diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..86aee8e --- /dev/null +++ b/.gitattributes @@ -0,0 +1,16 @@ +# Files that run inside Linux (the shell, WSL2, or a container) must keep LF line endings even when the +# repository is cloned on Windows with core.autocrlf=true: a CRLF shebang fails before install.sh's own +# CRLF guard can run (ADR-08). The list is explicit on purpose: `* text=auto` would rewrite legacy guide +# files that are CRLF in the index. +*.sh text eol=lf +*.bash text eol=lf +Dockerfile text eol=lf +Dockerfile.* text eol=lf +docker-compose*.yml text eol=lf +installer/**/*.py text eol=lf +installer/grdm_dev/messages.tsv text eol=lf +installer/grdm_dev/templates/** text eol=lf +installer/images/** text eol=lf +installer/pyproject.toml text eol=lf +manifest/** text eol=lf +tools/**/*.py text eol=lf diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml new file mode 100644 index 0000000..7c86663 --- /dev/null +++ b/.github/workflows/docs.yml @@ -0,0 +1,67 @@ +name: Documentation Build and Check + +on: + pull_request: + branches: + - develop + push: + branches: + - develop + +jobs: + linkcheck: + name: Check Links + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 + + - name: Set up Python + uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5 + with: + python-version: '3.11' + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r installer/requirements-docs.txt + + - name: Run documentation checks + run: python3 tools/docs_check.py + + mkdocs-build: + name: Build MkDocs Site + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 + + - name: Set up Python + uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5 + with: + python-version: '3.11' + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r installer/requirements-docs.txt + + - name: Build MkDocs site + run: | + # Check if mkdocs.yml exists + if [ ! -f mkdocs.yml ]; then + echo "Error: mkdocs.yml not found" + exit 1 + fi + + # Build the site (will fail if strict mode is enabled) + mkdocs build --strict + + - name: Upload site artifact + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 + with: + name: mkdocs-site + path: site/ + retention-days: 7 diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml new file mode 100644 index 0000000..b5b84b7 --- /dev/null +++ b/.github/workflows/images.yml @@ -0,0 +1,63 @@ +name: Image recipes + +# ADR-07 §4 / SPEC-02 §10: every `image_build` recipe under installer/images/ must build for both +# linux/amd64 and linux/arm64 on every pull request that can change it, so a broken download, digest +# or architecture-specific step is caught before a developer hits it. Nothing is pushed. + +on: + pull_request: + paths: + - "installer/images/**" + - "manifest/upstreams.json" + - ".github/workflows/images.yml" + push: + branches: [develop] + paths: + - "installer/images/**" + - "manifest/upstreams.json" + +permissions: + contents: read + +jobs: + recipes: + name: Build image_build recipes (amd64 + arm64, no push) + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + - name: Set up QEMU (arm64 emulation on the amd64 runner) + uses: docker/setup-qemu-action@99012661954931238ded8c8b007157a8430204e1 # v4.4.0 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1 + - name: Build every recipe the manifest declares, for both platforms + run: | + set -eu + python3 - <<'PY' > recipes.txt + import json + for c in json.load(open("manifest/upstreams.json"))["components"]: + ib = c.get("image_build") + if ib: + print(f"{c['id'].lower()} {ib['context']} {ib['tag']}") + PY + test -s recipes.txt || { echo "no image_build component in the manifest"; exit 0; } + while read -r cid ctx tag; do + echo "== $cid ($ctx) tag $tag" + docker buildx build --platform linux/amd64,linux/arm64 \ + --label "org.gakunin-rdm.component=$cid" \ + -t "grdm-dev/$cid:$tag" --output type=cacheonly "$ctx" + done < recipes.txt + - name: Smoke-test the amd64 variant of each recipe (image starts, port opens) + run: | + set -eu + while read -r cid ctx tag; do + docker buildx build --platform linux/amd64 --load -t "grdm-dev/$cid:$tag" "$ctx" + docker image inspect "grdm-dev/$cid:$tag" --format '{{index .Config.Labels "org.opencontainers.image.base.digest"}}' | grep -q sha256: || { echo "missing base digest label"; exit 1; } + case "$cid" in + elasticsearch2) + docker run -d --name smoke --read-only --tmpfs /tmp --tmpfs /usr/share/elasticsearch/logs:mode=1777 -v smoke:/usr/share/elasticsearch/data --cap-drop ALL --security-opt no-new-privileges:true -p 127.0.0.1:19200:9200 "grdm-dev/$cid:$tag" + for i in $(seq 1 24); do sleep 5; curl -sf http://127.0.0.1:19200/ >/dev/null && break; done + curl -sf http://127.0.0.1:19200/ | grep -q cluster_name + docker rm -f smoke >/dev/null; docker volume rm smoke >/dev/null ;; + esac + done < recipes.txt diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml new file mode 100644 index 0000000..c1f8b32 --- /dev/null +++ b/.github/workflows/security.yml @@ -0,0 +1,116 @@ +name: Security Checks + +# SPEC-03 §4 / §5: gitleaks, Semgrep and Trivy run on every PR. The gate is +# staged (ADR-03): at M1 Trivy is REPORT ONLY (exit-code 0); gitleaks, Semgrep, +# the manifest check and the private-URL policy are blocking from M1. +# Every `uses:` is pinned to a commit SHA; the comment names the tag it was +# resolved from. + +on: + pull_request: + branches: + - develop + push: + branches: + - develop + +permissions: + contents: read + +jobs: + gitleaks: + name: Secret scan (gitleaks) + runs-on: ubuntu-latest + steps: + - name: Checkout (full history) + uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 + with: + fetch-depth: 0 + - name: Run gitleaks over the whole history + # .gitleaks.toml extends the default rules ([extend] useDefault = true) + # and allowlists only whole manifest SHA / digest lines. + run: | + docker run --rm -v "$PWD:/repo" -w /repo ghcr.io/gitleaks/gitleaks:v8.21.2 \ + detect --source . --config .gitleaks.toml --redact --exit-code 1 \ + --report-format json --report-path gitleaks-results.json || status=$? + test -z "${status:-}" || { echo "::error::gitleaks found possible secrets"; exit "$status"; } + - name: Upload report + if: always() + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 + with: + name: gitleaks-report + path: gitleaks-results.json + if-no-files-found: ignore + + semgrep: + name: Semgrep static analysis + runs-on: ubuntu-latest + container: + image: semgrep/semgrep:1.97.0 + steps: + - name: Checkout + uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 + - name: Run semgrep (p/default) + run: semgrep scan --config p/default --error --metrics=off . + + trivy: + name: Trivy filesystem scan (report only at M1) + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 + - name: Trivy fs scan (table, HIGH/CRITICAL) + # SPEC-03 §5 staged gate: M1-M3 = report only, so exit-code is '0'. + # Change exit-code to '1' at M4 (stop on HIGH) per ADR-03. + uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0 + with: + scan-type: fs + scan-ref: . + scanners: vuln,misconfig,secret + severity: HIGH,CRITICAL + exit-code: '0' + format: table + skip-dirs: site + - name: Trivy fs scan (SARIF report artifact) + # Same scan, machine-readable. Also report only at M1 (see above). + uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0 + with: + scan-type: fs + scan-ref: . + scanners: vuln,misconfig,secret + severity: HIGH,CRITICAL + exit-code: '0' + format: sarif + output: trivy-results.sarif + skip-dirs: site + skip-setup-trivy: true + - name: Upload Trivy report + if: always() + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 + with: + name: trivy-report + path: trivy-results.sarif + if-no-files-found: ignore + + manifest-check: + name: Manifest validation and private-URL policy + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 + + - name: Set up Python + uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5 + with: + python-version: '3.11' + + - name: Manifest check (SPEC-01 MC-01..MC-11, MC-13; exit 20 on failure) + run: python3 tools/manifest_check.py --manifest-only + + - name: Private-URL and token policy (all tracked files; exit 1 on failure) + # SPEC-01 rule 5 / SPEC-06 §5: no URL to -private or -dev2027 + # repositories, no token-like strings, no private keys anywhere. + run: python3 tools/manifest_check.py --policy-only + + - name: Unit tests for the checkers + run: python3 -m unittest discover -s tools/tests -v diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..5e29864 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,33 @@ +name: Unit Tests + +on: + pull_request: + push: + branches: [develop] + +permissions: + contents: read + +jobs: + unittest: + name: Unit tests (installer, tools) + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: ["3.11", "3.12"] + steps: + - name: Checkout + uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 + - name: Set up Python + uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5 + with: + python-version: ${{ matrix.python-version }} + - name: Installer unit tests (SPEC-02 §10; no Docker required) + run: PYTHONPATH=installer python3 -m unittest discover -s installer/tests + - name: Tools unit tests (manifest_check, docs_check) + run: python3 -m unittest discover -s tools/tests + - name: Package builds and exposes the console script + run: | + python3 -m venv .venv-ci && .venv-ci/bin/pip install -q ./installer + .venv-ci/bin/grdm-dev --version diff --git a/.gitignore b/.gitignore index e43b0f9..e101675 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,15 @@ .DS_Store + +# grdm-dev runtime (generated, contains secrets); runtime.*/ are operator-made copies of it (a moved-aside +# runtime from a cold-start test got scanned by Semgrep in real install run 20 because only runtime/ was ignored) +runtime/ +runtime.*/ +.venv/ +__pycache__/ +*.pyc +.pytest_cache/ + +# Python packaging artifacts +installer/build/ +installer/*.egg-info/ +*.egg-info/ diff --git a/.gitleaks.toml b/.gitleaks.toml new file mode 100644 index 0000000..9d1a745 --- /dev/null +++ b/.gitleaks.toml @@ -0,0 +1,44 @@ +# Gitleaks configuration for RDM-developer-guide (gitleaks v8.21.2 format) +# +# The default detection rules shipped with gitleaks are enabled through +# [extend] useDefault = true. Without that table a config file with only an +# allowlist has ZERO rules (review finding R2 on PR #19). +# +# Every allowlist entry below is anchored to one whole line and names the field +# it exempts, so a secret can never hide behind it. In v8.21.2 the global +# [allowlist] combines `paths` and `regexes` with OR (there is no per-regex +# path scoping), which is why no `paths` entry is used here: a path entry +# would exempt whole files. Allowlist regexes are tested against the full +# source line (regexTarget = "line"), not only the matched secret, so the +# field name is part of the match. +# +# Private-repository URL policy (SPEC-01 rule 5, SPEC-06 §5) is NOT a gitleaks +# concern; it is enforced by `python3 tools/manifest_check.py --policy-only` +# in .github/workflows/security.yml. + +title = "RDM-developer-guide Gitleaks Configuration" + +[extend] +useDefault = true + +[allowlist] +description = "Manifest commit SHAs and image digests (SPEC-01 §3). Each regex is anchored to a complete line whose only payload is that field." +regexTarget = "line" +regexes = [ + # Google's documented public reCAPTCHA v2 TEST site key (always passes verification; not a credential). + # It sits in the history of docs/guides/storage-addon/README.legacy.md (ported from PR #18); the working + # tree uses the placeholder . Source: https://developers.google.com/recaptcha/docs/faq + '''^\s*"recaptchaSiteKey": "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI",?\s*$''', + # manifest/upstreams.json: "sha": "<40 lowercase hex>" + '''^\s*"sha": "[0-9a-f]{40}",?$''', + # manifest/upstreams.json: "base_image_digest": "sha256:<64 hex>" + '''^\s*"base_image_digest": "sha256:[0-9a-f]{64}",?$''', + # manifest/upstreams.toon: one upstreams[] row + # repo,branch,kind,tracking_branch,status,sha,fetched_at + '''^\s*[A-Za-z0-9_./-]+,[A-Za-z0-9_./-]+,(public|private|cos),upstream/[A-Za-z0-9_.-]+,(merged|reference|candidate),[0-9a-f]{40},20[0-9]{2}-[0-9]{2}-[0-9]{2}$''', + # Legacy waterbutler sample (docs/guides/storage-addon/waterbutler/config/setup.py, + # its generated site/ copy, and the pre-move path StorageAddon/... in history): + # a setuptools entry_points line that the default `dropbox-api-token` rule + # mistakes for a token. The whole line is a Python module path, no secret. + '''^\s*'dropbox = waterbutler\.providers\.dropbox:DropboxProvider',$''', +] diff --git a/.semgrepignore b/.semgrepignore new file mode 100644 index 0000000..44392fd --- /dev/null +++ b/.semgrepignore @@ -0,0 +1,24 @@ +# Semgrep ignore list (reasons are mandatory; see docs/spec/03_security_gate.md) +# Generated output of MkDocs; its sources under docs/ are scanned instead. +site/ +# Legacy sample code copied from the 2020-era guides (osf.io add-on examples). +# Findings there (raw HTML in templates, exec in a sample) are recorded on the status board +# and will be addressed when each guide is rewritten (M2/M3). The guides' README files stay scanned. +docs/guides/*/addon/ +docs/guides/*/admin/ +docs/guides/*/admin_tests/ +docs/guides/*/config/ +docs/guides/*/osf/ +docs/guides/*/website/ +docs/guides/*/osf.io/ +docs/guides/*/ember-osf-web/ +docs/guides/*/images/ +docs/guides/*/docs/ +docs/guides/*/waterbutler/ +# Compose service templates (data, not code). They name in-network endpoints (plain-text WebSocket to the y_websocket service); +# traffic stays inside the Compose network `grdm` (ADR-02) and is never published to the host or the LAN. +installer/grdm_dev/templates/ +# Review records: verbatim prose that SPEC-06 §8 forbids editing. They quote code and rule names in text +# (for example a plain-text WebSocket URL inside a sentence), which Semgrep's generic matching reports as +# code. Only Markdown records are excluded; no executable file lives here. +docs/reviews/*.md diff --git a/APIGuide/README.md b/APIGuide/README.md index c7cca56..9ee42bb 100644 --- a/APIGuide/README.md +++ b/APIGuide/README.md @@ -1,318 +1,8 @@ -# APIの利用 +# API Guide / API ユーガイド -RDMが研究データを効果的に管理するためには、外部システムとの連携や既存のRDMアドオンとの連携を行う必要が出てくるでしょう。 -このような時、外部システムやRDMおよびアドオンの間の境界面、特にAPI(Application Programming Interface)を意識しながら機能を実装することで、メンテナンス性を維持したり、今後の拡張を容易にしたりすることができます。 +Moved to [docs/guides/api/](../docs/guides/api/) for the latest guides. -本ドキュメントではアドオンにおける実装に着目し、アドオンを外部システムから操作可能にする方法([アドオンAPIの公開](#アドオンAPIの公開))と、アドオンからRDMを操作する方法([既存APIによる操作](#既存APIによる操作))の2つの観点で説明します。 +API ガイドの最新ガイドは [docs/guides/api/](../docs/guides/api/) に移動しました。 -# アドオンAPIの公開 - -アドオンの機能に対して、他のシステムからアクセス可能にするためのAPIの考え方、定義方法を説明します。 - -## APIの実装 - -外部システムがアドオンの機能に対してアクセスする場合は、HTTP(S)によるRESTful API呼び出しを利用するのが便利です。 -RDMアドオンは [スケルトン](../Skelton) の追加方法で説明したように、Djangoアプリケーションの形で実装されます。 -そのため、DjangoやRDMが提供する各種補助機能を利用することができます。 - -HTTP(S)で呼び出し可能なエンドポイントを定義する場合、ビューにより実装するのが一般的です。 -[スケルトンの作成#Viewの構成](../Skelton#viewの構成) に示すように、定義は以下の2種類から構成されます。 - -- Routes ... View処理をどのパスにマッピングし、どのような形式で出力するか。出力にはJSON形式や、HTMLのテンプレートを指定することができる -- Views ... View処理の内容 - -Routesは以下のようにパスとMethod(GET, POST, PUT, DELETE, ...)と、その組み合わせに対してどの関数を実行するか、その実行結果をどのように出力するかを定義します。 -例えば、[画面拡張の例](../ScreenExpansion)では以下のように定義しています。 - -``` -api_routes = { - 'rules': [ - ... - Rule([ # (1) - '/project//{}/config'.format(SHORT_NAME), - '/project//node//{}/config'.format(SHORT_NAME), - ], 'get', views.myscreen_get_config_ember, json_renderer), - Rule([ # (2) - '/project//{}/config'.format(SHORT_NAME), - '/project//node//{}/config'.format(SHORT_NAME), - ], 'patch', views.myscreen_set_config_ember, json_renderer), - ... - ], -} -``` - -ルール(1)は、`/project//アドオン名/config` というエンドポイントへの`GET`リクエストに対する処理を、viewsモジュールで定義した`myscreen_get_config_ember`という関数に行わせることを定義しています。`json_renderer`は、関数の戻り値として返されたオブジェクトを -JSONに変換、レスポンスとして返すことを定義しています。 -同様に、ルール(2)は`PATCH`リクエストに対しては`myscreen_set_config_ember`で処理することを示しています。 - -Viewsでは、以下のように関数を定義しています。 - -``` -@must_be_valid_project -@must_have_permission('admin') -@must_have_addon(SHORT_NAME, 'node') -def myscreen_get_config_ember(**kwargs): - node = kwargs['node'] or kwargs['project'] - addon = node.get_addon(SHORT_NAME) - return {'data': {'id': node._id, 'type': 'myscreen-config', - 'attributes': { - 'param1': addon.get_param_1() - }}} - -@must_be_valid_project -@must_have_permission('admin') -@must_have_addon(SHORT_NAME, 'node') -def myscreen_set_config_ember(**kwargs): - node = kwargs['node'] or kwargs['project'] - addon = node.get_addon(SHORT_NAME) - try: - config = request.json['data']['attributes'] - param_1 = config['param1'] - except KeyError: - raise HTTPError(http_status.HTTP_400_BAD_REQUEST) - - addon.set_param_1(param_1) - return {'data': {'id': node._id, 'type': 'myscreen-config', - 'attributes': { - 'param1': param_1 - }}} -``` - -いずれも、`@must_`から始まるデコレータと、`def`から始まる関数定義ブロックから構成されます。 -デコレータは、これらの関数に関する認可の要否や、使用可能なプロジェクトの条件を定義しています。 -また、`kwargs`には関数に与えられた引数が格納されます。`node`や`project`には、Django Modelが格納されます。 -(デコレータの定義によっては、格納されない場合もあります。) -アドオンはこれらのオブジェクトを介して、RDM内のデータベースの内容を操作することができます。 -([画面拡張の例](../ScreenExpansion)では、Emberで定義した画面からこれらのエンドポイントに対してリクエストを出しています。) - -これらのロジックの記述方法は一般的なDjangoのルールに則っています。したがって、DjangoやFlaskなどのPythonの -Webアプリケーションフレームワークの知識があれば比較的簡単に実装することができるでしょう。 -また、RDMではアクセス制御やプロジェクトの制限に便利なデコレータを提供しています。[RDMが提供するデコレータ一覧](Decorators.md)を参考にしてください。 - - -## APIのセキュリティ - -APIアクセスは適切なユーザ、またはシステムからのみ利用可能なようにアクセス制御を行う必要があります。 -アクセス制御方式の実現方法として、ユーザによる認可を経てアクセスを行う方式と、独自のセキュリティ機構を設ける方式について説明します。 - -### ユーザによる認可 - -先のViewsの例では、 `@must_have_permission('admin')` という形で、この操作は`admin`権限を持っているユーザにしか実施できないことを宣言しています。 -他にも、`write`権限が必要であるとか、様々な権限のコントロールが考えられます。 - -ここで重要なのは、**ユーザによって、操作可能な範囲が異なる**という点と、**ユーザはアドオンを無制限に信頼してくれるわけではない**という点です。 -ユーザの識別はWebアプリケーションにとっては当たり前のことですが、APIによる操作を考える場合にも非常に重要な点となります。 -ただ、APIのリクエスト側に*「私はxxです」*という申告を求めるわけにはいきません。詐称される可能性があるからです。 -また、秘密の情報(パスワード・秘密鍵等)で操作の主が認証できたとしても、そのユーザはこのアドオンを無制限に信頼してくれると考えるべきではありません。 -(RDM自体は信頼して使ってもらうことになりますが、RDMのAPIにアクセスするソフトウェアは信頼されているとは限りません。) -そのため、「このアドオンは情報yyの読み込みだけをします」であるとか、「読み込みと書き込みをします」であるとか、範囲を限定してユーザへの許可を求めることになります。 - -#### Personal Access Tokenによる認可 - -このような、ユーザの権限を行使するための機構の一つが、Personal Access Tokenです。RDMのユーザの [設定] 画面から、 [パーソナルアクセストークン] で取得することができます。 - -![パーソナルアクセストークン](images/personal-access-token.png) - -[新規トークン] ボタンをクリックすると、新規トークンを発行することができます。 - -![新規トークン](images/new-token.png) - -新規トークンの発行の際に、スコープという複数のチェック項目が現れます。これが認可の範囲を示しています。(詳細は [スコープの定義](#スコープの定義) を参照してください。) -[作成] ボタンをクリックして得たトークン(Access Token)はアプリケーションなどから`Authorization: Bearer`ヘッダを通して与えることで、APIにアクセスすることができるようになります。このようにすると、トークンの発行主の持つ権限と、(必要に応じて)スコープにより定義された認可範囲、 `@must_have_permission` などのデコレータによって定義された制約の検証が行われ、アクセスの許可・不許可が決定されます。 - -この方法は後述する [OAuthによる認可](#OAuthによる認可) 方式と異なり、Callback URLなどの準備が不要な一方、ユーザによるアクセストークン発行が必要なこと、そのアクセストークンが漏洩した際にユーザの協力を得ながら解決する必要があることなどから、開発中に利用できる便利な方式程度に考えるべきでしょう。 - -#### OAuthによる認可 - -Personal Access Tokenはユーザに手動でトークンを作成させ、トークンを何らかの方式でアプリケーションに渡す必要がありますが、RDMはOAuth https://tools.ietf.org/html/rfc6749 をサポートしており、OAuthによりアプリケーションとRDMの間で認可情報のやりとりを実現することができます。 - -アプリケーションがOAuthを通じてユーザから操作の認可を得るためには、RDMからConsumer KeyとConsumer Secretという情報を得る必要があります。 -この情報は、RDMのユーザの [設定] 画面から、 [開発者アプリ] で取得することができます。 - -![開発者アプリ](images/dev-application.png) - -APIに対してアクセスするアプリケーションは、OAuth 2.0に対応したクライアントライブラリを用いてOAuth認可フローを実装する必要があります。 -アプリケーションはOAuth認可フローを通して、ユーザにRDMへのログインと認可を求め、認可されるとAccess Token(または、要求した`access_type`が`offline`の場合、Refresh TokenとAccess Token)を取得することができます。あとはPersonal Access Tokenと同様に、`Authorization: Bearer`ヘッダにAccess Tokenを与えることで、APIアクセスを行うことができます。 - -頻繁に利用される可能性があるAccess Tokenは、悪用を防ぐために短時間(1時間)で期限切れとなるよう設計されています。そのため、認可を受けてから、長期間にわたってその認可された操作を実施したい場合は、Refresh Tokenを用いてAccess Tokenを定期的に新規取得する必要があります。 -これらの処理は、多くの場合OAuth対応クライアントライブラリにロジックが用意されており、RDMが提供するエンドポイントのURLを与えれば実現できます。 -(参考: エンドポイントの情報や可能な操作は https://github.com/RCOSDP/RDM-cas-overlay#web-server-authorization に記載されている。) - -> OAuthを用いたAPIの認可をローカル環境で試すためには、開発環境構築時に [cas-overlayを含む構成で起動する](../Environment.md#cas-overlayを含む構成で起動する) 必要があります。 - -### 独自方式によるアクセス制御: Signing API requestsの例 - -RDMはアドオンに関してサンドボックスのような隔離モデルは採用しておらず、アドオンからRDM本体と同様の操作が実施することができます。 -これは、様々な処理をアドオンとして実現できる一方、その強力な自由度を悪用されないよう、アドオンでは適切な権限制御を行う必要があります。 - -先に示したのはユーザの認可を経て処理を実施する方式ですが、アドオンによっては、必ずしも操作主体となるユーザを限定しない形で振舞う必要があるかもしれません。 -このような場合に関してRDMは特別なセキュリティ機構を提供していないため、独自に外部システム(アドオン呼び出し元)とアドオンの間で取り決めをし、不正なユーザがアクセスすることができないようにセキュリティ機構を実装する必要があります。 - -このような機構を実現する場合に最も簡単な方法は、第三者が推測しにくいトークンを外部システムとアドオンの間で決め、アドオンはこのトークンをともなうリクエストのみを許可する方式です。 -この方式は実現が容易な一方、中間者攻撃などリクエストの内容が奪われてしまうとこのトークンも漏洩してしまうという問題があります。(攻撃者は秘密のトークンを用いて自由にアドオンを操作できてしまう。) - -このような攻撃への対策として、秘密のトークンそのものをリクエストに含めるのではなく、秘密のトークンと、その他の情報を合わせたハッシュ値を計算し、そのハッシュをリクエストに含めることが考えられます。これにより、受信側は同様のハッシュ計算を行なって送信側のハッシュ値との比較を行うことで、送信側が秘密のトークンを所持しているかを検証することができます。 - -例として、IQB-RIMSアドオンの場合は、アドオンの設定情報に基づいたハッシュを生成し、独自のHTTPヘッダ `X-RDM-Token` に格納するようにしています。 -これにより、あるプロジェクトにアタッチされたアドオンにおいてハッシュが漏洩したとしても、別のアドオンに対して悪用はできないように配慮しています。 -ハッシュ生成処理は、[RDMが提供するデコレータ一覧](Decorators.md)のようにデコレータとして定義することで、再利用性を高めています。 - -``` -def must_have_valid_hash(): - """Decorator factory that ensures that a request have valid X-RDM-Token header. - :returns: Decorator function - """ - def wrapper(func): - - @functools.wraps(func) - def wrapped(*args, **kwargs): - owner = kwargs['node'] - addon = owner.get_addon(IQBRIMSAddonConfig.short_name) - if addon is None: - raise HTTPError(http.BAD_REQUEST) - secret = addon.get_secret() - process_def_id = addon.get_process_definition_id() - valid_hash = hashlib.sha256((secret + process_def_id + owner._id).encode('utf8')).hexdigest() - request_hash = request.headers.get('X-RDM-Token', None) - logger.debug('must_have_valid_hash: request_hash={}'.format(request_hash)) - logger.debug('must_have_valid_hash: valid_hash={}'.format(valid_hash)) - if request_hash != valid_hash: - raise HTTPError( - http.FORBIDDEN, - data={'message_long': ('User has restricted access to this page.')} - ) - return func(*args, **kwargs) - - return wrapped - - return wrapper -``` -(引用: https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/iqbrims/utils.py#L142) - -このように定義した独自の `addons.iqbrims.utils.must_have_valid_hash` デコレータを用いて、 -個々のViewsへのアクセスの際にハッシュ値の計算・設定が必要なことを明示しています。 - -``` -@must_be_valid_project -@must_have_addon(SHORT_NAME, 'node') -@must_have_valid_hash() # Hashの設定が必要なことを示す -def iqbrims_post_workflow_state(**kwargs): - node = kwargs['node'] or kwargs['project'] - ... # Viewsの処理 -``` -(引用: https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/iqbrims/views.py#L229) - -これらのハッシュ計算にどの程度のリスクを想定するかは利用形態によって異なります。例えば、Amazon S3のSigning and authenticating REST requests https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html では、送信時刻を含むリクエストヘッダをハッシュ計算の対象に含めることで、ハッシュ値を含むリクエストが漏洩しても、同じオブジェクトに対するリクエストは以後不可能なように配慮がなされています。ハッシュ値の計算にどのような要素を使うかはアドオンの実装に依存する部分ではありますが、たとえリクエストが漏洩したとしても、その影響範囲がある程度限定的になるよう配慮してハッシュ計算を実装する必要があるでしょう。 - - - -# 既存APIによる操作 - -RDMは多くの機能をAPIとして提供しているため、すでにある機能については積極的に活用すべきでしょう。また、内部ではDjangoの規則にしたがって作成されたDjango Modelを介してデータベースの管理を行なっているため、この本章では、OSF APIv2による操作とDjango Modelによるモデルの直接操作に関して説明します。 - -## OSF APIv2 による外部からの操作 - -OSF APIv2はRDMが備えるRESTful APIです。OSF APIv2ドキュメント https://developer.osf.io/ で説明されている通り、プロジェクトに対して様々な操作を実施することができます。 - -これらのAPIは外部システムからの呼び出しに利用される他、Emberベースのアプリケーションからの操作にも利用されます。また、JSON-API https://jsonapi.org/format/1.0/ に準拠した形式で提供されます。 - -### スコープの定義 - -APIの操作にはOAuthにて説明したように、適切なスコープを指定する必要があります。 -RDMにて指定可能なスコープは `oauth_scopes.public_scopes` として定義されます。 - -- https://github.com/RCOSDP/RDM-osf.io/blob/develop/framework/auth/oauth_scopes.py#L291-L363 - -これらのスコープは`CoreScopes` https://github.com/RCOSDP/RDM-osf.io/blob/develop/framework/auth/oauth_scopes.py#L23 の組み合わせとして表現されます。 -それぞれの操作がどのようなスコープを要求するかは、Viewクラスに定義されます。例えば、NodeListに関する操作 ( https://developer.osf.io/#operation/nodes_list や https://developer.osf.io/#operation/nodes_create ) であれば、 - -``` -class NodeList(JSONAPIBaseView, bulk_views.BulkUpdateJSONAPIView, bulk_views.BulkDestroyJSONAPIView, bulk_views.ListBulkCreateJSONAPIView, NodesFilterMixin, WaterButlerMixin, NodeOptimizationMixin): - """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_list). - """ - permission_classes = ( - drf_permissions.IsAuthenticatedOrReadOnly, - base_permissions.TokenHasScope, - ) - required_read_scopes = [CoreScopes.NODE_BASE_READ] - required_write_scopes = [CoreScopes.NODE_BASE_WRITE] - model_class = apps.get_model('osf.AbstractNode') - - parser_classes = (JSONAPIMultipleRelationshipsParser, JSONAPIMultipleRelationshipsParserForRegularJSON,) - serializer_class = NodeSerializer - ... -``` -(引用: https://github.com/RCOSDP/RDM-osf.io/blob/develop/api/nodes/views.py#L228-L229) - -のように、 `required_read_scopes` と `required_write_scopes` として、必要なスコープが定義されます。 - - -## Django Modelによる内部からの操作 - -RDMはDjangoアプリケーションとして構成されているため、データベースへのアクセスはDjango Modelを介して行います。 -この操作の例として、`django.dispatch.receiver` によるモデル変更検知と、 `osf.models` 内のオブジェクトを介した操作例を示します。 - -``` -from django.dispatch import receiver -... -from osf.models import Contributor, RdmAddonOption, AbstractNode - -... - -@receiver(post_save, sender=Node) -def add_iqbrims_addon(sender, instance, created, **kwargs): - if IQBRIMSAddonConfig.short_name not in ws_settings.ADDONS_AVAILABLE_DICT: - return - - inst_ids = instance.affiliated_institutions.values('id') - addon_option = RdmAddonOption.objects.filter( - provider=IQBRIMSAddonConfig.short_name, - institution_id__in=Subquery(inst_ids), - management_node__isnull=False, - is_allowed=True - ).first() - if addon_option is None: - return - if addon_option.organizational_node is not None and \ - not addon_option.organizational_node.is_contributor(instance.creator): - return - - instance.add_addon(IQBRIMSAddonConfig.short_name, auth=None, log=False) -``` -(引用: https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/iqbrims/models.py#L309-L327) - -以下で、注目すべきコードについてそれぞれ説明します。 - -### receiverによるモデル変更検知 - -`django.dispatch.receiver` デコレータを用いることで、特定のModelに変更が生じた場合の処理を記述することができます。 - -``` -@receiver(post_save, sender=Node) -def add_iqbrims_addon(sender, instance, created, **kwargs): - ... -``` - -この例の場合は、`post_save`を指定していますので、Node型(プロジェクトはこの型のオブジェクトで表現されます)を持つオブジェクトの更新後に、`add_iqbrims_addon`関数が呼び出されます。 - -> `post_save`のほか、検知可能な変更操作は、 https://docs.djangoproject.com/en/3.1/ref/signals/ に列挙されています。 -> RDM内では、 `pre_save`, `post_save`, `post_delete`, `m2m_changed` がすでに使用されています。 - -### osf.modelsによるモデル操作 - -`django.dispatch.receiver(post_save, sender=Node)` デコレータの場合は、第2引数の `instance` オブジェクトにNodeへの参照が格納されます。 -Django Modelは `osf.models` に定義してあります。例えば Node Modelならば、 https://github.com/RCOSDP/RDM-osf.io/blob/develop/osf/models/node.py#L2457 で定義されています。 - -例えば、プロジェクト内で特定のアドオンを有効化したい場合は、 `add_addon`関数 https://github.com/RCOSDP/RDM-osf.io/blob/develop/osf/models/node.py#L2290 を呼び出すことで実現できます。 - -``` -@receiver(post_save, sender=Node) -def add_iqbrims_addon(sender, instance, created, **kwargs): - ... - - instance.add_addon(IQBRIMSAddonConfig.short_name, auth=None, log=False) -``` - -このようにして、直接Modelを操作することで、RDMに対して様々な作用を与えることができます。 -モデル操作は自由に変更を行える一方、ユーザがこれらの変更を適切に理解できるようにする配慮を行う必要があります。 -さもないと、「何かが勝手に自身のプロジェクトを壊した」と思ってしまうかもしれません。アドオンが、ユーザ自身に許可された範囲で様々な変更を実施しているように、ユーザに理解してもらえるような動作を設計することが重要です。 +- [ Guides index](../docs/guides/README.md) / ガイド一覧 +- [ SPEC-06 Documentation Conventions](../docs/spec/06_documentation_conventions.md) / 文書規約 diff --git a/AdminRDMAddonGuide/README.md b/AdminRDMAddonGuide/README.md index 3818de5..da7905a 100644 --- a/AdminRDMAddonGuide/README.md +++ b/AdminRDMAddonGuide/README.md @@ -1,384 +1,8 @@ -# アドオンの機関管理機能の利用 +# Admin Addon Guide / 管理者アドオンガイド -ユーザの所属機関が管理できる「機関管理機能」において、アドオンに関する機能(RDM Addon)について説明します。 +Moved to [docs/guides/admin-addon/](../docs/guides/admin-addon/) for the latest guides. -具体的には、以下の方法を説明します。 +管理者アドオンガイドの最新ガイドは [docs/guides/admin-addon/](../docs/guides/admin-addon/) に移動しました。 -- アドオンに共通する機関管理機能を、新しく追加したアドオンで利用できるようにする方法 ([スケルトン アドオンの機関管理機能の対応](#スケルトン-アドオンの機関管理機能の対応)) -- 機関管理機能に新しい機能を追加する方法 ([Admin Notesの実装](#admin-notesの実装)) - -すべてのアドオンに共通する機関管理機能は、現在(2021年2月執筆時点)、アドオンの無効化機能のみです。機関ごとに、指定したアドオンを無効にすることができます。無効なアドオンは、ユーザーやプロジェクトのアドオン設定画面に表示されなくなり、利用もできなくなります。 - -## 前提条件 - -[開発環境の準備](../Environment.md#開発環境でRDMを起動する) のガイドに従い、開発環境にてRDMを起動しているものとします。 - -> 本ガイドでは機関管理機能を利用するため、`admin` と `admin_assets` サービスも起動してください。 - -動作確認のためのユーザは、 [開発環境の準備#ユーザを機関に所属させる](../Environment.md#ユーザを機関に所属させる) および [開発環境の準備#adminアクセス可能なユーザへと変更する](../Environment.md#adminアクセス可能なユーザへと変更する) のガイドに従い、何かしらの機関に所属し、その機関の機関管理者であるとします。 - - -# アドオンの機関管理機能の設計 - -## ファイルの構成 - -機関管理機能もアドオンと同様に[Django](https://www.djangoproject.com/)アプリケーションの形式で記述されます。ただし、OSF.io本体やアドオンとは若干中身が異なります。 - -アドオンの機関管理機能(RDM Addon)の基本的なファイル配置は以下のようになります(Force to useに関するファイルは記載していません)。 - -``` -/admin/ -├── rdm_addons ... アドオンの機関管理機能のモジュール -│ ├── api_v1 ... APIモジュール -│ │ ├── __init__.py ... モジュールの定義 -│ │ ├── urls.py ... APIのViewのルーティング定義 -│ │ └── views.py ... APIのViewの定義 -│ ├── __init__.py ... モジュールの定義 -│ ├── decorators.py ... デコレーターの定義 -│ ├── urls.py ... Viewのルーティング定義 -│ ├── utils.py ... ユーティリティ関数の定義 -│ └── views.py ... Viewの定義 -├── static ... Webブラウザから読み込むことを想定した静的ファイル -│ ├── css/rdm_addons.css ... アドオンの機関管理機能設定のCSSファイル -│ └── rdm_addons ... アドオンの機関管理機能設定のJavaScriptディレクトリ -│ ├── アドオン名 ...アドオンごとのJavaScriptディレクトリ -│ │ ├── アドオン名RdmConfig.js ... アドオンごとの機関管理機能設定の定義 -│ │ └── rdm-cfg.js ... アドオンごとの機関管理機能設定のエントリとなるJavaScriptファイル -│ ├── rdm-addons-page.js ... アドオンの機関管理機能設定のエントリとなるJavaScriptファイル -│ └── rdmAddonSettings.js ... アドオンの機関管理機能設定の定義 -├── templates ... テンプレートディレクトリ -│ └── rdm_addons ... アドオンの機関管理機能設定のテンプレートディレクトリ -│ ├── addons ... アドオンごとのテンプレートディレクトリ -│ │ └── アドオン名_institution_settings.html ... アドオンの機関管理機能設定のテンプレートファイル -│ ├── addon_list.html ... アドオン一覧画面のテンプレートファイル -│ └── institution_list.html ... 機関一覧画面のテンプレートファイル -└── translations ... 国際化ディレクトリ - ├── en/LC_MESSAGES ... 英語の国際化ディレクトリ - │ └── django.po ... 機関管理画面のテンプレートの国際化設定ファイル - ├── ja/LC_MESSAGES ... 日本語の国際化ディレクトリ - │ └── django.po ... 機関管理画面のテンプレートの国際化設定ファイル - └── django.pot ... 機関管理画面のテンプレートの国際化設定ファイル -``` - -機関管理機能のモデル定義は `/osf/models/` 以下に置きます。 - -``` -/osf/models/ -└── rdm_addons.py ... アドオンの機関管理機能設定のモデル定義 -``` - -JavaScriptで使う国際化設定は `/website/translations/` 以下のファイルに記述します。 - -``` -/website/translations/ -├── en/LC_MESSAGES ... 英語の国際化ディレクトリ -│ └── js_messages.po ... 機関管理機能のJavaScriptで使う国際化設定ファイル -├── ja/LC_MESSAGES ... 日本語の国際化ディレクトリ -│ └── js_messages.po ... 機関管理機能のJavaScriptで使う国際化設定ファイル -└── js_messages.pot ... 機関管理機能のJavaScriptで使う国際化設定ファイル -``` - -テストファイルは `/admin_tests/` 以下に置きます。 - -``` -/admin_tests/ -└── rdm_addons ... アドオンの機関管理機能設定のテスト - ├── api_v1 - │ ├── __init__.py - │ └── test_views.py - ├── __init__.py - ├── factories.py - └── test_views.py -``` - -## アドオンの機関管理機能のモジュール構成 - -アドオンと同様、Djangoの作法に従い、Model-Viewアーキテクチャにより実装します。 - -### Modelの構成 - -機関ごとのアドオンの設定を保持する `RdmAddonOption` モデルおよび `RdmAddonNoInstitutionOption` モデルが [osf/models/rdm_addons.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/osf/models/rdm_addons.py) に定義されています。設定項目を追加する場合は、これらモデルを変更します。 - -### Viewの構成 - -Viewの定義方法はアドオンと異なっているように見えますが、基本的な考え方は同じです。 - -ルーティング(アドオンにおける`routes.py`)は [admin/rdm_addons/urls.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/rdm_addons/urls.py) に定義し、各View処理は [admin/rdm_addons/views.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/rdm_addons/views.py) に定義します。 - -APIに関するView定義は、 [admin/rdm_addons/api_v1/urls.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/rdm_addons/api_v1/urls.py) と [admin/rdm_addons/api_v1/views.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/rdm_addons/api_v1/views.py) に定義します。 - -### フレームワークによって提供されるView - -HTMLテンプレートとJavaScriptの定義方法や、利用できるライブラリは、アドオンと似ています。 - -HTMLテンプレートファイルは [admin/templates/rdm_addons/](https://github.com/RCOSDP/RDM-osf.io/tree/develop/admin/templates/rdm_addons) 以下に配置します。拡張子が`.html`ですが、アドオンと同様に、テンプレート言語 [mako](https://www.makotemplates.org/) で記述します。 -各アドオンに関する設定画面のテンプレートファイルは、デフォルトで [admin/templates/rdm_addons/addons/institution_settings_default.html](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/templates/rdm_addons/addons/institution_settings_default.html) が使用されます。個別にテンプレートファイルを指定する方法は [#UI の追加](#uiの追加) で説明します。 - -各画面で読み込むJavaScriptファイルは [admin/static/js/rdm_addons/](https://github.com/RCOSDP/RDM-osf.io/tree/develop/admin/static/js/rdm_addons) 以下に配置します。テンプレートを動的に操作するためのJavaScriptのライブラリには [Knockout.js](https://knockoutjs.com/) を利用することができます。 -アドオンと違い、追加したエントリーファイルは [admin/webpack.admin.config.js](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/webpack.admin.config.js) の `entry` プロパティに追加する必要があることに注意してください。設定方法は [#UI の追加](#uiの追加) で説明します。 - -各画面に関するスタイル定義は [admin/static/css/rdm_addons.css](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/static/css/rdm_addons.css) にまとめて記述します。 - -> 機関管理者画面では、ember-osf-webで利用できるようなUI Componentは提供されていませんが、 [Bootstrap3](https://getbootstrap.com/docs/3.3/) のCSSやコンポーネントを利用することができます。 - -### テストコード - -テストコードは [admin_tests/rdm_addons](https://github.com/RCOSDP/RDM-osf.io/tree/develop/admin_tests/rdm_addons) 以下に作成します。 - -### Migrations定義 - -Migrationsファイルは [osf/migrations](https://github.com/RCOSDP/RDM-osf.io/tree/develop/osf/migrations) 以下に作成されます。Migrationsファイルの構造はアドオンと同様です。 - -### 国際化 - -HTMLテンプレートで使う国際化設定は [admin/translations/](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/translations/) 以下の `django.pot` および `django.po` に定義します。 - -JavaScriptで使う国際化設定は [website/translations/](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/translations/) 以下の `js_messages.pot` および `js_messages.po` に定義します。 - -定義方法や使い方は、 [ScreenExpansion#国際化](../ScreenExpansion/README.md#国際化) で説明しています。HTMLファイル内で文字列を国際化する方法は、makoと同様です。 - -> JavaScriptだけ、`website/translations/` 以下のファイルに定義することに気をつけてください。 - - -# スケルトン アドオンの機関管理機能の対応 - -`myskelton` という識別名のアドオンを、機関管理機能で管理するための実装を例に説明します。 - -[スケルトンの作成#スケルトン アドオンの実装](../Skelton/README.md#スケルトン-アドオンの実装) に従い、スケルトン アドオンの実装が完了していることを前提とします。 - -## addons.myskelton モジュールの変更 - -> ストレージアドオンの場合、この変更は不要です。 - -機関管理機能で管理するアドオンは、`AppConfig.config` に `accounts` が含まれている必要があります。 -`AppConfig.config` に `accounts` が含まれているアドオンは、ユーザのアドオンアカウント構成画面に表示され、デフォルトではOAuthの認証設定UIを含むテンプレートが参照されます。スケルトン アドオンは認証設定が不要なので、アドオン名を表示するだけのテンプレートを定義して、それを参照するようにします。 - -まずは [user_settings.mako](addon/templates/user_settings.mako) を `addons/myskelton/templates/user_settings.mako` に、[user-cfg.js](addon/static/user-cfg.js) を `addons/myskelton/static/user-cfg.js` にコピーします。 - -次に、`addons/myskelton/apps.py` を以下のように変更します。 -変更例はサンプル [apps.py](addon/apps.py) を参照してください。 - -```diff -class AddonAppConfig(BaseAddonAppConfig): - -- configs = ['node'] -+ configs = ['node', 'accounts'] - - node_settings_template = os.path.join(TEMPLATE_PATH, 'node_settings.mako') -+ user_settings_template = os.path.join(TEMPLATE_PATH, 'user_settings.mako') - - # 他変更なし -``` - - -## RDMコードの変更 - -### admin/base/settings/defaults.py への追加 - -[admin/base/settings/defaults.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/base/settings/defaults.py) の `INSTALLED_APPS` にアドオン名を、`MIGRATION_MODULES` にキーがアドオン名のプロパティを追加します。 - -> `INSTALLED_APPS` に追加する値は `addons.アドオン名` ですが、`MIGRATION_MODULES` に追加するキー名は `addons_アドオン名` です。`.` と `_` の違いに注意してください。 - -デフォルトでは、Force to useという、機関に属するプロジェクトでアドオンを強制的に有効にする機能が利用できます。しかし、この機能を利用するためには、認証情報を保存するための仕組みをアドオンに実装しておく必要があります。スケルトン アドオンは認証情報を持たないため、`UNSUPPORTED_FORCE_TO_USE_ADDONS` にアドオン名を追加し、この機能を無効にします。 - -実装例はサンプル [defaults.py](config/admin/base/settings/defaults.py) を参照してください。 - - -# スケルトン アドオンの機関管理機能の動作確認 - -スケルトン アドオンを機関管理機能で管理してみましょう。 - -変更したファイルに関連するサービスを再起動します。 - -``` -$ docker compose restart web api assets admin -``` - -これでサービスへの反映は完了です。機関管理機能でスケルトン アドオンの設定を変更できることを確認するには、以下のような操作を実施します。 - -1. RDM Web UIにアクセスする `http://localhost:5000` -1. 「アドオンアカウント構成」ページを開く。 -1. My Skeltonアドオンが表示されていることを確認する。 - ![Configure Addon Account](images/configure_addon_account.png) -1. 機関管理機能のWeb UIにアクセスする `http://localhost:8001` -1. RDM Addonsページを開く。 -1. 自分の所属機関のページを開く。 -1. My Skeltonアドオンの左のチェックボックスを外し、アドオンを無効化する。 - ![Disable Addon](images/admin_disable_addon1.png) -1. 再度、RDM Web UIで「アドオンアカウント構成」ページを開く。 -1. My Skeltonアドオンが表示されていないことを確認する。 - -以上でスケルトン アドオンの機関管理機能の動作確認は完了です! - - -# Admin Notesの実装 - -ここでは、機関管理者が、スケルトン アドオンに関するユーザへの注意書きを設定できる Admin Notes という機能の実装を例に説明します。 - -[スケルトン アドオンの機関管理機能の対応](#スケルトン-アドオンの機関管理機能の対応) が完了していることを前提とします。 - -## RDMコードの変更 - -### RdmAddonOption モデルの変更 - -[osf/models/rdm_addons.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/osf/models/rdm_addons.py) の `RdmAddonOption` モデルおよび `RdmAddonNoInstitutionOption` モデルに、Admin Notesの内容を保存する `admin_notes` カラムを追加します。 -変更例はサンプル [rdm_addons.py](osf/models/rdm_addons.py) を参照してください。 - -### APIの追加 - -Admin Notesを取得・設定するためのAPIを追加します。 - -[admin/rdm_addons/api_v1/views.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/rdm_addons/api_v1/views.py) に `AdminNotesView` クラスを追加します。 -変更例はサンプル [views.py](admin/rdm_addons/api_v1/views.py) を参照してください。 - -[admin/rdm_addons/api_v1/urls.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/rdm_addons/api_v1/urls.py) に `AdminNotesView` へのルーティング設定を追加します。 -変更例はサンプル [urls.py](admin/rdm_addons/api_v1/urls.py) を参照してください。 - -### UIの追加 - -Admin Notesを設定するためのUIを追加します。 -今回は、スケルトン アドオンに対してのみAdmin Notesを設定できるように、スケルトン アドオン用の設定UIを作成します。 - -以下に従って、テンプレートファイルとJavaScriptファイルをコピーします。 - -- [myskelton_institution_settings.html](admin/templates/rdm_addons/addons/myskelton_institution_settings.html) を `admin/templates/rdm_addons/addons/myskelton_institution_settings.html` にコピーする。 -- [myskeltonRdmConfig.js](admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js) を `admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js` にコピーする。 -- [rdm-cfg.js](admin/static/js/rdm_addons/myskelton/rdm-cfg.js) を `admin/static/js/rdm_addons/myskelton/rdm-cfg.js` にコピーする。 - -作成したテンプレートファイルを読み込むように、 [admin/rdm_addons/utils.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/rdm_addons/utils.py) の `get_institusion_settings_template()` 関数の一部を変更します。 -変更例はサンプル [utils.py](admin/rdm_addons/utils.py) を参照してください。 - -作成したJavaScriptファイルを読み込むように、 [admin/webpack.admin.config.js](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/webpack.admin.config.js) の `entry` に `rdm-myskelton-cfg` プロパティを追加します。 -変更例はサンプル [webpack.admin.config.js](config/admin/webpack.admin.config.js) を参照してください。 - -アドオンの機関管理機能UIで読み込まれるCSSファイル [admin/static/css/rdm_addons.css](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/static/css/rdm_addons.css) に、Admin Notesに関するCSSを追加します。 -変更例はサンプル [rdm_addons.css](admin/static/css/rdm_addons.css) を参照してください。 - -## addons.myskelton モジュールの変更 - -Admin Notesの内容をプロジェクトの「アドオンを構成」ページに表示するための変更を加えます。 - -### APIの追加 - -Admin Notesを取得するためのAPIを追加します。 - -`addons/myskelton/views.py` に `myskelton_get_admin_notes` 関数を追加します。 -変更例はサンプル [views.py](addon/views.py) を参照してください。 - -`addons/myskelton/routes.py` に `myskelton_get_admin_notes` へのルーティング設定を追加します。 -変更例はサンプル [routes.py](addon/routes.py) を参照してください。 - -### UIの追加 - -Admin Notesを表示するためのUIを追加します。 - -`addons/myskelton/templates/node_settings.mako` にAdmin Notesを表示するテンプレートを追加します。 -変更例はサンプル [node_settings.mako](addon/templates/node_settings.mako) を参照してください。 - -`addons/myskelton/static/node-cfg.js` にAdmin Notesを読み込む関数とAdmin Notesの内容を保持する変数を追加します。 -変更例はサンプル [node-cfg.js](addon/static/node-cfg.js) を参照してください。 - -## 国際化 - -[website/translations/](https://github.com/RCOSDP/RDM-osf.io/tree/develop/website/translations) 以下のファイル `js_messages.*` の末尾に、Admin Notesに関する国際化設定を追加します。 -変更例はサンプル [website/translations/](website/translations/) を参照してください。 - -[admin/translations/](https://github.com/RCOSDP/RDM-osf.io/tree/develop/admin/translations) 以下の各ファイルの末尾に、Admin Notesに関する国際化設定を追加します。 -変更例はサンプル [admin/translations/](admin/translations/) を参照してください。 - -## テストファイルの変更 - -### admin_tests/rdm_addons/api_v1/test_views.py の変更 - -機関管理機能に追加したAPIのテストを追加します。 - -[admin_tests/rdm_addons/api_v1/test_views.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin_tests/rdm_addons/api_v1/test_views.py) に、Admin Notes取得・設定APIをテストする `TestAdminNotesView` クラスを追加します。 -変更例はサンプル [test_views.py](admin_tests/rdm_addons/api_v1/test_views.py) を参照してください。 - -### addons/myskelton/tests/test_view.py の変更 - -スケルトン アドオンのAdmin Notesの取得APIのテストを追加します。 - -`addons/myskelton/tests/test_view.py` に、Admin Notes取得APIをテストする `TestAdminNotesViews` クラスを追加します。 -変更例はサンプル [test_views.py](addon/tests/test_view.py) を参照してください。 - -## Migrationsファイルの作成 - -makemigrations コマンドを実行して、Migrationsファイルを作成します。 - -``` -$ docker compose run --rm web python3 manage.py makemigrations -``` - -上記の出力中に以下のような出力が現れれば成功です。 - -> `osf/migrations` 配下に作成されるファイル名は、作成日時やRDMのバージョンによって異なります。 - -``` -Migrations for 'osf': - osf/migrations/0214_auto_20210214_1431.py - - Add field admin_notes to rdmaddonnoinstitutionoption - - Add field admin_notes to rdmaddonoption -``` - -## テスト - -アドオンの機関管理機能におけるAdmin Notesに関するユニットテストは、以下のコマンドで実行できます。 - -``` -$ docker compose run --rm web invoke test_module -m admin_tests/rdm_addons/api_v1/test_views.py::TestAdminNotesView -``` - -スケルトン アドオンにおけるAdmin Notesに関するユニットテストは、以下のコマンドで実行できます。 - -``` -$ docker compose run --rm web invoke test_module -m addons/myskelton/tests/test_view.py::TestAdminNotesViews -``` - -# Admin Notesの動作確認 - -Admin Notesの動作を確認してみましょう。 - -## DBマイグレーション - -マイグレーションを実行し、Migrations定義をPostgreSQLサービスに反映します。 - -``` -$ docker compose run --rm web python3 manage.py migrate -``` - -## 国際化のコンパイル - -テンプレートファイルの国際化設定を適用するために、国際化ファイルをコンパイルします。 - -``` -$ docker compose run --rm web pybabel compile -D django -d ./admin/translations -``` - -## サービスの再起動 - -変更したファイルに関するサービスを再起動します。 - -``` -$ docker compose restart web api assets admin admin_assets -``` - -これでサービスへの反映は完了です。 - -## Admin Notesを試す - -Admin Notesの設定および表示の確認をするには、以下のような操作を実施します。 - -1. 機関管理機能のWeb UIにアクセスする。 `http://localhost:8001` -1. アドオン利用制御(RDM Addons)ページを開く。 -1. 自分の所属機関のページを開く。 -1. My Skeltonアドオンの中の管理者ノート(Admin Notes)の下にあるテキストボックスに任意のテキストを入力し、保存する。 - ![Edit Admin Notes](images/edit_admin_notes.png) -1. RDM Web UIにアクセスする。 `http://localhost:5000` -1. 適当なプロジェクトを作成する。 -1. 「アドオン」ページを開く。 -1. My Skeltonアドオンを有効化する。 -1. 「アドオンを構成」のMy Skeltonの欄に、設定したAdmin Notesが表示されていることを確認する。 - ![View Admin Notes](images/view_admin_notes.png) - -以上でAdmin Notesの動作確認は完了です! +- [ Guides index](../docs/guides/README.md) / ガイド一覧 +- [ SPEC-06 Documentation Conventions](../docs/spec/06_documentation_conventions.md) / 文書規約 diff --git a/Environment.md b/Environment.md index 085e720..96d1402 100644 --- a/Environment.md +++ b/Environment.md @@ -1,385 +1,8 @@ -# 開発環境の準備 +# Environment / 環境設定と開発環境 -RDMは複数のマイクロサービスから構成されます。開発時にもこれらのサービスを動作させる必要がありますが、 -1つ1つのサービスを自身のOSに合わせてインストールしようとすると非常に手間がかかります。 +Moved to [docs/guides/environment/](docs/guides/environment/) for the latest guides. -そのため、Docker Compose を用いて開発環境を構築する方法が [RDM-osf.ioドキュメント](https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md) にて説明されています。 +環境設定と開発環境の最新ガイドは [docs/guides/environment/](docs/guides/environment/) に移動しました。 -Dockerを用いることで、OS等の環境の差異をコンテナにより吸収することができます。本ドキュメントでは [README-docker-compose.md](https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md) に補助的な説明を加えていきます。 - -# サービスの構成 - -`docker-compose.yml`に定義されているサービスは以下の通りです。 - -![Docker Compose](images/docker-compose.png) - -(Generated by https://github.com/pmsipilot/docker-compose-viz) - -図中の円はポート番号, 矩形はサービスを示しています。 -サービスは大きく分けて以下の5種類に分類できます。(括弧はインストールされるRCOSDP内リポジトリ) - -* データ保存・共有サービス: postgres, elasticsearch, elasticsearch6, rabbitmq, mongo -* 基本サービス: web, api, admin, worker ([RDM-osf.io](https://github.com/RCOSDP/RDM-osf.io/)), wb, wb_worker ([RDM-waterbutler](https://github.com/RCOSDP/RDM-waterbutler/)) -* UIサービス: ember_osf_web ([RDM-ember-osf-web](https://github.com/RCOSDP/RDM-ember-osf-web)), mfr ([RDM-modular-file-renderer](https://github.com/RCOSDP/RDM-modular-file-renderer)), unoconv, registries, preprints, reviews, sharejs -* テスト用認証サービス: fakecas -* ユーティリティサービス: requirements ([RDM-osf.io](https://github.com/RCOSDP/RDM-osf.io/)), mfr_requirements ([RDM-modular-file-renderer](https://github.com/RCOSDP/RDM-modular-file-renderer)), wb_requirements ([RDM-waterbutler](https://github.com/RCOSDP/RDM-waterbutler/)), assets, admin_assets ([RDM-osf.io](https://github.com/RCOSDP/RDM-osf.io/)) - -> GRDMでは preprints, registries は使用しません。 - -# 基本的な流れ - -1. DockerとOSのセットアップ - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#docker-and-os-setup - * Docker Composeを利用可能にするためにDocker Engineを自身の環境にインストールします。 - * RDMのサービス同士が互いに通信できるように、ループバックデバイスとして `192.168.168.167` を設定します。 - * ※注意: OSX ならびに Ubuntu については動作実績がありますが、Windows については動作が確認されていません。 -2. アプリケーションの設定 - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#application-configuration - * WebサーバとAPIサーバに関する、Djangoの設定ファイル `local.py` を準備します。特に変更の必要がなければ、それぞれの `local-dist.py` をコピーして使用します。 - * RDM-osf.io, RDM-waterbutlerリポジトリを使用するよう、Docker Composeサービス定義ファイルを変更します。`docker-compose.yml` を直接変更するのではなく、 `docker-compose.override.yml` を変更することで、誤って開発環境固有の情報をリポジトリにコミットすることを防止することができます。 -3. アプリケーションの実行 - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#application-runtime - * このDocker Compose環境は、Dockerイメージをベースに各サービスを起動しますが、PythonモジュールやNodeモジュールはイメージとは異なるボリュームに保持します。(開発中に更新される可能性を想定しているものと思われます。) そのため、サービス実行前に `docker compose up requirements mfr_requirements wb_requirements` を実施することで、必要なライブラリを各コンテナにインストールする必要があります。 -4. ツールの利用 - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#running-arbitrary-commands - * DjangoのMigrationファイルの作成や、RDMが保持するModelの確認、テストの実行など、Docker Compose経由でコマンドを実行することで、容易にこれらのコマンドを実行できます。 -5. 環境のリセット - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#cleanup--docker-reset - * Dockerを使うことで得られる恩恵の1つは、開発環境をいつでもリセットできるという点です。開発時の試行錯誤の副作用の蓄積を簡単にリセットし、動作確認を確実に行うことができます。 - -# 開発環境のカスタマイズ - -初期状態では `docker-compose.yml` は `quay.io/centerforopenscience/` からイメージを取得するようになっています。 - -GakuNin RDMの最新Docker Imageをベースに開発を行うには、これらのイメージを差し替える必要があります。以下の内容を `docker-compose.override.yml` に記述してください。 -(`docker-compose.yml` と同じディレクトリに作成してください。) - -``` -# Apple Silicon搭載Macの場合、platform指定のコメントアウト部分を外してARM版イメージを使用してください。 -services: - fakecas: - image: niicloudoperation/rdm-fakecas:latest - # platform: linux/arm64 - # Apple Silicon搭載Macの場合、以下のコメントアウト部分を外してARM版Elasticsearchイメージを使用してください。 - # elasticsearch: - # image: quay.io/centerforopenscience/elasticsearch:es6-arm-6.3.1 - # platform: linux/arm64 - admin: - image: niicloudoperation/rdm-osf.io:latest - # platform: linux/arm64 - environment: - AWS_EC2_METADATA_DISABLED: "true" - admin_assets: - image: niicloudoperation/rdm-osf.io:latest - # platform: linux/arm64 - api: - image: niicloudoperation/rdm-osf.io:latest - # platform: linux/arm64 - assets: - image: niicloudoperation/rdm-osf.io:latest - # platform: linux/arm64 - requirements: - image: niicloudoperation/rdm-osf.io:latest - # platform: linux/arm64 - command: - - /bin/bash - - -c - - apk add --no-cache --virtual .build-deps build-base linux-headers python3-dev musl-dev libxml2-dev libxslt-dev postgresql-dev libffi-dev libpng-dev freetype-dev jpeg-dev && - invoke requirements --all && - (python3 -m compileall /usr/lib/python3.6 || true) && - rm -Rf /python3.6/* && - cp -Rf -p /usr/lib/python3.6 / - web: - image: niicloudoperation/rdm-osf.io:latest - # platform: linux/arm64 - environment: - OAUTHLIB_INSECURE_TRANSPORT: '1' - # macOS 15.1.1以降の場合、5000ポートが使用されている場合があります。その場合は以下のコメントアウトをはずしてポートを変更してください。 - # また、 `.docker-compose.env`, `.docker-compose.mfr.env`, `.docker-compose.wb.env` のポート指定 `:5000` にも同様の - # 変更を行ってください。 - # ports: !override - # - 5001:5000 - worker: - image: niicloudoperation/rdm-osf.io:latest - # platform: linux/arm64 - ember_osf_web: - image: niicloudoperation/rdm-ember-osf-web:latest - # platform: linux/amd64 - cas: - image: niicloudoperation/rdm-cas-overlay:latest - # platform: linux/amd64 - mfr: - image: niicloudoperation/rdm-modular-file-renderer:latest - # platform: linux/amd64 - # ローカルのRDM-modular-file-rendererを試したい場合 - # volumes: - # - ../RDM-modular-file-renderer:/code - mfr_requirements: - image: niicloudoperation/rdm-modular-file-renderer:latest - # platform: linux/amd64 - # ローカルのRDM-modular-file-rendererを試したい場合 - # volumes: - # - ../RDM-modular-file-renderer:/code - wb: - image: niicloudoperation/rdm-waterbutler:latest - # platform: linux/arm64 - # ローカルのRDM-waterbutlerを試したい場合 - # volumes: - # - ../RDM-waterbutler:/code - wb_worker: - image: niicloudoperation/rdm-waterbutler:latest - # platform: linux/arm64 - # ローカルのRDM-waterbutlerを試したい場合 - # volumes: - # - ../RDM-waterbutler:/code - wb_requirements: - image: niicloudoperation/rdm-waterbutler:latest - # platform: linux/arm64 - # ローカルのRDM-waterbutlerを試したい場合 - # volumes: - # - ../RDM-waterbutler:/code -``` - - -Apple Silicon搭載Macの場合、`docker-compose.yml`のelasticsearchの制限に関するコメントアウト部分を外してください。 -Elasticsearch は並列分散処理ができるクラスタ設計されており、複数ノードでの連携を前提としています。開発環境のような単一ノードでの利用の場合はクラスタ機能を使う必要がないため、この設定を行うことで「シングルノードモード」で動作させるように指定します。またElasticsearch は起動時に「bootstrap チェック」という一連のシステム環境の検証を行います。その一部に system call filter の設定確認が含まれており、これはセキュリティ向上のために OS レベルの制限(システムコールのフィルタリング)を利用する機能です。しかし、Docker や他のコンテナ環境ではこのチェックが原因で起動エラーとなることがあります。 -ホスト側のデフォルトのulimit値がアプリケーションの要件を満たさない場合があるため、コンテナ内でのリソース制限を明示的に解除します。 - - -``` - elasticsearch: - image: elasticsearch:2 - ports: - - 9200:9200 - volumes: - - elasticsearch_data_vol:/usr/share/elasticsearch/data -# environment: -# - "ES_JAVA_OPTS=-Des.bootstrap.system_call_filter=false" -# ulimits: -# memlock: -# soft: -1 -# hard: -1 - stdin_open: true - - # Temporary: Remove when we've upgraded to ES6 - elasticsearch6: - image: docker.elastic.co/elasticsearch/elasticsearch:6.3.1 - ports: - - 9201:9200 - volumes: - - elasticsearch6_data_vol:/usr/share/elasticsearch/data - # environment: - # - "discovery.type=single-node" - # - "ES_JAVA_OPTS=-Des.bootstrap.system_call_filter=false" - # ulimits: - # memlock: - # soft: -1 - # hard: -1 - stdin_open: true -``` - -# 開発環境でRDMを起動する - -## サービスを起動する - -[Quickstart: Running all OSF services in the background](https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#quickstart-running-all-osf-services-in-the-background) に示されているように、以下のコマンドでサービスを実行することができます。 - -``` -# ライブラリのインストール - 初回/ライブラリ定義変更時だけ必要 -$ docker compose up requirements mfr_requirements wb_requirements -# DBのマイグレーション - 初回/DB定義変更時だけ必要 -$ docker compose run --rm web python3 manage.py migrate - -$ docker compose up -d assets admin_assets mfr wb wb_worker fakecas sharejs worker web api admin ember_osf_web -``` - -> https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md では preprints, registries の起動について紹介していますが、GRDMでは preprints, registries は提供しないため無視してください。 - -### シンプルな構成で起動する - -動作確認したい内容に応じて、 mfr, admin_assets, admin, sharejs を除外することもできます。 -例えば、fakecasで認証し、プロジェクト作成、ファイル管理を確認したいだけであれば、 - -``` -# ライブラリのインストール - 初回/ライブラリ定義変更時だけ必要 -$ docker compose up requirements wb_requirements -# DBのマイグレーション - 初回/DB定義変更時だけ必要 -$ docker compose run --rm web python3 manage.py migrate - -$ docker compose up -d assets wb wb_worker fakecas worker web api ember_osf_web -``` - -でも十分でしょう。`docker compose ps`で異常終了しているサービスがいないことを確認します。 -`docker compose ps`の出力例は以下の通りです。`docker compose up -d`で指定したサービスが`Up`であることを確認します。 - -``` -$ docker compose ps - Name Command State Ports -------------------------------------------------------------------------------------------------------------------------------------------------------------------- -rdm2-osfio_api_1 docker-entrypoint.sh invok ... Up 0.0.0.0:8000->8000/tcp -rdm2-osfio_assets_1 docker-entrypoint.sh invok ... Up -rdm2-osfio_elasticsearch_1 /docker-entrypoint.sh elas ... Up 0.0.0.0:9200->9200/tcp, 9300/tcp -rdm2-osfio_ember_osf_web_1 docker-entrypoint.sh /bin/ ... Up 0.0.0.0:41953->41953/tcp, 0.0.0.0:4200->4200/tcp -rdm2-osfio_fakecas_1 fakecas -host=0.0.0.0:8080 ... Up 0.0.0.0:8080->8080/tcp -rdm2-osfio_postgres_1 docker-entrypoint.sh /bin/ ... Up 0.0.0.0:5432->5432/tcp -rdm2-osfio_rabbitmq_1 docker-entrypoint.sh rabbi ... Up 15671/tcp, 0.0.0.0:15672->15672/tcp, 25672/tcp, 4369/tcp, 5671/tcp, 0.0.0.0:5672->5672/tcp -rdm2-osfio_requirements_1 docker-entrypoint.sh /bin/ ... Exit 0 -rdm2-osfio_wb_1 invoke server Up 0.0.0.0:7777->7777/tcp -rdm2-osfio_wb_requirements_1 /bin/bash -c invoke instal ... Exit 0 -rdm2-osfio_wb_worker_1 invoke celery Up 7777/tcp -rdm2-osfio_web_1 docker-entrypoint.sh invok ... Up 0.0.0.0:5000->5000/tcp -rdm2-osfio_worker_1 docker-entrypoint.sh invok ... Up - -``` - -### cas-overlayを含む構成で起動する - -fakecasは手軽にRDMの動作確認を行えますが、OAuthの動作確認などはできません。OAuthを用いたアプリケーションの開発時には、fakecasではなくcas-overlayを使ったテストが必要になります。このような場合、以下のようにfakecasの代わりに cas サービスを起動します。 - -``` -# ライブラリのインストール - 初回/ライブラリ定義変更時だけ必要 -$ docker compose up requirements wb_requirements -# DBのマイグレーション - 初回/DB定義変更時だけ必要 -$ docker compose run --rm web python3 manage.py migrate - -# fakecasではなくcasをサービスに指定する -$ docker compose up -d assets wb wb_worker cas worker web api ember_osf_web - -# OAuthのスコープを登録する -$ docker compose run --rm web python3 -m scripts.register_oauth_scopes -``` - -casはfakecasとは異なり、ログイン時に ユーザ作成手順(後述) において入力したパスワードが必要になります。他の操作方法はfakecasと同様です。 - -## Web UIを開く - -サービスが起動したことを確認したら、 `http://localhost:5000` にアクセスし動作を確認してみましょう。 - -ログは `docker compose logs` コマンドで確認できます。ember_osf_webコンテナは起動にある程度時間がかかりますが、この状態を確認するには、以下のコマンドを入力します。 - -``` -$ docker compose logs -f ember_osf_web -... -Build successful (xxxxxms) – Serving on http://0.0.0.0:4200/ -``` - -## テスト用ユーザを作成する - -`http://localhost:5000` が正常に参照できたら、`Sign Up`を行いましょう。以下の手順で行います。 - -1. `Sign Up`ボタンを押し、ユーザ登録画面を開く -1. ユーザ登録画面に適当なユーザ名、Eメールアドレスとパスワードを入力する -1. デバッグログにEメール到達確認用のURL(`http://localhost:5000/confirm/xxxxx/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/`)が出力されるので、 `docker compose logs web` で確認する - - > 本番環境の場合はここでEメールアドレス宛に到達確認用のURLを含むメールが届きますが、SMTPサーバを指定していないのでメールは送信されません。 - -1. 到達確認用のURLをブラウザでアクセスする - -> ブラウザはFirefoxを使用してください。Chromeの場合は、FakeCASとWeb UIの間でCookieが共有されず正常動作しない場合があります。 - -## 動作確認を実施する - -これでユーザの作成は完了です。以降は、ログイン画面から、登録したEメールアドレスのみでログインできます。(開発用途に限定して利用してください。) - -# コマンドの実行例 - -## ユニットテストを実行する - -全てのユニットテストを実行するには、以下のようにコマンドを入力します。 -`requirements` サービスによりテストに必要なライブラリがインストールされ、`invoke test`でテストが実行できます。 - -``` -# 初回だけ必要 -$ docker compose up requirements - -$ docker compose run --rm web invoke test -``` - -テストコードを限定する方法は https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#application-tests に記載されています。 - -## Migrationファイルを作成する - -RDM-osf.ioはDjangoアプリケーションとして実装されています。モデルの変更を行った場合、適切にデータベーススキーマに変更が反映されるよう、Migrationsファイルを作成する必要があります。 -以下のコマンドを入力することで、Djangoの管理コマンド `makemigrations` を実行できます。 - -``` -$ docker compose run --rm web python3 manage.py makemigrations -``` - -作成したMigrationsファイルは、以下のコマンドで `postgres`サービスに反映できます。 - -``` -$ docker compose run --rm web python3 manage.py migrate -``` - -## ユーザを機関に所属させる - -機関に関する機能を試すためには、ユーザを機関に所属させる必要があります。 -このような場合は、以下の手順を実施してください。 - -まず、実行中のRDMのデータベースに機関の情報を登録します。これは初回だけ必要です。 - -``` -$ docker compose run --rm web python3 -m scripts.populate_institutions -e test -a -``` - -上記のコマンドを実行すると、`Virginia Tech [Test]` などの機関名を持つ機関が登録されます。 - -次に、shell機能を使って、ユーザに機関を紐付けます。以下のコマンドを実行します。 - -``` -$ docker compose run --rm web invoke shell -``` - -上記コマンドを実行すると、以下のようなプロンプトが現れますので、Pythonスクリプトで処理を指示します。下記のようにスクリプトを実行すると、指定したEmailアドレスを持つユーザのモデルを取得することができます。 - -``` -In[1]: user = OSFUser.objects.get(username='登録したEmailアドレス') - -In [2]: user -Out[2]: -``` - -ユーザが所属する機関のリストは、`user.affiliated_institutions`で管理されます。このリストに、先に登録した機関に対応する`Institution`オブジェクトを追加すると、ユーザを機関に所属させることができます。 - -``` -# 機関名は例えば Virginia Tech [Test] 等: [i.name for i in Institution.objects.all()] で確認できる -In [4]: user.affiliated_institutions.add(Institution.objects.get(name='機関名')) -``` - -変数を編集したら、モデルに対して`save`メソッドを呼び出し、`commit`も忘れないようにしておきましょう。 - -``` -In [5]: user.save() - -In [6]: commit() -Transaction committed. -New transaction opened. -``` - -これでユーザを機関に所属させることができました。試しに、New Projectから新規プロジェクトの作成を実施してみましょう。所属のところに、Institutionで指定した機関が表示されます。 - -![Institution](images/institution.png) - -## adminアクセス可能なユーザへと変更する - -管理者機能は `http://localhost:8001/` からアクセスすることができます。 -ユーザがadminアクセス可能かどうかは `is_staff` プロパティで定義することができます。 - -`is_staff`の編集には、shell機能を使います。 - -``` -$ docker compose run --rm web invoke shell -``` - -shellから以下のようにコマンドを実行することで、指定したユーザの `is_staff` プロパティを変更することができます。 - -``` -In[1]: user = OSFUser.objects.get(username='登録したEmailアドレス') - -In [2]: user -Out[2]: - -In [3]: user.is_staff = True - -In [4]: user.save() - -In [5]: commit() -Transaction committed. -New transaction opened. -``` +- [ Guides index](docs/guides/README.md) / ガイド一覧 +- [ SPEC-06 Documentation Conventions](docs/spec/06_documentation_conventions.md) / 文書規約 diff --git a/README.md b/README.md index 4be241e..b65a5fc 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,223 @@ -# RDM-developer-guide +# RDM-developer-guide — GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 -GakuNin RDM developer guide +> **Summary:** Developer guide for the GakuNin RDM 2027 environment, including specifications, decisions, policies, guides, and status +> **概要:** GakuNin RDM 2027 開発環境の開発者ガイド。仕様、決定、方針、ガイド、進捗を含みます + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-10. **Learned:** a decision index goes stale one record at a time, so each new ADR is added to the root list in the same commit (ADR-08). / 決定の索引は一件ずつ古くなるので、新しい ADR は同じコミットでルートの一覧に加える(ADR-08)。 +- Version / 版: 0.2 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.1 — 2026-11-05 +- Normative for: `README.md` +- Related: [SPEC-06 Documentation Conventions](docs/spec/06_documentation_conventions.md) · [POL-01 Position](docs/policy/POL-01_Developer_Environment_2027_Position.md) + +--- + + +## English + +[→ 日本語版へ](#japanese) + +### 🚀 Quick start + +> Available from milestone M2. + +1. `git clone https://github.com/.../RDM-developer-guide.git` +2. `./installer/install.sh --yes` +3. Open http://127.0.0.1:5000 in your browser + +### 🧭 Map + +```mermaid +graph TD + subgraph docs[docs/] + spec[specs/] + decisions[decisions/] + policy[policy/] + reference[reference/] + guides[guides/] + status[status/] + end + + subgraph manifest[manifest/] + upstreams[upstreams.*] + end + + subgraph installer[installer/] + install[install.sh] + grdm_dev[grdm_dev/] + end + + subgraph site[site/] + index[index.html] + end + + docs --> manifest + docs --> installer + docs --> site +``` + +### 📚 Documents + +- [Documentation index](docs/README.md) - every document, by folder +- [Manifest](manifest/README.md) - what the installer builds (names and pinned SHAs) + +#### Specifications / 仕様 + +- [SPEC-00 Overview](docs/spec/00_overview.md) - Overview / 概要 +- [SPEC-01 Manifest](docs/spec/01_manifest.md) - Manifest format / マニフェスト形式 +- [SPEC-02 Installer CLI](docs/spec/02_installer_cli.md) - Installer command / インストーラー CLI +- [SPEC-03 Security Gate](docs/spec/03_security_gate.md) - Security gate (the checkpoint a build must pass before anyone may use it; see [REF-01](docs/reference/REF-01_Glossary.md)) / セキュリティゲート +- [SPEC-04 Acceptance Tests](docs/spec/04_acceptance_tests.md) - Acceptance tests / 受け入れ試験 +- [SPEC-05 Upstream Tracking](docs/spec/05_upstream_tracking.md) - Upstream tracking (Upstream: the original place our copies come from; see [REF-01](docs/reference/REF-01_Glossary.md)) / アップストリーム追跡 +- [SPEC-06 Documentation Conventions](docs/spec/06_documentation_conventions.md) - Documentation conventions / 文書規約 + +#### Policies & Decisions / 方針と決定 + +Each record explains one choice. Repository (a folder that remembers every change; see [REF-01](docs/reference/REF-01_Glossary.md)) placement comes first, then the network model, the staged security gate, the autonomy of AI agents, and the test IdP (the server where you log in; see [REF-01](docs/reference/REF-01_Glossary.md)) that stands in for a Shibboleth (the software that lets you log in once with your university account; see [REF-01](docs/reference/REF-01_Glossary.md)) login. + +- [POL-01 Position](docs/policy/POL-01_Developer_Environment_2027_Position.md) - Developer environment position / 開発環境の位置づけ +- [ADR-01 Integration Repository Placement](docs/decisions/ADR-01_Integration_Repository_Placement.md) - Integration repository / 統合リポジトリ配置 +- [ADR-02 Network Model](docs/decisions/ADR-02_Network_Model.md) - Network model / ネットワークモデル +- [ADR-03 Staged Security Gate](docs/decisions/ADR-03_Staged_Security_Gate.md) - Staged security gate / 階段式セキュリティゲート +- [ADR-04 AI Autonomy and Roles](docs/decisions/ADR-04_AI_Autonomy_and_Roles.md) - AI autonomy and roles / AI 自律性と役割 +- [ADR-05 Test IdP for Shibboleth](docs/decisions/ADR-05_Test_IdP_for_Shibboleth.md) - Test IdP for Shibboleth / Shibboleth 用テスト IdP +- [ADR-06 Wiki Frontend Overlay](docs/decisions/ADR-06_Wiki_Frontend_Overlay.md) - Wiki frontend overlay / Wiki フロントエンドのオーバーレイ +- [ADR-07 Native Builds of EOL Middleware](docs/decisions/ADR-07_Native_Builds_of_EOL_Middleware.md) - Native builds of EOL middleware / EOL ミドルウェアのネイティブビルド +- [ADR-08 Per-OS Installer Entry Points](docs/decisions/ADR-08_Per_OS_Installer_Entry_Points.md) - Per-OS installer entry points / OS ごとのインストーラーの入口 + +#### References / 参考資料 + +- [REF-01 Glossary](docs/reference/REF-01_Glossary.md) - Glossary / 用語集 + +#### Guides / ガイド + +- [Guides index](docs/guides/README.md) - Guides for addon development and environment setup / アドオン開発と環境セットアップのガイド + +#### Status / 進捗状況 + +- [Status](docs/status/README.md) - Project status and milestones / プロジェクト進捗とマイルストーン + +### 🛡️ Security + +This public repository contains only documentation, manifest, and installer code. Integration code is in the private RDM--dev2027 repository. A staged security gate is applied before code reaches production (see [SPEC-03 Security Gate](docs/spec/03_security_gate.md)). + +### 🌐 HTML version + +The human-readable HTML version lives at [site/index.html](site/index.html) (entry page: [index.html](index.html)). It is generated from `docs/` by MkDocs (a tool that turns Markdown files into a website; see [REF-01](docs/reference/REF-01_Glossary.md)) through `grdm-dev docs build` (see [SPEC-02](docs/spec/02_installer_cli.md)); do not edit `site/` by hand. + +### License + +MIT License — See [LICENSE](LICENSE) for details. + +--- + + +## 日本語 + +[→ To English](#english) + +### 🚀 クイックスタート + +> M2 マイルストーンから利用可能。 + +1. `git clone https://github.com/.../RDM-developer-guide.git` +2. `./installer/install.sh --yes` +3. ブラウザで http://127.0.0.1:5000 を開く + +### 🧭 地図 + +```mermaid +graph TD + subgraph docs[docs/] + spec[specs/] + decisions[decisions/] + policy[policy/] + reference[reference/] + guides[guides/] + status[status/] + end + + subgraph manifest[manifest/] + upstreams[upstreams.*] + end + + subgraph installer[installer/] + install[install.sh] + grdm_dev[grdm_dev/] + end + + subgraph site[site/] + index[index.html] + end + + docs --> manifest + docs --> installer + docs --> site +``` + +### 📚 文書 + +- [文書の索引](docs/README.md) - フォルダごとの全文書 +- [マニフェスト](manifest/README.md) - インストーラーが組み立てる対象(名前と固定 SHA) + +#### 仕様 + +- [SPEC-00 概要](docs/spec/00_overview.md) - Overview / 概要 +- [SPEC-01 マニフェスト](docs/spec/01_manifest.md) - Manifest format / マニフェスト形式 +- [SPEC-02 インストーラー CLI](docs/spec/02_installer_cli.md) - Installer command / インストーラー CLI +- [SPEC-03 セキュリティゲート](docs/spec/03_security_gate.md) - Security gate / セキュリティゲート(導入が必ず通る検問所。[REF-01](docs/reference/REF-01_Glossary.md)) +- [SPEC-04 受け入れ試験](docs/spec/04_acceptance_tests.md) - Acceptance tests / 受け入れ試験 +- [SPEC-05 アップストリーム追跡](docs/spec/05_upstream_tracking.md) - Upstream tracking / アップストリーム追跡(上流=写しの元の場所。[REF-01](docs/reference/REF-01_Glossary.md)) +- [SPEC-06 文書規約](docs/spec/06_documentation_conventions.md) - Documentation conventions / 文書規約 + +#### 方針と決定 + +各記録は一つの選択を説明します。まずリポジトリ(変更を全部覚えているフォルダ。[REF-01](docs/reference/REF-01_Glossary.md))の置き場、次にネットワークモデル、段階的なセキュリティゲート、AI エージェントの自律性、そして Shibboleth(大学のアカウントで一度ログインすれば済むようにするソフト。[REF-01](docs/reference/REF-01_Glossary.md))ログインの代わりを務めるテスト IdP(ログインする場所のサーバ。[REF-01](docs/reference/REF-01_Glossary.md))です。 + +- [POL-01 開発環境の位置づけ](docs/policy/POL-01_Developer_Environment_2027_Position.md) - Developer environment position / 開発環境の位置づけ +- [ADR-01 統合リポジトリ配置](docs/decisions/ADR-01_Integration_Repository_Placement.md) - Integration repository / 統合リポジトリ配置 +- [ADR-02 ネットワークモデル](docs/decisions/ADR-02_Network_Model.md) - Network model / ネットワークモデル +- [ADR-03 階段式セキュリティゲート](docs/decisions/ADR-03_Staged_Security_Gate.md) - Staged security gate / 階段式セキュリティゲート +- [ADR-04 AI 自律性と役割](docs/decisions/ADR-04_AI_Autonomy_and_Roles.md) - AI autonomy and roles / AI 自律性と役割 +- [ADR-05 Shibboleth 用テスト IdP](docs/decisions/ADR-05_Test_IdP_for_Shibboleth.md) - Test IdP for Shibboleth / Shibboleth 用テスト IdP +- [ADR-06 Wiki フロントエンドのオーバーレイ](docs/decisions/ADR-06_Wiki_Frontend_Overlay.md) - Wiki frontend overlay / Wiki フロントエンドのオーバーレイ +- [ADR-07 EOL ミドルウェアのネイティブビルド](docs/decisions/ADR-07_Native_Builds_of_EOL_Middleware.md) - Native builds of EOL middleware / EOL ミドルウェアのネイティブビルド +- [ADR-08 OS ごとのインストーラーの入口](docs/decisions/ADR-08_Per_OS_Installer_Entry_Points.md) - Per-OS installer entry points / OS ごとのインストーラーの入口 + +#### 参考資料 + +- [REF-01 用語集](docs/reference/REF-01_Glossary.md) - Glossary / 用語集 + +#### ガイド + +- [ガイド一覧](docs/guides/README.md) - Guides for addon development and environment setup / アドオン開発と環境セットアップのガイド + +#### 進捗状況 + +- [進捗](docs/status/README.md) - Project status and milestones / プロジェクト進捗とマイルストーン + +### 🛡️ セキュリティ + +このパブリックリポジトリにはドキュメント、マニフェスト、インストーラーコードのみが含まれます。統合コードは非公開の RDM--dev2027 リポジトリにあります。本番環境にコードが到達する前に段階的なセキュリティゲートが適用されます([SPEC-03 セキュリティゲート](docs/spec/03_security_gate.md) 参照)。 + +### 🌐 HTML バージョン + +人が読む HTML 版は [site/index.html](site/index.html)(入口ページは [index.html](index.html))にあります。`docs/` から MkDocs(Markdown のファイルを Web サイトに変える道具。[REF-01](docs/reference/REF-01_Glossary.md))が `grdm-dev docs build` で生成します([SPEC-02](docs/spec/02_installer_cli.md))。`site/` を手で編集しないでください。 + +### ライセンス + +MIT License — 詳細は [LICENSE](LICENSE) を参照。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| repository | A folder that stores code, documents, and configuration. | コードや文書、設定を保管するフォルダ。 | +| branch | A separate version of the code that can be developed independently. | コードの独立して開発できる別のバージョン。 | +| installer | A program that prepares other programs so they can run. | 他のプログラムを実行可能にするための準備をするプログラム。 | +| manifest | A list that says exactly which version of each source repository we use. | 使用する各ソースリポジトリのバージョンを正確に示すリスト。 | +| MkDocs | A tool that turns Markdown files into a website. | Markdown のファイルを Web サイトに変える道具。 | -* [開発環境の準備](Environment.md) -* [スケルトンの作成](Skelton/README.md) -* [ストレージアドオンの作成](StorageAddon/README.md) -* [画面拡張アドオンの作成](ScreenExpansion/README.md) -* [APIの利用](APIGuide/README.md) -* [機関管理機能が有効なアドオンの作成](AdminRDMAddonGuide/README.md) -* [EC2での開発環境の準備](SetupOsfOnEC2.md) diff --git a/ScreenExpansion/README.md b/ScreenExpansion/README.md index 8fd4c93..087e3a3 100644 --- a/ScreenExpansion/README.md +++ b/ScreenExpansion/README.md @@ -1,709 +1,8 @@ -# 画面拡張アドオンの作成 +# Screen Expansion Addon / 画面拡張アドオン -以下の機能を持つ画面拡張アドオンを実装します。 +Moved to [docs/guides/screen-expansion/](../docs/guides/screen-expansion/) for the latest guides. -- プロジェクトダッシュボード上のアドオンのウィジェッド -- プロジェクトのナビゲーションバーから遷移できるアドオンの画面タブ(Emberを利用) +画面拡張アドオンの最新ガイドは [docs/guides/screen-expansion/](../docs/guides/screen-expansion/) に移動しました。 -基本的なアドオンの概要は[スケルトンの作成](../Skelton/README.md)を参照してください。 - -## 前提条件 - -[開発環境の準備](../Environment.md#開発環境でRDMを起動する)のガイドに従い、開発環境にてRDMを起動しているものとします。 - -# 画面拡張アドオンの設計 - -## サービスの構成 - -画面拡張アドオンは以下の2つの要素から構成されます。 - -- OSF.ioサービスで動作するAddon: ユーザ・プロジェクト設定の管理 -- ember-osf-webサービスで動作する画面タブモジュール: 画面タブのView定義 - -ember-osf-webは、 [Ember.js](https://www.emberjs.com) をベースとしたOSFのフロントエンドUIの実装です。もともと、OSF.ioがフロントエンドも担当していましたが、COSはEmber.jsベースのコードに移行を進めています。 - -現在はosf-web(OSF.io)が外部からのリクエストを受け、要求されたエンドポイントをember-osf-webがサポートしていると判断される場合は、osf-webがember-osf-webに対してリクエストを転送する形式を取っています。実際のデータベースに対する操作は、従来のosf-api(OSF.io apiserver)が担います。ember-osf関連のフロントエンドは、必要に応じてAPIサーバへの問い合わせを行うことで、データベースに対する変更やストレージに対する操作を実施することができます。 - -## ファイルの構成 - -典型的なファイル配置は以下のようになります。 - -### OSF.io Addonのファイル構成 - -> クラス構成はスケルトン アドオンと同様です。 - -``` -/addons/アドオン名/ -├── __init__.py ... モジュールの定義 -├── apps.py ... (**) アプリケーションの定義 -├── models.py ... モデルの定義 -├── requirements.txt ... 利用するPythonモジュールの定義 -├── routes.py ... (**) View(Routes)の定義 -├── settings ... 設定を定義するモジュール -│ ├── defaults.py ... デフォルト設定の定義 -│ └── __init__.py ... 設定の定義 -├── static ... Webブラウザから読み込むことを想定した静的ファイル -│   ├── comicon.png ... アドオンのアイコン -│   ├── アドオン名.css ... (*) ウィジェットのCSSファイル -│   ├── node-cfg.js ... Node設定のエントリとなるJavaScriptファイル -│   └── widget-cfg.js ... (*) ウィジェットのJavaScriptファイル -├── templates ... テンプレートディレクトリ -│   └── node_settings.mako ... Node設定パネル -├── tests ... テストコード -│   ├── __init__.py -│   ├── conftest.py -│   ├── factories.py -│   ├── test_model.py -│   ├── (**) test_view.py -│   └── utils.py -├── utils.py ... (*) ユーティリティ関数の定義 -└── views.py ... (**) View(Views)の定義 -``` - -`(*)`が付いているファイルはスケルトン アドオンには存在しないファイルです。 -`(**)`が付いているファイルはスケルトン アドオンに存在しますが、変更が加えられているファイルです。 - -### ember-osf-web 画面タブのファイル構成 - -``` -app -├── guid-node/アドオン名 ... アドオンの画面タブモジュール定義 -│ ├── controller.ts ... 画面タブのコントローラ定義 -│ ├── route.ts ... 画面タブのルーティング定義 -│ ├── styles.scss ... 画面タブのCSS(SCSS)定義 -│ └── template.hbs ... 画面タブのテンプレートファイル -├── models/モデル名.ts ... 画面タブで使うモデル定義 -├── adapters/モデル名.ts ... 画面タブで使うモデルのアダプタ定義 -└── serializers/モデル名.ts ... 画面タブで使うモデルのシリアライザ定義 - -tests ... テストコード -├── acceptance/guid-node/アドオン名-test.ts -└── unit/guid-node/アドオン名/controller-test.ts - -mirage ... アダプタ接続先APIのテスト用モック定義 -├── factories/モデル名.ts -└── views/モデル名.ts -``` - -## OSF.io Addonのモジュール構成 - -スケルトン アドオンと大きな違いはありません。スケルトン アドオンとの違いを中心に説明していきます。 - -### Modelの構成 - -Modelの構成はスケルトン アドオンと同じです。 - -### Viewの構成 - -スケルトン アドオンのViewsおよびRoutesの定義に、画面タブ用の定義を追加します。 - -画面タブでアドオンのデータをやり取りするには、ember-osf-webに新しくモデルを定義し、そのモデルに対応するJSON APIをOSF.io側に定義する必要があります。 -データは以下のような [JSON:API](https://jsonapi.org/) で定められたフォーマットでやり取りします。 - -``` -{ - "data": { - "id": nodeのID - "type": "モデル名", - "attributes": データのDictionary - } -} -``` - -My Screenアドオンの場合、以下のようにRoutesとViewsを定義します。 - -- [routes.py](osf.io/addon/routes.py) -- [views.py](osf.io/addon/views.py) - -### フレームワークによって提供されるView - -アドオンのウィジェット定義を追加します。 - -ウィジェットテンプレートは [website/templates/util/render_addon_widget.mako](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/templates/util/render_addon_widget.mako) に定義します。 -ウィジェットテンプレートの設定は [website/project/views/node.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/project/views/node.py) に定義します。 - -ウィジェットで使うJavaScriptは `/addons/アドオン名/static/widget-cfg.js` で、CSSは `/addons/アドオン名/static/アドオン名.css` で定義します。CSSはJavaScriptファイルから `require()` を使って読み込みます。 - -My Screenアドオンの場合、以下のように定義します。 - -- [render_addon_widget.mako](osf.io/website/templates/util/render_addon_widget.mako) -- [node.py](osf.io/website/project/views/node.py) -- [widget-cfg.js](osf.io/addon/static/widget-cfg.js) -- [myscreen.css](osf.io/addon/static/myscreen.css) - -### 国際化 - -国際化の設定は [website/translations/](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/translations/) 以下のファイルに、以下のように定義します。 - -``` -msgid メッセージID -msgstr 国際化後の文字列 -``` - -`*.pot` ファイルには `msgstr` を `""` (空文字)にして定義します。 -`messages.*` にはmakoのテンプレートファイルで使う国際化設定を、 `js_messages.*` にはJavaScriptで使う国際化設定を定義します。 - -JavaScriptで文字列を国際化するのは、以下のように書きます。 - -``` -var _ = require('js/rdmGettext')._; -const localizedStr = _('メッセージID'); -``` - -makoで文字列を国際化するのは、以下のように書きます。 - -``` -${_("メッセージID")} -``` - -### 設定モジュール - -設定モジュールはスケルトン アドオンと同じです。 - -### AddonAppConfigの定義 - -ウィジェットと画面タブを有効にするために、 `/addons/アドオン名/app.py` の `AddonAppConfig.views` に、`'widget'` と `'page'` を追加します。 - -``` -class AddonAppConfig(BaseAddonAppConfig): - # 中略 - views = ['widget', 'page'] - # 中略 -``` - -My Screenアドオンの場合、以下のように定義します。 - -- [apps.py](osf.io/addon/apps.py) - -### テストコード - -スケルトン アドオンと同様に、ユニットテストを定義します。 -My Screenアドオンの場合、以下のように定義します。 - -- [tests/](osf.io/addon/tests/) - -## ember-osf-web 画面タブのモジュール構成 - -ember-osf-webは [TypeScript](https://www.typescriptlang.org) によって実装されます。 -アプリケーションのコードは [app/](https://github.com/RCOSDP/RDM-ember-osf-web/blob/master/app/) に実装されます。 - -ember-osf-webは、OSFの画面を構成するページを単位としてモジュール分割されています。 - -### router.ts -[router.ts](https://github.com/RCOSDP/RDM-ember-osf-web/blob/master/app/router.ts) は、ページ全体を束ねるルーティング定義ファイルです。 - -例えば、 `/プロジェクトID/アドオン名` というパスを追加する場合は、 `Router.map` に渡す関数に以下を追加します。 - -``` -this.route('guid-node', { path: '--node/:guid' }, function() { - this.route('アドオン名'); -}); -``` - -このパスにリクエストが与えられると、 `app/guid-node/アドオン名` で定義されたページに処理が移行します。 - -### ページの実装 - -#### 画面の実装 -画面の実装は [Handlebars templating library](https://handlebarsjs.com/) を使用して、 `template.hbs` ファイルに定義します。 - -画面上の文字列は全て国際化を考慮し、 [translations/en-us.yml](https://github.com/RCOSDP/RDM-ember-osf-web/blob/master/translations/en-us.yml) に定義された値を埋め込む必要があります。 - -My Screenアドオンの場合、以下のように定義します。 - -- [template.hbs](ember-osf-web/app/guid-node/myscreen/template.hbs) -- [translations/en-us.yml](ember-osf-web/translations/en-us.yml) - -> [ボタン](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/lib/osf-components/addon/components/osf-button) や [DatePicker](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/lib/osf-components/addon/components/validated-input/date) 、 [ダイアログボックス](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/lib/osf-components/addon/components/osf-dialog) などは、別のコンポーネントとして定義することで再利用できるようになっています。 -> [lib/osf-components](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/lib/osf-components) のコードを確認して、コンポーネントを利用しましょう。 - -#### コントローラの定義 -画面に埋め込む変数やハンドラの制御はコントローラが担います。 -コントローラには `template.hbs` に埋め込まれる変数やイベントに対する処理を記述します。 - -My Screenアドオンの場合、以下のように定義します。 - -- [controller.ts](ember-osf-web/app/guid-node/myscreen/controller.ts) - -また、コントローラとバックエンドのやり取りは、Ember Dataが提供する [DS.Store](https://api.emberjs.com/ember-data/release/classes/Store) オブジェクトを経由して行われます。 -DS.Storeで操作可能なオブジェクトは [models](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/app/models) に定義され、 [adapters](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/app/adapters) に定義されたルールに基づき、APIサーバを介したオブジェクトの操作を行います。 - -なお、APIサーバは [JSON:API](https://jsonapi.org/) に則っていることを前提とすることで、adapterは細かなエンドポイント生成処理を定義することなく、APIサーバとの連携を実現することができます。 -エンドポイント生成処理をカスタマイズしたい場合は、 [serializers](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/app/serializers) に定義を追加します。 - -My Screenアドオンの場合、`myscreen-config` というmodelと、対応するadapterおよびserializerを以下のように定義します。 - -- [models/myscreen-config.ts](ember-osf-web/app/models/myscreen-config.ts) -- [adapters/myscreen-config.ts](ember-osf-web/app/adapters/myscreen-config.ts) -- [serializers/myscreen-config.ts](ember-osf-web/app/serializers/myscreen-config.ts) - -#### スタイルの定義 -スタイルは [Sass(SCSS)](https://sass-lang.com/) を使用して、 `styles.scss` ファイルに定義します。 -My Screenアドオンの場合、以下のように定義します。 - -- [styles.scss](ember-osf-web/app/guid-node/myscreen/styles.scss) - -#### ルーティングの定義 -モジュールに関する追加の経路定義を `route.ts` に定義します。 -My Screenアドオンの場合、以下のように定義します。 - -- [route.ts](ember-osf-web/app/guid-node/myscreen/route.ts) - -### テストコード - -テストコードは [tests/](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/tests/) に定義します。 -テストに使うAPIのモックは、 [Mirage](https://miragejs.com/) を使用して [mirage/](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/mirage/) に定義します。 - -My Screenアドオンの場合、以下のように定義します。 - -- [tests/](ember-osf-web/tests) -- [mirage/](ember-osf-web/mirage) - - -# My Screenアドオンの実装 - -ここでは、 `myscreen` という識別名のアドオンの実装を例に説明します。アドオンの完全名は `My Screen` とします。 - -アドオン名は様々な場所に埋め込まれています。アドオン名を変更したい場合は、以降で追加・変更するファイル名やコードの `myscreen` 、 `My Screen` 、 `MyScreen` という文字列を変更してください。 - -## OSF.ioへの実装 - -### addons.myscreen モジュールの定義 - -スケルトン アドオンと同様に、[アドオンの実装例(`osf.io/addon/`)](osf.io/addon/)を `addons/myscreen` ディレクトリにコピーします。 - -### RDMコードの変更 - -スケルトン アドオンと同様に、RDMのコードをいくつか変更します。 - -- [addons.json](https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons.json) - - 変更例のサンプル: [addons.json](osf.io/config/addons.json) -- [framework/addons/data/addons.json](https://github.com/RCOSDP/RDM-osf.io/blob/develop/framework/addons/data/addons.json) - - 変更例のサンプル: [addons.json](osf.io/config/framework/addons/data/addons.json) -- [Dockerfile](https://github.com/RCOSDP/RDM-osf.io/blob/develop/Dockerfile) - - 変更例のサンプル: [Dockerfile](osf.io/config/Dockerfile) -- [api/base/settings/defaults.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/api/base/settings/defaults.py) - - 変更例のサンプル: [defaults.py](osf.io/config/api/base/settings/defaults.py) - -#### ウィジェットテンプレートの変更 - -[website/templates/util/render_addon_widget.mako](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/templates/util/render_addon_widget.mako) に、ウィジェットのテンプレート定義を追加します。 - -``` -% if addon_name == 'myscreen': -
- -
${_("Loading")}
- - -
${_("Error occurred")}
- - -
${_("My Screen Test")}
-
- -

-
- -
-% endif -``` - -[website/project/views/node.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/project/views/node.py) の `view_project()` 関数に、My Screenアドオンのウィジェットデータを読み込むコードを追加します。 - -``` -def view_project(auth, node, **kwargs): - # 中略 - addons_widget_data = { - # 中略 - 'myscreen': None - } - - if 'myscreen' in ret['addons']: - addons_widget_data['myscreen'] = serialize_myscreen_widget(node) - # 中略 -``` - -それぞれの変更例は、サンプル [render_addon_widget.mako](osf.io/website/templates/util/render_addon_widget.mako) と [node.py](osf.io/website/project/views/node.py) を参照してください。 - -#### 国際化ファイルの変更 - -[website/translations/](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/translations/) 以下の各国際化ファイルに、アドオンで表示する文字列の国際化設定を追加します。 - -`website/translations/messages.pot` と `website/translations/en/LC_MESSAGES/messages.po`: - -``` -#: website/templates/util/render_addon_widget.mako:245 -msgid "My Screen Test" -msgstr "" -``` - -`website/translations/ja/LC_MESSAGES/messages.po`: - -``` -#: website/templates/util/render_addon_widget.mako:245 -msgid "My Screen Test" -msgstr "My Screen テスト" -``` - -`website/translations/js_messages.pot` と `website/translations/en/LC_MESSAGES/js_messages.po`: - -``` -#: addons/myscreen/static/widget-cfg.js:22 -msgid "My Screen Param1 Label" -msgstr "" -``` - -`website/translations/ja/LC_MESSAGES/js_messages.po`: - -``` -#: addons/myscreen/static/widget-cfg.js:22 -msgid "My Screen Param1 Label" -msgstr "パラメーター1" -``` - -変更例は、サンプル [translations/](osf.io/website/translations/) を参照してください。 - -### Migrationsファイルの作成 - -`makemigrations` コマンドを実行して、Migrationsファイルを作成します。 - -``` -$ docker compose run --rm web python3 manage.py makemigrations -``` - -上記の出力中に以下のような出力が現れれば成功です。 - -``` -Migrations for 'addons_myscreen': - addons/myscreen/migrations/0001_initial.py - - Create model NodeSettings - - Add field user_settings to nodesettings -``` - -### Widgetの表示位置のカスタマイズ - -デフォルトでは、アドオンのWidgetはダッシュボードの左カラムの下部(FileViewerの下)に、アドオンの名前順で表示されます。表示位置を変更する場合は、 [website/templates/project/project.mako](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/templates/project/project.mako) ファイルを編集します。 - -> 今後、プロジェクトダッシュボードの表示もEmber化されることが考えられます。その場合は、Ember側も合わせて変更する必要があります。 - -左カラムの一番上(Wikiウィジェットの上)に表示したい場合は、以下のように修正します。 - -```diff -@@ -431,6 +431,10 @@ - -
- -+ % if 'myscreen' in addons_enabled and addons['myscreen']['has_widget']: -+ ${ render_addon_widget.render_addon_widget('myscreen', addons_widget_data['myscreen']) } -+ % endif -+ - %if user['show_wiki_widget']: - ${ render_addon_widget.render_addon_widget('wiki', addons_widget_data['wiki']) } - %endif -@@ -470,7 +474,7 @@ - - % for addon in addons_enabled: - % if addons[addon]['has_widget']: -- %if addon != 'wiki' and addon != 'iqbrims': ## We already show the wiki widget at the top -+ %if addon != 'wiki' and addon != 'iqbrims' and addon != 'myscreen': ## We already show the wiki widget at the top - ${ render_addon_widget.render_addon_widget(addon, addons_widget_data[addon]) } - %endif - % endif -``` - -右カラムの一番上に表示したい場合は、以下のように修正します。 - -```diff -@@ -470,7 +470,7 @@ - - % for addon in addons_enabled: - % if addons[addon]['has_widget']: -- %if addon != 'wiki' and addon != 'iqbrims': ## We already show the wiki widget at the top -+ %if addon != 'wiki' and addon != 'iqbrims' and addon != 'myscreen': ## We already show the wiki widget at the top - ${ render_addon_widget.render_addon_widget(addon, addons_widget_data[addon]) } - %endif - % endif - % endfor - % else: - - ${children()} - % endif - -
- -
-+ % if 'myscreen' in addons_enabled and addons['myscreen']['has_widget']: -+ ${ render_addon_widget.render_addon_widget('myscreen', addons_widget_data['myscreen']) } -+ % endif -+ - % if addons: - - % for addon in addons_enabled: -``` - -変更例は、サンプル [project.mako](osf.io/website/templates/project/project.mako) を参照してください。 - -### 画面タブリンクの表示位置のカスタマイズ - -デフォルトでは、アドオン画面タブのリンクはナビゲーションバーのFiles(ファイル)タブの右に、アドオンの名前順で表示されます。表示位置を変更する場合は、[website/templates/project/project_header.mako](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/templates/project/project_header.mako) ファイルを編集します。 - -> アドオン画面タブなどのember-osf-webが提供するViewを開いているときは、ember-osf-webで定義した `node-navbar` コンポーネントのテンプレート(後述)に従って表示されます。 - -アドオンリストの最後(Analytics(分析)の前)に表示する場合は、以下のように修正します。 - -```diff -@@ -43,7 +43,7 @@ - - % for addon in addons_enabled: - -- % if addons[addon]['has_page']: -+ % if addon != 'myscreen' and addons[addon]['has_page']: -
  • - - - % if addons[addon]['icon'] and addons[addon]['has_page_icon']: - - % endif - ${addons[addon]['full_name']} - -
  • - % endif - % endfor - -+ % if 'myscreen' in addons_enabled and addons['myscreen']['has_page']: -+
  • -+ -+ -+ % if addons['myscreen']['icon'] and addons['myscreen']['has_page_icon']: -+ -+ % endif -+ ${addons['myscreen']['full_name']} -+ -+
  • -+ % endif -+ - % if project_analytics: - % if node['is_public'] or user['is_contributor_or_group_member']: -
  • ${ _("Analytics") }
  • -``` - -変更例は、サンプル [project_header.mako](osf.io/website/templates/project/project_header.mako) を参照してください。 - -### アドオンのテスト - -以下のコマンドで、OSF.ioに追加したMy Screenアドオンのユニットテストを実行できます。 - -``` -$ docker compose run --rm web invoke test_module -m addons/myscreen/tests/ -``` - -## ember-osf-webへの実装 - -### 画面タブの実装 - -[画面タブの実装例(`ember-osf-web/app/guid-node/myscreen/`)](ember-osf-web/app/guid-node/myscreen/) を `app/guid-node/myscreen` ディレクトリにコピーします。 - -### myscreen-config モデルの定義 - -My Screenアドオンの画面タブでは、NodeSettingsの `param_1` プロパティに対応する `param1` プロパティを持つ、 `MyScreenConfig` モデルを定義して扱います。`MyScreenConfig` モデルと、アダプタ、シリアライザを、それぞれ以下のようにコピーします。 - -- [MyScreenConfigモデルの実装例](ember-osf-web/app/models/myscreen-config.ts) を `app/models/myscreen-config.ts` にコピーします。 -- [MyScreenConfigアダプタの実装例](ember-osf-web/app/adapters/myscreen-config.ts) を `app/adapters/myscreen-config.ts` にコピーします。 -- [MyScreenConfigシリアライザの実装例](ember-osf-web/app/serializers/myscreen-config.ts) を `app/serializers/myscreen-config.ts` にコピーします。 - -### テストコードの定義 - -画面タブに関するテストコード例と、テストに利用するMirageのコード例を、それぞれ以下のようにコピーします。 - -- [画面タブのコントローラの単体テストのコード例](ember-osf-web/tests/acceptance/guid-node/myscreen-test.ts) を `tests/acceptance/guid-node/myscreen-test.ts` にコピーします。 -- [画面タブの受け入れテストのコード例](ember-osf-web/tests/unit/guid-node/myscreen/controller-test.ts) を `tests/unit/guid-node/myscreen/controller-test.ts` にコピーします。 -- [MyScreenConfigのMirage Factoryコード例](ember-osf-web/mirage/factories/myscreen-config.ts) を `mirage/factories/myscreen-config.ts` にコピーします。 -- [MyScreenConfigのMirage Viewsコード例](ember-osf-web/mirage/views/myscreen-config.ts) を `mirage/views/myscreen-config.ts` にコピーします。 - -### RDMコードの変更 - -#### ルーティングの設定 - -[app/router.ts](https://github.com/RCOSDP/RDM-ember-osf-web/blob/develop/app/router.ts) に、アドオンの画面タブページへのルーティング設定を追加します。 - -``` -this.route('guid-node', { path: '--node/:guid' }, function() { - this.mount('analytics-page', { as: 'analytics' }); - this.route('forks'); - this.route('iqbrims'); - this.route('myscreen'); // 追加 - this.route('registrations'); - this.route('drafts', { path: '/drafts/:draftId' }, function() { - this.route('register'); - }); -}); -``` - -変更例は、サンプル [router.ts](ember-osf-web/app/router.ts) を参照してください。 - -#### ナビゲーションバー定義の変更 - -ember-osf-webが提供するViewから見えるプロジェクトのナビゲーションバーで、画面タブのリンクを表示するために、テンプレートファイル [lib/osf-components/addon/components/node-navbar/template.hbs](https://github.com/RCOSDP/RDM-ember-osf-web/blob/develop/lib/osf-components/addon/components/node-navbar/template.hbs) にコードを追加します。 - -``` -{{#if this.myscreenEnabled }} - {{node-navbar/link node=@node useLinkTo=false destination='myscreen'}} -{{/if}} -``` - -RDMでMy Screenアドオンが有効でないときはリンクを表示しないようにするために、コンポーネント定義ファイル [lib/osf-components/addon/components/node-navbar/component.ts](https://github.com/RCOSDP/RDM-ember-osf-web/blob/develop/lib/osf-components/addon/components/node-navbar/component.ts) に `myscreenEnabled` プロパティを追加します。 - -``` -@computed('node.addons.[]') -get myscreenEnabled(): Promise | null { - if (!this.node) { - return null; - } - const node = this.node; - return (async () => { - const addons = await node.addons; - if (!addons) { - return false; - } - const myscreen = addons.filter(addon => addon.id === 'myscreen'); - return myscreen.length > 0; - })(); -} -``` - -ナビゲーションバーのテスト [tests/integration/components/node-navbar/component-test.ts](https://github.com/RCOSDP/RDM-ember-osf-web/blob/develop/tests/integration/components/node-navbar/component-test.ts) も修正します。 - -それぞれの変更例は、サンプル [template.hbs](ember-osf-web/lib/osf-components/addon/components/node-navbar/template.hbs) 、 [component.ts](ember-osf-web/lib/osf-components/addon/components/node-navbar/component.ts) 、 [component-test.ts](ember-osf-web/tests/integration/components/node-navbar/component-test.ts) を参照してください。 - -#### 国際化ファイルの変更 - -[translations/en-us.yml](https://github.com/RCOSDP/RDM-ember-osf-web/blob/develop/translations/en-us.yml) に、My Screenアドオンの画面タブで表示する文字列の国際化設定を追加します。 - -``` -myscreen: - page_title: '{nodeTitle} My Screen' - header: 'My Screen' - loading: 'Loading My Screen config...' - param1: 'Param 1' - save_button: 'Save' - failed_to_submit: 'Failed to save' - placeholders: - param1: 'anything' -``` - -変更例は、サンプル [en-us.yml](ember-osf-web/translations/en-us.yml) を参照してください。 - -#### Mirage定義の変更 - -追加したMirageコードを利用してAPIをモックするように、 [mirage/config.ts](https://github.com/RCOSDP/RDM-ember-osf-web/blob/develop/mirage/config.ts) に以下を追加します。 - -``` -this.get('/project/:id/myscreen/config', myscreenConfig); -``` - -変更例は、サンプル [config.ts](ember-osf-web/mirage/config.ts) を参照してください。 - -### docker-compose.override.yml の追加 - -変更したコードを使うように、RDMの `docker-compose.override.yml` で osf-ember-web サービスの `volumes` を指定します。 - -例えば、以下のようなディレクトリ階層の場合は、 - -``` -. -├── RDM-osf.io -│   ├── docker-compose.override.yml -│   └── docker-compose.yml -└── RDM-ember-osf-web -``` - -`RDM-osf.io/docker-compose.override.yml` の内容を以下のようにします。 - -``` -version: "3.4" - -services: - ember_osf_web: - volumes: - - ../RDM-ember-osf-web:/code -``` - -### 画面タブのテスト - -以下のコマンドで、ember-osf-webに追加したMy Screen 画面タブのテストを実行できます。 - -コントローラの単体テスト: - -``` -$ docker compose run --rm ember_osf_web yarn test --module 'Unit | Controller | guid-node/myscreen' -``` - -ナビゲーションバーの結合テスト: - -``` -$ docker compose run --rm ember_osf_web yarn test --module 'Integration | Component | node-navbar' -``` - -画面タブの受け入れテスト: - -``` -$ docker compose run --rm ember_osf_web yarn test --module 'Acceptance | guid-node/myscreen' -``` - -ファイルを指定してlintを実行するのは、以下のコマンドを実行します。 - -``` -$ docker compose run --rm ember_osf_web node_modules/.bin/eslint --ext js,ts --max-warnings=0 'app/guid-node/myscreen' 'app/**/myscreen-config.ts' 'app/router.ts' 'lib/osf-components/addon/components/node-navbar/component.ts' 'tests/integration/components/node-navbar/component-test.ts' 'mirage/config.ts' -$ docker compose run --rm ember_osf_web node_modules/.bin/tslint -p . 'app/guid-node/myscreen/**/*.ts' 'app/**/myscreen-config.ts' 'app/router.ts' 'lib/osf-components/addon/components/node-navbar/component.ts' 'tests/integration/components/node-navbar/component-test.ts' 'mirage/config.ts' -$ docker compose run --rm ember_osf_web node_modules/.bin/stylelint 'app/guid-node/myscreen/**/*.scss' -$ docker compose run --rm ember_osf_web node_modules/.bin/ember-template-lint 'app/guid-node/myscreen/**/*.hbs' 'lib/osf-components/addon/components/node-navbar/template.hbs' -``` - - -# My Screenアドオンの動作確認 - -My Screenアドオンの動作確認をしてみましょう。 - -## DBマイグレーション - -マイグレーションを実行し、Migrations定義をPostgreSQLサービスに反映します。 - -``` -$ docker compose run --rm web python3 manage.py migrate -``` - -## 国際化のコンパイル - -`.mako` ファイルの国際化設定を適用するために、国際化ファイルをコンパイルします。 - -``` -$ docker compose run --rm web pybabel compile -d ./website/translations -``` - -> `.js` ファイルの国際化設定は、 `assets` サービスの再起動時に適用されます。 - -## サービスの再起動 - -変更したファイルに関連するサービスを再起動します。 - -``` -$ docker compose restart assets web api ember_osf_web -``` - -これでサービスへの反映は完了です。 - -## ストレージアドオンを試す - -My Screenアドオンの有効化手順は、スケルトン アドオンと同様です。 -My Screenアドオンを有効化すると、プロジェクトダッシュボードにウィジェットが表示され、ナビゲーションバーに画面タブのリンクが表示されます。 - -![Project Dashboard](images/project_dashboard.png) - -画面タブのリンクをクリックすると、画面タブのページを表示できます。 - -![Addon Tab](images/addon_tab.png) - -ここで設定した `param_1` プロパティの値が、ウィジェットに表示されます。 - -以上でMy Screenアドオンの動作確認は完了です! +- [ Guides index](../docs/guides/README.md) / ガイド一覧 +- [ SPEC-06 Documentation Conventions](../docs/spec/06_documentation_conventions.md) / 文書規約 diff --git a/SetupOsfOnEC2.md b/SetupOsfOnEC2.md index fb94a49..66c7742 100644 --- a/SetupOsfOnEC2.md +++ b/SetupOsfOnEC2.md @@ -1,398 +1,8 @@ -# OSF evaluation on AWS EC2 +# EC2 Development Environment / EC2 での開発環境 -## Quick Start Guide +Moved to [docs/guides/ec2/](docs/guides/ec2/) for the latest guides. -For setting up this project on your local environment, follow these steps: +EC2 での開発環境の最新ガイドは [docs/guides/ec2/](docs/guides/ec2/) に移動しました。 -### 1. Change to Project Directory - -Setup for git: -```bash -git config --global user.name 'Your github account name' -git config --global user.email 'Your email address' -git config --global core.editor 'code --wait' -git config --global merge.tool 'code --wait "$MERGED"' -git config --global push.default simple -git config --list # githuconfig confirmation -``` - -You need generate and register your github token in your gitconfig. - -link: https://docs.github.com/ja/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens - -Navigate to the project root directory: -```bash -git clone https://github.com/RCOSDP/RDM-osf.io.git -git clone -b develop https://github.com/RCOSDP/RDM-ember-osf-web.git -git clone https://github.com/RCOSDP/RDM-modular-file-renderer.git -git clone https://github.com/RCOSDP/RDM-waterbutler.git -``` - - -### 2. Docker Build -setup docker and docker compose. - -link: https://docs.docker.jp/v1.12/compose/install.html - -link: https://docs.docker.com/engine/install/ubuntu/ - -Build Docker images for each module: -```bash -sudo docker build RDM-ember-osf-web -t rdm-osf-web:dev -sudo docker build RDM-modular-file-renderer -t rdm-mfr:dev -sudo docker build RDM-waterbutler -t rdm-wb:dev -sudo docker build RDM-osf.io -t rdm-osf:dev -``` - -### 3. Setup Loopback Interface - - -Configure your loopback interface on your machine: -```bash -sudo apt install net-tools -sudo ifconfig lo:0 192.168.168.167 netmask 255.255.255.255 up -``` - -### 4. Change to Module Directory - -Navigate to the module directory: -```bash -cd RDM-osf.io/ -``` - -### 5. Copy and Update Local Settings - -Copy the local settings of the project: -```bash -cp ./website/settings/local-dist.py ./website/settings/local.py -cp ./api/base/settings/local-dist.py ./api/base/settings/local.py -cp ./admin/base/settings/local-dist.py ./admin/base/settings/local.py -cp ./tasks/local-dist.py ./tasks/local.py -``` - -Update the local settings of the project: -RDM-osf.io/.docker-compose.env -```bash - -DOMAIN=http://ec2.compute-1.amazonaws.com:5000 -INTERNAL_DOMAIN=http://web:5000 -API_DOMAIN=http://api.ec2.compute-1.amazonaws.com:8000 -ELASTIC_URI=elasticsearch:9200 -ELASTIC6_URI=elasticsearch6:9201 -OSF_DB_HOST=postgres -DB_HOST=mongo -WATERBUTLER_URL=http://files.ec2.compute-1.amazonaws.com:7777 -WATERBUTLER_INTERNAL_URL=http://wb:7777 -CAS_SERVER_URL=http://accounts.ec2.compute-1.amazonaws.com:8080 -MFR_SERVER_URL=http://mfr.ec2.compute-1.amazonaws.com:7778 -#SHARE_URL=http://192.168.168.167:8000 -BROKER_URL=amqp://guest:guest@rabbitmq:5672 -REDIS_URL=redis://192.168.168.167:6379/1 - -ADMIN_URL=http://admin.ec2.compute-1.amazonaws.com:8001 -ADMIN_INTERNAL_DOCKER_URL=http://admin:8001 - - -``` -RDM-osf.io/.docker-compose.osf-web.env -```bash -OSF_COOKIE_DOMAIN=.ec2.compute-1.amazonaws.com -OSF_URL=http://ec2.compute-1.amazonaws.com:5000 -OSF_API_URL=http://api.ec2.compute-1.amazonaws.com:8000 -OSF_MFR_URL=http://mfr.ec2.compute-1.amazonaws.com:7778 -OSF_RENDER_URL=http://mfr.ec2.compute-1.amazonaws.com:7778/render -OSF_FILE_URL=http://files.ec2.compute-1.amazonaws.com:7777 -OSF_HELP_URL=http://ec2.compute-1.amazonaws.com:5000/help -OSF_COOKIE_LOGIN_URL=http://accounts.ec2.compute-1.amazonaws.com:8080/login -OSF_OAUTH_URL=http://accounts.ec2.compute-1.amazonaws.com:8080/oauth2/profile -SHARE_BASE_URL=https://share.osf.io/ -SHARE_API_URL=https://share.osf.io/api/v2 -SHARE_SEARCH_URL=https://share.osf.io/api/v2/search/creativeworks/_search -CAS_URL=http://accounts.ec2.compute-1.amazonaws.com:8080 - -``` - -RDM-osf.io/.docker-compose.wb.env - -```bash -DEBUG= -SERVER_CONFIG_DEBUG= -SERVER_CONFIG_HMAC_SECRET=changeme -SERVER_CONFIG_ADDRESS=0.0.0.0 -SERVER_CONFIG_DOMAIN=http://ec2.compute-1.amazonaws.com:7777 -OSF_AUTH_CONFIG_API_URL=http://ec2.compute-1.amazonaws.com:5000/api/v1/files/auth/ -OSF_URL=http://ec2.compute-1.amazonaws.com:5000 - -TASKS_CONFIG_BROKER_URL=amqp://guest:guest@rabbitmq:5672// -``` - -RDM-osf.io/.docker-compose.mfr.env -```bash - -DEBUG= -SERVER_CONFIG_DEBUG= -SERVER_CONFIG_HMAC_SECRET=changeme - -SERVER_CONFIG_ADDRESS=0.0.0.0 -SERVER_CONFIG_ALLOWED_PROVIDER_DOMAINS='http://192.168.168.167:5000/ http://192.168.168.167:7777/ http://mfr:7777/ http://ec2.compute-1.amazonaws.com:5000/ http://files.ec2.compute-1.amazonaws.com:7777/' - -UNOCONV_PORT_2002_TCP_ADDR=192.168.168.167 -EXTENSION_CONFIG_LOCAL_DEVELOPMENT=1 - - -``` - -RDM-osf.io/admin/base/settings/local.py -```bash -SESSION_COOKIE_DOMAIN = 'ec2.compute-1.amazonaws.com' -from .defaults import * - -ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', 'localhost,osf.io').split(',') - -``` - - -RDM-osf.io/docker-compose.override.yml - -```bash -version: "3.4" - -services: - mfr_requirements: - image: rdm-mfr:dev - mfr: - image: rdm-mfr:dev - wb_requirements: - image: rdm-wb:dev - wb: - image: rdm-wb:dev - wb_worker: - image: rdm-wb:dev - ember_osf_web: - image: rdm-osf-web:dev - environment: - - BACKEND=env - env_file: - - .docker-compose.osf-web.env - volumes: - - ../RDM-ember-osf-web:/code:cached - - ember_osf_web_dist_vol:/code/dist - requirements: - image: rdm-osf:dev - assets: - image: rdm-osf:dev - admin_assets: - image: rdm-osf:dev - worker: - image: rdm-osf:dev - admin: - image: rdm-osf:dev - api: - image: rdm-osf:dev - web: - image: rdm-osf:dev - preprints: - environment: - - BACKEND=env - env_file: - - .docker-compose.osf-web.env - fakecas: - image: quay.io/centerforopenscience/fakecas:master - command: fakecas -host=0.0.0.0:8080 -osfhost=ec2.compute-1.amazonaws.com:5000 -dbaddress=postgres://postgres@postgres:5432/osf?sslmode=disable - registries: - environment: - - BACKEND=env - env_file: - - .docker-compose.osf-web.env - reviews: - environment: - - BACKEND=env - env_file: - - .docker-compose.osf-web.env -``` - -RDM-osf.io/website/settings/local.py -```bash -DOMAIN = PROTOCOL + 'ec2.compute-1.amazonaws.com:5000/' -INTERNAL_DOMAIN = DOMAIN -API_DOMAIN = PROTOCOL + 'ec2.compute-1.amazonaws.com:8000/' -OSF_COOKIE_DOMAIN = 'ec2.compute-1.amazonaws.com' - -``` - - -### 6. Docker Compose Up Requirements - -Ensure you have the required services running: -```bash -sudo docker compose up requirements wb_requirements mfr_requirements -``` - -### 7. Start Core Component Services (Detached) - -Spin up denpent services: -```bash -sudo docker compose up -d elasticsearch elasticsearch6 postgres mongo rabbitmq -``` - -### 8. Assets Setup - -Remove your existing node_modules and start the assets: -```bash -sudo rm -Rf ./node_modules -sudo rm -Rf ./website/static/vendor/bower_components -sudo rm -Rf ./admin/node_modules -sudo rm -Rf ./admin/static/vendor/bower_components -sudo docker compose up -d assets admin_assets -``` - -### 9. More Services - -Upgrade dependency -RDM-osf.io/requirements/dev.txt -```bash -pytest-xdist==1.34.0 -``` - -Start additional services: -```bash -sudo docker compose up -d unoconv mfr wb fakecas sharejs -``` - -### 10. Database Migration -When starting with an empty database you will need to run migrations and populate preprint providers. -Perform database migrations: -```bash -sudo docker compose run --rm web python3 manage.py migrate -``` -See the [Running arbitrary commands](RDM-osf.io/README-docker-compose.md#running-arbitrary-commands) section below for instructions. - -### 11. Run the Project - -Finally start the OSF Web, API Server, and Preprints (Detached): -```bash -sudo docker compose up -d wb_worker worker web api admin preprints ember_osf_web registries reviews -``` - -We can see containers and images list. -```bash -sudo docker iamges -sudo docker ps -``` - - -We can see the rdm page through browser. - -link : https://EC2-url:5000/ - -![top page](/images/rdmTop.png) - - -Once you follow these steps, you should have a local environment up and running for development. - -## Configuration Guide - -### 1. Let's Encrypt Setup -**Configure AWS Credentials** - -Use the AWS CLI Docker image to configure your AWS credentials: - -```bash -sudo docker run --rm -it -v "/root/.aws:/root/.aws" amazon/aws-cli configure -``` -**Verify AWS Credentials** -Nii has a Certificate Management Service link: https://certs.nii.ac.jp/ . You can contact to them if your service is created on NII infrastructure. - -Verify if your AWS credentials are working and have nominal access to Route 53: - -``` -sudo docker run --rm -it -v "/root/.aws:/root/.aws" amazon/aws-cli route53 list-hosted-zones -``` -**Request a Let's Encrypt Wildcard Certificate** - -Use the certbot/dns-route53 Docker image to request a wildcard certificate, forwarding your AWS credentials: - -``` -certbot certonly --dns-route53 --domain "your.com" --domain "*.your.com" -``` - -**Automate Certificate Renewal** - -Create systemd timer to automate certificate renewal, then daemon-reload, enable, and start the timer. -Create /etc/systemd/system/certbot.service. For the docker command, remove --it for non-interactive execution by systemd, and pass /usr/bin to the container to allow execution of systemctl by --deploy-hook: -``` -[Unit] -Description=Let's Encrypt certificate renewal - -[Service] -Type=oneshot -ExecStart=certbot renew --dns-route53 --quiet --agree-tos --deploy-hook "cd /home/ubuntu/RDM-osf.io && sudo docker compose restart web admin wb fakecas ember_osf_web preprints registries reviews" -``` - -Then create /etc/systemd/system/certbot.timer: -``` -[Unit] -Description=Monthly renewal of Let's Encrypt certificates - -[Timer] -OnCalendar=monthly -RandomizedDelaySec=12 hours -Persistent=true - -[Install] -WantedBy=timers.target -``` - -### 2. User Management - -**Setup SMTP**rdm - -We need to setup smtp and mailutils. We can install postfix with local only and deefault hostname -```bash -apt install postfix mailutils -``` - -/etc/postfix/main.cf -```bash - -mynetworks = 10.0.0.0/0 # your network -inet_interfaces = all # -``` - -Test for sending mail -```bash -echo "test" | mail -s test root@ip-1-1-1-1.ap-northeast-1.compute.internal -``` - -```bash -root@ip-1-1-1-1:/etc/postfix# mail -"/var/mail/root": 1 message 1 new ->N 1 root Mon Mar 4 05:29 14/656 test -? 1 ### input number -From: root -test -``` - - -**Create User** - -Method 1: -Create a user via register link: https://EC2-url:5000/register/ - -Method 2: -Create a user directly through the RDM shell. -```bash -docker compose run --rm web invoke shell -``` -Create an OSF User with python code: -```python -user = OSFUser.create(username=,password=,fullname=) -``` -> **Note:** User's registration status is to be shifted to True by adding `user.is_registered = True` `user.have_email = True` and `user.date_confirmed = timezone.now()`. Due to the lack of an inherited mail server in local environment, the newly created account is unable to send confirmation emails making the account unconfirmed. - -Save your user with `user.save()` -Commit the changes with `commit()` - -**Admin User** - -Please refer to [RDM-osf.io/admin/README.md](RDM-osf.io/admin/README.md) for instructions on how to make existing user super admin. +- [ Guides index](docs/guides/README.md) / ガイド一覧 +- [ SPEC-06 Documentation Conventions](docs/spec/06_documentation_conventions.md) / 文書規約 diff --git a/Skelton/README.md b/Skelton/README.md index 2aed685..eb69be9 100644 --- a/Skelton/README.md +++ b/Skelton/README.md @@ -1,353 +1,8 @@ -# スケルトンの作成 +# Skeleton Addon / スケルトンアドオン -アドオン開発の第一歩として、以下のような単純な機能を持つ「スケルトン」アドオンを実装します。 +Moved to [docs/guides/skeleton/](../docs/guides/skeleton/) for the latest guides. -スケルトンは以下の機能を持つものとします。 +スケルトンアドオンの最新ガイドは [docs/guides/skeleton/](../docs/guides/skeleton/) に移動しました。 -- 任意のプロジェクトにてスケルトンを有効化可能 -- スケルトンは `param_1` というパラメータを持ち、プロジェクトごとに異なる値を設定することができる -- `param_1` パラメータはプロジェクトのアドオン設定画面で設定することができる - -## 前提条件 - -本ドキュメントの実施にあたり、以下の前提条件を満たしているものとします。 - -* [RDM-osf.ioリポジトリ](https://github.com/RCOSDP/RDM-osf.io)をフォークし、ローカル環境にcloneしていること - * 特に指定がない限りはdevelopブランチからアドオン開発用ブランチ(例えば、 `feature/myskelton-addon`)を作成し作業する - * アドオン開発用ブランチには定期的にdevelopブランチをpullして変更を取り込む -* cloneしたアドオン開発用ブランチで、 [開発環境の準備](../Environment.md#開発環境でRDMを起動する) のガイドに従い、開発用RDMを起動していること - -# RDMアドオンの設計 - -## ファイルの構成 - -RDMにおいてアドオンは[Django](https://www.djangoproject.com/)アプリケーションの形式で記述されます。以下のようなファイルおよびクラスから構成されます。 - -![クラス構成](images/class.png) - -典型的なファイル配置は以下のようになります。 - -``` -/addons/アドオン名/ -├── __init__.py ... モジュールの定義 -├── apps.py ... アプリケーションの定義 -├── models.py ... モデルの定義 -├── requirements.txt ... 利用するPythonモジュールの定義 -├── routes.py ... View(Routes)の定義 -├── settings ... 設定を定義するモジュール。ここにlocal.pyを配置することでカスタマイズできる。 -│ ├── defaults.py ... デフォルト設定の定義 -│ └── __init__.py ... 設定の定義 -├── static ... Webブラウザから読み込むことを想定した静的ファイル -│ ├── comicon.png ... アドオンのアイコン -│ └── node-cfg.js ... Node設定を定義するJavaScriptファイル -├── templates ... テンプレートディレクトリ -│ └── node_settings.mako ... Node設定パネル -├── tests ... テストコード -│ ├── conftest.py -│ ├── factories.py -│ ├── test_model.py -│ ├── test_view.py -│ └── utils.py -└── views.py ... View(Views)の定義 -``` - -## アドオンのモジュール構成 - -アドオンはDjangoの作法に従い、Model-Viewアーキテクチャにより実装します。それぞれの責務は以下のように分担されます。 - -- Model ... ユーザとNode(プロジェクト)それぞれに対応したモデルを実装する。それぞれのモデルには認証情報やプロジェクト固有の情報を格納することができる -- View ... アドオンに応じた設定、データ取得、保存処理など、HTTP上のエンドポイント(パス)を定義する - -Modelはフレームワークにより自動的にそれぞれの利用者、プロジェクトに対応して生成、管理され、永続化されるのに対し、Viewはアプリケーションがロードされる際に構築されます。 -フレームワークによりそれぞれのライフサイクルが適切に管理されるので、アドオン開発者は機能面の実装に注力することができます。 - -### Modelの構成 - -Node(プロジェクト)に関する情報や、ユーザごとの情報(認証情報等)を記録、管理したい場合、Modelを定義します。 - -UserSettingsは利用者ごとにインスタンスが生成され、永続化されます。また、NodeSettingsはプロジェクトごとにインスタンスが生成、永続化されます。これらのインスタンスの生成や破棄をアドオンのコードが行うことは原則としてありません。 - -スケルトンの場合、以下のようにNodeに関するModelを定義します。 - -- [addons.myskelton.NodeSettings](addon/models.py) - -NodeSettingsは永続化すべきプロパティと、各種setterとgetterを定義しています。 - -### Viewの構成 - -Viewは[FlaskのPluggable Views](http://flask.pocoo.org/docs/0.10/views/)のように、サービス上のパスと処理の関係を定義します。定義はRoutesとViewsの2種類の要素から構成されます。 - -- Routes ... View処理をどのパスにマッピングし、どのような形式で出力するか。出力にはJSON形式や、HTMLのテンプレートを指定することができる -- Views ... View処理の内容 - -Routesは以下のようにパスとMethod(GET, POST, PUT, DELETE, ...)と、その組み合わせに対してどの関数を実行するか、その実行結果をどのように出力するかを定義します。 - -各View処理には、その処理の実行における前提をPythonのデコレータの形で記述することができます。指定可能なデコレータには以下のようなものがあります。 - -- `framework.auth.decorators.must_be_logged_in` ... ユーザがログインしている状態である場合にのみ呼び出し可能であることを宣言する。引数にはauthパラメータが追加され、認証しているユーザに関する情報を得ることができる -- `website.project.decorators.must_have_addon` ... アドオンに関する情報を必要とすることを宣言する。第1引数にはアドオン名を(例では `myskelton`)、第2引数には'user'か'node'のいずれかを定義する。('node'にした場合は、パスは /project// から始める必要がある) -- `website.project.decorators.must_have_permission` ... 必要なパーミッションを宣言する。引数には'write', 'read', 'admin'のいずれかを指定する。 - - -スケルトンの場合、以下のようにRoutesとViewsを定義します。 - -- [api_routes](addon/routes.py) -- [myskelton_get_config, myskelton_set_config](addon/views.py) - -コンテキストに応じてデコレータを宣言しておくことで、Viewの処理の中でModel(利用者が操作対象としているUserやNode)を参照することができます。 - -### フレームワークによって提供されるView - -Routes, Viewsを使うことでさまざまなAPIやインタフェースを定義することができますが、アドオンが持つ利用者用設定画面(認証情報の入力画面)とプロジェクト用設定画面(プロジェクトでアドオンを有効化した場合の設定画面)はフレームワークによってあらかじめテンプレート化されています。 - -- [node_settings.mako](addon/templates/node_settings.mako) - - -このファイルは、テンプレート言語 [mako](https://www.makotemplates.org/) で記述されます。 - -テンプレートを動的に操作するためのJavaScriptのライブラリにはKnockout.jsを利用することができます。JavaScriptコードについては、アドオンのstaticディレクトリにて定義することができます。 - -- [node-cfg.js](addon/static/node-cfg.js) - -また、staticディレクトリにはアドオンのアイコンを定義する必要があります。 - -- [comicon.png](addon/static/comicon.png) - -### 設定モジュール - -アドオンの動作を環境によりカスタマイズ可能にするため、settingsモジュールを用意します。 - -- [settings](addon/settings/) - -[RDMのアプリケーション設定](../Environment.md#基本的な流れ)と同様に、settingsディレクトリ内に `local.py` ファイルを定義することで、アドオンの動作をカスタマイズできるようになります。 -設定値は `defaults.py` で定義します。スケルトンの場合、以下のように定義します。 - -- [defaults.py](addon/settings/defaults.py) - -### テストコード - -アドオンのユニットテストを定義します。スケルトンの場合、以下のようにModelのテスト(`test_model.py`)とViewのテスト(`test_view.py`)を定義しています。 - -- [tests](addon/tests) - -### Migrations定義 - -Migrationsファイルは、Modelの内容をRDBのテーブルに対応づけをするために使用します。Modelの内容はバージョンによって変化しますから、各バージョンごとに適切にテーブルの変更がなされるよう、Migrationsファイルを適切に定義する必要があります。 -スケルトンの場合、空の `__init__.py` を定義しています。 - -- [migrations](addon/migrations/) - -[Migrationsファイルの作成](#Migrationsファイルの作成)にて作成方法を説明します。 - -# スケルトン アドオンの実装 - -ここでは、 `myskelton` という識別名のアドオンの実装を例に説明します。 - -## addons.myskelton モジュールの定義 - -[スケルトンコードの例](addon/)を `addons/myskelton` ディレクトリにコピーします。[ファイルの構成](#ファイルの構成)で示したツリー構造となるようにコピーしてください。 - -このスケルトンでは、アドオン名(識別名)を`myskelton`としています。 -識別名はモジュール名と一致させる必要がありますので、`myskelton`以外の名前にしたい場合は、`addons/(識別名)` ディレクトリに[スケルトンコード](addon/)を配置するようにしてください。 - -また、この名前を変更したい場合は、以下のコードを変更する必要があります。 - -- [SHORT_NAME(Python)](addon/__init__.py) -- [SHORT_NAME(JavaScript)](addon/static/node-cfg.js) -- [view関数のプレフィックス(myskelton_*)](addon/views.py) - [参照元](addon/routes.py) - -また、アドオンの完全名を `My Skelton` としています。これは、Web UIでの表示等に使われます。この名前を変更したい場合は、以下のコードを変更する必要があります。 - -- [AddonAppConfig.full_name](addon/apps.py) - -## RDMコードの変更 - -追加したアドオンをRDMに認識させるために、RDMのコードをいくつか変更します。 - -### addons.json の変更 - -[addons.json](https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons.json) に、アドオンに関する情報を追加します。このファイルはJSONファイル形式であり、キーごとに以下の値を登録します。 - -変更例はサンプル [addons.json](config/addons.json) を参照してください。 - -- `addons` ... 利用可能なアドオン一覧。必ず登録する -- `addons_default` ... プロジェクト作成時にデフォルトで有効になるアドオン一覧 -- `addons_archivable` ... アドオンごとのアーカイブに関する情報 -- `addons_commentable` ... コメント可能なアドオン一覧 -- `addons_description` ... アドオン名と説明の定義 - - ``` - "myskelton": "My Skelton Addon is ..." - ``` - -- `addons_url` ... アドオンの関連URLの定義 - - ``` - "myskelton": "https://dummy.nii.ac.jp/myskelton" - ``` - -### framework/addons/data/addons.json の変更 - -[framework/addons/data/addons.json](https://github.com/RCOSDP/RDM-osf.io/blob/develop/framework/addons/data/addons.json) に、アドオン登録時のメッセージリソースを登録します。 -`addons` オブジェクトに、アドオンの完全名(`AddonAppConfig.full_name` に相当)をキーとして情報を登録します。 - -変更例はサンプル [addons.json](config/framework/addons/data/addons.json) を参照してください。 - -> この定義ファイルの内容は画面表示のためだけに利用され、動作には影響しません。 - -``` -"My Skelton": { - "Permissions": { - "status": "none", - "text": "The GakuNin RDM does not affect the permissions of My Skelton." - }, - "View / download file versions": { - "status": "none", - "text": "The My Skelton add-on does not provide Storage Features." - }, - "Add / update files": { - "status": "none", - "text": "The My Skelton add-on does not provide Storage Features." - }, - "Delete files": { - "status": "none", - "text": "The My Skelton add-on does not provide Storage Features." - }, - "Logs": { - "status": "none", - "text": "The My Skelton add-on does not provide Storage Features." - }, - "Forking": { - "status": "partial", - "text": "Forking a project or component copies information about linked My Skelton but the GakuNin RDM does not affect authentication of My Skelton." - }, - "Registering": { - "status": "none", - "text": "My Skelton information will not be registered." - } -} -``` - -このメッセージの国際化については [国際化メッセージファイルの作成](#国際化メッセージファイルの作成)を参照してください。 - -### Dockerfile の変更 - -[Dockerfile](https://github.com/RCOSDP/RDM-osf.io/blob/develop/Dockerfile) に、アドオン関連のファイルコピー定義を追加します。 - -変更例はサンプル [Dockerfile](config/Dockerfile) を参照してください。 - - -- requirements.txtのコピー - ``` - COPY ./addons/myskelton/requirements.txt ./addons/myskelton/ - ``` - -- staticディレクトリの変更 - ``` - COPY ./addons/myskelton/static/ ./addons/myskelton/static/ - ``` - -### api/base/settings/defaults.py への追加 - -[api/base/settings/defaults.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/api/base/settings/defaults.py) の `INSTALLED_APPS` にアドオン名を追加します。 - -変更例はサンプル [defaults.py](config/api/base/settings/defaults.py) を参照してください。 - -``` -'addons.myskelton', -``` - -## Migrationsファイルの作成 - -Modelで定義したプロパティがRDBに保存されるよう、`makemigrations`コマンドを実行します。このコマンドを実行すると、 `addons/myskelton/migrations` にPythonファイルが作成されます。 - -``` -$ docker compose run --rm web python3 manage.py makemigrations -``` - -上記の出力中に以下の出力が現れれば成功です。現れない場合、RDMがアドオンを認識していない可能性があります。特に`addons.json`, `api/base/settings/defaults.py`の設定が漏れていないかどうかを確認してください。 - -``` -Migrations for 'addons_myskelton': - addons/myskelton/migrations/0001_initial.py - - Create model NodeSettings -``` - -## 国際化メッセージファイルの作成 - -国際化メッセージファイルの定義ファイルは以下のコマンドで生成することができます。 - -> このセクションの実施時は各サービスを停止状態にしてください。 - -``` -# framework/addons/data/addons.jsonに定義されたメッセージをJavaScriptファイルへと変換する -$ docker compose run --rm web python3 -m scripts.generate_addons_translations - -# メッセージ定義テンプレートファイル website/translations/js_messages.pot を更新する -$ docker compose run --rm web pybabel extract -F ./website/settings/babel_js.cfg -o ./website/translations/js_messages.pot . - -# メッセージ定義ファイル website/translations/ja/LC_MESSAGES/js_messages.po を更新する -$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/en/LC_MESSAGES/js_messages.po -l en -$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/ja/LC_MESSAGES/js_messages.po -l ja -``` - -上記を実行すると、`website/translations/ja/LC_MESSAGES/js_messages.po`にある英語メッセージと日本語メッセージの対応づけが更新されます。 -変更例のサンプル [js_messages.po](config/website/translations/ja/LC_MESSAGES/js_messages.po) を参考に日本語メッセージを追加してください。 - -``` -#: scripts/translations/messages_addonsJson.js:45 -msgid "" -"\n" -"\n" -"

    My Skelton Add-on Terms

    \n" -"\n" -... -msgstr "" -"\n" -"\n" -"

    My Skelton アドオン規約

    \n" -"\n" -"\n" -... -``` - -このメッセージを追加後、`assets`サービスの再起動時にメッセージ定義が反映されます。 - -## スケルトンのテスト - -これでアドオンのコードの作成は完了です。以下のコマンドで追加した `addons/myskelton` のユニットテストを実行してみましょう。 - -``` -$ docker compose run --rm web invoke test_module -m addons/myskelton/tests/ -``` - -# スケルトン アドオンの動作確認 - -スケルトン アドオンを動作確認をしてみましょう。 -アドオンには新規に定義されたModelが含まれていますので、Migrations定義をサービス中のPostgreSQLサービスに反映しましょう。 - -``` -$ docker compose run --rm web python3 manage.py migrate -``` - -また、新規にJavaScriptファイルを追加したので、新たなファイルがロード対象となるように、`RDM-osf.io`をイメージとしたサービスの再起動を実施します。 - -``` -$ docker compose restart assets web api -``` - -これでサービスへの反映は完了です。スケルトン アドオンを試すには、以下のような操作を実施します。 - -1. RDM Web UIにアクセスする `http://localhost:5000` -1. 適当なプロジェクトを作成する - ![Create Project](images/create-project.png) - -1. Add-onsページを開く -1. My Skeltonアドオンを有効化する - ![Enable Addon](images/enable-addon.png) - -これで、`node_settings.mako`で定義したNode設定画面が現れます。テキストボックスに入力した値が `param_1` プロパティに反映される様子が確認できるはずです。 - -![Addon](images/enabled-addon.png) - -以上でスケルトンアドオンの動作確認は完了です! +- [ Guides index](../docs/guides/README.md) / ガイド一覧 +- [ SPEC-06 Documentation Conventions](../docs/spec/06_documentation_conventions.md) / 文書規約 diff --git a/StorageAddon/README.md b/StorageAddon/README.md index 23470c0..692b4c5 100644 --- a/StorageAddon/README.md +++ b/StorageAddon/README.md @@ -1,711 +1,8 @@ -# ストレージアドオンの作成 +# Storage Addon / ストレージアドオン -具体的なストレージアドオンの例として、AWS S3互換の[MinIO](https://min.io/)と接続するストレージアドオンを実装します。このアドオンは特定のMinIOサーバーと接続するものとし、 My MinIOアドオンと名付けることとします。 +Moved to [docs/guides/storage-addon/](../docs/guides/storage-addon/) for the latest guides. -基本的なアドオンの概要は[スケルトンの作成](../Skelton/README.md)を参照してください。 +ストレージアドオンの最新ガイドは [docs/guides/storage-addon/](../docs/guides/storage-addon/) に移動しました。 -## 前提条件 - -[開発環境の準備](../Environment.md#開発環境でRDMを起動する)のガイドに従い、開発環境にてRDMを起動しているものとします。 - -# ストレージアドオンの設計 - -## サービスの構成 - -ストレージアドオンは以下の2つの要素から構成されます。 - -- OSF.ioサービスで動作するAddon: ユーザ・プロジェクト設定の管理 -- WaterButlerサービスで動作するProvider: ストレージへのアクセスの仲介 - -Addonによりユーザからの認証情報の受領や各種設定を行い、Providerはこの認証情報・設定情報をAddonから譲渡してもらい、実際のストレージへのアクセスを行います。 - -## ファイルの構成 - -典型的なクラス構成とファイル配置は以下のようになります。 - -### OSF.io Addonのクラス構成とファイル構成 - -![OSF.io Addon クラス構成](images/osf_class.png) - -`(*)`が付いているファイルはスケルトン アドオンには存在しないファイルです。 - -``` -/addons/アドオン名/ -├── __init__.py ... モジュールの定義 -├── apps.py ... アプリケーションの定義 -├── models.py ... モデルの定義 -├── provider.py ... (*) 認証プロバイダの定義 -├── requirements.txt ... 利用するPythonモジュールの定義 -├── routes.py ... View(Routes)の定義 -├── serializer.py ... (*) モデル-ビュー(JavaScript)間の情報交換用シリアライザの定義 -├── settings ... 設定を定義するモジュール -│ ├── defaults.py ... デフォルト設定の定義 -│ ├── __init__.py ... 設定の定義 -│   └── local-dist.py ... (*) local.pyのサンプルファイル -├── static ... Webブラウザから読み込むことを想定した静的ファイル -│   ├── comicon.png ... アドオンのアイコン -│   ├── myminioAnonymousLogActionList.json ... (*) 変更履歴メッセージ定義 -│   ├── myminioLogActionList.json ... (*) 変更履歴メッセージ定義 -│   ├── myminioNodeConfig.js ... (*) Node設定の定義 -│   ├── myminioUserConfig.js ... (*) User設定の定義 -│   ├── node-cfg.js ... Node設定のエントリとなるJavaScriptファイル -│   └── user-cfg.js ... (*) User設定のエントリとなるJavaScriptファイル -├── templates ... テンプレートディレクトリ -│   ├── credentials_modal.mako ... (*) 認証情報の設定用ダイアログ -│   ├── node_settings.mako ... Node設定パネル -│   └── user_settings.mako ... (*) User設定パネル -├── tests ... テストコード -│   ├── __init__.py -│   ├── conftest.py -│   ├── factories.py -│   ├── test_model.py -│   ├── test_serializer.py ... (*) -│   ├── test_view.py -│   └── utils.py -├── utils.py ... (*) ユーティリティ関数の定義 -└── views.py ... View(Views)の定義 -``` - -### WaterButler Providerのクラス構成とファイル構成 - -![WaterButler Addon クラス構成](images/wb_class.png) - -``` -waterbutler/providers/アドオン名/ -├── __init__.py ... Providerクラスの参照 -├── metadata.py ... Metadataの定義 -├── provider.py ... Providerの定義 -└── settings.py ... デフォルト設定の定義 - -tests/providers/アドオン名/ -├── __init__.py -└── provider.py ... Providerのテストコード -``` - -## OSF.io Addonのモジュール構成 - -スケルトン アドオンとの違いを中心に説明していきます。 - -### Modelの構成 - -`models.py` に、以下のModelを定義します。 - -- `UserSettings`: ユーザーに関する情報(認証情報等) -- `NodeSettings`: プロジェクトに関する情報 -- `アドオン名FileNode`: ファイル・フォルダオブジェクトの親定義 -- `アドオン名File`: ファイルオブジェクトの定義 -- `アドオン名Folder`: ファイルオブジェクトの定義 - -`provider.py` に `アドオン名Provider` を、 `serializer.py` に `アドオン名Serializer` を定義します。OAuthを用いる場合は `osf.models.external.ExternalProvider` を継承し、必要なメンバを定義します。実装は [GitHubの例](https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/github/models.py#L49) などを参考にしてください(GitHubアドオンは `アドオン名Provider` を `models.py` に定義しています)。 -`アドオン名Serializer` にはビュー(JavaScript)にURLリストや接続先フォルダなどを渡すための関数を定義します。 - -OAuth認証をしない場合であっても、ストレージアドオンの `UserSettings` と `NodeSettings` は、 `BaseOAuthUserSettings` と `BaseOAuthNodeSettings` をそれぞれ継承して定義し、 `oauth_provider` に`アドオン名Provider` を指定します。こうすることで、統一的な構造で簡単に認証の仕組みを実装することができます。 - -My MinIOアドオンの場合は、以下のように定義します。 - -- [models.py](osf.io/addon/models.py) -- [provider.py](osf.io/addon/provider.py) -- [serializer.py](osf.io/addon/serializer.py) - -### Viewの構成 - -`views.py`には、おおよそ以下の関数を定義します。 - -| 関数名 | 処理 | -|:------|:----| -| set_config | プロジェクトの設定を保存する。デフォルトでは接続先のフォルダとクライアント用のAPIのURLリストのみ。 | -| get_config | プロジェクトの設定を取得する。 | -| import_auth | ログイン中のユーザの認証情報をプロジェクトにインポートする。 | -| deauthorize_node | プロジェクトの認証情報を取り消す。 | -| add_user_account | ユーザの認証情報を追加する。 | -| account_list | ユーザの認証情報リストを取得する。 | -| create_folder | ストレージサービスにフォルダを追加する。プロジェクトのアドオン設定ページでフォルダを作る機能を提供しない場合は不要。 | -| folder_list | ストレージサービスのフォルダリストを取得する。 | - -シリアライザ(`serializer.py`)を定義し、 `addons.base.generic_views` を利用することで、以下のように一部のView処理を簡単に定義することができます。 - -``` -import_auth = addons.base.generic_views.import_auth( - SHORT_NAME, - Serializer -) -``` - -`generic_views` で提供していないView処理を追加したい場合や、View処理をカスタマイズしたい場合は、以下のように `views.py` に個別の関数を定義します。 - -``` -@must_have_addon(SHORT_NAME, 'node') -@must_be_addon_authorizer(SHORT_NAME) -def folder_list(node_addon, **kwargs): - return node_addon.get_folders() -``` - -フォルダの作成やフォルダリストの取得をするために、Addonでもストレージサービスへ接続する必要があります。 - -My MinIOアドオンの場合は、以下のように定義します。 - -- [routes.py](osf.io/addon/routes.py) -- [views.py](osf.io/addon/views.py) - - -### フレームワークによって提供されるView - -アドオンが持つ利用者用設定画面(`user_settings.mako`)とプロジェクト用設定画面(`node_settings.mako`)のテンプレートをそれぞれ定義します。認証情報の設定用ダイアログ(`credentials_modal.mako`)はどちらの画面でも利用するので、別のファイルで定義し、それぞれから参照します。 -My MinIOアドオンの場合は、以下のように定義します。 - -- [user_settings.mako](osf.io/addon/templates/user_settings.mako) -- [node_settings.mako](osf.io/addon/templates/node_settings.mako) -- [credentials_modal.mako](osf.io/addon/templates/credentials_modal.mako) - -利用者用設定画面のJavaScriptファイル(`user-cfg.js`, `myminioUserConfig.js`)と、プロジェクト用設定画面のJavaScriptファイル(`node-cfg.js`, `myminioNodeConfig.js`)をそれぞれ定義します。今回は、エントリとなるJavaScriptファイル(`*-cfg.js`)と定義ファイル(`myminio*Config.js`)を分けましたが、スケルトン アドオンのように `*-cfg.js` に定義を書いても構いません。 -My MinIOアドオンの場合は、以下のように定義します。 - -- [user-cfg.js](osf.io/addon/static/user-cfg.js) -- [node-cfg.js](osf.io/addon/static/node-cfg.js) -- [myminioUserConfig.js](osf.io/addon/static/myminioUserConfig.js) -- [myminioNodeConfig.js](osf.io/addon/static/myminioNodeConfig.js) - -また、変更履歴メッセージの定義ファイルも追加します。 -My MinIOアドオンの場合は、以下のように定義します。 - -- [myminioAnonymousLogActionList.json](osf.io/addon/static/myminioAnonymousLogActionList.json) -- [myminioLogActionList.json](osf.io/addon/static/myminioLogActionList.json) - -ストレージ操作UIであるFileViewerは[Fangorn](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/static/js/fangorn.js)を使って実装されています。アイテム選択時に表示するボタンをカスタマイズしたい場合は、 `Fangorn.config.アドオン名` を定義し、 `files.js` ファイルで読み込みます。 -My MinIOアドオンではカスタマイズせずデフォルト動作を使用しています。カスタマイズ例は、[GitHubアドオン](https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/github/static/githubFangornConfig.js)や[IQB-RIMSアドオン](https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/iqbrims/static/iqbrimsFangornConfig.js)を参照してください。 - -### 設定モジュール - -環境ごとの設定ファイル `local.py` の雛形として `local-dist.py` ファイルを定義します。サービス管理者は `local-dist.py` を `local.py` にコピーして、適宜設定値を書き換えます。 - -My MinIOアドオンの場合は、以下のように定義します。接続するMinIOサービスのホスト名を `HOST` プロパティに設定します。 - -- [local-dist.py](osf.io/addon/settings/local-dist.py) - -### テストコード - -シリアライザのテスト(`test_serializer.py`)を定義します。 -My MinIOアドオンの場合は、以下のように定義します。 - -- [test_serializer.py](osf.io/addon/tests/test_serializer.py) - -## WaterButler Providerのモジュール構成 - -WaterButler Providerは、WaterButlerプロジェクトの中でPythonモジュールとして実装されます。 - -`metadata.py` には、フォルダやファイルのメタデータと、リビジョンを持つクラスを定義します。 -My MinIOアドオンの場合は、以下のように定義します。 - -- [metadata.py](waterbutler/provider/metadata.py) - -`provider.py`には、ストレージサービスと接続しCRUD操作などを行うProviderクラスを定義します。 - -Providerが提供するメソッドには以下のようなものがあります。 - - -| 関数名 | 引数 | 戻り値 | 処理 | -|:------|:----|:------|:-----| -| validate_v1_path | path, **kwargs | WaterButlerPath | 文字列で与えられたパス情報(`path`)を検証し、属性付きのWaterButlerPathオブジェクトを返す。 | -| validate_path | path, **kwargs | WaterButlerPath | 同上(廃止予定のv0仕様との互換性維持のため、2つのメソッドに分かれている)。 | -| download | path, accept_url=False, version=None, range=None, **kwargs | Stream | 指定されたパス(`path`)のデータをダウンロードする。戻り値にはデータアクセス用のStreamを返す。 | -| upload | stream, path, conflict='replace', **kwargs | Metadata | 指定されたパス(`path`)に指定されたデータ(`stream`)をアップロードする。戻り値にはアップロードしたファイルを示すMetadataを返す。 | -| delete | path, confirm_delete=0, **kwargs | なし | 指定されたパス(`path`)のファイル・フォルダを削除する。 | -| revisions | path, **kwargs | List(Revision) | 指定されたパス(`path`)のリビジョン情報を取得する。 | -| metadata | path, revision=None, **kwargs | Metadata or List(Metadata) | 指定されたパス(`path`)のメタデータを取得する。`path` がfileの場合 `Metadata` , directoryの場合 `List(Metadata)` を返す。 | -| create_folder | path, folder_precheck=True, **kwargs | Metadata | 指定されたパスにフォルダを作成する。戻り値には作成したフォルダを示すMetadataを返す。 | -| can_intra_copy | dest_provider, path=None | Bool | 指定された送信先Provider(`dest_provider`), パス(`path`)に対してintra_copy(内部コピー: ストレージサービス上でのコピー)が可能かどうかを判定する。これがFalseの場合、いったん一時ディレクトリにdownloadして、destにuploadするという操作となる。 | -| can_intra_move | dest_provider, path=None | Bool | 指定された送信先Provider(`dest_provider`), パス(`path`)に対してintra_move(内部移動: ストレージサービス中での移動)が可能かどうかを判定する。これがFalseの場合、いったん一時ディレクトリにdownloadして、destにupload、コピー元ファイルをdeleteするという操作となる。 | -| intra_copy | dest_provider, src_path, dest_path | Bool | 内部コピーを実施する。成功すればTrueを返す。 | -| intra_move | dest_provider, src_path, dest_path | Bool | 内部移動を実施する。成功すればTrueを返す。 | - -My MinIOアドオンの場合は、以下のように定義します。 - -- [provider.py](waterbutler/provider/provider.py) - - -## OSF.io AddonとWaterButler Providerの認証情報の委譲 - -OSF.io Addonは、WaterButler Providerが必要なサービスに接続できるよう、認証情報を委譲します。この認証情報の形式はAddonにより異なるため、AddonとProviderのバージョンを合わせるなど依存関係に配慮する必要があります。 - -![認証情報などの委譲](images/crud.png) - -Addonにおける委譲設定は、 `addons.アドオン名.models.NodeSettings.serialize_waterbutler_credentials()` 関数で設定します。接続先のフォルダなどの情報は、同クラスの `serialize_waterbutler_settings()` 関数で設定します。例えば [IQB-RIMSアドオンの `serialize_waterbutler_settings()` 関数](https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/iqbrims/models.py#L226) では、フォルダごとの権限設定を渡します。 - -My MinIOアドオンの場合は、以下のように定義します。認証情報として、アクセス先のホスト名、アクセスキー、シークレットキーを渡します。設定情報として、接続先のバケットIDを渡します。 - -``` -def serialize_waterbutler_credentials(self): - if not self.has_auth: - raise exceptions.AddonError('Cannot serialize credentials for {} addon'.format(FULL_NAME)) - return { - 'host': settings.HOST, - 'access_key': self.external_account.oauth_key, - 'secret_key': self.external_account.oauth_secret, - } - -def serialize_waterbutler_settings(self): - if not self.folder_id: - raise exceptions.AddonError('Cannot serialize settings for {} addon'.format(FULL_NAME)) - return { - 'bucket': self.folder_id - } -``` - -Provider側では、認証情報と設定情報を `waterbutler.providers.アドオン名.アドオン名Provider` クラスのコンストラクタ(`__init__()`)の引数 `credentials` と `settings` にDictionary型でそれぞれ受け取ります。 - -My MinIOアドオンの場合は、以下のように定義します。認証情報を使ってMy MinIOサービスとの接続を確立し、設定情報を使って接続先バケットを取得します。 - -``` -class MyMinIOProvider(provider.BaseProvider): - def __init__(self, auth, credentials, settings): - super().__init__(auth, credentials, settings) - - host = credentials['host'] - port = 443 - m = re.match(r'^(.+)\:([0-9]+)$', host) - if m is not None: - host = m.group(1) - port = int(m.group(2)) - self.connection = MyMinIOConnection(credentials['access_key'], - credentials['secret_key'], - calling_format=OrdinaryCallingFormat(), - host=host, - port=port, - is_secure=port == 443) - self.bucket = self.connection.get_bucket(settings['bucket'], validate=False) -``` - -## Recent Activityの記録・表示 - -何らかのユーザ操作を契機としてアドオンに対して行われた操作は、Recent Activityという形で記録することができます。 - -### NodeLogモデルの追加 - -Recent Activityは[NodeLogモデル](https://github.com/RCOSDP/RDM-osf.io/blob/develop/osf/models/nodelog.py)により表現されます。 -ログの追加はNode(プロジェクトに対応するモデル)の [add_logメソッド](https://github.com/RCOSDP/RDM-osf.io/blob/develop/osf/models/mixins.py#L84) により行うことができます。 - -[models.py](osf.io/addon/models.py#L127-L143) -``` -self.owner.add_log( - '{0}_{1}'.format(SHORT_NAME, action), - auth=auth, - params={ - 'project': self.owner.parent_id, - 'node': self.owner._id, - 'path': metadata['materialized'], - 'bucket': self.folder_id, - 'urls': { - 'view': url, - 'download': url + '?action=download' - } - }, -) -``` - -この例では、NodeSettingsモデルのowner(Node)に対してログの追加を指示しています。 -パラメータには以下の値を指定することができます。 - -- `action` ... ログのアクション種別を示す名前。`アドオン名_アクション名`となる。本サンプルにより記録される`アクション名`には以下のものがある。 - - `node_authorized`, `node_deauthorized`, `node_deauthorized_no_user` ... プロジェクトに本アドオンが設定あるいは解除された場合に記録されるログ - - `bucket_linked`, `bucket_unlinked` ... プロジェクト設定画面により、バケットが設定あるいは解除された場合に記録されるログ - - `file_added`, `file_removed`, `file_updated`, `folder_created` ... WaterButlerによるファイル操作が行われた場合に記録されるログ -- `params` ... ログのパラメータ。任意のdictオブジェクトを指定することができる -- `auth` ... 操作を実施したユーザの情報。[framework.auth.Authクラス](https://github.com/RCOSDP/RDM-osf.io/blob/develop/framework/auth/core.py#L170)のインスタンスを与えることができる - -### NodeLogモデルの表示 - -記録されたログをどのように表示するかは、以下のJSONファイルにより定義します。 - -[myminioLogActionList.json](osf.io/addon/static/myminioLogActionList.json#L2) -``` -"myminio_bucket_linked" : "${user} linked the My MinIO bucket ${bucket} to ${node}", -``` - -[myminioAnonymousLogActionList.json](osf.io/addon/static/myminioAnonymousLogActionList.json#L2) -``` -"myminio_bucket_linked" : "A user linked an My MinIO bucket to a project", -``` - -`アドオン名LogActionList.json`はログインした状態でのプロジェクト表示の際に利用され、`アドオン名AnonymousLogActionList.json`はパブリックなプロジェクト(RDMでは利用を想定していません)に利用されます。 -どのメッセージがログ表示に利用されるかは、add_logメソッドの `action` 引数に与えられた文字列がキーとして使用されます。また、メッセージ定義中の `${パラメータ名}` にはadd_logメソッドの `params` 引数に与えられたパラメータ中のキーを指定することができます。 - -メッセージの国際化は[pybabelコマンド](http://babel.pocoo.org/en/latest/cmdline.html)を用いて行うことができます。定義したアドオンのメッセージ(英語で記載する)に対応する日本語メッセージの定義ファイルを生成するためには、 -以下のコマンドを実行します。 - -``` -# メッセージ定義JSONなどをJavaScriptファイルへと変換する -$ docker compose run --rm web invoke assets - -# メッセージ定義テンプレートファイル website/translations/js_messages.pot を更新する -$ docker compose run --rm web pybabel extract -F ./website/settings/babel_js.cfg -o ./website/translations/js_messages.pot . - -# メッセージ定義ファイル website/translations/ja/LC_MESSAGES/js_messages.po を更新する -$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/en/LC_MESSAGES/js_messages.po -l en -$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/ja/LC_MESSAGES/js_messages.po -l ja -``` - -すると、`website/translations/ja/LC_MESSAGES/js_messages.po`ファイルに、以下のような空の項目が追加されます。 - -``` -#: website/static/js/logActionsList_extract.js:246 -msgid "${user} linked the My MinIO bucket ${bucket} to ${node}" -msgstr "" -``` - -この `msgstr` に日本語によるメッセージ定義を追加することで、メッセージを国際化することができます。 - -``` -#: website/static/js/logActionsList_extract.js:246 -msgid "${user} linked the My MinIO bucket ${bucket} to ${node}" -msgstr "${user}が My MinIOバケット(${bucket})を接続しました" -``` - -`js_messages.po` を変更したら、`assets`サービスを再起動してください。最新の`js_messages.po`ファイルがメッセージの表示に使用されるようになります。 - -``` -$ docker compose restart assets -``` - -## タイムスタンプの処理 - -RDMではユーザが任意のタイミングで、プロジェクト中のファイルに対してタイムスタンプを打つことができます。タイムスタンプは、ファイルに関してその時点での内容を証明するもので、研究の証跡としてのデータを考える上で非常に重要です。 - -なお、docker-composeで起動した状態では [FreeTSA Project](http://eswg.jnsa.org/sandbox/freetsa/) のサーバを用いてタイムスタンプを付与します。実環境への配備時は[UPKI電子証明書発行サービス](https://certs.nii.ac.jp/)によりタイムスタンプ付与することを想定しています。 - -### ユーザによるタイムスタンプの追加 - -タイムスタンプは、ファイルの内容から計算したハッシュ値を署名する形で作成されます。ハッシュの取得は以下のいずれかの方法でおこないます。 - -- `osf.models.files.File` サブクラスの `get_hash_for_timestamp`により取得する -- WaterButlerを経由してファイルをダウンロードし、ハッシュ計算を行う - -`osf.models.files.File` サブクラスはアドオンのモデルとしてハッシュ値の取得方法を定義するものです。本サンプルでは [models.py](osf.io/addon/models.py) にあります。 -ストレージにより容易にハッシュ相当の値を取得・管理する方法がある場合は、このモデルに`get_hash_for_timestamp(self)`メソッドを定義します。 -タイムスタンプ処理はこのメソッドを通じてハッシュ値を取得することができます。 -`get_hash_for_timestamp(self)`メソッドの実装は dropboxbusinessアドオンの [DropboxBusinessFileクラス](https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/dropboxbusiness/models.py#L38) を参考にしてください。 - -`osf.models.files.File`モデルに`get_hash_for_timestamp(self)`が定義されていない場合は、タイムスタンプ処理はWaterButlerを経由してファイルをダウンロードする方法を試行します。 - -### RDM以外でのファイル変更によるタイムスタンプの追加 - -RDM以外でのファイル変更時に実施する場合も、ファイルが変更されたことを示すためにタイムスタンプを付加したい場合があります。 -このような処理を実行するためには `website.util.timestamp` モジュールを使用します。 -例えばDropbox Businessアドオンでは以下のように実装しています。 - -[dropboxbusiness/utils.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/dropboxbusiness/utils.py) -``` -... -from website.util import timestamp - -... - -file_info = { - 'file_id': file_node._id, - 'file_name': attrs.get('name'), - 'file_path': attrs.get('materialized'), - 'size': attrs.get('size'), - 'created': attrs.get('created_utc'), - 'modified': attrs.get('modified_utc'), - 'file_version': '', - 'provider': PROVIDER_NAME -} -# verified by admin -verify_result = timestamp.check_file_timestamp( - admin.id, node, file_info, verify_external_only=True) -``` - -`check_file_timestamp(uid, node, data, verify_external_only=False)`関数は以下のパラメータを指定することができます。 - -- `uid` ... タイムスタンプ操作を行うユーザを示すOSFUserのID -- `node` ... ファイルが所属するプロジェクトを示すNode -- `data` ... タイムスタンプにより署名検証するデータを示す辞書型データ -- `verify_external_only` ... タイムスタンプ検証情報の格納に`osf.models.RdmFileTimestamptokenVerifyResult`を使う場合はFalse, 使わない場合(`osf.models.files.File` サブクラスの`def set_timestamp(self, timestamp_data, timestamp_status, context)`に格納する場合)はTrueとする (デフォルトはFalse) - -なお、`def set_timestamp(self, timestamp_data, timestamp_status, context)` の定義方法は dropboxbusinessアドオンの [DropboxBusinessFileクラス](https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/dropboxbusiness/models.py#L38) を参考にしてください。 - -また、タイムスタンプの付加処理はストレージのAPI呼び出しやタイムスタンプの付加処理などI/Oを伴うため、viewsモジュール内の関数など、リクエストハンドラとして振る舞う関数中で処理を行ってしまうと、他のハンドラが待たされる要因になります。 -このような状況に対応するため、RDMでは[Celery](https://docs.celeryproject.org/en/stable/)によるワーカーが用意されています。 -関数をCeleryタスクとして定義することで、時間がかかる処理はワーカーに委譲することができます。 -例えばDropbox Businessアドオンでは以下のように定義しています。 - -[dropboxbusiness/utils.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/dropboxbusiness/utils.py) -``` -... -from framework.celery_tasks import app as celery_app - -... - -@celery_app.task(bind=True, base=AbortableTask) -def celery_check_updated_files(self, team_ids): - ... -``` - -呼び出し側では以下のように関数を実行することで、ワーカーに処理を任せ、自身の処理を続行することができます。 - -[dropboxbusiness/views.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/dropboxbusiness/views.py) -``` -utils.celery_check_updated_files.delay(team_ids) -``` - -# My MinIOアドオンの実装 - -ここでは、 `myminio` という識別名のアドオンの実装を例に説明します。アドオンの完全名は `My MinIO` とします。 - -アドオン名は様々な場所に埋め込まれています。アドオン名を変更したい場合は、以降で追加・変更するファイル名やコードの `myminio` 、 `My MinIO` 、 `MyMinIO` という文字列を変更してください。 - -My MinIOアドオンは、AWS S3互換サービスと接続するアドオンなので、Amazon S3アドオンやS3 Compatible Storageアドオンを参考に実装することができます。Amazon S3アドオンやS3 Compatible Storageアドオンとの違いは以下の通りです。 - -- My MinIOアドオンは簡単のため、アップロードの暗号化機能を実装しない。 -- Amazon S3アドオンやS3 Compatible Storageアドオンは、アカウントごとに接続するサービスやLocationなどを選択できるが、My MinIOはサービス側で指定した特定のMinIOサービスのみを扱う。 - -## OSF.ioへの実装 - -### addons.myminio モジュールの定義 - -スケルトン アドオンと同様に、[アドオンの実装例(`osf.io/addon/`)](osf.io/addon/)を `addons/myminio` ディレクトリにコピーします。 - -### RDMコードの変更 - -スケルトン アドオンと同様に、RDMのコードをいくつか変更します。 - -- [addons.json](https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons.json) - - 変更例のサンプル: [addons.json](osf.io/config/addons.json) -- [framework/addons/data/addons.json](https://github.com/RCOSDP/RDM-osf.io/blob/develop/framework/addons/data/addons.json) - - 変更例のサンプル: [addons.json](osf.io/config/framework/addons/data/addons.json) -- [Dockerfile](https://github.com/RCOSDP/RDM-osf.io/blob/develop/Dockerfile) - - 変更例のサンプル: [Dockerfile](osf.io/config/Dockerfile) -- [api/base/settings/defaults.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/api/base/settings/defaults.py) - - 変更例のサンプル: [defaults.py](osf.io/config/api/base/settings/defaults.py) - -`api/base/settings/defaults.py` は、 `INSTALLED_APPS` の他に、 `ADDONS_FOLDER_CONFIGURABLE` 、 `ADDONS_OAUTH` にもアドオン名を追加します。変更例サンプルでは、Amazon S3アドオンに合わせて、スケルトン アドオンとは異なる方法で設定しています。 - -``` -INSTALLED_APPS += ('addons.myminio',) -ADDONS_FOLDER_CONFIGURABLE.append('myminio') -ADDONS_OAUTH.append('myminio') -``` - -他にもストレージアドオンでは、 [website/static/storageAddons.json](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/static/storageAddons.json) にも設定を追加する必要があります。 - -変更例は [storageAddons.json](osf.io/config/website/static/storageAddons.json) を参照してください。 - -``` - "myminio": { - "fullName": "My MinIO", - "externalView": false - }, -``` - -> `externalView` を `true` に設定すると、FileViewerでファイルの外部ページリンクボタンが表示されるようになります。リンクを正しく動作させるには、WaterButlerのProviderを修正する必要があります。詳細は[GoogleDriveの実装](https://github.com/RCOSDP/RDM-waterbutler/blob/develop/waterbutler/providers/googledrive/metadata.py#L116)などを参照してください。 - -> FileViewerで、フォルダの操作はできるがファイルの操作ができない場合は、 `storageAddons.json` の設定が漏れている可能性があります。 - - -### Migrationsファイルの作成 - -`makemigrations` コマンドを実行して、Migrationsファイルを作成します。 - -``` -$ docker compose run --rm web python3 manage.py makemigrations -``` - -上記の出力中に以下のような出力が現れれば成功です。ストレージアドオンの場合、 `osf/migrations` と `addons/myminio/migrations` の2つのディレクトリ内にPythonファイルが作成されます。 - -> `osf/migrations` 配下に作成されるファイル名は、作成日時やRDMのバージョンによって異なります。 - -``` -Migrations for 'osf': - osf/migrations/0214_auto_20201001_0007.py - - Create proxy model MyMinIOFileNode - - Alter field type on basefilenode - - Create proxy model MyMinIOFile - - Create proxy model MyMinIOFolder -Migrations for 'addons_myminio': - addons/myminio/migrations/0001_initial.py - - Create model NodeSettings - - Create model UserSettings - - Add field user_settings to nodesettings -``` - -### 国際化メッセージファイルの作成 - -国際化メッセージファイルの定義ファイルは以下のコマンドで生成することができます。 - -> このセクションの実施時は各サービスを停止状態にしてください。 - -``` -# メッセージ定義JSONなどをJavaScriptファイルへと変換する。各サービスが停止している状態で実施する。 -$ docker compose run --rm web invoke assets - -# メッセージ定義テンプレートファイル website/translations/js_messages.pot を更新する -$ docker compose run --rm web pybabel extract -F ./website/settings/babel_js.cfg -o ./website/translations/js_messages.pot . - -# メッセージ定義ファイル website/translations/ja/LC_MESSAGES/js_messages.po を更新する -$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/en/LC_MESSAGES/js_messages.po -l en -$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/ja/LC_MESSAGES/js_messages.po -l ja -``` - -変更例のサンプル [js_messages.po](osf.io/config/website/translations/ja/LC_MESSAGES/js_messages.po) を参考に日本語メッセージを追加してください。 - -``` -#: website/static/js/logActionsList_extract.js:246 -msgid "${user} linked the My MinIO bucket ${bucket} to ${node}" -msgstr "${user}がMy MinIOバケット(${bucket})を${node}にリンクしました" - -#: website/static/js/logActionsList_extract.js:247 -msgid "${user} unselected the My MinIO bucket ${bucket} in ${node}" -msgstr "${user}が${node}のMy MinIOバケット(${bucket})の選択を解除しました" - -... -``` - -このメッセージを追加後、`assets`サービスの再起動時にメッセージ定義が反映されます。 - -### アドオンのテスト - -以下のコマンドで、OSF.ioに追加したMy MinIOアドオンのユニットテストを実行できます。 - -``` -$ docker compose run --rm web invoke test_module -m addons/myminio/tests/ -``` - -## WaterButlerへの実装 - -### waterbutler.providers.myminio モジュールの定義 - -[Providerの実装例(`waterbutler/provider/`)](waterbutler/provider/) を `waterbutler/providers/myminio` にコピーします。また、[Providerのテストコード例(`waterbutler/tests`)](waterbutler/tests) を `tests/providers/myminio` にコピーします。 - -### RDMコードの変更 - -[setup.py](https://github.com/RCOSDP/RDM-waterbutler/blob/develop/setup.py) に、アドオンのエントリポイント定義を追加します。`setup()` 関数の引数 `entry_points` に指定するDictionaryの `waterbutler.providers` キーに指定する配列に、以下を追加します。 - -``` -'myminio = waterbutler.providers.myminio:MyMinIOProvider', -``` - -変更例はサンプル [setup.py](waterbutler/config/setup.py) を参照してください。 - -### docker-compose.override.yml の追加 - -変更したコードを使うよう、RDMの `docker-compose.override.yml` で WaterButler のサービスの `volumes` を指定します。 - -例えば、以下のようなディレクトリ階層の場合は、 - -``` -. -├── RDM-osf.io -│   ├── docker-compose.override.yml -│   └── docker-compose.yml -└── RDM-waterbutler -``` - -`RDM-osf.io/docker-compose.override.yml` の内容を以下のようにします。 - -``` -version: "3.4" - -services: - wb: - volumes: - - ../RDM-waterbutler:/code - wb_worker: - volumes: - - ../RDM-waterbutler:/code - wb_requirements: - volumes: - - ../RDM-waterbutler:/code -``` - - -### アドオンのテスト - -以下のコマンドで、WaterButlerに追加したMy MinIOアドオン Providerのユニットテストを実行できます。 - -``` -$ docker compose run --rm wb invoke test --provider myminio -``` - - -# My MinIOアドオンの動作確認 - -My MinIOアドオンの動作確認をしてみましょう。 - -## MinIOサービスの起動 - -接続先のMinIOサービスを起動します。 - -``` -docker run -p 9001:9000 \ - -e "MINIO_ACCESS_KEY=minioadmin" \ - -e "MINIO_SECRET_KEY=minioadmin" \ - minio/minio server /data -``` - -RDMと同じコンピュータで実行する場合、9000番ポートが競合してしまうので、MinIOサービスのホストへの割り当てポートは9001などに設定します。 -`MINIO_ACCESS_KEY` と `MINIO_SECRET_KEY` は認証に使うキーです。適宜書き換えてください。 - -その他MinIOに関する詳しい説明は[MinIOのドキュメント](https://docs.min.io/)を参照してください。 - -## OSF.io Addonの設定 - -OSF.io Addonの設定をします。 `addons/myminio/settings/local-dist.py` を `addons/myminio/settings/local.py` にコピーし、 `HOST` プロパティに先ほど起動したMinIOサービスのホスト名を指定します。 - -``` -HOST = '192.168.168.167:9001' -``` - -RDMとMinIOサービスを同じ環境で実行している場合は、ループバックエイリアスを指定します。 - -## DBマイグレーション - -マイグレーションを実行し、Migrations定義をPostgreSQLサービスに反映します。 - -``` -$ docker compose run --rm web python3 manage.py migrate -``` - -## サービスの再起動 - -WaterButlerに追加したProviderを有効にするために、 `wb_requirements` を起動します。 - -``` -$ docker compose up wb_requirements -``` - -変更したファイルに関連するサービスを再起動します。 - -``` -$ docker compose restart assets web api wb -``` - -これでサービスへの反映は完了です。 - -## ストレージアドオンを試す - -My MinIOアドオンを試すには、以下のような操作を実施します。 - -1. RDM Web UIにアクセスする `http://localhost:5000` -1. ユーザ設定ページを開く -1. Configure add-on accountsページを開く -1. My MinIOアドオンの認証情報を設定をする - ![Authorize Addon](images/authorize-addon.png) - 認証情報の設定ダイアログが表示されるので、MinIOサービスの `MINIO_ACCESS_KEY` と `MINIO_SECRET_KEY` を、それぞれ、`Access Key` と `Secret Key` フォームに入力して保存します。 - ![Filled Credential](images/filled-credential.png) - 成功すれば、切断ボタンと利用しているプロジェクトリストが表示されるエリアが表示されます。 - ![Successful Authorization Addon](images/successful-authorization-addon.png) -1. 適当なプロジェクトを作成する -1. Add-onsページを開く -1. My MinIOアドオンを有効化する - ![Enable Addon](images/enable-addon.png) -1. My MinIOアドオンの設定をする - ![Configure Addon](images/configure-addon.png) - `Import Account from Profile`ボタンから、アドオンの設定を行います。 - 接続に成功すると、ルート直下のフォルダリストが表示されるので、プロジェクトに紐付けるフォルダを選択し、保存します。このページでフォルダを作成することもできます。 - ![Select Current Folder](images/select-current-folder.png) - -これで、作成したプロジェクトでMy MinIOアドオンが使えるようになりました。 -プロジェクトページのFiles ウィジェットやFilesページから、My MinIOサービスに対してフォルダの作成やファイルのアップロード、削除、ダウンロードなどができるようになるはずです。 - -![Enabled Addon](images/enabled-addon.png) - -以上でMy MinIOアドオンの動作確認は完了です! +- [ Guides index](../docs/guides/README.md) / ガイド一覧 +- [ SPEC-06 Documentation Conventions](../docs/spec/06_documentation_conventions.md) / 文書規約 diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..28aef55 --- /dev/null +++ b/docs/README.md @@ -0,0 +1,114 @@ +# Documentation Index / 文書索引 + +> **Summary:** The index of all documents in this repository: policies (our position), specifications (rules to implement), decisions (why we chose), demos (records of what was actually done), status (milestone progress), hand-offs (requests to other teams), reviews (review records), and reference (external facts). A Mermaid diagram shows how a change flows through the process. +> **概要:** このリポジトリのすべての文書の索引。方針(私たちの立場)、仕様(実装するルール)、決定(なぜ選んだか)、実証(実際にやったことの記録)、進捗(節目の進行状況)、引継ぎ(他のチームへの依頼)、レビュー(レビュー記録)、参考(外部事実)。Mermaid 図は、変更がプロセスを通る流れを示します。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.1 — 2026-11-05. **Learned:** without a single index page, it was unclear which folder to check for the latest milestone status or review records; putting everything in one place makes the documentation tree navigable. / 単一の索引ページが無ければ、最新の節目進捗やレビュー記録をどのフォルダで探すべきか分からず、文書ツリーのナビゲートが不可能になると分かった。 +- Normative for: every document under `docs/`, especially README.md files. +- Related: [../README.md](../README.md) · [site/index.html](../site/index.html) + +--- + + +## English + +[→ 日本語版へ](#japanese) + +### 1. Document folders + +| Folder | Description | +|---|---| +| [policy/](policy/README.md) | Our position on what we will and will not do. Each document states our stance on a topic. | +| [spec/](spec/README.md) | Rules to implement: specifications, acceptance tests, security gate, installer CLI. | +| [decisions/](decisions/README.md) | Decision records: why we chose one way and not another. | +| [demo/](demo/README.md) | Records of what was actually done: acceptance runs, integration test results. | +| [status/](status/README.md) | Milestone progress: M1–M5 status, open items, upstream tracking reports. | +| [handoff/](handoff/README.md) | Requests to other teams: dated files, named YYYY-MM-DD_.md. | +| [reviews/](reviews/README.md) | Review records: dated files, named YYYY-MM-DD_<Title>_rN.md. | +| [reference/](reference/README.md) | External facts: glossary, tool versions, upstream metadata. | + +### 2. How a change flows + +```mermaid +flowchart TD + A[Demo / Acceptance run] --> B{Pass?} + B -- yes --> C[Policy: position on the change] + B -- no --> D[Policy: rejection reason] + C --> E[Spec / ADR: rules to implement the change] + D --> E + E --> F[Code: implement the spec / decision] + F --> G[Demos: acceptance run with new behavior] + G --> H[Status: update milestone progress] + H --> I[Hand-off: request review / merge if ready] + I --> J[Reviews: independent assessment recorded] + J --> K{Decision} + K -- accept --> L[Merge to develop] + K -- reject --> M[Return for fix] +``` + +### 3. Links + +- [../README.md](../README.md) — Root index of the whole repository. +- [site/index.html](../site/index.html) — HTML site built by MkDocs (a tool that turns Markdown files into a website; see [REF-01](reference/REF-01_Glossary.md)). + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 文書フォルダ + +| フォルダ | 説明 | +|---|---| +| [policy/](policy/README.md) | 我々が何をし、何をしないかの立場。各文書はトピックに関する私たちの姿勢を述べます。 | +| [spec/](spec/README.md) | 実装するルール:仕様、受入試験、セキュリティの門、インストーラー CLI。 | +| [decisions/](decisions/README.md) | 決定の記録:なぜその道を選び、ほかを選ばなかったか。 | +| [demo/](demo/README.md) | 実際にやったことの記録:受入試験、統合試験結果。 | +| [status/](status/README.md) | 節目の進行状況:M1〜M5 の進捗、未解決項目、上流追従報告。 | +| [handoff/](handoff/README.md) | 他のチームへの依頼:日付付きファイル、YYYY-MM-DD_<Title>.md の形式。 | +| [reviews/](reviews/README.md) | レビュー記録:日付付きファイル、YYYY-MM-DD_<Title>_rN の形式。 | +| [reference/](reference/README.md) | 外部事実:用語集、道具の版、上流メタデータ。 | + +### 2. 変更が流れる流れ + +```mermaid +flowchart TD + A[実証/受入試験] --> B{合格?} + B -- はい --> C[方針:変更に関する立場] + B -- いいえ --> D[方針:拒否理由] + C --> E[仕様/ADR:変更を実装するルール] + D --> E + E --> F[コード:spec/ADR を実装] + F --> G[実証:新しい動作での受入試験] + G --> H[進捗:節目の進行状況を更新] + H --> I[引継ぎ:レビュー/マージの依頼] + I --> J[レビュー:独立した評価を記録] + J --> K{決定} + K -- 承認 --> L[develop へマージ] + K -- 拒否 --> M[修正のために戻す] +``` + +### 3. リンク + +- [../README.md](../README.md) — リポジトリ全体のルート索引。 +- [site/index.html](../site/index.html) — MkDocs(Markdown のファイルを Web サイトに変える道具。[REF-01](reference/REF-01_Glossary.md))が生成する HTML サイト。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Policy | A statement of our position on what we will and will not do. | 我々が何をし、何をしないかの立場。 | +| Specification | A rule book that implementers must follow. | 実装する人が守るルールブック。 | +| Decision record (ADR) | A note explaining why we chose one way and not another. | なぜその道を選び、ほかを選ばなかったかのメモ。 | +| Demo | Records of what was actually done, including acceptance runs. | 実際にやったことの記録、受入試験を含む。 | +| Milestone | A checkpoint with a pass/fail test. | 合否の試験がある関門。 | +| Hand-off | A request to another team or agent. | 他のチーム・エージェントへの依頼。 | +| Review | An independent assessment of a pull request. | プルリクエストの独立した評価。 | +| Reference | External facts such as glossaries, tool versions. | 用語集や道具の版などの外部事実。 | diff --git a/docs/assets/README.md b/docs/assets/README.md new file mode 100644 index 0000000..4951aa3 --- /dev/null +++ b/docs/assets/README.md @@ -0,0 +1,33 @@ +# Site Assets / サイト用の部品 + +> **Summary:** Third-party and local files that the MkDocs site loads. Kept in the repository so the HTML version works without any external network. +> **概要:** MkDocs のサイトが読み込む外部・自作のファイル。外部ネットワークなしで HTML 版が動くよう、リポジトリに同梱する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** loading Mermaid from a CDN made every generated page depend on an external host (Semgrep flagged 43 pages for missing integrity), so the library is vendored here instead. / Mermaid を CDN から読み込むと生成ページ全部が外部ホストに依存する(Semgrep が 43 ページを integrity 欠落として検出)と分かり、ここに同梱に変えた。 +- Related: [docs/README.md](../README.md) · [SPEC-06 §4](../spec/06_documentation_conventions.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +| File | Origin | License | Note | +|---|---|---|---| +| `mermaid.min.js` | mermaid 11.4.1, `https://unpkg.com/mermaid@11.4.1/dist/mermaid.min.js` | MIT | Draws diagrams written as text (Mermaid). Do not edit. Update by replacing the file and this row. | +| `mermaid-init.js` | written here | MIT (this repository) | Starts Mermaid on page load. | + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +| ファイル | 出所 | ライセンス | 備考 | +|---|---|---|---| +| `mermaid.min.js` | mermaid 11.4.1、`https://unpkg.com/mermaid@11.4.1/dist/mermaid.min.js` | MIT | 文字で書いた図(Mermaid)を描く。編集しない。更新はファイルとこの行を差し替える。 | +| `mermaid-init.js` | 本リポジトリで作成 | MIT(本リポジトリ) | ページ読み込み時に Mermaid を起動する。 | diff --git a/docs/assets/mermaid-init.js b/docs/assets/mermaid-init.js new file mode 100644 index 0000000..313a6e8 --- /dev/null +++ b/docs/assets/mermaid-init.js @@ -0,0 +1 @@ +mermaid.initialize({startOnLoad:true}); diff --git a/docs/assets/mermaid.min.js b/docs/assets/mermaid.min.js new file mode 100644 index 0000000..b01ad01 --- /dev/null +++ b/docs/assets/mermaid.min.js @@ -0,0 +1,2314 @@ +"use strict";var __esbuild_esm_mermaid=(()=>{var cxe=Object.create;var R1=Object.defineProperty;var uxe=Object.getOwnPropertyDescriptor;var hxe=Object.getOwnPropertyNames;var fxe=Object.getPrototypeOf,dxe=Object.prototype.hasOwnProperty;var o=(t,e)=>R1(t,"name",{value:e,configurable:!0});var M=(t,e)=>()=>(t&&(e=t(t=0)),e);var Ni=(t,e)=>()=>(e||t((e={exports:{}}).exports,e),e.exports),vr=(t,e)=>{for(var r in e)R1(t,r,{get:e[r],enumerable:!0})},Cb=(t,e,r,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of hxe(e))!dxe.call(t,i)&&i!==r&&R1(t,i,{get:()=>e[i],enumerable:!(n=uxe(e,i))||n.enumerable});return t},Er=(t,e,r)=>(Cb(t,e,"default"),r&&Cb(r,e,"default")),ka=(t,e,r)=>(r=t!=null?cxe(fxe(t)):{},Cb(e||!t||!t.__esModule?R1(r,"default",{value:t,enumerable:!0}):r,t)),pxe=t=>Cb(R1({},"__esModule",{value:!0}),t);var Ab=Ni((wS,TS)=>{"use strict";(function(t,e){typeof wS=="object"&&typeof TS<"u"?TS.exports=e():typeof define=="function"&&define.amd?define(e):(t=typeof globalThis<"u"?globalThis:t||self).dayjs=e()})(wS,function(){"use strict";var t=1e3,e=6e4,r=36e5,n="millisecond",i="second",a="minute",s="hour",l="day",u="week",h="month",f="quarter",d="year",p="date",m="Invalid Date",g=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,y=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,v={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:o(function(k){var R=["th","st","nd","rd"],S=k%100;return"["+k+(R[(S-20)%10]||R[S]||R[0])+"]"},"ordinal")},x=o(function(k,R,S){var O=String(k);return!O||O.length>=R?k:""+Array(R+1-O.length).join(S)+k},"m"),b={s:x,z:o(function(k){var R=-k.utcOffset(),S=Math.abs(R),O=Math.floor(S/60),N=S%60;return(R<=0?"+":"-")+x(O,2,"0")+":"+x(N,2,"0")},"z"),m:o(function k(R,S){if(R.date()<S.date())return-k(S,R);var O=12*(S.year()-R.year())+(S.month()-R.month()),N=R.clone().add(O,h),P=S-N<0,F=R.clone().add(O+(P?-1:1),h);return+(-(O+(S-N)/(P?N-F:F-N))||0)},"t"),a:o(function(k){return k<0?Math.ceil(k)||0:Math.floor(k)},"a"),p:o(function(k){return{M:h,y:d,w:u,d:l,D:p,h:s,m:a,s:i,ms:n,Q:f}[k]||String(k||"").toLowerCase().replace(/s$/,"")},"p"),u:o(function(k){return k===void 0},"u")},w="en",_={};_[w]=v;var T="$isDayjsObject",E=o(function(k){return k instanceof I||!(!k||!k[T])},"S"),L=o(function k(R,S,O){var N;if(!R)return w;if(typeof R=="string"){var P=R.toLowerCase();_[P]&&(N=P),S&&(_[P]=S,N=P);var F=R.split("-");if(!N&&F.length>1)return k(F[0])}else{var B=R.name;_[B]=R,N=B}return!O&&N&&(w=N),N||!O&&w},"t"),C=o(function(k,R){if(E(k))return k.clone();var S=typeof R=="object"?R:{};return S.date=k,S.args=arguments,new I(S)},"O"),A=b;A.l=L,A.i=E,A.w=function(k,R){return C(k,{locale:R.$L,utc:R.$u,x:R.$x,$offset:R.$offset})};var I=function(){function k(S){this.$L=L(S.locale,null,!0),this.parse(S),this.$x=this.$x||S.x||{},this[T]=!0}o(k,"M");var R=k.prototype;return R.parse=function(S){this.$d=function(O){var N=O.date,P=O.utc;if(N===null)return new Date(NaN);if(A.u(N))return new Date;if(N instanceof Date)return new Date(N);if(typeof N=="string"&&!/Z$/i.test(N)){var F=N.match(g);if(F){var B=F[2]-1||0,$=(F[7]||"0").substring(0,3);return P?new Date(Date.UTC(F[1],B,F[3]||1,F[4]||0,F[5]||0,F[6]||0,$)):new Date(F[1],B,F[3]||1,F[4]||0,F[5]||0,F[6]||0,$)}}return new Date(N)}(S),this.init()},R.init=function(){var S=this.$d;this.$y=S.getFullYear(),this.$M=S.getMonth(),this.$D=S.getDate(),this.$W=S.getDay(),this.$H=S.getHours(),this.$m=S.getMinutes(),this.$s=S.getSeconds(),this.$ms=S.getMilliseconds()},R.$utils=function(){return A},R.isValid=function(){return this.$d.toString()!==m},R.isSame=function(S,O){var N=C(S);return this.startOf(O)<=N&&N<=this.endOf(O)},R.isAfter=function(S,O){return C(S)<this.startOf(O)},R.isBefore=function(S,O){return this.endOf(O)<C(S)},R.$g=function(S,O,N){return A.u(S)?this[O]:this.set(N,S)},R.unix=function(){return Math.floor(this.valueOf()/1e3)},R.valueOf=function(){return this.$d.getTime()},R.startOf=function(S,O){var N=this,P=!!A.u(O)||O,F=A.p(S),B=o(function(ee,J){var H=A.w(N.$u?Date.UTC(N.$y,J,ee):new Date(N.$y,J,ee),N);return P?H:H.endOf(l)},"l"),$=o(function(ee,J){return A.w(N.toDate()[ee].apply(N.toDate("s"),(P?[0,0,0,0]:[23,59,59,999]).slice(J)),N)},"$"),z=this.$W,W=this.$M,j=this.$D,K="set"+(this.$u?"UTC":"");switch(F){case d:return P?B(1,0):B(31,11);case h:return P?B(1,W):B(0,W+1);case u:var ie=this.$locale().weekStart||0,Q=(z<ie?z+7:z)-ie;return B(P?j-Q:j+(6-Q),W);case l:case p:return $(K+"Hours",0);case s:return $(K+"Minutes",1);case a:return $(K+"Seconds",2);case i:return $(K+"Milliseconds",3);default:return this.clone()}},R.endOf=function(S){return this.startOf(S,!1)},R.$set=function(S,O){var N,P=A.p(S),F="set"+(this.$u?"UTC":""),B=(N={},N[l]=F+"Date",N[p]=F+"Date",N[h]=F+"Month",N[d]=F+"FullYear",N[s]=F+"Hours",N[a]=F+"Minutes",N[i]=F+"Seconds",N[n]=F+"Milliseconds",N)[P],$=P===l?this.$D+(O-this.$W):O;if(P===h||P===d){var z=this.clone().set(p,1);z.$d[B]($),z.init(),this.$d=z.set(p,Math.min(this.$D,z.daysInMonth())).$d}else B&&this.$d[B]($);return this.init(),this},R.set=function(S,O){return this.clone().$set(S,O)},R.get=function(S){return this[A.p(S)]()},R.add=function(S,O){var N,P=this;S=Number(S);var F=A.p(O),B=o(function(W){var j=C(P);return A.w(j.date(j.date()+Math.round(W*S)),P)},"y");if(F===h)return this.set(h,this.$M+S);if(F===d)return this.set(d,this.$y+S);if(F===l)return B(1);if(F===u)return B(7);var $=(N={},N[a]=e,N[s]=r,N[i]=t,N)[F]||1,z=this.$d.getTime()+S*$;return A.w(z,this)},R.subtract=function(S,O){return this.add(-1*S,O)},R.format=function(S){var O=this,N=this.$locale();if(!this.isValid())return N.invalidDate||m;var P=S||"YYYY-MM-DDTHH:mm:ssZ",F=A.z(this),B=this.$H,$=this.$m,z=this.$M,W=N.weekdays,j=N.months,K=N.meridiem,ie=o(function(J,H,q,Z){return J&&(J[H]||J(O,P))||q[H].slice(0,Z)},"h"),Q=o(function(J){return A.s(B%12||12,J,"0")},"d"),ee=K||function(J,H,q){var Z=J<12?"AM":"PM";return q?Z.toLowerCase():Z};return P.replace(y,function(J,H){return H||function(q){switch(q){case"YY":return String(O.$y).slice(-2);case"YYYY":return A.s(O.$y,4,"0");case"M":return z+1;case"MM":return A.s(z+1,2,"0");case"MMM":return ie(N.monthsShort,z,j,3);case"MMMM":return ie(j,z);case"D":return O.$D;case"DD":return A.s(O.$D,2,"0");case"d":return String(O.$W);case"dd":return ie(N.weekdaysMin,O.$W,W,2);case"ddd":return ie(N.weekdaysShort,O.$W,W,3);case"dddd":return W[O.$W];case"H":return String(B);case"HH":return A.s(B,2,"0");case"h":return Q(1);case"hh":return Q(2);case"a":return ee(B,$,!0);case"A":return ee(B,$,!1);case"m":return String($);case"mm":return A.s($,2,"0");case"s":return String(O.$s);case"ss":return A.s(O.$s,2,"0");case"SSS":return A.s(O.$ms,3,"0");case"Z":return F}return null}(J)||F.replace(":","")})},R.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},R.diff=function(S,O,N){var P,F=this,B=A.p(O),$=C(S),z=($.utcOffset()-this.utcOffset())*e,W=this-$,j=o(function(){return A.m(F,$)},"D");switch(B){case d:P=j()/12;break;case h:P=j();break;case f:P=j()/3;break;case u:P=(W-z)/6048e5;break;case l:P=(W-z)/864e5;break;case s:P=W/r;break;case a:P=W/e;break;case i:P=W/t;break;default:P=W}return N?P:A.a(P)},R.daysInMonth=function(){return this.endOf(h).$D},R.$locale=function(){return _[this.$L]},R.locale=function(S,O){if(!S)return this.$L;var N=this.clone(),P=L(S,O,!0);return P&&(N.$L=P),N},R.clone=function(){return A.w(this.$d,this)},R.toDate=function(){return new Date(this.valueOf())},R.toJSON=function(){return this.isValid()?this.toISOString():null},R.toISOString=function(){return this.$d.toISOString()},R.toString=function(){return this.$d.toUTCString()},k}(),D=I.prototype;return C.prototype=D,[["$ms",n],["$s",i],["$m",a],["$H",s],["$W",l],["$M",h],["$y",d],["$D",p]].forEach(function(k){D[k[1]]=function(R){return this.$g(R,k[0],k[1])}}),C.extend=function(k,R){return k.$i||(k(R,I,C),k.$i=!0),C},C.locale=L,C.isDayjs=E,C.unix=function(k){return C(1e3*k)},C.en=_[w],C.Ls=_,C.p={},C})});var EF,jc,Y,M1,bo,ht=M(()=>{"use strict";EF=ka(Ab(),1),jc={trace:0,debug:1,info:2,warn:3,error:4,fatal:5},Y={trace:o((...t)=>{},"trace"),debug:o((...t)=>{},"debug"),info:o((...t)=>{},"info"),warn:o((...t)=>{},"warn"),error:o((...t)=>{},"error"),fatal:o((...t)=>{},"fatal")},M1=o(function(t="fatal"){let e=jc.fatal;typeof t=="string"?t.toLowerCase()in jc&&(e=jc[t]):typeof t=="number"&&(e=t),Y.trace=()=>{},Y.debug=()=>{},Y.info=()=>{},Y.warn=()=>{},Y.error=()=>{},Y.fatal=()=>{},e<=jc.fatal&&(Y.fatal=console.error?console.error.bind(console,bo("FATAL"),"color: orange"):console.log.bind(console,"\x1B[35m",bo("FATAL"))),e<=jc.error&&(Y.error=console.error?console.error.bind(console,bo("ERROR"),"color: orange"):console.log.bind(console,"\x1B[31m",bo("ERROR"))),e<=jc.warn&&(Y.warn=console.warn?console.warn.bind(console,bo("WARN"),"color: orange"):console.log.bind(console,"\x1B[33m",bo("WARN"))),e<=jc.info&&(Y.info=console.info?console.info.bind(console,bo("INFO"),"color: lightblue"):console.log.bind(console,"\x1B[34m",bo("INFO"))),e<=jc.debug&&(Y.debug=console.debug?console.debug.bind(console,bo("DEBUG"),"color: lightgreen"):console.log.bind(console,"\x1B[32m",bo("DEBUG"))),e<=jc.trace&&(Y.trace=console.debug?console.debug.bind(console,bo("TRACE"),"color: lightgreen"):console.log.bind(console,"\x1B[32m",bo("TRACE")))},"setLogLevel"),bo=o(t=>`%c${(0,EF.default)().format("ss.SSS")} : ${t} : `,"format")});var mxe,Z0,kS,SF,_b=M(()=>{"use strict";mxe=Object.freeze({left:0,top:0,width:16,height:16}),Z0=Object.freeze({rotate:0,vFlip:!1,hFlip:!1}),kS=Object.freeze({...mxe,...Z0}),SF=Object.freeze({...kS,body:"",hidden:!1})});var gxe,CF,AF=M(()=>{"use strict";_b();gxe=Object.freeze({width:null,height:null}),CF=Object.freeze({...gxe,...Z0})});var Lb,ES,Db,_F=M(()=>{"use strict";Lb=/^[a-z0-9]+(-[a-z0-9]+)*$/,ES=o((t,e,r,n="")=>{let i=t.split(":");if(t.slice(0,1)==="@"){if(i.length<2||i.length>3)return null;n=i.shift().slice(1)}if(i.length>3||!i.length)return null;if(i.length>1){let l=i.pop(),u=i.pop(),h={provider:i.length>0?i[0]:n,prefix:u,name:l};return e&&!Db(h)?null:h}let a=i[0],s=a.split("-");if(s.length>1){let l={provider:n,prefix:s.shift(),name:s.join("-")};return e&&!Db(l)?null:l}if(r&&n===""){let l={provider:n,prefix:"",name:a};return e&&!Db(l,r)?null:l}return null},"stringToIcon"),Db=o((t,e)=>t?!!((t.provider===""||t.provider.match(Lb))&&(e&&t.prefix===""||t.prefix.match(Lb))&&t.name.match(Lb)):!1,"validateIconName")});function LF(t,e){let r={};!t.hFlip!=!e.hFlip&&(r.hFlip=!0),!t.vFlip!=!e.vFlip&&(r.vFlip=!0);let n=((t.rotate||0)+(e.rotate||0))%4;return n&&(r.rotate=n),r}var DF=M(()=>{"use strict";o(LF,"mergeIconTransformations")});function SS(t,e){let r=LF(t,e);for(let n in SF)n in Z0?n in t&&!(n in r)&&(r[n]=Z0[n]):n in e?r[n]=e[n]:n in t&&(r[n]=t[n]);return r}var NF=M(()=>{"use strict";_b();DF();o(SS,"mergeIconData")});function RF(t,e){let r=t.icons,n=t.aliases||Object.create(null),i=Object.create(null);function a(s){if(r[s])return i[s]=[];if(!(s in i)){i[s]=null;let l=n[s]&&n[s].parent,u=l&&a(l);u&&(i[s]=[l].concat(u))}return i[s]}return o(a,"resolve"),(e||Object.keys(r).concat(Object.keys(n))).forEach(a),i}var MF=M(()=>{"use strict";o(RF,"getIconsTree")});function IF(t,e,r){let n=t.icons,i=t.aliases||Object.create(null),a={};function s(l){a=SS(n[l]||i[l],a)}return o(s,"parse"),s(e),r.forEach(s),SS(t,a)}function CS(t,e){if(t.icons[e])return IF(t,e,[]);let r=RF(t,[e])[e];return r?IF(t,e,r):null}var OF=M(()=>{"use strict";NF();MF();o(IF,"internalGetIconData");o(CS,"getIconData")});function AS(t,e,r){if(e===1)return t;if(r=r||100,typeof t=="number")return Math.ceil(t*e*r)/r;if(typeof t!="string")return t;let n=t.split(yxe);if(n===null||!n.length)return t;let i=[],a=n.shift(),s=vxe.test(a);for(;;){if(s){let l=parseFloat(a);isNaN(l)?i.push(a):i.push(Math.ceil(l*e*r)/r)}else i.push(a);if(a=n.shift(),a===void 0)return i.join("");s=!s}}var yxe,vxe,PF=M(()=>{"use strict";yxe=/(-?[0-9.]*[0-9]+[0-9.]*)/g,vxe=/^-?[0-9.]*[0-9]+[0-9.]*$/g;o(AS,"calculateSize")});function xxe(t,e="defs"){let r="",n=t.indexOf("<"+e);for(;n>=0;){let i=t.indexOf(">",n),a=t.indexOf("</"+e);if(i===-1||a===-1)break;let s=t.indexOf(">",a);if(s===-1)break;r+=t.slice(i+1,a).trim(),t=t.slice(0,n).trim()+t.slice(s+1)}return{defs:r,content:t}}function bxe(t,e){return t?"<defs>"+t+"</defs>"+e:e}function BF(t,e,r){let n=xxe(t);return bxe(n.defs,e+n.content+r)}var FF=M(()=>{"use strict";o(xxe,"splitSVGDefs");o(bxe,"mergeDefsAndContent");o(BF,"wrapSVGContent")});function _S(t,e){let r={...kS,...t},n={...CF,...e},i={left:r.left,top:r.top,width:r.width,height:r.height},a=r.body;[r,n].forEach(y=>{let v=[],x=y.hFlip,b=y.vFlip,w=y.rotate;x?b?w+=2:(v.push("translate("+(i.width+i.left).toString()+" "+(0-i.top).toString()+")"),v.push("scale(-1 1)"),i.top=i.left=0):b&&(v.push("translate("+(0-i.left).toString()+" "+(i.height+i.top).toString()+")"),v.push("scale(1 -1)"),i.top=i.left=0);let _;switch(w<0&&(w-=Math.floor(w/4)*4),w=w%4,w){case 1:_=i.height/2+i.top,v.unshift("rotate(90 "+_.toString()+" "+_.toString()+")");break;case 2:v.unshift("rotate(180 "+(i.width/2+i.left).toString()+" "+(i.height/2+i.top).toString()+")");break;case 3:_=i.width/2+i.left,v.unshift("rotate(-90 "+_.toString()+" "+_.toString()+")");break}w%2===1&&(i.left!==i.top&&(_=i.left,i.left=i.top,i.top=_),i.width!==i.height&&(_=i.width,i.width=i.height,i.height=_)),v.length&&(a=BF(a,'<g transform="'+v.join(" ")+'">',"</g>"))});let s=n.width,l=n.height,u=i.width,h=i.height,f,d;s===null?(d=l===null?"1em":l==="auto"?h:l,f=AS(d,u/h)):(f=s==="auto"?u:s,d=l===null?AS(f,h/u):l==="auto"?h:l);let p={},m=o((y,v)=>{wxe(v)||(p[y]=v.toString())},"setAttr");m("width",f),m("height",d);let g=[i.left,i.top,u,h];return p.viewBox=g.join(" "),{attributes:p,viewBox:g,body:a}}var wxe,zF=M(()=>{"use strict";_b();AF();PF();FF();wxe=o(t=>t==="unset"||t==="undefined"||t==="none","isUnsetKeyword");o(_S,"iconToSVG")});function LS(t,e=kxe){let r=[],n;for(;n=Txe.exec(t);)r.push(n[1]);if(!r.length)return t;let i="suffix"+(Math.random()*16777216|Date.now()).toString(16);return r.forEach(a=>{let s=typeof e=="function"?e(a):e+(Exe++).toString(),l=a.replace(/[.*+?^${}()|[\]\\]/g,"\\$&");t=t.replace(new RegExp('([#;"])('+l+')([")]|\\.[a-z])',"g"),"$1"+s+i+"$3")}),t=t.replace(new RegExp(i,"g"),""),t}var Txe,kxe,Exe,GF=M(()=>{"use strict";Txe=/\sid="(\S+)"/g,kxe="IconifyId"+Date.now().toString(16)+(Math.random()*16777216|0).toString(16),Exe=0;o(LS,"replaceIDs")});function DS(t,e){let r=t.indexOf("xlink:")===-1?"":' xmlns:xlink="http://www.w3.org/1999/xlink"';for(let n in e)r+=" "+n+'="'+e[n]+'"';return'<svg xmlns="http://www.w3.org/2000/svg"'+r+">"+t+"</svg>"}var $F=M(()=>{"use strict";o(DS,"iconToHTML")});var UF=Ni((lst,VF)=>{"use strict";var J0=1e3,ep=J0*60,tp=ep*60,Ff=tp*24,Sxe=Ff*7,Cxe=Ff*365.25;VF.exports=function(t,e){e=e||{};var r=typeof t;if(r==="string"&&t.length>0)return Axe(t);if(r==="number"&&isFinite(t))return e.long?Lxe(t):_xe(t);throw new Error("val is not a non-empty string or a valid number. val="+JSON.stringify(t))};function Axe(t){if(t=String(t),!(t.length>100)){var e=/^(-?(?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)?$/i.exec(t);if(e){var r=parseFloat(e[1]),n=(e[2]||"ms").toLowerCase();switch(n){case"years":case"year":case"yrs":case"yr":case"y":return r*Cxe;case"weeks":case"week":case"w":return r*Sxe;case"days":case"day":case"d":return r*Ff;case"hours":case"hour":case"hrs":case"hr":case"h":return r*tp;case"minutes":case"minute":case"mins":case"min":case"m":return r*ep;case"seconds":case"second":case"secs":case"sec":case"s":return r*J0;case"milliseconds":case"millisecond":case"msecs":case"msec":case"ms":return r;default:return}}}}o(Axe,"parse");function _xe(t){var e=Math.abs(t);return e>=Ff?Math.round(t/Ff)+"d":e>=tp?Math.round(t/tp)+"h":e>=ep?Math.round(t/ep)+"m":e>=J0?Math.round(t/J0)+"s":t+"ms"}o(_xe,"fmtShort");function Lxe(t){var e=Math.abs(t);return e>=Ff?Nb(t,e,Ff,"day"):e>=tp?Nb(t,e,tp,"hour"):e>=ep?Nb(t,e,ep,"minute"):e>=J0?Nb(t,e,J0,"second"):t+" ms"}o(Lxe,"fmtLong");function Nb(t,e,r,n){var i=e>=r*1.5;return Math.round(t/r)+" "+n+(i?"s":"")}o(Nb,"plural")});var WF=Ni((ust,HF)=>{"use strict";function Dxe(t){r.debug=r,r.default=r,r.coerce=u,r.disable=a,r.enable=i,r.enabled=s,r.humanize=UF(),r.destroy=h,Object.keys(t).forEach(f=>{r[f]=t[f]}),r.names=[],r.skips=[],r.formatters={};function e(f){let d=0;for(let p=0;p<f.length;p++)d=(d<<5)-d+f.charCodeAt(p),d|=0;return r.colors[Math.abs(d)%r.colors.length]}o(e,"selectColor"),r.selectColor=e;function r(f){let d,p=null,m,g;function y(...v){if(!y.enabled)return;let x=y,b=Number(new Date),w=b-(d||b);x.diff=w,x.prev=d,x.curr=b,d=b,v[0]=r.coerce(v[0]),typeof v[0]!="string"&&v.unshift("%O");let _=0;v[0]=v[0].replace(/%([a-zA-Z%])/g,(E,L)=>{if(E==="%%")return"%";_++;let C=r.formatters[L];if(typeof C=="function"){let A=v[_];E=C.call(x,A),v.splice(_,1),_--}return E}),r.formatArgs.call(x,v),(x.log||r.log).apply(x,v)}return o(y,"debug"),y.namespace=f,y.useColors=r.useColors(),y.color=r.selectColor(f),y.extend=n,y.destroy=r.destroy,Object.defineProperty(y,"enabled",{enumerable:!0,configurable:!1,get:o(()=>p!==null?p:(m!==r.namespaces&&(m=r.namespaces,g=r.enabled(f)),g),"get"),set:o(v=>{p=v},"set")}),typeof r.init=="function"&&r.init(y),y}o(r,"createDebug");function n(f,d){let p=r(this.namespace+(typeof d>"u"?":":d)+f);return p.log=this.log,p}o(n,"extend");function i(f){r.save(f),r.namespaces=f,r.names=[],r.skips=[];let d,p=(typeof f=="string"?f:"").split(/[\s,]+/),m=p.length;for(d=0;d<m;d++)p[d]&&(f=p[d].replace(/\*/g,".*?"),f[0]==="-"?r.skips.push(new RegExp("^"+f.slice(1)+"$")):r.names.push(new RegExp("^"+f+"$")))}o(i,"enable");function a(){let f=[...r.names.map(l),...r.skips.map(l).map(d=>"-"+d)].join(",");return r.enable(""),f}o(a,"disable");function s(f){if(f[f.length-1]==="*")return!0;let d,p;for(d=0,p=r.skips.length;d<p;d++)if(r.skips[d].test(f))return!1;for(d=0,p=r.names.length;d<p;d++)if(r.names[d].test(f))return!0;return!1}o(s,"enabled");function l(f){return f.toString().substring(2,f.toString().length-2).replace(/\.\*\?$/,"*")}o(l,"toNamespace");function u(f){return f instanceof Error?f.stack||f.message:f}o(u,"coerce");function h(){console.warn("Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.")}return o(h,"destroy"),r.enable(r.load()),r}o(Dxe,"setup");HF.exports=Dxe});var YF=Ni((Us,Rb)=>{"use strict";Us.formatArgs=Rxe;Us.save=Mxe;Us.load=Ixe;Us.useColors=Nxe;Us.storage=Oxe();Us.destroy=(()=>{let t=!1;return()=>{t||(t=!0,console.warn("Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`."))}})();Us.colors=["#0000CC","#0000FF","#0033CC","#0033FF","#0066CC","#0066FF","#0099CC","#0099FF","#00CC00","#00CC33","#00CC66","#00CC99","#00CCCC","#00CCFF","#3300CC","#3300FF","#3333CC","#3333FF","#3366CC","#3366FF","#3399CC","#3399FF","#33CC00","#33CC33","#33CC66","#33CC99","#33CCCC","#33CCFF","#6600CC","#6600FF","#6633CC","#6633FF","#66CC00","#66CC33","#9900CC","#9900FF","#9933CC","#9933FF","#99CC00","#99CC33","#CC0000","#CC0033","#CC0066","#CC0099","#CC00CC","#CC00FF","#CC3300","#CC3333","#CC3366","#CC3399","#CC33CC","#CC33FF","#CC6600","#CC6633","#CC9900","#CC9933","#CCCC00","#CCCC33","#FF0000","#FF0033","#FF0066","#FF0099","#FF00CC","#FF00FF","#FF3300","#FF3333","#FF3366","#FF3399","#FF33CC","#FF33FF","#FF6600","#FF6633","#FF9900","#FF9933","#FFCC00","#FFCC33"];function Nxe(){if(typeof window<"u"&&window.process&&(window.process.type==="renderer"||window.process.__nwjs))return!0;if(typeof navigator<"u"&&navigator.userAgent&&navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/))return!1;let t;return typeof document<"u"&&document.documentElement&&document.documentElement.style&&document.documentElement.style.WebkitAppearance||typeof window<"u"&&window.console&&(window.console.firebug||window.console.exception&&window.console.table)||typeof navigator<"u"&&navigator.userAgent&&(t=navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/))&&parseInt(t[1],10)>=31||typeof navigator<"u"&&navigator.userAgent&&navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/)}o(Nxe,"useColors");function Rxe(t){if(t[0]=(this.useColors?"%c":"")+this.namespace+(this.useColors?" %c":" ")+t[0]+(this.useColors?"%c ":" ")+"+"+Rb.exports.humanize(this.diff),!this.useColors)return;let e="color: "+this.color;t.splice(1,0,e,"color: inherit");let r=0,n=0;t[0].replace(/%[a-zA-Z%]/g,i=>{i!=="%%"&&(r++,i==="%c"&&(n=r))}),t.splice(n,0,e)}o(Rxe,"formatArgs");Us.log=console.debug||console.log||(()=>{});function Mxe(t){try{t?Us.storage.setItem("debug",t):Us.storage.removeItem("debug")}catch{}}o(Mxe,"save");function Ixe(){let t;try{t=Us.storage.getItem("debug")}catch{}return!t&&typeof process<"u"&&"env"in process&&(t=process.env.DEBUG),t}o(Ixe,"load");function Oxe(){try{return localStorage}catch{}}o(Oxe,"localstorage");Rb.exports=WF()(Us);var{formatters:Pxe}=Rb.exports;Pxe.j=function(t){try{return JSON.stringify(t)}catch(e){return"[UnexpectedJSONParseError]: "+e.message}}});var dst,qF=M(()=>{"use strict";_F();OF();zF();GF();$F();dst=ka(YF(),1)});var RS,NS,XF,Mb,Bxe,wo,Kc=M(()=>{"use strict";ht();qF();RS={body:'<g><rect width="80" height="80" style="fill: #087ebf; stroke-width: 0px;"/><text transform="translate(21.16 64.67)" style="fill: #fff; font-family: ArialMT, Arial; font-size: 67.75px;"><tspan x="0" y="0">?</tspan></text></g>',height:80,width:80},NS=new Map,XF=new Map,Mb=o(t=>{for(let e of t){if(!e.name)throw new Error('Invalid icon loader. Must have a "name" property with non-empty string value.');if(Y.debug("Registering icon pack:",e.name),"loader"in e)XF.set(e.name,e.loader);else if("icons"in e)NS.set(e.name,e.icons);else throw Y.error("Invalid icon loader:",e),new Error('Invalid icon loader. Must have either "icons" or "loader" property.')}},"registerIconPacks"),Bxe=o(async(t,e)=>{let r=ES(t,!0,e!==void 0);if(!r)throw new Error(`Invalid icon name: ${t}`);let n=r.prefix||e;if(!n)throw new Error(`Icon name must contain a prefix: ${t}`);let i=NS.get(n);if(!i){let s=XF.get(n);if(!s)throw new Error(`Icon set not found: ${r.prefix}`);try{i={...await s(),prefix:n},NS.set(n,i)}catch(l){throw Y.error(l),new Error(`Failed to load icon set: ${r.prefix}`)}}let a=CS(i,r.name);if(!a)throw new Error(`Icon not found: ${t}`);return a},"getRegisteredIconData"),wo=o(async(t,e)=>{let r;try{r=await Bxe(t,e?.fallbackPrefix)}catch(a){Y.error(a),r=RS}let n=_S(r,e);return DS(LS(n.body),n.attributes)},"getIconSVG")});function Ib(t){for(var e=[],r=1;r<arguments.length;r++)e[r-1]=arguments[r];var n=Array.from(typeof t=="string"?[t]:t);n[n.length-1]=n[n.length-1].replace(/\r?\n([\t ]*)$/,"");var i=n.reduce(function(l,u){var h=u.match(/\n([\t ]+|(?!\s).)/g);return h?l.concat(h.map(function(f){var d,p;return(p=(d=f.match(/[\t ]/g))===null||d===void 0?void 0:d.length)!==null&&p!==void 0?p:0})):l},[]);if(i.length){var a=new RegExp(` +[ ]{`+Math.min.apply(Math,i)+"}","g");n=n.map(function(l){return l.replace(a,` +`)})}n[0]=n[0].replace(/^\r?\n/,"");var s=n[0];return e.forEach(function(l,u){var h=s.match(/(?:^|\n)( *)$/),f=h?h[1]:"",d=l;typeof l=="string"&&l.includes(` +`)&&(d=String(l).split(` +`).map(function(p,m){return m===0?p:""+f+p}).join(` +`)),s+=d+n[u+1]}),s}var MS=M(()=>{"use strict";o(Ib,"dedent")});var Ob,zf,jF,Pb=M(()=>{"use strict";Ob=/^-{3}\s*[\n\r](.*?)[\n\r]-{3}\s*[\n\r]+/s,zf=/%{2}{\s*(?:(\w+)\s*:|(\w+))\s*(?:(\w+)|((?:(?!}%{2}).|\r?\n)*))?\s*(?:}%{2})?/gi,jF=/\s*%%.*\n/gm});var rp,IS=M(()=>{"use strict";rp=class extends Error{static{o(this,"UnknownDiagramError")}constructor(e){super(e),this.name="UnknownDiagramError"}}});var Gf,np,Bb,OS,KF,$f=M(()=>{"use strict";ht();Pb();IS();Gf={},np=o(function(t,e){t=t.replace(Ob,"").replace(zf,"").replace(jF,` +`);for(let[r,{detector:n}]of Object.entries(Gf))if(n(t,e))return r;throw new rp(`No diagram type detected matching given configuration for text: ${t}`)},"detectType"),Bb=o((...t)=>{for(let{id:e,detector:r,loader:n}of t)OS(e,r,n)},"registerLazyLoadedDiagrams"),OS=o((t,e,r)=>{Gf[t]&&Y.warn(`Detector with key ${t} already exists. Overwriting.`),Gf[t]={detector:e,loader:r},Y.debug(`Detector with key ${t} added${r?" with loader":""}`)},"addDetector"),KF=o(t=>Gf[t].loader,"getDiagramLoader")});var I1,QF,PS=M(()=>{"use strict";I1=function(){var t=o(function(He,xe,X,fe){for(X=X||{},fe=He.length;fe--;X[He[fe]]=xe);return X},"o"),e=[1,24],r=[1,25],n=[1,26],i=[1,27],a=[1,28],s=[1,63],l=[1,64],u=[1,65],h=[1,66],f=[1,67],d=[1,68],p=[1,69],m=[1,29],g=[1,30],y=[1,31],v=[1,32],x=[1,33],b=[1,34],w=[1,35],_=[1,36],T=[1,37],E=[1,38],L=[1,39],C=[1,40],A=[1,41],I=[1,42],D=[1,43],k=[1,44],R=[1,45],S=[1,46],O=[1,47],N=[1,48],P=[1,50],F=[1,51],B=[1,52],$=[1,53],z=[1,54],W=[1,55],j=[1,56],K=[1,57],ie=[1,58],Q=[1,59],ee=[1,60],J=[14,42],H=[14,34,36,37,38,39,40,41,42,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74],q=[12,14,34,36,37,38,39,40,41,42,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74],Z=[1,82],ae=[1,83],ue=[1,84],ce=[1,85],te=[12,14,42],De=[12,14,33,42],oe=[12,14,33,42,76,77,79,80],ke=[12,33],Fe=[34,36,37,38,39,40,41,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74],Be={trace:o(function(){},"trace"),yy:{},symbols_:{error:2,start:3,mermaidDoc:4,direction:5,direction_tb:6,direction_bt:7,direction_rl:8,direction_lr:9,graphConfig:10,C4_CONTEXT:11,NEWLINE:12,statements:13,EOF:14,C4_CONTAINER:15,C4_COMPONENT:16,C4_DYNAMIC:17,C4_DEPLOYMENT:18,otherStatements:19,diagramStatements:20,otherStatement:21,title:22,accDescription:23,acc_title:24,acc_title_value:25,acc_descr:26,acc_descr_value:27,acc_descr_multiline_value:28,boundaryStatement:29,boundaryStartStatement:30,boundaryStopStatement:31,boundaryStart:32,LBRACE:33,ENTERPRISE_BOUNDARY:34,attributes:35,SYSTEM_BOUNDARY:36,BOUNDARY:37,CONTAINER_BOUNDARY:38,NODE:39,NODE_L:40,NODE_R:41,RBRACE:42,diagramStatement:43,PERSON:44,PERSON_EXT:45,SYSTEM:46,SYSTEM_DB:47,SYSTEM_QUEUE:48,SYSTEM_EXT:49,SYSTEM_EXT_DB:50,SYSTEM_EXT_QUEUE:51,CONTAINER:52,CONTAINER_DB:53,CONTAINER_QUEUE:54,CONTAINER_EXT:55,CONTAINER_EXT_DB:56,CONTAINER_EXT_QUEUE:57,COMPONENT:58,COMPONENT_DB:59,COMPONENT_QUEUE:60,COMPONENT_EXT:61,COMPONENT_EXT_DB:62,COMPONENT_EXT_QUEUE:63,REL:64,BIREL:65,REL_U:66,REL_D:67,REL_L:68,REL_R:69,REL_B:70,REL_INDEX:71,UPDATE_EL_STYLE:72,UPDATE_REL_STYLE:73,UPDATE_LAYOUT_CONFIG:74,attribute:75,STR:76,STR_KEY:77,STR_VALUE:78,ATTRIBUTE:79,ATTRIBUTE_EMPTY:80,$accept:0,$end:1},terminals_:{2:"error",6:"direction_tb",7:"direction_bt",8:"direction_rl",9:"direction_lr",11:"C4_CONTEXT",12:"NEWLINE",14:"EOF",15:"C4_CONTAINER",16:"C4_COMPONENT",17:"C4_DYNAMIC",18:"C4_DEPLOYMENT",22:"title",23:"accDescription",24:"acc_title",25:"acc_title_value",26:"acc_descr",27:"acc_descr_value",28:"acc_descr_multiline_value",33:"LBRACE",34:"ENTERPRISE_BOUNDARY",36:"SYSTEM_BOUNDARY",37:"BOUNDARY",38:"CONTAINER_BOUNDARY",39:"NODE",40:"NODE_L",41:"NODE_R",42:"RBRACE",44:"PERSON",45:"PERSON_EXT",46:"SYSTEM",47:"SYSTEM_DB",48:"SYSTEM_QUEUE",49:"SYSTEM_EXT",50:"SYSTEM_EXT_DB",51:"SYSTEM_EXT_QUEUE",52:"CONTAINER",53:"CONTAINER_DB",54:"CONTAINER_QUEUE",55:"CONTAINER_EXT",56:"CONTAINER_EXT_DB",57:"CONTAINER_EXT_QUEUE",58:"COMPONENT",59:"COMPONENT_DB",60:"COMPONENT_QUEUE",61:"COMPONENT_EXT",62:"COMPONENT_EXT_DB",63:"COMPONENT_EXT_QUEUE",64:"REL",65:"BIREL",66:"REL_U",67:"REL_D",68:"REL_L",69:"REL_R",70:"REL_B",71:"REL_INDEX",72:"UPDATE_EL_STYLE",73:"UPDATE_REL_STYLE",74:"UPDATE_LAYOUT_CONFIG",76:"STR",77:"STR_KEY",78:"STR_VALUE",79:"ATTRIBUTE",80:"ATTRIBUTE_EMPTY"},productions_:[0,[3,1],[3,1],[5,1],[5,1],[5,1],[5,1],[4,1],[10,4],[10,4],[10,4],[10,4],[10,4],[13,1],[13,1],[13,2],[19,1],[19,2],[19,3],[21,1],[21,1],[21,2],[21,2],[21,1],[29,3],[30,3],[30,3],[30,4],[32,2],[32,2],[32,2],[32,2],[32,2],[32,2],[32,2],[31,1],[20,1],[20,2],[20,3],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,1],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[43,2],[35,1],[35,2],[75,1],[75,2],[75,1],[75,1]],performAction:o(function(xe,X,fe,he,ge,ne,ye){var U=ne.length-1;switch(ge){case 3:he.setDirection("TB");break;case 4:he.setDirection("BT");break;case 5:he.setDirection("RL");break;case 6:he.setDirection("LR");break;case 8:case 9:case 10:case 11:case 12:he.setC4Type(ne[U-3]);break;case 19:he.setTitle(ne[U].substring(6)),this.$=ne[U].substring(6);break;case 20:he.setAccDescription(ne[U].substring(15)),this.$=ne[U].substring(15);break;case 21:this.$=ne[U].trim(),he.setTitle(this.$);break;case 22:case 23:this.$=ne[U].trim(),he.setAccDescription(this.$);break;case 28:ne[U].splice(2,0,"ENTERPRISE"),he.addPersonOrSystemBoundary(...ne[U]),this.$=ne[U];break;case 29:ne[U].splice(2,0,"SYSTEM"),he.addPersonOrSystemBoundary(...ne[U]),this.$=ne[U];break;case 30:he.addPersonOrSystemBoundary(...ne[U]),this.$=ne[U];break;case 31:ne[U].splice(2,0,"CONTAINER"),he.addContainerBoundary(...ne[U]),this.$=ne[U];break;case 32:he.addDeploymentNode("node",...ne[U]),this.$=ne[U];break;case 33:he.addDeploymentNode("nodeL",...ne[U]),this.$=ne[U];break;case 34:he.addDeploymentNode("nodeR",...ne[U]),this.$=ne[U];break;case 35:he.popBoundaryParseStack();break;case 39:he.addPersonOrSystem("person",...ne[U]),this.$=ne[U];break;case 40:he.addPersonOrSystem("external_person",...ne[U]),this.$=ne[U];break;case 41:he.addPersonOrSystem("system",...ne[U]),this.$=ne[U];break;case 42:he.addPersonOrSystem("system_db",...ne[U]),this.$=ne[U];break;case 43:he.addPersonOrSystem("system_queue",...ne[U]),this.$=ne[U];break;case 44:he.addPersonOrSystem("external_system",...ne[U]),this.$=ne[U];break;case 45:he.addPersonOrSystem("external_system_db",...ne[U]),this.$=ne[U];break;case 46:he.addPersonOrSystem("external_system_queue",...ne[U]),this.$=ne[U];break;case 47:he.addContainer("container",...ne[U]),this.$=ne[U];break;case 48:he.addContainer("container_db",...ne[U]),this.$=ne[U];break;case 49:he.addContainer("container_queue",...ne[U]),this.$=ne[U];break;case 50:he.addContainer("external_container",...ne[U]),this.$=ne[U];break;case 51:he.addContainer("external_container_db",...ne[U]),this.$=ne[U];break;case 52:he.addContainer("external_container_queue",...ne[U]),this.$=ne[U];break;case 53:he.addComponent("component",...ne[U]),this.$=ne[U];break;case 54:he.addComponent("component_db",...ne[U]),this.$=ne[U];break;case 55:he.addComponent("component_queue",...ne[U]),this.$=ne[U];break;case 56:he.addComponent("external_component",...ne[U]),this.$=ne[U];break;case 57:he.addComponent("external_component_db",...ne[U]),this.$=ne[U];break;case 58:he.addComponent("external_component_queue",...ne[U]),this.$=ne[U];break;case 60:he.addRel("rel",...ne[U]),this.$=ne[U];break;case 61:he.addRel("birel",...ne[U]),this.$=ne[U];break;case 62:he.addRel("rel_u",...ne[U]),this.$=ne[U];break;case 63:he.addRel("rel_d",...ne[U]),this.$=ne[U];break;case 64:he.addRel("rel_l",...ne[U]),this.$=ne[U];break;case 65:he.addRel("rel_r",...ne[U]),this.$=ne[U];break;case 66:he.addRel("rel_b",...ne[U]),this.$=ne[U];break;case 67:ne[U].splice(0,1),he.addRel("rel",...ne[U]),this.$=ne[U];break;case 68:he.updateElStyle("update_el_style",...ne[U]),this.$=ne[U];break;case 69:he.updateRelStyle("update_rel_style",...ne[U]),this.$=ne[U];break;case 70:he.updateLayoutConfig("update_layout_config",...ne[U]),this.$=ne[U];break;case 71:this.$=[ne[U]];break;case 72:ne[U].unshift(ne[U-1]),this.$=ne[U];break;case 73:case 75:this.$=ne[U].trim();break;case 74:let Te={};Te[ne[U-1].trim()]=ne[U].trim(),this.$=Te;break;case 76:this.$="";break}},"anonymous"),table:[{3:1,4:2,5:3,6:[1,5],7:[1,6],8:[1,7],9:[1,8],10:4,11:[1,9],15:[1,10],16:[1,11],17:[1,12],18:[1,13]},{1:[3]},{1:[2,1]},{1:[2,2]},{1:[2,7]},{1:[2,3]},{1:[2,4]},{1:[2,5]},{1:[2,6]},{12:[1,14]},{12:[1,15]},{12:[1,16]},{12:[1,17]},{12:[1,18]},{13:19,19:20,20:21,21:22,22:e,23:r,24:n,26:i,28:a,29:49,30:61,32:62,34:s,36:l,37:u,38:h,39:f,40:d,41:p,43:23,44:m,45:g,46:y,47:v,48:x,49:b,50:w,51:_,52:T,53:E,54:L,55:C,56:A,57:I,58:D,59:k,60:R,61:S,62:O,63:N,64:P,65:F,66:B,67:$,68:z,69:W,70:j,71:K,72:ie,73:Q,74:ee},{13:70,19:20,20:21,21:22,22:e,23:r,24:n,26:i,28:a,29:49,30:61,32:62,34:s,36:l,37:u,38:h,39:f,40:d,41:p,43:23,44:m,45:g,46:y,47:v,48:x,49:b,50:w,51:_,52:T,53:E,54:L,55:C,56:A,57:I,58:D,59:k,60:R,61:S,62:O,63:N,64:P,65:F,66:B,67:$,68:z,69:W,70:j,71:K,72:ie,73:Q,74:ee},{13:71,19:20,20:21,21:22,22:e,23:r,24:n,26:i,28:a,29:49,30:61,32:62,34:s,36:l,37:u,38:h,39:f,40:d,41:p,43:23,44:m,45:g,46:y,47:v,48:x,49:b,50:w,51:_,52:T,53:E,54:L,55:C,56:A,57:I,58:D,59:k,60:R,61:S,62:O,63:N,64:P,65:F,66:B,67:$,68:z,69:W,70:j,71:K,72:ie,73:Q,74:ee},{13:72,19:20,20:21,21:22,22:e,23:r,24:n,26:i,28:a,29:49,30:61,32:62,34:s,36:l,37:u,38:h,39:f,40:d,41:p,43:23,44:m,45:g,46:y,47:v,48:x,49:b,50:w,51:_,52:T,53:E,54:L,55:C,56:A,57:I,58:D,59:k,60:R,61:S,62:O,63:N,64:P,65:F,66:B,67:$,68:z,69:W,70:j,71:K,72:ie,73:Q,74:ee},{13:73,19:20,20:21,21:22,22:e,23:r,24:n,26:i,28:a,29:49,30:61,32:62,34:s,36:l,37:u,38:h,39:f,40:d,41:p,43:23,44:m,45:g,46:y,47:v,48:x,49:b,50:w,51:_,52:T,53:E,54:L,55:C,56:A,57:I,58:D,59:k,60:R,61:S,62:O,63:N,64:P,65:F,66:B,67:$,68:z,69:W,70:j,71:K,72:ie,73:Q,74:ee},{14:[1,74]},t(J,[2,13],{43:23,29:49,30:61,32:62,20:75,34:s,36:l,37:u,38:h,39:f,40:d,41:p,44:m,45:g,46:y,47:v,48:x,49:b,50:w,51:_,52:T,53:E,54:L,55:C,56:A,57:I,58:D,59:k,60:R,61:S,62:O,63:N,64:P,65:F,66:B,67:$,68:z,69:W,70:j,71:K,72:ie,73:Q,74:ee}),t(J,[2,14]),t(H,[2,16],{12:[1,76]}),t(J,[2,36],{12:[1,77]}),t(q,[2,19]),t(q,[2,20]),{25:[1,78]},{27:[1,79]},t(q,[2,23]),{35:80,75:81,76:Z,77:ae,79:ue,80:ce},{35:86,75:81,76:Z,77:ae,79:ue,80:ce},{35:87,75:81,76:Z,77:ae,79:ue,80:ce},{35:88,75:81,76:Z,77:ae,79:ue,80:ce},{35:89,75:81,76:Z,77:ae,79:ue,80:ce},{35:90,75:81,76:Z,77:ae,79:ue,80:ce},{35:91,75:81,76:Z,77:ae,79:ue,80:ce},{35:92,75:81,76:Z,77:ae,79:ue,80:ce},{35:93,75:81,76:Z,77:ae,79:ue,80:ce},{35:94,75:81,76:Z,77:ae,79:ue,80:ce},{35:95,75:81,76:Z,77:ae,79:ue,80:ce},{35:96,75:81,76:Z,77:ae,79:ue,80:ce},{35:97,75:81,76:Z,77:ae,79:ue,80:ce},{35:98,75:81,76:Z,77:ae,79:ue,80:ce},{35:99,75:81,76:Z,77:ae,79:ue,80:ce},{35:100,75:81,76:Z,77:ae,79:ue,80:ce},{35:101,75:81,76:Z,77:ae,79:ue,80:ce},{35:102,75:81,76:Z,77:ae,79:ue,80:ce},{35:103,75:81,76:Z,77:ae,79:ue,80:ce},{35:104,75:81,76:Z,77:ae,79:ue,80:ce},t(te,[2,59]),{35:105,75:81,76:Z,77:ae,79:ue,80:ce},{35:106,75:81,76:Z,77:ae,79:ue,80:ce},{35:107,75:81,76:Z,77:ae,79:ue,80:ce},{35:108,75:81,76:Z,77:ae,79:ue,80:ce},{35:109,75:81,76:Z,77:ae,79:ue,80:ce},{35:110,75:81,76:Z,77:ae,79:ue,80:ce},{35:111,75:81,76:Z,77:ae,79:ue,80:ce},{35:112,75:81,76:Z,77:ae,79:ue,80:ce},{35:113,75:81,76:Z,77:ae,79:ue,80:ce},{35:114,75:81,76:Z,77:ae,79:ue,80:ce},{35:115,75:81,76:Z,77:ae,79:ue,80:ce},{20:116,29:49,30:61,32:62,34:s,36:l,37:u,38:h,39:f,40:d,41:p,43:23,44:m,45:g,46:y,47:v,48:x,49:b,50:w,51:_,52:T,53:E,54:L,55:C,56:A,57:I,58:D,59:k,60:R,61:S,62:O,63:N,64:P,65:F,66:B,67:$,68:z,69:W,70:j,71:K,72:ie,73:Q,74:ee},{12:[1,118],33:[1,117]},{35:119,75:81,76:Z,77:ae,79:ue,80:ce},{35:120,75:81,76:Z,77:ae,79:ue,80:ce},{35:121,75:81,76:Z,77:ae,79:ue,80:ce},{35:122,75:81,76:Z,77:ae,79:ue,80:ce},{35:123,75:81,76:Z,77:ae,79:ue,80:ce},{35:124,75:81,76:Z,77:ae,79:ue,80:ce},{35:125,75:81,76:Z,77:ae,79:ue,80:ce},{14:[1,126]},{14:[1,127]},{14:[1,128]},{14:[1,129]},{1:[2,8]},t(J,[2,15]),t(H,[2,17],{21:22,19:130,22:e,23:r,24:n,26:i,28:a}),t(J,[2,37],{19:20,20:21,21:22,43:23,29:49,30:61,32:62,13:131,22:e,23:r,24:n,26:i,28:a,34:s,36:l,37:u,38:h,39:f,40:d,41:p,44:m,45:g,46:y,47:v,48:x,49:b,50:w,51:_,52:T,53:E,54:L,55:C,56:A,57:I,58:D,59:k,60:R,61:S,62:O,63:N,64:P,65:F,66:B,67:$,68:z,69:W,70:j,71:K,72:ie,73:Q,74:ee}),t(q,[2,21]),t(q,[2,22]),t(te,[2,39]),t(De,[2,71],{75:81,35:132,76:Z,77:ae,79:ue,80:ce}),t(oe,[2,73]),{78:[1,133]},t(oe,[2,75]),t(oe,[2,76]),t(te,[2,40]),t(te,[2,41]),t(te,[2,42]),t(te,[2,43]),t(te,[2,44]),t(te,[2,45]),t(te,[2,46]),t(te,[2,47]),t(te,[2,48]),t(te,[2,49]),t(te,[2,50]),t(te,[2,51]),t(te,[2,52]),t(te,[2,53]),t(te,[2,54]),t(te,[2,55]),t(te,[2,56]),t(te,[2,57]),t(te,[2,58]),t(te,[2,60]),t(te,[2,61]),t(te,[2,62]),t(te,[2,63]),t(te,[2,64]),t(te,[2,65]),t(te,[2,66]),t(te,[2,67]),t(te,[2,68]),t(te,[2,69]),t(te,[2,70]),{31:134,42:[1,135]},{12:[1,136]},{33:[1,137]},t(ke,[2,28]),t(ke,[2,29]),t(ke,[2,30]),t(ke,[2,31]),t(ke,[2,32]),t(ke,[2,33]),t(ke,[2,34]),{1:[2,9]},{1:[2,10]},{1:[2,11]},{1:[2,12]},t(H,[2,18]),t(J,[2,38]),t(De,[2,72]),t(oe,[2,74]),t(te,[2,24]),t(te,[2,35]),t(Fe,[2,25]),t(Fe,[2,26],{12:[1,138]}),t(Fe,[2,27])],defaultActions:{2:[2,1],3:[2,2],4:[2,7],5:[2,3],6:[2,4],7:[2,5],8:[2,6],74:[2,8],126:[2,9],127:[2,10],128:[2,11],129:[2,12]},parseError:o(function(xe,X){if(X.recoverable)this.trace(xe);else{var fe=new Error(xe);throw fe.hash=X,fe}},"parseError"),parse:o(function(xe){var X=this,fe=[0],he=[],ge=[null],ne=[],ye=this.table,U="",Te=0,se=0,Ee=0,Ae=2,Pe=1,Me=ne.slice.call(arguments,1),me=Object.create(this.lexer),We={yy:{}};for(var Re in this.yy)Object.prototype.hasOwnProperty.call(this.yy,Re)&&(We.yy[Re]=this.yy[Re]);me.setInput(xe,We.yy),We.yy.lexer=me,We.yy.parser=this,typeof me.yylloc>"u"&&(me.yylloc={});var tt=me.yylloc;ne.push(tt);var gt=me.options&&me.options.ranges;typeof We.yy.parseError=="function"?this.parseError=We.yy.parseError:this.parseError=Object.getPrototypeOf(this).parseError;function Et(zt){fe.length=fe.length-2*zt,ge.length=ge.length-zt,ne.length=ne.length-zt}o(Et,"popStack");function vt(){var zt;return zt=he.pop()||me.lex()||Pe,typeof zt!="number"&&(zt instanceof Array&&(he=zt,zt=he.pop()),zt=X.symbols_[zt]||zt),zt}o(vt,"lex");for(var Ye,Tt,$e,rt,ft,kt,er={},dt,Xe,ct,Lt;;){if($e=fe[fe.length-1],this.defaultActions[$e]?rt=this.defaultActions[$e]:((Ye===null||typeof Ye>"u")&&(Ye=vt()),rt=ye[$e]&&ye[$e][Ye]),typeof rt>"u"||!rt.length||!rt[0]){var Rt="";Lt=[];for(dt in ye[$e])this.terminals_[dt]&&dt>Ae&&Lt.push("'"+this.terminals_[dt]+"'");me.showPosition?Rt="Parse error on line "+(Te+1)+`: +`+me.showPosition()+` +Expecting `+Lt.join(", ")+", got '"+(this.terminals_[Ye]||Ye)+"'":Rt="Parse error on line "+(Te+1)+": Unexpected "+(Ye==Pe?"end of input":"'"+(this.terminals_[Ye]||Ye)+"'"),this.parseError(Rt,{text:me.match,token:this.terminals_[Ye]||Ye,line:me.yylineno,loc:tt,expected:Lt})}if(rt[0]instanceof Array&&rt.length>1)throw new Error("Parse Error: multiple actions possible at state: "+$e+", token: "+Ye);switch(rt[0]){case 1:fe.push(Ye),ge.push(me.yytext),ne.push(me.yylloc),fe.push(rt[1]),Ye=null,Tt?(Ye=Tt,Tt=null):(se=me.yyleng,U=me.yytext,Te=me.yylineno,tt=me.yylloc,Ee>0&&Ee--);break;case 2:if(Xe=this.productions_[rt[1]][1],er.$=ge[ge.length-Xe],er._$={first_line:ne[ne.length-(Xe||1)].first_line,last_line:ne[ne.length-1].last_line,first_column:ne[ne.length-(Xe||1)].first_column,last_column:ne[ne.length-1].last_column},gt&&(er._$.range=[ne[ne.length-(Xe||1)].range[0],ne[ne.length-1].range[1]]),kt=this.performAction.apply(er,[U,se,Te,We.yy,rt[1],ge,ne].concat(Me)),typeof kt<"u")return kt;Xe&&(fe=fe.slice(0,-1*Xe*2),ge=ge.slice(0,-1*Xe),ne=ne.slice(0,-1*Xe)),fe.push(this.productions_[rt[1]][0]),ge.push(er.$),ne.push(er._$),ct=ye[fe[fe.length-2]][fe[fe.length-1]],fe.push(ct);break;case 3:return!0}}return!0},"parse")},Ve=function(){var He={EOF:1,parseError:o(function(X,fe){if(this.yy.parser)this.yy.parser.parseError(X,fe);else throw new Error(X)},"parseError"),setInput:o(function(xe,X){return this.yy=X||this.yy||{},this._input=xe,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},"setInput"),input:o(function(){var xe=this._input[0];this.yytext+=xe,this.yyleng++,this.offset++,this.match+=xe,this.matched+=xe;var X=xe.match(/(?:\r\n?|\n).*/g);return X?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),xe},"input"),unput:o(function(xe){var X=xe.length,fe=xe.split(/(?:\r\n?|\n)/g);this._input=xe+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-X),this.offset-=X;var he=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),fe.length-1&&(this.yylineno-=fe.length-1);var ge=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:fe?(fe.length===he.length?this.yylloc.first_column:0)+he[he.length-fe.length].length-fe[0].length:this.yylloc.first_column-X},this.options.ranges&&(this.yylloc.range=[ge[0],ge[0]+this.yyleng-X]),this.yyleng=this.yytext.length,this},"unput"),more:o(function(){return this._more=!0,this},"more"),reject:o(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError("Lexical error on line "+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true). +`+this.showPosition(),{text:"",token:null,line:this.yylineno});return this},"reject"),less:o(function(xe){this.unput(this.match.slice(xe))},"less"),pastInput:o(function(){var xe=this.matched.substr(0,this.matched.length-this.match.length);return(xe.length>20?"...":"")+xe.substr(-20).replace(/\n/g,"")},"pastInput"),upcomingInput:o(function(){var xe=this.match;return xe.length<20&&(xe+=this._input.substr(0,20-xe.length)),(xe.substr(0,20)+(xe.length>20?"...":"")).replace(/\n/g,"")},"upcomingInput"),showPosition:o(function(){var xe=this.pastInput(),X=new Array(xe.length+1).join("-");return xe+this.upcomingInput()+` +`+X+"^"},"showPosition"),test_match:o(function(xe,X){var fe,he,ge;if(this.options.backtrack_lexer&&(ge={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(ge.yylloc.range=this.yylloc.range.slice(0))),he=xe[0].match(/(?:\r\n?|\n).*/g),he&&(this.yylineno+=he.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:he?he[he.length-1].length-he[he.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+xe[0].length},this.yytext+=xe[0],this.match+=xe[0],this.matches=xe,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(xe[0].length),this.matched+=xe[0],fe=this.performAction.call(this,this.yy,this,X,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),fe)return fe;if(this._backtrack){for(var ne in ge)this[ne]=ge[ne];return!1}return!1},"test_match"),next:o(function(){if(this.done)return this.EOF;this._input||(this.done=!0);var xe,X,fe,he;this._more||(this.yytext="",this.match="");for(var ge=this._currentRules(),ne=0;ne<ge.length;ne++)if(fe=this._input.match(this.rules[ge[ne]]),fe&&(!X||fe[0].length>X[0].length)){if(X=fe,he=ne,this.options.backtrack_lexer){if(xe=this.test_match(fe,ge[ne]),xe!==!1)return xe;if(this._backtrack){X=!1;continue}else return!1}else if(!this.options.flex)break}return X?(xe=this.test_match(X,ge[he]),xe!==!1?xe:!1):this._input===""?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+`. Unrecognized text. +`+this.showPosition(),{text:"",token:null,line:this.yylineno})},"next"),lex:o(function(){var X=this.next();return X||this.lex()},"lex"),begin:o(function(X){this.conditionStack.push(X)},"begin"),popState:o(function(){var X=this.conditionStack.length-1;return X>0?this.conditionStack.pop():this.conditionStack[0]},"popState"),_currentRules:o(function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},"_currentRules"),topState:o(function(X){return X=this.conditionStack.length-1-Math.abs(X||0),X>=0?this.conditionStack[X]:"INITIAL"},"topState"),pushState:o(function(X){this.begin(X)},"pushState"),stateStackSize:o(function(){return this.conditionStack.length},"stateStackSize"),options:{},performAction:o(function(X,fe,he,ge){var ne=ge;switch(he){case 0:return 6;case 1:return 7;case 2:return 8;case 3:return 9;case 4:return 22;case 5:return 23;case 6:return this.begin("acc_title"),24;break;case 7:return this.popState(),"acc_title_value";break;case 8:return this.begin("acc_descr"),26;break;case 9:return this.popState(),"acc_descr_value";break;case 10:this.begin("acc_descr_multiline");break;case 11:this.popState();break;case 12:return"acc_descr_multiline_value";case 13:break;case 14:c;break;case 15:return 12;case 16:break;case 17:return 11;case 18:return 15;case 19:return 16;case 20:return 17;case 21:return 18;case 22:return this.begin("person_ext"),45;break;case 23:return this.begin("person"),44;break;case 24:return this.begin("system_ext_queue"),51;break;case 25:return this.begin("system_ext_db"),50;break;case 26:return this.begin("system_ext"),49;break;case 27:return this.begin("system_queue"),48;break;case 28:return this.begin("system_db"),47;break;case 29:return this.begin("system"),46;break;case 30:return this.begin("boundary"),37;break;case 31:return this.begin("enterprise_boundary"),34;break;case 32:return this.begin("system_boundary"),36;break;case 33:return this.begin("container_ext_queue"),57;break;case 34:return this.begin("container_ext_db"),56;break;case 35:return this.begin("container_ext"),55;break;case 36:return this.begin("container_queue"),54;break;case 37:return this.begin("container_db"),53;break;case 38:return this.begin("container"),52;break;case 39:return this.begin("container_boundary"),38;break;case 40:return this.begin("component_ext_queue"),63;break;case 41:return this.begin("component_ext_db"),62;break;case 42:return this.begin("component_ext"),61;break;case 43:return this.begin("component_queue"),60;break;case 44:return this.begin("component_db"),59;break;case 45:return this.begin("component"),58;break;case 46:return this.begin("node"),39;break;case 47:return this.begin("node"),39;break;case 48:return this.begin("node_l"),40;break;case 49:return this.begin("node_r"),41;break;case 50:return this.begin("rel"),64;break;case 51:return this.begin("birel"),65;break;case 52:return this.begin("rel_u"),66;break;case 53:return this.begin("rel_u"),66;break;case 54:return this.begin("rel_d"),67;break;case 55:return this.begin("rel_d"),67;break;case 56:return this.begin("rel_l"),68;break;case 57:return this.begin("rel_l"),68;break;case 58:return this.begin("rel_r"),69;break;case 59:return this.begin("rel_r"),69;break;case 60:return this.begin("rel_b"),70;break;case 61:return this.begin("rel_index"),71;break;case 62:return this.begin("update_el_style"),72;break;case 63:return this.begin("update_rel_style"),73;break;case 64:return this.begin("update_layout_config"),74;break;case 65:return"EOF_IN_STRUCT";case 66:return this.begin("attribute"),"ATTRIBUTE_EMPTY";break;case 67:this.begin("attribute");break;case 68:this.popState(),this.popState();break;case 69:return 80;case 70:break;case 71:return 80;case 72:this.begin("string");break;case 73:this.popState();break;case 74:return"STR";case 75:this.begin("string_kv");break;case 76:return this.begin("string_kv_key"),"STR_KEY";break;case 77:this.popState(),this.begin("string_kv_value");break;case 78:return"STR_VALUE";case 79:this.popState(),this.popState();break;case 80:return"STR";case 81:return"LBRACE";case 82:return"RBRACE";case 83:return"SPACE";case 84:return"EOL";case 85:return 14}},"anonymous"),rules:[/^(?:.*direction\s+TB[^\n]*)/,/^(?:.*direction\s+BT[^\n]*)/,/^(?:.*direction\s+RL[^\n]*)/,/^(?:.*direction\s+LR[^\n]*)/,/^(?:title\s[^#\n;]+)/,/^(?:accDescription\s[^#\n;]+)/,/^(?:accTitle\s*:\s*)/,/^(?:(?!\n||)*[^\n]*)/,/^(?:accDescr\s*:\s*)/,/^(?:(?!\n||)*[^\n]*)/,/^(?:accDescr\s*\{\s*)/,/^(?:[\}])/,/^(?:[^\}]*)/,/^(?:%%(?!\{)*[^\n]*(\r?\n?)+)/,/^(?:%%[^\n]*(\r?\n)*)/,/^(?:\s*(\r?\n)+)/,/^(?:\s+)/,/^(?:C4Context\b)/,/^(?:C4Container\b)/,/^(?:C4Component\b)/,/^(?:C4Dynamic\b)/,/^(?:C4Deployment\b)/,/^(?:Person_Ext\b)/,/^(?:Person\b)/,/^(?:SystemQueue_Ext\b)/,/^(?:SystemDb_Ext\b)/,/^(?:System_Ext\b)/,/^(?:SystemQueue\b)/,/^(?:SystemDb\b)/,/^(?:System\b)/,/^(?:Boundary\b)/,/^(?:Enterprise_Boundary\b)/,/^(?:System_Boundary\b)/,/^(?:ContainerQueue_Ext\b)/,/^(?:ContainerDb_Ext\b)/,/^(?:Container_Ext\b)/,/^(?:ContainerQueue\b)/,/^(?:ContainerDb\b)/,/^(?:Container\b)/,/^(?:Container_Boundary\b)/,/^(?:ComponentQueue_Ext\b)/,/^(?:ComponentDb_Ext\b)/,/^(?:Component_Ext\b)/,/^(?:ComponentQueue\b)/,/^(?:ComponentDb\b)/,/^(?:Component\b)/,/^(?:Deployment_Node\b)/,/^(?:Node\b)/,/^(?:Node_L\b)/,/^(?:Node_R\b)/,/^(?:Rel\b)/,/^(?:BiRel\b)/,/^(?:Rel_Up\b)/,/^(?:Rel_U\b)/,/^(?:Rel_Down\b)/,/^(?:Rel_D\b)/,/^(?:Rel_Left\b)/,/^(?:Rel_L\b)/,/^(?:Rel_Right\b)/,/^(?:Rel_R\b)/,/^(?:Rel_Back\b)/,/^(?:RelIndex\b)/,/^(?:UpdateElementStyle\b)/,/^(?:UpdateRelStyle\b)/,/^(?:UpdateLayoutConfig\b)/,/^(?:$)/,/^(?:[(][ ]*[,])/,/^(?:[(])/,/^(?:[)])/,/^(?:,,)/,/^(?:,)/,/^(?:[ ]*["]["])/,/^(?:[ ]*["])/,/^(?:["])/,/^(?:[^"]*)/,/^(?:[ ]*[\$])/,/^(?:[^=]*)/,/^(?:[=][ ]*["])/,/^(?:[^"]+)/,/^(?:["])/,/^(?:[^,]+)/,/^(?:\{)/,/^(?:\})/,/^(?:[\s]+)/,/^(?:[\n\r]+)/,/^(?:$)/],conditions:{acc_descr_multiline:{rules:[11,12],inclusive:!1},acc_descr:{rules:[9],inclusive:!1},acc_title:{rules:[7],inclusive:!1},string_kv_value:{rules:[78,79],inclusive:!1},string_kv_key:{rules:[77],inclusive:!1},string_kv:{rules:[76],inclusive:!1},string:{rules:[73,74],inclusive:!1},attribute:{rules:[68,69,70,71,72,75,80],inclusive:!1},update_layout_config:{rules:[65,66,67,68],inclusive:!1},update_rel_style:{rules:[65,66,67,68],inclusive:!1},update_el_style:{rules:[65,66,67,68],inclusive:!1},rel_b:{rules:[65,66,67,68],inclusive:!1},rel_r:{rules:[65,66,67,68],inclusive:!1},rel_l:{rules:[65,66,67,68],inclusive:!1},rel_d:{rules:[65,66,67,68],inclusive:!1},rel_u:{rules:[65,66,67,68],inclusive:!1},rel_bi:{rules:[],inclusive:!1},rel:{rules:[65,66,67,68],inclusive:!1},node_r:{rules:[65,66,67,68],inclusive:!1},node_l:{rules:[65,66,67,68],inclusive:!1},node:{rules:[65,66,67,68],inclusive:!1},index:{rules:[],inclusive:!1},rel_index:{rules:[65,66,67,68],inclusive:!1},component_ext_queue:{rules:[],inclusive:!1},component_ext_db:{rules:[65,66,67,68],inclusive:!1},component_ext:{rules:[65,66,67,68],inclusive:!1},component_queue:{rules:[65,66,67,68],inclusive:!1},component_db:{rules:[65,66,67,68],inclusive:!1},component:{rules:[65,66,67,68],inclusive:!1},container_boundary:{rules:[65,66,67,68],inclusive:!1},container_ext_queue:{rules:[65,66,67,68],inclusive:!1},container_ext_db:{rules:[65,66,67,68],inclusive:!1},container_ext:{rules:[65,66,67,68],inclusive:!1},container_queue:{rules:[65,66,67,68],inclusive:!1},container_db:{rules:[65,66,67,68],inclusive:!1},container:{rules:[65,66,67,68],inclusive:!1},birel:{rules:[65,66,67,68],inclusive:!1},system_boundary:{rules:[65,66,67,68],inclusive:!1},enterprise_boundary:{rules:[65,66,67,68],inclusive:!1},boundary:{rules:[65,66,67,68],inclusive:!1},system_ext_queue:{rules:[65,66,67,68],inclusive:!1},system_ext_db:{rules:[65,66,67,68],inclusive:!1},system_ext:{rules:[65,66,67,68],inclusive:!1},system_queue:{rules:[65,66,67,68],inclusive:!1},system_db:{rules:[65,66,67,68],inclusive:!1},system:{rules:[65,66,67,68],inclusive:!1},person_ext:{rules:[65,66,67,68],inclusive:!1},person:{rules:[65,66,67,68],inclusive:!1},INITIAL:{rules:[0,1,2,3,4,5,6,8,10,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,81,82,83,84,85],inclusive:!0}}};return He}();Be.lexer=Ve;function Ge(){this.yy={}}return o(Ge,"Parser"),Ge.prototype=Be,Be.Parser=Ge,new Ge}();I1.parser=I1;QF=I1});var BS,Gn,ip=M(()=>{"use strict";BS=o((t,e,{depth:r=2,clobber:n=!1}={})=>{let i={depth:r,clobber:n};return Array.isArray(e)&&!Array.isArray(t)?(e.forEach(a=>BS(t,a,i)),t):Array.isArray(e)&&Array.isArray(t)?(e.forEach(a=>{t.includes(a)||t.push(a)}),t):t===void 0||r<=0?t!=null&&typeof t=="object"&&typeof e=="object"?Object.assign(t,e):e:(e!==void 0&&typeof t=="object"&&typeof e=="object"&&Object.keys(e).forEach(a=>{typeof e[a]=="object"&&(t[a]===void 0||typeof t[a]=="object")?(t[a]===void 0&&(t[a]=Array.isArray(e[a])?[]:{}),t[a]=BS(t[a],e[a],{depth:r-1,clobber:n})):(n||typeof t[a]!="object"&&typeof e[a]!="object")&&(t[a]=e[a])}),t)},"assignWithDepth"),Gn=BS});var Fb,ZF,JF=M(()=>{"use strict";Fb={min:{r:0,g:0,b:0,s:0,l:0,a:0},max:{r:255,g:255,b:255,h:360,s:100,l:100,a:1},clamp:{r:o(t=>t>=255?255:t<0?0:t,"r"),g:o(t=>t>=255?255:t<0?0:t,"g"),b:o(t=>t>=255?255:t<0?0:t,"b"),h:o(t=>t%360,"h"),s:o(t=>t>=100?100:t<0?0:t,"s"),l:o(t=>t>=100?100:t<0?0:t,"l"),a:o(t=>t>=1?1:t<0?0:t,"a")},toLinear:o(t=>{let e=t/255;return t>.03928?Math.pow((e+.055)/1.055,2.4):e/12.92},"toLinear"),hue2rgb:o((t,e,r)=>(r<0&&(r+=1),r>1&&(r-=1),r<.16666666666666666?t+(e-t)*6*r:r<.5?e:r<.6666666666666666?t+(e-t)*(.6666666666666666-r)*6:t),"hue2rgb"),hsl2rgb:o(({h:t,s:e,l:r},n)=>{if(!e)return r*2.55;t/=360,e/=100,r/=100;let i=r<.5?r*(1+e):r+e-r*e,a=2*r-i;switch(n){case"r":return Fb.hue2rgb(a,i,t+.3333333333333333)*255;case"g":return Fb.hue2rgb(a,i,t)*255;case"b":return Fb.hue2rgb(a,i,t-.3333333333333333)*255}},"hsl2rgb"),rgb2hsl:o(({r:t,g:e,b:r},n)=>{t/=255,e/=255,r/=255;let i=Math.max(t,e,r),a=Math.min(t,e,r),s=(i+a)/2;if(n==="l")return s*100;if(i===a)return 0;let l=i-a,u=s>.5?l/(2-i-a):l/(i+a);if(n==="s")return u*100;switch(i){case t:return((e-r)/l+(e<r?6:0))*60;case e:return((r-t)/l+2)*60;case r:return((t-e)/l+4)*60;default:return-1}},"rgb2hsl")},ZF=Fb});var Fxe,ez,tz=M(()=>{"use strict";Fxe={clamp:o((t,e,r)=>e>r?Math.min(e,Math.max(r,t)):Math.min(r,Math.max(e,t)),"clamp"),round:o(t=>Math.round(t*1e10)/1e10,"round")},ez=Fxe});var zxe,rz,nz=M(()=>{"use strict";zxe={dec2hex:o(t=>{let e=Math.round(t).toString(16);return e.length>1?e:`0${e}`},"dec2hex")},rz=zxe});var Gxe,Yt,jl=M(()=>{"use strict";JF();tz();nz();Gxe={channel:ZF,lang:ez,unit:rz},Yt=Gxe});var Qc,Ri,O1=M(()=>{"use strict";jl();Qc={};for(let t=0;t<=255;t++)Qc[t]=Yt.unit.dec2hex(t);Ri={ALL:0,RGB:1,HSL:2}});var FS,iz,az=M(()=>{"use strict";O1();FS=class{static{o(this,"Type")}constructor(){this.type=Ri.ALL}get(){return this.type}set(e){if(this.type&&this.type!==e)throw new Error("Cannot change both RGB and HSL channels at the same time");this.type=e}reset(){this.type=Ri.ALL}is(e){return this.type===e}},iz=FS});var zS,sz,oz=M(()=>{"use strict";jl();az();O1();zS=class{static{o(this,"Channels")}constructor(e,r){this.color=r,this.changed=!1,this.data=e,this.type=new iz}set(e,r){return this.color=r,this.changed=!1,this.data=e,this.type.type=Ri.ALL,this}_ensureHSL(){let e=this.data,{h:r,s:n,l:i}=e;r===void 0&&(e.h=Yt.channel.rgb2hsl(e,"h")),n===void 0&&(e.s=Yt.channel.rgb2hsl(e,"s")),i===void 0&&(e.l=Yt.channel.rgb2hsl(e,"l"))}_ensureRGB(){let e=this.data,{r,g:n,b:i}=e;r===void 0&&(e.r=Yt.channel.hsl2rgb(e,"r")),n===void 0&&(e.g=Yt.channel.hsl2rgb(e,"g")),i===void 0&&(e.b=Yt.channel.hsl2rgb(e,"b"))}get r(){let e=this.data,r=e.r;return!this.type.is(Ri.HSL)&&r!==void 0?r:(this._ensureHSL(),Yt.channel.hsl2rgb(e,"r"))}get g(){let e=this.data,r=e.g;return!this.type.is(Ri.HSL)&&r!==void 0?r:(this._ensureHSL(),Yt.channel.hsl2rgb(e,"g"))}get b(){let e=this.data,r=e.b;return!this.type.is(Ri.HSL)&&r!==void 0?r:(this._ensureHSL(),Yt.channel.hsl2rgb(e,"b"))}get h(){let e=this.data,r=e.h;return!this.type.is(Ri.RGB)&&r!==void 0?r:(this._ensureRGB(),Yt.channel.rgb2hsl(e,"h"))}get s(){let e=this.data,r=e.s;return!this.type.is(Ri.RGB)&&r!==void 0?r:(this._ensureRGB(),Yt.channel.rgb2hsl(e,"s"))}get l(){let e=this.data,r=e.l;return!this.type.is(Ri.RGB)&&r!==void 0?r:(this._ensureRGB(),Yt.channel.rgb2hsl(e,"l"))}get a(){return this.data.a}set r(e){this.type.set(Ri.RGB),this.changed=!0,this.data.r=e}set g(e){this.type.set(Ri.RGB),this.changed=!0,this.data.g=e}set b(e){this.type.set(Ri.RGB),this.changed=!0,this.data.b=e}set h(e){this.type.set(Ri.HSL),this.changed=!0,this.data.h=e}set s(e){this.type.set(Ri.HSL),this.changed=!0,this.data.s=e}set l(e){this.type.set(Ri.HSL),this.changed=!0,this.data.l=e}set a(e){this.changed=!0,this.data.a=e}},sz=zS});var $xe,th,P1=M(()=>{"use strict";oz();$xe=new sz({r:0,g:0,b:0,a:0},"transparent"),th=$xe});var lz,Vf,GS=M(()=>{"use strict";P1();O1();lz={re:/^#((?:[a-f0-9]{2}){2,4}|[a-f0-9]{3})$/i,parse:o(t=>{if(t.charCodeAt(0)!==35)return;let e=t.match(lz.re);if(!e)return;let r=e[1],n=parseInt(r,16),i=r.length,a=i%4===0,s=i>4,l=s?1:17,u=s?8:4,h=a?0:-1,f=s?255:15;return th.set({r:(n>>u*(h+3)&f)*l,g:(n>>u*(h+2)&f)*l,b:(n>>u*(h+1)&f)*l,a:a?(n&f)*l/255:1},t)},"parse"),stringify:o(t=>{let{r:e,g:r,b:n,a:i}=t;return i<1?`#${Qc[Math.round(e)]}${Qc[Math.round(r)]}${Qc[Math.round(n)]}${Qc[Math.round(i*255)]}`:`#${Qc[Math.round(e)]}${Qc[Math.round(r)]}${Qc[Math.round(n)]}`},"stringify")},Vf=lz});var zb,B1,cz=M(()=>{"use strict";jl();P1();zb={re:/^hsla?\(\s*?(-?(?:\d+(?:\.\d+)?|(?:\.\d+))(?:e-?\d+)?(?:deg|grad|rad|turn)?)\s*?(?:,|\s)\s*?(-?(?:\d+(?:\.\d+)?|(?:\.\d+))(?:e-?\d+)?%)\s*?(?:,|\s)\s*?(-?(?:\d+(?:\.\d+)?|(?:\.\d+))(?:e-?\d+)?%)(?:\s*?(?:,|\/)\s*?\+?(-?(?:\d+(?:\.\d+)?|(?:\.\d+))(?:e-?\d+)?(%)?))?\s*?\)$/i,hueRe:/^(.+?)(deg|grad|rad|turn)$/i,_hue2deg:o(t=>{let e=t.match(zb.hueRe);if(e){let[,r,n]=e;switch(n){case"grad":return Yt.channel.clamp.h(parseFloat(r)*.9);case"rad":return Yt.channel.clamp.h(parseFloat(r)*180/Math.PI);case"turn":return Yt.channel.clamp.h(parseFloat(r)*360)}}return Yt.channel.clamp.h(parseFloat(t))},"_hue2deg"),parse:o(t=>{let e=t.charCodeAt(0);if(e!==104&&e!==72)return;let r=t.match(zb.re);if(!r)return;let[,n,i,a,s,l]=r;return th.set({h:zb._hue2deg(n),s:Yt.channel.clamp.s(parseFloat(i)),l:Yt.channel.clamp.l(parseFloat(a)),a:s?Yt.channel.clamp.a(l?parseFloat(s)/100:parseFloat(s)):1},t)},"parse"),stringify:o(t=>{let{h:e,s:r,l:n,a:i}=t;return i<1?`hsla(${Yt.lang.round(e)}, ${Yt.lang.round(r)}%, ${Yt.lang.round(n)}%, ${i})`:`hsl(${Yt.lang.round(e)}, ${Yt.lang.round(r)}%, ${Yt.lang.round(n)}%)`},"stringify")},B1=zb});var Gb,$S,uz=M(()=>{"use strict";GS();Gb={colors:{aliceblue:"#f0f8ff",antiquewhite:"#faebd7",aqua:"#00ffff",aquamarine:"#7fffd4",azure:"#f0ffff",beige:"#f5f5dc",bisque:"#ffe4c4",black:"#000000",blanchedalmond:"#ffebcd",blue:"#0000ff",blueviolet:"#8a2be2",brown:"#a52a2a",burlywood:"#deb887",cadetblue:"#5f9ea0",chartreuse:"#7fff00",chocolate:"#d2691e",coral:"#ff7f50",cornflowerblue:"#6495ed",cornsilk:"#fff8dc",crimson:"#dc143c",cyanaqua:"#00ffff",darkblue:"#00008b",darkcyan:"#008b8b",darkgoldenrod:"#b8860b",darkgray:"#a9a9a9",darkgreen:"#006400",darkgrey:"#a9a9a9",darkkhaki:"#bdb76b",darkmagenta:"#8b008b",darkolivegreen:"#556b2f",darkorange:"#ff8c00",darkorchid:"#9932cc",darkred:"#8b0000",darksalmon:"#e9967a",darkseagreen:"#8fbc8f",darkslateblue:"#483d8b",darkslategray:"#2f4f4f",darkslategrey:"#2f4f4f",darkturquoise:"#00ced1",darkviolet:"#9400d3",deeppink:"#ff1493",deepskyblue:"#00bfff",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1e90ff",firebrick:"#b22222",floralwhite:"#fffaf0",forestgreen:"#228b22",fuchsia:"#ff00ff",gainsboro:"#dcdcdc",ghostwhite:"#f8f8ff",gold:"#ffd700",goldenrod:"#daa520",gray:"#808080",green:"#008000",greenyellow:"#adff2f",grey:"#808080",honeydew:"#f0fff0",hotpink:"#ff69b4",indianred:"#cd5c5c",indigo:"#4b0082",ivory:"#fffff0",khaki:"#f0e68c",lavender:"#e6e6fa",lavenderblush:"#fff0f5",lawngreen:"#7cfc00",lemonchiffon:"#fffacd",lightblue:"#add8e6",lightcoral:"#f08080",lightcyan:"#e0ffff",lightgoldenrodyellow:"#fafad2",lightgray:"#d3d3d3",lightgreen:"#90ee90",lightgrey:"#d3d3d3",lightpink:"#ffb6c1",lightsalmon:"#ffa07a",lightseagreen:"#20b2aa",lightskyblue:"#87cefa",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#b0c4de",lightyellow:"#ffffe0",lime:"#00ff00",limegreen:"#32cd32",linen:"#faf0e6",magenta:"#ff00ff",maroon:"#800000",mediumaquamarine:"#66cdaa",mediumblue:"#0000cd",mediumorchid:"#ba55d3",mediumpurple:"#9370db",mediumseagreen:"#3cb371",mediumslateblue:"#7b68ee",mediumspringgreen:"#00fa9a",mediumturquoise:"#48d1cc",mediumvioletred:"#c71585",midnightblue:"#191970",mintcream:"#f5fffa",mistyrose:"#ffe4e1",moccasin:"#ffe4b5",navajowhite:"#ffdead",navy:"#000080",oldlace:"#fdf5e6",olive:"#808000",olivedrab:"#6b8e23",orange:"#ffa500",orangered:"#ff4500",orchid:"#da70d6",palegoldenrod:"#eee8aa",palegreen:"#98fb98",paleturquoise:"#afeeee",palevioletred:"#db7093",papayawhip:"#ffefd5",peachpuff:"#ffdab9",peru:"#cd853f",pink:"#ffc0cb",plum:"#dda0dd",powderblue:"#b0e0e6",purple:"#800080",rebeccapurple:"#663399",red:"#ff0000",rosybrown:"#bc8f8f",royalblue:"#4169e1",saddlebrown:"#8b4513",salmon:"#fa8072",sandybrown:"#f4a460",seagreen:"#2e8b57",seashell:"#fff5ee",sienna:"#a0522d",silver:"#c0c0c0",skyblue:"#87ceeb",slateblue:"#6a5acd",slategray:"#708090",slategrey:"#708090",snow:"#fffafa",springgreen:"#00ff7f",tan:"#d2b48c",teal:"#008080",thistle:"#d8bfd8",transparent:"#00000000",turquoise:"#40e0d0",violet:"#ee82ee",wheat:"#f5deb3",white:"#ffffff",whitesmoke:"#f5f5f5",yellow:"#ffff00",yellowgreen:"#9acd32"},parse:o(t=>{t=t.toLowerCase();let e=Gb.colors[t];if(e)return Vf.parse(e)},"parse"),stringify:o(t=>{let e=Vf.stringify(t);for(let r in Gb.colors)if(Gb.colors[r]===e)return r},"stringify")},$S=Gb});var hz,F1,fz=M(()=>{"use strict";jl();P1();hz={re:/^rgba?\(\s*?(-?(?:\d+(?:\.\d+)?|(?:\.\d+))(?:e\d+)?(%?))\s*?(?:,|\s)\s*?(-?(?:\d+(?:\.\d+)?|(?:\.\d+))(?:e\d+)?(%?))\s*?(?:,|\s)\s*?(-?(?:\d+(?:\.\d+)?|(?:\.\d+))(?:e\d+)?(%?))(?:\s*?(?:,|\/)\s*?\+?(-?(?:\d+(?:\.\d+)?|(?:\.\d+))(?:e\d+)?(%?)))?\s*?\)$/i,parse:o(t=>{let e=t.charCodeAt(0);if(e!==114&&e!==82)return;let r=t.match(hz.re);if(!r)return;let[,n,i,a,s,l,u,h,f]=r;return th.set({r:Yt.channel.clamp.r(i?parseFloat(n)*2.55:parseFloat(n)),g:Yt.channel.clamp.g(s?parseFloat(a)*2.55:parseFloat(a)),b:Yt.channel.clamp.b(u?parseFloat(l)*2.55:parseFloat(l)),a:h?Yt.channel.clamp.a(f?parseFloat(h)/100:parseFloat(h)):1},t)},"parse"),stringify:o(t=>{let{r:e,g:r,b:n,a:i}=t;return i<1?`rgba(${Yt.lang.round(e)}, ${Yt.lang.round(r)}, ${Yt.lang.round(n)}, ${Yt.lang.round(i)})`:`rgb(${Yt.lang.round(e)}, ${Yt.lang.round(r)}, ${Yt.lang.round(n)})`},"stringify")},F1=hz});var Vxe,Mi,Zc=M(()=>{"use strict";GS();cz();uz();fz();O1();Vxe={format:{keyword:$S,hex:Vf,rgb:F1,rgba:F1,hsl:B1,hsla:B1},parse:o(t=>{if(typeof t!="string")return t;let e=Vf.parse(t)||F1.parse(t)||B1.parse(t)||$S.parse(t);if(e)return e;throw new Error(`Unsupported color format: "${t}"`)},"parse"),stringify:o(t=>!t.changed&&t.color?t.color:t.type.is(Ri.HSL)||t.data.r===void 0?B1.stringify(t):t.a<1||!Number.isInteger(t.r)||!Number.isInteger(t.g)||!Number.isInteger(t.b)?F1.stringify(t):Vf.stringify(t),"stringify")},Mi=Vxe});var Uxe,$b,VS=M(()=>{"use strict";jl();Zc();Uxe=o((t,e)=>{let r=Mi.parse(t);for(let n in e)r[n]=Yt.channel.clamp[n](e[n]);return Mi.stringify(r)},"change"),$b=Uxe});var Hxe,Hs,US=M(()=>{"use strict";jl();P1();Zc();VS();Hxe=o((t,e,r=0,n=1)=>{if(typeof t!="number")return $b(t,{a:e});let i=th.set({r:Yt.channel.clamp.r(t),g:Yt.channel.clamp.g(e),b:Yt.channel.clamp.b(r),a:Yt.channel.clamp.a(n)});return Mi.stringify(i)},"rgba"),Hs=Hxe});var Wxe,z1,dz=M(()=>{"use strict";jl();Zc();Wxe=o((t,e)=>Yt.lang.round(Mi.parse(t)[e]),"channel"),z1=Wxe});var Yxe,pz,mz=M(()=>{"use strict";jl();Zc();Yxe=o(t=>{let{r:e,g:r,b:n}=Mi.parse(t),i=.2126*Yt.channel.toLinear(e)+.7152*Yt.channel.toLinear(r)+.0722*Yt.channel.toLinear(n);return Yt.lang.round(i)},"luminance"),pz=Yxe});var qxe,gz,yz=M(()=>{"use strict";mz();qxe=o(t=>pz(t)>=.5,"isLight"),gz=qxe});var Xxe,aa,vz=M(()=>{"use strict";yz();Xxe=o(t=>!gz(t),"isDark"),aa=Xxe});var jxe,Vb,HS=M(()=>{"use strict";jl();Zc();jxe=o((t,e,r)=>{let n=Mi.parse(t),i=n[e],a=Yt.channel.clamp[e](i+r);return i!==a&&(n[e]=a),Mi.stringify(n)},"adjustChannel"),Vb=jxe});var Kxe,Dt,xz=M(()=>{"use strict";HS();Kxe=o((t,e)=>Vb(t,"l",e),"lighten"),Dt=Kxe});var Qxe,Bt,bz=M(()=>{"use strict";HS();Qxe=o((t,e)=>Vb(t,"l",-e),"darken"),Bt=Qxe});var Zxe,Ne,wz=M(()=>{"use strict";Zc();VS();Zxe=o((t,e)=>{let r=Mi.parse(t),n={};for(let i in e)e[i]&&(n[i]=r[i]+e[i]);return $b(t,n)},"adjust"),Ne=Zxe});var Jxe,Tz,kz=M(()=>{"use strict";Zc();US();Jxe=o((t,e,r=50)=>{let{r:n,g:i,b:a,a:s}=Mi.parse(t),{r:l,g:u,b:h,a:f}=Mi.parse(e),d=r/100,p=d*2-1,m=s-f,y=((p*m===-1?p:(p+m)/(1+p*m))+1)/2,v=1-y,x=n*y+l*v,b=i*y+u*v,w=a*y+h*v,_=s*d+f*(1-d);return Hs(x,b,w,_)},"mix"),Tz=Jxe});var ebe,pt,Ez=M(()=>{"use strict";Zc();kz();ebe=o((t,e=100)=>{let r=Mi.parse(t);return r.r=255-r.r,r.g=255-r.g,r.b=255-r.b,Tz(r,t,e)},"invert"),pt=ebe});var Sz=M(()=>{"use strict";US();dz();vz();xz();bz();wz();Ez()});var To=M(()=>{"use strict";Sz()});var rh,nh,G1=M(()=>{"use strict";rh="#ffffff",nh="#f2f2f2"});var wi,ap=M(()=>{"use strict";To();wi=o((t,e)=>e?Ne(t,{s:-40,l:10}):Ne(t,{s:-40,l:-10}),"mkBorder")});var WS,Az,_z=M(()=>{"use strict";To();G1();ap();WS=class{static{o(this,"Theme")}constructor(){this.background="#f4f4f4",this.primaryColor="#fff4dd",this.noteBkgColor="#fff5ad",this.noteTextColor="#333",this.THEME_COLOR_LIMIT=12,this.fontFamily='"trebuchet ms", verdana, arial, sans-serif',this.fontSize="16px"}updateColors(){if(this.primaryTextColor=this.primaryTextColor||(this.darkMode?"#eee":"#333"),this.secondaryColor=this.secondaryColor||Ne(this.primaryColor,{h:-120}),this.tertiaryColor=this.tertiaryColor||Ne(this.primaryColor,{h:180,l:5}),this.primaryBorderColor=this.primaryBorderColor||wi(this.primaryColor,this.darkMode),this.secondaryBorderColor=this.secondaryBorderColor||wi(this.secondaryColor,this.darkMode),this.tertiaryBorderColor=this.tertiaryBorderColor||wi(this.tertiaryColor,this.darkMode),this.noteBorderColor=this.noteBorderColor||wi(this.noteBkgColor,this.darkMode),this.noteBkgColor=this.noteBkgColor||"#fff5ad",this.noteTextColor=this.noteTextColor||"#333",this.secondaryTextColor=this.secondaryTextColor||pt(this.secondaryColor),this.tertiaryTextColor=this.tertiaryTextColor||pt(this.tertiaryColor),this.lineColor=this.lineColor||pt(this.background),this.arrowheadColor=this.arrowheadColor||pt(this.background),this.textColor=this.textColor||this.primaryTextColor,this.border2=this.border2||this.tertiaryBorderColor,this.nodeBkg=this.nodeBkg||this.primaryColor,this.mainBkg=this.mainBkg||this.primaryColor,this.nodeBorder=this.nodeBorder||this.primaryBorderColor,this.clusterBkg=this.clusterBkg||this.tertiaryColor,this.clusterBorder=this.clusterBorder||this.tertiaryBorderColor,this.defaultLinkColor=this.defaultLinkColor||this.lineColor,this.titleColor=this.titleColor||this.tertiaryTextColor,this.edgeLabelBackground=this.edgeLabelBackground||(this.darkMode?Bt(this.secondaryColor,30):this.secondaryColor),this.nodeTextColor=this.nodeTextColor||this.primaryTextColor,this.actorBorder=this.actorBorder||this.primaryBorderColor,this.actorBkg=this.actorBkg||this.mainBkg,this.actorTextColor=this.actorTextColor||this.primaryTextColor,this.actorLineColor=this.actorLineColor||this.actorBorder,this.labelBoxBkgColor=this.labelBoxBkgColor||this.actorBkg,this.signalColor=this.signalColor||this.textColor,this.signalTextColor=this.signalTextColor||this.textColor,this.labelBoxBorderColor=this.labelBoxBorderColor||this.actorBorder,this.labelTextColor=this.labelTextColor||this.actorTextColor,this.loopTextColor=this.loopTextColor||this.actorTextColor,this.activationBorderColor=this.activationBorderColor||Bt(this.secondaryColor,10),this.activationBkgColor=this.activationBkgColor||this.secondaryColor,this.sequenceNumberColor=this.sequenceNumberColor||pt(this.lineColor),this.sectionBkgColor=this.sectionBkgColor||this.tertiaryColor,this.altSectionBkgColor=this.altSectionBkgColor||"white",this.sectionBkgColor=this.sectionBkgColor||this.secondaryColor,this.sectionBkgColor2=this.sectionBkgColor2||this.primaryColor,this.excludeBkgColor=this.excludeBkgColor||"#eeeeee",this.taskBorderColor=this.taskBorderColor||this.primaryBorderColor,this.taskBkgColor=this.taskBkgColor||this.primaryColor,this.activeTaskBorderColor=this.activeTaskBorderColor||this.primaryColor,this.activeTaskBkgColor=this.activeTaskBkgColor||Dt(this.primaryColor,23),this.gridColor=this.gridColor||"lightgrey",this.doneTaskBkgColor=this.doneTaskBkgColor||"lightgrey",this.doneTaskBorderColor=this.doneTaskBorderColor||"grey",this.critBorderColor=this.critBorderColor||"#ff8888",this.critBkgColor=this.critBkgColor||"red",this.todayLineColor=this.todayLineColor||"red",this.taskTextColor=this.taskTextColor||this.textColor,this.taskTextOutsideColor=this.taskTextOutsideColor||this.textColor,this.taskTextLightColor=this.taskTextLightColor||this.textColor,this.taskTextColor=this.taskTextColor||this.primaryTextColor,this.taskTextDarkColor=this.taskTextDarkColor||this.textColor,this.taskTextClickableColor=this.taskTextClickableColor||"#003163",this.personBorder=this.personBorder||this.primaryBorderColor,this.personBkg=this.personBkg||this.mainBkg,this.transitionColor=this.transitionColor||this.lineColor,this.transitionLabelColor=this.transitionLabelColor||this.textColor,this.stateLabelColor=this.stateLabelColor||this.stateBkg||this.primaryTextColor,this.stateBkg=this.stateBkg||this.mainBkg,this.labelBackgroundColor=this.labelBackgroundColor||this.stateBkg,this.compositeBackground=this.compositeBackground||this.background||this.tertiaryColor,this.altBackground=this.altBackground||this.tertiaryColor,this.compositeTitleBackground=this.compositeTitleBackground||this.mainBkg,this.compositeBorder=this.compositeBorder||this.nodeBorder,this.innerEndBackground=this.nodeBorder,this.errorBkgColor=this.errorBkgColor||this.tertiaryColor,this.errorTextColor=this.errorTextColor||this.tertiaryTextColor,this.transitionColor=this.transitionColor||this.lineColor,this.specialStateColor=this.lineColor,this.cScale0=this.cScale0||this.primaryColor,this.cScale1=this.cScale1||this.secondaryColor,this.cScale2=this.cScale2||this.tertiaryColor,this.cScale3=this.cScale3||Ne(this.primaryColor,{h:30}),this.cScale4=this.cScale4||Ne(this.primaryColor,{h:60}),this.cScale5=this.cScale5||Ne(this.primaryColor,{h:90}),this.cScale6=this.cScale6||Ne(this.primaryColor,{h:120}),this.cScale7=this.cScale7||Ne(this.primaryColor,{h:150}),this.cScale8=this.cScale8||Ne(this.primaryColor,{h:210,l:150}),this.cScale9=this.cScale9||Ne(this.primaryColor,{h:270}),this.cScale10=this.cScale10||Ne(this.primaryColor,{h:300}),this.cScale11=this.cScale11||Ne(this.primaryColor,{h:330}),this.darkMode)for(let r=0;r<this.THEME_COLOR_LIMIT;r++)this["cScale"+r]=Bt(this["cScale"+r],75);else for(let r=0;r<this.THEME_COLOR_LIMIT;r++)this["cScale"+r]=Bt(this["cScale"+r],25);for(let r=0;r<this.THEME_COLOR_LIMIT;r++)this["cScaleInv"+r]=this["cScaleInv"+r]||pt(this["cScale"+r]);for(let r=0;r<this.THEME_COLOR_LIMIT;r++)this.darkMode?this["cScalePeer"+r]=this["cScalePeer"+r]||Dt(this["cScale"+r],10):this["cScalePeer"+r]=this["cScalePeer"+r]||Bt(this["cScale"+r],10);this.scaleLabelColor=this.scaleLabelColor||this.labelTextColor;for(let r=0;r<this.THEME_COLOR_LIMIT;r++)this["cScaleLabel"+r]=this["cScaleLabel"+r]||this.scaleLabelColor;let e=this.darkMode?-4:-1;for(let r=0;r<5;r++)this["surface"+r]=this["surface"+r]||Ne(this.mainBkg,{h:180,s:-15,l:e*(5+r*3)}),this["surfacePeer"+r]=this["surfacePeer"+r]||Ne(this.mainBkg,{h:180,s:-15,l:e*(8+r*3)});this.classText=this.classText||this.textColor,this.fillType0=this.fillType0||this.primaryColor,this.fillType1=this.fillType1||this.secondaryColor,this.fillType2=this.fillType2||Ne(this.primaryColor,{h:64}),this.fillType3=this.fillType3||Ne(this.secondaryColor,{h:64}),this.fillType4=this.fillType4||Ne(this.primaryColor,{h:-64}),this.fillType5=this.fillType5||Ne(this.secondaryColor,{h:-64}),this.fillType6=this.fillType6||Ne(this.primaryColor,{h:128}),this.fillType7=this.fillType7||Ne(this.secondaryColor,{h:128}),this.pie1=this.pie1||this.primaryColor,this.pie2=this.pie2||this.secondaryColor,this.pie3=this.pie3||this.tertiaryColor,this.pie4=this.pie4||Ne(this.primaryColor,{l:-10}),this.pie5=this.pie5||Ne(this.secondaryColor,{l:-10}),this.pie6=this.pie6||Ne(this.tertiaryColor,{l:-10}),this.pie7=this.pie7||Ne(this.primaryColor,{h:60,l:-10}),this.pie8=this.pie8||Ne(this.primaryColor,{h:-60,l:-10}),this.pie9=this.pie9||Ne(this.primaryColor,{h:120,l:0}),this.pie10=this.pie10||Ne(this.primaryColor,{h:60,l:-20}),this.pie11=this.pie11||Ne(this.primaryColor,{h:-60,l:-20}),this.pie12=this.pie12||Ne(this.primaryColor,{h:120,l:-10}),this.pieTitleTextSize=this.pieTitleTextSize||"25px",this.pieTitleTextColor=this.pieTitleTextColor||this.taskTextDarkColor,this.pieSectionTextSize=this.pieSectionTextSize||"17px",this.pieSectionTextColor=this.pieSectionTextColor||this.textColor,this.pieLegendTextSize=this.pieLegendTextSize||"17px",this.pieLegendTextColor=this.pieLegendTextColor||this.taskTextDarkColor,this.pieStrokeColor=this.pieStrokeColor||"black",this.pieStrokeWidth=this.pieStrokeWidth||"2px",this.pieOuterStrokeWidth=this.pieOuterStrokeWidth||"2px",this.pieOuterStrokeColor=this.pieOuterStrokeColor||"black",this.pieOpacity=this.pieOpacity||"0.7",this.archEdgeColor=this.archEdgeColor||"#777",this.archEdgeArrowColor=this.archEdgeArrowColor||"#777",this.archEdgeWidth=this.archEdgeWidth||"3",this.archGroupBorderColor=this.archGroupBorderColor||"#000",this.archGroupBorderWidth=this.archGroupBorderWidth||"2px",this.quadrant1Fill=this.quadrant1Fill||this.primaryColor,this.quadrant2Fill=this.quadrant2Fill||Ne(this.primaryColor,{r:5,g:5,b:5}),this.quadrant3Fill=this.quadrant3Fill||Ne(this.primaryColor,{r:10,g:10,b:10}),this.quadrant4Fill=this.quadrant4Fill||Ne(this.primaryColor,{r:15,g:15,b:15}),this.quadrant1TextFill=this.quadrant1TextFill||this.primaryTextColor,this.quadrant2TextFill=this.quadrant2TextFill||Ne(this.primaryTextColor,{r:-5,g:-5,b:-5}),this.quadrant3TextFill=this.quadrant3TextFill||Ne(this.primaryTextColor,{r:-10,g:-10,b:-10}),this.quadrant4TextFill=this.quadrant4TextFill||Ne(this.primaryTextColor,{r:-15,g:-15,b:-15}),this.quadrantPointFill=this.quadrantPointFill||aa(this.quadrant1Fill)?Dt(this.quadrant1Fill):Bt(this.quadrant1Fill),this.quadrantPointTextFill=this.quadrantPointTextFill||this.primaryTextColor,this.quadrantXAxisTextFill=this.quadrantXAxisTextFill||this.primaryTextColor,this.quadrantYAxisTextFill=this.quadrantYAxisTextFill||this.primaryTextColor,this.quadrantInternalBorderStrokeFill=this.quadrantInternalBorderStrokeFill||this.primaryBorderColor,this.quadrantExternalBorderStrokeFill=this.quadrantExternalBorderStrokeFill||this.primaryBorderColor,this.quadrantTitleFill=this.quadrantTitleFill||this.primaryTextColor,this.xyChart={backgroundColor:this.xyChart?.backgroundColor||this.background,titleColor:this.xyChart?.titleColor||this.primaryTextColor,xAxisTitleColor:this.xyChart?.xAxisTitleColor||this.primaryTextColor,xAxisLabelColor:this.xyChart?.xAxisLabelColor||this.primaryTextColor,xAxisTickColor:this.xyChart?.xAxisTickColor||this.primaryTextColor,xAxisLineColor:this.xyChart?.xAxisLineColor||this.primaryTextColor,yAxisTitleColor:this.xyChart?.yAxisTitleColor||this.primaryTextColor,yAxisLabelColor:this.xyChart?.yAxisLabelColor||this.primaryTextColor,yAxisTickColor:this.xyChart?.yAxisTickColor||this.primaryTextColor,yAxisLineColor:this.xyChart?.yAxisLineColor||this.primaryTextColor,plotColorPalette:this.xyChart?.plotColorPalette||"#FFF4DD,#FFD8B1,#FFA07A,#ECEFF1,#D6DBDF,#C3E0A8,#FFB6A4,#FFD74D,#738FA7,#FFFFF0"},this.requirementBackground=this.requirementBackground||this.primaryColor,this.requirementBorderColor=this.requirementBorderColor||this.primaryBorderColor,this.requirementBorderSize=this.requirementBorderSize||"1",this.requirementTextColor=this.requirementTextColor||this.primaryTextColor,this.relationColor=this.relationColor||this.lineColor,this.relationLabelBackground=this.relationLabelBackground||(this.darkMode?Bt(this.secondaryColor,30):this.secondaryColor),this.relationLabelColor=this.relationLabelColor||this.actorTextColor,this.git0=this.git0||this.primaryColor,this.git1=this.git1||this.secondaryColor,this.git2=this.git2||this.tertiaryColor,this.git3=this.git3||Ne(this.primaryColor,{h:-30}),this.git4=this.git4||Ne(this.primaryColor,{h:-60}),this.git5=this.git5||Ne(this.primaryColor,{h:-90}),this.git6=this.git6||Ne(this.primaryColor,{h:60}),this.git7=this.git7||Ne(this.primaryColor,{h:120}),this.darkMode?(this.git0=Dt(this.git0,25),this.git1=Dt(this.git1,25),this.git2=Dt(this.git2,25),this.git3=Dt(this.git3,25),this.git4=Dt(this.git4,25),this.git5=Dt(this.git5,25),this.git6=Dt(this.git6,25),this.git7=Dt(this.git7,25)):(this.git0=Bt(this.git0,25),this.git1=Bt(this.git1,25),this.git2=Bt(this.git2,25),this.git3=Bt(this.git3,25),this.git4=Bt(this.git4,25),this.git5=Bt(this.git5,25),this.git6=Bt(this.git6,25),this.git7=Bt(this.git7,25)),this.gitInv0=this.gitInv0||pt(this.git0),this.gitInv1=this.gitInv1||pt(this.git1),this.gitInv2=this.gitInv2||pt(this.git2),this.gitInv3=this.gitInv3||pt(this.git3),this.gitInv4=this.gitInv4||pt(this.git4),this.gitInv5=this.gitInv5||pt(this.git5),this.gitInv6=this.gitInv6||pt(this.git6),this.gitInv7=this.gitInv7||pt(this.git7),this.branchLabelColor=this.branchLabelColor||(this.darkMode?"black":this.labelTextColor),this.gitBranchLabel0=this.gitBranchLabel0||this.branchLabelColor,this.gitBranchLabel1=this.gitBranchLabel1||this.branchLabelColor,this.gitBranchLabel2=this.gitBranchLabel2||this.branchLabelColor,this.gitBranchLabel3=this.gitBranchLabel3||this.branchLabelColor,this.gitBranchLabel4=this.gitBranchLabel4||this.branchLabelColor,this.gitBranchLabel5=this.gitBranchLabel5||this.branchLabelColor,this.gitBranchLabel6=this.gitBranchLabel6||this.branchLabelColor,this.gitBranchLabel7=this.gitBranchLabel7||this.branchLabelColor,this.tagLabelColor=this.tagLabelColor||this.primaryTextColor,this.tagLabelBackground=this.tagLabelBackground||this.primaryColor,this.tagLabelBorder=this.tagBorder||this.primaryBorderColor,this.tagLabelFontSize=this.tagLabelFontSize||"10px",this.commitLabelColor=this.commitLabelColor||this.secondaryTextColor,this.commitLabelBackground=this.commitLabelBackground||this.secondaryColor,this.commitLabelFontSize=this.commitLabelFontSize||"10px",this.attributeBackgroundColorOdd=this.attributeBackgroundColorOdd||rh,this.attributeBackgroundColorEven=this.attributeBackgroundColorEven||nh}calculate(e){if(typeof e!="object"){this.updateColors();return}let r=Object.keys(e);r.forEach(n=>{this[n]=e[n]}),this.updateColors(),r.forEach(n=>{this[n]=e[n]})}},Az=o(t=>{let e=new WS;return e.calculate(t),e},"getThemeVariables")});var YS,Lz,Dz=M(()=>{"use strict";To();ap();YS=class{static{o(this,"Theme")}constructor(){this.background="#333",this.primaryColor="#1f2020",this.secondaryColor=Dt(this.primaryColor,16),this.tertiaryColor=Ne(this.primaryColor,{h:-160}),this.primaryBorderColor=pt(this.background),this.secondaryBorderColor=wi(this.secondaryColor,this.darkMode),this.tertiaryBorderColor=wi(this.tertiaryColor,this.darkMode),this.primaryTextColor=pt(this.primaryColor),this.secondaryTextColor=pt(this.secondaryColor),this.tertiaryTextColor=pt(this.tertiaryColor),this.lineColor=pt(this.background),this.textColor=pt(this.background),this.mainBkg="#1f2020",this.secondBkg="calculated",this.mainContrastColor="lightgrey",this.darkTextColor=Dt(pt("#323D47"),10),this.lineColor="calculated",this.border1="#ccc",this.border2=Hs(255,255,255,.25),this.arrowheadColor="calculated",this.fontFamily='"trebuchet ms", verdana, arial, sans-serif',this.fontSize="16px",this.labelBackground="#181818",this.textColor="#ccc",this.THEME_COLOR_LIMIT=12,this.nodeBkg="calculated",this.nodeBorder="calculated",this.clusterBkg="calculated",this.clusterBorder="calculated",this.defaultLinkColor="calculated",this.titleColor="#F9FFFE",this.edgeLabelBackground="calculated",this.actorBorder="calculated",this.actorBkg="calculated",this.actorTextColor="calculated",this.actorLineColor="calculated",this.signalColor="calculated",this.signalTextColor="calculated",this.labelBoxBkgColor="calculated",this.labelBoxBorderColor="calculated",this.labelTextColor="calculated",this.loopTextColor="calculated",this.noteBorderColor="calculated",this.noteBkgColor="#fff5ad",this.noteTextColor="calculated",this.activationBorderColor="calculated",this.activationBkgColor="calculated",this.sequenceNumberColor="black",this.sectionBkgColor=Bt("#EAE8D9",30),this.altSectionBkgColor="calculated",this.sectionBkgColor2="#EAE8D9",this.excludeBkgColor=Bt(this.sectionBkgColor,10),this.taskBorderColor=Hs(255,255,255,70),this.taskBkgColor="calculated",this.taskTextColor="calculated",this.taskTextLightColor="calculated",this.taskTextOutsideColor="calculated",this.taskTextClickableColor="#003163",this.activeTaskBorderColor=Hs(255,255,255,50),this.activeTaskBkgColor="#81B1DB",this.gridColor="calculated",this.doneTaskBkgColor="calculated",this.doneTaskBorderColor="grey",this.critBorderColor="#E83737",this.critBkgColor="#E83737",this.taskTextDarkColor="calculated",this.todayLineColor="#DB5757",this.personBorder=this.primaryBorderColor,this.personBkg=this.mainBkg,this.archEdgeColor="calculated",this.archEdgeArrowColor="calculated",this.archEdgeWidth="3",this.archGroupBorderColor=this.primaryBorderColor,this.archGroupBorderWidth="2px",this.labelColor="calculated",this.errorBkgColor="#a44141",this.errorTextColor="#ddd"}updateColors(){this.secondBkg=Dt(this.mainBkg,16),this.lineColor=this.mainContrastColor,this.arrowheadColor=this.mainContrastColor,this.nodeBkg=this.mainBkg,this.nodeBorder=this.border1,this.clusterBkg=this.secondBkg,this.clusterBorder=this.border2,this.defaultLinkColor=this.lineColor,this.edgeLabelBackground=Dt(this.labelBackground,25),this.actorBorder=this.border1,this.actorBkg=this.mainBkg,this.actorTextColor=this.mainContrastColor,this.actorLineColor=this.actorBorder,this.signalColor=this.mainContrastColor,this.signalTextColor=this.mainContrastColor,this.labelBoxBkgColor=this.actorBkg,this.labelBoxBorderColor=this.actorBorder,this.labelTextColor=this.mainContrastColor,this.loopTextColor=this.mainContrastColor,this.noteBorderColor=this.secondaryBorderColor,this.noteBkgColor=this.secondBkg,this.noteTextColor=this.secondaryTextColor,this.activationBorderColor=this.border1,this.activationBkgColor=this.secondBkg,this.altSectionBkgColor=this.background,this.taskBkgColor=Dt(this.mainBkg,23),this.taskTextColor=this.darkTextColor,this.taskTextLightColor=this.mainContrastColor,this.taskTextOutsideColor=this.taskTextLightColor,this.gridColor=this.mainContrastColor,this.doneTaskBkgColor=this.mainContrastColor,this.taskTextDarkColor=this.darkTextColor,this.archEdgeColor=this.lineColor,this.archEdgeArrowColor=this.lineColor,this.transitionColor=this.transitionColor||this.lineColor,this.transitionLabelColor=this.transitionLabelColor||this.textColor,this.stateLabelColor=this.stateLabelColor||this.stateBkg||this.primaryTextColor,this.stateBkg=this.stateBkg||this.mainBkg,this.labelBackgroundColor=this.labelBackgroundColor||this.stateBkg,this.compositeBackground=this.compositeBackground||this.background||this.tertiaryColor,this.altBackground=this.altBackground||"#555",this.compositeTitleBackground=this.compositeTitleBackground||this.mainBkg,this.compositeBorder=this.compositeBorder||this.nodeBorder,this.innerEndBackground=this.primaryBorderColor,this.specialStateColor="#f4f4f4",this.errorBkgColor=this.errorBkgColor||this.tertiaryColor,this.errorTextColor=this.errorTextColor||this.tertiaryTextColor,this.fillType0=this.primaryColor,this.fillType1=this.secondaryColor,this.fillType2=Ne(this.primaryColor,{h:64}),this.fillType3=Ne(this.secondaryColor,{h:64}),this.fillType4=Ne(this.primaryColor,{h:-64}),this.fillType5=Ne(this.secondaryColor,{h:-64}),this.fillType6=Ne(this.primaryColor,{h:128}),this.fillType7=Ne(this.secondaryColor,{h:128}),this.cScale1=this.cScale1||"#0b0000",this.cScale2=this.cScale2||"#4d1037",this.cScale3=this.cScale3||"#3f5258",this.cScale4=this.cScale4||"#4f2f1b",this.cScale5=this.cScale5||"#6e0a0a",this.cScale6=this.cScale6||"#3b0048",this.cScale7=this.cScale7||"#995a01",this.cScale8=this.cScale8||"#154706",this.cScale9=this.cScale9||"#161722",this.cScale10=this.cScale10||"#00296f",this.cScale11=this.cScale11||"#01629c",this.cScale12=this.cScale12||"#010029",this.cScale0=this.cScale0||this.primaryColor,this.cScale1=this.cScale1||this.secondaryColor,this.cScale2=this.cScale2||this.tertiaryColor,this.cScale3=this.cScale3||Ne(this.primaryColor,{h:30}),this.cScale4=this.cScale4||Ne(this.primaryColor,{h:60}),this.cScale5=this.cScale5||Ne(this.primaryColor,{h:90}),this.cScale6=this.cScale6||Ne(this.primaryColor,{h:120}),this.cScale7=this.cScale7||Ne(this.primaryColor,{h:150}),this.cScale8=this.cScale8||Ne(this.primaryColor,{h:210}),this.cScale9=this.cScale9||Ne(this.primaryColor,{h:270}),this.cScale10=this.cScale10||Ne(this.primaryColor,{h:300}),this.cScale11=this.cScale11||Ne(this.primaryColor,{h:330});for(let e=0;e<this.THEME_COLOR_LIMIT;e++)this["cScaleInv"+e]=this["cScaleInv"+e]||pt(this["cScale"+e]);for(let e=0;e<this.THEME_COLOR_LIMIT;e++)this["cScalePeer"+e]=this["cScalePeer"+e]||Dt(this["cScale"+e],10);for(let e=0;e<5;e++)this["surface"+e]=this["surface"+e]||Ne(this.mainBkg,{h:30,s:-30,l:-(-10+e*4)}),this["surfacePeer"+e]=this["surfacePeer"+e]||Ne(this.mainBkg,{h:30,s:-30,l:-(-7+e*4)});this.scaleLabelColor=this.scaleLabelColor||(this.darkMode?"black":this.labelTextColor);for(let e=0;e<this.THEME_COLOR_LIMIT;e++)this["cScaleLabel"+e]=this["cScaleLabel"+e]||this.scaleLabelColor;for(let e=0;e<this.THEME_COLOR_LIMIT;e++)this["pie"+e]=this["cScale"+e];this.pieTitleTextSize=this.pieTitleTextSize||"25px",this.pieTitleTextColor=this.pieTitleTextColor||this.taskTextDarkColor,this.pieSectionTextSize=this.pieSectionTextSize||"17px",this.pieSectionTextColor=this.pieSectionTextColor||this.textColor,this.pieLegendTextSize=this.pieLegendTextSize||"17px",this.pieLegendTextColor=this.pieLegendTextColor||this.taskTextDarkColor,this.pieStrokeColor=this.pieStrokeColor||"black",this.pieStrokeWidth=this.pieStrokeWidth||"2px",this.pieOuterStrokeWidth=this.pieOuterStrokeWidth||"2px",this.pieOuterStrokeColor=this.pieOuterStrokeColor||"black",this.pieOpacity=this.pieOpacity||"0.7",this.quadrant1Fill=this.quadrant1Fill||this.primaryColor,this.quadrant2Fill=this.quadrant2Fill||Ne(this.primaryColor,{r:5,g:5,b:5}),this.quadrant3Fill=this.quadrant3Fill||Ne(this.primaryColor,{r:10,g:10,b:10}),this.quadrant4Fill=this.quadrant4Fill||Ne(this.primaryColor,{r:15,g:15,b:15}),this.quadrant1TextFill=this.quadrant1TextFill||this.primaryTextColor,this.quadrant2TextFill=this.quadrant2TextFill||Ne(this.primaryTextColor,{r:-5,g:-5,b:-5}),this.quadrant3TextFill=this.quadrant3TextFill||Ne(this.primaryTextColor,{r:-10,g:-10,b:-10}),this.quadrant4TextFill=this.quadrant4TextFill||Ne(this.primaryTextColor,{r:-15,g:-15,b:-15}),this.quadrantPointFill=this.quadrantPointFill||aa(this.quadrant1Fill)?Dt(this.quadrant1Fill):Bt(this.quadrant1Fill),this.quadrantPointTextFill=this.quadrantPointTextFill||this.primaryTextColor,this.quadrantXAxisTextFill=this.quadrantXAxisTextFill||this.primaryTextColor,this.quadrantYAxisTextFill=this.quadrantYAxisTextFill||this.primaryTextColor,this.quadrantInternalBorderStrokeFill=this.quadrantInternalBorderStrokeFill||this.primaryBorderColor,this.quadrantExternalBorderStrokeFill=this.quadrantExternalBorderStrokeFill||this.primaryBorderColor,this.quadrantTitleFill=this.quadrantTitleFill||this.primaryTextColor,this.xyChart={backgroundColor:this.xyChart?.backgroundColor||this.background,titleColor:this.xyChart?.titleColor||this.primaryTextColor,xAxisTitleColor:this.xyChart?.xAxisTitleColor||this.primaryTextColor,xAxisLabelColor:this.xyChart?.xAxisLabelColor||this.primaryTextColor,xAxisTickColor:this.xyChart?.xAxisTickColor||this.primaryTextColor,xAxisLineColor:this.xyChart?.xAxisLineColor||this.primaryTextColor,yAxisTitleColor:this.xyChart?.yAxisTitleColor||this.primaryTextColor,yAxisLabelColor:this.xyChart?.yAxisLabelColor||this.primaryTextColor,yAxisTickColor:this.xyChart?.yAxisTickColor||this.primaryTextColor,yAxisLineColor:this.xyChart?.yAxisLineColor||this.primaryTextColor,plotColorPalette:this.xyChart?.plotColorPalette||"#3498db,#2ecc71,#e74c3c,#f1c40f,#bdc3c7,#ffffff,#34495e,#9b59b6,#1abc9c,#e67e22"},this.packet={startByteColor:this.primaryTextColor,endByteColor:this.primaryTextColor,labelColor:this.primaryTextColor,titleColor:this.primaryTextColor,blockStrokeColor:this.primaryTextColor,blockFillColor:this.background},this.classText=this.primaryTextColor,this.requirementBackground=this.requirementBackground||this.primaryColor,this.requirementBorderColor=this.requirementBorderColor||this.primaryBorderColor,this.requirementBorderSize=this.requirementBorderSize||"1",this.requirementTextColor=this.requirementTextColor||this.primaryTextColor,this.relationColor=this.relationColor||this.lineColor,this.relationLabelBackground=this.relationLabelBackground||(this.darkMode?Bt(this.secondaryColor,30):this.secondaryColor),this.relationLabelColor=this.relationLabelColor||this.actorTextColor,this.git0=Dt(this.secondaryColor,20),this.git1=Dt(this.pie2||this.secondaryColor,20),this.git2=Dt(this.pie3||this.tertiaryColor,20),this.git3=Dt(this.pie4||Ne(this.primaryColor,{h:-30}),20),this.git4=Dt(this.pie5||Ne(this.primaryColor,{h:-60}),20),this.git5=Dt(this.pie6||Ne(this.primaryColor,{h:-90}),10),this.git6=Dt(this.pie7||Ne(this.primaryColor,{h:60}),10),this.git7=Dt(this.pie8||Ne(this.primaryColor,{h:120}),20),this.gitInv0=this.gitInv0||pt(this.git0),this.gitInv1=this.gitInv1||pt(this.git1),this.gitInv2=this.gitInv2||pt(this.git2),this.gitInv3=this.gitInv3||pt(this.git3),this.gitInv4=this.gitInv4||pt(this.git4),this.gitInv5=this.gitInv5||pt(this.git5),this.gitInv6=this.gitInv6||pt(this.git6),this.gitInv7=this.gitInv7||pt(this.git7),this.gitBranchLabel0=this.gitBranchLabel0||pt(this.labelTextColor),this.gitBranchLabel1=this.gitBranchLabel1||this.labelTextColor,this.gitBranchLabel2=this.gitBranchLabel2||this.labelTextColor,this.gitBranchLabel3=this.gitBranchLabel3||pt(this.labelTextColor),this.gitBranchLabel4=this.gitBranchLabel4||this.labelTextColor,this.gitBranchLabel5=this.gitBranchLabel5||this.labelTextColor,this.gitBranchLabel6=this.gitBranchLabel6||this.labelTextColor,this.gitBranchLabel7=this.gitBranchLabel7||this.labelTextColor,this.tagLabelColor=this.tagLabelColor||this.primaryTextColor,this.tagLabelBackground=this.tagLabelBackground||this.primaryColor,this.tagLabelBorder=this.tagBorder||this.primaryBorderColor,this.tagLabelFontSize=this.tagLabelFontSize||"10px",this.commitLabelColor=this.commitLabelColor||this.secondaryTextColor,this.commitLabelBackground=this.commitLabelBackground||this.secondaryColor,this.commitLabelFontSize=this.commitLabelFontSize||"10px",this.attributeBackgroundColorOdd=this.attributeBackgroundColorOdd||Dt(this.background,12),this.attributeBackgroundColorEven=this.attributeBackgroundColorEven||Dt(this.background,2),this.nodeBorder=this.nodeBorder||"#999"}calculate(e){if(typeof e!="object"){this.updateColors();return}let r=Object.keys(e);r.forEach(n=>{this[n]=e[n]}),this.updateColors(),r.forEach(n=>{this[n]=e[n]})}},Lz=o(t=>{let e=new YS;return e.calculate(t),e},"getThemeVariables")});var qS,sp,Ub=M(()=>{"use strict";To();ap();G1();qS=class{static{o(this,"Theme")}constructor(){this.background="#f4f4f4",this.primaryColor="#ECECFF",this.secondaryColor=Ne(this.primaryColor,{h:120}),this.secondaryColor="#ffffde",this.tertiaryColor=Ne(this.primaryColor,{h:-160}),this.primaryBorderColor=wi(this.primaryColor,this.darkMode),this.secondaryBorderColor=wi(this.secondaryColor,this.darkMode),this.tertiaryBorderColor=wi(this.tertiaryColor,this.darkMode),this.primaryTextColor=pt(this.primaryColor),this.secondaryTextColor=pt(this.secondaryColor),this.tertiaryTextColor=pt(this.tertiaryColor),this.lineColor=pt(this.background),this.textColor=pt(this.background),this.background="white",this.mainBkg="#ECECFF",this.secondBkg="#ffffde",this.lineColor="#333333",this.border1="#9370DB",this.border2="#aaaa33",this.arrowheadColor="#333333",this.fontFamily='"trebuchet ms", verdana, arial, sans-serif',this.fontSize="16px",this.labelBackground="rgba(232,232,232, 0.8)",this.textColor="#333",this.THEME_COLOR_LIMIT=12,this.nodeBkg="calculated",this.nodeBorder="calculated",this.clusterBkg="calculated",this.clusterBorder="calculated",this.defaultLinkColor="calculated",this.titleColor="calculated",this.edgeLabelBackground="calculated",this.actorBorder="calculated",this.actorBkg="calculated",this.actorTextColor="black",this.actorLineColor="calculated",this.signalColor="calculated",this.signalTextColor="calculated",this.labelBoxBkgColor="calculated",this.labelBoxBorderColor="calculated",this.labelTextColor="calculated",this.loopTextColor="calculated",this.noteBorderColor="calculated",this.noteBkgColor="#fff5ad",this.noteTextColor="calculated",this.activationBorderColor="#666",this.activationBkgColor="#f4f4f4",this.sequenceNumberColor="white",this.sectionBkgColor="calculated",this.altSectionBkgColor="calculated",this.sectionBkgColor2="calculated",this.excludeBkgColor="#eeeeee",this.taskBorderColor="calculated",this.taskBkgColor="calculated",this.taskTextLightColor="calculated",this.taskTextColor=this.taskTextLightColor,this.taskTextDarkColor="calculated",this.taskTextOutsideColor=this.taskTextDarkColor,this.taskTextClickableColor="calculated",this.activeTaskBorderColor="calculated",this.activeTaskBkgColor="calculated",this.gridColor="calculated",this.doneTaskBkgColor="calculated",this.doneTaskBorderColor="calculated",this.critBorderColor="calculated",this.critBkgColor="calculated",this.todayLineColor="calculated",this.sectionBkgColor=Hs(102,102,255,.49),this.altSectionBkgColor="white",this.sectionBkgColor2="#fff400",this.taskBorderColor="#534fbc",this.taskBkgColor="#8a90dd",this.taskTextLightColor="white",this.taskTextColor="calculated",this.taskTextDarkColor="black",this.taskTextOutsideColor="calculated",this.taskTextClickableColor="#003163",this.activeTaskBorderColor="#534fbc",this.activeTaskBkgColor="#bfc7ff",this.gridColor="lightgrey",this.doneTaskBkgColor="lightgrey",this.doneTaskBorderColor="grey",this.critBorderColor="#ff8888",this.critBkgColor="red",this.todayLineColor="red",this.personBorder=this.primaryBorderColor,this.personBkg=this.mainBkg,this.archEdgeColor="calculated",this.archEdgeArrowColor="calculated",this.archEdgeWidth="3",this.archGroupBorderColor=this.primaryBorderColor,this.archGroupBorderWidth="2px",this.labelColor="black",this.errorBkgColor="#552222",this.errorTextColor="#552222",this.updateColors()}updateColors(){this.cScale0=this.cScale0||this.primaryColor,this.cScale1=this.cScale1||this.secondaryColor,this.cScale2=this.cScale2||this.tertiaryColor,this.cScale3=this.cScale3||Ne(this.primaryColor,{h:30}),this.cScale4=this.cScale4||Ne(this.primaryColor,{h:60}),this.cScale5=this.cScale5||Ne(this.primaryColor,{h:90}),this.cScale6=this.cScale6||Ne(this.primaryColor,{h:120}),this.cScale7=this.cScale7||Ne(this.primaryColor,{h:150}),this.cScale8=this.cScale8||Ne(this.primaryColor,{h:210}),this.cScale9=this.cScale9||Ne(this.primaryColor,{h:270}),this.cScale10=this.cScale10||Ne(this.primaryColor,{h:300}),this.cScale11=this.cScale11||Ne(this.primaryColor,{h:330}),this.cScalePeer1=this.cScalePeer1||Bt(this.secondaryColor,45),this.cScalePeer2=this.cScalePeer2||Bt(this.tertiaryColor,40);for(let e=0;e<this.THEME_COLOR_LIMIT;e++)this["cScale"+e]=Bt(this["cScale"+e],10),this["cScalePeer"+e]=this["cScalePeer"+e]||Bt(this["cScale"+e],25);for(let e=0;e<this.THEME_COLOR_LIMIT;e++)this["cScaleInv"+e]=this["cScaleInv"+e]||Ne(this["cScale"+e],{h:180});for(let e=0;e<5;e++)this["surface"+e]=this["surface"+e]||Ne(this.mainBkg,{h:30,l:-(5+e*5)}),this["surfacePeer"+e]=this["surfacePeer"+e]||Ne(this.mainBkg,{h:30,l:-(7+e*5)});if(this.scaleLabelColor=this.scaleLabelColor!=="calculated"&&this.scaleLabelColor?this.scaleLabelColor:this.labelTextColor,this.labelTextColor!=="calculated"){this.cScaleLabel0=this.cScaleLabel0||pt(this.labelTextColor),this.cScaleLabel3=this.cScaleLabel3||pt(this.labelTextColor);for(let e=0;e<this.THEME_COLOR_LIMIT;e++)this["cScaleLabel"+e]=this["cScaleLabel"+e]||this.labelTextColor}this.nodeBkg=this.mainBkg,this.nodeBorder=this.border1,this.clusterBkg=this.secondBkg,this.clusterBorder=this.border2,this.defaultLinkColor=this.lineColor,this.titleColor=this.textColor,this.edgeLabelBackground=this.labelBackground,this.actorBorder=Dt(this.border1,23),this.actorBkg=this.mainBkg,this.labelBoxBkgColor=this.actorBkg,this.signalColor=this.textColor,this.signalTextColor=this.textColor,this.labelBoxBorderColor=this.actorBorder,this.labelTextColor=this.actorTextColor,this.loopTextColor=this.actorTextColor,this.noteBorderColor=this.border2,this.noteTextColor=this.actorTextColor,this.actorLineColor=this.actorBorder,this.taskTextColor=this.taskTextLightColor,this.taskTextOutsideColor=this.taskTextDarkColor,this.archEdgeColor=this.lineColor,this.archEdgeArrowColor=this.lineColor,this.transitionColor=this.transitionColor||this.lineColor,this.transitionLabelColor=this.transitionLabelColor||this.textColor,this.stateLabelColor=this.stateLabelColor||this.stateBkg||this.primaryTextColor,this.stateBkg=this.stateBkg||this.mainBkg,this.labelBackgroundColor=this.labelBackgroundColor||this.stateBkg,this.compositeBackground=this.compositeBackground||this.background||this.tertiaryColor,this.altBackground=this.altBackground||"#f0f0f0",this.compositeTitleBackground=this.compositeTitleBackground||this.mainBkg,this.compositeBorder=this.compositeBorder||this.nodeBorder,this.innerEndBackground=this.nodeBorder,this.specialStateColor=this.lineColor,this.errorBkgColor=this.errorBkgColor||this.tertiaryColor,this.errorTextColor=this.errorTextColor||this.tertiaryTextColor,this.transitionColor=this.transitionColor||this.lineColor,this.classText=this.primaryTextColor,this.fillType0=this.primaryColor,this.fillType1=this.secondaryColor,this.fillType2=Ne(this.primaryColor,{h:64}),this.fillType3=Ne(this.secondaryColor,{h:64}),this.fillType4=Ne(this.primaryColor,{h:-64}),this.fillType5=Ne(this.secondaryColor,{h:-64}),this.fillType6=Ne(this.primaryColor,{h:128}),this.fillType7=Ne(this.secondaryColor,{h:128}),this.pie1=this.pie1||this.primaryColor,this.pie2=this.pie2||this.secondaryColor,this.pie3=this.pie3||Ne(this.tertiaryColor,{l:-40}),this.pie4=this.pie4||Ne(this.primaryColor,{l:-10}),this.pie5=this.pie5||Ne(this.secondaryColor,{l:-30}),this.pie6=this.pie6||Ne(this.tertiaryColor,{l:-20}),this.pie7=this.pie7||Ne(this.primaryColor,{h:60,l:-20}),this.pie8=this.pie8||Ne(this.primaryColor,{h:-60,l:-40}),this.pie9=this.pie9||Ne(this.primaryColor,{h:120,l:-40}),this.pie10=this.pie10||Ne(this.primaryColor,{h:60,l:-40}),this.pie11=this.pie11||Ne(this.primaryColor,{h:-90,l:-40}),this.pie12=this.pie12||Ne(this.primaryColor,{h:120,l:-30}),this.pieTitleTextSize=this.pieTitleTextSize||"25px",this.pieTitleTextColor=this.pieTitleTextColor||this.taskTextDarkColor,this.pieSectionTextSize=this.pieSectionTextSize||"17px",this.pieSectionTextColor=this.pieSectionTextColor||this.textColor,this.pieLegendTextSize=this.pieLegendTextSize||"17px",this.pieLegendTextColor=this.pieLegendTextColor||this.taskTextDarkColor,this.pieStrokeColor=this.pieStrokeColor||"black",this.pieStrokeWidth=this.pieStrokeWidth||"2px",this.pieOuterStrokeWidth=this.pieOuterStrokeWidth||"2px",this.pieOuterStrokeColor=this.pieOuterStrokeColor||"black",this.pieOpacity=this.pieOpacity||"0.7",this.quadrant1Fill=this.quadrant1Fill||this.primaryColor,this.quadrant2Fill=this.quadrant2Fill||Ne(this.primaryColor,{r:5,g:5,b:5}),this.quadrant3Fill=this.quadrant3Fill||Ne(this.primaryColor,{r:10,g:10,b:10}),this.quadrant4Fill=this.quadrant4Fill||Ne(this.primaryColor,{r:15,g:15,b:15}),this.quadrant1TextFill=this.quadrant1TextFill||this.primaryTextColor,this.quadrant2TextFill=this.quadrant2TextFill||Ne(this.primaryTextColor,{r:-5,g:-5,b:-5}),this.quadrant3TextFill=this.quadrant3TextFill||Ne(this.primaryTextColor,{r:-10,g:-10,b:-10}),this.quadrant4TextFill=this.quadrant4TextFill||Ne(this.primaryTextColor,{r:-15,g:-15,b:-15}),this.quadrantPointFill=this.quadrantPointFill||aa(this.quadrant1Fill)?Dt(this.quadrant1Fill):Bt(this.quadrant1Fill),this.quadrantPointTextFill=this.quadrantPointTextFill||this.primaryTextColor,this.quadrantXAxisTextFill=this.quadrantXAxisTextFill||this.primaryTextColor,this.quadrantYAxisTextFill=this.quadrantYAxisTextFill||this.primaryTextColor,this.quadrantInternalBorderStrokeFill=this.quadrantInternalBorderStrokeFill||this.primaryBorderColor,this.quadrantExternalBorderStrokeFill=this.quadrantExternalBorderStrokeFill||this.primaryBorderColor,this.quadrantTitleFill=this.quadrantTitleFill||this.primaryTextColor,this.xyChart={backgroundColor:this.xyChart?.backgroundColor||this.background,titleColor:this.xyChart?.titleColor||this.primaryTextColor,xAxisTitleColor:this.xyChart?.xAxisTitleColor||this.primaryTextColor,xAxisLabelColor:this.xyChart?.xAxisLabelColor||this.primaryTextColor,xAxisTickColor:this.xyChart?.xAxisTickColor||this.primaryTextColor,xAxisLineColor:this.xyChart?.xAxisLineColor||this.primaryTextColor,yAxisTitleColor:this.xyChart?.yAxisTitleColor||this.primaryTextColor,yAxisLabelColor:this.xyChart?.yAxisLabelColor||this.primaryTextColor,yAxisTickColor:this.xyChart?.yAxisTickColor||this.primaryTextColor,yAxisLineColor:this.xyChart?.yAxisLineColor||this.primaryTextColor,plotColorPalette:this.xyChart?.plotColorPalette||"#ECECFF,#8493A6,#FFC3A0,#DCDDE1,#B8E994,#D1A36F,#C3CDE6,#FFB6C1,#496078,#F8F3E3"},this.requirementBackground=this.requirementBackground||this.primaryColor,this.requirementBorderColor=this.requirementBorderColor||this.primaryBorderColor,this.requirementBorderSize=this.requirementBorderSize||"1",this.requirementTextColor=this.requirementTextColor||this.primaryTextColor,this.relationColor=this.relationColor||this.lineColor,this.relationLabelBackground=this.relationLabelBackground||this.labelBackground,this.relationLabelColor=this.relationLabelColor||this.actorTextColor,this.git0=this.git0||this.primaryColor,this.git1=this.git1||this.secondaryColor,this.git2=this.git2||this.tertiaryColor,this.git3=this.git3||Ne(this.primaryColor,{h:-30}),this.git4=this.git4||Ne(this.primaryColor,{h:-60}),this.git5=this.git5||Ne(this.primaryColor,{h:-90}),this.git6=this.git6||Ne(this.primaryColor,{h:60}),this.git7=this.git7||Ne(this.primaryColor,{h:120}),this.darkMode?(this.git0=Dt(this.git0,25),this.git1=Dt(this.git1,25),this.git2=Dt(this.git2,25),this.git3=Dt(this.git3,25),this.git4=Dt(this.git4,25),this.git5=Dt(this.git5,25),this.git6=Dt(this.git6,25),this.git7=Dt(this.git7,25)):(this.git0=Bt(this.git0,25),this.git1=Bt(this.git1,25),this.git2=Bt(this.git2,25),this.git3=Bt(this.git3,25),this.git4=Bt(this.git4,25),this.git5=Bt(this.git5,25),this.git6=Bt(this.git6,25),this.git7=Bt(this.git7,25)),this.gitInv0=this.gitInv0||Bt(pt(this.git0),25),this.gitInv1=this.gitInv1||pt(this.git1),this.gitInv2=this.gitInv2||pt(this.git2),this.gitInv3=this.gitInv3||pt(this.git3),this.gitInv4=this.gitInv4||pt(this.git4),this.gitInv5=this.gitInv5||pt(this.git5),this.gitInv6=this.gitInv6||pt(this.git6),this.gitInv7=this.gitInv7||pt(this.git7),this.gitBranchLabel0=this.gitBranchLabel0||pt(this.labelTextColor),this.gitBranchLabel1=this.gitBranchLabel1||this.labelTextColor,this.gitBranchLabel2=this.gitBranchLabel2||this.labelTextColor,this.gitBranchLabel3=this.gitBranchLabel3||pt(this.labelTextColor),this.gitBranchLabel4=this.gitBranchLabel4||this.labelTextColor,this.gitBranchLabel5=this.gitBranchLabel5||this.labelTextColor,this.gitBranchLabel6=this.gitBranchLabel6||this.labelTextColor,this.gitBranchLabel7=this.gitBranchLabel7||this.labelTextColor,this.tagLabelColor=this.tagLabelColor||this.primaryTextColor,this.tagLabelBackground=this.tagLabelBackground||this.primaryColor,this.tagLabelBorder=this.tagBorder||this.primaryBorderColor,this.tagLabelFontSize=this.tagLabelFontSize||"10px",this.commitLabelColor=this.commitLabelColor||this.secondaryTextColor,this.commitLabelBackground=this.commitLabelBackground||this.secondaryColor,this.commitLabelFontSize=this.commitLabelFontSize||"10px",this.attributeBackgroundColorOdd=this.attributeBackgroundColorOdd||rh,this.attributeBackgroundColorEven=this.attributeBackgroundColorEven||nh}calculate(e){if(typeof e!="object"){this.updateColors();return}let r=Object.keys(e);r.forEach(n=>{this[n]=e[n]}),this.updateColors(),r.forEach(n=>{this[n]=e[n]})}},sp=o(t=>{let e=new qS;return e.calculate(t),e},"getThemeVariables")});var XS,Nz,Rz=M(()=>{"use strict";To();G1();ap();XS=class{static{o(this,"Theme")}constructor(){this.background="#f4f4f4",this.primaryColor="#cde498",this.secondaryColor="#cdffb2",this.background="white",this.mainBkg="#cde498",this.secondBkg="#cdffb2",this.lineColor="green",this.border1="#13540c",this.border2="#6eaa49",this.arrowheadColor="green",this.fontFamily='"trebuchet ms", verdana, arial, sans-serif',this.fontSize="16px",this.tertiaryColor=Dt("#cde498",10),this.primaryBorderColor=wi(this.primaryColor,this.darkMode),this.secondaryBorderColor=wi(this.secondaryColor,this.darkMode),this.tertiaryBorderColor=wi(this.tertiaryColor,this.darkMode),this.primaryTextColor=pt(this.primaryColor),this.secondaryTextColor=pt(this.secondaryColor),this.tertiaryTextColor=pt(this.primaryColor),this.lineColor=pt(this.background),this.textColor=pt(this.background),this.THEME_COLOR_LIMIT=12,this.nodeBkg="calculated",this.nodeBorder="calculated",this.clusterBkg="calculated",this.clusterBorder="calculated",this.defaultLinkColor="calculated",this.titleColor="#333",this.edgeLabelBackground="#e8e8e8",this.actorBorder="calculated",this.actorBkg="calculated",this.actorTextColor="black",this.actorLineColor="calculated",this.signalColor="#333",this.signalTextColor="#333",this.labelBoxBkgColor="calculated",this.labelBoxBorderColor="#326932",this.labelTextColor="calculated",this.loopTextColor="calculated",this.noteBorderColor="calculated",this.noteBkgColor="#fff5ad",this.noteTextColor="calculated",this.activationBorderColor="#666",this.activationBkgColor="#f4f4f4",this.sequenceNumberColor="white",this.sectionBkgColor="#6eaa49",this.altSectionBkgColor="white",this.sectionBkgColor2="#6eaa49",this.excludeBkgColor="#eeeeee",this.taskBorderColor="calculated",this.taskBkgColor="#487e3a",this.taskTextLightColor="white",this.taskTextColor="calculated",this.taskTextDarkColor="black",this.taskTextOutsideColor="calculated",this.taskTextClickableColor="#003163",this.activeTaskBorderColor="calculated",this.activeTaskBkgColor="calculated",this.gridColor="lightgrey",this.doneTaskBkgColor="lightgrey",this.doneTaskBorderColor="grey",this.critBorderColor="#ff8888",this.critBkgColor="red",this.todayLineColor="red",this.personBorder=this.primaryBorderColor,this.personBkg=this.mainBkg,this.archEdgeColor="calculated",this.archEdgeArrowColor="calculated",this.archEdgeWidth="3",this.archGroupBorderColor=this.primaryBorderColor,this.archGroupBorderWidth="2px",this.labelColor="black",this.errorBkgColor="#552222",this.errorTextColor="#552222"}updateColors(){this.actorBorder=Bt(this.mainBkg,20),this.actorBkg=this.mainBkg,this.labelBoxBkgColor=this.actorBkg,this.labelTextColor=this.actorTextColor,this.loopTextColor=this.actorTextColor,this.noteBorderColor=this.border2,this.noteTextColor=this.actorTextColor,this.actorLineColor=this.actorBorder,this.cScale0=this.cScale0||this.primaryColor,this.cScale1=this.cScale1||this.secondaryColor,this.cScale2=this.cScale2||this.tertiaryColor,this.cScale3=this.cScale3||Ne(this.primaryColor,{h:30}),this.cScale4=this.cScale4||Ne(this.primaryColor,{h:60}),this.cScale5=this.cScale5||Ne(this.primaryColor,{h:90}),this.cScale6=this.cScale6||Ne(this.primaryColor,{h:120}),this.cScale7=this.cScale7||Ne(this.primaryColor,{h:150}),this.cScale8=this.cScale8||Ne(this.primaryColor,{h:210}),this.cScale9=this.cScale9||Ne(this.primaryColor,{h:270}),this.cScale10=this.cScale10||Ne(this.primaryColor,{h:300}),this.cScale11=this.cScale11||Ne(this.primaryColor,{h:330}),this.cScalePeer1=this.cScalePeer1||Bt(this.secondaryColor,45),this.cScalePeer2=this.cScalePeer2||Bt(this.tertiaryColor,40);for(let e=0;e<this.THEME_COLOR_LIMIT;e++)this["cScale"+e]=Bt(this["cScale"+e],10),this["cScalePeer"+e]=this["cScalePeer"+e]||Bt(this["cScale"+e],25);for(let e=0;e<this.THEME_COLOR_LIMIT;e++)this["cScaleInv"+e]=this["cScaleInv"+e]||Ne(this["cScale"+e],{h:180});this.scaleLabelColor=this.scaleLabelColor!=="calculated"&&this.scaleLabelColor?this.scaleLabelColor:this.labelTextColor;for(let e=0;e<this.THEME_COLOR_LIMIT;e++)this["cScaleLabel"+e]=this["cScaleLabel"+e]||this.scaleLabelColor;for(let e=0;e<5;e++)this["surface"+e]=this["surface"+e]||Ne(this.mainBkg,{h:30,s:-30,l:-(5+e*5)}),this["surfacePeer"+e]=this["surfacePeer"+e]||Ne(this.mainBkg,{h:30,s:-30,l:-(8+e*5)});this.nodeBkg=this.mainBkg,this.nodeBorder=this.border1,this.clusterBkg=this.secondBkg,this.clusterBorder=this.border2,this.defaultLinkColor=this.lineColor,this.taskBorderColor=this.border1,this.taskTextColor=this.taskTextLightColor,this.taskTextOutsideColor=this.taskTextDarkColor,this.activeTaskBorderColor=this.taskBorderColor,this.activeTaskBkgColor=this.mainBkg,this.archEdgeColor=this.lineColor,this.archEdgeArrowColor=this.lineColor,this.transitionColor=this.transitionColor||this.lineColor,this.transitionLabelColor=this.transitionLabelColor||this.textColor,this.stateLabelColor=this.stateLabelColor||this.stateBkg||this.primaryTextColor,this.stateBkg=this.stateBkg||this.mainBkg,this.labelBackgroundColor=this.labelBackgroundColor||this.stateBkg,this.compositeBackground=this.compositeBackground||this.background||this.tertiaryColor,this.altBackground=this.altBackground||"#f0f0f0",this.compositeTitleBackground=this.compositeTitleBackground||this.mainBkg,this.compositeBorder=this.compositeBorder||this.nodeBorder,this.innerEndBackground=this.primaryBorderColor,this.specialStateColor=this.lineColor,this.errorBkgColor=this.errorBkgColor||this.tertiaryColor,this.errorTextColor=this.errorTextColor||this.tertiaryTextColor,this.transitionColor=this.transitionColor||this.lineColor,this.classText=this.primaryTextColor,this.fillType0=this.primaryColor,this.fillType1=this.secondaryColor,this.fillType2=Ne(this.primaryColor,{h:64}),this.fillType3=Ne(this.secondaryColor,{h:64}),this.fillType4=Ne(this.primaryColor,{h:-64}),this.fillType5=Ne(this.secondaryColor,{h:-64}),this.fillType6=Ne(this.primaryColor,{h:128}),this.fillType7=Ne(this.secondaryColor,{h:128}),this.pie1=this.pie1||this.primaryColor,this.pie2=this.pie2||this.secondaryColor,this.pie3=this.pie3||this.tertiaryColor,this.pie4=this.pie4||Ne(this.primaryColor,{l:-30}),this.pie5=this.pie5||Ne(this.secondaryColor,{l:-30}),this.pie6=this.pie6||Ne(this.tertiaryColor,{h:40,l:-40}),this.pie7=this.pie7||Ne(this.primaryColor,{h:60,l:-10}),this.pie8=this.pie8||Ne(this.primaryColor,{h:-60,l:-10}),this.pie9=this.pie9||Ne(this.primaryColor,{h:120,l:0}),this.pie10=this.pie10||Ne(this.primaryColor,{h:60,l:-50}),this.pie11=this.pie11||Ne(this.primaryColor,{h:-60,l:-50}),this.pie12=this.pie12||Ne(this.primaryColor,{h:120,l:-50}),this.pieTitleTextSize=this.pieTitleTextSize||"25px",this.pieTitleTextColor=this.pieTitleTextColor||this.taskTextDarkColor,this.pieSectionTextSize=this.pieSectionTextSize||"17px",this.pieSectionTextColor=this.pieSectionTextColor||this.textColor,this.pieLegendTextSize=this.pieLegendTextSize||"17px",this.pieLegendTextColor=this.pieLegendTextColor||this.taskTextDarkColor,this.pieStrokeColor=this.pieStrokeColor||"black",this.pieStrokeWidth=this.pieStrokeWidth||"2px",this.pieOuterStrokeWidth=this.pieOuterStrokeWidth||"2px",this.pieOuterStrokeColor=this.pieOuterStrokeColor||"black",this.pieOpacity=this.pieOpacity||"0.7",this.quadrant1Fill=this.quadrant1Fill||this.primaryColor,this.quadrant2Fill=this.quadrant2Fill||Ne(this.primaryColor,{r:5,g:5,b:5}),this.quadrant3Fill=this.quadrant3Fill||Ne(this.primaryColor,{r:10,g:10,b:10}),this.quadrant4Fill=this.quadrant4Fill||Ne(this.primaryColor,{r:15,g:15,b:15}),this.quadrant1TextFill=this.quadrant1TextFill||this.primaryTextColor,this.quadrant2TextFill=this.quadrant2TextFill||Ne(this.primaryTextColor,{r:-5,g:-5,b:-5}),this.quadrant3TextFill=this.quadrant3TextFill||Ne(this.primaryTextColor,{r:-10,g:-10,b:-10}),this.quadrant4TextFill=this.quadrant4TextFill||Ne(this.primaryTextColor,{r:-15,g:-15,b:-15}),this.quadrantPointFill=this.quadrantPointFill||aa(this.quadrant1Fill)?Dt(this.quadrant1Fill):Bt(this.quadrant1Fill),this.quadrantPointTextFill=this.quadrantPointTextFill||this.primaryTextColor,this.quadrantXAxisTextFill=this.quadrantXAxisTextFill||this.primaryTextColor,this.quadrantYAxisTextFill=this.quadrantYAxisTextFill||this.primaryTextColor,this.quadrantInternalBorderStrokeFill=this.quadrantInternalBorderStrokeFill||this.primaryBorderColor,this.quadrantExternalBorderStrokeFill=this.quadrantExternalBorderStrokeFill||this.primaryBorderColor,this.quadrantTitleFill=this.quadrantTitleFill||this.primaryTextColor,this.packet={startByteColor:this.primaryTextColor,endByteColor:this.primaryTextColor,labelColor:this.primaryTextColor,titleColor:this.primaryTextColor,blockStrokeColor:this.primaryTextColor,blockFillColor:this.mainBkg},this.xyChart={backgroundColor:this.xyChart?.backgroundColor||this.background,titleColor:this.xyChart?.titleColor||this.primaryTextColor,xAxisTitleColor:this.xyChart?.xAxisTitleColor||this.primaryTextColor,xAxisLabelColor:this.xyChart?.xAxisLabelColor||this.primaryTextColor,xAxisTickColor:this.xyChart?.xAxisTickColor||this.primaryTextColor,xAxisLineColor:this.xyChart?.xAxisLineColor||this.primaryTextColor,yAxisTitleColor:this.xyChart?.yAxisTitleColor||this.primaryTextColor,yAxisLabelColor:this.xyChart?.yAxisLabelColor||this.primaryTextColor,yAxisTickColor:this.xyChart?.yAxisTickColor||this.primaryTextColor,yAxisLineColor:this.xyChart?.yAxisLineColor||this.primaryTextColor,plotColorPalette:this.xyChart?.plotColorPalette||"#CDE498,#FF6B6B,#A0D2DB,#D7BDE2,#F0F0F0,#FFC3A0,#7FD8BE,#FF9A8B,#FAF3E0,#FFF176"},this.requirementBackground=this.requirementBackground||this.primaryColor,this.requirementBorderColor=this.requirementBorderColor||this.primaryBorderColor,this.requirementBorderSize=this.requirementBorderSize||"1",this.requirementTextColor=this.requirementTextColor||this.primaryTextColor,this.relationColor=this.relationColor||this.lineColor,this.relationLabelBackground=this.relationLabelBackground||this.edgeLabelBackground,this.relationLabelColor=this.relationLabelColor||this.actorTextColor,this.git0=this.git0||this.primaryColor,this.git1=this.git1||this.secondaryColor,this.git2=this.git2||this.tertiaryColor,this.git3=this.git3||Ne(this.primaryColor,{h:-30}),this.git4=this.git4||Ne(this.primaryColor,{h:-60}),this.git5=this.git5||Ne(this.primaryColor,{h:-90}),this.git6=this.git6||Ne(this.primaryColor,{h:60}),this.git7=this.git7||Ne(this.primaryColor,{h:120}),this.darkMode?(this.git0=Dt(this.git0,25),this.git1=Dt(this.git1,25),this.git2=Dt(this.git2,25),this.git3=Dt(this.git3,25),this.git4=Dt(this.git4,25),this.git5=Dt(this.git5,25),this.git6=Dt(this.git6,25),this.git7=Dt(this.git7,25)):(this.git0=Bt(this.git0,25),this.git1=Bt(this.git1,25),this.git2=Bt(this.git2,25),this.git3=Bt(this.git3,25),this.git4=Bt(this.git4,25),this.git5=Bt(this.git5,25),this.git6=Bt(this.git6,25),this.git7=Bt(this.git7,25)),this.gitInv0=this.gitInv0||pt(this.git0),this.gitInv1=this.gitInv1||pt(this.git1),this.gitInv2=this.gitInv2||pt(this.git2),this.gitInv3=this.gitInv3||pt(this.git3),this.gitInv4=this.gitInv4||pt(this.git4),this.gitInv5=this.gitInv5||pt(this.git5),this.gitInv6=this.gitInv6||pt(this.git6),this.gitInv7=this.gitInv7||pt(this.git7),this.gitBranchLabel0=this.gitBranchLabel0||pt(this.labelTextColor),this.gitBranchLabel1=this.gitBranchLabel1||this.labelTextColor,this.gitBranchLabel2=this.gitBranchLabel2||this.labelTextColor,this.gitBranchLabel3=this.gitBranchLabel3||pt(this.labelTextColor),this.gitBranchLabel4=this.gitBranchLabel4||this.labelTextColor,this.gitBranchLabel5=this.gitBranchLabel5||this.labelTextColor,this.gitBranchLabel6=this.gitBranchLabel6||this.labelTextColor,this.gitBranchLabel7=this.gitBranchLabel7||this.labelTextColor,this.tagLabelColor=this.tagLabelColor||this.primaryTextColor,this.tagLabelBackground=this.tagLabelBackground||this.primaryColor,this.tagLabelBorder=this.tagBorder||this.primaryBorderColor,this.tagLabelFontSize=this.tagLabelFontSize||"10px",this.commitLabelColor=this.commitLabelColor||this.secondaryTextColor,this.commitLabelBackground=this.commitLabelBackground||this.secondaryColor,this.commitLabelFontSize=this.commitLabelFontSize||"10px",this.attributeBackgroundColorOdd=this.attributeBackgroundColorOdd||rh,this.attributeBackgroundColorEven=this.attributeBackgroundColorEven||nh}calculate(e){if(typeof e!="object"){this.updateColors();return}let r=Object.keys(e);r.forEach(n=>{this[n]=e[n]}),this.updateColors(),r.forEach(n=>{this[n]=e[n]})}},Nz=o(t=>{let e=new XS;return e.calculate(t),e},"getThemeVariables")});var jS,Mz,Iz=M(()=>{"use strict";To();ap();G1();jS=class{static{o(this,"Theme")}constructor(){this.primaryColor="#eee",this.contrast="#707070",this.secondaryColor=Dt(this.contrast,55),this.background="#ffffff",this.tertiaryColor=Ne(this.primaryColor,{h:-160}),this.primaryBorderColor=wi(this.primaryColor,this.darkMode),this.secondaryBorderColor=wi(this.secondaryColor,this.darkMode),this.tertiaryBorderColor=wi(this.tertiaryColor,this.darkMode),this.primaryTextColor=pt(this.primaryColor),this.secondaryTextColor=pt(this.secondaryColor),this.tertiaryTextColor=pt(this.tertiaryColor),this.lineColor=pt(this.background),this.textColor=pt(this.background),this.mainBkg="#eee",this.secondBkg="calculated",this.lineColor="#666",this.border1="#999",this.border2="calculated",this.note="#ffa",this.text="#333",this.critical="#d42",this.done="#bbb",this.arrowheadColor="#333333",this.fontFamily='"trebuchet ms", verdana, arial, sans-serif',this.fontSize="16px",this.THEME_COLOR_LIMIT=12,this.nodeBkg="calculated",this.nodeBorder="calculated",this.clusterBkg="calculated",this.clusterBorder="calculated",this.defaultLinkColor="calculated",this.titleColor="calculated",this.edgeLabelBackground="white",this.actorBorder="calculated",this.actorBkg="calculated",this.actorTextColor="calculated",this.actorLineColor=this.actorBorder,this.signalColor="calculated",this.signalTextColor="calculated",this.labelBoxBkgColor="calculated",this.labelBoxBorderColor="calculated",this.labelTextColor="calculated",this.loopTextColor="calculated",this.noteBorderColor="calculated",this.noteBkgColor="calculated",this.noteTextColor="calculated",this.activationBorderColor="#666",this.activationBkgColor="#f4f4f4",this.sequenceNumberColor="white",this.sectionBkgColor="calculated",this.altSectionBkgColor="white",this.sectionBkgColor2="calculated",this.excludeBkgColor="#eeeeee",this.taskBorderColor="calculated",this.taskBkgColor="calculated",this.taskTextLightColor="white",this.taskTextColor="calculated",this.taskTextDarkColor="calculated",this.taskTextOutsideColor="calculated",this.taskTextClickableColor="#003163",this.activeTaskBorderColor="calculated",this.activeTaskBkgColor="calculated",this.gridColor="calculated",this.doneTaskBkgColor="calculated",this.doneTaskBorderColor="calculated",this.critBkgColor="calculated",this.critBorderColor="calculated",this.todayLineColor="calculated",this.personBorder=this.primaryBorderColor,this.personBkg=this.mainBkg,this.archEdgeColor="calculated",this.archEdgeArrowColor="calculated",this.archEdgeWidth="3",this.archGroupBorderColor=this.primaryBorderColor,this.archGroupBorderWidth="2px",this.labelColor="black",this.errorBkgColor="#552222",this.errorTextColor="#552222"}updateColors(){this.secondBkg=Dt(this.contrast,55),this.border2=this.contrast,this.actorBorder=Dt(this.border1,23),this.actorBkg=this.mainBkg,this.actorTextColor=this.text,this.actorLineColor=this.actorBorder,this.signalColor=this.text,this.signalTextColor=this.text,this.labelBoxBkgColor=this.actorBkg,this.labelBoxBorderColor=this.actorBorder,this.labelTextColor=this.text,this.loopTextColor=this.text,this.noteBorderColor="#999",this.noteBkgColor="#666",this.noteTextColor="#fff",this.cScale0=this.cScale0||"#555",this.cScale1=this.cScale1||"#F4F4F4",this.cScale2=this.cScale2||"#555",this.cScale3=this.cScale3||"#BBB",this.cScale4=this.cScale4||"#777",this.cScale5=this.cScale5||"#999",this.cScale6=this.cScale6||"#DDD",this.cScale7=this.cScale7||"#FFF",this.cScale8=this.cScale8||"#DDD",this.cScale9=this.cScale9||"#BBB",this.cScale10=this.cScale10||"#999",this.cScale11=this.cScale11||"#777";for(let e=0;e<this.THEME_COLOR_LIMIT;e++)this["cScaleInv"+e]=this["cScaleInv"+e]||pt(this["cScale"+e]);for(let e=0;e<this.THEME_COLOR_LIMIT;e++)this.darkMode?this["cScalePeer"+e]=this["cScalePeer"+e]||Dt(this["cScale"+e],10):this["cScalePeer"+e]=this["cScalePeer"+e]||Bt(this["cScale"+e],10);this.scaleLabelColor=this.scaleLabelColor||(this.darkMode?"black":this.labelTextColor),this.cScaleLabel0=this.cScaleLabel0||this.cScale1,this.cScaleLabel2=this.cScaleLabel2||this.cScale1;for(let e=0;e<this.THEME_COLOR_LIMIT;e++)this["cScaleLabel"+e]=this["cScaleLabel"+e]||this.scaleLabelColor;for(let e=0;e<5;e++)this["surface"+e]=this["surface"+e]||Ne(this.mainBkg,{l:-(5+e*5)}),this["surfacePeer"+e]=this["surfacePeer"+e]||Ne(this.mainBkg,{l:-(8+e*5)});this.nodeBkg=this.mainBkg,this.nodeBorder=this.border1,this.clusterBkg=this.secondBkg,this.clusterBorder=this.border2,this.defaultLinkColor=this.lineColor,this.titleColor=this.text,this.sectionBkgColor=Dt(this.contrast,30),this.sectionBkgColor2=Dt(this.contrast,30),this.taskBorderColor=Bt(this.contrast,10),this.taskBkgColor=this.contrast,this.taskTextColor=this.taskTextLightColor,this.taskTextDarkColor=this.text,this.taskTextOutsideColor=this.taskTextDarkColor,this.activeTaskBorderColor=this.taskBorderColor,this.activeTaskBkgColor=this.mainBkg,this.gridColor=Dt(this.border1,30),this.doneTaskBkgColor=this.done,this.doneTaskBorderColor=this.lineColor,this.critBkgColor=this.critical,this.critBorderColor=Bt(this.critBkgColor,10),this.todayLineColor=this.critBkgColor,this.archEdgeColor=this.lineColor,this.archEdgeArrowColor=this.lineColor,this.transitionColor=this.transitionColor||"#000",this.transitionLabelColor=this.transitionLabelColor||this.textColor,this.stateLabelColor=this.stateLabelColor||this.stateBkg||this.primaryTextColor,this.stateBkg=this.stateBkg||this.mainBkg,this.labelBackgroundColor=this.labelBackgroundColor||this.stateBkg,this.compositeBackground=this.compositeBackground||this.background||this.tertiaryColor,this.altBackground=this.altBackground||"#f4f4f4",this.compositeTitleBackground=this.compositeTitleBackground||this.mainBkg,this.stateBorder=this.stateBorder||"#000",this.innerEndBackground=this.primaryBorderColor,this.specialStateColor="#222",this.errorBkgColor=this.errorBkgColor||this.tertiaryColor,this.errorTextColor=this.errorTextColor||this.tertiaryTextColor,this.classText=this.primaryTextColor,this.fillType0=this.primaryColor,this.fillType1=this.secondaryColor,this.fillType2=Ne(this.primaryColor,{h:64}),this.fillType3=Ne(this.secondaryColor,{h:64}),this.fillType4=Ne(this.primaryColor,{h:-64}),this.fillType5=Ne(this.secondaryColor,{h:-64}),this.fillType6=Ne(this.primaryColor,{h:128}),this.fillType7=Ne(this.secondaryColor,{h:128});for(let e=0;e<this.THEME_COLOR_LIMIT;e++)this["pie"+e]=this["cScale"+e];this.pie12=this.pie0,this.pieTitleTextSize=this.pieTitleTextSize||"25px",this.pieTitleTextColor=this.pieTitleTextColor||this.taskTextDarkColor,this.pieSectionTextSize=this.pieSectionTextSize||"17px",this.pieSectionTextColor=this.pieSectionTextColor||this.textColor,this.pieLegendTextSize=this.pieLegendTextSize||"17px",this.pieLegendTextColor=this.pieLegendTextColor||this.taskTextDarkColor,this.pieStrokeColor=this.pieStrokeColor||"black",this.pieStrokeWidth=this.pieStrokeWidth||"2px",this.pieOuterStrokeWidth=this.pieOuterStrokeWidth||"2px",this.pieOuterStrokeColor=this.pieOuterStrokeColor||"black",this.pieOpacity=this.pieOpacity||"0.7",this.quadrant1Fill=this.quadrant1Fill||this.primaryColor,this.quadrant2Fill=this.quadrant2Fill||Ne(this.primaryColor,{r:5,g:5,b:5}),this.quadrant3Fill=this.quadrant3Fill||Ne(this.primaryColor,{r:10,g:10,b:10}),this.quadrant4Fill=this.quadrant4Fill||Ne(this.primaryColor,{r:15,g:15,b:15}),this.quadrant1TextFill=this.quadrant1TextFill||this.primaryTextColor,this.quadrant2TextFill=this.quadrant2TextFill||Ne(this.primaryTextColor,{r:-5,g:-5,b:-5}),this.quadrant3TextFill=this.quadrant3TextFill||Ne(this.primaryTextColor,{r:-10,g:-10,b:-10}),this.quadrant4TextFill=this.quadrant4TextFill||Ne(this.primaryTextColor,{r:-15,g:-15,b:-15}),this.quadrantPointFill=this.quadrantPointFill||aa(this.quadrant1Fill)?Dt(this.quadrant1Fill):Bt(this.quadrant1Fill),this.quadrantPointTextFill=this.quadrantPointTextFill||this.primaryTextColor,this.quadrantXAxisTextFill=this.quadrantXAxisTextFill||this.primaryTextColor,this.quadrantYAxisTextFill=this.quadrantYAxisTextFill||this.primaryTextColor,this.quadrantInternalBorderStrokeFill=this.quadrantInternalBorderStrokeFill||this.primaryBorderColor,this.quadrantExternalBorderStrokeFill=this.quadrantExternalBorderStrokeFill||this.primaryBorderColor,this.quadrantTitleFill=this.quadrantTitleFill||this.primaryTextColor,this.xyChart={backgroundColor:this.xyChart?.backgroundColor||this.background,titleColor:this.xyChart?.titleColor||this.primaryTextColor,xAxisTitleColor:this.xyChart?.xAxisTitleColor||this.primaryTextColor,xAxisLabelColor:this.xyChart?.xAxisLabelColor||this.primaryTextColor,xAxisTickColor:this.xyChart?.xAxisTickColor||this.primaryTextColor,xAxisLineColor:this.xyChart?.xAxisLineColor||this.primaryTextColor,yAxisTitleColor:this.xyChart?.yAxisTitleColor||this.primaryTextColor,yAxisLabelColor:this.xyChart?.yAxisLabelColor||this.primaryTextColor,yAxisTickColor:this.xyChart?.yAxisTickColor||this.primaryTextColor,yAxisLineColor:this.xyChart?.yAxisLineColor||this.primaryTextColor,plotColorPalette:this.xyChart?.plotColorPalette||"#EEE,#6BB8E4,#8ACB88,#C7ACD6,#E8DCC2,#FFB2A8,#FFF380,#7E8D91,#FFD8B1,#FAF3E0"},this.requirementBackground=this.requirementBackground||this.primaryColor,this.requirementBorderColor=this.requirementBorderColor||this.primaryBorderColor,this.requirementBorderSize=this.requirementBorderSize||"1",this.requirementTextColor=this.requirementTextColor||this.primaryTextColor,this.relationColor=this.relationColor||this.lineColor,this.relationLabelBackground=this.relationLabelBackground||this.edgeLabelBackground,this.relationLabelColor=this.relationLabelColor||this.actorTextColor,this.git0=Bt(this.pie1,25)||this.primaryColor,this.git1=this.pie2||this.secondaryColor,this.git2=this.pie3||this.tertiaryColor,this.git3=this.pie4||Ne(this.primaryColor,{h:-30}),this.git4=this.pie5||Ne(this.primaryColor,{h:-60}),this.git5=this.pie6||Ne(this.primaryColor,{h:-90}),this.git6=this.pie7||Ne(this.primaryColor,{h:60}),this.git7=this.pie8||Ne(this.primaryColor,{h:120}),this.gitInv0=this.gitInv0||pt(this.git0),this.gitInv1=this.gitInv1||pt(this.git1),this.gitInv2=this.gitInv2||pt(this.git2),this.gitInv3=this.gitInv3||pt(this.git3),this.gitInv4=this.gitInv4||pt(this.git4),this.gitInv5=this.gitInv5||pt(this.git5),this.gitInv6=this.gitInv6||pt(this.git6),this.gitInv7=this.gitInv7||pt(this.git7),this.branchLabelColor=this.branchLabelColor||this.labelTextColor,this.gitBranchLabel0=this.branchLabelColor,this.gitBranchLabel1="white",this.gitBranchLabel2=this.branchLabelColor,this.gitBranchLabel3="white",this.gitBranchLabel4=this.branchLabelColor,this.gitBranchLabel5=this.branchLabelColor,this.gitBranchLabel6=this.branchLabelColor,this.gitBranchLabel7=this.branchLabelColor,this.tagLabelColor=this.tagLabelColor||this.primaryTextColor,this.tagLabelBackground=this.tagLabelBackground||this.primaryColor,this.tagLabelBorder=this.tagBorder||this.primaryBorderColor,this.tagLabelFontSize=this.tagLabelFontSize||"10px",this.commitLabelColor=this.commitLabelColor||this.secondaryTextColor,this.commitLabelBackground=this.commitLabelBackground||this.secondaryColor,this.commitLabelFontSize=this.commitLabelFontSize||"10px",this.attributeBackgroundColorOdd=this.attributeBackgroundColorOdd||rh,this.attributeBackgroundColorEven=this.attributeBackgroundColorEven||nh}calculate(e){if(typeof e!="object"){this.updateColors();return}let r=Object.keys(e);r.forEach(n=>{this[n]=e[n]}),this.updateColors(),r.forEach(n=>{this[n]=e[n]})}},Mz=o(t=>{let e=new jS;return e.calculate(t),e},"getThemeVariables")});var ko,Hb=M(()=>{"use strict";_z();Dz();Ub();Rz();Iz();ko={base:{getThemeVariables:Az},dark:{getThemeVariables:Lz},default:{getThemeVariables:sp},forest:{getThemeVariables:Nz},neutral:{getThemeVariables:Mz}}});var Jc,Oz=M(()=>{"use strict";Jc={flowchart:{useMaxWidth:!0,titleTopMargin:25,subGraphTitleMargin:{top:0,bottom:0},diagramPadding:8,htmlLabels:!0,nodeSpacing:50,rankSpacing:50,curve:"basis",padding:15,defaultRenderer:"dagre-wrapper",wrappingWidth:200},sequence:{useMaxWidth:!0,hideUnusedParticipants:!1,activationWidth:10,diagramMarginX:50,diagramMarginY:10,actorMargin:50,width:150,height:65,boxMargin:10,boxTextMargin:5,noteMargin:10,messageMargin:35,messageAlign:"center",mirrorActors:!0,forceMenus:!1,bottomMarginAdj:1,rightAngles:!1,showSequenceNumbers:!1,actorFontSize:14,actorFontFamily:'"Open Sans", sans-serif',actorFontWeight:400,noteFontSize:14,noteFontFamily:'"trebuchet ms", verdana, arial, sans-serif',noteFontWeight:400,noteAlign:"center",messageFontSize:16,messageFontFamily:'"trebuchet ms", verdana, arial, sans-serif',messageFontWeight:400,wrap:!1,wrapPadding:10,labelBoxWidth:50,labelBoxHeight:20},gantt:{useMaxWidth:!0,titleTopMargin:25,barHeight:20,barGap:4,topPadding:50,rightPadding:75,leftPadding:75,gridLineStartPadding:35,fontSize:11,sectionFontSize:11,numberSectionStyles:4,axisFormat:"%Y-%m-%d",topAxis:!1,displayMode:"",weekday:"sunday"},journey:{useMaxWidth:!0,diagramMarginX:50,diagramMarginY:10,leftMargin:150,width:150,height:50,boxMargin:10,boxTextMargin:5,noteMargin:10,messageMargin:35,messageAlign:"center",bottomMarginAdj:1,rightAngles:!1,taskFontSize:14,taskFontFamily:'"Open Sans", sans-serif',taskMargin:50,activationWidth:10,textPlacement:"fo",actorColours:["#8FBC8F","#7CFC00","#00FFFF","#20B2AA","#B0E0E6","#FFFFE0"],sectionFills:["#191970","#8B008B","#4B0082","#2F4F4F","#800000","#8B4513","#00008B"],sectionColours:["#fff"]},class:{useMaxWidth:!0,titleTopMargin:25,arrowMarkerAbsolute:!1,dividerMargin:10,padding:5,textHeight:10,defaultRenderer:"dagre-wrapper",htmlLabels:!1,hideEmptyMembersBox:!1},state:{useMaxWidth:!0,titleTopMargin:25,dividerMargin:10,sizeUnit:5,padding:8,textHeight:10,titleShift:-15,noteMargin:10,forkWidth:70,forkHeight:7,miniPadding:2,fontSizeFactor:5.02,fontSize:24,labelHeight:16,edgeLengthFactor:"20",compositTitleSize:35,radius:5,defaultRenderer:"dagre-wrapper"},er:{useMaxWidth:!0,titleTopMargin:25,diagramPadding:20,layoutDirection:"TB",minEntityWidth:100,minEntityHeight:75,entityPadding:15,stroke:"gray",fill:"honeydew",fontSize:12},pie:{useMaxWidth:!0,textPosition:.75},quadrantChart:{useMaxWidth:!0,chartWidth:500,chartHeight:500,titleFontSize:20,titlePadding:10,quadrantPadding:5,xAxisLabelPadding:5,yAxisLabelPadding:5,xAxisLabelFontSize:16,yAxisLabelFontSize:16,quadrantLabelFontSize:16,quadrantTextTopPadding:5,pointTextPadding:5,pointLabelFontSize:12,pointRadius:5,xAxisPosition:"top",yAxisPosition:"left",quadrantInternalBorderStrokeWidth:1,quadrantExternalBorderStrokeWidth:2},xyChart:{useMaxWidth:!0,width:700,height:500,titleFontSize:20,titlePadding:10,showTitle:!0,xAxis:{$ref:"#/$defs/XYChartAxisConfig",showLabel:!0,labelFontSize:14,labelPadding:5,showTitle:!0,titleFontSize:16,titlePadding:5,showTick:!0,tickLength:5,tickWidth:2,showAxisLine:!0,axisLineWidth:2},yAxis:{$ref:"#/$defs/XYChartAxisConfig",showLabel:!0,labelFontSize:14,labelPadding:5,showTitle:!0,titleFontSize:16,titlePadding:5,showTick:!0,tickLength:5,tickWidth:2,showAxisLine:!0,axisLineWidth:2},chartOrientation:"vertical",plotReservedSpacePercent:50},requirement:{useMaxWidth:!0,rect_fill:"#f9f9f9",text_color:"#333",rect_border_size:"0.5px",rect_border_color:"#bbb",rect_min_width:200,rect_min_height:200,fontSize:14,rect_padding:10,line_height:20},mindmap:{useMaxWidth:!0,padding:10,maxNodeWidth:200},kanban:{useMaxWidth:!0,padding:8,sectionWidth:200,ticketBaseUrl:""},timeline:{useMaxWidth:!0,diagramMarginX:50,diagramMarginY:10,leftMargin:150,width:150,height:50,boxMargin:10,boxTextMargin:5,noteMargin:10,messageMargin:35,messageAlign:"center",bottomMarginAdj:1,rightAngles:!1,taskFontSize:14,taskFontFamily:'"Open Sans", sans-serif',taskMargin:50,activationWidth:10,textPlacement:"fo",actorColours:["#8FBC8F","#7CFC00","#00FFFF","#20B2AA","#B0E0E6","#FFFFE0"],sectionFills:["#191970","#8B008B","#4B0082","#2F4F4F","#800000","#8B4513","#00008B"],sectionColours:["#fff"],disableMulticolor:!1},gitGraph:{useMaxWidth:!0,titleTopMargin:25,diagramPadding:8,nodeLabel:{width:75,height:100,x:-25,y:0},mainBranchName:"main",mainBranchOrder:0,showCommitLabel:!0,showBranches:!0,rotateCommitLabel:!0,parallelCommits:!1,arrowMarkerAbsolute:!1},c4:{useMaxWidth:!0,diagramMarginX:50,diagramMarginY:10,c4ShapeMargin:50,c4ShapePadding:20,width:216,height:60,boxMargin:10,c4ShapeInRow:4,nextLinePaddingX:0,c4BoundaryInRow:2,personFontSize:14,personFontFamily:'"Open Sans", sans-serif',personFontWeight:"normal",external_personFontSize:14,external_personFontFamily:'"Open Sans", sans-serif',external_personFontWeight:"normal",systemFontSize:14,systemFontFamily:'"Open Sans", sans-serif',systemFontWeight:"normal",external_systemFontSize:14,external_systemFontFamily:'"Open Sans", sans-serif',external_systemFontWeight:"normal",system_dbFontSize:14,system_dbFontFamily:'"Open Sans", sans-serif',system_dbFontWeight:"normal",external_system_dbFontSize:14,external_system_dbFontFamily:'"Open Sans", sans-serif',external_system_dbFontWeight:"normal",system_queueFontSize:14,system_queueFontFamily:'"Open Sans", sans-serif',system_queueFontWeight:"normal",external_system_queueFontSize:14,external_system_queueFontFamily:'"Open Sans", sans-serif',external_system_queueFontWeight:"normal",boundaryFontSize:14,boundaryFontFamily:'"Open Sans", sans-serif',boundaryFontWeight:"normal",messageFontSize:12,messageFontFamily:'"Open Sans", sans-serif',messageFontWeight:"normal",containerFontSize:14,containerFontFamily:'"Open Sans", sans-serif',containerFontWeight:"normal",external_containerFontSize:14,external_containerFontFamily:'"Open Sans", sans-serif',external_containerFontWeight:"normal",container_dbFontSize:14,container_dbFontFamily:'"Open Sans", sans-serif',container_dbFontWeight:"normal",external_container_dbFontSize:14,external_container_dbFontFamily:'"Open Sans", sans-serif',external_container_dbFontWeight:"normal",container_queueFontSize:14,container_queueFontFamily:'"Open Sans", sans-serif',container_queueFontWeight:"normal",external_container_queueFontSize:14,external_container_queueFontFamily:'"Open Sans", sans-serif',external_container_queueFontWeight:"normal",componentFontSize:14,componentFontFamily:'"Open Sans", sans-serif',componentFontWeight:"normal",external_componentFontSize:14,external_componentFontFamily:'"Open Sans", sans-serif',external_componentFontWeight:"normal",component_dbFontSize:14,component_dbFontFamily:'"Open Sans", sans-serif',component_dbFontWeight:"normal",external_component_dbFontSize:14,external_component_dbFontFamily:'"Open Sans", sans-serif',external_component_dbFontWeight:"normal",component_queueFontSize:14,component_queueFontFamily:'"Open Sans", sans-serif',component_queueFontWeight:"normal",external_component_queueFontSize:14,external_component_queueFontFamily:'"Open Sans", sans-serif',external_component_queueFontWeight:"normal",wrap:!0,wrapPadding:10,person_bg_color:"#08427B",person_border_color:"#073B6F",external_person_bg_color:"#686868",external_person_border_color:"#8A8A8A",system_bg_color:"#1168BD",system_border_color:"#3C7FC0",system_db_bg_color:"#1168BD",system_db_border_color:"#3C7FC0",system_queue_bg_color:"#1168BD",system_queue_border_color:"#3C7FC0",external_system_bg_color:"#999999",external_system_border_color:"#8A8A8A",external_system_db_bg_color:"#999999",external_system_db_border_color:"#8A8A8A",external_system_queue_bg_color:"#999999",external_system_queue_border_color:"#8A8A8A",container_bg_color:"#438DD5",container_border_color:"#3C7FC0",container_db_bg_color:"#438DD5",container_db_border_color:"#3C7FC0",container_queue_bg_color:"#438DD5",container_queue_border_color:"#3C7FC0",external_container_bg_color:"#B3B3B3",external_container_border_color:"#A6A6A6",external_container_db_bg_color:"#B3B3B3",external_container_db_border_color:"#A6A6A6",external_container_queue_bg_color:"#B3B3B3",external_container_queue_border_color:"#A6A6A6",component_bg_color:"#85BBF0",component_border_color:"#78A8D8",component_db_bg_color:"#85BBF0",component_db_border_color:"#78A8D8",component_queue_bg_color:"#85BBF0",component_queue_border_color:"#78A8D8",external_component_bg_color:"#CCCCCC",external_component_border_color:"#BFBFBF",external_component_db_bg_color:"#CCCCCC",external_component_db_border_color:"#BFBFBF",external_component_queue_bg_color:"#CCCCCC",external_component_queue_border_color:"#BFBFBF"},sankey:{useMaxWidth:!0,width:600,height:400,linkColor:"gradient",nodeAlignment:"justify",showValues:!0,prefix:"",suffix:""},block:{useMaxWidth:!0,padding:8},packet:{useMaxWidth:!0,rowHeight:32,bitWidth:32,bitsPerRow:32,showBits:!0,paddingX:5,paddingY:5},architecture:{useMaxWidth:!0,padding:40,iconSize:80,fontSize:16},theme:"default",look:"classic",handDrawnSeed:0,layout:"dagre",maxTextSize:5e4,maxEdges:500,darkMode:!1,fontFamily:'"trebuchet ms", verdana, arial, sans-serif;',logLevel:5,securityLevel:"strict",startOnLoad:!0,arrowMarkerAbsolute:!1,secure:["secure","securityLevel","startOnLoad","maxTextSize","suppressErrorRendering","maxEdges"],legacyMathML:!1,forceLegacyMathML:!1,deterministicIds:!1,fontSize:16,markdownAutoWrap:!0,suppressErrorRendering:!1}});var Pz,Bz,Fz,ur,hs=M(()=>{"use strict";Hb();Oz();Pz={...Jc,deterministicIDSeed:void 0,elk:{mergeEdges:!1,nodePlacementStrategy:"BRANDES_KOEPF"},themeCSS:void 0,themeVariables:ko.default.getThemeVariables(),sequence:{...Jc.sequence,messageFont:o(function(){return{fontFamily:this.messageFontFamily,fontSize:this.messageFontSize,fontWeight:this.messageFontWeight}},"messageFont"),noteFont:o(function(){return{fontFamily:this.noteFontFamily,fontSize:this.noteFontSize,fontWeight:this.noteFontWeight}},"noteFont"),actorFont:o(function(){return{fontFamily:this.actorFontFamily,fontSize:this.actorFontSize,fontWeight:this.actorFontWeight}},"actorFont")},class:{hideEmptyMembersBox:!1},gantt:{...Jc.gantt,tickInterval:void 0,useWidth:void 0},c4:{...Jc.c4,useWidth:void 0,personFont:o(function(){return{fontFamily:this.personFontFamily,fontSize:this.personFontSize,fontWeight:this.personFontWeight}},"personFont"),external_personFont:o(function(){return{fontFamily:this.external_personFontFamily,fontSize:this.external_personFontSize,fontWeight:this.external_personFontWeight}},"external_personFont"),systemFont:o(function(){return{fontFamily:this.systemFontFamily,fontSize:this.systemFontSize,fontWeight:this.systemFontWeight}},"systemFont"),external_systemFont:o(function(){return{fontFamily:this.external_systemFontFamily,fontSize:this.external_systemFontSize,fontWeight:this.external_systemFontWeight}},"external_systemFont"),system_dbFont:o(function(){return{fontFamily:this.system_dbFontFamily,fontSize:this.system_dbFontSize,fontWeight:this.system_dbFontWeight}},"system_dbFont"),external_system_dbFont:o(function(){return{fontFamily:this.external_system_dbFontFamily,fontSize:this.external_system_dbFontSize,fontWeight:this.external_system_dbFontWeight}},"external_system_dbFont"),system_queueFont:o(function(){return{fontFamily:this.system_queueFontFamily,fontSize:this.system_queueFontSize,fontWeight:this.system_queueFontWeight}},"system_queueFont"),external_system_queueFont:o(function(){return{fontFamily:this.external_system_queueFontFamily,fontSize:this.external_system_queueFontSize,fontWeight:this.external_system_queueFontWeight}},"external_system_queueFont"),containerFont:o(function(){return{fontFamily:this.containerFontFamily,fontSize:this.containerFontSize,fontWeight:this.containerFontWeight}},"containerFont"),external_containerFont:o(function(){return{fontFamily:this.external_containerFontFamily,fontSize:this.external_containerFontSize,fontWeight:this.external_containerFontWeight}},"external_containerFont"),container_dbFont:o(function(){return{fontFamily:this.container_dbFontFamily,fontSize:this.container_dbFontSize,fontWeight:this.container_dbFontWeight}},"container_dbFont"),external_container_dbFont:o(function(){return{fontFamily:this.external_container_dbFontFamily,fontSize:this.external_container_dbFontSize,fontWeight:this.external_container_dbFontWeight}},"external_container_dbFont"),container_queueFont:o(function(){return{fontFamily:this.container_queueFontFamily,fontSize:this.container_queueFontSize,fontWeight:this.container_queueFontWeight}},"container_queueFont"),external_container_queueFont:o(function(){return{fontFamily:this.external_container_queueFontFamily,fontSize:this.external_container_queueFontSize,fontWeight:this.external_container_queueFontWeight}},"external_container_queueFont"),componentFont:o(function(){return{fontFamily:this.componentFontFamily,fontSize:this.componentFontSize,fontWeight:this.componentFontWeight}},"componentFont"),external_componentFont:o(function(){return{fontFamily:this.external_componentFontFamily,fontSize:this.external_componentFontSize,fontWeight:this.external_componentFontWeight}},"external_componentFont"),component_dbFont:o(function(){return{fontFamily:this.component_dbFontFamily,fontSize:this.component_dbFontSize,fontWeight:this.component_dbFontWeight}},"component_dbFont"),external_component_dbFont:o(function(){return{fontFamily:this.external_component_dbFontFamily,fontSize:this.external_component_dbFontSize,fontWeight:this.external_component_dbFontWeight}},"external_component_dbFont"),component_queueFont:o(function(){return{fontFamily:this.component_queueFontFamily,fontSize:this.component_queueFontSize,fontWeight:this.component_queueFontWeight}},"component_queueFont"),external_component_queueFont:o(function(){return{fontFamily:this.external_component_queueFontFamily,fontSize:this.external_component_queueFontSize,fontWeight:this.external_component_queueFontWeight}},"external_component_queueFont"),boundaryFont:o(function(){return{fontFamily:this.boundaryFontFamily,fontSize:this.boundaryFontSize,fontWeight:this.boundaryFontWeight}},"boundaryFont"),messageFont:o(function(){return{fontFamily:this.messageFontFamily,fontSize:this.messageFontSize,fontWeight:this.messageFontWeight}},"messageFont")},pie:{...Jc.pie,useWidth:984},xyChart:{...Jc.xyChart,useWidth:void 0},requirement:{...Jc.requirement,useWidth:void 0},packet:{...Jc.packet}},Bz=o((t,e="")=>Object.keys(t).reduce((r,n)=>Array.isArray(t[n])?r:typeof t[n]=="object"&&t[n]!==null?[...r,e+n,...Bz(t[n],"")]:[...r,e+n],[]),"keyify"),Fz=new Set(Bz(Pz,"")),ur=Pz});var op,tbe,KS=M(()=>{"use strict";hs();ht();op=o(t=>{if(Y.debug("sanitizeDirective called with",t),!(typeof t!="object"||t==null)){if(Array.isArray(t)){t.forEach(e=>op(e));return}for(let e of Object.keys(t)){if(Y.debug("Checking key",e),e.startsWith("__")||e.includes("proto")||e.includes("constr")||!Fz.has(e)||t[e]==null){Y.debug("sanitize deleting key: ",e),delete t[e];continue}if(typeof t[e]=="object"){Y.debug("sanitizing object",e),op(t[e]);continue}let r=["themeCSS","fontFamily","altFontFamily"];for(let n of r)e.includes(n)&&(Y.debug("sanitizing css option",e),t[e]=tbe(t[e]))}if(t.themeVariables)for(let e of Object.keys(t.themeVariables)){let r=t.themeVariables[e];r?.match&&!r.match(/^[\d "#%(),.;A-Za-z]+$/)&&(t.themeVariables[e]="")}Y.debug("After sanitization",t)}},"sanitizeDirective"),tbe=o(t=>{let e=0,r=0;for(let n of t){if(e<r)return"{ /* ERROR: Unbalanced CSS */ }";n==="{"?e++:n==="}"&&r++}return e!==r?"{ /* ERROR: Unbalanced CSS */ }":t},"sanitizeCss")});var ih,fs,Gz,lp,$1,Wb,QS,$z,Vz,ZS,Yb,Sr,Uz,Hz,V1,rbe,zz,nbe,Wz,Ua=M(()=>{"use strict";ip();ht();Hb();hs();KS();ih=Object.freeze(ur),fs=Gn({},ih),lp=[],$1=Gn({},ih),Wb=o((t,e)=>{let r=Gn({},t),n={};for(let i of e)Uz(i),n=Gn(n,i);if(r=Gn(r,n),n.theme&&n.theme in ko){let i=Gn({},Gz),a=Gn(i.themeVariables||{},n.themeVariables);r.theme&&r.theme in ko&&(r.themeVariables=ko[r.theme].getThemeVariables(a))}return $1=r,Wz($1),$1},"updateCurrentConfig"),QS=o(t=>(fs=Gn({},ih),fs=Gn(fs,t),t.theme&&ko[t.theme]&&(fs.themeVariables=ko[t.theme].getThemeVariables(t.themeVariables)),Wb(fs,lp),fs),"setSiteConfig"),$z=o(t=>{Gz=Gn({},t)},"saveConfigFromInitialize"),Vz=o(t=>(fs=Gn(fs,t),Wb(fs,lp),fs),"updateSiteConfig"),ZS=o(()=>Gn({},fs),"getSiteConfig"),Yb=o(t=>(Wz(t),Gn($1,t),Sr()),"setConfig"),Sr=o(()=>Gn({},$1),"getConfig"),Uz=o(t=>{t&&(["secure",...fs.secure??[]].forEach(e=>{Object.hasOwn(t,e)&&(Y.debug(`Denied attempt to modify a secure key ${e}`,t[e]),delete t[e])}),Object.keys(t).forEach(e=>{e.startsWith("__")&&delete t[e]}),Object.keys(t).forEach(e=>{typeof t[e]=="string"&&(t[e].includes("<")||t[e].includes(">")||t[e].includes("url(data:"))&&delete t[e],typeof t[e]=="object"&&Uz(t[e])}))},"sanitize"),Hz=o(t=>{op(t),t.fontFamily&&!t.themeVariables?.fontFamily&&(t.themeVariables={...t.themeVariables,fontFamily:t.fontFamily}),lp.push(t),Wb(fs,lp)},"addDirective"),V1=o((t=fs)=>{lp=[],Wb(t,lp)},"reset"),rbe={LAZY_LOAD_DEPRECATED:"The configuration options lazyLoadedDiagrams and loadExternalDiagramsAtStartup are deprecated. Please use registerExternalDiagrams instead."},zz={},nbe=o(t=>{zz[t]||(Y.warn(rbe[t]),zz[t]=!0)},"issueWarning"),Wz=o(t=>{t&&(t.lazyLoadedDiagrams||t.loadExternalDiagramsAtStartup)&&nbe("LAZY_LOAD_DEPRECATED")},"checkConfig")});function Ws(t){return function(e){for(var r=arguments.length,n=new Array(r>1?r-1:0),i=1;i<r;i++)n[i-1]=arguments[i];return iC(t,e,n)}}function cbe(t){return function(){for(var e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];return aC(t,r)}}function Ar(t,e){let r=arguments.length>2&&arguments[2]!==void 0?arguments[2]:jb;Yz&&Yz(t,null);let n=e.length;for(;n--;){let i=e[n];if(typeof i=="string"){let a=r(i);a!==i&&(ibe(e)||(e[n]=a),i=a)}t[i]=!0}return t}function ube(t){for(let e=0;e<t.length;e++)ul(t,e)||(t[e]=null);return t}function Uf(t){let e=tG(null);for(let[r,n]of eG(t))ul(t,r)&&(Array.isArray(n)?e[r]=ube(n):n&&typeof n=="object"&&n.constructor===Object?e[r]=Uf(n):e[r]=n);return e}function Y1(t,e){for(;t!==null;){let n=sbe(t,e);if(n){if(n.get)return Ws(n.get);if(typeof n.value=="function")return Ws(n.value)}t=abe(t)}function r(){return null}return o(r,"fallbackValue"),r}function iG(){let t=arguments.length>0&&arguments[0]!==void 0?arguments[0]:wbe(),e=o(yt=>iG(yt),"DOMPurify");if(e.version="3.2.1",e.removed=[],!t||!t.document||t.document.nodeType!==q1.document)return e.isSupported=!1,e;let{document:r}=t,n=r,i=n.currentScript,{DocumentFragment:a,HTMLTemplateElement:s,Node:l,Element:u,NodeFilter:h,NamedNodeMap:f=t.NamedNodeMap||t.MozNamedAttrMap,HTMLFormElement:d,DOMParser:p,trustedTypes:m}=t,g=u.prototype,y=Y1(g,"cloneNode"),v=Y1(g,"remove"),x=Y1(g,"nextSibling"),b=Y1(g,"childNodes"),w=Y1(g,"parentNode");if(typeof s=="function"){let yt=r.createElement("template");yt.content&&yt.content.ownerDocument&&(r=yt.content.ownerDocument)}let _,T="",{implementation:E,createNodeIterator:L,createDocumentFragment:C,getElementsByTagName:A}=r,{importNode:I}=n,D={};e.isSupported=typeof eG=="function"&&typeof w=="function"&&E&&E.createHTMLDocument!==void 0;let{MUSTACHE_EXPR:k,ERB_EXPR:R,TMPLIT_EXPR:S,DATA_ATTR:O,ARIA_ATTR:N,IS_SCRIPT_OR_DATA:P,ATTR_WHITESPACE:F,CUSTOM_ELEMENT:B}=Jz,{IS_ALLOWED_URI:$}=Jz,z=null,W=Ar({},[...jz,...eC,...tC,...rC,...Kz]),j=null,K=Ar({},[...Qz,...nC,...Zz,...Xb]),ie=Object.seal(tG(null,{tagNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},attributeNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},allowCustomizedBuiltInElements:{writable:!0,configurable:!1,enumerable:!0,value:!1}})),Q=null,ee=null,J=!0,H=!0,q=!1,Z=!0,ae=!1,ue=!0,ce=!1,te=!1,De=!1,oe=!1,ke=!1,Fe=!1,Be=!0,Ve=!1,Ge="user-content-",He=!0,xe=!1,X={},fe=null,he=Ar({},["annotation-xml","audio","colgroup","desc","foreignobject","head","iframe","math","mi","mn","mo","ms","mtext","noembed","noframes","noscript","plaintext","script","style","svg","template","thead","title","video","xmp"]),ge=null,ne=Ar({},["audio","video","img","source","image","track"]),ye=null,U=Ar({},["alt","class","for","id","label","name","pattern","placeholder","role","summary","title","value","style","xmlns"]),Te="http://www.w3.org/1998/Math/MathML",se="http://www.w3.org/2000/svg",Ee="http://www.w3.org/1999/xhtml",Ae=Ee,Pe=!1,Me=null,me=Ar({},[Te,se,Ee],JS),We=Ar({},["mi","mo","mn","ms","mtext"]),Re=Ar({},["annotation-xml"]),tt=Ar({},["title","style","font","a","script"]),gt=null,Et=["application/xhtml+xml","text/html"],vt="text/html",Ye=null,Tt=null,$e=r.createElement("form"),rt=o(function(Se){return Se instanceof RegExp||Se instanceof Function},"isRegexOrFunction"),ft=o(function(){let Se=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{};if(!(Tt&&Tt===Se)){if((!Se||typeof Se!="object")&&(Se={}),Se=Uf(Se),gt=Et.indexOf(Se.PARSER_MEDIA_TYPE)===-1?vt:Se.PARSER_MEDIA_TYPE,Ye=gt==="application/xhtml+xml"?JS:jb,z=ul(Se,"ALLOWED_TAGS")?Ar({},Se.ALLOWED_TAGS,Ye):W,j=ul(Se,"ALLOWED_ATTR")?Ar({},Se.ALLOWED_ATTR,Ye):K,Me=ul(Se,"ALLOWED_NAMESPACES")?Ar({},Se.ALLOWED_NAMESPACES,JS):me,ye=ul(Se,"ADD_URI_SAFE_ATTR")?Ar(Uf(U),Se.ADD_URI_SAFE_ATTR,Ye):U,ge=ul(Se,"ADD_DATA_URI_TAGS")?Ar(Uf(ne),Se.ADD_DATA_URI_TAGS,Ye):ne,fe=ul(Se,"FORBID_CONTENTS")?Ar({},Se.FORBID_CONTENTS,Ye):he,Q=ul(Se,"FORBID_TAGS")?Ar({},Se.FORBID_TAGS,Ye):{},ee=ul(Se,"FORBID_ATTR")?Ar({},Se.FORBID_ATTR,Ye):{},X=ul(Se,"USE_PROFILES")?Se.USE_PROFILES:!1,J=Se.ALLOW_ARIA_ATTR!==!1,H=Se.ALLOW_DATA_ATTR!==!1,q=Se.ALLOW_UNKNOWN_PROTOCOLS||!1,Z=Se.ALLOW_SELF_CLOSE_IN_ATTR!==!1,ae=Se.SAFE_FOR_TEMPLATES||!1,ue=Se.SAFE_FOR_XML!==!1,ce=Se.WHOLE_DOCUMENT||!1,oe=Se.RETURN_DOM||!1,ke=Se.RETURN_DOM_FRAGMENT||!1,Fe=Se.RETURN_TRUSTED_TYPE||!1,De=Se.FORCE_BODY||!1,Be=Se.SANITIZE_DOM!==!1,Ve=Se.SANITIZE_NAMED_PROPS||!1,He=Se.KEEP_CONTENT!==!1,xe=Se.IN_PLACE||!1,$=Se.ALLOWED_URI_REGEXP||rG,Ae=Se.NAMESPACE||Ee,We=Se.MATHML_TEXT_INTEGRATION_POINTS||We,Re=Se.HTML_INTEGRATION_POINTS||Re,ie=Se.CUSTOM_ELEMENT_HANDLING||{},Se.CUSTOM_ELEMENT_HANDLING&&rt(Se.CUSTOM_ELEMENT_HANDLING.tagNameCheck)&&(ie.tagNameCheck=Se.CUSTOM_ELEMENT_HANDLING.tagNameCheck),Se.CUSTOM_ELEMENT_HANDLING&&rt(Se.CUSTOM_ELEMENT_HANDLING.attributeNameCheck)&&(ie.attributeNameCheck=Se.CUSTOM_ELEMENT_HANDLING.attributeNameCheck),Se.CUSTOM_ELEMENT_HANDLING&&typeof Se.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements=="boolean"&&(ie.allowCustomizedBuiltInElements=Se.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements),ae&&(H=!1),ke&&(oe=!0),X&&(z=Ar({},Kz),j=[],X.html===!0&&(Ar(z,jz),Ar(j,Qz)),X.svg===!0&&(Ar(z,eC),Ar(j,nC),Ar(j,Xb)),X.svgFilters===!0&&(Ar(z,tC),Ar(j,nC),Ar(j,Xb)),X.mathMl===!0&&(Ar(z,rC),Ar(j,Zz),Ar(j,Xb))),Se.ADD_TAGS&&(z===W&&(z=Uf(z)),Ar(z,Se.ADD_TAGS,Ye)),Se.ADD_ATTR&&(j===K&&(j=Uf(j)),Ar(j,Se.ADD_ATTR,Ye)),Se.ADD_URI_SAFE_ATTR&&Ar(ye,Se.ADD_URI_SAFE_ATTR,Ye),Se.FORBID_CONTENTS&&(fe===he&&(fe=Uf(fe)),Ar(fe,Se.FORBID_CONTENTS,Ye)),He&&(z["#text"]=!0),ce&&Ar(z,["html","head","body"]),z.table&&(Ar(z,["tbody"]),delete Q.tbody),Se.TRUSTED_TYPES_POLICY){if(typeof Se.TRUSTED_TYPES_POLICY.createHTML!="function")throw W1('TRUSTED_TYPES_POLICY configuration option must provide a "createHTML" hook.');if(typeof Se.TRUSTED_TYPES_POLICY.createScriptURL!="function")throw W1('TRUSTED_TYPES_POLICY configuration option must provide a "createScriptURL" hook.');_=Se.TRUSTED_TYPES_POLICY,T=_.createHTML("")}else _===void 0&&(_=Tbe(m,i)),_!==null&&typeof T=="string"&&(T=_.createHTML(""));Wa&&Wa(Se),Tt=Se}},"_parseConfig"),kt=Ar({},[...eC,...tC,...hbe]),er=Ar({},[...rC,...fbe]),dt=o(function(Se){let at=w(Se);(!at||!at.tagName)&&(at={namespaceURI:Ae,tagName:"template"});let At=jb(Se.tagName),pr=jb(at.tagName);return Me[Se.namespaceURI]?Se.namespaceURI===se?at.namespaceURI===Ee?At==="svg":at.namespaceURI===Te?At==="svg"&&(pr==="annotation-xml"||We[pr]):!!kt[At]:Se.namespaceURI===Te?at.namespaceURI===Ee?At==="math":at.namespaceURI===se?At==="math"&&Re[pr]:!!er[At]:Se.namespaceURI===Ee?at.namespaceURI===se&&!Re[pr]||at.namespaceURI===Te&&!We[pr]?!1:!er[At]&&(tt[At]||!kt[At]):!!(gt==="application/xhtml+xml"&&Me[Se.namespaceURI]):!1},"_checkValidNamespace"),Xe=o(function(Se){U1(e.removed,{element:Se});try{w(Se).removeChild(Se)}catch{v(Se)}},"_forceRemove"),ct=o(function(Se,at){try{U1(e.removed,{attribute:at.getAttributeNode(Se),from:at})}catch{U1(e.removed,{attribute:null,from:at})}if(at.removeAttribute(Se),Se==="is"&&!j[Se])if(oe||ke)try{Xe(at)}catch{}else try{at.setAttribute(Se,"")}catch{}},"_removeAttribute"),Lt=o(function(Se){let at=null,At=null;if(De)Se="<remove></remove>"+Se;else{let On=Xz(Se,/^[\r\n\t ]+/);At=On&&On[0]}gt==="application/xhtml+xml"&&Ae===Ee&&(Se='<html xmlns="http://www.w3.org/1999/xhtml"><head></head><body>'+Se+"</body></html>");let pr=_?_.createHTML(Se):Se;if(Ae===Ee)try{at=new p().parseFromString(pr,gt)}catch{}if(!at||!at.documentElement){at=E.createDocument(Ae,"template",null);try{at.documentElement.innerHTML=Pe?T:pr}catch{}}let In=at.body||at.documentElement;return Se&&At&&In.insertBefore(r.createTextNode(At),In.childNodes[0]||null),Ae===Ee?A.call(at,ce?"html":"body")[0]:ce?at.documentElement:In},"_initDocument"),Rt=o(function(Se){return L.call(Se.ownerDocument||Se,Se,h.SHOW_ELEMENT|h.SHOW_COMMENT|h.SHOW_TEXT|h.SHOW_PROCESSING_INSTRUCTION|h.SHOW_CDATA_SECTION,null)},"_createNodeIterator"),zt=o(function(Se){return Se instanceof d&&(typeof Se.nodeName!="string"||typeof Se.textContent!="string"||typeof Se.removeChild!="function"||!(Se.attributes instanceof f)||typeof Se.removeAttribute!="function"||typeof Se.setAttribute!="function"||typeof Se.namespaceURI!="string"||typeof Se.insertBefore!="function"||typeof Se.hasChildNodes!="function")},"_isClobbered"),Xn=o(function(Se){return typeof l=="function"&&Se instanceof l},"_isNode");function or(yt,Se,at){D[yt]&&qb(D[yt],At=>{At.call(e,Se,at,Tt)})}o(or,"_executeHook");let hn=o(function(Se){let at=null;if(or("beforeSanitizeElements",Se,null),zt(Se))return Xe(Se),!0;let At=Ye(Se.nodeName);if(or("uponSanitizeElement",Se,{tagName:At,allowedTags:z}),Se.hasChildNodes()&&!Xn(Se.firstElementChild)&&Ha(/<[/\w]/g,Se.innerHTML)&&Ha(/<[/\w]/g,Se.textContent)||Se.nodeType===q1.progressingInstruction||ue&&Se.nodeType===q1.comment&&Ha(/<[/\w]/g,Se.data))return Xe(Se),!0;if(!z[At]||Q[At]){if(!Q[At]&&Ur(At)&&(ie.tagNameCheck instanceof RegExp&&Ha(ie.tagNameCheck,At)||ie.tagNameCheck instanceof Function&&ie.tagNameCheck(At)))return!1;if(He&&!fe[At]){let pr=w(Se)||Se.parentNode,In=b(Se)||Se.childNodes;if(In&&pr){let On=In.length;for(let Ir=On-1;Ir>=0;--Ir){let kn=y(In[Ir],!0);kn.__removalCount=(Se.__removalCount||0)+1,pr.insertBefore(kn,x(Se))}}}return Xe(Se),!0}return Se instanceof u&&!dt(Se)||(At==="noscript"||At==="noembed"||At==="noframes")&&Ha(/<\/no(script|embed|frames)/i,Se.innerHTML)?(Xe(Se),!0):(ae&&Se.nodeType===q1.text&&(at=Se.textContent,qb([k,R,S],pr=>{at=H1(at,pr," ")}),Se.textContent!==at&&(U1(e.removed,{element:Se.cloneNode()}),Se.textContent=at)),or("afterSanitizeElements",Se,null),!1)},"_sanitizeElements"),Tn=o(function(Se,at,At){if(Be&&(at==="id"||at==="name")&&(At in r||At in $e))return!1;if(!(H&&!ee[at]&&Ha(O,at))){if(!(J&&Ha(N,at))){if(!j[at]||ee[at]){if(!(Ur(Se)&&(ie.tagNameCheck instanceof RegExp&&Ha(ie.tagNameCheck,Se)||ie.tagNameCheck instanceof Function&&ie.tagNameCheck(Se))&&(ie.attributeNameCheck instanceof RegExp&&Ha(ie.attributeNameCheck,at)||ie.attributeNameCheck instanceof Function&&ie.attributeNameCheck(at))||at==="is"&&ie.allowCustomizedBuiltInElements&&(ie.tagNameCheck instanceof RegExp&&Ha(ie.tagNameCheck,At)||ie.tagNameCheck instanceof Function&&ie.tagNameCheck(At))))return!1}else if(!ye[at]){if(!Ha($,H1(At,F,""))){if(!((at==="src"||at==="xlink:href"||at==="href")&&Se!=="script"&&obe(At,"data:")===0&&ge[Se])){if(!(q&&!Ha(P,H1(At,F,"")))){if(At)return!1}}}}}}return!0},"_isValidAttribute"),Ur=o(function(Se){return Se!=="annotation-xml"&&Xz(Se,B)},"_isBasicCustomElement"),ri=o(function(Se){or("beforeSanitizeAttributes",Se,null);let{attributes:at}=Se;if(!at)return;let At={attrName:"",attrValue:"",keepAttr:!0,allowedAttributes:j,forceKeepAttr:void 0},pr=at.length;for(;pr--;){let In=at[pr],{name:On,namespaceURI:Ir,value:kn}=In,_t=Ye(On),St=On==="value"?kn:lbe(kn);if(At.attrName=_t,At.attrValue=St,At.keepAttr=!0,At.forceKeepAttr=void 0,or("uponSanitizeAttribute",Se,At),St=At.attrValue,Ve&&(_t==="id"||_t==="name")&&(ct(On,Se),St=Ge+St),ue&&Ha(/((--!?|])>)|<\/(style|title)/i,St)){ct(On,Se);continue}if(At.forceKeepAttr||(ct(On,Se),!At.keepAttr))continue;if(!Z&&Ha(/\/>/i,St)){ct(On,Se);continue}ae&&qb([k,R,S],Ue=>{St=H1(St,Ue," ")});let bt=Ye(Se.nodeName);if(Tn(bt,_t,St)){if(_&&typeof m=="object"&&typeof m.getAttributeType=="function"&&!Ir)switch(m.getAttributeType(bt,_t)){case"TrustedHTML":{St=_.createHTML(St);break}case"TrustedScriptURL":{St=_.createScriptURL(St);break}}try{Ir?Se.setAttributeNS(Ir,On,St):Se.setAttribute(On,St),zt(Se)?Xe(Se):qz(e.removed)}catch{}}}or("afterSanitizeAttributes",Se,null)},"_sanitizeAttributes"),Mn=o(function yt(Se){let at=null,At=Rt(Se);for(or("beforeSanitizeShadowDOM",Se,null);at=At.nextNode();)or("uponSanitizeShadowNode",at,null),!hn(at)&&(at.content instanceof a&&yt(at.content),ri(at));or("afterSanitizeShadowDOM",Se,null)},"_sanitizeShadowDOM");return e.sanitize=function(yt){let Se=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},at=null,At=null,pr=null,In=null;if(Pe=!yt,Pe&&(yt="<!-->"),typeof yt!="string"&&!Xn(yt))if(typeof yt.toString=="function"){if(yt=yt.toString(),typeof yt!="string")throw W1("dirty is not a string, aborting")}else throw W1("toString is not a function");if(!e.isSupported)return yt;if(te||ft(Se),e.removed=[],typeof yt=="string"&&(xe=!1),xe){if(yt.nodeName){let kn=Ye(yt.nodeName);if(!z[kn]||Q[kn])throw W1("root node is forbidden and cannot be sanitized in-place")}}else if(yt instanceof l)at=Lt("<!---->"),At=at.ownerDocument.importNode(yt,!0),At.nodeType===q1.element&&At.nodeName==="BODY"||At.nodeName==="HTML"?at=At:at.appendChild(At);else{if(!oe&&!ae&&!ce&&yt.indexOf("<")===-1)return _&&Fe?_.createHTML(yt):yt;if(at=Lt(yt),!at)return oe?null:Fe?T:""}at&&De&&Xe(at.firstChild);let On=Rt(xe?yt:at);for(;pr=On.nextNode();)hn(pr)||(pr.content instanceof a&&Mn(pr.content),ri(pr));if(xe)return yt;if(oe){if(ke)for(In=C.call(at.ownerDocument);at.firstChild;)In.appendChild(at.firstChild);else In=at;return(j.shadowroot||j.shadowrootmode)&&(In=I.call(n,In,!0)),In}let Ir=ce?at.outerHTML:at.innerHTML;return ce&&z["!doctype"]&&at.ownerDocument&&at.ownerDocument.doctype&&at.ownerDocument.doctype.name&&Ha(nG,at.ownerDocument.doctype.name)&&(Ir="<!DOCTYPE "+at.ownerDocument.doctype.name+`> +`+Ir),ae&&qb([k,R,S],kn=>{Ir=H1(Ir,kn," ")}),_&&Fe?_.createHTML(Ir):Ir},e.setConfig=function(){let yt=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{};ft(yt),te=!0},e.clearConfig=function(){Tt=null,te=!1},e.isValidAttribute=function(yt,Se,at){Tt||ft({});let At=Ye(yt),pr=Ye(Se);return Tn(At,pr,at)},e.addHook=function(yt,Se){typeof Se=="function"&&(D[yt]=D[yt]||[],U1(D[yt],Se))},e.removeHook=function(yt){if(D[yt])return qz(D[yt])},e.removeHooks=function(yt){D[yt]&&(D[yt]=[])},e.removeAllHooks=function(){D={}},e}var eG,Yz,ibe,abe,sbe,Wa,Eo,tG,iC,aC,qb,qz,U1,jb,JS,Xz,H1,obe,lbe,ul,Ha,W1,jz,eC,tC,hbe,rC,fbe,Kz,Qz,nC,Zz,Xb,dbe,pbe,mbe,gbe,ybe,rG,vbe,xbe,nG,bbe,Jz,q1,wbe,Tbe,ah,sC=M(()=>{"use strict";({entries:eG,setPrototypeOf:Yz,isFrozen:ibe,getPrototypeOf:abe,getOwnPropertyDescriptor:sbe}=Object),{freeze:Wa,seal:Eo,create:tG}=Object,{apply:iC,construct:aC}=typeof Reflect<"u"&&Reflect;Wa||(Wa=o(function(e){return e},"freeze"));Eo||(Eo=o(function(e){return e},"seal"));iC||(iC=o(function(e,r,n){return e.apply(r,n)},"apply"));aC||(aC=o(function(e,r){return new e(...r)},"construct"));qb=Ws(Array.prototype.forEach),qz=Ws(Array.prototype.pop),U1=Ws(Array.prototype.push),jb=Ws(String.prototype.toLowerCase),JS=Ws(String.prototype.toString),Xz=Ws(String.prototype.match),H1=Ws(String.prototype.replace),obe=Ws(String.prototype.indexOf),lbe=Ws(String.prototype.trim),ul=Ws(Object.prototype.hasOwnProperty),Ha=Ws(RegExp.prototype.test),W1=cbe(TypeError);o(Ws,"unapply");o(cbe,"unconstruct");o(Ar,"addToSet");o(ube,"cleanArray");o(Uf,"clone");o(Y1,"lookupGetter");jz=Wa(["a","abbr","acronym","address","area","article","aside","audio","b","bdi","bdo","big","blink","blockquote","body","br","button","canvas","caption","center","cite","code","col","colgroup","content","data","datalist","dd","decorator","del","details","dfn","dialog","dir","div","dl","dt","element","em","fieldset","figcaption","figure","font","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","img","input","ins","kbd","label","legend","li","main","map","mark","marquee","menu","menuitem","meter","nav","nobr","ol","optgroup","option","output","p","picture","pre","progress","q","rp","rt","ruby","s","samp","section","select","shadow","small","source","spacer","span","strike","strong","style","sub","summary","sup","table","tbody","td","template","textarea","tfoot","th","thead","time","tr","track","tt","u","ul","var","video","wbr"]),eC=Wa(["svg","a","altglyph","altglyphdef","altglyphitem","animatecolor","animatemotion","animatetransform","circle","clippath","defs","desc","ellipse","filter","font","g","glyph","glyphref","hkern","image","line","lineargradient","marker","mask","metadata","mpath","path","pattern","polygon","polyline","radialgradient","rect","stop","style","switch","symbol","text","textpath","title","tref","tspan","view","vkern"]),tC=Wa(["feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feDistantLight","feDropShadow","feFlood","feFuncA","feFuncB","feFuncG","feFuncR","feGaussianBlur","feImage","feMerge","feMergeNode","feMorphology","feOffset","fePointLight","feSpecularLighting","feSpotLight","feTile","feTurbulence"]),hbe=Wa(["animate","color-profile","cursor","discard","font-face","font-face-format","font-face-name","font-face-src","font-face-uri","foreignobject","hatch","hatchpath","mesh","meshgradient","meshpatch","meshrow","missing-glyph","script","set","solidcolor","unknown","use"]),rC=Wa(["math","menclose","merror","mfenced","mfrac","mglyph","mi","mlabeledtr","mmultiscripts","mn","mo","mover","mpadded","mphantom","mroot","mrow","ms","mspace","msqrt","mstyle","msub","msup","msubsup","mtable","mtd","mtext","mtr","munder","munderover","mprescripts"]),fbe=Wa(["maction","maligngroup","malignmark","mlongdiv","mscarries","mscarry","msgroup","mstack","msline","msrow","semantics","annotation","annotation-xml","mprescripts","none"]),Kz=Wa(["#text"]),Qz=Wa(["accept","action","align","alt","autocapitalize","autocomplete","autopictureinpicture","autoplay","background","bgcolor","border","capture","cellpadding","cellspacing","checked","cite","class","clear","color","cols","colspan","controls","controlslist","coords","crossorigin","datetime","decoding","default","dir","disabled","disablepictureinpicture","disableremoteplayback","download","draggable","enctype","enterkeyhint","face","for","headers","height","hidden","high","href","hreflang","id","inputmode","integrity","ismap","kind","label","lang","list","loading","loop","low","max","maxlength","media","method","min","minlength","multiple","muted","name","nonce","noshade","novalidate","nowrap","open","optimum","pattern","placeholder","playsinline","popover","popovertarget","popovertargetaction","poster","preload","pubdate","radiogroup","readonly","rel","required","rev","reversed","role","rows","rowspan","spellcheck","scope","selected","shape","size","sizes","span","srclang","start","src","srcset","step","style","summary","tabindex","title","translate","type","usemap","valign","value","width","wrap","xmlns","slot"]),nC=Wa(["accent-height","accumulate","additive","alignment-baseline","amplitude","ascent","attributename","attributetype","azimuth","basefrequency","baseline-shift","begin","bias","by","class","clip","clippathunits","clip-path","clip-rule","color","color-interpolation","color-interpolation-filters","color-profile","color-rendering","cx","cy","d","dx","dy","diffuseconstant","direction","display","divisor","dur","edgemode","elevation","end","exponent","fill","fill-opacity","fill-rule","filter","filterunits","flood-color","flood-opacity","font-family","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-weight","fx","fy","g1","g2","glyph-name","glyphref","gradientunits","gradienttransform","height","href","id","image-rendering","in","in2","intercept","k","k1","k2","k3","k4","kerning","keypoints","keysplines","keytimes","lang","lengthadjust","letter-spacing","kernelmatrix","kernelunitlength","lighting-color","local","marker-end","marker-mid","marker-start","markerheight","markerunits","markerwidth","maskcontentunits","maskunits","max","mask","media","method","mode","min","name","numoctaves","offset","operator","opacity","order","orient","orientation","origin","overflow","paint-order","path","pathlength","patterncontentunits","patterntransform","patternunits","points","preservealpha","preserveaspectratio","primitiveunits","r","rx","ry","radius","refx","refy","repeatcount","repeatdur","restart","result","rotate","scale","seed","shape-rendering","slope","specularconstant","specularexponent","spreadmethod","startoffset","stddeviation","stitchtiles","stop-color","stop-opacity","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke","stroke-width","style","surfacescale","systemlanguage","tabindex","tablevalues","targetx","targety","transform","transform-origin","text-anchor","text-decoration","text-rendering","textlength","type","u1","u2","unicode","values","viewbox","visibility","version","vert-adv-y","vert-origin-x","vert-origin-y","width","word-spacing","wrap","writing-mode","xchannelselector","ychannelselector","x","x1","x2","xmlns","y","y1","y2","z","zoomandpan"]),Zz=Wa(["accent","accentunder","align","bevelled","close","columnsalign","columnlines","columnspan","denomalign","depth","dir","display","displaystyle","encoding","fence","frame","height","href","id","largeop","length","linethickness","lspace","lquote","mathbackground","mathcolor","mathsize","mathvariant","maxsize","minsize","movablelimits","notation","numalign","open","rowalign","rowlines","rowspacing","rowspan","rspace","rquote","scriptlevel","scriptminsize","scriptsizemultiplier","selection","separator","separators","stretchy","subscriptshift","supscriptshift","symmetric","voffset","width","xmlns"]),Xb=Wa(["xlink:href","xml:id","xlink:title","xml:space","xmlns:xlink"]),dbe=Eo(/\{\{[\w\W]*|[\w\W]*\}\}/gm),pbe=Eo(/<%[\w\W]*|[\w\W]*%>/gm),mbe=Eo(/\${[\w\W]*}/gm),gbe=Eo(/^data-[\-\w.\u00B7-\uFFFF]/),ybe=Eo(/^aria-[\-\w]+$/),rG=Eo(/^(?:(?:(?:f|ht)tps?|mailto|tel|callto|sms|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i),vbe=Eo(/^(?:\w+script|data):/i),xbe=Eo(/[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205F\u3000]/g),nG=Eo(/^html$/i),bbe=Eo(/^[a-z][.\w]*(-[.\w]+)+$/i),Jz=Object.freeze({__proto__:null,ARIA_ATTR:ybe,ATTR_WHITESPACE:xbe,CUSTOM_ELEMENT:bbe,DATA_ATTR:gbe,DOCTYPE_NAME:nG,ERB_EXPR:pbe,IS_ALLOWED_URI:rG,IS_SCRIPT_OR_DATA:vbe,MUSTACHE_EXPR:dbe,TMPLIT_EXPR:mbe}),q1={element:1,attribute:2,text:3,cdataSection:4,entityReference:5,entityNode:6,progressingInstruction:7,comment:8,document:9,documentType:10,documentFragment:11,notation:12},wbe=o(function(){return typeof window>"u"?null:window},"getGlobal"),Tbe=o(function(e,r){if(typeof e!="object"||typeof e.createPolicy!="function")return null;let n=null,i="data-tt-policy-suffix";r&&r.hasAttribute(i)&&(n=r.getAttribute(i));let a="dompurify"+(n?"#"+n:"");try{return e.createPolicy(a,{createHTML(s){return s},createScriptURL(s){return s}})}catch{return console.warn("TrustedTypes policy "+a+" could not be created."),null}},"_createTrustedTypesPolicy");o(iG,"createDOMPurify");ah=iG()});var N$={};vr(N$,{default:()=>g3e});function Lbe(t){return String(t).replace(_be,e=>Abe[e])}function Mbe(t){if(t.default)return t.default;var e=t.type,r=Array.isArray(e)?e[0]:e;if(typeof r!="string")return r.enum[0];switch(r){case"boolean":return!1;case"string":return"";case"number":return 0;case"object":return{}}}function Gbe(t){for(var e=0;e<xC.length;e++)for(var r=xC[e],n=0;n<r.blocks.length;n++){var i=r.blocks[n];if(t>=i[0]&&t<=i[1])return r.name}return null}function BG(t){for(var e=0;e<l4.length;e+=2)if(t>=l4[e]&&t<=l4[e+1])return!0;return!1}function Qbe(t,e){Zl[t]=e}function RC(t,e,r){if(!Zl[e])throw new Error("Font metrics not found for font: "+e+".");var n=t.charCodeAt(0),i=Zl[e][n];if(!i&&t[0]in sG&&(n=sG[t[0]].charCodeAt(0),i=Zl[e][n]),!i&&r==="text"&&BG(n)&&(i=Zl[e][77]),i)return{depth:i[0],height:i[1],italic:i[2],skew:i[3],width:i[4]}}function Zbe(t){var e;if(t>=5?e=0:t>=3?e=1:e=2,!oC[e]){var r=oC[e]={cssEmPerMu:Kb.quad[e]/18};for(var n in Kb)Kb.hasOwnProperty(n)&&(r[n]=Kb[n][e])}return oC[e]}function cG(t){if(t instanceof ms)return t;throw new Error("Expected symbolNode but got "+String(t)+".")}function r4e(t){if(t instanceof qf)return t;throw new Error("Expected span<HtmlDomNode> but got "+String(t)+".")}function G(t,e,r,n,i,a){En[t][i]={font:e,group:r,replace:n},a&&n&&(En[t][n]=En[t][i])}function Ct(t){for(var{type:e,names:r,props:n,handler:i,htmlBuilder:a,mathmlBuilder:s}=t,l={type:e,numArgs:n.numArgs,argTypes:n.argTypes,allowedInArgument:!!n.allowedInArgument,allowedInText:!!n.allowedInText,allowedInMath:n.allowedInMath===void 0?!0:n.allowedInMath,numOptionalArgs:n.numOptionalArgs||0,infix:!!n.infix,primitive:!!n.primitive,handler:i},u=0;u<r.length;++u)qG[r[u]]=l;e&&(a&&(f4[e]=a),s&&(d4[e]=s))}function Xf(t){var{type:e,htmlBuilder:r,mathmlBuilder:n}=t;Ct({type:e,names:[],props:{numArgs:0},handler(){throw new Error("Should never be called.")},htmlBuilder:r,mathmlBuilder:n})}function n4(t,e){var r=iu(["base"],t,e),n=iu(["strut"]);return n.style.height=mt(r.height+r.depth),r.depth&&(n.style.verticalAlign=mt(-r.depth)),r.children.unshift(n),r}function EC(t,e){var r=null;t.length===1&&t[0].type==="tag"&&(r=t[0].tag,t=t[0].body);var n=Ii(t,e,"root"),i;n.length===2&&n[1].hasClass("tag")&&(i=n.pop());for(var a=[],s=[],l=0;l<n.length;l++)if(s.push(n[l]),n[l].hasClass("mbin")||n[l].hasClass("mrel")||n[l].hasClass("allowbreak")){for(var u=!1;l<n.length-1&&n[l+1].hasClass("mspace")&&!n[l+1].hasClass("newline");)l++,s.push(n[l]),n[l].hasClass("nobreak")&&(u=!0);u||(a.push(n4(s,e)),s=[])}else n[l].hasClass("newline")&&(s.pop(),s.length>0&&(a.push(n4(s,e)),s=[]),a.push(n[l]));s.length>0&&a.push(n4(s,e));var h;r?(h=n4(Ii(r,e,!0)),h.classes=["tag"],a.push(h)):i&&a.push(i);var f=iu(["katex-html"],a);if(f.setAttribute("aria-hidden","true"),h){var d=h.children[0];d.style.height=mt(f.height+f.depth),f.depth&&(d.style.verticalAlign=mt(-f.depth))}return f}function jG(t){return new Yf(t)}function pG(t,e,r,n,i){var a=gs(t,r),s;a.length===1&&a[0]instanceof ps&&Jt.contains(["mrow","mtable"],a[0].type)?s=a[0]:s=new st.MathNode("mrow",a);var l=new st.MathNode("annotation",[new st.TextNode(e)]);l.setAttribute("encoding","application/x-tex");var u=new st.MathNode("semantics",[s,l]),h=new st.MathNode("math",[u]);h.setAttribute("xmlns","http://www.w3.org/1998/Math/MathML"),n&&h.setAttribute("display","block");var f=i?"katex":"katex-mathml";return Ie.makeSpan([f],[h])}function yr(t,e){if(!t||t.type!==e)throw new Error("Expected node of type "+e+", but got "+(t?"node of type "+t.type:String(t)));return t}function PC(t){var e=x4(t);if(!e)throw new Error("Expected node of symbol group type, but got "+(t?"node of type "+t.type:String(t)));return e}function x4(t){return t&&(t.type==="atom"||i4e.hasOwnProperty(t.type))?t:null}function JG(t,e){var r=Ii(t.body,e,!0);return I4e([t.mclass],r,e)}function e$(t,e){var r,n=gs(t.body,e);return t.mclass==="minner"?r=new st.MathNode("mpadded",n):t.mclass==="mord"?t.isCharacterBox?(r=n[0],r.type="mi"):r=new st.MathNode("mi",n):(t.isCharacterBox?(r=n[0],r.type="mo"):r=new st.MathNode("mo",n),t.mclass==="mbin"?(r.attributes.lspace="0.22em",r.attributes.rspace="0.22em"):t.mclass==="mpunct"?(r.attributes.lspace="0em",r.attributes.rspace="0.17em"):t.mclass==="mopen"||t.mclass==="mclose"?(r.attributes.lspace="0em",r.attributes.rspace="0em"):t.mclass==="minner"&&(r.attributes.lspace="0.0556em",r.attributes.width="+0.1111em")),r}function B4e(t,e,r){var n=O4e[t];switch(n){case"\\\\cdrightarrow":case"\\\\cdleftarrow":return r.callFunction(n,[e[0]],[e[1]]);case"\\uparrow":case"\\downarrow":{var i=r.callFunction("\\\\cdleft",[e[0]],[]),a={type:"atom",text:n,mode:"math",family:"rel"},s=r.callFunction("\\Big",[a],[]),l=r.callFunction("\\\\cdright",[e[1]],[]),u={type:"ordgroup",mode:"math",body:[i,s,l]};return r.callFunction("\\\\cdparent",[u],[])}case"\\\\cdlongequal":return r.callFunction("\\\\cdlongequal",[],[]);case"\\Vert":{var h={type:"textord",text:"\\Vert",mode:"math"};return r.callFunction("\\Big",[h],[])}default:return{type:"textord",text:" ",mode:"math"}}}function F4e(t){var e=[];for(t.gullet.beginGroup(),t.gullet.macros.set("\\cr","\\\\\\relax"),t.gullet.beginGroup();;){e.push(t.parseExpression(!1,"\\\\")),t.gullet.endGroup(),t.gullet.beginGroup();var r=t.fetch().text;if(r==="&"||r==="\\\\")t.consume();else if(r==="\\end"){e[e.length-1].length===0&&e.pop();break}else throw new ut("Expected \\\\ or \\cr or \\end",t.nextToken)}for(var n=[],i=[n],a=0;a<e.length;a++){for(var s=e[a],l=mG(),u=0;u<s.length;u++)if(!gG(s[u]))l.body.push(s[u]);else{n.push(l),u+=1;var h=PC(s[u]).text,f=new Array(2);if(f[0]={type:"ordgroup",mode:"math",body:[]},f[1]={type:"ordgroup",mode:"math",body:[]},!("=|.".indexOf(h)>-1))if("<>AV".indexOf(h)>-1)for(var d=0;d<2;d++){for(var p=!0,m=u+1;m<s.length;m++){if(P4e(s[m],h)){p=!1,u=m;break}if(gG(s[m]))throw new ut("Missing a "+h+" character to complete a CD arrow.",s[m]);f[d].body.push(s[m])}if(p)throw new ut("Missing a "+h+" character to complete a CD arrow.",s[u])}else throw new ut('Expected one of "<>AV=|." after @',s[u]);var g=B4e(h,f,t),y={type:"styling",body:[g],mode:"math",style:"display"};n.push(y),l=mG()}a%2===0?n.push(l):n.shift(),n=[],i.push(n)}t.gullet.endGroup(),t.gullet.endGroup();var v=new Array(i[0].length).fill({type:"align",align:"c",pregap:.25,postgap:.25});return{type:"array",mode:"math",body:i,arraystretch:1,addJot:!0,rowGaps:[null],cols:v,colSeparationType:"CD",hLinesBeforeRow:new Array(i.length+1).fill([])}}function w4(t,e){var r=x4(t);if(r&&Jt.contains(Q4e,r.text))return r;throw r?new ut("Invalid delimiter '"+r.text+"' after '"+e.funcName+"'",t):new ut("Invalid delimiter type '"+t.type+"'",t)}function vG(t){if(!t.body)throw new Error("Bug: The leftright ParseNode wasn't fully parsed.")}function ec(t){for(var{type:e,names:r,props:n,handler:i,htmlBuilder:a,mathmlBuilder:s}=t,l={type:e,numArgs:n.numArgs||0,allowedInText:!1,numOptionalArgs:0,handler:i},u=0;u<r.length;++u)d$[r[u]]=l;a&&(f4[e]=a),s&&(d4[e]=s)}function le(t,e){p$[t]=e}function xG(t){var e=[];t.consumeSpaces();var r=t.fetch().text;for(r==="\\relax"&&(t.consume(),t.consumeSpaces(),r=t.fetch().text);r==="\\hline"||r==="\\hdashline";)t.consume(),e.push(r==="\\hdashline"),t.consumeSpaces(),r=t.fetch().text;return e}function $C(t){if(t.indexOf("ed")===-1)return t.indexOf("*")===-1}function uh(t,e,r){var{hskipBeforeAndAfter:n,addJot:i,cols:a,arraystretch:s,colSeparationType:l,autoTag:u,singleRow:h,emptySingleRow:f,maxNumCols:d,leqno:p}=e;if(t.gullet.beginGroup(),h||t.gullet.macros.set("\\cr","\\\\\\relax"),!s){var m=t.gullet.expandMacroAsText("\\arraystretch");if(m==null)s=1;else if(s=parseFloat(m),!s||s<0)throw new ut("Invalid \\arraystretch: "+m)}t.gullet.beginGroup();var g=[],y=[g],v=[],x=[],b=u!=null?[]:void 0;function w(){u&&t.gullet.macros.set("\\@eqnsw","1",!0)}o(w,"beginRow");function _(){b&&(t.gullet.macros.get("\\df@tag")?(b.push(t.subparse([new Co("\\df@tag")])),t.gullet.macros.set("\\df@tag",void 0,!0)):b.push(!!u&&t.gullet.macros.get("\\@eqnsw")==="1"))}for(o(_,"endRow"),w(),x.push(xG(t));;){var T=t.parseExpression(!1,h?"\\end":"\\\\");t.gullet.endGroup(),t.gullet.beginGroup(),T={type:"ordgroup",mode:t.mode,body:T},r&&(T={type:"styling",mode:t.mode,style:r,body:[T]}),g.push(T);var E=t.fetch().text;if(E==="&"){if(d&&g.length===d){if(h||l)throw new ut("Too many tab characters: &",t.nextToken);t.settings.reportNonstrict("textEnv","Too few columns specified in the {array} column argument.")}t.consume()}else if(E==="\\end"){_(),g.length===1&&T.type==="styling"&&T.body[0].body.length===0&&(y.length>1||!f)&&y.pop(),x.length<y.length+1&&x.push([]);break}else if(E==="\\\\"){t.consume();var L=void 0;t.gullet.future().text!==" "&&(L=t.parseSizeGroup(!0)),v.push(L?L.value:null),_(),x.push(xG(t)),g=[],y.push(g),w()}else throw new ut("Expected & or \\\\ or \\cr or \\end",t.nextToken)}return t.gullet.endGroup(),t.gullet.endGroup(),{type:"array",mode:t.mode,addJot:i,arraystretch:s,body:y,cols:a,rowGaps:v,hskipBeforeAndAfter:n,hLinesBeforeRow:x,colSeparationType:l,tags:b,leqno:p}}function VC(t){return t.slice(0,1)==="d"?"display":"text"}function k$(t,e,r){for(var n=Ii(t,e,!1),i=e.sizeMultiplier/r.sizeMultiplier,a=0;a<n.length;a++){var s=n[a].classes.indexOf("sizing");s<0?Array.prototype.push.apply(n[a].classes,e.sizingClasses(r)):n[a].classes[s+1]==="reset-size"+e.size&&(n[a].classes[s+1]="reset-size"+r.size),n[a].height*=i,n[a].depth*=i}return Ie.makeFragment(n)}var Ys,Co,ut,kbe,Ebe,Sbe,Cbe,Abe,_be,PG,Dbe,Nbe,Rbe,Jt,o4,Z1,Kl,NC,c4,hp,ru,J1,So,fp,Ya,Ql,Ibe,Obe,Pbe,Bbe,Fbe,zbe,rr,xC,l4,up,$be,Vbe,Ube,Hbe,Wbe,Ybe,qbe,Xbe,jbe,aG,Kbe,Yf,Zl,Kb,sG,oC,Jbe,oG,lG,u4,bC,e4e,FG,Qn,mt,lh,zG,GG,$G,qf,ey,wC,t4e,ms,fl,Jl,ty,n4e,i4e,En,V,it,re,ve,$n,Nt,qa,dp,tr,Ti,qs,y4,we,su,_e,VG,uG,lC,Qb,hG,cC,Zb,h4,X1,Jb,sr,jn,Ea,eu,sh,TC,j1,e4,t4,fG,a4e,v4,hl,s4e,o4e,l4e,c4e,u4e,MC,ds,UG,h4e,f4e,HG,d4e,p4e,m4e,g4e,r4,WG,YG,y4e,Ie,Kn,Hf,tu,v4e,x4e,qG,f4,d4,p4,di,iu,b4e,w4e,T4e,k4e,Ii,dG,XG,E4e,kC,ry,Or,ps,Wf,SC,st,Ao,IC,OC,gs,ch,mn,KG,QG,S4e,C4e,A4e,_4e,L4e,D4e,N4e,R4e,au,BC,ZG,M4e,i4,I4e,b4,O4e,mG,gG,P4e,t$,r$,CC,n$,z4e,i$,K1,FC,a$,G4e,$4e,s$,uC,hC,AC,a4,V4e,U4e,o$,fC,dC,pC,H4e,l$,W4e,c$,Q1,Y4e,q4e,X4e,u$,j4e,h$,f$,K4e,nu,yG,Q4e,zC,GC,d$,p$,T4,tc,Z4e,rc,m$,bG,g$,y$,wG,v$,UC,HC,TG,kG,x$,J4e,mC,EG,b$,w$,pp,ny,e3e,t3e,T$,r3e,SG,n3e,CG,i3e,E$,gC,yC,AG,_G,LG,a3e,DG,NG,oh,S$,s3e,o3e,l3e,c3e,_C,u3e,h3e,m4,LC,f3e,RG,WC,MG,YC,C$,A$,_$,DC,IG,s4,vC,OG,g4,qC,L$,d3e,p3e,D$,XC,m3e,g3e,R$=M(()=>{"use strict";Ys=class t{static{o(this,"SourceLocation")}constructor(e,r,n){this.lexer=void 0,this.start=void 0,this.end=void 0,this.lexer=e,this.start=r,this.end=n}static range(e,r){return r?!e||!e.loc||!r.loc||e.loc.lexer!==r.loc.lexer?null:new t(e.loc.lexer,e.loc.start,r.loc.end):e&&e.loc}},Co=class t{static{o(this,"Token")}constructor(e,r){this.text=void 0,this.loc=void 0,this.noexpand=void 0,this.treatAsRelax=void 0,this.text=e,this.loc=r}range(e,r){return new t(r,Ys.range(this,e))}},ut=class t{static{o(this,"ParseError")}constructor(e,r){this.name=void 0,this.position=void 0,this.length=void 0,this.rawMessage=void 0;var n="KaTeX parse error: "+e,i,a,s=r&&r.loc;if(s&&s.start<=s.end){var l=s.lexer.input;i=s.start,a=s.end,i===l.length?n+=" at end of input: ":n+=" at position "+(i+1)+": ";var u=l.slice(i,a).replace(/[^]/g,"$&\u0332"),h;i>15?h="\u2026"+l.slice(i-15,i):h=l.slice(0,i);var f;a+15<l.length?f=l.slice(a,a+15)+"\u2026":f=l.slice(a),n+=h+u+f}var d=new Error(n);return d.name="ParseError",d.__proto__=t.prototype,d.position=i,i!=null&&a!=null&&(d.length=a-i),d.rawMessage=e,d}};ut.prototype.__proto__=Error.prototype;kbe=o(function(e,r){return e.indexOf(r)!==-1},"contains"),Ebe=o(function(e,r){return e===void 0?r:e},"deflt"),Sbe=/([A-Z])/g,Cbe=o(function(e){return e.replace(Sbe,"-$1").toLowerCase()},"hyphenate"),Abe={"&":"&",">":">","<":"<",'"':""","'":"'"},_be=/[&><"']/g;o(Lbe,"escape");PG=o(function t(e){return e.type==="ordgroup"||e.type==="color"?e.body.length===1?t(e.body[0]):e:e.type==="font"?t(e.body):e},"getBaseElem"),Dbe=o(function(e){var r=PG(e);return r.type==="mathord"||r.type==="textord"||r.type==="atom"},"isCharacterBox"),Nbe=o(function(e){if(!e)throw new Error("Expected non-null, but got "+String(e));return e},"assert"),Rbe=o(function(e){var r=/^[\x00-\x20]*([^\\/#?]*?)(:|�*58|�*3a|&colon)/i.exec(e);return r?r[2]!==":"||!/^[a-zA-Z][a-zA-Z0-9+\-.]*$/.test(r[1])?null:r[1].toLowerCase():"_relative"},"protocolFromUrl"),Jt={contains:kbe,deflt:Ebe,escape:Lbe,hyphenate:Cbe,getBaseElem:PG,isCharacterBox:Dbe,protocolFromUrl:Rbe},o4={displayMode:{type:"boolean",description:"Render math in display mode, which puts the math in display style (so \\int and \\sum are large, for example), and centers the math on the page on its own line.",cli:"-d, --display-mode"},output:{type:{enum:["htmlAndMathml","html","mathml"]},description:"Determines the markup language of the output.",cli:"-F, --format <type>"},leqno:{type:"boolean",description:"Render display math in leqno style (left-justified tags)."},fleqn:{type:"boolean",description:"Render display math flush left."},throwOnError:{type:"boolean",default:!0,cli:"-t, --no-throw-on-error",cliDescription:"Render errors (in the color given by --error-color) instead of throwing a ParseError exception when encountering an error."},errorColor:{type:"string",default:"#cc0000",cli:"-c, --error-color <color>",cliDescription:"A color string given in the format 'rgb' or 'rrggbb' (no #). This option determines the color of errors rendered by the -t option.",cliProcessor:o(t=>"#"+t,"cliProcessor")},macros:{type:"object",cli:"-m, --macro <def>",cliDescription:"Define custom macro of the form '\\foo:expansion' (use multiple -m arguments for multiple macros).",cliDefault:[],cliProcessor:o((t,e)=>(e.push(t),e),"cliProcessor")},minRuleThickness:{type:"number",description:"Specifies a minimum thickness, in ems, for fraction lines, `\\sqrt` top lines, `{array}` vertical lines, `\\hline`, `\\hdashline`, `\\underline`, `\\overline`, and the borders of `\\fbox`, `\\boxed`, and `\\fcolorbox`.",processor:o(t=>Math.max(0,t),"processor"),cli:"--min-rule-thickness <size>",cliProcessor:parseFloat},colorIsTextColor:{type:"boolean",description:"Makes \\color behave like LaTeX's 2-argument \\textcolor, instead of LaTeX's one-argument \\color mode change.",cli:"-b, --color-is-text-color"},strict:{type:[{enum:["warn","ignore","error"]},"boolean","function"],description:"Turn on strict / LaTeX faithfulness mode, which throws an error if the input uses features that are not supported by LaTeX.",cli:"-S, --strict",cliDefault:!1},trust:{type:["boolean","function"],description:"Trust the input, enabling all HTML features such as \\url.",cli:"-T, --trust"},maxSize:{type:"number",default:1/0,description:"If non-zero, all user-specified sizes, e.g. in \\rule{500em}{500em}, will be capped to maxSize ems. Otherwise, elements and spaces can be arbitrarily large",processor:o(t=>Math.max(0,t),"processor"),cli:"-s, --max-size <n>",cliProcessor:parseInt},maxExpand:{type:"number",default:1e3,description:"Limit the number of macro expansions to the specified number, to prevent e.g. infinite macro loops. If set to Infinity, the macro expander will try to fully expand as in LaTeX.",processor:o(t=>Math.max(0,t),"processor"),cli:"-e, --max-expand <n>",cliProcessor:o(t=>t==="Infinity"?1/0:parseInt(t),"cliProcessor")},globalGroup:{type:"boolean",cli:!1}};o(Mbe,"getDefaultValue");Z1=class{static{o(this,"Settings")}constructor(e){this.displayMode=void 0,this.output=void 0,this.leqno=void 0,this.fleqn=void 0,this.throwOnError=void 0,this.errorColor=void 0,this.macros=void 0,this.minRuleThickness=void 0,this.colorIsTextColor=void 0,this.strict=void 0,this.trust=void 0,this.maxSize=void 0,this.maxExpand=void 0,this.globalGroup=void 0,e=e||{};for(var r in o4)if(o4.hasOwnProperty(r)){var n=o4[r];this[r]=e[r]!==void 0?n.processor?n.processor(e[r]):e[r]:Mbe(n)}}reportNonstrict(e,r,n){var i=this.strict;if(typeof i=="function"&&(i=i(e,r,n)),!(!i||i==="ignore")){if(i===!0||i==="error")throw new ut("LaTeX-incompatible input and strict mode is set to 'error': "+(r+" ["+e+"]"),n);i==="warn"?typeof console<"u"&&console.warn("LaTeX-incompatible input and strict mode is set to 'warn': "+(r+" ["+e+"]")):typeof console<"u"&&console.warn("LaTeX-incompatible input and strict mode is set to "+("unrecognized '"+i+"': "+r+" ["+e+"]"))}}useStrictBehavior(e,r,n){var i=this.strict;if(typeof i=="function")try{i=i(e,r,n)}catch{i="error"}return!i||i==="ignore"?!1:i===!0||i==="error"?!0:i==="warn"?(typeof console<"u"&&console.warn("LaTeX-incompatible input and strict mode is set to 'warn': "+(r+" ["+e+"]")),!1):(typeof console<"u"&&console.warn("LaTeX-incompatible input and strict mode is set to "+("unrecognized '"+i+"': "+r+" ["+e+"]")),!1)}isTrusted(e){if(e.url&&!e.protocol){var r=Jt.protocolFromUrl(e.url);if(r==null)return!1;e.protocol=r}var n=typeof this.trust=="function"?this.trust(e):this.trust;return!!n}},Kl=class{static{o(this,"Style")}constructor(e,r,n){this.id=void 0,this.size=void 0,this.cramped=void 0,this.id=e,this.size=r,this.cramped=n}sup(){return Ql[Ibe[this.id]]}sub(){return Ql[Obe[this.id]]}fracNum(){return Ql[Pbe[this.id]]}fracDen(){return Ql[Bbe[this.id]]}cramp(){return Ql[Fbe[this.id]]}text(){return Ql[zbe[this.id]]}isTight(){return this.size>=2}},NC=0,c4=1,hp=2,ru=3,J1=4,So=5,fp=6,Ya=7,Ql=[new Kl(NC,0,!1),new Kl(c4,0,!0),new Kl(hp,1,!1),new Kl(ru,1,!0),new Kl(J1,2,!1),new Kl(So,2,!0),new Kl(fp,3,!1),new Kl(Ya,3,!0)],Ibe=[J1,So,J1,So,fp,Ya,fp,Ya],Obe=[So,So,So,So,Ya,Ya,Ya,Ya],Pbe=[hp,ru,J1,So,fp,Ya,fp,Ya],Bbe=[ru,ru,So,So,Ya,Ya,Ya,Ya],Fbe=[c4,c4,ru,ru,So,So,Ya,Ya],zbe=[NC,c4,hp,ru,hp,ru,hp,ru],rr={DISPLAY:Ql[NC],TEXT:Ql[hp],SCRIPT:Ql[J1],SCRIPTSCRIPT:Ql[fp]},xC=[{name:"latin",blocks:[[256,591],[768,879]]},{name:"cyrillic",blocks:[[1024,1279]]},{name:"armenian",blocks:[[1328,1423]]},{name:"brahmic",blocks:[[2304,4255]]},{name:"georgian",blocks:[[4256,4351]]},{name:"cjk",blocks:[[12288,12543],[19968,40879],[65280,65376]]},{name:"hangul",blocks:[[44032,55215]]}];o(Gbe,"scriptFromCodepoint");l4=[];xC.forEach(t=>t.blocks.forEach(e=>l4.push(...e)));o(BG,"supportedCodepoint");up=80,$be=o(function(e,r){return"M95,"+(622+e+r)+` +c-2.7,0,-7.17,-2.7,-13.5,-8c-5.8,-5.3,-9.5,-10,-9.5,-14 +c0,-2,0.3,-3.3,1,-4c1.3,-2.7,23.83,-20.7,67.5,-54 +c44.2,-33.3,65.8,-50.3,66.5,-51c1.3,-1.3,3,-2,5,-2c4.7,0,8.7,3.3,12,10 +s173,378,173,378c0.7,0,35.3,-71,104,-213c68.7,-142,137.5,-285,206.5,-429 +c69,-144,104.5,-217.7,106.5,-221 +l`+e/2.075+" -"+e+` +c5.3,-9.3,12,-14,20,-14 +H400000v`+(40+e)+`H845.2724 +s-225.272,467,-225.272,467s-235,486,-235,486c-2.7,4.7,-9,7,-19,7 +c-6,0,-10,-1,-12,-3s-194,-422,-194,-422s-65,47,-65,47z +M`+(834+e)+" "+r+"h400000v"+(40+e)+"h-400000z"},"sqrtMain"),Vbe=o(function(e,r){return"M263,"+(601+e+r)+`c0.7,0,18,39.7,52,119 +c34,79.3,68.167,158.7,102.5,238c34.3,79.3,51.8,119.3,52.5,120 +c340,-704.7,510.7,-1060.3,512,-1067 +l`+e/2.084+" -"+e+` +c4.7,-7.3,11,-11,19,-11 +H40000v`+(40+e)+`H1012.3 +s-271.3,567,-271.3,567c-38.7,80.7,-84,175,-136,283c-52,108,-89.167,185.3,-111.5,232 +c-22.3,46.7,-33.8,70.3,-34.5,71c-4.7,4.7,-12.3,7,-23,7s-12,-1,-12,-1 +s-109,-253,-109,-253c-72.7,-168,-109.3,-252,-110,-252c-10.7,8,-22,16.7,-34,26 +c-22,17.3,-33.3,26,-34,26s-26,-26,-26,-26s76,-59,76,-59s76,-60,76,-60z +M`+(1001+e)+" "+r+"h400000v"+(40+e)+"h-400000z"},"sqrtSize1"),Ube=o(function(e,r){return"M983 "+(10+e+r)+` +l`+e/3.13+" -"+e+` +c4,-6.7,10,-10,18,-10 H400000v`+(40+e)+` +H1013.1s-83.4,268,-264.1,840c-180.7,572,-277,876.3,-289,913c-4.7,4.7,-12.7,7,-24,7 +s-12,0,-12,0c-1.3,-3.3,-3.7,-11.7,-7,-25c-35.3,-125.3,-106.7,-373.3,-214,-744 +c-10,12,-21,25,-33,39s-32,39,-32,39c-6,-5.3,-15,-14,-27,-26s25,-30,25,-30 +c26.7,-32.7,52,-63,76,-91s52,-60,52,-60s208,722,208,722 +c56,-175.3,126.3,-397.3,211,-666c84.7,-268.7,153.8,-488.2,207.5,-658.5 +c53.7,-170.3,84.5,-266.8,92.5,-289.5z +M`+(1001+e)+" "+r+"h400000v"+(40+e)+"h-400000z"},"sqrtSize2"),Hbe=o(function(e,r){return"M424,"+(2398+e+r)+` +c-1.3,-0.7,-38.5,-172,-111.5,-514c-73,-342,-109.8,-513.3,-110.5,-514 +c0,-2,-10.7,14.3,-32,49c-4.7,7.3,-9.8,15.7,-15.5,25c-5.7,9.3,-9.8,16,-12.5,20 +s-5,7,-5,7c-4,-3.3,-8.3,-7.7,-13,-13s-13,-13,-13,-13s76,-122,76,-122s77,-121,77,-121 +s209,968,209,968c0,-2,84.7,-361.7,254,-1079c169.3,-717.3,254.7,-1077.7,256,-1081 +l`+e/4.223+" -"+e+`c4,-6.7,10,-10,18,-10 H400000 +v`+(40+e)+`H1014.6 +s-87.3,378.7,-272.6,1166c-185.3,787.3,-279.3,1182.3,-282,1185 +c-2,6,-10,9,-24,9 +c-8,0,-12,-0.7,-12,-2z M`+(1001+e)+" "+r+` +h400000v`+(40+e)+"h-400000z"},"sqrtSize3"),Wbe=o(function(e,r){return"M473,"+(2713+e+r)+` +c339.3,-1799.3,509.3,-2700,510,-2702 l`+e/5.298+" -"+e+` +c3.3,-7.3,9.3,-11,18,-11 H400000v`+(40+e)+`H1017.7 +s-90.5,478,-276.2,1466c-185.7,988,-279.5,1483,-281.5,1485c-2,6,-10,9,-24,9 +c-8,0,-12,-0.7,-12,-2c0,-1.3,-5.3,-32,-16,-92c-50.7,-293.3,-119.7,-693.3,-207,-1200 +c0,-1.3,-5.3,8.7,-16,30c-10.7,21.3,-21.3,42.7,-32,64s-16,33,-16,33s-26,-26,-26,-26 +s76,-153,76,-153s77,-151,77,-151c0.7,0.7,35.7,202,105,604c67.3,400.7,102,602.7,104, +606zM`+(1001+e)+" "+r+"h400000v"+(40+e)+"H1017.7z"},"sqrtSize4"),Ybe=o(function(e){var r=e/2;return"M400000 "+e+" H0 L"+r+" 0 l65 45 L145 "+(e-80)+" H400000z"},"phasePath"),qbe=o(function(e,r,n){var i=n-54-r-e;return"M702 "+(e+r)+"H400000"+(40+e)+` +H742v`+i+`l-4 4-4 4c-.667.7 -2 1.5-4 2.5s-4.167 1.833-6.5 2.5-5.5 1-9.5 1 +h-12l-28-84c-16.667-52-96.667 -294.333-240-727l-212 -643 -85 170 +c-4-3.333-8.333-7.667-13 -13l-13-13l77-155 77-156c66 199.333 139 419.667 +219 661 l218 661zM702 `+r+"H400000v"+(40+e)+"H742z"},"sqrtTall"),Xbe=o(function(e,r,n){r=1e3*r;var i="";switch(e){case"sqrtMain":i=$be(r,up);break;case"sqrtSize1":i=Vbe(r,up);break;case"sqrtSize2":i=Ube(r,up);break;case"sqrtSize3":i=Hbe(r,up);break;case"sqrtSize4":i=Wbe(r,up);break;case"sqrtTall":i=qbe(r,up,n)}return i},"sqrtPath"),jbe=o(function(e,r){switch(e){case"\u239C":return"M291 0 H417 V"+r+" H291z M291 0 H417 V"+r+" H291z";case"\u2223":return"M145 0 H188 V"+r+" H145z M145 0 H188 V"+r+" H145z";case"\u2225":return"M145 0 H188 V"+r+" H145z M145 0 H188 V"+r+" H145z"+("M367 0 H410 V"+r+" H367z M367 0 H410 V"+r+" H367z");case"\u239F":return"M457 0 H583 V"+r+" H457z M457 0 H583 V"+r+" H457z";case"\u23A2":return"M319 0 H403 V"+r+" H319z M319 0 H403 V"+r+" H319z";case"\u23A5":return"M263 0 H347 V"+r+" H263z M263 0 H347 V"+r+" H263z";case"\u23AA":return"M384 0 H504 V"+r+" H384z M384 0 H504 V"+r+" H384z";case"\u23D0":return"M312 0 H355 V"+r+" H312z M312 0 H355 V"+r+" H312z";case"\u2016":return"M257 0 H300 V"+r+" H257z M257 0 H300 V"+r+" H257z"+("M478 0 H521 V"+r+" H478z M478 0 H521 V"+r+" H478z");default:return""}},"innerPath"),aG={doubleleftarrow:`M262 157 +l10-10c34-36 62.7-77 86-123 3.3-8 5-13.3 5-16 0-5.3-6.7-8-20-8-7.3 + 0-12.2.5-14.5 1.5-2.3 1-4.8 4.5-7.5 10.5-49.3 97.3-121.7 169.3-217 216-28 + 14-57.3 25-88 33-6.7 2-11 3.8-13 5.5-2 1.7-3 4.2-3 7.5s1 5.8 3 7.5 +c2 1.7 6.3 3.5 13 5.5 68 17.3 128.2 47.8 180.5 91.5 52.3 43.7 93.8 96.2 124.5 + 157.5 9.3 8 15.3 12.3 18 13h6c12-.7 18-4 18-10 0-2-1.7-7-5-15-23.3-46-52-87 +-86-123l-10-10h399738v-40H218c328 0 0 0 0 0l-10-8c-26.7-20-65.7-43-117-69 2.7 +-2 6-3.7 10-5 36.7-16 72.3-37.3 107-64l10-8h399782v-40z +m8 0v40h399730v-40zm0 194v40h399730v-40z`,doublerightarrow:`M399738 392l +-10 10c-34 36-62.7 77-86 123-3.3 8-5 13.3-5 16 0 5.3 6.7 8 20 8 7.3 0 12.2-.5 + 14.5-1.5 2.3-1 4.8-4.5 7.5-10.5 49.3-97.3 121.7-169.3 217-216 28-14 57.3-25 88 +-33 6.7-2 11-3.8 13-5.5 2-1.7 3-4.2 3-7.5s-1-5.8-3-7.5c-2-1.7-6.3-3.5-13-5.5-68 +-17.3-128.2-47.8-180.5-91.5-52.3-43.7-93.8-96.2-124.5-157.5-9.3-8-15.3-12.3-18 +-13h-6c-12 .7-18 4-18 10 0 2 1.7 7 5 15 23.3 46 52 87 86 123l10 10H0v40h399782 +c-328 0 0 0 0 0l10 8c26.7 20 65.7 43 117 69-2.7 2-6 3.7-10 5-36.7 16-72.3 37.3 +-107 64l-10 8H0v40zM0 157v40h399730v-40zm0 194v40h399730v-40z`,leftarrow:`M400000 241H110l3-3c68.7-52.7 113.7-120 + 135-202 4-14.7 6-23 6-25 0-7.3-7-11-21-11-8 0-13.2.8-15.5 2.5-2.3 1.7-4.2 5.8 +-5.5 12.5-1.3 4.7-2.7 10.3-4 17-12 48.7-34.8 92-68.5 130S65.3 228.3 18 247 +c-10 4-16 7.7-18 11 0 8.7 6 14.3 18 17 47.3 18.7 87.8 47 121.5 85S196 441.3 208 + 490c.7 2 1.3 5 2 9s1.2 6.7 1.5 8c.3 1.3 1 3.3 2 6s2.2 4.5 3.5 5.5c1.3 1 3.3 + 1.8 6 2.5s6 1 10 1c14 0 21-3.7 21-11 0-2-2-10.3-6-25-20-79.3-65-146.7-135-202 + l-3-3h399890zM100 241v40h399900v-40z`,leftbrace:`M6 548l-6-6v-35l6-11c56-104 135.3-181.3 238-232 57.3-28.7 117 +-45 179-50h399577v120H403c-43.3 7-81 15-113 26-100.7 33-179.7 91-237 174-2.7 + 5-6 9-10 13-.7 1-7.3 1-20 1H6z`,leftbraceunder:`M0 6l6-6h17c12.688 0 19.313.3 20 1 4 4 7.313 8.3 10 13 + 35.313 51.3 80.813 93.8 136.5 127.5 55.688 33.7 117.188 55.8 184.5 66.5.688 + 0 2 .3 4 1 18.688 2.7 76 4.3 172 5h399450v120H429l-6-1c-124.688-8-235-61.7 +-331-161C60.687 138.7 32.312 99.3 7 54L0 41V6z`,leftgroup:`M400000 80 +H435C64 80 168.3 229.4 21 260c-5.9 1.2-18 0-18 0-2 0-3-1-3-3v-38C76 61 257 0 + 435 0h399565z`,leftgroupunder:`M400000 262 +H435C64 262 168.3 112.6 21 82c-5.9-1.2-18 0-18 0-2 0-3 1-3 3v38c76 158 257 219 + 435 219h399565z`,leftharpoon:`M0 267c.7 5.3 3 10 7 14h399993v-40H93c3.3 +-3.3 10.2-9.5 20.5-18.5s17.8-15.8 22.5-20.5c50.7-52 88-110.3 112-175 4-11.3 5 +-18.3 3-21-1.3-4-7.3-6-18-6-8 0-13 .7-15 2s-4.7 6.7-8 16c-42 98.7-107.3 174.7 +-196 228-6.7 4.7-10.7 8-12 10-1.3 2-2 5.7-2 11zm100-26v40h399900v-40z`,leftharpoonplus:`M0 267c.7 5.3 3 10 7 14h399993v-40H93c3.3-3.3 10.2-9.5 + 20.5-18.5s17.8-15.8 22.5-20.5c50.7-52 88-110.3 112-175 4-11.3 5-18.3 3-21-1.3 +-4-7.3-6-18-6-8 0-13 .7-15 2s-4.7 6.7-8 16c-42 98.7-107.3 174.7-196 228-6.7 4.7 +-10.7 8-12 10-1.3 2-2 5.7-2 11zm100-26v40h399900v-40zM0 435v40h400000v-40z +m0 0v40h400000v-40z`,leftharpoondown:`M7 241c-4 4-6.333 8.667-7 14 0 5.333.667 9 2 11s5.333 + 5.333 12 10c90.667 54 156 130 196 228 3.333 10.667 6.333 16.333 9 17 2 .667 5 + 1 9 1h5c10.667 0 16.667-2 18-6 2-2.667 1-9.667-3-21-32-87.333-82.667-157.667 +-152-211l-3-3h399907v-40zM93 281 H400000 v-40L7 241z`,leftharpoondownplus:`M7 435c-4 4-6.3 8.7-7 14 0 5.3.7 9 2 11s5.3 5.3 12 + 10c90.7 54 156 130 196 228 3.3 10.7 6.3 16.3 9 17 2 .7 5 1 9 1h5c10.7 0 16.7 +-2 18-6 2-2.7 1-9.7-3-21-32-87.3-82.7-157.7-152-211l-3-3h399907v-40H7zm93 0 +v40h399900v-40zM0 241v40h399900v-40zm0 0v40h399900v-40z`,lefthook:`M400000 281 H103s-33-11.2-61-33.5S0 197.3 0 164s14.2-61.2 42.5 +-83.5C70.8 58.2 104 47 142 47 c16.7 0 25 6.7 25 20 0 12-8.7 18.7-26 20-40 3.3 +-68.7 15.7-86 37-10 12-15 25.3-15 40 0 22.7 9.8 40.7 29.5 54 19.7 13.3 43.5 21 + 71.5 23h399859zM103 281v-40h399897v40z`,leftlinesegment:`M40 281 V428 H0 V94 H40 V241 H400000 v40z +M40 281 V428 H0 V94 H40 V241 H400000 v40z`,leftmapsto:`M40 281 V448H0V74H40V241H400000v40z +M40 281 V448H0V74H40V241H400000v40z`,leftToFrom:`M0 147h400000v40H0zm0 214c68 40 115.7 95.7 143 167h22c15.3 0 23 +-.3 23-1 0-1.3-5.3-13.7-16-37-18-35.3-41.3-69-70-101l-7-8h399905v-40H95l7-8 +c28.7-32 52-65.7 70-101 10.7-23.3 16-35.7 16-37 0-.7-7.7-1-23-1h-22C115.7 265.3 + 68 321 0 361zm0-174v-40h399900v40zm100 154v40h399900v-40z`,longequal:`M0 50 h400000 v40H0z m0 194h40000v40H0z +M0 50 h400000 v40H0z m0 194h40000v40H0z`,midbrace:`M200428 334 +c-100.7-8.3-195.3-44-280-108-55.3-42-101.7-93-139-153l-9-14c-2.7 4-5.7 8.7-9 14 +-53.3 86.7-123.7 153-211 199-66.7 36-137.3 56.3-212 62H0V214h199568c178.3-11.7 + 311.7-78.3 403-201 6-8 9.7-12 11-12 .7-.7 6.7-1 18-1s17.3.3 18 1c1.3 0 5 4 11 + 12 44.7 59.3 101.3 106.3 170 141s145.3 54.3 229 60h199572v120z`,midbraceunder:`M199572 214 +c100.7 8.3 195.3 44 280 108 55.3 42 101.7 93 139 153l9 14c2.7-4 5.7-8.7 9-14 + 53.3-86.7 123.7-153 211-199 66.7-36 137.3-56.3 212-62h199568v120H200432c-178.3 + 11.7-311.7 78.3-403 201-6 8-9.7 12-11 12-.7.7-6.7 1-18 1s-17.3-.3-18-1c-1.3 0 +-5-4-11-12-44.7-59.3-101.3-106.3-170-141s-145.3-54.3-229-60H0V214z`,oiintSize1:`M512.6 71.6c272.6 0 320.3 106.8 320.3 178.2 0 70.8-47.7 177.6 +-320.3 177.6S193.1 320.6 193.1 249.8c0-71.4 46.9-178.2 319.5-178.2z +m368.1 178.2c0-86.4-60.9-215.4-368.1-215.4-306.4 0-367.3 129-367.3 215.4 0 85.8 +60.9 214.8 367.3 214.8 307.2 0 368.1-129 368.1-214.8z`,oiintSize2:`M757.8 100.1c384.7 0 451.1 137.6 451.1 230 0 91.3-66.4 228.8 +-451.1 228.8-386.3 0-452.7-137.5-452.7-228.8 0-92.4 66.4-230 452.7-230z +m502.4 230c0-111.2-82.4-277.2-502.4-277.2s-504 166-504 277.2 +c0 110 84 276 504 276s502.4-166 502.4-276z`,oiiintSize1:`M681.4 71.6c408.9 0 480.5 106.8 480.5 178.2 0 70.8-71.6 177.6 +-480.5 177.6S202.1 320.6 202.1 249.8c0-71.4 70.5-178.2 479.3-178.2z +m525.8 178.2c0-86.4-86.8-215.4-525.7-215.4-437.9 0-524.7 129-524.7 215.4 0 +85.8 86.8 214.8 524.7 214.8 438.9 0 525.7-129 525.7-214.8z`,oiiintSize2:`M1021.2 53c603.6 0 707.8 165.8 707.8 277.2 0 110-104.2 275.8 +-707.8 275.8-606 0-710.2-165.8-710.2-275.8C311 218.8 415.2 53 1021.2 53z +m770.4 277.1c0-131.2-126.4-327.6-770.5-327.6S248.4 198.9 248.4 330.1 +c0 130 128.8 326.4 772.7 326.4s770.5-196.4 770.5-326.4z`,rightarrow:`M0 241v40h399891c-47.3 35.3-84 78-110 128 +-16.7 32-27.7 63.7-33 95 0 1.3-.2 2.7-.5 4-.3 1.3-.5 2.3-.5 3 0 7.3 6.7 11 20 + 11 8 0 13.2-.8 15.5-2.5 2.3-1.7 4.2-5.5 5.5-11.5 2-13.3 5.7-27 11-41 14.7-44.7 + 39-84.5 73-119.5s73.7-60.2 119-75.5c6-2 9-5.7 9-11s-3-9-9-11c-45.3-15.3-85 +-40.5-119-75.5s-58.3-74.8-73-119.5c-4.7-14-8.3-27.3-11-40-1.3-6.7-3.2-10.8-5.5 +-12.5-2.3-1.7-7.5-2.5-15.5-2.5-14 0-21 3.7-21 11 0 2 2 10.3 6 25 20.7 83.3 67 + 151.7 139 205zm0 0v40h399900v-40z`,rightbrace:`M400000 542l +-6 6h-17c-12.7 0-19.3-.3-20-1-4-4-7.3-8.3-10-13-35.3-51.3-80.8-93.8-136.5-127.5 +s-117.2-55.8-184.5-66.5c-.7 0-2-.3-4-1-18.7-2.7-76-4.3-172-5H0V214h399571l6 1 +c124.7 8 235 61.7 331 161 31.3 33.3 59.7 72.7 85 118l7 13v35z`,rightbraceunder:`M399994 0l6 6v35l-6 11c-56 104-135.3 181.3-238 232-57.3 + 28.7-117 45-179 50H-300V214h399897c43.3-7 81-15 113-26 100.7-33 179.7-91 237 +-174 2.7-5 6-9 10-13 .7-1 7.3-1 20-1h17z`,rightgroup:`M0 80h399565c371 0 266.7 149.4 414 180 5.9 1.2 18 0 18 0 2 0 + 3-1 3-3v-38c-76-158-257-219-435-219H0z`,rightgroupunder:`M0 262h399565c371 0 266.7-149.4 414-180 5.9-1.2 18 0 18 + 0 2 0 3 1 3 3v38c-76 158-257 219-435 219H0z`,rightharpoon:`M0 241v40h399993c4.7-4.7 7-9.3 7-14 0-9.3 +-3.7-15.3-11-18-92.7-56.7-159-133.7-199-231-3.3-9.3-6-14.7-8-16-2-1.3-7-2-15-2 +-10.7 0-16.7 2-18 6-2 2.7-1 9.7 3 21 15.3 42 36.7 81.8 64 119.5 27.3 37.7 58 + 69.2 92 94.5zm0 0v40h399900v-40z`,rightharpoonplus:`M0 241v40h399993c4.7-4.7 7-9.3 7-14 0-9.3-3.7-15.3-11 +-18-92.7-56.7-159-133.7-199-231-3.3-9.3-6-14.7-8-16-2-1.3-7-2-15-2-10.7 0-16.7 + 2-18 6-2 2.7-1 9.7 3 21 15.3 42 36.7 81.8 64 119.5 27.3 37.7 58 69.2 92 94.5z +m0 0v40h399900v-40z m100 194v40h399900v-40zm0 0v40h399900v-40z`,rightharpoondown:`M399747 511c0 7.3 6.7 11 20 11 8 0 13-.8 15-2.5s4.7-6.8 + 8-15.5c40-94 99.3-166.3 178-217 13.3-8 20.3-12.3 21-13 5.3-3.3 8.5-5.8 9.5 +-7.5 1-1.7 1.5-5.2 1.5-10.5s-2.3-10.3-7-15H0v40h399908c-34 25.3-64.7 57-92 95 +-27.3 38-48.7 77.7-64 119-3.3 8.7-5 14-5 16zM0 241v40h399900v-40z`,rightharpoondownplus:`M399747 705c0 7.3 6.7 11 20 11 8 0 13-.8 + 15-2.5s4.7-6.8 8-15.5c40-94 99.3-166.3 178-217 13.3-8 20.3-12.3 21-13 5.3-3.3 + 8.5-5.8 9.5-7.5 1-1.7 1.5-5.2 1.5-10.5s-2.3-10.3-7-15H0v40h399908c-34 25.3 +-64.7 57-92 95-27.3 38-48.7 77.7-64 119-3.3 8.7-5 14-5 16zM0 435v40h399900v-40z +m0-194v40h400000v-40zm0 0v40h400000v-40z`,righthook:`M399859 241c-764 0 0 0 0 0 40-3.3 68.7-15.7 86-37 10-12 15-25.3 + 15-40 0-22.7-9.8-40.7-29.5-54-19.7-13.3-43.5-21-71.5-23-17.3-1.3-26-8-26-20 0 +-13.3 8.7-20 26-20 38 0 71 11.2 99 33.5 0 0 7 5.6 21 16.7 14 11.2 21 33.5 21 + 66.8s-14 61.2-42 83.5c-28 22.3-61 33.5-99 33.5L0 241z M0 281v-40h399859v40z`,rightlinesegment:`M399960 241 V94 h40 V428 h-40 V281 H0 v-40z +M399960 241 V94 h40 V428 h-40 V281 H0 v-40z`,rightToFrom:`M400000 167c-70.7-42-118-97.7-142-167h-23c-15.3 0-23 .3-23 + 1 0 1.3 5.3 13.7 16 37 18 35.3 41.3 69 70 101l7 8H0v40h399905l-7 8c-28.7 32 +-52 65.7-70 101-10.7 23.3-16 35.7-16 37 0 .7 7.7 1 23 1h23c24-69.3 71.3-125 142 +-167z M100 147v40h399900v-40zM0 341v40h399900v-40z`,twoheadleftarrow:`M0 167c68 40 + 115.7 95.7 143 167h22c15.3 0 23-.3 23-1 0-1.3-5.3-13.7-16-37-18-35.3-41.3-69 +-70-101l-7-8h125l9 7c50.7 39.3 85 86 103 140h46c0-4.7-6.3-18.7-19-42-18-35.3 +-40-67.3-66-96l-9-9h399716v-40H284l9-9c26-28.7 48-60.7 66-96 12.7-23.333 19 +-37.333 19-42h-46c-18 54-52.3 100.7-103 140l-9 7H95l7-8c28.7-32 52-65.7 70-101 + 10.7-23.333 16-35.7 16-37 0-.7-7.7-1-23-1h-22C115.7 71.3 68 127 0 167z`,twoheadrightarrow:`M400000 167 +c-68-40-115.7-95.7-143-167h-22c-15.3 0-23 .3-23 1 0 1.3 5.3 13.7 16 37 18 35.3 + 41.3 69 70 101l7 8h-125l-9-7c-50.7-39.3-85-86-103-140h-46c0 4.7 6.3 18.7 19 42 + 18 35.3 40 67.3 66 96l9 9H0v40h399716l-9 9c-26 28.7-48 60.7-66 96-12.7 23.333 +-19 37.333-19 42h46c18-54 52.3-100.7 103-140l9-7h125l-7 8c-28.7 32-52 65.7-70 + 101-10.7 23.333-16 35.7-16 37 0 .7 7.7 1 23 1h22c27.3-71.3 75-127 143-167z`,tilde1:`M200 55.538c-77 0-168 73.953-177 73.953-3 0-7 +-2.175-9-5.437L2 97c-1-2-2-4-2-6 0-4 2-7 5-9l20-12C116 12 171 0 207 0c86 0 + 114 68 191 68 78 0 168-68 177-68 4 0 7 2 9 5l12 19c1 2.175 2 4.35 2 6.525 0 + 4.35-2 7.613-5 9.788l-19 13.05c-92 63.077-116.937 75.308-183 76.128 +-68.267.847-113-73.952-191-73.952z`,tilde2:`M344 55.266c-142 0-300.638 81.316-311.5 86.418 +-8.01 3.762-22.5 10.91-23.5 5.562L1 120c-1-2-1-3-1-4 0-5 3-9 8-10l18.4-9C160.9 + 31.9 283 0 358 0c148 0 188 122 331 122s314-97 326-97c4 0 8 2 10 7l7 21.114 +c1 2.14 1 3.21 1 4.28 0 5.347-3 9.626-7 10.696l-22.3 12.622C852.6 158.372 751 + 181.476 676 181.476c-149 0-189-126.21-332-126.21z`,tilde3:`M786 59C457 59 32 175.242 13 175.242c-6 0-10-3.457 +-11-10.37L.15 138c-1-7 3-12 10-13l19.2-6.4C378.4 40.7 634.3 0 804.3 0c337 0 + 411.8 157 746.8 157 328 0 754-112 773-112 5 0 10 3 11 9l1 14.075c1 8.066-.697 + 16.595-6.697 17.492l-21.052 7.31c-367.9 98.146-609.15 122.696-778.15 122.696 + -338 0-409-156.573-744-156.573z`,tilde4:`M786 58C457 58 32 177.487 13 177.487c-6 0-10-3.345 +-11-10.035L.15 143c-1-7 3-12 10-13l22-6.7C381.2 35 637.15 0 807.15 0c337 0 409 + 177 744 177 328 0 754-127 773-127 5 0 10 3 11 9l1 14.794c1 7.805-3 13.38-9 + 14.495l-20.7 5.574c-366.85 99.79-607.3 139.372-776.3 139.372-338 0-409 + -175.236-744-175.236z`,vec:`M377 20c0-5.333 1.833-10 5.5-14S391 0 397 0c4.667 0 8.667 1.667 12 5 +3.333 2.667 6.667 9 10 19 6.667 24.667 20.333 43.667 41 57 7.333 4.667 11 +10.667 11 18 0 6-1 10-3 12s-6.667 5-14 9c-28.667 14.667-53.667 35.667-75 63 +-1.333 1.333-3.167 3.5-5.5 6.5s-4 4.833-5 5.5c-1 .667-2.5 1.333-4.5 2s-4.333 1 +-7 1c-4.667 0-9.167-1.833-13.5-5.5S337 184 337 178c0-12.667 15.667-32.333 47-59 +H213l-171-1c-8.667-6-13-12.333-13-19 0-4.667 4.333-11.333 13-20h359 +c-16-25.333-24-45-24-59z`,widehat1:`M529 0h5l519 115c5 1 9 5 9 10 0 1-1 2-1 3l-4 22 +c-1 5-5 9-11 9h-2L532 67 19 159h-2c-5 0-9-4-11-9l-5-22c-1-6 2-12 8-13z`,widehat2:`M1181 0h2l1171 176c6 0 10 5 10 11l-2 23c-1 6-5 10 +-11 10h-1L1182 67 15 220h-1c-6 0-10-4-11-10l-2-23c-1-6 4-11 10-11z`,widehat3:`M1181 0h2l1171 236c6 0 10 5 10 11l-2 23c-1 6-5 10 +-11 10h-1L1182 67 15 280h-1c-6 0-10-4-11-10l-2-23c-1-6 4-11 10-11z`,widehat4:`M1181 0h2l1171 296c6 0 10 5 10 11l-2 23c-1 6-5 10 +-11 10h-1L1182 67 15 340h-1c-6 0-10-4-11-10l-2-23c-1-6 4-11 10-11z`,widecheck1:`M529,159h5l519,-115c5,-1,9,-5,9,-10c0,-1,-1,-2,-1,-3l-4,-22c-1, +-5,-5,-9,-11,-9h-2l-512,92l-513,-92h-2c-5,0,-9,4,-11,9l-5,22c-1,6,2,12,8,13z`,widecheck2:`M1181,220h2l1171,-176c6,0,10,-5,10,-11l-2,-23c-1,-6,-5,-10, +-11,-10h-1l-1168,153l-1167,-153h-1c-6,0,-10,4,-11,10l-2,23c-1,6,4,11,10,11z`,widecheck3:`M1181,280h2l1171,-236c6,0,10,-5,10,-11l-2,-23c-1,-6,-5,-10, +-11,-10h-1l-1168,213l-1167,-213h-1c-6,0,-10,4,-11,10l-2,23c-1,6,4,11,10,11z`,widecheck4:`M1181,340h2l1171,-296c6,0,10,-5,10,-11l-2,-23c-1,-6,-5,-10, +-11,-10h-1l-1168,273l-1167,-273h-1c-6,0,-10,4,-11,10l-2,23c-1,6,4,11,10,11z`,baraboveleftarrow:`M400000 620h-399890l3 -3c68.7 -52.7 113.7 -120 135 -202 +c4 -14.7 6 -23 6 -25c0 -7.3 -7 -11 -21 -11c-8 0 -13.2 0.8 -15.5 2.5 +c-2.3 1.7 -4.2 5.8 -5.5 12.5c-1.3 4.7 -2.7 10.3 -4 17c-12 48.7 -34.8 92 -68.5 130 +s-74.2 66.3 -121.5 85c-10 4 -16 7.7 -18 11c0 8.7 6 14.3 18 17c47.3 18.7 87.8 47 +121.5 85s56.5 81.3 68.5 130c0.7 2 1.3 5 2 9s1.2 6.7 1.5 8c0.3 1.3 1 3.3 2 6 +s2.2 4.5 3.5 5.5c1.3 1 3.3 1.8 6 2.5s6 1 10 1c14 0 21 -3.7 21 -11 +c0 -2 -2 -10.3 -6 -25c-20 -79.3 -65 -146.7 -135 -202l-3 -3h399890z +M100 620v40h399900v-40z M0 241v40h399900v-40zM0 241v40h399900v-40z`,rightarrowabovebar:`M0 241v40h399891c-47.3 35.3-84 78-110 128-16.7 32 +-27.7 63.7-33 95 0 1.3-.2 2.7-.5 4-.3 1.3-.5 2.3-.5 3 0 7.3 6.7 11 20 11 8 0 +13.2-.8 15.5-2.5 2.3-1.7 4.2-5.5 5.5-11.5 2-13.3 5.7-27 11-41 14.7-44.7 39 +-84.5 73-119.5s73.7-60.2 119-75.5c6-2 9-5.7 9-11s-3-9-9-11c-45.3-15.3-85-40.5 +-119-75.5s-58.3-74.8-73-119.5c-4.7-14-8.3-27.3-11-40-1.3-6.7-3.2-10.8-5.5 +-12.5-2.3-1.7-7.5-2.5-15.5-2.5-14 0-21 3.7-21 11 0 2 2 10.3 6 25 20.7 83.3 67 +151.7 139 205zm96 379h399894v40H0zm0 0h399904v40H0z`,baraboveshortleftharpoon:`M507,435c-4,4,-6.3,8.7,-7,14c0,5.3,0.7,9,2,11 +c1.3,2,5.3,5.3,12,10c90.7,54,156,130,196,228c3.3,10.7,6.3,16.3,9,17 +c2,0.7,5,1,9,1c0,0,5,0,5,0c10.7,0,16.7,-2,18,-6c2,-2.7,1,-9.7,-3,-21 +c-32,-87.3,-82.7,-157.7,-152,-211c0,0,-3,-3,-3,-3l399351,0l0,-40 +c-398570,0,-399437,0,-399437,0z M593 435 v40 H399500 v-40z +M0 281 v-40 H399908 v40z M0 281 v-40 H399908 v40z`,rightharpoonaboveshortbar:`M0,241 l0,40c399126,0,399993,0,399993,0 +c4.7,-4.7,7,-9.3,7,-14c0,-9.3,-3.7,-15.3,-11,-18c-92.7,-56.7,-159,-133.7,-199, +-231c-3.3,-9.3,-6,-14.7,-8,-16c-2,-1.3,-7,-2,-15,-2c-10.7,0,-16.7,2,-18,6 +c-2,2.7,-1,9.7,3,21c15.3,42,36.7,81.8,64,119.5c27.3,37.7,58,69.2,92,94.5z +M0 241 v40 H399908 v-40z M0 475 v-40 H399500 v40z M0 475 v-40 H399500 v40z`,shortbaraboveleftharpoon:`M7,435c-4,4,-6.3,8.7,-7,14c0,5.3,0.7,9,2,11 +c1.3,2,5.3,5.3,12,10c90.7,54,156,130,196,228c3.3,10.7,6.3,16.3,9,17c2,0.7,5,1,9, +1c0,0,5,0,5,0c10.7,0,16.7,-2,18,-6c2,-2.7,1,-9.7,-3,-21c-32,-87.3,-82.7,-157.7, +-152,-211c0,0,-3,-3,-3,-3l399907,0l0,-40c-399126,0,-399993,0,-399993,0z +M93 435 v40 H400000 v-40z M500 241 v40 H400000 v-40z M500 241 v40 H400000 v-40z`,shortrightharpoonabovebar:`M53,241l0,40c398570,0,399437,0,399437,0 +c4.7,-4.7,7,-9.3,7,-14c0,-9.3,-3.7,-15.3,-11,-18c-92.7,-56.7,-159,-133.7,-199, +-231c-3.3,-9.3,-6,-14.7,-8,-16c-2,-1.3,-7,-2,-15,-2c-10.7,0,-16.7,2,-18,6 +c-2,2.7,-1,9.7,3,21c15.3,42,36.7,81.8,64,119.5c27.3,37.7,58,69.2,92,94.5z +M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`},Kbe=o(function(e,r){switch(e){case"lbrack":return"M403 1759 V84 H666 V0 H319 V1759 v"+r+` v1759 h347 v-84 +H403z M403 1759 V0 H319 V1759 v`+r+" v1759 h84z";case"rbrack":return"M347 1759 V0 H0 V84 H263 V1759 v"+r+` v1759 H0 v84 H347z +M347 1759 V0 H263 V1759 v`+r+" v1759 h84z";case"vert":return"M145 15 v585 v"+r+` v585 c2.667,10,9.667,15,21,15 +c10,0,16.667,-5,20,-15 v-585 v`+-r+` v-585 c-2.667,-10,-9.667,-15,-21,-15 +c-10,0,-16.667,5,-20,15z M188 15 H145 v585 v`+r+" v585 h43z";case"doublevert":return"M145 15 v585 v"+r+` v585 c2.667,10,9.667,15,21,15 +c10,0,16.667,-5,20,-15 v-585 v`+-r+` v-585 c-2.667,-10,-9.667,-15,-21,-15 +c-10,0,-16.667,5,-20,15z M188 15 H145 v585 v`+r+` v585 h43z +M367 15 v585 v`+r+` v585 c2.667,10,9.667,15,21,15 +c10,0,16.667,-5,20,-15 v-585 v`+-r+` v-585 c-2.667,-10,-9.667,-15,-21,-15 +c-10,0,-16.667,5,-20,15z M410 15 H367 v585 v`+r+" v585 h43z";case"lfloor":return"M319 602 V0 H403 V602 v"+r+` v1715 h263 v84 H319z +MM319 602 V0 H403 V602 v`+r+" v1715 H319z";case"rfloor":return"M319 602 V0 H403 V602 v"+r+` v1799 H0 v-84 H319z +MM319 602 V0 H403 V602 v`+r+" v1715 H319z";case"lceil":return"M403 1759 V84 H666 V0 H319 V1759 v"+r+` v602 h84z +M403 1759 V0 H319 V1759 v`+r+" v602 h84z";case"rceil":return"M347 1759 V0 H0 V84 H263 V1759 v"+r+` v602 h84z +M347 1759 V0 h-84 V1759 v`+r+" v602 h84z";case"lparen":return`M863,9c0,-2,-2,-5,-6,-9c0,0,-17,0,-17,0c-12.7,0,-19.3,0.3,-20,1 +c-5.3,5.3,-10.3,11,-15,17c-242.7,294.7,-395.3,682,-458,1162c-21.3,163.3,-33.3,349, +-36,557 l0,`+(r+84)+`c0.2,6,0,26,0,60c2,159.3,10,310.7,24,454c53.3,528,210, +949.7,470,1265c4.7,6,9.7,11.7,15,17c0.7,0.7,7,1,19,1c0,0,18,0,18,0c4,-4,6,-7,6,-9 +c0,-2.7,-3.3,-8.7,-10,-18c-135.3,-192.7,-235.5,-414.3,-300.5,-665c-65,-250.7,-102.5, +-544.7,-112.5,-882c-2,-104,-3,-167,-3,-189 +l0,-`+(r+92)+`c0,-162.7,5.7,-314,17,-454c20.7,-272,63.7,-513,129,-723c65.3, +-210,155.3,-396.3,270,-559c6.7,-9.3,10,-15.3,10,-18z`;case"rparen":return`M76,0c-16.7,0,-25,3,-25,9c0,2,2,6.3,6,13c21.3,28.7,42.3,60.3, +63,95c96.7,156.7,172.8,332.5,228.5,527.5c55.7,195,92.8,416.5,111.5,664.5 +c11.3,139.3,17,290.7,17,454c0,28,1.7,43,3.3,45l0,`+(r+9)+` +c-3,4,-3.3,16.7,-3.3,38c0,162,-5.7,313.7,-17,455c-18.7,248,-55.8,469.3,-111.5,664 +c-55.7,194.7,-131.8,370.3,-228.5,527c-20.7,34.7,-41.7,66.3,-63,95c-2,3.3,-4,7,-6,11 +c0,7.3,5.7,11,17,11c0,0,11,0,11,0c9.3,0,14.3,-0.3,15,-1c5.3,-5.3,10.3,-11,15,-17 +c242.7,-294.7,395.3,-681.7,458,-1161c21.3,-164.7,33.3,-350.7,36,-558 +l0,-`+(r+144)+`c-2,-159.3,-10,-310.7,-24,-454c-53.3,-528,-210,-949.7, +-470,-1265c-4.7,-6,-9.7,-11.7,-15,-17c-0.7,-0.7,-6.7,-1,-18,-1z`;default:throw new Error("Unknown stretchy delimiter.")}},"tallDelim"),Yf=class{static{o(this,"DocumentFragment")}constructor(e){this.children=void 0,this.classes=void 0,this.height=void 0,this.depth=void 0,this.maxFontSize=void 0,this.style=void 0,this.children=e,this.classes=[],this.height=0,this.depth=0,this.maxFontSize=0,this.style={}}hasClass(e){return Jt.contains(this.classes,e)}toNode(){for(var e=document.createDocumentFragment(),r=0;r<this.children.length;r++)e.appendChild(this.children[r].toNode());return e}toMarkup(){for(var e="",r=0;r<this.children.length;r++)e+=this.children[r].toMarkup();return e}toText(){var e=o(r=>r.toText(),"toText");return this.children.map(e).join("")}},Zl={"AMS-Regular":{32:[0,0,0,0,.25],65:[0,.68889,0,0,.72222],66:[0,.68889,0,0,.66667],67:[0,.68889,0,0,.72222],68:[0,.68889,0,0,.72222],69:[0,.68889,0,0,.66667],70:[0,.68889,0,0,.61111],71:[0,.68889,0,0,.77778],72:[0,.68889,0,0,.77778],73:[0,.68889,0,0,.38889],74:[.16667,.68889,0,0,.5],75:[0,.68889,0,0,.77778],76:[0,.68889,0,0,.66667],77:[0,.68889,0,0,.94445],78:[0,.68889,0,0,.72222],79:[.16667,.68889,0,0,.77778],80:[0,.68889,0,0,.61111],81:[.16667,.68889,0,0,.77778],82:[0,.68889,0,0,.72222],83:[0,.68889,0,0,.55556],84:[0,.68889,0,0,.66667],85:[0,.68889,0,0,.72222],86:[0,.68889,0,0,.72222],87:[0,.68889,0,0,1],88:[0,.68889,0,0,.72222],89:[0,.68889,0,0,.72222],90:[0,.68889,0,0,.66667],107:[0,.68889,0,0,.55556],160:[0,0,0,0,.25],165:[0,.675,.025,0,.75],174:[.15559,.69224,0,0,.94666],240:[0,.68889,0,0,.55556],295:[0,.68889,0,0,.54028],710:[0,.825,0,0,2.33334],732:[0,.9,0,0,2.33334],770:[0,.825,0,0,2.33334],771:[0,.9,0,0,2.33334],989:[.08167,.58167,0,0,.77778],1008:[0,.43056,.04028,0,.66667],8245:[0,.54986,0,0,.275],8463:[0,.68889,0,0,.54028],8487:[0,.68889,0,0,.72222],8498:[0,.68889,0,0,.55556],8502:[0,.68889,0,0,.66667],8503:[0,.68889,0,0,.44445],8504:[0,.68889,0,0,.66667],8513:[0,.68889,0,0,.63889],8592:[-.03598,.46402,0,0,.5],8594:[-.03598,.46402,0,0,.5],8602:[-.13313,.36687,0,0,1],8603:[-.13313,.36687,0,0,1],8606:[.01354,.52239,0,0,1],8608:[.01354,.52239,0,0,1],8610:[.01354,.52239,0,0,1.11111],8611:[.01354,.52239,0,0,1.11111],8619:[0,.54986,0,0,1],8620:[0,.54986,0,0,1],8621:[-.13313,.37788,0,0,1.38889],8622:[-.13313,.36687,0,0,1],8624:[0,.69224,0,0,.5],8625:[0,.69224,0,0,.5],8630:[0,.43056,0,0,1],8631:[0,.43056,0,0,1],8634:[.08198,.58198,0,0,.77778],8635:[.08198,.58198,0,0,.77778],8638:[.19444,.69224,0,0,.41667],8639:[.19444,.69224,0,0,.41667],8642:[.19444,.69224,0,0,.41667],8643:[.19444,.69224,0,0,.41667],8644:[.1808,.675,0,0,1],8646:[.1808,.675,0,0,1],8647:[.1808,.675,0,0,1],8648:[.19444,.69224,0,0,.83334],8649:[.1808,.675,0,0,1],8650:[.19444,.69224,0,0,.83334],8651:[.01354,.52239,0,0,1],8652:[.01354,.52239,0,0,1],8653:[-.13313,.36687,0,0,1],8654:[-.13313,.36687,0,0,1],8655:[-.13313,.36687,0,0,1],8666:[.13667,.63667,0,0,1],8667:[.13667,.63667,0,0,1],8669:[-.13313,.37788,0,0,1],8672:[-.064,.437,0,0,1.334],8674:[-.064,.437,0,0,1.334],8705:[0,.825,0,0,.5],8708:[0,.68889,0,0,.55556],8709:[.08167,.58167,0,0,.77778],8717:[0,.43056,0,0,.42917],8722:[-.03598,.46402,0,0,.5],8724:[.08198,.69224,0,0,.77778],8726:[.08167,.58167,0,0,.77778],8733:[0,.69224,0,0,.77778],8736:[0,.69224,0,0,.72222],8737:[0,.69224,0,0,.72222],8738:[.03517,.52239,0,0,.72222],8739:[.08167,.58167,0,0,.22222],8740:[.25142,.74111,0,0,.27778],8741:[.08167,.58167,0,0,.38889],8742:[.25142,.74111,0,0,.5],8756:[0,.69224,0,0,.66667],8757:[0,.69224,0,0,.66667],8764:[-.13313,.36687,0,0,.77778],8765:[-.13313,.37788,0,0,.77778],8769:[-.13313,.36687,0,0,.77778],8770:[-.03625,.46375,0,0,.77778],8774:[.30274,.79383,0,0,.77778],8776:[-.01688,.48312,0,0,.77778],8778:[.08167,.58167,0,0,.77778],8782:[.06062,.54986,0,0,.77778],8783:[.06062,.54986,0,0,.77778],8785:[.08198,.58198,0,0,.77778],8786:[.08198,.58198,0,0,.77778],8787:[.08198,.58198,0,0,.77778],8790:[0,.69224,0,0,.77778],8791:[.22958,.72958,0,0,.77778],8796:[.08198,.91667,0,0,.77778],8806:[.25583,.75583,0,0,.77778],8807:[.25583,.75583,0,0,.77778],8808:[.25142,.75726,0,0,.77778],8809:[.25142,.75726,0,0,.77778],8812:[.25583,.75583,0,0,.5],8814:[.20576,.70576,0,0,.77778],8815:[.20576,.70576,0,0,.77778],8816:[.30274,.79383,0,0,.77778],8817:[.30274,.79383,0,0,.77778],8818:[.22958,.72958,0,0,.77778],8819:[.22958,.72958,0,0,.77778],8822:[.1808,.675,0,0,.77778],8823:[.1808,.675,0,0,.77778],8828:[.13667,.63667,0,0,.77778],8829:[.13667,.63667,0,0,.77778],8830:[.22958,.72958,0,0,.77778],8831:[.22958,.72958,0,0,.77778],8832:[.20576,.70576,0,0,.77778],8833:[.20576,.70576,0,0,.77778],8840:[.30274,.79383,0,0,.77778],8841:[.30274,.79383,0,0,.77778],8842:[.13597,.63597,0,0,.77778],8843:[.13597,.63597,0,0,.77778],8847:[.03517,.54986,0,0,.77778],8848:[.03517,.54986,0,0,.77778],8858:[.08198,.58198,0,0,.77778],8859:[.08198,.58198,0,0,.77778],8861:[.08198,.58198,0,0,.77778],8862:[0,.675,0,0,.77778],8863:[0,.675,0,0,.77778],8864:[0,.675,0,0,.77778],8865:[0,.675,0,0,.77778],8872:[0,.69224,0,0,.61111],8873:[0,.69224,0,0,.72222],8874:[0,.69224,0,0,.88889],8876:[0,.68889,0,0,.61111],8877:[0,.68889,0,0,.61111],8878:[0,.68889,0,0,.72222],8879:[0,.68889,0,0,.72222],8882:[.03517,.54986,0,0,.77778],8883:[.03517,.54986,0,0,.77778],8884:[.13667,.63667,0,0,.77778],8885:[.13667,.63667,0,0,.77778],8888:[0,.54986,0,0,1.11111],8890:[.19444,.43056,0,0,.55556],8891:[.19444,.69224,0,0,.61111],8892:[.19444,.69224,0,0,.61111],8901:[0,.54986,0,0,.27778],8903:[.08167,.58167,0,0,.77778],8905:[.08167,.58167,0,0,.77778],8906:[.08167,.58167,0,0,.77778],8907:[0,.69224,0,0,.77778],8908:[0,.69224,0,0,.77778],8909:[-.03598,.46402,0,0,.77778],8910:[0,.54986,0,0,.76042],8911:[0,.54986,0,0,.76042],8912:[.03517,.54986,0,0,.77778],8913:[.03517,.54986,0,0,.77778],8914:[0,.54986,0,0,.66667],8915:[0,.54986,0,0,.66667],8916:[0,.69224,0,0,.66667],8918:[.0391,.5391,0,0,.77778],8919:[.0391,.5391,0,0,.77778],8920:[.03517,.54986,0,0,1.33334],8921:[.03517,.54986,0,0,1.33334],8922:[.38569,.88569,0,0,.77778],8923:[.38569,.88569,0,0,.77778],8926:[.13667,.63667,0,0,.77778],8927:[.13667,.63667,0,0,.77778],8928:[.30274,.79383,0,0,.77778],8929:[.30274,.79383,0,0,.77778],8934:[.23222,.74111,0,0,.77778],8935:[.23222,.74111,0,0,.77778],8936:[.23222,.74111,0,0,.77778],8937:[.23222,.74111,0,0,.77778],8938:[.20576,.70576,0,0,.77778],8939:[.20576,.70576,0,0,.77778],8940:[.30274,.79383,0,0,.77778],8941:[.30274,.79383,0,0,.77778],8994:[.19444,.69224,0,0,.77778],8995:[.19444,.69224,0,0,.77778],9416:[.15559,.69224,0,0,.90222],9484:[0,.69224,0,0,.5],9488:[0,.69224,0,0,.5],9492:[0,.37788,0,0,.5],9496:[0,.37788,0,0,.5],9585:[.19444,.68889,0,0,.88889],9586:[.19444,.74111,0,0,.88889],9632:[0,.675,0,0,.77778],9633:[0,.675,0,0,.77778],9650:[0,.54986,0,0,.72222],9651:[0,.54986,0,0,.72222],9654:[.03517,.54986,0,0,.77778],9660:[0,.54986,0,0,.72222],9661:[0,.54986,0,0,.72222],9664:[.03517,.54986,0,0,.77778],9674:[.11111,.69224,0,0,.66667],9733:[.19444,.69224,0,0,.94445],10003:[0,.69224,0,0,.83334],10016:[0,.69224,0,0,.83334],10731:[.11111,.69224,0,0,.66667],10846:[.19444,.75583,0,0,.61111],10877:[.13667,.63667,0,0,.77778],10878:[.13667,.63667,0,0,.77778],10885:[.25583,.75583,0,0,.77778],10886:[.25583,.75583,0,0,.77778],10887:[.13597,.63597,0,0,.77778],10888:[.13597,.63597,0,0,.77778],10889:[.26167,.75726,0,0,.77778],10890:[.26167,.75726,0,0,.77778],10891:[.48256,.98256,0,0,.77778],10892:[.48256,.98256,0,0,.77778],10901:[.13667,.63667,0,0,.77778],10902:[.13667,.63667,0,0,.77778],10933:[.25142,.75726,0,0,.77778],10934:[.25142,.75726,0,0,.77778],10935:[.26167,.75726,0,0,.77778],10936:[.26167,.75726,0,0,.77778],10937:[.26167,.75726,0,0,.77778],10938:[.26167,.75726,0,0,.77778],10949:[.25583,.75583,0,0,.77778],10950:[.25583,.75583,0,0,.77778],10955:[.28481,.79383,0,0,.77778],10956:[.28481,.79383,0,0,.77778],57350:[.08167,.58167,0,0,.22222],57351:[.08167,.58167,0,0,.38889],57352:[.08167,.58167,0,0,.77778],57353:[0,.43056,.04028,0,.66667],57356:[.25142,.75726,0,0,.77778],57357:[.25142,.75726,0,0,.77778],57358:[.41951,.91951,0,0,.77778],57359:[.30274,.79383,0,0,.77778],57360:[.30274,.79383,0,0,.77778],57361:[.41951,.91951,0,0,.77778],57366:[.25142,.75726,0,0,.77778],57367:[.25142,.75726,0,0,.77778],57368:[.25142,.75726,0,0,.77778],57369:[.25142,.75726,0,0,.77778],57370:[.13597,.63597,0,0,.77778],57371:[.13597,.63597,0,0,.77778]},"Caligraphic-Regular":{32:[0,0,0,0,.25],65:[0,.68333,0,.19445,.79847],66:[0,.68333,.03041,.13889,.65681],67:[0,.68333,.05834,.13889,.52653],68:[0,.68333,.02778,.08334,.77139],69:[0,.68333,.08944,.11111,.52778],70:[0,.68333,.09931,.11111,.71875],71:[.09722,.68333,.0593,.11111,.59487],72:[0,.68333,.00965,.11111,.84452],73:[0,.68333,.07382,0,.54452],74:[.09722,.68333,.18472,.16667,.67778],75:[0,.68333,.01445,.05556,.76195],76:[0,.68333,0,.13889,.68972],77:[0,.68333,0,.13889,1.2009],78:[0,.68333,.14736,.08334,.82049],79:[0,.68333,.02778,.11111,.79611],80:[0,.68333,.08222,.08334,.69556],81:[.09722,.68333,0,.11111,.81667],82:[0,.68333,0,.08334,.8475],83:[0,.68333,.075,.13889,.60556],84:[0,.68333,.25417,0,.54464],85:[0,.68333,.09931,.08334,.62583],86:[0,.68333,.08222,0,.61278],87:[0,.68333,.08222,.08334,.98778],88:[0,.68333,.14643,.13889,.7133],89:[.09722,.68333,.08222,.08334,.66834],90:[0,.68333,.07944,.13889,.72473],160:[0,0,0,0,.25]},"Fraktur-Regular":{32:[0,0,0,0,.25],33:[0,.69141,0,0,.29574],34:[0,.69141,0,0,.21471],38:[0,.69141,0,0,.73786],39:[0,.69141,0,0,.21201],40:[.24982,.74947,0,0,.38865],41:[.24982,.74947,0,0,.38865],42:[0,.62119,0,0,.27764],43:[.08319,.58283,0,0,.75623],44:[0,.10803,0,0,.27764],45:[.08319,.58283,0,0,.75623],46:[0,.10803,0,0,.27764],47:[.24982,.74947,0,0,.50181],48:[0,.47534,0,0,.50181],49:[0,.47534,0,0,.50181],50:[0,.47534,0,0,.50181],51:[.18906,.47534,0,0,.50181],52:[.18906,.47534,0,0,.50181],53:[.18906,.47534,0,0,.50181],54:[0,.69141,0,0,.50181],55:[.18906,.47534,0,0,.50181],56:[0,.69141,0,0,.50181],57:[.18906,.47534,0,0,.50181],58:[0,.47534,0,0,.21606],59:[.12604,.47534,0,0,.21606],61:[-.13099,.36866,0,0,.75623],63:[0,.69141,0,0,.36245],65:[0,.69141,0,0,.7176],66:[0,.69141,0,0,.88397],67:[0,.69141,0,0,.61254],68:[0,.69141,0,0,.83158],69:[0,.69141,0,0,.66278],70:[.12604,.69141,0,0,.61119],71:[0,.69141,0,0,.78539],72:[.06302,.69141,0,0,.7203],73:[0,.69141,0,0,.55448],74:[.12604,.69141,0,0,.55231],75:[0,.69141,0,0,.66845],76:[0,.69141,0,0,.66602],77:[0,.69141,0,0,1.04953],78:[0,.69141,0,0,.83212],79:[0,.69141,0,0,.82699],80:[.18906,.69141,0,0,.82753],81:[.03781,.69141,0,0,.82699],82:[0,.69141,0,0,.82807],83:[0,.69141,0,0,.82861],84:[0,.69141,0,0,.66899],85:[0,.69141,0,0,.64576],86:[0,.69141,0,0,.83131],87:[0,.69141,0,0,1.04602],88:[0,.69141,0,0,.71922],89:[.18906,.69141,0,0,.83293],90:[.12604,.69141,0,0,.60201],91:[.24982,.74947,0,0,.27764],93:[.24982,.74947,0,0,.27764],94:[0,.69141,0,0,.49965],97:[0,.47534,0,0,.50046],98:[0,.69141,0,0,.51315],99:[0,.47534,0,0,.38946],100:[0,.62119,0,0,.49857],101:[0,.47534,0,0,.40053],102:[.18906,.69141,0,0,.32626],103:[.18906,.47534,0,0,.5037],104:[.18906,.69141,0,0,.52126],105:[0,.69141,0,0,.27899],106:[0,.69141,0,0,.28088],107:[0,.69141,0,0,.38946],108:[0,.69141,0,0,.27953],109:[0,.47534,0,0,.76676],110:[0,.47534,0,0,.52666],111:[0,.47534,0,0,.48885],112:[.18906,.52396,0,0,.50046],113:[.18906,.47534,0,0,.48912],114:[0,.47534,0,0,.38919],115:[0,.47534,0,0,.44266],116:[0,.62119,0,0,.33301],117:[0,.47534,0,0,.5172],118:[0,.52396,0,0,.5118],119:[0,.52396,0,0,.77351],120:[.18906,.47534,0,0,.38865],121:[.18906,.47534,0,0,.49884],122:[.18906,.47534,0,0,.39054],160:[0,0,0,0,.25],8216:[0,.69141,0,0,.21471],8217:[0,.69141,0,0,.21471],58112:[0,.62119,0,0,.49749],58113:[0,.62119,0,0,.4983],58114:[.18906,.69141,0,0,.33328],58115:[.18906,.69141,0,0,.32923],58116:[.18906,.47534,0,0,.50343],58117:[0,.69141,0,0,.33301],58118:[0,.62119,0,0,.33409],58119:[0,.47534,0,0,.50073]},"Main-Bold":{32:[0,0,0,0,.25],33:[0,.69444,0,0,.35],34:[0,.69444,0,0,.60278],35:[.19444,.69444,0,0,.95833],36:[.05556,.75,0,0,.575],37:[.05556,.75,0,0,.95833],38:[0,.69444,0,0,.89444],39:[0,.69444,0,0,.31944],40:[.25,.75,0,0,.44722],41:[.25,.75,0,0,.44722],42:[0,.75,0,0,.575],43:[.13333,.63333,0,0,.89444],44:[.19444,.15556,0,0,.31944],45:[0,.44444,0,0,.38333],46:[0,.15556,0,0,.31944],47:[.25,.75,0,0,.575],48:[0,.64444,0,0,.575],49:[0,.64444,0,0,.575],50:[0,.64444,0,0,.575],51:[0,.64444,0,0,.575],52:[0,.64444,0,0,.575],53:[0,.64444,0,0,.575],54:[0,.64444,0,0,.575],55:[0,.64444,0,0,.575],56:[0,.64444,0,0,.575],57:[0,.64444,0,0,.575],58:[0,.44444,0,0,.31944],59:[.19444,.44444,0,0,.31944],60:[.08556,.58556,0,0,.89444],61:[-.10889,.39111,0,0,.89444],62:[.08556,.58556,0,0,.89444],63:[0,.69444,0,0,.54305],64:[0,.69444,0,0,.89444],65:[0,.68611,0,0,.86944],66:[0,.68611,0,0,.81805],67:[0,.68611,0,0,.83055],68:[0,.68611,0,0,.88194],69:[0,.68611,0,0,.75555],70:[0,.68611,0,0,.72361],71:[0,.68611,0,0,.90416],72:[0,.68611,0,0,.9],73:[0,.68611,0,0,.43611],74:[0,.68611,0,0,.59444],75:[0,.68611,0,0,.90138],76:[0,.68611,0,0,.69166],77:[0,.68611,0,0,1.09166],78:[0,.68611,0,0,.9],79:[0,.68611,0,0,.86388],80:[0,.68611,0,0,.78611],81:[.19444,.68611,0,0,.86388],82:[0,.68611,0,0,.8625],83:[0,.68611,0,0,.63889],84:[0,.68611,0,0,.8],85:[0,.68611,0,0,.88472],86:[0,.68611,.01597,0,.86944],87:[0,.68611,.01597,0,1.18888],88:[0,.68611,0,0,.86944],89:[0,.68611,.02875,0,.86944],90:[0,.68611,0,0,.70277],91:[.25,.75,0,0,.31944],92:[.25,.75,0,0,.575],93:[.25,.75,0,0,.31944],94:[0,.69444,0,0,.575],95:[.31,.13444,.03194,0,.575],97:[0,.44444,0,0,.55902],98:[0,.69444,0,0,.63889],99:[0,.44444,0,0,.51111],100:[0,.69444,0,0,.63889],101:[0,.44444,0,0,.52708],102:[0,.69444,.10903,0,.35139],103:[.19444,.44444,.01597,0,.575],104:[0,.69444,0,0,.63889],105:[0,.69444,0,0,.31944],106:[.19444,.69444,0,0,.35139],107:[0,.69444,0,0,.60694],108:[0,.69444,0,0,.31944],109:[0,.44444,0,0,.95833],110:[0,.44444,0,0,.63889],111:[0,.44444,0,0,.575],112:[.19444,.44444,0,0,.63889],113:[.19444,.44444,0,0,.60694],114:[0,.44444,0,0,.47361],115:[0,.44444,0,0,.45361],116:[0,.63492,0,0,.44722],117:[0,.44444,0,0,.63889],118:[0,.44444,.01597,0,.60694],119:[0,.44444,.01597,0,.83055],120:[0,.44444,0,0,.60694],121:[.19444,.44444,.01597,0,.60694],122:[0,.44444,0,0,.51111],123:[.25,.75,0,0,.575],124:[.25,.75,0,0,.31944],125:[.25,.75,0,0,.575],126:[.35,.34444,0,0,.575],160:[0,0,0,0,.25],163:[0,.69444,0,0,.86853],168:[0,.69444,0,0,.575],172:[0,.44444,0,0,.76666],176:[0,.69444,0,0,.86944],177:[.13333,.63333,0,0,.89444],184:[.17014,0,0,0,.51111],198:[0,.68611,0,0,1.04166],215:[.13333,.63333,0,0,.89444],216:[.04861,.73472,0,0,.89444],223:[0,.69444,0,0,.59722],230:[0,.44444,0,0,.83055],247:[.13333,.63333,0,0,.89444],248:[.09722,.54167,0,0,.575],305:[0,.44444,0,0,.31944],338:[0,.68611,0,0,1.16944],339:[0,.44444,0,0,.89444],567:[.19444,.44444,0,0,.35139],710:[0,.69444,0,0,.575],711:[0,.63194,0,0,.575],713:[0,.59611,0,0,.575],714:[0,.69444,0,0,.575],715:[0,.69444,0,0,.575],728:[0,.69444,0,0,.575],729:[0,.69444,0,0,.31944],730:[0,.69444,0,0,.86944],732:[0,.69444,0,0,.575],733:[0,.69444,0,0,.575],915:[0,.68611,0,0,.69166],916:[0,.68611,0,0,.95833],920:[0,.68611,0,0,.89444],923:[0,.68611,0,0,.80555],926:[0,.68611,0,0,.76666],928:[0,.68611,0,0,.9],931:[0,.68611,0,0,.83055],933:[0,.68611,0,0,.89444],934:[0,.68611,0,0,.83055],936:[0,.68611,0,0,.89444],937:[0,.68611,0,0,.83055],8211:[0,.44444,.03194,0,.575],8212:[0,.44444,.03194,0,1.14999],8216:[0,.69444,0,0,.31944],8217:[0,.69444,0,0,.31944],8220:[0,.69444,0,0,.60278],8221:[0,.69444,0,0,.60278],8224:[.19444,.69444,0,0,.51111],8225:[.19444,.69444,0,0,.51111],8242:[0,.55556,0,0,.34444],8407:[0,.72444,.15486,0,.575],8463:[0,.69444,0,0,.66759],8465:[0,.69444,0,0,.83055],8467:[0,.69444,0,0,.47361],8472:[.19444,.44444,0,0,.74027],8476:[0,.69444,0,0,.83055],8501:[0,.69444,0,0,.70277],8592:[-.10889,.39111,0,0,1.14999],8593:[.19444,.69444,0,0,.575],8594:[-.10889,.39111,0,0,1.14999],8595:[.19444,.69444,0,0,.575],8596:[-.10889,.39111,0,0,1.14999],8597:[.25,.75,0,0,.575],8598:[.19444,.69444,0,0,1.14999],8599:[.19444,.69444,0,0,1.14999],8600:[.19444,.69444,0,0,1.14999],8601:[.19444,.69444,0,0,1.14999],8636:[-.10889,.39111,0,0,1.14999],8637:[-.10889,.39111,0,0,1.14999],8640:[-.10889,.39111,0,0,1.14999],8641:[-.10889,.39111,0,0,1.14999],8656:[-.10889,.39111,0,0,1.14999],8657:[.19444,.69444,0,0,.70277],8658:[-.10889,.39111,0,0,1.14999],8659:[.19444,.69444,0,0,.70277],8660:[-.10889,.39111,0,0,1.14999],8661:[.25,.75,0,0,.70277],8704:[0,.69444,0,0,.63889],8706:[0,.69444,.06389,0,.62847],8707:[0,.69444,0,0,.63889],8709:[.05556,.75,0,0,.575],8711:[0,.68611,0,0,.95833],8712:[.08556,.58556,0,0,.76666],8715:[.08556,.58556,0,0,.76666],8722:[.13333,.63333,0,0,.89444],8723:[.13333,.63333,0,0,.89444],8725:[.25,.75,0,0,.575],8726:[.25,.75,0,0,.575],8727:[-.02778,.47222,0,0,.575],8728:[-.02639,.47361,0,0,.575],8729:[-.02639,.47361,0,0,.575],8730:[.18,.82,0,0,.95833],8733:[0,.44444,0,0,.89444],8734:[0,.44444,0,0,1.14999],8736:[0,.69224,0,0,.72222],8739:[.25,.75,0,0,.31944],8741:[.25,.75,0,0,.575],8743:[0,.55556,0,0,.76666],8744:[0,.55556,0,0,.76666],8745:[0,.55556,0,0,.76666],8746:[0,.55556,0,0,.76666],8747:[.19444,.69444,.12778,0,.56875],8764:[-.10889,.39111,0,0,.89444],8768:[.19444,.69444,0,0,.31944],8771:[.00222,.50222,0,0,.89444],8773:[.027,.638,0,0,.894],8776:[.02444,.52444,0,0,.89444],8781:[.00222,.50222,0,0,.89444],8801:[.00222,.50222,0,0,.89444],8804:[.19667,.69667,0,0,.89444],8805:[.19667,.69667,0,0,.89444],8810:[.08556,.58556,0,0,1.14999],8811:[.08556,.58556,0,0,1.14999],8826:[.08556,.58556,0,0,.89444],8827:[.08556,.58556,0,0,.89444],8834:[.08556,.58556,0,0,.89444],8835:[.08556,.58556,0,0,.89444],8838:[.19667,.69667,0,0,.89444],8839:[.19667,.69667,0,0,.89444],8846:[0,.55556,0,0,.76666],8849:[.19667,.69667,0,0,.89444],8850:[.19667,.69667,0,0,.89444],8851:[0,.55556,0,0,.76666],8852:[0,.55556,0,0,.76666],8853:[.13333,.63333,0,0,.89444],8854:[.13333,.63333,0,0,.89444],8855:[.13333,.63333,0,0,.89444],8856:[.13333,.63333,0,0,.89444],8857:[.13333,.63333,0,0,.89444],8866:[0,.69444,0,0,.70277],8867:[0,.69444,0,0,.70277],8868:[0,.69444,0,0,.89444],8869:[0,.69444,0,0,.89444],8900:[-.02639,.47361,0,0,.575],8901:[-.02639,.47361,0,0,.31944],8902:[-.02778,.47222,0,0,.575],8968:[.25,.75,0,0,.51111],8969:[.25,.75,0,0,.51111],8970:[.25,.75,0,0,.51111],8971:[.25,.75,0,0,.51111],8994:[-.13889,.36111,0,0,1.14999],8995:[-.13889,.36111,0,0,1.14999],9651:[.19444,.69444,0,0,1.02222],9657:[-.02778,.47222,0,0,.575],9661:[.19444,.69444,0,0,1.02222],9667:[-.02778,.47222,0,0,.575],9711:[.19444,.69444,0,0,1.14999],9824:[.12963,.69444,0,0,.89444],9825:[.12963,.69444,0,0,.89444],9826:[.12963,.69444,0,0,.89444],9827:[.12963,.69444,0,0,.89444],9837:[0,.75,0,0,.44722],9838:[.19444,.69444,0,0,.44722],9839:[.19444,.69444,0,0,.44722],10216:[.25,.75,0,0,.44722],10217:[.25,.75,0,0,.44722],10815:[0,.68611,0,0,.9],10927:[.19667,.69667,0,0,.89444],10928:[.19667,.69667,0,0,.89444],57376:[.19444,.69444,0,0,0]},"Main-BoldItalic":{32:[0,0,0,0,.25],33:[0,.69444,.11417,0,.38611],34:[0,.69444,.07939,0,.62055],35:[.19444,.69444,.06833,0,.94444],37:[.05556,.75,.12861,0,.94444],38:[0,.69444,.08528,0,.88555],39:[0,.69444,.12945,0,.35555],40:[.25,.75,.15806,0,.47333],41:[.25,.75,.03306,0,.47333],42:[0,.75,.14333,0,.59111],43:[.10333,.60333,.03306,0,.88555],44:[.19444,.14722,0,0,.35555],45:[0,.44444,.02611,0,.41444],46:[0,.14722,0,0,.35555],47:[.25,.75,.15806,0,.59111],48:[0,.64444,.13167,0,.59111],49:[0,.64444,.13167,0,.59111],50:[0,.64444,.13167,0,.59111],51:[0,.64444,.13167,0,.59111],52:[.19444,.64444,.13167,0,.59111],53:[0,.64444,.13167,0,.59111],54:[0,.64444,.13167,0,.59111],55:[.19444,.64444,.13167,0,.59111],56:[0,.64444,.13167,0,.59111],57:[0,.64444,.13167,0,.59111],58:[0,.44444,.06695,0,.35555],59:[.19444,.44444,.06695,0,.35555],61:[-.10889,.39111,.06833,0,.88555],63:[0,.69444,.11472,0,.59111],64:[0,.69444,.09208,0,.88555],65:[0,.68611,0,0,.86555],66:[0,.68611,.0992,0,.81666],67:[0,.68611,.14208,0,.82666],68:[0,.68611,.09062,0,.87555],69:[0,.68611,.11431,0,.75666],70:[0,.68611,.12903,0,.72722],71:[0,.68611,.07347,0,.89527],72:[0,.68611,.17208,0,.8961],73:[0,.68611,.15681,0,.47166],74:[0,.68611,.145,0,.61055],75:[0,.68611,.14208,0,.89499],76:[0,.68611,0,0,.69777],77:[0,.68611,.17208,0,1.07277],78:[0,.68611,.17208,0,.8961],79:[0,.68611,.09062,0,.85499],80:[0,.68611,.0992,0,.78721],81:[.19444,.68611,.09062,0,.85499],82:[0,.68611,.02559,0,.85944],83:[0,.68611,.11264,0,.64999],84:[0,.68611,.12903,0,.7961],85:[0,.68611,.17208,0,.88083],86:[0,.68611,.18625,0,.86555],87:[0,.68611,.18625,0,1.15999],88:[0,.68611,.15681,0,.86555],89:[0,.68611,.19803,0,.86555],90:[0,.68611,.14208,0,.70888],91:[.25,.75,.1875,0,.35611],93:[.25,.75,.09972,0,.35611],94:[0,.69444,.06709,0,.59111],95:[.31,.13444,.09811,0,.59111],97:[0,.44444,.09426,0,.59111],98:[0,.69444,.07861,0,.53222],99:[0,.44444,.05222,0,.53222],100:[0,.69444,.10861,0,.59111],101:[0,.44444,.085,0,.53222],102:[.19444,.69444,.21778,0,.4],103:[.19444,.44444,.105,0,.53222],104:[0,.69444,.09426,0,.59111],105:[0,.69326,.11387,0,.35555],106:[.19444,.69326,.1672,0,.35555],107:[0,.69444,.11111,0,.53222],108:[0,.69444,.10861,0,.29666],109:[0,.44444,.09426,0,.94444],110:[0,.44444,.09426,0,.64999],111:[0,.44444,.07861,0,.59111],112:[.19444,.44444,.07861,0,.59111],113:[.19444,.44444,.105,0,.53222],114:[0,.44444,.11111,0,.50167],115:[0,.44444,.08167,0,.48694],116:[0,.63492,.09639,0,.385],117:[0,.44444,.09426,0,.62055],118:[0,.44444,.11111,0,.53222],119:[0,.44444,.11111,0,.76777],120:[0,.44444,.12583,0,.56055],121:[.19444,.44444,.105,0,.56166],122:[0,.44444,.13889,0,.49055],126:[.35,.34444,.11472,0,.59111],160:[0,0,0,0,.25],168:[0,.69444,.11473,0,.59111],176:[0,.69444,0,0,.94888],184:[.17014,0,0,0,.53222],198:[0,.68611,.11431,0,1.02277],216:[.04861,.73472,.09062,0,.88555],223:[.19444,.69444,.09736,0,.665],230:[0,.44444,.085,0,.82666],248:[.09722,.54167,.09458,0,.59111],305:[0,.44444,.09426,0,.35555],338:[0,.68611,.11431,0,1.14054],339:[0,.44444,.085,0,.82666],567:[.19444,.44444,.04611,0,.385],710:[0,.69444,.06709,0,.59111],711:[0,.63194,.08271,0,.59111],713:[0,.59444,.10444,0,.59111],714:[0,.69444,.08528,0,.59111],715:[0,.69444,0,0,.59111],728:[0,.69444,.10333,0,.59111],729:[0,.69444,.12945,0,.35555],730:[0,.69444,0,0,.94888],732:[0,.69444,.11472,0,.59111],733:[0,.69444,.11472,0,.59111],915:[0,.68611,.12903,0,.69777],916:[0,.68611,0,0,.94444],920:[0,.68611,.09062,0,.88555],923:[0,.68611,0,0,.80666],926:[0,.68611,.15092,0,.76777],928:[0,.68611,.17208,0,.8961],931:[0,.68611,.11431,0,.82666],933:[0,.68611,.10778,0,.88555],934:[0,.68611,.05632,0,.82666],936:[0,.68611,.10778,0,.88555],937:[0,.68611,.0992,0,.82666],8211:[0,.44444,.09811,0,.59111],8212:[0,.44444,.09811,0,1.18221],8216:[0,.69444,.12945,0,.35555],8217:[0,.69444,.12945,0,.35555],8220:[0,.69444,.16772,0,.62055],8221:[0,.69444,.07939,0,.62055]},"Main-Italic":{32:[0,0,0,0,.25],33:[0,.69444,.12417,0,.30667],34:[0,.69444,.06961,0,.51444],35:[.19444,.69444,.06616,0,.81777],37:[.05556,.75,.13639,0,.81777],38:[0,.69444,.09694,0,.76666],39:[0,.69444,.12417,0,.30667],40:[.25,.75,.16194,0,.40889],41:[.25,.75,.03694,0,.40889],42:[0,.75,.14917,0,.51111],43:[.05667,.56167,.03694,0,.76666],44:[.19444,.10556,0,0,.30667],45:[0,.43056,.02826,0,.35778],46:[0,.10556,0,0,.30667],47:[.25,.75,.16194,0,.51111],48:[0,.64444,.13556,0,.51111],49:[0,.64444,.13556,0,.51111],50:[0,.64444,.13556,0,.51111],51:[0,.64444,.13556,0,.51111],52:[.19444,.64444,.13556,0,.51111],53:[0,.64444,.13556,0,.51111],54:[0,.64444,.13556,0,.51111],55:[.19444,.64444,.13556,0,.51111],56:[0,.64444,.13556,0,.51111],57:[0,.64444,.13556,0,.51111],58:[0,.43056,.0582,0,.30667],59:[.19444,.43056,.0582,0,.30667],61:[-.13313,.36687,.06616,0,.76666],63:[0,.69444,.1225,0,.51111],64:[0,.69444,.09597,0,.76666],65:[0,.68333,0,0,.74333],66:[0,.68333,.10257,0,.70389],67:[0,.68333,.14528,0,.71555],68:[0,.68333,.09403,0,.755],69:[0,.68333,.12028,0,.67833],70:[0,.68333,.13305,0,.65277],71:[0,.68333,.08722,0,.77361],72:[0,.68333,.16389,0,.74333],73:[0,.68333,.15806,0,.38555],74:[0,.68333,.14028,0,.525],75:[0,.68333,.14528,0,.76888],76:[0,.68333,0,0,.62722],77:[0,.68333,.16389,0,.89666],78:[0,.68333,.16389,0,.74333],79:[0,.68333,.09403,0,.76666],80:[0,.68333,.10257,0,.67833],81:[.19444,.68333,.09403,0,.76666],82:[0,.68333,.03868,0,.72944],83:[0,.68333,.11972,0,.56222],84:[0,.68333,.13305,0,.71555],85:[0,.68333,.16389,0,.74333],86:[0,.68333,.18361,0,.74333],87:[0,.68333,.18361,0,.99888],88:[0,.68333,.15806,0,.74333],89:[0,.68333,.19383,0,.74333],90:[0,.68333,.14528,0,.61333],91:[.25,.75,.1875,0,.30667],93:[.25,.75,.10528,0,.30667],94:[0,.69444,.06646,0,.51111],95:[.31,.12056,.09208,0,.51111],97:[0,.43056,.07671,0,.51111],98:[0,.69444,.06312,0,.46],99:[0,.43056,.05653,0,.46],100:[0,.69444,.10333,0,.51111],101:[0,.43056,.07514,0,.46],102:[.19444,.69444,.21194,0,.30667],103:[.19444,.43056,.08847,0,.46],104:[0,.69444,.07671,0,.51111],105:[0,.65536,.1019,0,.30667],106:[.19444,.65536,.14467,0,.30667],107:[0,.69444,.10764,0,.46],108:[0,.69444,.10333,0,.25555],109:[0,.43056,.07671,0,.81777],110:[0,.43056,.07671,0,.56222],111:[0,.43056,.06312,0,.51111],112:[.19444,.43056,.06312,0,.51111],113:[.19444,.43056,.08847,0,.46],114:[0,.43056,.10764,0,.42166],115:[0,.43056,.08208,0,.40889],116:[0,.61508,.09486,0,.33222],117:[0,.43056,.07671,0,.53666],118:[0,.43056,.10764,0,.46],119:[0,.43056,.10764,0,.66444],120:[0,.43056,.12042,0,.46389],121:[.19444,.43056,.08847,0,.48555],122:[0,.43056,.12292,0,.40889],126:[.35,.31786,.11585,0,.51111],160:[0,0,0,0,.25],168:[0,.66786,.10474,0,.51111],176:[0,.69444,0,0,.83129],184:[.17014,0,0,0,.46],198:[0,.68333,.12028,0,.88277],216:[.04861,.73194,.09403,0,.76666],223:[.19444,.69444,.10514,0,.53666],230:[0,.43056,.07514,0,.71555],248:[.09722,.52778,.09194,0,.51111],338:[0,.68333,.12028,0,.98499],339:[0,.43056,.07514,0,.71555],710:[0,.69444,.06646,0,.51111],711:[0,.62847,.08295,0,.51111],713:[0,.56167,.10333,0,.51111],714:[0,.69444,.09694,0,.51111],715:[0,.69444,0,0,.51111],728:[0,.69444,.10806,0,.51111],729:[0,.66786,.11752,0,.30667],730:[0,.69444,0,0,.83129],732:[0,.66786,.11585,0,.51111],733:[0,.69444,.1225,0,.51111],915:[0,.68333,.13305,0,.62722],916:[0,.68333,0,0,.81777],920:[0,.68333,.09403,0,.76666],923:[0,.68333,0,0,.69222],926:[0,.68333,.15294,0,.66444],928:[0,.68333,.16389,0,.74333],931:[0,.68333,.12028,0,.71555],933:[0,.68333,.11111,0,.76666],934:[0,.68333,.05986,0,.71555],936:[0,.68333,.11111,0,.76666],937:[0,.68333,.10257,0,.71555],8211:[0,.43056,.09208,0,.51111],8212:[0,.43056,.09208,0,1.02222],8216:[0,.69444,.12417,0,.30667],8217:[0,.69444,.12417,0,.30667],8220:[0,.69444,.1685,0,.51444],8221:[0,.69444,.06961,0,.51444],8463:[0,.68889,0,0,.54028]},"Main-Regular":{32:[0,0,0,0,.25],33:[0,.69444,0,0,.27778],34:[0,.69444,0,0,.5],35:[.19444,.69444,0,0,.83334],36:[.05556,.75,0,0,.5],37:[.05556,.75,0,0,.83334],38:[0,.69444,0,0,.77778],39:[0,.69444,0,0,.27778],40:[.25,.75,0,0,.38889],41:[.25,.75,0,0,.38889],42:[0,.75,0,0,.5],43:[.08333,.58333,0,0,.77778],44:[.19444,.10556,0,0,.27778],45:[0,.43056,0,0,.33333],46:[0,.10556,0,0,.27778],47:[.25,.75,0,0,.5],48:[0,.64444,0,0,.5],49:[0,.64444,0,0,.5],50:[0,.64444,0,0,.5],51:[0,.64444,0,0,.5],52:[0,.64444,0,0,.5],53:[0,.64444,0,0,.5],54:[0,.64444,0,0,.5],55:[0,.64444,0,0,.5],56:[0,.64444,0,0,.5],57:[0,.64444,0,0,.5],58:[0,.43056,0,0,.27778],59:[.19444,.43056,0,0,.27778],60:[.0391,.5391,0,0,.77778],61:[-.13313,.36687,0,0,.77778],62:[.0391,.5391,0,0,.77778],63:[0,.69444,0,0,.47222],64:[0,.69444,0,0,.77778],65:[0,.68333,0,0,.75],66:[0,.68333,0,0,.70834],67:[0,.68333,0,0,.72222],68:[0,.68333,0,0,.76389],69:[0,.68333,0,0,.68056],70:[0,.68333,0,0,.65278],71:[0,.68333,0,0,.78472],72:[0,.68333,0,0,.75],73:[0,.68333,0,0,.36111],74:[0,.68333,0,0,.51389],75:[0,.68333,0,0,.77778],76:[0,.68333,0,0,.625],77:[0,.68333,0,0,.91667],78:[0,.68333,0,0,.75],79:[0,.68333,0,0,.77778],80:[0,.68333,0,0,.68056],81:[.19444,.68333,0,0,.77778],82:[0,.68333,0,0,.73611],83:[0,.68333,0,0,.55556],84:[0,.68333,0,0,.72222],85:[0,.68333,0,0,.75],86:[0,.68333,.01389,0,.75],87:[0,.68333,.01389,0,1.02778],88:[0,.68333,0,0,.75],89:[0,.68333,.025,0,.75],90:[0,.68333,0,0,.61111],91:[.25,.75,0,0,.27778],92:[.25,.75,0,0,.5],93:[.25,.75,0,0,.27778],94:[0,.69444,0,0,.5],95:[.31,.12056,.02778,0,.5],97:[0,.43056,0,0,.5],98:[0,.69444,0,0,.55556],99:[0,.43056,0,0,.44445],100:[0,.69444,0,0,.55556],101:[0,.43056,0,0,.44445],102:[0,.69444,.07778,0,.30556],103:[.19444,.43056,.01389,0,.5],104:[0,.69444,0,0,.55556],105:[0,.66786,0,0,.27778],106:[.19444,.66786,0,0,.30556],107:[0,.69444,0,0,.52778],108:[0,.69444,0,0,.27778],109:[0,.43056,0,0,.83334],110:[0,.43056,0,0,.55556],111:[0,.43056,0,0,.5],112:[.19444,.43056,0,0,.55556],113:[.19444,.43056,0,0,.52778],114:[0,.43056,0,0,.39167],115:[0,.43056,0,0,.39445],116:[0,.61508,0,0,.38889],117:[0,.43056,0,0,.55556],118:[0,.43056,.01389,0,.52778],119:[0,.43056,.01389,0,.72222],120:[0,.43056,0,0,.52778],121:[.19444,.43056,.01389,0,.52778],122:[0,.43056,0,0,.44445],123:[.25,.75,0,0,.5],124:[.25,.75,0,0,.27778],125:[.25,.75,0,0,.5],126:[.35,.31786,0,0,.5],160:[0,0,0,0,.25],163:[0,.69444,0,0,.76909],167:[.19444,.69444,0,0,.44445],168:[0,.66786,0,0,.5],172:[0,.43056,0,0,.66667],176:[0,.69444,0,0,.75],177:[.08333,.58333,0,0,.77778],182:[.19444,.69444,0,0,.61111],184:[.17014,0,0,0,.44445],198:[0,.68333,0,0,.90278],215:[.08333,.58333,0,0,.77778],216:[.04861,.73194,0,0,.77778],223:[0,.69444,0,0,.5],230:[0,.43056,0,0,.72222],247:[.08333,.58333,0,0,.77778],248:[.09722,.52778,0,0,.5],305:[0,.43056,0,0,.27778],338:[0,.68333,0,0,1.01389],339:[0,.43056,0,0,.77778],567:[.19444,.43056,0,0,.30556],710:[0,.69444,0,0,.5],711:[0,.62847,0,0,.5],713:[0,.56778,0,0,.5],714:[0,.69444,0,0,.5],715:[0,.69444,0,0,.5],728:[0,.69444,0,0,.5],729:[0,.66786,0,0,.27778],730:[0,.69444,0,0,.75],732:[0,.66786,0,0,.5],733:[0,.69444,0,0,.5],915:[0,.68333,0,0,.625],916:[0,.68333,0,0,.83334],920:[0,.68333,0,0,.77778],923:[0,.68333,0,0,.69445],926:[0,.68333,0,0,.66667],928:[0,.68333,0,0,.75],931:[0,.68333,0,0,.72222],933:[0,.68333,0,0,.77778],934:[0,.68333,0,0,.72222],936:[0,.68333,0,0,.77778],937:[0,.68333,0,0,.72222],8211:[0,.43056,.02778,0,.5],8212:[0,.43056,.02778,0,1],8216:[0,.69444,0,0,.27778],8217:[0,.69444,0,0,.27778],8220:[0,.69444,0,0,.5],8221:[0,.69444,0,0,.5],8224:[.19444,.69444,0,0,.44445],8225:[.19444,.69444,0,0,.44445],8230:[0,.123,0,0,1.172],8242:[0,.55556,0,0,.275],8407:[0,.71444,.15382,0,.5],8463:[0,.68889,0,0,.54028],8465:[0,.69444,0,0,.72222],8467:[0,.69444,0,.11111,.41667],8472:[.19444,.43056,0,.11111,.63646],8476:[0,.69444,0,0,.72222],8501:[0,.69444,0,0,.61111],8592:[-.13313,.36687,0,0,1],8593:[.19444,.69444,0,0,.5],8594:[-.13313,.36687,0,0,1],8595:[.19444,.69444,0,0,.5],8596:[-.13313,.36687,0,0,1],8597:[.25,.75,0,0,.5],8598:[.19444,.69444,0,0,1],8599:[.19444,.69444,0,0,1],8600:[.19444,.69444,0,0,1],8601:[.19444,.69444,0,0,1],8614:[.011,.511,0,0,1],8617:[.011,.511,0,0,1.126],8618:[.011,.511,0,0,1.126],8636:[-.13313,.36687,0,0,1],8637:[-.13313,.36687,0,0,1],8640:[-.13313,.36687,0,0,1],8641:[-.13313,.36687,0,0,1],8652:[.011,.671,0,0,1],8656:[-.13313,.36687,0,0,1],8657:[.19444,.69444,0,0,.61111],8658:[-.13313,.36687,0,0,1],8659:[.19444,.69444,0,0,.61111],8660:[-.13313,.36687,0,0,1],8661:[.25,.75,0,0,.61111],8704:[0,.69444,0,0,.55556],8706:[0,.69444,.05556,.08334,.5309],8707:[0,.69444,0,0,.55556],8709:[.05556,.75,0,0,.5],8711:[0,.68333,0,0,.83334],8712:[.0391,.5391,0,0,.66667],8715:[.0391,.5391,0,0,.66667],8722:[.08333,.58333,0,0,.77778],8723:[.08333,.58333,0,0,.77778],8725:[.25,.75,0,0,.5],8726:[.25,.75,0,0,.5],8727:[-.03472,.46528,0,0,.5],8728:[-.05555,.44445,0,0,.5],8729:[-.05555,.44445,0,0,.5],8730:[.2,.8,0,0,.83334],8733:[0,.43056,0,0,.77778],8734:[0,.43056,0,0,1],8736:[0,.69224,0,0,.72222],8739:[.25,.75,0,0,.27778],8741:[.25,.75,0,0,.5],8743:[0,.55556,0,0,.66667],8744:[0,.55556,0,0,.66667],8745:[0,.55556,0,0,.66667],8746:[0,.55556,0,0,.66667],8747:[.19444,.69444,.11111,0,.41667],8764:[-.13313,.36687,0,0,.77778],8768:[.19444,.69444,0,0,.27778],8771:[-.03625,.46375,0,0,.77778],8773:[-.022,.589,0,0,.778],8776:[-.01688,.48312,0,0,.77778],8781:[-.03625,.46375,0,0,.77778],8784:[-.133,.673,0,0,.778],8801:[-.03625,.46375,0,0,.77778],8804:[.13597,.63597,0,0,.77778],8805:[.13597,.63597,0,0,.77778],8810:[.0391,.5391,0,0,1],8811:[.0391,.5391,0,0,1],8826:[.0391,.5391,0,0,.77778],8827:[.0391,.5391,0,0,.77778],8834:[.0391,.5391,0,0,.77778],8835:[.0391,.5391,0,0,.77778],8838:[.13597,.63597,0,0,.77778],8839:[.13597,.63597,0,0,.77778],8846:[0,.55556,0,0,.66667],8849:[.13597,.63597,0,0,.77778],8850:[.13597,.63597,0,0,.77778],8851:[0,.55556,0,0,.66667],8852:[0,.55556,0,0,.66667],8853:[.08333,.58333,0,0,.77778],8854:[.08333,.58333,0,0,.77778],8855:[.08333,.58333,0,0,.77778],8856:[.08333,.58333,0,0,.77778],8857:[.08333,.58333,0,0,.77778],8866:[0,.69444,0,0,.61111],8867:[0,.69444,0,0,.61111],8868:[0,.69444,0,0,.77778],8869:[0,.69444,0,0,.77778],8872:[.249,.75,0,0,.867],8900:[-.05555,.44445,0,0,.5],8901:[-.05555,.44445,0,0,.27778],8902:[-.03472,.46528,0,0,.5],8904:[.005,.505,0,0,.9],8942:[.03,.903,0,0,.278],8943:[-.19,.313,0,0,1.172],8945:[-.1,.823,0,0,1.282],8968:[.25,.75,0,0,.44445],8969:[.25,.75,0,0,.44445],8970:[.25,.75,0,0,.44445],8971:[.25,.75,0,0,.44445],8994:[-.14236,.35764,0,0,1],8995:[-.14236,.35764,0,0,1],9136:[.244,.744,0,0,.412],9137:[.244,.745,0,0,.412],9651:[.19444,.69444,0,0,.88889],9657:[-.03472,.46528,0,0,.5],9661:[.19444,.69444,0,0,.88889],9667:[-.03472,.46528,0,0,.5],9711:[.19444,.69444,0,0,1],9824:[.12963,.69444,0,0,.77778],9825:[.12963,.69444,0,0,.77778],9826:[.12963,.69444,0,0,.77778],9827:[.12963,.69444,0,0,.77778],9837:[0,.75,0,0,.38889],9838:[.19444,.69444,0,0,.38889],9839:[.19444,.69444,0,0,.38889],10216:[.25,.75,0,0,.38889],10217:[.25,.75,0,0,.38889],10222:[.244,.744,0,0,.412],10223:[.244,.745,0,0,.412],10229:[.011,.511,0,0,1.609],10230:[.011,.511,0,0,1.638],10231:[.011,.511,0,0,1.859],10232:[.024,.525,0,0,1.609],10233:[.024,.525,0,0,1.638],10234:[.024,.525,0,0,1.858],10236:[.011,.511,0,0,1.638],10815:[0,.68333,0,0,.75],10927:[.13597,.63597,0,0,.77778],10928:[.13597,.63597,0,0,.77778],57376:[.19444,.69444,0,0,0]},"Math-BoldItalic":{32:[0,0,0,0,.25],48:[0,.44444,0,0,.575],49:[0,.44444,0,0,.575],50:[0,.44444,0,0,.575],51:[.19444,.44444,0,0,.575],52:[.19444,.44444,0,0,.575],53:[.19444,.44444,0,0,.575],54:[0,.64444,0,0,.575],55:[.19444,.44444,0,0,.575],56:[0,.64444,0,0,.575],57:[.19444,.44444,0,0,.575],65:[0,.68611,0,0,.86944],66:[0,.68611,.04835,0,.8664],67:[0,.68611,.06979,0,.81694],68:[0,.68611,.03194,0,.93812],69:[0,.68611,.05451,0,.81007],70:[0,.68611,.15972,0,.68889],71:[0,.68611,0,0,.88673],72:[0,.68611,.08229,0,.98229],73:[0,.68611,.07778,0,.51111],74:[0,.68611,.10069,0,.63125],75:[0,.68611,.06979,0,.97118],76:[0,.68611,0,0,.75555],77:[0,.68611,.11424,0,1.14201],78:[0,.68611,.11424,0,.95034],79:[0,.68611,.03194,0,.83666],80:[0,.68611,.15972,0,.72309],81:[.19444,.68611,0,0,.86861],82:[0,.68611,.00421,0,.87235],83:[0,.68611,.05382,0,.69271],84:[0,.68611,.15972,0,.63663],85:[0,.68611,.11424,0,.80027],86:[0,.68611,.25555,0,.67778],87:[0,.68611,.15972,0,1.09305],88:[0,.68611,.07778,0,.94722],89:[0,.68611,.25555,0,.67458],90:[0,.68611,.06979,0,.77257],97:[0,.44444,0,0,.63287],98:[0,.69444,0,0,.52083],99:[0,.44444,0,0,.51342],100:[0,.69444,0,0,.60972],101:[0,.44444,0,0,.55361],102:[.19444,.69444,.11042,0,.56806],103:[.19444,.44444,.03704,0,.5449],104:[0,.69444,0,0,.66759],105:[0,.69326,0,0,.4048],106:[.19444,.69326,.0622,0,.47083],107:[0,.69444,.01852,0,.6037],108:[0,.69444,.0088,0,.34815],109:[0,.44444,0,0,1.0324],110:[0,.44444,0,0,.71296],111:[0,.44444,0,0,.58472],112:[.19444,.44444,0,0,.60092],113:[.19444,.44444,.03704,0,.54213],114:[0,.44444,.03194,0,.5287],115:[0,.44444,0,0,.53125],116:[0,.63492,0,0,.41528],117:[0,.44444,0,0,.68102],118:[0,.44444,.03704,0,.56666],119:[0,.44444,.02778,0,.83148],120:[0,.44444,0,0,.65903],121:[.19444,.44444,.03704,0,.59028],122:[0,.44444,.04213,0,.55509],160:[0,0,0,0,.25],915:[0,.68611,.15972,0,.65694],916:[0,.68611,0,0,.95833],920:[0,.68611,.03194,0,.86722],923:[0,.68611,0,0,.80555],926:[0,.68611,.07458,0,.84125],928:[0,.68611,.08229,0,.98229],931:[0,.68611,.05451,0,.88507],933:[0,.68611,.15972,0,.67083],934:[0,.68611,0,0,.76666],936:[0,.68611,.11653,0,.71402],937:[0,.68611,.04835,0,.8789],945:[0,.44444,0,0,.76064],946:[.19444,.69444,.03403,0,.65972],947:[.19444,.44444,.06389,0,.59003],948:[0,.69444,.03819,0,.52222],949:[0,.44444,0,0,.52882],950:[.19444,.69444,.06215,0,.50833],951:[.19444,.44444,.03704,0,.6],952:[0,.69444,.03194,0,.5618],953:[0,.44444,0,0,.41204],954:[0,.44444,0,0,.66759],955:[0,.69444,0,0,.67083],956:[.19444,.44444,0,0,.70787],957:[0,.44444,.06898,0,.57685],958:[.19444,.69444,.03021,0,.50833],959:[0,.44444,0,0,.58472],960:[0,.44444,.03704,0,.68241],961:[.19444,.44444,0,0,.6118],962:[.09722,.44444,.07917,0,.42361],963:[0,.44444,.03704,0,.68588],964:[0,.44444,.13472,0,.52083],965:[0,.44444,.03704,0,.63055],966:[.19444,.44444,0,0,.74722],967:[.19444,.44444,0,0,.71805],968:[.19444,.69444,.03704,0,.75833],969:[0,.44444,.03704,0,.71782],977:[0,.69444,0,0,.69155],981:[.19444,.69444,0,0,.7125],982:[0,.44444,.03194,0,.975],1009:[.19444,.44444,0,0,.6118],1013:[0,.44444,0,0,.48333],57649:[0,.44444,0,0,.39352],57911:[.19444,.44444,0,0,.43889]},"Math-Italic":{32:[0,0,0,0,.25],48:[0,.43056,0,0,.5],49:[0,.43056,0,0,.5],50:[0,.43056,0,0,.5],51:[.19444,.43056,0,0,.5],52:[.19444,.43056,0,0,.5],53:[.19444,.43056,0,0,.5],54:[0,.64444,0,0,.5],55:[.19444,.43056,0,0,.5],56:[0,.64444,0,0,.5],57:[.19444,.43056,0,0,.5],65:[0,.68333,0,.13889,.75],66:[0,.68333,.05017,.08334,.75851],67:[0,.68333,.07153,.08334,.71472],68:[0,.68333,.02778,.05556,.82792],69:[0,.68333,.05764,.08334,.7382],70:[0,.68333,.13889,.08334,.64306],71:[0,.68333,0,.08334,.78625],72:[0,.68333,.08125,.05556,.83125],73:[0,.68333,.07847,.11111,.43958],74:[0,.68333,.09618,.16667,.55451],75:[0,.68333,.07153,.05556,.84931],76:[0,.68333,0,.02778,.68056],77:[0,.68333,.10903,.08334,.97014],78:[0,.68333,.10903,.08334,.80347],79:[0,.68333,.02778,.08334,.76278],80:[0,.68333,.13889,.08334,.64201],81:[.19444,.68333,0,.08334,.79056],82:[0,.68333,.00773,.08334,.75929],83:[0,.68333,.05764,.08334,.6132],84:[0,.68333,.13889,.08334,.58438],85:[0,.68333,.10903,.02778,.68278],86:[0,.68333,.22222,0,.58333],87:[0,.68333,.13889,0,.94445],88:[0,.68333,.07847,.08334,.82847],89:[0,.68333,.22222,0,.58056],90:[0,.68333,.07153,.08334,.68264],97:[0,.43056,0,0,.52859],98:[0,.69444,0,0,.42917],99:[0,.43056,0,.05556,.43276],100:[0,.69444,0,.16667,.52049],101:[0,.43056,0,.05556,.46563],102:[.19444,.69444,.10764,.16667,.48959],103:[.19444,.43056,.03588,.02778,.47697],104:[0,.69444,0,0,.57616],105:[0,.65952,0,0,.34451],106:[.19444,.65952,.05724,0,.41181],107:[0,.69444,.03148,0,.5206],108:[0,.69444,.01968,.08334,.29838],109:[0,.43056,0,0,.87801],110:[0,.43056,0,0,.60023],111:[0,.43056,0,.05556,.48472],112:[.19444,.43056,0,.08334,.50313],113:[.19444,.43056,.03588,.08334,.44641],114:[0,.43056,.02778,.05556,.45116],115:[0,.43056,0,.05556,.46875],116:[0,.61508,0,.08334,.36111],117:[0,.43056,0,.02778,.57246],118:[0,.43056,.03588,.02778,.48472],119:[0,.43056,.02691,.08334,.71592],120:[0,.43056,0,.02778,.57153],121:[.19444,.43056,.03588,.05556,.49028],122:[0,.43056,.04398,.05556,.46505],160:[0,0,0,0,.25],915:[0,.68333,.13889,.08334,.61528],916:[0,.68333,0,.16667,.83334],920:[0,.68333,.02778,.08334,.76278],923:[0,.68333,0,.16667,.69445],926:[0,.68333,.07569,.08334,.74236],928:[0,.68333,.08125,.05556,.83125],931:[0,.68333,.05764,.08334,.77986],933:[0,.68333,.13889,.05556,.58333],934:[0,.68333,0,.08334,.66667],936:[0,.68333,.11,.05556,.61222],937:[0,.68333,.05017,.08334,.7724],945:[0,.43056,.0037,.02778,.6397],946:[.19444,.69444,.05278,.08334,.56563],947:[.19444,.43056,.05556,0,.51773],948:[0,.69444,.03785,.05556,.44444],949:[0,.43056,0,.08334,.46632],950:[.19444,.69444,.07378,.08334,.4375],951:[.19444,.43056,.03588,.05556,.49653],952:[0,.69444,.02778,.08334,.46944],953:[0,.43056,0,.05556,.35394],954:[0,.43056,0,0,.57616],955:[0,.69444,0,0,.58334],956:[.19444,.43056,0,.02778,.60255],957:[0,.43056,.06366,.02778,.49398],958:[.19444,.69444,.04601,.11111,.4375],959:[0,.43056,0,.05556,.48472],960:[0,.43056,.03588,0,.57003],961:[.19444,.43056,0,.08334,.51702],962:[.09722,.43056,.07986,.08334,.36285],963:[0,.43056,.03588,0,.57141],964:[0,.43056,.1132,.02778,.43715],965:[0,.43056,.03588,.02778,.54028],966:[.19444,.43056,0,.08334,.65417],967:[.19444,.43056,0,.05556,.62569],968:[.19444,.69444,.03588,.11111,.65139],969:[0,.43056,.03588,0,.62245],977:[0,.69444,0,.08334,.59144],981:[.19444,.69444,0,.08334,.59583],982:[0,.43056,.02778,0,.82813],1009:[.19444,.43056,0,.08334,.51702],1013:[0,.43056,0,.05556,.4059],57649:[0,.43056,0,.02778,.32246],57911:[.19444,.43056,0,.08334,.38403]},"SansSerif-Bold":{32:[0,0,0,0,.25],33:[0,.69444,0,0,.36667],34:[0,.69444,0,0,.55834],35:[.19444,.69444,0,0,.91667],36:[.05556,.75,0,0,.55],37:[.05556,.75,0,0,1.02912],38:[0,.69444,0,0,.83056],39:[0,.69444,0,0,.30556],40:[.25,.75,0,0,.42778],41:[.25,.75,0,0,.42778],42:[0,.75,0,0,.55],43:[.11667,.61667,0,0,.85556],44:[.10556,.13056,0,0,.30556],45:[0,.45833,0,0,.36667],46:[0,.13056,0,0,.30556],47:[.25,.75,0,0,.55],48:[0,.69444,0,0,.55],49:[0,.69444,0,0,.55],50:[0,.69444,0,0,.55],51:[0,.69444,0,0,.55],52:[0,.69444,0,0,.55],53:[0,.69444,0,0,.55],54:[0,.69444,0,0,.55],55:[0,.69444,0,0,.55],56:[0,.69444,0,0,.55],57:[0,.69444,0,0,.55],58:[0,.45833,0,0,.30556],59:[.10556,.45833,0,0,.30556],61:[-.09375,.40625,0,0,.85556],63:[0,.69444,0,0,.51945],64:[0,.69444,0,0,.73334],65:[0,.69444,0,0,.73334],66:[0,.69444,0,0,.73334],67:[0,.69444,0,0,.70278],68:[0,.69444,0,0,.79445],69:[0,.69444,0,0,.64167],70:[0,.69444,0,0,.61111],71:[0,.69444,0,0,.73334],72:[0,.69444,0,0,.79445],73:[0,.69444,0,0,.33056],74:[0,.69444,0,0,.51945],75:[0,.69444,0,0,.76389],76:[0,.69444,0,0,.58056],77:[0,.69444,0,0,.97778],78:[0,.69444,0,0,.79445],79:[0,.69444,0,0,.79445],80:[0,.69444,0,0,.70278],81:[.10556,.69444,0,0,.79445],82:[0,.69444,0,0,.70278],83:[0,.69444,0,0,.61111],84:[0,.69444,0,0,.73334],85:[0,.69444,0,0,.76389],86:[0,.69444,.01528,0,.73334],87:[0,.69444,.01528,0,1.03889],88:[0,.69444,0,0,.73334],89:[0,.69444,.0275,0,.73334],90:[0,.69444,0,0,.67223],91:[.25,.75,0,0,.34306],93:[.25,.75,0,0,.34306],94:[0,.69444,0,0,.55],95:[.35,.10833,.03056,0,.55],97:[0,.45833,0,0,.525],98:[0,.69444,0,0,.56111],99:[0,.45833,0,0,.48889],100:[0,.69444,0,0,.56111],101:[0,.45833,0,0,.51111],102:[0,.69444,.07639,0,.33611],103:[.19444,.45833,.01528,0,.55],104:[0,.69444,0,0,.56111],105:[0,.69444,0,0,.25556],106:[.19444,.69444,0,0,.28611],107:[0,.69444,0,0,.53056],108:[0,.69444,0,0,.25556],109:[0,.45833,0,0,.86667],110:[0,.45833,0,0,.56111],111:[0,.45833,0,0,.55],112:[.19444,.45833,0,0,.56111],113:[.19444,.45833,0,0,.56111],114:[0,.45833,.01528,0,.37222],115:[0,.45833,0,0,.42167],116:[0,.58929,0,0,.40417],117:[0,.45833,0,0,.56111],118:[0,.45833,.01528,0,.5],119:[0,.45833,.01528,0,.74445],120:[0,.45833,0,0,.5],121:[.19444,.45833,.01528,0,.5],122:[0,.45833,0,0,.47639],126:[.35,.34444,0,0,.55],160:[0,0,0,0,.25],168:[0,.69444,0,0,.55],176:[0,.69444,0,0,.73334],180:[0,.69444,0,0,.55],184:[.17014,0,0,0,.48889],305:[0,.45833,0,0,.25556],567:[.19444,.45833,0,0,.28611],710:[0,.69444,0,0,.55],711:[0,.63542,0,0,.55],713:[0,.63778,0,0,.55],728:[0,.69444,0,0,.55],729:[0,.69444,0,0,.30556],730:[0,.69444,0,0,.73334],732:[0,.69444,0,0,.55],733:[0,.69444,0,0,.55],915:[0,.69444,0,0,.58056],916:[0,.69444,0,0,.91667],920:[0,.69444,0,0,.85556],923:[0,.69444,0,0,.67223],926:[0,.69444,0,0,.73334],928:[0,.69444,0,0,.79445],931:[0,.69444,0,0,.79445],933:[0,.69444,0,0,.85556],934:[0,.69444,0,0,.79445],936:[0,.69444,0,0,.85556],937:[0,.69444,0,0,.79445],8211:[0,.45833,.03056,0,.55],8212:[0,.45833,.03056,0,1.10001],8216:[0,.69444,0,0,.30556],8217:[0,.69444,0,0,.30556],8220:[0,.69444,0,0,.55834],8221:[0,.69444,0,0,.55834]},"SansSerif-Italic":{32:[0,0,0,0,.25],33:[0,.69444,.05733,0,.31945],34:[0,.69444,.00316,0,.5],35:[.19444,.69444,.05087,0,.83334],36:[.05556,.75,.11156,0,.5],37:[.05556,.75,.03126,0,.83334],38:[0,.69444,.03058,0,.75834],39:[0,.69444,.07816,0,.27778],40:[.25,.75,.13164,0,.38889],41:[.25,.75,.02536,0,.38889],42:[0,.75,.11775,0,.5],43:[.08333,.58333,.02536,0,.77778],44:[.125,.08333,0,0,.27778],45:[0,.44444,.01946,0,.33333],46:[0,.08333,0,0,.27778],47:[.25,.75,.13164,0,.5],48:[0,.65556,.11156,0,.5],49:[0,.65556,.11156,0,.5],50:[0,.65556,.11156,0,.5],51:[0,.65556,.11156,0,.5],52:[0,.65556,.11156,0,.5],53:[0,.65556,.11156,0,.5],54:[0,.65556,.11156,0,.5],55:[0,.65556,.11156,0,.5],56:[0,.65556,.11156,0,.5],57:[0,.65556,.11156,0,.5],58:[0,.44444,.02502,0,.27778],59:[.125,.44444,.02502,0,.27778],61:[-.13,.37,.05087,0,.77778],63:[0,.69444,.11809,0,.47222],64:[0,.69444,.07555,0,.66667],65:[0,.69444,0,0,.66667],66:[0,.69444,.08293,0,.66667],67:[0,.69444,.11983,0,.63889],68:[0,.69444,.07555,0,.72223],69:[0,.69444,.11983,0,.59722],70:[0,.69444,.13372,0,.56945],71:[0,.69444,.11983,0,.66667],72:[0,.69444,.08094,0,.70834],73:[0,.69444,.13372,0,.27778],74:[0,.69444,.08094,0,.47222],75:[0,.69444,.11983,0,.69445],76:[0,.69444,0,0,.54167],77:[0,.69444,.08094,0,.875],78:[0,.69444,.08094,0,.70834],79:[0,.69444,.07555,0,.73611],80:[0,.69444,.08293,0,.63889],81:[.125,.69444,.07555,0,.73611],82:[0,.69444,.08293,0,.64584],83:[0,.69444,.09205,0,.55556],84:[0,.69444,.13372,0,.68056],85:[0,.69444,.08094,0,.6875],86:[0,.69444,.1615,0,.66667],87:[0,.69444,.1615,0,.94445],88:[0,.69444,.13372,0,.66667],89:[0,.69444,.17261,0,.66667],90:[0,.69444,.11983,0,.61111],91:[.25,.75,.15942,0,.28889],93:[.25,.75,.08719,0,.28889],94:[0,.69444,.0799,0,.5],95:[.35,.09444,.08616,0,.5],97:[0,.44444,.00981,0,.48056],98:[0,.69444,.03057,0,.51667],99:[0,.44444,.08336,0,.44445],100:[0,.69444,.09483,0,.51667],101:[0,.44444,.06778,0,.44445],102:[0,.69444,.21705,0,.30556],103:[.19444,.44444,.10836,0,.5],104:[0,.69444,.01778,0,.51667],105:[0,.67937,.09718,0,.23889],106:[.19444,.67937,.09162,0,.26667],107:[0,.69444,.08336,0,.48889],108:[0,.69444,.09483,0,.23889],109:[0,.44444,.01778,0,.79445],110:[0,.44444,.01778,0,.51667],111:[0,.44444,.06613,0,.5],112:[.19444,.44444,.0389,0,.51667],113:[.19444,.44444,.04169,0,.51667],114:[0,.44444,.10836,0,.34167],115:[0,.44444,.0778,0,.38333],116:[0,.57143,.07225,0,.36111],117:[0,.44444,.04169,0,.51667],118:[0,.44444,.10836,0,.46111],119:[0,.44444,.10836,0,.68334],120:[0,.44444,.09169,0,.46111],121:[.19444,.44444,.10836,0,.46111],122:[0,.44444,.08752,0,.43472],126:[.35,.32659,.08826,0,.5],160:[0,0,0,0,.25],168:[0,.67937,.06385,0,.5],176:[0,.69444,0,0,.73752],184:[.17014,0,0,0,.44445],305:[0,.44444,.04169,0,.23889],567:[.19444,.44444,.04169,0,.26667],710:[0,.69444,.0799,0,.5],711:[0,.63194,.08432,0,.5],713:[0,.60889,.08776,0,.5],714:[0,.69444,.09205,0,.5],715:[0,.69444,0,0,.5],728:[0,.69444,.09483,0,.5],729:[0,.67937,.07774,0,.27778],730:[0,.69444,0,0,.73752],732:[0,.67659,.08826,0,.5],733:[0,.69444,.09205,0,.5],915:[0,.69444,.13372,0,.54167],916:[0,.69444,0,0,.83334],920:[0,.69444,.07555,0,.77778],923:[0,.69444,0,0,.61111],926:[0,.69444,.12816,0,.66667],928:[0,.69444,.08094,0,.70834],931:[0,.69444,.11983,0,.72222],933:[0,.69444,.09031,0,.77778],934:[0,.69444,.04603,0,.72222],936:[0,.69444,.09031,0,.77778],937:[0,.69444,.08293,0,.72222],8211:[0,.44444,.08616,0,.5],8212:[0,.44444,.08616,0,1],8216:[0,.69444,.07816,0,.27778],8217:[0,.69444,.07816,0,.27778],8220:[0,.69444,.14205,0,.5],8221:[0,.69444,.00316,0,.5]},"SansSerif-Regular":{32:[0,0,0,0,.25],33:[0,.69444,0,0,.31945],34:[0,.69444,0,0,.5],35:[.19444,.69444,0,0,.83334],36:[.05556,.75,0,0,.5],37:[.05556,.75,0,0,.83334],38:[0,.69444,0,0,.75834],39:[0,.69444,0,0,.27778],40:[.25,.75,0,0,.38889],41:[.25,.75,0,0,.38889],42:[0,.75,0,0,.5],43:[.08333,.58333,0,0,.77778],44:[.125,.08333,0,0,.27778],45:[0,.44444,0,0,.33333],46:[0,.08333,0,0,.27778],47:[.25,.75,0,0,.5],48:[0,.65556,0,0,.5],49:[0,.65556,0,0,.5],50:[0,.65556,0,0,.5],51:[0,.65556,0,0,.5],52:[0,.65556,0,0,.5],53:[0,.65556,0,0,.5],54:[0,.65556,0,0,.5],55:[0,.65556,0,0,.5],56:[0,.65556,0,0,.5],57:[0,.65556,0,0,.5],58:[0,.44444,0,0,.27778],59:[.125,.44444,0,0,.27778],61:[-.13,.37,0,0,.77778],63:[0,.69444,0,0,.47222],64:[0,.69444,0,0,.66667],65:[0,.69444,0,0,.66667],66:[0,.69444,0,0,.66667],67:[0,.69444,0,0,.63889],68:[0,.69444,0,0,.72223],69:[0,.69444,0,0,.59722],70:[0,.69444,0,0,.56945],71:[0,.69444,0,0,.66667],72:[0,.69444,0,0,.70834],73:[0,.69444,0,0,.27778],74:[0,.69444,0,0,.47222],75:[0,.69444,0,0,.69445],76:[0,.69444,0,0,.54167],77:[0,.69444,0,0,.875],78:[0,.69444,0,0,.70834],79:[0,.69444,0,0,.73611],80:[0,.69444,0,0,.63889],81:[.125,.69444,0,0,.73611],82:[0,.69444,0,0,.64584],83:[0,.69444,0,0,.55556],84:[0,.69444,0,0,.68056],85:[0,.69444,0,0,.6875],86:[0,.69444,.01389,0,.66667],87:[0,.69444,.01389,0,.94445],88:[0,.69444,0,0,.66667],89:[0,.69444,.025,0,.66667],90:[0,.69444,0,0,.61111],91:[.25,.75,0,0,.28889],93:[.25,.75,0,0,.28889],94:[0,.69444,0,0,.5],95:[.35,.09444,.02778,0,.5],97:[0,.44444,0,0,.48056],98:[0,.69444,0,0,.51667],99:[0,.44444,0,0,.44445],100:[0,.69444,0,0,.51667],101:[0,.44444,0,0,.44445],102:[0,.69444,.06944,0,.30556],103:[.19444,.44444,.01389,0,.5],104:[0,.69444,0,0,.51667],105:[0,.67937,0,0,.23889],106:[.19444,.67937,0,0,.26667],107:[0,.69444,0,0,.48889],108:[0,.69444,0,0,.23889],109:[0,.44444,0,0,.79445],110:[0,.44444,0,0,.51667],111:[0,.44444,0,0,.5],112:[.19444,.44444,0,0,.51667],113:[.19444,.44444,0,0,.51667],114:[0,.44444,.01389,0,.34167],115:[0,.44444,0,0,.38333],116:[0,.57143,0,0,.36111],117:[0,.44444,0,0,.51667],118:[0,.44444,.01389,0,.46111],119:[0,.44444,.01389,0,.68334],120:[0,.44444,0,0,.46111],121:[.19444,.44444,.01389,0,.46111],122:[0,.44444,0,0,.43472],126:[.35,.32659,0,0,.5],160:[0,0,0,0,.25],168:[0,.67937,0,0,.5],176:[0,.69444,0,0,.66667],184:[.17014,0,0,0,.44445],305:[0,.44444,0,0,.23889],567:[.19444,.44444,0,0,.26667],710:[0,.69444,0,0,.5],711:[0,.63194,0,0,.5],713:[0,.60889,0,0,.5],714:[0,.69444,0,0,.5],715:[0,.69444,0,0,.5],728:[0,.69444,0,0,.5],729:[0,.67937,0,0,.27778],730:[0,.69444,0,0,.66667],732:[0,.67659,0,0,.5],733:[0,.69444,0,0,.5],915:[0,.69444,0,0,.54167],916:[0,.69444,0,0,.83334],920:[0,.69444,0,0,.77778],923:[0,.69444,0,0,.61111],926:[0,.69444,0,0,.66667],928:[0,.69444,0,0,.70834],931:[0,.69444,0,0,.72222],933:[0,.69444,0,0,.77778],934:[0,.69444,0,0,.72222],936:[0,.69444,0,0,.77778],937:[0,.69444,0,0,.72222],8211:[0,.44444,.02778,0,.5],8212:[0,.44444,.02778,0,1],8216:[0,.69444,0,0,.27778],8217:[0,.69444,0,0,.27778],8220:[0,.69444,0,0,.5],8221:[0,.69444,0,0,.5]},"Script-Regular":{32:[0,0,0,0,.25],65:[0,.7,.22925,0,.80253],66:[0,.7,.04087,0,.90757],67:[0,.7,.1689,0,.66619],68:[0,.7,.09371,0,.77443],69:[0,.7,.18583,0,.56162],70:[0,.7,.13634,0,.89544],71:[0,.7,.17322,0,.60961],72:[0,.7,.29694,0,.96919],73:[0,.7,.19189,0,.80907],74:[.27778,.7,.19189,0,1.05159],75:[0,.7,.31259,0,.91364],76:[0,.7,.19189,0,.87373],77:[0,.7,.15981,0,1.08031],78:[0,.7,.3525,0,.9015],79:[0,.7,.08078,0,.73787],80:[0,.7,.08078,0,1.01262],81:[0,.7,.03305,0,.88282],82:[0,.7,.06259,0,.85],83:[0,.7,.19189,0,.86767],84:[0,.7,.29087,0,.74697],85:[0,.7,.25815,0,.79996],86:[0,.7,.27523,0,.62204],87:[0,.7,.27523,0,.80532],88:[0,.7,.26006,0,.94445],89:[0,.7,.2939,0,.70961],90:[0,.7,.24037,0,.8212],160:[0,0,0,0,.25]},"Size1-Regular":{32:[0,0,0,0,.25],40:[.35001,.85,0,0,.45834],41:[.35001,.85,0,0,.45834],47:[.35001,.85,0,0,.57778],91:[.35001,.85,0,0,.41667],92:[.35001,.85,0,0,.57778],93:[.35001,.85,0,0,.41667],123:[.35001,.85,0,0,.58334],125:[.35001,.85,0,0,.58334],160:[0,0,0,0,.25],710:[0,.72222,0,0,.55556],732:[0,.72222,0,0,.55556],770:[0,.72222,0,0,.55556],771:[0,.72222,0,0,.55556],8214:[-99e-5,.601,0,0,.77778],8593:[1e-5,.6,0,0,.66667],8595:[1e-5,.6,0,0,.66667],8657:[1e-5,.6,0,0,.77778],8659:[1e-5,.6,0,0,.77778],8719:[.25001,.75,0,0,.94445],8720:[.25001,.75,0,0,.94445],8721:[.25001,.75,0,0,1.05556],8730:[.35001,.85,0,0,1],8739:[-.00599,.606,0,0,.33333],8741:[-.00599,.606,0,0,.55556],8747:[.30612,.805,.19445,0,.47222],8748:[.306,.805,.19445,0,.47222],8749:[.306,.805,.19445,0,.47222],8750:[.30612,.805,.19445,0,.47222],8896:[.25001,.75,0,0,.83334],8897:[.25001,.75,0,0,.83334],8898:[.25001,.75,0,0,.83334],8899:[.25001,.75,0,0,.83334],8968:[.35001,.85,0,0,.47222],8969:[.35001,.85,0,0,.47222],8970:[.35001,.85,0,0,.47222],8971:[.35001,.85,0,0,.47222],9168:[-99e-5,.601,0,0,.66667],10216:[.35001,.85,0,0,.47222],10217:[.35001,.85,0,0,.47222],10752:[.25001,.75,0,0,1.11111],10753:[.25001,.75,0,0,1.11111],10754:[.25001,.75,0,0,1.11111],10756:[.25001,.75,0,0,.83334],10758:[.25001,.75,0,0,.83334]},"Size2-Regular":{32:[0,0,0,0,.25],40:[.65002,1.15,0,0,.59722],41:[.65002,1.15,0,0,.59722],47:[.65002,1.15,0,0,.81111],91:[.65002,1.15,0,0,.47222],92:[.65002,1.15,0,0,.81111],93:[.65002,1.15,0,0,.47222],123:[.65002,1.15,0,0,.66667],125:[.65002,1.15,0,0,.66667],160:[0,0,0,0,.25],710:[0,.75,0,0,1],732:[0,.75,0,0,1],770:[0,.75,0,0,1],771:[0,.75,0,0,1],8719:[.55001,1.05,0,0,1.27778],8720:[.55001,1.05,0,0,1.27778],8721:[.55001,1.05,0,0,1.44445],8730:[.65002,1.15,0,0,1],8747:[.86225,1.36,.44445,0,.55556],8748:[.862,1.36,.44445,0,.55556],8749:[.862,1.36,.44445,0,.55556],8750:[.86225,1.36,.44445,0,.55556],8896:[.55001,1.05,0,0,1.11111],8897:[.55001,1.05,0,0,1.11111],8898:[.55001,1.05,0,0,1.11111],8899:[.55001,1.05,0,0,1.11111],8968:[.65002,1.15,0,0,.52778],8969:[.65002,1.15,0,0,.52778],8970:[.65002,1.15,0,0,.52778],8971:[.65002,1.15,0,0,.52778],10216:[.65002,1.15,0,0,.61111],10217:[.65002,1.15,0,0,.61111],10752:[.55001,1.05,0,0,1.51112],10753:[.55001,1.05,0,0,1.51112],10754:[.55001,1.05,0,0,1.51112],10756:[.55001,1.05,0,0,1.11111],10758:[.55001,1.05,0,0,1.11111]},"Size3-Regular":{32:[0,0,0,0,.25],40:[.95003,1.45,0,0,.73611],41:[.95003,1.45,0,0,.73611],47:[.95003,1.45,0,0,1.04445],91:[.95003,1.45,0,0,.52778],92:[.95003,1.45,0,0,1.04445],93:[.95003,1.45,0,0,.52778],123:[.95003,1.45,0,0,.75],125:[.95003,1.45,0,0,.75],160:[0,0,0,0,.25],710:[0,.75,0,0,1.44445],732:[0,.75,0,0,1.44445],770:[0,.75,0,0,1.44445],771:[0,.75,0,0,1.44445],8730:[.95003,1.45,0,0,1],8968:[.95003,1.45,0,0,.58334],8969:[.95003,1.45,0,0,.58334],8970:[.95003,1.45,0,0,.58334],8971:[.95003,1.45,0,0,.58334],10216:[.95003,1.45,0,0,.75],10217:[.95003,1.45,0,0,.75]},"Size4-Regular":{32:[0,0,0,0,.25],40:[1.25003,1.75,0,0,.79167],41:[1.25003,1.75,0,0,.79167],47:[1.25003,1.75,0,0,1.27778],91:[1.25003,1.75,0,0,.58334],92:[1.25003,1.75,0,0,1.27778],93:[1.25003,1.75,0,0,.58334],123:[1.25003,1.75,0,0,.80556],125:[1.25003,1.75,0,0,.80556],160:[0,0,0,0,.25],710:[0,.825,0,0,1.8889],732:[0,.825,0,0,1.8889],770:[0,.825,0,0,1.8889],771:[0,.825,0,0,1.8889],8730:[1.25003,1.75,0,0,1],8968:[1.25003,1.75,0,0,.63889],8969:[1.25003,1.75,0,0,.63889],8970:[1.25003,1.75,0,0,.63889],8971:[1.25003,1.75,0,0,.63889],9115:[.64502,1.155,0,0,.875],9116:[1e-5,.6,0,0,.875],9117:[.64502,1.155,0,0,.875],9118:[.64502,1.155,0,0,.875],9119:[1e-5,.6,0,0,.875],9120:[.64502,1.155,0,0,.875],9121:[.64502,1.155,0,0,.66667],9122:[-99e-5,.601,0,0,.66667],9123:[.64502,1.155,0,0,.66667],9124:[.64502,1.155,0,0,.66667],9125:[-99e-5,.601,0,0,.66667],9126:[.64502,1.155,0,0,.66667],9127:[1e-5,.9,0,0,.88889],9128:[.65002,1.15,0,0,.88889],9129:[.90001,0,0,0,.88889],9130:[0,.3,0,0,.88889],9131:[1e-5,.9,0,0,.88889],9132:[.65002,1.15,0,0,.88889],9133:[.90001,0,0,0,.88889],9143:[.88502,.915,0,0,1.05556],10216:[1.25003,1.75,0,0,.80556],10217:[1.25003,1.75,0,0,.80556],57344:[-.00499,.605,0,0,1.05556],57345:[-.00499,.605,0,0,1.05556],57680:[0,.12,0,0,.45],57681:[0,.12,0,0,.45],57682:[0,.12,0,0,.45],57683:[0,.12,0,0,.45]},"Typewriter-Regular":{32:[0,0,0,0,.525],33:[0,.61111,0,0,.525],34:[0,.61111,0,0,.525],35:[0,.61111,0,0,.525],36:[.08333,.69444,0,0,.525],37:[.08333,.69444,0,0,.525],38:[0,.61111,0,0,.525],39:[0,.61111,0,0,.525],40:[.08333,.69444,0,0,.525],41:[.08333,.69444,0,0,.525],42:[0,.52083,0,0,.525],43:[-.08056,.53055,0,0,.525],44:[.13889,.125,0,0,.525],45:[-.08056,.53055,0,0,.525],46:[0,.125,0,0,.525],47:[.08333,.69444,0,0,.525],48:[0,.61111,0,0,.525],49:[0,.61111,0,0,.525],50:[0,.61111,0,0,.525],51:[0,.61111,0,0,.525],52:[0,.61111,0,0,.525],53:[0,.61111,0,0,.525],54:[0,.61111,0,0,.525],55:[0,.61111,0,0,.525],56:[0,.61111,0,0,.525],57:[0,.61111,0,0,.525],58:[0,.43056,0,0,.525],59:[.13889,.43056,0,0,.525],60:[-.05556,.55556,0,0,.525],61:[-.19549,.41562,0,0,.525],62:[-.05556,.55556,0,0,.525],63:[0,.61111,0,0,.525],64:[0,.61111,0,0,.525],65:[0,.61111,0,0,.525],66:[0,.61111,0,0,.525],67:[0,.61111,0,0,.525],68:[0,.61111,0,0,.525],69:[0,.61111,0,0,.525],70:[0,.61111,0,0,.525],71:[0,.61111,0,0,.525],72:[0,.61111,0,0,.525],73:[0,.61111,0,0,.525],74:[0,.61111,0,0,.525],75:[0,.61111,0,0,.525],76:[0,.61111,0,0,.525],77:[0,.61111,0,0,.525],78:[0,.61111,0,0,.525],79:[0,.61111,0,0,.525],80:[0,.61111,0,0,.525],81:[.13889,.61111,0,0,.525],82:[0,.61111,0,0,.525],83:[0,.61111,0,0,.525],84:[0,.61111,0,0,.525],85:[0,.61111,0,0,.525],86:[0,.61111,0,0,.525],87:[0,.61111,0,0,.525],88:[0,.61111,0,0,.525],89:[0,.61111,0,0,.525],90:[0,.61111,0,0,.525],91:[.08333,.69444,0,0,.525],92:[.08333,.69444,0,0,.525],93:[.08333,.69444,0,0,.525],94:[0,.61111,0,0,.525],95:[.09514,0,0,0,.525],96:[0,.61111,0,0,.525],97:[0,.43056,0,0,.525],98:[0,.61111,0,0,.525],99:[0,.43056,0,0,.525],100:[0,.61111,0,0,.525],101:[0,.43056,0,0,.525],102:[0,.61111,0,0,.525],103:[.22222,.43056,0,0,.525],104:[0,.61111,0,0,.525],105:[0,.61111,0,0,.525],106:[.22222,.61111,0,0,.525],107:[0,.61111,0,0,.525],108:[0,.61111,0,0,.525],109:[0,.43056,0,0,.525],110:[0,.43056,0,0,.525],111:[0,.43056,0,0,.525],112:[.22222,.43056,0,0,.525],113:[.22222,.43056,0,0,.525],114:[0,.43056,0,0,.525],115:[0,.43056,0,0,.525],116:[0,.55358,0,0,.525],117:[0,.43056,0,0,.525],118:[0,.43056,0,0,.525],119:[0,.43056,0,0,.525],120:[0,.43056,0,0,.525],121:[.22222,.43056,0,0,.525],122:[0,.43056,0,0,.525],123:[.08333,.69444,0,0,.525],124:[.08333,.69444,0,0,.525],125:[.08333,.69444,0,0,.525],126:[0,.61111,0,0,.525],127:[0,.61111,0,0,.525],160:[0,0,0,0,.525],176:[0,.61111,0,0,.525],184:[.19445,0,0,0,.525],305:[0,.43056,0,0,.525],567:[.22222,.43056,0,0,.525],711:[0,.56597,0,0,.525],713:[0,.56555,0,0,.525],714:[0,.61111,0,0,.525],715:[0,.61111,0,0,.525],728:[0,.61111,0,0,.525],730:[0,.61111,0,0,.525],770:[0,.61111,0,0,.525],771:[0,.61111,0,0,.525],776:[0,.61111,0,0,.525],915:[0,.61111,0,0,.525],916:[0,.61111,0,0,.525],920:[0,.61111,0,0,.525],923:[0,.61111,0,0,.525],926:[0,.61111,0,0,.525],928:[0,.61111,0,0,.525],931:[0,.61111,0,0,.525],933:[0,.61111,0,0,.525],934:[0,.61111,0,0,.525],936:[0,.61111,0,0,.525],937:[0,.61111,0,0,.525],8216:[0,.61111,0,0,.525],8217:[0,.61111,0,0,.525],8242:[0,.61111,0,0,.525],9251:[.11111,.21944,0,0,.525]}},Kb={slant:[.25,.25,.25],space:[0,0,0],stretch:[0,0,0],shrink:[0,0,0],xHeight:[.431,.431,.431],quad:[1,1.171,1.472],extraSpace:[0,0,0],num1:[.677,.732,.925],num2:[.394,.384,.387],num3:[.444,.471,.504],denom1:[.686,.752,1.025],denom2:[.345,.344,.532],sup1:[.413,.503,.504],sup2:[.363,.431,.404],sup3:[.289,.286,.294],sub1:[.15,.143,.2],sub2:[.247,.286,.4],supDrop:[.386,.353,.494],subDrop:[.05,.071,.1],delim1:[2.39,1.7,1.98],delim2:[1.01,1.157,1.42],axisHeight:[.25,.25,.25],defaultRuleThickness:[.04,.049,.049],bigOpSpacing1:[.111,.111,.111],bigOpSpacing2:[.166,.166,.166],bigOpSpacing3:[.2,.2,.2],bigOpSpacing4:[.6,.611,.611],bigOpSpacing5:[.1,.143,.143],sqrtRuleThickness:[.04,.04,.04],ptPerEm:[10,10,10],doubleRuleSep:[.2,.2,.2],arrayRuleWidth:[.04,.04,.04],fboxsep:[.3,.3,.3],fboxrule:[.04,.04,.04]},sG={\u00C5:"A",\u00D0:"D",\u00DE:"o",\u00E5:"a",\u00F0:"d",\u00FE:"o",\u0410:"A",\u0411:"B",\u0412:"B",\u0413:"F",\u0414:"A",\u0415:"E",\u0416:"K",\u0417:"3",\u0418:"N",\u0419:"N",\u041A:"K",\u041B:"N",\u041C:"M",\u041D:"H",\u041E:"O",\u041F:"N",\u0420:"P",\u0421:"C",\u0422:"T",\u0423:"y",\u0424:"O",\u0425:"X",\u0426:"U",\u0427:"h",\u0428:"W",\u0429:"W",\u042A:"B",\u042B:"X",\u042C:"B",\u042D:"3",\u042E:"X",\u042F:"R",\u0430:"a",\u0431:"b",\u0432:"a",\u0433:"r",\u0434:"y",\u0435:"e",\u0436:"m",\u0437:"e",\u0438:"n",\u0439:"n",\u043A:"n",\u043B:"n",\u043C:"m",\u043D:"n",\u043E:"o",\u043F:"n",\u0440:"p",\u0441:"c",\u0442:"o",\u0443:"y",\u0444:"b",\u0445:"x",\u0446:"n",\u0447:"n",\u0448:"w",\u0449:"w",\u044A:"a",\u044B:"m",\u044C:"a",\u044D:"e",\u044E:"m",\u044F:"r"};o(Qbe,"setFontMetrics");o(RC,"getCharacterMetrics");oC={};o(Zbe,"getGlobalMetrics");Jbe=[[1,1,1],[2,1,1],[3,1,1],[4,2,1],[5,2,1],[6,3,1],[7,4,2],[8,6,3],[9,7,6],[10,8,7],[11,10,9]],oG=[.5,.6,.7,.8,.9,1,1.2,1.44,1.728,2.074,2.488],lG=o(function(e,r){return r.size<2?e:Jbe[e-1][r.size-1]},"sizeAtStyle"),u4=class t{static{o(this,"Options")}constructor(e){this.style=void 0,this.color=void 0,this.size=void 0,this.textSize=void 0,this.phantom=void 0,this.font=void 0,this.fontFamily=void 0,this.fontWeight=void 0,this.fontShape=void 0,this.sizeMultiplier=void 0,this.maxSize=void 0,this.minRuleThickness=void 0,this._fontMetrics=void 0,this.style=e.style,this.color=e.color,this.size=e.size||t.BASESIZE,this.textSize=e.textSize||this.size,this.phantom=!!e.phantom,this.font=e.font||"",this.fontFamily=e.fontFamily||"",this.fontWeight=e.fontWeight||"",this.fontShape=e.fontShape||"",this.sizeMultiplier=oG[this.size-1],this.maxSize=e.maxSize,this.minRuleThickness=e.minRuleThickness,this._fontMetrics=void 0}extend(e){var r={style:this.style,size:this.size,textSize:this.textSize,color:this.color,phantom:this.phantom,font:this.font,fontFamily:this.fontFamily,fontWeight:this.fontWeight,fontShape:this.fontShape,maxSize:this.maxSize,minRuleThickness:this.minRuleThickness};for(var n in e)e.hasOwnProperty(n)&&(r[n]=e[n]);return new t(r)}havingStyle(e){return this.style===e?this:this.extend({style:e,size:lG(this.textSize,e)})}havingCrampedStyle(){return this.havingStyle(this.style.cramp())}havingSize(e){return this.size===e&&this.textSize===e?this:this.extend({style:this.style.text(),size:e,textSize:e,sizeMultiplier:oG[e-1]})}havingBaseStyle(e){e=e||this.style.text();var r=lG(t.BASESIZE,e);return this.size===r&&this.textSize===t.BASESIZE&&this.style===e?this:this.extend({style:e,size:r})}havingBaseSizing(){var e;switch(this.style.id){case 4:case 5:e=3;break;case 6:case 7:e=1;break;default:e=6}return this.extend({style:this.style.text(),size:e})}withColor(e){return this.extend({color:e})}withPhantom(){return this.extend({phantom:!0})}withFont(e){return this.extend({font:e})}withTextFontFamily(e){return this.extend({fontFamily:e,font:""})}withTextFontWeight(e){return this.extend({fontWeight:e,font:""})}withTextFontShape(e){return this.extend({fontShape:e,font:""})}sizingClasses(e){return e.size!==this.size?["sizing","reset-size"+e.size,"size"+this.size]:[]}baseSizingClasses(){return this.size!==t.BASESIZE?["sizing","reset-size"+this.size,"size"+t.BASESIZE]:[]}fontMetrics(){return this._fontMetrics||(this._fontMetrics=Zbe(this.size)),this._fontMetrics}getColor(){return this.phantom?"transparent":this.color}};u4.BASESIZE=6;bC={pt:1,mm:7227/2540,cm:7227/254,in:72.27,bp:803/800,pc:12,dd:1238/1157,cc:14856/1157,nd:685/642,nc:1370/107,sp:1/65536,px:803/800},e4e={ex:!0,em:!0,mu:!0},FG=o(function(e){return typeof e!="string"&&(e=e.unit),e in bC||e in e4e||e==="ex"},"validUnit"),Qn=o(function(e,r){var n;if(e.unit in bC)n=bC[e.unit]/r.fontMetrics().ptPerEm/r.sizeMultiplier;else if(e.unit==="mu")n=r.fontMetrics().cssEmPerMu;else{var i;if(r.style.isTight()?i=r.havingStyle(r.style.text()):i=r,e.unit==="ex")n=i.fontMetrics().xHeight;else if(e.unit==="em")n=i.fontMetrics().quad;else throw new ut("Invalid unit: '"+e.unit+"'");i!==r&&(n*=i.sizeMultiplier/r.sizeMultiplier)}return Math.min(e.number*n,r.maxSize)},"calculateSize"),mt=o(function(e){return+e.toFixed(4)+"em"},"makeEm"),lh=o(function(e){return e.filter(r=>r).join(" ")},"createClass"),zG=o(function(e,r,n){if(this.classes=e||[],this.attributes={},this.height=0,this.depth=0,this.maxFontSize=0,this.style=n||{},r){r.style.isTight()&&this.classes.push("mtight");var i=r.getColor();i&&(this.style.color=i)}},"initNode"),GG=o(function(e){var r=document.createElement(e);r.className=lh(this.classes);for(var n in this.style)this.style.hasOwnProperty(n)&&(r.style[n]=this.style[n]);for(var i in this.attributes)this.attributes.hasOwnProperty(i)&&r.setAttribute(i,this.attributes[i]);for(var a=0;a<this.children.length;a++)r.appendChild(this.children[a].toNode());return r},"toNode"),$G=o(function(e){var r="<"+e;this.classes.length&&(r+=' class="'+Jt.escape(lh(this.classes))+'"');var n="";for(var i in this.style)this.style.hasOwnProperty(i)&&(n+=Jt.hyphenate(i)+":"+this.style[i]+";");n&&(r+=' style="'+Jt.escape(n)+'"');for(var a in this.attributes)this.attributes.hasOwnProperty(a)&&(r+=" "+a+'="'+Jt.escape(this.attributes[a])+'"');r+=">";for(var s=0;s<this.children.length;s++)r+=this.children[s].toMarkup();return r+="</"+e+">",r},"toMarkup"),qf=class{static{o(this,"Span")}constructor(e,r,n,i){this.children=void 0,this.attributes=void 0,this.classes=void 0,this.height=void 0,this.depth=void 0,this.width=void 0,this.maxFontSize=void 0,this.style=void 0,zG.call(this,e,n,i),this.children=r||[]}setAttribute(e,r){this.attributes[e]=r}hasClass(e){return Jt.contains(this.classes,e)}toNode(){return GG.call(this,"span")}toMarkup(){return $G.call(this,"span")}},ey=class{static{o(this,"Anchor")}constructor(e,r,n,i){this.children=void 0,this.attributes=void 0,this.classes=void 0,this.height=void 0,this.depth=void 0,this.maxFontSize=void 0,this.style=void 0,zG.call(this,r,i),this.children=n||[],this.setAttribute("href",e)}setAttribute(e,r){this.attributes[e]=r}hasClass(e){return Jt.contains(this.classes,e)}toNode(){return GG.call(this,"a")}toMarkup(){return $G.call(this,"a")}},wC=class{static{o(this,"Img")}constructor(e,r,n){this.src=void 0,this.alt=void 0,this.classes=void 0,this.height=void 0,this.depth=void 0,this.maxFontSize=void 0,this.style=void 0,this.alt=r,this.src=e,this.classes=["mord"],this.style=n}hasClass(e){return Jt.contains(this.classes,e)}toNode(){var e=document.createElement("img");e.src=this.src,e.alt=this.alt,e.className="mord";for(var r in this.style)this.style.hasOwnProperty(r)&&(e.style[r]=this.style[r]);return e}toMarkup(){var e='<img src="'+Jt.escape(this.src)+'"'+(' alt="'+Jt.escape(this.alt)+'"'),r="";for(var n in this.style)this.style.hasOwnProperty(n)&&(r+=Jt.hyphenate(n)+":"+this.style[n]+";");return r&&(e+=' style="'+Jt.escape(r)+'"'),e+="'/>",e}},t4e={\u00EE:"\u0131\u0302",\u00EF:"\u0131\u0308",\u00ED:"\u0131\u0301",\u00EC:"\u0131\u0300"},ms=class{static{o(this,"SymbolNode")}constructor(e,r,n,i,a,s,l,u){this.text=void 0,this.height=void 0,this.depth=void 0,this.italic=void 0,this.skew=void 0,this.width=void 0,this.maxFontSize=void 0,this.classes=void 0,this.style=void 0,this.text=e,this.height=r||0,this.depth=n||0,this.italic=i||0,this.skew=a||0,this.width=s||0,this.classes=l||[],this.style=u||{},this.maxFontSize=0;var h=Gbe(this.text.charCodeAt(0));h&&this.classes.push(h+"_fallback"),/[îïíì]/.test(this.text)&&(this.text=t4e[this.text])}hasClass(e){return Jt.contains(this.classes,e)}toNode(){var e=document.createTextNode(this.text),r=null;this.italic>0&&(r=document.createElement("span"),r.style.marginRight=mt(this.italic)),this.classes.length>0&&(r=r||document.createElement("span"),r.className=lh(this.classes));for(var n in this.style)this.style.hasOwnProperty(n)&&(r=r||document.createElement("span"),r.style[n]=this.style[n]);return r?(r.appendChild(e),r):e}toMarkup(){var e=!1,r="<span";this.classes.length&&(e=!0,r+=' class="',r+=Jt.escape(lh(this.classes)),r+='"');var n="";this.italic>0&&(n+="margin-right:"+this.italic+"em;");for(var i in this.style)this.style.hasOwnProperty(i)&&(n+=Jt.hyphenate(i)+":"+this.style[i]+";");n&&(e=!0,r+=' style="'+Jt.escape(n)+'"');var a=Jt.escape(this.text);return e?(r+=">",r+=a,r+="</span>",r):a}},fl=class{static{o(this,"SvgNode")}constructor(e,r){this.children=void 0,this.attributes=void 0,this.children=e||[],this.attributes=r||{}}toNode(){var e="http://www.w3.org/2000/svg",r=document.createElementNS(e,"svg");for(var n in this.attributes)Object.prototype.hasOwnProperty.call(this.attributes,n)&&r.setAttribute(n,this.attributes[n]);for(var i=0;i<this.children.length;i++)r.appendChild(this.children[i].toNode());return r}toMarkup(){var e='<svg xmlns="http://www.w3.org/2000/svg"';for(var r in this.attributes)Object.prototype.hasOwnProperty.call(this.attributes,r)&&(e+=" "+r+'="'+Jt.escape(this.attributes[r])+'"');e+=">";for(var n=0;n<this.children.length;n++)e+=this.children[n].toMarkup();return e+="</svg>",e}},Jl=class{static{o(this,"PathNode")}constructor(e,r){this.pathName=void 0,this.alternate=void 0,this.pathName=e,this.alternate=r}toNode(){var e="http://www.w3.org/2000/svg",r=document.createElementNS(e,"path");return this.alternate?r.setAttribute("d",this.alternate):r.setAttribute("d",aG[this.pathName]),r}toMarkup(){return this.alternate?'<path d="'+Jt.escape(this.alternate)+'"/>':'<path d="'+Jt.escape(aG[this.pathName])+'"/>'}},ty=class{static{o(this,"LineNode")}constructor(e){this.attributes=void 0,this.attributes=e||{}}toNode(){var e="http://www.w3.org/2000/svg",r=document.createElementNS(e,"line");for(var n in this.attributes)Object.prototype.hasOwnProperty.call(this.attributes,n)&&r.setAttribute(n,this.attributes[n]);return r}toMarkup(){var e="<line";for(var r in this.attributes)Object.prototype.hasOwnProperty.call(this.attributes,r)&&(e+=" "+r+'="'+Jt.escape(this.attributes[r])+'"');return e+="/>",e}};o(cG,"assertSymbolDomNode");o(r4e,"assertSpan");n4e={bin:1,close:1,inner:1,open:1,punct:1,rel:1},i4e={"accent-token":1,mathord:1,"op-token":1,spacing:1,textord:1},En={math:{},text:{}};o(G,"defineSymbol");V="math",it="text",re="main",ve="ams",$n="accent-token",Nt="bin",qa="close",dp="inner",tr="mathord",Ti="op-token",qs="open",y4="punct",we="rel",su="spacing",_e="textord";G(V,re,we,"\u2261","\\equiv",!0);G(V,re,we,"\u227A","\\prec",!0);G(V,re,we,"\u227B","\\succ",!0);G(V,re,we,"\u223C","\\sim",!0);G(V,re,we,"\u22A5","\\perp");G(V,re,we,"\u2AAF","\\preceq",!0);G(V,re,we,"\u2AB0","\\succeq",!0);G(V,re,we,"\u2243","\\simeq",!0);G(V,re,we,"\u2223","\\mid",!0);G(V,re,we,"\u226A","\\ll",!0);G(V,re,we,"\u226B","\\gg",!0);G(V,re,we,"\u224D","\\asymp",!0);G(V,re,we,"\u2225","\\parallel");G(V,re,we,"\u22C8","\\bowtie",!0);G(V,re,we,"\u2323","\\smile",!0);G(V,re,we,"\u2291","\\sqsubseteq",!0);G(V,re,we,"\u2292","\\sqsupseteq",!0);G(V,re,we,"\u2250","\\doteq",!0);G(V,re,we,"\u2322","\\frown",!0);G(V,re,we,"\u220B","\\ni",!0);G(V,re,we,"\u221D","\\propto",!0);G(V,re,we,"\u22A2","\\vdash",!0);G(V,re,we,"\u22A3","\\dashv",!0);G(V,re,we,"\u220B","\\owns");G(V,re,y4,".","\\ldotp");G(V,re,y4,"\u22C5","\\cdotp");G(V,re,_e,"#","\\#");G(it,re,_e,"#","\\#");G(V,re,_e,"&","\\&");G(it,re,_e,"&","\\&");G(V,re,_e,"\u2135","\\aleph",!0);G(V,re,_e,"\u2200","\\forall",!0);G(V,re,_e,"\u210F","\\hbar",!0);G(V,re,_e,"\u2203","\\exists",!0);G(V,re,_e,"\u2207","\\nabla",!0);G(V,re,_e,"\u266D","\\flat",!0);G(V,re,_e,"\u2113","\\ell",!0);G(V,re,_e,"\u266E","\\natural",!0);G(V,re,_e,"\u2663","\\clubsuit",!0);G(V,re,_e,"\u2118","\\wp",!0);G(V,re,_e,"\u266F","\\sharp",!0);G(V,re,_e,"\u2662","\\diamondsuit",!0);G(V,re,_e,"\u211C","\\Re",!0);G(V,re,_e,"\u2661","\\heartsuit",!0);G(V,re,_e,"\u2111","\\Im",!0);G(V,re,_e,"\u2660","\\spadesuit",!0);G(V,re,_e,"\xA7","\\S",!0);G(it,re,_e,"\xA7","\\S");G(V,re,_e,"\xB6","\\P",!0);G(it,re,_e,"\xB6","\\P");G(V,re,_e,"\u2020","\\dag");G(it,re,_e,"\u2020","\\dag");G(it,re,_e,"\u2020","\\textdagger");G(V,re,_e,"\u2021","\\ddag");G(it,re,_e,"\u2021","\\ddag");G(it,re,_e,"\u2021","\\textdaggerdbl");G(V,re,qa,"\u23B1","\\rmoustache",!0);G(V,re,qs,"\u23B0","\\lmoustache",!0);G(V,re,qa,"\u27EF","\\rgroup",!0);G(V,re,qs,"\u27EE","\\lgroup",!0);G(V,re,Nt,"\u2213","\\mp",!0);G(V,re,Nt,"\u2296","\\ominus",!0);G(V,re,Nt,"\u228E","\\uplus",!0);G(V,re,Nt,"\u2293","\\sqcap",!0);G(V,re,Nt,"\u2217","\\ast");G(V,re,Nt,"\u2294","\\sqcup",!0);G(V,re,Nt,"\u25EF","\\bigcirc",!0);G(V,re,Nt,"\u2219","\\bullet",!0);G(V,re,Nt,"\u2021","\\ddagger");G(V,re,Nt,"\u2240","\\wr",!0);G(V,re,Nt,"\u2A3F","\\amalg");G(V,re,Nt,"&","\\And");G(V,re,we,"\u27F5","\\longleftarrow",!0);G(V,re,we,"\u21D0","\\Leftarrow",!0);G(V,re,we,"\u27F8","\\Longleftarrow",!0);G(V,re,we,"\u27F6","\\longrightarrow",!0);G(V,re,we,"\u21D2","\\Rightarrow",!0);G(V,re,we,"\u27F9","\\Longrightarrow",!0);G(V,re,we,"\u2194","\\leftrightarrow",!0);G(V,re,we,"\u27F7","\\longleftrightarrow",!0);G(V,re,we,"\u21D4","\\Leftrightarrow",!0);G(V,re,we,"\u27FA","\\Longleftrightarrow",!0);G(V,re,we,"\u21A6","\\mapsto",!0);G(V,re,we,"\u27FC","\\longmapsto",!0);G(V,re,we,"\u2197","\\nearrow",!0);G(V,re,we,"\u21A9","\\hookleftarrow",!0);G(V,re,we,"\u21AA","\\hookrightarrow",!0);G(V,re,we,"\u2198","\\searrow",!0);G(V,re,we,"\u21BC","\\leftharpoonup",!0);G(V,re,we,"\u21C0","\\rightharpoonup",!0);G(V,re,we,"\u2199","\\swarrow",!0);G(V,re,we,"\u21BD","\\leftharpoondown",!0);G(V,re,we,"\u21C1","\\rightharpoondown",!0);G(V,re,we,"\u2196","\\nwarrow",!0);G(V,re,we,"\u21CC","\\rightleftharpoons",!0);G(V,ve,we,"\u226E","\\nless",!0);G(V,ve,we,"\uE010","\\@nleqslant");G(V,ve,we,"\uE011","\\@nleqq");G(V,ve,we,"\u2A87","\\lneq",!0);G(V,ve,we,"\u2268","\\lneqq",!0);G(V,ve,we,"\uE00C","\\@lvertneqq");G(V,ve,we,"\u22E6","\\lnsim",!0);G(V,ve,we,"\u2A89","\\lnapprox",!0);G(V,ve,we,"\u2280","\\nprec",!0);G(V,ve,we,"\u22E0","\\npreceq",!0);G(V,ve,we,"\u22E8","\\precnsim",!0);G(V,ve,we,"\u2AB9","\\precnapprox",!0);G(V,ve,we,"\u2241","\\nsim",!0);G(V,ve,we,"\uE006","\\@nshortmid");G(V,ve,we,"\u2224","\\nmid",!0);G(V,ve,we,"\u22AC","\\nvdash",!0);G(V,ve,we,"\u22AD","\\nvDash",!0);G(V,ve,we,"\u22EA","\\ntriangleleft");G(V,ve,we,"\u22EC","\\ntrianglelefteq",!0);G(V,ve,we,"\u228A","\\subsetneq",!0);G(V,ve,we,"\uE01A","\\@varsubsetneq");G(V,ve,we,"\u2ACB","\\subsetneqq",!0);G(V,ve,we,"\uE017","\\@varsubsetneqq");G(V,ve,we,"\u226F","\\ngtr",!0);G(V,ve,we,"\uE00F","\\@ngeqslant");G(V,ve,we,"\uE00E","\\@ngeqq");G(V,ve,we,"\u2A88","\\gneq",!0);G(V,ve,we,"\u2269","\\gneqq",!0);G(V,ve,we,"\uE00D","\\@gvertneqq");G(V,ve,we,"\u22E7","\\gnsim",!0);G(V,ve,we,"\u2A8A","\\gnapprox",!0);G(V,ve,we,"\u2281","\\nsucc",!0);G(V,ve,we,"\u22E1","\\nsucceq",!0);G(V,ve,we,"\u22E9","\\succnsim",!0);G(V,ve,we,"\u2ABA","\\succnapprox",!0);G(V,ve,we,"\u2246","\\ncong",!0);G(V,ve,we,"\uE007","\\@nshortparallel");G(V,ve,we,"\u2226","\\nparallel",!0);G(V,ve,we,"\u22AF","\\nVDash",!0);G(V,ve,we,"\u22EB","\\ntriangleright");G(V,ve,we,"\u22ED","\\ntrianglerighteq",!0);G(V,ve,we,"\uE018","\\@nsupseteqq");G(V,ve,we,"\u228B","\\supsetneq",!0);G(V,ve,we,"\uE01B","\\@varsupsetneq");G(V,ve,we,"\u2ACC","\\supsetneqq",!0);G(V,ve,we,"\uE019","\\@varsupsetneqq");G(V,ve,we,"\u22AE","\\nVdash",!0);G(V,ve,we,"\u2AB5","\\precneqq",!0);G(V,ve,we,"\u2AB6","\\succneqq",!0);G(V,ve,we,"\uE016","\\@nsubseteqq");G(V,ve,Nt,"\u22B4","\\unlhd");G(V,ve,Nt,"\u22B5","\\unrhd");G(V,ve,we,"\u219A","\\nleftarrow",!0);G(V,ve,we,"\u219B","\\nrightarrow",!0);G(V,ve,we,"\u21CD","\\nLeftarrow",!0);G(V,ve,we,"\u21CF","\\nRightarrow",!0);G(V,ve,we,"\u21AE","\\nleftrightarrow",!0);G(V,ve,we,"\u21CE","\\nLeftrightarrow",!0);G(V,ve,we,"\u25B3","\\vartriangle");G(V,ve,_e,"\u210F","\\hslash");G(V,ve,_e,"\u25BD","\\triangledown");G(V,ve,_e,"\u25CA","\\lozenge");G(V,ve,_e,"\u24C8","\\circledS");G(V,ve,_e,"\xAE","\\circledR");G(it,ve,_e,"\xAE","\\circledR");G(V,ve,_e,"\u2221","\\measuredangle",!0);G(V,ve,_e,"\u2204","\\nexists");G(V,ve,_e,"\u2127","\\mho");G(V,ve,_e,"\u2132","\\Finv",!0);G(V,ve,_e,"\u2141","\\Game",!0);G(V,ve,_e,"\u2035","\\backprime");G(V,ve,_e,"\u25B2","\\blacktriangle");G(V,ve,_e,"\u25BC","\\blacktriangledown");G(V,ve,_e,"\u25A0","\\blacksquare");G(V,ve,_e,"\u29EB","\\blacklozenge");G(V,ve,_e,"\u2605","\\bigstar");G(V,ve,_e,"\u2222","\\sphericalangle",!0);G(V,ve,_e,"\u2201","\\complement",!0);G(V,ve,_e,"\xF0","\\eth",!0);G(it,re,_e,"\xF0","\xF0");G(V,ve,_e,"\u2571","\\diagup");G(V,ve,_e,"\u2572","\\diagdown");G(V,ve,_e,"\u25A1","\\square");G(V,ve,_e,"\u25A1","\\Box");G(V,ve,_e,"\u25CA","\\Diamond");G(V,ve,_e,"\xA5","\\yen",!0);G(it,ve,_e,"\xA5","\\yen",!0);G(V,ve,_e,"\u2713","\\checkmark",!0);G(it,ve,_e,"\u2713","\\checkmark");G(V,ve,_e,"\u2136","\\beth",!0);G(V,ve,_e,"\u2138","\\daleth",!0);G(V,ve,_e,"\u2137","\\gimel",!0);G(V,ve,_e,"\u03DD","\\digamma",!0);G(V,ve,_e,"\u03F0","\\varkappa");G(V,ve,qs,"\u250C","\\@ulcorner",!0);G(V,ve,qa,"\u2510","\\@urcorner",!0);G(V,ve,qs,"\u2514","\\@llcorner",!0);G(V,ve,qa,"\u2518","\\@lrcorner",!0);G(V,ve,we,"\u2266","\\leqq",!0);G(V,ve,we,"\u2A7D","\\leqslant",!0);G(V,ve,we,"\u2A95","\\eqslantless",!0);G(V,ve,we,"\u2272","\\lesssim",!0);G(V,ve,we,"\u2A85","\\lessapprox",!0);G(V,ve,we,"\u224A","\\approxeq",!0);G(V,ve,Nt,"\u22D6","\\lessdot");G(V,ve,we,"\u22D8","\\lll",!0);G(V,ve,we,"\u2276","\\lessgtr",!0);G(V,ve,we,"\u22DA","\\lesseqgtr",!0);G(V,ve,we,"\u2A8B","\\lesseqqgtr",!0);G(V,ve,we,"\u2251","\\doteqdot");G(V,ve,we,"\u2253","\\risingdotseq",!0);G(V,ve,we,"\u2252","\\fallingdotseq",!0);G(V,ve,we,"\u223D","\\backsim",!0);G(V,ve,we,"\u22CD","\\backsimeq",!0);G(V,ve,we,"\u2AC5","\\subseteqq",!0);G(V,ve,we,"\u22D0","\\Subset",!0);G(V,ve,we,"\u228F","\\sqsubset",!0);G(V,ve,we,"\u227C","\\preccurlyeq",!0);G(V,ve,we,"\u22DE","\\curlyeqprec",!0);G(V,ve,we,"\u227E","\\precsim",!0);G(V,ve,we,"\u2AB7","\\precapprox",!0);G(V,ve,we,"\u22B2","\\vartriangleleft");G(V,ve,we,"\u22B4","\\trianglelefteq");G(V,ve,we,"\u22A8","\\vDash",!0);G(V,ve,we,"\u22AA","\\Vvdash",!0);G(V,ve,we,"\u2323","\\smallsmile");G(V,ve,we,"\u2322","\\smallfrown");G(V,ve,we,"\u224F","\\bumpeq",!0);G(V,ve,we,"\u224E","\\Bumpeq",!0);G(V,ve,we,"\u2267","\\geqq",!0);G(V,ve,we,"\u2A7E","\\geqslant",!0);G(V,ve,we,"\u2A96","\\eqslantgtr",!0);G(V,ve,we,"\u2273","\\gtrsim",!0);G(V,ve,we,"\u2A86","\\gtrapprox",!0);G(V,ve,Nt,"\u22D7","\\gtrdot");G(V,ve,we,"\u22D9","\\ggg",!0);G(V,ve,we,"\u2277","\\gtrless",!0);G(V,ve,we,"\u22DB","\\gtreqless",!0);G(V,ve,we,"\u2A8C","\\gtreqqless",!0);G(V,ve,we,"\u2256","\\eqcirc",!0);G(V,ve,we,"\u2257","\\circeq",!0);G(V,ve,we,"\u225C","\\triangleq",!0);G(V,ve,we,"\u223C","\\thicksim");G(V,ve,we,"\u2248","\\thickapprox");G(V,ve,we,"\u2AC6","\\supseteqq",!0);G(V,ve,we,"\u22D1","\\Supset",!0);G(V,ve,we,"\u2290","\\sqsupset",!0);G(V,ve,we,"\u227D","\\succcurlyeq",!0);G(V,ve,we,"\u22DF","\\curlyeqsucc",!0);G(V,ve,we,"\u227F","\\succsim",!0);G(V,ve,we,"\u2AB8","\\succapprox",!0);G(V,ve,we,"\u22B3","\\vartriangleright");G(V,ve,we,"\u22B5","\\trianglerighteq");G(V,ve,we,"\u22A9","\\Vdash",!0);G(V,ve,we,"\u2223","\\shortmid");G(V,ve,we,"\u2225","\\shortparallel");G(V,ve,we,"\u226C","\\between",!0);G(V,ve,we,"\u22D4","\\pitchfork",!0);G(V,ve,we,"\u221D","\\varpropto");G(V,ve,we,"\u25C0","\\blacktriangleleft");G(V,ve,we,"\u2234","\\therefore",!0);G(V,ve,we,"\u220D","\\backepsilon");G(V,ve,we,"\u25B6","\\blacktriangleright");G(V,ve,we,"\u2235","\\because",!0);G(V,ve,we,"\u22D8","\\llless");G(V,ve,we,"\u22D9","\\gggtr");G(V,ve,Nt,"\u22B2","\\lhd");G(V,ve,Nt,"\u22B3","\\rhd");G(V,ve,we,"\u2242","\\eqsim",!0);G(V,re,we,"\u22C8","\\Join");G(V,ve,we,"\u2251","\\Doteq",!0);G(V,ve,Nt,"\u2214","\\dotplus",!0);G(V,ve,Nt,"\u2216","\\smallsetminus");G(V,ve,Nt,"\u22D2","\\Cap",!0);G(V,ve,Nt,"\u22D3","\\Cup",!0);G(V,ve,Nt,"\u2A5E","\\doublebarwedge",!0);G(V,ve,Nt,"\u229F","\\boxminus",!0);G(V,ve,Nt,"\u229E","\\boxplus",!0);G(V,ve,Nt,"\u22C7","\\divideontimes",!0);G(V,ve,Nt,"\u22C9","\\ltimes",!0);G(V,ve,Nt,"\u22CA","\\rtimes",!0);G(V,ve,Nt,"\u22CB","\\leftthreetimes",!0);G(V,ve,Nt,"\u22CC","\\rightthreetimes",!0);G(V,ve,Nt,"\u22CF","\\curlywedge",!0);G(V,ve,Nt,"\u22CE","\\curlyvee",!0);G(V,ve,Nt,"\u229D","\\circleddash",!0);G(V,ve,Nt,"\u229B","\\circledast",!0);G(V,ve,Nt,"\u22C5","\\centerdot");G(V,ve,Nt,"\u22BA","\\intercal",!0);G(V,ve,Nt,"\u22D2","\\doublecap");G(V,ve,Nt,"\u22D3","\\doublecup");G(V,ve,Nt,"\u22A0","\\boxtimes",!0);G(V,ve,we,"\u21E2","\\dashrightarrow",!0);G(V,ve,we,"\u21E0","\\dashleftarrow",!0);G(V,ve,we,"\u21C7","\\leftleftarrows",!0);G(V,ve,we,"\u21C6","\\leftrightarrows",!0);G(V,ve,we,"\u21DA","\\Lleftarrow",!0);G(V,ve,we,"\u219E","\\twoheadleftarrow",!0);G(V,ve,we,"\u21A2","\\leftarrowtail",!0);G(V,ve,we,"\u21AB","\\looparrowleft",!0);G(V,ve,we,"\u21CB","\\leftrightharpoons",!0);G(V,ve,we,"\u21B6","\\curvearrowleft",!0);G(V,ve,we,"\u21BA","\\circlearrowleft",!0);G(V,ve,we,"\u21B0","\\Lsh",!0);G(V,ve,we,"\u21C8","\\upuparrows",!0);G(V,ve,we,"\u21BF","\\upharpoonleft",!0);G(V,ve,we,"\u21C3","\\downharpoonleft",!0);G(V,re,we,"\u22B6","\\origof",!0);G(V,re,we,"\u22B7","\\imageof",!0);G(V,ve,we,"\u22B8","\\multimap",!0);G(V,ve,we,"\u21AD","\\leftrightsquigarrow",!0);G(V,ve,we,"\u21C9","\\rightrightarrows",!0);G(V,ve,we,"\u21C4","\\rightleftarrows",!0);G(V,ve,we,"\u21A0","\\twoheadrightarrow",!0);G(V,ve,we,"\u21A3","\\rightarrowtail",!0);G(V,ve,we,"\u21AC","\\looparrowright",!0);G(V,ve,we,"\u21B7","\\curvearrowright",!0);G(V,ve,we,"\u21BB","\\circlearrowright",!0);G(V,ve,we,"\u21B1","\\Rsh",!0);G(V,ve,we,"\u21CA","\\downdownarrows",!0);G(V,ve,we,"\u21BE","\\upharpoonright",!0);G(V,ve,we,"\u21C2","\\downharpoonright",!0);G(V,ve,we,"\u21DD","\\rightsquigarrow",!0);G(V,ve,we,"\u21DD","\\leadsto");G(V,ve,we,"\u21DB","\\Rrightarrow",!0);G(V,ve,we,"\u21BE","\\restriction");G(V,re,_e,"\u2018","`");G(V,re,_e,"$","\\$");G(it,re,_e,"$","\\$");G(it,re,_e,"$","\\textdollar");G(V,re,_e,"%","\\%");G(it,re,_e,"%","\\%");G(V,re,_e,"_","\\_");G(it,re,_e,"_","\\_");G(it,re,_e,"_","\\textunderscore");G(V,re,_e,"\u2220","\\angle",!0);G(V,re,_e,"\u221E","\\infty",!0);G(V,re,_e,"\u2032","\\prime");G(V,re,_e,"\u25B3","\\triangle");G(V,re,_e,"\u0393","\\Gamma",!0);G(V,re,_e,"\u0394","\\Delta",!0);G(V,re,_e,"\u0398","\\Theta",!0);G(V,re,_e,"\u039B","\\Lambda",!0);G(V,re,_e,"\u039E","\\Xi",!0);G(V,re,_e,"\u03A0","\\Pi",!0);G(V,re,_e,"\u03A3","\\Sigma",!0);G(V,re,_e,"\u03A5","\\Upsilon",!0);G(V,re,_e,"\u03A6","\\Phi",!0);G(V,re,_e,"\u03A8","\\Psi",!0);G(V,re,_e,"\u03A9","\\Omega",!0);G(V,re,_e,"A","\u0391");G(V,re,_e,"B","\u0392");G(V,re,_e,"E","\u0395");G(V,re,_e,"Z","\u0396");G(V,re,_e,"H","\u0397");G(V,re,_e,"I","\u0399");G(V,re,_e,"K","\u039A");G(V,re,_e,"M","\u039C");G(V,re,_e,"N","\u039D");G(V,re,_e,"O","\u039F");G(V,re,_e,"P","\u03A1");G(V,re,_e,"T","\u03A4");G(V,re,_e,"X","\u03A7");G(V,re,_e,"\xAC","\\neg",!0);G(V,re,_e,"\xAC","\\lnot");G(V,re,_e,"\u22A4","\\top");G(V,re,_e,"\u22A5","\\bot");G(V,re,_e,"\u2205","\\emptyset");G(V,ve,_e,"\u2205","\\varnothing");G(V,re,tr,"\u03B1","\\alpha",!0);G(V,re,tr,"\u03B2","\\beta",!0);G(V,re,tr,"\u03B3","\\gamma",!0);G(V,re,tr,"\u03B4","\\delta",!0);G(V,re,tr,"\u03F5","\\epsilon",!0);G(V,re,tr,"\u03B6","\\zeta",!0);G(V,re,tr,"\u03B7","\\eta",!0);G(V,re,tr,"\u03B8","\\theta",!0);G(V,re,tr,"\u03B9","\\iota",!0);G(V,re,tr,"\u03BA","\\kappa",!0);G(V,re,tr,"\u03BB","\\lambda",!0);G(V,re,tr,"\u03BC","\\mu",!0);G(V,re,tr,"\u03BD","\\nu",!0);G(V,re,tr,"\u03BE","\\xi",!0);G(V,re,tr,"\u03BF","\\omicron",!0);G(V,re,tr,"\u03C0","\\pi",!0);G(V,re,tr,"\u03C1","\\rho",!0);G(V,re,tr,"\u03C3","\\sigma",!0);G(V,re,tr,"\u03C4","\\tau",!0);G(V,re,tr,"\u03C5","\\upsilon",!0);G(V,re,tr,"\u03D5","\\phi",!0);G(V,re,tr,"\u03C7","\\chi",!0);G(V,re,tr,"\u03C8","\\psi",!0);G(V,re,tr,"\u03C9","\\omega",!0);G(V,re,tr,"\u03B5","\\varepsilon",!0);G(V,re,tr,"\u03D1","\\vartheta",!0);G(V,re,tr,"\u03D6","\\varpi",!0);G(V,re,tr,"\u03F1","\\varrho",!0);G(V,re,tr,"\u03C2","\\varsigma",!0);G(V,re,tr,"\u03C6","\\varphi",!0);G(V,re,Nt,"\u2217","*",!0);G(V,re,Nt,"+","+");G(V,re,Nt,"\u2212","-",!0);G(V,re,Nt,"\u22C5","\\cdot",!0);G(V,re,Nt,"\u2218","\\circ",!0);G(V,re,Nt,"\xF7","\\div",!0);G(V,re,Nt,"\xB1","\\pm",!0);G(V,re,Nt,"\xD7","\\times",!0);G(V,re,Nt,"\u2229","\\cap",!0);G(V,re,Nt,"\u222A","\\cup",!0);G(V,re,Nt,"\u2216","\\setminus",!0);G(V,re,Nt,"\u2227","\\land");G(V,re,Nt,"\u2228","\\lor");G(V,re,Nt,"\u2227","\\wedge",!0);G(V,re,Nt,"\u2228","\\vee",!0);G(V,re,_e,"\u221A","\\surd");G(V,re,qs,"\u27E8","\\langle",!0);G(V,re,qs,"\u2223","\\lvert");G(V,re,qs,"\u2225","\\lVert");G(V,re,qa,"?","?");G(V,re,qa,"!","!");G(V,re,qa,"\u27E9","\\rangle",!0);G(V,re,qa,"\u2223","\\rvert");G(V,re,qa,"\u2225","\\rVert");G(V,re,we,"=","=");G(V,re,we,":",":");G(V,re,we,"\u2248","\\approx",!0);G(V,re,we,"\u2245","\\cong",!0);G(V,re,we,"\u2265","\\ge");G(V,re,we,"\u2265","\\geq",!0);G(V,re,we,"\u2190","\\gets");G(V,re,we,">","\\gt",!0);G(V,re,we,"\u2208","\\in",!0);G(V,re,we,"\uE020","\\@not");G(V,re,we,"\u2282","\\subset",!0);G(V,re,we,"\u2283","\\supset",!0);G(V,re,we,"\u2286","\\subseteq",!0);G(V,re,we,"\u2287","\\supseteq",!0);G(V,ve,we,"\u2288","\\nsubseteq",!0);G(V,ve,we,"\u2289","\\nsupseteq",!0);G(V,re,we,"\u22A8","\\models");G(V,re,we,"\u2190","\\leftarrow",!0);G(V,re,we,"\u2264","\\le");G(V,re,we,"\u2264","\\leq",!0);G(V,re,we,"<","\\lt",!0);G(V,re,we,"\u2192","\\rightarrow",!0);G(V,re,we,"\u2192","\\to");G(V,ve,we,"\u2271","\\ngeq",!0);G(V,ve,we,"\u2270","\\nleq",!0);G(V,re,su,"\xA0","\\ ");G(V,re,su,"\xA0","\\space");G(V,re,su,"\xA0","\\nobreakspace");G(it,re,su,"\xA0","\\ ");G(it,re,su,"\xA0"," ");G(it,re,su,"\xA0","\\space");G(it,re,su,"\xA0","\\nobreakspace");G(V,re,su,null,"\\nobreak");G(V,re,su,null,"\\allowbreak");G(V,re,y4,",",",");G(V,re,y4,";",";");G(V,ve,Nt,"\u22BC","\\barwedge",!0);G(V,ve,Nt,"\u22BB","\\veebar",!0);G(V,re,Nt,"\u2299","\\odot",!0);G(V,re,Nt,"\u2295","\\oplus",!0);G(V,re,Nt,"\u2297","\\otimes",!0);G(V,re,_e,"\u2202","\\partial",!0);G(V,re,Nt,"\u2298","\\oslash",!0);G(V,ve,Nt,"\u229A","\\circledcirc",!0);G(V,ve,Nt,"\u22A1","\\boxdot",!0);G(V,re,Nt,"\u25B3","\\bigtriangleup");G(V,re,Nt,"\u25BD","\\bigtriangledown");G(V,re,Nt,"\u2020","\\dagger");G(V,re,Nt,"\u22C4","\\diamond");G(V,re,Nt,"\u22C6","\\star");G(V,re,Nt,"\u25C3","\\triangleleft");G(V,re,Nt,"\u25B9","\\triangleright");G(V,re,qs,"{","\\{");G(it,re,_e,"{","\\{");G(it,re,_e,"{","\\textbraceleft");G(V,re,qa,"}","\\}");G(it,re,_e,"}","\\}");G(it,re,_e,"}","\\textbraceright");G(V,re,qs,"{","\\lbrace");G(V,re,qa,"}","\\rbrace");G(V,re,qs,"[","\\lbrack",!0);G(it,re,_e,"[","\\lbrack",!0);G(V,re,qa,"]","\\rbrack",!0);G(it,re,_e,"]","\\rbrack",!0);G(V,re,qs,"(","\\lparen",!0);G(V,re,qa,")","\\rparen",!0);G(it,re,_e,"<","\\textless",!0);G(it,re,_e,">","\\textgreater",!0);G(V,re,qs,"\u230A","\\lfloor",!0);G(V,re,qa,"\u230B","\\rfloor",!0);G(V,re,qs,"\u2308","\\lceil",!0);G(V,re,qa,"\u2309","\\rceil",!0);G(V,re,_e,"\\","\\backslash");G(V,re,_e,"\u2223","|");G(V,re,_e,"\u2223","\\vert");G(it,re,_e,"|","\\textbar",!0);G(V,re,_e,"\u2225","\\|");G(V,re,_e,"\u2225","\\Vert");G(it,re,_e,"\u2225","\\textbardbl");G(it,re,_e,"~","\\textasciitilde");G(it,re,_e,"\\","\\textbackslash");G(it,re,_e,"^","\\textasciicircum");G(V,re,we,"\u2191","\\uparrow",!0);G(V,re,we,"\u21D1","\\Uparrow",!0);G(V,re,we,"\u2193","\\downarrow",!0);G(V,re,we,"\u21D3","\\Downarrow",!0);G(V,re,we,"\u2195","\\updownarrow",!0);G(V,re,we,"\u21D5","\\Updownarrow",!0);G(V,re,Ti,"\u2210","\\coprod");G(V,re,Ti,"\u22C1","\\bigvee");G(V,re,Ti,"\u22C0","\\bigwedge");G(V,re,Ti,"\u2A04","\\biguplus");G(V,re,Ti,"\u22C2","\\bigcap");G(V,re,Ti,"\u22C3","\\bigcup");G(V,re,Ti,"\u222B","\\int");G(V,re,Ti,"\u222B","\\intop");G(V,re,Ti,"\u222C","\\iint");G(V,re,Ti,"\u222D","\\iiint");G(V,re,Ti,"\u220F","\\prod");G(V,re,Ti,"\u2211","\\sum");G(V,re,Ti,"\u2A02","\\bigotimes");G(V,re,Ti,"\u2A01","\\bigoplus");G(V,re,Ti,"\u2A00","\\bigodot");G(V,re,Ti,"\u222E","\\oint");G(V,re,Ti,"\u222F","\\oiint");G(V,re,Ti,"\u2230","\\oiiint");G(V,re,Ti,"\u2A06","\\bigsqcup");G(V,re,Ti,"\u222B","\\smallint");G(it,re,dp,"\u2026","\\textellipsis");G(V,re,dp,"\u2026","\\mathellipsis");G(it,re,dp,"\u2026","\\ldots",!0);G(V,re,dp,"\u2026","\\ldots",!0);G(V,re,dp,"\u22EF","\\@cdots",!0);G(V,re,dp,"\u22F1","\\ddots",!0);G(V,re,_e,"\u22EE","\\varvdots");G(V,re,$n,"\u02CA","\\acute");G(V,re,$n,"\u02CB","\\grave");G(V,re,$n,"\xA8","\\ddot");G(V,re,$n,"~","\\tilde");G(V,re,$n,"\u02C9","\\bar");G(V,re,$n,"\u02D8","\\breve");G(V,re,$n,"\u02C7","\\check");G(V,re,$n,"^","\\hat");G(V,re,$n,"\u20D7","\\vec");G(V,re,$n,"\u02D9","\\dot");G(V,re,$n,"\u02DA","\\mathring");G(V,re,tr,"\uE131","\\@imath");G(V,re,tr,"\uE237","\\@jmath");G(V,re,_e,"\u0131","\u0131");G(V,re,_e,"\u0237","\u0237");G(it,re,_e,"\u0131","\\i",!0);G(it,re,_e,"\u0237","\\j",!0);G(it,re,_e,"\xDF","\\ss",!0);G(it,re,_e,"\xE6","\\ae",!0);G(it,re,_e,"\u0153","\\oe",!0);G(it,re,_e,"\xF8","\\o",!0);G(it,re,_e,"\xC6","\\AE",!0);G(it,re,_e,"\u0152","\\OE",!0);G(it,re,_e,"\xD8","\\O",!0);G(it,re,$n,"\u02CA","\\'");G(it,re,$n,"\u02CB","\\`");G(it,re,$n,"\u02C6","\\^");G(it,re,$n,"\u02DC","\\~");G(it,re,$n,"\u02C9","\\=");G(it,re,$n,"\u02D8","\\u");G(it,re,$n,"\u02D9","\\.");G(it,re,$n,"\xB8","\\c");G(it,re,$n,"\u02DA","\\r");G(it,re,$n,"\u02C7","\\v");G(it,re,$n,"\xA8",'\\"');G(it,re,$n,"\u02DD","\\H");G(it,re,$n,"\u25EF","\\textcircled");VG={"--":!0,"---":!0,"``":!0,"''":!0};G(it,re,_e,"\u2013","--",!0);G(it,re,_e,"\u2013","\\textendash");G(it,re,_e,"\u2014","---",!0);G(it,re,_e,"\u2014","\\textemdash");G(it,re,_e,"\u2018","`",!0);G(it,re,_e,"\u2018","\\textquoteleft");G(it,re,_e,"\u2019","'",!0);G(it,re,_e,"\u2019","\\textquoteright");G(it,re,_e,"\u201C","``",!0);G(it,re,_e,"\u201C","\\textquotedblleft");G(it,re,_e,"\u201D","''",!0);G(it,re,_e,"\u201D","\\textquotedblright");G(V,re,_e,"\xB0","\\degree",!0);G(it,re,_e,"\xB0","\\degree");G(it,re,_e,"\xB0","\\textdegree",!0);G(V,re,_e,"\xA3","\\pounds");G(V,re,_e,"\xA3","\\mathsterling",!0);G(it,re,_e,"\xA3","\\pounds");G(it,re,_e,"\xA3","\\textsterling",!0);G(V,ve,_e,"\u2720","\\maltese");G(it,ve,_e,"\u2720","\\maltese");uG='0123456789/@."';for(Qb=0;Qb<uG.length;Qb++)lC=uG.charAt(Qb),G(V,re,_e,lC,lC);hG='0123456789!@*()-=+";:?/.,';for(Zb=0;Zb<hG.length;Zb++)cC=hG.charAt(Zb),G(it,re,_e,cC,cC);h4="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";for(Jb=0;Jb<h4.length;Jb++)X1=h4.charAt(Jb),G(V,re,tr,X1,X1),G(it,re,_e,X1,X1);G(V,ve,_e,"C","\u2102");G(it,ve,_e,"C","\u2102");G(V,ve,_e,"H","\u210D");G(it,ve,_e,"H","\u210D");G(V,ve,_e,"N","\u2115");G(it,ve,_e,"N","\u2115");G(V,ve,_e,"P","\u2119");G(it,ve,_e,"P","\u2119");G(V,ve,_e,"Q","\u211A");G(it,ve,_e,"Q","\u211A");G(V,ve,_e,"R","\u211D");G(it,ve,_e,"R","\u211D");G(V,ve,_e,"Z","\u2124");G(it,ve,_e,"Z","\u2124");G(V,re,tr,"h","\u210E");G(it,re,tr,"h","\u210E");sr="";for(Ea=0;Ea<h4.length;Ea++)jn=h4.charAt(Ea),sr=String.fromCharCode(55349,56320+Ea),G(V,re,tr,jn,sr),G(it,re,_e,jn,sr),sr=String.fromCharCode(55349,56372+Ea),G(V,re,tr,jn,sr),G(it,re,_e,jn,sr),sr=String.fromCharCode(55349,56424+Ea),G(V,re,tr,jn,sr),G(it,re,_e,jn,sr),sr=String.fromCharCode(55349,56580+Ea),G(V,re,tr,jn,sr),G(it,re,_e,jn,sr),sr=String.fromCharCode(55349,56684+Ea),G(V,re,tr,jn,sr),G(it,re,_e,jn,sr),sr=String.fromCharCode(55349,56736+Ea),G(V,re,tr,jn,sr),G(it,re,_e,jn,sr),sr=String.fromCharCode(55349,56788+Ea),G(V,re,tr,jn,sr),G(it,re,_e,jn,sr),sr=String.fromCharCode(55349,56840+Ea),G(V,re,tr,jn,sr),G(it,re,_e,jn,sr),sr=String.fromCharCode(55349,56944+Ea),G(V,re,tr,jn,sr),G(it,re,_e,jn,sr),Ea<26&&(sr=String.fromCharCode(55349,56632+Ea),G(V,re,tr,jn,sr),G(it,re,_e,jn,sr),sr=String.fromCharCode(55349,56476+Ea),G(V,re,tr,jn,sr),G(it,re,_e,jn,sr));sr="\u{1D55C}";G(V,re,tr,"k",sr);G(it,re,_e,"k",sr);for(sh=0;sh<10;sh++)eu=sh.toString(),sr=String.fromCharCode(55349,57294+sh),G(V,re,tr,eu,sr),G(it,re,_e,eu,sr),sr=String.fromCharCode(55349,57314+sh),G(V,re,tr,eu,sr),G(it,re,_e,eu,sr),sr=String.fromCharCode(55349,57324+sh),G(V,re,tr,eu,sr),G(it,re,_e,eu,sr),sr=String.fromCharCode(55349,57334+sh),G(V,re,tr,eu,sr),G(it,re,_e,eu,sr);TC="\xD0\xDE\xFE";for(e4=0;e4<TC.length;e4++)j1=TC.charAt(e4),G(V,re,tr,j1,j1),G(it,re,_e,j1,j1);t4=[["mathbf","textbf","Main-Bold"],["mathbf","textbf","Main-Bold"],["mathnormal","textit","Math-Italic"],["mathnormal","textit","Math-Italic"],["boldsymbol","boldsymbol","Main-BoldItalic"],["boldsymbol","boldsymbol","Main-BoldItalic"],["mathscr","textscr","Script-Regular"],["","",""],["","",""],["","",""],["mathfrak","textfrak","Fraktur-Regular"],["mathfrak","textfrak","Fraktur-Regular"],["mathbb","textbb","AMS-Regular"],["mathbb","textbb","AMS-Regular"],["mathboldfrak","textboldfrak","Fraktur-Regular"],["mathboldfrak","textboldfrak","Fraktur-Regular"],["mathsf","textsf","SansSerif-Regular"],["mathsf","textsf","SansSerif-Regular"],["mathboldsf","textboldsf","SansSerif-Bold"],["mathboldsf","textboldsf","SansSerif-Bold"],["mathitsf","textitsf","SansSerif-Italic"],["mathitsf","textitsf","SansSerif-Italic"],["","",""],["","",""],["mathtt","texttt","Typewriter-Regular"],["mathtt","texttt","Typewriter-Regular"]],fG=[["mathbf","textbf","Main-Bold"],["","",""],["mathsf","textsf","SansSerif-Regular"],["mathboldsf","textboldsf","SansSerif-Bold"],["mathtt","texttt","Typewriter-Regular"]],a4e=o(function(e,r){var n=e.charCodeAt(0),i=e.charCodeAt(1),a=(n-55296)*1024+(i-56320)+65536,s=r==="math"?0:1;if(119808<=a&&a<120484){var l=Math.floor((a-119808)/26);return[t4[l][2],t4[l][s]]}else if(120782<=a&&a<=120831){var u=Math.floor((a-120782)/10);return[fG[u][2],fG[u][s]]}else{if(a===120485||a===120486)return[t4[0][2],t4[0][s]];if(120486<a&&a<120782)return["",""];throw new ut("Unsupported character: "+e)}},"wideCharacterFont"),v4=o(function(e,r,n){return En[n][e]&&En[n][e].replace&&(e=En[n][e].replace),{value:e,metrics:RC(e,r,n)}},"lookupSymbol"),hl=o(function(e,r,n,i,a){var s=v4(e,r,n),l=s.metrics;e=s.value;var u;if(l){var h=l.italic;(n==="text"||i&&i.font==="mathit")&&(h=0),u=new ms(e,l.height,l.depth,h,l.skew,l.width,a)}else typeof console<"u"&&console.warn("No character metrics "+("for '"+e+"' in style '"+r+"' and mode '"+n+"'")),u=new ms(e,0,0,0,0,0,a);if(i){u.maxFontSize=i.sizeMultiplier,i.style.isTight()&&u.classes.push("mtight");var f=i.getColor();f&&(u.style.color=f)}return u},"makeSymbol"),s4e=o(function(e,r,n,i){return i===void 0&&(i=[]),n.font==="boldsymbol"&&v4(e,"Main-Bold",r).metrics?hl(e,"Main-Bold",r,n,i.concat(["mathbf"])):e==="\\"||En[r][e].font==="main"?hl(e,"Main-Regular",r,n,i):hl(e,"AMS-Regular",r,n,i.concat(["amsrm"]))},"mathsym"),o4e=o(function(e,r,n,i,a){return a!=="textord"&&v4(e,"Math-BoldItalic",r).metrics?{fontName:"Math-BoldItalic",fontClass:"boldsymbol"}:{fontName:"Main-Bold",fontClass:"mathbf"}},"boldsymbol"),l4e=o(function(e,r,n){var i=e.mode,a=e.text,s=["mord"],l=i==="math"||i==="text"&&r.font,u=l?r.font:r.fontFamily,h="",f="";if(a.charCodeAt(0)===55349&&([h,f]=a4e(a,i)),h.length>0)return hl(a,h,i,r,s.concat(f));if(u){var d,p;if(u==="boldsymbol"){var m=o4e(a,i,r,s,n);d=m.fontName,p=[m.fontClass]}else l?(d=WG[u].fontName,p=[u]):(d=r4(u,r.fontWeight,r.fontShape),p=[u,r.fontWeight,r.fontShape]);if(v4(a,d,i).metrics)return hl(a,d,i,r,s.concat(p));if(VG.hasOwnProperty(a)&&d.slice(0,10)==="Typewriter"){for(var g=[],y=0;y<a.length;y++)g.push(hl(a[y],d,i,r,s.concat(p)));return HG(g)}}if(n==="mathord")return hl(a,"Math-Italic",i,r,s.concat(["mathnormal"]));if(n==="textord"){var v=En[i][a]&&En[i][a].font;if(v==="ams"){var x=r4("amsrm",r.fontWeight,r.fontShape);return hl(a,x,i,r,s.concat("amsrm",r.fontWeight,r.fontShape))}else if(v==="main"||!v){var b=r4("textrm",r.fontWeight,r.fontShape);return hl(a,b,i,r,s.concat(r.fontWeight,r.fontShape))}else{var w=r4(v,r.fontWeight,r.fontShape);return hl(a,w,i,r,s.concat(w,r.fontWeight,r.fontShape))}}else throw new Error("unexpected type: "+n+" in makeOrd")},"makeOrd"),c4e=o((t,e)=>{if(lh(t.classes)!==lh(e.classes)||t.skew!==e.skew||t.maxFontSize!==e.maxFontSize)return!1;if(t.classes.length===1){var r=t.classes[0];if(r==="mbin"||r==="mord")return!1}for(var n in t.style)if(t.style.hasOwnProperty(n)&&t.style[n]!==e.style[n])return!1;for(var i in e.style)if(e.style.hasOwnProperty(i)&&t.style[i]!==e.style[i])return!1;return!0},"canCombine"),u4e=o(t=>{for(var e=0;e<t.length-1;e++){var r=t[e],n=t[e+1];r instanceof ms&&n instanceof ms&&c4e(r,n)&&(r.text+=n.text,r.height=Math.max(r.height,n.height),r.depth=Math.max(r.depth,n.depth),r.italic=n.italic,t.splice(e+1,1),e--)}return t},"tryCombineChars"),MC=o(function(e){for(var r=0,n=0,i=0,a=0;a<e.children.length;a++){var s=e.children[a];s.height>r&&(r=s.height),s.depth>n&&(n=s.depth),s.maxFontSize>i&&(i=s.maxFontSize)}e.height=r,e.depth=n,e.maxFontSize=i},"sizeElementFromChildren"),ds=o(function(e,r,n,i){var a=new qf(e,r,n,i);return MC(a),a},"makeSpan"),UG=o((t,e,r,n)=>new qf(t,e,r,n),"makeSvgSpan"),h4e=o(function(e,r,n){var i=ds([e],[],r);return i.height=Math.max(n||r.fontMetrics().defaultRuleThickness,r.minRuleThickness),i.style.borderBottomWidth=mt(i.height),i.maxFontSize=1,i},"makeLineSpan"),f4e=o(function(e,r,n,i){var a=new ey(e,r,n,i);return MC(a),a},"makeAnchor"),HG=o(function(e){var r=new Yf(e);return MC(r),r},"makeFragment"),d4e=o(function(e,r){return e instanceof Yf?ds([],[e],r):e},"wrapFragment"),p4e=o(function(e){if(e.positionType==="individualShift"){for(var r=e.children,n=[r[0]],i=-r[0].shift-r[0].elem.depth,a=i,s=1;s<r.length;s++){var l=-r[s].shift-a-r[s].elem.depth,u=l-(r[s-1].elem.height+r[s-1].elem.depth);a=a+l,n.push({type:"kern",size:u}),n.push(r[s])}return{children:n,depth:i}}var h;if(e.positionType==="top"){for(var f=e.positionData,d=0;d<e.children.length;d++){var p=e.children[d];f-=p.type==="kern"?p.size:p.elem.height+p.elem.depth}h=f}else if(e.positionType==="bottom")h=-e.positionData;else{var m=e.children[0];if(m.type!=="elem")throw new Error('First child must have type "elem".');if(e.positionType==="shift")h=-m.elem.depth-e.positionData;else if(e.positionType==="firstBaseline")h=-m.elem.depth;else throw new Error("Invalid positionType "+e.positionType+".")}return{children:e.children,depth:h}},"getVListChildrenAndDepth"),m4e=o(function(e,r){for(var{children:n,depth:i}=p4e(e),a=0,s=0;s<n.length;s++){var l=n[s];if(l.type==="elem"){var u=l.elem;a=Math.max(a,u.maxFontSize,u.height)}}a+=2;var h=ds(["pstrut"],[]);h.style.height=mt(a);for(var f=[],d=i,p=i,m=i,g=0;g<n.length;g++){var y=n[g];if(y.type==="kern")m+=y.size;else{var v=y.elem,x=y.wrapperClasses||[],b=y.wrapperStyle||{},w=ds(x,[h,v],void 0,b);w.style.top=mt(-a-m-v.depth),y.marginLeft&&(w.style.marginLeft=y.marginLeft),y.marginRight&&(w.style.marginRight=y.marginRight),f.push(w),m+=v.height+v.depth}d=Math.min(d,m),p=Math.max(p,m)}var _=ds(["vlist"],f);_.style.height=mt(p);var T;if(d<0){var E=ds([],[]),L=ds(["vlist"],[E]);L.style.height=mt(-d);var C=ds(["vlist-s"],[new ms("\u200B")]);T=[ds(["vlist-r"],[_,C]),ds(["vlist-r"],[L])]}else T=[ds(["vlist-r"],[_])];var A=ds(["vlist-t"],T);return T.length===2&&A.classes.push("vlist-t2"),A.height=p,A.depth=-d,A},"makeVList"),g4e=o((t,e)=>{var r=ds(["mspace"],[],e),n=Qn(t,e);return r.style.marginRight=mt(n),r},"makeGlue"),r4=o(function(e,r,n){var i="";switch(e){case"amsrm":i="AMS";break;case"textrm":i="Main";break;case"textsf":i="SansSerif";break;case"texttt":i="Typewriter";break;default:i=e}var a;return r==="textbf"&&n==="textit"?a="BoldItalic":r==="textbf"?a="Bold":r==="textit"?a="Italic":a="Regular",i+"-"+a},"retrieveTextFontName"),WG={mathbf:{variant:"bold",fontName:"Main-Bold"},mathrm:{variant:"normal",fontName:"Main-Regular"},textit:{variant:"italic",fontName:"Main-Italic"},mathit:{variant:"italic",fontName:"Main-Italic"},mathnormal:{variant:"italic",fontName:"Math-Italic"},mathbb:{variant:"double-struck",fontName:"AMS-Regular"},mathcal:{variant:"script",fontName:"Caligraphic-Regular"},mathfrak:{variant:"fraktur",fontName:"Fraktur-Regular"},mathscr:{variant:"script",fontName:"Script-Regular"},mathsf:{variant:"sans-serif",fontName:"SansSerif-Regular"},mathtt:{variant:"monospace",fontName:"Typewriter-Regular"}},YG={vec:["vec",.471,.714],oiintSize1:["oiintSize1",.957,.499],oiintSize2:["oiintSize2",1.472,.659],oiiintSize1:["oiiintSize1",1.304,.499],oiiintSize2:["oiiintSize2",1.98,.659]},y4e=o(function(e,r){var[n,i,a]=YG[e],s=new Jl(n),l=new fl([s],{width:mt(i),height:mt(a),style:"width:"+mt(i),viewBox:"0 0 "+1e3*i+" "+1e3*a,preserveAspectRatio:"xMinYMin"}),u=UG(["overlay"],[l],r);return u.height=a,u.style.height=mt(a),u.style.width=mt(i),u},"staticSvg"),Ie={fontMap:WG,makeSymbol:hl,mathsym:s4e,makeSpan:ds,makeSvgSpan:UG,makeLineSpan:h4e,makeAnchor:f4e,makeFragment:HG,wrapFragment:d4e,makeVList:m4e,makeOrd:l4e,makeGlue:g4e,staticSvg:y4e,svgData:YG,tryCombineChars:u4e},Kn={number:3,unit:"mu"},Hf={number:4,unit:"mu"},tu={number:5,unit:"mu"},v4e={mord:{mop:Kn,mbin:Hf,mrel:tu,minner:Kn},mop:{mord:Kn,mop:Kn,mrel:tu,minner:Kn},mbin:{mord:Hf,mop:Hf,mopen:Hf,minner:Hf},mrel:{mord:tu,mop:tu,mopen:tu,minner:tu},mopen:{},mclose:{mop:Kn,mbin:Hf,mrel:tu,minner:Kn},mpunct:{mord:Kn,mop:Kn,mrel:tu,mopen:Kn,mclose:Kn,mpunct:Kn,minner:Kn},minner:{mord:Kn,mop:Kn,mbin:Hf,mrel:tu,mopen:Kn,mpunct:Kn,minner:Kn}},x4e={mord:{mop:Kn},mop:{mord:Kn,mop:Kn},mbin:{},mrel:{},mopen:{},mclose:{mop:Kn},mpunct:{},minner:{mop:Kn}},qG={},f4={},d4={};o(Ct,"defineFunction");o(Xf,"defineFunctionBuilders");p4=o(function(e){return e.type==="ordgroup"&&e.body.length===1?e.body[0]:e},"normalizeArgument"),di=o(function(e){return e.type==="ordgroup"?e.body:[e]},"ordargument"),iu=Ie.makeSpan,b4e=["leftmost","mbin","mopen","mrel","mop","mpunct"],w4e=["rightmost","mrel","mclose","mpunct"],T4e={display:rr.DISPLAY,text:rr.TEXT,script:rr.SCRIPT,scriptscript:rr.SCRIPTSCRIPT},k4e={mord:"mord",mop:"mop",mbin:"mbin",mrel:"mrel",mopen:"mopen",mclose:"mclose",mpunct:"mpunct",minner:"minner"},Ii=o(function(e,r,n,i){i===void 0&&(i=[null,null]);for(var a=[],s=0;s<e.length;s++){var l=Or(e[s],r);if(l instanceof Yf){var u=l.children;a.push(...u)}else a.push(l)}if(Ie.tryCombineChars(a),!n)return a;var h=r;if(e.length===1){var f=e[0];f.type==="sizing"?h=r.havingSize(f.size):f.type==="styling"&&(h=r.havingStyle(T4e[f.style]))}var d=iu([i[0]||"leftmost"],[],r),p=iu([i[1]||"rightmost"],[],r),m=n==="root";return dG(a,(g,y)=>{var v=y.classes[0],x=g.classes[0];v==="mbin"&&Jt.contains(w4e,x)?y.classes[0]="mord":x==="mbin"&&Jt.contains(b4e,v)&&(g.classes[0]="mord")},{node:d},p,m),dG(a,(g,y)=>{var v=kC(y),x=kC(g),b=v&&x?g.hasClass("mtight")?x4e[v][x]:v4e[v][x]:null;if(b)return Ie.makeGlue(b,h)},{node:d},p,m),a},"buildExpression"),dG=o(function t(e,r,n,i,a){i&&e.push(i);for(var s=0;s<e.length;s++){var l=e[s],u=XG(l);if(u){t(u.children,r,n,null,a);continue}var h=!l.hasClass("mspace");if(h){var f=r(l,n.node);f&&(n.insertAfter?n.insertAfter(f):(e.unshift(f),s++))}h?n.node=l:a&&l.hasClass("newline")&&(n.node=iu(["leftmost"])),n.insertAfter=(d=>p=>{e.splice(d+1,0,p),s++})(s)}i&&e.pop()},"traverseNonSpaceNodes"),XG=o(function(e){return e instanceof Yf||e instanceof ey||e instanceof qf&&e.hasClass("enclosing")?e:null},"checkPartialGroup"),E4e=o(function t(e,r){var n=XG(e);if(n){var i=n.children;if(i.length){if(r==="right")return t(i[i.length-1],"right");if(r==="left")return t(i[0],"left")}}return e},"getOutermostNode"),kC=o(function(e,r){return e?(r&&(e=E4e(e,r)),k4e[e.classes[0]]||null):null},"getTypeOfDomTree"),ry=o(function(e,r){var n=["nulldelimiter"].concat(e.baseSizingClasses());return iu(r.concat(n))},"makeNullDelimiter"),Or=o(function(e,r,n){if(!e)return iu();if(f4[e.type]){var i=f4[e.type](e,r);if(n&&r.size!==n.size){i=iu(r.sizingClasses(n),[i],r);var a=r.sizeMultiplier/n.sizeMultiplier;i.height*=a,i.depth*=a}return i}else throw new ut("Got group of unknown type: '"+e.type+"'")},"buildGroup");o(n4,"buildHTMLUnbreakable");o(EC,"buildHTML");o(jG,"newDocumentFragment");ps=class{static{o(this,"MathNode")}constructor(e,r,n){this.type=void 0,this.attributes=void 0,this.children=void 0,this.classes=void 0,this.type=e,this.attributes={},this.children=r||[],this.classes=n||[]}setAttribute(e,r){this.attributes[e]=r}getAttribute(e){return this.attributes[e]}toNode(){var e=document.createElementNS("http://www.w3.org/1998/Math/MathML",this.type);for(var r in this.attributes)Object.prototype.hasOwnProperty.call(this.attributes,r)&&e.setAttribute(r,this.attributes[r]);this.classes.length>0&&(e.className=lh(this.classes));for(var n=0;n<this.children.length;n++)e.appendChild(this.children[n].toNode());return e}toMarkup(){var e="<"+this.type;for(var r in this.attributes)Object.prototype.hasOwnProperty.call(this.attributes,r)&&(e+=" "+r+'="',e+=Jt.escape(this.attributes[r]),e+='"');this.classes.length>0&&(e+=' class ="'+Jt.escape(lh(this.classes))+'"'),e+=">";for(var n=0;n<this.children.length;n++)e+=this.children[n].toMarkup();return e+="</"+this.type+">",e}toText(){return this.children.map(e=>e.toText()).join("")}},Wf=class{static{o(this,"TextNode")}constructor(e){this.text=void 0,this.text=e}toNode(){return document.createTextNode(this.text)}toMarkup(){return Jt.escape(this.toText())}toText(){return this.text}},SC=class{static{o(this,"SpaceNode")}constructor(e){this.width=void 0,this.character=void 0,this.width=e,e>=.05555&&e<=.05556?this.character="\u200A":e>=.1666&&e<=.1667?this.character="\u2009":e>=.2222&&e<=.2223?this.character="\u2005":e>=.2777&&e<=.2778?this.character="\u2005\u200A":e>=-.05556&&e<=-.05555?this.character="\u200A\u2063":e>=-.1667&&e<=-.1666?this.character="\u2009\u2063":e>=-.2223&&e<=-.2222?this.character="\u205F\u2063":e>=-.2778&&e<=-.2777?this.character="\u2005\u2063":this.character=null}toNode(){if(this.character)return document.createTextNode(this.character);var e=document.createElementNS("http://www.w3.org/1998/Math/MathML","mspace");return e.setAttribute("width",mt(this.width)),e}toMarkup(){return this.character?"<mtext>"+this.character+"</mtext>":'<mspace width="'+mt(this.width)+'"/>'}toText(){return this.character?this.character:" "}},st={MathNode:ps,TextNode:Wf,SpaceNode:SC,newDocumentFragment:jG},Ao=o(function(e,r,n){return En[r][e]&&En[r][e].replace&&e.charCodeAt(0)!==55349&&!(VG.hasOwnProperty(e)&&n&&(n.fontFamily&&n.fontFamily.slice(4,6)==="tt"||n.font&&n.font.slice(4,6)==="tt"))&&(e=En[r][e].replace),new st.TextNode(e)},"makeText"),IC=o(function(e){return e.length===1?e[0]:new st.MathNode("mrow",e)},"makeRow"),OC=o(function(e,r){if(r.fontFamily==="texttt")return"monospace";if(r.fontFamily==="textsf")return r.fontShape==="textit"&&r.fontWeight==="textbf"?"sans-serif-bold-italic":r.fontShape==="textit"?"sans-serif-italic":r.fontWeight==="textbf"?"bold-sans-serif":"sans-serif";if(r.fontShape==="textit"&&r.fontWeight==="textbf")return"bold-italic";if(r.fontShape==="textit")return"italic";if(r.fontWeight==="textbf")return"bold";var n=r.font;if(!n||n==="mathnormal")return null;var i=e.mode;if(n==="mathit")return"italic";if(n==="boldsymbol")return e.type==="textord"?"bold":"bold-italic";if(n==="mathbf")return"bold";if(n==="mathbb")return"double-struck";if(n==="mathfrak")return"fraktur";if(n==="mathscr"||n==="mathcal")return"script";if(n==="mathsf")return"sans-serif";if(n==="mathtt")return"monospace";var a=e.text;if(Jt.contains(["\\imath","\\jmath"],a))return null;En[i][a]&&En[i][a].replace&&(a=En[i][a].replace);var s=Ie.fontMap[n].fontName;return RC(a,s,i)?Ie.fontMap[n].variant:null},"getVariant"),gs=o(function(e,r,n){if(e.length===1){var i=mn(e[0],r);return n&&i instanceof ps&&i.type==="mo"&&(i.setAttribute("lspace","0em"),i.setAttribute("rspace","0em")),[i]}for(var a=[],s,l=0;l<e.length;l++){var u=mn(e[l],r);if(u instanceof ps&&s instanceof ps){if(u.type==="mtext"&&s.type==="mtext"&&u.getAttribute("mathvariant")===s.getAttribute("mathvariant")){s.children.push(...u.children);continue}else if(u.type==="mn"&&s.type==="mn"){s.children.push(...u.children);continue}else if(u.type==="mi"&&u.children.length===1&&s.type==="mn"){var h=u.children[0];if(h instanceof Wf&&h.text==="."){s.children.push(...u.children);continue}}else if(s.type==="mi"&&s.children.length===1){var f=s.children[0];if(f instanceof Wf&&f.text==="\u0338"&&(u.type==="mo"||u.type==="mi"||u.type==="mn")){var d=u.children[0];d instanceof Wf&&d.text.length>0&&(d.text=d.text.slice(0,1)+"\u0338"+d.text.slice(1),a.pop())}}}a.push(u),s=u}return a},"buildExpression"),ch=o(function(e,r,n){return IC(gs(e,r,n))},"buildExpressionRow"),mn=o(function(e,r){if(!e)return new st.MathNode("mrow");if(d4[e.type]){var n=d4[e.type](e,r);return n}else throw new ut("Got group of unknown type: '"+e.type+"'")},"buildGroup");o(pG,"buildMathML");KG=o(function(e){return new u4({style:e.displayMode?rr.DISPLAY:rr.TEXT,maxSize:e.maxSize,minRuleThickness:e.minRuleThickness})},"optionsFromSettings"),QG=o(function(e,r){if(r.displayMode){var n=["katex-display"];r.leqno&&n.push("leqno"),r.fleqn&&n.push("fleqn"),e=Ie.makeSpan(n,[e])}return e},"displayWrap"),S4e=o(function(e,r,n){var i=KG(n),a;if(n.output==="mathml")return pG(e,r,i,n.displayMode,!0);if(n.output==="html"){var s=EC(e,i);a=Ie.makeSpan(["katex"],[s])}else{var l=pG(e,r,i,n.displayMode,!1),u=EC(e,i);a=Ie.makeSpan(["katex"],[l,u])}return QG(a,n)},"buildTree"),C4e=o(function(e,r,n){var i=KG(n),a=EC(e,i),s=Ie.makeSpan(["katex"],[a]);return QG(s,n)},"buildHTMLTree"),A4e={widehat:"^",widecheck:"\u02C7",widetilde:"~",utilde:"~",overleftarrow:"\u2190",underleftarrow:"\u2190",xleftarrow:"\u2190",overrightarrow:"\u2192",underrightarrow:"\u2192",xrightarrow:"\u2192",underbrace:"\u23DF",overbrace:"\u23DE",overgroup:"\u23E0",undergroup:"\u23E1",overleftrightarrow:"\u2194",underleftrightarrow:"\u2194",xleftrightarrow:"\u2194",Overrightarrow:"\u21D2",xRightarrow:"\u21D2",overleftharpoon:"\u21BC",xleftharpoonup:"\u21BC",overrightharpoon:"\u21C0",xrightharpoonup:"\u21C0",xLeftarrow:"\u21D0",xLeftrightarrow:"\u21D4",xhookleftarrow:"\u21A9",xhookrightarrow:"\u21AA",xmapsto:"\u21A6",xrightharpoondown:"\u21C1",xleftharpoondown:"\u21BD",xrightleftharpoons:"\u21CC",xleftrightharpoons:"\u21CB",xtwoheadleftarrow:"\u219E",xtwoheadrightarrow:"\u21A0",xlongequal:"=",xtofrom:"\u21C4",xrightleftarrows:"\u21C4",xrightequilibrium:"\u21CC",xleftequilibrium:"\u21CB","\\cdrightarrow":"\u2192","\\cdleftarrow":"\u2190","\\cdlongequal":"="},_4e=o(function(e){var r=new st.MathNode("mo",[new st.TextNode(A4e[e.replace(/^\\/,"")])]);return r.setAttribute("stretchy","true"),r},"mathMLnode"),L4e={overrightarrow:[["rightarrow"],.888,522,"xMaxYMin"],overleftarrow:[["leftarrow"],.888,522,"xMinYMin"],underrightarrow:[["rightarrow"],.888,522,"xMaxYMin"],underleftarrow:[["leftarrow"],.888,522,"xMinYMin"],xrightarrow:[["rightarrow"],1.469,522,"xMaxYMin"],"\\cdrightarrow":[["rightarrow"],3,522,"xMaxYMin"],xleftarrow:[["leftarrow"],1.469,522,"xMinYMin"],"\\cdleftarrow":[["leftarrow"],3,522,"xMinYMin"],Overrightarrow:[["doublerightarrow"],.888,560,"xMaxYMin"],xRightarrow:[["doublerightarrow"],1.526,560,"xMaxYMin"],xLeftarrow:[["doubleleftarrow"],1.526,560,"xMinYMin"],overleftharpoon:[["leftharpoon"],.888,522,"xMinYMin"],xleftharpoonup:[["leftharpoon"],.888,522,"xMinYMin"],xleftharpoondown:[["leftharpoondown"],.888,522,"xMinYMin"],overrightharpoon:[["rightharpoon"],.888,522,"xMaxYMin"],xrightharpoonup:[["rightharpoon"],.888,522,"xMaxYMin"],xrightharpoondown:[["rightharpoondown"],.888,522,"xMaxYMin"],xlongequal:[["longequal"],.888,334,"xMinYMin"],"\\cdlongequal":[["longequal"],3,334,"xMinYMin"],xtwoheadleftarrow:[["twoheadleftarrow"],.888,334,"xMinYMin"],xtwoheadrightarrow:[["twoheadrightarrow"],.888,334,"xMaxYMin"],overleftrightarrow:[["leftarrow","rightarrow"],.888,522],overbrace:[["leftbrace","midbrace","rightbrace"],1.6,548],underbrace:[["leftbraceunder","midbraceunder","rightbraceunder"],1.6,548],underleftrightarrow:[["leftarrow","rightarrow"],.888,522],xleftrightarrow:[["leftarrow","rightarrow"],1.75,522],xLeftrightarrow:[["doubleleftarrow","doublerightarrow"],1.75,560],xrightleftharpoons:[["leftharpoondownplus","rightharpoonplus"],1.75,716],xleftrightharpoons:[["leftharpoonplus","rightharpoondownplus"],1.75,716],xhookleftarrow:[["leftarrow","righthook"],1.08,522],xhookrightarrow:[["lefthook","rightarrow"],1.08,522],overlinesegment:[["leftlinesegment","rightlinesegment"],.888,522],underlinesegment:[["leftlinesegment","rightlinesegment"],.888,522],overgroup:[["leftgroup","rightgroup"],.888,342],undergroup:[["leftgroupunder","rightgroupunder"],.888,342],xmapsto:[["leftmapsto","rightarrow"],1.5,522],xtofrom:[["leftToFrom","rightToFrom"],1.75,528],xrightleftarrows:[["baraboveleftarrow","rightarrowabovebar"],1.75,901],xrightequilibrium:[["baraboveshortleftharpoon","rightharpoonaboveshortbar"],1.75,716],xleftequilibrium:[["shortbaraboveleftharpoon","shortrightharpoonabovebar"],1.75,716]},D4e=o(function(e){return e.type==="ordgroup"?e.body.length:1},"groupLength"),N4e=o(function(e,r){function n(){var l=4e5,u=e.label.slice(1);if(Jt.contains(["widehat","widecheck","widetilde","utilde"],u)){var h=e,f=D4e(h.base),d,p,m;if(f>5)u==="widehat"||u==="widecheck"?(d=420,l=2364,m=.42,p=u+"4"):(d=312,l=2340,m=.34,p="tilde4");else{var g=[1,1,2,2,3,3][f];u==="widehat"||u==="widecheck"?(l=[0,1062,2364,2364,2364][g],d=[0,239,300,360,420][g],m=[0,.24,.3,.3,.36,.42][g],p=u+g):(l=[0,600,1033,2339,2340][g],d=[0,260,286,306,312][g],m=[0,.26,.286,.3,.306,.34][g],p="tilde"+g)}var y=new Jl(p),v=new fl([y],{width:"100%",height:mt(m),viewBox:"0 0 "+l+" "+d,preserveAspectRatio:"none"});return{span:Ie.makeSvgSpan([],[v],r),minWidth:0,height:m}}else{var x=[],b=L4e[u],[w,_,T]=b,E=T/1e3,L=w.length,C,A;if(L===1){var I=b[3];C=["hide-tail"],A=[I]}else if(L===2)C=["halfarrow-left","halfarrow-right"],A=["xMinYMin","xMaxYMin"];else if(L===3)C=["brace-left","brace-center","brace-right"],A=["xMinYMin","xMidYMin","xMaxYMin"];else throw new Error(`Correct katexImagesData or update code here to support + `+L+" children.");for(var D=0;D<L;D++){var k=new Jl(w[D]),R=new fl([k],{width:"400em",height:mt(E),viewBox:"0 0 "+l+" "+T,preserveAspectRatio:A[D]+" slice"}),S=Ie.makeSvgSpan([C[D]],[R],r);if(L===1)return{span:S,minWidth:_,height:E};S.style.height=mt(E),x.push(S)}return{span:Ie.makeSpan(["stretchy"],x,r),minWidth:_,height:E}}}o(n,"buildSvgSpan_");var{span:i,minWidth:a,height:s}=n();return i.height=s,i.style.height=mt(s),a>0&&(i.style.minWidth=mt(a)),i},"svgSpan"),R4e=o(function(e,r,n,i,a){var s,l=e.height+e.depth+n+i;if(/fbox|color|angl/.test(r)){if(s=Ie.makeSpan(["stretchy",r],[],a),r==="fbox"){var u=a.color&&a.getColor();u&&(s.style.borderColor=u)}}else{var h=[];/^[bx]cancel$/.test(r)&&h.push(new ty({x1:"0",y1:"0",x2:"100%",y2:"100%","stroke-width":"0.046em"})),/^x?cancel$/.test(r)&&h.push(new ty({x1:"0",y1:"100%",x2:"100%",y2:"0","stroke-width":"0.046em"}));var f=new fl(h,{width:"100%",height:mt(l)});s=Ie.makeSvgSpan([],[f],a)}return s.height=l,s.style.height=mt(l),s},"encloseSpan"),au={encloseSpan:R4e,mathMLnode:_4e,svgSpan:N4e};o(yr,"assertNodeType");o(PC,"assertSymbolNodeType");o(x4,"checkSymbolNodeType");BC=o((t,e)=>{var r,n,i;t&&t.type==="supsub"?(n=yr(t.base,"accent"),r=n.base,t.base=r,i=r4e(Or(t,e)),t.base=n):(n=yr(t,"accent"),r=n.base);var a=Or(r,e.havingCrampedStyle()),s=n.isShifty&&Jt.isCharacterBox(r),l=0;if(s){var u=Jt.getBaseElem(r),h=Or(u,e.havingCrampedStyle());l=cG(h).skew}var f=n.label==="\\c",d=f?a.height+a.depth:Math.min(a.height,e.fontMetrics().xHeight),p;if(n.isStretchy)p=au.svgSpan(n,e),p=Ie.makeVList({positionType:"firstBaseline",children:[{type:"elem",elem:a},{type:"elem",elem:p,wrapperClasses:["svg-align"],wrapperStyle:l>0?{width:"calc(100% - "+mt(2*l)+")",marginLeft:mt(2*l)}:void 0}]},e);else{var m,g;n.label==="\\vec"?(m=Ie.staticSvg("vec",e),g=Ie.svgData.vec[1]):(m=Ie.makeOrd({mode:n.mode,text:n.label},e,"textord"),m=cG(m),m.italic=0,g=m.width,f&&(d+=m.depth)),p=Ie.makeSpan(["accent-body"],[m]);var y=n.label==="\\textcircled";y&&(p.classes.push("accent-full"),d=a.height);var v=l;y||(v-=g/2),p.style.left=mt(v),n.label==="\\textcircled"&&(p.style.top=".2em"),p=Ie.makeVList({positionType:"firstBaseline",children:[{type:"elem",elem:a},{type:"kern",size:-d},{type:"elem",elem:p}]},e)}var x=Ie.makeSpan(["mord","accent"],[p],e);return i?(i.children[0]=x,i.height=Math.max(x.height,i.height),i.classes[0]="mord",i):x},"htmlBuilder$a"),ZG=o((t,e)=>{var r=t.isStretchy?au.mathMLnode(t.label):new st.MathNode("mo",[Ao(t.label,t.mode)]),n=new st.MathNode("mover",[mn(t.base,e),r]);return n.setAttribute("accent","true"),n},"mathmlBuilder$9"),M4e=new RegExp(["\\acute","\\grave","\\ddot","\\tilde","\\bar","\\breve","\\check","\\hat","\\vec","\\dot","\\mathring"].map(t=>"\\"+t).join("|"));Ct({type:"accent",names:["\\acute","\\grave","\\ddot","\\tilde","\\bar","\\breve","\\check","\\hat","\\vec","\\dot","\\mathring","\\widecheck","\\widehat","\\widetilde","\\overrightarrow","\\overleftarrow","\\Overrightarrow","\\overleftrightarrow","\\overgroup","\\overlinesegment","\\overleftharpoon","\\overrightharpoon"],props:{numArgs:1},handler:o((t,e)=>{var r=p4(e[0]),n=!M4e.test(t.funcName),i=!n||t.funcName==="\\widehat"||t.funcName==="\\widetilde"||t.funcName==="\\widecheck";return{type:"accent",mode:t.parser.mode,label:t.funcName,isStretchy:n,isShifty:i,base:r}},"handler"),htmlBuilder:BC,mathmlBuilder:ZG});Ct({type:"accent",names:["\\'","\\`","\\^","\\~","\\=","\\u","\\.",'\\"',"\\c","\\r","\\H","\\v","\\textcircled"],props:{numArgs:1,allowedInText:!0,allowedInMath:!0,argTypes:["primitive"]},handler:o((t,e)=>{var r=e[0],n=t.parser.mode;return n==="math"&&(t.parser.settings.reportNonstrict("mathVsTextAccents","LaTeX's accent "+t.funcName+" works only in text mode"),n="text"),{type:"accent",mode:n,label:t.funcName,isStretchy:!1,isShifty:!0,base:r}},"handler"),htmlBuilder:BC,mathmlBuilder:ZG});Ct({type:"accentUnder",names:["\\underleftarrow","\\underrightarrow","\\underleftrightarrow","\\undergroup","\\underlinesegment","\\utilde"],props:{numArgs:1},handler:o((t,e)=>{var{parser:r,funcName:n}=t,i=e[0];return{type:"accentUnder",mode:r.mode,label:n,base:i}},"handler"),htmlBuilder:o((t,e)=>{var r=Or(t.base,e),n=au.svgSpan(t,e),i=t.label==="\\utilde"?.12:0,a=Ie.makeVList({positionType:"top",positionData:r.height,children:[{type:"elem",elem:n,wrapperClasses:["svg-align"]},{type:"kern",size:i},{type:"elem",elem:r}]},e);return Ie.makeSpan(["mord","accentunder"],[a],e)},"htmlBuilder"),mathmlBuilder:o((t,e)=>{var r=au.mathMLnode(t.label),n=new st.MathNode("munder",[mn(t.base,e),r]);return n.setAttribute("accentunder","true"),n},"mathmlBuilder")});i4=o(t=>{var e=new st.MathNode("mpadded",t?[t]:[]);return e.setAttribute("width","+0.6em"),e.setAttribute("lspace","0.3em"),e},"paddedNode");Ct({type:"xArrow",names:["\\xleftarrow","\\xrightarrow","\\xLeftarrow","\\xRightarrow","\\xleftrightarrow","\\xLeftrightarrow","\\xhookleftarrow","\\xhookrightarrow","\\xmapsto","\\xrightharpoondown","\\xrightharpoonup","\\xleftharpoondown","\\xleftharpoonup","\\xrightleftharpoons","\\xleftrightharpoons","\\xlongequal","\\xtwoheadrightarrow","\\xtwoheadleftarrow","\\xtofrom","\\xrightleftarrows","\\xrightequilibrium","\\xleftequilibrium","\\\\cdrightarrow","\\\\cdleftarrow","\\\\cdlongequal"],props:{numArgs:1,numOptionalArgs:1},handler(t,e,r){var{parser:n,funcName:i}=t;return{type:"xArrow",mode:n.mode,label:i,body:e[0],below:r[0]}},htmlBuilder(t,e){var r=e.style,n=e.havingStyle(r.sup()),i=Ie.wrapFragment(Or(t.body,n,e),e),a=t.label.slice(0,2)==="\\x"?"x":"cd";i.classes.push(a+"-arrow-pad");var s;t.below&&(n=e.havingStyle(r.sub()),s=Ie.wrapFragment(Or(t.below,n,e),e),s.classes.push(a+"-arrow-pad"));var l=au.svgSpan(t,e),u=-e.fontMetrics().axisHeight+.5*l.height,h=-e.fontMetrics().axisHeight-.5*l.height-.111;(i.depth>.25||t.label==="\\xleftequilibrium")&&(h-=i.depth);var f;if(s){var d=-e.fontMetrics().axisHeight+s.height+.5*l.height+.111;f=Ie.makeVList({positionType:"individualShift",children:[{type:"elem",elem:i,shift:h},{type:"elem",elem:l,shift:u},{type:"elem",elem:s,shift:d}]},e)}else f=Ie.makeVList({positionType:"individualShift",children:[{type:"elem",elem:i,shift:h},{type:"elem",elem:l,shift:u}]},e);return f.children[0].children[0].children[1].classes.push("svg-align"),Ie.makeSpan(["mrel","x-arrow"],[f],e)},mathmlBuilder(t,e){var r=au.mathMLnode(t.label);r.setAttribute("minsize",t.label.charAt(0)==="x"?"1.75em":"3.0em");var n;if(t.body){var i=i4(mn(t.body,e));if(t.below){var a=i4(mn(t.below,e));n=new st.MathNode("munderover",[r,a,i])}else n=new st.MathNode("mover",[r,i])}else if(t.below){var s=i4(mn(t.below,e));n=new st.MathNode("munder",[r,s])}else n=i4(),n=new st.MathNode("mover",[r,n]);return n}});I4e=Ie.makeSpan;o(JG,"htmlBuilder$9");o(e$,"mathmlBuilder$8");Ct({type:"mclass",names:["\\mathord","\\mathbin","\\mathrel","\\mathopen","\\mathclose","\\mathpunct","\\mathinner"],props:{numArgs:1,primitive:!0},handler(t,e){var{parser:r,funcName:n}=t,i=e[0];return{type:"mclass",mode:r.mode,mclass:"m"+n.slice(5),body:di(i),isCharacterBox:Jt.isCharacterBox(i)}},htmlBuilder:JG,mathmlBuilder:e$});b4=o(t=>{var e=t.type==="ordgroup"&&t.body.length?t.body[0]:t;return e.type==="atom"&&(e.family==="bin"||e.family==="rel")?"m"+e.family:"mord"},"binrelClass");Ct({type:"mclass",names:["\\@binrel"],props:{numArgs:2},handler(t,e){var{parser:r}=t;return{type:"mclass",mode:r.mode,mclass:b4(e[0]),body:di(e[1]),isCharacterBox:Jt.isCharacterBox(e[1])}}});Ct({type:"mclass",names:["\\stackrel","\\overset","\\underset"],props:{numArgs:2},handler(t,e){var{parser:r,funcName:n}=t,i=e[1],a=e[0],s;n!=="\\stackrel"?s=b4(i):s="mrel";var l={type:"op",mode:i.mode,limits:!0,alwaysHandleSupSub:!0,parentIsSupSub:!1,symbol:!1,suppressBaseShift:n!=="\\stackrel",body:di(i)},u={type:"supsub",mode:a.mode,base:l,sup:n==="\\underset"?null:a,sub:n==="\\underset"?a:null};return{type:"mclass",mode:r.mode,mclass:s,body:[u],isCharacterBox:Jt.isCharacterBox(u)}},htmlBuilder:JG,mathmlBuilder:e$});Ct({type:"pmb",names:["\\pmb"],props:{numArgs:1,allowedInText:!0},handler(t,e){var{parser:r}=t;return{type:"pmb",mode:r.mode,mclass:b4(e[0]),body:di(e[0])}},htmlBuilder(t,e){var r=Ii(t.body,e,!0),n=Ie.makeSpan([t.mclass],r,e);return n.style.textShadow="0.02em 0.01em 0.04px",n},mathmlBuilder(t,e){var r=gs(t.body,e),n=new st.MathNode("mstyle",r);return n.setAttribute("style","text-shadow: 0.02em 0.01em 0.04px"),n}});O4e={">":"\\\\cdrightarrow","<":"\\\\cdleftarrow","=":"\\\\cdlongequal",A:"\\uparrow",V:"\\downarrow","|":"\\Vert",".":"no arrow"},mG=o(()=>({type:"styling",body:[],mode:"math",style:"display"}),"newCell"),gG=o(t=>t.type==="textord"&&t.text==="@","isStartOfArrow"),P4e=o((t,e)=>(t.type==="mathord"||t.type==="atom")&&t.text===e,"isLabelEnd");o(B4e,"cdArrow");o(F4e,"parseCD");Ct({type:"cdlabel",names:["\\\\cdleft","\\\\cdright"],props:{numArgs:1},handler(t,e){var{parser:r,funcName:n}=t;return{type:"cdlabel",mode:r.mode,side:n.slice(4),label:e[0]}},htmlBuilder(t,e){var r=e.havingStyle(e.style.sup()),n=Ie.wrapFragment(Or(t.label,r,e),e);return n.classes.push("cd-label-"+t.side),n.style.bottom=mt(.8-n.depth),n.height=0,n.depth=0,n},mathmlBuilder(t,e){var r=new st.MathNode("mrow",[mn(t.label,e)]);return r=new st.MathNode("mpadded",[r]),r.setAttribute("width","0"),t.side==="left"&&r.setAttribute("lspace","-1width"),r.setAttribute("voffset","0.7em"),r=new st.MathNode("mstyle",[r]),r.setAttribute("displaystyle","false"),r.setAttribute("scriptlevel","1"),r}});Ct({type:"cdlabelparent",names:["\\\\cdparent"],props:{numArgs:1},handler(t,e){var{parser:r}=t;return{type:"cdlabelparent",mode:r.mode,fragment:e[0]}},htmlBuilder(t,e){var r=Ie.wrapFragment(Or(t.fragment,e),e);return r.classes.push("cd-vert-arrow"),r},mathmlBuilder(t,e){return new st.MathNode("mrow",[mn(t.fragment,e)])}});Ct({type:"textord",names:["\\@char"],props:{numArgs:1,allowedInText:!0},handler(t,e){for(var{parser:r}=t,n=yr(e[0],"ordgroup"),i=n.body,a="",s=0;s<i.length;s++){var l=yr(i[s],"textord");a+=l.text}var u=parseInt(a),h;if(isNaN(u))throw new ut("\\@char has non-numeric argument "+a);if(u<0||u>=1114111)throw new ut("\\@char with invalid code point "+a);return u<=65535?h=String.fromCharCode(u):(u-=65536,h=String.fromCharCode((u>>10)+55296,(u&1023)+56320)),{type:"textord",mode:r.mode,text:h}}});t$=o((t,e)=>{var r=Ii(t.body,e.withColor(t.color),!1);return Ie.makeFragment(r)},"htmlBuilder$8"),r$=o((t,e)=>{var r=gs(t.body,e.withColor(t.color)),n=new st.MathNode("mstyle",r);return n.setAttribute("mathcolor",t.color),n},"mathmlBuilder$7");Ct({type:"color",names:["\\textcolor"],props:{numArgs:2,allowedInText:!0,argTypes:["color","original"]},handler(t,e){var{parser:r}=t,n=yr(e[0],"color-token").color,i=e[1];return{type:"color",mode:r.mode,color:n,body:di(i)}},htmlBuilder:t$,mathmlBuilder:r$});Ct({type:"color",names:["\\color"],props:{numArgs:1,allowedInText:!0,argTypes:["color"]},handler(t,e){var{parser:r,breakOnTokenText:n}=t,i=yr(e[0],"color-token").color;r.gullet.macros.set("\\current@color",i);var a=r.parseExpression(!0,n);return{type:"color",mode:r.mode,color:i,body:a}},htmlBuilder:t$,mathmlBuilder:r$});Ct({type:"cr",names:["\\\\"],props:{numArgs:0,numOptionalArgs:0,allowedInText:!0},handler(t,e,r){var{parser:n}=t,i=n.gullet.future().text==="["?n.parseSizeGroup(!0):null,a=!n.settings.displayMode||!n.settings.useStrictBehavior("newLineInDisplayMode","In LaTeX, \\\\ or \\newline does nothing in display mode");return{type:"cr",mode:n.mode,newLine:a,size:i&&yr(i,"size").value}},htmlBuilder(t,e){var r=Ie.makeSpan(["mspace"],[],e);return t.newLine&&(r.classes.push("newline"),t.size&&(r.style.marginTop=mt(Qn(t.size,e)))),r},mathmlBuilder(t,e){var r=new st.MathNode("mspace");return t.newLine&&(r.setAttribute("linebreak","newline"),t.size&&r.setAttribute("height",mt(Qn(t.size,e)))),r}});CC={"\\global":"\\global","\\long":"\\\\globallong","\\\\globallong":"\\\\globallong","\\def":"\\gdef","\\gdef":"\\gdef","\\edef":"\\xdef","\\xdef":"\\xdef","\\let":"\\\\globallet","\\futurelet":"\\\\globalfuture"},n$=o(t=>{var e=t.text;if(/^(?:[\\{}$&#^_]|EOF)$/.test(e))throw new ut("Expected a control sequence",t);return e},"checkControlSequence"),z4e=o(t=>{var e=t.gullet.popToken();return e.text==="="&&(e=t.gullet.popToken(),e.text===" "&&(e=t.gullet.popToken())),e},"getRHS"),i$=o((t,e,r,n)=>{var i=t.gullet.macros.get(r.text);i==null&&(r.noexpand=!0,i={tokens:[r],numArgs:0,unexpandable:!t.gullet.isExpandable(r.text)}),t.gullet.macros.set(e,i,n)},"letCommand");Ct({type:"internal",names:["\\global","\\long","\\\\globallong"],props:{numArgs:0,allowedInText:!0},handler(t){var{parser:e,funcName:r}=t;e.consumeSpaces();var n=e.fetch();if(CC[n.text])return(r==="\\global"||r==="\\\\globallong")&&(n.text=CC[n.text]),yr(e.parseFunction(),"internal");throw new ut("Invalid token after macro prefix",n)}});Ct({type:"internal",names:["\\def","\\gdef","\\edef","\\xdef"],props:{numArgs:0,allowedInText:!0,primitive:!0},handler(t){var{parser:e,funcName:r}=t,n=e.gullet.popToken(),i=n.text;if(/^(?:[\\{}$&#^_]|EOF)$/.test(i))throw new ut("Expected a control sequence",n);for(var a=0,s,l=[[]];e.gullet.future().text!=="{";)if(n=e.gullet.popToken(),n.text==="#"){if(e.gullet.future().text==="{"){s=e.gullet.future(),l[a].push("{");break}if(n=e.gullet.popToken(),!/^[1-9]$/.test(n.text))throw new ut('Invalid argument number "'+n.text+'"');if(parseInt(n.text)!==a+1)throw new ut('Argument number "'+n.text+'" out of order');a++,l.push([])}else{if(n.text==="EOF")throw new ut("Expected a macro definition");l[a].push(n.text)}var{tokens:u}=e.gullet.consumeArg();return s&&u.unshift(s),(r==="\\edef"||r==="\\xdef")&&(u=e.gullet.expandTokens(u),u.reverse()),e.gullet.macros.set(i,{tokens:u,numArgs:a,delimiters:l},r===CC[r]),{type:"internal",mode:e.mode}}});Ct({type:"internal",names:["\\let","\\\\globallet"],props:{numArgs:0,allowedInText:!0,primitive:!0},handler(t){var{parser:e,funcName:r}=t,n=n$(e.gullet.popToken());e.gullet.consumeSpaces();var i=z4e(e);return i$(e,n,i,r==="\\\\globallet"),{type:"internal",mode:e.mode}}});Ct({type:"internal",names:["\\futurelet","\\\\globalfuture"],props:{numArgs:0,allowedInText:!0,primitive:!0},handler(t){var{parser:e,funcName:r}=t,n=n$(e.gullet.popToken()),i=e.gullet.popToken(),a=e.gullet.popToken();return i$(e,n,a,r==="\\\\globalfuture"),e.gullet.pushToken(a),e.gullet.pushToken(i),{type:"internal",mode:e.mode}}});K1=o(function(e,r,n){var i=En.math[e]&&En.math[e].replace,a=RC(i||e,r,n);if(!a)throw new Error("Unsupported symbol "+e+" and font size "+r+".");return a},"getMetrics"),FC=o(function(e,r,n,i){var a=n.havingBaseStyle(r),s=Ie.makeSpan(i.concat(a.sizingClasses(n)),[e],n),l=a.sizeMultiplier/n.sizeMultiplier;return s.height*=l,s.depth*=l,s.maxFontSize=a.sizeMultiplier,s},"styleWrap"),a$=o(function(e,r,n){var i=r.havingBaseStyle(n),a=(1-r.sizeMultiplier/i.sizeMultiplier)*r.fontMetrics().axisHeight;e.classes.push("delimcenter"),e.style.top=mt(a),e.height-=a,e.depth+=a},"centerSpan"),G4e=o(function(e,r,n,i,a,s){var l=Ie.makeSymbol(e,"Main-Regular",a,i),u=FC(l,r,i,s);return n&&a$(u,i,r),u},"makeSmallDelim"),$4e=o(function(e,r,n,i){return Ie.makeSymbol(e,"Size"+r+"-Regular",n,i)},"mathrmSize"),s$=o(function(e,r,n,i,a,s){var l=$4e(e,r,a,i),u=FC(Ie.makeSpan(["delimsizing","size"+r],[l],i),rr.TEXT,i,s);return n&&a$(u,i,rr.TEXT),u},"makeLargeDelim"),uC=o(function(e,r,n){var i;r==="Size1-Regular"?i="delim-size1":i="delim-size4";var a=Ie.makeSpan(["delimsizinginner",i],[Ie.makeSpan([],[Ie.makeSymbol(e,r,n)])]);return{type:"elem",elem:a}},"makeGlyphSpan"),hC=o(function(e,r,n){var i=Zl["Size4-Regular"][e.charCodeAt(0)]?Zl["Size4-Regular"][e.charCodeAt(0)][4]:Zl["Size1-Regular"][e.charCodeAt(0)][4],a=new Jl("inner",jbe(e,Math.round(1e3*r))),s=new fl([a],{width:mt(i),height:mt(r),style:"width:"+mt(i),viewBox:"0 0 "+1e3*i+" "+Math.round(1e3*r),preserveAspectRatio:"xMinYMin"}),l=Ie.makeSvgSpan([],[s],n);return l.height=r,l.style.height=mt(r),l.style.width=mt(i),{type:"elem",elem:l}},"makeInner"),AC=.008,a4={type:"kern",size:-1*AC},V4e=["|","\\lvert","\\rvert","\\vert"],U4e=["\\|","\\lVert","\\rVert","\\Vert"],o$=o(function(e,r,n,i,a,s){var l,u,h,f,d="",p=0;l=h=f=e,u=null;var m="Size1-Regular";e==="\\uparrow"?h=f="\u23D0":e==="\\Uparrow"?h=f="\u2016":e==="\\downarrow"?l=h="\u23D0":e==="\\Downarrow"?l=h="\u2016":e==="\\updownarrow"?(l="\\uparrow",h="\u23D0",f="\\downarrow"):e==="\\Updownarrow"?(l="\\Uparrow",h="\u2016",f="\\Downarrow"):Jt.contains(V4e,e)?(h="\u2223",d="vert",p=333):Jt.contains(U4e,e)?(h="\u2225",d="doublevert",p=556):e==="["||e==="\\lbrack"?(l="\u23A1",h="\u23A2",f="\u23A3",m="Size4-Regular",d="lbrack",p=667):e==="]"||e==="\\rbrack"?(l="\u23A4",h="\u23A5",f="\u23A6",m="Size4-Regular",d="rbrack",p=667):e==="\\lfloor"||e==="\u230A"?(h=l="\u23A2",f="\u23A3",m="Size4-Regular",d="lfloor",p=667):e==="\\lceil"||e==="\u2308"?(l="\u23A1",h=f="\u23A2",m="Size4-Regular",d="lceil",p=667):e==="\\rfloor"||e==="\u230B"?(h=l="\u23A5",f="\u23A6",m="Size4-Regular",d="rfloor",p=667):e==="\\rceil"||e==="\u2309"?(l="\u23A4",h=f="\u23A5",m="Size4-Regular",d="rceil",p=667):e==="("||e==="\\lparen"?(l="\u239B",h="\u239C",f="\u239D",m="Size4-Regular",d="lparen",p=875):e===")"||e==="\\rparen"?(l="\u239E",h="\u239F",f="\u23A0",m="Size4-Regular",d="rparen",p=875):e==="\\{"||e==="\\lbrace"?(l="\u23A7",u="\u23A8",f="\u23A9",h="\u23AA",m="Size4-Regular"):e==="\\}"||e==="\\rbrace"?(l="\u23AB",u="\u23AC",f="\u23AD",h="\u23AA",m="Size4-Regular"):e==="\\lgroup"||e==="\u27EE"?(l="\u23A7",f="\u23A9",h="\u23AA",m="Size4-Regular"):e==="\\rgroup"||e==="\u27EF"?(l="\u23AB",f="\u23AD",h="\u23AA",m="Size4-Regular"):e==="\\lmoustache"||e==="\u23B0"?(l="\u23A7",f="\u23AD",h="\u23AA",m="Size4-Regular"):(e==="\\rmoustache"||e==="\u23B1")&&(l="\u23AB",f="\u23A9",h="\u23AA",m="Size4-Regular");var g=K1(l,m,a),y=g.height+g.depth,v=K1(h,m,a),x=v.height+v.depth,b=K1(f,m,a),w=b.height+b.depth,_=0,T=1;if(u!==null){var E=K1(u,m,a);_=E.height+E.depth,T=2}var L=y+w+_,C=Math.max(0,Math.ceil((r-L)/(T*x))),A=L+C*T*x,I=i.fontMetrics().axisHeight;n&&(I*=i.sizeMultiplier);var D=A/2-I,k=[];if(d.length>0){var R=A-y-w,S=Math.round(A*1e3),O=Kbe(d,Math.round(R*1e3)),N=new Jl(d,O),P=(p/1e3).toFixed(3)+"em",F=(S/1e3).toFixed(3)+"em",B=new fl([N],{width:P,height:F,viewBox:"0 0 "+p+" "+S}),$=Ie.makeSvgSpan([],[B],i);$.height=S/1e3,$.style.width=P,$.style.height=F,k.push({type:"elem",elem:$})}else{if(k.push(uC(f,m,a)),k.push(a4),u===null){var z=A-y-w+2*AC;k.push(hC(h,z,i))}else{var W=(A-y-w-_)/2+2*AC;k.push(hC(h,W,i)),k.push(a4),k.push(uC(u,m,a)),k.push(a4),k.push(hC(h,W,i))}k.push(a4),k.push(uC(l,m,a))}var j=i.havingBaseStyle(rr.TEXT),K=Ie.makeVList({positionType:"bottom",positionData:D,children:k},j);return FC(Ie.makeSpan(["delimsizing","mult"],[K],j),rr.TEXT,i,s)},"makeStackedDelim"),fC=80,dC=.08,pC=o(function(e,r,n,i,a){var s=Xbe(e,i,n),l=new Jl(e,s),u=new fl([l],{width:"400em",height:mt(r),viewBox:"0 0 400000 "+n,preserveAspectRatio:"xMinYMin slice"});return Ie.makeSvgSpan(["hide-tail"],[u],a)},"sqrtSvg"),H4e=o(function(e,r){var n=r.havingBaseSizing(),i=h$("\\surd",e*n.sizeMultiplier,u$,n),a=n.sizeMultiplier,s=Math.max(0,r.minRuleThickness-r.fontMetrics().sqrtRuleThickness),l,u=0,h=0,f=0,d;return i.type==="small"?(f=1e3+1e3*s+fC,e<1?a=1:e<1.4&&(a=.7),u=(1+s+dC)/a,h=(1+s)/a,l=pC("sqrtMain",u,f,s,r),l.style.minWidth="0.853em",d=.833/a):i.type==="large"?(f=(1e3+fC)*Q1[i.size],h=(Q1[i.size]+s)/a,u=(Q1[i.size]+s+dC)/a,l=pC("sqrtSize"+i.size,u,f,s,r),l.style.minWidth="1.02em",d=1/a):(u=e+s+dC,h=e+s,f=Math.floor(1e3*e+s)+fC,l=pC("sqrtTall",u,f,s,r),l.style.minWidth="0.742em",d=1.056),l.height=h,l.style.height=mt(u),{span:l,advanceWidth:d,ruleWidth:(r.fontMetrics().sqrtRuleThickness+s)*a}},"makeSqrtImage"),l$=["(","\\lparen",")","\\rparen","[","\\lbrack","]","\\rbrack","\\{","\\lbrace","\\}","\\rbrace","\\lfloor","\\rfloor","\u230A","\u230B","\\lceil","\\rceil","\u2308","\u2309","\\surd"],W4e=["\\uparrow","\\downarrow","\\updownarrow","\\Uparrow","\\Downarrow","\\Updownarrow","|","\\|","\\vert","\\Vert","\\lvert","\\rvert","\\lVert","\\rVert","\\lgroup","\\rgroup","\u27EE","\u27EF","\\lmoustache","\\rmoustache","\u23B0","\u23B1"],c$=["<",">","\\langle","\\rangle","/","\\backslash","\\lt","\\gt"],Q1=[0,1.2,1.8,2.4,3],Y4e=o(function(e,r,n,i,a){if(e==="<"||e==="\\lt"||e==="\u27E8"?e="\\langle":(e===">"||e==="\\gt"||e==="\u27E9")&&(e="\\rangle"),Jt.contains(l$,e)||Jt.contains(c$,e))return s$(e,r,!1,n,i,a);if(Jt.contains(W4e,e))return o$(e,Q1[r],!1,n,i,a);throw new ut("Illegal delimiter: '"+e+"'")},"makeSizedDelim"),q4e=[{type:"small",style:rr.SCRIPTSCRIPT},{type:"small",style:rr.SCRIPT},{type:"small",style:rr.TEXT},{type:"large",size:1},{type:"large",size:2},{type:"large",size:3},{type:"large",size:4}],X4e=[{type:"small",style:rr.SCRIPTSCRIPT},{type:"small",style:rr.SCRIPT},{type:"small",style:rr.TEXT},{type:"stack"}],u$=[{type:"small",style:rr.SCRIPTSCRIPT},{type:"small",style:rr.SCRIPT},{type:"small",style:rr.TEXT},{type:"large",size:1},{type:"large",size:2},{type:"large",size:3},{type:"large",size:4},{type:"stack"}],j4e=o(function(e){if(e.type==="small")return"Main-Regular";if(e.type==="large")return"Size"+e.size+"-Regular";if(e.type==="stack")return"Size4-Regular";throw new Error("Add support for delim type '"+e.type+"' here.")},"delimTypeToFont"),h$=o(function(e,r,n,i){for(var a=Math.min(2,3-i.style.size),s=a;s<n.length&&n[s].type!=="stack";s++){var l=K1(e,j4e(n[s]),"math"),u=l.height+l.depth;if(n[s].type==="small"){var h=i.havingBaseStyle(n[s].style);u*=h.sizeMultiplier}if(u>r)return n[s]}return n[n.length-1]},"traverseSequence"),f$=o(function(e,r,n,i,a,s){e==="<"||e==="\\lt"||e==="\u27E8"?e="\\langle":(e===">"||e==="\\gt"||e==="\u27E9")&&(e="\\rangle");var l;Jt.contains(c$,e)?l=q4e:Jt.contains(l$,e)?l=u$:l=X4e;var u=h$(e,r,l,i);return u.type==="small"?G4e(e,u.style,n,i,a,s):u.type==="large"?s$(e,u.size,n,i,a,s):o$(e,r,n,i,a,s)},"makeCustomSizedDelim"),K4e=o(function(e,r,n,i,a,s){var l=i.fontMetrics().axisHeight*i.sizeMultiplier,u=901,h=5/i.fontMetrics().ptPerEm,f=Math.max(r-l,n+l),d=Math.max(f/500*u,2*f-h);return f$(e,d,!0,i,a,s)},"makeLeftRightDelim"),nu={sqrtImage:H4e,sizedDelim:Y4e,sizeToMaxHeight:Q1,customSizedDelim:f$,leftRightDelim:K4e},yG={"\\bigl":{mclass:"mopen",size:1},"\\Bigl":{mclass:"mopen",size:2},"\\biggl":{mclass:"mopen",size:3},"\\Biggl":{mclass:"mopen",size:4},"\\bigr":{mclass:"mclose",size:1},"\\Bigr":{mclass:"mclose",size:2},"\\biggr":{mclass:"mclose",size:3},"\\Biggr":{mclass:"mclose",size:4},"\\bigm":{mclass:"mrel",size:1},"\\Bigm":{mclass:"mrel",size:2},"\\biggm":{mclass:"mrel",size:3},"\\Biggm":{mclass:"mrel",size:4},"\\big":{mclass:"mord",size:1},"\\Big":{mclass:"mord",size:2},"\\bigg":{mclass:"mord",size:3},"\\Bigg":{mclass:"mord",size:4}},Q4e=["(","\\lparen",")","\\rparen","[","\\lbrack","]","\\rbrack","\\{","\\lbrace","\\}","\\rbrace","\\lfloor","\\rfloor","\u230A","\u230B","\\lceil","\\rceil","\u2308","\u2309","<",">","\\langle","\u27E8","\\rangle","\u27E9","\\lt","\\gt","\\lvert","\\rvert","\\lVert","\\rVert","\\lgroup","\\rgroup","\u27EE","\u27EF","\\lmoustache","\\rmoustache","\u23B0","\u23B1","/","\\backslash","|","\\vert","\\|","\\Vert","\\uparrow","\\Uparrow","\\downarrow","\\Downarrow","\\updownarrow","\\Updownarrow","."];o(w4,"checkDelimiter");Ct({type:"delimsizing",names:["\\bigl","\\Bigl","\\biggl","\\Biggl","\\bigr","\\Bigr","\\biggr","\\Biggr","\\bigm","\\Bigm","\\biggm","\\Biggm","\\big","\\Big","\\bigg","\\Bigg"],props:{numArgs:1,argTypes:["primitive"]},handler:o((t,e)=>{var r=w4(e[0],t);return{type:"delimsizing",mode:t.parser.mode,size:yG[t.funcName].size,mclass:yG[t.funcName].mclass,delim:r.text}},"handler"),htmlBuilder:o((t,e)=>t.delim==="."?Ie.makeSpan([t.mclass]):nu.sizedDelim(t.delim,t.size,e,t.mode,[t.mclass]),"htmlBuilder"),mathmlBuilder:o(t=>{var e=[];t.delim!=="."&&e.push(Ao(t.delim,t.mode));var r=new st.MathNode("mo",e);t.mclass==="mopen"||t.mclass==="mclose"?r.setAttribute("fence","true"):r.setAttribute("fence","false"),r.setAttribute("stretchy","true");var n=mt(nu.sizeToMaxHeight[t.size]);return r.setAttribute("minsize",n),r.setAttribute("maxsize",n),r},"mathmlBuilder")});o(vG,"assertParsed");Ct({type:"leftright-right",names:["\\right"],props:{numArgs:1,primitive:!0},handler:o((t,e)=>{var r=t.parser.gullet.macros.get("\\current@color");if(r&&typeof r!="string")throw new ut("\\current@color set to non-string in \\right");return{type:"leftright-right",mode:t.parser.mode,delim:w4(e[0],t).text,color:r}},"handler")});Ct({type:"leftright",names:["\\left"],props:{numArgs:1,primitive:!0},handler:o((t,e)=>{var r=w4(e[0],t),n=t.parser;++n.leftrightDepth;var i=n.parseExpression(!1);--n.leftrightDepth,n.expect("\\right",!1);var a=yr(n.parseFunction(),"leftright-right");return{type:"leftright",mode:n.mode,body:i,left:r.text,right:a.delim,rightColor:a.color}},"handler"),htmlBuilder:o((t,e)=>{vG(t);for(var r=Ii(t.body,e,!0,["mopen","mclose"]),n=0,i=0,a=!1,s=0;s<r.length;s++)r[s].isMiddle?a=!0:(n=Math.max(r[s].height,n),i=Math.max(r[s].depth,i));n*=e.sizeMultiplier,i*=e.sizeMultiplier;var l;if(t.left==="."?l=ry(e,["mopen"]):l=nu.leftRightDelim(t.left,n,i,e,t.mode,["mopen"]),r.unshift(l),a)for(var u=1;u<r.length;u++){var h=r[u],f=h.isMiddle;f&&(r[u]=nu.leftRightDelim(f.delim,n,i,f.options,t.mode,[]))}var d;if(t.right===".")d=ry(e,["mclose"]);else{var p=t.rightColor?e.withColor(t.rightColor):e;d=nu.leftRightDelim(t.right,n,i,p,t.mode,["mclose"])}return r.push(d),Ie.makeSpan(["minner"],r,e)},"htmlBuilder"),mathmlBuilder:o((t,e)=>{vG(t);var r=gs(t.body,e);if(t.left!=="."){var n=new st.MathNode("mo",[Ao(t.left,t.mode)]);n.setAttribute("fence","true"),r.unshift(n)}if(t.right!=="."){var i=new st.MathNode("mo",[Ao(t.right,t.mode)]);i.setAttribute("fence","true"),t.rightColor&&i.setAttribute("mathcolor",t.rightColor),r.push(i)}return IC(r)},"mathmlBuilder")});Ct({type:"middle",names:["\\middle"],props:{numArgs:1,primitive:!0},handler:o((t,e)=>{var r=w4(e[0],t);if(!t.parser.leftrightDepth)throw new ut("\\middle without preceding \\left",r);return{type:"middle",mode:t.parser.mode,delim:r.text}},"handler"),htmlBuilder:o((t,e)=>{var r;if(t.delim===".")r=ry(e,[]);else{r=nu.sizedDelim(t.delim,1,e,t.mode,[]);var n={delim:t.delim,options:e};r.isMiddle=n}return r},"htmlBuilder"),mathmlBuilder:o((t,e)=>{var r=t.delim==="\\vert"||t.delim==="|"?Ao("|","text"):Ao(t.delim,t.mode),n=new st.MathNode("mo",[r]);return n.setAttribute("fence","true"),n.setAttribute("lspace","0.05em"),n.setAttribute("rspace","0.05em"),n},"mathmlBuilder")});zC=o((t,e)=>{var r=Ie.wrapFragment(Or(t.body,e),e),n=t.label.slice(1),i=e.sizeMultiplier,a,s=0,l=Jt.isCharacterBox(t.body);if(n==="sout")a=Ie.makeSpan(["stretchy","sout"]),a.height=e.fontMetrics().defaultRuleThickness/i,s=-.5*e.fontMetrics().xHeight;else if(n==="phase"){var u=Qn({number:.6,unit:"pt"},e),h=Qn({number:.35,unit:"ex"},e),f=e.havingBaseSizing();i=i/f.sizeMultiplier;var d=r.height+r.depth+u+h;r.style.paddingLeft=mt(d/2+u);var p=Math.floor(1e3*d*i),m=Ybe(p),g=new fl([new Jl("phase",m)],{width:"400em",height:mt(p/1e3),viewBox:"0 0 400000 "+p,preserveAspectRatio:"xMinYMin slice"});a=Ie.makeSvgSpan(["hide-tail"],[g],e),a.style.height=mt(d),s=r.depth+u+h}else{/cancel/.test(n)?l||r.classes.push("cancel-pad"):n==="angl"?r.classes.push("anglpad"):r.classes.push("boxpad");var y=0,v=0,x=0;/box/.test(n)?(x=Math.max(e.fontMetrics().fboxrule,e.minRuleThickness),y=e.fontMetrics().fboxsep+(n==="colorbox"?0:x),v=y):n==="angl"?(x=Math.max(e.fontMetrics().defaultRuleThickness,e.minRuleThickness),y=4*x,v=Math.max(0,.25-r.depth)):(y=l?.2:0,v=y),a=au.encloseSpan(r,n,y,v,e),/fbox|boxed|fcolorbox/.test(n)?(a.style.borderStyle="solid",a.style.borderWidth=mt(x)):n==="angl"&&x!==.049&&(a.style.borderTopWidth=mt(x),a.style.borderRightWidth=mt(x)),s=r.depth+v,t.backgroundColor&&(a.style.backgroundColor=t.backgroundColor,t.borderColor&&(a.style.borderColor=t.borderColor))}var b;if(t.backgroundColor)b=Ie.makeVList({positionType:"individualShift",children:[{type:"elem",elem:a,shift:s},{type:"elem",elem:r,shift:0}]},e);else{var w=/cancel|phase/.test(n)?["svg-align"]:[];b=Ie.makeVList({positionType:"individualShift",children:[{type:"elem",elem:r,shift:0},{type:"elem",elem:a,shift:s,wrapperClasses:w}]},e)}return/cancel/.test(n)&&(b.height=r.height,b.depth=r.depth),/cancel/.test(n)&&!l?Ie.makeSpan(["mord","cancel-lap"],[b],e):Ie.makeSpan(["mord"],[b],e)},"htmlBuilder$7"),GC=o((t,e)=>{var r=0,n=new st.MathNode(t.label.indexOf("colorbox")>-1?"mpadded":"menclose",[mn(t.body,e)]);switch(t.label){case"\\cancel":n.setAttribute("notation","updiagonalstrike");break;case"\\bcancel":n.setAttribute("notation","downdiagonalstrike");break;case"\\phase":n.setAttribute("notation","phasorangle");break;case"\\sout":n.setAttribute("notation","horizontalstrike");break;case"\\fbox":n.setAttribute("notation","box");break;case"\\angl":n.setAttribute("notation","actuarial");break;case"\\fcolorbox":case"\\colorbox":if(r=e.fontMetrics().fboxsep*e.fontMetrics().ptPerEm,n.setAttribute("width","+"+2*r+"pt"),n.setAttribute("height","+"+2*r+"pt"),n.setAttribute("lspace",r+"pt"),n.setAttribute("voffset",r+"pt"),t.label==="\\fcolorbox"){var i=Math.max(e.fontMetrics().fboxrule,e.minRuleThickness);n.setAttribute("style","border: "+i+"em solid "+String(t.borderColor))}break;case"\\xcancel":n.setAttribute("notation","updiagonalstrike downdiagonalstrike");break}return t.backgroundColor&&n.setAttribute("mathbackground",t.backgroundColor),n},"mathmlBuilder$6");Ct({type:"enclose",names:["\\colorbox"],props:{numArgs:2,allowedInText:!0,argTypes:["color","text"]},handler(t,e,r){var{parser:n,funcName:i}=t,a=yr(e[0],"color-token").color,s=e[1];return{type:"enclose",mode:n.mode,label:i,backgroundColor:a,body:s}},htmlBuilder:zC,mathmlBuilder:GC});Ct({type:"enclose",names:["\\fcolorbox"],props:{numArgs:3,allowedInText:!0,argTypes:["color","color","text"]},handler(t,e,r){var{parser:n,funcName:i}=t,a=yr(e[0],"color-token").color,s=yr(e[1],"color-token").color,l=e[2];return{type:"enclose",mode:n.mode,label:i,backgroundColor:s,borderColor:a,body:l}},htmlBuilder:zC,mathmlBuilder:GC});Ct({type:"enclose",names:["\\fbox"],props:{numArgs:1,argTypes:["hbox"],allowedInText:!0},handler(t,e){var{parser:r}=t;return{type:"enclose",mode:r.mode,label:"\\fbox",body:e[0]}}});Ct({type:"enclose",names:["\\cancel","\\bcancel","\\xcancel","\\sout","\\phase"],props:{numArgs:1},handler(t,e){var{parser:r,funcName:n}=t,i=e[0];return{type:"enclose",mode:r.mode,label:n,body:i}},htmlBuilder:zC,mathmlBuilder:GC});Ct({type:"enclose",names:["\\angl"],props:{numArgs:1,argTypes:["hbox"],allowedInText:!1},handler(t,e){var{parser:r}=t;return{type:"enclose",mode:r.mode,label:"\\angl",body:e[0]}}});d$={};o(ec,"defineEnvironment");p$={};o(le,"defineMacro");o(xG,"getHLines");T4=o(t=>{var e=t.parser.settings;if(!e.displayMode)throw new ut("{"+t.envName+"} can be used only in display mode.")},"validateAmsEnvironmentContext");o($C,"getAutoTag");o(uh,"parseArray");o(VC,"dCellStyle");tc=o(function(e,r){var n,i,a=e.body.length,s=e.hLinesBeforeRow,l=0,u=new Array(a),h=[],f=Math.max(r.fontMetrics().arrayRuleWidth,r.minRuleThickness),d=1/r.fontMetrics().ptPerEm,p=5*d;if(e.colSeparationType&&e.colSeparationType==="small"){var m=r.havingStyle(rr.SCRIPT).sizeMultiplier;p=.2778*(m/r.sizeMultiplier)}var g=e.colSeparationType==="CD"?Qn({number:3,unit:"ex"},r):12*d,y=3*d,v=e.arraystretch*g,x=.7*v,b=.3*v,w=0;function _(ke){for(var Fe=0;Fe<ke.length;++Fe)Fe>0&&(w+=.25),h.push({pos:w,isDashed:ke[Fe]})}for(o(_,"setHLinePos"),_(s[0]),n=0;n<e.body.length;++n){var T=e.body[n],E=x,L=b;l<T.length&&(l=T.length);var C=new Array(T.length);for(i=0;i<T.length;++i){var A=Or(T[i],r);L<A.depth&&(L=A.depth),E<A.height&&(E=A.height),C[i]=A}var I=e.rowGaps[n],D=0;I&&(D=Qn(I,r),D>0&&(D+=b,L<D&&(L=D),D=0)),e.addJot&&(L+=y),C.height=E,C.depth=L,w+=E,C.pos=w,w+=L+D,u[n]=C,_(s[n+1])}var k=w/2+r.fontMetrics().axisHeight,R=e.cols||[],S=[],O,N,P=[];if(e.tags&&e.tags.some(ke=>ke))for(n=0;n<a;++n){var F=u[n],B=F.pos-k,$=e.tags[n],z=void 0;$===!0?z=Ie.makeSpan(["eqn-num"],[],r):$===!1?z=Ie.makeSpan([],[],r):z=Ie.makeSpan([],Ii($,r,!0),r),z.depth=F.depth,z.height=F.height,P.push({type:"elem",elem:z,shift:B})}for(i=0,N=0;i<l||N<R.length;++i,++N){for(var W=R[N]||{},j=!0;W.type==="separator";){if(j||(O=Ie.makeSpan(["arraycolsep"],[]),O.style.width=mt(r.fontMetrics().doubleRuleSep),S.push(O)),W.separator==="|"||W.separator===":"){var K=W.separator==="|"?"solid":"dashed",ie=Ie.makeSpan(["vertical-separator"],[],r);ie.style.height=mt(w),ie.style.borderRightWidth=mt(f),ie.style.borderRightStyle=K,ie.style.margin="0 "+mt(-f/2);var Q=w-k;Q&&(ie.style.verticalAlign=mt(-Q)),S.push(ie)}else throw new ut("Invalid separator type: "+W.separator);N++,W=R[N]||{},j=!1}if(!(i>=l)){var ee=void 0;(i>0||e.hskipBeforeAndAfter)&&(ee=Jt.deflt(W.pregap,p),ee!==0&&(O=Ie.makeSpan(["arraycolsep"],[]),O.style.width=mt(ee),S.push(O)));var J=[];for(n=0;n<a;++n){var H=u[n],q=H[i];if(q){var Z=H.pos-k;q.depth=H.depth,q.height=H.height,J.push({type:"elem",elem:q,shift:Z})}}J=Ie.makeVList({positionType:"individualShift",children:J},r),J=Ie.makeSpan(["col-align-"+(W.align||"c")],[J]),S.push(J),(i<l-1||e.hskipBeforeAndAfter)&&(ee=Jt.deflt(W.postgap,p),ee!==0&&(O=Ie.makeSpan(["arraycolsep"],[]),O.style.width=mt(ee),S.push(O)))}}if(u=Ie.makeSpan(["mtable"],S),h.length>0){for(var ae=Ie.makeLineSpan("hline",r,f),ue=Ie.makeLineSpan("hdashline",r,f),ce=[{type:"elem",elem:u,shift:0}];h.length>0;){var te=h.pop(),De=te.pos-k;te.isDashed?ce.push({type:"elem",elem:ue,shift:De}):ce.push({type:"elem",elem:ae,shift:De})}u=Ie.makeVList({positionType:"individualShift",children:ce},r)}if(P.length===0)return Ie.makeSpan(["mord"],[u],r);var oe=Ie.makeVList({positionType:"individualShift",children:P},r);return oe=Ie.makeSpan(["tag"],[oe],r),Ie.makeFragment([u,oe])},"htmlBuilder"),Z4e={c:"center ",l:"left ",r:"right "},rc=o(function(e,r){for(var n=[],i=new st.MathNode("mtd",[],["mtr-glue"]),a=new st.MathNode("mtd",[],["mml-eqn-num"]),s=0;s<e.body.length;s++){for(var l=e.body[s],u=[],h=0;h<l.length;h++)u.push(new st.MathNode("mtd",[mn(l[h],r)]));e.tags&&e.tags[s]&&(u.unshift(i),u.push(i),e.leqno?u.unshift(a):u.push(a)),n.push(new st.MathNode("mtr",u))}var f=new st.MathNode("mtable",n),d=e.arraystretch===.5?.1:.16+e.arraystretch-1+(e.addJot?.09:0);f.setAttribute("rowspacing",mt(d));var p="",m="";if(e.cols&&e.cols.length>0){var g=e.cols,y="",v=!1,x=0,b=g.length;g[0].type==="separator"&&(p+="top ",x=1),g[g.length-1].type==="separator"&&(p+="bottom ",b-=1);for(var w=x;w<b;w++)g[w].type==="align"?(m+=Z4e[g[w].align],v&&(y+="none "),v=!0):g[w].type==="separator"&&v&&(y+=g[w].separator==="|"?"solid ":"dashed ",v=!1);f.setAttribute("columnalign",m.trim()),/[sd]/.test(y)&&f.setAttribute("columnlines",y.trim())}if(e.colSeparationType==="align"){for(var _=e.cols||[],T="",E=1;E<_.length;E++)T+=E%2?"0em ":"1em ";f.setAttribute("columnspacing",T.trim())}else e.colSeparationType==="alignat"||e.colSeparationType==="gather"?f.setAttribute("columnspacing","0em"):e.colSeparationType==="small"?f.setAttribute("columnspacing","0.2778em"):e.colSeparationType==="CD"?f.setAttribute("columnspacing","0.5em"):f.setAttribute("columnspacing","1em");var L="",C=e.hLinesBeforeRow;p+=C[0].length>0?"left ":"",p+=C[C.length-1].length>0?"right ":"";for(var A=1;A<C.length-1;A++)L+=C[A].length===0?"none ":C[A][0]?"dashed ":"solid ";return/[sd]/.test(L)&&f.setAttribute("rowlines",L.trim()),p!==""&&(f=new st.MathNode("menclose",[f]),f.setAttribute("notation",p.trim())),e.arraystretch&&e.arraystretch<1&&(f=new st.MathNode("mstyle",[f]),f.setAttribute("scriptlevel","1")),f},"mathmlBuilder"),m$=o(function(e,r){e.envName.indexOf("ed")===-1&&T4(e);var n=[],i=e.envName.indexOf("at")>-1?"alignat":"align",a=e.envName==="split",s=uh(e.parser,{cols:n,addJot:!0,autoTag:a?void 0:$C(e.envName),emptySingleRow:!0,colSeparationType:i,maxNumCols:a?2:void 0,leqno:e.parser.settings.leqno},"display"),l,u=0,h={type:"ordgroup",mode:e.mode,body:[]};if(r[0]&&r[0].type==="ordgroup"){for(var f="",d=0;d<r[0].body.length;d++){var p=yr(r[0].body[d],"textord");f+=p.text}l=Number(f),u=l*2}var m=!u;s.body.forEach(function(x){for(var b=1;b<x.length;b+=2){var w=yr(x[b],"styling"),_=yr(w.body[0],"ordgroup");_.body.unshift(h)}if(m)u<x.length&&(u=x.length);else{var T=x.length/2;if(l<T)throw new ut("Too many math in a row: "+("expected "+l+", but got "+T),x[0])}});for(var g=0;g<u;++g){var y="r",v=0;g%2===1?y="l":g>0&&m&&(v=1),n[g]={type:"align",align:y,pregap:v,postgap:0}}return s.colSeparationType=m?"align":"alignat",s},"alignedHandler");ec({type:"array",names:["array","darray"],props:{numArgs:1},handler(t,e){var r=x4(e[0]),n=r?[e[0]]:yr(e[0],"ordgroup").body,i=n.map(function(s){var l=PC(s),u=l.text;if("lcr".indexOf(u)!==-1)return{type:"align",align:u};if(u==="|")return{type:"separator",separator:"|"};if(u===":")return{type:"separator",separator:":"};throw new ut("Unknown column alignment: "+u,s)}),a={cols:i,hskipBeforeAndAfter:!0,maxNumCols:i.length};return uh(t.parser,a,VC(t.envName))},htmlBuilder:tc,mathmlBuilder:rc});ec({type:"array",names:["matrix","pmatrix","bmatrix","Bmatrix","vmatrix","Vmatrix","matrix*","pmatrix*","bmatrix*","Bmatrix*","vmatrix*","Vmatrix*"],props:{numArgs:0},handler(t){var e={matrix:null,pmatrix:["(",")"],bmatrix:["[","]"],Bmatrix:["\\{","\\}"],vmatrix:["|","|"],Vmatrix:["\\Vert","\\Vert"]}[t.envName.replace("*","")],r="c",n={hskipBeforeAndAfter:!1,cols:[{type:"align",align:r}]};if(t.envName.charAt(t.envName.length-1)==="*"){var i=t.parser;if(i.consumeSpaces(),i.fetch().text==="["){if(i.consume(),i.consumeSpaces(),r=i.fetch().text,"lcr".indexOf(r)===-1)throw new ut("Expected l or c or r",i.nextToken);i.consume(),i.consumeSpaces(),i.expect("]"),i.consume(),n.cols=[{type:"align",align:r}]}}var a=uh(t.parser,n,VC(t.envName)),s=Math.max(0,...a.body.map(l=>l.length));return a.cols=new Array(s).fill({type:"align",align:r}),e?{type:"leftright",mode:t.mode,body:[a],left:e[0],right:e[1],rightColor:void 0}:a},htmlBuilder:tc,mathmlBuilder:rc});ec({type:"array",names:["smallmatrix"],props:{numArgs:0},handler(t){var e={arraystretch:.5},r=uh(t.parser,e,"script");return r.colSeparationType="small",r},htmlBuilder:tc,mathmlBuilder:rc});ec({type:"array",names:["subarray"],props:{numArgs:1},handler(t,e){var r=x4(e[0]),n=r?[e[0]]:yr(e[0],"ordgroup").body,i=n.map(function(s){var l=PC(s),u=l.text;if("lc".indexOf(u)!==-1)return{type:"align",align:u};throw new ut("Unknown column alignment: "+u,s)});if(i.length>1)throw new ut("{subarray} can contain only one column");var a={cols:i,hskipBeforeAndAfter:!1,arraystretch:.5};if(a=uh(t.parser,a,"script"),a.body.length>0&&a.body[0].length>1)throw new ut("{subarray} can contain only one column");return a},htmlBuilder:tc,mathmlBuilder:rc});ec({type:"array",names:["cases","dcases","rcases","drcases"],props:{numArgs:0},handler(t){var e={arraystretch:1.2,cols:[{type:"align",align:"l",pregap:0,postgap:1},{type:"align",align:"l",pregap:0,postgap:0}]},r=uh(t.parser,e,VC(t.envName));return{type:"leftright",mode:t.mode,body:[r],left:t.envName.indexOf("r")>-1?".":"\\{",right:t.envName.indexOf("r")>-1?"\\}":".",rightColor:void 0}},htmlBuilder:tc,mathmlBuilder:rc});ec({type:"array",names:["align","align*","aligned","split"],props:{numArgs:0},handler:m$,htmlBuilder:tc,mathmlBuilder:rc});ec({type:"array",names:["gathered","gather","gather*"],props:{numArgs:0},handler(t){Jt.contains(["gather","gather*"],t.envName)&&T4(t);var e={cols:[{type:"align",align:"c"}],addJot:!0,colSeparationType:"gather",autoTag:$C(t.envName),emptySingleRow:!0,leqno:t.parser.settings.leqno};return uh(t.parser,e,"display")},htmlBuilder:tc,mathmlBuilder:rc});ec({type:"array",names:["alignat","alignat*","alignedat"],props:{numArgs:1},handler:m$,htmlBuilder:tc,mathmlBuilder:rc});ec({type:"array",names:["equation","equation*"],props:{numArgs:0},handler(t){T4(t);var e={autoTag:$C(t.envName),emptySingleRow:!0,singleRow:!0,maxNumCols:1,leqno:t.parser.settings.leqno};return uh(t.parser,e,"display")},htmlBuilder:tc,mathmlBuilder:rc});ec({type:"array",names:["CD"],props:{numArgs:0},handler(t){return T4(t),F4e(t.parser)},htmlBuilder:tc,mathmlBuilder:rc});le("\\nonumber","\\gdef\\@eqnsw{0}");le("\\notag","\\nonumber");Ct({type:"text",names:["\\hline","\\hdashline"],props:{numArgs:0,allowedInText:!0,allowedInMath:!0},handler(t,e){throw new ut(t.funcName+" valid only within array environment")}});bG=d$;Ct({type:"environment",names:["\\begin","\\end"],props:{numArgs:1,argTypes:["text"]},handler(t,e){var{parser:r,funcName:n}=t,i=e[0];if(i.type!=="ordgroup")throw new ut("Invalid environment name",i);for(var a="",s=0;s<i.body.length;++s)a+=yr(i.body[s],"textord").text;if(n==="\\begin"){if(!bG.hasOwnProperty(a))throw new ut("No such environment: "+a,i);var l=bG[a],{args:u,optArgs:h}=r.parseArguments("\\begin{"+a+"}",l),f={mode:r.mode,envName:a,parser:r},d=l.handler(f,u,h);r.expect("\\end",!1);var p=r.nextToken,m=yr(r.parseFunction(),"environment");if(m.name!==a)throw new ut("Mismatch: \\begin{"+a+"} matched by \\end{"+m.name+"}",p);return d}return{type:"environment",mode:r.mode,name:a,nameGroup:i}}});g$=o((t,e)=>{var r=t.font,n=e.withFont(r);return Or(t.body,n)},"htmlBuilder$5"),y$=o((t,e)=>{var r=t.font,n=e.withFont(r);return mn(t.body,n)},"mathmlBuilder$4"),wG={"\\Bbb":"\\mathbb","\\bold":"\\mathbf","\\frak":"\\mathfrak","\\bm":"\\boldsymbol"};Ct({type:"font",names:["\\mathrm","\\mathit","\\mathbf","\\mathnormal","\\mathbb","\\mathcal","\\mathfrak","\\mathscr","\\mathsf","\\mathtt","\\Bbb","\\bold","\\frak"],props:{numArgs:1,allowedInArgument:!0},handler:o((t,e)=>{var{parser:r,funcName:n}=t,i=p4(e[0]),a=n;return a in wG&&(a=wG[a]),{type:"font",mode:r.mode,font:a.slice(1),body:i}},"handler"),htmlBuilder:g$,mathmlBuilder:y$});Ct({type:"mclass",names:["\\boldsymbol","\\bm"],props:{numArgs:1},handler:o((t,e)=>{var{parser:r}=t,n=e[0],i=Jt.isCharacterBox(n);return{type:"mclass",mode:r.mode,mclass:b4(n),body:[{type:"font",mode:r.mode,font:"boldsymbol",body:n}],isCharacterBox:i}},"handler")});Ct({type:"font",names:["\\rm","\\sf","\\tt","\\bf","\\it","\\cal"],props:{numArgs:0,allowedInText:!0},handler:o((t,e)=>{var{parser:r,funcName:n,breakOnTokenText:i}=t,{mode:a}=r,s=r.parseExpression(!0,i),l="math"+n.slice(1);return{type:"font",mode:a,font:l,body:{type:"ordgroup",mode:r.mode,body:s}}},"handler"),htmlBuilder:g$,mathmlBuilder:y$});v$=o((t,e)=>{var r=e;return t==="display"?r=r.id>=rr.SCRIPT.id?r.text():rr.DISPLAY:t==="text"&&r.size===rr.DISPLAY.size?r=rr.TEXT:t==="script"?r=rr.SCRIPT:t==="scriptscript"&&(r=rr.SCRIPTSCRIPT),r},"adjustStyle"),UC=o((t,e)=>{var r=v$(t.size,e.style),n=r.fracNum(),i=r.fracDen(),a;a=e.havingStyle(n);var s=Or(t.numer,a,e);if(t.continued){var l=8.5/e.fontMetrics().ptPerEm,u=3.5/e.fontMetrics().ptPerEm;s.height=s.height<l?l:s.height,s.depth=s.depth<u?u:s.depth}a=e.havingStyle(i);var h=Or(t.denom,a,e),f,d,p;t.hasBarLine?(t.barSize?(d=Qn(t.barSize,e),f=Ie.makeLineSpan("frac-line",e,d)):f=Ie.makeLineSpan("frac-line",e),d=f.height,p=f.height):(f=null,d=0,p=e.fontMetrics().defaultRuleThickness);var m,g,y;r.size===rr.DISPLAY.size||t.size==="display"?(m=e.fontMetrics().num1,d>0?g=3*p:g=7*p,y=e.fontMetrics().denom1):(d>0?(m=e.fontMetrics().num2,g=p):(m=e.fontMetrics().num3,g=3*p),y=e.fontMetrics().denom2);var v;if(f){var b=e.fontMetrics().axisHeight;m-s.depth-(b+.5*d)<g&&(m+=g-(m-s.depth-(b+.5*d))),b-.5*d-(h.height-y)<g&&(y+=g-(b-.5*d-(h.height-y)));var w=-(b-.5*d);v=Ie.makeVList({positionType:"individualShift",children:[{type:"elem",elem:h,shift:y},{type:"elem",elem:f,shift:w},{type:"elem",elem:s,shift:-m}]},e)}else{var x=m-s.depth-(h.height-y);x<g&&(m+=.5*(g-x),y+=.5*(g-x)),v=Ie.makeVList({positionType:"individualShift",children:[{type:"elem",elem:h,shift:y},{type:"elem",elem:s,shift:-m}]},e)}a=e.havingStyle(r),v.height*=a.sizeMultiplier/e.sizeMultiplier,v.depth*=a.sizeMultiplier/e.sizeMultiplier;var _;r.size===rr.DISPLAY.size?_=e.fontMetrics().delim1:r.size===rr.SCRIPTSCRIPT.size?_=e.havingStyle(rr.SCRIPT).fontMetrics().delim2:_=e.fontMetrics().delim2;var T,E;return t.leftDelim==null?T=ry(e,["mopen"]):T=nu.customSizedDelim(t.leftDelim,_,!0,e.havingStyle(r),t.mode,["mopen"]),t.continued?E=Ie.makeSpan([]):t.rightDelim==null?E=ry(e,["mclose"]):E=nu.customSizedDelim(t.rightDelim,_,!0,e.havingStyle(r),t.mode,["mclose"]),Ie.makeSpan(["mord"].concat(a.sizingClasses(e)),[T,Ie.makeSpan(["mfrac"],[v]),E],e)},"htmlBuilder$4"),HC=o((t,e)=>{var r=new st.MathNode("mfrac",[mn(t.numer,e),mn(t.denom,e)]);if(!t.hasBarLine)r.setAttribute("linethickness","0px");else if(t.barSize){var n=Qn(t.barSize,e);r.setAttribute("linethickness",mt(n))}var i=v$(t.size,e.style);if(i.size!==e.style.size){r=new st.MathNode("mstyle",[r]);var a=i.size===rr.DISPLAY.size?"true":"false";r.setAttribute("displaystyle",a),r.setAttribute("scriptlevel","0")}if(t.leftDelim!=null||t.rightDelim!=null){var s=[];if(t.leftDelim!=null){var l=new st.MathNode("mo",[new st.TextNode(t.leftDelim.replace("\\",""))]);l.setAttribute("fence","true"),s.push(l)}if(s.push(r),t.rightDelim!=null){var u=new st.MathNode("mo",[new st.TextNode(t.rightDelim.replace("\\",""))]);u.setAttribute("fence","true"),s.push(u)}return IC(s)}return r},"mathmlBuilder$3");Ct({type:"genfrac",names:["\\dfrac","\\frac","\\tfrac","\\dbinom","\\binom","\\tbinom","\\\\atopfrac","\\\\bracefrac","\\\\brackfrac"],props:{numArgs:2,allowedInArgument:!0},handler:o((t,e)=>{var{parser:r,funcName:n}=t,i=e[0],a=e[1],s,l=null,u=null,h="auto";switch(n){case"\\dfrac":case"\\frac":case"\\tfrac":s=!0;break;case"\\\\atopfrac":s=!1;break;case"\\dbinom":case"\\binom":case"\\tbinom":s=!1,l="(",u=")";break;case"\\\\bracefrac":s=!1,l="\\{",u="\\}";break;case"\\\\brackfrac":s=!1,l="[",u="]";break;default:throw new Error("Unrecognized genfrac command")}switch(n){case"\\dfrac":case"\\dbinom":h="display";break;case"\\tfrac":case"\\tbinom":h="text";break}return{type:"genfrac",mode:r.mode,continued:!1,numer:i,denom:a,hasBarLine:s,leftDelim:l,rightDelim:u,size:h,barSize:null}},"handler"),htmlBuilder:UC,mathmlBuilder:HC});Ct({type:"genfrac",names:["\\cfrac"],props:{numArgs:2},handler:o((t,e)=>{var{parser:r,funcName:n}=t,i=e[0],a=e[1];return{type:"genfrac",mode:r.mode,continued:!0,numer:i,denom:a,hasBarLine:!0,leftDelim:null,rightDelim:null,size:"display",barSize:null}},"handler")});Ct({type:"infix",names:["\\over","\\choose","\\atop","\\brace","\\brack"],props:{numArgs:0,infix:!0},handler(t){var{parser:e,funcName:r,token:n}=t,i;switch(r){case"\\over":i="\\frac";break;case"\\choose":i="\\binom";break;case"\\atop":i="\\\\atopfrac";break;case"\\brace":i="\\\\bracefrac";break;case"\\brack":i="\\\\brackfrac";break;default:throw new Error("Unrecognized infix genfrac command")}return{type:"infix",mode:e.mode,replaceWith:i,token:n}}});TG=["display","text","script","scriptscript"],kG=o(function(e){var r=null;return e.length>0&&(r=e,r=r==="."?null:r),r},"delimFromValue");Ct({type:"genfrac",names:["\\genfrac"],props:{numArgs:6,allowedInArgument:!0,argTypes:["math","math","size","text","math","math"]},handler(t,e){var{parser:r}=t,n=e[4],i=e[5],a=p4(e[0]),s=a.type==="atom"&&a.family==="open"?kG(a.text):null,l=p4(e[1]),u=l.type==="atom"&&l.family==="close"?kG(l.text):null,h=yr(e[2],"size"),f,d=null;h.isBlank?f=!0:(d=h.value,f=d.number>0);var p="auto",m=e[3];if(m.type==="ordgroup"){if(m.body.length>0){var g=yr(m.body[0],"textord");p=TG[Number(g.text)]}}else m=yr(m,"textord"),p=TG[Number(m.text)];return{type:"genfrac",mode:r.mode,numer:n,denom:i,continued:!1,hasBarLine:f,barSize:d,leftDelim:s,rightDelim:u,size:p}},htmlBuilder:UC,mathmlBuilder:HC});Ct({type:"infix",names:["\\above"],props:{numArgs:1,argTypes:["size"],infix:!0},handler(t,e){var{parser:r,funcName:n,token:i}=t;return{type:"infix",mode:r.mode,replaceWith:"\\\\abovefrac",size:yr(e[0],"size").value,token:i}}});Ct({type:"genfrac",names:["\\\\abovefrac"],props:{numArgs:3,argTypes:["math","size","math"]},handler:o((t,e)=>{var{parser:r,funcName:n}=t,i=e[0],a=Nbe(yr(e[1],"infix").size),s=e[2],l=a.number>0;return{type:"genfrac",mode:r.mode,numer:i,denom:s,continued:!1,hasBarLine:l,barSize:a,leftDelim:null,rightDelim:null,size:"auto"}},"handler"),htmlBuilder:UC,mathmlBuilder:HC});x$=o((t,e)=>{var r=e.style,n,i;t.type==="supsub"?(n=t.sup?Or(t.sup,e.havingStyle(r.sup()),e):Or(t.sub,e.havingStyle(r.sub()),e),i=yr(t.base,"horizBrace")):i=yr(t,"horizBrace");var a=Or(i.base,e.havingBaseStyle(rr.DISPLAY)),s=au.svgSpan(i,e),l;if(i.isOver?(l=Ie.makeVList({positionType:"firstBaseline",children:[{type:"elem",elem:a},{type:"kern",size:.1},{type:"elem",elem:s}]},e),l.children[0].children[0].children[1].classes.push("svg-align")):(l=Ie.makeVList({positionType:"bottom",positionData:a.depth+.1+s.height,children:[{type:"elem",elem:s},{type:"kern",size:.1},{type:"elem",elem:a}]},e),l.children[0].children[0].children[0].classes.push("svg-align")),n){var u=Ie.makeSpan(["mord",i.isOver?"mover":"munder"],[l],e);i.isOver?l=Ie.makeVList({positionType:"firstBaseline",children:[{type:"elem",elem:u},{type:"kern",size:.2},{type:"elem",elem:n}]},e):l=Ie.makeVList({positionType:"bottom",positionData:u.depth+.2+n.height+n.depth,children:[{type:"elem",elem:n},{type:"kern",size:.2},{type:"elem",elem:u}]},e)}return Ie.makeSpan(["mord",i.isOver?"mover":"munder"],[l],e)},"htmlBuilder$3"),J4e=o((t,e)=>{var r=au.mathMLnode(t.label);return new st.MathNode(t.isOver?"mover":"munder",[mn(t.base,e),r])},"mathmlBuilder$2");Ct({type:"horizBrace",names:["\\overbrace","\\underbrace"],props:{numArgs:1},handler(t,e){var{parser:r,funcName:n}=t;return{type:"horizBrace",mode:r.mode,label:n,isOver:/^\\over/.test(n),base:e[0]}},htmlBuilder:x$,mathmlBuilder:J4e});Ct({type:"href",names:["\\href"],props:{numArgs:2,argTypes:["url","original"],allowedInText:!0},handler:o((t,e)=>{var{parser:r}=t,n=e[1],i=yr(e[0],"url").url;return r.settings.isTrusted({command:"\\href",url:i})?{type:"href",mode:r.mode,href:i,body:di(n)}:r.formatUnsupportedCmd("\\href")},"handler"),htmlBuilder:o((t,e)=>{var r=Ii(t.body,e,!1);return Ie.makeAnchor(t.href,[],r,e)},"htmlBuilder"),mathmlBuilder:o((t,e)=>{var r=ch(t.body,e);return r instanceof ps||(r=new ps("mrow",[r])),r.setAttribute("href",t.href),r},"mathmlBuilder")});Ct({type:"href",names:["\\url"],props:{numArgs:1,argTypes:["url"],allowedInText:!0},handler:o((t,e)=>{var{parser:r}=t,n=yr(e[0],"url").url;if(!r.settings.isTrusted({command:"\\url",url:n}))return r.formatUnsupportedCmd("\\url");for(var i=[],a=0;a<n.length;a++){var s=n[a];s==="~"&&(s="\\textasciitilde"),i.push({type:"textord",mode:"text",text:s})}var l={type:"text",mode:r.mode,font:"\\texttt",body:i};return{type:"href",mode:r.mode,href:n,body:di(l)}},"handler")});Ct({type:"hbox",names:["\\hbox"],props:{numArgs:1,argTypes:["text"],allowedInText:!0,primitive:!0},handler(t,e){var{parser:r}=t;return{type:"hbox",mode:r.mode,body:di(e[0])}},htmlBuilder(t,e){var r=Ii(t.body,e,!1);return Ie.makeFragment(r)},mathmlBuilder(t,e){return new st.MathNode("mrow",gs(t.body,e))}});Ct({type:"html",names:["\\htmlClass","\\htmlId","\\htmlStyle","\\htmlData"],props:{numArgs:2,argTypes:["raw","original"],allowedInText:!0},handler:o((t,e)=>{var{parser:r,funcName:n,token:i}=t,a=yr(e[0],"raw").string,s=e[1];r.settings.strict&&r.settings.reportNonstrict("htmlExtension","HTML extension is disabled on strict mode");var l,u={};switch(n){case"\\htmlClass":u.class=a,l={command:"\\htmlClass",class:a};break;case"\\htmlId":u.id=a,l={command:"\\htmlId",id:a};break;case"\\htmlStyle":u.style=a,l={command:"\\htmlStyle",style:a};break;case"\\htmlData":{for(var h=a.split(","),f=0;f<h.length;f++){var d=h[f].split("=");if(d.length!==2)throw new ut("Error parsing key-value for \\htmlData");u["data-"+d[0].trim()]=d[1].trim()}l={command:"\\htmlData",attributes:u};break}default:throw new Error("Unrecognized html command")}return r.settings.isTrusted(l)?{type:"html",mode:r.mode,attributes:u,body:di(s)}:r.formatUnsupportedCmd(n)},"handler"),htmlBuilder:o((t,e)=>{var r=Ii(t.body,e,!1),n=["enclosing"];t.attributes.class&&n.push(...t.attributes.class.trim().split(/\s+/));var i=Ie.makeSpan(n,r,e);for(var a in t.attributes)a!=="class"&&t.attributes.hasOwnProperty(a)&&i.setAttribute(a,t.attributes[a]);return i},"htmlBuilder"),mathmlBuilder:o((t,e)=>ch(t.body,e),"mathmlBuilder")});Ct({type:"htmlmathml",names:["\\html@mathml"],props:{numArgs:2,allowedInText:!0},handler:o((t,e)=>{var{parser:r}=t;return{type:"htmlmathml",mode:r.mode,html:di(e[0]),mathml:di(e[1])}},"handler"),htmlBuilder:o((t,e)=>{var r=Ii(t.html,e,!1);return Ie.makeFragment(r)},"htmlBuilder"),mathmlBuilder:o((t,e)=>ch(t.mathml,e),"mathmlBuilder")});mC=o(function(e){if(/^[-+]? *(\d+(\.\d*)?|\.\d+)$/.test(e))return{number:+e,unit:"bp"};var r=/([-+]?) *(\d+(?:\.\d*)?|\.\d+) *([a-z]{2})/.exec(e);if(!r)throw new ut("Invalid size: '"+e+"' in \\includegraphics");var n={number:+(r[1]+r[2]),unit:r[3]};if(!FG(n))throw new ut("Invalid unit: '"+n.unit+"' in \\includegraphics.");return n},"sizeData");Ct({type:"includegraphics",names:["\\includegraphics"],props:{numArgs:1,numOptionalArgs:1,argTypes:["raw","url"],allowedInText:!1},handler:o((t,e,r)=>{var{parser:n}=t,i={number:0,unit:"em"},a={number:.9,unit:"em"},s={number:0,unit:"em"},l="";if(r[0])for(var u=yr(r[0],"raw").string,h=u.split(","),f=0;f<h.length;f++){var d=h[f].split("=");if(d.length===2){var p=d[1].trim();switch(d[0].trim()){case"alt":l=p;break;case"width":i=mC(p);break;case"height":a=mC(p);break;case"totalheight":s=mC(p);break;default:throw new ut("Invalid key: '"+d[0]+"' in \\includegraphics.")}}}var m=yr(e[0],"url").url;return l===""&&(l=m,l=l.replace(/^.*[\\/]/,""),l=l.substring(0,l.lastIndexOf("."))),n.settings.isTrusted({command:"\\includegraphics",url:m})?{type:"includegraphics",mode:n.mode,alt:l,width:i,height:a,totalheight:s,src:m}:n.formatUnsupportedCmd("\\includegraphics")},"handler"),htmlBuilder:o((t,e)=>{var r=Qn(t.height,e),n=0;t.totalheight.number>0&&(n=Qn(t.totalheight,e)-r);var i=0;t.width.number>0&&(i=Qn(t.width,e));var a={height:mt(r+n)};i>0&&(a.width=mt(i)),n>0&&(a.verticalAlign=mt(-n));var s=new wC(t.src,t.alt,a);return s.height=r,s.depth=n,s},"htmlBuilder"),mathmlBuilder:o((t,e)=>{var r=new st.MathNode("mglyph",[]);r.setAttribute("alt",t.alt);var n=Qn(t.height,e),i=0;if(t.totalheight.number>0&&(i=Qn(t.totalheight,e)-n,r.setAttribute("valign",mt(-i))),r.setAttribute("height",mt(n+i)),t.width.number>0){var a=Qn(t.width,e);r.setAttribute("width",mt(a))}return r.setAttribute("src",t.src),r},"mathmlBuilder")});Ct({type:"kern",names:["\\kern","\\mkern","\\hskip","\\mskip"],props:{numArgs:1,argTypes:["size"],primitive:!0,allowedInText:!0},handler(t,e){var{parser:r,funcName:n}=t,i=yr(e[0],"size");if(r.settings.strict){var a=n[1]==="m",s=i.value.unit==="mu";a?(s||r.settings.reportNonstrict("mathVsTextUnits","LaTeX's "+n+" supports only mu units, "+("not "+i.value.unit+" units")),r.mode!=="math"&&r.settings.reportNonstrict("mathVsTextUnits","LaTeX's "+n+" works only in math mode")):s&&r.settings.reportNonstrict("mathVsTextUnits","LaTeX's "+n+" doesn't support mu units")}return{type:"kern",mode:r.mode,dimension:i.value}},htmlBuilder(t,e){return Ie.makeGlue(t.dimension,e)},mathmlBuilder(t,e){var r=Qn(t.dimension,e);return new st.SpaceNode(r)}});Ct({type:"lap",names:["\\mathllap","\\mathrlap","\\mathclap"],props:{numArgs:1,allowedInText:!0},handler:o((t,e)=>{var{parser:r,funcName:n}=t,i=e[0];return{type:"lap",mode:r.mode,alignment:n.slice(5),body:i}},"handler"),htmlBuilder:o((t,e)=>{var r;t.alignment==="clap"?(r=Ie.makeSpan([],[Or(t.body,e)]),r=Ie.makeSpan(["inner"],[r],e)):r=Ie.makeSpan(["inner"],[Or(t.body,e)]);var n=Ie.makeSpan(["fix"],[]),i=Ie.makeSpan([t.alignment],[r,n],e),a=Ie.makeSpan(["strut"]);return a.style.height=mt(i.height+i.depth),i.depth&&(a.style.verticalAlign=mt(-i.depth)),i.children.unshift(a),i=Ie.makeSpan(["thinbox"],[i],e),Ie.makeSpan(["mord","vbox"],[i],e)},"htmlBuilder"),mathmlBuilder:o((t,e)=>{var r=new st.MathNode("mpadded",[mn(t.body,e)]);if(t.alignment!=="rlap"){var n=t.alignment==="llap"?"-1":"-0.5";r.setAttribute("lspace",n+"width")}return r.setAttribute("width","0px"),r},"mathmlBuilder")});Ct({type:"styling",names:["\\(","$"],props:{numArgs:0,allowedInText:!0,allowedInMath:!1},handler(t,e){var{funcName:r,parser:n}=t,i=n.mode;n.switchMode("math");var a=r==="\\("?"\\)":"$",s=n.parseExpression(!1,a);return n.expect(a),n.switchMode(i),{type:"styling",mode:n.mode,style:"text",body:s}}});Ct({type:"text",names:["\\)","\\]"],props:{numArgs:0,allowedInText:!0,allowedInMath:!1},handler(t,e){throw new ut("Mismatched "+t.funcName)}});EG=o((t,e)=>{switch(e.style.size){case rr.DISPLAY.size:return t.display;case rr.TEXT.size:return t.text;case rr.SCRIPT.size:return t.script;case rr.SCRIPTSCRIPT.size:return t.scriptscript;default:return t.text}},"chooseMathStyle");Ct({type:"mathchoice",names:["\\mathchoice"],props:{numArgs:4,primitive:!0},handler:o((t,e)=>{var{parser:r}=t;return{type:"mathchoice",mode:r.mode,display:di(e[0]),text:di(e[1]),script:di(e[2]),scriptscript:di(e[3])}},"handler"),htmlBuilder:o((t,e)=>{var r=EG(t,e),n=Ii(r,e,!1);return Ie.makeFragment(n)},"htmlBuilder"),mathmlBuilder:o((t,e)=>{var r=EG(t,e);return ch(r,e)},"mathmlBuilder")});b$=o((t,e,r,n,i,a,s)=>{t=Ie.makeSpan([],[t]);var l=r&&Jt.isCharacterBox(r),u,h;if(e){var f=Or(e,n.havingStyle(i.sup()),n);h={elem:f,kern:Math.max(n.fontMetrics().bigOpSpacing1,n.fontMetrics().bigOpSpacing3-f.depth)}}if(r){var d=Or(r,n.havingStyle(i.sub()),n);u={elem:d,kern:Math.max(n.fontMetrics().bigOpSpacing2,n.fontMetrics().bigOpSpacing4-d.height)}}var p;if(h&&u){var m=n.fontMetrics().bigOpSpacing5+u.elem.height+u.elem.depth+u.kern+t.depth+s;p=Ie.makeVList({positionType:"bottom",positionData:m,children:[{type:"kern",size:n.fontMetrics().bigOpSpacing5},{type:"elem",elem:u.elem,marginLeft:mt(-a)},{type:"kern",size:u.kern},{type:"elem",elem:t},{type:"kern",size:h.kern},{type:"elem",elem:h.elem,marginLeft:mt(a)},{type:"kern",size:n.fontMetrics().bigOpSpacing5}]},n)}else if(u){var g=t.height-s;p=Ie.makeVList({positionType:"top",positionData:g,children:[{type:"kern",size:n.fontMetrics().bigOpSpacing5},{type:"elem",elem:u.elem,marginLeft:mt(-a)},{type:"kern",size:u.kern},{type:"elem",elem:t}]},n)}else if(h){var y=t.depth+s;p=Ie.makeVList({positionType:"bottom",positionData:y,children:[{type:"elem",elem:t},{type:"kern",size:h.kern},{type:"elem",elem:h.elem,marginLeft:mt(a)},{type:"kern",size:n.fontMetrics().bigOpSpacing5}]},n)}else return t;var v=[p];if(u&&a!==0&&!l){var x=Ie.makeSpan(["mspace"],[],n);x.style.marginRight=mt(a),v.unshift(x)}return Ie.makeSpan(["mop","op-limits"],v,n)},"assembleSupSub"),w$=["\\smallint"],pp=o((t,e)=>{var r,n,i=!1,a;t.type==="supsub"?(r=t.sup,n=t.sub,a=yr(t.base,"op"),i=!0):a=yr(t,"op");var s=e.style,l=!1;s.size===rr.DISPLAY.size&&a.symbol&&!Jt.contains(w$,a.name)&&(l=!0);var u;if(a.symbol){var h=l?"Size2-Regular":"Size1-Regular",f="";if((a.name==="\\oiint"||a.name==="\\oiiint")&&(f=a.name.slice(1),a.name=f==="oiint"?"\\iint":"\\iiint"),u=Ie.makeSymbol(a.name,h,"math",e,["mop","op-symbol",l?"large-op":"small-op"]),f.length>0){var d=u.italic,p=Ie.staticSvg(f+"Size"+(l?"2":"1"),e);u=Ie.makeVList({positionType:"individualShift",children:[{type:"elem",elem:u,shift:0},{type:"elem",elem:p,shift:l?.08:0}]},e),a.name="\\"+f,u.classes.unshift("mop"),u.italic=d}}else if(a.body){var m=Ii(a.body,e,!0);m.length===1&&m[0]instanceof ms?(u=m[0],u.classes[0]="mop"):u=Ie.makeSpan(["mop"],m,e)}else{for(var g=[],y=1;y<a.name.length;y++)g.push(Ie.mathsym(a.name[y],a.mode,e));u=Ie.makeSpan(["mop"],g,e)}var v=0,x=0;return(u instanceof ms||a.name==="\\oiint"||a.name==="\\oiiint")&&!a.suppressBaseShift&&(v=(u.height-u.depth)/2-e.fontMetrics().axisHeight,x=u.italic),i?b$(u,r,n,e,s,x,v):(v&&(u.style.position="relative",u.style.top=mt(v)),u)},"htmlBuilder$2"),ny=o((t,e)=>{var r;if(t.symbol)r=new ps("mo",[Ao(t.name,t.mode)]),Jt.contains(w$,t.name)&&r.setAttribute("largeop","false");else if(t.body)r=new ps("mo",gs(t.body,e));else{r=new ps("mi",[new Wf(t.name.slice(1))]);var n=new ps("mo",[Ao("\u2061","text")]);t.parentIsSupSub?r=new ps("mrow",[r,n]):r=jG([r,n])}return r},"mathmlBuilder$1"),e3e={"\u220F":"\\prod","\u2210":"\\coprod","\u2211":"\\sum","\u22C0":"\\bigwedge","\u22C1":"\\bigvee","\u22C2":"\\bigcap","\u22C3":"\\bigcup","\u2A00":"\\bigodot","\u2A01":"\\bigoplus","\u2A02":"\\bigotimes","\u2A04":"\\biguplus","\u2A06":"\\bigsqcup"};Ct({type:"op",names:["\\coprod","\\bigvee","\\bigwedge","\\biguplus","\\bigcap","\\bigcup","\\intop","\\prod","\\sum","\\bigotimes","\\bigoplus","\\bigodot","\\bigsqcup","\\smallint","\u220F","\u2210","\u2211","\u22C0","\u22C1","\u22C2","\u22C3","\u2A00","\u2A01","\u2A02","\u2A04","\u2A06"],props:{numArgs:0},handler:o((t,e)=>{var{parser:r,funcName:n}=t,i=n;return i.length===1&&(i=e3e[i]),{type:"op",mode:r.mode,limits:!0,parentIsSupSub:!1,symbol:!0,name:i}},"handler"),htmlBuilder:pp,mathmlBuilder:ny});Ct({type:"op",names:["\\mathop"],props:{numArgs:1,primitive:!0},handler:o((t,e)=>{var{parser:r}=t,n=e[0];return{type:"op",mode:r.mode,limits:!1,parentIsSupSub:!1,symbol:!1,body:di(n)}},"handler"),htmlBuilder:pp,mathmlBuilder:ny});t3e={"\u222B":"\\int","\u222C":"\\iint","\u222D":"\\iiint","\u222E":"\\oint","\u222F":"\\oiint","\u2230":"\\oiiint"};Ct({type:"op",names:["\\arcsin","\\arccos","\\arctan","\\arctg","\\arcctg","\\arg","\\ch","\\cos","\\cosec","\\cosh","\\cot","\\cotg","\\coth","\\csc","\\ctg","\\cth","\\deg","\\dim","\\exp","\\hom","\\ker","\\lg","\\ln","\\log","\\sec","\\sin","\\sinh","\\sh","\\tan","\\tanh","\\tg","\\th"],props:{numArgs:0},handler(t){var{parser:e,funcName:r}=t;return{type:"op",mode:e.mode,limits:!1,parentIsSupSub:!1,symbol:!1,name:r}},htmlBuilder:pp,mathmlBuilder:ny});Ct({type:"op",names:["\\det","\\gcd","\\inf","\\lim","\\max","\\min","\\Pr","\\sup"],props:{numArgs:0},handler(t){var{parser:e,funcName:r}=t;return{type:"op",mode:e.mode,limits:!0,parentIsSupSub:!1,symbol:!1,name:r}},htmlBuilder:pp,mathmlBuilder:ny});Ct({type:"op",names:["\\int","\\iint","\\iiint","\\oint","\\oiint","\\oiiint","\u222B","\u222C","\u222D","\u222E","\u222F","\u2230"],props:{numArgs:0},handler(t){var{parser:e,funcName:r}=t,n=r;return n.length===1&&(n=t3e[n]),{type:"op",mode:e.mode,limits:!1,parentIsSupSub:!1,symbol:!0,name:n}},htmlBuilder:pp,mathmlBuilder:ny});T$=o((t,e)=>{var r,n,i=!1,a;t.type==="supsub"?(r=t.sup,n=t.sub,a=yr(t.base,"operatorname"),i=!0):a=yr(t,"operatorname");var s;if(a.body.length>0){for(var l=a.body.map(d=>{var p=d.text;return typeof p=="string"?{type:"textord",mode:d.mode,text:p}:d}),u=Ii(l,e.withFont("mathrm"),!0),h=0;h<u.length;h++){var f=u[h];f instanceof ms&&(f.text=f.text.replace(/\u2212/,"-").replace(/\u2217/,"*"))}s=Ie.makeSpan(["mop"],u,e)}else s=Ie.makeSpan(["mop"],[],e);return i?b$(s,r,n,e,e.style,0,0):s},"htmlBuilder$1"),r3e=o((t,e)=>{for(var r=gs(t.body,e.withFont("mathrm")),n=!0,i=0;i<r.length;i++){var a=r[i];if(!(a instanceof st.SpaceNode))if(a instanceof st.MathNode)switch(a.type){case"mi":case"mn":case"ms":case"mspace":case"mtext":break;case"mo":{var s=a.children[0];a.children.length===1&&s instanceof st.TextNode?s.text=s.text.replace(/\u2212/,"-").replace(/\u2217/,"*"):n=!1;break}default:n=!1}else n=!1}if(n){var l=r.map(f=>f.toText()).join("");r=[new st.TextNode(l)]}var u=new st.MathNode("mi",r);u.setAttribute("mathvariant","normal");var h=new st.MathNode("mo",[Ao("\u2061","text")]);return t.parentIsSupSub?new st.MathNode("mrow",[u,h]):st.newDocumentFragment([u,h])},"mathmlBuilder");Ct({type:"operatorname",names:["\\operatorname@","\\operatornamewithlimits"],props:{numArgs:1},handler:o((t,e)=>{var{parser:r,funcName:n}=t,i=e[0];return{type:"operatorname",mode:r.mode,body:di(i),alwaysHandleSupSub:n==="\\operatornamewithlimits",limits:!1,parentIsSupSub:!1}},"handler"),htmlBuilder:T$,mathmlBuilder:r3e});le("\\operatorname","\\@ifstar\\operatornamewithlimits\\operatorname@");Xf({type:"ordgroup",htmlBuilder(t,e){return t.semisimple?Ie.makeFragment(Ii(t.body,e,!1)):Ie.makeSpan(["mord"],Ii(t.body,e,!0),e)},mathmlBuilder(t,e){return ch(t.body,e,!0)}});Ct({type:"overline",names:["\\overline"],props:{numArgs:1},handler(t,e){var{parser:r}=t,n=e[0];return{type:"overline",mode:r.mode,body:n}},htmlBuilder(t,e){var r=Or(t.body,e.havingCrampedStyle()),n=Ie.makeLineSpan("overline-line",e),i=e.fontMetrics().defaultRuleThickness,a=Ie.makeVList({positionType:"firstBaseline",children:[{type:"elem",elem:r},{type:"kern",size:3*i},{type:"elem",elem:n},{type:"kern",size:i}]},e);return Ie.makeSpan(["mord","overline"],[a],e)},mathmlBuilder(t,e){var r=new st.MathNode("mo",[new st.TextNode("\u203E")]);r.setAttribute("stretchy","true");var n=new st.MathNode("mover",[mn(t.body,e),r]);return n.setAttribute("accent","true"),n}});Ct({type:"phantom",names:["\\phantom"],props:{numArgs:1,allowedInText:!0},handler:o((t,e)=>{var{parser:r}=t,n=e[0];return{type:"phantom",mode:r.mode,body:di(n)}},"handler"),htmlBuilder:o((t,e)=>{var r=Ii(t.body,e.withPhantom(),!1);return Ie.makeFragment(r)},"htmlBuilder"),mathmlBuilder:o((t,e)=>{var r=gs(t.body,e);return new st.MathNode("mphantom",r)},"mathmlBuilder")});Ct({type:"hphantom",names:["\\hphantom"],props:{numArgs:1,allowedInText:!0},handler:o((t,e)=>{var{parser:r}=t,n=e[0];return{type:"hphantom",mode:r.mode,body:n}},"handler"),htmlBuilder:o((t,e)=>{var r=Ie.makeSpan([],[Or(t.body,e.withPhantom())]);if(r.height=0,r.depth=0,r.children)for(var n=0;n<r.children.length;n++)r.children[n].height=0,r.children[n].depth=0;return r=Ie.makeVList({positionType:"firstBaseline",children:[{type:"elem",elem:r}]},e),Ie.makeSpan(["mord"],[r],e)},"htmlBuilder"),mathmlBuilder:o((t,e)=>{var r=gs(di(t.body),e),n=new st.MathNode("mphantom",r),i=new st.MathNode("mpadded",[n]);return i.setAttribute("height","0px"),i.setAttribute("depth","0px"),i},"mathmlBuilder")});Ct({type:"vphantom",names:["\\vphantom"],props:{numArgs:1,allowedInText:!0},handler:o((t,e)=>{var{parser:r}=t,n=e[0];return{type:"vphantom",mode:r.mode,body:n}},"handler"),htmlBuilder:o((t,e)=>{var r=Ie.makeSpan(["inner"],[Or(t.body,e.withPhantom())]),n=Ie.makeSpan(["fix"],[]);return Ie.makeSpan(["mord","rlap"],[r,n],e)},"htmlBuilder"),mathmlBuilder:o((t,e)=>{var r=gs(di(t.body),e),n=new st.MathNode("mphantom",r),i=new st.MathNode("mpadded",[n]);return i.setAttribute("width","0px"),i},"mathmlBuilder")});Ct({type:"raisebox",names:["\\raisebox"],props:{numArgs:2,argTypes:["size","hbox"],allowedInText:!0},handler(t,e){var{parser:r}=t,n=yr(e[0],"size").value,i=e[1];return{type:"raisebox",mode:r.mode,dy:n,body:i}},htmlBuilder(t,e){var r=Or(t.body,e),n=Qn(t.dy,e);return Ie.makeVList({positionType:"shift",positionData:-n,children:[{type:"elem",elem:r}]},e)},mathmlBuilder(t,e){var r=new st.MathNode("mpadded",[mn(t.body,e)]),n=t.dy.number+t.dy.unit;return r.setAttribute("voffset",n),r}});Ct({type:"internal",names:["\\relax"],props:{numArgs:0,allowedInText:!0},handler(t){var{parser:e}=t;return{type:"internal",mode:e.mode}}});Ct({type:"rule",names:["\\rule"],props:{numArgs:2,numOptionalArgs:1,argTypes:["size","size","size"]},handler(t,e,r){var{parser:n}=t,i=r[0],a=yr(e[0],"size"),s=yr(e[1],"size");return{type:"rule",mode:n.mode,shift:i&&yr(i,"size").value,width:a.value,height:s.value}},htmlBuilder(t,e){var r=Ie.makeSpan(["mord","rule"],[],e),n=Qn(t.width,e),i=Qn(t.height,e),a=t.shift?Qn(t.shift,e):0;return r.style.borderRightWidth=mt(n),r.style.borderTopWidth=mt(i),r.style.bottom=mt(a),r.width=n,r.height=i+a,r.depth=-a,r.maxFontSize=i*1.125*e.sizeMultiplier,r},mathmlBuilder(t,e){var r=Qn(t.width,e),n=Qn(t.height,e),i=t.shift?Qn(t.shift,e):0,a=e.color&&e.getColor()||"black",s=new st.MathNode("mspace");s.setAttribute("mathbackground",a),s.setAttribute("width",mt(r)),s.setAttribute("height",mt(n));var l=new st.MathNode("mpadded",[s]);return i>=0?l.setAttribute("height",mt(i)):(l.setAttribute("height",mt(i)),l.setAttribute("depth",mt(-i))),l.setAttribute("voffset",mt(i)),l}});o(k$,"sizingGroup");SG=["\\tiny","\\sixptsize","\\scriptsize","\\footnotesize","\\small","\\normalsize","\\large","\\Large","\\LARGE","\\huge","\\Huge"],n3e=o((t,e)=>{var r=e.havingSize(t.size);return k$(t.body,r,e)},"htmlBuilder");Ct({type:"sizing",names:SG,props:{numArgs:0,allowedInText:!0},handler:o((t,e)=>{var{breakOnTokenText:r,funcName:n,parser:i}=t,a=i.parseExpression(!1,r);return{type:"sizing",mode:i.mode,size:SG.indexOf(n)+1,body:a}},"handler"),htmlBuilder:n3e,mathmlBuilder:o((t,e)=>{var r=e.havingSize(t.size),n=gs(t.body,r),i=new st.MathNode("mstyle",n);return i.setAttribute("mathsize",mt(r.sizeMultiplier)),i},"mathmlBuilder")});Ct({type:"smash",names:["\\smash"],props:{numArgs:1,numOptionalArgs:1,allowedInText:!0},handler:o((t,e,r)=>{var{parser:n}=t,i=!1,a=!1,s=r[0]&&yr(r[0],"ordgroup");if(s)for(var l="",u=0;u<s.body.length;++u){var h=s.body[u];if(l=h.text,l==="t")i=!0;else if(l==="b")a=!0;else{i=!1,a=!1;break}}else i=!0,a=!0;var f=e[0];return{type:"smash",mode:n.mode,body:f,smashHeight:i,smashDepth:a}},"handler"),htmlBuilder:o((t,e)=>{var r=Ie.makeSpan([],[Or(t.body,e)]);if(!t.smashHeight&&!t.smashDepth)return r;if(t.smashHeight&&(r.height=0,r.children))for(var n=0;n<r.children.length;n++)r.children[n].height=0;if(t.smashDepth&&(r.depth=0,r.children))for(var i=0;i<r.children.length;i++)r.children[i].depth=0;var a=Ie.makeVList({positionType:"firstBaseline",children:[{type:"elem",elem:r}]},e);return Ie.makeSpan(["mord"],[a],e)},"htmlBuilder"),mathmlBuilder:o((t,e)=>{var r=new st.MathNode("mpadded",[mn(t.body,e)]);return t.smashHeight&&r.setAttribute("height","0px"),t.smashDepth&&r.setAttribute("depth","0px"),r},"mathmlBuilder")});Ct({type:"sqrt",names:["\\sqrt"],props:{numArgs:1,numOptionalArgs:1},handler(t,e,r){var{parser:n}=t,i=r[0],a=e[0];return{type:"sqrt",mode:n.mode,body:a,index:i}},htmlBuilder(t,e){var r=Or(t.body,e.havingCrampedStyle());r.height===0&&(r.height=e.fontMetrics().xHeight),r=Ie.wrapFragment(r,e);var n=e.fontMetrics(),i=n.defaultRuleThickness,a=i;e.style.id<rr.TEXT.id&&(a=e.fontMetrics().xHeight);var s=i+a/4,l=r.height+r.depth+s+i,{span:u,ruleWidth:h,advanceWidth:f}=nu.sqrtImage(l,e),d=u.height-h;d>r.height+r.depth+s&&(s=(s+d-r.height-r.depth)/2);var p=u.height-r.height-s-h;r.style.paddingLeft=mt(f);var m=Ie.makeVList({positionType:"firstBaseline",children:[{type:"elem",elem:r,wrapperClasses:["svg-align"]},{type:"kern",size:-(r.height+p)},{type:"elem",elem:u},{type:"kern",size:h}]},e);if(t.index){var g=e.havingStyle(rr.SCRIPTSCRIPT),y=Or(t.index,g,e),v=.6*(m.height-m.depth),x=Ie.makeVList({positionType:"shift",positionData:-v,children:[{type:"elem",elem:y}]},e),b=Ie.makeSpan(["root"],[x]);return Ie.makeSpan(["mord","sqrt"],[b,m],e)}else return Ie.makeSpan(["mord","sqrt"],[m],e)},mathmlBuilder(t,e){var{body:r,index:n}=t;return n?new st.MathNode("mroot",[mn(r,e),mn(n,e)]):new st.MathNode("msqrt",[mn(r,e)])}});CG={display:rr.DISPLAY,text:rr.TEXT,script:rr.SCRIPT,scriptscript:rr.SCRIPTSCRIPT};Ct({type:"styling",names:["\\displaystyle","\\textstyle","\\scriptstyle","\\scriptscriptstyle"],props:{numArgs:0,allowedInText:!0,primitive:!0},handler(t,e){var{breakOnTokenText:r,funcName:n,parser:i}=t,a=i.parseExpression(!0,r),s=n.slice(1,n.length-5);return{type:"styling",mode:i.mode,style:s,body:a}},htmlBuilder(t,e){var r=CG[t.style],n=e.havingStyle(r).withFont("");return k$(t.body,n,e)},mathmlBuilder(t,e){var r=CG[t.style],n=e.havingStyle(r),i=gs(t.body,n),a=new st.MathNode("mstyle",i),s={display:["0","true"],text:["0","false"],script:["1","false"],scriptscript:["2","false"]},l=s[t.style];return a.setAttribute("scriptlevel",l[0]),a.setAttribute("displaystyle",l[1]),a}});i3e=o(function(e,r){var n=e.base;if(n)if(n.type==="op"){var i=n.limits&&(r.style.size===rr.DISPLAY.size||n.alwaysHandleSupSub);return i?pp:null}else if(n.type==="operatorname"){var a=n.alwaysHandleSupSub&&(r.style.size===rr.DISPLAY.size||n.limits);return a?T$:null}else{if(n.type==="accent")return Jt.isCharacterBox(n.base)?BC:null;if(n.type==="horizBrace"){var s=!e.sub;return s===n.isOver?x$:null}else return null}else return null},"htmlBuilderDelegate");Xf({type:"supsub",htmlBuilder(t,e){var r=i3e(t,e);if(r)return r(t,e);var{base:n,sup:i,sub:a}=t,s=Or(n,e),l,u,h=e.fontMetrics(),f=0,d=0,p=n&&Jt.isCharacterBox(n);if(i){var m=e.havingStyle(e.style.sup());l=Or(i,m,e),p||(f=s.height-m.fontMetrics().supDrop*m.sizeMultiplier/e.sizeMultiplier)}if(a){var g=e.havingStyle(e.style.sub());u=Or(a,g,e),p||(d=s.depth+g.fontMetrics().subDrop*g.sizeMultiplier/e.sizeMultiplier)}var y;e.style===rr.DISPLAY?y=h.sup1:e.style.cramped?y=h.sup3:y=h.sup2;var v=e.sizeMultiplier,x=mt(.5/h.ptPerEm/v),b=null;if(u){var w=t.base&&t.base.type==="op"&&t.base.name&&(t.base.name==="\\oiint"||t.base.name==="\\oiiint");(s instanceof ms||w)&&(b=mt(-s.italic))}var _;if(l&&u){f=Math.max(f,y,l.depth+.25*h.xHeight),d=Math.max(d,h.sub2);var T=h.defaultRuleThickness,E=4*T;if(f-l.depth-(u.height-d)<E){d=E-(f-l.depth)+u.height;var L=.8*h.xHeight-(f-l.depth);L>0&&(f+=L,d-=L)}var C=[{type:"elem",elem:u,shift:d,marginRight:x,marginLeft:b},{type:"elem",elem:l,shift:-f,marginRight:x}];_=Ie.makeVList({positionType:"individualShift",children:C},e)}else if(u){d=Math.max(d,h.sub1,u.height-.8*h.xHeight);var A=[{type:"elem",elem:u,marginLeft:b,marginRight:x}];_=Ie.makeVList({positionType:"shift",positionData:d,children:A},e)}else if(l)f=Math.max(f,y,l.depth+.25*h.xHeight),_=Ie.makeVList({positionType:"shift",positionData:-f,children:[{type:"elem",elem:l,marginRight:x}]},e);else throw new Error("supsub must have either sup or sub.");var I=kC(s,"right")||"mord";return Ie.makeSpan([I],[s,Ie.makeSpan(["msupsub"],[_])],e)},mathmlBuilder(t,e){var r=!1,n,i;t.base&&t.base.type==="horizBrace"&&(i=!!t.sup,i===t.base.isOver&&(r=!0,n=t.base.isOver)),t.base&&(t.base.type==="op"||t.base.type==="operatorname")&&(t.base.parentIsSupSub=!0);var a=[mn(t.base,e)];t.sub&&a.push(mn(t.sub,e)),t.sup&&a.push(mn(t.sup,e));var s;if(r)s=n?"mover":"munder";else if(t.sub)if(t.sup){var h=t.base;h&&h.type==="op"&&h.limits&&e.style===rr.DISPLAY||h&&h.type==="operatorname"&&h.alwaysHandleSupSub&&(e.style===rr.DISPLAY||h.limits)?s="munderover":s="msubsup"}else{var u=t.base;u&&u.type==="op"&&u.limits&&(e.style===rr.DISPLAY||u.alwaysHandleSupSub)||u&&u.type==="operatorname"&&u.alwaysHandleSupSub&&(u.limits||e.style===rr.DISPLAY)?s="munder":s="msub"}else{var l=t.base;l&&l.type==="op"&&l.limits&&(e.style===rr.DISPLAY||l.alwaysHandleSupSub)||l&&l.type==="operatorname"&&l.alwaysHandleSupSub&&(l.limits||e.style===rr.DISPLAY)?s="mover":s="msup"}return new st.MathNode(s,a)}});Xf({type:"atom",htmlBuilder(t,e){return Ie.mathsym(t.text,t.mode,e,["m"+t.family])},mathmlBuilder(t,e){var r=new st.MathNode("mo",[Ao(t.text,t.mode)]);if(t.family==="bin"){var n=OC(t,e);n==="bold-italic"&&r.setAttribute("mathvariant",n)}else t.family==="punct"?r.setAttribute("separator","true"):(t.family==="open"||t.family==="close")&&r.setAttribute("stretchy","false");return r}});E$={mi:"italic",mn:"normal",mtext:"normal"};Xf({type:"mathord",htmlBuilder(t,e){return Ie.makeOrd(t,e,"mathord")},mathmlBuilder(t,e){var r=new st.MathNode("mi",[Ao(t.text,t.mode,e)]),n=OC(t,e)||"italic";return n!==E$[r.type]&&r.setAttribute("mathvariant",n),r}});Xf({type:"textord",htmlBuilder(t,e){return Ie.makeOrd(t,e,"textord")},mathmlBuilder(t,e){var r=Ao(t.text,t.mode,e),n=OC(t,e)||"normal",i;return t.mode==="text"?i=new st.MathNode("mtext",[r]):/[0-9]/.test(t.text)?i=new st.MathNode("mn",[r]):t.text==="\\prime"?i=new st.MathNode("mo",[r]):i=new st.MathNode("mi",[r]),n!==E$[i.type]&&i.setAttribute("mathvariant",n),i}});gC={"\\nobreak":"nobreak","\\allowbreak":"allowbreak"},yC={" ":{},"\\ ":{},"~":{className:"nobreak"},"\\space":{},"\\nobreakspace":{className:"nobreak"}};Xf({type:"spacing",htmlBuilder(t,e){if(yC.hasOwnProperty(t.text)){var r=yC[t.text].className||"";if(t.mode==="text"){var n=Ie.makeOrd(t,e,"textord");return n.classes.push(r),n}else return Ie.makeSpan(["mspace",r],[Ie.mathsym(t.text,t.mode,e)],e)}else{if(gC.hasOwnProperty(t.text))return Ie.makeSpan(["mspace",gC[t.text]],[],e);throw new ut('Unknown type of space "'+t.text+'"')}},mathmlBuilder(t,e){var r;if(yC.hasOwnProperty(t.text))r=new st.MathNode("mtext",[new st.TextNode("\xA0")]);else{if(gC.hasOwnProperty(t.text))return new st.MathNode("mspace");throw new ut('Unknown type of space "'+t.text+'"')}return r}});AG=o(()=>{var t=new st.MathNode("mtd",[]);return t.setAttribute("width","50%"),t},"pad");Xf({type:"tag",mathmlBuilder(t,e){var r=new st.MathNode("mtable",[new st.MathNode("mtr",[AG(),new st.MathNode("mtd",[ch(t.body,e)]),AG(),new st.MathNode("mtd",[ch(t.tag,e)])])]);return r.setAttribute("width","100%"),r}});_G={"\\text":void 0,"\\textrm":"textrm","\\textsf":"textsf","\\texttt":"texttt","\\textnormal":"textrm"},LG={"\\textbf":"textbf","\\textmd":"textmd"},a3e={"\\textit":"textit","\\textup":"textup"},DG=o((t,e)=>{var r=t.font;if(r){if(_G[r])return e.withTextFontFamily(_G[r]);if(LG[r])return e.withTextFontWeight(LG[r]);if(r==="\\emph")return e.fontShape==="textit"?e.withTextFontShape("textup"):e.withTextFontShape("textit")}else return e;return e.withTextFontShape(a3e[r])},"optionsWithFont");Ct({type:"text",names:["\\text","\\textrm","\\textsf","\\texttt","\\textnormal","\\textbf","\\textmd","\\textit","\\textup","\\emph"],props:{numArgs:1,argTypes:["text"],allowedInArgument:!0,allowedInText:!0},handler(t,e){var{parser:r,funcName:n}=t,i=e[0];return{type:"text",mode:r.mode,body:di(i),font:n}},htmlBuilder(t,e){var r=DG(t,e),n=Ii(t.body,r,!0);return Ie.makeSpan(["mord","text"],n,r)},mathmlBuilder(t,e){var r=DG(t,e);return ch(t.body,r)}});Ct({type:"underline",names:["\\underline"],props:{numArgs:1,allowedInText:!0},handler(t,e){var{parser:r}=t;return{type:"underline",mode:r.mode,body:e[0]}},htmlBuilder(t,e){var r=Or(t.body,e),n=Ie.makeLineSpan("underline-line",e),i=e.fontMetrics().defaultRuleThickness,a=Ie.makeVList({positionType:"top",positionData:r.height,children:[{type:"kern",size:i},{type:"elem",elem:n},{type:"kern",size:3*i},{type:"elem",elem:r}]},e);return Ie.makeSpan(["mord","underline"],[a],e)},mathmlBuilder(t,e){var r=new st.MathNode("mo",[new st.TextNode("\u203E")]);r.setAttribute("stretchy","true");var n=new st.MathNode("munder",[mn(t.body,e),r]);return n.setAttribute("accentunder","true"),n}});Ct({type:"vcenter",names:["\\vcenter"],props:{numArgs:1,argTypes:["original"],allowedInText:!1},handler(t,e){var{parser:r}=t;return{type:"vcenter",mode:r.mode,body:e[0]}},htmlBuilder(t,e){var r=Or(t.body,e),n=e.fontMetrics().axisHeight,i=.5*(r.height-n-(r.depth+n));return Ie.makeVList({positionType:"shift",positionData:i,children:[{type:"elem",elem:r}]},e)},mathmlBuilder(t,e){return new st.MathNode("mpadded",[mn(t.body,e)],["vcenter"])}});Ct({type:"verb",names:["\\verb"],props:{numArgs:0,allowedInText:!0},handler(t,e,r){throw new ut("\\verb ended by end of line instead of matching delimiter")},htmlBuilder(t,e){for(var r=NG(t),n=[],i=e.havingStyle(e.style.text()),a=0;a<r.length;a++){var s=r[a];s==="~"&&(s="\\textasciitilde"),n.push(Ie.makeSymbol(s,"Typewriter-Regular",t.mode,i,["mord","texttt"]))}return Ie.makeSpan(["mord","text"].concat(i.sizingClasses(e)),Ie.tryCombineChars(n),i)},mathmlBuilder(t,e){var r=new st.TextNode(NG(t)),n=new st.MathNode("mtext",[r]);return n.setAttribute("mathvariant","monospace"),n}});NG=o(t=>t.body.replace(/ /g,t.star?"\u2423":"\xA0"),"makeVerb"),oh=qG,S$=`[ \r + ]`,s3e="\\\\[a-zA-Z@]+",o3e="\\\\[^\uD800-\uDFFF]",l3e="("+s3e+")"+S$+"*",c3e=`\\\\( +|[ \r ]+ +?)[ \r ]*`,_C="[\u0300-\u036F]",u3e=new RegExp(_C+"+$"),h3e="("+S$+"+)|"+(c3e+"|")+"([!-\\[\\]-\u2027\u202A-\uD7FF\uF900-\uFFFF]"+(_C+"*")+"|[\uD800-\uDBFF][\uDC00-\uDFFF]"+(_C+"*")+"|\\\\verb\\*([^]).*?\\4|\\\\verb([^*a-zA-Z]).*?\\5"+("|"+l3e)+("|"+o3e+")"),m4=class{static{o(this,"Lexer")}constructor(e,r){this.input=void 0,this.settings=void 0,this.tokenRegex=void 0,this.catcodes=void 0,this.input=e,this.settings=r,this.tokenRegex=new RegExp(h3e,"g"),this.catcodes={"%":14,"~":13}}setCatcode(e,r){this.catcodes[e]=r}lex(){var e=this.input,r=this.tokenRegex.lastIndex;if(r===e.length)return new Co("EOF",new Ys(this,r,r));var n=this.tokenRegex.exec(e);if(n===null||n.index!==r)throw new ut("Unexpected character: '"+e[r]+"'",new Co(e[r],new Ys(this,r,r+1)));var i=n[6]||n[3]||(n[2]?"\\ ":" ");if(this.catcodes[i]===14){var a=e.indexOf(` +`,this.tokenRegex.lastIndex);return a===-1?(this.tokenRegex.lastIndex=e.length,this.settings.reportNonstrict("commentAtEnd","% comment has no terminating newline; LaTeX would fail because of commenting the end of math mode (e.g. $)")):this.tokenRegex.lastIndex=a+1,this.lex()}return new Co(i,new Ys(this,r,this.tokenRegex.lastIndex))}},LC=class{static{o(this,"Namespace")}constructor(e,r){e===void 0&&(e={}),r===void 0&&(r={}),this.current=void 0,this.builtins=void 0,this.undefStack=void 0,this.current=r,this.builtins=e,this.undefStack=[]}beginGroup(){this.undefStack.push({})}endGroup(){if(this.undefStack.length===0)throw new ut("Unbalanced namespace destruction: attempt to pop global namespace; please report this as a bug");var e=this.undefStack.pop();for(var r in e)e.hasOwnProperty(r)&&(e[r]==null?delete this.current[r]:this.current[r]=e[r])}endGroups(){for(;this.undefStack.length>0;)this.endGroup()}has(e){return this.current.hasOwnProperty(e)||this.builtins.hasOwnProperty(e)}get(e){return this.current.hasOwnProperty(e)?this.current[e]:this.builtins[e]}set(e,r,n){if(n===void 0&&(n=!1),n){for(var i=0;i<this.undefStack.length;i++)delete this.undefStack[i][e];this.undefStack.length>0&&(this.undefStack[this.undefStack.length-1][e]=r)}else{var a=this.undefStack[this.undefStack.length-1];a&&!a.hasOwnProperty(e)&&(a[e]=this.current[e])}r==null?delete this.current[e]:this.current[e]=r}},f3e=p$;le("\\noexpand",function(t){var e=t.popToken();return t.isExpandable(e.text)&&(e.noexpand=!0,e.treatAsRelax=!0),{tokens:[e],numArgs:0}});le("\\expandafter",function(t){var e=t.popToken();return t.expandOnce(!0),{tokens:[e],numArgs:0}});le("\\@firstoftwo",function(t){var e=t.consumeArgs(2);return{tokens:e[0],numArgs:0}});le("\\@secondoftwo",function(t){var e=t.consumeArgs(2);return{tokens:e[1],numArgs:0}});le("\\@ifnextchar",function(t){var e=t.consumeArgs(3);t.consumeSpaces();var r=t.future();return e[0].length===1&&e[0][0].text===r.text?{tokens:e[1],numArgs:0}:{tokens:e[2],numArgs:0}});le("\\@ifstar","\\@ifnextchar *{\\@firstoftwo{#1}}");le("\\TextOrMath",function(t){var e=t.consumeArgs(2);return t.mode==="text"?{tokens:e[0],numArgs:0}:{tokens:e[1],numArgs:0}});RG={0:0,1:1,2:2,3:3,4:4,5:5,6:6,7:7,8:8,9:9,a:10,A:10,b:11,B:11,c:12,C:12,d:13,D:13,e:14,E:14,f:15,F:15};le("\\char",function(t){var e=t.popToken(),r,n="";if(e.text==="'")r=8,e=t.popToken();else if(e.text==='"')r=16,e=t.popToken();else if(e.text==="`")if(e=t.popToken(),e.text[0]==="\\")n=e.text.charCodeAt(1);else{if(e.text==="EOF")throw new ut("\\char` missing argument");n=e.text.charCodeAt(0)}else r=10;if(r){if(n=RG[e.text],n==null||n>=r)throw new ut("Invalid base-"+r+" digit "+e.text);for(var i;(i=RG[t.future().text])!=null&&i<r;)n*=r,n+=i,t.popToken()}return"\\@char{"+n+"}"});WC=o((t,e,r)=>{var n=t.consumeArg().tokens;if(n.length!==1)throw new ut("\\newcommand's first argument must be a macro name");var i=n[0].text,a=t.isDefined(i);if(a&&!e)throw new ut("\\newcommand{"+i+"} attempting to redefine "+(i+"; use \\renewcommand"));if(!a&&!r)throw new ut("\\renewcommand{"+i+"} when command "+i+" does not yet exist; use \\newcommand");var s=0;if(n=t.consumeArg().tokens,n.length===1&&n[0].text==="["){for(var l="",u=t.expandNextToken();u.text!=="]"&&u.text!=="EOF";)l+=u.text,u=t.expandNextToken();if(!l.match(/^\s*[0-9]+\s*$/))throw new ut("Invalid number of arguments: "+l);s=parseInt(l),n=t.consumeArg().tokens}return t.macros.set(i,{tokens:n,numArgs:s}),""},"newcommand");le("\\newcommand",t=>WC(t,!1,!0));le("\\renewcommand",t=>WC(t,!0,!1));le("\\providecommand",t=>WC(t,!0,!0));le("\\message",t=>{var e=t.consumeArgs(1)[0];return console.log(e.reverse().map(r=>r.text).join("")),""});le("\\errmessage",t=>{var e=t.consumeArgs(1)[0];return console.error(e.reverse().map(r=>r.text).join("")),""});le("\\show",t=>{var e=t.popToken(),r=e.text;return console.log(e,t.macros.get(r),oh[r],En.math[r],En.text[r]),""});le("\\bgroup","{");le("\\egroup","}");le("~","\\nobreakspace");le("\\lq","`");le("\\rq","'");le("\\aa","\\r a");le("\\AA","\\r A");le("\\textcopyright","\\html@mathml{\\textcircled{c}}{\\char`\xA9}");le("\\copyright","\\TextOrMath{\\textcopyright}{\\text{\\textcopyright}}");le("\\textregistered","\\html@mathml{\\textcircled{\\scriptsize R}}{\\char`\xAE}");le("\u212C","\\mathscr{B}");le("\u2130","\\mathscr{E}");le("\u2131","\\mathscr{F}");le("\u210B","\\mathscr{H}");le("\u2110","\\mathscr{I}");le("\u2112","\\mathscr{L}");le("\u2133","\\mathscr{M}");le("\u211B","\\mathscr{R}");le("\u212D","\\mathfrak{C}");le("\u210C","\\mathfrak{H}");le("\u2128","\\mathfrak{Z}");le("\\Bbbk","\\Bbb{k}");le("\xB7","\\cdotp");le("\\llap","\\mathllap{\\textrm{#1}}");le("\\rlap","\\mathrlap{\\textrm{#1}}");le("\\clap","\\mathclap{\\textrm{#1}}");le("\\mathstrut","\\vphantom{(}");le("\\underbar","\\underline{\\text{#1}}");le("\\not",'\\html@mathml{\\mathrel{\\mathrlap\\@not}}{\\char"338}');le("\\neq","\\html@mathml{\\mathrel{\\not=}}{\\mathrel{\\char`\u2260}}");le("\\ne","\\neq");le("\u2260","\\neq");le("\\notin","\\html@mathml{\\mathrel{{\\in}\\mathllap{/\\mskip1mu}}}{\\mathrel{\\char`\u2209}}");le("\u2209","\\notin");le("\u2258","\\html@mathml{\\mathrel{=\\kern{-1em}\\raisebox{0.4em}{$\\scriptsize\\frown$}}}{\\mathrel{\\char`\u2258}}");le("\u2259","\\html@mathml{\\stackrel{\\tiny\\wedge}{=}}{\\mathrel{\\char`\u2258}}");le("\u225A","\\html@mathml{\\stackrel{\\tiny\\vee}{=}}{\\mathrel{\\char`\u225A}}");le("\u225B","\\html@mathml{\\stackrel{\\scriptsize\\star}{=}}{\\mathrel{\\char`\u225B}}");le("\u225D","\\html@mathml{\\stackrel{\\tiny\\mathrm{def}}{=}}{\\mathrel{\\char`\u225D}}");le("\u225E","\\html@mathml{\\stackrel{\\tiny\\mathrm{m}}{=}}{\\mathrel{\\char`\u225E}}");le("\u225F","\\html@mathml{\\stackrel{\\tiny?}{=}}{\\mathrel{\\char`\u225F}}");le("\u27C2","\\perp");le("\u203C","\\mathclose{!\\mkern-0.8mu!}");le("\u220C","\\notni");le("\u231C","\\ulcorner");le("\u231D","\\urcorner");le("\u231E","\\llcorner");le("\u231F","\\lrcorner");le("\xA9","\\copyright");le("\xAE","\\textregistered");le("\uFE0F","\\textregistered");le("\\ulcorner",'\\html@mathml{\\@ulcorner}{\\mathop{\\char"231c}}');le("\\urcorner",'\\html@mathml{\\@urcorner}{\\mathop{\\char"231d}}');le("\\llcorner",'\\html@mathml{\\@llcorner}{\\mathop{\\char"231e}}');le("\\lrcorner",'\\html@mathml{\\@lrcorner}{\\mathop{\\char"231f}}');le("\\vdots","\\mathord{\\varvdots\\rule{0pt}{15pt}}");le("\u22EE","\\vdots");le("\\varGamma","\\mathit{\\Gamma}");le("\\varDelta","\\mathit{\\Delta}");le("\\varTheta","\\mathit{\\Theta}");le("\\varLambda","\\mathit{\\Lambda}");le("\\varXi","\\mathit{\\Xi}");le("\\varPi","\\mathit{\\Pi}");le("\\varSigma","\\mathit{\\Sigma}");le("\\varUpsilon","\\mathit{\\Upsilon}");le("\\varPhi","\\mathit{\\Phi}");le("\\varPsi","\\mathit{\\Psi}");le("\\varOmega","\\mathit{\\Omega}");le("\\substack","\\begin{subarray}{c}#1\\end{subarray}");le("\\colon","\\nobreak\\mskip2mu\\mathpunct{}\\mathchoice{\\mkern-3mu}{\\mkern-3mu}{}{}{:}\\mskip6mu\\relax");le("\\boxed","\\fbox{$\\displaystyle{#1}$}");le("\\iff","\\DOTSB\\;\\Longleftrightarrow\\;");le("\\implies","\\DOTSB\\;\\Longrightarrow\\;");le("\\impliedby","\\DOTSB\\;\\Longleftarrow\\;");MG={",":"\\dotsc","\\not":"\\dotsb","+":"\\dotsb","=":"\\dotsb","<":"\\dotsb",">":"\\dotsb","-":"\\dotsb","*":"\\dotsb",":":"\\dotsb","\\DOTSB":"\\dotsb","\\coprod":"\\dotsb","\\bigvee":"\\dotsb","\\bigwedge":"\\dotsb","\\biguplus":"\\dotsb","\\bigcap":"\\dotsb","\\bigcup":"\\dotsb","\\prod":"\\dotsb","\\sum":"\\dotsb","\\bigotimes":"\\dotsb","\\bigoplus":"\\dotsb","\\bigodot":"\\dotsb","\\bigsqcup":"\\dotsb","\\And":"\\dotsb","\\longrightarrow":"\\dotsb","\\Longrightarrow":"\\dotsb","\\longleftarrow":"\\dotsb","\\Longleftarrow":"\\dotsb","\\longleftrightarrow":"\\dotsb","\\Longleftrightarrow":"\\dotsb","\\mapsto":"\\dotsb","\\longmapsto":"\\dotsb","\\hookrightarrow":"\\dotsb","\\doteq":"\\dotsb","\\mathbin":"\\dotsb","\\mathrel":"\\dotsb","\\relbar":"\\dotsb","\\Relbar":"\\dotsb","\\xrightarrow":"\\dotsb","\\xleftarrow":"\\dotsb","\\DOTSI":"\\dotsi","\\int":"\\dotsi","\\oint":"\\dotsi","\\iint":"\\dotsi","\\iiint":"\\dotsi","\\iiiint":"\\dotsi","\\idotsint":"\\dotsi","\\DOTSX":"\\dotsx"};le("\\dots",function(t){var e="\\dotso",r=t.expandAfterFuture().text;return r in MG?e=MG[r]:(r.slice(0,4)==="\\not"||r in En.math&&Jt.contains(["bin","rel"],En.math[r].group))&&(e="\\dotsb"),e});YC={")":!0,"]":!0,"\\rbrack":!0,"\\}":!0,"\\rbrace":!0,"\\rangle":!0,"\\rceil":!0,"\\rfloor":!0,"\\rgroup":!0,"\\rmoustache":!0,"\\right":!0,"\\bigr":!0,"\\biggr":!0,"\\Bigr":!0,"\\Biggr":!0,$:!0,";":!0,".":!0,",":!0};le("\\dotso",function(t){var e=t.future().text;return e in YC?"\\ldots\\,":"\\ldots"});le("\\dotsc",function(t){var e=t.future().text;return e in YC&&e!==","?"\\ldots\\,":"\\ldots"});le("\\cdots",function(t){var e=t.future().text;return e in YC?"\\@cdots\\,":"\\@cdots"});le("\\dotsb","\\cdots");le("\\dotsm","\\cdots");le("\\dotsi","\\!\\cdots");le("\\dotsx","\\ldots\\,");le("\\DOTSI","\\relax");le("\\DOTSB","\\relax");le("\\DOTSX","\\relax");le("\\tmspace","\\TextOrMath{\\kern#1#3}{\\mskip#1#2}\\relax");le("\\,","\\tmspace+{3mu}{.1667em}");le("\\thinspace","\\,");le("\\>","\\mskip{4mu}");le("\\:","\\tmspace+{4mu}{.2222em}");le("\\medspace","\\:");le("\\;","\\tmspace+{5mu}{.2777em}");le("\\thickspace","\\;");le("\\!","\\tmspace-{3mu}{.1667em}");le("\\negthinspace","\\!");le("\\negmedspace","\\tmspace-{4mu}{.2222em}");le("\\negthickspace","\\tmspace-{5mu}{.277em}");le("\\enspace","\\kern.5em ");le("\\enskip","\\hskip.5em\\relax");le("\\quad","\\hskip1em\\relax");le("\\qquad","\\hskip2em\\relax");le("\\tag","\\@ifstar\\tag@literal\\tag@paren");le("\\tag@paren","\\tag@literal{({#1})}");le("\\tag@literal",t=>{if(t.macros.get("\\df@tag"))throw new ut("Multiple \\tag");return"\\gdef\\df@tag{\\text{#1}}"});le("\\bmod","\\mathchoice{\\mskip1mu}{\\mskip1mu}{\\mskip5mu}{\\mskip5mu}\\mathbin{\\rm mod}\\mathchoice{\\mskip1mu}{\\mskip1mu}{\\mskip5mu}{\\mskip5mu}");le("\\pod","\\allowbreak\\mathchoice{\\mkern18mu}{\\mkern8mu}{\\mkern8mu}{\\mkern8mu}(#1)");le("\\pmod","\\pod{{\\rm mod}\\mkern6mu#1}");le("\\mod","\\allowbreak\\mathchoice{\\mkern18mu}{\\mkern12mu}{\\mkern12mu}{\\mkern12mu}{\\rm mod}\\,\\,#1");le("\\newline","\\\\\\relax");le("\\TeX","\\textrm{\\html@mathml{T\\kern-.1667em\\raisebox{-.5ex}{E}\\kern-.125emX}{TeX}}");C$=mt(Zl["Main-Regular"][84][1]-.7*Zl["Main-Regular"][65][1]);le("\\LaTeX","\\textrm{\\html@mathml{"+("L\\kern-.36em\\raisebox{"+C$+"}{\\scriptstyle A}")+"\\kern-.15em\\TeX}{LaTeX}}");le("\\KaTeX","\\textrm{\\html@mathml{"+("K\\kern-.17em\\raisebox{"+C$+"}{\\scriptstyle A}")+"\\kern-.15em\\TeX}{KaTeX}}");le("\\hspace","\\@ifstar\\@hspacer\\@hspace");le("\\@hspace","\\hskip #1\\relax");le("\\@hspacer","\\rule{0pt}{0pt}\\hskip #1\\relax");le("\\ordinarycolon",":");le("\\vcentcolon","\\mathrel{\\mathop\\ordinarycolon}");le("\\dblcolon",'\\html@mathml{\\mathrel{\\vcentcolon\\mathrel{\\mkern-.9mu}\\vcentcolon}}{\\mathop{\\char"2237}}');le("\\coloneqq",'\\html@mathml{\\mathrel{\\vcentcolon\\mathrel{\\mkern-1.2mu}=}}{\\mathop{\\char"2254}}');le("\\Coloneqq",'\\html@mathml{\\mathrel{\\dblcolon\\mathrel{\\mkern-1.2mu}=}}{\\mathop{\\char"2237\\char"3d}}');le("\\coloneq",'\\html@mathml{\\mathrel{\\vcentcolon\\mathrel{\\mkern-1.2mu}\\mathrel{-}}}{\\mathop{\\char"3a\\char"2212}}');le("\\Coloneq",'\\html@mathml{\\mathrel{\\dblcolon\\mathrel{\\mkern-1.2mu}\\mathrel{-}}}{\\mathop{\\char"2237\\char"2212}}');le("\\eqqcolon",'\\html@mathml{\\mathrel{=\\mathrel{\\mkern-1.2mu}\\vcentcolon}}{\\mathop{\\char"2255}}');le("\\Eqqcolon",'\\html@mathml{\\mathrel{=\\mathrel{\\mkern-1.2mu}\\dblcolon}}{\\mathop{\\char"3d\\char"2237}}');le("\\eqcolon",'\\html@mathml{\\mathrel{\\mathrel{-}\\mathrel{\\mkern-1.2mu}\\vcentcolon}}{\\mathop{\\char"2239}}');le("\\Eqcolon",'\\html@mathml{\\mathrel{\\mathrel{-}\\mathrel{\\mkern-1.2mu}\\dblcolon}}{\\mathop{\\char"2212\\char"2237}}');le("\\colonapprox",'\\html@mathml{\\mathrel{\\vcentcolon\\mathrel{\\mkern-1.2mu}\\approx}}{\\mathop{\\char"3a\\char"2248}}');le("\\Colonapprox",'\\html@mathml{\\mathrel{\\dblcolon\\mathrel{\\mkern-1.2mu}\\approx}}{\\mathop{\\char"2237\\char"2248}}');le("\\colonsim",'\\html@mathml{\\mathrel{\\vcentcolon\\mathrel{\\mkern-1.2mu}\\sim}}{\\mathop{\\char"3a\\char"223c}}');le("\\Colonsim",'\\html@mathml{\\mathrel{\\dblcolon\\mathrel{\\mkern-1.2mu}\\sim}}{\\mathop{\\char"2237\\char"223c}}');le("\u2237","\\dblcolon");le("\u2239","\\eqcolon");le("\u2254","\\coloneqq");le("\u2255","\\eqqcolon");le("\u2A74","\\Coloneqq");le("\\ratio","\\vcentcolon");le("\\coloncolon","\\dblcolon");le("\\colonequals","\\coloneqq");le("\\coloncolonequals","\\Coloneqq");le("\\equalscolon","\\eqqcolon");le("\\equalscoloncolon","\\Eqqcolon");le("\\colonminus","\\coloneq");le("\\coloncolonminus","\\Coloneq");le("\\minuscolon","\\eqcolon");le("\\minuscoloncolon","\\Eqcolon");le("\\coloncolonapprox","\\Colonapprox");le("\\coloncolonsim","\\Colonsim");le("\\simcolon","\\mathrel{\\sim\\mathrel{\\mkern-1.2mu}\\vcentcolon}");le("\\simcoloncolon","\\mathrel{\\sim\\mathrel{\\mkern-1.2mu}\\dblcolon}");le("\\approxcolon","\\mathrel{\\approx\\mathrel{\\mkern-1.2mu}\\vcentcolon}");le("\\approxcoloncolon","\\mathrel{\\approx\\mathrel{\\mkern-1.2mu}\\dblcolon}");le("\\notni","\\html@mathml{\\not\\ni}{\\mathrel{\\char`\u220C}}");le("\\limsup","\\DOTSB\\operatorname*{lim\\,sup}");le("\\liminf","\\DOTSB\\operatorname*{lim\\,inf}");le("\\injlim","\\DOTSB\\operatorname*{inj\\,lim}");le("\\projlim","\\DOTSB\\operatorname*{proj\\,lim}");le("\\varlimsup","\\DOTSB\\operatorname*{\\overline{lim}}");le("\\varliminf","\\DOTSB\\operatorname*{\\underline{lim}}");le("\\varinjlim","\\DOTSB\\operatorname*{\\underrightarrow{lim}}");le("\\varprojlim","\\DOTSB\\operatorname*{\\underleftarrow{lim}}");le("\\gvertneqq","\\html@mathml{\\@gvertneqq}{\u2269}");le("\\lvertneqq","\\html@mathml{\\@lvertneqq}{\u2268}");le("\\ngeqq","\\html@mathml{\\@ngeqq}{\u2271}");le("\\ngeqslant","\\html@mathml{\\@ngeqslant}{\u2271}");le("\\nleqq","\\html@mathml{\\@nleqq}{\u2270}");le("\\nleqslant","\\html@mathml{\\@nleqslant}{\u2270}");le("\\nshortmid","\\html@mathml{\\@nshortmid}{\u2224}");le("\\nshortparallel","\\html@mathml{\\@nshortparallel}{\u2226}");le("\\nsubseteqq","\\html@mathml{\\@nsubseteqq}{\u2288}");le("\\nsupseteqq","\\html@mathml{\\@nsupseteqq}{\u2289}");le("\\varsubsetneq","\\html@mathml{\\@varsubsetneq}{\u228A}");le("\\varsubsetneqq","\\html@mathml{\\@varsubsetneqq}{\u2ACB}");le("\\varsupsetneq","\\html@mathml{\\@varsupsetneq}{\u228B}");le("\\varsupsetneqq","\\html@mathml{\\@varsupsetneqq}{\u2ACC}");le("\\imath","\\html@mathml{\\@imath}{\u0131}");le("\\jmath","\\html@mathml{\\@jmath}{\u0237}");le("\\llbracket","\\html@mathml{\\mathopen{[\\mkern-3.2mu[}}{\\mathopen{\\char`\u27E6}}");le("\\rrbracket","\\html@mathml{\\mathclose{]\\mkern-3.2mu]}}{\\mathclose{\\char`\u27E7}}");le("\u27E6","\\llbracket");le("\u27E7","\\rrbracket");le("\\lBrace","\\html@mathml{\\mathopen{\\{\\mkern-3.2mu[}}{\\mathopen{\\char`\u2983}}");le("\\rBrace","\\html@mathml{\\mathclose{]\\mkern-3.2mu\\}}}{\\mathclose{\\char`\u2984}}");le("\u2983","\\lBrace");le("\u2984","\\rBrace");le("\\minuso","\\mathbin{\\html@mathml{{\\mathrlap{\\mathchoice{\\kern{0.145em}}{\\kern{0.145em}}{\\kern{0.1015em}}{\\kern{0.0725em}}\\circ}{-}}}{\\char`\u29B5}}");le("\u29B5","\\minuso");le("\\darr","\\downarrow");le("\\dArr","\\Downarrow");le("\\Darr","\\Downarrow");le("\\lang","\\langle");le("\\rang","\\rangle");le("\\uarr","\\uparrow");le("\\uArr","\\Uparrow");le("\\Uarr","\\Uparrow");le("\\N","\\mathbb{N}");le("\\R","\\mathbb{R}");le("\\Z","\\mathbb{Z}");le("\\alef","\\aleph");le("\\alefsym","\\aleph");le("\\Alpha","\\mathrm{A}");le("\\Beta","\\mathrm{B}");le("\\bull","\\bullet");le("\\Chi","\\mathrm{X}");le("\\clubs","\\clubsuit");le("\\cnums","\\mathbb{C}");le("\\Complex","\\mathbb{C}");le("\\Dagger","\\ddagger");le("\\diamonds","\\diamondsuit");le("\\empty","\\emptyset");le("\\Epsilon","\\mathrm{E}");le("\\Eta","\\mathrm{H}");le("\\exist","\\exists");le("\\harr","\\leftrightarrow");le("\\hArr","\\Leftrightarrow");le("\\Harr","\\Leftrightarrow");le("\\hearts","\\heartsuit");le("\\image","\\Im");le("\\infin","\\infty");le("\\Iota","\\mathrm{I}");le("\\isin","\\in");le("\\Kappa","\\mathrm{K}");le("\\larr","\\leftarrow");le("\\lArr","\\Leftarrow");le("\\Larr","\\Leftarrow");le("\\lrarr","\\leftrightarrow");le("\\lrArr","\\Leftrightarrow");le("\\Lrarr","\\Leftrightarrow");le("\\Mu","\\mathrm{M}");le("\\natnums","\\mathbb{N}");le("\\Nu","\\mathrm{N}");le("\\Omicron","\\mathrm{O}");le("\\plusmn","\\pm");le("\\rarr","\\rightarrow");le("\\rArr","\\Rightarrow");le("\\Rarr","\\Rightarrow");le("\\real","\\Re");le("\\reals","\\mathbb{R}");le("\\Reals","\\mathbb{R}");le("\\Rho","\\mathrm{P}");le("\\sdot","\\cdot");le("\\sect","\\S");le("\\spades","\\spadesuit");le("\\sub","\\subset");le("\\sube","\\subseteq");le("\\supe","\\supseteq");le("\\Tau","\\mathrm{T}");le("\\thetasym","\\vartheta");le("\\weierp","\\wp");le("\\Zeta","\\mathrm{Z}");le("\\argmin","\\DOTSB\\operatorname*{arg\\,min}");le("\\argmax","\\DOTSB\\operatorname*{arg\\,max}");le("\\plim","\\DOTSB\\mathop{\\operatorname{plim}}\\limits");le("\\bra","\\mathinner{\\langle{#1}|}");le("\\ket","\\mathinner{|{#1}\\rangle}");le("\\braket","\\mathinner{\\langle{#1}\\rangle}");le("\\Bra","\\left\\langle#1\\right|");le("\\Ket","\\left|#1\\right\\rangle");A$=o(t=>e=>{var r=e.consumeArg().tokens,n=e.consumeArg().tokens,i=e.consumeArg().tokens,a=e.consumeArg().tokens,s=e.macros.get("|"),l=e.macros.get("\\|");e.macros.beginGroup();var u=o(d=>p=>{t&&(p.macros.set("|",s),i.length&&p.macros.set("\\|",l));var m=d;if(!d&&i.length){var g=p.future();g.text==="|"&&(p.popToken(),m=!0)}return{tokens:m?i:n,numArgs:0}},"midMacro");e.macros.set("|",u(!1)),i.length&&e.macros.set("\\|",u(!0));var h=e.consumeArg().tokens,f=e.expandTokens([...a,...h,...r]);return e.macros.endGroup(),{tokens:f.reverse(),numArgs:0}},"braketHelper");le("\\bra@ket",A$(!1));le("\\bra@set",A$(!0));le("\\Braket","\\bra@ket{\\left\\langle}{\\,\\middle\\vert\\,}{\\,\\middle\\vert\\,}{\\right\\rangle}");le("\\Set","\\bra@set{\\left\\{\\:}{\\;\\middle\\vert\\;}{\\;\\middle\\Vert\\;}{\\:\\right\\}}");le("\\set","\\bra@set{\\{\\,}{\\mid}{}{\\,\\}}");le("\\angln","{\\angl n}");le("\\blue","\\textcolor{##6495ed}{#1}");le("\\orange","\\textcolor{##ffa500}{#1}");le("\\pink","\\textcolor{##ff00af}{#1}");le("\\red","\\textcolor{##df0030}{#1}");le("\\green","\\textcolor{##28ae7b}{#1}");le("\\gray","\\textcolor{gray}{#1}");le("\\purple","\\textcolor{##9d38bd}{#1}");le("\\blueA","\\textcolor{##ccfaff}{#1}");le("\\blueB","\\textcolor{##80f6ff}{#1}");le("\\blueC","\\textcolor{##63d9ea}{#1}");le("\\blueD","\\textcolor{##11accd}{#1}");le("\\blueE","\\textcolor{##0c7f99}{#1}");le("\\tealA","\\textcolor{##94fff5}{#1}");le("\\tealB","\\textcolor{##26edd5}{#1}");le("\\tealC","\\textcolor{##01d1c1}{#1}");le("\\tealD","\\textcolor{##01a995}{#1}");le("\\tealE","\\textcolor{##208170}{#1}");le("\\greenA","\\textcolor{##b6ffb0}{#1}");le("\\greenB","\\textcolor{##8af281}{#1}");le("\\greenC","\\textcolor{##74cf70}{#1}");le("\\greenD","\\textcolor{##1fab54}{#1}");le("\\greenE","\\textcolor{##0d923f}{#1}");le("\\goldA","\\textcolor{##ffd0a9}{#1}");le("\\goldB","\\textcolor{##ffbb71}{#1}");le("\\goldC","\\textcolor{##ff9c39}{#1}");le("\\goldD","\\textcolor{##e07d10}{#1}");le("\\goldE","\\textcolor{##a75a05}{#1}");le("\\redA","\\textcolor{##fca9a9}{#1}");le("\\redB","\\textcolor{##ff8482}{#1}");le("\\redC","\\textcolor{##f9685d}{#1}");le("\\redD","\\textcolor{##e84d39}{#1}");le("\\redE","\\textcolor{##bc2612}{#1}");le("\\maroonA","\\textcolor{##ffbde0}{#1}");le("\\maroonB","\\textcolor{##ff92c6}{#1}");le("\\maroonC","\\textcolor{##ed5fa6}{#1}");le("\\maroonD","\\textcolor{##ca337c}{#1}");le("\\maroonE","\\textcolor{##9e034e}{#1}");le("\\purpleA","\\textcolor{##ddd7ff}{#1}");le("\\purpleB","\\textcolor{##c6b9fc}{#1}");le("\\purpleC","\\textcolor{##aa87ff}{#1}");le("\\purpleD","\\textcolor{##7854ab}{#1}");le("\\purpleE","\\textcolor{##543b78}{#1}");le("\\mintA","\\textcolor{##f5f9e8}{#1}");le("\\mintB","\\textcolor{##edf2df}{#1}");le("\\mintC","\\textcolor{##e0e5cc}{#1}");le("\\grayA","\\textcolor{##f6f7f7}{#1}");le("\\grayB","\\textcolor{##f0f1f2}{#1}");le("\\grayC","\\textcolor{##e3e5e6}{#1}");le("\\grayD","\\textcolor{##d6d8da}{#1}");le("\\grayE","\\textcolor{##babec2}{#1}");le("\\grayF","\\textcolor{##888d93}{#1}");le("\\grayG","\\textcolor{##626569}{#1}");le("\\grayH","\\textcolor{##3b3e40}{#1}");le("\\grayI","\\textcolor{##21242c}{#1}");le("\\kaBlue","\\textcolor{##314453}{#1}");le("\\kaGreen","\\textcolor{##71B307}{#1}");_$={"^":!0,_:!0,"\\limits":!0,"\\nolimits":!0},DC=class{static{o(this,"MacroExpander")}constructor(e,r,n){this.settings=void 0,this.expansionCount=void 0,this.lexer=void 0,this.macros=void 0,this.stack=void 0,this.mode=void 0,this.settings=r,this.expansionCount=0,this.feed(e),this.macros=new LC(f3e,r.macros),this.mode=n,this.stack=[]}feed(e){this.lexer=new m4(e,this.settings)}switchMode(e){this.mode=e}beginGroup(){this.macros.beginGroup()}endGroup(){this.macros.endGroup()}endGroups(){this.macros.endGroups()}future(){return this.stack.length===0&&this.pushToken(this.lexer.lex()),this.stack[this.stack.length-1]}popToken(){return this.future(),this.stack.pop()}pushToken(e){this.stack.push(e)}pushTokens(e){this.stack.push(...e)}scanArgument(e){var r,n,i;if(e){if(this.consumeSpaces(),this.future().text!=="[")return null;r=this.popToken(),{tokens:i,end:n}=this.consumeArg(["]"])}else({tokens:i,start:r,end:n}=this.consumeArg());return this.pushToken(new Co("EOF",n.loc)),this.pushTokens(i),r.range(n,"")}consumeSpaces(){for(;;){var e=this.future();if(e.text===" ")this.stack.pop();else break}}consumeArg(e){var r=[],n=e&&e.length>0;n||this.consumeSpaces();var i=this.future(),a,s=0,l=0;do{if(a=this.popToken(),r.push(a),a.text==="{")++s;else if(a.text==="}"){if(--s,s===-1)throw new ut("Extra }",a)}else if(a.text==="EOF")throw new ut("Unexpected end of input in a macro argument, expected '"+(e&&n?e[l]:"}")+"'",a);if(e&&n)if((s===0||s===1&&e[l]==="{")&&a.text===e[l]){if(++l,l===e.length){r.splice(-l,l);break}}else l=0}while(s!==0||n);return i.text==="{"&&r[r.length-1].text==="}"&&(r.pop(),r.shift()),r.reverse(),{tokens:r,start:i,end:a}}consumeArgs(e,r){if(r){if(r.length!==e+1)throw new ut("The length of delimiters doesn't match the number of args!");for(var n=r[0],i=0;i<n.length;i++){var a=this.popToken();if(n[i]!==a.text)throw new ut("Use of the macro doesn't match its definition",a)}}for(var s=[],l=0;l<e;l++)s.push(this.consumeArg(r&&r[l+1]).tokens);return s}countExpansion(e){if(this.expansionCount+=e,this.expansionCount>this.settings.maxExpand)throw new ut("Too many expansions: infinite loop or need to increase maxExpand setting")}expandOnce(e){var r=this.popToken(),n=r.text,i=r.noexpand?null:this._getExpansion(n);if(i==null||e&&i.unexpandable){if(e&&i==null&&n[0]==="\\"&&!this.isDefined(n))throw new ut("Undefined control sequence: "+n);return this.pushToken(r),!1}this.countExpansion(1);var a=i.tokens,s=this.consumeArgs(i.numArgs,i.delimiters);if(i.numArgs){a=a.slice();for(var l=a.length-1;l>=0;--l){var u=a[l];if(u.text==="#"){if(l===0)throw new ut("Incomplete placeholder at end of macro body",u);if(u=a[--l],u.text==="#")a.splice(l+1,1);else if(/^[1-9]$/.test(u.text))a.splice(l,2,...s[+u.text-1]);else throw new ut("Not a valid argument number",u)}}}return this.pushTokens(a),a.length}expandAfterFuture(){return this.expandOnce(),this.future()}expandNextToken(){for(;;)if(this.expandOnce()===!1){var e=this.stack.pop();return e.treatAsRelax&&(e.text="\\relax"),e}throw new Error}expandMacro(e){return this.macros.has(e)?this.expandTokens([new Co(e)]):void 0}expandTokens(e){var r=[],n=this.stack.length;for(this.pushTokens(e);this.stack.length>n;)if(this.expandOnce(!0)===!1){var i=this.stack.pop();i.treatAsRelax&&(i.noexpand=!1,i.treatAsRelax=!1),r.push(i)}return this.countExpansion(r.length),r}expandMacroAsText(e){var r=this.expandMacro(e);return r&&r.map(n=>n.text).join("")}_getExpansion(e){var r=this.macros.get(e);if(r==null)return r;if(e.length===1){var n=this.lexer.catcodes[e];if(n!=null&&n!==13)return}var i=typeof r=="function"?r(this):r;if(typeof i=="string"){var a=0;if(i.indexOf("#")!==-1)for(var s=i.replace(/##/g,"");s.indexOf("#"+(a+1))!==-1;)++a;for(var l=new m4(i,this.settings),u=[],h=l.lex();h.text!=="EOF";)u.push(h),h=l.lex();u.reverse();var f={tokens:u,numArgs:a};return f}return i}isDefined(e){return this.macros.has(e)||oh.hasOwnProperty(e)||En.math.hasOwnProperty(e)||En.text.hasOwnProperty(e)||_$.hasOwnProperty(e)}isExpandable(e){var r=this.macros.get(e);return r!=null?typeof r=="string"||typeof r=="function"||!r.unexpandable:oh.hasOwnProperty(e)&&!oh[e].primitive}},IG=/^[₊₋₌₍₎₀₁₂₃₄₅₆₇₈₉ₐₑₕᵢⱼₖₗₘₙₒₚᵣₛₜᵤᵥₓᵦᵧᵨᵩᵪ]/,s4=Object.freeze({"\u208A":"+","\u208B":"-","\u208C":"=","\u208D":"(","\u208E":")","\u2080":"0","\u2081":"1","\u2082":"2","\u2083":"3","\u2084":"4","\u2085":"5","\u2086":"6","\u2087":"7","\u2088":"8","\u2089":"9","\u2090":"a","\u2091":"e","\u2095":"h","\u1D62":"i","\u2C7C":"j","\u2096":"k","\u2097":"l","\u2098":"m","\u2099":"n","\u2092":"o","\u209A":"p","\u1D63":"r","\u209B":"s","\u209C":"t","\u1D64":"u","\u1D65":"v","\u2093":"x","\u1D66":"\u03B2","\u1D67":"\u03B3","\u1D68":"\u03C1","\u1D69":"\u03D5","\u1D6A":"\u03C7","\u207A":"+","\u207B":"-","\u207C":"=","\u207D":"(","\u207E":")","\u2070":"0","\xB9":"1","\xB2":"2","\xB3":"3","\u2074":"4","\u2075":"5","\u2076":"6","\u2077":"7","\u2078":"8","\u2079":"9","\u1D2C":"A","\u1D2E":"B","\u1D30":"D","\u1D31":"E","\u1D33":"G","\u1D34":"H","\u1D35":"I","\u1D36":"J","\u1D37":"K","\u1D38":"L","\u1D39":"M","\u1D3A":"N","\u1D3C":"O","\u1D3E":"P","\u1D3F":"R","\u1D40":"T","\u1D41":"U","\u2C7D":"V","\u1D42":"W","\u1D43":"a","\u1D47":"b","\u1D9C":"c","\u1D48":"d","\u1D49":"e","\u1DA0":"f","\u1D4D":"g",\u02B0:"h","\u2071":"i",\u02B2:"j","\u1D4F":"k",\u02E1:"l","\u1D50":"m",\u207F:"n","\u1D52":"o","\u1D56":"p",\u02B3:"r",\u02E2:"s","\u1D57":"t","\u1D58":"u","\u1D5B":"v",\u02B7:"w",\u02E3:"x",\u02B8:"y","\u1DBB":"z","\u1D5D":"\u03B2","\u1D5E":"\u03B3","\u1D5F":"\u03B4","\u1D60":"\u03D5","\u1D61":"\u03C7","\u1DBF":"\u03B8"}),vC={"\u0301":{text:"\\'",math:"\\acute"},"\u0300":{text:"\\`",math:"\\grave"},"\u0308":{text:'\\"',math:"\\ddot"},"\u0303":{text:"\\~",math:"\\tilde"},"\u0304":{text:"\\=",math:"\\bar"},"\u0306":{text:"\\u",math:"\\breve"},"\u030C":{text:"\\v",math:"\\check"},"\u0302":{text:"\\^",math:"\\hat"},"\u0307":{text:"\\.",math:"\\dot"},"\u030A":{text:"\\r",math:"\\mathring"},"\u030B":{text:"\\H"},"\u0327":{text:"\\c"}},OG={\u00E1:"a\u0301",\u00E0:"a\u0300",\u00E4:"a\u0308",\u01DF:"a\u0308\u0304",\u00E3:"a\u0303",\u0101:"a\u0304",\u0103:"a\u0306",\u1EAF:"a\u0306\u0301",\u1EB1:"a\u0306\u0300",\u1EB5:"a\u0306\u0303",\u01CE:"a\u030C",\u00E2:"a\u0302",\u1EA5:"a\u0302\u0301",\u1EA7:"a\u0302\u0300",\u1EAB:"a\u0302\u0303",\u0227:"a\u0307",\u01E1:"a\u0307\u0304",\u00E5:"a\u030A",\u01FB:"a\u030A\u0301",\u1E03:"b\u0307",\u0107:"c\u0301",\u1E09:"c\u0327\u0301",\u010D:"c\u030C",\u0109:"c\u0302",\u010B:"c\u0307",\u00E7:"c\u0327",\u010F:"d\u030C",\u1E0B:"d\u0307",\u1E11:"d\u0327",\u00E9:"e\u0301",\u00E8:"e\u0300",\u00EB:"e\u0308",\u1EBD:"e\u0303",\u0113:"e\u0304",\u1E17:"e\u0304\u0301",\u1E15:"e\u0304\u0300",\u0115:"e\u0306",\u1E1D:"e\u0327\u0306",\u011B:"e\u030C",\u00EA:"e\u0302",\u1EBF:"e\u0302\u0301",\u1EC1:"e\u0302\u0300",\u1EC5:"e\u0302\u0303",\u0117:"e\u0307",\u0229:"e\u0327",\u1E1F:"f\u0307",\u01F5:"g\u0301",\u1E21:"g\u0304",\u011F:"g\u0306",\u01E7:"g\u030C",\u011D:"g\u0302",\u0121:"g\u0307",\u0123:"g\u0327",\u1E27:"h\u0308",\u021F:"h\u030C",\u0125:"h\u0302",\u1E23:"h\u0307",\u1E29:"h\u0327",\u00ED:"i\u0301",\u00EC:"i\u0300",\u00EF:"i\u0308",\u1E2F:"i\u0308\u0301",\u0129:"i\u0303",\u012B:"i\u0304",\u012D:"i\u0306",\u01D0:"i\u030C",\u00EE:"i\u0302",\u01F0:"j\u030C",\u0135:"j\u0302",\u1E31:"k\u0301",\u01E9:"k\u030C",\u0137:"k\u0327",\u013A:"l\u0301",\u013E:"l\u030C",\u013C:"l\u0327",\u1E3F:"m\u0301",\u1E41:"m\u0307",\u0144:"n\u0301",\u01F9:"n\u0300",\u00F1:"n\u0303",\u0148:"n\u030C",\u1E45:"n\u0307",\u0146:"n\u0327",\u00F3:"o\u0301",\u00F2:"o\u0300",\u00F6:"o\u0308",\u022B:"o\u0308\u0304",\u00F5:"o\u0303",\u1E4D:"o\u0303\u0301",\u1E4F:"o\u0303\u0308",\u022D:"o\u0303\u0304",\u014D:"o\u0304",\u1E53:"o\u0304\u0301",\u1E51:"o\u0304\u0300",\u014F:"o\u0306",\u01D2:"o\u030C",\u00F4:"o\u0302",\u1ED1:"o\u0302\u0301",\u1ED3:"o\u0302\u0300",\u1ED7:"o\u0302\u0303",\u022F:"o\u0307",\u0231:"o\u0307\u0304",\u0151:"o\u030B",\u1E55:"p\u0301",\u1E57:"p\u0307",\u0155:"r\u0301",\u0159:"r\u030C",\u1E59:"r\u0307",\u0157:"r\u0327",\u015B:"s\u0301",\u1E65:"s\u0301\u0307",\u0161:"s\u030C",\u1E67:"s\u030C\u0307",\u015D:"s\u0302",\u1E61:"s\u0307",\u015F:"s\u0327",\u1E97:"t\u0308",\u0165:"t\u030C",\u1E6B:"t\u0307",\u0163:"t\u0327",\u00FA:"u\u0301",\u00F9:"u\u0300",\u00FC:"u\u0308",\u01D8:"u\u0308\u0301",\u01DC:"u\u0308\u0300",\u01D6:"u\u0308\u0304",\u01DA:"u\u0308\u030C",\u0169:"u\u0303",\u1E79:"u\u0303\u0301",\u016B:"u\u0304",\u1E7B:"u\u0304\u0308",\u016D:"u\u0306",\u01D4:"u\u030C",\u00FB:"u\u0302",\u016F:"u\u030A",\u0171:"u\u030B",\u1E7D:"v\u0303",\u1E83:"w\u0301",\u1E81:"w\u0300",\u1E85:"w\u0308",\u0175:"w\u0302",\u1E87:"w\u0307",\u1E98:"w\u030A",\u1E8D:"x\u0308",\u1E8B:"x\u0307",\u00FD:"y\u0301",\u1EF3:"y\u0300",\u00FF:"y\u0308",\u1EF9:"y\u0303",\u0233:"y\u0304",\u0177:"y\u0302",\u1E8F:"y\u0307",\u1E99:"y\u030A",\u017A:"z\u0301",\u017E:"z\u030C",\u1E91:"z\u0302",\u017C:"z\u0307",\u00C1:"A\u0301",\u00C0:"A\u0300",\u00C4:"A\u0308",\u01DE:"A\u0308\u0304",\u00C3:"A\u0303",\u0100:"A\u0304",\u0102:"A\u0306",\u1EAE:"A\u0306\u0301",\u1EB0:"A\u0306\u0300",\u1EB4:"A\u0306\u0303",\u01CD:"A\u030C",\u00C2:"A\u0302",\u1EA4:"A\u0302\u0301",\u1EA6:"A\u0302\u0300",\u1EAA:"A\u0302\u0303",\u0226:"A\u0307",\u01E0:"A\u0307\u0304",\u00C5:"A\u030A",\u01FA:"A\u030A\u0301",\u1E02:"B\u0307",\u0106:"C\u0301",\u1E08:"C\u0327\u0301",\u010C:"C\u030C",\u0108:"C\u0302",\u010A:"C\u0307",\u00C7:"C\u0327",\u010E:"D\u030C",\u1E0A:"D\u0307",\u1E10:"D\u0327",\u00C9:"E\u0301",\u00C8:"E\u0300",\u00CB:"E\u0308",\u1EBC:"E\u0303",\u0112:"E\u0304",\u1E16:"E\u0304\u0301",\u1E14:"E\u0304\u0300",\u0114:"E\u0306",\u1E1C:"E\u0327\u0306",\u011A:"E\u030C",\u00CA:"E\u0302",\u1EBE:"E\u0302\u0301",\u1EC0:"E\u0302\u0300",\u1EC4:"E\u0302\u0303",\u0116:"E\u0307",\u0228:"E\u0327",\u1E1E:"F\u0307",\u01F4:"G\u0301",\u1E20:"G\u0304",\u011E:"G\u0306",\u01E6:"G\u030C",\u011C:"G\u0302",\u0120:"G\u0307",\u0122:"G\u0327",\u1E26:"H\u0308",\u021E:"H\u030C",\u0124:"H\u0302",\u1E22:"H\u0307",\u1E28:"H\u0327",\u00CD:"I\u0301",\u00CC:"I\u0300",\u00CF:"I\u0308",\u1E2E:"I\u0308\u0301",\u0128:"I\u0303",\u012A:"I\u0304",\u012C:"I\u0306",\u01CF:"I\u030C",\u00CE:"I\u0302",\u0130:"I\u0307",\u0134:"J\u0302",\u1E30:"K\u0301",\u01E8:"K\u030C",\u0136:"K\u0327",\u0139:"L\u0301",\u013D:"L\u030C",\u013B:"L\u0327",\u1E3E:"M\u0301",\u1E40:"M\u0307",\u0143:"N\u0301",\u01F8:"N\u0300",\u00D1:"N\u0303",\u0147:"N\u030C",\u1E44:"N\u0307",\u0145:"N\u0327",\u00D3:"O\u0301",\u00D2:"O\u0300",\u00D6:"O\u0308",\u022A:"O\u0308\u0304",\u00D5:"O\u0303",\u1E4C:"O\u0303\u0301",\u1E4E:"O\u0303\u0308",\u022C:"O\u0303\u0304",\u014C:"O\u0304",\u1E52:"O\u0304\u0301",\u1E50:"O\u0304\u0300",\u014E:"O\u0306",\u01D1:"O\u030C",\u00D4:"O\u0302",\u1ED0:"O\u0302\u0301",\u1ED2:"O\u0302\u0300",\u1ED6:"O\u0302\u0303",\u022E:"O\u0307",\u0230:"O\u0307\u0304",\u0150:"O\u030B",\u1E54:"P\u0301",\u1E56:"P\u0307",\u0154:"R\u0301",\u0158:"R\u030C",\u1E58:"R\u0307",\u0156:"R\u0327",\u015A:"S\u0301",\u1E64:"S\u0301\u0307",\u0160:"S\u030C",\u1E66:"S\u030C\u0307",\u015C:"S\u0302",\u1E60:"S\u0307",\u015E:"S\u0327",\u0164:"T\u030C",\u1E6A:"T\u0307",\u0162:"T\u0327",\u00DA:"U\u0301",\u00D9:"U\u0300",\u00DC:"U\u0308",\u01D7:"U\u0308\u0301",\u01DB:"U\u0308\u0300",\u01D5:"U\u0308\u0304",\u01D9:"U\u0308\u030C",\u0168:"U\u0303",\u1E78:"U\u0303\u0301",\u016A:"U\u0304",\u1E7A:"U\u0304\u0308",\u016C:"U\u0306",\u01D3:"U\u030C",\u00DB:"U\u0302",\u016E:"U\u030A",\u0170:"U\u030B",\u1E7C:"V\u0303",\u1E82:"W\u0301",\u1E80:"W\u0300",\u1E84:"W\u0308",\u0174:"W\u0302",\u1E86:"W\u0307",\u1E8C:"X\u0308",\u1E8A:"X\u0307",\u00DD:"Y\u0301",\u1EF2:"Y\u0300",\u0178:"Y\u0308",\u1EF8:"Y\u0303",\u0232:"Y\u0304",\u0176:"Y\u0302",\u1E8E:"Y\u0307",\u0179:"Z\u0301",\u017D:"Z\u030C",\u1E90:"Z\u0302",\u017B:"Z\u0307",\u03AC:"\u03B1\u0301",\u1F70:"\u03B1\u0300",\u1FB1:"\u03B1\u0304",\u1FB0:"\u03B1\u0306",\u03AD:"\u03B5\u0301",\u1F72:"\u03B5\u0300",\u03AE:"\u03B7\u0301",\u1F74:"\u03B7\u0300",\u03AF:"\u03B9\u0301",\u1F76:"\u03B9\u0300",\u03CA:"\u03B9\u0308",\u0390:"\u03B9\u0308\u0301",\u1FD2:"\u03B9\u0308\u0300",\u1FD1:"\u03B9\u0304",\u1FD0:"\u03B9\u0306",\u03CC:"\u03BF\u0301",\u1F78:"\u03BF\u0300",\u03CD:"\u03C5\u0301",\u1F7A:"\u03C5\u0300",\u03CB:"\u03C5\u0308",\u03B0:"\u03C5\u0308\u0301",\u1FE2:"\u03C5\u0308\u0300",\u1FE1:"\u03C5\u0304",\u1FE0:"\u03C5\u0306",\u03CE:"\u03C9\u0301",\u1F7C:"\u03C9\u0300",\u038E:"\u03A5\u0301",\u1FEA:"\u03A5\u0300",\u03AB:"\u03A5\u0308",\u1FE9:"\u03A5\u0304",\u1FE8:"\u03A5\u0306",\u038F:"\u03A9\u0301",\u1FFA:"\u03A9\u0300"},g4=class t{static{o(this,"Parser")}constructor(e,r){this.mode=void 0,this.gullet=void 0,this.settings=void 0,this.leftrightDepth=void 0,this.nextToken=void 0,this.mode="math",this.gullet=new DC(e,r,this.mode),this.settings=r,this.leftrightDepth=0}expect(e,r){if(r===void 0&&(r=!0),this.fetch().text!==e)throw new ut("Expected '"+e+"', got '"+this.fetch().text+"'",this.fetch());r&&this.consume()}consume(){this.nextToken=null}fetch(){return this.nextToken==null&&(this.nextToken=this.gullet.expandNextToken()),this.nextToken}switchMode(e){this.mode=e,this.gullet.switchMode(e)}parse(){this.settings.globalGroup||this.gullet.beginGroup(),this.settings.colorIsTextColor&&this.gullet.macros.set("\\color","\\textcolor");try{var e=this.parseExpression(!1);return this.expect("EOF"),this.settings.globalGroup||this.gullet.endGroup(),e}finally{this.gullet.endGroups()}}subparse(e){var r=this.nextToken;this.consume(),this.gullet.pushToken(new Co("}")),this.gullet.pushTokens(e);var n=this.parseExpression(!1);return this.expect("}"),this.nextToken=r,n}parseExpression(e,r){for(var n=[];;){this.mode==="math"&&this.consumeSpaces();var i=this.fetch();if(t.endOfExpression.indexOf(i.text)!==-1||r&&i.text===r||e&&oh[i.text]&&oh[i.text].infix)break;var a=this.parseAtom(r);if(a){if(a.type==="internal")continue}else break;n.push(a)}return this.mode==="text"&&this.formLigatures(n),this.handleInfixNodes(n)}handleInfixNodes(e){for(var r=-1,n,i=0;i<e.length;i++)if(e[i].type==="infix"){if(r!==-1)throw new ut("only one infix operator per group",e[i].token);r=i,n=e[i].replaceWith}if(r!==-1&&n){var a,s,l=e.slice(0,r),u=e.slice(r+1);l.length===1&&l[0].type==="ordgroup"?a=l[0]:a={type:"ordgroup",mode:this.mode,body:l},u.length===1&&u[0].type==="ordgroup"?s=u[0]:s={type:"ordgroup",mode:this.mode,body:u};var h;return n==="\\\\abovefrac"?h=this.callFunction(n,[a,e[r],s],[]):h=this.callFunction(n,[a,s],[]),[h]}else return e}handleSupSubscript(e){var r=this.fetch(),n=r.text;this.consume(),this.consumeSpaces();var i=this.parseGroup(e);if(!i)throw new ut("Expected group after '"+n+"'",r);return i}formatUnsupportedCmd(e){for(var r=[],n=0;n<e.length;n++)r.push({type:"textord",mode:"text",text:e[n]});var i={type:"text",mode:this.mode,body:r},a={type:"color",mode:this.mode,color:this.settings.errorColor,body:[i]};return a}parseAtom(e){var r=this.parseGroup("atom",e);if(this.mode==="text")return r;for(var n,i;;){this.consumeSpaces();var a=this.fetch();if(a.text==="\\limits"||a.text==="\\nolimits"){if(r&&r.type==="op"){var s=a.text==="\\limits";r.limits=s,r.alwaysHandleSupSub=!0}else if(r&&r.type==="operatorname")r.alwaysHandleSupSub&&(r.limits=a.text==="\\limits");else throw new ut("Limit controls must follow a math operator",a);this.consume()}else if(a.text==="^"){if(n)throw new ut("Double superscript",a);n=this.handleSupSubscript("superscript")}else if(a.text==="_"){if(i)throw new ut("Double subscript",a);i=this.handleSupSubscript("subscript")}else if(a.text==="'"){if(n)throw new ut("Double superscript",a);var l={type:"textord",mode:this.mode,text:"\\prime"},u=[l];for(this.consume();this.fetch().text==="'";)u.push(l),this.consume();this.fetch().text==="^"&&u.push(this.handleSupSubscript("superscript")),n={type:"ordgroup",mode:this.mode,body:u}}else if(s4[a.text]){var h=IG.test(a.text),f=[];for(f.push(new Co(s4[a.text])),this.consume();;){var d=this.fetch().text;if(!s4[d]||IG.test(d)!==h)break;f.unshift(new Co(s4[d])),this.consume()}var p=this.subparse(f);h?i={type:"ordgroup",mode:"math",body:p}:n={type:"ordgroup",mode:"math",body:p}}else break}return n||i?{type:"supsub",mode:this.mode,base:r,sup:n,sub:i}:r}parseFunction(e,r){var n=this.fetch(),i=n.text,a=oh[i];if(!a)return null;if(this.consume(),r&&r!=="atom"&&!a.allowedInArgument)throw new ut("Got function '"+i+"' with no arguments"+(r?" as "+r:""),n);if(this.mode==="text"&&!a.allowedInText)throw new ut("Can't use function '"+i+"' in text mode",n);if(this.mode==="math"&&a.allowedInMath===!1)throw new ut("Can't use function '"+i+"' in math mode",n);var{args:s,optArgs:l}=this.parseArguments(i,a);return this.callFunction(i,s,l,n,e)}callFunction(e,r,n,i,a){var s={funcName:e,parser:this,token:i,breakOnTokenText:a},l=oh[e];if(l&&l.handler)return l.handler(s,r,n);throw new ut("No function handler for "+e)}parseArguments(e,r){var n=r.numArgs+r.numOptionalArgs;if(n===0)return{args:[],optArgs:[]};for(var i=[],a=[],s=0;s<n;s++){var l=r.argTypes&&r.argTypes[s],u=s<r.numOptionalArgs;(r.primitive&&l==null||r.type==="sqrt"&&s===1&&a[0]==null)&&(l="primitive");var h=this.parseGroupOfType("argument to '"+e+"'",l,u);if(u)a.push(h);else if(h!=null)i.push(h);else throw new ut("Null argument, please report this as a bug")}return{args:i,optArgs:a}}parseGroupOfType(e,r,n){switch(r){case"color":return this.parseColorGroup(n);case"size":return this.parseSizeGroup(n);case"url":return this.parseUrlGroup(n);case"math":case"text":return this.parseArgumentGroup(n,r);case"hbox":{var i=this.parseArgumentGroup(n,"text");return i!=null?{type:"styling",mode:i.mode,body:[i],style:"text"}:null}case"raw":{var a=this.parseStringGroup("raw",n);return a!=null?{type:"raw",mode:"text",string:a.text}:null}case"primitive":{if(n)throw new ut("A primitive argument cannot be optional");var s=this.parseGroup(e);if(s==null)throw new ut("Expected group as "+e,this.fetch());return s}case"original":case null:case void 0:return this.parseArgumentGroup(n);default:throw new ut("Unknown group type as "+e,this.fetch())}}consumeSpaces(){for(;this.fetch().text===" ";)this.consume()}parseStringGroup(e,r){var n=this.gullet.scanArgument(r);if(n==null)return null;for(var i="",a;(a=this.fetch()).text!=="EOF";)i+=a.text,this.consume();return this.consume(),n.text=i,n}parseRegexGroup(e,r){for(var n=this.fetch(),i=n,a="",s;(s=this.fetch()).text!=="EOF"&&e.test(a+s.text);)i=s,a+=i.text,this.consume();if(a==="")throw new ut("Invalid "+r+": '"+n.text+"'",n);return n.range(i,a)}parseColorGroup(e){var r=this.parseStringGroup("color",e);if(r==null)return null;var n=/^(#[a-f0-9]{3}|#?[a-f0-9]{6}|[a-z]+)$/i.exec(r.text);if(!n)throw new ut("Invalid color: '"+r.text+"'",r);var i=n[0];return/^[0-9a-f]{6}$/i.test(i)&&(i="#"+i),{type:"color-token",mode:this.mode,color:i}}parseSizeGroup(e){var r,n=!1;if(this.gullet.consumeSpaces(),!e&&this.gullet.future().text!=="{"?r=this.parseRegexGroup(/^[-+]? *(?:$|\d+|\d+\.\d*|\.\d*) *[a-z]{0,2} *$/,"size"):r=this.parseStringGroup("size",e),!r)return null;!e&&r.text.length===0&&(r.text="0pt",n=!0);var i=/([-+]?) *(\d+(?:\.\d*)?|\.\d+) *([a-z]{2})/.exec(r.text);if(!i)throw new ut("Invalid size: '"+r.text+"'",r);var a={number:+(i[1]+i[2]),unit:i[3]};if(!FG(a))throw new ut("Invalid unit: '"+a.unit+"'",r);return{type:"size",mode:this.mode,value:a,isBlank:n}}parseUrlGroup(e){this.gullet.lexer.setCatcode("%",13),this.gullet.lexer.setCatcode("~",12);var r=this.parseStringGroup("url",e);if(this.gullet.lexer.setCatcode("%",14),this.gullet.lexer.setCatcode("~",13),r==null)return null;var n=r.text.replace(/\\([#$%&~_^{}])/g,"$1");return{type:"url",mode:this.mode,url:n}}parseArgumentGroup(e,r){var n=this.gullet.scanArgument(e);if(n==null)return null;var i=this.mode;r&&this.switchMode(r),this.gullet.beginGroup();var a=this.parseExpression(!1,"EOF");this.expect("EOF"),this.gullet.endGroup();var s={type:"ordgroup",mode:this.mode,loc:n.loc,body:a};return r&&this.switchMode(i),s}parseGroup(e,r){var n=this.fetch(),i=n.text,a;if(i==="{"||i==="\\begingroup"){this.consume();var s=i==="{"?"}":"\\endgroup";this.gullet.beginGroup();var l=this.parseExpression(!1,s),u=this.fetch();this.expect(s),this.gullet.endGroup(),a={type:"ordgroup",mode:this.mode,loc:Ys.range(n,u),body:l,semisimple:i==="\\begingroup"||void 0}}else if(a=this.parseFunction(r,e)||this.parseSymbol(),a==null&&i[0]==="\\"&&!_$.hasOwnProperty(i)){if(this.settings.throwOnError)throw new ut("Undefined control sequence: "+i,n);a=this.formatUnsupportedCmd(i),this.consume()}return a}formLigatures(e){for(var r=e.length-1,n=0;n<r;++n){var i=e[n],a=i.text;a==="-"&&e[n+1].text==="-"&&(n+1<r&&e[n+2].text==="-"?(e.splice(n,3,{type:"textord",mode:"text",loc:Ys.range(i,e[n+2]),text:"---"}),r-=2):(e.splice(n,2,{type:"textord",mode:"text",loc:Ys.range(i,e[n+1]),text:"--"}),r-=1)),(a==="'"||a==="`")&&e[n+1].text===a&&(e.splice(n,2,{type:"textord",mode:"text",loc:Ys.range(i,e[n+1]),text:a+a}),r-=1)}}parseSymbol(){var e=this.fetch(),r=e.text;if(/^\\verb[^a-zA-Z]/.test(r)){this.consume();var n=r.slice(5),i=n.charAt(0)==="*";if(i&&(n=n.slice(1)),n.length<2||n.charAt(0)!==n.slice(-1))throw new ut(`\\verb assertion failed -- + please report what input caused this bug`);return n=n.slice(1,-1),{type:"verb",mode:"text",body:n,star:i}}OG.hasOwnProperty(r[0])&&!En[this.mode][r[0]]&&(this.settings.strict&&this.mode==="math"&&this.settings.reportNonstrict("unicodeTextInMathMode",'Accented Unicode text character "'+r[0]+'" used in math mode',e),r=OG[r[0]]+r.slice(1));var a=u3e.exec(r);a&&(r=r.substring(0,a.index),r==="i"?r="\u0131":r==="j"&&(r="\u0237"));var s;if(En[this.mode][r]){this.settings.strict&&this.mode==="math"&&TC.indexOf(r)>=0&&this.settings.reportNonstrict("unicodeTextInMathMode",'Latin-1/Unicode text character "'+r[0]+'" used in math mode',e);var l=En[this.mode][r].group,u=Ys.range(e),h;if(n4e.hasOwnProperty(l)){var f=l;h={type:"atom",mode:this.mode,family:f,loc:u,text:r}}else h={type:l,mode:this.mode,loc:u,text:r};s=h}else if(r.charCodeAt(0)>=128)this.settings.strict&&(BG(r.charCodeAt(0))?this.mode==="math"&&this.settings.reportNonstrict("unicodeTextInMathMode",'Unicode text character "'+r[0]+'" used in math mode',e):this.settings.reportNonstrict("unknownSymbol",'Unrecognized Unicode character "'+r[0]+'"'+(" ("+r.charCodeAt(0)+")"),e)),s={type:"textord",mode:"text",loc:Ys.range(e),text:r};else return null;if(this.consume(),a)for(var d=0;d<a[0].length;d++){var p=a[0][d];if(!vC[p])throw new ut("Unknown accent ' "+p+"'",e);var m=vC[p][this.mode]||vC[p].text;if(!m)throw new ut("Accent "+p+" unsupported in "+this.mode+" mode",e);s={type:"accent",mode:this.mode,loc:Ys.range(e),label:m,isStretchy:!1,isShifty:!0,base:s}}return s}};g4.endOfExpression=["}","\\endgroup","\\end","\\right","&"];qC=o(function(e,r){if(!(typeof e=="string"||e instanceof String))throw new TypeError("KaTeX can only parse string typed expression");var n=new g4(e,r);delete n.gullet.macros.current["\\df@tag"];var i=n.parse();if(delete n.gullet.macros.current["\\current@color"],delete n.gullet.macros.current["\\color"],n.gullet.macros.get("\\df@tag")){if(!r.displayMode)throw new ut("\\tag works only in display equations");i=[{type:"tag",mode:"text",body:i,tag:n.subparse([new Co("\\df@tag")])}]}return i},"parseTree"),L$=o(function(e,r,n){r.textContent="";var i=XC(e,n).toNode();r.appendChild(i)},"render");typeof document<"u"&&document.compatMode!=="CSS1Compat"&&(typeof console<"u"&&console.warn("Warning: KaTeX doesn't work in quirks mode. Make sure your website has a suitable doctype."),L$=o(function(){throw new ut("KaTeX doesn't work in quirks mode.")},"render"));d3e=o(function(e,r){var n=XC(e,r).toMarkup();return n},"renderToString"),p3e=o(function(e,r){var n=new Z1(r);return qC(e,n)},"generateParseTree"),D$=o(function(e,r,n){if(n.throwOnError||!(e instanceof ut))throw e;var i=Ie.makeSpan(["katex-error"],[new ms(r)]);return i.setAttribute("title",e.toString()),i.setAttribute("style","color:"+n.errorColor),i},"renderError"),XC=o(function(e,r){var n=new Z1(r);try{var i=qC(e,n);return S4e(i,e,n)}catch(a){return D$(a,e,n)}},"renderToDomTree"),m3e=o(function(e,r){var n=new Z1(r);try{var i=qC(e,n);return C4e(i,e,n)}catch(a){return D$(a,e,n)}},"renderToHTMLTree"),g3e={version:"0.16.11",render:L$,renderToString:d3e,ParseError:ut,SETTINGS_SCHEMA:o4,__parse:p3e,__renderToDomTree:XC,__renderToHTMLTree:m3e,__setFontMetrics:Qbe,__defineSymbol:G,__defineFunction:Ct,__defineMacro:le,__domTree:{Span:qf,Anchor:ey,SymbolNode:ms,SvgNode:fl,PathNode:Jl,LineNode:ty}}});function x3e(){let t="data-temp-href-target";ah.addHook("beforeSanitizeAttributes",e=>{e instanceof Element&&e.tagName==="A"&&e.hasAttribute("target")&&e.setAttribute(t,e.getAttribute("target")??"")}),ah.addHook("afterSanitizeAttributes",e=>{e instanceof Element&&e.tagName==="A"&&e.hasAttribute(t)&&(e.setAttribute("target",e.getAttribute(t)??""),e.removeAttribute(t),e.getAttribute("target")==="_blank"&&e.setAttribute("rel","noopener"))})}var jf,y3e,v3e,O$,M$,Tr,b3e,w3e,T3e,k3e,P$,E3e,xr,S3e,C3e,ou,jC,A3e,_3e,I$,KC,pi,Kf,hh,je,fr=M(()=>{"use strict";sC();jf=/<br\s*\/?>/gi,y3e=o(t=>t?P$(t).replace(/\\n/g,"#br#").split("#br#"):[""],"getRows"),v3e=(()=>{let t=!1;return()=>{t||(x3e(),t=!0)}})();o(x3e,"setupDompurifyHooks");O$=o(t=>(v3e(),ah.sanitize(t)),"removeScript"),M$=o((t,e)=>{if(e.flowchart?.htmlLabels!==!1){let r=e.securityLevel;r==="antiscript"||r==="strict"?t=O$(t):r!=="loose"&&(t=P$(t),t=t.replace(/</g,"<").replace(/>/g,">"),t=t.replace(/=/g,"="),t=k3e(t))}return t},"sanitizeMore"),Tr=o((t,e)=>t&&(e.dompurifyConfig?t=ah.sanitize(M$(t,e),e.dompurifyConfig).toString():t=ah.sanitize(M$(t,e),{FORBID_TAGS:["style"]}).toString(),t),"sanitizeText"),b3e=o((t,e)=>typeof t=="string"?Tr(t,e):t.flat().map(r=>Tr(r,e)),"sanitizeTextOrArray"),w3e=o(t=>jf.test(t),"hasBreaks"),T3e=o(t=>t.split(jf),"splitBreaks"),k3e=o(t=>t.replace(/#br#/g,"<br/>"),"placeholderToBreak"),P$=o(t=>t.replace(jf,"#br#"),"breakToPlaceholder"),E3e=o(t=>{let e="";return t&&(e=window.location.protocol+"//"+window.location.host+window.location.pathname+window.location.search,e=e.replaceAll(/\(/g,"\\("),e=e.replaceAll(/\)/g,"\\)")),e},"getUrl"),xr=o(t=>!(t===!1||["false","null","0"].includes(String(t).trim().toLowerCase())),"evaluate"),S3e=o(function(...t){let e=t.filter(r=>!isNaN(r));return Math.max(...e)},"getMax"),C3e=o(function(...t){let e=t.filter(r=>!isNaN(r));return Math.min(...e)},"getMin"),ou=o(function(t){let e=t.split(/(,)/),r=[];for(let n=0;n<e.length;n++){let i=e[n];if(i===","&&n>0&&n+1<e.length){let a=e[n-1],s=e[n+1];A3e(a,s)&&(i=a+","+s,n++,r.pop())}r.push(_3e(i))}return r.join("")},"parseGenericTypes"),jC=o((t,e)=>Math.max(0,t.split(e).length-1),"countOccurrence"),A3e=o((t,e)=>{let r=jC(t,"~"),n=jC(e,"~");return r===1&&n===1},"shouldCombineSets"),_3e=o(t=>{let e=jC(t,"~"),r=!1;if(e<=1)return t;e%2!==0&&t.startsWith("~")&&(t=t.substring(1),r=!0);let n=[...t],i=n.indexOf("~"),a=n.lastIndexOf("~");for(;i!==-1&&a!==-1&&i!==a;)n[i]="<",n[a]=">",i=n.indexOf("~"),a=n.lastIndexOf("~");return r&&n.unshift("~"),n.join("")},"processSet"),I$=o(()=>window.MathMLElement!==void 0,"isMathMLSupported"),KC=/\$\$(.*)\$\$/g,pi=o(t=>(t.match(KC)?.length??0)>0,"hasKatex"),Kf=o(async(t,e)=>{t=await hh(t,e);let r=document.createElement("div");r.innerHTML=t,r.id="katex-temp",r.style.visibility="hidden",r.style.position="absolute",r.style.top="0",document.querySelector("body")?.insertAdjacentElement("beforeend",r);let i={width:r.clientWidth,height:r.clientHeight};return r.remove(),i},"calculateMathMLDimensions"),hh=o(async(t,e)=>{if(!pi(t))return t;if(!(I$()||e.legacyMathML||e.forceLegacyMathML))return t.replace(KC,"MathML is unsupported in this environment.");let{default:r}=await Promise.resolve().then(()=>(R$(),N$)),n=e.forceLegacyMathML||!I$()&&e.legacyMathML?"htmlAndMathml":"mathml";return t.split(jf).map(i=>pi(i)?`<div style="display: flex; align-items: center; justify-content: center; white-space: nowrap;">${i}</div>`:`<div>${i}</div>`).join("").replace(KC,(i,a)=>r.renderToString(a,{throwOnError:!0,displayMode:!0,output:n}).replace(/\n/g," ").replace(/<annotation.*<\/annotation>/g,""))},"renderKatex"),je={getRows:y3e,sanitizeText:Tr,sanitizeTextOrArray:b3e,hasBreaks:w3e,splitBreaks:T3e,lineBreakRegex:jf,removeScript:O$,getUrl:E3e,evaluate:xr,getMax:S3e,getMin:C3e}});var L3e,D3e,Zr,_o,ni=M(()=>{"use strict";ht();L3e=o(function(t,e){for(let r of e)t.attr(r[0],r[1])},"d3Attrs"),D3e=o(function(t,e,r){let n=new Map;return r?(n.set("width","100%"),n.set("style",`max-width: ${e}px;`)):(n.set("height",t),n.set("width",e)),n},"calculateSvgSizeAttrs"),Zr=o(function(t,e,r,n){let i=D3e(e,r,n);L3e(t,i)},"configureSvgSize"),_o=o(function(t,e,r,n){let i=e.node().getBBox(),a=i.width,s=i.height;Y.info(`SVG bounds: ${a}x${s}`,i);let l=0,u=0;Y.info(`Graph bounds: ${l}x${u}`,t),l=a+r*2,u=s+r*2,Y.info(`Calculated bounds: ${l}x${u}`),Zr(e,u,l,n);let h=`${i.x-r} ${i.y-r} ${i.width+2*r} ${i.height+2*r}`;e.attr("viewBox",h)},"setupGraphViewbox")});var k4,N3e,B$,F$,QC=M(()=>{"use strict";ht();k4={},N3e=o((t,e,r)=>{let n="";return t in k4&&k4[t]?n=k4[t](r):Y.warn(`No theme found for ${t}`),` & { + font-family: ${r.fontFamily}; + font-size: ${r.fontSize}; + fill: ${r.textColor} + } + + /* Classes common for multiple diagrams */ + + & .error-icon { + fill: ${r.errorBkgColor}; + } + & .error-text { + fill: ${r.errorTextColor}; + stroke: ${r.errorTextColor}; + } + + & .edge-thickness-normal { + stroke-width: 1px; + } + & .edge-thickness-thick { + stroke-width: 3.5px + } + & .edge-pattern-solid { + stroke-dasharray: 0; + } + & .edge-thickness-invisible { + stroke-width: 0; + fill: none; + } + & .edge-pattern-dashed{ + stroke-dasharray: 3; + } + .edge-pattern-dotted { + stroke-dasharray: 2; + } + + & .marker { + fill: ${r.lineColor}; + stroke: ${r.lineColor}; + } + & .marker.cross { + stroke: ${r.lineColor}; + } + + & svg { + font-family: ${r.fontFamily}; + font-size: ${r.fontSize}; + } + & p { + margin: 0 + } + + ${n} + + ${e} +`},"getStyles"),B$=o((t,e)=>{e!==void 0&&(k4[t]=e)},"addStylesForDiagram"),F$=N3e});var iy={};vr(iy,{clear:()=>_r,getAccDescription:()=>Fr,getAccTitle:()=>Pr,getDiagramTitle:()=>Jr,setAccDescription:()=>Br,setAccTitle:()=>Rr,setDiagramTitle:()=>ln});var ZC,JC,e7,t7,_r,Rr,Pr,Br,Fr,ln,Jr,ki=M(()=>{"use strict";fr();Ua();ZC="",JC="",e7="",t7=o(t=>Tr(t,Sr()),"sanitizeText"),_r=o(()=>{ZC="",e7="",JC=""},"clear"),Rr=o(t=>{ZC=t7(t).replace(/^\s+/g,"")},"setAccTitle"),Pr=o(()=>ZC,"getAccTitle"),Br=o(t=>{e7=t7(t).replace(/\n\s+/g,` +`)},"setAccDescription"),Fr=o(()=>e7,"getAccDescription"),ln=o(t=>{JC=t7(t)},"setDiagramTitle"),Jr=o(()=>JC,"getDiagramTitle")});var z$,R3e,de,n7,S4,i7,a7,M3e,E4,Qf,ay,r7,Vt=M(()=>{"use strict";$f();ht();Ua();fr();ni();QC();ki();z$=Y,R3e=M1,de=Sr,n7=Yb,S4=ih,i7=o(t=>Tr(t,de()),"sanitizeText"),a7=_o,M3e=o(()=>iy,"getCommonDb"),E4={},Qf=o((t,e,r)=>{E4[t]&&z$.warn(`Diagram with id ${t} already registered. Overwriting.`),E4[t]=e,r&&OS(t,r),B$(t,e.styles),e.injectUtils?.(z$,R3e,de,i7,a7,M3e(),()=>{})},"registerDiagram"),ay=o(t=>{if(t in E4)return E4[t];throw new r7(t)},"getDiagram"),r7=class extends Error{static{o(this,"DiagramNotFoundError")}constructor(e){super(`Diagram ${e} not found.`)}}});var pl,fh,Xa,dl,nc,sy,s7,o7,C4,A4,G$,I3e,O3e,P3e,B3e,F3e,z3e,G3e,$3e,V3e,U3e,H3e,W3e,Y3e,q3e,X3e,j3e,K3e,$$,Q3e,Z3e,V$,J3e,e5e,t5e,r5e,dh,n5e,i5e,a5e,s5e,o5e,oy,l7=M(()=>{"use strict";Vt();fr();ki();pl=[],fh=[""],Xa="global",dl="",nc=[{alias:"global",label:{text:"global"},type:{text:"global"},tags:null,link:null,parentBoundary:""}],sy=[],s7="",o7=!1,C4=4,A4=2,I3e=o(function(){return G$},"getC4Type"),O3e=o(function(t){G$=Tr(t,de())},"setC4Type"),P3e=o(function(t,e,r,n,i,a,s,l,u){if(t==null||e===void 0||e===null||r===void 0||r===null||n===void 0||n===null)return;let h={},f=sy.find(d=>d.from===e&&d.to===r);if(f?h=f:sy.push(h),h.type=t,h.from=e,h.to=r,h.label={text:n},i==null)h.techn={text:""};else if(typeof i=="object"){let[d,p]=Object.entries(i)[0];h[d]={text:p}}else h.techn={text:i};if(a==null)h.descr={text:""};else if(typeof a=="object"){let[d,p]=Object.entries(a)[0];h[d]={text:p}}else h.descr={text:a};if(typeof s=="object"){let[d,p]=Object.entries(s)[0];h[d]=p}else h.sprite=s;if(typeof l=="object"){let[d,p]=Object.entries(l)[0];h[d]=p}else h.tags=l;if(typeof u=="object"){let[d,p]=Object.entries(u)[0];h[d]=p}else h.link=u;h.wrap=dh()},"addRel"),B3e=o(function(t,e,r,n,i,a,s){if(e===null||r===null)return;let l={},u=pl.find(h=>h.alias===e);if(u&&e===u.alias?l=u:(l.alias=e,pl.push(l)),r==null?l.label={text:""}:l.label={text:r},n==null)l.descr={text:""};else if(typeof n=="object"){let[h,f]=Object.entries(n)[0];l[h]={text:f}}else l.descr={text:n};if(typeof i=="object"){let[h,f]=Object.entries(i)[0];l[h]=f}else l.sprite=i;if(typeof a=="object"){let[h,f]=Object.entries(a)[0];l[h]=f}else l.tags=a;if(typeof s=="object"){let[h,f]=Object.entries(s)[0];l[h]=f}else l.link=s;l.typeC4Shape={text:t},l.parentBoundary=Xa,l.wrap=dh()},"addPersonOrSystem"),F3e=o(function(t,e,r,n,i,a,s,l){if(e===null||r===null)return;let u={},h=pl.find(f=>f.alias===e);if(h&&e===h.alias?u=h:(u.alias=e,pl.push(u)),r==null?u.label={text:""}:u.label={text:r},n==null)u.techn={text:""};else if(typeof n=="object"){let[f,d]=Object.entries(n)[0];u[f]={text:d}}else u.techn={text:n};if(i==null)u.descr={text:""};else if(typeof i=="object"){let[f,d]=Object.entries(i)[0];u[f]={text:d}}else u.descr={text:i};if(typeof a=="object"){let[f,d]=Object.entries(a)[0];u[f]=d}else u.sprite=a;if(typeof s=="object"){let[f,d]=Object.entries(s)[0];u[f]=d}else u.tags=s;if(typeof l=="object"){let[f,d]=Object.entries(l)[0];u[f]=d}else u.link=l;u.wrap=dh(),u.typeC4Shape={text:t},u.parentBoundary=Xa},"addContainer"),z3e=o(function(t,e,r,n,i,a,s,l){if(e===null||r===null)return;let u={},h=pl.find(f=>f.alias===e);if(h&&e===h.alias?u=h:(u.alias=e,pl.push(u)),r==null?u.label={text:""}:u.label={text:r},n==null)u.techn={text:""};else if(typeof n=="object"){let[f,d]=Object.entries(n)[0];u[f]={text:d}}else u.techn={text:n};if(i==null)u.descr={text:""};else if(typeof i=="object"){let[f,d]=Object.entries(i)[0];u[f]={text:d}}else u.descr={text:i};if(typeof a=="object"){let[f,d]=Object.entries(a)[0];u[f]=d}else u.sprite=a;if(typeof s=="object"){let[f,d]=Object.entries(s)[0];u[f]=d}else u.tags=s;if(typeof l=="object"){let[f,d]=Object.entries(l)[0];u[f]=d}else u.link=l;u.wrap=dh(),u.typeC4Shape={text:t},u.parentBoundary=Xa},"addComponent"),G3e=o(function(t,e,r,n,i){if(t===null||e===null)return;let a={},s=nc.find(l=>l.alias===t);if(s&&t===s.alias?a=s:(a.alias=t,nc.push(a)),e==null?a.label={text:""}:a.label={text:e},r==null)a.type={text:"system"};else if(typeof r=="object"){let[l,u]=Object.entries(r)[0];a[l]={text:u}}else a.type={text:r};if(typeof n=="object"){let[l,u]=Object.entries(n)[0];a[l]=u}else a.tags=n;if(typeof i=="object"){let[l,u]=Object.entries(i)[0];a[l]=u}else a.link=i;a.parentBoundary=Xa,a.wrap=dh(),dl=Xa,Xa=t,fh.push(dl)},"addPersonOrSystemBoundary"),$3e=o(function(t,e,r,n,i){if(t===null||e===null)return;let a={},s=nc.find(l=>l.alias===t);if(s&&t===s.alias?a=s:(a.alias=t,nc.push(a)),e==null?a.label={text:""}:a.label={text:e},r==null)a.type={text:"container"};else if(typeof r=="object"){let[l,u]=Object.entries(r)[0];a[l]={text:u}}else a.type={text:r};if(typeof n=="object"){let[l,u]=Object.entries(n)[0];a[l]=u}else a.tags=n;if(typeof i=="object"){let[l,u]=Object.entries(i)[0];a[l]=u}else a.link=i;a.parentBoundary=Xa,a.wrap=dh(),dl=Xa,Xa=t,fh.push(dl)},"addContainerBoundary"),V3e=o(function(t,e,r,n,i,a,s,l){if(e===null||r===null)return;let u={},h=nc.find(f=>f.alias===e);if(h&&e===h.alias?u=h:(u.alias=e,nc.push(u)),r==null?u.label={text:""}:u.label={text:r},n==null)u.type={text:"node"};else if(typeof n=="object"){let[f,d]=Object.entries(n)[0];u[f]={text:d}}else u.type={text:n};if(i==null)u.descr={text:""};else if(typeof i=="object"){let[f,d]=Object.entries(i)[0];u[f]={text:d}}else u.descr={text:i};if(typeof s=="object"){let[f,d]=Object.entries(s)[0];u[f]=d}else u.tags=s;if(typeof l=="object"){let[f,d]=Object.entries(l)[0];u[f]=d}else u.link=l;u.nodeType=t,u.parentBoundary=Xa,u.wrap=dh(),dl=Xa,Xa=e,fh.push(dl)},"addDeploymentNode"),U3e=o(function(){Xa=dl,fh.pop(),dl=fh.pop(),fh.push(dl)},"popBoundaryParseStack"),H3e=o(function(t,e,r,n,i,a,s,l,u,h,f){let d=pl.find(p=>p.alias===e);if(!(d===void 0&&(d=nc.find(p=>p.alias===e),d===void 0))){if(r!=null)if(typeof r=="object"){let[p,m]=Object.entries(r)[0];d[p]=m}else d.bgColor=r;if(n!=null)if(typeof n=="object"){let[p,m]=Object.entries(n)[0];d[p]=m}else d.fontColor=n;if(i!=null)if(typeof i=="object"){let[p,m]=Object.entries(i)[0];d[p]=m}else d.borderColor=i;if(a!=null)if(typeof a=="object"){let[p,m]=Object.entries(a)[0];d[p]=m}else d.shadowing=a;if(s!=null)if(typeof s=="object"){let[p,m]=Object.entries(s)[0];d[p]=m}else d.shape=s;if(l!=null)if(typeof l=="object"){let[p,m]=Object.entries(l)[0];d[p]=m}else d.sprite=l;if(u!=null)if(typeof u=="object"){let[p,m]=Object.entries(u)[0];d[p]=m}else d.techn=u;if(h!=null)if(typeof h=="object"){let[p,m]=Object.entries(h)[0];d[p]=m}else d.legendText=h;if(f!=null)if(typeof f=="object"){let[p,m]=Object.entries(f)[0];d[p]=m}else d.legendSprite=f}},"updateElStyle"),W3e=o(function(t,e,r,n,i,a,s){let l=sy.find(u=>u.from===e&&u.to===r);if(l!==void 0){if(n!=null)if(typeof n=="object"){let[u,h]=Object.entries(n)[0];l[u]=h}else l.textColor=n;if(i!=null)if(typeof i=="object"){let[u,h]=Object.entries(i)[0];l[u]=h}else l.lineColor=i;if(a!=null)if(typeof a=="object"){let[u,h]=Object.entries(a)[0];l[u]=parseInt(h)}else l.offsetX=parseInt(a);if(s!=null)if(typeof s=="object"){let[u,h]=Object.entries(s)[0];l[u]=parseInt(h)}else l.offsetY=parseInt(s)}},"updateRelStyle"),Y3e=o(function(t,e,r){let n=C4,i=A4;if(typeof e=="object"){let a=Object.values(e)[0];n=parseInt(a)}else n=parseInt(e);if(typeof r=="object"){let a=Object.values(r)[0];i=parseInt(a)}else i=parseInt(r);n>=1&&(C4=n),i>=1&&(A4=i)},"updateLayoutConfig"),q3e=o(function(){return C4},"getC4ShapeInRow"),X3e=o(function(){return A4},"getC4BoundaryInRow"),j3e=o(function(){return Xa},"getCurrentBoundaryParse"),K3e=o(function(){return dl},"getParentBoundaryParse"),$$=o(function(t){return t==null?pl:pl.filter(e=>e.parentBoundary===t)},"getC4ShapeArray"),Q3e=o(function(t){return pl.find(e=>e.alias===t)},"getC4Shape"),Z3e=o(function(t){return Object.keys($$(t))},"getC4ShapeKeys"),V$=o(function(t){return t==null?nc:nc.filter(e=>e.parentBoundary===t)},"getBoundaries"),J3e=V$,e5e=o(function(){return sy},"getRels"),t5e=o(function(){return s7},"getTitle"),r5e=o(function(t){o7=t},"setWrap"),dh=o(function(){return o7},"autoWrap"),n5e=o(function(){pl=[],nc=[{alias:"global",label:{text:"global"},type:{text:"global"},tags:null,link:null,parentBoundary:""}],dl="",Xa="global",fh=[""],sy=[],fh=[""],s7="",o7=!1,C4=4,A4=2},"clear"),i5e={SOLID:0,DOTTED:1,NOTE:2,SOLID_CROSS:3,DOTTED_CROSS:4,SOLID_OPEN:5,DOTTED_OPEN:6,LOOP_START:10,LOOP_END:11,ALT_START:12,ALT_ELSE:13,ALT_END:14,OPT_START:15,OPT_END:16,ACTIVE_START:17,ACTIVE_END:18,PAR_START:19,PAR_AND:20,PAR_END:21,RECT_START:22,RECT_END:23,SOLID_POINT:24,DOTTED_POINT:25},a5e={FILLED:0,OPEN:1},s5e={LEFTOF:0,RIGHTOF:1,OVER:2},o5e=o(function(t){s7=Tr(t,de())},"setTitle"),oy={addPersonOrSystem:B3e,addPersonOrSystemBoundary:G3e,addContainer:F3e,addContainerBoundary:$3e,addComponent:z3e,addDeploymentNode:V3e,popBoundaryParseStack:U3e,addRel:P3e,updateElStyle:H3e,updateRelStyle:W3e,updateLayoutConfig:Y3e,autoWrap:dh,setWrap:r5e,getC4ShapeArray:$$,getC4Shape:Q3e,getC4ShapeKeys:Z3e,getBoundaries:V$,getBoundarys:J3e,getCurrentBoundaryParse:j3e,getParentBoundaryParse:K3e,getRels:e5e,getTitle:t5e,getC4Type:I3e,getC4ShapeInRow:q3e,getC4BoundaryInRow:X3e,setAccTitle:Rr,getAccTitle:Pr,getAccDescription:Fr,setAccDescription:Br,getConfig:o(()=>de().c4,"getConfig"),clear:n5e,LINETYPE:i5e,ARROWTYPE:a5e,PLACEMENT:s5e,setTitle:o5e,setC4Type:O3e}});function Zf(t,e){return t==null||e==null?NaN:t<e?-1:t>e?1:t>=e?0:NaN}var c7=M(()=>{"use strict";o(Zf,"ascending")});function u7(t,e){return t==null||e==null?NaN:e<t?-1:e>t?1:e>=t?0:NaN}var U$=M(()=>{"use strict";o(u7,"descending")});function Jf(t){let e,r,n;t.length!==2?(e=Zf,r=o((l,u)=>Zf(t(l),u),"compare2"),n=o((l,u)=>t(l)-u,"delta")):(e=t===Zf||t===u7?t:l5e,r=t,n=t);function i(l,u,h=0,f=l.length){if(h<f){if(e(u,u)!==0)return f;do{let d=h+f>>>1;r(l[d],u)<0?h=d+1:f=d}while(h<f)}return h}o(i,"left");function a(l,u,h=0,f=l.length){if(h<f){if(e(u,u)!==0)return f;do{let d=h+f>>>1;r(l[d],u)<=0?h=d+1:f=d}while(h<f)}return h}o(a,"right");function s(l,u,h=0,f=l.length){let d=i(l,u,h,f-1);return d>h&&n(l[d-1],u)>-n(l[d],u)?d-1:d}return o(s,"center"),{left:i,center:s,right:a}}function l5e(){return 0}var h7=M(()=>{"use strict";c7();U$();o(Jf,"bisector");o(l5e,"zero")});function f7(t){return t===null?NaN:+t}var H$=M(()=>{"use strict";o(f7,"number")});var W$,Y$,c5e,u5e,d7,q$=M(()=>{"use strict";c7();h7();H$();W$=Jf(Zf),Y$=W$.right,c5e=W$.left,u5e=Jf(f7).center,d7=Y$});function X$({_intern:t,_key:e},r){let n=e(r);return t.has(n)?t.get(n):r}function h5e({_intern:t,_key:e},r){let n=e(r);return t.has(n)?t.get(n):(t.set(n,r),r)}function f5e({_intern:t,_key:e},r){let n=e(r);return t.has(n)&&(r=t.get(n),t.delete(n)),r}function d5e(t){return t!==null&&typeof t=="object"?t.valueOf():t}var mp,j$=M(()=>{"use strict";mp=class extends Map{static{o(this,"InternMap")}constructor(e,r=d5e){if(super(),Object.defineProperties(this,{_intern:{value:new Map},_key:{value:r}}),e!=null)for(let[n,i]of e)this.set(n,i)}get(e){return super.get(X$(this,e))}has(e){return super.has(X$(this,e))}set(e,r){return super.set(h5e(this,e),r)}delete(e){return super.delete(f5e(this,e))}};o(X$,"intern_get");o(h5e,"intern_set");o(f5e,"intern_delete");o(d5e,"keyof")});function _4(t,e,r){let n=(e-t)/Math.max(0,r),i=Math.floor(Math.log10(n)),a=n/Math.pow(10,i),s=a>=p5e?10:a>=m5e?5:a>=g5e?2:1,l,u,h;return i<0?(h=Math.pow(10,-i)/s,l=Math.round(t*h),u=Math.round(e*h),l/h<t&&++l,u/h>e&&--u,h=-h):(h=Math.pow(10,i)*s,l=Math.round(t/h),u=Math.round(e/h),l*h<t&&++l,u*h>e&&--u),u<l&&.5<=r&&r<2?_4(t,e,r*2):[l,u,h]}function L4(t,e,r){if(e=+e,t=+t,r=+r,!(r>0))return[];if(t===e)return[t];let n=e<t,[i,a,s]=n?_4(e,t,r):_4(t,e,r);if(!(a>=i))return[];let l=a-i+1,u=new Array(l);if(n)if(s<0)for(let h=0;h<l;++h)u[h]=(a-h)/-s;else for(let h=0;h<l;++h)u[h]=(a-h)*s;else if(s<0)for(let h=0;h<l;++h)u[h]=(i+h)/-s;else for(let h=0;h<l;++h)u[h]=(i+h)*s;return u}function ly(t,e,r){return e=+e,t=+t,r=+r,_4(t,e,r)[2]}function gp(t,e,r){e=+e,t=+t,r=+r;let n=e<t,i=n?ly(e,t,r):ly(t,e,r);return(n?-1:1)*(i<0?1/-i:i)}var p5e,m5e,g5e,K$=M(()=>{"use strict";p5e=Math.sqrt(50),m5e=Math.sqrt(10),g5e=Math.sqrt(2);o(_4,"tickSpec");o(L4,"ticks");o(ly,"tickIncrement");o(gp,"tickStep")});function D4(t,e){let r;if(e===void 0)for(let n of t)n!=null&&(r<n||r===void 0&&n>=n)&&(r=n);else{let n=-1;for(let i of t)(i=e(i,++n,t))!=null&&(r<i||r===void 0&&i>=i)&&(r=i)}return r}var Q$=M(()=>{"use strict";o(D4,"max")});function N4(t,e){let r;if(e===void 0)for(let n of t)n!=null&&(r>n||r===void 0&&n>=n)&&(r=n);else{let n=-1;for(let i of t)(i=e(i,++n,t))!=null&&(r>i||r===void 0&&i>=i)&&(r=i)}return r}var Z$=M(()=>{"use strict";o(N4,"min")});function R4(t,e,r){t=+t,e=+e,r=(i=arguments.length)<2?(e=t,t=0,1):i<3?1:+r;for(var n=-1,i=Math.max(0,Math.ceil((e-t)/r))|0,a=new Array(i);++n<i;)a[n]=t+n*r;return a}var J$=M(()=>{"use strict";o(R4,"range")});var ph=M(()=>{"use strict";q$();h7();Q$();Z$();J$();K$();j$()});function p7(t){return t}var eV=M(()=>{"use strict";o(p7,"default")});function y5e(t){return"translate("+t+",0)"}function v5e(t){return"translate(0,"+t+")"}function x5e(t){return e=>+t(e)}function b5e(t,e){return e=Math.max(0,t.bandwidth()-e*2)/2,t.round()&&(e=Math.round(e)),r=>+t(r)+e}function w5e(){return!this.__axis}function rV(t,e){var r=[],n=null,i=null,a=6,s=6,l=3,u=typeof window<"u"&&window.devicePixelRatio>1?0:.5,h=t===I4||t===M4?-1:1,f=t===M4||t===m7?"x":"y",d=t===I4||t===g7?y5e:v5e;function p(m){var g=n??(e.ticks?e.ticks.apply(e,r):e.domain()),y=i??(e.tickFormat?e.tickFormat.apply(e,r):p7),v=Math.max(a,0)+l,x=e.range(),b=+x[0]+u,w=+x[x.length-1]+u,_=(e.bandwidth?b5e:x5e)(e.copy(),u),T=m.selection?m.selection():m,E=T.selectAll(".domain").data([null]),L=T.selectAll(".tick").data(g,e).order(),C=L.exit(),A=L.enter().append("g").attr("class","tick"),I=L.select("line"),D=L.select("text");E=E.merge(E.enter().insert("path",".tick").attr("class","domain").attr("stroke","currentColor")),L=L.merge(A),I=I.merge(A.append("line").attr("stroke","currentColor").attr(f+"2",h*a)),D=D.merge(A.append("text").attr("fill","currentColor").attr(f,h*v).attr("dy",t===I4?"0em":t===g7?"0.71em":"0.32em")),m!==T&&(E=E.transition(m),L=L.transition(m),I=I.transition(m),D=D.transition(m),C=C.transition(m).attr("opacity",tV).attr("transform",function(k){return isFinite(k=_(k))?d(k+u):this.getAttribute("transform")}),A.attr("opacity",tV).attr("transform",function(k){var R=this.parentNode.__axis;return d((R&&isFinite(R=R(k))?R:_(k))+u)})),C.remove(),E.attr("d",t===M4||t===m7?s?"M"+h*s+","+b+"H"+u+"V"+w+"H"+h*s:"M"+u+","+b+"V"+w:s?"M"+b+","+h*s+"V"+u+"H"+w+"V"+h*s:"M"+b+","+u+"H"+w),L.attr("opacity",1).attr("transform",function(k){return d(_(k)+u)}),I.attr(f+"2",h*a),D.attr(f,h*v).text(y),T.filter(w5e).attr("fill","none").attr("font-size",10).attr("font-family","sans-serif").attr("text-anchor",t===m7?"start":t===M4?"end":"middle"),T.each(function(){this.__axis=_})}return o(p,"axis"),p.scale=function(m){return arguments.length?(e=m,p):e},p.ticks=function(){return r=Array.from(arguments),p},p.tickArguments=function(m){return arguments.length?(r=m==null?[]:Array.from(m),p):r.slice()},p.tickValues=function(m){return arguments.length?(n=m==null?null:Array.from(m),p):n&&n.slice()},p.tickFormat=function(m){return arguments.length?(i=m,p):i},p.tickSize=function(m){return arguments.length?(a=s=+m,p):a},p.tickSizeInner=function(m){return arguments.length?(a=+m,p):a},p.tickSizeOuter=function(m){return arguments.length?(s=+m,p):s},p.tickPadding=function(m){return arguments.length?(l=+m,p):l},p.offset=function(m){return arguments.length?(u=+m,p):u},p}function y7(t){return rV(I4,t)}function v7(t){return rV(g7,t)}var I4,m7,g7,M4,tV,nV=M(()=>{"use strict";eV();I4=1,m7=2,g7=3,M4=4,tV=1e-6;o(y5e,"translateX");o(v5e,"translateY");o(x5e,"number");o(b5e,"center");o(w5e,"entering");o(rV,"axis");o(y7,"axisTop");o(v7,"axisBottom")});var iV=M(()=>{"use strict";nV()});function sV(){for(var t=0,e=arguments.length,r={},n;t<e;++t){if(!(n=arguments[t]+"")||n in r||/[\s.]/.test(n))throw new Error("illegal type: "+n);r[n]=[]}return new O4(r)}function O4(t){this._=t}function k5e(t,e){return t.trim().split(/^|\s+/).map(function(r){var n="",i=r.indexOf(".");if(i>=0&&(n=r.slice(i+1),r=r.slice(0,i)),r&&!e.hasOwnProperty(r))throw new Error("unknown type: "+r);return{type:r,name:n}})}function E5e(t,e){for(var r=0,n=t.length,i;r<n;++r)if((i=t[r]).name===e)return i.value}function aV(t,e,r){for(var n=0,i=t.length;n<i;++n)if(t[n].name===e){t[n]=T5e,t=t.slice(0,n).concat(t.slice(n+1));break}return r!=null&&t.push({name:e,value:r}),t}var T5e,x7,oV=M(()=>{"use strict";T5e={value:o(()=>{},"value")};o(sV,"dispatch");o(O4,"Dispatch");o(k5e,"parseTypenames");O4.prototype=sV.prototype={constructor:O4,on:o(function(t,e){var r=this._,n=k5e(t+"",r),i,a=-1,s=n.length;if(arguments.length<2){for(;++a<s;)if((i=(t=n[a]).type)&&(i=E5e(r[i],t.name)))return i;return}if(e!=null&&typeof e!="function")throw new Error("invalid callback: "+e);for(;++a<s;)if(i=(t=n[a]).type)r[i]=aV(r[i],t.name,e);else if(e==null)for(i in r)r[i]=aV(r[i],t.name,null);return this},"on"),copy:o(function(){var t={},e=this._;for(var r in e)t[r]=e[r].slice();return new O4(t)},"copy"),call:o(function(t,e){if((i=arguments.length-2)>0)for(var r=new Array(i),n=0,i,a;n<i;++n)r[n]=arguments[n+2];if(!this._.hasOwnProperty(t))throw new Error("unknown type: "+t);for(a=this._[t],n=0,i=a.length;n<i;++n)a[n].value.apply(e,r)},"call"),apply:o(function(t,e,r){if(!this._.hasOwnProperty(t))throw new Error("unknown type: "+t);for(var n=this._[t],i=0,a=n.length;i<a;++i)n[i].value.apply(e,r)},"apply")};o(E5e,"get");o(aV,"set");x7=sV});var b7=M(()=>{"use strict";oV()});var P4,w7,T7=M(()=>{"use strict";P4="http://www.w3.org/1999/xhtml",w7={svg:"http://www.w3.org/2000/svg",xhtml:P4,xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace",xmlns:"http://www.w3.org/2000/xmlns/"}});function ic(t){var e=t+="",r=e.indexOf(":");return r>=0&&(e=t.slice(0,r))!=="xmlns"&&(t=t.slice(r+1)),w7.hasOwnProperty(e)?{space:w7[e],local:t}:t}var B4=M(()=>{"use strict";T7();o(ic,"default")});function S5e(t){return function(){var e=this.ownerDocument,r=this.namespaceURI;return r===P4&&e.documentElement.namespaceURI===P4?e.createElement(t):e.createElementNS(r,t)}}function C5e(t){return function(){return this.ownerDocument.createElementNS(t.space,t.local)}}function cy(t){var e=ic(t);return(e.local?C5e:S5e)(e)}var k7=M(()=>{"use strict";B4();T7();o(S5e,"creatorInherit");o(C5e,"creatorFixed");o(cy,"default")});function A5e(){}function mh(t){return t==null?A5e:function(){return this.querySelector(t)}}var F4=M(()=>{"use strict";o(A5e,"none");o(mh,"default")});function E7(t){typeof t!="function"&&(t=mh(t));for(var e=this._groups,r=e.length,n=new Array(r),i=0;i<r;++i)for(var a=e[i],s=a.length,l=n[i]=new Array(s),u,h,f=0;f<s;++f)(u=a[f])&&(h=t.call(u,u.__data__,f,a))&&("__data__"in u&&(h.__data__=u.__data__),l[f]=h);return new ii(n,this._parents)}var lV=M(()=>{"use strict";ml();F4();o(E7,"default")});function S7(t){return t==null?[]:Array.isArray(t)?t:Array.from(t)}var cV=M(()=>{"use strict";o(S7,"array")});function _5e(){return[]}function yp(t){return t==null?_5e:function(){return this.querySelectorAll(t)}}var C7=M(()=>{"use strict";o(_5e,"empty");o(yp,"default")});function L5e(t){return function(){return S7(t.apply(this,arguments))}}function A7(t){typeof t=="function"?t=L5e(t):t=yp(t);for(var e=this._groups,r=e.length,n=[],i=[],a=0;a<r;++a)for(var s=e[a],l=s.length,u,h=0;h<l;++h)(u=s[h])&&(n.push(t.call(u,u.__data__,h,s)),i.push(u));return new ii(n,i)}var uV=M(()=>{"use strict";ml();cV();C7();o(L5e,"arrayAll");o(A7,"default")});function vp(t){return function(){return this.matches(t)}}function z4(t){return function(e){return e.matches(t)}}var uy=M(()=>{"use strict";o(vp,"default");o(z4,"childMatcher")});function N5e(t){return function(){return D5e.call(this.children,t)}}function R5e(){return this.firstElementChild}function _7(t){return this.select(t==null?R5e:N5e(typeof t=="function"?t:z4(t)))}var D5e,hV=M(()=>{"use strict";uy();D5e=Array.prototype.find;o(N5e,"childFind");o(R5e,"childFirst");o(_7,"default")});function I5e(){return Array.from(this.children)}function O5e(t){return function(){return M5e.call(this.children,t)}}function L7(t){return this.selectAll(t==null?I5e:O5e(typeof t=="function"?t:z4(t)))}var M5e,fV=M(()=>{"use strict";uy();M5e=Array.prototype.filter;o(I5e,"children");o(O5e,"childrenFilter");o(L7,"default")});function D7(t){typeof t!="function"&&(t=vp(t));for(var e=this._groups,r=e.length,n=new Array(r),i=0;i<r;++i)for(var a=e[i],s=a.length,l=n[i]=[],u,h=0;h<s;++h)(u=a[h])&&t.call(u,u.__data__,h,a)&&l.push(u);return new ii(n,this._parents)}var dV=M(()=>{"use strict";ml();uy();o(D7,"default")});function hy(t){return new Array(t.length)}var N7=M(()=>{"use strict";o(hy,"default")});function R7(){return new ii(this._enter||this._groups.map(hy),this._parents)}function fy(t,e){this.ownerDocument=t.ownerDocument,this.namespaceURI=t.namespaceURI,this._next=null,this._parent=t,this.__data__=e}var M7=M(()=>{"use strict";N7();ml();o(R7,"default");o(fy,"EnterNode");fy.prototype={constructor:fy,appendChild:o(function(t){return this._parent.insertBefore(t,this._next)},"appendChild"),insertBefore:o(function(t,e){return this._parent.insertBefore(t,e)},"insertBefore"),querySelector:o(function(t){return this._parent.querySelector(t)},"querySelector"),querySelectorAll:o(function(t){return this._parent.querySelectorAll(t)},"querySelectorAll")}});function I7(t){return function(){return t}}var pV=M(()=>{"use strict";o(I7,"default")});function P5e(t,e,r,n,i,a){for(var s=0,l,u=e.length,h=a.length;s<h;++s)(l=e[s])?(l.__data__=a[s],n[s]=l):r[s]=new fy(t,a[s]);for(;s<u;++s)(l=e[s])&&(i[s]=l)}function B5e(t,e,r,n,i,a,s){var l,u,h=new Map,f=e.length,d=a.length,p=new Array(f),m;for(l=0;l<f;++l)(u=e[l])&&(p[l]=m=s.call(u,u.__data__,l,e)+"",h.has(m)?i[l]=u:h.set(m,u));for(l=0;l<d;++l)m=s.call(t,a[l],l,a)+"",(u=h.get(m))?(n[l]=u,u.__data__=a[l],h.delete(m)):r[l]=new fy(t,a[l]);for(l=0;l<f;++l)(u=e[l])&&h.get(p[l])===u&&(i[l]=u)}function F5e(t){return t.__data__}function O7(t,e){if(!arguments.length)return Array.from(this,F5e);var r=e?B5e:P5e,n=this._parents,i=this._groups;typeof t!="function"&&(t=I7(t));for(var a=i.length,s=new Array(a),l=new Array(a),u=new Array(a),h=0;h<a;++h){var f=n[h],d=i[h],p=d.length,m=z5e(t.call(f,f&&f.__data__,h,n)),g=m.length,y=l[h]=new Array(g),v=s[h]=new Array(g),x=u[h]=new Array(p);r(f,d,y,v,x,m,e);for(var b=0,w=0,_,T;b<g;++b)if(_=y[b]){for(b>=w&&(w=b+1);!(T=v[w])&&++w<g;);_._next=T||null}}return s=new ii(s,n),s._enter=l,s._exit=u,s}function z5e(t){return typeof t=="object"&&"length"in t?t:Array.from(t)}var mV=M(()=>{"use strict";ml();M7();pV();o(P5e,"bindIndex");o(B5e,"bindKey");o(F5e,"datum");o(O7,"default");o(z5e,"arraylike")});function P7(){return new ii(this._exit||this._groups.map(hy),this._parents)}var gV=M(()=>{"use strict";N7();ml();o(P7,"default")});function B7(t,e,r){var n=this.enter(),i=this,a=this.exit();return typeof t=="function"?(n=t(n),n&&(n=n.selection())):n=n.append(t+""),e!=null&&(i=e(i),i&&(i=i.selection())),r==null?a.remove():r(a),n&&i?n.merge(i).order():i}var yV=M(()=>{"use strict";o(B7,"default")});function F7(t){for(var e=t.selection?t.selection():t,r=this._groups,n=e._groups,i=r.length,a=n.length,s=Math.min(i,a),l=new Array(i),u=0;u<s;++u)for(var h=r[u],f=n[u],d=h.length,p=l[u]=new Array(d),m,g=0;g<d;++g)(m=h[g]||f[g])&&(p[g]=m);for(;u<i;++u)l[u]=r[u];return new ii(l,this._parents)}var vV=M(()=>{"use strict";ml();o(F7,"default")});function z7(){for(var t=this._groups,e=-1,r=t.length;++e<r;)for(var n=t[e],i=n.length-1,a=n[i],s;--i>=0;)(s=n[i])&&(a&&s.compareDocumentPosition(a)^4&&a.parentNode.insertBefore(s,a),a=s);return this}var xV=M(()=>{"use strict";o(z7,"default")});function G7(t){t||(t=G5e);function e(d,p){return d&&p?t(d.__data__,p.__data__):!d-!p}o(e,"compareNode");for(var r=this._groups,n=r.length,i=new Array(n),a=0;a<n;++a){for(var s=r[a],l=s.length,u=i[a]=new Array(l),h,f=0;f<l;++f)(h=s[f])&&(u[f]=h);u.sort(e)}return new ii(i,this._parents).order()}function G5e(t,e){return t<e?-1:t>e?1:t>=e?0:NaN}var bV=M(()=>{"use strict";ml();o(G7,"default");o(G5e,"ascending")});function $7(){var t=arguments[0];return arguments[0]=this,t.apply(null,arguments),this}var wV=M(()=>{"use strict";o($7,"default")});function V7(){return Array.from(this)}var TV=M(()=>{"use strict";o(V7,"default")});function U7(){for(var t=this._groups,e=0,r=t.length;e<r;++e)for(var n=t[e],i=0,a=n.length;i<a;++i){var s=n[i];if(s)return s}return null}var kV=M(()=>{"use strict";o(U7,"default")});function H7(){let t=0;for(let e of this)++t;return t}var EV=M(()=>{"use strict";o(H7,"default")});function W7(){return!this.node()}var SV=M(()=>{"use strict";o(W7,"default")});function Y7(t){for(var e=this._groups,r=0,n=e.length;r<n;++r)for(var i=e[r],a=0,s=i.length,l;a<s;++a)(l=i[a])&&t.call(l,l.__data__,a,i);return this}var CV=M(()=>{"use strict";o(Y7,"default")});function $5e(t){return function(){this.removeAttribute(t)}}function V5e(t){return function(){this.removeAttributeNS(t.space,t.local)}}function U5e(t,e){return function(){this.setAttribute(t,e)}}function H5e(t,e){return function(){this.setAttributeNS(t.space,t.local,e)}}function W5e(t,e){return function(){var r=e.apply(this,arguments);r==null?this.removeAttribute(t):this.setAttribute(t,r)}}function Y5e(t,e){return function(){var r=e.apply(this,arguments);r==null?this.removeAttributeNS(t.space,t.local):this.setAttributeNS(t.space,t.local,r)}}function q7(t,e){var r=ic(t);if(arguments.length<2){var n=this.node();return r.local?n.getAttributeNS(r.space,r.local):n.getAttribute(r)}return this.each((e==null?r.local?V5e:$5e:typeof e=="function"?r.local?Y5e:W5e:r.local?H5e:U5e)(r,e))}var AV=M(()=>{"use strict";B4();o($5e,"attrRemove");o(V5e,"attrRemoveNS");o(U5e,"attrConstant");o(H5e,"attrConstantNS");o(W5e,"attrFunction");o(Y5e,"attrFunctionNS");o(q7,"default")});function dy(t){return t.ownerDocument&&t.ownerDocument.defaultView||t.document&&t||t.defaultView}var X7=M(()=>{"use strict";o(dy,"default")});function q5e(t){return function(){this.style.removeProperty(t)}}function X5e(t,e,r){return function(){this.style.setProperty(t,e,r)}}function j5e(t,e,r){return function(){var n=e.apply(this,arguments);n==null?this.style.removeProperty(t):this.style.setProperty(t,n,r)}}function j7(t,e,r){return arguments.length>1?this.each((e==null?q5e:typeof e=="function"?j5e:X5e)(t,e,r??"")):gh(this.node(),t)}function gh(t,e){return t.style.getPropertyValue(e)||dy(t).getComputedStyle(t,null).getPropertyValue(e)}var K7=M(()=>{"use strict";X7();o(q5e,"styleRemove");o(X5e,"styleConstant");o(j5e,"styleFunction");o(j7,"default");o(gh,"styleValue")});function K5e(t){return function(){delete this[t]}}function Q5e(t,e){return function(){this[t]=e}}function Z5e(t,e){return function(){var r=e.apply(this,arguments);r==null?delete this[t]:this[t]=r}}function Q7(t,e){return arguments.length>1?this.each((e==null?K5e:typeof e=="function"?Z5e:Q5e)(t,e)):this.node()[t]}var _V=M(()=>{"use strict";o(K5e,"propertyRemove");o(Q5e,"propertyConstant");o(Z5e,"propertyFunction");o(Q7,"default")});function LV(t){return t.trim().split(/^|\s+/)}function Z7(t){return t.classList||new DV(t)}function DV(t){this._node=t,this._names=LV(t.getAttribute("class")||"")}function NV(t,e){for(var r=Z7(t),n=-1,i=e.length;++n<i;)r.add(e[n])}function RV(t,e){for(var r=Z7(t),n=-1,i=e.length;++n<i;)r.remove(e[n])}function J5e(t){return function(){NV(this,t)}}function ewe(t){return function(){RV(this,t)}}function twe(t,e){return function(){(e.apply(this,arguments)?NV:RV)(this,t)}}function J7(t,e){var r=LV(t+"");if(arguments.length<2){for(var n=Z7(this.node()),i=-1,a=r.length;++i<a;)if(!n.contains(r[i]))return!1;return!0}return this.each((typeof e=="function"?twe:e?J5e:ewe)(r,e))}var MV=M(()=>{"use strict";o(LV,"classArray");o(Z7,"classList");o(DV,"ClassList");DV.prototype={add:o(function(t){var e=this._names.indexOf(t);e<0&&(this._names.push(t),this._node.setAttribute("class",this._names.join(" ")))},"add"),remove:o(function(t){var e=this._names.indexOf(t);e>=0&&(this._names.splice(e,1),this._node.setAttribute("class",this._names.join(" ")))},"remove"),contains:o(function(t){return this._names.indexOf(t)>=0},"contains")};o(NV,"classedAdd");o(RV,"classedRemove");o(J5e,"classedTrue");o(ewe,"classedFalse");o(twe,"classedFunction");o(J7,"default")});function rwe(){this.textContent=""}function nwe(t){return function(){this.textContent=t}}function iwe(t){return function(){var e=t.apply(this,arguments);this.textContent=e??""}}function eA(t){return arguments.length?this.each(t==null?rwe:(typeof t=="function"?iwe:nwe)(t)):this.node().textContent}var IV=M(()=>{"use strict";o(rwe,"textRemove");o(nwe,"textConstant");o(iwe,"textFunction");o(eA,"default")});function awe(){this.innerHTML=""}function swe(t){return function(){this.innerHTML=t}}function owe(t){return function(){var e=t.apply(this,arguments);this.innerHTML=e??""}}function tA(t){return arguments.length?this.each(t==null?awe:(typeof t=="function"?owe:swe)(t)):this.node().innerHTML}var OV=M(()=>{"use strict";o(awe,"htmlRemove");o(swe,"htmlConstant");o(owe,"htmlFunction");o(tA,"default")});function lwe(){this.nextSibling&&this.parentNode.appendChild(this)}function rA(){return this.each(lwe)}var PV=M(()=>{"use strict";o(lwe,"raise");o(rA,"default")});function cwe(){this.previousSibling&&this.parentNode.insertBefore(this,this.parentNode.firstChild)}function nA(){return this.each(cwe)}var BV=M(()=>{"use strict";o(cwe,"lower");o(nA,"default")});function iA(t){var e=typeof t=="function"?t:cy(t);return this.select(function(){return this.appendChild(e.apply(this,arguments))})}var FV=M(()=>{"use strict";k7();o(iA,"default")});function uwe(){return null}function aA(t,e){var r=typeof t=="function"?t:cy(t),n=e==null?uwe:typeof e=="function"?e:mh(e);return this.select(function(){return this.insertBefore(r.apply(this,arguments),n.apply(this,arguments)||null)})}var zV=M(()=>{"use strict";k7();F4();o(uwe,"constantNull");o(aA,"default")});function hwe(){var t=this.parentNode;t&&t.removeChild(this)}function sA(){return this.each(hwe)}var GV=M(()=>{"use strict";o(hwe,"remove");o(sA,"default")});function fwe(){var t=this.cloneNode(!1),e=this.parentNode;return e?e.insertBefore(t,this.nextSibling):t}function dwe(){var t=this.cloneNode(!0),e=this.parentNode;return e?e.insertBefore(t,this.nextSibling):t}function oA(t){return this.select(t?dwe:fwe)}var $V=M(()=>{"use strict";o(fwe,"selection_cloneShallow");o(dwe,"selection_cloneDeep");o(oA,"default")});function lA(t){return arguments.length?this.property("__data__",t):this.node().__data__}var VV=M(()=>{"use strict";o(lA,"default")});function pwe(t){return function(e){t.call(this,e,this.__data__)}}function mwe(t){return t.trim().split(/^|\s+/).map(function(e){var r="",n=e.indexOf(".");return n>=0&&(r=e.slice(n+1),e=e.slice(0,n)),{type:e,name:r}})}function gwe(t){return function(){var e=this.__on;if(e){for(var r=0,n=-1,i=e.length,a;r<i;++r)a=e[r],(!t.type||a.type===t.type)&&a.name===t.name?this.removeEventListener(a.type,a.listener,a.options):e[++n]=a;++n?e.length=n:delete this.__on}}}function ywe(t,e,r){return function(){var n=this.__on,i,a=pwe(e);if(n){for(var s=0,l=n.length;s<l;++s)if((i=n[s]).type===t.type&&i.name===t.name){this.removeEventListener(i.type,i.listener,i.options),this.addEventListener(i.type,i.listener=a,i.options=r),i.value=e;return}}this.addEventListener(t.type,a,r),i={type:t.type,name:t.name,value:e,listener:a,options:r},n?n.push(i):this.__on=[i]}}function cA(t,e,r){var n=mwe(t+""),i,a=n.length,s;if(arguments.length<2){var l=this.node().__on;if(l){for(var u=0,h=l.length,f;u<h;++u)for(i=0,f=l[u];i<a;++i)if((s=n[i]).type===f.type&&s.name===f.name)return f.value}return}for(l=e?ywe:gwe,i=0;i<a;++i)this.each(l(n[i],e,r));return this}var UV=M(()=>{"use strict";o(pwe,"contextListener");o(mwe,"parseTypenames");o(gwe,"onRemove");o(ywe,"onAdd");o(cA,"default")});function HV(t,e,r){var n=dy(t),i=n.CustomEvent;typeof i=="function"?i=new i(e,r):(i=n.document.createEvent("Event"),r?(i.initEvent(e,r.bubbles,r.cancelable),i.detail=r.detail):i.initEvent(e,!1,!1)),t.dispatchEvent(i)}function vwe(t,e){return function(){return HV(this,t,e)}}function xwe(t,e){return function(){return HV(this,t,e.apply(this,arguments))}}function uA(t,e){return this.each((typeof e=="function"?xwe:vwe)(t,e))}var WV=M(()=>{"use strict";X7();o(HV,"dispatchEvent");o(vwe,"dispatchConstant");o(xwe,"dispatchFunction");o(uA,"default")});function*hA(){for(var t=this._groups,e=0,r=t.length;e<r;++e)for(var n=t[e],i=0,a=n.length,s;i<a;++i)(s=n[i])&&(yield s)}var YV=M(()=>{"use strict";o(hA,"default")});function ii(t,e){this._groups=t,this._parents=e}function qV(){return new ii([[document.documentElement]],fA)}function bwe(){return this}var fA,lu,ml=M(()=>{"use strict";lV();uV();hV();fV();dV();mV();M7();gV();yV();vV();xV();bV();wV();TV();kV();EV();SV();CV();AV();K7();_V();MV();IV();OV();PV();BV();FV();zV();GV();$V();VV();UV();WV();YV();fA=[null];o(ii,"Selection");o(qV,"selection");o(bwe,"selection_selection");ii.prototype=qV.prototype={constructor:ii,select:E7,selectAll:A7,selectChild:_7,selectChildren:L7,filter:D7,data:O7,enter:R7,exit:P7,join:B7,merge:F7,selection:bwe,order:z7,sort:G7,call:$7,nodes:V7,node:U7,size:H7,empty:W7,each:Y7,attr:q7,style:j7,property:Q7,classed:J7,text:eA,html:tA,raise:rA,lower:nA,append:iA,insert:aA,remove:sA,clone:oA,datum:lA,on:cA,dispatch:uA,[Symbol.iterator]:hA};lu=qV});function ze(t){return typeof t=="string"?new ii([[document.querySelector(t)]],[document.documentElement]):new ii([[t]],fA)}var XV=M(()=>{"use strict";ml();o(ze,"default")});var gl=M(()=>{"use strict";uy();B4();XV();ml();F4();C7();K7()});var jV=M(()=>{"use strict"});function yh(t,e,r){t.prototype=e.prototype=r,r.constructor=t}function xp(t,e){var r=Object.create(t.prototype);for(var n in e)r[n]=e[n];return r}var dA=M(()=>{"use strict";o(yh,"default");o(xp,"extend")});function vh(){}function QV(){return this.rgb().formatHex()}function _we(){return this.rgb().formatHex8()}function Lwe(){return iU(this).formatHsl()}function ZV(){return this.rgb().formatRgb()}function vl(t){var e,r;return t=(t+"").trim().toLowerCase(),(e=wwe.exec(t))?(r=e[1].length,e=parseInt(e[1],16),r===6?JV(e):r===3?new sa(e>>8&15|e>>4&240,e>>4&15|e&240,(e&15)<<4|e&15,1):r===8?G4(e>>24&255,e>>16&255,e>>8&255,(e&255)/255):r===4?G4(e>>12&15|e>>8&240,e>>8&15|e>>4&240,e>>4&15|e&240,((e&15)<<4|e&15)/255):null):(e=Twe.exec(t))?new sa(e[1],e[2],e[3],1):(e=kwe.exec(t))?new sa(e[1]*255/100,e[2]*255/100,e[3]*255/100,1):(e=Ewe.exec(t))?G4(e[1],e[2],e[3],e[4]):(e=Swe.exec(t))?G4(e[1]*255/100,e[2]*255/100,e[3]*255/100,e[4]):(e=Cwe.exec(t))?rU(e[1],e[2]/100,e[3]/100,1):(e=Awe.exec(t))?rU(e[1],e[2]/100,e[3]/100,e[4]):KV.hasOwnProperty(t)?JV(KV[t]):t==="transparent"?new sa(NaN,NaN,NaN,0):null}function JV(t){return new sa(t>>16&255,t>>8&255,t&255,1)}function G4(t,e,r,n){return n<=0&&(t=e=r=NaN),new sa(t,e,r,n)}function mA(t){return t instanceof vh||(t=vl(t)),t?(t=t.rgb(),new sa(t.r,t.g,t.b,t.opacity)):new sa}function wp(t,e,r,n){return arguments.length===1?mA(t):new sa(t,e,r,n??1)}function sa(t,e,r,n){this.r=+t,this.g=+e,this.b=+r,this.opacity=+n}function eU(){return`#${ed(this.r)}${ed(this.g)}${ed(this.b)}`}function Dwe(){return`#${ed(this.r)}${ed(this.g)}${ed(this.b)}${ed((isNaN(this.opacity)?1:this.opacity)*255)}`}function tU(){let t=U4(this.opacity);return`${t===1?"rgb(":"rgba("}${td(this.r)}, ${td(this.g)}, ${td(this.b)}${t===1?")":`, ${t})`}`}function U4(t){return isNaN(t)?1:Math.max(0,Math.min(1,t))}function td(t){return Math.max(0,Math.min(255,Math.round(t)||0))}function ed(t){return t=td(t),(t<16?"0":"")+t.toString(16)}function rU(t,e,r,n){return n<=0?t=e=r=NaN:r<=0||r>=1?t=e=NaN:e<=0&&(t=NaN),new yl(t,e,r,n)}function iU(t){if(t instanceof yl)return new yl(t.h,t.s,t.l,t.opacity);if(t instanceof vh||(t=vl(t)),!t)return new yl;if(t instanceof yl)return t;t=t.rgb();var e=t.r/255,r=t.g/255,n=t.b/255,i=Math.min(e,r,n),a=Math.max(e,r,n),s=NaN,l=a-i,u=(a+i)/2;return l?(e===a?s=(r-n)/l+(r<n)*6:r===a?s=(n-e)/l+2:s=(e-r)/l+4,l/=u<.5?a+i:2-a-i,s*=60):l=u>0&&u<1?0:s,new yl(s,l,u,t.opacity)}function aU(t,e,r,n){return arguments.length===1?iU(t):new yl(t,e,r,n??1)}function yl(t,e,r,n){this.h=+t,this.s=+e,this.l=+r,this.opacity=+n}function nU(t){return t=(t||0)%360,t<0?t+360:t}function $4(t){return Math.max(0,Math.min(1,t||0))}function pA(t,e,r){return(t<60?e+(r-e)*t/60:t<180?r:t<240?e+(r-e)*(240-t)/60:e)*255}var py,V4,bp,my,ac,wwe,Twe,kwe,Ewe,Swe,Cwe,Awe,KV,gA=M(()=>{"use strict";dA();o(vh,"Color");py=.7,V4=1/py,bp="\\s*([+-]?\\d+)\\s*",my="\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)\\s*",ac="\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)%\\s*",wwe=/^#([0-9a-f]{3,8})$/,Twe=new RegExp(`^rgb\\(${bp},${bp},${bp}\\)$`),kwe=new RegExp(`^rgb\\(${ac},${ac},${ac}\\)$`),Ewe=new RegExp(`^rgba\\(${bp},${bp},${bp},${my}\\)$`),Swe=new RegExp(`^rgba\\(${ac},${ac},${ac},${my}\\)$`),Cwe=new RegExp(`^hsl\\(${my},${ac},${ac}\\)$`),Awe=new RegExp(`^hsla\\(${my},${ac},${ac},${my}\\)$`),KV={aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074};yh(vh,vl,{copy(t){return Object.assign(new this.constructor,this,t)},displayable(){return this.rgb().displayable()},hex:QV,formatHex:QV,formatHex8:_we,formatHsl:Lwe,formatRgb:ZV,toString:ZV});o(QV,"color_formatHex");o(_we,"color_formatHex8");o(Lwe,"color_formatHsl");o(ZV,"color_formatRgb");o(vl,"color");o(JV,"rgbn");o(G4,"rgba");o(mA,"rgbConvert");o(wp,"rgb");o(sa,"Rgb");yh(sa,wp,xp(vh,{brighter(t){return t=t==null?V4:Math.pow(V4,t),new sa(this.r*t,this.g*t,this.b*t,this.opacity)},darker(t){return t=t==null?py:Math.pow(py,t),new sa(this.r*t,this.g*t,this.b*t,this.opacity)},rgb(){return this},clamp(){return new sa(td(this.r),td(this.g),td(this.b),U4(this.opacity))},displayable(){return-.5<=this.r&&this.r<255.5&&-.5<=this.g&&this.g<255.5&&-.5<=this.b&&this.b<255.5&&0<=this.opacity&&this.opacity<=1},hex:eU,formatHex:eU,formatHex8:Dwe,formatRgb:tU,toString:tU}));o(eU,"rgb_formatHex");o(Dwe,"rgb_formatHex8");o(tU,"rgb_formatRgb");o(U4,"clampa");o(td,"clampi");o(ed,"hex");o(rU,"hsla");o(iU,"hslConvert");o(aU,"hsl");o(yl,"Hsl");yh(yl,aU,xp(vh,{brighter(t){return t=t==null?V4:Math.pow(V4,t),new yl(this.h,this.s,this.l*t,this.opacity)},darker(t){return t=t==null?py:Math.pow(py,t),new yl(this.h,this.s,this.l*t,this.opacity)},rgb(){var t=this.h%360+(this.h<0)*360,e=isNaN(t)||isNaN(this.s)?0:this.s,r=this.l,n=r+(r<.5?r:1-r)*e,i=2*r-n;return new sa(pA(t>=240?t-240:t+120,i,n),pA(t,i,n),pA(t<120?t+240:t-120,i,n),this.opacity)},clamp(){return new yl(nU(this.h),$4(this.s),$4(this.l),U4(this.opacity))},displayable(){return(0<=this.s&&this.s<=1||isNaN(this.s))&&0<=this.l&&this.l<=1&&0<=this.opacity&&this.opacity<=1},formatHsl(){let t=U4(this.opacity);return`${t===1?"hsl(":"hsla("}${nU(this.h)}, ${$4(this.s)*100}%, ${$4(this.l)*100}%${t===1?")":`, ${t})`}`}}));o(nU,"clamph");o($4,"clampt");o(pA,"hsl2rgb")});var sU,oU,lU=M(()=>{"use strict";sU=Math.PI/180,oU=180/Math.PI});function pU(t){if(t instanceof sc)return new sc(t.l,t.a,t.b,t.opacity);if(t instanceof cu)return mU(t);t instanceof sa||(t=mA(t));var e=bA(t.r),r=bA(t.g),n=bA(t.b),i=yA((.2225045*e+.7168786*r+.0606169*n)/uU),a,s;return e===r&&r===n?a=s=i:(a=yA((.4360747*e+.3850649*r+.1430804*n)/cU),s=yA((.0139322*e+.0971045*r+.7141733*n)/hU)),new sc(116*i-16,500*(a-i),200*(i-s),t.opacity)}function wA(t,e,r,n){return arguments.length===1?pU(t):new sc(t,e,r,n??1)}function sc(t,e,r,n){this.l=+t,this.a=+e,this.b=+r,this.opacity=+n}function yA(t){return t>Nwe?Math.pow(t,1/3):t/dU+fU}function vA(t){return t>Tp?t*t*t:dU*(t-fU)}function xA(t){return 255*(t<=.0031308?12.92*t:1.055*Math.pow(t,1/2.4)-.055)}function bA(t){return(t/=255)<=.04045?t/12.92:Math.pow((t+.055)/1.055,2.4)}function Rwe(t){if(t instanceof cu)return new cu(t.h,t.c,t.l,t.opacity);if(t instanceof sc||(t=pU(t)),t.a===0&&t.b===0)return new cu(NaN,0<t.l&&t.l<100?0:NaN,t.l,t.opacity);var e=Math.atan2(t.b,t.a)*oU;return new cu(e<0?e+360:e,Math.sqrt(t.a*t.a+t.b*t.b),t.l,t.opacity)}function gy(t,e,r,n){return arguments.length===1?Rwe(t):new cu(t,e,r,n??1)}function cu(t,e,r,n){this.h=+t,this.c=+e,this.l=+r,this.opacity=+n}function mU(t){if(isNaN(t.h))return new sc(t.l,0,0,t.opacity);var e=t.h*sU;return new sc(t.l,Math.cos(e)*t.c,Math.sin(e)*t.c,t.opacity)}var H4,cU,uU,hU,fU,Tp,dU,Nwe,gU=M(()=>{"use strict";dA();gA();lU();H4=18,cU=.96422,uU=1,hU=.82521,fU=4/29,Tp=6/29,dU=3*Tp*Tp,Nwe=Tp*Tp*Tp;o(pU,"labConvert");o(wA,"lab");o(sc,"Lab");yh(sc,wA,xp(vh,{brighter(t){return new sc(this.l+H4*(t??1),this.a,this.b,this.opacity)},darker(t){return new sc(this.l-H4*(t??1),this.a,this.b,this.opacity)},rgb(){var t=(this.l+16)/116,e=isNaN(this.a)?t:t+this.a/500,r=isNaN(this.b)?t:t-this.b/200;return e=cU*vA(e),t=uU*vA(t),r=hU*vA(r),new sa(xA(3.1338561*e-1.6168667*t-.4906146*r),xA(-.9787684*e+1.9161415*t+.033454*r),xA(.0719453*e-.2289914*t+1.4052427*r),this.opacity)}}));o(yA,"xyz2lab");o(vA,"lab2xyz");o(xA,"lrgb2rgb");o(bA,"rgb2lrgb");o(Rwe,"hclConvert");o(gy,"hcl");o(cu,"Hcl");o(mU,"hcl2lab");yh(cu,gy,xp(vh,{brighter(t){return new cu(this.h,this.c,this.l+H4*(t??1),this.opacity)},darker(t){return new cu(this.h,this.c,this.l-H4*(t??1),this.opacity)},rgb(){return mU(this).rgb()}}))});var kp=M(()=>{"use strict";gA();gU()});function TA(t,e,r,n,i){var a=t*t,s=a*t;return((1-3*t+3*a-s)*e+(4-6*a+3*s)*r+(1+3*t+3*a-3*s)*n+s*i)/6}function kA(t){var e=t.length-1;return function(r){var n=r<=0?r=0:r>=1?(r=1,e-1):Math.floor(r*e),i=t[n],a=t[n+1],s=n>0?t[n-1]:2*i-a,l=n<e-1?t[n+2]:2*a-i;return TA((r-n/e)*e,s,i,a,l)}}var EA=M(()=>{"use strict";o(TA,"basis");o(kA,"default")});function SA(t){var e=t.length;return function(r){var n=Math.floor(((r%=1)<0?++r:r)*e),i=t[(n+e-1)%e],a=t[n%e],s=t[(n+1)%e],l=t[(n+2)%e];return TA((r-n/e)*e,i,a,s,l)}}var yU=M(()=>{"use strict";EA();o(SA,"default")});var Ep,CA=M(()=>{"use strict";Ep=o(t=>()=>t,"default")});function vU(t,e){return function(r){return t+r*e}}function Mwe(t,e,r){return t=Math.pow(t,r),e=Math.pow(e,r)-t,r=1/r,function(n){return Math.pow(t+n*e,r)}}function xU(t,e){var r=e-t;return r?vU(t,r>180||r<-180?r-360*Math.round(r/360):r):Ep(isNaN(t)?e:t)}function bU(t){return(t=+t)==1?uu:function(e,r){return r-e?Mwe(e,r,t):Ep(isNaN(e)?r:e)}}function uu(t,e){var r=e-t;return r?vU(t,r):Ep(isNaN(t)?e:t)}var AA=M(()=>{"use strict";CA();o(vU,"linear");o(Mwe,"exponential");o(xU,"hue");o(bU,"gamma");o(uu,"nogamma")});function wU(t){return function(e){var r=e.length,n=new Array(r),i=new Array(r),a=new Array(r),s,l;for(s=0;s<r;++s)l=wp(e[s]),n[s]=l.r||0,i[s]=l.g||0,a[s]=l.b||0;return n=t(n),i=t(i),a=t(a),l.opacity=1,function(u){return l.r=n(u),l.g=i(u),l.b=a(u),l+""}}}var rd,Iwe,Owe,_A=M(()=>{"use strict";kp();EA();yU();AA();rd=o(function t(e){var r=bU(e);function n(i,a){var s=r((i=wp(i)).r,(a=wp(a)).r),l=r(i.g,a.g),u=r(i.b,a.b),h=uu(i.opacity,a.opacity);return function(f){return i.r=s(f),i.g=l(f),i.b=u(f),i.opacity=h(f),i+""}}return o(n,"rgb"),n.gamma=t,n},"rgbGamma")(1);o(wU,"rgbSpline");Iwe=wU(kA),Owe=wU(SA)});function LA(t,e){e||(e=[]);var r=t?Math.min(e.length,t.length):0,n=e.slice(),i;return function(a){for(i=0;i<r;++i)n[i]=t[i]*(1-a)+e[i]*a;return n}}function TU(t){return ArrayBuffer.isView(t)&&!(t instanceof DataView)}var kU=M(()=>{"use strict";o(LA,"default");o(TU,"isNumberArray")});function EU(t,e){var r=e?e.length:0,n=t?Math.min(r,t.length):0,i=new Array(n),a=new Array(r),s;for(s=0;s<n;++s)i[s]=xh(t[s],e[s]);for(;s<r;++s)a[s]=e[s];return function(l){for(s=0;s<n;++s)a[s]=i[s](l);return a}}var SU=M(()=>{"use strict";W4();o(EU,"genericArray")});function DA(t,e){var r=new Date;return t=+t,e=+e,function(n){return r.setTime(t*(1-n)+e*n),r}}var CU=M(()=>{"use strict";o(DA,"default")});function Ki(t,e){return t=+t,e=+e,function(r){return t*(1-r)+e*r}}var yy=M(()=>{"use strict";o(Ki,"default")});function NA(t,e){var r={},n={},i;(t===null||typeof t!="object")&&(t={}),(e===null||typeof e!="object")&&(e={});for(i in e)i in t?r[i]=xh(t[i],e[i]):n[i]=e[i];return function(a){for(i in r)n[i]=r[i](a);return n}}var AU=M(()=>{"use strict";W4();o(NA,"default")});function Pwe(t){return function(){return t}}function Bwe(t){return function(e){return t(e)+""}}function Sp(t,e){var r=MA.lastIndex=RA.lastIndex=0,n,i,a,s=-1,l=[],u=[];for(t=t+"",e=e+"";(n=MA.exec(t))&&(i=RA.exec(e));)(a=i.index)>r&&(a=e.slice(r,a),l[s]?l[s]+=a:l[++s]=a),(n=n[0])===(i=i[0])?l[s]?l[s]+=i:l[++s]=i:(l[++s]=null,u.push({i:s,x:Ki(n,i)})),r=RA.lastIndex;return r<e.length&&(a=e.slice(r),l[s]?l[s]+=a:l[++s]=a),l.length<2?u[0]?Bwe(u[0].x):Pwe(e):(e=u.length,function(h){for(var f=0,d;f<e;++f)l[(d=u[f]).i]=d.x(h);return l.join("")})}var MA,RA,IA=M(()=>{"use strict";yy();MA=/[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,RA=new RegExp(MA.source,"g");o(Pwe,"zero");o(Bwe,"one");o(Sp,"default")});function xh(t,e){var r=typeof e,n;return e==null||r==="boolean"?Ep(e):(r==="number"?Ki:r==="string"?(n=vl(e))?(e=n,rd):Sp:e instanceof vl?rd:e instanceof Date?DA:TU(e)?LA:Array.isArray(e)?EU:typeof e.valueOf!="function"&&typeof e.toString!="function"||isNaN(e)?NA:Ki)(t,e)}var W4=M(()=>{"use strict";kp();_A();SU();CU();yy();AU();IA();CA();kU();o(xh,"default")});function Y4(t,e){return t=+t,e=+e,function(r){return Math.round(t*(1-r)+e*r)}}var _U=M(()=>{"use strict";o(Y4,"default")});function X4(t,e,r,n,i,a){var s,l,u;return(s=Math.sqrt(t*t+e*e))&&(t/=s,e/=s),(u=t*r+e*n)&&(r-=t*u,n-=e*u),(l=Math.sqrt(r*r+n*n))&&(r/=l,n/=l,u/=l),t*n<e*r&&(t=-t,e=-e,u=-u,s=-s),{translateX:i,translateY:a,rotate:Math.atan2(e,t)*LU,skewX:Math.atan(u)*LU,scaleX:s,scaleY:l}}var LU,q4,DU=M(()=>{"use strict";LU=180/Math.PI,q4={translateX:0,translateY:0,rotate:0,skewX:0,scaleX:1,scaleY:1};o(X4,"default")});function NU(t){let e=new(typeof DOMMatrix=="function"?DOMMatrix:WebKitCSSMatrix)(t+"");return e.isIdentity?q4:X4(e.a,e.b,e.c,e.d,e.e,e.f)}function RU(t){return t==null?q4:(j4||(j4=document.createElementNS("http://www.w3.org/2000/svg","g")),j4.setAttribute("transform",t),(t=j4.transform.baseVal.consolidate())?(t=t.matrix,X4(t.a,t.b,t.c,t.d,t.e,t.f)):q4)}var j4,MU=M(()=>{"use strict";DU();o(NU,"parseCss");o(RU,"parseSvg")});function IU(t,e,r,n){function i(h){return h.length?h.pop()+" ":""}o(i,"pop");function a(h,f,d,p,m,g){if(h!==d||f!==p){var y=m.push("translate(",null,e,null,r);g.push({i:y-4,x:Ki(h,d)},{i:y-2,x:Ki(f,p)})}else(d||p)&&m.push("translate("+d+e+p+r)}o(a,"translate");function s(h,f,d,p){h!==f?(h-f>180?f+=360:f-h>180&&(h+=360),p.push({i:d.push(i(d)+"rotate(",null,n)-2,x:Ki(h,f)})):f&&d.push(i(d)+"rotate("+f+n)}o(s,"rotate");function l(h,f,d,p){h!==f?p.push({i:d.push(i(d)+"skewX(",null,n)-2,x:Ki(h,f)}):f&&d.push(i(d)+"skewX("+f+n)}o(l,"skewX");function u(h,f,d,p,m,g){if(h!==d||f!==p){var y=m.push(i(m)+"scale(",null,",",null,")");g.push({i:y-4,x:Ki(h,d)},{i:y-2,x:Ki(f,p)})}else(d!==1||p!==1)&&m.push(i(m)+"scale("+d+","+p+")")}return o(u,"scale"),function(h,f){var d=[],p=[];return h=t(h),f=t(f),a(h.translateX,h.translateY,f.translateX,f.translateY,d,p),s(h.rotate,f.rotate,d,p),l(h.skewX,f.skewX,d,p),u(h.scaleX,h.scaleY,f.scaleX,f.scaleY,d,p),h=f=null,function(m){for(var g=-1,y=p.length,v;++g<y;)d[(v=p[g]).i]=v.x(m);return d.join("")}}}var OA,PA,OU=M(()=>{"use strict";yy();MU();o(IU,"interpolateTransform");OA=IU(NU,"px, ","px)","deg)"),PA=IU(RU,", ",")",")")});function PU(t){return function(e,r){var n=t((e=gy(e)).h,(r=gy(r)).h),i=uu(e.c,r.c),a=uu(e.l,r.l),s=uu(e.opacity,r.opacity);return function(l){return e.h=n(l),e.c=i(l),e.l=a(l),e.opacity=s(l),e+""}}}var BA,Fwe,BU=M(()=>{"use strict";kp();AA();o(PU,"hcl");BA=PU(xU),Fwe=PU(uu)});var Cp=M(()=>{"use strict";W4();yy();_U();IA();OU();_A();BU()});function ky(){return nd||(GU(zwe),nd=wy.now()+Z4)}function zwe(){nd=0}function Ty(){this._call=this._time=this._next=null}function J4(t,e,r){var n=new Ty;return n.restart(t,e,r),n}function $U(){ky(),++Ap;for(var t=K4,e;t;)(e=nd-t._time)>=0&&t._call.call(void 0,e),t=t._next;--Ap}function FU(){nd=(Q4=wy.now())+Z4,Ap=xy=0;try{$U()}finally{Ap=0,$we(),nd=0}}function Gwe(){var t=wy.now(),e=t-Q4;e>zU&&(Z4-=e,Q4=t)}function $we(){for(var t,e=K4,r,n=1/0;e;)e._call?(n>e._time&&(n=e._time),t=e,e=e._next):(r=e._next,e._next=null,e=t?t._next=r:K4=r);by=t,FA(n)}function FA(t){if(!Ap){xy&&(xy=clearTimeout(xy));var e=t-nd;e>24?(t<1/0&&(xy=setTimeout(FU,t-wy.now()-Z4)),vy&&(vy=clearInterval(vy))):(vy||(Q4=wy.now(),vy=setInterval(Gwe,zU)),Ap=1,GU(FU))}}var Ap,xy,vy,zU,K4,by,Q4,nd,Z4,wy,GU,zA=M(()=>{"use strict";Ap=0,xy=0,vy=0,zU=1e3,Q4=0,nd=0,Z4=0,wy=typeof performance=="object"&&performance.now?performance:Date,GU=typeof window=="object"&&window.requestAnimationFrame?window.requestAnimationFrame.bind(window):function(t){setTimeout(t,17)};o(ky,"now");o(zwe,"clearNow");o(Ty,"Timer");Ty.prototype=J4.prototype={constructor:Ty,restart:o(function(t,e,r){if(typeof t!="function")throw new TypeError("callback is not a function");r=(r==null?ky():+r)+(e==null?0:+e),!this._next&&by!==this&&(by?by._next=this:K4=this,by=this),this._call=t,this._time=r,FA()},"restart"),stop:o(function(){this._call&&(this._call=null,this._time=1/0,FA())},"stop")};o(J4,"timer");o($U,"timerFlush");o(FU,"wake");o(Gwe,"poke");o($we,"nap");o(FA,"sleep")});function Ey(t,e,r){var n=new Ty;return e=e==null?0:+e,n.restart(i=>{n.stop(),t(i+e)},e,r),n}var VU=M(()=>{"use strict";zA();o(Ey,"default")});var e3=M(()=>{"use strict";zA();VU()});function hu(t,e,r,n,i,a){var s=t.__transition;if(!s)t.__transition={};else if(r in s)return;Hwe(t,r,{name:e,index:n,group:i,on:Vwe,tween:Uwe,time:a.time,delay:a.delay,duration:a.duration,ease:a.ease,timer:null,state:WU})}function Cy(t,e){var r=Oi(t,e);if(r.state>WU)throw new Error("too late; already scheduled");return r}function oa(t,e){var r=Oi(t,e);if(r.state>t3)throw new Error("too late; already running");return r}function Oi(t,e){var r=t.__transition;if(!r||!(r=r[e]))throw new Error("transition not found");return r}function Hwe(t,e,r){var n=t.__transition,i;n[e]=r,r.timer=J4(a,0,r.time);function a(h){r.state=UU,r.timer.restart(s,r.delay,r.time),r.delay<=h&&s(h-r.delay)}o(a,"schedule");function s(h){var f,d,p,m;if(r.state!==UU)return u();for(f in n)if(m=n[f],m.name===r.name){if(m.state===t3)return Ey(s);m.state===HU?(m.state=Sy,m.timer.stop(),m.on.call("interrupt",t,t.__data__,m.index,m.group),delete n[f]):+f<e&&(m.state=Sy,m.timer.stop(),m.on.call("cancel",t,t.__data__,m.index,m.group),delete n[f])}if(Ey(function(){r.state===t3&&(r.state=HU,r.timer.restart(l,r.delay,r.time),l(h))}),r.state=r3,r.on.call("start",t,t.__data__,r.index,r.group),r.state===r3){for(r.state=t3,i=new Array(p=r.tween.length),f=0,d=-1;f<p;++f)(m=r.tween[f].value.call(t,t.__data__,r.index,r.group))&&(i[++d]=m);i.length=d+1}}o(s,"start");function l(h){for(var f=h<r.duration?r.ease.call(null,h/r.duration):(r.timer.restart(u),r.state=n3,1),d=-1,p=i.length;++d<p;)i[d].call(t,f);r.state===n3&&(r.on.call("end",t,t.__data__,r.index,r.group),u())}o(l,"tick");function u(){r.state=Sy,r.timer.stop(),delete n[e];for(var h in n)return;delete t.__transition}o(u,"stop")}var Vwe,Uwe,WU,UU,r3,t3,HU,n3,Sy,ys=M(()=>{"use strict";b7();e3();Vwe=x7("start","end","cancel","interrupt"),Uwe=[],WU=0,UU=1,r3=2,t3=3,HU=4,n3=5,Sy=6;o(hu,"default");o(Cy,"init");o(oa,"set");o(Oi,"get");o(Hwe,"create")});function Ay(t,e){var r=t.__transition,n,i,a=!0,s;if(r){e=e==null?null:e+"";for(s in r){if((n=r[s]).name!==e){a=!1;continue}i=n.state>r3&&n.state<n3,n.state=Sy,n.timer.stop(),n.on.call(i?"interrupt":"cancel",t,t.__data__,n.index,n.group),delete r[s]}a&&delete t.__transition}}var YU=M(()=>{"use strict";ys();o(Ay,"default")});function GA(t){return this.each(function(){Ay(this,t)})}var qU=M(()=>{"use strict";YU();o(GA,"default")});function Wwe(t,e){var r,n;return function(){var i=oa(this,t),a=i.tween;if(a!==r){n=r=a;for(var s=0,l=n.length;s<l;++s)if(n[s].name===e){n=n.slice(),n.splice(s,1);break}}i.tween=n}}function Ywe(t,e,r){var n,i;if(typeof r!="function")throw new Error;return function(){var a=oa(this,t),s=a.tween;if(s!==n){i=(n=s).slice();for(var l={name:e,value:r},u=0,h=i.length;u<h;++u)if(i[u].name===e){i[u]=l;break}u===h&&i.push(l)}a.tween=i}}function $A(t,e){var r=this._id;if(t+="",arguments.length<2){for(var n=Oi(this.node(),r).tween,i=0,a=n.length,s;i<a;++i)if((s=n[i]).name===t)return s.value;return null}return this.each((e==null?Wwe:Ywe)(r,t,e))}function _p(t,e,r){var n=t._id;return t.each(function(){var i=oa(this,n);(i.value||(i.value={}))[e]=r.apply(this,arguments)}),function(i){return Oi(i,n).value[e]}}var _y=M(()=>{"use strict";ys();o(Wwe,"tweenRemove");o(Ywe,"tweenFunction");o($A,"default");o(_p,"tweenValue")});function Ly(t,e){var r;return(typeof e=="number"?Ki:e instanceof vl?rd:(r=vl(e))?(e=r,rd):Sp)(t,e)}var VA=M(()=>{"use strict";kp();Cp();o(Ly,"default")});function qwe(t){return function(){this.removeAttribute(t)}}function Xwe(t){return function(){this.removeAttributeNS(t.space,t.local)}}function jwe(t,e,r){var n,i=r+"",a;return function(){var s=this.getAttribute(t);return s===i?null:s===n?a:a=e(n=s,r)}}function Kwe(t,e,r){var n,i=r+"",a;return function(){var s=this.getAttributeNS(t.space,t.local);return s===i?null:s===n?a:a=e(n=s,r)}}function Qwe(t,e,r){var n,i,a;return function(){var s,l=r(this),u;return l==null?void this.removeAttribute(t):(s=this.getAttribute(t),u=l+"",s===u?null:s===n&&u===i?a:(i=u,a=e(n=s,l)))}}function Zwe(t,e,r){var n,i,a;return function(){var s,l=r(this),u;return l==null?void this.removeAttributeNS(t.space,t.local):(s=this.getAttributeNS(t.space,t.local),u=l+"",s===u?null:s===n&&u===i?a:(i=u,a=e(n=s,l)))}}function UA(t,e){var r=ic(t),n=r==="transform"?PA:Ly;return this.attrTween(t,typeof e=="function"?(r.local?Zwe:Qwe)(r,n,_p(this,"attr."+t,e)):e==null?(r.local?Xwe:qwe)(r):(r.local?Kwe:jwe)(r,n,e))}var XU=M(()=>{"use strict";Cp();gl();_y();VA();o(qwe,"attrRemove");o(Xwe,"attrRemoveNS");o(jwe,"attrConstant");o(Kwe,"attrConstantNS");o(Qwe,"attrFunction");o(Zwe,"attrFunctionNS");o(UA,"default")});function Jwe(t,e){return function(r){this.setAttribute(t,e.call(this,r))}}function eTe(t,e){return function(r){this.setAttributeNS(t.space,t.local,e.call(this,r))}}function tTe(t,e){var r,n;function i(){var a=e.apply(this,arguments);return a!==n&&(r=(n=a)&&eTe(t,a)),r}return o(i,"tween"),i._value=e,i}function rTe(t,e){var r,n;function i(){var a=e.apply(this,arguments);return a!==n&&(r=(n=a)&&Jwe(t,a)),r}return o(i,"tween"),i._value=e,i}function HA(t,e){var r="attr."+t;if(arguments.length<2)return(r=this.tween(r))&&r._value;if(e==null)return this.tween(r,null);if(typeof e!="function")throw new Error;var n=ic(t);return this.tween(r,(n.local?tTe:rTe)(n,e))}var jU=M(()=>{"use strict";gl();o(Jwe,"attrInterpolate");o(eTe,"attrInterpolateNS");o(tTe,"attrTweenNS");o(rTe,"attrTween");o(HA,"default")});function nTe(t,e){return function(){Cy(this,t).delay=+e.apply(this,arguments)}}function iTe(t,e){return e=+e,function(){Cy(this,t).delay=e}}function WA(t){var e=this._id;return arguments.length?this.each((typeof t=="function"?nTe:iTe)(e,t)):Oi(this.node(),e).delay}var KU=M(()=>{"use strict";ys();o(nTe,"delayFunction");o(iTe,"delayConstant");o(WA,"default")});function aTe(t,e){return function(){oa(this,t).duration=+e.apply(this,arguments)}}function sTe(t,e){return e=+e,function(){oa(this,t).duration=e}}function YA(t){var e=this._id;return arguments.length?this.each((typeof t=="function"?aTe:sTe)(e,t)):Oi(this.node(),e).duration}var QU=M(()=>{"use strict";ys();o(aTe,"durationFunction");o(sTe,"durationConstant");o(YA,"default")});function oTe(t,e){if(typeof e!="function")throw new Error;return function(){oa(this,t).ease=e}}function qA(t){var e=this._id;return arguments.length?this.each(oTe(e,t)):Oi(this.node(),e).ease}var ZU=M(()=>{"use strict";ys();o(oTe,"easeConstant");o(qA,"default")});function lTe(t,e){return function(){var r=e.apply(this,arguments);if(typeof r!="function")throw new Error;oa(this,t).ease=r}}function XA(t){if(typeof t!="function")throw new Error;return this.each(lTe(this._id,t))}var JU=M(()=>{"use strict";ys();o(lTe,"easeVarying");o(XA,"default")});function jA(t){typeof t!="function"&&(t=vp(t));for(var e=this._groups,r=e.length,n=new Array(r),i=0;i<r;++i)for(var a=e[i],s=a.length,l=n[i]=[],u,h=0;h<s;++h)(u=a[h])&&t.call(u,u.__data__,h,a)&&l.push(u);return new ja(n,this._parents,this._name,this._id)}var eH=M(()=>{"use strict";gl();id();o(jA,"default")});function KA(t){if(t._id!==this._id)throw new Error;for(var e=this._groups,r=t._groups,n=e.length,i=r.length,a=Math.min(n,i),s=new Array(n),l=0;l<a;++l)for(var u=e[l],h=r[l],f=u.length,d=s[l]=new Array(f),p,m=0;m<f;++m)(p=u[m]||h[m])&&(d[m]=p);for(;l<n;++l)s[l]=e[l];return new ja(s,this._parents,this._name,this._id)}var tH=M(()=>{"use strict";id();o(KA,"default")});function cTe(t){return(t+"").trim().split(/^|\s+/).every(function(e){var r=e.indexOf(".");return r>=0&&(e=e.slice(0,r)),!e||e==="start"})}function uTe(t,e,r){var n,i,a=cTe(e)?Cy:oa;return function(){var s=a(this,t),l=s.on;l!==n&&(i=(n=l).copy()).on(e,r),s.on=i}}function QA(t,e){var r=this._id;return arguments.length<2?Oi(this.node(),r).on.on(t):this.each(uTe(r,t,e))}var rH=M(()=>{"use strict";ys();o(cTe,"start");o(uTe,"onFunction");o(QA,"default")});function hTe(t){return function(){var e=this.parentNode;for(var r in this.__transition)if(+r!==t)return;e&&e.removeChild(this)}}function ZA(){return this.on("end.remove",hTe(this._id))}var nH=M(()=>{"use strict";o(hTe,"removeFunction");o(ZA,"default")});function JA(t){var e=this._name,r=this._id;typeof t!="function"&&(t=mh(t));for(var n=this._groups,i=n.length,a=new Array(i),s=0;s<i;++s)for(var l=n[s],u=l.length,h=a[s]=new Array(u),f,d,p=0;p<u;++p)(f=l[p])&&(d=t.call(f,f.__data__,p,l))&&("__data__"in f&&(d.__data__=f.__data__),h[p]=d,hu(h[p],e,r,p,h,Oi(f,r)));return new ja(a,this._parents,e,r)}var iH=M(()=>{"use strict";gl();id();ys();o(JA,"default")});function e8(t){var e=this._name,r=this._id;typeof t!="function"&&(t=yp(t));for(var n=this._groups,i=n.length,a=[],s=[],l=0;l<i;++l)for(var u=n[l],h=u.length,f,d=0;d<h;++d)if(f=u[d]){for(var p=t.call(f,f.__data__,d,u),m,g=Oi(f,r),y=0,v=p.length;y<v;++y)(m=p[y])&&hu(m,e,r,y,p,g);a.push(p),s.push(f)}return new ja(a,s,e,r)}var aH=M(()=>{"use strict";gl();id();ys();o(e8,"default")});function t8(){return new fTe(this._groups,this._parents)}var fTe,sH=M(()=>{"use strict";gl();fTe=lu.prototype.constructor;o(t8,"default")});function dTe(t,e){var r,n,i;return function(){var a=gh(this,t),s=(this.style.removeProperty(t),gh(this,t));return a===s?null:a===r&&s===n?i:i=e(r=a,n=s)}}function oH(t){return function(){this.style.removeProperty(t)}}function pTe(t,e,r){var n,i=r+"",a;return function(){var s=gh(this,t);return s===i?null:s===n?a:a=e(n=s,r)}}function mTe(t,e,r){var n,i,a;return function(){var s=gh(this,t),l=r(this),u=l+"";return l==null&&(u=l=(this.style.removeProperty(t),gh(this,t))),s===u?null:s===n&&u===i?a:(i=u,a=e(n=s,l))}}function gTe(t,e){var r,n,i,a="style."+e,s="end."+a,l;return function(){var u=oa(this,t),h=u.on,f=u.value[a]==null?l||(l=oH(e)):void 0;(h!==r||i!==f)&&(n=(r=h).copy()).on(s,i=f),u.on=n}}function r8(t,e,r){var n=(t+="")=="transform"?OA:Ly;return e==null?this.styleTween(t,dTe(t,n)).on("end.style."+t,oH(t)):typeof e=="function"?this.styleTween(t,mTe(t,n,_p(this,"style."+t,e))).each(gTe(this._id,t)):this.styleTween(t,pTe(t,n,e),r).on("end.style."+t,null)}var lH=M(()=>{"use strict";Cp();gl();ys();_y();VA();o(dTe,"styleNull");o(oH,"styleRemove");o(pTe,"styleConstant");o(mTe,"styleFunction");o(gTe,"styleMaybeRemove");o(r8,"default")});function yTe(t,e,r){return function(n){this.style.setProperty(t,e.call(this,n),r)}}function vTe(t,e,r){var n,i;function a(){var s=e.apply(this,arguments);return s!==i&&(n=(i=s)&&yTe(t,s,r)),n}return o(a,"tween"),a._value=e,a}function n8(t,e,r){var n="style."+(t+="");if(arguments.length<2)return(n=this.tween(n))&&n._value;if(e==null)return this.tween(n,null);if(typeof e!="function")throw new Error;return this.tween(n,vTe(t,e,r??""))}var cH=M(()=>{"use strict";o(yTe,"styleInterpolate");o(vTe,"styleTween");o(n8,"default")});function xTe(t){return function(){this.textContent=t}}function bTe(t){return function(){var e=t(this);this.textContent=e??""}}function i8(t){return this.tween("text",typeof t=="function"?bTe(_p(this,"text",t)):xTe(t==null?"":t+""))}var uH=M(()=>{"use strict";_y();o(xTe,"textConstant");o(bTe,"textFunction");o(i8,"default")});function wTe(t){return function(e){this.textContent=t.call(this,e)}}function TTe(t){var e,r;function n(){var i=t.apply(this,arguments);return i!==r&&(e=(r=i)&&wTe(i)),e}return o(n,"tween"),n._value=t,n}function a8(t){var e="text";if(arguments.length<1)return(e=this.tween(e))&&e._value;if(t==null)return this.tween(e,null);if(typeof t!="function")throw new Error;return this.tween(e,TTe(t))}var hH=M(()=>{"use strict";o(wTe,"textInterpolate");o(TTe,"textTween");o(a8,"default")});function s8(){for(var t=this._name,e=this._id,r=i3(),n=this._groups,i=n.length,a=0;a<i;++a)for(var s=n[a],l=s.length,u,h=0;h<l;++h)if(u=s[h]){var f=Oi(u,e);hu(u,t,r,h,s,{time:f.time+f.delay+f.duration,delay:0,duration:f.duration,ease:f.ease})}return new ja(n,this._parents,t,r)}var fH=M(()=>{"use strict";id();ys();o(s8,"default")});function o8(){var t,e,r=this,n=r._id,i=r.size();return new Promise(function(a,s){var l={value:s},u={value:o(function(){--i===0&&a()},"value")};r.each(function(){var h=oa(this,n),f=h.on;f!==t&&(e=(t=f).copy(),e._.cancel.push(l),e._.interrupt.push(l),e._.end.push(u)),h.on=e}),i===0&&a()})}var dH=M(()=>{"use strict";ys();o(o8,"default")});function ja(t,e,r,n){this._groups=t,this._parents=e,this._name=r,this._id=n}function pH(t){return lu().transition(t)}function i3(){return++kTe}var kTe,fu,id=M(()=>{"use strict";gl();XU();jU();KU();QU();ZU();JU();eH();tH();rH();nH();iH();aH();sH();lH();cH();uH();hH();fH();_y();dH();kTe=0;o(ja,"Transition");o(pH,"transition");o(i3,"newId");fu=lu.prototype;ja.prototype=pH.prototype={constructor:ja,select:JA,selectAll:e8,selectChild:fu.selectChild,selectChildren:fu.selectChildren,filter:jA,merge:KA,selection:t8,transition:s8,call:fu.call,nodes:fu.nodes,node:fu.node,size:fu.size,empty:fu.empty,each:fu.each,on:QA,attr:UA,attrTween:HA,style:r8,styleTween:n8,text:i8,textTween:a8,remove:ZA,tween:$A,delay:WA,duration:YA,ease:qA,easeVarying:XA,end:o8,[Symbol.iterator]:fu[Symbol.iterator]}});function a3(t){return((t*=2)<=1?t*t*t:(t-=2)*t*t+2)/2}var mH=M(()=>{"use strict";o(a3,"cubicInOut")});var l8=M(()=>{"use strict";mH()});function STe(t,e){for(var r;!(r=t.__transition)||!(r=r[e]);)if(!(t=t.parentNode))throw new Error(`transition ${e} not found`);return r}function c8(t){var e,r;t instanceof ja?(e=t._id,t=t._name):(e=i3(),(r=ETe).time=ky(),t=t==null?null:t+"");for(var n=this._groups,i=n.length,a=0;a<i;++a)for(var s=n[a],l=s.length,u,h=0;h<l;++h)(u=s[h])&&hu(u,t,e,h,s,r||STe(u,e));return new ja(n,this._parents,t,e)}var ETe,gH=M(()=>{"use strict";id();ys();l8();e3();ETe={time:null,delay:0,duration:250,ease:a3};o(STe,"inherit");o(c8,"default")});var yH=M(()=>{"use strict";gl();qU();gH();lu.prototype.interrupt=GA;lu.prototype.transition=c8});var s3=M(()=>{"use strict";yH()});var vH=M(()=>{"use strict"});var xH=M(()=>{"use strict"});var bH=M(()=>{"use strict"});function wH(t){return[+t[0],+t[1]]}function CTe(t){return[wH(t[0]),wH(t[1])]}function u8(t){return{type:t}}var t1t,r1t,n1t,i1t,a1t,s1t,TH=M(()=>{"use strict";s3();vH();xH();bH();({abs:t1t,max:r1t,min:n1t}=Math);o(wH,"number1");o(CTe,"number2");i1t={name:"x",handles:["w","e"].map(u8),input:o(function(t,e){return t==null?null:[[+t[0],e[0][1]],[+t[1],e[1][1]]]},"input"),output:o(function(t){return t&&[t[0][0],t[1][0]]},"output")},a1t={name:"y",handles:["n","s"].map(u8),input:o(function(t,e){return t==null?null:[[e[0][0],+t[0]],[e[1][0],+t[1]]]},"input"),output:o(function(t){return t&&[t[0][1],t[1][1]]},"output")},s1t={name:"xy",handles:["n","w","e","s","nw","ne","sw","se"].map(u8),input:o(function(t){return t==null?null:CTe(t)},"input"),output:o(function(t){return t},"output")};o(u8,"type")});var kH=M(()=>{"use strict";TH()});function EH(t){this._+=t[0];for(let e=1,r=t.length;e<r;++e)this._+=arguments[e]+t[e]}function _Te(t){let e=Math.floor(t);if(!(e>=0))throw new Error(`invalid digits: ${t}`);if(e>15)return EH;let r=10**e;return function(n){this._+=n[0];for(let i=1,a=n.length;i<a;++i)this._+=Math.round(arguments[i]*r)/r+n[i]}}function SH(){return new sd}var h8,f8,ad,ATe,sd,CH=M(()=>{"use strict";h8=Math.PI,f8=2*h8,ad=1e-6,ATe=f8-ad;o(EH,"append");o(_Te,"appendRound");sd=class{static{o(this,"Path")}constructor(e){this._x0=this._y0=this._x1=this._y1=null,this._="",this._append=e==null?EH:_Te(e)}moveTo(e,r){this._append`M${this._x0=this._x1=+e},${this._y0=this._y1=+r}`}closePath(){this._x1!==null&&(this._x1=this._x0,this._y1=this._y0,this._append`Z`)}lineTo(e,r){this._append`L${this._x1=+e},${this._y1=+r}`}quadraticCurveTo(e,r,n,i){this._append`Q${+e},${+r},${this._x1=+n},${this._y1=+i}`}bezierCurveTo(e,r,n,i,a,s){this._append`C${+e},${+r},${+n},${+i},${this._x1=+a},${this._y1=+s}`}arcTo(e,r,n,i,a){if(e=+e,r=+r,n=+n,i=+i,a=+a,a<0)throw new Error(`negative radius: ${a}`);let s=this._x1,l=this._y1,u=n-e,h=i-r,f=s-e,d=l-r,p=f*f+d*d;if(this._x1===null)this._append`M${this._x1=e},${this._y1=r}`;else if(p>ad)if(!(Math.abs(d*u-h*f)>ad)||!a)this._append`L${this._x1=e},${this._y1=r}`;else{let m=n-s,g=i-l,y=u*u+h*h,v=m*m+g*g,x=Math.sqrt(y),b=Math.sqrt(p),w=a*Math.tan((h8-Math.acos((y+p-v)/(2*x*b)))/2),_=w/b,T=w/x;Math.abs(_-1)>ad&&this._append`L${e+_*f},${r+_*d}`,this._append`A${a},${a},0,0,${+(d*m>f*g)},${this._x1=e+T*u},${this._y1=r+T*h}`}}arc(e,r,n,i,a,s){if(e=+e,r=+r,n=+n,s=!!s,n<0)throw new Error(`negative radius: ${n}`);let l=n*Math.cos(i),u=n*Math.sin(i),h=e+l,f=r+u,d=1^s,p=s?i-a:a-i;this._x1===null?this._append`M${h},${f}`:(Math.abs(this._x1-h)>ad||Math.abs(this._y1-f)>ad)&&this._append`L${h},${f}`,n&&(p<0&&(p=p%f8+f8),p>ATe?this._append`A${n},${n},0,1,${d},${e-l},${r-u}A${n},${n},0,1,${d},${this._x1=h},${this._y1=f}`:p>ad&&this._append`A${n},${n},0,${+(p>=h8)},${d},${this._x1=e+n*Math.cos(a)},${this._y1=r+n*Math.sin(a)}`)}rect(e,r,n,i){this._append`M${this._x0=this._x1=+e},${this._y0=this._y1=+r}h${n=+n}v${+i}h${-n}Z`}toString(){return this._}};o(SH,"path");SH.prototype=sd.prototype});var d8=M(()=>{"use strict";CH()});var AH=M(()=>{"use strict"});var _H=M(()=>{"use strict"});var LH=M(()=>{"use strict"});var DH=M(()=>{"use strict"});var NH=M(()=>{"use strict"});var RH=M(()=>{"use strict"});var MH=M(()=>{"use strict"});function p8(t){return Math.abs(t=Math.round(t))>=1e21?t.toLocaleString("en").replace(/,/g,""):t.toString(10)}function od(t,e){if((r=(t=e?t.toExponential(e-1):t.toExponential()).indexOf("e"))<0)return null;var r,n=t.slice(0,r);return[n.length>1?n[0]+n.slice(2):n,+t.slice(r+1)]}var Dy=M(()=>{"use strict";o(p8,"default");o(od,"formatDecimalParts")});function xl(t){return t=od(Math.abs(t)),t?t[1]:NaN}var Ny=M(()=>{"use strict";Dy();o(xl,"default")});function m8(t,e){return function(r,n){for(var i=r.length,a=[],s=0,l=t[0],u=0;i>0&&l>0&&(u+l+1>n&&(l=Math.max(1,n-u)),a.push(r.substring(i-=l,i+l)),!((u+=l+1)>n));)l=t[s=(s+1)%t.length];return a.reverse().join(e)}}var IH=M(()=>{"use strict";o(m8,"default")});function g8(t){return function(e){return e.replace(/[0-9]/g,function(r){return t[+r]})}}var OH=M(()=>{"use strict";o(g8,"default")});function bh(t){if(!(e=LTe.exec(t)))throw new Error("invalid format: "+t);var e;return new o3({fill:e[1],align:e[2],sign:e[3],symbol:e[4],zero:e[5],width:e[6],comma:e[7],precision:e[8]&&e[8].slice(1),trim:e[9],type:e[10]})}function o3(t){this.fill=t.fill===void 0?" ":t.fill+"",this.align=t.align===void 0?">":t.align+"",this.sign=t.sign===void 0?"-":t.sign+"",this.symbol=t.symbol===void 0?"":t.symbol+"",this.zero=!!t.zero,this.width=t.width===void 0?void 0:+t.width,this.comma=!!t.comma,this.precision=t.precision===void 0?void 0:+t.precision,this.trim=!!t.trim,this.type=t.type===void 0?"":t.type+""}var LTe,y8=M(()=>{"use strict";LTe=/^(?:(.)?([<>=^]))?([+\-( ])?([$#])?(0)?(\d+)?(,)?(\.\d+)?(~)?([a-z%])?$/i;o(bh,"formatSpecifier");bh.prototype=o3.prototype;o(o3,"FormatSpecifier");o3.prototype.toString=function(){return this.fill+this.align+this.sign+this.symbol+(this.zero?"0":"")+(this.width===void 0?"":Math.max(1,this.width|0))+(this.comma?",":"")+(this.precision===void 0?"":"."+Math.max(0,this.precision|0))+(this.trim?"~":"")+this.type}});function v8(t){e:for(var e=t.length,r=1,n=-1,i;r<e;++r)switch(t[r]){case".":n=i=r;break;case"0":n===0&&(n=r),i=r;break;default:if(!+t[r])break e;n>0&&(n=0);break}return n>0?t.slice(0,n)+t.slice(i+1):t}var PH=M(()=>{"use strict";o(v8,"default")});function b8(t,e){var r=od(t,e);if(!r)return t+"";var n=r[0],i=r[1],a=i-(x8=Math.max(-8,Math.min(8,Math.floor(i/3)))*3)+1,s=n.length;return a===s?n:a>s?n+new Array(a-s+1).join("0"):a>0?n.slice(0,a)+"."+n.slice(a):"0."+new Array(1-a).join("0")+od(t,Math.max(0,e+a-1))[0]}var x8,w8=M(()=>{"use strict";Dy();o(b8,"default")});function l3(t,e){var r=od(t,e);if(!r)return t+"";var n=r[0],i=r[1];return i<0?"0."+new Array(-i).join("0")+n:n.length>i+1?n.slice(0,i+1)+"."+n.slice(i+1):n+new Array(i-n.length+2).join("0")}var BH=M(()=>{"use strict";Dy();o(l3,"default")});var T8,FH=M(()=>{"use strict";Dy();w8();BH();T8={"%":o((t,e)=>(t*100).toFixed(e),"%"),b:o(t=>Math.round(t).toString(2),"b"),c:o(t=>t+"","c"),d:p8,e:o((t,e)=>t.toExponential(e),"e"),f:o((t,e)=>t.toFixed(e),"f"),g:o((t,e)=>t.toPrecision(e),"g"),o:o(t=>Math.round(t).toString(8),"o"),p:o((t,e)=>l3(t*100,e),"p"),r:l3,s:b8,X:o(t=>Math.round(t).toString(16).toUpperCase(),"X"),x:o(t=>Math.round(t).toString(16),"x")}});function c3(t){return t}var zH=M(()=>{"use strict";o(c3,"default")});function k8(t){var e=t.grouping===void 0||t.thousands===void 0?c3:m8(GH.call(t.grouping,Number),t.thousands+""),r=t.currency===void 0?"":t.currency[0]+"",n=t.currency===void 0?"":t.currency[1]+"",i=t.decimal===void 0?".":t.decimal+"",a=t.numerals===void 0?c3:g8(GH.call(t.numerals,String)),s=t.percent===void 0?"%":t.percent+"",l=t.minus===void 0?"\u2212":t.minus+"",u=t.nan===void 0?"NaN":t.nan+"";function h(d){d=bh(d);var p=d.fill,m=d.align,g=d.sign,y=d.symbol,v=d.zero,x=d.width,b=d.comma,w=d.precision,_=d.trim,T=d.type;T==="n"?(b=!0,T="g"):T8[T]||(w===void 0&&(w=12),_=!0,T="g"),(v||p==="0"&&m==="=")&&(v=!0,p="0",m="=");var E=y==="$"?r:y==="#"&&/[boxX]/.test(T)?"0"+T.toLowerCase():"",L=y==="$"?n:/[%p]/.test(T)?s:"",C=T8[T],A=/[defgprs%]/.test(T);w=w===void 0?6:/[gprs]/.test(T)?Math.max(1,Math.min(21,w)):Math.max(0,Math.min(20,w));function I(D){var k=E,R=L,S,O,N;if(T==="c")R=C(D)+R,D="";else{D=+D;var P=D<0||1/D<0;if(D=isNaN(D)?u:C(Math.abs(D),w),_&&(D=v8(D)),P&&+D==0&&g!=="+"&&(P=!1),k=(P?g==="("?g:l:g==="-"||g==="("?"":g)+k,R=(T==="s"?$H[8+x8/3]:"")+R+(P&&g==="("?")":""),A){for(S=-1,O=D.length;++S<O;)if(N=D.charCodeAt(S),48>N||N>57){R=(N===46?i+D.slice(S+1):D.slice(S))+R,D=D.slice(0,S);break}}}b&&!v&&(D=e(D,1/0));var F=k.length+D.length+R.length,B=F<x?new Array(x-F+1).join(p):"";switch(b&&v&&(D=e(B+D,B.length?x-R.length:1/0),B=""),m){case"<":D=k+D+R+B;break;case"=":D=k+B+D+R;break;case"^":D=B.slice(0,F=B.length>>1)+k+D+R+B.slice(F);break;default:D=B+k+D+R;break}return a(D)}return o(I,"format"),I.toString=function(){return d+""},I}o(h,"newFormat");function f(d,p){var m=h((d=bh(d),d.type="f",d)),g=Math.max(-8,Math.min(8,Math.floor(xl(p)/3)))*3,y=Math.pow(10,-g),v=$H[8+g/3];return function(x){return m(y*x)+v}}return o(f,"formatPrefix"),{format:h,formatPrefix:f}}var GH,$H,VH=M(()=>{"use strict";Ny();IH();OH();y8();PH();FH();w8();zH();GH=Array.prototype.map,$H=["y","z","a","f","p","n","\xB5","m","","k","M","G","T","P","E","Z","Y"];o(k8,"default")});function E8(t){return u3=k8(t),h3=u3.format,f3=u3.formatPrefix,u3}var u3,h3,f3,UH=M(()=>{"use strict";VH();E8({thousands:",",grouping:[3],currency:["$",""]});o(E8,"defaultLocale")});function d3(t){return Math.max(0,-xl(Math.abs(t)))}var HH=M(()=>{"use strict";Ny();o(d3,"default")});function p3(t,e){return Math.max(0,Math.max(-8,Math.min(8,Math.floor(xl(e)/3)))*3-xl(Math.abs(t)))}var WH=M(()=>{"use strict";Ny();o(p3,"default")});function m3(t,e){return t=Math.abs(t),e=Math.abs(e)-t,Math.max(0,xl(e)-xl(t))+1}var YH=M(()=>{"use strict";Ny();o(m3,"default")});var S8=M(()=>{"use strict";UH();y8();HH();WH();YH()});var qH=M(()=>{"use strict"});var XH=M(()=>{"use strict"});var jH=M(()=>{"use strict"});var KH=M(()=>{"use strict"});function wh(t,e){switch(arguments.length){case 0:break;case 1:this.range(t);break;default:this.range(e).domain(t);break}return this}var Ry=M(()=>{"use strict";o(wh,"initRange")});function du(){var t=new mp,e=[],r=[],n=C8;function i(a){let s=t.get(a);if(s===void 0){if(n!==C8)return n;t.set(a,s=e.push(a)-1)}return r[s%r.length]}return o(i,"scale"),i.domain=function(a){if(!arguments.length)return e.slice();e=[],t=new mp;for(let s of a)t.has(s)||t.set(s,e.push(s)-1);return i},i.range=function(a){return arguments.length?(r=Array.from(a),i):r.slice()},i.unknown=function(a){return arguments.length?(n=a,i):n},i.copy=function(){return du(e,r).unknown(n)},wh.apply(i,arguments),i}var C8,A8=M(()=>{"use strict";ph();Ry();C8=Symbol("implicit");o(du,"ordinal")});function Lp(){var t=du().unknown(void 0),e=t.domain,r=t.range,n=0,i=1,a,s,l=!1,u=0,h=0,f=.5;delete t.unknown;function d(){var p=e().length,m=i<n,g=m?i:n,y=m?n:i;a=(y-g)/Math.max(1,p-u+h*2),l&&(a=Math.floor(a)),g+=(y-g-a*(p-u))*f,s=a*(1-u),l&&(g=Math.round(g),s=Math.round(s));var v=R4(p).map(function(x){return g+a*x});return r(m?v.reverse():v)}return o(d,"rescale"),t.domain=function(p){return arguments.length?(e(p),d()):e()},t.range=function(p){return arguments.length?([n,i]=p,n=+n,i=+i,d()):[n,i]},t.rangeRound=function(p){return[n,i]=p,n=+n,i=+i,l=!0,d()},t.bandwidth=function(){return s},t.step=function(){return a},t.round=function(p){return arguments.length?(l=!!p,d()):l},t.padding=function(p){return arguments.length?(u=Math.min(1,h=+p),d()):u},t.paddingInner=function(p){return arguments.length?(u=Math.min(1,p),d()):u},t.paddingOuter=function(p){return arguments.length?(h=+p,d()):h},t.align=function(p){return arguments.length?(f=Math.max(0,Math.min(1,p)),d()):f},t.copy=function(){return Lp(e(),[n,i]).round(l).paddingInner(u).paddingOuter(h).align(f)},wh.apply(d(),arguments)}var QH=M(()=>{"use strict";ph();Ry();A8();o(Lp,"band")});function _8(t){return function(){return t}}var ZH=M(()=>{"use strict";o(_8,"constants")});function L8(t){return+t}var JH=M(()=>{"use strict";o(L8,"number")});function Dp(t){return t}function D8(t,e){return(e-=t=+t)?function(r){return(r-t)/e}:_8(isNaN(e)?NaN:.5)}function DTe(t,e){var r;return t>e&&(r=t,t=e,e=r),function(n){return Math.max(t,Math.min(e,n))}}function NTe(t,e,r){var n=t[0],i=t[1],a=e[0],s=e[1];return i<n?(n=D8(i,n),a=r(s,a)):(n=D8(n,i),a=r(a,s)),function(l){return a(n(l))}}function RTe(t,e,r){var n=Math.min(t.length,e.length)-1,i=new Array(n),a=new Array(n),s=-1;for(t[n]<t[0]&&(t=t.slice().reverse(),e=e.slice().reverse());++s<n;)i[s]=D8(t[s],t[s+1]),a[s]=r(e[s],e[s+1]);return function(l){var u=d7(t,l,1,n)-1;return a[u](i[u](l))}}function g3(t,e){return e.domain(t.domain()).range(t.range()).interpolate(t.interpolate()).clamp(t.clamp()).unknown(t.unknown())}function MTe(){var t=eW,e=eW,r=xh,n,i,a,s=Dp,l,u,h;function f(){var p=Math.min(t.length,e.length);return s!==Dp&&(s=DTe(t[0],t[p-1])),l=p>2?RTe:NTe,u=h=null,d}o(f,"rescale");function d(p){return p==null||isNaN(p=+p)?a:(u||(u=l(t.map(n),e,r)))(n(s(p)))}return o(d,"scale"),d.invert=function(p){return s(i((h||(h=l(e,t.map(n),Ki)))(p)))},d.domain=function(p){return arguments.length?(t=Array.from(p,L8),f()):t.slice()},d.range=function(p){return arguments.length?(e=Array.from(p),f()):e.slice()},d.rangeRound=function(p){return e=Array.from(p),r=Y4,f()},d.clamp=function(p){return arguments.length?(s=p?!0:Dp,f()):s!==Dp},d.interpolate=function(p){return arguments.length?(r=p,f()):r},d.unknown=function(p){return arguments.length?(a=p,d):a},function(p,m){return n=p,i=m,f()}}function My(){return MTe()(Dp,Dp)}var eW,N8=M(()=>{"use strict";ph();Cp();ZH();JH();eW=[0,1];o(Dp,"identity");o(D8,"normalize");o(DTe,"clamper");o(NTe,"bimap");o(RTe,"polymap");o(g3,"copy");o(MTe,"transformer");o(My,"continuous")});function R8(t,e,r,n){var i=gp(t,e,r),a;switch(n=bh(n??",f"),n.type){case"s":{var s=Math.max(Math.abs(t),Math.abs(e));return n.precision==null&&!isNaN(a=p3(i,s))&&(n.precision=a),f3(n,s)}case"":case"e":case"g":case"p":case"r":{n.precision==null&&!isNaN(a=m3(i,Math.max(Math.abs(t),Math.abs(e))))&&(n.precision=a-(n.type==="e"));break}case"f":case"%":{n.precision==null&&!isNaN(a=d3(i))&&(n.precision=a-(n.type==="%")*2);break}}return h3(n)}var tW=M(()=>{"use strict";ph();S8();o(R8,"tickFormat")});function ITe(t){var e=t.domain;return t.ticks=function(r){var n=e();return L4(n[0],n[n.length-1],r??10)},t.tickFormat=function(r,n){var i=e();return R8(i[0],i[i.length-1],r??10,n)},t.nice=function(r){r==null&&(r=10);var n=e(),i=0,a=n.length-1,s=n[i],l=n[a],u,h,f=10;for(l<s&&(h=s,s=l,l=h,h=i,i=a,a=h);f-- >0;){if(h=ly(s,l,r),h===u)return n[i]=s,n[a]=l,e(n);if(h>0)s=Math.floor(s/h)*h,l=Math.ceil(l/h)*h;else if(h<0)s=Math.ceil(s*h)/h,l=Math.floor(l*h)/h;else break;u=h}return t},t}function bl(){var t=My();return t.copy=function(){return g3(t,bl())},wh.apply(t,arguments),ITe(t)}var rW=M(()=>{"use strict";ph();N8();Ry();tW();o(ITe,"linearish");o(bl,"linear")});function M8(t,e){t=t.slice();var r=0,n=t.length-1,i=t[r],a=t[n],s;return a<i&&(s=r,r=n,n=s,s=i,i=a,a=s),t[r]=e.floor(i),t[n]=e.ceil(a),t}var nW=M(()=>{"use strict";o(M8,"nice")});function gn(t,e,r,n){function i(a){return t(a=arguments.length===0?new Date:new Date(+a)),a}return o(i,"interval"),i.floor=a=>(t(a=new Date(+a)),a),i.ceil=a=>(t(a=new Date(a-1)),e(a,1),t(a),a),i.round=a=>{let s=i(a),l=i.ceil(a);return a-s<l-a?s:l},i.offset=(a,s)=>(e(a=new Date(+a),s==null?1:Math.floor(s)),a),i.range=(a,s,l)=>{let u=[];if(a=i.ceil(a),l=l==null?1:Math.floor(l),!(a<s)||!(l>0))return u;let h;do u.push(h=new Date(+a)),e(a,l),t(a);while(h<a&&a<s);return u},i.filter=a=>gn(s=>{if(s>=s)for(;t(s),!a(s);)s.setTime(s-1)},(s,l)=>{if(s>=s)if(l<0)for(;++l<=0;)for(;e(s,-1),!a(s););else for(;--l>=0;)for(;e(s,1),!a(s););}),r&&(i.count=(a,s)=>(I8.setTime(+a),O8.setTime(+s),t(I8),t(O8),Math.floor(r(I8,O8))),i.every=a=>(a=Math.floor(a),!isFinite(a)||!(a>0)?null:a>1?i.filter(n?s=>n(s)%a===0:s=>i.count(0,s)%a===0):i)),i}var I8,O8,pu=M(()=>{"use strict";I8=new Date,O8=new Date;o(gn,"timeInterval")});var oc,iW,P8=M(()=>{"use strict";pu();oc=gn(()=>{},(t,e)=>{t.setTime(+t+e)},(t,e)=>e-t);oc.every=t=>(t=Math.floor(t),!isFinite(t)||!(t>0)?null:t>1?gn(e=>{e.setTime(Math.floor(e/t)*t)},(e,r)=>{e.setTime(+e+r*t)},(e,r)=>(r-e)/t):oc);iW=oc.range});var Xs,aW,B8=M(()=>{"use strict";pu();Xs=gn(t=>{t.setTime(t-t.getMilliseconds())},(t,e)=>{t.setTime(+t+e*1e3)},(t,e)=>(e-t)/1e3,t=>t.getUTCSeconds()),aW=Xs.range});var mu,OTe,y3,PTe,F8=M(()=>{"use strict";pu();mu=gn(t=>{t.setTime(t-t.getMilliseconds()-t.getSeconds()*1e3)},(t,e)=>{t.setTime(+t+e*6e4)},(t,e)=>(e-t)/6e4,t=>t.getMinutes()),OTe=mu.range,y3=gn(t=>{t.setUTCSeconds(0,0)},(t,e)=>{t.setTime(+t+e*6e4)},(t,e)=>(e-t)/6e4,t=>t.getUTCMinutes()),PTe=y3.range});var gu,BTe,v3,FTe,z8=M(()=>{"use strict";pu();gu=gn(t=>{t.setTime(t-t.getMilliseconds()-t.getSeconds()*1e3-t.getMinutes()*6e4)},(t,e)=>{t.setTime(+t+e*36e5)},(t,e)=>(e-t)/36e5,t=>t.getHours()),BTe=gu.range,v3=gn(t=>{t.setUTCMinutes(0,0,0)},(t,e)=>{t.setTime(+t+e*36e5)},(t,e)=>(e-t)/36e5,t=>t.getUTCHours()),FTe=v3.range});var Lo,zTe,Oy,GTe,x3,$Te,G8=M(()=>{"use strict";pu();Lo=gn(t=>t.setHours(0,0,0,0),(t,e)=>t.setDate(t.getDate()+e),(t,e)=>(e-t-(e.getTimezoneOffset()-t.getTimezoneOffset())*6e4)/864e5,t=>t.getDate()-1),zTe=Lo.range,Oy=gn(t=>{t.setUTCHours(0,0,0,0)},(t,e)=>{t.setUTCDate(t.getUTCDate()+e)},(t,e)=>(e-t)/864e5,t=>t.getUTCDate()-1),GTe=Oy.range,x3=gn(t=>{t.setUTCHours(0,0,0,0)},(t,e)=>{t.setUTCDate(t.getUTCDate()+e)},(t,e)=>(e-t)/864e5,t=>Math.floor(t/864e5)),$Te=x3.range});function ud(t){return gn(e=>{e.setDate(e.getDate()-(e.getDay()+7-t)%7),e.setHours(0,0,0,0)},(e,r)=>{e.setDate(e.getDate()+r*7)},(e,r)=>(r-e-(r.getTimezoneOffset()-e.getTimezoneOffset())*6e4)/6048e5)}function hd(t){return gn(e=>{e.setUTCDate(e.getUTCDate()-(e.getUTCDay()+7-t)%7),e.setUTCHours(0,0,0,0)},(e,r)=>{e.setUTCDate(e.getUTCDate()+r*7)},(e,r)=>(r-e)/6048e5)}var wl,Th,b3,w3,cc,T3,k3,oW,VTe,UTe,HTe,WTe,YTe,qTe,fd,Np,lW,cW,kh,uW,hW,fW,XTe,jTe,KTe,QTe,ZTe,JTe,$8=M(()=>{"use strict";pu();o(ud,"timeWeekday");wl=ud(0),Th=ud(1),b3=ud(2),w3=ud(3),cc=ud(4),T3=ud(5),k3=ud(6),oW=wl.range,VTe=Th.range,UTe=b3.range,HTe=w3.range,WTe=cc.range,YTe=T3.range,qTe=k3.range;o(hd,"utcWeekday");fd=hd(0),Np=hd(1),lW=hd(2),cW=hd(3),kh=hd(4),uW=hd(5),hW=hd(6),fW=fd.range,XTe=Np.range,jTe=lW.range,KTe=cW.range,QTe=kh.range,ZTe=uW.range,JTe=hW.range});var yu,eke,E3,tke,V8=M(()=>{"use strict";pu();yu=gn(t=>{t.setDate(1),t.setHours(0,0,0,0)},(t,e)=>{t.setMonth(t.getMonth()+e)},(t,e)=>e.getMonth()-t.getMonth()+(e.getFullYear()-t.getFullYear())*12,t=>t.getMonth()),eke=yu.range,E3=gn(t=>{t.setUTCDate(1),t.setUTCHours(0,0,0,0)},(t,e)=>{t.setUTCMonth(t.getUTCMonth()+e)},(t,e)=>e.getUTCMonth()-t.getUTCMonth()+(e.getUTCFullYear()-t.getUTCFullYear())*12,t=>t.getUTCMonth()),tke=E3.range});var js,rke,Tl,nke,U8=M(()=>{"use strict";pu();js=gn(t=>{t.setMonth(0,1),t.setHours(0,0,0,0)},(t,e)=>{t.setFullYear(t.getFullYear()+e)},(t,e)=>e.getFullYear()-t.getFullYear(),t=>t.getFullYear());js.every=t=>!isFinite(t=Math.floor(t))||!(t>0)?null:gn(e=>{e.setFullYear(Math.floor(e.getFullYear()/t)*t),e.setMonth(0,1),e.setHours(0,0,0,0)},(e,r)=>{e.setFullYear(e.getFullYear()+r*t)});rke=js.range,Tl=gn(t=>{t.setUTCMonth(0,1),t.setUTCHours(0,0,0,0)},(t,e)=>{t.setUTCFullYear(t.getUTCFullYear()+e)},(t,e)=>e.getUTCFullYear()-t.getUTCFullYear(),t=>t.getUTCFullYear());Tl.every=t=>!isFinite(t=Math.floor(t))||!(t>0)?null:gn(e=>{e.setUTCFullYear(Math.floor(e.getUTCFullYear()/t)*t),e.setUTCMonth(0,1),e.setUTCHours(0,0,0,0)},(e,r)=>{e.setUTCFullYear(e.getUTCFullYear()+r*t)});nke=Tl.range});function pW(t,e,r,n,i,a){let s=[[Xs,1,1e3],[Xs,5,5*1e3],[Xs,15,15*1e3],[Xs,30,30*1e3],[a,1,6e4],[a,5,5*6e4],[a,15,15*6e4],[a,30,30*6e4],[i,1,36e5],[i,3,3*36e5],[i,6,6*36e5],[i,12,12*36e5],[n,1,864e5],[n,2,2*864e5],[r,1,6048e5],[e,1,2592e6],[e,3,3*2592e6],[t,1,31536e6]];function l(h,f,d){let p=f<h;p&&([h,f]=[f,h]);let m=d&&typeof d.range=="function"?d:u(h,f,d),g=m?m.range(h,+f+1):[];return p?g.reverse():g}o(l,"ticks");function u(h,f,d){let p=Math.abs(f-h)/d,m=Jf(([,,v])=>v).right(s,p);if(m===s.length)return t.every(gp(h/31536e6,f/31536e6,d));if(m===0)return oc.every(Math.max(gp(h,f,d),1));let[g,y]=s[p/s[m-1][2]<s[m][2]/p?m-1:m];return g.every(y)}return o(u,"tickInterval"),[l,u]}var ake,ske,H8,W8,mW=M(()=>{"use strict";ph();P8();B8();F8();z8();G8();$8();V8();U8();o(pW,"ticker");[ake,ske]=pW(Tl,E3,fd,x3,v3,y3),[H8,W8]=pW(js,yu,wl,Lo,gu,mu)});var S3=M(()=>{"use strict";P8();B8();F8();z8();G8();$8();V8();U8();mW()});function Y8(t){if(0<=t.y&&t.y<100){var e=new Date(-1,t.m,t.d,t.H,t.M,t.S,t.L);return e.setFullYear(t.y),e}return new Date(t.y,t.m,t.d,t.H,t.M,t.S,t.L)}function q8(t){if(0<=t.y&&t.y<100){var e=new Date(Date.UTC(-1,t.m,t.d,t.H,t.M,t.S,t.L));return e.setUTCFullYear(t.y),e}return new Date(Date.UTC(t.y,t.m,t.d,t.H,t.M,t.S,t.L))}function Py(t,e,r){return{y:t,m:e,d:r,H:0,M:0,S:0,L:0}}function X8(t){var e=t.dateTime,r=t.date,n=t.time,i=t.periods,a=t.days,s=t.shortDays,l=t.months,u=t.shortMonths,h=By(i),f=Fy(i),d=By(a),p=Fy(a),m=By(s),g=Fy(s),y=By(l),v=Fy(l),x=By(u),b=Fy(u),w={a:P,A:F,b:B,B:$,c:null,d:wW,e:wW,f:Lke,g:zke,G:$ke,H:Cke,I:Ake,j:_ke,L:CW,m:Dke,M:Nke,p:z,q:W,Q:EW,s:SW,S:Rke,u:Mke,U:Ike,V:Oke,w:Pke,W:Bke,x:null,X:null,y:Fke,Y:Gke,Z:Vke,"%":kW},_={a:j,A:K,b:ie,B:Q,c:null,d:TW,e:TW,f:Yke,g:rEe,G:iEe,H:Uke,I:Hke,j:Wke,L:_W,m:qke,M:Xke,p:ee,q:J,Q:EW,s:SW,S:jke,u:Kke,U:Qke,V:Zke,w:Jke,W:eEe,x:null,X:null,y:tEe,Y:nEe,Z:aEe,"%":kW},T={a:I,A:D,b:k,B:R,c:S,d:xW,e:xW,f:Tke,g:vW,G:yW,H:bW,I:bW,j:vke,L:wke,m:yke,M:xke,p:A,q:gke,Q:Eke,s:Ske,S:bke,u:hke,U:fke,V:dke,w:uke,W:pke,x:O,X:N,y:vW,Y:yW,Z:mke,"%":kke};w.x=E(r,w),w.X=E(n,w),w.c=E(e,w),_.x=E(r,_),_.X=E(n,_),_.c=E(e,_);function E(H,q){return function(Z){var ae=[],ue=-1,ce=0,te=H.length,De,oe,ke;for(Z instanceof Date||(Z=new Date(+Z));++ue<te;)H.charCodeAt(ue)===37&&(ae.push(H.slice(ce,ue)),(oe=gW[De=H.charAt(++ue)])!=null?De=H.charAt(++ue):oe=De==="e"?" ":"0",(ke=q[De])&&(De=ke(Z,oe)),ae.push(De),ce=ue+1);return ae.push(H.slice(ce,ue)),ae.join("")}}o(E,"newFormat");function L(H,q){return function(Z){var ae=Py(1900,void 0,1),ue=C(ae,H,Z+="",0),ce,te;if(ue!=Z.length)return null;if("Q"in ae)return new Date(ae.Q);if("s"in ae)return new Date(ae.s*1e3+("L"in ae?ae.L:0));if(q&&!("Z"in ae)&&(ae.Z=0),"p"in ae&&(ae.H=ae.H%12+ae.p*12),ae.m===void 0&&(ae.m="q"in ae?ae.q:0),"V"in ae){if(ae.V<1||ae.V>53)return null;"w"in ae||(ae.w=1),"Z"in ae?(ce=q8(Py(ae.y,0,1)),te=ce.getUTCDay(),ce=te>4||te===0?Np.ceil(ce):Np(ce),ce=Oy.offset(ce,(ae.V-1)*7),ae.y=ce.getUTCFullYear(),ae.m=ce.getUTCMonth(),ae.d=ce.getUTCDate()+(ae.w+6)%7):(ce=Y8(Py(ae.y,0,1)),te=ce.getDay(),ce=te>4||te===0?Th.ceil(ce):Th(ce),ce=Lo.offset(ce,(ae.V-1)*7),ae.y=ce.getFullYear(),ae.m=ce.getMonth(),ae.d=ce.getDate()+(ae.w+6)%7)}else("W"in ae||"U"in ae)&&("w"in ae||(ae.w="u"in ae?ae.u%7:"W"in ae?1:0),te="Z"in ae?q8(Py(ae.y,0,1)).getUTCDay():Y8(Py(ae.y,0,1)).getDay(),ae.m=0,ae.d="W"in ae?(ae.w+6)%7+ae.W*7-(te+5)%7:ae.w+ae.U*7-(te+6)%7);return"Z"in ae?(ae.H+=ae.Z/100|0,ae.M+=ae.Z%100,q8(ae)):Y8(ae)}}o(L,"newParse");function C(H,q,Z,ae){for(var ue=0,ce=q.length,te=Z.length,De,oe;ue<ce;){if(ae>=te)return-1;if(De=q.charCodeAt(ue++),De===37){if(De=q.charAt(ue++),oe=T[De in gW?q.charAt(ue++):De],!oe||(ae=oe(H,Z,ae))<0)return-1}else if(De!=Z.charCodeAt(ae++))return-1}return ae}o(C,"parseSpecifier");function A(H,q,Z){var ae=h.exec(q.slice(Z));return ae?(H.p=f.get(ae[0].toLowerCase()),Z+ae[0].length):-1}o(A,"parsePeriod");function I(H,q,Z){var ae=m.exec(q.slice(Z));return ae?(H.w=g.get(ae[0].toLowerCase()),Z+ae[0].length):-1}o(I,"parseShortWeekday");function D(H,q,Z){var ae=d.exec(q.slice(Z));return ae?(H.w=p.get(ae[0].toLowerCase()),Z+ae[0].length):-1}o(D,"parseWeekday");function k(H,q,Z){var ae=x.exec(q.slice(Z));return ae?(H.m=b.get(ae[0].toLowerCase()),Z+ae[0].length):-1}o(k,"parseShortMonth");function R(H,q,Z){var ae=y.exec(q.slice(Z));return ae?(H.m=v.get(ae[0].toLowerCase()),Z+ae[0].length):-1}o(R,"parseMonth");function S(H,q,Z){return C(H,e,q,Z)}o(S,"parseLocaleDateTime");function O(H,q,Z){return C(H,r,q,Z)}o(O,"parseLocaleDate");function N(H,q,Z){return C(H,n,q,Z)}o(N,"parseLocaleTime");function P(H){return s[H.getDay()]}o(P,"formatShortWeekday");function F(H){return a[H.getDay()]}o(F,"formatWeekday");function B(H){return u[H.getMonth()]}o(B,"formatShortMonth");function $(H){return l[H.getMonth()]}o($,"formatMonth");function z(H){return i[+(H.getHours()>=12)]}o(z,"formatPeriod");function W(H){return 1+~~(H.getMonth()/3)}o(W,"formatQuarter");function j(H){return s[H.getUTCDay()]}o(j,"formatUTCShortWeekday");function K(H){return a[H.getUTCDay()]}o(K,"formatUTCWeekday");function ie(H){return u[H.getUTCMonth()]}o(ie,"formatUTCShortMonth");function Q(H){return l[H.getUTCMonth()]}o(Q,"formatUTCMonth");function ee(H){return i[+(H.getUTCHours()>=12)]}o(ee,"formatUTCPeriod");function J(H){return 1+~~(H.getUTCMonth()/3)}return o(J,"formatUTCQuarter"),{format:o(function(H){var q=E(H+="",w);return q.toString=function(){return H},q},"format"),parse:o(function(H){var q=L(H+="",!1);return q.toString=function(){return H},q},"parse"),utcFormat:o(function(H){var q=E(H+="",_);return q.toString=function(){return H},q},"utcFormat"),utcParse:o(function(H){var q=L(H+="",!0);return q.toString=function(){return H},q},"utcParse")}}function Hr(t,e,r){var n=t<0?"-":"",i=(n?-t:t)+"",a=i.length;return n+(a<r?new Array(r-a+1).join(e)+i:i)}function cke(t){return t.replace(lke,"\\$&")}function By(t){return new RegExp("^(?:"+t.map(cke).join("|")+")","i")}function Fy(t){return new Map(t.map((e,r)=>[e.toLowerCase(),r]))}function uke(t,e,r){var n=Qi.exec(e.slice(r,r+1));return n?(t.w=+n[0],r+n[0].length):-1}function hke(t,e,r){var n=Qi.exec(e.slice(r,r+1));return n?(t.u=+n[0],r+n[0].length):-1}function fke(t,e,r){var n=Qi.exec(e.slice(r,r+2));return n?(t.U=+n[0],r+n[0].length):-1}function dke(t,e,r){var n=Qi.exec(e.slice(r,r+2));return n?(t.V=+n[0],r+n[0].length):-1}function pke(t,e,r){var n=Qi.exec(e.slice(r,r+2));return n?(t.W=+n[0],r+n[0].length):-1}function yW(t,e,r){var n=Qi.exec(e.slice(r,r+4));return n?(t.y=+n[0],r+n[0].length):-1}function vW(t,e,r){var n=Qi.exec(e.slice(r,r+2));return n?(t.y=+n[0]+(+n[0]>68?1900:2e3),r+n[0].length):-1}function mke(t,e,r){var n=/^(Z)|([+-]\d\d)(?::?(\d\d))?/.exec(e.slice(r,r+6));return n?(t.Z=n[1]?0:-(n[2]+(n[3]||"00")),r+n[0].length):-1}function gke(t,e,r){var n=Qi.exec(e.slice(r,r+1));return n?(t.q=n[0]*3-3,r+n[0].length):-1}function yke(t,e,r){var n=Qi.exec(e.slice(r,r+2));return n?(t.m=n[0]-1,r+n[0].length):-1}function xW(t,e,r){var n=Qi.exec(e.slice(r,r+2));return n?(t.d=+n[0],r+n[0].length):-1}function vke(t,e,r){var n=Qi.exec(e.slice(r,r+3));return n?(t.m=0,t.d=+n[0],r+n[0].length):-1}function bW(t,e,r){var n=Qi.exec(e.slice(r,r+2));return n?(t.H=+n[0],r+n[0].length):-1}function xke(t,e,r){var n=Qi.exec(e.slice(r,r+2));return n?(t.M=+n[0],r+n[0].length):-1}function bke(t,e,r){var n=Qi.exec(e.slice(r,r+2));return n?(t.S=+n[0],r+n[0].length):-1}function wke(t,e,r){var n=Qi.exec(e.slice(r,r+3));return n?(t.L=+n[0],r+n[0].length):-1}function Tke(t,e,r){var n=Qi.exec(e.slice(r,r+6));return n?(t.L=Math.floor(n[0]/1e3),r+n[0].length):-1}function kke(t,e,r){var n=oke.exec(e.slice(r,r+1));return n?r+n[0].length:-1}function Eke(t,e,r){var n=Qi.exec(e.slice(r));return n?(t.Q=+n[0],r+n[0].length):-1}function Ske(t,e,r){var n=Qi.exec(e.slice(r));return n?(t.s=+n[0],r+n[0].length):-1}function wW(t,e){return Hr(t.getDate(),e,2)}function Cke(t,e){return Hr(t.getHours(),e,2)}function Ake(t,e){return Hr(t.getHours()%12||12,e,2)}function _ke(t,e){return Hr(1+Lo.count(js(t),t),e,3)}function CW(t,e){return Hr(t.getMilliseconds(),e,3)}function Lke(t,e){return CW(t,e)+"000"}function Dke(t,e){return Hr(t.getMonth()+1,e,2)}function Nke(t,e){return Hr(t.getMinutes(),e,2)}function Rke(t,e){return Hr(t.getSeconds(),e,2)}function Mke(t){var e=t.getDay();return e===0?7:e}function Ike(t,e){return Hr(wl.count(js(t)-1,t),e,2)}function AW(t){var e=t.getDay();return e>=4||e===0?cc(t):cc.ceil(t)}function Oke(t,e){return t=AW(t),Hr(cc.count(js(t),t)+(js(t).getDay()===4),e,2)}function Pke(t){return t.getDay()}function Bke(t,e){return Hr(Th.count(js(t)-1,t),e,2)}function Fke(t,e){return Hr(t.getFullYear()%100,e,2)}function zke(t,e){return t=AW(t),Hr(t.getFullYear()%100,e,2)}function Gke(t,e){return Hr(t.getFullYear()%1e4,e,4)}function $ke(t,e){var r=t.getDay();return t=r>=4||r===0?cc(t):cc.ceil(t),Hr(t.getFullYear()%1e4,e,4)}function Vke(t){var e=t.getTimezoneOffset();return(e>0?"-":(e*=-1,"+"))+Hr(e/60|0,"0",2)+Hr(e%60,"0",2)}function TW(t,e){return Hr(t.getUTCDate(),e,2)}function Uke(t,e){return Hr(t.getUTCHours(),e,2)}function Hke(t,e){return Hr(t.getUTCHours()%12||12,e,2)}function Wke(t,e){return Hr(1+Oy.count(Tl(t),t),e,3)}function _W(t,e){return Hr(t.getUTCMilliseconds(),e,3)}function Yke(t,e){return _W(t,e)+"000"}function qke(t,e){return Hr(t.getUTCMonth()+1,e,2)}function Xke(t,e){return Hr(t.getUTCMinutes(),e,2)}function jke(t,e){return Hr(t.getUTCSeconds(),e,2)}function Kke(t){var e=t.getUTCDay();return e===0?7:e}function Qke(t,e){return Hr(fd.count(Tl(t)-1,t),e,2)}function LW(t){var e=t.getUTCDay();return e>=4||e===0?kh(t):kh.ceil(t)}function Zke(t,e){return t=LW(t),Hr(kh.count(Tl(t),t)+(Tl(t).getUTCDay()===4),e,2)}function Jke(t){return t.getUTCDay()}function eEe(t,e){return Hr(Np.count(Tl(t)-1,t),e,2)}function tEe(t,e){return Hr(t.getUTCFullYear()%100,e,2)}function rEe(t,e){return t=LW(t),Hr(t.getUTCFullYear()%100,e,2)}function nEe(t,e){return Hr(t.getUTCFullYear()%1e4,e,4)}function iEe(t,e){var r=t.getUTCDay();return t=r>=4||r===0?kh(t):kh.ceil(t),Hr(t.getUTCFullYear()%1e4,e,4)}function aEe(){return"+0000"}function kW(){return"%"}function EW(t){return+t}function SW(t){return Math.floor(+t/1e3)}var gW,Qi,oke,lke,DW=M(()=>{"use strict";S3();o(Y8,"localDate");o(q8,"utcDate");o(Py,"newDate");o(X8,"formatLocale");gW={"-":"",_:" ",0:"0"},Qi=/^\s*\d+/,oke=/^%/,lke=/[\\^$*+?|[\]().{}]/g;o(Hr,"pad");o(cke,"requote");o(By,"formatRe");o(Fy,"formatLookup");o(uke,"parseWeekdayNumberSunday");o(hke,"parseWeekdayNumberMonday");o(fke,"parseWeekNumberSunday");o(dke,"parseWeekNumberISO");o(pke,"parseWeekNumberMonday");o(yW,"parseFullYear");o(vW,"parseYear");o(mke,"parseZone");o(gke,"parseQuarter");o(yke,"parseMonthNumber");o(xW,"parseDayOfMonth");o(vke,"parseDayOfYear");o(bW,"parseHour24");o(xke,"parseMinutes");o(bke,"parseSeconds");o(wke,"parseMilliseconds");o(Tke,"parseMicroseconds");o(kke,"parseLiteralPercent");o(Eke,"parseUnixTimestamp");o(Ske,"parseUnixTimestampSeconds");o(wW,"formatDayOfMonth");o(Cke,"formatHour24");o(Ake,"formatHour12");o(_ke,"formatDayOfYear");o(CW,"formatMilliseconds");o(Lke,"formatMicroseconds");o(Dke,"formatMonthNumber");o(Nke,"formatMinutes");o(Rke,"formatSeconds");o(Mke,"formatWeekdayNumberMonday");o(Ike,"formatWeekNumberSunday");o(AW,"dISO");o(Oke,"formatWeekNumberISO");o(Pke,"formatWeekdayNumberSunday");o(Bke,"formatWeekNumberMonday");o(Fke,"formatYear");o(zke,"formatYearISO");o(Gke,"formatFullYear");o($ke,"formatFullYearISO");o(Vke,"formatZone");o(TW,"formatUTCDayOfMonth");o(Uke,"formatUTCHour24");o(Hke,"formatUTCHour12");o(Wke,"formatUTCDayOfYear");o(_W,"formatUTCMilliseconds");o(Yke,"formatUTCMicroseconds");o(qke,"formatUTCMonthNumber");o(Xke,"formatUTCMinutes");o(jke,"formatUTCSeconds");o(Kke,"formatUTCWeekdayNumberMonday");o(Qke,"formatUTCWeekNumberSunday");o(LW,"UTCdISO");o(Zke,"formatUTCWeekNumberISO");o(Jke,"formatUTCWeekdayNumberSunday");o(eEe,"formatUTCWeekNumberMonday");o(tEe,"formatUTCYear");o(rEe,"formatUTCYearISO");o(nEe,"formatUTCFullYear");o(iEe,"formatUTCFullYearISO");o(aEe,"formatUTCZone");o(kW,"formatLiteralPercent");o(EW,"formatUnixTimestamp");o(SW,"formatUnixTimestampSeconds")});function j8(t){return Rp=X8(t),dd=Rp.format,NW=Rp.parse,RW=Rp.utcFormat,MW=Rp.utcParse,Rp}var Rp,dd,NW,RW,MW,IW=M(()=>{"use strict";DW();j8({dateTime:"%x, %X",date:"%-m/%-d/%Y",time:"%-I:%M:%S %p",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]});o(j8,"defaultLocale")});var K8=M(()=>{"use strict";IW()});function sEe(t){return new Date(t)}function oEe(t){return t instanceof Date?+t:+new Date(+t)}function OW(t,e,r,n,i,a,s,l,u,h){var f=My(),d=f.invert,p=f.domain,m=h(".%L"),g=h(":%S"),y=h("%I:%M"),v=h("%I %p"),x=h("%a %d"),b=h("%b %d"),w=h("%B"),_=h("%Y");function T(E){return(u(E)<E?m:l(E)<E?g:s(E)<E?y:a(E)<E?v:n(E)<E?i(E)<E?x:b:r(E)<E?w:_)(E)}return o(T,"tickFormat"),f.invert=function(E){return new Date(d(E))},f.domain=function(E){return arguments.length?p(Array.from(E,oEe)):p().map(sEe)},f.ticks=function(E){var L=p();return t(L[0],L[L.length-1],E??10)},f.tickFormat=function(E,L){return L==null?T:h(L)},f.nice=function(E){var L=p();return(!E||typeof E.range!="function")&&(E=e(L[0],L[L.length-1],E??10)),E?p(M8(L,E)):f},f.copy=function(){return g3(f,OW(t,e,r,n,i,a,s,l,u,h))},f}function C3(){return wh.apply(OW(H8,W8,js,yu,wl,Lo,gu,mu,Xs,dd).domain([new Date(2e3,0,1),new Date(2e3,0,2)]),arguments)}var PW=M(()=>{"use strict";S3();K8();N8();Ry();nW();o(sEe,"date");o(oEe,"number");o(OW,"calendar");o(C3,"time")});var BW=M(()=>{"use strict";QH();rW();A8();PW()});function Q8(t){for(var e=t.length/6|0,r=new Array(e),n=0;n<e;)r[n]="#"+t.slice(n*6,++n*6);return r}var FW=M(()=>{"use strict";o(Q8,"default")});var Z8,zW=M(()=>{"use strict";FW();Z8=Q8("4e79a7f28e2ce1575976b7b259a14fedc949af7aa1ff9da79c755fbab0ab")});var GW=M(()=>{"use strict";zW()});function Pn(t){return o(function(){return t},"constant")}var A3=M(()=>{"use strict";o(Pn,"default")});function VW(t){return t>1?0:t<-1?Mp:Math.acos(t)}function e_(t){return t>=1?zy:t<=-1?-zy:Math.asin(t)}var J8,la,Eh,$W,_3,kl,pd,Zi,Mp,zy,Ip,L3=M(()=>{"use strict";J8=Math.abs,la=Math.atan2,Eh=Math.cos,$W=Math.max,_3=Math.min,kl=Math.sin,pd=Math.sqrt,Zi=1e-12,Mp=Math.PI,zy=Mp/2,Ip=2*Mp;o(VW,"acos");o(e_,"asin")});function D3(t){let e=3;return t.digits=function(r){if(!arguments.length)return e;if(r==null)e=null;else{let n=Math.floor(r);if(!(n>=0))throw new RangeError(`invalid digits: ${r}`);e=n}return t},()=>new sd(e)}var t_=M(()=>{"use strict";d8();o(D3,"withPath")});function lEe(t){return t.innerRadius}function cEe(t){return t.outerRadius}function uEe(t){return t.startAngle}function hEe(t){return t.endAngle}function fEe(t){return t&&t.padAngle}function dEe(t,e,r,n,i,a,s,l){var u=r-t,h=n-e,f=s-i,d=l-a,p=d*u-f*h;if(!(p*p<Zi))return p=(f*(e-a)-d*(t-i))/p,[t+p*u,e+p*h]}function N3(t,e,r,n,i,a,s){var l=t-r,u=e-n,h=(s?a:-a)/pd(l*l+u*u),f=h*u,d=-h*l,p=t+f,m=e+d,g=r+f,y=n+d,v=(p+g)/2,x=(m+y)/2,b=g-p,w=y-m,_=b*b+w*w,T=i-a,E=p*y-g*m,L=(w<0?-1:1)*pd($W(0,T*T*_-E*E)),C=(E*w-b*L)/_,A=(-E*b-w*L)/_,I=(E*w+b*L)/_,D=(-E*b+w*L)/_,k=C-v,R=A-x,S=I-v,O=D-x;return k*k+R*R>S*S+O*O&&(C=I,A=D),{cx:C,cy:A,x01:-f,y01:-d,x11:C*(i/T-1),y11:A*(i/T-1)}}function El(){var t=lEe,e=cEe,r=Pn(0),n=null,i=uEe,a=hEe,s=fEe,l=null,u=D3(h);function h(){var f,d,p=+t.apply(this,arguments),m=+e.apply(this,arguments),g=i.apply(this,arguments)-zy,y=a.apply(this,arguments)-zy,v=J8(y-g),x=y>g;if(l||(l=f=u()),m<p&&(d=m,m=p,p=d),!(m>Zi))l.moveTo(0,0);else if(v>Ip-Zi)l.moveTo(m*Eh(g),m*kl(g)),l.arc(0,0,m,g,y,!x),p>Zi&&(l.moveTo(p*Eh(y),p*kl(y)),l.arc(0,0,p,y,g,x));else{var b=g,w=y,_=g,T=y,E=v,L=v,C=s.apply(this,arguments)/2,A=C>Zi&&(n?+n.apply(this,arguments):pd(p*p+m*m)),I=_3(J8(m-p)/2,+r.apply(this,arguments)),D=I,k=I,R,S;if(A>Zi){var O=e_(A/p*kl(C)),N=e_(A/m*kl(C));(E-=O*2)>Zi?(O*=x?1:-1,_+=O,T-=O):(E=0,_=T=(g+y)/2),(L-=N*2)>Zi?(N*=x?1:-1,b+=N,w-=N):(L=0,b=w=(g+y)/2)}var P=m*Eh(b),F=m*kl(b),B=p*Eh(T),$=p*kl(T);if(I>Zi){var z=m*Eh(w),W=m*kl(w),j=p*Eh(_),K=p*kl(_),ie;if(v<Mp)if(ie=dEe(P,F,j,K,z,W,B,$)){var Q=P-ie[0],ee=F-ie[1],J=z-ie[0],H=W-ie[1],q=1/kl(VW((Q*J+ee*H)/(pd(Q*Q+ee*ee)*pd(J*J+H*H)))/2),Z=pd(ie[0]*ie[0]+ie[1]*ie[1]);D=_3(I,(p-Z)/(q-1)),k=_3(I,(m-Z)/(q+1))}else D=k=0}L>Zi?k>Zi?(R=N3(j,K,P,F,m,k,x),S=N3(z,W,B,$,m,k,x),l.moveTo(R.cx+R.x01,R.cy+R.y01),k<I?l.arc(R.cx,R.cy,k,la(R.y01,R.x01),la(S.y01,S.x01),!x):(l.arc(R.cx,R.cy,k,la(R.y01,R.x01),la(R.y11,R.x11),!x),l.arc(0,0,m,la(R.cy+R.y11,R.cx+R.x11),la(S.cy+S.y11,S.cx+S.x11),!x),l.arc(S.cx,S.cy,k,la(S.y11,S.x11),la(S.y01,S.x01),!x))):(l.moveTo(P,F),l.arc(0,0,m,b,w,!x)):l.moveTo(P,F),!(p>Zi)||!(E>Zi)?l.lineTo(B,$):D>Zi?(R=N3(B,$,z,W,p,-D,x),S=N3(P,F,j,K,p,-D,x),l.lineTo(R.cx+R.x01,R.cy+R.y01),D<I?l.arc(R.cx,R.cy,D,la(R.y01,R.x01),la(S.y01,S.x01),!x):(l.arc(R.cx,R.cy,D,la(R.y01,R.x01),la(R.y11,R.x11),!x),l.arc(0,0,p,la(R.cy+R.y11,R.cx+R.x11),la(S.cy+S.y11,S.cx+S.x11),x),l.arc(S.cx,S.cy,D,la(S.y11,S.x11),la(S.y01,S.x01),!x))):l.arc(0,0,p,T,_,x)}if(l.closePath(),f)return l=null,f+""||null}return o(h,"arc"),h.centroid=function(){var f=(+t.apply(this,arguments)+ +e.apply(this,arguments))/2,d=(+i.apply(this,arguments)+ +a.apply(this,arguments))/2-Mp/2;return[Eh(d)*f,kl(d)*f]},h.innerRadius=function(f){return arguments.length?(t=typeof f=="function"?f:Pn(+f),h):t},h.outerRadius=function(f){return arguments.length?(e=typeof f=="function"?f:Pn(+f),h):e},h.cornerRadius=function(f){return arguments.length?(r=typeof f=="function"?f:Pn(+f),h):r},h.padRadius=function(f){return arguments.length?(n=f==null?null:typeof f=="function"?f:Pn(+f),h):n},h.startAngle=function(f){return arguments.length?(i=typeof f=="function"?f:Pn(+f),h):i},h.endAngle=function(f){return arguments.length?(a=typeof f=="function"?f:Pn(+f),h):a},h.padAngle=function(f){return arguments.length?(s=typeof f=="function"?f:Pn(+f),h):s},h.context=function(f){return arguments.length?(l=f??null,h):l},h}var UW=M(()=>{"use strict";A3();L3();t_();o(lEe,"arcInnerRadius");o(cEe,"arcOuterRadius");o(uEe,"arcStartAngle");o(hEe,"arcEndAngle");o(fEe,"arcPadAngle");o(dEe,"intersect");o(N3,"cornerTangents");o(El,"default")});function Gy(t){return typeof t=="object"&&"length"in t?t:Array.from(t)}var O2t,r_=M(()=>{"use strict";O2t=Array.prototype.slice;o(Gy,"default")});function HW(t){this._context=t}function Op(t){return new HW(t)}var n_=M(()=>{"use strict";o(HW,"Linear");HW.prototype={areaStart:o(function(){this._line=0},"areaStart"),areaEnd:o(function(){this._line=NaN},"areaEnd"),lineStart:o(function(){this._point=0},"lineStart"),lineEnd:o(function(){(this._line||this._line!==0&&this._point===1)&&this._context.closePath(),this._line=1-this._line},"lineEnd"),point:o(function(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,e):this._context.moveTo(t,e);break;case 1:this._point=2;default:this._context.lineTo(t,e);break}},"point")};o(Op,"default")});function WW(t){return t[0]}function YW(t){return t[1]}var qW=M(()=>{"use strict";o(WW,"x");o(YW,"y")});function Ka(t,e){var r=Pn(!0),n=null,i=Op,a=null,s=D3(l);t=typeof t=="function"?t:t===void 0?WW:Pn(t),e=typeof e=="function"?e:e===void 0?YW:Pn(e);function l(u){var h,f=(u=Gy(u)).length,d,p=!1,m;for(n==null&&(a=i(m=s())),h=0;h<=f;++h)!(h<f&&r(d=u[h],h,u))===p&&((p=!p)?a.lineStart():a.lineEnd()),p&&a.point(+t(d,h,u),+e(d,h,u));if(m)return a=null,m+""||null}return o(l,"line"),l.x=function(u){return arguments.length?(t=typeof u=="function"?u:Pn(+u),l):t},l.y=function(u){return arguments.length?(e=typeof u=="function"?u:Pn(+u),l):e},l.defined=function(u){return arguments.length?(r=typeof u=="function"?u:Pn(!!u),l):r},l.curve=function(u){return arguments.length?(i=u,n!=null&&(a=i(n)),l):i},l.context=function(u){return arguments.length?(u==null?n=a=null:a=i(n=u),l):n},l}var XW=M(()=>{"use strict";r_();A3();n_();t_();qW();o(Ka,"default")});function i_(t,e){return e<t?-1:e>t?1:e>=t?0:NaN}var jW=M(()=>{"use strict";o(i_,"default")});function a_(t){return t}var KW=M(()=>{"use strict";o(a_,"default")});function R3(){var t=a_,e=i_,r=null,n=Pn(0),i=Pn(Ip),a=Pn(0);function s(l){var u,h=(l=Gy(l)).length,f,d,p=0,m=new Array(h),g=new Array(h),y=+n.apply(this,arguments),v=Math.min(Ip,Math.max(-Ip,i.apply(this,arguments)-y)),x,b=Math.min(Math.abs(v)/h,a.apply(this,arguments)),w=b*(v<0?-1:1),_;for(u=0;u<h;++u)(_=g[m[u]=u]=+t(l[u],u,l))>0&&(p+=_);for(e!=null?m.sort(function(T,E){return e(g[T],g[E])}):r!=null&&m.sort(function(T,E){return r(l[T],l[E])}),u=0,d=p?(v-h*w)/p:0;u<h;++u,y=x)f=m[u],_=g[f],x=y+(_>0?_*d:0)+w,g[f]={data:l[f],index:u,value:_,startAngle:y,endAngle:x,padAngle:b};return g}return o(s,"pie"),s.value=function(l){return arguments.length?(t=typeof l=="function"?l:Pn(+l),s):t},s.sortValues=function(l){return arguments.length?(e=l,r=null,s):e},s.sort=function(l){return arguments.length?(r=l,e=null,s):r},s.startAngle=function(l){return arguments.length?(n=typeof l=="function"?l:Pn(+l),s):n},s.endAngle=function(l){return arguments.length?(i=typeof l=="function"?l:Pn(+l),s):i},s.padAngle=function(l){return arguments.length?(a=typeof l=="function"?l:Pn(+l),s):a},s}var QW=M(()=>{"use strict";r_();A3();jW();KW();L3();o(R3,"default")});function s_(t){return new M3(t,!0)}function o_(t){return new M3(t,!1)}var M3,ZW=M(()=>{"use strict";M3=class{static{o(this,"Bump")}constructor(e,r){this._context=e,this._x=r}areaStart(){this._line=0}areaEnd(){this._line=NaN}lineStart(){this._point=0}lineEnd(){(this._line||this._line!==0&&this._point===1)&&this._context.closePath(),this._line=1-this._line}point(e,r){switch(e=+e,r=+r,this._point){case 0:{this._point=1,this._line?this._context.lineTo(e,r):this._context.moveTo(e,r);break}case 1:this._point=2;default:{this._x?this._context.bezierCurveTo(this._x0=(this._x0+e)/2,this._y0,this._x0,r,e,r):this._context.bezierCurveTo(this._x0,this._y0=(this._y0+r)/2,e,this._y0,e,r);break}}this._x0=e,this._y0=r}};o(s_,"bumpX");o(o_,"bumpY")});function Ks(){}var $y=M(()=>{"use strict";o(Ks,"default")});function Pp(t,e,r){t._context.bezierCurveTo((2*t._x0+t._x1)/3,(2*t._y0+t._y1)/3,(t._x0+2*t._x1)/3,(t._y0+2*t._y1)/3,(t._x0+4*t._x1+e)/6,(t._y0+4*t._y1+r)/6)}function Vy(t){this._context=t}function Do(t){return new Vy(t)}var Uy=M(()=>{"use strict";o(Pp,"point");o(Vy,"Basis");Vy.prototype={areaStart:o(function(){this._line=0},"areaStart"),areaEnd:o(function(){this._line=NaN},"areaEnd"),lineStart:o(function(){this._x0=this._x1=this._y0=this._y1=NaN,this._point=0},"lineStart"),lineEnd:o(function(){switch(this._point){case 3:Pp(this,this._x1,this._y1);case 2:this._context.lineTo(this._x1,this._y1);break}(this._line||this._line!==0&&this._point===1)&&this._context.closePath(),this._line=1-this._line},"lineEnd"),point:o(function(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,e):this._context.moveTo(t,e);break;case 1:this._point=2;break;case 2:this._point=3,this._context.lineTo((5*this._x0+this._x1)/6,(5*this._y0+this._y1)/6);default:Pp(this,t,e);break}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=e},"point")};o(Do,"default")});function JW(t){this._context=t}function I3(t){return new JW(t)}var eY=M(()=>{"use strict";$y();Uy();o(JW,"BasisClosed");JW.prototype={areaStart:Ks,areaEnd:Ks,lineStart:o(function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._y0=this._y1=this._y2=this._y3=this._y4=NaN,this._point=0},"lineStart"),lineEnd:o(function(){switch(this._point){case 1:{this._context.moveTo(this._x2,this._y2),this._context.closePath();break}case 2:{this._context.moveTo((this._x2+2*this._x3)/3,(this._y2+2*this._y3)/3),this._context.lineTo((this._x3+2*this._x2)/3,(this._y3+2*this._y2)/3),this._context.closePath();break}case 3:{this.point(this._x2,this._y2),this.point(this._x3,this._y3),this.point(this._x4,this._y4);break}}},"lineEnd"),point:o(function(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1,this._x2=t,this._y2=e;break;case 1:this._point=2,this._x3=t,this._y3=e;break;case 2:this._point=3,this._x4=t,this._y4=e,this._context.moveTo((this._x0+4*this._x1+t)/6,(this._y0+4*this._y1+e)/6);break;default:Pp(this,t,e);break}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=e},"point")};o(I3,"default")});function tY(t){this._context=t}function O3(t){return new tY(t)}var rY=M(()=>{"use strict";Uy();o(tY,"BasisOpen");tY.prototype={areaStart:o(function(){this._line=0},"areaStart"),areaEnd:o(function(){this._line=NaN},"areaEnd"),lineStart:o(function(){this._x0=this._x1=this._y0=this._y1=NaN,this._point=0},"lineStart"),lineEnd:o(function(){(this._line||this._line!==0&&this._point===3)&&this._context.closePath(),this._line=1-this._line},"lineEnd"),point:o(function(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1;break;case 1:this._point=2;break;case 2:this._point=3;var r=(this._x0+4*this._x1+t)/6,n=(this._y0+4*this._y1+e)/6;this._line?this._context.lineTo(r,n):this._context.moveTo(r,n);break;case 3:this._point=4;default:Pp(this,t,e);break}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=e},"point")};o(O3,"default")});function nY(t,e){this._basis=new Vy(t),this._beta=e}var l_,iY=M(()=>{"use strict";Uy();o(nY,"Bundle");nY.prototype={lineStart:o(function(){this._x=[],this._y=[],this._basis.lineStart()},"lineStart"),lineEnd:o(function(){var t=this._x,e=this._y,r=t.length-1;if(r>0)for(var n=t[0],i=e[0],a=t[r]-n,s=e[r]-i,l=-1,u;++l<=r;)u=l/r,this._basis.point(this._beta*t[l]+(1-this._beta)*(n+u*a),this._beta*e[l]+(1-this._beta)*(i+u*s));this._x=this._y=null,this._basis.lineEnd()},"lineEnd"),point:o(function(t,e){this._x.push(+t),this._y.push(+e)},"point")};l_=o(function t(e){function r(n){return e===1?new Vy(n):new nY(n,e)}return o(r,"bundle"),r.beta=function(n){return t(+n)},r},"custom")(.85)});function Bp(t,e,r){t._context.bezierCurveTo(t._x1+t._k*(t._x2-t._x0),t._y1+t._k*(t._y2-t._y0),t._x2+t._k*(t._x1-e),t._y2+t._k*(t._y1-r),t._x2,t._y2)}function P3(t,e){this._context=t,this._k=(1-e)/6}var c_,Hy=M(()=>{"use strict";o(Bp,"point");o(P3,"Cardinal");P3.prototype={areaStart:o(function(){this._line=0},"areaStart"),areaEnd:o(function(){this._line=NaN},"areaEnd"),lineStart:o(function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._point=0},"lineStart"),lineEnd:o(function(){switch(this._point){case 2:this._context.lineTo(this._x2,this._y2);break;case 3:Bp(this,this._x1,this._y1);break}(this._line||this._line!==0&&this._point===1)&&this._context.closePath(),this._line=1-this._line},"lineEnd"),point:o(function(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,e):this._context.moveTo(t,e);break;case 1:this._point=2,this._x1=t,this._y1=e;break;case 2:this._point=3;default:Bp(this,t,e);break}this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=e},"point")};c_=o(function t(e){function r(n){return new P3(n,e)}return o(r,"cardinal"),r.tension=function(n){return t(+n)},r},"custom")(0)});function B3(t,e){this._context=t,this._k=(1-e)/6}var u_,h_=M(()=>{"use strict";$y();Hy();o(B3,"CardinalClosed");B3.prototype={areaStart:Ks,areaEnd:Ks,lineStart:o(function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._x5=this._y0=this._y1=this._y2=this._y3=this._y4=this._y5=NaN,this._point=0},"lineStart"),lineEnd:o(function(){switch(this._point){case 1:{this._context.moveTo(this._x3,this._y3),this._context.closePath();break}case 2:{this._context.lineTo(this._x3,this._y3),this._context.closePath();break}case 3:{this.point(this._x3,this._y3),this.point(this._x4,this._y4),this.point(this._x5,this._y5);break}}},"lineEnd"),point:o(function(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1,this._x3=t,this._y3=e;break;case 1:this._point=2,this._context.moveTo(this._x4=t,this._y4=e);break;case 2:this._point=3,this._x5=t,this._y5=e;break;default:Bp(this,t,e);break}this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=e},"point")};u_=o(function t(e){function r(n){return new B3(n,e)}return o(r,"cardinal"),r.tension=function(n){return t(+n)},r},"custom")(0)});function F3(t,e){this._context=t,this._k=(1-e)/6}var f_,d_=M(()=>{"use strict";Hy();o(F3,"CardinalOpen");F3.prototype={areaStart:o(function(){this._line=0},"areaStart"),areaEnd:o(function(){this._line=NaN},"areaEnd"),lineStart:o(function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._point=0},"lineStart"),lineEnd:o(function(){(this._line||this._line!==0&&this._point===3)&&this._context.closePath(),this._line=1-this._line},"lineEnd"),point:o(function(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1;break;case 1:this._point=2;break;case 2:this._point=3,this._line?this._context.lineTo(this._x2,this._y2):this._context.moveTo(this._x2,this._y2);break;case 3:this._point=4;default:Bp(this,t,e);break}this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=e},"point")};f_=o(function t(e){function r(n){return new F3(n,e)}return o(r,"cardinal"),r.tension=function(n){return t(+n)},r},"custom")(0)});function Wy(t,e,r){var n=t._x1,i=t._y1,a=t._x2,s=t._y2;if(t._l01_a>Zi){var l=2*t._l01_2a+3*t._l01_a*t._l12_a+t._l12_2a,u=3*t._l01_a*(t._l01_a+t._l12_a);n=(n*l-t._x0*t._l12_2a+t._x2*t._l01_2a)/u,i=(i*l-t._y0*t._l12_2a+t._y2*t._l01_2a)/u}if(t._l23_a>Zi){var h=2*t._l23_2a+3*t._l23_a*t._l12_a+t._l12_2a,f=3*t._l23_a*(t._l23_a+t._l12_a);a=(a*h+t._x1*t._l23_2a-e*t._l12_2a)/f,s=(s*h+t._y1*t._l23_2a-r*t._l12_2a)/f}t._context.bezierCurveTo(n,i,a,s,t._x2,t._y2)}function aY(t,e){this._context=t,this._alpha=e}var p_,z3=M(()=>{"use strict";L3();Hy();o(Wy,"point");o(aY,"CatmullRom");aY.prototype={areaStart:o(function(){this._line=0},"areaStart"),areaEnd:o(function(){this._line=NaN},"areaEnd"),lineStart:o(function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},"lineStart"),lineEnd:o(function(){switch(this._point){case 2:this._context.lineTo(this._x2,this._y2);break;case 3:this.point(this._x2,this._y2);break}(this._line||this._line!==0&&this._point===1)&&this._context.closePath(),this._line=1-this._line},"lineEnd"),point:o(function(t,e){if(t=+t,e=+e,this._point){var r=this._x2-t,n=this._y2-e;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(r*r+n*n,this._alpha))}switch(this._point){case 0:this._point=1,this._line?this._context.lineTo(t,e):this._context.moveTo(t,e);break;case 1:this._point=2;break;case 2:this._point=3;default:Wy(this,t,e);break}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=e},"point")};p_=o(function t(e){function r(n){return e?new aY(n,e):new P3(n,0)}return o(r,"catmullRom"),r.alpha=function(n){return t(+n)},r},"custom")(.5)});function sY(t,e){this._context=t,this._alpha=e}var m_,oY=M(()=>{"use strict";h_();$y();z3();o(sY,"CatmullRomClosed");sY.prototype={areaStart:Ks,areaEnd:Ks,lineStart:o(function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._x5=this._y0=this._y1=this._y2=this._y3=this._y4=this._y5=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},"lineStart"),lineEnd:o(function(){switch(this._point){case 1:{this._context.moveTo(this._x3,this._y3),this._context.closePath();break}case 2:{this._context.lineTo(this._x3,this._y3),this._context.closePath();break}case 3:{this.point(this._x3,this._y3),this.point(this._x4,this._y4),this.point(this._x5,this._y5);break}}},"lineEnd"),point:o(function(t,e){if(t=+t,e=+e,this._point){var r=this._x2-t,n=this._y2-e;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(r*r+n*n,this._alpha))}switch(this._point){case 0:this._point=1,this._x3=t,this._y3=e;break;case 1:this._point=2,this._context.moveTo(this._x4=t,this._y4=e);break;case 2:this._point=3,this._x5=t,this._y5=e;break;default:Wy(this,t,e);break}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=e},"point")};m_=o(function t(e){function r(n){return e?new sY(n,e):new B3(n,0)}return o(r,"catmullRom"),r.alpha=function(n){return t(+n)},r},"custom")(.5)});function lY(t,e){this._context=t,this._alpha=e}var g_,cY=M(()=>{"use strict";d_();z3();o(lY,"CatmullRomOpen");lY.prototype={areaStart:o(function(){this._line=0},"areaStart"),areaEnd:o(function(){this._line=NaN},"areaEnd"),lineStart:o(function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},"lineStart"),lineEnd:o(function(){(this._line||this._line!==0&&this._point===3)&&this._context.closePath(),this._line=1-this._line},"lineEnd"),point:o(function(t,e){if(t=+t,e=+e,this._point){var r=this._x2-t,n=this._y2-e;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(r*r+n*n,this._alpha))}switch(this._point){case 0:this._point=1;break;case 1:this._point=2;break;case 2:this._point=3,this._line?this._context.lineTo(this._x2,this._y2):this._context.moveTo(this._x2,this._y2);break;case 3:this._point=4;default:Wy(this,t,e);break}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=e},"point")};g_=o(function t(e){function r(n){return e?new lY(n,e):new F3(n,0)}return o(r,"catmullRom"),r.alpha=function(n){return t(+n)},r},"custom")(.5)});function uY(t){this._context=t}function G3(t){return new uY(t)}var hY=M(()=>{"use strict";$y();o(uY,"LinearClosed");uY.prototype={areaStart:Ks,areaEnd:Ks,lineStart:o(function(){this._point=0},"lineStart"),lineEnd:o(function(){this._point&&this._context.closePath()},"lineEnd"),point:o(function(t,e){t=+t,e=+e,this._point?this._context.lineTo(t,e):(this._point=1,this._context.moveTo(t,e))},"point")};o(G3,"default")});function fY(t){return t<0?-1:1}function dY(t,e,r){var n=t._x1-t._x0,i=e-t._x1,a=(t._y1-t._y0)/(n||i<0&&-0),s=(r-t._y1)/(i||n<0&&-0),l=(a*i+s*n)/(n+i);return(fY(a)+fY(s))*Math.min(Math.abs(a),Math.abs(s),.5*Math.abs(l))||0}function pY(t,e){var r=t._x1-t._x0;return r?(3*(t._y1-t._y0)/r-e)/2:e}function y_(t,e,r){var n=t._x0,i=t._y0,a=t._x1,s=t._y1,l=(a-n)/3;t._context.bezierCurveTo(n+l,i+l*e,a-l,s-l*r,a,s)}function $3(t){this._context=t}function mY(t){this._context=new gY(t)}function gY(t){this._context=t}function v_(t){return new $3(t)}function x_(t){return new mY(t)}var yY=M(()=>{"use strict";o(fY,"sign");o(dY,"slope3");o(pY,"slope2");o(y_,"point");o($3,"MonotoneX");$3.prototype={areaStart:o(function(){this._line=0},"areaStart"),areaEnd:o(function(){this._line=NaN},"areaEnd"),lineStart:o(function(){this._x0=this._x1=this._y0=this._y1=this._t0=NaN,this._point=0},"lineStart"),lineEnd:o(function(){switch(this._point){case 2:this._context.lineTo(this._x1,this._y1);break;case 3:y_(this,this._t0,pY(this,this._t0));break}(this._line||this._line!==0&&this._point===1)&&this._context.closePath(),this._line=1-this._line},"lineEnd"),point:o(function(t,e){var r=NaN;if(t=+t,e=+e,!(t===this._x1&&e===this._y1)){switch(this._point){case 0:this._point=1,this._line?this._context.lineTo(t,e):this._context.moveTo(t,e);break;case 1:this._point=2;break;case 2:this._point=3,y_(this,pY(this,r=dY(this,t,e)),r);break;default:y_(this,this._t0,r=dY(this,t,e));break}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=e,this._t0=r}},"point")};o(mY,"MonotoneY");(mY.prototype=Object.create($3.prototype)).point=function(t,e){$3.prototype.point.call(this,e,t)};o(gY,"ReflectContext");gY.prototype={moveTo:o(function(t,e){this._context.moveTo(e,t)},"moveTo"),closePath:o(function(){this._context.closePath()},"closePath"),lineTo:o(function(t,e){this._context.lineTo(e,t)},"lineTo"),bezierCurveTo:o(function(t,e,r,n,i,a){this._context.bezierCurveTo(e,t,n,r,a,i)},"bezierCurveTo")};o(v_,"monotoneX");o(x_,"monotoneY")});function xY(t){this._context=t}function vY(t){var e,r=t.length-1,n,i=new Array(r),a=new Array(r),s=new Array(r);for(i[0]=0,a[0]=2,s[0]=t[0]+2*t[1],e=1;e<r-1;++e)i[e]=1,a[e]=4,s[e]=4*t[e]+2*t[e+1];for(i[r-1]=2,a[r-1]=7,s[r-1]=8*t[r-1]+t[r],e=1;e<r;++e)n=i[e]/a[e-1],a[e]-=n,s[e]-=n*s[e-1];for(i[r-1]=s[r-1]/a[r-1],e=r-2;e>=0;--e)i[e]=(s[e]-i[e+1])/a[e];for(a[r-1]=(t[r]+i[r-1])/2,e=0;e<r-1;++e)a[e]=2*t[e+1]-i[e+1];return[i,a]}function V3(t){return new xY(t)}var bY=M(()=>{"use strict";o(xY,"Natural");xY.prototype={areaStart:o(function(){this._line=0},"areaStart"),areaEnd:o(function(){this._line=NaN},"areaEnd"),lineStart:o(function(){this._x=[],this._y=[]},"lineStart"),lineEnd:o(function(){var t=this._x,e=this._y,r=t.length;if(r)if(this._line?this._context.lineTo(t[0],e[0]):this._context.moveTo(t[0],e[0]),r===2)this._context.lineTo(t[1],e[1]);else for(var n=vY(t),i=vY(e),a=0,s=1;s<r;++a,++s)this._context.bezierCurveTo(n[0][a],i[0][a],n[1][a],i[1][a],t[s],e[s]);(this._line||this._line!==0&&r===1)&&this._context.closePath(),this._line=1-this._line,this._x=this._y=null},"lineEnd"),point:o(function(t,e){this._x.push(+t),this._y.push(+e)},"point")};o(vY,"controlPoints");o(V3,"default")});function U3(t,e){this._context=t,this._t=e}function H3(t){return new U3(t,.5)}function b_(t){return new U3(t,0)}function w_(t){return new U3(t,1)}var wY=M(()=>{"use strict";o(U3,"Step");U3.prototype={areaStart:o(function(){this._line=0},"areaStart"),areaEnd:o(function(){this._line=NaN},"areaEnd"),lineStart:o(function(){this._x=this._y=NaN,this._point=0},"lineStart"),lineEnd:o(function(){0<this._t&&this._t<1&&this._point===2&&this._context.lineTo(this._x,this._y),(this._line||this._line!==0&&this._point===1)&&this._context.closePath(),this._line>=0&&(this._t=1-this._t,this._line=1-this._line)},"lineEnd"),point:o(function(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,e):this._context.moveTo(t,e);break;case 1:this._point=2;default:{if(this._t<=0)this._context.lineTo(this._x,e),this._context.lineTo(t,e);else{var r=this._x*(1-this._t)+t*this._t;this._context.lineTo(r,this._y),this._context.lineTo(r,e)}break}}this._x=t,this._y=e},"point")};o(H3,"default");o(b_,"stepBefore");o(w_,"stepAfter")});var TY=M(()=>{"use strict";UW();XW();QW();eY();rY();Uy();ZW();iY();h_();d_();Hy();oY();cY();z3();hY();n_();yY();bY();wY()});var kY=M(()=>{"use strict"});var EY=M(()=>{"use strict"});function Sh(t,e,r){this.k=t,this.x=e,this.y=r}function k_(t){for(;!t.__zoom;)if(!(t=t.parentNode))return T_;return t.__zoom}var T_,E_=M(()=>{"use strict";o(Sh,"Transform");Sh.prototype={constructor:Sh,scale:o(function(t){return t===1?this:new Sh(this.k*t,this.x,this.y)},"scale"),translate:o(function(t,e){return t===0&e===0?this:new Sh(this.k,this.x+this.k*t,this.y+this.k*e)},"translate"),apply:o(function(t){return[t[0]*this.k+this.x,t[1]*this.k+this.y]},"apply"),applyX:o(function(t){return t*this.k+this.x},"applyX"),applyY:o(function(t){return t*this.k+this.y},"applyY"),invert:o(function(t){return[(t[0]-this.x)/this.k,(t[1]-this.y)/this.k]},"invert"),invertX:o(function(t){return(t-this.x)/this.k},"invertX"),invertY:o(function(t){return(t-this.y)/this.k},"invertY"),rescaleX:o(function(t){return t.copy().domain(t.range().map(this.invertX,this).map(t.invert,t))},"rescaleX"),rescaleY:o(function(t){return t.copy().domain(t.range().map(this.invertY,this).map(t.invert,t))},"rescaleY"),toString:o(function(){return"translate("+this.x+","+this.y+") scale("+this.k+")"},"toString")};T_=new Sh(1,0,0);k_.prototype=Sh.prototype;o(k_,"transform")});var SY=M(()=>{"use strict"});var CY=M(()=>{"use strict";s3();kY();EY();E_();SY()});var AY=M(()=>{"use strict";CY();E_()});var mr=M(()=>{"use strict";ph();iV();kH();AH();kp();_H();LH();b7();jV();DH();l8();NH();MH();S8();qH();XH();Cp();d8();jH();RH();KH();BW();GW();gl();TY();S3();K8();e3();s3();AY()});var _Y=Ni(Ji=>{"use strict";Object.defineProperty(Ji,"__esModule",{value:!0});Ji.BLANK_URL=Ji.relativeFirstCharacters=Ji.whitespaceEscapeCharsRegex=Ji.urlSchemeRegex=Ji.ctrlCharactersRegex=Ji.htmlCtrlEntityRegex=Ji.htmlEntitiesRegex=Ji.invalidProtocolRegex=void 0;Ji.invalidProtocolRegex=/^([^\w]*)(javascript|data|vbscript)/im;Ji.htmlEntitiesRegex=/&#(\w+)(^\w|;)?/g;Ji.htmlCtrlEntityRegex=/&(newline|tab);/gi;Ji.ctrlCharactersRegex=/[\u0000-\u001F\u007F-\u009F\u2000-\u200D\uFEFF]/gim;Ji.urlSchemeRegex=/^.+(:|:)/gim;Ji.whitespaceEscapeCharsRegex=/(\\|%5[cC])((%(6[eE]|72|74))|[nrt])/g;Ji.relativeFirstCharacters=[".","/"];Ji.BLANK_URL="about:blank"});var Fp=Ni(W3=>{"use strict";Object.defineProperty(W3,"__esModule",{value:!0});W3.sanitizeUrl=void 0;var Sa=_Y();function pEe(t){return Sa.relativeFirstCharacters.indexOf(t[0])>-1}o(pEe,"isRelativeUrlWithoutProtocol");function mEe(t){var e=t.replace(Sa.ctrlCharactersRegex,"");return e.replace(Sa.htmlEntitiesRegex,function(r,n){return String.fromCharCode(n)})}o(mEe,"decodeHtmlCharacters");function gEe(t){return URL.canParse(t)}o(gEe,"isValidUrl");function LY(t){try{return decodeURIComponent(t)}catch{return t}}o(LY,"decodeURI");function yEe(t){if(!t)return Sa.BLANK_URL;var e,r=LY(t.trim());do r=mEe(r).replace(Sa.htmlCtrlEntityRegex,"").replace(Sa.ctrlCharactersRegex,"").replace(Sa.whitespaceEscapeCharsRegex,"").trim(),r=LY(r),e=r.match(Sa.ctrlCharactersRegex)||r.match(Sa.htmlEntitiesRegex)||r.match(Sa.htmlCtrlEntityRegex)||r.match(Sa.whitespaceEscapeCharsRegex);while(e&&e.length>0);var n=r;if(!n)return Sa.BLANK_URL;if(pEe(n))return n;var i=n.trimStart(),a=i.match(Sa.urlSchemeRegex);if(!a)return n;var s=a[0].toLowerCase().trim();if(Sa.invalidProtocolRegex.test(s))return Sa.BLANK_URL;var l=i.replace(/\\/g,"/");if(s==="mailto:"||s.includes("://"))return l;if(s==="http:"||s==="https:"){if(!gEe(l))return Sa.BLANK_URL;var u=new URL(l);return u.protocol=u.protocol.toLowerCase(),u.hostname=u.hostname.toLowerCase(),u.toString()}return l}o(yEe,"sanitizeUrl");W3.sanitizeUrl=yEe});var S_,md,Y3,DY,NY,RY,Sl,Yy,qy=M(()=>{"use strict";S_=ka(Fp(),1);fr();md=o((t,e)=>{let r=t.append("rect");if(r.attr("x",e.x),r.attr("y",e.y),r.attr("fill",e.fill),r.attr("stroke",e.stroke),r.attr("width",e.width),r.attr("height",e.height),e.name&&r.attr("name",e.name),e.rx&&r.attr("rx",e.rx),e.ry&&r.attr("ry",e.ry),e.attrs!==void 0)for(let n in e.attrs)r.attr(n,e.attrs[n]);return e.class&&r.attr("class",e.class),r},"drawRect"),Y3=o((t,e)=>{let r={x:e.startx,y:e.starty,width:e.stopx-e.startx,height:e.stopy-e.starty,fill:e.fill,stroke:e.stroke,class:"rect"};md(t,r).lower()},"drawBackgroundRect"),DY=o((t,e)=>{let r=e.text.replace(jf," "),n=t.append("text");n.attr("x",e.x),n.attr("y",e.y),n.attr("class","legend"),n.style("text-anchor",e.anchor),e.class&&n.attr("class",e.class);let i=n.append("tspan");return i.attr("x",e.x+e.textMargin*2),i.text(r),n},"drawText"),NY=o((t,e,r,n)=>{let i=t.append("image");i.attr("x",e),i.attr("y",r);let a=(0,S_.sanitizeUrl)(n);i.attr("xlink:href",a)},"drawImage"),RY=o((t,e,r,n)=>{let i=t.append("use");i.attr("x",e),i.attr("y",r);let a=(0,S_.sanitizeUrl)(n);i.attr("xlink:href",`#${a}`)},"drawEmbeddedImage"),Sl=o(()=>({x:0,y:0,width:100,height:100,fill:"#EDF2AE",stroke:"#666",anchor:"start",rx:0,ry:0}),"getNoteRect"),Yy=o(()=>({x:0,y:0,width:100,height:100,"text-anchor":"start",style:"#666",textMargin:0,rx:0,ry:0,tspan:!0}),"getTextObj")});var MY,C_,IY,vEe,xEe,bEe,wEe,TEe,kEe,EEe,SEe,CEe,AEe,_Ee,LEe,vu,Cl,OY=M(()=>{"use strict";fr();qy();MY=ka(Fp(),1),C_=o(function(t,e){return md(t,e)},"drawRect"),IY=o(function(t,e,r,n,i,a){let s=t.append("image");s.attr("width",e),s.attr("height",r),s.attr("x",n),s.attr("y",i);let l=a.startsWith("data:image/png;base64")?a:(0,MY.sanitizeUrl)(a);s.attr("xlink:href",l)},"drawImage"),vEe=o((t,e,r)=>{let n=t.append("g"),i=0;for(let a of e){let s=a.textColor?a.textColor:"#444444",l=a.lineColor?a.lineColor:"#444444",u=a.offsetX?parseInt(a.offsetX):0,h=a.offsetY?parseInt(a.offsetY):0,f="";if(i===0){let p=n.append("line");p.attr("x1",a.startPoint.x),p.attr("y1",a.startPoint.y),p.attr("x2",a.endPoint.x),p.attr("y2",a.endPoint.y),p.attr("stroke-width","1"),p.attr("stroke",l),p.style("fill","none"),a.type!=="rel_b"&&p.attr("marker-end","url("+f+"#arrowhead)"),(a.type==="birel"||a.type==="rel_b")&&p.attr("marker-start","url("+f+"#arrowend)"),i=-1}else{let p=n.append("path");p.attr("fill","none").attr("stroke-width","1").attr("stroke",l).attr("d","Mstartx,starty Qcontrolx,controly stopx,stopy ".replaceAll("startx",a.startPoint.x).replaceAll("starty",a.startPoint.y).replaceAll("controlx",a.startPoint.x+(a.endPoint.x-a.startPoint.x)/2-(a.endPoint.x-a.startPoint.x)/4).replaceAll("controly",a.startPoint.y+(a.endPoint.y-a.startPoint.y)/2).replaceAll("stopx",a.endPoint.x).replaceAll("stopy",a.endPoint.y)),a.type!=="rel_b"&&p.attr("marker-end","url("+f+"#arrowhead)"),(a.type==="birel"||a.type==="rel_b")&&p.attr("marker-start","url("+f+"#arrowend)")}let d=r.messageFont();vu(r)(a.label.text,n,Math.min(a.startPoint.x,a.endPoint.x)+Math.abs(a.endPoint.x-a.startPoint.x)/2+u,Math.min(a.startPoint.y,a.endPoint.y)+Math.abs(a.endPoint.y-a.startPoint.y)/2+h,a.label.width,a.label.height,{fill:s},d),a.techn&&a.techn.text!==""&&(d=r.messageFont(),vu(r)("["+a.techn.text+"]",n,Math.min(a.startPoint.x,a.endPoint.x)+Math.abs(a.endPoint.x-a.startPoint.x)/2+u,Math.min(a.startPoint.y,a.endPoint.y)+Math.abs(a.endPoint.y-a.startPoint.y)/2+r.messageFontSize+5+h,Math.max(a.label.width,a.techn.width),a.techn.height,{fill:s,"font-style":"italic"},d))}},"drawRels"),xEe=o(function(t,e,r){let n=t.append("g"),i=e.bgColor?e.bgColor:"none",a=e.borderColor?e.borderColor:"#444444",s=e.fontColor?e.fontColor:"black",l={"stroke-width":1,"stroke-dasharray":"7.0,7.0"};e.nodeType&&(l={"stroke-width":1});let u={x:e.x,y:e.y,fill:i,stroke:a,width:e.width,height:e.height,rx:2.5,ry:2.5,attrs:l};C_(n,u);let h=r.boundaryFont();h.fontWeight="bold",h.fontSize=h.fontSize+2,h.fontColor=s,vu(r)(e.label.text,n,e.x,e.y+e.label.Y,e.width,e.height,{fill:"#444444"},h),e.type&&e.type.text!==""&&(h=r.boundaryFont(),h.fontColor=s,vu(r)(e.type.text,n,e.x,e.y+e.type.Y,e.width,e.height,{fill:"#444444"},h)),e.descr&&e.descr.text!==""&&(h=r.boundaryFont(),h.fontSize=h.fontSize-2,h.fontColor=s,vu(r)(e.descr.text,n,e.x,e.y+e.descr.Y,e.width,e.height,{fill:"#444444"},h))},"drawBoundary"),bEe=o(function(t,e,r){let n=e.bgColor?e.bgColor:r[e.typeC4Shape.text+"_bg_color"],i=e.borderColor?e.borderColor:r[e.typeC4Shape.text+"_border_color"],a=e.fontColor?e.fontColor:"#FFFFFF",s="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAACD0lEQVR4Xu2YoU4EMRCGT+4j8Ai8AhaH4QHgAUjQuFMECUgMIUgwJAgMhgQsAYUiJCiQIBBY+EITsjfTdme6V24v4c8vyGbb+ZjOtN0bNcvjQXmkH83WvYBWto6PLm6v7p7uH1/w2fXD+PBycX1Pv2l3IdDm/vn7x+dXQiAubRzoURa7gRZWd0iGRIiJbOnhnfYBQZNJjNbuyY2eJG8fkDE3bbG4ep6MHUAsgYxmE3nVs6VsBWJSGccsOlFPmLIViMzLOB7pCVO2AtHJMohH7Fh6zqitQK7m0rJvAVYgGcEpe//PLdDz65sM4pF9N7ICcXDKIB5Nv6j7tD0NoSdM2QrU9Gg0ewE1LqBhHR3BBdvj2vapnidjHxD/q6vd7Pvhr31AwcY8eXMTXAKECZZJFXuEq27aLgQK5uLMohCenGGuGewOxSjBvYBqeG6B+Nqiblggdjnc+ZXDy+FNFpFzw76O3UBAROuXh6FoiAcf5g9eTvUgzy0nWg6I8cXHRUpg5bOVBCo+KDpFajOf23GgPme7RSQ+lacIENUgJ6gg1k6HjgOlqnLqip4tEuhv0hNEMXUD0clyXE3p6pZA0S2nnvTlXwLJEZWlb7cTQH1+USgTN4VhAenm/wea1OCAOmqo6fE1WCb9WSKBah+rbUWPWAmE2Rvk0ApiB45eOyNAzU8xcTvj8KvkKEoOaIYeHNA3ZuygAvFMUO0AAAAASUVORK5CYII=";switch(e.typeC4Shape.text){case"person":s="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAACD0lEQVR4Xu2YoU4EMRCGT+4j8Ai8AhaH4QHgAUjQuFMECUgMIUgwJAgMhgQsAYUiJCiQIBBY+EITsjfTdme6V24v4c8vyGbb+ZjOtN0bNcvjQXmkH83WvYBWto6PLm6v7p7uH1/w2fXD+PBycX1Pv2l3IdDm/vn7x+dXQiAubRzoURa7gRZWd0iGRIiJbOnhnfYBQZNJjNbuyY2eJG8fkDE3bbG4ep6MHUAsgYxmE3nVs6VsBWJSGccsOlFPmLIViMzLOB7pCVO2AtHJMohH7Fh6zqitQK7m0rJvAVYgGcEpe//PLdDz65sM4pF9N7ICcXDKIB5Nv6j7tD0NoSdM2QrU9Gg0ewE1LqBhHR3BBdvj2vapnidjHxD/q6vd7Pvhr31AwcY8eXMTXAKECZZJFXuEq27aLgQK5uLMohCenGGuGewOxSjBvYBqeG6B+Nqiblggdjnc+ZXDy+FNFpFzw76O3UBAROuXh6FoiAcf5g9eTvUgzy0nWg6I8cXHRUpg5bOVBCo+KDpFajOf23GgPme7RSQ+lacIENUgJ6gg1k6HjgOlqnLqip4tEuhv0hNEMXUD0clyXE3p6pZA0S2nnvTlXwLJEZWlb7cTQH1+USgTN4VhAenm/wea1OCAOmqo6fE1WCb9WSKBah+rbUWPWAmE2Rvk0ApiB45eOyNAzU8xcTvj8KvkKEoOaIYeHNA3ZuygAvFMUO0AAAAASUVORK5CYII=";break;case"external_person":s="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAB6ElEQVR4Xu2YLY+EMBCG9+dWr0aj0Wg0Go1Go0+j8Xdv2uTCvv1gpt0ebHKPuhDaeW4605Z9mJvx4AdXUyTUdd08z+u6flmWZRnHsWkafk9DptAwDPu+f0eAYtu2PEaGWuj5fCIZrBAC2eLBAnRCsEkkxmeaJp7iDJ2QMDdHsLg8SxKFEJaAo8lAXnmuOFIhTMpxxKATebo4UiFknuNo4OniSIXQyRxEA3YsnjGCVEjVXD7yLUAqxBGUyPv/Y4W2beMgGuS7kVQIBycH0fD+oi5pezQETxdHKmQKGk1eQEYldK+jw5GxPfZ9z7Mk0Qnhf1W1m3w//EUn5BDmSZsbR44QQLBEqrBHqOrmSKaQAxdnLArCrxZcM7A7ZKs4ioRq8LFC+NpC3WCBJsvpVw5edm9iEXFuyNfxXAgSwfrFQ1c0iNda8AdejvUgnktOtJQQxmcfFzGglc5WVCj7oDgFqU18boeFSs52CUh8LE8BIVQDT1ABrB0HtgSEYlX5doJnCwv9TXocKCaKbnwhdDKPq4lf3SwU3HLq4V/+WYhHVMa/3b4IlfyikAduCkcBc7mQ3/z/Qq/cTuikhkzB12Ae/mcJC9U+Vo8Ej1gWAtgbeGgFsAMHr50BIWOLCbezvhpBFUdY6EJuJ/QDW0XoMX60zZ0AAAAASUVORK5CYII=";break}let l=t.append("g");l.attr("class","person-man");let u=Sl();switch(e.typeC4Shape.text){case"person":case"external_person":case"system":case"external_system":case"container":case"external_container":case"component":case"external_component":u.x=e.x,u.y=e.y,u.fill=n,u.width=e.width,u.height=e.height,u.stroke=i,u.rx=2.5,u.ry=2.5,u.attrs={"stroke-width":.5},C_(l,u);break;case"system_db":case"external_system_db":case"container_db":case"external_container_db":case"component_db":case"external_component_db":l.append("path").attr("fill",n).attr("stroke-width","0.5").attr("stroke",i).attr("d","Mstartx,startyc0,-10 half,-10 half,-10c0,0 half,0 half,10l0,heightc0,10 -half,10 -half,10c0,0 -half,0 -half,-10l0,-height".replaceAll("startx",e.x).replaceAll("starty",e.y).replaceAll("half",e.width/2).replaceAll("height",e.height)),l.append("path").attr("fill","none").attr("stroke-width","0.5").attr("stroke",i).attr("d","Mstartx,startyc0,10 half,10 half,10c0,0 half,0 half,-10".replaceAll("startx",e.x).replaceAll("starty",e.y).replaceAll("half",e.width/2));break;case"system_queue":case"external_system_queue":case"container_queue":case"external_container_queue":case"component_queue":case"external_component_queue":l.append("path").attr("fill",n).attr("stroke-width","0.5").attr("stroke",i).attr("d","Mstartx,startylwidth,0c5,0 5,half 5,halfc0,0 0,half -5,halfl-width,0c-5,0 -5,-half -5,-halfc0,0 0,-half 5,-half".replaceAll("startx",e.x).replaceAll("starty",e.y).replaceAll("width",e.width).replaceAll("half",e.height/2)),l.append("path").attr("fill","none").attr("stroke-width","0.5").attr("stroke",i).attr("d","Mstartx,startyc-5,0 -5,half -5,halfc0,half 5,half 5,half".replaceAll("startx",e.x+e.width).replaceAll("starty",e.y).replaceAll("half",e.height/2));break}let h=LEe(r,e.typeC4Shape.text);switch(l.append("text").attr("fill",a).attr("font-family",h.fontFamily).attr("font-size",h.fontSize-2).attr("font-style","italic").attr("lengthAdjust","spacing").attr("textLength",e.typeC4Shape.width).attr("x",e.x+e.width/2-e.typeC4Shape.width/2).attr("y",e.y+e.typeC4Shape.Y).text("<<"+e.typeC4Shape.text+">>"),e.typeC4Shape.text){case"person":case"external_person":IY(l,48,48,e.x+e.width/2-24,e.y+e.image.Y,s);break}let f=r[e.typeC4Shape.text+"Font"]();return f.fontWeight="bold",f.fontSize=f.fontSize+2,f.fontColor=a,vu(r)(e.label.text,l,e.x,e.y+e.label.Y,e.width,e.height,{fill:a},f),f=r[e.typeC4Shape.text+"Font"](),f.fontColor=a,e.techn&&e.techn?.text!==""?vu(r)(e.techn.text,l,e.x,e.y+e.techn.Y,e.width,e.height,{fill:a,"font-style":"italic"},f):e.type&&e.type.text!==""&&vu(r)(e.type.text,l,e.x,e.y+e.type.Y,e.width,e.height,{fill:a,"font-style":"italic"},f),e.descr&&e.descr.text!==""&&(f=r.personFont(),f.fontColor=a,vu(r)(e.descr.text,l,e.x,e.y+e.descr.Y,e.width,e.height,{fill:a},f)),e.height},"drawC4Shape"),wEe=o(function(t){t.append("defs").append("symbol").attr("id","database").attr("fill-rule","evenodd").attr("clip-rule","evenodd").append("path").attr("transform","scale(.5)").attr("d","M12.258.001l.256.004.255.005.253.008.251.01.249.012.247.015.246.016.242.019.241.02.239.023.236.024.233.027.231.028.229.031.225.032.223.034.22.036.217.038.214.04.211.041.208.043.205.045.201.046.198.048.194.05.191.051.187.053.183.054.18.056.175.057.172.059.168.06.163.061.16.063.155.064.15.066.074.033.073.033.071.034.07.034.069.035.068.035.067.035.066.035.064.036.064.036.062.036.06.036.06.037.058.037.058.037.055.038.055.038.053.038.052.038.051.039.05.039.048.039.047.039.045.04.044.04.043.04.041.04.04.041.039.041.037.041.036.041.034.041.033.042.032.042.03.042.029.042.027.042.026.043.024.043.023.043.021.043.02.043.018.044.017.043.015.044.013.044.012.044.011.045.009.044.007.045.006.045.004.045.002.045.001.045v17l-.001.045-.002.045-.004.045-.006.045-.007.045-.009.044-.011.045-.012.044-.013.044-.015.044-.017.043-.018.044-.02.043-.021.043-.023.043-.024.043-.026.043-.027.042-.029.042-.03.042-.032.042-.033.042-.034.041-.036.041-.037.041-.039.041-.04.041-.041.04-.043.04-.044.04-.045.04-.047.039-.048.039-.05.039-.051.039-.052.038-.053.038-.055.038-.055.038-.058.037-.058.037-.06.037-.06.036-.062.036-.064.036-.064.036-.066.035-.067.035-.068.035-.069.035-.07.034-.071.034-.073.033-.074.033-.15.066-.155.064-.16.063-.163.061-.168.06-.172.059-.175.057-.18.056-.183.054-.187.053-.191.051-.194.05-.198.048-.201.046-.205.045-.208.043-.211.041-.214.04-.217.038-.22.036-.223.034-.225.032-.229.031-.231.028-.233.027-.236.024-.239.023-.241.02-.242.019-.246.016-.247.015-.249.012-.251.01-.253.008-.255.005-.256.004-.258.001-.258-.001-.256-.004-.255-.005-.253-.008-.251-.01-.249-.012-.247-.015-.245-.016-.243-.019-.241-.02-.238-.023-.236-.024-.234-.027-.231-.028-.228-.031-.226-.032-.223-.034-.22-.036-.217-.038-.214-.04-.211-.041-.208-.043-.204-.045-.201-.046-.198-.048-.195-.05-.19-.051-.187-.053-.184-.054-.179-.056-.176-.057-.172-.059-.167-.06-.164-.061-.159-.063-.155-.064-.151-.066-.074-.033-.072-.033-.072-.034-.07-.034-.069-.035-.068-.035-.067-.035-.066-.035-.064-.036-.063-.036-.062-.036-.061-.036-.06-.037-.058-.037-.057-.037-.056-.038-.055-.038-.053-.038-.052-.038-.051-.039-.049-.039-.049-.039-.046-.039-.046-.04-.044-.04-.043-.04-.041-.04-.04-.041-.039-.041-.037-.041-.036-.041-.034-.041-.033-.042-.032-.042-.03-.042-.029-.042-.027-.042-.026-.043-.024-.043-.023-.043-.021-.043-.02-.043-.018-.044-.017-.043-.015-.044-.013-.044-.012-.044-.011-.045-.009-.044-.007-.045-.006-.045-.004-.045-.002-.045-.001-.045v-17l.001-.045.002-.045.004-.045.006-.045.007-.045.009-.044.011-.045.012-.044.013-.044.015-.044.017-.043.018-.044.02-.043.021-.043.023-.043.024-.043.026-.043.027-.042.029-.042.03-.042.032-.042.033-.042.034-.041.036-.041.037-.041.039-.041.04-.041.041-.04.043-.04.044-.04.046-.04.046-.039.049-.039.049-.039.051-.039.052-.038.053-.038.055-.038.056-.038.057-.037.058-.037.06-.037.061-.036.062-.036.063-.036.064-.036.066-.035.067-.035.068-.035.069-.035.07-.034.072-.034.072-.033.074-.033.151-.066.155-.064.159-.063.164-.061.167-.06.172-.059.176-.057.179-.056.184-.054.187-.053.19-.051.195-.05.198-.048.201-.046.204-.045.208-.043.211-.041.214-.04.217-.038.22-.036.223-.034.226-.032.228-.031.231-.028.234-.027.236-.024.238-.023.241-.02.243-.019.245-.016.247-.015.249-.012.251-.01.253-.008.255-.005.256-.004.258-.001.258.001zm-9.258 20.499v.01l.001.021.003.021.004.022.005.021.006.022.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.023.018.024.019.024.021.024.022.025.023.024.024.025.052.049.056.05.061.051.066.051.07.051.075.051.079.052.084.052.088.052.092.052.097.052.102.051.105.052.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.048.144.049.147.047.152.047.155.047.16.045.163.045.167.043.171.043.176.041.178.041.183.039.187.039.19.037.194.035.197.035.202.033.204.031.209.03.212.029.216.027.219.025.222.024.226.021.23.02.233.018.236.016.24.015.243.012.246.01.249.008.253.005.256.004.259.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.021.224-.024.22-.026.216-.027.212-.028.21-.031.205-.031.202-.034.198-.034.194-.036.191-.037.187-.039.183-.04.179-.04.175-.042.172-.043.168-.044.163-.045.16-.046.155-.046.152-.047.148-.048.143-.049.139-.049.136-.05.131-.05.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.053.083-.051.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.05.023-.024.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.023.01-.022.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.127l-.077.055-.08.053-.083.054-.085.053-.087.052-.09.052-.093.051-.095.05-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.045-.118.044-.12.043-.122.042-.124.042-.126.041-.128.04-.13.04-.132.038-.134.038-.135.037-.138.037-.139.035-.142.035-.143.034-.144.033-.147.032-.148.031-.15.03-.151.03-.153.029-.154.027-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.01-.179.008-.179.008-.181.006-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.006-.179-.008-.179-.008-.178-.01-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.027-.153-.029-.151-.03-.15-.03-.148-.031-.146-.032-.145-.033-.143-.034-.141-.035-.14-.035-.137-.037-.136-.037-.134-.038-.132-.038-.13-.04-.128-.04-.126-.041-.124-.042-.122-.042-.12-.044-.117-.043-.116-.045-.113-.045-.112-.046-.109-.047-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.05-.093-.052-.09-.051-.087-.052-.085-.053-.083-.054-.08-.054-.077-.054v4.127zm0-5.654v.011l.001.021.003.021.004.021.005.022.006.022.007.022.009.022.01.022.011.023.012.023.013.023.015.024.016.023.017.024.018.024.019.024.021.024.022.024.023.025.024.024.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.052.11.051.114.051.119.052.123.05.127.051.131.05.135.049.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.044.171.042.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.022.23.02.233.018.236.016.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.012.241-.015.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.048.139-.05.136-.049.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.051.051-.049.023-.025.023-.024.021-.025.02-.024.019-.024.018-.024.017-.024.015-.023.014-.023.013-.024.012-.022.01-.023.01-.023.008-.022.006-.022.006-.022.004-.021.004-.022.001-.021.001-.021v-4.139l-.077.054-.08.054-.083.054-.085.052-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.044-.118.044-.12.044-.122.042-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.035-.143.033-.144.033-.147.033-.148.031-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.009-.179.009-.179.007-.181.007-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.007-.179-.007-.179-.009-.178-.009-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.031-.146-.033-.145-.033-.143-.033-.141-.035-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.04-.126-.041-.124-.042-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.051-.093-.051-.09-.051-.087-.053-.085-.052-.083-.054-.08-.054-.077-.054v4.139zm0-5.666v.011l.001.02.003.022.004.021.005.022.006.021.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.024.018.023.019.024.021.025.022.024.023.024.024.025.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.051.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.043.171.043.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.021.23.02.233.018.236.017.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.013.241-.014.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.049.139-.049.136-.049.131-.051.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.049.023-.025.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.022.01-.023.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.153l-.077.054-.08.054-.083.053-.085.053-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.048-.105.048-.106.048-.109.046-.111.046-.114.046-.115.044-.118.044-.12.043-.122.043-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.034-.143.034-.144.033-.147.032-.148.032-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.024-.161.024-.162.023-.163.023-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.01-.178.01-.179.009-.179.007-.181.006-.182.006-.182.004-.184.003-.184.001-.185.001-.185-.001-.184-.001-.184-.003-.182-.004-.182-.006-.181-.006-.179-.007-.179-.009-.178-.01-.176-.01-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.023-.162-.023-.161-.024-.159-.024-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.032-.146-.032-.145-.033-.143-.034-.141-.034-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.041-.126-.041-.124-.041-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.048-.105-.048-.102-.048-.1-.05-.097-.049-.095-.051-.093-.051-.09-.052-.087-.052-.085-.053-.083-.053-.08-.054-.077-.054v4.153zm8.74-8.179l-.257.004-.254.005-.25.008-.247.011-.244.012-.241.014-.237.016-.233.018-.231.021-.226.022-.224.023-.22.026-.216.027-.212.028-.21.031-.205.032-.202.033-.198.034-.194.036-.191.038-.187.038-.183.04-.179.041-.175.042-.172.043-.168.043-.163.045-.16.046-.155.046-.152.048-.148.048-.143.048-.139.049-.136.05-.131.05-.126.051-.123.051-.118.051-.114.052-.11.052-.106.052-.101.052-.096.052-.092.052-.088.052-.083.052-.079.052-.074.051-.07.052-.065.051-.06.05-.056.05-.051.05-.023.025-.023.024-.021.024-.02.025-.019.024-.018.024-.017.023-.015.024-.014.023-.013.023-.012.023-.01.023-.01.022-.008.022-.006.023-.006.021-.004.022-.004.021-.001.021-.001.021.001.021.001.021.004.021.004.022.006.021.006.023.008.022.01.022.01.023.012.023.013.023.014.023.015.024.017.023.018.024.019.024.02.025.021.024.023.024.023.025.051.05.056.05.06.05.065.051.07.052.074.051.079.052.083.052.088.052.092.052.096.052.101.052.106.052.11.052.114.052.118.051.123.051.126.051.131.05.136.05.139.049.143.048.148.048.152.048.155.046.16.046.163.045.168.043.172.043.175.042.179.041.183.04.187.038.191.038.194.036.198.034.202.033.205.032.21.031.212.028.216.027.22.026.224.023.226.022.231.021.233.018.237.016.241.014.244.012.247.011.25.008.254.005.257.004.26.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.022.224-.023.22-.026.216-.027.212-.028.21-.031.205-.032.202-.033.198-.034.194-.036.191-.038.187-.038.183-.04.179-.041.175-.042.172-.043.168-.043.163-.045.16-.046.155-.046.152-.048.148-.048.143-.048.139-.049.136-.05.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.05.051-.05.023-.025.023-.024.021-.024.02-.025.019-.024.018-.024.017-.023.015-.024.014-.023.013-.023.012-.023.01-.023.01-.022.008-.022.006-.023.006-.021.004-.022.004-.021.001-.021.001-.021-.001-.021-.001-.021-.004-.021-.004-.022-.006-.021-.006-.023-.008-.022-.01-.022-.01-.023-.012-.023-.013-.023-.014-.023-.015-.024-.017-.023-.018-.024-.019-.024-.02-.025-.021-.024-.023-.024-.023-.025-.051-.05-.056-.05-.06-.05-.065-.051-.07-.052-.074-.051-.079-.052-.083-.052-.088-.052-.092-.052-.096-.052-.101-.052-.106-.052-.11-.052-.114-.052-.118-.051-.123-.051-.126-.051-.131-.05-.136-.05-.139-.049-.143-.048-.148-.048-.152-.048-.155-.046-.16-.046-.163-.045-.168-.043-.172-.043-.175-.042-.179-.041-.183-.04-.187-.038-.191-.038-.194-.036-.198-.034-.202-.033-.205-.032-.21-.031-.212-.028-.216-.027-.22-.026-.224-.023-.226-.022-.231-.021-.233-.018-.237-.016-.241-.014-.244-.012-.247-.011-.25-.008-.254-.005-.257-.004-.26-.001-.26.001z")},"insertDatabaseIcon"),TEe=o(function(t){t.append("defs").append("symbol").attr("id","computer").attr("width","24").attr("height","24").append("path").attr("transform","scale(.5)").attr("d","M2 2v13h20v-13h-20zm18 11h-16v-9h16v9zm-10.228 6l.466-1h3.524l.467 1h-4.457zm14.228 3h-24l2-6h2.104l-1.33 4h18.45l-1.297-4h2.073l2 6zm-5-10h-14v-7h14v7z")},"insertComputerIcon"),kEe=o(function(t){t.append("defs").append("symbol").attr("id","clock").attr("width","24").attr("height","24").append("path").attr("transform","scale(.5)").attr("d","M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm0-2c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm5.848 12.459c.202.038.202.333.001.372-1.907.361-6.045 1.111-6.547 1.111-.719 0-1.301-.582-1.301-1.301 0-.512.77-5.447 1.125-7.445.034-.192.312-.181.343.014l.985 6.238 5.394 1.011z")},"insertClockIcon"),EEe=o(function(t){t.append("defs").append("marker").attr("id","arrowhead").attr("refX",9).attr("refY",5).attr("markerUnits","userSpaceOnUse").attr("markerWidth",12).attr("markerHeight",12).attr("orient","auto").append("path").attr("d","M 0 0 L 10 5 L 0 10 z")},"insertArrowHead"),SEe=o(function(t){t.append("defs").append("marker").attr("id","arrowend").attr("refX",1).attr("refY",5).attr("markerUnits","userSpaceOnUse").attr("markerWidth",12).attr("markerHeight",12).attr("orient","auto").append("path").attr("d","M 10 0 L 0 5 L 10 10 z")},"insertArrowEnd"),CEe=o(function(t){t.append("defs").append("marker").attr("id","filled-head").attr("refX",18).attr("refY",7).attr("markerWidth",20).attr("markerHeight",28).attr("orient","auto").append("path").attr("d","M 18,7 L9,13 L14,7 L9,1 Z")},"insertArrowFilledHead"),AEe=o(function(t){t.append("defs").append("marker").attr("id","sequencenumber").attr("refX",15).attr("refY",15).attr("markerWidth",60).attr("markerHeight",40).attr("orient","auto").append("circle").attr("cx",15).attr("cy",15).attr("r",6)},"insertDynamicNumber"),_Ee=o(function(t){let r=t.append("defs").append("marker").attr("id","crosshead").attr("markerWidth",15).attr("markerHeight",8).attr("orient","auto").attr("refX",16).attr("refY",4);r.append("path").attr("fill","black").attr("stroke","#000000").style("stroke-dasharray","0, 0").attr("stroke-width","1px").attr("d","M 9,2 V 6 L16,4 Z"),r.append("path").attr("fill","none").attr("stroke","#000000").style("stroke-dasharray","0, 0").attr("stroke-width","1px").attr("d","M 0,1 L 6,7 M 6,1 L 0,7")},"insertArrowCrossHead"),LEe=o((t,e)=>({fontFamily:t[e+"FontFamily"],fontSize:t[e+"FontSize"],fontWeight:t[e+"FontWeight"]}),"getC4ShapeFont"),vu=function(){function t(i,a,s,l,u,h,f){let d=a.append("text").attr("x",s+u/2).attr("y",l+h/2+5).style("text-anchor","middle").text(i);n(d,f)}o(t,"byText");function e(i,a,s,l,u,h,f,d){let{fontSize:p,fontFamily:m,fontWeight:g}=d,y=i.split(je.lineBreakRegex);for(let v=0;v<y.length;v++){let x=v*p-p*(y.length-1)/2,b=a.append("text").attr("x",s+u/2).attr("y",l).style("text-anchor","middle").attr("dominant-baseline","middle").style("font-size",p).style("font-weight",g).style("font-family",m);b.append("tspan").attr("dy",x).text(y[v]).attr("alignment-baseline","mathematical"),n(b,f)}}o(e,"byTspan");function r(i,a,s,l,u,h,f,d){let p=a.append("switch"),g=p.append("foreignObject").attr("x",s).attr("y",l).attr("width",u).attr("height",h).append("xhtml:div").style("display","table").style("height","100%").style("width","100%");g.append("div").style("display","table-cell").style("text-align","center").style("vertical-align","middle").text(i),e(i,p,s,l,u,h,f,d),n(g,f)}o(r,"byFo");function n(i,a){for(let s in a)a.hasOwnProperty(s)&&i.attr(s,a[s])}return o(n,"_setTextAttrs"),function(i){return i.textPlacement==="fo"?r:i.textPlacement==="old"?t:e}}(),Cl={drawRect:C_,drawBoundary:xEe,drawC4Shape:bEe,drawRels:vEe,drawImage:IY,insertArrowHead:EEe,insertArrowEnd:SEe,insertArrowFilledHead:CEe,insertDynamicNumber:AEe,insertArrowCrossHead:_Ee,insertDatabaseIcon:wEe,insertComputerIcon:TEe,insertClockIcon:kEe}});var DEe,X3,A_=M(()=>{"use strict";DEe=typeof global=="object"&&global&&global.Object===Object&&global,X3=DEe});var NEe,REe,ai,No=M(()=>{"use strict";A_();NEe=typeof self=="object"&&self&&self.Object===Object&&self,REe=X3||NEe||Function("return this")(),ai=REe});var MEe,ea,gd=M(()=>{"use strict";No();MEe=ai.Symbol,ea=MEe});function PEe(t){var e=IEe.call(t,Xy),r=t[Xy];try{t[Xy]=void 0;var n=!0}catch{}var i=OEe.call(t);return n&&(e?t[Xy]=r:delete t[Xy]),i}var PY,IEe,OEe,Xy,BY,FY=M(()=>{"use strict";gd();PY=Object.prototype,IEe=PY.hasOwnProperty,OEe=PY.toString,Xy=ea?ea.toStringTag:void 0;o(PEe,"getRawTag");BY=PEe});function zEe(t){return FEe.call(t)}var BEe,FEe,zY,GY=M(()=>{"use strict";BEe=Object.prototype,FEe=BEe.toString;o(zEe,"objectToString");zY=zEe});function VEe(t){return t==null?t===void 0?$Ee:GEe:$Y&&$Y in Object(t)?BY(t):zY(t)}var GEe,$Ee,$Y,ca,xu=M(()=>{"use strict";gd();FY();GY();GEe="[object Null]",$Ee="[object Undefined]",$Y=ea?ea.toStringTag:void 0;o(VEe,"baseGetTag");ca=VEe});function UEe(t){var e=typeof t;return t!=null&&(e=="object"||e=="function")}var yn,Qs=M(()=>{"use strict";o(UEe,"isObject");yn=UEe});function XEe(t){if(!yn(t))return!1;var e=ca(t);return e==WEe||e==YEe||e==HEe||e==qEe}var HEe,WEe,YEe,qEe,Ei,jy=M(()=>{"use strict";xu();Qs();HEe="[object AsyncFunction]",WEe="[object Function]",YEe="[object GeneratorFunction]",qEe="[object Proxy]";o(XEe,"isFunction");Ei=XEe});var jEe,j3,VY=M(()=>{"use strict";No();jEe=ai["__core-js_shared__"],j3=jEe});function KEe(t){return!!UY&&UY in t}var UY,HY,WY=M(()=>{"use strict";VY();UY=function(){var t=/[^.]+$/.exec(j3&&j3.keys&&j3.keys.IE_PROTO||"");return t?"Symbol(src)_1."+t:""}();o(KEe,"isMasked");HY=KEe});function JEe(t){if(t!=null){try{return ZEe.call(t)}catch{}try{return t+""}catch{}}return""}var QEe,ZEe,bu,__=M(()=>{"use strict";QEe=Function.prototype,ZEe=QEe.toString;o(JEe,"toSource");bu=JEe});function o6e(t){if(!yn(t)||HY(t))return!1;var e=Ei(t)?s6e:t6e;return e.test(bu(t))}var e6e,t6e,r6e,n6e,i6e,a6e,s6e,YY,qY=M(()=>{"use strict";jy();WY();Qs();__();e6e=/[\\^$.*+?()[\]{}|]/g,t6e=/^\[object .+?Constructor\]$/,r6e=Function.prototype,n6e=Object.prototype,i6e=r6e.toString,a6e=n6e.hasOwnProperty,s6e=RegExp("^"+i6e.call(a6e).replace(e6e,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");o(o6e,"baseIsNative");YY=o6e});function l6e(t,e){return t?.[e]}var XY,jY=M(()=>{"use strict";o(l6e,"getValue");XY=l6e});function c6e(t,e){var r=XY(t,e);return YY(r)?r:void 0}var vs,Ch=M(()=>{"use strict";qY();jY();o(c6e,"getNative");vs=c6e});var u6e,wu,Ky=M(()=>{"use strict";Ch();u6e=vs(Object,"create"),wu=u6e});function h6e(){this.__data__=wu?wu(null):{},this.size=0}var KY,QY=M(()=>{"use strict";Ky();o(h6e,"hashClear");KY=h6e});function f6e(t){var e=this.has(t)&&delete this.__data__[t];return this.size-=e?1:0,e}var ZY,JY=M(()=>{"use strict";o(f6e,"hashDelete");ZY=f6e});function g6e(t){var e=this.__data__;if(wu){var r=e[t];return r===d6e?void 0:r}return m6e.call(e,t)?e[t]:void 0}var d6e,p6e,m6e,eq,tq=M(()=>{"use strict";Ky();d6e="__lodash_hash_undefined__",p6e=Object.prototype,m6e=p6e.hasOwnProperty;o(g6e,"hashGet");eq=g6e});function x6e(t){var e=this.__data__;return wu?e[t]!==void 0:v6e.call(e,t)}var y6e,v6e,rq,nq=M(()=>{"use strict";Ky();y6e=Object.prototype,v6e=y6e.hasOwnProperty;o(x6e,"hashHas");rq=x6e});function w6e(t,e){var r=this.__data__;return this.size+=this.has(t)?0:1,r[t]=wu&&e===void 0?b6e:e,this}var b6e,iq,aq=M(()=>{"use strict";Ky();b6e="__lodash_hash_undefined__";o(w6e,"hashSet");iq=w6e});function zp(t){var e=-1,r=t==null?0:t.length;for(this.clear();++e<r;){var n=t[e];this.set(n[0],n[1])}}var L_,sq=M(()=>{"use strict";QY();JY();tq();nq();aq();o(zp,"Hash");zp.prototype.clear=KY;zp.prototype.delete=ZY;zp.prototype.get=eq;zp.prototype.has=rq;zp.prototype.set=iq;L_=zp});function T6e(){this.__data__=[],this.size=0}var oq,lq=M(()=>{"use strict";o(T6e,"listCacheClear");oq=T6e});function k6e(t,e){return t===e||t!==t&&e!==e}var Ro,yd=M(()=>{"use strict";o(k6e,"eq");Ro=k6e});function E6e(t,e){for(var r=t.length;r--;)if(Ro(t[r][0],e))return r;return-1}var Ah,Qy=M(()=>{"use strict";yd();o(E6e,"assocIndexOf");Ah=E6e});function A6e(t){var e=this.__data__,r=Ah(e,t);if(r<0)return!1;var n=e.length-1;return r==n?e.pop():C6e.call(e,r,1),--this.size,!0}var S6e,C6e,cq,uq=M(()=>{"use strict";Qy();S6e=Array.prototype,C6e=S6e.splice;o(A6e,"listCacheDelete");cq=A6e});function _6e(t){var e=this.__data__,r=Ah(e,t);return r<0?void 0:e[r][1]}var hq,fq=M(()=>{"use strict";Qy();o(_6e,"listCacheGet");hq=_6e});function L6e(t){return Ah(this.__data__,t)>-1}var dq,pq=M(()=>{"use strict";Qy();o(L6e,"listCacheHas");dq=L6e});function D6e(t,e){var r=this.__data__,n=Ah(r,t);return n<0?(++this.size,r.push([t,e])):r[n][1]=e,this}var mq,gq=M(()=>{"use strict";Qy();o(D6e,"listCacheSet");mq=D6e});function Gp(t){var e=-1,r=t==null?0:t.length;for(this.clear();++e<r;){var n=t[e];this.set(n[0],n[1])}}var _h,Zy=M(()=>{"use strict";lq();uq();fq();pq();gq();o(Gp,"ListCache");Gp.prototype.clear=oq;Gp.prototype.delete=cq;Gp.prototype.get=hq;Gp.prototype.has=dq;Gp.prototype.set=mq;_h=Gp});var N6e,Lh,K3=M(()=>{"use strict";Ch();No();N6e=vs(ai,"Map"),Lh=N6e});function R6e(){this.size=0,this.__data__={hash:new L_,map:new(Lh||_h),string:new L_}}var yq,vq=M(()=>{"use strict";sq();Zy();K3();o(R6e,"mapCacheClear");yq=R6e});function M6e(t){var e=typeof t;return e=="string"||e=="number"||e=="symbol"||e=="boolean"?t!=="__proto__":t===null}var xq,bq=M(()=>{"use strict";o(M6e,"isKeyable");xq=M6e});function I6e(t,e){var r=t.__data__;return xq(e)?r[typeof e=="string"?"string":"hash"]:r.map}var Dh,Jy=M(()=>{"use strict";bq();o(I6e,"getMapData");Dh=I6e});function O6e(t){var e=Dh(this,t).delete(t);return this.size-=e?1:0,e}var wq,Tq=M(()=>{"use strict";Jy();o(O6e,"mapCacheDelete");wq=O6e});function P6e(t){return Dh(this,t).get(t)}var kq,Eq=M(()=>{"use strict";Jy();o(P6e,"mapCacheGet");kq=P6e});function B6e(t){return Dh(this,t).has(t)}var Sq,Cq=M(()=>{"use strict";Jy();o(B6e,"mapCacheHas");Sq=B6e});function F6e(t,e){var r=Dh(this,t),n=r.size;return r.set(t,e),this.size+=r.size==n?0:1,this}var Aq,_q=M(()=>{"use strict";Jy();o(F6e,"mapCacheSet");Aq=F6e});function $p(t){var e=-1,r=t==null?0:t.length;for(this.clear();++e<r;){var n=t[e];this.set(n[0],n[1])}}var vd,Q3=M(()=>{"use strict";vq();Tq();Eq();Cq();_q();o($p,"MapCache");$p.prototype.clear=yq;$p.prototype.delete=wq;$p.prototype.get=kq;$p.prototype.has=Sq;$p.prototype.set=Aq;vd=$p});function D_(t,e){if(typeof t!="function"||e!=null&&typeof e!="function")throw new TypeError(z6e);var r=o(function(){var n=arguments,i=e?e.apply(this,n):n[0],a=r.cache;if(a.has(i))return a.get(i);var s=t.apply(this,n);return r.cache=a.set(i,s)||a,s},"memoized");return r.cache=new(D_.Cache||vd),r}var z6e,Vp,N_=M(()=>{"use strict";Q3();z6e="Expected a function";o(D_,"memoize");D_.Cache=vd;Vp=D_});function G6e(){this.__data__=new _h,this.size=0}var Lq,Dq=M(()=>{"use strict";Zy();o(G6e,"stackClear");Lq=G6e});function $6e(t){var e=this.__data__,r=e.delete(t);return this.size=e.size,r}var Nq,Rq=M(()=>{"use strict";o($6e,"stackDelete");Nq=$6e});function V6e(t){return this.__data__.get(t)}var Mq,Iq=M(()=>{"use strict";o(V6e,"stackGet");Mq=V6e});function U6e(t){return this.__data__.has(t)}var Oq,Pq=M(()=>{"use strict";o(U6e,"stackHas");Oq=U6e});function W6e(t,e){var r=this.__data__;if(r instanceof _h){var n=r.__data__;if(!Lh||n.length<H6e-1)return n.push([t,e]),this.size=++r.size,this;r=this.__data__=new vd(n)}return r.set(t,e),this.size=r.size,this}var H6e,Bq,Fq=M(()=>{"use strict";Zy();K3();Q3();H6e=200;o(W6e,"stackSet");Bq=W6e});function Up(t){var e=this.__data__=new _h(t);this.size=e.size}var uc,ev=M(()=>{"use strict";Zy();Dq();Rq();Iq();Pq();Fq();o(Up,"Stack");Up.prototype.clear=Lq;Up.prototype.delete=Nq;Up.prototype.get=Mq;Up.prototype.has=Oq;Up.prototype.set=Bq;uc=Up});var Y6e,Hp,R_=M(()=>{"use strict";Ch();Y6e=function(){try{var t=vs(Object,"defineProperty");return t({},"",{}),t}catch{}}(),Hp=Y6e});function q6e(t,e,r){e=="__proto__"&&Hp?Hp(t,e,{configurable:!0,enumerable:!0,value:r,writable:!0}):t[e]=r}var hc,Wp=M(()=>{"use strict";R_();o(q6e,"baseAssignValue");hc=q6e});function X6e(t,e,r){(r!==void 0&&!Ro(t[e],r)||r===void 0&&!(e in t))&&hc(t,e,r)}var tv,M_=M(()=>{"use strict";Wp();yd();o(X6e,"assignMergeValue");tv=X6e});function j6e(t){return function(e,r,n){for(var i=-1,a=Object(e),s=n(e),l=s.length;l--;){var u=s[t?l:++i];if(r(a[u],u,a)===!1)break}return e}}var zq,Gq=M(()=>{"use strict";o(j6e,"createBaseFor");zq=j6e});var K6e,Yp,Z3=M(()=>{"use strict";Gq();K6e=zq(),Yp=K6e});function Z6e(t,e){if(e)return t.slice();var r=t.length,n=Uq?Uq(r):new t.constructor(r);return t.copy(n),n}var Hq,$q,Q6e,Vq,Uq,J3,I_=M(()=>{"use strict";No();Hq=typeof exports=="object"&&exports&&!exports.nodeType&&exports,$q=Hq&&typeof module=="object"&&module&&!module.nodeType&&module,Q6e=$q&&$q.exports===Hq,Vq=Q6e?ai.Buffer:void 0,Uq=Vq?Vq.allocUnsafe:void 0;o(Z6e,"cloneBuffer");J3=Z6e});var J6e,qp,O_=M(()=>{"use strict";No();J6e=ai.Uint8Array,qp=J6e});function eSe(t){var e=new t.constructor(t.byteLength);return new qp(e).set(new qp(t)),e}var Xp,e5=M(()=>{"use strict";O_();o(eSe,"cloneArrayBuffer");Xp=eSe});function tSe(t,e){var r=e?Xp(t.buffer):t.buffer;return new t.constructor(r,t.byteOffset,t.length)}var t5,P_=M(()=>{"use strict";e5();o(tSe,"cloneTypedArray");t5=tSe});function rSe(t,e){var r=-1,n=t.length;for(e||(e=Array(n));++r<n;)e[r]=t[r];return e}var r5,B_=M(()=>{"use strict";o(rSe,"copyArray");r5=rSe});var Wq,nSe,Yq,qq=M(()=>{"use strict";Qs();Wq=Object.create,nSe=function(){function t(){}return o(t,"object"),function(e){if(!yn(e))return{};if(Wq)return Wq(e);t.prototype=e;var r=new t;return t.prototype=void 0,r}}(),Yq=nSe});function iSe(t,e){return function(r){return t(e(r))}}var n5,F_=M(()=>{"use strict";o(iSe,"overArg");n5=iSe});var aSe,jp,i5=M(()=>{"use strict";F_();aSe=n5(Object.getPrototypeOf,Object),jp=aSe});function oSe(t){var e=t&&t.constructor,r=typeof e=="function"&&e.prototype||sSe;return t===r}var sSe,fc,Kp=M(()=>{"use strict";sSe=Object.prototype;o(oSe,"isPrototype");fc=oSe});function lSe(t){return typeof t.constructor=="function"&&!fc(t)?Yq(jp(t)):{}}var a5,z_=M(()=>{"use strict";qq();i5();Kp();o(lSe,"initCloneObject");a5=lSe});function cSe(t){return t!=null&&typeof t=="object"}var Zn,Mo=M(()=>{"use strict";o(cSe,"isObjectLike");Zn=cSe});function hSe(t){return Zn(t)&&ca(t)==uSe}var uSe,G_,Xq=M(()=>{"use strict";xu();Mo();uSe="[object Arguments]";o(hSe,"baseIsArguments");G_=hSe});var jq,fSe,dSe,pSe,Al,Qp=M(()=>{"use strict";Xq();Mo();jq=Object.prototype,fSe=jq.hasOwnProperty,dSe=jq.propertyIsEnumerable,pSe=G_(function(){return arguments}())?G_:function(t){return Zn(t)&&fSe.call(t,"callee")&&!dSe.call(t,"callee")},Al=pSe});var mSe,Mt,Vn=M(()=>{"use strict";mSe=Array.isArray,Mt=mSe});function ySe(t){return typeof t=="number"&&t>-1&&t%1==0&&t<=gSe}var gSe,Zp,s5=M(()=>{"use strict";gSe=9007199254740991;o(ySe,"isLength");Zp=ySe});function vSe(t){return t!=null&&Zp(t.length)&&!Ei(t)}var si,Io=M(()=>{"use strict";jy();s5();o(vSe,"isArrayLike");si=vSe});function xSe(t){return Zn(t)&&si(t)}var xd,o5=M(()=>{"use strict";Io();Mo();o(xSe,"isArrayLikeObject");xd=xSe});function bSe(){return!1}var Kq,Qq=M(()=>{"use strict";o(bSe,"stubFalse");Kq=bSe});var eX,Zq,wSe,Jq,TSe,kSe,_l,Jp=M(()=>{"use strict";No();Qq();eX=typeof exports=="object"&&exports&&!exports.nodeType&&exports,Zq=eX&&typeof module=="object"&&module&&!module.nodeType&&module,wSe=Zq&&Zq.exports===eX,Jq=wSe?ai.Buffer:void 0,TSe=Jq?Jq.isBuffer:void 0,kSe=TSe||Kq,_l=kSe});function LSe(t){if(!Zn(t)||ca(t)!=ESe)return!1;var e=jp(t);if(e===null)return!0;var r=ASe.call(e,"constructor")&&e.constructor;return typeof r=="function"&&r instanceof r&&tX.call(r)==_Se}var ESe,SSe,CSe,tX,ASe,_Se,rX,nX=M(()=>{"use strict";xu();i5();Mo();ESe="[object Object]",SSe=Function.prototype,CSe=Object.prototype,tX=SSe.toString,ASe=CSe.hasOwnProperty,_Se=tX.call(Object);o(LSe,"isPlainObject");rX=LSe});function eCe(t){return Zn(t)&&Zp(t.length)&&!!Bn[ca(t)]}var DSe,NSe,RSe,MSe,ISe,OSe,PSe,BSe,FSe,zSe,GSe,$Se,VSe,USe,HSe,WSe,YSe,qSe,XSe,jSe,KSe,QSe,ZSe,JSe,Bn,iX,aX=M(()=>{"use strict";xu();s5();Mo();DSe="[object Arguments]",NSe="[object Array]",RSe="[object Boolean]",MSe="[object Date]",ISe="[object Error]",OSe="[object Function]",PSe="[object Map]",BSe="[object Number]",FSe="[object Object]",zSe="[object RegExp]",GSe="[object Set]",$Se="[object String]",VSe="[object WeakMap]",USe="[object ArrayBuffer]",HSe="[object DataView]",WSe="[object Float32Array]",YSe="[object Float64Array]",qSe="[object Int8Array]",XSe="[object Int16Array]",jSe="[object Int32Array]",KSe="[object Uint8Array]",QSe="[object Uint8ClampedArray]",ZSe="[object Uint16Array]",JSe="[object Uint32Array]",Bn={};Bn[WSe]=Bn[YSe]=Bn[qSe]=Bn[XSe]=Bn[jSe]=Bn[KSe]=Bn[QSe]=Bn[ZSe]=Bn[JSe]=!0;Bn[DSe]=Bn[NSe]=Bn[USe]=Bn[RSe]=Bn[HSe]=Bn[MSe]=Bn[ISe]=Bn[OSe]=Bn[PSe]=Bn[BSe]=Bn[FSe]=Bn[zSe]=Bn[GSe]=Bn[$Se]=Bn[VSe]=!1;o(eCe,"baseIsTypedArray");iX=eCe});function tCe(t){return function(e){return t(e)}}var Oo,bd=M(()=>{"use strict";o(tCe,"baseUnary");Oo=tCe});var sX,rv,rCe,$_,nCe,Po,nv=M(()=>{"use strict";A_();sX=typeof exports=="object"&&exports&&!exports.nodeType&&exports,rv=sX&&typeof module=="object"&&module&&!module.nodeType&&module,rCe=rv&&rv.exports===sX,$_=rCe&&X3.process,nCe=function(){try{var t=rv&&rv.require&&rv.require("util").types;return t||$_&&$_.binding&&$_.binding("util")}catch{}}(),Po=nCe});var oX,iCe,Nh,iv=M(()=>{"use strict";aX();bd();nv();oX=Po&&Po.isTypedArray,iCe=oX?Oo(oX):iX,Nh=iCe});function aCe(t,e){if(!(e==="constructor"&&typeof t[e]=="function")&&e!="__proto__")return t[e]}var av,V_=M(()=>{"use strict";o(aCe,"safeGet");av=aCe});function lCe(t,e,r){var n=t[e];(!(oCe.call(t,e)&&Ro(n,r))||r===void 0&&!(e in t))&&hc(t,e,r)}var sCe,oCe,dc,em=M(()=>{"use strict";Wp();yd();sCe=Object.prototype,oCe=sCe.hasOwnProperty;o(lCe,"assignValue");dc=lCe});function cCe(t,e,r,n){var i=!r;r||(r={});for(var a=-1,s=e.length;++a<s;){var l=e[a],u=n?n(r[l],t[l],l,r,t):void 0;u===void 0&&(u=t[l]),i?hc(r,l,u):dc(r,l,u)}return r}var Bo,wd=M(()=>{"use strict";em();Wp();o(cCe,"copyObject");Bo=cCe});function uCe(t,e){for(var r=-1,n=Array(t);++r<t;)n[r]=e(r);return n}var lX,cX=M(()=>{"use strict";o(uCe,"baseTimes");lX=uCe});function dCe(t,e){var r=typeof t;return e=e??hCe,!!e&&(r=="number"||r!="symbol"&&fCe.test(t))&&t>-1&&t%1==0&&t<e}var hCe,fCe,Rh,sv=M(()=>{"use strict";hCe=9007199254740991,fCe=/^(?:0|[1-9]\d*)$/;o(dCe,"isIndex");Rh=dCe});function gCe(t,e){var r=Mt(t),n=!r&&Al(t),i=!r&&!n&&_l(t),a=!r&&!n&&!i&&Nh(t),s=r||n||i||a,l=s?lX(t.length,String):[],u=l.length;for(var h in t)(e||mCe.call(t,h))&&!(s&&(h=="length"||i&&(h=="offset"||h=="parent")||a&&(h=="buffer"||h=="byteLength"||h=="byteOffset")||Rh(h,u)))&&l.push(h);return l}var pCe,mCe,l5,U_=M(()=>{"use strict";cX();Qp();Vn();Jp();sv();iv();pCe=Object.prototype,mCe=pCe.hasOwnProperty;o(gCe,"arrayLikeKeys");l5=gCe});function yCe(t){var e=[];if(t!=null)for(var r in Object(t))e.push(r);return e}var uX,hX=M(()=>{"use strict";o(yCe,"nativeKeysIn");uX=yCe});function bCe(t){if(!yn(t))return uX(t);var e=fc(t),r=[];for(var n in t)n=="constructor"&&(e||!xCe.call(t,n))||r.push(n);return r}var vCe,xCe,fX,dX=M(()=>{"use strict";Qs();Kp();hX();vCe=Object.prototype,xCe=vCe.hasOwnProperty;o(bCe,"baseKeysIn");fX=bCe});function wCe(t){return si(t)?l5(t,!0):fX(t)}var xs,Mh=M(()=>{"use strict";U_();dX();Io();o(wCe,"keysIn");xs=wCe});function TCe(t){return Bo(t,xs(t))}var pX,mX=M(()=>{"use strict";wd();Mh();o(TCe,"toPlainObject");pX=TCe});function kCe(t,e,r,n,i,a,s){var l=av(t,r),u=av(e,r),h=s.get(u);if(h){tv(t,r,h);return}var f=a?a(l,u,r+"",t,e,s):void 0,d=f===void 0;if(d){var p=Mt(u),m=!p&&_l(u),g=!p&&!m&&Nh(u);f=u,p||m||g?Mt(l)?f=l:xd(l)?f=r5(l):m?(d=!1,f=J3(u,!0)):g?(d=!1,f=t5(u,!0)):f=[]:rX(u)||Al(u)?(f=l,Al(l)?f=pX(l):(!yn(l)||Ei(l))&&(f=a5(u))):d=!1}d&&(s.set(u,f),i(f,u,n,a,s),s.delete(u)),tv(t,r,f)}var gX,yX=M(()=>{"use strict";M_();I_();P_();B_();z_();Qp();Vn();o5();Jp();jy();Qs();nX();iv();V_();mX();o(kCe,"baseMergeDeep");gX=kCe});function vX(t,e,r,n,i){t!==e&&Yp(e,function(a,s){if(i||(i=new uc),yn(a))gX(t,e,s,r,vX,n,i);else{var l=n?n(av(t,s),a,s+"",t,e,i):void 0;l===void 0&&(l=a),tv(t,s,l)}},xs)}var xX,bX=M(()=>{"use strict";ev();M_();Z3();yX();Qs();Mh();V_();o(vX,"baseMerge");xX=vX});function ECe(t){return t}var ta,Tu=M(()=>{"use strict";o(ECe,"identity");ta=ECe});function SCe(t,e,r){switch(r.length){case 0:return t.call(e);case 1:return t.call(e,r[0]);case 2:return t.call(e,r[0],r[1]);case 3:return t.call(e,r[0],r[1],r[2])}return t.apply(e,r)}var wX,TX=M(()=>{"use strict";o(SCe,"apply");wX=SCe});function CCe(t,e,r){return e=kX(e===void 0?t.length-1:e,0),function(){for(var n=arguments,i=-1,a=kX(n.length-e,0),s=Array(a);++i<a;)s[i]=n[e+i];i=-1;for(var l=Array(e+1);++i<e;)l[i]=n[i];return l[e]=r(s),wX(t,this,l)}}var kX,c5,H_=M(()=>{"use strict";TX();kX=Math.max;o(CCe,"overRest");c5=CCe});function ACe(t){return function(){return t}}var bs,W_=M(()=>{"use strict";o(ACe,"constant");bs=ACe});var _Ce,EX,SX=M(()=>{"use strict";W_();R_();Tu();_Ce=Hp?function(t,e){return Hp(t,"toString",{configurable:!0,enumerable:!1,value:bs(e),writable:!0})}:ta,EX=_Ce});function RCe(t){var e=0,r=0;return function(){var n=NCe(),i=DCe-(n-r);if(r=n,i>0){if(++e>=LCe)return arguments[0]}else e=0;return t.apply(void 0,arguments)}}var LCe,DCe,NCe,CX,AX=M(()=>{"use strict";LCe=800,DCe=16,NCe=Date.now;o(RCe,"shortOut");CX=RCe});var MCe,u5,Y_=M(()=>{"use strict";SX();AX();MCe=CX(EX),u5=MCe});function ICe(t,e){return u5(c5(t,e,ta),t+"")}var pc,tm=M(()=>{"use strict";Tu();H_();Y_();o(ICe,"baseRest");pc=ICe});function OCe(t,e,r){if(!yn(r))return!1;var n=typeof e;return(n=="number"?si(r)&&Rh(e,r.length):n=="string"&&e in r)?Ro(r[e],t):!1}var Zs,Td=M(()=>{"use strict";yd();Io();sv();Qs();o(OCe,"isIterateeCall");Zs=OCe});function PCe(t){return pc(function(e,r){var n=-1,i=r.length,a=i>1?r[i-1]:void 0,s=i>2?r[2]:void 0;for(a=t.length>3&&typeof a=="function"?(i--,a):void 0,s&&Zs(r[0],r[1],s)&&(a=i<3?void 0:a,i=1),e=Object(e);++n<i;){var l=r[n];l&&t(e,l,n,a)}return e})}var h5,q_=M(()=>{"use strict";tm();Td();o(PCe,"createAssigner");h5=PCe});var BCe,Ih,X_=M(()=>{"use strict";bX();q_();BCe=h5(function(t,e,r){xX(t,e,r)}),Ih=BCe});function Q_(t,e){if(!t)return e;let r=`curve${t.charAt(0).toUpperCase()+t.slice(1)}`;return FCe[r]??e}function VCe(t,e){let r=t.trim();if(r)return e.securityLevel!=="loose"?(0,DX.sanitizeUrl)(r):r}function MX(t,e){return!t||!e?0:Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))}function HCe(t){let e,r=0;t.forEach(i=>{r+=MX(i,e),e=i});let n=r/2;return Z_(t,n)}function WCe(t){return t.length===1?t[0]:HCe(t)}function qCe(t,e,r){let n=structuredClone(r);Y.info("our points",n),e!=="start_left"&&e!=="start_right"&&n.reverse();let i=25+t,a=Z_(n,i),s=10+t*.5,l=Math.atan2(n[0].y-a.y,n[0].x-a.x),u={x:0,y:0};return e==="start_left"?(u.x=Math.sin(l+Math.PI)*s+(n[0].x+a.x)/2,u.y=-Math.cos(l+Math.PI)*s+(n[0].y+a.y)/2):e==="end_right"?(u.x=Math.sin(l-Math.PI)*s+(n[0].x+a.x)/2-5,u.y=-Math.cos(l-Math.PI)*s+(n[0].y+a.y)/2-5):e==="end_left"?(u.x=Math.sin(l)*s+(n[0].x+a.x)/2-5,u.y=-Math.cos(l)*s+(n[0].y+a.y)/2-5):(u.x=Math.sin(l)*s+(n[0].x+a.x)/2,u.y=-Math.cos(l)*s+(n[0].y+a.y)/2),u}function J_(t){let e="",r="";for(let n of t)n!==void 0&&(n.startsWith("color:")||n.startsWith("text-align:")?r=r+n+";":e=e+n+";");return{style:e,labelStyle:r}}function XCe(t){let e="",r="0123456789abcdef",n=r.length;for(let i=0;i<t;i++)e+=r.charAt(Math.floor(Math.random()*n));return e}function d5(t,e){return n9(t,e).height}function Js(t,e){return n9(t,e).width}function i9(t){return"str"in t}function ws(t,e){return Ih({},t,e)}function Fn(t){return t??null}var DX,K_,FCe,zCe,GCe,NX,RX,$Ce,UCe,_X,Z_,YCe,LX,e9,t9,jCe,KCe,r9,QCe,n9,j_,f5,ZCe,JCe,Fo,Ut,IX,Ca,p5,hr=M(()=>{"use strict";DX=ka(Fp(),1);mr();fr();KS();ht();$f();ip();N_();X_();Pb();K_="\u200B",FCe={curveBasis:Do,curveBasisClosed:I3,curveBasisOpen:O3,curveBumpX:s_,curveBumpY:o_,curveBundle:l_,curveCardinalClosed:u_,curveCardinalOpen:f_,curveCardinal:c_,curveCatmullRomClosed:m_,curveCatmullRomOpen:g_,curveCatmullRom:p_,curveLinear:Op,curveLinearClosed:G3,curveMonotoneX:v_,curveMonotoneY:x_,curveNatural:V3,curveStep:H3,curveStepAfter:w_,curveStepBefore:b_},zCe=/\s*(?:(\w+)(?=:):|(\w+))\s*(?:(\w+)|((?:(?!}%{2}).|\r?\n)*))?\s*(?:}%{2})?/gi,GCe=o(function(t,e){let r=NX(t,/(?:init\b)|(?:initialize\b)/),n={};if(Array.isArray(r)){let s=r.map(l=>l.args);op(s),n=Gn(n,[...s])}else n=r.args;if(!n)return;let i=np(t,e),a="config";return n[a]!==void 0&&(i==="flowchart-v2"&&(i="flowchart"),n[i]=n[a],delete n[a]),n},"detectInit"),NX=o(function(t,e=null){try{let r=new RegExp(`[%]{2}(?![{]${zCe.source})(?=[}][%]{2}).* +`,"ig");t=t.trim().replace(r,"").replace(/'/gm,'"'),Y.debug(`Detecting diagram directive${e!==null?" type:"+e:""} based on the text:${t}`);let n,i=[];for(;(n=zf.exec(t))!==null;)if(n.index===zf.lastIndex&&zf.lastIndex++,n&&!e||e&&n[1]?.match(e)||e&&n[2]?.match(e)){let a=n[1]?n[1]:n[2],s=n[3]?n[3].trim():n[4]?JSON.parse(n[4].trim()):null;i.push({type:a,args:s})}return i.length===0?{type:t,args:null}:i.length===1?i[0]:i}catch(r){return Y.error(`ERROR: ${r.message} - Unable to parse directive type: '${e}' based on the text: '${t}'`),{type:void 0,args:null}}},"detectDirective"),RX=o(function(t){return t.replace(zf,"")},"removeDirectives"),$Ce=o(function(t,e){for(let[r,n]of e.entries())if(n.match(t))return r;return-1},"isSubstringInArray");o(Q_,"interpolateToCurve");o(VCe,"formatUrl");UCe=o((t,...e)=>{let r=t.split("."),n=r.length-1,i=r[n],a=window;for(let s=0;s<n;s++)if(a=a[r[s]],!a){Y.error(`Function name: ${t} not found in window`);return}a[i](...e)},"runFunc");o(MX,"distance");o(HCe,"traverseEdge");o(WCe,"calcLabelPosition");_X=o((t,e=2)=>{let r=Math.pow(10,e);return Math.round(t*r)/r},"roundNumber"),Z_=o((t,e)=>{let r,n=e;for(let i of t){if(r){let a=MX(i,r);if(a<n)n-=a;else{let s=n/a;if(s<=0)return r;if(s>=1)return{x:i.x,y:i.y};if(s>0&&s<1)return{x:_X((1-s)*r.x+s*i.x,5),y:_X((1-s)*r.y+s*i.y,5)}}}r=i}throw new Error("Could not find a suitable point for the given distance")},"calculatePoint"),YCe=o((t,e,r)=>{Y.info(`our points ${JSON.stringify(e)}`),e[0]!==r&&(e=e.reverse());let i=Z_(e,25),a=t?10:5,s=Math.atan2(e[0].y-i.y,e[0].x-i.x),l={x:0,y:0};return l.x=Math.sin(s)*a+(e[0].x+i.x)/2,l.y=-Math.cos(s)*a+(e[0].y+i.y)/2,l},"calcCardinalityPosition");o(qCe,"calcTerminalLabelPosition");o(J_,"getStylesFromArray");LX=0,e9=o(()=>(LX++,"id-"+Math.random().toString(36).substr(2,12)+"-"+LX),"generateId");o(XCe,"makeRandomHex");t9=o(t=>XCe(t.length),"random"),jCe=o(function(){return{x:0,y:0,fill:void 0,anchor:"start",style:"#666",width:100,height:100,textMargin:0,rx:0,ry:0,valign:void 0,text:""}},"getTextObj"),KCe=o(function(t,e){let r=e.text.replace(je.lineBreakRegex," "),[,n]=Fo(e.fontSize),i=t.append("text");i.attr("x",e.x),i.attr("y",e.y),i.style("text-anchor",e.anchor),i.style("font-family",e.fontFamily),i.style("font-size",n),i.style("font-weight",e.fontWeight),i.attr("fill",e.fill),e.class!==void 0&&i.attr("class",e.class);let a=i.append("tspan");return a.attr("x",e.x+e.textMargin*2),a.attr("fill",e.fill),a.text(r),i},"drawSimpleText"),r9=Vp((t,e,r)=>{if(!t||(r=Object.assign({fontSize:12,fontWeight:400,fontFamily:"Arial",joinWith:"<br/>"},r),je.lineBreakRegex.test(t)))return t;let n=t.split(" ").filter(Boolean),i=[],a="";return n.forEach((s,l)=>{let u=Js(`${s} `,r),h=Js(a,r);if(u>e){let{hyphenatedStrings:p,remainingWord:m}=QCe(s,e,"-",r);i.push(a,...p),a=m}else h+u>=e?(i.push(a),a=s):a=[a,s].filter(Boolean).join(" ");l+1===n.length&&i.push(a)}),i.filter(s=>s!=="").join(r.joinWith)},(t,e,r)=>`${t}${e}${r.fontSize}${r.fontWeight}${r.fontFamily}${r.joinWith}`),QCe=Vp((t,e,r="-",n)=>{n=Object.assign({fontSize:12,fontWeight:400,fontFamily:"Arial",margin:0},n);let i=[...t],a=[],s="";return i.forEach((l,u)=>{let h=`${s}${l}`;if(Js(h,n)>=e){let d=u+1,p=i.length===d,m=`${h}${r}`;a.push(p?h:m),s=""}else s=h}),{hyphenatedStrings:a,remainingWord:s}},(t,e,r="-",n)=>`${t}${e}${r}${n.fontSize}${n.fontWeight}${n.fontFamily}`);o(d5,"calculateTextHeight");o(Js,"calculateTextWidth");n9=Vp((t,e)=>{let{fontSize:r=12,fontFamily:n="Arial",fontWeight:i=400}=e;if(!t)return{width:0,height:0};let[,a]=Fo(r),s=["sans-serif",n],l=t.split(je.lineBreakRegex),u=[],h=ze("body");if(!h.remove)return{width:0,height:0,lineHeight:0};let f=h.append("svg");for(let p of s){let m=0,g={width:0,height:0,lineHeight:0};for(let y of l){let v=jCe();v.text=y||K_;let x=KCe(f,v).style("font-size",a).style("font-weight",i).style("font-family",p),b=(x._groups||x)[0][0].getBBox();if(b.width===0&&b.height===0)throw new Error("svg element not in render tree");g.width=Math.round(Math.max(g.width,b.width)),m=Math.round(b.height),g.height+=m,g.lineHeight=Math.round(Math.max(g.lineHeight,m))}u.push(g)}f.remove();let d=isNaN(u[1].height)||isNaN(u[1].width)||isNaN(u[1].lineHeight)||u[0].height>u[1].height&&u[0].width>u[1].width&&u[0].lineHeight>u[1].lineHeight?0:1;return u[d]},(t,e)=>`${t}${e.fontSize}${e.fontWeight}${e.fontFamily}`),j_=class{constructor(e=!1,r){this.count=0;this.count=r?r.length:0,this.next=e?()=>this.count++:()=>Date.now()}static{o(this,"InitIDGenerator")}},ZCe=o(function(t){return f5=f5||document.createElement("div"),t=escape(t).replace(/%26/g,"&").replace(/%23/g,"#").replace(/%3B/g,";"),f5.innerHTML=t,unescape(f5.textContent)},"entityDecode");o(i9,"isDetailedError");JCe=o((t,e,r,n)=>{if(!n)return;let i=t.node()?.getBBox();i&&t.append("text").text(n).attr("text-anchor","middle").attr("x",i.x+i.width/2).attr("y",-r).attr("class",e)},"insertTitle"),Fo=o(t=>{if(typeof t=="number")return[t,t+"px"];let e=parseInt(t??"",10);return Number.isNaN(e)?[void 0,void 0]:t===String(e)?[e,t+"px"]:[e,t]},"parseFontSize");o(ws,"cleanAndMerge");Ut={assignWithDepth:Gn,wrapLabel:r9,calculateTextHeight:d5,calculateTextWidth:Js,calculateTextDimensions:n9,cleanAndMerge:ws,detectInit:GCe,detectDirective:NX,isSubstringInArray:$Ce,interpolateToCurve:Q_,calcLabelPosition:WCe,calcCardinalityPosition:YCe,calcTerminalLabelPosition:qCe,formatUrl:VCe,getStylesFromArray:J_,generateId:e9,random:t9,runFunc:UCe,entityDecode:ZCe,insertTitle:JCe,parseFontSize:Fo,InitIDGenerator:j_},IX=o(function(t){let e=t;return e=e.replace(/style.*:\S*#.*;/g,function(r){return r.substring(0,r.length-1)}),e=e.replace(/classDef.*:\S*#.*;/g,function(r){return r.substring(0,r.length-1)}),e=e.replace(/#\w+;/g,function(r){let n=r.substring(1,r.length-1);return/^\+?\d+$/.test(n)?"\uFB02\xB0\xB0"+n+"\xB6\xDF":"\uFB02\xB0"+n+"\xB6\xDF"}),e},"encodeEntities"),Ca=o(function(t){return t.replace(/fl°°/g,"&#").replace(/fl°/g,"&").replace(/¶ß/g,";")},"decodeEntities"),p5=o((t,e,{counter:r=0,prefix:n,suffix:i})=>`${n?`${n}_`:""}${t}_${e}_${r}${i?`_${i}`:""}`,"getEdgeId");o(Fn,"handleUndefinedAttr")});function Ll(t,e,r,n,i){if(!e[t].width)if(r)e[t].text=r9(e[t].text,i,n),e[t].textLines=e[t].text.split(je.lineBreakRegex).length,e[t].width=i,e[t].height=d5(e[t].text,n);else{let a=e[t].text.split(je.lineBreakRegex);e[t].textLines=a.length;let s=0;e[t].height=0,e[t].width=0;for(let l of a)e[t].width=Math.max(Js(l,n),e[t].width),s=d5(l,n),e[t].height=e[t].height+s}}function zX(t,e,r,n,i){let a=new v5(i);a.data.widthLimit=r.data.widthLimit/Math.min(a9,n.length);for(let[s,l]of n.entries()){let u=0;l.image={width:0,height:0,Y:0},l.sprite&&(l.image.width=48,l.image.height=48,l.image.Y=u,u=l.image.Y+l.image.height);let h=l.wrap&&Gt.wrap,f=m5(Gt);if(f.fontSize=f.fontSize+2,f.fontWeight="bold",Ll("label",l,h,f,a.data.widthLimit),l.label.Y=u+8,u=l.label.Y+l.label.height,l.type&&l.type.text!==""){l.type.text="["+l.type.text+"]";let g=m5(Gt);Ll("type",l,h,g,a.data.widthLimit),l.type.Y=u+5,u=l.type.Y+l.type.height}if(l.descr&&l.descr.text!==""){let g=m5(Gt);g.fontSize=g.fontSize-2,Ll("descr",l,h,g,a.data.widthLimit),l.descr.Y=u+20,u=l.descr.Y+l.descr.height}if(s==0||s%a9===0){let g=r.data.startx+Gt.diagramMarginX,y=r.data.stopy+Gt.diagramMarginY+u;a.setData(g,g,y,y)}else{let g=a.data.stopx!==a.data.startx?a.data.stopx+Gt.diagramMarginX:a.data.startx,y=a.data.starty;a.setData(g,g,y,y)}a.name=l.alias;let d=i.db.getC4ShapeArray(l.alias),p=i.db.getC4ShapeKeys(l.alias);p.length>0&&FX(a,t,d,p),e=l.alias;let m=i.db.getBoundarys(e);m.length>0&&zX(t,e,a,m,i),l.alias!=="global"&&BX(t,l,a),r.data.stopy=Math.max(a.data.stopy+Gt.c4ShapeMargin,r.data.stopy),r.data.stopx=Math.max(a.data.stopx+Gt.c4ShapeMargin,r.data.stopx),g5=Math.max(g5,r.data.stopx),y5=Math.max(y5,r.data.stopy)}}var g5,y5,PX,a9,Gt,v5,s9,ov,m5,e7e,BX,FX,Ts,OX,t7e,r7e,n7e,o9,GX=M(()=>{"use strict";mr();OY();ht();PS();fr();l7();Vt();ip();hr();ni();g5=0,y5=0,PX=4,a9=2;I1.yy=oy;Gt={},v5=class{static{o(this,"Bounds")}constructor(e){this.name="",this.data={},this.data.startx=void 0,this.data.stopx=void 0,this.data.starty=void 0,this.data.stopy=void 0,this.data.widthLimit=void 0,this.nextData={},this.nextData.startx=void 0,this.nextData.stopx=void 0,this.nextData.starty=void 0,this.nextData.stopy=void 0,this.nextData.cnt=0,s9(e.db.getConfig())}setData(e,r,n,i){this.nextData.startx=this.data.startx=e,this.nextData.stopx=this.data.stopx=r,this.nextData.starty=this.data.starty=n,this.nextData.stopy=this.data.stopy=i}updateVal(e,r,n,i){e[r]===void 0?e[r]=n:e[r]=i(n,e[r])}insert(e){this.nextData.cnt=this.nextData.cnt+1;let r=this.nextData.startx===this.nextData.stopx?this.nextData.stopx+e.margin:this.nextData.stopx+e.margin*2,n=r+e.width,i=this.nextData.starty+e.margin*2,a=i+e.height;(r>=this.data.widthLimit||n>=this.data.widthLimit||this.nextData.cnt>PX)&&(r=this.nextData.startx+e.margin+Gt.nextLinePaddingX,i=this.nextData.stopy+e.margin*2,this.nextData.stopx=n=r+e.width,this.nextData.starty=this.nextData.stopy,this.nextData.stopy=a=i+e.height,this.nextData.cnt=1),e.x=r,e.y=i,this.updateVal(this.data,"startx",r,Math.min),this.updateVal(this.data,"starty",i,Math.min),this.updateVal(this.data,"stopx",n,Math.max),this.updateVal(this.data,"stopy",a,Math.max),this.updateVal(this.nextData,"startx",r,Math.min),this.updateVal(this.nextData,"starty",i,Math.min),this.updateVal(this.nextData,"stopx",n,Math.max),this.updateVal(this.nextData,"stopy",a,Math.max)}init(e){this.name="",this.data={startx:void 0,stopx:void 0,starty:void 0,stopy:void 0,widthLimit:void 0},this.nextData={startx:void 0,stopx:void 0,starty:void 0,stopy:void 0,cnt:0},s9(e.db.getConfig())}bumpLastMargin(e){this.data.stopx+=e,this.data.stopy+=e}},s9=o(function(t){Gn(Gt,t),t.fontFamily&&(Gt.personFontFamily=Gt.systemFontFamily=Gt.messageFontFamily=t.fontFamily),t.fontSize&&(Gt.personFontSize=Gt.systemFontSize=Gt.messageFontSize=t.fontSize),t.fontWeight&&(Gt.personFontWeight=Gt.systemFontWeight=Gt.messageFontWeight=t.fontWeight)},"setConf"),ov=o((t,e)=>({fontFamily:t[e+"FontFamily"],fontSize:t[e+"FontSize"],fontWeight:t[e+"FontWeight"]}),"c4ShapeFont"),m5=o(t=>({fontFamily:t.boundaryFontFamily,fontSize:t.boundaryFontSize,fontWeight:t.boundaryFontWeight}),"boundaryFont"),e7e=o(t=>({fontFamily:t.messageFontFamily,fontSize:t.messageFontSize,fontWeight:t.messageFontWeight}),"messageFont");o(Ll,"calcC4ShapeTextWH");BX=o(function(t,e,r){e.x=r.data.startx,e.y=r.data.starty,e.width=r.data.stopx-r.data.startx,e.height=r.data.stopy-r.data.starty,e.label.y=Gt.c4ShapeMargin-35;let n=e.wrap&&Gt.wrap,i=m5(Gt);i.fontSize=i.fontSize+2,i.fontWeight="bold";let a=Js(e.label.text,i);Ll("label",e,n,i,a),Cl.drawBoundary(t,e,Gt)},"drawBoundary"),FX=o(function(t,e,r,n){let i=0;for(let a of n){i=0;let s=r[a],l=ov(Gt,s.typeC4Shape.text);switch(l.fontSize=l.fontSize-2,s.typeC4Shape.width=Js("\xAB"+s.typeC4Shape.text+"\xBB",l),s.typeC4Shape.height=l.fontSize+2,s.typeC4Shape.Y=Gt.c4ShapePadding,i=s.typeC4Shape.Y+s.typeC4Shape.height-4,s.image={width:0,height:0,Y:0},s.typeC4Shape.text){case"person":case"external_person":s.image.width=48,s.image.height=48,s.image.Y=i,i=s.image.Y+s.image.height;break}s.sprite&&(s.image.width=48,s.image.height=48,s.image.Y=i,i=s.image.Y+s.image.height);let u=s.wrap&&Gt.wrap,h=Gt.width-Gt.c4ShapePadding*2,f=ov(Gt,s.typeC4Shape.text);if(f.fontSize=f.fontSize+2,f.fontWeight="bold",Ll("label",s,u,f,h),s.label.Y=i+8,i=s.label.Y+s.label.height,s.type&&s.type.text!==""){s.type.text="["+s.type.text+"]";let m=ov(Gt,s.typeC4Shape.text);Ll("type",s,u,m,h),s.type.Y=i+5,i=s.type.Y+s.type.height}else if(s.techn&&s.techn.text!==""){s.techn.text="["+s.techn.text+"]";let m=ov(Gt,s.techn.text);Ll("techn",s,u,m,h),s.techn.Y=i+5,i=s.techn.Y+s.techn.height}let d=i,p=s.label.width;if(s.descr&&s.descr.text!==""){let m=ov(Gt,s.typeC4Shape.text);Ll("descr",s,u,m,h),s.descr.Y=i+20,i=s.descr.Y+s.descr.height,p=Math.max(s.label.width,s.descr.width),d=i-s.descr.textLines*5}p=p+Gt.c4ShapePadding,s.width=Math.max(s.width||Gt.width,p,Gt.width),s.height=Math.max(s.height||Gt.height,d,Gt.height),s.margin=s.margin||Gt.c4ShapeMargin,t.insert(s),Cl.drawC4Shape(e,s,Gt)}t.bumpLastMargin(Gt.c4ShapeMargin)},"drawC4ShapeArray"),Ts=class{static{o(this,"Point")}constructor(e,r){this.x=e,this.y=r}},OX=o(function(t,e){let r=t.x,n=t.y,i=e.x,a=e.y,s=r+t.width/2,l=n+t.height/2,u=Math.abs(r-i),h=Math.abs(n-a),f=h/u,d=t.height/t.width,p=null;return n==a&&r<i?p=new Ts(r+t.width,l):n==a&&r>i?p=new Ts(r,l):r==i&&n<a?p=new Ts(s,n+t.height):r==i&&n>a&&(p=new Ts(s,n)),r>i&&n<a?d>=f?p=new Ts(r,l+f*t.width/2):p=new Ts(s-u/h*t.height/2,n+t.height):r<i&&n<a?d>=f?p=new Ts(r+t.width,l+f*t.width/2):p=new Ts(s+u/h*t.height/2,n+t.height):r<i&&n>a?d>=f?p=new Ts(r+t.width,l-f*t.width/2):p=new Ts(s+t.height/2*u/h,n):r>i&&n>a&&(d>=f?p=new Ts(r,l-t.width/2*f):p=new Ts(s-t.height/2*u/h,n)),p},"getIntersectPoint"),t7e=o(function(t,e){let r={x:0,y:0};r.x=e.x+e.width/2,r.y=e.y+e.height/2;let n=OX(t,r);r.x=t.x+t.width/2,r.y=t.y+t.height/2;let i=OX(e,r);return{startPoint:n,endPoint:i}},"getIntersectPoints"),r7e=o(function(t,e,r,n){let i=0;for(let a of e){i=i+1;let s=a.wrap&&Gt.wrap,l=e7e(Gt);n.db.getC4Type()==="C4Dynamic"&&(a.label.text=i+": "+a.label.text);let h=Js(a.label.text,l);Ll("label",a,s,l,h),a.techn&&a.techn.text!==""&&(h=Js(a.techn.text,l),Ll("techn",a,s,l,h)),a.descr&&a.descr.text!==""&&(h=Js(a.descr.text,l),Ll("descr",a,s,l,h));let f=r(a.from),d=r(a.to),p=t7e(f,d);a.startPoint=p.startPoint,a.endPoint=p.endPoint}Cl.drawRels(t,e,Gt)},"drawRels");o(zX,"drawInsideBoundary");n7e=o(function(t,e,r,n){Gt=de().c4;let i=de().securityLevel,a;i==="sandbox"&&(a=ze("#i"+e));let s=i==="sandbox"?ze(a.nodes()[0].contentDocument.body):ze("body"),l=n.db;n.db.setWrap(Gt.wrap),PX=l.getC4ShapeInRow(),a9=l.getC4BoundaryInRow(),Y.debug(`C:${JSON.stringify(Gt,null,2)}`);let u=i==="sandbox"?s.select(`[id="${e}"]`):ze(`[id="${e}"]`);Cl.insertComputerIcon(u),Cl.insertDatabaseIcon(u),Cl.insertClockIcon(u);let h=new v5(n);h.setData(Gt.diagramMarginX,Gt.diagramMarginX,Gt.diagramMarginY,Gt.diagramMarginY),h.data.widthLimit=screen.availWidth,g5=Gt.diagramMarginX,y5=Gt.diagramMarginY;let f=n.db.getTitle(),d=n.db.getBoundarys("");zX(u,"",h,d,n),Cl.insertArrowHead(u),Cl.insertArrowEnd(u),Cl.insertArrowCrossHead(u),Cl.insertArrowFilledHead(u),r7e(u,n.db.getRels(),n.db.getC4Shape,n),h.data.stopx=g5,h.data.stopy=y5;let p=h.data,g=p.stopy-p.starty+2*Gt.diagramMarginY,v=p.stopx-p.startx+2*Gt.diagramMarginX;f&&u.append("text").text(f).attr("x",(p.stopx-p.startx)/2-4*Gt.diagramMarginX).attr("y",p.starty+Gt.diagramMarginY),Zr(u,g,v,Gt.useMaxWidth);let x=f?60:0;u.attr("viewBox",p.startx-Gt.diagramMarginX+" -"+(Gt.diagramMarginY+x)+" "+v+" "+(g+x)),Y.debug("models:",p)},"draw"),o9={drawPersonOrSystemArray:FX,drawBoundary:BX,setConf:s9,draw:n7e}});var i7e,$X,VX=M(()=>{"use strict";i7e=o(t=>`.person { + stroke: ${t.personBorder}; + fill: ${t.personBkg}; + } +`,"getStyles"),$X=i7e});var UX={};vr(UX,{diagram:()=>a7e});var a7e,HX=M(()=>{"use strict";PS();l7();GX();VX();a7e={parser:QF,db:oy,renderer:o9,styles:$X,init:o(({c4:t,wrap:e})=>{o9.setConf(t),oy.setWrap(e)},"init")}});function u9(){return{async:!1,breaks:!1,extensions:null,gfm:!0,hooks:null,pedantic:!1,renderer:null,silent:!1,tokenizer:null,walkTokens:null}}function ZX(t){Ed=t}function eo(t,e){if(e){if(JX.test(t))return t.replace(c7e,qX)}else if(ej.test(t))return t.replace(u7e,qX);return t}function d7e(t){return t.replace(f7e,(e,r)=>(r=r.toLowerCase(),r==="colon"?":":r.charAt(0)==="#"?r.charAt(1)==="x"?String.fromCharCode(parseInt(r.substring(2),16)):String.fromCharCode(+r.substring(1)):""))}function fn(t,e){let r=typeof t=="string"?t:t.source;e=e||"";let n={replace:o((i,a)=>{let s=typeof a=="string"?a:a.source;return s=s.replace(p7e,"$1"),r=r.replace(i,s),n},"replace"),getRegex:o(()=>new RegExp(r,e),"getRegex")};return n}function XX(t){try{t=encodeURI(t).replace(/%25/g,"%")}catch{return null}return t}function jX(t,e){let r=t.replace(/\|/g,(a,s,l)=>{let u=!1,h=s;for(;--h>=0&&l[h]==="\\";)u=!u;return u?"|":" |"}),n=r.split(/ \|/),i=0;if(n[0].trim()||n.shift(),n.length>0&&!n[n.length-1].trim()&&n.pop(),e)if(n.length>e)n.splice(e);else for(;n.length<e;)n.push("");for(;i<n.length;i++)n[i]=n[i].trim().replace(/\\\|/g,"|");return n}function lv(t,e,r){let n=t.length;if(n===0)return"";let i=0;for(;i<n;){let a=t.charAt(n-i-1);if(a===e&&!r)i++;else if(a!==e&&r)i++;else break}return t.slice(0,n-i)}function m7e(t,e){if(t.indexOf(e[1])===-1)return-1;let r=0;for(let n=0;n<t.length;n++)if(t[n]==="\\")n++;else if(t[n]===e[0])r++;else if(t[n]===e[1]&&(r--,r<0))return n;return-1}function KX(t,e,r,n){let i=e.href,a=e.title?eo(e.title):null,s=t[1].replace(/\\([\[\]])/g,"$1");if(t[0].charAt(0)!=="!"){n.state.inLink=!0;let l={type:"link",raw:r,href:i,title:a,text:s,tokens:n.inlineTokens(s)};return n.state.inLink=!1,l}return{type:"image",raw:r,href:i,title:a,text:eo(s)}}function g7e(t,e){let r=t.match(/^(\s+)(?:```)/);if(r===null)return e;let n=r[1];return e.split(` +`).map(i=>{let a=i.match(/^\s+/);if(a===null)return i;let[s]=a;return s.length>=n.length?i.slice(n.length):i}).join(` +`)}function en(t,e){return kd.parse(t,e)}var Ed,JX,c7e,ej,u7e,h7e,qX,f7e,p7e,uv,nm,y7e,v7e,x7e,fv,b7e,tj,rj,h9,w7e,f9,T7e,k7e,w5,d9,E7e,nj,S7e,p9,QX,C7e,A7e,ij,_7e,aj,L7e,dv,D7e,N7e,R7e,M7e,I7e,O7e,P7e,B7e,F7e,b5,z7e,sj,oj,G7e,m9,$7e,l9,V7e,x5,cv,ku,im,hv,Eu,rm,c9,kd,u6t,h6t,f6t,d6t,p6t,m6t,g6t,lj=M(()=>{"use strict";o(u9,"_getDefaults");Ed=u9();o(ZX,"changeDefaults");JX=/[&<>"']/,c7e=new RegExp(JX.source,"g"),ej=/[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/,u7e=new RegExp(ej.source,"g"),h7e={"&":"&","<":"<",">":">",'"':""","'":"'"},qX=o(t=>h7e[t],"getEscapeReplacement");o(eo,"escape$1");f7e=/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig;o(d7e,"unescape");p7e=/(^|[^\[])\^/g;o(fn,"edit");o(XX,"cleanUrl");uv={exec:o(()=>null,"exec")};o(jX,"splitCells");o(lv,"rtrim");o(m7e,"findClosingBracket");o(KX,"outputLink");o(g7e,"indentCodeCompensation");nm=class{static{o(this,"_Tokenizer")}options;rules;lexer;constructor(e){this.options=e||Ed}space(e){let r=this.rules.block.newline.exec(e);if(r&&r[0].length>0)return{type:"space",raw:r[0]}}code(e){let r=this.rules.block.code.exec(e);if(r){let n=r[0].replace(/^ {1,4}/gm,"");return{type:"code",raw:r[0],codeBlockStyle:"indented",text:this.options.pedantic?n:lv(n,` +`)}}}fences(e){let r=this.rules.block.fences.exec(e);if(r){let n=r[0],i=g7e(n,r[3]||"");return{type:"code",raw:n,lang:r[2]?r[2].trim().replace(this.rules.inline.anyPunctuation,"$1"):r[2],text:i}}}heading(e){let r=this.rules.block.heading.exec(e);if(r){let n=r[2].trim();if(/#$/.test(n)){let i=lv(n,"#");(this.options.pedantic||!i||/ $/.test(i))&&(n=i.trim())}return{type:"heading",raw:r[0],depth:r[1].length,text:n,tokens:this.lexer.inline(n)}}}hr(e){let r=this.rules.block.hr.exec(e);if(r)return{type:"hr",raw:lv(r[0],` +`)}}blockquote(e){let r=this.rules.block.blockquote.exec(e);if(r){let n=lv(r[0],` +`).split(` +`),i="",a="",s=[];for(;n.length>0;){let l=!1,u=[],h;for(h=0;h<n.length;h++)if(/^ {0,3}>/.test(n[h]))u.push(n[h]),l=!0;else if(!l)u.push(n[h]);else break;n=n.slice(h);let f=u.join(` +`),d=f.replace(/\n {0,3}((?:=+|-+) *)(?=\n|$)/g,` + $1`).replace(/^ {0,3}>[ \t]?/gm,"");i=i?`${i} +${f}`:f,a=a?`${a} +${d}`:d;let p=this.lexer.state.top;if(this.lexer.state.top=!0,this.lexer.blockTokens(d,s,!0),this.lexer.state.top=p,n.length===0)break;let m=s[s.length-1];if(m?.type==="code")break;if(m?.type==="blockquote"){let g=m,y=g.raw+` +`+n.join(` +`),v=this.blockquote(y);s[s.length-1]=v,i=i.substring(0,i.length-g.raw.length)+v.raw,a=a.substring(0,a.length-g.text.length)+v.text;break}else if(m?.type==="list"){let g=m,y=g.raw+` +`+n.join(` +`),v=this.list(y);s[s.length-1]=v,i=i.substring(0,i.length-m.raw.length)+v.raw,a=a.substring(0,a.length-g.raw.length)+v.raw,n=y.substring(s[s.length-1].raw.length).split(` +`);continue}}return{type:"blockquote",raw:i,tokens:s,text:a}}}list(e){let r=this.rules.block.list.exec(e);if(r){let n=r[1].trim(),i=n.length>1,a={type:"list",raw:"",ordered:i,start:i?+n.slice(0,-1):"",loose:!1,items:[]};n=i?`\\d{1,9}\\${n.slice(-1)}`:`\\${n}`,this.options.pedantic&&(n=i?n:"[*+-]");let s=new RegExp(`^( {0,3}${n})((?:[ ][^\\n]*)?(?:\\n|$))`),l=!1;for(;e;){let u=!1,h="",f="";if(!(r=s.exec(e))||this.rules.block.hr.test(e))break;h=r[0],e=e.substring(h.length);let d=r[2].split(` +`,1)[0].replace(/^\t+/,x=>" ".repeat(3*x.length)),p=e.split(` +`,1)[0],m=!d.trim(),g=0;if(this.options.pedantic?(g=2,f=d.trimStart()):m?g=r[1].length+1:(g=r[2].search(/[^ ]/),g=g>4?1:g,f=d.slice(g),g+=r[1].length),m&&/^ *$/.test(p)&&(h+=p+` +`,e=e.substring(p.length+1),u=!0),!u){let x=new RegExp(`^ {0,${Math.min(3,g-1)}}(?:[*+-]|\\d{1,9}[.)])((?:[ ][^\\n]*)?(?:\\n|$))`),b=new RegExp(`^ {0,${Math.min(3,g-1)}}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)`),w=new RegExp(`^ {0,${Math.min(3,g-1)}}(?:\`\`\`|~~~)`),_=new RegExp(`^ {0,${Math.min(3,g-1)}}#`);for(;e;){let T=e.split(` +`,1)[0];if(p=T,this.options.pedantic&&(p=p.replace(/^ {1,4}(?=( {4})*[^ ])/g," ")),w.test(p)||_.test(p)||x.test(p)||b.test(e))break;if(p.search(/[^ ]/)>=g||!p.trim())f+=` +`+p.slice(g);else{if(m||d.search(/[^ ]/)>=4||w.test(d)||_.test(d)||b.test(d))break;f+=` +`+p}!m&&!p.trim()&&(m=!0),h+=T+` +`,e=e.substring(T.length+1),d=p.slice(g)}}a.loose||(l?a.loose=!0:/\n *\n *$/.test(h)&&(l=!0));let y=null,v;this.options.gfm&&(y=/^\[[ xX]\] /.exec(f),y&&(v=y[0]!=="[ ] ",f=f.replace(/^\[[ xX]\] +/,""))),a.items.push({type:"list_item",raw:h,task:!!y,checked:v,loose:!1,text:f,tokens:[]}),a.raw+=h}a.items[a.items.length-1].raw=a.items[a.items.length-1].raw.trimEnd(),a.items[a.items.length-1].text=a.items[a.items.length-1].text.trimEnd(),a.raw=a.raw.trimEnd();for(let u=0;u<a.items.length;u++)if(this.lexer.state.top=!1,a.items[u].tokens=this.lexer.blockTokens(a.items[u].text,[]),!a.loose){let h=a.items[u].tokens.filter(d=>d.type==="space"),f=h.length>0&&h.some(d=>/\n.*\n/.test(d.raw));a.loose=f}if(a.loose)for(let u=0;u<a.items.length;u++)a.items[u].loose=!0;return a}}html(e){let r=this.rules.block.html.exec(e);if(r)return{type:"html",block:!0,raw:r[0],pre:r[1]==="pre"||r[1]==="script"||r[1]==="style",text:r[0]}}def(e){let r=this.rules.block.def.exec(e);if(r){let n=r[1].toLowerCase().replace(/\s+/g," "),i=r[2]?r[2].replace(/^<(.*)>$/,"$1").replace(this.rules.inline.anyPunctuation,"$1"):"",a=r[3]?r[3].substring(1,r[3].length-1).replace(this.rules.inline.anyPunctuation,"$1"):r[3];return{type:"def",tag:n,raw:r[0],href:i,title:a}}}table(e){let r=this.rules.block.table.exec(e);if(!r||!/[:|]/.test(r[2]))return;let n=jX(r[1]),i=r[2].replace(/^\||\| *$/g,"").split("|"),a=r[3]&&r[3].trim()?r[3].replace(/\n[ \t]*$/,"").split(` +`):[],s={type:"table",raw:r[0],header:[],align:[],rows:[]};if(n.length===i.length){for(let l of i)/^ *-+: *$/.test(l)?s.align.push("right"):/^ *:-+: *$/.test(l)?s.align.push("center"):/^ *:-+ *$/.test(l)?s.align.push("left"):s.align.push(null);for(let l=0;l<n.length;l++)s.header.push({text:n[l],tokens:this.lexer.inline(n[l]),header:!0,align:s.align[l]});for(let l of a)s.rows.push(jX(l,s.header.length).map((u,h)=>({text:u,tokens:this.lexer.inline(u),header:!1,align:s.align[h]})));return s}}lheading(e){let r=this.rules.block.lheading.exec(e);if(r)return{type:"heading",raw:r[0],depth:r[2].charAt(0)==="="?1:2,text:r[1],tokens:this.lexer.inline(r[1])}}paragraph(e){let r=this.rules.block.paragraph.exec(e);if(r){let n=r[1].charAt(r[1].length-1)===` +`?r[1].slice(0,-1):r[1];return{type:"paragraph",raw:r[0],text:n,tokens:this.lexer.inline(n)}}}text(e){let r=this.rules.block.text.exec(e);if(r)return{type:"text",raw:r[0],text:r[0],tokens:this.lexer.inline(r[0])}}escape(e){let r=this.rules.inline.escape.exec(e);if(r)return{type:"escape",raw:r[0],text:eo(r[1])}}tag(e){let r=this.rules.inline.tag.exec(e);if(r)return!this.lexer.state.inLink&&/^<a /i.test(r[0])?this.lexer.state.inLink=!0:this.lexer.state.inLink&&/^<\/a>/i.test(r[0])&&(this.lexer.state.inLink=!1),!this.lexer.state.inRawBlock&&/^<(pre|code|kbd|script)(\s|>)/i.test(r[0])?this.lexer.state.inRawBlock=!0:this.lexer.state.inRawBlock&&/^<\/(pre|code|kbd|script)(\s|>)/i.test(r[0])&&(this.lexer.state.inRawBlock=!1),{type:"html",raw:r[0],inLink:this.lexer.state.inLink,inRawBlock:this.lexer.state.inRawBlock,block:!1,text:r[0]}}link(e){let r=this.rules.inline.link.exec(e);if(r){let n=r[2].trim();if(!this.options.pedantic&&/^</.test(n)){if(!/>$/.test(n))return;let s=lv(n.slice(0,-1),"\\");if((n.length-s.length)%2===0)return}else{let s=m7e(r[2],"()");if(s>-1){let u=(r[0].indexOf("!")===0?5:4)+r[1].length+s;r[2]=r[2].substring(0,s),r[0]=r[0].substring(0,u).trim(),r[3]=""}}let i=r[2],a="";if(this.options.pedantic){let s=/^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(i);s&&(i=s[1],a=s[3])}else a=r[3]?r[3].slice(1,-1):"";return i=i.trim(),/^</.test(i)&&(this.options.pedantic&&!/>$/.test(n)?i=i.slice(1):i=i.slice(1,-1)),KX(r,{href:i&&i.replace(this.rules.inline.anyPunctuation,"$1"),title:a&&a.replace(this.rules.inline.anyPunctuation,"$1")},r[0],this.lexer)}}reflink(e,r){let n;if((n=this.rules.inline.reflink.exec(e))||(n=this.rules.inline.nolink.exec(e))){let i=(n[2]||n[1]).replace(/\s+/g," "),a=r[i.toLowerCase()];if(!a){let s=n[0].charAt(0);return{type:"text",raw:s,text:s}}return KX(n,a,n[0],this.lexer)}}emStrong(e,r,n=""){let i=this.rules.inline.emStrongLDelim.exec(e);if(!i||i[3]&&n.match(/[\p{L}\p{N}]/u))return;if(!(i[1]||i[2]||"")||!n||this.rules.inline.punctuation.exec(n)){let s=[...i[0]].length-1,l,u,h=s,f=0,d=i[0][0]==="*"?this.rules.inline.emStrongRDelimAst:this.rules.inline.emStrongRDelimUnd;for(d.lastIndex=0,r=r.slice(-1*e.length+s);(i=d.exec(r))!=null;){if(l=i[1]||i[2]||i[3]||i[4]||i[5]||i[6],!l)continue;if(u=[...l].length,i[3]||i[4]){h+=u;continue}else if((i[5]||i[6])&&s%3&&!((s+u)%3)){f+=u;continue}if(h-=u,h>0)continue;u=Math.min(u,u+h+f);let p=[...i[0]][0].length,m=e.slice(0,s+i.index+p+u);if(Math.min(s,u)%2){let y=m.slice(1,-1);return{type:"em",raw:m,text:y,tokens:this.lexer.inlineTokens(y)}}let g=m.slice(2,-2);return{type:"strong",raw:m,text:g,tokens:this.lexer.inlineTokens(g)}}}}codespan(e){let r=this.rules.inline.code.exec(e);if(r){let n=r[2].replace(/\n/g," "),i=/[^ ]/.test(n),a=/^ /.test(n)&&/ $/.test(n);return i&&a&&(n=n.substring(1,n.length-1)),n=eo(n,!0),{type:"codespan",raw:r[0],text:n}}}br(e){let r=this.rules.inline.br.exec(e);if(r)return{type:"br",raw:r[0]}}del(e){let r=this.rules.inline.del.exec(e);if(r)return{type:"del",raw:r[0],text:r[2],tokens:this.lexer.inlineTokens(r[2])}}autolink(e){let r=this.rules.inline.autolink.exec(e);if(r){let n,i;return r[2]==="@"?(n=eo(r[1]),i="mailto:"+n):(n=eo(r[1]),i=n),{type:"link",raw:r[0],text:n,href:i,tokens:[{type:"text",raw:n,text:n}]}}}url(e){let r;if(r=this.rules.inline.url.exec(e)){let n,i;if(r[2]==="@")n=eo(r[0]),i="mailto:"+n;else{let a;do a=r[0],r[0]=this.rules.inline._backpedal.exec(r[0])?.[0]??"";while(a!==r[0]);n=eo(r[0]),r[1]==="www."?i="http://"+r[0]:i=r[0]}return{type:"link",raw:r[0],text:n,href:i,tokens:[{type:"text",raw:n,text:n}]}}}inlineText(e){let r=this.rules.inline.text.exec(e);if(r){let n;return this.lexer.state.inRawBlock?n=r[0]:n=eo(r[0]),{type:"text",raw:r[0],text:n}}}},y7e=/^(?: *(?:\n|$))+/,v7e=/^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/,x7e=/^ {0,3}(`{3,}(?=[^`\n]*(?:\n|$))|~{3,})([^\n]*)(?:\n|$)(?:|([\s\S]*?)(?:\n|$))(?: {0,3}\1[~`]* *(?=\n|$)|$)/,fv=/^ {0,3}((?:-[\t ]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})(?:\n+|$)/,b7e=/^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/,tj=/(?:[*+-]|\d{1,9}[.)])/,rj=fn(/^(?!bull |blockCode|fences|blockquote|heading|html)((?:.|\n(?!\s*?\n|bull |blockCode|fences|blockquote|heading|html))+?)\n {0,3}(=+|-+) *(?:\n+|$)/).replace(/bull/g,tj).replace(/blockCode/g,/ {4}/).replace(/fences/g,/ {0,3}(?:`{3,}|~{3,})/).replace(/blockquote/g,/ {0,3}>/).replace(/heading/g,/ {0,3}#{1,6}/).replace(/html/g,/ {0,3}<[^\n>]+>\n/).getRegex(),h9=/^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html|table| +\n)[^\n]+)*)/,w7e=/^[^\n]+/,f9=/(?!\s*\])(?:\\.|[^\[\]\\])+/,T7e=fn(/^ {0,3}\[(label)\]: *(?:\n *)?([^<\s][^\s]*|<.*?>)(?:(?: +(?:\n *)?| *\n *)(title))? *(?:\n+|$)/).replace("label",f9).replace("title",/(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/).getRegex(),k7e=fn(/^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/).replace(/bull/g,tj).getRegex(),w5="address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|search|section|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul",d9=/<!--(?:-?>|[\s\S]*?(?:-->|$))/,E7e=fn("^ {0,3}(?:<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?(?:\\?>\\n*|$)|<![A-Z][\\s\\S]*?(?:>\\n*|$)|<!\\[CDATA\\[[\\s\\S]*?(?:\\]\\]>\\n*|$)|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:(?:\\n *)+\\n|$)|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)|</(?!script|pre|style|textarea)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$))","i").replace("comment",d9).replace("tag",w5).replace("attribute",/ +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(),nj=fn(h9).replace("hr",fv).replace("heading"," {0,3}#{1,6}(?:\\s|$)").replace("|lheading","").replace("|table","").replace("blockquote"," {0,3}>").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html","</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)").replace("tag",w5).getRegex(),S7e=fn(/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/).replace("paragraph",nj).getRegex(),p9={blockquote:S7e,code:v7e,def:T7e,fences:x7e,heading:b7e,hr:fv,html:E7e,lheading:rj,list:k7e,newline:y7e,paragraph:nj,table:uv,text:w7e},QX=fn("^ *([^\\n ].*)\\n {0,3}((?:\\| *)?:?-+:? *(?:\\| *:?-+:? *)*(?:\\| *)?)(?:\\n((?:(?! *\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)").replace("hr",fv).replace("heading"," {0,3}#{1,6}(?:\\s|$)").replace("blockquote"," {0,3}>").replace("code"," {4}[^\\n]").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html","</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)").replace("tag",w5).getRegex(),C7e={...p9,table:QX,paragraph:fn(h9).replace("hr",fv).replace("heading"," {0,3}#{1,6}(?:\\s|$)").replace("|lheading","").replace("table",QX).replace("blockquote"," {0,3}>").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html","</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)").replace("tag",w5).getRegex()},A7e={...p9,html:fn(`^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)|<tag(?:"[^"]*"|'[^']*'|\\s[^'"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))`).replace("comment",d9).replace(/tag/g,"(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b").getRegex(),def:/^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/,heading:/^(#{1,6})(.*)(?:\n+|$)/,fences:uv,lheading:/^(.+?)\n {0,3}(=+|-+) *(?:\n+|$)/,paragraph:fn(h9).replace("hr",fv).replace("heading",` *#{1,6} *[^ +]`).replace("lheading",rj).replace("|table","").replace("blockquote"," {0,3}>").replace("|fences","").replace("|list","").replace("|html","").replace("|tag","").getRegex()},ij=/^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,_7e=/^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,aj=/^( {2,}|\\)\n(?!\s*$)/,L7e=/^(`+|[^`])(?:(?= {2,}\n)|[\s\S]*?(?:(?=[\\<!\[`*_]|\b_|$)|[^ ](?= {2,}\n)))/,dv="\\p{P}\\p{S}",D7e=fn(/^((?![*_])[\spunctuation])/,"u").replace(/punctuation/g,dv).getRegex(),N7e=/\[[^[\]]*?\]\([^\(\)]*?\)|`[^`]*?`|<[^<>]*?>/g,R7e=fn(/^(?:\*+(?:((?!\*)[punct])|[^\s*]))|^_+(?:((?!_)[punct])|([^\s_]))/,"u").replace(/punct/g,dv).getRegex(),M7e=fn("^[^_*]*?__[^_*]*?\\*[^_*]*?(?=__)|[^*]+(?=[^*])|(?!\\*)[punct](\\*+)(?=[\\s]|$)|[^punct\\s](\\*+)(?!\\*)(?=[punct\\s]|$)|(?!\\*)[punct\\s](\\*+)(?=[^punct\\s])|[\\s](\\*+)(?!\\*)(?=[punct])|(?!\\*)[punct](\\*+)(?!\\*)(?=[punct])|[^punct\\s](\\*+)(?=[^punct\\s])","gu").replace(/punct/g,dv).getRegex(),I7e=fn("^[^_*]*?\\*\\*[^_*]*?_[^_*]*?(?=\\*\\*)|[^_]+(?=[^_])|(?!_)[punct](_+)(?=[\\s]|$)|[^punct\\s](_+)(?!_)(?=[punct\\s]|$)|(?!_)[punct\\s](_+)(?=[^punct\\s])|[\\s](_+)(?!_)(?=[punct])|(?!_)[punct](_+)(?!_)(?=[punct])","gu").replace(/punct/g,dv).getRegex(),O7e=fn(/\\([punct])/,"gu").replace(/punct/g,dv).getRegex(),P7e=fn(/^<(scheme:[^\s\x00-\x1f<>]*|email)>/).replace("scheme",/[a-zA-Z][a-zA-Z0-9+.-]{1,31}/).replace("email",/[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/).getRegex(),B7e=fn(d9).replace("(?:-->|$)","-->").getRegex(),F7e=fn("^comment|^</[a-zA-Z][\\w:-]*\\s*>|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^<![a-zA-Z]+\\s[\\s\\S]*?>|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>").replace("comment",B7e).replace("attribute",/\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/).getRegex(),b5=/(?:\[(?:\\.|[^\[\]\\])*\]|\\.|`[^`]*`|[^\[\]\\`])*?/,z7e=fn(/^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/).replace("label",b5).replace("href",/<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/).replace("title",/"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/).getRegex(),sj=fn(/^!?\[(label)\]\[(ref)\]/).replace("label",b5).replace("ref",f9).getRegex(),oj=fn(/^!?\[(ref)\](?:\[\])?/).replace("ref",f9).getRegex(),G7e=fn("reflink|nolink(?!\\()","g").replace("reflink",sj).replace("nolink",oj).getRegex(),m9={_backpedal:uv,anyPunctuation:O7e,autolink:P7e,blockSkip:N7e,br:aj,code:_7e,del:uv,emStrongLDelim:R7e,emStrongRDelimAst:M7e,emStrongRDelimUnd:I7e,escape:ij,link:z7e,nolink:oj,punctuation:D7e,reflink:sj,reflinkSearch:G7e,tag:F7e,text:L7e,url:uv},$7e={...m9,link:fn(/^!?\[(label)\]\((.*?)\)/).replace("label",b5).getRegex(),reflink:fn(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace("label",b5).getRegex()},l9={...m9,escape:fn(ij).replace("])","~|])").getRegex(),url:fn(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/,"i").replace("email",/[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/).getRegex(),_backpedal:/(?:[^?!.,:;*_'"~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_'"~)]+(?!$))+/,del:/^(~~?)(?=[^\s~])([\s\S]*?[^\s~])\1(?=[^~]|$)/,text:/^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)|[\s\S]*?(?:(?=[\\<!\[`*~_]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)))/},V7e={...l9,br:fn(aj).replace("{2,}","*").getRegex(),text:fn(l9.text).replace("\\b_","\\b_| {2,}\\n").replace(/\{2,\}/g,"*").getRegex()},x5={normal:p9,gfm:C7e,pedantic:A7e},cv={normal:m9,gfm:l9,breaks:V7e,pedantic:$7e},ku=class t{static{o(this,"_Lexer")}tokens;options;state;tokenizer;inlineQueue;constructor(e){this.tokens=[],this.tokens.links=Object.create(null),this.options=e||Ed,this.options.tokenizer=this.options.tokenizer||new nm,this.tokenizer=this.options.tokenizer,this.tokenizer.options=this.options,this.tokenizer.lexer=this,this.inlineQueue=[],this.state={inLink:!1,inRawBlock:!1,top:!0};let r={block:x5.normal,inline:cv.normal};this.options.pedantic?(r.block=x5.pedantic,r.inline=cv.pedantic):this.options.gfm&&(r.block=x5.gfm,this.options.breaks?r.inline=cv.breaks:r.inline=cv.gfm),this.tokenizer.rules=r}static get rules(){return{block:x5,inline:cv}}static lex(e,r){return new t(r).lex(e)}static lexInline(e,r){return new t(r).inlineTokens(e)}lex(e){e=e.replace(/\r\n|\r/g,` +`),this.blockTokens(e,this.tokens);for(let r=0;r<this.inlineQueue.length;r++){let n=this.inlineQueue[r];this.inlineTokens(n.src,n.tokens)}return this.inlineQueue=[],this.tokens}blockTokens(e,r=[],n=!1){this.options.pedantic?e=e.replace(/\t/g," ").replace(/^ +$/gm,""):e=e.replace(/^( *)(\t+)/gm,(l,u,h)=>u+" ".repeat(h.length));let i,a,s;for(;e;)if(!(this.options.extensions&&this.options.extensions.block&&this.options.extensions.block.some(l=>(i=l.call({lexer:this},e,r))?(e=e.substring(i.raw.length),r.push(i),!0):!1))){if(i=this.tokenizer.space(e)){e=e.substring(i.raw.length),i.raw.length===1&&r.length>0?r[r.length-1].raw+=` +`:r.push(i);continue}if(i=this.tokenizer.code(e)){e=e.substring(i.raw.length),a=r[r.length-1],a&&(a.type==="paragraph"||a.type==="text")?(a.raw+=` +`+i.raw,a.text+=` +`+i.text,this.inlineQueue[this.inlineQueue.length-1].src=a.text):r.push(i);continue}if(i=this.tokenizer.fences(e)){e=e.substring(i.raw.length),r.push(i);continue}if(i=this.tokenizer.heading(e)){e=e.substring(i.raw.length),r.push(i);continue}if(i=this.tokenizer.hr(e)){e=e.substring(i.raw.length),r.push(i);continue}if(i=this.tokenizer.blockquote(e)){e=e.substring(i.raw.length),r.push(i);continue}if(i=this.tokenizer.list(e)){e=e.substring(i.raw.length),r.push(i);continue}if(i=this.tokenizer.html(e)){e=e.substring(i.raw.length),r.push(i);continue}if(i=this.tokenizer.def(e)){e=e.substring(i.raw.length),a=r[r.length-1],a&&(a.type==="paragraph"||a.type==="text")?(a.raw+=` +`+i.raw,a.text+=` +`+i.raw,this.inlineQueue[this.inlineQueue.length-1].src=a.text):this.tokens.links[i.tag]||(this.tokens.links[i.tag]={href:i.href,title:i.title});continue}if(i=this.tokenizer.table(e)){e=e.substring(i.raw.length),r.push(i);continue}if(i=this.tokenizer.lheading(e)){e=e.substring(i.raw.length),r.push(i);continue}if(s=e,this.options.extensions&&this.options.extensions.startBlock){let l=1/0,u=e.slice(1),h;this.options.extensions.startBlock.forEach(f=>{h=f.call({lexer:this},u),typeof h=="number"&&h>=0&&(l=Math.min(l,h))}),l<1/0&&l>=0&&(s=e.substring(0,l+1))}if(this.state.top&&(i=this.tokenizer.paragraph(s))){a=r[r.length-1],n&&a?.type==="paragraph"?(a.raw+=` +`+i.raw,a.text+=` +`+i.text,this.inlineQueue.pop(),this.inlineQueue[this.inlineQueue.length-1].src=a.text):r.push(i),n=s.length!==e.length,e=e.substring(i.raw.length);continue}if(i=this.tokenizer.text(e)){e=e.substring(i.raw.length),a=r[r.length-1],a&&a.type==="text"?(a.raw+=` +`+i.raw,a.text+=` +`+i.text,this.inlineQueue.pop(),this.inlineQueue[this.inlineQueue.length-1].src=a.text):r.push(i);continue}if(e){let l="Infinite loop on byte: "+e.charCodeAt(0);if(this.options.silent){console.error(l);break}else throw new Error(l)}}return this.state.top=!0,r}inline(e,r=[]){return this.inlineQueue.push({src:e,tokens:r}),r}inlineTokens(e,r=[]){let n,i,a,s=e,l,u,h;if(this.tokens.links){let f=Object.keys(this.tokens.links);if(f.length>0)for(;(l=this.tokenizer.rules.inline.reflinkSearch.exec(s))!=null;)f.includes(l[0].slice(l[0].lastIndexOf("[")+1,-1))&&(s=s.slice(0,l.index)+"["+"a".repeat(l[0].length-2)+"]"+s.slice(this.tokenizer.rules.inline.reflinkSearch.lastIndex))}for(;(l=this.tokenizer.rules.inline.blockSkip.exec(s))!=null;)s=s.slice(0,l.index)+"["+"a".repeat(l[0].length-2)+"]"+s.slice(this.tokenizer.rules.inline.blockSkip.lastIndex);for(;(l=this.tokenizer.rules.inline.anyPunctuation.exec(s))!=null;)s=s.slice(0,l.index)+"++"+s.slice(this.tokenizer.rules.inline.anyPunctuation.lastIndex);for(;e;)if(u||(h=""),u=!1,!(this.options.extensions&&this.options.extensions.inline&&this.options.extensions.inline.some(f=>(n=f.call({lexer:this},e,r))?(e=e.substring(n.raw.length),r.push(n),!0):!1))){if(n=this.tokenizer.escape(e)){e=e.substring(n.raw.length),r.push(n);continue}if(n=this.tokenizer.tag(e)){e=e.substring(n.raw.length),i=r[r.length-1],i&&n.type==="text"&&i.type==="text"?(i.raw+=n.raw,i.text+=n.text):r.push(n);continue}if(n=this.tokenizer.link(e)){e=e.substring(n.raw.length),r.push(n);continue}if(n=this.tokenizer.reflink(e,this.tokens.links)){e=e.substring(n.raw.length),i=r[r.length-1],i&&n.type==="text"&&i.type==="text"?(i.raw+=n.raw,i.text+=n.text):r.push(n);continue}if(n=this.tokenizer.emStrong(e,s,h)){e=e.substring(n.raw.length),r.push(n);continue}if(n=this.tokenizer.codespan(e)){e=e.substring(n.raw.length),r.push(n);continue}if(n=this.tokenizer.br(e)){e=e.substring(n.raw.length),r.push(n);continue}if(n=this.tokenizer.del(e)){e=e.substring(n.raw.length),r.push(n);continue}if(n=this.tokenizer.autolink(e)){e=e.substring(n.raw.length),r.push(n);continue}if(!this.state.inLink&&(n=this.tokenizer.url(e))){e=e.substring(n.raw.length),r.push(n);continue}if(a=e,this.options.extensions&&this.options.extensions.startInline){let f=1/0,d=e.slice(1),p;this.options.extensions.startInline.forEach(m=>{p=m.call({lexer:this},d),typeof p=="number"&&p>=0&&(f=Math.min(f,p))}),f<1/0&&f>=0&&(a=e.substring(0,f+1))}if(n=this.tokenizer.inlineText(a)){e=e.substring(n.raw.length),n.raw.slice(-1)!=="_"&&(h=n.raw.slice(-1)),u=!0,i=r[r.length-1],i&&i.type==="text"?(i.raw+=n.raw,i.text+=n.text):r.push(n);continue}if(e){let f="Infinite loop on byte: "+e.charCodeAt(0);if(this.options.silent){console.error(f);break}else throw new Error(f)}}return r}},im=class{static{o(this,"_Renderer")}options;parser;constructor(e){this.options=e||Ed}space(e){return""}code({text:e,lang:r,escaped:n}){let i=(r||"").match(/^\S*/)?.[0],a=e.replace(/\n$/,"")+` +`;return i?'<pre><code class="language-'+eo(i)+'">'+(n?a:eo(a,!0))+`</code></pre> +`:"<pre><code>"+(n?a:eo(a,!0))+`</code></pre> +`}blockquote({tokens:e}){return`<blockquote> +${this.parser.parse(e)}</blockquote> +`}html({text:e}){return e}heading({tokens:e,depth:r}){return`<h${r}>${this.parser.parseInline(e)}</h${r}> +`}hr(e){return`<hr> +`}list(e){let r=e.ordered,n=e.start,i="";for(let l=0;l<e.items.length;l++){let u=e.items[l];i+=this.listitem(u)}let a=r?"ol":"ul",s=r&&n!==1?' start="'+n+'"':"";return"<"+a+s+`> +`+i+"</"+a+`> +`}listitem(e){let r="";if(e.task){let n=this.checkbox({checked:!!e.checked});e.loose?e.tokens.length>0&&e.tokens[0].type==="paragraph"?(e.tokens[0].text=n+" "+e.tokens[0].text,e.tokens[0].tokens&&e.tokens[0].tokens.length>0&&e.tokens[0].tokens[0].type==="text"&&(e.tokens[0].tokens[0].text=n+" "+e.tokens[0].tokens[0].text)):e.tokens.unshift({type:"text",raw:n+" ",text:n+" "}):r+=n+" "}return r+=this.parser.parse(e.tokens,!!e.loose),`<li>${r}</li> +`}checkbox({checked:e}){return"<input "+(e?'checked="" ':"")+'disabled="" type="checkbox">'}paragraph({tokens:e}){return`<p>${this.parser.parseInline(e)}</p> +`}table(e){let r="",n="";for(let a=0;a<e.header.length;a++)n+=this.tablecell(e.header[a]);r+=this.tablerow({text:n});let i="";for(let a=0;a<e.rows.length;a++){let s=e.rows[a];n="";for(let l=0;l<s.length;l++)n+=this.tablecell(s[l]);i+=this.tablerow({text:n})}return i&&(i=`<tbody>${i}</tbody>`),`<table> +<thead> +`+r+`</thead> +`+i+`</table> +`}tablerow({text:e}){return`<tr> +${e}</tr> +`}tablecell(e){let r=this.parser.parseInline(e.tokens),n=e.header?"th":"td";return(e.align?`<${n} align="${e.align}">`:`<${n}>`)+r+`</${n}> +`}strong({tokens:e}){return`<strong>${this.parser.parseInline(e)}</strong>`}em({tokens:e}){return`<em>${this.parser.parseInline(e)}</em>`}codespan({text:e}){return`<code>${e}</code>`}br(e){return"<br>"}del({tokens:e}){return`<del>${this.parser.parseInline(e)}</del>`}link({href:e,title:r,tokens:n}){let i=this.parser.parseInline(n),a=XX(e);if(a===null)return i;e=a;let s='<a href="'+e+'"';return r&&(s+=' title="'+r+'"'),s+=">"+i+"</a>",s}image({href:e,title:r,text:n}){let i=XX(e);if(i===null)return n;e=i;let a=`<img src="${e}" alt="${n}"`;return r&&(a+=` title="${r}"`),a+=">",a}text(e){return"tokens"in e&&e.tokens?this.parser.parseInline(e.tokens):e.text}},hv=class{static{o(this,"_TextRenderer")}strong({text:e}){return e}em({text:e}){return e}codespan({text:e}){return e}del({text:e}){return e}html({text:e}){return e}text({text:e}){return e}link({text:e}){return""+e}image({text:e}){return""+e}br(){return""}},Eu=class t{static{o(this,"_Parser")}options;renderer;textRenderer;constructor(e){this.options=e||Ed,this.options.renderer=this.options.renderer||new im,this.renderer=this.options.renderer,this.renderer.options=this.options,this.renderer.parser=this,this.textRenderer=new hv}static parse(e,r){return new t(r).parse(e)}static parseInline(e,r){return new t(r).parseInline(e)}parse(e,r=!0){let n="";for(let i=0;i<e.length;i++){let a=e[i];if(this.options.extensions&&this.options.extensions.renderers&&this.options.extensions.renderers[a.type]){let l=a,u=this.options.extensions.renderers[l.type].call({parser:this},l);if(u!==!1||!["space","hr","heading","code","table","blockquote","list","html","paragraph","text"].includes(l.type)){n+=u||"";continue}}let s=a;switch(s.type){case"space":{n+=this.renderer.space(s);continue}case"hr":{n+=this.renderer.hr(s);continue}case"heading":{n+=this.renderer.heading(s);continue}case"code":{n+=this.renderer.code(s);continue}case"table":{n+=this.renderer.table(s);continue}case"blockquote":{n+=this.renderer.blockquote(s);continue}case"list":{n+=this.renderer.list(s);continue}case"html":{n+=this.renderer.html(s);continue}case"paragraph":{n+=this.renderer.paragraph(s);continue}case"text":{let l=s,u=this.renderer.text(l);for(;i+1<e.length&&e[i+1].type==="text";)l=e[++i],u+=` +`+this.renderer.text(l);r?n+=this.renderer.paragraph({type:"paragraph",raw:u,text:u,tokens:[{type:"text",raw:u,text:u}]}):n+=u;continue}default:{let l='Token with "'+s.type+'" type was not found.';if(this.options.silent)return console.error(l),"";throw new Error(l)}}}return n}parseInline(e,r){r=r||this.renderer;let n="";for(let i=0;i<e.length;i++){let a=e[i];if(this.options.extensions&&this.options.extensions.renderers&&this.options.extensions.renderers[a.type]){let l=this.options.extensions.renderers[a.type].call({parser:this},a);if(l!==!1||!["escape","html","link","image","strong","em","codespan","br","del","text"].includes(a.type)){n+=l||"";continue}}let s=a;switch(s.type){case"escape":{n+=r.text(s);break}case"html":{n+=r.html(s);break}case"link":{n+=r.link(s);break}case"image":{n+=r.image(s);break}case"strong":{n+=r.strong(s);break}case"em":{n+=r.em(s);break}case"codespan":{n+=r.codespan(s);break}case"br":{n+=r.br(s);break}case"del":{n+=r.del(s);break}case"text":{n+=r.text(s);break}default:{let l='Token with "'+s.type+'" type was not found.';if(this.options.silent)return console.error(l),"";throw new Error(l)}}}return n}},rm=class{static{o(this,"_Hooks")}options;constructor(e){this.options=e||Ed}static passThroughHooks=new Set(["preprocess","postprocess","processAllTokens"]);preprocess(e){return e}postprocess(e){return e}processAllTokens(e){return e}},c9=class{static{o(this,"Marked")}defaults=u9();options=this.setOptions;parse=this.#e(ku.lex,Eu.parse);parseInline=this.#e(ku.lexInline,Eu.parseInline);Parser=Eu;Renderer=im;TextRenderer=hv;Lexer=ku;Tokenizer=nm;Hooks=rm;constructor(...e){this.use(...e)}walkTokens(e,r){let n=[];for(let i of e)switch(n=n.concat(r.call(this,i)),i.type){case"table":{let a=i;for(let s of a.header)n=n.concat(this.walkTokens(s.tokens,r));for(let s of a.rows)for(let l of s)n=n.concat(this.walkTokens(l.tokens,r));break}case"list":{let a=i;n=n.concat(this.walkTokens(a.items,r));break}default:{let a=i;this.defaults.extensions?.childTokens?.[a.type]?this.defaults.extensions.childTokens[a.type].forEach(s=>{let l=a[s].flat(1/0);n=n.concat(this.walkTokens(l,r))}):a.tokens&&(n=n.concat(this.walkTokens(a.tokens,r)))}}return n}use(...e){let r=this.defaults.extensions||{renderers:{},childTokens:{}};return e.forEach(n=>{let i={...n};if(i.async=this.defaults.async||i.async||!1,n.extensions&&(n.extensions.forEach(a=>{if(!a.name)throw new Error("extension name required");if("renderer"in a){let s=r.renderers[a.name];s?r.renderers[a.name]=function(...l){let u=a.renderer.apply(this,l);return u===!1&&(u=s.apply(this,l)),u}:r.renderers[a.name]=a.renderer}if("tokenizer"in a){if(!a.level||a.level!=="block"&&a.level!=="inline")throw new Error("extension level must be 'block' or 'inline'");let s=r[a.level];s?s.unshift(a.tokenizer):r[a.level]=[a.tokenizer],a.start&&(a.level==="block"?r.startBlock?r.startBlock.push(a.start):r.startBlock=[a.start]:a.level==="inline"&&(r.startInline?r.startInline.push(a.start):r.startInline=[a.start]))}"childTokens"in a&&a.childTokens&&(r.childTokens[a.name]=a.childTokens)}),i.extensions=r),n.renderer){let a=this.defaults.renderer||new im(this.defaults);for(let s in n.renderer){if(!(s in a))throw new Error(`renderer '${s}' does not exist`);if(["options","parser"].includes(s))continue;let l=s,u=n.renderer[l];n.useNewRenderer||(u=this.#t(u,l,a));let h=a[l];a[l]=(...f)=>{let d=u.apply(a,f);return d===!1&&(d=h.apply(a,f)),d||""}}i.renderer=a}if(n.tokenizer){let a=this.defaults.tokenizer||new nm(this.defaults);for(let s in n.tokenizer){if(!(s in a))throw new Error(`tokenizer '${s}' does not exist`);if(["options","rules","lexer"].includes(s))continue;let l=s,u=n.tokenizer[l],h=a[l];a[l]=(...f)=>{let d=u.apply(a,f);return d===!1&&(d=h.apply(a,f)),d}}i.tokenizer=a}if(n.hooks){let a=this.defaults.hooks||new rm;for(let s in n.hooks){if(!(s in a))throw new Error(`hook '${s}' does not exist`);if(s==="options")continue;let l=s,u=n.hooks[l],h=a[l];rm.passThroughHooks.has(s)?a[l]=f=>{if(this.defaults.async)return Promise.resolve(u.call(a,f)).then(p=>h.call(a,p));let d=u.call(a,f);return h.call(a,d)}:a[l]=(...f)=>{let d=u.apply(a,f);return d===!1&&(d=h.apply(a,f)),d}}i.hooks=a}if(n.walkTokens){let a=this.defaults.walkTokens,s=n.walkTokens;i.walkTokens=function(l){let u=[];return u.push(s.call(this,l)),a&&(u=u.concat(a.call(this,l))),u}}this.defaults={...this.defaults,...i}}),this}#t(e,r,n){switch(r){case"heading":return function(i){return!i.type||i.type!==r?e.apply(this,arguments):e.call(this,n.parser.parseInline(i.tokens),i.depth,d7e(n.parser.parseInline(i.tokens,n.parser.textRenderer)))};case"code":return function(i){return!i.type||i.type!==r?e.apply(this,arguments):e.call(this,i.text,i.lang,!!i.escaped)};case"table":return function(i){if(!i.type||i.type!==r)return e.apply(this,arguments);let a="",s="";for(let u=0;u<i.header.length;u++)s+=this.tablecell({text:i.header[u].text,tokens:i.header[u].tokens,header:!0,align:i.align[u]});a+=this.tablerow({text:s});let l="";for(let u=0;u<i.rows.length;u++){let h=i.rows[u];s="";for(let f=0;f<h.length;f++)s+=this.tablecell({text:h[f].text,tokens:h[f].tokens,header:!1,align:i.align[f]});l+=this.tablerow({text:s})}return e.call(this,a,l)};case"blockquote":return function(i){if(!i.type||i.type!==r)return e.apply(this,arguments);let a=this.parser.parse(i.tokens);return e.call(this,a)};case"list":return function(i){if(!i.type||i.type!==r)return e.apply(this,arguments);let a=i.ordered,s=i.start,l=i.loose,u="";for(let h=0;h<i.items.length;h++){let f=i.items[h],d=f.checked,p=f.task,m="";if(f.task){let g=this.checkbox({checked:!!d});l?f.tokens.length>0&&f.tokens[0].type==="paragraph"?(f.tokens[0].text=g+" "+f.tokens[0].text,f.tokens[0].tokens&&f.tokens[0].tokens.length>0&&f.tokens[0].tokens[0].type==="text"&&(f.tokens[0].tokens[0].text=g+" "+f.tokens[0].tokens[0].text)):f.tokens.unshift({type:"text",text:g+" "}):m+=g+" "}m+=this.parser.parse(f.tokens,l),u+=this.listitem({type:"list_item",raw:m,text:m,task:p,checked:!!d,loose:l,tokens:f.tokens})}return e.call(this,u,a,s)};case"html":return function(i){return!i.type||i.type!==r?e.apply(this,arguments):e.call(this,i.text,i.block)};case"paragraph":return function(i){return!i.type||i.type!==r?e.apply(this,arguments):e.call(this,this.parser.parseInline(i.tokens))};case"escape":return function(i){return!i.type||i.type!==r?e.apply(this,arguments):e.call(this,i.text)};case"link":return function(i){return!i.type||i.type!==r?e.apply(this,arguments):e.call(this,i.href,i.title,this.parser.parseInline(i.tokens))};case"image":return function(i){return!i.type||i.type!==r?e.apply(this,arguments):e.call(this,i.href,i.title,i.text)};case"strong":return function(i){return!i.type||i.type!==r?e.apply(this,arguments):e.call(this,this.parser.parseInline(i.tokens))};case"em":return function(i){return!i.type||i.type!==r?e.apply(this,arguments):e.call(this,this.parser.parseInline(i.tokens))};case"codespan":return function(i){return!i.type||i.type!==r?e.apply(this,arguments):e.call(this,i.text)};case"del":return function(i){return!i.type||i.type!==r?e.apply(this,arguments):e.call(this,this.parser.parseInline(i.tokens))};case"text":return function(i){return!i.type||i.type!==r?e.apply(this,arguments):e.call(this,i.text)}}return e}setOptions(e){return this.defaults={...this.defaults,...e},this}lexer(e,r){return ku.lex(e,r??this.defaults)}parser(e,r){return Eu.parse(e,r??this.defaults)}#e(e,r){return(n,i)=>{let a={...i},s={...this.defaults,...a};this.defaults.async===!0&&a.async===!1&&(s.silent||console.warn("marked(): The async option was set to true by an extension. The async: false option sent to parse will be ignored."),s.async=!0);let l=this.#r(!!s.silent,!!s.async);if(typeof n>"u"||n===null)return l(new Error("marked(): input parameter is undefined or null"));if(typeof n!="string")return l(new Error("marked(): input parameter is of type "+Object.prototype.toString.call(n)+", string expected"));if(s.hooks&&(s.hooks.options=s),s.async)return Promise.resolve(s.hooks?s.hooks.preprocess(n):n).then(u=>e(u,s)).then(u=>s.hooks?s.hooks.processAllTokens(u):u).then(u=>s.walkTokens?Promise.all(this.walkTokens(u,s.walkTokens)).then(()=>u):u).then(u=>r(u,s)).then(u=>s.hooks?s.hooks.postprocess(u):u).catch(l);try{s.hooks&&(n=s.hooks.preprocess(n));let u=e(n,s);s.hooks&&(u=s.hooks.processAllTokens(u)),s.walkTokens&&this.walkTokens(u,s.walkTokens);let h=r(u,s);return s.hooks&&(h=s.hooks.postprocess(h)),h}catch(u){return l(u)}}}#r(e,r){return n=>{if(n.message+=` +Please report this to https://github.com/markedjs/marked.`,e){let i="<p>An error occurred:</p><pre>"+eo(n.message+"",!0)+"</pre>";return r?Promise.resolve(i):i}if(r)return Promise.reject(n);throw n}}},kd=new c9;o(en,"marked");en.options=en.setOptions=function(t){return kd.setOptions(t),en.defaults=kd.defaults,ZX(en.defaults),en};en.getDefaults=u9;en.defaults=Ed;en.use=function(...t){return kd.use(...t),en.defaults=kd.defaults,ZX(en.defaults),en};en.walkTokens=function(t,e){return kd.walkTokens(t,e)};en.parseInline=kd.parseInline;en.Parser=Eu;en.parser=Eu.parse;en.Renderer=im;en.TextRenderer=hv;en.Lexer=ku;en.lexer=ku.lex;en.Tokenizer=nm;en.Hooks=rm;en.parse=en;u6t=en.options,h6t=en.setOptions,f6t=en.use,d6t=en.walkTokens,p6t=en.parseInline,m6t=Eu.parse,g6t=ku.lex});function U7e(t,{markdownAutoWrap:e}){let n=t.replace(/<br\/>/g,` +`).replace(/\n{2,}/g,` +`),i=Ib(n);return e===!1?i.replace(/ /g," "):i}function cj(t,e={}){let r=U7e(t,e),n=en.lexer(r),i=[[]],a=0;function s(l,u="normal"){l.type==="text"?l.text.split(` +`).forEach((f,d)=>{d!==0&&(a++,i.push([])),f.split(" ").forEach(p=>{p=p.replace(/'/g,"'"),p&&i[a].push({content:p,type:u})})}):l.type==="strong"||l.type==="em"?l.tokens.forEach(h=>{s(h,l.type)}):l.type==="html"&&i[a].push({content:l.text,type:"normal"})}return o(s,"processNode"),n.forEach(l=>{l.type==="paragraph"?l.tokens?.forEach(u=>{s(u)}):l.type==="html"&&i[a].push({content:l.text,type:"normal"})}),i}function uj(t,{markdownAutoWrap:e}={}){let r=en.lexer(t);function n(i){return i.type==="text"?e===!1?i.text.replace(/\n */g,"<br/>").replace(/ /g," "):i.text.replace(/\n */g,"<br/>"):i.type==="strong"?`<strong>${i.tokens?.map(n).join("")}</strong>`:i.type==="em"?`<em>${i.tokens?.map(n).join("")}</em>`:i.type==="paragraph"?`<p>${i.tokens?.map(n).join("")}</p>`:i.type==="space"?"":i.type==="html"?`${i.text}`:i.type==="escape"?i.text:`Unsupported markdown: ${i.type}`}return o(n,"output"),r.map(n).join("")}var hj=M(()=>{"use strict";lj();MS();o(U7e,"preprocessMarkdown");o(cj,"markdownToLines");o(uj,"markdownToHTML")});function H7e(t){return Intl.Segmenter?[...new Intl.Segmenter().segment(t)].map(e=>e.segment):[...t]}function W7e(t,e){let r=H7e(e.content);return fj(t,[],r,e.type)}function fj(t,e,r,n){if(r.length===0)return[{content:e.join(""),type:n},{content:"",type:n}];let[i,...a]=r,s=[...e,i];return t([{content:s.join(""),type:n}])?fj(t,s,a,n):(e.length===0&&i&&(e.push(i),r.shift()),[{content:e.join(""),type:n},{content:r.join(""),type:n}])}function dj(t,e){if(t.some(({content:r})=>r.includes(` +`)))throw new Error("splitLineToFitWidth does not support newlines in the line");return g9(t,e)}function g9(t,e,r=[],n=[]){if(t.length===0)return n.length>0&&r.push(n),r.length>0?r:[];let i="";t[0].content===" "&&(i=" ",t.shift());let a=t.shift()??{content:" ",type:"normal"},s=[...n];if(i!==""&&s.push({content:i,type:"normal"}),s.push(a),e(s))return g9(t,e,r,s);if(n.length>0)r.push(n),t.unshift(a);else if(a.content){let[l,u]=W7e(e,a);r.push([l]),u.content&&t.unshift(u)}return g9(t,e,r)}var pj=M(()=>{"use strict";o(H7e,"splitTextToChars");o(W7e,"splitWordToFitWidth");o(fj,"splitWordToFitWidthRecursion");o(dj,"splitLineToFitWidth");o(g9,"splitLineToFitWidthRecursion")});function mj(t,e){e&&t.attr("style",e)}async function Y7e(t,e,r,n,i=!1){let a=t.append("foreignObject");a.attr("width",`${10*r}px`),a.attr("height",`${10*r}px`);let s=a.append("xhtml:div"),l=e.label;e.label&&pi(e.label)&&(l=await hh(e.label.replace(je.lineBreakRegex,` +`),de()));let u=e.isNode?"nodeLabel":"edgeLabel",h=s.append("span");h.html(l),mj(h,e.labelStyle),h.attr("class",`${u} ${n}`),mj(s,e.labelStyle),s.style("display","table-cell"),s.style("white-space","nowrap"),s.style("line-height","1.5"),s.style("max-width",r+"px"),s.style("text-align","center"),s.attr("xmlns","http://www.w3.org/1999/xhtml"),i&&s.attr("class","labelBkg");let f=s.node().getBoundingClientRect();return f.width===r&&(s.style("display","table"),s.style("white-space","break-spaces"),s.style("width",r+"px"),f=s.node().getBoundingClientRect()),a.node()}function y9(t,e,r){return t.append("tspan").attr("class","text-outer-tspan").attr("x",0).attr("y",e*r-.1+"em").attr("dy",r+"em")}function q7e(t,e,r){let n=t.append("text"),i=y9(n,1,e);v9(i,r);let a=i.node().getComputedTextLength();return n.remove(),a}function gj(t,e,r){let n=t.append("text"),i=y9(n,1,e);v9(i,[{content:r,type:"normal"}]);let a=i.node()?.getBoundingClientRect();return a&&n.remove(),a}function X7e(t,e,r,n=!1){let a=e.append("g"),s=a.insert("rect").attr("class","background").attr("style","stroke: none"),l=a.append("text").attr("y","-10.1"),u=0;for(let h of r){let f=o(p=>q7e(a,1.1,p)<=t,"checkWidth"),d=f(h)?[h]:dj(h,f);for(let p of d){let m=y9(l,u,1.1);v9(m,p),u++}}if(n){let h=l.node().getBBox(),f=2;return s.attr("x",h.x-f).attr("y",h.y-f).attr("width",h.width+2*f).attr("height",h.height+2*f),a.node()}else return l.node()}function v9(t,e){t.text(""),e.forEach((r,n)=>{let i=t.append("tspan").attr("font-style",r.type==="em"?"italic":"normal").attr("class","text-inner-tspan").attr("font-weight",r.type==="strong"?"bold":"normal");n===0?i.text(r.content):i.text(" "+r.content)})}function x9(t){return t.replace(/fa[bklrs]?:fa-[\w-]+/g,e=>`<i class='${e.replace(":"," ")}'></i>`)}var Si,Dl=M(()=>{"use strict";Vt();fr();mr();ht();hj();hr();pj();o(mj,"applyStyle");o(Y7e,"addHtmlSpan");o(y9,"createTspan");o(q7e,"computeWidthOfText");o(gj,"computeDimensionOfText");o(X7e,"createFormattedText");o(v9,"updateTextContentAndStyles");o(x9,"replaceIconSubstring");Si=o(async(t,e="",{style:r="",isTitle:n=!1,classes:i="",useHtmlLabels:a=!0,isNode:s=!0,width:l=200,addSvgBackground:u=!1}={},h)=>{if(Y.debug("XYZ createText",e,r,n,i,a,s,"addSvgBackground: ",u),a){let f=uj(e,h),d=x9(Ca(f)),p=e.replace(/\\\\/g,"\\"),m={isNode:s,label:pi(e)?p:d,labelStyle:r.replace("fill:","color:")};return await Y7e(t,m,l,i,u)}else{let f=e.replace(/<br\s*\/?>/g,"<br/>"),d=cj(f.replace("<br>","<br/>"),h),p=X7e(l,t,d,e?u:!1);if(s){/stroke:/.exec(r)&&(r=r.replace("stroke:","lineColor:"));let m=r.replace(/stroke:[^;]+;?/g,"").replace(/stroke-width:[^;]+;?/g,"").replace(/fill:[^;]+;?/g,"").replace(/color:/g,"fill:");ze(p).attr("style",m)}else{let m=r.replace(/stroke:[^;]+;?/g,"").replace(/stroke-width:[^;]+;?/g,"").replace(/fill:[^;]+;?/g,"").replace(/background:/g,"fill:");ze(p).select("rect").attr("style",m.replace(/background:/g,"fill:"));let g=r.replace(/stroke:[^;]+;?/g,"").replace(/stroke-width:[^;]+;?/g,"").replace(/fill:[^;]+;?/g,"").replace(/color:/g,"fill:");ze(p).select("text").attr("style",g)}return p}},"createText")});function Wt(t){let e=t.map((r,n)=>`${n===0?"M":"L"}${r.x},${r.y}`);return e.push("Z"),e.join(" ")}function zo(t,e,r,n,i,a){let s=[],u=r-t,h=n-e,f=u/a,d=2*Math.PI/f,p=e+h/2;for(let m=0;m<=50;m++){let g=m/50,y=t+g*u,v=p+i*Math.sin(d*(y-t));s.push({x:y,y:v})}return s}function k5(t,e,r,n,i,a){let s=[],l=i*Math.PI/180,f=(a*Math.PI/180-l)/(n-1);for(let d=0;d<n;d++){let p=l+d*f,m=t+r*Math.cos(p),g=e+r*Math.sin(p);s.push({x:-m,y:-g})}return s}var ot,T5,Qe,lt,Ft=M(()=>{"use strict";Dl();Vt();mr();hs();fr();hr();ot=o(async(t,e,r)=>{let n,i=e.useHtmlLabels||xr(de()?.htmlLabels);r?n=r:n="node default";let a=t.insert("g").attr("class",n).attr("id",e.domId||e.id),s=a.insert("g").attr("class","label").attr("style",Fn(e.labelStyle)),l;e.label===void 0?l="":l=typeof e.label=="string"?e.label:e.label[0];let u=await Si(s,Tr(Ca(l),de()),{useHtmlLabels:i,width:e.width||de().flowchart?.wrappingWidth,cssClasses:"markdown-node-label",style:e.labelStyle,addSvgBackground:!!e.icon||!!e.img}),h=u.getBBox(),f=(e?.padding??0)/2;if(i){let d=u.children[0],p=ze(u),m=d.getElementsByTagName("img");if(m){let g=l.replace(/<img[^>]*>/g,"").trim()==="";await Promise.all([...m].map(y=>new Promise(v=>{function x(){if(y.style.display="flex",y.style.flexDirection="column",g){let b=de().fontSize?de().fontSize:window.getComputedStyle(document.body).fontSize,w=5,[_=ur.fontSize]=Fo(b),T=_*w+"px";y.style.minWidth=T,y.style.maxWidth=T}else y.style.width="100%";v(y)}o(x,"setupImage"),setTimeout(()=>{y.complete&&x()}),y.addEventListener("error",x),y.addEventListener("load",x)})))}h=d.getBoundingClientRect(),p.attr("width",h.width),p.attr("height",h.height)}return i?s.attr("transform","translate("+-h.width/2+", "+-h.height/2+")"):s.attr("transform","translate(0, "+-h.height/2+")"),e.centerLabel&&s.attr("transform","translate("+-h.width/2+", "+-h.height/2+")"),s.insert("rect",":first-child"),{shapeSvg:a,bbox:h,halfPadding:f,label:s}},"labelHelper"),T5=o(async(t,e,r)=>{let n=r.useHtmlLabels||xr(de()?.flowchart?.htmlLabels),i=t.insert("g").attr("class","label").attr("style",r.labelStyle||""),a=await Si(i,Tr(Ca(e),de()),{useHtmlLabels:n,width:r.width||de()?.flowchart?.wrappingWidth,style:r.labelStyle,addSvgBackground:!!r.icon||!!r.img}),s=a.getBBox(),l=r.padding/2;if(xr(de()?.flowchart?.htmlLabels)){let u=a.children[0],h=ze(a);s=u.getBoundingClientRect(),h.attr("width",s.width),h.attr("height",s.height)}return n?i.attr("transform","translate("+-s.width/2+", "+-s.height/2+")"):i.attr("transform","translate(0, "+-s.height/2+")"),r.centerLabel&&i.attr("transform","translate("+-s.width/2+", "+-s.height/2+")"),i.insert("rect",":first-child"),{shapeSvg:t,bbox:s,halfPadding:l,label:i}},"insertLabel"),Qe=o((t,e)=>{let r=e.node().getBBox();t.width=r.width,t.height=r.height},"updateNodeBounds"),lt=o((t,e)=>(t.look==="handDrawn"?"rough-node":"node")+" "+t.cssClasses+" "+(e||""),"getNodeClasses");o(Wt,"createPathFromPoints");o(zo,"generateFullSineWavePoints");o(k5,"generateCirclePoints")});function j7e(t,e){return t.intersect(e)}var yj,vj=M(()=>{"use strict";o(j7e,"intersectNode");yj=j7e});function K7e(t,e,r,n){var i=t.x,a=t.y,s=i-n.x,l=a-n.y,u=Math.sqrt(e*e*l*l+r*r*s*s),h=Math.abs(e*r*s/u);n.x<i&&(h=-h);var f=Math.abs(e*r*l/u);return n.y<a&&(f=-f),{x:i+h,y:a+f}}var E5,b9=M(()=>{"use strict";o(K7e,"intersectEllipse");E5=K7e});function Q7e(t,e,r){return E5(t,e,e,r)}var xj,bj=M(()=>{"use strict";b9();o(Q7e,"intersectCircle");xj=Q7e});function Z7e(t,e,r,n){var i,a,s,l,u,h,f,d,p,m,g,y,v,x,b;if(i=e.y-t.y,s=t.x-e.x,u=e.x*t.y-t.x*e.y,p=i*r.x+s*r.y+u,m=i*n.x+s*n.y+u,!(p!==0&&m!==0&&wj(p,m))&&(a=n.y-r.y,l=r.x-n.x,h=n.x*r.y-r.x*n.y,f=a*t.x+l*t.y+h,d=a*e.x+l*e.y+h,!(f!==0&&d!==0&&wj(f,d))&&(g=i*l-a*s,g!==0)))return y=Math.abs(g/2),v=s*h-l*u,x=v<0?(v-y)/g:(v+y)/g,v=a*u-i*h,b=v<0?(v-y)/g:(v+y)/g,{x,y:b}}function wj(t,e){return t*e>0}var Tj,kj=M(()=>{"use strict";o(Z7e,"intersectLine");o(wj,"sameSign");Tj=Z7e});function J7e(t,e,r){let n=t.x,i=t.y,a=[],s=Number.POSITIVE_INFINITY,l=Number.POSITIVE_INFINITY;typeof e.forEach=="function"?e.forEach(function(f){s=Math.min(s,f.x),l=Math.min(l,f.y)}):(s=Math.min(s,e.x),l=Math.min(l,e.y));let u=n-t.width/2-s,h=i-t.height/2-l;for(let f=0;f<e.length;f++){let d=e[f],p=e[f<e.length-1?f+1:0],m=Tj(t,r,{x:u+d.x,y:h+d.y},{x:u+p.x,y:h+p.y});m&&a.push(m)}return a.length?(a.length>1&&a.sort(function(f,d){let p=f.x-r.x,m=f.y-r.y,g=Math.sqrt(p*p+m*m),y=d.x-r.x,v=d.y-r.y,x=Math.sqrt(y*y+v*v);return g<x?-1:g===x?0:1}),a[0]):t}var Ej,Sj=M(()=>{"use strict";kj();o(J7e,"intersectPolygon");Ej=J7e});var eAe,Oh,w9=M(()=>{"use strict";eAe=o((t,e)=>{var r=t.x,n=t.y,i=e.x-r,a=e.y-n,s=t.width/2,l=t.height/2,u,h;return Math.abs(a)*s>Math.abs(i)*l?(a<0&&(l=-l),u=a===0?0:l*i/a,h=l):(i<0&&(s=-s),u=s,h=i===0?0:s*a/i),{x:r+u,y:n+h}},"intersectRect"),Oh=eAe});var qe,qt=M(()=>{"use strict";vj();bj();b9();Sj();w9();qe={node:yj,circle:xj,ellipse:E5,polygon:Ej,rect:Oh}});var Cj,mc,tAe,et,Ze,Xt=M(()=>{"use strict";Vt();Cj=o(t=>{let{handDrawnSeed:e}=de();return{fill:t,hachureAngle:120,hachureGap:4,fillWeight:2,roughness:.7,stroke:t,seed:e}},"solidStateFill"),mc=o(t=>{let e=tAe([...t.cssCompiledStyles||[],...t.cssStyles||[]]);return{stylesMap:e,stylesArray:[...e]}},"compileStyles"),tAe=o(t=>{let e=new Map;return t.forEach(r=>{let[n,i]=r.split(":");e.set(n.trim(),i?.trim())}),e},"styles2Map"),et=o(t=>{let{stylesArray:e}=mc(t),r=[],n=[],i=[],a=[];return e.forEach(s=>{let l=s[0];l==="color"||l==="font-size"||l==="font-family"||l==="font-weight"||l==="font-style"||l==="text-decoration"||l==="text-align"||l==="text-transform"||l==="line-height"||l==="letter-spacing"||l==="word-spacing"||l==="text-shadow"||l==="text-overflow"||l==="white-space"||l==="word-wrap"||l==="word-break"||l==="overflow-wrap"||l==="hyphens"?r.push(s.join(":")+" !important"):(n.push(s.join(":")+" !important"),l.includes("stroke")&&i.push(s.join(":")+" !important"),l==="fill"&&a.push(s.join(":")+" !important"))}),{labelStyles:r.join(";"),nodeStyles:n.join(";"),stylesArray:e,borderStyles:i,backgroundStyles:a}},"styles2String"),Ze=o((t,e)=>{let{themeVariables:r,handDrawnSeed:n}=de(),{nodeBorder:i,mainBkg:a}=r,{stylesMap:s}=mc(t);return Object.assign({roughness:.7,fill:s.get("fill")||a,fillStyle:"hachure",fillWeight:4,hachureGap:5.2,stroke:s.get("stroke")||i,seed:n,strokeWidth:s.get("stroke-width")?.replace("px","")||1.3,fillLineDash:[0,0]},e)},"userNodeOverrides")});function T9(t,e,r){if(t&&t.length){let[n,i]=e,a=Math.PI/180*r,s=Math.cos(a),l=Math.sin(a);for(let u of t){let[h,f]=u;u[0]=(h-n)*s-(f-i)*l+n,u[1]=(h-n)*l+(f-i)*s+i}}}function rAe(t,e){return t[0]===e[0]&&t[1]===e[1]}function nAe(t,e,r,n=1){let i=r,a=Math.max(e,.1),s=t[0]&&t[0][0]&&typeof t[0][0]=="number"?[t]:t,l=[0,0];if(i)for(let h of s)T9(h,l,i);let u=function(h,f,d){let p=[];for(let b of h){let w=[...b];rAe(w[0],w[w.length-1])||w.push([w[0][0],w[0][1]]),w.length>2&&p.push(w)}let m=[];f=Math.max(f,.1);let g=[];for(let b of p)for(let w=0;w<b.length-1;w++){let _=b[w],T=b[w+1];if(_[1]!==T[1]){let E=Math.min(_[1],T[1]);g.push({ymin:E,ymax:Math.max(_[1],T[1]),x:E===_[1]?_[0]:T[0],islope:(T[0]-_[0])/(T[1]-_[1])})}}if(g.sort((b,w)=>b.ymin<w.ymin?-1:b.ymin>w.ymin?1:b.x<w.x?-1:b.x>w.x?1:b.ymax===w.ymax?0:(b.ymax-w.ymax)/Math.abs(b.ymax-w.ymax)),!g.length)return m;let y=[],v=g[0].ymin,x=0;for(;y.length||g.length;){if(g.length){let b=-1;for(let w=0;w<g.length&&!(g[w].ymin>v);w++)b=w;g.splice(0,b+1).forEach(w=>{y.push({s:v,edge:w})})}if(y=y.filter(b=>!(b.edge.ymax<=v)),y.sort((b,w)=>b.edge.x===w.edge.x?0:(b.edge.x-w.edge.x)/Math.abs(b.edge.x-w.edge.x)),(d!==1||x%f==0)&&y.length>1)for(let b=0;b<y.length;b+=2){let w=b+1;if(w>=y.length)break;let _=y[b].edge,T=y[w].edge;m.push([[Math.round(_.x),v],[Math.round(T.x),v]])}v+=d,y.forEach(b=>{b.edge.x=b.edge.x+d*b.edge.islope}),x++}return m}(s,a,n);if(i){for(let h of s)T9(h,l,-i);(function(h,f,d){let p=[];h.forEach(m=>p.push(...m)),T9(p,f,d)})(u,l,-i)}return u}function yv(t,e){var r;let n=e.hachureAngle+90,i=e.hachureGap;i<0&&(i=4*e.strokeWidth),i=Math.round(Math.max(i,.1));let a=1;return e.roughness>=1&&(((r=e.randomizer)===null||r===void 0?void 0:r.next())||Math.random())>.7&&(a=i),nAe(t,i,n,a||1)}function M5(t){let e=t[0],r=t[1];return Math.sqrt(Math.pow(e[0]-r[0],2)+Math.pow(e[1]-r[1],2))}function E9(t,e){return t.type===e}function F9(t){let e=[],r=function(s){let l=new Array;for(;s!=="";)if(s.match(/^([ \t\r\n,]+)/))s=s.substr(RegExp.$1.length);else if(s.match(/^([aAcChHlLmMqQsStTvVzZ])/))l[l.length]={type:iAe,text:RegExp.$1},s=s.substr(RegExp.$1.length);else{if(!s.match(/^(([-+]?[0-9]+(\.[0-9]*)?|[-+]?\.[0-9]+)([eE][-+]?[0-9]+)?)/))return[];l[l.length]={type:k9,text:`${parseFloat(RegExp.$1)}`},s=s.substr(RegExp.$1.length)}return l[l.length]={type:Aj,text:""},l}(t),n="BOD",i=0,a=r[i];for(;!E9(a,Aj);){let s=0,l=[];if(n==="BOD"){if(a.text!=="M"&&a.text!=="m")return F9("M0,0"+t);i++,s=S5[a.text],n=a.text}else E9(a,k9)?s=S5[n]:(i++,s=S5[a.text],n=a.text);if(!(i+s<r.length))throw new Error("Path data ended short");for(let u=i;u<i+s;u++){let h=r[u];if(!E9(h,k9))throw new Error("Param not a number: "+n+","+h.text);l[l.length]=+h.text}if(typeof S5[n]!="number")throw new Error("Bad segment: "+n);{let u={key:n,data:l};e.push(u),i+=s,a=r[i],n==="M"&&(n="L"),n==="m"&&(n="l")}}return e}function Oj(t){let e=0,r=0,n=0,i=0,a=[];for(let{key:s,data:l}of t)switch(s){case"M":a.push({key:"M",data:[...l]}),[e,r]=l,[n,i]=l;break;case"m":e+=l[0],r+=l[1],a.push({key:"M",data:[e,r]}),n=e,i=r;break;case"L":a.push({key:"L",data:[...l]}),[e,r]=l;break;case"l":e+=l[0],r+=l[1],a.push({key:"L",data:[e,r]});break;case"C":a.push({key:"C",data:[...l]}),e=l[4],r=l[5];break;case"c":{let u=l.map((h,f)=>f%2?h+r:h+e);a.push({key:"C",data:u}),e=u[4],r=u[5];break}case"Q":a.push({key:"Q",data:[...l]}),e=l[2],r=l[3];break;case"q":{let u=l.map((h,f)=>f%2?h+r:h+e);a.push({key:"Q",data:u}),e=u[2],r=u[3];break}case"A":a.push({key:"A",data:[...l]}),e=l[5],r=l[6];break;case"a":e+=l[5],r+=l[6],a.push({key:"A",data:[l[0],l[1],l[2],l[3],l[4],e,r]});break;case"H":a.push({key:"H",data:[...l]}),e=l[0];break;case"h":e+=l[0],a.push({key:"H",data:[e]});break;case"V":a.push({key:"V",data:[...l]}),r=l[0];break;case"v":r+=l[0],a.push({key:"V",data:[r]});break;case"S":a.push({key:"S",data:[...l]}),e=l[2],r=l[3];break;case"s":{let u=l.map((h,f)=>f%2?h+r:h+e);a.push({key:"S",data:u}),e=u[2],r=u[3];break}case"T":a.push({key:"T",data:[...l]}),e=l[0],r=l[1];break;case"t":e+=l[0],r+=l[1],a.push({key:"T",data:[e,r]});break;case"Z":case"z":a.push({key:"Z",data:[]}),e=n,r=i}return a}function Pj(t){let e=[],r="",n=0,i=0,a=0,s=0,l=0,u=0;for(let{key:h,data:f}of t){switch(h){case"M":e.push({key:"M",data:[...f]}),[n,i]=f,[a,s]=f;break;case"C":e.push({key:"C",data:[...f]}),n=f[4],i=f[5],l=f[2],u=f[3];break;case"L":e.push({key:"L",data:[...f]}),[n,i]=f;break;case"H":n=f[0],e.push({key:"L",data:[n,i]});break;case"V":i=f[0],e.push({key:"L",data:[n,i]});break;case"S":{let d=0,p=0;r==="C"||r==="S"?(d=n+(n-l),p=i+(i-u)):(d=n,p=i),e.push({key:"C",data:[d,p,...f]}),l=f[0],u=f[1],n=f[2],i=f[3];break}case"T":{let[d,p]=f,m=0,g=0;r==="Q"||r==="T"?(m=n+(n-l),g=i+(i-u)):(m=n,g=i);let y=n+2*(m-n)/3,v=i+2*(g-i)/3,x=d+2*(m-d)/3,b=p+2*(g-p)/3;e.push({key:"C",data:[y,v,x,b,d,p]}),l=m,u=g,n=d,i=p;break}case"Q":{let[d,p,m,g]=f,y=n+2*(d-n)/3,v=i+2*(p-i)/3,x=m+2*(d-m)/3,b=g+2*(p-g)/3;e.push({key:"C",data:[y,v,x,b,m,g]}),l=d,u=p,n=m,i=g;break}case"A":{let d=Math.abs(f[0]),p=Math.abs(f[1]),m=f[2],g=f[3],y=f[4],v=f[5],x=f[6];d===0||p===0?(e.push({key:"C",data:[n,i,v,x,v,x]}),n=v,i=x):(n!==v||i!==x)&&(Bj(n,i,v,x,d,p,m,g,y).forEach(function(b){e.push({key:"C",data:b})}),n=v,i=x);break}case"Z":e.push({key:"Z",data:[]}),n=a,i=s}r=h}return e}function pv(t,e,r){return[t*Math.cos(r)-e*Math.sin(r),t*Math.sin(r)+e*Math.cos(r)]}function Bj(t,e,r,n,i,a,s,l,u,h){let f=(d=s,Math.PI*d/180);var d;let p=[],m=0,g=0,y=0,v=0;if(h)[m,g,y,v]=h;else{[t,e]=pv(t,e,-f),[r,n]=pv(r,n,-f);let R=(t-r)/2,S=(e-n)/2,O=R*R/(i*i)+S*S/(a*a);O>1&&(O=Math.sqrt(O),i*=O,a*=O);let N=i*i,P=a*a,F=N*P-N*S*S-P*R*R,B=N*S*S+P*R*R,$=(l===u?-1:1)*Math.sqrt(Math.abs(F/B));y=$*i*S/a+(t+r)/2,v=$*-a*R/i+(e+n)/2,m=Math.asin(parseFloat(((e-v)/a).toFixed(9))),g=Math.asin(parseFloat(((n-v)/a).toFixed(9))),t<y&&(m=Math.PI-m),r<y&&(g=Math.PI-g),m<0&&(m=2*Math.PI+m),g<0&&(g=2*Math.PI+g),u&&m>g&&(m-=2*Math.PI),!u&&g>m&&(g-=2*Math.PI)}let x=g-m;if(Math.abs(x)>120*Math.PI/180){let R=g,S=r,O=n;g=u&&g>m?m+120*Math.PI/180*1:m+120*Math.PI/180*-1,p=Bj(r=y+i*Math.cos(g),n=v+a*Math.sin(g),S,O,i,a,s,0,u,[g,R,y,v])}x=g-m;let b=Math.cos(m),w=Math.sin(m),_=Math.cos(g),T=Math.sin(g),E=Math.tan(x/4),L=4/3*i*E,C=4/3*a*E,A=[t,e],I=[t+L*w,e-C*b],D=[r+L*T,n-C*_],k=[r,n];if(I[0]=2*A[0]-I[0],I[1]=2*A[1]-I[1],h)return[I,D,k].concat(p);{p=[I,D,k].concat(p);let R=[];for(let S=0;S<p.length;S+=3){let O=pv(p[S][0],p[S][1],f),N=pv(p[S+1][0],p[S+1][1],f),P=pv(p[S+2][0],p[S+2][1],f);R.push([O[0],O[1],N[0],N[1],P[0],P[1]])}return R}}function Fj(t,e,r,n,i){return{type:"path",ops:Ph(t,e,r,n,i)}}function _5(t,e,r){let n=(t||[]).length;if(n>2){let i=[];for(let a=0;a<n-1;a++)i.push(...Ph(t[a][0],t[a][1],t[a+1][0],t[a+1][1],r));return e&&i.push(...Ph(t[n-1][0],t[n-1][1],t[0][0],t[0][1],r)),{type:"path",ops:i}}return n===2?Fj(t[0][0],t[0][1],t[1][0],t[1][1],r):{type:"path",ops:[]}}function sAe(t,e,r,n,i){return function(a,s){return _5(a,!0,s)}([[t,e],[t+r,e],[t+r,e+n],[t,e+n]],i)}function _j(t,e){if(t.length){let r=typeof t[0][0]=="number"?[t]:t,n=C5(r[0],1*(1+.2*e.roughness),e),i=e.disableMultiStroke?[]:C5(r[0],1.5*(1+.22*e.roughness),Nj(e));for(let a=1;a<r.length;a++){let s=r[a];if(s.length){let l=C5(s,1*(1+.2*e.roughness),e),u=e.disableMultiStroke?[]:C5(s,1.5*(1+.22*e.roughness),Nj(e));for(let h of l)h.op!=="move"&&n.push(h);for(let h of u)h.op!=="move"&&i.push(h)}}return{type:"path",ops:n.concat(i)}}return{type:"path",ops:[]}}function zj(t,e,r){let n=Math.sqrt(2*Math.PI*Math.sqrt((Math.pow(t/2,2)+Math.pow(e/2,2))/2)),i=Math.ceil(Math.max(r.curveStepCount,r.curveStepCount/Math.sqrt(200)*n)),a=2*Math.PI/i,s=Math.abs(t/2),l=Math.abs(e/2),u=1-r.curveFitting;return s+=nr(s*u,r),l+=nr(l*u,r),{increment:a,rx:s,ry:l}}function M9(t,e,r,n){let[i,a]=Rj(n.increment,t,e,n.rx,n.ry,1,n.increment*D5(.1,D5(.4,1,r),r),r),s=N5(i,null,r);if(!r.disableMultiStroke&&r.roughness!==0){let[l]=Rj(n.increment,t,e,n.rx,n.ry,1.5,0,r),u=N5(l,null,r);s=s.concat(u)}return{estimatedPoints:a,opset:{type:"path",ops:s}}}function Lj(t,e,r,n,i,a,s,l,u){let h=t,f=e,d=Math.abs(r/2),p=Math.abs(n/2);d+=nr(.01*d,u),p+=nr(.01*p,u);let m=i,g=a;for(;m<0;)m+=2*Math.PI,g+=2*Math.PI;g-m>2*Math.PI&&(m=0,g=2*Math.PI);let y=2*Math.PI/u.curveStepCount,v=Math.min(y/2,(g-m)/2),x=Mj(v,h,f,d,p,m,g,1,u);if(!u.disableMultiStroke){let b=Mj(v,h,f,d,p,m,g,1.5,u);x.push(...b)}return s&&(l?x.push(...Ph(h,f,h+d*Math.cos(m),f+p*Math.sin(m),u),...Ph(h,f,h+d*Math.cos(g),f+p*Math.sin(g),u)):x.push({op:"lineTo",data:[h,f]},{op:"lineTo",data:[h+d*Math.cos(m),f+p*Math.sin(m)]})),{type:"path",ops:x}}function Dj(t,e){let r=Pj(Oj(F9(t))),n=[],i=[0,0],a=[0,0];for(let{key:s,data:l}of r)switch(s){case"M":a=[l[0],l[1]],i=[l[0],l[1]];break;case"L":n.push(...Ph(a[0],a[1],l[0],l[1],e)),a=[l[0],l[1]];break;case"C":{let[u,h,f,d,p,m]=l;n.push(...oAe(u,h,f,d,p,m,a,e)),a=[p,m];break}case"Z":n.push(...Ph(a[0],a[1],i[0],i[1],e)),a=[i[0],i[1]]}return{type:"path",ops:n}}function S9(t,e){let r=[];for(let n of t)if(n.length){let i=e.maxRandomnessOffset||0,a=n.length;if(a>2){r.push({op:"move",data:[n[0][0]+nr(i,e),n[0][1]+nr(i,e)]});for(let s=1;s<a;s++)r.push({op:"lineTo",data:[n[s][0]+nr(i,e),n[s][1]+nr(i,e)]})}}return{type:"fillPath",ops:r}}function am(t,e){return function(r,n){let i=r.fillStyle||"hachure";if(!ks[i])switch(i){case"zigzag":ks[i]||(ks[i]=new A9(n));break;case"cross-hatch":ks[i]||(ks[i]=new _9(n));break;case"dots":ks[i]||(ks[i]=new L9(n));break;case"dashed":ks[i]||(ks[i]=new D9(n));break;case"zigzag-line":ks[i]||(ks[i]=new N9(n));break;default:i="hachure",ks[i]||(ks[i]=new gv(n))}return ks[i]}(e,aAe).fillPolygons(t,e)}function Nj(t){let e=Object.assign({},t);return e.randomizer=void 0,t.seed&&(e.seed=t.seed+1),e}function Gj(t){return t.randomizer||(t.randomizer=new R9(t.seed||0)),t.randomizer.next()}function D5(t,e,r,n=1){return r.roughness*n*(Gj(r)*(e-t)+t)}function nr(t,e,r=1){return D5(-t,t,e,r)}function Ph(t,e,r,n,i,a=!1){let s=a?i.disableMultiStrokeFill:i.disableMultiStroke,l=I9(t,e,r,n,i,!0,!1);if(s)return l;let u=I9(t,e,r,n,i,!0,!0);return l.concat(u)}function I9(t,e,r,n,i,a,s){let l=Math.pow(t-r,2)+Math.pow(e-n,2),u=Math.sqrt(l),h=1;h=u<200?1:u>500?.4:-.0016668*u+1.233334;let f=i.maxRandomnessOffset||0;f*f*100>l&&(f=u/10);let d=f/2,p=.2+.2*Gj(i),m=i.bowing*i.maxRandomnessOffset*(n-e)/200,g=i.bowing*i.maxRandomnessOffset*(t-r)/200;m=nr(m,i,h),g=nr(g,i,h);let y=[],v=o(()=>nr(d,i,h),"M"),x=o(()=>nr(f,i,h),"k"),b=i.preserveVertices;return a&&(s?y.push({op:"move",data:[t+(b?0:v()),e+(b?0:v())]}):y.push({op:"move",data:[t+(b?0:nr(f,i,h)),e+(b?0:nr(f,i,h))]})),s?y.push({op:"bcurveTo",data:[m+t+(r-t)*p+v(),g+e+(n-e)*p+v(),m+t+2*(r-t)*p+v(),g+e+2*(n-e)*p+v(),r+(b?0:v()),n+(b?0:v())]}):y.push({op:"bcurveTo",data:[m+t+(r-t)*p+x(),g+e+(n-e)*p+x(),m+t+2*(r-t)*p+x(),g+e+2*(n-e)*p+x(),r+(b?0:x()),n+(b?0:x())]}),y}function C5(t,e,r){if(!t.length)return[];let n=[];n.push([t[0][0]+nr(e,r),t[0][1]+nr(e,r)]),n.push([t[0][0]+nr(e,r),t[0][1]+nr(e,r)]);for(let i=1;i<t.length;i++)n.push([t[i][0]+nr(e,r),t[i][1]+nr(e,r)]),i===t.length-1&&n.push([t[i][0]+nr(e,r),t[i][1]+nr(e,r)]);return N5(n,null,r)}function N5(t,e,r){let n=t.length,i=[];if(n>3){let a=[],s=1-r.curveTightness;i.push({op:"move",data:[t[1][0],t[1][1]]});for(let l=1;l+2<n;l++){let u=t[l];a[0]=[u[0],u[1]],a[1]=[u[0]+(s*t[l+1][0]-s*t[l-1][0])/6,u[1]+(s*t[l+1][1]-s*t[l-1][1])/6],a[2]=[t[l+1][0]+(s*t[l][0]-s*t[l+2][0])/6,t[l+1][1]+(s*t[l][1]-s*t[l+2][1])/6],a[3]=[t[l+1][0],t[l+1][1]],i.push({op:"bcurveTo",data:[a[1][0],a[1][1],a[2][0],a[2][1],a[3][0],a[3][1]]})}if(e&&e.length===2){let l=r.maxRandomnessOffset;i.push({op:"lineTo",data:[e[0]+nr(l,r),e[1]+nr(l,r)]})}}else n===3?(i.push({op:"move",data:[t[1][0],t[1][1]]}),i.push({op:"bcurveTo",data:[t[1][0],t[1][1],t[2][0],t[2][1],t[2][0],t[2][1]]})):n===2&&i.push(...I9(t[0][0],t[0][1],t[1][0],t[1][1],r,!0,!0));return i}function Rj(t,e,r,n,i,a,s,l){let u=[],h=[];if(l.roughness===0){t/=4,h.push([e+n*Math.cos(-t),r+i*Math.sin(-t)]);for(let f=0;f<=2*Math.PI;f+=t){let d=[e+n*Math.cos(f),r+i*Math.sin(f)];u.push(d),h.push(d)}h.push([e+n*Math.cos(0),r+i*Math.sin(0)]),h.push([e+n*Math.cos(t),r+i*Math.sin(t)])}else{let f=nr(.5,l)-Math.PI/2;h.push([nr(a,l)+e+.9*n*Math.cos(f-t),nr(a,l)+r+.9*i*Math.sin(f-t)]);let d=2*Math.PI+f-.01;for(let p=f;p<d;p+=t){let m=[nr(a,l)+e+n*Math.cos(p),nr(a,l)+r+i*Math.sin(p)];u.push(m),h.push(m)}h.push([nr(a,l)+e+n*Math.cos(f+2*Math.PI+.5*s),nr(a,l)+r+i*Math.sin(f+2*Math.PI+.5*s)]),h.push([nr(a,l)+e+.98*n*Math.cos(f+s),nr(a,l)+r+.98*i*Math.sin(f+s)]),h.push([nr(a,l)+e+.9*n*Math.cos(f+.5*s),nr(a,l)+r+.9*i*Math.sin(f+.5*s)])}return[h,u]}function Mj(t,e,r,n,i,a,s,l,u){let h=a+nr(.1,u),f=[];f.push([nr(l,u)+e+.9*n*Math.cos(h-t),nr(l,u)+r+.9*i*Math.sin(h-t)]);for(let d=h;d<=s;d+=t)f.push([nr(l,u)+e+n*Math.cos(d),nr(l,u)+r+i*Math.sin(d)]);return f.push([e+n*Math.cos(s),r+i*Math.sin(s)]),f.push([e+n*Math.cos(s),r+i*Math.sin(s)]),N5(f,null,u)}function oAe(t,e,r,n,i,a,s,l){let u=[],h=[l.maxRandomnessOffset||1,(l.maxRandomnessOffset||1)+.3],f=[0,0],d=l.disableMultiStroke?1:2,p=l.preserveVertices;for(let m=0;m<d;m++)m===0?u.push({op:"move",data:[s[0],s[1]]}):u.push({op:"move",data:[s[0]+(p?0:nr(h[0],l)),s[1]+(p?0:nr(h[0],l))]}),f=p?[i,a]:[i+nr(h[m],l),a+nr(h[m],l)],u.push({op:"bcurveTo",data:[t+nr(h[m],l),e+nr(h[m],l),r+nr(h[m],l),n+nr(h[m],l),f[0],f[1]]});return u}function mv(t){return[...t]}function Ij(t,e=0){let r=t.length;if(r<3)throw new Error("A curve must have at least three points.");let n=[];if(r===3)n.push(mv(t[0]),mv(t[1]),mv(t[2]),mv(t[2]));else{let i=[];i.push(t[0],t[0]);for(let l=1;l<t.length;l++)i.push(t[l]),l===t.length-1&&i.push(t[l]);let a=[],s=1-e;n.push(mv(i[0]));for(let l=1;l+2<i.length;l++){let u=i[l];a[0]=[u[0],u[1]],a[1]=[u[0]+(s*i[l+1][0]-s*i[l-1][0])/6,u[1]+(s*i[l+1][1]-s*i[l-1][1])/6],a[2]=[i[l+1][0]+(s*i[l][0]-s*i[l+2][0])/6,i[l+1][1]+(s*i[l][1]-s*i[l+2][1])/6],a[3]=[i[l+1][0],i[l+1][1]],n.push(a[1],a[2],a[3])}}return n}function L5(t,e){return Math.pow(t[0]-e[0],2)+Math.pow(t[1]-e[1],2)}function lAe(t,e,r){let n=L5(e,r);if(n===0)return L5(t,e);let i=((t[0]-e[0])*(r[0]-e[0])+(t[1]-e[1])*(r[1]-e[1]))/n;return i=Math.max(0,Math.min(1,i)),L5(t,Sd(e,r,i))}function Sd(t,e,r){return[t[0]+(e[0]-t[0])*r,t[1]+(e[1]-t[1])*r]}function O9(t,e,r,n){let i=n||[];if(function(l,u){let h=l[u+0],f=l[u+1],d=l[u+2],p=l[u+3],m=3*f[0]-2*h[0]-p[0];m*=m;let g=3*f[1]-2*h[1]-p[1];g*=g;let y=3*d[0]-2*p[0]-h[0];y*=y;let v=3*d[1]-2*p[1]-h[1];return v*=v,m<y&&(m=y),g<v&&(g=v),m+g}(t,e)<r){let l=t[e+0];i.length?(a=i[i.length-1],s=l,Math.sqrt(L5(a,s))>1&&i.push(l)):i.push(l),i.push(t[e+3])}else{let u=t[e+0],h=t[e+1],f=t[e+2],d=t[e+3],p=Sd(u,h,.5),m=Sd(h,f,.5),g=Sd(f,d,.5),y=Sd(p,m,.5),v=Sd(m,g,.5),x=Sd(y,v,.5);O9([u,p,y,x],0,r,i),O9([x,v,g,d],0,r,i)}var a,s;return i}function cAe(t,e){return R5(t,0,t.length,e)}function R5(t,e,r,n,i){let a=i||[],s=t[e],l=t[r-1],u=0,h=1;for(let f=e+1;f<r-1;++f){let d=lAe(t[f],s,l);d>u&&(u=d,h=f)}return Math.sqrt(u)>n?(R5(t,e,h+1,n,a),R5(t,h,r,n,a)):(a.length||a.push(s),a.push(l)),a}function C9(t,e=.15,r){let n=[],i=(t.length-1)/3;for(let a=0;a<i;a++)O9(t,3*a,e,n);return r&&r>0?R5(n,0,n.length,r):n}var gv,A9,_9,L9,D9,N9,ks,R9,iAe,k9,Aj,S5,aAe,to,sm,P9,A5,B9,Ke,jt=M(()=>{"use strict";o(T9,"t");o(rAe,"e");o(nAe,"s");o(yv,"n");gv=class{static{o(this,"o")}constructor(e){this.helper=e}fillPolygons(e,r){return this._fillPolygons(e,r)}_fillPolygons(e,r){let n=yv(e,r);return{type:"fillSketch",ops:this.renderLines(n,r)}}renderLines(e,r){let n=[];for(let i of e)n.push(...this.helper.doubleLineOps(i[0][0],i[0][1],i[1][0],i[1][1],r));return n}};o(M5,"a");A9=class extends gv{static{o(this,"h")}fillPolygons(e,r){let n=r.hachureGap;n<0&&(n=4*r.strokeWidth),n=Math.max(n,.1);let i=yv(e,Object.assign({},r,{hachureGap:n})),a=Math.PI/180*r.hachureAngle,s=[],l=.5*n*Math.cos(a),u=.5*n*Math.sin(a);for(let[h,f]of i)M5([h,f])&&s.push([[h[0]-l,h[1]+u],[...f]],[[h[0]+l,h[1]-u],[...f]]);return{type:"fillSketch",ops:this.renderLines(s,r)}}},_9=class extends gv{static{o(this,"r")}fillPolygons(e,r){let n=this._fillPolygons(e,r),i=Object.assign({},r,{hachureAngle:r.hachureAngle+90}),a=this._fillPolygons(e,i);return n.ops=n.ops.concat(a.ops),n}},L9=class{static{o(this,"i")}constructor(e){this.helper=e}fillPolygons(e,r){let n=yv(e,r=Object.assign({},r,{hachureAngle:0}));return this.dotsOnLines(n,r)}dotsOnLines(e,r){let n=[],i=r.hachureGap;i<0&&(i=4*r.strokeWidth),i=Math.max(i,.1);let a=r.fillWeight;a<0&&(a=r.strokeWidth/2);let s=i/4;for(let l of e){let u=M5(l),h=u/i,f=Math.ceil(h)-1,d=u-f*i,p=(l[0][0]+l[1][0])/2-i/4,m=Math.min(l[0][1],l[1][1]);for(let g=0;g<f;g++){let y=m+d+g*i,v=p-s+2*Math.random()*s,x=y-s+2*Math.random()*s,b=this.helper.ellipse(v,x,a,a,r);n.push(...b.ops)}}return{type:"fillSketch",ops:n}}},D9=class{static{o(this,"c")}constructor(e){this.helper=e}fillPolygons(e,r){let n=yv(e,r);return{type:"fillSketch",ops:this.dashedLine(n,r)}}dashedLine(e,r){let n=r.dashOffset<0?r.hachureGap<0?4*r.strokeWidth:r.hachureGap:r.dashOffset,i=r.dashGap<0?r.hachureGap<0?4*r.strokeWidth:r.hachureGap:r.dashGap,a=[];return e.forEach(s=>{let l=M5(s),u=Math.floor(l/(n+i)),h=(l+i-u*(n+i))/2,f=s[0],d=s[1];f[0]>d[0]&&(f=s[1],d=s[0]);let p=Math.atan((d[1]-f[1])/(d[0]-f[0]));for(let m=0;m<u;m++){let g=m*(n+i),y=g+n,v=[f[0]+g*Math.cos(p)+h*Math.cos(p),f[1]+g*Math.sin(p)+h*Math.sin(p)],x=[f[0]+y*Math.cos(p)+h*Math.cos(p),f[1]+y*Math.sin(p)+h*Math.sin(p)];a.push(...this.helper.doubleLineOps(v[0],v[1],x[0],x[1],r))}}),a}},N9=class{static{o(this,"l")}constructor(e){this.helper=e}fillPolygons(e,r){let n=r.hachureGap<0?4*r.strokeWidth:r.hachureGap,i=r.zigzagOffset<0?n:r.zigzagOffset,a=yv(e,r=Object.assign({},r,{hachureGap:n+i}));return{type:"fillSketch",ops:this.zigzagLines(a,i,r)}}zigzagLines(e,r,n){let i=[];return e.forEach(a=>{let s=M5(a),l=Math.round(s/(2*r)),u=a[0],h=a[1];u[0]>h[0]&&(u=a[1],h=a[0]);let f=Math.atan((h[1]-u[1])/(h[0]-u[0]));for(let d=0;d<l;d++){let p=2*d*r,m=2*(d+1)*r,g=Math.sqrt(2*Math.pow(r,2)),y=[u[0]+p*Math.cos(f),u[1]+p*Math.sin(f)],v=[u[0]+m*Math.cos(f),u[1]+m*Math.sin(f)],x=[y[0]+g*Math.cos(f+Math.PI/4),y[1]+g*Math.sin(f+Math.PI/4)];i.push(...this.helper.doubleLineOps(y[0],y[1],x[0],x[1],n),...this.helper.doubleLineOps(x[0],x[1],v[0],v[1],n))}}),i}},ks={},R9=class{static{o(this,"p")}constructor(e){this.seed=e}next(){return this.seed?(2**31-1&(this.seed=Math.imul(48271,this.seed)))/2**31:Math.random()}},iAe=0,k9=1,Aj=2,S5={A:7,a:7,C:6,c:6,H:1,h:1,L:2,l:2,M:2,m:2,Q:4,q:4,S:4,s:4,T:2,t:2,V:1,v:1,Z:0,z:0};o(E9,"k");o(F9,"b");o(Oj,"y");o(Pj,"m");o(pv,"w");o(Bj,"x");aAe={randOffset:o(function(t,e){return nr(t,e)},"randOffset"),randOffsetWithRange:o(function(t,e,r){return D5(t,e,r)},"randOffsetWithRange"),ellipse:o(function(t,e,r,n,i){let a=zj(r,n,i);return M9(t,e,i,a).opset},"ellipse"),doubleLineOps:o(function(t,e,r,n,i){return Ph(t,e,r,n,i,!0)},"doubleLineOps")};o(Fj,"v");o(_5,"S");o(sAe,"O");o(_j,"L");o(zj,"T");o(M9,"D");o(Lj,"A");o(Dj,"_");o(S9,"I");o(am,"C");o(Nj,"z");o(Gj,"W");o(D5,"E");o(nr,"G");o(Ph,"$");o(I9,"R");o(C5,"j");o(N5,"q");o(Rj,"F");o(Mj,"V");o(oAe,"Z");o(mv,"Q");o(Ij,"H");o(L5,"N");o(lAe,"B");o(Sd,"J");o(O9,"K");o(cAe,"U");o(R5,"X");o(C9,"Y");to="none",sm=class{static{o(this,"et")}constructor(e){this.defaultOptions={maxRandomnessOffset:2,roughness:1,bowing:1,stroke:"#000",strokeWidth:1,curveTightness:0,curveFitting:.95,curveStepCount:9,fillStyle:"hachure",fillWeight:-1,hachureAngle:-41,hachureGap:-1,dashOffset:-1,dashGap:-1,zigzagOffset:-1,seed:0,disableMultiStroke:!1,disableMultiStrokeFill:!1,preserveVertices:!1,fillShapeRoughnessGain:.8},this.config=e||{},this.config.options&&(this.defaultOptions=this._o(this.config.options))}static newSeed(){return Math.floor(Math.random()*2**31)}_o(e){return e?Object.assign({},this.defaultOptions,e):this.defaultOptions}_d(e,r,n){return{shape:e,sets:r||[],options:n||this.defaultOptions}}line(e,r,n,i,a){let s=this._o(a);return this._d("line",[Fj(e,r,n,i,s)],s)}rectangle(e,r,n,i,a){let s=this._o(a),l=[],u=sAe(e,r,n,i,s);if(s.fill){let h=[[e,r],[e+n,r],[e+n,r+i],[e,r+i]];s.fillStyle==="solid"?l.push(S9([h],s)):l.push(am([h],s))}return s.stroke!==to&&l.push(u),this._d("rectangle",l,s)}ellipse(e,r,n,i,a){let s=this._o(a),l=[],u=zj(n,i,s),h=M9(e,r,s,u);if(s.fill)if(s.fillStyle==="solid"){let f=M9(e,r,s,u).opset;f.type="fillPath",l.push(f)}else l.push(am([h.estimatedPoints],s));return s.stroke!==to&&l.push(h.opset),this._d("ellipse",l,s)}circle(e,r,n,i){let a=this.ellipse(e,r,n,n,i);return a.shape="circle",a}linearPath(e,r){let n=this._o(r);return this._d("linearPath",[_5(e,!1,n)],n)}arc(e,r,n,i,a,s,l=!1,u){let h=this._o(u),f=[],d=Lj(e,r,n,i,a,s,l,!0,h);if(l&&h.fill)if(h.fillStyle==="solid"){let p=Object.assign({},h);p.disableMultiStroke=!0;let m=Lj(e,r,n,i,a,s,!0,!1,p);m.type="fillPath",f.push(m)}else f.push(function(p,m,g,y,v,x,b){let w=p,_=m,T=Math.abs(g/2),E=Math.abs(y/2);T+=nr(.01*T,b),E+=nr(.01*E,b);let L=v,C=x;for(;L<0;)L+=2*Math.PI,C+=2*Math.PI;C-L>2*Math.PI&&(L=0,C=2*Math.PI);let A=(C-L)/b.curveStepCount,I=[];for(let D=L;D<=C;D+=A)I.push([w+T*Math.cos(D),_+E*Math.sin(D)]);return I.push([w+T*Math.cos(C),_+E*Math.sin(C)]),I.push([w,_]),am([I],b)}(e,r,n,i,a,s,h));return h.stroke!==to&&f.push(d),this._d("arc",f,h)}curve(e,r){let n=this._o(r),i=[],a=_j(e,n);if(n.fill&&n.fill!==to)if(n.fillStyle==="solid"){let s=_j(e,Object.assign(Object.assign({},n),{disableMultiStroke:!0,roughness:n.roughness?n.roughness+n.fillShapeRoughnessGain:0}));i.push({type:"fillPath",ops:this._mergedShape(s.ops)})}else{let s=[],l=e;if(l.length){let u=typeof l[0][0]=="number"?[l]:l;for(let h of u)h.length<3?s.push(...h):h.length===3?s.push(...C9(Ij([h[0],h[0],h[1],h[2]]),10,(1+n.roughness)/2)):s.push(...C9(Ij(h),10,(1+n.roughness)/2))}s.length&&i.push(am([s],n))}return n.stroke!==to&&i.push(a),this._d("curve",i,n)}polygon(e,r){let n=this._o(r),i=[],a=_5(e,!0,n);return n.fill&&(n.fillStyle==="solid"?i.push(S9([e],n)):i.push(am([e],n))),n.stroke!==to&&i.push(a),this._d("polygon",i,n)}path(e,r){let n=this._o(r),i=[];if(!e)return this._d("path",i,n);e=(e||"").replace(/\n/g," ").replace(/(-\s)/g,"-").replace("/(ss)/g"," ");let a=n.fill&&n.fill!=="transparent"&&n.fill!==to,s=n.stroke!==to,l=!!(n.simplification&&n.simplification<1),u=function(f,d,p){let m=Pj(Oj(F9(f))),g=[],y=[],v=[0,0],x=[],b=o(()=>{x.length>=4&&y.push(...C9(x,d)),x=[]},"i"),w=o(()=>{b(),y.length&&(g.push(y),y=[])},"c");for(let{key:T,data:E}of m)switch(T){case"M":w(),v=[E[0],E[1]],y.push(v);break;case"L":b(),y.push([E[0],E[1]]);break;case"C":if(!x.length){let L=y.length?y[y.length-1]:v;x.push([L[0],L[1]])}x.push([E[0],E[1]]),x.push([E[2],E[3]]),x.push([E[4],E[5]]);break;case"Z":b(),y.push([v[0],v[1]])}if(w(),!p)return g;let _=[];for(let T of g){let E=cAe(T,p);E.length&&_.push(E)}return _}(e,1,l?4-4*(n.simplification||1):(1+n.roughness)/2),h=Dj(e,n);if(a)if(n.fillStyle==="solid")if(u.length===1){let f=Dj(e,Object.assign(Object.assign({},n),{disableMultiStroke:!0,roughness:n.roughness?n.roughness+n.fillShapeRoughnessGain:0}));i.push({type:"fillPath",ops:this._mergedShape(f.ops)})}else i.push(S9(u,n));else i.push(am(u,n));return s&&(l?u.forEach(f=>{i.push(_5(f,!1,n))}):i.push(h)),this._d("path",i,n)}opsToPath(e,r){let n="";for(let i of e.ops){let a=typeof r=="number"&&r>=0?i.data.map(s=>+s.toFixed(r)):i.data;switch(i.op){case"move":n+=`M${a[0]} ${a[1]} `;break;case"bcurveTo":n+=`C${a[0]} ${a[1]}, ${a[2]} ${a[3]}, ${a[4]} ${a[5]} `;break;case"lineTo":n+=`L${a[0]} ${a[1]} `}}return n.trim()}toPaths(e){let r=e.sets||[],n=e.options||this.defaultOptions,i=[];for(let a of r){let s=null;switch(a.type){case"path":s={d:this.opsToPath(a),stroke:n.stroke,strokeWidth:n.strokeWidth,fill:to};break;case"fillPath":s={d:this.opsToPath(a),stroke:to,strokeWidth:0,fill:n.fill||to};break;case"fillSketch":s=this.fillSketch(a,n)}s&&i.push(s)}return i}fillSketch(e,r){let n=r.fillWeight;return n<0&&(n=r.strokeWidth/2),{d:this.opsToPath(e),stroke:r.fill||to,strokeWidth:n,fill:to}}_mergedShape(e){return e.filter((r,n)=>n===0||r.op!=="move")}},P9=class{static{o(this,"st")}constructor(e,r){this.canvas=e,this.ctx=this.canvas.getContext("2d"),this.gen=new sm(r)}draw(e){let r=e.sets||[],n=e.options||this.getDefaultOptions(),i=this.ctx,a=e.options.fixedDecimalPlaceDigits;for(let s of r)switch(s.type){case"path":i.save(),i.strokeStyle=n.stroke==="none"?"transparent":n.stroke,i.lineWidth=n.strokeWidth,n.strokeLineDash&&i.setLineDash(n.strokeLineDash),n.strokeLineDashOffset&&(i.lineDashOffset=n.strokeLineDashOffset),this._drawToContext(i,s,a),i.restore();break;case"fillPath":{i.save(),i.fillStyle=n.fill||"";let l=e.shape==="curve"||e.shape==="polygon"||e.shape==="path"?"evenodd":"nonzero";this._drawToContext(i,s,a,l),i.restore();break}case"fillSketch":this.fillSketch(i,s,n)}}fillSketch(e,r,n){let i=n.fillWeight;i<0&&(i=n.strokeWidth/2),e.save(),n.fillLineDash&&e.setLineDash(n.fillLineDash),n.fillLineDashOffset&&(e.lineDashOffset=n.fillLineDashOffset),e.strokeStyle=n.fill||"",e.lineWidth=i,this._drawToContext(e,r,n.fixedDecimalPlaceDigits),e.restore()}_drawToContext(e,r,n,i="nonzero"){e.beginPath();for(let a of r.ops){let s=typeof n=="number"&&n>=0?a.data.map(l=>+l.toFixed(n)):a.data;switch(a.op){case"move":e.moveTo(s[0],s[1]);break;case"bcurveTo":e.bezierCurveTo(s[0],s[1],s[2],s[3],s[4],s[5]);break;case"lineTo":e.lineTo(s[0],s[1])}}r.type==="fillPath"?e.fill(i):e.stroke()}get generator(){return this.gen}getDefaultOptions(){return this.gen.defaultOptions}line(e,r,n,i,a){let s=this.gen.line(e,r,n,i,a);return this.draw(s),s}rectangle(e,r,n,i,a){let s=this.gen.rectangle(e,r,n,i,a);return this.draw(s),s}ellipse(e,r,n,i,a){let s=this.gen.ellipse(e,r,n,i,a);return this.draw(s),s}circle(e,r,n,i){let a=this.gen.circle(e,r,n,i);return this.draw(a),a}linearPath(e,r){let n=this.gen.linearPath(e,r);return this.draw(n),n}polygon(e,r){let n=this.gen.polygon(e,r);return this.draw(n),n}arc(e,r,n,i,a,s,l=!1,u){let h=this.gen.arc(e,r,n,i,a,s,l,u);return this.draw(h),h}curve(e,r){let n=this.gen.curve(e,r);return this.draw(n),n}path(e,r){let n=this.gen.path(e,r);return this.draw(n),n}},A5="http://www.w3.org/2000/svg",B9=class{static{o(this,"ot")}constructor(e,r){this.svg=e,this.gen=new sm(r)}draw(e){let r=e.sets||[],n=e.options||this.getDefaultOptions(),i=this.svg.ownerDocument||window.document,a=i.createElementNS(A5,"g"),s=e.options.fixedDecimalPlaceDigits;for(let l of r){let u=null;switch(l.type){case"path":u=i.createElementNS(A5,"path"),u.setAttribute("d",this.opsToPath(l,s)),u.setAttribute("stroke",n.stroke),u.setAttribute("stroke-width",n.strokeWidth+""),u.setAttribute("fill","none"),n.strokeLineDash&&u.setAttribute("stroke-dasharray",n.strokeLineDash.join(" ").trim()),n.strokeLineDashOffset&&u.setAttribute("stroke-dashoffset",`${n.strokeLineDashOffset}`);break;case"fillPath":u=i.createElementNS(A5,"path"),u.setAttribute("d",this.opsToPath(l,s)),u.setAttribute("stroke","none"),u.setAttribute("stroke-width","0"),u.setAttribute("fill",n.fill||""),e.shape!=="curve"&&e.shape!=="polygon"||u.setAttribute("fill-rule","evenodd");break;case"fillSketch":u=this.fillSketch(i,l,n)}u&&a.appendChild(u)}return a}fillSketch(e,r,n){let i=n.fillWeight;i<0&&(i=n.strokeWidth/2);let a=e.createElementNS(A5,"path");return a.setAttribute("d",this.opsToPath(r,n.fixedDecimalPlaceDigits)),a.setAttribute("stroke",n.fill||""),a.setAttribute("stroke-width",i+""),a.setAttribute("fill","none"),n.fillLineDash&&a.setAttribute("stroke-dasharray",n.fillLineDash.join(" ").trim()),n.fillLineDashOffset&&a.setAttribute("stroke-dashoffset",`${n.fillLineDashOffset}`),a}get generator(){return this.gen}getDefaultOptions(){return this.gen.defaultOptions}opsToPath(e,r){return this.gen.opsToPath(e,r)}line(e,r,n,i,a){let s=this.gen.line(e,r,n,i,a);return this.draw(s)}rectangle(e,r,n,i,a){let s=this.gen.rectangle(e,r,n,i,a);return this.draw(s)}ellipse(e,r,n,i,a){let s=this.gen.ellipse(e,r,n,i,a);return this.draw(s)}circle(e,r,n,i){let a=this.gen.circle(e,r,n,i);return this.draw(a)}linearPath(e,r){let n=this.gen.linearPath(e,r);return this.draw(n)}polygon(e,r){let n=this.gen.polygon(e,r);return this.draw(n)}arc(e,r,n,i,a,s,l=!1,u){let h=this.gen.arc(e,r,n,i,a,s,l,u);return this.draw(h)}curve(e,r){let n=this.gen.curve(e,r);return this.draw(n)}path(e,r){let n=this.gen.path(e,r);return this.draw(n)}},Ke={canvas:o((t,e)=>new P9(t,e),"canvas"),svg:o((t,e)=>new B9(t,e),"svg"),generator:o(t=>new sm(t),"generator"),newSeed:o(()=>sm.newSeed(),"newSeed")}});function $j(t,e){let{labelStyles:r}=et(e);e.labelStyle=r;let n=lt(e),i=n;n||(i="anchor");let a=t.insert("g").attr("class",i).attr("id",e.domId||e.id),s=1,{cssStyles:l}=e,u=Ke.svg(a),h=Ze(e,{fill:"black",stroke:"none",fillStyle:"solid"});e.look!=="handDrawn"&&(h.roughness=0);let f=u.circle(0,0,s*2,h),d=a.insert(()=>f,":first-child");return d.attr("class","anchor").attr("style",Fn(l)),Qe(e,d),e.intersect=function(p){return Y.info("Circle intersect",e,s,p),qe.circle(e,s,p)},a}var Vj=M(()=>{"use strict";ht();Ft();qt();Xt();jt();hr();o($j,"anchor")});function Uj(t,e,r,n,i,a,s){let u=(t+r)/2,h=(e+n)/2,f=Math.atan2(n-e,r-t),d=(r-t)/2,p=(n-e)/2,m=d/i,g=p/a,y=Math.sqrt(m**2+g**2);if(y>1)throw new Error("The given radii are too small to create an arc between the points.");let v=Math.sqrt(1-y**2),x=u+v*a*Math.sin(f)*(s?-1:1),b=h-v*i*Math.cos(f)*(s?-1:1),w=Math.atan2((e-b)/a,(t-x)/i),T=Math.atan2((n-b)/a,(r-x)/i)-w;s&&T<0&&(T+=2*Math.PI),!s&&T>0&&(T-=2*Math.PI);let E=[];for(let L=0;L<20;L++){let C=L/19,A=w+C*T,I=x+i*Math.cos(A),D=b+a*Math.sin(A);E.push({x:I,y:D})}return E}async function Hj(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a}=await ot(t,e,lt(e)),s=a.width+e.padding+20,l=a.height+e.padding,u=l/2,h=u/(2.5+l/50),{cssStyles:f}=e,d=[{x:s/2,y:-l/2},{x:-s/2,y:-l/2},...Uj(-s/2,-l/2,-s/2,l/2,h,u,!1),{x:s/2,y:l/2},...Uj(s/2,l/2,s/2,-l/2,h,u,!0)],p=Ke.svg(i),m=Ze(e,{});e.look!=="handDrawn"&&(m.roughness=0,m.fillStyle="solid");let g=Wt(d),y=p.path(g,m),v=i.insert(()=>y,":first-child");return v.attr("class","basic label-container"),f&&e.look!=="handDrawn"&&v.selectAll("path").attr("style",f),n&&e.look!=="handDrawn"&&v.selectAll("path").attr("style",n),v.attr("transform",`translate(${h/2}, 0)`),Qe(e,v),e.intersect=function(x){return qe.polygon(e,d,x)},i}var Wj=M(()=>{"use strict";Ft();qt();Xt();jt();o(Uj,"generateArcPoints");o(Hj,"bowTieRect")});function Aa(t,e,r,n){return t.insert("polygon",":first-child").attr("points",n.map(function(i){return i.x+","+i.y}).join(" ")).attr("class","label-container").attr("transform","translate("+-e/2+","+r/2+")")}var Su=M(()=>{"use strict";o(Aa,"insertPolygonShape")});async function Yj(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a}=await ot(t,e,lt(e)),s=a.height+e.padding,l=12,u=a.width+e.padding+l,h=0,f=u,d=-s,p=0,m=[{x:h+l,y:d},{x:f,y:d},{x:f,y:p},{x:h,y:p},{x:h,y:d+l},{x:h+l,y:d}],g,{cssStyles:y}=e;if(e.look==="handDrawn"){let v=Ke.svg(i),x=Ze(e,{}),b=Wt(m),w=v.path(b,x);g=i.insert(()=>w,":first-child").attr("transform",`translate(${-u/2}, ${s/2})`),y&&g.attr("style",y)}else g=Aa(i,u,s,m);return n&&g.attr("style",n),Qe(e,g),e.intersect=function(v){return qe.polygon(e,m,v)},i}var qj=M(()=>{"use strict";Ft();qt();Xt();jt();Su();Ft();o(Yj,"card")});function Xj(t,e){let{nodeStyles:r}=et(e);e.label="";let n=t.insert("g").attr("class",lt(e)).attr("id",e.domId??e.id),{cssStyles:i}=e,a=Math.max(28,e.width??0),s=[{x:0,y:a/2},{x:a/2,y:0},{x:0,y:-a/2},{x:-a/2,y:0}],l=Ke.svg(n),u=Ze(e,{});e.look!=="handDrawn"&&(u.roughness=0,u.fillStyle="solid");let h=Wt(s),f=l.path(h,u),d=n.insert(()=>f,":first-child");return i&&e.look!=="handDrawn"&&d.selectAll("path").attr("style",i),r&&e.look!=="handDrawn"&&d.selectAll("path").attr("style",r),e.width=28,e.height=28,e.intersect=function(p){return qe.polygon(e,s,p)},n}var jj=M(()=>{"use strict";qt();jt();Xt();Ft();o(Xj,"choice")});async function Kj(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,halfPadding:s}=await ot(t,e,lt(e)),l=a.width/2+s,u,{cssStyles:h}=e;if(e.look==="handDrawn"){let f=Ke.svg(i),d=Ze(e,{}),p=f.circle(0,0,l*2,d);u=i.insert(()=>p,":first-child"),u.attr("class","basic label-container").attr("style",Fn(h))}else u=i.insert("circle",":first-child").attr("class","basic label-container").attr("style",n).attr("r",l).attr("cx",0).attr("cy",0);return Qe(e,u),e.intersect=function(f){return Y.info("Circle intersect",e,l,f),qe.circle(e,l,f)},i}var Qj=M(()=>{"use strict";ht();Ft();qt();Xt();jt();hr();o(Kj,"circle")});function uAe(t){let e=Math.cos(Math.PI/4),r=Math.sin(Math.PI/4),n=t*2,i={x:n/2*e,y:n/2*r},a={x:-(n/2)*e,y:n/2*r},s={x:-(n/2)*e,y:-(n/2)*r},l={x:n/2*e,y:-(n/2)*r};return`M ${a.x},${a.y} L ${l.x},${l.y} + M ${i.x},${i.y} L ${s.x},${s.y}`}function Zj(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r,e.label="";let i=t.insert("g").attr("class",lt(e)).attr("id",e.domId??e.id),a=Math.max(30,e?.width??0),{cssStyles:s}=e,l=Ke.svg(i),u=Ze(e,{});e.look!=="handDrawn"&&(u.roughness=0,u.fillStyle="solid");let h=l.circle(0,0,a*2,u),f=uAe(a),d=l.path(f,u),p=i.insert(()=>h,":first-child");return p.insert(()=>d),s&&e.look!=="handDrawn"&&p.selectAll("path").attr("style",s),n&&e.look!=="handDrawn"&&p.selectAll("path").attr("style",n),Qe(e,p),e.intersect=function(m){return Y.info("crossedCircle intersect",e,{radius:a,point:m}),qe.circle(e,a,m)},i}var Jj=M(()=>{"use strict";ht();Ft();Xt();jt();qt();o(uAe,"createLine");o(Zj,"crossedCircle")});function Bh(t,e,r,n=100,i=0,a=180){let s=[],l=i*Math.PI/180,f=(a*Math.PI/180-l)/(n-1);for(let d=0;d<n;d++){let p=l+d*f,m=t+r*Math.cos(p),g=e+r*Math.sin(p);s.push({x:-m,y:-g})}return s}async function eK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=a.width+(e.padding??0),u=a.height+(e.padding??0),h=Math.max(5,u*.1),{cssStyles:f}=e,d=[...Bh(l/2,-u/2,h,30,-90,0),{x:-l/2-h,y:h},...Bh(l/2+h*2,-h,h,20,-180,-270),...Bh(l/2+h*2,h,h,20,-90,-180),{x:-l/2-h,y:-u/2},...Bh(l/2,u/2,h,20,0,90)],p=[{x:l/2,y:-u/2-h},{x:-l/2,y:-u/2-h},...Bh(l/2,-u/2,h,20,-90,0),{x:-l/2-h,y:-h},...Bh(l/2+l*.1,-h,h,20,-180,-270),...Bh(l/2+l*.1,h,h,20,-90,-180),{x:-l/2-h,y:u/2},...Bh(l/2,u/2,h,20,0,90),{x:-l/2,y:u/2+h},{x:l/2,y:u/2+h}],m=Ke.svg(i),g=Ze(e,{fill:"none"});e.look!=="handDrawn"&&(g.roughness=0,g.fillStyle="solid");let v=Wt(d).replace("Z",""),x=m.path(v,g),b=Wt(p),w=m.path(b,{...g}),_=i.insert("g",":first-child");return _.insert(()=>w,":first-child").attr("stroke-opacity",0),_.insert(()=>x,":first-child"),_.attr("class","text"),f&&e.look!=="handDrawn"&&_.selectAll("path").attr("style",f),n&&e.look!=="handDrawn"&&_.selectAll("path").attr("style",n),_.attr("transform",`translate(${h}, 0)`),s.attr("transform",`translate(${-l/2+h-(a.x-(a.left??0))},${-u/2+(e.padding??0)/2-(a.y-(a.top??0))})`),Qe(e,_),e.intersect=function(T){return qe.polygon(e,p,T)},i}var tK=M(()=>{"use strict";Ft();qt();Xt();jt();o(Bh,"generateCirclePoints");o(eK,"curlyBraceLeft")});function Fh(t,e,r,n=100,i=0,a=180){let s=[],l=i*Math.PI/180,f=(a*Math.PI/180-l)/(n-1);for(let d=0;d<n;d++){let p=l+d*f,m=t+r*Math.cos(p),g=e+r*Math.sin(p);s.push({x:m,y:g})}return s}async function rK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=a.width+(e.padding??0),u=a.height+(e.padding??0),h=Math.max(5,u*.1),{cssStyles:f}=e,d=[...Fh(l/2,-u/2,h,20,-90,0),{x:l/2+h,y:-h},...Fh(l/2+h*2,-h,h,20,-180,-270),...Fh(l/2+h*2,h,h,20,-90,-180),{x:l/2+h,y:u/2},...Fh(l/2,u/2,h,20,0,90)],p=[{x:-l/2,y:-u/2-h},{x:l/2,y:-u/2-h},...Fh(l/2,-u/2,h,20,-90,0),{x:l/2+h,y:-h},...Fh(l/2+h*2,-h,h,20,-180,-270),...Fh(l/2+h*2,h,h,20,-90,-180),{x:l/2+h,y:u/2},...Fh(l/2,u/2,h,20,0,90),{x:l/2,y:u/2+h},{x:-l/2,y:u/2+h}],m=Ke.svg(i),g=Ze(e,{fill:"none"});e.look!=="handDrawn"&&(g.roughness=0,g.fillStyle="solid");let v=Wt(d).replace("Z",""),x=m.path(v,g),b=Wt(p),w=m.path(b,{...g}),_=i.insert("g",":first-child");return _.insert(()=>w,":first-child").attr("stroke-opacity",0),_.insert(()=>x,":first-child"),_.attr("class","text"),f&&e.look!=="handDrawn"&&_.selectAll("path").attr("style",f),n&&e.look!=="handDrawn"&&_.selectAll("path").attr("style",n),_.attr("transform",`translate(${-h}, 0)`),s.attr("transform",`translate(${-l/2+(e.padding??0)/2-(a.x-(a.left??0))},${-u/2+(e.padding??0)/2-(a.y-(a.top??0))})`),Qe(e,_),e.intersect=function(T){return qe.polygon(e,p,T)},i}var nK=M(()=>{"use strict";Ft();qt();Xt();jt();o(Fh,"generateCirclePoints");o(rK,"curlyBraceRight")});function _a(t,e,r,n=100,i=0,a=180){let s=[],l=i*Math.PI/180,f=(a*Math.PI/180-l)/(n-1);for(let d=0;d<n;d++){let p=l+d*f,m=t+r*Math.cos(p),g=e+r*Math.sin(p);s.push({x:-m,y:-g})}return s}async function iK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=a.width+(e.padding??0),u=a.height+(e.padding??0),h=Math.max(5,u*.1),{cssStyles:f}=e,d=[..._a(l/2,-u/2,h,30,-90,0),{x:-l/2-h,y:h},..._a(l/2+h*2,-h,h,20,-180,-270),..._a(l/2+h*2,h,h,20,-90,-180),{x:-l/2-h,y:-u/2},..._a(l/2,u/2,h,20,0,90)],p=[..._a(-l/2+h+h/2,-u/2,h,20,-90,-180),{x:l/2-h/2,y:h},..._a(-l/2-h/2,-h,h,20,0,90),..._a(-l/2-h/2,h,h,20,-90,0),{x:l/2-h/2,y:-h},..._a(-l/2+h+h/2,u/2,h,30,-180,-270)],m=[{x:l/2,y:-u/2-h},{x:-l/2,y:-u/2-h},..._a(l/2,-u/2,h,20,-90,0),{x:-l/2-h,y:-h},..._a(l/2+h*2,-h,h,20,-180,-270),..._a(l/2+h*2,h,h,20,-90,-180),{x:-l/2-h,y:u/2},..._a(l/2,u/2,h,20,0,90),{x:-l/2,y:u/2+h},{x:l/2-h-h/2,y:u/2+h},..._a(-l/2+h+h/2,-u/2,h,20,-90,-180),{x:l/2-h/2,y:h},..._a(-l/2-h/2,-h,h,20,0,90),..._a(-l/2-h/2,h,h,20,-90,0),{x:l/2-h/2,y:-h},..._a(-l/2+h+h/2,u/2,h,30,-180,-270)],g=Ke.svg(i),y=Ze(e,{fill:"none"});e.look!=="handDrawn"&&(y.roughness=0,y.fillStyle="solid");let x=Wt(d).replace("Z",""),b=g.path(x,y),_=Wt(p).replace("Z",""),T=g.path(_,y),E=Wt(m),L=g.path(E,{...y}),C=i.insert("g",":first-child");return C.insert(()=>L,":first-child").attr("stroke-opacity",0),C.insert(()=>b,":first-child"),C.insert(()=>T,":first-child"),C.attr("class","text"),f&&e.look!=="handDrawn"&&C.selectAll("path").attr("style",f),n&&e.look!=="handDrawn"&&C.selectAll("path").attr("style",n),C.attr("transform",`translate(${h-h/4}, 0)`),s.attr("transform",`translate(${-l/2+(e.padding??0)/2-(a.x-(a.left??0))},${-u/2+(e.padding??0)/2-(a.y-(a.top??0))})`),Qe(e,C),e.intersect=function(A){return qe.polygon(e,m,A)},i}var aK=M(()=>{"use strict";Ft();qt();Xt();jt();o(_a,"generateCirclePoints");o(iK,"curlyBraces")});async function sK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a}=await ot(t,e,lt(e)),s=80,l=20,u=Math.max(s,(a.width+(e.padding??0)*2)*1.25,e?.width??0),h=Math.max(l,a.height+(e.padding??0)*2,e?.height??0),f=h/2,{cssStyles:d}=e,p=Ke.svg(i),m=Ze(e,{});e.look!=="handDrawn"&&(m.roughness=0,m.fillStyle="solid");let g=u,y=h,v=g-f,x=y/4,b=[{x:v,y:0},{x,y:0},{x:0,y:y/2},{x,y},{x:v,y},...k5(-v,-y/2,f,50,270,90)],w=Wt(b),_=p.path(w,m),T=i.insert(()=>_,":first-child");return T.attr("class","basic label-container"),d&&e.look!=="handDrawn"&&T.selectChildren("path").attr("style",d),n&&e.look!=="handDrawn"&&T.selectChildren("path").attr("style",n),T.attr("transform",`translate(${-u/2}, ${-h/2})`),Qe(e,T),e.intersect=function(E){return qe.polygon(e,b,E)},i}var oK=M(()=>{"use strict";Ft();qt();Xt();jt();o(sK,"curvedTrapezoid")});async function lK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=Math.max(a.width+e.padding,e.width??0),u=l/2,h=u/(2.5+l/50),f=Math.max(a.height+h+e.padding,e.height??0),d,{cssStyles:p}=e;if(e.look==="handDrawn"){let m=Ke.svg(i),g=fAe(0,0,l,f,u,h),y=dAe(0,h,l,f,u,h),v=m.path(g,Ze(e,{})),x=m.path(y,Ze(e,{fill:"none"}));d=i.insert(()=>x,":first-child"),d=i.insert(()=>v,":first-child"),d.attr("class","basic label-container"),p&&d.attr("style",p)}else{let m=hAe(0,0,l,f,u,h);d=i.insert("path",":first-child").attr("d",m).attr("class","basic label-container").attr("style",Fn(p)).attr("style",n)}return d.attr("label-offset-y",h),d.attr("transform",`translate(${-l/2}, ${-(f/2+h)})`),Qe(e,d),s.attr("transform",`translate(${-(a.width/2)-(a.x-(a.left??0))}, ${-(a.height/2)+(e.padding??0)/1.5-(a.y-(a.top??0))})`),e.intersect=function(m){let g=qe.rect(e,m),y=g.x-(e.x??0);if(u!=0&&(Math.abs(y)<(e.width??0)/2||Math.abs(y)==(e.width??0)/2&&Math.abs(g.y-(e.y??0))>(e.height??0)/2-h)){let v=h*h*(1-y*y/(u*u));v>0&&(v=Math.sqrt(v)),v=h-v,m.y-(e.y??0)>0&&(v=-v),g.y+=v}return g},i}var hAe,fAe,dAe,cK=M(()=>{"use strict";Ft();qt();Xt();jt();hr();hAe=o((t,e,r,n,i,a)=>[`M${t},${e+a}`,`a${i},${a} 0,0,0 ${r},0`,`a${i},${a} 0,0,0 ${-r},0`,`l0,${n}`,`a${i},${a} 0,0,0 ${r},0`,`l0,${-n}`].join(" "),"createCylinderPathD"),fAe=o((t,e,r,n,i,a)=>[`M${t},${e+a}`,`M${t+r},${e+a}`,`a${i},${a} 0,0,0 ${-r},0`,`l0,${n}`,`a${i},${a} 0,0,0 ${r},0`,`l0,${-n}`].join(" "),"createOuterCylinderPathD"),dAe=o((t,e,r,n,i,a)=>[`M${t-r/2},${-n/2}`,`a${i},${a} 0,0,0 ${r},0`].join(" "),"createInnerCylinderPathD");o(lK,"cylinder")});async function uK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=a.width+e.padding,u=a.height+e.padding,h=u*.2,f=-l/2,d=-u/2-h/2,{cssStyles:p}=e,m=Ke.svg(i),g=Ze(e,{});e.look!=="handDrawn"&&(g.roughness=0,g.fillStyle="solid");let y=[{x:f,y:d+h},{x:-f,y:d+h},{x:-f,y:-d},{x:f,y:-d},{x:f,y:d},{x:-f,y:d},{x:-f,y:d+h}],v=m.polygon(y.map(b=>[b.x,b.y]),g),x=i.insert(()=>v,":first-child");return x.attr("class","basic label-container"),p&&e.look!=="handDrawn"&&x.selectAll("path").attr("style",p),n&&e.look!=="handDrawn"&&x.selectAll("path").attr("style",n),s.attr("transform",`translate(${f+(e.padding??0)/2-(a.x-(a.left??0))}, ${d+h+(e.padding??0)/2-(a.y-(a.top??0))})`),Qe(e,x),e.intersect=function(b){return qe.rect(e,b)},i}var hK=M(()=>{"use strict";Ft();qt();Xt();jt();o(uK,"dividedRectangle")});async function fK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,halfPadding:s}=await ot(t,e,lt(e)),u=a.width/2+s+5,h=a.width/2+s,f,{cssStyles:d}=e;if(e.look==="handDrawn"){let p=Ke.svg(i),m=Ze(e,{roughness:.2,strokeWidth:2.5}),g=Ze(e,{roughness:.2,strokeWidth:1.5}),y=p.circle(0,0,u*2,m),v=p.circle(0,0,h*2,g);f=i.insert("g",":first-child"),f.attr("class",Fn(e.cssClasses)).attr("style",Fn(d)),f.node()?.appendChild(y),f.node()?.appendChild(v)}else{f=i.insert("g",":first-child");let p=f.insert("circle",":first-child"),m=f.insert("circle");f.attr("class","basic label-container").attr("style",n),p.attr("class","outer-circle").attr("style",n).attr("r",u).attr("cx",0).attr("cy",0),m.attr("class","inner-circle").attr("style",n).attr("r",h).attr("cx",0).attr("cy",0)}return Qe(e,f),e.intersect=function(p){return Y.info("DoubleCircle intersect",e,u,p),qe.circle(e,u,p)},i}var dK=M(()=>{"use strict";ht();Ft();qt();Xt();jt();hr();o(fK,"doublecircle")});function pK(t,e,{config:{themeVariables:r}}){let{labelStyles:n,nodeStyles:i}=et(e);e.label="",e.labelStyle=n;let a=t.insert("g").attr("class",lt(e)).attr("id",e.domId??e.id),s=7,{cssStyles:l}=e,u=Ke.svg(a),{nodeBorder:h}=r,f=Ze(e,{fillStyle:"solid"});e.look!=="handDrawn"&&(f.roughness=0);let d=u.circle(0,0,s*2,f),p=a.insert(()=>d,":first-child");return p.selectAll("path").attr("style",`fill: ${h} !important;`),l&&l.length>0&&e.look!=="handDrawn"&&p.selectAll("path").attr("style",l),i&&e.look!=="handDrawn"&&p.selectAll("path").attr("style",i),Qe(e,p),e.intersect=function(m){return Y.info("filledCircle intersect",e,{radius:s,point:m}),qe.circle(e,s,m)},a}var mK=M(()=>{"use strict";jt();ht();qt();Xt();Ft();o(pK,"filledCircle")});async function gK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=a.width+(e.padding??0),u=l+a.height,h=l+a.height,f=[{x:0,y:-u},{x:h,y:-u},{x:h/2,y:0}],{cssStyles:d}=e,p=Ke.svg(i),m=Ze(e,{});e.look!=="handDrawn"&&(m.roughness=0,m.fillStyle="solid");let g=Wt(f),y=p.path(g,m),v=i.insert(()=>y,":first-child").attr("transform",`translate(${-u/2}, ${u/2})`);return d&&e.look!=="handDrawn"&&v.selectChildren("path").attr("style",d),n&&e.look!=="handDrawn"&&v.selectChildren("path").attr("style",n),e.width=l,e.height=u,Qe(e,v),s.attr("transform",`translate(${-a.width/2-(a.x-(a.left??0))}, ${-u/2+(e.padding??0)/2+(a.y-(a.top??0))})`),e.intersect=function(x){return Y.info("Triangle intersect",e,f,x),qe.polygon(e,f,x)},i}var yK=M(()=>{"use strict";ht();Ft();qt();Xt();jt();Ft();o(gK,"flippedTriangle")});function vK(t,e,{dir:r,config:{state:n,themeVariables:i}}){let{nodeStyles:a}=et(e);e.label="";let s=t.insert("g").attr("class",lt(e)).attr("id",e.domId??e.id),{cssStyles:l}=e,u=Math.max(70,e?.width??0),h=Math.max(10,e?.height??0);r==="LR"&&(u=Math.max(10,e?.width??0),h=Math.max(70,e?.height??0));let f=-1*u/2,d=-1*h/2,p=Ke.svg(s),m=Ze(e,{stroke:i.lineColor,fill:i.lineColor});e.look!=="handDrawn"&&(m.roughness=0,m.fillStyle="solid");let g=p.rectangle(f,d,u,h,m),y=s.insert(()=>g,":first-child");l&&e.look!=="handDrawn"&&y.selectAll("path").attr("style",l),a&&e.look!=="handDrawn"&&y.selectAll("path").attr("style",a),Qe(e,y);let v=n?.padding??0;return e.width&&e.height&&(e.width+=v/2||0,e.height+=v/2||0),e.intersect=function(x){return qe.rect(e,x)},s}var xK=M(()=>{"use strict";jt();qt();Xt();Ft();o(vK,"forkJoin")});async function bK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let i=80,a=50,{shapeSvg:s,bbox:l}=await ot(t,e,lt(e)),u=Math.max(i,l.width+(e.padding??0)*2,e?.width??0),h=Math.max(a,l.height+(e.padding??0)*2,e?.height??0),f=h/2,{cssStyles:d}=e,p=Ke.svg(s),m=Ze(e,{});e.look!=="handDrawn"&&(m.roughness=0,m.fillStyle="solid");let g=[{x:-u/2,y:-h/2},{x:u/2-f,y:-h/2},...k5(-u/2+f,0,f,50,90,270),{x:u/2-f,y:h/2},{x:-u/2,y:h/2}],y=Wt(g),v=p.path(y,m),x=s.insert(()=>v,":first-child");return x.attr("class","basic label-container"),d&&e.look!=="handDrawn"&&x.selectChildren("path").attr("style",d),n&&e.look!=="handDrawn"&&x.selectChildren("path").attr("style",n),Qe(e,x),e.intersect=function(b){return Y.info("Pill intersect",e,{radius:f,point:b}),qe.polygon(e,g,b)},s}var wK=M(()=>{"use strict";ht();Ft();qt();Xt();jt();o(bK,"halfRoundedRectangle")});async function TK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a}=await ot(t,e,lt(e)),s=4,l=a.height+e.padding,u=l/s,h=a.width+2*u+e.padding,f=[{x:u,y:0},{x:h-u,y:0},{x:h,y:-l/2},{x:h-u,y:-l},{x:u,y:-l},{x:0,y:-l/2}],d,{cssStyles:p}=e;if(e.look==="handDrawn"){let m=Ke.svg(i),g=Ze(e,{}),y=pAe(0,0,h,l,u),v=m.path(y,g);d=i.insert(()=>v,":first-child").attr("transform",`translate(${-h/2}, ${l/2})`),p&&d.attr("style",p)}else d=Aa(i,h,l,f);return n&&d.attr("style",n),e.width=h,e.height=l,Qe(e,d),e.intersect=function(m){return qe.polygon(e,f,m)},i}var pAe,kK=M(()=>{"use strict";Ft();qt();Xt();jt();Su();pAe=o((t,e,r,n,i)=>[`M${t+i},${e}`,`L${t+r-i},${e}`,`L${t+r},${e-n/2}`,`L${t+r-i},${e-n}`,`L${t+i},${e-n}`,`L${t},${e-n/2}`,"Z"].join(" "),"createHexagonPathD");o(TK,"hexagon")});async function EK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.label="",e.labelStyle=r;let{shapeSvg:i}=await ot(t,e,lt(e)),a=Math.max(30,e?.width??0),s=Math.max(30,e?.height??0),{cssStyles:l}=e,u=Ke.svg(i),h=Ze(e,{});e.look!=="handDrawn"&&(h.roughness=0,h.fillStyle="solid");let f=[{x:0,y:0},{x:a,y:0},{x:0,y:s},{x:a,y:s}],d=Wt(f),p=u.path(d,h),m=i.insert(()=>p,":first-child");return m.attr("class","basic label-container"),l&&e.look!=="handDrawn"&&m.selectChildren("path").attr("style",l),n&&e.look!=="handDrawn"&&m.selectChildren("path").attr("style",n),m.attr("transform",`translate(${-a/2}, ${-s/2})`),Qe(e,m),e.intersect=function(g){return Y.info("Pill intersect",e,{points:f}),qe.polygon(e,f,g)},i}var SK=M(()=>{"use strict";ht();Ft();qt();Xt();jt();o(EK,"hourglass")});async function CK(t,e,{config:{themeVariables:r,flowchart:n}}){let{labelStyles:i}=et(e);e.labelStyle=i;let a=e.assetHeight??48,s=e.assetWidth??48,l=Math.max(a,s),u=n?.wrappingWidth;e.width=Math.max(l,u??0);let{shapeSvg:h,bbox:f,label:d}=await ot(t,e,"icon-shape default"),p=e.pos==="t",m=l,g=l,{nodeBorder:y}=r,{stylesMap:v}=mc(e),x=-g/2,b=-m/2,w=e.label?8:0,_=Ke.svg(h),T=Ze(e,{stroke:"none",fill:"none"});e.look!=="handDrawn"&&(T.roughness=0,T.fillStyle="solid");let E=_.rectangle(x,b,g,m,T),L=Math.max(g,f.width),C=m+f.height+w,A=_.rectangle(-L/2,-C/2,L,C,{...T,fill:"transparent",stroke:"none"}),I=h.insert(()=>E,":first-child"),D=h.insert(()=>A);if(e.icon){let k=h.append("g");k.html(`<g>${await wo(e.icon,{height:l,width:l,fallbackPrefix:""})}</g>`);let R=k.node().getBBox(),S=R.width,O=R.height,N=R.x,P=R.y;k.attr("transform",`translate(${-S/2-N},${p?f.height/2+w/2-O/2-P:-f.height/2-w/2-O/2-P})`),k.attr("style",`color: ${v.get("stroke")??y};`)}return d.attr("transform",`translate(${-f.width/2-(f.x-(f.left??0))},${p?-C/2:C/2-f.height})`),I.attr("transform",`translate(0,${p?f.height/2+w/2:-f.height/2-w/2})`),Qe(e,D),e.intersect=function(k){if(Y.info("iconSquare intersect",e,k),!e.label)return qe.rect(e,k);let R=e.x??0,S=e.y??0,O=e.height??0,N=[];return p?N=[{x:R-f.width/2,y:S-O/2},{x:R+f.width/2,y:S-O/2},{x:R+f.width/2,y:S-O/2+f.height+w},{x:R+g/2,y:S-O/2+f.height+w},{x:R+g/2,y:S+O/2},{x:R-g/2,y:S+O/2},{x:R-g/2,y:S-O/2+f.height+w},{x:R-f.width/2,y:S-O/2+f.height+w}]:N=[{x:R-g/2,y:S-O/2},{x:R+g/2,y:S-O/2},{x:R+g/2,y:S-O/2+m},{x:R+f.width/2,y:S-O/2+m},{x:R+f.width/2/2,y:S+O/2},{x:R-f.width/2,y:S+O/2},{x:R-f.width/2,y:S-O/2+m},{x:R-g/2,y:S-O/2+m}],qe.polygon(e,N,k)},h}var AK=M(()=>{"use strict";jt();ht();Kc();qt();Xt();Ft();o(CK,"icon")});async function _K(t,e,{config:{themeVariables:r,flowchart:n}}){let{labelStyles:i}=et(e);e.labelStyle=i;let a=e.assetHeight??48,s=e.assetWidth??48,l=Math.max(a,s),u=n?.wrappingWidth;e.width=Math.max(l,u??0);let{shapeSvg:h,bbox:f,label:d}=await ot(t,e,"icon-shape default"),p=20,m=e.label?8:0,g=e.pos==="t",{nodeBorder:y,mainBkg:v}=r,{stylesMap:x}=mc(e),b=Ke.svg(h),w=Ze(e,{});e.look!=="handDrawn"&&(w.roughness=0,w.fillStyle="solid");let _=x.get("fill");w.stroke=_??v;let T=h.append("g");e.icon&&T.html(`<g>${await wo(e.icon,{height:l,width:l,fallbackPrefix:""})}</g>`);let E=T.node().getBBox(),L=E.width,C=E.height,A=E.x,I=E.y,D=Math.max(L,C)*Math.SQRT2+p*2,k=b.circle(0,0,D,w),R=Math.max(D,f.width),S=D+f.height+m,O=b.rectangle(-R/2,-S/2,R,S,{...w,fill:"transparent",stroke:"none"}),N=h.insert(()=>k,":first-child"),P=h.insert(()=>O);return T.attr("transform",`translate(${-L/2-A},${g?f.height/2+m/2-C/2-I:-f.height/2-m/2-C/2-I})`),T.attr("style",`color: ${x.get("stroke")??y};`),d.attr("transform",`translate(${-f.width/2-(f.x-(f.left??0))},${g?-S/2:S/2-f.height})`),N.attr("transform",`translate(0,${g?f.height/2+m/2:-f.height/2-m/2})`),Qe(e,P),e.intersect=function(F){return Y.info("iconSquare intersect",e,F),qe.rect(e,F)},h}var LK=M(()=>{"use strict";jt();ht();Kc();qt();Xt();Ft();o(_K,"iconCircle")});var La,zh=M(()=>{"use strict";La=o((t,e,r,n,i)=>["M",t+i,e,"H",t+r-i,"A",i,i,0,0,1,t+r,e+i,"V",e+n-i,"A",i,i,0,0,1,t+r-i,e+n,"H",t+i,"A",i,i,0,0,1,t,e+n-i,"V",e+i,"A",i,i,0,0,1,t+i,e,"Z"].join(" "),"createRoundedRectPathD")});async function DK(t,e,{config:{themeVariables:r,flowchart:n}}){let{labelStyles:i}=et(e);e.labelStyle=i;let a=e.assetHeight??48,s=e.assetWidth??48,l=Math.max(a,s),u=n?.wrappingWidth;e.width=Math.max(l,u??0);let{shapeSvg:h,bbox:f,halfPadding:d,label:p}=await ot(t,e,"icon-shape default"),m=e.pos==="t",g=l+d*2,y=l+d*2,{nodeBorder:v,mainBkg:x}=r,{stylesMap:b}=mc(e),w=-y/2,_=-g/2,T=e.label?8:0,E=Ke.svg(h),L=Ze(e,{});e.look!=="handDrawn"&&(L.roughness=0,L.fillStyle="solid");let C=b.get("fill");L.stroke=C??x;let A=E.path(La(w,_,y,g,5),L),I=Math.max(y,f.width),D=g+f.height+T,k=E.rectangle(-I/2,-D/2,I,D,{...L,fill:"transparent",stroke:"none"}),R=h.insert(()=>A,":first-child").attr("class","icon-shape2"),S=h.insert(()=>k);if(e.icon){let O=h.append("g");O.html(`<g>${await wo(e.icon,{height:l,width:l,fallbackPrefix:""})}</g>`);let N=O.node().getBBox(),P=N.width,F=N.height,B=N.x,$=N.y;O.attr("transform",`translate(${-P/2-B},${m?f.height/2+T/2-F/2-$:-f.height/2-T/2-F/2-$})`),O.attr("style",`color: ${b.get("stroke")??v};`)}return p.attr("transform",`translate(${-f.width/2-(f.x-(f.left??0))},${m?-D/2:D/2-f.height})`),R.attr("transform",`translate(0,${m?f.height/2+T/2:-f.height/2-T/2})`),Qe(e,S),e.intersect=function(O){if(Y.info("iconSquare intersect",e,O),!e.label)return qe.rect(e,O);let N=e.x??0,P=e.y??0,F=e.height??0,B=[];return m?B=[{x:N-f.width/2,y:P-F/2},{x:N+f.width/2,y:P-F/2},{x:N+f.width/2,y:P-F/2+f.height+T},{x:N+y/2,y:P-F/2+f.height+T},{x:N+y/2,y:P+F/2},{x:N-y/2,y:P+F/2},{x:N-y/2,y:P-F/2+f.height+T},{x:N-f.width/2,y:P-F/2+f.height+T}]:B=[{x:N-y/2,y:P-F/2},{x:N+y/2,y:P-F/2},{x:N+y/2,y:P-F/2+g},{x:N+f.width/2,y:P-F/2+g},{x:N+f.width/2/2,y:P+F/2},{x:N-f.width/2,y:P+F/2},{x:N-f.width/2,y:P-F/2+g},{x:N-y/2,y:P-F/2+g}],qe.polygon(e,B,O)},h}var NK=M(()=>{"use strict";jt();ht();Kc();qt();Xt();zh();Ft();o(DK,"iconRounded")});async function RK(t,e,{config:{themeVariables:r,flowchart:n}}){let{labelStyles:i}=et(e);e.labelStyle=i;let a=e.assetHeight??48,s=e.assetWidth??48,l=Math.max(a,s),u=n?.wrappingWidth;e.width=Math.max(l,u??0);let{shapeSvg:h,bbox:f,halfPadding:d,label:p}=await ot(t,e,"icon-shape default"),m=e.pos==="t",g=l+d*2,y=l+d*2,{nodeBorder:v,mainBkg:x}=r,{stylesMap:b}=mc(e),w=-y/2,_=-g/2,T=e.label?8:0,E=Ke.svg(h),L=Ze(e,{});e.look!=="handDrawn"&&(L.roughness=0,L.fillStyle="solid");let C=b.get("fill");L.stroke=C??x;let A=E.path(La(w,_,y,g,.1),L),I=Math.max(y,f.width),D=g+f.height+T,k=E.rectangle(-I/2,-D/2,I,D,{...L,fill:"transparent",stroke:"none"}),R=h.insert(()=>A,":first-child"),S=h.insert(()=>k);if(e.icon){let O=h.append("g");O.html(`<g>${await wo(e.icon,{height:l,width:l,fallbackPrefix:""})}</g>`);let N=O.node().getBBox(),P=N.width,F=N.height,B=N.x,$=N.y;O.attr("transform",`translate(${-P/2-B},${m?f.height/2+T/2-F/2-$:-f.height/2-T/2-F/2-$})`),O.attr("style",`color: ${b.get("stroke")??v};`)}return p.attr("transform",`translate(${-f.width/2-(f.x-(f.left??0))},${m?-D/2:D/2-f.height})`),R.attr("transform",`translate(0,${m?f.height/2+T/2:-f.height/2-T/2})`),Qe(e,S),e.intersect=function(O){if(Y.info("iconSquare intersect",e,O),!e.label)return qe.rect(e,O);let N=e.x??0,P=e.y??0,F=e.height??0,B=[];return m?B=[{x:N-f.width/2,y:P-F/2},{x:N+f.width/2,y:P-F/2},{x:N+f.width/2,y:P-F/2+f.height+T},{x:N+y/2,y:P-F/2+f.height+T},{x:N+y/2,y:P+F/2},{x:N-y/2,y:P+F/2},{x:N-y/2,y:P-F/2+f.height+T},{x:N-f.width/2,y:P-F/2+f.height+T}]:B=[{x:N-y/2,y:P-F/2},{x:N+y/2,y:P-F/2},{x:N+y/2,y:P-F/2+g},{x:N+f.width/2,y:P-F/2+g},{x:N+f.width/2/2,y:P+F/2},{x:N-f.width/2,y:P+F/2},{x:N-f.width/2,y:P-F/2+g},{x:N-y/2,y:P-F/2+g}],qe.polygon(e,B,O)},h}var MK=M(()=>{"use strict";jt();ht();Kc();qt();zh();Xt();Ft();o(RK,"iconSquare")});async function IK(t,e,{config:{flowchart:r}}){let n=new Image;n.src=e?.img??"",await n.decode();let i=Number(n.naturalWidth.toString().replace("px","")),a=Number(n.naturalHeight.toString().replace("px",""));e.imageAspectRatio=i/a;let{labelStyles:s}=et(e);e.labelStyle=s;let l=r?.wrappingWidth;e.defaultWidth=r?.wrappingWidth;let u=Math.max(e.label?l??0:0,e?.assetWidth??i),h=e.constraint==="on"&&e?.assetHeight?e.assetHeight*e.imageAspectRatio:u,f=e.constraint==="on"?h/e.imageAspectRatio:e?.assetHeight??a;e.width=Math.max(h,l??0);let{shapeSvg:d,bbox:p,label:m}=await ot(t,e,"image-shape default"),g=e.pos==="t",y=-h/2,v=-f/2,x=e.label?8:0,b=Ke.svg(d),w=Ze(e,{});e.look!=="handDrawn"&&(w.roughness=0,w.fillStyle="solid");let _=b.rectangle(y,v,h,f,w),T=Math.max(h,p.width),E=f+p.height+x,L=b.rectangle(-T/2,-E/2,T,E,{...w,fill:"none",stroke:"none"}),C=d.insert(()=>_,":first-child"),A=d.insert(()=>L);if(e.img){let I=d.append("image");I.attr("href",e.img),I.attr("width",h),I.attr("height",f),I.attr("preserveAspectRatio","none"),I.attr("transform",`translate(${-h/2},${g?E/2-f:-E/2})`)}return m.attr("transform",`translate(${-p.width/2-(p.x-(p.left??0))},${g?-f/2-p.height/2-x/2:f/2-p.height/2+x/2})`),C.attr("transform",`translate(0,${g?p.height/2+x/2:-p.height/2-x/2})`),Qe(e,A),e.intersect=function(I){if(Y.info("iconSquare intersect",e,I),!e.label)return qe.rect(e,I);let D=e.x??0,k=e.y??0,R=e.height??0,S=[];return g?S=[{x:D-p.width/2,y:k-R/2},{x:D+p.width/2,y:k-R/2},{x:D+p.width/2,y:k-R/2+p.height+x},{x:D+h/2,y:k-R/2+p.height+x},{x:D+h/2,y:k+R/2},{x:D-h/2,y:k+R/2},{x:D-h/2,y:k-R/2+p.height+x},{x:D-p.width/2,y:k-R/2+p.height+x}]:S=[{x:D-h/2,y:k-R/2},{x:D+h/2,y:k-R/2},{x:D+h/2,y:k-R/2+f},{x:D+p.width/2,y:k-R/2+f},{x:D+p.width/2/2,y:k+R/2},{x:D-p.width/2,y:k+R/2},{x:D-p.width/2,y:k-R/2+f},{x:D-h/2,y:k-R/2+f}],qe.polygon(e,S,I)},d}var OK=M(()=>{"use strict";jt();ht();qt();Xt();Ft();o(IK,"imageSquare")});async function PK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a}=await ot(t,e,lt(e)),s=Math.max(a.width+(e.padding??0)*2,e?.width??0),l=Math.max(a.height+(e.padding??0)*2,e?.height??0),u=[{x:0,y:0},{x:s,y:0},{x:s+3*l/6,y:-l},{x:-3*l/6,y:-l}],h,{cssStyles:f}=e;if(e.look==="handDrawn"){let d=Ke.svg(i),p=Ze(e,{}),m=Wt(u),g=d.path(m,p);h=i.insert(()=>g,":first-child").attr("transform",`translate(${-s/2}, ${l/2})`),f&&h.attr("style",f)}else h=Aa(i,s,l,u);return n&&h.attr("style",n),e.width=s,e.height=l,Qe(e,h),e.intersect=function(d){return qe.polygon(e,u,d)},i}var BK=M(()=>{"use strict";Ft();qt();Xt();jt();Su();o(PK,"inv_trapezoid")});async function Cd(t,e,r){let{labelStyles:n,nodeStyles:i}=et(e);e.labelStyle=n;let{shapeSvg:a,bbox:s}=await ot(t,e,lt(e)),l=Math.max(s.width+r.labelPaddingX*2,e?.width||0),u=Math.max(s.height+r.labelPaddingY*2,e?.height||0),h=-l/2,f=-u/2,d,{rx:p,ry:m}=e,{cssStyles:g}=e;if(r?.rx&&r.ry&&(p=r.rx,m=r.ry),e.look==="handDrawn"){let y=Ke.svg(a),v=Ze(e,{}),x=p||m?y.path(La(h,f,l,u,p||0),v):y.rectangle(h,f,l,u,v);d=a.insert(()=>x,":first-child"),d.attr("class","basic label-container").attr("style",Fn(g))}else d=a.insert("rect",":first-child"),d.attr("class","basic label-container").attr("style",i).attr("rx",Fn(p)).attr("ry",Fn(m)).attr("x",h).attr("y",f).attr("width",l).attr("height",u);return Qe(e,d),e.intersect=function(y){return qe.rect(e,y)},a}var vv=M(()=>{"use strict";Ft();qt();zh();Xt();jt();hr();o(Cd,"drawRect")});async function FK(t,e){let{shapeSvg:r,bbox:n,label:i}=await ot(t,e,"label"),a=r.insert("rect",":first-child");return a.attr("width",.1).attr("height",.1),r.attr("class","label edgeLabel"),i.attr("transform",`translate(${-(n.width/2)-(n.x-(n.left??0))}, ${-(n.height/2)-(n.y-(n.top??0))})`),Qe(e,a),e.intersect=function(u){return qe.rect(e,u)},r}var zK=M(()=>{"use strict";vv();Ft();qt();o(FK,"labelRect")});async function GK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a}=await ot(t,e,lt(e)),s=Math.max(a.width+(e.padding??0),e?.width??0),l=Math.max(a.height+(e.padding??0),e?.height??0),u=[{x:0,y:0},{x:s+3*l/6,y:0},{x:s,y:-l},{x:-(3*l)/6,y:-l}],h,{cssStyles:f}=e;if(e.look==="handDrawn"){let d=Ke.svg(i),p=Ze(e,{}),m=Wt(u),g=d.path(m,p);h=i.insert(()=>g,":first-child").attr("transform",`translate(${-s/2}, ${l/2})`),f&&h.attr("style",f)}else h=Aa(i,s,l,u);return n&&h.attr("style",n),e.width=s,e.height=l,Qe(e,h),e.intersect=function(d){return qe.polygon(e,u,d)},i}var $K=M(()=>{"use strict";Ft();qt();Xt();jt();Su();o(GK,"lean_left")});async function VK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a}=await ot(t,e,lt(e)),s=Math.max(a.width+(e.padding??0),e?.width??0),l=Math.max(a.height+(e.padding??0),e?.height??0),u=[{x:-3*l/6,y:0},{x:s,y:0},{x:s+3*l/6,y:-l},{x:0,y:-l}],h,{cssStyles:f}=e;if(e.look==="handDrawn"){let d=Ke.svg(i),p=Ze(e,{}),m=Wt(u),g=d.path(m,p);h=i.insert(()=>g,":first-child").attr("transform",`translate(${-s/2}, ${l/2})`),f&&h.attr("style",f)}else h=Aa(i,s,l,u);return n&&h.attr("style",n),e.width=s,e.height=l,Qe(e,h),e.intersect=function(d){return qe.polygon(e,u,d)},i}var UK=M(()=>{"use strict";Ft();qt();Xt();jt();Su();o(VK,"lean_right")});function HK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.label="",e.labelStyle=r;let i=t.insert("g").attr("class",lt(e)).attr("id",e.domId??e.id),{cssStyles:a}=e,s=Math.max(35,e?.width??0),l=Math.max(35,e?.height??0),u=7,h=[{x:s,y:0},{x:0,y:l+u/2},{x:s-2*u,y:l+u/2},{x:0,y:2*l},{x:s,y:l-u/2},{x:2*u,y:l-u/2}],f=Ke.svg(i),d=Ze(e,{});e.look!=="handDrawn"&&(d.roughness=0,d.fillStyle="solid");let p=Wt(h),m=f.path(p,d),g=i.insert(()=>m,":first-child");return a&&e.look!=="handDrawn"&&g.selectAll("path").attr("style",a),n&&e.look!=="handDrawn"&&g.selectAll("path").attr("style",n),g.attr("transform",`translate(-${s/2},${-l})`),Qe(e,g),e.intersect=function(y){return Y.info("lightningBolt intersect",e,y),qe.polygon(e,h,y)},i}var WK=M(()=>{"use strict";ht();Ft();Xt();jt();qt();Ft();o(HK,"lightningBolt")});async function YK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=Math.max(a.width+(e.padding??0),e.width??0),u=l/2,h=u/(2.5+l/50),f=Math.max(a.height+h+(e.padding??0),e.height??0),d=f*.1,p,{cssStyles:m}=e;if(e.look==="handDrawn"){let g=Ke.svg(i),y=gAe(0,0,l,f,u,h,d),v=yAe(0,h,l,f,u,h),x=Ze(e,{}),b=g.path(y,x),w=g.path(v,x);i.insert(()=>w,":first-child").attr("class","line"),p=i.insert(()=>b,":first-child"),p.attr("class","basic label-container"),m&&p.attr("style",m)}else{let g=mAe(0,0,l,f,u,h,d);p=i.insert("path",":first-child").attr("d",g).attr("class","basic label-container").attr("style",Fn(m)).attr("style",n)}return p.attr("label-offset-y",h),p.attr("transform",`translate(${-l/2}, ${-(f/2+h)})`),Qe(e,p),s.attr("transform",`translate(${-(a.width/2)-(a.x-(a.left??0))}, ${-(a.height/2)+h-(a.y-(a.top??0))})`),e.intersect=function(g){let y=qe.rect(e,g),v=y.x-(e.x??0);if(u!=0&&(Math.abs(v)<(e.width??0)/2||Math.abs(v)==(e.width??0)/2&&Math.abs(y.y-(e.y??0))>(e.height??0)/2-h)){let x=h*h*(1-v*v/(u*u));x>0&&(x=Math.sqrt(x)),x=h-x,g.y-(e.y??0)>0&&(x=-x),y.y+=x}return y},i}var mAe,gAe,yAe,qK=M(()=>{"use strict";Ft();qt();Xt();jt();hr();mAe=o((t,e,r,n,i,a,s)=>[`M${t},${e+a}`,`a${i},${a} 0,0,0 ${r},0`,`a${i},${a} 0,0,0 ${-r},0`,`l0,${n}`,`a${i},${a} 0,0,0 ${r},0`,`l0,${-n}`,`M${t},${e+a+s}`,`a${i},${a} 0,0,0 ${r},0`].join(" "),"createCylinderPathD"),gAe=o((t,e,r,n,i,a,s)=>[`M${t},${e+a}`,`M${t+r},${e+a}`,`a${i},${a} 0,0,0 ${-r},0`,`l0,${n}`,`a${i},${a} 0,0,0 ${r},0`,`l0,${-n}`,`M${t},${e+a+s}`,`a${i},${a} 0,0,0 ${r},0`].join(" "),"createOuterCylinderPathD"),yAe=o((t,e,r,n,i,a)=>[`M${t-r/2},${-n/2}`,`a${i},${a} 0,0,0 ${r},0`].join(" "),"createInnerCylinderPathD");o(YK,"linedCylinder")});async function XK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=Math.max(a.width+(e.padding??0)*2,e?.width??0),u=Math.max(a.height+(e.padding??0)*2,e?.height??0),h=u/4,f=u+h,{cssStyles:d}=e,p=Ke.svg(i),m=Ze(e,{});e.look!=="handDrawn"&&(m.roughness=0,m.fillStyle="solid");let g=[{x:-l/2-l/2*.1,y:-f/2},{x:-l/2-l/2*.1,y:f/2},...zo(-l/2-l/2*.1,f/2,l/2+l/2*.1,f/2,h,.8),{x:l/2+l/2*.1,y:-f/2},{x:-l/2-l/2*.1,y:-f/2},{x:-l/2,y:-f/2},{x:-l/2,y:f/2*1.1},{x:-l/2,y:-f/2}],y=p.polygon(g.map(x=>[x.x,x.y]),m),v=i.insert(()=>y,":first-child");return v.attr("class","basic label-container"),d&&e.look!=="handDrawn"&&v.selectAll("path").attr("style",d),n&&e.look!=="handDrawn"&&v.selectAll("path").attr("style",n),v.attr("transform",`translate(0,${-h/2})`),s.attr("transform",`translate(${-l/2+(e.padding??0)+l/2*.1/2-(a.x-(a.left??0))},${-u/2+(e.padding??0)-h/2-(a.y-(a.top??0))})`),Qe(e,v),e.intersect=function(x){return qe.polygon(e,g,x)},i}var jK=M(()=>{"use strict";Ft();qt();jt();Xt();o(XK,"linedWaveEdgedRect")});async function KK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=Math.max(a.width+(e.padding??0)*2,e?.width??0),u=Math.max(a.height+(e.padding??0)*2,e?.height??0),h=5,f=-l/2,d=-u/2,{cssStyles:p}=e,m=Ke.svg(i),g=Ze(e,{}),y=[{x:f-h,y:d+h},{x:f-h,y:d+u+h},{x:f+l-h,y:d+u+h},{x:f+l-h,y:d+u},{x:f+l,y:d+u},{x:f+l,y:d+u-h},{x:f+l+h,y:d+u-h},{x:f+l+h,y:d-h},{x:f+h,y:d-h},{x:f+h,y:d},{x:f,y:d},{x:f,y:d+h}],v=[{x:f,y:d+h},{x:f+l-h,y:d+h},{x:f+l-h,y:d+u},{x:f+l,y:d+u},{x:f+l,y:d},{x:f,y:d}];e.look!=="handDrawn"&&(g.roughness=0,g.fillStyle="solid");let x=Wt(y),b=m.path(x,g),w=Wt(v),_=m.path(w,{...g,fill:"none"}),T=i.insert(()=>_,":first-child");return T.insert(()=>b,":first-child"),T.attr("class","basic label-container"),p&&e.look!=="handDrawn"&&T.selectAll("path").attr("style",p),n&&e.look!=="handDrawn"&&T.selectAll("path").attr("style",n),s.attr("transform",`translate(${-(a.width/2)-h-(a.x-(a.left??0))}, ${-(a.height/2)+h-(a.y-(a.top??0))})`),Qe(e,T),e.intersect=function(E){return qe.polygon(e,y,E)},i}var QK=M(()=>{"use strict";Ft();Xt();jt();qt();o(KK,"multiRect")});async function ZK(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=Math.max(a.width+(e.padding??0)*2,e?.width??0),u=Math.max(a.height+(e.padding??0)*2,e?.height??0),h=u/4,f=u+h,d=-l/2,p=-f/2,m=5,{cssStyles:g}=e,y=zo(d-m,p+f+m,d+l-m,p+f+m,h,.8),v=y?.[y.length-1],x=[{x:d-m,y:p+m},{x:d-m,y:p+f+m},...y,{x:d+l-m,y:v.y-m},{x:d+l,y:v.y-m},{x:d+l,y:v.y-2*m},{x:d+l+m,y:v.y-2*m},{x:d+l+m,y:p-m},{x:d+m,y:p-m},{x:d+m,y:p},{x:d,y:p},{x:d,y:p+m}],b=[{x:d,y:p+m},{x:d+l-m,y:p+m},{x:d+l-m,y:v.y-m},{x:d+l,y:v.y-m},{x:d+l,y:p},{x:d,y:p}],w=Ke.svg(i),_=Ze(e,{});e.look!=="handDrawn"&&(_.roughness=0,_.fillStyle="solid");let T=Wt(x),E=w.path(T,_),L=Wt(b),C=w.path(L,_),A=i.insert(()=>E,":first-child");return A.insert(()=>C),A.attr("class","basic label-container"),g&&e.look!=="handDrawn"&&A.selectAll("path").attr("style",g),n&&e.look!=="handDrawn"&&A.selectAll("path").attr("style",n),A.attr("transform",`translate(0,${-h/2})`),s.attr("transform",`translate(${-(a.width/2)-m-(a.x-(a.left??0))}, ${-(a.height/2)+m-h/2-(a.y-(a.top??0))})`),Qe(e,A),e.intersect=function(I){return qe.polygon(e,x,I)},i}var JK=M(()=>{"use strict";Ft();qt();jt();Xt();o(ZK,"multiWaveEdgedRectangle")});async function eQ(t,e,{config:{themeVariables:r}}){let{labelStyles:n,nodeStyles:i}=et(e);e.labelStyle=n,e.useHtmlLabels||Sr().flowchart?.htmlLabels!==!1||(e.centerLabel=!0);let{shapeSvg:s,bbox:l}=await ot(t,e,lt(e)),u=Math.max(l.width+(e.padding??0)*2,e?.width??0),h=Math.max(l.height+(e.padding??0)*2,e?.height??0),f=-u/2,d=-h/2,{cssStyles:p}=e,m=Ke.svg(s),g=Ze(e,{fill:r.noteBkgColor,stroke:r.noteBorderColor});e.look!=="handDrawn"&&(g.roughness=0,g.fillStyle="solid");let y=m.rectangle(f,d,u,h,g),v=s.insert(()=>y,":first-child");return v.attr("class","basic label-container"),p&&e.look!=="handDrawn"&&v.selectAll("path").attr("style",p),i&&e.look!=="handDrawn"&&v.selectAll("path").attr("style",i),Qe(e,v),e.intersect=function(x){return qe.rect(e,x)},s}var tQ=M(()=>{"use strict";jt();qt();Xt();Ft();Ua();o(eQ,"note")});async function rQ(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a}=await ot(t,e,lt(e)),s=a.width+e.padding,l=a.height+e.padding,u=s+l,h=[{x:u/2,y:0},{x:u,y:-u/2},{x:u/2,y:-u},{x:0,y:-u/2}],f,{cssStyles:d}=e;if(e.look==="handDrawn"){let p=Ke.svg(i),m=Ze(e,{}),g=vAe(0,0,u),y=p.path(g,m);f=i.insert(()=>y,":first-child").attr("transform",`translate(${-u/2}, ${u/2})`),d&&f.attr("style",d)}else f=Aa(i,u,u,h);return n&&f.attr("style",n),Qe(e,f),e.intersect=function(p){return Y.debug(`APA12 Intersect called SPLIT +point:`,p,` +node: +`,e,` +res:`,qe.polygon(e,h,p)),qe.polygon(e,h,p)},i}var vAe,nQ=M(()=>{"use strict";ht();Ft();qt();Xt();jt();Su();vAe=o((t,e,r)=>[`M${t+r/2},${e}`,`L${t+r},${e-r/2}`,`L${t+r/2},${e-r}`,`L${t},${e-r/2}`,"Z"].join(" "),"createDecisionBoxPathD");o(rQ,"question")});async function iQ(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=Math.max(a.width+(e.padding??0),e?.width??0),u=Math.max(a.height+(e.padding??0),e?.height??0),h=-l/2,f=-u/2,d=f/2,p=[{x:h+d,y:f},{x:h,y:0},{x:h+d,y:-f},{x:-h,y:-f},{x:-h,y:f}],{cssStyles:m}=e,g=Ke.svg(i),y=Ze(e,{});e.look!=="handDrawn"&&(y.roughness=0,y.fillStyle="solid");let v=Wt(p),x=g.path(v,y),b=i.insert(()=>x,":first-child");return b.attr("class","basic label-container"),m&&e.look!=="handDrawn"&&b.selectAll("path").attr("style",m),n&&e.look!=="handDrawn"&&b.selectAll("path").attr("style",n),b.attr("transform",`translate(${-d/2},0)`),s.attr("transform",`translate(${-d/2-a.width/2-(a.x-(a.left??0))}, ${-(a.height/2)-(a.y-(a.top??0))})`),Qe(e,b),e.intersect=function(w){return qe.polygon(e,p,w)},i}var aQ=M(()=>{"use strict";Ft();qt();Xt();jt();o(iQ,"rect_left_inv_arrow")});function xAe(t,e){e&&t.attr("style",e)}async function bAe(t){let e=ze(document.createElementNS("http://www.w3.org/2000/svg","foreignObject")),r=e.append("xhtml:div"),n=t.label;t.label&&pi(t.label)&&(n=await hh(t.label.replace(je.lineBreakRegex,` +`),de()));let i=t.isNode?"nodeLabel":"edgeLabel";return r.html('<span class="'+i+'" '+(t.labelStyle?'style="'+t.labelStyle+'"':"")+">"+n+"</span>"),xAe(r,t.labelStyle),r.style("display","inline-block"),r.style("padding-right","1px"),r.style("white-space","nowrap"),r.attr("xmlns","http://www.w3.org/1999/xhtml"),e.node()}var wAe,gc,I5=M(()=>{"use strict";mr();ht();Vt();fr();hr();o(xAe,"applyStyle");o(bAe,"addHtmlLabel");wAe=o(async(t,e,r,n)=>{let i=t||"";if(typeof i=="object"&&(i=i[0]),xr(de().flowchart.htmlLabels)){i=i.replace(/\\n|\n/g,"<br />"),Y.info("vertexText"+i);let a={isNode:n,label:Ca(i).replace(/fa[blrs]?:fa-[\w-]+/g,l=>`<i class='${l.replace(":"," ")}'></i>`),labelStyle:e&&e.replace("fill:","color:")};return await bAe(a)}else{let a=document.createElementNS("http://www.w3.org/2000/svg","text");a.setAttribute("style",e.replace("color:","fill:"));let s=[];typeof i=="string"?s=i.split(/\\n|\n|<br\s*\/?>/gi):Array.isArray(i)?s=i:s=[];for(let l of s){let u=document.createElementNS("http://www.w3.org/2000/svg","tspan");u.setAttributeNS("http://www.w3.org/XML/1998/namespace","xml:space","preserve"),u.setAttribute("dy","1em"),u.setAttribute("x","0"),r?u.setAttribute("class","title-row"):u.setAttribute("class","row"),u.textContent=l.trim(),a.appendChild(u)}return a}},"createLabel"),gc=wAe});async function sQ(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let i;e.cssClasses?i="node "+e.cssClasses:i="node default";let a=t.insert("g").attr("class",i).attr("id",e.domId||e.id),s=a.insert("g"),l=a.insert("g").attr("class","label").attr("style",n),u=e.description,h=e.label,f=l.node().appendChild(await gc(h,e.labelStyle,!0,!0)),d={width:0,height:0};if(xr(de()?.flowchart?.htmlLabels)){let C=f.children[0],A=ze(f);d=C.getBoundingClientRect(),A.attr("width",d.width),A.attr("height",d.height)}Y.info("Text 2",u);let p=u||[],m=f.getBBox(),g=l.node().appendChild(await gc(p.join?p.join("<br/>"):p,e.labelStyle,!0,!0)),y=g.children[0],v=ze(g);d=y.getBoundingClientRect(),v.attr("width",d.width),v.attr("height",d.height);let x=(e.padding||0)/2;ze(g).attr("transform","translate( "+(d.width>m.width?0:(m.width-d.width)/2)+", "+(m.height+x+5)+")"),ze(f).attr("transform","translate( "+(d.width<m.width?0:-(m.width-d.width)/2)+", 0)"),d=l.node().getBBox(),l.attr("transform","translate("+-d.width/2+", "+(-d.height/2-x+3)+")");let b=d.width+(e.padding||0),w=d.height+(e.padding||0),_=-d.width/2-x,T=-d.height/2-x,E,L;if(e.look==="handDrawn"){let C=Ke.svg(a),A=Ze(e,{}),I=C.path(La(_,T,b,w,e.rx||0),A),D=C.line(-d.width/2-x,-d.height/2-x+m.height+x,d.width/2+x,-d.height/2-x+m.height+x,A);L=a.insert(()=>(Y.debug("Rough node insert CXC",I),D),":first-child"),E=a.insert(()=>(Y.debug("Rough node insert CXC",I),I),":first-child")}else E=s.insert("rect",":first-child"),L=s.insert("line"),E.attr("class","outer title-state").attr("style",n).attr("x",-d.width/2-x).attr("y",-d.height/2-x).attr("width",d.width+(e.padding||0)).attr("height",d.height+(e.padding||0)),L.attr("class","divider").attr("x1",-d.width/2-x).attr("x2",d.width/2+x).attr("y1",-d.height/2-x+m.height+x).attr("y2",-d.height/2-x+m.height+x);return Qe(e,E),e.intersect=function(C){return qe.rect(e,C)},a}var oQ=M(()=>{"use strict";mr();fr();Ft();I5();qt();Xt();jt();Vt();zh();ht();o(sQ,"rectWithTitle")});async function lQ(t,e){let r={rx:5,ry:5,classes:"",labelPaddingX:(e?.padding||0)*1,labelPaddingY:(e?.padding||0)*1};return Cd(t,e,r)}var cQ=M(()=>{"use strict";vv();o(lQ,"roundedRect")});async function uQ(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=e?.padding??0,u=Math.max(a.width+(e.padding??0)*2,e?.width??0),h=Math.max(a.height+(e.padding??0)*2,e?.height??0),f=-a.width/2-l,d=-a.height/2-l,{cssStyles:p}=e,m=Ke.svg(i),g=Ze(e,{});e.look!=="handDrawn"&&(g.roughness=0,g.fillStyle="solid");let y=[{x:f,y:d},{x:f+u+8,y:d},{x:f+u+8,y:d+h},{x:f-8,y:d+h},{x:f-8,y:d},{x:f,y:d},{x:f,y:d+h}],v=m.polygon(y.map(b=>[b.x,b.y]),g),x=i.insert(()=>v,":first-child");return x.attr("class","basic label-container").attr("style",Fn(p)),n&&e.look!=="handDrawn"&&x.selectAll("path").attr("style",n),p&&e.look!=="handDrawn"&&x.selectAll("path").attr("style",n),s.attr("transform",`translate(${-u/2+4+(e.padding??0)-(a.x-(a.left??0))},${-h/2+(e.padding??0)-(a.y-(a.top??0))})`),Qe(e,x),e.intersect=function(b){return qe.rect(e,b)},i}var hQ=M(()=>{"use strict";Ft();qt();Xt();jt();hr();o(uQ,"shadedProcess")});async function fQ(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=Math.max(a.width+(e.padding??0)*2,e?.width??0),u=Math.max(a.height+(e.padding??0)*2,e?.height??0),h=-l/2,f=-u/2,{cssStyles:d}=e,p=Ke.svg(i),m=Ze(e,{});e.look!=="handDrawn"&&(m.roughness=0,m.fillStyle="solid");let g=[{x:h,y:f},{x:h,y:f+u},{x:h+l,y:f+u},{x:h+l,y:f-u/2}],y=Wt(g),v=p.path(y,m),x=i.insert(()=>v,":first-child");return x.attr("class","basic label-container"),d&&e.look!=="handDrawn"&&x.selectChildren("path").attr("style",d),n&&e.look!=="handDrawn"&&x.selectChildren("path").attr("style",n),x.attr("transform",`translate(0, ${u/4})`),s.attr("transform",`translate(${-l/2+(e.padding??0)-(a.x-(a.left??0))}, ${-u/4+(e.padding??0)-(a.y-(a.top??0))})`),Qe(e,x),e.intersect=function(b){return qe.polygon(e,g,b)},i}var dQ=M(()=>{"use strict";Ft();qt();Xt();jt();o(fQ,"slopedRect")});async function pQ(t,e){let r={rx:0,ry:0,classes:"",labelPaddingX:(e?.padding||0)*2,labelPaddingY:(e?.padding||0)*1};return Cd(t,e,r)}var mQ=M(()=>{"use strict";vv();o(pQ,"squareRect")});async function gQ(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a}=await ot(t,e,lt(e)),s=a.height+e.padding,l=a.width+s/4+e.padding,u,{cssStyles:h}=e;if(e.look==="handDrawn"){let f=Ke.svg(i),d=Ze(e,{}),p=La(-l/2,-s/2,l,s,s/2),m=f.path(p,d);u=i.insert(()=>m,":first-child"),u.attr("class","basic label-container").attr("style",Fn(h))}else u=i.insert("rect",":first-child"),u.attr("class","basic label-container").attr("style",n).attr("rx",s/2).attr("ry",s/2).attr("x",-l/2).attr("y",-s/2).attr("width",l).attr("height",s);return Qe(e,u),e.intersect=function(f){return qe.rect(e,f)},i}var yQ=M(()=>{"use strict";Ft();qt();Xt();jt();zh();hr();o(gQ,"stadium")});async function vQ(t,e){return Cd(t,e,{rx:5,ry:5,classes:"flowchart-node"})}var xQ=M(()=>{"use strict";vv();o(vQ,"state")});function bQ(t,e,{config:{themeVariables:r}}){let{labelStyles:n,nodeStyles:i}=et(e);e.labelStyle=n;let{cssStyles:a}=e,{lineColor:s,stateBorder:l,nodeBorder:u}=r,h=t.insert("g").attr("class","node default").attr("id",e.domId||e.id),f=Ke.svg(h),d=Ze(e,{});e.look!=="handDrawn"&&(d.roughness=0,d.fillStyle="solid");let p=f.circle(0,0,14,{...d,stroke:s,strokeWidth:2}),m=l??u,g=f.circle(0,0,5,{...d,fill:m,stroke:m,strokeWidth:2,fillStyle:"solid"}),y=h.insert(()=>p,":first-child");return y.insert(()=>g),a&&y.selectAll("path").attr("style",a),i&&y.selectAll("path").attr("style",i),Qe(e,y),e.intersect=function(v){return qe.circle(e,7,v)},h}var wQ=M(()=>{"use strict";jt();qt();Xt();Ft();o(bQ,"stateEnd")});function TQ(t,e,{config:{themeVariables:r}}){let{lineColor:n}=r,i=t.insert("g").attr("class","node default").attr("id",e.domId||e.id),a;if(e.look==="handDrawn"){let l=Ke.svg(i).circle(0,0,14,Cj(n));a=i.insert(()=>l),a.attr("class","state-start").attr("r",7).attr("width",14).attr("height",14)}else a=i.insert("circle",":first-child"),a.attr("class","state-start").attr("r",7).attr("width",14).attr("height",14);return Qe(e,a),e.intersect=function(s){return qe.circle(e,7,s)},i}var kQ=M(()=>{"use strict";jt();qt();Xt();Ft();o(TQ,"stateStart")});async function EQ(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a}=await ot(t,e,lt(e)),s=(e?.padding||0)/2,l=a.width+e.padding,u=a.height+e.padding,h=-a.width/2-s,f=-a.height/2-s,d=[{x:0,y:0},{x:l,y:0},{x:l,y:-u},{x:0,y:-u},{x:0,y:0},{x:-8,y:0},{x:l+8,y:0},{x:l+8,y:-u},{x:-8,y:-u},{x:-8,y:0}];if(e.look==="handDrawn"){let p=Ke.svg(i),m=Ze(e,{}),g=p.rectangle(h-8,f,l+16,u,m),y=p.line(h,f,h,f+u,m),v=p.line(h+l,f,h+l,f+u,m);i.insert(()=>y,":first-child"),i.insert(()=>v,":first-child");let x=i.insert(()=>g,":first-child"),{cssStyles:b}=e;x.attr("class","basic label-container").attr("style",Fn(b)),Qe(e,x)}else{let p=Aa(i,l,u,d);n&&p.attr("style",n),Qe(e,p)}return e.intersect=function(p){return qe.polygon(e,d,p)},i}var SQ=M(()=>{"use strict";Ft();qt();Xt();jt();Su();hr();o(EQ,"subroutine")});async function CQ(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a}=await ot(t,e,lt(e)),s=Math.max(a.width+(e.padding??0)*2,e?.width??0),l=Math.max(a.height+(e.padding??0)*2,e?.height??0),u=-s/2,h=-l/2,f=.2*l,d=.2*l,{cssStyles:p}=e,m=Ke.svg(i),g=Ze(e,{}),y=[{x:u-f/2,y:h},{x:u+s+f/2,y:h},{x:u+s+f/2,y:h+l},{x:u-f/2,y:h+l}],v=[{x:u+s-f/2,y:h+l},{x:u+s+f/2,y:h+l},{x:u+s+f/2,y:h+l-d}];e.look!=="handDrawn"&&(g.roughness=0,g.fillStyle="solid");let x=Wt(y),b=m.path(x,g),w=Wt(v),_=m.path(w,{...g,fillStyle:"solid"}),T=i.insert(()=>_,":first-child");return T.insert(()=>b,":first-child"),T.attr("class","basic label-container"),p&&e.look!=="handDrawn"&&T.selectAll("path").attr("style",p),n&&e.look!=="handDrawn"&&T.selectAll("path").attr("style",n),Qe(e,T),e.intersect=function(E){return qe.polygon(e,y,E)},i}var AQ=M(()=>{"use strict";Ft();Xt();jt();qt();o(CQ,"taggedRect")});async function _Q(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=Math.max(a.width+(e.padding??0)*2,e?.width??0),u=Math.max(a.height+(e.padding??0)*2,e?.height??0),h=u/4,f=.2*l,d=.2*u,p=u+h,{cssStyles:m}=e,g=Ke.svg(i),y=Ze(e,{});e.look!=="handDrawn"&&(y.roughness=0,y.fillStyle="solid");let v=[{x:-l/2-l/2*.1,y:p/2},...zo(-l/2-l/2*.1,p/2,l/2+l/2*.1,p/2,h,.8),{x:l/2+l/2*.1,y:-p/2},{x:-l/2-l/2*.1,y:-p/2}],x=-l/2+l/2*.1,b=-p/2-d*.4,w=[{x:x+l-f,y:(b+u)*1.4},{x:x+l,y:b+u-d},{x:x+l,y:(b+u)*.9},...zo(x+l,(b+u)*1.3,x+l-f,(b+u)*1.5,-u*.03,.5)],_=Wt(v),T=g.path(_,y),E=Wt(w),L=g.path(E,{...y,fillStyle:"solid"}),C=i.insert(()=>L,":first-child");return C.insert(()=>T,":first-child"),C.attr("class","basic label-container"),m&&e.look!=="handDrawn"&&C.selectAll("path").attr("style",m),n&&e.look!=="handDrawn"&&C.selectAll("path").attr("style",n),C.attr("transform",`translate(0,${-h/2})`),s.attr("transform",`translate(${-l/2+(e.padding??0)-(a.x-(a.left??0))},${-u/2+(e.padding??0)-h/2-(a.y-(a.top??0))})`),Qe(e,C),e.intersect=function(A){return qe.polygon(e,v,A)},i}var LQ=M(()=>{"use strict";Ft();qt();jt();Xt();o(_Q,"taggedWaveEdgedRectangle")});async function DQ(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a}=await ot(t,e,lt(e)),s=Math.max(a.width+e.padding,e?.width||0),l=Math.max(a.height+e.padding,e?.height||0),u=-s/2,h=-l/2,f=i.insert("rect",":first-child");return f.attr("class","text").attr("style",n).attr("rx",0).attr("ry",0).attr("x",u).attr("y",h).attr("width",s).attr("height",l),Qe(e,f),e.intersect=function(d){return qe.rect(e,d)},i}var NQ=M(()=>{"use strict";Ft();qt();Xt();o(DQ,"text")});async function RQ(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s,halfPadding:l}=await ot(t,e,lt(e)),u=e.look==="neo"?l*2:l,h=a.height+u,f=h/2,d=f/(2.5+h/50),p=a.width+d+u,{cssStyles:m}=e,g;if(e.look==="handDrawn"){let y=Ke.svg(i),v=kAe(0,0,p,h,d,f),x=EAe(0,0,p,h,d,f),b=y.path(v,Ze(e,{})),w=y.path(x,Ze(e,{fill:"none"}));g=i.insert(()=>w,":first-child"),g=i.insert(()=>b,":first-child"),g.attr("class","basic label-container"),m&&g.attr("style",m)}else{let y=TAe(0,0,p,h,d,f);g=i.insert("path",":first-child").attr("d",y).attr("class","basic label-container").attr("style",Fn(m)).attr("style",n),g.attr("class","basic label-container"),m&&g.selectAll("path").attr("style",m),n&&g.selectAll("path").attr("style",n)}return g.attr("label-offset-x",d),g.attr("transform",`translate(${-p/2}, ${h/2} )`),s.attr("transform",`translate(${-(a.width/2)-d-(a.x-(a.left??0))}, ${-(a.height/2)-(a.y-(a.top??0))})`),Qe(e,g),e.intersect=function(y){let v=qe.rect(e,y),x=v.y-(e.y??0);if(f!=0&&(Math.abs(x)<(e.height??0)/2||Math.abs(x)==(e.height??0)/2&&Math.abs(v.x-(e.x??0))>(e.width??0)/2-d)){let b=d*d*(1-x*x/(f*f));b!=0&&(b=Math.sqrt(Math.abs(b))),b=d-b,y.x-(e.x??0)>0&&(b=-b),v.x+=b}return v},i}var TAe,kAe,EAe,MQ=M(()=>{"use strict";Ft();Xt();jt();qt();hr();TAe=o((t,e,r,n,i,a)=>`M${t},${e} + a${i},${a} 0,0,1 0,${-n} + l${r},0 + a${i},${a} 0,0,1 0,${n} + M${r},${-n} + a${i},${a} 0,0,0 0,${n} + l${-r},0`,"createCylinderPathD"),kAe=o((t,e,r,n,i,a)=>[`M${t},${e}`,`M${t+r},${e}`,`a${i},${a} 0,0,0 0,${-n}`,`l${-r},0`,`a${i},${a} 0,0,0 0,${n}`,`l${r},0`].join(" "),"createOuterCylinderPathD"),EAe=o((t,e,r,n,i,a)=>[`M${t+r/2},${-n/2}`,`a${i},${a} 0,0,0 0,${n}`].join(" "),"createInnerCylinderPathD");o(RQ,"tiltedCylinder")});async function IQ(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a}=await ot(t,e,lt(e)),s=a.width+e.padding,l=a.height+e.padding,u=[{x:-3*l/6,y:0},{x:s+3*l/6,y:0},{x:s,y:-l},{x:0,y:-l}],h,{cssStyles:f}=e;if(e.look==="handDrawn"){let d=Ke.svg(i),p=Ze(e,{}),m=Wt(u),g=d.path(m,p);h=i.insert(()=>g,":first-child").attr("transform",`translate(${-s/2}, ${l/2})`),f&&h.attr("style",f)}else h=Aa(i,s,l,u);return n&&h.attr("style",n),e.width=s,e.height=l,Qe(e,h),e.intersect=function(d){return qe.polygon(e,u,d)},i}var OQ=M(()=>{"use strict";Ft();qt();Xt();jt();Su();o(IQ,"trapezoid")});async function PQ(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a}=await ot(t,e,lt(e)),s=60,l=20,u=Math.max(s,a.width+(e.padding??0)*2,e?.width??0),h=Math.max(l,a.height+(e.padding??0)*2,e?.height??0),{cssStyles:f}=e,d=Ke.svg(i),p=Ze(e,{});e.look!=="handDrawn"&&(p.roughness=0,p.fillStyle="solid");let m=[{x:-u/2*.8,y:-h/2},{x:u/2*.8,y:-h/2},{x:u/2,y:-h/2*.6},{x:u/2,y:h/2},{x:-u/2,y:h/2},{x:-u/2,y:-h/2*.6}],g=Wt(m),y=d.path(g,p),v=i.insert(()=>y,":first-child");return v.attr("class","basic label-container"),f&&e.look!=="handDrawn"&&v.selectChildren("path").attr("style",f),n&&e.look!=="handDrawn"&&v.selectChildren("path").attr("style",n),Qe(e,v),e.intersect=function(x){return qe.polygon(e,m,x)},i}var BQ=M(()=>{"use strict";Ft();qt();Xt();jt();o(PQ,"trapezoidalPentagon")});async function FQ(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=xr(de().flowchart?.htmlLabels),u=a.width+(e.padding??0),h=u+a.height,f=u+a.height,d=[{x:0,y:0},{x:f,y:0},{x:f/2,y:-h}],{cssStyles:p}=e,m=Ke.svg(i),g=Ze(e,{});e.look!=="handDrawn"&&(g.roughness=0,g.fillStyle="solid");let y=Wt(d),v=m.path(y,g),x=i.insert(()=>v,":first-child").attr("transform",`translate(${-h/2}, ${h/2})`);return p&&e.look!=="handDrawn"&&x.selectChildren("path").attr("style",p),n&&e.look!=="handDrawn"&&x.selectChildren("path").attr("style",n),e.width=u,e.height=h,Qe(e,x),s.attr("transform",`translate(${-a.width/2-(a.x-(a.left??0))}, ${h/2-(a.height+(e.padding??0)/(l?2:1)-(a.y-(a.top??0)))})`),e.intersect=function(b){return Y.info("Triangle intersect",e,d,b),qe.polygon(e,d,b)},i}var zQ=M(()=>{"use strict";ht();Ft();qt();Xt();jt();Ft();fr();Vt();o(FQ,"triangle")});async function GQ(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=Math.max(a.width+(e.padding??0)*2,e?.width??0),u=Math.max(a.height+(e.padding??0)*2,e?.height??0),h=u/8,f=u+h,{cssStyles:d}=e,m=70-l,g=m>0?m/2:0,y=Ke.svg(i),v=Ze(e,{});e.look!=="handDrawn"&&(v.roughness=0,v.fillStyle="solid");let x=[{x:-l/2-g,y:f/2},...zo(-l/2-g,f/2,l/2+g,f/2,h,.8),{x:l/2+g,y:-f/2},{x:-l/2-g,y:-f/2}],b=Wt(x),w=y.path(b,v),_=i.insert(()=>w,":first-child");return _.attr("class","basic label-container"),d&&e.look!=="handDrawn"&&_.selectAll("path").attr("style",d),n&&e.look!=="handDrawn"&&_.selectAll("path").attr("style",n),_.attr("transform",`translate(0,${-h/2})`),s.attr("transform",`translate(${-l/2+(e.padding??0)-(a.x-(a.left??0))},${-u/2+(e.padding??0)-h-(a.y-(a.top??0))})`),Qe(e,_),e.intersect=function(T){return qe.polygon(e,x,T)},i}var $Q=M(()=>{"use strict";Ft();qt();jt();Xt();o(GQ,"waveEdgedRectangle")});async function VQ(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a}=await ot(t,e,lt(e)),s=100,l=50,u=Math.max(a.width+(e.padding??0)*2,e?.width??0),h=Math.max(a.height+(e.padding??0)*2,e?.height??0),f=u/h,d=u,p=h;d>p*f?p=d/f:d=p*f,d=Math.max(d,s),p=Math.max(p,l);let m=Math.min(p*.2,p/4),g=p+m*2,{cssStyles:y}=e,v=Ke.svg(i),x=Ze(e,{});e.look!=="handDrawn"&&(x.roughness=0,x.fillStyle="solid");let b=[{x:-d/2,y:g/2},...zo(-d/2,g/2,d/2,g/2,m,1),{x:d/2,y:-g/2},...zo(d/2,-g/2,-d/2,-g/2,m,-1)],w=Wt(b),_=v.path(w,x),T=i.insert(()=>_,":first-child");return T.attr("class","basic label-container"),y&&e.look!=="handDrawn"&&T.selectAll("path").attr("style",y),n&&e.look!=="handDrawn"&&T.selectAll("path").attr("style",n),Qe(e,T),e.intersect=function(E){return qe.polygon(e,b,E)},i}var UQ=M(()=>{"use strict";Ft();qt();Xt();jt();o(VQ,"waveRectangle")});async function HQ(t,e){let{labelStyles:r,nodeStyles:n}=et(e);e.labelStyle=r;let{shapeSvg:i,bbox:a,label:s}=await ot(t,e,lt(e)),l=Math.max(a.width+(e.padding??0)*2,e?.width??0),u=Math.max(a.height+(e.padding??0)*2,e?.height??0),h=5,f=-l/2,d=-u/2,{cssStyles:p}=e,m=Ke.svg(i),g=Ze(e,{}),y=[{x:f-h,y:d-h},{x:f-h,y:d+u},{x:f+l,y:d+u},{x:f+l,y:d-h}],v=`M${f-h},${d-h} L${f+l},${d-h} L${f+l},${d+u} L${f-h},${d+u} L${f-h},${d-h} + M${f-h},${d} L${f+l},${d} + M${f},${d-h} L${f},${d+u}`;e.look!=="handDrawn"&&(g.roughness=0,g.fillStyle="solid");let x=m.path(v,g),b=i.insert(()=>x,":first-child");return b.attr("transform",`translate(${h/2}, ${h/2})`),b.attr("class","basic label-container"),p&&e.look!=="handDrawn"&&b.selectAll("path").attr("style",p),n&&e.look!=="handDrawn"&&b.selectAll("path").attr("style",n),s.attr("transform",`translate(${-(a.width/2)+h/2-(a.x-(a.left??0))}, ${-(a.height/2)+h/2-(a.y-(a.top??0))})`),Qe(e,b),e.intersect=function(w){return qe.polygon(e,y,w)},i}var WQ=M(()=>{"use strict";Ft();Xt();jt();qt();o(HQ,"windowPane")});async function YQ(t,e,r,n,i=r.class.padding??12){let a=n?0:3,s=t.insert("g").attr("class",lt(e)).attr("id",e.domId||e.id),l=null,u=null,h=null,f=null,d=0,p=0,m=0;if(l=s.insert("g").attr("class","annotation-group text"),e.annotations.length>0){let b=e.annotations[0];await O5(l,{text:`\xAB${b}\xBB`},0),d=l.node().getBBox().height}u=s.insert("g").attr("class","label-group text"),await O5(u,e,0,["font-weight: bolder"]);let g=u.node().getBBox();p=g.height,h=s.insert("g").attr("class","members-group text");let y=0;for(let b of e.members){let w=await O5(h,b,y,[b.parseClassifier()]);y+=w+a}m=h.node().getBBox().height,m<=0&&(m=i/2),f=s.insert("g").attr("class","methods-group text");let v=0;for(let b of e.methods){let w=await O5(f,b,v,[b.parseClassifier()]);v+=w+a}let x=s.node().getBBox();if(l!==null){let b=l.node().getBBox();l.attr("transform",`translate(${-b.width/2})`)}return u.attr("transform",`translate(${-g.width/2}, ${d})`),x=s.node().getBBox(),h.attr("transform",`translate(0, ${d+p+i*2})`),x=s.node().getBBox(),f.attr("transform",`translate(0, ${d+p+(m?m+i*4:i*2)})`),x=s.node().getBBox(),{shapeSvg:s,bbox:x}}async function O5(t,e,r,n=[]){let i=t.insert("g").attr("class","label").attr("style",n.join("; ")),a=Sr(),s="useHtmlLabels"in e?e.useHtmlLabels:xr(a.htmlLabels)??!0,l="";"text"in e?l=e.text:l=e.label,!s&&l.startsWith("\\")&&(l=l.substring(1)),pi(l)&&(s=!0);let u=await Si(i,i7(Ca(l)),{width:Js(l,a)+50,classes:"markdown-node-label",useHtmlLabels:s},a),h,f=1;if(s){let d=u.children[0],p=ze(u);f=d.innerHTML.split("<br>").length,d.innerHTML.includes("</math>")&&(f+=d.innerHTML.split("<mrow>").length-1);let m=d.getElementsByTagName("img");if(m){let g=l.replace(/<img[^>]*>/g,"").trim()==="";await Promise.all([...m].map(y=>new Promise(v=>{function x(){if(y.style.display="flex",y.style.flexDirection="column",g){let b=a.fontSize?.toString()??window.getComputedStyle(document.body).fontSize,_=parseInt(b,10)*5+"px";y.style.minWidth=_,y.style.maxWidth=_}else y.style.width="100%";v(y)}o(x,"setupImage"),setTimeout(()=>{y.complete&&x()}),y.addEventListener("error",x),y.addEventListener("load",x)})))}h=d.getBoundingClientRect(),p.attr("width",h.width),p.attr("height",h.height)}else{n.includes("font-weight: bolder")&&ze(u).selectAll("tspan").attr("font-weight",""),f=u.children.length;let d=u.children[0];(u.textContent===""||u.textContent.includes(">"))&&(d.textContent=l[0]+l.substring(1).replaceAll(">",">").replaceAll("<","<").trim(),l[1]===" "&&(d.textContent=d.textContent[0]+" "+d.textContent.substring(1))),d.textContent==="undefined"&&(d.textContent=""),h=u.getBBox()}return i.attr("transform","translate(0,"+(-h.height/(2*f)+r)+")"),h.height}var qQ=M(()=>{"use strict";mr();Ua();Ft();hr();Vt();Dl();fr();o(YQ,"textHelper");o(O5,"addText")});async function XQ(t,e){let r=de(),n=r.class.padding??12,i=n,a=e.useHtmlLabels??xr(r.htmlLabels)??!0,s=e;s.annotations=s.annotations??[],s.members=s.members??[],s.methods=s.methods??[];let{shapeSvg:l,bbox:u}=await YQ(t,e,r,a,i),{labelStyles:h,nodeStyles:f}=et(e);e.labelStyle=h,e.cssStyles=s.styles||"";let d=s.styles?.join(";")||f||"";e.cssStyles||(e.cssStyles=d.replaceAll("!important","").split(";"));let p=s.members.length===0&&s.methods.length===0&&!r.class?.hideEmptyMembersBox,m=Ke.svg(l),g=Ze(e,{});e.look!=="handDrawn"&&(g.roughness=0,g.fillStyle="solid");let y=u.width,v=u.height;s.members.length===0&&s.methods.length===0?v+=i:s.members.length>0&&s.methods.length===0&&(v+=i*2);let x=-y/2,b=-v/2,w=m.rectangle(x-n,b-n-(p?n:s.members.length===0&&s.methods.length===0?-n/2:0),y+2*n,v+2*n+(p?n*2:s.members.length===0&&s.methods.length===0?-n:0),g),_=l.insert(()=>w,":first-child");_.attr("class","basic label-container");let T=_.node().getBBox();l.selectAll(".text").each((A,I,D)=>{let k=ze(D[I]),R=k.attr("transform"),S=0;if(R){let F=RegExp(/translate\(([^,]+),([^)]+)\)/).exec(R);F&&(S=parseFloat(F[2]))}let O=S+b+n-(p?n:s.members.length===0&&s.methods.length===0?-n/2:0);a||(O-=4);let N=x;(k.attr("class").includes("label-group")||k.attr("class").includes("annotation-group"))&&(N=-k.node()?.getBBox().width/2||0,l.selectAll("text").each(function(P,F,B){window.getComputedStyle(B[F]).textAnchor==="middle"&&(N=0)})),k.attr("transform",`translate(${N}, ${O})`)});let E=l.select(".annotation-group").node().getBBox().height-(p?n/2:0)||0,L=l.select(".label-group").node().getBBox().height-(p?n/2:0)||0,C=l.select(".members-group").node().getBBox().height-(p?n/2:0)||0;if(s.members.length>0||s.methods.length>0||p){let A=m.line(T.x,E+L+b+n,T.x+T.width,E+L+b+n,g);l.insert(()=>A).attr("class","divider").attr("style",d)}if(p||s.members.length>0||s.methods.length>0){let A=m.line(T.x,E+L+C+b+i*2+n,T.x+T.width,E+L+C+b+n+i*2,g);l.insert(()=>A).attr("class","divider").attr("style",d)}if(s.look!=="handDrawn"&&l.selectAll("path").attr("style",d),_.select(":nth-child(2)").attr("style",d),l.selectAll(".divider").select("path").attr("style",d),e.labelStyle?l.selectAll("span").attr("style",e.labelStyle):l.selectAll("span").attr("style",d),!a){let A=RegExp(/color\s*:\s*([^;]*)/),I=A.exec(d);if(I){let D=I[0].replace("color","fill");l.selectAll("tspan").attr("style",D)}else if(h){let D=A.exec(h);if(D){let k=D[0].replace("color","fill");l.selectAll("tspan").attr("style",k)}}}return Qe(e,_),e.intersect=function(A){return qe.rect(e,A)},l}var jQ=M(()=>{"use strict";Ft();Vt();mr();jt();Xt();qt();qQ();fr();o(XQ,"classBox")});async function KQ(t,e,{config:r}){let{labelStyles:n,nodeStyles:i}=et(e);e.labelStyle=n||"";let a=10,s=e.width;e.width=(e.width??200)-10;let{shapeSvg:l,bbox:u,label:h}=await ot(t,e,lt(e)),f=e.padding||10,d="",p;"ticket"in e&&e.ticket&&r?.kanban?.ticketBaseUrl&&(d=r?.kanban?.ticketBaseUrl.replace("#TICKET#",e.ticket),p=l.insert("svg:a",":first-child").attr("class","kanban-ticket-link").attr("xlink:href",d).attr("target","_blank"));let m={useHtmlLabels:e.useHtmlLabels,labelStyle:e.labelStyle||"",width:e.width,img:e.img,padding:e.padding||8,centerLabel:!1},g,y;p?{label:g,bbox:y}=await T5(p,"ticket"in e&&e.ticket||"",m):{label:g,bbox:y}=await T5(l,"ticket"in e&&e.ticket||"",m);let{label:v,bbox:x}=await T5(l,"assigned"in e&&e.assigned||"",m);e.width=s;let b=10,w=e?.width||0,_=Math.max(y.height,x.height)/2,T=Math.max(u.height+b*2,e?.height||0)+_,E=-w/2,L=-T/2;h.attr("transform","translate("+(f-w/2)+", "+(-_-u.height/2)+")"),g.attr("transform","translate("+(f-w/2)+", "+(-_+u.height/2)+")"),v.attr("transform","translate("+(f+w/2-x.width-2*a)+", "+(-_+u.height/2)+")");let C,{rx:A,ry:I}=e,{cssStyles:D}=e;if(e.look==="handDrawn"){let k=Ke.svg(l),R=Ze(e,{}),S=A||I?k.path(La(E,L,w,T,A||0),R):k.rectangle(E,L,w,T,R);C=l.insert(()=>S,":first-child"),C.attr("class","basic label-container").attr("style",D||null)}else{C=l.insert("rect",":first-child"),C.attr("class","basic label-container __APA__").attr("style",i).attr("rx",A??5).attr("ry",I??5).attr("x",E).attr("y",L).attr("width",w).attr("height",T);let k="priority"in e&&e.priority;if(k){let R=l.append("line"),S=E+2,O=L+Math.floor((A??0)/2),N=L+T-Math.floor((A??0)/2);R.attr("x1",S).attr("y1",O).attr("x2",S).attr("y2",N).attr("stroke-width","4").attr("stroke",SAe(k))}}return Qe(e,C),e.height=T,e.intersect=function(k){return qe.rect(e,k)},l}var SAe,QQ=M(()=>{"use strict";Ft();qt();zh();Xt();jt();SAe=o(t=>{switch(t){case"Very High":return"red";case"High":return"orange";case"Medium":return null;case"Low":return"blue";case"Very Low":return"lightblue"}},"colorFromPriority");o(KQ,"kanbanItem")});function ZQ(t){return t in z9}var CAe,AAe,z9,G9=M(()=>{"use strict";Vj();Wj();qj();jj();Qj();Jj();tK();nK();aK();oK();cK();hK();dK();mK();yK();xK();wK();kK();SK();AK();LK();NK();MK();OK();BK();zK();$K();UK();WK();qK();jK();QK();JK();tQ();nQ();aQ();oQ();cQ();hQ();dQ();mQ();yQ();xQ();wQ();kQ();SQ();AQ();LQ();NQ();MQ();OQ();BQ();zQ();$Q();UQ();WQ();jQ();QQ();CAe=[{semanticName:"Process",name:"Rectangle",shortName:"rect",description:"Standard process shape",aliases:["proc","process","rectangle"],internalAliases:["squareRect"],handler:pQ},{semanticName:"Event",name:"Rounded Rectangle",shortName:"rounded",description:"Represents an event",aliases:["event"],internalAliases:["roundedRect"],handler:lQ},{semanticName:"Terminal Point",name:"Stadium",shortName:"stadium",description:"Terminal point",aliases:["terminal","pill"],handler:gQ},{semanticName:"Subprocess",name:"Framed Rectangle",shortName:"fr-rect",description:"Subprocess",aliases:["subprocess","subproc","framed-rectangle","subroutine"],handler:EQ},{semanticName:"Database",name:"Cylinder",shortName:"cyl",description:"Database storage",aliases:["db","database","cylinder"],handler:lK},{semanticName:"Start",name:"Circle",shortName:"circle",description:"Starting point",aliases:["circ"],handler:Kj},{semanticName:"Decision",name:"Diamond",shortName:"diam",description:"Decision-making step",aliases:["decision","diamond","question"],handler:rQ},{semanticName:"Prepare Conditional",name:"Hexagon",shortName:"hex",description:"Preparation or condition step",aliases:["hexagon","prepare"],handler:TK},{semanticName:"Data Input/Output",name:"Lean Right",shortName:"lean-r",description:"Represents input or output",aliases:["lean-right","in-out"],internalAliases:["lean_right"],handler:VK},{semanticName:"Data Input/Output",name:"Lean Left",shortName:"lean-l",description:"Represents output or input",aliases:["lean-left","out-in"],internalAliases:["lean_left"],handler:GK},{semanticName:"Priority Action",name:"Trapezoid Base Bottom",shortName:"trap-b",description:"Priority action",aliases:["priority","trapezoid-bottom","trapezoid"],handler:IQ},{semanticName:"Manual Operation",name:"Trapezoid Base Top",shortName:"trap-t",description:"Represents a manual task",aliases:["manual","trapezoid-top","inv-trapezoid"],internalAliases:["inv_trapezoid"],handler:PK},{semanticName:"Stop",name:"Double Circle",shortName:"dbl-circ",description:"Represents a stop point",aliases:["double-circle"],internalAliases:["doublecircle"],handler:fK},{semanticName:"Text Block",name:"Text Block",shortName:"text",description:"Text block",handler:DQ},{semanticName:"Card",name:"Notched Rectangle",shortName:"notch-rect",description:"Represents a card",aliases:["card","notched-rectangle"],handler:Yj},{semanticName:"Lined/Shaded Process",name:"Lined Rectangle",shortName:"lin-rect",description:"Lined process shape",aliases:["lined-rectangle","lined-process","lin-proc","shaded-process"],handler:uQ},{semanticName:"Start",name:"Small Circle",shortName:"sm-circ",description:"Small starting point",aliases:["start","small-circle"],internalAliases:["stateStart"],handler:TQ},{semanticName:"Stop",name:"Framed Circle",shortName:"fr-circ",description:"Stop point",aliases:["stop","framed-circle"],internalAliases:["stateEnd"],handler:bQ},{semanticName:"Fork/Join",name:"Filled Rectangle",shortName:"fork",description:"Fork or join in process flow",aliases:["join"],internalAliases:["forkJoin"],handler:vK},{semanticName:"Collate",name:"Hourglass",shortName:"hourglass",description:"Represents a collate operation",aliases:["hourglass","collate"],handler:EK},{semanticName:"Comment",name:"Curly Brace",shortName:"brace",description:"Adds a comment",aliases:["comment","brace-l"],handler:eK},{semanticName:"Comment Right",name:"Curly Brace",shortName:"brace-r",description:"Adds a comment",handler:rK},{semanticName:"Comment with braces on both sides",name:"Curly Braces",shortName:"braces",description:"Adds a comment",handler:iK},{semanticName:"Com Link",name:"Lightning Bolt",shortName:"bolt",description:"Communication link",aliases:["com-link","lightning-bolt"],handler:HK},{semanticName:"Document",name:"Document",shortName:"doc",description:"Represents a document",aliases:["doc","document"],handler:GQ},{semanticName:"Delay",name:"Half-Rounded Rectangle",shortName:"delay",description:"Represents a delay",aliases:["half-rounded-rectangle"],handler:bK},{semanticName:"Direct Access Storage",name:"Horizontal Cylinder",shortName:"h-cyl",description:"Direct access storage",aliases:["das","horizontal-cylinder"],handler:RQ},{semanticName:"Disk Storage",name:"Lined Cylinder",shortName:"lin-cyl",description:"Disk storage",aliases:["disk","lined-cylinder"],handler:YK},{semanticName:"Display",name:"Curved Trapezoid",shortName:"curv-trap",description:"Represents a display",aliases:["curved-trapezoid","display"],handler:sK},{semanticName:"Divided Process",name:"Divided Rectangle",shortName:"div-rect",description:"Divided process shape",aliases:["div-proc","divided-rectangle","divided-process"],handler:uK},{semanticName:"Extract",name:"Triangle",shortName:"tri",description:"Extraction process",aliases:["extract","triangle"],handler:FQ},{semanticName:"Internal Storage",name:"Window Pane",shortName:"win-pane",description:"Internal storage",aliases:["internal-storage","window-pane"],handler:HQ},{semanticName:"Junction",name:"Filled Circle",shortName:"f-circ",description:"Junction point",aliases:["junction","filled-circle"],handler:pK},{semanticName:"Loop Limit",name:"Trapezoidal Pentagon",shortName:"notch-pent",description:"Loop limit step",aliases:["loop-limit","notched-pentagon"],handler:PQ},{semanticName:"Manual File",name:"Flipped Triangle",shortName:"flip-tri",description:"Manual file operation",aliases:["manual-file","flipped-triangle"],handler:gK},{semanticName:"Manual Input",name:"Sloped Rectangle",shortName:"sl-rect",description:"Manual input step",aliases:["manual-input","sloped-rectangle"],handler:fQ},{semanticName:"Multi-Document",name:"Stacked Document",shortName:"docs",description:"Multiple documents",aliases:["documents","st-doc","stacked-document"],handler:ZK},{semanticName:"Multi-Process",name:"Stacked Rectangle",shortName:"st-rect",description:"Multiple processes",aliases:["procs","processes","stacked-rectangle"],handler:KK},{semanticName:"Stored Data",name:"Bow Tie Rectangle",shortName:"bow-rect",description:"Stored data",aliases:["stored-data","bow-tie-rectangle"],handler:Hj},{semanticName:"Summary",name:"Crossed Circle",shortName:"cross-circ",description:"Summary",aliases:["summary","crossed-circle"],handler:Zj},{semanticName:"Tagged Document",name:"Tagged Document",shortName:"tag-doc",description:"Tagged document",aliases:["tag-doc","tagged-document"],handler:_Q},{semanticName:"Tagged Process",name:"Tagged Rectangle",shortName:"tag-rect",description:"Tagged process",aliases:["tagged-rectangle","tag-proc","tagged-process"],handler:CQ},{semanticName:"Paper Tape",name:"Flag",shortName:"flag",description:"Paper tape",aliases:["paper-tape"],handler:VQ},{semanticName:"Odd",name:"Odd",shortName:"odd",description:"Odd shape",internalAliases:["rect_left_inv_arrow"],handler:iQ},{semanticName:"Lined Document",name:"Lined Document",shortName:"lin-doc",description:"Lined document",aliases:["lined-document"],handler:XK}],AAe=o(()=>{let e=[...Object.entries({state:vQ,choice:Xj,note:eQ,rectWithTitle:sQ,labelRect:FK,iconSquare:RK,iconCircle:_K,icon:CK,iconRounded:DK,imageSquare:IK,anchor:$j,kanbanItem:KQ,classBox:XQ}),...CAe.flatMap(r=>[r.shortName,..."aliases"in r?r.aliases:[],..."internalAliases"in r?r.internalAliases:[]].map(i=>[i,r.handler]))];return Object.fromEntries(e)},"generateShapeMap"),z9=AAe();o(ZQ,"isValidShape")});function pZ(t){return typeof t>"u"||t===null}function _Ae(t){return typeof t=="object"&&t!==null}function LAe(t){return Array.isArray(t)?t:pZ(t)?[]:[t]}function DAe(t,e){var r,n,i,a;if(e)for(a=Object.keys(e),r=0,n=a.length;r<n;r+=1)i=a[r],t[i]=e[i];return t}function NAe(t,e){var r="",n;for(n=0;n<e;n+=1)r+=t;return r}function RAe(t){return t===0&&Number.NEGATIVE_INFINITY===1/t}function mZ(t,e){var r="",n=t.reason||"(unknown reason)";return t.mark?(t.mark.name&&(r+='in "'+t.mark.name+'" '),r+="("+(t.mark.line+1)+":"+(t.mark.column+1)+")",!e&&t.mark.snippet&&(r+=` + +`+t.mark.snippet),n+" "+r):n}function bv(t,e){Error.call(this),this.name="YAMLException",this.reason=t,this.mark=e,this.message=mZ(this,!1),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=new Error().stack||""}function $9(t,e,r,n,i){var a="",s="",l=Math.floor(i/2)-1;return n-e>l&&(a=" ... ",e=n-l+a.length),r-n>l&&(s=" ...",r=n+l-s.length),{str:a+t.slice(e,r).replace(/\t/g,"\u2192")+s,pos:n-e+a.length}}function V9(t,e){return Pi.repeat(" ",e-t.length)+t}function zAe(t,e){if(e=Object.create(e||null),!t.buffer)return null;e.maxLength||(e.maxLength=79),typeof e.indent!="number"&&(e.indent=1),typeof e.linesBefore!="number"&&(e.linesBefore=3),typeof e.linesAfter!="number"&&(e.linesAfter=2);for(var r=/\r?\n|\r|\0/g,n=[0],i=[],a,s=-1;a=r.exec(t.buffer);)i.push(a.index),n.push(a.index+a[0].length),t.position<=a.index&&s<0&&(s=n.length-2);s<0&&(s=n.length-1);var l="",u,h,f=Math.min(t.line+e.linesAfter,i.length).toString().length,d=e.maxLength-(e.indent+f+3);for(u=1;u<=e.linesBefore&&!(s-u<0);u++)h=$9(t.buffer,n[s-u],i[s-u],t.position-(n[s]-n[s-u]),d),l=Pi.repeat(" ",e.indent)+V9((t.line-u+1).toString(),f)+" | "+h.str+` +`+l;for(h=$9(t.buffer,n[s],i[s],t.position,d),l+=Pi.repeat(" ",e.indent)+V9((t.line+1).toString(),f)+" | "+h.str+` +`,l+=Pi.repeat("-",e.indent+f+3+h.pos)+`^ +`,u=1;u<=e.linesAfter&&!(s+u>=i.length);u++)h=$9(t.buffer,n[s+u],i[s+u],t.position-(n[s]-n[s+u]),d),l+=Pi.repeat(" ",e.indent)+V9((t.line+u+1).toString(),f)+" | "+h.str+` +`;return l.replace(/\n$/,"")}function UAe(t){var e={};return t!==null&&Object.keys(t).forEach(function(r){t[r].forEach(function(n){e[String(n)]=r})}),e}function HAe(t,e){if(e=e||{},Object.keys(e).forEach(function(r){if($Ae.indexOf(r)===-1)throw new Es('Unknown option "'+r+'" is met in definition of "'+t+'" YAML type.')}),this.options=e,this.tag=t,this.kind=e.kind||null,this.resolve=e.resolve||function(){return!0},this.construct=e.construct||function(r){return r},this.instanceOf=e.instanceOf||null,this.predicate=e.predicate||null,this.represent=e.represent||null,this.representName=e.representName||null,this.defaultStyle=e.defaultStyle||null,this.multi=e.multi||!1,this.styleAliases=UAe(e.styleAliases||null),VAe.indexOf(this.kind)===-1)throw new Es('Unknown kind "'+this.kind+'" is specified for "'+t+'" YAML type.')}function JQ(t,e){var r=[];return t[e].forEach(function(n){var i=r.length;r.forEach(function(a,s){a.tag===n.tag&&a.kind===n.kind&&a.multi===n.multi&&(i=s)}),r[i]=n}),r}function WAe(){var t={scalar:{},sequence:{},mapping:{},fallback:{},multi:{scalar:[],sequence:[],mapping:[],fallback:[]}},e,r;function n(i){i.multi?(t.multi[i.kind].push(i),t.multi.fallback.push(i)):t[i.kind][i.tag]=t.fallback[i.tag]=i}for(o(n,"collectType"),e=0,r=arguments.length;e<r;e+=1)arguments[e].forEach(n);return t}function H9(t){return this.extend(t)}function QAe(t){if(t===null)return!0;var e=t.length;return e===1&&t==="~"||e===4&&(t==="null"||t==="Null"||t==="NULL")}function ZAe(){return null}function JAe(t){return t===null}function t8e(t){if(t===null)return!1;var e=t.length;return e===4&&(t==="true"||t==="True"||t==="TRUE")||e===5&&(t==="false"||t==="False"||t==="FALSE")}function r8e(t){return t==="true"||t==="True"||t==="TRUE"}function n8e(t){return Object.prototype.toString.call(t)==="[object Boolean]"}function a8e(t){return 48<=t&&t<=57||65<=t&&t<=70||97<=t&&t<=102}function s8e(t){return 48<=t&&t<=55}function o8e(t){return 48<=t&&t<=57}function l8e(t){if(t===null)return!1;var e=t.length,r=0,n=!1,i;if(!e)return!1;if(i=t[r],(i==="-"||i==="+")&&(i=t[++r]),i==="0"){if(r+1===e)return!0;if(i=t[++r],i==="b"){for(r++;r<e;r++)if(i=t[r],i!=="_"){if(i!=="0"&&i!=="1")return!1;n=!0}return n&&i!=="_"}if(i==="x"){for(r++;r<e;r++)if(i=t[r],i!=="_"){if(!a8e(t.charCodeAt(r)))return!1;n=!0}return n&&i!=="_"}if(i==="o"){for(r++;r<e;r++)if(i=t[r],i!=="_"){if(!s8e(t.charCodeAt(r)))return!1;n=!0}return n&&i!=="_"}}if(i==="_")return!1;for(;r<e;r++)if(i=t[r],i!=="_"){if(!o8e(t.charCodeAt(r)))return!1;n=!0}return!(!n||i==="_")}function c8e(t){var e=t,r=1,n;if(e.indexOf("_")!==-1&&(e=e.replace(/_/g,"")),n=e[0],(n==="-"||n==="+")&&(n==="-"&&(r=-1),e=e.slice(1),n=e[0]),e==="0")return 0;if(n==="0"){if(e[1]==="b")return r*parseInt(e.slice(2),2);if(e[1]==="x")return r*parseInt(e.slice(2),16);if(e[1]==="o")return r*parseInt(e.slice(2),8)}return r*parseInt(e,10)}function u8e(t){return Object.prototype.toString.call(t)==="[object Number]"&&t%1===0&&!Pi.isNegativeZero(t)}function d8e(t){return!(t===null||!f8e.test(t)||t[t.length-1]==="_")}function p8e(t){var e,r;return e=t.replace(/_/g,"").toLowerCase(),r=e[0]==="-"?-1:1,"+-".indexOf(e[0])>=0&&(e=e.slice(1)),e===".inf"?r===1?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:e===".nan"?NaN:r*parseFloat(e,10)}function g8e(t,e){var r;if(isNaN(t))switch(e){case"lowercase":return".nan";case"uppercase":return".NAN";case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===t)switch(e){case"lowercase":return".inf";case"uppercase":return".INF";case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===t)switch(e){case"lowercase":return"-.inf";case"uppercase":return"-.INF";case"camelcase":return"-.Inf"}else if(Pi.isNegativeZero(t))return"-0.0";return r=t.toString(10),m8e.test(r)?r.replace("e",".e"):r}function y8e(t){return Object.prototype.toString.call(t)==="[object Number]"&&(t%1!==0||Pi.isNegativeZero(t))}function b8e(t){return t===null?!1:yZ.exec(t)!==null||vZ.exec(t)!==null}function w8e(t){var e,r,n,i,a,s,l,u=0,h=null,f,d,p;if(e=yZ.exec(t),e===null&&(e=vZ.exec(t)),e===null)throw new Error("Date resolve error");if(r=+e[1],n=+e[2]-1,i=+e[3],!e[4])return new Date(Date.UTC(r,n,i));if(a=+e[4],s=+e[5],l=+e[6],e[7]){for(u=e[7].slice(0,3);u.length<3;)u+="0";u=+u}return e[9]&&(f=+e[10],d=+(e[11]||0),h=(f*60+d)*6e4,e[9]==="-"&&(h=-h)),p=new Date(Date.UTC(r,n,i,a,s,l,u)),h&&p.setTime(p.getTime()-h),p}function T8e(t){return t.toISOString()}function E8e(t){return t==="<<"||t===null}function C8e(t){if(t===null)return!1;var e,r,n=0,i=t.length,a=j9;for(r=0;r<i;r++)if(e=a.indexOf(t.charAt(r)),!(e>64)){if(e<0)return!1;n+=6}return n%8===0}function A8e(t){var e,r,n=t.replace(/[\r\n=]/g,""),i=n.length,a=j9,s=0,l=[];for(e=0;e<i;e++)e%4===0&&e&&(l.push(s>>16&255),l.push(s>>8&255),l.push(s&255)),s=s<<6|a.indexOf(n.charAt(e));return r=i%4*6,r===0?(l.push(s>>16&255),l.push(s>>8&255),l.push(s&255)):r===18?(l.push(s>>10&255),l.push(s>>2&255)):r===12&&l.push(s>>4&255),new Uint8Array(l)}function _8e(t){var e="",r=0,n,i,a=t.length,s=j9;for(n=0;n<a;n++)n%3===0&&n&&(e+=s[r>>18&63],e+=s[r>>12&63],e+=s[r>>6&63],e+=s[r&63]),r=(r<<8)+t[n];return i=a%3,i===0?(e+=s[r>>18&63],e+=s[r>>12&63],e+=s[r>>6&63],e+=s[r&63]):i===2?(e+=s[r>>10&63],e+=s[r>>4&63],e+=s[r<<2&63],e+=s[64]):i===1&&(e+=s[r>>2&63],e+=s[r<<4&63],e+=s[64],e+=s[64]),e}function L8e(t){return Object.prototype.toString.call(t)==="[object Uint8Array]"}function M8e(t){if(t===null)return!0;var e=[],r,n,i,a,s,l=t;for(r=0,n=l.length;r<n;r+=1){if(i=l[r],s=!1,R8e.call(i)!=="[object Object]")return!1;for(a in i)if(N8e.call(i,a))if(!s)s=!0;else return!1;if(!s)return!1;if(e.indexOf(a)===-1)e.push(a);else return!1}return!0}function I8e(t){return t!==null?t:[]}function B8e(t){if(t===null)return!0;var e,r,n,i,a,s=t;for(a=new Array(s.length),e=0,r=s.length;e<r;e+=1){if(n=s[e],P8e.call(n)!=="[object Object]"||(i=Object.keys(n),i.length!==1))return!1;a[e]=[i[0],n[i[0]]]}return!0}function F8e(t){if(t===null)return[];var e,r,n,i,a,s=t;for(a=new Array(s.length),e=0,r=s.length;e<r;e+=1)n=s[e],i=Object.keys(n),a[e]=[i[0],n[i[0]]];return a}function $8e(t){if(t===null)return!0;var e,r=t;for(e in r)if(G8e.call(r,e)&&r[e]!==null)return!1;return!0}function V8e(t){return t!==null?t:{}}function tZ(t){return Object.prototype.toString.call(t)}function yc(t){return t===10||t===13}function _d(t){return t===9||t===32}function Ss(t){return t===9||t===32||t===10||t===13}function lm(t){return t===44||t===91||t===93||t===123||t===125}function X8e(t){var e;return 48<=t&&t<=57?t-48:(e=t|32,97<=e&&e<=102?e-97+10:-1)}function j8e(t){return t===120?2:t===117?4:t===85?8:0}function K8e(t){return 48<=t&&t<=57?t-48:-1}function rZ(t){return t===48?"\0":t===97?"\x07":t===98?"\b":t===116||t===9?" ":t===110?` +`:t===118?"\v":t===102?"\f":t===114?"\r":t===101?"\x1B":t===32?" ":t===34?'"':t===47?"/":t===92?"\\":t===78?"\x85":t===95?"\xA0":t===76?"\u2028":t===80?"\u2029":""}function Q8e(t){return t<=65535?String.fromCharCode(t):String.fromCharCode((t-65536>>10)+55296,(t-65536&1023)+56320)}function Z8e(t,e){this.input=t,this.filename=e.filename||null,this.schema=e.schema||xZ,this.onWarning=e.onWarning||null,this.legacy=e.legacy||!1,this.json=e.json||!1,this.listener=e.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=t.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.firstTabInLine=-1,this.documents=[]}function CZ(t,e){var r={name:t.filename,buffer:t.input.slice(0,-1),position:t.position,line:t.line,column:t.position-t.lineStart};return r.snippet=GAe(r),new Es(e,r)}function Qt(t,e){throw CZ(t,e)}function F5(t,e){t.onWarning&&t.onWarning.call(null,CZ(t,e))}function Gh(t,e,r,n){var i,a,s,l;if(e<r){if(l=t.input.slice(e,r),n)for(i=0,a=l.length;i<a;i+=1)s=l.charCodeAt(i),s===9||32<=s&&s<=1114111||Qt(t,"expected valid JSON character");else W8e.test(l)&&Qt(t,"the stream contains non-printable characters");t.result+=l}}function iZ(t,e,r,n){var i,a,s,l;for(Pi.isObject(r)||Qt(t,"cannot merge mappings; the provided source object is unacceptable"),i=Object.keys(r),s=0,l=i.length;s<l;s+=1)a=i[s],$h.call(e,a)||(e[a]=r[a],n[a]=!0)}function cm(t,e,r,n,i,a,s,l,u){var h,f;if(Array.isArray(i))for(i=Array.prototype.slice.call(i),h=0,f=i.length;h<f;h+=1)Array.isArray(i[h])&&Qt(t,"nested arrays are not supported inside keys"),typeof i=="object"&&tZ(i[h])==="[object Object]"&&(i[h]="[object Object]");if(typeof i=="object"&&tZ(i)==="[object Object]"&&(i="[object Object]"),i=String(i),e===null&&(e={}),n==="tag:yaml.org,2002:merge")if(Array.isArray(a))for(h=0,f=a.length;h<f;h+=1)iZ(t,e,a[h],r);else iZ(t,e,a,r);else!t.json&&!$h.call(r,i)&&$h.call(e,i)&&(t.line=s||t.line,t.lineStart=l||t.lineStart,t.position=u||t.position,Qt(t,"duplicated mapping key")),i==="__proto__"?Object.defineProperty(e,i,{configurable:!0,enumerable:!0,writable:!0,value:a}):e[i]=a,delete r[i];return e}function K9(t){var e;e=t.input.charCodeAt(t.position),e===10?t.position++:e===13?(t.position++,t.input.charCodeAt(t.position)===10&&t.position++):Qt(t,"a line break is expected"),t.line+=1,t.lineStart=t.position,t.firstTabInLine=-1}function Ci(t,e,r){for(var n=0,i=t.input.charCodeAt(t.position);i!==0;){for(;_d(i);)i===9&&t.firstTabInLine===-1&&(t.firstTabInLine=t.position),i=t.input.charCodeAt(++t.position);if(e&&i===35)do i=t.input.charCodeAt(++t.position);while(i!==10&&i!==13&&i!==0);if(yc(i))for(K9(t),i=t.input.charCodeAt(t.position),n++,t.lineIndent=0;i===32;)t.lineIndent++,i=t.input.charCodeAt(++t.position);else break}return r!==-1&&n!==0&&t.lineIndent<r&&F5(t,"deficient indentation"),n}function $5(t){var e=t.position,r;return r=t.input.charCodeAt(e),!!((r===45||r===46)&&r===t.input.charCodeAt(e+1)&&r===t.input.charCodeAt(e+2)&&(e+=3,r=t.input.charCodeAt(e),r===0||Ss(r)))}function Q9(t,e){e===1?t.result+=" ":e>1&&(t.result+=Pi.repeat(` +`,e-1))}function J8e(t,e,r){var n,i,a,s,l,u,h,f,d=t.kind,p=t.result,m;if(m=t.input.charCodeAt(t.position),Ss(m)||lm(m)||m===35||m===38||m===42||m===33||m===124||m===62||m===39||m===34||m===37||m===64||m===96||(m===63||m===45)&&(i=t.input.charCodeAt(t.position+1),Ss(i)||r&&lm(i)))return!1;for(t.kind="scalar",t.result="",a=s=t.position,l=!1;m!==0;){if(m===58){if(i=t.input.charCodeAt(t.position+1),Ss(i)||r&&lm(i))break}else if(m===35){if(n=t.input.charCodeAt(t.position-1),Ss(n))break}else{if(t.position===t.lineStart&&$5(t)||r&&lm(m))break;if(yc(m))if(u=t.line,h=t.lineStart,f=t.lineIndent,Ci(t,!1,-1),t.lineIndent>=e){l=!0,m=t.input.charCodeAt(t.position);continue}else{t.position=s,t.line=u,t.lineStart=h,t.lineIndent=f;break}}l&&(Gh(t,a,s,!1),Q9(t,t.line-u),a=s=t.position,l=!1),_d(m)||(s=t.position+1),m=t.input.charCodeAt(++t.position)}return Gh(t,a,s,!1),t.result?!0:(t.kind=d,t.result=p,!1)}function e_e(t,e){var r,n,i;if(r=t.input.charCodeAt(t.position),r!==39)return!1;for(t.kind="scalar",t.result="",t.position++,n=i=t.position;(r=t.input.charCodeAt(t.position))!==0;)if(r===39)if(Gh(t,n,t.position,!0),r=t.input.charCodeAt(++t.position),r===39)n=t.position,t.position++,i=t.position;else return!0;else yc(r)?(Gh(t,n,i,!0),Q9(t,Ci(t,!1,e)),n=i=t.position):t.position===t.lineStart&&$5(t)?Qt(t,"unexpected end of the document within a single quoted scalar"):(t.position++,i=t.position);Qt(t,"unexpected end of the stream within a single quoted scalar")}function t_e(t,e){var r,n,i,a,s,l;if(l=t.input.charCodeAt(t.position),l!==34)return!1;for(t.kind="scalar",t.result="",t.position++,r=n=t.position;(l=t.input.charCodeAt(t.position))!==0;){if(l===34)return Gh(t,r,t.position,!0),t.position++,!0;if(l===92){if(Gh(t,r,t.position,!0),l=t.input.charCodeAt(++t.position),yc(l))Ci(t,!1,e);else if(l<256&&EZ[l])t.result+=SZ[l],t.position++;else if((s=j8e(l))>0){for(i=s,a=0;i>0;i--)l=t.input.charCodeAt(++t.position),(s=X8e(l))>=0?a=(a<<4)+s:Qt(t,"expected hexadecimal character");t.result+=Q8e(a),t.position++}else Qt(t,"unknown escape sequence");r=n=t.position}else yc(l)?(Gh(t,r,n,!0),Q9(t,Ci(t,!1,e)),r=n=t.position):t.position===t.lineStart&&$5(t)?Qt(t,"unexpected end of the document within a double quoted scalar"):(t.position++,n=t.position)}Qt(t,"unexpected end of the stream within a double quoted scalar")}function r_e(t,e){var r=!0,n,i,a,s=t.tag,l,u=t.anchor,h,f,d,p,m,g=Object.create(null),y,v,x,b;if(b=t.input.charCodeAt(t.position),b===91)f=93,m=!1,l=[];else if(b===123)f=125,m=!0,l={};else return!1;for(t.anchor!==null&&(t.anchorMap[t.anchor]=l),b=t.input.charCodeAt(++t.position);b!==0;){if(Ci(t,!0,e),b=t.input.charCodeAt(t.position),b===f)return t.position++,t.tag=s,t.anchor=u,t.kind=m?"mapping":"sequence",t.result=l,!0;r?b===44&&Qt(t,"expected the node content, but found ','"):Qt(t,"missed comma between flow collection entries"),v=y=x=null,d=p=!1,b===63&&(h=t.input.charCodeAt(t.position+1),Ss(h)&&(d=p=!0,t.position++,Ci(t,!0,e))),n=t.line,i=t.lineStart,a=t.position,um(t,e,P5,!1,!0),v=t.tag,y=t.result,Ci(t,!0,e),b=t.input.charCodeAt(t.position),(p||t.line===n)&&b===58&&(d=!0,b=t.input.charCodeAt(++t.position),Ci(t,!0,e),um(t,e,P5,!1,!0),x=t.result),m?cm(t,l,g,v,y,x,n,i,a):d?l.push(cm(t,null,g,v,y,x,n,i,a)):l.push(y),Ci(t,!0,e),b=t.input.charCodeAt(t.position),b===44?(r=!0,b=t.input.charCodeAt(++t.position)):r=!1}Qt(t,"unexpected end of the stream within a flow collection")}function n_e(t,e){var r,n,i=U9,a=!1,s=!1,l=e,u=0,h=!1,f,d;if(d=t.input.charCodeAt(t.position),d===124)n=!1;else if(d===62)n=!0;else return!1;for(t.kind="scalar",t.result="";d!==0;)if(d=t.input.charCodeAt(++t.position),d===43||d===45)U9===i?i=d===43?eZ:H8e:Qt(t,"repeat of a chomping mode identifier");else if((f=K8e(d))>=0)f===0?Qt(t,"bad explicit indentation width of a block scalar; it cannot be less than one"):s?Qt(t,"repeat of an indentation width identifier"):(l=e+f-1,s=!0);else break;if(_d(d)){do d=t.input.charCodeAt(++t.position);while(_d(d));if(d===35)do d=t.input.charCodeAt(++t.position);while(!yc(d)&&d!==0)}for(;d!==0;){for(K9(t),t.lineIndent=0,d=t.input.charCodeAt(t.position);(!s||t.lineIndent<l)&&d===32;)t.lineIndent++,d=t.input.charCodeAt(++t.position);if(!s&&t.lineIndent>l&&(l=t.lineIndent),yc(d)){u++;continue}if(t.lineIndent<l){i===eZ?t.result+=Pi.repeat(` +`,a?1+u:u):i===U9&&a&&(t.result+=` +`);break}for(n?_d(d)?(h=!0,t.result+=Pi.repeat(` +`,a?1+u:u)):h?(h=!1,t.result+=Pi.repeat(` +`,u+1)):u===0?a&&(t.result+=" "):t.result+=Pi.repeat(` +`,u):t.result+=Pi.repeat(` +`,a?1+u:u),a=!0,s=!0,u=0,r=t.position;!yc(d)&&d!==0;)d=t.input.charCodeAt(++t.position);Gh(t,r,t.position,!1)}return!0}function aZ(t,e){var r,n=t.tag,i=t.anchor,a=[],s,l=!1,u;if(t.firstTabInLine!==-1)return!1;for(t.anchor!==null&&(t.anchorMap[t.anchor]=a),u=t.input.charCodeAt(t.position);u!==0&&(t.firstTabInLine!==-1&&(t.position=t.firstTabInLine,Qt(t,"tab characters must not be used in indentation")),!(u!==45||(s=t.input.charCodeAt(t.position+1),!Ss(s))));){if(l=!0,t.position++,Ci(t,!0,-1)&&t.lineIndent<=e){a.push(null),u=t.input.charCodeAt(t.position);continue}if(r=t.line,um(t,e,wZ,!1,!0),a.push(t.result),Ci(t,!0,-1),u=t.input.charCodeAt(t.position),(t.line===r||t.lineIndent>e)&&u!==0)Qt(t,"bad indentation of a sequence entry");else if(t.lineIndent<e)break}return l?(t.tag=n,t.anchor=i,t.kind="sequence",t.result=a,!0):!1}function i_e(t,e,r){var n,i,a,s,l,u,h=t.tag,f=t.anchor,d={},p=Object.create(null),m=null,g=null,y=null,v=!1,x=!1,b;if(t.firstTabInLine!==-1)return!1;for(t.anchor!==null&&(t.anchorMap[t.anchor]=d),b=t.input.charCodeAt(t.position);b!==0;){if(!v&&t.firstTabInLine!==-1&&(t.position=t.firstTabInLine,Qt(t,"tab characters must not be used in indentation")),n=t.input.charCodeAt(t.position+1),a=t.line,(b===63||b===58)&&Ss(n))b===63?(v&&(cm(t,d,p,m,g,null,s,l,u),m=g=y=null),x=!0,v=!0,i=!0):v?(v=!1,i=!0):Qt(t,"incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line"),t.position+=1,b=n;else{if(s=t.line,l=t.lineStart,u=t.position,!um(t,r,bZ,!1,!0))break;if(t.line===a){for(b=t.input.charCodeAt(t.position);_d(b);)b=t.input.charCodeAt(++t.position);if(b===58)b=t.input.charCodeAt(++t.position),Ss(b)||Qt(t,"a whitespace character is expected after the key-value separator within a block mapping"),v&&(cm(t,d,p,m,g,null,s,l,u),m=g=y=null),x=!0,v=!1,i=!1,m=t.tag,g=t.result;else if(x)Qt(t,"can not read an implicit mapping pair; a colon is missed");else return t.tag=h,t.anchor=f,!0}else if(x)Qt(t,"can not read a block mapping entry; a multiline key may not be an implicit key");else return t.tag=h,t.anchor=f,!0}if((t.line===a||t.lineIndent>e)&&(v&&(s=t.line,l=t.lineStart,u=t.position),um(t,e,B5,!0,i)&&(v?g=t.result:y=t.result),v||(cm(t,d,p,m,g,y,s,l,u),m=g=y=null),Ci(t,!0,-1),b=t.input.charCodeAt(t.position)),(t.line===a||t.lineIndent>e)&&b!==0)Qt(t,"bad indentation of a mapping entry");else if(t.lineIndent<e)break}return v&&cm(t,d,p,m,g,null,s,l,u),x&&(t.tag=h,t.anchor=f,t.kind="mapping",t.result=d),x}function a_e(t){var e,r=!1,n=!1,i,a,s;if(s=t.input.charCodeAt(t.position),s!==33)return!1;if(t.tag!==null&&Qt(t,"duplication of a tag property"),s=t.input.charCodeAt(++t.position),s===60?(r=!0,s=t.input.charCodeAt(++t.position)):s===33?(n=!0,i="!!",s=t.input.charCodeAt(++t.position)):i="!",e=t.position,r){do s=t.input.charCodeAt(++t.position);while(s!==0&&s!==62);t.position<t.length?(a=t.input.slice(e,t.position),s=t.input.charCodeAt(++t.position)):Qt(t,"unexpected end of the stream within a verbatim tag")}else{for(;s!==0&&!Ss(s);)s===33&&(n?Qt(t,"tag suffix cannot contain exclamation marks"):(i=t.input.slice(e-1,t.position+1),TZ.test(i)||Qt(t,"named tag handle cannot contain such characters"),n=!0,e=t.position+1)),s=t.input.charCodeAt(++t.position);a=t.input.slice(e,t.position),q8e.test(a)&&Qt(t,"tag suffix cannot contain flow indicator characters")}a&&!kZ.test(a)&&Qt(t,"tag name cannot contain such characters: "+a);try{a=decodeURIComponent(a)}catch{Qt(t,"tag name is malformed: "+a)}return r?t.tag=a:$h.call(t.tagMap,i)?t.tag=t.tagMap[i]+a:i==="!"?t.tag="!"+a:i==="!!"?t.tag="tag:yaml.org,2002:"+a:Qt(t,'undeclared tag handle "'+i+'"'),!0}function s_e(t){var e,r;if(r=t.input.charCodeAt(t.position),r!==38)return!1;for(t.anchor!==null&&Qt(t,"duplication of an anchor property"),r=t.input.charCodeAt(++t.position),e=t.position;r!==0&&!Ss(r)&&!lm(r);)r=t.input.charCodeAt(++t.position);return t.position===e&&Qt(t,"name of an anchor node must contain at least one character"),t.anchor=t.input.slice(e,t.position),!0}function o_e(t){var e,r,n;if(n=t.input.charCodeAt(t.position),n!==42)return!1;for(n=t.input.charCodeAt(++t.position),e=t.position;n!==0&&!Ss(n)&&!lm(n);)n=t.input.charCodeAt(++t.position);return t.position===e&&Qt(t,"name of an alias node must contain at least one character"),r=t.input.slice(e,t.position),$h.call(t.anchorMap,r)||Qt(t,'unidentified alias "'+r+'"'),t.result=t.anchorMap[r],Ci(t,!0,-1),!0}function um(t,e,r,n,i){var a,s,l,u=1,h=!1,f=!1,d,p,m,g,y,v;if(t.listener!==null&&t.listener("open",t),t.tag=null,t.anchor=null,t.kind=null,t.result=null,a=s=l=B5===r||wZ===r,n&&Ci(t,!0,-1)&&(h=!0,t.lineIndent>e?u=1:t.lineIndent===e?u=0:t.lineIndent<e&&(u=-1)),u===1)for(;a_e(t)||s_e(t);)Ci(t,!0,-1)?(h=!0,l=a,t.lineIndent>e?u=1:t.lineIndent===e?u=0:t.lineIndent<e&&(u=-1)):l=!1;if(l&&(l=h||i),(u===1||B5===r)&&(P5===r||bZ===r?y=e:y=e+1,v=t.position-t.lineStart,u===1?l&&(aZ(t,v)||i_e(t,v,y))||r_e(t,y)?f=!0:(s&&n_e(t,y)||e_e(t,y)||t_e(t,y)?f=!0:o_e(t)?(f=!0,(t.tag!==null||t.anchor!==null)&&Qt(t,"alias node should not have any properties")):J8e(t,y,P5===r)&&(f=!0,t.tag===null&&(t.tag="?")),t.anchor!==null&&(t.anchorMap[t.anchor]=t.result)):u===0&&(f=l&&aZ(t,v))),t.tag===null)t.anchor!==null&&(t.anchorMap[t.anchor]=t.result);else if(t.tag==="?"){for(t.result!==null&&t.kind!=="scalar"&&Qt(t,'unacceptable node kind for !<?> tag; it should be "scalar", not "'+t.kind+'"'),d=0,p=t.implicitTypes.length;d<p;d+=1)if(g=t.implicitTypes[d],g.resolve(t.result)){t.result=g.construct(t.result),t.tag=g.tag,t.anchor!==null&&(t.anchorMap[t.anchor]=t.result);break}}else if(t.tag!=="!"){if($h.call(t.typeMap[t.kind||"fallback"],t.tag))g=t.typeMap[t.kind||"fallback"][t.tag];else for(g=null,m=t.typeMap.multi[t.kind||"fallback"],d=0,p=m.length;d<p;d+=1)if(t.tag.slice(0,m[d].tag.length)===m[d].tag){g=m[d];break}g||Qt(t,"unknown tag !<"+t.tag+">"),t.result!==null&&g.kind!==t.kind&&Qt(t,"unacceptable node kind for !<"+t.tag+'> tag; it should be "'+g.kind+'", not "'+t.kind+'"'),g.resolve(t.result,t.tag)?(t.result=g.construct(t.result,t.tag),t.anchor!==null&&(t.anchorMap[t.anchor]=t.result)):Qt(t,"cannot resolve a node with !<"+t.tag+"> explicit tag")}return t.listener!==null&&t.listener("close",t),t.tag!==null||t.anchor!==null||f}function l_e(t){var e=t.position,r,n,i,a=!1,s;for(t.version=null,t.checkLineBreaks=t.legacy,t.tagMap=Object.create(null),t.anchorMap=Object.create(null);(s=t.input.charCodeAt(t.position))!==0&&(Ci(t,!0,-1),s=t.input.charCodeAt(t.position),!(t.lineIndent>0||s!==37));){for(a=!0,s=t.input.charCodeAt(++t.position),r=t.position;s!==0&&!Ss(s);)s=t.input.charCodeAt(++t.position);for(n=t.input.slice(r,t.position),i=[],n.length<1&&Qt(t,"directive name must not be less than one character in length");s!==0;){for(;_d(s);)s=t.input.charCodeAt(++t.position);if(s===35){do s=t.input.charCodeAt(++t.position);while(s!==0&&!yc(s));break}if(yc(s))break;for(r=t.position;s!==0&&!Ss(s);)s=t.input.charCodeAt(++t.position);i.push(t.input.slice(r,t.position))}s!==0&&K9(t),$h.call(nZ,n)?nZ[n](t,n,i):F5(t,'unknown document directive "'+n+'"')}if(Ci(t,!0,-1),t.lineIndent===0&&t.input.charCodeAt(t.position)===45&&t.input.charCodeAt(t.position+1)===45&&t.input.charCodeAt(t.position+2)===45?(t.position+=3,Ci(t,!0,-1)):a&&Qt(t,"directives end mark is expected"),um(t,t.lineIndent-1,B5,!1,!0),Ci(t,!0,-1),t.checkLineBreaks&&Y8e.test(t.input.slice(e,t.position))&&F5(t,"non-ASCII line breaks are interpreted as content"),t.documents.push(t.result),t.position===t.lineStart&&$5(t)){t.input.charCodeAt(t.position)===46&&(t.position+=3,Ci(t,!0,-1));return}if(t.position<t.length-1)Qt(t,"end of the stream or a document separator is expected");else return}function AZ(t,e){t=String(t),e=e||{},t.length!==0&&(t.charCodeAt(t.length-1)!==10&&t.charCodeAt(t.length-1)!==13&&(t+=` +`),t.charCodeAt(0)===65279&&(t=t.slice(1)));var r=new Z8e(t,e),n=t.indexOf("\0");for(n!==-1&&(r.position=n,Qt(r,"null byte is not allowed in input")),r.input+="\0";r.input.charCodeAt(r.position)===32;)r.lineIndent+=1,r.position+=1;for(;r.position<r.length-1;)l_e(r);return r.documents}function c_e(t,e,r){e!==null&&typeof e=="object"&&typeof r>"u"&&(r=e,e=null);var n=AZ(t,r);if(typeof e!="function")return n;for(var i=0,a=n.length;i<a;i+=1)e(n[i])}function u_e(t,e){var r=AZ(t,e);if(r.length!==0){if(r.length===1)return r[0];throw new Es("expected a single document in the stream, but found more")}}function N_e(t,e){var r,n,i,a,s,l,u;if(e===null)return{};for(r={},n=Object.keys(e),i=0,a=n.length;i<a;i+=1)s=n[i],l=String(e[s]),s.slice(0,2)==="!!"&&(s="tag:yaml.org,2002:"+s.slice(2)),u=t.compiledTypeMap.fallback[s],u&&DZ.call(u.styleAliases,l)&&(l=u.styleAliases[l]),r[s]=l;return r}function R_e(t){var e,r,n;if(e=t.toString(16).toUpperCase(),t<=255)r="x",n=2;else if(t<=65535)r="u",n=4;else if(t<=4294967295)r="U",n=8;else throw new Es("code point within a string may not be greater than 0xFFFFFFFF");return"\\"+r+Pi.repeat("0",n-e.length)+e}function I_e(t){this.schema=t.schema||xZ,this.indent=Math.max(1,t.indent||2),this.noArrayIndent=t.noArrayIndent||!1,this.skipInvalid=t.skipInvalid||!1,this.flowLevel=Pi.isNothing(t.flowLevel)?-1:t.flowLevel,this.styleMap=N_e(this.schema,t.styles||null),this.sortKeys=t.sortKeys||!1,this.lineWidth=t.lineWidth||80,this.noRefs=t.noRefs||!1,this.noCompatMode=t.noCompatMode||!1,this.condenseFlow=t.condenseFlow||!1,this.quotingType=t.quotingType==='"'?Tv:M_e,this.forceQuotes=t.forceQuotes||!1,this.replacer=typeof t.replacer=="function"?t.replacer:null,this.implicitTypes=this.schema.compiledImplicit,this.explicitTypes=this.schema.compiledExplicit,this.tag=null,this.result="",this.duplicates=[],this.usedDuplicates=null}function sZ(t,e){for(var r=Pi.repeat(" ",e),n=0,i=-1,a="",s,l=t.length;n<l;)i=t.indexOf(` +`,n),i===-1?(s=t.slice(n),n=l):(s=t.slice(n,i+1),n=i+1),s.length&&s!==` +`&&(a+=r),a+=s;return a}function Y9(t,e){return` +`+Pi.repeat(" ",t.indent*e)}function O_e(t,e){var r,n,i;for(r=0,n=t.implicitTypes.length;r<n;r+=1)if(i=t.implicitTypes[r],i.resolve(e))return!0;return!1}function G5(t){return t===m_e||t===d_e}function kv(t){return 32<=t&&t<=126||161<=t&&t<=55295&&t!==8232&&t!==8233||57344<=t&&t<=65533&&t!==Z9||65536<=t&&t<=1114111}function oZ(t){return kv(t)&&t!==Z9&&t!==p_e&&t!==wv}function lZ(t,e,r){var n=oZ(t),i=n&&!G5(t);return(r?n:n&&t!==NZ&&t!==RZ&&t!==MZ&&t!==IZ&&t!==OZ)&&t!==W9&&!(e===z5&&!i)||oZ(e)&&!G5(e)&&t===W9||e===z5&&i}function P_e(t){return kv(t)&&t!==Z9&&!G5(t)&&t!==T_e&&t!==S_e&&t!==z5&&t!==NZ&&t!==RZ&&t!==MZ&&t!==IZ&&t!==OZ&&t!==W9&&t!==x_e&&t!==w_e&&t!==g_e&&t!==__e&&t!==k_e&&t!==E_e&&t!==b_e&&t!==y_e&&t!==v_e&&t!==C_e&&t!==A_e}function B_e(t){return!G5(t)&&t!==z5}function xv(t,e){var r=t.charCodeAt(e),n;return r>=55296&&r<=56319&&e+1<t.length&&(n=t.charCodeAt(e+1),n>=56320&&n<=57343)?(r-55296)*1024+n-56320+65536:r}function PZ(t){var e=/^\n* /;return e.test(t)}function F_e(t,e,r,n,i,a,s,l){var u,h=0,f=null,d=!1,p=!1,m=n!==-1,g=-1,y=P_e(xv(t,0))&&B_e(xv(t,t.length-1));if(e||s)for(u=0;u<t.length;h>=65536?u+=2:u++){if(h=xv(t,u),!kv(h))return om;y=y&&lZ(h,f,l),f=h}else{for(u=0;u<t.length;h>=65536?u+=2:u++){if(h=xv(t,u),h===wv)d=!0,m&&(p=p||u-g-1>n&&t[g+1]!==" ",g=u);else if(!kv(h))return om;y=y&&lZ(h,f,l),f=h}p=p||m&&u-g-1>n&&t[g+1]!==" "}return!d&&!p?y&&!s&&!i(t)?BZ:a===Tv?om:q9:r>9&&PZ(t)?om:s?a===Tv?om:q9:p?zZ:FZ}function z_e(t,e,r,n,i){t.dump=function(){if(e.length===0)return t.quotingType===Tv?'""':"''";if(!t.noCompatMode&&(L_e.indexOf(e)!==-1||D_e.test(e)))return t.quotingType===Tv?'"'+e+'"':"'"+e+"'";var a=t.indent*Math.max(1,r),s=t.lineWidth===-1?-1:Math.max(Math.min(t.lineWidth,40),t.lineWidth-a),l=n||t.flowLevel>-1&&r>=t.flowLevel;function u(h){return O_e(t,h)}switch(o(u,"testAmbiguity"),F_e(e,l,t.indent,s,u,t.quotingType,t.forceQuotes&&!n,i)){case BZ:return e;case q9:return"'"+e.replace(/'/g,"''")+"'";case FZ:return"|"+cZ(e,t.indent)+uZ(sZ(e,a));case zZ:return">"+cZ(e,t.indent)+uZ(sZ(G_e(e,s),a));case om:return'"'+$_e(e)+'"';default:throw new Es("impossible error: invalid scalar style")}}()}function cZ(t,e){var r=PZ(t)?String(e):"",n=t[t.length-1]===` +`,i=n&&(t[t.length-2]===` +`||t===` +`),a=i?"+":n?"":"-";return r+a+` +`}function uZ(t){return t[t.length-1]===` +`?t.slice(0,-1):t}function G_e(t,e){for(var r=/(\n+)([^\n]*)/g,n=function(){var h=t.indexOf(` +`);return h=h!==-1?h:t.length,r.lastIndex=h,hZ(t.slice(0,h),e)}(),i=t[0]===` +`||t[0]===" ",a,s;s=r.exec(t);){var l=s[1],u=s[2];a=u[0]===" ",n+=l+(!i&&!a&&u!==""?` +`:"")+hZ(u,e),i=a}return n}function hZ(t,e){if(t===""||t[0]===" ")return t;for(var r=/ [^ ]/g,n,i=0,a,s=0,l=0,u="";n=r.exec(t);)l=n.index,l-i>e&&(a=s>i?s:l,u+=` +`+t.slice(i,a),i=a+1),s=l;return u+=` +`,t.length-i>e&&s>i?u+=t.slice(i,s)+` +`+t.slice(s+1):u+=t.slice(i),u.slice(1)}function $_e(t){for(var e="",r=0,n,i=0;i<t.length;r>=65536?i+=2:i++)r=xv(t,i),n=Na[r],!n&&kv(r)?(e+=t[i],r>=65536&&(e+=t[i+1])):e+=n||R_e(r);return e}function V_e(t,e,r){var n="",i=t.tag,a,s,l;for(a=0,s=r.length;a<s;a+=1)l=r[a],t.replacer&&(l=t.replacer.call(r,String(a),l)),(Cu(t,e,l,!1,!1)||typeof l>"u"&&Cu(t,e,null,!1,!1))&&(n!==""&&(n+=","+(t.condenseFlow?"":" ")),n+=t.dump);t.tag=i,t.dump="["+n+"]"}function fZ(t,e,r,n){var i="",a=t.tag,s,l,u;for(s=0,l=r.length;s<l;s+=1)u=r[s],t.replacer&&(u=t.replacer.call(r,String(s),u)),(Cu(t,e+1,u,!0,!0,!1,!0)||typeof u>"u"&&Cu(t,e+1,null,!0,!0,!1,!0))&&((!n||i!=="")&&(i+=Y9(t,e)),t.dump&&wv===t.dump.charCodeAt(0)?i+="-":i+="- ",i+=t.dump);t.tag=a,t.dump=i||"[]"}function U_e(t,e,r){var n="",i=t.tag,a=Object.keys(r),s,l,u,h,f;for(s=0,l=a.length;s<l;s+=1)f="",n!==""&&(f+=", "),t.condenseFlow&&(f+='"'),u=a[s],h=r[u],t.replacer&&(h=t.replacer.call(r,u,h)),Cu(t,e,u,!1,!1)&&(t.dump.length>1024&&(f+="? "),f+=t.dump+(t.condenseFlow?'"':"")+":"+(t.condenseFlow?"":" "),Cu(t,e,h,!1,!1)&&(f+=t.dump,n+=f));t.tag=i,t.dump="{"+n+"}"}function H_e(t,e,r,n){var i="",a=t.tag,s=Object.keys(r),l,u,h,f,d,p;if(t.sortKeys===!0)s.sort();else if(typeof t.sortKeys=="function")s.sort(t.sortKeys);else if(t.sortKeys)throw new Es("sortKeys must be a boolean or a function");for(l=0,u=s.length;l<u;l+=1)p="",(!n||i!=="")&&(p+=Y9(t,e)),h=s[l],f=r[h],t.replacer&&(f=t.replacer.call(r,h,f)),Cu(t,e+1,h,!0,!0,!0)&&(d=t.tag!==null&&t.tag!=="?"||t.dump&&t.dump.length>1024,d&&(t.dump&&wv===t.dump.charCodeAt(0)?p+="?":p+="? "),p+=t.dump,d&&(p+=Y9(t,e)),Cu(t,e+1,f,!0,d)&&(t.dump&&wv===t.dump.charCodeAt(0)?p+=":":p+=": ",p+=t.dump,i+=p));t.tag=a,t.dump=i||"{}"}function dZ(t,e,r){var n,i,a,s,l,u;for(i=r?t.explicitTypes:t.implicitTypes,a=0,s=i.length;a<s;a+=1)if(l=i[a],(l.instanceOf||l.predicate)&&(!l.instanceOf||typeof e=="object"&&e instanceof l.instanceOf)&&(!l.predicate||l.predicate(e))){if(r?l.multi&&l.representName?t.tag=l.representName(e):t.tag=l.tag:t.tag="?",l.represent){if(u=t.styleMap[l.tag]||l.defaultStyle,LZ.call(l.represent)==="[object Function]")n=l.represent(e,u);else if(DZ.call(l.represent,u))n=l.represent[u](e,u);else throw new Es("!<"+l.tag+'> tag resolver accepts not "'+u+'" style');t.dump=n}return!0}return!1}function Cu(t,e,r,n,i,a,s){t.tag=null,t.dump=r,dZ(t,r,!1)||dZ(t,r,!0);var l=LZ.call(t.dump),u=n,h;n&&(n=t.flowLevel<0||t.flowLevel>e);var f=l==="[object Object]"||l==="[object Array]",d,p;if(f&&(d=t.duplicates.indexOf(r),p=d!==-1),(t.tag!==null&&t.tag!=="?"||p||t.indent!==2&&e>0)&&(i=!1),p&&t.usedDuplicates[d])t.dump="*ref_"+d;else{if(f&&p&&!t.usedDuplicates[d]&&(t.usedDuplicates[d]=!0),l==="[object Object]")n&&Object.keys(t.dump).length!==0?(H_e(t,e,t.dump,i),p&&(t.dump="&ref_"+d+t.dump)):(U_e(t,e,t.dump),p&&(t.dump="&ref_"+d+" "+t.dump));else if(l==="[object Array]")n&&t.dump.length!==0?(t.noArrayIndent&&!s&&e>0?fZ(t,e-1,t.dump,i):fZ(t,e,t.dump,i),p&&(t.dump="&ref_"+d+t.dump)):(V_e(t,e,t.dump),p&&(t.dump="&ref_"+d+" "+t.dump));else if(l==="[object String]")t.tag!=="?"&&z_e(t,t.dump,e,a,u);else{if(l==="[object Undefined]")return!1;if(t.skipInvalid)return!1;throw new Es("unacceptable kind of an object to dump "+l)}t.tag!==null&&t.tag!=="?"&&(h=encodeURI(t.tag[0]==="!"?t.tag.slice(1):t.tag).replace(/!/g,"%21"),t.tag[0]==="!"?h="!"+h:h.slice(0,18)==="tag:yaml.org,2002:"?h="!!"+h.slice(18):h="!<"+h+">",t.dump=h+" "+t.dump)}return!0}function W_e(t,e){var r=[],n=[],i,a;for(X9(t,r,n),i=0,a=n.length;i<a;i+=1)e.duplicates.push(r[n[i]]);e.usedDuplicates=new Array(a)}function X9(t,e,r){var n,i,a;if(t!==null&&typeof t=="object")if(i=e.indexOf(t),i!==-1)r.indexOf(i)===-1&&r.push(i);else if(e.push(t),Array.isArray(t))for(i=0,a=t.length;i<a;i+=1)X9(t[i],e,r);else for(n=Object.keys(t),i=0,a=n.length;i<a;i+=1)X9(t[n[i]],e,r)}function Y_e(t,e){e=e||{};var r=new I_e(e);r.noRefs||W_e(t,r);var n=t;return r.replacer&&(n=r.replacer.call({"":n},"",n)),Cu(r,0,n,!0,!0)?r.dump+` +`:""}function J9(t,e){return function(){throw new Error("Function yaml."+t+" is removed in js-yaml 4. Use yaml."+e+" instead, which is now safe by default.")}}var MAe,IAe,OAe,PAe,BAe,FAe,Pi,Es,GAe,$Ae,VAe,Da,YAe,qAe,XAe,jAe,KAe,e8e,i8e,h8e,f8e,m8e,v8e,gZ,x8e,yZ,vZ,k8e,S8e,j9,D8e,N8e,R8e,O8e,P8e,z8e,G8e,U8e,xZ,$h,P5,bZ,wZ,B5,U9,H8e,eZ,W8e,Y8e,q8e,TZ,kZ,EZ,SZ,Ad,nZ,h_e,f_e,_Z,LZ,DZ,Z9,d_e,wv,p_e,m_e,g_e,y_e,W9,v_e,x_e,b_e,w_e,NZ,T_e,z5,k_e,E_e,S_e,C_e,RZ,MZ,A_e,IZ,__e,OZ,Na,L_e,D_e,M_e,Tv,BZ,q9,FZ,zZ,om,q_e,X_e,hm,fm,uNt,hNt,fNt,dNt,pNt,V5=M(()=>{"use strict";o(pZ,"isNothing");o(_Ae,"isObject");o(LAe,"toArray");o(DAe,"extend");o(NAe,"repeat");o(RAe,"isNegativeZero");MAe=pZ,IAe=_Ae,OAe=LAe,PAe=NAe,BAe=RAe,FAe=DAe,Pi={isNothing:MAe,isObject:IAe,toArray:OAe,repeat:PAe,isNegativeZero:BAe,extend:FAe};o(mZ,"formatError");o(bv,"YAMLException$1");bv.prototype=Object.create(Error.prototype);bv.prototype.constructor=bv;bv.prototype.toString=o(function(e){return this.name+": "+mZ(this,e)},"toString");Es=bv;o($9,"getLine");o(V9,"padStart");o(zAe,"makeSnippet");GAe=zAe,$Ae=["kind","multi","resolve","construct","instanceOf","predicate","represent","representName","defaultStyle","styleAliases"],VAe=["scalar","sequence","mapping"];o(UAe,"compileStyleAliases");o(HAe,"Type$1");Da=HAe;o(JQ,"compileList");o(WAe,"compileMap");o(H9,"Schema$1");H9.prototype.extend=o(function(e){var r=[],n=[];if(e instanceof Da)n.push(e);else if(Array.isArray(e))n=n.concat(e);else if(e&&(Array.isArray(e.implicit)||Array.isArray(e.explicit)))e.implicit&&(r=r.concat(e.implicit)),e.explicit&&(n=n.concat(e.explicit));else throw new Es("Schema.extend argument should be a Type, [ Type ], or a schema definition ({ implicit: [...], explicit: [...] })");r.forEach(function(a){if(!(a instanceof Da))throw new Es("Specified list of YAML types (or a single Type object) contains a non-Type object.");if(a.loadKind&&a.loadKind!=="scalar")throw new Es("There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.");if(a.multi)throw new Es("There is a multi type in the implicit list of a schema. Multi tags can only be listed as explicit.")}),n.forEach(function(a){if(!(a instanceof Da))throw new Es("Specified list of YAML types (or a single Type object) contains a non-Type object.")});var i=Object.create(H9.prototype);return i.implicit=(this.implicit||[]).concat(r),i.explicit=(this.explicit||[]).concat(n),i.compiledImplicit=JQ(i,"implicit"),i.compiledExplicit=JQ(i,"explicit"),i.compiledTypeMap=WAe(i.compiledImplicit,i.compiledExplicit),i},"extend");YAe=H9,qAe=new Da("tag:yaml.org,2002:str",{kind:"scalar",construct:o(function(t){return t!==null?t:""},"construct")}),XAe=new Da("tag:yaml.org,2002:seq",{kind:"sequence",construct:o(function(t){return t!==null?t:[]},"construct")}),jAe=new Da("tag:yaml.org,2002:map",{kind:"mapping",construct:o(function(t){return t!==null?t:{}},"construct")}),KAe=new YAe({explicit:[qAe,XAe,jAe]});o(QAe,"resolveYamlNull");o(ZAe,"constructYamlNull");o(JAe,"isNull");e8e=new Da("tag:yaml.org,2002:null",{kind:"scalar",resolve:QAe,construct:ZAe,predicate:JAe,represent:{canonical:o(function(){return"~"},"canonical"),lowercase:o(function(){return"null"},"lowercase"),uppercase:o(function(){return"NULL"},"uppercase"),camelcase:o(function(){return"Null"},"camelcase"),empty:o(function(){return""},"empty")},defaultStyle:"lowercase"});o(t8e,"resolveYamlBoolean");o(r8e,"constructYamlBoolean");o(n8e,"isBoolean");i8e=new Da("tag:yaml.org,2002:bool",{kind:"scalar",resolve:t8e,construct:r8e,predicate:n8e,represent:{lowercase:o(function(t){return t?"true":"false"},"lowercase"),uppercase:o(function(t){return t?"TRUE":"FALSE"},"uppercase"),camelcase:o(function(t){return t?"True":"False"},"camelcase")},defaultStyle:"lowercase"});o(a8e,"isHexCode");o(s8e,"isOctCode");o(o8e,"isDecCode");o(l8e,"resolveYamlInteger");o(c8e,"constructYamlInteger");o(u8e,"isInteger");h8e=new Da("tag:yaml.org,2002:int",{kind:"scalar",resolve:l8e,construct:c8e,predicate:u8e,represent:{binary:o(function(t){return t>=0?"0b"+t.toString(2):"-0b"+t.toString(2).slice(1)},"binary"),octal:o(function(t){return t>=0?"0o"+t.toString(8):"-0o"+t.toString(8).slice(1)},"octal"),decimal:o(function(t){return t.toString(10)},"decimal"),hexadecimal:o(function(t){return t>=0?"0x"+t.toString(16).toUpperCase():"-0x"+t.toString(16).toUpperCase().slice(1)},"hexadecimal")},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}}),f8e=new RegExp("^(?:[-+]?(?:[0-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$");o(d8e,"resolveYamlFloat");o(p8e,"constructYamlFloat");m8e=/^[-+]?[0-9]+e/;o(g8e,"representYamlFloat");o(y8e,"isFloat");v8e=new Da("tag:yaml.org,2002:float",{kind:"scalar",resolve:d8e,construct:p8e,predicate:y8e,represent:g8e,defaultStyle:"lowercase"}),gZ=KAe.extend({implicit:[e8e,i8e,h8e,v8e]}),x8e=gZ,yZ=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$"),vZ=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$");o(b8e,"resolveYamlTimestamp");o(w8e,"constructYamlTimestamp");o(T8e,"representYamlTimestamp");k8e=new Da("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:b8e,construct:w8e,instanceOf:Date,represent:T8e});o(E8e,"resolveYamlMerge");S8e=new Da("tag:yaml.org,2002:merge",{kind:"scalar",resolve:E8e}),j9=`ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/= +\r`;o(C8e,"resolveYamlBinary");o(A8e,"constructYamlBinary");o(_8e,"representYamlBinary");o(L8e,"isBinary");D8e=new Da("tag:yaml.org,2002:binary",{kind:"scalar",resolve:C8e,construct:A8e,predicate:L8e,represent:_8e}),N8e=Object.prototype.hasOwnProperty,R8e=Object.prototype.toString;o(M8e,"resolveYamlOmap");o(I8e,"constructYamlOmap");O8e=new Da("tag:yaml.org,2002:omap",{kind:"sequence",resolve:M8e,construct:I8e}),P8e=Object.prototype.toString;o(B8e,"resolveYamlPairs");o(F8e,"constructYamlPairs");z8e=new Da("tag:yaml.org,2002:pairs",{kind:"sequence",resolve:B8e,construct:F8e}),G8e=Object.prototype.hasOwnProperty;o($8e,"resolveYamlSet");o(V8e,"constructYamlSet");U8e=new Da("tag:yaml.org,2002:set",{kind:"mapping",resolve:$8e,construct:V8e}),xZ=x8e.extend({implicit:[k8e,S8e],explicit:[D8e,O8e,z8e,U8e]}),$h=Object.prototype.hasOwnProperty,P5=1,bZ=2,wZ=3,B5=4,U9=1,H8e=2,eZ=3,W8e=/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,Y8e=/[\x85\u2028\u2029]/,q8e=/[,\[\]\{\}]/,TZ=/^(?:!|!!|![a-z\-]+!)$/i,kZ=/^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i;o(tZ,"_class");o(yc,"is_EOL");o(_d,"is_WHITE_SPACE");o(Ss,"is_WS_OR_EOL");o(lm,"is_FLOW_INDICATOR");o(X8e,"fromHexCode");o(j8e,"escapedHexLen");o(K8e,"fromDecimalCode");o(rZ,"simpleEscapeSequence");o(Q8e,"charFromCodepoint");EZ=new Array(256),SZ=new Array(256);for(Ad=0;Ad<256;Ad++)EZ[Ad]=rZ(Ad)?1:0,SZ[Ad]=rZ(Ad);o(Z8e,"State$1");o(CZ,"generateError");o(Qt,"throwError");o(F5,"throwWarning");nZ={YAML:o(function(e,r,n){var i,a,s;e.version!==null&&Qt(e,"duplication of %YAML directive"),n.length!==1&&Qt(e,"YAML directive accepts exactly one argument"),i=/^([0-9]+)\.([0-9]+)$/.exec(n[0]),i===null&&Qt(e,"ill-formed argument of the YAML directive"),a=parseInt(i[1],10),s=parseInt(i[2],10),a!==1&&Qt(e,"unacceptable YAML version of the document"),e.version=n[0],e.checkLineBreaks=s<2,s!==1&&s!==2&&F5(e,"unsupported YAML version of the document")},"handleYamlDirective"),TAG:o(function(e,r,n){var i,a;n.length!==2&&Qt(e,"TAG directive accepts exactly two arguments"),i=n[0],a=n[1],TZ.test(i)||Qt(e,"ill-formed tag handle (first argument) of the TAG directive"),$h.call(e.tagMap,i)&&Qt(e,'there is a previously declared suffix for "'+i+'" tag handle'),kZ.test(a)||Qt(e,"ill-formed tag prefix (second argument) of the TAG directive");try{a=decodeURIComponent(a)}catch{Qt(e,"tag prefix is malformed: "+a)}e.tagMap[i]=a},"handleTagDirective")};o(Gh,"captureSegment");o(iZ,"mergeMappings");o(cm,"storeMappingPair");o(K9,"readLineBreak");o(Ci,"skipSeparationSpace");o($5,"testDocumentSeparator");o(Q9,"writeFoldedLines");o(J8e,"readPlainScalar");o(e_e,"readSingleQuotedScalar");o(t_e,"readDoubleQuotedScalar");o(r_e,"readFlowCollection");o(n_e,"readBlockScalar");o(aZ,"readBlockSequence");o(i_e,"readBlockMapping");o(a_e,"readTagProperty");o(s_e,"readAnchorProperty");o(o_e,"readAlias");o(um,"composeNode");o(l_e,"readDocument");o(AZ,"loadDocuments");o(c_e,"loadAll$1");o(u_e,"load$1");h_e=c_e,f_e=u_e,_Z={loadAll:h_e,load:f_e},LZ=Object.prototype.toString,DZ=Object.prototype.hasOwnProperty,Z9=65279,d_e=9,wv=10,p_e=13,m_e=32,g_e=33,y_e=34,W9=35,v_e=37,x_e=38,b_e=39,w_e=42,NZ=44,T_e=45,z5=58,k_e=61,E_e=62,S_e=63,C_e=64,RZ=91,MZ=93,A_e=96,IZ=123,__e=124,OZ=125,Na={};Na[0]="\\0";Na[7]="\\a";Na[8]="\\b";Na[9]="\\t";Na[10]="\\n";Na[11]="\\v";Na[12]="\\f";Na[13]="\\r";Na[27]="\\e";Na[34]='\\"';Na[92]="\\\\";Na[133]="\\N";Na[160]="\\_";Na[8232]="\\L";Na[8233]="\\P";L_e=["y","Y","yes","Yes","YES","on","On","ON","n","N","no","No","NO","off","Off","OFF"],D_e=/^[-+]?[0-9_]+(?::[0-9_]+)+(?:\.[0-9_]*)?$/;o(N_e,"compileStyleMap");o(R_e,"encodeHex");M_e=1,Tv=2;o(I_e,"State");o(sZ,"indentString");o(Y9,"generateNextLine");o(O_e,"testImplicitResolving");o(G5,"isWhitespace");o(kv,"isPrintable");o(oZ,"isNsCharOrWhitespace");o(lZ,"isPlainSafe");o(P_e,"isPlainSafeFirst");o(B_e,"isPlainSafeLast");o(xv,"codePointAt");o(PZ,"needIndentIndicator");BZ=1,q9=2,FZ=3,zZ=4,om=5;o(F_e,"chooseScalarStyle");o(z_e,"writeScalar");o(cZ,"blockHeader");o(uZ,"dropEndingNewline");o(G_e,"foldString");o(hZ,"foldLine");o($_e,"escapeString");o(V_e,"writeFlowSequence");o(fZ,"writeBlockSequence");o(U_e,"writeFlowMapping");o(H_e,"writeBlockMapping");o(dZ,"detectType");o(Cu,"writeNode");o(W_e,"getDuplicateReferences");o(X9,"inspectNode");o(Y_e,"dump$1");q_e=Y_e,X_e={dump:q_e};o(J9,"renamed");hm=gZ,fm=_Z.load,uNt=_Z.loadAll,hNt=X_e.dump,fNt=J9("safeLoad","load"),dNt=J9("safeLoadAll","loadAll"),pNt=J9("safeDump","dump")});function rL(t){let e=[];for(let r of t){let n=Sv.get(r);n?.styles&&(e=[...e,...n.styles??[]].map(i=>i.trim())),n?.textStyles&&(e=[...e,...n.textStyles??[]].map(i=>i.trim()))}return e}var j_e,GZ,dm,Vh,Cs,Sv,Au,nL,iL,U5,tL,Go,H5,W5,Y5,q5,K_e,Q_e,Z_e,J_e,e9e,t9e,r9e,aL,n9e,i9e,a9e,$Z,s9e,o9e,sL,VZ,UZ,l9e,HZ,c9e,u9e,h9e,f9e,d9e,Ev,WZ,YZ,p9e,m9e,qZ,g9e,y9e,v9e,x9e,b9e,XZ,jZ,w9e,T9e,k9e,E9e,S9e,C9e,X5,oL=M(()=>{"use strict";mr();hr();Vt();fr();G9();ht();V5();ki();j_e="flowchart-",GZ=0,dm=de(),Vh=new Map,Cs=[],Sv=new Map,Au=[],nL=new Map,iL=new Map,U5=0,tL=!0,W5=[],Y5=o(t=>je.sanitizeText(t,dm),"sanitizeText"),q5=o(function(t){for(let e of Vh.values())if(e.id===t)return e.domId;return t},"lookUpDomId"),K_e=o(function(t,e,r,n,i,a,s={},l){if(!t||t.trim().length===0)return;let u,h=Vh.get(t);if(h===void 0&&(h={id:t,labelType:"text",domId:j_e+t+"-"+GZ,styles:[],classes:[]},Vh.set(t,h)),GZ++,e!==void 0?(dm=de(),u=Y5(e.text.trim()),h.labelType=e.type,u.startsWith('"')&&u.endsWith('"')&&(u=u.substring(1,u.length-1)),h.text=u):h.text===void 0&&(h.text=t),r!==void 0&&(h.type=r),n?.forEach(function(f){h.styles.push(f)}),i?.forEach(function(f){h.classes.push(f)}),a!==void 0&&(h.dir=a),h.props===void 0?h.props=s:s!==void 0&&Object.assign(h.props,s),l!==void 0){let f;l.includes(` +`)?f=l+` +`:f=`{ +`+l+` +}`;let d=fm(f,{schema:hm});if(d.shape){if(d.shape!==d.shape.toLowerCase()||d.shape.includes("_"))throw new Error(`No such shape: ${d.shape}. Shape names should be lowercase.`);if(!ZQ(d.shape))throw new Error(`No such shape: ${d.shape}.`);h.type=d?.shape}d?.label&&(h.text=d?.label),d?.icon&&(h.icon=d?.icon,!d.label?.trim()&&h.text===t&&(h.text="")),d?.form&&(h.form=d?.form),d?.pos&&(h.pos=d?.pos),d?.img&&(h.img=d?.img,!d.label?.trim()&&h.text===t&&(h.text="")),d?.constraint&&(h.constraint=d.constraint),d.w&&(h.assetWidth=Number(d.w)),d.h&&(h.assetHeight=Number(d.h))}},"addVertex"),Q_e=o(function(t,e,r){let a={start:t,end:e,type:void 0,text:"",labelType:"text"};Y.info("abc78 Got edge...",a);let s=r.text;if(s!==void 0&&(a.text=Y5(s.text.trim()),a.text.startsWith('"')&&a.text.endsWith('"')&&(a.text=a.text.substring(1,a.text.length-1)),a.labelType=s.type),r!==void 0&&(a.type=r.type,a.stroke=r.stroke,a.length=r.length>10?10:r.length),Cs.length<(dm.maxEdges??500))Y.info("Pushing edge..."),Cs.push(a);else throw new Error(`Edge limit exceeded. ${Cs.length} edges found, but the limit is ${dm.maxEdges}. + +Initialize mermaid with maxEdges set to a higher number to allow more edges. +You cannot set this config via configuration inside the diagram as it is a secure config. +You have to call mermaid.initialize.`)},"addSingleLink"),Z_e=o(function(t,e,r){Y.info("addLink",t,e,r);for(let n of t)for(let i of e)Q_e(n,i,r)},"addLink"),J_e=o(function(t,e){t.forEach(function(r){r==="default"?Cs.defaultInterpolate=e:Cs[r].interpolate=e})},"updateLinkInterpolate"),e9e=o(function(t,e){t.forEach(function(r){if(typeof r=="number"&&r>=Cs.length)throw new Error(`The index ${r} for linkStyle is out of bounds. Valid indices for linkStyle are between 0 and ${Cs.length-1}. (Help: Ensure that the index is within the range of existing edges.)`);r==="default"?Cs.defaultStyle=e:(Cs[r].style=e,(Cs[r]?.style?.length??0)>0&&!Cs[r]?.style?.some(n=>n?.startsWith("fill"))&&Cs[r]?.style?.push("fill:none"))})},"updateLink"),t9e=o(function(t,e){t.split(",").forEach(function(r){let n=Sv.get(r);n===void 0&&(n={id:r,styles:[],textStyles:[]},Sv.set(r,n)),e?.forEach(function(i){if(/color/.exec(i)){let a=i.replace("fill","bgFill");n.textStyles.push(a)}n.styles.push(i)})})},"addClass"),r9e=o(function(t){Go=t,/.*</.exec(Go)&&(Go="RL"),/.*\^/.exec(Go)&&(Go="BT"),/.*>/.exec(Go)&&(Go="LR"),/.*v/.exec(Go)&&(Go="TB"),Go==="TD"&&(Go="TB")},"setDirection"),aL=o(function(t,e){for(let r of t.split(",")){let n=Vh.get(r);n&&n.classes.push(e);let i=nL.get(r);i&&i.classes.push(e)}},"setClass"),n9e=o(function(t,e){if(e!==void 0){e=Y5(e);for(let r of t.split(","))iL.set(H5==="gen-1"?q5(r):r,e)}},"setTooltip"),i9e=o(function(t,e,r){let n=q5(t);if(de().securityLevel!=="loose"||e===void 0)return;let i=[];if(typeof r=="string"){i=r.split(/,(?=(?:(?:[^"]*"){2})*[^"]*$)/);for(let s=0;s<i.length;s++){let l=i[s].trim();l.startsWith('"')&&l.endsWith('"')&&(l=l.substr(1,l.length-2)),i[s]=l}}i.length===0&&i.push(t);let a=Vh.get(t);a&&(a.haveCallback=!0,W5.push(function(){let s=document.querySelector(`[id="${n}"]`);s!==null&&s.addEventListener("click",function(){Ut.runFunc(e,...i)},!1)}))},"setClickFun"),a9e=o(function(t,e,r){t.split(",").forEach(function(n){let i=Vh.get(n);i!==void 0&&(i.link=Ut.formatUrl(e,dm),i.linkTarget=r)}),aL(t,"clickable")},"setLink"),$Z=o(function(t){return iL.get(t)},"getTooltip"),s9e=o(function(t,e,r){t.split(",").forEach(function(n){i9e(n,e,r)}),aL(t,"clickable")},"setClickEvent"),o9e=o(function(t){W5.forEach(function(e){e(t)})},"bindFunctions"),sL=o(function(){return Go.trim()},"getDirection"),VZ=o(function(){return Vh},"getVertices"),UZ=o(function(){return Cs},"getEdges"),l9e=o(function(){return Sv},"getClasses"),HZ=o(function(t){let e=ze(".mermaidTooltip");(e._groups||e)[0][0]===null&&(e=ze("body").append("div").attr("class","mermaidTooltip").style("opacity",0)),ze(t).select("svg").selectAll("g.node").on("mouseover",function(){let i=ze(this);if(i.attr("title")===null)return;let s=this?.getBoundingClientRect();e.transition().duration(200).style("opacity",".9"),e.text(i.attr("title")).style("left",window.scrollX+s.left+(s.right-s.left)/2+"px").style("top",window.scrollY+s.bottom+"px"),e.html(e.html().replace(/<br\/>/g,"<br/>")),i.classed("hover",!0)}).on("mouseout",function(){e.transition().duration(500).style("opacity",0),ze(this).classed("hover",!1)})},"setupToolTips");W5.push(HZ);c9e=o(function(t="gen-1"){Vh=new Map,Sv=new Map,Cs=[],W5=[HZ],Au=[],nL=new Map,U5=0,iL=new Map,tL=!0,H5=t,dm=de(),_r()},"clear"),u9e=o(t=>{H5=t||"gen-2"},"setGen"),h9e=o(function(){return"fill:#ffa;stroke: #f66; stroke-width: 3px; stroke-dasharray: 5, 5;fill:#ffa;stroke: #666;"},"defaultStyle"),f9e=o(function(t,e,r){let n=t.text.trim(),i=r.text;t===r&&/\s/.exec(r.text)&&(n=void 0);function a(h){let f={boolean:{},number:{},string:{}},d=[],p;return{nodeList:h.filter(function(g){let y=typeof g;return g.stmt&&g.stmt==="dir"?(p=g.value,!1):g.trim()===""?!1:y in f?f[y].hasOwnProperty(g)?!1:f[y][g]=!0:d.includes(g)?!1:d.push(g)}),dir:p}}o(a,"uniq");let{nodeList:s,dir:l}=a(e.flat());if(H5==="gen-1")for(let h=0;h<s.length;h++)s[h]=q5(s[h]);n=n??"subGraph"+U5,i=i||"",i=Y5(i),U5=U5+1;let u={id:n,nodes:s,title:i.trim(),classes:[],dir:l,labelType:r.type};return Y.info("Adding",u.id,u.nodes,u.dir),u.nodes=jZ(u,Au).nodes,Au.push(u),nL.set(n,u),n},"addSubGraph"),d9e=o(function(t){for(let[e,r]of Au.entries())if(r.id===t)return e;return-1},"getPosForId"),Ev=-1,WZ=[],YZ=o(function(t,e){let r=Au[e].nodes;if(Ev=Ev+1,Ev>2e3)return{result:!1,count:0};if(WZ[Ev]=e,Au[e].id===t)return{result:!0,count:0};let n=0,i=1;for(;n<r.length;){let a=d9e(r[n]);if(a>=0){let s=YZ(t,a);if(s.result)return{result:!0,count:i+s.count};i=i+s.count}n=n+1}return{result:!1,count:i}},"indexNodes2"),p9e=o(function(t){return WZ[t]},"getDepthFirstPos"),m9e=o(function(){Ev=-1,Au.length>0&&YZ("none",Au.length-1)},"indexNodes"),qZ=o(function(){return Au},"getSubGraphs"),g9e=o(()=>tL?(tL=!1,!0):!1,"firstGraph"),y9e=o(t=>{let e=t.trim(),r="arrow_open";switch(e[0]){case"<":r="arrow_point",e=e.slice(1);break;case"x":r="arrow_cross",e=e.slice(1);break;case"o":r="arrow_circle",e=e.slice(1);break}let n="normal";return e.includes("=")&&(n="thick"),e.includes(".")&&(n="dotted"),{type:r,stroke:n}},"destructStartLink"),v9e=o((t,e)=>{let r=e.length,n=0;for(let i=0;i<r;++i)e[i]===t&&++n;return n},"countChar"),x9e=o(t=>{let e=t.trim(),r=e.slice(0,-1),n="arrow_open";switch(e.slice(-1)){case"x":n="arrow_cross",e.startsWith("x")&&(n="double_"+n,r=r.slice(1));break;case">":n="arrow_point",e.startsWith("<")&&(n="double_"+n,r=r.slice(1));break;case"o":n="arrow_circle",e.startsWith("o")&&(n="double_"+n,r=r.slice(1));break}let i="normal",a=r.length-1;r.startsWith("=")&&(i="thick"),r.startsWith("~")&&(i="invisible");let s=v9e(".",r);return s&&(i="dotted",a=s),{type:n,stroke:i,length:a}},"destructEndLink"),b9e=o((t,e)=>{let r=x9e(t),n;if(e){if(n=y9e(e),n.stroke!==r.stroke)return{type:"INVALID",stroke:"INVALID"};if(n.type==="arrow_open")n.type=r.type;else{if(n.type!==r.type)return{type:"INVALID",stroke:"INVALID"};n.type="double_"+n.type}return n.type==="double_arrow"&&(n.type="double_arrow_point"),n.length=r.length,n}return r},"destructLink"),XZ=o((t,e)=>{for(let r of t)if(r.nodes.includes(e))return!0;return!1},"exists"),jZ=o((t,e)=>{let r=[];return t.nodes.forEach((n,i)=>{XZ(e,n)||r.push(t.nodes[i])}),{nodes:r}},"makeUniq"),w9e={firstGraph:g9e},T9e=o(t=>{if(t.img)return"imageSquare";if(t.icon)return t.form==="circle"?"iconCircle":t.form==="square"?"iconSquare":t.form==="rounded"?"iconRounded":"icon";switch(t.type){case"square":case void 0:return"squareRect";case"round":return"roundedRect";case"ellipse":return"ellipse";default:return t.type}},"getTypeFromVertex"),k9e=o((t,e)=>t.find(r=>r.id===e),"findNode"),E9e=o(t=>{let e="none",r="arrow_point";switch(t){case"arrow_point":case"arrow_circle":case"arrow_cross":r=t;break;case"double_arrow_point":case"double_arrow_circle":case"double_arrow_cross":e=t.replace("double_",""),r=e;break}return{arrowTypeStart:e,arrowTypeEnd:r}},"destructEdgeType"),S9e=o((t,e,r,n,i,a)=>{let s=r.get(t.id),l=n.get(t.id)??!1,u=k9e(e,t.id);if(u)u.cssStyles=t.styles,u.cssCompiledStyles=rL(t.classes),u.cssClasses=t.classes.join(" ");else{let h={id:t.id,label:t.text,labelStyle:"",parentId:s,padding:i.flowchart?.padding||8,cssStyles:t.styles,cssCompiledStyles:rL(["default","node",...t.classes]),cssClasses:"default "+t.classes.join(" "),dir:t.dir,domId:t.domId,look:a,link:t.link,linkTarget:t.linkTarget,tooltip:$Z(t.id),icon:t.icon,pos:t.pos,img:t.img,assetWidth:t.assetWidth,assetHeight:t.assetHeight,constraint:t.constraint};l?e.push({...h,isGroup:!0,shape:"rect"}):e.push({...h,isGroup:!1,shape:T9e(t)})}},"addNodeFromVertex");o(rL,"getCompiledStyles");C9e=o(()=>{let t=de(),e=[],r=[],n=qZ(),i=new Map,a=new Map;for(let u=n.length-1;u>=0;u--){let h=n[u];h.nodes.length>0&&a.set(h.id,!0);for(let f of h.nodes)i.set(f,h.id)}for(let u=n.length-1;u>=0;u--){let h=n[u];e.push({id:h.id,label:h.title,labelStyle:"",parentId:i.get(h.id),padding:8,cssCompiledStyles:rL(h.classes),cssClasses:h.classes.join(" "),shape:"rect",dir:h.dir,isGroup:!0,look:t.look})}VZ().forEach(u=>{S9e(u,e,i,a,t,t.look||"classic")});let l=UZ();return l.forEach((u,h)=>{let{arrowTypeStart:f,arrowTypeEnd:d}=E9e(u.type),p=[...l.defaultStyle??[]];u.style&&p.push(...u.style);let m={id:p5(u.start,u.end,{counter:h,prefix:"L"}),start:u.start,end:u.end,type:u.type??"normal",label:u.text,labelpos:"c",thickness:u.stroke,minlen:u.length,classes:u?.stroke==="invisible"?"":"edge-thickness-normal edge-pattern-solid flowchart-link",arrowTypeStart:u?.stroke==="invisible"?"none":f,arrowTypeEnd:u?.stroke==="invisible"?"none":d,arrowheadStyle:"fill: #333",labelStyle:p,style:p,pattern:u.stroke,look:t.look};r.push(m)}),{nodes:e,edges:r,other:{},config:t}},"getData"),X5={defaultConfig:o(()=>S4.flowchart,"defaultConfig"),setAccTitle:Rr,getAccTitle:Pr,getAccDescription:Fr,getData:C9e,setAccDescription:Br,addVertex:K_e,lookUpDomId:q5,addLink:Z_e,updateLinkInterpolate:J_e,updateLink:e9e,addClass:t9e,setDirection:r9e,setClass:aL,setTooltip:n9e,getTooltip:$Z,setClickEvent:s9e,setLink:a9e,bindFunctions:o9e,getDirection:sL,getVertices:VZ,getEdges:UZ,getClasses:l9e,clear:c9e,setGen:u9e,defaultStyle:h9e,addSubGraph:f9e,getDepthFirstPos:p9e,indexNodes:m9e,getSubGraphs:qZ,destructLink:b9e,lex:w9e,exists:XZ,makeUniq:jZ,setDiagramTitle:ln,getDiagramTitle:Jr}});var pm,j5=M(()=>{"use strict";mr();pm=o((t,e)=>{let r;return e==="sandbox"&&(r=ze("#i"+t)),(e==="sandbox"?ze(r.nodes()[0].contentDocument.body):ze("body")).select(`[id="${t}"]`)},"getDiagramElement")});var _u,Cv=M(()=>{"use strict";_u=o(({flowchart:t})=>{let e=t?.subGraphTitleMargin?.top??0,r=t?.subGraphTitleMargin?.bottom??0,n=e+r;return{subGraphTitleTopMargin:e,subGraphTitleBottomMargin:r,subGraphTitleTotalMargin:n}},"getSubGraphTitleMargins")});var KZ,A9e,_9e,L9e,D9e,N9e,R9e,QZ,mm,ZZ,K5=M(()=>{"use strict";Vt();fr();ht();Cv();mr();jt();Dl();w9();I5();zh();Xt();KZ=o(async(t,e)=>{Y.info("Creating subgraph rect for ",e.id,e);let r=de(),{themeVariables:n,handDrawnSeed:i}=r,{clusterBkg:a,clusterBorder:s}=n,{labelStyles:l,nodeStyles:u,borderStyles:h,backgroundStyles:f}=et(e),d=t.insert("g").attr("class","cluster "+e.cssClasses).attr("id",e.id).attr("data-look",e.look),p=xr(r.flowchart.htmlLabels),m=d.insert("g").attr("class","cluster-label "),g=await Si(m,e.label,{style:e.labelStyle,useHtmlLabels:p,isNode:!0}),y=g.getBBox();if(xr(r.flowchart.htmlLabels)){let L=g.children[0],C=ze(g);y=L.getBoundingClientRect(),C.attr("width",y.width),C.attr("height",y.height)}let v=e.width<=y.width+e.padding?y.width+e.padding:e.width;e.width<=y.width+e.padding?e.diff=(v-e.width)/2-e.padding:e.diff=-e.padding;let x=e.height,b=e.x-v/2,w=e.y-x/2;Y.trace("Data ",e,JSON.stringify(e));let _;if(e.look==="handDrawn"){let L=Ke.svg(d),C=Ze(e,{roughness:.7,fill:a,stroke:s,fillWeight:3,seed:i}),A=L.path(La(b,w,v,x,0),C);_=d.insert(()=>(Y.debug("Rough node insert CXC",A),A),":first-child"),_.select("path:nth-child(2)").attr("style",h.join(";")),_.select("path").attr("style",f.join(";").replace("fill","stroke"))}else _=d.insert("rect",":first-child"),_.attr("style",u).attr("rx",e.rx).attr("ry",e.ry).attr("x",b).attr("y",w).attr("width",v).attr("height",x);let{subGraphTitleTopMargin:T}=_u(r);if(m.attr("transform",`translate(${e.x-y.width/2}, ${e.y-e.height/2+T})`),l){let L=m.select("span");L&&L.attr("style",l)}let E=_.node().getBBox();return e.offsetX=0,e.width=E.width,e.height=E.height,e.offsetY=y.height-e.padding/2,e.intersect=function(L){return Oh(e,L)},{cluster:d,labelBBox:y}},"rect"),A9e=o((t,e)=>{let r=t.insert("g").attr("class","note-cluster").attr("id",e.id),n=r.insert("rect",":first-child"),i=0*e.padding,a=i/2;n.attr("rx",e.rx).attr("ry",e.ry).attr("x",e.x-e.width/2-a).attr("y",e.y-e.height/2-a).attr("width",e.width+i).attr("height",e.height+i).attr("fill","none");let s=n.node().getBBox();return e.width=s.width,e.height=s.height,e.intersect=function(l){return Oh(e,l)},{cluster:r,labelBBox:{width:0,height:0}}},"noteGroup"),_9e=o(async(t,e)=>{let r=de(),{themeVariables:n,handDrawnSeed:i}=r,{altBackground:a,compositeBackground:s,compositeTitleBackground:l,nodeBorder:u}=n,h=t.insert("g").attr("class",e.cssClasses).attr("id",e.id).attr("data-id",e.id).attr("data-look",e.look),f=h.insert("g",":first-child"),d=h.insert("g").attr("class","cluster-label"),p=h.append("rect"),m=d.node().appendChild(await gc(e.label,e.labelStyle,void 0,!0)),g=m.getBBox();if(xr(r.flowchart.htmlLabels)){let A=m.children[0],I=ze(m);g=A.getBoundingClientRect(),I.attr("width",g.width),I.attr("height",g.height)}let y=0*e.padding,v=y/2,x=(e.width<=g.width+e.padding?g.width+e.padding:e.width)+y;e.width<=g.width+e.padding?e.diff=(x-e.width)/2-e.padding:e.diff=-e.padding;let b=e.height+y,w=e.height+y-g.height-6,_=e.x-x/2,T=e.y-b/2;e.width=x;let E=e.y-e.height/2-v+g.height+2,L;if(e.look==="handDrawn"){let A=e.cssClasses.includes("statediagram-cluster-alt"),I=Ke.svg(h),D=e.rx||e.ry?I.path(La(_,T,x,b,10),{roughness:.7,fill:l,fillStyle:"solid",stroke:u,seed:i}):I.rectangle(_,T,x,b,{seed:i});L=h.insert(()=>D,":first-child");let k=I.rectangle(_,E,x,w,{fill:A?a:s,fillStyle:A?"hachure":"solid",stroke:u,seed:i});L=h.insert(()=>D,":first-child"),p=h.insert(()=>k)}else L=f.insert("rect",":first-child"),L.attr("class","outer").attr("x",_).attr("y",T).attr("width",x).attr("height",b).attr("data-look",e.look),p.attr("class","inner").attr("x",_).attr("y",E).attr("width",x).attr("height",w);d.attr("transform",`translate(${e.x-g.width/2}, ${T+1-(xr(r.flowchart.htmlLabels)?0:3)})`);let C=L.node().getBBox();return e.height=C.height,e.offsetX=0,e.offsetY=g.height-e.padding/2,e.labelBBox=g,e.intersect=function(A){return Oh(e,A)},{cluster:h,labelBBox:g}},"roundedWithTitle"),L9e=o(async(t,e)=>{Y.info("Creating subgraph rect for ",e.id,e);let r=de(),{themeVariables:n,handDrawnSeed:i}=r,{clusterBkg:a,clusterBorder:s}=n,{labelStyles:l,nodeStyles:u,borderStyles:h,backgroundStyles:f}=et(e),d=t.insert("g").attr("class","cluster "+e.cssClasses).attr("id",e.id).attr("data-look",e.look),p=xr(r.flowchart.htmlLabels),m=d.insert("g").attr("class","cluster-label "),g=await Si(m,e.label,{style:e.labelStyle,useHtmlLabels:p,isNode:!0,width:e.width}),y=g.getBBox();if(xr(r.flowchart.htmlLabels)){let L=g.children[0],C=ze(g);y=L.getBoundingClientRect(),C.attr("width",y.width),C.attr("height",y.height)}let v=e.width<=y.width+e.padding?y.width+e.padding:e.width;e.width<=y.width+e.padding?e.diff=(v-e.width)/2-e.padding:e.diff=-e.padding;let x=e.height,b=e.x-v/2,w=e.y-x/2;Y.trace("Data ",e,JSON.stringify(e));let _;if(e.look==="handDrawn"){let L=Ke.svg(d),C=Ze(e,{roughness:.7,fill:a,stroke:s,fillWeight:4,seed:i}),A=L.path(La(b,w,v,x,e.rx),C);_=d.insert(()=>(Y.debug("Rough node insert CXC",A),A),":first-child"),_.select("path:nth-child(2)").attr("style",h.join(";")),_.select("path").attr("style",f.join(";").replace("fill","stroke"))}else _=d.insert("rect",":first-child"),_.attr("style",u).attr("rx",e.rx).attr("ry",e.ry).attr("x",b).attr("y",w).attr("width",v).attr("height",x);let{subGraphTitleTopMargin:T}=_u(r);if(m.attr("transform",`translate(${e.x-y.width/2}, ${e.y-e.height/2+T})`),l){let L=m.select("span");L&&L.attr("style",l)}let E=_.node().getBBox();return e.offsetX=0,e.width=E.width,e.height=E.height,e.offsetY=y.height-e.padding/2,e.intersect=function(L){return Oh(e,L)},{cluster:d,labelBBox:y}},"kanbanSection"),D9e=o((t,e)=>{let r=de(),{themeVariables:n,handDrawnSeed:i}=r,{nodeBorder:a}=n,s=t.insert("g").attr("class",e.cssClasses).attr("id",e.id).attr("data-look",e.look),l=s.insert("g",":first-child"),u=0*e.padding,h=e.width+u;e.diff=-e.padding;let f=e.height+u,d=e.x-h/2,p=e.y-f/2;e.width=h;let m;if(e.look==="handDrawn"){let v=Ke.svg(s).rectangle(d,p,h,f,{fill:"lightgrey",roughness:.5,strokeLineDash:[5],stroke:a,seed:i});m=s.insert(()=>v,":first-child")}else m=l.insert("rect",":first-child"),m.attr("class","divider").attr("x",d).attr("y",p).attr("width",h).attr("height",f).attr("data-look",e.look);let g=m.node().getBBox();return e.height=g.height,e.offsetX=0,e.offsetY=0,e.intersect=function(y){return Oh(e,y)},{cluster:s,labelBBox:{}}},"divider"),N9e=KZ,R9e={rect:KZ,squareRect:N9e,roundedWithTitle:_9e,noteGroup:A9e,divider:D9e,kanbanSection:L9e},QZ=new Map,mm=o(async(t,e)=>{let r=e.shape||"rect",n=await R9e[r](t,e);return QZ.set(e.id,n),n},"insertCluster"),ZZ=o(()=>{QZ=new Map},"clear")});function Q5(t,e){if(t===void 0||e===void 0)return{angle:0,deltaX:0,deltaY:0};t=Un(t),e=Un(e);let[r,n]=[t.x,t.y],[i,a]=[e.x,e.y],s=i-r,l=a-n;return{angle:Math.atan(l/s),deltaX:s,deltaY:l}}var $o,Un,Z5,lL=M(()=>{"use strict";$o={aggregation:18,extension:18,composition:18,dependency:6,lollipop:13.5,arrow_point:4};o(Q5,"calculateDeltaAndAngle");Un=o(t=>Array.isArray(t)?{x:t[0],y:t[1]}:t,"pointTransformer"),Z5=o(t=>({x:o(function(e,r,n){let i=0,a=Un(n[0]).x<Un(n[n.length-1]).x?"left":"right";if(r===0&&Object.hasOwn($o,t.arrowTypeStart)){let{angle:m,deltaX:g}=Q5(n[0],n[1]);i=$o[t.arrowTypeStart]*Math.cos(m)*(g>=0?1:-1)}else if(r===n.length-1&&Object.hasOwn($o,t.arrowTypeEnd)){let{angle:m,deltaX:g}=Q5(n[n.length-1],n[n.length-2]);i=$o[t.arrowTypeEnd]*Math.cos(m)*(g>=0?1:-1)}let s=Math.abs(Un(e).x-Un(n[n.length-1]).x),l=Math.abs(Un(e).y-Un(n[n.length-1]).y),u=Math.abs(Un(e).x-Un(n[0]).x),h=Math.abs(Un(e).y-Un(n[0]).y),f=$o[t.arrowTypeStart],d=$o[t.arrowTypeEnd],p=1;if(s<d&&s>0&&l<d){let m=d+p-s;m*=a==="right"?-1:1,i-=m}if(u<f&&u>0&&h<f){let m=f+p-u;m*=a==="right"?-1:1,i+=m}return Un(e).x+i},"x"),y:o(function(e,r,n){let i=0,a=Un(n[0]).y<Un(n[n.length-1]).y?"down":"up";if(r===0&&Object.hasOwn($o,t.arrowTypeStart)){let{angle:m,deltaY:g}=Q5(n[0],n[1]);i=$o[t.arrowTypeStart]*Math.abs(Math.sin(m))*(g>=0?1:-1)}else if(r===n.length-1&&Object.hasOwn($o,t.arrowTypeEnd)){let{angle:m,deltaY:g}=Q5(n[n.length-1],n[n.length-2]);i=$o[t.arrowTypeEnd]*Math.abs(Math.sin(m))*(g>=0?1:-1)}let s=Math.abs(Un(e).y-Un(n[n.length-1]).y),l=Math.abs(Un(e).x-Un(n[n.length-1]).x),u=Math.abs(Un(e).y-Un(n[0]).y),h=Math.abs(Un(e).x-Un(n[0]).x),f=$o[t.arrowTypeStart],d=$o[t.arrowTypeEnd],p=1;if(s<d&&s>0&&l<d){let m=d+p-s;m*=a==="up"?-1:1,i-=m}if(u<f&&u>0&&h<f){let m=f+p-u;m*=a==="up"?-1:1,i+=m}return Un(e).y+i},"y")}),"getLineFunctionsWithOffset")});var eJ,M9e,JZ,tJ=M(()=>{"use strict";ht();eJ=o((t,e,r,n,i)=>{e.arrowTypeStart&&JZ(t,"start",e.arrowTypeStart,r,n,i),e.arrowTypeEnd&&JZ(t,"end",e.arrowTypeEnd,r,n,i)},"addEdgeMarkers"),M9e={arrow_cross:"cross",arrow_point:"point",arrow_barb:"barb",arrow_circle:"circle",aggregation:"aggregation",extension:"extension",composition:"composition",dependency:"dependency",lollipop:"lollipop"},JZ=o((t,e,r,n,i,a)=>{let s=M9e[r];if(!s){Y.warn(`Unknown arrow type: ${r}`);return}let l=e==="start"?"Start":"End";t.attr(`marker-${e}`,`url(${n}#${i}_${a}-${s}${l})`)},"addEdgeMarker")});function J5(t,e){de().flowchart.htmlLabels&&t&&(t.style.width=e.length*9+"px",t.style.height="12px")}function P9e(t){let e=[],r=[];for(let n=1;n<t.length-1;n++){let i=t[n-1],a=t[n],s=t[n+1];(i.x===a.x&&a.y===s.y&&Math.abs(a.x-s.x)>5&&Math.abs(a.y-i.y)>5||i.y===a.y&&a.x===s.x&&Math.abs(a.x-i.x)>5&&Math.abs(a.y-s.y)>5)&&(e.push(a),r.push(n))}return{cornerPoints:e,cornerPointPositions:r}}var ew,ua,iJ,Av,tw,rw,I9e,O9e,rJ,nJ,B9e,nw,cL=M(()=>{"use strict";Vt();fr();ht();Dl();hr();lL();Cv();mr();jt();I5();tJ();ew=new Map,ua=new Map,iJ=o(()=>{ew.clear(),ua.clear()},"clear"),Av=o(t=>t?t.reduce((r,n)=>r+";"+n,""):"","getLabelStyles"),tw=o(async(t,e)=>{let r=xr(de().flowchart.htmlLabels),n=await Si(t,e.label,{style:Av(e.labelStyle),useHtmlLabels:r,addSvgBackground:!0,isNode:!1});Y.info("abc82",e,e.labelType);let i=t.insert("g").attr("class","edgeLabel"),a=i.insert("g").attr("class","label");a.node().appendChild(n);let s=n.getBBox();if(r){let u=n.children[0],h=ze(n);s=u.getBoundingClientRect(),h.attr("width",s.width),h.attr("height",s.height)}a.attr("transform","translate("+-s.width/2+", "+-s.height/2+")"),ew.set(e.id,i),e.width=s.width,e.height=s.height;let l;if(e.startLabelLeft){let u=await gc(e.startLabelLeft,Av(e.labelStyle)),h=t.insert("g").attr("class","edgeTerminals"),f=h.insert("g").attr("class","inner");l=f.node().appendChild(u);let d=u.getBBox();f.attr("transform","translate("+-d.width/2+", "+-d.height/2+")"),ua.get(e.id)||ua.set(e.id,{}),ua.get(e.id).startLeft=h,J5(l,e.startLabelLeft)}if(e.startLabelRight){let u=await gc(e.startLabelRight,Av(e.labelStyle)),h=t.insert("g").attr("class","edgeTerminals"),f=h.insert("g").attr("class","inner");l=h.node().appendChild(u),f.node().appendChild(u);let d=u.getBBox();f.attr("transform","translate("+-d.width/2+", "+-d.height/2+")"),ua.get(e.id)||ua.set(e.id,{}),ua.get(e.id).startRight=h,J5(l,e.startLabelRight)}if(e.endLabelLeft){let u=await gc(e.endLabelLeft,Av(e.labelStyle)),h=t.insert("g").attr("class","edgeTerminals"),f=h.insert("g").attr("class","inner");l=f.node().appendChild(u);let d=u.getBBox();f.attr("transform","translate("+-d.width/2+", "+-d.height/2+")"),h.node().appendChild(u),ua.get(e.id)||ua.set(e.id,{}),ua.get(e.id).endLeft=h,J5(l,e.endLabelLeft)}if(e.endLabelRight){let u=await gc(e.endLabelRight,Av(e.labelStyle)),h=t.insert("g").attr("class","edgeTerminals"),f=h.insert("g").attr("class","inner");l=f.node().appendChild(u);let d=u.getBBox();f.attr("transform","translate("+-d.width/2+", "+-d.height/2+")"),h.node().appendChild(u),ua.get(e.id)||ua.set(e.id,{}),ua.get(e.id).endRight=h,J5(l,e.endLabelRight)}return n},"insertEdgeLabel");o(J5,"setTerminalWidth");rw=o((t,e)=>{Y.debug("Moving label abc88 ",t.id,t.label,ew.get(t.id),e);let r=e.updatedPath?e.updatedPath:e.originalPath,n=de(),{subGraphTitleTotalMargin:i}=_u(n);if(t.label){let a=ew.get(t.id),s=t.x,l=t.y;if(r){let u=Ut.calcLabelPosition(r);Y.debug("Moving label "+t.label+" from (",s,",",l,") to (",u.x,",",u.y,") abc88"),e.updatedPath&&(s=u.x,l=u.y)}a.attr("transform",`translate(${s}, ${l+i/2})`)}if(t.startLabelLeft){let a=ua.get(t.id).startLeft,s=t.x,l=t.y;if(r){let u=Ut.calcTerminalLabelPosition(t.arrowTypeStart?10:0,"start_left",r);s=u.x,l=u.y}a.attr("transform",`translate(${s}, ${l})`)}if(t.startLabelRight){let a=ua.get(t.id).startRight,s=t.x,l=t.y;if(r){let u=Ut.calcTerminalLabelPosition(t.arrowTypeStart?10:0,"start_right",r);s=u.x,l=u.y}a.attr("transform",`translate(${s}, ${l})`)}if(t.endLabelLeft){let a=ua.get(t.id).endLeft,s=t.x,l=t.y;if(r){let u=Ut.calcTerminalLabelPosition(t.arrowTypeEnd?10:0,"end_left",r);s=u.x,l=u.y}a.attr("transform",`translate(${s}, ${l})`)}if(t.endLabelRight){let a=ua.get(t.id).endRight,s=t.x,l=t.y;if(r){let u=Ut.calcTerminalLabelPosition(t.arrowTypeEnd?10:0,"end_right",r);s=u.x,l=u.y}a.attr("transform",`translate(${s}, ${l})`)}},"positionEdgeLabel"),I9e=o((t,e)=>{let r=t.x,n=t.y,i=Math.abs(e.x-r),a=Math.abs(e.y-n),s=t.width/2,l=t.height/2;return i>=s||a>=l},"outsideNode"),O9e=o((t,e,r)=>{Y.debug(`intersection calc abc89: + outsidePoint: ${JSON.stringify(e)} + insidePoint : ${JSON.stringify(r)} + node : x:${t.x} y:${t.y} w:${t.width} h:${t.height}`);let n=t.x,i=t.y,a=Math.abs(n-r.x),s=t.width/2,l=r.x<e.x?s-a:s+a,u=t.height/2,h=Math.abs(e.y-r.y),f=Math.abs(e.x-r.x);if(Math.abs(i-e.y)*s>Math.abs(n-e.x)*u){let d=r.y<e.y?e.y-u-i:i-u-e.y;l=f*d/h;let p={x:r.x<e.x?r.x+l:r.x-f+l,y:r.y<e.y?r.y+h-d:r.y-h+d};return l===0&&(p.x=e.x,p.y=e.y),f===0&&(p.x=e.x),h===0&&(p.y=e.y),Y.debug(`abc89 top/bottom calc, Q ${h}, q ${d}, R ${f}, r ${l}`,p),p}else{r.x<e.x?l=e.x-s-n:l=n-s-e.x;let d=h*l/f,p=r.x<e.x?r.x+f-l:r.x-f+l,m=r.y<e.y?r.y+d:r.y-d;return Y.debug(`sides calc abc89, Q ${h}, q ${d}, R ${f}, r ${l}`,{_x:p,_y:m}),l===0&&(p=e.x,m=e.y),f===0&&(p=e.x),h===0&&(m=e.y),{x:p,y:m}}},"intersection"),rJ=o((t,e)=>{Y.warn("abc88 cutPathAtIntersect",t,e);let r=[],n=t[0],i=!1;return t.forEach(a=>{if(Y.info("abc88 checking point",a,e),!I9e(e,a)&&!i){let s=O9e(e,n,a);Y.debug("abc88 inside",a,n,s),Y.debug("abc88 intersection",s,e);let l=!1;r.forEach(u=>{l=l||u.x===s.x&&u.y===s.y}),r.some(u=>u.x===s.x&&u.y===s.y)?Y.warn("abc88 no intersect",s,r):r.push(s),i=!0}else Y.warn("abc88 outside",a,n),n=a,i||r.push(a)}),Y.debug("returning points",r),r},"cutPathAtIntersect");o(P9e,"extractCornerPoints");nJ=o(function(t,e,r){let n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),s=r/a;return{x:e.x-s*n,y:e.y-s*i}},"findAdjacentPoint"),B9e=o(function(t){let{cornerPointPositions:e}=P9e(t),r=[];for(let n=0;n<t.length;n++)if(e.includes(n)){let i=t[n-1],a=t[n+1],s=t[n],l=nJ(i,s,5),u=nJ(a,s,5),h=u.x-l.x,f=u.y-l.y;r.push(l);let d=Math.sqrt(2)*2,p={x:s.x,y:s.y};if(Math.abs(a.x-i.x)>10&&Math.abs(a.y-i.y)>=10){Y.debug("Corner point fixing",Math.abs(a.x-i.x),Math.abs(a.y-i.y));let m=5;s.x===l.x?p={x:h<0?l.x-m+d:l.x+m-d,y:f<0?l.y-d:l.y+d}:p={x:h<0?l.x-d:l.x+d,y:f<0?l.y-m+d:l.y+m-d}}else Y.debug("Corner point skipping fixing",Math.abs(a.x-i.x),Math.abs(a.y-i.y));r.push(p,u)}else r.push(t[n]);return r},"fixCorners"),nw=o(function(t,e,r,n,i,a,s){let{handDrawnSeed:l}=de(),u=e.points,h=!1,f=i;var d=a;d.intersect&&f.intersect&&(u=u.slice(1,e.points.length-1),u.unshift(f.intersect(u[0])),Y.debug("Last point APA12",e.start,"-->",e.end,u[u.length-1],d,d.intersect(u[u.length-1])),u.push(d.intersect(u[u.length-1]))),e.toCluster&&(Y.info("to cluster abc88",r.get(e.toCluster)),u=rJ(e.points,r.get(e.toCluster).node),h=!0),e.fromCluster&&(Y.debug("from cluster abc88",r.get(e.fromCluster),JSON.stringify(u,null,2)),u=rJ(u.reverse(),r.get(e.fromCluster).node).reverse(),h=!0);let p=u.filter(L=>!Number.isNaN(L.y));p=B9e(p);let m=Do;e.curve&&(m=e.curve);let{x:g,y}=Z5(e),v=Ka().x(g).y(y).curve(m),x;switch(e.thickness){case"normal":x="edge-thickness-normal";break;case"thick":x="edge-thickness-thick";break;case"invisible":x="edge-thickness-invisible";break;default:x="edge-thickness-normal"}switch(e.pattern){case"solid":x+=" edge-pattern-solid";break;case"dotted":x+=" edge-pattern-dotted";break;case"dashed":x+=" edge-pattern-dashed";break;default:x+=" edge-pattern-solid"}let b,w=v(p),_=Array.isArray(e.style)?e.style:[e.style];if(e.look==="handDrawn"){let L=Ke.svg(t);Object.assign([],p);let C=L.path(w,{roughness:.3,seed:l});x+=" transition",b=ze(C).select("path").attr("id",e.id).attr("class"," "+x+(e.classes?" "+e.classes:"")).attr("style",_?_.reduce((I,D)=>I+";"+D,""):"");let A=b.attr("d");b.attr("d",A),t.node().appendChild(b.node())}else b=t.append("path").attr("d",w).attr("id",e.id).attr("class"," "+x+(e.classes?" "+e.classes:"")).attr("style",_?_.reduce((L,C)=>L+";"+C,""):"");let T="";(de().flowchart.arrowMarkerAbsolute||de().state.arrowMarkerAbsolute)&&(T=window.location.protocol+"//"+window.location.host+window.location.pathname+window.location.search,T=T.replace(/\(/g,"\\(").replace(/\)/g,"\\)")),Y.info("arrowTypeStart",e.arrowTypeStart),Y.info("arrowTypeEnd",e.arrowTypeEnd),eJ(b,e,T,s,n);let E={};return h&&(E.updatedPath=u),E.originalPath=e.points,E},"insertEdge")});var F9e,z9e,G9e,$9e,V9e,U9e,H9e,W9e,Y9e,q9e,X9e,iw,uL=M(()=>{"use strict";ht();F9e=o((t,e,r,n)=>{e.forEach(i=>{X9e[i](t,r,n)})},"insertMarkers"),z9e=o((t,e,r)=>{Y.trace("Making markers for ",r),t.append("defs").append("marker").attr("id",r+"_"+e+"-extensionStart").attr("class","marker extension "+e).attr("refX",18).attr("refY",7).attr("markerWidth",190).attr("markerHeight",240).attr("orient","auto").append("path").attr("d","M 1,7 L18,13 V 1 Z"),t.append("defs").append("marker").attr("id",r+"_"+e+"-extensionEnd").attr("class","marker extension "+e).attr("refX",1).attr("refY",7).attr("markerWidth",20).attr("markerHeight",28).attr("orient","auto").append("path").attr("d","M 1,1 V 13 L18,7 Z")},"extension"),G9e=o((t,e,r)=>{t.append("defs").append("marker").attr("id",r+"_"+e+"-compositionStart").attr("class","marker composition "+e).attr("refX",18).attr("refY",7).attr("markerWidth",190).attr("markerHeight",240).attr("orient","auto").append("path").attr("d","M 18,7 L9,13 L1,7 L9,1 Z"),t.append("defs").append("marker").attr("id",r+"_"+e+"-compositionEnd").attr("class","marker composition "+e).attr("refX",1).attr("refY",7).attr("markerWidth",20).attr("markerHeight",28).attr("orient","auto").append("path").attr("d","M 18,7 L9,13 L1,7 L9,1 Z")},"composition"),$9e=o((t,e,r)=>{t.append("defs").append("marker").attr("id",r+"_"+e+"-aggregationStart").attr("class","marker aggregation "+e).attr("refX",18).attr("refY",7).attr("markerWidth",190).attr("markerHeight",240).attr("orient","auto").append("path").attr("d","M 18,7 L9,13 L1,7 L9,1 Z"),t.append("defs").append("marker").attr("id",r+"_"+e+"-aggregationEnd").attr("class","marker aggregation "+e).attr("refX",1).attr("refY",7).attr("markerWidth",20).attr("markerHeight",28).attr("orient","auto").append("path").attr("d","M 18,7 L9,13 L1,7 L9,1 Z")},"aggregation"),V9e=o((t,e,r)=>{t.append("defs").append("marker").attr("id",r+"_"+e+"-dependencyStart").attr("class","marker dependency "+e).attr("refX",6).attr("refY",7).attr("markerWidth",190).attr("markerHeight",240).attr("orient","auto").append("path").attr("d","M 5,7 L9,13 L1,7 L9,1 Z"),t.append("defs").append("marker").attr("id",r+"_"+e+"-dependencyEnd").attr("class","marker dependency "+e).attr("refX",13).attr("refY",7).attr("markerWidth",20).attr("markerHeight",28).attr("orient","auto").append("path").attr("d","M 18,7 L9,13 L14,7 L9,1 Z")},"dependency"),U9e=o((t,e,r)=>{t.append("defs").append("marker").attr("id",r+"_"+e+"-lollipopStart").attr("class","marker lollipop "+e).attr("refX",13).attr("refY",7).attr("markerWidth",190).attr("markerHeight",240).attr("orient","auto").append("circle").attr("stroke","black").attr("fill","transparent").attr("cx",7).attr("cy",7).attr("r",6),t.append("defs").append("marker").attr("id",r+"_"+e+"-lollipopEnd").attr("class","marker lollipop "+e).attr("refX",1).attr("refY",7).attr("markerWidth",190).attr("markerHeight",240).attr("orient","auto").append("circle").attr("stroke","black").attr("fill","transparent").attr("cx",7).attr("cy",7).attr("r",6)},"lollipop"),H9e=o((t,e,r)=>{t.append("marker").attr("id",r+"_"+e+"-pointEnd").attr("class","marker "+e).attr("viewBox","0 0 10 10").attr("refX",5).attr("refY",5).attr("markerUnits","userSpaceOnUse").attr("markerWidth",8).attr("markerHeight",8).attr("orient","auto").append("path").attr("d","M 0 0 L 10 5 L 0 10 z").attr("class","arrowMarkerPath").style("stroke-width",1).style("stroke-dasharray","1,0"),t.append("marker").attr("id",r+"_"+e+"-pointStart").attr("class","marker "+e).attr("viewBox","0 0 10 10").attr("refX",4.5).attr("refY",5).attr("markerUnits","userSpaceOnUse").attr("markerWidth",8).attr("markerHeight",8).attr("orient","auto").append("path").attr("d","M 0 5 L 10 10 L 10 0 z").attr("class","arrowMarkerPath").style("stroke-width",1).style("stroke-dasharray","1,0")},"point"),W9e=o((t,e,r)=>{t.append("marker").attr("id",r+"_"+e+"-circleEnd").attr("class","marker "+e).attr("viewBox","0 0 10 10").attr("refX",11).attr("refY",5).attr("markerUnits","userSpaceOnUse").attr("markerWidth",11).attr("markerHeight",11).attr("orient","auto").append("circle").attr("cx","5").attr("cy","5").attr("r","5").attr("class","arrowMarkerPath").style("stroke-width",1).style("stroke-dasharray","1,0"),t.append("marker").attr("id",r+"_"+e+"-circleStart").attr("class","marker "+e).attr("viewBox","0 0 10 10").attr("refX",-1).attr("refY",5).attr("markerUnits","userSpaceOnUse").attr("markerWidth",11).attr("markerHeight",11).attr("orient","auto").append("circle").attr("cx","5").attr("cy","5").attr("r","5").attr("class","arrowMarkerPath").style("stroke-width",1).style("stroke-dasharray","1,0")},"circle"),Y9e=o((t,e,r)=>{t.append("marker").attr("id",r+"_"+e+"-crossEnd").attr("class","marker cross "+e).attr("viewBox","0 0 11 11").attr("refX",12).attr("refY",5.2).attr("markerUnits","userSpaceOnUse").attr("markerWidth",11).attr("markerHeight",11).attr("orient","auto").append("path").attr("d","M 1,1 l 9,9 M 10,1 l -9,9").attr("class","arrowMarkerPath").style("stroke-width",2).style("stroke-dasharray","1,0"),t.append("marker").attr("id",r+"_"+e+"-crossStart").attr("class","marker cross "+e).attr("viewBox","0 0 11 11").attr("refX",-1).attr("refY",5.2).attr("markerUnits","userSpaceOnUse").attr("markerWidth",11).attr("markerHeight",11).attr("orient","auto").append("path").attr("d","M 1,1 l 9,9 M 10,1 l -9,9").attr("class","arrowMarkerPath").style("stroke-width",2).style("stroke-dasharray","1,0")},"cross"),q9e=o((t,e,r)=>{t.append("defs").append("marker").attr("id",r+"_"+e+"-barbEnd").attr("refX",19).attr("refY",7).attr("markerWidth",20).attr("markerHeight",14).attr("markerUnits","userSpaceOnUse").attr("orient","auto").append("path").attr("d","M 19,7 L9,13 L14,7 L9,1 Z")},"barb"),X9e={extension:z9e,composition:G9e,aggregation:$9e,dependency:V9e,lollipop:U9e,point:H9e,circle:W9e,cross:Y9e,barb:q9e},iw=F9e});async function gm(t,e,r){let n,i;e.shape==="rect"&&(e.rx&&e.ry?e.shape="roundedRect":e.shape="squareRect");let a=e.shape?z9[e.shape]:void 0;if(!a)throw new Error(`No such shape: ${e.shape}. Please check your syntax.`);if(e.link){let s;r.config.securityLevel==="sandbox"?s="_top":e.linkTarget&&(s=e.linkTarget||"_blank"),n=t.insert("svg:a").attr("xlink:href",e.link).attr("target",s??null),i=await a(n,e,r)}else i=await a(t,e,r),n=i;return e.tooltip&&i.attr("title",e.tooltip),aw.set(e.id,n),e.haveCallback&&n.attr("class",n.attr("class")+" clickable"),n}var aw,aJ,sJ,_v,sw=M(()=>{"use strict";ht();G9();aw=new Map;o(gm,"insertNode");aJ=o((t,e)=>{aw.set(e.id,t)},"setNodeElem"),sJ=o(()=>{aw.clear()},"clear"),_v=o(t=>{let e=aw.get(t.id);Y.trace("Transforming node",t.diff,t,"translate("+(t.x-t.width/2-5)+", "+t.width/2+")");let r=8,n=t.diff||0;return t.clusterNode?e.attr("transform","translate("+(t.x+n-t.width/2)+", "+(t.y-t.height/2-r)+")"):e.attr("transform","translate("+t.x+", "+t.y+")"),n},"positionNode")});var oJ,lJ=M(()=>{"use strict";Ua();fr();ht();K5();cL();uL();sw();Ft();hr();oJ={common:je,getConfig:Sr,insertCluster:mm,insertEdge:nw,insertEdgeLabel:tw,insertMarkers:iw,insertNode:gm,interpolateToCurve:Q_,labelHelper:ot,log:Y,positionEdgeLabel:rw}});function K9e(t){return typeof t=="symbol"||Zn(t)&&ca(t)==j9e}var j9e,ro,Ld=M(()=>{"use strict";xu();Mo();j9e="[object Symbol]";o(K9e,"isSymbol");ro=K9e});function Q9e(t,e){for(var r=-1,n=t==null?0:t.length,i=Array(n);++r<n;)i[r]=e(t[r],r,t);return i}var As,Dd=M(()=>{"use strict";o(Q9e,"arrayMap");As=Q9e});function hJ(t){if(typeof t=="string")return t;if(Mt(t))return As(t,hJ)+"";if(ro(t))return uJ?uJ.call(t):"";var e=t+"";return e=="0"&&1/t==-Z9e?"-0":e}var Z9e,cJ,uJ,fJ,dJ=M(()=>{"use strict";gd();Dd();Vn();Ld();Z9e=1/0,cJ=ea?ea.prototype:void 0,uJ=cJ?cJ.toString:void 0;o(hJ,"baseToString");fJ=hJ});function eLe(t){for(var e=t.length;e--&&J9e.test(t.charAt(e)););return e}var J9e,pJ,mJ=M(()=>{"use strict";J9e=/\s/;o(eLe,"trimmedEndIndex");pJ=eLe});function rLe(t){return t&&t.slice(0,pJ(t)+1).replace(tLe,"")}var tLe,gJ,yJ=M(()=>{"use strict";mJ();tLe=/^\s+/;o(rLe,"baseTrim");gJ=rLe});function oLe(t){if(typeof t=="number")return t;if(ro(t))return vJ;if(yn(t)){var e=typeof t.valueOf=="function"?t.valueOf():t;t=yn(e)?e+"":e}if(typeof t!="string")return t===0?t:+t;t=gJ(t);var r=iLe.test(t);return r||aLe.test(t)?sLe(t.slice(2),r?2:8):nLe.test(t)?vJ:+t}var vJ,nLe,iLe,aLe,sLe,xJ,bJ=M(()=>{"use strict";yJ();Qs();Ld();vJ=NaN,nLe=/^[-+]0x[0-9a-f]+$/i,iLe=/^0b[01]+$/i,aLe=/^0o[0-7]+$/i,sLe=parseInt;o(oLe,"toNumber");xJ=oLe});function cLe(t){if(!t)return t===0?t:0;if(t=xJ(t),t===wJ||t===-wJ){var e=t<0?-1:1;return e*lLe}return t===t?t:0}var wJ,lLe,ym,hL=M(()=>{"use strict";bJ();wJ=1/0,lLe=17976931348623157e292;o(cLe,"toFinite");ym=cLe});function uLe(t){var e=ym(t),r=e%1;return e===e?r?e-r:e:0}var vc,vm=M(()=>{"use strict";hL();o(uLe,"toInteger");vc=uLe});var hLe,ow,TJ=M(()=>{"use strict";Ch();No();hLe=vs(ai,"WeakMap"),ow=hLe});function fLe(){}var Jn,fL=M(()=>{"use strict";o(fLe,"noop");Jn=fLe});function dLe(t,e){for(var r=-1,n=t==null?0:t.length;++r<n&&e(t[r],r,t)!==!1;);return t}var lw,dL=M(()=>{"use strict";o(dLe,"arrayEach");lw=dLe});function pLe(t,e,r,n){for(var i=t.length,a=r+(n?1:-1);n?a--:++a<i;)if(e(t[a],a,t))return a;return-1}var cw,pL=M(()=>{"use strict";o(pLe,"baseFindIndex");cw=pLe});function mLe(t){return t!==t}var kJ,EJ=M(()=>{"use strict";o(mLe,"baseIsNaN");kJ=mLe});function gLe(t,e,r){for(var n=r-1,i=t.length;++n<i;)if(t[n]===e)return n;return-1}var SJ,CJ=M(()=>{"use strict";o(gLe,"strictIndexOf");SJ=gLe});function yLe(t,e,r){return e===e?SJ(t,e,r):cw(t,kJ,r)}var xm,uw=M(()=>{"use strict";pL();EJ();CJ();o(yLe,"baseIndexOf");xm=yLe});function vLe(t,e){var r=t==null?0:t.length;return!!r&&xm(t,e,0)>-1}var hw,mL=M(()=>{"use strict";uw();o(vLe,"arrayIncludes");hw=vLe});var xLe,AJ,_J=M(()=>{"use strict";F_();xLe=n5(Object.keys,Object),AJ=xLe});function TLe(t){if(!fc(t))return AJ(t);var e=[];for(var r in Object(t))wLe.call(t,r)&&r!="constructor"&&e.push(r);return e}var bLe,wLe,bm,fw=M(()=>{"use strict";Kp();_J();bLe=Object.prototype,wLe=bLe.hasOwnProperty;o(TLe,"baseKeys");bm=TLe});function kLe(t){return si(t)?l5(t):bm(t)}var zr,xc=M(()=>{"use strict";U_();fw();Io();o(kLe,"keys");zr=kLe});var ELe,SLe,CLe,ha,LJ=M(()=>{"use strict";em();wd();q_();Io();Kp();xc();ELe=Object.prototype,SLe=ELe.hasOwnProperty,CLe=h5(function(t,e){if(fc(e)||si(e)){Bo(e,zr(e),t);return}for(var r in e)SLe.call(e,r)&&dc(t,r,e[r])}),ha=CLe});function LLe(t,e){if(Mt(t))return!1;var r=typeof t;return r=="number"||r=="symbol"||r=="boolean"||t==null||ro(t)?!0:_Le.test(t)||!ALe.test(t)||e!=null&&t in Object(e)}var ALe,_Le,wm,dw=M(()=>{"use strict";Vn();Ld();ALe=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,_Le=/^\w*$/;o(LLe,"isKey");wm=LLe});function NLe(t){var e=Vp(t,function(n){return r.size===DLe&&r.clear(),n}),r=e.cache;return e}var DLe,DJ,NJ=M(()=>{"use strict";N_();DLe=500;o(NLe,"memoizeCapped");DJ=NLe});var RLe,MLe,ILe,RJ,MJ=M(()=>{"use strict";NJ();RLe=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,MLe=/\\(\\)?/g,ILe=DJ(function(t){var e=[];return t.charCodeAt(0)===46&&e.push(""),t.replace(RLe,function(r,n,i,a){e.push(i?a.replace(MLe,"$1"):n||r)}),e}),RJ=ILe});function OLe(t){return t==null?"":fJ(t)}var pw,gL=M(()=>{"use strict";dJ();o(OLe,"toString");pw=OLe});function PLe(t,e){return Mt(t)?t:wm(t,e)?[t]:RJ(pw(t))}var Uh,Lv=M(()=>{"use strict";Vn();dw();MJ();gL();o(PLe,"castPath");Uh=PLe});function FLe(t){if(typeof t=="string"||ro(t))return t;var e=t+"";return e=="0"&&1/t==-BLe?"-0":e}var BLe,bc,Tm=M(()=>{"use strict";Ld();BLe=1/0;o(FLe,"toKey");bc=FLe});function zLe(t,e){e=Uh(e,t);for(var r=0,n=e.length;t!=null&&r<n;)t=t[bc(e[r++])];return r&&r==n?t:void 0}var Hh,Dv=M(()=>{"use strict";Lv();Tm();o(zLe,"baseGet");Hh=zLe});function GLe(t,e,r){var n=t==null?void 0:Hh(t,e);return n===void 0?r:n}var IJ,OJ=M(()=>{"use strict";Dv();o(GLe,"get");IJ=GLe});function $Le(t,e){for(var r=-1,n=e.length,i=t.length;++r<n;)t[i+r]=e[r];return t}var km,mw=M(()=>{"use strict";o($Le,"arrayPush");km=$Le});function VLe(t){return Mt(t)||Al(t)||!!(PJ&&t&&t[PJ])}var PJ,BJ,FJ=M(()=>{"use strict";gd();Qp();Vn();PJ=ea?ea.isConcatSpreadable:void 0;o(VLe,"isFlattenable");BJ=VLe});function zJ(t,e,r,n,i){var a=-1,s=t.length;for(r||(r=BJ),i||(i=[]);++a<s;){var l=t[a];e>0&&r(l)?e>1?zJ(l,e-1,r,n,i):km(i,l):n||(i[i.length]=l)}return i}var wc,Em=M(()=>{"use strict";mw();FJ();o(zJ,"baseFlatten");wc=zJ});function ULe(t){var e=t==null?0:t.length;return e?wc(t,1):[]}var Wr,gw=M(()=>{"use strict";Em();o(ULe,"flatten");Wr=ULe});function HLe(t){return u5(c5(t,void 0,Wr),t+"")}var GJ,$J=M(()=>{"use strict";gw();H_();Y_();o(HLe,"flatRest");GJ=HLe});function WLe(t,e,r){var n=-1,i=t.length;e<0&&(e=-e>i?0:i+e),r=r>i?i:r,r<0&&(r+=i),i=e>r?0:r-e>>>0,e>>>=0;for(var a=Array(i);++n<i;)a[n]=t[n+e];return a}var yw,yL=M(()=>{"use strict";o(WLe,"baseSlice");yw=WLe});function eDe(t){return JLe.test(t)}var YLe,qLe,XLe,jLe,KLe,QLe,ZLe,JLe,VJ,UJ=M(()=>{"use strict";YLe="\\ud800-\\udfff",qLe="\\u0300-\\u036f",XLe="\\ufe20-\\ufe2f",jLe="\\u20d0-\\u20ff",KLe=qLe+XLe+jLe,QLe="\\ufe0e\\ufe0f",ZLe="\\u200d",JLe=RegExp("["+ZLe+YLe+KLe+QLe+"]");o(eDe,"hasUnicode");VJ=eDe});function tDe(t,e,r,n){var i=-1,a=t==null?0:t.length;for(n&&a&&(r=t[++i]);++i<a;)r=e(r,t[i],i,t);return r}var HJ,WJ=M(()=>{"use strict";o(tDe,"arrayReduce");HJ=tDe});function rDe(t,e){return t&&Bo(e,zr(e),t)}var YJ,qJ=M(()=>{"use strict";wd();xc();o(rDe,"baseAssign");YJ=rDe});function nDe(t,e){return t&&Bo(e,xs(e),t)}var XJ,jJ=M(()=>{"use strict";wd();Mh();o(nDe,"baseAssignIn");XJ=nDe});function iDe(t,e){for(var r=-1,n=t==null?0:t.length,i=0,a=[];++r<n;){var s=t[r];e(s,r,t)&&(a[i++]=s)}return a}var Sm,vw=M(()=>{"use strict";o(iDe,"arrayFilter");Sm=iDe});function aDe(){return[]}var xw,vL=M(()=>{"use strict";o(aDe,"stubArray");xw=aDe});var sDe,oDe,KJ,lDe,Cm,bw=M(()=>{"use strict";vw();vL();sDe=Object.prototype,oDe=sDe.propertyIsEnumerable,KJ=Object.getOwnPropertySymbols,lDe=KJ?function(t){return t==null?[]:(t=Object(t),Sm(KJ(t),function(e){return oDe.call(t,e)}))}:xw,Cm=lDe});function cDe(t,e){return Bo(t,Cm(t),e)}var QJ,ZJ=M(()=>{"use strict";wd();bw();o(cDe,"copySymbols");QJ=cDe});var uDe,hDe,ww,xL=M(()=>{"use strict";mw();i5();bw();vL();uDe=Object.getOwnPropertySymbols,hDe=uDe?function(t){for(var e=[];t;)km(e,Cm(t)),t=jp(t);return e}:xw,ww=hDe});function fDe(t,e){return Bo(t,ww(t),e)}var JJ,eee=M(()=>{"use strict";wd();xL();o(fDe,"copySymbolsIn");JJ=fDe});function dDe(t,e,r){var n=e(t);return Mt(t)?n:km(n,r(t))}var Tw,bL=M(()=>{"use strict";mw();Vn();o(dDe,"baseGetAllKeys");Tw=dDe});function pDe(t){return Tw(t,zr,Cm)}var Nv,wL=M(()=>{"use strict";bL();bw();xc();o(pDe,"getAllKeys");Nv=pDe});function mDe(t){return Tw(t,xs,ww)}var kw,TL=M(()=>{"use strict";bL();xL();Mh();o(mDe,"getAllKeysIn");kw=mDe});var gDe,Ew,tee=M(()=>{"use strict";Ch();No();gDe=vs(ai,"DataView"),Ew=gDe});var yDe,Sw,ree=M(()=>{"use strict";Ch();No();yDe=vs(ai,"Promise"),Sw=yDe});var vDe,Wh,kL=M(()=>{"use strict";Ch();No();vDe=vs(ai,"Set"),Wh=vDe});var nee,xDe,iee,aee,see,oee,bDe,wDe,TDe,kDe,EDe,Nd,no,Rd=M(()=>{"use strict";tee();K3();ree();kL();TJ();xu();__();nee="[object Map]",xDe="[object Object]",iee="[object Promise]",aee="[object Set]",see="[object WeakMap]",oee="[object DataView]",bDe=bu(Ew),wDe=bu(Lh),TDe=bu(Sw),kDe=bu(Wh),EDe=bu(ow),Nd=ca;(Ew&&Nd(new Ew(new ArrayBuffer(1)))!=oee||Lh&&Nd(new Lh)!=nee||Sw&&Nd(Sw.resolve())!=iee||Wh&&Nd(new Wh)!=aee||ow&&Nd(new ow)!=see)&&(Nd=o(function(t){var e=ca(t),r=e==xDe?t.constructor:void 0,n=r?bu(r):"";if(n)switch(n){case bDe:return oee;case wDe:return nee;case TDe:return iee;case kDe:return aee;case EDe:return see}return e},"getTag"));no=Nd});function ADe(t){var e=t.length,r=new t.constructor(e);return e&&typeof t[0]=="string"&&CDe.call(t,"index")&&(r.index=t.index,r.input=t.input),r}var SDe,CDe,lee,cee=M(()=>{"use strict";SDe=Object.prototype,CDe=SDe.hasOwnProperty;o(ADe,"initCloneArray");lee=ADe});function _De(t,e){var r=e?Xp(t.buffer):t.buffer;return new t.constructor(r,t.byteOffset,t.byteLength)}var uee,hee=M(()=>{"use strict";e5();o(_De,"cloneDataView");uee=_De});function DDe(t){var e=new t.constructor(t.source,LDe.exec(t));return e.lastIndex=t.lastIndex,e}var LDe,fee,dee=M(()=>{"use strict";LDe=/\w*$/;o(DDe,"cloneRegExp");fee=DDe});function NDe(t){return mee?Object(mee.call(t)):{}}var pee,mee,gee,yee=M(()=>{"use strict";gd();pee=ea?ea.prototype:void 0,mee=pee?pee.valueOf:void 0;o(NDe,"cloneSymbol");gee=NDe});function QDe(t,e,r){var n=t.constructor;switch(e){case GDe:return Xp(t);case RDe:case MDe:return new n(+t);case $De:return uee(t,r);case VDe:case UDe:case HDe:case WDe:case YDe:case qDe:case XDe:case jDe:case KDe:return t5(t,r);case IDe:return new n;case ODe:case FDe:return new n(t);case PDe:return fee(t);case BDe:return new n;case zDe:return gee(t)}}var RDe,MDe,IDe,ODe,PDe,BDe,FDe,zDe,GDe,$De,VDe,UDe,HDe,WDe,YDe,qDe,XDe,jDe,KDe,vee,xee=M(()=>{"use strict";e5();hee();dee();yee();P_();RDe="[object Boolean]",MDe="[object Date]",IDe="[object Map]",ODe="[object Number]",PDe="[object RegExp]",BDe="[object Set]",FDe="[object String]",zDe="[object Symbol]",GDe="[object ArrayBuffer]",$De="[object DataView]",VDe="[object Float32Array]",UDe="[object Float64Array]",HDe="[object Int8Array]",WDe="[object Int16Array]",YDe="[object Int32Array]",qDe="[object Uint8Array]",XDe="[object Uint8ClampedArray]",jDe="[object Uint16Array]",KDe="[object Uint32Array]";o(QDe,"initCloneByTag");vee=QDe});function JDe(t){return Zn(t)&&no(t)==ZDe}var ZDe,bee,wee=M(()=>{"use strict";Rd();Mo();ZDe="[object Map]";o(JDe,"baseIsMap");bee=JDe});var Tee,eNe,kee,Eee=M(()=>{"use strict";wee();bd();nv();Tee=Po&&Po.isMap,eNe=Tee?Oo(Tee):bee,kee=eNe});function rNe(t){return Zn(t)&&no(t)==tNe}var tNe,See,Cee=M(()=>{"use strict";Rd();Mo();tNe="[object Set]";o(rNe,"baseIsSet");See=rNe});var Aee,nNe,_ee,Lee=M(()=>{"use strict";Cee();bd();nv();Aee=Po&&Po.isSet,nNe=Aee?Oo(Aee):See,_ee=nNe});function Cw(t,e,r,n,i,a){var s,l=e&iNe,u=e&aNe,h=e&sNe;if(r&&(s=i?r(t,n,i,a):r(t)),s!==void 0)return s;if(!yn(t))return t;var f=Mt(t);if(f){if(s=lee(t),!l)return r5(t,s)}else{var d=no(t),p=d==Nee||d==hNe;if(_l(t))return J3(t,l);if(d==Ree||d==Dee||p&&!i){if(s=u||p?{}:a5(t),!l)return u?JJ(t,XJ(s,t)):QJ(t,YJ(s,t))}else{if(!Sn[d])return i?t:{};s=vee(t,d,l)}}a||(a=new uc);var m=a.get(t);if(m)return m;a.set(t,s),_ee(t)?t.forEach(function(v){s.add(Cw(v,e,r,v,t,a))}):kee(t)&&t.forEach(function(v,x){s.set(x,Cw(v,e,r,x,t,a))});var g=h?u?kw:Nv:u?xs:zr,y=f?void 0:g(t);return lw(y||t,function(v,x){y&&(x=v,v=t[x]),dc(s,x,Cw(v,e,r,x,t,a))}),s}var iNe,aNe,sNe,Dee,oNe,lNe,cNe,uNe,Nee,hNe,fNe,dNe,Ree,pNe,mNe,gNe,yNe,vNe,xNe,bNe,wNe,TNe,kNe,ENe,SNe,CNe,ANe,_Ne,LNe,Sn,Aw,EL=M(()=>{"use strict";ev();dL();em();qJ();jJ();I_();B_();ZJ();eee();wL();TL();Rd();cee();xee();z_();Vn();Jp();Eee();Qs();Lee();xc();Mh();iNe=1,aNe=2,sNe=4,Dee="[object Arguments]",oNe="[object Array]",lNe="[object Boolean]",cNe="[object Date]",uNe="[object Error]",Nee="[object Function]",hNe="[object GeneratorFunction]",fNe="[object Map]",dNe="[object Number]",Ree="[object Object]",pNe="[object RegExp]",mNe="[object Set]",gNe="[object String]",yNe="[object Symbol]",vNe="[object WeakMap]",xNe="[object ArrayBuffer]",bNe="[object DataView]",wNe="[object Float32Array]",TNe="[object Float64Array]",kNe="[object Int8Array]",ENe="[object Int16Array]",SNe="[object Int32Array]",CNe="[object Uint8Array]",ANe="[object Uint8ClampedArray]",_Ne="[object Uint16Array]",LNe="[object Uint32Array]",Sn={};Sn[Dee]=Sn[oNe]=Sn[xNe]=Sn[bNe]=Sn[lNe]=Sn[cNe]=Sn[wNe]=Sn[TNe]=Sn[kNe]=Sn[ENe]=Sn[SNe]=Sn[fNe]=Sn[dNe]=Sn[Ree]=Sn[pNe]=Sn[mNe]=Sn[gNe]=Sn[yNe]=Sn[CNe]=Sn[ANe]=Sn[_Ne]=Sn[LNe]=!0;Sn[uNe]=Sn[Nee]=Sn[vNe]=!1;o(Cw,"baseClone");Aw=Cw});function NNe(t){return Aw(t,DNe)}var DNe,rn,SL=M(()=>{"use strict";EL();DNe=4;o(NNe,"clone");rn=NNe});function INe(t){return Aw(t,RNe|MNe)}var RNe,MNe,CL,Mee=M(()=>{"use strict";EL();RNe=1,MNe=4;o(INe,"cloneDeep");CL=INe});function ONe(t){for(var e=-1,r=t==null?0:t.length,n=0,i=[];++e<r;){var a=t[e];a&&(i[n++]=a)}return i}var Tc,Iee=M(()=>{"use strict";o(ONe,"compact");Tc=ONe});function BNe(t){return this.__data__.set(t,PNe),this}var PNe,Oee,Pee=M(()=>{"use strict";PNe="__lodash_hash_undefined__";o(BNe,"setCacheAdd");Oee=BNe});function FNe(t){return this.__data__.has(t)}var Bee,Fee=M(()=>{"use strict";o(FNe,"setCacheHas");Bee=FNe});function _w(t){var e=-1,r=t==null?0:t.length;for(this.__data__=new vd;++e<r;)this.add(t[e])}var Am,Lw=M(()=>{"use strict";Q3();Pee();Fee();o(_w,"SetCache");_w.prototype.add=_w.prototype.push=Oee;_w.prototype.has=Bee;Am=_w});function zNe(t,e){for(var r=-1,n=t==null?0:t.length;++r<n;)if(e(t[r],r,t))return!0;return!1}var Dw,AL=M(()=>{"use strict";o(zNe,"arraySome");Dw=zNe});function GNe(t,e){return t.has(e)}var _m,Nw=M(()=>{"use strict";o(GNe,"cacheHas");_m=GNe});function UNe(t,e,r,n,i,a){var s=r&$Ne,l=t.length,u=e.length;if(l!=u&&!(s&&u>l))return!1;var h=a.get(t),f=a.get(e);if(h&&f)return h==e&&f==t;var d=-1,p=!0,m=r&VNe?new Am:void 0;for(a.set(t,e),a.set(e,t);++d<l;){var g=t[d],y=e[d];if(n)var v=s?n(y,g,d,e,t,a):n(g,y,d,t,e,a);if(v!==void 0){if(v)continue;p=!1;break}if(m){if(!Dw(e,function(x,b){if(!_m(m,b)&&(g===x||i(g,x,r,n,a)))return m.push(b)})){p=!1;break}}else if(!(g===y||i(g,y,r,n,a))){p=!1;break}}return a.delete(t),a.delete(e),p}var $Ne,VNe,Rw,_L=M(()=>{"use strict";Lw();AL();Nw();$Ne=1,VNe=2;o(UNe,"equalArrays");Rw=UNe});function HNe(t){var e=-1,r=Array(t.size);return t.forEach(function(n,i){r[++e]=[i,n]}),r}var zee,Gee=M(()=>{"use strict";o(HNe,"mapToArray");zee=HNe});function WNe(t){var e=-1,r=Array(t.size);return t.forEach(function(n){r[++e]=n}),r}var Lm,Mw=M(()=>{"use strict";o(WNe,"setToArray");Lm=WNe});function aRe(t,e,r,n,i,a,s){switch(r){case iRe:if(t.byteLength!=e.byteLength||t.byteOffset!=e.byteOffset)return!1;t=t.buffer,e=e.buffer;case nRe:return!(t.byteLength!=e.byteLength||!a(new qp(t),new qp(e)));case XNe:case jNe:case ZNe:return Ro(+t,+e);case KNe:return t.name==e.name&&t.message==e.message;case JNe:case tRe:return t==e+"";case QNe:var l=zee;case eRe:var u=n&YNe;if(l||(l=Lm),t.size!=e.size&&!u)return!1;var h=s.get(t);if(h)return h==e;n|=qNe,s.set(t,e);var f=Rw(l(t),l(e),n,i,a,s);return s.delete(t),f;case rRe:if(LL)return LL.call(t)==LL.call(e)}return!1}var YNe,qNe,XNe,jNe,KNe,QNe,ZNe,JNe,eRe,tRe,rRe,nRe,iRe,$ee,LL,Vee,Uee=M(()=>{"use strict";gd();O_();yd();_L();Gee();Mw();YNe=1,qNe=2,XNe="[object Boolean]",jNe="[object Date]",KNe="[object Error]",QNe="[object Map]",ZNe="[object Number]",JNe="[object RegExp]",eRe="[object Set]",tRe="[object String]",rRe="[object Symbol]",nRe="[object ArrayBuffer]",iRe="[object DataView]",$ee=ea?ea.prototype:void 0,LL=$ee?$ee.valueOf:void 0;o(aRe,"equalByTag");Vee=aRe});function cRe(t,e,r,n,i,a){var s=r&sRe,l=Nv(t),u=l.length,h=Nv(e),f=h.length;if(u!=f&&!s)return!1;for(var d=u;d--;){var p=l[d];if(!(s?p in e:lRe.call(e,p)))return!1}var m=a.get(t),g=a.get(e);if(m&&g)return m==e&&g==t;var y=!0;a.set(t,e),a.set(e,t);for(var v=s;++d<u;){p=l[d];var x=t[p],b=e[p];if(n)var w=s?n(b,x,p,e,t,a):n(x,b,p,t,e,a);if(!(w===void 0?x===b||i(x,b,r,n,a):w)){y=!1;break}v||(v=p=="constructor")}if(y&&!v){var _=t.constructor,T=e.constructor;_!=T&&"constructor"in t&&"constructor"in e&&!(typeof _=="function"&&_ instanceof _&&typeof T=="function"&&T instanceof T)&&(y=!1)}return a.delete(t),a.delete(e),y}var sRe,oRe,lRe,Hee,Wee=M(()=>{"use strict";wL();sRe=1,oRe=Object.prototype,lRe=oRe.hasOwnProperty;o(cRe,"equalObjects");Hee=cRe});function fRe(t,e,r,n,i,a){var s=Mt(t),l=Mt(e),u=s?qee:no(t),h=l?qee:no(e);u=u==Yee?Iw:u,h=h==Yee?Iw:h;var f=u==Iw,d=h==Iw,p=u==h;if(p&&_l(t)){if(!_l(e))return!1;s=!0,f=!1}if(p&&!f)return a||(a=new uc),s||Nh(t)?Rw(t,e,r,n,i,a):Vee(t,e,u,r,n,i,a);if(!(r&uRe)){var m=f&&Xee.call(t,"__wrapped__"),g=d&&Xee.call(e,"__wrapped__");if(m||g){var y=m?t.value():t,v=g?e.value():e;return a||(a=new uc),i(y,v,r,n,a)}}return p?(a||(a=new uc),Hee(t,e,r,n,i,a)):!1}var uRe,Yee,qee,Iw,hRe,Xee,jee,Kee=M(()=>{"use strict";ev();_L();Uee();Wee();Rd();Vn();Jp();iv();uRe=1,Yee="[object Arguments]",qee="[object Array]",Iw="[object Object]",hRe=Object.prototype,Xee=hRe.hasOwnProperty;o(fRe,"baseIsEqualDeep");jee=fRe});function Qee(t,e,r,n,i){return t===e?!0:t==null||e==null||!Zn(t)&&!Zn(e)?t!==t&&e!==e:jee(t,e,r,n,Qee,i)}var Ow,DL=M(()=>{"use strict";Kee();Mo();o(Qee,"baseIsEqual");Ow=Qee});function mRe(t,e,r,n){var i=r.length,a=i,s=!n;if(t==null)return!a;for(t=Object(t);i--;){var l=r[i];if(s&&l[2]?l[1]!==t[l[0]]:!(l[0]in t))return!1}for(;++i<a;){l=r[i];var u=l[0],h=t[u],f=l[1];if(s&&l[2]){if(h===void 0&&!(u in t))return!1}else{var d=new uc;if(n)var p=n(h,f,u,t,e,d);if(!(p===void 0?Ow(f,h,dRe|pRe,n,d):p))return!1}}return!0}var dRe,pRe,Zee,Jee=M(()=>{"use strict";ev();DL();dRe=1,pRe=2;o(mRe,"baseIsMatch");Zee=mRe});function gRe(t){return t===t&&!yn(t)}var Pw,NL=M(()=>{"use strict";Qs();o(gRe,"isStrictComparable");Pw=gRe});function yRe(t){for(var e=zr(t),r=e.length;r--;){var n=e[r],i=t[n];e[r]=[n,i,Pw(i)]}return e}var ete,tte=M(()=>{"use strict";NL();xc();o(yRe,"getMatchData");ete=yRe});function vRe(t,e){return function(r){return r==null?!1:r[t]===e&&(e!==void 0||t in Object(r))}}var Bw,RL=M(()=>{"use strict";o(vRe,"matchesStrictComparable");Bw=vRe});function xRe(t){var e=ete(t);return e.length==1&&e[0][2]?Bw(e[0][0],e[0][1]):function(r){return r===t||Zee(r,t,e)}}var rte,nte=M(()=>{"use strict";Jee();tte();RL();o(xRe,"baseMatches");rte=xRe});function bRe(t,e){return t!=null&&e in Object(t)}var ite,ate=M(()=>{"use strict";o(bRe,"baseHasIn");ite=bRe});function wRe(t,e,r){e=Uh(e,t);for(var n=-1,i=e.length,a=!1;++n<i;){var s=bc(e[n]);if(!(a=t!=null&&r(t,s)))break;t=t[s]}return a||++n!=i?a:(i=t==null?0:t.length,!!i&&Zp(i)&&Rh(s,i)&&(Mt(t)||Al(t)))}var Fw,ML=M(()=>{"use strict";Lv();Qp();Vn();sv();s5();Tm();o(wRe,"hasPath");Fw=wRe});function TRe(t,e){return t!=null&&Fw(t,e,ite)}var zw,IL=M(()=>{"use strict";ate();ML();o(TRe,"hasIn");zw=TRe});function SRe(t,e){return wm(t)&&Pw(e)?Bw(bc(t),e):function(r){var n=IJ(r,t);return n===void 0&&n===e?zw(r,t):Ow(e,n,kRe|ERe)}}var kRe,ERe,ste,ote=M(()=>{"use strict";DL();OJ();IL();dw();NL();RL();Tm();kRe=1,ERe=2;o(SRe,"baseMatchesProperty");ste=SRe});function CRe(t){return function(e){return e?.[t]}}var Gw,OL=M(()=>{"use strict";o(CRe,"baseProperty");Gw=CRe});function ARe(t){return function(e){return Hh(e,t)}}var lte,cte=M(()=>{"use strict";Dv();o(ARe,"basePropertyDeep");lte=ARe});function _Re(t){return wm(t)?Gw(bc(t)):lte(t)}var ute,hte=M(()=>{"use strict";OL();cte();dw();Tm();o(_Re,"property");ute=_Re});function LRe(t){return typeof t=="function"?t:t==null?ta:typeof t=="object"?Mt(t)?ste(t[0],t[1]):rte(t):ute(t)}var dn,Qa=M(()=>{"use strict";nte();ote();Tu();Vn();hte();o(LRe,"baseIteratee");dn=LRe});function DRe(t,e,r,n){for(var i=-1,a=t==null?0:t.length;++i<a;){var s=t[i];e(n,s,r(s),t)}return n}var fte,dte=M(()=>{"use strict";o(DRe,"arrayAggregator");fte=DRe});function NRe(t,e){return t&&Yp(t,e,zr)}var Dm,$w=M(()=>{"use strict";Z3();xc();o(NRe,"baseForOwn");Dm=NRe});function RRe(t,e){return function(r,n){if(r==null)return r;if(!si(r))return t(r,n);for(var i=r.length,a=e?i:-1,s=Object(r);(e?a--:++a<i)&&n(s[a],a,s)!==!1;);return r}}var pte,mte=M(()=>{"use strict";Io();o(RRe,"createBaseEach");pte=RRe});var MRe,_s,Yh=M(()=>{"use strict";$w();mte();MRe=pte(Dm),_s=MRe});function IRe(t,e,r,n){return _s(t,function(i,a,s){e(n,i,r(i),s)}),n}var gte,yte=M(()=>{"use strict";Yh();o(IRe,"baseAggregator");gte=IRe});function ORe(t,e){return function(r,n){var i=Mt(r)?fte:gte,a=e?e():{};return i(r,t,dn(n,2),a)}}var vte,xte=M(()=>{"use strict";dte();yte();Qa();Vn();o(ORe,"createAggregator");vte=ORe});var PRe,Vw,bte=M(()=>{"use strict";No();PRe=o(function(){return ai.Date.now()},"now"),Vw=PRe});var wte,BRe,FRe,qh,Tte=M(()=>{"use strict";tm();yd();Td();Mh();wte=Object.prototype,BRe=wte.hasOwnProperty,FRe=pc(function(t,e){t=Object(t);var r=-1,n=e.length,i=n>2?e[2]:void 0;for(i&&Zs(e[0],e[1],i)&&(n=1);++r<n;)for(var a=e[r],s=xs(a),l=-1,u=s.length;++l<u;){var h=s[l],f=t[h];(f===void 0||Ro(f,wte[h])&&!BRe.call(t,h))&&(t[h]=a[h])}return t}),qh=FRe});function zRe(t,e,r){for(var n=-1,i=t==null?0:t.length;++n<i;)if(r(e,t[n]))return!0;return!1}var Uw,PL=M(()=>{"use strict";o(zRe,"arrayIncludesWith");Uw=zRe});function $Re(t,e,r,n){var i=-1,a=hw,s=!0,l=t.length,u=[],h=e.length;if(!l)return u;r&&(e=As(e,Oo(r))),n?(a=Uw,s=!1):e.length>=GRe&&(a=_m,s=!1,e=new Am(e));e:for(;++i<l;){var f=t[i],d=r==null?f:r(f);if(f=n||f!==0?f:0,s&&d===d){for(var p=h;p--;)if(e[p]===d)continue e;u.push(f)}else a(e,d,n)||u.push(f)}return u}var GRe,kte,Ete=M(()=>{"use strict";Lw();mL();PL();Dd();bd();Nw();GRe=200;o($Re,"baseDifference");kte=$Re});var VRe,Xh,Ste=M(()=>{"use strict";Ete();Em();tm();o5();VRe=pc(function(t,e){return xd(t)?kte(t,wc(e,1,xd,!0)):[]}),Xh=VRe});function URe(t){var e=t==null?0:t.length;return e?t[e-1]:void 0}var fa,Cte=M(()=>{"use strict";o(URe,"last");fa=URe});function HRe(t,e,r){var n=t==null?0:t.length;return n?(e=r||e===void 0?1:vc(e),yw(t,e<0?0:e,n)):[]}var mi,Ate=M(()=>{"use strict";yL();vm();o(HRe,"drop");mi=HRe});function WRe(t,e,r){var n=t==null?0:t.length;return n?(e=r||e===void 0?1:vc(e),e=n-e,yw(t,0,e<0?0:e)):[]}var Lu,_te=M(()=>{"use strict";yL();vm();o(WRe,"dropRight");Lu=WRe});function YRe(t){return typeof t=="function"?t:ta}var Nm,Hw=M(()=>{"use strict";Tu();o(YRe,"castFunction");Nm=YRe});function qRe(t,e){var r=Mt(t)?lw:_s;return r(t,Nm(e))}var Ce,Ww=M(()=>{"use strict";dL();Yh();Hw();Vn();o(qRe,"forEach");Ce=qRe});var Lte=M(()=>{"use strict";Ww()});function XRe(t,e){for(var r=-1,n=t==null?0:t.length;++r<n;)if(!e(t[r],r,t))return!1;return!0}var Dte,Nte=M(()=>{"use strict";o(XRe,"arrayEvery");Dte=XRe});function jRe(t,e){var r=!0;return _s(t,function(n,i,a){return r=!!e(n,i,a),r}),r}var Rte,Mte=M(()=>{"use strict";Yh();o(jRe,"baseEvery");Rte=jRe});function KRe(t,e,r){var n=Mt(t)?Dte:Rte;return r&&Zs(t,e,r)&&(e=void 0),n(t,dn(e,3))}var Ra,Ite=M(()=>{"use strict";Nte();Mte();Qa();Vn();Td();o(KRe,"every");Ra=KRe});function QRe(t,e){var r=[];return _s(t,function(n,i,a){e(n,i,a)&&r.push(n)}),r}var Yw,BL=M(()=>{"use strict";Yh();o(QRe,"baseFilter");Yw=QRe});function ZRe(t,e){var r=Mt(t)?Sm:Yw;return r(t,dn(e,3))}var Yr,FL=M(()=>{"use strict";vw();BL();Qa();Vn();o(ZRe,"filter");Yr=ZRe});function JRe(t){return function(e,r,n){var i=Object(e);if(!si(e)){var a=dn(r,3);e=zr(e),r=o(function(l){return a(i[l],l,i)},"predicate")}var s=t(e,r,n);return s>-1?i[a?e[s]:s]:void 0}}var Ote,Pte=M(()=>{"use strict";Qa();Io();xc();o(JRe,"createFind");Ote=JRe});function tMe(t,e,r){var n=t==null?0:t.length;if(!n)return-1;var i=r==null?0:vc(r);return i<0&&(i=eMe(n+i,0)),cw(t,dn(e,3),i)}var eMe,Bte,Fte=M(()=>{"use strict";pL();Qa();vm();eMe=Math.max;o(tMe,"findIndex");Bte=tMe});var rMe,Za,zte=M(()=>{"use strict";Pte();Fte();rMe=Ote(Bte),Za=rMe});function nMe(t){return t&&t.length?t[0]:void 0}var ra,Gte=M(()=>{"use strict";o(nMe,"head");ra=nMe});var $te=M(()=>{"use strict";Gte()});function iMe(t,e){var r=-1,n=si(t)?Array(t.length):[];return _s(t,function(i,a,s){n[++r]=e(i,a,s)}),n}var qw,zL=M(()=>{"use strict";Yh();Io();o(iMe,"baseMap");qw=iMe});function aMe(t,e){var r=Mt(t)?As:qw;return r(t,dn(e,3))}var Je,Rm=M(()=>{"use strict";Dd();Qa();zL();Vn();o(aMe,"map");Je=aMe});function sMe(t,e){return wc(Je(t,e),1)}var da,GL=M(()=>{"use strict";Em();Rm();o(sMe,"flatMap");da=sMe});function oMe(t,e){return t==null?t:Yp(t,Nm(e),xs)}var $L,Vte=M(()=>{"use strict";Z3();Hw();Mh();o(oMe,"forIn");$L=oMe});function lMe(t,e){return t&&Dm(t,Nm(e))}var VL,Ute=M(()=>{"use strict";$w();Hw();o(lMe,"forOwn");VL=lMe});var cMe,uMe,hMe,UL,Hte=M(()=>{"use strict";Wp();xte();cMe=Object.prototype,uMe=cMe.hasOwnProperty,hMe=vte(function(t,e,r){uMe.call(t,r)?t[r].push(e):hc(t,r,[e])}),UL=hMe});function fMe(t,e){return t>e}var Wte,Yte=M(()=>{"use strict";o(fMe,"baseGt");Wte=fMe});function mMe(t,e){return t!=null&&pMe.call(t,e)}var dMe,pMe,qte,Xte=M(()=>{"use strict";dMe=Object.prototype,pMe=dMe.hasOwnProperty;o(mMe,"baseHas");qte=mMe});function gMe(t,e){return t!=null&&Fw(t,e,qte)}var It,jte=M(()=>{"use strict";Xte();ML();o(gMe,"has");It=gMe});function vMe(t){return typeof t=="string"||!Mt(t)&&Zn(t)&&ca(t)==yMe}var yMe,gi,Xw=M(()=>{"use strict";xu();Vn();Mo();yMe="[object String]";o(vMe,"isString");gi=vMe});function xMe(t,e){return As(e,function(r){return t[r]})}var Kte,Qte=M(()=>{"use strict";Dd();o(xMe,"baseValues");Kte=xMe});function bMe(t){return t==null?[]:Kte(t,zr(t))}var br,HL=M(()=>{"use strict";Qte();xc();o(bMe,"values");br=bMe});function TMe(t,e,r,n){t=si(t)?t:br(t),r=r&&!n?vc(r):0;var i=t.length;return r<0&&(r=wMe(i+r,0)),gi(t)?r<=i&&t.indexOf(e,r)>-1:!!i&&xm(t,e,r)>-1}var wMe,Hn,Zte=M(()=>{"use strict";uw();Io();Xw();vm();HL();wMe=Math.max;o(TMe,"includes");Hn=TMe});function EMe(t,e,r){var n=t==null?0:t.length;if(!n)return-1;var i=r==null?0:vc(r);return i<0&&(i=kMe(n+i,0)),xm(t,e,i)}var kMe,jw,Jte=M(()=>{"use strict";uw();vm();kMe=Math.max;o(EMe,"indexOf");jw=EMe});function LMe(t){if(t==null)return!0;if(si(t)&&(Mt(t)||typeof t=="string"||typeof t.splice=="function"||_l(t)||Nh(t)||Al(t)))return!t.length;var e=no(t);if(e==SMe||e==CMe)return!t.size;if(fc(t))return!bm(t).length;for(var r in t)if(_Me.call(t,r))return!1;return!0}var SMe,CMe,AMe,_Me,cr,Kw=M(()=>{"use strict";fw();Rd();Qp();Vn();Io();Jp();Kp();iv();SMe="[object Map]",CMe="[object Set]",AMe=Object.prototype,_Me=AMe.hasOwnProperty;o(LMe,"isEmpty");cr=LMe});function NMe(t){return Zn(t)&&ca(t)==DMe}var DMe,ere,tre=M(()=>{"use strict";xu();Mo();DMe="[object RegExp]";o(NMe,"baseIsRegExp");ere=NMe});var rre,RMe,Vo,nre=M(()=>{"use strict";tre();bd();nv();rre=Po&&Po.isRegExp,RMe=rre?Oo(rre):ere,Vo=RMe});function MMe(t){return t===void 0}var dr,ire=M(()=>{"use strict";o(MMe,"isUndefined");dr=MMe});function IMe(t,e){return t<e}var Qw,WL=M(()=>{"use strict";o(IMe,"baseLt");Qw=IMe});function OMe(t,e){var r={};return e=dn(e,3),Dm(t,function(n,i,a){hc(r,i,e(n,i,a))}),r}var Md,are=M(()=>{"use strict";Wp();$w();Qa();o(OMe,"mapValues");Md=OMe});function PMe(t,e,r){for(var n=-1,i=t.length;++n<i;){var a=t[n],s=e(a);if(s!=null&&(l===void 0?s===s&&!ro(s):r(s,l)))var l=s,u=a}return u}var Mm,Zw=M(()=>{"use strict";Ld();o(PMe,"baseExtremum");Mm=PMe});function BMe(t){return t&&t.length?Mm(t,ta,Wte):void 0}var Ls,sre=M(()=>{"use strict";Zw();Yte();Tu();o(BMe,"max");Ls=BMe});function FMe(t){return t&&t.length?Mm(t,ta,Qw):void 0}var Nl,YL=M(()=>{"use strict";Zw();WL();Tu();o(FMe,"min");Nl=FMe});function zMe(t,e){return t&&t.length?Mm(t,dn(e,2),Qw):void 0}var Id,ore=M(()=>{"use strict";Zw();Qa();WL();o(zMe,"minBy");Id=zMe});function $Me(t){if(typeof t!="function")throw new TypeError(GMe);return function(){var e=arguments;switch(e.length){case 0:return!t.call(this);case 1:return!t.call(this,e[0]);case 2:return!t.call(this,e[0],e[1]);case 3:return!t.call(this,e[0],e[1],e[2])}return!t.apply(this,e)}}var GMe,lre,cre=M(()=>{"use strict";GMe="Expected a function";o($Me,"negate");lre=$Me});function VMe(t,e,r,n){if(!yn(t))return t;e=Uh(e,t);for(var i=-1,a=e.length,s=a-1,l=t;l!=null&&++i<a;){var u=bc(e[i]),h=r;if(u==="__proto__"||u==="constructor"||u==="prototype")return t;if(i!=s){var f=l[u];h=n?n(f,u,l):void 0,h===void 0&&(h=yn(f)?f:Rh(e[i+1])?[]:{})}dc(l,u,h),l=l[u]}return t}var ure,hre=M(()=>{"use strict";em();Lv();sv();Qs();Tm();o(VMe,"baseSet");ure=VMe});function UMe(t,e,r){for(var n=-1,i=e.length,a={};++n<i;){var s=e[n],l=Hh(t,s);r(l,s)&&ure(a,Uh(s,t),l)}return a}var Jw,qL=M(()=>{"use strict";Dv();hre();Lv();o(UMe,"basePickBy");Jw=UMe});function HMe(t,e){if(t==null)return{};var r=As(kw(t),function(n){return[n]});return e=dn(e),Jw(t,r,function(n,i){return e(n,i[0])})}var Ds,fre=M(()=>{"use strict";Dd();Qa();qL();TL();o(HMe,"pickBy");Ds=HMe});function WMe(t,e){var r=t.length;for(t.sort(e);r--;)t[r]=t[r].value;return t}var dre,pre=M(()=>{"use strict";o(WMe,"baseSortBy");dre=WMe});function YMe(t,e){if(t!==e){var r=t!==void 0,n=t===null,i=t===t,a=ro(t),s=e!==void 0,l=e===null,u=e===e,h=ro(e);if(!l&&!h&&!a&&t>e||a&&s&&u&&!l&&!h||n&&s&&u||!r&&u||!i)return 1;if(!n&&!a&&!h&&t<e||h&&r&&i&&!n&&!a||l&&r&&i||!s&&i||!u)return-1}return 0}var mre,gre=M(()=>{"use strict";Ld();o(YMe,"compareAscending");mre=YMe});function qMe(t,e,r){for(var n=-1,i=t.criteria,a=e.criteria,s=i.length,l=r.length;++n<s;){var u=mre(i[n],a[n]);if(u){if(n>=l)return u;var h=r[n];return u*(h=="desc"?-1:1)}}return t.index-e.index}var yre,vre=M(()=>{"use strict";gre();o(qMe,"compareMultiple");yre=qMe});function XMe(t,e,r){e.length?e=As(e,function(a){return Mt(a)?function(s){return Hh(s,a.length===1?a[0]:a)}:a}):e=[ta];var n=-1;e=As(e,Oo(dn));var i=qw(t,function(a,s,l){var u=As(e,function(h){return h(a)});return{criteria:u,index:++n,value:a}});return dre(i,function(a,s){return yre(a,s,r)})}var xre,bre=M(()=>{"use strict";Dd();Dv();Qa();zL();pre();bd();vre();Tu();Vn();o(XMe,"baseOrderBy");xre=XMe});var jMe,wre,Tre=M(()=>{"use strict";OL();jMe=Gw("length"),wre=jMe});function oIe(t){for(var e=kre.lastIndex=0;kre.test(t);)++e;return e}var Ere,KMe,QMe,ZMe,JMe,eIe,tIe,XL,jL,rIe,Sre,Cre,Are,nIe,_re,Lre,iIe,aIe,sIe,kre,Dre,Nre=M(()=>{"use strict";Ere="\\ud800-\\udfff",KMe="\\u0300-\\u036f",QMe="\\ufe20-\\ufe2f",ZMe="\\u20d0-\\u20ff",JMe=KMe+QMe+ZMe,eIe="\\ufe0e\\ufe0f",tIe="["+Ere+"]",XL="["+JMe+"]",jL="\\ud83c[\\udffb-\\udfff]",rIe="(?:"+XL+"|"+jL+")",Sre="[^"+Ere+"]",Cre="(?:\\ud83c[\\udde6-\\uddff]){2}",Are="[\\ud800-\\udbff][\\udc00-\\udfff]",nIe="\\u200d",_re=rIe+"?",Lre="["+eIe+"]?",iIe="(?:"+nIe+"(?:"+[Sre,Cre,Are].join("|")+")"+Lre+_re+")*",aIe=Lre+_re+iIe,sIe="(?:"+[Sre+XL+"?",XL,Cre,Are,tIe].join("|")+")",kre=RegExp(jL+"(?="+jL+")|"+sIe+aIe,"g");o(oIe,"unicodeSize");Dre=oIe});function lIe(t){return VJ(t)?Dre(t):wre(t)}var Rre,Mre=M(()=>{"use strict";Tre();UJ();Nre();o(lIe,"stringSize");Rre=lIe});function cIe(t,e){return Jw(t,e,function(r,n){return zw(t,n)})}var Ire,Ore=M(()=>{"use strict";qL();IL();o(cIe,"basePick");Ire=cIe});var uIe,Od,Pre=M(()=>{"use strict";Ore();$J();uIe=GJ(function(t,e){return t==null?{}:Ire(t,e)}),Od=uIe});function dIe(t,e,r,n){for(var i=-1,a=fIe(hIe((e-t)/(r||1)),0),s=Array(a);a--;)s[n?a:++i]=t,t+=r;return s}var hIe,fIe,Bre,Fre=M(()=>{"use strict";hIe=Math.ceil,fIe=Math.max;o(dIe,"baseRange");Bre=dIe});function pIe(t){return function(e,r,n){return n&&typeof n!="number"&&Zs(e,r,n)&&(r=n=void 0),e=ym(e),r===void 0?(r=e,e=0):r=ym(r),n=n===void 0?e<r?1:-1:ym(n),Bre(e,r,n,t)}}var zre,Gre=M(()=>{"use strict";Fre();Td();hL();o(pIe,"createRange");zre=pIe});var mIe,Uo,$re=M(()=>{"use strict";Gre();mIe=zre(),Uo=mIe});function gIe(t,e,r,n,i){return i(t,function(a,s,l){r=n?(n=!1,a):e(r,a,s,l)}),r}var Vre,Ure=M(()=>{"use strict";o(gIe,"baseReduce");Vre=gIe});function yIe(t,e,r){var n=Mt(t)?HJ:Vre,i=arguments.length<3;return n(t,dn(e,4),r,i,_s)}var qr,KL=M(()=>{"use strict";WJ();Yh();Qa();Ure();Vn();o(yIe,"reduce");qr=yIe});function vIe(t,e){var r=Mt(t)?Sm:Yw;return r(t,lre(dn(e,3)))}var jh,Hre=M(()=>{"use strict";vw();BL();Qa();Vn();cre();o(vIe,"reject");jh=vIe});function wIe(t){if(t==null)return 0;if(si(t))return gi(t)?Rre(t):t.length;var e=no(t);return e==xIe||e==bIe?t.size:bm(t).length}var xIe,bIe,QL,Wre=M(()=>{"use strict";fw();Rd();Io();Xw();Mre();xIe="[object Map]",bIe="[object Set]";o(wIe,"size");QL=wIe});function TIe(t,e){var r;return _s(t,function(n,i,a){return r=e(n,i,a),!r}),!!r}var Yre,qre=M(()=>{"use strict";Yh();o(TIe,"baseSome");Yre=TIe});function kIe(t,e,r){var n=Mt(t)?Dw:Yre;return r&&Zs(t,e,r)&&(e=void 0),n(t,dn(e,3))}var Rv,Xre=M(()=>{"use strict";AL();Qa();qre();Vn();Td();o(kIe,"some");Rv=kIe});var EIe,kc,jre=M(()=>{"use strict";Em();bre();tm();Td();EIe=pc(function(t,e){if(t==null)return[];var r=e.length;return r>1&&Zs(t,e[0],e[1])?e=[]:r>2&&Zs(e[0],e[1],e[2])&&(e=[e[0]]),xre(t,wc(e,1),[])}),kc=EIe});var SIe,CIe,Kre,Qre=M(()=>{"use strict";kL();fL();Mw();SIe=1/0,CIe=Wh&&1/Lm(new Wh([,-0]))[1]==SIe?function(t){return new Wh(t)}:Jn,Kre=CIe});function _Ie(t,e,r){var n=-1,i=hw,a=t.length,s=!0,l=[],u=l;if(r)s=!1,i=Uw;else if(a>=AIe){var h=e?null:Kre(t);if(h)return Lm(h);s=!1,i=_m,u=new Am}else u=e?[]:l;e:for(;++n<a;){var f=t[n],d=e?e(f):f;if(f=r||f!==0?f:0,s&&d===d){for(var p=u.length;p--;)if(u[p]===d)continue e;e&&u.push(d),l.push(f)}else i(u,d,r)||(u!==l&&u.push(d),l.push(f))}return l}var AIe,Im,eT=M(()=>{"use strict";Lw();mL();PL();Nw();Qre();Mw();AIe=200;o(_Ie,"baseUniq");Im=_Ie});var LIe,ZL,Zre=M(()=>{"use strict";Em();tm();eT();o5();LIe=pc(function(t){return Im(wc(t,1,xd,!0))}),ZL=LIe});function DIe(t){return t&&t.length?Im(t):[]}var Om,Jre=M(()=>{"use strict";eT();o(DIe,"uniq");Om=DIe});function NIe(t,e){return t&&t.length?Im(t,dn(e,2)):[]}var ene,tne=M(()=>{"use strict";Qa();eT();o(NIe,"uniqBy");ene=NIe});function MIe(t){var e=++RIe;return pw(t)+e}var RIe,Pd,rne=M(()=>{"use strict";gL();RIe=0;o(MIe,"uniqueId");Pd=MIe});function IIe(t,e,r){for(var n=-1,i=t.length,a=e.length,s={};++n<i;){var l=n<a?e[n]:void 0;r(s,t[n],l)}return s}var nne,ine=M(()=>{"use strict";o(IIe,"baseZipObject");nne=IIe});function OIe(t,e){return nne(t||[],e||[],dc)}var tT,ane=M(()=>{"use strict";em();ine();o(OIe,"zipObject");tT=OIe});var Ht=M(()=>{"use strict";LJ();SL();Mee();Iee();W_();Tte();Ste();Ate();_te();Lte();Ite();FL();zte();$te();GL();gw();Ww();Vte();Ute();Hte();jte();Tu();Zte();Jte();Vn();Kw();jy();Qs();nre();Xw();ire();xc();Cte();Rm();are();sre();X_();YL();ore();fL();bte();Pre();fre();$re();KL();Hre();Wre();Xre();jre();Zre();Jre();rne();HL();ane();});function one(t,e){t[e]?t[e]++:t[e]=1}function lne(t,e){--t[e]||delete t[e]}function Mv(t,e,r,n){var i=""+e,a=""+r;if(!t&&i>a){var s=i;i=a,a=s}return i+sne+a+sne+(dr(n)?PIe:n)}function BIe(t,e,r,n){var i=""+e,a=""+r;if(!t&&i>a){var s=i;i=a,a=s}var l={v:i,w:a};return n&&(l.name=n),l}function JL(t,e){return Mv(t,e.v,e.w,e.name)}var PIe,Bd,sne,Mr,rT=M(()=>{"use strict";Ht();PIe="\0",Bd="\0",sne="",Mr=class{static{o(this,"Graph")}constructor(e={}){this._isDirected=Object.prototype.hasOwnProperty.call(e,"directed")?e.directed:!0,this._isMultigraph=Object.prototype.hasOwnProperty.call(e,"multigraph")?e.multigraph:!1,this._isCompound=Object.prototype.hasOwnProperty.call(e,"compound")?e.compound:!1,this._label=void 0,this._defaultNodeLabelFn=bs(void 0),this._defaultEdgeLabelFn=bs(void 0),this._nodes={},this._isCompound&&(this._parent={},this._children={},this._children[Bd]={}),this._in={},this._preds={},this._out={},this._sucs={},this._edgeObjs={},this._edgeLabels={}}isDirected(){return this._isDirected}isMultigraph(){return this._isMultigraph}isCompound(){return this._isCompound}setGraph(e){return this._label=e,this}graph(){return this._label}setDefaultNodeLabel(e){return Ei(e)||(e=bs(e)),this._defaultNodeLabelFn=e,this}nodeCount(){return this._nodeCount}nodes(){return zr(this._nodes)}sources(){var e=this;return Yr(this.nodes(),function(r){return cr(e._in[r])})}sinks(){var e=this;return Yr(this.nodes(),function(r){return cr(e._out[r])})}setNodes(e,r){var n=arguments,i=this;return Ce(e,function(a){n.length>1?i.setNode(a,r):i.setNode(a)}),this}setNode(e,r){return Object.prototype.hasOwnProperty.call(this._nodes,e)?(arguments.length>1&&(this._nodes[e]=r),this):(this._nodes[e]=arguments.length>1?r:this._defaultNodeLabelFn(e),this._isCompound&&(this._parent[e]=Bd,this._children[e]={},this._children[Bd][e]=!0),this._in[e]={},this._preds[e]={},this._out[e]={},this._sucs[e]={},++this._nodeCount,this)}node(e){return this._nodes[e]}hasNode(e){return Object.prototype.hasOwnProperty.call(this._nodes,e)}removeNode(e){if(Object.prototype.hasOwnProperty.call(this._nodes,e)){var r=o(n=>this.removeEdge(this._edgeObjs[n]),"removeEdge");delete this._nodes[e],this._isCompound&&(this._removeFromParentsChildList(e),delete this._parent[e],Ce(this.children(e),n=>{this.setParent(n)}),delete this._children[e]),Ce(zr(this._in[e]),r),delete this._in[e],delete this._preds[e],Ce(zr(this._out[e]),r),delete this._out[e],delete this._sucs[e],--this._nodeCount}return this}setParent(e,r){if(!this._isCompound)throw new Error("Cannot set parent in a non-compound graph");if(dr(r))r=Bd;else{r+="";for(var n=r;!dr(n);n=this.parent(n))if(n===e)throw new Error("Setting "+r+" as parent of "+e+" would create a cycle");this.setNode(r)}return this.setNode(e),this._removeFromParentsChildList(e),this._parent[e]=r,this._children[r][e]=!0,this}_removeFromParentsChildList(e){delete this._children[this._parent[e]][e]}parent(e){if(this._isCompound){var r=this._parent[e];if(r!==Bd)return r}}children(e){if(dr(e)&&(e=Bd),this._isCompound){var r=this._children[e];if(r)return zr(r)}else{if(e===Bd)return this.nodes();if(this.hasNode(e))return[]}}predecessors(e){var r=this._preds[e];if(r)return zr(r)}successors(e){var r=this._sucs[e];if(r)return zr(r)}neighbors(e){var r=this.predecessors(e);if(r)return ZL(r,this.successors(e))}isLeaf(e){var r;return this.isDirected()?r=this.successors(e):r=this.neighbors(e),r.length===0}filterNodes(e){var r=new this.constructor({directed:this._isDirected,multigraph:this._isMultigraph,compound:this._isCompound});r.setGraph(this.graph());var n=this;Ce(this._nodes,function(s,l){e(l)&&r.setNode(l,s)}),Ce(this._edgeObjs,function(s){r.hasNode(s.v)&&r.hasNode(s.w)&&r.setEdge(s,n.edge(s))});var i={};function a(s){var l=n.parent(s);return l===void 0||r.hasNode(l)?(i[s]=l,l):l in i?i[l]:a(l)}return o(a,"findParent"),this._isCompound&&Ce(r.nodes(),function(s){r.setParent(s,a(s))}),r}setDefaultEdgeLabel(e){return Ei(e)||(e=bs(e)),this._defaultEdgeLabelFn=e,this}edgeCount(){return this._edgeCount}edges(){return br(this._edgeObjs)}setPath(e,r){var n=this,i=arguments;return qr(e,function(a,s){return i.length>1?n.setEdge(a,s,r):n.setEdge(a,s),s}),this}setEdge(){var e,r,n,i,a=!1,s=arguments[0];typeof s=="object"&&s!==null&&"v"in s?(e=s.v,r=s.w,n=s.name,arguments.length===2&&(i=arguments[1],a=!0)):(e=s,r=arguments[1],n=arguments[3],arguments.length>2&&(i=arguments[2],a=!0)),e=""+e,r=""+r,dr(n)||(n=""+n);var l=Mv(this._isDirected,e,r,n);if(Object.prototype.hasOwnProperty.call(this._edgeLabels,l))return a&&(this._edgeLabels[l]=i),this;if(!dr(n)&&!this._isMultigraph)throw new Error("Cannot set a named edge when isMultigraph = false");this.setNode(e),this.setNode(r),this._edgeLabels[l]=a?i:this._defaultEdgeLabelFn(e,r,n);var u=BIe(this._isDirected,e,r,n);return e=u.v,r=u.w,Object.freeze(u),this._edgeObjs[l]=u,one(this._preds[r],e),one(this._sucs[e],r),this._in[r][l]=u,this._out[e][l]=u,this._edgeCount++,this}edge(e,r,n){var i=arguments.length===1?JL(this._isDirected,arguments[0]):Mv(this._isDirected,e,r,n);return this._edgeLabels[i]}hasEdge(e,r,n){var i=arguments.length===1?JL(this._isDirected,arguments[0]):Mv(this._isDirected,e,r,n);return Object.prototype.hasOwnProperty.call(this._edgeLabels,i)}removeEdge(e,r,n){var i=arguments.length===1?JL(this._isDirected,arguments[0]):Mv(this._isDirected,e,r,n),a=this._edgeObjs[i];return a&&(e=a.v,r=a.w,delete this._edgeLabels[i],delete this._edgeObjs[i],lne(this._preds[r],e),lne(this._sucs[e],r),delete this._in[r][i],delete this._out[e][i],this._edgeCount--),this}inEdges(e,r){var n=this._in[e];if(n){var i=br(n);return r?Yr(i,function(a){return a.v===r}):i}}outEdges(e,r){var n=this._out[e];if(n){var i=br(n);return r?Yr(i,function(a){return a.w===r}):i}}nodeEdges(e,r){var n=this.inEdges(e,r);if(n)return n.concat(this.outEdges(e,r))}};Mr.prototype._nodeCount=0;Mr.prototype._edgeCount=0;o(one,"incrementOrInitEntry");o(lne,"decrementOrRemoveEntry");o(Mv,"edgeArgsToId");o(BIe,"edgeArgsToObj");o(JL,"edgeObjToId")});var Ns=M(()=>{"use strict";rT()});function cne(t){t._prev._next=t._next,t._next._prev=t._prev,delete t._next,delete t._prev}function FIe(t,e){if(t!=="_next"&&t!=="_prev")return e}var nT,une=M(()=>{"use strict";nT=class{static{o(this,"List")}constructor(){var e={};e._next=e._prev=e,this._sentinel=e}dequeue(){var e=this._sentinel,r=e._prev;if(r!==e)return cne(r),r}enqueue(e){var r=this._sentinel;e._prev&&e._next&&cne(e),e._next=r._next,r._next._prev=e,r._next=e,e._prev=r}toString(){for(var e=[],r=this._sentinel,n=r._prev;n!==r;)e.push(JSON.stringify(n,FIe)),n=n._prev;return"["+e.join(", ")+"]"}};o(cne,"unlink");o(FIe,"filterOutLinks")});function hne(t,e){if(t.nodeCount()<=1)return[];var r=$Ie(t,e||zIe),n=GIe(r.graph,r.buckets,r.zeroIdx);return Wr(Je(n,function(i){return t.outEdges(i.v,i.w)}))}function GIe(t,e,r){for(var n=[],i=e[e.length-1],a=e[0],s;t.nodeCount();){for(;s=a.dequeue();)eD(t,e,r,s);for(;s=i.dequeue();)eD(t,e,r,s);if(t.nodeCount()){for(var l=e.length-2;l>0;--l)if(s=e[l].dequeue(),s){n=n.concat(eD(t,e,r,s,!0));break}}}return n}function eD(t,e,r,n,i){var a=i?[]:void 0;return Ce(t.inEdges(n.v),function(s){var l=t.edge(s),u=t.node(s.v);i&&a.push({v:s.v,w:s.w}),u.out-=l,tD(e,r,u)}),Ce(t.outEdges(n.v),function(s){var l=t.edge(s),u=s.w,h=t.node(u);h.in-=l,tD(e,r,h)}),t.removeNode(n.v),a}function $Ie(t,e){var r=new Mr,n=0,i=0;Ce(t.nodes(),function(l){r.setNode(l,{v:l,in:0,out:0})}),Ce(t.edges(),function(l){var u=r.edge(l.v,l.w)||0,h=e(l),f=u+h;r.setEdge(l.v,l.w,f),i=Math.max(i,r.node(l.v).out+=h),n=Math.max(n,r.node(l.w).in+=h)});var a=Uo(i+n+3).map(function(){return new nT}),s=n+1;return Ce(r.nodes(),function(l){tD(a,s,r.node(l))}),{graph:r,buckets:a,zeroIdx:s}}function tD(t,e,r){r.out?r.in?t[r.out-r.in+e].enqueue(r):t[t.length-1].enqueue(r):t[0].enqueue(r)}var zIe,fne=M(()=>{"use strict";Ht();Ns();une();zIe=bs(1);o(hne,"greedyFAS");o(GIe,"doGreedyFAS");o(eD,"removeNode");o($Ie,"buildState");o(tD,"assignBucket")});function dne(t){var e=t.graph().acyclicer==="greedy"?hne(t,r(t)):VIe(t);Ce(e,function(n){var i=t.edge(n);t.removeEdge(n),i.forwardName=n.name,i.reversed=!0,t.setEdge(n.w,n.v,i,Pd("rev"))});function r(n){return function(i){return n.edge(i).weight}}o(r,"weightFn")}function VIe(t){var e=[],r={},n={};function i(a){Object.prototype.hasOwnProperty.call(n,a)||(n[a]=!0,r[a]=!0,Ce(t.outEdges(a),function(s){Object.prototype.hasOwnProperty.call(r,s.w)?e.push(s):i(s.w)}),delete r[a])}return o(i,"dfs"),Ce(t.nodes(),i),e}function pne(t){Ce(t.edges(),function(e){var r=t.edge(e);if(r.reversed){t.removeEdge(e);var n=r.forwardName;delete r.reversed,delete r.forwardName,t.setEdge(e.w,e.v,r,n)}})}var rD=M(()=>{"use strict";Ht();fne();o(dne,"run");o(VIe,"dfsFAS");o(pne,"undo")});function Ec(t,e,r,n){var i;do i=Pd(n);while(t.hasNode(i));return r.dummy=e,t.setNode(i,r),i}function gne(t){var e=new Mr().setGraph(t.graph());return Ce(t.nodes(),function(r){e.setNode(r,t.node(r))}),Ce(t.edges(),function(r){var n=e.edge(r.v,r.w)||{weight:0,minlen:1},i=t.edge(r);e.setEdge(r.v,r.w,{weight:n.weight+i.weight,minlen:Math.max(n.minlen,i.minlen)})}),e}function iT(t){var e=new Mr({multigraph:t.isMultigraph()}).setGraph(t.graph());return Ce(t.nodes(),function(r){t.children(r).length||e.setNode(r,t.node(r))}),Ce(t.edges(),function(r){e.setEdge(r,t.edge(r))}),e}function nD(t,e){var r=t.x,n=t.y,i=e.x-r,a=e.y-n,s=t.width/2,l=t.height/2;if(!i&&!a)throw new Error("Not possible to find intersection inside of the rectangle");var u,h;return Math.abs(a)*s>Math.abs(i)*l?(a<0&&(l=-l),u=l*i/a,h=l):(i<0&&(s=-s),u=s,h=s*a/i),{x:r+u,y:n+h}}function Kh(t){var e=Je(Uo(aD(t)+1),function(){return[]});return Ce(t.nodes(),function(r){var n=t.node(r),i=n.rank;dr(i)||(e[i][n.order]=r)}),e}function yne(t){var e=Nl(Je(t.nodes(),function(r){return t.node(r).rank}));Ce(t.nodes(),function(r){var n=t.node(r);It(n,"rank")&&(n.rank-=e)})}function vne(t){var e=Nl(Je(t.nodes(),function(a){return t.node(a).rank})),r=[];Ce(t.nodes(),function(a){var s=t.node(a).rank-e;r[s]||(r[s]=[]),r[s].push(a)});var n=0,i=t.graph().nodeRankFactor;Ce(r,function(a,s){dr(a)&&s%i!==0?--n:n&&Ce(a,function(l){t.node(l).rank+=n})})}function iD(t,e,r,n){var i={width:0,height:0};return arguments.length>=4&&(i.rank=r,i.order=n),Ec(t,"border",i,e)}function aD(t){return Ls(Je(t.nodes(),function(e){var r=t.node(e).rank;if(!dr(r))return r}))}function xne(t,e){var r={lhs:[],rhs:[]};return Ce(t,function(n){e(n)?r.lhs.push(n):r.rhs.push(n)}),r}function bne(t,e){var r=Vw();try{return e()}finally{console.log(t+" time: "+(Vw()-r)+"ms")}}function wne(t,e){return e()}var Sc=M(()=>{"use strict";Ht();Ns();o(Ec,"addDummyNode");o(gne,"simplify");o(iT,"asNonCompoundGraph");o(nD,"intersectRect");o(Kh,"buildLayerMatrix");o(yne,"normalizeRanks");o(vne,"removeEmptyRanks");o(iD,"addBorderNode");o(aD,"maxRank");o(xne,"partition");o(bne,"time");o(wne,"notime")});function kne(t){function e(r){var n=t.children(r),i=t.node(r);if(n.length&&Ce(n,e),Object.prototype.hasOwnProperty.call(i,"minRank")){i.borderLeft=[],i.borderRight=[];for(var a=i.minRank,s=i.maxRank+1;a<s;++a)Tne(t,"borderLeft","_bl",r,i,a),Tne(t,"borderRight","_br",r,i,a)}}o(e,"dfs"),Ce(t.children(),e)}function Tne(t,e,r,n,i,a){var s={width:0,height:0,rank:a,borderType:e},l=i[e][a-1],u=Ec(t,"border",s,r);i[e][a]=u,t.setParent(u,n),l&&t.setEdge(l,u,{weight:1})}var Ene=M(()=>{"use strict";Ht();Sc();o(kne,"addBorderSegments");o(Tne,"addBorderNode")});function Cne(t){var e=t.graph().rankdir.toLowerCase();(e==="lr"||e==="rl")&&_ne(t)}function Ane(t){var e=t.graph().rankdir.toLowerCase();(e==="bt"||e==="rl")&&UIe(t),(e==="lr"||e==="rl")&&(HIe(t),_ne(t))}function _ne(t){Ce(t.nodes(),function(e){Sne(t.node(e))}),Ce(t.edges(),function(e){Sne(t.edge(e))})}function Sne(t){var e=t.width;t.width=t.height,t.height=e}function UIe(t){Ce(t.nodes(),function(e){sD(t.node(e))}),Ce(t.edges(),function(e){var r=t.edge(e);Ce(r.points,sD),Object.prototype.hasOwnProperty.call(r,"y")&&sD(r)})}function sD(t){t.y=-t.y}function HIe(t){Ce(t.nodes(),function(e){oD(t.node(e))}),Ce(t.edges(),function(e){var r=t.edge(e);Ce(r.points,oD),Object.prototype.hasOwnProperty.call(r,"x")&&oD(r)})}function oD(t){var e=t.x;t.x=t.y,t.y=e}var Lne=M(()=>{"use strict";Ht();o(Cne,"adjust");o(Ane,"undo");o(_ne,"swapWidthHeight");o(Sne,"swapWidthHeightOne");o(UIe,"reverseY");o(sD,"reverseYOne");o(HIe,"swapXY");o(oD,"swapXYOne")});function Dne(t){t.graph().dummyChains=[],Ce(t.edges(),function(e){YIe(t,e)})}function YIe(t,e){var r=e.v,n=t.node(r).rank,i=e.w,a=t.node(i).rank,s=e.name,l=t.edge(e),u=l.labelRank;if(a!==n+1){t.removeEdge(e);var h=void 0,f,d;for(d=0,++n;n<a;++d,++n)l.points=[],h={width:0,height:0,edgeLabel:l,edgeObj:e,rank:n},f=Ec(t,"edge",h,"_d"),n===u&&(h.width=l.width,h.height=l.height,h.dummy="edge-label",h.labelpos=l.labelpos),t.setEdge(r,f,{weight:l.weight},s),d===0&&t.graph().dummyChains.push(f),r=f;t.setEdge(r,i,{weight:l.weight},s)}}function Nne(t){Ce(t.graph().dummyChains,function(e){var r=t.node(e),n=r.edgeLabel,i;for(t.setEdge(r.edgeObj,n);r.dummy;)i=t.successors(e)[0],t.removeNode(e),n.points.push({x:r.x,y:r.y}),r.dummy==="edge-label"&&(n.x=r.x,n.y=r.y,n.width=r.width,n.height=r.height),e=i,r=t.node(e)})}var lD=M(()=>{"use strict";Ht();Sc();o(Dne,"run");o(YIe,"normalizeEdge");o(Nne,"undo")});function Iv(t){var e={};function r(n){var i=t.node(n);if(Object.prototype.hasOwnProperty.call(e,n))return i.rank;e[n]=!0;var a=Nl(Je(t.outEdges(n),function(s){return r(s.w)-t.edge(s).minlen}));return(a===Number.POSITIVE_INFINITY||a===void 0||a===null)&&(a=0),i.rank=a}o(r,"dfs"),Ce(t.sources(),r)}function Fd(t,e){return t.node(e.w).rank-t.node(e.v).rank-t.edge(e).minlen}var aT=M(()=>{"use strict";Ht();o(Iv,"longestPath");o(Fd,"slack")});function sT(t){var e=new Mr({directed:!1}),r=t.nodes()[0],n=t.nodeCount();e.setNode(r,{});for(var i,a;qIe(e,t)<n;)i=XIe(e,t),a=e.hasNode(i.v)?Fd(t,i):-Fd(t,i),jIe(e,t,a);return e}function qIe(t,e){function r(n){Ce(e.nodeEdges(n),function(i){var a=i.v,s=n===a?i.w:a;!t.hasNode(s)&&!Fd(e,i)&&(t.setNode(s,{}),t.setEdge(n,s,{}),r(s))})}return o(r,"dfs"),Ce(t.nodes(),r),t.nodeCount()}function XIe(t,e){return Id(e.edges(),function(r){if(t.hasNode(r.v)!==t.hasNode(r.w))return Fd(e,r)})}function jIe(t,e,r){Ce(t.nodes(),function(n){e.node(n).rank+=r})}var cD=M(()=>{"use strict";Ht();Ns();aT();o(sT,"feasibleTree");o(qIe,"tightTree");o(XIe,"findMinSlackEdge");o(jIe,"shiftRanks")});var Mne=M(()=>{"use strict"});var uD=M(()=>{"use strict"});var $Yt,hD=M(()=>{"use strict";Ht();uD();$Yt=bs(1)});var Ine=M(()=>{"use strict";hD()});var fD=M(()=>{"use strict"});var One=M(()=>{"use strict";fD()});var ZYt,Pne=M(()=>{"use strict";Ht();ZYt=bs(1)});function dD(t){var e={},r={},n=[];function i(a){if(Object.prototype.hasOwnProperty.call(r,a))throw new Ov;Object.prototype.hasOwnProperty.call(e,a)||(r[a]=!0,e[a]=!0,Ce(t.predecessors(a),i),delete r[a],n.push(a))}if(o(i,"visit"),Ce(t.sinks(),i),QL(e)!==t.nodeCount())throw new Ov;return n}function Ov(){}var pD=M(()=>{"use strict";Ht();dD.CycleException=Ov;o(dD,"topsort");o(Ov,"CycleException");Ov.prototype=new Error});var Bne=M(()=>{"use strict";pD()});function oT(t,e,r){Mt(e)||(e=[e]);var n=(t.isDirected()?t.successors:t.neighbors).bind(t),i=[],a={};return Ce(e,function(s){if(!t.hasNode(s))throw new Error("Graph does not have node: "+s);Fne(t,s,r==="post",a,n,i)}),i}function Fne(t,e,r,n,i,a){Object.prototype.hasOwnProperty.call(n,e)||(n[e]=!0,r||a.push(e),Ce(i(e),function(s){Fne(t,s,r,n,i,a)}),r&&a.push(e))}var mD=M(()=>{"use strict";Ht();o(oT,"dfs");o(Fne,"doDfs")});function gD(t,e){return oT(t,e,"post")}var zne=M(()=>{"use strict";mD();o(gD,"postorder")});function yD(t,e){return oT(t,e,"pre")}var Gne=M(()=>{"use strict";mD();o(yD,"preorder")});var $ne=M(()=>{"use strict";uD();rT()});var Vne=M(()=>{"use strict";Mne();hD();Ine();One();Pne();Bne();zne();Gne();$ne();fD();pD()});function Zh(t){t=gne(t),Iv(t);var e=sT(t);xD(e),vD(e,t);for(var r,n;r=Yne(e);)n=qne(e,t,r),Xne(e,t,r,n)}function vD(t,e){var r=gD(t,t.nodes());r=r.slice(0,r.length-1),Ce(r,function(n){eOe(t,e,n)})}function eOe(t,e,r){var n=t.node(r),i=n.parent;t.edge(r,i).cutvalue=Hne(t,e,r)}function Hne(t,e,r){var n=t.node(r),i=n.parent,a=!0,s=e.edge(r,i),l=0;return s||(a=!1,s=e.edge(i,r)),l=s.weight,Ce(e.nodeEdges(r),function(u){var h=u.v===r,f=h?u.w:u.v;if(f!==i){var d=h===a,p=e.edge(u).weight;if(l+=d?p:-p,rOe(t,r,f)){var m=t.edge(r,f).cutvalue;l+=d?-m:m}}}),l}function xD(t,e){arguments.length<2&&(e=t.nodes()[0]),Wne(t,{},1,e)}function Wne(t,e,r,n,i){var a=r,s=t.node(n);return e[n]=!0,Ce(t.neighbors(n),function(l){Object.prototype.hasOwnProperty.call(e,l)||(r=Wne(t,e,r,l,n))}),s.low=a,s.lim=r++,i?s.parent=i:delete s.parent,r}function Yne(t){return Za(t.edges(),function(e){return t.edge(e).cutvalue<0})}function qne(t,e,r){var n=r.v,i=r.w;e.hasEdge(n,i)||(n=r.w,i=r.v);var a=t.node(n),s=t.node(i),l=a,u=!1;a.lim>s.lim&&(l=s,u=!0);var h=Yr(e.edges(),function(f){return u===Une(t,t.node(f.v),l)&&u!==Une(t,t.node(f.w),l)});return Id(h,function(f){return Fd(e,f)})}function Xne(t,e,r,n){var i=r.v,a=r.w;t.removeEdge(i,a),t.setEdge(n.v,n.w,{}),xD(t),vD(t,e),tOe(t,e)}function tOe(t,e){var r=Za(t.nodes(),function(i){return!e.node(i).parent}),n=yD(t,r);n=n.slice(1),Ce(n,function(i){var a=t.node(i).parent,s=e.edge(i,a),l=!1;s||(s=e.edge(a,i),l=!0),e.node(i).rank=e.node(a).rank+(l?s.minlen:-s.minlen)})}function rOe(t,e,r){return t.hasEdge(e,r)}function Une(t,e,r){return r.low<=e.lim&&e.lim<=r.lim}var jne=M(()=>{"use strict";Ht();Vne();Sc();cD();aT();Zh.initLowLimValues=xD;Zh.initCutValues=vD;Zh.calcCutValue=Hne;Zh.leaveEdge=Yne;Zh.enterEdge=qne;Zh.exchangeEdges=Xne;o(Zh,"networkSimplex");o(vD,"initCutValues");o(eOe,"assignCutValue");o(Hne,"calcCutValue");o(xD,"initLowLimValues");o(Wne,"dfsAssignLowLim");o(Yne,"leaveEdge");o(qne,"enterEdge");o(Xne,"exchangeEdges");o(tOe,"updateRanks");o(rOe,"isTreeEdge");o(Une,"isDescendant")});function bD(t){switch(t.graph().ranker){case"network-simplex":Kne(t);break;case"tight-tree":iOe(t);break;case"longest-path":nOe(t);break;default:Kne(t)}}function iOe(t){Iv(t),sT(t)}function Kne(t){Zh(t)}var nOe,wD=M(()=>{"use strict";cD();jne();aT();o(bD,"rank");nOe=Iv;o(iOe,"tightTreeRanker");o(Kne,"networkSimplexRanker")});function Qne(t){var e=Ec(t,"root",{},"_root"),r=aOe(t),n=Ls(br(r))-1,i=2*n+1;t.graph().nestingRoot=e,Ce(t.edges(),function(s){t.edge(s).minlen*=i});var a=sOe(t)+1;Ce(t.children(),function(s){Zne(t,e,i,a,n,r,s)}),t.graph().nodeRankFactor=i}function Zne(t,e,r,n,i,a,s){var l=t.children(s);if(!l.length){s!==e&&t.setEdge(e,s,{weight:0,minlen:r});return}var u=iD(t,"_bt"),h=iD(t,"_bb"),f=t.node(s);t.setParent(u,s),f.borderTop=u,t.setParent(h,s),f.borderBottom=h,Ce(l,function(d){Zne(t,e,r,n,i,a,d);var p=t.node(d),m=p.borderTop?p.borderTop:d,g=p.borderBottom?p.borderBottom:d,y=p.borderTop?n:2*n,v=m!==g?1:i-a[s]+1;t.setEdge(u,m,{weight:y,minlen:v,nestingEdge:!0}),t.setEdge(g,h,{weight:y,minlen:v,nestingEdge:!0})}),t.parent(s)||t.setEdge(e,u,{weight:0,minlen:i+a[s]})}function aOe(t){var e={};function r(n,i){var a=t.children(n);a&&a.length&&Ce(a,function(s){r(s,i+1)}),e[n]=i}return o(r,"dfs"),Ce(t.children(),function(n){r(n,1)}),e}function sOe(t){return qr(t.edges(),function(e,r){return e+t.edge(r).weight},0)}function Jne(t){var e=t.graph();t.removeNode(e.nestingRoot),delete e.nestingRoot,Ce(t.edges(),function(r){var n=t.edge(r);n.nestingEdge&&t.removeEdge(r)})}var eie=M(()=>{"use strict";Ht();Sc();o(Qne,"run");o(Zne,"dfs");o(aOe,"treeDepths");o(sOe,"sumWeights");o(Jne,"cleanup")});function tie(t,e,r){var n={},i;Ce(r,function(a){for(var s=t.parent(a),l,u;s;){if(l=t.parent(s),l?(u=n[l],n[l]=s):(u=i,i=s),u&&u!==s){e.setEdge(u,s);return}s=l}})}var rie=M(()=>{"use strict";Ht();o(tie,"addSubgraphConstraints")});function nie(t,e,r){var n=lOe(t),i=new Mr({compound:!0}).setGraph({root:n}).setDefaultNodeLabel(function(a){return t.node(a)});return Ce(t.nodes(),function(a){var s=t.node(a),l=t.parent(a);(s.rank===e||s.minRank<=e&&e<=s.maxRank)&&(i.setNode(a),i.setParent(a,l||n),Ce(t[r](a),function(u){var h=u.v===a?u.w:u.v,f=i.edge(h,a),d=dr(f)?0:f.weight;i.setEdge(h,a,{weight:t.edge(u).weight+d})}),Object.prototype.hasOwnProperty.call(s,"minRank")&&i.setNode(a,{borderLeft:s.borderLeft[e],borderRight:s.borderRight[e]}))}),i}function lOe(t){for(var e;t.hasNode(e=Pd("_root")););return e}var iie=M(()=>{"use strict";Ht();Ns();o(nie,"buildLayerGraph");o(lOe,"createRootNode")});function aie(t,e){for(var r=0,n=1;n<e.length;++n)r+=cOe(t,e[n-1],e[n]);return r}function cOe(t,e,r){for(var n=tT(r,Je(r,function(h,f){return f})),i=Wr(Je(e,function(h){return kc(Je(t.outEdges(h),function(f){return{pos:n[f.w],weight:t.edge(f).weight}}),"pos")})),a=1;a<r.length;)a<<=1;var s=2*a-1;a-=1;var l=Je(new Array(s),function(){return 0}),u=0;return Ce(i.forEach(function(h){var f=h.pos+a;l[f]+=h.weight;for(var d=0;f>0;)f%2&&(d+=l[f+1]),f=f-1>>1,l[f]+=h.weight;u+=h.weight*d})),u}var sie=M(()=>{"use strict";Ht();o(aie,"crossCount");o(cOe,"twoLayerCrossCount")});function oie(t){var e={},r=Yr(t.nodes(),function(l){return!t.children(l).length}),n=Ls(Je(r,function(l){return t.node(l).rank})),i=Je(Uo(n+1),function(){return[]});function a(l){if(!It(e,l)){e[l]=!0;var u=t.node(l);i[u.rank].push(l),Ce(t.successors(l),a)}}o(a,"dfs");var s=kc(r,function(l){return t.node(l).rank});return Ce(s,a),i}var lie=M(()=>{"use strict";Ht();o(oie,"initOrder")});function cie(t,e){return Je(e,function(r){var n=t.inEdges(r);if(n.length){var i=qr(n,function(a,s){var l=t.edge(s),u=t.node(s.v);return{sum:a.sum+l.weight*u.order,weight:a.weight+l.weight}},{sum:0,weight:0});return{v:r,barycenter:i.sum/i.weight,weight:i.weight}}else return{v:r}})}var uie=M(()=>{"use strict";Ht();o(cie,"barycenter")});function hie(t,e){var r={};Ce(t,function(i,a){var s=r[i.v]={indegree:0,in:[],out:[],vs:[i.v],i:a};dr(i.barycenter)||(s.barycenter=i.barycenter,s.weight=i.weight)}),Ce(e.edges(),function(i){var a=r[i.v],s=r[i.w];!dr(a)&&!dr(s)&&(s.indegree++,a.out.push(r[i.w]))});var n=Yr(r,function(i){return!i.indegree});return uOe(n)}function uOe(t){var e=[];function r(a){return function(s){s.merged||(dr(s.barycenter)||dr(a.barycenter)||s.barycenter>=a.barycenter)&&hOe(a,s)}}o(r,"handleIn");function n(a){return function(s){s.in.push(a),--s.indegree===0&&t.push(s)}}for(o(n,"handleOut");t.length;){var i=t.pop();e.push(i),Ce(i.in.reverse(),r(i)),Ce(i.out,n(i))}return Je(Yr(e,function(a){return!a.merged}),function(a){return Od(a,["vs","i","barycenter","weight"])})}function hOe(t,e){var r=0,n=0;t.weight&&(r+=t.barycenter*t.weight,n+=t.weight),e.weight&&(r+=e.barycenter*e.weight,n+=e.weight),t.vs=e.vs.concat(t.vs),t.barycenter=r/n,t.weight=n,t.i=Math.min(e.i,t.i),e.merged=!0}var fie=M(()=>{"use strict";Ht();o(hie,"resolveConflicts");o(uOe,"doResolveConflicts");o(hOe,"mergeEntries")});function pie(t,e){var r=xne(t,function(f){return Object.prototype.hasOwnProperty.call(f,"barycenter")}),n=r.lhs,i=kc(r.rhs,function(f){return-f.i}),a=[],s=0,l=0,u=0;n.sort(fOe(!!e)),u=die(a,i,u),Ce(n,function(f){u+=f.vs.length,a.push(f.vs),s+=f.barycenter*f.weight,l+=f.weight,u=die(a,i,u)});var h={vs:Wr(a)};return l&&(h.barycenter=s/l,h.weight=l),h}function die(t,e,r){for(var n;e.length&&(n=fa(e)).i<=r;)e.pop(),t.push(n.vs),r++;return r}function fOe(t){return function(e,r){return e.barycenter<r.barycenter?-1:e.barycenter>r.barycenter?1:t?r.i-e.i:e.i-r.i}}var mie=M(()=>{"use strict";Ht();Sc();o(pie,"sort");o(die,"consumeUnsortable");o(fOe,"compareWithBias")});function TD(t,e,r,n){var i=t.children(e),a=t.node(e),s=a?a.borderLeft:void 0,l=a?a.borderRight:void 0,u={};s&&(i=Yr(i,function(g){return g!==s&&g!==l}));var h=cie(t,i);Ce(h,function(g){if(t.children(g.v).length){var y=TD(t,g.v,r,n);u[g.v]=y,Object.prototype.hasOwnProperty.call(y,"barycenter")&&pOe(g,y)}});var f=hie(h,r);dOe(f,u);var d=pie(f,n);if(s&&(d.vs=Wr([s,d.vs,l]),t.predecessors(s).length)){var p=t.node(t.predecessors(s)[0]),m=t.node(t.predecessors(l)[0]);Object.prototype.hasOwnProperty.call(d,"barycenter")||(d.barycenter=0,d.weight=0),d.barycenter=(d.barycenter*d.weight+p.order+m.order)/(d.weight+2),d.weight+=2}return d}function dOe(t,e){Ce(t,function(r){r.vs=Wr(r.vs.map(function(n){return e[n]?e[n].vs:n}))})}function pOe(t,e){dr(t.barycenter)?(t.barycenter=e.barycenter,t.weight=e.weight):(t.barycenter=(t.barycenter*t.weight+e.barycenter*e.weight)/(t.weight+e.weight),t.weight+=e.weight)}var gie=M(()=>{"use strict";Ht();uie();fie();mie();o(TD,"sortSubgraph");o(dOe,"expandSubgraphs");o(pOe,"mergeBarycenters")});function xie(t){var e=aD(t),r=yie(t,Uo(1,e+1),"inEdges"),n=yie(t,Uo(e-1,-1,-1),"outEdges"),i=oie(t);vie(t,i);for(var a=Number.POSITIVE_INFINITY,s,l=0,u=0;u<4;++l,++u){mOe(l%2?r:n,l%4>=2),i=Kh(t);var h=aie(t,i);h<a&&(u=0,s=CL(i),a=h)}vie(t,s)}function yie(t,e,r){return Je(e,function(n){return nie(t,n,r)})}function mOe(t,e){var r=new Mr;Ce(t,function(n){var i=n.graph().root,a=TD(n,i,r,e);Ce(a.vs,function(s,l){n.node(s).order=l}),tie(n,r,a.vs)})}function vie(t,e){Ce(e,function(r){Ce(r,function(n,i){t.node(n).order=i})})}var bie=M(()=>{"use strict";Ht();Ns();Sc();rie();iie();sie();lie();gie();o(xie,"order");o(yie,"buildLayerGraphs");o(mOe,"sweepLayerGraphs");o(vie,"assignOrder")});function wie(t){var e=yOe(t);Ce(t.graph().dummyChains,function(r){for(var n=t.node(r),i=n.edgeObj,a=gOe(t,e,i.v,i.w),s=a.path,l=a.lca,u=0,h=s[u],f=!0;r!==i.w;){if(n=t.node(r),f){for(;(h=s[u])!==l&&t.node(h).maxRank<n.rank;)u++;h===l&&(f=!1)}if(!f){for(;u<s.length-1&&t.node(h=s[u+1]).minRank<=n.rank;)u++;h=s[u]}t.setParent(r,h),r=t.successors(r)[0]}})}function gOe(t,e,r,n){var i=[],a=[],s=Math.min(e[r].low,e[n].low),l=Math.max(e[r].lim,e[n].lim),u,h;u=r;do u=t.parent(u),i.push(u);while(u&&(e[u].low>s||l>e[u].lim));for(h=u,u=n;(u=t.parent(u))!==h;)a.push(u);return{path:i.concat(a.reverse()),lca:h}}function yOe(t){var e={},r=0;function n(i){var a=r;Ce(t.children(i),n),e[i]={low:a,lim:r++}}return o(n,"dfs"),Ce(t.children(),n),e}var Tie=M(()=>{"use strict";Ht();o(wie,"parentDummyChains");o(gOe,"findPath");o(yOe,"postorder")});function vOe(t,e){var r={};function n(i,a){var s=0,l=0,u=i.length,h=fa(a);return Ce(a,function(f,d){var p=bOe(t,f),m=p?t.node(p).order:u;(p||f===h)&&(Ce(a.slice(l,d+1),function(g){Ce(t.predecessors(g),function(y){var v=t.node(y),x=v.order;(x<s||m<x)&&!(v.dummy&&t.node(g).dummy)&&kie(r,y,g)})}),l=d+1,s=m)}),a}return o(n,"visitLayer"),qr(e,n),r}function xOe(t,e){var r={};function n(a,s,l,u,h){var f;Ce(Uo(s,l),function(d){f=a[d],t.node(f).dummy&&Ce(t.predecessors(f),function(p){var m=t.node(p);m.dummy&&(m.order<u||m.order>h)&&kie(r,p,f)})})}o(n,"scan");function i(a,s){var l=-1,u,h=0;return Ce(s,function(f,d){if(t.node(f).dummy==="border"){var p=t.predecessors(f);p.length&&(u=t.node(p[0]).order,n(s,h,d,l,u),h=d,l=u)}n(s,h,s.length,u,a.length)}),s}return o(i,"visitLayer"),qr(e,i),r}function bOe(t,e){if(t.node(e).dummy)return Za(t.predecessors(e),function(r){return t.node(r).dummy})}function kie(t,e,r){if(e>r){var n=e;e=r,r=n}var i=t[e];i||(t[e]=i={}),i[r]=!0}function wOe(t,e,r){if(e>r){var n=e;e=r,r=n}return!!t[e]&&Object.prototype.hasOwnProperty.call(t[e],r)}function TOe(t,e,r,n){var i={},a={},s={};return Ce(e,function(l){Ce(l,function(u,h){i[u]=u,a[u]=u,s[u]=h})}),Ce(e,function(l){var u=-1;Ce(l,function(h){var f=n(h);if(f.length){f=kc(f,function(y){return s[y]});for(var d=(f.length-1)/2,p=Math.floor(d),m=Math.ceil(d);p<=m;++p){var g=f[p];a[h]===h&&u<s[g]&&!wOe(r,h,g)&&(a[g]=h,a[h]=i[h]=i[g],u=s[g])}}})}),{root:i,align:a}}function kOe(t,e,r,n,i){var a={},s=EOe(t,e,r,i),l=i?"borderLeft":"borderRight";function u(d,p){for(var m=s.nodes(),g=m.pop(),y={};g;)y[g]?d(g):(y[g]=!0,m.push(g),m=m.concat(p(g))),g=m.pop()}o(u,"iterate");function h(d){a[d]=s.inEdges(d).reduce(function(p,m){return Math.max(p,a[m.v]+s.edge(m))},0)}o(h,"pass1");function f(d){var p=s.outEdges(d).reduce(function(g,y){return Math.min(g,a[y.w]-s.edge(y))},Number.POSITIVE_INFINITY),m=t.node(d);p!==Number.POSITIVE_INFINITY&&m.borderType!==l&&(a[d]=Math.max(a[d],p))}return o(f,"pass2"),u(h,s.predecessors.bind(s)),u(f,s.successors.bind(s)),Ce(n,function(d){a[d]=a[r[d]]}),a}function EOe(t,e,r,n){var i=new Mr,a=t.graph(),s=_Oe(a.nodesep,a.edgesep,n);return Ce(e,function(l){var u;Ce(l,function(h){var f=r[h];if(i.setNode(f),u){var d=r[u],p=i.edge(d,f);i.setEdge(d,f,Math.max(s(t,h,u),p||0))}u=h})}),i}function SOe(t,e){return Id(br(e),function(r){var n=Number.NEGATIVE_INFINITY,i=Number.POSITIVE_INFINITY;return $L(r,function(a,s){var l=LOe(t,s)/2;n=Math.max(a+l,n),i=Math.min(a-l,i)}),n-i})}function COe(t,e){var r=br(e),n=Nl(r),i=Ls(r);Ce(["u","d"],function(a){Ce(["l","r"],function(s){var l=a+s,u=t[l],h;if(u!==e){var f=br(u);h=s==="l"?n-Nl(f):i-Ls(f),h&&(t[l]=Md(u,function(d){return d+h}))}})})}function AOe(t,e){return Md(t.ul,function(r,n){if(e)return t[e.toLowerCase()][n];var i=kc(Je(t,n));return(i[1]+i[2])/2})}function Eie(t){var e=Kh(t),r=Ih(vOe(t,e),xOe(t,e)),n={},i;Ce(["u","d"],function(s){i=s==="u"?e:br(e).reverse(),Ce(["l","r"],function(l){l==="r"&&(i=Je(i,function(d){return br(d).reverse()}));var u=(s==="u"?t.predecessors:t.successors).bind(t),h=TOe(t,i,r,u),f=kOe(t,i,h.root,h.align,l==="r");l==="r"&&(f=Md(f,function(d){return-d})),n[s+l]=f})});var a=SOe(t,n);return COe(n,a),AOe(n,t.graph().align)}function _Oe(t,e,r){return function(n,i,a){var s=n.node(i),l=n.node(a),u=0,h;if(u+=s.width/2,Object.prototype.hasOwnProperty.call(s,"labelpos"))switch(s.labelpos.toLowerCase()){case"l":h=-s.width/2;break;case"r":h=s.width/2;break}if(h&&(u+=r?h:-h),h=0,u+=(s.dummy?e:t)/2,u+=(l.dummy?e:t)/2,u+=l.width/2,Object.prototype.hasOwnProperty.call(l,"labelpos"))switch(l.labelpos.toLowerCase()){case"l":h=l.width/2;break;case"r":h=-l.width/2;break}return h&&(u+=r?h:-h),h=0,u}}function LOe(t,e){return t.node(e).width}var Sie=M(()=>{"use strict";Ht();Ns();Sc();o(vOe,"findType1Conflicts");o(xOe,"findType2Conflicts");o(bOe,"findOtherInnerSegmentNode");o(kie,"addConflict");o(wOe,"hasConflict");o(TOe,"verticalAlignment");o(kOe,"horizontalCompaction");o(EOe,"buildBlockGraph");o(SOe,"findSmallestWidthAlignment");o(COe,"alignCoordinates");o(AOe,"balance");o(Eie,"positionX");o(_Oe,"sep");o(LOe,"width")});function Cie(t){t=iT(t),DOe(t),VL(Eie(t),function(e,r){t.node(r).x=e})}function DOe(t){var e=Kh(t),r=t.graph().ranksep,n=0;Ce(e,function(i){var a=Ls(Je(i,function(s){return t.node(s).height}));Ce(i,function(s){t.node(s).y=n+a/2}),n+=a+r})}var Aie=M(()=>{"use strict";Ht();Sc();Sie();o(Cie,"position");o(DOe,"positionY")});function Du(t,e){var r=e&&e.debugTiming?bne:wne;r("layout",()=>{var n=r(" buildLayoutGraph",()=>$Oe(t));r(" runLayout",()=>NOe(n,r)),r(" updateInputGraph",()=>ROe(t,n))})}function NOe(t,e){e(" makeSpaceForEdgeLabels",()=>VOe(t)),e(" removeSelfEdges",()=>QOe(t)),e(" acyclic",()=>dne(t)),e(" nestingGraph.run",()=>Qne(t)),e(" rank",()=>bD(iT(t))),e(" injectEdgeLabelProxies",()=>UOe(t)),e(" removeEmptyRanks",()=>vne(t)),e(" nestingGraph.cleanup",()=>Jne(t)),e(" normalizeRanks",()=>yne(t)),e(" assignRankMinMax",()=>HOe(t)),e(" removeEdgeLabelProxies",()=>WOe(t)),e(" normalize.run",()=>Dne(t)),e(" parentDummyChains",()=>wie(t)),e(" addBorderSegments",()=>kne(t)),e(" order",()=>xie(t)),e(" insertSelfEdges",()=>ZOe(t)),e(" adjustCoordinateSystem",()=>Cne(t)),e(" position",()=>Cie(t)),e(" positionSelfEdges",()=>JOe(t)),e(" removeBorderNodes",()=>KOe(t)),e(" normalize.undo",()=>Nne(t)),e(" fixupEdgeLabelCoords",()=>XOe(t)),e(" undoCoordinateSystem",()=>Ane(t)),e(" translateGraph",()=>YOe(t)),e(" assignNodeIntersects",()=>qOe(t)),e(" reversePoints",()=>jOe(t)),e(" acyclic.undo",()=>pne(t))}function ROe(t,e){Ce(t.nodes(),function(r){var n=t.node(r),i=e.node(r);n&&(n.x=i.x,n.y=i.y,e.children(r).length&&(n.width=i.width,n.height=i.height))}),Ce(t.edges(),function(r){var n=t.edge(r),i=e.edge(r);n.points=i.points,Object.prototype.hasOwnProperty.call(i,"x")&&(n.x=i.x,n.y=i.y)}),t.graph().width=e.graph().width,t.graph().height=e.graph().height}function $Oe(t){var e=new Mr({multigraph:!0,compound:!0}),r=ED(t.graph());return e.setGraph(Ih({},IOe,kD(r,MOe),Od(r,OOe))),Ce(t.nodes(),function(n){var i=ED(t.node(n));e.setNode(n,qh(kD(i,POe),BOe)),e.setParent(n,t.parent(n))}),Ce(t.edges(),function(n){var i=ED(t.edge(n));e.setEdge(n,Ih({},zOe,kD(i,FOe),Od(i,GOe)))}),e}function VOe(t){var e=t.graph();e.ranksep/=2,Ce(t.edges(),function(r){var n=t.edge(r);n.minlen*=2,n.labelpos.toLowerCase()!=="c"&&(e.rankdir==="TB"||e.rankdir==="BT"?n.width+=n.labeloffset:n.height+=n.labeloffset)})}function UOe(t){Ce(t.edges(),function(e){var r=t.edge(e);if(r.width&&r.height){var n=t.node(e.v),i=t.node(e.w),a={rank:(i.rank-n.rank)/2+n.rank,e};Ec(t,"edge-proxy",a,"_ep")}})}function HOe(t){var e=0;Ce(t.nodes(),function(r){var n=t.node(r);n.borderTop&&(n.minRank=t.node(n.borderTop).rank,n.maxRank=t.node(n.borderBottom).rank,e=Ls(e,n.maxRank))}),t.graph().maxRank=e}function WOe(t){Ce(t.nodes(),function(e){var r=t.node(e);r.dummy==="edge-proxy"&&(t.edge(r.e).labelRank=r.rank,t.removeNode(e))})}function YOe(t){var e=Number.POSITIVE_INFINITY,r=0,n=Number.POSITIVE_INFINITY,i=0,a=t.graph(),s=a.marginx||0,l=a.marginy||0;function u(h){var f=h.x,d=h.y,p=h.width,m=h.height;e=Math.min(e,f-p/2),r=Math.max(r,f+p/2),n=Math.min(n,d-m/2),i=Math.max(i,d+m/2)}o(u,"getExtremes"),Ce(t.nodes(),function(h){u(t.node(h))}),Ce(t.edges(),function(h){var f=t.edge(h);Object.prototype.hasOwnProperty.call(f,"x")&&u(f)}),e-=s,n-=l,Ce(t.nodes(),function(h){var f=t.node(h);f.x-=e,f.y-=n}),Ce(t.edges(),function(h){var f=t.edge(h);Ce(f.points,function(d){d.x-=e,d.y-=n}),Object.prototype.hasOwnProperty.call(f,"x")&&(f.x-=e),Object.prototype.hasOwnProperty.call(f,"y")&&(f.y-=n)}),a.width=r-e+s,a.height=i-n+l}function qOe(t){Ce(t.edges(),function(e){var r=t.edge(e),n=t.node(e.v),i=t.node(e.w),a,s;r.points?(a=r.points[0],s=r.points[r.points.length-1]):(r.points=[],a=i,s=n),r.points.unshift(nD(n,a)),r.points.push(nD(i,s))})}function XOe(t){Ce(t.edges(),function(e){var r=t.edge(e);if(Object.prototype.hasOwnProperty.call(r,"x"))switch((r.labelpos==="l"||r.labelpos==="r")&&(r.width-=r.labeloffset),r.labelpos){case"l":r.x-=r.width/2+r.labeloffset;break;case"r":r.x+=r.width/2+r.labeloffset;break}})}function jOe(t){Ce(t.edges(),function(e){var r=t.edge(e);r.reversed&&r.points.reverse()})}function KOe(t){Ce(t.nodes(),function(e){if(t.children(e).length){var r=t.node(e),n=t.node(r.borderTop),i=t.node(r.borderBottom),a=t.node(fa(r.borderLeft)),s=t.node(fa(r.borderRight));r.width=Math.abs(s.x-a.x),r.height=Math.abs(i.y-n.y),r.x=a.x+r.width/2,r.y=n.y+r.height/2}}),Ce(t.nodes(),function(e){t.node(e).dummy==="border"&&t.removeNode(e)})}function QOe(t){Ce(t.edges(),function(e){if(e.v===e.w){var r=t.node(e.v);r.selfEdges||(r.selfEdges=[]),r.selfEdges.push({e,label:t.edge(e)}),t.removeEdge(e)}})}function ZOe(t){var e=Kh(t);Ce(e,function(r){var n=0;Ce(r,function(i,a){var s=t.node(i);s.order=a+n,Ce(s.selfEdges,function(l){Ec(t,"selfedge",{width:l.label.width,height:l.label.height,rank:s.rank,order:a+ ++n,e:l.e,label:l.label},"_se")}),delete s.selfEdges})})}function JOe(t){Ce(t.nodes(),function(e){var r=t.node(e);if(r.dummy==="selfedge"){var n=t.node(r.e.v),i=n.x+n.width/2,a=n.y,s=r.x-i,l=n.height/2;t.setEdge(r.e,r.label),t.removeNode(e),r.label.points=[{x:i+2*s/3,y:a-l},{x:i+5*s/6,y:a-l},{x:i+s,y:a},{x:i+5*s/6,y:a+l},{x:i+2*s/3,y:a+l}],r.label.x=r.x,r.label.y=r.y}})}function kD(t,e){return Md(Od(t,e),Number)}function ED(t){var e={};return Ce(t,function(r,n){e[n.toLowerCase()]=r}),e}var MOe,IOe,OOe,POe,BOe,FOe,zOe,GOe,_ie=M(()=>{"use strict";Ht();Ns();Ene();Lne();rD();lD();wD();eie();bie();Tie();Aie();Sc();o(Du,"layout");o(NOe,"runLayout");o(ROe,"updateInputGraph");MOe=["nodesep","edgesep","ranksep","marginx","marginy"],IOe={ranksep:50,edgesep:20,nodesep:50,rankdir:"tb"},OOe=["acyclicer","ranker","rankdir","align"],POe=["width","height"],BOe={width:0,height:0},FOe=["minlen","weight","width","height","labeloffset"],zOe={minlen:1,weight:1,width:0,height:0,labeloffset:10,labelpos:"r"},GOe=["labelpos"];o($Oe,"buildLayoutGraph");o(VOe,"makeSpaceForEdgeLabels");o(UOe,"injectEdgeLabelProxies");o(HOe,"assignRankMinMax");o(WOe,"removeEdgeLabelProxies");o(YOe,"translateGraph");o(qOe,"assignNodeIntersects");o(XOe,"fixupEdgeLabelCoords");o(jOe,"reversePointsForReversedEdges");o(KOe,"removeBorderNodes");o(QOe,"removeSelfEdges");o(ZOe,"insertSelfEdges");o(JOe,"positionSelfEdges");o(kD,"selectNumberAttrs");o(ED,"canonicalize")});var Pv=M(()=>{"use strict";rD();_ie();lD();wD()});function Ho(t){var e={options:{directed:t.isDirected(),multigraph:t.isMultigraph(),compound:t.isCompound()},nodes:ePe(t),edges:tPe(t)};return dr(t.graph())||(e.value=rn(t.graph())),e}function ePe(t){return Je(t.nodes(),function(e){var r=t.node(e),n=t.parent(e),i={v:e};return dr(r)||(i.value=r),dr(n)||(i.parent=n),i})}function tPe(t){return Je(t.edges(),function(e){var r=t.edge(e),n={v:e.v,w:e.w};return dr(e.name)||(n.name=e.name),dr(r)||(n.value=r),n})}var SD=M(()=>{"use strict";Ht();rT();o(Ho,"write");o(ePe,"writeNodes");o(tPe,"writeEdges")});var wr,zd,Nie,Rie,lT,rPe,Mie,Iie,nPe,Bm,Die,Oie,Pie,Bie,Fie,zie=M(()=>{"use strict";ht();Ns();SD();wr=new Map,zd=new Map,Nie=new Map,Rie=o(()=>{zd.clear(),Nie.clear(),wr.clear()},"clear"),lT=o((t,e)=>{let r=zd.get(e)||[];return Y.trace("In isDescendant",e," ",t," = ",r.includes(t)),r.includes(t)},"isDescendant"),rPe=o((t,e)=>{let r=zd.get(e)||[];return Y.info("Descendants of ",e," is ",r),Y.info("Edge is ",t),t.v===e||t.w===e?!1:r?r.includes(t.v)||lT(t.v,e)||lT(t.w,e)||r.includes(t.w):(Y.debug("Tilt, ",e,",not in descendants"),!1)},"edgeInCluster"),Mie=o((t,e,r,n)=>{Y.warn("Copying children of ",t,"root",n,"data",e.node(t),n);let i=e.children(t)||[];t!==n&&i.push(t),Y.warn("Copying (nodes) clusterId",t,"nodes",i),i.forEach(a=>{if(e.children(a).length>0)Mie(a,e,r,n);else{let s=e.node(a);Y.info("cp ",a," to ",n," with parent ",t),r.setNode(a,s),n!==e.parent(a)&&(Y.warn("Setting parent",a,e.parent(a)),r.setParent(a,e.parent(a))),t!==n&&a!==t?(Y.debug("Setting parent",a,t),r.setParent(a,t)):(Y.info("In copy ",t,"root",n,"data",e.node(t),n),Y.debug("Not Setting parent for node=",a,"cluster!==rootId",t!==n,"node!==clusterId",a!==t));let l=e.edges(a);Y.debug("Copying Edges",l),l.forEach(u=>{Y.info("Edge",u);let h=e.edge(u.v,u.w,u.name);Y.info("Edge data",h,n);try{rPe(u,n)?(Y.info("Copying as ",u.v,u.w,h,u.name),r.setEdge(u.v,u.w,h,u.name),Y.info("newGraph edges ",r.edges(),r.edge(r.edges()[0]))):Y.info("Skipping copy of edge ",u.v,"-->",u.w," rootId: ",n," clusterId:",t)}catch(f){Y.error(f)}})}Y.debug("Removing node",a),e.removeNode(a)})},"copy"),Iie=o((t,e)=>{let r=e.children(t),n=[...r];for(let i of r)Nie.set(i,t),n=[...n,...Iie(i,e)];return n},"extractDescendants"),nPe=o((t,e,r)=>{let n=t.edges().filter(u=>u.v===e||u.w===e),i=t.edges().filter(u=>u.v===r||u.w===r),a=n.map(u=>({v:u.v===e?r:u.v,w:u.w===e?e:u.w})),s=i.map(u=>({v:u.v,w:u.w}));return a.filter(u=>s.some(h=>u.v===h.v&&u.w===h.w))},"findCommonEdges"),Bm=o((t,e,r)=>{let n=e.children(t);if(Y.trace("Searching children of id ",t,n),n.length<1)return t;let i;for(let a of n){let s=Bm(a,e,r),l=nPe(e,r,s);if(s)if(l.length>0)i=s;else return s}return i},"findNonClusterChild"),Die=o(t=>!wr.has(t)||!wr.get(t).externalConnections?t:wr.has(t)?wr.get(t).id:t,"getAnchorId"),Oie=o((t,e)=>{if(!t||e>10){Y.debug("Opting out, no graph ");return}else Y.debug("Opting in, graph ");t.nodes().forEach(function(r){t.children(r).length>0&&(Y.warn("Cluster identified",r," Replacement id in edges: ",Bm(r,t,r)),zd.set(r,Iie(r,t)),wr.set(r,{id:Bm(r,t,r),clusterData:t.node(r)}))}),t.nodes().forEach(function(r){let n=t.children(r),i=t.edges();n.length>0?(Y.debug("Cluster identified",r,zd),i.forEach(a=>{let s=lT(a.v,r),l=lT(a.w,r);s^l&&(Y.warn("Edge: ",a," leaves cluster ",r),Y.warn("Descendants of XXX ",r,": ",zd.get(r)),wr.get(r).externalConnections=!0)})):Y.debug("Not a cluster ",r,zd)});for(let r of wr.keys()){let n=wr.get(r).id,i=t.parent(n);i!==r&&wr.has(i)&&!wr.get(i).externalConnections&&(wr.get(r).id=i)}t.edges().forEach(function(r){let n=t.edge(r);Y.warn("Edge "+r.v+" -> "+r.w+": "+JSON.stringify(r)),Y.warn("Edge "+r.v+" -> "+r.w+": "+JSON.stringify(t.edge(r)));let i=r.v,a=r.w;if(Y.warn("Fix XXX",wr,"ids:",r.v,r.w,"Translating: ",wr.get(r.v)," --- ",wr.get(r.w)),wr.get(r.v)||wr.get(r.w)){if(Y.warn("Fixing and trying - removing XXX",r.v,r.w,r.name),i=Die(r.v),a=Die(r.w),t.removeEdge(r.v,r.w,r.name),i!==r.v){let s=t.parent(i);wr.get(s).externalConnections=!0,n.fromCluster=r.v}if(a!==r.w){let s=t.parent(a);wr.get(s).externalConnections=!0,n.toCluster=r.w}Y.warn("Fix Replacing with XXX",i,a,r.name),t.setEdge(i,a,n,r.name)}}),Y.warn("Adjusted Graph",Ho(t)),Pie(t,0),Y.trace(wr)},"adjustClustersAndEdges"),Pie=o((t,e)=>{if(Y.warn("extractor - ",e,Ho(t),t.children("D")),e>10){Y.error("Bailing out");return}let r=t.nodes(),n=!1;for(let i of r){let a=t.children(i);n=n||a.length>0}if(!n){Y.debug("Done, no node has children",t.nodes());return}Y.debug("Nodes = ",r,e);for(let i of r)if(Y.debug("Extracting node",i,wr,wr.has(i)&&!wr.get(i).externalConnections,!t.parent(i),t.node(i),t.children("D")," Depth ",e),!wr.has(i))Y.debug("Not a cluster",i,e);else if(!wr.get(i).externalConnections&&t.children(i)&&t.children(i).length>0){Y.warn("Cluster without external connections, without a parent and with children",i,e);let s=t.graph().rankdir==="TB"?"LR":"TB";wr.get(i)?.clusterData?.dir&&(s=wr.get(i).clusterData.dir,Y.warn("Fixing dir",wr.get(i).clusterData.dir,s));let l=new Mr({multigraph:!0,compound:!0}).setGraph({rankdir:s,nodesep:50,ranksep:50,marginx:8,marginy:8}).setDefaultEdgeLabel(function(){return{}});Y.warn("Old graph before copy",Ho(t)),Mie(i,t,l,i),t.setNode(i,{clusterNode:!0,id:i,clusterData:wr.get(i).clusterData,label:wr.get(i).label,graph:l}),Y.warn("New graph after copy node: (",i,")",Ho(l)),Y.debug("Old graph after copy",Ho(t))}else Y.warn("Cluster ** ",i," **not meeting the criteria !externalConnections:",!wr.get(i).externalConnections," no parent: ",!t.parent(i)," children ",t.children(i)&&t.children(i).length>0,t.children("D"),e),Y.debug(wr);r=t.nodes(),Y.warn("New list of nodes",r);for(let i of r){let a=t.node(i);Y.warn(" Now next level",i,a),a?.clusterNode&&Pie(a.graph,e+1)}},"extractor"),Bie=o((t,e)=>{if(e.length===0)return[];let r=Object.assign([],e);return e.forEach(n=>{let i=t.children(n),a=Bie(t,i);r=[...r,...a]}),r},"sorter"),Fie=o(t=>Bie(t,t.children()),"sortNodesByHierarchy")});var $ie={};vr($ie,{render:()=>iPe});var Gie,iPe,Vie=M(()=>{"use strict";Pv();SD();Ns();uL();Ft();zie();sw();K5();cL();ht();Cv();Vt();Gie=o(async(t,e,r,n,i,a)=>{Y.warn("Graph in recursive render:XAX",Ho(e),i);let s=e.graph().rankdir;Y.trace("Dir in recursive render - dir:",s);let l=t.insert("g").attr("class","root");e.nodes()?Y.info("Recursive render XXX",e.nodes()):Y.info("No nodes found for",e),e.edges().length>0&&Y.info("Recursive edges",e.edge(e.edges()[0]));let u=l.insert("g").attr("class","clusters"),h=l.insert("g").attr("class","edgePaths"),f=l.insert("g").attr("class","edgeLabels"),d=l.insert("g").attr("class","nodes");await Promise.all(e.nodes().map(async function(y){let v=e.node(y);if(i!==void 0){let x=JSON.parse(JSON.stringify(i.clusterData));Y.trace(`Setting data for parent cluster XXX + Node.id = `,y,` + data=`,x.height,` +Parent cluster`,i.height),e.setNode(i.id,x),e.parent(y)||(Y.trace("Setting parent",y,i.id),e.setParent(y,i.id,x))}if(Y.info("(Insert) Node XXX"+y+": "+JSON.stringify(e.node(y))),v?.clusterNode){Y.info("Cluster identified XBX",y,v.width,e.node(y));let{ranksep:x,nodesep:b}=e.graph();v.graph.setGraph({...v.graph.graph(),ranksep:x+25,nodesep:b});let w=await Gie(d,v.graph,r,n,e.node(y),a),_=w.elem;Qe(v,_),v.diff=w.diff||0,Y.info("New compound node after recursive render XAX",y,"width",v.width,"height",v.height),aJ(_,v)}else e.children(y).length>0?(Y.trace("Cluster - the non recursive path XBX",y,v.id,v,v.width,"Graph:",e),Y.trace(Bm(v.id,e)),wr.set(v.id,{id:Bm(v.id,e),node:v})):(Y.trace("Node - the non recursive path XAX",y,d,e.node(y),s),await gm(d,e.node(y),{config:a,dir:s}))})),await o(async()=>{let y=e.edges().map(async function(v){let x=e.edge(v.v,v.w,v.name);Y.info("Edge "+v.v+" -> "+v.w+": "+JSON.stringify(v)),Y.info("Edge "+v.v+" -> "+v.w+": ",v," ",JSON.stringify(e.edge(v))),Y.info("Fix",wr,"ids:",v.v,v.w,"Translating: ",wr.get(v.v),wr.get(v.w)),await tw(f,x)});await Promise.all(y)},"processEdges")(),Y.info("Graph before layout:",JSON.stringify(Ho(e))),Y.info("############################################# XXX"),Y.info("### Layout ### XXX"),Y.info("############################################# XXX"),Du(e),Y.info("Graph after layout:",JSON.stringify(Ho(e)));let m=0,{subGraphTitleTotalMargin:g}=_u(a);return await Promise.all(Fie(e).map(async function(y){let v=e.node(y);if(Y.info("Position XBX => "+y+": ("+v.x,","+v.y,") width: ",v.width," height: ",v.height),v?.clusterNode)v.y+=g,Y.info("A tainted cluster node XBX1",y,v.id,v.width,v.height,v.x,v.y,e.parent(y)),wr.get(v.id).node=v,_v(v);else if(e.children(y).length>0){Y.info("A pure cluster node XBX1",y,v.id,v.x,v.y,v.width,v.height,e.parent(y)),v.height+=g,e.node(v.parentId);let x=v?.padding/2||0,b=v?.labelBBox?.height||0,w=b-x||0;Y.debug("OffsetY",w,"labelHeight",b,"halfPadding",x),await mm(u,v),wr.get(v.id).node=v}else{let x=e.node(v.parentId);v.y+=g/2,Y.info("A regular node XBX1 - using the padding",v.id,"parent",v.parentId,v.width,v.height,v.x,v.y,"offsetY",v.offsetY,"parent",x,x?.offsetY,v),_v(v)}})),e.edges().forEach(function(y){let v=e.edge(y);Y.info("Edge "+y.v+" -> "+y.w+": "+JSON.stringify(v),v),v.points.forEach(_=>_.y+=g/2);let x=e.node(y.v);var b=e.node(y.w);let w=nw(h,v,wr,r,x,b,n);rw(v,w)}),e.nodes().forEach(function(y){let v=e.node(y);Y.info(y,v.type,v.diff),v.isGroup&&(m=v.diff)}),Y.warn("Returning from recursive render XAX",l,m),{elem:l,diff:m}},"recursiveRender"),iPe=o(async(t,e)=>{let r=new Mr({multigraph:!0,compound:!0}).setGraph({rankdir:t.direction,nodesep:t.config?.nodeSpacing||t.config?.flowchart?.nodeSpacing||t.nodeSpacing,ranksep:t.config?.rankSpacing||t.config?.flowchart?.rankSpacing||t.rankSpacing,marginx:8,marginy:8}).setDefaultEdgeLabel(function(){return{}}),n=e.select("g");iw(n,t.markers,t.type,t.diagramId),sJ(),iJ(),ZZ(),Rie(),t.nodes.forEach(a=>{r.setNode(a.id,{...a}),a.parentId&&r.setParent(a.id,a.parentId)}),Y.debug("Edges:",t.edges),t.edges.forEach(a=>{if(a.start===a.end){let s=a.start,l=s+"---"+s+"---1",u=s+"---"+s+"---2",h=r.node(s);r.setNode(l,{domId:l,id:l,parentId:h.parentId,labelStyle:"",label:"",padding:0,shape:"labelRect",style:"",width:10,height:10}),r.setParent(l,h.parentId),r.setNode(u,{domId:u,id:u,parentId:h.parentId,labelStyle:"",padding:0,shape:"labelRect",label:"",style:"",width:10,height:10}),r.setParent(u,h.parentId);let f=structuredClone(a),d=structuredClone(a),p=structuredClone(a);f.label="",f.arrowTypeEnd="none",f.id=s+"-cyclic-special-1",d.arrowTypeEnd="none",d.id=s+"-cyclic-special-mid",p.label="",h.isGroup&&(f.fromCluster=s,p.toCluster=s),p.id=s+"-cyclic-special-2",r.setEdge(s,l,f,s+"-cyclic-special-0"),r.setEdge(l,u,d,s+"-cyclic-special-1"),r.setEdge(u,s,p,s+"-cyc<lic-special-2")}else r.setEdge(a.start,a.end,{...a},a.id)}),Y.warn("Graph at first:",JSON.stringify(Ho(r))),Oie(r),Y.warn("Graph after XAX:",JSON.stringify(Ho(r)));let i=de();await Gie(n,r,t.type,t.diagramId,void 0,i)},"render")});var Bv,CD,aPe,Fm,cT,Fv=M(()=>{"use strict";lJ();ht();Bv={},CD=o(t=>{for(let e of t)Bv[e.name]=e},"registerLayoutLoaders"),aPe=o(()=>{CD([{name:"dagre",loader:o(async()=>await Promise.resolve().then(()=>(Vie(),$ie)),"loader")}])},"registerDefaultLayoutLoaders");aPe();Fm=o(async(t,e)=>{if(!(t.layoutAlgorithm in Bv))throw new Error(`Unknown layout algorithm: ${t.layoutAlgorithm}`);let r=Bv[t.layoutAlgorithm];return(await r.loader()).render(t,e,oJ,{algorithm:r.algorithm})},"render"),cT=o((t="",{fallback:e="dagre"}={})=>{if(t in Bv)return t;if(e in Bv)return Y.warn(`Layout algorithm ${t} is not registered. Using ${e} as fallback.`),e;throw new Error(`Both layout algorithms ${t} and ${e} are not registered.`)},"getRegisteredLayoutAlgorithm")});var zm,sPe,oPe,uT=M(()=>{"use strict";ni();ht();zm=o((t,e,r,n)=>{t.attr("class",r);let{width:i,height:a,x:s,y:l}=sPe(t,e);Zr(t,a,i,n);let u=oPe(s,l,i,a,e);t.attr("viewBox",u),Y.debug(`viewBox configured: ${u} with padding: ${e}`)},"setupViewPortForSVG"),sPe=o((t,e)=>{let r=t.node()?.getBBox()||{width:0,height:0,x:0,y:0};return{width:r.width+e*2,height:r.height+e*2,x:r.x,y:r.y}},"calculateDimensionsWithPadding"),oPe=o((t,e,r,n,i)=>`${t-i} ${e-i} ${r} ${n}`,"createViewBox")});var lPe,cPe,Uie,Hie=M(()=>{"use strict";mr();Vt();ht();j5();Fv();uT();hr();oL();lPe=o(function(t,e){return e.db.getClasses()},"getClasses"),cPe=o(async function(t,e,r,n){Y.info("REF0:"),Y.info("Drawing state diagram (v2)",e);let{securityLevel:i,flowchart:a,layout:s}=de(),l;i==="sandbox"&&(l=ze("#i"+e));let u=i==="sandbox"?l.nodes()[0].contentDocument:document;Y.debug("Before getData: ");let h=n.db.getData();Y.debug("Data: ",h);let f=pm(e,i),d=sL();h.type=n.type,h.layoutAlgorithm=cT(s),h.layoutAlgorithm==="dagre"&&s==="elk"&&Y.warn("flowchart-elk was moved to an external package in Mermaid v11. Please refer [release notes](https://github.com/mermaid-js/mermaid/releases/tag/v11.0.0) for more details. This diagram will be rendered using `dagre` layout as a fallback."),h.direction=d,h.nodeSpacing=a?.nodeSpacing||50,h.rankSpacing=a?.rankSpacing||50,h.markers=["point","circle","cross"],h.diagramId=e,Y.debug("REF1:",h),await Fm(h,f);let p=h.config.flowchart?.diagramPadding??8;Ut.insertTitle(f,"flowchartTitleText",a?.titleTopMargin||0,n.db.getDiagramTitle()),zm(f,p,"flowchart",a?.useMaxWidth||!1);for(let m of h.nodes){let g=ze(`#${e} [id="${m.id}"]`);if(!g||!m.link)continue;let y=u.createElementNS("http://www.w3.org/2000/svg","a");y.setAttributeNS("http://www.w3.org/2000/svg","class",m.cssClasses),y.setAttributeNS("http://www.w3.org/2000/svg","rel","noopener"),i==="sandbox"?y.setAttributeNS("http://www.w3.org/2000/svg","target","_top"):m.linkTarget&&y.setAttributeNS("http://www.w3.org/2000/svg","target",m.linkTarget);let v=g.insert(function(){return y},":first-child"),x=g.select(".label-container");x&&v.append(function(){return x.node()});let b=g.select(".label");b&&v.append(function(){return b.node()})}},"draw"),Uie={getClasses:lPe,draw:cPe}});var AD,Wie,Yie=M(()=>{"use strict";AD=function(){var t=o(function(kn,_t,St,bt){for(St=St||{},bt=kn.length;bt--;St[kn[bt]]=_t);return St},"o"),e=[1,4],r=[1,3],n=[1,5],i=[1,8,9,10,11,27,34,36,38,44,60,83,84,85,86,87,88,101,104,105,108,110,113,114,115,120,121,122,123],a=[2,2],s=[1,13],l=[1,14],u=[1,15],h=[1,16],f=[1,23],d=[1,25],p=[1,26],m=[1,27],g=[1,49],y=[1,48],v=[1,29],x=[1,30],b=[1,31],w=[1,32],_=[1,33],T=[1,44],E=[1,46],L=[1,42],C=[1,47],A=[1,43],I=[1,50],D=[1,45],k=[1,51],R=[1,52],S=[1,34],O=[1,35],N=[1,36],P=[1,37],F=[1,57],B=[1,8,9,10,11,27,32,34,36,38,44,60,83,84,85,86,87,88,101,104,105,108,110,113,114,115,120,121,122,123],$=[1,61],z=[1,60],W=[1,62],j=[8,9,11,75,77],K=[1,77],ie=[1,90],Q=[1,95],ee=[1,94],J=[1,91],H=[1,87],q=[1,93],Z=[1,89],ae=[1,96],ue=[1,92],ce=[1,97],te=[1,88],De=[8,9,10,11,40,75,77],oe=[8,9,10,11,40,46,75,77],ke=[8,9,10,11,29,40,44,46,48,50,52,54,56,58,60,63,65,67,68,70,75,77,88,101,104,105,108,110,113,114,115],Fe=[8,9,11,44,60,75,77,88,101,104,105,108,110,113,114,115],Be=[44,60,88,101,104,105,108,110,113,114,115],Ve=[1,123],Ge=[1,122],He=[1,130],xe=[1,144],X=[1,145],fe=[1,146],he=[1,147],ge=[1,132],ne=[1,134],ye=[1,138],U=[1,139],Te=[1,140],se=[1,141],Ee=[1,142],Ae=[1,143],Pe=[1,148],Me=[1,149],me=[1,128],We=[1,129],Re=[1,136],tt=[1,131],gt=[1,135],Et=[1,133],vt=[8,9,10,11,27,32,34,36,38,44,60,83,84,85,86,87,88,101,104,105,108,110,113,114,115,120,121,122,123],Ye=[1,151],Tt=[1,153],$e=[8,9,11],rt=[8,9,10,11,14,44,60,88,104,105,108,110,113,114,115],ft=[1,173],kt=[1,169],er=[1,170],dt=[1,174],Xe=[1,171],ct=[1,172],Lt=[77,115,118],Rt=[8,9,10,11,12,14,27,29,32,44,60,75,83,84,85,86,87,88,89,104,108,110,113,114,115],zt=[10,105],Xn=[31,49,51,53,55,57,62,64,66,67,69,71,115,116,117],or=[1,242],hn=[1,240],Tn=[1,244],Ur=[1,238],ri=[1,239],Mn=[1,241],yt=[1,243],Se=[1,245],at=[1,263],At=[8,9,11,105],pr=[8,9,10,11,60,83,104,105,108,109,110,111],In={trace:o(function(){},"trace"),yy:{},symbols_:{error:2,start:3,graphConfig:4,document:5,line:6,statement:7,SEMI:8,NEWLINE:9,SPACE:10,EOF:11,GRAPH:12,NODIR:13,DIR:14,FirstStmtSeparator:15,ending:16,endToken:17,spaceList:18,spaceListNewline:19,vertexStatement:20,separator:21,styleStatement:22,linkStyleStatement:23,classDefStatement:24,classStatement:25,clickStatement:26,subgraph:27,textNoTags:28,SQS:29,text:30,SQE:31,end:32,direction:33,acc_title:34,acc_title_value:35,acc_descr:36,acc_descr_value:37,acc_descr_multiline_value:38,shapeData:39,SHAPE_DATA:40,link:41,node:42,styledVertex:43,AMP:44,vertex:45,STYLE_SEPARATOR:46,idString:47,DOUBLECIRCLESTART:48,DOUBLECIRCLEEND:49,PS:50,PE:51,"(-":52,"-)":53,STADIUMSTART:54,STADIUMEND:55,SUBROUTINESTART:56,SUBROUTINEEND:57,VERTEX_WITH_PROPS_START:58,"NODE_STRING[field]":59,COLON:60,"NODE_STRING[value]":61,PIPE:62,CYLINDERSTART:63,CYLINDEREND:64,DIAMOND_START:65,DIAMOND_STOP:66,TAGEND:67,TRAPSTART:68,TRAPEND:69,INVTRAPSTART:70,INVTRAPEND:71,linkStatement:72,arrowText:73,TESTSTR:74,START_LINK:75,edgeText:76,LINK:77,edgeTextToken:78,STR:79,MD_STR:80,textToken:81,keywords:82,STYLE:83,LINKSTYLE:84,CLASSDEF:85,CLASS:86,CLICK:87,DOWN:88,UP:89,textNoTagsToken:90,stylesOpt:91,"idString[vertex]":92,"idString[class]":93,CALLBACKNAME:94,CALLBACKARGS:95,HREF:96,LINK_TARGET:97,"STR[link]":98,"STR[tooltip]":99,alphaNum:100,DEFAULT:101,numList:102,INTERPOLATE:103,NUM:104,COMMA:105,style:106,styleComponent:107,NODE_STRING:108,UNIT:109,BRKT:110,PCT:111,idStringToken:112,MINUS:113,MULT:114,UNICODE_TEXT:115,TEXT:116,TAGSTART:117,EDGE_TEXT:118,alphaNumToken:119,direction_tb:120,direction_bt:121,direction_rl:122,direction_lr:123,$accept:0,$end:1},terminals_:{2:"error",8:"SEMI",9:"NEWLINE",10:"SPACE",11:"EOF",12:"GRAPH",13:"NODIR",14:"DIR",27:"subgraph",29:"SQS",31:"SQE",32:"end",34:"acc_title",35:"acc_title_value",36:"acc_descr",37:"acc_descr_value",38:"acc_descr_multiline_value",40:"SHAPE_DATA",44:"AMP",46:"STYLE_SEPARATOR",48:"DOUBLECIRCLESTART",49:"DOUBLECIRCLEEND",50:"PS",51:"PE",52:"(-",53:"-)",54:"STADIUMSTART",55:"STADIUMEND",56:"SUBROUTINESTART",57:"SUBROUTINEEND",58:"VERTEX_WITH_PROPS_START",59:"NODE_STRING[field]",60:"COLON",61:"NODE_STRING[value]",62:"PIPE",63:"CYLINDERSTART",64:"CYLINDEREND",65:"DIAMOND_START",66:"DIAMOND_STOP",67:"TAGEND",68:"TRAPSTART",69:"TRAPEND",70:"INVTRAPSTART",71:"INVTRAPEND",74:"TESTSTR",75:"START_LINK",77:"LINK",79:"STR",80:"MD_STR",83:"STYLE",84:"LINKSTYLE",85:"CLASSDEF",86:"CLASS",87:"CLICK",88:"DOWN",89:"UP",92:"idString[vertex]",93:"idString[class]",94:"CALLBACKNAME",95:"CALLBACKARGS",96:"HREF",97:"LINK_TARGET",98:"STR[link]",99:"STR[tooltip]",101:"DEFAULT",103:"INTERPOLATE",104:"NUM",105:"COMMA",108:"NODE_STRING",109:"UNIT",110:"BRKT",111:"PCT",113:"MINUS",114:"MULT",115:"UNICODE_TEXT",116:"TEXT",117:"TAGSTART",118:"EDGE_TEXT",120:"direction_tb",121:"direction_bt",122:"direction_rl",123:"direction_lr"},productions_:[0,[3,2],[5,0],[5,2],[6,1],[6,1],[6,1],[6,1],[6,1],[4,2],[4,2],[4,2],[4,3],[16,2],[16,1],[17,1],[17,1],[17,1],[15,1],[15,1],[15,2],[19,2],[19,2],[19,1],[19,1],[18,2],[18,1],[7,2],[7,2],[7,2],[7,2],[7,2],[7,2],[7,9],[7,6],[7,4],[7,1],[7,2],[7,2],[7,1],[21,1],[21,1],[21,1],[39,2],[39,1],[20,4],[20,3],[20,4],[20,2],[20,2],[20,1],[42,1],[42,6],[42,5],[43,1],[43,3],[45,4],[45,4],[45,6],[45,4],[45,4],[45,4],[45,8],[45,4],[45,4],[45,4],[45,6],[45,4],[45,4],[45,4],[45,4],[45,4],[45,1],[41,2],[41,3],[41,3],[41,1],[41,3],[76,1],[76,2],[76,1],[76,1],[72,1],[73,3],[30,1],[30,2],[30,1],[30,1],[82,1],[82,1],[82,1],[82,1],[82,1],[82,1],[82,1],[82,1],[82,1],[82,1],[82,1],[28,1],[28,2],[28,1],[28,1],[24,5],[25,5],[26,2],[26,4],[26,3],[26,5],[26,3],[26,5],[26,5],[26,7],[26,2],[26,4],[26,2],[26,4],[26,4],[26,6],[22,5],[23,5],[23,5],[23,9],[23,9],[23,7],[23,7],[102,1],[102,3],[91,1],[91,3],[106,1],[106,2],[107,1],[107,1],[107,1],[107,1],[107,1],[107,1],[107,1],[107,1],[112,1],[112,1],[112,1],[112,1],[112,1],[112,1],[112,1],[112,1],[112,1],[112,1],[112,1],[81,1],[81,1],[81,1],[81,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[78,1],[78,1],[119,1],[119,1],[119,1],[119,1],[119,1],[119,1],[119,1],[119,1],[119,1],[119,1],[119,1],[47,1],[47,2],[100,1],[100,2],[33,1],[33,1],[33,1],[33,1]],performAction:o(function(_t,St,bt,Ue,Kt,pe,bi){var be=pe.length-1;switch(Kt){case 2:this.$=[];break;case 3:(!Array.isArray(pe[be])||pe[be].length>0)&&pe[be-1].push(pe[be]),this.$=pe[be-1];break;case 4:case 181:this.$=pe[be];break;case 11:Ue.setDirection("TB"),this.$="TB";break;case 12:Ue.setDirection(pe[be-1]),this.$=pe[be-1];break;case 27:this.$=pe[be-1].nodes;break;case 28:case 29:case 30:case 31:case 32:this.$=[];break;case 33:this.$=Ue.addSubGraph(pe[be-6],pe[be-1],pe[be-4]);break;case 34:this.$=Ue.addSubGraph(pe[be-3],pe[be-1],pe[be-3]);break;case 35:this.$=Ue.addSubGraph(void 0,pe[be-1],void 0);break;case 37:this.$=pe[be].trim(),Ue.setAccTitle(this.$);break;case 38:case 39:this.$=pe[be].trim(),Ue.setAccDescription(this.$);break;case 43:this.$=pe[be-1]+pe[be];break;case 44:this.$=pe[be];break;case 45:Ue.addVertex(pe[be-1][0],void 0,void 0,void 0,void 0,void 0,void 0,pe[be]),Ue.addLink(pe[be-3].stmt,pe[be-1],pe[be-2]),this.$={stmt:pe[be-1],nodes:pe[be-1].concat(pe[be-3].nodes)};break;case 46:Ue.addLink(pe[be-2].stmt,pe[be],pe[be-1]),this.$={stmt:pe[be],nodes:pe[be].concat(pe[be-2].nodes)};break;case 47:Ue.addLink(pe[be-3].stmt,pe[be-1],pe[be-2]),this.$={stmt:pe[be-1],nodes:pe[be-1].concat(pe[be-3].nodes)};break;case 48:this.$={stmt:pe[be-1],nodes:pe[be-1]};break;case 49:Ue.addVertex(pe[be-1][0],void 0,void 0,void 0,void 0,void 0,void 0,pe[be]),this.$={stmt:pe[be-1],nodes:pe[be-1],shapeData:pe[be]};break;case 50:this.$={stmt:pe[be],nodes:pe[be]};break;case 51:this.$=[pe[be]];break;case 52:Ue.addVertex(pe[be-5][0],void 0,void 0,void 0,void 0,void 0,void 0,pe[be-4]),this.$=pe[be-5].concat(pe[be]);break;case 53:this.$=pe[be-4].concat(pe[be]);break;case 54:this.$=pe[be];break;case 55:this.$=pe[be-2],Ue.setClass(pe[be-2],pe[be]);break;case 56:this.$=pe[be-3],Ue.addVertex(pe[be-3],pe[be-1],"square");break;case 57:this.$=pe[be-3],Ue.addVertex(pe[be-3],pe[be-1],"doublecircle");break;case 58:this.$=pe[be-5],Ue.addVertex(pe[be-5],pe[be-2],"circle");break;case 59:this.$=pe[be-3],Ue.addVertex(pe[be-3],pe[be-1],"ellipse");break;case 60:this.$=pe[be-3],Ue.addVertex(pe[be-3],pe[be-1],"stadium");break;case 61:this.$=pe[be-3],Ue.addVertex(pe[be-3],pe[be-1],"subroutine");break;case 62:this.$=pe[be-7],Ue.addVertex(pe[be-7],pe[be-1],"rect",void 0,void 0,void 0,Object.fromEntries([[pe[be-5],pe[be-3]]]));break;case 63:this.$=pe[be-3],Ue.addVertex(pe[be-3],pe[be-1],"cylinder");break;case 64:this.$=pe[be-3],Ue.addVertex(pe[be-3],pe[be-1],"round");break;case 65:this.$=pe[be-3],Ue.addVertex(pe[be-3],pe[be-1],"diamond");break;case 66:this.$=pe[be-5],Ue.addVertex(pe[be-5],pe[be-2],"hexagon");break;case 67:this.$=pe[be-3],Ue.addVertex(pe[be-3],pe[be-1],"odd");break;case 68:this.$=pe[be-3],Ue.addVertex(pe[be-3],pe[be-1],"trapezoid");break;case 69:this.$=pe[be-3],Ue.addVertex(pe[be-3],pe[be-1],"inv_trapezoid");break;case 70:this.$=pe[be-3],Ue.addVertex(pe[be-3],pe[be-1],"lean_right");break;case 71:this.$=pe[be-3],Ue.addVertex(pe[be-3],pe[be-1],"lean_left");break;case 72:this.$=pe[be],Ue.addVertex(pe[be]);break;case 73:pe[be-1].text=pe[be],this.$=pe[be-1];break;case 74:case 75:pe[be-2].text=pe[be-1],this.$=pe[be-2];break;case 76:this.$=pe[be];break;case 77:var vo=Ue.destructLink(pe[be],pe[be-2]);this.$={type:vo.type,stroke:vo.stroke,length:vo.length,text:pe[be-1]};break;case 78:this.$={text:pe[be],type:"text"};break;case 79:this.$={text:pe[be-1].text+""+pe[be],type:pe[be-1].type};break;case 80:this.$={text:pe[be],type:"string"};break;case 81:this.$={text:pe[be],type:"markdown"};break;case 82:var vo=Ue.destructLink(pe[be]);this.$={type:vo.type,stroke:vo.stroke,length:vo.length};break;case 83:this.$=pe[be-1];break;case 84:this.$={text:pe[be],type:"text"};break;case 85:this.$={text:pe[be-1].text+""+pe[be],type:pe[be-1].type};break;case 86:this.$={text:pe[be],type:"string"};break;case 87:case 102:this.$={text:pe[be],type:"markdown"};break;case 99:this.$={text:pe[be],type:"text"};break;case 100:this.$={text:pe[be-1].text+""+pe[be],type:pe[be-1].type};break;case 101:this.$={text:pe[be],type:"text"};break;case 103:this.$=pe[be-4],Ue.addClass(pe[be-2],pe[be]);break;case 104:this.$=pe[be-4],Ue.setClass(pe[be-2],pe[be]);break;case 105:case 113:this.$=pe[be-1],Ue.setClickEvent(pe[be-1],pe[be]);break;case 106:case 114:this.$=pe[be-3],Ue.setClickEvent(pe[be-3],pe[be-2]),Ue.setTooltip(pe[be-3],pe[be]);break;case 107:this.$=pe[be-2],Ue.setClickEvent(pe[be-2],pe[be-1],pe[be]);break;case 108:this.$=pe[be-4],Ue.setClickEvent(pe[be-4],pe[be-3],pe[be-2]),Ue.setTooltip(pe[be-4],pe[be]);break;case 109:this.$=pe[be-2],Ue.setLink(pe[be-2],pe[be]);break;case 110:this.$=pe[be-4],Ue.setLink(pe[be-4],pe[be-2]),Ue.setTooltip(pe[be-4],pe[be]);break;case 111:this.$=pe[be-4],Ue.setLink(pe[be-4],pe[be-2],pe[be]);break;case 112:this.$=pe[be-6],Ue.setLink(pe[be-6],pe[be-4],pe[be]),Ue.setTooltip(pe[be-6],pe[be-2]);break;case 115:this.$=pe[be-1],Ue.setLink(pe[be-1],pe[be]);break;case 116:this.$=pe[be-3],Ue.setLink(pe[be-3],pe[be-2]),Ue.setTooltip(pe[be-3],pe[be]);break;case 117:this.$=pe[be-3],Ue.setLink(pe[be-3],pe[be-2],pe[be]);break;case 118:this.$=pe[be-5],Ue.setLink(pe[be-5],pe[be-4],pe[be]),Ue.setTooltip(pe[be-5],pe[be-2]);break;case 119:this.$=pe[be-4],Ue.addVertex(pe[be-2],void 0,void 0,pe[be]);break;case 120:this.$=pe[be-4],Ue.updateLink([pe[be-2]],pe[be]);break;case 121:this.$=pe[be-4],Ue.updateLink(pe[be-2],pe[be]);break;case 122:this.$=pe[be-8],Ue.updateLinkInterpolate([pe[be-6]],pe[be-2]),Ue.updateLink([pe[be-6]],pe[be]);break;case 123:this.$=pe[be-8],Ue.updateLinkInterpolate(pe[be-6],pe[be-2]),Ue.updateLink(pe[be-6],pe[be]);break;case 124:this.$=pe[be-6],Ue.updateLinkInterpolate([pe[be-4]],pe[be]);break;case 125:this.$=pe[be-6],Ue.updateLinkInterpolate(pe[be-4],pe[be]);break;case 126:case 128:this.$=[pe[be]];break;case 127:case 129:pe[be-2].push(pe[be]),this.$=pe[be-2];break;case 131:this.$=pe[be-1]+pe[be];break;case 179:this.$=pe[be];break;case 180:this.$=pe[be-1]+""+pe[be];break;case 182:this.$=pe[be-1]+""+pe[be];break;case 183:this.$={stmt:"dir",value:"TB"};break;case 184:this.$={stmt:"dir",value:"BT"};break;case 185:this.$={stmt:"dir",value:"RL"};break;case 186:this.$={stmt:"dir",value:"LR"};break}},"anonymous"),table:[{3:1,4:2,9:e,10:r,12:n},{1:[3]},t(i,a,{5:6}),{4:7,9:e,10:r,12:n},{4:8,9:e,10:r,12:n},{13:[1,9],14:[1,10]},{1:[2,1],6:11,7:12,8:s,9:l,10:u,11:h,20:17,22:18,23:19,24:20,25:21,26:22,27:f,33:24,34:d,36:p,38:m,42:28,43:38,44:g,45:39,47:40,60:y,83:v,84:x,85:b,86:w,87:_,88:T,101:E,104:L,105:C,108:A,110:I,112:41,113:D,114:k,115:R,120:S,121:O,122:N,123:P},t(i,[2,9]),t(i,[2,10]),t(i,[2,11]),{8:[1,54],9:[1,55],10:F,15:53,18:56},t(B,[2,3]),t(B,[2,4]),t(B,[2,5]),t(B,[2,6]),t(B,[2,7]),t(B,[2,8]),{8:$,9:z,11:W,21:58,41:59,72:63,75:[1,64],77:[1,65]},{8:$,9:z,11:W,21:66},{8:$,9:z,11:W,21:67},{8:$,9:z,11:W,21:68},{8:$,9:z,11:W,21:69},{8:$,9:z,11:W,21:70},{8:$,9:z,10:[1,71],11:W,21:72},t(B,[2,36]),{35:[1,73]},{37:[1,74]},t(B,[2,39]),t(j,[2,50],{18:75,39:76,10:F,40:K}),{10:[1,78]},{10:[1,79]},{10:[1,80]},{10:[1,81]},{14:ie,44:Q,60:ee,79:[1,85],88:J,94:[1,82],96:[1,83],100:84,104:H,105:q,108:Z,110:ae,113:ue,114:ce,115:te,119:86},t(B,[2,183]),t(B,[2,184]),t(B,[2,185]),t(B,[2,186]),t(De,[2,51]),t(De,[2,54],{46:[1,98]}),t(oe,[2,72],{112:111,29:[1,99],44:g,48:[1,100],50:[1,101],52:[1,102],54:[1,103],56:[1,104],58:[1,105],60:y,63:[1,106],65:[1,107],67:[1,108],68:[1,109],70:[1,110],88:T,101:E,104:L,105:C,108:A,110:I,113:D,114:k,115:R}),t(ke,[2,179]),t(ke,[2,140]),t(ke,[2,141]),t(ke,[2,142]),t(ke,[2,143]),t(ke,[2,144]),t(ke,[2,145]),t(ke,[2,146]),t(ke,[2,147]),t(ke,[2,148]),t(ke,[2,149]),t(ke,[2,150]),t(i,[2,12]),t(i,[2,18]),t(i,[2,19]),{9:[1,112]},t(Fe,[2,26],{18:113,10:F}),t(B,[2,27]),{42:114,43:38,44:g,45:39,47:40,60:y,88:T,101:E,104:L,105:C,108:A,110:I,112:41,113:D,114:k,115:R},t(B,[2,40]),t(B,[2,41]),t(B,[2,42]),t(Be,[2,76],{73:115,62:[1,117],74:[1,116]}),{76:118,78:119,79:[1,120],80:[1,121],115:Ve,118:Ge},t([44,60,62,74,88,101,104,105,108,110,113,114,115],[2,82]),t(B,[2,28]),t(B,[2,29]),t(B,[2,30]),t(B,[2,31]),t(B,[2,32]),{10:He,12:xe,14:X,27:fe,28:124,32:he,44:ge,60:ne,75:ye,79:[1,126],80:[1,127],82:137,83:U,84:Te,85:se,86:Ee,87:Ae,88:Pe,89:Me,90:125,104:me,108:We,110:Re,113:tt,114:gt,115:Et},t(vt,a,{5:150}),t(B,[2,37]),t(B,[2,38]),t(j,[2,48],{44:Ye}),t(j,[2,49],{18:152,10:F,40:Tt}),t(De,[2,44]),{44:g,47:154,60:y,88:T,101:E,104:L,105:C,108:A,110:I,112:41,113:D,114:k,115:R},{101:[1,155],102:156,104:[1,157]},{44:g,47:158,60:y,88:T,101:E,104:L,105:C,108:A,110:I,112:41,113:D,114:k,115:R},{44:g,47:159,60:y,88:T,101:E,104:L,105:C,108:A,110:I,112:41,113:D,114:k,115:R},t($e,[2,105],{10:[1,160],95:[1,161]}),{79:[1,162]},t($e,[2,113],{119:164,10:[1,163],14:ie,44:Q,60:ee,88:J,104:H,105:q,108:Z,110:ae,113:ue,114:ce,115:te}),t($e,[2,115],{10:[1,165]}),t(rt,[2,181]),t(rt,[2,168]),t(rt,[2,169]),t(rt,[2,170]),t(rt,[2,171]),t(rt,[2,172]),t(rt,[2,173]),t(rt,[2,174]),t(rt,[2,175]),t(rt,[2,176]),t(rt,[2,177]),t(rt,[2,178]),{44:g,47:166,60:y,88:T,101:E,104:L,105:C,108:A,110:I,112:41,113:D,114:k,115:R},{30:167,67:ft,79:kt,80:er,81:168,115:dt,116:Xe,117:ct},{30:175,67:ft,79:kt,80:er,81:168,115:dt,116:Xe,117:ct},{30:177,50:[1,176],67:ft,79:kt,80:er,81:168,115:dt,116:Xe,117:ct},{30:178,67:ft,79:kt,80:er,81:168,115:dt,116:Xe,117:ct},{30:179,67:ft,79:kt,80:er,81:168,115:dt,116:Xe,117:ct},{30:180,67:ft,79:kt,80:er,81:168,115:dt,116:Xe,117:ct},{108:[1,181]},{30:182,67:ft,79:kt,80:er,81:168,115:dt,116:Xe,117:ct},{30:183,65:[1,184],67:ft,79:kt,80:er,81:168,115:dt,116:Xe,117:ct},{30:185,67:ft,79:kt,80:er,81:168,115:dt,116:Xe,117:ct},{30:186,67:ft,79:kt,80:er,81:168,115:dt,116:Xe,117:ct},{30:187,67:ft,79:kt,80:er,81:168,115:dt,116:Xe,117:ct},t(ke,[2,180]),t(i,[2,20]),t(Fe,[2,25]),t(j,[2,46],{39:188,18:189,10:F,40:K}),t(Be,[2,73],{10:[1,190]}),{10:[1,191]},{30:192,67:ft,79:kt,80:er,81:168,115:dt,116:Xe,117:ct},{77:[1,193],78:194,115:Ve,118:Ge},t(Lt,[2,78]),t(Lt,[2,80]),t(Lt,[2,81]),t(Lt,[2,166]),t(Lt,[2,167]),{8:$,9:z,10:He,11:W,12:xe,14:X,21:196,27:fe,29:[1,195],32:he,44:ge,60:ne,75:ye,82:137,83:U,84:Te,85:se,86:Ee,87:Ae,88:Pe,89:Me,90:197,104:me,108:We,110:Re,113:tt,114:gt,115:Et},t(Rt,[2,99]),t(Rt,[2,101]),t(Rt,[2,102]),t(Rt,[2,155]),t(Rt,[2,156]),t(Rt,[2,157]),t(Rt,[2,158]),t(Rt,[2,159]),t(Rt,[2,160]),t(Rt,[2,161]),t(Rt,[2,162]),t(Rt,[2,163]),t(Rt,[2,164]),t(Rt,[2,165]),t(Rt,[2,88]),t(Rt,[2,89]),t(Rt,[2,90]),t(Rt,[2,91]),t(Rt,[2,92]),t(Rt,[2,93]),t(Rt,[2,94]),t(Rt,[2,95]),t(Rt,[2,96]),t(Rt,[2,97]),t(Rt,[2,98]),{6:11,7:12,8:s,9:l,10:u,11:h,20:17,22:18,23:19,24:20,25:21,26:22,27:f,32:[1,198],33:24,34:d,36:p,38:m,42:28,43:38,44:g,45:39,47:40,60:y,83:v,84:x,85:b,86:w,87:_,88:T,101:E,104:L,105:C,108:A,110:I,112:41,113:D,114:k,115:R,120:S,121:O,122:N,123:P},{10:F,18:199},{44:[1,200]},t(De,[2,43]),{10:[1,201],44:g,60:y,88:T,101:E,104:L,105:C,108:A,110:I,112:111,113:D,114:k,115:R},{10:[1,202]},{10:[1,203],105:[1,204]},t(zt,[2,126]),{10:[1,205],44:g,60:y,88:T,101:E,104:L,105:C,108:A,110:I,112:111,113:D,114:k,115:R},{10:[1,206],44:g,60:y,88:T,101:E,104:L,105:C,108:A,110:I,112:111,113:D,114:k,115:R},{79:[1,207]},t($e,[2,107],{10:[1,208]}),t($e,[2,109],{10:[1,209]}),{79:[1,210]},t(rt,[2,182]),{79:[1,211],97:[1,212]},t(De,[2,55],{112:111,44:g,60:y,88:T,101:E,104:L,105:C,108:A,110:I,113:D,114:k,115:R}),{31:[1,213],67:ft,81:214,115:dt,116:Xe,117:ct},t(Xn,[2,84]),t(Xn,[2,86]),t(Xn,[2,87]),t(Xn,[2,151]),t(Xn,[2,152]),t(Xn,[2,153]),t(Xn,[2,154]),{49:[1,215],67:ft,81:214,115:dt,116:Xe,117:ct},{30:216,67:ft,79:kt,80:er,81:168,115:dt,116:Xe,117:ct},{51:[1,217],67:ft,81:214,115:dt,116:Xe,117:ct},{53:[1,218],67:ft,81:214,115:dt,116:Xe,117:ct},{55:[1,219],67:ft,81:214,115:dt,116:Xe,117:ct},{57:[1,220],67:ft,81:214,115:dt,116:Xe,117:ct},{60:[1,221]},{64:[1,222],67:ft,81:214,115:dt,116:Xe,117:ct},{66:[1,223],67:ft,81:214,115:dt,116:Xe,117:ct},{30:224,67:ft,79:kt,80:er,81:168,115:dt,116:Xe,117:ct},{31:[1,225],67:ft,81:214,115:dt,116:Xe,117:ct},{67:ft,69:[1,226],71:[1,227],81:214,115:dt,116:Xe,117:ct},{67:ft,69:[1,229],71:[1,228],81:214,115:dt,116:Xe,117:ct},t(j,[2,45],{18:152,10:F,40:Tt}),t(j,[2,47],{44:Ye}),t(Be,[2,75]),t(Be,[2,74]),{62:[1,230],67:ft,81:214,115:dt,116:Xe,117:ct},t(Be,[2,77]),t(Lt,[2,79]),{30:231,67:ft,79:kt,80:er,81:168,115:dt,116:Xe,117:ct},t(vt,a,{5:232}),t(Rt,[2,100]),t(B,[2,35]),{43:233,44:g,45:39,47:40,60:y,88:T,101:E,104:L,105:C,108:A,110:I,112:41,113:D,114:k,115:R},{10:F,18:234},{10:or,60:hn,83:Tn,91:235,104:Ur,106:236,107:237,108:ri,109:Mn,110:yt,111:Se},{10:or,60:hn,83:Tn,91:246,103:[1,247],104:Ur,106:236,107:237,108:ri,109:Mn,110:yt,111:Se},{10:or,60:hn,83:Tn,91:248,103:[1,249],104:Ur,106:236,107:237,108:ri,109:Mn,110:yt,111:Se},{104:[1,250]},{10:or,60:hn,83:Tn,91:251,104:Ur,106:236,107:237,108:ri,109:Mn,110:yt,111:Se},{44:g,47:252,60:y,88:T,101:E,104:L,105:C,108:A,110:I,112:41,113:D,114:k,115:R},t($e,[2,106]),{79:[1,253]},{79:[1,254],97:[1,255]},t($e,[2,114]),t($e,[2,116],{10:[1,256]}),t($e,[2,117]),t(oe,[2,56]),t(Xn,[2,85]),t(oe,[2,57]),{51:[1,257],67:ft,81:214,115:dt,116:Xe,117:ct},t(oe,[2,64]),t(oe,[2,59]),t(oe,[2,60]),t(oe,[2,61]),{108:[1,258]},t(oe,[2,63]),t(oe,[2,65]),{66:[1,259],67:ft,81:214,115:dt,116:Xe,117:ct},t(oe,[2,67]),t(oe,[2,68]),t(oe,[2,70]),t(oe,[2,69]),t(oe,[2,71]),t([10,44,60,88,101,104,105,108,110,113,114,115],[2,83]),{31:[1,260],67:ft,81:214,115:dt,116:Xe,117:ct},{6:11,7:12,8:s,9:l,10:u,11:h,20:17,22:18,23:19,24:20,25:21,26:22,27:f,32:[1,261],33:24,34:d,36:p,38:m,42:28,43:38,44:g,45:39,47:40,60:y,83:v,84:x,85:b,86:w,87:_,88:T,101:E,104:L,105:C,108:A,110:I,112:41,113:D,114:k,115:R,120:S,121:O,122:N,123:P},t(De,[2,53]),{43:262,44:g,45:39,47:40,60:y,88:T,101:E,104:L,105:C,108:A,110:I,112:41,113:D,114:k,115:R},t($e,[2,119],{105:at}),t(At,[2,128],{107:264,10:or,60:hn,83:Tn,104:Ur,108:ri,109:Mn,110:yt,111:Se}),t(pr,[2,130]),t(pr,[2,132]),t(pr,[2,133]),t(pr,[2,134]),t(pr,[2,135]),t(pr,[2,136]),t(pr,[2,137]),t(pr,[2,138]),t(pr,[2,139]),t($e,[2,120],{105:at}),{10:[1,265]},t($e,[2,121],{105:at}),{10:[1,266]},t(zt,[2,127]),t($e,[2,103],{105:at}),t($e,[2,104],{112:111,44:g,60:y,88:T,101:E,104:L,105:C,108:A,110:I,113:D,114:k,115:R}),t($e,[2,108]),t($e,[2,110],{10:[1,267]}),t($e,[2,111]),{97:[1,268]},{51:[1,269]},{62:[1,270]},{66:[1,271]},{8:$,9:z,11:W,21:272},t(B,[2,34]),t(De,[2,52]),{10:or,60:hn,83:Tn,104:Ur,106:273,107:237,108:ri,109:Mn,110:yt,111:Se},t(pr,[2,131]),{14:ie,44:Q,60:ee,88:J,100:274,104:H,105:q,108:Z,110:ae,113:ue,114:ce,115:te,119:86},{14:ie,44:Q,60:ee,88:J,100:275,104:H,105:q,108:Z,110:ae,113:ue,114:ce,115:te,119:86},{97:[1,276]},t($e,[2,118]),t(oe,[2,58]),{30:277,67:ft,79:kt,80:er,81:168,115:dt,116:Xe,117:ct},t(oe,[2,66]),t(vt,a,{5:278}),t(At,[2,129],{107:264,10:or,60:hn,83:Tn,104:Ur,108:ri,109:Mn,110:yt,111:Se}),t($e,[2,124],{119:164,10:[1,279],14:ie,44:Q,60:ee,88:J,104:H,105:q,108:Z,110:ae,113:ue,114:ce,115:te}),t($e,[2,125],{119:164,10:[1,280],14:ie,44:Q,60:ee,88:J,104:H,105:q,108:Z,110:ae,113:ue,114:ce,115:te}),t($e,[2,112]),{31:[1,281],67:ft,81:214,115:dt,116:Xe,117:ct},{6:11,7:12,8:s,9:l,10:u,11:h,20:17,22:18,23:19,24:20,25:21,26:22,27:f,32:[1,282],33:24,34:d,36:p,38:m,42:28,43:38,44:g,45:39,47:40,60:y,83:v,84:x,85:b,86:w,87:_,88:T,101:E,104:L,105:C,108:A,110:I,112:41,113:D,114:k,115:R,120:S,121:O,122:N,123:P},{10:or,60:hn,83:Tn,91:283,104:Ur,106:236,107:237,108:ri,109:Mn,110:yt,111:Se},{10:or,60:hn,83:Tn,91:284,104:Ur,106:236,107:237,108:ri,109:Mn,110:yt,111:Se},t(oe,[2,62]),t(B,[2,33]),t($e,[2,122],{105:at}),t($e,[2,123],{105:at})],defaultActions:{},parseError:o(function(_t,St){if(St.recoverable)this.trace(_t);else{var bt=new Error(_t);throw bt.hash=St,bt}},"parseError"),parse:o(function(_t){var St=this,bt=[0],Ue=[],Kt=[null],pe=[],bi=this.table,be="",vo=0,bF=0,wF=0,axe=2,TF=1,sxe=pe.slice.call(arguments,1),ji=Object.create(this.lexer),Pf={yy:{}};for(var gS in this.yy)Object.prototype.hasOwnProperty.call(this.yy,gS)&&(Pf.yy[gS]=this.yy[gS]);ji.setInput(_t,Pf.yy),Pf.yy.lexer=ji,Pf.yy.parser=this,typeof ji.yylloc>"u"&&(ji.yylloc={});var yS=ji.yylloc;pe.push(yS);var oxe=ji.options&&ji.options.ranges;typeof Pf.yy.parseError=="function"?this.parseError=Pf.yy.parseError:this.parseError=Object.getPrototypeOf(this).parseError;function Sat(Vs){bt.length=bt.length-2*Vs,Kt.length=Kt.length-Vs,pe.length=pe.length-Vs}o(Sat,"popStack");function lxe(){var Vs;return Vs=Ue.pop()||ji.lex()||TF,typeof Vs!="number"&&(Vs instanceof Array&&(Ue=Vs,Vs=Ue.pop()),Vs=St.symbols_[Vs]||Vs),Vs}o(lxe,"lex");for(var Va,vS,Bf,xo,Cat,xS,Q0={},Eb,Xc,kF,Sb;;){if(Bf=bt[bt.length-1],this.defaultActions[Bf]?xo=this.defaultActions[Bf]:((Va===null||typeof Va>"u")&&(Va=lxe()),xo=bi[Bf]&&bi[Bf][Va]),typeof xo>"u"||!xo.length||!xo[0]){var bS="";Sb=[];for(Eb in bi[Bf])this.terminals_[Eb]&&Eb>axe&&Sb.push("'"+this.terminals_[Eb]+"'");ji.showPosition?bS="Parse error on line "+(vo+1)+`: +`+ji.showPosition()+` +Expecting `+Sb.join(", ")+", got '"+(this.terminals_[Va]||Va)+"'":bS="Parse error on line "+(vo+1)+": Unexpected "+(Va==TF?"end of input":"'"+(this.terminals_[Va]||Va)+"'"),this.parseError(bS,{text:ji.match,token:this.terminals_[Va]||Va,line:ji.yylineno,loc:yS,expected:Sb})}if(xo[0]instanceof Array&&xo.length>1)throw new Error("Parse Error: multiple actions possible at state: "+Bf+", token: "+Va);switch(xo[0]){case 1:bt.push(Va),Kt.push(ji.yytext),pe.push(ji.yylloc),bt.push(xo[1]),Va=null,vS?(Va=vS,vS=null):(bF=ji.yyleng,be=ji.yytext,vo=ji.yylineno,yS=ji.yylloc,wF>0&&wF--);break;case 2:if(Xc=this.productions_[xo[1]][1],Q0.$=Kt[Kt.length-Xc],Q0._$={first_line:pe[pe.length-(Xc||1)].first_line,last_line:pe[pe.length-1].last_line,first_column:pe[pe.length-(Xc||1)].first_column,last_column:pe[pe.length-1].last_column},oxe&&(Q0._$.range=[pe[pe.length-(Xc||1)].range[0],pe[pe.length-1].range[1]]),xS=this.performAction.apply(Q0,[be,bF,vo,Pf.yy,xo[1],Kt,pe].concat(sxe)),typeof xS<"u")return xS;Xc&&(bt=bt.slice(0,-1*Xc*2),Kt=Kt.slice(0,-1*Xc),pe=pe.slice(0,-1*Xc)),bt.push(this.productions_[xo[1]][0]),Kt.push(Q0.$),pe.push(Q0._$),kF=bi[bt[bt.length-2]][bt[bt.length-1]],bt.push(kF);break;case 3:return!0}}return!0},"parse")},On=function(){var kn={EOF:1,parseError:o(function(St,bt){if(this.yy.parser)this.yy.parser.parseError(St,bt);else throw new Error(St)},"parseError"),setInput:o(function(_t,St){return this.yy=St||this.yy||{},this._input=_t,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},"setInput"),input:o(function(){var _t=this._input[0];this.yytext+=_t,this.yyleng++,this.offset++,this.match+=_t,this.matched+=_t;var St=_t.match(/(?:\r\n?|\n).*/g);return St?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),_t},"input"),unput:o(function(_t){var St=_t.length,bt=_t.split(/(?:\r\n?|\n)/g);this._input=_t+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-St),this.offset-=St;var Ue=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),bt.length-1&&(this.yylineno-=bt.length-1);var Kt=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:bt?(bt.length===Ue.length?this.yylloc.first_column:0)+Ue[Ue.length-bt.length].length-bt[0].length:this.yylloc.first_column-St},this.options.ranges&&(this.yylloc.range=[Kt[0],Kt[0]+this.yyleng-St]),this.yyleng=this.yytext.length,this},"unput"),more:o(function(){return this._more=!0,this},"more"),reject:o(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError("Lexical error on line "+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true). +`+this.showPosition(),{text:"",token:null,line:this.yylineno});return this},"reject"),less:o(function(_t){this.unput(this.match.slice(_t))},"less"),pastInput:o(function(){var _t=this.matched.substr(0,this.matched.length-this.match.length);return(_t.length>20?"...":"")+_t.substr(-20).replace(/\n/g,"")},"pastInput"),upcomingInput:o(function(){var _t=this.match;return _t.length<20&&(_t+=this._input.substr(0,20-_t.length)),(_t.substr(0,20)+(_t.length>20?"...":"")).replace(/\n/g,"")},"upcomingInput"),showPosition:o(function(){var _t=this.pastInput(),St=new Array(_t.length+1).join("-");return _t+this.upcomingInput()+` +`+St+"^"},"showPosition"),test_match:o(function(_t,St){var bt,Ue,Kt;if(this.options.backtrack_lexer&&(Kt={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(Kt.yylloc.range=this.yylloc.range.slice(0))),Ue=_t[0].match(/(?:\r\n?|\n).*/g),Ue&&(this.yylineno+=Ue.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:Ue?Ue[Ue.length-1].length-Ue[Ue.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+_t[0].length},this.yytext+=_t[0],this.match+=_t[0],this.matches=_t,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(_t[0].length),this.matched+=_t[0],bt=this.performAction.call(this,this.yy,this,St,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),bt)return bt;if(this._backtrack){for(var pe in Kt)this[pe]=Kt[pe];return!1}return!1},"test_match"),next:o(function(){if(this.done)return this.EOF;this._input||(this.done=!0);var _t,St,bt,Ue;this._more||(this.yytext="",this.match="");for(var Kt=this._currentRules(),pe=0;pe<Kt.length;pe++)if(bt=this._input.match(this.rules[Kt[pe]]),bt&&(!St||bt[0].length>St[0].length)){if(St=bt,Ue=pe,this.options.backtrack_lexer){if(_t=this.test_match(bt,Kt[pe]),_t!==!1)return _t;if(this._backtrack){St=!1;continue}else return!1}else if(!this.options.flex)break}return St?(_t=this.test_match(St,Kt[Ue]),_t!==!1?_t:!1):this._input===""?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+`. Unrecognized text. +`+this.showPosition(),{text:"",token:null,line:this.yylineno})},"next"),lex:o(function(){var St=this.next();return St||this.lex()},"lex"),begin:o(function(St){this.conditionStack.push(St)},"begin"),popState:o(function(){var St=this.conditionStack.length-1;return St>0?this.conditionStack.pop():this.conditionStack[0]},"popState"),_currentRules:o(function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},"_currentRules"),topState:o(function(St){return St=this.conditionStack.length-1-Math.abs(St||0),St>=0?this.conditionStack[St]:"INITIAL"},"topState"),pushState:o(function(St){this.begin(St)},"pushState"),stateStackSize:o(function(){return this.conditionStack.length},"stateStackSize"),options:{},performAction:o(function(St,bt,Ue,Kt){var pe=Kt;switch(Ue){case 0:return this.begin("acc_title"),34;break;case 1:return this.popState(),"acc_title_value";break;case 2:return this.begin("acc_descr"),36;break;case 3:return this.popState(),"acc_descr_value";break;case 4:this.begin("acc_descr_multiline");break;case 5:this.popState();break;case 6:return"acc_descr_multiline_value";case 7:return this.pushState("shapeData"),bt.yytext="",40;break;case 8:return this.pushState("shapeDataStr"),40;break;case 9:return this.popState(),40;break;case 10:let bi=/\n\s*/g;return bt.yytext=bt.yytext.replace(bi,"<br/>"),40;break;case 11:return 40;case 12:this.popState();break;case 13:this.begin("callbackname");break;case 14:this.popState();break;case 15:this.popState(),this.begin("callbackargs");break;case 16:return 94;case 17:this.popState();break;case 18:return 95;case 19:return"MD_STR";case 20:this.popState();break;case 21:this.begin("md_string");break;case 22:return"STR";case 23:this.popState();break;case 24:this.pushState("string");break;case 25:return 83;case 26:return 101;case 27:return 84;case 28:return 103;case 29:return 85;case 30:return 86;case 31:return 96;case 32:this.begin("click");break;case 33:this.popState();break;case 34:return 87;case 35:return St.lex.firstGraph()&&this.begin("dir"),12;break;case 36:return St.lex.firstGraph()&&this.begin("dir"),12;break;case 37:return St.lex.firstGraph()&&this.begin("dir"),12;break;case 38:return 27;case 39:return 32;case 40:return 97;case 41:return 97;case 42:return 97;case 43:return 97;case 44:return this.popState(),13;break;case 45:return this.popState(),14;break;case 46:return this.popState(),14;break;case 47:return this.popState(),14;break;case 48:return this.popState(),14;break;case 49:return this.popState(),14;break;case 50:return this.popState(),14;break;case 51:return this.popState(),14;break;case 52:return this.popState(),14;break;case 53:return this.popState(),14;break;case 54:return this.popState(),14;break;case 55:return 120;case 56:return 121;case 57:return 122;case 58:return 123;case 59:return 104;case 60:return 110;case 61:return 46;case 62:return 60;case 63:return 44;case 64:return 8;case 65:return 105;case 66:return 114;case 67:return this.popState(),77;break;case 68:return this.pushState("edgeText"),75;break;case 69:return 118;case 70:return this.popState(),77;break;case 71:return this.pushState("thickEdgeText"),75;break;case 72:return 118;case 73:return this.popState(),77;break;case 74:return this.pushState("dottedEdgeText"),75;break;case 75:return 118;case 76:return 77;case 77:return this.popState(),53;break;case 78:return"TEXT";case 79:return this.pushState("ellipseText"),52;break;case 80:return this.popState(),55;break;case 81:return this.pushState("text"),54;break;case 82:return this.popState(),57;break;case 83:return this.pushState("text"),56;break;case 84:return 58;case 85:return this.pushState("text"),67;break;case 86:return this.popState(),64;break;case 87:return this.pushState("text"),63;break;case 88:return this.popState(),49;break;case 89:return this.pushState("text"),48;break;case 90:return this.popState(),69;break;case 91:return this.popState(),71;break;case 92:return 116;case 93:return this.pushState("trapText"),68;break;case 94:return this.pushState("trapText"),70;break;case 95:return 117;case 96:return 67;case 97:return 89;case 98:return"SEP";case 99:return 88;case 100:return 114;case 101:return 110;case 102:return 44;case 103:return 108;case 104:return 113;case 105:return 115;case 106:return this.popState(),62;break;case 107:return this.pushState("text"),62;break;case 108:return this.popState(),51;break;case 109:return this.pushState("text"),50;break;case 110:return this.popState(),31;break;case 111:return this.pushState("text"),29;break;case 112:return this.popState(),66;break;case 113:return this.pushState("text"),65;break;case 114:return"TEXT";case 115:return"QUOTE";case 116:return 9;case 117:return 10;case 118:return 11}},"anonymous"),rules:[/^(?:accTitle\s*:\s*)/,/^(?:(?!\n||)*[^\n]*)/,/^(?:accDescr\s*:\s*)/,/^(?:(?!\n||)*[^\n]*)/,/^(?:accDescr\s*\{\s*)/,/^(?:[\}])/,/^(?:[^\}]*)/,/^(?:@\{)/,/^(?:["])/,/^(?:["])/,/^(?:[^\"]+)/,/^(?:[^}^"]+)/,/^(?:\})/,/^(?:call[\s]+)/,/^(?:\([\s]*\))/,/^(?:\()/,/^(?:[^(]*)/,/^(?:\))/,/^(?:[^)]*)/,/^(?:[^`"]+)/,/^(?:[`]["])/,/^(?:["][`])/,/^(?:[^"]+)/,/^(?:["])/,/^(?:["])/,/^(?:style\b)/,/^(?:default\b)/,/^(?:linkStyle\b)/,/^(?:interpolate\b)/,/^(?:classDef\b)/,/^(?:class\b)/,/^(?:href[\s])/,/^(?:click[\s]+)/,/^(?:[\s\n])/,/^(?:[^\s\n]*)/,/^(?:flowchart-elk\b)/,/^(?:graph\b)/,/^(?:flowchart\b)/,/^(?:subgraph\b)/,/^(?:end\b\s*)/,/^(?:_self\b)/,/^(?:_blank\b)/,/^(?:_parent\b)/,/^(?:_top\b)/,/^(?:(\r?\n)*\s*\n)/,/^(?:\s*LR\b)/,/^(?:\s*RL\b)/,/^(?:\s*TB\b)/,/^(?:\s*BT\b)/,/^(?:\s*TD\b)/,/^(?:\s*BR\b)/,/^(?:\s*<)/,/^(?:\s*>)/,/^(?:\s*\^)/,/^(?:\s*v\b)/,/^(?:.*direction\s+TB[^\n]*)/,/^(?:.*direction\s+BT[^\n]*)/,/^(?:.*direction\s+RL[^\n]*)/,/^(?:.*direction\s+LR[^\n]*)/,/^(?:[0-9]+)/,/^(?:#)/,/^(?::::)/,/^(?::)/,/^(?:&)/,/^(?:;)/,/^(?:,)/,/^(?:\*)/,/^(?:\s*[xo<]?--+[-xo>]\s*)/,/^(?:\s*[xo<]?--\s*)/,/^(?:[^-]|-(?!-)+)/,/^(?:\s*[xo<]?==+[=xo>]\s*)/,/^(?:\s*[xo<]?==\s*)/,/^(?:[^=]|=(?!))/,/^(?:\s*[xo<]?-?\.+-[xo>]?\s*)/,/^(?:\s*[xo<]?-\.\s*)/,/^(?:[^\.]|\.(?!))/,/^(?:\s*~~[\~]+\s*)/,/^(?:[-/\)][\)])/,/^(?:[^\(\)\[\]\{\}]|!\)+)/,/^(?:\(-)/,/^(?:\]\))/,/^(?:\(\[)/,/^(?:\]\])/,/^(?:\[\[)/,/^(?:\[\|)/,/^(?:>)/,/^(?:\)\])/,/^(?:\[\()/,/^(?:\)\)\))/,/^(?:\(\(\()/,/^(?:[\\(?=\])][\]])/,/^(?:\/(?=\])\])/,/^(?:\/(?!\])|\\(?!\])|[^\\\[\]\(\)\{\}\/]+)/,/^(?:\[\/)/,/^(?:\[\\)/,/^(?:<)/,/^(?:>)/,/^(?:\^)/,/^(?:\\\|)/,/^(?:v\b)/,/^(?:\*)/,/^(?:#)/,/^(?:&)/,/^(?:([A-Za-z0-9!"\#$%&'*+\.`?\\_\/]|-(?=[^\>\-\.])|(?!))+)/,/^(?:-)/,/^(?:[\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6]|[\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377]|[\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5]|[\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA]|[\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE]|[\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA]|[\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0]|[\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977]|[\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2]|[\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A]|[\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39]|[\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8]|[\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C]|[\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C]|[\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99]|[\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0]|[\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D]|[\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3]|[\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10]|[\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1]|[\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81]|[\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3]|[\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6]|[\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A]|[\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081]|[\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D]|[\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0]|[\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310]|[\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C]|[\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u1700-\u170C\u170E-\u1711]|[\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7]|[\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C]|[\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16]|[\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF]|[\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC]|[\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D]|[\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D]|[\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3]|[\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F]|[\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128]|[\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184]|[\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3]|[\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6]|[\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE]|[\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C]|[\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D]|[\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC]|[\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B]|[\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788]|[\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805]|[\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB]|[\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28]|[\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5]|[\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4]|[\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E]|[\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D]|[\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36]|[\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D]|[\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC]|[\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF]|[\uFFD2-\uFFD7\uFFDA-\uFFDC])/,/^(?:\|)/,/^(?:\|)/,/^(?:\))/,/^(?:\()/,/^(?:\])/,/^(?:\[)/,/^(?:(\}))/,/^(?:\{)/,/^(?:[^\[\]\(\)\{\}\|\"]+)/,/^(?:")/,/^(?:(\r?\n)+)/,/^(?:\s)/,/^(?:$)/],conditions:{shapeDataEndBracket:{rules:[21,24,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},shapeDataStr:{rules:[9,10,21,24,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},shapeData:{rules:[8,11,12,21,24,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},callbackargs:{rules:[17,18,21,24,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},callbackname:{rules:[14,15,16,21,24,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},href:{rules:[21,24,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},click:{rules:[21,24,33,34,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},dottedEdgeText:{rules:[21,24,73,75,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},thickEdgeText:{rules:[21,24,70,72,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},edgeText:{rules:[21,24,67,69,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},trapText:{rules:[21,24,76,79,81,83,87,89,90,91,92,93,94,107,109,111,113],inclusive:!1},ellipseText:{rules:[21,24,76,77,78,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},text:{rules:[21,24,76,79,80,81,82,83,86,87,88,89,93,94,106,107,108,109,110,111,112,113,114],inclusive:!1},vertex:{rules:[21,24,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},dir:{rules:[21,24,44,45,46,47,48,49,50,51,52,53,54,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},acc_descr_multiline:{rules:[5,6,21,24,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},acc_descr:{rules:[3,21,24,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},acc_title:{rules:[1,21,24,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},md_string:{rules:[19,20,21,24,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},string:{rules:[21,22,23,24,76,79,81,83,87,89,93,94,107,109,111,113],inclusive:!1},INITIAL:{rules:[0,2,4,7,13,21,24,25,26,27,28,29,30,31,32,35,36,37,38,39,40,41,42,43,55,56,57,58,59,60,61,62,63,64,65,66,67,68,70,71,73,74,76,79,81,83,84,85,87,89,93,94,95,96,97,98,99,100,101,102,103,104,105,107,109,111,113,115,116,117,118],inclusive:!0}}};return kn}();In.lexer=On;function Ir(){this.yy={}}return o(Ir,"Parser"),Ir.prototype=In,In.Parser=Ir,new Ir}();AD.parser=AD;Wie=AD});var uPe,hPe,qie,Xie=M(()=>{"use strict";To();uPe=o((t,e)=>{let r=z1,n=r(t,"r"),i=r(t,"g"),a=r(t,"b");return Hs(n,i,a,e)},"fade"),hPe=o(t=>`.label { + font-family: ${t.fontFamily}; + color: ${t.nodeTextColor||t.textColor}; + } + .cluster-label text { + fill: ${t.titleColor}; + } + .cluster-label span { + color: ${t.titleColor}; + } + .cluster-label span p { + background-color: transparent; + } + + .label text,span { + fill: ${t.nodeTextColor||t.textColor}; + color: ${t.nodeTextColor||t.textColor}; + } + + .node rect, + .node circle, + .node ellipse, + .node polygon, + .node path { + fill: ${t.mainBkg}; + stroke: ${t.nodeBorder}; + stroke-width: 1px; + } + .rough-node .label text , .node .label text, .image-shape .label, .icon-shape .label { + text-anchor: middle; + } + // .flowchart-label .text-outer-tspan { + // text-anchor: middle; + // } + // .flowchart-label .text-inner-tspan { + // text-anchor: start; + // } + + .node .katex path { + fill: #000; + stroke: #000; + stroke-width: 1px; + } + + .rough-node .label,.node .label, .image-shape .label, .icon-shape .label { + text-align: center; + } + .node.clickable { + cursor: pointer; + } + + + .root .anchor path { + fill: ${t.lineColor} !important; + stroke-width: 0; + stroke: ${t.lineColor}; + } + + .arrowheadPath { + fill: ${t.arrowheadColor}; + } + + .edgePath .path { + stroke: ${t.lineColor}; + stroke-width: 2.0px; + } + + .flowchart-link { + stroke: ${t.lineColor}; + fill: none; + } + + .edgeLabel { + background-color: ${t.edgeLabelBackground}; + p { + background-color: ${t.edgeLabelBackground}; + } + rect { + opacity: 0.5; + background-color: ${t.edgeLabelBackground}; + fill: ${t.edgeLabelBackground}; + } + text-align: center; + } + + /* For html labels only */ + .labelBkg { + background-color: ${uPe(t.edgeLabelBackground,.5)}; + // background-color: + } + + .cluster rect { + fill: ${t.clusterBkg}; + stroke: ${t.clusterBorder}; + stroke-width: 1px; + } + + .cluster text { + fill: ${t.titleColor}; + } + + .cluster span { + color: ${t.titleColor}; + } + /* .cluster div { + color: ${t.titleColor}; + } */ + + div.mermaidTooltip { + position: absolute; + text-align: center; + max-width: 200px; + padding: 2px; + font-family: ${t.fontFamily}; + font-size: 12px; + background: ${t.tertiaryColor}; + border: 1px solid ${t.border2}; + border-radius: 2px; + pointer-events: none; + z-index: 100; + } + + .flowchartTitleText { + text-anchor: middle; + font-size: 18px; + fill: ${t.textColor}; + } + + rect.text { + fill: none; + stroke-width: 0; + } + + .icon-shape, .image-shape { + background-color: ${t.edgeLabelBackground}; + p { + background-color: ${t.edgeLabelBackground}; + padding: 2px; + } + rect { + opacity: 0.5; + background-color: ${t.edgeLabelBackground}; + fill: ${t.edgeLabelBackground}; + } + text-align: center; + } +`,"getStyles"),qie=hPe});var hT={};vr(hT,{diagram:()=>fPe});var fPe,fT=M(()=>{"use strict";Vt();oL();Hie();Yie();Xie();fPe={parser:Wie,db:X5,renderer:Uie,styles:qie,init:o(t=>{t.flowchart||(t.flowchart={}),t.layout&&n7({layout:t.layout}),t.flowchart.arrowMarkerAbsolute=t.arrowMarkerAbsolute,n7({flowchart:{arrowMarkerAbsolute:t.arrowMarkerAbsolute}}),X5.clear(),X5.setGen("gen-2")},"init")}});var _D,Jie,eae=M(()=>{"use strict";_D=function(){var t=o(function(C,A,I,D){for(I=I||{},D=C.length;D--;I[C[D]]=A);return I},"o"),e=[6,8,10,20,22,24,26,27,28],r=[1,10],n=[1,11],i=[1,12],a=[1,13],s=[1,14],l=[1,15],u=[1,21],h=[1,22],f=[1,23],d=[1,24],p=[1,25],m=[6,8,10,13,15,18,19,20,22,24,26,27,28,41,42,43,44,45],g=[1,34],y=[27,28,46,47],v=[41,42,43,44,45],x=[17,34],b=[1,54],w=[1,53],_=[17,34,36,38],T={trace:o(function(){},"trace"),yy:{},symbols_:{error:2,start:3,ER_DIAGRAM:4,document:5,EOF:6,line:7,SPACE:8,statement:9,NEWLINE:10,entityName:11,relSpec:12,":":13,role:14,BLOCK_START:15,attributes:16,BLOCK_STOP:17,SQS:18,SQE:19,title:20,title_value:21,acc_title:22,acc_title_value:23,acc_descr:24,acc_descr_value:25,acc_descr_multiline_value:26,ALPHANUM:27,ENTITY_NAME:28,attribute:29,attributeType:30,attributeName:31,attributeKeyTypeList:32,attributeComment:33,ATTRIBUTE_WORD:34,attributeKeyType:35,COMMA:36,ATTRIBUTE_KEY:37,COMMENT:38,cardinality:39,relType:40,ZERO_OR_ONE:41,ZERO_OR_MORE:42,ONE_OR_MORE:43,ONLY_ONE:44,MD_PARENT:45,NON_IDENTIFYING:46,IDENTIFYING:47,WORD:48,$accept:0,$end:1},terminals_:{2:"error",4:"ER_DIAGRAM",6:"EOF",8:"SPACE",10:"NEWLINE",13:":",15:"BLOCK_START",17:"BLOCK_STOP",18:"SQS",19:"SQE",20:"title",21:"title_value",22:"acc_title",23:"acc_title_value",24:"acc_descr",25:"acc_descr_value",26:"acc_descr_multiline_value",27:"ALPHANUM",28:"ENTITY_NAME",34:"ATTRIBUTE_WORD",36:"COMMA",37:"ATTRIBUTE_KEY",38:"COMMENT",41:"ZERO_OR_ONE",42:"ZERO_OR_MORE",43:"ONE_OR_MORE",44:"ONLY_ONE",45:"MD_PARENT",46:"NON_IDENTIFYING",47:"IDENTIFYING",48:"WORD"},productions_:[0,[3,3],[5,0],[5,2],[7,2],[7,1],[7,1],[7,1],[9,5],[9,4],[9,3],[9,1],[9,7],[9,6],[9,4],[9,2],[9,2],[9,2],[9,1],[11,1],[11,1],[16,1],[16,2],[29,2],[29,3],[29,3],[29,4],[30,1],[31,1],[32,1],[32,3],[35,1],[33,1],[12,3],[39,1],[39,1],[39,1],[39,1],[39,1],[40,1],[40,1],[14,1],[14,1],[14,1]],performAction:o(function(A,I,D,k,R,S,O){var N=S.length-1;switch(R){case 1:break;case 2:this.$=[];break;case 3:S[N-1].push(S[N]),this.$=S[N-1];break;case 4:case 5:this.$=S[N];break;case 6:case 7:this.$=[];break;case 8:k.addEntity(S[N-4]),k.addEntity(S[N-2]),k.addRelationship(S[N-4],S[N],S[N-2],S[N-3]);break;case 9:k.addEntity(S[N-3]),k.addAttributes(S[N-3],S[N-1]);break;case 10:k.addEntity(S[N-2]);break;case 11:k.addEntity(S[N]);break;case 12:k.addEntity(S[N-6],S[N-4]),k.addAttributes(S[N-6],S[N-1]);break;case 13:k.addEntity(S[N-5],S[N-3]);break;case 14:k.addEntity(S[N-3],S[N-1]);break;case 15:case 16:this.$=S[N].trim(),k.setAccTitle(this.$);break;case 17:case 18:this.$=S[N].trim(),k.setAccDescription(this.$);break;case 19:case 43:this.$=S[N];break;case 20:case 41:case 42:this.$=S[N].replace(/"/g,"");break;case 21:case 29:this.$=[S[N]];break;case 22:S[N].push(S[N-1]),this.$=S[N];break;case 23:this.$={attributeType:S[N-1],attributeName:S[N]};break;case 24:this.$={attributeType:S[N-2],attributeName:S[N-1],attributeKeyTypeList:S[N]};break;case 25:this.$={attributeType:S[N-2],attributeName:S[N-1],attributeComment:S[N]};break;case 26:this.$={attributeType:S[N-3],attributeName:S[N-2],attributeKeyTypeList:S[N-1],attributeComment:S[N]};break;case 27:case 28:case 31:this.$=S[N];break;case 30:S[N-2].push(S[N]),this.$=S[N-2];break;case 32:this.$=S[N].replace(/"/g,"");break;case 33:this.$={cardA:S[N],relType:S[N-1],cardB:S[N-2]};break;case 34:this.$=k.Cardinality.ZERO_OR_ONE;break;case 35:this.$=k.Cardinality.ZERO_OR_MORE;break;case 36:this.$=k.Cardinality.ONE_OR_MORE;break;case 37:this.$=k.Cardinality.ONLY_ONE;break;case 38:this.$=k.Cardinality.MD_PARENT;break;case 39:this.$=k.Identification.NON_IDENTIFYING;break;case 40:this.$=k.Identification.IDENTIFYING;break}},"anonymous"),table:[{3:1,4:[1,2]},{1:[3]},t(e,[2,2],{5:3}),{6:[1,4],7:5,8:[1,6],9:7,10:[1,8],11:9,20:r,22:n,24:i,26:a,27:s,28:l},t(e,[2,7],{1:[2,1]}),t(e,[2,3]),{9:16,11:9,20:r,22:n,24:i,26:a,27:s,28:l},t(e,[2,5]),t(e,[2,6]),t(e,[2,11],{12:17,39:20,15:[1,18],18:[1,19],41:u,42:h,43:f,44:d,45:p}),{21:[1,26]},{23:[1,27]},{25:[1,28]},t(e,[2,18]),t(m,[2,19]),t(m,[2,20]),t(e,[2,4]),{11:29,27:s,28:l},{16:30,17:[1,31],29:32,30:33,34:g},{11:35,27:s,28:l},{40:36,46:[1,37],47:[1,38]},t(y,[2,34]),t(y,[2,35]),t(y,[2,36]),t(y,[2,37]),t(y,[2,38]),t(e,[2,15]),t(e,[2,16]),t(e,[2,17]),{13:[1,39]},{17:[1,40]},t(e,[2,10]),{16:41,17:[2,21],29:32,30:33,34:g},{31:42,34:[1,43]},{34:[2,27]},{19:[1,44]},{39:45,41:u,42:h,43:f,44:d,45:p},t(v,[2,39]),t(v,[2,40]),{14:46,27:[1,49],28:[1,48],48:[1,47]},t(e,[2,9]),{17:[2,22]},t(x,[2,23],{32:50,33:51,35:52,37:b,38:w}),t([17,34,37,38],[2,28]),t(e,[2,14],{15:[1,55]}),t([27,28],[2,33]),t(e,[2,8]),t(e,[2,41]),t(e,[2,42]),t(e,[2,43]),t(x,[2,24],{33:56,36:[1,57],38:w}),t(x,[2,25]),t(_,[2,29]),t(x,[2,32]),t(_,[2,31]),{16:58,17:[1,59],29:32,30:33,34:g},t(x,[2,26]),{35:60,37:b},{17:[1,61]},t(e,[2,13]),t(_,[2,30]),t(e,[2,12])],defaultActions:{34:[2,27],41:[2,22]},parseError:o(function(A,I){if(I.recoverable)this.trace(A);else{var D=new Error(A);throw D.hash=I,D}},"parseError"),parse:o(function(A){var I=this,D=[0],k=[],R=[null],S=[],O=this.table,N="",P=0,F=0,B=0,$=2,z=1,W=S.slice.call(arguments,1),j=Object.create(this.lexer),K={yy:{}};for(var ie in this.yy)Object.prototype.hasOwnProperty.call(this.yy,ie)&&(K.yy[ie]=this.yy[ie]);j.setInput(A,K.yy),K.yy.lexer=j,K.yy.parser=this,typeof j.yylloc>"u"&&(j.yylloc={});var Q=j.yylloc;S.push(Q);var ee=j.options&&j.options.ranges;typeof K.yy.parseError=="function"?this.parseError=K.yy.parseError:this.parseError=Object.getPrototypeOf(this).parseError;function J(Ge){D.length=D.length-2*Ge,R.length=R.length-Ge,S.length=S.length-Ge}o(J,"popStack");function H(){var Ge;return Ge=k.pop()||j.lex()||z,typeof Ge!="number"&&(Ge instanceof Array&&(k=Ge,Ge=k.pop()),Ge=I.symbols_[Ge]||Ge),Ge}o(H,"lex");for(var q,Z,ae,ue,ce,te,De={},oe,ke,Fe,Be;;){if(ae=D[D.length-1],this.defaultActions[ae]?ue=this.defaultActions[ae]:((q===null||typeof q>"u")&&(q=H()),ue=O[ae]&&O[ae][q]),typeof ue>"u"||!ue.length||!ue[0]){var Ve="";Be=[];for(oe in O[ae])this.terminals_[oe]&&oe>$&&Be.push("'"+this.terminals_[oe]+"'");j.showPosition?Ve="Parse error on line "+(P+1)+`: +`+j.showPosition()+` +Expecting `+Be.join(", ")+", got '"+(this.terminals_[q]||q)+"'":Ve="Parse error on line "+(P+1)+": Unexpected "+(q==z?"end of input":"'"+(this.terminals_[q]||q)+"'"),this.parseError(Ve,{text:j.match,token:this.terminals_[q]||q,line:j.yylineno,loc:Q,expected:Be})}if(ue[0]instanceof Array&&ue.length>1)throw new Error("Parse Error: multiple actions possible at state: "+ae+", token: "+q);switch(ue[0]){case 1:D.push(q),R.push(j.yytext),S.push(j.yylloc),D.push(ue[1]),q=null,Z?(q=Z,Z=null):(F=j.yyleng,N=j.yytext,P=j.yylineno,Q=j.yylloc,B>0&&B--);break;case 2:if(ke=this.productions_[ue[1]][1],De.$=R[R.length-ke],De._$={first_line:S[S.length-(ke||1)].first_line,last_line:S[S.length-1].last_line,first_column:S[S.length-(ke||1)].first_column,last_column:S[S.length-1].last_column},ee&&(De._$.range=[S[S.length-(ke||1)].range[0],S[S.length-1].range[1]]),te=this.performAction.apply(De,[N,F,P,K.yy,ue[1],R,S].concat(W)),typeof te<"u")return te;ke&&(D=D.slice(0,-1*ke*2),R=R.slice(0,-1*ke),S=S.slice(0,-1*ke)),D.push(this.productions_[ue[1]][0]),R.push(De.$),S.push(De._$),Fe=O[D[D.length-2]][D[D.length-1]],D.push(Fe);break;case 3:return!0}}return!0},"parse")},E=function(){var C={EOF:1,parseError:o(function(I,D){if(this.yy.parser)this.yy.parser.parseError(I,D);else throw new Error(I)},"parseError"),setInput:o(function(A,I){return this.yy=I||this.yy||{},this._input=A,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},"setInput"),input:o(function(){var A=this._input[0];this.yytext+=A,this.yyleng++,this.offset++,this.match+=A,this.matched+=A;var I=A.match(/(?:\r\n?|\n).*/g);return I?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),A},"input"),unput:o(function(A){var I=A.length,D=A.split(/(?:\r\n?|\n)/g);this._input=A+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-I),this.offset-=I;var k=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),D.length-1&&(this.yylineno-=D.length-1);var R=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:D?(D.length===k.length?this.yylloc.first_column:0)+k[k.length-D.length].length-D[0].length:this.yylloc.first_column-I},this.options.ranges&&(this.yylloc.range=[R[0],R[0]+this.yyleng-I]),this.yyleng=this.yytext.length,this},"unput"),more:o(function(){return this._more=!0,this},"more"),reject:o(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError("Lexical error on line "+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true). +`+this.showPosition(),{text:"",token:null,line:this.yylineno});return this},"reject"),less:o(function(A){this.unput(this.match.slice(A))},"less"),pastInput:o(function(){var A=this.matched.substr(0,this.matched.length-this.match.length);return(A.length>20?"...":"")+A.substr(-20).replace(/\n/g,"")},"pastInput"),upcomingInput:o(function(){var A=this.match;return A.length<20&&(A+=this._input.substr(0,20-A.length)),(A.substr(0,20)+(A.length>20?"...":"")).replace(/\n/g,"")},"upcomingInput"),showPosition:o(function(){var A=this.pastInput(),I=new Array(A.length+1).join("-");return A+this.upcomingInput()+` +`+I+"^"},"showPosition"),test_match:o(function(A,I){var D,k,R;if(this.options.backtrack_lexer&&(R={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(R.yylloc.range=this.yylloc.range.slice(0))),k=A[0].match(/(?:\r\n?|\n).*/g),k&&(this.yylineno+=k.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:k?k[k.length-1].length-k[k.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+A[0].length},this.yytext+=A[0],this.match+=A[0],this.matches=A,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(A[0].length),this.matched+=A[0],D=this.performAction.call(this,this.yy,this,I,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),D)return D;if(this._backtrack){for(var S in R)this[S]=R[S];return!1}return!1},"test_match"),next:o(function(){if(this.done)return this.EOF;this._input||(this.done=!0);var A,I,D,k;this._more||(this.yytext="",this.match="");for(var R=this._currentRules(),S=0;S<R.length;S++)if(D=this._input.match(this.rules[R[S]]),D&&(!I||D[0].length>I[0].length)){if(I=D,k=S,this.options.backtrack_lexer){if(A=this.test_match(D,R[S]),A!==!1)return A;if(this._backtrack){I=!1;continue}else return!1}else if(!this.options.flex)break}return I?(A=this.test_match(I,R[k]),A!==!1?A:!1):this._input===""?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+`. Unrecognized text. +`+this.showPosition(),{text:"",token:null,line:this.yylineno})},"next"),lex:o(function(){var I=this.next();return I||this.lex()},"lex"),begin:o(function(I){this.conditionStack.push(I)},"begin"),popState:o(function(){var I=this.conditionStack.length-1;return I>0?this.conditionStack.pop():this.conditionStack[0]},"popState"),_currentRules:o(function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},"_currentRules"),topState:o(function(I){return I=this.conditionStack.length-1-Math.abs(I||0),I>=0?this.conditionStack[I]:"INITIAL"},"topState"),pushState:o(function(I){this.begin(I)},"pushState"),stateStackSize:o(function(){return this.conditionStack.length},"stateStackSize"),options:{"case-insensitive":!0},performAction:o(function(I,D,k,R){var S=R;switch(k){case 0:return this.begin("acc_title"),22;break;case 1:return this.popState(),"acc_title_value";break;case 2:return this.begin("acc_descr"),24;break;case 3:return this.popState(),"acc_descr_value";break;case 4:this.begin("acc_descr_multiline");break;case 5:this.popState();break;case 6:return"acc_descr_multiline_value";case 7:return 10;case 8:break;case 9:return 8;case 10:return 28;case 11:return 48;case 12:return 4;case 13:return this.begin("block"),15;break;case 14:return 36;case 15:break;case 16:return 37;case 17:return 34;case 18:return 34;case 19:return 38;case 20:break;case 21:return this.popState(),17;break;case 22:return D.yytext[0];case 23:return 18;case 24:return 19;case 25:return 41;case 26:return 43;case 27:return 43;case 28:return 43;case 29:return 41;case 30:return 41;case 31:return 42;case 32:return 42;case 33:return 42;case 34:return 42;case 35:return 42;case 36:return 43;case 37:return 42;case 38:return 43;case 39:return 44;case 40:return 44;case 41:return 44;case 42:return 44;case 43:return 41;case 44:return 42;case 45:return 43;case 46:return 45;case 47:return 46;case 48:return 47;case 49:return 47;case 50:return 46;case 51:return 46;case 52:return 46;case 53:return 27;case 54:return D.yytext[0];case 55:return 6}},"anonymous"),rules:[/^(?:accTitle\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*\{\s*)/i,/^(?:[\}])/i,/^(?:[^\}]*)/i,/^(?:[\n]+)/i,/^(?:\s+)/i,/^(?:[\s]+)/i,/^(?:"[^"%\r\n\v\b\\]+")/i,/^(?:"[^"]*")/i,/^(?:erDiagram\b)/i,/^(?:\{)/i,/^(?:,)/i,/^(?:\s+)/i,/^(?:\b((?:PK)|(?:FK)|(?:UK))\b)/i,/^(?:(.*?)[~](.*?)*[~])/i,/^(?:[\*A-Za-z_][A-Za-z0-9\-_\[\]\(\)]*)/i,/^(?:"[^"]*")/i,/^(?:[\n]+)/i,/^(?:\})/i,/^(?:.)/i,/^(?:\[)/i,/^(?:\])/i,/^(?:one or zero\b)/i,/^(?:one or more\b)/i,/^(?:one or many\b)/i,/^(?:1\+)/i,/^(?:\|o\b)/i,/^(?:zero or one\b)/i,/^(?:zero or more\b)/i,/^(?:zero or many\b)/i,/^(?:0\+)/i,/^(?:\}o\b)/i,/^(?:many\(0\))/i,/^(?:many\(1\))/i,/^(?:many\b)/i,/^(?:\}\|)/i,/^(?:one\b)/i,/^(?:only one\b)/i,/^(?:1\b)/i,/^(?:\|\|)/i,/^(?:o\|)/i,/^(?:o\{)/i,/^(?:\|\{)/i,/^(?:\s*u\b)/i,/^(?:\.\.)/i,/^(?:--)/i,/^(?:to\b)/i,/^(?:optionally to\b)/i,/^(?:\.-)/i,/^(?:-\.)/i,/^(?:[A-Za-z_][A-Za-z0-9\-_]*)/i,/^(?:.)/i,/^(?:$)/i],conditions:{acc_descr_multiline:{rules:[5,6],inclusive:!1},acc_descr:{rules:[3],inclusive:!1},acc_title:{rules:[1],inclusive:!1},block:{rules:[14,15,16,17,18,19,20,21,22],inclusive:!1},INITIAL:{rules:[0,2,4,7,8,9,10,11,12,13,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55],inclusive:!0}}};return C}();T.lexer=E;function L(){this.yy={}}return o(L,"Parser"),L.prototype=T,T.Parser=L,new L}();_D.parser=_D;Jie=_D});var Gd,LD,xPe,bPe,tae,wPe,TPe,kPe,EPe,SPe,rae,nae=M(()=>{"use strict";ht();Vt();ki();Gd=new Map,LD=[],xPe={ZERO_OR_ONE:"ZERO_OR_ONE",ZERO_OR_MORE:"ZERO_OR_MORE",ONE_OR_MORE:"ONE_OR_MORE",ONLY_ONE:"ONLY_ONE",MD_PARENT:"MD_PARENT"},bPe={NON_IDENTIFYING:"NON_IDENTIFYING",IDENTIFYING:"IDENTIFYING"},tae=o(function(t,e=void 0){return Gd.has(t)?!Gd.get(t).alias&&e&&(Gd.get(t).alias=e,Y.info(`Add alias '${e}' to entity '${t}'`)):(Gd.set(t,{attributes:[],alias:e}),Y.info("Added new entity :",t)),Gd.get(t)},"addEntity"),wPe=o(()=>Gd,"getEntities"),TPe=o(function(t,e){let r=tae(t),n;for(n=e.length-1;n>=0;n--)r.attributes.push(e[n]),Y.debug("Added attribute ",e[n].attributeName)},"addAttributes"),kPe=o(function(t,e,r,n){let i={entityA:t,roleA:e,entityB:r,relSpec:n};LD.push(i),Y.debug("Added new relationship :",i)},"addRelationship"),EPe=o(()=>LD,"getRelationships"),SPe=o(function(){Gd=new Map,LD=[],_r()},"clear"),rae={Cardinality:xPe,Identification:bPe,getConfig:o(()=>de().er,"getConfig"),addEntity:tae,addAttributes:TPe,getEntities:wPe,addRelationship:kPe,getRelationships:EPe,clear:SPe,setAccTitle:Rr,getAccTitle:Pr,setAccDescription:Br,getAccDescription:Fr,setDiagramTitle:ln,getDiagramTitle:Jr}});var Rl,CPe,Wo,iae=M(()=>{"use strict";Rl={ONLY_ONE_START:"ONLY_ONE_START",ONLY_ONE_END:"ONLY_ONE_END",ZERO_OR_ONE_START:"ZERO_OR_ONE_START",ZERO_OR_ONE_END:"ZERO_OR_ONE_END",ONE_OR_MORE_START:"ONE_OR_MORE_START",ONE_OR_MORE_END:"ONE_OR_MORE_END",ZERO_OR_MORE_START:"ZERO_OR_MORE_START",ZERO_OR_MORE_END:"ZERO_OR_MORE_END",MD_PARENT_END:"MD_PARENT_END",MD_PARENT_START:"MD_PARENT_START"},CPe=o(function(t,e){let r;t.append("defs").append("marker").attr("id",Rl.MD_PARENT_START).attr("refX",0).attr("refY",7).attr("markerWidth",190).attr("markerHeight",240).attr("orient","auto").append("path").attr("d","M 18,7 L9,13 L1,7 L9,1 Z"),t.append("defs").append("marker").attr("id",Rl.MD_PARENT_END).attr("refX",19).attr("refY",7).attr("markerWidth",20).attr("markerHeight",28).attr("orient","auto").append("path").attr("d","M 18,7 L9,13 L1,7 L9,1 Z"),t.append("defs").append("marker").attr("id",Rl.ONLY_ONE_START).attr("refX",0).attr("refY",9).attr("markerWidth",18).attr("markerHeight",18).attr("orient","auto").append("path").attr("stroke",e.stroke).attr("fill","none").attr("d","M9,0 L9,18 M15,0 L15,18"),t.append("defs").append("marker").attr("id",Rl.ONLY_ONE_END).attr("refX",18).attr("refY",9).attr("markerWidth",18).attr("markerHeight",18).attr("orient","auto").append("path").attr("stroke",e.stroke).attr("fill","none").attr("d","M3,0 L3,18 M9,0 L9,18"),r=t.append("defs").append("marker").attr("id",Rl.ZERO_OR_ONE_START).attr("refX",0).attr("refY",9).attr("markerWidth",30).attr("markerHeight",18).attr("orient","auto"),r.append("circle").attr("stroke",e.stroke).attr("fill","white").attr("cx",21).attr("cy",9).attr("r",6),r.append("path").attr("stroke",e.stroke).attr("fill","none").attr("d","M9,0 L9,18"),r=t.append("defs").append("marker").attr("id",Rl.ZERO_OR_ONE_END).attr("refX",30).attr("refY",9).attr("markerWidth",30).attr("markerHeight",18).attr("orient","auto"),r.append("circle").attr("stroke",e.stroke).attr("fill","white").attr("cx",9).attr("cy",9).attr("r",6),r.append("path").attr("stroke",e.stroke).attr("fill","none").attr("d","M21,0 L21,18"),t.append("defs").append("marker").attr("id",Rl.ONE_OR_MORE_START).attr("refX",18).attr("refY",18).attr("markerWidth",45).attr("markerHeight",36).attr("orient","auto").append("path").attr("stroke",e.stroke).attr("fill","none").attr("d","M0,18 Q 18,0 36,18 Q 18,36 0,18 M42,9 L42,27"),t.append("defs").append("marker").attr("id",Rl.ONE_OR_MORE_END).attr("refX",27).attr("refY",18).attr("markerWidth",45).attr("markerHeight",36).attr("orient","auto").append("path").attr("stroke",e.stroke).attr("fill","none").attr("d","M3,9 L3,27 M9,18 Q27,0 45,18 Q27,36 9,18"),r=t.append("defs").append("marker").attr("id",Rl.ZERO_OR_MORE_START).attr("refX",18).attr("refY",18).attr("markerWidth",57).attr("markerHeight",36).attr("orient","auto"),r.append("circle").attr("stroke",e.stroke).attr("fill","white").attr("cx",48).attr("cy",18).attr("r",6),r.append("path").attr("stroke",e.stroke).attr("fill","none").attr("d","M0,18 Q18,0 36,18 Q18,36 0,18"),r=t.append("defs").append("marker").attr("id",Rl.ZERO_OR_MORE_END).attr("refX",39).attr("refY",18).attr("markerWidth",57).attr("markerHeight",36).attr("orient","auto"),r.append("circle").attr("stroke",e.stroke).attr("fill","white").attr("cx",9).attr("cy",18).attr("r",6),r.append("path").attr("stroke",e.stroke).attr("fill","none").attr("d","M21,18 Q39,0 57,18 Q39,36 21,18")},"insertMarkers"),Wo={ERMarkers:Rl,insertMarkers:CPe}});var aae,sae=M(()=>{"use strict";aae=/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i});function APe(t){return typeof t=="string"&&aae.test(t)}var oae,lae=M(()=>{"use strict";sae();o(APe,"validate");oae=APe});function cae(t,e=0){return pa[t[e+0]]+pa[t[e+1]]+pa[t[e+2]]+pa[t[e+3]]+"-"+pa[t[e+4]]+pa[t[e+5]]+"-"+pa[t[e+6]]+pa[t[e+7]]+"-"+pa[t[e+8]]+pa[t[e+9]]+"-"+pa[t[e+10]]+pa[t[e+11]]+pa[t[e+12]]+pa[t[e+13]]+pa[t[e+14]]+pa[t[e+15]]}var pa,uae=M(()=>{"use strict";pa=[];for(let t=0;t<256;++t)pa.push((t+256).toString(16).slice(1));o(cae,"unsafeStringify")});function _Pe(t){if(!oae(t))throw TypeError("Invalid UUID");let e,r=new Uint8Array(16);return r[0]=(e=parseInt(t.slice(0,8),16))>>>24,r[1]=e>>>16&255,r[2]=e>>>8&255,r[3]=e&255,r[4]=(e=parseInt(t.slice(9,13),16))>>>8,r[5]=e&255,r[6]=(e=parseInt(t.slice(14,18),16))>>>8,r[7]=e&255,r[8]=(e=parseInt(t.slice(19,23),16))>>>8,r[9]=e&255,r[10]=(e=parseInt(t.slice(24,36),16))/1099511627776&255,r[11]=e/4294967296&255,r[12]=e>>>24&255,r[13]=e>>>16&255,r[14]=e>>>8&255,r[15]=e&255,r}var hae,fae=M(()=>{"use strict";lae();o(_Pe,"parse");hae=_Pe});function LPe(t){t=unescape(encodeURIComponent(t));let e=[];for(let r=0;r<t.length;++r)e.push(t.charCodeAt(r));return e}function DD(t,e,r){function n(i,a,s,l){var u;if(typeof i=="string"&&(i=LPe(i)),typeof a=="string"&&(a=hae(a)),((u=a)===null||u===void 0?void 0:u.length)!==16)throw TypeError("Namespace must be array-like (16 iterable integer values, 0-255)");let h=new Uint8Array(16+i.length);if(h.set(a),h.set(i,a.length),h=r(h),h[6]=h[6]&15|e,h[8]=h[8]&63|128,s){l=l||0;for(let f=0;f<16;++f)s[l+f]=h[f];return s}return cae(h)}o(n,"generateUUID");try{n.name=t}catch{}return n.DNS=DPe,n.URL=NPe,n}var DPe,NPe,dae=M(()=>{"use strict";uae();fae();o(LPe,"stringToBytes");DPe="6ba7b810-9dad-11d1-80b4-00c04fd430c8",NPe="6ba7b811-9dad-11d1-80b4-00c04fd430c8";o(DD,"v35")});function RPe(t,e,r,n){switch(t){case 0:return e&r^~e&n;case 1:return e^r^n;case 2:return e&r^e&n^r&n;case 3:return e^r^n}}function ND(t,e){return t<<e|t>>>32-e}function MPe(t){let e=[1518500249,1859775393,2400959708,3395469782],r=[1732584193,4023233417,2562383102,271733878,3285377520];if(typeof t=="string"){let s=unescape(encodeURIComponent(t));t=[];for(let l=0;l<s.length;++l)t.push(s.charCodeAt(l))}else Array.isArray(t)||(t=Array.prototype.slice.call(t));t.push(128);let n=t.length/4+2,i=Math.ceil(n/16),a=new Array(i);for(let s=0;s<i;++s){let l=new Uint32Array(16);for(let u=0;u<16;++u)l[u]=t[s*64+u*4]<<24|t[s*64+u*4+1]<<16|t[s*64+u*4+2]<<8|t[s*64+u*4+3];a[s]=l}a[i-1][14]=(t.length-1)*8/Math.pow(2,32),a[i-1][14]=Math.floor(a[i-1][14]),a[i-1][15]=(t.length-1)*8&4294967295;for(let s=0;s<i;++s){let l=new Uint32Array(80);for(let m=0;m<16;++m)l[m]=a[s][m];for(let m=16;m<80;++m)l[m]=ND(l[m-3]^l[m-8]^l[m-14]^l[m-16],1);let u=r[0],h=r[1],f=r[2],d=r[3],p=r[4];for(let m=0;m<80;++m){let g=Math.floor(m/20),y=ND(u,5)+RPe(g,h,f,d)+p+e[g]+l[m]>>>0;p=d,d=f,f=ND(h,30)>>>0,h=u,u=y}r[0]=r[0]+u>>>0,r[1]=r[1]+h>>>0,r[2]=r[2]+f>>>0,r[3]=r[3]+d>>>0,r[4]=r[4]+p>>>0}return[r[0]>>24&255,r[0]>>16&255,r[0]>>8&255,r[0]&255,r[1]>>24&255,r[1]>>16&255,r[1]>>8&255,r[1]&255,r[2]>>24&255,r[2]>>16&255,r[2]>>8&255,r[2]&255,r[3]>>24&255,r[3]>>16&255,r[3]>>8&255,r[3]&255,r[4]>>24&255,r[4]>>16&255,r[4]>>8&255,r[4]&255]}var pae,mae=M(()=>{"use strict";o(RPe,"f");o(ND,"ROTL");o(MPe,"sha1");pae=MPe});var IPe,RD,gae=M(()=>{"use strict";dae();mae();IPe=DD("v5",80,pae),RD=IPe});var yae=M(()=>{"use strict";gae()});function HPe(t="",e=""){let r=t.replace(OPe,"");return`${xae(e)}${xae(r)}${RD(t,UPe)}`}function xae(t=""){return t.length>0?`${t}-`:""}var OPe,Bi,zv,PPe,BPe,FPe,zPe,bae,GPe,vae,$Pe,VPe,UPe,wae,Tae=M(()=>{"use strict";Ns();mr();Pv();Vt();ht();hr();iae();ni();fr();yae();OPe=/[^\dA-Za-z](\W)*/g,Bi={},zv=new Map,PPe=o(function(t){let e=Object.keys(t);for(let r of e)Bi[r]=t[r]},"setConf"),BPe=o((t,e,r)=>{let n=Bi.entityPadding/3,i=Bi.entityPadding/3,a=Bi.fontSize*.85,s=e.node().getBBox(),l=[],u=!1,h=!1,f=0,d=0,p=0,m=0,g=s.height+n*2,y=1;r.forEach(w=>{w.attributeKeyTypeList!==void 0&&w.attributeKeyTypeList.length>0&&(u=!0),w.attributeComment!==void 0&&(h=!0)}),r.forEach(w=>{let _=`${e.node().id}-attr-${y}`,T=0,E=ou(w.attributeType),L=t.append("text").classed("er entityLabel",!0).attr("id",`${_}-type`).attr("x",0).attr("y",0).style("dominant-baseline","middle").style("text-anchor","left").style("font-family",de().fontFamily).style("font-size",a+"px").text(E),C=t.append("text").classed("er entityLabel",!0).attr("id",`${_}-name`).attr("x",0).attr("y",0).style("dominant-baseline","middle").style("text-anchor","left").style("font-family",de().fontFamily).style("font-size",a+"px").text(w.attributeName),A={};A.tn=L,A.nn=C;let I=L.node().getBBox(),D=C.node().getBBox();if(f=Math.max(f,I.width),d=Math.max(d,D.width),T=Math.max(I.height,D.height),u){let k=w.attributeKeyTypeList!==void 0?w.attributeKeyTypeList.join(","):"",R=t.append("text").classed("er entityLabel",!0).attr("id",`${_}-key`).attr("x",0).attr("y",0).style("dominant-baseline","middle").style("text-anchor","left").style("font-family",de().fontFamily).style("font-size",a+"px").text(k);A.kn=R;let S=R.node().getBBox();p=Math.max(p,S.width),T=Math.max(T,S.height)}if(h){let k=t.append("text").classed("er entityLabel",!0).attr("id",`${_}-comment`).attr("x",0).attr("y",0).style("dominant-baseline","middle").style("text-anchor","left").style("font-family",de().fontFamily).style("font-size",a+"px").text(w.attributeComment||"");A.cn=k;let R=k.node().getBBox();m=Math.max(m,R.width),T=Math.max(T,R.height)}A.height=T,l.push(A),g+=T+n*2,y+=1});let v=4;u&&(v+=2),h&&(v+=2);let x=f+d+p+m,b={width:Math.max(Bi.minEntityWidth,Math.max(s.width+Bi.entityPadding*2,x+i*v)),height:r.length>0?g:Math.max(Bi.minEntityHeight,s.height+Bi.entityPadding*2)};if(r.length>0){let w=Math.max(0,(b.width-x-i*v)/(v/2));e.attr("transform","translate("+b.width/2+","+(n+s.height/2)+")");let _=s.height+n*2,T="attributeBoxOdd";l.forEach(E=>{let L=_+n+E.height/2;E.tn.attr("transform","translate("+i+","+L+")");let C=t.insert("rect","#"+E.tn.node().id).classed(`er ${T}`,!0).attr("x",0).attr("y",_).attr("width",f+i*2+w).attr("height",E.height+n*2),A=parseFloat(C.attr("x"))+parseFloat(C.attr("width"));E.nn.attr("transform","translate("+(A+i)+","+L+")");let I=t.insert("rect","#"+E.nn.node().id).classed(`er ${T}`,!0).attr("x",A).attr("y",_).attr("width",d+i*2+w).attr("height",E.height+n*2),D=parseFloat(I.attr("x"))+parseFloat(I.attr("width"));if(u){E.kn.attr("transform","translate("+(D+i)+","+L+")");let k=t.insert("rect","#"+E.kn.node().id).classed(`er ${T}`,!0).attr("x",D).attr("y",_).attr("width",p+i*2+w).attr("height",E.height+n*2);D=parseFloat(k.attr("x"))+parseFloat(k.attr("width"))}h&&(E.cn.attr("transform","translate("+(D+i)+","+L+")"),t.insert("rect","#"+E.cn.node().id).classed(`er ${T}`,"true").attr("x",D).attr("y",_).attr("width",m+i*2+w).attr("height",E.height+n*2)),_+=E.height+n*2,T=T==="attributeBoxOdd"?"attributeBoxEven":"attributeBoxOdd"})}else b.height=Math.max(Bi.minEntityHeight,g),e.attr("transform","translate("+b.width/2+","+b.height/2+")");return b},"drawAttributes"),FPe=o(function(t,e,r){let n=[...e.keys()],i;return n.forEach(function(a){let s=HPe(a,"entity");zv.set(a,s);let l=t.append("g").attr("id",s);i=i===void 0?s:i;let u="text-"+s,h=l.append("text").classed("er entityLabel",!0).attr("id",u).attr("x",0).attr("y",0).style("dominant-baseline","middle").style("text-anchor","middle").style("font-family",de().fontFamily).style("font-size",Bi.fontSize+"px").text(e.get(a).alias??a),{width:f,height:d}=BPe(l,h,e.get(a).attributes),m=l.insert("rect","#"+u).classed("er entityBox",!0).attr("x",0).attr("y",0).attr("width",f).attr("height",d).node().getBBox();r.setNode(s,{width:m.width,height:m.height,shape:"rect",id:s})}),i},"drawEntities"),zPe=o(function(t,e){e.nodes().forEach(function(r){r!==void 0&&e.node(r)!==void 0&&t.select("#"+r).attr("transform","translate("+(e.node(r).x-e.node(r).width/2)+","+(e.node(r).y-e.node(r).height/2)+" )")})},"adjustEntities"),bae=o(function(t){return(t.entityA+t.roleA+t.entityB).replace(/\s/g,"")},"getEdgeName"),GPe=o(function(t,e){return t.forEach(function(r){e.setEdge(zv.get(r.entityA),zv.get(r.entityB),{relationship:r},bae(r))}),t},"addRelationships"),vae=0,$Pe=o(function(t,e,r,n,i){vae++;let a=r.edge(zv.get(e.entityA),zv.get(e.entityB),bae(e)),s=Ka().x(function(y){return y.x}).y(function(y){return y.y}).curve(Do),l=t.insert("path","#"+n).classed("er relationshipLine",!0).attr("d",s(a.points)).style("stroke",Bi.stroke).style("fill","none");e.relSpec.relType===i.db.Identification.NON_IDENTIFYING&&l.attr("stroke-dasharray","8,8");let u="";switch(Bi.arrowMarkerAbsolute&&(u=window.location.protocol+"//"+window.location.host+window.location.pathname+window.location.search,u=u.replace(/\(/g,"\\("),u=u.replace(/\)/g,"\\)")),e.relSpec.cardA){case i.db.Cardinality.ZERO_OR_ONE:l.attr("marker-end","url("+u+"#"+Wo.ERMarkers.ZERO_OR_ONE_END+")");break;case i.db.Cardinality.ZERO_OR_MORE:l.attr("marker-end","url("+u+"#"+Wo.ERMarkers.ZERO_OR_MORE_END+")");break;case i.db.Cardinality.ONE_OR_MORE:l.attr("marker-end","url("+u+"#"+Wo.ERMarkers.ONE_OR_MORE_END+")");break;case i.db.Cardinality.ONLY_ONE:l.attr("marker-end","url("+u+"#"+Wo.ERMarkers.ONLY_ONE_END+")");break;case i.db.Cardinality.MD_PARENT:l.attr("marker-end","url("+u+"#"+Wo.ERMarkers.MD_PARENT_END+")");break}switch(e.relSpec.cardB){case i.db.Cardinality.ZERO_OR_ONE:l.attr("marker-start","url("+u+"#"+Wo.ERMarkers.ZERO_OR_ONE_START+")");break;case i.db.Cardinality.ZERO_OR_MORE:l.attr("marker-start","url("+u+"#"+Wo.ERMarkers.ZERO_OR_MORE_START+")");break;case i.db.Cardinality.ONE_OR_MORE:l.attr("marker-start","url("+u+"#"+Wo.ERMarkers.ONE_OR_MORE_START+")");break;case i.db.Cardinality.ONLY_ONE:l.attr("marker-start","url("+u+"#"+Wo.ERMarkers.ONLY_ONE_START+")");break;case i.db.Cardinality.MD_PARENT:l.attr("marker-start","url("+u+"#"+Wo.ERMarkers.MD_PARENT_START+")");break}let h=l.node().getTotalLength(),f=l.node().getPointAtLength(h*.5),d="rel"+vae,p=e.roleA.split(/<br ?\/>/g),m=t.append("text").classed("er relationshipLabel",!0).attr("id",d).attr("x",f.x).attr("y",f.y).style("text-anchor","middle").style("dominant-baseline","middle").style("font-family",de().fontFamily).style("font-size",Bi.fontSize+"px");if(p.length==1)m.text(e.roleA);else{let y=-(p.length-1)*.5;p.forEach((v,x)=>{m.append("tspan").attr("x",f.x).attr("dy",`${x===0?y:1}em`).text(v)})}let g=m.node().getBBox();t.insert("rect","#"+d).classed("er relationshipLabelBox",!0).attr("x",f.x-g.width/2).attr("y",f.y-g.height/2).attr("width",g.width).attr("height",g.height)},"drawRelationshipFromLayout"),VPe=o(function(t,e,r,n){Bi=de().er,Y.info("Drawing ER diagram");let i=de().securityLevel,a;i==="sandbox"&&(a=ze("#i"+e));let l=(i==="sandbox"?ze(a.nodes()[0].contentDocument.body):ze("body")).select(`[id='${e}']`);Wo.insertMarkers(l,Bi);let u;u=new Mr({multigraph:!0,directed:!0,compound:!1}).setGraph({rankdir:Bi.layoutDirection,marginx:20,marginy:20,nodesep:100,edgesep:100,ranksep:100}).setDefaultEdgeLabel(function(){return{}});let h=FPe(l,n.db.getEntities(),u),f=GPe(n.db.getRelationships(),u);Du(u),zPe(l,u),f.forEach(function(y){$Pe(l,y,u,h,n)});let d=Bi.diagramPadding;Ut.insertTitle(l,"entityTitleText",Bi.titleTopMargin,n.db.getDiagramTitle());let p=l.node().getBBox(),m=p.width+d*2,g=p.height+d*2;Zr(l,g,m,Bi.useMaxWidth),l.attr("viewBox",`${p.x-d} ${p.y-d} ${m} ${g}`)},"draw"),UPe="28e9f9db-3c8d-5aa5-9faf-44286ae5937c";o(HPe,"generateId");o(xae,"strWithHyphen");wae={setConf:PPe,draw:VPe}});var WPe,kae,Eae=M(()=>{"use strict";WPe=o(t=>` + .entityBox { + fill: ${t.mainBkg}; + stroke: ${t.nodeBorder}; + } + + .attributeBoxOdd { + fill: ${t.attributeBackgroundColorOdd}; + stroke: ${t.nodeBorder}; + } + + .attributeBoxEven { + fill: ${t.attributeBackgroundColorEven}; + stroke: ${t.nodeBorder}; + } + + .relationshipLabelBox { + fill: ${t.tertiaryColor}; + opacity: 0.7; + background-color: ${t.tertiaryColor}; + rect { + opacity: 0.5; + } + } + + .relationshipLine { + stroke: ${t.lineColor}; + } + + .entityTitleText { + text-anchor: middle; + font-size: 18px; + fill: ${t.textColor}; + } + #MD_PARENT_START { + fill: #f5f5f5 !important; + stroke: ${t.lineColor} !important; + stroke-width: 1; + } + #MD_PARENT_END { + fill: #f5f5f5 !important; + stroke: ${t.lineColor} !important; + stroke-width: 1; + } + +`,"getStyles"),kae=WPe});var Sae={};vr(Sae,{diagram:()=>YPe});var YPe,Cae=M(()=>{"use strict";eae();nae();Tae();Eae();YPe={parser:Jie,db:rae,renderer:wae,styles:kae}});function ei(t){return typeof t=="object"&&t!==null&&typeof t.$type=="string"}function ma(t){return typeof t=="object"&&t!==null&&typeof t.$refText=="string"}function MD(t){return typeof t=="object"&&t!==null&&typeof t.name=="string"&&typeof t.type=="string"&&typeof t.path=="string"}function Vd(t){return typeof t=="object"&&t!==null&&ei(t.container)&&ma(t.reference)&&typeof t.message=="string"}function io(t){return typeof t=="object"&&t!==null&&Array.isArray(t.content)}function Jh(t){return typeof t=="object"&&t!==null&&typeof t.tokenType=="object"}function Gv(t){return io(t)&&typeof t.fullText=="string"}var $d,Yo=M(()=>{"use strict";o(ei,"isAstNode");o(ma,"isReference");o(MD,"isAstNodeDescription");o(Vd,"isLinkingError");$d=class{static{o(this,"AbstractAstReflection")}constructor(){this.subtypes={},this.allSubtypes={}}isInstance(e,r){return ei(e)&&this.isSubtype(e.$type,r)}isSubtype(e,r){if(e===r)return!0;let n=this.subtypes[e];n||(n=this.subtypes[e]={});let i=n[r];if(i!==void 0)return i;{let a=this.computeIsSubtype(e,r);return n[r]=a,a}}getAllSubTypes(e){let r=this.allSubtypes[e];if(r)return r;{let n=this.getAllTypes(),i=[];for(let a of n)this.isSubtype(a,e)&&i.push(a);return this.allSubtypes[e]=i,i}}};o(io,"isCompositeCstNode");o(Jh,"isLeafCstNode");o(Gv,"isRootCstNode")});function KPe(t){return typeof t=="string"?t:typeof t>"u"?"undefined":typeof t.toString=="function"?t.toString():Object.prototype.toString.call(t)}function dT(t){return!!t&&typeof t[Symbol.iterator]=="function"}function tn(...t){if(t.length===1){let e=t[0];if(e instanceof ao)return e;if(dT(e))return new ao(()=>e[Symbol.iterator](),r=>r.next());if(typeof e.length=="number")return new ao(()=>({index:0}),r=>r.index<e.length?{done:!1,value:e[r.index++]}:Ja)}return t.length>1?new ao(()=>({collIndex:0,arrIndex:0}),e=>{do{if(e.iterator){let r=e.iterator.next();if(!r.done)return r;e.iterator=void 0}if(e.array){if(e.arrIndex<e.array.length)return{done:!1,value:e.array[e.arrIndex++]};e.array=void 0,e.arrIndex=0}if(e.collIndex<t.length){let r=t[e.collIndex++];dT(r)?e.iterator=r[Symbol.iterator]():r&&typeof r.length=="number"&&(e.array=r)}}while(e.iterator||e.array||e.collIndex<t.length);return Ja}):$v}var ao,$v,Ja,Cc,Gm,Rs=M(()=>{"use strict";ao=class t{static{o(this,"StreamImpl")}constructor(e,r){this.startFn=e,this.nextFn=r}iterator(){let e={state:this.startFn(),next:o(()=>this.nextFn(e.state),"next"),[Symbol.iterator]:()=>e};return e}[Symbol.iterator](){return this.iterator()}isEmpty(){return!!this.iterator().next().done}count(){let e=this.iterator(),r=0,n=e.next();for(;!n.done;)r++,n=e.next();return r}toArray(){let e=[],r=this.iterator(),n;do n=r.next(),n.value!==void 0&&e.push(n.value);while(!n.done);return e}toSet(){return new Set(this)}toMap(e,r){let n=this.map(i=>[e?e(i):i,r?r(i):i]);return new Map(n)}toString(){return this.join()}concat(e){let r=e[Symbol.iterator]();return new t(()=>({first:this.startFn(),firstDone:!1}),n=>{let i;if(!n.firstDone){do if(i=this.nextFn(n.first),!i.done)return i;while(!i.done);n.firstDone=!0}do if(i=r.next(),!i.done)return i;while(!i.done);return Ja})}join(e=","){let r=this.iterator(),n="",i,a=!1;do i=r.next(),i.done||(a&&(n+=e),n+=KPe(i.value)),a=!0;while(!i.done);return n}indexOf(e,r=0){let n=this.iterator(),i=0,a=n.next();for(;!a.done;){if(i>=r&&a.value===e)return i;a=n.next(),i++}return-1}every(e){let r=this.iterator(),n=r.next();for(;!n.done;){if(!e(n.value))return!1;n=r.next()}return!0}some(e){let r=this.iterator(),n=r.next();for(;!n.done;){if(e(n.value))return!0;n=r.next()}return!1}forEach(e){let r=this.iterator(),n=0,i=r.next();for(;!i.done;)e(i.value,n),i=r.next(),n++}map(e){return new t(this.startFn,r=>{let{done:n,value:i}=this.nextFn(r);return n?Ja:{done:!1,value:e(i)}})}filter(e){return new t(this.startFn,r=>{let n;do if(n=this.nextFn(r),!n.done&&e(n.value))return n;while(!n.done);return Ja})}nonNullable(){return this.filter(e=>e!=null)}reduce(e,r){let n=this.iterator(),i=r,a=n.next();for(;!a.done;)i===void 0?i=a.value:i=e(i,a.value),a=n.next();return i}reduceRight(e,r){return this.recursiveReduce(this.iterator(),e,r)}recursiveReduce(e,r,n){let i=e.next();if(i.done)return n;let a=this.recursiveReduce(e,r,n);return a===void 0?i.value:r(a,i.value)}find(e){let r=this.iterator(),n=r.next();for(;!n.done;){if(e(n.value))return n.value;n=r.next()}}findIndex(e){let r=this.iterator(),n=0,i=r.next();for(;!i.done;){if(e(i.value))return n;i=r.next(),n++}return-1}includes(e){let r=this.iterator(),n=r.next();for(;!n.done;){if(n.value===e)return!0;n=r.next()}return!1}flatMap(e){return new t(()=>({this:this.startFn()}),r=>{do{if(r.iterator){let a=r.iterator.next();if(a.done)r.iterator=void 0;else return a}let{done:n,value:i}=this.nextFn(r.this);if(!n){let a=e(i);if(dT(a))r.iterator=a[Symbol.iterator]();else return{done:!1,value:a}}}while(r.iterator);return Ja})}flat(e){if(e===void 0&&(e=1),e<=0)return this;let r=e>1?this.flat(e-1):this;return new t(()=>({this:r.startFn()}),n=>{do{if(n.iterator){let s=n.iterator.next();if(s.done)n.iterator=void 0;else return s}let{done:i,value:a}=r.nextFn(n.this);if(!i)if(dT(a))n.iterator=a[Symbol.iterator]();else return{done:!1,value:a}}while(n.iterator);return Ja})}head(){let r=this.iterator().next();if(!r.done)return r.value}tail(e=1){return new t(()=>{let r=this.startFn();for(let n=0;n<e;n++)if(this.nextFn(r).done)return r;return r},this.nextFn)}limit(e){return new t(()=>({size:0,state:this.startFn()}),r=>(r.size++,r.size>e?Ja:this.nextFn(r.state)))}distinct(e){let r=new Set;return this.filter(n=>{let i=e?e(n):n;return r.has(i)?!1:(r.add(i),!0)})}exclude(e,r){let n=new Set;for(let i of e){let a=r?r(i):i;n.add(a)}return this.filter(i=>{let a=r?r(i):i;return!n.has(a)})}};o(KPe,"toString");o(dT,"isIterable");$v=new ao(()=>{},()=>Ja),Ja=Object.freeze({done:!0,value:void 0});o(tn,"stream");Cc=class extends ao{static{o(this,"TreeStreamImpl")}constructor(e,r,n){super(()=>({iterators:n?.includeRoot?[[e][Symbol.iterator]()]:[r(e)[Symbol.iterator]()],pruned:!1}),i=>{for(i.pruned&&(i.iterators.pop(),i.pruned=!1);i.iterators.length>0;){let s=i.iterators[i.iterators.length-1].next();if(s.done)i.iterators.pop();else return i.iterators.push(r(s.value)[Symbol.iterator]()),s}return Ja})}iterator(){let e={state:this.startFn(),next:o(()=>this.nextFn(e.state),"next"),prune:o(()=>{e.state.pruned=!0},"prune"),[Symbol.iterator]:()=>e};return e}};(function(t){function e(a){return a.reduce((s,l)=>s+l,0)}o(e,"sum"),t.sum=e;function r(a){return a.reduce((s,l)=>s*l,0)}o(r,"product"),t.product=r;function n(a){return a.reduce((s,l)=>Math.min(s,l))}o(n,"min"),t.min=n;function i(a){return a.reduce((s,l)=>Math.max(s,l))}o(i,"max"),t.max=i})(Gm||(Gm={}))});var mT={};vr(mT,{DefaultNameRegexp:()=>pT,RangeComparison:()=>Nu,compareRange:()=>Dae,findCommentNode:()=>BD,findDeclarationNodeAtOffset:()=>ZPe,findLeafNodeAtOffset:()=>FD,findLeafNodeBeforeOffset:()=>Nae,flattenCst:()=>QPe,getInteriorNodes:()=>tBe,getNextNode:()=>JPe,getPreviousNode:()=>Mae,getStartlineNode:()=>eBe,inRange:()=>PD,isChildNode:()=>OD,isCommentNode:()=>ID,streamCst:()=>Ud,toDocumentSegment:()=>Hd,tokenToRange:()=>$m});function Ud(t){return new Cc(t,e=>io(e)?e.content:[],{includeRoot:!0})}function QPe(t){return Ud(t).filter(Jh)}function OD(t,e){for(;t.container;)if(t=t.container,t===e)return!0;return!1}function $m(t){return{start:{character:t.startColumn-1,line:t.startLine-1},end:{character:t.endColumn,line:t.endLine-1}}}function Hd(t){if(!t)return;let{offset:e,end:r,range:n}=t;return{range:n,offset:e,end:r,length:r-e}}function Dae(t,e){if(t.end.line<e.start.line||t.end.line===e.start.line&&t.end.character<t.start.character)return Nu.Before;if(t.start.line>e.end.line||t.start.line===e.end.line&&t.start.character>e.end.character)return Nu.After;let r=t.start.line>e.start.line||t.start.line===e.start.line&&t.start.character>=e.start.character,n=t.end.line<e.end.line||t.end.line===e.end.line&&t.end.character<=e.end.character;return r&&n?Nu.Inside:r?Nu.OverlapBack:Nu.OverlapFront}function PD(t,e){return Dae(t,e)>Nu.After}function ZPe(t,e,r=pT){if(t){if(e>0){let n=e-t.offset,i=t.text.charAt(n);r.test(i)||e--}return FD(t,e)}}function BD(t,e){if(t){let r=Mae(t,!0);if(r&&ID(r,e))return r;if(Gv(t)){let n=t.content.findIndex(i=>!i.hidden);for(let i=n-1;i>=0;i--){let a=t.content[i];if(ID(a,e))return a}}}}function ID(t,e){return Jh(t)&&e.includes(t.tokenType.name)}function FD(t,e){if(Jh(t))return t;if(io(t)){let r=Rae(t,e,!1);if(r)return FD(r,e)}}function Nae(t,e){if(Jh(t))return t;if(io(t)){let r=Rae(t,e,!0);if(r)return Nae(r,e)}}function Rae(t,e,r){let n=0,i=t.content.length-1,a;for(;n<=i;){let s=Math.floor((n+i)/2),l=t.content[s];if(l.offset<=e&&l.end>e)return l;l.end<=e?(a=r?l:void 0,n=s+1):i=s-1}return a}function Mae(t,e=!0){for(;t.container;){let r=t.container,n=r.content.indexOf(t);for(;n>0;){n--;let i=r.content[n];if(e||!i.hidden)return i}t=r}}function JPe(t,e=!0){for(;t.container;){let r=t.container,n=r.content.indexOf(t),i=r.content.length-1;for(;n<i;){n++;let a=r.content[n];if(e||!a.hidden)return a}t=r}}function eBe(t){if(t.range.start.character===0)return t;let e=t.range.start.line,r=t,n;for(;t.container;){let i=t.container,a=n??i.content.indexOf(t);if(a===0?(t=i,n=void 0):(n=a-1,t=i.content[n]),t.range.start.line!==e)break;r=t}return r}function tBe(t,e){let r=rBe(t,e);return r?r.parent.content.slice(r.a+1,r.b):[]}function rBe(t,e){let r=Lae(t),n=Lae(e),i;for(let a=0;a<r.length&&a<n.length;a++){let s=r[a],l=n[a];if(s.parent===l.parent)i={parent:s.parent,a:s.index,b:l.index};else break}return i}function Lae(t){let e=[];for(;t.container;){let r=t.container,n=r.content.indexOf(t);e.push({parent:r,index:n}),t=r}return e.reverse()}var Nu,pT,Ml=M(()=>{"use strict";Yo();Rs();o(Ud,"streamCst");o(QPe,"flattenCst");o(OD,"isChildNode");o($m,"tokenToRange");o(Hd,"toDocumentSegment");(function(t){t[t.Before=0]="Before",t[t.After=1]="After",t[t.OverlapFront=2]="OverlapFront",t[t.OverlapBack=3]="OverlapBack",t[t.Inside=4]="Inside"})(Nu||(Nu={}));o(Dae,"compareRange");o(PD,"inRange");pT=/^[\w\p{L}]$/u;o(ZPe,"findDeclarationNodeAtOffset");o(BD,"findCommentNode");o(ID,"isCommentNode");o(FD,"findLeafNodeAtOffset");o(Nae,"findLeafNodeBeforeOffset");o(Rae,"binarySearch");o(Mae,"getPreviousNode");o(JPe,"getNextNode");o(eBe,"getStartlineNode");o(tBe,"getInteriorNodes");o(rBe,"getCommonParent");o(Lae,"getParentChain")});function ef(t){throw new Error("Error! The input value was not handled.")}var Wd,gT=M(()=>{"use strict";Wd=class extends Error{static{o(this,"ErrorWithLocation")}constructor(e,r){super(e?`${r} at ${e.range.start.line}:${e.range.start.character}`:r)}};o(ef,"assertUnreachable")});var Yv={};vr(Yv,{AbstractElement:()=>GD,AbstractRule:()=>Vv,AbstractType:()=>Uv,Action:()=>pN,Alternatives:()=>mN,ArrayLiteral:()=>$D,ArrayType:()=>VD,Assignment:()=>gN,BooleanLiteral:()=>HD,CharacterRange:()=>yN,Condition:()=>yT,Conjunction:()=>YD,CrossReference:()=>xN,Disjunction:()=>XD,EndOfFile:()=>bN,Grammar:()=>KD,GrammarImport:()=>Oae,Group:()=>TN,InferredType:()=>QD,Interface:()=>ZD,Keyword:()=>kN,LangiumGrammarAstReflection:()=>Vm,LangiumGrammarTerminals:()=>nBe,NamedArgument:()=>Pae,NegatedToken:()=>EN,Negation:()=>JD,NumberLiteral:()=>tN,Parameter:()=>rN,ParameterReference:()=>nN,ParserRule:()=>aN,ReferenceType:()=>sN,RegexToken:()=>CN,ReturnType:()=>Bae,RuleCall:()=>_N,SimpleType:()=>cN,StringLiteral:()=>uN,TerminalAlternatives:()=>LN,TerminalGroup:()=>NN,TerminalRule:()=>xT,TerminalRuleCall:()=>MN,Type:()=>hN,TypeAttribute:()=>Fae,TypeDefinition:()=>zD,UnionType:()=>fN,UnorderedGroup:()=>IN,UntilToken:()=>ON,ValueLiteral:()=>vT,Wildcard:()=>BN,isAbstractElement:()=>Hv,isAbstractRule:()=>iBe,isAbstractType:()=>aBe,isAction:()=>Ru,isAlternatives:()=>kT,isArrayLiteral:()=>uBe,isArrayType:()=>UD,isAssignment:()=>Il,isBooleanLiteral:()=>WD,isCharacterRange:()=>vN,isCondition:()=>sBe,isConjunction:()=>qD,isCrossReference:()=>Yd,isDisjunction:()=>jD,isEndOfFile:()=>wN,isFeatureName:()=>oBe,isGrammar:()=>hBe,isGrammarImport:()=>fBe,isGroup:()=>tf,isInferredType:()=>bT,isInterface:()=>wT,isKeyword:()=>Xo,isNamedArgument:()=>dBe,isNegatedToken:()=>SN,isNegation:()=>eN,isNumberLiteral:()=>pBe,isParameter:()=>mBe,isParameterReference:()=>iN,isParserRule:()=>Ma,isPrimitiveType:()=>Iae,isReferenceType:()=>oN,isRegexToken:()=>AN,isReturnType:()=>lN,isRuleCall:()=>Ol,isSimpleType:()=>TT,isStringLiteral:()=>gBe,isTerminalAlternatives:()=>DN,isTerminalGroup:()=>RN,isTerminalRule:()=>qo,isTerminalRuleCall:()=>ET,isType:()=>Wv,isTypeAttribute:()=>yBe,isTypeDefinition:()=>lBe,isUnionType:()=>dN,isUnorderedGroup:()=>ST,isUntilToken:()=>PN,isValueLiteral:()=>cBe,isWildcard:()=>FN,reflection:()=>lr});function iBe(t){return lr.isInstance(t,Vv)}function aBe(t){return lr.isInstance(t,Uv)}function sBe(t){return lr.isInstance(t,yT)}function oBe(t){return Iae(t)||t==="current"||t==="entry"||t==="extends"||t==="false"||t==="fragment"||t==="grammar"||t==="hidden"||t==="import"||t==="interface"||t==="returns"||t==="terminal"||t==="true"||t==="type"||t==="infer"||t==="infers"||t==="with"||typeof t=="string"&&/\^?[_a-zA-Z][\w_]*/.test(t)}function Iae(t){return t==="string"||t==="number"||t==="boolean"||t==="Date"||t==="bigint"}function lBe(t){return lr.isInstance(t,zD)}function cBe(t){return lr.isInstance(t,vT)}function Hv(t){return lr.isInstance(t,GD)}function uBe(t){return lr.isInstance(t,$D)}function UD(t){return lr.isInstance(t,VD)}function WD(t){return lr.isInstance(t,HD)}function qD(t){return lr.isInstance(t,YD)}function jD(t){return lr.isInstance(t,XD)}function hBe(t){return lr.isInstance(t,KD)}function fBe(t){return lr.isInstance(t,Oae)}function bT(t){return lr.isInstance(t,QD)}function wT(t){return lr.isInstance(t,ZD)}function dBe(t){return lr.isInstance(t,Pae)}function eN(t){return lr.isInstance(t,JD)}function pBe(t){return lr.isInstance(t,tN)}function mBe(t){return lr.isInstance(t,rN)}function iN(t){return lr.isInstance(t,nN)}function Ma(t){return lr.isInstance(t,aN)}function oN(t){return lr.isInstance(t,sN)}function lN(t){return lr.isInstance(t,Bae)}function TT(t){return lr.isInstance(t,cN)}function gBe(t){return lr.isInstance(t,uN)}function qo(t){return lr.isInstance(t,xT)}function Wv(t){return lr.isInstance(t,hN)}function yBe(t){return lr.isInstance(t,Fae)}function dN(t){return lr.isInstance(t,fN)}function Ru(t){return lr.isInstance(t,pN)}function kT(t){return lr.isInstance(t,mN)}function Il(t){return lr.isInstance(t,gN)}function vN(t){return lr.isInstance(t,yN)}function Yd(t){return lr.isInstance(t,xN)}function wN(t){return lr.isInstance(t,bN)}function tf(t){return lr.isInstance(t,TN)}function Xo(t){return lr.isInstance(t,kN)}function SN(t){return lr.isInstance(t,EN)}function AN(t){return lr.isInstance(t,CN)}function Ol(t){return lr.isInstance(t,_N)}function DN(t){return lr.isInstance(t,LN)}function RN(t){return lr.isInstance(t,NN)}function ET(t){return lr.isInstance(t,MN)}function ST(t){return lr.isInstance(t,IN)}function PN(t){return lr.isInstance(t,ON)}function FN(t){return lr.isInstance(t,BN)}var nBe,Vv,Uv,yT,zD,vT,GD,$D,VD,HD,YD,XD,KD,Oae,QD,ZD,Pae,JD,tN,rN,nN,aN,sN,Bae,cN,uN,xT,hN,Fae,fN,pN,mN,gN,yN,xN,bN,TN,kN,EN,CN,_N,LN,NN,MN,IN,ON,BN,Vm,lr,Ac=M(()=>{"use strict";Yo();nBe={ID:/\^?[_a-zA-Z][\w_]*/,STRING:/"(\\.|[^"\\])*"|'(\\.|[^'\\])*'/,NUMBER:/NaN|-?((\d*\.\d+|\d+)([Ee][+-]?\d+)?|Infinity)/,RegexLiteral:/\/(?![*+?])(?:[^\r\n\[/\\]|\\.|\[(?:[^\r\n\]\\]|\\.)*\])+\/[a-z]*/,WS:/\s+/,ML_COMMENT:/\/\*[\s\S]*?\*\//,SL_COMMENT:/\/\/[^\n\r]*/},Vv="AbstractRule";o(iBe,"isAbstractRule");Uv="AbstractType";o(aBe,"isAbstractType");yT="Condition";o(sBe,"isCondition");o(oBe,"isFeatureName");o(Iae,"isPrimitiveType");zD="TypeDefinition";o(lBe,"isTypeDefinition");vT="ValueLiteral";o(cBe,"isValueLiteral");GD="AbstractElement";o(Hv,"isAbstractElement");$D="ArrayLiteral";o(uBe,"isArrayLiteral");VD="ArrayType";o(UD,"isArrayType");HD="BooleanLiteral";o(WD,"isBooleanLiteral");YD="Conjunction";o(qD,"isConjunction");XD="Disjunction";o(jD,"isDisjunction");KD="Grammar";o(hBe,"isGrammar");Oae="GrammarImport";o(fBe,"isGrammarImport");QD="InferredType";o(bT,"isInferredType");ZD="Interface";o(wT,"isInterface");Pae="NamedArgument";o(dBe,"isNamedArgument");JD="Negation";o(eN,"isNegation");tN="NumberLiteral";o(pBe,"isNumberLiteral");rN="Parameter";o(mBe,"isParameter");nN="ParameterReference";o(iN,"isParameterReference");aN="ParserRule";o(Ma,"isParserRule");sN="ReferenceType";o(oN,"isReferenceType");Bae="ReturnType";o(lN,"isReturnType");cN="SimpleType";o(TT,"isSimpleType");uN="StringLiteral";o(gBe,"isStringLiteral");xT="TerminalRule";o(qo,"isTerminalRule");hN="Type";o(Wv,"isType");Fae="TypeAttribute";o(yBe,"isTypeAttribute");fN="UnionType";o(dN,"isUnionType");pN="Action";o(Ru,"isAction");mN="Alternatives";o(kT,"isAlternatives");gN="Assignment";o(Il,"isAssignment");yN="CharacterRange";o(vN,"isCharacterRange");xN="CrossReference";o(Yd,"isCrossReference");bN="EndOfFile";o(wN,"isEndOfFile");TN="Group";o(tf,"isGroup");kN="Keyword";o(Xo,"isKeyword");EN="NegatedToken";o(SN,"isNegatedToken");CN="RegexToken";o(AN,"isRegexToken");_N="RuleCall";o(Ol,"isRuleCall");LN="TerminalAlternatives";o(DN,"isTerminalAlternatives");NN="TerminalGroup";o(RN,"isTerminalGroup");MN="TerminalRuleCall";o(ET,"isTerminalRuleCall");IN="UnorderedGroup";o(ST,"isUnorderedGroup");ON="UntilToken";o(PN,"isUntilToken");BN="Wildcard";o(FN,"isWildcard");Vm=class extends $d{static{o(this,"LangiumGrammarAstReflection")}getAllTypes(){return["AbstractElement","AbstractRule","AbstractType","Action","Alternatives","ArrayLiteral","ArrayType","Assignment","BooleanLiteral","CharacterRange","Condition","Conjunction","CrossReference","Disjunction","EndOfFile","Grammar","GrammarImport","Group","InferredType","Interface","Keyword","NamedArgument","NegatedToken","Negation","NumberLiteral","Parameter","ParameterReference","ParserRule","ReferenceType","RegexToken","ReturnType","RuleCall","SimpleType","StringLiteral","TerminalAlternatives","TerminalGroup","TerminalRule","TerminalRuleCall","Type","TypeAttribute","TypeDefinition","UnionType","UnorderedGroup","UntilToken","ValueLiteral","Wildcard"]}computeIsSubtype(e,r){switch(e){case pN:case mN:case gN:case yN:case xN:case bN:case TN:case kN:case EN:case CN:case _N:case LN:case NN:case MN:case IN:case ON:case BN:return this.isSubtype(GD,r);case $D:case tN:case uN:return this.isSubtype(vT,r);case VD:case sN:case cN:case fN:return this.isSubtype(zD,r);case HD:return this.isSubtype(yT,r)||this.isSubtype(vT,r);case YD:case XD:case JD:case nN:return this.isSubtype(yT,r);case QD:case ZD:case hN:return this.isSubtype(Uv,r);case aN:return this.isSubtype(Vv,r)||this.isSubtype(Uv,r);case xT:return this.isSubtype(Vv,r);default:return!1}}getReferenceType(e){let r=`${e.container.$type}:${e.property}`;switch(r){case"Action:type":case"CrossReference:type":case"Interface:superTypes":case"ParserRule:returnType":case"SimpleType:typeRef":return Uv;case"Grammar:hiddenTokens":case"ParserRule:hiddenTokens":case"RuleCall:rule":return Vv;case"Grammar:usedGrammars":return KD;case"NamedArgument:parameter":case"ParameterReference:parameter":return rN;case"TerminalRuleCall:rule":return xT;default:throw new Error(`${r} is not a valid reference id.`)}}getTypeMetaData(e){switch(e){case"AbstractElement":return{name:"AbstractElement",properties:[{name:"cardinality"},{name:"lookahead"}]};case"ArrayLiteral":return{name:"ArrayLiteral",properties:[{name:"elements",defaultValue:[]}]};case"ArrayType":return{name:"ArrayType",properties:[{name:"elementType"}]};case"BooleanLiteral":return{name:"BooleanLiteral",properties:[{name:"true",defaultValue:!1}]};case"Conjunction":return{name:"Conjunction",properties:[{name:"left"},{name:"right"}]};case"Disjunction":return{name:"Disjunction",properties:[{name:"left"},{name:"right"}]};case"Grammar":return{name:"Grammar",properties:[{name:"definesHiddenTokens",defaultValue:!1},{name:"hiddenTokens",defaultValue:[]},{name:"imports",defaultValue:[]},{name:"interfaces",defaultValue:[]},{name:"isDeclared",defaultValue:!1},{name:"name"},{name:"rules",defaultValue:[]},{name:"types",defaultValue:[]},{name:"usedGrammars",defaultValue:[]}]};case"GrammarImport":return{name:"GrammarImport",properties:[{name:"path"}]};case"InferredType":return{name:"InferredType",properties:[{name:"name"}]};case"Interface":return{name:"Interface",properties:[{name:"attributes",defaultValue:[]},{name:"name"},{name:"superTypes",defaultValue:[]}]};case"NamedArgument":return{name:"NamedArgument",properties:[{name:"calledByName",defaultValue:!1},{name:"parameter"},{name:"value"}]};case"Negation":return{name:"Negation",properties:[{name:"value"}]};case"NumberLiteral":return{name:"NumberLiteral",properties:[{name:"value"}]};case"Parameter":return{name:"Parameter",properties:[{name:"name"}]};case"ParameterReference":return{name:"ParameterReference",properties:[{name:"parameter"}]};case"ParserRule":return{name:"ParserRule",properties:[{name:"dataType"},{name:"definesHiddenTokens",defaultValue:!1},{name:"definition"},{name:"entry",defaultValue:!1},{name:"fragment",defaultValue:!1},{name:"hiddenTokens",defaultValue:[]},{name:"inferredType"},{name:"name"},{name:"parameters",defaultValue:[]},{name:"returnType"},{name:"wildcard",defaultValue:!1}]};case"ReferenceType":return{name:"ReferenceType",properties:[{name:"referenceType"}]};case"ReturnType":return{name:"ReturnType",properties:[{name:"name"}]};case"SimpleType":return{name:"SimpleType",properties:[{name:"primitiveType"},{name:"stringType"},{name:"typeRef"}]};case"StringLiteral":return{name:"StringLiteral",properties:[{name:"value"}]};case"TerminalRule":return{name:"TerminalRule",properties:[{name:"definition"},{name:"fragment",defaultValue:!1},{name:"hidden",defaultValue:!1},{name:"name"},{name:"type"}]};case"Type":return{name:"Type",properties:[{name:"name"},{name:"type"}]};case"TypeAttribute":return{name:"TypeAttribute",properties:[{name:"defaultValue"},{name:"isOptional",defaultValue:!1},{name:"name"},{name:"type"}]};case"UnionType":return{name:"UnionType",properties:[{name:"types",defaultValue:[]}]};case"Action":return{name:"Action",properties:[{name:"cardinality"},{name:"feature"},{name:"inferredType"},{name:"lookahead"},{name:"operator"},{name:"type"}]};case"Alternatives":return{name:"Alternatives",properties:[{name:"cardinality"},{name:"elements",defaultValue:[]},{name:"lookahead"}]};case"Assignment":return{name:"Assignment",properties:[{name:"cardinality"},{name:"feature"},{name:"lookahead"},{name:"operator"},{name:"terminal"}]};case"CharacterRange":return{name:"CharacterRange",properties:[{name:"cardinality"},{name:"left"},{name:"lookahead"},{name:"right"}]};case"CrossReference":return{name:"CrossReference",properties:[{name:"cardinality"},{name:"deprecatedSyntax",defaultValue:!1},{name:"lookahead"},{name:"terminal"},{name:"type"}]};case"EndOfFile":return{name:"EndOfFile",properties:[{name:"cardinality"},{name:"lookahead"}]};case"Group":return{name:"Group",properties:[{name:"cardinality"},{name:"elements",defaultValue:[]},{name:"guardCondition"},{name:"lookahead"}]};case"Keyword":return{name:"Keyword",properties:[{name:"cardinality"},{name:"lookahead"},{name:"value"}]};case"NegatedToken":return{name:"NegatedToken",properties:[{name:"cardinality"},{name:"lookahead"},{name:"terminal"}]};case"RegexToken":return{name:"RegexToken",properties:[{name:"cardinality"},{name:"lookahead"},{name:"regex"}]};case"RuleCall":return{name:"RuleCall",properties:[{name:"arguments",defaultValue:[]},{name:"cardinality"},{name:"lookahead"},{name:"rule"}]};case"TerminalAlternatives":return{name:"TerminalAlternatives",properties:[{name:"cardinality"},{name:"elements",defaultValue:[]},{name:"lookahead"}]};case"TerminalGroup":return{name:"TerminalGroup",properties:[{name:"cardinality"},{name:"elements",defaultValue:[]},{name:"lookahead"}]};case"TerminalRuleCall":return{name:"TerminalRuleCall",properties:[{name:"cardinality"},{name:"lookahead"},{name:"rule"}]};case"UnorderedGroup":return{name:"UnorderedGroup",properties:[{name:"cardinality"},{name:"elements",defaultValue:[]},{name:"lookahead"}]};case"UntilToken":return{name:"UntilToken",properties:[{name:"cardinality"},{name:"lookahead"},{name:"terminal"}]};case"Wildcard":return{name:"Wildcard",properties:[{name:"cardinality"},{name:"lookahead"}]};default:return{name:e,properties:[]}}}},lr=new Vm});var AT={};vr(AT,{assignMandatoryProperties:()=>$N,copyAstNode:()=>GN,findLocalReferences:()=>xBe,findRootNode:()=>zae,getContainerOfType:()=>qd,getDocument:()=>Fi,hasContainerOfType:()=>vBe,linkContentToContainer:()=>CT,streamAllContents:()=>_c,streamAst:()=>jo,streamContents:()=>qv,streamReferences:()=>Um});function CT(t){for(let[e,r]of Object.entries(t))e.startsWith("$")||(Array.isArray(r)?r.forEach((n,i)=>{ei(n)&&(n.$container=t,n.$containerProperty=e,n.$containerIndex=i)}):ei(r)&&(r.$container=t,r.$containerProperty=e))}function qd(t,e){let r=t;for(;r;){if(e(r))return r;r=r.$container}}function vBe(t,e){let r=t;for(;r;){if(e(r))return!0;r=r.$container}return!1}function Fi(t){let r=zae(t).$document;if(!r)throw new Error("AST node has no document.");return r}function zae(t){for(;t.$container;)t=t.$container;return t}function qv(t,e){if(!t)throw new Error("Node must be an AstNode.");let r=e?.range;return new ao(()=>({keys:Object.keys(t),keyIndex:0,arrayIndex:0}),n=>{for(;n.keyIndex<n.keys.length;){let i=n.keys[n.keyIndex];if(!i.startsWith("$")){let a=t[i];if(ei(a)){if(n.keyIndex++,zN(a,r))return{done:!1,value:a}}else if(Array.isArray(a)){for(;n.arrayIndex<a.length;){let s=n.arrayIndex++,l=a[s];if(ei(l)&&zN(l,r))return{done:!1,value:l}}n.arrayIndex=0}}n.keyIndex++}return Ja})}function _c(t,e){if(!t)throw new Error("Root node must be an AstNode.");return new Cc(t,r=>qv(r,e))}function jo(t,e){if(t){if(e?.range&&!zN(t,e.range))return new Cc(t,()=>[])}else throw new Error("Root node must be an AstNode.");return new Cc(t,r=>qv(r,e),{includeRoot:!0})}function zN(t,e){var r;if(!e)return!0;let n=(r=t.$cstNode)===null||r===void 0?void 0:r.range;return n?PD(n,e):!1}function Um(t){return new ao(()=>({keys:Object.keys(t),keyIndex:0,arrayIndex:0}),e=>{for(;e.keyIndex<e.keys.length;){let r=e.keys[e.keyIndex];if(!r.startsWith("$")){let n=t[r];if(ma(n))return e.keyIndex++,{done:!1,value:{reference:n,container:t,property:r}};if(Array.isArray(n)){for(;e.arrayIndex<n.length;){let i=e.arrayIndex++,a=n[i];if(ma(a))return{done:!1,value:{reference:a,container:t,property:r,index:i}}}e.arrayIndex=0}}e.keyIndex++}return Ja})}function xBe(t,e=Fi(t).parseResult.value){let r=[];return jo(e).forEach(n=>{Um(n).forEach(i=>{i.reference.ref===t&&r.push(i.reference)})}),tn(r)}function $N(t,e){let r=t.getTypeMetaData(e.$type),n=e;for(let i of r.properties)i.defaultValue!==void 0&&n[i.name]===void 0&&(n[i.name]=Gae(i.defaultValue))}function Gae(t){return Array.isArray(t)?[...t.map(Gae)]:t}function GN(t,e){let r={$type:t.$type};for(let[n,i]of Object.entries(t))if(!n.startsWith("$"))if(ei(i))r[n]=GN(i,e);else if(ma(i))r[n]=e(r,n,i.$refNode,i.$refText);else if(Array.isArray(i)){let a=[];for(let s of i)ei(s)?a.push(GN(s,e)):ma(s)?a.push(e(r,n,s.$refNode,s.$refText)):a.push(s);r[n]=a}else r[n]=i;return CT(r),r}var es=M(()=>{"use strict";Yo();Rs();Ml();o(CT,"linkContentToContainer");o(qd,"getContainerOfType");o(vBe,"hasContainerOfType");o(Fi,"getDocument");o(zae,"findRootNode");o(qv,"streamContents");o(_c,"streamAllContents");o(jo,"streamAst");o(zN,"isAstNodeInRange");o(Um,"streamReferences");o(xBe,"findLocalReferences");o($N,"assignMandatoryProperties");o(Gae,"copyDefaultValue");o(GN,"copyAstNode")});function ar(t){return t.charCodeAt(0)}function _T(t,e){Array.isArray(t)?t.forEach(function(r){e.push(r)}):e.push(t)}function Hm(t,e){if(t[e]===!0)throw"duplicate flag "+e;let r=t[e];t[e]=!0}function Xd(t){if(t===void 0)throw Error("Internal Error - Should never get here!");return!0}function Xv(){throw Error("Internal Error - Should never get here!")}function VN(t){return t.type==="Character"}var UN=M(()=>{"use strict";o(ar,"cc");o(_T,"insertToSet");o(Hm,"addFlag");o(Xd,"ASSERT_EXISTS");o(Xv,"ASSERT_NEVER_REACH_HERE");o(VN,"isCharacter")});var jv,Kv,HN,$ae=M(()=>{"use strict";UN();jv=[];for(let t=ar("0");t<=ar("9");t++)jv.push(t);Kv=[ar("_")].concat(jv);for(let t=ar("a");t<=ar("z");t++)Kv.push(t);for(let t=ar("A");t<=ar("Z");t++)Kv.push(t);HN=[ar(" "),ar("\f"),ar(` +`),ar("\r"),ar(" "),ar("\v"),ar(" "),ar("\xA0"),ar("\u1680"),ar("\u2000"),ar("\u2001"),ar("\u2002"),ar("\u2003"),ar("\u2004"),ar("\u2005"),ar("\u2006"),ar("\u2007"),ar("\u2008"),ar("\u2009"),ar("\u200A"),ar("\u2028"),ar("\u2029"),ar("\u202F"),ar("\u205F"),ar("\u3000"),ar("\uFEFF")]});var bBe,LT,wBe,jd,Vae=M(()=>{"use strict";UN();$ae();bBe=/[0-9a-fA-F]/,LT=/[0-9]/,wBe=/[1-9]/,jd=class{static{o(this,"RegExpParser")}constructor(){this.idx=0,this.input="",this.groupIdx=0}saveState(){return{idx:this.idx,input:this.input,groupIdx:this.groupIdx}}restoreState(e){this.idx=e.idx,this.input=e.input,this.groupIdx=e.groupIdx}pattern(e){this.idx=0,this.input=e,this.groupIdx=0,this.consumeChar("/");let r=this.disjunction();this.consumeChar("/");let n={type:"Flags",loc:{begin:this.idx,end:e.length},global:!1,ignoreCase:!1,multiLine:!1,unicode:!1,sticky:!1};for(;this.isRegExpFlag();)switch(this.popChar()){case"g":Hm(n,"global");break;case"i":Hm(n,"ignoreCase");break;case"m":Hm(n,"multiLine");break;case"u":Hm(n,"unicode");break;case"y":Hm(n,"sticky");break}if(this.idx!==this.input.length)throw Error("Redundant input: "+this.input.substring(this.idx));return{type:"Pattern",flags:n,value:r,loc:this.loc(0)}}disjunction(){let e=[],r=this.idx;for(e.push(this.alternative());this.peekChar()==="|";)this.consumeChar("|"),e.push(this.alternative());return{type:"Disjunction",value:e,loc:this.loc(r)}}alternative(){let e=[],r=this.idx;for(;this.isTerm();)e.push(this.term());return{type:"Alternative",value:e,loc:this.loc(r)}}term(){return this.isAssertion()?this.assertion():this.atom()}assertion(){let e=this.idx;switch(this.popChar()){case"^":return{type:"StartAnchor",loc:this.loc(e)};case"$":return{type:"EndAnchor",loc:this.loc(e)};case"\\":switch(this.popChar()){case"b":return{type:"WordBoundary",loc:this.loc(e)};case"B":return{type:"NonWordBoundary",loc:this.loc(e)}}throw Error("Invalid Assertion Escape");case"(":this.consumeChar("?");let r;switch(this.popChar()){case"=":r="Lookahead";break;case"!":r="NegativeLookahead";break}Xd(r);let n=this.disjunction();return this.consumeChar(")"),{type:r,value:n,loc:this.loc(e)}}return Xv()}quantifier(e=!1){let r,n=this.idx;switch(this.popChar()){case"*":r={atLeast:0,atMost:1/0};break;case"+":r={atLeast:1,atMost:1/0};break;case"?":r={atLeast:0,atMost:1};break;case"{":let i=this.integerIncludingZero();switch(this.popChar()){case"}":r={atLeast:i,atMost:i};break;case",":let a;this.isDigit()?(a=this.integerIncludingZero(),r={atLeast:i,atMost:a}):r={atLeast:i,atMost:1/0},this.consumeChar("}");break}if(e===!0&&r===void 0)return;Xd(r);break}if(!(e===!0&&r===void 0)&&Xd(r))return this.peekChar(0)==="?"?(this.consumeChar("?"),r.greedy=!1):r.greedy=!0,r.type="Quantifier",r.loc=this.loc(n),r}atom(){let e,r=this.idx;switch(this.peekChar()){case".":e=this.dotAll();break;case"\\":e=this.atomEscape();break;case"[":e=this.characterClass();break;case"(":e=this.group();break}return e===void 0&&this.isPatternCharacter()&&(e=this.patternCharacter()),Xd(e)?(e.loc=this.loc(r),this.isQuantifier()&&(e.quantifier=this.quantifier()),e):Xv()}dotAll(){return this.consumeChar("."),{type:"Set",complement:!0,value:[ar(` +`),ar("\r"),ar("\u2028"),ar("\u2029")]}}atomEscape(){switch(this.consumeChar("\\"),this.peekChar()){case"1":case"2":case"3":case"4":case"5":case"6":case"7":case"8":case"9":return this.decimalEscapeAtom();case"d":case"D":case"s":case"S":case"w":case"W":return this.characterClassEscape();case"f":case"n":case"r":case"t":case"v":return this.controlEscapeAtom();case"c":return this.controlLetterEscapeAtom();case"0":return this.nulCharacterAtom();case"x":return this.hexEscapeSequenceAtom();case"u":return this.regExpUnicodeEscapeSequenceAtom();default:return this.identityEscapeAtom()}}decimalEscapeAtom(){return{type:"GroupBackReference",value:this.positiveInteger()}}characterClassEscape(){let e,r=!1;switch(this.popChar()){case"d":e=jv;break;case"D":e=jv,r=!0;break;case"s":e=HN;break;case"S":e=HN,r=!0;break;case"w":e=Kv;break;case"W":e=Kv,r=!0;break}return Xd(e)?{type:"Set",value:e,complement:r}:Xv()}controlEscapeAtom(){let e;switch(this.popChar()){case"f":e=ar("\f");break;case"n":e=ar(` +`);break;case"r":e=ar("\r");break;case"t":e=ar(" ");break;case"v":e=ar("\v");break}return Xd(e)?{type:"Character",value:e}:Xv()}controlLetterEscapeAtom(){this.consumeChar("c");let e=this.popChar();if(/[a-zA-Z]/.test(e)===!1)throw Error("Invalid ");return{type:"Character",value:e.toUpperCase().charCodeAt(0)-64}}nulCharacterAtom(){return this.consumeChar("0"),{type:"Character",value:ar("\0")}}hexEscapeSequenceAtom(){return this.consumeChar("x"),this.parseHexDigits(2)}regExpUnicodeEscapeSequenceAtom(){return this.consumeChar("u"),this.parseHexDigits(4)}identityEscapeAtom(){let e=this.popChar();return{type:"Character",value:ar(e)}}classPatternCharacterAtom(){switch(this.peekChar()){case` +`:case"\r":case"\u2028":case"\u2029":case"\\":case"]":throw Error("TBD");default:let e=this.popChar();return{type:"Character",value:ar(e)}}}characterClass(){let e=[],r=!1;for(this.consumeChar("["),this.peekChar(0)==="^"&&(this.consumeChar("^"),r=!0);this.isClassAtom();){let n=this.classAtom(),i=n.type==="Character";if(VN(n)&&this.isRangeDash()){this.consumeChar("-");let a=this.classAtom(),s=a.type==="Character";if(VN(a)){if(a.value<n.value)throw Error("Range out of order in character class");e.push({from:n.value,to:a.value})}else _T(n.value,e),e.push(ar("-")),_T(a.value,e)}else _T(n.value,e)}return this.consumeChar("]"),{type:"Set",complement:r,value:e}}classAtom(){switch(this.peekChar()){case"]":case` +`:case"\r":case"\u2028":case"\u2029":throw Error("TBD");case"\\":return this.classEscape();default:return this.classPatternCharacterAtom()}}classEscape(){switch(this.consumeChar("\\"),this.peekChar()){case"b":return this.consumeChar("b"),{type:"Character",value:ar("\b")};case"d":case"D":case"s":case"S":case"w":case"W":return this.characterClassEscape();case"f":case"n":case"r":case"t":case"v":return this.controlEscapeAtom();case"c":return this.controlLetterEscapeAtom();case"0":return this.nulCharacterAtom();case"x":return this.hexEscapeSequenceAtom();case"u":return this.regExpUnicodeEscapeSequenceAtom();default:return this.identityEscapeAtom()}}group(){let e=!0;switch(this.consumeChar("("),this.peekChar(0)){case"?":this.consumeChar("?"),this.consumeChar(":"),e=!1;break;default:this.groupIdx++;break}let r=this.disjunction();this.consumeChar(")");let n={type:"Group",capturing:e,value:r};return e&&(n.idx=this.groupIdx),n}positiveInteger(){let e=this.popChar();if(wBe.test(e)===!1)throw Error("Expecting a positive integer");for(;LT.test(this.peekChar(0));)e+=this.popChar();return parseInt(e,10)}integerIncludingZero(){let e=this.popChar();if(LT.test(e)===!1)throw Error("Expecting an integer");for(;LT.test(this.peekChar(0));)e+=this.popChar();return parseInt(e,10)}patternCharacter(){let e=this.popChar();switch(e){case` +`:case"\r":case"\u2028":case"\u2029":case"^":case"$":case"\\":case".":case"*":case"+":case"?":case"(":case")":case"[":case"|":throw Error("TBD");default:return{type:"Character",value:ar(e)}}}isRegExpFlag(){switch(this.peekChar(0)){case"g":case"i":case"m":case"u":case"y":return!0;default:return!1}}isRangeDash(){return this.peekChar()==="-"&&this.isClassAtom(1)}isDigit(){return LT.test(this.peekChar(0))}isClassAtom(e=0){switch(this.peekChar(e)){case"]":case` +`:case"\r":case"\u2028":case"\u2029":return!1;default:return!0}}isTerm(){return this.isAtom()||this.isAssertion()}isAtom(){if(this.isPatternCharacter())return!0;switch(this.peekChar(0)){case".":case"\\":case"[":case"(":return!0;default:return!1}}isAssertion(){switch(this.peekChar(0)){case"^":case"$":return!0;case"\\":switch(this.peekChar(1)){case"b":case"B":return!0;default:return!1}case"(":return this.peekChar(1)==="?"&&(this.peekChar(2)==="="||this.peekChar(2)==="!");default:return!1}}isQuantifier(){let e=this.saveState();try{return this.quantifier(!0)!==void 0}catch{return!1}finally{this.restoreState(e)}}isPatternCharacter(){switch(this.peekChar()){case"^":case"$":case"\\":case".":case"*":case"+":case"?":case"(":case")":case"[":case"|":case"/":case` +`:case"\r":case"\u2028":case"\u2029":return!1;default:return!0}}parseHexDigits(e){let r="";for(let i=0;i<e;i++){let a=this.popChar();if(bBe.test(a)===!1)throw Error("Expecting a HexDecimal digits");r+=a}return{type:"Character",value:parseInt(r,16)}}peekChar(e=0){return this.input[this.idx+e]}popChar(){let e=this.peekChar(0);return this.consumeChar(void 0),e}consumeChar(e){if(e!==void 0&&this.input[this.idx]!==e)throw Error("Expected: '"+e+"' but found: '"+this.input[this.idx]+"' at offset: "+this.idx);if(this.idx>=this.input.length)throw Error("Unexpected end of input");this.idx++}loc(e){return{begin:e,end:this.idx}}}});var Lc,Uae=M(()=>{"use strict";Lc=class{static{o(this,"BaseRegExpVisitor")}visitChildren(e){for(let r in e){let n=e[r];e.hasOwnProperty(r)&&(n.type!==void 0?this.visit(n):Array.isArray(n)&&n.forEach(i=>{this.visit(i)},this))}}visit(e){switch(e.type){case"Pattern":this.visitPattern(e);break;case"Flags":this.visitFlags(e);break;case"Disjunction":this.visitDisjunction(e);break;case"Alternative":this.visitAlternative(e);break;case"StartAnchor":this.visitStartAnchor(e);break;case"EndAnchor":this.visitEndAnchor(e);break;case"WordBoundary":this.visitWordBoundary(e);break;case"NonWordBoundary":this.visitNonWordBoundary(e);break;case"Lookahead":this.visitLookahead(e);break;case"NegativeLookahead":this.visitNegativeLookahead(e);break;case"Character":this.visitCharacter(e);break;case"Set":this.visitSet(e);break;case"Group":this.visitGroup(e);break;case"GroupBackReference":this.visitGroupBackReference(e);break;case"Quantifier":this.visitQuantifier(e);break}this.visitChildren(e)}visitPattern(e){}visitFlags(e){}visitDisjunction(e){}visitAlternative(e){}visitStartAnchor(e){}visitEndAnchor(e){}visitWordBoundary(e){}visitNonWordBoundary(e){}visitLookahead(e){}visitNegativeLookahead(e){}visitCharacter(e){}visitSet(e){}visitGroup(e){}visitGroupBackReference(e){}visitQuantifier(e){}}});var Qv=M(()=>{"use strict";Vae();Uae()});var NT={};vr(NT,{NEWLINE_REGEXP:()=>YN,escapeRegExp:()=>Qd,getCaseInsensitivePattern:()=>XN,getTerminalParts:()=>TBe,isMultilineComment:()=>qN,isWhitespace:()=>DT,partialMatches:()=>jN,partialRegExp:()=>Wae});function TBe(t){try{typeof t!="string"&&(t=t.source),t=`/${t}/`;let e=Hae.pattern(t),r=[];for(let n of e.value.value)Kd.reset(t),Kd.visit(n),r.push({start:Kd.startRegexp,end:Kd.endRegex});return r}catch{return[]}}function qN(t){try{return typeof t=="string"&&(t=new RegExp(t)),t=t.toString(),Kd.reset(t),Kd.visit(Hae.pattern(t)),Kd.multiline}catch{return!1}}function DT(t){return(typeof t=="string"?new RegExp(t):t).test(" ")}function Qd(t){return t.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}function XN(t){return Array.prototype.map.call(t,e=>/\w/.test(e)?`[${e.toLowerCase()}${e.toUpperCase()}]`:Qd(e)).join("")}function jN(t,e){let r=Wae(t),n=e.match(r);return!!n&&n[0].length>0}function Wae(t){typeof t=="string"&&(t=new RegExp(t));let e=t,r=t.source,n=0;function i(){let a="",s;function l(h){a+=r.substr(n,h),n+=h}o(l,"appendRaw");function u(h){a+="(?:"+r.substr(n,h)+"|$)",n+=h}for(o(u,"appendOptional");n<r.length;)switch(r[n]){case"\\":switch(r[n+1]){case"c":u(3);break;case"x":u(4);break;case"u":e.unicode?r[n+2]==="{"?u(r.indexOf("}",n)-n+1):u(6):u(2);break;case"p":case"P":e.unicode?u(r.indexOf("}",n)-n+1):u(2);break;case"k":u(r.indexOf(">",n)-n+1);break;default:u(2);break}break;case"[":s=/\[(?:\\.|.)*?\]/g,s.lastIndex=n,s=s.exec(r)||[],u(s[0].length);break;case"|":case"^":case"$":case"*":case"+":case"?":l(1);break;case"{":s=/\{\d+,?\d*\}/g,s.lastIndex=n,s=s.exec(r),s?l(s[0].length):u(1);break;case"(":if(r[n+1]==="?")switch(r[n+2]){case":":a+="(?:",n+=3,a+=i()+"|$)";break;case"=":a+="(?=",n+=3,a+=i()+")";break;case"!":s=n,n+=3,i(),a+=r.substr(s,n-s);break;case"<":switch(r[n+3]){case"=":case"!":s=n,n+=4,i(),a+=r.substr(s,n-s);break;default:l(r.indexOf(">",n)-n+1),a+=i()+"|$)";break}break}else l(1),a+=i()+"|$)";break;case")":return++n,a;default:u(1);break}return a}return o(i,"process"),new RegExp(i(),t.flags)}var YN,Hae,WN,Kd,Wm=M(()=>{"use strict";Qv();YN=/\r?\n/gm,Hae=new jd,WN=class extends Lc{static{o(this,"TerminalRegExpVisitor")}constructor(){super(...arguments),this.isStarting=!0,this.endRegexpStack=[],this.multiline=!1}get endRegex(){return this.endRegexpStack.join("")}reset(e){this.multiline=!1,this.regex=e,this.startRegexp="",this.isStarting=!0,this.endRegexpStack=[]}visitGroup(e){e.quantifier&&(this.isStarting=!1,this.endRegexpStack=[])}visitCharacter(e){let r=String.fromCharCode(e.value);if(!this.multiline&&r===` +`&&(this.multiline=!0),e.quantifier)this.isStarting=!1,this.endRegexpStack=[];else{let n=Qd(r);this.endRegexpStack.push(n),this.isStarting&&(this.startRegexp+=n)}}visitSet(e){if(!this.multiline){let r=this.regex.substring(e.loc.begin,e.loc.end),n=new RegExp(r);this.multiline=!!` +`.match(n)}if(e.quantifier)this.isStarting=!1,this.endRegexpStack=[];else{let r=this.regex.substring(e.loc.begin,e.loc.end);this.endRegexpStack.push(r),this.isStarting&&(this.startRegexp+=r)}}visitChildren(e){e.type==="Group"&&e.quantifier||super.visitChildren(e)}},Kd=new WN;o(TBe,"getTerminalParts");o(qN,"isMultilineComment");o(DT,"isWhitespace");o(Qd,"escapeRegExp");o(XN,"getCaseInsensitivePattern");o(jN,"partialMatches");o(Wae,"partialRegExp")});var MT={};vr(MT,{findAssignment:()=>iR,findNameAssignment:()=>RT,findNodeForKeyword:()=>rR,findNodeForProperty:()=>Jv,findNodesForKeyword:()=>kBe,findNodesForKeywordInternal:()=>nR,findNodesForProperty:()=>eR,getActionAtElement:()=>Kae,getActionType:()=>Zae,getAllReachableRules:()=>Zv,getCrossReferenceTerminal:()=>ZN,getEntryRule:()=>Yae,getExplicitRuleType:()=>aR,getHiddenRules:()=>qae,getRuleType:()=>sR,getTypeName:()=>Zd,isArrayCardinality:()=>SBe,isArrayOperator:()=>CBe,isCommentTerminal:()=>JN,isDataType:()=>ABe,isDataTypeRule:()=>e2,isOptionalCardinality:()=>EBe,terminalRegex:()=>Ym});function Yae(t){return t.rules.find(e=>Ma(e)&&e.entry)}function qae(t){return t.rules.filter(e=>qo(e)&&e.hidden)}function Zv(t,e){let r=new Set,n=Yae(t);if(!n)return new Set(t.rules);let i=[n].concat(qae(t));for(let s of i)Xae(s,r,e);let a=new Set;for(let s of t.rules)(r.has(s.name)||qo(s)&&s.hidden)&&a.add(s);return a}function Xae(t,e,r){e.add(t.name),_c(t).forEach(n=>{if(Ol(n)||r&&ET(n)){let i=n.rule.ref;i&&!e.has(i.name)&&Xae(i,e,r)}})}function ZN(t){if(t.terminal)return t.terminal;if(t.type.ref){let e=RT(t.type.ref);return e?.terminal}}function JN(t){return t.hidden&&!Ym(t).test(" ")}function eR(t,e){return!t||!e?[]:tR(t,e,t.astNode,!0)}function Jv(t,e,r){if(!t||!e)return;let n=tR(t,e,t.astNode,!0);if(n.length!==0)return r!==void 0?r=Math.max(0,Math.min(r,n.length-1)):r=0,n[r]}function tR(t,e,r,n){if(!n){let i=qd(t.grammarSource,Il);if(i&&i.feature===e)return[t]}return io(t)&&t.astNode===r?t.content.flatMap(i=>tR(i,e,r,!1)):[]}function kBe(t,e){return t?nR(t,e,t?.astNode):[]}function rR(t,e,r){if(!t)return;let n=nR(t,e,t?.astNode);if(n.length!==0)return r!==void 0?r=Math.max(0,Math.min(r,n.length-1)):r=0,n[r]}function nR(t,e,r){if(t.astNode!==r)return[];if(Xo(t.grammarSource)&&t.grammarSource.value===e)return[t];let n=Ud(t).iterator(),i,a=[];do if(i=n.next(),!i.done){let s=i.value;s.astNode===r?Xo(s.grammarSource)&&s.grammarSource.value===e&&a.push(s):n.prune()}while(!i.done);return a}function iR(t){var e;let r=t.astNode;for(;r===((e=t.container)===null||e===void 0?void 0:e.astNode);){let n=qd(t.grammarSource,Il);if(n)return n;t=t.container}}function RT(t){let e=t;return bT(e)&&(Ru(e.$container)?e=e.$container.$container:Ma(e.$container)?e=e.$container:ef(e.$container)),jae(t,e,new Map)}function jae(t,e,r){var n;function i(a,s){let l;return qd(a,Il)||(l=jae(s,s,r)),r.set(t,l),l}if(o(i,"go"),r.has(t))return r.get(t);r.set(t,void 0);for(let a of _c(e)){if(Il(a)&&a.feature.toLowerCase()==="name")return r.set(t,a),a;if(Ol(a)&&Ma(a.rule.ref))return i(a,a.rule.ref);if(TT(a)&&(!((n=a.typeRef)===null||n===void 0)&&n.ref))return i(a,a.typeRef.ref)}}function Kae(t){let e=t.$container;if(tf(e)){let r=e.elements,n=r.indexOf(t);for(let i=n-1;i>=0;i--){let a=r[i];if(Ru(a))return a;{let s=_c(r[i]).find(Ru);if(s)return s}}}if(Hv(e))return Kae(e)}function EBe(t,e){return t==="?"||t==="*"||tf(e)&&!!e.guardCondition}function SBe(t){return t==="*"||t==="+"}function CBe(t){return t==="+="}function e2(t){return Qae(t,new Set)}function Qae(t,e){if(e.has(t))return!0;e.add(t);for(let r of _c(t))if(Ol(r)){if(!r.rule.ref||Ma(r.rule.ref)&&!Qae(r.rule.ref,e))return!1}else{if(Il(r))return!1;if(Ru(r))return!1}return!!t.definition}function ABe(t){return QN(t.type,new Set)}function QN(t,e){if(e.has(t))return!0;if(e.add(t),UD(t))return!1;if(oN(t))return!1;if(dN(t))return t.types.every(r=>QN(r,e));if(TT(t)){if(t.primitiveType!==void 0)return!0;if(t.stringType!==void 0)return!0;if(t.typeRef!==void 0){let r=t.typeRef.ref;return Wv(r)?QN(r.type,e):!1}else return!1}else return!1}function aR(t){if(t.inferredType)return t.inferredType.name;if(t.dataType)return t.dataType;if(t.returnType){let e=t.returnType.ref;if(e){if(Ma(e))return e.name;if(wT(e)||Wv(e))return e.name}}}function Zd(t){var e;if(Ma(t))return e2(t)?t.name:(e=aR(t))!==null&&e!==void 0?e:t.name;if(wT(t)||Wv(t)||lN(t))return t.name;if(Ru(t)){let r=Zae(t);if(r)return r}else if(bT(t))return t.name;throw new Error("Cannot get name of Unknown Type")}function Zae(t){var e;if(t.inferredType)return t.inferredType.name;if(!((e=t.type)===null||e===void 0)&&e.ref)return Zd(t.type.ref)}function sR(t){var e,r,n;return qo(t)?(r=(e=t.type)===null||e===void 0?void 0:e.name)!==null&&r!==void 0?r:"string":e2(t)?t.name:(n=aR(t))!==null&&n!==void 0?n:t.name}function Ym(t){let e={s:!1,i:!1,u:!1},r=qm(t.definition,e),n=Object.entries(e).filter(([,i])=>i).map(([i])=>i).join("");return new RegExp(r,n)}function qm(t,e){if(DN(t))return _Be(t);if(RN(t))return LBe(t);if(vN(t))return RBe(t);if(ET(t)){let r=t.rule.ref;if(!r)throw new Error("Missing rule reference.");return Mu(qm(r.definition),{cardinality:t.cardinality,lookahead:t.lookahead})}else{if(SN(t))return NBe(t);if(PN(t))return DBe(t);if(AN(t)){let r=t.regex.lastIndexOf("/"),n=t.regex.substring(1,r),i=t.regex.substring(r+1);return e&&(e.i=i.includes("i"),e.s=i.includes("s"),e.u=i.includes("u")),Mu(n,{cardinality:t.cardinality,lookahead:t.lookahead,wrap:!1})}else{if(FN(t))return Mu(oR,{cardinality:t.cardinality,lookahead:t.lookahead});throw new Error(`Invalid terminal element: ${t?.$type}`)}}}function _Be(t){return Mu(t.elements.map(e=>qm(e)).join("|"),{cardinality:t.cardinality,lookahead:t.lookahead})}function LBe(t){return Mu(t.elements.map(e=>qm(e)).join(""),{cardinality:t.cardinality,lookahead:t.lookahead})}function DBe(t){return Mu(`${oR}*?${qm(t.terminal)}`,{cardinality:t.cardinality,lookahead:t.lookahead})}function NBe(t){return Mu(`(?!${qm(t.terminal)})${oR}*?`,{cardinality:t.cardinality,lookahead:t.lookahead})}function RBe(t){return t.right?Mu(`[${KN(t.left)}-${KN(t.right)}]`,{cardinality:t.cardinality,lookahead:t.lookahead,wrap:!1}):Mu(KN(t.left),{cardinality:t.cardinality,lookahead:t.lookahead,wrap:!1})}function KN(t){return Qd(t.value)}function Mu(t,e){var r;return(e.wrap!==!1||e.lookahead)&&(t=`(${(r=e.lookahead)!==null&&r!==void 0?r:""}${t})`),e.cardinality?`${t}${e.cardinality}`:t}var oR,Pl=M(()=>{"use strict";gT();Ac();Yo();es();Ml();Wm();o(Yae,"getEntryRule");o(qae,"getHiddenRules");o(Zv,"getAllReachableRules");o(Xae,"ruleDfs");o(ZN,"getCrossReferenceTerminal");o(JN,"isCommentTerminal");o(eR,"findNodesForProperty");o(Jv,"findNodeForProperty");o(tR,"findNodesForPropertyInternal");o(kBe,"findNodesForKeyword");o(rR,"findNodeForKeyword");o(nR,"findNodesForKeywordInternal");o(iR,"findAssignment");o(RT,"findNameAssignment");o(jae,"findNameAssignmentInternal");o(Kae,"getActionAtElement");o(EBe,"isOptionalCardinality");o(SBe,"isArrayCardinality");o(CBe,"isArrayOperator");o(e2,"isDataTypeRule");o(Qae,"isDataTypeRuleInternal");o(ABe,"isDataType");o(QN,"isDataTypeInternal");o(aR,"getExplicitRuleType");o(Zd,"getTypeName");o(Zae,"getActionType");o(sR,"getRuleType");o(Ym,"terminalRegex");oR=/[\s\S]/.source;o(qm,"abstractElementToRegex");o(_Be,"terminalAlternativesToRegex");o(LBe,"terminalGroupToRegex");o(DBe,"untilTokenToRegex");o(NBe,"negateTokenToRegex");o(RBe,"characterRangeToRegex");o(KN,"keywordToRegex");o(Mu,"withCardinality")});function lR(t){let e=[],r=t.Grammar;for(let n of r.rules)qo(n)&&JN(n)&&qN(Ym(n))&&e.push(n.name);return{multilineCommentRules:e,nameRegexp:pT}}var cR=M(()=>{"use strict";Ml();Pl();Wm();Ac();o(lR,"createGrammarConfig")});var uR=M(()=>{"use strict"});function Xm(t){console&&console.error&&console.error(`Error: ${t}`)}function t2(t){console&&console.warn&&console.warn(`Warning: ${t}`)}var Jae=M(()=>{"use strict";o(Xm,"PRINT_ERROR");o(t2,"PRINT_WARNING")});function r2(t){let e=new Date().getTime(),r=t();return{time:new Date().getTime()-e,value:r}}var ese=M(()=>{"use strict";o(r2,"timer")});function n2(t){function e(){}o(e,"FakeConstructor"),e.prototype=t;let r=new e;function n(){return typeof r.bar}return o(n,"fakeAccess"),n(),n(),t;(0,eval)(t)}var tse=M(()=>{"use strict";o(n2,"toFastProperties")});var jm=M(()=>{"use strict";Jae();ese();tse()});function MBe(t){return IBe(t)?t.LABEL:t.name}function IBe(t){return gi(t.LABEL)&&t.LABEL!==""}function IT(t){return Je(t,Km)}function Km(t){function e(r){return Je(r,Km)}if(o(e,"convertDefinition"),t instanceof nn){let r={type:"NonTerminal",name:t.nonTerminalName,idx:t.idx};return gi(t.label)&&(r.label=t.label),r}else{if(t instanceof Cn)return{type:"Alternative",definition:e(t.definition)};if(t instanceof an)return{type:"Option",idx:t.idx,definition:e(t.definition)};if(t instanceof An)return{type:"RepetitionMandatory",idx:t.idx,definition:e(t.definition)};if(t instanceof _n)return{type:"RepetitionMandatoryWithSeparator",idx:t.idx,separator:Km(new kr({terminalType:t.separator})),definition:e(t.definition)};if(t instanceof vn)return{type:"RepetitionWithSeparator",idx:t.idx,separator:Km(new kr({terminalType:t.separator})),definition:e(t.definition)};if(t instanceof Lr)return{type:"Repetition",idx:t.idx,definition:e(t.definition)};if(t instanceof xn)return{type:"Alternation",idx:t.idx,definition:e(t.definition)};if(t instanceof kr){let r={type:"Terminal",name:t.terminalType.name,label:MBe(t.terminalType),idx:t.idx};gi(t.label)&&(r.terminalLabel=t.label);let n=t.terminalType.PATTERN;return t.terminalType.PATTERN&&(r.pattern=Vo(n)?n.source:n),r}else{if(t instanceof ts)return{type:"Rule",name:t.name,orgText:t.orgText,definition:e(t.definition)};throw Error("non exhaustive match")}}}var so,nn,ts,Cn,an,An,_n,Lr,vn,xn,kr,OT=M(()=>{"use strict";Ht();o(MBe,"tokenLabel");o(IBe,"hasTokenLabel");so=class{static{o(this,"AbstractProduction")}get definition(){return this._definition}set definition(e){this._definition=e}constructor(e){this._definition=e}accept(e){e.visit(this),Ce(this.definition,r=>{r.accept(e)})}},nn=class extends so{static{o(this,"NonTerminal")}constructor(e){super([]),this.idx=1,ha(this,Ds(e,r=>r!==void 0))}set definition(e){}get definition(){return this.referencedRule!==void 0?this.referencedRule.definition:[]}accept(e){e.visit(this)}},ts=class extends so{static{o(this,"Rule")}constructor(e){super(e.definition),this.orgText="",ha(this,Ds(e,r=>r!==void 0))}},Cn=class extends so{static{o(this,"Alternative")}constructor(e){super(e.definition),this.ignoreAmbiguities=!1,ha(this,Ds(e,r=>r!==void 0))}},an=class extends so{static{o(this,"Option")}constructor(e){super(e.definition),this.idx=1,ha(this,Ds(e,r=>r!==void 0))}},An=class extends so{static{o(this,"RepetitionMandatory")}constructor(e){super(e.definition),this.idx=1,ha(this,Ds(e,r=>r!==void 0))}},_n=class extends so{static{o(this,"RepetitionMandatoryWithSeparator")}constructor(e){super(e.definition),this.idx=1,ha(this,Ds(e,r=>r!==void 0))}},Lr=class extends so{static{o(this,"Repetition")}constructor(e){super(e.definition),this.idx=1,ha(this,Ds(e,r=>r!==void 0))}},vn=class extends so{static{o(this,"RepetitionWithSeparator")}constructor(e){super(e.definition),this.idx=1,ha(this,Ds(e,r=>r!==void 0))}},xn=class extends so{static{o(this,"Alternation")}get definition(){return this._definition}set definition(e){this._definition=e}constructor(e){super(e.definition),this.idx=1,this.ignoreAmbiguities=!1,this.hasPredicates=!1,ha(this,Ds(e,r=>r!==void 0))}},kr=class{static{o(this,"Terminal")}constructor(e){this.idx=1,ha(this,Ds(e,r=>r!==void 0))}accept(e){e.visit(this)}};o(IT,"serializeGrammar");o(Km,"serializeProduction")});var rs,rse=M(()=>{"use strict";OT();rs=class{static{o(this,"GAstVisitor")}visit(e){let r=e;switch(r.constructor){case nn:return this.visitNonTerminal(r);case Cn:return this.visitAlternative(r);case an:return this.visitOption(r);case An:return this.visitRepetitionMandatory(r);case _n:return this.visitRepetitionMandatoryWithSeparator(r);case vn:return this.visitRepetitionWithSeparator(r);case Lr:return this.visitRepetition(r);case xn:return this.visitAlternation(r);case kr:return this.visitTerminal(r);case ts:return this.visitRule(r);default:throw Error("non exhaustive match")}}visitNonTerminal(e){}visitAlternative(e){}visitOption(e){}visitRepetition(e){}visitRepetitionMandatory(e){}visitRepetitionMandatoryWithSeparator(e){}visitRepetitionWithSeparator(e){}visitAlternation(e){}visitTerminal(e){}visitRule(e){}}});function hR(t){return t instanceof Cn||t instanceof an||t instanceof Lr||t instanceof An||t instanceof _n||t instanceof vn||t instanceof kr||t instanceof ts}function Jd(t,e=[]){return t instanceof an||t instanceof Lr||t instanceof vn?!0:t instanceof xn?Rv(t.definition,n=>Jd(n,e)):t instanceof nn&&Hn(e,t)?!1:t instanceof so?(t instanceof nn&&e.push(t),Ra(t.definition,n=>Jd(n,e))):!1}function fR(t){return t instanceof xn}function Ms(t){if(t instanceof nn)return"SUBRULE";if(t instanceof an)return"OPTION";if(t instanceof xn)return"OR";if(t instanceof An)return"AT_LEAST_ONE";if(t instanceof _n)return"AT_LEAST_ONE_SEP";if(t instanceof vn)return"MANY_SEP";if(t instanceof Lr)return"MANY";if(t instanceof kr)return"CONSUME";throw Error("non exhaustive match")}var nse=M(()=>{"use strict";Ht();OT();o(hR,"isSequenceProd");o(Jd,"isOptionalProd");o(fR,"isBranchingProd");o(Ms,"getProductionDslName")});var ns=M(()=>{"use strict";OT();rse();nse()});function ise(t,e,r){return[new an({definition:[new kr({terminalType:t.separator})].concat(t.definition)})].concat(e,r)}var Iu,PT=M(()=>{"use strict";Ht();ns();Iu=class{static{o(this,"RestWalker")}walk(e,r=[]){Ce(e.definition,(n,i)=>{let a=mi(e.definition,i+1);if(n instanceof nn)this.walkProdRef(n,a,r);else if(n instanceof kr)this.walkTerminal(n,a,r);else if(n instanceof Cn)this.walkFlat(n,a,r);else if(n instanceof an)this.walkOption(n,a,r);else if(n instanceof An)this.walkAtLeastOne(n,a,r);else if(n instanceof _n)this.walkAtLeastOneSep(n,a,r);else if(n instanceof vn)this.walkManySep(n,a,r);else if(n instanceof Lr)this.walkMany(n,a,r);else if(n instanceof xn)this.walkOr(n,a,r);else throw Error("non exhaustive match")})}walkTerminal(e,r,n){}walkProdRef(e,r,n){}walkFlat(e,r,n){let i=r.concat(n);this.walk(e,i)}walkOption(e,r,n){let i=r.concat(n);this.walk(e,i)}walkAtLeastOne(e,r,n){let i=[new an({definition:e.definition})].concat(r,n);this.walk(e,i)}walkAtLeastOneSep(e,r,n){let i=ise(e,r,n);this.walk(e,i)}walkMany(e,r,n){let i=[new an({definition:e.definition})].concat(r,n);this.walk(e,i)}walkManySep(e,r,n){let i=ise(e,r,n);this.walk(e,i)}walkOr(e,r,n){let i=r.concat(n);Ce(e.definition,a=>{let s=new Cn({definition:[a]});this.walk(s,i)})}};o(ise,"restForRepetitionWithSeparator")});function e0(t){if(t instanceof nn)return e0(t.referencedRule);if(t instanceof kr)return BBe(t);if(hR(t))return OBe(t);if(fR(t))return PBe(t);throw Error("non exhaustive match")}function OBe(t){let e=[],r=t.definition,n=0,i=r.length>n,a,s=!0;for(;i&&s;)a=r[n],s=Jd(a),e=e.concat(e0(a)),n=n+1,i=r.length>n;return Om(e)}function PBe(t){let e=Je(t.definition,r=>e0(r));return Om(Wr(e))}function BBe(t){return[t.terminalType]}var dR=M(()=>{"use strict";Ht();ns();o(e0,"first");o(OBe,"firstForSequence");o(PBe,"firstForBranching");o(BBe,"firstForTerminal")});var BT,pR=M(()=>{"use strict";BT="_~IN~_"});function ase(t){let e={};return Ce(t,r=>{let n=new mR(r).startWalking();ha(e,n)}),e}function FBe(t,e){return t.name+e+BT}var mR,sse=M(()=>{"use strict";PT();dR();Ht();pR();ns();mR=class extends Iu{static{o(this,"ResyncFollowsWalker")}constructor(e){super(),this.topProd=e,this.follows={}}startWalking(){return this.walk(this.topProd),this.follows}walkTerminal(e,r,n){}walkProdRef(e,r,n){let i=FBe(e.referencedRule,e.idx)+this.topProd.name,a=r.concat(n),s=new Cn({definition:a}),l=e0(s);this.follows[i]=l}};o(ase,"computeAllProdsFollows");o(FBe,"buildBetweenProdsFollowPrefix")});function Qm(t){let e=t.toString();if(FT.hasOwnProperty(e))return FT[e];{let r=zBe.pattern(e);return FT[e]=r,r}}function ose(){FT={}}var FT,zBe,zT=M(()=>{"use strict";Qv();FT={},zBe=new jd;o(Qm,"getRegExpAst");o(ose,"clearRegExpParserCache")});function use(t,e=!1){try{let r=Qm(t);return gR(r.value,{},r.flags.ignoreCase)}catch(r){if(r.message===cse)e&&t2(`${i2} Unable to optimize: < ${t.toString()} > + Complement Sets cannot be automatically optimized. + This will disable the lexer's first char optimizations. + See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#COMPLEMENT for details.`);else{let n="";e&&(n=` + This will disable the lexer's first char optimizations. + See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#REGEXP_PARSING for details.`),Xm(`${i2} + Failed parsing: < ${t.toString()} > + Using the @chevrotain/regexp-to-ast library + Please open an issue at: https://github.com/chevrotain/chevrotain/issues`+n)}}return[]}function gR(t,e,r){switch(t.type){case"Disjunction":for(let i=0;i<t.value.length;i++)gR(t.value[i],e,r);break;case"Alternative":let n=t.value;for(let i=0;i<n.length;i++){let a=n[i];switch(a.type){case"EndAnchor":case"GroupBackReference":case"Lookahead":case"NegativeLookahead":case"StartAnchor":case"WordBoundary":case"NonWordBoundary":continue}let s=a;switch(s.type){case"Character":GT(s.value,e,r);break;case"Set":if(s.complement===!0)throw Error(cse);Ce(s.value,u=>{if(typeof u=="number")GT(u,e,r);else{let h=u;if(r===!0)for(let f=h.from;f<=h.to;f++)GT(f,e,r);else{for(let f=h.from;f<=h.to&&f<Zm;f++)GT(f,e,r);if(h.to>=Zm){let f=h.from>=Zm?h.from:Zm,d=h.to,p=Dc(f),m=Dc(d);for(let g=p;g<=m;g++)e[g]=g}}}});break;case"Group":gR(s.value,e,r);break;default:throw Error("Non Exhaustive Match")}let l=s.quantifier!==void 0&&s.quantifier.atLeast===0;if(s.type==="Group"&&yR(s)===!1||s.type!=="Group"&&l===!1)break}break;default:throw Error("non exhaustive match!")}return br(e)}function GT(t,e,r){let n=Dc(t);e[n]=n,r===!0&&GBe(t,e)}function GBe(t,e){let r=String.fromCharCode(t),n=r.toUpperCase();if(n!==r){let i=Dc(n.charCodeAt(0));e[i]=i}else{let i=r.toLowerCase();if(i!==r){let a=Dc(i.charCodeAt(0));e[a]=a}}}function lse(t,e){return Za(t.value,r=>{if(typeof r=="number")return Hn(e,r);{let n=r;return Za(e,i=>n.from<=i&&i<=n.to)!==void 0}})}function yR(t){let e=t.quantifier;return e&&e.atLeast===0?!0:t.value?Mt(t.value)?Ra(t.value,yR):yR(t.value):!1}function $T(t,e){if(e instanceof RegExp){let r=Qm(e),n=new vR(t);return n.visit(r),n.found}else return Za(e,r=>Hn(t,r.charCodeAt(0)))!==void 0}var cse,i2,vR,hse=M(()=>{"use strict";Qv();Ht();jm();zT();xR();cse="Complement Sets are not supported for first char optimization",i2=`Unable to use "first char" lexer optimizations: +`;o(use,"getOptimizedStartCodesIndices");o(gR,"firstCharOptimizedIndices");o(GT,"addOptimizedIdxToResult");o(GBe,"handleIgnoreCase");o(lse,"findCode");o(yR,"isWholeOptional");vR=class extends Lc{static{o(this,"CharCodeFinder")}constructor(e){super(),this.targetCharCodes=e,this.found=!1}visitChildren(e){if(this.found!==!0){switch(e.type){case"Lookahead":this.visitLookahead(e);return;case"NegativeLookahead":this.visitNegativeLookahead(e);return}super.visitChildren(e)}}visitCharacter(e){Hn(this.targetCharCodes,e.value)&&(this.found=!0)}visitSet(e){e.complement?lse(e,this.targetCharCodes)===void 0&&(this.found=!0):lse(e,this.targetCharCodes)!==void 0&&(this.found=!0)}};o($T,"canMatchCharCode")});function pse(t,e){e=qh(e,{useSticky:wR,debug:!1,safeMode:!1,positionTracking:"full",lineTerminatorCharacters:["\r",` +`],tracer:o((b,w)=>w(),"tracer")});let r=e.tracer;r("initCharCodeToOptimizedIndexMap",()=>{iFe()});let n;r("Reject Lexer.NA",()=>{n=jh(t,b=>b[t0]===oi.NA)});let i=!1,a;r("Transform Patterns",()=>{i=!1,a=Je(n,b=>{let w=b[t0];if(Vo(w)){let _=w.source;return _.length===1&&_!=="^"&&_!=="$"&&_!=="."&&!w.ignoreCase?_:_.length===2&&_[0]==="\\"&&!Hn(["d","D","s","S","t","r","n","t","0","c","b","B","f","v","w","W"],_[1])?_[1]:e.useSticky?dse(w):fse(w)}else{if(Ei(w))return i=!0,{exec:w};if(typeof w=="object")return i=!0,w;if(typeof w=="string"){if(w.length===1)return w;{let _=w.replace(/[\\^$.*+?()[\]{}|]/g,"\\$&"),T=new RegExp(_);return e.useSticky?dse(T):fse(T)}}else throw Error("non exhaustive match")}})});let s,l,u,h,f;r("misc mapping",()=>{s=Je(n,b=>b.tokenTypeIdx),l=Je(n,b=>{let w=b.GROUP;if(w!==oi.SKIPPED){if(gi(w))return w;if(dr(w))return!1;throw Error("non exhaustive match")}}),u=Je(n,b=>{let w=b.LONGER_ALT;if(w)return Mt(w)?Je(w,T=>jw(n,T)):[jw(n,w)]}),h=Je(n,b=>b.PUSH_MODE),f=Je(n,b=>It(b,"POP_MODE"))});let d;r("Line Terminator Handling",()=>{let b=Tse(e.lineTerminatorCharacters);d=Je(n,w=>!1),e.positionTracking!=="onlyOffset"&&(d=Je(n,w=>It(w,"LINE_BREAKS")?!!w.LINE_BREAKS:wse(w,b)===!1&&$T(b,w.PATTERN)))});let p,m,g,y;r("Misc Mapping #2",()=>{p=Je(n,xse),m=Je(a,rFe),g=qr(n,(b,w)=>{let _=w.GROUP;return gi(_)&&_!==oi.SKIPPED&&(b[_]=[]),b},{}),y=Je(a,(b,w)=>({pattern:a[w],longerAlt:u[w],canLineTerminator:d[w],isCustom:p[w],short:m[w],group:l[w],push:h[w],pop:f[w],tokenTypeIdx:s[w],tokenType:n[w]}))});let v=!0,x=[];return e.safeMode||r("First Char Optimization",()=>{x=qr(n,(b,w,_)=>{if(typeof w.PATTERN=="string"){let T=w.PATTERN.charCodeAt(0),E=Dc(T);bR(b,E,y[_])}else if(Mt(w.START_CHARS_HINT)){let T;Ce(w.START_CHARS_HINT,E=>{let L=typeof E=="string"?E.charCodeAt(0):E,C=Dc(L);T!==C&&(T=C,bR(b,C,y[_]))})}else if(Vo(w.PATTERN))if(w.PATTERN.unicode)v=!1,e.ensureOptimizations&&Xm(`${i2} Unable to analyze < ${w.PATTERN.toString()} > pattern. + The regexp unicode flag is not currently supported by the regexp-to-ast library. + This will disable the lexer's first char optimizations. + For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#UNICODE_OPTIMIZE`);else{let T=use(w.PATTERN,e.ensureOptimizations);cr(T)&&(v=!1),Ce(T,E=>{bR(b,E,y[_])})}else e.ensureOptimizations&&Xm(`${i2} TokenType: <${w.name}> is using a custom token pattern without providing <start_chars_hint> parameter. + This will disable the lexer's first char optimizations. + For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#CUSTOM_OPTIMIZE`),v=!1;return b},[])}),{emptyGroups:g,patternIdxToConfig:y,charCodeToPatternIdxToConfig:x,hasCustom:i,canBeOptimized:v}}function mse(t,e){let r=[],n=VBe(t);r=r.concat(n.errors);let i=UBe(n.valid),a=i.valid;return r=r.concat(i.errors),r=r.concat($Be(a)),r=r.concat(QBe(a)),r=r.concat(ZBe(a,e)),r=r.concat(JBe(a)),r}function $Be(t){let e=[],r=Yr(t,n=>Vo(n[t0]));return e=e.concat(WBe(r)),e=e.concat(XBe(r)),e=e.concat(jBe(r)),e=e.concat(KBe(r)),e=e.concat(YBe(r)),e}function VBe(t){let e=Yr(t,i=>!It(i,t0)),r=Je(e,i=>({message:"Token Type: ->"+i.name+"<- missing static 'PATTERN' property",type:Wn.MISSING_PATTERN,tokenTypes:[i]})),n=Xh(t,e);return{errors:r,valid:n}}function UBe(t){let e=Yr(t,i=>{let a=i[t0];return!Vo(a)&&!Ei(a)&&!It(a,"exec")&&!gi(a)}),r=Je(e,i=>({message:"Token Type: ->"+i.name+"<- static 'PATTERN' can only be a RegExp, a Function matching the {CustomPatternMatcherFunc} type or an Object matching the {ICustomPattern} interface.",type:Wn.INVALID_PATTERN,tokenTypes:[i]})),n=Xh(t,e);return{errors:r,valid:n}}function WBe(t){class e extends Lc{static{o(this,"EndAnchorFinder")}constructor(){super(...arguments),this.found=!1}visitEndAnchor(a){this.found=!0}}let r=Yr(t,i=>{let a=i.PATTERN;try{let s=Qm(a),l=new e;return l.visit(s),l.found}catch{return HBe.test(a.source)}});return Je(r,i=>({message:`Unexpected RegExp Anchor Error: + Token Type: ->`+i.name+`<- static 'PATTERN' cannot contain end of input anchor '$' + See chevrotain.io/docs/guide/resolving_lexer_errors.html#ANCHORS for details.`,type:Wn.EOI_ANCHOR_FOUND,tokenTypes:[i]}))}function YBe(t){let e=Yr(t,n=>n.PATTERN.test(""));return Je(e,n=>({message:"Token Type: ->"+n.name+"<- static 'PATTERN' must not match an empty string",type:Wn.EMPTY_MATCH_PATTERN,tokenTypes:[n]}))}function XBe(t){class e extends Lc{static{o(this,"StartAnchorFinder")}constructor(){super(...arguments),this.found=!1}visitStartAnchor(a){this.found=!0}}let r=Yr(t,i=>{let a=i.PATTERN;try{let s=Qm(a),l=new e;return l.visit(s),l.found}catch{return qBe.test(a.source)}});return Je(r,i=>({message:`Unexpected RegExp Anchor Error: + Token Type: ->`+i.name+`<- static 'PATTERN' cannot contain start of input anchor '^' + See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#ANCHORS for details.`,type:Wn.SOI_ANCHOR_FOUND,tokenTypes:[i]}))}function jBe(t){let e=Yr(t,n=>{let i=n[t0];return i instanceof RegExp&&(i.multiline||i.global)});return Je(e,n=>({message:"Token Type: ->"+n.name+"<- static 'PATTERN' may NOT contain global('g') or multiline('m')",type:Wn.UNSUPPORTED_FLAGS_FOUND,tokenTypes:[n]}))}function KBe(t){let e=[],r=Je(t,a=>qr(t,(s,l)=>(a.PATTERN.source===l.PATTERN.source&&!Hn(e,l)&&l.PATTERN!==oi.NA&&(e.push(l),s.push(l)),s),[]));r=Tc(r);let n=Yr(r,a=>a.length>1);return Je(n,a=>{let s=Je(a,u=>u.name);return{message:`The same RegExp pattern ->${ra(a).PATTERN}<-has been used in all of the following Token Types: ${s.join(", ")} <-`,type:Wn.DUPLICATE_PATTERNS_FOUND,tokenTypes:a}})}function QBe(t){let e=Yr(t,n=>{if(!It(n,"GROUP"))return!1;let i=n.GROUP;return i!==oi.SKIPPED&&i!==oi.NA&&!gi(i)});return Je(e,n=>({message:"Token Type: ->"+n.name+"<- static 'GROUP' can only be Lexer.SKIPPED/Lexer.NA/A String",type:Wn.INVALID_GROUP_TYPE_FOUND,tokenTypes:[n]}))}function ZBe(t,e){let r=Yr(t,i=>i.PUSH_MODE!==void 0&&!Hn(e,i.PUSH_MODE));return Je(r,i=>({message:`Token Type: ->${i.name}<- static 'PUSH_MODE' value cannot refer to a Lexer Mode ->${i.PUSH_MODE}<-which does not exist`,type:Wn.PUSH_MODE_DOES_NOT_EXIST,tokenTypes:[i]}))}function JBe(t){let e=[],r=qr(t,(n,i,a)=>{let s=i.PATTERN;return s===oi.NA||(gi(s)?n.push({str:s,idx:a,tokenType:i}):Vo(s)&&tFe(s)&&n.push({str:s.source,idx:a,tokenType:i})),n},[]);return Ce(t,(n,i)=>{Ce(r,({str:a,idx:s,tokenType:l})=>{if(i<s&&eFe(a,n.PATTERN)){let u=`Token: ->${l.name}<- can never be matched. +Because it appears AFTER the Token Type ->${n.name}<-in the lexer's definition. +See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#UNREACHABLE`;e.push({message:u,type:Wn.UNREACHABLE_PATTERN,tokenTypes:[n,l]})}})}),e}function eFe(t,e){if(Vo(e)){let r=e.exec(t);return r!==null&&r.index===0}else{if(Ei(e))return e(t,0,[],{});if(It(e,"exec"))return e.exec(t,0,[],{});if(typeof e=="string")return e===t;throw Error("non exhaustive match")}}function tFe(t){return Za([".","\\","[","]","|","^","$","(",")","?","*","+","{"],r=>t.source.indexOf(r)!==-1)===void 0}function fse(t){let e=t.ignoreCase?"i":"";return new RegExp(`^(?:${t.source})`,e)}function dse(t){let e=t.ignoreCase?"iy":"y";return new RegExp(`${t.source}`,e)}function gse(t,e,r){let n=[];return It(t,Jm)||n.push({message:"A MultiMode Lexer cannot be initialized without a <"+Jm+`> property in its definition +`,type:Wn.MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE}),It(t,VT)||n.push({message:"A MultiMode Lexer cannot be initialized without a <"+VT+`> property in its definition +`,type:Wn.MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY}),It(t,VT)&&It(t,Jm)&&!It(t.modes,t.defaultMode)&&n.push({message:`A MultiMode Lexer cannot be initialized with a ${Jm}: <${t.defaultMode}>which does not exist +`,type:Wn.MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST}),It(t,VT)&&Ce(t.modes,(i,a)=>{Ce(i,(s,l)=>{if(dr(s))n.push({message:`A Lexer cannot be initialized using an undefined Token Type. Mode:<${a}> at index: <${l}> +`,type:Wn.LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED});else if(It(s,"LONGER_ALT")){let u=Mt(s.LONGER_ALT)?s.LONGER_ALT:[s.LONGER_ALT];Ce(u,h=>{!dr(h)&&!Hn(i,h)&&n.push({message:`A MultiMode Lexer cannot be initialized with a longer_alt <${h.name}> on token <${s.name}> outside of mode <${a}> +`,type:Wn.MULTI_MODE_LEXER_LONGER_ALT_NOT_IN_CURRENT_MODE})})}})}),n}function yse(t,e,r){let n=[],i=!1,a=Tc(Wr(br(t.modes))),s=jh(a,u=>u[t0]===oi.NA),l=Tse(r);return e&&Ce(s,u=>{let h=wse(u,l);if(h!==!1){let d={message:nFe(u,h),type:h.issue,tokenType:u};n.push(d)}else It(u,"LINE_BREAKS")?u.LINE_BREAKS===!0&&(i=!0):$T(l,u.PATTERN)&&(i=!0)}),e&&!i&&n.push({message:`Warning: No LINE_BREAKS Found. + This Lexer has been defined to track line and column information, + But none of the Token Types can be identified as matching a line terminator. + See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#LINE_BREAKS + for details.`,type:Wn.NO_LINE_BREAKS_FLAGS}),n}function vse(t){let e={},r=zr(t);return Ce(r,n=>{let i=t[n];if(Mt(i))e[n]=[];else throw Error("non exhaustive match")}),e}function xse(t){let e=t.PATTERN;if(Vo(e))return!1;if(Ei(e))return!0;if(It(e,"exec"))return!0;if(gi(e))return!1;throw Error("non exhaustive match")}function rFe(t){return gi(t)&&t.length===1?t.charCodeAt(0):!1}function wse(t,e){if(It(t,"LINE_BREAKS"))return!1;if(Vo(t.PATTERN)){try{$T(e,t.PATTERN)}catch(r){return{issue:Wn.IDENTIFY_TERMINATOR,errMsg:r.message}}return!1}else{if(gi(t.PATTERN))return!1;if(xse(t))return{issue:Wn.CUSTOM_LINE_BREAK};throw Error("non exhaustive match")}}function nFe(t,e){if(e.issue===Wn.IDENTIFY_TERMINATOR)return`Warning: unable to identify line terminator usage in pattern. + The problem is in the <${t.name}> Token Type + Root cause: ${e.errMsg}. + For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#IDENTIFY_TERMINATOR`;if(e.issue===Wn.CUSTOM_LINE_BREAK)return`Warning: A Custom Token Pattern should specify the <line_breaks> option. + The problem is in the <${t.name}> Token Type + For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#CUSTOM_LINE_BREAK`;throw Error("non exhaustive match")}function Tse(t){return Je(t,r=>gi(r)?r.charCodeAt(0):r)}function bR(t,e,r){t[e]===void 0?t[e]=[r]:t[e].push(r)}function Dc(t){return t<Zm?t:UT[t]}function iFe(){if(cr(UT)){UT=new Array(65536);for(let t=0;t<65536;t++)UT[t]=t>255?255+~~(t/255):t}}var t0,Jm,VT,wR,HBe,qBe,bse,Zm,UT,xR=M(()=>{"use strict";Qv();a2();Ht();jm();hse();zT();t0="PATTERN",Jm="defaultMode",VT="modes",wR=typeof new RegExp("(?:)").sticky=="boolean";o(pse,"analyzeTokenTypes");o(mse,"validatePatterns");o($Be,"validateRegExpPattern");o(VBe,"findMissingPatterns");o(UBe,"findInvalidPatterns");HBe=/[^\\][$]/;o(WBe,"findEndOfInputAnchor");o(YBe,"findEmptyMatchRegExps");qBe=/[^\\[][\^]|^\^/;o(XBe,"findStartOfInputAnchor");o(jBe,"findUnsupportedFlags");o(KBe,"findDuplicatePatterns");o(QBe,"findInvalidGroupType");o(ZBe,"findModesThatDoNotExist");o(JBe,"findUnreachablePatterns");o(eFe,"testTokenType");o(tFe,"noMetaChar");o(fse,"addStartOfInput");o(dse,"addStickyFlag");o(gse,"performRuntimeChecks");o(yse,"performWarningRuntimeChecks");o(vse,"cloneEmptyGroups");o(xse,"isCustomPattern");o(rFe,"isShortPattern");bse={test:o(function(t){let e=t.length;for(let r=this.lastIndex;r<e;r++){let n=t.charCodeAt(r);if(n===10)return this.lastIndex=r+1,!0;if(n===13)return t.charCodeAt(r+1)===10?this.lastIndex=r+2:this.lastIndex=r+1,!0}return!1},"test"),lastIndex:0};o(wse,"checkLineBreaksIssues");o(nFe,"buildLineBreakIssueMessage");o(Tse,"getCharCodes");o(bR,"addToMapOfArrays");Zm=256,UT=[];o(Dc,"charCodeToOptimizedIndex");o(iFe,"initCharCodeToOptimizedIndexMap")});function Ou(t,e){let r=t.tokenTypeIdx;return r===e.tokenTypeIdx?!0:e.isParent===!0&&e.categoryMatchesMap[r]===!0}function eg(t,e){return t.tokenTypeIdx===e.tokenTypeIdx}function Pu(t){let e=aFe(t);sFe(e),lFe(e),oFe(e),Ce(e,r=>{r.isParent=r.categoryMatches.length>0})}function aFe(t){let e=rn(t),r=t,n=!0;for(;n;){r=Tc(Wr(Je(r,a=>a.CATEGORIES)));let i=Xh(r,e);e=e.concat(i),cr(i)?n=!1:r=i}return e}function sFe(t){Ce(t,e=>{TR(e)||(Sse[kse]=e,e.tokenTypeIdx=kse++),Ese(e)&&!Mt(e.CATEGORIES)&&(e.CATEGORIES=[e.CATEGORIES]),Ese(e)||(e.CATEGORIES=[]),cFe(e)||(e.categoryMatches=[]),uFe(e)||(e.categoryMatchesMap={})})}function oFe(t){Ce(t,e=>{e.categoryMatches=[],Ce(e.categoryMatchesMap,(r,n)=>{e.categoryMatches.push(Sse[n].tokenTypeIdx)})})}function lFe(t){Ce(t,e=>{Cse([],e)})}function Cse(t,e){Ce(t,r=>{e.categoryMatchesMap[r.tokenTypeIdx]=!0}),Ce(e.CATEGORIES,r=>{let n=t.concat(e);Hn(n,r)||Cse(n,r)})}function TR(t){return It(t,"tokenTypeIdx")}function Ese(t){return It(t,"CATEGORIES")}function cFe(t){return It(t,"categoryMatches")}function uFe(t){return It(t,"categoryMatchesMap")}function Ase(t){return It(t,"tokenTypeIdx")}var kse,Sse,r0=M(()=>{"use strict";Ht();o(Ou,"tokenStructuredMatcher");o(eg,"tokenStructuredMatcherNoCategories");kse=1,Sse={};o(Pu,"augmentTokenTypes");o(aFe,"expandCategories");o(sFe,"assignTokenDefaultProps");o(oFe,"assignCategoriesTokensProp");o(lFe,"assignCategoriesMapProp");o(Cse,"singleAssignCategoriesToksMap");o(TR,"hasShortKeyProperty");o(Ese,"hasCategoriesProperty");o(cFe,"hasExtendingTokensTypesProperty");o(uFe,"hasExtendingTokensTypesMapProperty");o(Ase,"isTokenType")});var kR,ER=M(()=>{"use strict";kR={buildUnableToPopLexerModeMessage(t){return`Unable to pop Lexer Mode after encountering Token ->${t.image}<- The Mode Stack is empty`},buildUnexpectedCharactersMessage(t,e,r,n,i){return`unexpected character: ->${t.charAt(e)}<- at offset: ${e}, skipped ${r} characters.`}}});var Wn,s2,oi,a2=M(()=>{"use strict";xR();Ht();jm();r0();ER();zT();(function(t){t[t.MISSING_PATTERN=0]="MISSING_PATTERN",t[t.INVALID_PATTERN=1]="INVALID_PATTERN",t[t.EOI_ANCHOR_FOUND=2]="EOI_ANCHOR_FOUND",t[t.UNSUPPORTED_FLAGS_FOUND=3]="UNSUPPORTED_FLAGS_FOUND",t[t.DUPLICATE_PATTERNS_FOUND=4]="DUPLICATE_PATTERNS_FOUND",t[t.INVALID_GROUP_TYPE_FOUND=5]="INVALID_GROUP_TYPE_FOUND",t[t.PUSH_MODE_DOES_NOT_EXIST=6]="PUSH_MODE_DOES_NOT_EXIST",t[t.MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE=7]="MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE",t[t.MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY=8]="MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY",t[t.MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST=9]="MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST",t[t.LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED=10]="LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED",t[t.SOI_ANCHOR_FOUND=11]="SOI_ANCHOR_FOUND",t[t.EMPTY_MATCH_PATTERN=12]="EMPTY_MATCH_PATTERN",t[t.NO_LINE_BREAKS_FLAGS=13]="NO_LINE_BREAKS_FLAGS",t[t.UNREACHABLE_PATTERN=14]="UNREACHABLE_PATTERN",t[t.IDENTIFY_TERMINATOR=15]="IDENTIFY_TERMINATOR",t[t.CUSTOM_LINE_BREAK=16]="CUSTOM_LINE_BREAK",t[t.MULTI_MODE_LEXER_LONGER_ALT_NOT_IN_CURRENT_MODE=17]="MULTI_MODE_LEXER_LONGER_ALT_NOT_IN_CURRENT_MODE"})(Wn||(Wn={}));s2={deferDefinitionErrorsHandling:!1,positionTracking:"full",lineTerminatorsPattern:/\n|\r\n?/g,lineTerminatorCharacters:[` +`,"\r"],ensureOptimizations:!1,safeMode:!1,errorMessageProvider:kR,traceInitPerf:!1,skipValidations:!1,recoveryEnabled:!0};Object.freeze(s2);oi=class{static{o(this,"Lexer")}constructor(e,r=s2){if(this.lexerDefinition=e,this.lexerDefinitionErrors=[],this.lexerDefinitionWarning=[],this.patternIdxToConfig={},this.charCodeToPatternIdxToConfig={},this.modes=[],this.emptyGroups={},this.trackStartLines=!0,this.trackEndLines=!0,this.hasCustom=!1,this.canModeBeOptimized={},this.TRACE_INIT=(i,a)=>{if(this.traceInitPerf===!0){this.traceInitIndent++;let s=new Array(this.traceInitIndent+1).join(" ");this.traceInitIndent<this.traceInitMaxIdent&&console.log(`${s}--> <${i}>`);let{time:l,value:u}=r2(a),h=l>10?console.warn:console.log;return this.traceInitIndent<this.traceInitMaxIdent&&h(`${s}<-- <${i}> time: ${l}ms`),this.traceInitIndent--,u}else return a()},typeof r=="boolean")throw Error(`The second argument to the Lexer constructor is now an ILexerConfig Object. +a boolean 2nd argument is no longer supported`);this.config=ha({},s2,r);let n=this.config.traceInitPerf;n===!0?(this.traceInitMaxIdent=1/0,this.traceInitPerf=!0):typeof n=="number"&&(this.traceInitMaxIdent=n,this.traceInitPerf=!0),this.traceInitIndent=-1,this.TRACE_INIT("Lexer Constructor",()=>{let i,a=!0;this.TRACE_INIT("Lexer Config handling",()=>{if(this.config.lineTerminatorsPattern===s2.lineTerminatorsPattern)this.config.lineTerminatorsPattern=bse;else if(this.config.lineTerminatorCharacters===s2.lineTerminatorCharacters)throw Error(`Error: Missing <lineTerminatorCharacters> property on the Lexer config. + For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#MISSING_LINE_TERM_CHARS`);if(r.safeMode&&r.ensureOptimizations)throw Error('"safeMode" and "ensureOptimizations" flags are mutually exclusive.');this.trackStartLines=/full|onlyStart/i.test(this.config.positionTracking),this.trackEndLines=/full/i.test(this.config.positionTracking),Mt(e)?i={modes:{defaultMode:rn(e)},defaultMode:Jm}:(a=!1,i=rn(e))}),this.config.skipValidations===!1&&(this.TRACE_INIT("performRuntimeChecks",()=>{this.lexerDefinitionErrors=this.lexerDefinitionErrors.concat(gse(i,this.trackStartLines,this.config.lineTerminatorCharacters))}),this.TRACE_INIT("performWarningRuntimeChecks",()=>{this.lexerDefinitionWarning=this.lexerDefinitionWarning.concat(yse(i,this.trackStartLines,this.config.lineTerminatorCharacters))})),i.modes=i.modes?i.modes:{},Ce(i.modes,(l,u)=>{i.modes[u]=jh(l,h=>dr(h))});let s=zr(i.modes);if(Ce(i.modes,(l,u)=>{this.TRACE_INIT(`Mode: <${u}> processing`,()=>{if(this.modes.push(u),this.config.skipValidations===!1&&this.TRACE_INIT("validatePatterns",()=>{this.lexerDefinitionErrors=this.lexerDefinitionErrors.concat(mse(l,s))}),cr(this.lexerDefinitionErrors)){Pu(l);let h;this.TRACE_INIT("analyzeTokenTypes",()=>{h=pse(l,{lineTerminatorCharacters:this.config.lineTerminatorCharacters,positionTracking:r.positionTracking,ensureOptimizations:r.ensureOptimizations,safeMode:r.safeMode,tracer:this.TRACE_INIT})}),this.patternIdxToConfig[u]=h.patternIdxToConfig,this.charCodeToPatternIdxToConfig[u]=h.charCodeToPatternIdxToConfig,this.emptyGroups=ha({},this.emptyGroups,h.emptyGroups),this.hasCustom=h.hasCustom||this.hasCustom,this.canModeBeOptimized[u]=h.canBeOptimized}})}),this.defaultMode=i.defaultMode,!cr(this.lexerDefinitionErrors)&&!this.config.deferDefinitionErrorsHandling){let u=Je(this.lexerDefinitionErrors,h=>h.message).join(`----------------------- +`);throw new Error(`Errors detected in definition of Lexer: +`+u)}Ce(this.lexerDefinitionWarning,l=>{t2(l.message)}),this.TRACE_INIT("Choosing sub-methods implementations",()=>{if(wR?(this.chopInput=ta,this.match=this.matchWithTest):(this.updateLastIndex=Jn,this.match=this.matchWithExec),a&&(this.handleModes=Jn),this.trackStartLines===!1&&(this.computeNewColumn=ta),this.trackEndLines===!1&&(this.updateTokenEndLineColumnLocation=Jn),/full/i.test(this.config.positionTracking))this.createTokenInstance=this.createFullToken;else if(/onlyStart/i.test(this.config.positionTracking))this.createTokenInstance=this.createStartOnlyToken;else if(/onlyOffset/i.test(this.config.positionTracking))this.createTokenInstance=this.createOffsetOnlyToken;else throw Error(`Invalid <positionTracking> config option: "${this.config.positionTracking}"`);this.hasCustom?(this.addToken=this.addTokenUsingPush,this.handlePayload=this.handlePayloadWithCustom):(this.addToken=this.addTokenUsingMemberAccess,this.handlePayload=this.handlePayloadNoCustom)}),this.TRACE_INIT("Failed Optimization Warnings",()=>{let l=qr(this.canModeBeOptimized,(u,h,f)=>(h===!1&&u.push(f),u),[]);if(r.ensureOptimizations&&!cr(l))throw Error(`Lexer Modes: < ${l.join(", ")} > cannot be optimized. + Disable the "ensureOptimizations" lexer config flag to silently ignore this and run the lexer in an un-optimized mode. + Or inspect the console log for details on how to resolve these issues.`)}),this.TRACE_INIT("clearRegExpParserCache",()=>{ose()}),this.TRACE_INIT("toFastProperties",()=>{n2(this)})})}tokenize(e,r=this.defaultMode){if(!cr(this.lexerDefinitionErrors)){let i=Je(this.lexerDefinitionErrors,a=>a.message).join(`----------------------- +`);throw new Error(`Unable to Tokenize because Errors detected in definition of Lexer: +`+i)}return this.tokenizeInternal(e,r)}tokenizeInternal(e,r){let n,i,a,s,l,u,h,f,d,p,m,g,y,v,x,b,w=e,_=w.length,T=0,E=0,L=this.hasCustom?0:Math.floor(e.length/10),C=new Array(L),A=[],I=this.trackStartLines?1:void 0,D=this.trackStartLines?1:void 0,k=vse(this.emptyGroups),R=this.trackStartLines,S=this.config.lineTerminatorsPattern,O=0,N=[],P=[],F=[],B=[];Object.freeze(B);let $;function z(){return N}o(z,"getPossiblePatternsSlow");function W(ee){let J=Dc(ee),H=P[J];return H===void 0?B:H}o(W,"getPossiblePatternsOptimized");let j=o(ee=>{if(F.length===1&&ee.tokenType.PUSH_MODE===void 0){let J=this.config.errorMessageProvider.buildUnableToPopLexerModeMessage(ee);A.push({offset:ee.startOffset,line:ee.startLine,column:ee.startColumn,length:ee.image.length,message:J})}else{F.pop();let J=fa(F);N=this.patternIdxToConfig[J],P=this.charCodeToPatternIdxToConfig[J],O=N.length;let H=this.canModeBeOptimized[J]&&this.config.safeMode===!1;P&&H?$=W:$=z}},"pop_mode");function K(ee){F.push(ee),P=this.charCodeToPatternIdxToConfig[ee],N=this.patternIdxToConfig[ee],O=N.length,O=N.length;let J=this.canModeBeOptimized[ee]&&this.config.safeMode===!1;P&&J?$=W:$=z}o(K,"push_mode"),K.call(this,r);let ie,Q=this.config.recoveryEnabled;for(;T<_;){u=null;let ee=w.charCodeAt(T),J=$(ee),H=J.length;for(n=0;n<H;n++){ie=J[n];let q=ie.pattern;h=null;let Z=ie.short;if(Z!==!1?ee===Z&&(u=q):ie.isCustom===!0?(b=q.exec(w,T,C,k),b!==null?(u=b[0],b.payload!==void 0&&(h=b.payload)):u=null):(this.updateLastIndex(q,T),u=this.match(q,e,T)),u!==null){if(l=ie.longerAlt,l!==void 0){let ae=l.length;for(a=0;a<ae;a++){let ue=N[l[a]],ce=ue.pattern;if(f=null,ue.isCustom===!0?(b=ce.exec(w,T,C,k),b!==null?(s=b[0],b.payload!==void 0&&(f=b.payload)):s=null):(this.updateLastIndex(ce,T),s=this.match(ce,e,T)),s&&s.length>u.length){u=s,h=f,ie=ue;break}}}break}}if(u!==null){if(d=u.length,p=ie.group,p!==void 0&&(m=ie.tokenTypeIdx,g=this.createTokenInstance(u,T,m,ie.tokenType,I,D,d),this.handlePayload(g,h),p===!1?E=this.addToken(C,E,g):k[p].push(g)),e=this.chopInput(e,d),T=T+d,D=this.computeNewColumn(D,d),R===!0&&ie.canLineTerminator===!0){let q=0,Z,ae;S.lastIndex=0;do Z=S.test(u),Z===!0&&(ae=S.lastIndex-1,q++);while(Z===!0);q!==0&&(I=I+q,D=d-ae,this.updateTokenEndLineColumnLocation(g,p,ae,q,I,D,d))}this.handleModes(ie,j,K,g)}else{let q=T,Z=I,ae=D,ue=Q===!1;for(;ue===!1&&T<_;)for(e=this.chopInput(e,1),T++,i=0;i<O;i++){let ce=N[i],te=ce.pattern,De=ce.short;if(De!==!1?w.charCodeAt(T)===De&&(ue=!0):ce.isCustom===!0?ue=te.exec(w,T,C,k)!==null:(this.updateLastIndex(te,T),ue=te.exec(e)!==null),ue===!0)break}if(y=T-q,D=this.computeNewColumn(D,y),x=this.config.errorMessageProvider.buildUnexpectedCharactersMessage(w,q,y,Z,ae),A.push({offset:q,line:Z,column:ae,length:y,message:x}),Q===!1)break}}return this.hasCustom||(C.length=E),{tokens:C,groups:k,errors:A}}handleModes(e,r,n,i){if(e.pop===!0){let a=e.push;r(i),a!==void 0&&n.call(this,a)}else e.push!==void 0&&n.call(this,e.push)}chopInput(e,r){return e.substring(r)}updateLastIndex(e,r){e.lastIndex=r}updateTokenEndLineColumnLocation(e,r,n,i,a,s,l){let u,h;r!==void 0&&(u=n===l-1,h=u?-1:0,i===1&&u===!0||(e.endLine=a+h,e.endColumn=s-1+-h))}computeNewColumn(e,r){return e+r}createOffsetOnlyToken(e,r,n,i){return{image:e,startOffset:r,tokenTypeIdx:n,tokenType:i}}createStartOnlyToken(e,r,n,i,a,s){return{image:e,startOffset:r,startLine:a,startColumn:s,tokenTypeIdx:n,tokenType:i}}createFullToken(e,r,n,i,a,s,l){return{image:e,startOffset:r,endOffset:r+l-1,startLine:a,endLine:a,startColumn:s,endColumn:s+l-1,tokenTypeIdx:n,tokenType:i}}addTokenUsingPush(e,r,n){return e.push(n),r}addTokenUsingMemberAccess(e,r,n){return e[r]=n,r++,r}handlePayloadNoCustom(e,r){}handlePayloadWithCustom(e,r){r!==null&&(e.payload=r)}matchWithTest(e,r,n){return e.test(r)===!0?r.substring(n,e.lastIndex):null}matchWithExec(e,r){let n=e.exec(r);return n!==null?n[0]:null}};oi.SKIPPED="This marks a skipped Token pattern, this means each token identified by it willbe consumed and then thrown into oblivion, this can be used to for example to completely ignore whitespace.";oi.NA=/NOT_APPLICABLE/});function Bu(t){return SR(t)?t.LABEL:t.name}function SR(t){return gi(t.LABEL)&&t.LABEL!==""}function HT(t){return fFe(t)}function fFe(t){let e=t.pattern,r={};if(r.name=t.name,dr(e)||(r.PATTERN=e),It(t,hFe))throw`The parent property is no longer supported. +See: https://github.com/chevrotain/chevrotain/issues/564#issuecomment-349062346 for details.`;return It(t,_se)&&(r.CATEGORIES=t[_se]),Pu([r]),It(t,Lse)&&(r.LABEL=t[Lse]),It(t,Dse)&&(r.GROUP=t[Dse]),It(t,Rse)&&(r.POP_MODE=t[Rse]),It(t,Nse)&&(r.PUSH_MODE=t[Nse]),It(t,Mse)&&(r.LONGER_ALT=t[Mse]),It(t,Ise)&&(r.LINE_BREAKS=t[Ise]),It(t,Ose)&&(r.START_CHARS_HINT=t[Ose]),r}function n0(t,e,r,n,i,a,s,l){return{image:e,startOffset:r,endOffset:n,startLine:i,endLine:a,startColumn:s,endColumn:l,tokenTypeIdx:t.tokenTypeIdx,tokenType:t}}function o2(t,e){return Ou(t,e)}var hFe,_se,Lse,Dse,Nse,Rse,Mse,Ise,Ose,oo,i0=M(()=>{"use strict";Ht();a2();r0();o(Bu,"tokenLabel");o(SR,"hasTokenLabel");hFe="parent",_se="categories",Lse="label",Dse="group",Nse="push_mode",Rse="pop_mode",Mse="longer_alt",Ise="line_breaks",Ose="start_chars_hint";o(HT,"createToken");o(fFe,"createTokenInternal");oo=HT({name:"EOF",pattern:oi.NA});Pu([oo]);o(n0,"createTokenInstance");o(o2,"tokenMatcher")});var Fu,Pse,Bl,tg=M(()=>{"use strict";i0();Ht();ns();Fu={buildMismatchTokenMessage({expected:t,actual:e,previous:r,ruleName:n}){return`Expecting ${SR(t)?`--> ${Bu(t)} <--`:`token of type --> ${t.name} <--`} but found --> '${e.image}' <--`},buildNotAllInputParsedMessage({firstRedundant:t,ruleName:e}){return"Redundant input, expecting EOF but found: "+t.image},buildNoViableAltMessage({expectedPathsPerAlt:t,actual:e,previous:r,customUserDescription:n,ruleName:i}){let a="Expecting: ",l=` +but found: '`+ra(e).image+"'";if(n)return a+n+l;{let u=qr(t,(p,m)=>p.concat(m),[]),h=Je(u,p=>`[${Je(p,m=>Bu(m)).join(", ")}]`),d=`one of these possible Token sequences: +${Je(h,(p,m)=>` ${m+1}. ${p}`).join(` +`)}`;return a+d+l}},buildEarlyExitMessage({expectedIterationPaths:t,actual:e,customUserDescription:r,ruleName:n}){let i="Expecting: ",s=` +but found: '`+ra(e).image+"'";if(r)return i+r+s;{let u=`expecting at least one iteration which starts with one of these possible Token sequences:: + <${Je(t,h=>`[${Je(h,f=>Bu(f)).join(",")}]`).join(" ,")}>`;return i+u+s}}};Object.freeze(Fu);Pse={buildRuleNotFoundError(t,e){return"Invalid grammar, reference to a rule which is not defined: ->"+e.nonTerminalName+`<- +inside top level rule: ->`+t.name+"<-"}},Bl={buildDuplicateFoundError(t,e){function r(f){return f instanceof kr?f.terminalType.name:f instanceof nn?f.nonTerminalName:""}o(r,"getExtraProductionArgument");let n=t.name,i=ra(e),a=i.idx,s=Ms(i),l=r(i),u=a>0,h=`->${s}${u?a:""}<- ${l?`with argument: ->${l}<-`:""} + appears more than once (${e.length} times) in the top level rule: ->${n}<-. + For further details see: https://chevrotain.io/docs/FAQ.html#NUMERICAL_SUFFIXES + `;return h=h.replace(/[ \t]+/g," "),h=h.replace(/\s\s+/g,` +`),h},buildNamespaceConflictError(t){return`Namespace conflict found in grammar. +The grammar has both a Terminal(Token) and a Non-Terminal(Rule) named: <${t.name}>. +To resolve this make sure each Terminal and Non-Terminal names are unique +This is easy to accomplish by using the convention that Terminal names start with an uppercase letter +and Non-Terminal names start with a lower case letter.`},buildAlternationPrefixAmbiguityError(t){let e=Je(t.prefixPath,i=>Bu(i)).join(", "),r=t.alternation.idx===0?"":t.alternation.idx;return`Ambiguous alternatives: <${t.ambiguityIndices.join(" ,")}> due to common lookahead prefix +in <OR${r}> inside <${t.topLevelRule.name}> Rule, +<${e}> may appears as a prefix path in all these alternatives. +See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#COMMON_PREFIX +For Further details.`},buildAlternationAmbiguityError(t){let e=Je(t.prefixPath,i=>Bu(i)).join(", "),r=t.alternation.idx===0?"":t.alternation.idx,n=`Ambiguous Alternatives Detected: <${t.ambiguityIndices.join(" ,")}> in <OR${r}> inside <${t.topLevelRule.name}> Rule, +<${e}> may appears as a prefix path in all these alternatives. +`;return n=n+`See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#AMBIGUOUS_ALTERNATIVES +For Further details.`,n},buildEmptyRepetitionError(t){let e=Ms(t.repetition);return t.repetition.idx!==0&&(e+=t.repetition.idx),`The repetition <${e}> within Rule <${t.topLevelRule.name}> can never consume any tokens. +This could lead to an infinite loop.`},buildTokenNameError(t){return"deprecated"},buildEmptyAlternationError(t){return`Ambiguous empty alternative: <${t.emptyChoiceIdx+1}> in <OR${t.alternation.idx}> inside <${t.topLevelRule.name}> Rule. +Only the last alternative may be an empty alternative.`},buildTooManyAlternativesError(t){return`An Alternation cannot have more than 256 alternatives: +<OR${t.alternation.idx}> inside <${t.topLevelRule.name}> Rule. + has ${t.alternation.definition.length+1} alternatives.`},buildLeftRecursionError(t){let e=t.topLevelRule.name,r=Je(t.leftRecursionPath,a=>a.name),n=`${e} --> ${r.concat([e]).join(" --> ")}`;return`Left Recursion found in grammar. +rule: <${e}> can be invoked from itself (directly or indirectly) +without consuming any Tokens. The grammar path that causes this is: + ${n} + To fix this refactor your grammar to remove the left recursion. +see: https://en.wikipedia.org/wiki/LL_parser#Left_factoring.`},buildInvalidRuleNameError(t){return"deprecated"},buildDuplicateRuleNameError(t){let e;return t.topLevelRule instanceof ts?e=t.topLevelRule.name:e=t.topLevelRule,`Duplicate definition, rule: ->${e}<- is already defined in the grammar: ->${t.grammarName}<-`}}});function Bse(t,e){let r=new CR(t,e);return r.resolveRefs(),r.errors}var CR,Fse=M(()=>{"use strict";Is();Ht();ns();o(Bse,"resolveGrammar");CR=class extends rs{static{o(this,"GastRefResolverVisitor")}constructor(e,r){super(),this.nameToTopRule=e,this.errMsgProvider=r,this.errors=[]}resolveRefs(){Ce(br(this.nameToTopRule),e=>{this.currTopLevel=e,e.accept(this)})}visitNonTerminal(e){let r=this.nameToTopRule[e.nonTerminalName];if(r)e.referencedRule=r;else{let n=this.errMsgProvider.buildRuleNotFoundError(this.currTopLevel,e);this.errors.push({message:n,type:zi.UNRESOLVED_SUBRULE_REF,ruleName:this.currTopLevel.name,unresolvedRefName:e.nonTerminalName})}}}});function XT(t,e,r=[]){r=rn(r);let n=[],i=0;function a(l){return l.concat(mi(t,i+1))}o(a,"remainingPathWith");function s(l){let u=XT(a(l),e,r);return n.concat(u)}for(o(s,"getAlternativesForProd");r.length<e&&i<t.length;){let l=t[i];if(l instanceof Cn)return s(l.definition);if(l instanceof nn)return s(l.definition);if(l instanceof an)n=s(l.definition);else if(l instanceof An){let u=l.definition.concat([new Lr({definition:l.definition})]);return s(u)}else if(l instanceof _n){let u=[new Cn({definition:l.definition}),new Lr({definition:[new kr({terminalType:l.separator})].concat(l.definition)})];return s(u)}else if(l instanceof vn){let u=l.definition.concat([new Lr({definition:[new kr({terminalType:l.separator})].concat(l.definition)})]);n=s(u)}else if(l instanceof Lr){let u=l.definition.concat([new Lr({definition:l.definition})]);n=s(u)}else{if(l instanceof xn)return Ce(l.definition,u=>{cr(u.definition)===!1&&(n=s(u.definition))}),n;if(l instanceof kr)r.push(l.terminalType);else throw Error("non exhaustive match")}i++}return n.push({partialPath:r,suffixDef:mi(t,i)}),n}function jT(t,e,r,n){let i="EXIT_NONE_TERMINAL",a=[i],s="EXIT_ALTERNATIVE",l=!1,u=e.length,h=u-n-1,f=[],d=[];for(d.push({idx:-1,def:t,ruleStack:[],occurrenceStack:[]});!cr(d);){let p=d.pop();if(p===s){l&&fa(d).idx<=h&&d.pop();continue}let m=p.def,g=p.idx,y=p.ruleStack,v=p.occurrenceStack;if(cr(m))continue;let x=m[0];if(x===i){let b={idx:g,def:mi(m),ruleStack:Lu(y),occurrenceStack:Lu(v)};d.push(b)}else if(x instanceof kr)if(g<u-1){let b=g+1,w=e[b];if(r(w,x.terminalType)){let _={idx:b,def:mi(m),ruleStack:y,occurrenceStack:v};d.push(_)}}else if(g===u-1)f.push({nextTokenType:x.terminalType,nextTokenOccurrence:x.idx,ruleStack:y,occurrenceStack:v}),l=!0;else throw Error("non exhaustive match");else if(x instanceof nn){let b=rn(y);b.push(x.nonTerminalName);let w=rn(v);w.push(x.idx);let _={idx:g,def:x.definition.concat(a,mi(m)),ruleStack:b,occurrenceStack:w};d.push(_)}else if(x instanceof an){let b={idx:g,def:mi(m),ruleStack:y,occurrenceStack:v};d.push(b),d.push(s);let w={idx:g,def:x.definition.concat(mi(m)),ruleStack:y,occurrenceStack:v};d.push(w)}else if(x instanceof An){let b=new Lr({definition:x.definition,idx:x.idx}),w=x.definition.concat([b],mi(m)),_={idx:g,def:w,ruleStack:y,occurrenceStack:v};d.push(_)}else if(x instanceof _n){let b=new kr({terminalType:x.separator}),w=new Lr({definition:[b].concat(x.definition),idx:x.idx}),_=x.definition.concat([w],mi(m)),T={idx:g,def:_,ruleStack:y,occurrenceStack:v};d.push(T)}else if(x instanceof vn){let b={idx:g,def:mi(m),ruleStack:y,occurrenceStack:v};d.push(b),d.push(s);let w=new kr({terminalType:x.separator}),_=new Lr({definition:[w].concat(x.definition),idx:x.idx}),T=x.definition.concat([_],mi(m)),E={idx:g,def:T,ruleStack:y,occurrenceStack:v};d.push(E)}else if(x instanceof Lr){let b={idx:g,def:mi(m),ruleStack:y,occurrenceStack:v};d.push(b),d.push(s);let w=new Lr({definition:x.definition,idx:x.idx}),_=x.definition.concat([w],mi(m)),T={idx:g,def:_,ruleStack:y,occurrenceStack:v};d.push(T)}else if(x instanceof xn)for(let b=x.definition.length-1;b>=0;b--){let w=x.definition[b],_={idx:g,def:w.definition.concat(mi(m)),ruleStack:y,occurrenceStack:v};d.push(_),d.push(s)}else if(x instanceof Cn)d.push({idx:g,def:x.definition.concat(mi(m)),ruleStack:y,occurrenceStack:v});else if(x instanceof ts)d.push(dFe(x,g,y,v));else throw Error("non exhaustive match")}return f}function dFe(t,e,r,n){let i=rn(r);i.push(t.name);let a=rn(n);return a.push(1),{idx:e,def:t.definition,ruleStack:i,occurrenceStack:a}}var AR,WT,rg,YT,l2,qT,c2,u2=M(()=>{"use strict";Ht();dR();PT();ns();AR=class extends Iu{static{o(this,"AbstractNextPossibleTokensWalker")}constructor(e,r){super(),this.topProd=e,this.path=r,this.possibleTokTypes=[],this.nextProductionName="",this.nextProductionOccurrence=0,this.found=!1,this.isAtEndOfPath=!1}startWalking(){if(this.found=!1,this.path.ruleStack[0]!==this.topProd.name)throw Error("The path does not start with the walker's top Rule!");return this.ruleStack=rn(this.path.ruleStack).reverse(),this.occurrenceStack=rn(this.path.occurrenceStack).reverse(),this.ruleStack.pop(),this.occurrenceStack.pop(),this.updateExpectedNext(),this.walk(this.topProd),this.possibleTokTypes}walk(e,r=[]){this.found||super.walk(e,r)}walkProdRef(e,r,n){if(e.referencedRule.name===this.nextProductionName&&e.idx===this.nextProductionOccurrence){let i=r.concat(n);this.updateExpectedNext(),this.walk(e.referencedRule,i)}}updateExpectedNext(){cr(this.ruleStack)?(this.nextProductionName="",this.nextProductionOccurrence=0,this.isAtEndOfPath=!0):(this.nextProductionName=this.ruleStack.pop(),this.nextProductionOccurrence=this.occurrenceStack.pop())}},WT=class extends AR{static{o(this,"NextAfterTokenWalker")}constructor(e,r){super(e,r),this.path=r,this.nextTerminalName="",this.nextTerminalOccurrence=0,this.nextTerminalName=this.path.lastTok.name,this.nextTerminalOccurrence=this.path.lastTokOccurrence}walkTerminal(e,r,n){if(this.isAtEndOfPath&&e.terminalType.name===this.nextTerminalName&&e.idx===this.nextTerminalOccurrence&&!this.found){let i=r.concat(n),a=new Cn({definition:i});this.possibleTokTypes=e0(a),this.found=!0}}},rg=class extends Iu{static{o(this,"AbstractNextTerminalAfterProductionWalker")}constructor(e,r){super(),this.topRule=e,this.occurrence=r,this.result={token:void 0,occurrence:void 0,isEndOfRule:void 0}}startWalking(){return this.walk(this.topRule),this.result}},YT=class extends rg{static{o(this,"NextTerminalAfterManyWalker")}walkMany(e,r,n){if(e.idx===this.occurrence){let i=ra(r.concat(n));this.result.isEndOfRule=i===void 0,i instanceof kr&&(this.result.token=i.terminalType,this.result.occurrence=i.idx)}else super.walkMany(e,r,n)}},l2=class extends rg{static{o(this,"NextTerminalAfterManySepWalker")}walkManySep(e,r,n){if(e.idx===this.occurrence){let i=ra(r.concat(n));this.result.isEndOfRule=i===void 0,i instanceof kr&&(this.result.token=i.terminalType,this.result.occurrence=i.idx)}else super.walkManySep(e,r,n)}},qT=class extends rg{static{o(this,"NextTerminalAfterAtLeastOneWalker")}walkAtLeastOne(e,r,n){if(e.idx===this.occurrence){let i=ra(r.concat(n));this.result.isEndOfRule=i===void 0,i instanceof kr&&(this.result.token=i.terminalType,this.result.occurrence=i.idx)}else super.walkAtLeastOne(e,r,n)}},c2=class extends rg{static{o(this,"NextTerminalAfterAtLeastOneSepWalker")}walkAtLeastOneSep(e,r,n){if(e.idx===this.occurrence){let i=ra(r.concat(n));this.result.isEndOfRule=i===void 0,i instanceof kr&&(this.result.token=i.terminalType,this.result.occurrence=i.idx)}else super.walkAtLeastOneSep(e,r,n)}};o(XT,"possiblePathsFrom");o(jT,"nextPossibleTokensAfter");o(dFe,"expandTopLevelRule")});function h2(t){if(t instanceof an||t==="Option")return Yn.OPTION;if(t instanceof Lr||t==="Repetition")return Yn.REPETITION;if(t instanceof An||t==="RepetitionMandatory")return Yn.REPETITION_MANDATORY;if(t instanceof _n||t==="RepetitionMandatoryWithSeparator")return Yn.REPETITION_MANDATORY_WITH_SEPARATOR;if(t instanceof vn||t==="RepetitionWithSeparator")return Yn.REPETITION_WITH_SEPARATOR;if(t instanceof xn||t==="Alternation")return Yn.ALTERNATION;throw Error("non exhaustive match")}function QT(t){let{occurrence:e,rule:r,prodType:n,maxLookahead:i}=t,a=h2(n);return a===Yn.ALTERNATION?ng(e,r,i):ig(e,r,a,i)}function Gse(t,e,r,n,i,a){let s=ng(t,e,r),l=Yse(s)?eg:Ou;return a(s,n,l,i)}function $se(t,e,r,n,i,a){let s=ig(t,e,i,r),l=Yse(s)?eg:Ou;return a(s[0],l,n)}function Vse(t,e,r,n){let i=t.length,a=Ra(t,s=>Ra(s,l=>l.length===1));if(e)return function(s){let l=Je(s,u=>u.GATE);for(let u=0;u<i;u++){let h=t[u],f=h.length,d=l[u];if(!(d!==void 0&&d.call(this)===!1))e:for(let p=0;p<f;p++){let m=h[p],g=m.length;for(let y=0;y<g;y++){let v=this.LA(y+1);if(r(v,m[y])===!1)continue e}return u}}};if(a&&!n){let s=Je(t,u=>Wr(u)),l=qr(s,(u,h,f)=>(Ce(h,d=>{It(u,d.tokenTypeIdx)||(u[d.tokenTypeIdx]=f),Ce(d.categoryMatches,p=>{It(u,p)||(u[p]=f)})}),u),{});return function(){let u=this.LA(1);return l[u.tokenTypeIdx]}}else return function(){for(let s=0;s<i;s++){let l=t[s],u=l.length;e:for(let h=0;h<u;h++){let f=l[h],d=f.length;for(let p=0;p<d;p++){let m=this.LA(p+1);if(r(m,f[p])===!1)continue e}return s}}}}function Use(t,e,r){let n=Ra(t,a=>a.length===1),i=t.length;if(n&&!r){let a=Wr(t);if(a.length===1&&cr(a[0].categoryMatches)){let l=a[0].tokenTypeIdx;return function(){return this.LA(1).tokenTypeIdx===l}}else{let s=qr(a,(l,u,h)=>(l[u.tokenTypeIdx]=!0,Ce(u.categoryMatches,f=>{l[f]=!0}),l),[]);return function(){let l=this.LA(1);return s[l.tokenTypeIdx]===!0}}}else return function(){e:for(let a=0;a<i;a++){let s=t[a],l=s.length;for(let u=0;u<l;u++){let h=this.LA(u+1);if(e(h,s[u])===!1)continue e}return!0}return!1}}function zse(t){let e=new Array(t);for(let r=0;r<t;r++)e[r]=[];return e}function _R(t){let e=[""];for(let r=0;r<t.length;r++){let n=t[r],i=[];for(let a=0;a<e.length;a++){let s=e[a];i.push(s+"_"+n.tokenTypeIdx);for(let l=0;l<n.categoryMatches.length;l++){let u="_"+n.categoryMatches[l];i.push(s+u)}}e=i}return e}function pFe(t,e,r){for(let n=0;n<t.length;n++){if(n===r)continue;let i=t[n];for(let a=0;a<e.length;a++){let s=e[a];if(i[s]===!0)return!1}}return!0}function Hse(t,e){let r=Je(t,s=>XT([s],1)),n=zse(r.length),i=Je(r,s=>{let l={};return Ce(s,u=>{let h=_R(u.partialPath);Ce(h,f=>{l[f]=!0})}),l}),a=r;for(let s=1;s<=e;s++){let l=a;a=zse(l.length);for(let u=0;u<l.length;u++){let h=l[u];for(let f=0;f<h.length;f++){let d=h[f].partialPath,p=h[f].suffixDef,m=_R(d);if(pFe(i,m,u)||cr(p)||d.length===e){let y=n[u];if(ZT(y,d)===!1){y.push(d);for(let v=0;v<m.length;v++){let x=m[v];i[u][x]=!0}}}else{let y=XT(p,s+1,d);a[u]=a[u].concat(y),Ce(y,v=>{let x=_R(v.partialPath);Ce(x,b=>{i[u][b]=!0})})}}}}return n}function ng(t,e,r,n){let i=new KT(t,Yn.ALTERNATION,n);return e.accept(i),Hse(i.result,r)}function ig(t,e,r,n){let i=new KT(t,r);e.accept(i);let a=i.result,l=new LR(e,t,r).startWalking(),u=new Cn({definition:a}),h=new Cn({definition:l});return Hse([u,h],n)}function ZT(t,e){e:for(let r=0;r<t.length;r++){let n=t[r];if(n.length===e.length){for(let i=0;i<n.length;i++){let a=e[i],s=n[i];if((a===s||s.categoryMatchesMap[a.tokenTypeIdx]!==void 0)===!1)continue e}return!0}}return!1}function Wse(t,e){return t.length<e.length&&Ra(t,(r,n)=>{let i=e[n];return r===i||i.categoryMatchesMap[r.tokenTypeIdx]})}function Yse(t){return Ra(t,e=>Ra(e,r=>Ra(r,n=>cr(n.categoryMatches))))}var Yn,LR,KT,ag=M(()=>{"use strict";Ht();u2();PT();r0();ns();(function(t){t[t.OPTION=0]="OPTION",t[t.REPETITION=1]="REPETITION",t[t.REPETITION_MANDATORY=2]="REPETITION_MANDATORY",t[t.REPETITION_MANDATORY_WITH_SEPARATOR=3]="REPETITION_MANDATORY_WITH_SEPARATOR",t[t.REPETITION_WITH_SEPARATOR=4]="REPETITION_WITH_SEPARATOR",t[t.ALTERNATION=5]="ALTERNATION"})(Yn||(Yn={}));o(h2,"getProdType");o(QT,"getLookaheadPaths");o(Gse,"buildLookaheadFuncForOr");o($se,"buildLookaheadFuncForOptionalProd");o(Vse,"buildAlternativesLookAheadFunc");o(Use,"buildSingleAlternativeLookaheadFunction");LR=class extends Iu{static{o(this,"RestDefinitionFinderWalker")}constructor(e,r,n){super(),this.topProd=e,this.targetOccurrence=r,this.targetProdType=n}startWalking(){return this.walk(this.topProd),this.restDef}checkIsTarget(e,r,n,i){return e.idx===this.targetOccurrence&&this.targetProdType===r?(this.restDef=n.concat(i),!0):!1}walkOption(e,r,n){this.checkIsTarget(e,Yn.OPTION,r,n)||super.walkOption(e,r,n)}walkAtLeastOne(e,r,n){this.checkIsTarget(e,Yn.REPETITION_MANDATORY,r,n)||super.walkOption(e,r,n)}walkAtLeastOneSep(e,r,n){this.checkIsTarget(e,Yn.REPETITION_MANDATORY_WITH_SEPARATOR,r,n)||super.walkOption(e,r,n)}walkMany(e,r,n){this.checkIsTarget(e,Yn.REPETITION,r,n)||super.walkOption(e,r,n)}walkManySep(e,r,n){this.checkIsTarget(e,Yn.REPETITION_WITH_SEPARATOR,r,n)||super.walkOption(e,r,n)}},KT=class extends rs{static{o(this,"InsideDefinitionFinderVisitor")}constructor(e,r,n){super(),this.targetOccurrence=e,this.targetProdType=r,this.targetRef=n,this.result=[]}checkIsTarget(e,r){e.idx===this.targetOccurrence&&this.targetProdType===r&&(this.targetRef===void 0||e===this.targetRef)&&(this.result=e.definition)}visitOption(e){this.checkIsTarget(e,Yn.OPTION)}visitRepetition(e){this.checkIsTarget(e,Yn.REPETITION)}visitRepetitionMandatory(e){this.checkIsTarget(e,Yn.REPETITION_MANDATORY)}visitRepetitionMandatoryWithSeparator(e){this.checkIsTarget(e,Yn.REPETITION_MANDATORY_WITH_SEPARATOR)}visitRepetitionWithSeparator(e){this.checkIsTarget(e,Yn.REPETITION_WITH_SEPARATOR)}visitAlternation(e){this.checkIsTarget(e,Yn.ALTERNATION)}};o(zse,"initializeArrayOfArrays");o(_R,"pathToHashKeys");o(pFe,"isUniquePrefixHash");o(Hse,"lookAheadSequenceFromAlternatives");o(ng,"getLookaheadPathsForOr");o(ig,"getLookaheadPathsForOptionalProd");o(ZT,"containsPath");o(Wse,"isStrictPrefixOfPath");o(Yse,"areTokenCategoriesNotUsed")});function qse(t){let e=t.lookaheadStrategy.validate({rules:t.rules,tokenTypes:t.tokenTypes,grammarName:t.grammarName});return Je(e,r=>Object.assign({type:zi.CUSTOM_LOOKAHEAD_VALIDATION},r))}function Xse(t,e,r,n){let i=da(t,u=>mFe(u,r)),a=wFe(t,e,r),s=da(t,u=>vFe(u,r)),l=da(t,u=>yFe(u,t,n,r));return i.concat(a,s,l)}function mFe(t,e){let r=new DR;t.accept(r);let n=r.allProductions,i=UL(n,gFe),a=Ds(i,l=>l.length>1);return Je(br(a),l=>{let u=ra(l),h=e.buildDuplicateFoundError(t,l),f=Ms(u),d={message:h,type:zi.DUPLICATE_PRODUCTIONS,ruleName:t.name,dslName:f,occurrence:u.idx},p=jse(u);return p&&(d.parameter=p),d})}function gFe(t){return`${Ms(t)}_#_${t.idx}_#_${jse(t)}`}function jse(t){return t instanceof kr?t.terminalType.name:t instanceof nn?t.nonTerminalName:""}function yFe(t,e,r,n){let i=[];if(qr(e,(s,l)=>l.name===t.name?s+1:s,0)>1){let s=n.buildDuplicateRuleNameError({topLevelRule:t,grammarName:r});i.push({message:s,type:zi.DUPLICATE_RULE_NAME,ruleName:t.name})}return i}function Kse(t,e,r){let n=[],i;return Hn(e,t)||(i=`Invalid rule override, rule: ->${t}<- cannot be overridden in the grammar: ->${r}<-as it is not defined in any of the super grammars `,n.push({message:i,type:zi.INVALID_RULE_OVERRIDE,ruleName:t})),n}function RR(t,e,r,n=[]){let i=[],a=JT(e.definition);if(cr(a))return[];{let s=t.name;Hn(a,t)&&i.push({message:r.buildLeftRecursionError({topLevelRule:t,leftRecursionPath:n}),type:zi.LEFT_RECURSION,ruleName:s});let u=Xh(a,n.concat([t])),h=da(u,f=>{let d=rn(n);return d.push(f),RR(t,f,r,d)});return i.concat(h)}}function JT(t){let e=[];if(cr(t))return e;let r=ra(t);if(r instanceof nn)e.push(r.referencedRule);else if(r instanceof Cn||r instanceof an||r instanceof An||r instanceof _n||r instanceof vn||r instanceof Lr)e=e.concat(JT(r.definition));else if(r instanceof xn)e=Wr(Je(r.definition,a=>JT(a.definition)));else if(!(r instanceof kr))throw Error("non exhaustive match");let n=Jd(r),i=t.length>1;if(n&&i){let a=mi(t);return e.concat(JT(a))}else return e}function Qse(t,e){let r=new f2;t.accept(r);let n=r.alternations;return da(n,a=>{let s=Lu(a.definition);return da(s,(l,u)=>{let h=jT([l],[],Ou,1);return cr(h)?[{message:e.buildEmptyAlternationError({topLevelRule:t,alternation:a,emptyChoiceIdx:u}),type:zi.NONE_LAST_EMPTY_ALT,ruleName:t.name,occurrence:a.idx,alternative:u+1}]:[]})})}function Zse(t,e,r){let n=new f2;t.accept(n);let i=n.alternations;return i=jh(i,s=>s.ignoreAmbiguities===!0),da(i,s=>{let l=s.idx,u=s.maxLookahead||e,h=ng(l,t,u,s),f=xFe(h,s,t,r),d=bFe(h,s,t,r);return f.concat(d)})}function vFe(t,e){let r=new f2;t.accept(r);let n=r.alternations;return da(n,a=>a.definition.length>255?[{message:e.buildTooManyAlternativesError({topLevelRule:t,alternation:a}),type:zi.TOO_MANY_ALTS,ruleName:t.name,occurrence:a.idx}]:[])}function Jse(t,e,r){let n=[];return Ce(t,i=>{let a=new NR;i.accept(a);let s=a.allProductions;Ce(s,l=>{let u=h2(l),h=l.maxLookahead||e,f=l.idx,p=ig(f,i,u,h)[0];if(cr(Wr(p))){let m=r.buildEmptyRepetitionError({topLevelRule:i,repetition:l});n.push({message:m,type:zi.NO_NON_EMPTY_LOOKAHEAD,ruleName:i.name})}})}),n}function xFe(t,e,r,n){let i=[],a=qr(t,(l,u,h)=>(e.definition[h].ignoreAmbiguities===!0||Ce(u,f=>{let d=[h];Ce(t,(p,m)=>{h!==m&&ZT(p,f)&&e.definition[m].ignoreAmbiguities!==!0&&d.push(m)}),d.length>1&&!ZT(i,f)&&(i.push(f),l.push({alts:d,path:f}))}),l),[]);return Je(a,l=>{let u=Je(l.alts,f=>f+1);return{message:n.buildAlternationAmbiguityError({topLevelRule:r,alternation:e,ambiguityIndices:u,prefixPath:l.path}),type:zi.AMBIGUOUS_ALTS,ruleName:r.name,occurrence:e.idx,alternatives:l.alts}})}function bFe(t,e,r,n){let i=qr(t,(s,l,u)=>{let h=Je(l,f=>({idx:u,path:f}));return s.concat(h)},[]);return Tc(da(i,s=>{if(e.definition[s.idx].ignoreAmbiguities===!0)return[];let u=s.idx,h=s.path,f=Yr(i,p=>e.definition[p.idx].ignoreAmbiguities!==!0&&p.idx<u&&Wse(p.path,h));return Je(f,p=>{let m=[p.idx+1,u+1],g=e.idx===0?"":e.idx;return{message:n.buildAlternationPrefixAmbiguityError({topLevelRule:r,alternation:e,ambiguityIndices:m,prefixPath:p.path}),type:zi.AMBIGUOUS_PREFIX_ALTS,ruleName:r.name,occurrence:g,alternatives:m}})}))}function wFe(t,e,r){let n=[],i=Je(e,a=>a.name);return Ce(t,a=>{let s=a.name;if(Hn(i,s)){let l=r.buildNamespaceConflictError(a);n.push({message:l,type:zi.CONFLICT_TOKENS_RULES_NAMESPACE,ruleName:s})}}),n}var DR,f2,NR,d2=M(()=>{"use strict";Ht();Is();ns();ag();u2();r0();o(qse,"validateLookahead");o(Xse,"validateGrammar");o(mFe,"validateDuplicateProductions");o(gFe,"identifyProductionForDuplicates");o(jse,"getExtraProductionArgument");DR=class extends rs{static{o(this,"OccurrenceValidationCollector")}constructor(){super(...arguments),this.allProductions=[]}visitNonTerminal(e){this.allProductions.push(e)}visitOption(e){this.allProductions.push(e)}visitRepetitionWithSeparator(e){this.allProductions.push(e)}visitRepetitionMandatory(e){this.allProductions.push(e)}visitRepetitionMandatoryWithSeparator(e){this.allProductions.push(e)}visitRepetition(e){this.allProductions.push(e)}visitAlternation(e){this.allProductions.push(e)}visitTerminal(e){this.allProductions.push(e)}};o(yFe,"validateRuleDoesNotAlreadyExist");o(Kse,"validateRuleIsOverridden");o(RR,"validateNoLeftRecursion");o(JT,"getFirstNoneTerminal");f2=class extends rs{static{o(this,"OrCollector")}constructor(){super(...arguments),this.alternations=[]}visitAlternation(e){this.alternations.push(e)}};o(Qse,"validateEmptyOrAlternative");o(Zse,"validateAmbiguousAlternationAlternatives");NR=class extends rs{static{o(this,"RepetitionCollector")}constructor(){super(...arguments),this.allProductions=[]}visitRepetitionWithSeparator(e){this.allProductions.push(e)}visitRepetitionMandatory(e){this.allProductions.push(e)}visitRepetitionMandatoryWithSeparator(e){this.allProductions.push(e)}visitRepetition(e){this.allProductions.push(e)}};o(vFe,"validateTooManyAlts");o(Jse,"validateSomeNonEmptyLookaheadPath");o(xFe,"checkAlternativesAmbiguities");o(bFe,"checkPrefixAlternativesAmbiguities");o(wFe,"checkTerminalAndNoneTerminalsNameSpace")});function eoe(t){let e=qh(t,{errMsgProvider:Pse}),r={};return Ce(t.rules,n=>{r[n.name]=n}),Bse(r,e.errMsgProvider)}function toe(t){return t=qh(t,{errMsgProvider:Bl}),Xse(t.rules,t.tokenTypes,t.errMsgProvider,t.grammarName)}var roe=M(()=>{"use strict";Ht();Fse();d2();tg();o(eoe,"resolveGrammar");o(toe,"validateGrammar")});function rf(t){return Hn(ooe,t.name)}var noe,ioe,aoe,soe,ooe,sg,a0,p2,m2,g2,og=M(()=>{"use strict";Ht();noe="MismatchedTokenException",ioe="NoViableAltException",aoe="EarlyExitException",soe="NotAllInputParsedException",ooe=[noe,ioe,aoe,soe];Object.freeze(ooe);o(rf,"isRecognitionException");sg=class extends Error{static{o(this,"RecognitionException")}constructor(e,r){super(e),this.token=r,this.resyncedTokens=[],Object.setPrototypeOf(this,new.target.prototype),Error.captureStackTrace&&Error.captureStackTrace(this,this.constructor)}},a0=class extends sg{static{o(this,"MismatchedTokenException")}constructor(e,r,n){super(e,r),this.previousToken=n,this.name=noe}},p2=class extends sg{static{o(this,"NoViableAltException")}constructor(e,r,n){super(e,r),this.previousToken=n,this.name=ioe}},m2=class extends sg{static{o(this,"NotAllInputParsedException")}constructor(e,r){super(e,r),this.name=soe}},g2=class extends sg{static{o(this,"EarlyExitException")}constructor(e,r,n){super(e,r),this.previousToken=n,this.name=aoe}}});function TFe(t,e,r,n,i,a,s){let l=this.getKeyForAutomaticLookahead(n,i),u=this.firstAfterRepMap[l];if(u===void 0){let p=this.getCurrRuleFullName(),m=this.getGAstProductions()[p];u=new a(m,i).startWalking(),this.firstAfterRepMap[l]=u}let h=u.token,f=u.occurrence,d=u.isEndOfRule;this.RULE_STACK.length===1&&d&&h===void 0&&(h=oo,f=1),!(h===void 0||f===void 0)&&this.shouldInRepetitionRecoveryBeTried(h,f,s)&&this.tryInRepetitionRecovery(t,e,r,h)}var MR,OR,IR,ek,PR=M(()=>{"use strict";i0();Ht();og();pR();Is();MR={},OR="InRuleRecoveryException",IR=class extends Error{static{o(this,"InRuleRecoveryException")}constructor(e){super(e),this.name=OR}},ek=class{static{o(this,"Recoverable")}initRecoverable(e){this.firstAfterRepMap={},this.resyncFollows={},this.recoveryEnabled=It(e,"recoveryEnabled")?e.recoveryEnabled:is.recoveryEnabled,this.recoveryEnabled&&(this.attemptInRepetitionRecovery=TFe)}getTokenToInsert(e){let r=n0(e,"",NaN,NaN,NaN,NaN,NaN,NaN);return r.isInsertedInRecovery=!0,r}canTokenTypeBeInsertedInRecovery(e){return!0}canTokenTypeBeDeletedInRecovery(e){return!0}tryInRepetitionRecovery(e,r,n,i){let a=this.findReSyncTokenType(),s=this.exportLexerState(),l=[],u=!1,h=this.LA(1),f=this.LA(1),d=o(()=>{let p=this.LA(0),m=this.errorMessageProvider.buildMismatchTokenMessage({expected:i,actual:h,previous:p,ruleName:this.getCurrRuleFullName()}),g=new a0(m,h,this.LA(0));g.resyncedTokens=Lu(l),this.SAVE_ERROR(g)},"generateErrorMessage");for(;!u;)if(this.tokenMatcher(f,i)){d();return}else if(n.call(this)){d(),e.apply(this,r);return}else this.tokenMatcher(f,a)?u=!0:(f=this.SKIP_TOKEN(),this.addToResyncTokens(f,l));this.importLexerState(s)}shouldInRepetitionRecoveryBeTried(e,r,n){return!(n===!1||this.tokenMatcher(this.LA(1),e)||this.isBackTracking()||this.canPerformInRuleRecovery(e,this.getFollowsForInRuleRecovery(e,r)))}getFollowsForInRuleRecovery(e,r){let n=this.getCurrentGrammarPath(e,r);return this.getNextPossibleTokenTypes(n)}tryInRuleRecovery(e,r){if(this.canRecoverWithSingleTokenInsertion(e,r))return this.getTokenToInsert(e);if(this.canRecoverWithSingleTokenDeletion(e)){let n=this.SKIP_TOKEN();return this.consumeToken(),n}throw new IR("sad sad panda")}canPerformInRuleRecovery(e,r){return this.canRecoverWithSingleTokenInsertion(e,r)||this.canRecoverWithSingleTokenDeletion(e)}canRecoverWithSingleTokenInsertion(e,r){if(!this.canTokenTypeBeInsertedInRecovery(e)||cr(r))return!1;let n=this.LA(1);return Za(r,a=>this.tokenMatcher(n,a))!==void 0}canRecoverWithSingleTokenDeletion(e){return this.canTokenTypeBeDeletedInRecovery(e)?this.tokenMatcher(this.LA(2),e):!1}isInCurrentRuleReSyncSet(e){let r=this.getCurrFollowKey(),n=this.getFollowSetFromFollowKey(r);return Hn(n,e)}findReSyncTokenType(){let e=this.flattenFollowSet(),r=this.LA(1),n=2;for(;;){let i=Za(e,a=>o2(r,a));if(i!==void 0)return i;r=this.LA(n),n++}}getCurrFollowKey(){if(this.RULE_STACK.length===1)return MR;let e=this.getLastExplicitRuleShortName(),r=this.getLastExplicitRuleOccurrenceIndex(),n=this.getPreviousExplicitRuleShortName();return{ruleName:this.shortRuleNameToFullName(e),idxInCallingRule:r,inRule:this.shortRuleNameToFullName(n)}}buildFullFollowKeyStack(){let e=this.RULE_STACK,r=this.RULE_OCCURRENCE_STACK;return Je(e,(n,i)=>i===0?MR:{ruleName:this.shortRuleNameToFullName(n),idxInCallingRule:r[i],inRule:this.shortRuleNameToFullName(e[i-1])})}flattenFollowSet(){let e=Je(this.buildFullFollowKeyStack(),r=>this.getFollowSetFromFollowKey(r));return Wr(e)}getFollowSetFromFollowKey(e){if(e===MR)return[oo];let r=e.ruleName+e.idxInCallingRule+BT+e.inRule;return this.resyncFollows[r]}addToResyncTokens(e,r){return this.tokenMatcher(e,oo)||r.push(e),r}reSyncTo(e){let r=[],n=this.LA(1);for(;this.tokenMatcher(n,e)===!1;)n=this.SKIP_TOKEN(),this.addToResyncTokens(n,r);return Lu(r)}attemptInRepetitionRecovery(e,r,n,i,a,s,l){}getCurrentGrammarPath(e,r){let n=this.getHumanReadableRuleStack(),i=rn(this.RULE_OCCURRENCE_STACK);return{ruleStack:n,occurrenceStack:i,lastTok:e,lastTokOccurrence:r}}getHumanReadableRuleStack(){return Je(this.RULE_STACK,e=>this.shortRuleNameToFullName(e))}};o(TFe,"attemptInRepetitionRecovery")});function tk(t,e,r){return r|e|t}var rk=M(()=>{"use strict";o(tk,"getKeyForAutomaticLookahead")});var zu,BR=M(()=>{"use strict";Ht();tg();Is();d2();ag();zu=class{static{o(this,"LLkLookaheadStrategy")}constructor(e){var r;this.maxLookahead=(r=e?.maxLookahead)!==null&&r!==void 0?r:is.maxLookahead}validate(e){let r=this.validateNoLeftRecursion(e.rules);if(cr(r)){let n=this.validateEmptyOrAlternatives(e.rules),i=this.validateAmbiguousAlternationAlternatives(e.rules,this.maxLookahead),a=this.validateSomeNonEmptyLookaheadPath(e.rules,this.maxLookahead);return[...r,...n,...i,...a]}return r}validateNoLeftRecursion(e){return da(e,r=>RR(r,r,Bl))}validateEmptyOrAlternatives(e){return da(e,r=>Qse(r,Bl))}validateAmbiguousAlternationAlternatives(e,r){return da(e,n=>Zse(n,r,Bl))}validateSomeNonEmptyLookaheadPath(e,r){return Jse(e,r,Bl)}buildLookaheadForAlternation(e){return Gse(e.prodOccurrence,e.rule,e.maxLookahead,e.hasPredicates,e.dynamicTokensEnabled,Vse)}buildLookaheadForOptional(e){return $se(e.prodOccurrence,e.rule,e.maxLookahead,e.dynamicTokensEnabled,h2(e.prodType),Use)}}});function kFe(t){nk.reset(),t.accept(nk);let e=nk.dslMethods;return nk.reset(),e}var ik,FR,nk,loe=M(()=>{"use strict";Ht();Is();rk();ns();BR();ik=class{static{o(this,"LooksAhead")}initLooksAhead(e){this.dynamicTokensEnabled=It(e,"dynamicTokensEnabled")?e.dynamicTokensEnabled:is.dynamicTokensEnabled,this.maxLookahead=It(e,"maxLookahead")?e.maxLookahead:is.maxLookahead,this.lookaheadStrategy=It(e,"lookaheadStrategy")?e.lookaheadStrategy:new zu({maxLookahead:this.maxLookahead}),this.lookAheadFuncsCache=new Map}preComputeLookaheadFunctions(e){Ce(e,r=>{this.TRACE_INIT(`${r.name} Rule Lookahead`,()=>{let{alternation:n,repetition:i,option:a,repetitionMandatory:s,repetitionMandatoryWithSeparator:l,repetitionWithSeparator:u}=kFe(r);Ce(n,h=>{let f=h.idx===0?"":h.idx;this.TRACE_INIT(`${Ms(h)}${f}`,()=>{let d=this.lookaheadStrategy.buildLookaheadForAlternation({prodOccurrence:h.idx,rule:r,maxLookahead:h.maxLookahead||this.maxLookahead,hasPredicates:h.hasPredicates,dynamicTokensEnabled:this.dynamicTokensEnabled}),p=tk(this.fullRuleNameToShort[r.name],256,h.idx);this.setLaFuncCache(p,d)})}),Ce(i,h=>{this.computeLookaheadFunc(r,h.idx,768,"Repetition",h.maxLookahead,Ms(h))}),Ce(a,h=>{this.computeLookaheadFunc(r,h.idx,512,"Option",h.maxLookahead,Ms(h))}),Ce(s,h=>{this.computeLookaheadFunc(r,h.idx,1024,"RepetitionMandatory",h.maxLookahead,Ms(h))}),Ce(l,h=>{this.computeLookaheadFunc(r,h.idx,1536,"RepetitionMandatoryWithSeparator",h.maxLookahead,Ms(h))}),Ce(u,h=>{this.computeLookaheadFunc(r,h.idx,1280,"RepetitionWithSeparator",h.maxLookahead,Ms(h))})})})}computeLookaheadFunc(e,r,n,i,a,s){this.TRACE_INIT(`${s}${r===0?"":r}`,()=>{let l=this.lookaheadStrategy.buildLookaheadForOptional({prodOccurrence:r,rule:e,maxLookahead:a||this.maxLookahead,dynamicTokensEnabled:this.dynamicTokensEnabled,prodType:i}),u=tk(this.fullRuleNameToShort[e.name],n,r);this.setLaFuncCache(u,l)})}getKeyForAutomaticLookahead(e,r){let n=this.getLastExplicitRuleShortName();return tk(n,e,r)}getLaFuncFromCache(e){return this.lookAheadFuncsCache.get(e)}setLaFuncCache(e,r){this.lookAheadFuncsCache.set(e,r)}},FR=class extends rs{static{o(this,"DslMethodsCollectorVisitor")}constructor(){super(...arguments),this.dslMethods={option:[],alternation:[],repetition:[],repetitionWithSeparator:[],repetitionMandatory:[],repetitionMandatoryWithSeparator:[]}}reset(){this.dslMethods={option:[],alternation:[],repetition:[],repetitionWithSeparator:[],repetitionMandatory:[],repetitionMandatoryWithSeparator:[]}}visitOption(e){this.dslMethods.option.push(e)}visitRepetitionWithSeparator(e){this.dslMethods.repetitionWithSeparator.push(e)}visitRepetitionMandatory(e){this.dslMethods.repetitionMandatory.push(e)}visitRepetitionMandatoryWithSeparator(e){this.dslMethods.repetitionMandatoryWithSeparator.push(e)}visitRepetition(e){this.dslMethods.repetition.push(e)}visitAlternation(e){this.dslMethods.alternation.push(e)}},nk=new FR;o(kFe,"collectMethods")});function $R(t,e){isNaN(t.startOffset)===!0?(t.startOffset=e.startOffset,t.endOffset=e.endOffset):t.endOffset<e.endOffset&&(t.endOffset=e.endOffset)}function VR(t,e){isNaN(t.startOffset)===!0?(t.startOffset=e.startOffset,t.startColumn=e.startColumn,t.startLine=e.startLine,t.endOffset=e.endOffset,t.endColumn=e.endColumn,t.endLine=e.endLine):t.endOffset<e.endOffset&&(t.endOffset=e.endOffset,t.endColumn=e.endColumn,t.endLine=e.endLine)}function coe(t,e,r){t.children[r]===void 0?t.children[r]=[e]:t.children[r].push(e)}function uoe(t,e,r){t.children[e]===void 0?t.children[e]=[r]:t.children[e].push(r)}var hoe=M(()=>{"use strict";o($R,"setNodeLocationOnlyOffset");o(VR,"setNodeLocationFull");o(coe,"addTerminalToCst");o(uoe,"addNoneTerminalToCst")});function UR(t,e){Object.defineProperty(t,EFe,{enumerable:!1,configurable:!0,writable:!1,value:e})}var EFe,foe=M(()=>{"use strict";EFe="name";o(UR,"defineNameProp")});function SFe(t,e){let r=zr(t),n=r.length;for(let i=0;i<n;i++){let a=r[i],s=t[a],l=s.length;for(let u=0;u<l;u++){let h=s[u];h.tokenTypeIdx===void 0&&this[h.name](h.children,e)}}}function doe(t,e){let r=o(function(){},"derivedConstructor");UR(r,t+"BaseSemantics");let n={visit:o(function(i,a){if(Mt(i)&&(i=i[0]),!dr(i))return this[i.name](i.children,a)},"visit"),validateVisitor:o(function(){let i=CFe(this,e);if(!cr(i)){let a=Je(i,s=>s.msg);throw Error(`Errors Detected in CST Visitor <${this.constructor.name}>: + ${a.join(` + +`).replace(/\n/g,` + `)}`)}},"validateVisitor")};return r.prototype=n,r.prototype.constructor=r,r._RULE_NAMES=e,r}function poe(t,e,r){let n=o(function(){},"derivedConstructor");UR(n,t+"BaseSemanticsWithDefaults");let i=Object.create(r.prototype);return Ce(e,a=>{i[a]=SFe}),n.prototype=i,n.prototype.constructor=n,n}function CFe(t,e){return AFe(t,e)}function AFe(t,e){let r=Yr(e,i=>Ei(t[i])===!1),n=Je(r,i=>({msg:`Missing visitor method: <${i}> on ${t.constructor.name} CST Visitor.`,type:HR.MISSING_METHOD,methodName:i}));return Tc(n)}var HR,moe=M(()=>{"use strict";Ht();foe();o(SFe,"defaultVisit");o(doe,"createBaseSemanticVisitorConstructor");o(poe,"createBaseVisitorConstructorWithDefaults");(function(t){t[t.REDUNDANT_METHOD=0]="REDUNDANT_METHOD",t[t.MISSING_METHOD=1]="MISSING_METHOD"})(HR||(HR={}));o(CFe,"validateVisitor");o(AFe,"validateMissingCstMethods")});var lk,goe=M(()=>{"use strict";hoe();Ht();moe();Is();lk=class{static{o(this,"TreeBuilder")}initTreeBuilder(e){if(this.CST_STACK=[],this.outputCst=e.outputCst,this.nodeLocationTracking=It(e,"nodeLocationTracking")?e.nodeLocationTracking:is.nodeLocationTracking,!this.outputCst)this.cstInvocationStateUpdate=Jn,this.cstFinallyStateUpdate=Jn,this.cstPostTerminal=Jn,this.cstPostNonTerminal=Jn,this.cstPostRule=Jn;else if(/full/i.test(this.nodeLocationTracking))this.recoveryEnabled?(this.setNodeLocationFromToken=VR,this.setNodeLocationFromNode=VR,this.cstPostRule=Jn,this.setInitialNodeLocation=this.setInitialNodeLocationFullRecovery):(this.setNodeLocationFromToken=Jn,this.setNodeLocationFromNode=Jn,this.cstPostRule=this.cstPostRuleFull,this.setInitialNodeLocation=this.setInitialNodeLocationFullRegular);else if(/onlyOffset/i.test(this.nodeLocationTracking))this.recoveryEnabled?(this.setNodeLocationFromToken=$R,this.setNodeLocationFromNode=$R,this.cstPostRule=Jn,this.setInitialNodeLocation=this.setInitialNodeLocationOnlyOffsetRecovery):(this.setNodeLocationFromToken=Jn,this.setNodeLocationFromNode=Jn,this.cstPostRule=this.cstPostRuleOnlyOffset,this.setInitialNodeLocation=this.setInitialNodeLocationOnlyOffsetRegular);else if(/none/i.test(this.nodeLocationTracking))this.setNodeLocationFromToken=Jn,this.setNodeLocationFromNode=Jn,this.cstPostRule=Jn,this.setInitialNodeLocation=Jn;else throw Error(`Invalid <nodeLocationTracking> config option: "${e.nodeLocationTracking}"`)}setInitialNodeLocationOnlyOffsetRecovery(e){e.location={startOffset:NaN,endOffset:NaN}}setInitialNodeLocationOnlyOffsetRegular(e){e.location={startOffset:this.LA(1).startOffset,endOffset:NaN}}setInitialNodeLocationFullRecovery(e){e.location={startOffset:NaN,startLine:NaN,startColumn:NaN,endOffset:NaN,endLine:NaN,endColumn:NaN}}setInitialNodeLocationFullRegular(e){let r=this.LA(1);e.location={startOffset:r.startOffset,startLine:r.startLine,startColumn:r.startColumn,endOffset:NaN,endLine:NaN,endColumn:NaN}}cstInvocationStateUpdate(e){let r={name:e,children:Object.create(null)};this.setInitialNodeLocation(r),this.CST_STACK.push(r)}cstFinallyStateUpdate(){this.CST_STACK.pop()}cstPostRuleFull(e){let r=this.LA(0),n=e.location;n.startOffset<=r.startOffset?(n.endOffset=r.endOffset,n.endLine=r.endLine,n.endColumn=r.endColumn):(n.startOffset=NaN,n.startLine=NaN,n.startColumn=NaN)}cstPostRuleOnlyOffset(e){let r=this.LA(0),n=e.location;n.startOffset<=r.startOffset?n.endOffset=r.endOffset:n.startOffset=NaN}cstPostTerminal(e,r){let n=this.CST_STACK[this.CST_STACK.length-1];coe(n,r,e),this.setNodeLocationFromToken(n.location,r)}cstPostNonTerminal(e,r){let n=this.CST_STACK[this.CST_STACK.length-1];uoe(n,r,e),this.setNodeLocationFromNode(n.location,e.location)}getBaseCstVisitorConstructor(){if(dr(this.baseCstVisitorConstructor)){let e=doe(this.className,zr(this.gastProductionsCache));return this.baseCstVisitorConstructor=e,e}return this.baseCstVisitorConstructor}getBaseCstVisitorConstructorWithDefaults(){if(dr(this.baseCstVisitorWithDefaultsConstructor)){let e=poe(this.className,zr(this.gastProductionsCache),this.getBaseCstVisitorConstructor());return this.baseCstVisitorWithDefaultsConstructor=e,e}return this.baseCstVisitorWithDefaultsConstructor}getLastExplicitRuleShortName(){let e=this.RULE_STACK;return e[e.length-1]}getPreviousExplicitRuleShortName(){let e=this.RULE_STACK;return e[e.length-2]}getLastExplicitRuleOccurrenceIndex(){let e=this.RULE_OCCURRENCE_STACK;return e[e.length-1]}}});var ck,yoe=M(()=>{"use strict";Is();ck=class{static{o(this,"LexerAdapter")}initLexerAdapter(){this.tokVector=[],this.tokVectorLength=0,this.currIdx=-1}set input(e){if(this.selfAnalysisDone!==!0)throw Error("Missing <performSelfAnalysis> invocation at the end of the Parser's constructor.");this.reset(),this.tokVector=e,this.tokVectorLength=e.length}get input(){return this.tokVector}SKIP_TOKEN(){return this.currIdx<=this.tokVector.length-2?(this.consumeToken(),this.LA(1)):lg}LA(e){let r=this.currIdx+e;return r<0||this.tokVectorLength<=r?lg:this.tokVector[r]}consumeToken(){this.currIdx++}exportLexerState(){return this.currIdx}importLexerState(e){this.currIdx=e}resetLexerState(){this.currIdx=-1}moveToTerminatedState(){this.currIdx=this.tokVector.length-1}getLexerPosition(){return this.exportLexerState()}}});var uk,voe=M(()=>{"use strict";Ht();og();Is();tg();d2();ns();uk=class{static{o(this,"RecognizerApi")}ACTION(e){return e.call(this)}consume(e,r,n){return this.consumeInternal(r,e,n)}subrule(e,r,n){return this.subruleInternal(r,e,n)}option(e,r){return this.optionInternal(r,e)}or(e,r){return this.orInternal(r,e)}many(e,r){return this.manyInternal(e,r)}atLeastOne(e,r){return this.atLeastOneInternal(e,r)}CONSUME(e,r){return this.consumeInternal(e,0,r)}CONSUME1(e,r){return this.consumeInternal(e,1,r)}CONSUME2(e,r){return this.consumeInternal(e,2,r)}CONSUME3(e,r){return this.consumeInternal(e,3,r)}CONSUME4(e,r){return this.consumeInternal(e,4,r)}CONSUME5(e,r){return this.consumeInternal(e,5,r)}CONSUME6(e,r){return this.consumeInternal(e,6,r)}CONSUME7(e,r){return this.consumeInternal(e,7,r)}CONSUME8(e,r){return this.consumeInternal(e,8,r)}CONSUME9(e,r){return this.consumeInternal(e,9,r)}SUBRULE(e,r){return this.subruleInternal(e,0,r)}SUBRULE1(e,r){return this.subruleInternal(e,1,r)}SUBRULE2(e,r){return this.subruleInternal(e,2,r)}SUBRULE3(e,r){return this.subruleInternal(e,3,r)}SUBRULE4(e,r){return this.subruleInternal(e,4,r)}SUBRULE5(e,r){return this.subruleInternal(e,5,r)}SUBRULE6(e,r){return this.subruleInternal(e,6,r)}SUBRULE7(e,r){return this.subruleInternal(e,7,r)}SUBRULE8(e,r){return this.subruleInternal(e,8,r)}SUBRULE9(e,r){return this.subruleInternal(e,9,r)}OPTION(e){return this.optionInternal(e,0)}OPTION1(e){return this.optionInternal(e,1)}OPTION2(e){return this.optionInternal(e,2)}OPTION3(e){return this.optionInternal(e,3)}OPTION4(e){return this.optionInternal(e,4)}OPTION5(e){return this.optionInternal(e,5)}OPTION6(e){return this.optionInternal(e,6)}OPTION7(e){return this.optionInternal(e,7)}OPTION8(e){return this.optionInternal(e,8)}OPTION9(e){return this.optionInternal(e,9)}OR(e){return this.orInternal(e,0)}OR1(e){return this.orInternal(e,1)}OR2(e){return this.orInternal(e,2)}OR3(e){return this.orInternal(e,3)}OR4(e){return this.orInternal(e,4)}OR5(e){return this.orInternal(e,5)}OR6(e){return this.orInternal(e,6)}OR7(e){return this.orInternal(e,7)}OR8(e){return this.orInternal(e,8)}OR9(e){return this.orInternal(e,9)}MANY(e){this.manyInternal(0,e)}MANY1(e){this.manyInternal(1,e)}MANY2(e){this.manyInternal(2,e)}MANY3(e){this.manyInternal(3,e)}MANY4(e){this.manyInternal(4,e)}MANY5(e){this.manyInternal(5,e)}MANY6(e){this.manyInternal(6,e)}MANY7(e){this.manyInternal(7,e)}MANY8(e){this.manyInternal(8,e)}MANY9(e){this.manyInternal(9,e)}MANY_SEP(e){this.manySepFirstInternal(0,e)}MANY_SEP1(e){this.manySepFirstInternal(1,e)}MANY_SEP2(e){this.manySepFirstInternal(2,e)}MANY_SEP3(e){this.manySepFirstInternal(3,e)}MANY_SEP4(e){this.manySepFirstInternal(4,e)}MANY_SEP5(e){this.manySepFirstInternal(5,e)}MANY_SEP6(e){this.manySepFirstInternal(6,e)}MANY_SEP7(e){this.manySepFirstInternal(7,e)}MANY_SEP8(e){this.manySepFirstInternal(8,e)}MANY_SEP9(e){this.manySepFirstInternal(9,e)}AT_LEAST_ONE(e){this.atLeastOneInternal(0,e)}AT_LEAST_ONE1(e){return this.atLeastOneInternal(1,e)}AT_LEAST_ONE2(e){this.atLeastOneInternal(2,e)}AT_LEAST_ONE3(e){this.atLeastOneInternal(3,e)}AT_LEAST_ONE4(e){this.atLeastOneInternal(4,e)}AT_LEAST_ONE5(e){this.atLeastOneInternal(5,e)}AT_LEAST_ONE6(e){this.atLeastOneInternal(6,e)}AT_LEAST_ONE7(e){this.atLeastOneInternal(7,e)}AT_LEAST_ONE8(e){this.atLeastOneInternal(8,e)}AT_LEAST_ONE9(e){this.atLeastOneInternal(9,e)}AT_LEAST_ONE_SEP(e){this.atLeastOneSepFirstInternal(0,e)}AT_LEAST_ONE_SEP1(e){this.atLeastOneSepFirstInternal(1,e)}AT_LEAST_ONE_SEP2(e){this.atLeastOneSepFirstInternal(2,e)}AT_LEAST_ONE_SEP3(e){this.atLeastOneSepFirstInternal(3,e)}AT_LEAST_ONE_SEP4(e){this.atLeastOneSepFirstInternal(4,e)}AT_LEAST_ONE_SEP5(e){this.atLeastOneSepFirstInternal(5,e)}AT_LEAST_ONE_SEP6(e){this.atLeastOneSepFirstInternal(6,e)}AT_LEAST_ONE_SEP7(e){this.atLeastOneSepFirstInternal(7,e)}AT_LEAST_ONE_SEP8(e){this.atLeastOneSepFirstInternal(8,e)}AT_LEAST_ONE_SEP9(e){this.atLeastOneSepFirstInternal(9,e)}RULE(e,r,n=cg){if(Hn(this.definedRulesNames,e)){let s={message:Bl.buildDuplicateRuleNameError({topLevelRule:e,grammarName:this.className}),type:zi.DUPLICATE_RULE_NAME,ruleName:e};this.definitionErrors.push(s)}this.definedRulesNames.push(e);let i=this.defineRule(e,r,n);return this[e]=i,i}OVERRIDE_RULE(e,r,n=cg){let i=Kse(e,this.definedRulesNames,this.className);this.definitionErrors=this.definitionErrors.concat(i);let a=this.defineRule(e,r,n);return this[e]=a,a}BACKTRACK(e,r){return function(){this.isBackTrackingStack.push(1);let n=this.saveRecogState();try{return e.apply(this,r),!0}catch(i){if(rf(i))return!1;throw i}finally{this.reloadRecogState(n),this.isBackTrackingStack.pop()}}}getGAstProductions(){return this.gastProductionsCache}getSerializedGastProductions(){return IT(br(this.gastProductionsCache))}}});var hk,xoe=M(()=>{"use strict";Ht();rk();og();ag();u2();Is();PR();i0();r0();hk=class{static{o(this,"RecognizerEngine")}initRecognizerEngine(e,r){if(this.className=this.constructor.name,this.shortRuleNameToFull={},this.fullRuleNameToShort={},this.ruleShortNameIdx=256,this.tokenMatcher=eg,this.subruleIdx=0,this.definedRulesNames=[],this.tokensMap={},this.isBackTrackingStack=[],this.RULE_STACK=[],this.RULE_OCCURRENCE_STACK=[],this.gastProductionsCache={},It(r,"serializedGrammar"))throw Error(`The Parser's configuration can no longer contain a <serializedGrammar> property. + See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_6-0-0 + For Further details.`);if(Mt(e)){if(cr(e))throw Error(`A Token Vocabulary cannot be empty. + Note that the first argument for the parser constructor + is no longer a Token vector (since v4.0).`);if(typeof e[0].startOffset=="number")throw Error(`The Parser constructor no longer accepts a token vector as the first argument. + See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_4-0-0 + For Further details.`)}if(Mt(e))this.tokensMap=qr(e,(a,s)=>(a[s.name]=s,a),{});else if(It(e,"modes")&&Ra(Wr(br(e.modes)),Ase)){let a=Wr(br(e.modes)),s=Om(a);this.tokensMap=qr(s,(l,u)=>(l[u.name]=u,l),{})}else if(yn(e))this.tokensMap=rn(e);else throw new Error("<tokensDictionary> argument must be An Array of Token constructors, A dictionary of Token constructors or an IMultiModeLexerDefinition");this.tokensMap.EOF=oo;let n=It(e,"modes")?Wr(br(e.modes)):br(e),i=Ra(n,a=>cr(a.categoryMatches));this.tokenMatcher=i?eg:Ou,Pu(br(this.tokensMap))}defineRule(e,r,n){if(this.selfAnalysisDone)throw Error(`Grammar rule <${e}> may not be defined after the 'performSelfAnalysis' method has been called' +Make sure that all grammar rule definitions are done before 'performSelfAnalysis' is called.`);let i=It(n,"resyncEnabled")?n.resyncEnabled:cg.resyncEnabled,a=It(n,"recoveryValueFunc")?n.recoveryValueFunc:cg.recoveryValueFunc,s=this.ruleShortNameIdx<<12;this.ruleShortNameIdx++,this.shortRuleNameToFull[s]=e,this.fullRuleNameToShort[e]=s;let l;return this.outputCst===!0?l=o(function(...f){try{this.ruleInvocationStateUpdate(s,e,this.subruleIdx),r.apply(this,f);let d=this.CST_STACK[this.CST_STACK.length-1];return this.cstPostRule(d),d}catch(d){return this.invokeRuleCatch(d,i,a)}finally{this.ruleFinallyStateUpdate()}},"invokeRuleWithTry"):l=o(function(...f){try{return this.ruleInvocationStateUpdate(s,e,this.subruleIdx),r.apply(this,f)}catch(d){return this.invokeRuleCatch(d,i,a)}finally{this.ruleFinallyStateUpdate()}},"invokeRuleWithTryCst"),Object.assign(l,{ruleName:e,originalGrammarAction:r})}invokeRuleCatch(e,r,n){let i=this.RULE_STACK.length===1,a=r&&!this.isBackTracking()&&this.recoveryEnabled;if(rf(e)){let s=e;if(a){let l=this.findReSyncTokenType();if(this.isInCurrentRuleReSyncSet(l))if(s.resyncedTokens=this.reSyncTo(l),this.outputCst){let u=this.CST_STACK[this.CST_STACK.length-1];return u.recoveredNode=!0,u}else return n(e);else{if(this.outputCst){let u=this.CST_STACK[this.CST_STACK.length-1];u.recoveredNode=!0,s.partialCstResult=u}throw s}}else{if(i)return this.moveToTerminatedState(),n(e);throw s}}else throw e}optionInternal(e,r){let n=this.getKeyForAutomaticLookahead(512,r);return this.optionInternalLogic(e,r,n)}optionInternalLogic(e,r,n){let i=this.getLaFuncFromCache(n),a;if(typeof e!="function"){a=e.DEF;let s=e.GATE;if(s!==void 0){let l=i;i=o(()=>s.call(this)&&l.call(this),"lookAheadFunc")}}else a=e;if(i.call(this)===!0)return a.call(this)}atLeastOneInternal(e,r){let n=this.getKeyForAutomaticLookahead(1024,e);return this.atLeastOneInternalLogic(e,r,n)}atLeastOneInternalLogic(e,r,n){let i=this.getLaFuncFromCache(n),a;if(typeof r!="function"){a=r.DEF;let s=r.GATE;if(s!==void 0){let l=i;i=o(()=>s.call(this)&&l.call(this),"lookAheadFunc")}}else a=r;if(i.call(this)===!0){let s=this.doSingleRepetition(a);for(;i.call(this)===!0&&s===!0;)s=this.doSingleRepetition(a)}else throw this.raiseEarlyExitException(e,Yn.REPETITION_MANDATORY,r.ERR_MSG);this.attemptInRepetitionRecovery(this.atLeastOneInternal,[e,r],i,1024,e,qT)}atLeastOneSepFirstInternal(e,r){let n=this.getKeyForAutomaticLookahead(1536,e);this.atLeastOneSepFirstInternalLogic(e,r,n)}atLeastOneSepFirstInternalLogic(e,r,n){let i=r.DEF,a=r.SEP;if(this.getLaFuncFromCache(n).call(this)===!0){i.call(this);let l=o(()=>this.tokenMatcher(this.LA(1),a),"separatorLookAheadFunc");for(;this.tokenMatcher(this.LA(1),a)===!0;)this.CONSUME(a),i.call(this);this.attemptInRepetitionRecovery(this.repetitionSepSecondInternal,[e,a,l,i,c2],l,1536,e,c2)}else throw this.raiseEarlyExitException(e,Yn.REPETITION_MANDATORY_WITH_SEPARATOR,r.ERR_MSG)}manyInternal(e,r){let n=this.getKeyForAutomaticLookahead(768,e);return this.manyInternalLogic(e,r,n)}manyInternalLogic(e,r,n){let i=this.getLaFuncFromCache(n),a;if(typeof r!="function"){a=r.DEF;let l=r.GATE;if(l!==void 0){let u=i;i=o(()=>l.call(this)&&u.call(this),"lookaheadFunction")}}else a=r;let s=!0;for(;i.call(this)===!0&&s===!0;)s=this.doSingleRepetition(a);this.attemptInRepetitionRecovery(this.manyInternal,[e,r],i,768,e,YT,s)}manySepFirstInternal(e,r){let n=this.getKeyForAutomaticLookahead(1280,e);this.manySepFirstInternalLogic(e,r,n)}manySepFirstInternalLogic(e,r,n){let i=r.DEF,a=r.SEP;if(this.getLaFuncFromCache(n).call(this)===!0){i.call(this);let l=o(()=>this.tokenMatcher(this.LA(1),a),"separatorLookAheadFunc");for(;this.tokenMatcher(this.LA(1),a)===!0;)this.CONSUME(a),i.call(this);this.attemptInRepetitionRecovery(this.repetitionSepSecondInternal,[e,a,l,i,l2],l,1280,e,l2)}}repetitionSepSecondInternal(e,r,n,i,a){for(;n();)this.CONSUME(r),i.call(this);this.attemptInRepetitionRecovery(this.repetitionSepSecondInternal,[e,r,n,i,a],n,1536,e,a)}doSingleRepetition(e){let r=this.getLexerPosition();return e.call(this),this.getLexerPosition()>r}orInternal(e,r){let n=this.getKeyForAutomaticLookahead(256,r),i=Mt(e)?e:e.DEF,s=this.getLaFuncFromCache(n).call(this,i);if(s!==void 0)return i[s].ALT.call(this);this.raiseNoAltException(r,e.ERR_MSG)}ruleFinallyStateUpdate(){if(this.RULE_STACK.pop(),this.RULE_OCCURRENCE_STACK.pop(),this.cstFinallyStateUpdate(),this.RULE_STACK.length===0&&this.isAtEndOfInput()===!1){let e=this.LA(1),r=this.errorMessageProvider.buildNotAllInputParsedMessage({firstRedundant:e,ruleName:this.getCurrRuleFullName()});this.SAVE_ERROR(new m2(r,e))}}subruleInternal(e,r,n){let i;try{let a=n!==void 0?n.ARGS:void 0;return this.subruleIdx=r,i=e.apply(this,a),this.cstPostNonTerminal(i,n!==void 0&&n.LABEL!==void 0?n.LABEL:e.ruleName),i}catch(a){throw this.subruleInternalError(a,n,e.ruleName)}}subruleInternalError(e,r,n){throw rf(e)&&e.partialCstResult!==void 0&&(this.cstPostNonTerminal(e.partialCstResult,r!==void 0&&r.LABEL!==void 0?r.LABEL:n),delete e.partialCstResult),e}consumeInternal(e,r,n){let i;try{let a=this.LA(1);this.tokenMatcher(a,e)===!0?(this.consumeToken(),i=a):this.consumeInternalError(e,a,n)}catch(a){i=this.consumeInternalRecovery(e,r,a)}return this.cstPostTerminal(n!==void 0&&n.LABEL!==void 0?n.LABEL:e.name,i),i}consumeInternalError(e,r,n){let i,a=this.LA(0);throw n!==void 0&&n.ERR_MSG?i=n.ERR_MSG:i=this.errorMessageProvider.buildMismatchTokenMessage({expected:e,actual:r,previous:a,ruleName:this.getCurrRuleFullName()}),this.SAVE_ERROR(new a0(i,r,a))}consumeInternalRecovery(e,r,n){if(this.recoveryEnabled&&n.name==="MismatchedTokenException"&&!this.isBackTracking()){let i=this.getFollowsForInRuleRecovery(e,r);try{return this.tryInRuleRecovery(e,i)}catch(a){throw a.name===OR?n:a}}else throw n}saveRecogState(){let e=this.errors,r=rn(this.RULE_STACK);return{errors:e,lexerState:this.exportLexerState(),RULE_STACK:r,CST_STACK:this.CST_STACK}}reloadRecogState(e){this.errors=e.errors,this.importLexerState(e.lexerState),this.RULE_STACK=e.RULE_STACK}ruleInvocationStateUpdate(e,r,n){this.RULE_OCCURRENCE_STACK.push(n),this.RULE_STACK.push(e),this.cstInvocationStateUpdate(r)}isBackTracking(){return this.isBackTrackingStack.length!==0}getCurrRuleFullName(){let e=this.getLastExplicitRuleShortName();return this.shortRuleNameToFull[e]}shortRuleNameToFullName(e){return this.shortRuleNameToFull[e]}isAtEndOfInput(){return this.tokenMatcher(this.LA(1),oo)}reset(){this.resetLexerState(),this.subruleIdx=0,this.isBackTrackingStack=[],this.errors=[],this.RULE_STACK=[],this.CST_STACK=[],this.RULE_OCCURRENCE_STACK=[]}}});var fk,boe=M(()=>{"use strict";og();Ht();ag();Is();fk=class{static{o(this,"ErrorHandler")}initErrorHandler(e){this._errors=[],this.errorMessageProvider=It(e,"errorMessageProvider")?e.errorMessageProvider:is.errorMessageProvider}SAVE_ERROR(e){if(rf(e))return e.context={ruleStack:this.getHumanReadableRuleStack(),ruleOccurrenceStack:rn(this.RULE_OCCURRENCE_STACK)},this._errors.push(e),e;throw Error("Trying to save an Error which is not a RecognitionException")}get errors(){return rn(this._errors)}set errors(e){this._errors=e}raiseEarlyExitException(e,r,n){let i=this.getCurrRuleFullName(),a=this.getGAstProductions()[i],l=ig(e,a,r,this.maxLookahead)[0],u=[];for(let f=1;f<=this.maxLookahead;f++)u.push(this.LA(f));let h=this.errorMessageProvider.buildEarlyExitMessage({expectedIterationPaths:l,actual:u,previous:this.LA(0),customUserDescription:n,ruleName:i});throw this.SAVE_ERROR(new g2(h,this.LA(1),this.LA(0)))}raiseNoAltException(e,r){let n=this.getCurrRuleFullName(),i=this.getGAstProductions()[n],a=ng(e,i,this.maxLookahead),s=[];for(let h=1;h<=this.maxLookahead;h++)s.push(this.LA(h));let l=this.LA(0),u=this.errorMessageProvider.buildNoViableAltMessage({expectedPathsPerAlt:a,actual:s,previous:l,customUserDescription:r,ruleName:this.getCurrRuleFullName()});throw this.SAVE_ERROR(new p2(u,this.LA(1),l))}}});var dk,woe=M(()=>{"use strict";u2();Ht();dk=class{static{o(this,"ContentAssist")}initContentAssist(){}computeContentAssist(e,r){let n=this.gastProductionsCache[e];if(dr(n))throw Error(`Rule ->${e}<- does not exist in this grammar.`);return jT([n],r,this.tokenMatcher,this.maxLookahead)}getNextPossibleTokenTypes(e){let r=ra(e.ruleStack),i=this.getGAstProductions()[r];return new WT(i,e).startWalking()}}});function v2(t,e,r,n=!1){mk(r);let i=fa(this.recordingProdStack),a=Ei(e)?e:e.DEF,s=new t({definition:[],idx:r});return n&&(s.separator=e.SEP),It(e,"MAX_LOOKAHEAD")&&(s.maxLookahead=e.MAX_LOOKAHEAD),this.recordingProdStack.push(s),a.call(this),i.definition.push(s),this.recordingProdStack.pop(),gk}function DFe(t,e){mk(e);let r=fa(this.recordingProdStack),n=Mt(t)===!1,i=n===!1?t:t.DEF,a=new xn({definition:[],idx:e,ignoreAmbiguities:n&&t.IGNORE_AMBIGUITIES===!0});It(t,"MAX_LOOKAHEAD")&&(a.maxLookahead=t.MAX_LOOKAHEAD);let s=Rv(i,l=>Ei(l.GATE));return a.hasPredicates=s,r.definition.push(a),Ce(i,l=>{let u=new Cn({definition:[]});a.definition.push(u),It(l,"IGNORE_AMBIGUITIES")?u.ignoreAmbiguities=l.IGNORE_AMBIGUITIES:It(l,"GATE")&&(u.ignoreAmbiguities=!0),this.recordingProdStack.push(u),l.ALT.call(this),this.recordingProdStack.pop()}),gk}function Eoe(t){return t===0?"":`${t}`}function mk(t){if(t<0||t>koe){let e=new Error(`Invalid DSL Method idx value: <${t}> + Idx value must be a none negative value smaller than ${koe+1}`);throw e.KNOWN_RECORDER_ERROR=!0,e}}var gk,Toe,koe,Soe,Coe,LFe,pk,Aoe=M(()=>{"use strict";Ht();ns();a2();r0();i0();Is();rk();gk={description:"This Object indicates the Parser is during Recording Phase"};Object.freeze(gk);Toe=!0,koe=Math.pow(2,8)-1,Soe=HT({name:"RECORDING_PHASE_TOKEN",pattern:oi.NA});Pu([Soe]);Coe=n0(Soe,`This IToken indicates the Parser is in Recording Phase + See: https://chevrotain.io/docs/guide/internals.html#grammar-recording for details`,-1,-1,-1,-1,-1,-1);Object.freeze(Coe);LFe={name:`This CSTNode indicates the Parser is in Recording Phase + See: https://chevrotain.io/docs/guide/internals.html#grammar-recording for details`,children:{}},pk=class{static{o(this,"GastRecorder")}initGastRecorder(e){this.recordingProdStack=[],this.RECORDING_PHASE=!1}enableRecording(){this.RECORDING_PHASE=!0,this.TRACE_INIT("Enable Recording",()=>{for(let e=0;e<10;e++){let r=e>0?e:"";this[`CONSUME${r}`]=function(n,i){return this.consumeInternalRecord(n,e,i)},this[`SUBRULE${r}`]=function(n,i){return this.subruleInternalRecord(n,e,i)},this[`OPTION${r}`]=function(n){return this.optionInternalRecord(n,e)},this[`OR${r}`]=function(n){return this.orInternalRecord(n,e)},this[`MANY${r}`]=function(n){this.manyInternalRecord(e,n)},this[`MANY_SEP${r}`]=function(n){this.manySepFirstInternalRecord(e,n)},this[`AT_LEAST_ONE${r}`]=function(n){this.atLeastOneInternalRecord(e,n)},this[`AT_LEAST_ONE_SEP${r}`]=function(n){this.atLeastOneSepFirstInternalRecord(e,n)}}this.consume=function(e,r,n){return this.consumeInternalRecord(r,e,n)},this.subrule=function(e,r,n){return this.subruleInternalRecord(r,e,n)},this.option=function(e,r){return this.optionInternalRecord(r,e)},this.or=function(e,r){return this.orInternalRecord(r,e)},this.many=function(e,r){this.manyInternalRecord(e,r)},this.atLeastOne=function(e,r){this.atLeastOneInternalRecord(e,r)},this.ACTION=this.ACTION_RECORD,this.BACKTRACK=this.BACKTRACK_RECORD,this.LA=this.LA_RECORD})}disableRecording(){this.RECORDING_PHASE=!1,this.TRACE_INIT("Deleting Recording methods",()=>{let e=this;for(let r=0;r<10;r++){let n=r>0?r:"";delete e[`CONSUME${n}`],delete e[`SUBRULE${n}`],delete e[`OPTION${n}`],delete e[`OR${n}`],delete e[`MANY${n}`],delete e[`MANY_SEP${n}`],delete e[`AT_LEAST_ONE${n}`],delete e[`AT_LEAST_ONE_SEP${n}`]}delete e.consume,delete e.subrule,delete e.option,delete e.or,delete e.many,delete e.atLeastOne,delete e.ACTION,delete e.BACKTRACK,delete e.LA})}ACTION_RECORD(e){}BACKTRACK_RECORD(e,r){return()=>!0}LA_RECORD(e){return lg}topLevelRuleRecord(e,r){try{let n=new ts({definition:[],name:e});return n.name=e,this.recordingProdStack.push(n),r.call(this),this.recordingProdStack.pop(),n}catch(n){if(n.KNOWN_RECORDER_ERROR!==!0)try{n.message=n.message+` + This error was thrown during the "grammar recording phase" For more info see: + https://chevrotain.io/docs/guide/internals.html#grammar-recording`}catch{throw n}throw n}}optionInternalRecord(e,r){return v2.call(this,an,e,r)}atLeastOneInternalRecord(e,r){v2.call(this,An,r,e)}atLeastOneSepFirstInternalRecord(e,r){v2.call(this,_n,r,e,Toe)}manyInternalRecord(e,r){v2.call(this,Lr,r,e)}manySepFirstInternalRecord(e,r){v2.call(this,vn,r,e,Toe)}orInternalRecord(e,r){return DFe.call(this,e,r)}subruleInternalRecord(e,r,n){if(mk(r),!e||It(e,"ruleName")===!1){let l=new Error(`<SUBRULE${Eoe(r)}> argument is invalid expecting a Parser method reference but got: <${JSON.stringify(e)}> + inside top level rule: <${this.recordingProdStack[0].name}>`);throw l.KNOWN_RECORDER_ERROR=!0,l}let i=fa(this.recordingProdStack),a=e.ruleName,s=new nn({idx:r,nonTerminalName:a,label:n?.LABEL,referencedRule:void 0});return i.definition.push(s),this.outputCst?LFe:gk}consumeInternalRecord(e,r,n){if(mk(r),!TR(e)){let s=new Error(`<CONSUME${Eoe(r)}> argument is invalid expecting a TokenType reference but got: <${JSON.stringify(e)}> + inside top level rule: <${this.recordingProdStack[0].name}>`);throw s.KNOWN_RECORDER_ERROR=!0,s}let i=fa(this.recordingProdStack),a=new kr({idx:r,terminalType:e,label:n?.LABEL});return i.definition.push(a),Coe}};o(v2,"recordProd");o(DFe,"recordOrProd");o(Eoe,"getIdxSuffix");o(mk,"assertMethodIdxIsValid")});var yk,_oe=M(()=>{"use strict";Ht();jm();Is();yk=class{static{o(this,"PerformanceTracer")}initPerformanceTracer(e){if(It(e,"traceInitPerf")){let r=e.traceInitPerf,n=typeof r=="number";this.traceInitMaxIdent=n?r:1/0,this.traceInitPerf=n?r>0:r}else this.traceInitMaxIdent=0,this.traceInitPerf=is.traceInitPerf;this.traceInitIndent=-1}TRACE_INIT(e,r){if(this.traceInitPerf===!0){this.traceInitIndent++;let n=new Array(this.traceInitIndent+1).join(" ");this.traceInitIndent<this.traceInitMaxIdent&&console.log(`${n}--> <${e}>`);let{time:i,value:a}=r2(r),s=i>10?console.warn:console.log;return this.traceInitIndent<this.traceInitMaxIdent&&s(`${n}<-- <${e}> time: ${i}ms`),this.traceInitIndent--,a}else return r()}}});function Loe(t,e){e.forEach(r=>{let n=r.prototype;Object.getOwnPropertyNames(n).forEach(i=>{if(i==="constructor")return;let a=Object.getOwnPropertyDescriptor(n,i);a&&(a.get||a.set)?Object.defineProperty(t.prototype,i,a):t.prototype[i]=r.prototype[i]})})}var Doe=M(()=>{"use strict";o(Loe,"applyMixins")});function vk(t=void 0){return function(){return t}}var lg,is,cg,zi,x2,b2,Is=M(()=>{"use strict";Ht();jm();sse();i0();tg();roe();PR();loe();goe();yoe();voe();xoe();boe();woe();Aoe();_oe();Doe();d2();lg=n0(oo,"",NaN,NaN,NaN,NaN,NaN,NaN);Object.freeze(lg);is=Object.freeze({recoveryEnabled:!1,maxLookahead:3,dynamicTokensEnabled:!1,outputCst:!0,errorMessageProvider:Fu,nodeLocationTracking:"none",traceInitPerf:!1,skipValidations:!1}),cg=Object.freeze({recoveryValueFunc:o(()=>{},"recoveryValueFunc"),resyncEnabled:!0});(function(t){t[t.INVALID_RULE_NAME=0]="INVALID_RULE_NAME",t[t.DUPLICATE_RULE_NAME=1]="DUPLICATE_RULE_NAME",t[t.INVALID_RULE_OVERRIDE=2]="INVALID_RULE_OVERRIDE",t[t.DUPLICATE_PRODUCTIONS=3]="DUPLICATE_PRODUCTIONS",t[t.UNRESOLVED_SUBRULE_REF=4]="UNRESOLVED_SUBRULE_REF",t[t.LEFT_RECURSION=5]="LEFT_RECURSION",t[t.NONE_LAST_EMPTY_ALT=6]="NONE_LAST_EMPTY_ALT",t[t.AMBIGUOUS_ALTS=7]="AMBIGUOUS_ALTS",t[t.CONFLICT_TOKENS_RULES_NAMESPACE=8]="CONFLICT_TOKENS_RULES_NAMESPACE",t[t.INVALID_TOKEN_NAME=9]="INVALID_TOKEN_NAME",t[t.NO_NON_EMPTY_LOOKAHEAD=10]="NO_NON_EMPTY_LOOKAHEAD",t[t.AMBIGUOUS_PREFIX_ALTS=11]="AMBIGUOUS_PREFIX_ALTS",t[t.TOO_MANY_ALTS=12]="TOO_MANY_ALTS",t[t.CUSTOM_LOOKAHEAD_VALIDATION=13]="CUSTOM_LOOKAHEAD_VALIDATION"})(zi||(zi={}));o(vk,"EMPTY_ALT");x2=class t{static{o(this,"Parser")}static performSelfAnalysis(e){throw Error("The **static** `performSelfAnalysis` method has been deprecated. \nUse the **instance** method with the same name instead.")}performSelfAnalysis(){this.TRACE_INIT("performSelfAnalysis",()=>{let e;this.selfAnalysisDone=!0;let r=this.className;this.TRACE_INIT("toFastProps",()=>{n2(this)}),this.TRACE_INIT("Grammar Recording",()=>{try{this.enableRecording(),Ce(this.definedRulesNames,i=>{let s=this[i].originalGrammarAction,l;this.TRACE_INIT(`${i} Rule`,()=>{l=this.topLevelRuleRecord(i,s)}),this.gastProductionsCache[i]=l})}finally{this.disableRecording()}});let n=[];if(this.TRACE_INIT("Grammar Resolving",()=>{n=eoe({rules:br(this.gastProductionsCache)}),this.definitionErrors=this.definitionErrors.concat(n)}),this.TRACE_INIT("Grammar Validations",()=>{if(cr(n)&&this.skipValidations===!1){let i=toe({rules:br(this.gastProductionsCache),tokenTypes:br(this.tokensMap),errMsgProvider:Bl,grammarName:r}),a=qse({lookaheadStrategy:this.lookaheadStrategy,rules:br(this.gastProductionsCache),tokenTypes:br(this.tokensMap),grammarName:r});this.definitionErrors=this.definitionErrors.concat(i,a)}}),cr(this.definitionErrors)&&(this.recoveryEnabled&&this.TRACE_INIT("computeAllProdsFollows",()=>{let i=ase(br(this.gastProductionsCache));this.resyncFollows=i}),this.TRACE_INIT("ComputeLookaheadFunctions",()=>{var i,a;(a=(i=this.lookaheadStrategy).initialize)===null||a===void 0||a.call(i,{rules:br(this.gastProductionsCache)}),this.preComputeLookaheadFunctions(br(this.gastProductionsCache))})),!t.DEFER_DEFINITION_ERRORS_HANDLING&&!cr(this.definitionErrors))throw e=Je(this.definitionErrors,i=>i.message),new Error(`Parser Definition Errors detected: + ${e.join(` +------------------------------- +`)}`)})}constructor(e,r){this.definitionErrors=[],this.selfAnalysisDone=!1;let n=this;if(n.initErrorHandler(r),n.initLexerAdapter(),n.initLooksAhead(r),n.initRecognizerEngine(e,r),n.initRecoverable(r),n.initTreeBuilder(r),n.initContentAssist(),n.initGastRecorder(r),n.initPerformanceTracer(r),It(r,"ignoredIssues"))throw new Error(`The <ignoredIssues> IParserConfig property has been deprecated. + Please use the <IGNORE_AMBIGUITIES> flag on the relevant DSL method instead. + See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#IGNORING_AMBIGUITIES + For further details.`);this.skipValidations=It(r,"skipValidations")?r.skipValidations:is.skipValidations}};x2.DEFER_DEFINITION_ERRORS_HANDLING=!1;Loe(x2,[ek,ik,lk,ck,hk,uk,fk,dk,pk,yk]);b2=class extends x2{static{o(this,"EmbeddedActionsParser")}constructor(e,r=is){let n=rn(r);n.outputCst=!1,super(e,n)}}});var Noe=M(()=>{"use strict";ns()});var Roe=M(()=>{"use strict"});var Moe=M(()=>{"use strict";Noe();Roe()});var Ioe=M(()=>{"use strict";uR()});var s0=M(()=>{"use strict";uR();Is();a2();i0();ag();BR();tg();og();ER();ns();ns();Moe();Ioe()});function o0(t,e,r){return`${t.name}_${e}_${r}`}function Foe(t){let e={decisionMap:{},decisionStates:[],ruleToStartState:new Map,ruleToStopState:new Map,states:[]};BFe(e,t);let r=t.length;for(let n=0;n<r;n++){let i=t[n],a=l0(e,i,i);a!==void 0&&XFe(e,i,a)}return e}function BFe(t,e){let r=e.length;for(let n=0;n<r;n++){let i=e[n],a=na(t,i,void 0,{type:RFe}),s=na(t,i,void 0,{type:fg});a.stop=s,t.ruleToStartState.set(i,a),t.ruleToStopState.set(i,s)}}function zoe(t,e,r){return r instanceof kr?YR(t,e,r.terminalType,r):r instanceof nn?qFe(t,e,r):r instanceof xn?VFe(t,e,r):r instanceof an?UFe(t,e,r):r instanceof Lr?FFe(t,e,r):r instanceof vn?zFe(t,e,r):r instanceof An?GFe(t,e,r):r instanceof _n?$Fe(t,e,r):l0(t,e,r)}function FFe(t,e,r){let n=na(t,e,r,{type:Poe});af(t,n);let i=dg(t,e,n,r,l0(t,e,r));return $oe(t,e,r,i)}function zFe(t,e,r){let n=na(t,e,r,{type:Poe});af(t,n);let i=dg(t,e,n,r,l0(t,e,r)),a=YR(t,e,r.separator,r);return $oe(t,e,r,i,a)}function GFe(t,e,r){let n=na(t,e,r,{type:Ooe});af(t,n);let i=dg(t,e,n,r,l0(t,e,r));return Goe(t,e,r,i)}function $Fe(t,e,r){let n=na(t,e,r,{type:Ooe});af(t,n);let i=dg(t,e,n,r,l0(t,e,r)),a=YR(t,e,r.separator,r);return Goe(t,e,r,i,a)}function VFe(t,e,r){let n=na(t,e,r,{type:nf});af(t,n);let i=Je(r.definition,s=>zoe(t,e,s));return dg(t,e,n,r,...i)}function UFe(t,e,r){let n=na(t,e,r,{type:nf});af(t,n);let i=dg(t,e,n,r,l0(t,e,r));return HFe(t,e,r,i)}function l0(t,e,r){let n=Yr(Je(r.definition,i=>zoe(t,e,i)),i=>i!==void 0);return n.length===1?n[0]:n.length===0?void 0:YFe(t,n)}function Goe(t,e,r,n,i){let a=n.left,s=n.right,l=na(t,e,r,{type:PFe});af(t,l);let u=na(t,e,r,{type:Boe});return a.loopback=l,u.loopback=l,t.decisionMap[o0(e,i?"RepetitionMandatoryWithSeparator":"RepetitionMandatory",r.idx)]=l,Ai(s,l),i===void 0?(Ai(l,a),Ai(l,u)):(Ai(l,u),Ai(l,i.left),Ai(i.right,a)),{left:a,right:u}}function $oe(t,e,r,n,i){let a=n.left,s=n.right,l=na(t,e,r,{type:OFe});af(t,l);let u=na(t,e,r,{type:Boe}),h=na(t,e,r,{type:IFe});return l.loopback=h,u.loopback=h,Ai(l,a),Ai(l,u),Ai(s,h),i!==void 0?(Ai(h,u),Ai(h,i.left),Ai(i.right,a)):Ai(h,l),t.decisionMap[o0(e,i?"RepetitionWithSeparator":"Repetition",r.idx)]=l,{left:l,right:u}}function HFe(t,e,r,n){let i=n.left,a=n.right;return Ai(i,a),t.decisionMap[o0(e,"Option",r.idx)]=i,n}function af(t,e){return t.decisionStates.push(e),e.decision=t.decisionStates.length-1,e.decision}function dg(t,e,r,n,...i){let a=na(t,e,n,{type:MFe,start:r});r.end=a;for(let l of i)l!==void 0?(Ai(r,l.left),Ai(l.right,a)):Ai(r,a);let s={left:r,right:a};return t.decisionMap[o0(e,WFe(n),n.idx)]=r,s}function WFe(t){if(t instanceof xn)return"Alternation";if(t instanceof an)return"Option";if(t instanceof Lr)return"Repetition";if(t instanceof vn)return"RepetitionWithSeparator";if(t instanceof An)return"RepetitionMandatory";if(t instanceof _n)return"RepetitionMandatoryWithSeparator";throw new Error("Invalid production type encountered")}function YFe(t,e){let r=e.length;for(let a=0;a<r-1;a++){let s=e[a],l;s.left.transitions.length===1&&(l=s.left.transitions[0]);let u=l instanceof hg,h=l,f=e[a+1].left;s.left.type===nf&&s.right.type===nf&&l!==void 0&&(u&&h.followState===s.right||l.target===s.right)?(u?h.followState=f:l.target=f,jFe(t,s.right)):Ai(s.right,f)}let n=e[0],i=e[r-1];return{left:n.left,right:i.right}}function YR(t,e,r,n){let i=na(t,e,n,{type:nf}),a=na(t,e,n,{type:nf});return qR(i,new ug(a,r)),{left:i,right:a}}function qFe(t,e,r){let n=r.referencedRule,i=t.ruleToStartState.get(n),a=na(t,e,r,{type:nf}),s=na(t,e,r,{type:nf}),l=new hg(i,n,s);return qR(a,l),{left:a,right:s}}function XFe(t,e,r){let n=t.ruleToStartState.get(e);Ai(n,r.left);let i=t.ruleToStopState.get(e);return Ai(r.right,i),{left:n,right:i}}function Ai(t,e){let r=new T2(e);qR(t,r)}function na(t,e,r,n){let i=Object.assign({atn:t,production:r,epsilonOnlyTransitions:!1,rule:e,transitions:[],nextTokenWithinRule:[],stateNumber:t.states.length},n);return t.states.push(i),i}function qR(t,e){t.transitions.length===0&&(t.epsilonOnlyTransitions=e.isEpsilon()),t.transitions.push(e)}function jFe(t,e){t.states.splice(t.states.indexOf(e),1)}var nf,RFe,Ooe,Poe,fg,MFe,IFe,OFe,PFe,Boe,w2,ug,T2,hg,Voe=M(()=>{"use strict";Rm();FL();s0();o(o0,"buildATNKey");nf=1,RFe=2,Ooe=4,Poe=5,fg=7,MFe=8,IFe=9,OFe=10,PFe=11,Boe=12,w2=class{static{o(this,"AbstractTransition")}constructor(e){this.target=e}isEpsilon(){return!1}},ug=class extends w2{static{o(this,"AtomTransition")}constructor(e,r){super(e),this.tokenType=r}},T2=class extends w2{static{o(this,"EpsilonTransition")}constructor(e){super(e)}isEpsilon(){return!0}},hg=class extends w2{static{o(this,"RuleTransition")}constructor(e,r,n){super(e),this.rule=r,this.followState=n}isEpsilon(){return!0}};o(Foe,"createATN");o(BFe,"createRuleStartAndStopATNStates");o(zoe,"atom");o(FFe,"repetition");o(zFe,"repetitionSep");o(GFe,"repetitionMandatory");o($Fe,"repetitionMandatorySep");o(VFe,"alternation");o(UFe,"option");o(l0,"block");o(Goe,"plus");o($oe,"star");o(HFe,"optional");o(af,"defineDecisionState");o(dg,"makeAlts");o(WFe,"getProdType");o(YFe,"makeBlock");o(YR,"tokenRef");o(qFe,"ruleRef");o(XFe,"buildRuleHandle");o(Ai,"epsilon");o(na,"newState");o(qR,"addTransition");o(jFe,"removeState")});function XR(t,e=!0){return`${e?`a${t.alt}`:""}s${t.state.stateNumber}:${t.stack.map(r=>r.stateNumber.toString()).join("_")}`}var k2,pg,Uoe=M(()=>{"use strict";Rm();k2={},pg=class{static{o(this,"ATNConfigSet")}constructor(){this.map={},this.configs=[]}get size(){return this.configs.length}finalize(){this.map={}}add(e){let r=XR(e);r in this.map||(this.map[r]=this.configs.length,this.configs.push(e))}get elements(){return this.configs}get alts(){return Je(this.configs,e=>e.alt)}get key(){let e="";for(let r in this.map)e+=r+":";return e}};o(XR,"getATNConfigKey")});function KFe(t,e){let r={};return n=>{let i=n.toString(),a=r[i];return a!==void 0||(a={atnStartState:t,decision:e,states:{}},r[i]=a),a}}function Woe(t,e=!0){let r=new Set;for(let n of t){let i=new Set;for(let a of n){if(a===void 0){if(e)break;return!1}let s=[a.tokenTypeIdx].concat(a.categoryMatches);for(let l of s)if(r.has(l)){if(!i.has(l))return!1}else r.add(l),i.add(l)}}return!0}function QFe(t){let e=t.decisionStates.length,r=Array(e);for(let n=0;n<e;n++)r[n]=KFe(t.decisionStates[n],n);return r}function jR(t,e,r,n){let i=t[e](r),a=i.start;if(a===void 0){let l=lze(i.atnStartState);a=Xoe(i,qoe(l)),i.start=a}return ZFe.apply(this,[i,a,r,n])}function ZFe(t,e,r,n){let i=e,a=1,s=[],l=this.LA(a++);for(;;){let u=ize(i,l);if(u===void 0&&(u=JFe.apply(this,[t,i,l,a,r,n])),u===k2)return nze(s,i,l);if(u.isAcceptState===!0)return u.prediction;i=u,s.push(l),l=this.LA(a++)}}function JFe(t,e,r,n,i,a){let s=aze(e.configs,r,i);if(s.size===0)return Yoe(t,e,r,k2),k2;let l=qoe(s),u=oze(s,i);if(u!==void 0)l.isAcceptState=!0,l.prediction=u,l.configs.uniqueAlt=u;else if(fze(s)){let h=Nl(s.alts);l.isAcceptState=!0,l.prediction=h,l.configs.uniqueAlt=h,eze.apply(this,[t,n,s.alts,a])}return l=Yoe(t,e,r,l),l}function eze(t,e,r,n){let i=[];for(let h=1;h<=e;h++)i.push(this.LA(h).tokenType);let a=t.atnStartState,s=a.rule,l=a.production,u=tze({topLevelRule:s,ambiguityIndices:r,production:l,prefixPath:i});n(u)}function tze(t){let e=Je(t.prefixPath,i=>Bu(i)).join(", "),r=t.production.idx===0?"":t.production.idx,n=`Ambiguous Alternatives Detected: <${t.ambiguityIndices.join(", ")}> in <${rze(t.production)}${r}> inside <${t.topLevelRule.name}> Rule, +<${e}> may appears as a prefix path in all these alternatives. +`;return n=n+`See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#AMBIGUOUS_ALTERNATIVES +For Further details.`,n}function rze(t){if(t instanceof nn)return"SUBRULE";if(t instanceof an)return"OPTION";if(t instanceof xn)return"OR";if(t instanceof An)return"AT_LEAST_ONE";if(t instanceof _n)return"AT_LEAST_ONE_SEP";if(t instanceof vn)return"MANY_SEP";if(t instanceof Lr)return"MANY";if(t instanceof kr)return"CONSUME";throw Error("non exhaustive match")}function nze(t,e,r){let n=da(e.configs.elements,a=>a.state.transitions),i=ene(n.filter(a=>a instanceof ug).map(a=>a.tokenType),a=>a.tokenTypeIdx);return{actualToken:r,possibleTokenTypes:i,tokenPath:t}}function ize(t,e){return t.edges[e.tokenTypeIdx]}function aze(t,e,r){let n=new pg,i=[];for(let s of t.elements){if(r.is(s.alt)===!1)continue;if(s.state.type===fg){i.push(s);continue}let l=s.state.transitions.length;for(let u=0;u<l;u++){let h=s.state.transitions[u],f=sze(h,e);f!==void 0&&n.add({state:f,alt:s.alt,stack:s.stack})}}let a;if(i.length===0&&n.size===1&&(a=n),a===void 0){a=new pg;for(let s of n.elements)bk(s,a)}if(i.length>0&&!uze(a))for(let s of i)a.add(s);return a}function sze(t,e){if(t instanceof ug&&o2(e,t.tokenType))return t.target}function oze(t,e){let r;for(let n of t.elements)if(e.is(n.alt)===!0){if(r===void 0)r=n.alt;else if(r!==n.alt)return}return r}function qoe(t){return{configs:t,edges:{},isAcceptState:!1,prediction:-1}}function Yoe(t,e,r,n){return n=Xoe(t,n),e.edges[r.tokenTypeIdx]=n,n}function Xoe(t,e){if(e===k2)return e;let r=e.configs.key,n=t.states[r];return n!==void 0?n:(e.configs.finalize(),t.states[r]=e,e)}function lze(t){let e=new pg,r=t.transitions.length;for(let n=0;n<r;n++){let a={state:t.transitions[n].target,alt:n,stack:[]};bk(a,e)}return e}function bk(t,e){let r=t.state;if(r.type===fg){if(t.stack.length>0){let i=[...t.stack],s={state:i.pop(),alt:t.alt,stack:i};bk(s,e)}else e.add(t);return}r.epsilonOnlyTransitions||e.add(t);let n=r.transitions.length;for(let i=0;i<n;i++){let a=r.transitions[i],s=cze(t,a);s!==void 0&&bk(s,e)}}function cze(t,e){if(e instanceof T2)return{state:e.target,alt:t.alt,stack:t.stack};if(e instanceof hg){let r=[...t.stack,e.followState];return{state:e.target,alt:t.alt,stack:r}}}function uze(t){for(let e of t.elements)if(e.state.type===fg)return!0;return!1}function hze(t){for(let e of t.elements)if(e.state.type!==fg)return!1;return!0}function fze(t){if(hze(t))return!0;let e=dze(t.elements);return pze(e)&&!mze(e)}function dze(t){let e=new Map;for(let r of t){let n=XR(r,!1),i=e.get(n);i===void 0&&(i={},e.set(n,i)),i[r.alt]=!0}return e}function pze(t){for(let e of Array.from(t.values()))if(Object.keys(e).length>1)return!0;return!1}function mze(t){for(let e of Array.from(t.values()))if(Object.keys(e).length===1)return!0;return!1}var xk,Hoe,E2,joe=M(()=>{"use strict";s0();Voe();Uoe();YL();GL();tne();Rm();gw();Ww();Kw();KL();o(KFe,"createDFACache");xk=class{static{o(this,"PredicateSet")}constructor(){this.predicates=[]}is(e){return e>=this.predicates.length||this.predicates[e]}set(e,r){this.predicates[e]=r}toString(){let e="",r=this.predicates.length;for(let n=0;n<r;n++)e+=this.predicates[n]===!0?"1":"0";return e}},Hoe=new xk,E2=class extends zu{static{o(this,"LLStarLookaheadStrategy")}constructor(e){var r;super(),this.logging=(r=e?.logging)!==null&&r!==void 0?r:n=>console.log(n)}initialize(e){this.atn=Foe(e.rules),this.dfas=QFe(this.atn)}validateAmbiguousAlternationAlternatives(){return[]}validateEmptyOrAlternatives(){return[]}buildLookaheadForAlternation(e){let{prodOccurrence:r,rule:n,hasPredicates:i,dynamicTokensEnabled:a}=e,s=this.dfas,l=this.logging,u=o0(n,"Alternation",r),f=this.atn.decisionMap[u].decision,d=Je(QT({maxLookahead:1,occurrence:r,prodType:"Alternation",rule:n}),p=>Je(p,m=>m[0]));if(Woe(d,!1)&&!a){let p=qr(d,(m,g,y)=>(Ce(g,v=>{v&&(m[v.tokenTypeIdx]=y,Ce(v.categoryMatches,x=>{m[x]=y}))}),m),{});return i?function(m){var g;let y=this.LA(1),v=p[y.tokenTypeIdx];if(m!==void 0&&v!==void 0){let x=(g=m[v])===null||g===void 0?void 0:g.GATE;if(x!==void 0&&x.call(this)===!1)return}return v}:function(){let m=this.LA(1);return p[m.tokenTypeIdx]}}else return i?function(p){let m=new xk,g=p===void 0?0:p.length;for(let v=0;v<g;v++){let x=p?.[v].GATE;m.set(v,x===void 0||x.call(this))}let y=jR.call(this,s,f,m,l);return typeof y=="number"?y:void 0}:function(){let p=jR.call(this,s,f,Hoe,l);return typeof p=="number"?p:void 0}}buildLookaheadForOptional(e){let{prodOccurrence:r,rule:n,prodType:i,dynamicTokensEnabled:a}=e,s=this.dfas,l=this.logging,u=o0(n,i,r),f=this.atn.decisionMap[u].decision,d=Je(QT({maxLookahead:1,occurrence:r,prodType:i,rule:n}),p=>Je(p,m=>m[0]));if(Woe(d)&&d[0][0]&&!a){let p=d[0],m=Wr(p);if(m.length===1&&cr(m[0].categoryMatches)){let y=m[0].tokenTypeIdx;return function(){return this.LA(1).tokenTypeIdx===y}}else{let g=qr(m,(y,v)=>(v!==void 0&&(y[v.tokenTypeIdx]=!0,Ce(v.categoryMatches,x=>{y[x]=!0})),y),{});return function(){let y=this.LA(1);return g[y.tokenTypeIdx]===!0}}}return function(){let p=jR.call(this,s,f,Hoe,l);return typeof p=="object"?!1:p===0}}};o(Woe,"isLL1Sequence");o(QFe,"initATNSimulator");o(jR,"adaptivePredict");o(ZFe,"performLookahead");o(JFe,"computeLookaheadTarget");o(eze,"reportLookaheadAmbiguity");o(tze,"buildAmbiguityError");o(rze,"getProductionDslName");o(nze,"buildAdaptivePredictError");o(ize,"getExistingTargetState");o(aze,"computeReachSet");o(sze,"getReachableTarget");o(oze,"getUniqueAlt");o(qoe,"newDFAState");o(Yoe,"addDFAEdge");o(Xoe,"addDFAState");o(lze,"computeStartState");o(bk,"closure");o(cze,"getEpsilonTarget");o(uze,"hasConfigInRuleStopState");o(hze,"allConfigsInRuleStopStates");o(fze,"hasConflictTerminatingPrediction");o(dze,"getConflictingAltSets");o(pze,"hasConflictingAltSet");o(mze,"hasStateAssociatedWithOneAlt")});var Koe=M(()=>{"use strict";joe()});var Qoe,KR,Zoe,wk,Xr,Dr,Tk,Joe,QR,ele,tle,rle,nle,ZR,ile,ale,sle,kk,mg,gg,JR,yg,ole,eM,tM,rM,nM,iM,lle,cle,aM,ule,sM,S2,hle,fle,dle,ple,mle,gle,yle,vle,Ek,xle,ble,wle,Tle,kle,Ele,Sle,Cle,Ale,_le,Lle,Sk,Dle,Nle,Rle,Mle,Ile,Ole,Ple,Ble,Fle,zle,Gle,$le,Vle,oM,lM,Ule,Hle,Wle,Yle,qle,Xle,jle,Kle,Qle,cM,Oe,uM=M(()=>{"use strict";(function(t){function e(r){return typeof r=="string"}o(e,"is"),t.is=e})(Qoe||(Qoe={}));(function(t){function e(r){return typeof r=="string"}o(e,"is"),t.is=e})(KR||(KR={}));(function(t){t.MIN_VALUE=-2147483648,t.MAX_VALUE=2147483647;function e(r){return typeof r=="number"&&t.MIN_VALUE<=r&&r<=t.MAX_VALUE}o(e,"is"),t.is=e})(Zoe||(Zoe={}));(function(t){t.MIN_VALUE=0,t.MAX_VALUE=2147483647;function e(r){return typeof r=="number"&&t.MIN_VALUE<=r&&r<=t.MAX_VALUE}o(e,"is"),t.is=e})(wk||(wk={}));(function(t){function e(n,i){return n===Number.MAX_VALUE&&(n=wk.MAX_VALUE),i===Number.MAX_VALUE&&(i=wk.MAX_VALUE),{line:n,character:i}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.objectLiteral(i)&&Oe.uinteger(i.line)&&Oe.uinteger(i.character)}o(r,"is"),t.is=r})(Xr||(Xr={}));(function(t){function e(n,i,a,s){if(Oe.uinteger(n)&&Oe.uinteger(i)&&Oe.uinteger(a)&&Oe.uinteger(s))return{start:Xr.create(n,i),end:Xr.create(a,s)};if(Xr.is(n)&&Xr.is(i))return{start:n,end:i};throw new Error(`Range#create called with invalid arguments[${n}, ${i}, ${a}, ${s}]`)}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.objectLiteral(i)&&Xr.is(i.start)&&Xr.is(i.end)}o(r,"is"),t.is=r})(Dr||(Dr={}));(function(t){function e(n,i){return{uri:n,range:i}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.objectLiteral(i)&&Dr.is(i.range)&&(Oe.string(i.uri)||Oe.undefined(i.uri))}o(r,"is"),t.is=r})(Tk||(Tk={}));(function(t){function e(n,i,a,s){return{targetUri:n,targetRange:i,targetSelectionRange:a,originSelectionRange:s}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.objectLiteral(i)&&Dr.is(i.targetRange)&&Oe.string(i.targetUri)&&Dr.is(i.targetSelectionRange)&&(Dr.is(i.originSelectionRange)||Oe.undefined(i.originSelectionRange))}o(r,"is"),t.is=r})(Joe||(Joe={}));(function(t){function e(n,i,a,s){return{red:n,green:i,blue:a,alpha:s}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.objectLiteral(i)&&Oe.numberRange(i.red,0,1)&&Oe.numberRange(i.green,0,1)&&Oe.numberRange(i.blue,0,1)&&Oe.numberRange(i.alpha,0,1)}o(r,"is"),t.is=r})(QR||(QR={}));(function(t){function e(n,i){return{range:n,color:i}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.objectLiteral(i)&&Dr.is(i.range)&&QR.is(i.color)}o(r,"is"),t.is=r})(ele||(ele={}));(function(t){function e(n,i,a){return{label:n,textEdit:i,additionalTextEdits:a}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.objectLiteral(i)&&Oe.string(i.label)&&(Oe.undefined(i.textEdit)||gg.is(i))&&(Oe.undefined(i.additionalTextEdits)||Oe.typedArray(i.additionalTextEdits,gg.is))}o(r,"is"),t.is=r})(tle||(tle={}));(function(t){t.Comment="comment",t.Imports="imports",t.Region="region"})(rle||(rle={}));(function(t){function e(n,i,a,s,l,u){let h={startLine:n,endLine:i};return Oe.defined(a)&&(h.startCharacter=a),Oe.defined(s)&&(h.endCharacter=s),Oe.defined(l)&&(h.kind=l),Oe.defined(u)&&(h.collapsedText=u),h}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.objectLiteral(i)&&Oe.uinteger(i.startLine)&&Oe.uinteger(i.startLine)&&(Oe.undefined(i.startCharacter)||Oe.uinteger(i.startCharacter))&&(Oe.undefined(i.endCharacter)||Oe.uinteger(i.endCharacter))&&(Oe.undefined(i.kind)||Oe.string(i.kind))}o(r,"is"),t.is=r})(nle||(nle={}));(function(t){function e(n,i){return{location:n,message:i}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.defined(i)&&Tk.is(i.location)&&Oe.string(i.message)}o(r,"is"),t.is=r})(ZR||(ZR={}));(function(t){t.Error=1,t.Warning=2,t.Information=3,t.Hint=4})(ile||(ile={}));(function(t){t.Unnecessary=1,t.Deprecated=2})(ale||(ale={}));(function(t){function e(r){let n=r;return Oe.objectLiteral(n)&&Oe.string(n.href)}o(e,"is"),t.is=e})(sle||(sle={}));(function(t){function e(n,i,a,s,l,u){let h={range:n,message:i};return Oe.defined(a)&&(h.severity=a),Oe.defined(s)&&(h.code=s),Oe.defined(l)&&(h.source=l),Oe.defined(u)&&(h.relatedInformation=u),h}o(e,"create"),t.create=e;function r(n){var i;let a=n;return Oe.defined(a)&&Dr.is(a.range)&&Oe.string(a.message)&&(Oe.number(a.severity)||Oe.undefined(a.severity))&&(Oe.integer(a.code)||Oe.string(a.code)||Oe.undefined(a.code))&&(Oe.undefined(a.codeDescription)||Oe.string((i=a.codeDescription)===null||i===void 0?void 0:i.href))&&(Oe.string(a.source)||Oe.undefined(a.source))&&(Oe.undefined(a.relatedInformation)||Oe.typedArray(a.relatedInformation,ZR.is))}o(r,"is"),t.is=r})(kk||(kk={}));(function(t){function e(n,i,...a){let s={title:n,command:i};return Oe.defined(a)&&a.length>0&&(s.arguments=a),s}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.defined(i)&&Oe.string(i.title)&&Oe.string(i.command)}o(r,"is"),t.is=r})(mg||(mg={}));(function(t){function e(a,s){return{range:a,newText:s}}o(e,"replace"),t.replace=e;function r(a,s){return{range:{start:a,end:a},newText:s}}o(r,"insert"),t.insert=r;function n(a){return{range:a,newText:""}}o(n,"del"),t.del=n;function i(a){let s=a;return Oe.objectLiteral(s)&&Oe.string(s.newText)&&Dr.is(s.range)}o(i,"is"),t.is=i})(gg||(gg={}));(function(t){function e(n,i,a){let s={label:n};return i!==void 0&&(s.needsConfirmation=i),a!==void 0&&(s.description=a),s}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.objectLiteral(i)&&Oe.string(i.label)&&(Oe.boolean(i.needsConfirmation)||i.needsConfirmation===void 0)&&(Oe.string(i.description)||i.description===void 0)}o(r,"is"),t.is=r})(JR||(JR={}));(function(t){function e(r){let n=r;return Oe.string(n)}o(e,"is"),t.is=e})(yg||(yg={}));(function(t){function e(a,s,l){return{range:a,newText:s,annotationId:l}}o(e,"replace"),t.replace=e;function r(a,s,l){return{range:{start:a,end:a},newText:s,annotationId:l}}o(r,"insert"),t.insert=r;function n(a,s){return{range:a,newText:"",annotationId:s}}o(n,"del"),t.del=n;function i(a){let s=a;return gg.is(s)&&(JR.is(s.annotationId)||yg.is(s.annotationId))}o(i,"is"),t.is=i})(ole||(ole={}));(function(t){function e(n,i){return{textDocument:n,edits:i}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.defined(i)&&aM.is(i.textDocument)&&Array.isArray(i.edits)}o(r,"is"),t.is=r})(eM||(eM={}));(function(t){function e(n,i,a){let s={kind:"create",uri:n};return i!==void 0&&(i.overwrite!==void 0||i.ignoreIfExists!==void 0)&&(s.options=i),a!==void 0&&(s.annotationId=a),s}o(e,"create"),t.create=e;function r(n){let i=n;return i&&i.kind==="create"&&Oe.string(i.uri)&&(i.options===void 0||(i.options.overwrite===void 0||Oe.boolean(i.options.overwrite))&&(i.options.ignoreIfExists===void 0||Oe.boolean(i.options.ignoreIfExists)))&&(i.annotationId===void 0||yg.is(i.annotationId))}o(r,"is"),t.is=r})(tM||(tM={}));(function(t){function e(n,i,a,s){let l={kind:"rename",oldUri:n,newUri:i};return a!==void 0&&(a.overwrite!==void 0||a.ignoreIfExists!==void 0)&&(l.options=a),s!==void 0&&(l.annotationId=s),l}o(e,"create"),t.create=e;function r(n){let i=n;return i&&i.kind==="rename"&&Oe.string(i.oldUri)&&Oe.string(i.newUri)&&(i.options===void 0||(i.options.overwrite===void 0||Oe.boolean(i.options.overwrite))&&(i.options.ignoreIfExists===void 0||Oe.boolean(i.options.ignoreIfExists)))&&(i.annotationId===void 0||yg.is(i.annotationId))}o(r,"is"),t.is=r})(rM||(rM={}));(function(t){function e(n,i,a){let s={kind:"delete",uri:n};return i!==void 0&&(i.recursive!==void 0||i.ignoreIfNotExists!==void 0)&&(s.options=i),a!==void 0&&(s.annotationId=a),s}o(e,"create"),t.create=e;function r(n){let i=n;return i&&i.kind==="delete"&&Oe.string(i.uri)&&(i.options===void 0||(i.options.recursive===void 0||Oe.boolean(i.options.recursive))&&(i.options.ignoreIfNotExists===void 0||Oe.boolean(i.options.ignoreIfNotExists)))&&(i.annotationId===void 0||yg.is(i.annotationId))}o(r,"is"),t.is=r})(nM||(nM={}));(function(t){function e(r){let n=r;return n&&(n.changes!==void 0||n.documentChanges!==void 0)&&(n.documentChanges===void 0||n.documentChanges.every(i=>Oe.string(i.kind)?tM.is(i)||rM.is(i)||nM.is(i):eM.is(i)))}o(e,"is"),t.is=e})(iM||(iM={}));(function(t){function e(n){return{uri:n}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.defined(i)&&Oe.string(i.uri)}o(r,"is"),t.is=r})(lle||(lle={}));(function(t){function e(n,i){return{uri:n,version:i}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.defined(i)&&Oe.string(i.uri)&&Oe.integer(i.version)}o(r,"is"),t.is=r})(cle||(cle={}));(function(t){function e(n,i){return{uri:n,version:i}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.defined(i)&&Oe.string(i.uri)&&(i.version===null||Oe.integer(i.version))}o(r,"is"),t.is=r})(aM||(aM={}));(function(t){function e(n,i,a,s){return{uri:n,languageId:i,version:a,text:s}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.defined(i)&&Oe.string(i.uri)&&Oe.string(i.languageId)&&Oe.integer(i.version)&&Oe.string(i.text)}o(r,"is"),t.is=r})(ule||(ule={}));(function(t){t.PlainText="plaintext",t.Markdown="markdown";function e(r){let n=r;return n===t.PlainText||n===t.Markdown}o(e,"is"),t.is=e})(sM||(sM={}));(function(t){function e(r){let n=r;return Oe.objectLiteral(r)&&sM.is(n.kind)&&Oe.string(n.value)}o(e,"is"),t.is=e})(S2||(S2={}));(function(t){t.Text=1,t.Method=2,t.Function=3,t.Constructor=4,t.Field=5,t.Variable=6,t.Class=7,t.Interface=8,t.Module=9,t.Property=10,t.Unit=11,t.Value=12,t.Enum=13,t.Keyword=14,t.Snippet=15,t.Color=16,t.File=17,t.Reference=18,t.Folder=19,t.EnumMember=20,t.Constant=21,t.Struct=22,t.Event=23,t.Operator=24,t.TypeParameter=25})(hle||(hle={}));(function(t){t.PlainText=1,t.Snippet=2})(fle||(fle={}));(function(t){t.Deprecated=1})(dle||(dle={}));(function(t){function e(n,i,a){return{newText:n,insert:i,replace:a}}o(e,"create"),t.create=e;function r(n){let i=n;return i&&Oe.string(i.newText)&&Dr.is(i.insert)&&Dr.is(i.replace)}o(r,"is"),t.is=r})(ple||(ple={}));(function(t){t.asIs=1,t.adjustIndentation=2})(mle||(mle={}));(function(t){function e(r){let n=r;return n&&(Oe.string(n.detail)||n.detail===void 0)&&(Oe.string(n.description)||n.description===void 0)}o(e,"is"),t.is=e})(gle||(gle={}));(function(t){function e(r){return{label:r}}o(e,"create"),t.create=e})(yle||(yle={}));(function(t){function e(r,n){return{items:r||[],isIncomplete:!!n}}o(e,"create"),t.create=e})(vle||(vle={}));(function(t){function e(n){return n.replace(/[\\`*_{}[\]()#+\-.!]/g,"\\$&")}o(e,"fromPlainText"),t.fromPlainText=e;function r(n){let i=n;return Oe.string(i)||Oe.objectLiteral(i)&&Oe.string(i.language)&&Oe.string(i.value)}o(r,"is"),t.is=r})(Ek||(Ek={}));(function(t){function e(r){let n=r;return!!n&&Oe.objectLiteral(n)&&(S2.is(n.contents)||Ek.is(n.contents)||Oe.typedArray(n.contents,Ek.is))&&(r.range===void 0||Dr.is(r.range))}o(e,"is"),t.is=e})(xle||(xle={}));(function(t){function e(r,n){return n?{label:r,documentation:n}:{label:r}}o(e,"create"),t.create=e})(ble||(ble={}));(function(t){function e(r,n,...i){let a={label:r};return Oe.defined(n)&&(a.documentation=n),Oe.defined(i)?a.parameters=i:a.parameters=[],a}o(e,"create"),t.create=e})(wle||(wle={}));(function(t){t.Text=1,t.Read=2,t.Write=3})(Tle||(Tle={}));(function(t){function e(r,n){let i={range:r};return Oe.number(n)&&(i.kind=n),i}o(e,"create"),t.create=e})(kle||(kle={}));(function(t){t.File=1,t.Module=2,t.Namespace=3,t.Package=4,t.Class=5,t.Method=6,t.Property=7,t.Field=8,t.Constructor=9,t.Enum=10,t.Interface=11,t.Function=12,t.Variable=13,t.Constant=14,t.String=15,t.Number=16,t.Boolean=17,t.Array=18,t.Object=19,t.Key=20,t.Null=21,t.EnumMember=22,t.Struct=23,t.Event=24,t.Operator=25,t.TypeParameter=26})(Ele||(Ele={}));(function(t){t.Deprecated=1})(Sle||(Sle={}));(function(t){function e(r,n,i,a,s){let l={name:r,kind:n,location:{uri:a,range:i}};return s&&(l.containerName=s),l}o(e,"create"),t.create=e})(Cle||(Cle={}));(function(t){function e(r,n,i,a){return a!==void 0?{name:r,kind:n,location:{uri:i,range:a}}:{name:r,kind:n,location:{uri:i}}}o(e,"create"),t.create=e})(Ale||(Ale={}));(function(t){function e(n,i,a,s,l,u){let h={name:n,detail:i,kind:a,range:s,selectionRange:l};return u!==void 0&&(h.children=u),h}o(e,"create"),t.create=e;function r(n){let i=n;return i&&Oe.string(i.name)&&Oe.number(i.kind)&&Dr.is(i.range)&&Dr.is(i.selectionRange)&&(i.detail===void 0||Oe.string(i.detail))&&(i.deprecated===void 0||Oe.boolean(i.deprecated))&&(i.children===void 0||Array.isArray(i.children))&&(i.tags===void 0||Array.isArray(i.tags))}o(r,"is"),t.is=r})(_le||(_le={}));(function(t){t.Empty="",t.QuickFix="quickfix",t.Refactor="refactor",t.RefactorExtract="refactor.extract",t.RefactorInline="refactor.inline",t.RefactorRewrite="refactor.rewrite",t.Source="source",t.SourceOrganizeImports="source.organizeImports",t.SourceFixAll="source.fixAll"})(Lle||(Lle={}));(function(t){t.Invoked=1,t.Automatic=2})(Sk||(Sk={}));(function(t){function e(n,i,a){let s={diagnostics:n};return i!=null&&(s.only=i),a!=null&&(s.triggerKind=a),s}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.defined(i)&&Oe.typedArray(i.diagnostics,kk.is)&&(i.only===void 0||Oe.typedArray(i.only,Oe.string))&&(i.triggerKind===void 0||i.triggerKind===Sk.Invoked||i.triggerKind===Sk.Automatic)}o(r,"is"),t.is=r})(Dle||(Dle={}));(function(t){function e(n,i,a){let s={title:n},l=!0;return typeof i=="string"?(l=!1,s.kind=i):mg.is(i)?s.command=i:s.edit=i,l&&a!==void 0&&(s.kind=a),s}o(e,"create"),t.create=e;function r(n){let i=n;return i&&Oe.string(i.title)&&(i.diagnostics===void 0||Oe.typedArray(i.diagnostics,kk.is))&&(i.kind===void 0||Oe.string(i.kind))&&(i.edit!==void 0||i.command!==void 0)&&(i.command===void 0||mg.is(i.command))&&(i.isPreferred===void 0||Oe.boolean(i.isPreferred))&&(i.edit===void 0||iM.is(i.edit))}o(r,"is"),t.is=r})(Nle||(Nle={}));(function(t){function e(n,i){let a={range:n};return Oe.defined(i)&&(a.data=i),a}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.defined(i)&&Dr.is(i.range)&&(Oe.undefined(i.command)||mg.is(i.command))}o(r,"is"),t.is=r})(Rle||(Rle={}));(function(t){function e(n,i){return{tabSize:n,insertSpaces:i}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.defined(i)&&Oe.uinteger(i.tabSize)&&Oe.boolean(i.insertSpaces)}o(r,"is"),t.is=r})(Mle||(Mle={}));(function(t){function e(n,i,a){return{range:n,target:i,data:a}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.defined(i)&&Dr.is(i.range)&&(Oe.undefined(i.target)||Oe.string(i.target))}o(r,"is"),t.is=r})(Ile||(Ile={}));(function(t){function e(n,i){return{range:n,parent:i}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.objectLiteral(i)&&Dr.is(i.range)&&(i.parent===void 0||t.is(i.parent))}o(r,"is"),t.is=r})(Ole||(Ole={}));(function(t){t.namespace="namespace",t.type="type",t.class="class",t.enum="enum",t.interface="interface",t.struct="struct",t.typeParameter="typeParameter",t.parameter="parameter",t.variable="variable",t.property="property",t.enumMember="enumMember",t.event="event",t.function="function",t.method="method",t.macro="macro",t.keyword="keyword",t.modifier="modifier",t.comment="comment",t.string="string",t.number="number",t.regexp="regexp",t.operator="operator",t.decorator="decorator"})(Ple||(Ple={}));(function(t){t.declaration="declaration",t.definition="definition",t.readonly="readonly",t.static="static",t.deprecated="deprecated",t.abstract="abstract",t.async="async",t.modification="modification",t.documentation="documentation",t.defaultLibrary="defaultLibrary"})(Ble||(Ble={}));(function(t){function e(r){let n=r;return Oe.objectLiteral(n)&&(n.resultId===void 0||typeof n.resultId=="string")&&Array.isArray(n.data)&&(n.data.length===0||typeof n.data[0]=="number")}o(e,"is"),t.is=e})(Fle||(Fle={}));(function(t){function e(n,i){return{range:n,text:i}}o(e,"create"),t.create=e;function r(n){let i=n;return i!=null&&Dr.is(i.range)&&Oe.string(i.text)}o(r,"is"),t.is=r})(zle||(zle={}));(function(t){function e(n,i,a){return{range:n,variableName:i,caseSensitiveLookup:a}}o(e,"create"),t.create=e;function r(n){let i=n;return i!=null&&Dr.is(i.range)&&Oe.boolean(i.caseSensitiveLookup)&&(Oe.string(i.variableName)||i.variableName===void 0)}o(r,"is"),t.is=r})(Gle||(Gle={}));(function(t){function e(n,i){return{range:n,expression:i}}o(e,"create"),t.create=e;function r(n){let i=n;return i!=null&&Dr.is(i.range)&&(Oe.string(i.expression)||i.expression===void 0)}o(r,"is"),t.is=r})($le||($le={}));(function(t){function e(n,i){return{frameId:n,stoppedLocation:i}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.defined(i)&&Dr.is(n.stoppedLocation)}o(r,"is"),t.is=r})(Vle||(Vle={}));(function(t){t.Type=1,t.Parameter=2;function e(r){return r===1||r===2}o(e,"is"),t.is=e})(oM||(oM={}));(function(t){function e(n){return{value:n}}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.objectLiteral(i)&&(i.tooltip===void 0||Oe.string(i.tooltip)||S2.is(i.tooltip))&&(i.location===void 0||Tk.is(i.location))&&(i.command===void 0||mg.is(i.command))}o(r,"is"),t.is=r})(lM||(lM={}));(function(t){function e(n,i,a){let s={position:n,label:i};return a!==void 0&&(s.kind=a),s}o(e,"create"),t.create=e;function r(n){let i=n;return Oe.objectLiteral(i)&&Xr.is(i.position)&&(Oe.string(i.label)||Oe.typedArray(i.label,lM.is))&&(i.kind===void 0||oM.is(i.kind))&&i.textEdits===void 0||Oe.typedArray(i.textEdits,gg.is)&&(i.tooltip===void 0||Oe.string(i.tooltip)||S2.is(i.tooltip))&&(i.paddingLeft===void 0||Oe.boolean(i.paddingLeft))&&(i.paddingRight===void 0||Oe.boolean(i.paddingRight))}o(r,"is"),t.is=r})(Ule||(Ule={}));(function(t){function e(r){return{kind:"snippet",value:r}}o(e,"createSnippet"),t.createSnippet=e})(Hle||(Hle={}));(function(t){function e(r,n,i,a){return{insertText:r,filterText:n,range:i,command:a}}o(e,"create"),t.create=e})(Wle||(Wle={}));(function(t){function e(r){return{items:r}}o(e,"create"),t.create=e})(Yle||(Yle={}));(function(t){t.Invoked=0,t.Automatic=1})(qle||(qle={}));(function(t){function e(r,n){return{range:r,text:n}}o(e,"create"),t.create=e})(Xle||(Xle={}));(function(t){function e(r,n){return{triggerKind:r,selectedCompletionInfo:n}}o(e,"create"),t.create=e})(jle||(jle={}));(function(t){function e(r){let n=r;return Oe.objectLiteral(n)&&KR.is(n.uri)&&Oe.string(n.name)}o(e,"is"),t.is=e})(Kle||(Kle={}));(function(t){function e(a,s,l,u){return new cM(a,s,l,u)}o(e,"create"),t.create=e;function r(a){let s=a;return!!(Oe.defined(s)&&Oe.string(s.uri)&&(Oe.undefined(s.languageId)||Oe.string(s.languageId))&&Oe.uinteger(s.lineCount)&&Oe.func(s.getText)&&Oe.func(s.positionAt)&&Oe.func(s.offsetAt))}o(r,"is"),t.is=r;function n(a,s){let l=a.getText(),u=i(s,(f,d)=>{let p=f.range.start.line-d.range.start.line;return p===0?f.range.start.character-d.range.start.character:p}),h=l.length;for(let f=u.length-1;f>=0;f--){let d=u[f],p=a.offsetAt(d.range.start),m=a.offsetAt(d.range.end);if(m<=h)l=l.substring(0,p)+d.newText+l.substring(m,l.length);else throw new Error("Overlapping edit");h=p}return l}o(n,"applyEdits"),t.applyEdits=n;function i(a,s){if(a.length<=1)return a;let l=a.length/2|0,u=a.slice(0,l),h=a.slice(l);i(u,s),i(h,s);let f=0,d=0,p=0;for(;f<u.length&&d<h.length;)s(u[f],h[d])<=0?a[p++]=u[f++]:a[p++]=h[d++];for(;f<u.length;)a[p++]=u[f++];for(;d<h.length;)a[p++]=h[d++];return a}o(i,"mergeSort")})(Qle||(Qle={}));cM=class{static{o(this,"FullTextDocument")}constructor(e,r,n,i){this._uri=e,this._languageId=r,this._version=n,this._content=i,this._lineOffsets=void 0}get uri(){return this._uri}get languageId(){return this._languageId}get version(){return this._version}getText(e){if(e){let r=this.offsetAt(e.start),n=this.offsetAt(e.end);return this._content.substring(r,n)}return this._content}update(e,r){this._content=e.text,this._version=r,this._lineOffsets=void 0}getLineOffsets(){if(this._lineOffsets===void 0){let e=[],r=this._content,n=!0;for(let i=0;i<r.length;i++){n&&(e.push(i),n=!1);let a=r.charAt(i);n=a==="\r"||a===` +`,a==="\r"&&i+1<r.length&&r.charAt(i+1)===` +`&&i++}n&&r.length>0&&e.push(r.length),this._lineOffsets=e}return this._lineOffsets}positionAt(e){e=Math.max(Math.min(e,this._content.length),0);let r=this.getLineOffsets(),n=0,i=r.length;if(i===0)return Xr.create(0,e);for(;n<i;){let s=Math.floor((n+i)/2);r[s]>e?i=s:n=s+1}let a=n-1;return Xr.create(a,e-r[a])}offsetAt(e){let r=this.getLineOffsets();if(e.line>=r.length)return this._content.length;if(e.line<0)return 0;let n=r[e.line],i=e.line+1<r.length?r[e.line+1]:this._content.length;return Math.max(Math.min(n+e.character,i),n)}get lineCount(){return this.getLineOffsets().length}};(function(t){let e=Object.prototype.toString;function r(m){return typeof m<"u"}o(r,"defined"),t.defined=r;function n(m){return typeof m>"u"}o(n,"undefined"),t.undefined=n;function i(m){return m===!0||m===!1}o(i,"boolean"),t.boolean=i;function a(m){return e.call(m)==="[object String]"}o(a,"string"),t.string=a;function s(m){return e.call(m)==="[object Number]"}o(s,"number"),t.number=s;function l(m,g,y){return e.call(m)==="[object Number]"&&g<=m&&m<=y}o(l,"numberRange"),t.numberRange=l;function u(m){return e.call(m)==="[object Number]"&&-2147483648<=m&&m<=2147483647}o(u,"integer"),t.integer=u;function h(m){return e.call(m)==="[object Number]"&&0<=m&&m<=2147483647}o(h,"uinteger"),t.uinteger=h;function f(m){return e.call(m)==="[object Function]"}o(f,"func"),t.func=f;function d(m){return m!==null&&typeof m=="object"}o(d,"objectLiteral"),t.objectLiteral=d;function p(m,g){return Array.isArray(m)&&m.every(g)}o(p,"typedArray"),t.typedArray=p})(Oe||(Oe={}))});var C2,A2,c0,u0,hM,vg,Ck=M(()=>{"use strict";uM();Yo();Ml();C2=class{static{o(this,"CstNodeBuilder")}constructor(){this.nodeStack=[]}get current(){return this.nodeStack[this.nodeStack.length-1]}buildRootNode(e){return this.rootNode=new vg(e),this.rootNode.root=this.rootNode,this.nodeStack=[this.rootNode],this.rootNode}buildCompositeNode(e){let r=new u0;return r.grammarSource=e,r.root=this.rootNode,this.current.content.push(r),this.nodeStack.push(r),r}buildLeafNode(e,r){let n=new c0(e.startOffset,e.image.length,$m(e),e.tokenType,!1);return n.grammarSource=r,n.root=this.rootNode,this.current.content.push(n),n}removeNode(e){let r=e.container;if(r){let n=r.content.indexOf(e);n>=0&&r.content.splice(n,1)}}construct(e){let r=this.current;typeof e.$type=="string"&&(this.current.astNode=e),e.$cstNode=r;let n=this.nodeStack.pop();n?.content.length===0&&this.removeNode(n)}addHiddenTokens(e){for(let r of e){let n=new c0(r.startOffset,r.image.length,$m(r),r.tokenType,!0);n.root=this.rootNode,this.addHiddenToken(this.rootNode,n)}}addHiddenToken(e,r){let{offset:n,end:i}=r;for(let a=0;a<e.content.length;a++){let s=e.content[a],{offset:l,end:u}=s;if(io(s)&&n>l&&i<u){this.addHiddenToken(s,r);return}else if(i<=l){e.content.splice(a,0,r);return}}e.content.push(r)}},A2=class{static{o(this,"AbstractCstNode")}get parent(){return this.container}get feature(){return this.grammarSource}get hidden(){return!1}get astNode(){var e,r;let n=typeof((e=this._astNode)===null||e===void 0?void 0:e.$type)=="string"?this._astNode:(r=this.container)===null||r===void 0?void 0:r.astNode;if(!n)throw new Error("This node has no associated AST element");return n}set astNode(e){this._astNode=e}get element(){return this.astNode}get text(){return this.root.fullText.substring(this.offset,this.end)}},c0=class extends A2{static{o(this,"LeafCstNodeImpl")}get offset(){return this._offset}get length(){return this._length}get end(){return this._offset+this._length}get hidden(){return this._hidden}get tokenType(){return this._tokenType}get range(){return this._range}constructor(e,r,n,i,a=!1){super(),this._hidden=a,this._offset=e,this._tokenType=i,this._length=r,this._range=n}},u0=class extends A2{static{o(this,"CompositeCstNodeImpl")}constructor(){super(...arguments),this.content=new hM(this)}get children(){return this.content}get offset(){var e,r;return(r=(e=this.firstNonHiddenNode)===null||e===void 0?void 0:e.offset)!==null&&r!==void 0?r:0}get length(){return this.end-this.offset}get end(){var e,r;return(r=(e=this.lastNonHiddenNode)===null||e===void 0?void 0:e.end)!==null&&r!==void 0?r:0}get range(){let e=this.firstNonHiddenNode,r=this.lastNonHiddenNode;if(e&&r){if(this._rangeCache===void 0){let{range:n}=e,{range:i}=r;this._rangeCache={start:n.start,end:i.end.line<n.start.line?n.start:i.end}}return this._rangeCache}else return{start:Xr.create(0,0),end:Xr.create(0,0)}}get firstNonHiddenNode(){for(let e of this.content)if(!e.hidden)return e;return this.content[0]}get lastNonHiddenNode(){for(let e=this.content.length-1;e>=0;e--){let r=this.content[e];if(!r.hidden)return r}return this.content[this.content.length-1]}},hM=class t extends Array{static{o(this,"CstNodeContainer")}constructor(e){super(),this.parent=e,Object.setPrototypeOf(this,t.prototype)}push(...e){return this.addParents(e),super.push(...e)}unshift(...e){return this.addParents(e),super.unshift(...e)}splice(e,r,...n){return this.addParents(n),super.splice(e,r,...n)}addParents(e){for(let r of e)r.container=this.parent}},vg=class extends u0{static{o(this,"RootCstNodeImpl")}get text(){return this._text.substring(this.offset,this.end)}get fullText(){return this._text}constructor(e){super(),this._text="",this._text=e??""}}});function fM(t){return t.$type===Ak}var Ak,Zle,Jle,_2,L2,_k,xg,D2,gze,dM,N2=M(()=>{"use strict";s0();Koe();Ac();Pl();es();Ck();Ak=Symbol("Datatype");o(fM,"isDataTypeNode");Zle="\u200B",Jle=o(t=>t.endsWith(Zle)?t:t+Zle,"withRuleSuffix"),_2=class{static{o(this,"AbstractLangiumParser")}constructor(e){this._unorderedGroups=new Map,this.lexer=e.parser.Lexer;let r=this.lexer.definition;this.wrapper=new dM(r,Object.assign(Object.assign({},e.parser.ParserConfig),{errorMessageProvider:e.parser.ParserErrorMessageProvider}))}alternatives(e,r){this.wrapper.wrapOr(e,r)}optional(e,r){this.wrapper.wrapOption(e,r)}many(e,r){this.wrapper.wrapMany(e,r)}atLeastOne(e,r){this.wrapper.wrapAtLeastOne(e,r)}isRecording(){return this.wrapper.IS_RECORDING}get unorderedGroups(){return this._unorderedGroups}getRuleStack(){return this.wrapper.RULE_STACK}finalize(){this.wrapper.wrapSelfAnalysis()}},L2=class extends _2{static{o(this,"LangiumParser")}get current(){return this.stack[this.stack.length-1]}constructor(e){super(e),this.nodeBuilder=new C2,this.stack=[],this.assignmentMap=new Map,this.linker=e.references.Linker,this.converter=e.parser.ValueConverter,this.astReflection=e.shared.AstReflection}rule(e,r){let n=e.fragment?void 0:e2(e)?Ak:Zd(e),i=this.wrapper.DEFINE_RULE(Jle(e.name),this.startImplementation(n,r).bind(this));return e.entry&&(this.mainRule=i),i}parse(e){this.nodeBuilder.buildRootNode(e);let r=this.lexer.tokenize(e);this.wrapper.input=r.tokens;let n=this.mainRule.call(this.wrapper,{});return this.nodeBuilder.addHiddenTokens(r.hidden),this.unorderedGroups.clear(),{value:n,lexerErrors:r.errors,parserErrors:this.wrapper.errors}}startImplementation(e,r){return n=>{if(!this.isRecording()){let a={$type:e};this.stack.push(a),e===Ak&&(a.value="")}let i;try{i=r(n)}catch{i=void 0}return!this.isRecording()&&i===void 0&&(i=this.construct()),i}}consume(e,r,n){let i=this.wrapper.wrapConsume(e,r);if(!this.isRecording()&&this.isValidToken(i)){let a=this.nodeBuilder.buildLeafNode(i,n),{assignment:s,isCrossRef:l}=this.getAssignment(n),u=this.current;if(s){let h=Xo(n)?i.image:this.converter.convert(i.image,a);this.assign(s.operator,s.feature,h,a,l)}else if(fM(u)){let h=i.image;Xo(n)||(h=this.converter.convert(h,a).toString()),u.value+=h}}}isValidToken(e){return!e.isInsertedInRecovery&&!isNaN(e.startOffset)&&typeof e.endOffset=="number"&&!isNaN(e.endOffset)}subrule(e,r,n,i){let a;this.isRecording()||(a=this.nodeBuilder.buildCompositeNode(n));let s=this.wrapper.wrapSubrule(e,r,i);!this.isRecording()&&a&&a.length>0&&this.performSubruleAssignment(s,n,a)}performSubruleAssignment(e,r,n){let{assignment:i,isCrossRef:a}=this.getAssignment(r);if(i)this.assign(i.operator,i.feature,e,n,a);else if(!i){let s=this.current;if(fM(s))s.value+=e.toString();else if(typeof e=="object"&&e){let l=e.$type,u=this.assignWithoutOverride(e,s);l&&(u.$type=l);let h=u;this.stack.pop(),this.stack.push(h)}}}action(e,r){if(!this.isRecording()){let n=this.current;if(!n.$cstNode&&r.feature&&r.operator){n=this.construct(!1);let a=n.$cstNode.feature;this.nodeBuilder.buildCompositeNode(a)}let i={$type:e};this.stack.pop(),this.stack.push(i),r.feature&&r.operator&&this.assign(r.operator,r.feature,n,n.$cstNode,!1)}}construct(e=!0){if(this.isRecording())return;let r=this.current;return CT(r),this.nodeBuilder.construct(r),e&&this.stack.pop(),fM(r)?this.converter.convert(r.value,r.$cstNode):($N(this.astReflection,r),r)}getAssignment(e){if(!this.assignmentMap.has(e)){let r=qd(e,Il);this.assignmentMap.set(e,{assignment:r,isCrossRef:r?Yd(r.terminal):!1})}return this.assignmentMap.get(e)}assign(e,r,n,i,a){let s=this.current,l;switch(a&&typeof n=="string"?l=this.linker.buildReference(s,r,i,n):l=n,e){case"=":{s[r]=l;break}case"?=":{s[r]=!0;break}case"+=":Array.isArray(s[r])||(s[r]=[]),s[r].push(l)}}assignWithoutOverride(e,r){for(let[n,i]of Object.entries(r)){let a=e[n];a===void 0?e[n]=i:Array.isArray(a)&&Array.isArray(i)&&(i.push(...a),e[n]=i)}return e}get definitionErrors(){return this.wrapper.definitionErrors}},_k=class{static{o(this,"AbstractParserErrorMessageProvider")}buildMismatchTokenMessage(e){return Fu.buildMismatchTokenMessage(e)}buildNotAllInputParsedMessage(e){return Fu.buildNotAllInputParsedMessage(e)}buildNoViableAltMessage(e){return Fu.buildNoViableAltMessage(e)}buildEarlyExitMessage(e){return Fu.buildEarlyExitMessage(e)}},xg=class extends _k{static{o(this,"LangiumParserErrorMessageProvider")}buildMismatchTokenMessage({expected:e,actual:r}){return`Expecting ${e.LABEL?"`"+e.LABEL+"`":e.name.endsWith(":KW")?`keyword '${e.name.substring(0,e.name.length-3)}'`:`token of type '${e.name}'`} but found \`${r.image}\`.`}buildNotAllInputParsedMessage({firstRedundant:e}){return`Expecting end of file but found \`${e.image}\`.`}},D2=class extends _2{static{o(this,"LangiumCompletionParser")}constructor(){super(...arguments),this.tokens=[],this.elementStack=[],this.lastElementStack=[],this.nextTokenIndex=0,this.stackSize=0}action(){}construct(){}parse(e){this.resetState();let r=this.lexer.tokenize(e);return this.tokens=r.tokens,this.wrapper.input=[...this.tokens],this.mainRule.call(this.wrapper,{}),this.unorderedGroups.clear(),{tokens:this.tokens,elementStack:[...this.lastElementStack],tokenIndex:this.nextTokenIndex}}rule(e,r){let n=this.wrapper.DEFINE_RULE(Jle(e.name),this.startImplementation(r).bind(this));return e.entry&&(this.mainRule=n),n}resetState(){this.elementStack=[],this.lastElementStack=[],this.nextTokenIndex=0,this.stackSize=0}startImplementation(e){return r=>{let n=this.keepStackSize();try{e(r)}finally{this.resetStackSize(n)}}}removeUnexpectedElements(){this.elementStack.splice(this.stackSize)}keepStackSize(){let e=this.elementStack.length;return this.stackSize=e,e}resetStackSize(e){this.removeUnexpectedElements(),this.stackSize=e}consume(e,r,n){this.wrapper.wrapConsume(e,r),this.isRecording()||(this.lastElementStack=[...this.elementStack,n],this.nextTokenIndex=this.currIdx+1)}subrule(e,r,n,i){this.before(n),this.wrapper.wrapSubrule(e,r,i),this.after(n)}before(e){this.isRecording()||this.elementStack.push(e)}after(e){if(!this.isRecording()){let r=this.elementStack.lastIndexOf(e);r>=0&&this.elementStack.splice(r)}}get currIdx(){return this.wrapper.currIdx}},gze={recoveryEnabled:!0,nodeLocationTracking:"full",skipValidations:!0,errorMessageProvider:new xg},dM=class extends b2{static{o(this,"ChevrotainWrapper")}constructor(e,r){let n=r&&"maxLookahead"in r;super(e,Object.assign(Object.assign(Object.assign({},gze),{lookaheadStrategy:n?new zu({maxLookahead:r.maxLookahead}):new E2}),r))}get IS_RECORDING(){return this.RECORDING_PHASE}DEFINE_RULE(e,r){return this.RULE(e,r)}wrapSelfAnalysis(){this.performSelfAnalysis()}wrapConsume(e,r){return this.consume(e,r)}wrapSubrule(e,r,n){return this.subrule(e,r,{ARGS:[n]})}wrapOr(e,r){this.or(e,r)}wrapOption(e,r){this.option(e,r)}wrapMany(e,r){this.many(e,r)}wrapAtLeastOne(e,r){this.atLeastOne(e,r)}}});function Dk(t,e,r){return yze({parser:e,tokens:r,rules:new Map,ruleNames:new Map},t),e}function yze(t,e){let r=Zv(e,!1),n=tn(e.rules).filter(Ma).filter(i=>r.has(i));for(let i of n){let a=Object.assign(Object.assign({},t),{consume:1,optional:1,subrule:1,many:1,or:1});a.rules.set(i.name,t.parser.rule(i,h0(a,i.definition)))}}function h0(t,e,r=!1){let n;if(Xo(e))n=Eze(t,e);else if(Ru(e))n=vze(t,e);else if(Il(e))n=h0(t,e.terminal);else if(Yd(e))n=ece(t,e);else if(Ol(e))n=xze(t,e);else if(kT(e))n=wze(t,e);else if(ST(e))n=Tze(t,e);else if(tf(e))n=kze(t,e);else if(wN(e)){let i=t.consume++;n=o(()=>t.parser.consume(i,oo,e),"method")}else throw new Wd(e.$cstNode,`Unexpected element type: ${e.$type}`);return tce(t,r?void 0:Lk(e),n,e.cardinality)}function vze(t,e){let r=Zd(e);return()=>t.parser.action(r,e)}function xze(t,e){let r=e.rule.ref;if(Ma(r)){let n=t.subrule++,i=e.arguments.length>0?bze(r,e.arguments):()=>({});return a=>t.parser.subrule(n,rce(t,r),e,i(a))}else if(qo(r)){let n=t.consume++,i=pM(t,r.name);return()=>t.parser.consume(n,i,e)}else if(r)ef(r);else throw new Wd(e.$cstNode,`Undefined rule type: ${e.$type}`)}function bze(t,e){let r=e.map(n=>Gu(n.value));return n=>{let i={};for(let a=0;a<r.length;a++){let s=t.parameters[a],l=r[a];i[s.name]=l(n)}return i}}function Gu(t){if(jD(t)){let e=Gu(t.left),r=Gu(t.right);return n=>e(n)||r(n)}else if(qD(t)){let e=Gu(t.left),r=Gu(t.right);return n=>e(n)&&r(n)}else if(eN(t)){let e=Gu(t.value);return r=>!e(r)}else if(iN(t)){let e=t.parameter.ref.name;return r=>r!==void 0&&r[e]===!0}else if(WD(t)){let e=!!t.true;return()=>e}ef(t)}function wze(t,e){if(e.elements.length===1)return h0(t,e.elements[0]);{let r=[];for(let i of e.elements){let a={ALT:h0(t,i,!0)},s=Lk(i);s&&(a.GATE=Gu(s)),r.push(a)}let n=t.or++;return i=>t.parser.alternatives(n,r.map(a=>{let s={ALT:o(()=>a.ALT(i),"ALT")},l=a.GATE;return l&&(s.GATE=()=>l(i)),s}))}}function Tze(t,e){if(e.elements.length===1)return h0(t,e.elements[0]);let r=[];for(let l of e.elements){let u={ALT:h0(t,l,!0)},h=Lk(l);h&&(u.GATE=Gu(h)),r.push(u)}let n=t.or++,i=o((l,u)=>{let h=u.getRuleStack().join("-");return`uGroup_${l}_${h}`},"idFunc"),a=o(l=>t.parser.alternatives(n,r.map((u,h)=>{let f={ALT:o(()=>!0,"ALT")},d=t.parser;f.ALT=()=>{if(u.ALT(l),!d.isRecording()){let m=i(n,d);d.unorderedGroups.get(m)||d.unorderedGroups.set(m,[]);let g=d.unorderedGroups.get(m);typeof g?.[h]>"u"&&(g[h]=!0)}};let p=u.GATE;return p?f.GATE=()=>p(l):f.GATE=()=>{let m=d.unorderedGroups.get(i(n,d));return!m?.[h]},f})),"alternatives"),s=tce(t,Lk(e),a,"*");return l=>{s(l),t.parser.isRecording()||t.parser.unorderedGroups.delete(i(n,t.parser))}}function kze(t,e){let r=e.elements.map(n=>h0(t,n));return n=>r.forEach(i=>i(n))}function Lk(t){if(tf(t))return t.guardCondition}function ece(t,e,r=e.terminal){if(r)if(Ol(r)&&Ma(r.rule.ref)){let n=t.subrule++;return i=>t.parser.subrule(n,rce(t,r.rule.ref),e,i)}else if(Ol(r)&&qo(r.rule.ref)){let n=t.consume++,i=pM(t,r.rule.ref.name);return()=>t.parser.consume(n,i,e)}else if(Xo(r)){let n=t.consume++,i=pM(t,r.value);return()=>t.parser.consume(n,i,e)}else throw new Error("Could not build cross reference parser");else{if(!e.type.ref)throw new Error("Could not resolve reference to type: "+e.type.$refText);let n=RT(e.type.ref),i=n?.terminal;if(!i)throw new Error("Could not find name assignment for type: "+Zd(e.type.ref));return ece(t,e,i)}}function Eze(t,e){let r=t.consume++,n=t.tokens[e.value];if(!n)throw new Error("Could not find token for keyword: "+e.value);return()=>t.parser.consume(r,n,e)}function tce(t,e,r,n){let i=e&&Gu(e);if(!n)if(i){let a=t.or++;return s=>t.parser.alternatives(a,[{ALT:o(()=>r(s),"ALT"),GATE:o(()=>i(s),"GATE")},{ALT:vk(),GATE:o(()=>!i(s),"GATE")}])}else return r;if(n==="*"){let a=t.many++;return s=>t.parser.many(a,{DEF:o(()=>r(s),"DEF"),GATE:i?()=>i(s):void 0})}else if(n==="+"){let a=t.many++;if(i){let s=t.or++;return l=>t.parser.alternatives(s,[{ALT:o(()=>t.parser.atLeastOne(a,{DEF:o(()=>r(l),"DEF")}),"ALT"),GATE:o(()=>i(l),"GATE")},{ALT:vk(),GATE:o(()=>!i(l),"GATE")}])}else return s=>t.parser.atLeastOne(a,{DEF:o(()=>r(s),"DEF")})}else if(n==="?"){let a=t.optional++;return s=>t.parser.optional(a,{DEF:o(()=>r(s),"DEF"),GATE:i?()=>i(s):void 0})}else ef(n)}function rce(t,e){let r=Sze(t,e),n=t.rules.get(r);if(!n)throw new Error(`Rule "${r}" not found."`);return n}function Sze(t,e){if(Ma(e))return e.name;if(t.ruleNames.has(e))return t.ruleNames.get(e);{let r=e,n=r.$container,i=e.$type;for(;!Ma(n);)(tf(n)||kT(n)||ST(n))&&(i=n.elements.indexOf(r).toString()+":"+i),r=n,n=n.$container;return i=n.name+":"+i,t.ruleNames.set(e,i),i}}function pM(t,e){let r=t.tokens[e];if(!r)throw new Error(`Token "${e}" not found."`);return r}var mM=M(()=>{"use strict";s0();Ac();gT();Rs();Pl();o(Dk,"createParser");o(yze,"buildRules");o(h0,"buildElement");o(vze,"buildAction");o(xze,"buildRuleCall");o(bze,"buildRuleCallPredicate");o(Gu,"buildPredicate");o(wze,"buildAlternatives");o(Tze,"buildUnorderedGroup");o(kze,"buildGroup");o(Lk,"getGuardCondition");o(ece,"buildCrossReference");o(Eze,"buildKeyword");o(tce,"wrap");o(rce,"getRule");o(Sze,"getRuleName");o(pM,"getToken")});function gM(t){let e=t.Grammar,r=t.parser.Lexer,n=new D2(t);return Dk(e,n,r.definition),n.finalize(),n}var yM=M(()=>{"use strict";N2();mM();o(gM,"createCompletionParser")});function vM(t){let e=nce(t);return e.finalize(),e}function nce(t){let e=t.Grammar,r=t.parser.Lexer,n=new L2(t);return Dk(e,n,r.definition)}var xM=M(()=>{"use strict";N2();mM();o(vM,"createLangiumParser");o(nce,"prepareLangiumParser")});var f0,bM=M(()=>{"use strict";s0();Ac();es();Pl();Wm();Rs();f0=class{static{o(this,"DefaultTokenBuilder")}buildTokens(e,r){let n=tn(Zv(e,!1)),i=this.buildTerminalTokens(n),a=this.buildKeywordTokens(n,i,r);return i.forEach(s=>{let l=s.PATTERN;typeof l=="object"&&l&&"test"in l&&DT(l)?a.unshift(s):a.push(s)}),a}buildTerminalTokens(e){return e.filter(qo).filter(r=>!r.fragment).map(r=>this.buildTerminalToken(r)).toArray()}buildTerminalToken(e){let r=Ym(e),n=this.requiresCustomPattern(r)?this.regexPatternFunction(r):r,i={name:e.name,PATTERN:n,LINE_BREAKS:!0};return e.hidden&&(i.GROUP=DT(r)?oi.SKIPPED:"hidden"),i}requiresCustomPattern(e){return e.flags.includes("u")?!0:!!(e.source.includes("?<=")||e.source.includes("?<!"))}regexPatternFunction(e){let r=new RegExp(e,e.flags+"y");return(n,i)=>(r.lastIndex=i,r.exec(n))}buildKeywordTokens(e,r,n){return e.filter(Ma).flatMap(i=>_c(i).filter(Xo)).distinct(i=>i.value).toArray().sort((i,a)=>a.value.length-i.value.length).map(i=>this.buildKeywordToken(i,r,!!n?.caseInsensitive))}buildKeywordToken(e,r,n){return{name:e.value,PATTERN:this.buildKeywordPattern(e,n),LONGER_ALT:this.findLongerAlt(e,r)}}buildKeywordPattern(e,r){return r?new RegExp(XN(e.value)):e.value}findLongerAlt(e,r){return r.reduce((n,i)=>{let a=i?.PATTERN;return a?.source&&jN("^"+a.source+"$",e.value)&&n.push(i),n},[])}}});var d0,Nc,wM=M(()=>{"use strict";Ac();Pl();d0=class{static{o(this,"DefaultValueConverter")}convert(e,r){let n=r.grammarSource;if(Yd(n)&&(n=ZN(n)),Ol(n)){let i=n.rule.ref;if(!i)throw new Error("This cst node was not parsed by a rule.");return this.runConverter(i,e,r)}return e}runConverter(e,r,n){var i;switch(e.name.toUpperCase()){case"INT":return Nc.convertInt(r);case"STRING":return Nc.convertString(r);case"ID":return Nc.convertID(r)}switch((i=sR(e))===null||i===void 0?void 0:i.toLowerCase()){case"number":return Nc.convertNumber(r);case"boolean":return Nc.convertBoolean(r);case"bigint":return Nc.convertBigint(r);case"date":return Nc.convertDate(r);default:return r}}};(function(t){function e(h){let f="";for(let d=1;d<h.length-1;d++){let p=h.charAt(d);if(p==="\\"){let m=h.charAt(++d);f+=r(m)}else f+=p}return f}o(e,"convertString"),t.convertString=e;function r(h){switch(h){case"b":return"\b";case"f":return"\f";case"n":return` +`;case"r":return"\r";case"t":return" ";case"v":return"\v";case"0":return"\0";default:return h}}o(r,"convertEscapeCharacter");function n(h){return h.charAt(0)==="^"?h.substring(1):h}o(n,"convertID"),t.convertID=n;function i(h){return parseInt(h)}o(i,"convertInt"),t.convertInt=i;function a(h){return BigInt(h)}o(a,"convertBigint"),t.convertBigint=a;function s(h){return new Date(h)}o(s,"convertDate"),t.convertDate=s;function l(h){return Number(h)}o(l,"convertNumber"),t.convertNumber=l;function u(h){return h.toLowerCase()==="true"}o(u,"convertBoolean"),t.convertBoolean=u})(Nc||(Nc={}))});var SM=Ni(EM=>{"use strict";Object.defineProperty(EM,"__esModule",{value:!0});var TM;function kM(){if(TM===void 0)throw new Error("No runtime abstraction layer installed");return TM}o(kM,"RAL");(function(t){function e(r){if(r===void 0)throw new Error("No runtime abstraction layer provided");TM=r}o(e,"install"),t.install=e})(kM||(kM={}));EM.default=kM});var sce=Ni(Ia=>{"use strict";Object.defineProperty(Ia,"__esModule",{value:!0});Ia.stringArray=Ia.array=Ia.func=Ia.error=Ia.number=Ia.string=Ia.boolean=void 0;function Cze(t){return t===!0||t===!1}o(Cze,"boolean");Ia.boolean=Cze;function ice(t){return typeof t=="string"||t instanceof String}o(ice,"string");Ia.string=ice;function Aze(t){return typeof t=="number"||t instanceof Number}o(Aze,"number");Ia.number=Aze;function _ze(t){return t instanceof Error}o(_ze,"error");Ia.error=_ze;function Lze(t){return typeof t=="function"}o(Lze,"func");Ia.func=Lze;function ace(t){return Array.isArray(t)}o(ace,"array");Ia.array=ace;function Dze(t){return ace(t)&&t.every(e=>ice(e))}o(Dze,"stringArray");Ia.stringArray=Dze});var AM=Ni(bg=>{"use strict";Object.defineProperty(bg,"__esModule",{value:!0});bg.Emitter=bg.Event=void 0;var Nze=SM(),oce;(function(t){let e={dispose(){}};t.None=function(){return e}})(oce||(bg.Event=oce={}));var CM=class{static{o(this,"CallbackList")}add(e,r=null,n){this._callbacks||(this._callbacks=[],this._contexts=[]),this._callbacks.push(e),this._contexts.push(r),Array.isArray(n)&&n.push({dispose:o(()=>this.remove(e,r),"dispose")})}remove(e,r=null){if(!this._callbacks)return;let n=!1;for(let i=0,a=this._callbacks.length;i<a;i++)if(this._callbacks[i]===e)if(this._contexts[i]===r){this._callbacks.splice(i,1),this._contexts.splice(i,1);return}else n=!0;if(n)throw new Error("When adding a listener with a context, you should remove it with the same context")}invoke(...e){if(!this._callbacks)return[];let r=[],n=this._callbacks.slice(0),i=this._contexts.slice(0);for(let a=0,s=n.length;a<s;a++)try{r.push(n[a].apply(i[a],e))}catch(l){(0,Nze.default)().console.error(l)}return r}isEmpty(){return!this._callbacks||this._callbacks.length===0}dispose(){this._callbacks=void 0,this._contexts=void 0}},Nk=class t{static{o(this,"Emitter")}constructor(e){this._options=e}get event(){return this._event||(this._event=(e,r,n)=>{this._callbacks||(this._callbacks=new CM),this._options&&this._options.onFirstListenerAdd&&this._callbacks.isEmpty()&&this._options.onFirstListenerAdd(this),this._callbacks.add(e,r);let i={dispose:o(()=>{this._callbacks&&(this._callbacks.remove(e,r),i.dispose=t._noop,this._options&&this._options.onLastListenerRemove&&this._callbacks.isEmpty()&&this._options.onLastListenerRemove(this))},"dispose")};return Array.isArray(n)&&n.push(i),i}),this._event}fire(e){this._callbacks&&this._callbacks.invoke.call(this._callbacks,e)}dispose(){this._callbacks&&(this._callbacks.dispose(),this._callbacks=void 0)}};bg.Emitter=Nk;Nk._noop=function(){}});var lce=Ni(wg=>{"use strict";Object.defineProperty(wg,"__esModule",{value:!0});wg.CancellationTokenSource=wg.CancellationToken=void 0;var Rze=SM(),Mze=sce(),_M=AM(),Rk;(function(t){t.None=Object.freeze({isCancellationRequested:!1,onCancellationRequested:_M.Event.None}),t.Cancelled=Object.freeze({isCancellationRequested:!0,onCancellationRequested:_M.Event.None});function e(r){let n=r;return n&&(n===t.None||n===t.Cancelled||Mze.boolean(n.isCancellationRequested)&&!!n.onCancellationRequested)}o(e,"is"),t.is=e})(Rk||(wg.CancellationToken=Rk={}));var Ize=Object.freeze(function(t,e){let r=(0,Rze.default)().timer.setTimeout(t.bind(e),0);return{dispose(){r.dispose()}}}),Mk=class{static{o(this,"MutableToken")}constructor(){this._isCancelled=!1}cancel(){this._isCancelled||(this._isCancelled=!0,this._emitter&&(this._emitter.fire(void 0),this.dispose()))}get isCancellationRequested(){return this._isCancelled}get onCancellationRequested(){return this._isCancelled?Ize:(this._emitter||(this._emitter=new _M.Emitter),this._emitter.event)}dispose(){this._emitter&&(this._emitter.dispose(),this._emitter=void 0)}},LM=class{static{o(this,"CancellationTokenSource")}get token(){return this._token||(this._token=new Mk),this._token}cancel(){this._token?this._token.cancel():this._token=Rk.Cancelled}dispose(){this._token?this._token instanceof Mk&&this._token.dispose():this._token=Rk.None}};wg.CancellationTokenSource=LM});var Cr={};var Ko=M(()=>{"use strict";Er(Cr,ka(lce(),1))});function NM(){return new Promise(t=>{typeof setImmediate>"u"?setTimeout(t,0):setImmediate(t)})}function uce(){return DM=Date.now(),new Cr.CancellationTokenSource}function hce(t){cce=t}function sf(t){return t===Rc}async function Gi(t){if(t===Cr.CancellationToken.None)return;let e=Date.now();if(e-DM>=cce&&(DM=e,await NM()),t.isCancellationRequested)throw Rc}var DM,cce,Rc,as,Qo=M(()=>{"use strict";Ko();o(NM,"delayNextTick");DM=0,cce=10;o(uce,"startCancelableOperation");o(hce,"setInterruptionPeriod");Rc=Symbol("OperationCancelled");o(sf,"isOperationCancelled");o(Gi,"interruptAndCheck");as=class{static{o(this,"Deferred")}constructor(){this.promise=new Promise((e,r)=>{this.resolve=n=>(e(n),this),this.reject=n=>(r(n),this)})}}});function RM(t,e){if(t.length<=1)return t;let r=t.length/2|0,n=t.slice(0,r),i=t.slice(r);RM(n,e),RM(i,e);let a=0,s=0,l=0;for(;a<n.length&&s<i.length;)e(n[a],i[s])<=0?t[l++]=n[a++]:t[l++]=i[s++];for(;a<n.length;)t[l++]=n[a++];for(;s<i.length;)t[l++]=i[s++];return t}function fce(t,e,r=0){let n=e?[r]:[];for(let i=0;i<t.length;i++){let a=t.charCodeAt(i);dce(a)&&(a===13&&i+1<t.length&&t.charCodeAt(i+1)===10&&i++,n.push(r+i+1))}return n}function dce(t){return t===13||t===10}function pce(t){let e=t.start,r=t.end;return e.line>r.line||e.line===r.line&&e.character>r.character?{start:r,end:e}:t}function Oze(t){let e=pce(t.range);return e!==t.range?{newText:t.newText,range:e}:t}var Ik,Tg,mce=M(()=>{"use strict";Ik=class t{static{o(this,"FullTextDocument")}constructor(e,r,n,i){this._uri=e,this._languageId=r,this._version=n,this._content=i,this._lineOffsets=void 0}get uri(){return this._uri}get languageId(){return this._languageId}get version(){return this._version}getText(e){if(e){let r=this.offsetAt(e.start),n=this.offsetAt(e.end);return this._content.substring(r,n)}return this._content}update(e,r){for(let n of e)if(t.isIncremental(n)){let i=pce(n.range),a=this.offsetAt(i.start),s=this.offsetAt(i.end);this._content=this._content.substring(0,a)+n.text+this._content.substring(s,this._content.length);let l=Math.max(i.start.line,0),u=Math.max(i.end.line,0),h=this._lineOffsets,f=fce(n.text,!1,a);if(u-l===f.length)for(let p=0,m=f.length;p<m;p++)h[p+l+1]=f[p];else f.length<1e4?h.splice(l+1,u-l,...f):this._lineOffsets=h=h.slice(0,l+1).concat(f,h.slice(u+1));let d=n.text.length-(s-a);if(d!==0)for(let p=l+1+f.length,m=h.length;p<m;p++)h[p]=h[p]+d}else if(t.isFull(n))this._content=n.text,this._lineOffsets=void 0;else throw new Error("Unknown change event received");this._version=r}getLineOffsets(){return this._lineOffsets===void 0&&(this._lineOffsets=fce(this._content,!0)),this._lineOffsets}positionAt(e){e=Math.max(Math.min(e,this._content.length),0);let r=this.getLineOffsets(),n=0,i=r.length;if(i===0)return{line:0,character:e};for(;n<i;){let s=Math.floor((n+i)/2);r[s]>e?i=s:n=s+1}let a=n-1;return e=this.ensureBeforeEOL(e,r[a]),{line:a,character:e-r[a]}}offsetAt(e){let r=this.getLineOffsets();if(e.line>=r.length)return this._content.length;if(e.line<0)return 0;let n=r[e.line];if(e.character<=0)return n;let i=e.line+1<r.length?r[e.line+1]:this._content.length,a=Math.min(n+e.character,i);return this.ensureBeforeEOL(a,n)}ensureBeforeEOL(e,r){for(;e>r&&dce(this._content.charCodeAt(e-1));)e--;return e}get lineCount(){return this.getLineOffsets().length}static isIncremental(e){let r=e;return r!=null&&typeof r.text=="string"&&r.range!==void 0&&(r.rangeLength===void 0||typeof r.rangeLength=="number")}static isFull(e){let r=e;return r!=null&&typeof r.text=="string"&&r.range===void 0&&r.rangeLength===void 0}};(function(t){function e(i,a,s,l){return new Ik(i,a,s,l)}o(e,"create"),t.create=e;function r(i,a,s){if(i instanceof Ik)return i.update(a,s),i;throw new Error("TextDocument.update: document must be created by TextDocument.create")}o(r,"update"),t.update=r;function n(i,a){let s=i.getText(),l=RM(a.map(Oze),(f,d)=>{let p=f.range.start.line-d.range.start.line;return p===0?f.range.start.character-d.range.start.character:p}),u=0,h=[];for(let f of l){let d=i.offsetAt(f.range.start);if(d<u)throw new Error("Overlapping edit");d>u&&h.push(s.substring(u,d)),f.newText.length&&h.push(f.newText),u=i.offsetAt(f.range.end)}return h.push(s.substr(u)),h.join("")}o(n,"applyEdits"),t.applyEdits=n})(Tg||(Tg={}));o(RM,"mergeSort");o(fce,"computeLineOffsets");o(dce,"isEOL");o(pce,"getWellformedRange");o(Oze,"getWellformedEdit")});var gce,Os,kg,MM=M(()=>{"use strict";(()=>{"use strict";var t={470:i=>{function a(u){if(typeof u!="string")throw new TypeError("Path must be a string. Received "+JSON.stringify(u))}o(a,"e");function s(u,h){for(var f,d="",p=0,m=-1,g=0,y=0;y<=u.length;++y){if(y<u.length)f=u.charCodeAt(y);else{if(f===47)break;f=47}if(f===47){if(!(m===y-1||g===1))if(m!==y-1&&g===2){if(d.length<2||p!==2||d.charCodeAt(d.length-1)!==46||d.charCodeAt(d.length-2)!==46){if(d.length>2){var v=d.lastIndexOf("/");if(v!==d.length-1){v===-1?(d="",p=0):p=(d=d.slice(0,v)).length-1-d.lastIndexOf("/"),m=y,g=0;continue}}else if(d.length===2||d.length===1){d="",p=0,m=y,g=0;continue}}h&&(d.length>0?d+="/..":d="..",p=2)}else d.length>0?d+="/"+u.slice(m+1,y):d=u.slice(m+1,y),p=y-m-1;m=y,g=0}else f===46&&g!==-1?++g:g=-1}return d}o(s,"r");var l={resolve:o(function(){for(var u,h="",f=!1,d=arguments.length-1;d>=-1&&!f;d--){var p;d>=0?p=arguments[d]:(u===void 0&&(u=process.cwd()),p=u),a(p),p.length!==0&&(h=p+"/"+h,f=p.charCodeAt(0)===47)}return h=s(h,!f),f?h.length>0?"/"+h:"/":h.length>0?h:"."},"resolve"),normalize:o(function(u){if(a(u),u.length===0)return".";var h=u.charCodeAt(0)===47,f=u.charCodeAt(u.length-1)===47;return(u=s(u,!h)).length!==0||h||(u="."),u.length>0&&f&&(u+="/"),h?"/"+u:u},"normalize"),isAbsolute:o(function(u){return a(u),u.length>0&&u.charCodeAt(0)===47},"isAbsolute"),join:o(function(){if(arguments.length===0)return".";for(var u,h=0;h<arguments.length;++h){var f=arguments[h];a(f),f.length>0&&(u===void 0?u=f:u+="/"+f)}return u===void 0?".":l.normalize(u)},"join"),relative:o(function(u,h){if(a(u),a(h),u===h||(u=l.resolve(u))===(h=l.resolve(h)))return"";for(var f=1;f<u.length&&u.charCodeAt(f)===47;++f);for(var d=u.length,p=d-f,m=1;m<h.length&&h.charCodeAt(m)===47;++m);for(var g=h.length-m,y=p<g?p:g,v=-1,x=0;x<=y;++x){if(x===y){if(g>y){if(h.charCodeAt(m+x)===47)return h.slice(m+x+1);if(x===0)return h.slice(m+x)}else p>y&&(u.charCodeAt(f+x)===47?v=x:x===0&&(v=0));break}var b=u.charCodeAt(f+x);if(b!==h.charCodeAt(m+x))break;b===47&&(v=x)}var w="";for(x=f+v+1;x<=d;++x)x!==d&&u.charCodeAt(x)!==47||(w.length===0?w+="..":w+="/..");return w.length>0?w+h.slice(m+v):(m+=v,h.charCodeAt(m)===47&&++m,h.slice(m))},"relative"),_makeLong:o(function(u){return u},"_makeLong"),dirname:o(function(u){if(a(u),u.length===0)return".";for(var h=u.charCodeAt(0),f=h===47,d=-1,p=!0,m=u.length-1;m>=1;--m)if((h=u.charCodeAt(m))===47){if(!p){d=m;break}}else p=!1;return d===-1?f?"/":".":f&&d===1?"//":u.slice(0,d)},"dirname"),basename:o(function(u,h){if(h!==void 0&&typeof h!="string")throw new TypeError('"ext" argument must be a string');a(u);var f,d=0,p=-1,m=!0;if(h!==void 0&&h.length>0&&h.length<=u.length){if(h.length===u.length&&h===u)return"";var g=h.length-1,y=-1;for(f=u.length-1;f>=0;--f){var v=u.charCodeAt(f);if(v===47){if(!m){d=f+1;break}}else y===-1&&(m=!1,y=f+1),g>=0&&(v===h.charCodeAt(g)?--g==-1&&(p=f):(g=-1,p=y))}return d===p?p=y:p===-1&&(p=u.length),u.slice(d,p)}for(f=u.length-1;f>=0;--f)if(u.charCodeAt(f)===47){if(!m){d=f+1;break}}else p===-1&&(m=!1,p=f+1);return p===-1?"":u.slice(d,p)},"basename"),extname:o(function(u){a(u);for(var h=-1,f=0,d=-1,p=!0,m=0,g=u.length-1;g>=0;--g){var y=u.charCodeAt(g);if(y!==47)d===-1&&(p=!1,d=g+1),y===46?h===-1?h=g:m!==1&&(m=1):h!==-1&&(m=-1);else if(!p){f=g+1;break}}return h===-1||d===-1||m===0||m===1&&h===d-1&&h===f+1?"":u.slice(h,d)},"extname"),format:o(function(u){if(u===null||typeof u!="object")throw new TypeError('The "pathObject" argument must be of type Object. Received type '+typeof u);return function(h,f){var d=f.dir||f.root,p=f.base||(f.name||"")+(f.ext||"");return d?d===f.root?d+p:d+"/"+p:p}(0,u)},"format"),parse:o(function(u){a(u);var h={root:"",dir:"",base:"",ext:"",name:""};if(u.length===0)return h;var f,d=u.charCodeAt(0),p=d===47;p?(h.root="/",f=1):f=0;for(var m=-1,g=0,y=-1,v=!0,x=u.length-1,b=0;x>=f;--x)if((d=u.charCodeAt(x))!==47)y===-1&&(v=!1,y=x+1),d===46?m===-1?m=x:b!==1&&(b=1):m!==-1&&(b=-1);else if(!v){g=x+1;break}return m===-1||y===-1||b===0||b===1&&m===y-1&&m===g+1?y!==-1&&(h.base=h.name=g===0&&p?u.slice(1,y):u.slice(g,y)):(g===0&&p?(h.name=u.slice(1,m),h.base=u.slice(1,y)):(h.name=u.slice(g,m),h.base=u.slice(g,y)),h.ext=u.slice(m,y)),g>0?h.dir=u.slice(0,g-1):p&&(h.dir="/"),h},"parse"),sep:"/",delimiter:":",win32:null,posix:null};l.posix=l,i.exports=l}},e={};function r(i){var a=e[i];if(a!==void 0)return a.exports;var s=e[i]={exports:{}};return t[i](s,s.exports,r),s.exports}o(r,"r"),r.d=(i,a)=>{for(var s in a)r.o(a,s)&&!r.o(i,s)&&Object.defineProperty(i,s,{enumerable:!0,get:a[s]})},r.o=(i,a)=>Object.prototype.hasOwnProperty.call(i,a),r.r=i=>{typeof Symbol<"u"&&Symbol.toStringTag&&Object.defineProperty(i,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(i,"__esModule",{value:!0})};var n={};(()=>{let i;r.r(n),r.d(n,{URI:o(()=>p,"URI"),Utils:o(()=>I,"Utils")}),typeof process=="object"?i=process.platform==="win32":typeof navigator=="object"&&(i=navigator.userAgent.indexOf("Windows")>=0);let a=/^\w[\w\d+.-]*$/,s=/^\//,l=/^\/\//;function u(D,k){if(!D.scheme&&k)throw new Error(`[UriError]: Scheme is missing: {scheme: "", authority: "${D.authority}", path: "${D.path}", query: "${D.query}", fragment: "${D.fragment}"}`);if(D.scheme&&!a.test(D.scheme))throw new Error("[UriError]: Scheme contains illegal characters.");if(D.path){if(D.authority){if(!s.test(D.path))throw new Error('[UriError]: If a URI contains an authority component, then the path component must either be empty or begin with a slash ("/") character')}else if(l.test(D.path))throw new Error('[UriError]: If a URI does not contain an authority component, then the path cannot begin with two slash characters ("//")')}}o(u,"s");let h="",f="/",d=/^(([^:/?#]+?):)?(\/\/([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/;class p{static{o(this,"f")}static isUri(k){return k instanceof p||!!k&&typeof k.authority=="string"&&typeof k.fragment=="string"&&typeof k.path=="string"&&typeof k.query=="string"&&typeof k.scheme=="string"&&typeof k.fsPath=="string"&&typeof k.with=="function"&&typeof k.toString=="function"}scheme;authority;path;query;fragment;constructor(k,R,S,O,N,P=!1){typeof k=="object"?(this.scheme=k.scheme||h,this.authority=k.authority||h,this.path=k.path||h,this.query=k.query||h,this.fragment=k.fragment||h):(this.scheme=function(F,B){return F||B?F:"file"}(k,P),this.authority=R||h,this.path=function(F,B){switch(F){case"https":case"http":case"file":B?B[0]!==f&&(B=f+B):B=f}return B}(this.scheme,S||h),this.query=O||h,this.fragment=N||h,u(this,P))}get fsPath(){return b(this,!1)}with(k){if(!k)return this;let{scheme:R,authority:S,path:O,query:N,fragment:P}=k;return R===void 0?R=this.scheme:R===null&&(R=h),S===void 0?S=this.authority:S===null&&(S=h),O===void 0?O=this.path:O===null&&(O=h),N===void 0?N=this.query:N===null&&(N=h),P===void 0?P=this.fragment:P===null&&(P=h),R===this.scheme&&S===this.authority&&O===this.path&&N===this.query&&P===this.fragment?this:new g(R,S,O,N,P)}static parse(k,R=!1){let S=d.exec(k);return S?new g(S[2]||h,E(S[4]||h),E(S[5]||h),E(S[7]||h),E(S[9]||h),R):new g(h,h,h,h,h)}static file(k){let R=h;if(i&&(k=k.replace(/\\/g,f)),k[0]===f&&k[1]===f){let S=k.indexOf(f,2);S===-1?(R=k.substring(2),k=f):(R=k.substring(2,S),k=k.substring(S)||f)}return new g("file",R,k,h,h)}static from(k){let R=new g(k.scheme,k.authority,k.path,k.query,k.fragment);return u(R,!0),R}toString(k=!1){return w(this,k)}toJSON(){return this}static revive(k){if(k){if(k instanceof p)return k;{let R=new g(k);return R._formatted=k.external,R._fsPath=k._sep===m?k.fsPath:null,R}}return k}}let m=i?1:void 0;class g extends p{static{o(this,"l")}_formatted=null;_fsPath=null;get fsPath(){return this._fsPath||(this._fsPath=b(this,!1)),this._fsPath}toString(k=!1){return k?w(this,!0):(this._formatted||(this._formatted=w(this,!1)),this._formatted)}toJSON(){let k={$mid:1};return this._fsPath&&(k.fsPath=this._fsPath,k._sep=m),this._formatted&&(k.external=this._formatted),this.path&&(k.path=this.path),this.scheme&&(k.scheme=this.scheme),this.authority&&(k.authority=this.authority),this.query&&(k.query=this.query),this.fragment&&(k.fragment=this.fragment),k}}let y={58:"%3A",47:"%2F",63:"%3F",35:"%23",91:"%5B",93:"%5D",64:"%40",33:"%21",36:"%24",38:"%26",39:"%27",40:"%28",41:"%29",42:"%2A",43:"%2B",44:"%2C",59:"%3B",61:"%3D",32:"%20"};function v(D,k,R){let S,O=-1;for(let N=0;N<D.length;N++){let P=D.charCodeAt(N);if(P>=97&&P<=122||P>=65&&P<=90||P>=48&&P<=57||P===45||P===46||P===95||P===126||k&&P===47||R&&P===91||R&&P===93||R&&P===58)O!==-1&&(S+=encodeURIComponent(D.substring(O,N)),O=-1),S!==void 0&&(S+=D.charAt(N));else{S===void 0&&(S=D.substr(0,N));let F=y[P];F!==void 0?(O!==-1&&(S+=encodeURIComponent(D.substring(O,N)),O=-1),S+=F):O===-1&&(O=N)}}return O!==-1&&(S+=encodeURIComponent(D.substring(O))),S!==void 0?S:D}o(v,"d");function x(D){let k;for(let R=0;R<D.length;R++){let S=D.charCodeAt(R);S===35||S===63?(k===void 0&&(k=D.substr(0,R)),k+=y[S]):k!==void 0&&(k+=D[R])}return k!==void 0?k:D}o(x,"p");function b(D,k){let R;return R=D.authority&&D.path.length>1&&D.scheme==="file"?`//${D.authority}${D.path}`:D.path.charCodeAt(0)===47&&(D.path.charCodeAt(1)>=65&&D.path.charCodeAt(1)<=90||D.path.charCodeAt(1)>=97&&D.path.charCodeAt(1)<=122)&&D.path.charCodeAt(2)===58?k?D.path.substr(1):D.path[1].toLowerCase()+D.path.substr(2):D.path,i&&(R=R.replace(/\//g,"\\")),R}o(b,"m");function w(D,k){let R=k?x:v,S="",{scheme:O,authority:N,path:P,query:F,fragment:B}=D;if(O&&(S+=O,S+=":"),(N||O==="file")&&(S+=f,S+=f),N){let $=N.indexOf("@");if($!==-1){let z=N.substr(0,$);N=N.substr($+1),$=z.lastIndexOf(":"),$===-1?S+=R(z,!1,!1):(S+=R(z.substr(0,$),!1,!1),S+=":",S+=R(z.substr($+1),!1,!0)),S+="@"}N=N.toLowerCase(),$=N.lastIndexOf(":"),$===-1?S+=R(N,!1,!0):(S+=R(N.substr(0,$),!1,!0),S+=N.substr($))}if(P){if(P.length>=3&&P.charCodeAt(0)===47&&P.charCodeAt(2)===58){let $=P.charCodeAt(1);$>=65&&$<=90&&(P=`/${String.fromCharCode($+32)}:${P.substr(3)}`)}else if(P.length>=2&&P.charCodeAt(1)===58){let $=P.charCodeAt(0);$>=65&&$<=90&&(P=`${String.fromCharCode($+32)}:${P.substr(2)}`)}S+=R(P,!0,!1)}return F&&(S+="?",S+=R(F,!1,!1)),B&&(S+="#",S+=k?B:v(B,!1,!1)),S}o(w,"y");function _(D){try{return decodeURIComponent(D)}catch{return D.length>3?D.substr(0,3)+_(D.substr(3)):D}}o(_,"v");let T=/(%[0-9A-Za-z][0-9A-Za-z])+/g;function E(D){return D.match(T)?D.replace(T,k=>_(k)):D}o(E,"C");var L=r(470);let C=L.posix||L,A="/";var I;(function(D){D.joinPath=function(k,...R){return k.with({path:C.join(k.path,...R)})},D.resolvePath=function(k,...R){let S=k.path,O=!1;S[0]!==A&&(S=A+S,O=!0);let N=C.resolve(S,...R);return O&&N[0]===A&&!k.authority&&(N=N.substring(1)),k.with({path:N})},D.dirname=function(k){if(k.path.length===0||k.path===A)return k;let R=C.dirname(k.path);return R.length===1&&R.charCodeAt(0)===46&&(R=""),k.with({path:R})},D.basename=function(k){return C.basename(k.path)},D.extname=function(k){return C.extname(k.path)}})(I||(I={}))})(),gce=n})();({URI:Os,Utils:kg}=gce)});var ss,Mc=M(()=>{"use strict";MM();(function(t){t.basename=kg.basename,t.dirname=kg.dirname,t.extname=kg.extname,t.joinPath=kg.joinPath,t.resolvePath=kg.resolvePath;function e(n,i){return n?.toString()===i?.toString()}o(e,"equals"),t.equals=e;function r(n,i){let a=typeof n=="string"?n:n.path,s=typeof i=="string"?i:i.path,l=a.split("/").filter(p=>p.length>0),u=s.split("/").filter(p=>p.length>0),h=0;for(;h<l.length&&l[h]===u[h];h++);let f="../".repeat(l.length-h),d=u.slice(h).join("/");return f+d}o(r,"relative"),t.relative=r})(ss||(ss={}))});var bn,R2,M2,Eg=M(()=>{"use strict";mce();Eg();Ko();Rs();Mc();(function(t){t[t.Changed=0]="Changed",t[t.Parsed=1]="Parsed",t[t.IndexedContent=2]="IndexedContent",t[t.ComputedScopes=3]="ComputedScopes",t[t.Linked=4]="Linked",t[t.IndexedReferences=5]="IndexedReferences",t[t.Validated=6]="Validated"})(bn||(bn={}));R2=class{static{o(this,"DefaultLangiumDocumentFactory")}constructor(e){this.serviceRegistry=e.ServiceRegistry,this.textDocuments=e.workspace.TextDocuments,this.fileSystemProvider=e.workspace.FileSystemProvider}async fromUri(e,r=Cr.CancellationToken.None){let n=await this.fileSystemProvider.readFile(e);return this.createAsync(e,n,r)}fromTextDocument(e,r,n){return r=r??Os.parse(e.uri),n?this.createAsync(r,e,n):this.create(r,e)}fromString(e,r,n){return n?this.createAsync(r,e,n):this.create(r,e)}fromModel(e,r){return this.create(r,{$model:e})}create(e,r){if(typeof r=="string"){let n=this.parse(e,r);return this.createLangiumDocument(n,e,void 0,r)}else if("$model"in r){let n={value:r.$model,parserErrors:[],lexerErrors:[]};return this.createLangiumDocument(n,e)}else{let n=this.parse(e,r.getText());return this.createLangiumDocument(n,e,r)}}async createAsync(e,r,n){if(typeof r=="string"){let i=await this.parseAsync(e,r,n);return this.createLangiumDocument(i,e,void 0,r)}else{let i=await this.parseAsync(e,r.getText(),n);return this.createLangiumDocument(i,e,r)}}createLangiumDocument(e,r,n,i){let a;if(n)a={parseResult:e,uri:r,state:bn.Parsed,references:[],textDocument:n};else{let s=this.createTextDocumentGetter(r,i);a={parseResult:e,uri:r,state:bn.Parsed,references:[],get textDocument(){return s()}}}return e.value.$document=a,a}async update(e,r){var n,i;let a=(n=e.parseResult.value.$cstNode)===null||n===void 0?void 0:n.root.fullText,s=(i=this.textDocuments)===null||i===void 0?void 0:i.get(e.uri.toString()),l=s?s.getText():await this.fileSystemProvider.readFile(e.uri);if(s)Object.defineProperty(e,"textDocument",{value:s});else{let u=this.createTextDocumentGetter(e.uri,l);Object.defineProperty(e,"textDocument",{get:u})}return a!==l&&(e.parseResult=await this.parseAsync(e.uri,l,r),e.parseResult.value.$document=e),e.state=bn.Parsed,e}parse(e,r){return this.serviceRegistry.getServices(e).parser.LangiumParser.parse(r)}parseAsync(e,r,n){return this.serviceRegistry.getServices(e).parser.AsyncParser.parse(r,n)}createTextDocumentGetter(e,r){let n=this.serviceRegistry,i;return()=>i??(i=Tg.create(e.toString(),n.getServices(e).LanguageMetaData.languageId,0,r??""))}},M2=class{static{o(this,"DefaultLangiumDocuments")}constructor(e){this.documentMap=new Map,this.langiumDocumentFactory=e.workspace.LangiumDocumentFactory}get all(){return tn(this.documentMap.values())}addDocument(e){let r=e.uri.toString();if(this.documentMap.has(r))throw new Error(`A document with the URI '${r}' is already present.`);this.documentMap.set(r,e)}getDocument(e){let r=e.toString();return this.documentMap.get(r)}async getOrCreateDocument(e,r){let n=this.getDocument(e);return n||(n=await this.langiumDocumentFactory.fromUri(e,r),this.addDocument(n),n)}createDocument(e,r,n){if(n)return this.langiumDocumentFactory.fromString(r,e,n).then(i=>(this.addDocument(i),i));{let i=this.langiumDocumentFactory.fromString(r,e);return this.addDocument(i),i}}hasDocument(e){return this.documentMap.has(e.toString())}invalidateDocument(e){let r=e.toString(),n=this.documentMap.get(r);return n&&(n.state=bn.Changed,n.precomputedScopes=void 0,n.references=[],n.diagnostics=void 0),n}deleteDocument(e){let r=e.toString(),n=this.documentMap.get(r);return n&&(n.state=bn.Changed,this.documentMap.delete(r)),n}}});var I2,IM=M(()=>{"use strict";Ko();Yo();es();Qo();Eg();I2=class{static{o(this,"DefaultLinker")}constructor(e){this.reflection=e.shared.AstReflection,this.langiumDocuments=()=>e.shared.workspace.LangiumDocuments,this.scopeProvider=e.references.ScopeProvider,this.astNodeLocator=e.workspace.AstNodeLocator}async link(e,r=Cr.CancellationToken.None){for(let n of jo(e.parseResult.value))await Gi(r),Um(n).forEach(i=>this.doLink(i,e))}doLink(e,r){let n=e.reference;if(n._ref===void 0)try{let i=this.getCandidate(e);if(Vd(i))n._ref=i;else if(n._nodeDescription=i,this.langiumDocuments().hasDocument(i.documentUri)){let a=this.loadAstNode(i);n._ref=a??this.createLinkingError(e,i)}}catch(i){n._ref=Object.assign(Object.assign({},e),{message:`An error occurred while resolving reference to '${n.$refText}': ${i}`})}r.references.push(n)}unlink(e){for(let r of e.references)delete r._ref,delete r._nodeDescription;e.references=[]}getCandidate(e){let n=this.scopeProvider.getScope(e).getElement(e.reference.$refText);return n??this.createLinkingError(e)}buildReference(e,r,n,i){let a=this,s={$refNode:n,$refText:i,get ref(){var l;if(ei(this._ref))return this._ref;if(MD(this._nodeDescription)){let u=a.loadAstNode(this._nodeDescription);this._ref=u??a.createLinkingError({reference:s,container:e,property:r},this._nodeDescription)}else if(this._ref===void 0){let u=a.getLinkedNode({reference:s,container:e,property:r});if(u.error&&Fi(e).state<bn.ComputedScopes)return;this._ref=(l=u.node)!==null&&l!==void 0?l:u.error,this._nodeDescription=u.descr}return ei(this._ref)?this._ref:void 0},get $nodeDescription(){return this._nodeDescription},get error(){return Vd(this._ref)?this._ref:void 0}};return s}getLinkedNode(e){try{let r=this.getCandidate(e);if(Vd(r))return{error:r};let n=this.loadAstNode(r);return n?{node:n,descr:r}:{descr:r,error:this.createLinkingError(e,r)}}catch(r){return{error:Object.assign(Object.assign({},e),{message:`An error occurred while resolving reference to '${e.reference.$refText}': ${r}`})}}}loadAstNode(e){if(e.node)return e.node;let r=this.langiumDocuments().getDocument(e.documentUri);if(r)return this.astNodeLocator.getAstNode(r.parseResult.value,e.path)}createLinkingError(e,r){let n=Fi(e.container);n.state<bn.ComputedScopes&&console.warn(`Attempted reference resolution before document reached ComputedScopes state (${n.uri}).`);let i=this.reflection.getReferenceType(e);return Object.assign(Object.assign({},e),{message:`Could not resolve reference to ${i} named '${e.reference.$refText}'.`,targetDescription:r})}}});function yce(t){return typeof t.name=="string"}var O2,OM=M(()=>{"use strict";Pl();o(yce,"isNamed");O2=class{static{o(this,"DefaultNameProvider")}getName(e){if(yce(e))return e.name}getNameNode(e){return Jv(e.$cstNode,"name")}}});var P2,PM=M(()=>{"use strict";Pl();Yo();es();Ml();Rs();Mc();P2=class{static{o(this,"DefaultReferences")}constructor(e){this.nameProvider=e.references.NameProvider,this.index=e.shared.workspace.IndexManager,this.nodeLocator=e.workspace.AstNodeLocator}findDeclaration(e){if(e){let r=iR(e),n=e.astNode;if(r&&n){let i=n[r.feature];if(ma(i))return i.ref;if(Array.isArray(i)){for(let a of i)if(ma(a)&&a.$refNode&&a.$refNode.offset<=e.offset&&a.$refNode.end>=e.end)return a.ref}}if(n){let i=this.nameProvider.getNameNode(n);if(i&&(i===e||OD(e,i)))return n}}}findDeclarationNode(e){let r=this.findDeclaration(e);if(r?.$cstNode){let n=this.nameProvider.getNameNode(r);return n??r.$cstNode}}findReferences(e,r){let n=[];if(r.includeDeclaration){let a=this.getReferenceToSelf(e);a&&n.push(a)}let i=this.index.findAllReferences(e,this.nodeLocator.getAstNodePath(e));return r.documentUri&&(i=i.filter(a=>ss.equals(a.sourceUri,r.documentUri))),n.push(...i),tn(n)}getReferenceToSelf(e){let r=this.nameProvider.getNameNode(e);if(r){let n=Fi(e),i=this.nodeLocator.getAstNodePath(e);return{sourceUri:n.uri,sourcePath:i,targetUri:n.uri,targetPath:i,segment:Hd(r),local:!0}}}}});var Ic,p0,Sg=M(()=>{"use strict";Rs();Ic=class{static{o(this,"MultiMap")}constructor(e){if(this.map=new Map,e)for(let[r,n]of e)this.add(r,n)}get size(){return Gm.sum(tn(this.map.values()).map(e=>e.length))}clear(){this.map.clear()}delete(e,r){if(r===void 0)return this.map.delete(e);{let n=this.map.get(e);if(n){let i=n.indexOf(r);if(i>=0)return n.length===1?this.map.delete(e):n.splice(i,1),!0}return!1}}get(e){var r;return(r=this.map.get(e))!==null&&r!==void 0?r:[]}has(e,r){if(r===void 0)return this.map.has(e);{let n=this.map.get(e);return n?n.indexOf(r)>=0:!1}}add(e,r){return this.map.has(e)?this.map.get(e).push(r):this.map.set(e,[r]),this}addAll(e,r){return this.map.has(e)?this.map.get(e).push(...r):this.map.set(e,Array.from(r)),this}forEach(e){this.map.forEach((r,n)=>r.forEach(i=>e(i,n,this)))}[Symbol.iterator](){return this.entries().iterator()}entries(){return tn(this.map.entries()).flatMap(([e,r])=>r.map(n=>[e,n]))}keys(){return tn(this.map.keys())}values(){return tn(this.map.values()).flat()}entriesGroupedByKey(){return tn(this.map.entries())}},p0=class{static{o(this,"BiMap")}get size(){return this.map.size}constructor(e){if(this.map=new Map,this.inverse=new Map,e)for(let[r,n]of e)this.set(r,n)}clear(){this.map.clear(),this.inverse.clear()}set(e,r){return this.map.set(e,r),this.inverse.set(r,e),this}get(e){return this.map.get(e)}getKey(e){return this.inverse.get(e)}delete(e){let r=this.map.get(e);return r!==void 0?(this.map.delete(e),this.inverse.delete(r),!0):!1}}});var B2,BM=M(()=>{"use strict";Ko();es();Sg();Qo();B2=class{static{o(this,"DefaultScopeComputation")}constructor(e){this.nameProvider=e.references.NameProvider,this.descriptions=e.workspace.AstNodeDescriptionProvider}async computeExports(e,r=Cr.CancellationToken.None){return this.computeExportsForNode(e.parseResult.value,e,void 0,r)}async computeExportsForNode(e,r,n=qv,i=Cr.CancellationToken.None){let a=[];this.exportNode(e,a,r);for(let s of n(e))await Gi(i),this.exportNode(s,a,r);return a}exportNode(e,r,n){let i=this.nameProvider.getName(e);i&&r.push(this.descriptions.createDescription(e,i,n))}async computeLocalScopes(e,r=Cr.CancellationToken.None){let n=e.parseResult.value,i=new Ic;for(let a of _c(n))await Gi(r),this.processNode(a,e,i);return i}processNode(e,r,n){let i=e.$container;if(i){let a=this.nameProvider.getName(e);a&&n.add(i,this.descriptions.createDescription(e,a,r))}}}});var Cg,F2,Pze,FM=M(()=>{"use strict";Rs();Cg=class{static{o(this,"StreamScope")}constructor(e,r,n){var i;this.elements=e,this.outerScope=r,this.caseInsensitive=(i=n?.caseInsensitive)!==null&&i!==void 0?i:!1}getAllElements(){return this.outerScope?this.elements.concat(this.outerScope.getAllElements()):this.elements}getElement(e){let r=this.caseInsensitive?this.elements.find(n=>n.name.toLowerCase()===e.toLowerCase()):this.elements.find(n=>n.name===e);if(r)return r;if(this.outerScope)return this.outerScope.getElement(e)}},F2=class{static{o(this,"MapScope")}constructor(e,r,n){var i;this.elements=new Map,this.caseInsensitive=(i=n?.caseInsensitive)!==null&&i!==void 0?i:!1;for(let a of e){let s=this.caseInsensitive?a.name.toLowerCase():a.name;this.elements.set(s,a)}this.outerScope=r}getElement(e){let r=this.caseInsensitive?e.toLowerCase():e,n=this.elements.get(r);if(n)return n;if(this.outerScope)return this.outerScope.getElement(e)}getAllElements(){let e=tn(this.elements.values());return this.outerScope&&(e=e.concat(this.outerScope.getAllElements())),e}},Pze={getElement(){},getAllElements(){return $v}}});var Ag,z2,m0,Ok,_g,Pk=M(()=>{"use strict";Ag=class{static{o(this,"DisposableCache")}constructor(){this.toDispose=[],this.isDisposed=!1}onDispose(e){this.toDispose.push(e)}dispose(){this.throwIfDisposed(),this.clear(),this.isDisposed=!0,this.toDispose.forEach(e=>e.dispose())}throwIfDisposed(){if(this.isDisposed)throw new Error("This cache has already been disposed")}},z2=class extends Ag{static{o(this,"SimpleCache")}constructor(){super(...arguments),this.cache=new Map}has(e){return this.throwIfDisposed(),this.cache.has(e)}set(e,r){this.throwIfDisposed(),this.cache.set(e,r)}get(e,r){if(this.throwIfDisposed(),this.cache.has(e))return this.cache.get(e);if(r){let n=r();return this.cache.set(e,n),n}else return}delete(e){return this.throwIfDisposed(),this.cache.delete(e)}clear(){this.throwIfDisposed(),this.cache.clear()}},m0=class extends Ag{static{o(this,"ContextCache")}constructor(e){super(),this.cache=new Map,this.converter=e??(r=>r)}has(e,r){return this.throwIfDisposed(),this.cacheForContext(e).has(r)}set(e,r,n){this.throwIfDisposed(),this.cacheForContext(e).set(r,n)}get(e,r,n){this.throwIfDisposed();let i=this.cacheForContext(e);if(i.has(r))return i.get(r);if(n){let a=n();return i.set(r,a),a}else return}delete(e,r){return this.throwIfDisposed(),this.cacheForContext(e).delete(r)}clear(e){if(this.throwIfDisposed(),e){let r=this.converter(e);this.cache.delete(r)}else this.cache.clear()}cacheForContext(e){let r=this.converter(e),n=this.cache.get(r);return n||(n=new Map,this.cache.set(r,n)),n}},Ok=class extends m0{static{o(this,"DocumentCache")}constructor(e){super(r=>r.toString()),this.onDispose(e.workspace.DocumentBuilder.onUpdate((r,n)=>{let i=r.concat(n);for(let a of i)this.clear(a)}))}},_g=class extends z2{static{o(this,"WorkspaceCache")}constructor(e){super(),this.onDispose(e.workspace.DocumentBuilder.onUpdate(()=>{this.clear()}))}}});var G2,zM=M(()=>{"use strict";FM();es();Rs();Pk();G2=class{static{o(this,"DefaultScopeProvider")}constructor(e){this.reflection=e.shared.AstReflection,this.nameProvider=e.references.NameProvider,this.descriptions=e.workspace.AstNodeDescriptionProvider,this.indexManager=e.shared.workspace.IndexManager,this.globalScopeCache=new _g(e.shared)}getScope(e){let r=[],n=this.reflection.getReferenceType(e),i=Fi(e.container).precomputedScopes;if(i){let s=e.container;do{let l=i.get(s);l.length>0&&r.push(tn(l).filter(u=>this.reflection.isSubtype(u.type,n))),s=s.$container}while(s)}let a=this.getGlobalScope(n,e);for(let s=r.length-1;s>=0;s--)a=this.createScope(r[s],a);return a}createScope(e,r,n){return new Cg(tn(e),r,n)}createScopeForNodes(e,r,n){let i=tn(e).map(a=>{let s=this.nameProvider.getName(a);if(s)return this.descriptions.createDescription(a,s)}).nonNullable();return new Cg(i,r,n)}getGlobalScope(e,r){return this.globalScopeCache.get(e,()=>new F2(this.indexManager.allElements(e)))}}});function GM(t){return typeof t.$comment=="string"}function vce(t){return typeof t=="object"&&!!t&&("$ref"in t||"$error"in t)}var $2,Bk=M(()=>{"use strict";MM();Yo();es();Pl();o(GM,"isAstNodeWithComment");o(vce,"isIntermediateReference");$2=class{static{o(this,"DefaultJsonSerializer")}constructor(e){this.ignoreProperties=new Set(["$container","$containerProperty","$containerIndex","$document","$cstNode"]),this.langiumDocuments=e.shared.workspace.LangiumDocuments,this.astNodeLocator=e.workspace.AstNodeLocator,this.nameProvider=e.references.NameProvider,this.commentProvider=e.documentation.CommentProvider}serialize(e,r={}){let n=r?.replacer,i=o((s,l)=>this.replacer(s,l,r),"defaultReplacer"),a=n?(s,l)=>n(s,l,i):i;try{return this.currentDocument=Fi(e),JSON.stringify(e,a,r?.space)}finally{this.currentDocument=void 0}}deserialize(e,r={}){let n=JSON.parse(e);return this.linkNode(n,n,r),n}replacer(e,r,{refText:n,sourceText:i,textRegions:a,comments:s,uriConverter:l}){var u,h,f,d;if(!this.ignoreProperties.has(e))if(ma(r)){let p=r.ref,m=n?r.$refText:void 0;if(p){let g=Fi(p),y="";this.currentDocument&&this.currentDocument!==g&&(l?y=l(g.uri,r):y=g.uri.toString());let v=this.astNodeLocator.getAstNodePath(p);return{$ref:`${y}#${v}`,$refText:m}}else return{$error:(h=(u=r.error)===null||u===void 0?void 0:u.message)!==null&&h!==void 0?h:"Could not resolve reference",$refText:m}}else if(ei(r)){let p;if(a&&(p=this.addAstNodeRegionWithAssignmentsTo(Object.assign({},r)),(!e||r.$document)&&p?.$textRegion&&(p.$textRegion.documentURI=(f=this.currentDocument)===null||f===void 0?void 0:f.uri.toString())),i&&!e&&(p??(p=Object.assign({},r)),p.$sourceText=(d=r.$cstNode)===null||d===void 0?void 0:d.text),s){p??(p=Object.assign({},r));let m=this.commentProvider.getComment(r);m&&(p.$comment=m.replace(/\r/g,""))}return p??r}else return r}addAstNodeRegionWithAssignmentsTo(e){let r=o(n=>({offset:n.offset,end:n.end,length:n.length,range:n.range}),"createDocumentSegment");if(e.$cstNode){let n=e.$textRegion=r(e.$cstNode),i=n.assignments={};return Object.keys(e).filter(a=>!a.startsWith("$")).forEach(a=>{let s=eR(e.$cstNode,a).map(r);s.length!==0&&(i[a]=s)}),e}}linkNode(e,r,n,i,a,s){for(let[u,h]of Object.entries(e))if(Array.isArray(h))for(let f=0;f<h.length;f++){let d=h[f];vce(d)?h[f]=this.reviveReference(e,u,r,d,n):ei(d)&&this.linkNode(d,r,n,e,u,f)}else vce(h)?e[u]=this.reviveReference(e,u,r,h,n):ei(h)&&this.linkNode(h,r,n,e,u);let l=e;l.$container=i,l.$containerProperty=a,l.$containerIndex=s}reviveReference(e,r,n,i,a){let s=i.$refText,l=i.$error;if(i.$ref){let u=this.getRefNode(n,i.$ref,a.uriConverter);if(ei(u))return s||(s=this.nameProvider.getName(u)),{$refText:s??"",ref:u};l=u}if(l){let u={$refText:s??""};return u.error={container:e,property:r,message:l,reference:u},u}else return}getRefNode(e,r,n){try{let i=r.indexOf("#");if(i===0){let u=this.astNodeLocator.getAstNode(e,r.substring(1));return u||"Could not resolve path: "+r}if(i<0){let u=n?n(r):Os.parse(r),h=this.langiumDocuments.getDocument(u);return h?h.parseResult.value:"Could not find document for URI: "+r}let a=n?n(r.substring(0,i)):Os.parse(r.substring(0,i)),s=this.langiumDocuments.getDocument(a);if(!s)return"Could not find document for URI: "+r;if(i===r.length-1)return s.parseResult.value;let l=this.astNodeLocator.getAstNode(s.parseResult.value,r.substring(i+1));return l||"Could not resolve URI: "+r}catch(i){return String(i)}}}});var V2,$M=M(()=>{"use strict";Mc();V2=class{static{o(this,"DefaultServiceRegistry")}register(e){if(!this.singleton&&!this.map){this.singleton=e;return}if(!this.map&&(this.map={},this.singleton)){for(let r of this.singleton.LanguageMetaData.fileExtensions)this.map[r]=this.singleton;this.singleton=void 0}for(let r of e.LanguageMetaData.fileExtensions)this.map[r]!==void 0&&this.map[r]!==e&&console.warn(`The file extension ${r} is used by multiple languages. It is now assigned to '${e.LanguageMetaData.languageId}'.`),this.map[r]=e}getServices(e){if(this.singleton!==void 0)return this.singleton;if(this.map===void 0)throw new Error("The service registry is empty. Use `register` to register the services of a language.");let r=ss.extname(e),n=this.map[r];if(!n)throw new Error(`The service registry contains no services for the extension '${r}'.`);return n}get all(){return this.singleton!==void 0?[this.singleton]:this.map!==void 0?Object.values(this.map):[]}}});function Fk(t){return{code:t}}var Lg,U2,H2=M(()=>{"use strict";Sg();Qo();Rs();o(Fk,"diagnosticData");(function(t){t.all=["fast","slow","built-in"]})(Lg||(Lg={}));U2=class{static{o(this,"ValidationRegistry")}constructor(e){this.entries=new Ic,this.reflection=e.shared.AstReflection}register(e,r=this,n="fast"){if(n==="built-in")throw new Error("The 'built-in' category is reserved for lexer, parser, and linker errors.");for(let[i,a]of Object.entries(e)){let s=a;if(Array.isArray(s))for(let l of s){let u={check:this.wrapValidationException(l,r),category:n};this.addEntry(i,u)}else if(typeof s=="function"){let l={check:this.wrapValidationException(s,r),category:n};this.addEntry(i,l)}}}wrapValidationException(e,r){return async(n,i,a)=>{try{await e.call(r,n,i,a)}catch(s){if(sf(s))throw s;console.error("An error occurred during validation:",s);let l=s instanceof Error?s.message:String(s);s instanceof Error&&s.stack&&console.error(s.stack),i("error","An error occurred during validation: "+l,{node:n})}}}addEntry(e,r){if(e==="AstNode"){this.entries.add("AstNode",r);return}for(let n of this.reflection.getAllSubTypes(e))this.entries.add(n,r)}getChecks(e,r){let n=tn(this.entries.get(e)).concat(this.entries.get("AstNode"));return r&&(n=n.filter(i=>r.includes(i.category))),n.map(i=>i.check)}}});function xce(t){if(t.range)return t.range;let e;return typeof t.property=="string"?e=Jv(t.node.$cstNode,t.property,t.index):typeof t.keyword=="string"&&(e=rR(t.node.$cstNode,t.keyword,t.index)),e??(e=t.node.$cstNode),e?e.range:{start:{line:0,character:0},end:{line:0,character:0}}}function zk(t){switch(t){case"error":return 1;case"warning":return 2;case"info":return 3;case"hint":return 4;default:throw new Error("Invalid diagnostic severity: "+t)}}var W2,$u,VM=M(()=>{"use strict";Ko();Pl();es();Ml();Qo();H2();W2=class{static{o(this,"DefaultDocumentValidator")}constructor(e){this.validationRegistry=e.validation.ValidationRegistry,this.metadata=e.LanguageMetaData}async validateDocument(e,r={},n=Cr.CancellationToken.None){let i=e.parseResult,a=[];if(await Gi(n),(!r.categories||r.categories.includes("built-in"))&&(this.processLexingErrors(i,a,r),r.stopAfterLexingErrors&&a.some(s=>{var l;return((l=s.data)===null||l===void 0?void 0:l.code)===$u.LexingError})||(this.processParsingErrors(i,a,r),r.stopAfterParsingErrors&&a.some(s=>{var l;return((l=s.data)===null||l===void 0?void 0:l.code)===$u.ParsingError}))||(this.processLinkingErrors(e,a,r),r.stopAfterLinkingErrors&&a.some(s=>{var l;return((l=s.data)===null||l===void 0?void 0:l.code)===$u.LinkingError}))))return a;try{a.push(...await this.validateAst(i.value,r,n))}catch(s){if(sf(s))throw s;console.error("An error occurred during validation:",s)}return await Gi(n),a}processLexingErrors(e,r,n){for(let i of e.lexerErrors){let a={severity:zk("error"),range:{start:{line:i.line-1,character:i.column-1},end:{line:i.line-1,character:i.column+i.length-1}},message:i.message,data:Fk($u.LexingError),source:this.getSource()};r.push(a)}}processParsingErrors(e,r,n){for(let i of e.parserErrors){let a;if(isNaN(i.token.startOffset)){if("previousToken"in i){let s=i.previousToken;if(isNaN(s.startOffset)){let l={line:0,character:0};a={start:l,end:l}}else{let l={line:s.endLine-1,character:s.endColumn};a={start:l,end:l}}}}else a=$m(i.token);if(a){let s={severity:zk("error"),range:a,message:i.message,data:Fk($u.ParsingError),source:this.getSource()};r.push(s)}}}processLinkingErrors(e,r,n){for(let i of e.references){let a=i.error;if(a){let s={node:a.container,property:a.property,index:a.index,data:{code:$u.LinkingError,containerType:a.container.$type,property:a.property,refText:a.reference.$refText}};r.push(this.toDiagnostic("error",a.message,s))}}}async validateAst(e,r,n=Cr.CancellationToken.None){let i=[],a=o((s,l,u)=>{i.push(this.toDiagnostic(s,l,u))},"acceptor");return await Promise.all(jo(e).map(async s=>{await Gi(n);let l=this.validationRegistry.getChecks(s.$type,r.categories);for(let u of l)await u(s,a,n)})),i}toDiagnostic(e,r,n){return{message:r,range:xce(n),severity:zk(e),code:n.code,codeDescription:n.codeDescription,tags:n.tags,relatedInformation:n.relatedInformation,data:n.data,source:this.getSource()}}getSource(){return this.metadata.languageId}};o(xce,"getDiagnosticRange");o(zk,"toDiagnosticSeverity");(function(t){t.LexingError="lexing-error",t.ParsingError="parsing-error",t.LinkingError="linking-error"})($u||($u={}))});var Y2,q2,UM=M(()=>{"use strict";Ko();Yo();es();Ml();Qo();Mc();Y2=class{static{o(this,"DefaultAstNodeDescriptionProvider")}constructor(e){this.astNodeLocator=e.workspace.AstNodeLocator,this.nameProvider=e.references.NameProvider}createDescription(e,r,n=Fi(e)){r??(r=this.nameProvider.getName(e));let i=this.astNodeLocator.getAstNodePath(e);if(!r)throw new Error(`Node at path ${i} has no name.`);let a,s=o(()=>{var l;return a??(a=Hd((l=this.nameProvider.getNameNode(e))!==null&&l!==void 0?l:e.$cstNode))},"nameSegmentGetter");return{node:e,name:r,get nameSegment(){return s()},selectionSegment:Hd(e.$cstNode),type:e.$type,documentUri:n.uri,path:i}}},q2=class{static{o(this,"DefaultReferenceDescriptionProvider")}constructor(e){this.nodeLocator=e.workspace.AstNodeLocator}async createDescriptions(e,r=Cr.CancellationToken.None){let n=[],i=e.parseResult.value;for(let a of jo(i))await Gi(r),Um(a).filter(s=>!Vd(s)).forEach(s=>{let l=this.createDescription(s);l&&n.push(l)});return n}createDescription(e){let r=e.reference.$nodeDescription,n=e.reference.$refNode;if(!r||!n)return;let i=Fi(e.container).uri;return{sourceUri:i,sourcePath:this.nodeLocator.getAstNodePath(e.container),targetUri:r.documentUri,targetPath:r.path,segment:Hd(n),local:ss.equals(r.documentUri,i)}}}});var X2,HM=M(()=>{"use strict";X2=class{static{o(this,"DefaultAstNodeLocator")}constructor(){this.segmentSeparator="/",this.indexSeparator="@"}getAstNodePath(e){if(e.$container){let r=this.getAstNodePath(e.$container),n=this.getPathSegment(e);return r+this.segmentSeparator+n}return""}getPathSegment({$containerProperty:e,$containerIndex:r}){if(!e)throw new Error("Missing '$containerProperty' in AST node.");return r!==void 0?e+this.indexSeparator+r:e}getAstNode(e,r){return r.split(this.segmentSeparator).reduce((i,a)=>{if(!i||a.length===0)return i;let s=a.indexOf(this.indexSeparator);if(s>0){let l=a.substring(0,s),u=parseInt(a.substring(s+1)),h=i[l];return h?.[u]}return i[a]},e)}}});var j2,WM=M(()=>{"use strict";Qo();j2=class{static{o(this,"DefaultConfigurationProvider")}constructor(e){this._ready=new as,this.settings={},this.workspaceConfig=!1,this.serviceRegistry=e.ServiceRegistry}get ready(){return this._ready.promise}initialize(e){var r,n;this.workspaceConfig=(n=(r=e.capabilities.workspace)===null||r===void 0?void 0:r.configuration)!==null&&n!==void 0?n:!1}async initialized(e){if(this.workspaceConfig){if(e.register){let r=this.serviceRegistry.all;e.register({section:r.map(n=>this.toSectionName(n.LanguageMetaData.languageId))})}if(e.fetchConfiguration){let r=this.serviceRegistry.all.map(i=>({section:this.toSectionName(i.LanguageMetaData.languageId)})),n=await e.fetchConfiguration(r);r.forEach((i,a)=>{this.updateSectionConfiguration(i.section,n[a])})}}this._ready.resolve()}updateConfiguration(e){e.settings&&Object.keys(e.settings).forEach(r=>{this.updateSectionConfiguration(r,e.settings[r])})}updateSectionConfiguration(e,r){this.settings[e]=r}async getConfiguration(e,r){await this.ready;let n=this.toSectionName(e);if(this.settings[n])return this.settings[n][r]}toSectionName(e){return`${e}`}}});var g0,YM=M(()=>{"use strict";(function(t){function e(r){return{dispose:o(async()=>await r(),"dispose")}}o(e,"create"),t.create=e})(g0||(g0={}))});var K2,qM=M(()=>{"use strict";Ko();YM();Sg();Qo();Rs();H2();Eg();K2=class{static{o(this,"DefaultDocumentBuilder")}constructor(e){this.updateBuildOptions={validation:{categories:["built-in","fast"]}},this.updateListeners=[],this.buildPhaseListeners=new Ic,this.buildState=new Map,this.documentBuildWaiters=new Map,this.currentState=bn.Changed,this.langiumDocuments=e.workspace.LangiumDocuments,this.langiumDocumentFactory=e.workspace.LangiumDocumentFactory,this.indexManager=e.workspace.IndexManager,this.serviceRegistry=e.ServiceRegistry}async build(e,r={},n=Cr.CancellationToken.None){var i,a;for(let s of e){let l=s.uri.toString();if(s.state===bn.Validated){if(typeof r.validation=="boolean"&&r.validation)s.state=bn.IndexedReferences,s.diagnostics=void 0,this.buildState.delete(l);else if(typeof r.validation=="object"){let u=this.buildState.get(l),h=(i=u?.result)===null||i===void 0?void 0:i.validationChecks;if(h){let d=((a=r.validation.categories)!==null&&a!==void 0?a:Lg.all).filter(p=>!h.includes(p));d.length>0&&(this.buildState.set(l,{completed:!1,options:{validation:Object.assign(Object.assign({},r.validation),{categories:d})},result:u.result}),s.state=bn.IndexedReferences)}}}else this.buildState.delete(l)}this.currentState=bn.Changed,await this.emitUpdate(e.map(s=>s.uri),[]),await this.buildDocuments(e,r,n)}async update(e,r,n=Cr.CancellationToken.None){this.currentState=bn.Changed;for(let s of r)this.langiumDocuments.deleteDocument(s),this.buildState.delete(s.toString()),this.indexManager.remove(s);for(let s of e){if(!this.langiumDocuments.invalidateDocument(s)){let u=this.langiumDocumentFactory.fromModel({$type:"INVALID"},s);u.state=bn.Changed,this.langiumDocuments.addDocument(u)}this.buildState.delete(s.toString())}let i=tn(e).concat(r).map(s=>s.toString()).toSet();this.langiumDocuments.all.filter(s=>!i.has(s.uri.toString())&&this.shouldRelink(s,i)).forEach(s=>{this.serviceRegistry.getServices(s.uri).references.Linker.unlink(s),s.state=Math.min(s.state,bn.ComputedScopes),s.diagnostics=void 0}),await this.emitUpdate(e,r),await Gi(n);let a=this.langiumDocuments.all.filter(s=>{var l;return s.state<bn.Linked||!(!((l=this.buildState.get(s.uri.toString()))===null||l===void 0)&&l.completed)}).toArray();await this.buildDocuments(a,this.updateBuildOptions,n)}async emitUpdate(e,r){await Promise.all(this.updateListeners.map(n=>n(e,r)))}shouldRelink(e,r){return e.references.some(n=>n.error!==void 0)?!0:this.indexManager.isAffected(e,r)}onUpdate(e){return this.updateListeners.push(e),g0.create(()=>{let r=this.updateListeners.indexOf(e);r>=0&&this.updateListeners.splice(r,1)})}async buildDocuments(e,r,n){this.prepareBuild(e,r),await this.runCancelable(e,bn.Parsed,n,a=>this.langiumDocumentFactory.update(a,n)),await this.runCancelable(e,bn.IndexedContent,n,a=>this.indexManager.updateContent(a,n)),await this.runCancelable(e,bn.ComputedScopes,n,async a=>{let s=this.serviceRegistry.getServices(a.uri).references.ScopeComputation;a.precomputedScopes=await s.computeLocalScopes(a,n)}),await this.runCancelable(e,bn.Linked,n,a=>this.serviceRegistry.getServices(a.uri).references.Linker.link(a,n)),await this.runCancelable(e,bn.IndexedReferences,n,a=>this.indexManager.updateReferences(a,n));let i=e.filter(a=>this.shouldValidate(a));await this.runCancelable(i,bn.Validated,n,a=>this.validate(a,n));for(let a of e){let s=this.buildState.get(a.uri.toString());s&&(s.completed=!0)}}prepareBuild(e,r){for(let n of e){let i=n.uri.toString(),a=this.buildState.get(i);(!a||a.completed)&&this.buildState.set(i,{completed:!1,options:r,result:a?.result})}}async runCancelable(e,r,n,i){let a=e.filter(s=>s.state<r);for(let s of a)await Gi(n),await i(s),s.state=r;await this.notifyBuildPhase(a,r,n),this.currentState=r}onBuildPhase(e,r){return this.buildPhaseListeners.add(e,r),g0.create(()=>{this.buildPhaseListeners.delete(e,r)})}waitUntil(e,r,n){let i;if(r&&"path"in r?i=r:n=r,n??(n=Cr.CancellationToken.None),i){let a=this.langiumDocuments.getDocument(i);if(a&&a.state>e)return Promise.resolve(i)}return this.currentState>=e?Promise.resolve(void 0):n.isCancellationRequested?Promise.reject(Rc):new Promise((a,s)=>{let l=this.onBuildPhase(e,()=>{if(l.dispose(),u.dispose(),i){let h=this.langiumDocuments.getDocument(i);a(h?.uri)}else a(void 0)}),u=n.onCancellationRequested(()=>{l.dispose(),u.dispose(),s(Rc)})})}async notifyBuildPhase(e,r,n){if(e.length===0)return;let i=this.buildPhaseListeners.get(r);for(let a of i)await Gi(n),await a(e,n)}shouldValidate(e){return!!this.getBuildOptions(e).validation}async validate(e,r){var n,i;let a=this.serviceRegistry.getServices(e.uri).validation.DocumentValidator,s=this.getBuildOptions(e).validation,l=typeof s=="object"?s:void 0,u=await a.validateDocument(e,l,r);e.diagnostics?e.diagnostics.push(...u):e.diagnostics=u;let h=this.buildState.get(e.uri.toString());if(h){(n=h.result)!==null&&n!==void 0||(h.result={});let f=(i=l?.categories)!==null&&i!==void 0?i:Lg.all;h.result.validationChecks?h.result.validationChecks.push(...f):h.result.validationChecks=[...f]}}getBuildOptions(e){var r,n;return(n=(r=this.buildState.get(e.uri.toString()))===null||r===void 0?void 0:r.options)!==null&&n!==void 0?n:{}}}});var Q2,XM=M(()=>{"use strict";es();Pk();Ko();Rs();Mc();Q2=class{static{o(this,"DefaultIndexManager")}constructor(e){this.symbolIndex=new Map,this.symbolByTypeIndex=new m0,this.referenceIndex=new Map,this.documents=e.workspace.LangiumDocuments,this.serviceRegistry=e.ServiceRegistry,this.astReflection=e.AstReflection}findAllReferences(e,r){let n=Fi(e).uri,i=[];return this.referenceIndex.forEach(a=>{a.forEach(s=>{ss.equals(s.targetUri,n)&&s.targetPath===r&&i.push(s)})}),tn(i)}allElements(e,r){let n=tn(this.symbolIndex.keys());return r&&(n=n.filter(i=>!r||r.has(i))),n.map(i=>this.getFileDescriptions(i,e)).flat()}getFileDescriptions(e,r){var n;return r?this.symbolByTypeIndex.get(e,r,()=>{var a;return((a=this.symbolIndex.get(e))!==null&&a!==void 0?a:[]).filter(l=>this.astReflection.isSubtype(l.type,r))}):(n=this.symbolIndex.get(e))!==null&&n!==void 0?n:[]}remove(e){let r=e.toString();this.symbolIndex.delete(r),this.symbolByTypeIndex.clear(r),this.referenceIndex.delete(r)}async updateContent(e,r=Cr.CancellationToken.None){let i=await this.serviceRegistry.getServices(e.uri).references.ScopeComputation.computeExports(e,r),a=e.uri.toString();this.symbolIndex.set(a,i),this.symbolByTypeIndex.clear(a)}async updateReferences(e,r=Cr.CancellationToken.None){let i=await this.serviceRegistry.getServices(e.uri).workspace.ReferenceDescriptionProvider.createDescriptions(e,r);this.referenceIndex.set(e.uri.toString(),i)}isAffected(e,r){let n=this.referenceIndex.get(e.uri.toString());return n?n.some(i=>!i.local&&r.has(i.targetUri.toString())):!1}}});var Z2,jM=M(()=>{"use strict";Ko();Qo();Mc();Z2=class{static{o(this,"DefaultWorkspaceManager")}constructor(e){this.initialBuildOptions={},this._ready=new as,this.serviceRegistry=e.ServiceRegistry,this.langiumDocuments=e.workspace.LangiumDocuments,this.documentBuilder=e.workspace.DocumentBuilder,this.fileSystemProvider=e.workspace.FileSystemProvider,this.mutex=e.workspace.WorkspaceLock}get ready(){return this._ready.promise}initialize(e){var r;this.folders=(r=e.workspaceFolders)!==null&&r!==void 0?r:void 0}initialized(e){return this.mutex.write(r=>{var n;return this.initializeWorkspace((n=this.folders)!==null&&n!==void 0?n:[],r)})}async initializeWorkspace(e,r=Cr.CancellationToken.None){let n=await this.performStartup(e);await Gi(r),await this.documentBuilder.build(n,this.initialBuildOptions,r)}async performStartup(e){let r=this.serviceRegistry.all.flatMap(a=>a.LanguageMetaData.fileExtensions),n=[],i=o(a=>{n.push(a),this.langiumDocuments.hasDocument(a.uri)||this.langiumDocuments.addDocument(a)},"collector");return await this.loadAdditionalDocuments(e,i),await Promise.all(e.map(a=>[a,this.getRootFolder(a)]).map(async a=>this.traverseFolder(...a,r,i))),this._ready.resolve(),n}loadAdditionalDocuments(e,r){return Promise.resolve()}getRootFolder(e){return Os.parse(e.uri)}async traverseFolder(e,r,n,i){let a=await this.fileSystemProvider.readDirectory(r);await Promise.all(a.map(async s=>{if(this.includeEntry(e,s,n)){if(s.isDirectory)await this.traverseFolder(e,s.uri,n,i);else if(s.isFile){let l=await this.langiumDocuments.getOrCreateDocument(s.uri);i(l)}}}))}includeEntry(e,r,n){let i=ss.basename(r.uri);if(i.startsWith("."))return!1;if(r.isDirectory)return i!=="node_modules"&&i!=="out";if(r.isFile){let a=ss.extname(r.uri);return n.includes(a)}return!1}}});function bce(t){return Array.isArray(t)&&(t.length===0||"name"in t[0])}function QM(t){return t&&"modes"in t&&"defaultMode"in t}function KM(t){return!bce(t)&&!QM(t)}var J2,ZM=M(()=>{"use strict";s0();J2=class{static{o(this,"DefaultLexer")}constructor(e){let r=e.parser.TokenBuilder.buildTokens(e.Grammar,{caseInsensitive:e.LanguageMetaData.caseInsensitive});this.tokenTypes=this.toTokenTypeDictionary(r);let n=KM(r)?Object.values(r):r;this.chevrotainLexer=new oi(n,{positionTracking:"full"})}get definition(){return this.tokenTypes}tokenize(e){var r;let n=this.chevrotainLexer.tokenize(e);return{tokens:n.tokens,errors:n.errors,hidden:(r=n.groups.hidden)!==null&&r!==void 0?r:[]}}toTokenTypeDictionary(e){if(KM(e))return e;let r=QM(e)?Object.values(e.modes).flat():e,n={};return r.forEach(i=>n[i.name]=i),n}};o(bce,"isTokenTypeArray");o(QM,"isIMultiModeLexerDefinition");o(KM,"isTokenTypeDictionary")});function tI(t,e,r){let n,i;typeof t=="string"?(i=e,n=r):(i=t.range.start,n=e),i||(i=Xr.create(0,0));let a=kce(t),s=nI(n),l=Fze({lines:a,position:i,options:s});return Uze({index:0,tokens:l,position:i})}function rI(t,e){let r=nI(e),n=kce(t);if(n.length===0)return!1;let i=n[0],a=n[n.length-1],s=r.start,l=r.end;return!!s?.exec(i)&&!!l?.exec(a)}function kce(t){let e="";return typeof t=="string"?e=t:e=t.text,e.split(YN)}function Fze(t){var e,r,n;let i=[],a=t.position.line,s=t.position.character;for(let l=0;l<t.lines.length;l++){let u=l===0,h=l===t.lines.length-1,f=t.lines[l],d=0;if(u&&t.options.start){let m=(e=t.options.start)===null||e===void 0?void 0:e.exec(f);m&&(d=m.index+m[0].length)}else{let m=(r=t.options.line)===null||r===void 0?void 0:r.exec(f);m&&(d=m.index+m[0].length)}if(h){let m=(n=t.options.end)===null||n===void 0?void 0:n.exec(f);m&&(f=f.substring(0,m.index))}if(f=f.substring(0,Vze(f)),eI(f,d)>=f.length){if(i.length>0){let m=Xr.create(a,s);i.push({type:"break",content:"",range:Dr.create(m,m)})}}else{wce.lastIndex=d;let m=wce.exec(f);if(m){let g=m[0],y=m[1],v=Xr.create(a,s+d),x=Xr.create(a,s+d+g.length);i.push({type:"tag",content:y,range:Dr.create(v,x)}),d+=g.length,d=eI(f,d)}if(d<f.length){let g=f.substring(d),y=Array.from(g.matchAll(Bze));i.push(...zze(y,g,a,s+d))}}a++,s=0}return i.length>0&&i[i.length-1].type==="break"?i.slice(0,-1):i}function zze(t,e,r,n){let i=[];if(t.length===0){let a=Xr.create(r,n),s=Xr.create(r,n+e.length);i.push({type:"text",content:e,range:Dr.create(a,s)})}else{let a=0;for(let l of t){let u=l.index,h=e.substring(a,u);h.length>0&&i.push({type:"text",content:e.substring(a,u),range:Dr.create(Xr.create(r,a+n),Xr.create(r,u+n))});let f=h.length+1,d=l[1];if(i.push({type:"inline-tag",content:d,range:Dr.create(Xr.create(r,a+f+n),Xr.create(r,a+f+d.length+n))}),f+=d.length,l.length===4){f+=l[2].length;let p=l[3];i.push({type:"text",content:p,range:Dr.create(Xr.create(r,a+f+n),Xr.create(r,a+f+p.length+n))})}else i.push({type:"text",content:"",range:Dr.create(Xr.create(r,a+f+n),Xr.create(r,a+f+n))});a=u+l[0].length}let s=e.substring(a);s.length>0&&i.push({type:"text",content:s,range:Dr.create(Xr.create(r,a+n),Xr.create(r,a+n+s.length))})}return i}function eI(t,e){let r=t.substring(e).match(Gze);return r?e+r.index:t.length}function Vze(t){let e=t.match($ze);if(e&&typeof e.index=="number")return e.index}function Uze(t){var e,r,n,i;let a=Xr.create(t.position.line,t.position.character);if(t.tokens.length===0)return new Gk([],Dr.create(a,a));let s=[];for(;t.index<t.tokens.length;){let h=Hze(t,s[s.length-1]);h&&s.push(h)}let l=(r=(e=s[0])===null||e===void 0?void 0:e.range.start)!==null&&r!==void 0?r:a,u=(i=(n=s[s.length-1])===null||n===void 0?void 0:n.range.end)!==null&&i!==void 0?i:a;return new Gk(s,Dr.create(l,u))}function Hze(t,e){let r=t.tokens[t.index];if(r.type==="tag")return Sce(t,!1);if(r.type==="text"||r.type==="inline-tag")return Ece(t);Wze(r,e),t.index++}function Wze(t,e){if(e){let r=new $k("",t.range);"inlines"in e?e.inlines.push(r):e.content.inlines.push(r)}}function Ece(t){let e=t.tokens[t.index],r=e,n=e,i=[];for(;e&&e.type!=="break"&&e.type!=="tag";)i.push(Yze(t)),n=e,e=t.tokens[t.index];return new tx(i,Dr.create(r.range.start,n.range.end))}function Yze(t){return t.tokens[t.index].type==="inline-tag"?Sce(t,!0):Cce(t)}function Sce(t,e){let r=t.tokens[t.index++],n=r.content.substring(1),i=t.tokens[t.index];if(i?.type==="text")if(e){let a=Cce(t);return new ex(n,new tx([a],a.range),e,Dr.create(r.range.start,a.range.end))}else{let a=Ece(t);return new ex(n,a,e,Dr.create(r.range.start,a.range.end))}else{let a=r.range;return new ex(n,new tx([],a),e,a)}}function Cce(t){let e=t.tokens[t.index++];return new $k(e.content,e.range)}function nI(t){if(!t)return nI({start:"/**",end:"*/",line:"*"});let{start:e,end:r,line:n}=t;return{start:JM(e,!0),end:JM(r,!1),line:JM(n,!0)}}function JM(t,e){if(typeof t=="string"||typeof t=="object"){let r=typeof t=="string"?Qd(t):t.source;return e?new RegExp(`^\\s*${r}`):new RegExp(`\\s*${r}\\s*$`)}else return t}function qze(t,e,r){var n,i;if(t==="linkplain"||t==="linkcode"||t==="link"){let a=e.indexOf(" "),s=e;if(a>0){let u=eI(e,a);s=e.substring(u),e=e.substring(0,a)}return(t==="linkcode"||t==="link"&&r.link==="code")&&(s=`\`${s}\``),(i=(n=r.renderLink)===null||n===void 0?void 0:n.call(r,e,s))!==null&&i!==void 0?i:Xze(e,s)}}function Xze(t,e){try{return Os.parse(t,!0),`[${e}](${t})`}catch{return t}}function Tce(t){return t.endsWith(` +`)?` +`:` + +`}var wce,Bze,Gze,$ze,Gk,ex,tx,$k,iI=M(()=>{"use strict";uM();Wm();Mc();o(tI,"parseJSDoc");o(rI,"isJSDoc");o(kce,"getLines");wce=/\s*(@([\p{L}][\p{L}\p{N}]*)?)/uy,Bze=/\{(@[\p{L}][\p{L}\p{N}]*)(\s*)([^\r\n}]+)?\}/gu;o(Fze,"tokenize");o(zze,"buildInlineTokens");Gze=/\S/,$ze=/\s*$/;o(eI,"skipWhitespace");o(Vze,"lastCharacter");o(Uze,"parseJSDocComment");o(Hze,"parseJSDocElement");o(Wze,"appendEmptyLine");o(Ece,"parseJSDocText");o(Yze,"parseJSDocInline");o(Sce,"parseJSDocTag");o(Cce,"parseJSDocLine");o(nI,"normalizeOptions");o(JM,"normalizeOption");Gk=class{static{o(this,"JSDocCommentImpl")}constructor(e,r){this.elements=e,this.range=r}getTag(e){return this.getAllTags().find(r=>r.name===e)}getTags(e){return this.getAllTags().filter(r=>r.name===e)}getAllTags(){return this.elements.filter(e=>"name"in e)}toString(){let e="";for(let r of this.elements)if(e.length===0)e=r.toString();else{let n=r.toString();e+=Tce(e)+n}return e.trim()}toMarkdown(e){let r="";for(let n of this.elements)if(r.length===0)r=n.toMarkdown(e);else{let i=n.toMarkdown(e);r+=Tce(r)+i}return r.trim()}},ex=class{static{o(this,"JSDocTagImpl")}constructor(e,r,n,i){this.name=e,this.content=r,this.inline=n,this.range=i}toString(){let e=`@${this.name}`,r=this.content.toString();return this.content.inlines.length===1?e=`${e} ${r}`:this.content.inlines.length>1&&(e=`${e} +${r}`),this.inline?`{${e}}`:e}toMarkdown(e){var r,n;return(n=(r=e?.renderTag)===null||r===void 0?void 0:r.call(e,this))!==null&&n!==void 0?n:this.toMarkdownDefault(e)}toMarkdownDefault(e){let r=this.content.toMarkdown(e);if(this.inline){let a=qze(this.name,r,e??{});if(typeof a=="string")return a}let n="";e?.tag==="italic"||e?.tag===void 0?n="*":e?.tag==="bold"?n="**":e?.tag==="bold-italic"&&(n="***");let i=`${n}@${this.name}${n}`;return this.content.inlines.length===1?i=`${i} \u2014 ${r}`:this.content.inlines.length>1&&(i=`${i} +${r}`),this.inline?`{${i}}`:i}};o(qze,"renderInlineTag");o(Xze,"renderLinkDefault");tx=class{static{o(this,"JSDocTextImpl")}constructor(e,r){this.inlines=e,this.range=r}toString(){let e="";for(let r=0;r<this.inlines.length;r++){let n=this.inlines[r],i=this.inlines[r+1];e+=n.toString(),i&&i.range.start.line>n.range.start.line&&(e+=` +`)}return e}toMarkdown(e){let r="";for(let n=0;n<this.inlines.length;n++){let i=this.inlines[n],a=this.inlines[n+1];r+=i.toMarkdown(e),a&&a.range.start.line>i.range.start.line&&(r+=` +`)}return r}},$k=class{static{o(this,"JSDocLineImpl")}constructor(e,r){this.text=e,this.range=r}toString(){return this.text}toMarkdown(){return this.text}};o(Tce,"fillNewlines")});var rx,aI=M(()=>{"use strict";es();iI();rx=class{static{o(this,"JSDocDocumentationProvider")}constructor(e){this.indexManager=e.shared.workspace.IndexManager,this.commentProvider=e.documentation.CommentProvider}getDocumentation(e){let r=this.commentProvider.getComment(e);if(r&&rI(r))return tI(r).toMarkdown({renderLink:o((i,a)=>this.documentationLinkRenderer(e,i,a),"renderLink"),renderTag:o(i=>this.documentationTagRenderer(e,i),"renderTag")})}documentationLinkRenderer(e,r,n){var i;let a=(i=this.findNameInPrecomputedScopes(e,r))!==null&&i!==void 0?i:this.findNameInGlobalScope(e,r);if(a&&a.nameSegment){let s=a.nameSegment.range.start.line+1,l=a.nameSegment.range.start.character+1,u=a.documentUri.with({fragment:`L${s},${l}`});return`[${n}](${u.toString()})`}else return}documentationTagRenderer(e,r){}findNameInPrecomputedScopes(e,r){let i=Fi(e).precomputedScopes;if(!i)return;let a=e;do{let l=i.get(a).find(u=>u.name===r);if(l)return l;a=a.$container}while(a)}findNameInGlobalScope(e,r){return this.indexManager.allElements().find(i=>i.name===r)}}});var nx,sI=M(()=>{"use strict";Bk();Ml();nx=class{static{o(this,"DefaultCommentProvider")}constructor(e){this.grammarConfig=()=>e.parser.GrammarConfig}getComment(e){var r;return GM(e)?e.$comment:(r=BD(e.$cstNode,this.grammarConfig().multilineCommentRules))===null||r===void 0?void 0:r.text}}});var li={};var oI=M(()=>{"use strict";Er(li,ka(AM(),1))});var ix,lI,cI,uI=M(()=>{"use strict";Qo();oI();ix=class{static{o(this,"DefaultAsyncParser")}constructor(e){this.syncParser=e.parser.LangiumParser}parse(e){return Promise.resolve(this.syncParser.parse(e))}},lI=class{static{o(this,"AbstractThreadedAsyncParser")}constructor(e){this.threadCount=8,this.terminationDelay=200,this.workerPool=[],this.queue=[],this.hydrator=e.serializer.Hydrator}initializeWorkers(){for(;this.workerPool.length<this.threadCount;){let e=this.createWorker();e.onReady(()=>{if(this.queue.length>0){let r=this.queue.shift();r&&(e.lock(),r.resolve(e))}}),this.workerPool.push(e)}}async parse(e,r){let n=await this.acquireParserWorker(r),i=new as,a,s=r.onCancellationRequested(()=>{a=setTimeout(()=>{this.terminateWorker(n)},this.terminationDelay)});return n.parse(e).then(l=>{let u=this.hydrator.hydrate(l);i.resolve(u)}).catch(l=>{i.reject(l)}).finally(()=>{s.dispose(),clearTimeout(a)}),i.promise}terminateWorker(e){e.terminate();let r=this.workerPool.indexOf(e);r>=0&&this.workerPool.splice(r,1)}async acquireParserWorker(e){this.initializeWorkers();for(let n of this.workerPool)if(n.ready)return n.lock(),n;let r=new as;return e.onCancellationRequested(()=>{let n=this.queue.indexOf(r);n>=0&&this.queue.splice(n,1),r.reject(Rc)}),this.queue.push(r),r.promise}},cI=class{static{o(this,"ParserWorker")}get ready(){return this._ready}get onReady(){return this.onReadyEmitter.event}constructor(e,r,n,i){this.onReadyEmitter=new li.Emitter,this.deferred=new as,this._ready=!0,this._parsing=!1,this.sendMessage=e,this._terminate=i,r(a=>{let s=a;this.deferred.resolve(s),this.unlock()}),n(a=>{this.deferred.reject(a),this.unlock()})}terminate(){this.deferred.reject(Rc),this._terminate()}lock(){this._ready=!1}unlock(){this._parsing=!1,this._ready=!0,this.onReadyEmitter.fire()}parse(e){if(this._parsing)throw new Error("Parser worker is busy");return this._parsing=!0,this.deferred=new as,this.sendMessage(e),this.deferred.promise}}});var ax,hI=M(()=>{"use strict";Ko();Qo();ax=class{static{o(this,"DefaultWorkspaceLock")}constructor(){this.previousTokenSource=new Cr.CancellationTokenSource,this.writeQueue=[],this.readQueue=[],this.done=!0}write(e){this.cancelWrite();let r=new Cr.CancellationTokenSource;return this.previousTokenSource=r,this.enqueue(this.writeQueue,e,r.token)}read(e){return this.enqueue(this.readQueue,e)}enqueue(e,r,n){let i=new as,a={action:r,deferred:i,cancellationToken:n??Cr.CancellationToken.None};return e.push(a),this.performNextOperation(),i.promise}async performNextOperation(){if(!this.done)return;let e=[];if(this.writeQueue.length>0)e.push(this.writeQueue.shift());else if(this.readQueue.length>0)e.push(...this.readQueue.splice(0,this.readQueue.length));else return;this.done=!1,await Promise.all(e.map(async({action:r,deferred:n,cancellationToken:i})=>{try{let a=await Promise.resolve().then(()=>r(i));n.resolve(a)}catch(a){sf(a)?n.resolve(void 0):n.reject(a)}})),this.done=!0,this.performNextOperation()}cancelWrite(){this.previousTokenSource.cancel()}}});var sx,fI=M(()=>{"use strict";Ck();Ac();Yo();es();Sg();Ml();sx=class{static{o(this,"DefaultHydrator")}constructor(e){this.grammarElementIdMap=new p0,this.tokenTypeIdMap=new p0,this.grammar=e.Grammar,this.lexer=e.parser.Lexer,this.linker=e.references.Linker}dehydrate(e){return{lexerErrors:e.lexerErrors.map(r=>Object.assign({},r)),parserErrors:e.parserErrors.map(r=>Object.assign({},r)),value:this.dehydrateAstNode(e.value,this.createDehyrationContext(e.value))}}createDehyrationContext(e){let r=new Map,n=new Map;for(let i of jo(e))r.set(i,{});if(e.$cstNode)for(let i of Ud(e.$cstNode))n.set(i,{});return{astNodes:r,cstNodes:n}}dehydrateAstNode(e,r){let n=r.astNodes.get(e);n.$type=e.$type,n.$containerIndex=e.$containerIndex,n.$containerProperty=e.$containerProperty,e.$cstNode!==void 0&&(n.$cstNode=this.dehydrateCstNode(e.$cstNode,r));for(let[i,a]of Object.entries(e))if(!i.startsWith("$"))if(Array.isArray(a)){let s=[];n[i]=s;for(let l of a)ei(l)?s.push(this.dehydrateAstNode(l,r)):ma(l)?s.push(this.dehydrateReference(l,r)):s.push(l)}else ei(a)?n[i]=this.dehydrateAstNode(a,r):ma(a)?n[i]=this.dehydrateReference(a,r):a!==void 0&&(n[i]=a);return n}dehydrateReference(e,r){let n={};return n.$refText=e.$refText,e.$refNode&&(n.$refNode=r.cstNodes.get(e.$refNode)),n}dehydrateCstNode(e,r){let n=r.cstNodes.get(e);return Gv(e)?n.fullText=e.fullText:n.grammarSource=this.getGrammarElementId(e.grammarSource),n.hidden=e.hidden,n.astNode=r.astNodes.get(e.astNode),io(e)?n.content=e.content.map(i=>this.dehydrateCstNode(i,r)):Jh(e)&&(n.tokenType=e.tokenType.name,n.offset=e.offset,n.length=e.length,n.startLine=e.range.start.line,n.startColumn=e.range.start.character,n.endLine=e.range.end.line,n.endColumn=e.range.end.character),n}hydrate(e){let r=e.value,n=this.createHydrationContext(r);return"$cstNode"in r&&this.hydrateCstNode(r.$cstNode,n),{lexerErrors:e.lexerErrors,parserErrors:e.parserErrors,value:this.hydrateAstNode(r,n)}}createHydrationContext(e){let r=new Map,n=new Map;for(let a of jo(e))r.set(a,{});let i;if(e.$cstNode)for(let a of Ud(e.$cstNode)){let s;"fullText"in a?(s=new vg(a.fullText),i=s):"content"in a?s=new u0:"tokenType"in a&&(s=this.hydrateCstLeafNode(a)),s&&(n.set(a,s),s.root=i)}return{astNodes:r,cstNodes:n}}hydrateAstNode(e,r){let n=r.astNodes.get(e);n.$type=e.$type,n.$containerIndex=e.$containerIndex,n.$containerProperty=e.$containerProperty,e.$cstNode&&(n.$cstNode=r.cstNodes.get(e.$cstNode));for(let[i,a]of Object.entries(e))if(!i.startsWith("$"))if(Array.isArray(a)){let s=[];n[i]=s;for(let l of a)ei(l)?s.push(this.setParent(this.hydrateAstNode(l,r),n)):ma(l)?s.push(this.hydrateReference(l,n,i,r)):s.push(l)}else ei(a)?n[i]=this.setParent(this.hydrateAstNode(a,r),n):ma(a)?n[i]=this.hydrateReference(a,n,i,r):a!==void 0&&(n[i]=a);return n}setParent(e,r){return e.$container=r,e}hydrateReference(e,r,n,i){return this.linker.buildReference(r,n,i.cstNodes.get(e.$refNode),e.$refText)}hydrateCstNode(e,r,n=0){let i=r.cstNodes.get(e);if(typeof e.grammarSource=="number"&&(i.grammarSource=this.getGrammarElement(e.grammarSource)),i.astNode=r.astNodes.get(e.astNode),io(i))for(let a of e.content){let s=this.hydrateCstNode(a,r,n++);i.content.push(s)}return i}hydrateCstLeafNode(e){let r=this.getTokenType(e.tokenType),n=e.offset,i=e.length,a=e.startLine,s=e.startColumn,l=e.endLine,u=e.endColumn,h=e.hidden;return new c0(n,i,{start:{line:a,character:s},end:{line:l,character:u}},r,h)}getTokenType(e){return this.lexer.definition[e]}getGrammarElementId(e){return this.grammarElementIdMap.size===0&&this.createGrammarElementIdMap(),this.grammarElementIdMap.get(e)}getGrammarElement(e){this.grammarElementIdMap.size===0&&this.createGrammarElementIdMap();let r=this.grammarElementIdMap.getKey(e);if(r)return r;throw new Error("Invalid grammar element id: "+e)}createGrammarElementIdMap(){let e=0;for(let r of jo(this.grammar))Hv(r)&&this.grammarElementIdMap.set(r,e++)}}});function lo(t){return{documentation:{CommentProvider:o(e=>new nx(e),"CommentProvider"),DocumentationProvider:o(e=>new rx(e),"DocumentationProvider")},parser:{AsyncParser:o(e=>new ix(e),"AsyncParser"),GrammarConfig:o(e=>lR(e),"GrammarConfig"),LangiumParser:o(e=>vM(e),"LangiumParser"),CompletionParser:o(e=>gM(e),"CompletionParser"),ValueConverter:o(()=>new d0,"ValueConverter"),TokenBuilder:o(()=>new f0,"TokenBuilder"),Lexer:o(e=>new J2(e),"Lexer"),ParserErrorMessageProvider:o(()=>new xg,"ParserErrorMessageProvider")},workspace:{AstNodeLocator:o(()=>new X2,"AstNodeLocator"),AstNodeDescriptionProvider:o(e=>new Y2(e),"AstNodeDescriptionProvider"),ReferenceDescriptionProvider:o(e=>new q2(e),"ReferenceDescriptionProvider")},references:{Linker:o(e=>new I2(e),"Linker"),NameProvider:o(()=>new O2,"NameProvider"),ScopeProvider:o(e=>new G2(e),"ScopeProvider"),ScopeComputation:o(e=>new B2(e),"ScopeComputation"),References:o(e=>new P2(e),"References")},serializer:{Hydrator:o(e=>new sx(e),"Hydrator"),JsonSerializer:o(e=>new $2(e),"JsonSerializer")},validation:{DocumentValidator:o(e=>new W2(e),"DocumentValidator"),ValidationRegistry:o(e=>new U2(e),"ValidationRegistry")},shared:o(()=>t.shared,"shared")}}function co(t){return{ServiceRegistry:o(()=>new V2,"ServiceRegistry"),workspace:{LangiumDocuments:o(e=>new M2(e),"LangiumDocuments"),LangiumDocumentFactory:o(e=>new R2(e),"LangiumDocumentFactory"),DocumentBuilder:o(e=>new K2(e),"DocumentBuilder"),IndexManager:o(e=>new Q2(e),"IndexManager"),WorkspaceManager:o(e=>new Z2(e),"WorkspaceManager"),FileSystemProvider:o(e=>t.fileSystemProvider(e),"FileSystemProvider"),WorkspaceLock:o(()=>new ax,"WorkspaceLock"),ConfigurationProvider:o(e=>new j2(e),"ConfigurationProvider")}}}var dI=M(()=>{"use strict";cR();yM();xM();bM();wM();IM();OM();PM();BM();zM();Bk();$M();VM();H2();UM();HM();WM();qM();Eg();XM();jM();ZM();aI();sI();N2();uI();hI();fI();o(lo,"createDefaultCoreModule");o(co,"createDefaultSharedCoreModule")});function $i(t,e,r,n,i,a,s,l,u){let h=[t,e,r,n,i,a,s,l,u].reduce(Vk,{});return Dce(h)}function Lce(t){if(t&&t[mI])for(let e of Object.values(t))Lce(e);return t}function Dce(t,e){let r=new Proxy({},{deleteProperty:o(()=>!1,"deleteProperty"),get:o((n,i)=>_ce(n,i,t,e||r),"get"),getOwnPropertyDescriptor:o((n,i)=>(_ce(n,i,t,e||r),Object.getOwnPropertyDescriptor(n,i)),"getOwnPropertyDescriptor"),has:o((n,i)=>i in t,"has"),ownKeys:o(()=>[...Reflect.ownKeys(t),mI],"ownKeys")});return r[mI]=!0,r}function _ce(t,e,r,n){if(e in t){if(t[e]instanceof Error)throw new Error("Construction failure. Please make sure that your dependencies are constructable.",{cause:t[e]});if(t[e]===Ace)throw new Error('Cycle detected. Please make "'+String(e)+'" lazy. See https://langium.org/docs/configuration-services/#resolving-cyclic-dependencies');return t[e]}else if(e in r){let i=r[e];t[e]=Ace;try{t[e]=typeof i=="function"?i(n):Dce(i,n)}catch(a){throw t[e]=a instanceof Error?a:void 0,a}return t[e]}else return}function Vk(t,e){if(e){for(let[r,n]of Object.entries(e))if(n!==void 0){let i=t[r];i!==null&&n!==null&&typeof i=="object"&&typeof n=="object"?t[r]=Vk(i,n):t[r]=n}}return t}var pI,mI,Ace,gI=M(()=>{"use strict";(function(t){t.merge=(e,r)=>Vk(Vk({},e),r)})(pI||(pI={}));o($i,"inject");mI=Symbol("isProxy");o(Lce,"eagerLoad");o(Dce,"_inject");Ace=Symbol();o(_ce,"_resolve");o(Vk,"_merge")});var Nce=M(()=>{"use strict"});var Rce=M(()=>{"use strict";sI();aI();iI()});var Mce=M(()=>{"use strict"});var Ice=M(()=>{"use strict";cR();Mce()});var Oce=M(()=>{"use strict"});var Pce=M(()=>{"use strict";uI();yM();Ck();xM();N2();ZM();Oce();bM();wM()});var Bce=M(()=>{"use strict";IM();OM();PM();FM();BM();zM()});var Fce=M(()=>{"use strict";fI();Bk()});var Uk,uo,yI=M(()=>{"use strict";Uk=class{static{o(this,"EmptyFileSystemProvider")}readFile(){throw new Error("No file system is available.")}async readDirectory(){return[]}},uo={fileSystemProvider:o(()=>new Uk,"fileSystemProvider")}});function Qze(){let t=$i(co(uo),Kze),e=$i(lo({shared:t}),jze);return t.ServiceRegistry.register(e),e}function of(t){var e;let r=Qze(),n=r.serializer.JsonSerializer.deserialize(t);return r.shared.workspace.LangiumDocumentFactory.fromModel(n,Os.parse(`memory://${(e=n.name)!==null&&e!==void 0?e:"grammar"}.langium`)),n}var jze,Kze,zce=M(()=>{"use strict";dI();gI();Ac();yI();Mc();jze={Grammar:o(()=>{},"Grammar"),LanguageMetaData:o(()=>({caseInsensitive:!1,fileExtensions:[".langium"],languageId:"langium"}),"LanguageMetaData")},Kze={AstReflection:o(()=>new Vm,"AstReflection")};o(Qze,"createMinimalGrammarServices");o(of,"loadGrammarFromJson")});var Gr={};vr(Gr,{AstUtils:()=>AT,BiMap:()=>p0,Cancellation:()=>Cr,ContextCache:()=>m0,CstUtils:()=>mT,DONE_RESULT:()=>Ja,Deferred:()=>as,Disposable:()=>g0,DisposableCache:()=>Ag,DocumentCache:()=>Ok,EMPTY_STREAM:()=>$v,ErrorWithLocation:()=>Wd,GrammarUtils:()=>MT,MultiMap:()=>Ic,OperationCancelled:()=>Rc,Reduction:()=>Gm,RegExpUtils:()=>NT,SimpleCache:()=>z2,StreamImpl:()=>ao,TreeStreamImpl:()=>Cc,URI:()=>Os,UriUtils:()=>ss,WorkspaceCache:()=>_g,assertUnreachable:()=>ef,delayNextTick:()=>NM,interruptAndCheck:()=>Gi,isOperationCancelled:()=>sf,loadGrammarFromJson:()=>of,setInterruptionPeriod:()=>hce,startCancelableOperation:()=>uce,stream:()=>tn});var Gce=M(()=>{"use strict";Pk();oI();Er(Gr,li);Sg();YM();gT();zce();Qo();Rs();Mc();es();Ko();Ml();Pl();Wm()});var $ce=M(()=>{"use strict";VM();H2()});var Vce=M(()=>{"use strict";UM();HM();WM();qM();Eg();yI();XM();hI();jM()});var ga={};vr(ga,{AbstractAstReflection:()=>$d,AbstractCstNode:()=>A2,AbstractLangiumParser:()=>_2,AbstractParserErrorMessageProvider:()=>_k,AbstractThreadedAsyncParser:()=>lI,AstUtils:()=>AT,BiMap:()=>p0,Cancellation:()=>Cr,CompositeCstNodeImpl:()=>u0,ContextCache:()=>m0,CstNodeBuilder:()=>C2,CstUtils:()=>mT,DONE_RESULT:()=>Ja,DatatypeSymbol:()=>Ak,DefaultAstNodeDescriptionProvider:()=>Y2,DefaultAstNodeLocator:()=>X2,DefaultAsyncParser:()=>ix,DefaultCommentProvider:()=>nx,DefaultConfigurationProvider:()=>j2,DefaultDocumentBuilder:()=>K2,DefaultDocumentValidator:()=>W2,DefaultHydrator:()=>sx,DefaultIndexManager:()=>Q2,DefaultJsonSerializer:()=>$2,DefaultLangiumDocumentFactory:()=>R2,DefaultLangiumDocuments:()=>M2,DefaultLexer:()=>J2,DefaultLinker:()=>I2,DefaultNameProvider:()=>O2,DefaultReferenceDescriptionProvider:()=>q2,DefaultReferences:()=>P2,DefaultScopeComputation:()=>B2,DefaultScopeProvider:()=>G2,DefaultServiceRegistry:()=>V2,DefaultTokenBuilder:()=>f0,DefaultValueConverter:()=>d0,DefaultWorkspaceLock:()=>ax,DefaultWorkspaceManager:()=>Z2,Deferred:()=>as,Disposable:()=>g0,DisposableCache:()=>Ag,DocumentCache:()=>Ok,DocumentState:()=>bn,DocumentValidator:()=>$u,EMPTY_SCOPE:()=>Pze,EMPTY_STREAM:()=>$v,EmptyFileSystem:()=>uo,EmptyFileSystemProvider:()=>Uk,ErrorWithLocation:()=>Wd,GrammarAST:()=>Yv,GrammarUtils:()=>MT,JSDocDocumentationProvider:()=>rx,LangiumCompletionParser:()=>D2,LangiumParser:()=>L2,LangiumParserErrorMessageProvider:()=>xg,LeafCstNodeImpl:()=>c0,MapScope:()=>F2,Module:()=>pI,MultiMap:()=>Ic,OperationCancelled:()=>Rc,ParserWorker:()=>cI,Reduction:()=>Gm,RegExpUtils:()=>NT,RootCstNodeImpl:()=>vg,SimpleCache:()=>z2,StreamImpl:()=>ao,StreamScope:()=>Cg,TextDocument:()=>Tg,TreeStreamImpl:()=>Cc,URI:()=>Os,UriUtils:()=>ss,ValidationCategory:()=>Lg,ValidationRegistry:()=>U2,ValueConverter:()=>Nc,WorkspaceCache:()=>_g,assertUnreachable:()=>ef,createCompletionParser:()=>gM,createDefaultCoreModule:()=>lo,createDefaultSharedCoreModule:()=>co,createGrammarConfig:()=>lR,createLangiumParser:()=>vM,delayNextTick:()=>NM,diagnosticData:()=>Fk,eagerLoad:()=>Lce,getDiagnosticRange:()=>xce,inject:()=>$i,interruptAndCheck:()=>Gi,isAstNode:()=>ei,isAstNodeDescription:()=>MD,isAstNodeWithComment:()=>GM,isCompositeCstNode:()=>io,isIMultiModeLexerDefinition:()=>QM,isJSDoc:()=>rI,isLeafCstNode:()=>Jh,isLinkingError:()=>Vd,isNamed:()=>yce,isOperationCancelled:()=>sf,isReference:()=>ma,isRootCstNode:()=>Gv,isTokenTypeArray:()=>bce,isTokenTypeDictionary:()=>KM,loadGrammarFromJson:()=>of,parseJSDoc:()=>tI,prepareLangiumParser:()=>nce,setInterruptionPeriod:()=>hce,startCancelableOperation:()=>uce,stream:()=>tn,toDiagnosticSeverity:()=>zk});var Oc=M(()=>{"use strict";dI();gI();$M();Nce();Yo();Rce();Ice();Pce();Bce();Fce();Gce();Er(ga,Gr);$ce();Vce();Ac()});function Kce(t){return Fl.isInstance(t,jce)}function Qce(t){return Fl.isInstance(t,vI)}function Zce(t){return Fl.isInstance(t,xI)}function Jce(t){return Fl.isInstance(t,tGe)}function eue(t){return Fl.isInstance(t,bI)}function rue(t){return Fl.isInstance(t,tue)}function nue(t){return Fl.isInstance(t,wI)}function aue(t){return Fl.isInstance(t,iue)}function oue(t){return Fl.isInstance(t,sue)}function cue(t){return Fl.isInstance(t,lue)}function hue(t){return Fl.isInstance(t,uue)}var Zze,Ot,Xce,jce,vI,Jze,eGe,xI,tGe,bI,tue,wI,iue,sue,lue,uue,rGe,fue,Fl,Uce,nGe,Hce,iGe,Wce,aGe,Yce,sGe,qce,oGe,lGe,cGe,uGe,hGe,fGe,zl,TI,kI,EI,SI,CI,dGe,pGe,mGe,gGe,Dg,y0,Zo,yGe,Jo=M(()=>{"use strict";Oc();Oc();Oc();Oc();Zze=Object.defineProperty,Ot=o((t,e)=>Zze(t,"name",{value:e,configurable:!0}),"__name"),Xce="Statement",jce="Architecture";o(Kce,"isArchitecture");Ot(Kce,"isArchitecture");vI="Branch";o(Qce,"isBranch");Ot(Qce,"isBranch");Jze="Checkout",eGe="CherryPicking",xI="Commit";o(Zce,"isCommit");Ot(Zce,"isCommit");tGe="Common";o(Jce,"isCommon");Ot(Jce,"isCommon");bI="GitGraph";o(eue,"isGitGraph");Ot(eue,"isGitGraph");tue="Info";o(rue,"isInfo");Ot(rue,"isInfo");wI="Merge";o(nue,"isMerge");Ot(nue,"isMerge");iue="Packet";o(aue,"isPacket");Ot(aue,"isPacket");sue="PacketBlock";o(oue,"isPacketBlock");Ot(oue,"isPacketBlock");lue="Pie";o(cue,"isPie");Ot(cue,"isPie");uue="PieSection";o(hue,"isPieSection");Ot(hue,"isPieSection");rGe="Direction",fue=class extends $d{static{o(this,"MermaidAstReflection")}static{Ot(this,"MermaidAstReflection")}getAllTypes(){return["Architecture","Branch","Checkout","CherryPicking","Commit","Common","Direction","Edge","GitGraph","Group","Info","Junction","Merge","Packet","PacketBlock","Pie","PieSection","Service","Statement"]}computeIsSubtype(t,e){switch(t){case vI:case Jze:case eGe:case xI:case wI:return this.isSubtype(Xce,e);case rGe:return this.isSubtype(bI,e);default:return!1}}getReferenceType(t){let e=`${t.container.$type}:${t.property}`;switch(e){default:throw new Error(`${e} is not a valid reference id.`)}}getTypeMetaData(t){switch(t){case"Architecture":return{name:"Architecture",properties:[{name:"accDescr"},{name:"accTitle"},{name:"edges",defaultValue:[]},{name:"groups",defaultValue:[]},{name:"junctions",defaultValue:[]},{name:"services",defaultValue:[]},{name:"title"}]};case"Branch":return{name:"Branch",properties:[{name:"name"},{name:"order"}]};case"Checkout":return{name:"Checkout",properties:[{name:"branch"}]};case"CherryPicking":return{name:"CherryPicking",properties:[{name:"id"},{name:"parent"},{name:"tags",defaultValue:[]}]};case"Commit":return{name:"Commit",properties:[{name:"id"},{name:"message"},{name:"tags",defaultValue:[]},{name:"type"}]};case"Common":return{name:"Common",properties:[{name:"accDescr"},{name:"accTitle"},{name:"title"}]};case"Edge":return{name:"Edge",properties:[{name:"lhsDir"},{name:"lhsGroup",defaultValue:!1},{name:"lhsId"},{name:"lhsInto",defaultValue:!1},{name:"rhsDir"},{name:"rhsGroup",defaultValue:!1},{name:"rhsId"},{name:"rhsInto",defaultValue:!1},{name:"title"}]};case"GitGraph":return{name:"GitGraph",properties:[{name:"accDescr"},{name:"accTitle"},{name:"statements",defaultValue:[]},{name:"title"}]};case"Group":return{name:"Group",properties:[{name:"icon"},{name:"id"},{name:"in"},{name:"title"}]};case"Info":return{name:"Info",properties:[{name:"accDescr"},{name:"accTitle"},{name:"title"}]};case"Junction":return{name:"Junction",properties:[{name:"id"},{name:"in"}]};case"Merge":return{name:"Merge",properties:[{name:"branch"},{name:"id"},{name:"tags",defaultValue:[]},{name:"type"}]};case"Packet":return{name:"Packet",properties:[{name:"accDescr"},{name:"accTitle"},{name:"blocks",defaultValue:[]},{name:"title"}]};case"PacketBlock":return{name:"PacketBlock",properties:[{name:"end"},{name:"label"},{name:"start"}]};case"Pie":return{name:"Pie",properties:[{name:"accDescr"},{name:"accTitle"},{name:"sections",defaultValue:[]},{name:"showData",defaultValue:!1},{name:"title"}]};case"PieSection":return{name:"PieSection",properties:[{name:"label"},{name:"value"}]};case"Service":return{name:"Service",properties:[{name:"icon"},{name:"iconText"},{name:"id"},{name:"in"},{name:"title"}]};case"Direction":return{name:"Direction",properties:[{name:"accDescr"},{name:"accTitle"},{name:"dir"},{name:"statements",defaultValue:[]},{name:"title"}]};default:return{name:t,properties:[]}}}},Fl=new fue,nGe=Ot(()=>Uce??(Uce=of('{"$type":"Grammar","isDeclared":true,"name":"Info","imports":[],"rules":[{"$type":"ParserRule","name":"Info","entry":true,"definition":{"$type":"Group","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@3"},"arguments":[],"cardinality":"*"},{"$type":"Keyword","value":"info"},{"$type":"RuleCall","rule":{"$ref":"#/rules@3"},"arguments":[],"cardinality":"*"},{"$type":"Group","elements":[{"$type":"Keyword","value":"showInfo"},{"$type":"RuleCall","rule":{"$ref":"#/rules@3"},"arguments":[],"cardinality":"*"}],"cardinality":"?"},{"$type":"RuleCall","rule":{"$ref":"#/rules@1"},"arguments":[],"cardinality":"?"}]},"definesHiddenTokens":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"TitleAndAccessibilities","fragment":true,"definition":{"$type":"Group","elements":[{"$type":"Alternatives","elements":[{"$type":"Assignment","feature":"accDescr","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@4"},"arguments":[]}},{"$type":"Assignment","feature":"accTitle","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@5"},"arguments":[]}},{"$type":"Assignment","feature":"title","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@6"},"arguments":[]}}]},{"$type":"RuleCall","rule":{"$ref":"#/rules@2"},"arguments":[]}],"cardinality":"+"},"definesHiddenTokens":false,"entry":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"EOL","fragment":true,"dataType":"string","definition":{"$type":"Alternatives","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@3"},"arguments":[],"cardinality":"+"},{"$type":"EndOfFile"}]},"definesHiddenTokens":false,"entry":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"TerminalRule","name":"NEWLINE","definition":{"$type":"RegexToken","regex":"/\\\\r?\\\\n/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ACC_DESCR","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*accDescr(?:[\\\\t ]*:([^\\\\n\\\\r]*?(?=%%)|[^\\\\n\\\\r]*)|\\\\s*{([^}]*)})/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ACC_TITLE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*accTitle[\\\\t ]*:(?:[^\\\\n\\\\r]*?(?=%%)|[^\\\\n\\\\r]*)/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"TITLE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*title(?:[\\\\t ][^\\\\n\\\\r]*?(?=%%)|[\\\\t ][^\\\\n\\\\r]*|)/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","hidden":true,"name":"WHITESPACE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]+/"},"fragment":false},{"$type":"TerminalRule","hidden":true,"name":"YAML","definition":{"$type":"RegexToken","regex":"/---[\\\\t ]*\\\\r?\\\\n(?:[\\\\S\\\\s]*?\\\\r?\\\\n)?---(?:\\\\r?\\\\n|(?!\\\\S))/"},"fragment":false},{"$type":"TerminalRule","hidden":true,"name":"DIRECTIVE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*%%{[\\\\S\\\\s]*?}%%(?:\\\\r?\\\\n|(?!\\\\S))/"},"fragment":false},{"$type":"TerminalRule","hidden":true,"name":"SINGLE_LINE_COMMENT","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*%%[^\\\\n\\\\r]*/"},"fragment":false}],"definesHiddenTokens":false,"hiddenTokens":[],"interfaces":[{"$type":"Interface","name":"Common","attributes":[{"$type":"TypeAttribute","name":"accDescr","isOptional":true,"type":{"$type":"SimpleType","primitiveType":"string"}},{"$type":"TypeAttribute","name":"accTitle","isOptional":true,"type":{"$type":"SimpleType","primitiveType":"string"}},{"$type":"TypeAttribute","name":"title","isOptional":true,"type":{"$type":"SimpleType","primitiveType":"string"}}],"superTypes":[]}],"types":[],"usedGrammars":[]}')),"InfoGrammar"),iGe=Ot(()=>Hce??(Hce=of(`{"$type":"Grammar","isDeclared":true,"name":"Packet","imports":[],"rules":[{"$type":"ParserRule","name":"Packet","entry":true,"definition":{"$type":"Group","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@6"},"arguments":[],"cardinality":"*"},{"$type":"Keyword","value":"packet-beta"},{"$type":"Alternatives","elements":[{"$type":"Group","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@6"},"arguments":[],"cardinality":"*"},{"$type":"RuleCall","rule":{"$ref":"#/rules@4"},"arguments":[]},{"$type":"Assignment","feature":"blocks","operator":"+=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@1"},"arguments":[]},"cardinality":"*"}]},{"$type":"Group","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@6"},"arguments":[],"cardinality":"+"},{"$type":"Assignment","feature":"blocks","operator":"+=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@1"},"arguments":[]},"cardinality":"+"}]},{"$type":"RuleCall","rule":{"$ref":"#/rules@6"},"arguments":[],"cardinality":"*"}]}]},"definesHiddenTokens":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"PacketBlock","definition":{"$type":"Group","elements":[{"$type":"Assignment","feature":"start","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@2"},"arguments":[]}},{"$type":"Group","elements":[{"$type":"Keyword","value":"-"},{"$type":"Assignment","feature":"end","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@2"},"arguments":[]}}],"cardinality":"?"},{"$type":"Keyword","value":":"},{"$type":"Assignment","feature":"label","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@3"},"arguments":[]}},{"$type":"RuleCall","rule":{"$ref":"#/rules@5"},"arguments":[]}]},"definesHiddenTokens":false,"entry":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"TerminalRule","name":"INT","type":{"$type":"ReturnType","name":"number"},"definition":{"$type":"RegexToken","regex":"/0|[1-9][0-9]*/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"STRING","definition":{"$type":"RegexToken","regex":"/\\"[^\\"]*\\"|'[^']*'/"},"fragment":false,"hidden":false},{"$type":"ParserRule","name":"TitleAndAccessibilities","fragment":true,"definition":{"$type":"Group","elements":[{"$type":"Alternatives","elements":[{"$type":"Assignment","feature":"accDescr","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@7"},"arguments":[]}},{"$type":"Assignment","feature":"accTitle","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@8"},"arguments":[]}},{"$type":"Assignment","feature":"title","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@9"},"arguments":[]}}]},{"$type":"RuleCall","rule":{"$ref":"#/rules@5"},"arguments":[]}],"cardinality":"+"},"definesHiddenTokens":false,"entry":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"EOL","fragment":true,"dataType":"string","definition":{"$type":"Alternatives","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@6"},"arguments":[],"cardinality":"+"},{"$type":"EndOfFile"}]},"definesHiddenTokens":false,"entry":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"TerminalRule","name":"NEWLINE","definition":{"$type":"RegexToken","regex":"/\\\\r?\\\\n/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ACC_DESCR","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*accDescr(?:[\\\\t ]*:([^\\\\n\\\\r]*?(?=%%)|[^\\\\n\\\\r]*)|\\\\s*{([^}]*)})/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ACC_TITLE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*accTitle[\\\\t ]*:(?:[^\\\\n\\\\r]*?(?=%%)|[^\\\\n\\\\r]*)/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"TITLE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*title(?:[\\\\t ][^\\\\n\\\\r]*?(?=%%)|[\\\\t ][^\\\\n\\\\r]*|)/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","hidden":true,"name":"WHITESPACE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]+/"},"fragment":false},{"$type":"TerminalRule","hidden":true,"name":"YAML","definition":{"$type":"RegexToken","regex":"/---[\\\\t ]*\\\\r?\\\\n(?:[\\\\S\\\\s]*?\\\\r?\\\\n)?---(?:\\\\r?\\\\n|(?!\\\\S))/"},"fragment":false},{"$type":"TerminalRule","hidden":true,"name":"DIRECTIVE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*%%{[\\\\S\\\\s]*?}%%(?:\\\\r?\\\\n|(?!\\\\S))/"},"fragment":false},{"$type":"TerminalRule","hidden":true,"name":"SINGLE_LINE_COMMENT","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*%%[^\\\\n\\\\r]*/"},"fragment":false}],"definesHiddenTokens":false,"hiddenTokens":[],"interfaces":[{"$type":"Interface","name":"Common","attributes":[{"$type":"TypeAttribute","name":"accDescr","isOptional":true,"type":{"$type":"SimpleType","primitiveType":"string"}},{"$type":"TypeAttribute","name":"accTitle","isOptional":true,"type":{"$type":"SimpleType","primitiveType":"string"}},{"$type":"TypeAttribute","name":"title","isOptional":true,"type":{"$type":"SimpleType","primitiveType":"string"}}],"superTypes":[]}],"types":[],"usedGrammars":[]}`)),"PacketGrammar"),aGe=Ot(()=>Wce??(Wce=of('{"$type":"Grammar","isDeclared":true,"name":"Pie","imports":[],"rules":[{"$type":"ParserRule","name":"Pie","entry":true,"definition":{"$type":"Group","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@6"},"arguments":[],"cardinality":"*"},{"$type":"Keyword","value":"pie"},{"$type":"Assignment","feature":"showData","operator":"?=","terminal":{"$type":"Keyword","value":"showData"},"cardinality":"?"},{"$type":"Alternatives","elements":[{"$type":"Group","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@6"},"arguments":[],"cardinality":"*"},{"$type":"RuleCall","rule":{"$ref":"#/rules@4"},"arguments":[]},{"$type":"Assignment","feature":"sections","operator":"+=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@1"},"arguments":[]},"cardinality":"*"}]},{"$type":"Group","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@6"},"arguments":[],"cardinality":"+"},{"$type":"Assignment","feature":"sections","operator":"+=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@1"},"arguments":[]},"cardinality":"+"}]},{"$type":"RuleCall","rule":{"$ref":"#/rules@6"},"arguments":[],"cardinality":"*"}]}]},"definesHiddenTokens":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"PieSection","definition":{"$type":"Group","elements":[{"$type":"Assignment","feature":"label","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@2"},"arguments":[]}},{"$type":"Keyword","value":":"},{"$type":"Assignment","feature":"value","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@3"},"arguments":[]}},{"$type":"RuleCall","rule":{"$ref":"#/rules@5"},"arguments":[]}]},"definesHiddenTokens":false,"entry":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"TerminalRule","name":"PIE_SECTION_LABEL","definition":{"$type":"RegexToken","regex":"/\\"[^\\"]+\\"/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"PIE_SECTION_VALUE","type":{"$type":"ReturnType","name":"number"},"definition":{"$type":"RegexToken","regex":"/(0|[1-9][0-9]*)(\\\\.[0-9]+)?/"},"fragment":false,"hidden":false},{"$type":"ParserRule","name":"TitleAndAccessibilities","fragment":true,"definition":{"$type":"Group","elements":[{"$type":"Alternatives","elements":[{"$type":"Assignment","feature":"accDescr","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@7"},"arguments":[]}},{"$type":"Assignment","feature":"accTitle","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@8"},"arguments":[]}},{"$type":"Assignment","feature":"title","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@9"},"arguments":[]}}]},{"$type":"RuleCall","rule":{"$ref":"#/rules@5"},"arguments":[]}],"cardinality":"+"},"definesHiddenTokens":false,"entry":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"EOL","fragment":true,"dataType":"string","definition":{"$type":"Alternatives","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@6"},"arguments":[],"cardinality":"+"},{"$type":"EndOfFile"}]},"definesHiddenTokens":false,"entry":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"TerminalRule","name":"NEWLINE","definition":{"$type":"RegexToken","regex":"/\\\\r?\\\\n/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ACC_DESCR","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*accDescr(?:[\\\\t ]*:([^\\\\n\\\\r]*?(?=%%)|[^\\\\n\\\\r]*)|\\\\s*{([^}]*)})/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ACC_TITLE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*accTitle[\\\\t ]*:(?:[^\\\\n\\\\r]*?(?=%%)|[^\\\\n\\\\r]*)/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"TITLE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*title(?:[\\\\t ][^\\\\n\\\\r]*?(?=%%)|[\\\\t ][^\\\\n\\\\r]*|)/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","hidden":true,"name":"WHITESPACE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]+/"},"fragment":false},{"$type":"TerminalRule","hidden":true,"name":"YAML","definition":{"$type":"RegexToken","regex":"/---[\\\\t ]*\\\\r?\\\\n(?:[\\\\S\\\\s]*?\\\\r?\\\\n)?---(?:\\\\r?\\\\n|(?!\\\\S))/"},"fragment":false},{"$type":"TerminalRule","hidden":true,"name":"DIRECTIVE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*%%{[\\\\S\\\\s]*?}%%(?:\\\\r?\\\\n|(?!\\\\S))/"},"fragment":false},{"$type":"TerminalRule","hidden":true,"name":"SINGLE_LINE_COMMENT","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*%%[^\\\\n\\\\r]*/"},"fragment":false}],"definesHiddenTokens":false,"hiddenTokens":[],"interfaces":[{"$type":"Interface","name":"Common","attributes":[{"$type":"TypeAttribute","name":"accDescr","isOptional":true,"type":{"$type":"SimpleType","primitiveType":"string"}},{"$type":"TypeAttribute","name":"accTitle","isOptional":true,"type":{"$type":"SimpleType","primitiveType":"string"}},{"$type":"TypeAttribute","name":"title","isOptional":true,"type":{"$type":"SimpleType","primitiveType":"string"}}],"superTypes":[]}],"types":[],"usedGrammars":[]}')),"PieGrammar"),sGe=Ot(()=>Yce??(Yce=of('{"$type":"Grammar","isDeclared":true,"name":"Architecture","imports":[],"rules":[{"$type":"ParserRule","name":"Architecture","entry":true,"definition":{"$type":"Group","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@18"},"arguments":[],"cardinality":"*"},{"$type":"Keyword","value":"architecture-beta"},{"$type":"Alternatives","elements":[{"$type":"Group","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@18"},"arguments":[],"cardinality":"*"},{"$type":"RuleCall","rule":{"$ref":"#/rules@16"},"arguments":[]}]},{"$type":"Group","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@18"},"arguments":[],"cardinality":"*"},{"$type":"RuleCall","rule":{"$ref":"#/rules@1"},"arguments":[],"cardinality":"*"}]},{"$type":"RuleCall","rule":{"$ref":"#/rules@18"},"arguments":[],"cardinality":"*"}]}]},"definesHiddenTokens":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"Statement","fragment":true,"definition":{"$type":"Alternatives","elements":[{"$type":"Assignment","feature":"groups","operator":"+=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@5"},"arguments":[]}},{"$type":"Assignment","feature":"services","operator":"+=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@6"},"arguments":[]}},{"$type":"Assignment","feature":"junctions","operator":"+=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@7"},"arguments":[]}},{"$type":"Assignment","feature":"edges","operator":"+=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@8"},"arguments":[]}}]},"definesHiddenTokens":false,"entry":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"LeftPort","fragment":true,"definition":{"$type":"Group","elements":[{"$type":"Keyword","value":":"},{"$type":"Assignment","feature":"lhsDir","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@9"},"arguments":[]}}]},"definesHiddenTokens":false,"entry":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"RightPort","fragment":true,"definition":{"$type":"Group","elements":[{"$type":"Assignment","feature":"rhsDir","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@9"},"arguments":[]}},{"$type":"Keyword","value":":"}]},"definesHiddenTokens":false,"entry":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"Arrow","fragment":true,"definition":{"$type":"Group","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@2"},"arguments":[]},{"$type":"Assignment","feature":"lhsInto","operator":"?=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@15"},"arguments":[]},"cardinality":"?"},{"$type":"Alternatives","elements":[{"$type":"Keyword","value":"--"},{"$type":"Group","elements":[{"$type":"Keyword","value":"-"},{"$type":"Assignment","feature":"title","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@13"},"arguments":[]}},{"$type":"Keyword","value":"-"}]}]},{"$type":"Assignment","feature":"rhsInto","operator":"?=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@15"},"arguments":[]},"cardinality":"?"},{"$type":"RuleCall","rule":{"$ref":"#/rules@3"},"arguments":[]}]},"definesHiddenTokens":false,"entry":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"Group","definition":{"$type":"Group","elements":[{"$type":"Keyword","value":"group"},{"$type":"Assignment","feature":"id","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@10"},"arguments":[]}},{"$type":"Assignment","feature":"icon","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@12"},"arguments":[]},"cardinality":"?"},{"$type":"Assignment","feature":"title","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@13"},"arguments":[]},"cardinality":"?"},{"$type":"Group","elements":[{"$type":"Keyword","value":"in"},{"$type":"Assignment","feature":"in","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@10"},"arguments":[]}}],"cardinality":"?"},{"$type":"RuleCall","rule":{"$ref":"#/rules@17"},"arguments":[]}]},"definesHiddenTokens":false,"entry":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"Service","definition":{"$type":"Group","elements":[{"$type":"Keyword","value":"service"},{"$type":"Assignment","feature":"id","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@10"},"arguments":[]}},{"$type":"Alternatives","elements":[{"$type":"Assignment","feature":"iconText","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@11"},"arguments":[]}},{"$type":"Assignment","feature":"icon","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@12"},"arguments":[]}}],"cardinality":"?"},{"$type":"Assignment","feature":"title","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@13"},"arguments":[]},"cardinality":"?"},{"$type":"Group","elements":[{"$type":"Keyword","value":"in"},{"$type":"Assignment","feature":"in","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@10"},"arguments":[]}}],"cardinality":"?"},{"$type":"RuleCall","rule":{"$ref":"#/rules@17"},"arguments":[]}]},"definesHiddenTokens":false,"entry":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"Junction","definition":{"$type":"Group","elements":[{"$type":"Keyword","value":"junction"},{"$type":"Assignment","feature":"id","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@10"},"arguments":[]}},{"$type":"Group","elements":[{"$type":"Keyword","value":"in"},{"$type":"Assignment","feature":"in","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@10"},"arguments":[]}}],"cardinality":"?"},{"$type":"RuleCall","rule":{"$ref":"#/rules@17"},"arguments":[]}]},"definesHiddenTokens":false,"entry":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"Edge","definition":{"$type":"Group","elements":[{"$type":"Assignment","feature":"lhsId","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@10"},"arguments":[]}},{"$type":"Assignment","feature":"lhsGroup","operator":"?=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@14"},"arguments":[]},"cardinality":"?"},{"$type":"RuleCall","rule":{"$ref":"#/rules@4"},"arguments":[]},{"$type":"Assignment","feature":"rhsId","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@10"},"arguments":[]}},{"$type":"Assignment","feature":"rhsGroup","operator":"?=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@14"},"arguments":[]},"cardinality":"?"},{"$type":"RuleCall","rule":{"$ref":"#/rules@17"},"arguments":[]}]},"definesHiddenTokens":false,"entry":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"TerminalRule","name":"ARROW_DIRECTION","definition":{"$type":"TerminalAlternatives","elements":[{"$type":"TerminalAlternatives","elements":[{"$type":"TerminalAlternatives","elements":[{"$type":"CharacterRange","left":{"$type":"Keyword","value":"L"}},{"$type":"CharacterRange","left":{"$type":"Keyword","value":"R"}}]},{"$type":"CharacterRange","left":{"$type":"Keyword","value":"T"}}]},{"$type":"CharacterRange","left":{"$type":"Keyword","value":"B"}}]},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ARCH_ID","definition":{"$type":"RegexToken","regex":"/[\\\\w]+/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ARCH_TEXT_ICON","definition":{"$type":"RegexToken","regex":"/\\\\(\\"[^\\"]+\\"\\\\)/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ARCH_ICON","definition":{"$type":"RegexToken","regex":"/\\\\([\\\\w-:]+\\\\)/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ARCH_TITLE","definition":{"$type":"RegexToken","regex":"/\\\\[[\\\\w ]+\\\\]/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ARROW_GROUP","definition":{"$type":"RegexToken","regex":"/\\\\{group\\\\}/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ARROW_INTO","definition":{"$type":"RegexToken","regex":"/<|>/"},"fragment":false,"hidden":false},{"$type":"ParserRule","name":"TitleAndAccessibilities","fragment":true,"definition":{"$type":"Group","elements":[{"$type":"Alternatives","elements":[{"$type":"Assignment","feature":"accDescr","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@19"},"arguments":[]}},{"$type":"Assignment","feature":"accTitle","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@20"},"arguments":[]}},{"$type":"Assignment","feature":"title","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@21"},"arguments":[]}}]},{"$type":"RuleCall","rule":{"$ref":"#/rules@17"},"arguments":[]}],"cardinality":"+"},"definesHiddenTokens":false,"entry":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"EOL","fragment":true,"dataType":"string","definition":{"$type":"Alternatives","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@18"},"arguments":[],"cardinality":"+"},{"$type":"EndOfFile"}]},"definesHiddenTokens":false,"entry":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"TerminalRule","name":"NEWLINE","definition":{"$type":"RegexToken","regex":"/\\\\r?\\\\n/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ACC_DESCR","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*accDescr(?:[\\\\t ]*:([^\\\\n\\\\r]*?(?=%%)|[^\\\\n\\\\r]*)|\\\\s*{([^}]*)})/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ACC_TITLE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*accTitle[\\\\t ]*:(?:[^\\\\n\\\\r]*?(?=%%)|[^\\\\n\\\\r]*)/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"TITLE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*title(?:[\\\\t ][^\\\\n\\\\r]*?(?=%%)|[\\\\t ][^\\\\n\\\\r]*|)/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","hidden":true,"name":"WHITESPACE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]+/"},"fragment":false},{"$type":"TerminalRule","hidden":true,"name":"YAML","definition":{"$type":"RegexToken","regex":"/---[\\\\t ]*\\\\r?\\\\n(?:[\\\\S\\\\s]*?\\\\r?\\\\n)?---(?:\\\\r?\\\\n|(?!\\\\S))/"},"fragment":false},{"$type":"TerminalRule","hidden":true,"name":"DIRECTIVE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*%%{[\\\\S\\\\s]*?}%%(?:\\\\r?\\\\n|(?!\\\\S))/"},"fragment":false},{"$type":"TerminalRule","hidden":true,"name":"SINGLE_LINE_COMMENT","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*%%[^\\\\n\\\\r]*/"},"fragment":false}],"definesHiddenTokens":false,"hiddenTokens":[],"interfaces":[{"$type":"Interface","name":"Common","attributes":[{"$type":"TypeAttribute","name":"accDescr","isOptional":true,"type":{"$type":"SimpleType","primitiveType":"string"}},{"$type":"TypeAttribute","name":"accTitle","isOptional":true,"type":{"$type":"SimpleType","primitiveType":"string"}},{"$type":"TypeAttribute","name":"title","isOptional":true,"type":{"$type":"SimpleType","primitiveType":"string"}}],"superTypes":[]}],"types":[],"usedGrammars":[]}')),"ArchitectureGrammar"),oGe=Ot(()=>qce??(qce=of(`{"$type":"Grammar","isDeclared":true,"name":"GitGraph","interfaces":[{"$type":"Interface","name":"Common","attributes":[{"$type":"TypeAttribute","name":"accDescr","isOptional":true,"type":{"$type":"SimpleType","primitiveType":"string"}},{"$type":"TypeAttribute","name":"accTitle","isOptional":true,"type":{"$type":"SimpleType","primitiveType":"string"}},{"$type":"TypeAttribute","name":"title","isOptional":true,"type":{"$type":"SimpleType","primitiveType":"string"}}],"superTypes":[]}],"rules":[{"$type":"ParserRule","name":"TitleAndAccessibilities","fragment":true,"definition":{"$type":"Group","elements":[{"$type":"Alternatives","elements":[{"$type":"Assignment","feature":"accDescr","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@3"},"arguments":[]}},{"$type":"Assignment","feature":"accTitle","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@4"},"arguments":[]}},{"$type":"Assignment","feature":"title","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@5"},"arguments":[]}}]},{"$type":"RuleCall","rule":{"$ref":"#/rules@1"},"arguments":[]}],"cardinality":"+"},"definesHiddenTokens":false,"entry":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"EOL","fragment":true,"dataType":"string","definition":{"$type":"Alternatives","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@2"},"arguments":[],"cardinality":"+"},{"$type":"EndOfFile"}]},"definesHiddenTokens":false,"entry":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"TerminalRule","name":"NEWLINE","definition":{"$type":"RegexToken","regex":"/\\\\r?\\\\n/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ACC_DESCR","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*accDescr(?:[\\\\t ]*:([^\\\\n\\\\r]*?(?=%%)|[^\\\\n\\\\r]*)|\\\\s*{([^}]*)})/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ACC_TITLE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*accTitle[\\\\t ]*:(?:[^\\\\n\\\\r]*?(?=%%)|[^\\\\n\\\\r]*)/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"TITLE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*title(?:[\\\\t ][^\\\\n\\\\r]*?(?=%%)|[\\\\t ][^\\\\n\\\\r]*|)/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","hidden":true,"name":"WHITESPACE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]+/"},"fragment":false},{"$type":"TerminalRule","hidden":true,"name":"YAML","definition":{"$type":"RegexToken","regex":"/---[\\\\t ]*\\\\r?\\\\n(?:[\\\\S\\\\s]*?\\\\r?\\\\n)?---(?:\\\\r?\\\\n|(?!\\\\S))/"},"fragment":false},{"$type":"TerminalRule","hidden":true,"name":"DIRECTIVE","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*%%{[\\\\S\\\\s]*?}%%(?:\\\\r?\\\\n|(?!\\\\S))/"},"fragment":false},{"$type":"TerminalRule","hidden":true,"name":"SINGLE_LINE_COMMENT","definition":{"$type":"RegexToken","regex":"/[\\\\t ]*%%[^\\\\n\\\\r]*/"},"fragment":false},{"$type":"ParserRule","name":"GitGraph","entry":true,"definition":{"$type":"Group","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@2"},"arguments":[],"cardinality":"*"},{"$type":"Alternatives","elements":[{"$type":"Keyword","value":"gitGraph"},{"$type":"Group","elements":[{"$type":"Keyword","value":"gitGraph"},{"$type":"Keyword","value":":"}]},{"$type":"Keyword","value":"gitGraph:"},{"$type":"Group","elements":[{"$type":"Keyword","value":"gitGraph"},{"$type":"RuleCall","rule":{"$ref":"#/rules@12"},"arguments":[]},{"$type":"Keyword","value":":"}]}]},{"$type":"RuleCall","rule":{"$ref":"#/rules@2"},"arguments":[],"cardinality":"*"},{"$type":"Group","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@2"},"arguments":[],"cardinality":"*"},{"$type":"Alternatives","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@0"},"arguments":[]},{"$type":"Assignment","feature":"statements","operator":"+=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@11"},"arguments":[]}},{"$type":"RuleCall","rule":{"$ref":"#/rules@2"},"arguments":[]}],"cardinality":"*"}]}]},"definesHiddenTokens":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"Statement","definition":{"$type":"Alternatives","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@13"},"arguments":[]},{"$type":"RuleCall","rule":{"$ref":"#/rules@14"},"arguments":[]},{"$type":"RuleCall","rule":{"$ref":"#/rules@15"},"arguments":[]},{"$type":"RuleCall","rule":{"$ref":"#/rules@16"},"arguments":[]},{"$type":"RuleCall","rule":{"$ref":"#/rules@17"},"arguments":[]}]},"definesHiddenTokens":false,"entry":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"Direction","definition":{"$type":"Assignment","feature":"dir","operator":"=","terminal":{"$type":"Alternatives","elements":[{"$type":"Keyword","value":"LR"},{"$type":"Keyword","value":"TB"},{"$type":"Keyword","value":"BT"}]}},"definesHiddenTokens":false,"entry":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"Commit","definition":{"$type":"Group","elements":[{"$type":"Keyword","value":"commit"},{"$type":"Alternatives","elements":[{"$type":"Group","elements":[{"$type":"Keyword","value":"id:"},{"$type":"Assignment","feature":"id","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@20"},"arguments":[]}}]},{"$type":"Group","elements":[{"$type":"Keyword","value":"msg:","cardinality":"?"},{"$type":"Assignment","feature":"message","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@20"},"arguments":[]}}]},{"$type":"Group","elements":[{"$type":"Keyword","value":"tag:"},{"$type":"Assignment","feature":"tags","operator":"+=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@20"},"arguments":[]}}]},{"$type":"Group","elements":[{"$type":"Keyword","value":"type:"},{"$type":"Assignment","feature":"type","operator":"=","terminal":{"$type":"Alternatives","elements":[{"$type":"Keyword","value":"NORMAL"},{"$type":"Keyword","value":"REVERSE"},{"$type":"Keyword","value":"HIGHLIGHT"}]}}]}],"cardinality":"*"},{"$type":"RuleCall","rule":{"$ref":"#/rules@1"},"arguments":[]}]},"definesHiddenTokens":false,"entry":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"Branch","definition":{"$type":"Group","elements":[{"$type":"Keyword","value":"branch"},{"$type":"Assignment","feature":"name","operator":"=","terminal":{"$type":"Alternatives","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@19"},"arguments":[]},{"$type":"RuleCall","rule":{"$ref":"#/rules@20"},"arguments":[]}]}},{"$type":"Group","elements":[{"$type":"Keyword","value":"order:"},{"$type":"Assignment","feature":"order","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@18"},"arguments":[]}}],"cardinality":"?"},{"$type":"RuleCall","rule":{"$ref":"#/rules@1"},"arguments":[]}]},"definesHiddenTokens":false,"entry":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"Merge","definition":{"$type":"Group","elements":[{"$type":"Keyword","value":"merge"},{"$type":"Assignment","feature":"branch","operator":"=","terminal":{"$type":"Alternatives","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@19"},"arguments":[]},{"$type":"RuleCall","rule":{"$ref":"#/rules@20"},"arguments":[]}]}},{"$type":"Alternatives","elements":[{"$type":"Group","elements":[{"$type":"Keyword","value":"id:"},{"$type":"Assignment","feature":"id","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@20"},"arguments":[]}}]},{"$type":"Group","elements":[{"$type":"Keyword","value":"tag:"},{"$type":"Assignment","feature":"tags","operator":"+=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@20"},"arguments":[]}}]},{"$type":"Group","elements":[{"$type":"Keyword","value":"type:"},{"$type":"Assignment","feature":"type","operator":"=","terminal":{"$type":"Alternatives","elements":[{"$type":"Keyword","value":"NORMAL"},{"$type":"Keyword","value":"REVERSE"},{"$type":"Keyword","value":"HIGHLIGHT"}]}}]}],"cardinality":"*"},{"$type":"RuleCall","rule":{"$ref":"#/rules@1"},"arguments":[]}]},"definesHiddenTokens":false,"entry":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"Checkout","definition":{"$type":"Group","elements":[{"$type":"Alternatives","elements":[{"$type":"Keyword","value":"checkout"},{"$type":"Keyword","value":"switch"}]},{"$type":"Assignment","feature":"branch","operator":"=","terminal":{"$type":"Alternatives","elements":[{"$type":"RuleCall","rule":{"$ref":"#/rules@19"},"arguments":[]},{"$type":"RuleCall","rule":{"$ref":"#/rules@20"},"arguments":[]}]}},{"$type":"RuleCall","rule":{"$ref":"#/rules@1"},"arguments":[]}]},"definesHiddenTokens":false,"entry":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"ParserRule","name":"CherryPicking","definition":{"$type":"Group","elements":[{"$type":"Keyword","value":"cherry-pick"},{"$type":"Alternatives","elements":[{"$type":"Group","elements":[{"$type":"Keyword","value":"id:"},{"$type":"Assignment","feature":"id","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@20"},"arguments":[]}}]},{"$type":"Group","elements":[{"$type":"Keyword","value":"tag:"},{"$type":"Assignment","feature":"tags","operator":"+=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@20"},"arguments":[]}}]},{"$type":"Group","elements":[{"$type":"Keyword","value":"parent:"},{"$type":"Assignment","feature":"parent","operator":"=","terminal":{"$type":"RuleCall","rule":{"$ref":"#/rules@20"},"arguments":[]}}]}],"cardinality":"*"},{"$type":"RuleCall","rule":{"$ref":"#/rules@1"},"arguments":[]}]},"definesHiddenTokens":false,"entry":false,"fragment":false,"hiddenTokens":[],"parameters":[],"wildcard":false},{"$type":"TerminalRule","name":"INT","type":{"$type":"ReturnType","name":"number"},"definition":{"$type":"RegexToken","regex":"/[0-9]+(?=\\\\s)/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"ID","type":{"$type":"ReturnType","name":"string"},"definition":{"$type":"RegexToken","regex":"/\\\\w([-\\\\./\\\\w]*[-\\\\w])?/"},"fragment":false,"hidden":false},{"$type":"TerminalRule","name":"STRING","definition":{"$type":"RegexToken","regex":"/\\"[^\\"]*\\"|'[^']*'/"},"fragment":false,"hidden":false}],"definesHiddenTokens":false,"hiddenTokens":[],"imports":[],"types":[],"usedGrammars":[]}`)),"GitGraphGrammar"),lGe={languageId:"info",fileExtensions:[".mmd",".mermaid"],caseInsensitive:!1},cGe={languageId:"packet",fileExtensions:[".mmd",".mermaid"],caseInsensitive:!1},uGe={languageId:"pie",fileExtensions:[".mmd",".mermaid"],caseInsensitive:!1},hGe={languageId:"architecture",fileExtensions:[".mmd",".mermaid"],caseInsensitive:!1},fGe={languageId:"gitGraph",fileExtensions:[".mmd",".mermaid"],caseInsensitive:!1},zl={AstReflection:Ot(()=>new fue,"AstReflection")},TI={Grammar:Ot(()=>nGe(),"Grammar"),LanguageMetaData:Ot(()=>lGe,"LanguageMetaData"),parser:{}},kI={Grammar:Ot(()=>iGe(),"Grammar"),LanguageMetaData:Ot(()=>cGe,"LanguageMetaData"),parser:{}},EI={Grammar:Ot(()=>aGe(),"Grammar"),LanguageMetaData:Ot(()=>uGe,"LanguageMetaData"),parser:{}},SI={Grammar:Ot(()=>sGe(),"Grammar"),LanguageMetaData:Ot(()=>hGe,"LanguageMetaData"),parser:{}},CI={Grammar:Ot(()=>oGe(),"Grammar"),LanguageMetaData:Ot(()=>fGe,"LanguageMetaData"),parser:{}},dGe=/accDescr(?:[\t ]*:([^\n\r]*)|\s*{([^}]*)})/,pGe=/accTitle[\t ]*:([^\n\r]*)/,mGe=/title([\t ][^\n\r]*|)/,gGe={ACC_DESCR:dGe,ACC_TITLE:pGe,TITLE:mGe},Dg=class extends d0{static{o(this,"AbstractMermaidValueConverter")}static{Ot(this,"AbstractMermaidValueConverter")}runConverter(t,e,r){let n=this.runCommonConverter(t,e,r);return n===void 0&&(n=this.runCustomConverter(t,e,r)),n===void 0?super.runConverter(t,e,r):n}runCommonConverter(t,e,r){let n=gGe[t.name];if(n===void 0)return;let i=n.exec(e);if(i!==null){if(i[1]!==void 0)return i[1].trim().replace(/[\t ]{2,}/gm," ");if(i[2]!==void 0)return i[2].replace(/^\s*/gm,"").replace(/\s+$/gm,"").replace(/[\t ]{2,}/gm," ").replace(/[\n\r]{2,}/gm,` +`)}}},y0=class extends Dg{static{o(this,"CommonValueConverter")}static{Ot(this,"CommonValueConverter")}runCustomConverter(t,e,r){}},Zo=class extends f0{static{o(this,"AbstractMermaidTokenBuilder")}static{Ot(this,"AbstractMermaidTokenBuilder")}constructor(t){super(),this.keywords=new Set(t)}buildKeywordTokens(t,e,r){let n=super.buildKeywordTokens(t,e,r);return n.forEach(i=>{this.keywords.has(i.name)&&i.PATTERN!==void 0&&(i.PATTERN=new RegExp(i.PATTERN.toString()+"(?:(?=%%)|(?!\\S))"))}),n}},yGe=class extends Zo{static{o(this,"CommonTokenBuilder")}static{Ot(this,"CommonTokenBuilder")}}});function Wk(t=uo){let e=$i(co(t),zl),r=$i(lo({shared:e}),CI,Hk);return e.ServiceRegistry.register(r),{shared:e,GitGraph:r}}var vGe,Hk,AI=M(()=>{"use strict";Jo();Oc();vGe=class extends Zo{static{o(this,"GitGraphTokenBuilder")}static{Ot(this,"GitGraphTokenBuilder")}constructor(){super(["gitGraph"])}},Hk={parser:{TokenBuilder:Ot(()=>new vGe,"TokenBuilder"),ValueConverter:Ot(()=>new y0,"ValueConverter")}};o(Wk,"createGitGraphServices");Ot(Wk,"createGitGraphServices")});function qk(t=uo){let e=$i(co(t),zl),r=$i(lo({shared:e}),TI,Yk);return e.ServiceRegistry.register(r),{shared:e,Info:r}}var xGe,Yk,_I=M(()=>{"use strict";Jo();Oc();xGe=class extends Zo{static{o(this,"InfoTokenBuilder")}static{Ot(this,"InfoTokenBuilder")}constructor(){super(["info","showInfo"])}},Yk={parser:{TokenBuilder:Ot(()=>new xGe,"TokenBuilder"),ValueConverter:Ot(()=>new y0,"ValueConverter")}};o(qk,"createInfoServices");Ot(qk,"createInfoServices")});function jk(t=uo){let e=$i(co(t),zl),r=$i(lo({shared:e}),kI,Xk);return e.ServiceRegistry.register(r),{shared:e,Packet:r}}var bGe,Xk,LI=M(()=>{"use strict";Jo();Oc();bGe=class extends Zo{static{o(this,"PacketTokenBuilder")}static{Ot(this,"PacketTokenBuilder")}constructor(){super(["packet-beta"])}},Xk={parser:{TokenBuilder:Ot(()=>new bGe,"TokenBuilder"),ValueConverter:Ot(()=>new y0,"ValueConverter")}};o(jk,"createPacketServices");Ot(jk,"createPacketServices")});function Qk(t=uo){let e=$i(co(t),zl),r=$i(lo({shared:e}),EI,Kk);return e.ServiceRegistry.register(r),{shared:e,Pie:r}}var wGe,TGe,Kk,DI=M(()=>{"use strict";Jo();Oc();wGe=class extends Zo{static{o(this,"PieTokenBuilder")}static{Ot(this,"PieTokenBuilder")}constructor(){super(["pie","showData"])}},TGe=class extends Dg{static{o(this,"PieValueConverter")}static{Ot(this,"PieValueConverter")}runCustomConverter(t,e,r){if(t.name==="PIE_SECTION_LABEL")return e.replace(/"/g,"").trim()}},Kk={parser:{TokenBuilder:Ot(()=>new wGe,"TokenBuilder"),ValueConverter:Ot(()=>new TGe,"ValueConverter")}};o(Qk,"createPieServices");Ot(Qk,"createPieServices")});function Jk(t=uo){let e=$i(co(t),zl),r=$i(lo({shared:e}),SI,Zk);return e.ServiceRegistry.register(r),{shared:e,Architecture:r}}var kGe,EGe,Zk,NI=M(()=>{"use strict";Jo();Oc();kGe=class extends Zo{static{o(this,"ArchitectureTokenBuilder")}static{Ot(this,"ArchitectureTokenBuilder")}constructor(){super(["architecture"])}},EGe=class extends Dg{static{o(this,"ArchitectureValueConverter")}static{Ot(this,"ArchitectureValueConverter")}runCustomConverter(t,e,r){if(t.name==="ARCH_ICON")return e.replace(/[()]/g,"").trim();if(t.name==="ARCH_TEXT_ICON")return e.replace(/["()]/g,"");if(t.name==="ARCH_TITLE")return e.replace(/[[\]]/g,"").trim()}},Zk={parser:{TokenBuilder:Ot(()=>new kGe,"TokenBuilder"),ValueConverter:Ot(()=>new EGe,"ValueConverter")}};o(Jk,"createArchitectureServices");Ot(Jk,"createArchitectureServices")});var due={};vr(due,{InfoModule:()=>Yk,createInfoServices:()=>qk});var pue=M(()=>{"use strict";_I();Jo()});var mue={};vr(mue,{PacketModule:()=>Xk,createPacketServices:()=>jk});var gue=M(()=>{"use strict";LI();Jo()});var yue={};vr(yue,{PieModule:()=>Kk,createPieServices:()=>Qk});var vue=M(()=>{"use strict";DI();Jo()});var xue={};vr(xue,{ArchitectureModule:()=>Zk,createArchitectureServices:()=>Jk});var bue=M(()=>{"use strict";NI();Jo()});var wue={};vr(wue,{GitGraphModule:()=>Hk,createGitGraphServices:()=>Wk});var Tue=M(()=>{"use strict";AI();Jo()});async function Gl(t,e){let r=SGe[t];if(!r)throw new Error(`Unknown diagram type: ${t}`);v0[t]||await r();let i=v0[t].parse(e);if(i.lexerErrors.length>0||i.parserErrors.length>0)throw new CGe(i);return i.value}var v0,SGe,CGe,Ng=M(()=>{"use strict";AI();_I();LI();DI();NI();Jo();v0={},SGe={info:Ot(async()=>{let{createInfoServices:t}=await Promise.resolve().then(()=>(pue(),due)),e=t().Info.parser.LangiumParser;v0.info=e},"info"),packet:Ot(async()=>{let{createPacketServices:t}=await Promise.resolve().then(()=>(gue(),mue)),e=t().Packet.parser.LangiumParser;v0.packet=e},"packet"),pie:Ot(async()=>{let{createPieServices:t}=await Promise.resolve().then(()=>(vue(),yue)),e=t().Pie.parser.LangiumParser;v0.pie=e},"pie"),architecture:Ot(async()=>{let{createArchitectureServices:t}=await Promise.resolve().then(()=>(bue(),xue)),e=t().Architecture.parser.LangiumParser;v0.architecture=e},"architecture"),gitGraph:Ot(async()=>{let{createGitGraphServices:t}=await Promise.resolve().then(()=>(Tue(),wue)),e=t().GitGraph.parser.LangiumParser;v0.gitGraph=e},"gitGraph")};o(Gl,"parse");Ot(Gl,"parse");CGe=class extends Error{static{o(this,"MermaidParseError")}constructor(t){let e=t.lexerErrors.map(n=>n.message).join(` +`),r=t.parserErrors.map(n=>n.message).join(` +`);super(`Parsing failed: ${e} ${r}`),this.result=t}static{Ot(this,"MermaidParseError")}}});function lf(t,e){t.accDescr&&e.setAccDescription?.(t.accDescr),t.accTitle&&e.setAccTitle?.(t.accTitle),t.title&&e.setDiagramTitle?.(t.title)}var ox=M(()=>{"use strict";o(lf,"populateCommonDb")});var jr,eE=M(()=>{"use strict";jr={NORMAL:0,REVERSE:1,HIGHLIGHT:2,MERGE:3,CHERRY_PICK:4}});var cf,tE=M(()=>{"use strict";cf=class{constructor(e){this.init=e;this.records=this.init()}static{o(this,"ImperativeState")}reset(){this.records=this.init()}}});function RI(){return t9({length:7})}function _Ge(t,e){let r=Object.create(null);return t.reduce((n,i)=>{let a=e(i);return r[a]||(r[a]=!0,n.push(i)),n},[])}function kue(t,e,r){let n=t.indexOf(e);n===-1?t.push(r):t.splice(n,1,r)}function Sue(t){let e=t.reduce((i,a)=>i.seq>a.seq?i:a,t[0]),r="";t.forEach(function(i){i===e?r+=" *":r+=" |"});let n=[r,e.id,e.seq];for(let i in wt.records.branches)wt.records.branches.get(i)===e.id&&n.push(i);if(Y.debug(n.join(" ")),e.parents&&e.parents.length==2&&e.parents[0]&&e.parents[1]){let i=wt.records.commits.get(e.parents[0]);kue(t,e,i),e.parents[1]&&t.push(wt.records.commits.get(e.parents[1]))}else{if(e.parents.length==0)return;if(e.parents[0]){let i=wt.records.commits.get(e.parents[0]);kue(t,e,i)}}t=_Ge(t,i=>i.id),Sue(t)}var AGe,x0,wt,LGe,DGe,NGe,RGe,MGe,IGe,OGe,Eue,PGe,BGe,FGe,zGe,GGe,Cue,$Ge,VGe,UGe,rE,MI=M(()=>{"use strict";ht();hr();Ua();fr();ki();eE();tE();hs();AGe=ur.gitGraph,x0=o(()=>ws({...AGe,...Sr().gitGraph}),"getConfig"),wt=new cf(()=>{let t=x0(),e=t.mainBranchName,r=t.mainBranchOrder;return{mainBranchName:e,commits:new Map,head:null,branchConfig:new Map([[e,{name:e,order:r}]]),branches:new Map([[e,null]]),currBranch:e,direction:"LR",seq:0,options:{}}});o(RI,"getID");o(_Ge,"uniqBy");LGe=o(function(t){wt.records.direction=t},"setDirection"),DGe=o(function(t){Y.debug("options str",t),t=t?.trim(),t=t||"{}";try{wt.records.options=JSON.parse(t)}catch(e){Y.error("error while parsing gitGraph options",e.message)}},"setOptions"),NGe=o(function(){return wt.records.options},"getOptions"),RGe=o(function(t){let e=t.msg,r=t.id,n=t.type,i=t.tags;Y.info("commit",e,r,n,i),Y.debug("Entering commit:",e,r,n,i);let a=x0();r=je.sanitizeText(r,a),e=je.sanitizeText(e,a),i=i?.map(l=>je.sanitizeText(l,a));let s={id:r||wt.records.seq+"-"+RI(),message:e,seq:wt.records.seq++,type:n??jr.NORMAL,tags:i??[],parents:wt.records.head==null?[]:[wt.records.head.id],branch:wt.records.currBranch};wt.records.head=s,Y.info("main branch",a.mainBranchName),wt.records.commits.set(s.id,s),wt.records.branches.set(wt.records.currBranch,s.id),Y.debug("in pushCommit "+s.id)},"commit"),MGe=o(function(t){let e=t.name,r=t.order;if(e=je.sanitizeText(e,x0()),wt.records.branches.has(e))throw new Error(`Trying to create an existing branch. (Help: Either use a new name if you want create a new branch or try using "checkout ${e}")`);wt.records.branches.set(e,wt.records.head!=null?wt.records.head.id:null),wt.records.branchConfig.set(e,{name:e,order:r}),Eue(e),Y.debug("in createBranch")},"branch"),IGe=o(t=>{let e=t.branch,r=t.id,n=t.type,i=t.tags,a=x0();e=je.sanitizeText(e,a),r&&(r=je.sanitizeText(r,a));let s=wt.records.branches.get(wt.records.currBranch),l=wt.records.branches.get(e),u=s?wt.records.commits.get(s):void 0,h=l?wt.records.commits.get(l):void 0;if(u&&h&&u.branch===e)throw new Error(`Cannot merge branch '${e}' into itself.`);if(wt.records.currBranch===e){let p=new Error('Incorrect usage of "merge". Cannot merge a branch to itself');throw p.hash={text:`merge ${e}`,token:`merge ${e}`,expected:["branch abc"]},p}if(u===void 0||!u){let p=new Error(`Incorrect usage of "merge". Current branch (${wt.records.currBranch})has no commits`);throw p.hash={text:`merge ${e}`,token:`merge ${e}`,expected:["commit"]},p}if(!wt.records.branches.has(e)){let p=new Error('Incorrect usage of "merge". Branch to be merged ('+e+") does not exist");throw p.hash={text:`merge ${e}`,token:`merge ${e}`,expected:[`branch ${e}`]},p}if(h===void 0||!h){let p=new Error('Incorrect usage of "merge". Branch to be merged ('+e+") has no commits");throw p.hash={text:`merge ${e}`,token:`merge ${e}`,expected:['"commit"']},p}if(u===h){let p=new Error('Incorrect usage of "merge". Both branches have same head');throw p.hash={text:`merge ${e}`,token:`merge ${e}`,expected:["branch abc"]},p}if(r&&wt.records.commits.has(r)){let p=new Error('Incorrect usage of "merge". Commit with id:'+r+" already exists, use different custom Id");throw p.hash={text:`merge ${e} ${r} ${n} ${i?.join(" ")}`,token:`merge ${e} ${r} ${n} ${i?.join(" ")}`,expected:[`merge ${e} ${r}_UNIQUE ${n} ${i?.join(" ")}`]},p}let f=l||"",d={id:r||`${wt.records.seq}-${RI()}`,message:`merged branch ${e} into ${wt.records.currBranch}`,seq:wt.records.seq++,parents:wt.records.head==null?[]:[wt.records.head.id,f],branch:wt.records.currBranch,type:jr.MERGE,customType:n,customId:!!r,tags:i??[]};wt.records.head=d,wt.records.commits.set(d.id,d),wt.records.branches.set(wt.records.currBranch,d.id),Y.debug(wt.records.branches),Y.debug("in mergeBranch")},"merge"),OGe=o(function(t){let e=t.id,r=t.targetId,n=t.tags,i=t.parent;Y.debug("Entering cherryPick:",e,r,n);let a=x0();if(e=je.sanitizeText(e,a),r=je.sanitizeText(r,a),n=n?.map(u=>je.sanitizeText(u,a)),i=je.sanitizeText(i,a),!e||!wt.records.commits.has(e)){let u=new Error('Incorrect usage of "cherryPick". Source commit id should exist and provided');throw u.hash={text:`cherryPick ${e} ${r}`,token:`cherryPick ${e} ${r}`,expected:["cherry-pick abc"]},u}let s=wt.records.commits.get(e);if(s===void 0||!s)throw new Error('Incorrect usage of "cherryPick". Source commit id should exist and provided');if(i&&!(Array.isArray(s.parents)&&s.parents.includes(i)))throw new Error("Invalid operation: The specified parent commit is not an immediate parent of the cherry-picked commit.");let l=s.branch;if(s.type===jr.MERGE&&!i)throw new Error("Incorrect usage of cherry-pick: If the source commit is a merge commit, an immediate parent commit must be specified.");if(!r||!wt.records.commits.has(r)){if(l===wt.records.currBranch){let d=new Error('Incorrect usage of "cherryPick". Source commit is already on current branch');throw d.hash={text:`cherryPick ${e} ${r}`,token:`cherryPick ${e} ${r}`,expected:["cherry-pick abc"]},d}let u=wt.records.branches.get(wt.records.currBranch);if(u===void 0||!u){let d=new Error(`Incorrect usage of "cherry-pick". Current branch (${wt.records.currBranch})has no commits`);throw d.hash={text:`cherryPick ${e} ${r}`,token:`cherryPick ${e} ${r}`,expected:["cherry-pick abc"]},d}let h=wt.records.commits.get(u);if(h===void 0||!h){let d=new Error(`Incorrect usage of "cherry-pick". Current branch (${wt.records.currBranch})has no commits`);throw d.hash={text:`cherryPick ${e} ${r}`,token:`cherryPick ${e} ${r}`,expected:["cherry-pick abc"]},d}let f={id:wt.records.seq+"-"+RI(),message:`cherry-picked ${s?.message} into ${wt.records.currBranch}`,seq:wt.records.seq++,parents:wt.records.head==null?[]:[wt.records.head.id,s.id],branch:wt.records.currBranch,type:jr.CHERRY_PICK,tags:n?n.filter(Boolean):[`cherry-pick:${s.id}${s.type===jr.MERGE?`|parent:${i}`:""}`]};wt.records.head=f,wt.records.commits.set(f.id,f),wt.records.branches.set(wt.records.currBranch,f.id),Y.debug(wt.records.branches),Y.debug("in cherryPick")}},"cherryPick"),Eue=o(function(t){if(t=je.sanitizeText(t,x0()),wt.records.branches.has(t)){wt.records.currBranch=t;let e=wt.records.branches.get(wt.records.currBranch);e===void 0||!e?wt.records.head=null:wt.records.head=wt.records.commits.get(e)??null}else{let e=new Error(`Trying to checkout branch which is not yet created. (Help try using "branch ${t}")`);throw e.hash={text:`checkout ${t}`,token:`checkout ${t}`,expected:[`branch ${t}`]},e}},"checkout");o(kue,"upsert");o(Sue,"prettyPrintCommitHistory");PGe=o(function(){Y.debug(wt.records.commits);let t=Cue()[0];Sue([t])},"prettyPrint"),BGe=o(function(){wt.reset(),_r()},"clear"),FGe=o(function(){return[...wt.records.branchConfig.values()].map((e,r)=>e.order!==null&&e.order!==void 0?e:{...e,order:parseFloat(`0.${r}`)}).sort((e,r)=>(e.order??0)-(r.order??0)).map(({name:e})=>({name:e}))},"getBranchesAsObjArray"),zGe=o(function(){return wt.records.branches},"getBranches"),GGe=o(function(){return wt.records.commits},"getCommits"),Cue=o(function(){let t=[...wt.records.commits.values()];return t.forEach(function(e){Y.debug(e.id)}),t.sort((e,r)=>e.seq-r.seq),t},"getCommitsArray"),$Ge=o(function(){return wt.records.currBranch},"getCurrentBranch"),VGe=o(function(){return wt.records.direction},"getDirection"),UGe=o(function(){return wt.records.head},"getHead"),rE={commitType:jr,getConfig:x0,setDirection:LGe,setOptions:DGe,getOptions:NGe,commit:RGe,branch:MGe,merge:IGe,cherryPick:OGe,checkout:Eue,prettyPrint:PGe,clear:BGe,getBranchesAsObjArray:FGe,getBranches:zGe,getCommits:GGe,getCommitsArray:Cue,getCurrentBranch:$Ge,getDirection:VGe,getHead:UGe,setAccTitle:Rr,getAccTitle:Pr,getAccDescription:Fr,setAccDescription:Br,setDiagramTitle:ln,getDiagramTitle:Jr}});var HGe,WGe,YGe,qGe,XGe,jGe,KGe,Aue,_ue=M(()=>{"use strict";Ng();ht();ox();MI();eE();HGe=o((t,e)=>{lf(t,e),t.dir&&e.setDirection(t.dir);for(let r of t.statements)WGe(r,e)},"populate"),WGe=o((t,e)=>{let n={Commit:o(i=>e.commit(YGe(i)),"Commit"),Branch:o(i=>e.branch(qGe(i)),"Branch"),Merge:o(i=>e.merge(XGe(i)),"Merge"),Checkout:o(i=>e.checkout(jGe(i)),"Checkout"),CherryPicking:o(i=>e.cherryPick(KGe(i)),"CherryPicking")}[t.$type];n?n(t):Y.error(`Unknown statement type: ${t.$type}`)},"parseStatement"),YGe=o(t=>({id:t.id,msg:t.message??"",type:t.type!==void 0?jr[t.type]:jr.NORMAL,tags:t.tags??void 0}),"parseCommit"),qGe=o(t=>({name:t.name,order:t.order??0}),"parseBranch"),XGe=o(t=>({branch:t.branch,id:t.id??"",type:t.type!==void 0?jr[t.type]:void 0,tags:t.tags??void 0}),"parseMerge"),jGe=o(t=>t.branch,"parseCheckout"),KGe=o(t=>({id:t.id,targetId:"",tags:t.tags?.length===0?void 0:t.tags,parent:t.parent}),"parseCherryPicking"),Aue={parse:o(async t=>{let e=await Gl("gitGraph",t);Y.debug(e),HGe(e,rE)},"parse")}});var QGe,el,hf,ff,Pc,Vu,b0,Ps,Bs,nE,lx,iE,uf,Nr,ZGe,Due,Nue,JGe,e$e,t$e,r$e,n$e,i$e,a$e,s$e,o$e,l$e,c$e,u$e,Lue,h$e,cx,f$e,d$e,p$e,m$e,g$e,Rue,Mue=M(()=>{"use strict";mr();Vt();ht();hr();eE();QGe=de(),el=QGe?.gitGraph,hf=10,ff=40,Pc=4,Vu=2,b0=8,Ps=new Map,Bs=new Map,nE=30,lx=new Map,iE=[],uf=0,Nr="LR",ZGe=o(()=>{Ps.clear(),Bs.clear(),lx.clear(),uf=0,iE=[],Nr="LR"},"clear"),Due=o(t=>{let e=document.createElementNS("http://www.w3.org/2000/svg","text");return(typeof t=="string"?t.split(/\\n|\n|<br\s*\/?>/gi):t).forEach(n=>{let i=document.createElementNS("http://www.w3.org/2000/svg","tspan");i.setAttributeNS("http://www.w3.org/XML/1998/namespace","xml:space","preserve"),i.setAttribute("dy","1em"),i.setAttribute("x","0"),i.setAttribute("class","row"),i.textContent=n.trim(),e.appendChild(i)}),e},"drawText"),Nue=o(t=>{let e,r,n;return Nr==="BT"?(r=o((i,a)=>i<=a,"comparisonFunc"),n=1/0):(r=o((i,a)=>i>=a,"comparisonFunc"),n=0),t.forEach(i=>{let a=Nr==="TB"||Nr=="BT"?Bs.get(i)?.y:Bs.get(i)?.x;a!==void 0&&r(a,n)&&(e=i,n=a)}),e},"findClosestParent"),JGe=o(t=>{let e="",r=1/0;return t.forEach(n=>{let i=Bs.get(n).y;i<=r&&(e=n,r=i)}),e||void 0},"findClosestParentBT"),e$e=o((t,e,r)=>{let n=r,i=r,a=[];t.forEach(s=>{let l=e.get(s);if(!l)throw new Error(`Commit not found for key ${s}`);l.parents.length?(n=r$e(l),i=Math.max(n,i)):a.push(l),n$e(l,n)}),n=i,a.forEach(s=>{i$e(s,n,r)}),t.forEach(s=>{let l=e.get(s);if(l?.parents.length){let u=JGe(l.parents);n=Bs.get(u).y-ff,n<=i&&(i=n);let h=Ps.get(l.branch).pos,f=n-hf;Bs.set(l.id,{x:h,y:f})}})},"setParallelBTPos"),t$e=o(t=>{let e=Nue(t.parents.filter(n=>n!==null));if(!e)throw new Error(`Closest parent not found for commit ${t.id}`);let r=Bs.get(e)?.y;if(r===void 0)throw new Error(`Closest parent position not found for commit ${t.id}`);return r},"findClosestParentPos"),r$e=o(t=>t$e(t)+ff,"calculateCommitPosition"),n$e=o((t,e)=>{let r=Ps.get(t.branch);if(!r)throw new Error(`Branch not found for commit ${t.id}`);let n=r.pos,i=e+hf;return Bs.set(t.id,{x:n,y:i}),{x:n,y:i}},"setCommitPosition"),i$e=o((t,e,r)=>{let n=Ps.get(t.branch);if(!n)throw new Error(`Branch not found for commit ${t.id}`);let i=e+r,a=n.pos;Bs.set(t.id,{x:a,y:i})},"setRootPosition"),a$e=o((t,e,r,n,i,a)=>{if(a===jr.HIGHLIGHT)t.append("rect").attr("x",r.x-10).attr("y",r.y-10).attr("width",20).attr("height",20).attr("class",`commit ${e.id} commit-highlight${i%b0} ${n}-outer`),t.append("rect").attr("x",r.x-6).attr("y",r.y-6).attr("width",12).attr("height",12).attr("class",`commit ${e.id} commit${i%b0} ${n}-inner`);else if(a===jr.CHERRY_PICK)t.append("circle").attr("cx",r.x).attr("cy",r.y).attr("r",10).attr("class",`commit ${e.id} ${n}`),t.append("circle").attr("cx",r.x-3).attr("cy",r.y+2).attr("r",2.75).attr("fill","#fff").attr("class",`commit ${e.id} ${n}`),t.append("circle").attr("cx",r.x+3).attr("cy",r.y+2).attr("r",2.75).attr("fill","#fff").attr("class",`commit ${e.id} ${n}`),t.append("line").attr("x1",r.x+3).attr("y1",r.y+1).attr("x2",r.x).attr("y2",r.y-5).attr("stroke","#fff").attr("class",`commit ${e.id} ${n}`),t.append("line").attr("x1",r.x-3).attr("y1",r.y+1).attr("x2",r.x).attr("y2",r.y-5).attr("stroke","#fff").attr("class",`commit ${e.id} ${n}`);else{let s=t.append("circle");if(s.attr("cx",r.x),s.attr("cy",r.y),s.attr("r",e.type===jr.MERGE?9:10),s.attr("class",`commit ${e.id} commit${i%b0}`),a===jr.MERGE){let l=t.append("circle");l.attr("cx",r.x),l.attr("cy",r.y),l.attr("r",6),l.attr("class",`commit ${n} ${e.id} commit${i%b0}`)}a===jr.REVERSE&&t.append("path").attr("d",`M ${r.x-5},${r.y-5}L${r.x+5},${r.y+5}M${r.x-5},${r.y+5}L${r.x+5},${r.y-5}`).attr("class",`commit ${n} ${e.id} commit${i%b0}`)}},"drawCommitBullet"),s$e=o((t,e,r,n)=>{if(e.type!==jr.CHERRY_PICK&&(e.customId&&e.type===jr.MERGE||e.type!==jr.MERGE)&&el?.showCommitLabel){let i=t.append("g"),a=i.insert("rect").attr("class","commit-label-bkg"),s=i.append("text").attr("x",n).attr("y",r.y+25).attr("class","commit-label").text(e.id),l=s.node()?.getBBox();if(l&&(a.attr("x",r.posWithOffset-l.width/2-Vu).attr("y",r.y+13.5).attr("width",l.width+2*Vu).attr("height",l.height+2*Vu),Nr==="TB"||Nr==="BT"?(a.attr("x",r.x-(l.width+4*Pc+5)).attr("y",r.y-12),s.attr("x",r.x-(l.width+4*Pc)).attr("y",r.y+l.height-12)):s.attr("x",r.posWithOffset-l.width/2),el.rotateCommitLabel))if(Nr==="TB"||Nr==="BT")s.attr("transform","rotate(-45, "+r.x+", "+r.y+")"),a.attr("transform","rotate(-45, "+r.x+", "+r.y+")");else{let u=-7.5-(l.width+10)/25*9.5,h=10+l.width/25*8.5;i.attr("transform","translate("+u+", "+h+") rotate(-45, "+n+", "+r.y+")")}}},"drawCommitLabel"),o$e=o((t,e,r,n)=>{if(e.tags.length>0){let i=0,a=0,s=0,l=[];for(let u of e.tags.reverse()){let h=t.insert("polygon"),f=t.append("circle"),d=t.append("text").attr("y",r.y-16-i).attr("class","tag-label").text(u),p=d.node()?.getBBox();if(!p)throw new Error("Tag bbox not found");a=Math.max(a,p.width),s=Math.max(s,p.height),d.attr("x",r.posWithOffset-p.width/2),l.push({tag:d,hole:f,rect:h,yOffset:i}),i+=20}for(let{tag:u,hole:h,rect:f,yOffset:d}of l){let p=s/2,m=r.y-19.2-d;if(f.attr("class","tag-label-bkg").attr("points",` + ${n-a/2-Pc/2},${m+Vu} + ${n-a/2-Pc/2},${m-Vu} + ${r.posWithOffset-a/2-Pc},${m-p-Vu} + ${r.posWithOffset+a/2+Pc},${m-p-Vu} + ${r.posWithOffset+a/2+Pc},${m+p+Vu} + ${r.posWithOffset-a/2-Pc},${m+p+Vu}`),h.attr("cy",m).attr("cx",n-a/2+Pc/2).attr("r",1.5).attr("class","tag-hole"),Nr==="TB"||Nr==="BT"){let g=n+d;f.attr("class","tag-label-bkg").attr("points",` + ${r.x},${g+2} + ${r.x},${g-2} + ${r.x+hf},${g-p-2} + ${r.x+hf+a+4},${g-p-2} + ${r.x+hf+a+4},${g+p+2} + ${r.x+hf},${g+p+2}`).attr("transform","translate(12,12) rotate(45, "+r.x+","+n+")"),h.attr("cx",r.x+Pc/2).attr("cy",g).attr("transform","translate(12,12) rotate(45, "+r.x+","+n+")"),u.attr("x",r.x+5).attr("y",g+3).attr("transform","translate(14,14) rotate(45, "+r.x+","+n+")")}}}},"drawCommitTags"),l$e=o(t=>{switch(t.customType??t.type){case jr.NORMAL:return"commit-normal";case jr.REVERSE:return"commit-reverse";case jr.HIGHLIGHT:return"commit-highlight";case jr.MERGE:return"commit-merge";case jr.CHERRY_PICK:return"commit-cherry-pick";default:return"commit-normal"}},"getCommitClassType"),c$e=o((t,e,r,n)=>{let i={x:0,y:0};if(t.parents.length>0){let a=Nue(t.parents);if(a){let s=n.get(a)??i;return e==="TB"?s.y+ff:e==="BT"?(n.get(t.id)??i).y-ff:s.x+ff}}else return e==="TB"?nE:e==="BT"?(n.get(t.id)??i).y-ff:0;return 0},"calculatePosition"),u$e=o((t,e,r)=>{let n=Nr==="BT"&&r?e:e+hf,i=Nr==="TB"||Nr==="BT"?n:Ps.get(t.branch)?.pos,a=Nr==="TB"||Nr==="BT"?Ps.get(t.branch)?.pos:n;if(a===void 0||i===void 0)throw new Error(`Position were undefined for commit ${t.id}`);return{x:a,y:i,posWithOffset:n}},"getCommitPosition"),Lue=o((t,e,r)=>{if(!el)throw new Error("GitGraph config not found");let n=t.append("g").attr("class","commit-bullets"),i=t.append("g").attr("class","commit-labels"),a=Nr==="TB"||Nr==="BT"?nE:0,s=[...e.keys()],l=el?.parallelCommits??!1,u=o((f,d)=>{let p=e.get(f)?.seq,m=e.get(d)?.seq;return p!==void 0&&m!==void 0?p-m:0},"sortKeys"),h=s.sort(u);Nr==="BT"&&(l&&e$e(h,e,a),h=h.reverse()),h.forEach(f=>{let d=e.get(f);if(!d)throw new Error(`Commit not found for key ${f}`);l&&(a=c$e(d,Nr,a,Bs));let p=u$e(d,a,l);if(r){let m=l$e(d),g=d.customType??d.type,y=Ps.get(d.branch)?.index??0;a$e(n,d,p,m,y,g),s$e(i,d,p,a),o$e(i,d,p,a)}Nr==="TB"||Nr==="BT"?Bs.set(d.id,{x:p.x,y:p.posWithOffset}):Bs.set(d.id,{x:p.posWithOffset,y:p.y}),a=Nr==="BT"&&l?a+ff:a+ff+hf,a>uf&&(uf=a)})},"drawCommits"),h$e=o((t,e,r,n,i)=>{let s=(Nr==="TB"||Nr==="BT"?r.x<n.x:r.y<n.y)?e.branch:t.branch,l=o(h=>h.branch===s,"isOnBranchToGetCurve"),u=o(h=>h.seq>t.seq&&h.seq<e.seq,"isBetweenCommits");return[...i.values()].some(h=>u(h)&&l(h))},"shouldRerouteArrow"),cx=o((t,e,r=0)=>{let n=t+Math.abs(t-e)/2;if(r>5)return n;if(iE.every(s=>Math.abs(s-n)>=10))return iE.push(n),n;let a=Math.abs(t-e);return cx(t,e-a/5,r+1)},"findLane"),f$e=o((t,e,r,n)=>{let i=Bs.get(e.id),a=Bs.get(r.id);if(i===void 0||a===void 0)throw new Error(`Commit positions not found for commits ${e.id} and ${r.id}`);let s=h$e(e,r,i,a,n),l="",u="",h=0,f=0,d=Ps.get(r.branch)?.index;r.type===jr.MERGE&&e.id!==r.parents[0]&&(d=Ps.get(e.branch)?.index);let p;if(s){l="A 10 10, 0, 0, 0,",u="A 10 10, 0, 0, 1,",h=10,f=10;let m=i.y<a.y?cx(i.y,a.y):cx(a.y,i.y),g=i.x<a.x?cx(i.x,a.x):cx(a.x,i.x);Nr==="TB"?i.x<a.x?p=`M ${i.x} ${i.y} L ${g-h} ${i.y} ${u} ${g} ${i.y+f} L ${g} ${a.y-h} ${l} ${g+f} ${a.y} L ${a.x} ${a.y}`:(d=Ps.get(e.branch)?.index,p=`M ${i.x} ${i.y} L ${g+h} ${i.y} ${l} ${g} ${i.y+f} L ${g} ${a.y-h} ${u} ${g-f} ${a.y} L ${a.x} ${a.y}`):Nr==="BT"?i.x<a.x?p=`M ${i.x} ${i.y} L ${g-h} ${i.y} ${l} ${g} ${i.y-f} L ${g} ${a.y+h} ${u} ${g+f} ${a.y} L ${a.x} ${a.y}`:(d=Ps.get(e.branch)?.index,p=`M ${i.x} ${i.y} L ${g+h} ${i.y} ${u} ${g} ${i.y-f} L ${g} ${a.y+h} ${l} ${g-f} ${a.y} L ${a.x} ${a.y}`):i.y<a.y?p=`M ${i.x} ${i.y} L ${i.x} ${m-h} ${l} ${i.x+f} ${m} L ${a.x-h} ${m} ${u} ${a.x} ${m+f} L ${a.x} ${a.y}`:(d=Ps.get(e.branch)?.index,p=`M ${i.x} ${i.y} L ${i.x} ${m+h} ${u} ${i.x+f} ${m} L ${a.x-h} ${m} ${l} ${a.x} ${m-f} L ${a.x} ${a.y}`)}else l="A 20 20, 0, 0, 0,",u="A 20 20, 0, 0, 1,",h=20,f=20,Nr==="TB"?(i.x<a.x&&(r.type===jr.MERGE&&e.id!==r.parents[0]?p=`M ${i.x} ${i.y} L ${i.x} ${a.y-h} ${l} ${i.x+f} ${a.y} L ${a.x} ${a.y}`:p=`M ${i.x} ${i.y} L ${a.x-h} ${i.y} ${u} ${a.x} ${i.y+f} L ${a.x} ${a.y}`),i.x>a.x&&(l="A 20 20, 0, 0, 0,",u="A 20 20, 0, 0, 1,",h=20,f=20,r.type===jr.MERGE&&e.id!==r.parents[0]?p=`M ${i.x} ${i.y} L ${i.x} ${a.y-h} ${u} ${i.x-f} ${a.y} L ${a.x} ${a.y}`:p=`M ${i.x} ${i.y} L ${a.x+h} ${i.y} ${l} ${a.x} ${i.y+f} L ${a.x} ${a.y}`),i.x===a.x&&(p=`M ${i.x} ${i.y} L ${a.x} ${a.y}`)):Nr==="BT"?(i.x<a.x&&(r.type===jr.MERGE&&e.id!==r.parents[0]?p=`M ${i.x} ${i.y} L ${i.x} ${a.y+h} ${u} ${i.x+f} ${a.y} L ${a.x} ${a.y}`:p=`M ${i.x} ${i.y} L ${a.x-h} ${i.y} ${l} ${a.x} ${i.y-f} L ${a.x} ${a.y}`),i.x>a.x&&(l="A 20 20, 0, 0, 0,",u="A 20 20, 0, 0, 1,",h=20,f=20,r.type===jr.MERGE&&e.id!==r.parents[0]?p=`M ${i.x} ${i.y} L ${i.x} ${a.y+h} ${l} ${i.x-f} ${a.y} L ${a.x} ${a.y}`:p=`M ${i.x} ${i.y} L ${a.x-h} ${i.y} ${l} ${a.x} ${i.y-f} L ${a.x} ${a.y}`),i.x===a.x&&(p=`M ${i.x} ${i.y} L ${a.x} ${a.y}`)):(i.y<a.y&&(r.type===jr.MERGE&&e.id!==r.parents[0]?p=`M ${i.x} ${i.y} L ${a.x-h} ${i.y} ${u} ${a.x} ${i.y+f} L ${a.x} ${a.y}`:p=`M ${i.x} ${i.y} L ${i.x} ${a.y-h} ${l} ${i.x+f} ${a.y} L ${a.x} ${a.y}`),i.y>a.y&&(r.type===jr.MERGE&&e.id!==r.parents[0]?p=`M ${i.x} ${i.y} L ${a.x-h} ${i.y} ${l} ${a.x} ${i.y-f} L ${a.x} ${a.y}`:p=`M ${i.x} ${i.y} L ${i.x} ${a.y+h} ${u} ${i.x+f} ${a.y} L ${a.x} ${a.y}`),i.y===a.y&&(p=`M ${i.x} ${i.y} L ${a.x} ${a.y}`));if(p===void 0)throw new Error("Line definition not found");t.append("path").attr("d",p).attr("class","arrow arrow"+d%b0)},"drawArrow"),d$e=o((t,e)=>{let r=t.append("g").attr("class","commit-arrows");[...e.keys()].forEach(n=>{let i=e.get(n);i.parents&&i.parents.length>0&&i.parents.forEach(a=>{f$e(r,e.get(a),i,e)})})},"drawArrows"),p$e=o((t,e)=>{let r=t.append("g");e.forEach((n,i)=>{let a=i%b0,s=Ps.get(n.name)?.pos;if(s===void 0)throw new Error(`Position not found for branch ${n.name}`);let l=r.append("line");l.attr("x1",0),l.attr("y1",s),l.attr("x2",uf),l.attr("y2",s),l.attr("class","branch branch"+a),Nr==="TB"?(l.attr("y1",nE),l.attr("x1",s),l.attr("y2",uf),l.attr("x2",s)):Nr==="BT"&&(l.attr("y1",uf),l.attr("x1",s),l.attr("y2",nE),l.attr("x2",s)),iE.push(s);let u=n.name,h=Due(u),f=r.insert("rect"),p=r.insert("g").attr("class","branchLabel").insert("g").attr("class","label branch-label"+a);p.node().appendChild(h);let m=h.getBBox();f.attr("class","branchLabelBkg label"+a).attr("rx",4).attr("ry",4).attr("x",-m.width-4-(el?.rotateCommitLabel===!0?30:0)).attr("y",-m.height/2+8).attr("width",m.width+18).attr("height",m.height+4),p.attr("transform","translate("+(-m.width-14-(el?.rotateCommitLabel===!0?30:0))+", "+(s-m.height/2-1)+")"),Nr==="TB"?(f.attr("x",s-m.width/2-10).attr("y",0),p.attr("transform","translate("+(s-m.width/2-5)+", 0)")):Nr==="BT"?(f.attr("x",s-m.width/2-10).attr("y",uf),p.attr("transform","translate("+(s-m.width/2-5)+", "+uf+")")):f.attr("transform","translate(-19, "+(s-m.height/2)+")")})},"drawBranches"),m$e=o(function(t,e,r,n,i){return Ps.set(t,{pos:e,index:r}),e+=50+(i?40:0)+(Nr==="TB"||Nr==="BT"?n.width/2:0),e},"setBranchPosition"),g$e=o(function(t,e,r,n){if(ZGe(),Y.debug("in gitgraph renderer",t+` +`,"id:",e,r),!el)throw new Error("GitGraph config not found");let i=el.rotateCommitLabel??!1,a=n.db;lx=a.getCommits();let s=a.getBranchesAsObjArray();Nr=a.getDirection();let l=ze(`[id="${e}"]`),u=0;s.forEach((h,f)=>{let d=Due(h.name),p=l.append("g"),m=p.insert("g").attr("class","branchLabel"),g=m.insert("g").attr("class","label branch-label");g.node()?.appendChild(d);let y=d.getBBox();u=m$e(h.name,u,f,y,i),g.remove(),m.remove(),p.remove()}),Lue(l,lx,!1),el.showBranches&&p$e(l,s),d$e(l,lx),Lue(l,lx,!0),Ut.insertTitle(l,"gitTitleText",el.titleTopMargin??0,a.getDiagramTitle()),a7(void 0,l,el.diagramPadding,el.useMaxWidth)},"draw"),Rue={draw:g$e}});var y$e,Iue,Oue=M(()=>{"use strict";y$e=o(t=>` + .commit-id, + .commit-msg, + .branch-label { + fill: lightgrey; + color: lightgrey; + font-family: 'trebuchet ms', verdana, arial, sans-serif; + font-family: var(--mermaid-font-family); + } + ${[0,1,2,3,4,5,6,7].map(e=>` + .branch-label${e} { fill: ${t["gitBranchLabel"+e]}; } + .commit${e} { stroke: ${t["git"+e]}; fill: ${t["git"+e]}; } + .commit-highlight${e} { stroke: ${t["gitInv"+e]}; fill: ${t["gitInv"+e]}; } + .label${e} { fill: ${t["git"+e]}; } + .arrow${e} { stroke: ${t["git"+e]}; } + `).join(` +`)} + + .branch { + stroke-width: 1; + stroke: ${t.lineColor}; + stroke-dasharray: 2; + } + .commit-label { font-size: ${t.commitLabelFontSize}; fill: ${t.commitLabelColor};} + .commit-label-bkg { font-size: ${t.commitLabelFontSize}; fill: ${t.commitLabelBackground}; opacity: 0.5; } + .tag-label { font-size: ${t.tagLabelFontSize}; fill: ${t.tagLabelColor};} + .tag-label-bkg { fill: ${t.tagLabelBackground}; stroke: ${t.tagLabelBorder}; } + .tag-hole { fill: ${t.textColor}; } + + .commit-merge { + stroke: ${t.primaryColor}; + fill: ${t.primaryColor}; + } + .commit-reverse { + stroke: ${t.primaryColor}; + fill: ${t.primaryColor}; + stroke-width: 3; + } + .commit-highlight-outer { + } + .commit-highlight-inner { + stroke: ${t.primaryColor}; + fill: ${t.primaryColor}; + } + + .arrow { stroke-width: 8; stroke-linecap: round; fill: none} + .gitTitleText { + text-anchor: middle; + font-size: 18px; + fill: ${t.textColor}; + } +`,"getStyles"),Iue=y$e});var Pue={};vr(Pue,{diagram:()=>v$e});var v$e,Bue=M(()=>{"use strict";_ue();MI();Mue();Oue();v$e={parser:Aue,db:rE,renderer:Rue,styles:Iue}});var II,Gue,$ue=M(()=>{"use strict";II=function(){var t=o(function(R,S,O,N){for(O=O||{},N=R.length;N--;O[R[N]]=S);return O},"o"),e=[6,8,10,12,13,14,15,16,17,18,20,21,22,23,24,25,26,27,28,29,30,31,33,35,36,38,40],r=[1,26],n=[1,27],i=[1,28],a=[1,29],s=[1,30],l=[1,31],u=[1,32],h=[1,33],f=[1,34],d=[1,9],p=[1,10],m=[1,11],g=[1,12],y=[1,13],v=[1,14],x=[1,15],b=[1,16],w=[1,19],_=[1,20],T=[1,21],E=[1,22],L=[1,23],C=[1,25],A=[1,35],I={trace:o(function(){},"trace"),yy:{},symbols_:{error:2,start:3,gantt:4,document:5,EOF:6,line:7,SPACE:8,statement:9,NL:10,weekday:11,weekday_monday:12,weekday_tuesday:13,weekday_wednesday:14,weekday_thursday:15,weekday_friday:16,weekday_saturday:17,weekday_sunday:18,weekend:19,weekend_friday:20,weekend_saturday:21,dateFormat:22,inclusiveEndDates:23,topAxis:24,axisFormat:25,tickInterval:26,excludes:27,includes:28,todayMarker:29,title:30,acc_title:31,acc_title_value:32,acc_descr:33,acc_descr_value:34,acc_descr_multiline_value:35,section:36,clickStatement:37,taskTxt:38,taskData:39,click:40,callbackname:41,callbackargs:42,href:43,clickStatementDebug:44,$accept:0,$end:1},terminals_:{2:"error",4:"gantt",6:"EOF",8:"SPACE",10:"NL",12:"weekday_monday",13:"weekday_tuesday",14:"weekday_wednesday",15:"weekday_thursday",16:"weekday_friday",17:"weekday_saturday",18:"weekday_sunday",20:"weekend_friday",21:"weekend_saturday",22:"dateFormat",23:"inclusiveEndDates",24:"topAxis",25:"axisFormat",26:"tickInterval",27:"excludes",28:"includes",29:"todayMarker",30:"title",31:"acc_title",32:"acc_title_value",33:"acc_descr",34:"acc_descr_value",35:"acc_descr_multiline_value",36:"section",38:"taskTxt",39:"taskData",40:"click",41:"callbackname",42:"callbackargs",43:"href"},productions_:[0,[3,3],[5,0],[5,2],[7,2],[7,1],[7,1],[7,1],[11,1],[11,1],[11,1],[11,1],[11,1],[11,1],[11,1],[19,1],[19,1],[9,1],[9,1],[9,1],[9,1],[9,1],[9,1],[9,1],[9,1],[9,1],[9,1],[9,1],[9,2],[9,2],[9,1],[9,1],[9,1],[9,2],[37,2],[37,3],[37,3],[37,4],[37,3],[37,4],[37,2],[44,2],[44,3],[44,3],[44,4],[44,3],[44,4],[44,2]],performAction:o(function(S,O,N,P,F,B,$){var z=B.length-1;switch(F){case 1:return B[z-1];case 2:this.$=[];break;case 3:B[z-1].push(B[z]),this.$=B[z-1];break;case 4:case 5:this.$=B[z];break;case 6:case 7:this.$=[];break;case 8:P.setWeekday("monday");break;case 9:P.setWeekday("tuesday");break;case 10:P.setWeekday("wednesday");break;case 11:P.setWeekday("thursday");break;case 12:P.setWeekday("friday");break;case 13:P.setWeekday("saturday");break;case 14:P.setWeekday("sunday");break;case 15:P.setWeekend("friday");break;case 16:P.setWeekend("saturday");break;case 17:P.setDateFormat(B[z].substr(11)),this.$=B[z].substr(11);break;case 18:P.enableInclusiveEndDates(),this.$=B[z].substr(18);break;case 19:P.TopAxis(),this.$=B[z].substr(8);break;case 20:P.setAxisFormat(B[z].substr(11)),this.$=B[z].substr(11);break;case 21:P.setTickInterval(B[z].substr(13)),this.$=B[z].substr(13);break;case 22:P.setExcludes(B[z].substr(9)),this.$=B[z].substr(9);break;case 23:P.setIncludes(B[z].substr(9)),this.$=B[z].substr(9);break;case 24:P.setTodayMarker(B[z].substr(12)),this.$=B[z].substr(12);break;case 27:P.setDiagramTitle(B[z].substr(6)),this.$=B[z].substr(6);break;case 28:this.$=B[z].trim(),P.setAccTitle(this.$);break;case 29:case 30:this.$=B[z].trim(),P.setAccDescription(this.$);break;case 31:P.addSection(B[z].substr(8)),this.$=B[z].substr(8);break;case 33:P.addTask(B[z-1],B[z]),this.$="task";break;case 34:this.$=B[z-1],P.setClickEvent(B[z-1],B[z],null);break;case 35:this.$=B[z-2],P.setClickEvent(B[z-2],B[z-1],B[z]);break;case 36:this.$=B[z-2],P.setClickEvent(B[z-2],B[z-1],null),P.setLink(B[z-2],B[z]);break;case 37:this.$=B[z-3],P.setClickEvent(B[z-3],B[z-2],B[z-1]),P.setLink(B[z-3],B[z]);break;case 38:this.$=B[z-2],P.setClickEvent(B[z-2],B[z],null),P.setLink(B[z-2],B[z-1]);break;case 39:this.$=B[z-3],P.setClickEvent(B[z-3],B[z-1],B[z]),P.setLink(B[z-3],B[z-2]);break;case 40:this.$=B[z-1],P.setLink(B[z-1],B[z]);break;case 41:case 47:this.$=B[z-1]+" "+B[z];break;case 42:case 43:case 45:this.$=B[z-2]+" "+B[z-1]+" "+B[z];break;case 44:case 46:this.$=B[z-3]+" "+B[z-2]+" "+B[z-1]+" "+B[z];break}},"anonymous"),table:[{3:1,4:[1,2]},{1:[3]},t(e,[2,2],{5:3}),{6:[1,4],7:5,8:[1,6],9:7,10:[1,8],11:17,12:r,13:n,14:i,15:a,16:s,17:l,18:u,19:18,20:h,21:f,22:d,23:p,24:m,25:g,26:y,27:v,28:x,29:b,30:w,31:_,33:T,35:E,36:L,37:24,38:C,40:A},t(e,[2,7],{1:[2,1]}),t(e,[2,3]),{9:36,11:17,12:r,13:n,14:i,15:a,16:s,17:l,18:u,19:18,20:h,21:f,22:d,23:p,24:m,25:g,26:y,27:v,28:x,29:b,30:w,31:_,33:T,35:E,36:L,37:24,38:C,40:A},t(e,[2,5]),t(e,[2,6]),t(e,[2,17]),t(e,[2,18]),t(e,[2,19]),t(e,[2,20]),t(e,[2,21]),t(e,[2,22]),t(e,[2,23]),t(e,[2,24]),t(e,[2,25]),t(e,[2,26]),t(e,[2,27]),{32:[1,37]},{34:[1,38]},t(e,[2,30]),t(e,[2,31]),t(e,[2,32]),{39:[1,39]},t(e,[2,8]),t(e,[2,9]),t(e,[2,10]),t(e,[2,11]),t(e,[2,12]),t(e,[2,13]),t(e,[2,14]),t(e,[2,15]),t(e,[2,16]),{41:[1,40],43:[1,41]},t(e,[2,4]),t(e,[2,28]),t(e,[2,29]),t(e,[2,33]),t(e,[2,34],{42:[1,42],43:[1,43]}),t(e,[2,40],{41:[1,44]}),t(e,[2,35],{43:[1,45]}),t(e,[2,36]),t(e,[2,38],{42:[1,46]}),t(e,[2,37]),t(e,[2,39])],defaultActions:{},parseError:o(function(S,O){if(O.recoverable)this.trace(S);else{var N=new Error(S);throw N.hash=O,N}},"parseError"),parse:o(function(S){var O=this,N=[0],P=[],F=[null],B=[],$=this.table,z="",W=0,j=0,K=0,ie=2,Q=1,ee=B.slice.call(arguments,1),J=Object.create(this.lexer),H={yy:{}};for(var q in this.yy)Object.prototype.hasOwnProperty.call(this.yy,q)&&(H.yy[q]=this.yy[q]);J.setInput(S,H.yy),H.yy.lexer=J,H.yy.parser=this,typeof J.yylloc>"u"&&(J.yylloc={});var Z=J.yylloc;B.push(Z);var ae=J.options&&J.options.ranges;typeof H.yy.parseError=="function"?this.parseError=H.yy.parseError:this.parseError=Object.getPrototypeOf(this).parseError;function ue(he){N.length=N.length-2*he,F.length=F.length-he,B.length=B.length-he}o(ue,"popStack");function ce(){var he;return he=P.pop()||J.lex()||Q,typeof he!="number"&&(he instanceof Array&&(P=he,he=P.pop()),he=O.symbols_[he]||he),he}o(ce,"lex");for(var te,De,oe,ke,Fe,Be,Ve={},Ge,He,xe,X;;){if(oe=N[N.length-1],this.defaultActions[oe]?ke=this.defaultActions[oe]:((te===null||typeof te>"u")&&(te=ce()),ke=$[oe]&&$[oe][te]),typeof ke>"u"||!ke.length||!ke[0]){var fe="";X=[];for(Ge in $[oe])this.terminals_[Ge]&&Ge>ie&&X.push("'"+this.terminals_[Ge]+"'");J.showPosition?fe="Parse error on line "+(W+1)+`: +`+J.showPosition()+` +Expecting `+X.join(", ")+", got '"+(this.terminals_[te]||te)+"'":fe="Parse error on line "+(W+1)+": Unexpected "+(te==Q?"end of input":"'"+(this.terminals_[te]||te)+"'"),this.parseError(fe,{text:J.match,token:this.terminals_[te]||te,line:J.yylineno,loc:Z,expected:X})}if(ke[0]instanceof Array&&ke.length>1)throw new Error("Parse Error: multiple actions possible at state: "+oe+", token: "+te);switch(ke[0]){case 1:N.push(te),F.push(J.yytext),B.push(J.yylloc),N.push(ke[1]),te=null,De?(te=De,De=null):(j=J.yyleng,z=J.yytext,W=J.yylineno,Z=J.yylloc,K>0&&K--);break;case 2:if(He=this.productions_[ke[1]][1],Ve.$=F[F.length-He],Ve._$={first_line:B[B.length-(He||1)].first_line,last_line:B[B.length-1].last_line,first_column:B[B.length-(He||1)].first_column,last_column:B[B.length-1].last_column},ae&&(Ve._$.range=[B[B.length-(He||1)].range[0],B[B.length-1].range[1]]),Be=this.performAction.apply(Ve,[z,j,W,H.yy,ke[1],F,B].concat(ee)),typeof Be<"u")return Be;He&&(N=N.slice(0,-1*He*2),F=F.slice(0,-1*He),B=B.slice(0,-1*He)),N.push(this.productions_[ke[1]][0]),F.push(Ve.$),B.push(Ve._$),xe=$[N[N.length-2]][N[N.length-1]],N.push(xe);break;case 3:return!0}}return!0},"parse")},D=function(){var R={EOF:1,parseError:o(function(O,N){if(this.yy.parser)this.yy.parser.parseError(O,N);else throw new Error(O)},"parseError"),setInput:o(function(S,O){return this.yy=O||this.yy||{},this._input=S,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},"setInput"),input:o(function(){var S=this._input[0];this.yytext+=S,this.yyleng++,this.offset++,this.match+=S,this.matched+=S;var O=S.match(/(?:\r\n?|\n).*/g);return O?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),S},"input"),unput:o(function(S){var O=S.length,N=S.split(/(?:\r\n?|\n)/g);this._input=S+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-O),this.offset-=O;var P=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),N.length-1&&(this.yylineno-=N.length-1);var F=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:N?(N.length===P.length?this.yylloc.first_column:0)+P[P.length-N.length].length-N[0].length:this.yylloc.first_column-O},this.options.ranges&&(this.yylloc.range=[F[0],F[0]+this.yyleng-O]),this.yyleng=this.yytext.length,this},"unput"),more:o(function(){return this._more=!0,this},"more"),reject:o(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError("Lexical error on line "+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true). +`+this.showPosition(),{text:"",token:null,line:this.yylineno});return this},"reject"),less:o(function(S){this.unput(this.match.slice(S))},"less"),pastInput:o(function(){var S=this.matched.substr(0,this.matched.length-this.match.length);return(S.length>20?"...":"")+S.substr(-20).replace(/\n/g,"")},"pastInput"),upcomingInput:o(function(){var S=this.match;return S.length<20&&(S+=this._input.substr(0,20-S.length)),(S.substr(0,20)+(S.length>20?"...":"")).replace(/\n/g,"")},"upcomingInput"),showPosition:o(function(){var S=this.pastInput(),O=new Array(S.length+1).join("-");return S+this.upcomingInput()+` +`+O+"^"},"showPosition"),test_match:o(function(S,O){var N,P,F;if(this.options.backtrack_lexer&&(F={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(F.yylloc.range=this.yylloc.range.slice(0))),P=S[0].match(/(?:\r\n?|\n).*/g),P&&(this.yylineno+=P.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:P?P[P.length-1].length-P[P.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+S[0].length},this.yytext+=S[0],this.match+=S[0],this.matches=S,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(S[0].length),this.matched+=S[0],N=this.performAction.call(this,this.yy,this,O,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),N)return N;if(this._backtrack){for(var B in F)this[B]=F[B];return!1}return!1},"test_match"),next:o(function(){if(this.done)return this.EOF;this._input||(this.done=!0);var S,O,N,P;this._more||(this.yytext="",this.match="");for(var F=this._currentRules(),B=0;B<F.length;B++)if(N=this._input.match(this.rules[F[B]]),N&&(!O||N[0].length>O[0].length)){if(O=N,P=B,this.options.backtrack_lexer){if(S=this.test_match(N,F[B]),S!==!1)return S;if(this._backtrack){O=!1;continue}else return!1}else if(!this.options.flex)break}return O?(S=this.test_match(O,F[P]),S!==!1?S:!1):this._input===""?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+`. Unrecognized text. +`+this.showPosition(),{text:"",token:null,line:this.yylineno})},"next"),lex:o(function(){var O=this.next();return O||this.lex()},"lex"),begin:o(function(O){this.conditionStack.push(O)},"begin"),popState:o(function(){var O=this.conditionStack.length-1;return O>0?this.conditionStack.pop():this.conditionStack[0]},"popState"),_currentRules:o(function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},"_currentRules"),topState:o(function(O){return O=this.conditionStack.length-1-Math.abs(O||0),O>=0?this.conditionStack[O]:"INITIAL"},"topState"),pushState:o(function(O){this.begin(O)},"pushState"),stateStackSize:o(function(){return this.conditionStack.length},"stateStackSize"),options:{"case-insensitive":!0},performAction:o(function(O,N,P,F){var B=F;switch(P){case 0:return this.begin("open_directive"),"open_directive";break;case 1:return this.begin("acc_title"),31;break;case 2:return this.popState(),"acc_title_value";break;case 3:return this.begin("acc_descr"),33;break;case 4:return this.popState(),"acc_descr_value";break;case 5:this.begin("acc_descr_multiline");break;case 6:this.popState();break;case 7:return"acc_descr_multiline_value";case 8:break;case 9:break;case 10:break;case 11:return 10;case 12:break;case 13:break;case 14:this.begin("href");break;case 15:this.popState();break;case 16:return 43;case 17:this.begin("callbackname");break;case 18:this.popState();break;case 19:this.popState(),this.begin("callbackargs");break;case 20:return 41;case 21:this.popState();break;case 22:return 42;case 23:this.begin("click");break;case 24:this.popState();break;case 25:return 40;case 26:return 4;case 27:return 22;case 28:return 23;case 29:return 24;case 30:return 25;case 31:return 26;case 32:return 28;case 33:return 27;case 34:return 29;case 35:return 12;case 36:return 13;case 37:return 14;case 38:return 15;case 39:return 16;case 40:return 17;case 41:return 18;case 42:return 20;case 43:return 21;case 44:return"date";case 45:return 30;case 46:return"accDescription";case 47:return 36;case 48:return 38;case 49:return 39;case 50:return":";case 51:return 6;case 52:return"INVALID"}},"anonymous"),rules:[/^(?:%%\{)/i,/^(?:accTitle\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*\{\s*)/i,/^(?:[\}])/i,/^(?:[^\}]*)/i,/^(?:%%(?!\{)*[^\n]*)/i,/^(?:[^\}]%%*[^\n]*)/i,/^(?:%%*[^\n]*[\n]*)/i,/^(?:[\n]+)/i,/^(?:\s+)/i,/^(?:%[^\n]*)/i,/^(?:href[\s]+["])/i,/^(?:["])/i,/^(?:[^"]*)/i,/^(?:call[\s]+)/i,/^(?:\([\s]*\))/i,/^(?:\()/i,/^(?:[^(]*)/i,/^(?:\))/i,/^(?:[^)]*)/i,/^(?:click[\s]+)/i,/^(?:[\s\n])/i,/^(?:[^\s\n]*)/i,/^(?:gantt\b)/i,/^(?:dateFormat\s[^#\n;]+)/i,/^(?:inclusiveEndDates\b)/i,/^(?:topAxis\b)/i,/^(?:axisFormat\s[^#\n;]+)/i,/^(?:tickInterval\s[^#\n;]+)/i,/^(?:includes\s[^#\n;]+)/i,/^(?:excludes\s[^#\n;]+)/i,/^(?:todayMarker\s[^\n;]+)/i,/^(?:weekday\s+monday\b)/i,/^(?:weekday\s+tuesday\b)/i,/^(?:weekday\s+wednesday\b)/i,/^(?:weekday\s+thursday\b)/i,/^(?:weekday\s+friday\b)/i,/^(?:weekday\s+saturday\b)/i,/^(?:weekday\s+sunday\b)/i,/^(?:weekend\s+friday\b)/i,/^(?:weekend\s+saturday\b)/i,/^(?:\d\d\d\d-\d\d-\d\d\b)/i,/^(?:title\s[^\n]+)/i,/^(?:accDescription\s[^#\n;]+)/i,/^(?:section\s[^\n]+)/i,/^(?:[^:\n]+)/i,/^(?::[^#\n;]+)/i,/^(?::)/i,/^(?:$)/i,/^(?:.)/i],conditions:{acc_descr_multiline:{rules:[6,7],inclusive:!1},acc_descr:{rules:[4],inclusive:!1},acc_title:{rules:[2],inclusive:!1},callbackargs:{rules:[21,22],inclusive:!1},callbackname:{rules:[18,19,20],inclusive:!1},href:{rules:[15,16],inclusive:!1},click:{rules:[24,25],inclusive:!1},INITIAL:{rules:[0,1,3,5,8,9,10,11,12,13,14,17,23,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52],inclusive:!0}}};return R}();I.lexer=D;function k(){this.yy={}}return o(k,"Parser"),k.prototype=I,I.Parser=k,new k}();II.parser=II;Gue=II});var Vue=Ni((OI,PI)=>{"use strict";(function(t,e){typeof OI=="object"&&typeof PI<"u"?PI.exports=e():typeof define=="function"&&define.amd?define(e):(t=typeof globalThis<"u"?globalThis:t||self).dayjs_plugin_isoWeek=e()})(OI,function(){"use strict";var t="day";return function(e,r,n){var i=o(function(l){return l.add(4-l.isoWeekday(),t)},"a"),a=r.prototype;a.isoWeekYear=function(){return i(this).year()},a.isoWeek=function(l){if(!this.$utils().u(l))return this.add(7*(l-this.isoWeek()),t);var u,h,f,d,p=i(this),m=(u=this.isoWeekYear(),h=this.$u,f=(h?n.utc:n)().year(u).startOf("year"),d=4-f.isoWeekday(),f.isoWeekday()>4&&(d+=7),f.add(d,t));return p.diff(m,"week")+1},a.isoWeekday=function(l){return this.$utils().u(l)?this.day()||7:this.day(this.day()%7?l:l-7)};var s=a.startOf;a.startOf=function(l,u){var h=this.$utils(),f=!!h.u(u)||u;return h.p(l)==="isoweek"?f?this.date(this.date()-(this.isoWeekday()-1)).startOf("day"):this.date(this.date()-1-(this.isoWeekday()-1)+7).endOf("day"):s.bind(this)(l,u)}}})});var Uue=Ni((BI,FI)=>{"use strict";(function(t,e){typeof BI=="object"&&typeof FI<"u"?FI.exports=e():typeof define=="function"&&define.amd?define(e):(t=typeof globalThis<"u"?globalThis:t||self).dayjs_plugin_customParseFormat=e()})(BI,function(){"use strict";var t={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},e=/(\[[^[]*\])|([-_:/.,()\s]+)|(A|a|Q|YYYY|YY?|ww?|MM?M?M?|Do|DD?|hh?|HH?|mm?|ss?|S{1,3}|z|ZZ?)/g,r=/\d/,n=/\d\d/,i=/\d\d?/,a=/\d*[^-_:/,()\s\d]+/,s={},l=o(function(g){return(g=+g)+(g>68?1900:2e3)},"a"),u=o(function(g){return function(y){this[g]=+y}},"f"),h=[/[+-]\d\d:?(\d\d)?|Z/,function(g){(this.zone||(this.zone={})).offset=function(y){if(!y||y==="Z")return 0;var v=y.match(/([+-]|\d\d)/g),x=60*v[1]+(+v[2]||0);return x===0?0:v[0]==="+"?-x:x}(g)}],f=o(function(g){var y=s[g];return y&&(y.indexOf?y:y.s.concat(y.f))},"u"),d=o(function(g,y){var v,x=s.meridiem;if(x){for(var b=1;b<=24;b+=1)if(g.indexOf(x(b,0,y))>-1){v=b>12;break}}else v=g===(y?"pm":"PM");return v},"d"),p={A:[a,function(g){this.afternoon=d(g,!1)}],a:[a,function(g){this.afternoon=d(g,!0)}],Q:[r,function(g){this.month=3*(g-1)+1}],S:[r,function(g){this.milliseconds=100*+g}],SS:[n,function(g){this.milliseconds=10*+g}],SSS:[/\d{3}/,function(g){this.milliseconds=+g}],s:[i,u("seconds")],ss:[i,u("seconds")],m:[i,u("minutes")],mm:[i,u("minutes")],H:[i,u("hours")],h:[i,u("hours")],HH:[i,u("hours")],hh:[i,u("hours")],D:[i,u("day")],DD:[n,u("day")],Do:[a,function(g){var y=s.ordinal,v=g.match(/\d+/);if(this.day=v[0],y)for(var x=1;x<=31;x+=1)y(x).replace(/\[|\]/g,"")===g&&(this.day=x)}],w:[i,u("week")],ww:[n,u("week")],M:[i,u("month")],MM:[n,u("month")],MMM:[a,function(g){var y=f("months"),v=(f("monthsShort")||y.map(function(x){return x.slice(0,3)})).indexOf(g)+1;if(v<1)throw new Error;this.month=v%12||v}],MMMM:[a,function(g){var y=f("months").indexOf(g)+1;if(y<1)throw new Error;this.month=y%12||y}],Y:[/[+-]?\d+/,u("year")],YY:[n,function(g){this.year=l(g)}],YYYY:[/\d{4}/,u("year")],Z:h,ZZ:h};function m(g){var y,v;y=g,v=s&&s.formats;for(var x=(g=y.replace(/(\[[^\]]+])|(LTS?|l{1,4}|L{1,4})/g,function(C,A,I){var D=I&&I.toUpperCase();return A||v[I]||t[I]||v[D].replace(/(\[[^\]]+])|(MMMM|MM|DD|dddd)/g,function(k,R,S){return R||S.slice(1)})})).match(e),b=x.length,w=0;w<b;w+=1){var _=x[w],T=p[_],E=T&&T[0],L=T&&T[1];x[w]=L?{regex:E,parser:L}:_.replace(/^\[|\]$/g,"")}return function(C){for(var A={},I=0,D=0;I<b;I+=1){var k=x[I];if(typeof k=="string")D+=k.length;else{var R=k.regex,S=k.parser,O=C.slice(D),N=R.exec(O)[0];S.call(A,N),C=C.replace(N,"")}}return function(P){var F=P.afternoon;if(F!==void 0){var B=P.hours;F?B<12&&(P.hours+=12):B===12&&(P.hours=0),delete P.afternoon}}(A),A}}return o(m,"l"),function(g,y,v){v.p.customParseFormat=!0,g&&g.parseTwoDigitYear&&(l=g.parseTwoDigitYear);var x=y.prototype,b=x.parse;x.parse=function(w){var _=w.date,T=w.utc,E=w.args;this.$u=T;var L=E[1];if(typeof L=="string"){var C=E[2]===!0,A=E[3]===!0,I=C||A,D=E[2];A&&(D=E[2]),s=this.$locale(),!C&&D&&(s=v.Ls[D]),this.$d=function(O,N,P,F){try{if(["x","X"].indexOf(N)>-1)return new Date((N==="X"?1e3:1)*O);var B=m(N)(O),$=B.year,z=B.month,W=B.day,j=B.hours,K=B.minutes,ie=B.seconds,Q=B.milliseconds,ee=B.zone,J=B.week,H=new Date,q=W||($||z?1:H.getDate()),Z=$||H.getFullYear(),ae=0;$&&!z||(ae=z>0?z-1:H.getMonth());var ue,ce=j||0,te=K||0,De=ie||0,oe=Q||0;return ee?new Date(Date.UTC(Z,ae,q,ce,te,De,oe+60*ee.offset*1e3)):P?new Date(Date.UTC(Z,ae,q,ce,te,De,oe)):(ue=new Date(Z,ae,q,ce,te,De,oe),J&&(ue=F(ue).week(J).toDate()),ue)}catch{return new Date("")}}(_,L,T,v),this.init(),D&&D!==!0&&(this.$L=this.locale(D).$L),I&&_!=this.format(L)&&(this.$d=new Date("")),s={}}else if(L instanceof Array)for(var k=L.length,R=1;R<=k;R+=1){E[1]=L[R-1];var S=v.apply(this,E);if(S.isValid()){this.$d=S.$d,this.$L=S.$L,this.init();break}R===k&&(this.$d=new Date(""))}else b.call(this,w)}}})});var Hue=Ni((zI,GI)=>{"use strict";(function(t,e){typeof zI=="object"&&typeof GI<"u"?GI.exports=e():typeof define=="function"&&define.amd?define(e):(t=typeof globalThis<"u"?globalThis:t||self).dayjs_plugin_advancedFormat=e()})(zI,function(){"use strict";return function(t,e){var r=e.prototype,n=r.format;r.format=function(i){var a=this,s=this.$locale();if(!this.isValid())return n.bind(this)(i);var l=this.$utils(),u=(i||"YYYY-MM-DDTHH:mm:ssZ").replace(/\[([^\]]+)]|Q|wo|ww|w|WW|W|zzz|z|gggg|GGGG|Do|X|x|k{1,2}|S/g,function(h){switch(h){case"Q":return Math.ceil((a.$M+1)/3);case"Do":return s.ordinal(a.$D);case"gggg":return a.weekYear();case"GGGG":return a.isoWeekYear();case"wo":return s.ordinal(a.week(),"W");case"w":case"ww":return l.s(a.week(),h==="w"?1:2,"0");case"W":case"WW":return l.s(a.isoWeek(),h==="W"?1:2,"0");case"k":case"kk":return l.s(String(a.$H===0?24:a.$H),h==="k"?1:2,"0");case"X":return Math.floor(a.$d.getTime()/1e3);case"x":return a.$d.getTime();case"z":return"["+a.offsetName()+"]";case"zzz":return"["+a.offsetName("long")+"]";default:return h}});return n.bind(this)(u)}}})});function she(t,e,r){let n=!0;for(;n;)n=!1,r.forEach(function(i){let a="^\\s*"+i+"\\s*$",s=new RegExp(a);t[0].match(s)&&(e[i]=!0,t.shift(1),n=!0)})}var que,ho,Xue,jue,Kue,Wue,Bc,HI,WI,YI,ux,hx,qI,XI,oE,Mg,jI,Que,KI,fx,QI,ZI,lE,$I,T$e,k$e,E$e,S$e,C$e,A$e,_$e,L$e,D$e,N$e,R$e,M$e,I$e,O$e,P$e,B$e,F$e,z$e,G$e,$$e,V$e,U$e,H$e,Zue,W$e,Y$e,q$e,Jue,X$e,VI,ehe,the,aE,Rg,j$e,K$e,UI,sE,Vi,rhe,Q$e,w0,Z$e,Yue,J$e,nhe,eVe,ihe,tVe,rVe,ahe,ohe=M(()=>{"use strict";que=ka(Fp(),1),ho=ka(Ab(),1),Xue=ka(Vue(),1),jue=ka(Uue(),1),Kue=ka(Hue(),1);ht();Vt();hr();ki();ho.default.extend(Xue.default);ho.default.extend(jue.default);ho.default.extend(Kue.default);Wue={friday:5,saturday:6},Bc="",HI="",YI="",ux=[],hx=[],qI=new Map,XI=[],oE=[],Mg="",jI="",Que=["active","done","crit","milestone"],KI=[],fx=!1,QI=!1,ZI="sunday",lE="saturday",$I=0,T$e=o(function(){XI=[],oE=[],Mg="",KI=[],aE=0,UI=void 0,sE=void 0,Vi=[],Bc="",HI="",jI="",WI=void 0,YI="",ux=[],hx=[],fx=!1,QI=!1,$I=0,qI=new Map,_r(),ZI="sunday",lE="saturday"},"clear"),k$e=o(function(t){HI=t},"setAxisFormat"),E$e=o(function(){return HI},"getAxisFormat"),S$e=o(function(t){WI=t},"setTickInterval"),C$e=o(function(){return WI},"getTickInterval"),A$e=o(function(t){YI=t},"setTodayMarker"),_$e=o(function(){return YI},"getTodayMarker"),L$e=o(function(t){Bc=t},"setDateFormat"),D$e=o(function(){fx=!0},"enableInclusiveEndDates"),N$e=o(function(){return fx},"endDatesAreInclusive"),R$e=o(function(){QI=!0},"enableTopAxis"),M$e=o(function(){return QI},"topAxisEnabled"),I$e=o(function(t){jI=t},"setDisplayMode"),O$e=o(function(){return jI},"getDisplayMode"),P$e=o(function(){return Bc},"getDateFormat"),B$e=o(function(t){ux=t.toLowerCase().split(/[\s,]+/)},"setIncludes"),F$e=o(function(){return ux},"getIncludes"),z$e=o(function(t){hx=t.toLowerCase().split(/[\s,]+/)},"setExcludes"),G$e=o(function(){return hx},"getExcludes"),$$e=o(function(){return qI},"getLinks"),V$e=o(function(t){Mg=t,XI.push(t)},"addSection"),U$e=o(function(){return XI},"getSections"),H$e=o(function(){let t=Yue(),e=10,r=0;for(;!t&&r<e;)t=Yue(),r++;return oE=Vi,oE},"getTasks"),Zue=o(function(t,e,r,n){return n.includes(t.format(e.trim()))?!1:r.includes("weekends")&&(t.isoWeekday()===Wue[lE]||t.isoWeekday()===Wue[lE]+1)||r.includes(t.format("dddd").toLowerCase())?!0:r.includes(t.format(e.trim()))},"isInvalidDate"),W$e=o(function(t){ZI=t},"setWeekday"),Y$e=o(function(){return ZI},"getWeekday"),q$e=o(function(t){lE=t},"setWeekend"),Jue=o(function(t,e,r,n){if(!r.length||t.manualEndTime)return;let i;t.startTime instanceof Date?i=(0,ho.default)(t.startTime):i=(0,ho.default)(t.startTime,e,!0),i=i.add(1,"d");let a;t.endTime instanceof Date?a=(0,ho.default)(t.endTime):a=(0,ho.default)(t.endTime,e,!0);let[s,l]=X$e(i,a,e,r,n);t.endTime=s.toDate(),t.renderEndTime=l},"checkTaskDates"),X$e=o(function(t,e,r,n,i){let a=!1,s=null;for(;t<=e;)a||(s=e.toDate()),a=Zue(t,r,n,i),a&&(e=e.add(1,"d")),t=t.add(1,"d");return[e,s]},"fixTaskDates"),VI=o(function(t,e,r){r=r.trim();let i=/^after\s+(?<ids>[\d\w- ]+)/.exec(r);if(i!==null){let s=null;for(let u of i.groups.ids.split(" ")){let h=w0(u);h!==void 0&&(!s||h.endTime>s.endTime)&&(s=h)}if(s)return s.endTime;let l=new Date;return l.setHours(0,0,0,0),l}let a=(0,ho.default)(r,e.trim(),!0);if(a.isValid())return a.toDate();{Y.debug("Invalid date:"+r),Y.debug("With date format:"+e.trim());let s=new Date(r);if(s===void 0||isNaN(s.getTime())||s.getFullYear()<-1e4||s.getFullYear()>1e4)throw new Error("Invalid date:"+r);return s}},"getStartDate"),ehe=o(function(t){let e=/^(\d+(?:\.\d+)?)([Mdhmswy]|ms)$/.exec(t.trim());return e!==null?[Number.parseFloat(e[1]),e[2]]:[NaN,"ms"]},"parseDuration"),the=o(function(t,e,r,n=!1){r=r.trim();let a=/^until\s+(?<ids>[\d\w- ]+)/.exec(r);if(a!==null){let f=null;for(let p of a.groups.ids.split(" ")){let m=w0(p);m!==void 0&&(!f||m.startTime<f.startTime)&&(f=m)}if(f)return f.startTime;let d=new Date;return d.setHours(0,0,0,0),d}let s=(0,ho.default)(r,e.trim(),!0);if(s.isValid())return n&&(s=s.add(1,"d")),s.toDate();let l=(0,ho.default)(t),[u,h]=ehe(r);if(!Number.isNaN(u)){let f=l.add(u,h);f.isValid()&&(l=f)}return l.toDate()},"getEndDate"),aE=0,Rg=o(function(t){return t===void 0?(aE=aE+1,"task"+aE):t},"parseId"),j$e=o(function(t,e){let r;e.substr(0,1)===":"?r=e.substr(1,e.length):r=e;let n=r.split(","),i={};she(n,i,Que);for(let s=0;s<n.length;s++)n[s]=n[s].trim();let a="";switch(n.length){case 1:i.id=Rg(),i.startTime=t.endTime,a=n[0];break;case 2:i.id=Rg(),i.startTime=VI(void 0,Bc,n[0]),a=n[1];break;case 3:i.id=Rg(n[0]),i.startTime=VI(void 0,Bc,n[1]),a=n[2];break;default:}return a&&(i.endTime=the(i.startTime,Bc,a,fx),i.manualEndTime=(0,ho.default)(a,"YYYY-MM-DD",!0).isValid(),Jue(i,Bc,hx,ux)),i},"compileData"),K$e=o(function(t,e){let r;e.substr(0,1)===":"?r=e.substr(1,e.length):r=e;let n=r.split(","),i={};she(n,i,Que);for(let a=0;a<n.length;a++)n[a]=n[a].trim();switch(n.length){case 1:i.id=Rg(),i.startTime={type:"prevTaskEnd",id:t},i.endTime={data:n[0]};break;case 2:i.id=Rg(),i.startTime={type:"getStartDate",startData:n[0]},i.endTime={data:n[1]};break;case 3:i.id=Rg(n[0]),i.startTime={type:"getStartDate",startData:n[1]},i.endTime={data:n[2]};break;default:}return i},"parseData"),Vi=[],rhe={},Q$e=o(function(t,e){let r={section:Mg,type:Mg,processed:!1,manualEndTime:!1,renderEndTime:null,raw:{data:e},task:t,classes:[]},n=K$e(sE,e);r.raw.startTime=n.startTime,r.raw.endTime=n.endTime,r.id=n.id,r.prevTaskId=sE,r.active=n.active,r.done=n.done,r.crit=n.crit,r.milestone=n.milestone,r.order=$I,$I++;let i=Vi.push(r);sE=r.id,rhe[r.id]=i-1},"addTask"),w0=o(function(t){let e=rhe[t];return Vi[e]},"findTaskById"),Z$e=o(function(t,e){let r={section:Mg,type:Mg,description:t,task:t,classes:[]},n=j$e(UI,e);r.startTime=n.startTime,r.endTime=n.endTime,r.id=n.id,r.active=n.active,r.done=n.done,r.crit=n.crit,r.milestone=n.milestone,UI=r,oE.push(r)},"addTaskOrg"),Yue=o(function(){let t=o(function(r){let n=Vi[r],i="";switch(Vi[r].raw.startTime.type){case"prevTaskEnd":{let a=w0(n.prevTaskId);n.startTime=a.endTime;break}case"getStartDate":i=VI(void 0,Bc,Vi[r].raw.startTime.startData),i&&(Vi[r].startTime=i);break}return Vi[r].startTime&&(Vi[r].endTime=the(Vi[r].startTime,Bc,Vi[r].raw.endTime.data,fx),Vi[r].endTime&&(Vi[r].processed=!0,Vi[r].manualEndTime=(0,ho.default)(Vi[r].raw.endTime.data,"YYYY-MM-DD",!0).isValid(),Jue(Vi[r],Bc,hx,ux))),Vi[r].processed},"compileTask"),e=!0;for(let[r,n]of Vi.entries())t(r),e=e&&n.processed;return e},"compileTasks"),J$e=o(function(t,e){let r=e;de().securityLevel!=="loose"&&(r=(0,que.sanitizeUrl)(e)),t.split(",").forEach(function(n){w0(n)!==void 0&&(ihe(n,()=>{window.open(r,"_self")}),qI.set(n,r))}),nhe(t,"clickable")},"setLink"),nhe=o(function(t,e){t.split(",").forEach(function(r){let n=w0(r);n!==void 0&&n.classes.push(e)})},"setClass"),eVe=o(function(t,e,r){if(de().securityLevel!=="loose"||e===void 0)return;let n=[];if(typeof r=="string"){n=r.split(/,(?=(?:(?:[^"]*"){2})*[^"]*$)/);for(let a=0;a<n.length;a++){let s=n[a].trim();s.startsWith('"')&&s.endsWith('"')&&(s=s.substr(1,s.length-2)),n[a]=s}}n.length===0&&n.push(t),w0(t)!==void 0&&ihe(t,()=>{Ut.runFunc(e,...n)})},"setClickFun"),ihe=o(function(t,e){KI.push(function(){let r=document.querySelector(`[id="${t}"]`);r!==null&&r.addEventListener("click",function(){e()})},function(){let r=document.querySelector(`[id="${t}-text"]`);r!==null&&r.addEventListener("click",function(){e()})})},"pushFun"),tVe=o(function(t,e,r){t.split(",").forEach(function(n){eVe(n,e,r)}),nhe(t,"clickable")},"setClickEvent"),rVe=o(function(t){KI.forEach(function(e){e(t)})},"bindFunctions"),ahe={getConfig:o(()=>de().gantt,"getConfig"),clear:T$e,setDateFormat:L$e,getDateFormat:P$e,enableInclusiveEndDates:D$e,endDatesAreInclusive:N$e,enableTopAxis:R$e,topAxisEnabled:M$e,setAxisFormat:k$e,getAxisFormat:E$e,setTickInterval:S$e,getTickInterval:C$e,setTodayMarker:A$e,getTodayMarker:_$e,setAccTitle:Rr,getAccTitle:Pr,setDiagramTitle:ln,getDiagramTitle:Jr,setDisplayMode:I$e,getDisplayMode:O$e,setAccDescription:Br,getAccDescription:Fr,addSection:V$e,getSections:U$e,getTasks:H$e,addTask:Q$e,findTaskById:w0,addTaskOrg:Z$e,setIncludes:B$e,getIncludes:F$e,setExcludes:z$e,getExcludes:G$e,setClickEvent:tVe,setLink:J$e,getLinks:$$e,bindFunctions:rVe,parseDuration:ehe,isInvalidDate:Zue,setWeekday:W$e,getWeekday:Y$e,setWeekend:q$e};o(she,"getTaskTags")});var cE,nVe,lhe,iVe,Uu,aVe,che,uhe=M(()=>{"use strict";cE=ka(Ab(),1);ht();mr();fr();Vt();ni();nVe=o(function(){Y.debug("Something is calling, setConf, remove the call")},"setConf"),lhe={monday:Th,tuesday:b3,wednesday:w3,thursday:cc,friday:T3,saturday:k3,sunday:wl},iVe=o((t,e)=>{let r=[...t].map(()=>-1/0),n=[...t].sort((a,s)=>a.startTime-s.startTime||a.order-s.order),i=0;for(let a of n)for(let s=0;s<r.length;s++)if(a.startTime>=r[s]){r[s]=a.endTime,a.order=s+e,s>i&&(i=s);break}return i},"getMaxIntersections"),aVe=o(function(t,e,r,n){let i=de().gantt,a=de().securityLevel,s;a==="sandbox"&&(s=ze("#i"+e));let l=a==="sandbox"?ze(s.nodes()[0].contentDocument.body):ze("body"),u=a==="sandbox"?s.nodes()[0].contentDocument:document,h=u.getElementById(e);Uu=h.parentElement.offsetWidth,Uu===void 0&&(Uu=1200),i.useWidth!==void 0&&(Uu=i.useWidth);let f=n.db.getTasks(),d=[];for(let C of f)d.push(C.type);d=L(d);let p={},m=2*i.topPadding;if(n.db.getDisplayMode()==="compact"||i.displayMode==="compact"){let C={};for(let I of f)C[I.section]===void 0?C[I.section]=[I]:C[I.section].push(I);let A=0;for(let I of Object.keys(C)){let D=iVe(C[I],A)+1;A+=D,m+=D*(i.barHeight+i.barGap),p[I]=D}}else{m+=f.length*(i.barHeight+i.barGap);for(let C of d)p[C]=f.filter(A=>A.type===C).length}h.setAttribute("viewBox","0 0 "+Uu+" "+m);let g=l.select(`[id="${e}"]`),y=C3().domain([N4(f,function(C){return C.startTime}),D4(f,function(C){return C.endTime})]).rangeRound([0,Uu-i.leftPadding-i.rightPadding]);function v(C,A){let I=C.startTime,D=A.startTime,k=0;return I>D?k=1:I<D&&(k=-1),k}o(v,"taskCompare"),f.sort(v),x(f,Uu,m),Zr(g,m,Uu,i.useMaxWidth),g.append("text").text(n.db.getDiagramTitle()).attr("x",Uu/2).attr("y",i.titleTopMargin).attr("class","titleText");function x(C,A,I){let D=i.barHeight,k=D+i.barGap,R=i.topPadding,S=i.leftPadding,O=bl().domain([0,d.length]).range(["#00B9FA","#F95002"]).interpolate(BA);w(k,R,S,A,I,C,n.db.getExcludes(),n.db.getIncludes()),_(S,R,A,I),b(C,k,R,S,D,O,A,I),T(k,R,S,D,O),E(S,R,A,I)}o(x,"makeGantt");function b(C,A,I,D,k,R,S){let N=[...new Set(C.map($=>$.order))].map($=>C.find(z=>z.order===$));g.append("g").selectAll("rect").data(N).enter().append("rect").attr("x",0).attr("y",function($,z){return z=$.order,z*A+I-2}).attr("width",function(){return S-i.rightPadding/2}).attr("height",A).attr("class",function($){for(let[z,W]of d.entries())if($.type===W)return"section section"+z%i.numberSectionStyles;return"section section0"});let P=g.append("g").selectAll("rect").data(C).enter(),F=n.db.getLinks();if(P.append("rect").attr("id",function($){return $.id}).attr("rx",3).attr("ry",3).attr("x",function($){return $.milestone?y($.startTime)+D+.5*(y($.endTime)-y($.startTime))-.5*k:y($.startTime)+D}).attr("y",function($,z){return z=$.order,z*A+I}).attr("width",function($){return $.milestone?k:y($.renderEndTime||$.endTime)-y($.startTime)}).attr("height",k).attr("transform-origin",function($,z){return z=$.order,(y($.startTime)+D+.5*(y($.endTime)-y($.startTime))).toString()+"px "+(z*A+I+.5*k).toString()+"px"}).attr("class",function($){let z="task",W="";$.classes.length>0&&(W=$.classes.join(" "));let j=0;for(let[ie,Q]of d.entries())$.type===Q&&(j=ie%i.numberSectionStyles);let K="";return $.active?$.crit?K+=" activeCrit":K=" active":$.done?$.crit?K=" doneCrit":K=" done":$.crit&&(K+=" crit"),K.length===0&&(K=" task"),$.milestone&&(K=" milestone "+K),K+=j,K+=" "+W,z+K}),P.append("text").attr("id",function($){return $.id+"-text"}).text(function($){return $.task}).attr("font-size",i.fontSize).attr("x",function($){let z=y($.startTime),W=y($.renderEndTime||$.endTime);$.milestone&&(z+=.5*(y($.endTime)-y($.startTime))-.5*k),$.milestone&&(W=z+k);let j=this.getBBox().width;return j>W-z?W+j+1.5*i.leftPadding>S?z+D-5:W+D+5:(W-z)/2+z+D}).attr("y",function($,z){return z=$.order,z*A+i.barHeight/2+(i.fontSize/2-2)+I}).attr("text-height",k).attr("class",function($){let z=y($.startTime),W=y($.endTime);$.milestone&&(W=z+k);let j=this.getBBox().width,K="";$.classes.length>0&&(K=$.classes.join(" "));let ie=0;for(let[ee,J]of d.entries())$.type===J&&(ie=ee%i.numberSectionStyles);let Q="";return $.active&&($.crit?Q="activeCritText"+ie:Q="activeText"+ie),$.done?$.crit?Q=Q+" doneCritText"+ie:Q=Q+" doneText"+ie:$.crit&&(Q=Q+" critText"+ie),$.milestone&&(Q+=" milestoneText"),j>W-z?W+j+1.5*i.leftPadding>S?K+" taskTextOutsideLeft taskTextOutside"+ie+" "+Q:K+" taskTextOutsideRight taskTextOutside"+ie+" "+Q+" width-"+j:K+" taskText taskText"+ie+" "+Q+" width-"+j}),de().securityLevel==="sandbox"){let $;$=ze("#i"+e);let z=$.nodes()[0].contentDocument;P.filter(function(W){return F.has(W.id)}).each(function(W){var j=z.querySelector("#"+W.id),K=z.querySelector("#"+W.id+"-text");let ie=j.parentNode;var Q=z.createElement("a");Q.setAttribute("xlink:href",F.get(W.id)),Q.setAttribute("target","_top"),ie.appendChild(Q),Q.appendChild(j),Q.appendChild(K)})}}o(b,"drawRects");function w(C,A,I,D,k,R,S,O){if(S.length===0&&O.length===0)return;let N,P;for(let{startTime:j,endTime:K}of R)(N===void 0||j<N)&&(N=j),(P===void 0||K>P)&&(P=K);if(!N||!P)return;if((0,cE.default)(P).diff((0,cE.default)(N),"year")>5){Y.warn("The difference between the min and max time is more than 5 years. This will cause performance issues. Skipping drawing exclude days.");return}let F=n.db.getDateFormat(),B=[],$=null,z=(0,cE.default)(N);for(;z.valueOf()<=P;)n.db.isInvalidDate(z,F,S,O)?$?$.end=z:$={start:z,end:z}:$&&(B.push($),$=null),z=z.add(1,"d");g.append("g").selectAll("rect").data(B).enter().append("rect").attr("id",function(j){return"exclude-"+j.start.format("YYYY-MM-DD")}).attr("x",function(j){return y(j.start)+I}).attr("y",i.gridLineStartPadding).attr("width",function(j){let K=j.end.add(1,"day");return y(K)-y(j.start)}).attr("height",k-A-i.gridLineStartPadding).attr("transform-origin",function(j,K){return(y(j.start)+I+.5*(y(j.end)-y(j.start))).toString()+"px "+(K*C+.5*k).toString()+"px"}).attr("class","exclude-range")}o(w,"drawExcludeDays");function _(C,A,I,D){let k=v7(y).tickSize(-D+A+i.gridLineStartPadding).tickFormat(dd(n.db.getAxisFormat()||i.axisFormat||"%Y-%m-%d")),S=/^([1-9]\d*)(millisecond|second|minute|hour|day|week|month)$/.exec(n.db.getTickInterval()||i.tickInterval);if(S!==null){let O=S[1],N=S[2],P=n.db.getWeekday()||i.weekday;switch(N){case"millisecond":k.ticks(oc.every(O));break;case"second":k.ticks(Xs.every(O));break;case"minute":k.ticks(mu.every(O));break;case"hour":k.ticks(gu.every(O));break;case"day":k.ticks(Lo.every(O));break;case"week":k.ticks(lhe[P].every(O));break;case"month":k.ticks(yu.every(O));break}}if(g.append("g").attr("class","grid").attr("transform","translate("+C+", "+(D-50)+")").call(k).selectAll("text").style("text-anchor","middle").attr("fill","#000").attr("stroke","none").attr("font-size",10).attr("dy","1em"),n.db.topAxisEnabled()||i.topAxis){let O=y7(y).tickSize(-D+A+i.gridLineStartPadding).tickFormat(dd(n.db.getAxisFormat()||i.axisFormat||"%Y-%m-%d"));if(S!==null){let N=S[1],P=S[2],F=n.db.getWeekday()||i.weekday;switch(P){case"millisecond":O.ticks(oc.every(N));break;case"second":O.ticks(Xs.every(N));break;case"minute":O.ticks(mu.every(N));break;case"hour":O.ticks(gu.every(N));break;case"day":O.ticks(Lo.every(N));break;case"week":O.ticks(lhe[F].every(N));break;case"month":O.ticks(yu.every(N));break}}g.append("g").attr("class","grid").attr("transform","translate("+C+", "+A+")").call(O).selectAll("text").style("text-anchor","middle").attr("fill","#000").attr("stroke","none").attr("font-size",10)}}o(_,"makeGrid");function T(C,A){let I=0,D=Object.keys(p).map(k=>[k,p[k]]);g.append("g").selectAll("text").data(D).enter().append(function(k){let R=k[0].split(je.lineBreakRegex),S=-(R.length-1)/2,O=u.createElementNS("http://www.w3.org/2000/svg","text");O.setAttribute("dy",S+"em");for(let[N,P]of R.entries()){let F=u.createElementNS("http://www.w3.org/2000/svg","tspan");F.setAttribute("alignment-baseline","central"),F.setAttribute("x","10"),N>0&&F.setAttribute("dy","1em"),F.textContent=P,O.appendChild(F)}return O}).attr("x",10).attr("y",function(k,R){if(R>0)for(let S=0;S<R;S++)return I+=D[R-1][1],k[1]*C/2+I*C+A;else return k[1]*C/2+A}).attr("font-size",i.sectionFontSize).attr("class",function(k){for(let[R,S]of d.entries())if(k[0]===S)return"sectionTitle sectionTitle"+R%i.numberSectionStyles;return"sectionTitle"})}o(T,"vertLabels");function E(C,A,I,D){let k=n.db.getTodayMarker();if(k==="off")return;let R=g.append("g").attr("class","today"),S=new Date,O=R.append("line");O.attr("x1",y(S)+C).attr("x2",y(S)+C).attr("y1",i.titleTopMargin).attr("y2",D-i.titleTopMargin).attr("class","today"),k!==""&&O.attr("style",k.replace(/,/g,";"))}o(E,"drawToday");function L(C){let A={},I=[];for(let D=0,k=C.length;D<k;++D)Object.prototype.hasOwnProperty.call(A,C[D])||(A[C[D]]=!0,I.push(C[D]));return I}o(L,"checkUnique")},"draw"),che={setConf:nVe,draw:aVe}});var sVe,hhe,fhe=M(()=>{"use strict";sVe=o(t=>` + .mermaid-main-font { + font-family: var(--mermaid-font-family, "trebuchet ms", verdana, arial, sans-serif); + } + + .exclude-range { + fill: ${t.excludeBkgColor}; + } + + .section { + stroke: none; + opacity: 0.2; + } + + .section0 { + fill: ${t.sectionBkgColor}; + } + + .section2 { + fill: ${t.sectionBkgColor2}; + } + + .section1, + .section3 { + fill: ${t.altSectionBkgColor}; + opacity: 0.2; + } + + .sectionTitle0 { + fill: ${t.titleColor}; + } + + .sectionTitle1 { + fill: ${t.titleColor}; + } + + .sectionTitle2 { + fill: ${t.titleColor}; + } + + .sectionTitle3 { + fill: ${t.titleColor}; + } + + .sectionTitle { + text-anchor: start; + font-family: var(--mermaid-font-family, "trebuchet ms", verdana, arial, sans-serif); + } + + + /* Grid and axis */ + + .grid .tick { + stroke: ${t.gridColor}; + opacity: 0.8; + shape-rendering: crispEdges; + } + + .grid .tick text { + font-family: ${t.fontFamily}; + fill: ${t.textColor}; + } + + .grid path { + stroke-width: 0; + } + + + /* Today line */ + + .today { + fill: none; + stroke: ${t.todayLineColor}; + stroke-width: 2px; + } + + + /* Task styling */ + + /* Default task */ + + .task { + stroke-width: 2; + } + + .taskText { + text-anchor: middle; + font-family: var(--mermaid-font-family, "trebuchet ms", verdana, arial, sans-serif); + } + + .taskTextOutsideRight { + fill: ${t.taskTextDarkColor}; + text-anchor: start; + font-family: var(--mermaid-font-family, "trebuchet ms", verdana, arial, sans-serif); + } + + .taskTextOutsideLeft { + fill: ${t.taskTextDarkColor}; + text-anchor: end; + } + + + /* Special case clickable */ + + .task.clickable { + cursor: pointer; + } + + .taskText.clickable { + cursor: pointer; + fill: ${t.taskTextClickableColor} !important; + font-weight: bold; + } + + .taskTextOutsideLeft.clickable { + cursor: pointer; + fill: ${t.taskTextClickableColor} !important; + font-weight: bold; + } + + .taskTextOutsideRight.clickable { + cursor: pointer; + fill: ${t.taskTextClickableColor} !important; + font-weight: bold; + } + + + /* Specific task settings for the sections*/ + + .taskText0, + .taskText1, + .taskText2, + .taskText3 { + fill: ${t.taskTextColor}; + } + + .task0, + .task1, + .task2, + .task3 { + fill: ${t.taskBkgColor}; + stroke: ${t.taskBorderColor}; + } + + .taskTextOutside0, + .taskTextOutside2 + { + fill: ${t.taskTextOutsideColor}; + } + + .taskTextOutside1, + .taskTextOutside3 { + fill: ${t.taskTextOutsideColor}; + } + + + /* Active task */ + + .active0, + .active1, + .active2, + .active3 { + fill: ${t.activeTaskBkgColor}; + stroke: ${t.activeTaskBorderColor}; + } + + .activeText0, + .activeText1, + .activeText2, + .activeText3 { + fill: ${t.taskTextDarkColor} !important; + } + + + /* Completed task */ + + .done0, + .done1, + .done2, + .done3 { + stroke: ${t.doneTaskBorderColor}; + fill: ${t.doneTaskBkgColor}; + stroke-width: 2; + } + + .doneText0, + .doneText1, + .doneText2, + .doneText3 { + fill: ${t.taskTextDarkColor} !important; + } + + + /* Tasks on the critical line */ + + .crit0, + .crit1, + .crit2, + .crit3 { + stroke: ${t.critBorderColor}; + fill: ${t.critBkgColor}; + stroke-width: 2; + } + + .activeCrit0, + .activeCrit1, + .activeCrit2, + .activeCrit3 { + stroke: ${t.critBorderColor}; + fill: ${t.activeTaskBkgColor}; + stroke-width: 2; + } + + .doneCrit0, + .doneCrit1, + .doneCrit2, + .doneCrit3 { + stroke: ${t.critBorderColor}; + fill: ${t.doneTaskBkgColor}; + stroke-width: 2; + cursor: pointer; + shape-rendering: crispEdges; + } + + .milestone { + transform: rotate(45deg) scale(0.8,0.8); + } + + .milestoneText { + font-style: italic; + } + .doneCritText0, + .doneCritText1, + .doneCritText2, + .doneCritText3 { + fill: ${t.taskTextDarkColor} !important; + } + + .activeCritText0, + .activeCritText1, + .activeCritText2, + .activeCritText3 { + fill: ${t.taskTextDarkColor} !important; + } + + .titleText { + text-anchor: middle; + font-size: 18px; + fill: ${t.titleColor||t.textColor}; + font-family: var(--mermaid-font-family, "trebuchet ms", verdana, arial, sans-serif); + } +`,"getStyles"),hhe=sVe});var dhe={};vr(dhe,{diagram:()=>oVe});var oVe,phe=M(()=>{"use strict";$ue();ohe();uhe();fhe();oVe={parser:Gue,db:ahe,renderer:che,styles:hhe}});var yhe,vhe=M(()=>{"use strict";Ng();ht();yhe={parse:o(async t=>{let e=await Gl("info",t);Y.debug(e)},"parse")}});var dx,JI=M(()=>{dx="11.4.1"});var fVe,dVe,xhe,bhe=M(()=>{"use strict";JI();fVe={version:dx},dVe=o(()=>fVe.version,"getVersion"),xhe={getVersion:dVe}});var Oa,Hu=M(()=>{"use strict";mr();Vt();Oa=o(t=>{let{securityLevel:e}=de(),r=ze("body");if(e==="sandbox"){let a=ze(`#i${t}`).node()?.contentDocument??document;r=ze(a.body)}return r.select(`#${t}`)},"selectSvgElement")});var pVe,whe,The=M(()=>{"use strict";ht();Hu();ni();pVe=o((t,e,r)=>{Y.debug(`rendering info diagram +`+t);let n=Oa(e);Zr(n,100,400,!0),n.append("g").append("text").attr("x",100).attr("y",40).attr("class","version").attr("font-size",32).style("text-anchor","middle").text(`v${r}`)},"draw"),whe={draw:pVe}});var khe={};vr(khe,{diagram:()=>mVe});var mVe,Ehe=M(()=>{"use strict";vhe();bhe();The();mVe={parser:yhe,db:xhe,renderer:whe}});var Ahe,eO,uE,tO,vVe,xVe,bVe,wVe,TVe,kVe,EVe,hE,rO=M(()=>{"use strict";ht();ki();hs();Ahe=ur.pie,eO={sections:new Map,showData:!1,config:Ahe},uE=eO.sections,tO=eO.showData,vVe=structuredClone(Ahe),xVe=o(()=>structuredClone(vVe),"getConfig"),bVe=o(()=>{uE=new Map,tO=eO.showData,_r()},"clear"),wVe=o(({label:t,value:e})=>{uE.has(t)||(uE.set(t,e),Y.debug(`added new section: ${t}, with value: ${e}`))},"addSection"),TVe=o(()=>uE,"getSections"),kVe=o(t=>{tO=t},"setShowData"),EVe=o(()=>tO,"getShowData"),hE={getConfig:xVe,clear:bVe,setDiagramTitle:ln,getDiagramTitle:Jr,setAccTitle:Rr,getAccTitle:Pr,setAccDescription:Br,getAccDescription:Fr,addSection:wVe,getSections:TVe,setShowData:kVe,getShowData:EVe}});var SVe,_he,Lhe=M(()=>{"use strict";Ng();ht();ox();rO();SVe=o((t,e)=>{lf(t,e),e.setShowData(t.showData),t.sections.map(e.addSection)},"populateDb"),_he={parse:o(async t=>{let e=await Gl("pie",t);Y.debug(e),SVe(e,hE)},"parse")}});var CVe,Dhe,Nhe=M(()=>{"use strict";CVe=o(t=>` + .pieCircle{ + stroke: ${t.pieStrokeColor}; + stroke-width : ${t.pieStrokeWidth}; + opacity : ${t.pieOpacity}; + } + .pieOuterCircle{ + stroke: ${t.pieOuterStrokeColor}; + stroke-width: ${t.pieOuterStrokeWidth}; + fill: none; + } + .pieTitleText { + text-anchor: middle; + font-size: ${t.pieTitleTextSize}; + fill: ${t.pieTitleTextColor}; + font-family: ${t.fontFamily}; + } + .slice { + font-family: ${t.fontFamily}; + fill: ${t.pieSectionTextColor}; + font-size:${t.pieSectionTextSize}; + // fill: white; + } + .legend text { + fill: ${t.pieLegendTextColor}; + font-family: ${t.fontFamily}; + font-size: ${t.pieLegendTextSize}; + } +`,"getStyles"),Dhe=CVe});var AVe,_Ve,Rhe,Mhe=M(()=>{"use strict";mr();Vt();ht();Hu();ni();hr();AVe=o(t=>{let e=[...t.entries()].map(n=>({label:n[0],value:n[1]})).sort((n,i)=>i.value-n.value);return R3().value(n=>n.value)(e)},"createPieArcs"),_Ve=o((t,e,r,n)=>{Y.debug(`rendering pie chart +`+t);let i=n.db,a=de(),s=ws(i.getConfig(),a.pie),l=40,u=18,h=4,f=450,d=f,p=Oa(e),m=p.append("g");m.attr("transform","translate("+d/2+","+f/2+")");let{themeVariables:g}=a,[y]=Fo(g.pieOuterStrokeWidth);y??=2;let v=s.textPosition,x=Math.min(d,f)/2-l,b=El().innerRadius(0).outerRadius(x),w=El().innerRadius(x*v).outerRadius(x*v);m.append("circle").attr("cx",0).attr("cy",0).attr("r",x+y/2).attr("class","pieOuterCircle");let _=i.getSections(),T=AVe(_),E=[g.pie1,g.pie2,g.pie3,g.pie4,g.pie5,g.pie6,g.pie7,g.pie8,g.pie9,g.pie10,g.pie11,g.pie12],L=du(E);m.selectAll("mySlices").data(T).enter().append("path").attr("d",b).attr("fill",k=>L(k.data.label)).attr("class","pieCircle");let C=0;_.forEach(k=>{C+=k}),m.selectAll("mySlices").data(T).enter().append("text").text(k=>(k.data.value/C*100).toFixed(0)+"%").attr("transform",k=>"translate("+w.centroid(k)+")").style("text-anchor","middle").attr("class","slice"),m.append("text").text(i.getDiagramTitle()).attr("x",0).attr("y",-(f-50)/2).attr("class","pieTitleText");let A=m.selectAll(".legend").data(L.domain()).enter().append("g").attr("class","legend").attr("transform",(k,R)=>{let S=u+h,O=S*L.domain().length/2,N=12*u,P=R*S-O;return"translate("+N+","+P+")"});A.append("rect").attr("width",u).attr("height",u).style("fill",L).style("stroke",L),A.data(T).append("text").attr("x",u+h).attr("y",u-h).text(k=>{let{label:R,value:S}=k.data;return i.getShowData()?`${R} [${S}]`:R});let I=Math.max(...A.selectAll("text").nodes().map(k=>k?.getBoundingClientRect().width??0)),D=d+l+u+h+I;p.attr("viewBox",`0 0 ${D} ${f}`),Zr(p,f,D,s.useMaxWidth)},"draw"),Rhe={draw:_Ve}});var Ihe={};vr(Ihe,{diagram:()=>LVe});var LVe,Ohe=M(()=>{"use strict";Lhe();rO();Nhe();Mhe();LVe={parser:_he,db:hE,renderer:Rhe,styles:Dhe}});var nO,Fhe,zhe=M(()=>{"use strict";nO=function(){var t=o(function(Te,se,Ee,Ae){for(Ee=Ee||{},Ae=Te.length;Ae--;Ee[Te[Ae]]=se);return Ee},"o"),e=[1,3],r=[1,4],n=[1,5],i=[1,6],a=[1,7],s=[1,4,5,10,12,13,14,18,25,35,37,39,41,42,48,50,51,52,53,54,55,56,57,60,61,63,64,65,66,67],l=[1,4,5,10,12,13,14,18,25,28,35,37,39,41,42,48,50,51,52,53,54,55,56,57,60,61,63,64,65,66,67],u=[55,56,57],h=[2,36],f=[1,37],d=[1,36],p=[1,38],m=[1,35],g=[1,43],y=[1,41],v=[1,14],x=[1,23],b=[1,18],w=[1,19],_=[1,20],T=[1,21],E=[1,22],L=[1,24],C=[1,25],A=[1,26],I=[1,27],D=[1,28],k=[1,29],R=[1,32],S=[1,33],O=[1,34],N=[1,39],P=[1,40],F=[1,42],B=[1,44],$=[1,62],z=[1,61],W=[4,5,8,10,12,13,14,18,44,47,49,55,56,57,63,64,65,66,67],j=[1,65],K=[1,66],ie=[1,67],Q=[1,68],ee=[1,69],J=[1,70],H=[1,71],q=[1,72],Z=[1,73],ae=[1,74],ue=[1,75],ce=[1,76],te=[4,5,6,7,8,9,10,11,12,13,14,15,18],De=[1,90],oe=[1,91],ke=[1,92],Fe=[1,99],Be=[1,93],Ve=[1,96],Ge=[1,94],He=[1,95],xe=[1,97],X=[1,98],fe=[1,102],he=[10,55,56,57],ge=[4,5,6,8,10,11,13,17,18,19,20,55,56,57],ne={trace:o(function(){},"trace"),yy:{},symbols_:{error:2,idStringToken:3,ALPHA:4,NUM:5,NODE_STRING:6,DOWN:7,MINUS:8,DEFAULT:9,COMMA:10,COLON:11,AMP:12,BRKT:13,MULT:14,UNICODE_TEXT:15,styleComponent:16,UNIT:17,SPACE:18,STYLE:19,PCT:20,idString:21,style:22,stylesOpt:23,classDefStatement:24,CLASSDEF:25,start:26,eol:27,QUADRANT:28,document:29,line:30,statement:31,axisDetails:32,quadrantDetails:33,points:34,title:35,title_value:36,acc_title:37,acc_title_value:38,acc_descr:39,acc_descr_value:40,acc_descr_multiline_value:41,section:42,text:43,point_start:44,point_x:45,point_y:46,class_name:47,"X-AXIS":48,"AXIS-TEXT-DELIMITER":49,"Y-AXIS":50,QUADRANT_1:51,QUADRANT_2:52,QUADRANT_3:53,QUADRANT_4:54,NEWLINE:55,SEMI:56,EOF:57,alphaNumToken:58,textNoTagsToken:59,STR:60,MD_STR:61,alphaNum:62,PUNCTUATION:63,PLUS:64,EQUALS:65,DOT:66,UNDERSCORE:67,$accept:0,$end:1},terminals_:{2:"error",4:"ALPHA",5:"NUM",6:"NODE_STRING",7:"DOWN",8:"MINUS",9:"DEFAULT",10:"COMMA",11:"COLON",12:"AMP",13:"BRKT",14:"MULT",15:"UNICODE_TEXT",17:"UNIT",18:"SPACE",19:"STYLE",20:"PCT",25:"CLASSDEF",28:"QUADRANT",35:"title",36:"title_value",37:"acc_title",38:"acc_title_value",39:"acc_descr",40:"acc_descr_value",41:"acc_descr_multiline_value",42:"section",44:"point_start",45:"point_x",46:"point_y",47:"class_name",48:"X-AXIS",49:"AXIS-TEXT-DELIMITER",50:"Y-AXIS",51:"QUADRANT_1",52:"QUADRANT_2",53:"QUADRANT_3",54:"QUADRANT_4",55:"NEWLINE",56:"SEMI",57:"EOF",60:"STR",61:"MD_STR",63:"PUNCTUATION",64:"PLUS",65:"EQUALS",66:"DOT",67:"UNDERSCORE"},productions_:[0,[3,1],[3,1],[3,1],[3,1],[3,1],[3,1],[3,1],[3,1],[3,1],[3,1],[3,1],[3,1],[16,1],[16,1],[16,1],[16,1],[16,1],[16,1],[16,1],[16,1],[16,1],[16,1],[21,1],[21,2],[22,1],[22,2],[23,1],[23,3],[24,5],[26,2],[26,2],[26,2],[29,0],[29,2],[30,2],[31,0],[31,1],[31,2],[31,1],[31,1],[31,1],[31,2],[31,2],[31,2],[31,1],[31,1],[34,4],[34,5],[34,5],[34,6],[32,4],[32,3],[32,2],[32,4],[32,3],[32,2],[33,2],[33,2],[33,2],[33,2],[27,1],[27,1],[27,1],[43,1],[43,2],[43,1],[43,1],[62,1],[62,2],[58,1],[58,1],[58,1],[58,1],[58,1],[58,1],[58,1],[58,1],[58,1],[58,1],[58,1],[59,1],[59,1],[59,1]],performAction:o(function(se,Ee,Ae,Pe,Me,me,We){var Re=me.length-1;switch(Me){case 23:this.$=me[Re];break;case 24:this.$=me[Re-1]+""+me[Re];break;case 26:this.$=me[Re-1]+me[Re];break;case 27:this.$=[me[Re].trim()];break;case 28:me[Re-2].push(me[Re].trim()),this.$=me[Re-2];break;case 29:this.$=me[Re-4],Pe.addClass(me[Re-2],me[Re]);break;case 37:this.$=[];break;case 42:this.$=me[Re].trim(),Pe.setDiagramTitle(this.$);break;case 43:this.$=me[Re].trim(),Pe.setAccTitle(this.$);break;case 44:case 45:this.$=me[Re].trim(),Pe.setAccDescription(this.$);break;case 46:Pe.addSection(me[Re].substr(8)),this.$=me[Re].substr(8);break;case 47:Pe.addPoint(me[Re-3],"",me[Re-1],me[Re],[]);break;case 48:Pe.addPoint(me[Re-4],me[Re-3],me[Re-1],me[Re],[]);break;case 49:Pe.addPoint(me[Re-4],"",me[Re-2],me[Re-1],me[Re]);break;case 50:Pe.addPoint(me[Re-5],me[Re-4],me[Re-2],me[Re-1],me[Re]);break;case 51:Pe.setXAxisLeftText(me[Re-2]),Pe.setXAxisRightText(me[Re]);break;case 52:me[Re-1].text+=" \u27F6 ",Pe.setXAxisLeftText(me[Re-1]);break;case 53:Pe.setXAxisLeftText(me[Re]);break;case 54:Pe.setYAxisBottomText(me[Re-2]),Pe.setYAxisTopText(me[Re]);break;case 55:me[Re-1].text+=" \u27F6 ",Pe.setYAxisBottomText(me[Re-1]);break;case 56:Pe.setYAxisBottomText(me[Re]);break;case 57:Pe.setQuadrant1Text(me[Re]);break;case 58:Pe.setQuadrant2Text(me[Re]);break;case 59:Pe.setQuadrant3Text(me[Re]);break;case 60:Pe.setQuadrant4Text(me[Re]);break;case 64:this.$={text:me[Re],type:"text"};break;case 65:this.$={text:me[Re-1].text+""+me[Re],type:me[Re-1].type};break;case 66:this.$={text:me[Re],type:"text"};break;case 67:this.$={text:me[Re],type:"markdown"};break;case 68:this.$=me[Re];break;case 69:this.$=me[Re-1]+""+me[Re];break}},"anonymous"),table:[{18:e,26:1,27:2,28:r,55:n,56:i,57:a},{1:[3]},{18:e,26:8,27:2,28:r,55:n,56:i,57:a},{18:e,26:9,27:2,28:r,55:n,56:i,57:a},t(s,[2,33],{29:10}),t(l,[2,61]),t(l,[2,62]),t(l,[2,63]),{1:[2,30]},{1:[2,31]},t(u,h,{30:11,31:12,24:13,32:15,33:16,34:17,43:30,58:31,1:[2,32],4:f,5:d,10:p,12:m,13:g,14:y,18:v,25:x,35:b,37:w,39:_,41:T,42:E,48:L,50:C,51:A,52:I,53:D,54:k,60:R,61:S,63:O,64:N,65:P,66:F,67:B}),t(s,[2,34]),{27:45,55:n,56:i,57:a},t(u,[2,37]),t(u,h,{24:13,32:15,33:16,34:17,43:30,58:31,31:46,4:f,5:d,10:p,12:m,13:g,14:y,18:v,25:x,35:b,37:w,39:_,41:T,42:E,48:L,50:C,51:A,52:I,53:D,54:k,60:R,61:S,63:O,64:N,65:P,66:F,67:B}),t(u,[2,39]),t(u,[2,40]),t(u,[2,41]),{36:[1,47]},{38:[1,48]},{40:[1,49]},t(u,[2,45]),t(u,[2,46]),{18:[1,50]},{4:f,5:d,10:p,12:m,13:g,14:y,43:51,58:31,60:R,61:S,63:O,64:N,65:P,66:F,67:B},{4:f,5:d,10:p,12:m,13:g,14:y,43:52,58:31,60:R,61:S,63:O,64:N,65:P,66:F,67:B},{4:f,5:d,10:p,12:m,13:g,14:y,43:53,58:31,60:R,61:S,63:O,64:N,65:P,66:F,67:B},{4:f,5:d,10:p,12:m,13:g,14:y,43:54,58:31,60:R,61:S,63:O,64:N,65:P,66:F,67:B},{4:f,5:d,10:p,12:m,13:g,14:y,43:55,58:31,60:R,61:S,63:O,64:N,65:P,66:F,67:B},{4:f,5:d,10:p,12:m,13:g,14:y,43:56,58:31,60:R,61:S,63:O,64:N,65:P,66:F,67:B},{4:f,5:d,8:$,10:p,12:m,13:g,14:y,18:z,44:[1,57],47:[1,58],58:60,59:59,63:O,64:N,65:P,66:F,67:B},t(W,[2,64]),t(W,[2,66]),t(W,[2,67]),t(W,[2,70]),t(W,[2,71]),t(W,[2,72]),t(W,[2,73]),t(W,[2,74]),t(W,[2,75]),t(W,[2,76]),t(W,[2,77]),t(W,[2,78]),t(W,[2,79]),t(W,[2,80]),t(s,[2,35]),t(u,[2,38]),t(u,[2,42]),t(u,[2,43]),t(u,[2,44]),{3:64,4:j,5:K,6:ie,7:Q,8:ee,9:J,10:H,11:q,12:Z,13:ae,14:ue,15:ce,21:63},t(u,[2,53],{59:59,58:60,4:f,5:d,8:$,10:p,12:m,13:g,14:y,18:z,49:[1,77],63:O,64:N,65:P,66:F,67:B}),t(u,[2,56],{59:59,58:60,4:f,5:d,8:$,10:p,12:m,13:g,14:y,18:z,49:[1,78],63:O,64:N,65:P,66:F,67:B}),t(u,[2,57],{59:59,58:60,4:f,5:d,8:$,10:p,12:m,13:g,14:y,18:z,63:O,64:N,65:P,66:F,67:B}),t(u,[2,58],{59:59,58:60,4:f,5:d,8:$,10:p,12:m,13:g,14:y,18:z,63:O,64:N,65:P,66:F,67:B}),t(u,[2,59],{59:59,58:60,4:f,5:d,8:$,10:p,12:m,13:g,14:y,18:z,63:O,64:N,65:P,66:F,67:B}),t(u,[2,60],{59:59,58:60,4:f,5:d,8:$,10:p,12:m,13:g,14:y,18:z,63:O,64:N,65:P,66:F,67:B}),{45:[1,79]},{44:[1,80]},t(W,[2,65]),t(W,[2,81]),t(W,[2,82]),t(W,[2,83]),{3:82,4:j,5:K,6:ie,7:Q,8:ee,9:J,10:H,11:q,12:Z,13:ae,14:ue,15:ce,18:[1,81]},t(te,[2,23]),t(te,[2,1]),t(te,[2,2]),t(te,[2,3]),t(te,[2,4]),t(te,[2,5]),t(te,[2,6]),t(te,[2,7]),t(te,[2,8]),t(te,[2,9]),t(te,[2,10]),t(te,[2,11]),t(te,[2,12]),t(u,[2,52],{58:31,43:83,4:f,5:d,10:p,12:m,13:g,14:y,60:R,61:S,63:O,64:N,65:P,66:F,67:B}),t(u,[2,55],{58:31,43:84,4:f,5:d,10:p,12:m,13:g,14:y,60:R,61:S,63:O,64:N,65:P,66:F,67:B}),{46:[1,85]},{45:[1,86]},{4:De,5:oe,6:ke,8:Fe,11:Be,13:Ve,16:89,17:Ge,18:He,19:xe,20:X,22:88,23:87},t(te,[2,24]),t(u,[2,51],{59:59,58:60,4:f,5:d,8:$,10:p,12:m,13:g,14:y,18:z,63:O,64:N,65:P,66:F,67:B}),t(u,[2,54],{59:59,58:60,4:f,5:d,8:$,10:p,12:m,13:g,14:y,18:z,63:O,64:N,65:P,66:F,67:B}),t(u,[2,47],{22:88,16:89,23:100,4:De,5:oe,6:ke,8:Fe,11:Be,13:Ve,17:Ge,18:He,19:xe,20:X}),{46:[1,101]},t(u,[2,29],{10:fe}),t(he,[2,27],{16:103,4:De,5:oe,6:ke,8:Fe,11:Be,13:Ve,17:Ge,18:He,19:xe,20:X}),t(ge,[2,25]),t(ge,[2,13]),t(ge,[2,14]),t(ge,[2,15]),t(ge,[2,16]),t(ge,[2,17]),t(ge,[2,18]),t(ge,[2,19]),t(ge,[2,20]),t(ge,[2,21]),t(ge,[2,22]),t(u,[2,49],{10:fe}),t(u,[2,48],{22:88,16:89,23:104,4:De,5:oe,6:ke,8:Fe,11:Be,13:Ve,17:Ge,18:He,19:xe,20:X}),{4:De,5:oe,6:ke,8:Fe,11:Be,13:Ve,16:89,17:Ge,18:He,19:xe,20:X,22:105},t(ge,[2,26]),t(u,[2,50],{10:fe}),t(he,[2,28],{16:103,4:De,5:oe,6:ke,8:Fe,11:Be,13:Ve,17:Ge,18:He,19:xe,20:X})],defaultActions:{8:[2,30],9:[2,31]},parseError:o(function(se,Ee){if(Ee.recoverable)this.trace(se);else{var Ae=new Error(se);throw Ae.hash=Ee,Ae}},"parseError"),parse:o(function(se){var Ee=this,Ae=[0],Pe=[],Me=[null],me=[],We=this.table,Re="",tt=0,gt=0,Et=0,vt=2,Ye=1,Tt=me.slice.call(arguments,1),$e=Object.create(this.lexer),rt={yy:{}};for(var ft in this.yy)Object.prototype.hasOwnProperty.call(this.yy,ft)&&(rt.yy[ft]=this.yy[ft]);$e.setInput(se,rt.yy),rt.yy.lexer=$e,rt.yy.parser=this,typeof $e.yylloc>"u"&&($e.yylloc={});var kt=$e.yylloc;me.push(kt);var er=$e.options&&$e.options.ranges;typeof rt.yy.parseError=="function"?this.parseError=rt.yy.parseError:this.parseError=Object.getPrototypeOf(this).parseError;function dt(Se){Ae.length=Ae.length-2*Se,Me.length=Me.length-Se,me.length=me.length-Se}o(dt,"popStack");function Xe(){var Se;return Se=Pe.pop()||$e.lex()||Ye,typeof Se!="number"&&(Se instanceof Array&&(Pe=Se,Se=Pe.pop()),Se=Ee.symbols_[Se]||Se),Se}o(Xe,"lex");for(var ct,Lt,Rt,zt,Xn,or,hn={},Tn,Ur,ri,Mn;;){if(Rt=Ae[Ae.length-1],this.defaultActions[Rt]?zt=this.defaultActions[Rt]:((ct===null||typeof ct>"u")&&(ct=Xe()),zt=We[Rt]&&We[Rt][ct]),typeof zt>"u"||!zt.length||!zt[0]){var yt="";Mn=[];for(Tn in We[Rt])this.terminals_[Tn]&&Tn>vt&&Mn.push("'"+this.terminals_[Tn]+"'");$e.showPosition?yt="Parse error on line "+(tt+1)+`: +`+$e.showPosition()+` +Expecting `+Mn.join(", ")+", got '"+(this.terminals_[ct]||ct)+"'":yt="Parse error on line "+(tt+1)+": Unexpected "+(ct==Ye?"end of input":"'"+(this.terminals_[ct]||ct)+"'"),this.parseError(yt,{text:$e.match,token:this.terminals_[ct]||ct,line:$e.yylineno,loc:kt,expected:Mn})}if(zt[0]instanceof Array&&zt.length>1)throw new Error("Parse Error: multiple actions possible at state: "+Rt+", token: "+ct);switch(zt[0]){case 1:Ae.push(ct),Me.push($e.yytext),me.push($e.yylloc),Ae.push(zt[1]),ct=null,Lt?(ct=Lt,Lt=null):(gt=$e.yyleng,Re=$e.yytext,tt=$e.yylineno,kt=$e.yylloc,Et>0&&Et--);break;case 2:if(Ur=this.productions_[zt[1]][1],hn.$=Me[Me.length-Ur],hn._$={first_line:me[me.length-(Ur||1)].first_line,last_line:me[me.length-1].last_line,first_column:me[me.length-(Ur||1)].first_column,last_column:me[me.length-1].last_column},er&&(hn._$.range=[me[me.length-(Ur||1)].range[0],me[me.length-1].range[1]]),or=this.performAction.apply(hn,[Re,gt,tt,rt.yy,zt[1],Me,me].concat(Tt)),typeof or<"u")return or;Ur&&(Ae=Ae.slice(0,-1*Ur*2),Me=Me.slice(0,-1*Ur),me=me.slice(0,-1*Ur)),Ae.push(this.productions_[zt[1]][0]),Me.push(hn.$),me.push(hn._$),ri=We[Ae[Ae.length-2]][Ae[Ae.length-1]],Ae.push(ri);break;case 3:return!0}}return!0},"parse")},ye=function(){var Te={EOF:1,parseError:o(function(Ee,Ae){if(this.yy.parser)this.yy.parser.parseError(Ee,Ae);else throw new Error(Ee)},"parseError"),setInput:o(function(se,Ee){return this.yy=Ee||this.yy||{},this._input=se,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},"setInput"),input:o(function(){var se=this._input[0];this.yytext+=se,this.yyleng++,this.offset++,this.match+=se,this.matched+=se;var Ee=se.match(/(?:\r\n?|\n).*/g);return Ee?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),se},"input"),unput:o(function(se){var Ee=se.length,Ae=se.split(/(?:\r\n?|\n)/g);this._input=se+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-Ee),this.offset-=Ee;var Pe=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),Ae.length-1&&(this.yylineno-=Ae.length-1);var Me=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:Ae?(Ae.length===Pe.length?this.yylloc.first_column:0)+Pe[Pe.length-Ae.length].length-Ae[0].length:this.yylloc.first_column-Ee},this.options.ranges&&(this.yylloc.range=[Me[0],Me[0]+this.yyleng-Ee]),this.yyleng=this.yytext.length,this},"unput"),more:o(function(){return this._more=!0,this},"more"),reject:o(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError("Lexical error on line "+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true). +`+this.showPosition(),{text:"",token:null,line:this.yylineno});return this},"reject"),less:o(function(se){this.unput(this.match.slice(se))},"less"),pastInput:o(function(){var se=this.matched.substr(0,this.matched.length-this.match.length);return(se.length>20?"...":"")+se.substr(-20).replace(/\n/g,"")},"pastInput"),upcomingInput:o(function(){var se=this.match;return se.length<20&&(se+=this._input.substr(0,20-se.length)),(se.substr(0,20)+(se.length>20?"...":"")).replace(/\n/g,"")},"upcomingInput"),showPosition:o(function(){var se=this.pastInput(),Ee=new Array(se.length+1).join("-");return se+this.upcomingInput()+` +`+Ee+"^"},"showPosition"),test_match:o(function(se,Ee){var Ae,Pe,Me;if(this.options.backtrack_lexer&&(Me={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(Me.yylloc.range=this.yylloc.range.slice(0))),Pe=se[0].match(/(?:\r\n?|\n).*/g),Pe&&(this.yylineno+=Pe.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:Pe?Pe[Pe.length-1].length-Pe[Pe.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+se[0].length},this.yytext+=se[0],this.match+=se[0],this.matches=se,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(se[0].length),this.matched+=se[0],Ae=this.performAction.call(this,this.yy,this,Ee,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),Ae)return Ae;if(this._backtrack){for(var me in Me)this[me]=Me[me];return!1}return!1},"test_match"),next:o(function(){if(this.done)return this.EOF;this._input||(this.done=!0);var se,Ee,Ae,Pe;this._more||(this.yytext="",this.match="");for(var Me=this._currentRules(),me=0;me<Me.length;me++)if(Ae=this._input.match(this.rules[Me[me]]),Ae&&(!Ee||Ae[0].length>Ee[0].length)){if(Ee=Ae,Pe=me,this.options.backtrack_lexer){if(se=this.test_match(Ae,Me[me]),se!==!1)return se;if(this._backtrack){Ee=!1;continue}else return!1}else if(!this.options.flex)break}return Ee?(se=this.test_match(Ee,Me[Pe]),se!==!1?se:!1):this._input===""?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+`. Unrecognized text. +`+this.showPosition(),{text:"",token:null,line:this.yylineno})},"next"),lex:o(function(){var Ee=this.next();return Ee||this.lex()},"lex"),begin:o(function(Ee){this.conditionStack.push(Ee)},"begin"),popState:o(function(){var Ee=this.conditionStack.length-1;return Ee>0?this.conditionStack.pop():this.conditionStack[0]},"popState"),_currentRules:o(function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},"_currentRules"),topState:o(function(Ee){return Ee=this.conditionStack.length-1-Math.abs(Ee||0),Ee>=0?this.conditionStack[Ee]:"INITIAL"},"topState"),pushState:o(function(Ee){this.begin(Ee)},"pushState"),stateStackSize:o(function(){return this.conditionStack.length},"stateStackSize"),options:{"case-insensitive":!0},performAction:o(function(Ee,Ae,Pe,Me){var me=Me;switch(Pe){case 0:break;case 1:break;case 2:return 55;case 3:break;case 4:return this.begin("title"),35;break;case 5:return this.popState(),"title_value";break;case 6:return this.begin("acc_title"),37;break;case 7:return this.popState(),"acc_title_value";break;case 8:return this.begin("acc_descr"),39;break;case 9:return this.popState(),"acc_descr_value";break;case 10:this.begin("acc_descr_multiline");break;case 11:this.popState();break;case 12:return"acc_descr_multiline_value";case 13:return 48;case 14:return 50;case 15:return 49;case 16:return 51;case 17:return 52;case 18:return 53;case 19:return 54;case 20:return 25;case 21:this.begin("md_string");break;case 22:return"MD_STR";case 23:this.popState();break;case 24:this.begin("string");break;case 25:this.popState();break;case 26:return"STR";case 27:this.begin("class_name");break;case 28:return this.popState(),47;break;case 29:return this.begin("point_start"),44;break;case 30:return this.begin("point_x"),45;break;case 31:this.popState();break;case 32:this.popState(),this.begin("point_y");break;case 33:return this.popState(),46;break;case 34:return 28;case 35:return 4;case 36:return 11;case 37:return 64;case 38:return 10;case 39:return 65;case 40:return 65;case 41:return 14;case 42:return 13;case 43:return 67;case 44:return 66;case 45:return 12;case 46:return 8;case 47:return 5;case 48:return 18;case 49:return 56;case 50:return 63;case 51:return 57}},"anonymous"),rules:[/^(?:%%(?!\{)[^\n]*)/i,/^(?:[^\}]%%[^\n]*)/i,/^(?:[\n\r]+)/i,/^(?:%%[^\n]*)/i,/^(?:title\b)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accTitle\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*\{\s*)/i,/^(?:[\}])/i,/^(?:[^\}]*)/i,/^(?: *x-axis *)/i,/^(?: *y-axis *)/i,/^(?: *--+> *)/i,/^(?: *quadrant-1 *)/i,/^(?: *quadrant-2 *)/i,/^(?: *quadrant-3 *)/i,/^(?: *quadrant-4 *)/i,/^(?:classDef\b)/i,/^(?:["][`])/i,/^(?:[^`"]+)/i,/^(?:[`]["])/i,/^(?:["])/i,/^(?:["])/i,/^(?:[^"]*)/i,/^(?::::)/i,/^(?:^\w+)/i,/^(?:\s*:\s*\[\s*)/i,/^(?:(1)|(0(.\d+)?))/i,/^(?:\s*\] *)/i,/^(?:\s*,\s*)/i,/^(?:(1)|(0(.\d+)?))/i,/^(?: *quadrantChart *)/i,/^(?:[A-Za-z]+)/i,/^(?::)/i,/^(?:\+)/i,/^(?:,)/i,/^(?:=)/i,/^(?:=)/i,/^(?:\*)/i,/^(?:#)/i,/^(?:[\_])/i,/^(?:\.)/i,/^(?:&)/i,/^(?:-)/i,/^(?:[0-9]+)/i,/^(?:\s)/i,/^(?:;)/i,/^(?:[!"#$%&'*+,-.`?\\_/])/i,/^(?:$)/i],conditions:{class_name:{rules:[28],inclusive:!1},point_y:{rules:[33],inclusive:!1},point_x:{rules:[32],inclusive:!1},point_start:{rules:[30,31],inclusive:!1},acc_descr_multiline:{rules:[11,12],inclusive:!1},acc_descr:{rules:[9],inclusive:!1},acc_title:{rules:[7],inclusive:!1},title:{rules:[5],inclusive:!1},md_string:{rules:[22,23],inclusive:!1},string:{rules:[25,26],inclusive:!1},INITIAL:{rules:[0,1,2,3,4,6,8,10,13,14,15,16,17,18,19,20,21,24,27,29,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51],inclusive:!0}}};return Te}();ne.lexer=ye;function U(){this.yy={}}return o(U,"Parser"),U.prototype=ne,ne.Parser=U,new U}();nO.parser=nO;Fhe=nO});var os,fE,Ghe=M(()=>{"use strict";mr();hs();ht();Ub();os=sp(),fE=class{constructor(){this.classes=new Map;this.config=this.getDefaultConfig(),this.themeConfig=this.getDefaultThemeConfig(),this.data=this.getDefaultData()}static{o(this,"QuadrantBuilder")}getDefaultData(){return{titleText:"",quadrant1Text:"",quadrant2Text:"",quadrant3Text:"",quadrant4Text:"",xAxisLeftText:"",xAxisRightText:"",yAxisBottomText:"",yAxisTopText:"",points:[]}}getDefaultConfig(){return{showXAxis:!0,showYAxis:!0,showTitle:!0,chartHeight:ur.quadrantChart?.chartWidth||500,chartWidth:ur.quadrantChart?.chartHeight||500,titlePadding:ur.quadrantChart?.titlePadding||10,titleFontSize:ur.quadrantChart?.titleFontSize||20,quadrantPadding:ur.quadrantChart?.quadrantPadding||5,xAxisLabelPadding:ur.quadrantChart?.xAxisLabelPadding||5,yAxisLabelPadding:ur.quadrantChart?.yAxisLabelPadding||5,xAxisLabelFontSize:ur.quadrantChart?.xAxisLabelFontSize||16,yAxisLabelFontSize:ur.quadrantChart?.yAxisLabelFontSize||16,quadrantLabelFontSize:ur.quadrantChart?.quadrantLabelFontSize||16,quadrantTextTopPadding:ur.quadrantChart?.quadrantTextTopPadding||5,pointTextPadding:ur.quadrantChart?.pointTextPadding||5,pointLabelFontSize:ur.quadrantChart?.pointLabelFontSize||12,pointRadius:ur.quadrantChart?.pointRadius||5,xAxisPosition:ur.quadrantChart?.xAxisPosition||"top",yAxisPosition:ur.quadrantChart?.yAxisPosition||"left",quadrantInternalBorderStrokeWidth:ur.quadrantChart?.quadrantInternalBorderStrokeWidth||1,quadrantExternalBorderStrokeWidth:ur.quadrantChart?.quadrantExternalBorderStrokeWidth||2}}getDefaultThemeConfig(){return{quadrant1Fill:os.quadrant1Fill,quadrant2Fill:os.quadrant2Fill,quadrant3Fill:os.quadrant3Fill,quadrant4Fill:os.quadrant4Fill,quadrant1TextFill:os.quadrant1TextFill,quadrant2TextFill:os.quadrant2TextFill,quadrant3TextFill:os.quadrant3TextFill,quadrant4TextFill:os.quadrant4TextFill,quadrantPointFill:os.quadrantPointFill,quadrantPointTextFill:os.quadrantPointTextFill,quadrantXAxisTextFill:os.quadrantXAxisTextFill,quadrantYAxisTextFill:os.quadrantYAxisTextFill,quadrantTitleFill:os.quadrantTitleFill,quadrantInternalBorderStrokeFill:os.quadrantInternalBorderStrokeFill,quadrantExternalBorderStrokeFill:os.quadrantExternalBorderStrokeFill}}clear(){this.config=this.getDefaultConfig(),this.themeConfig=this.getDefaultThemeConfig(),this.data=this.getDefaultData(),this.classes=new Map,Y.info("clear called")}setData(e){this.data={...this.data,...e}}addPoints(e){this.data.points=[...e,...this.data.points]}addClass(e,r){this.classes.set(e,r)}setConfig(e){Y.trace("setConfig called with: ",e),this.config={...this.config,...e}}setThemeConfig(e){Y.trace("setThemeConfig called with: ",e),this.themeConfig={...this.themeConfig,...e}}calculateSpace(e,r,n,i){let a=this.config.xAxisLabelPadding*2+this.config.xAxisLabelFontSize,s={top:e==="top"&&r?a:0,bottom:e==="bottom"&&r?a:0},l=this.config.yAxisLabelPadding*2+this.config.yAxisLabelFontSize,u={left:this.config.yAxisPosition==="left"&&n?l:0,right:this.config.yAxisPosition==="right"&&n?l:0},h=this.config.titleFontSize+this.config.titlePadding*2,f={top:i?h:0},d=this.config.quadrantPadding+u.left,p=this.config.quadrantPadding+s.top+f.top,m=this.config.chartWidth-this.config.quadrantPadding*2-u.left-u.right,g=this.config.chartHeight-this.config.quadrantPadding*2-s.top-s.bottom-f.top,y=m/2,v=g/2;return{xAxisSpace:s,yAxisSpace:u,titleSpace:f,quadrantSpace:{quadrantLeft:d,quadrantTop:p,quadrantWidth:m,quadrantHalfWidth:y,quadrantHeight:g,quadrantHalfHeight:v}}}getAxisLabels(e,r,n,i){let{quadrantSpace:a,titleSpace:s}=i,{quadrantHalfHeight:l,quadrantHeight:u,quadrantLeft:h,quadrantHalfWidth:f,quadrantTop:d,quadrantWidth:p}=a,m=!!this.data.xAxisRightText,g=!!this.data.yAxisTopText,y=[];return this.data.xAxisLeftText&&r&&y.push({text:this.data.xAxisLeftText,fill:this.themeConfig.quadrantXAxisTextFill,x:h+(m?f/2:0),y:e==="top"?this.config.xAxisLabelPadding+s.top:this.config.xAxisLabelPadding+d+u+this.config.quadrantPadding,fontSize:this.config.xAxisLabelFontSize,verticalPos:m?"center":"left",horizontalPos:"top",rotation:0}),this.data.xAxisRightText&&r&&y.push({text:this.data.xAxisRightText,fill:this.themeConfig.quadrantXAxisTextFill,x:h+f+(m?f/2:0),y:e==="top"?this.config.xAxisLabelPadding+s.top:this.config.xAxisLabelPadding+d+u+this.config.quadrantPadding,fontSize:this.config.xAxisLabelFontSize,verticalPos:m?"center":"left",horizontalPos:"top",rotation:0}),this.data.yAxisBottomText&&n&&y.push({text:this.data.yAxisBottomText,fill:this.themeConfig.quadrantYAxisTextFill,x:this.config.yAxisPosition==="left"?this.config.yAxisLabelPadding:this.config.yAxisLabelPadding+h+p+this.config.quadrantPadding,y:d+u-(g?l/2:0),fontSize:this.config.yAxisLabelFontSize,verticalPos:g?"center":"left",horizontalPos:"top",rotation:-90}),this.data.yAxisTopText&&n&&y.push({text:this.data.yAxisTopText,fill:this.themeConfig.quadrantYAxisTextFill,x:this.config.yAxisPosition==="left"?this.config.yAxisLabelPadding:this.config.yAxisLabelPadding+h+p+this.config.quadrantPadding,y:d+l-(g?l/2:0),fontSize:this.config.yAxisLabelFontSize,verticalPos:g?"center":"left",horizontalPos:"top",rotation:-90}),y}getQuadrants(e){let{quadrantSpace:r}=e,{quadrantHalfHeight:n,quadrantLeft:i,quadrantHalfWidth:a,quadrantTop:s}=r,l=[{text:{text:this.data.quadrant1Text,fill:this.themeConfig.quadrant1TextFill,x:0,y:0,fontSize:this.config.quadrantLabelFontSize,verticalPos:"center",horizontalPos:"middle",rotation:0},x:i+a,y:s,width:a,height:n,fill:this.themeConfig.quadrant1Fill},{text:{text:this.data.quadrant2Text,fill:this.themeConfig.quadrant2TextFill,x:0,y:0,fontSize:this.config.quadrantLabelFontSize,verticalPos:"center",horizontalPos:"middle",rotation:0},x:i,y:s,width:a,height:n,fill:this.themeConfig.quadrant2Fill},{text:{text:this.data.quadrant3Text,fill:this.themeConfig.quadrant3TextFill,x:0,y:0,fontSize:this.config.quadrantLabelFontSize,verticalPos:"center",horizontalPos:"middle",rotation:0},x:i,y:s+n,width:a,height:n,fill:this.themeConfig.quadrant3Fill},{text:{text:this.data.quadrant4Text,fill:this.themeConfig.quadrant4TextFill,x:0,y:0,fontSize:this.config.quadrantLabelFontSize,verticalPos:"center",horizontalPos:"middle",rotation:0},x:i+a,y:s+n,width:a,height:n,fill:this.themeConfig.quadrant4Fill}];for(let u of l)u.text.x=u.x+u.width/2,this.data.points.length===0?(u.text.y=u.y+u.height/2,u.text.horizontalPos="middle"):(u.text.y=u.y+this.config.quadrantTextTopPadding,u.text.horizontalPos="top");return l}getQuadrantPoints(e){let{quadrantSpace:r}=e,{quadrantHeight:n,quadrantLeft:i,quadrantTop:a,quadrantWidth:s}=r,l=bl().domain([0,1]).range([i,s+i]),u=bl().domain([0,1]).range([n+a,a]);return this.data.points.map(f=>{let d=this.classes.get(f.className);return d&&(f={...d,...f}),{x:l(f.x),y:u(f.y),fill:f.color??this.themeConfig.quadrantPointFill,radius:f.radius??this.config.pointRadius,text:{text:f.text,fill:this.themeConfig.quadrantPointTextFill,x:l(f.x),y:u(f.y)+this.config.pointTextPadding,verticalPos:"center",horizontalPos:"top",fontSize:this.config.pointLabelFontSize,rotation:0},strokeColor:f.strokeColor??this.themeConfig.quadrantPointFill,strokeWidth:f.strokeWidth??"0px"}})}getBorders(e){let r=this.config.quadrantExternalBorderStrokeWidth/2,{quadrantSpace:n}=e,{quadrantHalfHeight:i,quadrantHeight:a,quadrantLeft:s,quadrantHalfWidth:l,quadrantTop:u,quadrantWidth:h}=n;return[{strokeFill:this.themeConfig.quadrantExternalBorderStrokeFill,strokeWidth:this.config.quadrantExternalBorderStrokeWidth,x1:s-r,y1:u,x2:s+h+r,y2:u},{strokeFill:this.themeConfig.quadrantExternalBorderStrokeFill,strokeWidth:this.config.quadrantExternalBorderStrokeWidth,x1:s+h,y1:u+r,x2:s+h,y2:u+a-r},{strokeFill:this.themeConfig.quadrantExternalBorderStrokeFill,strokeWidth:this.config.quadrantExternalBorderStrokeWidth,x1:s-r,y1:u+a,x2:s+h+r,y2:u+a},{strokeFill:this.themeConfig.quadrantExternalBorderStrokeFill,strokeWidth:this.config.quadrantExternalBorderStrokeWidth,x1:s,y1:u+r,x2:s,y2:u+a-r},{strokeFill:this.themeConfig.quadrantInternalBorderStrokeFill,strokeWidth:this.config.quadrantInternalBorderStrokeWidth,x1:s+l,y1:u+r,x2:s+l,y2:u+a-r},{strokeFill:this.themeConfig.quadrantInternalBorderStrokeFill,strokeWidth:this.config.quadrantInternalBorderStrokeWidth,x1:s+r,y1:u+i,x2:s+h-r,y2:u+i}]}getTitle(e){if(e)return{text:this.data.titleText,fill:this.themeConfig.quadrantTitleFill,fontSize:this.config.titleFontSize,horizontalPos:"top",verticalPos:"center",rotation:0,y:this.config.titlePadding,x:this.config.chartWidth/2}}build(){let e=this.config.showXAxis&&!!(this.data.xAxisLeftText||this.data.xAxisRightText),r=this.config.showYAxis&&!!(this.data.yAxisTopText||this.data.yAxisBottomText),n=this.config.showTitle&&!!this.data.titleText,i=this.data.points.length>0?"bottom":this.config.xAxisPosition,a=this.calculateSpace(i,e,r,n);return{points:this.getQuadrantPoints(a),quadrants:this.getQuadrants(a),axisLabels:this.getAxisLabels(i,e,r,a),borderLines:this.getBorders(a),title:this.getTitle(n)}}}});function iO(t){return!/^#?([\dA-Fa-f]{6}|[\dA-Fa-f]{3})$/.test(t)}function $he(t){return!/^\d+$/.test(t)}function Vhe(t){return!/^\d+px$/.test(t)}var T0,Uhe=M(()=>{"use strict";T0=class extends Error{static{o(this,"InvalidStyleError")}constructor(e,r,n){super(`value for ${e} ${r} is invalid, please use a valid ${n}`),this.name="InvalidStyleError"}};o(iO,"validateHexCode");o($he,"validateNumber");o(Vhe,"validateSizeInPixels")});function Wu(t){return Tr(t.trim(),RVe)}function MVe(t){ya.setData({quadrant1Text:Wu(t.text)})}function IVe(t){ya.setData({quadrant2Text:Wu(t.text)})}function OVe(t){ya.setData({quadrant3Text:Wu(t.text)})}function PVe(t){ya.setData({quadrant4Text:Wu(t.text)})}function BVe(t){ya.setData({xAxisLeftText:Wu(t.text)})}function FVe(t){ya.setData({xAxisRightText:Wu(t.text)})}function zVe(t){ya.setData({yAxisTopText:Wu(t.text)})}function GVe(t){ya.setData({yAxisBottomText:Wu(t.text)})}function aO(t){let e={};for(let r of t){let[n,i]=r.trim().split(/\s*:\s*/);if(n==="radius"){if($he(i))throw new T0(n,i,"number");e.radius=parseInt(i)}else if(n==="color"){if(iO(i))throw new T0(n,i,"hex code");e.color=i}else if(n==="stroke-color"){if(iO(i))throw new T0(n,i,"hex code");e.strokeColor=i}else if(n==="stroke-width"){if(Vhe(i))throw new T0(n,i,"number of pixels (eg. 10px)");e.strokeWidth=i}else throw new Error(`style named ${n} is not supported.`)}return e}function $Ve(t,e,r,n,i){let a=aO(i);ya.addPoints([{x:r,y:n,text:Wu(t.text),className:e,...a}])}function VVe(t,e){ya.addClass(t,aO(e))}function UVe(t){ya.setConfig({chartWidth:t})}function HVe(t){ya.setConfig({chartHeight:t})}function WVe(){let t=de(),{themeVariables:e,quadrantChart:r}=t;return r&&ya.setConfig(r),ya.setThemeConfig({quadrant1Fill:e.quadrant1Fill,quadrant2Fill:e.quadrant2Fill,quadrant3Fill:e.quadrant3Fill,quadrant4Fill:e.quadrant4Fill,quadrant1TextFill:e.quadrant1TextFill,quadrant2TextFill:e.quadrant2TextFill,quadrant3TextFill:e.quadrant3TextFill,quadrant4TextFill:e.quadrant4TextFill,quadrantPointFill:e.quadrantPointFill,quadrantPointTextFill:e.quadrantPointTextFill,quadrantXAxisTextFill:e.quadrantXAxisTextFill,quadrantYAxisTextFill:e.quadrantYAxisTextFill,quadrantExternalBorderStrokeFill:e.quadrantExternalBorderStrokeFill,quadrantInternalBorderStrokeFill:e.quadrantInternalBorderStrokeFill,quadrantTitleFill:e.quadrantTitleFill}),ya.setData({titleText:Jr()}),ya.build()}var RVe,ya,YVe,Hhe,Whe=M(()=>{"use strict";Vt();fr();ki();Ghe();Uhe();RVe=de();o(Wu,"textSanitizer");ya=new fE;o(MVe,"setQuadrant1Text");o(IVe,"setQuadrant2Text");o(OVe,"setQuadrant3Text");o(PVe,"setQuadrant4Text");o(BVe,"setXAxisLeftText");o(FVe,"setXAxisRightText");o(zVe,"setYAxisTopText");o(GVe,"setYAxisBottomText");o(aO,"parseStyles");o($Ve,"addPoint");o(VVe,"addClass");o(UVe,"setWidth");o(HVe,"setHeight");o(WVe,"getQuadrantData");YVe=o(function(){ya.clear(),_r()},"clear"),Hhe={setWidth:UVe,setHeight:HVe,setQuadrant1Text:MVe,setQuadrant2Text:IVe,setQuadrant3Text:OVe,setQuadrant4Text:PVe,setXAxisLeftText:BVe,setXAxisRightText:FVe,setYAxisTopText:zVe,setYAxisBottomText:GVe,parseStyles:aO,addPoint:$Ve,addClass:VVe,getQuadrantData:WVe,clear:YVe,setAccTitle:Rr,getAccTitle:Pr,setDiagramTitle:ln,getDiagramTitle:Jr,getAccDescription:Fr,setAccDescription:Br}});var qVe,Yhe,qhe=M(()=>{"use strict";mr();Vt();ht();ni();qVe=o((t,e,r,n)=>{function i(C){return C==="top"?"hanging":"middle"}o(i,"getDominantBaseLine");function a(C){return C==="left"?"start":"middle"}o(a,"getTextAnchor");function s(C){return`translate(${C.x}, ${C.y}) rotate(${C.rotation||0})`}o(s,"getTransformation");let l=de();Y.debug(`Rendering quadrant chart +`+t);let u=l.securityLevel,h;u==="sandbox"&&(h=ze("#i"+e));let d=(u==="sandbox"?ze(h.nodes()[0].contentDocument.body):ze("body")).select(`[id="${e}"]`),p=d.append("g").attr("class","main"),m=l.quadrantChart?.chartWidth??500,g=l.quadrantChart?.chartHeight??500;Zr(d,g,m,l.quadrantChart?.useMaxWidth??!0),d.attr("viewBox","0 0 "+m+" "+g),n.db.setHeight(g),n.db.setWidth(m);let y=n.db.getQuadrantData(),v=p.append("g").attr("class","quadrants"),x=p.append("g").attr("class","border"),b=p.append("g").attr("class","data-points"),w=p.append("g").attr("class","labels"),_=p.append("g").attr("class","title");y.title&&_.append("text").attr("x",0).attr("y",0).attr("fill",y.title.fill).attr("font-size",y.title.fontSize).attr("dominant-baseline",i(y.title.horizontalPos)).attr("text-anchor",a(y.title.verticalPos)).attr("transform",s(y.title)).text(y.title.text),y.borderLines&&x.selectAll("line").data(y.borderLines).enter().append("line").attr("x1",C=>C.x1).attr("y1",C=>C.y1).attr("x2",C=>C.x2).attr("y2",C=>C.y2).style("stroke",C=>C.strokeFill).style("stroke-width",C=>C.strokeWidth);let T=v.selectAll("g.quadrant").data(y.quadrants).enter().append("g").attr("class","quadrant");T.append("rect").attr("x",C=>C.x).attr("y",C=>C.y).attr("width",C=>C.width).attr("height",C=>C.height).attr("fill",C=>C.fill),T.append("text").attr("x",0).attr("y",0).attr("fill",C=>C.text.fill).attr("font-size",C=>C.text.fontSize).attr("dominant-baseline",C=>i(C.text.horizontalPos)).attr("text-anchor",C=>a(C.text.verticalPos)).attr("transform",C=>s(C.text)).text(C=>C.text.text),w.selectAll("g.label").data(y.axisLabels).enter().append("g").attr("class","label").append("text").attr("x",0).attr("y",0).text(C=>C.text).attr("fill",C=>C.fill).attr("font-size",C=>C.fontSize).attr("dominant-baseline",C=>i(C.horizontalPos)).attr("text-anchor",C=>a(C.verticalPos)).attr("transform",C=>s(C));let L=b.selectAll("g.data-point").data(y.points).enter().append("g").attr("class","data-point");L.append("circle").attr("cx",C=>C.x).attr("cy",C=>C.y).attr("r",C=>C.radius).attr("fill",C=>C.fill).attr("stroke",C=>C.strokeColor).attr("stroke-width",C=>C.strokeWidth),L.append("text").attr("x",0).attr("y",0).text(C=>C.text.text).attr("fill",C=>C.text.fill).attr("font-size",C=>C.text.fontSize).attr("dominant-baseline",C=>i(C.text.horizontalPos)).attr("text-anchor",C=>a(C.text.verticalPos)).attr("transform",C=>s(C.text))},"draw"),Yhe={draw:qVe}});var Xhe={};vr(Xhe,{diagram:()=>XVe});var XVe,jhe=M(()=>{"use strict";zhe();Whe();qhe();XVe={parser:Fhe,db:Hhe,renderer:Yhe,styles:o(()=>"","styles")}});var sO,Zhe,Jhe=M(()=>{"use strict";sO=function(){var t=o(function(O,N,P,F){for(P=P||{},F=O.length;F--;P[O[F]]=N);return P},"o"),e=[1,10,12,14,16,18,19,21,23],r=[2,6],n=[1,3],i=[1,5],a=[1,6],s=[1,7],l=[1,5,10,12,14,16,18,19,21,23,34,35,36],u=[1,25],h=[1,26],f=[1,28],d=[1,29],p=[1,30],m=[1,31],g=[1,32],y=[1,33],v=[1,34],x=[1,35],b=[1,36],w=[1,37],_=[1,43],T=[1,42],E=[1,47],L=[1,50],C=[1,10,12,14,16,18,19,21,23,34,35,36],A=[1,10,12,14,16,18,19,21,23,24,26,27,28,34,35,36],I=[1,10,12,14,16,18,19,21,23,24,26,27,28,34,35,36,41,42,43,44,45,46,47,48,49,50],D=[1,64],k={trace:o(function(){},"trace"),yy:{},symbols_:{error:2,start:3,eol:4,XYCHART:5,chartConfig:6,document:7,CHART_ORIENTATION:8,statement:9,title:10,text:11,X_AXIS:12,parseXAxis:13,Y_AXIS:14,parseYAxis:15,LINE:16,plotData:17,BAR:18,acc_title:19,acc_title_value:20,acc_descr:21,acc_descr_value:22,acc_descr_multiline_value:23,SQUARE_BRACES_START:24,commaSeparatedNumbers:25,SQUARE_BRACES_END:26,NUMBER_WITH_DECIMAL:27,COMMA:28,xAxisData:29,bandData:30,ARROW_DELIMITER:31,commaSeparatedTexts:32,yAxisData:33,NEWLINE:34,SEMI:35,EOF:36,alphaNum:37,STR:38,MD_STR:39,alphaNumToken:40,AMP:41,NUM:42,ALPHA:43,PLUS:44,EQUALS:45,MULT:46,DOT:47,BRKT:48,MINUS:49,UNDERSCORE:50,$accept:0,$end:1},terminals_:{2:"error",5:"XYCHART",8:"CHART_ORIENTATION",10:"title",12:"X_AXIS",14:"Y_AXIS",16:"LINE",18:"BAR",19:"acc_title",20:"acc_title_value",21:"acc_descr",22:"acc_descr_value",23:"acc_descr_multiline_value",24:"SQUARE_BRACES_START",26:"SQUARE_BRACES_END",27:"NUMBER_WITH_DECIMAL",28:"COMMA",31:"ARROW_DELIMITER",34:"NEWLINE",35:"SEMI",36:"EOF",38:"STR",39:"MD_STR",41:"AMP",42:"NUM",43:"ALPHA",44:"PLUS",45:"EQUALS",46:"MULT",47:"DOT",48:"BRKT",49:"MINUS",50:"UNDERSCORE"},productions_:[0,[3,2],[3,3],[3,2],[3,1],[6,1],[7,0],[7,2],[9,2],[9,2],[9,2],[9,2],[9,2],[9,3],[9,2],[9,3],[9,2],[9,2],[9,1],[17,3],[25,3],[25,1],[13,1],[13,2],[13,1],[29,1],[29,3],[30,3],[32,3],[32,1],[15,1],[15,2],[15,1],[33,3],[4,1],[4,1],[4,1],[11,1],[11,1],[11,1],[37,1],[37,2],[40,1],[40,1],[40,1],[40,1],[40,1],[40,1],[40,1],[40,1],[40,1],[40,1]],performAction:o(function(N,P,F,B,$,z,W){var j=z.length-1;switch($){case 5:B.setOrientation(z[j]);break;case 9:B.setDiagramTitle(z[j].text.trim());break;case 12:B.setLineData({text:"",type:"text"},z[j]);break;case 13:B.setLineData(z[j-1],z[j]);break;case 14:B.setBarData({text:"",type:"text"},z[j]);break;case 15:B.setBarData(z[j-1],z[j]);break;case 16:this.$=z[j].trim(),B.setAccTitle(this.$);break;case 17:case 18:this.$=z[j].trim(),B.setAccDescription(this.$);break;case 19:this.$=z[j-1];break;case 20:this.$=[Number(z[j-2]),...z[j]];break;case 21:this.$=[Number(z[j])];break;case 22:B.setXAxisTitle(z[j]);break;case 23:B.setXAxisTitle(z[j-1]);break;case 24:B.setXAxisTitle({type:"text",text:""});break;case 25:B.setXAxisBand(z[j]);break;case 26:B.setXAxisRangeData(Number(z[j-2]),Number(z[j]));break;case 27:this.$=z[j-1];break;case 28:this.$=[z[j-2],...z[j]];break;case 29:this.$=[z[j]];break;case 30:B.setYAxisTitle(z[j]);break;case 31:B.setYAxisTitle(z[j-1]);break;case 32:B.setYAxisTitle({type:"text",text:""});break;case 33:B.setYAxisRangeData(Number(z[j-2]),Number(z[j]));break;case 37:this.$={text:z[j],type:"text"};break;case 38:this.$={text:z[j],type:"text"};break;case 39:this.$={text:z[j],type:"markdown"};break;case 40:this.$=z[j];break;case 41:this.$=z[j-1]+""+z[j];break}},"anonymous"),table:[t(e,r,{3:1,4:2,7:4,5:n,34:i,35:a,36:s}),{1:[3]},t(e,r,{4:2,7:4,3:8,5:n,34:i,35:a,36:s}),t(e,r,{4:2,7:4,6:9,3:10,5:n,8:[1,11],34:i,35:a,36:s}),{1:[2,4],9:12,10:[1,13],12:[1,14],14:[1,15],16:[1,16],18:[1,17],19:[1,18],21:[1,19],23:[1,20]},t(l,[2,34]),t(l,[2,35]),t(l,[2,36]),{1:[2,1]},t(e,r,{4:2,7:4,3:21,5:n,34:i,35:a,36:s}),{1:[2,3]},t(l,[2,5]),t(e,[2,7],{4:22,34:i,35:a,36:s}),{11:23,37:24,38:u,39:h,40:27,41:f,42:d,43:p,44:m,45:g,46:y,47:v,48:x,49:b,50:w},{11:39,13:38,24:_,27:T,29:40,30:41,37:24,38:u,39:h,40:27,41:f,42:d,43:p,44:m,45:g,46:y,47:v,48:x,49:b,50:w},{11:45,15:44,27:E,33:46,37:24,38:u,39:h,40:27,41:f,42:d,43:p,44:m,45:g,46:y,47:v,48:x,49:b,50:w},{11:49,17:48,24:L,37:24,38:u,39:h,40:27,41:f,42:d,43:p,44:m,45:g,46:y,47:v,48:x,49:b,50:w},{11:52,17:51,24:L,37:24,38:u,39:h,40:27,41:f,42:d,43:p,44:m,45:g,46:y,47:v,48:x,49:b,50:w},{20:[1,53]},{22:[1,54]},t(C,[2,18]),{1:[2,2]},t(C,[2,8]),t(C,[2,9]),t(A,[2,37],{40:55,41:f,42:d,43:p,44:m,45:g,46:y,47:v,48:x,49:b,50:w}),t(A,[2,38]),t(A,[2,39]),t(I,[2,40]),t(I,[2,42]),t(I,[2,43]),t(I,[2,44]),t(I,[2,45]),t(I,[2,46]),t(I,[2,47]),t(I,[2,48]),t(I,[2,49]),t(I,[2,50]),t(I,[2,51]),t(C,[2,10]),t(C,[2,22],{30:41,29:56,24:_,27:T}),t(C,[2,24]),t(C,[2,25]),{31:[1,57]},{11:59,32:58,37:24,38:u,39:h,40:27,41:f,42:d,43:p,44:m,45:g,46:y,47:v,48:x,49:b,50:w},t(C,[2,11]),t(C,[2,30],{33:60,27:E}),t(C,[2,32]),{31:[1,61]},t(C,[2,12]),{17:62,24:L},{25:63,27:D},t(C,[2,14]),{17:65,24:L},t(C,[2,16]),t(C,[2,17]),t(I,[2,41]),t(C,[2,23]),{27:[1,66]},{26:[1,67]},{26:[2,29],28:[1,68]},t(C,[2,31]),{27:[1,69]},t(C,[2,13]),{26:[1,70]},{26:[2,21],28:[1,71]},t(C,[2,15]),t(C,[2,26]),t(C,[2,27]),{11:59,32:72,37:24,38:u,39:h,40:27,41:f,42:d,43:p,44:m,45:g,46:y,47:v,48:x,49:b,50:w},t(C,[2,33]),t(C,[2,19]),{25:73,27:D},{26:[2,28]},{26:[2,20]}],defaultActions:{8:[2,1],10:[2,3],21:[2,2],72:[2,28],73:[2,20]},parseError:o(function(N,P){if(P.recoverable)this.trace(N);else{var F=new Error(N);throw F.hash=P,F}},"parseError"),parse:o(function(N){var P=this,F=[0],B=[],$=[null],z=[],W=this.table,j="",K=0,ie=0,Q=0,ee=2,J=1,H=z.slice.call(arguments,1),q=Object.create(this.lexer),Z={yy:{}};for(var ae in this.yy)Object.prototype.hasOwnProperty.call(this.yy,ae)&&(Z.yy[ae]=this.yy[ae]);q.setInput(N,Z.yy),Z.yy.lexer=q,Z.yy.parser=this,typeof q.yylloc>"u"&&(q.yylloc={});var ue=q.yylloc;z.push(ue);var ce=q.options&&q.options.ranges;typeof Z.yy.parseError=="function"?this.parseError=Z.yy.parseError:this.parseError=Object.getPrototypeOf(this).parseError;function te(ne){F.length=F.length-2*ne,$.length=$.length-ne,z.length=z.length-ne}o(te,"popStack");function De(){var ne;return ne=B.pop()||q.lex()||J,typeof ne!="number"&&(ne instanceof Array&&(B=ne,ne=B.pop()),ne=P.symbols_[ne]||ne),ne}o(De,"lex");for(var oe,ke,Fe,Be,Ve,Ge,He={},xe,X,fe,he;;){if(Fe=F[F.length-1],this.defaultActions[Fe]?Be=this.defaultActions[Fe]:((oe===null||typeof oe>"u")&&(oe=De()),Be=W[Fe]&&W[Fe][oe]),typeof Be>"u"||!Be.length||!Be[0]){var ge="";he=[];for(xe in W[Fe])this.terminals_[xe]&&xe>ee&&he.push("'"+this.terminals_[xe]+"'");q.showPosition?ge="Parse error on line "+(K+1)+`: +`+q.showPosition()+` +Expecting `+he.join(", ")+", got '"+(this.terminals_[oe]||oe)+"'":ge="Parse error on line "+(K+1)+": Unexpected "+(oe==J?"end of input":"'"+(this.terminals_[oe]||oe)+"'"),this.parseError(ge,{text:q.match,token:this.terminals_[oe]||oe,line:q.yylineno,loc:ue,expected:he})}if(Be[0]instanceof Array&&Be.length>1)throw new Error("Parse Error: multiple actions possible at state: "+Fe+", token: "+oe);switch(Be[0]){case 1:F.push(oe),$.push(q.yytext),z.push(q.yylloc),F.push(Be[1]),oe=null,ke?(oe=ke,ke=null):(ie=q.yyleng,j=q.yytext,K=q.yylineno,ue=q.yylloc,Q>0&&Q--);break;case 2:if(X=this.productions_[Be[1]][1],He.$=$[$.length-X],He._$={first_line:z[z.length-(X||1)].first_line,last_line:z[z.length-1].last_line,first_column:z[z.length-(X||1)].first_column,last_column:z[z.length-1].last_column},ce&&(He._$.range=[z[z.length-(X||1)].range[0],z[z.length-1].range[1]]),Ge=this.performAction.apply(He,[j,ie,K,Z.yy,Be[1],$,z].concat(H)),typeof Ge<"u")return Ge;X&&(F=F.slice(0,-1*X*2),$=$.slice(0,-1*X),z=z.slice(0,-1*X)),F.push(this.productions_[Be[1]][0]),$.push(He.$),z.push(He._$),fe=W[F[F.length-2]][F[F.length-1]],F.push(fe);break;case 3:return!0}}return!0},"parse")},R=function(){var O={EOF:1,parseError:o(function(P,F){if(this.yy.parser)this.yy.parser.parseError(P,F);else throw new Error(P)},"parseError"),setInput:o(function(N,P){return this.yy=P||this.yy||{},this._input=N,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},"setInput"),input:o(function(){var N=this._input[0];this.yytext+=N,this.yyleng++,this.offset++,this.match+=N,this.matched+=N;var P=N.match(/(?:\r\n?|\n).*/g);return P?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),N},"input"),unput:o(function(N){var P=N.length,F=N.split(/(?:\r\n?|\n)/g);this._input=N+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-P),this.offset-=P;var B=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),F.length-1&&(this.yylineno-=F.length-1);var $=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:F?(F.length===B.length?this.yylloc.first_column:0)+B[B.length-F.length].length-F[0].length:this.yylloc.first_column-P},this.options.ranges&&(this.yylloc.range=[$[0],$[0]+this.yyleng-P]),this.yyleng=this.yytext.length,this},"unput"),more:o(function(){return this._more=!0,this},"more"),reject:o(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError("Lexical error on line "+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true). +`+this.showPosition(),{text:"",token:null,line:this.yylineno});return this},"reject"),less:o(function(N){this.unput(this.match.slice(N))},"less"),pastInput:o(function(){var N=this.matched.substr(0,this.matched.length-this.match.length);return(N.length>20?"...":"")+N.substr(-20).replace(/\n/g,"")},"pastInput"),upcomingInput:o(function(){var N=this.match;return N.length<20&&(N+=this._input.substr(0,20-N.length)),(N.substr(0,20)+(N.length>20?"...":"")).replace(/\n/g,"")},"upcomingInput"),showPosition:o(function(){var N=this.pastInput(),P=new Array(N.length+1).join("-");return N+this.upcomingInput()+` +`+P+"^"},"showPosition"),test_match:o(function(N,P){var F,B,$;if(this.options.backtrack_lexer&&($={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&($.yylloc.range=this.yylloc.range.slice(0))),B=N[0].match(/(?:\r\n?|\n).*/g),B&&(this.yylineno+=B.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:B?B[B.length-1].length-B[B.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+N[0].length},this.yytext+=N[0],this.match+=N[0],this.matches=N,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(N[0].length),this.matched+=N[0],F=this.performAction.call(this,this.yy,this,P,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),F)return F;if(this._backtrack){for(var z in $)this[z]=$[z];return!1}return!1},"test_match"),next:o(function(){if(this.done)return this.EOF;this._input||(this.done=!0);var N,P,F,B;this._more||(this.yytext="",this.match="");for(var $=this._currentRules(),z=0;z<$.length;z++)if(F=this._input.match(this.rules[$[z]]),F&&(!P||F[0].length>P[0].length)){if(P=F,B=z,this.options.backtrack_lexer){if(N=this.test_match(F,$[z]),N!==!1)return N;if(this._backtrack){P=!1;continue}else return!1}else if(!this.options.flex)break}return P?(N=this.test_match(P,$[B]),N!==!1?N:!1):this._input===""?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+`. Unrecognized text. +`+this.showPosition(),{text:"",token:null,line:this.yylineno})},"next"),lex:o(function(){var P=this.next();return P||this.lex()},"lex"),begin:o(function(P){this.conditionStack.push(P)},"begin"),popState:o(function(){var P=this.conditionStack.length-1;return P>0?this.conditionStack.pop():this.conditionStack[0]},"popState"),_currentRules:o(function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},"_currentRules"),topState:o(function(P){return P=this.conditionStack.length-1-Math.abs(P||0),P>=0?this.conditionStack[P]:"INITIAL"},"topState"),pushState:o(function(P){this.begin(P)},"pushState"),stateStackSize:o(function(){return this.conditionStack.length},"stateStackSize"),options:{"case-insensitive":!0},performAction:o(function(P,F,B,$){var z=$;switch(B){case 0:break;case 1:break;case 2:return this.popState(),34;break;case 3:return this.popState(),34;break;case 4:return 34;case 5:break;case 6:return 10;case 7:return this.pushState("acc_title"),19;break;case 8:return this.popState(),"acc_title_value";break;case 9:return this.pushState("acc_descr"),21;break;case 10:return this.popState(),"acc_descr_value";break;case 11:this.pushState("acc_descr_multiline");break;case 12:this.popState();break;case 13:return"acc_descr_multiline_value";case 14:return 5;case 15:return 8;case 16:return this.pushState("axis_data"),"X_AXIS";break;case 17:return this.pushState("axis_data"),"Y_AXIS";break;case 18:return this.pushState("axis_band_data"),24;break;case 19:return 31;case 20:return this.pushState("data"),16;break;case 21:return this.pushState("data"),18;break;case 22:return this.pushState("data_inner"),24;break;case 23:return 27;case 24:return this.popState(),26;break;case 25:this.popState();break;case 26:this.pushState("string");break;case 27:this.popState();break;case 28:return"STR";case 29:return 24;case 30:return 26;case 31:return 43;case 32:return"COLON";case 33:return 44;case 34:return 28;case 35:return 45;case 36:return 46;case 37:return 48;case 38:return 50;case 39:return 47;case 40:return 41;case 41:return 49;case 42:return 42;case 43:break;case 44:return 35;case 45:return 36}},"anonymous"),rules:[/^(?:%%(?!\{)[^\n]*)/i,/^(?:[^\}]%%[^\n]*)/i,/^(?:(\r?\n))/i,/^(?:(\r?\n))/i,/^(?:[\n\r]+)/i,/^(?:%%[^\n]*)/i,/^(?:title\b)/i,/^(?:accTitle\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*\{\s*)/i,/^(?:\{)/i,/^(?:[^\}]*)/i,/^(?:xychart-beta\b)/i,/^(?:(?:vertical|horizontal))/i,/^(?:x-axis\b)/i,/^(?:y-axis\b)/i,/^(?:\[)/i,/^(?:-->)/i,/^(?:line\b)/i,/^(?:bar\b)/i,/^(?:\[)/i,/^(?:[+-]?(?:\d+(?:\.\d+)?|\.\d+))/i,/^(?:\])/i,/^(?:(?:`\) \{ this\.pushState\(md_string\); \}\n<md_string>\(\?:\(\?!`"\)\.\)\+ \{ return MD_STR; \}\n<md_string>\(\?:`))/i,/^(?:["])/i,/^(?:["])/i,/^(?:[^"]*)/i,/^(?:\[)/i,/^(?:\])/i,/^(?:[A-Za-z]+)/i,/^(?::)/i,/^(?:\+)/i,/^(?:,)/i,/^(?:=)/i,/^(?:\*)/i,/^(?:#)/i,/^(?:[\_])/i,/^(?:\.)/i,/^(?:&)/i,/^(?:-)/i,/^(?:[0-9]+)/i,/^(?:\s+)/i,/^(?:;)/i,/^(?:$)/i],conditions:{data_inner:{rules:[0,1,4,5,6,7,9,11,14,15,16,17,20,21,23,24,25,26,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45],inclusive:!0},data:{rules:[0,1,3,4,5,6,7,9,11,14,15,16,17,20,21,22,25,26,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45],inclusive:!0},axis_band_data:{rules:[0,1,4,5,6,7,9,11,14,15,16,17,20,21,24,25,26,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45],inclusive:!0},axis_data:{rules:[0,1,2,4,5,6,7,9,11,14,15,16,17,18,19,20,21,23,25,26,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45],inclusive:!0},acc_descr_multiline:{rules:[12,13],inclusive:!1},acc_descr:{rules:[10],inclusive:!1},acc_title:{rules:[8],inclusive:!1},title:{rules:[],inclusive:!1},md_string:{rules:[],inclusive:!1},string:{rules:[27,28],inclusive:!1},INITIAL:{rules:[0,1,4,5,6,7,9,11,14,15,16,17,20,21,25,26,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45],inclusive:!0}}};return O}();k.lexer=R;function S(){this.yy={}}return o(S,"Parser"),S.prototype=k,k.Parser=S,new S}();sO.parser=sO;Zhe=sO});function oO(t){return t.type==="bar"}function dE(t){return t.type==="band"}function Ig(t){return t.type==="linear"}var pE=M(()=>{"use strict";o(oO,"isBarPlot");o(dE,"isBandAxisData");o(Ig,"isLinearAxisData")});var Og,lO=M(()=>{"use strict";Dl();Og=class{constructor(e){this.parentGroup=e}static{o(this,"TextDimensionCalculatorWithFont")}getMaxDimension(e,r){if(!this.parentGroup)return{width:e.reduce((a,s)=>Math.max(s.length,a),0)*r,height:r};let n={width:0,height:0},i=this.parentGroup.append("g").attr("visibility","hidden").attr("font-size",r);for(let a of e){let s=gj(i,1,a),l=s?s.width:a.length*r,u=s?s.height:r;n.width=Math.max(n.width,l),n.height=Math.max(n.height,u)}return i.remove(),n}}});var Pg,cO=M(()=>{"use strict";Pg=class{constructor(e,r,n,i){this.axisConfig=e;this.title=r;this.textDimensionCalculator=n;this.axisThemeConfig=i;this.boundingRect={x:0,y:0,width:0,height:0};this.axisPosition="left";this.showTitle=!1;this.showLabel=!1;this.showTick=!1;this.showAxisLine=!1;this.outerPadding=0;this.titleTextHeight=0;this.labelTextHeight=0;this.range=[0,10],this.boundingRect={x:0,y:0,width:0,height:0},this.axisPosition="left"}static{o(this,"BaseAxis")}setRange(e){this.range=e,this.axisPosition==="left"||this.axisPosition==="right"?this.boundingRect.height=e[1]-e[0]:this.boundingRect.width=e[1]-e[0],this.recalculateScale()}getRange(){return[this.range[0]+this.outerPadding,this.range[1]-this.outerPadding]}setAxisPosition(e){this.axisPosition=e,this.setRange(this.range)}getTickDistance(){let e=this.getRange();return Math.abs(e[0]-e[1])/this.getTickValues().length}getAxisOuterPadding(){return this.outerPadding}getLabelDimension(){return this.textDimensionCalculator.getMaxDimension(this.getTickValues().map(e=>e.toString()),this.axisConfig.labelFontSize)}recalculateOuterPaddingToDrawBar(){.7*this.getTickDistance()>this.outerPadding*2&&(this.outerPadding=Math.floor(.7*this.getTickDistance()/2)),this.recalculateScale()}calculateSpaceIfDrawnHorizontally(e){let r=e.height;if(this.axisConfig.showAxisLine&&r>this.axisConfig.axisLineWidth&&(r-=this.axisConfig.axisLineWidth,this.showAxisLine=!0),this.axisConfig.showLabel){let n=this.getLabelDimension(),i=.2*e.width;this.outerPadding=Math.min(n.width/2,i);let a=n.height+this.axisConfig.labelPadding*2;this.labelTextHeight=n.height,a<=r&&(r-=a,this.showLabel=!0)}if(this.axisConfig.showTick&&r>=this.axisConfig.tickLength&&(this.showTick=!0,r-=this.axisConfig.tickLength),this.axisConfig.showTitle&&this.title){let n=this.textDimensionCalculator.getMaxDimension([this.title],this.axisConfig.titleFontSize),i=n.height+this.axisConfig.titlePadding*2;this.titleTextHeight=n.height,i<=r&&(r-=i,this.showTitle=!0)}this.boundingRect.width=e.width,this.boundingRect.height=e.height-r}calculateSpaceIfDrawnVertical(e){let r=e.width;if(this.axisConfig.showAxisLine&&r>this.axisConfig.axisLineWidth&&(r-=this.axisConfig.axisLineWidth,this.showAxisLine=!0),this.axisConfig.showLabel){let n=this.getLabelDimension(),i=.2*e.height;this.outerPadding=Math.min(n.height/2,i);let a=n.width+this.axisConfig.labelPadding*2;a<=r&&(r-=a,this.showLabel=!0)}if(this.axisConfig.showTick&&r>=this.axisConfig.tickLength&&(this.showTick=!0,r-=this.axisConfig.tickLength),this.axisConfig.showTitle&&this.title){let n=this.textDimensionCalculator.getMaxDimension([this.title],this.axisConfig.titleFontSize),i=n.height+this.axisConfig.titlePadding*2;this.titleTextHeight=n.height,i<=r&&(r-=i,this.showTitle=!0)}this.boundingRect.width=e.width-r,this.boundingRect.height=e.height}calculateSpace(e){return this.axisPosition==="left"||this.axisPosition==="right"?this.calculateSpaceIfDrawnVertical(e):this.calculateSpaceIfDrawnHorizontally(e),this.recalculateScale(),{width:this.boundingRect.width,height:this.boundingRect.height}}setBoundingBoxXY(e){this.boundingRect.x=e.x,this.boundingRect.y=e.y}getDrawableElementsForLeftAxis(){let e=[];if(this.showAxisLine){let r=this.boundingRect.x+this.boundingRect.width-this.axisConfig.axisLineWidth/2;e.push({type:"path",groupTexts:["left-axis","axisl-line"],data:[{path:`M ${r},${this.boundingRect.y} L ${r},${this.boundingRect.y+this.boundingRect.height} `,strokeFill:this.axisThemeConfig.axisLineColor,strokeWidth:this.axisConfig.axisLineWidth}]})}if(this.showLabel&&e.push({type:"text",groupTexts:["left-axis","label"],data:this.getTickValues().map(r=>({text:r.toString(),x:this.boundingRect.x+this.boundingRect.width-(this.showLabel?this.axisConfig.labelPadding:0)-(this.showTick?this.axisConfig.tickLength:0)-(this.showAxisLine?this.axisConfig.axisLineWidth:0),y:this.getScaleValue(r),fill:this.axisThemeConfig.labelColor,fontSize:this.axisConfig.labelFontSize,rotation:0,verticalPos:"middle",horizontalPos:"right"}))}),this.showTick){let r=this.boundingRect.x+this.boundingRect.width-(this.showAxisLine?this.axisConfig.axisLineWidth:0);e.push({type:"path",groupTexts:["left-axis","ticks"],data:this.getTickValues().map(n=>({path:`M ${r},${this.getScaleValue(n)} L ${r-this.axisConfig.tickLength},${this.getScaleValue(n)}`,strokeFill:this.axisThemeConfig.tickColor,strokeWidth:this.axisConfig.tickWidth}))})}return this.showTitle&&e.push({type:"text",groupTexts:["left-axis","title"],data:[{text:this.title,x:this.boundingRect.x+this.axisConfig.titlePadding,y:this.boundingRect.y+this.boundingRect.height/2,fill:this.axisThemeConfig.titleColor,fontSize:this.axisConfig.titleFontSize,rotation:270,verticalPos:"top",horizontalPos:"center"}]}),e}getDrawableElementsForBottomAxis(){let e=[];if(this.showAxisLine){let r=this.boundingRect.y+this.axisConfig.axisLineWidth/2;e.push({type:"path",groupTexts:["bottom-axis","axis-line"],data:[{path:`M ${this.boundingRect.x},${r} L ${this.boundingRect.x+this.boundingRect.width},${r}`,strokeFill:this.axisThemeConfig.axisLineColor,strokeWidth:this.axisConfig.axisLineWidth}]})}if(this.showLabel&&e.push({type:"text",groupTexts:["bottom-axis","label"],data:this.getTickValues().map(r=>({text:r.toString(),x:this.getScaleValue(r),y:this.boundingRect.y+this.axisConfig.labelPadding+(this.showTick?this.axisConfig.tickLength:0)+(this.showAxisLine?this.axisConfig.axisLineWidth:0),fill:this.axisThemeConfig.labelColor,fontSize:this.axisConfig.labelFontSize,rotation:0,verticalPos:"top",horizontalPos:"center"}))}),this.showTick){let r=this.boundingRect.y+(this.showAxisLine?this.axisConfig.axisLineWidth:0);e.push({type:"path",groupTexts:["bottom-axis","ticks"],data:this.getTickValues().map(n=>({path:`M ${this.getScaleValue(n)},${r} L ${this.getScaleValue(n)},${r+this.axisConfig.tickLength}`,strokeFill:this.axisThemeConfig.tickColor,strokeWidth:this.axisConfig.tickWidth}))})}return this.showTitle&&e.push({type:"text",groupTexts:["bottom-axis","title"],data:[{text:this.title,x:this.range[0]+(this.range[1]-this.range[0])/2,y:this.boundingRect.y+this.boundingRect.height-this.axisConfig.titlePadding-this.titleTextHeight,fill:this.axisThemeConfig.titleColor,fontSize:this.axisConfig.titleFontSize,rotation:0,verticalPos:"top",horizontalPos:"center"}]}),e}getDrawableElementsForTopAxis(){let e=[];if(this.showAxisLine){let r=this.boundingRect.y+this.boundingRect.height-this.axisConfig.axisLineWidth/2;e.push({type:"path",groupTexts:["top-axis","axis-line"],data:[{path:`M ${this.boundingRect.x},${r} L ${this.boundingRect.x+this.boundingRect.width},${r}`,strokeFill:this.axisThemeConfig.axisLineColor,strokeWidth:this.axisConfig.axisLineWidth}]})}if(this.showLabel&&e.push({type:"text",groupTexts:["top-axis","label"],data:this.getTickValues().map(r=>({text:r.toString(),x:this.getScaleValue(r),y:this.boundingRect.y+(this.showTitle?this.titleTextHeight+this.axisConfig.titlePadding*2:0)+this.axisConfig.labelPadding,fill:this.axisThemeConfig.labelColor,fontSize:this.axisConfig.labelFontSize,rotation:0,verticalPos:"top",horizontalPos:"center"}))}),this.showTick){let r=this.boundingRect.y;e.push({type:"path",groupTexts:["top-axis","ticks"],data:this.getTickValues().map(n=>({path:`M ${this.getScaleValue(n)},${r+this.boundingRect.height-(this.showAxisLine?this.axisConfig.axisLineWidth:0)} L ${this.getScaleValue(n)},${r+this.boundingRect.height-this.axisConfig.tickLength-(this.showAxisLine?this.axisConfig.axisLineWidth:0)}`,strokeFill:this.axisThemeConfig.tickColor,strokeWidth:this.axisConfig.tickWidth}))})}return this.showTitle&&e.push({type:"text",groupTexts:["top-axis","title"],data:[{text:this.title,x:this.boundingRect.x+this.boundingRect.width/2,y:this.boundingRect.y+this.axisConfig.titlePadding,fill:this.axisThemeConfig.titleColor,fontSize:this.axisConfig.titleFontSize,rotation:0,verticalPos:"top",horizontalPos:"center"}]}),e}getDrawableElements(){if(this.axisPosition==="left")return this.getDrawableElementsForLeftAxis();if(this.axisPosition==="right")throw Error("Drawing of right axis is not implemented");return this.axisPosition==="bottom"?this.getDrawableElementsForBottomAxis():this.axisPosition==="top"?this.getDrawableElementsForTopAxis():[]}}});var mE,efe=M(()=>{"use strict";mr();ht();cO();mE=class extends Pg{static{o(this,"BandAxis")}constructor(e,r,n,i,a){super(e,i,a,r),this.categories=n,this.scale=Lp().domain(this.categories).range(this.getRange())}setRange(e){super.setRange(e)}recalculateScale(){this.scale=Lp().domain(this.categories).range(this.getRange()).paddingInner(1).paddingOuter(0).align(.5),Y.trace("BandAxis axis final categories, range: ",this.categories,this.getRange())}getTickValues(){return this.categories}getScaleValue(e){return this.scale(e)??this.getRange()[0]}}});var gE,tfe=M(()=>{"use strict";mr();cO();gE=class extends Pg{static{o(this,"LinearAxis")}constructor(e,r,n,i,a){super(e,i,a,r),this.domain=n,this.scale=bl().domain(this.domain).range(this.getRange())}getTickValues(){return this.scale.ticks()}recalculateScale(){let e=[...this.domain];this.axisPosition==="left"&&e.reverse(),this.scale=bl().domain(e).range(this.getRange())}getScaleValue(e){return this.scale(e)}}});function uO(t,e,r,n){let i=new Og(n);return dE(t)?new mE(e,r,t.categories,t.title,i):new gE(e,r,[t.min,t.max],t.title,i)}var rfe=M(()=>{"use strict";pE();lO();efe();tfe();o(uO,"getAxis")});function nfe(t,e,r,n){let i=new Og(n);return new hO(i,t,e,r)}var hO,ife=M(()=>{"use strict";lO();hO=class{constructor(e,r,n,i){this.textDimensionCalculator=e;this.chartConfig=r;this.chartData=n;this.chartThemeConfig=i;this.boundingRect={x:0,y:0,width:0,height:0},this.showChartTitle=!1}static{o(this,"ChartTitle")}setBoundingBoxXY(e){this.boundingRect.x=e.x,this.boundingRect.y=e.y}calculateSpace(e){let r=this.textDimensionCalculator.getMaxDimension([this.chartData.title],this.chartConfig.titleFontSize),n=Math.max(r.width,e.width),i=r.height+2*this.chartConfig.titlePadding;return r.width<=n&&r.height<=i&&this.chartConfig.showTitle&&this.chartData.title&&(this.boundingRect.width=n,this.boundingRect.height=i,this.showChartTitle=!0),{width:this.boundingRect.width,height:this.boundingRect.height}}getDrawableElements(){let e=[];return this.showChartTitle&&e.push({groupTexts:["chart-title"],type:"text",data:[{fontSize:this.chartConfig.titleFontSize,text:this.chartData.title,verticalPos:"middle",horizontalPos:"center",x:this.boundingRect.x+this.boundingRect.width/2,y:this.boundingRect.y+this.boundingRect.height/2,fill:this.chartThemeConfig.titleColor,rotation:0}]}),e}};o(nfe,"getChartTitleComponent")});var yE,afe=M(()=>{"use strict";mr();yE=class{constructor(e,r,n,i,a){this.plotData=e;this.xAxis=r;this.yAxis=n;this.orientation=i;this.plotIndex=a}static{o(this,"LinePlot")}getDrawableElement(){let e=this.plotData.data.map(n=>[this.xAxis.getScaleValue(n[0]),this.yAxis.getScaleValue(n[1])]),r;return this.orientation==="horizontal"?r=Ka().y(n=>n[0]).x(n=>n[1])(e):r=Ka().x(n=>n[0]).y(n=>n[1])(e),r?[{groupTexts:["plot",`line-plot-${this.plotIndex}`],type:"path",data:[{path:r,strokeFill:this.plotData.strokeFill,strokeWidth:this.plotData.strokeWidth}]}]:[]}}});var vE,sfe=M(()=>{"use strict";vE=class{constructor(e,r,n,i,a,s){this.barData=e;this.boundingRect=r;this.xAxis=n;this.yAxis=i;this.orientation=a;this.plotIndex=s}static{o(this,"BarPlot")}getDrawableElement(){let e=this.barData.data.map(a=>[this.xAxis.getScaleValue(a[0]),this.yAxis.getScaleValue(a[1])]),n=Math.min(this.xAxis.getAxisOuterPadding()*2,this.xAxis.getTickDistance())*(1-.05),i=n/2;return this.orientation==="horizontal"?[{groupTexts:["plot",`bar-plot-${this.plotIndex}`],type:"rect",data:e.map(a=>({x:this.boundingRect.x,y:a[0]-i,height:n,width:a[1]-this.boundingRect.x,fill:this.barData.fill,strokeWidth:0,strokeFill:this.barData.fill}))}]:[{groupTexts:["plot",`bar-plot-${this.plotIndex}`],type:"rect",data:e.map(a=>({x:a[0]-i,y:a[1],width:n,height:this.boundingRect.y+this.boundingRect.height-a[1],fill:this.barData.fill,strokeWidth:0,strokeFill:this.barData.fill}))}]}}});function ofe(t,e,r){return new fO(t,e,r)}var fO,lfe=M(()=>{"use strict";afe();sfe();fO=class{constructor(e,r,n){this.chartConfig=e;this.chartData=r;this.chartThemeConfig=n;this.boundingRect={x:0,y:0,width:0,height:0}}static{o(this,"BasePlot")}setAxes(e,r){this.xAxis=e,this.yAxis=r}setBoundingBoxXY(e){this.boundingRect.x=e.x,this.boundingRect.y=e.y}calculateSpace(e){return this.boundingRect.width=e.width,this.boundingRect.height=e.height,{width:this.boundingRect.width,height:this.boundingRect.height}}getDrawableElements(){if(!(this.xAxis&&this.yAxis))throw Error("Axes must be passed to render Plots");let e=[];for(let[r,n]of this.chartData.plots.entries())switch(n.type){case"line":{let i=new yE(n,this.xAxis,this.yAxis,this.chartConfig.chartOrientation,r);e.push(...i.getDrawableElement())}break;case"bar":{let i=new vE(n,this.boundingRect,this.xAxis,this.yAxis,this.chartConfig.chartOrientation,r);e.push(...i.getDrawableElement())}break}return e}};o(ofe,"getPlotComponent")});var xE,cfe=M(()=>{"use strict";rfe();ife();lfe();pE();xE=class{constructor(e,r,n,i){this.chartConfig=e;this.chartData=r;this.componentStore={title:nfe(e,r,n,i),plot:ofe(e,r,n),xAxis:uO(r.xAxis,e.xAxis,{titleColor:n.xAxisTitleColor,labelColor:n.xAxisLabelColor,tickColor:n.xAxisTickColor,axisLineColor:n.xAxisLineColor},i),yAxis:uO(r.yAxis,e.yAxis,{titleColor:n.yAxisTitleColor,labelColor:n.yAxisLabelColor,tickColor:n.yAxisTickColor,axisLineColor:n.yAxisLineColor},i)}}static{o(this,"Orchestrator")}calculateVerticalSpace(){let e=this.chartConfig.width,r=this.chartConfig.height,n=0,i=0,a=Math.floor(e*this.chartConfig.plotReservedSpacePercent/100),s=Math.floor(r*this.chartConfig.plotReservedSpacePercent/100),l=this.componentStore.plot.calculateSpace({width:a,height:s});e-=l.width,r-=l.height,l=this.componentStore.title.calculateSpace({width:this.chartConfig.width,height:r}),i=l.height,r-=l.height,this.componentStore.xAxis.setAxisPosition("bottom"),l=this.componentStore.xAxis.calculateSpace({width:e,height:r}),r-=l.height,this.componentStore.yAxis.setAxisPosition("left"),l=this.componentStore.yAxis.calculateSpace({width:e,height:r}),n=l.width,e-=l.width,e>0&&(a+=e,e=0),r>0&&(s+=r,r=0),this.componentStore.plot.calculateSpace({width:a,height:s}),this.componentStore.plot.setBoundingBoxXY({x:n,y:i}),this.componentStore.xAxis.setRange([n,n+a]),this.componentStore.xAxis.setBoundingBoxXY({x:n,y:i+s}),this.componentStore.yAxis.setRange([i,i+s]),this.componentStore.yAxis.setBoundingBoxXY({x:0,y:i}),this.chartData.plots.some(u=>oO(u))&&this.componentStore.xAxis.recalculateOuterPaddingToDrawBar()}calculateHorizontalSpace(){let e=this.chartConfig.width,r=this.chartConfig.height,n=0,i=0,a=0,s=Math.floor(e*this.chartConfig.plotReservedSpacePercent/100),l=Math.floor(r*this.chartConfig.plotReservedSpacePercent/100),u=this.componentStore.plot.calculateSpace({width:s,height:l});e-=u.width,r-=u.height,u=this.componentStore.title.calculateSpace({width:this.chartConfig.width,height:r}),n=u.height,r-=u.height,this.componentStore.xAxis.setAxisPosition("left"),u=this.componentStore.xAxis.calculateSpace({width:e,height:r}),e-=u.width,i=u.width,this.componentStore.yAxis.setAxisPosition("top"),u=this.componentStore.yAxis.calculateSpace({width:e,height:r}),r-=u.height,a=n+u.height,e>0&&(s+=e,e=0),r>0&&(l+=r,r=0),this.componentStore.plot.calculateSpace({width:s,height:l}),this.componentStore.plot.setBoundingBoxXY({x:i,y:a}),this.componentStore.yAxis.setRange([i,i+s]),this.componentStore.yAxis.setBoundingBoxXY({x:i,y:n}),this.componentStore.xAxis.setRange([a,a+l]),this.componentStore.xAxis.setBoundingBoxXY({x:0,y:a}),this.chartData.plots.some(h=>oO(h))&&this.componentStore.xAxis.recalculateOuterPaddingToDrawBar()}calculateSpace(){this.chartConfig.chartOrientation==="horizontal"?this.calculateHorizontalSpace():this.calculateVerticalSpace()}getDrawableElement(){this.calculateSpace();let e=[];this.componentStore.plot.setAxes(this.componentStore.xAxis,this.componentStore.yAxis);for(let r of Object.values(this.componentStore))e.push(...r.getDrawableElements());return e}}});var bE,ufe=M(()=>{"use strict";cfe();bE=class{static{o(this,"XYChartBuilder")}static build(e,r,n,i){return new xE(e,r,n,i).getDrawableElement()}}});function ffe(){let t=sp(),e=Sr();return ws(t.xyChart,e.themeVariables.xyChart)}function dfe(){let t=Sr();return ws(ur.xyChart,t.xyChart)}function pfe(){return{yAxis:{type:"linear",title:"",min:1/0,max:-1/0},xAxis:{type:"band",title:"",categories:[]},title:"",plots:[]}}function mO(t){let e=Sr();return Tr(t.trim(),e)}function ZVe(t){hfe=t}function JVe(t){t==="horizontal"?mx.chartOrientation="horizontal":mx.chartOrientation="vertical"}function eUe(t){un.xAxis.title=mO(t.text)}function mfe(t,e){un.xAxis={type:"linear",title:un.xAxis.title,min:t,max:e},wE=!0}function tUe(t){un.xAxis={type:"band",title:un.xAxis.title,categories:t.map(e=>mO(e.text))},wE=!0}function rUe(t){un.yAxis.title=mO(t.text)}function nUe(t,e){un.yAxis={type:"linear",title:un.yAxis.title,min:t,max:e},pO=!0}function iUe(t){let e=Math.min(...t),r=Math.max(...t),n=Ig(un.yAxis)?un.yAxis.min:1/0,i=Ig(un.yAxis)?un.yAxis.max:-1/0;un.yAxis={type:"linear",title:un.yAxis.title,min:Math.min(n,e),max:Math.max(i,r)}}function gfe(t){let e=[];if(t.length===0)return e;if(!wE){let r=Ig(un.xAxis)?un.xAxis.min:1/0,n=Ig(un.xAxis)?un.xAxis.max:-1/0;mfe(Math.min(r,1),Math.max(n,t.length))}if(pO||iUe(t),dE(un.xAxis)&&(e=un.xAxis.categories.map((r,n)=>[r,t[n]])),Ig(un.xAxis)){let r=un.xAxis.min,n=un.xAxis.max,i=(n-r)/(t.length-1),a=[];for(let s=r;s<=n;s+=i)a.push(`${s}`);e=a.map((s,l)=>[s,t[l]])}return e}function yfe(t){return dO[t===0?0:t%dO.length]}function aUe(t,e){let r=gfe(e);un.plots.push({type:"line",strokeFill:yfe(px),strokeWidth:2,data:r}),px++}function sUe(t,e){let r=gfe(e);un.plots.push({type:"bar",fill:yfe(px),data:r}),px++}function oUe(){if(un.plots.length===0)throw Error("No Plot to render, please provide a plot with some data");return un.title=Jr(),bE.build(mx,un,gx,hfe)}function lUe(){return gx}function cUe(){return mx}var px,hfe,mx,gx,un,dO,wE,pO,uUe,vfe,xfe=M(()=>{"use strict";Ua();hs();Ub();hr();fr();ki();ufe();pE();px=0,mx=dfe(),gx=ffe(),un=pfe(),dO=gx.plotColorPalette.split(",").map(t=>t.trim()),wE=!1,pO=!1;o(ffe,"getChartDefaultThemeConfig");o(dfe,"getChartDefaultConfig");o(pfe,"getChartDefaultData");o(mO,"textSanitizer");o(ZVe,"setTmpSVGG");o(JVe,"setOrientation");o(eUe,"setXAxisTitle");o(mfe,"setXAxisRangeData");o(tUe,"setXAxisBand");o(rUe,"setYAxisTitle");o(nUe,"setYAxisRangeData");o(iUe,"setYAxisRangeFromPlotData");o(gfe,"transformDataWithoutCategory");o(yfe,"getPlotColorFromPalette");o(aUe,"setLineData");o(sUe,"setBarData");o(oUe,"getDrawableElem");o(lUe,"getChartThemeConfig");o(cUe,"getChartConfig");uUe=o(function(){_r(),px=0,mx=dfe(),un=pfe(),gx=ffe(),dO=gx.plotColorPalette.split(",").map(t=>t.trim()),wE=!1,pO=!1},"clear"),vfe={getDrawableElem:oUe,clear:uUe,setAccTitle:Rr,getAccTitle:Pr,setDiagramTitle:ln,getDiagramTitle:Jr,getAccDescription:Fr,setAccDescription:Br,setOrientation:JVe,setXAxisTitle:eUe,setXAxisRangeData:mfe,setXAxisBand:tUe,setYAxisTitle:rUe,setYAxisRangeData:nUe,setLineData:aUe,setBarData:sUe,setTmpSVGG:ZVe,getChartThemeConfig:lUe,getChartConfig:cUe}});var hUe,bfe,wfe=M(()=>{"use strict";ht();Hu();ni();hUe=o((t,e,r,n)=>{let i=n.db,a=i.getChartThemeConfig(),s=i.getChartConfig();function l(v){return v==="top"?"text-before-edge":"middle"}o(l,"getDominantBaseLine");function u(v){return v==="left"?"start":v==="right"?"end":"middle"}o(u,"getTextAnchor");function h(v){return`translate(${v.x}, ${v.y}) rotate(${v.rotation||0})`}o(h,"getTextTransformation"),Y.debug(`Rendering xychart chart +`+t);let f=Oa(e),d=f.append("g").attr("class","main"),p=d.append("rect").attr("width",s.width).attr("height",s.height).attr("class","background");Zr(f,s.height,s.width,!0),f.attr("viewBox",`0 0 ${s.width} ${s.height}`),p.attr("fill",a.backgroundColor),i.setTmpSVGG(f.append("g").attr("class","mermaid-tmp-group"));let m=i.getDrawableElem(),g={};function y(v){let x=d,b="";for(let[w]of v.entries()){let _=d;w>0&&g[b]&&(_=g[b]),b+=v[w],x=g[b],x||(x=g[b]=_.append("g").attr("class",v[w]))}return x}o(y,"getGroup");for(let v of m){if(v.data.length===0)continue;let x=y(v.groupTexts);switch(v.type){case"rect":x.selectAll("rect").data(v.data).enter().append("rect").attr("x",b=>b.x).attr("y",b=>b.y).attr("width",b=>b.width).attr("height",b=>b.height).attr("fill",b=>b.fill).attr("stroke",b=>b.strokeFill).attr("stroke-width",b=>b.strokeWidth);break;case"text":x.selectAll("text").data(v.data).enter().append("text").attr("x",0).attr("y",0).attr("fill",b=>b.fill).attr("font-size",b=>b.fontSize).attr("dominant-baseline",b=>l(b.verticalPos)).attr("text-anchor",b=>u(b.horizontalPos)).attr("transform",b=>h(b)).text(b=>b.text);break;case"path":x.selectAll("path").data(v.data).enter().append("path").attr("d",b=>b.path).attr("fill",b=>b.fill?b.fill:"none").attr("stroke",b=>b.strokeFill).attr("stroke-width",b=>b.strokeWidth);break}}},"draw"),bfe={draw:hUe}});var Tfe={};vr(Tfe,{diagram:()=>fUe});var fUe,kfe=M(()=>{"use strict";Jhe();xfe();wfe();fUe={parser:Zhe,db:vfe,renderer:bfe}});var gO,Cfe,Afe=M(()=>{"use strict";gO=function(){var t=o(function(ie,Q,ee,J){for(ee=ee||{},J=ie.length;J--;ee[ie[J]]=Q);return ee},"o"),e=[1,3],r=[1,4],n=[1,5],i=[1,6],a=[5,6,8,9,11,13,31,32,33,34,35,36,44,62,63],s=[1,18],l=[2,7],u=[1,22],h=[1,23],f=[1,24],d=[1,25],p=[1,26],m=[1,27],g=[1,20],y=[1,28],v=[1,29],x=[62,63],b=[5,8,9,11,13,31,32,33,34,35,36,44,51,53,62,63],w=[1,47],_=[1,48],T=[1,49],E=[1,50],L=[1,51],C=[1,52],A=[1,53],I=[53,54],D=[1,64],k=[1,60],R=[1,61],S=[1,62],O=[1,63],N=[1,65],P=[1,69],F=[1,70],B=[1,67],$=[1,68],z=[5,8,9,11,13,31,32,33,34,35,36,44,62,63],W={trace:o(function(){},"trace"),yy:{},symbols_:{error:2,start:3,directive:4,NEWLINE:5,RD:6,diagram:7,EOF:8,acc_title:9,acc_title_value:10,acc_descr:11,acc_descr_value:12,acc_descr_multiline_value:13,requirementDef:14,elementDef:15,relationshipDef:16,requirementType:17,requirementName:18,STRUCT_START:19,requirementBody:20,ID:21,COLONSEP:22,id:23,TEXT:24,text:25,RISK:26,riskLevel:27,VERIFYMTHD:28,verifyType:29,STRUCT_STOP:30,REQUIREMENT:31,FUNCTIONAL_REQUIREMENT:32,INTERFACE_REQUIREMENT:33,PERFORMANCE_REQUIREMENT:34,PHYSICAL_REQUIREMENT:35,DESIGN_CONSTRAINT:36,LOW_RISK:37,MED_RISK:38,HIGH_RISK:39,VERIFY_ANALYSIS:40,VERIFY_DEMONSTRATION:41,VERIFY_INSPECTION:42,VERIFY_TEST:43,ELEMENT:44,elementName:45,elementBody:46,TYPE:47,type:48,DOCREF:49,ref:50,END_ARROW_L:51,relationship:52,LINE:53,END_ARROW_R:54,CONTAINS:55,COPIES:56,DERIVES:57,SATISFIES:58,VERIFIES:59,REFINES:60,TRACES:61,unqString:62,qString:63,$accept:0,$end:1},terminals_:{2:"error",5:"NEWLINE",6:"RD",8:"EOF",9:"acc_title",10:"acc_title_value",11:"acc_descr",12:"acc_descr_value",13:"acc_descr_multiline_value",19:"STRUCT_START",21:"ID",22:"COLONSEP",24:"TEXT",26:"RISK",28:"VERIFYMTHD",30:"STRUCT_STOP",31:"REQUIREMENT",32:"FUNCTIONAL_REQUIREMENT",33:"INTERFACE_REQUIREMENT",34:"PERFORMANCE_REQUIREMENT",35:"PHYSICAL_REQUIREMENT",36:"DESIGN_CONSTRAINT",37:"LOW_RISK",38:"MED_RISK",39:"HIGH_RISK",40:"VERIFY_ANALYSIS",41:"VERIFY_DEMONSTRATION",42:"VERIFY_INSPECTION",43:"VERIFY_TEST",44:"ELEMENT",47:"TYPE",49:"DOCREF",51:"END_ARROW_L",53:"LINE",54:"END_ARROW_R",55:"CONTAINS",56:"COPIES",57:"DERIVES",58:"SATISFIES",59:"VERIFIES",60:"REFINES",61:"TRACES",62:"unqString",63:"qString"},productions_:[0,[3,3],[3,2],[3,4],[4,2],[4,2],[4,1],[7,0],[7,2],[7,2],[7,2],[7,2],[7,2],[14,5],[20,5],[20,5],[20,5],[20,5],[20,2],[20,1],[17,1],[17,1],[17,1],[17,1],[17,1],[17,1],[27,1],[27,1],[27,1],[29,1],[29,1],[29,1],[29,1],[15,5],[46,5],[46,5],[46,2],[46,1],[16,5],[16,5],[52,1],[52,1],[52,1],[52,1],[52,1],[52,1],[52,1],[18,1],[18,1],[23,1],[23,1],[25,1],[25,1],[45,1],[45,1],[48,1],[48,1],[50,1],[50,1]],performAction:o(function(Q,ee,J,H,q,Z,ae){var ue=Z.length-1;switch(q){case 4:this.$=Z[ue].trim(),H.setAccTitle(this.$);break;case 5:case 6:this.$=Z[ue].trim(),H.setAccDescription(this.$);break;case 7:this.$=[];break;case 13:H.addRequirement(Z[ue-3],Z[ue-4]);break;case 14:H.setNewReqId(Z[ue-2]);break;case 15:H.setNewReqText(Z[ue-2]);break;case 16:H.setNewReqRisk(Z[ue-2]);break;case 17:H.setNewReqVerifyMethod(Z[ue-2]);break;case 20:this.$=H.RequirementType.REQUIREMENT;break;case 21:this.$=H.RequirementType.FUNCTIONAL_REQUIREMENT;break;case 22:this.$=H.RequirementType.INTERFACE_REQUIREMENT;break;case 23:this.$=H.RequirementType.PERFORMANCE_REQUIREMENT;break;case 24:this.$=H.RequirementType.PHYSICAL_REQUIREMENT;break;case 25:this.$=H.RequirementType.DESIGN_CONSTRAINT;break;case 26:this.$=H.RiskLevel.LOW_RISK;break;case 27:this.$=H.RiskLevel.MED_RISK;break;case 28:this.$=H.RiskLevel.HIGH_RISK;break;case 29:this.$=H.VerifyType.VERIFY_ANALYSIS;break;case 30:this.$=H.VerifyType.VERIFY_DEMONSTRATION;break;case 31:this.$=H.VerifyType.VERIFY_INSPECTION;break;case 32:this.$=H.VerifyType.VERIFY_TEST;break;case 33:H.addElement(Z[ue-3]);break;case 34:H.setNewElementType(Z[ue-2]);break;case 35:H.setNewElementDocRef(Z[ue-2]);break;case 38:H.addRelationship(Z[ue-2],Z[ue],Z[ue-4]);break;case 39:H.addRelationship(Z[ue-2],Z[ue-4],Z[ue]);break;case 40:this.$=H.Relationships.CONTAINS;break;case 41:this.$=H.Relationships.COPIES;break;case 42:this.$=H.Relationships.DERIVES;break;case 43:this.$=H.Relationships.SATISFIES;break;case 44:this.$=H.Relationships.VERIFIES;break;case 45:this.$=H.Relationships.REFINES;break;case 46:this.$=H.Relationships.TRACES;break}},"anonymous"),table:[{3:1,4:2,6:e,9:r,11:n,13:i},{1:[3]},{3:8,4:2,5:[1,7],6:e,9:r,11:n,13:i},{5:[1,9]},{10:[1,10]},{12:[1,11]},t(a,[2,6]),{3:12,4:2,6:e,9:r,11:n,13:i},{1:[2,2]},{4:17,5:s,7:13,8:l,9:r,11:n,13:i,14:14,15:15,16:16,17:19,23:21,31:u,32:h,33:f,34:d,35:p,36:m,44:g,62:y,63:v},t(a,[2,4]),t(a,[2,5]),{1:[2,1]},{8:[1,30]},{4:17,5:s,7:31,8:l,9:r,11:n,13:i,14:14,15:15,16:16,17:19,23:21,31:u,32:h,33:f,34:d,35:p,36:m,44:g,62:y,63:v},{4:17,5:s,7:32,8:l,9:r,11:n,13:i,14:14,15:15,16:16,17:19,23:21,31:u,32:h,33:f,34:d,35:p,36:m,44:g,62:y,63:v},{4:17,5:s,7:33,8:l,9:r,11:n,13:i,14:14,15:15,16:16,17:19,23:21,31:u,32:h,33:f,34:d,35:p,36:m,44:g,62:y,63:v},{4:17,5:s,7:34,8:l,9:r,11:n,13:i,14:14,15:15,16:16,17:19,23:21,31:u,32:h,33:f,34:d,35:p,36:m,44:g,62:y,63:v},{4:17,5:s,7:35,8:l,9:r,11:n,13:i,14:14,15:15,16:16,17:19,23:21,31:u,32:h,33:f,34:d,35:p,36:m,44:g,62:y,63:v},{18:36,62:[1,37],63:[1,38]},{45:39,62:[1,40],63:[1,41]},{51:[1,42],53:[1,43]},t(x,[2,20]),t(x,[2,21]),t(x,[2,22]),t(x,[2,23]),t(x,[2,24]),t(x,[2,25]),t(b,[2,49]),t(b,[2,50]),{1:[2,3]},{8:[2,8]},{8:[2,9]},{8:[2,10]},{8:[2,11]},{8:[2,12]},{19:[1,44]},{19:[2,47]},{19:[2,48]},{19:[1,45]},{19:[2,53]},{19:[2,54]},{52:46,55:w,56:_,57:T,58:E,59:L,60:C,61:A},{52:54,55:w,56:_,57:T,58:E,59:L,60:C,61:A},{5:[1,55]},{5:[1,56]},{53:[1,57]},t(I,[2,40]),t(I,[2,41]),t(I,[2,42]),t(I,[2,43]),t(I,[2,44]),t(I,[2,45]),t(I,[2,46]),{54:[1,58]},{5:D,20:59,21:k,24:R,26:S,28:O,30:N},{5:P,30:F,46:66,47:B,49:$},{23:71,62:y,63:v},{23:72,62:y,63:v},t(z,[2,13]),{22:[1,73]},{22:[1,74]},{22:[1,75]},{22:[1,76]},{5:D,20:77,21:k,24:R,26:S,28:O,30:N},t(z,[2,19]),t(z,[2,33]),{22:[1,78]},{22:[1,79]},{5:P,30:F,46:80,47:B,49:$},t(z,[2,37]),t(z,[2,38]),t(z,[2,39]),{23:81,62:y,63:v},{25:82,62:[1,83],63:[1,84]},{27:85,37:[1,86],38:[1,87],39:[1,88]},{29:89,40:[1,90],41:[1,91],42:[1,92],43:[1,93]},t(z,[2,18]),{48:94,62:[1,95],63:[1,96]},{50:97,62:[1,98],63:[1,99]},t(z,[2,36]),{5:[1,100]},{5:[1,101]},{5:[2,51]},{5:[2,52]},{5:[1,102]},{5:[2,26]},{5:[2,27]},{5:[2,28]},{5:[1,103]},{5:[2,29]},{5:[2,30]},{5:[2,31]},{5:[2,32]},{5:[1,104]},{5:[2,55]},{5:[2,56]},{5:[1,105]},{5:[2,57]},{5:[2,58]},{5:D,20:106,21:k,24:R,26:S,28:O,30:N},{5:D,20:107,21:k,24:R,26:S,28:O,30:N},{5:D,20:108,21:k,24:R,26:S,28:O,30:N},{5:D,20:109,21:k,24:R,26:S,28:O,30:N},{5:P,30:F,46:110,47:B,49:$},{5:P,30:F,46:111,47:B,49:$},t(z,[2,14]),t(z,[2,15]),t(z,[2,16]),t(z,[2,17]),t(z,[2,34]),t(z,[2,35])],defaultActions:{8:[2,2],12:[2,1],30:[2,3],31:[2,8],32:[2,9],33:[2,10],34:[2,11],35:[2,12],37:[2,47],38:[2,48],40:[2,53],41:[2,54],83:[2,51],84:[2,52],86:[2,26],87:[2,27],88:[2,28],90:[2,29],91:[2,30],92:[2,31],93:[2,32],95:[2,55],96:[2,56],98:[2,57],99:[2,58]},parseError:o(function(Q,ee){if(ee.recoverable)this.trace(Q);else{var J=new Error(Q);throw J.hash=ee,J}},"parseError"),parse:o(function(Q){var ee=this,J=[0],H=[],q=[null],Z=[],ae=this.table,ue="",ce=0,te=0,De=0,oe=2,ke=1,Fe=Z.slice.call(arguments,1),Be=Object.create(this.lexer),Ve={yy:{}};for(var Ge in this.yy)Object.prototype.hasOwnProperty.call(this.yy,Ge)&&(Ve.yy[Ge]=this.yy[Ge]);Be.setInput(Q,Ve.yy),Ve.yy.lexer=Be,Ve.yy.parser=this,typeof Be.yylloc>"u"&&(Be.yylloc={});var He=Be.yylloc;Z.push(He);var xe=Be.options&&Be.options.ranges;typeof Ve.yy.parseError=="function"?this.parseError=Ve.yy.parseError:this.parseError=Object.getPrototypeOf(this).parseError;function X(We){J.length=J.length-2*We,q.length=q.length-We,Z.length=Z.length-We}o(X,"popStack");function fe(){var We;return We=H.pop()||Be.lex()||ke,typeof We!="number"&&(We instanceof Array&&(H=We,We=H.pop()),We=ee.symbols_[We]||We),We}o(fe,"lex");for(var he,ge,ne,ye,U,Te,se={},Ee,Ae,Pe,Me;;){if(ne=J[J.length-1],this.defaultActions[ne]?ye=this.defaultActions[ne]:((he===null||typeof he>"u")&&(he=fe()),ye=ae[ne]&&ae[ne][he]),typeof ye>"u"||!ye.length||!ye[0]){var me="";Me=[];for(Ee in ae[ne])this.terminals_[Ee]&&Ee>oe&&Me.push("'"+this.terminals_[Ee]+"'");Be.showPosition?me="Parse error on line "+(ce+1)+`: +`+Be.showPosition()+` +Expecting `+Me.join(", ")+", got '"+(this.terminals_[he]||he)+"'":me="Parse error on line "+(ce+1)+": Unexpected "+(he==ke?"end of input":"'"+(this.terminals_[he]||he)+"'"),this.parseError(me,{text:Be.match,token:this.terminals_[he]||he,line:Be.yylineno,loc:He,expected:Me})}if(ye[0]instanceof Array&&ye.length>1)throw new Error("Parse Error: multiple actions possible at state: "+ne+", token: "+he);switch(ye[0]){case 1:J.push(he),q.push(Be.yytext),Z.push(Be.yylloc),J.push(ye[1]),he=null,ge?(he=ge,ge=null):(te=Be.yyleng,ue=Be.yytext,ce=Be.yylineno,He=Be.yylloc,De>0&&De--);break;case 2:if(Ae=this.productions_[ye[1]][1],se.$=q[q.length-Ae],se._$={first_line:Z[Z.length-(Ae||1)].first_line,last_line:Z[Z.length-1].last_line,first_column:Z[Z.length-(Ae||1)].first_column,last_column:Z[Z.length-1].last_column},xe&&(se._$.range=[Z[Z.length-(Ae||1)].range[0],Z[Z.length-1].range[1]]),Te=this.performAction.apply(se,[ue,te,ce,Ve.yy,ye[1],q,Z].concat(Fe)),typeof Te<"u")return Te;Ae&&(J=J.slice(0,-1*Ae*2),q=q.slice(0,-1*Ae),Z=Z.slice(0,-1*Ae)),J.push(this.productions_[ye[1]][0]),q.push(se.$),Z.push(se._$),Pe=ae[J[J.length-2]][J[J.length-1]],J.push(Pe);break;case 3:return!0}}return!0},"parse")},j=function(){var ie={EOF:1,parseError:o(function(ee,J){if(this.yy.parser)this.yy.parser.parseError(ee,J);else throw new Error(ee)},"parseError"),setInput:o(function(Q,ee){return this.yy=ee||this.yy||{},this._input=Q,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},"setInput"),input:o(function(){var Q=this._input[0];this.yytext+=Q,this.yyleng++,this.offset++,this.match+=Q,this.matched+=Q;var ee=Q.match(/(?:\r\n?|\n).*/g);return ee?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),Q},"input"),unput:o(function(Q){var ee=Q.length,J=Q.split(/(?:\r\n?|\n)/g);this._input=Q+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-ee),this.offset-=ee;var H=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),J.length-1&&(this.yylineno-=J.length-1);var q=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:J?(J.length===H.length?this.yylloc.first_column:0)+H[H.length-J.length].length-J[0].length:this.yylloc.first_column-ee},this.options.ranges&&(this.yylloc.range=[q[0],q[0]+this.yyleng-ee]),this.yyleng=this.yytext.length,this},"unput"),more:o(function(){return this._more=!0,this},"more"),reject:o(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError("Lexical error on line "+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true). +`+this.showPosition(),{text:"",token:null,line:this.yylineno});return this},"reject"),less:o(function(Q){this.unput(this.match.slice(Q))},"less"),pastInput:o(function(){var Q=this.matched.substr(0,this.matched.length-this.match.length);return(Q.length>20?"...":"")+Q.substr(-20).replace(/\n/g,"")},"pastInput"),upcomingInput:o(function(){var Q=this.match;return Q.length<20&&(Q+=this._input.substr(0,20-Q.length)),(Q.substr(0,20)+(Q.length>20?"...":"")).replace(/\n/g,"")},"upcomingInput"),showPosition:o(function(){var Q=this.pastInput(),ee=new Array(Q.length+1).join("-");return Q+this.upcomingInput()+` +`+ee+"^"},"showPosition"),test_match:o(function(Q,ee){var J,H,q;if(this.options.backtrack_lexer&&(q={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(q.yylloc.range=this.yylloc.range.slice(0))),H=Q[0].match(/(?:\r\n?|\n).*/g),H&&(this.yylineno+=H.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:H?H[H.length-1].length-H[H.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+Q[0].length},this.yytext+=Q[0],this.match+=Q[0],this.matches=Q,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(Q[0].length),this.matched+=Q[0],J=this.performAction.call(this,this.yy,this,ee,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),J)return J;if(this._backtrack){for(var Z in q)this[Z]=q[Z];return!1}return!1},"test_match"),next:o(function(){if(this.done)return this.EOF;this._input||(this.done=!0);var Q,ee,J,H;this._more||(this.yytext="",this.match="");for(var q=this._currentRules(),Z=0;Z<q.length;Z++)if(J=this._input.match(this.rules[q[Z]]),J&&(!ee||J[0].length>ee[0].length)){if(ee=J,H=Z,this.options.backtrack_lexer){if(Q=this.test_match(J,q[Z]),Q!==!1)return Q;if(this._backtrack){ee=!1;continue}else return!1}else if(!this.options.flex)break}return ee?(Q=this.test_match(ee,q[H]),Q!==!1?Q:!1):this._input===""?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+`. Unrecognized text. +`+this.showPosition(),{text:"",token:null,line:this.yylineno})},"next"),lex:o(function(){var ee=this.next();return ee||this.lex()},"lex"),begin:o(function(ee){this.conditionStack.push(ee)},"begin"),popState:o(function(){var ee=this.conditionStack.length-1;return ee>0?this.conditionStack.pop():this.conditionStack[0]},"popState"),_currentRules:o(function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},"_currentRules"),topState:o(function(ee){return ee=this.conditionStack.length-1-Math.abs(ee||0),ee>=0?this.conditionStack[ee]:"INITIAL"},"topState"),pushState:o(function(ee){this.begin(ee)},"pushState"),stateStackSize:o(function(){return this.conditionStack.length},"stateStackSize"),options:{"case-insensitive":!0},performAction:o(function(ee,J,H,q){var Z=q;switch(H){case 0:return"title";case 1:return this.begin("acc_title"),9;break;case 2:return this.popState(),"acc_title_value";break;case 3:return this.begin("acc_descr"),11;break;case 4:return this.popState(),"acc_descr_value";break;case 5:this.begin("acc_descr_multiline");break;case 6:this.popState();break;case 7:return"acc_descr_multiline_value";case 8:return 5;case 9:break;case 10:break;case 11:break;case 12:return 8;case 13:return 6;case 14:return 19;case 15:return 30;case 16:return 22;case 17:return 21;case 18:return 24;case 19:return 26;case 20:return 28;case 21:return 31;case 22:return 32;case 23:return 33;case 24:return 34;case 25:return 35;case 26:return 36;case 27:return 37;case 28:return 38;case 29:return 39;case 30:return 40;case 31:return 41;case 32:return 42;case 33:return 43;case 34:return 44;case 35:return 55;case 36:return 56;case 37:return 57;case 38:return 58;case 39:return 59;case 40:return 60;case 41:return 61;case 42:return 47;case 43:return 49;case 44:return 51;case 45:return 54;case 46:return 53;case 47:this.begin("string");break;case 48:this.popState();break;case 49:return"qString";case 50:return J.yytext=J.yytext.trim(),62;break}},"anonymous"),rules:[/^(?:title\s[^#\n;]+)/i,/^(?:accTitle\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*\{\s*)/i,/^(?:[\}])/i,/^(?:[^\}]*)/i,/^(?:(\r?\n)+)/i,/^(?:\s+)/i,/^(?:#[^\n]*)/i,/^(?:%[^\n]*)/i,/^(?:$)/i,/^(?:requirementDiagram\b)/i,/^(?:\{)/i,/^(?:\})/i,/^(?::)/i,/^(?:id\b)/i,/^(?:text\b)/i,/^(?:risk\b)/i,/^(?:verifyMethod\b)/i,/^(?:requirement\b)/i,/^(?:functionalRequirement\b)/i,/^(?:interfaceRequirement\b)/i,/^(?:performanceRequirement\b)/i,/^(?:physicalRequirement\b)/i,/^(?:designConstraint\b)/i,/^(?:low\b)/i,/^(?:medium\b)/i,/^(?:high\b)/i,/^(?:analysis\b)/i,/^(?:demonstration\b)/i,/^(?:inspection\b)/i,/^(?:test\b)/i,/^(?:element\b)/i,/^(?:contains\b)/i,/^(?:copies\b)/i,/^(?:derives\b)/i,/^(?:satisfies\b)/i,/^(?:verifies\b)/i,/^(?:refines\b)/i,/^(?:traces\b)/i,/^(?:type\b)/i,/^(?:docref\b)/i,/^(?:<-)/i,/^(?:->)/i,/^(?:-)/i,/^(?:["])/i,/^(?:["])/i,/^(?:[^"]*)/i,/^(?:[\w][^\r\n\{\<\>\-\=]*)/i],conditions:{acc_descr_multiline:{rules:[6,7],inclusive:!1},acc_descr:{rules:[4],inclusive:!1},acc_title:{rules:[2],inclusive:!1},unqString:{rules:[],inclusive:!1},token:{rules:[],inclusive:!1},string:{rules:[48,49],inclusive:!1},INITIAL:{rules:[0,1,3,5,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,50],inclusive:!0}}};return ie}();W.lexer=j;function K(){this.yy={}}return o(K,"Parser"),K.prototype=W,W.Parser=K,new K}();gO.parser=gO;Cfe=gO});var yO,Fs,yx,df,vx,gUe,yUe,vUe,xUe,bUe,wUe,TUe,kUe,EUe,SUe,CUe,AUe,_Ue,LUe,DUe,NUe,RUe,_fe,Lfe=M(()=>{"use strict";Vt();ht();ki();yO=[],Fs={},yx=new Map,df={},vx=new Map,gUe={REQUIREMENT:"Requirement",FUNCTIONAL_REQUIREMENT:"Functional Requirement",INTERFACE_REQUIREMENT:"Interface Requirement",PERFORMANCE_REQUIREMENT:"Performance Requirement",PHYSICAL_REQUIREMENT:"Physical Requirement",DESIGN_CONSTRAINT:"Design Constraint"},yUe={LOW_RISK:"Low",MED_RISK:"Medium",HIGH_RISK:"High"},vUe={VERIFY_ANALYSIS:"Analysis",VERIFY_DEMONSTRATION:"Demonstration",VERIFY_INSPECTION:"Inspection",VERIFY_TEST:"Test"},xUe={CONTAINS:"contains",COPIES:"copies",DERIVES:"derives",SATISFIES:"satisfies",VERIFIES:"verifies",REFINES:"refines",TRACES:"traces"},bUe=o((t,e)=>(yx.has(t)||yx.set(t,{name:t,type:e,id:Fs.id,text:Fs.text,risk:Fs.risk,verifyMethod:Fs.verifyMethod}),Fs={},yx.get(t)),"addRequirement"),wUe=o(()=>yx,"getRequirements"),TUe=o(t=>{Fs!==void 0&&(Fs.id=t)},"setNewReqId"),kUe=o(t=>{Fs!==void 0&&(Fs.text=t)},"setNewReqText"),EUe=o(t=>{Fs!==void 0&&(Fs.risk=t)},"setNewReqRisk"),SUe=o(t=>{Fs!==void 0&&(Fs.verifyMethod=t)},"setNewReqVerifyMethod"),CUe=o(t=>(vx.has(t)||(vx.set(t,{name:t,type:df.type,docRef:df.docRef}),Y.info("Added new requirement: ",t)),df={},vx.get(t)),"addElement"),AUe=o(()=>vx,"getElements"),_Ue=o(t=>{df!==void 0&&(df.type=t)},"setNewElementType"),LUe=o(t=>{df!==void 0&&(df.docRef=t)},"setNewElementDocRef"),DUe=o((t,e,r)=>{yO.push({type:t,src:e,dst:r})},"addRelationship"),NUe=o(()=>yO,"getRelationships"),RUe=o(()=>{yO=[],Fs={},yx=new Map,df={},vx=new Map,_r()},"clear"),_fe={RequirementType:gUe,RiskLevel:yUe,VerifyType:vUe,Relationships:xUe,getConfig:o(()=>de().req,"getConfig"),addRequirement:bUe,getRequirements:wUe,setNewReqId:TUe,setNewReqText:kUe,setNewReqRisk:EUe,setNewReqVerifyMethod:SUe,setAccTitle:Rr,getAccTitle:Pr,setAccDescription:Br,getAccDescription:Fr,addElement:CUe,getElements:AUe,setNewElementType:_Ue,setNewElementDocRef:LUe,addRelationship:DUe,getRelationships:NUe,clear:RUe}});var MUe,Dfe,Nfe=M(()=>{"use strict";MUe=o(t=>` + + marker { + fill: ${t.relationColor}; + stroke: ${t.relationColor}; + } + + marker.cross { + stroke: ${t.lineColor}; + } + + svg { + font-family: ${t.fontFamily}; + font-size: ${t.fontSize}; + } + + .reqBox { + fill: ${t.requirementBackground}; + fill-opacity: 1.0; + stroke: ${t.requirementBorderColor}; + stroke-width: ${t.requirementBorderSize}; + } + + .reqTitle, .reqLabel{ + fill: ${t.requirementTextColor}; + } + .reqLabelBox { + fill: ${t.relationLabelBackground}; + fill-opacity: 1.0; + } + + .req-title-line { + stroke: ${t.requirementBorderColor}; + stroke-width: ${t.requirementBorderSize}; + } + .relationshipLine { + stroke: ${t.relationColor}; + stroke-width: 1; + } + .relationshipLabel { + fill: ${t.relationLabelColor}; + } + +`,"getStyles"),Dfe=MUe});var vO,IUe,xO,Rfe=M(()=>{"use strict";vO={CONTAINS:"contains",ARROW:"arrow"},IUe=o((t,e)=>{let r=t.append("defs").append("marker").attr("id",vO.CONTAINS+"_line_ending").attr("refX",0).attr("refY",e.line_height/2).attr("markerWidth",e.line_height).attr("markerHeight",e.line_height).attr("orient","auto").append("g");r.append("circle").attr("cx",e.line_height/2).attr("cy",e.line_height/2).attr("r",e.line_height/2).attr("fill","none"),r.append("line").attr("x1",0).attr("x2",e.line_height).attr("y1",e.line_height/2).attr("y2",e.line_height/2).attr("stroke-width",1),r.append("line").attr("y1",0).attr("y2",e.line_height).attr("x1",e.line_height/2).attr("x2",e.line_height/2).attr("stroke-width",1),t.append("defs").append("marker").attr("id",vO.ARROW+"_line_ending").attr("refX",e.line_height).attr("refY",.5*e.line_height).attr("markerWidth",e.line_height).attr("markerHeight",e.line_height).attr("orient","auto").append("path").attr("d",`M0,0 + L${e.line_height},${e.line_height/2} + M${e.line_height},${e.line_height/2} + L0,${e.line_height}`).attr("stroke-width",1)},"insertLineEndings"),xO={ReqMarkers:vO,insertLineEndings:IUe}});var ci,Mfe,Ife,Ofe,Pfe,OUe,PUe,BUe,FUe,zUe,GUe,Bg,$Ue,Bfe,Ffe=M(()=>{"use strict";mr();Pv();Ns();Vt();ht();ni();fr();Rfe();ci={},Mfe=0,Ife=o((t,e)=>t.insert("rect","#"+e).attr("class","req reqBox").attr("x",0).attr("y",0).attr("width",ci.rect_min_width+"px").attr("height",ci.rect_min_height+"px"),"newRectNode"),Ofe=o((t,e,r)=>{let n=ci.rect_min_width/2,i=t.append("text").attr("class","req reqLabel reqTitle").attr("id",e).attr("x",n).attr("y",ci.rect_padding).attr("dominant-baseline","hanging"),a=0;r.forEach(h=>{a==0?i.append("tspan").attr("text-anchor","middle").attr("x",ci.rect_min_width/2).attr("dy",0).text(h):i.append("tspan").attr("text-anchor","middle").attr("x",ci.rect_min_width/2).attr("dy",ci.line_height*.75).text(h),a++});let s=1.5*ci.rect_padding,l=a*ci.line_height*.75,u=s+l;return t.append("line").attr("class","req-title-line").attr("x1","0").attr("x2",ci.rect_min_width).attr("y1",u).attr("y2",u),{titleNode:i,y:u}},"newTitleNode"),Pfe=o((t,e,r,n)=>{let i=t.append("text").attr("class","req reqLabel").attr("id",e).attr("x",ci.rect_padding).attr("y",n).attr("dominant-baseline","hanging"),a=0,s=30,l=[];return r.forEach(u=>{let h=u.length;for(;h>s&&a<3;){let f=u.substring(0,s);u=u.substring(s,u.length),h=u.length,l[l.length]=f,a++}if(a==3){let f=l[l.length-1];l[l.length-1]=f.substring(0,f.length-4)+"..."}else l[l.length]=u;a=0}),l.forEach(u=>{i.append("tspan").attr("x",ci.rect_padding).attr("dy",ci.line_height).text(u)}),i},"newBodyNode"),OUe=o((t,e,r,n)=>{let i=e.node().getTotalLength(),a=e.node().getPointAtLength(i*.5),s="rel"+Mfe;Mfe++;let u=t.append("text").attr("class","req relationshipLabel").attr("id",s).attr("x",a.x).attr("y",a.y).attr("text-anchor","middle").attr("dominant-baseline","middle").text(n).node().getBBox();t.insert("rect","#"+s).attr("class","req reqLabelBox").attr("x",a.x-u.width/2).attr("y",a.y-u.height/2).attr("width",u.width).attr("height",u.height).attr("fill","white").attr("fill-opacity","85%")},"addEdgeLabel"),PUe=o(function(t,e,r,n,i){let a=r.edge(Bg(e.src),Bg(e.dst)),s=Ka().x(function(u){return u.x}).y(function(u){return u.y}),l=t.insert("path","#"+n).attr("class","er relationshipLine").attr("d",s(a.points)).attr("fill","none");e.type==i.db.Relationships.CONTAINS?l.attr("marker-start","url("+je.getUrl(ci.arrowMarkerAbsolute)+"#"+e.type+"_line_ending)"):(l.attr("stroke-dasharray","10,7"),l.attr("marker-end","url("+je.getUrl(ci.arrowMarkerAbsolute)+"#"+xO.ReqMarkers.ARROW+"_line_ending)")),OUe(t,l,ci,`<<${e.type}>>`)},"drawRelationshipFromLayout"),BUe=o((t,e,r)=>{t.forEach((n,i)=>{i=Bg(i),Y.info("Added new requirement: ",i);let a=r.append("g").attr("id",i),s="req-"+i,l=Ife(a,s),u=[],h=Ofe(a,i+"_title",[`<<${n.type}>>`,`${n.name}`]);u.push(h.titleNode);let f=Pfe(a,i+"_body",[`Id: ${n.id}`,`Text: ${n.text}`,`Risk: ${n.risk}`,`Verification: ${n.verifyMethod}`],h.y);u.push(f);let d=l.node().getBBox();e.setNode(i,{width:d.width,height:d.height,shape:"rect",id:i})})},"drawReqs"),FUe=o((t,e,r)=>{t.forEach((n,i)=>{let a=Bg(i),s=r.append("g").attr("id",a),l="element-"+a,u=Ife(s,l),h=[],f=Ofe(s,l+"_title",["<<Element>>",`${i}`]);h.push(f.titleNode);let d=Pfe(s,l+"_body",[`Type: ${n.type||"Not Specified"}`,`Doc Ref: ${n.docRef||"None"}`],f.y);h.push(d);let p=u.node().getBBox();e.setNode(a,{width:p.width,height:p.height,shape:"rect",id:a})})},"drawElements"),zUe=o((t,e)=>(t.forEach(function(r){let n=Bg(r.src),i=Bg(r.dst);e.setEdge(n,i,{relationship:r})}),t),"addRelationships"),GUe=o(function(t,e){e.nodes().forEach(function(r){r!==void 0&&e.node(r)!==void 0&&(t.select("#"+r),t.select("#"+r).attr("transform","translate("+(e.node(r).x-e.node(r).width/2)+","+(e.node(r).y-e.node(r).height/2)+" )"))})},"adjustEntities"),Bg=o(t=>t.replace(/\s/g,"").replace(/\./g,"_"),"elementString"),$Ue=o((t,e,r,n)=>{ci=de().requirement;let i=ci.securityLevel,a;i==="sandbox"&&(a=ze("#i"+e));let l=(i==="sandbox"?ze(a.nodes()[0].contentDocument.body):ze("body")).select(`[id='${e}']`);xO.insertLineEndings(l,ci);let u=new Mr({multigraph:!1,compound:!1,directed:!0}).setGraph({rankdir:ci.layoutDirection,marginx:20,marginy:20,nodesep:100,edgesep:100,ranksep:100}).setDefaultEdgeLabel(function(){return{}}),h=n.db.getRequirements(),f=n.db.getElements(),d=n.db.getRelationships();BUe(h,u,l),FUe(f,u,l),zUe(d,u),Du(u),GUe(l,u),d.forEach(function(v){PUe(l,v,u,e,n)});let p=ci.rect_padding,m=l.node().getBBox(),g=m.width+p*2,y=m.height+p*2;Zr(l,y,g,ci.useMaxWidth),l.attr("viewBox",`${m.x-p} ${m.y-p} ${g} ${y}`)},"draw"),Bfe={draw:$Ue}});var zfe={};vr(zfe,{diagram:()=>VUe});var VUe,Gfe=M(()=>{"use strict";Afe();Lfe();Nfe();Ffe();VUe={parser:Cfe,db:_fe,renderer:Bfe,styles:Dfe}});var bO,Ufe,Hfe=M(()=>{"use strict";bO=function(){var t=o(function(H,q,Z,ae){for(Z=Z||{},ae=H.length;ae--;Z[H[ae]]=q);return Z},"o"),e=[1,2],r=[1,3],n=[1,4],i=[2,4],a=[1,9],s=[1,11],l=[1,13],u=[1,14],h=[1,16],f=[1,17],d=[1,18],p=[1,24],m=[1,25],g=[1,26],y=[1,27],v=[1,28],x=[1,29],b=[1,30],w=[1,31],_=[1,32],T=[1,33],E=[1,34],L=[1,35],C=[1,36],A=[1,37],I=[1,38],D=[1,39],k=[1,41],R=[1,42],S=[1,43],O=[1,44],N=[1,45],P=[1,46],F=[1,4,5,13,14,16,18,21,23,29,30,31,33,35,36,37,38,39,41,43,44,46,47,48,49,50,52,53,54,59,60,61,62,70],B=[4,5,16,50,52,53],$=[4,5,13,14,16,18,21,23,29,30,31,33,35,36,37,38,39,41,43,44,46,50,52,53,54,59,60,61,62,70],z=[4,5,13,14,16,18,21,23,29,30,31,33,35,36,37,38,39,41,43,44,46,49,50,52,53,54,59,60,61,62,70],W=[4,5,13,14,16,18,21,23,29,30,31,33,35,36,37,38,39,41,43,44,46,48,50,52,53,54,59,60,61,62,70],j=[4,5,13,14,16,18,21,23,29,30,31,33,35,36,37,38,39,41,43,44,46,47,50,52,53,54,59,60,61,62,70],K=[68,69,70],ie=[1,122],Q={trace:o(function(){},"trace"),yy:{},symbols_:{error:2,start:3,SPACE:4,NEWLINE:5,SD:6,document:7,line:8,statement:9,box_section:10,box_line:11,participant_statement:12,create:13,box:14,restOfLine:15,end:16,signal:17,autonumber:18,NUM:19,off:20,activate:21,actor:22,deactivate:23,note_statement:24,links_statement:25,link_statement:26,properties_statement:27,details_statement:28,title:29,legacy_title:30,acc_title:31,acc_title_value:32,acc_descr:33,acc_descr_value:34,acc_descr_multiline_value:35,loop:36,rect:37,opt:38,alt:39,else_sections:40,par:41,par_sections:42,par_over:43,critical:44,option_sections:45,break:46,option:47,and:48,else:49,participant:50,AS:51,participant_actor:52,destroy:53,note:54,placement:55,text2:56,over:57,actor_pair:58,links:59,link:60,properties:61,details:62,spaceList:63,",":64,left_of:65,right_of:66,signaltype:67,"+":68,"-":69,ACTOR:70,SOLID_OPEN_ARROW:71,DOTTED_OPEN_ARROW:72,SOLID_ARROW:73,BIDIRECTIONAL_SOLID_ARROW:74,DOTTED_ARROW:75,BIDIRECTIONAL_DOTTED_ARROW:76,SOLID_CROSS:77,DOTTED_CROSS:78,SOLID_POINT:79,DOTTED_POINT:80,TXT:81,$accept:0,$end:1},terminals_:{2:"error",4:"SPACE",5:"NEWLINE",6:"SD",13:"create",14:"box",15:"restOfLine",16:"end",18:"autonumber",19:"NUM",20:"off",21:"activate",23:"deactivate",29:"title",30:"legacy_title",31:"acc_title",32:"acc_title_value",33:"acc_descr",34:"acc_descr_value",35:"acc_descr_multiline_value",36:"loop",37:"rect",38:"opt",39:"alt",41:"par",43:"par_over",44:"critical",46:"break",47:"option",48:"and",49:"else",50:"participant",51:"AS",52:"participant_actor",53:"destroy",54:"note",57:"over",59:"links",60:"link",61:"properties",62:"details",64:",",65:"left_of",66:"right_of",68:"+",69:"-",70:"ACTOR",71:"SOLID_OPEN_ARROW",72:"DOTTED_OPEN_ARROW",73:"SOLID_ARROW",74:"BIDIRECTIONAL_SOLID_ARROW",75:"DOTTED_ARROW",76:"BIDIRECTIONAL_DOTTED_ARROW",77:"SOLID_CROSS",78:"DOTTED_CROSS",79:"SOLID_POINT",80:"DOTTED_POINT",81:"TXT"},productions_:[0,[3,2],[3,2],[3,2],[7,0],[7,2],[8,2],[8,1],[8,1],[10,0],[10,2],[11,2],[11,1],[11,1],[9,1],[9,2],[9,4],[9,2],[9,4],[9,3],[9,3],[9,2],[9,3],[9,3],[9,2],[9,2],[9,2],[9,2],[9,2],[9,1],[9,1],[9,2],[9,2],[9,1],[9,4],[9,4],[9,4],[9,4],[9,4],[9,4],[9,4],[9,4],[45,1],[45,4],[42,1],[42,4],[40,1],[40,4],[12,5],[12,3],[12,5],[12,3],[12,3],[24,4],[24,4],[25,3],[26,3],[27,3],[28,3],[63,2],[63,1],[58,3],[58,1],[55,1],[55,1],[17,5],[17,5],[17,4],[22,1],[67,1],[67,1],[67,1],[67,1],[67,1],[67,1],[67,1],[67,1],[67,1],[67,1],[56,1]],performAction:o(function(q,Z,ae,ue,ce,te,De){var oe=te.length-1;switch(ce){case 3:return ue.apply(te[oe]),te[oe];break;case 4:case 9:this.$=[];break;case 5:case 10:te[oe-1].push(te[oe]),this.$=te[oe-1];break;case 6:case 7:case 11:case 12:this.$=te[oe];break;case 8:case 13:this.$=[];break;case 15:te[oe].type="createParticipant",this.$=te[oe];break;case 16:te[oe-1].unshift({type:"boxStart",boxData:ue.parseBoxData(te[oe-2])}),te[oe-1].push({type:"boxEnd",boxText:te[oe-2]}),this.$=te[oe-1];break;case 18:this.$={type:"sequenceIndex",sequenceIndex:Number(te[oe-2]),sequenceIndexStep:Number(te[oe-1]),sequenceVisible:!0,signalType:ue.LINETYPE.AUTONUMBER};break;case 19:this.$={type:"sequenceIndex",sequenceIndex:Number(te[oe-1]),sequenceIndexStep:1,sequenceVisible:!0,signalType:ue.LINETYPE.AUTONUMBER};break;case 20:this.$={type:"sequenceIndex",sequenceVisible:!1,signalType:ue.LINETYPE.AUTONUMBER};break;case 21:this.$={type:"sequenceIndex",sequenceVisible:!0,signalType:ue.LINETYPE.AUTONUMBER};break;case 22:this.$={type:"activeStart",signalType:ue.LINETYPE.ACTIVE_START,actor:te[oe-1].actor};break;case 23:this.$={type:"activeEnd",signalType:ue.LINETYPE.ACTIVE_END,actor:te[oe-1].actor};break;case 29:ue.setDiagramTitle(te[oe].substring(6)),this.$=te[oe].substring(6);break;case 30:ue.setDiagramTitle(te[oe].substring(7)),this.$=te[oe].substring(7);break;case 31:this.$=te[oe].trim(),ue.setAccTitle(this.$);break;case 32:case 33:this.$=te[oe].trim(),ue.setAccDescription(this.$);break;case 34:te[oe-1].unshift({type:"loopStart",loopText:ue.parseMessage(te[oe-2]),signalType:ue.LINETYPE.LOOP_START}),te[oe-1].push({type:"loopEnd",loopText:te[oe-2],signalType:ue.LINETYPE.LOOP_END}),this.$=te[oe-1];break;case 35:te[oe-1].unshift({type:"rectStart",color:ue.parseMessage(te[oe-2]),signalType:ue.LINETYPE.RECT_START}),te[oe-1].push({type:"rectEnd",color:ue.parseMessage(te[oe-2]),signalType:ue.LINETYPE.RECT_END}),this.$=te[oe-1];break;case 36:te[oe-1].unshift({type:"optStart",optText:ue.parseMessage(te[oe-2]),signalType:ue.LINETYPE.OPT_START}),te[oe-1].push({type:"optEnd",optText:ue.parseMessage(te[oe-2]),signalType:ue.LINETYPE.OPT_END}),this.$=te[oe-1];break;case 37:te[oe-1].unshift({type:"altStart",altText:ue.parseMessage(te[oe-2]),signalType:ue.LINETYPE.ALT_START}),te[oe-1].push({type:"altEnd",signalType:ue.LINETYPE.ALT_END}),this.$=te[oe-1];break;case 38:te[oe-1].unshift({type:"parStart",parText:ue.parseMessage(te[oe-2]),signalType:ue.LINETYPE.PAR_START}),te[oe-1].push({type:"parEnd",signalType:ue.LINETYPE.PAR_END}),this.$=te[oe-1];break;case 39:te[oe-1].unshift({type:"parStart",parText:ue.parseMessage(te[oe-2]),signalType:ue.LINETYPE.PAR_OVER_START}),te[oe-1].push({type:"parEnd",signalType:ue.LINETYPE.PAR_END}),this.$=te[oe-1];break;case 40:te[oe-1].unshift({type:"criticalStart",criticalText:ue.parseMessage(te[oe-2]),signalType:ue.LINETYPE.CRITICAL_START}),te[oe-1].push({type:"criticalEnd",signalType:ue.LINETYPE.CRITICAL_END}),this.$=te[oe-1];break;case 41:te[oe-1].unshift({type:"breakStart",breakText:ue.parseMessage(te[oe-2]),signalType:ue.LINETYPE.BREAK_START}),te[oe-1].push({type:"breakEnd",optText:ue.parseMessage(te[oe-2]),signalType:ue.LINETYPE.BREAK_END}),this.$=te[oe-1];break;case 43:this.$=te[oe-3].concat([{type:"option",optionText:ue.parseMessage(te[oe-1]),signalType:ue.LINETYPE.CRITICAL_OPTION},te[oe]]);break;case 45:this.$=te[oe-3].concat([{type:"and",parText:ue.parseMessage(te[oe-1]),signalType:ue.LINETYPE.PAR_AND},te[oe]]);break;case 47:this.$=te[oe-3].concat([{type:"else",altText:ue.parseMessage(te[oe-1]),signalType:ue.LINETYPE.ALT_ELSE},te[oe]]);break;case 48:te[oe-3].draw="participant",te[oe-3].type="addParticipant",te[oe-3].description=ue.parseMessage(te[oe-1]),this.$=te[oe-3];break;case 49:te[oe-1].draw="participant",te[oe-1].type="addParticipant",this.$=te[oe-1];break;case 50:te[oe-3].draw="actor",te[oe-3].type="addParticipant",te[oe-3].description=ue.parseMessage(te[oe-1]),this.$=te[oe-3];break;case 51:te[oe-1].draw="actor",te[oe-1].type="addParticipant",this.$=te[oe-1];break;case 52:te[oe-1].type="destroyParticipant",this.$=te[oe-1];break;case 53:this.$=[te[oe-1],{type:"addNote",placement:te[oe-2],actor:te[oe-1].actor,text:te[oe]}];break;case 54:te[oe-2]=[].concat(te[oe-1],te[oe-1]).slice(0,2),te[oe-2][0]=te[oe-2][0].actor,te[oe-2][1]=te[oe-2][1].actor,this.$=[te[oe-1],{type:"addNote",placement:ue.PLACEMENT.OVER,actor:te[oe-2].slice(0,2),text:te[oe]}];break;case 55:this.$=[te[oe-1],{type:"addLinks",actor:te[oe-1].actor,text:te[oe]}];break;case 56:this.$=[te[oe-1],{type:"addALink",actor:te[oe-1].actor,text:te[oe]}];break;case 57:this.$=[te[oe-1],{type:"addProperties",actor:te[oe-1].actor,text:te[oe]}];break;case 58:this.$=[te[oe-1],{type:"addDetails",actor:te[oe-1].actor,text:te[oe]}];break;case 61:this.$=[te[oe-2],te[oe]];break;case 62:this.$=te[oe];break;case 63:this.$=ue.PLACEMENT.LEFTOF;break;case 64:this.$=ue.PLACEMENT.RIGHTOF;break;case 65:this.$=[te[oe-4],te[oe-1],{type:"addMessage",from:te[oe-4].actor,to:te[oe-1].actor,signalType:te[oe-3],msg:te[oe],activate:!0},{type:"activeStart",signalType:ue.LINETYPE.ACTIVE_START,actor:te[oe-1].actor}];break;case 66:this.$=[te[oe-4],te[oe-1],{type:"addMessage",from:te[oe-4].actor,to:te[oe-1].actor,signalType:te[oe-3],msg:te[oe]},{type:"activeEnd",signalType:ue.LINETYPE.ACTIVE_END,actor:te[oe-4].actor}];break;case 67:this.$=[te[oe-3],te[oe-1],{type:"addMessage",from:te[oe-3].actor,to:te[oe-1].actor,signalType:te[oe-2],msg:te[oe]}];break;case 68:this.$={type:"addParticipant",actor:te[oe]};break;case 69:this.$=ue.LINETYPE.SOLID_OPEN;break;case 70:this.$=ue.LINETYPE.DOTTED_OPEN;break;case 71:this.$=ue.LINETYPE.SOLID;break;case 72:this.$=ue.LINETYPE.BIDIRECTIONAL_SOLID;break;case 73:this.$=ue.LINETYPE.DOTTED;break;case 74:this.$=ue.LINETYPE.BIDIRECTIONAL_DOTTED;break;case 75:this.$=ue.LINETYPE.SOLID_CROSS;break;case 76:this.$=ue.LINETYPE.DOTTED_CROSS;break;case 77:this.$=ue.LINETYPE.SOLID_POINT;break;case 78:this.$=ue.LINETYPE.DOTTED_POINT;break;case 79:this.$=ue.parseMessage(te[oe].trim().substring(1));break}},"anonymous"),table:[{3:1,4:e,5:r,6:n},{1:[3]},{3:5,4:e,5:r,6:n},{3:6,4:e,5:r,6:n},t([1,4,5,13,14,18,21,23,29,30,31,33,35,36,37,38,39,41,43,44,46,50,52,53,54,59,60,61,62,70],i,{7:7}),{1:[2,1]},{1:[2,2]},{1:[2,3],4:a,5:s,8:8,9:10,12:12,13:l,14:u,17:15,18:h,21:f,22:40,23:d,24:19,25:20,26:21,27:22,28:23,29:p,30:m,31:g,33:y,35:v,36:x,37:b,38:w,39:_,41:T,43:E,44:L,46:C,50:A,52:I,53:D,54:k,59:R,60:S,61:O,62:N,70:P},t(F,[2,5]),{9:47,12:12,13:l,14:u,17:15,18:h,21:f,22:40,23:d,24:19,25:20,26:21,27:22,28:23,29:p,30:m,31:g,33:y,35:v,36:x,37:b,38:w,39:_,41:T,43:E,44:L,46:C,50:A,52:I,53:D,54:k,59:R,60:S,61:O,62:N,70:P},t(F,[2,7]),t(F,[2,8]),t(F,[2,14]),{12:48,50:A,52:I,53:D},{15:[1,49]},{5:[1,50]},{5:[1,53],19:[1,51],20:[1,52]},{22:54,70:P},{22:55,70:P},{5:[1,56]},{5:[1,57]},{5:[1,58]},{5:[1,59]},{5:[1,60]},t(F,[2,29]),t(F,[2,30]),{32:[1,61]},{34:[1,62]},t(F,[2,33]),{15:[1,63]},{15:[1,64]},{15:[1,65]},{15:[1,66]},{15:[1,67]},{15:[1,68]},{15:[1,69]},{15:[1,70]},{22:71,70:P},{22:72,70:P},{22:73,70:P},{67:74,71:[1,75],72:[1,76],73:[1,77],74:[1,78],75:[1,79],76:[1,80],77:[1,81],78:[1,82],79:[1,83],80:[1,84]},{55:85,57:[1,86],65:[1,87],66:[1,88]},{22:89,70:P},{22:90,70:P},{22:91,70:P},{22:92,70:P},t([5,51,64,71,72,73,74,75,76,77,78,79,80,81],[2,68]),t(F,[2,6]),t(F,[2,15]),t(B,[2,9],{10:93}),t(F,[2,17]),{5:[1,95],19:[1,94]},{5:[1,96]},t(F,[2,21]),{5:[1,97]},{5:[1,98]},t(F,[2,24]),t(F,[2,25]),t(F,[2,26]),t(F,[2,27]),t(F,[2,28]),t(F,[2,31]),t(F,[2,32]),t($,i,{7:99}),t($,i,{7:100}),t($,i,{7:101}),t(z,i,{40:102,7:103}),t(W,i,{42:104,7:105}),t(W,i,{7:105,42:106}),t(j,i,{45:107,7:108}),t($,i,{7:109}),{5:[1,111],51:[1,110]},{5:[1,113],51:[1,112]},{5:[1,114]},{22:117,68:[1,115],69:[1,116],70:P},t(K,[2,69]),t(K,[2,70]),t(K,[2,71]),t(K,[2,72]),t(K,[2,73]),t(K,[2,74]),t(K,[2,75]),t(K,[2,76]),t(K,[2,77]),t(K,[2,78]),{22:118,70:P},{22:120,58:119,70:P},{70:[2,63]},{70:[2,64]},{56:121,81:ie},{56:123,81:ie},{56:124,81:ie},{56:125,81:ie},{4:[1,128],5:[1,130],11:127,12:129,16:[1,126],50:A,52:I,53:D},{5:[1,131]},t(F,[2,19]),t(F,[2,20]),t(F,[2,22]),t(F,[2,23]),{4:a,5:s,8:8,9:10,12:12,13:l,14:u,16:[1,132],17:15,18:h,21:f,22:40,23:d,24:19,25:20,26:21,27:22,28:23,29:p,30:m,31:g,33:y,35:v,36:x,37:b,38:w,39:_,41:T,43:E,44:L,46:C,50:A,52:I,53:D,54:k,59:R,60:S,61:O,62:N,70:P},{4:a,5:s,8:8,9:10,12:12,13:l,14:u,16:[1,133],17:15,18:h,21:f,22:40,23:d,24:19,25:20,26:21,27:22,28:23,29:p,30:m,31:g,33:y,35:v,36:x,37:b,38:w,39:_,41:T,43:E,44:L,46:C,50:A,52:I,53:D,54:k,59:R,60:S,61:O,62:N,70:P},{4:a,5:s,8:8,9:10,12:12,13:l,14:u,16:[1,134],17:15,18:h,21:f,22:40,23:d,24:19,25:20,26:21,27:22,28:23,29:p,30:m,31:g,33:y,35:v,36:x,37:b,38:w,39:_,41:T,43:E,44:L,46:C,50:A,52:I,53:D,54:k,59:R,60:S,61:O,62:N,70:P},{16:[1,135]},{4:a,5:s,8:8,9:10,12:12,13:l,14:u,16:[2,46],17:15,18:h,21:f,22:40,23:d,24:19,25:20,26:21,27:22,28:23,29:p,30:m,31:g,33:y,35:v,36:x,37:b,38:w,39:_,41:T,43:E,44:L,46:C,49:[1,136],50:A,52:I,53:D,54:k,59:R,60:S,61:O,62:N,70:P},{16:[1,137]},{4:a,5:s,8:8,9:10,12:12,13:l,14:u,16:[2,44],17:15,18:h,21:f,22:40,23:d,24:19,25:20,26:21,27:22,28:23,29:p,30:m,31:g,33:y,35:v,36:x,37:b,38:w,39:_,41:T,43:E,44:L,46:C,48:[1,138],50:A,52:I,53:D,54:k,59:R,60:S,61:O,62:N,70:P},{16:[1,139]},{16:[1,140]},{4:a,5:s,8:8,9:10,12:12,13:l,14:u,16:[2,42],17:15,18:h,21:f,22:40,23:d,24:19,25:20,26:21,27:22,28:23,29:p,30:m,31:g,33:y,35:v,36:x,37:b,38:w,39:_,41:T,43:E,44:L,46:C,47:[1,141],50:A,52:I,53:D,54:k,59:R,60:S,61:O,62:N,70:P},{4:a,5:s,8:8,9:10,12:12,13:l,14:u,16:[1,142],17:15,18:h,21:f,22:40,23:d,24:19,25:20,26:21,27:22,28:23,29:p,30:m,31:g,33:y,35:v,36:x,37:b,38:w,39:_,41:T,43:E,44:L,46:C,50:A,52:I,53:D,54:k,59:R,60:S,61:O,62:N,70:P},{15:[1,143]},t(F,[2,49]),{15:[1,144]},t(F,[2,51]),t(F,[2,52]),{22:145,70:P},{22:146,70:P},{56:147,81:ie},{56:148,81:ie},{56:149,81:ie},{64:[1,150],81:[2,62]},{5:[2,55]},{5:[2,79]},{5:[2,56]},{5:[2,57]},{5:[2,58]},t(F,[2,16]),t(B,[2,10]),{12:151,50:A,52:I,53:D},t(B,[2,12]),t(B,[2,13]),t(F,[2,18]),t(F,[2,34]),t(F,[2,35]),t(F,[2,36]),t(F,[2,37]),{15:[1,152]},t(F,[2,38]),{15:[1,153]},t(F,[2,39]),t(F,[2,40]),{15:[1,154]},t(F,[2,41]),{5:[1,155]},{5:[1,156]},{56:157,81:ie},{56:158,81:ie},{5:[2,67]},{5:[2,53]},{5:[2,54]},{22:159,70:P},t(B,[2,11]),t(z,i,{7:103,40:160}),t(W,i,{7:105,42:161}),t(j,i,{7:108,45:162}),t(F,[2,48]),t(F,[2,50]),{5:[2,65]},{5:[2,66]},{81:[2,61]},{16:[2,47]},{16:[2,45]},{16:[2,43]}],defaultActions:{5:[2,1],6:[2,2],87:[2,63],88:[2,64],121:[2,55],122:[2,79],123:[2,56],124:[2,57],125:[2,58],147:[2,67],148:[2,53],149:[2,54],157:[2,65],158:[2,66],159:[2,61],160:[2,47],161:[2,45],162:[2,43]},parseError:o(function(q,Z){if(Z.recoverable)this.trace(q);else{var ae=new Error(q);throw ae.hash=Z,ae}},"parseError"),parse:o(function(q){var Z=this,ae=[0],ue=[],ce=[null],te=[],De=this.table,oe="",ke=0,Fe=0,Be=0,Ve=2,Ge=1,He=te.slice.call(arguments,1),xe=Object.create(this.lexer),X={yy:{}};for(var fe in this.yy)Object.prototype.hasOwnProperty.call(this.yy,fe)&&(X.yy[fe]=this.yy[fe]);xe.setInput(q,X.yy),X.yy.lexer=xe,X.yy.parser=this,typeof xe.yylloc>"u"&&(xe.yylloc={});var he=xe.yylloc;te.push(he);var ge=xe.options&&xe.options.ranges;typeof X.yy.parseError=="function"?this.parseError=X.yy.parseError:this.parseError=Object.getPrototypeOf(this).parseError;function ne(Et){ae.length=ae.length-2*Et,ce.length=ce.length-Et,te.length=te.length-Et}o(ne,"popStack");function ye(){var Et;return Et=ue.pop()||xe.lex()||Ge,typeof Et!="number"&&(Et instanceof Array&&(ue=Et,Et=ue.pop()),Et=Z.symbols_[Et]||Et),Et}o(ye,"lex");for(var U,Te,se,Ee,Ae,Pe,Me={},me,We,Re,tt;;){if(se=ae[ae.length-1],this.defaultActions[se]?Ee=this.defaultActions[se]:((U===null||typeof U>"u")&&(U=ye()),Ee=De[se]&&De[se][U]),typeof Ee>"u"||!Ee.length||!Ee[0]){var gt="";tt=[];for(me in De[se])this.terminals_[me]&&me>Ve&&tt.push("'"+this.terminals_[me]+"'");xe.showPosition?gt="Parse error on line "+(ke+1)+`: +`+xe.showPosition()+` +Expecting `+tt.join(", ")+", got '"+(this.terminals_[U]||U)+"'":gt="Parse error on line "+(ke+1)+": Unexpected "+(U==Ge?"end of input":"'"+(this.terminals_[U]||U)+"'"),this.parseError(gt,{text:xe.match,token:this.terminals_[U]||U,line:xe.yylineno,loc:he,expected:tt})}if(Ee[0]instanceof Array&&Ee.length>1)throw new Error("Parse Error: multiple actions possible at state: "+se+", token: "+U);switch(Ee[0]){case 1:ae.push(U),ce.push(xe.yytext),te.push(xe.yylloc),ae.push(Ee[1]),U=null,Te?(U=Te,Te=null):(Fe=xe.yyleng,oe=xe.yytext,ke=xe.yylineno,he=xe.yylloc,Be>0&&Be--);break;case 2:if(We=this.productions_[Ee[1]][1],Me.$=ce[ce.length-We],Me._$={first_line:te[te.length-(We||1)].first_line,last_line:te[te.length-1].last_line,first_column:te[te.length-(We||1)].first_column,last_column:te[te.length-1].last_column},ge&&(Me._$.range=[te[te.length-(We||1)].range[0],te[te.length-1].range[1]]),Pe=this.performAction.apply(Me,[oe,Fe,ke,X.yy,Ee[1],ce,te].concat(He)),typeof Pe<"u")return Pe;We&&(ae=ae.slice(0,-1*We*2),ce=ce.slice(0,-1*We),te=te.slice(0,-1*We)),ae.push(this.productions_[Ee[1]][0]),ce.push(Me.$),te.push(Me._$),Re=De[ae[ae.length-2]][ae[ae.length-1]],ae.push(Re);break;case 3:return!0}}return!0},"parse")},ee=function(){var H={EOF:1,parseError:o(function(Z,ae){if(this.yy.parser)this.yy.parser.parseError(Z,ae);else throw new Error(Z)},"parseError"),setInput:o(function(q,Z){return this.yy=Z||this.yy||{},this._input=q,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},"setInput"),input:o(function(){var q=this._input[0];this.yytext+=q,this.yyleng++,this.offset++,this.match+=q,this.matched+=q;var Z=q.match(/(?:\r\n?|\n).*/g);return Z?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),q},"input"),unput:o(function(q){var Z=q.length,ae=q.split(/(?:\r\n?|\n)/g);this._input=q+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-Z),this.offset-=Z;var ue=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),ae.length-1&&(this.yylineno-=ae.length-1);var ce=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:ae?(ae.length===ue.length?this.yylloc.first_column:0)+ue[ue.length-ae.length].length-ae[0].length:this.yylloc.first_column-Z},this.options.ranges&&(this.yylloc.range=[ce[0],ce[0]+this.yyleng-Z]),this.yyleng=this.yytext.length,this},"unput"),more:o(function(){return this._more=!0,this},"more"),reject:o(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError("Lexical error on line "+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true). +`+this.showPosition(),{text:"",token:null,line:this.yylineno});return this},"reject"),less:o(function(q){this.unput(this.match.slice(q))},"less"),pastInput:o(function(){var q=this.matched.substr(0,this.matched.length-this.match.length);return(q.length>20?"...":"")+q.substr(-20).replace(/\n/g,"")},"pastInput"),upcomingInput:o(function(){var q=this.match;return q.length<20&&(q+=this._input.substr(0,20-q.length)),(q.substr(0,20)+(q.length>20?"...":"")).replace(/\n/g,"")},"upcomingInput"),showPosition:o(function(){var q=this.pastInput(),Z=new Array(q.length+1).join("-");return q+this.upcomingInput()+` +`+Z+"^"},"showPosition"),test_match:o(function(q,Z){var ae,ue,ce;if(this.options.backtrack_lexer&&(ce={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(ce.yylloc.range=this.yylloc.range.slice(0))),ue=q[0].match(/(?:\r\n?|\n).*/g),ue&&(this.yylineno+=ue.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:ue?ue[ue.length-1].length-ue[ue.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+q[0].length},this.yytext+=q[0],this.match+=q[0],this.matches=q,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(q[0].length),this.matched+=q[0],ae=this.performAction.call(this,this.yy,this,Z,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),ae)return ae;if(this._backtrack){for(var te in ce)this[te]=ce[te];return!1}return!1},"test_match"),next:o(function(){if(this.done)return this.EOF;this._input||(this.done=!0);var q,Z,ae,ue;this._more||(this.yytext="",this.match="");for(var ce=this._currentRules(),te=0;te<ce.length;te++)if(ae=this._input.match(this.rules[ce[te]]),ae&&(!Z||ae[0].length>Z[0].length)){if(Z=ae,ue=te,this.options.backtrack_lexer){if(q=this.test_match(ae,ce[te]),q!==!1)return q;if(this._backtrack){Z=!1;continue}else return!1}else if(!this.options.flex)break}return Z?(q=this.test_match(Z,ce[ue]),q!==!1?q:!1):this._input===""?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+`. Unrecognized text. +`+this.showPosition(),{text:"",token:null,line:this.yylineno})},"next"),lex:o(function(){var Z=this.next();return Z||this.lex()},"lex"),begin:o(function(Z){this.conditionStack.push(Z)},"begin"),popState:o(function(){var Z=this.conditionStack.length-1;return Z>0?this.conditionStack.pop():this.conditionStack[0]},"popState"),_currentRules:o(function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},"_currentRules"),topState:o(function(Z){return Z=this.conditionStack.length-1-Math.abs(Z||0),Z>=0?this.conditionStack[Z]:"INITIAL"},"topState"),pushState:o(function(Z){this.begin(Z)},"pushState"),stateStackSize:o(function(){return this.conditionStack.length},"stateStackSize"),options:{"case-insensitive":!0},performAction:o(function(Z,ae,ue,ce){var te=ce;switch(ue){case 0:return 5;case 1:break;case 2:break;case 3:break;case 4:break;case 5:break;case 6:return 19;case 7:return this.begin("LINE"),14;break;case 8:return this.begin("ID"),50;break;case 9:return this.begin("ID"),52;break;case 10:return 13;case 11:return this.begin("ID"),53;break;case 12:return ae.yytext=ae.yytext.trim(),this.begin("ALIAS"),70;break;case 13:return this.popState(),this.popState(),this.begin("LINE"),51;break;case 14:return this.popState(),this.popState(),5;break;case 15:return this.begin("LINE"),36;break;case 16:return this.begin("LINE"),37;break;case 17:return this.begin("LINE"),38;break;case 18:return this.begin("LINE"),39;break;case 19:return this.begin("LINE"),49;break;case 20:return this.begin("LINE"),41;break;case 21:return this.begin("LINE"),43;break;case 22:return this.begin("LINE"),48;break;case 23:return this.begin("LINE"),44;break;case 24:return this.begin("LINE"),47;break;case 25:return this.begin("LINE"),46;break;case 26:return this.popState(),15;break;case 27:return 16;case 28:return 65;case 29:return 66;case 30:return 59;case 31:return 60;case 32:return 61;case 33:return 62;case 34:return 57;case 35:return 54;case 36:return this.begin("ID"),21;break;case 37:return this.begin("ID"),23;break;case 38:return 29;case 39:return 30;case 40:return this.begin("acc_title"),31;break;case 41:return this.popState(),"acc_title_value";break;case 42:return this.begin("acc_descr"),33;break;case 43:return this.popState(),"acc_descr_value";break;case 44:this.begin("acc_descr_multiline");break;case 45:this.popState();break;case 46:return"acc_descr_multiline_value";case 47:return 6;case 48:return 18;case 49:return 20;case 50:return 64;case 51:return 5;case 52:return ae.yytext=ae.yytext.trim(),70;break;case 53:return 73;case 54:return 74;case 55:return 75;case 56:return 76;case 57:return 71;case 58:return 72;case 59:return 77;case 60:return 78;case 61:return 79;case 62:return 80;case 63:return 81;case 64:return 68;case 65:return 69;case 66:return 5;case 67:return"INVALID"}},"anonymous"),rules:[/^(?:[\n]+)/i,/^(?:\s+)/i,/^(?:((?!\n)\s)+)/i,/^(?:#[^\n]*)/i,/^(?:%(?!\{)[^\n]*)/i,/^(?:[^\}]%%[^\n]*)/i,/^(?:[0-9]+(?=[ \n]+))/i,/^(?:box\b)/i,/^(?:participant\b)/i,/^(?:actor\b)/i,/^(?:create\b)/i,/^(?:destroy\b)/i,/^(?:[^\<->\->:\n,;]+?([\-]*[^\<->\->:\n,;]+?)*?(?=((?!\n)\s)+as(?!\n)\s|[#\n;]|$))/i,/^(?:as\b)/i,/^(?:(?:))/i,/^(?:loop\b)/i,/^(?:rect\b)/i,/^(?:opt\b)/i,/^(?:alt\b)/i,/^(?:else\b)/i,/^(?:par\b)/i,/^(?:par_over\b)/i,/^(?:and\b)/i,/^(?:critical\b)/i,/^(?:option\b)/i,/^(?:break\b)/i,/^(?:(?:[:]?(?:no)?wrap)?[^#\n;]*)/i,/^(?:end\b)/i,/^(?:left of\b)/i,/^(?:right of\b)/i,/^(?:links\b)/i,/^(?:link\b)/i,/^(?:properties\b)/i,/^(?:details\b)/i,/^(?:over\b)/i,/^(?:note\b)/i,/^(?:activate\b)/i,/^(?:deactivate\b)/i,/^(?:title\s[^#\n;]+)/i,/^(?:title:\s[^#\n;]+)/i,/^(?:accTitle\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*\{\s*)/i,/^(?:[\}])/i,/^(?:[^\}]*)/i,/^(?:sequenceDiagram\b)/i,/^(?:autonumber\b)/i,/^(?:off\b)/i,/^(?:,)/i,/^(?:;)/i,/^(?:[^\+\<->\->:\n,;]+((?!(-x|--x|-\)|--\)))[\-]*[^\+\<->\->:\n,;]+)*)/i,/^(?:->>)/i,/^(?:<<->>)/i,/^(?:-->>)/i,/^(?:<<-->>)/i,/^(?:->)/i,/^(?:-->)/i,/^(?:-[x])/i,/^(?:--[x])/i,/^(?:-[\)])/i,/^(?:--[\)])/i,/^(?::(?:(?:no)?wrap)?[^#\n;]+)/i,/^(?:\+)/i,/^(?:-)/i,/^(?:$)/i,/^(?:.)/i],conditions:{acc_descr_multiline:{rules:[45,46],inclusive:!1},acc_descr:{rules:[43],inclusive:!1},acc_title:{rules:[41],inclusive:!1},ID:{rules:[2,3,12],inclusive:!1},ALIAS:{rules:[2,3,13,14],inclusive:!1},LINE:{rules:[2,3,26],inclusive:!1},INITIAL:{rules:[0,1,3,4,5,6,7,8,9,10,11,15,16,17,18,19,20,21,22,23,24,25,27,28,29,30,31,32,33,34,35,36,37,38,39,40,42,44,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67],inclusive:!0}}};return H}();Q.lexer=ee;function J(){this.yy={}}return o(J,"Parser"),J.prototype=Q,Q.Parser=J,new J}();bO.parser=bO;Ufe=bO});function TO(t,e){if(t.links==null)t.links=e;else for(let r in e)t.links[r]=e[r]}function jfe(t,e){if(t.properties==null)t.properties=e;else for(let r in e)t.properties[r]=e[r]}function dHe(){$t.records.currentBox=void 0}var $t,YUe,wO,qUe,XUe,yi,jUe,KUe,QUe,ZUe,JUe,eHe,tHe,bx,rHe,nHe,iHe,aHe,sHe,Wfe,k0,oHe,lHe,cHe,xx,uHe,hHe,Yfe,qfe,fHe,Xfe,Kfe,pHe,Qfe,kO,Zfe=M(()=>{"use strict";Vt();ht();tE();fr();ki();$t=new cf(()=>({prevActor:void 0,actors:new Map,createdActors:new Map,destroyedActors:new Map,boxes:[],messages:[],notes:[],sequenceNumbersEnabled:!1,wrapEnabled:void 0,currentBox:void 0,lastCreated:void 0,lastDestroyed:void 0})),YUe=o(function(t){$t.records.boxes.push({name:t.text,wrap:t.wrap??k0(),fill:t.color,actorKeys:[]}),$t.records.currentBox=$t.records.boxes.slice(-1)[0]},"addBox"),wO=o(function(t,e,r,n){let i=$t.records.currentBox,a=$t.records.actors.get(t);if(a){if($t.records.currentBox&&a.box&&$t.records.currentBox!==a.box)throw new Error(`A same participant should only be defined in one Box: ${a.name} can't be in '${a.box.name}' and in '${$t.records.currentBox.name}' at the same time.`);if(i=a.box?a.box:$t.records.currentBox,a.box=i,a&&e===a.name&&r==null)return}if(r?.text==null&&(r={text:e,type:n}),(n==null||r.text==null)&&(r={text:e,type:n}),$t.records.actors.set(t,{box:i,name:e,description:r.text,wrap:r.wrap??k0(),prevActor:$t.records.prevActor,links:{},properties:{},actorCnt:null,rectData:null,type:n??"participant"}),$t.records.prevActor){let s=$t.records.actors.get($t.records.prevActor);s&&(s.nextActor=t)}$t.records.currentBox&&$t.records.currentBox.actorKeys.push(t),$t.records.prevActor=t},"addActor"),qUe=o(t=>{let e,r=0;if(!t)return 0;for(e=0;e<$t.records.messages.length;e++)$t.records.messages[e].type===xx.ACTIVE_START&&$t.records.messages[e].from===t&&r++,$t.records.messages[e].type===xx.ACTIVE_END&&$t.records.messages[e].from===t&&r--;return r},"activationCount"),XUe=o(function(t,e,r,n){$t.records.messages.push({from:t,to:e,message:r.text,wrap:r.wrap??k0(),answer:n})},"addMessage"),yi=o(function(t,e,r,n,i=!1){if(n===xx.ACTIVE_END&&qUe(t??"")<1){let s=new Error("Trying to inactivate an inactive participant ("+t+")");throw s.hash={text:"->>-",token:"->>-",line:"1",loc:{first_line:1,last_line:1,first_column:1,last_column:1},expected:["'ACTIVE_PARTICIPANT'"]},s}return $t.records.messages.push({from:t,to:e,message:r?.text??"",wrap:r?.wrap??k0(),type:n,activate:i}),!0},"addSignal"),jUe=o(function(){return $t.records.boxes.length>0},"hasAtLeastOneBox"),KUe=o(function(){return $t.records.boxes.some(t=>t.name)},"hasAtLeastOneBoxWithTitle"),QUe=o(function(){return $t.records.messages},"getMessages"),ZUe=o(function(){return $t.records.boxes},"getBoxes"),JUe=o(function(){return $t.records.actors},"getActors"),eHe=o(function(){return $t.records.createdActors},"getCreatedActors"),tHe=o(function(){return $t.records.destroyedActors},"getDestroyedActors"),bx=o(function(t){return $t.records.actors.get(t)},"getActor"),rHe=o(function(){return[...$t.records.actors.keys()]},"getActorKeys"),nHe=o(function(){$t.records.sequenceNumbersEnabled=!0},"enableSequenceNumbers"),iHe=o(function(){$t.records.sequenceNumbersEnabled=!1},"disableSequenceNumbers"),aHe=o(()=>$t.records.sequenceNumbersEnabled,"showSequenceNumbers"),sHe=o(function(t){$t.records.wrapEnabled=t},"setWrap"),Wfe=o(t=>{if(t===void 0)return{};t=t.trim();let e=/^:?wrap:/.exec(t)!==null?!0:/^:?nowrap:/.exec(t)!==null?!1:void 0;return{cleanedText:(e===void 0?t:t.replace(/^:?(?:no)?wrap:/,"")).trim(),wrap:e}},"extractWrap"),k0=o(()=>$t.records.wrapEnabled!==void 0?$t.records.wrapEnabled:de().sequence?.wrap??!1,"autoWrap"),oHe=o(function(){$t.reset(),_r()},"clear"),lHe=o(function(t){let e=t.trim(),{wrap:r,cleanedText:n}=Wfe(e),i={text:n,wrap:r};return Y.debug(`parseMessage: ${JSON.stringify(i)}`),i},"parseMessage"),cHe=o(function(t){let e=/^((?:rgba?|hsla?)\s*\(.*\)|\w*)(.*)$/.exec(t),r=e?.[1]?e[1].trim():"transparent",n=e?.[2]?e[2].trim():void 0;if(window?.CSS)window.CSS.supports("color",r)||(r="transparent",n=t.trim());else{let s=new Option().style;s.color=r,s.color!==r&&(r="transparent",n=t.trim())}let{wrap:i,cleanedText:a}=Wfe(n);return{text:a?Tr(a,de()):void 0,color:r,wrap:i}},"parseBoxData"),xx={SOLID:0,DOTTED:1,NOTE:2,SOLID_CROSS:3,DOTTED_CROSS:4,SOLID_OPEN:5,DOTTED_OPEN:6,LOOP_START:10,LOOP_END:11,ALT_START:12,ALT_ELSE:13,ALT_END:14,OPT_START:15,OPT_END:16,ACTIVE_START:17,ACTIVE_END:18,PAR_START:19,PAR_AND:20,PAR_END:21,RECT_START:22,RECT_END:23,SOLID_POINT:24,DOTTED_POINT:25,AUTONUMBER:26,CRITICAL_START:27,CRITICAL_OPTION:28,CRITICAL_END:29,BREAK_START:30,BREAK_END:31,PAR_OVER_START:32,BIDIRECTIONAL_SOLID:33,BIDIRECTIONAL_DOTTED:34},uHe={FILLED:0,OPEN:1},hHe={LEFTOF:0,RIGHTOF:1,OVER:2},Yfe=o(function(t,e,r){let n={actor:t,placement:e,message:r.text,wrap:r.wrap??k0()},i=[].concat(t,t);$t.records.notes.push(n),$t.records.messages.push({from:i[0],to:i[1],message:r.text,wrap:r.wrap??k0(),type:xx.NOTE,placement:e})},"addNote"),qfe=o(function(t,e){let r=bx(t);try{let n=Tr(e.text,de());n=n.replace(/&/g,"&"),n=n.replace(/=/g,"=");let i=JSON.parse(n);TO(r,i)}catch(n){Y.error("error while parsing actor link text",n)}},"addLinks"),fHe=o(function(t,e){let r=bx(t);try{let n={},i=Tr(e.text,de()),a=i.indexOf("@");i=i.replace(/&/g,"&"),i=i.replace(/=/g,"=");let s=i.slice(0,a-1).trim(),l=i.slice(a+1).trim();n[s]=l,TO(r,n)}catch(n){Y.error("error while parsing actor link text",n)}},"addALink");o(TO,"insertLinks");Xfe=o(function(t,e){let r=bx(t);try{let n=Tr(e.text,de()),i=JSON.parse(n);jfe(r,i)}catch(n){Y.error("error while parsing actor properties text",n)}},"addProperties");o(jfe,"insertProperties");o(dHe,"boxEnd");Kfe=o(function(t,e){let r=bx(t),n=document.getElementById(e.text);try{let i=n.innerHTML,a=JSON.parse(i);a.properties&&jfe(r,a.properties),a.links&&TO(r,a.links)}catch(i){Y.error("error while parsing actor details text",i)}},"addDetails"),pHe=o(function(t,e){if(t?.properties!==void 0)return t.properties[e]},"getActorProperty"),Qfe=o(function(t){if(Array.isArray(t))t.forEach(function(e){Qfe(e)});else switch(t.type){case"sequenceIndex":$t.records.messages.push({from:void 0,to:void 0,message:{start:t.sequenceIndex,step:t.sequenceIndexStep,visible:t.sequenceVisible},wrap:!1,type:t.signalType});break;case"addParticipant":wO(t.actor,t.actor,t.description,t.draw);break;case"createParticipant":if($t.records.actors.has(t.actor))throw new Error("It is not possible to have actors with the same id, even if one is destroyed before the next is created. Use 'AS' aliases to simulate the behavior");$t.records.lastCreated=t.actor,wO(t.actor,t.actor,t.description,t.draw),$t.records.createdActors.set(t.actor,$t.records.messages.length);break;case"destroyParticipant":$t.records.lastDestroyed=t.actor,$t.records.destroyedActors.set(t.actor,$t.records.messages.length);break;case"activeStart":yi(t.actor,void 0,void 0,t.signalType);break;case"activeEnd":yi(t.actor,void 0,void 0,t.signalType);break;case"addNote":Yfe(t.actor,t.placement,t.text);break;case"addLinks":qfe(t.actor,t.text);break;case"addALink":fHe(t.actor,t.text);break;case"addProperties":Xfe(t.actor,t.text);break;case"addDetails":Kfe(t.actor,t.text);break;case"addMessage":if($t.records.lastCreated){if(t.to!==$t.records.lastCreated)throw new Error("The created participant "+$t.records.lastCreated.name+" does not have an associated creating message after its declaration. Please check the sequence diagram.");$t.records.lastCreated=void 0}else if($t.records.lastDestroyed){if(t.to!==$t.records.lastDestroyed&&t.from!==$t.records.lastDestroyed)throw new Error("The destroyed participant "+$t.records.lastDestroyed.name+" does not have an associated destroying message after its declaration. Please check the sequence diagram.");$t.records.lastDestroyed=void 0}yi(t.from,t.to,t.msg,t.signalType,t.activate);break;case"boxStart":YUe(t.boxData);break;case"boxEnd":dHe();break;case"loopStart":yi(void 0,void 0,t.loopText,t.signalType);break;case"loopEnd":yi(void 0,void 0,void 0,t.signalType);break;case"rectStart":yi(void 0,void 0,t.color,t.signalType);break;case"rectEnd":yi(void 0,void 0,void 0,t.signalType);break;case"optStart":yi(void 0,void 0,t.optText,t.signalType);break;case"optEnd":yi(void 0,void 0,void 0,t.signalType);break;case"altStart":yi(void 0,void 0,t.altText,t.signalType);break;case"else":yi(void 0,void 0,t.altText,t.signalType);break;case"altEnd":yi(void 0,void 0,void 0,t.signalType);break;case"setAccTitle":Rr(t.text);break;case"parStart":yi(void 0,void 0,t.parText,t.signalType);break;case"and":yi(void 0,void 0,t.parText,t.signalType);break;case"parEnd":yi(void 0,void 0,void 0,t.signalType);break;case"criticalStart":yi(void 0,void 0,t.criticalText,t.signalType);break;case"option":yi(void 0,void 0,t.optionText,t.signalType);break;case"criticalEnd":yi(void 0,void 0,void 0,t.signalType);break;case"breakStart":yi(void 0,void 0,t.breakText,t.signalType);break;case"breakEnd":yi(void 0,void 0,void 0,t.signalType);break}},"apply"),kO={addActor:wO,addMessage:XUe,addSignal:yi,addLinks:qfe,addDetails:Kfe,addProperties:Xfe,autoWrap:k0,setWrap:sHe,enableSequenceNumbers:nHe,disableSequenceNumbers:iHe,showSequenceNumbers:aHe,getMessages:QUe,getActors:JUe,getCreatedActors:eHe,getDestroyedActors:tHe,getActor:bx,getActorKeys:rHe,getActorProperty:pHe,getAccTitle:Pr,getBoxes:ZUe,getDiagramTitle:Jr,setDiagramTitle:ln,getConfig:o(()=>de().sequence,"getConfig"),clear:oHe,parseMessage:lHe,parseBoxData:cHe,LINETYPE:xx,ARROWTYPE:uHe,PLACEMENT:hHe,addNote:Yfe,setAccTitle:Rr,apply:Qfe,setAccDescription:Br,getAccDescription:Fr,hasAtLeastOneBox:jUe,hasAtLeastOneBoxWithTitle:KUe}});var mHe,Jfe,ede=M(()=>{"use strict";mHe=o(t=>`.actor { + stroke: ${t.actorBorder}; + fill: ${t.actorBkg}; + } + + text.actor > tspan { + fill: ${t.actorTextColor}; + stroke: none; + } + + .actor-line { + stroke: ${t.actorLineColor}; + } + + .messageLine0 { + stroke-width: 1.5; + stroke-dasharray: none; + stroke: ${t.signalColor}; + } + + .messageLine1 { + stroke-width: 1.5; + stroke-dasharray: 2, 2; + stroke: ${t.signalColor}; + } + + #arrowhead path { + fill: ${t.signalColor}; + stroke: ${t.signalColor}; + } + + .sequenceNumber { + fill: ${t.sequenceNumberColor}; + } + + #sequencenumber { + fill: ${t.signalColor}; + } + + #crosshead path { + fill: ${t.signalColor}; + stroke: ${t.signalColor}; + } + + .messageText { + fill: ${t.signalTextColor}; + stroke: none; + } + + .labelBox { + stroke: ${t.labelBoxBorderColor}; + fill: ${t.labelBoxBkgColor}; + } + + .labelText, .labelText > tspan { + fill: ${t.labelTextColor}; + stroke: none; + } + + .loopText, .loopText > tspan { + fill: ${t.loopTextColor}; + stroke: none; + } + + .loopLine { + stroke-width: 2px; + stroke-dasharray: 2, 2; + stroke: ${t.labelBoxBorderColor}; + fill: ${t.labelBoxBorderColor}; + } + + .note { + //stroke: #decc93; + stroke: ${t.noteBorderColor}; + fill: ${t.noteBkgColor}; + } + + .noteText, .noteText > tspan { + fill: ${t.noteTextColor}; + stroke: none; + } + + .activation0 { + fill: ${t.activationBkgColor}; + stroke: ${t.activationBorderColor}; + } + + .activation1 { + fill: ${t.activationBkgColor}; + stroke: ${t.activationBorderColor}; + } + + .activation2 { + fill: ${t.activationBkgColor}; + stroke: ${t.activationBorderColor}; + } + + .actorPopupMenu { + position: absolute; + } + + .actorPopupMenuPanel { + position: absolute; + fill: ${t.actorBkg}; + box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); + filter: drop-shadow(3px 5px 2px rgb(0 0 0 / 0.4)); +} + .actor-man line { + stroke: ${t.actorBorder}; + fill: ${t.actorBkg}; + } + .actor-man circle, line { + stroke: ${t.actorBorder}; + fill: ${t.actorBkg}; + stroke-width: 2px; + } +`,"getStyles"),Jfe=mHe});var EO,pf,rde,nde,gHe,tde,SO,yHe,vHe,wx,E0,ide,Fc,CO,xHe,bHe,wHe,THe,kHe,EHe,SHe,ade,CHe,AHe,_He,LHe,DHe,NHe,RHe,sde,MHe,AO,IHe,ui,ode=M(()=>{"use strict";fr();qy();hr();EO=ka(Fp(),1);Ua();pf=18*2,rde="actor-top",nde="actor-bottom",gHe="actor-box",tde="actor-man",SO=o(function(t,e){return md(t,e)},"drawRect"),yHe=o(function(t,e,r,n,i){if(e.links===void 0||e.links===null||Object.keys(e.links).length===0)return{height:0,width:0};let a=e.links,s=e.actorCnt,l=e.rectData;var u="none";i&&(u="block !important");let h=t.append("g");h.attr("id","actor"+s+"_popup"),h.attr("class","actorPopupMenu"),h.attr("display",u);var f="";l.class!==void 0&&(f=" "+l.class);let d=l.width>r?l.width:r,p=h.append("rect");if(p.attr("class","actorPopupMenuPanel"+f),p.attr("x",l.x),p.attr("y",l.height),p.attr("fill",l.fill),p.attr("stroke",l.stroke),p.attr("width",d),p.attr("height",l.height),p.attr("rx",l.rx),p.attr("ry",l.ry),a!=null){var m=20;for(let v in a){var g=h.append("a"),y=(0,EO.sanitizeUrl)(a[v]);g.attr("xlink:href",y),g.attr("target","_blank"),IHe(n)(v,g,l.x+10,l.height+m,d,20,{class:"actor"},n),m+=30}}return p.attr("height",m),{height:l.height+m,width:d}},"drawPopup"),vHe=o(function(t){return"var pu = document.getElementById('"+t+"'); if (pu != null) { pu.style.display = pu.style.display == 'block' ? 'none' : 'block'; }"},"popupMenuToggle"),wx=o(async function(t,e,r=null){let n=t.append("foreignObject"),i=await hh(e.text,Sr()),s=n.append("xhtml:div").attr("style","width: fit-content;").attr("xmlns","http://www.w3.org/1999/xhtml").html(i).node().getBoundingClientRect();if(n.attr("height",Math.round(s.height)).attr("width",Math.round(s.width)),e.class==="noteText"){let l=t.node().firstChild;l.setAttribute("height",s.height+2*e.textMargin);let u=l.getBBox();n.attr("x",Math.round(u.x+u.width/2-s.width/2)).attr("y",Math.round(u.y+u.height/2-s.height/2))}else if(r){let{startx:l,stopx:u,starty:h}=r;if(l>u){let f=l;l=u,u=f}n.attr("x",Math.round(l+Math.abs(l-u)/2-s.width/2)),e.class==="loopText"?n.attr("y",Math.round(h)):n.attr("y",Math.round(h-s.height))}return[n]},"drawKatex"),E0=o(function(t,e){let r=0,n=0,i=e.text.split(je.lineBreakRegex),[a,s]=Fo(e.fontSize),l=[],u=0,h=o(()=>e.y,"yfunc");if(e.valign!==void 0&&e.textMargin!==void 0&&e.textMargin>0)switch(e.valign){case"top":case"start":h=o(()=>Math.round(e.y+e.textMargin),"yfunc");break;case"middle":case"center":h=o(()=>Math.round(e.y+(r+n+e.textMargin)/2),"yfunc");break;case"bottom":case"end":h=o(()=>Math.round(e.y+(r+n+2*e.textMargin)-e.textMargin),"yfunc");break}if(e.anchor!==void 0&&e.textMargin!==void 0&&e.width!==void 0)switch(e.anchor){case"left":case"start":e.x=Math.round(e.x+e.textMargin),e.anchor="start",e.dominantBaseline="middle",e.alignmentBaseline="middle";break;case"middle":case"center":e.x=Math.round(e.x+e.width/2),e.anchor="middle",e.dominantBaseline="middle",e.alignmentBaseline="middle";break;case"right":case"end":e.x=Math.round(e.x+e.width-e.textMargin),e.anchor="end",e.dominantBaseline="middle",e.alignmentBaseline="middle";break}for(let[f,d]of i.entries()){e.textMargin!==void 0&&e.textMargin===0&&a!==void 0&&(u=f*a);let p=t.append("text");p.attr("x",e.x),p.attr("y",h()),e.anchor!==void 0&&p.attr("text-anchor",e.anchor).attr("dominant-baseline",e.dominantBaseline).attr("alignment-baseline",e.alignmentBaseline),e.fontFamily!==void 0&&p.style("font-family",e.fontFamily),s!==void 0&&p.style("font-size",s),e.fontWeight!==void 0&&p.style("font-weight",e.fontWeight),e.fill!==void 0&&p.attr("fill",e.fill),e.class!==void 0&&p.attr("class",e.class),e.dy!==void 0?p.attr("dy",e.dy):u!==0&&p.attr("dy",u);let m=d||K_;if(e.tspan){let g=p.append("tspan");g.attr("x",e.x),e.fill!==void 0&&g.attr("fill",e.fill),g.text(m)}else p.text(m);e.valign!==void 0&&e.textMargin!==void 0&&e.textMargin>0&&(n+=(p._groups||p)[0][0].getBBox().height,r=n),l.push(p)}return l},"drawText"),ide=o(function(t,e){function r(i,a,s,l,u){return i+","+a+" "+(i+s)+","+a+" "+(i+s)+","+(a+l-u)+" "+(i+s-u*1.2)+","+(a+l)+" "+i+","+(a+l)}o(r,"genPoints");let n=t.append("polygon");return n.attr("points",r(e.x,e.y,e.width,e.height,7)),n.attr("class","labelBox"),e.y=e.y+e.height/2,E0(t,e),n},"drawLabel"),Fc=-1,CO=o((t,e,r,n)=>{t.select&&r.forEach(i=>{let a=e.get(i),s=t.select("#actor"+a.actorCnt);!n.mirrorActors&&a.stopy?s.attr("y2",a.stopy+a.height/2):n.mirrorActors&&s.attr("y2",a.stopy)})},"fixLifeLineHeights"),xHe=o(function(t,e,r,n){let i=n?e.stopy:e.starty,a=e.x+e.width/2,s=i+e.height,l=t.append("g").lower();var u=l;n||(Fc++,Object.keys(e.links||{}).length&&!r.forceMenus&&u.attr("onclick",vHe(`actor${Fc}_popup`)).attr("cursor","pointer"),u.append("line").attr("id","actor"+Fc).attr("x1",a).attr("y1",s).attr("x2",a).attr("y2",2e3).attr("class","actor-line 200").attr("stroke-width","0.5px").attr("stroke","#999").attr("name",e.name),u=l.append("g"),e.actorCnt=Fc,e.links!=null&&u.attr("id","root-"+Fc));let h=Sl();var f="actor";e.properties?.class?f=e.properties.class:h.fill="#eaeaea",n?f+=` ${nde}`:f+=` ${rde}`,h.x=e.x,h.y=i,h.width=e.width,h.height=e.height,h.class=f,h.rx=3,h.ry=3,h.name=e.name;let d=SO(u,h);if(e.rectData=h,e.properties?.icon){let m=e.properties.icon.trim();m.charAt(0)==="@"?RY(u,h.x+h.width-20,h.y+10,m.substr(1)):NY(u,h.x+h.width-20,h.y+10,m)}AO(r,pi(e.description))(e.description,u,h.x,h.y,h.width,h.height,{class:`actor ${gHe}`},r);let p=e.height;if(d.node){let m=d.node().getBBox();e.height=m.height,p=m.height}return p},"drawActorTypeParticipant"),bHe=o(function(t,e,r,n){let i=n?e.stopy:e.starty,a=e.x+e.width/2,s=i+80,l=t.append("g").lower();n||(Fc++,l.append("line").attr("id","actor"+Fc).attr("x1",a).attr("y1",s).attr("x2",a).attr("y2",2e3).attr("class","actor-line 200").attr("stroke-width","0.5px").attr("stroke","#999").attr("name",e.name),e.actorCnt=Fc);let u=t.append("g"),h=tde;n?h+=` ${nde}`:h+=` ${rde}`,u.attr("class",h),u.attr("name",e.name);let f=Sl();f.x=e.x,f.y=i,f.fill="#eaeaea",f.width=e.width,f.height=e.height,f.class="actor",f.rx=3,f.ry=3,u.append("line").attr("id","actor-man-torso"+Fc).attr("x1",a).attr("y1",i+25).attr("x2",a).attr("y2",i+45),u.append("line").attr("id","actor-man-arms"+Fc).attr("x1",a-pf/2).attr("y1",i+33).attr("x2",a+pf/2).attr("y2",i+33),u.append("line").attr("x1",a-pf/2).attr("y1",i+60).attr("x2",a).attr("y2",i+45),u.append("line").attr("x1",a).attr("y1",i+45).attr("x2",a+pf/2-2).attr("y2",i+60);let d=u.append("circle");d.attr("cx",e.x+e.width/2),d.attr("cy",i+10),d.attr("r",15),d.attr("width",e.width),d.attr("height",e.height);let p=u.node().getBBox();return e.height=p.height,AO(r,pi(e.description))(e.description,u,f.x,f.y+35,f.width,f.height,{class:`actor ${tde}`},r),e.height},"drawActorTypeActor"),wHe=o(async function(t,e,r,n){switch(e.type){case"actor":return await bHe(t,e,r,n);case"participant":return await xHe(t,e,r,n)}},"drawActor"),THe=o(function(t,e,r){let i=t.append("g");ade(i,e),e.name&&AO(r)(e.name,i,e.x,e.y+(e.textMaxHeight||0)/2,e.width,0,{class:"text"},r),i.lower()},"drawBox"),kHe=o(function(t){return t.append("g")},"anchorElement"),EHe=o(function(t,e,r,n,i){let a=Sl(),s=e.anchored;a.x=e.startx,a.y=e.starty,a.class="activation"+i%3,a.width=e.stopx-e.startx,a.height=r-e.starty,SO(s,a)},"drawActivation"),SHe=o(async function(t,e,r,n){let{boxMargin:i,boxTextMargin:a,labelBoxHeight:s,labelBoxWidth:l,messageFontFamily:u,messageFontSize:h,messageFontWeight:f}=n,d=t.append("g"),p=o(function(y,v,x,b){return d.append("line").attr("x1",y).attr("y1",v).attr("x2",x).attr("y2",b).attr("class","loopLine")},"drawLoopLine");p(e.startx,e.starty,e.stopx,e.starty),p(e.stopx,e.starty,e.stopx,e.stopy),p(e.startx,e.stopy,e.stopx,e.stopy),p(e.startx,e.starty,e.startx,e.stopy),e.sections!==void 0&&e.sections.forEach(function(y){p(e.startx,y.y,e.stopx,y.y).style("stroke-dasharray","3, 3")});let m=Yy();m.text=r,m.x=e.startx,m.y=e.starty,m.fontFamily=u,m.fontSize=h,m.fontWeight=f,m.anchor="middle",m.valign="middle",m.tspan=!1,m.width=l||50,m.height=s||20,m.textMargin=a,m.class="labelText",ide(d,m),m=sde(),m.text=e.title,m.x=e.startx+l/2+(e.stopx-e.startx)/2,m.y=e.starty+i+a,m.anchor="middle",m.valign="middle",m.textMargin=a,m.class="loopText",m.fontFamily=u,m.fontSize=h,m.fontWeight=f,m.wrap=!0;let g=pi(m.text)?await wx(d,m,e):E0(d,m);if(e.sectionTitles!==void 0){for(let[y,v]of Object.entries(e.sectionTitles))if(v.message){m.text=v.message,m.x=e.startx+(e.stopx-e.startx)/2,m.y=e.sections[y].y+i+a,m.class="loopText",m.anchor="middle",m.valign="middle",m.tspan=!1,m.fontFamily=u,m.fontSize=h,m.fontWeight=f,m.wrap=e.wrap,pi(m.text)?(e.starty=e.sections[y].y,await wx(d,m,e)):E0(d,m);let x=Math.round(g.map(b=>(b._groups||b)[0][0].getBBox().height).reduce((b,w)=>b+w));e.sections[y].height+=x-(i+a)}}return e.height=Math.round(e.stopy-e.starty),d},"drawLoop"),ade=o(function(t,e){Y3(t,e)},"drawBackgroundRect"),CHe=o(function(t){t.append("defs").append("symbol").attr("id","database").attr("fill-rule","evenodd").attr("clip-rule","evenodd").append("path").attr("transform","scale(.5)").attr("d","M12.258.001l.256.004.255.005.253.008.251.01.249.012.247.015.246.016.242.019.241.02.239.023.236.024.233.027.231.028.229.031.225.032.223.034.22.036.217.038.214.04.211.041.208.043.205.045.201.046.198.048.194.05.191.051.187.053.183.054.18.056.175.057.172.059.168.06.163.061.16.063.155.064.15.066.074.033.073.033.071.034.07.034.069.035.068.035.067.035.066.035.064.036.064.036.062.036.06.036.06.037.058.037.058.037.055.038.055.038.053.038.052.038.051.039.05.039.048.039.047.039.045.04.044.04.043.04.041.04.04.041.039.041.037.041.036.041.034.041.033.042.032.042.03.042.029.042.027.042.026.043.024.043.023.043.021.043.02.043.018.044.017.043.015.044.013.044.012.044.011.045.009.044.007.045.006.045.004.045.002.045.001.045v17l-.001.045-.002.045-.004.045-.006.045-.007.045-.009.044-.011.045-.012.044-.013.044-.015.044-.017.043-.018.044-.02.043-.021.043-.023.043-.024.043-.026.043-.027.042-.029.042-.03.042-.032.042-.033.042-.034.041-.036.041-.037.041-.039.041-.04.041-.041.04-.043.04-.044.04-.045.04-.047.039-.048.039-.05.039-.051.039-.052.038-.053.038-.055.038-.055.038-.058.037-.058.037-.06.037-.06.036-.062.036-.064.036-.064.036-.066.035-.067.035-.068.035-.069.035-.07.034-.071.034-.073.033-.074.033-.15.066-.155.064-.16.063-.163.061-.168.06-.172.059-.175.057-.18.056-.183.054-.187.053-.191.051-.194.05-.198.048-.201.046-.205.045-.208.043-.211.041-.214.04-.217.038-.22.036-.223.034-.225.032-.229.031-.231.028-.233.027-.236.024-.239.023-.241.02-.242.019-.246.016-.247.015-.249.012-.251.01-.253.008-.255.005-.256.004-.258.001-.258-.001-.256-.004-.255-.005-.253-.008-.251-.01-.249-.012-.247-.015-.245-.016-.243-.019-.241-.02-.238-.023-.236-.024-.234-.027-.231-.028-.228-.031-.226-.032-.223-.034-.22-.036-.217-.038-.214-.04-.211-.041-.208-.043-.204-.045-.201-.046-.198-.048-.195-.05-.19-.051-.187-.053-.184-.054-.179-.056-.176-.057-.172-.059-.167-.06-.164-.061-.159-.063-.155-.064-.151-.066-.074-.033-.072-.033-.072-.034-.07-.034-.069-.035-.068-.035-.067-.035-.066-.035-.064-.036-.063-.036-.062-.036-.061-.036-.06-.037-.058-.037-.057-.037-.056-.038-.055-.038-.053-.038-.052-.038-.051-.039-.049-.039-.049-.039-.046-.039-.046-.04-.044-.04-.043-.04-.041-.04-.04-.041-.039-.041-.037-.041-.036-.041-.034-.041-.033-.042-.032-.042-.03-.042-.029-.042-.027-.042-.026-.043-.024-.043-.023-.043-.021-.043-.02-.043-.018-.044-.017-.043-.015-.044-.013-.044-.012-.044-.011-.045-.009-.044-.007-.045-.006-.045-.004-.045-.002-.045-.001-.045v-17l.001-.045.002-.045.004-.045.006-.045.007-.045.009-.044.011-.045.012-.044.013-.044.015-.044.017-.043.018-.044.02-.043.021-.043.023-.043.024-.043.026-.043.027-.042.029-.042.03-.042.032-.042.033-.042.034-.041.036-.041.037-.041.039-.041.04-.041.041-.04.043-.04.044-.04.046-.04.046-.039.049-.039.049-.039.051-.039.052-.038.053-.038.055-.038.056-.038.057-.037.058-.037.06-.037.061-.036.062-.036.063-.036.064-.036.066-.035.067-.035.068-.035.069-.035.07-.034.072-.034.072-.033.074-.033.151-.066.155-.064.159-.063.164-.061.167-.06.172-.059.176-.057.179-.056.184-.054.187-.053.19-.051.195-.05.198-.048.201-.046.204-.045.208-.043.211-.041.214-.04.217-.038.22-.036.223-.034.226-.032.228-.031.231-.028.234-.027.236-.024.238-.023.241-.02.243-.019.245-.016.247-.015.249-.012.251-.01.253-.008.255-.005.256-.004.258-.001.258.001zm-9.258 20.499v.01l.001.021.003.021.004.022.005.021.006.022.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.023.018.024.019.024.021.024.022.025.023.024.024.025.052.049.056.05.061.051.066.051.07.051.075.051.079.052.084.052.088.052.092.052.097.052.102.051.105.052.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.048.144.049.147.047.152.047.155.047.16.045.163.045.167.043.171.043.176.041.178.041.183.039.187.039.19.037.194.035.197.035.202.033.204.031.209.03.212.029.216.027.219.025.222.024.226.021.23.02.233.018.236.016.24.015.243.012.246.01.249.008.253.005.256.004.259.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.021.224-.024.22-.026.216-.027.212-.028.21-.031.205-.031.202-.034.198-.034.194-.036.191-.037.187-.039.183-.04.179-.04.175-.042.172-.043.168-.044.163-.045.16-.046.155-.046.152-.047.148-.048.143-.049.139-.049.136-.05.131-.05.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.053.083-.051.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.05.023-.024.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.023.01-.022.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.127l-.077.055-.08.053-.083.054-.085.053-.087.052-.09.052-.093.051-.095.05-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.045-.118.044-.12.043-.122.042-.124.042-.126.041-.128.04-.13.04-.132.038-.134.038-.135.037-.138.037-.139.035-.142.035-.143.034-.144.033-.147.032-.148.031-.15.03-.151.03-.153.029-.154.027-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.01-.179.008-.179.008-.181.006-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.006-.179-.008-.179-.008-.178-.01-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.027-.153-.029-.151-.03-.15-.03-.148-.031-.146-.032-.145-.033-.143-.034-.141-.035-.14-.035-.137-.037-.136-.037-.134-.038-.132-.038-.13-.04-.128-.04-.126-.041-.124-.042-.122-.042-.12-.044-.117-.043-.116-.045-.113-.045-.112-.046-.109-.047-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.05-.093-.052-.09-.051-.087-.052-.085-.053-.083-.054-.08-.054-.077-.054v4.127zm0-5.654v.011l.001.021.003.021.004.021.005.022.006.022.007.022.009.022.01.022.011.023.012.023.013.023.015.024.016.023.017.024.018.024.019.024.021.024.022.024.023.025.024.024.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.052.11.051.114.051.119.052.123.05.127.051.131.05.135.049.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.044.171.042.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.022.23.02.233.018.236.016.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.012.241-.015.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.048.139-.05.136-.049.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.051.051-.049.023-.025.023-.024.021-.025.02-.024.019-.024.018-.024.017-.024.015-.023.014-.023.013-.024.012-.022.01-.023.01-.023.008-.022.006-.022.006-.022.004-.021.004-.022.001-.021.001-.021v-4.139l-.077.054-.08.054-.083.054-.085.052-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.044-.118.044-.12.044-.122.042-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.035-.143.033-.144.033-.147.033-.148.031-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.009-.179.009-.179.007-.181.007-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.007-.179-.007-.179-.009-.178-.009-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.031-.146-.033-.145-.033-.143-.033-.141-.035-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.04-.126-.041-.124-.042-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.051-.093-.051-.09-.051-.087-.053-.085-.052-.083-.054-.08-.054-.077-.054v4.139zm0-5.666v.011l.001.02.003.022.004.021.005.022.006.021.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.024.018.023.019.024.021.025.022.024.023.024.024.025.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.051.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.043.171.043.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.021.23.02.233.018.236.017.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.013.241-.014.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.049.139-.049.136-.049.131-.051.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.049.023-.025.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.022.01-.023.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.153l-.077.054-.08.054-.083.053-.085.053-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.048-.105.048-.106.048-.109.046-.111.046-.114.046-.115.044-.118.044-.12.043-.122.043-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.034-.143.034-.144.033-.147.032-.148.032-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.024-.161.024-.162.023-.163.023-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.01-.178.01-.179.009-.179.007-.181.006-.182.006-.182.004-.184.003-.184.001-.185.001-.185-.001-.184-.001-.184-.003-.182-.004-.182-.006-.181-.006-.179-.007-.179-.009-.178-.01-.176-.01-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.023-.162-.023-.161-.024-.159-.024-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.032-.146-.032-.145-.033-.143-.034-.141-.034-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.041-.126-.041-.124-.041-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.048-.105-.048-.102-.048-.1-.05-.097-.049-.095-.051-.093-.051-.09-.052-.087-.052-.085-.053-.083-.053-.08-.054-.077-.054v4.153zm8.74-8.179l-.257.004-.254.005-.25.008-.247.011-.244.012-.241.014-.237.016-.233.018-.231.021-.226.022-.224.023-.22.026-.216.027-.212.028-.21.031-.205.032-.202.033-.198.034-.194.036-.191.038-.187.038-.183.04-.179.041-.175.042-.172.043-.168.043-.163.045-.16.046-.155.046-.152.048-.148.048-.143.048-.139.049-.136.05-.131.05-.126.051-.123.051-.118.051-.114.052-.11.052-.106.052-.101.052-.096.052-.092.052-.088.052-.083.052-.079.052-.074.051-.07.052-.065.051-.06.05-.056.05-.051.05-.023.025-.023.024-.021.024-.02.025-.019.024-.018.024-.017.023-.015.024-.014.023-.013.023-.012.023-.01.023-.01.022-.008.022-.006.023-.006.021-.004.022-.004.021-.001.021-.001.021.001.021.001.021.004.021.004.022.006.021.006.023.008.022.01.022.01.023.012.023.013.023.014.023.015.024.017.023.018.024.019.024.02.025.021.024.023.024.023.025.051.05.056.05.06.05.065.051.07.052.074.051.079.052.083.052.088.052.092.052.096.052.101.052.106.052.11.052.114.052.118.051.123.051.126.051.131.05.136.05.139.049.143.048.148.048.152.048.155.046.16.046.163.045.168.043.172.043.175.042.179.041.183.04.187.038.191.038.194.036.198.034.202.033.205.032.21.031.212.028.216.027.22.026.224.023.226.022.231.021.233.018.237.016.241.014.244.012.247.011.25.008.254.005.257.004.26.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.022.224-.023.22-.026.216-.027.212-.028.21-.031.205-.032.202-.033.198-.034.194-.036.191-.038.187-.038.183-.04.179-.041.175-.042.172-.043.168-.043.163-.045.16-.046.155-.046.152-.048.148-.048.143-.048.139-.049.136-.05.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.05.051-.05.023-.025.023-.024.021-.024.02-.025.019-.024.018-.024.017-.023.015-.024.014-.023.013-.023.012-.023.01-.023.01-.022.008-.022.006-.023.006-.021.004-.022.004-.021.001-.021.001-.021-.001-.021-.001-.021-.004-.021-.004-.022-.006-.021-.006-.023-.008-.022-.01-.022-.01-.023-.012-.023-.013-.023-.014-.023-.015-.024-.017-.023-.018-.024-.019-.024-.02-.025-.021-.024-.023-.024-.023-.025-.051-.05-.056-.05-.06-.05-.065-.051-.07-.052-.074-.051-.079-.052-.083-.052-.088-.052-.092-.052-.096-.052-.101-.052-.106-.052-.11-.052-.114-.052-.118-.051-.123-.051-.126-.051-.131-.05-.136-.05-.139-.049-.143-.048-.148-.048-.152-.048-.155-.046-.16-.046-.163-.045-.168-.043-.172-.043-.175-.042-.179-.041-.183-.04-.187-.038-.191-.038-.194-.036-.198-.034-.202-.033-.205-.032-.21-.031-.212-.028-.216-.027-.22-.026-.224-.023-.226-.022-.231-.021-.233-.018-.237-.016-.241-.014-.244-.012-.247-.011-.25-.008-.254-.005-.257-.004-.26-.001-.26.001z")},"insertDatabaseIcon"),AHe=o(function(t){t.append("defs").append("symbol").attr("id","computer").attr("width","24").attr("height","24").append("path").attr("transform","scale(.5)").attr("d","M2 2v13h20v-13h-20zm18 11h-16v-9h16v9zm-10.228 6l.466-1h3.524l.467 1h-4.457zm14.228 3h-24l2-6h2.104l-1.33 4h18.45l-1.297-4h2.073l2 6zm-5-10h-14v-7h14v7z")},"insertComputerIcon"),_He=o(function(t){t.append("defs").append("symbol").attr("id","clock").attr("width","24").attr("height","24").append("path").attr("transform","scale(.5)").attr("d","M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm0-2c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm5.848 12.459c.202.038.202.333.001.372-1.907.361-6.045 1.111-6.547 1.111-.719 0-1.301-.582-1.301-1.301 0-.512.77-5.447 1.125-7.445.034-.192.312-.181.343.014l.985 6.238 5.394 1.011z")},"insertClockIcon"),LHe=o(function(t){t.append("defs").append("marker").attr("id","arrowhead").attr("refX",7.9).attr("refY",5).attr("markerUnits","userSpaceOnUse").attr("markerWidth",12).attr("markerHeight",12).attr("orient","auto-start-reverse").append("path").attr("d","M -1 0 L 10 5 L 0 10 z")},"insertArrowHead"),DHe=o(function(t){t.append("defs").append("marker").attr("id","filled-head").attr("refX",15.5).attr("refY",7).attr("markerWidth",20).attr("markerHeight",28).attr("orient","auto").append("path").attr("d","M 18,7 L9,13 L14,7 L9,1 Z")},"insertArrowFilledHead"),NHe=o(function(t){t.append("defs").append("marker").attr("id","sequencenumber").attr("refX",15).attr("refY",15).attr("markerWidth",60).attr("markerHeight",40).attr("orient","auto").append("circle").attr("cx",15).attr("cy",15).attr("r",6)},"insertSequenceNumber"),RHe=o(function(t){t.append("defs").append("marker").attr("id","crosshead").attr("markerWidth",15).attr("markerHeight",8).attr("orient","auto").attr("refX",4).attr("refY",4.5).append("path").attr("fill","none").attr("stroke","#000000").style("stroke-dasharray","0, 0").attr("stroke-width","1pt").attr("d","M 1,2 L 6,7 M 6,2 L 1,7")},"insertArrowCrossHead"),sde=o(function(){return{x:0,y:0,fill:void 0,anchor:void 0,style:"#666",width:void 0,height:void 0,textMargin:0,rx:0,ry:0,tspan:!0,valign:void 0}},"getTextObj"),MHe=o(function(){return{x:0,y:0,fill:"#EDF2AE",stroke:"#666",width:100,anchor:"start",height:100,rx:0,ry:0}},"getNoteRect"),AO=function(){function t(a,s,l,u,h,f,d){let p=s.append("text").attr("x",l+h/2).attr("y",u+f/2+5).style("text-anchor","middle").text(a);i(p,d)}o(t,"byText");function e(a,s,l,u,h,f,d,p){let{actorFontSize:m,actorFontFamily:g,actorFontWeight:y}=p,[v,x]=Fo(m),b=a.split(je.lineBreakRegex);for(let w=0;w<b.length;w++){let _=w*v-v*(b.length-1)/2,T=s.append("text").attr("x",l+h/2).attr("y",u).style("text-anchor","middle").style("font-size",x).style("font-weight",y).style("font-family",g);T.append("tspan").attr("x",l+h/2).attr("dy",_).text(b[w]),T.attr("y",u+f/2).attr("dominant-baseline","central").attr("alignment-baseline","central"),i(T,d)}}o(e,"byTspan");function r(a,s,l,u,h,f,d,p){let m=s.append("switch"),y=m.append("foreignObject").attr("x",l).attr("y",u).attr("width",h).attr("height",f).append("xhtml:div").style("display","table").style("height","100%").style("width","100%");y.append("div").style("display","table-cell").style("text-align","center").style("vertical-align","middle").text(a),e(a,m,l,u,h,f,d,p),i(y,d)}o(r,"byFo");async function n(a,s,l,u,h,f,d,p){let m=await Kf(a,Sr()),g=s.append("switch"),v=g.append("foreignObject").attr("x",l+h/2-m.width/2).attr("y",u+f/2-m.height/2).attr("width",m.width).attr("height",m.height).append("xhtml:div").style("height","100%").style("width","100%");v.append("div").style("text-align","center").style("vertical-align","middle").html(await hh(a,Sr())),e(a,g,l,u,h,f,d,p),i(v,d)}o(n,"byKatex");function i(a,s){for(let l in s)s.hasOwnProperty(l)&&a.attr(l,s[l])}return o(i,"_setTextAttrs"),function(a,s=!1){return s?n:a.textPlacement==="fo"?r:a.textPlacement==="old"?t:e}}(),IHe=function(){function t(i,a,s,l,u,h,f){let d=a.append("text").attr("x",s).attr("y",l).style("text-anchor","start").text(i);n(d,f)}o(t,"byText");function e(i,a,s,l,u,h,f,d){let{actorFontSize:p,actorFontFamily:m,actorFontWeight:g}=d,y=i.split(je.lineBreakRegex);for(let v=0;v<y.length;v++){let x=v*p-p*(y.length-1)/2,b=a.append("text").attr("x",s).attr("y",l).style("text-anchor","start").style("font-size",p).style("font-weight",g).style("font-family",m);b.append("tspan").attr("x",s).attr("dy",x).text(y[v]),b.attr("y",l+h/2).attr("dominant-baseline","central").attr("alignment-baseline","central"),n(b,f)}}o(e,"byTspan");function r(i,a,s,l,u,h,f,d){let p=a.append("switch"),g=p.append("foreignObject").attr("x",s).attr("y",l).attr("width",u).attr("height",h).append("xhtml:div").style("display","table").style("height","100%").style("width","100%");g.append("div").style("display","table-cell").style("text-align","center").style("vertical-align","middle").text(i),e(i,p,s,l,u,h,f,d),n(g,f)}o(r,"byFo");function n(i,a){for(let s in a)a.hasOwnProperty(s)&&i.attr(s,a[s])}return o(n,"_setTextAttrs"),function(i){return i.textPlacement==="fo"?r:i.textPlacement==="old"?t:e}}(),ui={drawRect:SO,drawText:E0,drawLabel:ide,drawActor:wHe,drawBox:THe,drawPopup:yHe,anchorElement:kHe,drawActivation:EHe,drawLoop:SHe,drawBackgroundRect:ade,insertArrowHead:LHe,insertArrowFilledHead:DHe,insertSequenceNumber:NHe,insertArrowCrossHead:RHe,insertDatabaseIcon:CHe,insertComputerIcon:AHe,insertClockIcon:_He,getTextObj:sde,getNoteRect:MHe,fixLifeLineHeights:CO,sanitizeUrl:EO.sanitizeUrl}});async function PHe(t,e){nt.bumpVerticalPos(10);let{startx:r,stopx:n,message:i}=e,a=je.splitBreaks(i).length,s=pi(i),l=s?await Kf(i,de()):Ut.calculateTextDimensions(i,S0(Le));if(!s){let d=l.height/a;e.height+=d,nt.bumpVerticalPos(d)}let u,h=l.height-10,f=l.width;if(r===n){u=nt.getVerticalPos()+h,Le.rightAngles||(h+=Le.boxMargin,u=nt.getVerticalPos()+h),h+=30;let d=je.getMax(f/2,Le.width/2);nt.insert(r-d,nt.getVerticalPos()-10+h,n+d,nt.getVerticalPos()+30+h)}else h+=Le.boxMargin,u=nt.getVerticalPos()+h,nt.insert(r,u-10,n,u);return nt.bumpVerticalPos(h),e.height+=h,e.stopy=e.starty+e.height,nt.insert(e.fromBounds,e.starty,e.toBounds,e.stopy),u}function zc(t,e,r,n,i){nt.bumpVerticalPos(r);let a=n;if(e.id&&e.message&&t[e.id]){let s=t[e.id].width,l=S0(Le);e.message=Ut.wrapLabel(`[${e.message}]`,s-2*Le.wrapPadding,l),e.width=s,e.wrap=!0;let u=Ut.calculateTextDimensions(e.message,l),h=je.getMax(u.height,Le.labelBoxHeight);a=n+h,Y.debug(`${h} - ${e.message}`)}i(e),nt.bumpVerticalPos(a)}function zHe(t,e,r,n,i,a,s){function l(h,f){h.x<i.get(t.from).x?(nt.insert(e.stopx-f,e.starty,e.startx,e.stopy+h.height/2+Le.noteMargin),e.stopx=e.stopx+f):(nt.insert(e.startx,e.starty,e.stopx+f,e.stopy+h.height/2+Le.noteMargin),e.stopx=e.stopx-f)}o(l,"receiverAdjustment");function u(h,f){h.x<i.get(t.to).x?(nt.insert(e.startx-f,e.starty,e.stopx,e.stopy+h.height/2+Le.noteMargin),e.startx=e.startx+f):(nt.insert(e.stopx,e.starty,e.startx+f,e.stopy+h.height/2+Le.noteMargin),e.startx=e.startx-f)}if(o(u,"senderAdjustment"),a.get(t.to)==n){let h=i.get(t.to),f=h.type=="actor"?pf/2+3:h.width/2+3;l(h,f),h.starty=r-h.height/2,nt.bumpVerticalPos(h.height/2)}else if(s.get(t.from)==n){let h=i.get(t.from);if(Le.mirrorActors){let f=h.type=="actor"?pf/2:h.width/2;u(h,f)}h.stopy=r-h.height/2,nt.bumpVerticalPos(h.height/2)}else if(s.get(t.to)==n){let h=i.get(t.to);if(Le.mirrorActors){let f=h.type=="actor"?pf/2+3:h.width/2+3;l(h,f)}h.stopy=r-h.height/2,nt.bumpVerticalPos(h.height/2)}}async function $He(t,e,r){let n={};for(let i of e)if(t.get(i.to)&&t.get(i.from)){let a=t.get(i.to);if(i.placement===r.db.PLACEMENT.LEFTOF&&!a.prevActor||i.placement===r.db.PLACEMENT.RIGHTOF&&!a.nextActor)continue;let s=i.placement!==void 0,l=!s,u=s?Fg(Le):S0(Le),h=i.wrap?Ut.wrapLabel(i.message,Le.width-2*Le.wrapPadding,u):i.message,d=(pi(h)?await Kf(i.message,de()):Ut.calculateTextDimensions(h,u)).width+2*Le.wrapPadding;l&&i.from===a.nextActor?n[i.to]=je.getMax(n[i.to]||0,d):l&&i.from===a.prevActor?n[i.from]=je.getMax(n[i.from]||0,d):l&&i.from===i.to?(n[i.from]=je.getMax(n[i.from]||0,d/2),n[i.to]=je.getMax(n[i.to]||0,d/2)):i.placement===r.db.PLACEMENT.RIGHTOF?n[i.from]=je.getMax(n[i.from]||0,d):i.placement===r.db.PLACEMENT.LEFTOF?n[a.prevActor]=je.getMax(n[a.prevActor]||0,d):i.placement===r.db.PLACEMENT.OVER&&(a.prevActor&&(n[a.prevActor]=je.getMax(n[a.prevActor]||0,d/2)),a.nextActor&&(n[i.from]=je.getMax(n[i.from]||0,d/2)))}return Y.debug("maxMessageWidthPerActor:",n),n}async function UHe(t,e,r){let n=0;for(let a of t.keys()){let s=t.get(a);s.wrap&&(s.description=Ut.wrapLabel(s.description,Le.width-2*Le.wrapPadding,_O(Le)));let l=pi(s.description)?await Kf(s.description,de()):Ut.calculateTextDimensions(s.description,_O(Le));s.width=s.wrap?Le.width:je.getMax(Le.width,l.width+2*Le.wrapPadding),s.height=s.wrap?je.getMax(l.height,Le.height):Le.height,n=je.getMax(n,s.height)}for(let a in e){let s=t.get(a);if(!s)continue;let l=t.get(s.nextActor);if(!l){let d=e[a]+Le.actorMargin-s.width/2;s.margin=je.getMax(d,Le.actorMargin);continue}let h=e[a]+Le.actorMargin-s.width/2-l.width/2;s.margin=je.getMax(h,Le.actorMargin)}let i=0;return r.forEach(a=>{let s=S0(Le),l=a.actorKeys.reduce((f,d)=>f+=t.get(d).width+(t.get(d).margin||0),0);l-=2*Le.boxTextMargin,a.wrap&&(a.name=Ut.wrapLabel(a.name,l-2*Le.wrapPadding,s));let u=Ut.calculateTextDimensions(a.name,s);i=je.getMax(u.height,i);let h=je.getMax(l,u.width+2*Le.wrapPadding);if(a.margin=Le.boxTextMargin,l<h){let f=(h-l)/2;a.margin+=f}}),r.forEach(a=>a.textMaxHeight=i),je.getMax(n,Le.height)}var Le,nt,OHe,S0,Fg,_O,BHe,FHe,LO,cde,ude,TE,lde,GHe,VHe,HHe,WHe,YHe,hde,fde=M(()=>{"use strict";mr();ode();ht();fr();qy();Vt();ip();hr();ni();Le={},nt={data:{startx:void 0,stopx:void 0,starty:void 0,stopy:void 0},verticalPos:0,sequenceItems:[],activations:[],models:{getHeight:o(function(){return Math.max.apply(null,this.actors.length===0?[0]:this.actors.map(t=>t.height||0))+(this.loops.length===0?0:this.loops.map(t=>t.height||0).reduce((t,e)=>t+e))+(this.messages.length===0?0:this.messages.map(t=>t.height||0).reduce((t,e)=>t+e))+(this.notes.length===0?0:this.notes.map(t=>t.height||0).reduce((t,e)=>t+e))},"getHeight"),clear:o(function(){this.actors=[],this.boxes=[],this.loops=[],this.messages=[],this.notes=[]},"clear"),addBox:o(function(t){this.boxes.push(t)},"addBox"),addActor:o(function(t){this.actors.push(t)},"addActor"),addLoop:o(function(t){this.loops.push(t)},"addLoop"),addMessage:o(function(t){this.messages.push(t)},"addMessage"),addNote:o(function(t){this.notes.push(t)},"addNote"),lastActor:o(function(){return this.actors[this.actors.length-1]},"lastActor"),lastLoop:o(function(){return this.loops[this.loops.length-1]},"lastLoop"),lastMessage:o(function(){return this.messages[this.messages.length-1]},"lastMessage"),lastNote:o(function(){return this.notes[this.notes.length-1]},"lastNote"),actors:[],boxes:[],loops:[],messages:[],notes:[]},init:o(function(){this.sequenceItems=[],this.activations=[],this.models.clear(),this.data={startx:void 0,stopx:void 0,starty:void 0,stopy:void 0},this.verticalPos=0,ude(de())},"init"),updateVal:o(function(t,e,r,n){t[e]===void 0?t[e]=r:t[e]=n(r,t[e])},"updateVal"),updateBounds:o(function(t,e,r,n){let i=this,a=0;function s(l){return o(function(h){a++;let f=i.sequenceItems.length-a+1;i.updateVal(h,"starty",e-f*Le.boxMargin,Math.min),i.updateVal(h,"stopy",n+f*Le.boxMargin,Math.max),i.updateVal(nt.data,"startx",t-f*Le.boxMargin,Math.min),i.updateVal(nt.data,"stopx",r+f*Le.boxMargin,Math.max),l!=="activation"&&(i.updateVal(h,"startx",t-f*Le.boxMargin,Math.min),i.updateVal(h,"stopx",r+f*Le.boxMargin,Math.max),i.updateVal(nt.data,"starty",e-f*Le.boxMargin,Math.min),i.updateVal(nt.data,"stopy",n+f*Le.boxMargin,Math.max))},"updateItemBounds")}o(s,"updateFn"),this.sequenceItems.forEach(s()),this.activations.forEach(s("activation"))},"updateBounds"),insert:o(function(t,e,r,n){let i=je.getMin(t,r),a=je.getMax(t,r),s=je.getMin(e,n),l=je.getMax(e,n);this.updateVal(nt.data,"startx",i,Math.min),this.updateVal(nt.data,"starty",s,Math.min),this.updateVal(nt.data,"stopx",a,Math.max),this.updateVal(nt.data,"stopy",l,Math.max),this.updateBounds(i,s,a,l)},"insert"),newActivation:o(function(t,e,r){let n=r.get(t.from),i=TE(t.from).length||0,a=n.x+n.width/2+(i-1)*Le.activationWidth/2;this.activations.push({startx:a,starty:this.verticalPos+2,stopx:a+Le.activationWidth,stopy:void 0,actor:t.from,anchored:ui.anchorElement(e)})},"newActivation"),endActivation:o(function(t){let e=this.activations.map(function(r){return r.actor}).lastIndexOf(t.from);return this.activations.splice(e,1)[0]},"endActivation"),createLoop:o(function(t={message:void 0,wrap:!1,width:void 0},e){return{startx:void 0,starty:this.verticalPos,stopx:void 0,stopy:void 0,title:t.message,wrap:t.wrap,width:t.width,height:0,fill:e}},"createLoop"),newLoop:o(function(t={message:void 0,wrap:!1,width:void 0},e){this.sequenceItems.push(this.createLoop(t,e))},"newLoop"),endLoop:o(function(){return this.sequenceItems.pop()},"endLoop"),isLoopOverlap:o(function(){return this.sequenceItems.length?this.sequenceItems[this.sequenceItems.length-1].overlap:!1},"isLoopOverlap"),addSectionToLoop:o(function(t){let e=this.sequenceItems.pop();e.sections=e.sections||[],e.sectionTitles=e.sectionTitles||[],e.sections.push({y:nt.getVerticalPos(),height:0}),e.sectionTitles.push(t),this.sequenceItems.push(e)},"addSectionToLoop"),saveVerticalPos:o(function(){this.isLoopOverlap()&&(this.savedVerticalPos=this.verticalPos)},"saveVerticalPos"),resetVerticalPos:o(function(){this.isLoopOverlap()&&(this.verticalPos=this.savedVerticalPos)},"resetVerticalPos"),bumpVerticalPos:o(function(t){this.verticalPos=this.verticalPos+t,this.data.stopy=je.getMax(this.data.stopy,this.verticalPos)},"bumpVerticalPos"),getVerticalPos:o(function(){return this.verticalPos},"getVerticalPos"),getBounds:o(function(){return{bounds:this.data,models:this.models}},"getBounds")},OHe=o(async function(t,e){nt.bumpVerticalPos(Le.boxMargin),e.height=Le.boxMargin,e.starty=nt.getVerticalPos();let r=Sl();r.x=e.startx,r.y=e.starty,r.width=e.width||Le.width,r.class="note";let n=t.append("g"),i=ui.drawRect(n,r),a=Yy();a.x=e.startx,a.y=e.starty,a.width=r.width,a.dy="1em",a.text=e.message,a.class="noteText",a.fontFamily=Le.noteFontFamily,a.fontSize=Le.noteFontSize,a.fontWeight=Le.noteFontWeight,a.anchor=Le.noteAlign,a.textMargin=Le.noteMargin,a.valign="center";let s=pi(a.text)?await wx(n,a):E0(n,a),l=Math.round(s.map(u=>(u._groups||u)[0][0].getBBox().height).reduce((u,h)=>u+h));i.attr("height",l+2*Le.noteMargin),e.height+=l+2*Le.noteMargin,nt.bumpVerticalPos(l+2*Le.noteMargin),e.stopy=e.starty+l+2*Le.noteMargin,e.stopx=e.startx+r.width,nt.insert(e.startx,e.starty,e.stopx,e.stopy),nt.models.addNote(e)},"drawNote"),S0=o(t=>({fontFamily:t.messageFontFamily,fontSize:t.messageFontSize,fontWeight:t.messageFontWeight}),"messageFont"),Fg=o(t=>({fontFamily:t.noteFontFamily,fontSize:t.noteFontSize,fontWeight:t.noteFontWeight}),"noteFont"),_O=o(t=>({fontFamily:t.actorFontFamily,fontSize:t.actorFontSize,fontWeight:t.actorFontWeight}),"actorFont");o(PHe,"boundMessage");BHe=o(async function(t,e,r,n){let{startx:i,stopx:a,starty:s,message:l,type:u,sequenceIndex:h,sequenceVisible:f}=e,d=Ut.calculateTextDimensions(l,S0(Le)),p=Yy();p.x=i,p.y=s+10,p.width=a-i,p.class="messageText",p.dy="1em",p.text=l,p.fontFamily=Le.messageFontFamily,p.fontSize=Le.messageFontSize,p.fontWeight=Le.messageFontWeight,p.anchor=Le.messageAlign,p.valign="center",p.textMargin=Le.wrapPadding,p.tspan=!1,pi(p.text)?await wx(t,p,{startx:i,stopx:a,starty:r}):E0(t,p);let m=d.width,g;i===a?Le.rightAngles?g=t.append("path").attr("d",`M ${i},${r} H ${i+je.getMax(Le.width/2,m/2)} V ${r+25} H ${i}`):g=t.append("path").attr("d","M "+i+","+r+" C "+(i+60)+","+(r-10)+" "+(i+60)+","+(r+30)+" "+i+","+(r+20)):(g=t.append("line"),g.attr("x1",i),g.attr("y1",r),g.attr("x2",a),g.attr("y2",r)),u===n.db.LINETYPE.DOTTED||u===n.db.LINETYPE.DOTTED_CROSS||u===n.db.LINETYPE.DOTTED_POINT||u===n.db.LINETYPE.DOTTED_OPEN||u===n.db.LINETYPE.BIDIRECTIONAL_DOTTED?(g.style("stroke-dasharray","3, 3"),g.attr("class","messageLine1")):g.attr("class","messageLine0");let y="";Le.arrowMarkerAbsolute&&(y=window.location.protocol+"//"+window.location.host+window.location.pathname+window.location.search,y=y.replace(/\(/g,"\\("),y=y.replace(/\)/g,"\\)")),g.attr("stroke-width",2),g.attr("stroke","none"),g.style("fill","none"),(u===n.db.LINETYPE.SOLID||u===n.db.LINETYPE.DOTTED)&&g.attr("marker-end","url("+y+"#arrowhead)"),(u===n.db.LINETYPE.BIDIRECTIONAL_SOLID||u===n.db.LINETYPE.BIDIRECTIONAL_DOTTED)&&(g.attr("marker-start","url("+y+"#arrowhead)"),g.attr("marker-end","url("+y+"#arrowhead)")),(u===n.db.LINETYPE.SOLID_POINT||u===n.db.LINETYPE.DOTTED_POINT)&&g.attr("marker-end","url("+y+"#filled-head)"),(u===n.db.LINETYPE.SOLID_CROSS||u===n.db.LINETYPE.DOTTED_CROSS)&&g.attr("marker-end","url("+y+"#crosshead)"),(f||Le.showSequenceNumbers)&&(g.attr("marker-start","url("+y+"#sequencenumber)"),t.append("text").attr("x",i).attr("y",r+4).attr("font-family","sans-serif").attr("font-size","12px").attr("text-anchor","middle").attr("class","sequenceNumber").text(h))},"drawMessage"),FHe=o(function(t,e,r,n,i,a,s){let l=0,u=0,h,f=0;for(let d of n){let p=e.get(d),m=p.box;h&&h!=m&&(s||nt.models.addBox(h),u+=Le.boxMargin+h.margin),m&&m!=h&&(s||(m.x=l+u,m.y=i),u+=m.margin),p.width=p.width||Le.width,p.height=je.getMax(p.height||Le.height,Le.height),p.margin=p.margin||Le.actorMargin,f=je.getMax(f,p.height),r.get(p.name)&&(u+=p.width/2),p.x=l+u,p.starty=nt.getVerticalPos(),nt.insert(p.x,i,p.x+p.width,p.height),l+=p.width+u,p.box&&(p.box.width=l+m.margin-p.box.x),u=p.margin,h=p.box,nt.models.addActor(p)}h&&!s&&nt.models.addBox(h),nt.bumpVerticalPos(f)},"addActorRenderingData"),LO=o(async function(t,e,r,n){if(n){let i=0;nt.bumpVerticalPos(Le.boxMargin*2);for(let a of r){let s=e.get(a);s.stopy||(s.stopy=nt.getVerticalPos());let l=await ui.drawActor(t,s,Le,!0);i=je.getMax(i,l)}nt.bumpVerticalPos(i+Le.boxMargin)}else for(let i of r){let a=e.get(i);await ui.drawActor(t,a,Le,!1)}},"drawActors"),cde=o(function(t,e,r,n){let i=0,a=0;for(let s of r){let l=e.get(s),u=VHe(l),h=ui.drawPopup(t,l,u,Le,Le.forceMenus,n);h.height>i&&(i=h.height),h.width+l.x>a&&(a=h.width+l.x)}return{maxHeight:i,maxWidth:a}},"drawActorsPopup"),ude=o(function(t){Gn(Le,t),t.fontFamily&&(Le.actorFontFamily=Le.noteFontFamily=Le.messageFontFamily=t.fontFamily),t.fontSize&&(Le.actorFontSize=Le.noteFontSize=Le.messageFontSize=t.fontSize),t.fontWeight&&(Le.actorFontWeight=Le.noteFontWeight=Le.messageFontWeight=t.fontWeight)},"setConf"),TE=o(function(t){return nt.activations.filter(function(e){return e.actor===t})},"actorActivations"),lde=o(function(t,e){let r=e.get(t),n=TE(t),i=n.reduce(function(s,l){return je.getMin(s,l.startx)},r.x+r.width/2-1),a=n.reduce(function(s,l){return je.getMax(s,l.stopx)},r.x+r.width/2+1);return[i,a]},"activationBounds");o(zc,"adjustLoopHeightForWrap");o(zHe,"adjustCreatedDestroyedData");GHe=o(async function(t,e,r,n){let{securityLevel:i,sequence:a}=de();Le=a;let s;i==="sandbox"&&(s=ze("#i"+e));let l=i==="sandbox"?ze(s.nodes()[0].contentDocument.body):ze("body"),u=i==="sandbox"?s.nodes()[0].contentDocument:document;nt.init(),Y.debug(n.db);let h=i==="sandbox"?l.select(`[id="${e}"]`):ze(`[id="${e}"]`),f=n.db.getActors(),d=n.db.getCreatedActors(),p=n.db.getDestroyedActors(),m=n.db.getBoxes(),g=n.db.getActorKeys(),y=n.db.getMessages(),v=n.db.getDiagramTitle(),x=n.db.hasAtLeastOneBox(),b=n.db.hasAtLeastOneBoxWithTitle(),w=await $He(f,y,n);if(Le.height=await UHe(f,w,m),ui.insertComputerIcon(h),ui.insertDatabaseIcon(h),ui.insertClockIcon(h),x&&(nt.bumpVerticalPos(Le.boxMargin),b&&nt.bumpVerticalPos(m[0].textMaxHeight)),Le.hideUnusedParticipants===!0){let F=new Set;y.forEach(B=>{F.add(B.from),F.add(B.to)}),g=g.filter(B=>F.has(B))}FHe(h,f,d,g,0,y,!1);let _=await YHe(y,f,w,n);ui.insertArrowHead(h),ui.insertArrowCrossHead(h),ui.insertArrowFilledHead(h),ui.insertSequenceNumber(h);function T(F,B){let $=nt.endActivation(F);$.starty+18>B&&($.starty=B-6,B+=12),ui.drawActivation(h,$,B,Le,TE(F.from).length),nt.insert($.startx,B-10,$.stopx,B)}o(T,"activeEnd");let E=1,L=1,C=[],A=[],I=0;for(let F of y){let B,$,z;switch(F.type){case n.db.LINETYPE.NOTE:nt.resetVerticalPos(),$=F.noteModel,await OHe(h,$);break;case n.db.LINETYPE.ACTIVE_START:nt.newActivation(F,h,f);break;case n.db.LINETYPE.ACTIVE_END:T(F,nt.getVerticalPos());break;case n.db.LINETYPE.LOOP_START:zc(_,F,Le.boxMargin,Le.boxMargin+Le.boxTextMargin,W=>nt.newLoop(W));break;case n.db.LINETYPE.LOOP_END:B=nt.endLoop(),await ui.drawLoop(h,B,"loop",Le),nt.bumpVerticalPos(B.stopy-nt.getVerticalPos()),nt.models.addLoop(B);break;case n.db.LINETYPE.RECT_START:zc(_,F,Le.boxMargin,Le.boxMargin,W=>nt.newLoop(void 0,W.message));break;case n.db.LINETYPE.RECT_END:B=nt.endLoop(),A.push(B),nt.models.addLoop(B),nt.bumpVerticalPos(B.stopy-nt.getVerticalPos());break;case n.db.LINETYPE.OPT_START:zc(_,F,Le.boxMargin,Le.boxMargin+Le.boxTextMargin,W=>nt.newLoop(W));break;case n.db.LINETYPE.OPT_END:B=nt.endLoop(),await ui.drawLoop(h,B,"opt",Le),nt.bumpVerticalPos(B.stopy-nt.getVerticalPos()),nt.models.addLoop(B);break;case n.db.LINETYPE.ALT_START:zc(_,F,Le.boxMargin,Le.boxMargin+Le.boxTextMargin,W=>nt.newLoop(W));break;case n.db.LINETYPE.ALT_ELSE:zc(_,F,Le.boxMargin+Le.boxTextMargin,Le.boxMargin,W=>nt.addSectionToLoop(W));break;case n.db.LINETYPE.ALT_END:B=nt.endLoop(),await ui.drawLoop(h,B,"alt",Le),nt.bumpVerticalPos(B.stopy-nt.getVerticalPos()),nt.models.addLoop(B);break;case n.db.LINETYPE.PAR_START:case n.db.LINETYPE.PAR_OVER_START:zc(_,F,Le.boxMargin,Le.boxMargin+Le.boxTextMargin,W=>nt.newLoop(W)),nt.saveVerticalPos();break;case n.db.LINETYPE.PAR_AND:zc(_,F,Le.boxMargin+Le.boxTextMargin,Le.boxMargin,W=>nt.addSectionToLoop(W));break;case n.db.LINETYPE.PAR_END:B=nt.endLoop(),await ui.drawLoop(h,B,"par",Le),nt.bumpVerticalPos(B.stopy-nt.getVerticalPos()),nt.models.addLoop(B);break;case n.db.LINETYPE.AUTONUMBER:E=F.message.start||E,L=F.message.step||L,F.message.visible?n.db.enableSequenceNumbers():n.db.disableSequenceNumbers();break;case n.db.LINETYPE.CRITICAL_START:zc(_,F,Le.boxMargin,Le.boxMargin+Le.boxTextMargin,W=>nt.newLoop(W));break;case n.db.LINETYPE.CRITICAL_OPTION:zc(_,F,Le.boxMargin+Le.boxTextMargin,Le.boxMargin,W=>nt.addSectionToLoop(W));break;case n.db.LINETYPE.CRITICAL_END:B=nt.endLoop(),await ui.drawLoop(h,B,"critical",Le),nt.bumpVerticalPos(B.stopy-nt.getVerticalPos()),nt.models.addLoop(B);break;case n.db.LINETYPE.BREAK_START:zc(_,F,Le.boxMargin,Le.boxMargin+Le.boxTextMargin,W=>nt.newLoop(W));break;case n.db.LINETYPE.BREAK_END:B=nt.endLoop(),await ui.drawLoop(h,B,"break",Le),nt.bumpVerticalPos(B.stopy-nt.getVerticalPos()),nt.models.addLoop(B);break;default:try{z=F.msgModel,z.starty=nt.getVerticalPos(),z.sequenceIndex=E,z.sequenceVisible=n.db.showSequenceNumbers();let W=await PHe(h,z);zHe(F,z,W,I,f,d,p),C.push({messageModel:z,lineStartY:W}),nt.models.addMessage(z)}catch(W){Y.error("error while drawing message",W)}}[n.db.LINETYPE.SOLID_OPEN,n.db.LINETYPE.DOTTED_OPEN,n.db.LINETYPE.SOLID,n.db.LINETYPE.DOTTED,n.db.LINETYPE.SOLID_CROSS,n.db.LINETYPE.DOTTED_CROSS,n.db.LINETYPE.SOLID_POINT,n.db.LINETYPE.DOTTED_POINT,n.db.LINETYPE.BIDIRECTIONAL_SOLID,n.db.LINETYPE.BIDIRECTIONAL_DOTTED].includes(F.type)&&(E=E+L),I++}Y.debug("createdActors",d),Y.debug("destroyedActors",p),await LO(h,f,g,!1);for(let F of C)await BHe(h,F.messageModel,F.lineStartY,n);Le.mirrorActors&&await LO(h,f,g,!0),A.forEach(F=>ui.drawBackgroundRect(h,F)),CO(h,f,g,Le);for(let F of nt.models.boxes)F.height=nt.getVerticalPos()-F.y,nt.insert(F.x,F.y,F.x+F.width,F.height),F.startx=F.x,F.starty=F.y,F.stopx=F.startx+F.width,F.stopy=F.starty+F.height,F.stroke="rgb(0,0,0, 0.5)",ui.drawBox(h,F,Le);x&&nt.bumpVerticalPos(Le.boxMargin);let D=cde(h,f,g,u),{bounds:k}=nt.getBounds();k.startx===void 0&&(k.startx=0),k.starty===void 0&&(k.starty=0),k.stopx===void 0&&(k.stopx=0),k.stopy===void 0&&(k.stopy=0);let R=k.stopy-k.starty;R<D.maxHeight&&(R=D.maxHeight);let S=R+2*Le.diagramMarginY;Le.mirrorActors&&(S=S-Le.boxMargin+Le.bottomMarginAdj);let O=k.stopx-k.startx;O<D.maxWidth&&(O=D.maxWidth);let N=O+2*Le.diagramMarginX;v&&h.append("text").text(v).attr("x",(k.stopx-k.startx)/2-2*Le.diagramMarginX).attr("y",-25),Zr(h,S,N,Le.useMaxWidth);let P=v?40:0;h.attr("viewBox",k.startx-Le.diagramMarginX+" -"+(Le.diagramMarginY+P)+" "+N+" "+(S+P)),Y.debug("models:",nt.models)},"draw");o($He,"getMaxMessageWidthPerActor");VHe=o(function(t){let e=0,r=_O(Le);for(let n in t.links){let a=Ut.calculateTextDimensions(n,r).width+2*Le.wrapPadding+2*Le.boxMargin;e<a&&(e=a)}return e},"getRequiredPopupWidth");o(UHe,"calculateActorMargins");HHe=o(async function(t,e,r){let n=e.get(t.from),i=e.get(t.to),a=n.x,s=i.x,l=t.wrap&&t.message,u=pi(t.message)?await Kf(t.message,de()):Ut.calculateTextDimensions(l?Ut.wrapLabel(t.message,Le.width,Fg(Le)):t.message,Fg(Le)),h={width:l?Le.width:je.getMax(Le.width,u.width+2*Le.noteMargin),height:0,startx:n.x,stopx:0,starty:0,stopy:0,message:t.message};return t.placement===r.db.PLACEMENT.RIGHTOF?(h.width=l?je.getMax(Le.width,u.width):je.getMax(n.width/2+i.width/2,u.width+2*Le.noteMargin),h.startx=a+(n.width+Le.actorMargin)/2):t.placement===r.db.PLACEMENT.LEFTOF?(h.width=l?je.getMax(Le.width,u.width+2*Le.noteMargin):je.getMax(n.width/2+i.width/2,u.width+2*Le.noteMargin),h.startx=a-h.width+(n.width-Le.actorMargin)/2):t.to===t.from?(u=Ut.calculateTextDimensions(l?Ut.wrapLabel(t.message,je.getMax(Le.width,n.width),Fg(Le)):t.message,Fg(Le)),h.width=l?je.getMax(Le.width,n.width):je.getMax(n.width,Le.width,u.width+2*Le.noteMargin),h.startx=a+(n.width-h.width)/2):(h.width=Math.abs(a+n.width/2-(s+i.width/2))+Le.actorMargin,h.startx=a<s?a+n.width/2-Le.actorMargin/2:s+i.width/2-Le.actorMargin/2),l&&(h.message=Ut.wrapLabel(t.message,h.width-2*Le.wrapPadding,Fg(Le))),Y.debug(`NM:[${h.startx},${h.stopx},${h.starty},${h.stopy}:${h.width},${h.height}=${t.message}]`),h},"buildNoteModel"),WHe=o(function(t,e,r){if(![r.db.LINETYPE.SOLID_OPEN,r.db.LINETYPE.DOTTED_OPEN,r.db.LINETYPE.SOLID,r.db.LINETYPE.DOTTED,r.db.LINETYPE.SOLID_CROSS,r.db.LINETYPE.DOTTED_CROSS,r.db.LINETYPE.SOLID_POINT,r.db.LINETYPE.DOTTED_POINT,r.db.LINETYPE.BIDIRECTIONAL_SOLID,r.db.LINETYPE.BIDIRECTIONAL_DOTTED].includes(t.type))return{};let[n,i]=lde(t.from,e),[a,s]=lde(t.to,e),l=n<=a,u=l?i:n,h=l?a:s,f=Math.abs(a-s)>2,d=o(y=>l?-y:y,"adjustValue");t.from===t.to?h=u:(t.activate&&!f&&(h+=d(Le.activationWidth/2-1)),[r.db.LINETYPE.SOLID_OPEN,r.db.LINETYPE.DOTTED_OPEN].includes(t.type)||(h+=d(3)),[r.db.LINETYPE.BIDIRECTIONAL_SOLID,r.db.LINETYPE.BIDIRECTIONAL_DOTTED].includes(t.type)&&(u-=d(3)));let p=[n,i,a,s],m=Math.abs(u-h);t.wrap&&t.message&&(t.message=Ut.wrapLabel(t.message,je.getMax(m+2*Le.wrapPadding,Le.width),S0(Le)));let g=Ut.calculateTextDimensions(t.message,S0(Le));return{width:je.getMax(t.wrap?0:g.width+2*Le.wrapPadding,m+2*Le.wrapPadding,Le.width),height:0,startx:u,stopx:h,starty:0,stopy:0,message:t.message,type:t.type,wrap:t.wrap,fromBounds:Math.min.apply(null,p),toBounds:Math.max.apply(null,p)}},"buildMessageModel"),YHe=o(async function(t,e,r,n){let i={},a=[],s,l,u;for(let h of t){switch(h.id=Ut.random({length:10}),h.type){case n.db.LINETYPE.LOOP_START:case n.db.LINETYPE.ALT_START:case n.db.LINETYPE.OPT_START:case n.db.LINETYPE.PAR_START:case n.db.LINETYPE.PAR_OVER_START:case n.db.LINETYPE.CRITICAL_START:case n.db.LINETYPE.BREAK_START:a.push({id:h.id,msg:h.message,from:Number.MAX_SAFE_INTEGER,to:Number.MIN_SAFE_INTEGER,width:0});break;case n.db.LINETYPE.ALT_ELSE:case n.db.LINETYPE.PAR_AND:case n.db.LINETYPE.CRITICAL_OPTION:h.message&&(s=a.pop(),i[s.id]=s,i[h.id]=s,a.push(s));break;case n.db.LINETYPE.LOOP_END:case n.db.LINETYPE.ALT_END:case n.db.LINETYPE.OPT_END:case n.db.LINETYPE.PAR_END:case n.db.LINETYPE.CRITICAL_END:case n.db.LINETYPE.BREAK_END:s=a.pop(),i[s.id]=s;break;case n.db.LINETYPE.ACTIVE_START:{let d=e.get(h.from?h.from:h.to.actor),p=TE(h.from?h.from:h.to.actor).length,m=d.x+d.width/2+(p-1)*Le.activationWidth/2,g={startx:m,stopx:m+Le.activationWidth,actor:h.from,enabled:!0};nt.activations.push(g)}break;case n.db.LINETYPE.ACTIVE_END:{let d=nt.activations.map(p=>p.actor).lastIndexOf(h.from);nt.activations.splice(d,1).splice(0,1)}break}h.placement!==void 0?(l=await HHe(h,e,n),h.noteModel=l,a.forEach(d=>{s=d,s.from=je.getMin(s.from,l.startx),s.to=je.getMax(s.to,l.startx+l.width),s.width=je.getMax(s.width,Math.abs(s.from-s.to))-Le.labelBoxWidth})):(u=WHe(h,e,n),h.msgModel=u,u.startx&&u.stopx&&a.length>0&&a.forEach(d=>{if(s=d,u.startx===u.stopx){let p=e.get(h.from),m=e.get(h.to);s.from=je.getMin(p.x-u.width/2,p.x-p.width/2,s.from),s.to=je.getMax(m.x+u.width/2,m.x+p.width/2,s.to),s.width=je.getMax(s.width,Math.abs(s.to-s.from))-Le.labelBoxWidth}else s.from=je.getMin(u.startx,s.from),s.to=je.getMax(u.stopx,s.to),s.width=je.getMax(s.width,u.width)-Le.labelBoxWidth}))}return nt.activations=[],Y.debug("Loop type widths:",i),i},"calculateLoopBounds"),hde={bounds:nt,drawActors:LO,drawActorsPopup:cde,setConf:ude,draw:GHe}});var dde={};vr(dde,{diagram:()=>qHe});var qHe,pde=M(()=>{"use strict";Hfe();Zfe();ede();fde();qHe={parser:Ufe,db:kO,renderer:hde,styles:Jfe,init:o(({wrap:t})=>{kO.setWrap(t)},"init")}});var DO,kE,NO=M(()=>{"use strict";DO=function(){var t=o(function(X,fe,he,ge){for(he=he||{},ge=X.length;ge--;he[X[ge]]=fe);return he},"o"),e=[1,18],r=[1,19],n=[1,20],i=[1,41],a=[1,42],s=[1,26],l=[1,24],u=[1,25],h=[1,32],f=[1,33],d=[1,34],p=[1,45],m=[1,35],g=[1,36],y=[1,37],v=[1,38],x=[1,27],b=[1,28],w=[1,29],_=[1,30],T=[1,31],E=[1,44],L=[1,46],C=[1,43],A=[1,47],I=[1,9],D=[1,8,9],k=[1,58],R=[1,59],S=[1,60],O=[1,61],N=[1,62],P=[1,63],F=[1,64],B=[1,8,9,41],$=[1,76],z=[1,8,9,12,13,22,39,41,44,66,67,68,69,70,71,72,77,79],W=[1,8,9,12,13,17,20,22,39,41,44,48,58,66,67,68,69,70,71,72,77,79,84,99,101,102],j=[13,58,84,99,101,102],K=[13,58,71,72,84,99,101,102],ie=[13,58,66,67,68,69,70,84,99,101,102],Q=[1,98],ee=[1,115],J=[1,107],H=[1,113],q=[1,108],Z=[1,109],ae=[1,110],ue=[1,111],ce=[1,112],te=[1,114],De=[22,58,59,80,84,85,86,87,88,89],oe=[1,8,9,39,41,44],ke=[1,8,9,22],Fe=[1,143],Be=[1,8,9,59],Ve=[1,8,9,22,58,59,80,84,85,86,87,88,89],Ge={trace:o(function(){},"trace"),yy:{},symbols_:{error:2,start:3,mermaidDoc:4,statements:5,graphConfig:6,CLASS_DIAGRAM:7,NEWLINE:8,EOF:9,statement:10,classLabel:11,SQS:12,STR:13,SQE:14,namespaceName:15,alphaNumToken:16,DOT:17,className:18,classLiteralName:19,GENERICTYPE:20,relationStatement:21,LABEL:22,namespaceStatement:23,classStatement:24,memberStatement:25,annotationStatement:26,clickStatement:27,styleStatement:28,cssClassStatement:29,noteStatement:30,classDefStatement:31,direction:32,acc_title:33,acc_title_value:34,acc_descr:35,acc_descr_value:36,acc_descr_multiline_value:37,namespaceIdentifier:38,STRUCT_START:39,classStatements:40,STRUCT_STOP:41,NAMESPACE:42,classIdentifier:43,STYLE_SEPARATOR:44,members:45,CLASS:46,ANNOTATION_START:47,ANNOTATION_END:48,MEMBER:49,SEPARATOR:50,relation:51,NOTE_FOR:52,noteText:53,NOTE:54,CLASSDEF:55,classList:56,stylesOpt:57,ALPHA:58,COMMA:59,direction_tb:60,direction_bt:61,direction_rl:62,direction_lr:63,relationType:64,lineType:65,AGGREGATION:66,EXTENSION:67,COMPOSITION:68,DEPENDENCY:69,LOLLIPOP:70,LINE:71,DOTTED_LINE:72,CALLBACK:73,LINK:74,LINK_TARGET:75,CLICK:76,CALLBACK_NAME:77,CALLBACK_ARGS:78,HREF:79,STYLE:80,CSSCLASS:81,style:82,styleComponent:83,NUM:84,COLON:85,UNIT:86,SPACE:87,BRKT:88,PCT:89,commentToken:90,textToken:91,graphCodeTokens:92,textNoTagsToken:93,TAGSTART:94,TAGEND:95,"==":96,"--":97,DEFAULT:98,MINUS:99,keywords:100,UNICODE_TEXT:101,BQUOTE_STR:102,$accept:0,$end:1},terminals_:{2:"error",7:"CLASS_DIAGRAM",8:"NEWLINE",9:"EOF",12:"SQS",13:"STR",14:"SQE",17:"DOT",20:"GENERICTYPE",22:"LABEL",33:"acc_title",34:"acc_title_value",35:"acc_descr",36:"acc_descr_value",37:"acc_descr_multiline_value",39:"STRUCT_START",41:"STRUCT_STOP",42:"NAMESPACE",44:"STYLE_SEPARATOR",46:"CLASS",47:"ANNOTATION_START",48:"ANNOTATION_END",49:"MEMBER",50:"SEPARATOR",52:"NOTE_FOR",54:"NOTE",55:"CLASSDEF",58:"ALPHA",59:"COMMA",60:"direction_tb",61:"direction_bt",62:"direction_rl",63:"direction_lr",66:"AGGREGATION",67:"EXTENSION",68:"COMPOSITION",69:"DEPENDENCY",70:"LOLLIPOP",71:"LINE",72:"DOTTED_LINE",73:"CALLBACK",74:"LINK",75:"LINK_TARGET",76:"CLICK",77:"CALLBACK_NAME",78:"CALLBACK_ARGS",79:"HREF",80:"STYLE",81:"CSSCLASS",84:"NUM",85:"COLON",86:"UNIT",87:"SPACE",88:"BRKT",89:"PCT",92:"graphCodeTokens",94:"TAGSTART",95:"TAGEND",96:"==",97:"--",98:"DEFAULT",99:"MINUS",100:"keywords",101:"UNICODE_TEXT",102:"BQUOTE_STR"},productions_:[0,[3,1],[3,1],[4,1],[6,4],[5,1],[5,2],[5,3],[11,3],[15,1],[15,3],[15,2],[18,1],[18,3],[18,1],[18,2],[18,2],[18,2],[10,1],[10,2],[10,1],[10,1],[10,1],[10,1],[10,1],[10,1],[10,1],[10,1],[10,1],[10,1],[10,2],[10,2],[10,1],[23,4],[23,5],[38,2],[40,1],[40,2],[40,3],[24,1],[24,3],[24,4],[24,6],[43,2],[43,3],[26,4],[45,1],[45,2],[25,1],[25,2],[25,1],[25,1],[21,3],[21,4],[21,4],[21,5],[30,3],[30,2],[31,3],[56,1],[56,3],[32,1],[32,1],[32,1],[32,1],[51,3],[51,2],[51,2],[51,1],[64,1],[64,1],[64,1],[64,1],[64,1],[65,1],[65,1],[27,3],[27,4],[27,3],[27,4],[27,4],[27,5],[27,3],[27,4],[27,4],[27,5],[27,4],[27,5],[27,5],[27,6],[28,3],[29,3],[57,1],[57,3],[82,1],[82,2],[83,1],[83,1],[83,1],[83,1],[83,1],[83,1],[83,1],[83,1],[83,1],[90,1],[90,1],[91,1],[91,1],[91,1],[91,1],[91,1],[91,1],[91,1],[93,1],[93,1],[93,1],[93,1],[16,1],[16,1],[16,1],[16,1],[19,1],[53,1]],performAction:o(function(fe,he,ge,ne,ye,U,Te){var se=U.length-1;switch(ye){case 8:this.$=U[se-1];break;case 9:case 12:case 14:this.$=U[se];break;case 10:case 13:this.$=U[se-2]+"."+U[se];break;case 11:case 15:this.$=U[se-1]+U[se];break;case 16:case 17:this.$=U[se-1]+"~"+U[se]+"~";break;case 18:ne.addRelation(U[se]);break;case 19:U[se-1].title=ne.cleanupLabel(U[se]),ne.addRelation(U[se-1]);break;case 30:this.$=U[se].trim(),ne.setAccTitle(this.$);break;case 31:case 32:this.$=U[se].trim(),ne.setAccDescription(this.$);break;case 33:ne.addClassesToNamespace(U[se-3],U[se-1]);break;case 34:ne.addClassesToNamespace(U[se-4],U[se-1]);break;case 35:this.$=U[se],ne.addNamespace(U[se]);break;case 36:this.$=[U[se]];break;case 37:this.$=[U[se-1]];break;case 38:U[se].unshift(U[se-2]),this.$=U[se];break;case 40:ne.setCssClass(U[se-2],U[se]);break;case 41:ne.addMembers(U[se-3],U[se-1]);break;case 42:ne.setCssClass(U[se-5],U[se-3]),ne.addMembers(U[se-5],U[se-1]);break;case 43:this.$=U[se],ne.addClass(U[se]);break;case 44:this.$=U[se-1],ne.addClass(U[se-1]),ne.setClassLabel(U[se-1],U[se]);break;case 45:ne.addAnnotation(U[se],U[se-2]);break;case 46:case 59:this.$=[U[se]];break;case 47:U[se].push(U[se-1]),this.$=U[se];break;case 48:break;case 49:ne.addMember(U[se-1],ne.cleanupLabel(U[se]));break;case 50:break;case 51:break;case 52:this.$={id1:U[se-2],id2:U[se],relation:U[se-1],relationTitle1:"none",relationTitle2:"none"};break;case 53:this.$={id1:U[se-3],id2:U[se],relation:U[se-1],relationTitle1:U[se-2],relationTitle2:"none"};break;case 54:this.$={id1:U[se-3],id2:U[se],relation:U[se-2],relationTitle1:"none",relationTitle2:U[se-1]};break;case 55:this.$={id1:U[se-4],id2:U[se],relation:U[se-2],relationTitle1:U[se-3],relationTitle2:U[se-1]};break;case 56:ne.addNote(U[se],U[se-1]);break;case 57:ne.addNote(U[se]);break;case 58:this.$=U[se-2],ne.defineClass(U[se-1],U[se]);break;case 60:this.$=U[se-2].concat([U[se]]);break;case 61:ne.setDirection("TB");break;case 62:ne.setDirection("BT");break;case 63:ne.setDirection("RL");break;case 64:ne.setDirection("LR");break;case 65:this.$={type1:U[se-2],type2:U[se],lineType:U[se-1]};break;case 66:this.$={type1:"none",type2:U[se],lineType:U[se-1]};break;case 67:this.$={type1:U[se-1],type2:"none",lineType:U[se]};break;case 68:this.$={type1:"none",type2:"none",lineType:U[se]};break;case 69:this.$=ne.relationType.AGGREGATION;break;case 70:this.$=ne.relationType.EXTENSION;break;case 71:this.$=ne.relationType.COMPOSITION;break;case 72:this.$=ne.relationType.DEPENDENCY;break;case 73:this.$=ne.relationType.LOLLIPOP;break;case 74:this.$=ne.lineType.LINE;break;case 75:this.$=ne.lineType.DOTTED_LINE;break;case 76:case 82:this.$=U[se-2],ne.setClickEvent(U[se-1],U[se]);break;case 77:case 83:this.$=U[se-3],ne.setClickEvent(U[se-2],U[se-1]),ne.setTooltip(U[se-2],U[se]);break;case 78:this.$=U[se-2],ne.setLink(U[se-1],U[se]);break;case 79:this.$=U[se-3],ne.setLink(U[se-2],U[se-1],U[se]);break;case 80:this.$=U[se-3],ne.setLink(U[se-2],U[se-1]),ne.setTooltip(U[se-2],U[se]);break;case 81:this.$=U[se-4],ne.setLink(U[se-3],U[se-2],U[se]),ne.setTooltip(U[se-3],U[se-1]);break;case 84:this.$=U[se-3],ne.setClickEvent(U[se-2],U[se-1],U[se]);break;case 85:this.$=U[se-4],ne.setClickEvent(U[se-3],U[se-2],U[se-1]),ne.setTooltip(U[se-3],U[se]);break;case 86:this.$=U[se-3],ne.setLink(U[se-2],U[se]);break;case 87:this.$=U[se-4],ne.setLink(U[se-3],U[se-1],U[se]);break;case 88:this.$=U[se-4],ne.setLink(U[se-3],U[se-1]),ne.setTooltip(U[se-3],U[se]);break;case 89:this.$=U[se-5],ne.setLink(U[se-4],U[se-2],U[se]),ne.setTooltip(U[se-4],U[se-1]);break;case 90:this.$=U[se-2],ne.setCssStyle(U[se-1],U[se]);break;case 91:ne.setCssClass(U[se-1],U[se]);break;case 92:this.$=[U[se]];break;case 93:U[se-2].push(U[se]),this.$=U[se-2];break;case 95:this.$=U[se-1]+U[se];break}},"anonymous"),table:[{3:1,4:2,5:3,6:4,7:[1,6],10:5,16:39,18:21,19:40,21:7,23:8,24:9,25:10,26:11,27:12,28:13,29:14,30:15,31:16,32:17,33:e,35:r,37:n,38:22,42:i,43:23,46:a,47:s,49:l,50:u,52:h,54:f,55:d,58:p,60:m,61:g,62:y,63:v,73:x,74:b,76:w,80:_,81:T,84:E,99:L,101:C,102:A},{1:[3]},{1:[2,1]},{1:[2,2]},{1:[2,3]},t(I,[2,5],{8:[1,48]}),{8:[1,49]},t(D,[2,18],{22:[1,50]}),t(D,[2,20]),t(D,[2,21]),t(D,[2,22]),t(D,[2,23]),t(D,[2,24]),t(D,[2,25]),t(D,[2,26]),t(D,[2,27]),t(D,[2,28]),t(D,[2,29]),{34:[1,51]},{36:[1,52]},t(D,[2,32]),t(D,[2,48],{51:53,64:56,65:57,13:[1,54],22:[1,55],66:k,67:R,68:S,69:O,70:N,71:P,72:F}),{39:[1,65]},t(B,[2,39],{39:[1,67],44:[1,66]}),t(D,[2,50]),t(D,[2,51]),{16:68,58:p,84:E,99:L,101:C},{16:39,18:69,19:40,58:p,84:E,99:L,101:C,102:A},{16:39,18:70,19:40,58:p,84:E,99:L,101:C,102:A},{16:39,18:71,19:40,58:p,84:E,99:L,101:C,102:A},{58:[1,72]},{13:[1,73]},{16:39,18:74,19:40,58:p,84:E,99:L,101:C,102:A},{13:$,53:75},{56:77,58:[1,78]},t(D,[2,61]),t(D,[2,62]),t(D,[2,63]),t(D,[2,64]),t(z,[2,12],{16:39,19:40,18:80,17:[1,79],20:[1,81],58:p,84:E,99:L,101:C,102:A}),t(z,[2,14],{20:[1,82]}),{15:83,16:84,58:p,84:E,99:L,101:C},{16:39,18:85,19:40,58:p,84:E,99:L,101:C,102:A},t(W,[2,118]),t(W,[2,119]),t(W,[2,120]),t(W,[2,121]),t([1,8,9,12,13,20,22,39,41,44,66,67,68,69,70,71,72,77,79],[2,122]),t(I,[2,6],{10:5,21:7,23:8,24:9,25:10,26:11,27:12,28:13,29:14,30:15,31:16,32:17,18:21,38:22,43:23,16:39,19:40,5:86,33:e,35:r,37:n,42:i,46:a,47:s,49:l,50:u,52:h,54:f,55:d,58:p,60:m,61:g,62:y,63:v,73:x,74:b,76:w,80:_,81:T,84:E,99:L,101:C,102:A}),{5:87,10:5,16:39,18:21,19:40,21:7,23:8,24:9,25:10,26:11,27:12,28:13,29:14,30:15,31:16,32:17,33:e,35:r,37:n,38:22,42:i,43:23,46:a,47:s,49:l,50:u,52:h,54:f,55:d,58:p,60:m,61:g,62:y,63:v,73:x,74:b,76:w,80:_,81:T,84:E,99:L,101:C,102:A},t(D,[2,19]),t(D,[2,30]),t(D,[2,31]),{13:[1,89],16:39,18:88,19:40,58:p,84:E,99:L,101:C,102:A},{51:90,64:56,65:57,66:k,67:R,68:S,69:O,70:N,71:P,72:F},t(D,[2,49]),{65:91,71:P,72:F},t(j,[2,68],{64:92,66:k,67:R,68:S,69:O,70:N}),t(K,[2,69]),t(K,[2,70]),t(K,[2,71]),t(K,[2,72]),t(K,[2,73]),t(ie,[2,74]),t(ie,[2,75]),{8:[1,94],24:95,40:93,43:23,46:a},{16:96,58:p,84:E,99:L,101:C},{45:97,49:Q},{48:[1,99]},{13:[1,100]},{13:[1,101]},{77:[1,102],79:[1,103]},{22:ee,57:104,58:J,80:H,82:105,83:106,84:q,85:Z,86:ae,87:ue,88:ce,89:te},{58:[1,116]},{13:$,53:117},t(D,[2,57]),t(D,[2,123]),{22:ee,57:118,58:J,59:[1,119],80:H,82:105,83:106,84:q,85:Z,86:ae,87:ue,88:ce,89:te},t(De,[2,59]),{16:39,18:120,19:40,58:p,84:E,99:L,101:C,102:A},t(z,[2,15]),t(z,[2,16]),t(z,[2,17]),{39:[2,35]},{15:122,16:84,17:[1,121],39:[2,9],58:p,84:E,99:L,101:C},t(oe,[2,43],{11:123,12:[1,124]}),t(I,[2,7]),{9:[1,125]},t(ke,[2,52]),{16:39,18:126,19:40,58:p,84:E,99:L,101:C,102:A},{13:[1,128],16:39,18:127,19:40,58:p,84:E,99:L,101:C,102:A},t(j,[2,67],{64:129,66:k,67:R,68:S,69:O,70:N}),t(j,[2,66]),{41:[1,130]},{24:95,40:131,43:23,46:a},{8:[1,132],41:[2,36]},t(B,[2,40],{39:[1,133]}),{41:[1,134]},{41:[2,46],45:135,49:Q},{16:39,18:136,19:40,58:p,84:E,99:L,101:C,102:A},t(D,[2,76],{13:[1,137]}),t(D,[2,78],{13:[1,139],75:[1,138]}),t(D,[2,82],{13:[1,140],78:[1,141]}),{13:[1,142]},t(D,[2,90],{59:Fe}),t(Be,[2,92],{83:144,22:ee,58:J,80:H,84:q,85:Z,86:ae,87:ue,88:ce,89:te}),t(Ve,[2,94]),t(Ve,[2,96]),t(Ve,[2,97]),t(Ve,[2,98]),t(Ve,[2,99]),t(Ve,[2,100]),t(Ve,[2,101]),t(Ve,[2,102]),t(Ve,[2,103]),t(Ve,[2,104]),t(D,[2,91]),t(D,[2,56]),t(D,[2,58],{59:Fe}),{58:[1,145]},t(z,[2,13]),{15:146,16:84,58:p,84:E,99:L,101:C},{39:[2,11]},t(oe,[2,44]),{13:[1,147]},{1:[2,4]},t(ke,[2,54]),t(ke,[2,53]),{16:39,18:148,19:40,58:p,84:E,99:L,101:C,102:A},t(j,[2,65]),t(D,[2,33]),{41:[1,149]},{24:95,40:150,41:[2,37],43:23,46:a},{45:151,49:Q},t(B,[2,41]),{41:[2,47]},t(D,[2,45]),t(D,[2,77]),t(D,[2,79]),t(D,[2,80],{75:[1,152]}),t(D,[2,83]),t(D,[2,84],{13:[1,153]}),t(D,[2,86],{13:[1,155],75:[1,154]}),{22:ee,58:J,80:H,82:156,83:106,84:q,85:Z,86:ae,87:ue,88:ce,89:te},t(Ve,[2,95]),t(De,[2,60]),{39:[2,10]},{14:[1,157]},t(ke,[2,55]),t(D,[2,34]),{41:[2,38]},{41:[1,158]},t(D,[2,81]),t(D,[2,85]),t(D,[2,87]),t(D,[2,88],{75:[1,159]}),t(Be,[2,93],{83:144,22:ee,58:J,80:H,84:q,85:Z,86:ae,87:ue,88:ce,89:te}),t(oe,[2,8]),t(B,[2,42]),t(D,[2,89])],defaultActions:{2:[2,1],3:[2,2],4:[2,3],83:[2,35],122:[2,11],125:[2,4],135:[2,47],146:[2,10],150:[2,38]},parseError:o(function(fe,he){if(he.recoverable)this.trace(fe);else{var ge=new Error(fe);throw ge.hash=he,ge}},"parseError"),parse:o(function(fe){var he=this,ge=[0],ne=[],ye=[null],U=[],Te=this.table,se="",Ee=0,Ae=0,Pe=0,Me=2,me=1,We=U.slice.call(arguments,1),Re=Object.create(this.lexer),tt={yy:{}};for(var gt in this.yy)Object.prototype.hasOwnProperty.call(this.yy,gt)&&(tt.yy[gt]=this.yy[gt]);Re.setInput(fe,tt.yy),tt.yy.lexer=Re,tt.yy.parser=this,typeof Re.yylloc>"u"&&(Re.yylloc={});var Et=Re.yylloc;U.push(Et);var vt=Re.options&&Re.options.ranges;typeof tt.yy.parseError=="function"?this.parseError=tt.yy.parseError:this.parseError=Object.getPrototypeOf(this).parseError;function Ye(or){ge.length=ge.length-2*or,ye.length=ye.length-or,U.length=U.length-or}o(Ye,"popStack");function Tt(){var or;return or=ne.pop()||Re.lex()||me,typeof or!="number"&&(or instanceof Array&&(ne=or,or=ne.pop()),or=he.symbols_[or]||or),or}o(Tt,"lex");for(var $e,rt,ft,kt,er,dt,Xe={},ct,Lt,Rt,zt;;){if(ft=ge[ge.length-1],this.defaultActions[ft]?kt=this.defaultActions[ft]:(($e===null||typeof $e>"u")&&($e=Tt()),kt=Te[ft]&&Te[ft][$e]),typeof kt>"u"||!kt.length||!kt[0]){var Xn="";zt=[];for(ct in Te[ft])this.terminals_[ct]&&ct>Me&&zt.push("'"+this.terminals_[ct]+"'");Re.showPosition?Xn="Parse error on line "+(Ee+1)+`: +`+Re.showPosition()+` +Expecting `+zt.join(", ")+", got '"+(this.terminals_[$e]||$e)+"'":Xn="Parse error on line "+(Ee+1)+": Unexpected "+($e==me?"end of input":"'"+(this.terminals_[$e]||$e)+"'"),this.parseError(Xn,{text:Re.match,token:this.terminals_[$e]||$e,line:Re.yylineno,loc:Et,expected:zt})}if(kt[0]instanceof Array&&kt.length>1)throw new Error("Parse Error: multiple actions possible at state: "+ft+", token: "+$e);switch(kt[0]){case 1:ge.push($e),ye.push(Re.yytext),U.push(Re.yylloc),ge.push(kt[1]),$e=null,rt?($e=rt,rt=null):(Ae=Re.yyleng,se=Re.yytext,Ee=Re.yylineno,Et=Re.yylloc,Pe>0&&Pe--);break;case 2:if(Lt=this.productions_[kt[1]][1],Xe.$=ye[ye.length-Lt],Xe._$={first_line:U[U.length-(Lt||1)].first_line,last_line:U[U.length-1].last_line,first_column:U[U.length-(Lt||1)].first_column,last_column:U[U.length-1].last_column},vt&&(Xe._$.range=[U[U.length-(Lt||1)].range[0],U[U.length-1].range[1]]),dt=this.performAction.apply(Xe,[se,Ae,Ee,tt.yy,kt[1],ye,U].concat(We)),typeof dt<"u")return dt;Lt&&(ge=ge.slice(0,-1*Lt*2),ye=ye.slice(0,-1*Lt),U=U.slice(0,-1*Lt)),ge.push(this.productions_[kt[1]][0]),ye.push(Xe.$),U.push(Xe._$),Rt=Te[ge[ge.length-2]][ge[ge.length-1]],ge.push(Rt);break;case 3:return!0}}return!0},"parse")},He=function(){var X={EOF:1,parseError:o(function(he,ge){if(this.yy.parser)this.yy.parser.parseError(he,ge);else throw new Error(he)},"parseError"),setInput:o(function(fe,he){return this.yy=he||this.yy||{},this._input=fe,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},"setInput"),input:o(function(){var fe=this._input[0];this.yytext+=fe,this.yyleng++,this.offset++,this.match+=fe,this.matched+=fe;var he=fe.match(/(?:\r\n?|\n).*/g);return he?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),fe},"input"),unput:o(function(fe){var he=fe.length,ge=fe.split(/(?:\r\n?|\n)/g);this._input=fe+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-he),this.offset-=he;var ne=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),ge.length-1&&(this.yylineno-=ge.length-1);var ye=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:ge?(ge.length===ne.length?this.yylloc.first_column:0)+ne[ne.length-ge.length].length-ge[0].length:this.yylloc.first_column-he},this.options.ranges&&(this.yylloc.range=[ye[0],ye[0]+this.yyleng-he]),this.yyleng=this.yytext.length,this},"unput"),more:o(function(){return this._more=!0,this},"more"),reject:o(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError("Lexical error on line "+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true). +`+this.showPosition(),{text:"",token:null,line:this.yylineno});return this},"reject"),less:o(function(fe){this.unput(this.match.slice(fe))},"less"),pastInput:o(function(){var fe=this.matched.substr(0,this.matched.length-this.match.length);return(fe.length>20?"...":"")+fe.substr(-20).replace(/\n/g,"")},"pastInput"),upcomingInput:o(function(){var fe=this.match;return fe.length<20&&(fe+=this._input.substr(0,20-fe.length)),(fe.substr(0,20)+(fe.length>20?"...":"")).replace(/\n/g,"")},"upcomingInput"),showPosition:o(function(){var fe=this.pastInput(),he=new Array(fe.length+1).join("-");return fe+this.upcomingInput()+` +`+he+"^"},"showPosition"),test_match:o(function(fe,he){var ge,ne,ye;if(this.options.backtrack_lexer&&(ye={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(ye.yylloc.range=this.yylloc.range.slice(0))),ne=fe[0].match(/(?:\r\n?|\n).*/g),ne&&(this.yylineno+=ne.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:ne?ne[ne.length-1].length-ne[ne.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+fe[0].length},this.yytext+=fe[0],this.match+=fe[0],this.matches=fe,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(fe[0].length),this.matched+=fe[0],ge=this.performAction.call(this,this.yy,this,he,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),ge)return ge;if(this._backtrack){for(var U in ye)this[U]=ye[U];return!1}return!1},"test_match"),next:o(function(){if(this.done)return this.EOF;this._input||(this.done=!0);var fe,he,ge,ne;this._more||(this.yytext="",this.match="");for(var ye=this._currentRules(),U=0;U<ye.length;U++)if(ge=this._input.match(this.rules[ye[U]]),ge&&(!he||ge[0].length>he[0].length)){if(he=ge,ne=U,this.options.backtrack_lexer){if(fe=this.test_match(ge,ye[U]),fe!==!1)return fe;if(this._backtrack){he=!1;continue}else return!1}else if(!this.options.flex)break}return he?(fe=this.test_match(he,ye[ne]),fe!==!1?fe:!1):this._input===""?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+`. Unrecognized text. +`+this.showPosition(),{text:"",token:null,line:this.yylineno})},"next"),lex:o(function(){var he=this.next();return he||this.lex()},"lex"),begin:o(function(he){this.conditionStack.push(he)},"begin"),popState:o(function(){var he=this.conditionStack.length-1;return he>0?this.conditionStack.pop():this.conditionStack[0]},"popState"),_currentRules:o(function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},"_currentRules"),topState:o(function(he){return he=this.conditionStack.length-1-Math.abs(he||0),he>=0?this.conditionStack[he]:"INITIAL"},"topState"),pushState:o(function(he){this.begin(he)},"pushState"),stateStackSize:o(function(){return this.conditionStack.length},"stateStackSize"),options:{},performAction:o(function(he,ge,ne,ye){var U=ye;switch(ne){case 0:return 60;case 1:return 61;case 2:return 62;case 3:return 63;case 4:break;case 5:break;case 6:return this.begin("acc_title"),33;break;case 7:return this.popState(),"acc_title_value";break;case 8:return this.begin("acc_descr"),35;break;case 9:return this.popState(),"acc_descr_value";break;case 10:this.begin("acc_descr_multiline");break;case 11:this.popState();break;case 12:return"acc_descr_multiline_value";case 13:return 8;case 14:break;case 15:return 7;case 16:return 7;case 17:return"EDGE_STATE";case 18:this.begin("callback_name");break;case 19:this.popState();break;case 20:this.popState(),this.begin("callback_args");break;case 21:return 77;case 22:this.popState();break;case 23:return 78;case 24:this.popState();break;case 25:return"STR";case 26:this.begin("string");break;case 27:return 80;case 28:return 55;case 29:return this.begin("namespace"),42;break;case 30:return this.popState(),8;break;case 31:break;case 32:return this.begin("namespace-body"),39;break;case 33:return this.popState(),41;break;case 34:return"EOF_IN_STRUCT";case 35:return 8;case 36:break;case 37:return"EDGE_STATE";case 38:return this.begin("class"),46;break;case 39:return this.popState(),8;break;case 40:break;case 41:return this.popState(),this.popState(),41;break;case 42:return this.begin("class-body"),39;break;case 43:return this.popState(),41;break;case 44:return"EOF_IN_STRUCT";case 45:return"EDGE_STATE";case 46:return"OPEN_IN_STRUCT";case 47:break;case 48:return"MEMBER";case 49:return 81;case 50:return 73;case 51:return 74;case 52:return 76;case 53:return 52;case 54:return 54;case 55:return 47;case 56:return 48;case 57:return 79;case 58:this.popState();break;case 59:return"GENERICTYPE";case 60:this.begin("generic");break;case 61:this.popState();break;case 62:return"BQUOTE_STR";case 63:this.begin("bqstring");break;case 64:return 75;case 65:return 75;case 66:return 75;case 67:return 75;case 68:return 67;case 69:return 67;case 70:return 69;case 71:return 69;case 72:return 68;case 73:return 66;case 74:return 70;case 75:return 71;case 76:return 72;case 77:return 22;case 78:return 44;case 79:return 99;case 80:return 17;case 81:return"PLUS";case 82:return 85;case 83:return 59;case 84:return 88;case 85:return 88;case 86:return 89;case 87:return"EQUALS";case 88:return"EQUALS";case 89:return 58;case 90:return 12;case 91:return 14;case 92:return"PUNCTUATION";case 93:return 84;case 94:return 101;case 95:return 87;case 96:return 87;case 97:return 9}},"anonymous"),rules:[/^(?:.*direction\s+TB[^\n]*)/,/^(?:.*direction\s+BT[^\n]*)/,/^(?:.*direction\s+RL[^\n]*)/,/^(?:.*direction\s+LR[^\n]*)/,/^(?:%%(?!\{)*[^\n]*(\r?\n?)+)/,/^(?:%%[^\n]*(\r?\n)*)/,/^(?:accTitle\s*:\s*)/,/^(?:(?!\n||)*[^\n]*)/,/^(?:accDescr\s*:\s*)/,/^(?:(?!\n||)*[^\n]*)/,/^(?:accDescr\s*\{\s*)/,/^(?:[\}])/,/^(?:[^\}]*)/,/^(?:\s*(\r?\n)+)/,/^(?:\s+)/,/^(?:classDiagram-v2\b)/,/^(?:classDiagram\b)/,/^(?:\[\*\])/,/^(?:call[\s]+)/,/^(?:\([\s]*\))/,/^(?:\()/,/^(?:[^(]*)/,/^(?:\))/,/^(?:[^)]*)/,/^(?:["])/,/^(?:[^"]*)/,/^(?:["])/,/^(?:style\b)/,/^(?:classDef\b)/,/^(?:namespace\b)/,/^(?:\s*(\r?\n)+)/,/^(?:\s+)/,/^(?:[{])/,/^(?:[}])/,/^(?:$)/,/^(?:\s*(\r?\n)+)/,/^(?:\s+)/,/^(?:\[\*\])/,/^(?:class\b)/,/^(?:\s*(\r?\n)+)/,/^(?:\s+)/,/^(?:[}])/,/^(?:[{])/,/^(?:[}])/,/^(?:$)/,/^(?:\[\*\])/,/^(?:[{])/,/^(?:[\n])/,/^(?:[^{}\n]*)/,/^(?:cssClass\b)/,/^(?:callback\b)/,/^(?:link\b)/,/^(?:click\b)/,/^(?:note for\b)/,/^(?:note\b)/,/^(?:<<)/,/^(?:>>)/,/^(?:href\b)/,/^(?:[~])/,/^(?:[^~]*)/,/^(?:~)/,/^(?:[`])/,/^(?:[^`]+)/,/^(?:[`])/,/^(?:_self\b)/,/^(?:_blank\b)/,/^(?:_parent\b)/,/^(?:_top\b)/,/^(?:\s*<\|)/,/^(?:\s*\|>)/,/^(?:\s*>)/,/^(?:\s*<)/,/^(?:\s*\*)/,/^(?:\s*o\b)/,/^(?:\s*\(\))/,/^(?:--)/,/^(?:\.\.)/,/^(?::{1}[^:\n;]+)/,/^(?::{3})/,/^(?:-)/,/^(?:\.)/,/^(?:\+)/,/^(?::)/,/^(?:,)/,/^(?:#)/,/^(?:#)/,/^(?:%)/,/^(?:=)/,/^(?:=)/,/^(?:\w+)/,/^(?:\[)/,/^(?:\])/,/^(?:[!"#$%&'*+,-.`?\\/])/,/^(?:[0-9]+)/,/^(?:[\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6]|[\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377]|[\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5]|[\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA]|[\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE]|[\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA]|[\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0]|[\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977]|[\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2]|[\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A]|[\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39]|[\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8]|[\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C]|[\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C]|[\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99]|[\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0]|[\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D]|[\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3]|[\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10]|[\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1]|[\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81]|[\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3]|[\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6]|[\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A]|[\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081]|[\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D]|[\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0]|[\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310]|[\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C]|[\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u1700-\u170C\u170E-\u1711]|[\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7]|[\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C]|[\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16]|[\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF]|[\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC]|[\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D]|[\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D]|[\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3]|[\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F]|[\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128]|[\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184]|[\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3]|[\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6]|[\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE]|[\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C]|[\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D]|[\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC]|[\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B]|[\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788]|[\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805]|[\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB]|[\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28]|[\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5]|[\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4]|[\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E]|[\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D]|[\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36]|[\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D]|[\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC]|[\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF]|[\uFFD2-\uFFD7\uFFDA-\uFFDC])/,/^(?:\s)/,/^(?:\s)/,/^(?:$)/],conditions:{"namespace-body":{rules:[26,33,34,35,36,37,38,49,50,51,52,53,54,55,56,57,60,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,86,87,88,89,90,91,92,93,94,95,97],inclusive:!1},namespace:{rules:[26,29,30,31,32,49,50,51,52,53,54,55,56,57,60,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,86,87,88,89,90,91,92,93,94,95,97],inclusive:!1},"class-body":{rules:[26,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,60,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,86,87,88,89,90,91,92,93,94,95,97],inclusive:!1},class:{rules:[26,39,40,41,42,49,50,51,52,53,54,55,56,57,60,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,86,87,88,89,90,91,92,93,94,95,97],inclusive:!1},acc_descr_multiline:{rules:[11,12,26,49,50,51,52,53,54,55,56,57,60,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,86,87,88,89,90,91,92,93,94,95,97],inclusive:!1},acc_descr:{rules:[9,26,49,50,51,52,53,54,55,56,57,60,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,86,87,88,89,90,91,92,93,94,95,97],inclusive:!1},acc_title:{rules:[7,26,49,50,51,52,53,54,55,56,57,60,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,86,87,88,89,90,91,92,93,94,95,97],inclusive:!1},callback_args:{rules:[22,23,26,49,50,51,52,53,54,55,56,57,60,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,86,87,88,89,90,91,92,93,94,95,97],inclusive:!1},callback_name:{rules:[19,20,21,26,49,50,51,52,53,54,55,56,57,60,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,86,87,88,89,90,91,92,93,94,95,97],inclusive:!1},href:{rules:[26,49,50,51,52,53,54,55,56,57,60,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,86,87,88,89,90,91,92,93,94,95,97],inclusive:!1},struct:{rules:[26,49,50,51,52,53,54,55,56,57,60,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,86,87,88,89,90,91,92,93,94,95,97],inclusive:!1},generic:{rules:[26,49,50,51,52,53,54,55,56,57,58,59,60,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,86,87,88,89,90,91,92,93,94,95,97],inclusive:!1},bqstring:{rules:[26,49,50,51,52,53,54,55,56,57,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,86,87,88,89,90,91,92,93,94,95,97],inclusive:!1},string:{rules:[24,25,26,49,50,51,52,53,54,55,56,57,60,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,86,87,88,89,90,91,92,93,94,95,97],inclusive:!1},INITIAL:{rules:[0,1,2,3,4,5,6,8,10,13,14,15,16,17,18,26,27,28,29,38,49,50,51,52,53,54,55,56,57,60,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97],inclusive:!0}}};return X}();Ge.lexer=He;function xe(){this.yy={}}return o(xe,"Parser"),xe.prototype=Ge,Ge.Parser=xe,new xe}();DO.parser=DO;kE=DO});var yde,Tx,vde=M(()=>{"use strict";Vt();fr();yde=["#","+","~","-",""],Tx=class{static{o(this,"ClassMember")}constructor(e,r){this.memberType=r,this.visibility="",this.classifier="",this.text="";let n=Tr(e,de());this.parseMember(n)}getDisplayDetails(){let e=this.visibility+ou(this.id);this.memberType==="method"&&(e+=`(${ou(this.parameters.trim())})`,this.returnType&&(e+=" : "+ou(this.returnType))),e=e.trim();let r=this.parseClassifier();return{displayText:e,cssStyle:r}}parseMember(e){let r="";if(this.memberType==="method"){let a=/([#+~-])?(.+)\((.*)\)([\s$*])?(.*)([$*])?/.exec(e);if(a){let s=a[1]?a[1].trim():"";if(yde.includes(s)&&(this.visibility=s),this.id=a[2],this.parameters=a[3]?a[3].trim():"",r=a[4]?a[4].trim():"",this.returnType=a[5]?a[5].trim():"",r===""){let l=this.returnType.substring(this.returnType.length-1);/[$*]/.exec(l)&&(r=l,this.returnType=this.returnType.substring(0,this.returnType.length-1))}}}else{let i=e.length,a=e.substring(0,1),s=e.substring(i-1);yde.includes(a)&&(this.visibility=a),/[$*]/.exec(s)&&(r=s),this.id=e.substring(this.visibility===""?0:1,r===""?i:i-1)}this.classifier=r,this.id=this.id.startsWith(" ")?" "+this.id.trim():this.id.trim();let n=`${this.visibility?"\\"+this.visibility:""}${ou(this.id)}${this.memberType==="method"?`(${ou(this.parameters)})${this.returnType?" : "+ou(this.returnType):""}`:""}`;this.text=n.replaceAll("<","<").replaceAll(">",">"),this.text.startsWith("\\<")&&(this.text=this.text.replace("\\<","~"))}parseClassifier(){switch(this.classifier){case"*":return"font-style:italic;";case"$":return"text-decoration:underline;";default:return""}}}});function Tde(t){let e;switch(t){case 0:e="aggregation";break;case 1:e="extension";break;case 2:e="composition";break;case 3:e="dependency";break;case 4:e="lollipop";break;default:e="none"}return e}var EE,SE,Ln,xde,kx,Gg,bde,$l,RO,Ex,C0,A0,QHe,zg,wde,kde,ZHe,JHe,eWe,tWe,rWe,nWe,iWe,Ede,aWe,sWe,oWe,MO,lWe,cWe,uWe,hWe,fWe,dWe,pWe,mWe,mf,Sde,IO,Cde,gWe,yWe,vWe,xWe,bWe,wWe,TWe,$g,OO=M(()=>{"use strict";mr();ht();Vt();fr();hr();ki();vde();EE="classId-",SE=[],Ln=new Map,xde=new Map,kx=[],Gg=[],bde=0,$l=new Map,RO=0,Ex=[],C0=o(t=>je.sanitizeText(t,de()),"sanitizeText"),A0=o(function(t){let e=je.sanitizeText(t,de()),r="",n=e;if(e.indexOf("~")>0){let i=e.split("~");n=C0(i[0]),r=C0(i[1])}return{className:n,type:r}},"splitClassNameAndType"),QHe=o(function(t,e){let r=je.sanitizeText(t,de());e&&(e=C0(e));let{className:n}=A0(r);Ln.get(n).label=e,Ln.get(n).text=`${e}${Ln.get(n).type?`<${Ln.get(n).type}>`:""}`},"setClassLabel"),zg=o(function(t){let e=je.sanitizeText(t,de()),{className:r,type:n}=A0(e);if(Ln.has(r))return;let i=je.sanitizeText(r,de());Ln.set(i,{id:i,type:n,label:i,text:`${i}${n?`<${n}>`:""}`,shape:"classBox",cssClasses:"default",methods:[],members:[],annotations:[],styles:[],domId:EE+i+"-"+bde}),bde++},"addClass"),wde=o(function(t,e){let r={id:`interface${Gg.length}`,label:t,classId:e};Gg.push(r)},"addInterface"),kde=o(function(t){let e=je.sanitizeText(t,de());if(Ln.has(e))return Ln.get(e).domId;throw new Error("Class not found: "+e)},"lookUpDomId"),ZHe=o(function(){SE=[],Ln=new Map,kx=[],Gg=[],Ex=[],Ex.push(Sde),$l=new Map,RO=0,IO="TB",_r()},"clear"),JHe=o(function(t){return Ln.get(t)},"getClass"),eWe=o(function(){return Ln},"getClasses"),tWe=o(function(){return SE},"getRelations"),rWe=o(function(){return kx},"getNotes"),nWe=o(function(t){Y.debug("Adding relation: "+JSON.stringify(t));let e=[mf.LOLLIPOP,mf.AGGREGATION,mf.COMPOSITION,mf.DEPENDENCY,mf.EXTENSION];t.relation.type1===mf.LOLLIPOP&&!e.includes(t.relation.type2)?(zg(t.id2),wde(t.id1,t.id2),t.id1=`interface${Gg.length-1}`):t.relation.type2===mf.LOLLIPOP&&!e.includes(t.relation.type1)?(zg(t.id1),wde(t.id2,t.id1),t.id2=`interface${Gg.length-1}`):(zg(t.id1),zg(t.id2)),t.id1=A0(t.id1).className,t.id2=A0(t.id2).className,t.relationTitle1=je.sanitizeText(t.relationTitle1.trim(),de()),t.relationTitle2=je.sanitizeText(t.relationTitle2.trim(),de()),SE.push(t)},"addRelation"),iWe=o(function(t,e){let r=A0(t).className;Ln.get(r).annotations.push(e)},"addAnnotation"),Ede=o(function(t,e){zg(t);let r=A0(t).className,n=Ln.get(r);if(typeof e=="string"){let i=e.trim();i.startsWith("<<")&&i.endsWith(">>")?n.annotations.push(C0(i.substring(2,i.length-2))):i.indexOf(")")>0?n.methods.push(new Tx(i,"method")):i&&n.members.push(new Tx(i,"attribute"))}},"addMember"),aWe=o(function(t,e){Array.isArray(e)&&(e.reverse(),e.forEach(r=>Ede(t,r)))},"addMembers"),sWe=o(function(t,e){let r={id:`note${kx.length}`,class:e,text:t};kx.push(r)},"addNote"),oWe=o(function(t){return t.startsWith(":")&&(t=t.substring(1)),C0(t.trim())},"cleanupLabel"),MO=o(function(t,e){t.split(",").forEach(function(r){let n=r;/\d/.exec(r[0])&&(n=EE+n);let i=Ln.get(n);i&&(i.cssClasses+=" "+e)})},"setCssClass"),lWe=o(function(t,e){for(let r of t){let n=xde.get(r);n===void 0&&(n={id:r,styles:[],textStyles:[]},xde.set(r,n)),e&&e.forEach(function(i){if(/color/.exec(i)){let a=i.replace("fill","bgFill");n.textStyles.push(a)}n.styles.push(i)}),Ln.forEach(i=>{i.cssClasses.includes(r)&&i.styles.push(...e.flatMap(a=>a.split(",")))})}},"defineClass"),cWe=o(function(t,e){t.split(",").forEach(function(r){e!==void 0&&(Ln.get(r).tooltip=C0(e))})},"setTooltip"),uWe=o(function(t,e){return e&&$l.has(e)?$l.get(e).classes.get(t).tooltip:Ln.get(t).tooltip},"getTooltip"),hWe=o(function(t,e,r){let n=de();t.split(",").forEach(function(i){let a=i;/\d/.exec(i[0])&&(a=EE+a);let s=Ln.get(a);s&&(s.link=Ut.formatUrl(e,n),n.securityLevel==="sandbox"?s.linkTarget="_top":typeof r=="string"?s.linkTarget=C0(r):s.linkTarget="_blank")}),MO(t,"clickable")},"setLink"),fWe=o(function(t,e,r){t.split(",").forEach(function(n){dWe(n,e,r),Ln.get(n).haveCallback=!0}),MO(t,"clickable")},"setClickEvent"),dWe=o(function(t,e,r){let n=je.sanitizeText(t,de());if(de().securityLevel!=="loose"||e===void 0)return;let a=n;if(Ln.has(a)){let s=kde(a),l=[];if(typeof r=="string"){l=r.split(/,(?=(?:(?:[^"]*"){2})*[^"]*$)/);for(let u=0;u<l.length;u++){let h=l[u].trim();h.startsWith('"')&&h.endsWith('"')&&(h=h.substr(1,h.length-2)),l[u]=h}}l.length===0&&l.push(s),Ex.push(function(){let u=document.querySelector(`[id="${s}"]`);u!==null&&u.addEventListener("click",function(){Ut.runFunc(e,...l)},!1)})}},"setClickFunc"),pWe=o(function(t){Ex.forEach(function(e){e(t)})},"bindFunctions"),mWe={LINE:0,DOTTED_LINE:1},mf={AGGREGATION:0,EXTENSION:1,COMPOSITION:2,DEPENDENCY:3,LOLLIPOP:4},Sde=o(function(t){let e=ze(".mermaidTooltip");(e._groups||e)[0][0]===null&&(e=ze("body").append("div").attr("class","mermaidTooltip").style("opacity",0)),ze(t).select("svg").selectAll("g.node").on("mouseover",function(){let i=ze(this);if(i.attr("title")===null)return;let s=this.getBoundingClientRect();e.transition().duration(200).style("opacity",".9"),e.text(i.attr("title")).style("left",window.scrollX+s.left+(s.right-s.left)/2+"px").style("top",window.scrollY+s.top-14+document.body.scrollTop+"px"),e.html(e.html().replace(/<br\/>/g,"<br/>")),i.classed("hover",!0)}).on("mouseout",function(){e.transition().duration(500).style("opacity",0),ze(this).classed("hover",!1)})},"setupToolTips");Ex.push(Sde);IO="TB",Cde=o(()=>IO,"getDirection"),gWe=o(t=>{IO=t},"setDirection"),yWe=o(function(t){$l.has(t)||($l.set(t,{id:t,classes:new Map,children:{},domId:EE+t+"-"+RO}),RO++)},"addNamespace"),vWe=o(function(t){return $l.get(t)},"getNamespace"),xWe=o(function(){return $l},"getNamespaces"),bWe=o(function(t,e){if($l.has(t))for(let r of e){let{className:n}=A0(r);Ln.get(n).parent=t,$l.get(t).classes.set(n,Ln.get(n))}},"addClassesToNamespace"),wWe=o(function(t,e){let r=Ln.get(t);if(!(!e||!r))for(let n of e)n.includes(",")?r.styles.push(...n.split(",")):r.styles.push(n)},"setCssStyle");o(Tde,"getArrowMarker");TWe=o(()=>{let t=[],e=[],r=de();for(let i of $l.keys()){let a=$l.get(i);if(a){let s={id:a.id,label:a.id,isGroup:!0,padding:r.class.padding??16,shape:"rect",cssStyles:["fill: none","stroke: black"],look:r.look};t.push(s)}}for(let i of Ln.keys()){let a=Ln.get(i);if(a){let s=a;s.parentId=a.parent,s.look=r.look,t.push(s)}}let n=0;for(let i of kx){n++;let a={id:i.id,label:i.text,isGroup:!1,shape:"note",padding:r.class.padding??6,cssStyles:["text-align: left","white-space: nowrap",`fill: ${r.themeVariables.noteBkgColor}`,`stroke: ${r.themeVariables.noteBorderColor}`],look:r.look};t.push(a);let s=Ln.get(i.class)?.id??"";if(s){let l={id:`edgeNote${n}`,start:i.id,end:s,type:"normal",thickness:"normal",classes:"relation",arrowTypeStart:"none",arrowTypeEnd:"none",arrowheadStyle:"",labelStyle:[""],style:["fill: none"],pattern:"dotted",look:r.look};e.push(l)}}for(let i of Gg){let a={id:i.id,label:i.label,isGroup:!1,shape:"rect",cssStyles:["opacity: 0;"],look:r.look};t.push(a)}n=0;for(let i of SE){n++;let a={id:p5(i.id1,i.id2,{prefix:"id",counter:n}),start:i.id1,end:i.id2,type:"normal",label:i.title,labelpos:"c",thickness:"normal",classes:"relation",arrowTypeStart:Tde(i.relation.type1),arrowTypeEnd:Tde(i.relation.type2),startLabelRight:i.relationTitle1==="none"?"":i.relationTitle1,endLabelLeft:i.relationTitle2==="none"?"":i.relationTitle2,arrowheadStyle:"",labelStyle:["display: inline-block"],style:i.style||"",pattern:i.relation.lineType==1?"dashed":"solid",look:r.look};e.push(a)}return{nodes:t,edges:e,other:{},config:r,direction:Cde()}},"getData"),$g={setAccTitle:Rr,getAccTitle:Pr,getAccDescription:Fr,setAccDescription:Br,getConfig:o(()=>de().class,"getConfig"),addClass:zg,bindFunctions:pWe,clear:ZHe,getClass:JHe,getClasses:eWe,getNotes:rWe,addAnnotation:iWe,addNote:sWe,getRelations:tWe,addRelation:nWe,getDirection:Cde,setDirection:gWe,addMember:Ede,addMembers:aWe,cleanupLabel:oWe,lineType:mWe,relationType:mf,setClickEvent:fWe,setCssClass:MO,defineClass:lWe,setLink:hWe,getTooltip:uWe,setTooltip:cWe,lookUpDomId:kde,setDiagramTitle:ln,getDiagramTitle:Jr,setClassLabel:QHe,addNamespace:yWe,addClassesToNamespace:bWe,getNamespace:vWe,getNamespaces:xWe,setCssStyle:wWe,getData:TWe}});var kWe,CE,PO=M(()=>{"use strict";kWe=o(t=>`g.classGroup text { + fill: ${t.nodeBorder||t.classText}; + stroke: none; + font-family: ${t.fontFamily}; + font-size: 10px; + + .title { + font-weight: bolder; + } + +} + +.nodeLabel, .edgeLabel { + color: ${t.classText}; +} +.edgeLabel .label rect { + fill: ${t.mainBkg}; +} +.label text { + fill: ${t.classText}; +} + +.labelBkg { + background: ${t.mainBkg}; +} +.edgeLabel .label span { + background: ${t.mainBkg}; +} + +.classTitle { + font-weight: bolder; +} +.node rect, + .node circle, + .node ellipse, + .node polygon, + .node path { + fill: ${t.mainBkg}; + stroke: ${t.nodeBorder}; + stroke-width: 1px; + } + + +.divider { + stroke: ${t.nodeBorder}; + stroke-width: 1; +} + +g.clickable { + cursor: pointer; +} + +g.classGroup rect { + fill: ${t.mainBkg}; + stroke: ${t.nodeBorder}; +} + +g.classGroup line { + stroke: ${t.nodeBorder}; + stroke-width: 1; +} + +.classLabel .box { + stroke: none; + stroke-width: 0; + fill: ${t.mainBkg}; + opacity: 0.5; +} + +.classLabel .label { + fill: ${t.nodeBorder}; + font-size: 10px; +} + +.relation { + stroke: ${t.lineColor}; + stroke-width: 1; + fill: none; +} + +.dashed-line{ + stroke-dasharray: 3; +} + +.dotted-line{ + stroke-dasharray: 1 2; +} + +#compositionStart, .composition { + fill: ${t.lineColor} !important; + stroke: ${t.lineColor} !important; + stroke-width: 1; +} + +#compositionEnd, .composition { + fill: ${t.lineColor} !important; + stroke: ${t.lineColor} !important; + stroke-width: 1; +} + +#dependencyStart, .dependency { + fill: ${t.lineColor} !important; + stroke: ${t.lineColor} !important; + stroke-width: 1; +} + +#dependencyStart, .dependency { + fill: ${t.lineColor} !important; + stroke: ${t.lineColor} !important; + stroke-width: 1; +} + +#extensionStart, .extension { + fill: transparent !important; + stroke: ${t.lineColor} !important; + stroke-width: 1; +} + +#extensionEnd, .extension { + fill: transparent !important; + stroke: ${t.lineColor} !important; + stroke-width: 1; +} + +#aggregationStart, .aggregation { + fill: transparent !important; + stroke: ${t.lineColor} !important; + stroke-width: 1; +} + +#aggregationEnd, .aggregation { + fill: transparent !important; + stroke: ${t.lineColor} !important; + stroke-width: 1; +} + +#lollipopStart, .lollipop { + fill: ${t.mainBkg} !important; + stroke: ${t.lineColor} !important; + stroke-width: 1; +} + +#lollipopEnd, .lollipop { + fill: ${t.mainBkg} !important; + stroke: ${t.lineColor} !important; + stroke-width: 1; +} + +.edgeTerminals { + font-size: 11px; + line-height: initial; +} + +.classTitleText { + text-anchor: middle; + font-size: 18px; + fill: ${t.textColor}; +} +`,"getStyles"),CE=kWe});var EWe,SWe,CWe,AE,BO=M(()=>{"use strict";Vt();ht();j5();Fv();uT();hr();EWe=o((t,e="TB")=>{if(!t.doc)return e;let r=e;for(let n of t.doc)n.stmt==="dir"&&(r=n.value);return r},"getDir"),SWe=o(function(t,e){return e.db.getClasses()},"getClasses"),CWe=o(async function(t,e,r,n){Y.info("REF0:"),Y.info("Drawing class diagram (v3)",e);let{securityLevel:i,state:a,layout:s}=de(),l=n.db.getData(),u=pm(e,i);l.type=n.type,l.layoutAlgorithm=cT(s),l.nodeSpacing=a?.nodeSpacing||50,l.rankSpacing=a?.rankSpacing||50,l.markers=["aggregation","extension","composition","dependency","lollipop"],l.diagramId=e,await Fm(l,u);let h=8;Ut.insertTitle(u,"classDiagramTitleText",a?.titleTopMargin??25,n.db.getDiagramTitle()),zm(u,h,"classDiagram",a?.useMaxWidth??!0)},"draw"),AE={getClasses:SWe,draw:CWe,getDir:EWe}});var Ade={};vr(Ade,{diagram:()=>AWe});var AWe,_de=M(()=>{"use strict";NO();OO();PO();BO();AWe={parser:kE,db:$g,renderer:AE,styles:CE,init:o(t=>{t.class||(t.class={}),t.class.arrowMarkerAbsolute=t.arrowMarkerAbsolute,$g.clear()},"init")}});var Nde={};vr(Nde,{diagram:()=>NWe});var NWe,Rde=M(()=>{"use strict";NO();OO();PO();BO();NWe={parser:kE,db:$g,renderer:AE,styles:CE,init:o(t=>{t.class||(t.class={}),t.class.arrowMarkerAbsolute=t.arrowMarkerAbsolute,$g.clear()},"init")}});var FO,_E,zO=M(()=>{"use strict";FO=function(){var t=o(function(F,B,$,z){for($=$||{},z=F.length;z--;$[F[z]]=B);return $},"o"),e=[1,2],r=[1,3],n=[1,4],i=[2,4],a=[1,9],s=[1,11],l=[1,16],u=[1,17],h=[1,18],f=[1,19],d=[1,32],p=[1,20],m=[1,21],g=[1,22],y=[1,23],v=[1,24],x=[1,26],b=[1,27],w=[1,28],_=[1,29],T=[1,30],E=[1,31],L=[1,34],C=[1,35],A=[1,36],I=[1,37],D=[1,33],k=[1,4,5,16,17,19,21,22,24,25,26,27,28,29,33,35,37,38,42,45,48,49,50,51,54],R=[1,4,5,14,15,16,17,19,21,22,24,25,26,27,28,29,33,35,37,38,42,45,48,49,50,51,54],S=[4,5,16,17,19,21,22,24,25,26,27,28,29,33,35,37,38,42,45,48,49,50,51,54],O={trace:o(function(){},"trace"),yy:{},symbols_:{error:2,start:3,SPACE:4,NL:5,SD:6,document:7,line:8,statement:9,classDefStatement:10,styleStatement:11,cssClassStatement:12,idStatement:13,DESCR:14,"-->":15,HIDE_EMPTY:16,scale:17,WIDTH:18,COMPOSIT_STATE:19,STRUCT_START:20,STRUCT_STOP:21,STATE_DESCR:22,AS:23,ID:24,FORK:25,JOIN:26,CHOICE:27,CONCURRENT:28,note:29,notePosition:30,NOTE_TEXT:31,direction:32,acc_title:33,acc_title_value:34,acc_descr:35,acc_descr_value:36,acc_descr_multiline_value:37,classDef:38,CLASSDEF_ID:39,CLASSDEF_STYLEOPTS:40,DEFAULT:41,style:42,STYLE_IDS:43,STYLEDEF_STYLEOPTS:44,class:45,CLASSENTITY_IDS:46,STYLECLASS:47,direction_tb:48,direction_bt:49,direction_rl:50,direction_lr:51,eol:52,";":53,EDGE_STATE:54,STYLE_SEPARATOR:55,left_of:56,right_of:57,$accept:0,$end:1},terminals_:{2:"error",4:"SPACE",5:"NL",6:"SD",14:"DESCR",15:"-->",16:"HIDE_EMPTY",17:"scale",18:"WIDTH",19:"COMPOSIT_STATE",20:"STRUCT_START",21:"STRUCT_STOP",22:"STATE_DESCR",23:"AS",24:"ID",25:"FORK",26:"JOIN",27:"CHOICE",28:"CONCURRENT",29:"note",31:"NOTE_TEXT",33:"acc_title",34:"acc_title_value",35:"acc_descr",36:"acc_descr_value",37:"acc_descr_multiline_value",38:"classDef",39:"CLASSDEF_ID",40:"CLASSDEF_STYLEOPTS",41:"DEFAULT",42:"style",43:"STYLE_IDS",44:"STYLEDEF_STYLEOPTS",45:"class",46:"CLASSENTITY_IDS",47:"STYLECLASS",48:"direction_tb",49:"direction_bt",50:"direction_rl",51:"direction_lr",53:";",54:"EDGE_STATE",55:"STYLE_SEPARATOR",56:"left_of",57:"right_of"},productions_:[0,[3,2],[3,2],[3,2],[7,0],[7,2],[8,2],[8,1],[8,1],[9,1],[9,1],[9,1],[9,1],[9,2],[9,3],[9,4],[9,1],[9,2],[9,1],[9,4],[9,3],[9,6],[9,1],[9,1],[9,1],[9,1],[9,4],[9,4],[9,1],[9,2],[9,2],[9,1],[10,3],[10,3],[11,3],[12,3],[32,1],[32,1],[32,1],[32,1],[52,1],[52,1],[13,1],[13,1],[13,3],[13,3],[30,1],[30,1]],performAction:o(function(B,$,z,W,j,K,ie){var Q=K.length-1;switch(j){case 3:return W.setRootDoc(K[Q]),K[Q];break;case 4:this.$=[];break;case 5:K[Q]!="nl"&&(K[Q-1].push(K[Q]),this.$=K[Q-1]);break;case 6:case 7:this.$=K[Q];break;case 8:this.$="nl";break;case 12:this.$=K[Q];break;case 13:let q=K[Q-1];q.description=W.trimColon(K[Q]),this.$=q;break;case 14:this.$={stmt:"relation",state1:K[Q-2],state2:K[Q]};break;case 15:let Z=W.trimColon(K[Q]);this.$={stmt:"relation",state1:K[Q-3],state2:K[Q-1],description:Z};break;case 19:this.$={stmt:"state",id:K[Q-3],type:"default",description:"",doc:K[Q-1]};break;case 20:var ee=K[Q],J=K[Q-2].trim();if(K[Q].match(":")){var H=K[Q].split(":");ee=H[0],J=[J,H[1]]}this.$={stmt:"state",id:ee,type:"default",description:J};break;case 21:this.$={stmt:"state",id:K[Q-3],type:"default",description:K[Q-5],doc:K[Q-1]};break;case 22:this.$={stmt:"state",id:K[Q],type:"fork"};break;case 23:this.$={stmt:"state",id:K[Q],type:"join"};break;case 24:this.$={stmt:"state",id:K[Q],type:"choice"};break;case 25:this.$={stmt:"state",id:W.getDividerId(),type:"divider"};break;case 26:this.$={stmt:"state",id:K[Q-1].trim(),note:{position:K[Q-2].trim(),text:K[Q].trim()}};break;case 29:this.$=K[Q].trim(),W.setAccTitle(this.$);break;case 30:case 31:this.$=K[Q].trim(),W.setAccDescription(this.$);break;case 32:case 33:this.$={stmt:"classDef",id:K[Q-1].trim(),classes:K[Q].trim()};break;case 34:this.$={stmt:"style",id:K[Q-1].trim(),styleClass:K[Q].trim()};break;case 35:this.$={stmt:"applyClass",id:K[Q-1].trim(),styleClass:K[Q].trim()};break;case 36:W.setDirection("TB"),this.$={stmt:"dir",value:"TB"};break;case 37:W.setDirection("BT"),this.$={stmt:"dir",value:"BT"};break;case 38:W.setDirection("RL"),this.$={stmt:"dir",value:"RL"};break;case 39:W.setDirection("LR"),this.$={stmt:"dir",value:"LR"};break;case 42:case 43:this.$={stmt:"state",id:K[Q].trim(),type:"default",description:""};break;case 44:this.$={stmt:"state",id:K[Q-2].trim(),classes:[K[Q].trim()],type:"default",description:""};break;case 45:this.$={stmt:"state",id:K[Q-2].trim(),classes:[K[Q].trim()],type:"default",description:""};break}},"anonymous"),table:[{3:1,4:e,5:r,6:n},{1:[3]},{3:5,4:e,5:r,6:n},{3:6,4:e,5:r,6:n},t([1,4,5,16,17,19,22,24,25,26,27,28,29,33,35,37,38,42,45,48,49,50,51,54],i,{7:7}),{1:[2,1]},{1:[2,2]},{1:[2,3],4:a,5:s,8:8,9:10,10:12,11:13,12:14,13:15,16:l,17:u,19:h,22:f,24:d,25:p,26:m,27:g,28:y,29:v,32:25,33:x,35:b,37:w,38:_,42:T,45:E,48:L,49:C,50:A,51:I,54:D},t(k,[2,5]),{9:38,10:12,11:13,12:14,13:15,16:l,17:u,19:h,22:f,24:d,25:p,26:m,27:g,28:y,29:v,32:25,33:x,35:b,37:w,38:_,42:T,45:E,48:L,49:C,50:A,51:I,54:D},t(k,[2,7]),t(k,[2,8]),t(k,[2,9]),t(k,[2,10]),t(k,[2,11]),t(k,[2,12],{14:[1,39],15:[1,40]}),t(k,[2,16]),{18:[1,41]},t(k,[2,18],{20:[1,42]}),{23:[1,43]},t(k,[2,22]),t(k,[2,23]),t(k,[2,24]),t(k,[2,25]),{30:44,31:[1,45],56:[1,46],57:[1,47]},t(k,[2,28]),{34:[1,48]},{36:[1,49]},t(k,[2,31]),{39:[1,50],41:[1,51]},{43:[1,52]},{46:[1,53]},t(R,[2,42],{55:[1,54]}),t(R,[2,43],{55:[1,55]}),t(k,[2,36]),t(k,[2,37]),t(k,[2,38]),t(k,[2,39]),t(k,[2,6]),t(k,[2,13]),{13:56,24:d,54:D},t(k,[2,17]),t(S,i,{7:57}),{24:[1,58]},{24:[1,59]},{23:[1,60]},{24:[2,46]},{24:[2,47]},t(k,[2,29]),t(k,[2,30]),{40:[1,61]},{40:[1,62]},{44:[1,63]},{47:[1,64]},{24:[1,65]},{24:[1,66]},t(k,[2,14],{14:[1,67]}),{4:a,5:s,8:8,9:10,10:12,11:13,12:14,13:15,16:l,17:u,19:h,21:[1,68],22:f,24:d,25:p,26:m,27:g,28:y,29:v,32:25,33:x,35:b,37:w,38:_,42:T,45:E,48:L,49:C,50:A,51:I,54:D},t(k,[2,20],{20:[1,69]}),{31:[1,70]},{24:[1,71]},t(k,[2,32]),t(k,[2,33]),t(k,[2,34]),t(k,[2,35]),t(R,[2,44]),t(R,[2,45]),t(k,[2,15]),t(k,[2,19]),t(S,i,{7:72}),t(k,[2,26]),t(k,[2,27]),{4:a,5:s,8:8,9:10,10:12,11:13,12:14,13:15,16:l,17:u,19:h,21:[1,73],22:f,24:d,25:p,26:m,27:g,28:y,29:v,32:25,33:x,35:b,37:w,38:_,42:T,45:E,48:L,49:C,50:A,51:I,54:D},t(k,[2,21])],defaultActions:{5:[2,1],6:[2,2],46:[2,46],47:[2,47]},parseError:o(function(B,$){if($.recoverable)this.trace(B);else{var z=new Error(B);throw z.hash=$,z}},"parseError"),parse:o(function(B){var $=this,z=[0],W=[],j=[null],K=[],ie=this.table,Q="",ee=0,J=0,H=0,q=2,Z=1,ae=K.slice.call(arguments,1),ue=Object.create(this.lexer),ce={yy:{}};for(var te in this.yy)Object.prototype.hasOwnProperty.call(this.yy,te)&&(ce.yy[te]=this.yy[te]);ue.setInput(B,ce.yy),ce.yy.lexer=ue,ce.yy.parser=this,typeof ue.yylloc>"u"&&(ue.yylloc={});var De=ue.yylloc;K.push(De);var oe=ue.options&&ue.options.ranges;typeof ce.yy.parseError=="function"?this.parseError=ce.yy.parseError:this.parseError=Object.getPrototypeOf(this).parseError;function ke(Te){z.length=z.length-2*Te,j.length=j.length-Te,K.length=K.length-Te}o(ke,"popStack");function Fe(){var Te;return Te=W.pop()||ue.lex()||Z,typeof Te!="number"&&(Te instanceof Array&&(W=Te,Te=W.pop()),Te=$.symbols_[Te]||Te),Te}o(Fe,"lex");for(var Be,Ve,Ge,He,xe,X,fe={},he,ge,ne,ye;;){if(Ge=z[z.length-1],this.defaultActions[Ge]?He=this.defaultActions[Ge]:((Be===null||typeof Be>"u")&&(Be=Fe()),He=ie[Ge]&&ie[Ge][Be]),typeof He>"u"||!He.length||!He[0]){var U="";ye=[];for(he in ie[Ge])this.terminals_[he]&&he>q&&ye.push("'"+this.terminals_[he]+"'");ue.showPosition?U="Parse error on line "+(ee+1)+`: +`+ue.showPosition()+` +Expecting `+ye.join(", ")+", got '"+(this.terminals_[Be]||Be)+"'":U="Parse error on line "+(ee+1)+": Unexpected "+(Be==Z?"end of input":"'"+(this.terminals_[Be]||Be)+"'"),this.parseError(U,{text:ue.match,token:this.terminals_[Be]||Be,line:ue.yylineno,loc:De,expected:ye})}if(He[0]instanceof Array&&He.length>1)throw new Error("Parse Error: multiple actions possible at state: "+Ge+", token: "+Be);switch(He[0]){case 1:z.push(Be),j.push(ue.yytext),K.push(ue.yylloc),z.push(He[1]),Be=null,Ve?(Be=Ve,Ve=null):(J=ue.yyleng,Q=ue.yytext,ee=ue.yylineno,De=ue.yylloc,H>0&&H--);break;case 2:if(ge=this.productions_[He[1]][1],fe.$=j[j.length-ge],fe._$={first_line:K[K.length-(ge||1)].first_line,last_line:K[K.length-1].last_line,first_column:K[K.length-(ge||1)].first_column,last_column:K[K.length-1].last_column},oe&&(fe._$.range=[K[K.length-(ge||1)].range[0],K[K.length-1].range[1]]),X=this.performAction.apply(fe,[Q,J,ee,ce.yy,He[1],j,K].concat(ae)),typeof X<"u")return X;ge&&(z=z.slice(0,-1*ge*2),j=j.slice(0,-1*ge),K=K.slice(0,-1*ge)),z.push(this.productions_[He[1]][0]),j.push(fe.$),K.push(fe._$),ne=ie[z[z.length-2]][z[z.length-1]],z.push(ne);break;case 3:return!0}}return!0},"parse")},N=function(){var F={EOF:1,parseError:o(function($,z){if(this.yy.parser)this.yy.parser.parseError($,z);else throw new Error($)},"parseError"),setInput:o(function(B,$){return this.yy=$||this.yy||{},this._input=B,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},"setInput"),input:o(function(){var B=this._input[0];this.yytext+=B,this.yyleng++,this.offset++,this.match+=B,this.matched+=B;var $=B.match(/(?:\r\n?|\n).*/g);return $?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),B},"input"),unput:o(function(B){var $=B.length,z=B.split(/(?:\r\n?|\n)/g);this._input=B+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-$),this.offset-=$;var W=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),z.length-1&&(this.yylineno-=z.length-1);var j=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:z?(z.length===W.length?this.yylloc.first_column:0)+W[W.length-z.length].length-z[0].length:this.yylloc.first_column-$},this.options.ranges&&(this.yylloc.range=[j[0],j[0]+this.yyleng-$]),this.yyleng=this.yytext.length,this},"unput"),more:o(function(){return this._more=!0,this},"more"),reject:o(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError("Lexical error on line "+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true). +`+this.showPosition(),{text:"",token:null,line:this.yylineno});return this},"reject"),less:o(function(B){this.unput(this.match.slice(B))},"less"),pastInput:o(function(){var B=this.matched.substr(0,this.matched.length-this.match.length);return(B.length>20?"...":"")+B.substr(-20).replace(/\n/g,"")},"pastInput"),upcomingInput:o(function(){var B=this.match;return B.length<20&&(B+=this._input.substr(0,20-B.length)),(B.substr(0,20)+(B.length>20?"...":"")).replace(/\n/g,"")},"upcomingInput"),showPosition:o(function(){var B=this.pastInput(),$=new Array(B.length+1).join("-");return B+this.upcomingInput()+` +`+$+"^"},"showPosition"),test_match:o(function(B,$){var z,W,j;if(this.options.backtrack_lexer&&(j={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(j.yylloc.range=this.yylloc.range.slice(0))),W=B[0].match(/(?:\r\n?|\n).*/g),W&&(this.yylineno+=W.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:W?W[W.length-1].length-W[W.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+B[0].length},this.yytext+=B[0],this.match+=B[0],this.matches=B,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(B[0].length),this.matched+=B[0],z=this.performAction.call(this,this.yy,this,$,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),z)return z;if(this._backtrack){for(var K in j)this[K]=j[K];return!1}return!1},"test_match"),next:o(function(){if(this.done)return this.EOF;this._input||(this.done=!0);var B,$,z,W;this._more||(this.yytext="",this.match="");for(var j=this._currentRules(),K=0;K<j.length;K++)if(z=this._input.match(this.rules[j[K]]),z&&(!$||z[0].length>$[0].length)){if($=z,W=K,this.options.backtrack_lexer){if(B=this.test_match(z,j[K]),B!==!1)return B;if(this._backtrack){$=!1;continue}else return!1}else if(!this.options.flex)break}return $?(B=this.test_match($,j[W]),B!==!1?B:!1):this._input===""?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+`. Unrecognized text. +`+this.showPosition(),{text:"",token:null,line:this.yylineno})},"next"),lex:o(function(){var $=this.next();return $||this.lex()},"lex"),begin:o(function($){this.conditionStack.push($)},"begin"),popState:o(function(){var $=this.conditionStack.length-1;return $>0?this.conditionStack.pop():this.conditionStack[0]},"popState"),_currentRules:o(function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},"_currentRules"),topState:o(function($){return $=this.conditionStack.length-1-Math.abs($||0),$>=0?this.conditionStack[$]:"INITIAL"},"topState"),pushState:o(function($){this.begin($)},"pushState"),stateStackSize:o(function(){return this.conditionStack.length},"stateStackSize"),options:{"case-insensitive":!0},performAction:o(function($,z,W,j){var K=j;switch(W){case 0:return 41;case 1:return 48;case 2:return 49;case 3:return 50;case 4:return 51;case 5:break;case 6:break;case 7:return 5;case 8:break;case 9:break;case 10:break;case 11:break;case 12:return this.pushState("SCALE"),17;break;case 13:return 18;case 14:this.popState();break;case 15:return this.begin("acc_title"),33;break;case 16:return this.popState(),"acc_title_value";break;case 17:return this.begin("acc_descr"),35;break;case 18:return this.popState(),"acc_descr_value";break;case 19:this.begin("acc_descr_multiline");break;case 20:this.popState();break;case 21:return"acc_descr_multiline_value";case 22:return this.pushState("CLASSDEF"),38;break;case 23:return this.popState(),this.pushState("CLASSDEFID"),"DEFAULT_CLASSDEF_ID";break;case 24:return this.popState(),this.pushState("CLASSDEFID"),39;break;case 25:return this.popState(),40;break;case 26:return this.pushState("CLASS"),45;break;case 27:return this.popState(),this.pushState("CLASS_STYLE"),46;break;case 28:return this.popState(),47;break;case 29:return this.pushState("STYLE"),42;break;case 30:return this.popState(),this.pushState("STYLEDEF_STYLES"),43;break;case 31:return this.popState(),44;break;case 32:return this.pushState("SCALE"),17;break;case 33:return 18;case 34:this.popState();break;case 35:this.pushState("STATE");break;case 36:return this.popState(),z.yytext=z.yytext.slice(0,-8).trim(),25;break;case 37:return this.popState(),z.yytext=z.yytext.slice(0,-8).trim(),26;break;case 38:return this.popState(),z.yytext=z.yytext.slice(0,-10).trim(),27;break;case 39:return this.popState(),z.yytext=z.yytext.slice(0,-8).trim(),25;break;case 40:return this.popState(),z.yytext=z.yytext.slice(0,-8).trim(),26;break;case 41:return this.popState(),z.yytext=z.yytext.slice(0,-10).trim(),27;break;case 42:return 48;case 43:return 49;case 44:return 50;case 45:return 51;case 46:this.pushState("STATE_STRING");break;case 47:return this.pushState("STATE_ID"),"AS";break;case 48:return this.popState(),"ID";break;case 49:this.popState();break;case 50:return"STATE_DESCR";case 51:return 19;case 52:this.popState();break;case 53:return this.popState(),this.pushState("struct"),20;break;case 54:break;case 55:return this.popState(),21;break;case 56:break;case 57:return this.begin("NOTE"),29;break;case 58:return this.popState(),this.pushState("NOTE_ID"),56;break;case 59:return this.popState(),this.pushState("NOTE_ID"),57;break;case 60:this.popState(),this.pushState("FLOATING_NOTE");break;case 61:return this.popState(),this.pushState("FLOATING_NOTE_ID"),"AS";break;case 62:break;case 63:return"NOTE_TEXT";case 64:return this.popState(),"ID";break;case 65:return this.popState(),this.pushState("NOTE_TEXT"),24;break;case 66:return this.popState(),z.yytext=z.yytext.substr(2).trim(),31;break;case 67:return this.popState(),z.yytext=z.yytext.slice(0,-8).trim(),31;break;case 68:return 6;case 69:return 6;case 70:return 16;case 71:return 54;case 72:return 24;case 73:return z.yytext=z.yytext.trim(),14;break;case 74:return 15;case 75:return 28;case 76:return 55;case 77:return 5;case 78:return"INVALID"}},"anonymous"),rules:[/^(?:default\b)/i,/^(?:.*direction\s+TB[^\n]*)/i,/^(?:.*direction\s+BT[^\n]*)/i,/^(?:.*direction\s+RL[^\n]*)/i,/^(?:.*direction\s+LR[^\n]*)/i,/^(?:%%(?!\{)[^\n]*)/i,/^(?:[^\}]%%[^\n]*)/i,/^(?:[\n]+)/i,/^(?:[\s]+)/i,/^(?:((?!\n)\s)+)/i,/^(?:#[^\n]*)/i,/^(?:%[^\n]*)/i,/^(?:scale\s+)/i,/^(?:\d+)/i,/^(?:\s+width\b)/i,/^(?:accTitle\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*\{\s*)/i,/^(?:[\}])/i,/^(?:[^\}]*)/i,/^(?:classDef\s+)/i,/^(?:DEFAULT\s+)/i,/^(?:\w+\s+)/i,/^(?:[^\n]*)/i,/^(?:class\s+)/i,/^(?:(\w+)+((,\s*\w+)*))/i,/^(?:[^\n]*)/i,/^(?:style\s+)/i,/^(?:[\w,]+\s+)/i,/^(?:[^\n]*)/i,/^(?:scale\s+)/i,/^(?:\d+)/i,/^(?:\s+width\b)/i,/^(?:state\s+)/i,/^(?:.*<<fork>>)/i,/^(?:.*<<join>>)/i,/^(?:.*<<choice>>)/i,/^(?:.*\[\[fork\]\])/i,/^(?:.*\[\[join\]\])/i,/^(?:.*\[\[choice\]\])/i,/^(?:.*direction\s+TB[^\n]*)/i,/^(?:.*direction\s+BT[^\n]*)/i,/^(?:.*direction\s+RL[^\n]*)/i,/^(?:.*direction\s+LR[^\n]*)/i,/^(?:["])/i,/^(?:\s*as\s+)/i,/^(?:[^\n\{]*)/i,/^(?:["])/i,/^(?:[^"]*)/i,/^(?:[^\n\s\{]+)/i,/^(?:\n)/i,/^(?:\{)/i,/^(?:%%(?!\{)[^\n]*)/i,/^(?:\})/i,/^(?:[\n])/i,/^(?:note\s+)/i,/^(?:left of\b)/i,/^(?:right of\b)/i,/^(?:")/i,/^(?:\s*as\s*)/i,/^(?:["])/i,/^(?:[^"]*)/i,/^(?:[^\n]*)/i,/^(?:\s*[^:\n\s\-]+)/i,/^(?:\s*:[^:\n;]+)/i,/^(?:[\s\S]*?end note\b)/i,/^(?:stateDiagram\s+)/i,/^(?:stateDiagram-v2\s+)/i,/^(?:hide empty description\b)/i,/^(?:\[\*\])/i,/^(?:[^:\n\s\-\{]+)/i,/^(?:\s*:[^:\n;]+)/i,/^(?:-->)/i,/^(?:--)/i,/^(?::::)/i,/^(?:$)/i,/^(?:.)/i],conditions:{LINE:{rules:[9,10],inclusive:!1},struct:{rules:[9,10,22,26,29,35,42,43,44,45,54,55,56,57,71,72,73,74,75],inclusive:!1},FLOATING_NOTE_ID:{rules:[64],inclusive:!1},FLOATING_NOTE:{rules:[61,62,63],inclusive:!1},NOTE_TEXT:{rules:[66,67],inclusive:!1},NOTE_ID:{rules:[65],inclusive:!1},NOTE:{rules:[58,59,60],inclusive:!1},STYLEDEF_STYLEOPTS:{rules:[],inclusive:!1},STYLEDEF_STYLES:{rules:[31],inclusive:!1},STYLE_IDS:{rules:[],inclusive:!1},STYLE:{rules:[30],inclusive:!1},CLASS_STYLE:{rules:[28],inclusive:!1},CLASS:{rules:[27],inclusive:!1},CLASSDEFID:{rules:[25],inclusive:!1},CLASSDEF:{rules:[23,24],inclusive:!1},acc_descr_multiline:{rules:[20,21],inclusive:!1},acc_descr:{rules:[18],inclusive:!1},acc_title:{rules:[16],inclusive:!1},SCALE:{rules:[13,14,33,34],inclusive:!1},ALIAS:{rules:[],inclusive:!1},STATE_ID:{rules:[48],inclusive:!1},STATE_STRING:{rules:[49,50],inclusive:!1},FORK_STATE:{rules:[],inclusive:!1},STATE:{rules:[9,10,36,37,38,39,40,41,46,47,51,52,53],inclusive:!1},ID:{rules:[9,10],inclusive:!1},INITIAL:{rules:[0,1,2,3,4,5,6,7,8,10,11,12,15,17,19,22,26,29,32,35,53,57,68,69,70,71,72,73,74,76,77,78],inclusive:!0}}};return F}();O.lexer=N;function P(){this.yy={}}return o(P,"Parser"),P.prototype=O,O.Parser=P,new P}();FO.parser=FO;_E=FO});var Ode,LE,Vg,Sx,Pde,Bde,Fde,_0,DE,GO,$O,VO,UO,HO,NE,RE,zde,Gde,WO,YO,$de,Vde,Ug,OWe,Ude,qO,PWe,BWe,Hde,Wde,FWe,Yde,zWe,qde,XO,jO,Xde,ME,jde,KO,IE=M(()=>{"use strict";Ode="LR",LE="TB",Vg="state",Sx="relation",Pde="classDef",Bde="style",Fde="applyClass",_0="default",DE="divider",GO="fill:none",$O="fill: #333",VO="c",UO="text",HO="normal",NE="rect",RE="rectWithTitle",zde="stateStart",Gde="stateEnd",WO="divider",YO="roundedWithTitle",$de="note",Vde="noteGroup",Ug="statediagram",OWe="state",Ude=`${Ug}-${OWe}`,qO="transition",PWe="note",BWe="note-edge",Hde=`${qO} ${BWe}`,Wde=`${Ug}-${PWe}`,FWe="cluster",Yde=`${Ug}-${FWe}`,zWe="cluster-alt",qde=`${Ug}-${zWe}`,XO="parent",jO="note",Xde="state",ME="----",jde=`${ME}${jO}`,KO=`${ME}${XO}`});function QO(t="",e=0,r="",n=ME){let i=r!==null&&r.length>0?`${n}${r}`:"";return`${Xde}-${t}${i}-${e}`}function OE(t,e,r){if(!e.id||e.id==="</join></fork>"||e.id==="</choice>")return;e.cssClasses&&(Array.isArray(e.cssCompiledStyles)||(e.cssCompiledStyles=[]),e.cssClasses.split(" ").forEach(i=>{if(r.get(i)){let a=r.get(i);e.cssCompiledStyles=[...e.cssCompiledStyles,...a.styles]}}));let n=t.find(i=>i.id===e.id);n?Object.assign(n,e):t.push(e)}function $We(t){return t?.classes?.join(" ")??""}function VWe(t){return t?.styles??[]}var PE,gf,GWe,Kde,Hg,Qde,Zde=M(()=>{"use strict";Vt();ht();fr();IE();PE=new Map,gf=0;o(QO,"stateDomId");GWe=o((t,e,r,n,i,a,s,l)=>{Y.trace("items",e),e.forEach(u=>{switch(u.stmt){case Vg:Hg(t,u,r,n,i,a,s,l);break;case _0:Hg(t,u,r,n,i,a,s,l);break;case Sx:{Hg(t,u.state1,r,n,i,a,s,l),Hg(t,u.state2,r,n,i,a,s,l);let h={id:"edge"+gf,start:u.state1.id,end:u.state2.id,arrowhead:"normal",arrowTypeEnd:"arrow_barb",style:GO,labelStyle:"",label:je.sanitizeText(u.description,de()),arrowheadStyle:$O,labelpos:VO,labelType:UO,thickness:HO,classes:qO,look:s};i.push(h),gf++}break}})},"setupDoc"),Kde=o((t,e=LE)=>{let r=e;if(t.doc)for(let n of t.doc)n.stmt==="dir"&&(r=n.value);return r},"getDir");o(OE,"insertOrUpdateNode");o($We,"getClassesFromDbInfo");o(VWe,"getStylesFromDbInfo");Hg=o((t,e,r,n,i,a,s,l)=>{let u=e.id,h=r.get(u),f=$We(h),d=VWe(h);if(Y.info("dataFetcher parsedItem",e,h,d),u!=="root"){let p=NE;e.start===!0?p=zde:e.start===!1&&(p=Gde),e.type!==_0&&(p=e.type),PE.get(u)||PE.set(u,{id:u,shape:p,description:je.sanitizeText(u,de()),cssClasses:`${f} ${Ude}`,cssStyles:d});let m=PE.get(u);e.description&&(Array.isArray(m.description)?(m.shape=RE,m.description.push(e.description)):m.description?.length>0?(m.shape=RE,m.description===u?m.description=[e.description]:m.description=[m.description,e.description]):(m.shape=NE,m.description=e.description),m.description=je.sanitizeTextOrArray(m.description,de())),m.description?.length===1&&m.shape===RE&&(m.type==="group"?m.shape=YO:m.shape=NE),!m.type&&e.doc&&(Y.info("Setting cluster for XCX",u,Kde(e)),m.type="group",m.isGroup=!0,m.dir=Kde(e),m.shape=e.type===DE?WO:YO,m.cssClasses=`${m.cssClasses} ${Yde} ${a?qde:""}`);let g={labelStyle:"",shape:m.shape,label:m.description,cssClasses:m.cssClasses,cssCompiledStyles:[],cssStyles:m.cssStyles,id:u,dir:m.dir,domId:QO(u,gf),type:m.type,isGroup:m.type==="group",padding:8,rx:10,ry:10,look:s};if(g.shape===WO&&(g.label=""),t&&t.id!=="root"&&(Y.trace("Setting node ",u," to be child of its parent ",t.id),g.parentId=t.id),g.centerLabel=!0,e.note){let y={labelStyle:"",shape:$de,label:e.note.text,cssClasses:Wde,cssStyles:[],cssCompilesStyles:[],id:u+jde+"-"+gf,domId:QO(u,gf,jO),type:m.type,isGroup:m.type==="group",padding:de().flowchart.padding,look:s,position:e.note.position},v=u+KO,x={labelStyle:"",shape:Vde,label:e.note.text,cssClasses:m.cssClasses,cssStyles:[],id:u+KO,domId:QO(u,gf,XO),type:"group",isGroup:!0,padding:16,look:s,position:e.note.position};gf++,x.id=v,y.parentId=v,OE(n,x,l),OE(n,y,l),OE(n,g,l);let b=u,w=y.id;e.note.position==="left of"&&(b=y.id,w=u),i.push({id:b+"-"+w,start:b,end:w,arrowhead:"none",arrowTypeEnd:"",style:GO,labelStyle:"",classes:Hde,arrowheadStyle:$O,labelpos:VO,labelType:UO,thickness:HO,look:s})}else OE(n,g,l)}e.doc&&(Y.trace("Adding nodes children "),GWe(e,e.doc,r,n,i,!a,s,l))},"dataFetcher"),Qde=o(()=>{PE.clear(),gf=0},"reset")});var ZO,UWe,HWe,Jde,JO=M(()=>{"use strict";Vt();ht();j5();Fv();uT();hr();IE();ZO=o((t,e=LE)=>{if(!t.doc)return e;let r=e;for(let n of t.doc)n.stmt==="dir"&&(r=n.value);return r},"getDir"),UWe=o(function(t,e){return e.db.extract(e.db.getRootDocV2()),e.db.getClasses()},"getClasses"),HWe=o(async function(t,e,r,n){Y.info("REF0:"),Y.info("Drawing state diagram (v2)",e);let{securityLevel:i,state:a,layout:s}=de();n.db.extract(n.db.getRootDocV2());let l=n.db.getData(),u=pm(e,i);l.type=n.type,l.layoutAlgorithm=s,l.nodeSpacing=a?.nodeSpacing||50,l.rankSpacing=a?.rankSpacing||50,l.markers=["barb"],l.diagramId=e,await Fm(l,u);let h=8;Ut.insertTitle(u,"statediagramTitleText",a?.titleTopMargin??25,n.db.getDiagramTitle()),zm(u,h,Ug,a?.useMaxWidth??!0)},"draw"),Jde={getClasses:UWe,draw:HWe,getDir:ZO}});function s0e(){return new Map}function eP(t=""){let e=t;return t===nP&&(Cx++,e=`${n0e}${Cx}`),e}function tP(t="",e=_0){return t===nP?n0e:e}function eYe(t=""){let e=t;return t===i0e&&(Cx++,e=`${a0e}${Cx}`),e}function tYe(t="",e=_0){return t===i0e?a0e:e}function rYe(t,e,r){let n=eP(t.id.trim()),i=tP(t.id.trim(),t.type),a=eP(e.id.trim()),s=tP(e.id.trim(),e.type);yf(n,i,t.doc,t.description,t.note,t.classes,t.styles,t.textStyles),yf(a,s,e.doc,e.description,e.note,e.classes,e.styles,e.textStyles),zs.relations.push({id1:n,id2:a,relationTitle:je.sanitizeText(r,de())})}var nP,n0e,i0e,a0e,e0e,t0e,WWe,YWe,zE,iP,o0e,GE,Wg,l0e,$E,zs,Cx,r0e,qWe,XWe,BE,jWe,KWe,FE,aP,QWe,yf,c0e,L0,u0e,ZWe,JWe,h0e,rP,nYe,iYe,f0e,aYe,sP,sYe,oYe,lYe,cYe,uYe,hYe,tl,VE=M(()=>{"use strict";ht();hr();fr();Vt();ki();Zde();JO();IE();nP="[*]",n0e="start",i0e=nP,a0e="end",e0e="color",t0e="fill",WWe="bgFill",YWe=",";o(s0e,"newClassesList");zE=[],iP=[],o0e=Ode,GE=[],Wg=s0e(),l0e=o(()=>({relations:[],states:new Map,documents:{}}),"newDoc"),$E={root:l0e()},zs=$E.root,Cx=0,r0e=0,qWe={LINE:0,DOTTED_LINE:1},XWe={AGGREGATION:0,EXTENSION:1,COMPOSITION:2,DEPENDENCY:3},BE=o(t=>JSON.parse(JSON.stringify(t)),"clone"),jWe=o(t=>{Y.info("Setting root doc",t),GE=t},"setRootDoc"),KWe=o(()=>GE,"getRootDoc"),FE=o((t,e,r)=>{if(e.stmt===Sx)FE(t,e.state1,!0),FE(t,e.state2,!1);else if(e.stmt===Vg&&(e.id==="[*]"?(e.id=r?t.id+"_start":t.id+"_end",e.start=r):e.id=e.id.trim()),e.doc){let n=[],i=[],a;for(a=0;a<e.doc.length;a++)if(e.doc[a].type===DE){let s=BE(e.doc[a]);s.doc=BE(i),n.push(s),i=[]}else i.push(e.doc[a]);if(n.length>0&&i.length>0){let s={stmt:Vg,id:e9(),type:"divider",doc:BE(i)};n.push(BE(s)),e.doc=n}e.doc.forEach(s=>FE(e,s,!0))}},"docTranslator"),aP=o(()=>(FE({id:"root"},{id:"root",doc:GE},!0),{id:"root",doc:GE}),"getRootDocV2"),QWe=o(t=>{let e;t.doc?e=t.doc:e=t,Y.info(e),c0e(!0),Y.info("Extract initial document:",e),e.forEach(a=>{switch(Y.warn("Statement",a.stmt),a.stmt){case Vg:yf(a.id.trim(),a.type,a.doc,a.description,a.note,a.classes,a.styles,a.textStyles);break;case Sx:h0e(a.state1,a.state2,a.description);break;case Pde:f0e(a.id.trim(),a.classes);break;case Bde:{let s=a.id.trim().split(","),l=a.styleClass.split(",");s.forEach(u=>{let h=L0(u);if(h===void 0){let f=u.trim();yf(f),h=L0(f)}h.styles=l.map(f=>f.replace(/;/g,"")?.trim())})}break;case Fde:sP(a.id.trim(),a.styleClass);break}});let r=u0e(),i=de().look;Qde(),Hg(void 0,aP(),r,zE,iP,!0,i,Wg),zE.forEach(a=>{if(Array.isArray(a.label)){if(a.description=a.label.slice(1),a.isGroup&&a.description.length>0)throw new Error("Group nodes can only have label. Remove the additional description for node ["+a.id+"]");a.label=a.label[0]}})},"extract"),yf=o(function(t,e=_0,r=null,n=null,i=null,a=null,s=null,l=null){let u=t?.trim();if(zs.states.has(u)?(zs.states.get(u).doc||(zs.states.get(u).doc=r),zs.states.get(u).type||(zs.states.get(u).type=e)):(Y.info("Adding state ",u,n),zs.states.set(u,{id:u,descriptions:[],type:e,doc:r,note:i,classes:[],styles:[],textStyles:[]})),n&&(Y.info("Setting state description",u,n),typeof n=="string"&&rP(u,n.trim()),typeof n=="object"&&n.forEach(h=>rP(u,h.trim()))),i){let h=zs.states.get(u);h.note=i,h.note.text=je.sanitizeText(h.note.text,de())}a&&(Y.info("Setting state classes",u,a),(typeof a=="string"?[a]:a).forEach(f=>sP(u,f.trim()))),s&&(Y.info("Setting state styles",u,s),(typeof s=="string"?[s]:s).forEach(f=>sYe(u,f.trim()))),l&&(Y.info("Setting state styles",u,s),(typeof l=="string"?[l]:l).forEach(f=>oYe(u,f.trim())))},"addState"),c0e=o(function(t){zE=[],iP=[],$E={root:l0e()},zs=$E.root,Cx=0,Wg=s0e(),t||_r()},"clear"),L0=o(function(t){return zs.states.get(t)},"getState"),u0e=o(function(){return zs.states},"getStates"),ZWe=o(function(){Y.info("Documents = ",$E)},"logDocuments"),JWe=o(function(){return zs.relations},"getRelations");o(eP,"startIdIfNeeded");o(tP,"startTypeIfNeeded");o(eYe,"endIdIfNeeded");o(tYe,"endTypeIfNeeded");o(rYe,"addRelationObjs");h0e=o(function(t,e,r){if(typeof t=="object")rYe(t,e,r);else{let n=eP(t.trim()),i=tP(t),a=eYe(e.trim()),s=tYe(e);yf(n,i),yf(a,s),zs.relations.push({id1:n,id2:a,title:je.sanitizeText(r,de())})}},"addRelation"),rP=o(function(t,e){let r=zs.states.get(t),n=e.startsWith(":")?e.replace(":","").trim():e;r.descriptions.push(je.sanitizeText(n,de()))},"addDescription"),nYe=o(function(t){return t.substring(0,1)===":"?t.substr(2).trim():t.trim()},"cleanupLabel"),iYe=o(()=>(r0e++,"divider-id-"+r0e),"getDividerId"),f0e=o(function(t,e=""){Wg.has(t)||Wg.set(t,{id:t,styles:[],textStyles:[]});let r=Wg.get(t);e?.split(YWe).forEach(n=>{let i=n.replace(/([^;]*);/,"$1").trim();if(RegExp(e0e).exec(n)){let s=i.replace(t0e,WWe).replace(e0e,t0e);r.textStyles.push(s)}r.styles.push(i)})},"addStyleClass"),aYe=o(function(){return Wg},"getClasses"),sP=o(function(t,e){t.split(",").forEach(function(r){let n=L0(r);if(n===void 0){let i=r.trim();yf(i),n=L0(i)}n.classes.push(e)})},"setCssClass"),sYe=o(function(t,e){let r=L0(t);r!==void 0&&r.styles.push(e)},"setStyle"),oYe=o(function(t,e){let r=L0(t);r!==void 0&&r.textStyles.push(e)},"setTextStyle"),lYe=o(()=>o0e,"getDirection"),cYe=o(t=>{o0e=t},"setDirection"),uYe=o(t=>t&&t[0]===":"?t.substr(1).trim():t.trim(),"trimColon"),hYe=o(()=>{let t=de();return{nodes:zE,edges:iP,other:{},config:t,direction:ZO(aP())}},"getData"),tl={getConfig:o(()=>de().state,"getConfig"),getData:hYe,addState:yf,clear:c0e,getState:L0,getStates:u0e,getRelations:JWe,getClasses:aYe,getDirection:lYe,addRelation:h0e,getDividerId:iYe,setDirection:cYe,cleanupLabel:nYe,lineType:qWe,relationType:XWe,logDocuments:ZWe,getRootDoc:KWe,setRootDoc:jWe,getRootDocV2:aP,extract:QWe,trimColon:uYe,getAccTitle:Pr,setAccTitle:Rr,getAccDescription:Fr,setAccDescription:Br,addStyleClass:f0e,setCssClass:sP,addDescription:rP,setDiagramTitle:ln,getDiagramTitle:Jr}});var fYe,UE,oP=M(()=>{"use strict";fYe=o(t=>` +defs #statediagram-barbEnd { + fill: ${t.transitionColor}; + stroke: ${t.transitionColor}; + } +g.stateGroup text { + fill: ${t.nodeBorder}; + stroke: none; + font-size: 10px; +} +g.stateGroup text { + fill: ${t.textColor}; + stroke: none; + font-size: 10px; + +} +g.stateGroup .state-title { + font-weight: bolder; + fill: ${t.stateLabelColor}; +} + +g.stateGroup rect { + fill: ${t.mainBkg}; + stroke: ${t.nodeBorder}; +} + +g.stateGroup line { + stroke: ${t.lineColor}; + stroke-width: 1; +} + +.transition { + stroke: ${t.transitionColor}; + stroke-width: 1; + fill: none; +} + +.stateGroup .composit { + fill: ${t.background}; + border-bottom: 1px +} + +.stateGroup .alt-composit { + fill: #e0e0e0; + border-bottom: 1px +} + +.state-note { + stroke: ${t.noteBorderColor}; + fill: ${t.noteBkgColor}; + + text { + fill: ${t.noteTextColor}; + stroke: none; + font-size: 10px; + } +} + +.stateLabel .box { + stroke: none; + stroke-width: 0; + fill: ${t.mainBkg}; + opacity: 0.5; +} + +.edgeLabel .label rect { + fill: ${t.labelBackgroundColor}; + opacity: 0.5; +} +.edgeLabel { + background-color: ${t.edgeLabelBackground}; + p { + background-color: ${t.edgeLabelBackground}; + } + rect { + opacity: 0.5; + background-color: ${t.edgeLabelBackground}; + fill: ${t.edgeLabelBackground}; + } + text-align: center; +} +.edgeLabel .label text { + fill: ${t.transitionLabelColor||t.tertiaryTextColor}; +} +.label div .edgeLabel { + color: ${t.transitionLabelColor||t.tertiaryTextColor}; +} + +.stateLabel text { + fill: ${t.stateLabelColor}; + font-size: 10px; + font-weight: bold; +} + +.node circle.state-start { + fill: ${t.specialStateColor}; + stroke: ${t.specialStateColor}; +} + +.node .fork-join { + fill: ${t.specialStateColor}; + stroke: ${t.specialStateColor}; +} + +.node circle.state-end { + fill: ${t.innerEndBackground}; + stroke: ${t.background}; + stroke-width: 1.5 +} +.end-state-inner { + fill: ${t.compositeBackground||t.background}; + // stroke: ${t.background}; + stroke-width: 1.5 +} + +.node rect { + fill: ${t.stateBkg||t.mainBkg}; + stroke: ${t.stateBorder||t.nodeBorder}; + stroke-width: 1px; +} +.node polygon { + fill: ${t.mainBkg}; + stroke: ${t.stateBorder||t.nodeBorder};; + stroke-width: 1px; +} +#statediagram-barbEnd { + fill: ${t.lineColor}; +} + +.statediagram-cluster rect { + fill: ${t.compositeTitleBackground}; + stroke: ${t.stateBorder||t.nodeBorder}; + stroke-width: 1px; +} + +.cluster-label, .nodeLabel { + color: ${t.stateLabelColor}; + // line-height: 1; +} + +.statediagram-cluster rect.outer { + rx: 5px; + ry: 5px; +} +.statediagram-state .divider { + stroke: ${t.stateBorder||t.nodeBorder}; +} + +.statediagram-state .title-state { + rx: 5px; + ry: 5px; +} +.statediagram-cluster.statediagram-cluster .inner { + fill: ${t.compositeBackground||t.background}; +} +.statediagram-cluster.statediagram-cluster-alt .inner { + fill: ${t.altBackground?t.altBackground:"#efefef"}; +} + +.statediagram-cluster .inner { + rx:0; + ry:0; +} + +.statediagram-state rect.basic { + rx: 5px; + ry: 5px; +} +.statediagram-state rect.divider { + stroke-dasharray: 10,10; + fill: ${t.altBackground?t.altBackground:"#efefef"}; +} + +.note-edge { + stroke-dasharray: 5; +} + +.statediagram-note rect { + fill: ${t.noteBkgColor}; + stroke: ${t.noteBorderColor}; + stroke-width: 1px; + rx: 0; + ry: 0; +} +.statediagram-note rect { + fill: ${t.noteBkgColor}; + stroke: ${t.noteBorderColor}; + stroke-width: 1px; + rx: 0; + ry: 0; +} + +.statediagram-note text { + fill: ${t.noteTextColor}; +} + +.statediagram-note .nodeLabel { + color: ${t.noteTextColor}; +} +.statediagram .edgeLabel { + color: red; // ${t.noteTextColor}; +} + +#dependencyStart, #dependencyEnd { + fill: ${t.lineColor}; + stroke: ${t.lineColor}; + stroke-width: 1; +} + +.statediagramTitleText { + text-anchor: middle; + font-size: 18px; + fill: ${t.textColor}; +} +`,"getStyles"),UE=fYe});var lP,dYe,pYe,d0e,mYe,p0e,m0e=M(()=>{"use strict";lP={},dYe=o((t,e)=>{lP[t]=e},"set"),pYe=o(t=>lP[t],"get"),d0e=o(()=>Object.keys(lP),"keys"),mYe=o(()=>d0e().length,"size"),p0e={get:pYe,set:dYe,keys:d0e,size:mYe}});var gYe,yYe,vYe,xYe,y0e,bYe,wYe,TYe,kYe,cP,g0e,v0e,x0e=M(()=>{"use strict";mr();m0e();VE();hr();fr();Vt();ht();gYe=o(t=>t.append("circle").attr("class","start-state").attr("r",de().state.sizeUnit).attr("cx",de().state.padding+de().state.sizeUnit).attr("cy",de().state.padding+de().state.sizeUnit),"drawStartState"),yYe=o(t=>t.append("line").style("stroke","grey").style("stroke-dasharray","3").attr("x1",de().state.textHeight).attr("class","divider").attr("x2",de().state.textHeight*2).attr("y1",0).attr("y2",0),"drawDivider"),vYe=o((t,e)=>{let r=t.append("text").attr("x",2*de().state.padding).attr("y",de().state.textHeight+2*de().state.padding).attr("font-size",de().state.fontSize).attr("class","state-title").text(e.id),n=r.node().getBBox();return t.insert("rect",":first-child").attr("x",de().state.padding).attr("y",de().state.padding).attr("width",n.width+2*de().state.padding).attr("height",n.height+2*de().state.padding).attr("rx",de().state.radius),r},"drawSimpleState"),xYe=o((t,e)=>{let r=o(function(p,m,g){let y=p.append("tspan").attr("x",2*de().state.padding).text(m);g||y.attr("dy",de().state.textHeight)},"addTspan"),i=t.append("text").attr("x",2*de().state.padding).attr("y",de().state.textHeight+1.3*de().state.padding).attr("font-size",de().state.fontSize).attr("class","state-title").text(e.descriptions[0]).node().getBBox(),a=i.height,s=t.append("text").attr("x",de().state.padding).attr("y",a+de().state.padding*.4+de().state.dividerMargin+de().state.textHeight).attr("class","state-description"),l=!0,u=!0;e.descriptions.forEach(function(p){l||(r(s,p,u),u=!1),l=!1});let h=t.append("line").attr("x1",de().state.padding).attr("y1",de().state.padding+a+de().state.dividerMargin/2).attr("y2",de().state.padding+a+de().state.dividerMargin/2).attr("class","descr-divider"),f=s.node().getBBox(),d=Math.max(f.width,i.width);return h.attr("x2",d+3*de().state.padding),t.insert("rect",":first-child").attr("x",de().state.padding).attr("y",de().state.padding).attr("width",d+2*de().state.padding).attr("height",f.height+a+2*de().state.padding).attr("rx",de().state.radius),t},"drawDescrState"),y0e=o((t,e,r)=>{let n=de().state.padding,i=2*de().state.padding,a=t.node().getBBox(),s=a.width,l=a.x,u=t.append("text").attr("x",0).attr("y",de().state.titleShift).attr("font-size",de().state.fontSize).attr("class","state-title").text(e.id),f=u.node().getBBox().width+i,d=Math.max(f,s);d===s&&(d=d+i);let p,m=t.node().getBBox();e.doc,p=l-n,f>s&&(p=(s-d)/2+n),Math.abs(l-m.x)<n&&f>s&&(p=l-(f-s)/2);let g=1-de().state.textHeight;return t.insert("rect",":first-child").attr("x",p).attr("y",g).attr("class",r?"alt-composit":"composit").attr("width",d).attr("height",m.height+de().state.textHeight+de().state.titleShift+1).attr("rx","0"),u.attr("x",p+n),f<=s&&u.attr("x",l+(d-i)/2-f/2+n),t.insert("rect",":first-child").attr("x",p).attr("y",de().state.titleShift-de().state.textHeight-de().state.padding).attr("width",d).attr("height",de().state.textHeight*3).attr("rx",de().state.radius),t.insert("rect",":first-child").attr("x",p).attr("y",de().state.titleShift-de().state.textHeight-de().state.padding).attr("width",d).attr("height",m.height+3+2*de().state.textHeight).attr("rx",de().state.radius),t},"addTitleAndBox"),bYe=o(t=>(t.append("circle").attr("class","end-state-outer").attr("r",de().state.sizeUnit+de().state.miniPadding).attr("cx",de().state.padding+de().state.sizeUnit+de().state.miniPadding).attr("cy",de().state.padding+de().state.sizeUnit+de().state.miniPadding),t.append("circle").attr("class","end-state-inner").attr("r",de().state.sizeUnit).attr("cx",de().state.padding+de().state.sizeUnit+2).attr("cy",de().state.padding+de().state.sizeUnit+2)),"drawEndState"),wYe=o((t,e)=>{let r=de().state.forkWidth,n=de().state.forkHeight;if(e.parentId){let i=r;r=n,n=i}return t.append("rect").style("stroke","black").style("fill","black").attr("width",r).attr("height",n).attr("x",de().state.padding).attr("y",de().state.padding)},"drawForkJoinState"),TYe=o((t,e,r,n)=>{let i=0,a=n.append("text");a.style("text-anchor","start"),a.attr("class","noteText");let s=t.replace(/\r\n/g,"<br/>");s=s.replace(/\n/g,"<br/>");let l=s.split(je.lineBreakRegex),u=1.25*de().state.noteMargin;for(let h of l){let f=h.trim();if(f.length>0){let d=a.append("tspan");if(d.text(f),u===0){let p=d.node().getBBox();u+=p.height}i+=u,d.attr("x",e+de().state.noteMargin),d.attr("y",r+i+1.25*de().state.noteMargin)}}return{textWidth:a.node().getBBox().width,textHeight:i}},"_drawLongText"),kYe=o((t,e)=>{e.attr("class","state-note");let r=e.append("rect").attr("x",0).attr("y",de().state.padding),n=e.append("g"),{textWidth:i,textHeight:a}=TYe(t,0,0,n);return r.attr("height",a+2*de().state.noteMargin),r.attr("width",i+de().state.noteMargin*2),r},"drawNote"),cP=o(function(t,e){let r=e.id,n={id:r,label:e.id,width:0,height:0},i=t.append("g").attr("id",r).attr("class","stateGroup");e.type==="start"&&gYe(i),e.type==="end"&&bYe(i),(e.type==="fork"||e.type==="join")&&wYe(i,e),e.type==="note"&&kYe(e.note.text,i),e.type==="divider"&&yYe(i),e.type==="default"&&e.descriptions.length===0&&vYe(i,e),e.type==="default"&&e.descriptions.length>0&&xYe(i,e);let a=i.node().getBBox();return n.width=a.width+2*de().state.padding,n.height=a.height+2*de().state.padding,p0e.set(r,n),n},"drawState"),g0e=0,v0e=o(function(t,e,r){let n=o(function(u){switch(u){case tl.relationType.AGGREGATION:return"aggregation";case tl.relationType.EXTENSION:return"extension";case tl.relationType.COMPOSITION:return"composition";case tl.relationType.DEPENDENCY:return"dependency"}},"getRelationType");e.points=e.points.filter(u=>!Number.isNaN(u.y));let i=e.points,a=Ka().x(function(u){return u.x}).y(function(u){return u.y}).curve(Do),s=t.append("path").attr("d",a(i)).attr("id","edge"+g0e).attr("class","transition"),l="";if(de().state.arrowMarkerAbsolute&&(l=window.location.protocol+"//"+window.location.host+window.location.pathname+window.location.search,l=l.replace(/\(/g,"\\("),l=l.replace(/\)/g,"\\)")),s.attr("marker-end","url("+l+"#"+n(tl.relationType.DEPENDENCY)+"End)"),r.title!==void 0){let u=t.append("g").attr("class","stateLabel"),{x:h,y:f}=Ut.calcLabelPosition(e.points),d=je.getRows(r.title),p=0,m=[],g=0,y=0;for(let b=0;b<=d.length;b++){let w=u.append("text").attr("text-anchor","middle").text(d[b]).attr("x",h).attr("y",f+p),_=w.node().getBBox();g=Math.max(g,_.width),y=Math.min(y,_.x),Y.info(_.x,h,f+p),p===0&&(p=w.node().getBBox().height,Y.info("Title height",p,f)),m.push(w)}let v=p*d.length;if(d.length>1){let b=(d.length-1)*p*.5;m.forEach((w,_)=>w.attr("y",f+_*p-b)),v=p*d.length}let x=u.node().getBBox();u.insert("rect",":first-child").attr("class","box").attr("x",h-g/2-de().state.padding/2).attr("y",f-v/2-de().state.padding/2-3.5).attr("width",g+de().state.padding).attr("height",v+de().state.padding),Y.info(x)}g0e++},"drawEdge")});var fo,uP,EYe,SYe,CYe,AYe,b0e,w0e,T0e=M(()=>{"use strict";mr();Pv();Ns();ht();fr();x0e();Vt();ni();uP={},EYe=o(function(){},"setConf"),SYe=o(function(t){t.append("defs").append("marker").attr("id","dependencyEnd").attr("refX",19).attr("refY",7).attr("markerWidth",20).attr("markerHeight",28).attr("orient","auto").append("path").attr("d","M 19,7 L9,13 L14,7 L9,1 Z")},"insertMarkers"),CYe=o(function(t,e,r,n){fo=de().state;let i=de().securityLevel,a;i==="sandbox"&&(a=ze("#i"+e));let s=i==="sandbox"?ze(a.nodes()[0].contentDocument.body):ze("body"),l=i==="sandbox"?a.nodes()[0].contentDocument:document;Y.debug("Rendering diagram "+t);let u=s.select(`[id='${e}']`);SYe(u);let h=n.db.getRootDoc();b0e(h,u,void 0,!1,s,l,n);let f=fo.padding,d=u.node().getBBox(),p=d.width+f*2,m=d.height+f*2,g=p*1.75;Zr(u,m,g,fo.useMaxWidth),u.attr("viewBox",`${d.x-fo.padding} ${d.y-fo.padding} `+p+" "+m)},"draw"),AYe=o(t=>t?t.length*fo.fontSizeFactor:1,"getLabelWidth"),b0e=o((t,e,r,n,i,a,s)=>{let l=new Mr({compound:!0,multigraph:!0}),u,h=!0;for(u=0;u<t.length;u++)if(t[u].stmt==="relation"){h=!1;break}r?l.setGraph({rankdir:"LR",multigraph:!0,compound:!0,ranker:"tight-tree",ranksep:h?1:fo.edgeLengthFactor,nodeSep:h?1:50,isMultiGraph:!0}):l.setGraph({rankdir:"TB",multigraph:!0,compound:!0,ranksep:h?1:fo.edgeLengthFactor,nodeSep:h?1:50,ranker:"tight-tree",isMultiGraph:!0}),l.setDefaultEdgeLabel(function(){return{}}),s.db.extract(t);let f=s.db.getStates(),d=s.db.getRelations(),p=Object.keys(f),m=!0;for(let b of p){let w=f[b];r&&(w.parentId=r);let _;if(w.doc){let T=e.append("g").attr("id",w.id).attr("class","stateGroup");if(_=b0e(w.doc,T,w.id,!n,i,a,s),m){T=y0e(T,w,n);let E=T.node().getBBox();_.width=E.width,_.height=E.height+fo.padding/2,uP[w.id]={y:fo.compositTitleSize}}else{let E=T.node().getBBox();_.width=E.width,_.height=E.height}}else _=cP(e,w,l);if(w.note){let T={descriptions:[],id:w.id+"-note",note:w.note,type:"note"},E=cP(e,T,l);w.note.position==="left of"?(l.setNode(_.id+"-note",E),l.setNode(_.id,_)):(l.setNode(_.id,_),l.setNode(_.id+"-note",E)),l.setParent(_.id,_.id+"-group"),l.setParent(_.id+"-note",_.id+"-group")}else l.setNode(_.id,_)}Y.debug("Count=",l.nodeCount(),l);let g=0;d.forEach(function(b){g++,Y.debug("Setting edge",b),l.setEdge(b.id1,b.id2,{relation:b,width:AYe(b.title),height:fo.labelHeight*je.getRows(b.title).length,labelpos:"c"},"id"+g)}),Du(l),Y.debug("Graph after layout",l.nodes());let y=e.node();l.nodes().forEach(function(b){b!==void 0&&l.node(b)!==void 0?(Y.warn("Node "+b+": "+JSON.stringify(l.node(b))),i.select("#"+y.id+" #"+b).attr("transform","translate("+(l.node(b).x-l.node(b).width/2)+","+(l.node(b).y+(uP[b]?uP[b].y:0)-l.node(b).height/2)+" )"),i.select("#"+y.id+" #"+b).attr("data-x-shift",l.node(b).x-l.node(b).width/2),a.querySelectorAll("#"+y.id+" #"+b+" .divider").forEach(_=>{let T=_.parentElement,E=0,L=0;T&&(T.parentElement&&(E=T.parentElement.getBBox().width),L=parseInt(T.getAttribute("data-x-shift"),10),Number.isNaN(L)&&(L=0)),_.setAttribute("x1",0-L+8),_.setAttribute("x2",E-L-8)})):Y.debug("No Node "+b+": "+JSON.stringify(l.node(b)))});let v=y.getBBox();l.edges().forEach(function(b){b!==void 0&&l.edge(b)!==void 0&&(Y.debug("Edge "+b.v+" -> "+b.w+": "+JSON.stringify(l.edge(b))),v0e(e,l.edge(b),l.edge(b).relation))}),v=y.getBBox();let x={id:r||"root",label:r||"root",width:0,height:0};return x.width=v.width+2*fo.padding,x.height=v.height+2*fo.padding,Y.debug("Doc rendered",x,l),x},"renderDoc"),w0e={setConf:EYe,draw:CYe}});var k0e={};vr(k0e,{diagram:()=>_Ye});var _Ye,E0e=M(()=>{"use strict";zO();VE();oP();T0e();_Ye={parser:_E,db:tl,renderer:w0e,styles:UE,init:o(t=>{t.state||(t.state={}),t.state.arrowMarkerAbsolute=t.arrowMarkerAbsolute,tl.clear()},"init")}});var A0e={};vr(A0e,{diagram:()=>RYe});var RYe,_0e=M(()=>{"use strict";zO();VE();oP();JO();RYe={parser:_E,db:tl,renderer:Jde,styles:UE,init:o(t=>{t.state||(t.state={}),t.state.arrowMarkerAbsolute=t.arrowMarkerAbsolute,tl.clear()},"init")}});var hP,N0e,R0e=M(()=>{"use strict";hP=function(){var t=o(function(d,p,m,g){for(m=m||{},g=d.length;g--;m[d[g]]=p);return m},"o"),e=[6,8,10,11,12,14,16,17,18],r=[1,9],n=[1,10],i=[1,11],a=[1,12],s=[1,13],l=[1,14],u={trace:o(function(){},"trace"),yy:{},symbols_:{error:2,start:3,journey:4,document:5,EOF:6,line:7,SPACE:8,statement:9,NEWLINE:10,title:11,acc_title:12,acc_title_value:13,acc_descr:14,acc_descr_value:15,acc_descr_multiline_value:16,section:17,taskName:18,taskData:19,$accept:0,$end:1},terminals_:{2:"error",4:"journey",6:"EOF",8:"SPACE",10:"NEWLINE",11:"title",12:"acc_title",13:"acc_title_value",14:"acc_descr",15:"acc_descr_value",16:"acc_descr_multiline_value",17:"section",18:"taskName",19:"taskData"},productions_:[0,[3,3],[5,0],[5,2],[7,2],[7,1],[7,1],[7,1],[9,1],[9,2],[9,2],[9,1],[9,1],[9,2]],performAction:o(function(p,m,g,y,v,x,b){var w=x.length-1;switch(v){case 1:return x[w-1];case 2:this.$=[];break;case 3:x[w-1].push(x[w]),this.$=x[w-1];break;case 4:case 5:this.$=x[w];break;case 6:case 7:this.$=[];break;case 8:y.setDiagramTitle(x[w].substr(6)),this.$=x[w].substr(6);break;case 9:this.$=x[w].trim(),y.setAccTitle(this.$);break;case 10:case 11:this.$=x[w].trim(),y.setAccDescription(this.$);break;case 12:y.addSection(x[w].substr(8)),this.$=x[w].substr(8);break;case 13:y.addTask(x[w-1],x[w]),this.$="task";break}},"anonymous"),table:[{3:1,4:[1,2]},{1:[3]},t(e,[2,2],{5:3}),{6:[1,4],7:5,8:[1,6],9:7,10:[1,8],11:r,12:n,14:i,16:a,17:s,18:l},t(e,[2,7],{1:[2,1]}),t(e,[2,3]),{9:15,11:r,12:n,14:i,16:a,17:s,18:l},t(e,[2,5]),t(e,[2,6]),t(e,[2,8]),{13:[1,16]},{15:[1,17]},t(e,[2,11]),t(e,[2,12]),{19:[1,18]},t(e,[2,4]),t(e,[2,9]),t(e,[2,10]),t(e,[2,13])],defaultActions:{},parseError:o(function(p,m){if(m.recoverable)this.trace(p);else{var g=new Error(p);throw g.hash=m,g}},"parseError"),parse:o(function(p){var m=this,g=[0],y=[],v=[null],x=[],b=this.table,w="",_=0,T=0,E=0,L=2,C=1,A=x.slice.call(arguments,1),I=Object.create(this.lexer),D={yy:{}};for(var k in this.yy)Object.prototype.hasOwnProperty.call(this.yy,k)&&(D.yy[k]=this.yy[k]);I.setInput(p,D.yy),D.yy.lexer=I,D.yy.parser=this,typeof I.yylloc>"u"&&(I.yylloc={});var R=I.yylloc;x.push(R);var S=I.options&&I.options.ranges;typeof D.yy.parseError=="function"?this.parseError=D.yy.parseError:this.parseError=Object.getPrototypeOf(this).parseError;function O(H){g.length=g.length-2*H,v.length=v.length-H,x.length=x.length-H}o(O,"popStack");function N(){var H;return H=y.pop()||I.lex()||C,typeof H!="number"&&(H instanceof Array&&(y=H,H=y.pop()),H=m.symbols_[H]||H),H}o(N,"lex");for(var P,F,B,$,z,W,j={},K,ie,Q,ee;;){if(B=g[g.length-1],this.defaultActions[B]?$=this.defaultActions[B]:((P===null||typeof P>"u")&&(P=N()),$=b[B]&&b[B][P]),typeof $>"u"||!$.length||!$[0]){var J="";ee=[];for(K in b[B])this.terminals_[K]&&K>L&&ee.push("'"+this.terminals_[K]+"'");I.showPosition?J="Parse error on line "+(_+1)+`: +`+I.showPosition()+` +Expecting `+ee.join(", ")+", got '"+(this.terminals_[P]||P)+"'":J="Parse error on line "+(_+1)+": Unexpected "+(P==C?"end of input":"'"+(this.terminals_[P]||P)+"'"),this.parseError(J,{text:I.match,token:this.terminals_[P]||P,line:I.yylineno,loc:R,expected:ee})}if($[0]instanceof Array&&$.length>1)throw new Error("Parse Error: multiple actions possible at state: "+B+", token: "+P);switch($[0]){case 1:g.push(P),v.push(I.yytext),x.push(I.yylloc),g.push($[1]),P=null,F?(P=F,F=null):(T=I.yyleng,w=I.yytext,_=I.yylineno,R=I.yylloc,E>0&&E--);break;case 2:if(ie=this.productions_[$[1]][1],j.$=v[v.length-ie],j._$={first_line:x[x.length-(ie||1)].first_line,last_line:x[x.length-1].last_line,first_column:x[x.length-(ie||1)].first_column,last_column:x[x.length-1].last_column},S&&(j._$.range=[x[x.length-(ie||1)].range[0],x[x.length-1].range[1]]),W=this.performAction.apply(j,[w,T,_,D.yy,$[1],v,x].concat(A)),typeof W<"u")return W;ie&&(g=g.slice(0,-1*ie*2),v=v.slice(0,-1*ie),x=x.slice(0,-1*ie)),g.push(this.productions_[$[1]][0]),v.push(j.$),x.push(j._$),Q=b[g[g.length-2]][g[g.length-1]],g.push(Q);break;case 3:return!0}}return!0},"parse")},h=function(){var d={EOF:1,parseError:o(function(m,g){if(this.yy.parser)this.yy.parser.parseError(m,g);else throw new Error(m)},"parseError"),setInput:o(function(p,m){return this.yy=m||this.yy||{},this._input=p,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},"setInput"),input:o(function(){var p=this._input[0];this.yytext+=p,this.yyleng++,this.offset++,this.match+=p,this.matched+=p;var m=p.match(/(?:\r\n?|\n).*/g);return m?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),p},"input"),unput:o(function(p){var m=p.length,g=p.split(/(?:\r\n?|\n)/g);this._input=p+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-m),this.offset-=m;var y=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),g.length-1&&(this.yylineno-=g.length-1);var v=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:g?(g.length===y.length?this.yylloc.first_column:0)+y[y.length-g.length].length-g[0].length:this.yylloc.first_column-m},this.options.ranges&&(this.yylloc.range=[v[0],v[0]+this.yyleng-m]),this.yyleng=this.yytext.length,this},"unput"),more:o(function(){return this._more=!0,this},"more"),reject:o(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError("Lexical error on line "+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true). +`+this.showPosition(),{text:"",token:null,line:this.yylineno});return this},"reject"),less:o(function(p){this.unput(this.match.slice(p))},"less"),pastInput:o(function(){var p=this.matched.substr(0,this.matched.length-this.match.length);return(p.length>20?"...":"")+p.substr(-20).replace(/\n/g,"")},"pastInput"),upcomingInput:o(function(){var p=this.match;return p.length<20&&(p+=this._input.substr(0,20-p.length)),(p.substr(0,20)+(p.length>20?"...":"")).replace(/\n/g,"")},"upcomingInput"),showPosition:o(function(){var p=this.pastInput(),m=new Array(p.length+1).join("-");return p+this.upcomingInput()+` +`+m+"^"},"showPosition"),test_match:o(function(p,m){var g,y,v;if(this.options.backtrack_lexer&&(v={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(v.yylloc.range=this.yylloc.range.slice(0))),y=p[0].match(/(?:\r\n?|\n).*/g),y&&(this.yylineno+=y.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:y?y[y.length-1].length-y[y.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+p[0].length},this.yytext+=p[0],this.match+=p[0],this.matches=p,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(p[0].length),this.matched+=p[0],g=this.performAction.call(this,this.yy,this,m,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),g)return g;if(this._backtrack){for(var x in v)this[x]=v[x];return!1}return!1},"test_match"),next:o(function(){if(this.done)return this.EOF;this._input||(this.done=!0);var p,m,g,y;this._more||(this.yytext="",this.match="");for(var v=this._currentRules(),x=0;x<v.length;x++)if(g=this._input.match(this.rules[v[x]]),g&&(!m||g[0].length>m[0].length)){if(m=g,y=x,this.options.backtrack_lexer){if(p=this.test_match(g,v[x]),p!==!1)return p;if(this._backtrack){m=!1;continue}else return!1}else if(!this.options.flex)break}return m?(p=this.test_match(m,v[y]),p!==!1?p:!1):this._input===""?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+`. Unrecognized text. +`+this.showPosition(),{text:"",token:null,line:this.yylineno})},"next"),lex:o(function(){var m=this.next();return m||this.lex()},"lex"),begin:o(function(m){this.conditionStack.push(m)},"begin"),popState:o(function(){var m=this.conditionStack.length-1;return m>0?this.conditionStack.pop():this.conditionStack[0]},"popState"),_currentRules:o(function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},"_currentRules"),topState:o(function(m){return m=this.conditionStack.length-1-Math.abs(m||0),m>=0?this.conditionStack[m]:"INITIAL"},"topState"),pushState:o(function(m){this.begin(m)},"pushState"),stateStackSize:o(function(){return this.conditionStack.length},"stateStackSize"),options:{"case-insensitive":!0},performAction:o(function(m,g,y,v){var x=v;switch(y){case 0:break;case 1:break;case 2:return 10;case 3:break;case 4:break;case 5:return 4;case 6:return 11;case 7:return this.begin("acc_title"),12;break;case 8:return this.popState(),"acc_title_value";break;case 9:return this.begin("acc_descr"),14;break;case 10:return this.popState(),"acc_descr_value";break;case 11:this.begin("acc_descr_multiline");break;case 12:this.popState();break;case 13:return"acc_descr_multiline_value";case 14:return 17;case 15:return 18;case 16:return 19;case 17:return":";case 18:return 6;case 19:return"INVALID"}},"anonymous"),rules:[/^(?:%(?!\{)[^\n]*)/i,/^(?:[^\}]%%[^\n]*)/i,/^(?:[\n]+)/i,/^(?:\s+)/i,/^(?:#[^\n]*)/i,/^(?:journey\b)/i,/^(?:title\s[^#\n;]+)/i,/^(?:accTitle\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*\{\s*)/i,/^(?:[\}])/i,/^(?:[^\}]*)/i,/^(?:section\s[^#:\n;]+)/i,/^(?:[^#:\n;]+)/i,/^(?::[^#\n;]+)/i,/^(?::)/i,/^(?:$)/i,/^(?:.)/i],conditions:{acc_descr_multiline:{rules:[12,13],inclusive:!1},acc_descr:{rules:[10],inclusive:!1},acc_title:{rules:[8],inclusive:!1},INITIAL:{rules:[0,1,2,3,4,5,6,7,9,11,14,15,16,17,18,19],inclusive:!0}}};return d}();u.lexer=h;function f(){this.yy={}}return o(f,"Parser"),f.prototype=u,u.Parser=f,new f}();hP.parser=hP;N0e=hP});var Yg,fP,Ax,_x,PYe,BYe,FYe,zYe,GYe,$Ye,VYe,M0e,UYe,dP,I0e=M(()=>{"use strict";Vt();ki();Yg="",fP=[],Ax=[],_x=[],PYe=o(function(){fP.length=0,Ax.length=0,Yg="",_x.length=0,_r()},"clear"),BYe=o(function(t){Yg=t,fP.push(t)},"addSection"),FYe=o(function(){return fP},"getSections"),zYe=o(function(){let t=M0e(),e=100,r=0;for(;!t&&r<e;)t=M0e(),r++;return Ax.push(..._x),Ax},"getTasks"),GYe=o(function(){let t=[];return Ax.forEach(r=>{r.people&&t.push(...r.people)}),[...new Set(t)].sort()},"updateActors"),$Ye=o(function(t,e){let r=e.substr(1).split(":"),n=0,i=[];r.length===1?(n=Number(r[0]),i=[]):(n=Number(r[0]),i=r[1].split(","));let a=i.map(l=>l.trim()),s={section:Yg,type:Yg,people:a,task:t,score:n};_x.push(s)},"addTask"),VYe=o(function(t){let e={section:Yg,type:Yg,description:t,task:t,classes:[]};Ax.push(e)},"addTaskOrg"),M0e=o(function(){let t=o(function(r){return _x[r].processed},"compileTask"),e=!0;for(let[r,n]of _x.entries())t(r),e=e&&n.processed;return e},"compileTasks"),UYe=o(function(){return GYe()},"getActors"),dP={getConfig:o(()=>de().journey,"getConfig"),clear:PYe,setDiagramTitle:ln,getDiagramTitle:Jr,setAccTitle:Rr,getAccTitle:Pr,setAccDescription:Br,getAccDescription:Fr,addSection:BYe,getSections:FYe,getTasks:zYe,addTask:$Ye,addTaskOrg:VYe,getActors:UYe}});var HYe,O0e,P0e=M(()=>{"use strict";HYe=o(t=>`.label { + font-family: 'trebuchet ms', verdana, arial, sans-serif; + font-family: var(--mermaid-font-family); + color: ${t.textColor}; + } + .mouth { + stroke: #666; + } + + line { + stroke: ${t.textColor} + } + + .legend { + fill: ${t.textColor}; + } + + .label text { + fill: #333; + } + .label { + color: ${t.textColor} + } + + .face { + ${t.faceColor?`fill: ${t.faceColor}`:"fill: #FFF8DC"}; + stroke: #999; + } + + .node rect, + .node circle, + .node ellipse, + .node polygon, + .node path { + fill: ${t.mainBkg}; + stroke: ${t.nodeBorder}; + stroke-width: 1px; + } + + .node .label { + text-align: center; + } + .node.clickable { + cursor: pointer; + } + + .arrowheadPath { + fill: ${t.arrowheadColor}; + } + + .edgePath .path { + stroke: ${t.lineColor}; + stroke-width: 1.5px; + } + + .flowchart-link { + stroke: ${t.lineColor}; + fill: none; + } + + .edgeLabel { + background-color: ${t.edgeLabelBackground}; + rect { + opacity: 0.5; + } + text-align: center; + } + + .cluster rect { + } + + .cluster text { + fill: ${t.titleColor}; + } + + div.mermaidTooltip { + position: absolute; + text-align: center; + max-width: 200px; + padding: 2px; + font-family: 'trebuchet ms', verdana, arial, sans-serif; + font-family: var(--mermaid-font-family); + font-size: 12px; + background: ${t.tertiaryColor}; + border: 1px solid ${t.border2}; + border-radius: 2px; + pointer-events: none; + z-index: 100; + } + + .task-type-0, .section-type-0 { + ${t.fillType0?`fill: ${t.fillType0}`:""}; + } + .task-type-1, .section-type-1 { + ${t.fillType0?`fill: ${t.fillType1}`:""}; + } + .task-type-2, .section-type-2 { + ${t.fillType0?`fill: ${t.fillType2}`:""}; + } + .task-type-3, .section-type-3 { + ${t.fillType0?`fill: ${t.fillType3}`:""}; + } + .task-type-4, .section-type-4 { + ${t.fillType0?`fill: ${t.fillType4}`:""}; + } + .task-type-5, .section-type-5 { + ${t.fillType0?`fill: ${t.fillType5}`:""}; + } + .task-type-6, .section-type-6 { + ${t.fillType0?`fill: ${t.fillType6}`:""}; + } + .task-type-7, .section-type-7 { + ${t.fillType0?`fill: ${t.fillType7}`:""}; + } + + .actor-0 { + ${t.actor0?`fill: ${t.actor0}`:""}; + } + .actor-1 { + ${t.actor1?`fill: ${t.actor1}`:""}; + } + .actor-2 { + ${t.actor2?`fill: ${t.actor2}`:""}; + } + .actor-3 { + ${t.actor3?`fill: ${t.actor3}`:""}; + } + .actor-4 { + ${t.actor4?`fill: ${t.actor4}`:""}; + } + .actor-5 { + ${t.actor5?`fill: ${t.actor5}`:""}; + } +`,"getStyles"),O0e=HYe});var pP,WYe,F0e,z0e,YYe,qYe,B0e,XYe,jYe,G0e,KYe,qg,$0e=M(()=>{"use strict";mr();qy();pP=o(function(t,e){return md(t,e)},"drawRect"),WYe=o(function(t,e){let n=t.append("circle").attr("cx",e.cx).attr("cy",e.cy).attr("class","face").attr("r",15).attr("stroke-width",2).attr("overflow","visible"),i=t.append("g");i.append("circle").attr("cx",e.cx-15/3).attr("cy",e.cy-15/3).attr("r",1.5).attr("stroke-width",2).attr("fill","#666").attr("stroke","#666"),i.append("circle").attr("cx",e.cx+15/3).attr("cy",e.cy-15/3).attr("r",1.5).attr("stroke-width",2).attr("fill","#666").attr("stroke","#666");function a(u){let h=El().startAngle(Math.PI/2).endAngle(3*(Math.PI/2)).innerRadius(7.5).outerRadius(6.8181818181818175);u.append("path").attr("class","mouth").attr("d",h).attr("transform","translate("+e.cx+","+(e.cy+2)+")")}o(a,"smile");function s(u){let h=El().startAngle(3*Math.PI/2).endAngle(5*(Math.PI/2)).innerRadius(7.5).outerRadius(6.8181818181818175);u.append("path").attr("class","mouth").attr("d",h).attr("transform","translate("+e.cx+","+(e.cy+7)+")")}o(s,"sad");function l(u){u.append("line").attr("class","mouth").attr("stroke",2).attr("x1",e.cx-5).attr("y1",e.cy+7).attr("x2",e.cx+5).attr("y2",e.cy+7).attr("class","mouth").attr("stroke-width","1px").attr("stroke","#666")}return o(l,"ambivalent"),e.score>3?a(i):e.score<3?s(i):l(i),n},"drawFace"),F0e=o(function(t,e){let r=t.append("circle");return r.attr("cx",e.cx),r.attr("cy",e.cy),r.attr("class","actor-"+e.pos),r.attr("fill",e.fill),r.attr("stroke",e.stroke),r.attr("r",e.r),r.class!==void 0&&r.attr("class",r.class),e.title!==void 0&&r.append("title").text(e.title),r},"drawCircle"),z0e=o(function(t,e){return DY(t,e)},"drawText"),YYe=o(function(t,e){function r(i,a,s,l,u){return i+","+a+" "+(i+s)+","+a+" "+(i+s)+","+(a+l-u)+" "+(i+s-u*1.2)+","+(a+l)+" "+i+","+(a+l)}o(r,"genPoints");let n=t.append("polygon");n.attr("points",r(e.x,e.y,50,20,7)),n.attr("class","labelBox"),e.y=e.y+e.labelMargin,e.x=e.x+.5*e.labelMargin,z0e(t,e)},"drawLabel"),qYe=o(function(t,e,r){let n=t.append("g"),i=Sl();i.x=e.x,i.y=e.y,i.fill=e.fill,i.width=r.width*e.taskCount+r.diagramMarginX*(e.taskCount-1),i.height=r.height,i.class="journey-section section-type-"+e.num,i.rx=3,i.ry=3,pP(n,i),G0e(r)(e.text,n,i.x,i.y,i.width,i.height,{class:"journey-section section-type-"+e.num},r,e.colour)},"drawSection"),B0e=-1,XYe=o(function(t,e,r){let n=e.x+r.width/2,i=t.append("g");B0e++;let a=300+5*30;i.append("line").attr("id","task"+B0e).attr("x1",n).attr("y1",e.y).attr("x2",n).attr("y2",a).attr("class","task-line").attr("stroke-width","1px").attr("stroke-dasharray","4 2").attr("stroke","#666"),WYe(i,{cx:n,cy:300+(5-e.score)*30,score:e.score});let s=Sl();s.x=e.x,s.y=e.y,s.fill=e.fill,s.width=r.width,s.height=r.height,s.class="task task-type-"+e.num,s.rx=3,s.ry=3,pP(i,s);let l=e.x+14;e.people.forEach(u=>{let h=e.actors[u].color,f={cx:l,cy:e.y,r:7,fill:h,stroke:"#000",title:u,pos:e.actors[u].position};F0e(i,f),l+=10}),G0e(r)(e.task,i,s.x,s.y,s.width,s.height,{class:"task"},r,e.colour)},"drawTask"),jYe=o(function(t,e){Y3(t,e)},"drawBackgroundRect"),G0e=function(){function t(i,a,s,l,u,h,f,d){let p=a.append("text").attr("x",s+u/2).attr("y",l+h/2+5).style("font-color",d).style("text-anchor","middle").text(i);n(p,f)}o(t,"byText");function e(i,a,s,l,u,h,f,d,p){let{taskFontSize:m,taskFontFamily:g}=d,y=i.split(/<br\s*\/?>/gi);for(let v=0;v<y.length;v++){let x=v*m-m*(y.length-1)/2,b=a.append("text").attr("x",s+u/2).attr("y",l).attr("fill",p).style("text-anchor","middle").style("font-size",m).style("font-family",g);b.append("tspan").attr("x",s+u/2).attr("dy",x).text(y[v]),b.attr("y",l+h/2).attr("dominant-baseline","central").attr("alignment-baseline","central"),n(b,f)}}o(e,"byTspan");function r(i,a,s,l,u,h,f,d){let p=a.append("switch"),g=p.append("foreignObject").attr("x",s).attr("y",l).attr("width",u).attr("height",h).attr("position","fixed").append("xhtml:div").style("display","table").style("height","100%").style("width","100%");g.append("div").attr("class","label").style("display","table-cell").style("text-align","center").style("vertical-align","middle").text(i),e(i,p,s,l,u,h,f,d),n(g,f)}o(r,"byFo");function n(i,a){for(let s in a)s in a&&i.attr(s,a[s])}return o(n,"_setTextAttrs"),function(i){return i.textPlacement==="fo"?r:i.textPlacement==="old"?t:e}}(),KYe=o(function(t){t.append("defs").append("marker").attr("id","arrowhead").attr("refX",5).attr("refY",2).attr("markerWidth",6).attr("markerHeight",4).attr("orient","auto").append("path").attr("d","M 0,0 V 4 L6,2 Z")},"initGraphics"),qg={drawRect:pP,drawCircle:F0e,drawSection:qYe,drawText:z0e,drawLabel:YYe,drawTask:XYe,drawBackgroundRect:jYe,initGraphics:KYe}});function ZYe(t){let e=de().journey,r=60;Object.keys(Yu).forEach(n=>{let i=Yu[n].color,a={cx:20,cy:r,r:7,fill:i,stroke:"#000",pos:Yu[n].position};qg.drawCircle(t,a);let s={x:40,y:r+7,fill:"#666",text:n,textMargin:e.boxTextMargin|5};qg.drawText(t,s),r+=20})}var QYe,Yu,HE,D0,JYe,rl,mP,V0e,eqe,gP,U0e=M(()=>{"use strict";mr();$0e();Vt();ni();QYe=o(function(t){Object.keys(t).forEach(function(r){HE[r]=t[r]})},"setConf"),Yu={};o(ZYe,"drawActorLegend");HE=de().journey,D0=HE.leftMargin,JYe=o(function(t,e,r,n){let i=de().journey,a=de().securityLevel,s;a==="sandbox"&&(s=ze("#i"+e));let l=a==="sandbox"?ze(s.nodes()[0].contentDocument.body):ze("body");rl.init();let u=l.select("#"+e);qg.initGraphics(u);let h=n.db.getTasks(),f=n.db.getDiagramTitle(),d=n.db.getActors();for(let x in Yu)delete Yu[x];let p=0;d.forEach(x=>{Yu[x]={color:i.actorColours[p%i.actorColours.length],position:p},p++}),ZYe(u),rl.insert(0,0,D0,Object.keys(Yu).length*50),eqe(u,h,0);let m=rl.getBounds();f&&u.append("text").text(f).attr("x",D0).attr("font-size","4ex").attr("font-weight","bold").attr("y",25);let g=m.stopy-m.starty+2*i.diagramMarginY,y=D0+m.stopx+2*i.diagramMarginX;Zr(u,g,y,i.useMaxWidth),u.append("line").attr("x1",D0).attr("y1",i.height*4).attr("x2",y-D0-4).attr("y2",i.height*4).attr("stroke-width",4).attr("stroke","black").attr("marker-end","url(#arrowhead)");let v=f?70:0;u.attr("viewBox",`${m.startx} -25 ${y} ${g+v}`),u.attr("preserveAspectRatio","xMinYMin meet"),u.attr("height",g+v+25)},"draw"),rl={data:{startx:void 0,stopx:void 0,starty:void 0,stopy:void 0},verticalPos:0,sequenceItems:[],init:o(function(){this.sequenceItems=[],this.data={startx:void 0,stopx:void 0,starty:void 0,stopy:void 0},this.verticalPos=0},"init"),updateVal:o(function(t,e,r,n){t[e]===void 0?t[e]=r:t[e]=n(r,t[e])},"updateVal"),updateBounds:o(function(t,e,r,n){let i=de().journey,a=this,s=0;function l(u){return o(function(f){s++;let d=a.sequenceItems.length-s+1;a.updateVal(f,"starty",e-d*i.boxMargin,Math.min),a.updateVal(f,"stopy",n+d*i.boxMargin,Math.max),a.updateVal(rl.data,"startx",t-d*i.boxMargin,Math.min),a.updateVal(rl.data,"stopx",r+d*i.boxMargin,Math.max),u!=="activation"&&(a.updateVal(f,"startx",t-d*i.boxMargin,Math.min),a.updateVal(f,"stopx",r+d*i.boxMargin,Math.max),a.updateVal(rl.data,"starty",e-d*i.boxMargin,Math.min),a.updateVal(rl.data,"stopy",n+d*i.boxMargin,Math.max))},"updateItemBounds")}o(l,"updateFn"),this.sequenceItems.forEach(l())},"updateBounds"),insert:o(function(t,e,r,n){let i=Math.min(t,r),a=Math.max(t,r),s=Math.min(e,n),l=Math.max(e,n);this.updateVal(rl.data,"startx",i,Math.min),this.updateVal(rl.data,"starty",s,Math.min),this.updateVal(rl.data,"stopx",a,Math.max),this.updateVal(rl.data,"stopy",l,Math.max),this.updateBounds(i,s,a,l)},"insert"),bumpVerticalPos:o(function(t){this.verticalPos=this.verticalPos+t,this.data.stopy=this.verticalPos},"bumpVerticalPos"),getVerticalPos:o(function(){return this.verticalPos},"getVerticalPos"),getBounds:o(function(){return this.data},"getBounds")},mP=HE.sectionFills,V0e=HE.sectionColours,eqe=o(function(t,e,r){let n=de().journey,i="",a=n.height*2+n.diagramMarginY,s=r+a,l=0,u="#CCC",h="black",f=0;for(let[d,p]of e.entries()){if(i!==p.section){u=mP[l%mP.length],f=l%mP.length,h=V0e[l%V0e.length];let g=0,y=p.section;for(let x=d;x<e.length&&e[x].section==y;x++)g=g+1;let v={x:d*n.taskMargin+d*n.width+D0,y:50,text:p.section,fill:u,num:f,colour:h,taskCount:g};qg.drawSection(t,v,n),i=p.section,l++}let m=p.people.reduce((g,y)=>(Yu[y]&&(g[y]=Yu[y]),g),{});p.x=d*n.taskMargin+d*n.width+D0,p.y=s,p.width=n.diagramMarginX,p.height=n.diagramMarginY,p.colour=h,p.fill=u,p.num=f,p.actors=m,qg.drawTask(t,p,n),rl.insert(p.x,p.y,p.x+p.width+n.taskMargin,300+5*30)}},"drawTasks"),gP={setConf:QYe,draw:JYe}});var H0e={};vr(H0e,{diagram:()=>tqe});var tqe,W0e=M(()=>{"use strict";R0e();I0e();P0e();U0e();tqe={parser:N0e,db:dP,renderer:gP,styles:O0e,init:o(t=>{gP.setConf(t.journey),dP.clear()},"init")}});var vP,Z0e,J0e=M(()=>{"use strict";vP=function(){var t=o(function(p,m,g,y){for(g=g||{},y=p.length;y--;g[p[y]]=m);return g},"o"),e=[6,8,10,11,12,14,16,17,20,21],r=[1,9],n=[1,10],i=[1,11],a=[1,12],s=[1,13],l=[1,16],u=[1,17],h={trace:o(function(){},"trace"),yy:{},symbols_:{error:2,start:3,timeline:4,document:5,EOF:6,line:7,SPACE:8,statement:9,NEWLINE:10,title:11,acc_title:12,acc_title_value:13,acc_descr:14,acc_descr_value:15,acc_descr_multiline_value:16,section:17,period_statement:18,event_statement:19,period:20,event:21,$accept:0,$end:1},terminals_:{2:"error",4:"timeline",6:"EOF",8:"SPACE",10:"NEWLINE",11:"title",12:"acc_title",13:"acc_title_value",14:"acc_descr",15:"acc_descr_value",16:"acc_descr_multiline_value",17:"section",20:"period",21:"event"},productions_:[0,[3,3],[5,0],[5,2],[7,2],[7,1],[7,1],[7,1],[9,1],[9,2],[9,2],[9,1],[9,1],[9,1],[9,1],[18,1],[19,1]],performAction:o(function(m,g,y,v,x,b,w){var _=b.length-1;switch(x){case 1:return b[_-1];case 2:this.$=[];break;case 3:b[_-1].push(b[_]),this.$=b[_-1];break;case 4:case 5:this.$=b[_];break;case 6:case 7:this.$=[];break;case 8:v.getCommonDb().setDiagramTitle(b[_].substr(6)),this.$=b[_].substr(6);break;case 9:this.$=b[_].trim(),v.getCommonDb().setAccTitle(this.$);break;case 10:case 11:this.$=b[_].trim(),v.getCommonDb().setAccDescription(this.$);break;case 12:v.addSection(b[_].substr(8)),this.$=b[_].substr(8);break;case 15:v.addTask(b[_],0,""),this.$=b[_];break;case 16:v.addEvent(b[_].substr(2)),this.$=b[_];break}},"anonymous"),table:[{3:1,4:[1,2]},{1:[3]},t(e,[2,2],{5:3}),{6:[1,4],7:5,8:[1,6],9:7,10:[1,8],11:r,12:n,14:i,16:a,17:s,18:14,19:15,20:l,21:u},t(e,[2,7],{1:[2,1]}),t(e,[2,3]),{9:18,11:r,12:n,14:i,16:a,17:s,18:14,19:15,20:l,21:u},t(e,[2,5]),t(e,[2,6]),t(e,[2,8]),{13:[1,19]},{15:[1,20]},t(e,[2,11]),t(e,[2,12]),t(e,[2,13]),t(e,[2,14]),t(e,[2,15]),t(e,[2,16]),t(e,[2,4]),t(e,[2,9]),t(e,[2,10])],defaultActions:{},parseError:o(function(m,g){if(g.recoverable)this.trace(m);else{var y=new Error(m);throw y.hash=g,y}},"parseError"),parse:o(function(m){var g=this,y=[0],v=[],x=[null],b=[],w=this.table,_="",T=0,E=0,L=0,C=2,A=1,I=b.slice.call(arguments,1),D=Object.create(this.lexer),k={yy:{}};for(var R in this.yy)Object.prototype.hasOwnProperty.call(this.yy,R)&&(k.yy[R]=this.yy[R]);D.setInput(m,k.yy),k.yy.lexer=D,k.yy.parser=this,typeof D.yylloc>"u"&&(D.yylloc={});var S=D.yylloc;b.push(S);var O=D.options&&D.options.ranges;typeof k.yy.parseError=="function"?this.parseError=k.yy.parseError:this.parseError=Object.getPrototypeOf(this).parseError;function N(q){y.length=y.length-2*q,x.length=x.length-q,b.length=b.length-q}o(N,"popStack");function P(){var q;return q=v.pop()||D.lex()||A,typeof q!="number"&&(q instanceof Array&&(v=q,q=v.pop()),q=g.symbols_[q]||q),q}o(P,"lex");for(var F,B,$,z,W,j,K={},ie,Q,ee,J;;){if($=y[y.length-1],this.defaultActions[$]?z=this.defaultActions[$]:((F===null||typeof F>"u")&&(F=P()),z=w[$]&&w[$][F]),typeof z>"u"||!z.length||!z[0]){var H="";J=[];for(ie in w[$])this.terminals_[ie]&&ie>C&&J.push("'"+this.terminals_[ie]+"'");D.showPosition?H="Parse error on line "+(T+1)+`: +`+D.showPosition()+` +Expecting `+J.join(", ")+", got '"+(this.terminals_[F]||F)+"'":H="Parse error on line "+(T+1)+": Unexpected "+(F==A?"end of input":"'"+(this.terminals_[F]||F)+"'"),this.parseError(H,{text:D.match,token:this.terminals_[F]||F,line:D.yylineno,loc:S,expected:J})}if(z[0]instanceof Array&&z.length>1)throw new Error("Parse Error: multiple actions possible at state: "+$+", token: "+F);switch(z[0]){case 1:y.push(F),x.push(D.yytext),b.push(D.yylloc),y.push(z[1]),F=null,B?(F=B,B=null):(E=D.yyleng,_=D.yytext,T=D.yylineno,S=D.yylloc,L>0&&L--);break;case 2:if(Q=this.productions_[z[1]][1],K.$=x[x.length-Q],K._$={first_line:b[b.length-(Q||1)].first_line,last_line:b[b.length-1].last_line,first_column:b[b.length-(Q||1)].first_column,last_column:b[b.length-1].last_column},O&&(K._$.range=[b[b.length-(Q||1)].range[0],b[b.length-1].range[1]]),j=this.performAction.apply(K,[_,E,T,k.yy,z[1],x,b].concat(I)),typeof j<"u")return j;Q&&(y=y.slice(0,-1*Q*2),x=x.slice(0,-1*Q),b=b.slice(0,-1*Q)),y.push(this.productions_[z[1]][0]),x.push(K.$),b.push(K._$),ee=w[y[y.length-2]][y[y.length-1]],y.push(ee);break;case 3:return!0}}return!0},"parse")},f=function(){var p={EOF:1,parseError:o(function(g,y){if(this.yy.parser)this.yy.parser.parseError(g,y);else throw new Error(g)},"parseError"),setInput:o(function(m,g){return this.yy=g||this.yy||{},this._input=m,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},"setInput"),input:o(function(){var m=this._input[0];this.yytext+=m,this.yyleng++,this.offset++,this.match+=m,this.matched+=m;var g=m.match(/(?:\r\n?|\n).*/g);return g?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),m},"input"),unput:o(function(m){var g=m.length,y=m.split(/(?:\r\n?|\n)/g);this._input=m+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-g),this.offset-=g;var v=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),y.length-1&&(this.yylineno-=y.length-1);var x=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:y?(y.length===v.length?this.yylloc.first_column:0)+v[v.length-y.length].length-y[0].length:this.yylloc.first_column-g},this.options.ranges&&(this.yylloc.range=[x[0],x[0]+this.yyleng-g]),this.yyleng=this.yytext.length,this},"unput"),more:o(function(){return this._more=!0,this},"more"),reject:o(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError("Lexical error on line "+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true). +`+this.showPosition(),{text:"",token:null,line:this.yylineno});return this},"reject"),less:o(function(m){this.unput(this.match.slice(m))},"less"),pastInput:o(function(){var m=this.matched.substr(0,this.matched.length-this.match.length);return(m.length>20?"...":"")+m.substr(-20).replace(/\n/g,"")},"pastInput"),upcomingInput:o(function(){var m=this.match;return m.length<20&&(m+=this._input.substr(0,20-m.length)),(m.substr(0,20)+(m.length>20?"...":"")).replace(/\n/g,"")},"upcomingInput"),showPosition:o(function(){var m=this.pastInput(),g=new Array(m.length+1).join("-");return m+this.upcomingInput()+` +`+g+"^"},"showPosition"),test_match:o(function(m,g){var y,v,x;if(this.options.backtrack_lexer&&(x={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(x.yylloc.range=this.yylloc.range.slice(0))),v=m[0].match(/(?:\r\n?|\n).*/g),v&&(this.yylineno+=v.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:v?v[v.length-1].length-v[v.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+m[0].length},this.yytext+=m[0],this.match+=m[0],this.matches=m,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(m[0].length),this.matched+=m[0],y=this.performAction.call(this,this.yy,this,g,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),y)return y;if(this._backtrack){for(var b in x)this[b]=x[b];return!1}return!1},"test_match"),next:o(function(){if(this.done)return this.EOF;this._input||(this.done=!0);var m,g,y,v;this._more||(this.yytext="",this.match="");for(var x=this._currentRules(),b=0;b<x.length;b++)if(y=this._input.match(this.rules[x[b]]),y&&(!g||y[0].length>g[0].length)){if(g=y,v=b,this.options.backtrack_lexer){if(m=this.test_match(y,x[b]),m!==!1)return m;if(this._backtrack){g=!1;continue}else return!1}else if(!this.options.flex)break}return g?(m=this.test_match(g,x[v]),m!==!1?m:!1):this._input===""?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+`. Unrecognized text. +`+this.showPosition(),{text:"",token:null,line:this.yylineno})},"next"),lex:o(function(){var g=this.next();return g||this.lex()},"lex"),begin:o(function(g){this.conditionStack.push(g)},"begin"),popState:o(function(){var g=this.conditionStack.length-1;return g>0?this.conditionStack.pop():this.conditionStack[0]},"popState"),_currentRules:o(function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},"_currentRules"),topState:o(function(g){return g=this.conditionStack.length-1-Math.abs(g||0),g>=0?this.conditionStack[g]:"INITIAL"},"topState"),pushState:o(function(g){this.begin(g)},"pushState"),stateStackSize:o(function(){return this.conditionStack.length},"stateStackSize"),options:{"case-insensitive":!0},performAction:o(function(g,y,v,x){var b=x;switch(v){case 0:break;case 1:break;case 2:return 10;case 3:break;case 4:break;case 5:return 4;case 6:return 11;case 7:return this.begin("acc_title"),12;break;case 8:return this.popState(),"acc_title_value";break;case 9:return this.begin("acc_descr"),14;break;case 10:return this.popState(),"acc_descr_value";break;case 11:this.begin("acc_descr_multiline");break;case 12:this.popState();break;case 13:return"acc_descr_multiline_value";case 14:return 17;case 15:return 21;case 16:return 20;case 17:return 6;case 18:return"INVALID"}},"anonymous"),rules:[/^(?:%(?!\{)[^\n]*)/i,/^(?:[^\}]%%[^\n]*)/i,/^(?:[\n]+)/i,/^(?:\s+)/i,/^(?:#[^\n]*)/i,/^(?:timeline\b)/i,/^(?:title\s[^\n]+)/i,/^(?:accTitle\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*:\s*)/i,/^(?:(?!\n||)*[^\n]*)/i,/^(?:accDescr\s*\{\s*)/i,/^(?:[\}])/i,/^(?:[^\}]*)/i,/^(?:section\s[^:\n]+)/i,/^(?::\s[^:\n]+)/i,/^(?:[^#:\n]+)/i,/^(?:$)/i,/^(?:.)/i],conditions:{acc_descr_multiline:{rules:[12,13],inclusive:!1},acc_descr:{rules:[10],inclusive:!1},acc_title:{rules:[8],inclusive:!1},INITIAL:{rules:[0,1,2,3,4,5,6,7,9,11,14,15,16,17,18],inclusive:!0}}};return p}();h.lexer=f;function d(){this.yy={}}return o(d,"Parser"),d.prototype=h,h.Parser=d,new d}();vP.parser=vP;Z0e=vP});var bP={};vr(bP,{addEvent:()=>lpe,addSection:()=>ipe,addTask:()=>ope,addTaskOrg:()=>cpe,clear:()=>npe,default:()=>uqe,getCommonDb:()=>rpe,getSections:()=>ape,getTasks:()=>spe});var Xg,tpe,xP,WE,jg,rpe,npe,ipe,ape,spe,ope,lpe,cpe,epe,uqe,upe=M(()=>{"use strict";ki();Xg="",tpe=0,xP=[],WE=[],jg=[],rpe=o(()=>iy,"getCommonDb"),npe=o(function(){xP.length=0,WE.length=0,Xg="",jg.length=0,_r()},"clear"),ipe=o(function(t){Xg=t,xP.push(t)},"addSection"),ape=o(function(){return xP},"getSections"),spe=o(function(){let t=epe(),e=100,r=0;for(;!t&&r<e;)t=epe(),r++;return WE.push(...jg),WE},"getTasks"),ope=o(function(t,e,r){let n={id:tpe++,section:Xg,type:Xg,task:t,score:e||0,events:r?[r]:[]};jg.push(n)},"addTask"),lpe=o(function(t){jg.find(r=>r.id===tpe-1).events.push(t)},"addEvent"),cpe=o(function(t){let e={section:Xg,type:Xg,description:t,task:t,classes:[]};WE.push(e)},"addTaskOrg"),epe=o(function(){let t=o(function(r){return jg[r].processed},"compileTask"),e=!0;for(let[r,n]of jg.entries())t(r),e=e&&n.processed;return e},"compileTasks"),uqe={clear:npe,getCommonDb:rpe,addSection:ipe,getSections:ape,getTasks:spe,addTask:ope,addTaskOrg:cpe,addEvent:lpe}});function ppe(t,e){t.each(function(){var r=ze(this),n=r.text().split(/(\s+|<br>)/).reverse(),i,a=[],s=1.1,l=r.attr("y"),u=parseFloat(r.attr("dy")),h=r.text(null).append("tspan").attr("x",0).attr("y",l).attr("dy",u+"em");for(let f=0;f<n.length;f++)i=n[n.length-1-f],a.push(i),h.text(a.join(" ").trim()),(h.node().getComputedTextLength()>e||i==="<br>")&&(a.pop(),h.text(a.join(" ").trim()),i==="<br>"?a=[""]:a=[i],h=r.append("tspan").attr("x",0).attr("y",l).attr("dy",s+"em").text(i))})}var hqe,YE,fqe,dqe,fpe,pqe,mqe,hpe,gqe,yqe,vqe,wP,dpe,xqe,bqe,wqe,Tqe,vf,mpe=M(()=>{"use strict";mr();hqe=12,YE=o(function(t,e){let r=t.append("rect");return r.attr("x",e.x),r.attr("y",e.y),r.attr("fill",e.fill),r.attr("stroke",e.stroke),r.attr("width",e.width),r.attr("height",e.height),r.attr("rx",e.rx),r.attr("ry",e.ry),e.class!==void 0&&r.attr("class",e.class),r},"drawRect"),fqe=o(function(t,e){let n=t.append("circle").attr("cx",e.cx).attr("cy",e.cy).attr("class","face").attr("r",15).attr("stroke-width",2).attr("overflow","visible"),i=t.append("g");i.append("circle").attr("cx",e.cx-15/3).attr("cy",e.cy-15/3).attr("r",1.5).attr("stroke-width",2).attr("fill","#666").attr("stroke","#666"),i.append("circle").attr("cx",e.cx+15/3).attr("cy",e.cy-15/3).attr("r",1.5).attr("stroke-width",2).attr("fill","#666").attr("stroke","#666");function a(u){let h=El().startAngle(Math.PI/2).endAngle(3*(Math.PI/2)).innerRadius(7.5).outerRadius(6.8181818181818175);u.append("path").attr("class","mouth").attr("d",h).attr("transform","translate("+e.cx+","+(e.cy+2)+")")}o(a,"smile");function s(u){let h=El().startAngle(3*Math.PI/2).endAngle(5*(Math.PI/2)).innerRadius(7.5).outerRadius(6.8181818181818175);u.append("path").attr("class","mouth").attr("d",h).attr("transform","translate("+e.cx+","+(e.cy+7)+")")}o(s,"sad");function l(u){u.append("line").attr("class","mouth").attr("stroke",2).attr("x1",e.cx-5).attr("y1",e.cy+7).attr("x2",e.cx+5).attr("y2",e.cy+7).attr("class","mouth").attr("stroke-width","1px").attr("stroke","#666")}return o(l,"ambivalent"),e.score>3?a(i):e.score<3?s(i):l(i),n},"drawFace"),dqe=o(function(t,e){let r=t.append("circle");return r.attr("cx",e.cx),r.attr("cy",e.cy),r.attr("class","actor-"+e.pos),r.attr("fill",e.fill),r.attr("stroke",e.stroke),r.attr("r",e.r),r.class!==void 0&&r.attr("class",r.class),e.title!==void 0&&r.append("title").text(e.title),r},"drawCircle"),fpe=o(function(t,e){let r=e.text.replace(/<br\s*\/?>/gi," "),n=t.append("text");n.attr("x",e.x),n.attr("y",e.y),n.attr("class","legend"),n.style("text-anchor",e.anchor),e.class!==void 0&&n.attr("class",e.class);let i=n.append("tspan");return i.attr("x",e.x+e.textMargin*2),i.text(r),n},"drawText"),pqe=o(function(t,e){function r(i,a,s,l,u){return i+","+a+" "+(i+s)+","+a+" "+(i+s)+","+(a+l-u)+" "+(i+s-u*1.2)+","+(a+l)+" "+i+","+(a+l)}o(r,"genPoints");let n=t.append("polygon");n.attr("points",r(e.x,e.y,50,20,7)),n.attr("class","labelBox"),e.y=e.y+e.labelMargin,e.x=e.x+.5*e.labelMargin,fpe(t,e)},"drawLabel"),mqe=o(function(t,e,r){let n=t.append("g"),i=wP();i.x=e.x,i.y=e.y,i.fill=e.fill,i.width=r.width,i.height=r.height,i.class="journey-section section-type-"+e.num,i.rx=3,i.ry=3,YE(n,i),dpe(r)(e.text,n,i.x,i.y,i.width,i.height,{class:"journey-section section-type-"+e.num},r,e.colour)},"drawSection"),hpe=-1,gqe=o(function(t,e,r){let n=e.x+r.width/2,i=t.append("g");hpe++;let a=300+5*30;i.append("line").attr("id","task"+hpe).attr("x1",n).attr("y1",e.y).attr("x2",n).attr("y2",a).attr("class","task-line").attr("stroke-width","1px").attr("stroke-dasharray","4 2").attr("stroke","#666"),fqe(i,{cx:n,cy:300+(5-e.score)*30,score:e.score});let s=wP();s.x=e.x,s.y=e.y,s.fill=e.fill,s.width=r.width,s.height=r.height,s.class="task task-type-"+e.num,s.rx=3,s.ry=3,YE(i,s),dpe(r)(e.task,i,s.x,s.y,s.width,s.height,{class:"task"},r,e.colour)},"drawTask"),yqe=o(function(t,e){YE(t,{x:e.startx,y:e.starty,width:e.stopx-e.startx,height:e.stopy-e.starty,fill:e.fill,class:"rect"}).lower()},"drawBackgroundRect"),vqe=o(function(){return{x:0,y:0,fill:void 0,"text-anchor":"start",width:100,height:100,textMargin:0,rx:0,ry:0}},"getTextObj"),wP=o(function(){return{x:0,y:0,width:100,anchor:"start",height:100,rx:0,ry:0}},"getNoteRect"),dpe=function(){function t(i,a,s,l,u,h,f,d){let p=a.append("text").attr("x",s+u/2).attr("y",l+h/2+5).style("font-color",d).style("text-anchor","middle").text(i);n(p,f)}o(t,"byText");function e(i,a,s,l,u,h,f,d,p){let{taskFontSize:m,taskFontFamily:g}=d,y=i.split(/<br\s*\/?>/gi);for(let v=0;v<y.length;v++){let x=v*m-m*(y.length-1)/2,b=a.append("text").attr("x",s+u/2).attr("y",l).attr("fill",p).style("text-anchor","middle").style("font-size",m).style("font-family",g);b.append("tspan").attr("x",s+u/2).attr("dy",x).text(y[v]),b.attr("y",l+h/2).attr("dominant-baseline","central").attr("alignment-baseline","central"),n(b,f)}}o(e,"byTspan");function r(i,a,s,l,u,h,f,d){let p=a.append("switch"),g=p.append("foreignObject").attr("x",s).attr("y",l).attr("width",u).attr("height",h).attr("position","fixed").append("xhtml:div").style("display","table").style("height","100%").style("width","100%");g.append("div").attr("class","label").style("display","table-cell").style("text-align","center").style("vertical-align","middle").text(i),e(i,p,s,l,u,h,f,d),n(g,f)}o(r,"byFo");function n(i,a){for(let s in a)s in a&&i.attr(s,a[s])}return o(n,"_setTextAttrs"),function(i){return i.textPlacement==="fo"?r:i.textPlacement==="old"?t:e}}(),xqe=o(function(t){t.append("defs").append("marker").attr("id","arrowhead").attr("refX",5).attr("refY",2).attr("markerWidth",6).attr("markerHeight",4).attr("orient","auto").append("path").attr("d","M 0,0 V 4 L6,2 Z")},"initGraphics");o(ppe,"wrap");bqe=o(function(t,e,r,n){let i=r%hqe-1,a=t.append("g");e.section=i,a.attr("class",(e.class?e.class+" ":"")+"timeline-node "+("section-"+i));let s=a.append("g"),l=a.append("g"),h=l.append("text").text(e.descr).attr("dy","1em").attr("alignment-baseline","middle").attr("dominant-baseline","middle").attr("text-anchor","middle").call(ppe,e.width).node().getBBox(),f=n.fontSize?.replace?n.fontSize.replace("px",""):n.fontSize;return e.height=h.height+f*1.1*.5+e.padding,e.height=Math.max(e.height,e.maxHeight),e.width=e.width+2*e.padding,l.attr("transform","translate("+e.width/2+", "+e.padding/2+")"),Tqe(s,e,i,n),e},"drawNode"),wqe=o(function(t,e,r){let n=t.append("g"),a=n.append("text").text(e.descr).attr("dy","1em").attr("alignment-baseline","middle").attr("dominant-baseline","middle").attr("text-anchor","middle").call(ppe,e.width).node().getBBox(),s=r.fontSize?.replace?r.fontSize.replace("px",""):r.fontSize;return n.remove(),a.height+s*1.1*.5+e.padding},"getVirtualNodeHeight"),Tqe=o(function(t,e,r){t.append("path").attr("id","node-"+e.id).attr("class","node-bkg node-"+e.type).attr("d",`M0 ${e.height-5} v${-e.height+2*5} q0,-5 5,-5 h${e.width-2*5} q5,0 5,5 v${e.height-5} H0 Z`),t.append("line").attr("class","node-line-"+r).attr("x1",0).attr("y1",e.height).attr("x2",e.width).attr("y2",e.height)},"defaultBkg"),vf={drawRect:YE,drawCircle:dqe,drawSection:mqe,drawText:fpe,drawLabel:pqe,drawTask:gqe,drawBackgroundRect:yqe,getTextObj:vqe,getNoteRect:wP,initGraphics:xqe,drawNode:bqe,getVirtualNodeHeight:wqe}});var kqe,gpe,Eqe,ype,vpe=M(()=>{"use strict";mr();mpe();ht();Vt();ni();kqe=o(function(t,e,r,n){let i=de(),a=i.leftMargin??50;Y.debug("timeline",n.db);let s=i.securityLevel,l;s==="sandbox"&&(l=ze("#i"+e));let h=(s==="sandbox"?ze(l.nodes()[0].contentDocument.body):ze("body")).select("#"+e);h.append("g");let f=n.db.getTasks(),d=n.db.getCommonDb().getDiagramTitle();Y.debug("task",f),vf.initGraphics(h);let p=n.db.getSections();Y.debug("sections",p);let m=0,g=0,y=0,v=0,x=50+a,b=50;v=50;let w=0,_=!0;p.forEach(function(A){let I={number:w,descr:A,section:w,width:150,padding:20,maxHeight:m},D=vf.getVirtualNodeHeight(h,I,i);Y.debug("sectionHeight before draw",D),m=Math.max(m,D+20)});let T=0,E=0;Y.debug("tasks.length",f.length);for(let[A,I]of f.entries()){let D={number:A,descr:I,section:I.section,width:150,padding:20,maxHeight:g},k=vf.getVirtualNodeHeight(h,D,i);Y.debug("taskHeight before draw",k),g=Math.max(g,k+20),T=Math.max(T,I.events.length);let R=0;for(let S of I.events){let O={descr:S,section:I.section,number:I.section,width:150,padding:20,maxHeight:50};R+=vf.getVirtualNodeHeight(h,O,i)}E=Math.max(E,R)}Y.debug("maxSectionHeight before draw",m),Y.debug("maxTaskHeight before draw",g),p&&p.length>0?p.forEach(A=>{let I=f.filter(S=>S.section===A),D={number:w,descr:A,section:w,width:200*Math.max(I.length,1)-50,padding:20,maxHeight:m};Y.debug("sectionNode",D);let k=h.append("g"),R=vf.drawNode(k,D,w,i);Y.debug("sectionNode output",R),k.attr("transform",`translate(${x}, ${v})`),b+=m+50,I.length>0&&gpe(h,I,w,x,b,g,i,T,E,m,!1),x+=200*Math.max(I.length,1),b=v,w++}):(_=!1,gpe(h,f,w,x,b,g,i,T,E,m,!0));let L=h.node().getBBox();Y.debug("bounds",L),d&&h.append("text").text(d).attr("x",L.width/2-a).attr("font-size","4ex").attr("font-weight","bold").attr("y",20),y=_?m+g+150:g+100,h.append("g").attr("class","lineWrapper").append("line").attr("x1",a).attr("y1",y).attr("x2",L.width+3*a).attr("y2",y).attr("stroke-width",4).attr("stroke","black").attr("marker-end","url(#arrowhead)"),_o(void 0,h,i.timeline?.padding??50,i.timeline?.useMaxWidth??!1)},"draw"),gpe=o(function(t,e,r,n,i,a,s,l,u,h,f){for(let d of e){let p={descr:d.task,section:r,number:r,width:150,padding:20,maxHeight:a};Y.debug("taskNode",p);let m=t.append("g").attr("class","taskWrapper"),y=vf.drawNode(m,p,r,s).height;if(Y.debug("taskHeight after draw",y),m.attr("transform",`translate(${n}, ${i})`),a=Math.max(a,y),d.events){let v=t.append("g").attr("class","lineWrapper"),x=a;i+=100,x=x+Eqe(t,d.events,r,n,i,s),i-=100,v.append("line").attr("x1",n+190/2).attr("y1",i+a).attr("x2",n+190/2).attr("y2",i+a+(f?a:h)+u+120).attr("stroke-width",2).attr("stroke","black").attr("marker-end","url(#arrowhead)").attr("stroke-dasharray","5,5")}n=n+200,f&&!s.timeline?.disableMulticolor&&r++}i=i-10},"drawTasks"),Eqe=o(function(t,e,r,n,i,a){let s=0,l=i;i=i+100;for(let u of e){let h={descr:u,section:r,number:r,width:150,padding:20,maxHeight:50};Y.debug("eventNode",h);let f=t.append("g").attr("class","eventWrapper"),p=vf.drawNode(f,h,r,a).height;s=s+p,f.attr("transform",`translate(${n}, ${i})`),i=i+10+p}return i=l,s},"drawEvents"),ype={setConf:o(()=>{},"setConf"),draw:kqe}});var Sqe,Cqe,xpe,bpe=M(()=>{"use strict";To();Sqe=o(t=>{let e="";for(let r=0;r<t.THEME_COLOR_LIMIT;r++)t["lineColor"+r]=t["lineColor"+r]||t["cScaleInv"+r],aa(t["lineColor"+r])?t["lineColor"+r]=Dt(t["lineColor"+r],20):t["lineColor"+r]=Bt(t["lineColor"+r],20);for(let r=0;r<t.THEME_COLOR_LIMIT;r++){let n=""+(17-3*r);e+=` + .section-${r-1} rect, .section-${r-1} path, .section-${r-1} circle, .section-${r-1} path { + fill: ${t["cScale"+r]}; + } + .section-${r-1} text { + fill: ${t["cScaleLabel"+r]}; + } + .node-icon-${r-1} { + font-size: 40px; + color: ${t["cScaleLabel"+r]}; + } + .section-edge-${r-1}{ + stroke: ${t["cScale"+r]}; + } + .edge-depth-${r-1}{ + stroke-width: ${n}; + } + .section-${r-1} line { + stroke: ${t["cScaleInv"+r]} ; + stroke-width: 3; + } + + .lineWrapper line{ + stroke: ${t["cScaleLabel"+r]} ; + } + + .disabled, .disabled circle, .disabled text { + fill: lightgray; + } + .disabled text { + fill: #efefef; + } + `}return e},"genSections"),Cqe=o(t=>` + .edge { + stroke-width: 3; + } + ${Sqe(t)} + .section-root rect, .section-root path, .section-root circle { + fill: ${t.git0}; + } + .section-root text { + fill: ${t.gitBranchLabel0}; + } + .icon-container { + height:100%; + display: flex; + justify-content: center; + align-items: center; + } + .edge { + fill: none; + } + .eventWrapper { + filter: brightness(120%); + } +`,"getStyles"),xpe=Cqe});var wpe={};vr(wpe,{diagram:()=>Aqe});var Aqe,Tpe=M(()=>{"use strict";J0e();upe();vpe();bpe();Aqe={db:bP,renderer:ype,parser:Z0e,styles:xpe}});var TP,Spe,Cpe=M(()=>{"use strict";TP=function(){var t=o(function(_,T,E,L){for(E=E||{},L=_.length;L--;E[_[L]]=T);return E},"o"),e=[1,4],r=[1,13],n=[1,12],i=[1,15],a=[1,16],s=[1,20],l=[1,19],u=[6,7,8],h=[1,26],f=[1,24],d=[1,25],p=[6,7,11],m=[1,6,13,15,16,19,22],g=[1,33],y=[1,34],v=[1,6,7,11,13,15,16,19,22],x={trace:o(function(){},"trace"),yy:{},symbols_:{error:2,start:3,mindMap:4,spaceLines:5,SPACELINE:6,NL:7,MINDMAP:8,document:9,stop:10,EOF:11,statement:12,SPACELIST:13,node:14,ICON:15,CLASS:16,nodeWithId:17,nodeWithoutId:18,NODE_DSTART:19,NODE_DESCR:20,NODE_DEND:21,NODE_ID:22,$accept:0,$end:1},terminals_:{2:"error",6:"SPACELINE",7:"NL",8:"MINDMAP",11:"EOF",13:"SPACELIST",15:"ICON",16:"CLASS",19:"NODE_DSTART",20:"NODE_DESCR",21:"NODE_DEND",22:"NODE_ID"},productions_:[0,[3,1],[3,2],[5,1],[5,2],[5,2],[4,2],[4,3],[10,1],[10,1],[10,1],[10,2],[10,2],[9,3],[9,2],[12,2],[12,2],[12,2],[12,1],[12,1],[12,1],[12,1],[12,1],[14,1],[14,1],[18,3],[17,1],[17,4]],performAction:o(function(T,E,L,C,A,I,D){var k=I.length-1;switch(A){case 6:case 7:return C;case 8:C.getLogger().trace("Stop NL ");break;case 9:C.getLogger().trace("Stop EOF ");break;case 11:C.getLogger().trace("Stop NL2 ");break;case 12:C.getLogger().trace("Stop EOF2 ");break;case 15:C.getLogger().info("Node: ",I[k].id),C.addNode(I[k-1].length,I[k].id,I[k].descr,I[k].type);break;case 16:C.getLogger().trace("Icon: ",I[k]),C.decorateNode({icon:I[k]});break;case 17:case 21:C.decorateNode({class:I[k]});break;case 18:C.getLogger().trace("SPACELIST");break;case 19:C.getLogger().trace("Node: ",I[k].id),C.addNode(0,I[k].id,I[k].descr,I[k].type);break;case 20:C.decorateNode({icon:I[k]});break;case 25:C.getLogger().trace("node found ..",I[k-2]),this.$={id:I[k-1],descr:I[k-1],type:C.getType(I[k-2],I[k])};break;case 26:this.$={id:I[k],descr:I[k],type:C.nodeType.DEFAULT};break;case 27:C.getLogger().trace("node found ..",I[k-3]),this.$={id:I[k-3],descr:I[k-1],type:C.getType(I[k-2],I[k])};break}},"anonymous"),table:[{3:1,4:2,5:3,6:[1,5],8:e},{1:[3]},{1:[2,1]},{4:6,6:[1,7],7:[1,8],8:e},{6:r,7:[1,10],9:9,12:11,13:n,14:14,15:i,16:a,17:17,18:18,19:s,22:l},t(u,[2,3]),{1:[2,2]},t(u,[2,4]),t(u,[2,5]),{1:[2,6],6:r,12:21,13:n,14:14,15:i,16:a,17:17,18:18,19:s,22:l},{6:r,9:22,12:11,13:n,14:14,15:i,16:a,17:17,18:18,19:s,22:l},{6:h,7:f,10:23,11:d},t(p,[2,22],{17:17,18:18,14:27,15:[1,28],16:[1,29],19:s,22:l}),t(p,[2,18]),t(p,[2,19]),t(p,[2,20]),t(p,[2,21]),t(p,[2,23]),t(p,[2,24]),t(p,[2,26],{19:[1,30]}),{20:[1,31]},{6:h,7:f,10:32,11:d},{1:[2,7],6:r,12:21,13:n,14:14,15:i,16:a,17:17,18:18,19:s,22:l},t(m,[2,14],{7:g,11:y}),t(v,[2,8]),t(v,[2,9]),t(v,[2,10]),t(p,[2,15]),t(p,[2,16]),t(p,[2,17]),{20:[1,35]},{21:[1,36]},t(m,[2,13],{7:g,11:y}),t(v,[2,11]),t(v,[2,12]),{21:[1,37]},t(p,[2,25]),t(p,[2,27])],defaultActions:{2:[2,1],6:[2,2]},parseError:o(function(T,E){if(E.recoverable)this.trace(T);else{var L=new Error(T);throw L.hash=E,L}},"parseError"),parse:o(function(T){var E=this,L=[0],C=[],A=[null],I=[],D=this.table,k="",R=0,S=0,O=0,N=2,P=1,F=I.slice.call(arguments,1),B=Object.create(this.lexer),$={yy:{}};for(var z in this.yy)Object.prototype.hasOwnProperty.call(this.yy,z)&&($.yy[z]=this.yy[z]);B.setInput(T,$.yy),$.yy.lexer=B,$.yy.parser=this,typeof B.yylloc>"u"&&(B.yylloc={});var W=B.yylloc;I.push(W);var j=B.options&&B.options.ranges;typeof $.yy.parseError=="function"?this.parseError=$.yy.parseError:this.parseError=Object.getPrototypeOf(this).parseError;function K(ke){L.length=L.length-2*ke,A.length=A.length-ke,I.length=I.length-ke}o(K,"popStack");function ie(){var ke;return ke=C.pop()||B.lex()||P,typeof ke!="number"&&(ke instanceof Array&&(C=ke,ke=C.pop()),ke=E.symbols_[ke]||ke),ke}o(ie,"lex");for(var Q,ee,J,H,q,Z,ae={},ue,ce,te,De;;){if(J=L[L.length-1],this.defaultActions[J]?H=this.defaultActions[J]:((Q===null||typeof Q>"u")&&(Q=ie()),H=D[J]&&D[J][Q]),typeof H>"u"||!H.length||!H[0]){var oe="";De=[];for(ue in D[J])this.terminals_[ue]&&ue>N&&De.push("'"+this.terminals_[ue]+"'");B.showPosition?oe="Parse error on line "+(R+1)+`: +`+B.showPosition()+` +Expecting `+De.join(", ")+", got '"+(this.terminals_[Q]||Q)+"'":oe="Parse error on line "+(R+1)+": Unexpected "+(Q==P?"end of input":"'"+(this.terminals_[Q]||Q)+"'"),this.parseError(oe,{text:B.match,token:this.terminals_[Q]||Q,line:B.yylineno,loc:W,expected:De})}if(H[0]instanceof Array&&H.length>1)throw new Error("Parse Error: multiple actions possible at state: "+J+", token: "+Q);switch(H[0]){case 1:L.push(Q),A.push(B.yytext),I.push(B.yylloc),L.push(H[1]),Q=null,ee?(Q=ee,ee=null):(S=B.yyleng,k=B.yytext,R=B.yylineno,W=B.yylloc,O>0&&O--);break;case 2:if(ce=this.productions_[H[1]][1],ae.$=A[A.length-ce],ae._$={first_line:I[I.length-(ce||1)].first_line,last_line:I[I.length-1].last_line,first_column:I[I.length-(ce||1)].first_column,last_column:I[I.length-1].last_column},j&&(ae._$.range=[I[I.length-(ce||1)].range[0],I[I.length-1].range[1]]),Z=this.performAction.apply(ae,[k,S,R,$.yy,H[1],A,I].concat(F)),typeof Z<"u")return Z;ce&&(L=L.slice(0,-1*ce*2),A=A.slice(0,-1*ce),I=I.slice(0,-1*ce)),L.push(this.productions_[H[1]][0]),A.push(ae.$),I.push(ae._$),te=D[L[L.length-2]][L[L.length-1]],L.push(te);break;case 3:return!0}}return!0},"parse")},b=function(){var _={EOF:1,parseError:o(function(E,L){if(this.yy.parser)this.yy.parser.parseError(E,L);else throw new Error(E)},"parseError"),setInput:o(function(T,E){return this.yy=E||this.yy||{},this._input=T,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},"setInput"),input:o(function(){var T=this._input[0];this.yytext+=T,this.yyleng++,this.offset++,this.match+=T,this.matched+=T;var E=T.match(/(?:\r\n?|\n).*/g);return E?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),T},"input"),unput:o(function(T){var E=T.length,L=T.split(/(?:\r\n?|\n)/g);this._input=T+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-E),this.offset-=E;var C=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),L.length-1&&(this.yylineno-=L.length-1);var A=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:L?(L.length===C.length?this.yylloc.first_column:0)+C[C.length-L.length].length-L[0].length:this.yylloc.first_column-E},this.options.ranges&&(this.yylloc.range=[A[0],A[0]+this.yyleng-E]),this.yyleng=this.yytext.length,this},"unput"),more:o(function(){return this._more=!0,this},"more"),reject:o(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError("Lexical error on line "+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true). +`+this.showPosition(),{text:"",token:null,line:this.yylineno});return this},"reject"),less:o(function(T){this.unput(this.match.slice(T))},"less"),pastInput:o(function(){var T=this.matched.substr(0,this.matched.length-this.match.length);return(T.length>20?"...":"")+T.substr(-20).replace(/\n/g,"")},"pastInput"),upcomingInput:o(function(){var T=this.match;return T.length<20&&(T+=this._input.substr(0,20-T.length)),(T.substr(0,20)+(T.length>20?"...":"")).replace(/\n/g,"")},"upcomingInput"),showPosition:o(function(){var T=this.pastInput(),E=new Array(T.length+1).join("-");return T+this.upcomingInput()+` +`+E+"^"},"showPosition"),test_match:o(function(T,E){var L,C,A;if(this.options.backtrack_lexer&&(A={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(A.yylloc.range=this.yylloc.range.slice(0))),C=T[0].match(/(?:\r\n?|\n).*/g),C&&(this.yylineno+=C.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:C?C[C.length-1].length-C[C.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+T[0].length},this.yytext+=T[0],this.match+=T[0],this.matches=T,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(T[0].length),this.matched+=T[0],L=this.performAction.call(this,this.yy,this,E,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),L)return L;if(this._backtrack){for(var I in A)this[I]=A[I];return!1}return!1},"test_match"),next:o(function(){if(this.done)return this.EOF;this._input||(this.done=!0);var T,E,L,C;this._more||(this.yytext="",this.match="");for(var A=this._currentRules(),I=0;I<A.length;I++)if(L=this._input.match(this.rules[A[I]]),L&&(!E||L[0].length>E[0].length)){if(E=L,C=I,this.options.backtrack_lexer){if(T=this.test_match(L,A[I]),T!==!1)return T;if(this._backtrack){E=!1;continue}else return!1}else if(!this.options.flex)break}return E?(T=this.test_match(E,A[C]),T!==!1?T:!1):this._input===""?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+`. Unrecognized text. +`+this.showPosition(),{text:"",token:null,line:this.yylineno})},"next"),lex:o(function(){var E=this.next();return E||this.lex()},"lex"),begin:o(function(E){this.conditionStack.push(E)},"begin"),popState:o(function(){var E=this.conditionStack.length-1;return E>0?this.conditionStack.pop():this.conditionStack[0]},"popState"),_currentRules:o(function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},"_currentRules"),topState:o(function(E){return E=this.conditionStack.length-1-Math.abs(E||0),E>=0?this.conditionStack[E]:"INITIAL"},"topState"),pushState:o(function(E){this.begin(E)},"pushState"),stateStackSize:o(function(){return this.conditionStack.length},"stateStackSize"),options:{"case-insensitive":!0},performAction:o(function(E,L,C,A){var I=A;switch(C){case 0:return E.getLogger().trace("Found comment",L.yytext),6;break;case 1:return 8;case 2:this.begin("CLASS");break;case 3:return this.popState(),16;break;case 4:this.popState();break;case 5:E.getLogger().trace("Begin icon"),this.begin("ICON");break;case 6:return E.getLogger().trace("SPACELINE"),6;break;case 7:return 7;case 8:return 15;case 9:E.getLogger().trace("end icon"),this.popState();break;case 10:return E.getLogger().trace("Exploding node"),this.begin("NODE"),19;break;case 11:return E.getLogger().trace("Cloud"),this.begin("NODE"),19;break;case 12:return E.getLogger().trace("Explosion Bang"),this.begin("NODE"),19;break;case 13:return E.getLogger().trace("Cloud Bang"),this.begin("NODE"),19;break;case 14:return this.begin("NODE"),19;break;case 15:return this.begin("NODE"),19;break;case 16:return this.begin("NODE"),19;break;case 17:return this.begin("NODE"),19;break;case 18:return 13;case 19:return 22;case 20:return 11;case 21:this.begin("NSTR2");break;case 22:return"NODE_DESCR";case 23:this.popState();break;case 24:E.getLogger().trace("Starting NSTR"),this.begin("NSTR");break;case 25:return E.getLogger().trace("description:",L.yytext),"NODE_DESCR";break;case 26:this.popState();break;case 27:return this.popState(),E.getLogger().trace("node end ))"),"NODE_DEND";break;case 28:return this.popState(),E.getLogger().trace("node end )"),"NODE_DEND";break;case 29:return this.popState(),E.getLogger().trace("node end ...",L.yytext),"NODE_DEND";break;case 30:return this.popState(),E.getLogger().trace("node end (("),"NODE_DEND";break;case 31:return this.popState(),E.getLogger().trace("node end (-"),"NODE_DEND";break;case 32:return this.popState(),E.getLogger().trace("node end (-"),"NODE_DEND";break;case 33:return this.popState(),E.getLogger().trace("node end (("),"NODE_DEND";break;case 34:return this.popState(),E.getLogger().trace("node end (("),"NODE_DEND";break;case 35:return E.getLogger().trace("Long description:",L.yytext),20;break;case 36:return E.getLogger().trace("Long description:",L.yytext),20;break}},"anonymous"),rules:[/^(?:\s*%%.*)/i,/^(?:mindmap\b)/i,/^(?::::)/i,/^(?:.+)/i,/^(?:\n)/i,/^(?:::icon\()/i,/^(?:[\s]+[\n])/i,/^(?:[\n]+)/i,/^(?:[^\)]+)/i,/^(?:\))/i,/^(?:-\))/i,/^(?:\(-)/i,/^(?:\)\))/i,/^(?:\))/i,/^(?:\(\()/i,/^(?:\{\{)/i,/^(?:\()/i,/^(?:\[)/i,/^(?:[\s]+)/i,/^(?:[^\(\[\n\)\{\}]+)/i,/^(?:$)/i,/^(?:["][`])/i,/^(?:[^`"]+)/i,/^(?:[`]["])/i,/^(?:["])/i,/^(?:[^"]+)/i,/^(?:["])/i,/^(?:[\)]\))/i,/^(?:[\)])/i,/^(?:[\]])/i,/^(?:\}\})/i,/^(?:\(-)/i,/^(?:-\))/i,/^(?:\(\()/i,/^(?:\()/i,/^(?:[^\)\]\(\}]+)/i,/^(?:.+(?!\(\())/i],conditions:{CLASS:{rules:[3,4],inclusive:!1},ICON:{rules:[8,9],inclusive:!1},NSTR2:{rules:[22,23],inclusive:!1},NSTR:{rules:[25,26],inclusive:!1},NODE:{rules:[21,24,27,28,29,30,31,32,33,34,35,36],inclusive:!1},INITIAL:{rules:[0,1,2,5,6,7,10,11,12,13,14,15,16,17,18,19,20],inclusive:!0}}};return _}();x.lexer=b;function w(){this.yy={}}return o(w,"Parser"),w.prototype=x,x.Parser=w,new w}();TP.parser=TP;Spe=TP});var Vl,Ape,kP,Nqe,Rqe,Mqe,Iqe,Ui,Oqe,Pqe,Bqe,Fqe,zqe,Gqe,$qe,_pe,Lpe=M(()=>{"use strict";Vt();fr();ht();hs();Vl=[],Ape=0,kP={},Nqe=o(()=>{Vl=[],Ape=0,kP={}},"clear"),Rqe=o(function(t){for(let e=Vl.length-1;e>=0;e--)if(Vl[e].level<t)return Vl[e];return null},"getParent"),Mqe=o(()=>Vl.length>0?Vl[0]:null,"getMindmap"),Iqe=o((t,e,r,n)=>{Y.info("addNode",t,e,r,n);let i=de(),a=i.mindmap?.padding??ur.mindmap.padding;switch(n){case Ui.ROUNDED_RECT:case Ui.RECT:case Ui.HEXAGON:a*=2}let s={id:Ape++,nodeId:Tr(e,i),level:t,descr:Tr(r,i),type:n,children:[],width:i.mindmap?.maxNodeWidth??ur.mindmap.maxNodeWidth,padding:a},l=Rqe(t);if(l)l.children.push(s),Vl.push(s);else if(Vl.length===0)Vl.push(s);else throw new Error('There can be only one root. No parent could be found for ("'+s.descr+'")')},"addNode"),Ui={DEFAULT:0,NO_BORDER:0,ROUNDED_RECT:1,RECT:2,CIRCLE:3,CLOUD:4,BANG:5,HEXAGON:6},Oqe=o((t,e)=>{switch(Y.debug("In get type",t,e),t){case"[":return Ui.RECT;case"(":return e===")"?Ui.ROUNDED_RECT:Ui.CLOUD;case"((":return Ui.CIRCLE;case")":return Ui.CLOUD;case"))":return Ui.BANG;case"{{":return Ui.HEXAGON;default:return Ui.DEFAULT}},"getType"),Pqe=o((t,e)=>{kP[t]=e},"setElementForId"),Bqe=o(t=>{if(!t)return;let e=de(),r=Vl[Vl.length-1];t.icon&&(r.icon=Tr(t.icon,e)),t.class&&(r.class=Tr(t.class,e))},"decorateNode"),Fqe=o(t=>{switch(t){case Ui.DEFAULT:return"no-border";case Ui.RECT:return"rect";case Ui.ROUNDED_RECT:return"rounded-rect";case Ui.CIRCLE:return"circle";case Ui.CLOUD:return"cloud";case Ui.BANG:return"bang";case Ui.HEXAGON:return"hexgon";default:return"no-border"}},"type2Str"),zqe=o(()=>Y,"getLogger"),Gqe=o(t=>kP[t],"getElementById"),$qe={clear:Nqe,addNode:Iqe,getMindmap:Mqe,nodeType:Ui,getType:Oqe,setElementForId:Pqe,decorateNode:Bqe,type2Str:Fqe,getLogger:zqe,getElementById:Gqe},_pe=$qe});function Yi(t){"@babel/helpers - typeof";return Yi=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(e){return typeof e}:function(e){return e&&typeof Symbol=="function"&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},Yi(t)}function JP(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Dpe(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}function eB(t,e,r){return e&&Dpe(t.prototype,e),r&&Dpe(t,r),Object.defineProperty(t,"prototype",{writable:!1}),t}function Hme(t,e,r){return e in t?Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[e]=r,t}function Ul(t,e){return Vqe(t)||Uqe(t,e)||Wme(t,e)||Hqe()}function Vqe(t){if(Array.isArray(t))return t}function Uqe(t,e){var r=t==null?null:typeof Symbol<"u"&&t[Symbol.iterator]||t["@@iterator"];if(r!=null){var n=[],i=!0,a=!1,s,l;try{for(r=r.call(t);!(i=(s=r.next()).done)&&(n.push(s.value),!(e&&n.length===e));i=!0);}catch(u){a=!0,l=u}finally{try{!i&&r.return!=null&&r.return()}finally{if(a)throw l}}return n}}function Wme(t,e){if(t){if(typeof t=="string")return Npe(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);if(r==="Object"&&t.constructor&&(r=t.constructor.name),r==="Map"||r==="Set")return Array.from(t);if(r==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r))return Npe(t,e)}}function Npe(t,e){(e==null||e>t.length)&&(e=t.length);for(var r=0,n=new Array(e);r<e;r++)n[r]=t[r];return n}function Hqe(){throw new TypeError(`Invalid attempt to destructure non-iterable instance. +In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}function Yme(t,e){var r=typeof Symbol<"u"&&t[Symbol.iterator]||t["@@iterator"];if(!r){if(Array.isArray(t)||(r=Wme(t))||e&&t&&typeof t.length=="number"){r&&(t=r);var n=0,i=o(function(){},"F");return{s:i,n:o(function(){return n>=t.length?{done:!0}:{done:!1,value:t[n++]}},"n"),e:o(function(u){throw u},"e"),f:i}}throw new TypeError(`Invalid attempt to iterate non-iterable instance. +In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}var a=!0,s=!1,l;return{s:o(function(){r=r.call(t)},"s"),n:o(function(){var u=r.next();return a=u.done,u},"n"),e:o(function(u){s=!0,l=u},"e"),f:o(function(){try{!a&&r.return!=null&&r.return()}finally{if(s)throw l}},"f")}}function pXe(t){var e=typeof t;return t!=null&&(e=="object"||e=="function")}function mXe(t,e){return e={exports:{}},t(e,e.exports),e.exports}function TXe(t){for(var e=t.length;e--&&wXe.test(t.charAt(e)););return e}function SXe(t){return t&&t.slice(0,kXe(t)+1).replace(EXe,"")}function DXe(t){var e=_Xe.call(t,Lx),r=t[Lx];try{t[Lx]=void 0;var n=!0}catch{}var i=LXe.call(t);return n&&(e?t[Lx]=r:delete t[Lx]),i}function IXe(t){return MXe.call(t)}function FXe(t){return t==null?t===void 0?BXe:PXe:Ipe&&Ipe in Object(t)?NXe(t):OXe(t)}function zXe(t){return t!=null&&typeof t=="object"}function VXe(t){return typeof t=="symbol"||GXe(t)&&tge(t)==$Xe}function qXe(t){if(typeof t=="number")return t;if(eb(t))return Ope;if(F0(t)){var e=typeof t.valueOf=="function"?t.valueOf():t;t=F0(e)?e+"":e}if(typeof t!="string")return t===0?t:+t;t=CXe(t);var r=HXe.test(t);return r||WXe.test(t)?YXe(t.slice(2),r?2:8):UXe.test(t)?Ope:+t}function QXe(t,e,r){var n,i,a,s,l,u,h=0,f=!1,d=!1,p=!0;if(typeof t!="function")throw new TypeError(XXe);e=Ppe(e)||0,F0(r)&&(f=!!r.leading,d="maxWait"in r,a=d?jXe(Ppe(r.maxWait)||0,e):a,p="trailing"in r?!!r.trailing:p);function m(E){var L=n,C=i;return n=i=void 0,h=E,s=t.apply(C,L),s}o(m,"invokeFunc");function g(E){return h=E,l=setTimeout(x,e),f?m(E):s}o(g,"leadingEdge");function y(E){var L=E-u,C=E-h,A=e-L;return d?KXe(A,a-C):A}o(y,"remainingWait");function v(E){var L=E-u,C=E-h;return u===void 0||L>=e||L<0||d&&C>=a}o(v,"shouldInvoke");function x(){var E=EP();if(v(E))return b(E);l=setTimeout(x,y(E))}o(x,"timerExpired");function b(E){return l=void 0,p&&n?m(E):(n=i=void 0,s)}o(b,"trailingEdge");function w(){l!==void 0&&clearTimeout(l),h=0,n=u=i=l=void 0}o(w,"cancel");function _(){return l===void 0?s:b(EP())}o(_,"flush");function T(){var E=EP(),L=v(E);if(n=arguments,i=this,u=E,L){if(l===void 0)return g(u);if(d)return clearTimeout(l),l=setTimeout(x,e),m(u)}return l===void 0&&(l=setTimeout(x,e)),s}return o(T,"debounced"),T.cancel=w,T.flush=_,T}function D6(t,e,r,n,i,a){var s;return ti(t)?s=t:s=u1[t]||u1.euclidean,e===0&&ti(t)?s(i,a):s(e,r,n,i,a)}function UKe(t,e){if(N6(t))return!1;var r=typeof t;return r=="number"||r=="symbol"||r=="boolean"||t==null||eb(t)?!0:VKe.test(t)||!$Ke.test(t)||e!=null&&t in Object(e)}function jKe(t){if(!F0(t))return!1;var e=tge(t);return e==YKe||e==qKe||e==WKe||e==XKe}function ZKe(t){return!!rme&&rme in t}function rQe(t){if(t!=null){try{return tQe.call(t)}catch{}try{return t+""}catch{}}return""}function hQe(t){if(!F0(t)||JKe(t))return!1;var e=KKe(t)?uQe:aQe;return e.test(nQe(t))}function dQe(t,e){return t?.[e]}function mQe(t,e){var r=pQe(t,e);return fQe(r)?r:void 0}function yQe(){this.__data__=qx?qx(null):{},this.size=0}function xQe(t){var e=this.has(t)&&delete this.__data__[t];return this.size-=e?1:0,e}function EQe(t){var e=this.__data__;if(qx){var r=e[t];return r===wQe?void 0:r}return kQe.call(e,t)?e[t]:void 0}function _Qe(t){var e=this.__data__;return qx?e[t]!==void 0:AQe.call(e,t)}function NQe(t,e){var r=this.__data__;return this.size+=this.has(t)?0:1,r[t]=qx&&e===void 0?DQe:e,this}function p1(t){var e=-1,r=t==null?0:t.length;for(this.clear();++e<r;){var n=t[e];this.set(n[0],n[1])}}function MQe(){this.__data__=[],this.size=0}function OQe(t,e){return t===e||t!==t&&e!==e}function PQe(t,e){for(var r=t.length;r--;)if(Cge(t[r][0],e))return r;return-1}function zQe(t){var e=this.__data__,r=R6(e,t);if(r<0)return!1;var n=e.length-1;return r==n?e.pop():FQe.call(e,r,1),--this.size,!0}function $Qe(t){var e=this.__data__,r=R6(e,t);return r<0?void 0:e[r][1]}function UQe(t){return R6(this.__data__,t)>-1}function WQe(t,e){var r=this.__data__,n=R6(r,t);return n<0?(++this.size,r.push([t,e])):r[n][1]=e,this}function m1(t){var e=-1,r=t==null?0:t.length;for(this.clear();++e<r;){var n=t[e];this.set(n[0],n[1])}}function KQe(){this.size=0,this.__data__={hash:new nme,map:new(jQe||qQe),string:new nme}}function ZQe(t){var e=typeof t;return e=="string"||e=="number"||e=="symbol"||e=="boolean"?t!=="__proto__":t===null}function eZe(t,e){var r=t.__data__;return JQe(e)?r[typeof e=="string"?"string":"hash"]:r.map}function tZe(t){var e=M6(this,t).delete(t);return this.size-=e?1:0,e}function nZe(t){return M6(this,t).get(t)}function aZe(t){return M6(this,t).has(t)}function oZe(t,e){var r=M6(this,t),n=r.size;return r.set(t,e),this.size+=r.size==n?0:1,this}function g1(t){var e=-1,r=t==null?0:t.length;for(this.clear();++e<r;){var n=t[e];this.set(n[0],n[1])}}function hB(t,e){if(typeof t!="function"||e!=null&&typeof e!="function")throw new TypeError(cZe);var r=o(function(){var n=arguments,i=e?e.apply(this,n):n[0],a=r.cache;if(a.has(i))return a.get(i);var s=t.apply(this,n);return r.cache=a.set(i,s)||a,s},"memoized");return r.cache=new(hB.Cache||Age),r}function fZe(t){var e=uZe(t,function(n){return r.size===hZe&&r.clear(),n}),r=e.cache;return e}function yZe(t,e){for(var r=-1,n=t==null?0:t.length,i=Array(n);++r<n;)i[r]=e(t[r],r,t);return i}function Dge(t){if(typeof t=="string")return t;if(N6(t))return Lge(t,Dge)+"";if(eb(t))return ame?ame.call(t):"";var e=t+"";return e=="0"&&1/t==-vZe?"-0":e}function bZe(t){return t==null?"":xZe(t)}function wZe(t,e){return N6(t)?t:HKe(t,e)?[t]:_ge(Nge(t))}function kZe(t){if(typeof t=="string"||eb(t))return t;var e=t+"";return e=="0"&&1/t==-TZe?"-0":e}function EZe(t,e){e=Rge(e,t);for(var r=0,n=e.length;t!=null&&r<n;)t=t[fB(e[r++])];return r&&r==n?t:void 0}function CZe(t,e,r){var n=t==null?void 0:SZe(t,e);return n===void 0?r:n}function LZe(t,e,r){e=="__proto__"&&sme?sme(t,e,{configurable:!0,enumerable:!0,value:r,writable:!0}):t[e]=r}function MZe(t,e,r){var n=t[e];(!(RZe.call(t,e)&&Cge(n,r))||r===void 0&&!(e in t))&&DZe(t,e,r)}function BZe(t,e){var r=typeof t;return e=e??OZe,!!e&&(r=="number"||r!="symbol"&&PZe.test(t))&&t>-1&&t%1==0&&t<e}function zZe(t,e,r,n){if(!F0(t))return t;e=Rge(e,t);for(var i=-1,a=e.length,s=a-1,l=t;l!=null&&++i<a;){var u=fB(e[i]),h=r;if(u==="__proto__"||u==="constructor"||u==="prototype")return t;if(i!=s){var f=l[u];h=n?n(f,u,l):void 0,h===void 0&&(h=F0(f)?f:FZe(e[i+1])?[]:{})}IZe(l,u,h),l=l[u]}return t}function $Ze(t,e,r){return t==null?t:GZe(t,e,r)}function UZe(t,e){var r=-1,n=t.length;for(e||(e=Array(n));++r<n;)e[r]=t[r];return e}function WZe(t){return N6(t)?Lge(t,fB):eb(t)?[t]:HZe(_ge(Nge(t)))}function pB(t,e,r,n){for(var i=[],a=new f1,s=t.cy(),l=s.hasCompoundNodes(),u=0;u<t.length;u++){var h=t[u];r?i.push(h):l&&n(i,a,h)}for(;i.length>0;){var f=i.shift();e(f),a.add(f.id()),l&&n(i,a,f)}return t}function Ige(t,e,r){if(r.isParent())for(var n=r._private.children,i=0;i<n.length;i++){var a=n[i];e.has(a.id())||t.push(a)}}function Oge(t,e,r){if(r.isChild()){var n=r._private.parent;e.has(n.id())||t.push(n)}}function uJe(t,e,r){Oge(t,e,r),Ige(t,e,r)}function DP(t){return function(e){var r=this;if(e===void 0&&(e=!0),r.length!==0)if(r.isNode()&&!r.removed()){for(var n=0,i=r[0],a=i._private.edges,s=0;s<a.length;s++){var l=a[s];!e&&l.isLoop()||(n+=t(i,l))}return n}else return}}function Qg(t,e){return function(r){for(var n,i=this.nodes(),a=0;a<i.length;a++){var s=i[a],l=s[t](r);l!==void 0&&(n===void 0||e(l,n))&&(n=l)}return n}}function Rx(){return!1}function e6(){return!0}function O6(){for(var t=arguments.length>0&&arguments[0]!==void 0?arguments[0]:LJe,e=arguments.length>1?arguments[1]:void 0,r=0;r<fme.length;r++){var n=fme[r];this[n]=t[n]||Hge[n]}this.context=e||this.context,this.listeners=[],this.emitting=0}function jge(t,e,r){var n=r._private,i=n.styleCache=n.styleCache||[],a;return(a=i[t])!=null||(a=i[t]=e(r)),a}function P6(t,e){return t=z0(t),o(function(n){return jge(t,e,n)},"cachedStyleFunction")}function B6(t,e){t=z0(t);var r=o(function(i){return e.call(i)},"selfFn");return o(function(){var i=this[0];if(i)return jge(t,r,i)},"cachedPrototypeStyleFunction")}function RP(t,e){var r=t._private,n=r.data.parent?t.parents():null;if(n)for(var i=0;i<n.length;i++){var a=n[i];if(!e(a))return!1}return!0}function mB(t){var e=t.ok,r=t.edgeOkViaNode||t.ok,n=t.parentOk||t.ok;return function(){var i=this.cy();if(!i.styleEnabled())return!0;var a=this[0],s=i.hasCompoundNodes();if(a){var l=a._private;if(!e(a))return!1;if(a.isNode())return!s||RP(a,n);var u=l.source,h=l.target;return r(u)&&(!s||RP(u,r))&&(u===h||r(h)&&(!s||RP(h,r)))}}}function pme(t){return function(){var e=arguments,r=[];if(e.length===2){var n=e[0],i=e[1];this.on(t.event,n,i)}else if(e.length===1&&ti(e[0])){var a=e[0];this.on(t.event,a)}else if(e.length===0||e.length===1&&wn(e[0])){for(var s=e.length===1?e[0]:null,l=0;l<this.length;l++){var u=this[l],h=!t.ableField||u._private[t.ableField],f=u._private[t.field]!=t.value;if(t.overrideAble){var d=t.overrideAble(u);if(d!==void 0&&(h=d,!d))return this}h&&(u._private[t.field]=t.value,f&&r.push(u))}var p=this.spawn(r);p.updateStyle(),p.emit(t.event),s&&p.emit(s)}return this}}function v1(t){Ef[t.field]=function(){var e=this[0];if(e){if(t.overrideField){var r=t.overrideField(e);if(r!==void 0)return r}return e._private[t.field]}},Ef[t.on]=pme({event:t.on,field:t.field,ableField:t.ableField,overrideAble:t.overrideAble,value:!0}),Ef[t.off]=pme({event:t.off,field:t.field,ableField:t.ableField,overrideAble:t.overrideAble,value:!1})}function vme(t){return o(function(r){for(var n=[],i=0;i<this.length;i++){var a=this[i],s=a._private[t.attr];s&&n.push(s)}return this.spawn(n,!0).filter(r)},"sourceImpl")}function xme(t){return o(function(r){var n=[],i=this._private.cy,a=t||{};Zt(r)&&(r=i.$(r));for(var s=0;s<r.length;s++)for(var l=r[s]._private.edges,u=0;u<l.length;u++){var h=l[u],f=h._private.data,d=this.hasElementWithId(f.source)&&r.hasElementWithId(f.target),p=r.hasElementWithId(f.source)&&this.hasElementWithId(f.target),m=d||p;m&&((a.thisIsSrc||a.thisIsTgt)&&(a.thisIsSrc&&!d||a.thisIsTgt&&!p)||n.push(h))}return this.spawn(n,!0)},"edgesWithImpl")}function bme(t){var e={codirected:!1};return t=ir({},e,t),o(function(n){for(var i=[],a=this.edges(),s=t,l=0;l<a.length;l++)for(var u=a[l],h=u._private,f=h.source,d=f._private.data.id,p=h.data.target,m=f._private.edges,g=0;g<m.length;g++){var y=m[g],v=y._private.data,x=v.target,b=v.source,w=x===p&&b===d,_=d===x&&p===b;(s.codirected&&w||!s.codirected&&(w||_))&&i.push(y)}return this.spawn(i,!0).filter(n)},"parallelEdgesImpl")}function GJe(t,e,r,n){var i=4,a=.001,s=1e-7,l=10,u=11,h=1/(u-1),f=typeof Float32Array<"u";if(arguments.length!==4)return!1;for(var d=0;d<4;++d)if(typeof arguments[d]!="number"||isNaN(arguments[d])||!isFinite(arguments[d]))return!1;t=Math.min(t,1),r=Math.min(r,1),t=Math.max(t,0),r=Math.max(r,0);var p=f?new Float32Array(u):new Array(u);function m(I,D){return 1-3*D+3*I}o(m,"A");function g(I,D){return 3*D-6*I}o(g,"B");function y(I){return 3*I}o(y,"C");function v(I,D,k){return((m(D,k)*I+g(D,k))*I+y(D))*I}o(v,"calcBezier");function x(I,D,k){return 3*m(D,k)*I*I+2*g(D,k)*I+y(D)}o(x,"getSlope");function b(I,D){for(var k=0;k<i;++k){var R=x(D,t,r);if(R===0)return D;var S=v(D,t,r)-I;D-=S/R}return D}o(b,"newtonRaphsonIterate");function w(){for(var I=0;I<u;++I)p[I]=v(I*h,t,r)}o(w,"calcSampleValues");function _(I,D,k){var R,S,O=0;do S=D+(k-D)/2,R=v(S,t,r)-I,R>0?k=S:D=S;while(Math.abs(R)>s&&++O<l);return S}o(_,"binarySubdivide");function T(I){for(var D=0,k=1,R=u-1;k!==R&&p[k]<=I;++k)D+=h;--k;var S=(I-p[k])/(p[k+1]-p[k]),O=D+S*h,N=x(O,t,r);return N>=a?b(I,O):N===0?O:_(I,D,D+h)}o(T,"getTForX");var E=!1;function L(){E=!0,(t!==e||r!==n)&&w()}o(L,"precompute");var C=o(function(D){return E||L(),t===e&&r===n?D:D===0?0:D===1?1:v(T(D),e,n)},"f");C.getControlPoints=function(){return[{x:t,y:e},{x:r,y:n}]};var A="generateBezier("+[t,e,r,n]+")";return C.toString=function(){return A},C}function wme(t,e,r,n,i){if(n===1||e===r)return r;var a=i(e,r,n);return t==null||((t.roundValue||t.color)&&(a=Math.round(a)),t.min!==void 0&&(a=Math.max(a,t.min)),t.max!==void 0&&(a=Math.min(a,t.max))),a}function Tme(t,e){return t.pfValue!=null||t.value!=null?t.pfValue!=null&&(e==null||e.type.units!=="%")?t.pfValue:t.value:t}function Zg(t,e,r,n,i){var a=i!=null?i.type:null;r<0?r=0:r>1&&(r=1);var s=Tme(t,i),l=Tme(e,i);if(xt(s)&&xt(l))return wme(a,s,l,r,n);if(wn(s)&&wn(l)){for(var u=[],h=0;h<l.length;h++){var f=s[h],d=l[h];if(f!=null&&d!=null){var p=wme(a,f,d,r,n);u.push(p)}else u.push(d)}return u}}function VJe(t,e,r,n){var i=!n,a=t._private,s=e._private,l=s.easing,u=s.startTime,h=n?t:t.cy(),f=h.style();if(!s.easingImpl)if(l==null)s.easingImpl=c6.linear;else{var d;if(Zt(l)){var p=f.parse("transition-timing-function",l);d=p.value}else d=l;var m,g;Zt(d)?(m=d,g=[]):(m=d[1],g=d.slice(2).map(function(B){return+B})),g.length>0?(m==="spring"&&g.push(s.duration),s.easingImpl=c6[m].apply(null,g)):s.easingImpl=c6[m]}var y=s.easingImpl,v;if(s.duration===0?v=1:v=(r-u)/s.duration,s.applying&&(v=s.progress),v<0?v=0:v>1&&(v=1),s.delay==null){var x=s.startPosition,b=s.position;if(b&&i&&!t.locked()){var w={};Mx(x.x,b.x)&&(w.x=Zg(x.x,b.x,v,y)),Mx(x.y,b.y)&&(w.y=Zg(x.y,b.y,v,y)),t.position(w)}var _=s.startPan,T=s.pan,E=a.pan,L=T!=null&&n;L&&(Mx(_.x,T.x)&&(E.x=Zg(_.x,T.x,v,y)),Mx(_.y,T.y)&&(E.y=Zg(_.y,T.y,v,y)),t.emit("pan"));var C=s.startZoom,A=s.zoom,I=A!=null&&n;I&&(Mx(C,A)&&(a.zoom=Wx(a.minZoom,Zg(C,A,v,y),a.maxZoom)),t.emit("zoom")),(L||I)&&t.emit("viewport");var D=s.style;if(D&&D.length>0&&i){for(var k=0;k<D.length;k++){var R=D[k],S=R.name,O=R,N=s.startStyle[S],P=f.properties[N.name],F=Zg(N,O,v,y,P);f.overrideBypass(t,S,F)}t.emit("style")}}return s.progress=v,v}function Mx(t,e){return t==null||e==null?!1:xt(t)&&xt(e)?!0:!!(t&&e)}function UJe(t,e,r,n){var i=e._private;i.started=!0,i.startTime=r-i.progress*i.duration}function kme(t,e){var r=e._private.aniEles,n=[];function i(f,d){var p=f._private,m=p.animation.current,g=p.animation.queue,y=!1;if(m.length===0){var v=g.shift();v&&m.push(v)}for(var x=o(function(E){for(var L=E.length-1;L>=0;L--){var C=E[L];C()}E.splice(0,E.length)},"callbacks"),b=m.length-1;b>=0;b--){var w=m[b],_=w._private;if(_.stopped){m.splice(b,1),_.hooked=!1,_.playing=!1,_.started=!1,x(_.frames);continue}!_.playing&&!_.applying||(_.playing&&_.applying&&(_.applying=!1),_.started||UJe(f,w,t),VJe(f,w,t,d),_.applying&&(_.applying=!1),x(_.frames),_.step!=null&&_.step(t),w.completed()&&(m.splice(b,1),_.hooked=!1,_.playing=!1,_.started=!1,x(_.completes)),y=!0)}return!d&&m.length===0&&g.length===0&&n.push(f),y}o(i,"stepOne");for(var a=!1,s=0;s<r.length;s++){var l=r[s],u=i(l);a=a||u}var h=i(e,!0);(a||h)&&(r.length>0?e.notify("draw",r):e.notify("draw")),r.unmerge(n),e.emit("step")}function Qge(t){this.options=ir({},QJe,ZJe,t)}function Zge(t){this.options=ir({},JJe,t)}function Jge(t){this.options=ir({},eet,t)}function G6(t){this.options=ir({},tet,t),this.options.layout=this;var e=this.options.eles.nodes(),r=this.options.eles.edges(),n=r.filter(function(i){var a=i.source().data("id"),s=i.target().data("id"),l=e.some(function(h){return h.data("id")===a}),u=e.some(function(h){return h.data("id")===s});return!l||!u});this.options.eles=this.options.eles.not(n)}function t1e(t){this.options=ir({},xet,t)}function vB(t){this.options=ir({},bet,t)}function r1e(t){this.options=ir({},wet,t)}function n1e(t){this.options=ir({},Tet,t)}function i1e(t){this.options=t,this.notifications=0}function o1e(t,e){e.radius===0?t.lineTo(e.cx,e.cy):t.arc(e.cx,e.cy,e.radius,e.startAngle,e.endAngle,e.counterClockwise)}function bB(t,e,r,n){var i=arguments.length>4&&arguments[4]!==void 0?arguments[4]:!0;return n===0||e.radius===0?{cx:e.x,cy:e.y,radius:0,startX:e.x,startY:e.y,stopX:e.x,stopY:e.y,startAngle:void 0,endAngle:void 0,counterClockwise:void 0}:(Cet(t,e,r,n,i),{cx:WP,cy:YP,radius:O0,startX:a1e,startY:s1e,stopX:qP,stopY:XP,startAngle:$c.ang+Math.PI/2*P0,endAngle:nl.ang-Math.PI/2*P0,counterClockwise:f6})}function l1e(t){var e=[];if(t!=null){for(var r=0;r<t.length;r+=2){var n=t[r],i=t[r+1];e.push({x:n,y:i})}return e}}function Aet(t,e,r){for(var n=o(function(h,f,d,p){return ia(h,f,d,p)},"qbezierAt$1"),i=e._private,a=i.rstyle.bezierPts,s=0;s<t.bezierProjPcts.length;s++){var l=t.bezierProjPcts[s];a.push({x:n(r[0],r[2],r[4],l),y:n(r[1],r[3],r[5],l)})}}function itt(t,e){for(var r=0;r<e.length;r++){var n=e[r];t.lineTo(n.x,n.y)}}function att(t,e,r){for(var n,i=0;i<e.length;i++){var a=e[i];i===0&&(n=a),t.lineTo(a.x,a.y)}t.quadraticCurveTo(r.x,r.y,n.x,n.y)}function Gme(t,e,r){t.beginPath&&t.beginPath();for(var n=e,i=0;i<n.length;i++){var a=n[i];t.lineTo(a.x,a.y)}var s=r,l=r[0];t.moveTo(l.x,l.y);for(var i=1;i<s.length;i++){var a=s[i];t.lineTo(a.x,a.y)}t.closePath&&t.closePath()}function stt(t,e,r,n,i){t.beginPath&&t.beginPath(),t.arc(r,n,i,0,Math.PI*2,!1);var a=e,s=a[0];t.moveTo(s.x,s.y);for(var l=0;l<a.length;l++){var u=a[l];t.lineTo(u.x,u.y)}t.closePath&&t.closePath()}function ott(t,e,r,n){t.arc(e,r,n,0,Math.PI*2,!1)}function PP(t,e,r,n,i){var a=arguments.length>5&&arguments[5]!==void 0?arguments[5]:5,s=arguments.length>6?arguments[6]:void 0;t.beginPath(),t.moveTo(e+a,r),t.lineTo(e+n-a,r),t.quadraticCurveTo(e+n,r,e+n,r+a),t.lineTo(e+n,r+i-a),t.quadraticCurveTo(e+n,r+i,e+n-a,r+i),t.lineTo(e+a,r+i),t.quadraticCurveTo(e,r+i,e,r+i-a),t.lineTo(e,r+a),t.quadraticCurveTo(e,r,e+a,r),t.closePath(),s?t.stroke():t.fill()}function ptt(t,e){for(var r=atob(t),n=new ArrayBuffer(r.length),i=new Uint8Array(n),a=0;a<r.length;a++)i[a]=r.charCodeAt(a);return new Blob([n],{type:e})}function Ume(t){var e=t.indexOf(",");return t.substr(e+1)}function w1e(t,e,r){var n=o(function(){return e.toDataURL(r,t.quality)},"getB64Uri");switch(t.output){case"blob-promise":return new d1(function(i,a){try{e.toBlob(function(s){s!=null?i(s):a(new Error("`canvas.toBlob()` sent a null value in its callback"))},r,t.quality)}catch(s){a(s)}});case"blob":return ptt(Ume(n()),r);case"base64":return Ume(n());case"base64uri":default:return n()}}function k1e(t){var e=this,r=e.cy.window(),n=r.document;e.data={canvases:new Array(Kr.CANVAS_LAYERS),contexts:new Array(Kr.CANVAS_LAYERS),canvasNeedsRedraw:new Array(Kr.CANVAS_LAYERS),bufferCanvases:new Array(Kr.BUFFER_COUNT),bufferContexts:new Array(Kr.CANVAS_LAYERS)};var i="-webkit-tap-highlight-color",a="rgba(0,0,0,0)";e.data.canvasContainer=n.createElement("div");var s=e.data.canvasContainer.style;e.data.canvasContainer.style[i]=a,s.position="relative",s.zIndex="0",s.overflow="hidden";var l=t.cy.container();l.appendChild(e.data.canvasContainer),l.style[i]=a;var u={"-webkit-user-select":"none","-moz-user-select":"-moz-none","user-select":"none","-webkit-tap-highlight-color":"rgba(0,0,0,0)","outline-style":"none"};eXe()&&(u["-ms-touch-action"]="none",u["touch-action"]="none");for(var h=0;h<Kr.CANVAS_LAYERS;h++){var f=e.data.canvases[h]=n.createElement("canvas");e.data.contexts[h]=f.getContext("2d"),Object.keys(u).forEach(function(J){f.style[J]=u[J]}),f.style.position="absolute",f.setAttribute("data-id","layer"+h),f.style.zIndex=String(Kr.CANVAS_LAYERS-h),e.data.canvasContainer.appendChild(f),e.data.canvasNeedsRedraw[h]=!1}e.data.topCanvas=e.data.canvases[0],e.data.canvases[Kr.NODE].setAttribute("data-id","layer"+Kr.NODE+"-node"),e.data.canvases[Kr.SELECT_BOX].setAttribute("data-id","layer"+Kr.SELECT_BOX+"-selectbox"),e.data.canvases[Kr.DRAG].setAttribute("data-id","layer"+Kr.DRAG+"-drag");for(var h=0;h<Kr.BUFFER_COUNT;h++)e.data.bufferCanvases[h]=n.createElement("canvas"),e.data.bufferContexts[h]=e.data.bufferCanvases[h].getContext("2d"),e.data.bufferCanvases[h].style.position="absolute",e.data.bufferCanvases[h].setAttribute("data-id","buffer"+h),e.data.bufferCanvases[h].style.zIndex=String(-h-1),e.data.bufferCanvases[h].style.visibility="hidden";e.pathsEnabled=!0;var d=$s(),p=o(function(H){return{x:(H.x1+H.x2)/2,y:(H.y1+H.y2)/2}},"getBoxCenter"),m=o(function(H){return{x:-H.w/2,y:-H.h/2}},"getCenterOffset"),g=o(function(H){var q=H[0]._private,Z=q.oldBackgroundTimestamp===q.backgroundTimestamp;return!Z},"backgroundTimestampHasChanged"),y=o(function(H){return H[0]._private.nodeKey},"getStyleKey"),v=o(function(H){return H[0]._private.labelStyleKey},"getLabelKey"),x=o(function(H){return H[0]._private.sourceLabelStyleKey},"getSourceLabelKey"),b=o(function(H){return H[0]._private.targetLabelStyleKey},"getTargetLabelKey"),w=o(function(H,q,Z,ae,ue){return e.drawElement(H,q,Z,!1,!1,ue)},"drawElement"),_=o(function(H,q,Z,ae,ue){return e.drawElementText(H,q,Z,ae,"main",ue)},"drawLabel"),T=o(function(H,q,Z,ae,ue){return e.drawElementText(H,q,Z,ae,"source",ue)},"drawSourceLabel"),E=o(function(H,q,Z,ae,ue){return e.drawElementText(H,q,Z,ae,"target",ue)},"drawTargetLabel"),L=o(function(H){return H.boundingBox(),H[0]._private.bodyBounds},"getElementBox"),C=o(function(H){return H.boundingBox(),H[0]._private.labelBounds.main||d},"getLabelBox"),A=o(function(H){return H.boundingBox(),H[0]._private.labelBounds.source||d},"getSourceLabelBox"),I=o(function(H){return H.boundingBox(),H[0]._private.labelBounds.target||d},"getTargetLabelBox"),D=o(function(H,q){return q},"isLabelVisibleAtScale"),k=o(function(H){return p(L(H))},"getElementRotationPoint"),R=o(function(H,q,Z){var ae=H?H+"-":"";return{x:q.x+Z.pstyle(ae+"text-margin-x").pfValue,y:q.y+Z.pstyle(ae+"text-margin-y").pfValue}},"addTextMargin"),S=o(function(H,q,Z){var ae=H[0]._private.rscratch;return{x:ae[q],y:ae[Z]}},"getRsPt"),O=o(function(H){return R("",S(H,"labelX","labelY"),H)},"getLabelRotationPoint"),N=o(function(H){return R("source",S(H,"sourceLabelX","sourceLabelY"),H)},"getSourceLabelRotationPoint"),P=o(function(H){return R("target",S(H,"targetLabelX","targetLabelY"),H)},"getTargetLabelRotationPoint"),F=o(function(H){return m(L(H))},"getElementRotationOffset"),B=o(function(H){return m(A(H))},"getSourceLabelRotationOffset"),$=o(function(H){return m(I(H))},"getTargetLabelRotationOffset"),z=o(function(H){var q=C(H),Z=m(C(H));if(H.isNode()){switch(H.pstyle("text-halign").value){case"left":Z.x=-q.w;break;case"right":Z.x=0;break}switch(H.pstyle("text-valign").value){case"top":Z.y=-q.h;break;case"bottom":Z.y=0;break}}return Z},"getLabelRotationOffset"),W=e.data.eleTxrCache=new Fx(e,{getKey:y,doesEleInvalidateKey:g,drawElement:w,getBoundingBox:L,getRotationPoint:k,getRotationOffset:F,allowEdgeTxrCaching:!1,allowParentTxrCaching:!1}),j=e.data.lblTxrCache=new Fx(e,{getKey:v,drawElement:_,getBoundingBox:C,getRotationPoint:O,getRotationOffset:z,isVisible:D}),K=e.data.slbTxrCache=new Fx(e,{getKey:x,drawElement:T,getBoundingBox:A,getRotationPoint:N,getRotationOffset:B,isVisible:D}),ie=e.data.tlbTxrCache=new Fx(e,{getKey:b,drawElement:E,getBoundingBox:I,getRotationPoint:P,getRotationOffset:$,isVisible:D}),Q=e.data.lyrTxrCache=new g1e(e);e.onUpdateEleCalcs(o(function(H,q){W.invalidateElements(q),j.invalidateElements(q),K.invalidateElements(q),ie.invalidateElements(q),Q.invalidateElements(q);for(var Z=0;Z<q.length;Z++){var ae=q[Z]._private;ae.oldBackgroundTimestamp=ae.backgroundTimestamp}},"invalidateTextureCaches"));var ee=o(function(H){for(var q=0;q<H.length;q++)Q.enqueueElementRefinement(H[q].ele)},"refineInLayers");W.onDequeue(ee),j.onDequeue(ee),K.onDequeue(ee),ie.onDequeue(ee)}function C1e(t,e,r){var n=r,i=o(function(C){on("Can not register `"+e+"` for `"+t+"` since `"+C+"` already exists in the prototype and can not be overridden")},"overrideErr");if(t==="core"){if(Qx.prototype[e])return i(e);Qx.prototype[e]=r}else if(t==="collection"){if(ba.prototype[e])return i(e);ba.prototype[e]=r}else if(t==="layout"){for(var a=o(function(C){this.options=C,r.call(this,C),Vr(this._private)||(this._private={}),this._private.cy=C.cy,this._private.listeners=[],this.createEmitter()},"Layout"),s=a.prototype=Object.create(r.prototype),l=[],u=0;u<l.length;u++){var h=l[u];s[h]=s[h]||function(){return this}}s.start&&!s.run?s.run=function(){return this.start(),this}:!s.start&&s.run&&(s.start=function(){return this.run(),this});var f=r.prototype.stop;s.stop=function(){var L=this.options;if(L&&L.animate){var C=this.animations;if(C)for(var A=0;A<C.length;A++)C[A].stop()}return f?f.call(this):this.emit("layoutstop"),this},s.destroy||(s.destroy=function(){return this}),s.cy=function(){return this._private.cy};var d=o(function(C){return C._private.cy},"getCy"),p={addEventFields:o(function(C,A){A.layout=C,A.cy=d(C),A.target=C},"addEventFields"),bubble:o(function(){return!0},"bubble"),parent:o(function(C){return d(C)},"parent")};ir(s,{createEmitter:o(function(){return this._private.emitter=new O6(p,this),this},"createEmitter"),emitter:o(function(){return this._private.emitter},"emitter"),on:o(function(C,A){return this.emitter().on(C,A),this},"on"),one:o(function(C,A){return this.emitter().one(C,A),this},"one"),once:o(function(C,A){return this.emitter().one(C,A),this},"once"),removeListener:o(function(C,A){return this.emitter().removeListener(C,A),this},"removeListener"),removeAllListeners:o(function(){return this.emitter().removeAllListeners(),this},"removeAllListeners"),emit:o(function(C,A){return this.emitter().emit(C,A),this},"emit")}),sn.eventAliasesOn(s),n=a}else if(t==="renderer"&&e!=="null"&&e!=="base"){var m=A1e("renderer","base"),g=m.prototype,y=r,v=r.prototype,x=o(function(){m.apply(this,arguments),y.apply(this,arguments)},"Renderer"),b=x.prototype;for(var w in g){var _=g[w],T=v[w]!=null;if(T)return i(w);b[w]=_}for(var E in v)b[E]=v[E];g.clientFunctions.forEach(function(L){b[L]=b[L]||function(){hi("Renderer does not implement `renderer."+L+"()` on its prototype")}}),n=x}else if(t==="__proto__"||t==="constructor"||t==="prototype")return hi(t+" is an illegal type to be registered, possibly lead to prototype pollutions");return Zme({map:E1e,keys:[t,e],value:n})}function A1e(t,e){return Jme({map:E1e,keys:[t,e]})}function xtt(t,e,r,n,i){return Zme({map:S1e,keys:[t,e,r,n],value:i})}function btt(t,e,r,n){return Jme({map:S1e,keys:[t,e,r,n]})}var Hi,Rpe,Wqe,qme,Yqe,qqe,Zx,Zt,ti,wn,Vr,Xqe,xt,jqe,p6,po,Jx,Xme,tB,jme,Kqe,Sf,Qqe,Zqe,Jqe,eXe,$x,rB,S6,Kme,Mpe,Wi,tXe,rXe,nXe,iXe,aXe,sXe,Qme,oXe,ir,lXe,cXe,uXe,hXe,fXe,dXe,Zme,Jme,F0,Ix,gXe,yXe,vXe,xXe,C6,bXe,EP,wXe,kXe,EXe,CXe,AXe,l1,ege,_Xe,LXe,Lx,NXe,RXe,MXe,OXe,PXe,BXe,Ipe,tge,GXe,$Xe,eb,Ope,UXe,HXe,WXe,YXe,Ppe,XXe,jXe,KXe,A6,SP,rge,ZXe,m6,Xu,t1,nge,Ox,ige,Vx,Ux,JXe,xf,qE,eje,z0,age,tje,Bpe,rje,nje,nB,sge,g6,Fpe,iB,hi,oge,on,ije,Vc,aje,lge,sje,cge,wa,Cf,aB,oje,Wl,wf,lje,Uc,cje,uje,f1,_6,zpe,Hx,hje,tb,fje,dje,pje,mje,gje,yje,vje,xje,bje,wje,Tje,CP,kje,Eje,L6,uge,r1,Sje,Cje,Aje,_je,Lje,XE,sB,hge,G0,M0,Dje,ia,i1,Nje,Wx,$s,Rje,Mje,Ije,fge,Oje,a6,s6,Gpe,oB,c1,Pje,dge,pge,Bje,Fje,zje,Gje,$je,Vje,Gs,ju,Uje,y6,v6,Hje,B0,Px,AP,Tf,Yx,Wje,jE,ls,mge,BP,$0,gge,lB,Yje,FP,qje,Xje,$pe,a1,Vpe,s1,jje,zP,Kje,Qje,Zje,Jje,yge,eKe,tKe,rKe,nKe,iKe,aKe,sKe,Upe,oKe,lKe,vge,Hpe,Wpe,cKe,uKe,Dx,u1,hKe,cB,x6,_P,xge,bge,fKe,dKe,pKe,Ype,qpe,mKe,gKe,yKe,vKe,xKe,Xpe,bKe,wKe,TKe,kKe,jpe,KE,EKe,SKe,Kpe,CKe,AKe,_Ke,LKe,DKe,NKe,Qpe,RKe,Zpe,MKe,IKe,OKe,QE,PKe,ZE,BKe,wge,Tge,kge,Ege,Ku,Jpe,Sge,eme,tme,FKe,d1,GP,V0,zKe,GKe,N6,$Ke,VKe,HKe,WKe,YKe,qKe,XKe,KKe,QKe,LP,rme,JKe,eQe,tQe,nQe,iQe,aQe,sQe,oQe,lQe,cQe,uQe,fQe,pQe,uB,gQe,qx,vQe,bQe,wQe,TQe,kQe,SQe,CQe,AQe,LQe,DQe,RQe,nme,IQe,Cge,R6,BQe,FQe,GQe,VQe,HQe,YQe,qQe,XQe,jQe,QQe,JQe,M6,rZe,iZe,sZe,lZe,Age,cZe,uZe,hZe,dZe,pZe,mZe,gZe,_ge,Lge,vZe,ime,ame,xZe,Nge,Rge,TZe,fB,SZe,AZe,_Ze,sme,DZe,NZe,RZe,IZe,OZe,PZe,FZe,GZe,VZe,HZe,YZe,qZe,XZe,sn,jZe,o6,$r,pn,Pt,$P,KZe,QZe,ZZe,Kg,bf,VP,JZe,eJe,tJe,rJe,nJe,Mge,iJe,aJe,dB,sJe,fi,zn,oJe,lJe,cJe,Af,_f,kf,al,h1,Xx,Pge,hJe,I6,Yl,Bge,Fge,ome,fJe,o1,Df,il,Hl,I0,Nx,JE,NP,dJe,pJe,zge,Gge,lme,jx,cme,ume,mJe,Bx,rb,$ge,gJe,yJe,vJe,xJe,bJe,wJe,TJe,kJe,EJe,hme,SJe,CJe,AJe,Vge,Uge,_Je,Hge,fme,LJe,Lf,Wge,dme,DJe,NJe,t6,Yge,qge,Qr,RJe,Xge,b6,MJe,IJe,l6,xa,y1,OJe,PJe,BJe,FJe,Ef,Ba,mme,gme,yme,ba,Nn,zJe,$Je,Dn,c6,HJe,WJe,r6,Kge,UP,u6,YJe,qJe,HP,h6,za,zx,XJe,nb,gB,Hc,F6,yB,va,z6,Pa,Fa,jJe,KJe,U0,Kx,Qx,w6,QJe,ZJe,Jg,Eme,JJe,eet,MP,tet,ret,net,iet,aet,set,e1e,oet,cet,uet,Sme,het,fet,T6,det,pet,met,get,yet,vet,Cme,xet,bet,wet,Tet,ket,Ame,_me,xB,W0,k6,WP,YP,$c,nl,Lme,Dme,P0,f6,qu,N0,O0,Gc,e1,n6,a1e,s1e,qP,XP,Nme,Rme,Eet,Cet,Ga,ib,wB,Wc,c1e,u1e,_et,h1e,Mme,Ime,$6,V6,f1e,d1e,x1,Qu,ab,Ome,Let,p1e,b1,IP,m1e,Det,Pme,i6,d6,jP,Net,Ret,Met,Iet,Oet,Pet,Bet,Fet,zet,Get,$et,Vet,Uet,Het,n1,Wet,Fx,qi,Yet,Gx,E6,qet,Xet,jet,Ket,Qet,Zet,Jet,ett,Bme,ttt,rtt,g1e,Ta,Fme,ntt,y1e,zme,Yc,ltt,ctt,utt,htt,ftt,OP,Zu,v1e,TB,Y0,w1,x1e,mo,dtt,Nf,$me,Vme,KP,QP,b1e,R0,sb,T1e,mtt,Kr,gtt,ytt,vtt,E1e,S1e,ZP,_1e,H0,wtt,sl,kB=M(()=>{"use strict";o(Yi,"_typeof");o(JP,"_classCallCheck");o(Dpe,"_defineProperties");o(eB,"_createClass");o(Hme,"_defineProperty$1");o(Ul,"_slicedToArray");o(Vqe,"_arrayWithHoles");o(Uqe,"_iterableToArrayLimit");o(Wme,"_unsupportedIterableToArray");o(Npe,"_arrayLikeToArray");o(Hqe,"_nonIterableRest");o(Yme,"_createForOfIteratorHelper");Hi=typeof window>"u"?null:window,Rpe=Hi?Hi.navigator:null;Hi&&Hi.document;Wqe=Yi(""),qme=Yi({}),Yqe=Yi(function(){}),qqe=typeof HTMLElement>"u"?"undefined":Yi(HTMLElement),Zx=o(function(e){return e&&e.instanceString&&ti(e.instanceString)?e.instanceString():null},"instanceStr"),Zt=o(function(e){return e!=null&&Yi(e)==Wqe},"string"),ti=o(function(e){return e!=null&&Yi(e)===Yqe},"fn"),wn=o(function(e){return!po(e)&&(Array.isArray?Array.isArray(e):e!=null&&e instanceof Array)},"array"),Vr=o(function(e){return e!=null&&Yi(e)===qme&&!wn(e)&&e.constructor===Object},"plainObject"),Xqe=o(function(e){return e!=null&&Yi(e)===qme},"object"),xt=o(function(e){return e!=null&&Yi(e)===Yi(1)&&!isNaN(e)},"number"),jqe=o(function(e){return xt(e)&&Math.floor(e)===e},"integer"),p6=o(function(e){if(qqe!=="undefined")return e!=null&&e instanceof HTMLElement},"htmlElement"),po=o(function(e){return Jx(e)||Xme(e)},"elementOrCollection"),Jx=o(function(e){return Zx(e)==="collection"&&e._private.single},"element"),Xme=o(function(e){return Zx(e)==="collection"&&!e._private.single},"collection"),tB=o(function(e){return Zx(e)==="core"},"core"),jme=o(function(e){return Zx(e)==="stylesheet"},"stylesheet"),Kqe=o(function(e){return Zx(e)==="event"},"event"),Sf=o(function(e){return e==null?!0:!!(e===""||e.match(/^\s+$/))},"emptyString"),Qqe=o(function(e){return typeof HTMLElement>"u"?!1:e instanceof HTMLElement},"domElement"),Zqe=o(function(e){return Vr(e)&&xt(e.x1)&&xt(e.x2)&&xt(e.y1)&&xt(e.y2)},"boundingBox"),Jqe=o(function(e){return Xqe(e)&&ti(e.then)},"promise"),eXe=o(function(){return Rpe&&Rpe.userAgent.match(/msie|trident|edge/i)},"ms"),$x=o(function(e,r){r||(r=o(function(){if(arguments.length===1)return arguments[0];if(arguments.length===0)return"undefined";for(var a=[],s=0;s<arguments.length;s++)a.push(arguments[s]);return a.join("$")},"keyFn"));var n=o(function i(){var a=this,s=arguments,l,u=r.apply(a,s),h=i.cache;return(l=h[u])||(l=h[u]=e.apply(a,s)),l},"memoizedFn");return n.cache={},n},"memoize"),rB=$x(function(t){return t.replace(/([A-Z])/g,function(e){return"-"+e.toLowerCase()})}),S6=$x(function(t){return t.replace(/(-\w)/g,function(e){return e[1].toUpperCase()})}),Kme=$x(function(t,e){return t+e[0].toUpperCase()+e.substring(1)},function(t,e){return t+"$"+e}),Mpe=o(function(e){return Sf(e)?e:e.charAt(0).toUpperCase()+e.substring(1)},"capitalize"),Wi="(?:[-+]?(?:(?:\\d+|\\d*\\.\\d+)(?:[Ee][+-]?\\d+)?))",tXe="rgb[a]?\\(("+Wi+"[%]?)\\s*,\\s*("+Wi+"[%]?)\\s*,\\s*("+Wi+"[%]?)(?:\\s*,\\s*("+Wi+"))?\\)",rXe="rgb[a]?\\((?:"+Wi+"[%]?)\\s*,\\s*(?:"+Wi+"[%]?)\\s*,\\s*(?:"+Wi+"[%]?)(?:\\s*,\\s*(?:"+Wi+"))?\\)",nXe="hsl[a]?\\(("+Wi+")\\s*,\\s*("+Wi+"[%])\\s*,\\s*("+Wi+"[%])(?:\\s*,\\s*("+Wi+"))?\\)",iXe="hsl[a]?\\((?:"+Wi+")\\s*,\\s*(?:"+Wi+"[%])\\s*,\\s*(?:"+Wi+"[%])(?:\\s*,\\s*(?:"+Wi+"))?\\)",aXe="\\#[0-9a-fA-F]{3}",sXe="\\#[0-9a-fA-F]{6}",Qme=o(function(e,r){return e<r?-1:e>r?1:0},"ascending"),oXe=o(function(e,r){return-1*Qme(e,r)},"descending"),ir=Object.assign!=null?Object.assign.bind(Object):function(t){for(var e=arguments,r=1;r<e.length;r++){var n=e[r];if(n!=null)for(var i=Object.keys(n),a=0;a<i.length;a++){var s=i[a];t[s]=n[s]}}return t},lXe=o(function(e){if(!(!(e.length===4||e.length===7)||e[0]!=="#")){var r=e.length===4,n,i,a,s=16;return r?(n=parseInt(e[1]+e[1],s),i=parseInt(e[2]+e[2],s),a=parseInt(e[3]+e[3],s)):(n=parseInt(e[1]+e[2],s),i=parseInt(e[3]+e[4],s),a=parseInt(e[5]+e[6],s)),[n,i,a]}},"hex2tuple"),cXe=o(function(e){var r,n,i,a,s,l,u,h;function f(g,y,v){return v<0&&(v+=1),v>1&&(v-=1),v<1/6?g+(y-g)*6*v:v<1/2?y:v<2/3?g+(y-g)*(2/3-v)*6:g}o(f,"hue2rgb");var d=new RegExp("^"+nXe+"$").exec(e);if(d){if(n=parseInt(d[1]),n<0?n=(360- -1*n%360)%360:n>360&&(n=n%360),n/=360,i=parseFloat(d[2]),i<0||i>100||(i=i/100,a=parseFloat(d[3]),a<0||a>100)||(a=a/100,s=d[4],s!==void 0&&(s=parseFloat(s),s<0||s>1)))return;if(i===0)l=u=h=Math.round(a*255);else{var p=a<.5?a*(1+i):a+i-a*i,m=2*a-p;l=Math.round(255*f(m,p,n+1/3)),u=Math.round(255*f(m,p,n)),h=Math.round(255*f(m,p,n-1/3))}r=[l,u,h,s]}return r},"hsl2tuple"),uXe=o(function(e){var r,n=new RegExp("^"+tXe+"$").exec(e);if(n){r=[];for(var i=[],a=1;a<=3;a++){var s=n[a];if(s[s.length-1]==="%"&&(i[a]=!0),s=parseFloat(s),i[a]&&(s=s/100*255),s<0||s>255)return;r.push(Math.floor(s))}var l=i[1]||i[2]||i[3],u=i[1]&&i[2]&&i[3];if(l&&!u)return;var h=n[4];if(h!==void 0){if(h=parseFloat(h),h<0||h>1)return;r.push(h)}}return r},"rgb2tuple"),hXe=o(function(e){return dXe[e.toLowerCase()]},"colorname2tuple"),fXe=o(function(e){return(wn(e)?e:null)||hXe(e)||lXe(e)||uXe(e)||cXe(e)},"color2tuple"),dXe={transparent:[0,0,0,0],aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],grey:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},Zme=o(function(e){for(var r=e.map,n=e.keys,i=n.length,a=0;a<i;a++){var s=n[a];if(Vr(s))throw Error("Tried to set map with object key");a<n.length-1?(r[s]==null&&(r[s]={}),r=r[s]):r[s]=e.value}},"setMap"),Jme=o(function(e){for(var r=e.map,n=e.keys,i=n.length,a=0;a<i;a++){var s=n[a];if(Vr(s))throw Error("Tried to get map with object key");if(r=r[s],r==null)return r}return r},"getMap");o(pXe,"isObject");F0=pXe,Ix=typeof globalThis<"u"?globalThis:typeof window<"u"?window:typeof global<"u"?global:typeof self<"u"?self:{};o(mXe,"createCommonjsModule");gXe=typeof Ix=="object"&&Ix&&Ix.Object===Object&&Ix,yXe=gXe,vXe=typeof self=="object"&&self&&self.Object===Object&&self,xXe=yXe||vXe||Function("return this")(),C6=xXe,bXe=o(function(){return C6.Date.now()},"now"),EP=bXe,wXe=/\s/;o(TXe,"trimmedEndIndex");kXe=TXe,EXe=/^\s+/;o(SXe,"baseTrim");CXe=SXe,AXe=C6.Symbol,l1=AXe,ege=Object.prototype,_Xe=ege.hasOwnProperty,LXe=ege.toString,Lx=l1?l1.toStringTag:void 0;o(DXe,"getRawTag");NXe=DXe,RXe=Object.prototype,MXe=RXe.toString;o(IXe,"objectToString");OXe=IXe,PXe="[object Null]",BXe="[object Undefined]",Ipe=l1?l1.toStringTag:void 0;o(FXe,"baseGetTag");tge=FXe;o(zXe,"isObjectLike");GXe=zXe,$Xe="[object Symbol]";o(VXe,"isSymbol");eb=VXe,Ope=NaN,UXe=/^[-+]0x[0-9a-f]+$/i,HXe=/^0b[01]+$/i,WXe=/^0o[0-7]+$/i,YXe=parseInt;o(qXe,"toNumber");Ppe=qXe,XXe="Expected a function",jXe=Math.max,KXe=Math.min;o(QXe,"debounce");A6=QXe,SP=Hi?Hi.performance:null,rge=SP&&SP.now?function(){return SP.now()}:function(){return Date.now()},ZXe=function(){if(Hi){if(Hi.requestAnimationFrame)return function(t){Hi.requestAnimationFrame(t)};if(Hi.mozRequestAnimationFrame)return function(t){Hi.mozRequestAnimationFrame(t)};if(Hi.webkitRequestAnimationFrame)return function(t){Hi.webkitRequestAnimationFrame(t)};if(Hi.msRequestAnimationFrame)return function(t){Hi.msRequestAnimationFrame(t)}}return function(t){t&&setTimeout(function(){t(rge())},1e3/60)}}(),m6=o(function(e){return ZXe(e)},"requestAnimationFrame"),Xu=rge,t1=9261,nge=65599,Ox=5381,ige=o(function(e){for(var r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:t1,n=r,i;i=e.next(),!i.done;)n=n*nge+i.value|0;return n},"hashIterableInts"),Vx=o(function(e){var r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:t1;return r*nge+e|0},"hashInt"),Ux=o(function(e){var r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:Ox;return(r<<5)+r+e|0},"hashIntAlt"),JXe=o(function(e,r){return e*2097152+r},"combineHashes"),xf=o(function(e){return e[0]*2097152+e[1]},"combineHashesArray"),qE=o(function(e,r){return[Vx(e[0],r[0]),Ux(e[1],r[1])]},"hashArrays"),eje=o(function(e,r){var n={value:0,done:!1},i=0,a=e.length,s={next:o(function(){return i<a?n.value=e[i++]:n.done=!0,n},"next")};return ige(s,r)},"hashIntsArray"),z0=o(function(e,r){var n={value:0,done:!1},i=0,a=e.length,s={next:o(function(){return i<a?n.value=e.charCodeAt(i++):n.done=!0,n},"next")};return ige(s,r)},"hashString"),age=o(function(){return tje(arguments)},"hashStrings"),tje=o(function(e){for(var r,n=0;n<e.length;n++){var i=e[n];n===0?r=z0(i):r=z0(i,r)}return r},"hashStringsArray"),Bpe=!0,rje=console.warn!=null,nje=console.trace!=null,nB=Number.MAX_SAFE_INTEGER||9007199254740991,sge=o(function(){return!0},"trueify"),g6=o(function(){return!1},"falsify"),Fpe=o(function(){return 0},"zeroify"),iB=o(function(){},"noop"),hi=o(function(e){throw new Error(e)},"error"),oge=o(function(e){if(e!==void 0)Bpe=!!e;else return Bpe},"warnings"),on=o(function(e){oge()&&(rje?console.warn(e):(console.log(e),nje&&console.trace()))},"warn"),ije=o(function(e){return ir({},e)},"clone"),Vc=o(function(e){return e==null?e:wn(e)?e.slice():Vr(e)?ije(e):e},"copy"),aje=o(function(e){return e.slice()},"copyArray"),lge=o(function(e,r){for(r=e="";e++<36;r+=e*51&52?(e^15?8^Math.random()*(e^20?16:4):4).toString(16):"-");return r},"uuid"),sje={},cge=o(function(){return sje},"staticEmptyObject"),wa=o(function(e){var r=Object.keys(e);return function(n){for(var i={},a=0;a<r.length;a++){var s=r[a],l=n?.[s];i[s]=l===void 0?e[s]:l}return i}},"defaults"),Cf=o(function(e,r,n){for(var i=e.length-1;i>=0&&!(e[i]===r&&(e.splice(i,1),n));i--);},"removeFromArray"),aB=o(function(e){e.splice(0,e.length)},"clearArray"),oje=o(function(e,r){for(var n=0;n<r.length;n++){var i=r[n];e.push(i)}},"push"),Wl=o(function(e,r,n){return n&&(r=Kme(n,r)),e[r]},"getPrefixedProperty"),wf=o(function(e,r,n,i){n&&(r=Kme(n,r)),e[r]=i},"setPrefixedProperty"),lje=function(){function t(){JP(this,t),this._obj={}}return o(t,"ObjectMap"),eB(t,[{key:"set",value:o(function(r,n){return this._obj[r]=n,this},"set")},{key:"delete",value:o(function(r){return this._obj[r]=void 0,this},"_delete")},{key:"clear",value:o(function(){this._obj={}},"clear")},{key:"has",value:o(function(r){return this._obj[r]!==void 0},"has")},{key:"get",value:o(function(r){return this._obj[r]},"get")}]),t}(),Uc=typeof Map<"u"?Map:lje,cje="undefined",uje=function(){function t(e){if(JP(this,t),this._obj=Object.create(null),this.size=0,e!=null){var r;e.instanceString!=null&&e.instanceString()===this.instanceString()?r=e.toArray():r=e;for(var n=0;n<r.length;n++)this.add(r[n])}}return o(t,"ObjectSet"),eB(t,[{key:"instanceString",value:o(function(){return"set"},"instanceString")},{key:"add",value:o(function(r){var n=this._obj;n[r]!==1&&(n[r]=1,this.size++)},"add")},{key:"delete",value:o(function(r){var n=this._obj;n[r]===1&&(n[r]=0,this.size--)},"_delete")},{key:"clear",value:o(function(){this._obj=Object.create(null)},"clear")},{key:"has",value:o(function(r){return this._obj[r]===1},"has")},{key:"toArray",value:o(function(){var r=this;return Object.keys(this._obj).filter(function(n){return r.has(n)})},"toArray")},{key:"forEach",value:o(function(r,n){return this.toArray().forEach(r,n)},"forEach")}]),t}(),f1=(typeof Set>"u"?"undefined":Yi(Set))!==cje?Set:uje,_6=o(function(e,r){var n=arguments.length>2&&arguments[2]!==void 0?arguments[2]:!0;if(e===void 0||r===void 0||!tB(e)){hi("An element must have a core reference and parameters set");return}var i=r.group;if(i==null&&(r.data&&r.data.source!=null&&r.data.target!=null?i="edges":i="nodes"),i!=="nodes"&&i!=="edges"){hi("An element must be of type `nodes` or `edges`; you specified `"+i+"`");return}this.length=1,this[0]=this;var a=this._private={cy:e,single:!0,data:r.data||{},position:r.position||{x:0,y:0},autoWidth:void 0,autoHeight:void 0,autoPadding:void 0,compoundBoundsClean:!1,listeners:[],group:i,style:{},rstyle:{},styleCxts:[],styleKeys:{},removed:!0,selected:!!r.selected,selectable:r.selectable===void 0?!0:!!r.selectable,locked:!!r.locked,grabbed:!1,grabbable:r.grabbable===void 0?!0:!!r.grabbable,pannable:r.pannable===void 0?i==="edges":!!r.pannable,active:!1,classes:new f1,animation:{current:[],queue:[]},rscratch:{},scratch:r.scratch||{},edges:[],children:[],parent:r.parent&&r.parent.isNode()?r.parent:null,traversalCache:{},backgrounding:!1,bbCache:null,bbCacheShift:{x:0,y:0},bodyBounds:null,overlayBounds:null,labelBounds:{all:null,source:null,target:null,main:null},arrowBounds:{source:null,target:null,"mid-source":null,"mid-target":null}};if(a.position.x==null&&(a.position.x=0),a.position.y==null&&(a.position.y=0),r.renderedPosition){var s=r.renderedPosition,l=e.pan(),u=e.zoom();a.position={x:(s.x-l.x)/u,y:(s.y-l.y)/u}}var h=[];wn(r.classes)?h=r.classes:Zt(r.classes)&&(h=r.classes.split(/\s+/));for(var f=0,d=h.length;f<d;f++){var p=h[f];!p||p===""||a.classes.add(p)}this.createEmitter();var m=r.style||r.css;m&&(on("Setting a `style` bypass at element creation should be done only when absolutely necessary. Try to use the stylesheet instead."),this.style(m)),(n===void 0||n)&&this.restore()},"Element"),zpe=o(function(e){return e={bfs:e.bfs||!e.dfs,dfs:e.dfs||!e.bfs},o(function(n,i,a){var s;Vr(n)&&!po(n)&&(s=n,n=s.roots||s.root,i=s.visit,a=s.directed),a=arguments.length===2&&!ti(i)?i:a,i=ti(i)?i:function(){};for(var l=this._private.cy,u=n=Zt(n)?this.filter(n):n,h=[],f=[],d={},p={},m={},g=0,y,v=this.byGroup(),x=v.nodes,b=v.edges,w=0;w<u.length;w++){var _=u[w],T=_.id();_.isNode()&&(h.unshift(_),e.bfs&&(m[T]=!0,f.push(_)),p[T]=0)}for(var E=o(function(){var R=e.bfs?h.shift():h.pop(),S=R.id();if(e.dfs){if(m[S])return"continue";m[S]=!0,f.push(R)}var O=p[S],N=d[S],P=N!=null?N.source():null,F=N!=null?N.target():null,B=N==null?void 0:R.same(P)?F[0]:P[0],$=void 0;if($=i(R,N,B,g++,O),$===!0)return y=R,"break";if($===!1)return"break";for(var z=R.connectedEdges().filter(function(Q){return(!a||Q.source().same(R))&&b.has(Q)}),W=0;W<z.length;W++){var j=z[W],K=j.connectedNodes().filter(function(Q){return!Q.same(R)&&x.has(Q)}),ie=K.id();K.length!==0&&!m[ie]&&(K=K[0],h.push(K),e.bfs&&(m[ie]=!0,f.push(K)),d[ie]=j,p[ie]=p[S]+1)}},"_loop");h.length!==0;){var L=E();if(L!=="continue"&&L==="break")break}for(var C=l.collection(),A=0;A<f.length;A++){var I=f[A],D=d[I.id()];D!=null&&C.push(D),C.push(I)}return{path:l.collection(C),found:l.collection(y)}},"searchFn")},"defineSearch"),Hx={breadthFirstSearch:zpe({bfs:!0}),depthFirstSearch:zpe({dfs:!0})};Hx.bfs=Hx.breadthFirstSearch;Hx.dfs=Hx.depthFirstSearch;hje=mXe(function(t,e){(function(){var r,n,i,a,s,l,u,h,f,d,p,m,g,y,v;i=Math.floor,d=Math.min,n=o(function(x,b){return x<b?-1:x>b?1:0},"defaultCmp"),f=o(function(x,b,w,_,T){var E;if(w==null&&(w=0),T==null&&(T=n),w<0)throw new Error("lo must be non-negative");for(_==null&&(_=x.length);w<_;)E=i((w+_)/2),T(b,x[E])<0?_=E:w=E+1;return[].splice.apply(x,[w,w-w].concat(b)),b},"insort"),l=o(function(x,b,w){return w==null&&(w=n),x.push(b),y(x,0,x.length-1,w)},"heappush"),s=o(function(x,b){var w,_;return b==null&&(b=n),w=x.pop(),x.length?(_=x[0],x[0]=w,v(x,0,b)):_=w,_},"heappop"),h=o(function(x,b,w){var _;return w==null&&(w=n),_=x[0],x[0]=b,v(x,0,w),_},"heapreplace"),u=o(function(x,b,w){var _;return w==null&&(w=n),x.length&&w(x[0],b)<0&&(_=[x[0],b],b=_[0],x[0]=_[1],v(x,0,w)),b},"heappushpop"),a=o(function(x,b){var w,_,T,E,L,C;for(b==null&&(b=n),E=function(){C=[];for(var A=0,I=i(x.length/2);0<=I?A<I:A>I;0<=I?A++:A--)C.push(A);return C}.apply(this).reverse(),L=[],_=0,T=E.length;_<T;_++)w=E[_],L.push(v(x,w,b));return L},"heapify"),g=o(function(x,b,w){var _;if(w==null&&(w=n),_=x.indexOf(b),_!==-1)return y(x,0,_,w),v(x,_,w)},"updateItem"),p=o(function(x,b,w){var _,T,E,L,C;if(w==null&&(w=n),T=x.slice(0,b),!T.length)return T;for(a(T,w),C=x.slice(b),E=0,L=C.length;E<L;E++)_=C[E],u(T,_,w);return T.sort(w).reverse()},"nlargest"),m=o(function(x,b,w){var _,T,E,L,C,A,I,D,k;if(w==null&&(w=n),b*10<=x.length){if(E=x.slice(0,b).sort(w),!E.length)return E;for(T=E[E.length-1],I=x.slice(b),L=0,A=I.length;L<A;L++)_=I[L],w(_,T)<0&&(f(E,_,0,null,w),E.pop(),T=E[E.length-1]);return E}for(a(x,w),k=[],C=0,D=d(b,x.length);0<=D?C<D:C>D;0<=D?++C:--C)k.push(s(x,w));return k},"nsmallest"),y=o(function(x,b,w,_){var T,E,L;for(_==null&&(_=n),T=x[w];w>b;){if(L=w-1>>1,E=x[L],_(T,E)<0){x[w]=E,w=L;continue}break}return x[w]=T},"_siftdown"),v=o(function(x,b,w){var _,T,E,L,C;for(w==null&&(w=n),T=x.length,C=b,E=x[b],_=2*b+1;_<T;)L=_+1,L<T&&!(w(x[_],x[L])<0)&&(_=L),x[b]=x[_],b=_,_=2*b+1;return x[b]=E,y(x,C,b,w)},"_siftup"),r=function(){x.push=l,x.pop=s,x.replace=h,x.pushpop=u,x.heapify=a,x.updateItem=g,x.nlargest=p,x.nsmallest=m;function x(b){this.cmp=b??n,this.nodes=[]}return o(x,"Heap"),x.prototype.push=function(b){return l(this.nodes,b,this.cmp)},x.prototype.pop=function(){return s(this.nodes,this.cmp)},x.prototype.peek=function(){return this.nodes[0]},x.prototype.contains=function(b){return this.nodes.indexOf(b)!==-1},x.prototype.replace=function(b){return h(this.nodes,b,this.cmp)},x.prototype.pushpop=function(b){return u(this.nodes,b,this.cmp)},x.prototype.heapify=function(){return a(this.nodes,this.cmp)},x.prototype.updateItem=function(b){return g(this.nodes,b,this.cmp)},x.prototype.clear=function(){return this.nodes=[]},x.prototype.empty=function(){return this.nodes.length===0},x.prototype.size=function(){return this.nodes.length},x.prototype.clone=function(){var b;return b=new x,b.nodes=this.nodes.slice(0),b},x.prototype.toArray=function(){return this.nodes.slice(0)},x.prototype.insert=x.prototype.push,x.prototype.top=x.prototype.peek,x.prototype.front=x.prototype.peek,x.prototype.has=x.prototype.contains,x.prototype.copy=x.prototype.clone,x}(),function(x,b){return t.exports=b()}(this,function(){return r})}).call(Ix)}),tb=hje,fje=wa({root:null,weight:o(function(e){return 1},"weight"),directed:!1}),dje={dijkstra:o(function(e){if(!Vr(e)){var r=arguments;e={root:r[0],weight:r[1],directed:r[2]}}var n=fje(e),i=n.root,a=n.weight,s=n.directed,l=this,u=a,h=Zt(i)?this.filter(i)[0]:i[0],f={},d={},p={},m=this.byGroup(),g=m.nodes,y=m.edges;y.unmergeBy(function(O){return O.isLoop()});for(var v=o(function(N){return f[N.id()]},"getDist"),x=o(function(N,P){f[N.id()]=P,b.updateItem(N)},"setDist"),b=new tb(function(O,N){return v(O)-v(N)}),w=0;w<g.length;w++){var _=g[w];f[_.id()]=_.same(h)?0:1/0,b.push(_)}for(var T=o(function(N,P){for(var F=(s?N.edgesTo(P):N.edgesWith(P)).intersect(y),B=1/0,$,z=0;z<F.length;z++){var W=F[z],j=u(W);(j<B||!$)&&(B=j,$=W)}return{edge:$,dist:B}},"distBetween");b.size()>0;){var E=b.pop(),L=v(E),C=E.id();if(p[C]=L,L!==1/0)for(var A=E.neighborhood().intersect(g),I=0;I<A.length;I++){var D=A[I],k=D.id(),R=T(E,D),S=L+R.dist;S<v(D)&&(x(D,S),d[k]={node:E,edge:R.edge})}}return{distanceTo:o(function(N){var P=Zt(N)?g.filter(N)[0]:N[0];return p[P.id()]},"distanceTo"),pathTo:o(function(N){var P=Zt(N)?g.filter(N)[0]:N[0],F=[],B=P,$=B.id();if(P.length>0)for(F.unshift(P);d[$];){var z=d[$];F.unshift(z.edge),F.unshift(z.node),B=z.node,$=B.id()}return l.spawn(F)},"pathTo")}},"dijkstra")},pje={kruskal:o(function(e){e=e||function(w){return 1};for(var r=this.byGroup(),n=r.nodes,i=r.edges,a=n.length,s=new Array(a),l=n,u=o(function(_){for(var T=0;T<s.length;T++){var E=s[T];if(E.has(_))return T}},"findSetIndex"),h=0;h<a;h++)s[h]=this.spawn(n[h]);for(var f=i.sort(function(w,_){return e(w)-e(_)}),d=0;d<f.length;d++){var p=f[d],m=p.source()[0],g=p.target()[0],y=u(m),v=u(g),x=s[y],b=s[v];y!==v&&(l.merge(p),x.merge(b),s.splice(v,1))}return l},"kruskal")},mje=wa({root:null,goal:null,weight:o(function(e){return 1},"weight"),heuristic:o(function(e){return 0},"heuristic"),directed:!1}),gje={aStar:o(function(e){var r=this.cy(),n=mje(e),i=n.root,a=n.goal,s=n.heuristic,l=n.directed,u=n.weight;i=r.collection(i)[0],a=r.collection(a)[0];var h=i.id(),f=a.id(),d={},p={},m={},g=new tb(function($,z){return p[$.id()]-p[z.id()]}),y=new f1,v={},x={},b=o(function(z,W){g.push(z),y.add(W)},"addToOpenSet"),w,_,T=o(function(){w=g.pop(),_=w.id(),y.delete(_)},"popFromOpenSet"),E=o(function(z){return y.has(z)},"isInOpenSet");b(i,h),d[h]=0,p[h]=s(i);for(var L=0;g.size()>0;){if(T(),L++,_===f){for(var C=[],A=a,I=f,D=x[I];C.unshift(A),D!=null&&C.unshift(D),A=v[I],A!=null;)I=A.id(),D=x[I];return{found:!0,distance:d[_],path:this.spawn(C),steps:L}}m[_]=!0;for(var k=w._private.edges,R=0;R<k.length;R++){var S=k[R];if(this.hasElementWithId(S.id())&&!(l&&S.data("source")!==_)){var O=S.source(),N=S.target(),P=O.id()!==_?O:N,F=P.id();if(this.hasElementWithId(F)&&!m[F]){var B=d[_]+u(S);if(!E(F)){d[F]=B,p[F]=B+s(P),b(P,F),v[F]=w,x[F]=S;continue}B<d[F]&&(d[F]=B,p[F]=B+s(P),v[F]=w,x[F]=S)}}}}return{found:!1,distance:void 0,path:void 0,steps:L}},"aStar")},yje=wa({weight:o(function(e){return 1},"weight"),directed:!1}),vje={floydWarshall:o(function(e){for(var r=this.cy(),n=yje(e),i=n.weight,a=n.directed,s=i,l=this.byGroup(),u=l.nodes,h=l.edges,f=u.length,d=f*f,p=o(function(j){return u.indexOf(j)},"indexOf"),m=o(function(j){return u[j]},"atIndex"),g=new Array(d),y=0;y<d;y++){var v=y%f,x=(y-v)/f;x===v?g[y]=0:g[y]=1/0}for(var b=new Array(d),w=new Array(d),_=0;_<h.length;_++){var T=h[_],E=T.source()[0],L=T.target()[0];if(E!==L){var C=p(E),A=p(L),I=C*f+A,D=s(T);if(g[I]>D&&(g[I]=D,b[I]=A,w[I]=T),!a){var k=A*f+C;!a&&g[k]>D&&(g[k]=D,b[k]=C,w[k]=T)}}}for(var R=0;R<f;R++)for(var S=0;S<f;S++)for(var O=S*f+R,N=0;N<f;N++){var P=S*f+N,F=R*f+N;g[O]+g[F]<g[P]&&(g[P]=g[O]+g[F],b[P]=b[O])}var B=o(function(j){return(Zt(j)?r.filter(j):j)[0]},"getArgEle"),$=o(function(j){return p(B(j))},"indexOfArgEle"),z={distance:o(function(j,K){var ie=$(j),Q=$(K);return g[ie*f+Q]},"distance"),path:o(function(j,K){var ie=$(j),Q=$(K),ee=m(ie);if(ie===Q)return ee.collection();if(b[ie*f+Q]==null)return r.collection();var J=r.collection(),H=ie,q;for(J.merge(ee);ie!==Q;)H=ie,ie=b[ie*f+Q],q=w[H*f+ie],J.merge(q),J.merge(m(ie));return J},"path")};return z},"floydWarshall")},xje=wa({weight:o(function(e){return 1},"weight"),directed:!1,root:null}),bje={bellmanFord:o(function(e){var r=this,n=xje(e),i=n.weight,a=n.directed,s=n.root,l=i,u=this,h=this.cy(),f=this.byGroup(),d=f.edges,p=f.nodes,m=p.length,g=new Uc,y=!1,v=[];s=h.collection(s)[0],d.unmergeBy(function(oe){return oe.isLoop()});for(var x=d.length,b=o(function(ke){var Fe=g.get(ke.id());return Fe||(Fe={},g.set(ke.id(),Fe)),Fe},"getInfo"),w=o(function(ke){return(Zt(ke)?h.$(ke):ke)[0]},"getNodeFromTo"),_=o(function(ke){return b(w(ke)).dist},"distanceTo"),T=o(function(ke){for(var Fe=arguments.length>1&&arguments[1]!==void 0?arguments[1]:s,Be=w(ke),Ve=[],Ge=Be;;){if(Ge==null)return r.spawn();var He=b(Ge),xe=He.edge,X=He.pred;if(Ve.unshift(Ge[0]),Ge.same(Fe)&&Ve.length>0)break;xe!=null&&Ve.unshift(xe),Ge=X}return u.spawn(Ve)},"pathTo"),E=0;E<m;E++){var L=p[E],C=b(L);L.same(s)?C.dist=0:C.dist=1/0,C.pred=null,C.edge=null}for(var A=!1,I=o(function(ke,Fe,Be,Ve,Ge,He){var xe=Ve.dist+He;xe<Ge.dist&&!Be.same(Ve.edge)&&(Ge.dist=xe,Ge.pred=ke,Ge.edge=Be,A=!0)},"checkForEdgeReplacement"),D=1;D<m;D++){A=!1;for(var k=0;k<x;k++){var R=d[k],S=R.source(),O=R.target(),N=l(R),P=b(S),F=b(O);I(S,O,R,P,F,N),a||I(O,S,R,F,P,N)}if(!A)break}if(A)for(var B=[],$=0;$<x;$++){var z=d[$],W=z.source(),j=z.target(),K=l(z),ie=b(W).dist,Q=b(j).dist;if(ie+K<Q||!a&&Q+K<ie)if(y||(on("Graph contains a negative weight cycle for Bellman-Ford"),y=!0),e.findNegativeWeightCycles!==!1){var ee=[];ie+K<Q&&ee.push(W),!a&&Q+K<ie&&ee.push(j);for(var J=ee.length,H=0;H<J;H++){var q=ee[H],Z=[q];Z.push(b(q).edge);for(var ae=b(q).pred;Z.indexOf(ae)===-1;)Z.push(ae),Z.push(b(ae).edge),ae=b(ae).pred;Z=Z.slice(Z.indexOf(ae));for(var ue=Z[0].id(),ce=0,te=2;te<Z.length;te+=2)Z[te].id()<ue&&(ue=Z[te].id(),ce=te);Z=Z.slice(ce).concat(Z.slice(0,ce)),Z.push(Z[0]);var De=Z.map(function(oe){return oe.id()}).join(",");B.indexOf(De)===-1&&(v.push(u.spawn(Z)),B.push(De))}}else break}return{distanceTo:_,pathTo:T,hasNegativeWeightCycle:y,negativeWeightCycles:v}},"bellmanFord")},wje=Math.sqrt(2),Tje=o(function(e,r,n){n.length===0&&hi("Karger-Stein must be run on a connected (sub)graph");for(var i=n[e],a=i[1],s=i[2],l=r[a],u=r[s],h=n,f=h.length-1;f>=0;f--){var d=h[f],p=d[1],m=d[2];(r[p]===l&&r[m]===u||r[p]===u&&r[m]===l)&&h.splice(f,1)}for(var g=0;g<h.length;g++){var y=h[g];y[1]===u?(h[g]=y.slice(),h[g][1]=l):y[2]===u&&(h[g]=y.slice(),h[g][2]=l)}for(var v=0;v<r.length;v++)r[v]===u&&(r[v]=l);return h},"collapse"),CP=o(function(e,r,n,i){for(;n>i;){var a=Math.floor(Math.random()*r.length);r=Tje(a,e,r),n--}return r},"contractUntil"),kje={kargerStein:o(function(){var e=this,r=this.byGroup(),n=r.nodes,i=r.edges;i.unmergeBy(function(F){return F.isLoop()});var a=n.length,s=i.length,l=Math.ceil(Math.pow(Math.log(a)/Math.LN2,2)),u=Math.floor(a/wje);if(a<2){hi("At least 2 nodes are required for Karger-Stein algorithm");return}for(var h=[],f=0;f<s;f++){var d=i[f];h.push([f,n.indexOf(d.source()),n.indexOf(d.target())])}for(var p=1/0,m=[],g=new Array(a),y=new Array(a),v=new Array(a),x=o(function(B,$){for(var z=0;z<a;z++)$[z]=B[z]},"copyNodesMap"),b=0;b<=l;b++){for(var w=0;w<a;w++)y[w]=w;var _=CP(y,h.slice(),a,u),T=_.slice();x(y,v);var E=CP(y,_,u,2),L=CP(v,T,u,2);E.length<=L.length&&E.length<p?(p=E.length,m=E,x(y,g)):L.length<=E.length&&L.length<p&&(p=L.length,m=L,x(v,g))}for(var C=this.spawn(m.map(function(F){return i[F[0]]})),A=this.spawn(),I=this.spawn(),D=g[0],k=0;k<g.length;k++){var R=g[k],S=n[k];R===D?A.merge(S):I.merge(S)}var O=o(function(B){var $=e.spawn();return B.forEach(function(z){$.merge(z),z.connectedEdges().forEach(function(W){e.contains(W)&&!C.contains(W)&&$.merge(W)})}),$},"constructComponent"),N=[O(A),O(I)],P={cut:C,components:N,partition1:A,partition2:I};return P},"kargerStein")},Eje=o(function(e){return{x:e.x,y:e.y}},"copyPosition"),L6=o(function(e,r,n){return{x:e.x*r+n.x,y:e.y*r+n.y}},"modelToRenderedPosition"),uge=o(function(e,r,n){return{x:(e.x-n.x)/r,y:(e.y-n.y)/r}},"renderedToModelPosition"),r1=o(function(e){return{x:e[0],y:e[1]}},"array2point"),Sje=o(function(e){for(var r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:0,n=arguments.length>2&&arguments[2]!==void 0?arguments[2]:e.length,i=1/0,a=r;a<n;a++){var s=e[a];isFinite(s)&&(i=Math.min(s,i))}return i},"min"),Cje=o(function(e){for(var r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:0,n=arguments.length>2&&arguments[2]!==void 0?arguments[2]:e.length,i=-1/0,a=r;a<n;a++){var s=e[a];isFinite(s)&&(i=Math.max(s,i))}return i},"max"),Aje=o(function(e){for(var r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:0,n=arguments.length>2&&arguments[2]!==void 0?arguments[2]:e.length,i=0,a=0,s=r;s<n;s++){var l=e[s];isFinite(l)&&(i+=l,a++)}return i/a},"mean"),_je=o(function(e){var r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:0,n=arguments.length>2&&arguments[2]!==void 0?arguments[2]:e.length,i=arguments.length>3&&arguments[3]!==void 0?arguments[3]:!0,a=arguments.length>4&&arguments[4]!==void 0?arguments[4]:!0,s=arguments.length>5&&arguments[5]!==void 0?arguments[5]:!0;i?e=e.slice(r,n):(n<e.length&&e.splice(n,e.length-n),r>0&&e.splice(0,r));for(var l=0,u=e.length-1;u>=0;u--){var h=e[u];s?isFinite(h)||(e[u]=-1/0,l++):e.splice(u,1)}a&&e.sort(function(p,m){return p-m});var f=e.length,d=Math.floor(f/2);return f%2!==0?e[d+1+l]:(e[d-1+l]+e[d+l])/2},"median"),Lje=o(function(e){return Math.PI*e/180},"deg2rad"),XE=o(function(e,r){return Math.atan2(r,e)-Math.PI/2},"getAngleFromDisp"),sB=Math.log2||function(t){return Math.log(t)/Math.log(2)},hge=o(function(e){return e>0?1:e<0?-1:0},"signum"),G0=o(function(e,r){return Math.sqrt(M0(e,r))},"dist"),M0=o(function(e,r){var n=r.x-e.x,i=r.y-e.y;return n*n+i*i},"sqdist"),Dje=o(function(e){for(var r=e.length,n=0,i=0;i<r;i++)n+=e[i];for(var a=0;a<r;a++)e[a]=e[a]/n;return e},"inPlaceSumNormalize"),ia=o(function(e,r,n,i){return(1-i)*(1-i)*e+2*(1-i)*i*r+i*i*n},"qbezierAt"),i1=o(function(e,r,n,i){return{x:ia(e.x,r.x,n.x,i),y:ia(e.y,r.y,n.y,i)}},"qbezierPtAt"),Nje=o(function(e,r,n,i){var a={x:r.x-e.x,y:r.y-e.y},s=G0(e,r),l={x:a.x/s,y:a.y/s};return n=n??0,i=i??n*s,{x:e.x+l.x*i,y:e.y+l.y*i}},"lineAt"),Wx=o(function(e,r,n){return Math.max(e,Math.min(n,r))},"bound"),$s=o(function(e){if(e==null)return{x1:1/0,y1:1/0,x2:-1/0,y2:-1/0,w:0,h:0};if(e.x1!=null&&e.y1!=null){if(e.x2!=null&&e.y2!=null&&e.x2>=e.x1&&e.y2>=e.y1)return{x1:e.x1,y1:e.y1,x2:e.x2,y2:e.y2,w:e.x2-e.x1,h:e.y2-e.y1};if(e.w!=null&&e.h!=null&&e.w>=0&&e.h>=0)return{x1:e.x1,y1:e.y1,x2:e.x1+e.w,y2:e.y1+e.h,w:e.w,h:e.h}}},"makeBoundingBox"),Rje=o(function(e){return{x1:e.x1,x2:e.x2,w:e.w,y1:e.y1,y2:e.y2,h:e.h}},"copyBoundingBox"),Mje=o(function(e){e.x1=1/0,e.y1=1/0,e.x2=-1/0,e.y2=-1/0,e.w=0,e.h=0},"clearBoundingBox"),Ije=o(function(e,r,n){return{x1:e.x1+r,x2:e.x2+r,y1:e.y1+n,y2:e.y2+n,w:e.w,h:e.h}},"shiftBoundingBox"),fge=o(function(e,r){e.x1=Math.min(e.x1,r.x1),e.x2=Math.max(e.x2,r.x2),e.w=e.x2-e.x1,e.y1=Math.min(e.y1,r.y1),e.y2=Math.max(e.y2,r.y2),e.h=e.y2-e.y1},"updateBoundingBox"),Oje=o(function(e,r,n){e.x1=Math.min(e.x1,r),e.x2=Math.max(e.x2,r),e.w=e.x2-e.x1,e.y1=Math.min(e.y1,n),e.y2=Math.max(e.y2,n),e.h=e.y2-e.y1},"expandBoundingBoxByPoint"),a6=o(function(e){var r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:0;return e.x1-=r,e.x2+=r,e.y1-=r,e.y2+=r,e.w=e.x2-e.x1,e.h=e.y2-e.y1,e},"expandBoundingBox"),s6=o(function(e){var r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:[0],n,i,a,s;if(r.length===1)n=i=a=s=r[0];else if(r.length===2)n=a=r[0],s=i=r[1];else if(r.length===4){var l=Ul(r,4);n=l[0],i=l[1],a=l[2],s=l[3]}return e.x1-=s,e.x2+=i,e.y1-=n,e.y2+=a,e.w=e.x2-e.x1,e.h=e.y2-e.y1,e},"expandBoundingBoxSides"),Gpe=o(function(e,r){e.x1=r.x1,e.y1=r.y1,e.x2=r.x2,e.y2=r.y2,e.w=e.x2-e.x1,e.h=e.y2-e.y1},"assignBoundingBox"),oB=o(function(e,r){return!(e.x1>r.x2||r.x1>e.x2||e.x2<r.x1||r.x2<e.x1||e.y2<r.y1||r.y2<e.y1||e.y1>r.y2||r.y1>e.y2)},"boundingBoxesIntersect"),c1=o(function(e,r,n){return e.x1<=r&&r<=e.x2&&e.y1<=n&&n<=e.y2},"inBoundingBox"),Pje=o(function(e,r){return c1(e,r.x,r.y)},"pointInBoundingBox"),dge=o(function(e,r){return c1(e,r.x1,r.y1)&&c1(e,r.x2,r.y2)},"boundingBoxInBoundingBox"),pge=o(function(e,r,n,i,a,s,l){var u=arguments.length>7&&arguments[7]!==void 0?arguments[7]:"auto",h=u==="auto"?$0(a,s):u,f=a/2,d=s/2;h=Math.min(h,f,d);var p=h!==f,m=h!==d,g;if(p){var y=n-f+h-l,v=i-d-l,x=n+f-h+l,b=v;if(g=Tf(e,r,n,i,y,v,x,b,!1),g.length>0)return g}if(m){var w=n+f+l,_=i-d+h-l,T=w,E=i+d-h+l;if(g=Tf(e,r,n,i,w,_,T,E,!1),g.length>0)return g}if(p){var L=n-f+h-l,C=i+d+l,A=n+f-h+l,I=C;if(g=Tf(e,r,n,i,L,C,A,I,!1),g.length>0)return g}if(m){var D=n-f-l,k=i-d+h-l,R=D,S=i+d-h+l;if(g=Tf(e,r,n,i,D,k,R,S,!1),g.length>0)return g}var O;{var N=n-f+h,P=i-d+h;if(O=Px(e,r,n,i,N,P,h+l),O.length>0&&O[0]<=N&&O[1]<=P)return[O[0],O[1]]}{var F=n+f-h,B=i-d+h;if(O=Px(e,r,n,i,F,B,h+l),O.length>0&&O[0]>=F&&O[1]<=B)return[O[0],O[1]]}{var $=n+f-h,z=i+d-h;if(O=Px(e,r,n,i,$,z,h+l),O.length>0&&O[0]>=$&&O[1]>=z)return[O[0],O[1]]}{var W=n-f+h,j=i+d-h;if(O=Px(e,r,n,i,W,j,h+l),O.length>0&&O[0]<=W&&O[1]>=j)return[O[0],O[1]]}return[]},"roundRectangleIntersectLine"),Bje=o(function(e,r,n,i,a,s,l){var u=l,h=Math.min(n,a),f=Math.max(n,a),d=Math.min(i,s),p=Math.max(i,s);return h-u<=e&&e<=f+u&&d-u<=r&&r<=p+u},"inLineVicinity"),Fje=o(function(e,r,n,i,a,s,l,u,h){var f={x1:Math.min(n,l,a)-h,x2:Math.max(n,l,a)+h,y1:Math.min(i,u,s)-h,y2:Math.max(i,u,s)+h};return!(e<f.x1||e>f.x2||r<f.y1||r>f.y2)},"inBezierVicinity"),zje=o(function(e,r,n,i){n-=i;var a=r*r-4*e*n;if(a<0)return[];var s=Math.sqrt(a),l=2*e,u=(-r+s)/l,h=(-r-s)/l;return[u,h]},"solveQuadratic"),Gje=o(function(e,r,n,i,a){var s=1e-5;e===0&&(e=s),r/=e,n/=e,i/=e;var l,u,h,f,d,p,m,g;if(u=(3*n-r*r)/9,h=-(27*i)+r*(9*n-2*(r*r)),h/=54,l=u*u*u+h*h,a[1]=0,m=r/3,l>0){d=h+Math.sqrt(l),d=d<0?-Math.pow(-d,1/3):Math.pow(d,1/3),p=h-Math.sqrt(l),p=p<0?-Math.pow(-p,1/3):Math.pow(p,1/3),a[0]=-m+d+p,m+=(d+p)/2,a[4]=a[2]=-m,m=Math.sqrt(3)*(-p+d)/2,a[3]=m,a[5]=-m;return}if(a[5]=a[3]=0,l===0){g=h<0?-Math.pow(-h,1/3):Math.pow(h,1/3),a[0]=-m+2*g,a[4]=a[2]=-(g+m);return}u=-u,f=u*u*u,f=Math.acos(h/Math.sqrt(f)),g=2*Math.sqrt(u),a[0]=-m+g*Math.cos(f/3),a[2]=-m+g*Math.cos((f+2*Math.PI)/3),a[4]=-m+g*Math.cos((f+4*Math.PI)/3)},"solveCubic"),$je=o(function(e,r,n,i,a,s,l,u){var h=1*n*n-4*n*a+2*n*l+4*a*a-4*a*l+l*l+i*i-4*i*s+2*i*u+4*s*s-4*s*u+u*u,f=1*9*n*a-3*n*n-3*n*l-6*a*a+3*a*l+9*i*s-3*i*i-3*i*u-6*s*s+3*s*u,d=1*3*n*n-6*n*a+n*l-n*e+2*a*a+2*a*e-l*e+3*i*i-6*i*s+i*u-i*r+2*s*s+2*s*r-u*r,p=1*n*a-n*n+n*e-a*e+i*s-i*i+i*r-s*r,m=[];Gje(h,f,d,p,m);for(var g=1e-7,y=[],v=0;v<6;v+=2)Math.abs(m[v+1])<g&&m[v]>=0&&m[v]<=1&&y.push(m[v]);y.push(1),y.push(0);for(var x=-1,b,w,_,T=0;T<y.length;T++)b=Math.pow(1-y[T],2)*n+2*(1-y[T])*y[T]*a+y[T]*y[T]*l,w=Math.pow(1-y[T],2)*i+2*(1-y[T])*y[T]*s+y[T]*y[T]*u,_=Math.pow(b-e,2)+Math.pow(w-r,2),x>=0?_<x&&(x=_):x=_;return x},"sqdistToQuadraticBezier"),Vje=o(function(e,r,n,i,a,s){var l=[e-n,r-i],u=[a-n,s-i],h=u[0]*u[0]+u[1]*u[1],f=l[0]*l[0]+l[1]*l[1],d=l[0]*u[0]+l[1]*u[1],p=d*d/h;return d<0?f:p>h?(e-a)*(e-a)+(r-s)*(r-s):f-p},"sqdistToFiniteLine"),Gs=o(function(e,r,n){for(var i,a,s,l,u,h=0,f=0;f<n.length/2;f++)if(i=n[f*2],a=n[f*2+1],f+1<n.length/2?(s=n[(f+1)*2],l=n[(f+1)*2+1]):(s=n[(f+1-n.length/2)*2],l=n[(f+1-n.length/2)*2+1]),!(i==e&&s==e))if(i>=e&&e>=s||i<=e&&e<=s)u=(e-i)/(s-i)*(l-a)+a,u>r&&h++;else continue;return h%2!==0},"pointInsidePolygonPoints"),ju=o(function(e,r,n,i,a,s,l,u,h){var f=new Array(n.length),d;u[0]!=null?(d=Math.atan(u[1]/u[0]),u[0]<0?d=d+Math.PI/2:d=-d-Math.PI/2):d=u;for(var p=Math.cos(-d),m=Math.sin(-d),g=0;g<f.length/2;g++)f[g*2]=s/2*(n[g*2]*p-n[g*2+1]*m),f[g*2+1]=l/2*(n[g*2+1]*p+n[g*2]*m),f[g*2]+=i,f[g*2+1]+=a;var y;if(h>0){var v=v6(f,-h);y=y6(v)}else y=f;return Gs(e,r,y)},"pointInsidePolygon"),Uje=o(function(e,r,n,i,a,s,l,u){for(var h=new Array(n.length*2),f=0;f<u.length;f++){var d=u[f];h[f*4+0]=d.startX,h[f*4+1]=d.startY,h[f*4+2]=d.stopX,h[f*4+3]=d.stopY;var p=Math.pow(d.cx-e,2)+Math.pow(d.cy-r,2);if(p<=Math.pow(d.radius,2))return!0}return Gs(e,r,h)},"pointInsideRoundPolygon"),y6=o(function(e){for(var r=new Array(e.length/2),n,i,a,s,l,u,h,f,d=0;d<e.length/4;d++){n=e[d*4],i=e[d*4+1],a=e[d*4+2],s=e[d*4+3],d<e.length/4-1?(l=e[(d+1)*4],u=e[(d+1)*4+1],h=e[(d+1)*4+2],f=e[(d+1)*4+3]):(l=e[0],u=e[1],h=e[2],f=e[3]);var p=Tf(n,i,a,s,l,u,h,f,!0);r[d*2]=p[0],r[d*2+1]=p[1]}return r},"joinLines"),v6=o(function(e,r){for(var n=new Array(e.length*2),i,a,s,l,u=0;u<e.length/2;u++){i=e[u*2],a=e[u*2+1],u<e.length/2-1?(s=e[(u+1)*2],l=e[(u+1)*2+1]):(s=e[0],l=e[1]);var h=l-a,f=-(s-i),d=Math.sqrt(h*h+f*f),p=h/d,m=f/d;n[u*4]=i+p*r,n[u*4+1]=a+m*r,n[u*4+2]=s+p*r,n[u*4+3]=l+m*r}return n},"expandPolygon"),Hje=o(function(e,r,n,i,a,s){var l=n-e,u=i-r;l/=a,u/=s;var h=Math.sqrt(l*l+u*u),f=h-1;if(f<0)return[];var d=f/h;return[(n-e)*d+e,(i-r)*d+r]},"intersectLineEllipse"),B0=o(function(e,r,n,i,a,s,l){return e-=a,r-=s,e/=n/2+l,r/=i/2+l,e*e+r*r<=1},"checkInEllipse"),Px=o(function(e,r,n,i,a,s,l){var u=[n-e,i-r],h=[e-a,r-s],f=u[0]*u[0]+u[1]*u[1],d=2*(h[0]*u[0]+h[1]*u[1]),p=h[0]*h[0]+h[1]*h[1]-l*l,m=d*d-4*f*p;if(m<0)return[];var g=(-d+Math.sqrt(m))/(2*f),y=(-d-Math.sqrt(m))/(2*f),v=Math.min(g,y),x=Math.max(g,y),b=[];if(v>=0&&v<=1&&b.push(v),x>=0&&x<=1&&b.push(x),b.length===0)return[];var w=b[0]*u[0]+e,_=b[0]*u[1]+r;if(b.length>1){if(b[0]==b[1])return[w,_];var T=b[1]*u[0]+e,E=b[1]*u[1]+r;return[w,_,T,E]}else return[w,_]},"intersectLineCircle"),AP=o(function(e,r,n){return r<=e&&e<=n||n<=e&&e<=r?e:e<=r&&r<=n||n<=r&&r<=e?r:n},"midOfThree"),Tf=o(function(e,r,n,i,a,s,l,u,h){var f=e-a,d=n-e,p=l-a,m=r-s,g=i-r,y=u-s,v=p*m-y*f,x=d*m-g*f,b=y*d-p*g;if(b!==0){var w=v/b,_=x/b,T=.001,E=0-T,L=1+T;return E<=w&&w<=L&&E<=_&&_<=L?[e+w*d,r+w*g]:h?[e+w*d,r+w*g]:[]}else return v===0||x===0?AP(e,n,l)===l?[l,u]:AP(e,n,a)===a?[a,s]:AP(a,l,n)===n?[n,i]:[]:[]},"finiteLinesIntersect"),Yx=o(function(e,r,n,i,a,s,l,u){var h=[],f,d=new Array(n.length),p=!0;s==null&&(p=!1);var m;if(p){for(var g=0;g<d.length/2;g++)d[g*2]=n[g*2]*s+i,d[g*2+1]=n[g*2+1]*l+a;if(u>0){var y=v6(d,-u);m=y6(y)}else m=d}else m=n;for(var v,x,b,w,_=0;_<m.length/2;_++)v=m[_*2],x=m[_*2+1],_<m.length/2-1?(b=m[(_+1)*2],w=m[(_+1)*2+1]):(b=m[0],w=m[1]),f=Tf(e,r,i,a,v,x,b,w),f.length!==0&&h.push(f[0],f[1]);return h},"polygonIntersectLine"),Wje=o(function(e,r,n,i,a,s,l,u,h){var f=[],d,p=new Array(n.length*2);h.forEach(function(b,w){w===0?(p[p.length-2]=b.startX,p[p.length-1]=b.startY):(p[w*4-2]=b.startX,p[w*4-1]=b.startY),p[w*4]=b.stopX,p[w*4+1]=b.stopY,d=Px(e,r,i,a,b.cx,b.cy,b.radius),d.length!==0&&f.push(d[0],d[1])});for(var m=0;m<p.length/4;m++)d=Tf(e,r,i,a,p[m*4],p[m*4+1],p[m*4+2],p[m*4+3],!1),d.length!==0&&f.push(d[0],d[1]);if(f.length>2){for(var g=[f[0],f[1]],y=Math.pow(g[0]-e,2)+Math.pow(g[1]-r,2),v=1;v<f.length/2;v++){var x=Math.pow(f[v*2]-e,2)+Math.pow(f[v*2+1]-r,2);x<=y&&(g[0]=f[v*2],g[1]=f[v*2+1],y=x)}return g}return f},"roundPolygonIntersectLine"),jE=o(function(e,r,n){var i=[e[0]-r[0],e[1]-r[1]],a=Math.sqrt(i[0]*i[0]+i[1]*i[1]),s=(a-n)/a;return s<0&&(s=1e-5),[r[0]+s*i[0],r[1]+s*i[1]]},"shortenIntersection"),ls=o(function(e,r){var n=BP(e,r);return n=mge(n),n},"generateUnitNgonPointsFitToSquare"),mge=o(function(e){for(var r,n,i=e.length/2,a=1/0,s=1/0,l=-1/0,u=-1/0,h=0;h<i;h++)r=e[2*h],n=e[2*h+1],a=Math.min(a,r),l=Math.max(l,r),s=Math.min(s,n),u=Math.max(u,n);for(var f=2/(l-a),d=2/(u-s),p=0;p<i;p++)r=e[2*p]=e[2*p]*f,n=e[2*p+1]=e[2*p+1]*d,a=Math.min(a,r),l=Math.max(l,r),s=Math.min(s,n),u=Math.max(u,n);if(s<-1)for(var m=0;m<i;m++)n=e[2*m+1]=e[2*m+1]+(-1-s);return e},"fitPolygonToSquare"),BP=o(function(e,r){var n=1/e*2*Math.PI,i=e%2===0?Math.PI/2+n/2:Math.PI/2;i+=r;for(var a=new Array(e*2),s,l=0;l<e;l++)s=l*n+i,a[2*l]=Math.cos(s),a[2*l+1]=Math.sin(-s);return a},"generateUnitNgonPoints"),$0=o(function(e,r){return Math.min(e/4,r/4,8)},"getRoundRectangleRadius"),gge=o(function(e,r){return Math.min(e/10,r/10,8)},"getRoundPolygonRadius"),lB=o(function(){return 8},"getCutRectangleCornerLength"),Yje=o(function(e,r,n){return[e-2*r+n,2*(r-e),e]},"bezierPtsToQuadCoeff"),FP=o(function(e,r){return{heightOffset:Math.min(15,.05*r),widthOffset:Math.min(100,.25*e),ctrlPtOffsetPct:.05}},"getBarrelCurveConstants"),qje=wa({dampingFactor:.8,precision:1e-6,iterations:200,weight:o(function(e){return 1},"weight")}),Xje={pageRank:o(function(e){for(var r=qje(e),n=r.dampingFactor,i=r.precision,a=r.iterations,s=r.weight,l=this._private.cy,u=this.byGroup(),h=u.nodes,f=u.edges,d=h.length,p=d*d,m=f.length,g=new Array(p),y=new Array(d),v=(1-n)/d,x=0;x<d;x++){for(var b=0;b<d;b++){var w=x*d+b;g[w]=0}y[x]=0}for(var _=0;_<m;_++){var T=f[_],E=T.data("source"),L=T.data("target");if(E!==L){var C=h.indexOfId(E),A=h.indexOfId(L),I=s(T),D=A*d+C;g[D]+=I,y[C]+=I}}for(var k=1/d+v,R=0;R<d;R++)if(y[R]===0)for(var S=0;S<d;S++){var O=S*d+R;g[O]=k}else for(var N=0;N<d;N++){var P=N*d+R;g[P]=g[P]/y[R]+v}for(var F=new Array(d),B=new Array(d),$,z=0;z<d;z++)F[z]=1;for(var W=0;W<a;W++){for(var j=0;j<d;j++)B[j]=0;for(var K=0;K<d;K++)for(var ie=0;ie<d;ie++){var Q=K*d+ie;B[K]+=g[Q]*F[ie]}Dje(B),$=F,F=B,B=$;for(var ee=0,J=0;J<d;J++){var H=$[J]-F[J];ee+=H*H}if(ee<i)break}var q={rank:o(function(ae){return ae=l.collection(ae)[0],F[h.indexOf(ae)]},"rank")};return q},"pageRank")},$pe=wa({root:null,weight:o(function(e){return 1},"weight"),directed:!1,alpha:0}),a1={degreeCentralityNormalized:o(function(e){e=$pe(e);var r=this.cy(),n=this.nodes(),i=n.length;if(e.directed){for(var f={},d={},p=0,m=0,g=0;g<i;g++){var y=n[g],v=y.id();e.root=y;var x=this.degreeCentrality(e);p<x.indegree&&(p=x.indegree),m<x.outdegree&&(m=x.outdegree),f[v]=x.indegree,d[v]=x.outdegree}return{indegree:o(function(w){return p==0?0:(Zt(w)&&(w=r.filter(w)),f[w.id()]/p)},"indegree"),outdegree:o(function(w){return m===0?0:(Zt(w)&&(w=r.filter(w)),d[w.id()]/m)},"outdegree")}}else{for(var a={},s=0,l=0;l<i;l++){var u=n[l];e.root=u;var h=this.degreeCentrality(e);s<h.degree&&(s=h.degree),a[u.id()]=h.degree}return{degree:o(function(w){return s===0?0:(Zt(w)&&(w=r.filter(w)),a[w.id()]/s)},"degree")}}},"degreeCentralityNormalized"),degreeCentrality:o(function(e){e=$pe(e);var r=this.cy(),n=this,i=e,a=i.root,s=i.weight,l=i.directed,u=i.alpha;if(a=r.collection(a)[0],l){for(var m=a.connectedEdges(),g=m.filter(function(E){return E.target().same(a)&&n.has(E)}),y=m.filter(function(E){return E.source().same(a)&&n.has(E)}),v=g.length,x=y.length,b=0,w=0,_=0;_<g.length;_++)b+=s(g[_]);for(var T=0;T<y.length;T++)w+=s(y[T]);return{indegree:Math.pow(v,1-u)*Math.pow(b,u),outdegree:Math.pow(x,1-u)*Math.pow(w,u)}}else{for(var h=a.connectedEdges().intersection(n),f=h.length,d=0,p=0;p<h.length;p++)d+=s(h[p]);return{degree:Math.pow(f,1-u)*Math.pow(d,u)}}},"degreeCentrality")};a1.dc=a1.degreeCentrality;a1.dcn=a1.degreeCentralityNormalised=a1.degreeCentralityNormalized;Vpe=wa({harmonic:!0,weight:o(function(){return 1},"weight"),directed:!1,root:null}),s1={closenessCentralityNormalized:o(function(e){for(var r=Vpe(e),n=r.harmonic,i=r.weight,a=r.directed,s=this.cy(),l={},u=0,h=this.nodes(),f=this.floydWarshall({weight:i,directed:a}),d=0;d<h.length;d++){for(var p=0,m=h[d],g=0;g<h.length;g++)if(d!==g){var y=f.distance(m,h[g]);n?p+=1/y:p+=y}n||(p=1/p),u<p&&(u=p),l[m.id()]=p}return{closeness:o(function(x){return u==0?0:(Zt(x)?x=s.filter(x)[0].id():x=x.id(),l[x]/u)},"closeness")}},"closenessCentralityNormalized"),closenessCentrality:o(function(e){var r=Vpe(e),n=r.root,i=r.weight,a=r.directed,s=r.harmonic;n=this.filter(n)[0];for(var l=this.dijkstra({root:n,weight:i,directed:a}),u=0,h=this.nodes(),f=0;f<h.length;f++){var d=h[f];if(!d.same(n)){var p=l.distanceTo(d);s?u+=1/p:u+=p}}return s?u:1/u},"closenessCentrality")};s1.cc=s1.closenessCentrality;s1.ccn=s1.closenessCentralityNormalised=s1.closenessCentralityNormalized;jje=wa({weight:null,directed:!1}),zP={betweennessCentrality:o(function(e){for(var r=jje(e),n=r.directed,i=r.weight,a=i!=null,s=this.cy(),l=this.nodes(),u={},h={},f=0,d={set:o(function(w,_){h[w]=_,_>f&&(f=_)},"set"),get:o(function(w){return h[w]},"get")},p=0;p<l.length;p++){var m=l[p],g=m.id();n?u[g]=m.outgoers().nodes():u[g]=m.openNeighborhood().nodes(),d.set(g,0)}for(var y=o(function(w){for(var _=l[w].id(),T=[],E={},L={},C={},A=new tb(function(ie,Q){return C[ie]-C[Q]}),I=0;I<l.length;I++){var D=l[I].id();E[D]=[],L[D]=0,C[D]=1/0}for(L[_]=1,C[_]=0,A.push(_);!A.empty();){var k=A.pop();if(T.push(k),a)for(var R=0;R<u[k].length;R++){var S=u[k][R],O=s.getElementById(k),N=void 0;O.edgesTo(S).length>0?N=O.edgesTo(S)[0]:N=S.edgesTo(O)[0];var P=i(N);S=S.id(),C[S]>C[k]+P&&(C[S]=C[k]+P,A.nodes.indexOf(S)<0?A.push(S):A.updateItem(S),L[S]=0,E[S]=[]),C[S]==C[k]+P&&(L[S]=L[S]+L[k],E[S].push(k))}else for(var F=0;F<u[k].length;F++){var B=u[k][F].id();C[B]==1/0&&(A.push(B),C[B]=C[k]+1),C[B]==C[k]+1&&(L[B]=L[B]+L[k],E[B].push(k))}}for(var $={},z=0;z<l.length;z++)$[l[z].id()]=0;for(;T.length>0;){for(var W=T.pop(),j=0;j<E[W].length;j++){var K=E[W][j];$[K]=$[K]+L[K]/L[W]*(1+$[W])}W!=l[w].id()&&d.set(W,d.get(W)+$[W])}},"_loop"),v=0;v<l.length;v++)y(v);var x={betweenness:o(function(w){var _=s.collection(w).id();return d.get(_)},"betweenness"),betweennessNormalized:o(function(w){if(f==0)return 0;var _=s.collection(w).id();return d.get(_)/f},"betweennessNormalized")};return x.betweennessNormalised=x.betweennessNormalized,x},"betweennessCentrality")};zP.bc=zP.betweennessCentrality;Kje=wa({expandFactor:2,inflateFactor:2,multFactor:1,maxIterations:20,attributes:[function(t){return 1}]}),Qje=o(function(e){return Kje(e)},"setOptions"),Zje=o(function(e,r){for(var n=0,i=0;i<r.length;i++)n+=r[i](e);return n},"getSimilarity"),Jje=o(function(e,r,n){for(var i=0;i<r;i++)e[i*r+i]=n},"addLoops"),yge=o(function(e,r){for(var n,i=0;i<r;i++){n=0;for(var a=0;a<r;a++)n+=e[a*r+i];for(var s=0;s<r;s++)e[s*r+i]=e[s*r+i]/n}},"normalize"),eKe=o(function(e,r,n){for(var i=new Array(n*n),a=0;a<n;a++){for(var s=0;s<n;s++)i[a*n+s]=0;for(var l=0;l<n;l++)for(var u=0;u<n;u++)i[a*n+u]+=e[a*n+l]*r[l*n+u]}return i},"mmult"),tKe=o(function(e,r,n){for(var i=e.slice(0),a=1;a<n;a++)e=eKe(e,i,r);return e},"expand"),rKe=o(function(e,r,n){for(var i=new Array(r*r),a=0;a<r*r;a++)i[a]=Math.pow(e[a],n);return yge(i,r),i},"inflate"),nKe=o(function(e,r,n,i){for(var a=0;a<n;a++){var s=Math.round(e[a]*Math.pow(10,i))/Math.pow(10,i),l=Math.round(r[a]*Math.pow(10,i))/Math.pow(10,i);if(s!==l)return!1}return!0},"hasConverged"),iKe=o(function(e,r,n,i){for(var a=[],s=0;s<r;s++){for(var l=[],u=0;u<r;u++)Math.round(e[s*r+u]*1e3)/1e3>0&&l.push(n[u]);l.length!==0&&a.push(i.collection(l))}return a},"assign"),aKe=o(function(e,r){for(var n=0;n<e.length;n++)if(!r[n]||e[n].id()!==r[n].id())return!1;return!0},"isDuplicate"),sKe=o(function(e){for(var r=0;r<e.length;r++)for(var n=0;n<e.length;n++)r!=n&&aKe(e[r],e[n])&&e.splice(n,1);return e},"removeDuplicates"),Upe=o(function(e){for(var r=this.nodes(),n=this.edges(),i=this.cy(),a=Qje(e),s={},l=0;l<r.length;l++)s[r[l].id()]=l;for(var u=r.length,h=u*u,f=new Array(h),d,p=0;p<h;p++)f[p]=0;for(var m=0;m<n.length;m++){var g=n[m],y=s[g.source().id()],v=s[g.target().id()],x=Zje(g,a.attributes);f[y*u+v]+=x,f[v*u+y]+=x}Jje(f,u,a.multFactor),yge(f,u);for(var b=!0,w=0;b&&w<a.maxIterations;)b=!1,d=tKe(f,u,a.expandFactor),f=rKe(d,u,a.inflateFactor),nKe(f,d,h,4)||(b=!0),w++;var _=iKe(f,u,r,i);return _=sKe(_),_},"markovClustering"),oKe={markovClustering:Upe,mcl:Upe},lKe=o(function(e){return e},"identity"),vge=o(function(e,r){return Math.abs(r-e)},"absDiff"),Hpe=o(function(e,r,n){return e+vge(r,n)},"addAbsDiff"),Wpe=o(function(e,r,n){return e+Math.pow(n-r,2)},"addSquaredDiff"),cKe=o(function(e){return Math.sqrt(e)},"sqrt"),uKe=o(function(e,r,n){return Math.max(e,vge(r,n))},"maxAbsDiff"),Dx=o(function(e,r,n,i,a){for(var s=arguments.length>5&&arguments[5]!==void 0?arguments[5]:lKe,l=i,u,h,f=0;f<e;f++)u=r(f),h=n(f),l=a(l,u,h);return s(l)},"getDistance"),u1={euclidean:o(function(e,r,n){return e>=2?Dx(e,r,n,0,Wpe,cKe):Dx(e,r,n,0,Hpe)},"euclidean"),squaredEuclidean:o(function(e,r,n){return Dx(e,r,n,0,Wpe)},"squaredEuclidean"),manhattan:o(function(e,r,n){return Dx(e,r,n,0,Hpe)},"manhattan"),max:o(function(e,r,n){return Dx(e,r,n,-1/0,uKe)},"max")};u1["squared-euclidean"]=u1.squaredEuclidean;u1.squaredeuclidean=u1.squaredEuclidean;o(D6,"clusteringDistance");hKe=wa({k:2,m:2,sensitivityThreshold:1e-4,distance:"euclidean",maxIterations:10,attributes:[],testMode:!1,testCentroids:null}),cB=o(function(e){return hKe(e)},"setOptions"),x6=o(function(e,r,n,i,a){var s=a!=="kMedoids",l=s?function(d){return n[d]}:function(d){return i[d](n)},u=o(function(p){return i[p](r)},"getQ"),h=n,f=r;return D6(e,i.length,l,u,h,f)},"getDist"),_P=o(function(e,r,n){for(var i=n.length,a=new Array(i),s=new Array(i),l=new Array(r),u=null,h=0;h<i;h++)a[h]=e.min(n[h]).value,s[h]=e.max(n[h]).value;for(var f=0;f<r;f++){u=[];for(var d=0;d<i;d++)u[d]=Math.random()*(s[d]-a[d])+a[d];l[f]=u}return l},"randomCentroids"),xge=o(function(e,r,n,i,a){for(var s=1/0,l=0,u=0;u<r.length;u++){var h=x6(n,e,r[u],i,a);h<s&&(s=h,l=u)}return l},"classify"),bge=o(function(e,r,n){for(var i=[],a=null,s=0;s<r.length;s++)a=r[s],n[a.id()]===e&&i.push(a);return i},"buildCluster"),fKe=o(function(e,r,n){return Math.abs(r-e)<=n},"haveValuesConverged"),dKe=o(function(e,r,n){for(var i=0;i<e.length;i++)for(var a=0;a<e[i].length;a++){var s=Math.abs(e[i][a]-r[i][a]);if(s>n)return!1}return!0},"haveMatricesConverged"),pKe=o(function(e,r,n){for(var i=0;i<n;i++)if(e===r[i])return!0;return!1},"seenBefore"),Ype=o(function(e,r){var n=new Array(r);if(e.length<50)for(var i=0;i<r;i++){for(var a=e[Math.floor(Math.random()*e.length)];pKe(a,n,i);)a=e[Math.floor(Math.random()*e.length)];n[i]=a}else for(var s=0;s<r;s++)n[s]=e[Math.floor(Math.random()*e.length)];return n},"randomMedoids"),qpe=o(function(e,r,n){for(var i=0,a=0;a<r.length;a++)i+=x6("manhattan",r[a],e,n,"kMedoids");return i},"findCost"),mKe=o(function(e){var r=this.cy(),n=this.nodes(),i=null,a=cB(e),s=new Array(a.k),l={},u;a.testMode?typeof a.testCentroids=="number"?(a.testCentroids,u=_P(n,a.k,a.attributes)):Yi(a.testCentroids)==="object"?u=a.testCentroids:u=_P(n,a.k,a.attributes):u=_P(n,a.k,a.attributes);for(var h=!0,f=0;h&&f<a.maxIterations;){for(var d=0;d<n.length;d++)i=n[d],l[i.id()]=xge(i,u,a.distance,a.attributes,"kMeans");h=!1;for(var p=0;p<a.k;p++){var m=bge(p,n,l);if(m.length!==0){for(var g=a.attributes.length,y=u[p],v=new Array(g),x=new Array(g),b=0;b<g;b++){x[b]=0;for(var w=0;w<m.length;w++)i=m[w],x[b]+=a.attributes[b](i);v[b]=x[b]/m.length,fKe(v[b],y[b],a.sensitivityThreshold)||(h=!0)}u[p]=v,s[p]=r.collection(m)}}f++}return s},"kMeans"),gKe=o(function(e){var r=this.cy(),n=this.nodes(),i=null,a=cB(e),s=new Array(a.k),l,u={},h,f=new Array(a.k);a.testMode?typeof a.testCentroids=="number"||(Yi(a.testCentroids)==="object"?l=a.testCentroids:l=Ype(n,a.k)):l=Ype(n,a.k);for(var d=!0,p=0;d&&p<a.maxIterations;){for(var m=0;m<n.length;m++)i=n[m],u[i.id()]=xge(i,l,a.distance,a.attributes,"kMedoids");d=!1;for(var g=0;g<l.length;g++){var y=bge(g,n,u);if(y.length!==0){f[g]=qpe(l[g],y,a.attributes);for(var v=0;v<y.length;v++)h=qpe(y[v],y,a.attributes),h<f[g]&&(f[g]=h,l[g]=y[v],d=!0);s[g]=r.collection(y)}}p++}return s},"kMedoids"),yKe=o(function(e,r,n,i,a){for(var s,l,u=0;u<r.length;u++)for(var h=0;h<e.length;h++)i[u][h]=Math.pow(n[u][h],a.m);for(var f=0;f<e.length;f++)for(var d=0;d<a.attributes.length;d++){s=0,l=0;for(var p=0;p<r.length;p++)s+=i[p][f]*a.attributes[d](r[p]),l+=i[p][f];e[f][d]=s/l}},"updateCentroids"),vKe=o(function(e,r,n,i,a){for(var s=0;s<e.length;s++)r[s]=e[s].slice();for(var l,u,h,f=2/(a.m-1),d=0;d<n.length;d++)for(var p=0;p<i.length;p++){l=0;for(var m=0;m<n.length;m++)u=x6(a.distance,i[p],n[d],a.attributes,"cmeans"),h=x6(a.distance,i[p],n[m],a.attributes,"cmeans"),l+=Math.pow(u/h,f);e[p][d]=1/l}},"updateMembership"),xKe=o(function(e,r,n,i){for(var a=new Array(n.k),s=0;s<a.length;s++)a[s]=[];for(var l,u,h=0;h<r.length;h++){l=-1/0,u=-1;for(var f=0;f<r[0].length;f++)r[h][f]>l&&(l=r[h][f],u=f);a[u].push(e[h])}for(var d=0;d<a.length;d++)a[d]=i.collection(a[d]);return a},"assign"),Xpe=o(function(e){var r=this.cy(),n=this.nodes(),i=cB(e),a,s,l,u,h;u=new Array(n.length);for(var f=0;f<n.length;f++)u[f]=new Array(i.k);l=new Array(n.length);for(var d=0;d<n.length;d++)l[d]=new Array(i.k);for(var p=0;p<n.length;p++){for(var m=0,g=0;g<i.k;g++)l[p][g]=Math.random(),m+=l[p][g];for(var y=0;y<i.k;y++)l[p][y]=l[p][y]/m}s=new Array(i.k);for(var v=0;v<i.k;v++)s[v]=new Array(i.attributes.length);h=new Array(n.length);for(var x=0;x<n.length;x++)h[x]=new Array(i.k);for(var b=!0,w=0;b&&w<i.maxIterations;)b=!1,yKe(s,n,l,h,i),vKe(l,u,s,n,i),dKe(l,u,i.sensitivityThreshold)||(b=!0),w++;return a=xKe(n,l,i,r),{clusters:a,degreeOfMembership:l}},"fuzzyCMeans"),bKe={kMeans:mKe,kMedoids:gKe,fuzzyCMeans:Xpe,fcm:Xpe},wKe=wa({distance:"euclidean",linkage:"min",mode:"threshold",threshold:1/0,addDendrogram:!1,dendrogramDepth:0,attributes:[]}),TKe={single:"min",complete:"max"},kKe=o(function(e){var r=wKe(e),n=TKe[r.linkage];return n!=null&&(r.linkage=n),r},"setOptions"),jpe=o(function(e,r,n,i,a){for(var s=0,l=1/0,u,h=a.attributes,f=o(function(A,I){return D6(a.distance,h.length,function(D){return h[D](A)},function(D){return h[D](I)},A,I)},"getDist"),d=0;d<e.length;d++){var p=e[d].key,m=n[p][i[p]];m<l&&(s=p,l=m)}if(a.mode==="threshold"&&l>=a.threshold||a.mode==="dendrogram"&&e.length===1)return!1;var g=r[s],y=r[i[s]],v;a.mode==="dendrogram"?v={left:g,right:y,key:g.key}:v={value:g.value.concat(y.value),key:g.key},e[g.index]=v,e.splice(y.index,1),r[g.key]=v;for(var x=0;x<e.length;x++){var b=e[x];g.key===b.key?u=1/0:a.linkage==="min"?(u=n[g.key][b.key],n[g.key][b.key]>n[y.key][b.key]&&(u=n[y.key][b.key])):a.linkage==="max"?(u=n[g.key][b.key],n[g.key][b.key]<n[y.key][b.key]&&(u=n[y.key][b.key])):a.linkage==="mean"?u=(n[g.key][b.key]*g.size+n[y.key][b.key]*y.size)/(g.size+y.size):a.mode==="dendrogram"?u=f(b.value,g.value):u=f(b.value[0],g.value[0]),n[g.key][b.key]=n[b.key][g.key]=u}for(var w=0;w<e.length;w++){var _=e[w].key;if(i[_]===g.key||i[_]===y.key){for(var T=_,E=0;E<e.length;E++){var L=e[E].key;n[_][L]<n[_][T]&&(T=L)}i[_]=T}e[w].index=w}return g.key=y.key=g.index=y.index=null,!0},"mergeClosest"),KE=o(function t(e,r,n){e&&(e.value?r.push(e.value):(e.left&&t(e.left,r),e.right&&t(e.right,r)))},"getAllChildren"),EKe=o(function t(e,r){if(!e)return"";if(e.left&&e.right){var n=t(e.left,r),i=t(e.right,r),a=r.add({group:"nodes",data:{id:n+","+i}});return r.add({group:"edges",data:{source:n,target:a.id()}}),r.add({group:"edges",data:{source:i,target:a.id()}}),a.id()}else if(e.value)return e.value.id()},"buildDendrogram"),SKe=o(function t(e,r,n){if(!e)return[];var i=[],a=[],s=[];return r===0?(e.left&&KE(e.left,i),e.right&&KE(e.right,a),s=i.concat(a),[n.collection(s)]):r===1?e.value?[n.collection(e.value)]:(e.left&&KE(e.left,i),e.right&&KE(e.right,a),[n.collection(i),n.collection(a)]):e.value?[n.collection(e.value)]:(e.left&&(i=t(e.left,r-1,n)),e.right&&(a=t(e.right,r-1,n)),i.concat(a))},"buildClustersFromTree"),Kpe=o(function(e){for(var r=this.cy(),n=this.nodes(),i=kKe(e),a=i.attributes,s=o(function(w,_){return D6(i.distance,a.length,function(T){return a[T](w)},function(T){return a[T](_)},w,_)},"getDist"),l=[],u=[],h=[],f=[],d=0;d<n.length;d++){var p={value:i.mode==="dendrogram"?n[d]:[n[d]],key:d,index:d};l[d]=p,f[d]=p,u[d]=[],h[d]=0}for(var m=0;m<l.length;m++)for(var g=0;g<=m;g++){var y=void 0;i.mode==="dendrogram"?y=m===g?1/0:s(l[m].value,l[g].value):y=m===g?1/0:s(l[m].value[0],l[g].value[0]),u[m][g]=y,u[g][m]=y,y<u[m][h[m]]&&(h[m]=g)}for(var v=jpe(l,f,u,h,i);v;)v=jpe(l,f,u,h,i);var x;return i.mode==="dendrogram"?(x=SKe(l[0],i.dendrogramDepth,r),i.addDendrogram&&EKe(l[0],r)):(x=new Array(l.length),l.forEach(function(b,w){b.key=b.index=null,x[w]=r.collection(b.value)})),x},"hierarchicalClustering"),CKe={hierarchicalClustering:Kpe,hca:Kpe},AKe=wa({distance:"euclidean",preference:"median",damping:.8,maxIterations:1e3,minIterations:100,attributes:[]}),_Ke=o(function(e){var r=e.damping,n=e.preference;.5<=r&&r<1||hi("Damping must range on [0.5, 1). Got: ".concat(r));var i=["median","mean","min","max"];return i.some(function(a){return a===n})||xt(n)||hi("Preference must be one of [".concat(i.map(function(a){return"'".concat(a,"'")}).join(", "),"] or a number. Got: ").concat(n)),AKe(e)},"setOptions"),LKe=o(function(e,r,n,i){var a=o(function(l,u){return i[u](l)},"attr");return-D6(e,i.length,function(s){return a(r,s)},function(s){return a(n,s)},r,n)},"getSimilarity"),DKe=o(function(e,r){var n=null;return r==="median"?n=_je(e):r==="mean"?n=Aje(e):r==="min"?n=Sje(e):r==="max"?n=Cje(e):n=r,n},"getPreference"),NKe=o(function(e,r,n){for(var i=[],a=0;a<e;a++)r[a*e+a]+n[a*e+a]>0&&i.push(a);return i},"findExemplars"),Qpe=o(function(e,r,n){for(var i=[],a=0;a<e;a++){for(var s=-1,l=-1/0,u=0;u<n.length;u++){var h=n[u];r[a*e+h]>l&&(s=h,l=r[a*e+h])}s>0&&i.push(s)}for(var f=0;f<n.length;f++)i[n[f]]=n[f];return i},"assignClusters"),RKe=o(function(e,r,n){for(var i=Qpe(e,r,n),a=0;a<n.length;a++){for(var s=[],l=0;l<i.length;l++)i[l]===n[a]&&s.push(l);for(var u=-1,h=-1/0,f=0;f<s.length;f++){for(var d=0,p=0;p<s.length;p++)d+=r[s[p]*e+s[f]];d>h&&(u=f,h=d)}n[a]=s[u]}return i=Qpe(e,r,n),i},"assign"),Zpe=o(function(e){for(var r=this.cy(),n=this.nodes(),i=_Ke(e),a={},s=0;s<n.length;s++)a[n[s].id()]=s;var l,u,h,f,d,p;l=n.length,u=l*l,h=new Array(u);for(var m=0;m<u;m++)h[m]=-1/0;for(var g=0;g<l;g++)for(var y=0;y<l;y++)g!==y&&(h[g*l+y]=LKe(i.distance,n[g],n[y],i.attributes));f=DKe(h,i.preference);for(var v=0;v<l;v++)h[v*l+v]=f;d=new Array(u);for(var x=0;x<u;x++)d[x]=0;p=new Array(u);for(var b=0;b<u;b++)p[b]=0;for(var w=new Array(l),_=new Array(l),T=new Array(l),E=0;E<l;E++)w[E]=0,_[E]=0,T[E]=0;for(var L=new Array(l*i.minIterations),C=0;C<L.length;C++)L[C]=0;var A;for(A=0;A<i.maxIterations;A++){for(var I=0;I<l;I++){for(var D=-1/0,k=-1/0,R=-1,S=0,O=0;O<l;O++)w[O]=d[I*l+O],S=p[I*l+O]+h[I*l+O],S>=D?(k=D,D=S,R=O):S>k&&(k=S);for(var N=0;N<l;N++)d[I*l+N]=(1-i.damping)*(h[I*l+N]-D)+i.damping*w[N];d[I*l+R]=(1-i.damping)*(h[I*l+R]-k)+i.damping*w[R]}for(var P=0;P<l;P++){for(var F=0,B=0;B<l;B++)w[B]=p[B*l+P],_[B]=Math.max(0,d[B*l+P]),F+=_[B];F-=_[P],_[P]=d[P*l+P],F+=_[P];for(var $=0;$<l;$++)p[$*l+P]=(1-i.damping)*Math.min(0,F-_[$])+i.damping*w[$];p[P*l+P]=(1-i.damping)*(F-_[P])+i.damping*w[P]}for(var z=0,W=0;W<l;W++){var j=p[W*l+W]+d[W*l+W]>0?1:0;L[A%i.minIterations*l+W]=j,z+=j}if(z>0&&(A>=i.minIterations-1||A==i.maxIterations-1)){for(var K=0,ie=0;ie<l;ie++){T[ie]=0;for(var Q=0;Q<i.minIterations;Q++)T[ie]+=L[Q*l+ie];(T[ie]===0||T[ie]===i.minIterations)&&K++}if(K===l)break}}for(var ee=NKe(l,d,p),J=RKe(l,h,ee),H={},q=0;q<ee.length;q++)H[ee[q]]=[];for(var Z=0;Z<n.length;Z++){var ae=a[n[Z].id()],ue=J[ae];ue!=null&&H[ue].push(n[Z])}for(var ce=new Array(ee.length),te=0;te<ee.length;te++)ce[te]=r.collection(H[ee[te]]);return ce},"affinityPropagation"),MKe={affinityPropagation:Zpe,ap:Zpe},IKe=wa({root:void 0,directed:!1}),OKe={hierholzer:o(function(e){if(!Vr(e)){var r=arguments;e={root:r[0],directed:r[1]}}var n=IKe(e),i=n.root,a=n.directed,s=this,l=!1,u,h,f;i&&(f=Zt(i)?this.filter(i)[0].id():i[0].id());var d={},p={};a?s.forEach(function(b){var w=b.id();if(b.isNode()){var _=b.indegree(!0),T=b.outdegree(!0),E=_-T,L=T-_;E==1?u?l=!0:u=w:L==1?h?l=!0:h=w:(L>1||E>1)&&(l=!0),d[w]=[],b.outgoers().forEach(function(C){C.isEdge()&&d[w].push(C.id())})}else p[w]=[void 0,b.target().id()]}):s.forEach(function(b){var w=b.id();if(b.isNode()){var _=b.degree(!0);_%2&&(u?h?l=!0:h=w:u=w),d[w]=[],b.connectedEdges().forEach(function(T){return d[w].push(T.id())})}else p[w]=[b.source().id(),b.target().id()]});var m={found:!1,trail:void 0};if(l)return m;if(h&&u)if(a){if(f&&h!=f)return m;f=h}else{if(f&&h!=f&&u!=f)return m;f||(f=h)}else f||(f=s[0].id());var g=o(function(w){for(var _=w,T=[w],E,L,C;d[_].length;)E=d[_].shift(),L=p[E][0],C=p[E][1],_!=C?(d[C]=d[C].filter(function(A){return A!=E}),_=C):!a&&_!=L&&(d[L]=d[L].filter(function(A){return A!=E}),_=L),T.unshift(E),T.unshift(_);return T},"walk"),y=[],v=[];for(v=g(f);v.length!=1;)d[v[0]].length==0?(y.unshift(s.getElementById(v.shift())),y.unshift(s.getElementById(v.shift()))):v=g(v.shift()).concat(v);y.unshift(s.getElementById(v.shift()));for(var x in d)if(d[x].length)return m;return m.found=!0,m.trail=this.spawn(y,!0),m},"hierholzer")},QE=o(function(){var e=this,r={},n=0,i=0,a=[],s=[],l={},u=o(function(p,m){for(var g=s.length-1,y=[],v=e.spawn();s[g].x!=p||s[g].y!=m;)y.push(s.pop().edge),g--;y.push(s.pop().edge),y.forEach(function(x){var b=x.connectedNodes().intersection(e);v.merge(x),b.forEach(function(w){var _=w.id(),T=w.connectedEdges().intersection(e);v.merge(w),r[_].cutVertex?v.merge(T.filter(function(E){return E.isLoop()})):v.merge(T)})}),a.push(v)},"buildComponent"),h=o(function d(p,m,g){p===g&&(i+=1),r[m]={id:n,low:n++,cutVertex:!1};var y=e.getElementById(m).connectedEdges().intersection(e);if(y.size()===0)a.push(e.spawn(e.getElementById(m)));else{var v,x,b,w;y.forEach(function(_){v=_.source().id(),x=_.target().id(),b=v===m?x:v,b!==g&&(w=_.id(),l[w]||(l[w]=!0,s.push({x:m,y:b,edge:_})),b in r?r[m].low=Math.min(r[m].low,r[b].id):(d(p,b,m),r[m].low=Math.min(r[m].low,r[b].low),r[m].id<=r[b].low&&(r[m].cutVertex=!0,u(m,b))))})}},"biconnectedSearch");e.forEach(function(d){if(d.isNode()){var p=d.id();p in r||(i=0,h(p,p),r[p].cutVertex=i>1)}});var f=Object.keys(r).filter(function(d){return r[d].cutVertex}).map(function(d){return e.getElementById(d)});return{cut:e.spawn(f),components:a}},"hopcroftTarjanBiconnected"),PKe={hopcroftTarjanBiconnected:QE,htbc:QE,htb:QE,hopcroftTarjanBiconnectedComponents:QE},ZE=o(function(){var e=this,r={},n=0,i=[],a=[],s=e.spawn(e),l=o(function u(h){a.push(h),r[h]={index:n,low:n++,explored:!1};var f=e.getElementById(h).connectedEdges().intersection(e);if(f.forEach(function(y){var v=y.target().id();v!==h&&(v in r||u(v),r[v].explored||(r[h].low=Math.min(r[h].low,r[v].low)))}),r[h].index===r[h].low){for(var d=e.spawn();;){var p=a.pop();if(d.merge(e.getElementById(p)),r[p].low=r[h].index,r[p].explored=!0,p===h)break}var m=d.edgesWith(d),g=d.merge(m);i.push(g),s=s.difference(g)}},"stronglyConnectedSearch");return e.forEach(function(u){if(u.isNode()){var h=u.id();h in r||l(h)}}),{cut:s,components:i}},"tarjanStronglyConnected"),BKe={tarjanStronglyConnected:ZE,tsc:ZE,tscc:ZE,tarjanStronglyConnectedComponents:ZE},wge={};[Hx,dje,pje,gje,vje,bje,kje,Xje,a1,s1,zP,oKe,bKe,CKe,MKe,OKe,PKe,BKe].forEach(function(t){ir(wge,t)});Tge=0,kge=1,Ege=2,Ku=o(function t(e){if(!(this instanceof t))return new t(e);this.id="Thenable/1.0.7",this.state=Tge,this.fulfillValue=void 0,this.rejectReason=void 0,this.onFulfilled=[],this.onRejected=[],this.proxy={then:this.then.bind(this)},typeof e=="function"&&e.call(this,this.fulfill.bind(this),this.reject.bind(this))},"api");Ku.prototype={fulfill:o(function(e){return Jpe(this,kge,"fulfillValue",e)},"fulfill"),reject:o(function(e){return Jpe(this,Ege,"rejectReason",e)},"reject"),then:o(function(e,r){var n=this,i=new Ku;return n.onFulfilled.push(tme(e,i,"fulfill")),n.onRejected.push(tme(r,i,"reject")),Sge(n),i.proxy},"then")};Jpe=o(function(e,r,n,i){return e.state===Tge&&(e.state=r,e[n]=i,Sge(e)),e},"deliver"),Sge=o(function(e){e.state===kge?eme(e,"onFulfilled",e.fulfillValue):e.state===Ege&&eme(e,"onRejected",e.rejectReason)},"execute"),eme=o(function(e,r,n){if(e[r].length!==0){var i=e[r];e[r]=[];var a=o(function(){for(var l=0;l<i.length;l++)i[l](n)},"func");typeof setImmediate=="function"?setImmediate(a):setTimeout(a,0)}},"execute_handlers"),tme=o(function(e,r,n){return function(i){if(typeof e!="function")r[n].call(r,i);else{var a;try{a=e(i)}catch(s){r.reject(s);return}FKe(r,a)}}},"resolver"),FKe=o(function t(e,r){if(e===r||e.proxy===r){e.reject(new TypeError("cannot resolve promise with itself"));return}var n;if(Yi(r)==="object"&&r!==null||typeof r=="function")try{n=r.then}catch(a){e.reject(a);return}if(typeof n=="function"){var i=!1;try{n.call(r,function(a){i||(i=!0,a===r?e.reject(new TypeError("circular thenable chain")):t(e,a))},function(a){i||(i=!0,e.reject(a))})}catch(a){i||e.reject(a)}return}e.fulfill(r)},"resolve");Ku.all=function(t){return new Ku(function(e,r){for(var n=new Array(t.length),i=0,a=o(function(u,h){n[u]=h,i++,i===t.length&&e(n)},"fulfill"),s=0;s<t.length;s++)(function(l){var u=t[l],h=u!=null&&u.then!=null;if(h)u.then(function(d){a(l,d)},function(d){r(d)});else{var f=u;a(l,f)}})(s)})};Ku.resolve=function(t){return new Ku(function(e,r){e(t)})};Ku.reject=function(t){return new Ku(function(e,r){r(t)})};d1=typeof Promise<"u"?Promise:Ku,GP=o(function(e,r,n){var i=tB(e),a=!i,s=this._private=ir({duration:1e3},r,n);if(s.target=e,s.style=s.style||s.css,s.started=!1,s.playing=!1,s.hooked=!1,s.applying=!1,s.progress=0,s.completes=[],s.frames=[],s.complete&&ti(s.complete)&&s.completes.push(s.complete),a){var l=e.position();s.startPosition=s.startPosition||{x:l.x,y:l.y},s.startStyle=s.startStyle||e.cy().style().getAnimationStartStyle(e,s.style)}if(i){var u=e.pan();s.startPan={x:u.x,y:u.y},s.startZoom=e.zoom()}this.length=1,this[0]=this},"Animation"),V0=GP.prototype;ir(V0,{instanceString:o(function(){return"animation"},"instanceString"),hook:o(function(){var e=this._private;if(!e.hooked){var r,n=e.target._private.animation;e.queue?r=n.queue:r=n.current,r.push(this),po(e.target)&&e.target.cy().addToAnimationPool(e.target),e.hooked=!0}return this},"hook"),play:o(function(){var e=this._private;return e.progress===1&&(e.progress=0),e.playing=!0,e.started=!1,e.stopped=!1,this.hook(),this},"play"),playing:o(function(){return this._private.playing},"playing"),apply:o(function(){var e=this._private;return e.applying=!0,e.started=!1,e.stopped=!1,this.hook(),this},"apply"),applying:o(function(){return this._private.applying},"applying"),pause:o(function(){var e=this._private;return e.playing=!1,e.started=!1,this},"pause"),stop:o(function(){var e=this._private;return e.playing=!1,e.started=!1,e.stopped=!0,this},"stop"),rewind:o(function(){return this.progress(0)},"rewind"),fastforward:o(function(){return this.progress(1)},"fastforward"),time:o(function(e){var r=this._private;return e===void 0?r.progress*r.duration:this.progress(e/r.duration)},"time"),progress:o(function(e){var r=this._private,n=r.playing;return e===void 0?r.progress:(n&&this.pause(),r.progress=e,r.started=!1,n&&this.play(),this)},"progress"),completed:o(function(){return this._private.progress===1},"completed"),reverse:o(function(){var e=this._private,r=e.playing;r&&this.pause(),e.progress=1-e.progress,e.started=!1;var n=o(function(h,f){var d=e[h];d!=null&&(e[h]=e[f],e[f]=d)},"swap");if(n("zoom","startZoom"),n("pan","startPan"),n("position","startPosition"),e.style)for(var i=0;i<e.style.length;i++){var a=e.style[i],s=a.name,l=e.startStyle[s];e.startStyle[s]=a,e.style[i]=l}return r&&this.play(),this},"reverse"),promise:o(function(e){var r=this._private,n;switch(e){case"frame":n=r.frames;break;default:case"complete":case"completed":n=r.completes}return new d1(function(i,a){n.push(function(){i()})})},"promise")});V0.complete=V0.completed;V0.run=V0.play;V0.running=V0.playing;zKe={animated:o(function(){return o(function(){var r=this,n=r.length!==void 0,i=n?r:[r],a=this._private.cy||this;if(!a.styleEnabled())return!1;var s=i[0];if(s)return s._private.animation.current.length>0},"animatedImpl")},"animated"),clearQueue:o(function(){return o(function(){var r=this,n=r.length!==void 0,i=n?r:[r],a=this._private.cy||this;if(!a.styleEnabled())return this;for(var s=0;s<i.length;s++){var l=i[s];l._private.animation.queue=[]}return this},"clearQueueImpl")},"clearQueue"),delay:o(function(){return o(function(r,n){var i=this._private.cy||this;return i.styleEnabled()?this.animate({delay:r,duration:r,complete:n}):this},"delayImpl")},"delay"),delayAnimation:o(function(){return o(function(r,n){var i=this._private.cy||this;return i.styleEnabled()?this.animation({delay:r,duration:r,complete:n}):this},"delayAnimationImpl")},"delayAnimation"),animation:o(function(){return o(function(r,n){var i=this,a=i.length!==void 0,s=a?i:[i],l=this._private.cy||this,u=!a,h=!u;if(!l.styleEnabled())return this;var f=l.style();r=ir({},r,n);var d=Object.keys(r).length===0;if(d)return new GP(s[0],r);switch(r.duration===void 0&&(r.duration=400),r.duration){case"slow":r.duration=600;break;case"fast":r.duration=200;break}if(h&&(r.style=f.getPropsList(r.style||r.css),r.css=void 0),h&&r.renderedPosition!=null){var p=r.renderedPosition,m=l.pan(),g=l.zoom();r.position=uge(p,g,m)}if(u&&r.panBy!=null){var y=r.panBy,v=l.pan();r.pan={x:v.x+y.x,y:v.y+y.y}}var x=r.center||r.centre;if(u&&x!=null){var b=l.getCenterPan(x.eles,r.zoom);b!=null&&(r.pan=b)}if(u&&r.fit!=null){var w=r.fit,_=l.getFitViewport(w.eles||w.boundingBox,w.padding);_!=null&&(r.pan=_.pan,r.zoom=_.zoom)}if(u&&Vr(r.zoom)){var T=l.getZoomedViewport(r.zoom);T!=null?(T.zoomed&&(r.zoom=T.zoom),T.panned&&(r.pan=T.pan)):r.zoom=null}return new GP(s[0],r)},"animationImpl")},"animation"),animate:o(function(){return o(function(r,n){var i=this,a=i.length!==void 0,s=a?i:[i],l=this._private.cy||this;if(!l.styleEnabled())return this;n&&(r=ir({},r,n));for(var u=0;u<s.length;u++){var h=s[u],f=h.animated()&&(r.queue===void 0||r.queue),d=h.animation(r,f?{queue:!0}:void 0);d.play()}return this},"animateImpl")},"animate"),stop:o(function(){return o(function(r,n){var i=this,a=i.length!==void 0,s=a?i:[i],l=this._private.cy||this;if(!l.styleEnabled())return this;for(var u=0;u<s.length;u++){for(var h=s[u],f=h._private,d=f.animation.current,p=0;p<d.length;p++){var m=d[p],g=m._private;n&&(g.duration=0)}r&&(f.animation.queue=[]),n||(f.animation.current=[])}return l.notify("draw"),this},"stopImpl")},"stop")},GKe=Array.isArray,N6=GKe,$Ke=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,VKe=/^\w*$/;o(UKe,"isKey");HKe=UKe,WKe="[object AsyncFunction]",YKe="[object Function]",qKe="[object GeneratorFunction]",XKe="[object Proxy]";o(jKe,"isFunction");KKe=jKe,QKe=C6["__core-js_shared__"],LP=QKe,rme=function(){var t=/[^.]+$/.exec(LP&&LP.keys&&LP.keys.IE_PROTO||"");return t?"Symbol(src)_1."+t:""}();o(ZKe,"isMasked");JKe=ZKe,eQe=Function.prototype,tQe=eQe.toString;o(rQe,"toSource");nQe=rQe,iQe=/[\\^$.*+?()[\]{}|]/g,aQe=/^\[object .+?Constructor\]$/,sQe=Function.prototype,oQe=Object.prototype,lQe=sQe.toString,cQe=oQe.hasOwnProperty,uQe=RegExp("^"+lQe.call(cQe).replace(iQe,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");o(hQe,"baseIsNative");fQe=hQe;o(dQe,"getValue$1");pQe=dQe;o(mQe,"getNative");uB=mQe,gQe=uB(Object,"create"),qx=gQe;o(yQe,"hashClear");vQe=yQe;o(xQe,"hashDelete");bQe=xQe,wQe="__lodash_hash_undefined__",TQe=Object.prototype,kQe=TQe.hasOwnProperty;o(EQe,"hashGet");SQe=EQe,CQe=Object.prototype,AQe=CQe.hasOwnProperty;o(_Qe,"hashHas");LQe=_Qe,DQe="__lodash_hash_undefined__";o(NQe,"hashSet");RQe=NQe;o(p1,"Hash");p1.prototype.clear=vQe;p1.prototype.delete=bQe;p1.prototype.get=SQe;p1.prototype.has=LQe;p1.prototype.set=RQe;nme=p1;o(MQe,"listCacheClear");IQe=MQe;o(OQe,"eq");Cge=OQe;o(PQe,"assocIndexOf");R6=PQe,BQe=Array.prototype,FQe=BQe.splice;o(zQe,"listCacheDelete");GQe=zQe;o($Qe,"listCacheGet");VQe=$Qe;o(UQe,"listCacheHas");HQe=UQe;o(WQe,"listCacheSet");YQe=WQe;o(m1,"ListCache");m1.prototype.clear=IQe;m1.prototype.delete=GQe;m1.prototype.get=VQe;m1.prototype.has=HQe;m1.prototype.set=YQe;qQe=m1,XQe=uB(C6,"Map"),jQe=XQe;o(KQe,"mapCacheClear");QQe=KQe;o(ZQe,"isKeyable");JQe=ZQe;o(eZe,"getMapData");M6=eZe;o(tZe,"mapCacheDelete");rZe=tZe;o(nZe,"mapCacheGet");iZe=nZe;o(aZe,"mapCacheHas");sZe=aZe;o(oZe,"mapCacheSet");lZe=oZe;o(g1,"MapCache");g1.prototype.clear=QQe;g1.prototype.delete=rZe;g1.prototype.get=iZe;g1.prototype.has=sZe;g1.prototype.set=lZe;Age=g1,cZe="Expected a function";o(hB,"memoize");hB.Cache=Age;uZe=hB,hZe=500;o(fZe,"memoizeCapped");dZe=fZe,pZe=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,mZe=/\\(\\)?/g,gZe=dZe(function(t){var e=[];return t.charCodeAt(0)===46&&e.push(""),t.replace(pZe,function(r,n,i,a){e.push(i?a.replace(mZe,"$1"):n||r)}),e}),_ge=gZe;o(yZe,"arrayMap");Lge=yZe,vZe=1/0,ime=l1?l1.prototype:void 0,ame=ime?ime.toString:void 0;o(Dge,"baseToString");xZe=Dge;o(bZe,"toString$1");Nge=bZe;o(wZe,"castPath");Rge=wZe,TZe=1/0;o(kZe,"toKey");fB=kZe;o(EZe,"baseGet");SZe=EZe;o(CZe,"get");AZe=CZe,_Ze=function(){try{var t=uB(Object,"defineProperty");return t({},"",{}),t}catch{}}(),sme=_Ze;o(LZe,"baseAssignValue");DZe=LZe,NZe=Object.prototype,RZe=NZe.hasOwnProperty;o(MZe,"assignValue");IZe=MZe,OZe=9007199254740991,PZe=/^(?:0|[1-9]\d*)$/;o(BZe,"isIndex");FZe=BZe;o(zZe,"baseSet");GZe=zZe;o($Ze,"set");VZe=$Ze;o(UZe,"copyArray");HZe=UZe;o(WZe,"toPath");YZe=WZe,qZe={data:o(function(e){var r={field:"data",bindingEvent:"data",allowBinding:!1,allowSetting:!1,allowGetting:!1,settingEvent:"data",settingTriggersEvent:!1,triggerFnName:"trigger",immutableKeys:{},updateStyle:!1,beforeGet:o(function(i){},"beforeGet"),beforeSet:o(function(i,a){},"beforeSet"),onSet:o(function(i){},"onSet"),canSet:o(function(i){return!0},"canSet")};return e=ir({},r,e),o(function(i,a){var s=e,l=this,u=l.length!==void 0,h=u?l:[l],f=u?l[0]:l;if(Zt(i)){var d=i.indexOf(".")!==-1,p=d&&YZe(i);if(s.allowGetting&&a===void 0){var m;return f&&(s.beforeGet(f),p&&f._private[s.field][i]===void 0?m=AZe(f._private[s.field],p):m=f._private[s.field][i]),m}else if(s.allowSetting&&a!==void 0){var g=!s.immutableKeys[i];if(g){var y=Hme({},i,a);s.beforeSet(l,y);for(var v=0,x=h.length;v<x;v++){var b=h[v];s.canSet(b)&&(p&&f._private[s.field][i]===void 0?VZe(b._private[s.field],p,a):b._private[s.field][i]=a)}s.updateStyle&&l.updateStyle(),s.onSet(l),s.settingTriggersEvent&&l[s.triggerFnName](s.settingEvent)}}}else if(s.allowSetting&&Vr(i)){var w=i,_,T,E=Object.keys(w);s.beforeSet(l,w);for(var L=0;L<E.length;L++){_=E[L],T=w[_];var C=!s.immutableKeys[_];if(C)for(var A=0;A<h.length;A++){var I=h[A];s.canSet(I)&&(I._private[s.field][_]=T)}}s.updateStyle&&l.updateStyle(),s.onSet(l),s.settingTriggersEvent&&l[s.triggerFnName](s.settingEvent)}else if(s.allowBinding&&ti(i)){var D=i;l.on(s.bindingEvent,D)}else if(s.allowGetting&&i===void 0){var k;return f&&(s.beforeGet(f),k=f._private[s.field]),k}return l},"dataImpl")},"data"),removeData:o(function(e){var r={field:"data",event:"data",triggerFnName:"trigger",triggerEvent:!1,immutableKeys:{}};return e=ir({},r,e),o(function(i){var a=e,s=this,l=s.length!==void 0,u=l?s:[s];if(Zt(i)){for(var h=i.split(/\s+/),f=h.length,d=0;d<f;d++){var p=h[d];if(!Sf(p)){var m=!a.immutableKeys[p];if(m)for(var g=0,y=u.length;g<y;g++)u[g]._private[a.field][p]=void 0}}a.triggerEvent&&s[a.triggerFnName](a.event)}else if(i===void 0){for(var v=0,x=u.length;v<x;v++)for(var b=u[v]._private[a.field],w=Object.keys(b),_=0;_<w.length;_++){var T=w[_],E=!a.immutableKeys[T];E&&(b[T]=void 0)}a.triggerEvent&&s[a.triggerFnName](a.event)}return s},"removeDataImpl")},"removeData")},XZe={eventAliasesOn:o(function(e){var r=e;r.addListener=r.listen=r.bind=r.on,r.unlisten=r.unbind=r.off=r.removeListener,r.trigger=r.emit,r.pon=r.promiseOn=function(n,i){var a=this,s=Array.prototype.slice.call(arguments,0);return new d1(function(l,u){var h=o(function(m){a.off.apply(a,d),l(m)},"callback"),f=s.concat([h]),d=f.concat([]);a.on.apply(a,f)})}},"eventAliasesOn")},sn={};[zKe,qZe,XZe].forEach(function(t){ir(sn,t)});jZe={animate:sn.animate(),animation:sn.animation(),animated:sn.animated(),clearQueue:sn.clearQueue(),delay:sn.delay(),delayAnimation:sn.delayAnimation(),stop:sn.stop()},o6={classes:o(function(e){var r=this;if(e===void 0){var n=[];return r[0]._private.classes.forEach(function(g){return n.push(g)}),n}else wn(e)||(e=(e||"").match(/\S+/g)||[]);for(var i=[],a=new f1(e),s=0;s<r.length;s++){for(var l=r[s],u=l._private,h=u.classes,f=!1,d=0;d<e.length;d++){var p=e[d],m=h.has(p);if(!m){f=!0;break}}f||(f=h.size!==e.length),f&&(u.classes=a,i.push(l))}return i.length>0&&this.spawn(i).updateStyle().emit("class"),r},"classes"),addClass:o(function(e){return this.toggleClass(e,!0)},"addClass"),hasClass:o(function(e){var r=this[0];return r!=null&&r._private.classes.has(e)},"hasClass"),toggleClass:o(function(e,r){wn(e)||(e=e.match(/\S+/g)||[]);for(var n=this,i=r===void 0,a=[],s=0,l=n.length;s<l;s++)for(var u=n[s],h=u._private.classes,f=!1,d=0;d<e.length;d++){var p=e[d],m=h.has(p),g=!1;r||i&&!m?(h.add(p),g=!0):(!r||i&&m)&&(h.delete(p),g=!0),!f&&g&&(a.push(u),f=!0)}return a.length>0&&this.spawn(a).updateStyle().emit("class"),n},"toggleClass"),removeClass:o(function(e){return this.toggleClass(e,!1)},"removeClass"),flashClass:o(function(e,r){var n=this;if(r==null)r=250;else if(r===0)return n;return n.addClass(e),setTimeout(function(){n.removeClass(e)},r),n},"flashClass")};o6.className=o6.classNames=o6.classes;$r={metaChar:"[\\!\\\"\\#\\$\\%\\&\\'\\(\\)\\*\\+\\,\\.\\/\\:\\;\\<\\=\\>\\?\\@\\[\\]\\^\\`\\{\\|\\}\\~]",comparatorOp:"=|\\!=|>|>=|<|<=|\\$=|\\^=|\\*=",boolOp:"\\?|\\!|\\^",string:`"(?:\\\\"|[^"])*"|'(?:\\\\'|[^'])*'`,number:Wi,meta:"degree|indegree|outdegree",separator:"\\s*,\\s*",descendant:"\\s+",child:"\\s+>\\s+",subject:"\\$",group:"node|edge|\\*",directedEdge:"\\s+->\\s+",undirectedEdge:"\\s+<->\\s+"};$r.variable="(?:[\\w-.]|(?:\\\\"+$r.metaChar+"))+";$r.className="(?:[\\w-]|(?:\\\\"+$r.metaChar+"))+";$r.value=$r.string+"|"+$r.number;$r.id=$r.variable;(function(){var t,e,r;for(t=$r.comparatorOp.split("|"),r=0;r<t.length;r++)e=t[r],$r.comparatorOp+="|@"+e;for(t=$r.comparatorOp.split("|"),r=0;r<t.length;r++)e=t[r],!(e.indexOf("!")>=0)&&e!=="="&&($r.comparatorOp+="|\\!"+e)})();pn=o(function(){return{checks:[]}},"newQuery"),Pt={GROUP:0,COLLECTION:1,FILTER:2,DATA_COMPARE:3,DATA_EXIST:4,DATA_BOOL:5,META_COMPARE:6,STATE:7,ID:8,CLASS:9,UNDIRECTED_EDGE:10,DIRECTED_EDGE:11,NODE_SOURCE:12,NODE_TARGET:13,NODE_NEIGHBOR:14,CHILD:15,DESCENDANT:16,PARENT:17,ANCESTOR:18,COMPOUND_SPLIT:19,TRUE:20},$P=[{selector:":selected",matches:o(function(e){return e.selected()},"matches")},{selector:":unselected",matches:o(function(e){return!e.selected()},"matches")},{selector:":selectable",matches:o(function(e){return e.selectable()},"matches")},{selector:":unselectable",matches:o(function(e){return!e.selectable()},"matches")},{selector:":locked",matches:o(function(e){return e.locked()},"matches")},{selector:":unlocked",matches:o(function(e){return!e.locked()},"matches")},{selector:":visible",matches:o(function(e){return e.visible()},"matches")},{selector:":hidden",matches:o(function(e){return!e.visible()},"matches")},{selector:":transparent",matches:o(function(e){return e.transparent()},"matches")},{selector:":grabbed",matches:o(function(e){return e.grabbed()},"matches")},{selector:":free",matches:o(function(e){return!e.grabbed()},"matches")},{selector:":removed",matches:o(function(e){return e.removed()},"matches")},{selector:":inside",matches:o(function(e){return!e.removed()},"matches")},{selector:":grabbable",matches:o(function(e){return e.grabbable()},"matches")},{selector:":ungrabbable",matches:o(function(e){return!e.grabbable()},"matches")},{selector:":animated",matches:o(function(e){return e.animated()},"matches")},{selector:":unanimated",matches:o(function(e){return!e.animated()},"matches")},{selector:":parent",matches:o(function(e){return e.isParent()},"matches")},{selector:":childless",matches:o(function(e){return e.isChildless()},"matches")},{selector:":child",matches:o(function(e){return e.isChild()},"matches")},{selector:":orphan",matches:o(function(e){return e.isOrphan()},"matches")},{selector:":nonorphan",matches:o(function(e){return e.isChild()},"matches")},{selector:":compound",matches:o(function(e){return e.isNode()?e.isParent():e.source().isParent()||e.target().isParent()},"matches")},{selector:":loop",matches:o(function(e){return e.isLoop()},"matches")},{selector:":simple",matches:o(function(e){return e.isSimple()},"matches")},{selector:":active",matches:o(function(e){return e.active()},"matches")},{selector:":inactive",matches:o(function(e){return!e.active()},"matches")},{selector:":backgrounding",matches:o(function(e){return e.backgrounding()},"matches")},{selector:":nonbackgrounding",matches:o(function(e){return!e.backgrounding()},"matches")}].sort(function(t,e){return oXe(t.selector,e.selector)}),KZe=function(){for(var t={},e,r=0;r<$P.length;r++)e=$P[r],t[e.selector]=e.matches;return t}(),QZe=o(function(e,r){return KZe[e](r)},"stateSelectorMatches"),ZZe="("+$P.map(function(t){return t.selector}).join("|")+")",Kg=o(function(e){return e.replace(new RegExp("\\\\("+$r.metaChar+")","g"),function(r,n){return n})},"cleanMetaChars"),bf=o(function(e,r,n){e[e.length-1]=n},"replaceLastQuery"),VP=[{name:"group",query:!0,regex:"("+$r.group+")",populate:o(function(e,r,n){var i=Ul(n,1),a=i[0];r.checks.push({type:Pt.GROUP,value:a==="*"?a:a+"s"})},"populate")},{name:"state",query:!0,regex:ZZe,populate:o(function(e,r,n){var i=Ul(n,1),a=i[0];r.checks.push({type:Pt.STATE,value:a})},"populate")},{name:"id",query:!0,regex:"\\#("+$r.id+")",populate:o(function(e,r,n){var i=Ul(n,1),a=i[0];r.checks.push({type:Pt.ID,value:Kg(a)})},"populate")},{name:"className",query:!0,regex:"\\.("+$r.className+")",populate:o(function(e,r,n){var i=Ul(n,1),a=i[0];r.checks.push({type:Pt.CLASS,value:Kg(a)})},"populate")},{name:"dataExists",query:!0,regex:"\\[\\s*("+$r.variable+")\\s*\\]",populate:o(function(e,r,n){var i=Ul(n,1),a=i[0];r.checks.push({type:Pt.DATA_EXIST,field:Kg(a)})},"populate")},{name:"dataCompare",query:!0,regex:"\\[\\s*("+$r.variable+")\\s*("+$r.comparatorOp+")\\s*("+$r.value+")\\s*\\]",populate:o(function(e,r,n){var i=Ul(n,3),a=i[0],s=i[1],l=i[2],u=new RegExp("^"+$r.string+"$").exec(l)!=null;u?l=l.substring(1,l.length-1):l=parseFloat(l),r.checks.push({type:Pt.DATA_COMPARE,field:Kg(a),operator:s,value:l})},"populate")},{name:"dataBool",query:!0,regex:"\\[\\s*("+$r.boolOp+")\\s*("+$r.variable+")\\s*\\]",populate:o(function(e,r,n){var i=Ul(n,2),a=i[0],s=i[1];r.checks.push({type:Pt.DATA_BOOL,field:Kg(s),operator:a})},"populate")},{name:"metaCompare",query:!0,regex:"\\[\\[\\s*("+$r.meta+")\\s*("+$r.comparatorOp+")\\s*("+$r.number+")\\s*\\]\\]",populate:o(function(e,r,n){var i=Ul(n,3),a=i[0],s=i[1],l=i[2];r.checks.push({type:Pt.META_COMPARE,field:Kg(a),operator:s,value:parseFloat(l)})},"populate")},{name:"nextQuery",separator:!0,regex:$r.separator,populate:o(function(e,r){var n=e.currentSubject,i=e.edgeCount,a=e.compoundCount,s=e[e.length-1];n!=null&&(s.subject=n,e.currentSubject=null),s.edgeCount=i,s.compoundCount=a,e.edgeCount=0,e.compoundCount=0;var l=e[e.length++]=pn();return l},"populate")},{name:"directedEdge",separator:!0,regex:$r.directedEdge,populate:o(function(e,r){if(e.currentSubject==null){var n=pn(),i=r,a=pn();return n.checks.push({type:Pt.DIRECTED_EDGE,source:i,target:a}),bf(e,r,n),e.edgeCount++,a}else{var s=pn(),l=r,u=pn();return s.checks.push({type:Pt.NODE_SOURCE,source:l,target:u}),bf(e,r,s),e.edgeCount++,u}},"populate")},{name:"undirectedEdge",separator:!0,regex:$r.undirectedEdge,populate:o(function(e,r){if(e.currentSubject==null){var n=pn(),i=r,a=pn();return n.checks.push({type:Pt.UNDIRECTED_EDGE,nodes:[i,a]}),bf(e,r,n),e.edgeCount++,a}else{var s=pn(),l=r,u=pn();return s.checks.push({type:Pt.NODE_NEIGHBOR,node:l,neighbor:u}),bf(e,r,s),u}},"populate")},{name:"child",separator:!0,regex:$r.child,populate:o(function(e,r){if(e.currentSubject==null){var n=pn(),i=pn(),a=e[e.length-1];return n.checks.push({type:Pt.CHILD,parent:a,child:i}),bf(e,r,n),e.compoundCount++,i}else if(e.currentSubject===r){var s=pn(),l=e[e.length-1],u=pn(),h=pn(),f=pn(),d=pn();return s.checks.push({type:Pt.COMPOUND_SPLIT,left:l,right:u,subject:h}),h.checks=r.checks,r.checks=[{type:Pt.TRUE}],d.checks.push({type:Pt.TRUE}),u.checks.push({type:Pt.PARENT,parent:d,child:f}),bf(e,l,s),e.currentSubject=h,e.compoundCount++,f}else{var p=pn(),m=pn(),g=[{type:Pt.PARENT,parent:p,child:m}];return p.checks=r.checks,r.checks=g,e.compoundCount++,m}},"populate")},{name:"descendant",separator:!0,regex:$r.descendant,populate:o(function(e,r){if(e.currentSubject==null){var n=pn(),i=pn(),a=e[e.length-1];return n.checks.push({type:Pt.DESCENDANT,ancestor:a,descendant:i}),bf(e,r,n),e.compoundCount++,i}else if(e.currentSubject===r){var s=pn(),l=e[e.length-1],u=pn(),h=pn(),f=pn(),d=pn();return s.checks.push({type:Pt.COMPOUND_SPLIT,left:l,right:u,subject:h}),h.checks=r.checks,r.checks=[{type:Pt.TRUE}],d.checks.push({type:Pt.TRUE}),u.checks.push({type:Pt.ANCESTOR,ancestor:d,descendant:f}),bf(e,l,s),e.currentSubject=h,e.compoundCount++,f}else{var p=pn(),m=pn(),g=[{type:Pt.ANCESTOR,ancestor:p,descendant:m}];return p.checks=r.checks,r.checks=g,e.compoundCount++,m}},"populate")},{name:"subject",modifier:!0,regex:$r.subject,populate:o(function(e,r){if(e.currentSubject!=null&&e.currentSubject!==r)return on("Redefinition of subject in selector `"+e.toString()+"`"),!1;e.currentSubject=r;var n=e[e.length-1],i=n.checks[0],a=i==null?null:i.type;a===Pt.DIRECTED_EDGE?i.type=Pt.NODE_TARGET:a===Pt.UNDIRECTED_EDGE&&(i.type=Pt.NODE_NEIGHBOR,i.node=i.nodes[1],i.neighbor=i.nodes[0],i.nodes=null)},"populate")}];VP.forEach(function(t){return t.regexObj=new RegExp("^"+t.regex)});JZe=o(function(e){for(var r,n,i,a=0;a<VP.length;a++){var s=VP[a],l=s.name,u=e.match(s.regexObj);if(u!=null){n=u,r=s,i=l;var h=u[0];e=e.substring(h.length);break}}return{expr:r,match:n,name:i,remaining:e}},"consumeExpr"),eJe=o(function(e){var r=e.match(/^\s+/);if(r){var n=r[0];e=e.substring(n.length)}return e},"consumeWhitespace"),tJe=o(function(e){var r=this,n=r.inputText=e,i=r[0]=pn();for(r.length=1,n=eJe(n);;){var a=JZe(n);if(a.expr==null)return on("The selector `"+e+"`is invalid"),!1;var s=a.match.slice(1),l=a.expr.populate(r,i,s);if(l===!1)return!1;if(l!=null&&(i=l),n=a.remaining,n.match(/^\s*$/))break}var u=r[r.length-1];r.currentSubject!=null&&(u.subject=r.currentSubject),u.edgeCount=r.edgeCount,u.compoundCount=r.compoundCount;for(var h=0;h<r.length;h++){var f=r[h];if(f.compoundCount>0&&f.edgeCount>0)return on("The selector `"+e+"` is invalid because it uses both a compound selector and an edge selector"),!1;if(f.edgeCount>1)return on("The selector `"+e+"` is invalid because it uses multiple edge selectors"),!1;f.edgeCount===1&&on("The selector `"+e+"` is deprecated. Edge selectors do not take effect on changes to source and target nodes after an edge is added, for performance reasons. Use a class or data selector on edges instead, updating the class or data of an edge when your app detects a change in source or target nodes.")}return!0},"parse"),rJe=o(function(){if(this.toStringCache!=null)return this.toStringCache;for(var e=o(function(f){return f??""},"clean"),r=o(function(f){return Zt(f)?'"'+f+'"':e(f)},"cleanVal"),n=o(function(f){return" "+f+" "},"space"),i=o(function(f,d){var p=f.type,m=f.value;switch(p){case Pt.GROUP:{var g=e(m);return g.substring(0,g.length-1)}case Pt.DATA_COMPARE:{var y=f.field,v=f.operator;return"["+y+n(e(v))+r(m)+"]"}case Pt.DATA_BOOL:{var x=f.operator,b=f.field;return"["+e(x)+b+"]"}case Pt.DATA_EXIST:{var w=f.field;return"["+w+"]"}case Pt.META_COMPARE:{var _=f.operator,T=f.field;return"[["+T+n(e(_))+r(m)+"]]"}case Pt.STATE:return m;case Pt.ID:return"#"+m;case Pt.CLASS:return"."+m;case Pt.PARENT:case Pt.CHILD:return a(f.parent,d)+n(">")+a(f.child,d);case Pt.ANCESTOR:case Pt.DESCENDANT:return a(f.ancestor,d)+" "+a(f.descendant,d);case Pt.COMPOUND_SPLIT:{var E=a(f.left,d),L=a(f.subject,d),C=a(f.right,d);return E+(E.length>0?" ":"")+L+C}case Pt.TRUE:return""}},"checkToString"),a=o(function(f,d){return f.checks.reduce(function(p,m,g){return p+(d===f&&g===0?"$":"")+i(m,d)},"")},"queryToString"),s="",l=0;l<this.length;l++){var u=this[l];s+=a(u,u.subject),this.length>1&&l<this.length-1&&(s+=", ")}return this.toStringCache=s,s},"toString"),nJe={parse:tJe,toString:rJe},Mge=o(function(e,r,n){var i,a=Zt(e),s=xt(e),l=Zt(n),u,h,f=!1,d=!1,p=!1;switch(r.indexOf("!")>=0&&(r=r.replace("!",""),d=!0),r.indexOf("@")>=0&&(r=r.replace("@",""),f=!0),(a||l||f)&&(u=!a&&!s?"":""+e,h=""+n),f&&(e=u=u.toLowerCase(),n=h=h.toLowerCase()),r){case"*=":i=u.indexOf(h)>=0;break;case"$=":i=u.indexOf(h,u.length-h.length)>=0;break;case"^=":i=u.indexOf(h)===0;break;case"=":i=e===n;break;case">":p=!0,i=e>n;break;case">=":p=!0,i=e>=n;break;case"<":p=!0,i=e<n;break;case"<=":p=!0,i=e<=n;break;default:i=!1;break}return d&&(e!=null||!p)&&(i=!i),i},"valCmp"),iJe=o(function(e,r){switch(r){case"?":return!!e;case"!":return!e;case"^":return e===void 0}},"boolCmp"),aJe=o(function(e){return e!==void 0},"existCmp"),dB=o(function(e,r){return e.data(r)},"data"),sJe=o(function(e,r){return e[r]()},"meta"),fi=[],zn=o(function(e,r){return e.checks.every(function(n){return fi[n.type](n,r)})},"matches");fi[Pt.GROUP]=function(t,e){var r=t.value;return r==="*"||r===e.group()};fi[Pt.STATE]=function(t,e){var r=t.value;return QZe(r,e)};fi[Pt.ID]=function(t,e){var r=t.value;return e.id()===r};fi[Pt.CLASS]=function(t,e){var r=t.value;return e.hasClass(r)};fi[Pt.META_COMPARE]=function(t,e){var r=t.field,n=t.operator,i=t.value;return Mge(sJe(e,r),n,i)};fi[Pt.DATA_COMPARE]=function(t,e){var r=t.field,n=t.operator,i=t.value;return Mge(dB(e,r),n,i)};fi[Pt.DATA_BOOL]=function(t,e){var r=t.field,n=t.operator;return iJe(dB(e,r),n)};fi[Pt.DATA_EXIST]=function(t,e){var r=t.field;return t.operator,aJe(dB(e,r))};fi[Pt.UNDIRECTED_EDGE]=function(t,e){var r=t.nodes[0],n=t.nodes[1],i=e.source(),a=e.target();return zn(r,i)&&zn(n,a)||zn(n,i)&&zn(r,a)};fi[Pt.NODE_NEIGHBOR]=function(t,e){return zn(t.node,e)&&e.neighborhood().some(function(r){return r.isNode()&&zn(t.neighbor,r)})};fi[Pt.DIRECTED_EDGE]=function(t,e){return zn(t.source,e.source())&&zn(t.target,e.target())};fi[Pt.NODE_SOURCE]=function(t,e){return zn(t.source,e)&&e.outgoers().some(function(r){return r.isNode()&&zn(t.target,r)})};fi[Pt.NODE_TARGET]=function(t,e){return zn(t.target,e)&&e.incomers().some(function(r){return r.isNode()&&zn(t.source,r)})};fi[Pt.CHILD]=function(t,e){return zn(t.child,e)&&zn(t.parent,e.parent())};fi[Pt.PARENT]=function(t,e){return zn(t.parent,e)&&e.children().some(function(r){return zn(t.child,r)})};fi[Pt.DESCENDANT]=function(t,e){return zn(t.descendant,e)&&e.ancestors().some(function(r){return zn(t.ancestor,r)})};fi[Pt.ANCESTOR]=function(t,e){return zn(t.ancestor,e)&&e.descendants().some(function(r){return zn(t.descendant,r)})};fi[Pt.COMPOUND_SPLIT]=function(t,e){return zn(t.subject,e)&&zn(t.left,e)&&zn(t.right,e)};fi[Pt.TRUE]=function(){return!0};fi[Pt.COLLECTION]=function(t,e){var r=t.value;return r.has(e)};fi[Pt.FILTER]=function(t,e){var r=t.value;return r(e)};oJe=o(function(e){var r=this;if(r.length===1&&r[0].checks.length===1&&r[0].checks[0].type===Pt.ID)return e.getElementById(r[0].checks[0].value).collection();var n=o(function(a){for(var s=0;s<r.length;s++){var l=r[s];if(zn(l,a))return!0}return!1},"selectorFunction");return r.text()==null&&(n=o(function(){return!0},"selectorFunction")),e.filter(n)},"filter"),lJe=o(function(e){for(var r=this,n=0;n<r.length;n++){var i=r[n];if(zn(i,e))return!0}return!1},"matches"),cJe={matches:lJe,filter:oJe},Af=o(function(e){this.inputText=e,this.currentSubject=null,this.compoundCount=0,this.edgeCount=0,this.length=0,e==null||Zt(e)&&e.match(/^\s*$/)||(po(e)?this.addQuery({checks:[{type:Pt.COLLECTION,value:e.collection()}]}):ti(e)?this.addQuery({checks:[{type:Pt.FILTER,value:e}]}):Zt(e)?this.parse(e)||(this.invalid=!0):hi("A selector must be created from a string; found "))},"Selector"),_f=Af.prototype;[nJe,cJe].forEach(function(t){return ir(_f,t)});_f.text=function(){return this.inputText};_f.size=function(){return this.length};_f.eq=function(t){return this[t]};_f.sameText=function(t){return!this.invalid&&!t.invalid&&this.text()===t.text()};_f.addQuery=function(t){this[this.length++]=t};_f.selector=_f.toString;kf={allAre:o(function(e){var r=new Af(e);return this.every(function(n){return r.matches(n)})},"allAre"),is:o(function(e){var r=new Af(e);return this.some(function(n){return r.matches(n)})},"is"),some:o(function(e,r){for(var n=0;n<this.length;n++){var i=r?e.apply(r,[this[n],n,this]):e(this[n],n,this);if(i)return!0}return!1},"some"),every:o(function(e,r){for(var n=0;n<this.length;n++){var i=r?e.apply(r,[this[n],n,this]):e(this[n],n,this);if(!i)return!1}return!0},"every"),same:o(function(e){if(this===e)return!0;e=this.cy().collection(e);var r=this.length,n=e.length;return r!==n?!1:r===1?this[0]===e[0]:this.every(function(i){return e.hasElementWithId(i.id())})},"same"),anySame:o(function(e){return e=this.cy().collection(e),this.some(function(r){return e.hasElementWithId(r.id())})},"anySame"),allAreNeighbors:o(function(e){e=this.cy().collection(e);var r=this.neighborhood();return e.every(function(n){return r.hasElementWithId(n.id())})},"allAreNeighbors"),contains:o(function(e){e=this.cy().collection(e);var r=this;return e.every(function(n){return r.hasElementWithId(n.id())})},"contains")};kf.allAreNeighbours=kf.allAreNeighbors;kf.has=kf.contains;kf.equal=kf.equals=kf.same;al=o(function(e,r){return o(function(i,a,s,l){var u=i,h=this,f;if(u==null?f="":po(u)&&u.length===1&&(f=u.id()),h.length===1&&f){var d=h[0]._private,p=d.traversalCache=d.traversalCache||{},m=p[r]=p[r]||[],g=z0(f),y=m[g];return y||(m[g]=e.call(h,i,a,s,l))}else return e.call(h,i,a,s,l)},"traversalCache")},"cache"),h1={parent:o(function(e){var r=[];if(this.length===1){var n=this[0]._private.parent;if(n)return n}for(var i=0;i<this.length;i++){var a=this[i],s=a._private.parent;s&&r.push(s)}return this.spawn(r,!0).filter(e)},"parent"),parents:o(function(e){for(var r=[],n=this.parent();n.nonempty();){for(var i=0;i<n.length;i++){var a=n[i];r.push(a)}n=n.parent()}return this.spawn(r,!0).filter(e)},"parents"),commonAncestors:o(function(e){for(var r,n=0;n<this.length;n++){var i=this[n],a=i.parents();r=r||a,r=r.intersect(a)}return r.filter(e)},"commonAncestors"),orphans:o(function(e){return this.stdFilter(function(r){return r.isOrphan()}).filter(e)},"orphans"),nonorphans:o(function(e){return this.stdFilter(function(r){return r.isChild()}).filter(e)},"nonorphans"),children:al(function(t){for(var e=[],r=0;r<this.length;r++)for(var n=this[r],i=n._private.children,a=0;a<i.length;a++)e.push(i[a]);return this.spawn(e,!0).filter(t)},"children"),siblings:o(function(e){return this.parent().children().not(this).filter(e)},"siblings"),isParent:o(function(){var e=this[0];if(e)return e.isNode()&&e._private.children.length!==0},"isParent"),isChildless:o(function(){var e=this[0];if(e)return e.isNode()&&e._private.children.length===0},"isChildless"),isChild:o(function(){var e=this[0];if(e)return e.isNode()&&e._private.parent!=null},"isChild"),isOrphan:o(function(){var e=this[0];if(e)return e.isNode()&&e._private.parent==null},"isOrphan"),descendants:o(function(e){var r=[];function n(i){for(var a=0;a<i.length;a++){var s=i[a];r.push(s),s.children().nonempty()&&n(s.children())}}return o(n,"add"),n(this.children()),this.spawn(r,!0).filter(e)},"descendants")};o(pB,"forEachCompound");o(Ige,"addChildren");h1.forEachDown=function(t){var e=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0;return pB(this,t,e,Ige)};o(Oge,"addParent");h1.forEachUp=function(t){var e=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0;return pB(this,t,e,Oge)};o(uJe,"addParentAndChildren");h1.forEachUpAndDown=function(t){var e=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0;return pB(this,t,e,uJe)};h1.ancestors=h1.parents;Xx=Pge={data:sn.data({field:"data",bindingEvent:"data",allowBinding:!0,allowSetting:!0,settingEvent:"data",settingTriggersEvent:!0,triggerFnName:"trigger",allowGetting:!0,immutableKeys:{id:!0,source:!0,target:!0,parent:!0},updateStyle:!0}),removeData:sn.removeData({field:"data",event:"data",triggerFnName:"trigger",triggerEvent:!0,immutableKeys:{id:!0,source:!0,target:!0,parent:!0},updateStyle:!0}),scratch:sn.data({field:"scratch",bindingEvent:"scratch",allowBinding:!0,allowSetting:!0,settingEvent:"scratch",settingTriggersEvent:!0,triggerFnName:"trigger",allowGetting:!0,updateStyle:!0}),removeScratch:sn.removeData({field:"scratch",event:"scratch",triggerFnName:"trigger",triggerEvent:!0,updateStyle:!0}),rscratch:sn.data({field:"rscratch",allowBinding:!1,allowSetting:!0,settingTriggersEvent:!1,allowGetting:!0}),removeRscratch:sn.removeData({field:"rscratch",triggerEvent:!1}),id:o(function(){var e=this[0];if(e)return e._private.data.id},"id")};Xx.attr=Xx.data;Xx.removeAttr=Xx.removeData;hJe=Pge,I6={};o(DP,"defineDegreeFunction");ir(I6,{degree:DP(function(t,e){return e.source().same(e.target())?2:1}),indegree:DP(function(t,e){return e.target().same(t)?1:0}),outdegree:DP(function(t,e){return e.source().same(t)?1:0})});o(Qg,"defineDegreeBoundsFunction");ir(I6,{minDegree:Qg("degree",function(t,e){return t<e}),maxDegree:Qg("degree",function(t,e){return t>e}),minIndegree:Qg("indegree",function(t,e){return t<e}),maxIndegree:Qg("indegree",function(t,e){return t>e}),minOutdegree:Qg("outdegree",function(t,e){return t<e}),maxOutdegree:Qg("outdegree",function(t,e){return t>e})});ir(I6,{totalDegree:o(function(e){for(var r=0,n=this.nodes(),i=0;i<n.length;i++)r+=n[i].degree(e);return r},"totalDegree")});Fge=o(function(e,r,n){for(var i=0;i<e.length;i++){var a=e[i];if(!a.locked()){var s=a._private.position,l={x:r.x!=null?r.x-s.x:0,y:r.y!=null?r.y-s.y:0};a.isParent()&&!(l.x===0&&l.y===0)&&a.children().shift(l,n),a.dirtyBoundingBoxCache()}}},"beforePositionSet"),ome={field:"position",bindingEvent:"position",allowBinding:!0,allowSetting:!0,settingEvent:"position",settingTriggersEvent:!0,triggerFnName:"emitAndNotify",allowGetting:!0,validKeys:["x","y"],beforeGet:o(function(e){e.updateCompoundBounds()},"beforeGet"),beforeSet:o(function(e,r){Fge(e,r,!1)},"beforeSet"),onSet:o(function(e){e.dirtyCompoundBoundsCache()},"onSet"),canSet:o(function(e){return!e.locked()},"canSet")};Yl=Bge={position:sn.data(ome),silentPosition:sn.data(ir({},ome,{allowBinding:!1,allowSetting:!0,settingTriggersEvent:!1,allowGetting:!1,beforeSet:o(function(e,r){Fge(e,r,!0)},"beforeSet"),onSet:o(function(e){e.dirtyCompoundBoundsCache()},"onSet")})),positions:o(function(e,r){if(Vr(e))r?this.silentPosition(e):this.position(e);else if(ti(e)){var n=e,i=this.cy();i.startBatch();for(var a=0;a<this.length;a++){var s=this[a],l=void 0;(l=n(s,a))&&(r?s.silentPosition(l):s.position(l))}i.endBatch()}return this},"positions"),silentPositions:o(function(e){return this.positions(e,!0)},"silentPositions"),shift:o(function(e,r,n){var i;if(Vr(e)?(i={x:xt(e.x)?e.x:0,y:xt(e.y)?e.y:0},n=r):Zt(e)&&xt(r)&&(i={x:0,y:0},i[e]=r),i!=null){var a=this.cy();a.startBatch();for(var s=0;s<this.length;s++){var l=this[s];if(!(a.hasCompoundNodes()&&l.isChild()&&l.ancestors().anySame(this))){var u=l.position(),h={x:u.x+i.x,y:u.y+i.y};n?l.silentPosition(h):l.position(h)}}a.endBatch()}return this},"shift"),silentShift:o(function(e,r){return Vr(e)?this.shift(e,!0):Zt(e)&&xt(r)&&this.shift(e,r,!0),this},"silentShift"),renderedPosition:o(function(e,r){var n=this[0],i=this.cy(),a=i.zoom(),s=i.pan(),l=Vr(e)?e:void 0,u=l!==void 0||r!==void 0&&Zt(e);if(n&&n.isNode())if(u)for(var h=0;h<this.length;h++){var f=this[h];r!==void 0?f.position(e,(r-s[e])/a):l!==void 0&&f.position(uge(l,a,s))}else{var d=n.position();return l=L6(d,a,s),e===void 0?l:l[e]}else if(!u)return;return this},"renderedPosition"),relativePosition:o(function(e,r){var n=this[0],i=this.cy(),a=Vr(e)?e:void 0,s=a!==void 0||r!==void 0&&Zt(e),l=i.hasCompoundNodes();if(n&&n.isNode())if(s)for(var u=0;u<this.length;u++){var h=this[u],f=l?h.parent():null,d=f&&f.length>0,p=d;d&&(f=f[0]);var m=p?f.position():{x:0,y:0};r!==void 0?h.position(e,r+m[e]):a!==void 0&&h.position({x:a.x+m.x,y:a.y+m.y})}else{var g=n.position(),y=l?n.parent():null,v=y&&y.length>0,x=v;v&&(y=y[0]);var b=x?y.position():{x:0,y:0};return a={x:g.x-b.x,y:g.y-b.y},e===void 0?a:a[e]}else if(!s)return;return this},"relativePosition")};Yl.modelPosition=Yl.point=Yl.position;Yl.modelPositions=Yl.points=Yl.positions;Yl.renderedPoint=Yl.renderedPosition;Yl.relativePoint=Yl.relativePosition;fJe=Bge;o1=Df={};Df.renderedBoundingBox=function(t){var e=this.boundingBox(t),r=this.cy(),n=r.zoom(),i=r.pan(),a=e.x1*n+i.x,s=e.x2*n+i.x,l=e.y1*n+i.y,u=e.y2*n+i.y;return{x1:a,x2:s,y1:l,y2:u,w:s-a,h:u-l}};Df.dirtyCompoundBoundsCache=function(){var t=arguments.length>0&&arguments[0]!==void 0?arguments[0]:!1,e=this.cy();return!e.styleEnabled()||!e.hasCompoundNodes()?this:(this.forEachUp(function(r){if(r.isParent()){var n=r._private;n.compoundBoundsClean=!1,n.bbCache=null,t||r.emitAndNotify("bounds")}}),this)};Df.updateCompoundBounds=function(){var t=arguments.length>0&&arguments[0]!==void 0?arguments[0]:!1,e=this.cy();if(!e.styleEnabled()||!e.hasCompoundNodes())return this;if(!t&&e.batching())return this;function r(s){if(!s.isParent())return;var l=s._private,u=s.children(),h=s.pstyle("compound-sizing-wrt-labels").value==="include",f={width:{val:s.pstyle("min-width").pfValue,left:s.pstyle("min-width-bias-left"),right:s.pstyle("min-width-bias-right")},height:{val:s.pstyle("min-height").pfValue,top:s.pstyle("min-height-bias-top"),bottom:s.pstyle("min-height-bias-bottom")}},d=u.boundingBox({includeLabels:h,includeOverlays:!1,useCache:!1}),p=l.position;(d.w===0||d.h===0)&&(d={w:s.pstyle("width").pfValue,h:s.pstyle("height").pfValue},d.x1=p.x-d.w/2,d.x2=p.x+d.w/2,d.y1=p.y-d.h/2,d.y2=p.y+d.h/2);function m(A,I,D){var k=0,R=0,S=I+D;return A>0&&S>0&&(k=I/S*A,R=D/S*A),{biasDiff:k,biasComplementDiff:R}}o(m,"computeBiasValues");function g(A,I,D,k){if(D.units==="%")switch(k){case"width":return A>0?D.pfValue*A:0;case"height":return I>0?D.pfValue*I:0;case"average":return A>0&&I>0?D.pfValue*(A+I)/2:0;case"min":return A>0&&I>0?A>I?D.pfValue*I:D.pfValue*A:0;case"max":return A>0&&I>0?A>I?D.pfValue*A:D.pfValue*I:0;default:return 0}else return D.units==="px"?D.pfValue:0}o(g,"computePaddingValues");var y=f.width.left.value;f.width.left.units==="px"&&f.width.val>0&&(y=y*100/f.width.val);var v=f.width.right.value;f.width.right.units==="px"&&f.width.val>0&&(v=v*100/f.width.val);var x=f.height.top.value;f.height.top.units==="px"&&f.height.val>0&&(x=x*100/f.height.val);var b=f.height.bottom.value;f.height.bottom.units==="px"&&f.height.val>0&&(b=b*100/f.height.val);var w=m(f.width.val-d.w,y,v),_=w.biasDiff,T=w.biasComplementDiff,E=m(f.height.val-d.h,x,b),L=E.biasDiff,C=E.biasComplementDiff;l.autoPadding=g(d.w,d.h,s.pstyle("padding"),s.pstyle("padding-relative-to").value),l.autoWidth=Math.max(d.w,f.width.val),p.x=(-_+d.x1+d.x2+T)/2,l.autoHeight=Math.max(d.h,f.height.val),p.y=(-L+d.y1+d.y2+C)/2}o(r,"update");for(var n=0;n<this.length;n++){var i=this[n],a=i._private;(!a.compoundBoundsClean||t)&&(r(i),e.batching()||(a.compoundBoundsClean=!0))}return this};il=o(function(e){return e===1/0||e===-1/0?0:e},"noninf"),Hl=o(function(e,r,n,i,a){i-r===0||a-n===0||r==null||n==null||i==null||a==null||(e.x1=r<e.x1?r:e.x1,e.x2=i>e.x2?i:e.x2,e.y1=n<e.y1?n:e.y1,e.y2=a>e.y2?a:e.y2,e.w=e.x2-e.x1,e.h=e.y2-e.y1)},"updateBounds"),I0=o(function(e,r){return r==null?e:Hl(e,r.x1,r.y1,r.x2,r.y2)},"updateBoundsFromBox"),Nx=o(function(e,r,n){return Wl(e,r,n)},"prefixedProperty"),JE=o(function(e,r,n){if(!r.cy().headless()){var i=r._private,a=i.rstyle,s=a.arrowWidth/2,l=r.pstyle(n+"-arrow-shape").value,u,h;if(l!=="none"){n==="source"?(u=a.srcX,h=a.srcY):n==="target"?(u=a.tgtX,h=a.tgtY):(u=a.midX,h=a.midY);var f=i.arrowBounds=i.arrowBounds||{},d=f[n]=f[n]||{};d.x1=u-s,d.y1=h-s,d.x2=u+s,d.y2=h+s,d.w=d.x2-d.x1,d.h=d.y2-d.y1,a6(d,1),Hl(e,d.x1,d.y1,d.x2,d.y2)}}},"updateBoundsFromArrow"),NP=o(function(e,r,n){if(!r.cy().headless()){var i;n?i=n+"-":i="";var a=r._private,s=a.rstyle,l=r.pstyle(i+"label").strValue;if(l){var u=r.pstyle("text-halign"),h=r.pstyle("text-valign"),f=Nx(s,"labelWidth",n),d=Nx(s,"labelHeight",n),p=Nx(s,"labelX",n),m=Nx(s,"labelY",n),g=r.pstyle(i+"text-margin-x").pfValue,y=r.pstyle(i+"text-margin-y").pfValue,v=r.isEdge(),x=r.pstyle(i+"text-rotation"),b=r.pstyle("text-outline-width").pfValue,w=r.pstyle("text-border-width").pfValue,_=w/2,T=r.pstyle("text-background-padding").pfValue,E=2,L=d,C=f,A=C/2,I=L/2,D,k,R,S;if(v)D=p-A,k=p+A,R=m-I,S=m+I;else{switch(u.value){case"left":D=p-C,k=p;break;case"center":D=p-A,k=p+A;break;case"right":D=p,k=p+C;break}switch(h.value){case"top":R=m-L,S=m;break;case"center":R=m-I,S=m+I;break;case"bottom":R=m,S=m+L;break}}D+=g-Math.max(b,_)-T-E,k+=g+Math.max(b,_)+T+E,R+=y-Math.max(b,_)-T-E,S+=y+Math.max(b,_)+T+E;var O=n||"main",N=a.labelBounds,P=N[O]=N[O]||{};P.x1=D,P.y1=R,P.x2=k,P.y2=S,P.w=k-D,P.h=S-R;var F=v&&x.strValue==="autorotate",B=x.pfValue!=null&&x.pfValue!==0;if(F||B){var $=F?Nx(a.rstyle,"labelAngle",n):x.pfValue,z=Math.cos($),W=Math.sin($),j=(D+k)/2,K=(R+S)/2;if(!v){switch(u.value){case"left":j=k;break;case"right":j=D;break}switch(h.value){case"top":K=S;break;case"bottom":K=R;break}}var ie=o(function(ue,ce){return ue=ue-j,ce=ce-K,{x:ue*z-ce*W+j,y:ue*W+ce*z+K}},"rotate"),Q=ie(D,R),ee=ie(D,S),J=ie(k,R),H=ie(k,S);D=Math.min(Q.x,ee.x,J.x,H.x),k=Math.max(Q.x,ee.x,J.x,H.x),R=Math.min(Q.y,ee.y,J.y,H.y),S=Math.max(Q.y,ee.y,J.y,H.y)}var q=O+"Rot",Z=N[q]=N[q]||{};Z.x1=D,Z.y1=R,Z.x2=k,Z.y2=S,Z.w=k-D,Z.h=S-R,Hl(e,D,R,k,S),Hl(a.labelBounds.all,D,R,k,S)}return e}},"updateBoundsFromLabel"),dJe=o(function(e,r){if(!r.cy().headless()){var n=r.pstyle("outline-opacity").value,i=r.pstyle("outline-width").value;if(n>0&&i>0){var a=r.pstyle("outline-offset").value,s=r.pstyle("shape").value,l=i+a,u=(e.w+l*2)/e.w,h=(e.h+l*2)/e.h,f=0,d=0;["diamond","pentagon","round-triangle"].includes(s)?(u=(e.w+l*2.4)/e.w,d=-l/3.6):["concave-hexagon","rhomboid","right-rhomboid"].includes(s)?u=(e.w+l*2.4)/e.w:s==="star"?(u=(e.w+l*2.8)/e.w,h=(e.h+l*2.6)/e.h,d=-l/3.8):s==="triangle"?(u=(e.w+l*2.8)/e.w,h=(e.h+l*2.4)/e.h,d=-l/1.4):s==="vee"&&(u=(e.w+l*4.4)/e.w,h=(e.h+l*3.8)/e.h,d=-l*.5);var p=e.h*h-e.h,m=e.w*u-e.w;if(s6(e,[Math.ceil(p/2),Math.ceil(m/2)]),f!=0||d!==0){var g=Ije(e,f,d);fge(e,g)}}}},"updateBoundsFromOutline"),pJe=o(function(e,r){var n=e._private.cy,i=n.styleEnabled(),a=n.headless(),s=$s(),l=e._private,u=e.isNode(),h=e.isEdge(),f,d,p,m,g,y,v=l.rstyle,x=u&&i?e.pstyle("bounds-expansion").pfValue:[0],b=o(function(De){return De.pstyle("display").value!=="none"},"isDisplayed"),w=!i||b(e)&&(!h||b(e.source())&&b(e.target()));if(w){var _=0,T=0;i&&r.includeOverlays&&(_=e.pstyle("overlay-opacity").value,_!==0&&(T=e.pstyle("overlay-padding").value));var E=0,L=0;i&&r.includeUnderlays&&(E=e.pstyle("underlay-opacity").value,E!==0&&(L=e.pstyle("underlay-padding").value));var C=Math.max(T,L),A=0,I=0;if(i&&(A=e.pstyle("width").pfValue,I=A/2),u&&r.includeNodes){var D=e.position();g=D.x,y=D.y;var k=e.outerWidth(),R=k/2,S=e.outerHeight(),O=S/2;f=g-R,d=g+R,p=y-O,m=y+O,Hl(s,f,p,d,m),i&&r.includeOutlines&&dJe(s,e)}else if(h&&r.includeEdges)if(i&&!a){var N=e.pstyle("curve-style").strValue;if(f=Math.min(v.srcX,v.midX,v.tgtX),d=Math.max(v.srcX,v.midX,v.tgtX),p=Math.min(v.srcY,v.midY,v.tgtY),m=Math.max(v.srcY,v.midY,v.tgtY),f-=I,d+=I,p-=I,m+=I,Hl(s,f,p,d,m),N==="haystack"){var P=v.haystackPts;if(P&&P.length===2){if(f=P[0].x,p=P[0].y,d=P[1].x,m=P[1].y,f>d){var F=f;f=d,d=F}if(p>m){var B=p;p=m,m=B}Hl(s,f-I,p-I,d+I,m+I)}}else if(N==="bezier"||N==="unbundled-bezier"||N.endsWith("segments")||N.endsWith("taxi")){var $;switch(N){case"bezier":case"unbundled-bezier":$=v.bezierPts;break;case"segments":case"taxi":case"round-segments":case"round-taxi":$=v.linePts;break}if($!=null)for(var z=0;z<$.length;z++){var W=$[z];f=W.x-I,d=W.x+I,p=W.y-I,m=W.y+I,Hl(s,f,p,d,m)}}}else{var j=e.source(),K=j.position(),ie=e.target(),Q=ie.position();if(f=K.x,d=Q.x,p=K.y,m=Q.y,f>d){var ee=f;f=d,d=ee}if(p>m){var J=p;p=m,m=J}f-=I,d+=I,p-=I,m+=I,Hl(s,f,p,d,m)}if(i&&r.includeEdges&&h&&(JE(s,e,"mid-source"),JE(s,e,"mid-target"),JE(s,e,"source"),JE(s,e,"target")),i){var H=e.pstyle("ghost").value==="yes";if(H){var q=e.pstyle("ghost-offset-x").pfValue,Z=e.pstyle("ghost-offset-y").pfValue;Hl(s,s.x1+q,s.y1+Z,s.x2+q,s.y2+Z)}}var ae=l.bodyBounds=l.bodyBounds||{};Gpe(ae,s),s6(ae,x),a6(ae,1),i&&(f=s.x1,d=s.x2,p=s.y1,m=s.y2,Hl(s,f-C,p-C,d+C,m+C));var ue=l.overlayBounds=l.overlayBounds||{};Gpe(ue,s),s6(ue,x),a6(ue,1);var ce=l.labelBounds=l.labelBounds||{};ce.all!=null?Mje(ce.all):ce.all=$s(),i&&r.includeLabels&&(r.includeMainLabels&&NP(s,e,null),h&&(r.includeSourceLabels&&NP(s,e,"source"),r.includeTargetLabels&&NP(s,e,"target")))}return s.x1=il(s.x1),s.y1=il(s.y1),s.x2=il(s.x2),s.y2=il(s.y2),s.w=il(s.x2-s.x1),s.h=il(s.y2-s.y1),s.w>0&&s.h>0&&w&&(s6(s,x),a6(s,1)),s},"boundingBoxImpl"),zge=o(function(e){var r=0,n=o(function(s){return(s?1:0)<<r++},"tf"),i=0;return i+=n(e.incudeNodes),i+=n(e.includeEdges),i+=n(e.includeLabels),i+=n(e.includeMainLabels),i+=n(e.includeSourceLabels),i+=n(e.includeTargetLabels),i+=n(e.includeOverlays),i+=n(e.includeOutlines),i},"getKey"),Gge=o(function(e){if(e.isEdge()){var r=e.source().position(),n=e.target().position(),i=o(function(s){return Math.round(s)},"r");return eje([i(r.x),i(r.y),i(n.x),i(n.y)])}else return 0},"getBoundingBoxPosKey"),lme=o(function(e,r){var n=e._private,i,a=e.isEdge(),s=r==null?cme:zge(r),l=s===cme,u=Gge(e),h=n.bbCachePosKey===u,f=r.useCache&&h,d=o(function(y){return y._private.bbCache==null||y._private.styleDirty},"isDirty"),p=!f||d(e)||a&&d(e.source())||d(e.target());if(p?(h||e.recalculateRenderedStyle(f),i=pJe(e,jx),n.bbCache=i,n.bbCachePosKey=u):i=n.bbCache,!l){var m=e.isNode();i=$s(),(r.includeNodes&&m||r.includeEdges&&!m)&&(r.includeOverlays?I0(i,n.overlayBounds):I0(i,n.bodyBounds)),r.includeLabels&&(r.includeMainLabels&&(!a||r.includeSourceLabels&&r.includeTargetLabels)?I0(i,n.labelBounds.all):(r.includeMainLabels&&I0(i,n.labelBounds.mainRot),r.includeSourceLabels&&I0(i,n.labelBounds.sourceRot),r.includeTargetLabels&&I0(i,n.labelBounds.targetRot))),i.w=i.x2-i.x1,i.h=i.y2-i.y1}return i},"cachedBoundingBoxImpl"),jx={includeNodes:!0,includeEdges:!0,includeLabels:!0,includeMainLabels:!0,includeSourceLabels:!0,includeTargetLabels:!0,includeOverlays:!0,includeUnderlays:!0,includeOutlines:!0,useCache:!0},cme=zge(jx),ume=wa(jx);Df.boundingBox=function(t){var e;if(this.length===1&&this[0]._private.bbCache!=null&&!this[0]._private.styleDirty&&(t===void 0||t.useCache===void 0||t.useCache===!0))t===void 0?t=jx:t=ume(t),e=lme(this[0],t);else{e=$s(),t=t||jx;var r=ume(t),n=this,i=n.cy(),a=i.styleEnabled();if(a)for(var s=0;s<n.length;s++){var l=n[s],u=l._private,h=Gge(l),f=u.bbCachePosKey===h,d=r.useCache&&f&&!u.styleDirty;l.recalculateRenderedStyle(d)}this.updateCompoundBounds(!t.useCache);for(var p=0;p<n.length;p++){var m=n[p];I0(e,lme(m,r))}}return e.x1=il(e.x1),e.y1=il(e.y1),e.x2=il(e.x2),e.y2=il(e.y2),e.w=il(e.x2-e.x1),e.h=il(e.y2-e.y1),e};Df.dirtyBoundingBoxCache=function(){for(var t=0;t<this.length;t++){var e=this[t]._private;e.bbCache=null,e.bbCachePosKey=null,e.bodyBounds=null,e.overlayBounds=null,e.labelBounds.all=null,e.labelBounds.source=null,e.labelBounds.target=null,e.labelBounds.main=null,e.labelBounds.sourceRot=null,e.labelBounds.targetRot=null,e.labelBounds.mainRot=null,e.arrowBounds.source=null,e.arrowBounds.target=null,e.arrowBounds["mid-source"]=null,e.arrowBounds["mid-target"]=null}return this.emitAndNotify("bounds"),this};Df.boundingBoxAt=function(t){var e=this.nodes(),r=this.cy(),n=r.hasCompoundNodes(),i=r.collection();if(n&&(i=e.filter(function(h){return h.isParent()}),e=e.not(i)),Vr(t)){var a=t;t=o(function(){return a},"fn")}var s=o(function(f,d){return f._private.bbAtOldPos=t(f,d)},"storeOldPos"),l=o(function(f){return f._private.bbAtOldPos},"getOldPos");r.startBatch(),e.forEach(s).silentPositions(t),n&&(i.dirtyCompoundBoundsCache(),i.dirtyBoundingBoxCache(),i.updateCompoundBounds(!0));var u=Rje(this.boundingBox({useCache:!1}));return e.silentPositions(l),n&&(i.dirtyCompoundBoundsCache(),i.dirtyBoundingBoxCache(),i.updateCompoundBounds(!0)),r.endBatch(),u};o1.boundingbox=o1.bb=o1.boundingBox;o1.renderedBoundingbox=o1.renderedBoundingBox;mJe=Df;Bx=rb={};$ge=o(function(e){e.uppercaseName=Mpe(e.name),e.autoName="auto"+e.uppercaseName,e.labelName="label"+e.uppercaseName,e.outerName="outer"+e.uppercaseName,e.uppercaseOuterName=Mpe(e.outerName),Bx[e.name]=o(function(){var n=this[0],i=n._private,a=i.cy,s=a._private.styleEnabled;if(n)if(s){if(n.isParent())return n.updateCompoundBounds(),i[e.autoName]||0;var l=n.pstyle(e.name);switch(l.strValue){case"label":return n.recalculateRenderedStyle(),i.rstyle[e.labelName]||0;default:return l.pfValue}}else return 1},"dimImpl"),Bx["outer"+e.uppercaseName]=o(function(){var n=this[0],i=n._private,a=i.cy,s=a._private.styleEnabled;if(n)if(s){var l=n[e.name](),u=n.pstyle("border-width").pfValue,h=2*n.padding();return l+u+h}else return 1},"outerDimImpl"),Bx["rendered"+e.uppercaseName]=o(function(){var n=this[0];if(n){var i=n[e.name]();return i*this.cy().zoom()}},"renderedDimImpl"),Bx["rendered"+e.uppercaseOuterName]=o(function(){var n=this[0];if(n){var i=n[e.outerName]();return i*this.cy().zoom()}},"renderedOuterDimImpl")},"defineDimFns");$ge({name:"width"});$ge({name:"height"});rb.padding=function(){var t=this[0],e=t._private;return t.isParent()?(t.updateCompoundBounds(),e.autoPadding!==void 0?e.autoPadding:t.pstyle("padding").pfValue):t.pstyle("padding").pfValue};rb.paddedHeight=function(){var t=this[0];return t.height()+2*t.padding()};rb.paddedWidth=function(){var t=this[0];return t.width()+2*t.padding()};gJe=rb,yJe=o(function(e,r){if(e.isEdge())return r(e)},"ifEdge"),vJe=o(function(e,r){if(e.isEdge()){var n=e.cy();return L6(r(e),n.zoom(),n.pan())}},"ifEdgeRenderedPosition"),xJe=o(function(e,r){if(e.isEdge()){var n=e.cy(),i=n.pan(),a=n.zoom();return r(e).map(function(s){return L6(s,a,i)})}},"ifEdgeRenderedPositions"),bJe=o(function(e){return e.renderer().getControlPoints(e)},"controlPoints"),wJe=o(function(e){return e.renderer().getSegmentPoints(e)},"segmentPoints"),TJe=o(function(e){return e.renderer().getSourceEndpoint(e)},"sourceEndpoint"),kJe=o(function(e){return e.renderer().getTargetEndpoint(e)},"targetEndpoint"),EJe=o(function(e){return e.renderer().getEdgeMidpoint(e)},"midpoint"),hme={controlPoints:{get:bJe,mult:!0},segmentPoints:{get:wJe,mult:!0},sourceEndpoint:{get:TJe},targetEndpoint:{get:kJe},midpoint:{get:EJe}},SJe=o(function(e){return"rendered"+e[0].toUpperCase()+e.substr(1)},"renderedName"),CJe=Object.keys(hme).reduce(function(t,e){var r=hme[e],n=SJe(e);return t[e]=function(){return yJe(this,r.get)},r.mult?t[n]=function(){return xJe(this,r.get)}:t[n]=function(){return vJe(this,r.get)},t},{}),AJe=ir({},fJe,mJe,gJe,CJe);Vge=o(function(e,r){this.recycle(e,r)},"Event");o(Rx,"returnFalse");o(e6,"returnTrue");Vge.prototype={instanceString:o(function(){return"event"},"instanceString"),recycle:o(function(e,r){if(this.isImmediatePropagationStopped=this.isPropagationStopped=this.isDefaultPrevented=Rx,e!=null&&e.preventDefault?(this.type=e.type,this.isDefaultPrevented=e.defaultPrevented?e6:Rx):e!=null&&e.type?r=e:this.type=e,r!=null&&(this.originalEvent=r.originalEvent,this.type=r.type!=null?r.type:this.type,this.cy=r.cy,this.target=r.target,this.position=r.position,this.renderedPosition=r.renderedPosition,this.namespace=r.namespace,this.layout=r.layout),this.cy!=null&&this.position!=null&&this.renderedPosition==null){var n=this.position,i=this.cy.zoom(),a=this.cy.pan();this.renderedPosition={x:n.x*i+a.x,y:n.y*i+a.y}}this.timeStamp=e&&e.timeStamp||Date.now()},"recycle"),preventDefault:o(function(){this.isDefaultPrevented=e6;var e=this.originalEvent;e&&e.preventDefault&&e.preventDefault()},"preventDefault"),stopPropagation:o(function(){this.isPropagationStopped=e6;var e=this.originalEvent;e&&e.stopPropagation&&e.stopPropagation()},"stopPropagation"),stopImmediatePropagation:o(function(){this.isImmediatePropagationStopped=e6,this.stopPropagation()},"stopImmediatePropagation"),isDefaultPrevented:Rx,isPropagationStopped:Rx,isImmediatePropagationStopped:Rx};Uge=/^([^.]+)(\.(?:[^.]+))?$/,_Je=".*",Hge={qualifierCompare:o(function(e,r){return e===r},"qualifierCompare"),eventMatches:o(function(){return!0},"eventMatches"),addEventFields:o(function(){},"addEventFields"),callbackContext:o(function(e){return e},"callbackContext"),beforeEmit:o(function(){},"beforeEmit"),afterEmit:o(function(){},"afterEmit"),bubble:o(function(){return!1},"bubble"),parent:o(function(){return null},"parent"),context:null},fme=Object.keys(Hge),LJe={};o(O6,"Emitter");Lf=O6.prototype,Wge=o(function(e,r,n,i,a,s,l){ti(i)&&(a=i,i=null),l&&(s==null?s=l:s=ir({},s,l));for(var u=wn(n)?n:n.split(/\s+/),h=0;h<u.length;h++){var f=u[h];if(!Sf(f)){var d=f.match(Uge);if(d){var p=d[1],m=d[2]?d[2]:null,g=r(e,f,p,m,i,a,s);if(g===!1)break}}}},"forEachEvent"),dme=o(function(e,r){return e.addEventFields(e.context,r),new Vge(r.type,r)},"makeEventObj"),DJe=o(function(e,r,n){if(Kqe(n)){r(e,n);return}else if(Vr(n)){r(e,dme(e,n));return}for(var i=wn(n)?n:n.split(/\s+/),a=0;a<i.length;a++){var s=i[a];if(!Sf(s)){var l=s.match(Uge);if(l){var u=l[1],h=l[2]?l[2]:null,f=dme(e,{type:u,namespace:h,target:e.context});r(e,f)}}}},"forEachEventObj");Lf.on=Lf.addListener=function(t,e,r,n,i){return Wge(this,function(a,s,l,u,h,f,d){ti(f)&&a.listeners.push({event:s,callback:f,type:l,namespace:u,qualifier:h,conf:d})},t,e,r,n,i),this};Lf.one=function(t,e,r,n){return this.on(t,e,r,n,{one:!0})};Lf.removeListener=Lf.off=function(t,e,r,n){var i=this;this.emitting!==0&&(this.listeners=aje(this.listeners));for(var a=this.listeners,s=o(function(h){var f=a[h];Wge(i,function(d,p,m,g,y,v){if((f.type===m||t==="*")&&(!g&&f.namespace!==".*"||f.namespace===g)&&(!y||d.qualifierCompare(f.qualifier,y))&&(!v||f.callback===v))return a.splice(h,1),!1},t,e,r,n)},"_loop"),l=a.length-1;l>=0;l--)s(l);return this};Lf.removeAllListeners=function(){return this.removeListener("*")};Lf.emit=Lf.trigger=function(t,e,r){var n=this.listeners,i=n.length;return this.emitting++,wn(e)||(e=[e]),DJe(this,function(a,s){r!=null&&(n=[{event:s.event,type:s.type,namespace:s.namespace,callback:r}],i=n.length);for(var l=o(function(f){var d=n[f];if(d.type===s.type&&(!d.namespace||d.namespace===s.namespace||d.namespace===_Je)&&a.eventMatches(a.context,d,s)){var p=[s];e!=null&&oje(p,e),a.beforeEmit(a.context,d,s),d.conf&&d.conf.one&&(a.listeners=a.listeners.filter(function(y){return y!==d}));var m=a.callbackContext(a.context,d,s),g=d.callback.apply(m,p);a.afterEmit(a.context,d,s),g===!1&&(s.stopPropagation(),s.preventDefault())}},"_loop2"),u=0;u<i;u++)l(u);a.bubble(a.context)&&!s.isPropagationStopped()&&a.parent(a.context).emit(s,e)},t),this.emitting--,this};NJe={qualifierCompare:o(function(e,r){return e==null||r==null?e==null&&r==null:e.sameText(r)},"qualifierCompare"),eventMatches:o(function(e,r,n){var i=r.qualifier;return i!=null?e!==n.target&&Jx(n.target)&&i.matches(n.target):!0},"eventMatches"),addEventFields:o(function(e,r){r.cy=e.cy(),r.target=e},"addEventFields"),callbackContext:o(function(e,r,n){return r.qualifier!=null?n.target:e},"callbackContext"),beforeEmit:o(function(e,r){r.conf&&r.conf.once&&r.conf.onceCollection.removeListener(r.event,r.qualifier,r.callback)},"beforeEmit"),bubble:o(function(){return!0},"bubble"),parent:o(function(e){return e.isChild()?e.parent():e.cy()},"parent")},t6=o(function(e){return Zt(e)?new Af(e):e},"argSelector"),Yge={createEmitter:o(function(){for(var e=0;e<this.length;e++){var r=this[e],n=r._private;n.emitter||(n.emitter=new O6(NJe,r))}return this},"createEmitter"),emitter:o(function(){return this._private.emitter},"emitter"),on:o(function(e,r,n){for(var i=t6(r),a=0;a<this.length;a++){var s=this[a];s.emitter().on(e,i,n)}return this},"on"),removeListener:o(function(e,r,n){for(var i=t6(r),a=0;a<this.length;a++){var s=this[a];s.emitter().removeListener(e,i,n)}return this},"removeListener"),removeAllListeners:o(function(){for(var e=0;e<this.length;e++){var r=this[e];r.emitter().removeAllListeners()}return this},"removeAllListeners"),one:o(function(e,r,n){for(var i=t6(r),a=0;a<this.length;a++){var s=this[a];s.emitter().one(e,i,n)}return this},"one"),once:o(function(e,r,n){for(var i=t6(r),a=0;a<this.length;a++){var s=this[a];s.emitter().on(e,i,n,{once:!0,onceCollection:this})}},"once"),emit:o(function(e,r){for(var n=0;n<this.length;n++){var i=this[n];i.emitter().emit(e,r)}return this},"emit"),emitAndNotify:o(function(e,r){if(this.length!==0)return this.cy().notify(e,this),this.emit(e,r),this},"emitAndNotify")};sn.eventAliasesOn(Yge);qge={nodes:o(function(e){return this.filter(function(r){return r.isNode()}).filter(e)},"nodes"),edges:o(function(e){return this.filter(function(r){return r.isEdge()}).filter(e)},"edges"),byGroup:o(function(){for(var e=this.spawn(),r=this.spawn(),n=0;n<this.length;n++){var i=this[n];i.isNode()?e.push(i):r.push(i)}return{nodes:e,edges:r}},"byGroup"),filter:o(function(e,r){if(e===void 0)return this;if(Zt(e)||po(e))return new Af(e).filter(this);if(ti(e)){for(var n=this.spawn(),i=this,a=0;a<i.length;a++){var s=i[a],l=r?e.apply(r,[s,a,i]):e(s,a,i);l&&n.push(s)}return n}return this.spawn()},"filter"),not:o(function(e){if(e){Zt(e)&&(e=this.filter(e));for(var r=this.spawn(),n=0;n<this.length;n++){var i=this[n],a=e.has(i);a||r.push(i)}return r}else return this},"not"),absoluteComplement:o(function(){var e=this.cy();return e.mutableElements().not(this)},"absoluteComplement"),intersect:o(function(e){if(Zt(e)){var r=e;return this.filter(r)}for(var n=this.spawn(),i=this,a=e,s=this.length<e.length,l=s?i:a,u=s?a:i,h=0;h<l.length;h++){var f=l[h];u.has(f)&&n.push(f)}return n},"intersect"),xor:o(function(e){var r=this._private.cy;Zt(e)&&(e=r.$(e));var n=this.spawn(),i=this,a=e,s=o(function(u,h){for(var f=0;f<u.length;f++){var d=u[f],p=d._private.data.id,m=h.hasElementWithId(p);m||n.push(d)}},"add");return s(i,a),s(a,i),n},"xor"),diff:o(function(e){var r=this._private.cy;Zt(e)&&(e=r.$(e));var n=this.spawn(),i=this.spawn(),a=this.spawn(),s=this,l=e,u=o(function(f,d,p){for(var m=0;m<f.length;m++){var g=f[m],y=g._private.data.id,v=d.hasElementWithId(y);v?a.merge(g):p.push(g)}},"add");return u(s,l,n),u(l,s,i),{left:n,right:i,both:a}},"diff"),add:o(function(e){var r=this._private.cy;if(!e)return this;if(Zt(e)){var n=e;e=r.mutableElements().filter(n)}for(var i=this.spawnSelf(),a=0;a<e.length;a++){var s=e[a],l=!this.has(s);l&&i.push(s)}return i},"add"),merge:o(function(e){var r=this._private,n=r.cy;if(!e)return this;if(e&&Zt(e)){var i=e;e=n.mutableElements().filter(i)}for(var a=r.map,s=0;s<e.length;s++){var l=e[s],u=l._private.data.id,h=!a.has(u);if(h){var f=this.length++;this[f]=l,a.set(u,{ele:l,index:f})}}return this},"merge"),unmergeAt:o(function(e){var r=this[e],n=r.id(),i=this._private,a=i.map;this[e]=void 0,a.delete(n);var s=e===this.length-1;if(this.length>1&&!s){var l=this.length-1,u=this[l],h=u._private.data.id;this[l]=void 0,this[e]=u,a.set(h,{ele:u,index:e})}return this.length--,this},"unmergeAt"),unmergeOne:o(function(e){e=e[0];var r=this._private,n=e._private.data.id,i=r.map,a=i.get(n);if(!a)return this;var s=a.index;return this.unmergeAt(s),this},"unmergeOne"),unmerge:o(function(e){var r=this._private.cy;if(!e)return this;if(e&&Zt(e)){var n=e;e=r.mutableElements().filter(n)}for(var i=0;i<e.length;i++)this.unmergeOne(e[i]);return this},"unmerge"),unmergeBy:o(function(e){for(var r=this.length-1;r>=0;r--){var n=this[r];e(n)&&this.unmergeAt(r)}return this},"unmergeBy"),map:o(function(e,r){for(var n=[],i=this,a=0;a<i.length;a++){var s=i[a],l=r?e.apply(r,[s,a,i]):e(s,a,i);n.push(l)}return n},"map"),reduce:o(function(e,r){for(var n=r,i=this,a=0;a<i.length;a++)n=e(n,i[a],a,i);return n},"reduce"),max:o(function(e,r){for(var n=-1/0,i,a=this,s=0;s<a.length;s++){var l=a[s],u=r?e.apply(r,[l,s,a]):e(l,s,a);u>n&&(n=u,i=l)}return{value:n,ele:i}},"max"),min:o(function(e,r){for(var n=1/0,i,a=this,s=0;s<a.length;s++){var l=a[s],u=r?e.apply(r,[l,s,a]):e(l,s,a);u<n&&(n=u,i=l)}return{value:n,ele:i}},"min")},Qr=qge;Qr.u=Qr["|"]=Qr["+"]=Qr.union=Qr.or=Qr.add;Qr["\\"]=Qr["!"]=Qr["-"]=Qr.difference=Qr.relativeComplement=Qr.subtract=Qr.not;Qr.n=Qr["&"]=Qr["."]=Qr.and=Qr.intersection=Qr.intersect;Qr["^"]=Qr["(+)"]=Qr["(-)"]=Qr.symmetricDifference=Qr.symdiff=Qr.xor;Qr.fnFilter=Qr.filterFn=Qr.stdFilter=Qr.filter;Qr.complement=Qr.abscomp=Qr.absoluteComplement;RJe={isNode:o(function(){return this.group()==="nodes"},"isNode"),isEdge:o(function(){return this.group()==="edges"},"isEdge"),isLoop:o(function(){return this.isEdge()&&this.source()[0]===this.target()[0]},"isLoop"),isSimple:o(function(){return this.isEdge()&&this.source()[0]!==this.target()[0]},"isSimple"),group:o(function(){var e=this[0];if(e)return e._private.group},"group")},Xge=o(function(e,r){var n=e.cy(),i=n.hasCompoundNodes();function a(f){var d=f.pstyle("z-compound-depth");return d.value==="auto"?i?f.zDepth():0:d.value==="bottom"?-1:d.value==="top"?nB:0}o(a,"getDepth");var s=a(e)-a(r);if(s!==0)return s;function l(f){var d=f.pstyle("z-index-compare");return d.value==="auto"&&f.isNode()?1:0}o(l,"getEleDepth");var u=l(e)-l(r);if(u!==0)return u;var h=e.pstyle("z-index").value-r.pstyle("z-index").value;return h!==0?h:e.poolIndex()-r.poolIndex()},"zIndexSort"),b6={forEach:o(function(e,r){if(ti(e))for(var n=this.length,i=0;i<n;i++){var a=this[i],s=r?e.apply(r,[a,i,this]):e(a,i,this);if(s===!1)break}return this},"forEach"),toArray:o(function(){for(var e=[],r=0;r<this.length;r++)e.push(this[r]);return e},"toArray"),slice:o(function(e,r){var n=[],i=this.length;r==null&&(r=i),e==null&&(e=0),e<0&&(e=i+e),r<0&&(r=i+r);for(var a=e;a>=0&&a<r&&a<i;a++)n.push(this[a]);return this.spawn(n)},"slice"),size:o(function(){return this.length},"size"),eq:o(function(e){return this[e]||this.spawn()},"eq"),first:o(function(){return this[0]||this.spawn()},"first"),last:o(function(){return this[this.length-1]||this.spawn()},"last"),empty:o(function(){return this.length===0},"empty"),nonempty:o(function(){return!this.empty()},"nonempty"),sort:o(function(e){if(!ti(e))return this;var r=this.toArray().sort(e);return this.spawn(r)},"sort"),sortByZIndex:o(function(){return this.sort(Xge)},"sortByZIndex"),zDepth:o(function(){var e=this[0];if(e){var r=e._private,n=r.group;if(n==="nodes"){var i=r.data.parent?e.parents().size():0;return e.isParent()?i:nB-1}else{var a=r.source,s=r.target,l=a.zDepth(),u=s.zDepth();return Math.max(l,u,0)}}},"zDepth")};b6.each=b6.forEach;MJe=o(function(){var e="undefined",r=(typeof Symbol>"u"?"undefined":Yi(Symbol))!=e&&Yi(Symbol.iterator)!=e;r&&(b6[Symbol.iterator]=function(){var n=this,i={value:void 0,done:!1},a=0,s=this.length;return Hme({next:o(function(){return a<s?i.value=n[a++]:(i.value=void 0,i.done=!0),i},"next")},Symbol.iterator,function(){return this})})},"defineSymbolIterator");MJe();IJe=wa({nodeDimensionsIncludeLabels:!1}),l6={layoutDimensions:o(function(e){e=IJe(e);var r;if(!this.takesUpSpace())r={w:0,h:0};else if(e.nodeDimensionsIncludeLabels){var n=this.boundingBox();r={w:n.w,h:n.h}}else r={w:this.outerWidth(),h:this.outerHeight()};return(r.w===0||r.h===0)&&(r.w=r.h=1),r},"layoutDimensions"),layoutPositions:o(function(e,r,n){var i=this.nodes().filter(function(T){return!T.isParent()}),a=this.cy(),s=r.eles,l=o(function(E){return E.id()},"getMemoizeKey"),u=$x(n,l);e.emit({type:"layoutstart",layout:e}),e.animations=[];var h=o(function(E,L,C){var A={x:L.x1+L.w/2,y:L.y1+L.h/2},I={x:(C.x-A.x)*E,y:(C.y-A.y)*E};return{x:A.x+I.x,y:A.y+I.y}},"calculateSpacing"),f=r.spacingFactor&&r.spacingFactor!==1,d=o(function(){if(!f)return null;for(var E=$s(),L=0;L<i.length;L++){var C=i[L],A=u(C,L);Oje(E,A.x,A.y)}return E},"spacingBb"),p=d(),m=$x(function(T,E){var L=u(T,E);if(f){var C=Math.abs(r.spacingFactor);L=h(C,p,L)}return r.transform!=null&&(L=r.transform(T,L)),L},l);if(r.animate){for(var g=0;g<i.length;g++){var y=i[g],v=m(y,g),x=r.animateFilter==null||r.animateFilter(y,g);if(x){var b=y.animation({position:v,duration:r.animationDuration,easing:r.animationEasing});e.animations.push(b)}else y.position(v)}if(r.fit){var w=a.animation({fit:{boundingBox:s.boundingBoxAt(m),padding:r.padding},duration:r.animationDuration,easing:r.animationEasing});e.animations.push(w)}else if(r.zoom!==void 0&&r.pan!==void 0){var _=a.animation({zoom:r.zoom,pan:r.pan,duration:r.animationDuration,easing:r.animationEasing});e.animations.push(_)}e.animations.forEach(function(T){return T.play()}),e.one("layoutready",r.ready),e.emit({type:"layoutready",layout:e}),d1.all(e.animations.map(function(T){return T.promise()})).then(function(){e.one("layoutstop",r.stop),e.emit({type:"layoutstop",layout:e})})}else i.positions(m),r.fit&&a.fit(r.eles,r.padding),r.zoom!=null&&a.zoom(r.zoom),r.pan&&a.pan(r.pan),e.one("layoutready",r.ready),e.emit({type:"layoutready",layout:e}),e.one("layoutstop",r.stop),e.emit({type:"layoutstop",layout:e});return this},"layoutPositions"),layout:o(function(e){var r=this.cy();return r.makeLayout(ir({},e,{eles:this}))},"layout")};l6.createLayout=l6.makeLayout=l6.layout;o(jge,"styleCache");o(P6,"cacheStyleFunction");o(B6,"cachePrototypeStyleFunction");xa={recalculateRenderedStyle:o(function(e){var r=this.cy(),n=r.renderer(),i=r.styleEnabled();return n&&i&&n.recalculateRenderedStyle(this,e),this},"recalculateRenderedStyle"),dirtyStyleCache:o(function(){var e=this.cy(),r=o(function(a){return a._private.styleCache=null},"dirty");if(e.hasCompoundNodes()){var n;n=this.spawnSelf().merge(this.descendants()).merge(this.parents()),n.merge(n.connectedEdges()),n.forEach(r)}else this.forEach(function(i){r(i),i.connectedEdges().forEach(r)});return this},"dirtyStyleCache"),updateStyle:o(function(e){var r=this._private.cy;if(!r.styleEnabled())return this;if(r.batching()){var n=r._private.batchStyleEles;return n.merge(this),this}var i=r.hasCompoundNodes(),a=this;e=!!(e||e===void 0),i&&(a=this.spawnSelf().merge(this.descendants()).merge(this.parents()));var s=a;return e?s.emitAndNotify("style"):s.emit("style"),a.forEach(function(l){return l._private.styleDirty=!0}),this},"updateStyle"),cleanStyle:o(function(){var e=this.cy();if(e.styleEnabled())for(var r=0;r<this.length;r++){var n=this[r];n._private.styleDirty&&(n._private.styleDirty=!1,e.style().apply(n))}},"cleanStyle"),parsedStyle:o(function(e){var r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0,n=this[0],i=n.cy();if(i.styleEnabled()&&n){this.cleanStyle();var a=n._private.style[e];return a??(r?i.style().getDefaultProperty(e):null)}},"parsedStyle"),numericStyle:o(function(e){var r=this[0];if(r.cy().styleEnabled()&&r){var n=r.pstyle(e);return n.pfValue!==void 0?n.pfValue:n.value}},"numericStyle"),numericStyleUnits:o(function(e){var r=this[0];if(r.cy().styleEnabled()&&r)return r.pstyle(e).units},"numericStyleUnits"),renderedStyle:o(function(e){var r=this.cy();if(!r.styleEnabled())return this;var n=this[0];if(n)return r.style().getRenderedStyle(n,e)},"renderedStyle"),style:o(function(e,r){var n=this.cy();if(!n.styleEnabled())return this;var i=!1,a=n.style();if(Vr(e)){var s=e;a.applyBypass(this,s,i),this.emitAndNotify("style")}else if(Zt(e))if(r===void 0){var l=this[0];return l?a.getStylePropertyValue(l,e):void 0}else a.applyBypass(this,e,r,i),this.emitAndNotify("style");else if(e===void 0){var u=this[0];return u?a.getRawStyle(u):void 0}return this},"style"),removeStyle:o(function(e){var r=this.cy();if(!r.styleEnabled())return this;var n=!1,i=r.style(),a=this;if(e===void 0)for(var s=0;s<a.length;s++){var l=a[s];i.removeAllBypasses(l,n)}else{e=e.split(/\s+/);for(var u=0;u<a.length;u++){var h=a[u];i.removeBypasses(h,e,n)}}return this.emitAndNotify("style"),this},"removeStyle"),show:o(function(){return this.css("display","element"),this},"show"),hide:o(function(){return this.css("display","none"),this},"hide"),effectiveOpacity:o(function(){var e=this.cy();if(!e.styleEnabled())return 1;var r=e.hasCompoundNodes(),n=this[0];if(n){var i=n._private,a=n.pstyle("opacity").value;if(!r)return a;var s=i.data.parent?n.parents():null;if(s)for(var l=0;l<s.length;l++){var u=s[l],h=u.pstyle("opacity").value;a=h*a}return a}},"effectiveOpacity"),transparent:o(function(){var e=this.cy();if(!e.styleEnabled())return!1;var r=this[0],n=r.cy().hasCompoundNodes();if(r)return n?r.effectiveOpacity()===0:r.pstyle("opacity").value===0},"transparent"),backgrounding:o(function(){var e=this.cy();if(!e.styleEnabled())return!1;var r=this[0];return!!r._private.backgrounding},"backgrounding")};o(RP,"checkCompound");o(mB,"defineDerivedStateFunction");y1=P6("eleTakesUpSpace",function(t){return t.pstyle("display").value==="element"&&t.width()!==0&&(t.isNode()?t.height()!==0:!0)});xa.takesUpSpace=B6("takesUpSpace",mB({ok:y1}));OJe=P6("eleInteractive",function(t){return t.pstyle("events").value==="yes"&&t.pstyle("visibility").value==="visible"&&y1(t)}),PJe=P6("parentInteractive",function(t){return t.pstyle("visibility").value==="visible"&&y1(t)});xa.interactive=B6("interactive",mB({ok:OJe,parentOk:PJe,edgeOkViaNode:y1}));xa.noninteractive=function(){var t=this[0];if(t)return!t.interactive()};BJe=P6("eleVisible",function(t){return t.pstyle("visibility").value==="visible"&&t.pstyle("opacity").pfValue!==0&&y1(t)}),FJe=y1;xa.visible=B6("visible",mB({ok:BJe,edgeOkViaNode:FJe}));xa.hidden=function(){var t=this[0];if(t)return!t.visible()};xa.isBundledBezier=B6("isBundledBezier",function(){return this.cy().styleEnabled()?!this.removed()&&this.pstyle("curve-style").value==="bezier"&&this.takesUpSpace():!1});xa.bypass=xa.css=xa.style;xa.renderedCss=xa.renderedStyle;xa.removeBypass=xa.removeCss=xa.removeStyle;xa.pstyle=xa.parsedStyle;Ef={};o(pme,"defineSwitchFunction");o(v1,"defineSwitchSet");v1({field:"locked",overrideField:o(function(e){return e.cy().autolock()?!0:void 0},"overrideField"),on:"lock",off:"unlock"});v1({field:"grabbable",overrideField:o(function(e){return e.cy().autoungrabify()||e.pannable()?!1:void 0},"overrideField"),on:"grabify",off:"ungrabify"});v1({field:"selected",ableField:"selectable",overrideAble:o(function(e){return e.cy().autounselectify()?!1:void 0},"overrideAble"),on:"select",off:"unselect"});v1({field:"selectable",overrideField:o(function(e){return e.cy().autounselectify()?!1:void 0},"overrideField"),on:"selectify",off:"unselectify"});Ef.deselect=Ef.unselect;Ef.grabbed=function(){var t=this[0];if(t)return t._private.grabbed};v1({field:"active",on:"activate",off:"unactivate"});v1({field:"pannable",on:"panify",off:"unpanify"});Ef.inactive=function(){var t=this[0];if(t)return!t._private.active};Ba={},mme=o(function(e){return o(function(n){for(var i=this,a=[],s=0;s<i.length;s++){var l=i[s];if(l.isNode()){for(var u=!1,h=l.connectedEdges(),f=0;f<h.length;f++){var d=h[f],p=d.source(),m=d.target();if(e.noIncomingEdges&&m===l&&p!==l||e.noOutgoingEdges&&p===l&&m!==l){u=!0;break}}u||a.push(l)}}return this.spawn(a,!0).filter(n)},"dagExtremityImpl")},"defineDagExtremity"),gme=o(function(e){return function(r){for(var n=this,i=[],a=0;a<n.length;a++){var s=n[a];if(s.isNode())for(var l=s.connectedEdges(),u=0;u<l.length;u++){var h=l[u],f=h.source(),d=h.target();e.outgoing&&f===s?(i.push(h),i.push(d)):e.incoming&&d===s&&(i.push(h),i.push(f))}}return this.spawn(i,!0).filter(r)}},"defineDagOneHop"),yme=o(function(e){return function(r){for(var n=this,i=[],a={};;){var s=e.outgoing?n.outgoers():n.incomers();if(s.length===0)break;for(var l=!1,u=0;u<s.length;u++){var h=s[u],f=h.id();a[f]||(a[f]=!0,i.push(h),l=!0)}if(!l)break;n=s}return this.spawn(i,!0).filter(r)}},"defineDagAllHops");Ba.clearTraversalCache=function(){for(var t=0;t<this.length;t++)this[t]._private.traversalCache=null};ir(Ba,{roots:mme({noIncomingEdges:!0}),leaves:mme({noOutgoingEdges:!0}),outgoers:al(gme({outgoing:!0}),"outgoers"),successors:yme({outgoing:!0}),incomers:al(gme({incoming:!0}),"incomers"),predecessors:yme({incoming:!0})});ir(Ba,{neighborhood:al(function(t){for(var e=[],r=this.nodes(),n=0;n<r.length;n++)for(var i=r[n],a=i.connectedEdges(),s=0;s<a.length;s++){var l=a[s],u=l.source(),h=l.target(),f=i===u?h:u;f.length>0&&e.push(f[0]),e.push(l[0])}return this.spawn(e,!0).filter(t)},"neighborhood"),closedNeighborhood:o(function(e){return this.neighborhood().add(this).filter(e)},"closedNeighborhood"),openNeighborhood:o(function(e){return this.neighborhood(e)},"openNeighborhood")});Ba.neighbourhood=Ba.neighborhood;Ba.closedNeighbourhood=Ba.closedNeighborhood;Ba.openNeighbourhood=Ba.openNeighborhood;ir(Ba,{source:al(o(function(e){var r=this[0],n;return r&&(n=r._private.source||r.cy().collection()),n&&e?n.filter(e):n},"sourceImpl"),"source"),target:al(o(function(e){var r=this[0],n;return r&&(n=r._private.target||r.cy().collection()),n&&e?n.filter(e):n},"targetImpl"),"target"),sources:vme({attr:"source"}),targets:vme({attr:"target"})});o(vme,"defineSourceFunction");ir(Ba,{edgesWith:al(xme(),"edgesWith"),edgesTo:al(xme({thisIsSrc:!0}),"edgesTo")});o(xme,"defineEdgesWithFunction");ir(Ba,{connectedEdges:al(function(t){for(var e=[],r=this,n=0;n<r.length;n++){var i=r[n];if(i.isNode())for(var a=i._private.edges,s=0;s<a.length;s++){var l=a[s];e.push(l)}}return this.spawn(e,!0).filter(t)},"connectedEdges"),connectedNodes:al(function(t){for(var e=[],r=this,n=0;n<r.length;n++){var i=r[n];i.isEdge()&&(e.push(i.source()[0]),e.push(i.target()[0]))}return this.spawn(e,!0).filter(t)},"connectedNodes"),parallelEdges:al(bme(),"parallelEdges"),codirectedEdges:al(bme({codirected:!0}),"codirectedEdges")});o(bme,"defineParallelEdgesFunction");ir(Ba,{components:o(function(e){var r=this,n=r.cy(),i=n.collection(),a=e==null?r.nodes():e.nodes(),s=[];e!=null&&a.empty()&&(a=e.sources());var l=o(function(f,d){i.merge(f),a.unmerge(f),d.merge(f)},"visitInComponent");if(a.empty())return r.spawn();var u=o(function(){var f=n.collection();s.push(f);var d=a[0];l(d,f),r.bfs({directed:!1,roots:d,visit:o(function(m){return l(m,f)},"visit")}),f.forEach(function(p){p.connectedEdges().forEach(function(m){r.has(m)&&f.has(m.source())&&f.has(m.target())&&f.merge(m)})})},"_loop");do u();while(a.length>0);return s},"components"),component:o(function(){var e=this[0];return e.cy().mutableElements().components(e)[0]},"component")});Ba.componentsOf=Ba.components;ba=o(function(e,r){var n=arguments.length>2&&arguments[2]!==void 0?arguments[2]:!1,i=arguments.length>3&&arguments[3]!==void 0?arguments[3]:!1;if(e===void 0){hi("A collection must have a reference to the core");return}var a=new Uc,s=!1;if(!r)r=[];else if(r.length>0&&Vr(r[0])&&!Jx(r[0])){s=!0;for(var l=[],u=new f1,h=0,f=r.length;h<f;h++){var d=r[h];d.data==null&&(d.data={});var p=d.data;if(p.id==null)p.id=lge();else if(e.hasElementWithId(p.id)||u.has(p.id))continue;var m=new _6(e,d,!1);l.push(m),u.add(p.id)}r=l}this.length=0;for(var g=0,y=r.length;g<y;g++){var v=r[g][0];if(v!=null){var x=v._private.data.id;(!n||!a.has(x))&&(n&&a.set(x,{index:this.length,ele:v}),this[this.length]=v,this.length++)}}this._private={eles:this,cy:e,get map(){return this.lazyMap==null&&this.rebuildMap(),this.lazyMap},set map(b){this.lazyMap=b},rebuildMap:o(function(){for(var w=this.lazyMap=new Uc,_=this.eles,T=0;T<_.length;T++){var E=_[T];w.set(E.id(),{index:T,ele:E})}},"rebuildMap")},n&&(this._private.map=a),s&&!i&&this.restore()},"Collection"),Nn=_6.prototype=ba.prototype=Object.create(Array.prototype);Nn.instanceString=function(){return"collection"};Nn.spawn=function(t,e){return new ba(this.cy(),t,e)};Nn.spawnSelf=function(){return this.spawn(this)};Nn.cy=function(){return this._private.cy};Nn.renderer=function(){return this._private.cy.renderer()};Nn.element=function(){return this[0]};Nn.collection=function(){return Xme(this)?this:new ba(this._private.cy,[this])};Nn.unique=function(){return new ba(this._private.cy,this,!0)};Nn.hasElementWithId=function(t){return t=""+t,this._private.map.has(t)};Nn.getElementById=function(t){t=""+t;var e=this._private.cy,r=this._private.map.get(t);return r?r.ele:new ba(e)};Nn.$id=Nn.getElementById;Nn.poolIndex=function(){var t=this._private.cy,e=t._private.elements,r=this[0]._private.data.id;return e._private.map.get(r).index};Nn.indexOf=function(t){var e=t[0]._private.data.id;return this._private.map.get(e).index};Nn.indexOfId=function(t){return t=""+t,this._private.map.get(t).index};Nn.json=function(t){var e=this.element(),r=this.cy();if(e==null&&t)return this;if(e!=null){var n=e._private;if(Vr(t)){if(r.startBatch(),t.data){e.data(t.data);var i=n.data;if(e.isEdge()){var a=!1,s={},l=t.data.source,u=t.data.target;l!=null&&l!=i.source&&(s.source=""+l,a=!0),u!=null&&u!=i.target&&(s.target=""+u,a=!0),a&&(e=e.move(s))}else{var h="parent"in t.data,f=t.data.parent;h&&(f!=null||i.parent!=null)&&f!=i.parent&&(f===void 0&&(f=null),f!=null&&(f=""+f),e=e.move({parent:f}))}}t.position&&e.position(t.position);var d=o(function(y,v,x){var b=t[y];b!=null&&b!==n[y]&&(b?e[v]():e[x]())},"checkSwitch");return d("removed","remove","restore"),d("selected","select","unselect"),d("selectable","selectify","unselectify"),d("locked","lock","unlock"),d("grabbable","grabify","ungrabify"),d("pannable","panify","unpanify"),t.classes!=null&&e.classes(t.classes),r.endBatch(),this}else if(t===void 0){var p={data:Vc(n.data),position:Vc(n.position),group:n.group,removed:n.removed,selected:n.selected,selectable:n.selectable,locked:n.locked,grabbable:n.grabbable,pannable:n.pannable,classes:null};p.classes="";var m=0;return n.classes.forEach(function(g){return p.classes+=m++===0?g:" "+g}),p}}};Nn.jsons=function(){for(var t=[],e=0;e<this.length;e++){var r=this[e],n=r.json();t.push(n)}return t};Nn.clone=function(){for(var t=this.cy(),e=[],r=0;r<this.length;r++){var n=this[r],i=n.json(),a=new _6(t,i,!1);e.push(a)}return new ba(t,e)};Nn.copy=Nn.clone;Nn.restore=function(){for(var t=arguments.length>0&&arguments[0]!==void 0?arguments[0]:!0,e=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0,r=this,n=r.cy(),i=n._private,a=[],s=[],l,u=0,h=r.length;u<h;u++){var f=r[u];e&&!f.removed()||(f.isNode()?a.push(f):s.push(f))}l=a.concat(s);var d,p=o(function(){l.splice(d,1),d--},"removeFromElements");for(d=0;d<l.length;d++){var m=l[d],g=m._private,y=g.data;if(m.clearTraversalCache(),!(!e&&!g.removed)){if(y.id===void 0)y.id=lge();else if(xt(y.id))y.id=""+y.id;else if(Sf(y.id)||!Zt(y.id)){hi("Can not create element with invalid string ID `"+y.id+"`"),p();continue}else if(n.hasElementWithId(y.id)){hi("Can not create second element with ID `"+y.id+"`"),p();continue}}var v=y.id;if(m.isNode()){var x=g.position;x.x==null&&(x.x=0),x.y==null&&(x.y=0)}if(m.isEdge()){for(var b=m,w=["source","target"],_=w.length,T=!1,E=0;E<_;E++){var L=w[E],C=y[L];xt(C)&&(C=y[L]=""+y[L]),C==null||C===""?(hi("Can not create edge `"+v+"` with unspecified "+L),T=!0):n.hasElementWithId(C)||(hi("Can not create edge `"+v+"` with nonexistant "+L+" `"+C+"`"),T=!0)}if(T){p();continue}var A=n.getElementById(y.source),I=n.getElementById(y.target);A.same(I)?A._private.edges.push(b):(A._private.edges.push(b),I._private.edges.push(b)),b._private.source=A,b._private.target=I}g.map=new Uc,g.map.set(v,{ele:m,index:0}),g.removed=!1,e&&n.addToPool(m)}for(var D=0;D<a.length;D++){var k=a[D],R=k._private.data;xt(R.parent)&&(R.parent=""+R.parent);var S=R.parent,O=S!=null;if(O||k._private.parent){var N=k._private.parent?n.collection().merge(k._private.parent):n.getElementById(S);if(N.empty())R.parent=void 0;else if(N[0].removed())on("Node added with missing parent, reference to parent removed"),R.parent=void 0,k._private.parent=null;else{for(var P=!1,F=N;!F.empty();){if(k.same(F)){P=!0,R.parent=void 0;break}F=F.parent()}P||(N[0]._private.children.push(k),k._private.parent=N[0],i.hasCompoundNodes=!0)}}}if(l.length>0){for(var B=l.length===r.length?r:new ba(n,l),$=0;$<B.length;$++){var z=B[$];z.isNode()||(z.parallelEdges().clearTraversalCache(),z.source().clearTraversalCache(),z.target().clearTraversalCache())}var W;i.hasCompoundNodes?W=n.collection().merge(B).merge(B.connectedNodes()).merge(B.parent()):W=B,W.dirtyCompoundBoundsCache().dirtyBoundingBoxCache().updateStyle(t),t?B.emitAndNotify("add"):e&&B.emit("add")}return r};Nn.removed=function(){var t=this[0];return t&&t._private.removed};Nn.inside=function(){var t=this[0];return t&&!t._private.removed};Nn.remove=function(){var t=arguments.length>0&&arguments[0]!==void 0?arguments[0]:!0,e=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0,r=this,n=[],i={},a=r._private.cy;function s(S){for(var O=S._private.edges,N=0;N<O.length;N++)u(O[N])}o(s,"addConnectedEdges");function l(S){for(var O=S._private.children,N=0;N<O.length;N++)u(O[N])}o(l,"addChildren");function u(S){var O=i[S.id()];e&&S.removed()||O||(i[S.id()]=!0,S.isNode()?(n.push(S),s(S),l(S)):n.unshift(S))}o(u,"add");for(var h=0,f=r.length;h<f;h++){var d=r[h];u(d)}function p(S,O){var N=S._private.edges;Cf(N,O),S.clearTraversalCache()}o(p,"removeEdgeRef");function m(S){S.clearTraversalCache()}o(m,"removeParallelRef");var g=[];g.ids={};function y(S,O){O=O[0],S=S[0];var N=S._private.children,P=S.id();Cf(N,O),O._private.parent=null,g.ids[P]||(g.ids[P]=!0,g.push(S))}o(y,"removeChildRef"),r.dirtyCompoundBoundsCache(),e&&a.removeFromPool(n);for(var v=0;v<n.length;v++){var x=n[v];if(x.isEdge()){var b=x.source()[0],w=x.target()[0];p(b,x),p(w,x);for(var _=x.parallelEdges(),T=0;T<_.length;T++){var E=_[T];m(E),E.isBundledBezier()&&E.dirtyBoundingBoxCache()}}else{var L=x.parent();L.length!==0&&y(L,x)}e&&(x._private.removed=!0)}var C=a._private.elements;a._private.hasCompoundNodes=!1;for(var A=0;A<C.length;A++){var I=C[A];if(I.isParent()){a._private.hasCompoundNodes=!0;break}}var D=new ba(this.cy(),n);D.size()>0&&(t?D.emitAndNotify("remove"):e&&D.emit("remove"));for(var k=0;k<g.length;k++){var R=g[k];(!e||!R.removed())&&R.updateStyle()}return D};Nn.move=function(t){var e=this._private.cy,r=this,n=!1,i=!1,a=o(function(g){return g==null?g:""+g},"toString");if(t.source!==void 0||t.target!==void 0){var s=a(t.source),l=a(t.target),u=s!=null&&e.hasElementWithId(s),h=l!=null&&e.hasElementWithId(l);(u||h)&&(e.batch(function(){r.remove(n,i),r.emitAndNotify("moveout");for(var m=0;m<r.length;m++){var g=r[m],y=g._private.data;g.isEdge()&&(u&&(y.source=s),h&&(y.target=l))}r.restore(n,i)}),r.emitAndNotify("move"))}else if(t.parent!==void 0){var f=a(t.parent),d=f===null||e.hasElementWithId(f);if(d){var p=f===null?void 0:f;e.batch(function(){var m=r.remove(n,i);m.emitAndNotify("moveout");for(var g=0;g<r.length;g++){var y=r[g],v=y._private.data;y.isNode()&&(v.parent=p)}m.restore(n,i)}),r.emitAndNotify("move")}}return this};[wge,jZe,o6,kf,h1,hJe,I6,AJe,Yge,qge,RJe,b6,l6,xa,Ef,Ba].forEach(function(t){ir(Nn,t)});zJe={add:o(function(e){var r,n=this;if(po(e)){var i=e;if(i._private.cy===n)r=i.restore();else{for(var a=[],s=0;s<i.length;s++){var l=i[s];a.push(l.json())}r=new ba(n,a)}}else if(wn(e)){var u=e;r=new ba(n,u)}else if(Vr(e)&&(wn(e.nodes)||wn(e.edges))){for(var h=e,f=[],d=["nodes","edges"],p=0,m=d.length;p<m;p++){var g=d[p],y=h[g];if(wn(y))for(var v=0,x=y.length;v<x;v++){var b=ir({group:g},y[v]);f.push(b)}}r=new ba(n,f)}else{var w=e;r=new _6(n,w).collection()}return r},"add"),remove:o(function(e){if(!po(e)){if(Zt(e)){var r=e;e=this.$(r)}}return e.remove()},"remove")};o(GJe,"generateCubicBezier");$Je=function(){function t(n){return-n.tension*n.x-n.friction*n.v}o(t,"springAccelerationForState");function e(n,i,a){var s={x:n.x+a.dx*i,v:n.v+a.dv*i,tension:n.tension,friction:n.friction};return{dx:s.v,dv:t(s)}}o(e,"springEvaluateStateWithDerivative");function r(n,i){var a={dx:n.v,dv:t(n)},s=e(n,i*.5,a),l=e(n,i*.5,s),u=e(n,i,l),h=1/6*(a.dx+2*(s.dx+l.dx)+u.dx),f=1/6*(a.dv+2*(s.dv+l.dv)+u.dv);return n.x=n.x+h*i,n.v=n.v+f*i,n}return o(r,"springIntegrateState"),o(function n(i,a,s){var l={x:-1,v:0,tension:null,friction:null},u=[0],h=0,f=1/1e4,d=16/1e3,p,m,g;for(i=parseFloat(i)||500,a=parseFloat(a)||20,s=s||null,l.tension=i,l.friction=a,p=s!==null,p?(h=n(i,a),m=h/s*d):m=d;g=r(g||l,m),u.push(1+g.x),h+=16,Math.abs(g.x)>f&&Math.abs(g.v)>f;);return p?function(y){return u[y*(u.length-1)|0]}:h},"springRK4Factory")}(),Dn=o(function(e,r,n,i){var a=GJe(e,r,n,i);return function(s,l,u){return s+(l-s)*a(u)}},"cubicBezier"),c6={linear:o(function(e,r,n){return e+(r-e)*n},"linear"),ease:Dn(.25,.1,.25,1),"ease-in":Dn(.42,0,1,1),"ease-out":Dn(0,0,.58,1),"ease-in-out":Dn(.42,0,.58,1),"ease-in-sine":Dn(.47,0,.745,.715),"ease-out-sine":Dn(.39,.575,.565,1),"ease-in-out-sine":Dn(.445,.05,.55,.95),"ease-in-quad":Dn(.55,.085,.68,.53),"ease-out-quad":Dn(.25,.46,.45,.94),"ease-in-out-quad":Dn(.455,.03,.515,.955),"ease-in-cubic":Dn(.55,.055,.675,.19),"ease-out-cubic":Dn(.215,.61,.355,1),"ease-in-out-cubic":Dn(.645,.045,.355,1),"ease-in-quart":Dn(.895,.03,.685,.22),"ease-out-quart":Dn(.165,.84,.44,1),"ease-in-out-quart":Dn(.77,0,.175,1),"ease-in-quint":Dn(.755,.05,.855,.06),"ease-out-quint":Dn(.23,1,.32,1),"ease-in-out-quint":Dn(.86,0,.07,1),"ease-in-expo":Dn(.95,.05,.795,.035),"ease-out-expo":Dn(.19,1,.22,1),"ease-in-out-expo":Dn(1,0,0,1),"ease-in-circ":Dn(.6,.04,.98,.335),"ease-out-circ":Dn(.075,.82,.165,1),"ease-in-out-circ":Dn(.785,.135,.15,.86),spring:o(function(e,r,n){if(n===0)return c6.linear;var i=$Je(e,r,n);return function(a,s,l){return a+(s-a)*i(l)}},"spring"),"cubic-bezier":Dn};o(wme,"getEasedValue");o(Tme,"getValue");o(Zg,"ease");o(VJe,"step$1");o(Mx,"valid");o(UJe,"startAnimation");o(kme,"stepAll");HJe={animate:sn.animate(),animation:sn.animation(),animated:sn.animated(),clearQueue:sn.clearQueue(),delay:sn.delay(),delayAnimation:sn.delayAnimation(),stop:sn.stop(),addToAnimationPool:o(function(e){var r=this;r.styleEnabled()&&r._private.aniEles.merge(e)},"addToAnimationPool"),stopAnimationLoop:o(function(){this._private.animationsRunning=!1},"stopAnimationLoop"),startAnimationLoop:o(function(){var e=this;if(e._private.animationsRunning=!0,!e.styleEnabled())return;function r(){e._private.animationsRunning&&m6(o(function(a){kme(a,e),r()},"animationStep"))}o(r,"headlessStep");var n=e.renderer();n&&n.beforeRender?n.beforeRender(o(function(a,s){kme(s,e)},"rendererAnimationStep"),n.beforeRenderPriorities.animations):r()},"startAnimationLoop")},WJe={qualifierCompare:o(function(e,r){return e==null||r==null?e==null&&r==null:e.sameText(r)},"qualifierCompare"),eventMatches:o(function(e,r,n){var i=r.qualifier;return i!=null?e!==n.target&&Jx(n.target)&&i.matches(n.target):!0},"eventMatches"),addEventFields:o(function(e,r){r.cy=e,r.target=e},"addEventFields"),callbackContext:o(function(e,r,n){return r.qualifier!=null?n.target:e},"callbackContext")},r6=o(function(e){return Zt(e)?new Af(e):e},"argSelector"),Kge={createEmitter:o(function(){var e=this._private;return e.emitter||(e.emitter=new O6(WJe,this)),this},"createEmitter"),emitter:o(function(){return this._private.emitter},"emitter"),on:o(function(e,r,n){return this.emitter().on(e,r6(r),n),this},"on"),removeListener:o(function(e,r,n){return this.emitter().removeListener(e,r6(r),n),this},"removeListener"),removeAllListeners:o(function(){return this.emitter().removeAllListeners(),this},"removeAllListeners"),one:o(function(e,r,n){return this.emitter().one(e,r6(r),n),this},"one"),once:o(function(e,r,n){return this.emitter().one(e,r6(r),n),this},"once"),emit:o(function(e,r){return this.emitter().emit(e,r),this},"emit"),emitAndNotify:o(function(e,r){return this.emit(e),this.notify(e,r),this},"emitAndNotify")};sn.eventAliasesOn(Kge);UP={png:o(function(e){var r=this._private.renderer;return e=e||{},r.png(e)},"png"),jpg:o(function(e){var r=this._private.renderer;return e=e||{},e.bg=e.bg||"#fff",r.jpg(e)},"jpg")};UP.jpeg=UP.jpg;u6={layout:o(function(e){var r=this;if(e==null){hi("Layout options must be specified to make a layout");return}if(e.name==null){hi("A `name` must be specified to make a layout");return}var n=e.name,i=r.extension("layout",n);if(i==null){hi("No such layout `"+n+"` found. Did you forget to import it and `cytoscape.use()` it?");return}var a;Zt(e.eles)?a=r.$(e.eles):a=e.eles!=null?e.eles:r.$();var s=new i(ir({},e,{cy:r,eles:a}));return s},"layout")};u6.createLayout=u6.makeLayout=u6.layout;YJe={notify:o(function(e,r){var n=this._private;if(this.batching()){n.batchNotifications=n.batchNotifications||{};var i=n.batchNotifications[e]=n.batchNotifications[e]||this.collection();r!=null&&i.merge(r);return}if(n.notificationsEnabled){var a=this.renderer();this.destroyed()||!a||a.notify(e,r)}},"notify"),notifications:o(function(e){var r=this._private;return e===void 0?r.notificationsEnabled:(r.notificationsEnabled=!!e,this)},"notifications"),noNotifications:o(function(e){this.notifications(!1),e(),this.notifications(!0)},"noNotifications"),batching:o(function(){return this._private.batchCount>0},"batching"),startBatch:o(function(){var e=this._private;return e.batchCount==null&&(e.batchCount=0),e.batchCount===0&&(e.batchStyleEles=this.collection(),e.batchNotifications={}),e.batchCount++,this},"startBatch"),endBatch:o(function(){var e=this._private;if(e.batchCount===0)return this;if(e.batchCount--,e.batchCount===0){e.batchStyleEles.updateStyle();var r=this.renderer();Object.keys(e.batchNotifications).forEach(function(n){var i=e.batchNotifications[n];i.empty()?r.notify(n):r.notify(n,i)})}return this},"endBatch"),batch:o(function(e){return this.startBatch(),e(),this.endBatch(),this},"batch"),batchData:o(function(e){var r=this;return this.batch(function(){for(var n=Object.keys(e),i=0;i<n.length;i++){var a=n[i],s=e[a],l=r.getElementById(a);l.data(s)}})},"batchData")},qJe=wa({hideEdgesOnViewport:!1,textureOnViewport:!1,motionBlur:!1,motionBlurOpacity:.05,pixelRatio:void 0,desktopTapThreshold:4,touchTapThreshold:8,wheelSensitivity:1,debug:!1,showFps:!1}),HP={renderTo:o(function(e,r,n,i){var a=this._private.renderer;return a.renderTo(e,r,n,i),this},"renderTo"),renderer:o(function(){return this._private.renderer},"renderer"),forceRender:o(function(){return this.notify("draw"),this},"forceRender"),resize:o(function(){return this.invalidateSize(),this.emitAndNotify("resize"),this},"resize"),initRenderer:o(function(e){var r=this,n=r.extension("renderer",e.name);if(n==null){hi("Can not initialise: No such renderer `".concat(e.name,"` found. Did you forget to import it and `cytoscape.use()` it?"));return}e.wheelSensitivity!==void 0&&on("You have set a custom wheel sensitivity. This will make your app zoom unnaturally when using mainstream mice. You should change this value from the default only if you can guarantee that all your users will use the same hardware and OS configuration as your current machine.");var i=qJe(e);i.cy=r,r._private.renderer=new n(i),this.notify("init")},"initRenderer"),destroyRenderer:o(function(){var e=this;e.notify("destroy");var r=e.container();if(r)for(r._cyreg=null;r.childNodes.length>0;)r.removeChild(r.childNodes[0]);e._private.renderer=null,e.mutableElements().forEach(function(n){var i=n._private;i.rscratch={},i.rstyle={},i.animation.current=[],i.animation.queue=[]})},"destroyRenderer"),onRender:o(function(e){return this.on("render",e)},"onRender"),offRender:o(function(e){return this.off("render",e)},"offRender")};HP.invalidateDimensions=HP.resize;h6={collection:o(function(e,r){return Zt(e)?this.$(e):po(e)?e.collection():wn(e)?(r||(r={}),new ba(this,e,r.unique,r.removed)):new ba(this)},"collection"),nodes:o(function(e){var r=this.$(function(n){return n.isNode()});return e?r.filter(e):r},"nodes"),edges:o(function(e){var r=this.$(function(n){return n.isEdge()});return e?r.filter(e):r},"edges"),$:o(function(e){var r=this._private.elements;return e?r.filter(e):r.spawnSelf()},"$"),mutableElements:o(function(){return this._private.elements},"mutableElements")};h6.elements=h6.filter=h6.$;za={},zx="t",XJe="f";za.apply=function(t){for(var e=this,r=e._private,n=r.cy,i=n.collection(),a=0;a<t.length;a++){var s=t[a],l=e.getContextMeta(s);if(!l.empty){var u=e.getContextStyle(l),h=e.applyContextStyle(l,u,s);s._private.appliedInitStyle?e.updateTransitions(s,h.diffProps):s._private.appliedInitStyle=!0;var f=e.updateStyleHints(s);f&&i.push(s)}}return i};za.getPropertiesDiff=function(t,e){var r=this,n=r._private.propDiffs=r._private.propDiffs||{},i=t+"-"+e,a=n[i];if(a)return a;for(var s=[],l={},u=0;u<r.length;u++){var h=r[u],f=t[u]===zx,d=e[u]===zx,p=f!==d,m=h.mappedProperties.length>0;if(p||d&&m){var g=void 0;p&&m||p?g=h.properties:m&&(g=h.mappedProperties);for(var y=0;y<g.length;y++){for(var v=g[y],x=v.name,b=!1,w=u+1;w<r.length;w++){var _=r[w],T=e[w]===zx;if(T&&(b=_.properties[v.name]!=null,b))break}!l[x]&&!b&&(l[x]=!0,s.push(x))}}}return n[i]=s,s};za.getContextMeta=function(t){for(var e=this,r="",n,i=t._private.styleCxtKey||"",a=0;a<e.length;a++){var s=e[a],l=s.selector&&s.selector.matches(t);l?r+=zx:r+=XJe}return n=e.getPropertiesDiff(i,r),t._private.styleCxtKey=r,{key:r,diffPropNames:n,empty:n.length===0}};za.getContextStyle=function(t){var e=t.key,r=this,n=this._private.contextStyles=this._private.contextStyles||{};if(n[e])return n[e];for(var i={_private:{key:e}},a=0;a<r.length;a++){var s=r[a],l=e[a]===zx;if(l)for(var u=0;u<s.properties.length;u++){var h=s.properties[u];i[h.name]=h}}return n[e]=i,i};za.applyContextStyle=function(t,e,r){for(var n=this,i=t.diffPropNames,a={},s=n.types,l=0;l<i.length;l++){var u=i[l],h=e[u],f=r.pstyle(u);if(!h)if(f)f.bypass?h={name:u,deleteBypassed:!0}:h={name:u,delete:!0};else continue;if(f!==h){if(h.mapped===s.fn&&f!=null&&f.mapping!=null&&f.mapping.value===h.value){var d=f.mapping,p=d.fnValue=h.value(r);if(p===d.prevFnValue)continue}var m=a[u]={prev:f};n.applyParsedProperty(r,h),m.next=r.pstyle(u),m.next&&m.next.bypass&&(m.next=m.next.bypassed)}}return{diffProps:a}};za.updateStyleHints=function(t){var e=t._private,r=this,n=r.propertyGroupNames,i=r.propertyGroupKeys,a=o(function(Z,ae,ue){return r.getPropertiesHash(Z,ae,ue)},"propHash"),s=e.styleKey;if(t.removed())return!1;var l=e.group==="nodes",u=t._private.style;n=Object.keys(u);for(var h=0;h<i.length;h++){var f=i[h];e.styleKeys[f]=[t1,Ox]}for(var d=o(function(Z,ae){return e.styleKeys[ae][0]=Vx(Z,e.styleKeys[ae][0])},"updateGrKey1"),p=o(function(Z,ae){return e.styleKeys[ae][1]=Ux(Z,e.styleKeys[ae][1])},"updateGrKey2"),m=o(function(Z,ae){d(Z,ae),p(Z,ae)},"updateGrKey"),g=o(function(Z,ae){for(var ue=0;ue<Z.length;ue++){var ce=Z.charCodeAt(ue);d(ce,ae),p(ce,ae)}},"updateGrKeyWStr"),y=2e9,v=o(function(Z){return-128<Z&&Z<128&&Math.floor(Z)!==Z?y-(Z*1024|0):Z},"cleanNum"),x=0;x<n.length;x++){var b=n[x],w=u[b];if(w!=null){var _=this.properties[b],T=_.type,E=_.groupKey,L=void 0;_.hashOverride!=null?L=_.hashOverride(t,w):w.pfValue!=null&&(L=w.pfValue);var C=_.enums==null?w.value:null,A=L!=null,I=C!=null,D=A||I,k=w.units;if(T.number&&D&&!T.multiple){var R=A?L:C;m(v(R),E),!A&&k!=null&&g(k,E)}else g(w.strValue,E)}}for(var S=[t1,Ox],O=0;O<i.length;O++){var N=i[O],P=e.styleKeys[N];S[0]=Vx(P[0],S[0]),S[1]=Ux(P[1],S[1])}e.styleKey=JXe(S[0],S[1]);var F=e.styleKeys;e.labelDimsKey=xf(F.labelDimensions);var B=a(t,["label"],F.labelDimensions);if(e.labelKey=xf(B),e.labelStyleKey=xf(qE(F.commonLabel,B)),!l){var $=a(t,["source-label"],F.labelDimensions);e.sourceLabelKey=xf($),e.sourceLabelStyleKey=xf(qE(F.commonLabel,$));var z=a(t,["target-label"],F.labelDimensions);e.targetLabelKey=xf(z),e.targetLabelStyleKey=xf(qE(F.commonLabel,z))}if(l){var W=e.styleKeys,j=W.nodeBody,K=W.nodeBorder,ie=W.nodeOutline,Q=W.backgroundImage,ee=W.compound,J=W.pie,H=[j,K,ie,Q,ee,J].filter(function(q){return q!=null}).reduce(qE,[t1,Ox]);e.nodeKey=xf(H),e.hasPie=J!=null&&J[0]!==t1&&J[1]!==Ox}return s!==e.styleKey};za.clearStyleHints=function(t){var e=t._private;e.styleCxtKey="",e.styleKeys={},e.styleKey=null,e.labelKey=null,e.labelStyleKey=null,e.sourceLabelKey=null,e.sourceLabelStyleKey=null,e.targetLabelKey=null,e.targetLabelStyleKey=null,e.nodeKey=null,e.hasPie=null};za.applyParsedProperty=function(t,e){var r=this,n=e,i=t._private.style,a,s=r.types,l=r.properties[n.name].type,u=n.bypass,h=i[n.name],f=h&&h.bypass,d=t._private,p="mapping",m=o(function(j){return j==null?null:j.pfValue!=null?j.pfValue:j.value},"getVal"),g=o(function(){var j=m(h),K=m(n);r.checkTriggers(t,n.name,j,K)},"checkTriggers");if(e.name==="curve-style"&&t.isEdge()&&(e.value!=="bezier"&&t.isLoop()||e.value==="haystack"&&(t.source().isParent()||t.target().isParent()))&&(n=e=this.parse(e.name,"bezier",u)),n.delete)return i[n.name]=void 0,g(),!0;if(n.deleteBypassed)return h?h.bypass?(h.bypassed=void 0,g(),!0):!1:(g(),!0);if(n.deleteBypass)return h?h.bypass?(i[n.name]=h.bypassed,g(),!0):!1:(g(),!0);var y=o(function(){on("Do not assign mappings to elements without corresponding data (i.e. ele `"+t.id()+"` has no mapping for property `"+n.name+"` with data field `"+n.field+"`); try a `["+n.field+"]` selector to limit scope to elements with `"+n.field+"` defined")},"printMappingErr");switch(n.mapped){case s.mapData:{for(var v=n.field.split("."),x=d.data,b=0;b<v.length&&x;b++){var w=v[b];x=x[w]}if(x==null)return y(),!1;var _;if(xt(x)){var T=n.fieldMax-n.fieldMin;T===0?_=0:_=(x-n.fieldMin)/T}else return on("Do not use continuous mappers without specifying numeric data (i.e. `"+n.field+": "+x+"` for `"+t.id()+"` is non-numeric)"),!1;if(_<0?_=0:_>1&&(_=1),l.color){var E=n.valueMin[0],L=n.valueMax[0],C=n.valueMin[1],A=n.valueMax[1],I=n.valueMin[2],D=n.valueMax[2],k=n.valueMin[3]==null?1:n.valueMin[3],R=n.valueMax[3]==null?1:n.valueMax[3],S=[Math.round(E+(L-E)*_),Math.round(C+(A-C)*_),Math.round(I+(D-I)*_),Math.round(k+(R-k)*_)];a={bypass:n.bypass,name:n.name,value:S,strValue:"rgb("+S[0]+", "+S[1]+", "+S[2]+")"}}else if(l.number){var O=n.valueMin+(n.valueMax-n.valueMin)*_;a=this.parse(n.name,O,n.bypass,p)}else return!1;if(!a)return y(),!1;a.mapping=n,n=a;break}case s.data:{for(var N=n.field.split("."),P=d.data,F=0;F<N.length&&P;F++){var B=N[F];P=P[B]}if(P!=null&&(a=this.parse(n.name,P,n.bypass,p)),!a)return y(),!1;a.mapping=n,n=a;break}case s.fn:{var $=n.value,z=n.fnValue!=null?n.fnValue:$(t);if(n.prevFnValue=z,z==null)return on("Custom function mappers may not return null (i.e. `"+n.name+"` for ele `"+t.id()+"` is null)"),!1;if(a=this.parse(n.name,z,n.bypass,p),!a)return on("Custom function mappers may not return invalid values for the property type (i.e. `"+n.name+"` for ele `"+t.id()+"` is invalid)"),!1;a.mapping=Vc(n),n=a;break}case void 0:break;default:return!1}return u?(f?n.bypassed=h.bypassed:n.bypassed=h,i[n.name]=n):f?h.bypassed=n:i[n.name]=n,g(),!0};za.cleanElements=function(t,e){for(var r=0;r<t.length;r++){var n=t[r];if(this.clearStyleHints(n),n.dirtyCompoundBoundsCache(),n.dirtyBoundingBoxCache(),!e)n._private.style={};else for(var i=n._private.style,a=Object.keys(i),s=0;s<a.length;s++){var l=a[s],u=i[l];u!=null&&(u.bypass?u.bypassed=null:i[l]=null)}}};za.update=function(){var t=this._private.cy,e=t.mutableElements();e.updateStyle()};za.updateTransitions=function(t,e){var r=this,n=t._private,i=t.pstyle("transition-property").value,a=t.pstyle("transition-duration").pfValue,s=t.pstyle("transition-delay").pfValue;if(i.length>0&&a>0){for(var l={},u=!1,h=0;h<i.length;h++){var f=i[h],d=t.pstyle(f),p=e[f];if(p){var m=p.prev,g=m,y=p.next!=null?p.next:d,v=!1,x=void 0,b=1e-6;g&&(xt(g.pfValue)&&xt(y.pfValue)?(v=y.pfValue-g.pfValue,x=g.pfValue+b*v):xt(g.value)&&xt(y.value)?(v=y.value-g.value,x=g.value+b*v):wn(g.value)&&wn(y.value)&&(v=g.value[0]!==y.value[0]||g.value[1]!==y.value[1]||g.value[2]!==y.value[2],x=g.strValue),v&&(l[f]=y.strValue,this.applyBypass(t,f,x),u=!0))}}if(!u)return;n.transitioning=!0,new d1(function(w){s>0?t.delayAnimation(s).play().promise().then(w):w()}).then(function(){return t.animation({style:l,duration:a,easing:t.pstyle("transition-timing-function").value,queue:!1}).play().promise()}).then(function(){r.removeBypasses(t,i),t.emitAndNotify("style"),n.transitioning=!1})}else n.transitioning&&(this.removeBypasses(t,i),t.emitAndNotify("style"),n.transitioning=!1)};za.checkTrigger=function(t,e,r,n,i,a){var s=this.properties[e],l=i(s);l!=null&&l(r,n)&&a(s)};za.checkZOrderTrigger=function(t,e,r,n){var i=this;this.checkTrigger(t,e,r,n,function(a){return a.triggersZOrder},function(){i._private.cy.notify("zorder",t)})};za.checkBoundsTrigger=function(t,e,r,n){this.checkTrigger(t,e,r,n,function(i){return i.triggersBounds},function(i){t.dirtyCompoundBoundsCache(),t.dirtyBoundingBoxCache(),i.triggersBoundsOfParallelBeziers&&e==="curve-style"&&(r==="bezier"||n==="bezier")&&t.parallelEdges().forEach(function(a){a.isBundledBezier()&&a.dirtyBoundingBoxCache()}),i.triggersBoundsOfConnectedEdges&&e==="display"&&(r==="none"||n==="none")&&t.connectedEdges().forEach(function(a){a.dirtyBoundingBoxCache()})})};za.checkTriggers=function(t,e,r,n){t.dirtyStyleCache(),this.checkZOrderTrigger(t,e,r,n),this.checkBoundsTrigger(t,e,r,n)};nb={};nb.applyBypass=function(t,e,r,n){var i=this,a=[],s=!0;if(e==="*"||e==="**"){if(r!==void 0)for(var l=0;l<i.properties.length;l++){var u=i.properties[l],h=u.name,f=this.parse(h,r,!0);f&&a.push(f)}}else if(Zt(e)){var d=this.parse(e,r,!0);d&&a.push(d)}else if(Vr(e)){var p=e;n=r;for(var m=Object.keys(p),g=0;g<m.length;g++){var y=m[g],v=p[y];if(v===void 0&&(v=p[S6(y)]),v!==void 0){var x=this.parse(y,v,!0);x&&a.push(x)}}}else return!1;if(a.length===0)return!1;for(var b=!1,w=0;w<t.length;w++){for(var _=t[w],T={},E=void 0,L=0;L<a.length;L++){var C=a[L];if(n){var A=_.pstyle(C.name);E=T[C.name]={prev:A}}b=this.applyParsedProperty(_,Vc(C))||b,n&&(E.next=_.pstyle(C.name))}b&&this.updateStyleHints(_),n&&this.updateTransitions(_,T,s)}return b};nb.overrideBypass=function(t,e,r){e=rB(e);for(var n=0;n<t.length;n++){var i=t[n],a=i._private.style[e],s=this.properties[e].type,l=s.color,u=s.mutiple,h=a?a.pfValue!=null?a.pfValue:a.value:null;!a||!a.bypass?this.applyBypass(i,e,r):(a.value=r,a.pfValue!=null&&(a.pfValue=r),l?a.strValue="rgb("+r.join(",")+")":u?a.strValue=r.join(" "):a.strValue=""+r,this.updateStyleHints(i)),this.checkTriggers(i,e,h,r)}};nb.removeAllBypasses=function(t,e){return this.removeBypasses(t,this.propertyNames,e)};nb.removeBypasses=function(t,e,r){for(var n=!0,i=0;i<t.length;i++){for(var a=t[i],s={},l=0;l<e.length;l++){var u=e[l],h=this.properties[u],f=a.pstyle(h.name);if(!(!f||!f.bypass)){var d="",p=this.parse(u,d,!0),m=s[h.name]={prev:f};this.applyParsedProperty(a,p),m.next=a.pstyle(h.name)}}this.updateStyleHints(a),r&&this.updateTransitions(a,s,n)}};gB={};gB.getEmSizeInPixels=function(){var t=this.containerCss("font-size");return t!=null?parseFloat(t):1};gB.containerCss=function(t){var e=this._private.cy,r=e.container(),n=e.window();if(n&&r&&n.getComputedStyle)return n.getComputedStyle(r).getPropertyValue(t)};Hc={};Hc.getRenderedStyle=function(t,e){return e?this.getStylePropertyValue(t,e,!0):this.getRawStyle(t,!0)};Hc.getRawStyle=function(t,e){var r=this;if(t=t[0],t){for(var n={},i=0;i<r.properties.length;i++){var a=r.properties[i],s=r.getStylePropertyValue(t,a.name,e);s!=null&&(n[a.name]=s,n[S6(a.name)]=s)}return n}};Hc.getIndexedStyle=function(t,e,r,n){var i=t.pstyle(e)[r][n];return i??t.cy().style().getDefaultProperty(e)[r][0]};Hc.getStylePropertyValue=function(t,e,r){var n=this;if(t=t[0],t){var i=n.properties[e];i.alias&&(i=i.pointsTo);var a=i.type,s=t.pstyle(i.name);if(s){var l=s.value,u=s.units,h=s.strValue;if(r&&a.number&&l!=null&&xt(l)){var f=t.cy().zoom(),d=o(function(v){return v*f},"getRenderedValue"),p=o(function(v,x){return d(v)+x},"getValueStringWithUnits"),m=wn(l),g=m?u.every(function(y){return y!=null}):u!=null;return g?m?l.map(function(y,v){return p(y,u[v])}).join(" "):p(l,u):m?l.map(function(y){return Zt(y)?y:""+d(y)}).join(" "):""+d(l)}else if(h!=null)return h}return null}};Hc.getAnimationStartStyle=function(t,e){for(var r={},n=0;n<e.length;n++){var i=e[n],a=i.name,s=t.pstyle(a);s!==void 0&&(Vr(s)?s=this.parse(a,s.strValue):s=this.parse(a,s)),s&&(r[a]=s)}return r};Hc.getPropsList=function(t){var e=this,r=[],n=t,i=e.properties;if(n)for(var a=Object.keys(n),s=0;s<a.length;s++){var l=a[s],u=n[l],h=i[l]||i[rB(l)],f=this.parse(h.name,u);f&&r.push(f)}return r};Hc.getNonDefaultPropertiesHash=function(t,e,r){var n=r.slice(),i,a,s,l,u,h;for(u=0;u<e.length;u++)if(i=e[u],a=t.pstyle(i,!1),a!=null)if(a.pfValue!=null)n[0]=Vx(l,n[0]),n[1]=Ux(l,n[1]);else for(s=a.strValue,h=0;h<s.length;h++)l=s.charCodeAt(h),n[0]=Vx(l,n[0]),n[1]=Ux(l,n[1]);return n};Hc.getPropertiesHash=Hc.getNonDefaultPropertiesHash;F6={};F6.appendFromJson=function(t){for(var e=this,r=0;r<t.length;r++){var n=t[r],i=n.selector,a=n.style||n.css,s=Object.keys(a);e.selector(i);for(var l=0;l<s.length;l++){var u=s[l],h=a[u];e.css(u,h)}}return e};F6.fromJson=function(t){var e=this;return e.resetToDefault(),e.appendFromJson(t),e};F6.json=function(){for(var t=[],e=this.defaultLength;e<this.length;e++){for(var r=this[e],n=r.selector,i=r.properties,a={},s=0;s<i.length;s++){var l=i[s];a[l.name]=l.strValue}t.push({selector:n?n.toString():"core",style:a})}return t};yB={};yB.appendFromString=function(t){var e=this,r=this,n=""+t,i,a,s;n=n.replace(/[/][*](\s|.)+?[*][/]/g,"");function l(){n.length>i.length?n=n.substr(i.length):n=""}o(l,"removeSelAndBlockFromRemaining");function u(){a.length>s.length?a=a.substr(s.length):a=""}for(o(u,"removePropAndValFromRem");;){var h=n.match(/^\s*$/);if(h)break;var f=n.match(/^\s*((?:.|\s)+?)\s*\{((?:.|\s)+?)\}/);if(!f){on("Halting stylesheet parsing: String stylesheet contains more to parse but no selector and block found in: "+n);break}i=f[0];var d=f[1];if(d!=="core"){var p=new Af(d);if(p.invalid){on("Skipping parsing of block: Invalid selector found in string stylesheet: "+d),l();continue}}var m=f[2],g=!1;a=m;for(var y=[];;){var v=a.match(/^\s*$/);if(v)break;var x=a.match(/^\s*(.+?)\s*:\s*(.+?)(?:\s*;|\s*$)/);if(!x){on("Skipping parsing of block: Invalid formatting of style property and value definitions found in:"+m),g=!0;break}s=x[0];var b=x[1],w=x[2],_=e.properties[b];if(!_){on("Skipping property: Invalid property name in: "+s),u();continue}var T=r.parse(b,w);if(!T){on("Skipping property: Invalid property definition in: "+s),u();continue}y.push({name:b,val:w}),u()}if(g){l();break}r.selector(d);for(var E=0;E<y.length;E++){var L=y[E];r.css(L.name,L.val)}l()}return r};yB.fromString=function(t){var e=this;return e.resetToDefault(),e.appendFromString(t),e};va={};(function(){var t=Wi,e=rXe,r=iXe,n=aXe,i=sXe,a=o(function(H){return"^"+H+"\\s*\\(\\s*([\\w\\.]+)\\s*\\)$"},"data"),s=o(function(H){var q=t+"|\\w+|"+e+"|"+r+"|"+n+"|"+i;return"^"+H+"\\s*\\(([\\w\\.]+)\\s*\\,\\s*("+t+")\\s*\\,\\s*("+t+")\\s*,\\s*("+q+")\\s*\\,\\s*("+q+")\\)$"},"mapData"),l=[`^url\\s*\\(\\s*['"]?(.+?)['"]?\\s*\\)$`,"^(none)$","^(.+)$"];va.types={time:{number:!0,min:0,units:"s|ms",implicitUnits:"ms"},percent:{number:!0,min:0,max:100,units:"%",implicitUnits:"%"},percentages:{number:!0,min:0,max:100,units:"%",implicitUnits:"%",multiple:!0},zeroOneNumber:{number:!0,min:0,max:1,unitless:!0},zeroOneNumbers:{number:!0,min:0,max:1,unitless:!0,multiple:!0},nOneOneNumber:{number:!0,min:-1,max:1,unitless:!0},nonNegativeInt:{number:!0,min:0,integer:!0,unitless:!0},nonNegativeNumber:{number:!0,min:0,unitless:!0},position:{enums:["parent","origin"]},nodeSize:{number:!0,min:0,enums:["label"]},number:{number:!0,unitless:!0},numbers:{number:!0,unitless:!0,multiple:!0},positiveNumber:{number:!0,unitless:!0,min:0,strictMin:!0},size:{number:!0,min:0},bidirectionalSize:{number:!0},bidirectionalSizeMaybePercent:{number:!0,allowPercent:!0},bidirectionalSizes:{number:!0,multiple:!0},sizeMaybePercent:{number:!0,min:0,allowPercent:!0},axisDirection:{enums:["horizontal","leftward","rightward","vertical","upward","downward","auto"]},paddingRelativeTo:{enums:["width","height","average","min","max"]},bgWH:{number:!0,min:0,allowPercent:!0,enums:["auto"],multiple:!0},bgPos:{number:!0,allowPercent:!0,multiple:!0},bgRelativeTo:{enums:["inner","include-padding"],multiple:!0},bgRepeat:{enums:["repeat","repeat-x","repeat-y","no-repeat"],multiple:!0},bgFit:{enums:["none","contain","cover"],multiple:!0},bgCrossOrigin:{enums:["anonymous","use-credentials","null"],multiple:!0},bgClip:{enums:["none","node"],multiple:!0},bgContainment:{enums:["inside","over"],multiple:!0},color:{color:!0},colors:{color:!0,multiple:!0},fill:{enums:["solid","linear-gradient","radial-gradient"]},bool:{enums:["yes","no"]},bools:{enums:["yes","no"],multiple:!0},lineStyle:{enums:["solid","dotted","dashed"]},lineCap:{enums:["butt","round","square"]},linePosition:{enums:["center","inside","outside"]},lineJoin:{enums:["round","bevel","miter"]},borderStyle:{enums:["solid","dotted","dashed","double"]},curveStyle:{enums:["bezier","unbundled-bezier","haystack","segments","straight","straight-triangle","taxi","round-segments","round-taxi"]},radiusType:{enums:["arc-radius","influence-radius"],multiple:!0},fontFamily:{regex:'^([\\w- \\"]+(?:\\s*,\\s*[\\w- \\"]+)*)$'},fontStyle:{enums:["italic","normal","oblique"]},fontWeight:{enums:["normal","bold","bolder","lighter","100","200","300","400","500","600","800","900",100,200,300,400,500,600,700,800,900]},textDecoration:{enums:["none","underline","overline","line-through"]},textTransform:{enums:["none","uppercase","lowercase"]},textWrap:{enums:["none","wrap","ellipsis"]},textOverflowWrap:{enums:["whitespace","anywhere"]},textBackgroundShape:{enums:["rectangle","roundrectangle","round-rectangle"]},nodeShape:{enums:["rectangle","roundrectangle","round-rectangle","cutrectangle","cut-rectangle","bottomroundrectangle","bottom-round-rectangle","barrel","ellipse","triangle","round-triangle","square","pentagon","round-pentagon","hexagon","round-hexagon","concavehexagon","concave-hexagon","heptagon","round-heptagon","octagon","round-octagon","tag","round-tag","star","diamond","round-diamond","vee","rhomboid","right-rhomboid","polygon"]},overlayShape:{enums:["roundrectangle","round-rectangle","ellipse"]},cornerRadius:{number:!0,min:0,units:"px|em",implicitUnits:"px",enums:["auto"]},compoundIncludeLabels:{enums:["include","exclude"]},arrowShape:{enums:["tee","triangle","triangle-tee","circle-triangle","triangle-cross","triangle-backcurve","vee","square","circle","diamond","chevron","none"]},arrowFill:{enums:["filled","hollow"]},arrowWidth:{number:!0,units:"%|px|em",implicitUnits:"px",enums:["match-line"]},display:{enums:["element","none"]},visibility:{enums:["hidden","visible"]},zCompoundDepth:{enums:["bottom","orphan","auto","top"]},zIndexCompare:{enums:["auto","manual"]},valign:{enums:["top","center","bottom"]},halign:{enums:["left","center","right"]},justification:{enums:["left","center","right","auto"]},text:{string:!0},data:{mapping:!0,regex:a("data")},layoutData:{mapping:!0,regex:a("layoutData")},scratch:{mapping:!0,regex:a("scratch")},mapData:{mapping:!0,regex:s("mapData")},mapLayoutData:{mapping:!0,regex:s("mapLayoutData")},mapScratch:{mapping:!0,regex:s("mapScratch")},fn:{mapping:!0,fn:!0},url:{regexes:l,singleRegexMatchValue:!0},urls:{regexes:l,singleRegexMatchValue:!0,multiple:!0},propList:{propList:!0},angle:{number:!0,units:"deg|rad",implicitUnits:"rad"},textRotation:{number:!0,units:"deg|rad",implicitUnits:"rad",enums:["none","autorotate"]},polygonPointList:{number:!0,multiple:!0,evenMultiple:!0,min:-1,max:1,unitless:!0},edgeDistances:{enums:["intersection","node-position","endpoints"]},edgeEndpoint:{number:!0,multiple:!0,units:"%|px|em|deg|rad",implicitUnits:"px",enums:["inside-to-node","outside-to-node","outside-to-node-or-label","outside-to-line","outside-to-line-or-label"],singleEnum:!0,validate:o(function(H,q){switch(H.length){case 2:return q[0]!=="deg"&&q[0]!=="rad"&&q[1]!=="deg"&&q[1]!=="rad";case 1:return Zt(H[0])||q[0]==="deg"||q[0]==="rad";default:return!1}},"validate")},easing:{regexes:["^(spring)\\s*\\(\\s*("+t+")\\s*,\\s*("+t+")\\s*\\)$","^(cubic-bezier)\\s*\\(\\s*("+t+")\\s*,\\s*("+t+")\\s*,\\s*("+t+")\\s*,\\s*("+t+")\\s*\\)$"],enums:["linear","ease","ease-in","ease-out","ease-in-out","ease-in-sine","ease-out-sine","ease-in-out-sine","ease-in-quad","ease-out-quad","ease-in-out-quad","ease-in-cubic","ease-out-cubic","ease-in-out-cubic","ease-in-quart","ease-out-quart","ease-in-out-quart","ease-in-quint","ease-out-quint","ease-in-out-quint","ease-in-expo","ease-out-expo","ease-in-out-expo","ease-in-circ","ease-out-circ","ease-in-out-circ"]},gradientDirection:{enums:["to-bottom","to-top","to-left","to-right","to-bottom-right","to-bottom-left","to-top-right","to-top-left","to-right-bottom","to-left-bottom","to-right-top","to-left-top"]},boundsExpansion:{number:!0,multiple:!0,min:0,validate:o(function(H){var q=H.length;return q===1||q===2||q===4},"validate")}};var u={zeroNonZero:o(function(H,q){return(H==null||q==null)&&H!==q||H==0&&q!=0?!0:H!=0&&q==0},"zeroNonZero"),any:o(function(H,q){return H!=q},"any"),emptyNonEmpty:o(function(H,q){var Z=Sf(H),ae=Sf(q);return Z&&!ae||!Z&&ae},"emptyNonEmpty")},h=va.types,f=[{name:"label",type:h.text,triggersBounds:u.any,triggersZOrder:u.emptyNonEmpty},{name:"text-rotation",type:h.textRotation,triggersBounds:u.any},{name:"text-margin-x",type:h.bidirectionalSize,triggersBounds:u.any},{name:"text-margin-y",type:h.bidirectionalSize,triggersBounds:u.any}],d=[{name:"source-label",type:h.text,triggersBounds:u.any},{name:"source-text-rotation",type:h.textRotation,triggersBounds:u.any},{name:"source-text-margin-x",type:h.bidirectionalSize,triggersBounds:u.any},{name:"source-text-margin-y",type:h.bidirectionalSize,triggersBounds:u.any},{name:"source-text-offset",type:h.size,triggersBounds:u.any}],p=[{name:"target-label",type:h.text,triggersBounds:u.any},{name:"target-text-rotation",type:h.textRotation,triggersBounds:u.any},{name:"target-text-margin-x",type:h.bidirectionalSize,triggersBounds:u.any},{name:"target-text-margin-y",type:h.bidirectionalSize,triggersBounds:u.any},{name:"target-text-offset",type:h.size,triggersBounds:u.any}],m=[{name:"font-family",type:h.fontFamily,triggersBounds:u.any},{name:"font-style",type:h.fontStyle,triggersBounds:u.any},{name:"font-weight",type:h.fontWeight,triggersBounds:u.any},{name:"font-size",type:h.size,triggersBounds:u.any},{name:"text-transform",type:h.textTransform,triggersBounds:u.any},{name:"text-wrap",type:h.textWrap,triggersBounds:u.any},{name:"text-overflow-wrap",type:h.textOverflowWrap,triggersBounds:u.any},{name:"text-max-width",type:h.size,triggersBounds:u.any},{name:"text-outline-width",type:h.size,triggersBounds:u.any},{name:"line-height",type:h.positiveNumber,triggersBounds:u.any}],g=[{name:"text-valign",type:h.valign,triggersBounds:u.any},{name:"text-halign",type:h.halign,triggersBounds:u.any},{name:"color",type:h.color},{name:"text-outline-color",type:h.color},{name:"text-outline-opacity",type:h.zeroOneNumber},{name:"text-background-color",type:h.color},{name:"text-background-opacity",type:h.zeroOneNumber},{name:"text-background-padding",type:h.size,triggersBounds:u.any},{name:"text-border-opacity",type:h.zeroOneNumber},{name:"text-border-color",type:h.color},{name:"text-border-width",type:h.size,triggersBounds:u.any},{name:"text-border-style",type:h.borderStyle,triggersBounds:u.any},{name:"text-background-shape",type:h.textBackgroundShape,triggersBounds:u.any},{name:"text-justification",type:h.justification}],y=[{name:"events",type:h.bool,triggersZOrder:u.any},{name:"text-events",type:h.bool,triggersZOrder:u.any}],v=[{name:"display",type:h.display,triggersZOrder:u.any,triggersBounds:u.any,triggersBoundsOfConnectedEdges:!0},{name:"visibility",type:h.visibility,triggersZOrder:u.any},{name:"opacity",type:h.zeroOneNumber,triggersZOrder:u.zeroNonZero},{name:"text-opacity",type:h.zeroOneNumber},{name:"min-zoomed-font-size",type:h.size},{name:"z-compound-depth",type:h.zCompoundDepth,triggersZOrder:u.any},{name:"z-index-compare",type:h.zIndexCompare,triggersZOrder:u.any},{name:"z-index",type:h.number,triggersZOrder:u.any}],x=[{name:"overlay-padding",type:h.size,triggersBounds:u.any},{name:"overlay-color",type:h.color},{name:"overlay-opacity",type:h.zeroOneNumber,triggersBounds:u.zeroNonZero},{name:"overlay-shape",type:h.overlayShape,triggersBounds:u.any},{name:"overlay-corner-radius",type:h.cornerRadius}],b=[{name:"underlay-padding",type:h.size,triggersBounds:u.any},{name:"underlay-color",type:h.color},{name:"underlay-opacity",type:h.zeroOneNumber,triggersBounds:u.zeroNonZero},{name:"underlay-shape",type:h.overlayShape,triggersBounds:u.any},{name:"underlay-corner-radius",type:h.cornerRadius}],w=[{name:"transition-property",type:h.propList},{name:"transition-duration",type:h.time},{name:"transition-delay",type:h.time},{name:"transition-timing-function",type:h.easing}],_=o(function(H,q){return q.value==="label"?-H.poolIndex():q.pfValue},"nodeSizeHashOverride"),T=[{name:"height",type:h.nodeSize,triggersBounds:u.any,hashOverride:_},{name:"width",type:h.nodeSize,triggersBounds:u.any,hashOverride:_},{name:"shape",type:h.nodeShape,triggersBounds:u.any},{name:"shape-polygon-points",type:h.polygonPointList,triggersBounds:u.any},{name:"corner-radius",type:h.cornerRadius},{name:"background-color",type:h.color},{name:"background-fill",type:h.fill},{name:"background-opacity",type:h.zeroOneNumber},{name:"background-blacken",type:h.nOneOneNumber},{name:"background-gradient-stop-colors",type:h.colors},{name:"background-gradient-stop-positions",type:h.percentages},{name:"background-gradient-direction",type:h.gradientDirection},{name:"padding",type:h.sizeMaybePercent,triggersBounds:u.any},{name:"padding-relative-to",type:h.paddingRelativeTo,triggersBounds:u.any},{name:"bounds-expansion",type:h.boundsExpansion,triggersBounds:u.any}],E=[{name:"border-color",type:h.color},{name:"border-opacity",type:h.zeroOneNumber},{name:"border-width",type:h.size,triggersBounds:u.any},{name:"border-style",type:h.borderStyle},{name:"border-cap",type:h.lineCap},{name:"border-join",type:h.lineJoin},{name:"border-dash-pattern",type:h.numbers},{name:"border-dash-offset",type:h.number},{name:"border-position",type:h.linePosition}],L=[{name:"outline-color",type:h.color},{name:"outline-opacity",type:h.zeroOneNumber},{name:"outline-width",type:h.size,triggersBounds:u.any},{name:"outline-style",type:h.borderStyle},{name:"outline-offset",type:h.size,triggersBounds:u.any}],C=[{name:"background-image",type:h.urls},{name:"background-image-crossorigin",type:h.bgCrossOrigin},{name:"background-image-opacity",type:h.zeroOneNumbers},{name:"background-image-containment",type:h.bgContainment},{name:"background-image-smoothing",type:h.bools},{name:"background-position-x",type:h.bgPos},{name:"background-position-y",type:h.bgPos},{name:"background-width-relative-to",type:h.bgRelativeTo},{name:"background-height-relative-to",type:h.bgRelativeTo},{name:"background-repeat",type:h.bgRepeat},{name:"background-fit",type:h.bgFit},{name:"background-clip",type:h.bgClip},{name:"background-width",type:h.bgWH},{name:"background-height",type:h.bgWH},{name:"background-offset-x",type:h.bgPos},{name:"background-offset-y",type:h.bgPos}],A=[{name:"position",type:h.position,triggersBounds:u.any},{name:"compound-sizing-wrt-labels",type:h.compoundIncludeLabels,triggersBounds:u.any},{name:"min-width",type:h.size,triggersBounds:u.any},{name:"min-width-bias-left",type:h.sizeMaybePercent,triggersBounds:u.any},{name:"min-width-bias-right",type:h.sizeMaybePercent,triggersBounds:u.any},{name:"min-height",type:h.size,triggersBounds:u.any},{name:"min-height-bias-top",type:h.sizeMaybePercent,triggersBounds:u.any},{name:"min-height-bias-bottom",type:h.sizeMaybePercent,triggersBounds:u.any}],I=[{name:"line-style",type:h.lineStyle},{name:"line-color",type:h.color},{name:"line-fill",type:h.fill},{name:"line-cap",type:h.lineCap},{name:"line-opacity",type:h.zeroOneNumber},{name:"line-dash-pattern",type:h.numbers},{name:"line-dash-offset",type:h.number},{name:"line-outline-width",type:h.size},{name:"line-outline-color",type:h.color},{name:"line-gradient-stop-colors",type:h.colors},{name:"line-gradient-stop-positions",type:h.percentages},{name:"curve-style",type:h.curveStyle,triggersBounds:u.any,triggersBoundsOfParallelBeziers:!0},{name:"haystack-radius",type:h.zeroOneNumber,triggersBounds:u.any},{name:"source-endpoint",type:h.edgeEndpoint,triggersBounds:u.any},{name:"target-endpoint",type:h.edgeEndpoint,triggersBounds:u.any},{name:"control-point-step-size",type:h.size,triggersBounds:u.any},{name:"control-point-distances",type:h.bidirectionalSizes,triggersBounds:u.any},{name:"control-point-weights",type:h.numbers,triggersBounds:u.any},{name:"segment-distances",type:h.bidirectionalSizes,triggersBounds:u.any},{name:"segment-weights",type:h.numbers,triggersBounds:u.any},{name:"segment-radii",type:h.numbers,triggersBounds:u.any},{name:"radius-type",type:h.radiusType,triggersBounds:u.any},{name:"taxi-turn",type:h.bidirectionalSizeMaybePercent,triggersBounds:u.any},{name:"taxi-turn-min-distance",type:h.size,triggersBounds:u.any},{name:"taxi-direction",type:h.axisDirection,triggersBounds:u.any},{name:"taxi-radius",type:h.number,triggersBounds:u.any},{name:"edge-distances",type:h.edgeDistances,triggersBounds:u.any},{name:"arrow-scale",type:h.positiveNumber,triggersBounds:u.any},{name:"loop-direction",type:h.angle,triggersBounds:u.any},{name:"loop-sweep",type:h.angle,triggersBounds:u.any},{name:"source-distance-from-node",type:h.size,triggersBounds:u.any},{name:"target-distance-from-node",type:h.size,triggersBounds:u.any}],D=[{name:"ghost",type:h.bool,triggersBounds:u.any},{name:"ghost-offset-x",type:h.bidirectionalSize,triggersBounds:u.any},{name:"ghost-offset-y",type:h.bidirectionalSize,triggersBounds:u.any},{name:"ghost-opacity",type:h.zeroOneNumber}],k=[{name:"selection-box-color",type:h.color},{name:"selection-box-opacity",type:h.zeroOneNumber},{name:"selection-box-border-color",type:h.color},{name:"selection-box-border-width",type:h.size},{name:"active-bg-color",type:h.color},{name:"active-bg-opacity",type:h.zeroOneNumber},{name:"active-bg-size",type:h.size},{name:"outside-texture-bg-color",type:h.color},{name:"outside-texture-bg-opacity",type:h.zeroOneNumber}],R=[];va.pieBackgroundN=16,R.push({name:"pie-size",type:h.sizeMaybePercent});for(var S=1;S<=va.pieBackgroundN;S++)R.push({name:"pie-"+S+"-background-color",type:h.color}),R.push({name:"pie-"+S+"-background-size",type:h.percent}),R.push({name:"pie-"+S+"-background-opacity",type:h.zeroOneNumber});var O=[],N=va.arrowPrefixes=["source","mid-source","target","mid-target"];[{name:"arrow-shape",type:h.arrowShape,triggersBounds:u.any},{name:"arrow-color",type:h.color},{name:"arrow-fill",type:h.arrowFill},{name:"arrow-width",type:h.arrowWidth}].forEach(function(J){N.forEach(function(H){var q=H+"-"+J.name,Z=J.type,ae=J.triggersBounds;O.push({name:q,type:Z,triggersBounds:ae})})},{});var P=va.properties=[].concat(y,w,v,x,b,D,g,m,f,d,p,T,E,L,C,R,A,I,O,k),F=va.propertyGroups={behavior:y,transition:w,visibility:v,overlay:x,underlay:b,ghost:D,commonLabel:g,labelDimensions:m,mainLabel:f,sourceLabel:d,targetLabel:p,nodeBody:T,nodeBorder:E,nodeOutline:L,backgroundImage:C,pie:R,compound:A,edgeLine:I,edgeArrow:O,core:k},B=va.propertyGroupNames={},$=va.propertyGroupKeys=Object.keys(F);$.forEach(function(J){B[J]=F[J].map(function(H){return H.name}),F[J].forEach(function(H){return H.groupKey=J})});var z=va.aliases=[{name:"content",pointsTo:"label"},{name:"control-point-distance",pointsTo:"control-point-distances"},{name:"control-point-weight",pointsTo:"control-point-weights"},{name:"segment-distance",pointsTo:"segment-distances"},{name:"segment-weight",pointsTo:"segment-weights"},{name:"segment-radius",pointsTo:"segment-radii"},{name:"edge-text-rotation",pointsTo:"text-rotation"},{name:"padding-left",pointsTo:"padding"},{name:"padding-right",pointsTo:"padding"},{name:"padding-top",pointsTo:"padding"},{name:"padding-bottom",pointsTo:"padding"}];va.propertyNames=P.map(function(J){return J.name});for(var W=0;W<P.length;W++){var j=P[W];P[j.name]=j}for(var K=0;K<z.length;K++){var ie=z[K],Q=P[ie.pointsTo],ee={name:ie.name,alias:!0,pointsTo:Q};P.push(ee),P[ie.name]=ee}})();va.getDefaultProperty=function(t){return this.getDefaultProperties()[t]};va.getDefaultProperties=function(){var t=this._private;if(t.defaultProperties!=null)return t.defaultProperties;for(var e=ir({"selection-box-color":"#ddd","selection-box-opacity":.65,"selection-box-border-color":"#aaa","selection-box-border-width":1,"active-bg-color":"black","active-bg-opacity":.15,"active-bg-size":30,"outside-texture-bg-color":"#000","outside-texture-bg-opacity":.125,events:"yes","text-events":"no","text-valign":"top","text-halign":"center","text-justification":"auto","line-height":1,color:"#000","text-outline-color":"#000","text-outline-width":0,"text-outline-opacity":1,"text-opacity":1,"text-decoration":"none","text-transform":"none","text-wrap":"none","text-overflow-wrap":"whitespace","text-max-width":9999,"text-background-color":"#000","text-background-opacity":0,"text-background-shape":"rectangle","text-background-padding":0,"text-border-opacity":0,"text-border-width":0,"text-border-style":"solid","text-border-color":"#000","font-family":"Helvetica Neue, Helvetica, sans-serif","font-style":"normal","font-weight":"normal","font-size":16,"min-zoomed-font-size":0,"text-rotation":"none","source-text-rotation":"none","target-text-rotation":"none",visibility:"visible",display:"element",opacity:1,"z-compound-depth":"auto","z-index-compare":"auto","z-index":0,label:"","text-margin-x":0,"text-margin-y":0,"source-label":"","source-text-offset":0,"source-text-margin-x":0,"source-text-margin-y":0,"target-label":"","target-text-offset":0,"target-text-margin-x":0,"target-text-margin-y":0,"overlay-opacity":0,"overlay-color":"#000","overlay-padding":10,"overlay-shape":"round-rectangle","overlay-corner-radius":"auto","underlay-opacity":0,"underlay-color":"#000","underlay-padding":10,"underlay-shape":"round-rectangle","underlay-corner-radius":"auto","transition-property":"none","transition-duration":0,"transition-delay":0,"transition-timing-function":"linear","background-blacken":0,"background-color":"#999","background-fill":"solid","background-opacity":1,"background-image":"none","background-image-crossorigin":"anonymous","background-image-opacity":1,"background-image-containment":"inside","background-image-smoothing":"yes","background-position-x":"50%","background-position-y":"50%","background-offset-x":0,"background-offset-y":0,"background-width-relative-to":"include-padding","background-height-relative-to":"include-padding","background-repeat":"no-repeat","background-fit":"none","background-clip":"node","background-width":"auto","background-height":"auto","border-color":"#000","border-opacity":1,"border-width":0,"border-style":"solid","border-dash-pattern":[4,2],"border-dash-offset":0,"border-cap":"butt","border-join":"miter","border-position":"center","outline-color":"#999","outline-opacity":1,"outline-width":0,"outline-offset":0,"outline-style":"solid",height:30,width:30,shape:"ellipse","shape-polygon-points":"-1, -1, 1, -1, 1, 1, -1, 1","corner-radius":"auto","bounds-expansion":0,"background-gradient-direction":"to-bottom","background-gradient-stop-colors":"#999","background-gradient-stop-positions":"0%",ghost:"no","ghost-offset-y":0,"ghost-offset-x":0,"ghost-opacity":0,padding:0,"padding-relative-to":"width",position:"origin","compound-sizing-wrt-labels":"include","min-width":0,"min-width-bias-left":0,"min-width-bias-right":0,"min-height":0,"min-height-bias-top":0,"min-height-bias-bottom":0},{"pie-size":"100%"},[{name:"pie-{{i}}-background-color",value:"black"},{name:"pie-{{i}}-background-size",value:"0%"},{name:"pie-{{i}}-background-opacity",value:1}].reduce(function(u,h){for(var f=1;f<=va.pieBackgroundN;f++){var d=h.name.replace("{{i}}",f),p=h.value;u[d]=p}return u},{}),{"line-style":"solid","line-color":"#999","line-fill":"solid","line-cap":"butt","line-opacity":1,"line-outline-width":0,"line-outline-color":"#000","line-gradient-stop-colors":"#999","line-gradient-stop-positions":"0%","control-point-step-size":40,"control-point-weights":.5,"segment-weights":.5,"segment-distances":20,"segment-radii":15,"radius-type":"arc-radius","taxi-turn":"50%","taxi-radius":15,"taxi-turn-min-distance":10,"taxi-direction":"auto","edge-distances":"intersection","curve-style":"haystack","haystack-radius":0,"arrow-scale":1,"loop-direction":"-45deg","loop-sweep":"-90deg","source-distance-from-node":0,"target-distance-from-node":0,"source-endpoint":"outside-to-node","target-endpoint":"outside-to-node","line-dash-pattern":[6,3],"line-dash-offset":0},[{name:"arrow-shape",value:"none"},{name:"arrow-color",value:"#999"},{name:"arrow-fill",value:"filled"},{name:"arrow-width",value:1}].reduce(function(u,h){return va.arrowPrefixes.forEach(function(f){var d=f+"-"+h.name,p=h.value;u[d]=p}),u},{})),r={},n=0;n<this.properties.length;n++){var i=this.properties[n];if(!i.pointsTo){var a=i.name,s=e[a],l=this.parse(a,s);r[a]=l}}return t.defaultProperties=r,t.defaultProperties};va.addDefaultStylesheet=function(){this.selector(":parent").css({shape:"rectangle",padding:10,"background-color":"#eee","border-color":"#ccc","border-width":1}).selector("edge").css({width:3}).selector(":loop").css({"curve-style":"bezier"}).selector("edge:compound").css({"curve-style":"bezier","source-endpoint":"outside-to-line","target-endpoint":"outside-to-line"}).selector(":selected").css({"background-color":"#0169D9","line-color":"#0169D9","source-arrow-color":"#0169D9","target-arrow-color":"#0169D9","mid-source-arrow-color":"#0169D9","mid-target-arrow-color":"#0169D9"}).selector(":parent:selected").css({"background-color":"#CCE1F9","border-color":"#aec8e5"}).selector(":active").css({"overlay-color":"black","overlay-padding":10,"overlay-opacity":.25}),this.defaultLength=this.length};z6={};z6.parse=function(t,e,r,n){var i=this;if(ti(e))return i.parseImplWarn(t,e,r,n);var a=n==="mapping"||n===!0||n===!1||n==null?"dontcare":n,s=r?"t":"f",l=""+e,u=age(t,l,s,a),h=i.propCache=i.propCache||[],f;return(f=h[u])||(f=h[u]=i.parseImplWarn(t,e,r,n)),(r||n==="mapping")&&(f=Vc(f),f&&(f.value=Vc(f.value))),f};z6.parseImplWarn=function(t,e,r,n){var i=this.parseImpl(t,e,r,n);return!i&&e!=null&&on("The style property `".concat(t,": ").concat(e,"` is invalid")),i&&(i.name==="width"||i.name==="height")&&e==="label"&&on("The style value of `label` is deprecated for `"+i.name+"`"),i};z6.parseImpl=function(t,e,r,n){var i=this;t=rB(t);var a=i.properties[t],s=e,l=i.types;if(!a||e===void 0)return null;a.alias&&(a=a.pointsTo,t=a.name);var u=Zt(e);u&&(e=e.trim());var h=a.type;if(!h)return null;if(r&&(e===""||e===null))return{name:t,value:e,bypass:!0,deleteBypass:!0};if(ti(e))return{name:t,value:e,strValue:"fn",mapped:l.fn,bypass:r};var f,d;if(!(!u||n||e.length<7||e[1]!=="a")){if(e.length>=7&&e[0]==="d"&&(f=new RegExp(l.data.regex).exec(e))){if(r)return!1;var p=l.data;return{name:t,value:f,strValue:""+e,mapped:p,field:f[1],bypass:r}}else if(e.length>=10&&e[0]==="m"&&(d=new RegExp(l.mapData.regex).exec(e))){if(r||h.multiple)return!1;var m=l.mapData;if(!(h.color||h.number))return!1;var g=this.parse(t,d[4]);if(!g||g.mapped)return!1;var y=this.parse(t,d[5]);if(!y||y.mapped)return!1;if(g.pfValue===y.pfValue||g.strValue===y.strValue)return on("`"+t+": "+e+"` is not a valid mapper because the output range is zero; converting to `"+t+": "+g.strValue+"`"),this.parse(t,g.strValue);if(h.color){var v=g.value,x=y.value,b=v[0]===x[0]&&v[1]===x[1]&&v[2]===x[2]&&(v[3]===x[3]||(v[3]==null||v[3]===1)&&(x[3]==null||x[3]===1));if(b)return!1}return{name:t,value:d,strValue:""+e,mapped:m,field:d[1],fieldMin:parseFloat(d[2]),fieldMax:parseFloat(d[3]),valueMin:g.value,valueMax:y.value,bypass:r}}}if(h.multiple&&n!=="multiple"){var w;if(u?w=e.split(/\s+/):wn(e)?w=e:w=[e],h.evenMultiple&&w.length%2!==0)return null;for(var _=[],T=[],E=[],L="",C=!1,A=0;A<w.length;A++){var I=i.parse(t,w[A],r,"multiple");C=C||Zt(I.value),_.push(I.value),E.push(I.pfValue!=null?I.pfValue:I.value),T.push(I.units),L+=(A>0?" ":"")+I.strValue}return h.validate&&!h.validate(_,T)?null:h.singleEnum&&C?_.length===1&&Zt(_[0])?{name:t,value:_[0],strValue:_[0],bypass:r}:null:{name:t,value:_,pfValue:E,strValue:L,bypass:r,units:T}}var D=o(function(){for(var H=0;H<h.enums.length;H++){var q=h.enums[H];if(q===e)return{name:t,value:e,strValue:""+e,bypass:r}}return null},"checkEnums");if(h.number){var k,R="px";if(h.units&&(k=h.units),h.implicitUnits&&(R=h.implicitUnits),!h.unitless)if(u){var S="px|em"+(h.allowPercent?"|\\%":"");k&&(S=k);var O=e.match("^("+Wi+")("+S+")?$");O&&(e=O[1],k=O[2]||R)}else(!k||h.implicitUnits)&&(k=R);if(e=parseFloat(e),isNaN(e)&&h.enums===void 0)return null;if(isNaN(e)&&h.enums!==void 0)return e=s,D();if(h.integer&&!jqe(e)||h.min!==void 0&&(e<h.min||h.strictMin&&e===h.min)||h.max!==void 0&&(e>h.max||h.strictMax&&e===h.max))return null;var N={name:t,value:e,strValue:""+e+(k||""),units:k,bypass:r};return h.unitless||k!=="px"&&k!=="em"?N.pfValue=e:N.pfValue=k==="px"||!k?e:this.getEmSizeInPixels()*e,(k==="ms"||k==="s")&&(N.pfValue=k==="ms"?e:1e3*e),(k==="deg"||k==="rad")&&(N.pfValue=k==="rad"?e:Lje(e)),k==="%"&&(N.pfValue=e/100),N}else if(h.propList){var P=[],F=""+e;if(F!=="none"){for(var B=F.split(/\s*,\s*|\s+/),$=0;$<B.length;$++){var z=B[$].trim();i.properties[z]?P.push(z):on("`"+z+"` is not a valid property name")}if(P.length===0)return null}return{name:t,value:P,strValue:P.length===0?"none":P.join(" "),bypass:r}}else if(h.color){var W=fXe(e);return W?{name:t,value:W,pfValue:W,strValue:"rgb("+W[0]+","+W[1]+","+W[2]+")",bypass:r}:null}else if(h.regex||h.regexes){if(h.enums){var j=D();if(j)return j}for(var K=h.regexes?h.regexes:[h.regex],ie=0;ie<K.length;ie++){var Q=new RegExp(K[ie]),ee=Q.exec(e);if(ee)return{name:t,value:h.singleRegexMatchValue?ee[1]:ee,strValue:""+e,bypass:r}}return null}else return h.string?{name:t,value:""+e,strValue:""+e,bypass:r}:h.enums?D():null};Pa=o(function t(e){if(!(this instanceof t))return new t(e);if(!tB(e)){hi("A style must have a core reference");return}this._private={cy:e,coreStyle:{}},this.length=0,this.resetToDefault()},"Style"),Fa=Pa.prototype;Fa.instanceString=function(){return"style"};Fa.clear=function(){for(var t=this._private,e=t.cy,r=e.elements(),n=0;n<this.length;n++)this[n]=void 0;return this.length=0,t.contextStyles={},t.propDiffs={},this.cleanElements(r,!0),r.forEach(function(i){var a=i[0]._private;a.styleDirty=!0,a.appliedInitStyle=!1}),this};Fa.resetToDefault=function(){return this.clear(),this.addDefaultStylesheet(),this};Fa.core=function(t){return this._private.coreStyle[t]||this.getDefaultProperty(t)};Fa.selector=function(t){var e=t==="core"?null:new Af(t),r=this.length++;return this[r]={selector:e,properties:[],mappedProperties:[],index:r},this};Fa.css=function(){var t=this,e=arguments;if(e.length===1)for(var r=e[0],n=0;n<t.properties.length;n++){var i=t.properties[n],a=r[i.name];a===void 0&&(a=r[S6(i.name)]),a!==void 0&&this.cssRule(i.name,a)}else e.length===2&&this.cssRule(e[0],e[1]);return this};Fa.style=Fa.css;Fa.cssRule=function(t,e){var r=this.parse(t,e);if(r){var n=this.length-1;this[n].properties.push(r),this[n].properties[r.name]=r,r.name.match(/pie-(\d+)-background-size/)&&r.value&&(this._private.hasPie=!0),r.mapped&&this[n].mappedProperties.push(r);var i=!this[n].selector;i&&(this._private.coreStyle[r.name]=r)}return this};Fa.append=function(t){return jme(t)?t.appendToStyle(this):wn(t)?this.appendFromJson(t):Zt(t)&&this.appendFromString(t),this};Pa.fromJson=function(t,e){var r=new Pa(t);return r.fromJson(e),r};Pa.fromString=function(t,e){return new Pa(t).fromString(e)};[za,nb,gB,Hc,F6,yB,va,z6].forEach(function(t){ir(Fa,t)});Pa.types=Fa.types;Pa.properties=Fa.properties;Pa.propertyGroups=Fa.propertyGroups;Pa.propertyGroupNames=Fa.propertyGroupNames;Pa.propertyGroupKeys=Fa.propertyGroupKeys;jJe={style:o(function(e){if(e){var r=this.setStyle(e);r.update()}return this._private.style},"style"),setStyle:o(function(e){var r=this._private;return jme(e)?r.style=e.generateStyle(this):wn(e)?r.style=Pa.fromJson(this,e):Zt(e)?r.style=Pa.fromString(this,e):r.style=Pa(this),r.style},"setStyle"),updateStyle:o(function(){this.mutableElements().updateStyle()},"updateStyle")},KJe="single",U0={autolock:o(function(e){if(e!==void 0)this._private.autolock=!!e;else return this._private.autolock;return this},"autolock"),autoungrabify:o(function(e){if(e!==void 0)this._private.autoungrabify=!!e;else return this._private.autoungrabify;return this},"autoungrabify"),autounselectify:o(function(e){if(e!==void 0)this._private.autounselectify=!!e;else return this._private.autounselectify;return this},"autounselectify"),selectionType:o(function(e){var r=this._private;if(r.selectionType==null&&(r.selectionType=KJe),e!==void 0)(e==="additive"||e==="single")&&(r.selectionType=e);else return r.selectionType;return this},"selectionType"),panningEnabled:o(function(e){if(e!==void 0)this._private.panningEnabled=!!e;else return this._private.panningEnabled;return this},"panningEnabled"),userPanningEnabled:o(function(e){if(e!==void 0)this._private.userPanningEnabled=!!e;else return this._private.userPanningEnabled;return this},"userPanningEnabled"),zoomingEnabled:o(function(e){if(e!==void 0)this._private.zoomingEnabled=!!e;else return this._private.zoomingEnabled;return this},"zoomingEnabled"),userZoomingEnabled:o(function(e){if(e!==void 0)this._private.userZoomingEnabled=!!e;else return this._private.userZoomingEnabled;return this},"userZoomingEnabled"),boxSelectionEnabled:o(function(e){if(e!==void 0)this._private.boxSelectionEnabled=!!e;else return this._private.boxSelectionEnabled;return this},"boxSelectionEnabled"),pan:o(function(){var e=arguments,r=this._private.pan,n,i,a,s,l;switch(e.length){case 0:return r;case 1:if(Zt(e[0]))return n=e[0],r[n];if(Vr(e[0])){if(!this._private.panningEnabled)return this;a=e[0],s=a.x,l=a.y,xt(s)&&(r.x=s),xt(l)&&(r.y=l),this.emit("pan viewport")}break;case 2:if(!this._private.panningEnabled)return this;n=e[0],i=e[1],(n==="x"||n==="y")&&xt(i)&&(r[n]=i),this.emit("pan viewport");break}return this.notify("viewport"),this},"pan"),panBy:o(function(e,r){var n=arguments,i=this._private.pan,a,s,l,u,h;if(!this._private.panningEnabled)return this;switch(n.length){case 1:Vr(e)&&(l=n[0],u=l.x,h=l.y,xt(u)&&(i.x+=u),xt(h)&&(i.y+=h),this.emit("pan viewport"));break;case 2:a=e,s=r,(a==="x"||a==="y")&&xt(s)&&(i[a]+=s),this.emit("pan viewport");break}return this.notify("viewport"),this},"panBy"),fit:o(function(e,r){var n=this.getFitViewport(e,r);if(n){var i=this._private;i.zoom=n.zoom,i.pan=n.pan,this.emit("pan zoom viewport"),this.notify("viewport")}return this},"fit"),getFitViewport:o(function(e,r){if(xt(e)&&r===void 0&&(r=e,e=void 0),!(!this._private.panningEnabled||!this._private.zoomingEnabled)){var n;if(Zt(e)){var i=e;e=this.$(i)}else if(Zqe(e)){var a=e;n={x1:a.x1,y1:a.y1,x2:a.x2,y2:a.y2},n.w=n.x2-n.x1,n.h=n.y2-n.y1}else po(e)||(e=this.mutableElements());if(!(po(e)&&e.empty())){n=n||e.boundingBox();var s=this.width(),l=this.height(),u;if(r=xt(r)?r:0,!isNaN(s)&&!isNaN(l)&&s>0&&l>0&&!isNaN(n.w)&&!isNaN(n.h)&&n.w>0&&n.h>0){u=Math.min((s-2*r)/n.w,(l-2*r)/n.h),u=u>this._private.maxZoom?this._private.maxZoom:u,u=u<this._private.minZoom?this._private.minZoom:u;var h={x:(s-u*(n.x1+n.x2))/2,y:(l-u*(n.y1+n.y2))/2};return{zoom:u,pan:h}}}}},"getFitViewport"),zoomRange:o(function(e,r){var n=this._private;if(r==null){var i=e;e=i.min,r=i.max}return xt(e)&&xt(r)&&e<=r?(n.minZoom=e,n.maxZoom=r):xt(e)&&r===void 0&&e<=n.maxZoom?n.minZoom=e:xt(r)&&e===void 0&&r>=n.minZoom&&(n.maxZoom=r),this},"zoomRange"),minZoom:o(function(e){return e===void 0?this._private.minZoom:this.zoomRange({min:e})},"minZoom"),maxZoom:o(function(e){return e===void 0?this._private.maxZoom:this.zoomRange({max:e})},"maxZoom"),getZoomedViewport:o(function(e){var r=this._private,n=r.pan,i=r.zoom,a,s,l=!1;if(r.zoomingEnabled||(l=!0),xt(e)?s=e:Vr(e)&&(s=e.level,e.position!=null?a=L6(e.position,i,n):e.renderedPosition!=null&&(a=e.renderedPosition),a!=null&&!r.panningEnabled&&(l=!0)),s=s>r.maxZoom?r.maxZoom:s,s=s<r.minZoom?r.minZoom:s,l||!xt(s)||s===i||a!=null&&(!xt(a.x)||!xt(a.y)))return null;if(a!=null){var u=n,h=i,f=s,d={x:-f/h*(a.x-u.x)+a.x,y:-f/h*(a.y-u.y)+a.y};return{zoomed:!0,panned:!0,zoom:f,pan:d}}else return{zoomed:!0,panned:!1,zoom:s,pan:n}},"getZoomedViewport"),zoom:o(function(e){if(e===void 0)return this._private.zoom;var r=this.getZoomedViewport(e),n=this._private;return r==null||!r.zoomed?this:(n.zoom=r.zoom,r.panned&&(n.pan.x=r.pan.x,n.pan.y=r.pan.y),this.emit("zoom"+(r.panned?" pan":"")+" viewport"),this.notify("viewport"),this)},"zoom"),viewport:o(function(e){var r=this._private,n=!0,i=!0,a=[],s=!1,l=!1;if(!e)return this;if(xt(e.zoom)||(n=!1),Vr(e.pan)||(i=!1),!n&&!i)return this;if(n){var u=e.zoom;u<r.minZoom||u>r.maxZoom||!r.zoomingEnabled?s=!0:(r.zoom=u,a.push("zoom"))}if(i&&(!s||!e.cancelOnFailedZoom)&&r.panningEnabled){var h=e.pan;xt(h.x)&&(r.pan.x=h.x,l=!1),xt(h.y)&&(r.pan.y=h.y,l=!1),l||a.push("pan")}return a.length>0&&(a.push("viewport"),this.emit(a.join(" ")),this.notify("viewport")),this},"viewport"),center:o(function(e){var r=this.getCenterPan(e);return r&&(this._private.pan=r,this.emit("pan viewport"),this.notify("viewport")),this},"center"),getCenterPan:o(function(e,r){if(this._private.panningEnabled){if(Zt(e)){var n=e;e=this.mutableElements().filter(n)}else po(e)||(e=this.mutableElements());if(e.length!==0){var i=e.boundingBox(),a=this.width(),s=this.height();r=r===void 0?this._private.zoom:r;var l={x:(a-r*(i.x1+i.x2))/2,y:(s-r*(i.y1+i.y2))/2};return l}}},"getCenterPan"),reset:o(function(){return!this._private.panningEnabled||!this._private.zoomingEnabled?this:(this.viewport({pan:{x:0,y:0},zoom:1}),this)},"reset"),invalidateSize:o(function(){this._private.sizeCache=null},"invalidateSize"),size:o(function(){var e=this._private,r=e.container,n=this;return e.sizeCache=e.sizeCache||(r?function(){var i=n.window().getComputedStyle(r),a=o(function(l){return parseFloat(i.getPropertyValue(l))},"val");return{width:r.clientWidth-a("padding-left")-a("padding-right"),height:r.clientHeight-a("padding-top")-a("padding-bottom")}}():{width:1,height:1})},"size"),width:o(function(){return this.size().width},"width"),height:o(function(){return this.size().height},"height"),extent:o(function(){var e=this._private.pan,r=this._private.zoom,n=this.renderedExtent(),i={x1:(n.x1-e.x)/r,x2:(n.x2-e.x)/r,y1:(n.y1-e.y)/r,y2:(n.y2-e.y)/r};return i.w=i.x2-i.x1,i.h=i.y2-i.y1,i},"extent"),renderedExtent:o(function(){var e=this.width(),r=this.height();return{x1:0,y1:0,x2:e,y2:r,w:e,h:r}},"renderedExtent"),multiClickDebounceTime:o(function(e){if(e)this._private.multiClickDebounceTime=e;else return this._private.multiClickDebounceTime;return this},"multiClickDebounceTime")};U0.centre=U0.center;U0.autolockNodes=U0.autolock;U0.autoungrabifyNodes=U0.autoungrabify;Kx={data:sn.data({field:"data",bindingEvent:"data",allowBinding:!0,allowSetting:!0,settingEvent:"data",settingTriggersEvent:!0,triggerFnName:"trigger",allowGetting:!0,updateStyle:!0}),removeData:sn.removeData({field:"data",event:"data",triggerFnName:"trigger",triggerEvent:!0,updateStyle:!0}),scratch:sn.data({field:"scratch",bindingEvent:"scratch",allowBinding:!0,allowSetting:!0,settingEvent:"scratch",settingTriggersEvent:!0,triggerFnName:"trigger",allowGetting:!0,updateStyle:!0}),removeScratch:sn.removeData({field:"scratch",event:"scratch",triggerFnName:"trigger",triggerEvent:!0,updateStyle:!0})};Kx.attr=Kx.data;Kx.removeAttr=Kx.removeData;Qx=o(function(e){var r=this;e=ir({},e);var n=e.container;n&&!p6(n)&&p6(n[0])&&(n=n[0]);var i=n?n._cyreg:null;i=i||{},i&&i.cy&&(i.cy.destroy(),i={});var a=i.readies=i.readies||[];n&&(n._cyreg=i),i.cy=r;var s=Hi!==void 0&&n!==void 0&&!e.headless,l=e;l.layout=ir({name:s?"grid":"null"},l.layout),l.renderer=ir({name:s?"canvas":"null"},l.renderer);var u=o(function(g,y,v){return y!==void 0?y:v!==void 0?v:g},"defVal"),h=this._private={container:n,ready:!1,options:l,elements:new ba(this),listeners:[],aniEles:new ba(this),data:l.data||{},scratch:{},layout:null,renderer:null,destroyed:!1,notificationsEnabled:!0,minZoom:1e-50,maxZoom:1e50,zoomingEnabled:u(!0,l.zoomingEnabled),userZoomingEnabled:u(!0,l.userZoomingEnabled),panningEnabled:u(!0,l.panningEnabled),userPanningEnabled:u(!0,l.userPanningEnabled),boxSelectionEnabled:u(!0,l.boxSelectionEnabled),autolock:u(!1,l.autolock,l.autolockNodes),autoungrabify:u(!1,l.autoungrabify,l.autoungrabifyNodes),autounselectify:u(!1,l.autounselectify),styleEnabled:l.styleEnabled===void 0?s:l.styleEnabled,zoom:xt(l.zoom)?l.zoom:1,pan:{x:Vr(l.pan)&&xt(l.pan.x)?l.pan.x:0,y:Vr(l.pan)&&xt(l.pan.y)?l.pan.y:0},animation:{current:[],queue:[]},hasCompoundNodes:!1,multiClickDebounceTime:u(250,l.multiClickDebounceTime)};this.createEmitter(),this.selectionType(l.selectionType),this.zoomRange({min:l.minZoom,max:l.maxZoom});var f=o(function(g,y){var v=g.some(Jqe);if(v)return d1.all(g).then(y);y(g)},"loadExtData");h.styleEnabled&&r.setStyle([]);var d=ir({},l,l.renderer);r.initRenderer(d);var p=o(function(g,y,v){r.notifications(!1);var x=r.mutableElements();x.length>0&&x.remove(),g!=null&&(Vr(g)||wn(g))&&r.add(g),r.one("layoutready",function(w){r.notifications(!0),r.emit(w),r.one("load",y),r.emitAndNotify("load")}).one("layoutstop",function(){r.one("done",v),r.emit("done")});var b=ir({},r._private.options.layout);b.eles=r.elements(),r.layout(b).run()},"setElesAndLayout");f([l.style,l.elements],function(m){var g=m[0],y=m[1];h.styleEnabled&&r.style().append(g),p(y,function(){r.startAnimationLoop(),h.ready=!0,ti(l.ready)&&r.on("ready",l.ready);for(var v=0;v<a.length;v++){var x=a[v];r.on("ready",x)}i&&(i.readies=[]),r.emit("ready")},l.done)})},"Core"),w6=Qx.prototype;ir(w6,{instanceString:o(function(){return"core"},"instanceString"),isReady:o(function(){return this._private.ready},"isReady"),destroyed:o(function(){return this._private.destroyed},"destroyed"),ready:o(function(e){return this.isReady()?this.emitter().emit("ready",[],e):this.on("ready",e),this},"ready"),destroy:o(function(){var e=this;if(!e.destroyed())return e.stopAnimationLoop(),e.destroyRenderer(),this.emit("destroy"),e._private.destroyed=!0,e},"destroy"),hasElementWithId:o(function(e){return this._private.elements.hasElementWithId(e)},"hasElementWithId"),getElementById:o(function(e){return this._private.elements.getElementById(e)},"getElementById"),hasCompoundNodes:o(function(){return this._private.hasCompoundNodes},"hasCompoundNodes"),headless:o(function(){return this._private.renderer.isHeadless()},"headless"),styleEnabled:o(function(){return this._private.styleEnabled},"styleEnabled"),addToPool:o(function(e){return this._private.elements.merge(e),this},"addToPool"),removeFromPool:o(function(e){return this._private.elements.unmerge(e),this},"removeFromPool"),container:o(function(){return this._private.container||null},"container"),window:o(function(){var e=this._private.container;if(e==null)return Hi;var r=this._private.container.ownerDocument;return r===void 0||r==null?Hi:r.defaultView||Hi},"window"),mount:o(function(e){if(e!=null){var r=this,n=r._private,i=n.options;return!p6(e)&&p6(e[0])&&(e=e[0]),r.stopAnimationLoop(),r.destroyRenderer(),n.container=e,n.styleEnabled=!0,r.invalidateSize(),r.initRenderer(ir({},i,i.renderer,{name:i.renderer.name==="null"?"canvas":i.renderer.name})),r.startAnimationLoop(),r.style(i.style),r.emit("mount"),r}},"mount"),unmount:o(function(){var e=this;return e.stopAnimationLoop(),e.destroyRenderer(),e.initRenderer({name:"null"}),e.emit("unmount"),e},"unmount"),options:o(function(){return Vc(this._private.options)},"options"),json:o(function(e){var r=this,n=r._private,i=r.mutableElements(),a=o(function(_){return r.getElementById(_.id())},"getFreshRef");if(Vr(e)){if(r.startBatch(),e.elements){var s={},l=o(function(_,T){for(var E=[],L=[],C=0;C<_.length;C++){var A=_[C];if(!A.data.id){on("cy.json() cannot handle elements without an ID attribute");continue}var I=""+A.data.id,D=r.getElementById(I);s[I]=!0,D.length!==0?L.push({ele:D,json:A}):(T&&(A.group=T),E.push(A))}r.add(E);for(var k=0;k<L.length;k++){var R=L[k],S=R.ele,O=R.json;S.json(O)}},"updateEles");if(wn(e.elements))l(e.elements);else for(var u=["nodes","edges"],h=0;h<u.length;h++){var f=u[h],d=e.elements[f];wn(d)&&l(d,f)}var p=r.collection();i.filter(function(w){return!s[w.id()]}).forEach(function(w){w.isParent()?p.merge(w):w.remove()}),p.forEach(function(w){return w.children().move({parent:null})}),p.forEach(function(w){return a(w).remove()})}e.style&&r.style(e.style),e.zoom!=null&&e.zoom!==n.zoom&&r.zoom(e.zoom),e.pan&&(e.pan.x!==n.pan.x||e.pan.y!==n.pan.y)&&r.pan(e.pan),e.data&&r.data(e.data);for(var m=["minZoom","maxZoom","zoomingEnabled","userZoomingEnabled","panningEnabled","userPanningEnabled","boxSelectionEnabled","autolock","autoungrabify","autounselectify","multiClickDebounceTime"],g=0;g<m.length;g++){var y=m[g];e[y]!=null&&r[y](e[y])}return r.endBatch(),this}else{var v=!!e,x={};v?x.elements=this.elements().map(function(w){return w.json()}):(x.elements={},i.forEach(function(w){var _=w.group();x.elements[_]||(x.elements[_]=[]),x.elements[_].push(w.json())})),this._private.styleEnabled&&(x.style=r.style().json()),x.data=Vc(r.data());var b=n.options;return x.zoomingEnabled=n.zoomingEnabled,x.userZoomingEnabled=n.userZoomingEnabled,x.zoom=n.zoom,x.minZoom=n.minZoom,x.maxZoom=n.maxZoom,x.panningEnabled=n.panningEnabled,x.userPanningEnabled=n.userPanningEnabled,x.pan=Vc(n.pan),x.boxSelectionEnabled=n.boxSelectionEnabled,x.renderer=Vc(b.renderer),x.hideEdgesOnViewport=b.hideEdgesOnViewport,x.textureOnViewport=b.textureOnViewport,x.wheelSensitivity=b.wheelSensitivity,x.motionBlur=b.motionBlur,x.multiClickDebounceTime=b.multiClickDebounceTime,x}},"json")});w6.$id=w6.getElementById;[zJe,HJe,Kge,UP,u6,YJe,HP,h6,jJe,U0,Kx].forEach(function(t){ir(w6,t)});QJe={fit:!0,directed:!1,padding:30,circle:!1,grid:!1,spacingFactor:1.75,boundingBox:void 0,avoidOverlap:!0,nodeDimensionsIncludeLabels:!1,roots:void 0,depthSort:void 0,animate:!1,animationDuration:500,animationEasing:void 0,animateFilter:o(function(e,r){return!0},"animateFilter"),ready:void 0,stop:void 0,transform:o(function(e,r){return r},"transform")},ZJe={maximal:!1,acyclic:!1},Jg=o(function(e){return e.scratch("breadthfirst")},"getInfo"),Eme=o(function(e,r){return e.scratch("breadthfirst",r)},"setInfo");o(Qge,"BreadthFirstLayout");Qge.prototype.run=function(){var t=this.options,e=t,r=t.cy,n=e.eles,i=n.nodes().filter(function(ce){return!ce.isParent()}),a=n,s=e.directed,l=e.acyclic||e.maximal||e.maximalAdjustments>0,u=$s(e.boundingBox?e.boundingBox:{x1:0,y1:0,w:r.width(),h:r.height()}),h;if(po(e.roots))h=e.roots;else if(wn(e.roots)){for(var f=[],d=0;d<e.roots.length;d++){var p=e.roots[d],m=r.getElementById(p);f.push(m)}h=r.collection(f)}else if(Zt(e.roots))h=r.$(e.roots);else if(s)h=i.roots();else{var g=n.components();h=r.collection();for(var y=o(function(te){var De=g[te],oe=De.maxDegree(!1),ke=De.filter(function(Fe){return Fe.degree(!1)===oe});h=h.add(ke)},"_loop"),v=0;v<g.length;v++)y(v)}var x=[],b={},w=o(function(te,De){x[De]==null&&(x[De]=[]);var oe=x[De].length;x[De].push(te),Eme(te,{index:oe,depth:De})},"addToDepth"),_=o(function(te,De){var oe=Jg(te),ke=oe.depth,Fe=oe.index;x[ke][Fe]=null,w(te,De)},"changeDepth");a.bfs({roots:h,directed:e.directed,visit:o(function(te,De,oe,ke,Fe){var Be=te[0],Ve=Be.id();w(Be,Fe),b[Ve]=!0},"visit")});for(var T=[],E=0;E<i.length;E++){var L=i[E];b[L.id()]||T.push(L)}var C=o(function(te){for(var De=x[te],oe=0;oe<De.length;oe++){var ke=De[oe];if(ke==null){De.splice(oe,1),oe--;continue}Eme(ke,{depth:te,index:oe})}},"assignDepthsAt"),A=o(function(){for(var te=0;te<x.length;te++)C(te)},"assignDepths"),I=o(function(te,De){for(var oe=Jg(te),ke=te.incomers().filter(function(X){return X.isNode()&&n.has(X)}),Fe=-1,Be=te.id(),Ve=0;Ve<ke.length;Ve++){var Ge=ke[Ve],He=Jg(Ge);Fe=Math.max(Fe,He.depth)}if(oe.depth<=Fe){if(!e.acyclic&&De[Be])return null;var xe=Fe+1;return _(te,xe),De[Be]=xe,!0}return!1},"adjustMaximally");if(s&&l){var D=[],k={},R=o(function(te){return D.push(te)},"enqueue"),S=o(function(){return D.shift()},"dequeue");for(i.forEach(function(ce){return D.push(ce)});D.length>0;){var O=S(),N=I(O,k);if(N)O.outgoers().filter(function(ce){return ce.isNode()&&n.has(ce)}).forEach(R);else if(N===null){on("Detected double maximal shift for node `"+O.id()+"`. Bailing maximal adjustment due to cycle. Use `options.maximal: true` only on DAGs.");break}}}A();var P=0;if(e.avoidOverlap)for(var F=0;F<i.length;F++){var B=i[F],$=B.layoutDimensions(e),z=$.w,W=$.h;P=Math.max(P,z,W)}var j={},K=o(function(te){if(j[te.id()])return j[te.id()];for(var De=Jg(te).depth,oe=te.neighborhood(),ke=0,Fe=0,Be=0;Be<oe.length;Be++){var Ve=oe[Be];if(!(Ve.isEdge()||Ve.isParent()||!i.has(Ve))){var Ge=Jg(Ve);if(Ge!=null){var He=Ge.index,xe=Ge.depth;if(!(He==null||xe==null)){var X=x[xe].length;xe<De&&(ke+=He/X,Fe++)}}}}return Fe=Math.max(1,Fe),ke=ke/Fe,Fe===0&&(ke=0),j[te.id()]=ke,ke},"getWeightedPercent"),ie=o(function(te,De){var oe=K(te),ke=K(De),Fe=oe-ke;return Fe===0?Qme(te.id(),De.id()):Fe},"sortFn");e.depthSort!==void 0&&(ie=e.depthSort);for(var Q=0;Q<x.length;Q++)x[Q].sort(ie),C(Q);for(var ee=[],J=0;J<T.length;J++)ee.push(T[J]);x.unshift(ee),A();for(var H=0,q=0;q<x.length;q++)H=Math.max(x[q].length,H);var Z={x:u.x1+u.w/2,y:u.x1+u.h/2},ae=x.reduce(function(ce,te){return Math.max(ce,te.length)},0),ue=o(function(te){var De=Jg(te),oe=De.depth,ke=De.index,Fe=x[oe].length,Be=Math.max(u.w/((e.grid?ae:Fe)+1),P),Ve=Math.max(u.h/(x.length+1),P),Ge=Math.min(u.w/2/x.length,u.h/2/x.length);if(Ge=Math.max(Ge,P),e.circle){var xe=Ge*oe+Ge-(x.length>0&&x[0].length<=3?Ge/2:0),X=2*Math.PI/x[oe].length*ke;return oe===0&&x[0].length===1&&(xe=1),{x:Z.x+xe*Math.cos(X),y:Z.y+xe*Math.sin(X)}}else{var He={x:Z.x+(ke+1-(Fe+1)/2)*Be,y:(oe+1)*Ve};return He}},"getPosition");return n.nodes().layoutPositions(this,e,ue),this};JJe={fit:!0,padding:30,boundingBox:void 0,avoidOverlap:!0,nodeDimensionsIncludeLabels:!1,spacingFactor:void 0,radius:void 0,startAngle:3/2*Math.PI,sweep:void 0,clockwise:!0,sort:void 0,animate:!1,animationDuration:500,animationEasing:void 0,animateFilter:o(function(e,r){return!0},"animateFilter"),ready:void 0,stop:void 0,transform:o(function(e,r){return r},"transform")};o(Zge,"CircleLayout");Zge.prototype.run=function(){var t=this.options,e=t,r=t.cy,n=e.eles,i=e.counterclockwise!==void 0?!e.counterclockwise:e.clockwise,a=n.nodes().not(":parent");e.sort&&(a=a.sort(e.sort));for(var s=$s(e.boundingBox?e.boundingBox:{x1:0,y1:0,w:r.width(),h:r.height()}),l={x:s.x1+s.w/2,y:s.y1+s.h/2},u=e.sweep===void 0?2*Math.PI-2*Math.PI/a.length:e.sweep,h=u/Math.max(1,a.length-1),f,d=0,p=0;p<a.length;p++){var m=a[p],g=m.layoutDimensions(e),y=g.w,v=g.h;d=Math.max(d,y,v)}if(xt(e.radius)?f=e.radius:a.length<=1?f=0:f=Math.min(s.h,s.w)/2-d,a.length>1&&e.avoidOverlap){d*=1.75;var x=Math.cos(h)-Math.cos(0),b=Math.sin(h)-Math.sin(0),w=Math.sqrt(d*d/(x*x+b*b));f=Math.max(w,f)}var _=o(function(E,L){var C=e.startAngle+L*h*(i?1:-1),A=f*Math.cos(C),I=f*Math.sin(C),D={x:l.x+A,y:l.y+I};return D},"getPos");return n.nodes().layoutPositions(this,e,_),this};eet={fit:!0,padding:30,startAngle:3/2*Math.PI,sweep:void 0,clockwise:!0,equidistant:!1,minNodeSpacing:10,boundingBox:void 0,avoidOverlap:!0,nodeDimensionsIncludeLabels:!1,height:void 0,width:void 0,spacingFactor:void 0,concentric:o(function(e){return e.degree()},"concentric"),levelWidth:o(function(e){return e.maxDegree()/4},"levelWidth"),animate:!1,animationDuration:500,animationEasing:void 0,animateFilter:o(function(e,r){return!0},"animateFilter"),ready:void 0,stop:void 0,transform:o(function(e,r){return r},"transform")};o(Jge,"ConcentricLayout");Jge.prototype.run=function(){for(var t=this.options,e=t,r=e.counterclockwise!==void 0?!e.counterclockwise:e.clockwise,n=t.cy,i=e.eles,a=i.nodes().not(":parent"),s=$s(e.boundingBox?e.boundingBox:{x1:0,y1:0,w:n.width(),h:n.height()}),l={x:s.x1+s.w/2,y:s.y1+s.h/2},u=[],h=0,f=0;f<a.length;f++){var d=a[f],p=void 0;p=e.concentric(d),u.push({value:p,node:d}),d._private.scratch.concentric=p}a.updateStyle();for(var m=0;m<a.length;m++){var g=a[m],y=g.layoutDimensions(e);h=Math.max(h,y.w,y.h)}u.sort(function(ce,te){return te.value-ce.value});for(var v=e.levelWidth(a),x=[[]],b=x[0],w=0;w<u.length;w++){var _=u[w];if(b.length>0){var T=Math.abs(b[0].value-_.value);T>=v&&(b=[],x.push(b))}b.push(_)}var E=h+e.minNodeSpacing;if(!e.avoidOverlap){var L=x.length>0&&x[0].length>1,C=Math.min(s.w,s.h)/2-E,A=C/(x.length+L?1:0);E=Math.min(E,A)}for(var I=0,D=0;D<x.length;D++){var k=x[D],R=e.sweep===void 0?2*Math.PI-2*Math.PI/k.length:e.sweep,S=k.dTheta=R/Math.max(1,k.length-1);if(k.length>1&&e.avoidOverlap){var O=Math.cos(S)-Math.cos(0),N=Math.sin(S)-Math.sin(0),P=Math.sqrt(E*E/(O*O+N*N));I=Math.max(P,I)}k.r=I,I+=E}if(e.equidistant){for(var F=0,B=0,$=0;$<x.length;$++){var z=x[$],W=z.r-B;F=Math.max(F,W)}B=0;for(var j=0;j<x.length;j++){var K=x[j];j===0&&(B=K.r),K.r=B,B+=F}}for(var ie={},Q=0;Q<x.length;Q++)for(var ee=x[Q],J=ee.dTheta,H=ee.r,q=0;q<ee.length;q++){var Z=ee[q],ae=e.startAngle+(r?1:-1)*J*q,ue={x:l.x+H*Math.cos(ae),y:l.y+H*Math.sin(ae)};ie[Z.node.id()]=ue}return i.nodes().layoutPositions(this,e,function(ce){var te=ce.id();return ie[te]}),this};tet={ready:o(function(){},"ready"),stop:o(function(){},"stop"),animate:!0,animationEasing:void 0,animationDuration:void 0,animateFilter:o(function(e,r){return!0},"animateFilter"),animationThreshold:250,refresh:20,fit:!0,padding:30,boundingBox:void 0,nodeDimensionsIncludeLabels:!1,randomize:!1,componentSpacing:40,nodeRepulsion:o(function(e){return 2048},"nodeRepulsion"),nodeOverlap:4,idealEdgeLength:o(function(e){return 32},"idealEdgeLength"),edgeElasticity:o(function(e){return 32},"edgeElasticity"),nestingFactor:1.2,gravity:1,numIter:1e3,initialTemp:1e3,coolingFactor:.99,minTemp:1};o(G6,"CoseLayout");G6.prototype.run=function(){var t=this.options,e=t.cy,r=this;r.stopped=!1,(t.animate===!0||t.animate===!1)&&r.emit({type:"layoutstart",layout:r}),t.debug===!0?MP=!0:MP=!1;var n=ret(e,r,t);MP&&aet(n),t.randomize&&set(n);var i=Xu(),a=o(function(){oet(n,e,t),t.fit===!0&&e.fit(t.padding)},"refresh"),s=o(function(p){return!(r.stopped||p>=t.numIter||(cet(n,t),n.temperature=n.temperature*t.coolingFactor,n.temperature<t.minTemp))},"mainLoop"),l=o(function(){if(t.animate===!0||t.animate===!1)a(),r.one("layoutstop",t.stop),r.emit({type:"layoutstop",layout:r});else{var p=t.eles.nodes(),m=e1e(n,t,p);p.layoutPositions(r,t,m)}},"done"),u=0,h=!0;if(t.animate===!0){var f=o(function d(){for(var p=0;h&&p<t.refresh;)h=s(u),u++,p++;if(!h)Cme(n,t),l();else{var m=Xu();m-i>=t.animationThreshold&&a(),m6(d)}},"frame");f()}else{for(;h;)h=s(u),u++;Cme(n,t),l()}return this};G6.prototype.stop=function(){return this.stopped=!0,this.thread&&this.thread.stop(),this.emit("layoutstop"),this};G6.prototype.destroy=function(){return this.thread&&this.thread.stop(),this};ret=o(function(e,r,n){for(var i=n.eles.edges(),a=n.eles.nodes(),s=$s(n.boundingBox?n.boundingBox:{x1:0,y1:0,w:e.width(),h:e.height()}),l={isCompound:e.hasCompoundNodes(),layoutNodes:[],idToIndex:{},nodeSize:a.size(),graphSet:[],indexToGraph:[],layoutEdges:[],edgeSize:i.size(),temperature:n.initialTemp,clientWidth:s.w,clientHeight:s.h,boundingBox:s},u=n.eles.components(),h={},f=0;f<u.length;f++)for(var d=u[f],p=0;p<d.length;p++){var m=d[p];h[m.id()]=f}for(var f=0;f<l.nodeSize;f++){var g=a[f],y=g.layoutDimensions(n),v={};v.isLocked=g.locked(),v.id=g.data("id"),v.parentId=g.data("parent"),v.cmptId=h[g.id()],v.children=[],v.positionX=g.position("x"),v.positionY=g.position("y"),v.offsetX=0,v.offsetY=0,v.height=y.w,v.width=y.h,v.maxX=v.positionX+v.width/2,v.minX=v.positionX-v.width/2,v.maxY=v.positionY+v.height/2,v.minY=v.positionY-v.height/2,v.padLeft=parseFloat(g.style("padding")),v.padRight=parseFloat(g.style("padding")),v.padTop=parseFloat(g.style("padding")),v.padBottom=parseFloat(g.style("padding")),v.nodeRepulsion=ti(n.nodeRepulsion)?n.nodeRepulsion(g):n.nodeRepulsion,l.layoutNodes.push(v),l.idToIndex[v.id]=f}for(var x=[],b=0,w=-1,_=[],f=0;f<l.nodeSize;f++){var g=l.layoutNodes[f],T=g.parentId;T!=null?l.layoutNodes[l.idToIndex[T]].children.push(g.id):(x[++w]=g.id,_.push(g.id))}for(l.graphSet.push(_);b<=w;){var E=x[b++],L=l.idToIndex[E],m=l.layoutNodes[L],C=m.children;if(C.length>0){l.graphSet.push(C);for(var f=0;f<C.length;f++)x[++w]=C[f]}}for(var f=0;f<l.graphSet.length;f++)for(var A=l.graphSet[f],p=0;p<A.length;p++){var I=l.idToIndex[A[p]];l.indexToGraph[I]=f}for(var f=0;f<l.edgeSize;f++){var D=i[f],k={};k.id=D.data("id"),k.sourceId=D.data("source"),k.targetId=D.data("target");var R=ti(n.idealEdgeLength)?n.idealEdgeLength(D):n.idealEdgeLength,S=ti(n.edgeElasticity)?n.edgeElasticity(D):n.edgeElasticity,O=l.idToIndex[k.sourceId],N=l.idToIndex[k.targetId],P=l.indexToGraph[O],F=l.indexToGraph[N];if(P!=F){for(var B=net(k.sourceId,k.targetId,l),$=l.graphSet[B],z=0,v=l.layoutNodes[O];$.indexOf(v.id)===-1;)v=l.layoutNodes[l.idToIndex[v.parentId]],z++;for(v=l.layoutNodes[N];$.indexOf(v.id)===-1;)v=l.layoutNodes[l.idToIndex[v.parentId]],z++;R*=z*n.nestingFactor}k.idealLength=R,k.elasticity=S,l.layoutEdges.push(k)}return l},"createLayoutInfo"),net=o(function(e,r,n){var i=iet(e,r,0,n);return 2>i.count?0:i.graph},"findLCA"),iet=o(function t(e,r,n,i){var a=i.graphSet[n];if(-1<a.indexOf(e)&&-1<a.indexOf(r))return{count:2,graph:n};for(var s=0,l=0;l<a.length;l++){var u=a[l],h=i.idToIndex[u],f=i.layoutNodes[h].children;if(f.length!==0){var d=i.indexToGraph[i.idToIndex[f[0]]],p=t(e,r,d,i);if(p.count!==0)if(p.count===1){if(s++,s===2)break}else return p}}return{count:s,graph:n}},"findLCA_aux"),set=o(function(e,r){for(var n=e.clientWidth,i=e.clientHeight,a=0;a<e.nodeSize;a++){var s=e.layoutNodes[a];s.children.length===0&&!s.isLocked&&(s.positionX=Math.random()*n,s.positionY=Math.random()*i)}},"randomizePositions"),e1e=o(function(e,r,n){var i=e.boundingBox,a={x1:1/0,x2:-1/0,y1:1/0,y2:-1/0};return r.boundingBox&&(n.forEach(function(s){var l=e.layoutNodes[e.idToIndex[s.data("id")]];a.x1=Math.min(a.x1,l.positionX),a.x2=Math.max(a.x2,l.positionX),a.y1=Math.min(a.y1,l.positionY),a.y2=Math.max(a.y2,l.positionY)}),a.w=a.x2-a.x1,a.h=a.y2-a.y1),function(s,l){var u=e.layoutNodes[e.idToIndex[s.data("id")]];if(r.boundingBox){var h=(u.positionX-a.x1)/a.w,f=(u.positionY-a.y1)/a.h;return{x:i.x1+h*i.w,y:i.y1+f*i.h}}else return{x:u.positionX,y:u.positionY}}},"getScaleInBoundsFn"),oet=o(function(e,r,n){var i=n.layout,a=n.eles.nodes(),s=e1e(e,n,a);a.positions(s),e.ready!==!0&&(e.ready=!0,i.one("layoutready",n.ready),i.emit({type:"layoutready",layout:this}))},"refreshPositions"),cet=o(function(e,r,n){uet(e,r),det(e),pet(e,r),met(e),get(e)},"step"),uet=o(function(e,r){for(var n=0;n<e.graphSet.length;n++)for(var i=e.graphSet[n],a=i.length,s=0;s<a;s++)for(var l=e.layoutNodes[e.idToIndex[i[s]]],u=s+1;u<a;u++){var h=e.layoutNodes[e.idToIndex[i[u]]];het(l,h,e,r)}},"calculateNodeForces"),Sme=o(function(e){return-e+2*e*Math.random()},"randomDistance"),het=o(function(e,r,n,i){var a=e.cmptId,s=r.cmptId;if(!(a!==s&&!n.isCompound)){var l=r.positionX-e.positionX,u=r.positionY-e.positionY,h=1;l===0&&u===0&&(l=Sme(h),u=Sme(h));var f=fet(e,r,l,u);if(f>0)var d=i.nodeOverlap*f,p=Math.sqrt(l*l+u*u),m=d*l/p,g=d*u/p;else var y=T6(e,l,u),v=T6(r,-1*l,-1*u),x=v.x-y.x,b=v.y-y.y,w=x*x+b*b,p=Math.sqrt(w),d=(e.nodeRepulsion+r.nodeRepulsion)/w,m=d*x/p,g=d*b/p;e.isLocked||(e.offsetX-=m,e.offsetY-=g),r.isLocked||(r.offsetX+=m,r.offsetY+=g)}},"nodeRepulsion"),fet=o(function(e,r,n,i){if(n>0)var a=e.maxX-r.minX;else var a=r.maxX-e.minX;if(i>0)var s=e.maxY-r.minY;else var s=r.maxY-e.minY;return a>=0&&s>=0?Math.sqrt(a*a+s*s):0},"nodesOverlap"),T6=o(function(e,r,n){var i=e.positionX,a=e.positionY,s=e.height||1,l=e.width||1,u=n/r,h=s/l,f={};return r===0&&0<n||r===0&&0>n?(f.x=i,f.y=a+s/2,f):0<r&&-1*h<=u&&u<=h?(f.x=i+l/2,f.y=a+l*n/2/r,f):0>r&&-1*h<=u&&u<=h?(f.x=i-l/2,f.y=a-l*n/2/r,f):0<n&&(u<=-1*h||u>=h)?(f.x=i+s*r/2/n,f.y=a+s/2,f):(0>n&&(u<=-1*h||u>=h)&&(f.x=i-s*r/2/n,f.y=a-s/2),f)},"findClippingPoint"),det=o(function(e,r){for(var n=0;n<e.edgeSize;n++){var i=e.layoutEdges[n],a=e.idToIndex[i.sourceId],s=e.layoutNodes[a],l=e.idToIndex[i.targetId],u=e.layoutNodes[l],h=u.positionX-s.positionX,f=u.positionY-s.positionY;if(!(h===0&&f===0)){var d=T6(s,h,f),p=T6(u,-1*h,-1*f),m=p.x-d.x,g=p.y-d.y,y=Math.sqrt(m*m+g*g),v=Math.pow(i.idealLength-y,2)/i.elasticity;if(y!==0)var x=v*m/y,b=v*g/y;else var x=0,b=0;s.isLocked||(s.offsetX+=x,s.offsetY+=b),u.isLocked||(u.offsetX-=x,u.offsetY-=b)}}},"calculateEdgeForces"),pet=o(function(e,r){if(r.gravity!==0)for(var n=1,i=0;i<e.graphSet.length;i++){var a=e.graphSet[i],s=a.length;if(i===0)var l=e.clientHeight/2,u=e.clientWidth/2;else var h=e.layoutNodes[e.idToIndex[a[0]]],f=e.layoutNodes[e.idToIndex[h.parentId]],l=f.positionX,u=f.positionY;for(var d=0;d<s;d++){var p=e.layoutNodes[e.idToIndex[a[d]]];if(!p.isLocked){var m=l-p.positionX,g=u-p.positionY,y=Math.sqrt(m*m+g*g);if(y>n){var v=r.gravity*m/y,x=r.gravity*g/y;p.offsetX+=v,p.offsetY+=x}}}}},"calculateGravityForces"),met=o(function(e,r){var n=[],i=0,a=-1;for(n.push.apply(n,e.graphSet[0]),a+=e.graphSet[0].length;i<=a;){var s=n[i++],l=e.idToIndex[s],u=e.layoutNodes[l],h=u.children;if(0<h.length&&!u.isLocked){for(var f=u.offsetX,d=u.offsetY,p=0;p<h.length;p++){var m=e.layoutNodes[e.idToIndex[h[p]]];m.offsetX+=f,m.offsetY+=d,n[++a]=h[p]}u.offsetX=0,u.offsetY=0}}},"propagateForces"),get=o(function(e,r){for(var n=0;n<e.nodeSize;n++){var i=e.layoutNodes[n];0<i.children.length&&(i.maxX=void 0,i.minX=void 0,i.maxY=void 0,i.minY=void 0)}for(var n=0;n<e.nodeSize;n++){var i=e.layoutNodes[n];if(!(0<i.children.length||i.isLocked)){var a=yet(i.offsetX,i.offsetY,e.temperature);i.positionX+=a.x,i.positionY+=a.y,i.offsetX=0,i.offsetY=0,i.minX=i.positionX-i.width,i.maxX=i.positionX+i.width,i.minY=i.positionY-i.height,i.maxY=i.positionY+i.height,vet(i,e)}}for(var n=0;n<e.nodeSize;n++){var i=e.layoutNodes[n];0<i.children.length&&!i.isLocked&&(i.positionX=(i.maxX+i.minX)/2,i.positionY=(i.maxY+i.minY)/2,i.width=i.maxX-i.minX,i.height=i.maxY-i.minY)}},"updatePositions"),yet=o(function(e,r,n){var i=Math.sqrt(e*e+r*r);if(i>n)var a={x:n*e/i,y:n*r/i};else var a={x:e,y:r};return a},"limitForce"),vet=o(function t(e,r){var n=e.parentId;if(n!=null){var i=r.layoutNodes[r.idToIndex[n]],a=!1;if((i.maxX==null||e.maxX+i.padRight>i.maxX)&&(i.maxX=e.maxX+i.padRight,a=!0),(i.minX==null||e.minX-i.padLeft<i.minX)&&(i.minX=e.minX-i.padLeft,a=!0),(i.maxY==null||e.maxY+i.padBottom>i.maxY)&&(i.maxY=e.maxY+i.padBottom,a=!0),(i.minY==null||e.minY-i.padTop<i.minY)&&(i.minY=e.minY-i.padTop,a=!0),a)return t(i,r)}},"updateAncestryBoundaries"),Cme=o(function(e,r){for(var n=e.layoutNodes,i=[],a=0;a<n.length;a++){var s=n[a],l=s.cmptId,u=i[l]=i[l]||[];u.push(s)}for(var h=0,a=0;a<i.length;a++){var f=i[a];if(f){f.x1=1/0,f.x2=-1/0,f.y1=1/0,f.y2=-1/0;for(var d=0;d<f.length;d++){var p=f[d];f.x1=Math.min(f.x1,p.positionX-p.width/2),f.x2=Math.max(f.x2,p.positionX+p.width/2),f.y1=Math.min(f.y1,p.positionY-p.height/2),f.y2=Math.max(f.y2,p.positionY+p.height/2)}f.w=f.x2-f.x1,f.h=f.y2-f.y1,h+=f.w*f.h}}i.sort(function(b,w){return w.w*w.h-b.w*b.h});for(var m=0,g=0,y=0,v=0,x=Math.sqrt(h)*e.clientWidth/e.clientHeight,a=0;a<i.length;a++){var f=i[a];if(f){for(var d=0;d<f.length;d++){var p=f[d];p.isLocked||(p.positionX+=m-f.x1,p.positionY+=g-f.y1)}m+=f.w+r.componentSpacing,y+=f.w+r.componentSpacing,v=Math.max(v,f.h),y>x&&(g+=v+r.componentSpacing,m=0,y=0,v=0)}}},"separateComponents"),xet={fit:!0,padding:30,boundingBox:void 0,avoidOverlap:!0,avoidOverlapPadding:10,nodeDimensionsIncludeLabels:!1,spacingFactor:void 0,condense:!1,rows:void 0,cols:void 0,position:o(function(e){},"position"),sort:void 0,animate:!1,animationDuration:500,animationEasing:void 0,animateFilter:o(function(e,r){return!0},"animateFilter"),ready:void 0,stop:void 0,transform:o(function(e,r){return r},"transform")};o(t1e,"GridLayout");t1e.prototype.run=function(){var t=this.options,e=t,r=t.cy,n=e.eles,i=n.nodes().not(":parent");e.sort&&(i=i.sort(e.sort));var a=$s(e.boundingBox?e.boundingBox:{x1:0,y1:0,w:r.width(),h:r.height()});if(a.h===0||a.w===0)n.nodes().layoutPositions(this,e,function(j){return{x:a.x1,y:a.y1}});else{var s=i.size(),l=Math.sqrt(s*a.h/a.w),u=Math.round(l),h=Math.round(a.w/a.h*l),f=o(function(K){if(K==null)return Math.min(u,h);var ie=Math.min(u,h);ie==u?u=K:h=K},"small"),d=o(function(K){if(K==null)return Math.max(u,h);var ie=Math.max(u,h);ie==u?u=K:h=K},"large"),p=e.rows,m=e.cols!=null?e.cols:e.columns;if(p!=null&&m!=null)u=p,h=m;else if(p!=null&&m==null)u=p,h=Math.ceil(s/u);else if(p==null&&m!=null)h=m,u=Math.ceil(s/h);else if(h*u>s){var g=f(),y=d();(g-1)*y>=s?f(g-1):(y-1)*g>=s&&d(y-1)}else for(;h*u<s;){var v=f(),x=d();(x+1)*v>=s?d(x+1):f(v+1)}var b=a.w/h,w=a.h/u;if(e.condense&&(b=0,w=0),e.avoidOverlap)for(var _=0;_<i.length;_++){var T=i[_],E=T._private.position;(E.x==null||E.y==null)&&(E.x=0,E.y=0);var L=T.layoutDimensions(e),C=e.avoidOverlapPadding,A=L.w+C,I=L.h+C;b=Math.max(b,A),w=Math.max(w,I)}for(var D={},k=o(function(K,ie){return!!D["c-"+K+"-"+ie]},"used"),R=o(function(K,ie){D["c-"+K+"-"+ie]=!0},"use"),S=0,O=0,N=o(function(){O++,O>=h&&(O=0,S++)},"moveToNextCell"),P={},F=0;F<i.length;F++){var B=i[F],$=e.position(B);if($&&($.row!==void 0||$.col!==void 0)){var z={row:$.row,col:$.col};if(z.col===void 0)for(z.col=0;k(z.row,z.col);)z.col++;else if(z.row===void 0)for(z.row=0;k(z.row,z.col);)z.row++;P[B.id()]=z,R(z.row,z.col)}}var W=o(function(K,ie){var Q,ee;if(K.locked()||K.isParent())return!1;var J=P[K.id()];if(J)Q=J.col*b+b/2+a.x1,ee=J.row*w+w/2+a.y1;else{for(;k(S,O);)N();Q=O*b+b/2+a.x1,ee=S*w+w/2+a.y1,R(S,O),N()}return{x:Q,y:ee}},"getPos");i.layoutPositions(this,e,W)}return this};bet={ready:o(function(){},"ready"),stop:o(function(){},"stop")};o(vB,"NullLayout");vB.prototype.run=function(){var t=this.options,e=t.eles,r=this;return t.cy,r.emit("layoutstart"),e.nodes().positions(function(){return{x:0,y:0}}),r.one("layoutready",t.ready),r.emit("layoutready"),r.one("layoutstop",t.stop),r.emit("layoutstop"),this};vB.prototype.stop=function(){return this};wet={positions:void 0,zoom:void 0,pan:void 0,fit:!0,padding:30,spacingFactor:void 0,animate:!1,animationDuration:500,animationEasing:void 0,animateFilter:o(function(e,r){return!0},"animateFilter"),ready:void 0,stop:void 0,transform:o(function(e,r){return r},"transform")};o(r1e,"PresetLayout");r1e.prototype.run=function(){var t=this.options,e=t.eles,r=e.nodes(),n=ti(t.positions);function i(a){if(t.positions==null)return Eje(a.position());if(n)return t.positions(a);var s=t.positions[a._private.data.id];return s??null}return o(i,"getPosition"),r.layoutPositions(this,t,function(a,s){var l=i(a);return a.locked()||l==null?!1:l}),this};Tet={fit:!0,padding:30,boundingBox:void 0,animate:!1,animationDuration:500,animationEasing:void 0,animateFilter:o(function(e,r){return!0},"animateFilter"),ready:void 0,stop:void 0,transform:o(function(e,r){return r},"transform")};o(n1e,"RandomLayout");n1e.prototype.run=function(){var t=this.options,e=t.cy,r=t.eles,n=$s(t.boundingBox?t.boundingBox:{x1:0,y1:0,w:e.width(),h:e.height()}),i=o(function(s,l){return{x:n.x1+Math.round(Math.random()*n.w),y:n.y1+Math.round(Math.random()*n.h)}},"getPos");return r.nodes().layoutPositions(this,t,i),this};ket=[{name:"breadthfirst",impl:Qge},{name:"circle",impl:Zge},{name:"concentric",impl:Jge},{name:"cose",impl:G6},{name:"grid",impl:t1e},{name:"null",impl:vB},{name:"preset",impl:r1e},{name:"random",impl:n1e}];o(i1e,"NullRenderer");Ame=o(function(){},"noop"),_me=o(function(){throw new Error("A headless instance can not render images")},"throwImgErr");i1e.prototype={recalculateRenderedStyle:Ame,notify:o(function(){this.notifications++},"notify"),init:Ame,isHeadless:o(function(){return!0},"isHeadless"),png:_me,jpg:_me};xB={};xB.arrowShapeWidth=.3;xB.registerArrowShapes=function(){var t=this.arrowShapes={},e=this,r=o(function(h,f,d,p,m,g,y){var v=m.x-d/2-y,x=m.x+d/2+y,b=m.y-d/2-y,w=m.y+d/2+y,_=v<=h&&h<=x&&b<=f&&f<=w;return _},"bbCollide"),n=o(function(h,f,d,p,m){var g=h*Math.cos(p)-f*Math.sin(p),y=h*Math.sin(p)+f*Math.cos(p),v=g*d,x=y*d,b=v+m.x,w=x+m.y;return{x:b,y:w}},"transform"),i=o(function(h,f,d,p){for(var m=[],g=0;g<h.length;g+=2){var y=h[g],v=h[g+1];m.push(n(y,v,f,d,p))}return m},"transformPoints"),a=o(function(h){for(var f=[],d=0;d<h.length;d++){var p=h[d];f.push(p.x,p.y)}return f},"pointsToArr"),s=o(function(h){return h.pstyle("width").pfValue*h.pstyle("arrow-scale").pfValue*2},"standardGap"),l=o(function(h,f){Zt(f)&&(f=t[f]),t[h]=ir({name:h,points:[-.15,-.3,.15,-.3,.15,.3,-.15,.3],collide:o(function(p,m,g,y,v,x){var b=a(i(this.points,g+2*x,y,v)),w=Gs(p,m,b);return w},"collide"),roughCollide:r,draw:o(function(p,m,g,y){var v=i(this.points,m,g,y);e.arrowShapeImpl("polygon")(p,v)},"draw"),spacing:o(function(p){return 0},"spacing"),gap:s},f)},"defineArrowShape");l("none",{collide:g6,roughCollide:g6,draw:iB,spacing:Fpe,gap:Fpe}),l("triangle",{points:[-.15,-.3,0,0,.15,-.3]}),l("arrow","triangle"),l("triangle-backcurve",{points:t.triangle.points,controlPoint:[0,-.15],roughCollide:r,draw:o(function(h,f,d,p,m){var g=i(this.points,f,d,p),y=this.controlPoint,v=n(y[0],y[1],f,d,p);e.arrowShapeImpl(this.name)(h,g,v)},"draw"),gap:o(function(h){return s(h)*.8},"gap")}),l("triangle-tee",{points:[0,0,.15,-.3,-.15,-.3,0,0],pointsTee:[-.15,-.4,-.15,-.5,.15,-.5,.15,-.4],collide:o(function(h,f,d,p,m,g,y){var v=a(i(this.points,d+2*y,p,m)),x=a(i(this.pointsTee,d+2*y,p,m)),b=Gs(h,f,v)||Gs(h,f,x);return b},"collide"),draw:o(function(h,f,d,p,m){var g=i(this.points,f,d,p),y=i(this.pointsTee,f,d,p);e.arrowShapeImpl(this.name)(h,g,y)},"draw")}),l("circle-triangle",{radius:.15,pointsTr:[0,-.15,.15,-.45,-.15,-.45,0,-.15],collide:o(function(h,f,d,p,m,g,y){var v=m,x=Math.pow(v.x-h,2)+Math.pow(v.y-f,2)<=Math.pow((d+2*y)*this.radius,2),b=a(i(this.points,d+2*y,p,m));return Gs(h,f,b)||x},"collide"),draw:o(function(h,f,d,p,m){var g=i(this.pointsTr,f,d,p);e.arrowShapeImpl(this.name)(h,g,p.x,p.y,this.radius*f)},"draw"),spacing:o(function(h){return e.getArrowWidth(h.pstyle("width").pfValue,h.pstyle("arrow-scale").value)*this.radius},"spacing")}),l("triangle-cross",{points:[0,0,.15,-.3,-.15,-.3,0,0],baseCrossLinePts:[-.15,-.4,-.15,-.4,.15,-.4,.15,-.4],crossLinePts:o(function(h,f){var d=this.baseCrossLinePts.slice(),p=f/h,m=3,g=5;return d[m]=d[m]-p,d[g]=d[g]-p,d},"crossLinePts"),collide:o(function(h,f,d,p,m,g,y){var v=a(i(this.points,d+2*y,p,m)),x=a(i(this.crossLinePts(d,g),d+2*y,p,m)),b=Gs(h,f,v)||Gs(h,f,x);return b},"collide"),draw:o(function(h,f,d,p,m){var g=i(this.points,f,d,p),y=i(this.crossLinePts(f,m),f,d,p);e.arrowShapeImpl(this.name)(h,g,y)},"draw")}),l("vee",{points:[-.15,-.3,0,0,.15,-.3,0,-.15],gap:o(function(h){return s(h)*.525},"gap")}),l("circle",{radius:.15,collide:o(function(h,f,d,p,m,g,y){var v=m,x=Math.pow(v.x-h,2)+Math.pow(v.y-f,2)<=Math.pow((d+2*y)*this.radius,2);return x},"collide"),draw:o(function(h,f,d,p,m){e.arrowShapeImpl(this.name)(h,p.x,p.y,this.radius*f)},"draw"),spacing:o(function(h){return e.getArrowWidth(h.pstyle("width").pfValue,h.pstyle("arrow-scale").value)*this.radius},"spacing")}),l("tee",{points:[-.15,0,-.15,-.1,.15,-.1,.15,0],spacing:o(function(h){return 1},"spacing"),gap:o(function(h){return 1},"gap")}),l("square",{points:[-.15,0,.15,0,.15,-.3,-.15,-.3]}),l("diamond",{points:[-.15,-.15,0,-.3,.15,-.15,0,0],gap:o(function(h){return h.pstyle("width").pfValue*h.pstyle("arrow-scale").value},"gap")}),l("chevron",{points:[0,0,-.15,-.15,-.1,-.2,0,-.1,.1,-.2,.15,-.15],gap:o(function(h){return .95*h.pstyle("width").pfValue*h.pstyle("arrow-scale").value},"gap")})};W0={};W0.projectIntoViewport=function(t,e){var r=this.cy,n=this.findContainerClientCoords(),i=n[0],a=n[1],s=n[4],l=r.pan(),u=r.zoom(),h=((t-i)/s-l.x)/u,f=((e-a)/s-l.y)/u;return[h,f]};W0.findContainerClientCoords=function(){if(this.containerBB)return this.containerBB;var t=this.container,e=t.getBoundingClientRect(),r=this.cy.window().getComputedStyle(t),n=o(function(x){return parseFloat(r.getPropertyValue(x))},"styleValue"),i={left:n("padding-left"),right:n("padding-right"),top:n("padding-top"),bottom:n("padding-bottom")},a={left:n("border-left-width"),right:n("border-right-width"),top:n("border-top-width"),bottom:n("border-bottom-width")},s=t.clientWidth,l=t.clientHeight,u=i.left+i.right,h=i.top+i.bottom,f=a.left+a.right,d=e.width/(s+f),p=s-u,m=l-h,g=e.left+i.left+a.left,y=e.top+i.top+a.top;return this.containerBB=[g,y,p,m,d]};W0.invalidateContainerClientCoordsCache=function(){this.containerBB=null};W0.findNearestElement=function(t,e,r,n){return this.findNearestElements(t,e,r,n)[0]};W0.findNearestElements=function(t,e,r,n){var i=this,a=this,s=a.getCachedZSortedEles(),l=[],u=a.cy.zoom(),h=a.cy.hasCompoundNodes(),f=(n?24:8)/u,d=(n?8:2)/u,p=(n?8:2)/u,m=1/0,g,y;r&&(s=s.interactive);function v(L,C){if(L.isNode()){if(y)return;y=L,l.push(L)}if(L.isEdge()&&(C==null||C<m))if(g){if(g.pstyle("z-compound-depth").value===L.pstyle("z-compound-depth").value&&g.pstyle("z-compound-depth").value===L.pstyle("z-compound-depth").value){for(var A=0;A<l.length;A++)if(l[A].isEdge()){l[A]=L,g=L,m=C??m;break}}}else l.push(L),g=L,m=C??m}o(v,"addEle");function x(L){var C=L.outerWidth()+2*d,A=L.outerHeight()+2*d,I=C/2,D=A/2,k=L.position(),R=L.pstyle("corner-radius").value==="auto"?"auto":L.pstyle("corner-radius").pfValue,S=L._private.rscratch;if(k.x-I<=t&&t<=k.x+I&&k.y-D<=e&&e<=k.y+D){var O=a.nodeShapes[i.getNodeShape(L)];if(O.checkPoint(t,e,0,C,A,k.x,k.y,R,S))return v(L,0),!0}}o(x,"checkNode");function b(L){var C=L._private,A=C.rscratch,I=L.pstyle("width").pfValue,D=L.pstyle("arrow-scale").value,k=I/2+f,R=k*k,S=k*2,F=C.source,B=C.target,O;if(A.edgeType==="segments"||A.edgeType==="straight"||A.edgeType==="haystack"){for(var N=A.allpts,P=0;P+3<N.length;P+=2)if(Bje(t,e,N[P],N[P+1],N[P+2],N[P+3],S)&&R>(O=Vje(t,e,N[P],N[P+1],N[P+2],N[P+3])))return v(L,O),!0}else if(A.edgeType==="bezier"||A.edgeType==="multibezier"||A.edgeType==="self"||A.edgeType==="compound"){for(var N=A.allpts,P=0;P+5<A.allpts.length;P+=4)if(Fje(t,e,N[P],N[P+1],N[P+2],N[P+3],N[P+4],N[P+5],S)&&R>(O=$je(t,e,N[P],N[P+1],N[P+2],N[P+3],N[P+4],N[P+5])))return v(L,O),!0}for(var F=F||C.source,B=B||C.target,$=i.getArrowWidth(I,D),z=[{name:"source",x:A.arrowStartX,y:A.arrowStartY,angle:A.srcArrowAngle},{name:"target",x:A.arrowEndX,y:A.arrowEndY,angle:A.tgtArrowAngle},{name:"mid-source",x:A.midX,y:A.midY,angle:A.midsrcArrowAngle},{name:"mid-target",x:A.midX,y:A.midY,angle:A.midtgtArrowAngle}],P=0;P<z.length;P++){var W=z[P],j=a.arrowShapes[L.pstyle(W.name+"-arrow-shape").value],K=L.pstyle("width").pfValue;if(j.roughCollide(t,e,$,W.angle,{x:W.x,y:W.y},K,f)&&j.collide(t,e,$,W.angle,{x:W.x,y:W.y},K,f))return v(L),!0}h&&l.length>0&&(x(F),x(B))}o(b,"checkEdge");function w(L,C,A){return Wl(L,C,A)}o(w,"preprop");function _(L,C){var A=L._private,I=p,D;C?D=C+"-":D="",L.boundingBox();var k=A.labelBounds[C||"main"],R=L.pstyle(D+"label").value,S=L.pstyle("text-events").strValue==="yes";if(!(!S||!R)){var O=w(A.rscratch,"labelX",C),N=w(A.rscratch,"labelY",C),P=w(A.rscratch,"labelAngle",C),F=L.pstyle(D+"text-margin-x").pfValue,B=L.pstyle(D+"text-margin-y").pfValue,$=k.x1-I-F,z=k.x2+I-F,W=k.y1-I-B,j=k.y2+I-B;if(P){var K=Math.cos(P),ie=Math.sin(P),Q=o(function(ue,ce){return ue=ue-O,ce=ce-N,{x:ue*K-ce*ie+O,y:ue*ie+ce*K+N}},"rotate"),ee=Q($,W),J=Q($,j),H=Q(z,W),q=Q(z,j),Z=[ee.x+F,ee.y+B,H.x+F,H.y+B,q.x+F,q.y+B,J.x+F,J.y+B];if(Gs(t,e,Z))return v(L),!0}else if(c1(k,t,e))return v(L),!0}}o(_,"checkLabel");for(var T=s.length-1;T>=0;T--){var E=s[T];E.isNode()?x(E)||_(E):b(E)||_(E)||_(E,"source")||_(E,"target")}return l};W0.getAllInBox=function(t,e,r,n){var i=this.getCachedZSortedEles().interactive,a=[],s=Math.min(t,r),l=Math.max(t,r),u=Math.min(e,n),h=Math.max(e,n);t=s,r=l,e=u,n=h;for(var f=$s({x1:t,y1:e,x2:r,y2:n}),d=0;d<i.length;d++){var p=i[d];if(p.isNode()){var m=p,g=m.boundingBox({includeNodes:!0,includeEdges:!1,includeLabels:!1});oB(f,g)&&!dge(g,f)&&a.push(m)}else{var y=p,v=y._private,x=v.rscratch;if(x.startX!=null&&x.startY!=null&&!c1(f,x.startX,x.startY)||x.endX!=null&&x.endY!=null&&!c1(f,x.endX,x.endY))continue;if(x.edgeType==="bezier"||x.edgeType==="multibezier"||x.edgeType==="self"||x.edgeType==="compound"||x.edgeType==="segments"||x.edgeType==="haystack"){for(var b=v.rstyle.bezierPts||v.rstyle.linePts||v.rstyle.haystackPts,w=!0,_=0;_<b.length;_++)if(!Pje(f,b[_])){w=!1;break}w&&a.push(y)}else(x.edgeType==="haystack"||x.edgeType==="straight")&&a.push(y)}}return a};k6={};k6.calculateArrowAngles=function(t){var e=t._private.rscratch,r=e.edgeType==="haystack",n=e.edgeType==="bezier",i=e.edgeType==="multibezier",a=e.edgeType==="segments",s=e.edgeType==="compound",l=e.edgeType==="self",u,h,f,d,p,m,x,b;if(r?(f=e.haystackPts[0],d=e.haystackPts[1],p=e.haystackPts[2],m=e.haystackPts[3]):(f=e.arrowStartX,d=e.arrowStartY,p=e.arrowEndX,m=e.arrowEndY),x=e.midX,b=e.midY,a)u=f-e.segpts[0],h=d-e.segpts[1];else if(i||s||l||n){var g=e.allpts,y=ia(g[0],g[2],g[4],.1),v=ia(g[1],g[3],g[5],.1);u=f-y,h=d-v}else u=f-x,h=d-b;e.srcArrowAngle=XE(u,h);var x=e.midX,b=e.midY;if(r&&(x=(f+p)/2,b=(d+m)/2),u=p-f,h=m-d,a){var g=e.allpts;if(g.length/2%2===0){var w=g.length/2,_=w-2;u=g[w]-g[_],h=g[w+1]-g[_+1]}else if(e.isRound)u=e.midVector[1],h=-e.midVector[0];else{var w=g.length/2-1,_=w-2;u=g[w]-g[_],h=g[w+1]-g[_+1]}}else if(i||s||l){var g=e.allpts,T=e.ctrlpts,E,L,C,A;if(T.length/2%2===0){var I=g.length/2-1,D=I+2,k=D+2;E=ia(g[I],g[D],g[k],0),L=ia(g[I+1],g[D+1],g[k+1],0),C=ia(g[I],g[D],g[k],1e-4),A=ia(g[I+1],g[D+1],g[k+1],1e-4)}else{var D=g.length/2-1,I=D-2,k=D+2;E=ia(g[I],g[D],g[k],.4999),L=ia(g[I+1],g[D+1],g[k+1],.4999),C=ia(g[I],g[D],g[k],.5),A=ia(g[I+1],g[D+1],g[k+1],.5)}u=C-E,h=A-L}if(e.midtgtArrowAngle=XE(u,h),e.midDispX=u,e.midDispY=h,u*=-1,h*=-1,a){var g=e.allpts;if(g.length/2%2!==0){if(!e.isRound){var w=g.length/2-1,R=w+2;u=-(g[R]-g[w]),h=-(g[R+1]-g[w+1])}}}if(e.midsrcArrowAngle=XE(u,h),a)u=p-e.segpts[e.segpts.length-2],h=m-e.segpts[e.segpts.length-1];else if(i||s||l||n){var g=e.allpts,S=g.length,y=ia(g[S-6],g[S-4],g[S-2],.9),v=ia(g[S-5],g[S-3],g[S-1],.9);u=p-y,h=m-v}else u=p-x,h=m-b;e.tgtArrowAngle=XE(u,h)};k6.getArrowWidth=k6.getArrowHeight=function(t,e){var r=this.arrowWidthCache=this.arrowWidthCache||{},n=r[t+", "+e];return n||(n=Math.max(Math.pow(t*13.37,.9),29)*e,r[t+", "+e]=n,n)};$c={},nl={},Rme=o(function(e,r,n){n.x=r.x-e.x,n.y=r.y-e.y,n.len=Math.sqrt(n.x*n.x+n.y*n.y),n.nx=n.x/n.len,n.ny=n.y/n.len,n.ang=Math.atan2(n.ny,n.nx)},"asVec"),Eet=o(function(e,r){r.x=e.x*-1,r.y=e.y*-1,r.nx=e.nx*-1,r.ny=e.ny*-1,r.ang=e.ang>0?-(Math.PI-e.ang):Math.PI+e.ang},"invertVec"),Cet=o(function(e,r,n,i,a){if(e!==Nme?Rme(r,e,$c):Eet(nl,$c),Rme(r,n,nl),Lme=$c.nx*nl.ny-$c.ny*nl.nx,Dme=$c.nx*nl.nx-$c.ny*-nl.ny,qu=Math.asin(Math.max(-1,Math.min(1,Lme))),Math.abs(qu)<1e-6){WP=r.x,YP=r.y,O0=e1=0;return}P0=1,f6=!1,Dme<0?qu<0?qu=Math.PI+qu:(qu=Math.PI-qu,P0=-1,f6=!0):qu>0&&(P0=-1,f6=!0),r.radius!==void 0?e1=r.radius:e1=i,N0=qu/2,n6=Math.min($c.len/2,nl.len/2),a?(Gc=Math.abs(Math.cos(N0)*e1/Math.sin(N0)),Gc>n6?(Gc=n6,O0=Math.abs(Gc*Math.sin(N0)/Math.cos(N0))):O0=e1):(Gc=Math.min(n6,e1),O0=Math.abs(Gc*Math.sin(N0)/Math.cos(N0))),qP=r.x+nl.nx*Gc,XP=r.y+nl.ny*Gc,WP=qP-nl.ny*O0*P0,YP=XP+nl.nx*O0*P0,a1e=r.x+$c.nx*Gc,s1e=r.y+$c.ny*Gc,Nme=r},"calcCornerArc");o(o1e,"drawPreparedRoundCorner");o(bB,"getRoundCorner");Ga={};Ga.findMidptPtsEtc=function(t,e){var r=e.posPts,n=e.intersectionPts,i=e.vectorNormInverse,a,s=t.pstyle("source-endpoint"),l=t.pstyle("target-endpoint"),u=s.units!=null&&l.units!=null,h=o(function(T,E,L,C){var A=C-E,I=L-T,D=Math.sqrt(I*I+A*A);return{x:-A/D,y:I/D}},"recalcVectorNormInverse"),f=t.pstyle("edge-distances").value;switch(f){case"node-position":a=r;break;case"intersection":a=n;break;case"endpoints":{if(u){var d=this.manualEndptToPx(t.source()[0],s),p=Ul(d,2),m=p[0],g=p[1],y=this.manualEndptToPx(t.target()[0],l),v=Ul(y,2),x=v[0],b=v[1],w={x1:m,y1:g,x2:x,y2:b};i=h(m,g,x,b),a=w}else on("Edge ".concat(t.id()," has edge-distances:endpoints specified without manual endpoints specified via source-endpoint and target-endpoint. Falling back on edge-distances:intersection (default).")),a=n;break}}return{midptPts:a,vectorNormInverse:i}};Ga.findHaystackPoints=function(t){for(var e=0;e<t.length;e++){var r=t[e],n=r._private,i=n.rscratch;if(!i.haystack){var a=Math.random()*2*Math.PI;i.source={x:Math.cos(a),y:Math.sin(a)},a=Math.random()*2*Math.PI,i.target={x:Math.cos(a),y:Math.sin(a)}}var s=n.source,l=n.target,u=s.position(),h=l.position(),f=s.width(),d=l.width(),p=s.height(),m=l.height(),g=r.pstyle("haystack-radius").value,y=g/2;i.haystackPts=i.allpts=[i.source.x*f*y+u.x,i.source.y*p*y+u.y,i.target.x*d*y+h.x,i.target.y*m*y+h.y],i.midX=(i.allpts[0]+i.allpts[2])/2,i.midY=(i.allpts[1]+i.allpts[3])/2,i.edgeType="haystack",i.haystack=!0,this.storeEdgeProjections(r),this.calculateArrowAngles(r),this.recalculateEdgeLabelProjections(r),this.calculateLabelAngles(r)}};Ga.findSegmentsPoints=function(t,e){var r=t._private.rscratch,n=t.pstyle("segment-weights"),i=t.pstyle("segment-distances"),a=t.pstyle("segment-radii"),s=t.pstyle("radius-type"),l=Math.min(n.pfValue.length,i.pfValue.length),u=a.pfValue[a.pfValue.length-1],h=s.pfValue[s.pfValue.length-1];r.edgeType="segments",r.segpts=[],r.radii=[],r.isArcRadius=[];for(var f=0;f<l;f++){var d=n.pfValue[f],p=i.pfValue[f],m=1-d,g=d,y=this.findMidptPtsEtc(t,e),v=y.midptPts,x=y.vectorNormInverse,b={x:v.x1*m+v.x2*g,y:v.y1*m+v.y2*g};r.segpts.push(b.x+x.x*p,b.y+x.y*p),r.radii.push(a.pfValue[f]!==void 0?a.pfValue[f]:u),r.isArcRadius.push((s.pfValue[f]!==void 0?s.pfValue[f]:h)==="arc-radius")}};Ga.findLoopPoints=function(t,e,r,n){var i=t._private.rscratch,a=e.dirCounts,s=e.srcPos,l=t.pstyle("control-point-distances"),u=l?l.pfValue[0]:void 0,h=t.pstyle("loop-direction").pfValue,f=t.pstyle("loop-sweep").pfValue,d=t.pstyle("control-point-step-size").pfValue;i.edgeType="self";var p=r,m=d;n&&(p=0,m=u);var g=h-Math.PI/2,y=g-f/2,v=g+f/2,x=h+"_"+f;p=a[x]===void 0?a[x]=0:++a[x],i.ctrlpts=[s.x+Math.cos(y)*1.4*m*(p/3+1),s.y+Math.sin(y)*1.4*m*(p/3+1),s.x+Math.cos(v)*1.4*m*(p/3+1),s.y+Math.sin(v)*1.4*m*(p/3+1)]};Ga.findCompoundLoopPoints=function(t,e,r,n){var i=t._private.rscratch;i.edgeType="compound";var a=e.srcPos,s=e.tgtPos,l=e.srcW,u=e.srcH,h=e.tgtW,f=e.tgtH,d=t.pstyle("control-point-step-size").pfValue,p=t.pstyle("control-point-distances"),m=p?p.pfValue[0]:void 0,g=r,y=d;n&&(g=0,y=m);var v=50,x={x:a.x-l/2,y:a.y-u/2},b={x:s.x-h/2,y:s.y-f/2},w={x:Math.min(x.x,b.x),y:Math.min(x.y,b.y)},_=.5,T=Math.max(_,Math.log(l*.01)),E=Math.max(_,Math.log(h*.01));i.ctrlpts=[w.x,w.y-(1+Math.pow(v,1.12)/100)*y*(g/3+1)*T,w.x-(1+Math.pow(v,1.12)/100)*y*(g/3+1)*E,w.y]};Ga.findStraightEdgePoints=function(t){t._private.rscratch.edgeType="straight"};Ga.findBezierPoints=function(t,e,r,n,i){var a=t._private.rscratch,s=t.pstyle("control-point-step-size").pfValue,l=t.pstyle("control-point-distances"),u=t.pstyle("control-point-weights"),h=l&&u?Math.min(l.value.length,u.value.length):1,f=l?l.pfValue[0]:void 0,d=u.value[0],p=n;a.edgeType=p?"multibezier":"bezier",a.ctrlpts=[];for(var m=0;m<h;m++){var g=(.5-e.eles.length/2+r)*s*(i?-1:1),y=void 0,v=hge(g);p&&(f=l?l.pfValue[m]:s,d=u.value[m]),n?y=f:y=f!==void 0?v*f:void 0;var x=y!==void 0?y:g,b=1-d,w=d,_=this.findMidptPtsEtc(t,e),T=_.midptPts,E=_.vectorNormInverse,L={x:T.x1*b+T.x2*w,y:T.y1*b+T.y2*w};a.ctrlpts.push(L.x+E.x*x,L.y+E.y*x)}};Ga.findTaxiPoints=function(t,e){var r=t._private.rscratch;r.edgeType="segments";var n="vertical",i="horizontal",a="leftward",s="rightward",l="downward",u="upward",h="auto",f=e.posPts,d=e.srcW,p=e.srcH,m=e.tgtW,g=e.tgtH,y=t.pstyle("edge-distances").value,v=y!=="node-position",x=t.pstyle("taxi-direction").value,b=x,w=t.pstyle("taxi-turn"),_=w.units==="%",T=w.pfValue,E=T<0,L=t.pstyle("taxi-turn-min-distance").pfValue,C=v?(d+m)/2:0,A=v?(p+g)/2:0,I=f.x2-f.x1,D=f.y2-f.y1,k=o(function(se,Ee){return se>0?Math.max(se-Ee,0):Math.min(se+Ee,0)},"subDWH"),R=k(I,C),S=k(D,A),O=!1;b===h?x=Math.abs(R)>Math.abs(S)?i:n:b===u||b===l?(x=n,O=!0):(b===a||b===s)&&(x=i,O=!0);var N=x===n,P=N?S:R,F=N?D:I,B=hge(F),$=!1;!(O&&(_||E))&&(b===l&&F<0||b===u&&F>0||b===a&&F>0||b===s&&F<0)&&(B*=-1,P=B*Math.abs(P),$=!0);var z;if(_){var W=T<0?1+T:T;z=W*P}else{var j=T<0?P:0;z=j+T*B}var K=o(function(se){return Math.abs(se)<L||Math.abs(se)>=Math.abs(P)},"getIsTooClose"),ie=K(z),Q=K(Math.abs(P)-Math.abs(z)),ee=ie||Q;if(ee&&!$)if(N){var J=Math.abs(F)<=p/2,H=Math.abs(I)<=m/2;if(J){var q=(f.x1+f.x2)/2,Z=f.y1,ae=f.y2;r.segpts=[q,Z,q,ae]}else if(H){var ue=(f.y1+f.y2)/2,ce=f.x1,te=f.x2;r.segpts=[ce,ue,te,ue]}else r.segpts=[f.x1,f.y2]}else{var De=Math.abs(F)<=d/2,oe=Math.abs(D)<=g/2;if(De){var ke=(f.y1+f.y2)/2,Fe=f.x1,Be=f.x2;r.segpts=[Fe,ke,Be,ke]}else if(oe){var Ve=(f.x1+f.x2)/2,Ge=f.y1,He=f.y2;r.segpts=[Ve,Ge,Ve,He]}else r.segpts=[f.x2,f.y1]}else if(N){var xe=f.y1+z+(v?p/2*B:0),X=f.x1,fe=f.x2;r.segpts=[X,xe,fe,xe]}else{var he=f.x1+z+(v?d/2*B:0),ge=f.y1,ne=f.y2;r.segpts=[he,ge,he,ne]}if(r.isRound){var ye=t.pstyle("taxi-radius").value,U=t.pstyle("radius-type").value[0]==="arc-radius";r.radii=new Array(r.segpts.length/2).fill(ye),r.isArcRadius=new Array(r.segpts.length/2).fill(U)}};Ga.tryToCorrectInvalidPoints=function(t,e){var r=t._private.rscratch;if(r.edgeType==="bezier"){var n=e.srcPos,i=e.tgtPos,a=e.srcW,s=e.srcH,l=e.tgtW,u=e.tgtH,h=e.srcShape,f=e.tgtShape,d=e.srcCornerRadius,p=e.tgtCornerRadius,m=e.srcRs,g=e.tgtRs,y=!xt(r.startX)||!xt(r.startY),v=!xt(r.arrowStartX)||!xt(r.arrowStartY),x=!xt(r.endX)||!xt(r.endY),b=!xt(r.arrowEndX)||!xt(r.arrowEndY),w=3,_=this.getArrowWidth(t.pstyle("width").pfValue,t.pstyle("arrow-scale").value)*this.arrowShapeWidth,T=w*_,E=G0({x:r.ctrlpts[0],y:r.ctrlpts[1]},{x:r.startX,y:r.startY}),L=E<T,C=G0({x:r.ctrlpts[0],y:r.ctrlpts[1]},{x:r.endX,y:r.endY}),A=C<T,I=!1;if(y||v||L){I=!0;var D={x:r.ctrlpts[0]-n.x,y:r.ctrlpts[1]-n.y},k=Math.sqrt(D.x*D.x+D.y*D.y),R={x:D.x/k,y:D.y/k},S=Math.max(a,s),O={x:r.ctrlpts[0]+R.x*2*S,y:r.ctrlpts[1]+R.y*2*S},N=h.intersectLine(n.x,n.y,a,s,O.x,O.y,0,d,m);L?(r.ctrlpts[0]=r.ctrlpts[0]+R.x*(T-E),r.ctrlpts[1]=r.ctrlpts[1]+R.y*(T-E)):(r.ctrlpts[0]=N[0]+R.x*T,r.ctrlpts[1]=N[1]+R.y*T)}if(x||b||A){I=!0;var P={x:r.ctrlpts[0]-i.x,y:r.ctrlpts[1]-i.y},F=Math.sqrt(P.x*P.x+P.y*P.y),B={x:P.x/F,y:P.y/F},$=Math.max(a,s),z={x:r.ctrlpts[0]+B.x*2*$,y:r.ctrlpts[1]+B.y*2*$},W=f.intersectLine(i.x,i.y,l,u,z.x,z.y,0,p,g);A?(r.ctrlpts[0]=r.ctrlpts[0]+B.x*(T-C),r.ctrlpts[1]=r.ctrlpts[1]+B.y*(T-C)):(r.ctrlpts[0]=W[0]+B.x*T,r.ctrlpts[1]=W[1]+B.y*T)}I&&this.findEndpoints(t)}};Ga.storeAllpts=function(t){var e=t._private.rscratch;if(e.edgeType==="multibezier"||e.edgeType==="bezier"||e.edgeType==="self"||e.edgeType==="compound"){e.allpts=[],e.allpts.push(e.startX,e.startY);for(var r=0;r+1<e.ctrlpts.length;r+=2)e.allpts.push(e.ctrlpts[r],e.ctrlpts[r+1]),r+3<e.ctrlpts.length&&e.allpts.push((e.ctrlpts[r]+e.ctrlpts[r+2])/2,(e.ctrlpts[r+1]+e.ctrlpts[r+3])/2);e.allpts.push(e.endX,e.endY);var n,i;e.ctrlpts.length/2%2===0?(n=e.allpts.length/2-1,e.midX=e.allpts[n],e.midY=e.allpts[n+1]):(n=e.allpts.length/2-3,i=.5,e.midX=ia(e.allpts[n],e.allpts[n+2],e.allpts[n+4],i),e.midY=ia(e.allpts[n+1],e.allpts[n+3],e.allpts[n+5],i))}else if(e.edgeType==="straight")e.allpts=[e.startX,e.startY,e.endX,e.endY],e.midX=(e.startX+e.endX+e.arrowStartX+e.arrowEndX)/4,e.midY=(e.startY+e.endY+e.arrowStartY+e.arrowEndY)/4;else if(e.edgeType==="segments"){if(e.allpts=[],e.allpts.push(e.startX,e.startY),e.allpts.push.apply(e.allpts,e.segpts),e.allpts.push(e.endX,e.endY),e.isRound){e.roundCorners=[];for(var a=2;a+3<e.allpts.length;a+=2){var s=e.radii[a/2-1],l=e.isArcRadius[a/2-1];e.roundCorners.push(bB({x:e.allpts[a-2],y:e.allpts[a-1]},{x:e.allpts[a],y:e.allpts[a+1],radius:s},{x:e.allpts[a+2],y:e.allpts[a+3]},s,l))}}if(e.segpts.length%4===0){var u=e.segpts.length/2,h=u-2;e.midX=(e.segpts[h]+e.segpts[u])/2,e.midY=(e.segpts[h+1]+e.segpts[u+1])/2}else{var f=e.segpts.length/2-1;if(!e.isRound)e.midX=e.segpts[f],e.midY=e.segpts[f+1];else{var d={x:e.segpts[f],y:e.segpts[f+1]},p=e.roundCorners[f/2],m=[d.x-p.cx,d.y-p.cy],g=p.radius/Math.sqrt(Math.pow(m[0],2)+Math.pow(m[1],2));m=m.map(function(y){return y*g}),e.midX=p.cx+m[0],e.midY=p.cy+m[1],e.midVector=m}}}};Ga.checkForInvalidEdgeWarning=function(t){var e=t[0]._private.rscratch;e.nodesOverlap||xt(e.startX)&&xt(e.startY)&&xt(e.endX)&&xt(e.endY)?e.loggedErr=!1:e.loggedErr||(e.loggedErr=!0,on("Edge `"+t.id()+"` has invalid endpoints and so it is impossible to draw. Adjust your edge style (e.g. control points) accordingly or use an alternative edge type. This is expected behaviour when the source node and the target node overlap."))};Ga.findEdgeControlPoints=function(t){var e=this;if(!(!t||t.length===0)){for(var r=this,n=r.cy,i=n.hasCompoundNodes(),a={map:new Uc,get:o(function(L){var C=this.map.get(L[0]);return C!=null?C.get(L[1]):null},"get"),set:o(function(L,C){var A=this.map.get(L[0]);A==null&&(A=new Uc,this.map.set(L[0],A)),A.set(L[1],C)},"set")},s=[],l=[],u=0;u<t.length;u++){var h=t[u],f=h._private,d=h.pstyle("curve-style").value;if(!(h.removed()||!h.takesUpSpace())){if(d==="haystack"){l.push(h);continue}var p=d==="unbundled-bezier"||d.endsWith("segments")||d==="straight"||d==="straight-triangle"||d.endsWith("taxi"),m=d==="unbundled-bezier"||d==="bezier",g=f.source,y=f.target,v=g.poolIndex(),x=y.poolIndex(),b=[v,x].sort(),w=a.get(b);w==null&&(w={eles:[]},a.set(b,w),s.push(b)),w.eles.push(h),p&&(w.hasUnbundled=!0),m&&(w.hasBezier=!0)}}for(var _=o(function(L){var C=s[L],A=a.get(C),I=void 0;if(!A.hasUnbundled){var D=A.eles[0].parallelEdges().filter(function(he){return he.isBundledBezier()});aB(A.eles),D.forEach(function(he){return A.eles.push(he)}),A.eles.sort(function(he,ge){return he.poolIndex()-ge.poolIndex()})}var k=A.eles[0],R=k.source(),S=k.target();if(R.poolIndex()>S.poolIndex()){var O=R;R=S,S=O}var N=A.srcPos=R.position(),P=A.tgtPos=S.position(),F=A.srcW=R.outerWidth(),B=A.srcH=R.outerHeight(),$=A.tgtW=S.outerWidth(),z=A.tgtH=S.outerHeight(),W=A.srcShape=r.nodeShapes[e.getNodeShape(R)],j=A.tgtShape=r.nodeShapes[e.getNodeShape(S)],K=A.srcCornerRadius=R.pstyle("corner-radius").value==="auto"?"auto":R.pstyle("corner-radius").pfValue,ie=A.tgtCornerRadius=S.pstyle("corner-radius").value==="auto"?"auto":S.pstyle("corner-radius").pfValue,Q=A.tgtRs=S._private.rscratch,ee=A.srcRs=R._private.rscratch;A.dirCounts={north:0,west:0,south:0,east:0,northwest:0,southwest:0,northeast:0,southeast:0};for(var J=0;J<A.eles.length;J++){var H=A.eles[J],q=H[0]._private.rscratch,Z=H.pstyle("curve-style").value,ae=Z==="unbundled-bezier"||Z.endsWith("segments")||Z.endsWith("taxi"),ue=!R.same(H.source());if(!A.calculatedIntersection&&R!==S&&(A.hasBezier||A.hasUnbundled)){A.calculatedIntersection=!0;var ce=W.intersectLine(N.x,N.y,F,B,P.x,P.y,0,K,ee),te=A.srcIntn=ce,De=j.intersectLine(P.x,P.y,$,z,N.x,N.y,0,ie,Q),oe=A.tgtIntn=De,ke=A.intersectionPts={x1:ce[0],x2:De[0],y1:ce[1],y2:De[1]},Fe=A.posPts={x1:N.x,x2:P.x,y1:N.y,y2:P.y},Be=De[1]-ce[1],Ve=De[0]-ce[0],Ge=Math.sqrt(Ve*Ve+Be*Be),He=A.vector={x:Ve,y:Be},xe=A.vectorNorm={x:He.x/Ge,y:He.y/Ge},X={x:-xe.y,y:xe.x};A.nodesOverlap=!xt(Ge)||j.checkPoint(ce[0],ce[1],0,$,z,P.x,P.y,ie,Q)||W.checkPoint(De[0],De[1],0,F,B,N.x,N.y,K,ee),A.vectorNormInverse=X,I={nodesOverlap:A.nodesOverlap,dirCounts:A.dirCounts,calculatedIntersection:!0,hasBezier:A.hasBezier,hasUnbundled:A.hasUnbundled,eles:A.eles,srcPos:P,tgtPos:N,srcW:$,srcH:z,tgtW:F,tgtH:B,srcIntn:oe,tgtIntn:te,srcShape:j,tgtShape:W,posPts:{x1:Fe.x2,y1:Fe.y2,x2:Fe.x1,y2:Fe.y1},intersectionPts:{x1:ke.x2,y1:ke.y2,x2:ke.x1,y2:ke.y1},vector:{x:-He.x,y:-He.y},vectorNorm:{x:-xe.x,y:-xe.y},vectorNormInverse:{x:-X.x,y:-X.y}}}var fe=ue?I:A;q.nodesOverlap=fe.nodesOverlap,q.srcIntn=fe.srcIntn,q.tgtIntn=fe.tgtIntn,q.isRound=Z.startsWith("round"),i&&(R.isParent()||R.isChild()||S.isParent()||S.isChild())&&(R.parents().anySame(S)||S.parents().anySame(R)||R.same(S)&&R.isParent())?e.findCompoundLoopPoints(H,fe,J,ae):R===S?e.findLoopPoints(H,fe,J,ae):Z.endsWith("segments")?e.findSegmentsPoints(H,fe):Z.endsWith("taxi")?e.findTaxiPoints(H,fe):Z==="straight"||!ae&&A.eles.length%2===1&&J===Math.floor(A.eles.length/2)?e.findStraightEdgePoints(H):e.findBezierPoints(H,fe,J,ae,ue),e.findEndpoints(H),e.tryToCorrectInvalidPoints(H,fe),e.checkForInvalidEdgeWarning(H),e.storeAllpts(H),e.storeEdgeProjections(H),e.calculateArrowAngles(H),e.recalculateEdgeLabelProjections(H),e.calculateLabelAngles(H)}},"_loop"),T=0;T<s.length;T++)_(T);this.findHaystackPoints(l)}};o(l1e,"getPts");Ga.getSegmentPoints=function(t){var e=t[0]._private.rscratch,r=e.edgeType;if(r==="segments")return this.recalculateRenderedStyle(t),l1e(e.segpts)};Ga.getControlPoints=function(t){var e=t[0]._private.rscratch,r=e.edgeType;if(r==="bezier"||r==="multibezier"||r==="self"||r==="compound")return this.recalculateRenderedStyle(t),l1e(e.ctrlpts)};Ga.getEdgeMidpoint=function(t){var e=t[0]._private.rscratch;return this.recalculateRenderedStyle(t),{x:e.midX,y:e.midY}};ib={};ib.manualEndptToPx=function(t,e){var r=this,n=t.position(),i=t.outerWidth(),a=t.outerHeight(),s=t._private.rscratch;if(e.value.length===2){var l=[e.pfValue[0],e.pfValue[1]];return e.units[0]==="%"&&(l[0]=l[0]*i),e.units[1]==="%"&&(l[1]=l[1]*a),l[0]+=n.x,l[1]+=n.y,l}else{var u=e.pfValue[0];u=-Math.PI/2+u;var h=2*Math.max(i,a),f=[n.x+Math.cos(u)*h,n.y+Math.sin(u)*h];return r.nodeShapes[this.getNodeShape(t)].intersectLine(n.x,n.y,i,a,f[0],f[1],0,t.pstyle("corner-radius").value==="auto"?"auto":t.pstyle("corner-radius").pfValue,s)}};ib.findEndpoints=function(t){var e=this,r,n=t.source()[0],i=t.target()[0],a=n.position(),s=i.position(),l=t.pstyle("target-arrow-shape").value,u=t.pstyle("source-arrow-shape").value,h=t.pstyle("target-distance-from-node").pfValue,f=t.pstyle("source-distance-from-node").pfValue,d=n._private.rscratch,p=i._private.rscratch,m=t.pstyle("curve-style").value,g=t._private.rscratch,y=g.edgeType,v=m==="taxi",x=y==="self"||y==="compound",b=y==="bezier"||y==="multibezier"||x,w=y!=="bezier",_=y==="straight"||y==="segments",T=y==="segments",E=b||w||_,L=x||v,C=t.pstyle("source-endpoint"),A=L?"outside-to-node":C.value,I=n.pstyle("corner-radius").value==="auto"?"auto":n.pstyle("corner-radius").pfValue,D=t.pstyle("target-endpoint"),k=L?"outside-to-node":D.value,R=i.pstyle("corner-radius").value==="auto"?"auto":i.pstyle("corner-radius").pfValue;g.srcManEndpt=C,g.tgtManEndpt=D;var S,O,N,P;if(b){var F=[g.ctrlpts[0],g.ctrlpts[1]],B=w?[g.ctrlpts[g.ctrlpts.length-2],g.ctrlpts[g.ctrlpts.length-1]]:F;S=B,O=F}else if(_){var $=T?g.segpts.slice(0,2):[s.x,s.y],z=T?g.segpts.slice(g.segpts.length-2):[a.x,a.y];S=z,O=$}if(k==="inside-to-node")r=[s.x,s.y];else if(D.units)r=this.manualEndptToPx(i,D);else if(k==="outside-to-line")r=g.tgtIntn;else if(k==="outside-to-node"||k==="outside-to-node-or-label"?N=S:(k==="outside-to-line"||k==="outside-to-line-or-label")&&(N=[a.x,a.y]),r=e.nodeShapes[this.getNodeShape(i)].intersectLine(s.x,s.y,i.outerWidth(),i.outerHeight(),N[0],N[1],0,R,p),k==="outside-to-node-or-label"||k==="outside-to-line-or-label"){var W=i._private.rscratch,j=W.labelWidth,K=W.labelHeight,ie=W.labelX,Q=W.labelY,ee=j/2,J=K/2,H=i.pstyle("text-valign").value;H==="top"?Q-=J:H==="bottom"&&(Q+=J);var q=i.pstyle("text-halign").value;q==="left"?ie-=ee:q==="right"&&(ie+=ee);var Z=Yx(N[0],N[1],[ie-ee,Q-J,ie+ee,Q-J,ie+ee,Q+J,ie-ee,Q+J],s.x,s.y);if(Z.length>0){var ae=a,ue=M0(ae,r1(r)),ce=M0(ae,r1(Z)),te=ue;if(ce<ue&&(r=Z,te=ce),Z.length>2){var De=M0(ae,{x:Z[2],y:Z[3]});De<te&&(r=[Z[2],Z[3]])}}}var oe=jE(r,S,e.arrowShapes[l].spacing(t)+h),ke=jE(r,S,e.arrowShapes[l].gap(t)+h);if(g.endX=ke[0],g.endY=ke[1],g.arrowEndX=oe[0],g.arrowEndY=oe[1],A==="inside-to-node")r=[a.x,a.y];else if(C.units)r=this.manualEndptToPx(n,C);else if(A==="outside-to-line")r=g.srcIntn;else if(A==="outside-to-node"||A==="outside-to-node-or-label"?P=O:(A==="outside-to-line"||A==="outside-to-line-or-label")&&(P=[s.x,s.y]),r=e.nodeShapes[this.getNodeShape(n)].intersectLine(a.x,a.y,n.outerWidth(),n.outerHeight(),P[0],P[1],0,I,d),A==="outside-to-node-or-label"||A==="outside-to-line-or-label"){var Fe=n._private.rscratch,Be=Fe.labelWidth,Ve=Fe.labelHeight,Ge=Fe.labelX,He=Fe.labelY,xe=Be/2,X=Ve/2,fe=n.pstyle("text-valign").value;fe==="top"?He-=X:fe==="bottom"&&(He+=X);var he=n.pstyle("text-halign").value;he==="left"?Ge-=xe:he==="right"&&(Ge+=xe);var ge=Yx(P[0],P[1],[Ge-xe,He-X,Ge+xe,He-X,Ge+xe,He+X,Ge-xe,He+X],a.x,a.y);if(ge.length>0){var ne=s,ye=M0(ne,r1(r)),U=M0(ne,r1(ge)),Te=ye;if(U<ye&&(r=[ge[0],ge[1]],Te=U),ge.length>2){var se=M0(ne,{x:ge[2],y:ge[3]});se<Te&&(r=[ge[2],ge[3]])}}}var Ee=jE(r,O,e.arrowShapes[u].spacing(t)+f),Ae=jE(r,O,e.arrowShapes[u].gap(t)+f);g.startX=Ae[0],g.startY=Ae[1],g.arrowStartX=Ee[0],g.arrowStartY=Ee[1],E&&(!xt(g.startX)||!xt(g.startY)||!xt(g.endX)||!xt(g.endY)?g.badLine=!0:g.badLine=!1)};ib.getSourceEndpoint=function(t){var e=t[0]._private.rscratch;switch(this.recalculateRenderedStyle(t),e.edgeType){case"haystack":return{x:e.haystackPts[0],y:e.haystackPts[1]};default:return{x:e.arrowStartX,y:e.arrowStartY}}};ib.getTargetEndpoint=function(t){var e=t[0]._private.rscratch;switch(this.recalculateRenderedStyle(t),e.edgeType){case"haystack":return{x:e.haystackPts[2],y:e.haystackPts[3]};default:return{x:e.arrowEndX,y:e.arrowEndY}}};wB={};o(Aet,"pushBezierPts");wB.storeEdgeProjections=function(t){var e=t._private,r=e.rscratch,n=r.edgeType;if(e.rstyle.bezierPts=null,e.rstyle.linePts=null,e.rstyle.haystackPts=null,n==="multibezier"||n==="bezier"||n==="self"||n==="compound"){e.rstyle.bezierPts=[];for(var i=0;i+5<r.allpts.length;i+=4)Aet(this,t,r.allpts.slice(i,i+6))}else if(n==="segments")for(var a=e.rstyle.linePts=[],i=0;i+1<r.allpts.length;i+=2)a.push({x:r.allpts[i],y:r.allpts[i+1]});else if(n==="haystack"){var s=r.haystackPts;e.rstyle.haystackPts=[{x:s[0],y:s[1]},{x:s[2],y:s[3]}]}e.rstyle.arrowWidth=this.getArrowWidth(t.pstyle("width").pfValue,t.pstyle("arrow-scale").value)*this.arrowShapeWidth};wB.recalculateEdgeProjections=function(t){this.findEdgeControlPoints(t)};Wc={};Wc.recalculateNodeLabelProjection=function(t){var e=t.pstyle("label").strValue;if(!Sf(e)){var r,n,i=t._private,a=t.width(),s=t.height(),l=t.padding(),u=t.position(),h=t.pstyle("text-halign").strValue,f=t.pstyle("text-valign").strValue,d=i.rscratch,p=i.rstyle;switch(h){case"left":r=u.x-a/2-l;break;case"right":r=u.x+a/2+l;break;default:r=u.x}switch(f){case"top":n=u.y-s/2-l;break;case"bottom":n=u.y+s/2+l;break;default:n=u.y}d.labelX=r,d.labelY=n,p.labelX=r,p.labelY=n,this.calculateLabelAngles(t),this.applyLabelDimensions(t)}};c1e=o(function(e,r){var n=Math.atan(r/e);return e===0&&n<0&&(n=n*-1),n},"lineAngleFromDelta"),u1e=o(function(e,r){var n=r.x-e.x,i=r.y-e.y;return c1e(n,i)},"lineAngle"),_et=o(function(e,r,n,i){var a=Wx(0,i-.001,1),s=Wx(0,i+.001,1),l=i1(e,r,n,a),u=i1(e,r,n,s);return u1e(l,u)},"bezierAngle");Wc.recalculateEdgeLabelProjections=function(t){var e,r=t._private,n=r.rscratch,i=this,a={mid:t.pstyle("label").strValue,source:t.pstyle("source-label").strValue,target:t.pstyle("target-label").strValue};if(a.mid||a.source||a.target){e={x:n.midX,y:n.midY};var s=o(function(d,p,m){wf(r.rscratch,d,p,m),wf(r.rstyle,d,p,m)},"setRs");s("labelX",null,e.x),s("labelY",null,e.y);var l=c1e(n.midDispX,n.midDispY);s("labelAutoAngle",null,l);var u=o(function f(){if(f.cache)return f.cache;for(var d=[],p=0;p+5<n.allpts.length;p+=4){var m={x:n.allpts[p],y:n.allpts[p+1]},g={x:n.allpts[p+2],y:n.allpts[p+3]},y={x:n.allpts[p+4],y:n.allpts[p+5]};d.push({p0:m,p1:g,p2:y,startDist:0,length:0,segments:[]})}var v=r.rstyle.bezierPts,x=i.bezierProjPcts.length;function b(L,C,A,I,D){var k=G0(C,A),R=L.segments[L.segments.length-1],S={p0:C,p1:A,t0:I,t1:D,startDist:R?R.startDist+R.length:0,length:k};L.segments.push(S),L.length+=k}o(b,"addSegment");for(var w=0;w<d.length;w++){var _=d[w],T=d[w-1];T&&(_.startDist=T.startDist+T.length),b(_,_.p0,v[w*x],0,i.bezierProjPcts[0]);for(var E=0;E<x-1;E++)b(_,v[w*x+E],v[w*x+E+1],i.bezierProjPcts[E],i.bezierProjPcts[E+1]);b(_,v[w*x+x-1],_.p2,i.bezierProjPcts[x-1],1)}return f.cache=d},"createControlPointInfo"),h=o(function(d){var p,m=d==="source";if(a[d]){var g=t.pstyle(d+"-text-offset").pfValue;switch(n.edgeType){case"self":case"compound":case"bezier":case"multibezier":{for(var y=u(),v,x=0,b=0,w=0;w<y.length;w++){for(var _=y[m?w:y.length-1-w],T=0;T<_.segments.length;T++){var E=_.segments[m?T:_.segments.length-1-T],L=w===y.length-1&&T===_.segments.length-1;if(x=b,b+=E.length,b>=g||L){v={cp:_,segment:E};break}}if(v)break}var C=v.cp,A=v.segment,I=(g-x)/A.length,D=A.t1-A.t0,k=m?A.t0+D*I:A.t1-D*I;k=Wx(0,k,1),e=i1(C.p0,C.p1,C.p2,k),p=_et(C.p0,C.p1,C.p2,k);break}case"straight":case"segments":case"haystack":{for(var R=0,S,O,N,P,F=n.allpts.length,B=0;B+3<F&&(m?(N={x:n.allpts[B],y:n.allpts[B+1]},P={x:n.allpts[B+2],y:n.allpts[B+3]}):(N={x:n.allpts[F-2-B],y:n.allpts[F-1-B]},P={x:n.allpts[F-4-B],y:n.allpts[F-3-B]}),S=G0(N,P),O=R,R+=S,!(R>=g));B+=2);var $=g-O,z=$/S;z=Wx(0,z,1),e=Nje(N,P,z),p=u1e(N,P);break}}s("labelX",d,e.x),s("labelY",d,e.y),s("labelAutoAngle",d,p)}},"calculateEndProjection");h("source"),h("target"),this.applyLabelDimensions(t)}};Wc.applyLabelDimensions=function(t){this.applyPrefixedLabelDimensions(t),t.isEdge()&&(this.applyPrefixedLabelDimensions(t,"source"),this.applyPrefixedLabelDimensions(t,"target"))};Wc.applyPrefixedLabelDimensions=function(t,e){var r=t._private,n=this.getLabelText(t,e),i=this.calculateLabelDimensions(t,n),a=t.pstyle("line-height").pfValue,s=t.pstyle("text-wrap").strValue,l=Wl(r.rscratch,"labelWrapCachedLines",e)||[],u=s!=="wrap"?1:Math.max(l.length,1),h=i.height/u,f=h*a,d=i.width,p=i.height+(u-1)*(a-1)*h;wf(r.rstyle,"labelWidth",e,d),wf(r.rscratch,"labelWidth",e,d),wf(r.rstyle,"labelHeight",e,p),wf(r.rscratch,"labelHeight",e,p),wf(r.rscratch,"labelLineHeight",e,f)};Wc.getLabelText=function(t,e){var r=t._private,n=e?e+"-":"",i=t.pstyle(n+"label").strValue,a=t.pstyle("text-transform").value,s=o(function(j,K){return K?(wf(r.rscratch,j,e,K),K):Wl(r.rscratch,j,e)},"rscratch");if(!i)return"";a=="none"||(a=="uppercase"?i=i.toUpperCase():a=="lowercase"&&(i=i.toLowerCase()));var l=t.pstyle("text-wrap").value;if(l==="wrap"){var u=s("labelKey");if(u!=null&&s("labelWrapKey")===u)return s("labelWrapCachedText");for(var h="\u200B",f=i.split(` +`),d=t.pstyle("text-max-width").pfValue,p=t.pstyle("text-overflow-wrap").value,m=p==="anywhere",g=[],y=/[\s\u200b]+|$/g,v=0;v<f.length;v++){var x=f[v],b=this.calculateLabelDimensions(t,x),w=b.width;if(m){var _=x.split("").join(h);x=_}if(w>d){var T=x.matchAll(y),E="",L=0,C=Yme(T),A;try{for(C.s();!(A=C.n()).done;){var I=A.value,D=I[0],k=x.substring(L,I.index);L=I.index+D.length;var R=E.length===0?k:E+k+D,S=this.calculateLabelDimensions(t,R),O=S.width;O<=d?E+=k+D:(E&&g.push(E),E=k+D)}}catch(W){C.e(W)}finally{C.f()}E.match(/^[\s\u200b]+$/)||g.push(E)}else g.push(x)}s("labelWrapCachedLines",g),i=s("labelWrapCachedText",g.join(` +`)),s("labelWrapKey",u)}else if(l==="ellipsis"){var N=t.pstyle("text-max-width").pfValue,P="",F="\u2026",B=!1;if(this.calculateLabelDimensions(t,i).width<N)return i;for(var $=0;$<i.length;$++){var z=this.calculateLabelDimensions(t,P+i[$]+F).width;if(z>N)break;P+=i[$],$===i.length-1&&(B=!0)}return B||(P+=F),P}return i};Wc.getLabelJustification=function(t){var e=t.pstyle("text-justification").strValue,r=t.pstyle("text-halign").strValue;if(e==="auto")if(t.isNode())switch(r){case"left":return"right";case"right":return"left";default:return"center"}else return"center";else return e};Wc.calculateLabelDimensions=function(t,e){var r=this,n=r.cy.window(),i=n.document,a=z0(e,t._private.labelDimsKey),s=r.labelDimCache||(r.labelDimCache=[]),l=s[a];if(l!=null)return l;var u=0,h=t.pstyle("font-style").strValue,f=t.pstyle("font-size").pfValue,d=t.pstyle("font-family").strValue,p=t.pstyle("font-weight").strValue,m=this.labelCalcCanvas,g=this.labelCalcCanvasContext;if(!m){m=this.labelCalcCanvas=i.createElement("canvas"),g=this.labelCalcCanvasContext=m.getContext("2d");var y=m.style;y.position="absolute",y.left="-9999px",y.top="-9999px",y.zIndex="-1",y.visibility="hidden",y.pointerEvents="none"}g.font="".concat(h," ").concat(p," ").concat(f,"px ").concat(d);for(var v=0,x=0,b=e.split(` +`),w=0;w<b.length;w++){var _=b[w],T=g.measureText(_),E=Math.ceil(T.width),L=f;v=Math.max(E,v),x+=L}return v+=u,x+=u,s[a]={width:v,height:x}};Wc.calculateLabelAngle=function(t,e){var r=t._private,n=r.rscratch,i=t.isEdge(),a=e?e+"-":"",s=t.pstyle(a+"text-rotation"),l=s.strValue;return l==="none"?0:i&&l==="autorotate"?n.labelAutoAngle:l==="autorotate"?0:s.pfValue};Wc.calculateLabelAngles=function(t){var e=this,r=t.isEdge(),n=t._private,i=n.rscratch;i.labelAngle=e.calculateLabelAngle(t),r&&(i.sourceLabelAngle=e.calculateLabelAngle(t,"source"),i.targetLabelAngle=e.calculateLabelAngle(t,"target"))};h1e={},Mme=28,Ime=!1;h1e.getNodeShape=function(t){var e=this,r=t.pstyle("shape").value;if(r==="cutrectangle"&&(t.width()<Mme||t.height()<Mme))return Ime||(on("The `cutrectangle` node shape can not be used at small sizes so `rectangle` is used instead"),Ime=!0),"rectangle";if(t.isParent())return r==="rectangle"||r==="roundrectangle"||r==="round-rectangle"||r==="cutrectangle"||r==="cut-rectangle"||r==="barrel"?r:"rectangle";if(r==="polygon"){var n=t.pstyle("shape-polygon-points").value;return e.nodeShapes.makePolygon(n).name}return r};$6={};$6.registerCalculationListeners=function(){var t=this.cy,e=t.collection(),r=this,n=o(function(s){var l=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0;if(e.merge(s),l)for(var u=0;u<s.length;u++){var h=s[u],f=h._private,d=f.rstyle;d.clean=!1,d.cleanConnected=!1}},"enqueue");r.binder(t).on("bounds.* dirty.*",o(function(s){var l=s.target;n(l)},"onDirtyBounds")).on("style.* background.*",o(function(s){var l=s.target;n(l,!1)},"onDirtyStyle"));var i=o(function(s){if(s){var l=r.onUpdateEleCalcsFns;e.cleanStyle();for(var u=0;u<e.length;u++){var h=e[u],f=h._private.rstyle;h.isNode()&&!f.cleanConnected&&(n(h.connectedEdges()),f.cleanConnected=!0)}if(l)for(var d=0;d<l.length;d++){var p=l[d];p(s,e)}r.recalculateRenderedStyle(e),e=t.collection()}},"updateEleCalcs");r.flushRenderedStyleQueue=function(){i(!0)},r.beforeRender(i,r.beforeRenderPriorities.eleCalcs)};$6.onUpdateEleCalcs=function(t){var e=this.onUpdateEleCalcsFns=this.onUpdateEleCalcsFns||[];e.push(t)};$6.recalculateRenderedStyle=function(t,e){var r=o(function(_){return _._private.rstyle.cleanConnected},"isCleanConnected"),n=[],i=[];if(!this.destroyed){e===void 0&&(e=!0);for(var a=0;a<t.length;a++){var s=t[a],l=s._private,u=l.rstyle;s.isEdge()&&(!r(s.source())||!r(s.target()))&&(u.clean=!1),!(e&&u.clean||s.removed())&&s.pstyle("display").value!=="none"&&(l.group==="nodes"?i.push(s):n.push(s),u.clean=!0)}for(var h=0;h<i.length;h++){var f=i[h],d=f._private,p=d.rstyle,m=f.position();this.recalculateNodeLabelProjection(f),p.nodeX=m.x,p.nodeY=m.y,p.nodeW=f.pstyle("width").pfValue,p.nodeH=f.pstyle("height").pfValue}this.recalculateEdgeProjections(n);for(var g=0;g<n.length;g++){var y=n[g],v=y._private,x=v.rstyle,b=v.rscratch;x.srcX=b.arrowStartX,x.srcY=b.arrowStartY,x.tgtX=b.arrowEndX,x.tgtY=b.arrowEndY,x.midX=b.midX,x.midY=b.midY,x.labelAngle=b.labelAngle,x.sourceLabelAngle=b.sourceLabelAngle,x.targetLabelAngle=b.targetLabelAngle}}};V6={};V6.updateCachedGrabbedEles=function(){var t=this.cachedZSortedEles;if(t){t.drag=[],t.nondrag=[];for(var e=[],r=0;r<t.length;r++){var n=t[r],i=n._private.rscratch;n.grabbed()&&!n.isParent()?e.push(n):i.inDragLayer?t.drag.push(n):t.nondrag.push(n)}for(var r=0;r<e.length;r++){var n=e[r];t.drag.push(n)}}};V6.invalidateCachedZSortedEles=function(){this.cachedZSortedEles=null};V6.getCachedZSortedEles=function(t){if(t||!this.cachedZSortedEles){var e=this.cy.mutableElements().toArray();e.sort(Xge),e.interactive=e.filter(function(r){return r.interactive()}),this.cachedZSortedEles=e,this.updateCachedGrabbedEles()}else e=this.cachedZSortedEles;return e};f1e={};[W0,k6,Ga,ib,wB,Wc,h1e,$6,V6].forEach(function(t){ir(f1e,t)});d1e={};d1e.getCachedImage=function(t,e,r){var n=this,i=n.imageCache=n.imageCache||{},a=i[t];if(a)return a.image.complete||a.image.addEventListener("load",r),a.image;a=i[t]=i[t]||{};var s=a.image=new Image;s.addEventListener("load",r),s.addEventListener("error",function(){s.error=!0});var l="data:",u=t.substring(0,l.length).toLowerCase()===l;return u||(e=e==="null"?null:e,s.crossOrigin=e),s.src=t,s};x1={};x1.registerBinding=function(t,e,r,n){var i=Array.prototype.slice.apply(arguments,[1]),a=this.binder(t);return a.on.apply(a,i)};x1.binder=function(t){var e=this,r=e.cy.window(),n=t===r||t===r.document||t===r.document.body||Qqe(t);if(e.supportsPassiveEvents==null){var i=!1;try{var a=Object.defineProperty({},"passive",{get:o(function(){return i=!0,!0},"get")});r.addEventListener("test",null,a)}catch{}e.supportsPassiveEvents=i}var s=o(function(u,h,f){var d=Array.prototype.slice.call(arguments);return n&&e.supportsPassiveEvents&&(d[2]={capture:f??!1,passive:!1,once:!1}),e.bindings.push({target:t,args:d}),(t.addEventListener||t.on).apply(t,d),this},"on");return{on:s,addEventListener:s,addListener:s,bind:s}};x1.nodeIsDraggable=function(t){return t&&t.isNode()&&!t.locked()&&t.grabbable()};x1.nodeIsGrabbable=function(t){return this.nodeIsDraggable(t)&&t.interactive()};x1.load=function(){var t=this,e=t.cy.window(),r=o(function(X){return X.selected()},"isSelected"),n=o(function(X,fe,he,ge){X==null&&(X=t.cy);for(var ne=0;ne<fe.length;ne++){var ye=fe[ne];X.emit({originalEvent:he,type:ye,position:ge})}},"triggerEvents"),i=o(function(X){return X.shiftKey||X.metaKey||X.ctrlKey},"isMultSelKeyDown"),a=o(function(X,fe){var he=!0;if(t.cy.hasCompoundNodes()&&X&&X.pannable())for(var ge=0;fe&&ge<fe.length;ge++){var X=fe[ge];if(X.isNode()&&X.isParent()&&!X.pannable()){he=!1;break}}else he=!0;return he},"allowPanningPassthrough"),s=o(function(X){X[0]._private.grabbed=!0},"setGrabbed"),l=o(function(X){X[0]._private.grabbed=!1},"setFreed"),u=o(function(X){X[0]._private.rscratch.inDragLayer=!0},"setInDragLayer"),h=o(function(X){X[0]._private.rscratch.inDragLayer=!1},"setOutDragLayer"),f=o(function(X){X[0]._private.rscratch.isGrabTarget=!0},"setGrabTarget"),d=o(function(X){X[0]._private.rscratch.isGrabTarget=!1},"removeGrabTarget"),p=o(function(X,fe){var he=fe.addToList,ge=he.has(X);!ge&&X.grabbable()&&!X.locked()&&(he.merge(X),s(X))},"addToDragList"),m=o(function(X,fe){if(X.cy().hasCompoundNodes()&&!(fe.inDragLayer==null&&fe.addToList==null)){var he=X.descendants();fe.inDragLayer&&(he.forEach(u),he.connectedEdges().forEach(u)),fe.addToList&&p(he,fe)}},"addDescendantsToDrag"),g=o(function(X,fe){fe=fe||{};var he=X.cy().hasCompoundNodes();fe.inDragLayer&&(X.forEach(u),X.neighborhood().stdFilter(function(ge){return!he||ge.isEdge()}).forEach(u)),fe.addToList&&X.forEach(function(ge){p(ge,fe)}),m(X,fe),x(X,{inDragLayer:fe.inDragLayer}),t.updateCachedGrabbedEles()},"addNodesToDrag"),y=g,v=o(function(X){X&&(t.getCachedZSortedEles().forEach(function(fe){l(fe),h(fe),d(fe)}),t.updateCachedGrabbedEles())},"freeDraggedElements"),x=o(function(X,fe){if(!(fe.inDragLayer==null&&fe.addToList==null)&&X.cy().hasCompoundNodes()){var he=X.ancestors().orphans();if(!he.same(X)){var ge=he.descendants().spawnSelf().merge(he).unmerge(X).unmerge(X.descendants()),ne=ge.connectedEdges();fe.inDragLayer&&(ne.forEach(u),ge.forEach(u)),fe.addToList&&ge.forEach(function(ye){p(ye,fe)})}}},"updateAncestorsInDragLayer"),b=o(function(){document.activeElement!=null&&document.activeElement.blur!=null&&document.activeElement.blur()},"blurActiveDomElement"),w=typeof MutationObserver<"u",_=typeof ResizeObserver<"u";w?(t.removeObserver=new MutationObserver(function(xe){for(var X=0;X<xe.length;X++){var fe=xe[X],he=fe.removedNodes;if(he)for(var ge=0;ge<he.length;ge++){var ne=he[ge];if(ne===t.container){t.destroy();break}}}}),t.container.parentNode&&t.removeObserver.observe(t.container.parentNode,{childList:!0})):t.registerBinding(t.container,"DOMNodeRemoved",function(xe){t.destroy()});var T=A6(function(){t.cy.resize()},100);w&&(t.styleObserver=new MutationObserver(T),t.styleObserver.observe(t.container,{attributes:!0})),t.registerBinding(e,"resize",T),_&&(t.resizeObserver=new ResizeObserver(T),t.resizeObserver.observe(t.container));var E=o(function(X,fe){for(;X!=null;)fe(X),X=X.parentNode},"forEachUp"),L=o(function(){t.invalidateContainerClientCoordsCache()},"invalidateCoords");E(t.container,function(xe){t.registerBinding(xe,"transitionend",L),t.registerBinding(xe,"animationend",L),t.registerBinding(xe,"scroll",L)}),t.registerBinding(t.container,"contextmenu",function(xe){xe.preventDefault()});var C=o(function(){return t.selection[4]!==0},"inBoxSelection"),A=o(function(X){for(var fe=t.findContainerClientCoords(),he=fe[0],ge=fe[1],ne=fe[2],ye=fe[3],U=X.touches?X.touches:[X],Te=!1,se=0;se<U.length;se++){var Ee=U[se];if(he<=Ee.clientX&&Ee.clientX<=he+ne&&ge<=Ee.clientY&&Ee.clientY<=ge+ye){Te=!0;break}}if(!Te)return!1;for(var Ae=t.container,Pe=X.target,Me=Pe.parentNode,me=!1;Me;){if(Me===Ae){me=!0;break}Me=Me.parentNode}return!!me},"eventInContainer");t.registerBinding(t.container,"mousedown",o(function(X){if(A(X)&&!(t.hoverData.which===1&&X.which!==1)){X.preventDefault(),b(),t.hoverData.capture=!0,t.hoverData.which=X.which;var fe=t.cy,he=[X.clientX,X.clientY],ge=t.projectIntoViewport(he[0],he[1]),ne=t.selection,ye=t.findNearestElements(ge[0],ge[1],!0,!1),U=ye[0],Te=t.dragData.possibleDragElements;t.hoverData.mdownPos=ge,t.hoverData.mdownGPos=he;var se=o(function(){t.hoverData.tapholdCancelled=!1,clearTimeout(t.hoverData.tapholdTimeout),t.hoverData.tapholdTimeout=setTimeout(function(){if(!t.hoverData.tapholdCancelled){var We=t.hoverData.down;We?We.emit({originalEvent:X,type:"taphold",position:{x:ge[0],y:ge[1]}}):fe.emit({originalEvent:X,type:"taphold",position:{x:ge[0],y:ge[1]}})}},t.tapholdDuration)},"checkForTaphold");if(X.which==3){t.hoverData.cxtStarted=!0;var Ee={originalEvent:X,type:"cxttapstart",position:{x:ge[0],y:ge[1]}};U?(U.activate(),U.emit(Ee),t.hoverData.down=U):fe.emit(Ee),t.hoverData.downTime=new Date().getTime(),t.hoverData.cxtDragged=!1}else if(X.which==1){U&&U.activate();{if(U!=null&&t.nodeIsGrabbable(U)){var Ae=o(function(We){return{originalEvent:X,type:We,position:{x:ge[0],y:ge[1]}}},"makeEvent"),Pe=o(function(We){We.emit(Ae("grab"))},"triggerGrab");if(f(U),!U.selected())Te=t.dragData.possibleDragElements=fe.collection(),y(U,{addToList:Te}),U.emit(Ae("grabon")).emit(Ae("grab"));else{Te=t.dragData.possibleDragElements=fe.collection();var Me=fe.$(function(me){return me.isNode()&&me.selected()&&t.nodeIsGrabbable(me)});g(Me,{addToList:Te}),U.emit(Ae("grabon")),Me.forEach(Pe)}t.redrawHint("eles",!0),t.redrawHint("drag",!0)}t.hoverData.down=U,t.hoverData.downs=ye,t.hoverData.downTime=new Date().getTime()}n(U,["mousedown","tapstart","vmousedown"],X,{x:ge[0],y:ge[1]}),U==null?(ne[4]=1,t.data.bgActivePosistion={x:ge[0],y:ge[1]},t.redrawHint("select",!0),t.redraw()):U.pannable()&&(ne[4]=1),se()}ne[0]=ne[2]=ge[0],ne[1]=ne[3]=ge[1]}},"mousedownHandler"),!1),t.registerBinding(e,"mousemove",o(function(X){var fe=t.hoverData.capture;if(!(!fe&&!A(X))){var he=!1,ge=t.cy,ne=ge.zoom(),ye=[X.clientX,X.clientY],U=t.projectIntoViewport(ye[0],ye[1]),Te=t.hoverData.mdownPos,se=t.hoverData.mdownGPos,Ee=t.selection,Ae=null;!t.hoverData.draggingEles&&!t.hoverData.dragging&&!t.hoverData.selecting&&(Ae=t.findNearestElement(U[0],U[1],!0,!1));var Pe=t.hoverData.last,Me=t.hoverData.down,me=[U[0]-Ee[2],U[1]-Ee[3]],We=t.dragData.possibleDragElements,Re;if(se){var tt=ye[0]-se[0],gt=tt*tt,Et=ye[1]-se[1],vt=Et*Et,Ye=gt+vt;t.hoverData.isOverThresholdDrag=Re=Ye>=t.desktopTapThreshold2}var Tt=i(X);Re&&(t.hoverData.tapholdCancelled=!0);var $e=o(function(){var zt=t.hoverData.dragDelta=t.hoverData.dragDelta||[];zt.length===0?(zt.push(me[0]),zt.push(me[1])):(zt[0]+=me[0],zt[1]+=me[1])},"updateDragDelta");he=!0,n(Ae,["mousemove","vmousemove","tapdrag"],X,{x:U[0],y:U[1]});var rt=o(function(){t.data.bgActivePosistion=void 0,t.hoverData.selecting||ge.emit({originalEvent:X,type:"boxstart",position:{x:U[0],y:U[1]}}),Ee[4]=1,t.hoverData.selecting=!0,t.redrawHint("select",!0),t.redraw()},"goIntoBoxMode");if(t.hoverData.which===3){if(Re){var ft={originalEvent:X,type:"cxtdrag",position:{x:U[0],y:U[1]}};Me?Me.emit(ft):ge.emit(ft),t.hoverData.cxtDragged=!0,(!t.hoverData.cxtOver||Ae!==t.hoverData.cxtOver)&&(t.hoverData.cxtOver&&t.hoverData.cxtOver.emit({originalEvent:X,type:"cxtdragout",position:{x:U[0],y:U[1]}}),t.hoverData.cxtOver=Ae,Ae&&Ae.emit({originalEvent:X,type:"cxtdragover",position:{x:U[0],y:U[1]}}))}}else if(t.hoverData.dragging){if(he=!0,ge.panningEnabled()&&ge.userPanningEnabled()){var kt;if(t.hoverData.justStartedPan){var er=t.hoverData.mdownPos;kt={x:(U[0]-er[0])*ne,y:(U[1]-er[1])*ne},t.hoverData.justStartedPan=!1}else kt={x:me[0]*ne,y:me[1]*ne};ge.panBy(kt),ge.emit("dragpan"),t.hoverData.dragged=!0}U=t.projectIntoViewport(X.clientX,X.clientY)}else if(Ee[4]==1&&(Me==null||Me.pannable())){if(Re){if(!t.hoverData.dragging&&ge.boxSelectionEnabled()&&(Tt||!ge.panningEnabled()||!ge.userPanningEnabled()))rt();else if(!t.hoverData.selecting&&ge.panningEnabled()&&ge.userPanningEnabled()){var dt=a(Me,t.hoverData.downs);dt&&(t.hoverData.dragging=!0,t.hoverData.justStartedPan=!0,Ee[4]=0,t.data.bgActivePosistion=r1(Te),t.redrawHint("select",!0),t.redraw())}Me&&Me.pannable()&&Me.active()&&Me.unactivate()}}else{if(Me&&Me.pannable()&&Me.active()&&Me.unactivate(),(!Me||!Me.grabbed())&&Ae!=Pe&&(Pe&&n(Pe,["mouseout","tapdragout"],X,{x:U[0],y:U[1]}),Ae&&n(Ae,["mouseover","tapdragover"],X,{x:U[0],y:U[1]}),t.hoverData.last=Ae),Me)if(Re){if(ge.boxSelectionEnabled()&&Tt)Me&&Me.grabbed()&&(v(We),Me.emit("freeon"),We.emit("free"),t.dragData.didDrag&&(Me.emit("dragfreeon"),We.emit("dragfree"))),rt();else if(Me&&Me.grabbed()&&t.nodeIsDraggable(Me)){var Xe=!t.dragData.didDrag;Xe&&t.redrawHint("eles",!0),t.dragData.didDrag=!0,t.hoverData.draggingEles||g(We,{inDragLayer:!0});var ct={x:0,y:0};if(xt(me[0])&&xt(me[1])&&(ct.x+=me[0],ct.y+=me[1],Xe)){var Lt=t.hoverData.dragDelta;Lt&&xt(Lt[0])&&xt(Lt[1])&&(ct.x+=Lt[0],ct.y+=Lt[1])}t.hoverData.draggingEles=!0,We.silentShift(ct).emit("position drag"),t.redrawHint("drag",!0),t.redraw()}}else $e();he=!0}if(Ee[2]=U[0],Ee[3]=U[1],he)return X.stopPropagation&&X.stopPropagation(),X.preventDefault&&X.preventDefault(),!1}},"mousemoveHandler"),!1);var I,D,k;t.registerBinding(e,"mouseup",o(function(X){if(!(t.hoverData.which===1&&X.which!==1&&t.hoverData.capture)){var fe=t.hoverData.capture;if(fe){t.hoverData.capture=!1;var he=t.cy,ge=t.projectIntoViewport(X.clientX,X.clientY),ne=t.selection,ye=t.findNearestElement(ge[0],ge[1],!0,!1),U=t.dragData.possibleDragElements,Te=t.hoverData.down,se=i(X);if(t.data.bgActivePosistion&&(t.redrawHint("select",!0),t.redraw()),t.hoverData.tapholdCancelled=!0,t.data.bgActivePosistion=void 0,Te&&Te.unactivate(),t.hoverData.which===3){var Ee={originalEvent:X,type:"cxttapend",position:{x:ge[0],y:ge[1]}};if(Te?Te.emit(Ee):he.emit(Ee),!t.hoverData.cxtDragged){var Ae={originalEvent:X,type:"cxttap",position:{x:ge[0],y:ge[1]}};Te?Te.emit(Ae):he.emit(Ae)}t.hoverData.cxtDragged=!1,t.hoverData.which=null}else if(t.hoverData.which===1){if(n(ye,["mouseup","tapend","vmouseup"],X,{x:ge[0],y:ge[1]}),!t.dragData.didDrag&&!t.hoverData.dragged&&!t.hoverData.selecting&&!t.hoverData.isOverThresholdDrag&&(n(Te,["click","tap","vclick"],X,{x:ge[0],y:ge[1]}),D=!1,X.timeStamp-k<=he.multiClickDebounceTime()?(I&&clearTimeout(I),D=!0,k=null,n(Te,["dblclick","dbltap","vdblclick"],X,{x:ge[0],y:ge[1]})):(I=setTimeout(function(){D||n(Te,["oneclick","onetap","voneclick"],X,{x:ge[0],y:ge[1]})},he.multiClickDebounceTime()),k=X.timeStamp)),Te==null&&!t.dragData.didDrag&&!t.hoverData.selecting&&!t.hoverData.dragged&&!i(X)&&(he.$(r).unselect(["tapunselect"]),U.length>0&&t.redrawHint("eles",!0),t.dragData.possibleDragElements=U=he.collection()),ye==Te&&!t.dragData.didDrag&&!t.hoverData.selecting&&ye!=null&&ye._private.selectable&&(t.hoverData.dragging||(he.selectionType()==="additive"||se?ye.selected()?ye.unselect(["tapunselect"]):ye.select(["tapselect"]):se||(he.$(r).unmerge(ye).unselect(["tapunselect"]),ye.select(["tapselect"]))),t.redrawHint("eles",!0)),t.hoverData.selecting){var Pe=he.collection(t.getAllInBox(ne[0],ne[1],ne[2],ne[3]));t.redrawHint("select",!0),Pe.length>0&&t.redrawHint("eles",!0),he.emit({type:"boxend",originalEvent:X,position:{x:ge[0],y:ge[1]}});var Me=o(function(Re){return Re.selectable()&&!Re.selected()},"eleWouldBeSelected");he.selectionType()==="additive"||se||he.$(r).unmerge(Pe).unselect(),Pe.emit("box").stdFilter(Me).select().emit("boxselect"),t.redraw()}if(t.hoverData.dragging&&(t.hoverData.dragging=!1,t.redrawHint("select",!0),t.redrawHint("eles",!0),t.redraw()),!ne[4]){t.redrawHint("drag",!0),t.redrawHint("eles",!0);var me=Te&&Te.grabbed();v(U),me&&(Te.emit("freeon"),U.emit("free"),t.dragData.didDrag&&(Te.emit("dragfreeon"),U.emit("dragfree")))}}ne[4]=0,t.hoverData.down=null,t.hoverData.cxtStarted=!1,t.hoverData.draggingEles=!1,t.hoverData.selecting=!1,t.hoverData.isOverThresholdDrag=!1,t.dragData.didDrag=!1,t.hoverData.dragged=!1,t.hoverData.dragDelta=[],t.hoverData.mdownPos=null,t.hoverData.mdownGPos=null,t.hoverData.which=null}}},"mouseupHandler"),!1);var R=o(function(X){if(!t.scrollingPage){var fe=t.cy,he=fe.zoom(),ge=fe.pan(),ne=t.projectIntoViewport(X.clientX,X.clientY),ye=[ne[0]*he+ge.x,ne[1]*he+ge.y];if(t.hoverData.draggingEles||t.hoverData.dragging||t.hoverData.cxtStarted||C()){X.preventDefault();return}if(fe.panningEnabled()&&fe.userPanningEnabled()&&fe.zoomingEnabled()&&fe.userZoomingEnabled()){X.preventDefault(),t.data.wheelZooming=!0,clearTimeout(t.data.wheelTimeout),t.data.wheelTimeout=setTimeout(function(){t.data.wheelZooming=!1,t.redrawHint("eles",!0),t.redraw()},150);var U;X.deltaY!=null?U=X.deltaY/-250:X.wheelDeltaY!=null?U=X.wheelDeltaY/1e3:U=X.wheelDelta/1e3,U=U*t.wheelSensitivity;var Te=X.deltaMode===1;Te&&(U*=33);var se=fe.zoom()*Math.pow(10,U);X.type==="gesturechange"&&(se=t.gestureStartZoom*X.scale),fe.zoom({level:se,renderedPosition:{x:ye[0],y:ye[1]}}),fe.emit(X.type==="gesturechange"?"pinchzoom":"scrollzoom")}}},"wheelHandler");t.registerBinding(t.container,"wheel",R,!0),t.registerBinding(e,"scroll",o(function(X){t.scrollingPage=!0,clearTimeout(t.scrollingPageTimeout),t.scrollingPageTimeout=setTimeout(function(){t.scrollingPage=!1},250)},"scrollHandler"),!0),t.registerBinding(t.container,"gesturestart",o(function(X){t.gestureStartZoom=t.cy.zoom(),t.hasTouchStarted||X.preventDefault()},"gestureStartHandler"),!0),t.registerBinding(t.container,"gesturechange",function(xe){t.hasTouchStarted||R(xe)},!0),t.registerBinding(t.container,"mouseout",o(function(X){var fe=t.projectIntoViewport(X.clientX,X.clientY);t.cy.emit({originalEvent:X,type:"mouseout",position:{x:fe[0],y:fe[1]}})},"mouseOutHandler"),!1),t.registerBinding(t.container,"mouseover",o(function(X){var fe=t.projectIntoViewport(X.clientX,X.clientY);t.cy.emit({originalEvent:X,type:"mouseover",position:{x:fe[0],y:fe[1]}})},"mouseOverHandler"),!1);var S,O,N,P,F,B,$,z,W,j,K,ie,Q,ee=o(function(X,fe,he,ge){return Math.sqrt((he-X)*(he-X)+(ge-fe)*(ge-fe))},"distance"),J=o(function(X,fe,he,ge){return(he-X)*(he-X)+(ge-fe)*(ge-fe)},"distanceSq"),H;t.registerBinding(t.container,"touchstart",H=o(function(X){if(t.hasTouchStarted=!0,!!A(X)){b(),t.touchData.capture=!0,t.data.bgActivePosistion=void 0;var fe=t.cy,he=t.touchData.now,ge=t.touchData.earlier;if(X.touches[0]){var ne=t.projectIntoViewport(X.touches[0].clientX,X.touches[0].clientY);he[0]=ne[0],he[1]=ne[1]}if(X.touches[1]){var ne=t.projectIntoViewport(X.touches[1].clientX,X.touches[1].clientY);he[2]=ne[0],he[3]=ne[1]}if(X.touches[2]){var ne=t.projectIntoViewport(X.touches[2].clientX,X.touches[2].clientY);he[4]=ne[0],he[5]=ne[1]}if(X.touches[1]){t.touchData.singleTouchMoved=!0,v(t.dragData.touchDragEles);var ye=t.findContainerClientCoords();W=ye[0],j=ye[1],K=ye[2],ie=ye[3],S=X.touches[0].clientX-W,O=X.touches[0].clientY-j,N=X.touches[1].clientX-W,P=X.touches[1].clientY-j,Q=0<=S&&S<=K&&0<=N&&N<=K&&0<=O&&O<=ie&&0<=P&&P<=ie;var U=fe.pan(),Te=fe.zoom();F=ee(S,O,N,P),B=J(S,O,N,P),$=[(S+N)/2,(O+P)/2],z=[($[0]-U.x)/Te,($[1]-U.y)/Te];var se=200,Ee=se*se;if(B<Ee&&!X.touches[2]){var Ae=t.findNearestElement(he[0],he[1],!0,!0),Pe=t.findNearestElement(he[2],he[3],!0,!0);Ae&&Ae.isNode()?(Ae.activate().emit({originalEvent:X,type:"cxttapstart",position:{x:he[0],y:he[1]}}),t.touchData.start=Ae):Pe&&Pe.isNode()?(Pe.activate().emit({originalEvent:X,type:"cxttapstart",position:{x:he[0],y:he[1]}}),t.touchData.start=Pe):fe.emit({originalEvent:X,type:"cxttapstart",position:{x:he[0],y:he[1]}}),t.touchData.start&&(t.touchData.start._private.grabbed=!1),t.touchData.cxt=!0,t.touchData.cxtDragged=!1,t.data.bgActivePosistion=void 0,t.redraw();return}}if(X.touches[2])fe.boxSelectionEnabled()&&X.preventDefault();else if(!X.touches[1]){if(X.touches[0]){var Me=t.findNearestElements(he[0],he[1],!0,!0),me=Me[0];if(me!=null&&(me.activate(),t.touchData.start=me,t.touchData.starts=Me,t.nodeIsGrabbable(me))){var We=t.dragData.touchDragEles=fe.collection(),Re=null;t.redrawHint("eles",!0),t.redrawHint("drag",!0),me.selected()?(Re=fe.$(function(Ye){return Ye.selected()&&t.nodeIsGrabbable(Ye)}),g(Re,{addToList:We})):y(me,{addToList:We}),f(me);var tt=o(function(Tt){return{originalEvent:X,type:Tt,position:{x:he[0],y:he[1]}}},"makeEvent");me.emit(tt("grabon")),Re?Re.forEach(function(Ye){Ye.emit(tt("grab"))}):me.emit(tt("grab"))}n(me,["touchstart","tapstart","vmousedown"],X,{x:he[0],y:he[1]}),me==null&&(t.data.bgActivePosistion={x:ne[0],y:ne[1]},t.redrawHint("select",!0),t.redraw()),t.touchData.singleTouchMoved=!1,t.touchData.singleTouchStartTime=+new Date,clearTimeout(t.touchData.tapholdTimeout),t.touchData.tapholdTimeout=setTimeout(function(){t.touchData.singleTouchMoved===!1&&!t.pinching&&!t.touchData.selecting&&n(t.touchData.start,["taphold"],X,{x:he[0],y:he[1]})},t.tapholdDuration)}}if(X.touches.length>=1){for(var gt=t.touchData.startPosition=[null,null,null,null,null,null],Et=0;Et<he.length;Et++)gt[Et]=ge[Et]=he[Et];var vt=X.touches[0];t.touchData.startGPosition=[vt.clientX,vt.clientY]}}},"touchstartHandler"),!1);var q;t.registerBinding(e,"touchmove",q=o(function(X){var fe=t.touchData.capture;if(!(!fe&&!A(X))){var he=t.selection,ge=t.cy,ne=t.touchData.now,ye=t.touchData.earlier,U=ge.zoom();if(X.touches[0]){var Te=t.projectIntoViewport(X.touches[0].clientX,X.touches[0].clientY);ne[0]=Te[0],ne[1]=Te[1]}if(X.touches[1]){var Te=t.projectIntoViewport(X.touches[1].clientX,X.touches[1].clientY);ne[2]=Te[0],ne[3]=Te[1]}if(X.touches[2]){var Te=t.projectIntoViewport(X.touches[2].clientX,X.touches[2].clientY);ne[4]=Te[0],ne[5]=Te[1]}var se=t.touchData.startGPosition,Ee;if(fe&&X.touches[0]&&se){for(var Ae=[],Pe=0;Pe<ne.length;Pe++)Ae[Pe]=ne[Pe]-ye[Pe];var Me=X.touches[0].clientX-se[0],me=Me*Me,We=X.touches[0].clientY-se[1],Re=We*We,tt=me+Re;Ee=tt>=t.touchTapThreshold2}if(fe&&t.touchData.cxt){X.preventDefault();var gt=X.touches[0].clientX-W,Et=X.touches[0].clientY-j,vt=X.touches[1].clientX-W,Ye=X.touches[1].clientY-j,Tt=J(gt,Et,vt,Ye),$e=Tt/B,rt=150,ft=rt*rt,kt=1.5,er=kt*kt;if($e>=er||Tt>=ft){t.touchData.cxt=!1,t.data.bgActivePosistion=void 0,t.redrawHint("select",!0);var dt={originalEvent:X,type:"cxttapend",position:{x:ne[0],y:ne[1]}};t.touchData.start?(t.touchData.start.unactivate().emit(dt),t.touchData.start=null):ge.emit(dt)}}if(fe&&t.touchData.cxt){var dt={originalEvent:X,type:"cxtdrag",position:{x:ne[0],y:ne[1]}};t.data.bgActivePosistion=void 0,t.redrawHint("select",!0),t.touchData.start?t.touchData.start.emit(dt):ge.emit(dt),t.touchData.start&&(t.touchData.start._private.grabbed=!1),t.touchData.cxtDragged=!0;var Xe=t.findNearestElement(ne[0],ne[1],!0,!0);(!t.touchData.cxtOver||Xe!==t.touchData.cxtOver)&&(t.touchData.cxtOver&&t.touchData.cxtOver.emit({originalEvent:X,type:"cxtdragout",position:{x:ne[0],y:ne[1]}}),t.touchData.cxtOver=Xe,Xe&&Xe.emit({originalEvent:X,type:"cxtdragover",position:{x:ne[0],y:ne[1]}}))}else if(fe&&X.touches[2]&&ge.boxSelectionEnabled())X.preventDefault(),t.data.bgActivePosistion=void 0,this.lastThreeTouch=+new Date,t.touchData.selecting||ge.emit({originalEvent:X,type:"boxstart",position:{x:ne[0],y:ne[1]}}),t.touchData.selecting=!0,t.touchData.didSelect=!0,he[4]=1,!he||he.length===0||he[0]===void 0?(he[0]=(ne[0]+ne[2]+ne[4])/3,he[1]=(ne[1]+ne[3]+ne[5])/3,he[2]=(ne[0]+ne[2]+ne[4])/3+1,he[3]=(ne[1]+ne[3]+ne[5])/3+1):(he[2]=(ne[0]+ne[2]+ne[4])/3,he[3]=(ne[1]+ne[3]+ne[5])/3),t.redrawHint("select",!0),t.redraw();else if(fe&&X.touches[1]&&!t.touchData.didSelect&&ge.zoomingEnabled()&&ge.panningEnabled()&&ge.userZoomingEnabled()&&ge.userPanningEnabled()){X.preventDefault(),t.data.bgActivePosistion=void 0,t.redrawHint("select",!0);var ct=t.dragData.touchDragEles;if(ct){t.redrawHint("drag",!0);for(var Lt=0;Lt<ct.length;Lt++){var Rt=ct[Lt]._private;Rt.grabbed=!1,Rt.rscratch.inDragLayer=!1}}var zt=t.touchData.start,gt=X.touches[0].clientX-W,Et=X.touches[0].clientY-j,vt=X.touches[1].clientX-W,Ye=X.touches[1].clientY-j,Xn=ee(gt,Et,vt,Ye),or=Xn/F;if(Q){var hn=gt-S,Tn=Et-O,Ur=vt-N,ri=Ye-P,Mn=(hn+Ur)/2,yt=(Tn+ri)/2,Se=ge.zoom(),at=Se*or,At=ge.pan(),pr=z[0]*Se+At.x,In=z[1]*Se+At.y,On={x:-at/Se*(pr-At.x-Mn)+pr,y:-at/Se*(In-At.y-yt)+In};if(zt&&zt.active()){var ct=t.dragData.touchDragEles;v(ct),t.redrawHint("drag",!0),t.redrawHint("eles",!0),zt.unactivate().emit("freeon"),ct.emit("free"),t.dragData.didDrag&&(zt.emit("dragfreeon"),ct.emit("dragfree"))}ge.viewport({zoom:at,pan:On,cancelOnFailedZoom:!0}),ge.emit("pinchzoom"),F=Xn,S=gt,O=Et,N=vt,P=Ye,t.pinching=!0}if(X.touches[0]){var Te=t.projectIntoViewport(X.touches[0].clientX,X.touches[0].clientY);ne[0]=Te[0],ne[1]=Te[1]}if(X.touches[1]){var Te=t.projectIntoViewport(X.touches[1].clientX,X.touches[1].clientY);ne[2]=Te[0],ne[3]=Te[1]}if(X.touches[2]){var Te=t.projectIntoViewport(X.touches[2].clientX,X.touches[2].clientY);ne[4]=Te[0],ne[5]=Te[1]}}else if(X.touches[0]&&!t.touchData.didSelect){var Ir=t.touchData.start,kn=t.touchData.last,Xe;if(!t.hoverData.draggingEles&&!t.swipePanning&&(Xe=t.findNearestElement(ne[0],ne[1],!0,!0)),fe&&Ir!=null&&X.preventDefault(),fe&&Ir!=null&&t.nodeIsDraggable(Ir))if(Ee){var ct=t.dragData.touchDragEles,_t=!t.dragData.didDrag;_t&&g(ct,{inDragLayer:!0}),t.dragData.didDrag=!0;var St={x:0,y:0};if(xt(Ae[0])&&xt(Ae[1])&&(St.x+=Ae[0],St.y+=Ae[1],_t)){t.redrawHint("eles",!0);var bt=t.touchData.dragDelta;bt&&xt(bt[0])&&xt(bt[1])&&(St.x+=bt[0],St.y+=bt[1])}t.hoverData.draggingEles=!0,ct.silentShift(St).emit("position drag"),t.redrawHint("drag",!0),t.touchData.startPosition[0]==ye[0]&&t.touchData.startPosition[1]==ye[1]&&t.redrawHint("eles",!0),t.redraw()}else{var bt=t.touchData.dragDelta=t.touchData.dragDelta||[];bt.length===0?(bt.push(Ae[0]),bt.push(Ae[1])):(bt[0]+=Ae[0],bt[1]+=Ae[1])}if(n(Ir||Xe,["touchmove","tapdrag","vmousemove"],X,{x:ne[0],y:ne[1]}),(!Ir||!Ir.grabbed())&&Xe!=kn&&(kn&&kn.emit({originalEvent:X,type:"tapdragout",position:{x:ne[0],y:ne[1]}}),Xe&&Xe.emit({originalEvent:X,type:"tapdragover",position:{x:ne[0],y:ne[1]}})),t.touchData.last=Xe,fe)for(var Lt=0;Lt<ne.length;Lt++)ne[Lt]&&t.touchData.startPosition[Lt]&&Ee&&(t.touchData.singleTouchMoved=!0);if(fe&&(Ir==null||Ir.pannable())&&ge.panningEnabled()&&ge.userPanningEnabled()){var Ue=a(Ir,t.touchData.starts);Ue&&(X.preventDefault(),t.data.bgActivePosistion||(t.data.bgActivePosistion=r1(t.touchData.startPosition)),t.swipePanning?(ge.panBy({x:Ae[0]*U,y:Ae[1]*U}),ge.emit("dragpan")):Ee&&(t.swipePanning=!0,ge.panBy({x:Me*U,y:We*U}),ge.emit("dragpan"),Ir&&(Ir.unactivate(),t.redrawHint("select",!0),t.touchData.start=null)));var Te=t.projectIntoViewport(X.touches[0].clientX,X.touches[0].clientY);ne[0]=Te[0],ne[1]=Te[1]}}for(var Pe=0;Pe<ne.length;Pe++)ye[Pe]=ne[Pe];fe&&X.touches.length>0&&!t.hoverData.draggingEles&&!t.swipePanning&&t.data.bgActivePosistion!=null&&(t.data.bgActivePosistion=void 0,t.redrawHint("select",!0),t.redraw())}},"touchmoveHandler"),!1);var Z;t.registerBinding(e,"touchcancel",Z=o(function(X){var fe=t.touchData.start;t.touchData.capture=!1,fe&&fe.unactivate()},"touchcancelHandler"));var ae,ue,ce,te;if(t.registerBinding(e,"touchend",ae=o(function(X){var fe=t.touchData.start,he=t.touchData.capture;if(he)X.touches.length===0&&(t.touchData.capture=!1),X.preventDefault();else return;var ge=t.selection;t.swipePanning=!1,t.hoverData.draggingEles=!1;var ne=t.cy,ye=ne.zoom(),U=t.touchData.now,Te=t.touchData.earlier;if(X.touches[0]){var se=t.projectIntoViewport(X.touches[0].clientX,X.touches[0].clientY);U[0]=se[0],U[1]=se[1]}if(X.touches[1]){var se=t.projectIntoViewport(X.touches[1].clientX,X.touches[1].clientY);U[2]=se[0],U[3]=se[1]}if(X.touches[2]){var se=t.projectIntoViewport(X.touches[2].clientX,X.touches[2].clientY);U[4]=se[0],U[5]=se[1]}fe&&fe.unactivate();var Ee;if(t.touchData.cxt){if(Ee={originalEvent:X,type:"cxttapend",position:{x:U[0],y:U[1]}},fe?fe.emit(Ee):ne.emit(Ee),!t.touchData.cxtDragged){var Ae={originalEvent:X,type:"cxttap",position:{x:U[0],y:U[1]}};fe?fe.emit(Ae):ne.emit(Ae)}t.touchData.start&&(t.touchData.start._private.grabbed=!1),t.touchData.cxt=!1,t.touchData.start=null,t.redraw();return}if(!X.touches[2]&&ne.boxSelectionEnabled()&&t.touchData.selecting){t.touchData.selecting=!1;var Pe=ne.collection(t.getAllInBox(ge[0],ge[1],ge[2],ge[3]));ge[0]=void 0,ge[1]=void 0,ge[2]=void 0,ge[3]=void 0,ge[4]=0,t.redrawHint("select",!0),ne.emit({type:"boxend",originalEvent:X,position:{x:U[0],y:U[1]}});var Me=o(function(ft){return ft.selectable()&&!ft.selected()},"eleWouldBeSelected");Pe.emit("box").stdFilter(Me).select().emit("boxselect"),Pe.nonempty()&&t.redrawHint("eles",!0),t.redraw()}if(fe?.unactivate(),X.touches[2])t.data.bgActivePosistion=void 0,t.redrawHint("select",!0);else if(!X.touches[1]){if(!X.touches[0]){if(!X.touches[0]){t.data.bgActivePosistion=void 0,t.redrawHint("select",!0);var me=t.dragData.touchDragEles;if(fe!=null){var We=fe._private.grabbed;v(me),t.redrawHint("drag",!0),t.redrawHint("eles",!0),We&&(fe.emit("freeon"),me.emit("free"),t.dragData.didDrag&&(fe.emit("dragfreeon"),me.emit("dragfree"))),n(fe,["touchend","tapend","vmouseup","tapdragout"],X,{x:U[0],y:U[1]}),fe.unactivate(),t.touchData.start=null}else{var Re=t.findNearestElement(U[0],U[1],!0,!0);n(Re,["touchend","tapend","vmouseup","tapdragout"],X,{x:U[0],y:U[1]})}var tt=t.touchData.startPosition[0]-U[0],gt=tt*tt,Et=t.touchData.startPosition[1]-U[1],vt=Et*Et,Ye=gt+vt,Tt=Ye*ye*ye;t.touchData.singleTouchMoved||(fe||ne.$(":selected").unselect(["tapunselect"]),n(fe,["tap","vclick"],X,{x:U[0],y:U[1]}),ue=!1,X.timeStamp-te<=ne.multiClickDebounceTime()?(ce&&clearTimeout(ce),ue=!0,te=null,n(fe,["dbltap","vdblclick"],X,{x:U[0],y:U[1]})):(ce=setTimeout(function(){ue||n(fe,["onetap","voneclick"],X,{x:U[0],y:U[1]})},ne.multiClickDebounceTime()),te=X.timeStamp)),fe!=null&&!t.dragData.didDrag&&fe._private.selectable&&Tt<t.touchTapThreshold2&&!t.pinching&&(ne.selectionType()==="single"?(ne.$(r).unmerge(fe).unselect(["tapunselect"]),fe.select(["tapselect"])):fe.selected()?fe.unselect(["tapunselect"]):fe.select(["tapselect"]),t.redrawHint("eles",!0)),t.touchData.singleTouchMoved=!0}}}for(var $e=0;$e<U.length;$e++)Te[$e]=U[$e];t.dragData.didDrag=!1,X.touches.length===0&&(t.touchData.dragDelta=[],t.touchData.startPosition=[null,null,null,null,null,null],t.touchData.startGPosition=null,t.touchData.didSelect=!1),X.touches.length<2&&(X.touches.length===1&&(t.touchData.startGPosition=[X.touches[0].clientX,X.touches[0].clientY]),t.pinching=!1,t.redrawHint("eles",!0),t.redraw())},"touchendHandler"),!1),typeof TouchEvent>"u"){var De=[],oe=o(function(X){return{clientX:X.clientX,clientY:X.clientY,force:1,identifier:X.pointerId,pageX:X.pageX,pageY:X.pageY,radiusX:X.width/2,radiusY:X.height/2,screenX:X.screenX,screenY:X.screenY,target:X.target}},"makeTouch"),ke=o(function(X){return{event:X,touch:oe(X)}},"makePointer"),Fe=o(function(X){De.push(ke(X))},"addPointer"),Be=o(function(X){for(var fe=0;fe<De.length;fe++){var he=De[fe];if(he.event.pointerId===X.pointerId){De.splice(fe,1);return}}},"removePointer"),Ve=o(function(X){var fe=De.filter(function(he){return he.event.pointerId===X.pointerId})[0];fe.event=X,fe.touch=oe(X)},"updatePointer"),Ge=o(function(X){X.touches=De.map(function(fe){return fe.touch})},"addTouchesToEvent"),He=o(function(X){return X.pointerType==="mouse"||X.pointerType===4},"pointerIsMouse");t.registerBinding(t.container,"pointerdown",function(xe){He(xe)||(xe.preventDefault(),Fe(xe),Ge(xe),H(xe))}),t.registerBinding(t.container,"pointerup",function(xe){He(xe)||(Be(xe),Ge(xe),ae(xe))}),t.registerBinding(t.container,"pointercancel",function(xe){He(xe)||(Be(xe),Ge(xe),Z(xe))}),t.registerBinding(t.container,"pointermove",function(xe){He(xe)||(xe.preventDefault(),Ve(xe),Ge(xe),q(xe))})}};Qu={};Qu.generatePolygon=function(t,e){return this.nodeShapes[t]={renderer:this,name:t,points:e,draw:o(function(n,i,a,s,l,u){this.renderer.nodeShapeImpl("polygon",n,i,a,s,l,this.points)},"draw"),intersectLine:o(function(n,i,a,s,l,u,h,f){return Yx(l,u,this.points,n,i,a/2,s/2,h)},"intersectLine"),checkPoint:o(function(n,i,a,s,l,u,h,f){return ju(n,i,this.points,u,h,s,l,[0,-1],a)},"checkPoint")}};Qu.generateEllipse=function(){return this.nodeShapes.ellipse={renderer:this,name:"ellipse",draw:o(function(e,r,n,i,a,s){this.renderer.nodeShapeImpl(this.name,e,r,n,i,a)},"draw"),intersectLine:o(function(e,r,n,i,a,s,l,u){return Hje(a,s,e,r,n/2+l,i/2+l)},"intersectLine"),checkPoint:o(function(e,r,n,i,a,s,l,u){return B0(e,r,i,a,s,l,n)},"checkPoint")}};Qu.generateRoundPolygon=function(t,e){return this.nodeShapes[t]={renderer:this,name:t,points:e,getOrCreateCorners:o(function(n,i,a,s,l,u,h){if(u[h]!==void 0&&u[h+"-cx"]===n&&u[h+"-cy"]===i)return u[h];u[h]=new Array(e.length/2),u[h+"-cx"]=n,u[h+"-cy"]=i;var f=a/2,d=s/2;l=l==="auto"?gge(a,s):l;for(var p=new Array(e.length/2),m=0;m<e.length/2;m++)p[m]={x:n+f*e[m*2],y:i+d*e[m*2+1]};var g,y,v,x,b=p.length;for(y=p[b-1],g=0;g<b;g++)v=p[g%b],x=p[(g+1)%b],u[h][g]=bB(y,v,x,l),y=v,v=x;return u[h]},"getOrCreateCorners"),draw:o(function(n,i,a,s,l,u,h){this.renderer.nodeShapeImpl("round-polygon",n,i,a,s,l,this.points,this.getOrCreateCorners(i,a,s,l,u,h,"drawCorners"))},"draw"),intersectLine:o(function(n,i,a,s,l,u,h,f,d){return Wje(l,u,this.points,n,i,a,s,h,this.getOrCreateCorners(n,i,a,s,f,d,"corners"))},"intersectLine"),checkPoint:o(function(n,i,a,s,l,u,h,f,d){return Uje(n,i,this.points,u,h,s,l,this.getOrCreateCorners(u,h,s,l,f,d,"corners"))},"checkPoint")}};Qu.generateRoundRectangle=function(){return this.nodeShapes["round-rectangle"]=this.nodeShapes.roundrectangle={renderer:this,name:"round-rectangle",points:ls(4,0),draw:o(function(e,r,n,i,a,s){this.renderer.nodeShapeImpl(this.name,e,r,n,i,a,this.points,s)},"draw"),intersectLine:o(function(e,r,n,i,a,s,l,u){return pge(a,s,e,r,n,i,l,u)},"intersectLine"),checkPoint:o(function(e,r,n,i,a,s,l,u){var h=i/2,f=a/2;u=u==="auto"?$0(i,a):u,u=Math.min(h,f,u);var d=u*2;return!!(ju(e,r,this.points,s,l,i,a-d,[0,-1],n)||ju(e,r,this.points,s,l,i-d,a,[0,-1],n)||B0(e,r,d,d,s-h+u,l-f+u,n)||B0(e,r,d,d,s+h-u,l-f+u,n)||B0(e,r,d,d,s+h-u,l+f-u,n)||B0(e,r,d,d,s-h+u,l+f-u,n))},"checkPoint")}};Qu.generateCutRectangle=function(){return this.nodeShapes["cut-rectangle"]=this.nodeShapes.cutrectangle={renderer:this,name:"cut-rectangle",cornerLength:lB(),points:ls(4,0),draw:o(function(e,r,n,i,a,s){this.renderer.nodeShapeImpl(this.name,e,r,n,i,a,null,s)},"draw"),generateCutTrianglePts:o(function(e,r,n,i,a){var s=a==="auto"?this.cornerLength:a,l=r/2,u=e/2,h=n-u,f=n+u,d=i-l,p=i+l;return{topLeft:[h,d+s,h+s,d,h+s,d+s],topRight:[f-s,d,f,d+s,f-s,d+s],bottomRight:[f,p-s,f-s,p,f-s,p-s],bottomLeft:[h+s,p,h,p-s,h+s,p-s]}},"generateCutTrianglePts"),intersectLine:o(function(e,r,n,i,a,s,l,u){var h=this.generateCutTrianglePts(n+2*l,i+2*l,e,r,u),f=[].concat.apply([],[h.topLeft.splice(0,4),h.topRight.splice(0,4),h.bottomRight.splice(0,4),h.bottomLeft.splice(0,4)]);return Yx(a,s,f,e,r)},"intersectLine"),checkPoint:o(function(e,r,n,i,a,s,l,u){var h=u==="auto"?this.cornerLength:u;if(ju(e,r,this.points,s,l,i,a-2*h,[0,-1],n)||ju(e,r,this.points,s,l,i-2*h,a,[0,-1],n))return!0;var f=this.generateCutTrianglePts(i,a,s,l);return Gs(e,r,f.topLeft)||Gs(e,r,f.topRight)||Gs(e,r,f.bottomRight)||Gs(e,r,f.bottomLeft)},"checkPoint")}};Qu.generateBarrel=function(){return this.nodeShapes.barrel={renderer:this,name:"barrel",points:ls(4,0),draw:o(function(e,r,n,i,a,s){this.renderer.nodeShapeImpl(this.name,e,r,n,i,a)},"draw"),intersectLine:o(function(e,r,n,i,a,s,l,u){var h=.15,f=.5,d=.85,p=this.generateBarrelBezierPts(n+2*l,i+2*l,e,r),m=o(function(v){var x=i1({x:v[0],y:v[1]},{x:v[2],y:v[3]},{x:v[4],y:v[5]},h),b=i1({x:v[0],y:v[1]},{x:v[2],y:v[3]},{x:v[4],y:v[5]},f),w=i1({x:v[0],y:v[1]},{x:v[2],y:v[3]},{x:v[4],y:v[5]},d);return[v[0],v[1],x.x,x.y,b.x,b.y,w.x,w.y,v[4],v[5]]},"approximateBarrelCurvePts"),g=[].concat(m(p.topLeft),m(p.topRight),m(p.bottomRight),m(p.bottomLeft));return Yx(a,s,g,e,r)},"intersectLine"),generateBarrelBezierPts:o(function(e,r,n,i){var a=r/2,s=e/2,l=n-s,u=n+s,h=i-a,f=i+a,d=FP(e,r),p=d.heightOffset,m=d.widthOffset,g=d.ctrlPtOffsetPct*e,y={topLeft:[l,h+p,l+g,h,l+m,h],topRight:[u-m,h,u-g,h,u,h+p],bottomRight:[u,f-p,u-g,f,u-m,f],bottomLeft:[l+m,f,l+g,f,l,f-p]};return y.topLeft.isTop=!0,y.topRight.isTop=!0,y.bottomLeft.isBottom=!0,y.bottomRight.isBottom=!0,y},"generateBarrelBezierPts"),checkPoint:o(function(e,r,n,i,a,s,l,u){var h=FP(i,a),f=h.heightOffset,d=h.widthOffset;if(ju(e,r,this.points,s,l,i,a-2*f,[0,-1],n)||ju(e,r,this.points,s,l,i-2*d,a,[0,-1],n))return!0;for(var p=this.generateBarrelBezierPts(i,a,s,l),m=o(function(C,A,I){var D=I[4],k=I[2],R=I[0],S=I[5],O=I[1],N=Math.min(D,R),P=Math.max(D,R),F=Math.min(S,O),B=Math.max(S,O);if(N<=C&&C<=P&&F<=A&&A<=B){var $=Yje(D,k,R),z=zje($[0],$[1],$[2],C),W=z.filter(function(j){return 0<=j&&j<=1});if(W.length>0)return W[0]}return null},"getCurveT"),g=Object.keys(p),y=0;y<g.length;y++){var v=g[y],x=p[v],b=m(e,r,x);if(b!=null){var w=x[5],_=x[3],T=x[1],E=ia(w,_,T,b);if(x.isTop&&E<=r||x.isBottom&&r<=E)return!0}}return!1},"checkPoint")}};Qu.generateBottomRoundrectangle=function(){return this.nodeShapes["bottom-round-rectangle"]=this.nodeShapes.bottomroundrectangle={renderer:this,name:"bottom-round-rectangle",points:ls(4,0),draw:o(function(e,r,n,i,a,s){this.renderer.nodeShapeImpl(this.name,e,r,n,i,a,this.points,s)},"draw"),intersectLine:o(function(e,r,n,i,a,s,l,u){var h=e-(n/2+l),f=r-(i/2+l),d=f,p=e+(n/2+l),m=Tf(a,s,e,r,h,f,p,d,!1);return m.length>0?m:pge(a,s,e,r,n,i,l,u)},"intersectLine"),checkPoint:o(function(e,r,n,i,a,s,l,u){u=u==="auto"?$0(i,a):u;var h=2*u;if(ju(e,r,this.points,s,l,i,a-h,[0,-1],n)||ju(e,r,this.points,s,l,i-h,a,[0,-1],n))return!0;var f=i/2+2*n,d=a/2+2*n,p=[s-f,l-d,s-f,l,s+f,l,s+f,l-d];return!!(Gs(e,r,p)||B0(e,r,h,h,s+i/2-u,l+a/2-u,n)||B0(e,r,h,h,s-i/2+u,l+a/2-u,n))},"checkPoint")}};Qu.registerNodeShapes=function(){var t=this.nodeShapes={},e=this;this.generateEllipse(),this.generatePolygon("triangle",ls(3,0)),this.generateRoundPolygon("round-triangle",ls(3,0)),this.generatePolygon("rectangle",ls(4,0)),t.square=t.rectangle,this.generateRoundRectangle(),this.generateCutRectangle(),this.generateBarrel(),this.generateBottomRoundrectangle();{var r=[0,1,1,0,0,-1,-1,0];this.generatePolygon("diamond",r),this.generateRoundPolygon("round-diamond",r)}this.generatePolygon("pentagon",ls(5,0)),this.generateRoundPolygon("round-pentagon",ls(5,0)),this.generatePolygon("hexagon",ls(6,0)),this.generateRoundPolygon("round-hexagon",ls(6,0)),this.generatePolygon("heptagon",ls(7,0)),this.generateRoundPolygon("round-heptagon",ls(7,0)),this.generatePolygon("octagon",ls(8,0)),this.generateRoundPolygon("round-octagon",ls(8,0));var n=new Array(20);{var i=BP(5,0),a=BP(5,Math.PI/5),s=.5*(3-Math.sqrt(5));s*=1.57;for(var l=0;l<a.length/2;l++)a[l*2]*=s,a[l*2+1]*=s;for(var l=0;l<20/4;l++)n[l*4]=i[l*2],n[l*4+1]=i[l*2+1],n[l*4+2]=a[l*2],n[l*4+3]=a[l*2+1]}n=mge(n),this.generatePolygon("star",n),this.generatePolygon("vee",[-1,-1,0,-.333,1,-1,0,1]),this.generatePolygon("rhomboid",[-1,-1,.333,-1,1,1,-.333,1]),this.generatePolygon("right-rhomboid",[-.333,-1,1,-1,.333,1,-1,1]),this.nodeShapes.concavehexagon=this.generatePolygon("concave-hexagon",[-1,-.95,-.75,0,-1,.95,1,.95,.75,0,1,-.95]);{var u=[-1,-1,.25,-1,1,0,.25,1,-1,1];this.generatePolygon("tag",u),this.generateRoundPolygon("round-tag",u)}t.makePolygon=function(h){var f=h.join("$"),d="polygon-"+f,p;return(p=this[d])?p:e.generatePolygon(d,h)}};ab={};ab.timeToRender=function(){return this.redrawTotalTime/this.redrawCount};ab.redraw=function(t){t=t||cge();var e=this;e.averageRedrawTime===void 0&&(e.averageRedrawTime=0),e.lastRedrawTime===void 0&&(e.lastRedrawTime=0),e.lastDrawTime===void 0&&(e.lastDrawTime=0),e.requestedFrame=!0,e.renderOptions=t};ab.beforeRender=function(t,e){if(!this.destroyed){e==null&&hi("Priority is not optional for beforeRender");var r=this.beforeRenderCallbacks;r.push({fn:t,priority:e}),r.sort(function(n,i){return i.priority-n.priority})}};Ome=o(function(e,r,n){for(var i=e.beforeRenderCallbacks,a=0;a<i.length;a++)i[a].fn(r,n)},"beforeRenderCallbacks");ab.startRenderLoop=function(){var t=this,e=t.cy;if(!t.renderLoopStarted){t.renderLoopStarted=!0;var r=o(function n(i){if(!t.destroyed){if(!e.batching())if(t.requestedFrame&&!t.skipFrame){Ome(t,!0,i);var a=Xu();t.render(t.renderOptions);var s=t.lastDrawTime=Xu();t.averageRedrawTime===void 0&&(t.averageRedrawTime=s-a),t.redrawCount===void 0&&(t.redrawCount=0),t.redrawCount++,t.redrawTotalTime===void 0&&(t.redrawTotalTime=0);var l=s-a;t.redrawTotalTime+=l,t.lastRedrawTime=l,t.averageRedrawTime=t.averageRedrawTime/2+l/2,t.requestedFrame=!1}else Ome(t,!1,i);t.skipFrame=!1,m6(n)}},"renderFn");m6(r)}};Let=o(function(e){this.init(e)},"BaseRenderer"),p1e=Let,b1=p1e.prototype;b1.clientFunctions=["redrawHint","render","renderTo","matchCanvasSize","nodeShapeImpl","arrowShapeImpl"];b1.init=function(t){var e=this;e.options=t,e.cy=t.cy;var r=e.container=t.cy.container(),n=e.cy.window();if(n){var i=n.document,a=i.head,s="__________cytoscape_stylesheet",l="__________cytoscape_container",u=i.getElementById(s)!=null;if(r.className.indexOf(l)<0&&(r.className=(r.className||"")+" "+l),!u){var h=i.createElement("style");h.id=s,h.textContent="."+l+" { position: relative; }",a.insertBefore(h,a.children[0])}var f=n.getComputedStyle(r),d=f.getPropertyValue("position");d==="static"&&on("A Cytoscape container has style position:static and so can not use UI extensions properly")}e.selection=[void 0,void 0,void 0,void 0,0],e.bezierProjPcts=[.05,.225,.4,.5,.6,.775,.95],e.hoverData={down:null,last:null,downTime:null,triggerMode:null,dragging:!1,initialPan:[null,null],capture:!1},e.dragData={possibleDragElements:[]},e.touchData={start:null,capture:!1,startPosition:[null,null,null,null,null,null],singleTouchStartTime:null,singleTouchMoved:!0,now:[null,null,null,null,null,null],earlier:[null,null,null,null,null,null]},e.redraws=0,e.showFps=t.showFps,e.debug=t.debug,e.hideEdgesOnViewport=t.hideEdgesOnViewport,e.textureOnViewport=t.textureOnViewport,e.wheelSensitivity=t.wheelSensitivity,e.motionBlurEnabled=t.motionBlur,e.forcedPixelRatio=xt(t.pixelRatio)?t.pixelRatio:null,e.motionBlur=t.motionBlur,e.motionBlurOpacity=t.motionBlurOpacity,e.motionBlurTransparency=1-e.motionBlurOpacity,e.motionBlurPxRatio=1,e.mbPxRBlurry=1,e.minMbLowQualFrames=4,e.fullQualityMb=!1,e.clearedForMotionBlur=[],e.desktopTapThreshold=t.desktopTapThreshold,e.desktopTapThreshold2=t.desktopTapThreshold*t.desktopTapThreshold,e.touchTapThreshold=t.touchTapThreshold,e.touchTapThreshold2=t.touchTapThreshold*t.touchTapThreshold,e.tapholdDuration=500,e.bindings=[],e.beforeRenderCallbacks=[],e.beforeRenderPriorities={animations:400,eleCalcs:300,eleTxrDeq:200,lyrTxrDeq:150,lyrTxrSkip:100},e.registerNodeShapes(),e.registerArrowShapes(),e.registerCalculationListeners()};b1.notify=function(t,e){var r=this,n=r.cy;if(!this.destroyed){if(t==="init"){r.load();return}if(t==="destroy"){r.destroy();return}(t==="add"||t==="remove"||t==="move"&&n.hasCompoundNodes()||t==="load"||t==="zorder"||t==="mount")&&r.invalidateCachedZSortedEles(),t==="viewport"&&r.redrawHint("select",!0),(t==="load"||t==="resize"||t==="mount")&&(r.invalidateContainerClientCoordsCache(),r.matchCanvasSize(r.container)),r.redrawHint("eles",!0),r.redrawHint("drag",!0),this.startRenderLoop(),this.redraw()}};b1.destroy=function(){var t=this;t.destroyed=!0,t.cy.stopAnimationLoop();for(var e=0;e<t.bindings.length;e++){var r=t.bindings[e],n=r,i=n.target;(i.off||i.removeEventListener).apply(i,n.args)}if(t.bindings=[],t.beforeRenderCallbacks=[],t.onUpdateEleCalcsFns=[],t.removeObserver&&t.removeObserver.disconnect(),t.styleObserver&&t.styleObserver.disconnect(),t.resizeObserver&&t.resizeObserver.disconnect(),t.labelCalcDiv)try{document.body.removeChild(t.labelCalcDiv)}catch{}};b1.isHeadless=function(){return!1};[xB,f1e,d1e,x1,Qu,ab].forEach(function(t){ir(b1,t)});IP=1e3/60,m1e={setupDequeueing:o(function(e){return o(function(){var n=this,i=this.renderer;if(!n.dequeueingSetup){n.dequeueingSetup=!0;var a=A6(function(){i.redrawHint("eles",!0),i.redrawHint("drag",!0),i.redraw()},e.deqRedrawThreshold),s=o(function(h,f){var d=Xu(),p=i.averageRedrawTime,m=i.lastRedrawTime,g=[],y=i.cy.extent(),v=i.getPixelRatio();for(h||i.flushRenderedStyleQueue();;){var x=Xu(),b=x-d,w=x-f;if(m<IP){var _=IP-(h?p:0);if(w>=e.deqFastCost*_)break}else if(h){if(b>=e.deqCost*m||b>=e.deqAvgCost*p)break}else if(w>=e.deqNoDrawCost*IP)break;var T=e.deq(n,v,y);if(T.length>0)for(var E=0;E<T.length;E++)g.push(T[E]);else break}g.length>0&&(e.onDeqd(n,g),!h&&e.shouldRedraw(n,g,v,y)&&a())},"dequeue"),l=e.priority||iB;i.beforeRender(s,l(n))}},"setupDequeueingImpl")},"setupDequeueing")},Det=function(){function t(e){var r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:g6;JP(this,t),this.idsByKey=new Uc,this.keyForId=new Uc,this.cachesByLvl=new Uc,this.lvls=[],this.getKey=e,this.doesEleInvalidateKey=r}return o(t,"ElementTextureCacheLookup"),eB(t,[{key:"getIdsFor",value:o(function(r){r==null&&hi("Can not get id list for null key");var n=this.idsByKey,i=this.idsByKey.get(r);return i||(i=new f1,n.set(r,i)),i},"getIdsFor")},{key:"addIdForKey",value:o(function(r,n){r!=null&&this.getIdsFor(r).add(n)},"addIdForKey")},{key:"deleteIdForKey",value:o(function(r,n){r!=null&&this.getIdsFor(r).delete(n)},"deleteIdForKey")},{key:"getNumberOfIdsForKey",value:o(function(r){return r==null?0:this.getIdsFor(r).size},"getNumberOfIdsForKey")},{key:"updateKeyMappingFor",value:o(function(r){var n=r.id(),i=this.keyForId.get(n),a=this.getKey(r);this.deleteIdForKey(i,n),this.addIdForKey(a,n),this.keyForId.set(n,a)},"updateKeyMappingFor")},{key:"deleteKeyMappingFor",value:o(function(r){var n=r.id(),i=this.keyForId.get(n);this.deleteIdForKey(i,n),this.keyForId.delete(n)},"deleteKeyMappingFor")},{key:"keyHasChangedFor",value:o(function(r){var n=r.id(),i=this.keyForId.get(n),a=this.getKey(r);return i!==a},"keyHasChangedFor")},{key:"isInvalid",value:o(function(r){return this.keyHasChangedFor(r)||this.doesEleInvalidateKey(r)},"isInvalid")},{key:"getCachesAt",value:o(function(r){var n=this.cachesByLvl,i=this.lvls,a=n.get(r);return a||(a=new Uc,n.set(r,a),i.push(r)),a},"getCachesAt")},{key:"getCache",value:o(function(r,n){return this.getCachesAt(n).get(r)},"getCache")},{key:"get",value:o(function(r,n){var i=this.getKey(r),a=this.getCache(i,n);return a!=null&&this.updateKeyMappingFor(r),a},"get")},{key:"getForCachedKey",value:o(function(r,n){var i=this.keyForId.get(r.id()),a=this.getCache(i,n);return a},"getForCachedKey")},{key:"hasCache",value:o(function(r,n){return this.getCachesAt(n).has(r)},"hasCache")},{key:"has",value:o(function(r,n){var i=this.getKey(r);return this.hasCache(i,n)},"has")},{key:"setCache",value:o(function(r,n,i){i.key=r,this.getCachesAt(n).set(r,i)},"setCache")},{key:"set",value:o(function(r,n,i){var a=this.getKey(r);this.setCache(a,n,i),this.updateKeyMappingFor(r)},"set")},{key:"deleteCache",value:o(function(r,n){this.getCachesAt(n).delete(r)},"deleteCache")},{key:"delete",value:o(function(r,n){var i=this.getKey(r);this.deleteCache(i,n)},"_delete")},{key:"invalidateKey",value:o(function(r){var n=this;this.lvls.forEach(function(i){return n.deleteCache(r,i)})},"invalidateKey")},{key:"invalidate",value:o(function(r){var n=r.id(),i=this.keyForId.get(n);this.deleteKeyMappingFor(r);var a=this.doesEleInvalidateKey(r);return a&&this.invalidateKey(i),a||this.getNumberOfIdsForKey(i)===0},"invalidate")}]),t}(),Pme=25,i6=50,d6=-4,jP=3,Net=7.99,Ret=8,Met=1024,Iet=1024,Oet=1024,Pet=.2,Bet=.8,Fet=10,zet=.15,Get=.1,$et=.9,Vet=.9,Uet=100,Het=1,n1={dequeue:"dequeue",downscale:"downscale",highQuality:"highQuality"},Wet=wa({getKey:null,doesEleInvalidateKey:g6,drawElement:null,getBoundingBox:null,getRotationPoint:null,getRotationOffset:null,isVisible:sge,allowEdgeTxrCaching:!0,allowParentTxrCaching:!0}),Fx=o(function(e,r){var n=this;n.renderer=e,n.onDequeues=[];var i=Wet(r);ir(n,i),n.lookup=new Det(i.getKey,i.doesEleInvalidateKey),n.setupDequeueing()},"ElementTextureCache"),qi=Fx.prototype;qi.reasons=n1;qi.getTextureQueue=function(t){var e=this;return e.eleImgCaches=e.eleImgCaches||{},e.eleImgCaches[t]=e.eleImgCaches[t]||[]};qi.getRetiredTextureQueue=function(t){var e=this,r=e.eleImgCaches.retired=e.eleImgCaches.retired||{},n=r[t]=r[t]||[];return n};qi.getElementQueue=function(){var t=this,e=t.eleCacheQueue=t.eleCacheQueue||new tb(function(r,n){return n.reqs-r.reqs});return e};qi.getElementKeyToQueue=function(){var t=this,e=t.eleKeyToCacheQueue=t.eleKeyToCacheQueue||{};return e};qi.getElement=function(t,e,r,n,i){var a=this,s=this.renderer,l=s.cy.zoom(),u=this.lookup;if(!e||e.w===0||e.h===0||isNaN(e.w)||isNaN(e.h)||!t.visible()||t.removed()||!a.allowEdgeTxrCaching&&t.isEdge()||!a.allowParentTxrCaching&&t.isParent())return null;if(n==null&&(n=Math.ceil(sB(l*r))),n<d6)n=d6;else if(l>=Net||n>jP)return null;var h=Math.pow(2,n),f=e.h*h,d=e.w*h,p=s.eleTextBiggerThanMin(t,h);if(!this.isVisible(t,p))return null;var m=u.get(t,n);if(m&&m.invalidated&&(m.invalidated=!1,m.texture.invalidatedWidth-=m.width),m)return m;var g;if(f<=Pme?g=Pme:f<=i6?g=i6:g=Math.ceil(f/i6)*i6,f>Oet||d>Iet)return null;var y=a.getTextureQueue(g),v=y[y.length-2],x=o(function(){return a.recycleTexture(g,d)||a.addTexture(g,d)},"addNewTxr");v||(v=y[y.length-1]),v||(v=x()),v.width-v.usedWidth<d&&(v=x());for(var b=o(function(N){return N&&N.scaledLabelShown===p},"scalableFrom"),w=i&&i===n1.dequeue,_=i&&i===n1.highQuality,T=i&&i===n1.downscale,E,L=n+1;L<=jP;L++){var C=u.get(t,L);if(C){E=C;break}}var A=E&&E.level===n+1?E:null,I=o(function(){v.context.drawImage(A.texture.canvas,A.x,0,A.width,A.height,v.usedWidth,0,d,f)},"downscale");if(v.context.setTransform(1,0,0,1,0,0),v.context.clearRect(v.usedWidth,0,d,g),b(A))I();else if(b(E))if(_){for(var D=E.level;D>n;D--)A=a.getElement(t,e,r,D,n1.downscale);I()}else return a.queueElement(t,E.level-1),E;else{var k;if(!w&&!_&&!T)for(var R=n-1;R>=d6;R--){var S=u.get(t,R);if(S){k=S;break}}if(b(k))return a.queueElement(t,n),k;v.context.translate(v.usedWidth,0),v.context.scale(h,h),this.drawElement(v.context,t,e,p,!1),v.context.scale(1/h,1/h),v.context.translate(-v.usedWidth,0)}return m={x:v.usedWidth,texture:v,level:n,scale:h,width:d,height:f,scaledLabelShown:p},v.usedWidth+=Math.ceil(d+Ret),v.eleCaches.push(m),u.set(t,n,m),a.checkTextureFullness(v),m};qi.invalidateElements=function(t){for(var e=0;e<t.length;e++)this.invalidateElement(t[e])};qi.invalidateElement=function(t){var e=this,r=e.lookup,n=[],i=r.isInvalid(t);if(i){for(var a=d6;a<=jP;a++){var s=r.getForCachedKey(t,a);s&&n.push(s)}var l=r.invalidate(t);if(l)for(var u=0;u<n.length;u++){var h=n[u],f=h.texture;f.invalidatedWidth+=h.width,h.invalidated=!0,e.checkTextureUtility(f)}e.removeFromQueue(t)}};qi.checkTextureUtility=function(t){t.invalidatedWidth>=Pet*t.width&&this.retireTexture(t)};qi.checkTextureFullness=function(t){var e=this,r=e.getTextureQueue(t.height);t.usedWidth/t.width>Bet&&t.fullnessChecks>=Fet?Cf(r,t):t.fullnessChecks++};qi.retireTexture=function(t){var e=this,r=t.height,n=e.getTextureQueue(r),i=this.lookup;Cf(n,t),t.retired=!0;for(var a=t.eleCaches,s=0;s<a.length;s++){var l=a[s];i.deleteCache(l.key,l.level)}aB(a);var u=e.getRetiredTextureQueue(r);u.push(t)};qi.addTexture=function(t,e){var r=this,n=r.getTextureQueue(t),i={};return n.push(i),i.eleCaches=[],i.height=t,i.width=Math.max(Met,e),i.usedWidth=0,i.invalidatedWidth=0,i.fullnessChecks=0,i.canvas=r.renderer.makeOffscreenCanvas(i.width,i.height),i.context=i.canvas.getContext("2d"),i};qi.recycleTexture=function(t,e){for(var r=this,n=r.getTextureQueue(t),i=r.getRetiredTextureQueue(t),a=0;a<i.length;a++){var s=i[a];if(s.width>=e)return s.retired=!1,s.usedWidth=0,s.invalidatedWidth=0,s.fullnessChecks=0,aB(s.eleCaches),s.context.setTransform(1,0,0,1,0,0),s.context.clearRect(0,0,s.width,s.height),Cf(i,s),n.push(s),s}};qi.queueElement=function(t,e){var r=this,n=r.getElementQueue(),i=r.getElementKeyToQueue(),a=this.getKey(t),s=i[a];if(s)s.level=Math.max(s.level,e),s.eles.merge(t),s.reqs++,n.updateItem(s);else{var l={eles:t.spawn().merge(t),level:e,reqs:1,key:a};n.push(l),i[a]=l}};qi.dequeue=function(t){for(var e=this,r=e.getElementQueue(),n=e.getElementKeyToQueue(),i=[],a=e.lookup,s=0;s<Het&&r.size()>0;s++){var l=r.pop(),u=l.key,h=l.eles[0],f=a.hasCache(h,l.level);if(n[u]=null,f)continue;i.push(l);var d=e.getBoundingBox(h);e.getElement(h,d,t,l.level,n1.dequeue)}return i};qi.removeFromQueue=function(t){var e=this,r=e.getElementQueue(),n=e.getElementKeyToQueue(),i=this.getKey(t),a=n[i];a!=null&&(a.eles.length===1?(a.reqs=nB,r.updateItem(a),r.pop(),n[i]=null):a.eles.unmerge(t))};qi.onDequeue=function(t){this.onDequeues.push(t)};qi.offDequeue=function(t){Cf(this.onDequeues,t)};qi.setupDequeueing=m1e.setupDequeueing({deqRedrawThreshold:Uet,deqCost:zet,deqAvgCost:Get,deqNoDrawCost:$et,deqFastCost:Vet,deq:o(function(e,r,n){return e.dequeue(r,n)},"deq"),onDeqd:o(function(e,r){for(var n=0;n<e.onDequeues.length;n++){var i=e.onDequeues[n];i(r)}},"onDeqd"),shouldRedraw:o(function(e,r,n,i){for(var a=0;a<r.length;a++)for(var s=r[a].eles,l=0;l<s.length;l++){var u=s[l].boundingBox();if(oB(u,i))return!0}return!1},"shouldRedraw"),priority:o(function(e){return e.renderer.beforeRenderPriorities.eleTxrDeq},"priority")});Yet=1,Gx=-4,E6=2,qet=3.99,Xet=50,jet=50,Ket=.15,Qet=.1,Zet=.9,Jet=.9,ett=1,Bme=250,ttt=4e3*4e3,rtt=!0,g1e=o(function(e){var r=this,n=r.renderer=e,i=n.cy;r.layersByLevel={},r.firstGet=!0,r.lastInvalidationTime=Xu()-2*Bme,r.skipping=!1,r.eleTxrDeqs=i.collection(),r.scheduleElementRefinement=A6(function(){r.refineElementTextures(r.eleTxrDeqs),r.eleTxrDeqs.unmerge(r.eleTxrDeqs)},jet),n.beforeRender(function(s,l){l-r.lastInvalidationTime<=Bme?r.skipping=!0:r.skipping=!1},n.beforeRenderPriorities.lyrTxrSkip);var a=o(function(l,u){return u.reqs-l.reqs},"qSort");r.layersQueue=new tb(a),r.setupDequeueing()},"LayeredTextureCache"),Ta=g1e.prototype,Fme=0,ntt=Math.pow(2,53)-1;Ta.makeLayer=function(t,e){var r=Math.pow(2,e),n=Math.ceil(t.w*r),i=Math.ceil(t.h*r),a=this.renderer.makeOffscreenCanvas(n,i),s={id:Fme=++Fme%ntt,bb:t,level:e,width:n,height:i,canvas:a,context:a.getContext("2d"),eles:[],elesQueue:[],reqs:0},l=s.context,u=-s.bb.x1,h=-s.bb.y1;return l.scale(r,r),l.translate(u,h),s};Ta.getLayers=function(t,e,r){var n=this,i=n.renderer,a=i.cy,s=a.zoom(),l=n.firstGet;if(n.firstGet=!1,r==null){if(r=Math.ceil(sB(s*e)),r<Gx)r=Gx;else if(s>=qet||r>E6)return null}n.validateLayersElesOrdering(r,t);var u=n.layersByLevel,h=Math.pow(2,r),f=u[r]=u[r]||[],d,p=n.levelIsComplete(r,t),m,g=o(function(){var I=o(function(O){if(n.validateLayersElesOrdering(O,t),n.levelIsComplete(O,t))return m=u[O],!0},"canUseAsTmpLvl"),D=o(function(O){if(!m)for(var N=r+O;Gx<=N&&N<=E6&&!I(N);N+=O);},"checkLvls");D(1),D(-1);for(var k=f.length-1;k>=0;k--){var R=f[k];R.invalid&&Cf(f,R)}},"checkTempLevels");if(!p)g();else return f;var y=o(function(){if(!d){d=$s();for(var I=0;I<t.length;I++)fge(d,t[I].boundingBox())}return d},"getBb"),v=o(function(I){I=I||{};var D=I.after;y();var k=d.w*h*(d.h*h);if(k>ttt)return null;var R=n.makeLayer(d,r);if(D!=null){var S=f.indexOf(D)+1;f.splice(S,0,R)}else(I.insert===void 0||I.insert)&&f.unshift(R);return R},"makeLayer");if(n.skipping&&!l)return null;for(var x=null,b=t.length/Yet,w=!l,_=0;_<t.length;_++){var T=t[_],E=T._private.rscratch,L=E.imgLayerCaches=E.imgLayerCaches||{},C=L[r];if(C){x=C;continue}if((!x||x.eles.length>=b||!dge(x.bb,T.boundingBox()))&&(x=v({insert:!0,after:x}),!x))return null;m||w?n.queueLayer(x,T):n.drawEleInLayer(x,T,r,e),x.eles.push(T),L[r]=x}return m||(w?null:f)};Ta.getEleLevelForLayerLevel=function(t,e){return t};Ta.drawEleInLayer=function(t,e,r,n){var i=this,a=this.renderer,s=t.context,l=e.boundingBox();l.w===0||l.h===0||!e.visible()||(r=i.getEleLevelForLayerLevel(r,n),a.setImgSmoothing(s,!1),a.drawCachedElement(s,e,null,null,r,rtt),a.setImgSmoothing(s,!0))};Ta.levelIsComplete=function(t,e){var r=this,n=r.layersByLevel[t];if(!n||n.length===0)return!1;for(var i=0,a=0;a<n.length;a++){var s=n[a];if(s.reqs>0||s.invalid)return!1;i+=s.eles.length}return i===e.length};Ta.validateLayersElesOrdering=function(t,e){var r=this.layersByLevel[t];if(r)for(var n=0;n<r.length;n++){for(var i=r[n],a=-1,s=0;s<e.length;s++)if(i.eles[0]===e[s]){a=s;break}if(a<0){this.invalidateLayer(i);continue}for(var l=a,s=0;s<i.eles.length;s++)if(i.eles[s]!==e[l+s]){this.invalidateLayer(i);break}}};Ta.updateElementsInLayers=function(t,e){for(var r=this,n=Jx(t[0]),i=0;i<t.length;i++)for(var a=n?null:t[i],s=n?t[i]:t[i].ele,l=s._private.rscratch,u=l.imgLayerCaches=l.imgLayerCaches||{},h=Gx;h<=E6;h++){var f=u[h];f&&(a&&r.getEleLevelForLayerLevel(f.level)!==a.level||e(f,s,a))}};Ta.haveLayers=function(){for(var t=this,e=!1,r=Gx;r<=E6;r++){var n=t.layersByLevel[r];if(n&&n.length>0){e=!0;break}}return e};Ta.invalidateElements=function(t){var e=this;t.length!==0&&(e.lastInvalidationTime=Xu(),!(t.length===0||!e.haveLayers())&&e.updateElementsInLayers(t,o(function(n,i,a){e.invalidateLayer(n)},"invalAssocLayers")))};Ta.invalidateLayer=function(t){if(this.lastInvalidationTime=Xu(),!t.invalid){var e=t.level,r=t.eles,n=this.layersByLevel[e];Cf(n,t),t.elesQueue=[],t.invalid=!0,t.replacement&&(t.replacement.invalid=!0);for(var i=0;i<r.length;i++){var a=r[i]._private.rscratch.imgLayerCaches;a&&(a[e]=null)}}};Ta.refineElementTextures=function(t){var e=this;e.updateElementsInLayers(t,o(function(n,i,a){var s=n.replacement;if(s||(s=n.replacement=e.makeLayer(n.bb,n.level),s.replaces=n,s.eles=n.eles),!s.reqs)for(var l=0;l<s.eles.length;l++)e.queueLayer(s,s.eles[l])},"refineEachEle"))};Ta.enqueueElementRefinement=function(t){this.eleTxrDeqs.merge(t),this.scheduleElementRefinement()};Ta.queueLayer=function(t,e){var r=this,n=r.layersQueue,i=t.elesQueue,a=i.hasId=i.hasId||{};if(!t.replacement){if(e){if(a[e.id()])return;i.push(e),a[e.id()]=!0}t.reqs?(t.reqs++,n.updateItem(t)):(t.reqs=1,n.push(t))}};Ta.dequeue=function(t){for(var e=this,r=e.layersQueue,n=[],i=0;i<ett&&r.size()!==0;){var a=r.peek();if(a.replacement){r.pop();continue}if(a.replaces&&a!==a.replaces.replacement){r.pop();continue}if(a.invalid){r.pop();continue}var s=a.elesQueue.shift();s&&(e.drawEleInLayer(a,s,a.level,t),i++),n.length===0&&n.push(!0),a.elesQueue.length===0&&(r.pop(),a.reqs=0,a.replaces&&e.applyLayerReplacement(a),e.requestRedraw())}return n};Ta.applyLayerReplacement=function(t){var e=this,r=e.layersByLevel[t.level],n=t.replaces,i=r.indexOf(n);if(!(i<0||n.invalid)){r[i]=t;for(var a=0;a<t.eles.length;a++){var s=t.eles[a]._private,l=s.imgLayerCaches=s.imgLayerCaches||{};l&&(l[t.level]=t)}e.requestRedraw()}};Ta.requestRedraw=A6(function(){var t=this.renderer;t.redrawHint("eles",!0),t.redrawHint("drag",!0),t.redraw()},100);Ta.setupDequeueing=m1e.setupDequeueing({deqRedrawThreshold:Xet,deqCost:Ket,deqAvgCost:Qet,deqNoDrawCost:Zet,deqFastCost:Jet,deq:o(function(e,r){return e.dequeue(r)},"deq"),onDeqd:iB,shouldRedraw:sge,priority:o(function(e){return e.renderer.beforeRenderPriorities.lyrTxrDeq},"priority")});y1e={};o(itt,"polygon");o(att,"triangleBackcurve");o(Gme,"triangleTee");o(stt,"circleTriangle");o(ott,"circle");y1e.arrowShapeImpl=function(t){return(zme||(zme={polygon:itt,"triangle-backcurve":att,"triangle-tee":Gme,"circle-triangle":stt,"triangle-cross":Gme,circle:ott}))[t]};Yc={};Yc.drawElement=function(t,e,r,n,i,a){var s=this;e.isNode()?s.drawNode(t,e,r,n,i,a):s.drawEdge(t,e,r,n,i,a)};Yc.drawElementOverlay=function(t,e){var r=this;e.isNode()?r.drawNodeOverlay(t,e):r.drawEdgeOverlay(t,e)};Yc.drawElementUnderlay=function(t,e){var r=this;e.isNode()?r.drawNodeUnderlay(t,e):r.drawEdgeUnderlay(t,e)};Yc.drawCachedElementPortion=function(t,e,r,n,i,a,s,l){var u=this,h=r.getBoundingBox(e);if(!(h.w===0||h.h===0)){var f=r.getElement(e,h,n,i,a);if(f!=null){var d=l(u,e);if(d===0)return;var p=s(u,e),m=h.x1,g=h.y1,y=h.w,v=h.h,x,b,w,_,T;if(p!==0){var E=r.getRotationPoint(e);w=E.x,_=E.y,t.translate(w,_),t.rotate(p),T=u.getImgSmoothing(t),T||u.setImgSmoothing(t,!0);var L=r.getRotationOffset(e);x=L.x,b=L.y}else x=m,b=g;var C;d!==1&&(C=t.globalAlpha,t.globalAlpha=C*d),t.drawImage(f.texture.canvas,f.x,0,f.width,f.height,x,b,y,v),d!==1&&(t.globalAlpha=C),p!==0&&(t.rotate(-p),t.translate(-w,-_),T||u.setImgSmoothing(t,!1))}else r.drawElement(t,e)}};ltt=o(function(){return 0},"getZeroRotation"),ctt=o(function(e,r){return e.getTextAngle(r,null)},"getLabelRotation"),utt=o(function(e,r){return e.getTextAngle(r,"source")},"getSourceLabelRotation"),htt=o(function(e,r){return e.getTextAngle(r,"target")},"getTargetLabelRotation"),ftt=o(function(e,r){return r.effectiveOpacity()},"getOpacity"),OP=o(function(e,r){return r.pstyle("text-opacity").pfValue*r.effectiveOpacity()},"getTextOpacity");Yc.drawCachedElement=function(t,e,r,n,i,a){var s=this,l=s.data,u=l.eleTxrCache,h=l.lblTxrCache,f=l.slbTxrCache,d=l.tlbTxrCache,p=e.boundingBox(),m=a===!0?u.reasons.highQuality:null;if(!(p.w===0||p.h===0||!e.visible())&&(!n||oB(p,n))){var g=e.isEdge(),y=e.element()._private.rscratch.badLine;s.drawElementUnderlay(t,e),s.drawCachedElementPortion(t,e,u,r,i,m,ltt,ftt),(!g||!y)&&s.drawCachedElementPortion(t,e,h,r,i,m,ctt,OP),g&&!y&&(s.drawCachedElementPortion(t,e,f,r,i,m,utt,OP),s.drawCachedElementPortion(t,e,d,r,i,m,htt,OP)),s.drawElementOverlay(t,e)}};Yc.drawElements=function(t,e){for(var r=this,n=0;n<e.length;n++){var i=e[n];r.drawElement(t,i)}};Yc.drawCachedElements=function(t,e,r,n){for(var i=this,a=0;a<e.length;a++){var s=e[a];i.drawCachedElement(t,s,r,n)}};Yc.drawCachedNodes=function(t,e,r,n){for(var i=this,a=0;a<e.length;a++){var s=e[a];s.isNode()&&i.drawCachedElement(t,s,r,n)}};Yc.drawLayeredElements=function(t,e,r,n){var i=this,a=i.data.lyrTxrCache.getLayers(e,r);if(a)for(var s=0;s<a.length;s++){var l=a[s],u=l.bb;u.w===0||u.h===0||t.drawImage(l.canvas,u.x1,u.y1,u.w,u.h)}else i.drawCachedElements(t,e,r,n)};Zu={};Zu.drawEdge=function(t,e,r){var n=arguments.length>3&&arguments[3]!==void 0?arguments[3]:!0,i=arguments.length>4&&arguments[4]!==void 0?arguments[4]:!0,a=arguments.length>5&&arguments[5]!==void 0?arguments[5]:!0,s=this,l=e._private.rscratch;if(!(a&&!e.visible())&&!(l.badLine||l.allpts==null||isNaN(l.allpts[0]))){var u;r&&(u=r,t.translate(-u.x1,-u.y1));var h=a?e.pstyle("opacity").value:1,f=a?e.pstyle("line-opacity").value:1,d=e.pstyle("curve-style").value,p=e.pstyle("line-style").value,m=e.pstyle("width").pfValue,g=e.pstyle("line-cap").value,y=e.pstyle("line-outline-width").value,v=e.pstyle("line-outline-color").value,x=h*f,b=h*f,w=o(function(){var O=arguments.length>0&&arguments[0]!==void 0?arguments[0]:x;d==="straight-triangle"?(s.eleStrokeStyle(t,e,O),s.drawEdgeTrianglePath(e,t,l.allpts)):(t.lineWidth=m,t.lineCap=g,s.eleStrokeStyle(t,e,O),s.drawEdgePath(e,t,l.allpts,p),t.lineCap="butt")},"drawLine"),_=o(function(){var O=arguments.length>0&&arguments[0]!==void 0?arguments[0]:x;if(t.lineWidth=m+y,t.lineCap=g,y>0)s.colorStrokeStyle(t,v[0],v[1],v[2],O);else{t.lineCap="butt";return}d==="straight-triangle"?s.drawEdgeTrianglePath(e,t,l.allpts):(s.drawEdgePath(e,t,l.allpts,p),t.lineCap="butt")},"drawLineOutline"),T=o(function(){i&&s.drawEdgeOverlay(t,e)},"drawOverlay"),E=o(function(){i&&s.drawEdgeUnderlay(t,e)},"drawUnderlay"),L=o(function(){var O=arguments.length>0&&arguments[0]!==void 0?arguments[0]:b;s.drawArrowheads(t,e,O)},"drawArrows"),C=o(function(){s.drawElementText(t,e,null,n)},"drawText");t.lineJoin="round";var A=e.pstyle("ghost").value==="yes";if(A){var I=e.pstyle("ghost-offset-x").pfValue,D=e.pstyle("ghost-offset-y").pfValue,k=e.pstyle("ghost-opacity").value,R=x*k;t.translate(I,D),w(R),L(R),t.translate(-I,-D)}else _();E(),w(),L(),T(),C(),r&&t.translate(u.x1,u.y1)}};v1e=o(function(e){if(!["overlay","underlay"].includes(e))throw new Error("Invalid state");return function(r,n){if(n.visible()){var i=n.pstyle("".concat(e,"-opacity")).value;if(i!==0){var a=this,s=a.usePaths(),l=n._private.rscratch,u=n.pstyle("".concat(e,"-padding")).pfValue,h=2*u,f=n.pstyle("".concat(e,"-color")).value;r.lineWidth=h,l.edgeType==="self"&&!s?r.lineCap="butt":r.lineCap="round",a.colorStrokeStyle(r,f[0],f[1],f[2],i),a.drawEdgePath(n,r,l.allpts,"solid")}}}},"drawEdgeOverlayUnderlay");Zu.drawEdgeOverlay=v1e("overlay");Zu.drawEdgeUnderlay=v1e("underlay");Zu.drawEdgePath=function(t,e,r,n){var i=t._private.rscratch,a=e,s,l=!1,u=this.usePaths(),h=t.pstyle("line-dash-pattern").pfValue,f=t.pstyle("line-dash-offset").pfValue;if(u){var d=r.join("$"),p=i.pathCacheKey&&i.pathCacheKey===d;p?(s=e=i.pathCache,l=!0):(s=e=new Path2D,i.pathCacheKey=d,i.pathCache=s)}if(a.setLineDash)switch(n){case"dotted":a.setLineDash([1,1]);break;case"dashed":a.setLineDash(h),a.lineDashOffset=f;break;case"solid":a.setLineDash([]);break}if(!l&&!i.badLine)switch(e.beginPath&&e.beginPath(),e.moveTo(r[0],r[1]),i.edgeType){case"bezier":case"self":case"compound":case"multibezier":for(var m=2;m+3<r.length;m+=4)e.quadraticCurveTo(r[m],r[m+1],r[m+2],r[m+3]);break;case"straight":case"haystack":for(var g=2;g+1<r.length;g+=2)e.lineTo(r[g],r[g+1]);break;case"segments":if(i.isRound){var y=Yme(i.roundCorners),v;try{for(y.s();!(v=y.n()).done;){var x=v.value;o1e(e,x)}}catch(w){y.e(w)}finally{y.f()}e.lineTo(r[r.length-2],r[r.length-1])}else for(var b=2;b+1<r.length;b+=2)e.lineTo(r[b],r[b+1]);break}e=a,u?e.stroke(s):e.stroke(),e.setLineDash&&e.setLineDash([])};Zu.drawEdgeTrianglePath=function(t,e,r){e.fillStyle=e.strokeStyle;for(var n=t.pstyle("width").pfValue,i=0;i+1<r.length;i+=2){var a=[r[i+2]-r[i],r[i+3]-r[i+1]],s=Math.sqrt(a[0]*a[0]+a[1]*a[1]),l=[a[1]/s,-a[0]/s],u=[l[0]*n/2,l[1]*n/2];e.beginPath(),e.moveTo(r[i]-u[0],r[i+1]-u[1]),e.lineTo(r[i]+u[0],r[i+1]+u[1]),e.lineTo(r[i+2],r[i+3]),e.closePath(),e.fill()}};Zu.drawArrowheads=function(t,e,r){var n=e._private.rscratch,i=n.edgeType==="haystack";i||this.drawArrowhead(t,e,"source",n.arrowStartX,n.arrowStartY,n.srcArrowAngle,r),this.drawArrowhead(t,e,"mid-target",n.midX,n.midY,n.midtgtArrowAngle,r),this.drawArrowhead(t,e,"mid-source",n.midX,n.midY,n.midsrcArrowAngle,r),i||this.drawArrowhead(t,e,"target",n.arrowEndX,n.arrowEndY,n.tgtArrowAngle,r)};Zu.drawArrowhead=function(t,e,r,n,i,a,s){if(!(isNaN(n)||n==null||isNaN(i)||i==null||isNaN(a)||a==null)){var l=this,u=e.pstyle(r+"-arrow-shape").value;if(u!=="none"){var h=e.pstyle(r+"-arrow-fill").value==="hollow"?"both":"filled",f=e.pstyle(r+"-arrow-fill").value,d=e.pstyle("width").pfValue,p=e.pstyle(r+"-arrow-width"),m=p.value==="match-line"?d:p.pfValue;p.units==="%"&&(m*=d);var g=e.pstyle("opacity").value;s===void 0&&(s=g);var y=t.globalCompositeOperation;(s!==1||f==="hollow")&&(t.globalCompositeOperation="destination-out",l.colorFillStyle(t,255,255,255,1),l.colorStrokeStyle(t,255,255,255,1),l.drawArrowShape(e,t,h,d,u,m,n,i,a),t.globalCompositeOperation=y);var v=e.pstyle(r+"-arrow-color").value;l.colorFillStyle(t,v[0],v[1],v[2],s),l.colorStrokeStyle(t,v[0],v[1],v[2],s),l.drawArrowShape(e,t,f,d,u,m,n,i,a)}}};Zu.drawArrowShape=function(t,e,r,n,i,a,s,l,u){var h=this,f=this.usePaths()&&i!=="triangle-cross",d=!1,p,m=e,g={x:s,y:l},y=t.pstyle("arrow-scale").value,v=this.getArrowWidth(n,y),x=h.arrowShapes[i];if(f){var b=h.arrowPathCache=h.arrowPathCache||[],w=z0(i),_=b[w];_!=null?(p=e=_,d=!0):(p=e=new Path2D,b[w]=p)}d||(e.beginPath&&e.beginPath(),f?x.draw(e,1,0,{x:0,y:0},1):x.draw(e,v,u,g,n),e.closePath&&e.closePath()),e=m,f&&(e.translate(s,l),e.rotate(u),e.scale(v,v)),(r==="filled"||r==="both")&&(f?e.fill(p):e.fill()),(r==="hollow"||r==="both")&&(e.lineWidth=a/(f?v:1),e.lineJoin="miter",f?e.stroke(p):e.stroke()),f&&(e.scale(1/v,1/v),e.rotate(-u),e.translate(-s,-l))};TB={};TB.safeDrawImage=function(t,e,r,n,i,a,s,l,u,h){if(!(i<=0||a<=0||u<=0||h<=0))try{t.drawImage(e,r,n,i,a,s,l,u,h)}catch(f){on(f)}};TB.drawInscribedImage=function(t,e,r,n,i){var a=this,s=r.position(),l=s.x,u=s.y,h=r.cy().style(),f=h.getIndexedStyle.bind(h),d=f(r,"background-fit","value",n),p=f(r,"background-repeat","value",n),m=r.width(),g=r.height(),y=r.padding()*2,v=m+(f(r,"background-width-relative-to","value",n)==="inner"?0:y),x=g+(f(r,"background-height-relative-to","value",n)==="inner"?0:y),b=r._private.rscratch,w=f(r,"background-clip","value",n),_=w==="node",T=f(r,"background-image-opacity","value",n)*i,E=f(r,"background-image-smoothing","value",n),L=r.pstyle("corner-radius").value;L!=="auto"&&(L=r.pstyle("corner-radius").pfValue);var C=e.width||e.cachedW,A=e.height||e.cachedH;(C==null||A==null)&&(document.body.appendChild(e),C=e.cachedW=e.width||e.offsetWidth,A=e.cachedH=e.height||e.offsetHeight,document.body.removeChild(e));var I=C,D=A;if(f(r,"background-width","value",n)!=="auto"&&(f(r,"background-width","units",n)==="%"?I=f(r,"background-width","pfValue",n)*v:I=f(r,"background-width","pfValue",n)),f(r,"background-height","value",n)!=="auto"&&(f(r,"background-height","units",n)==="%"?D=f(r,"background-height","pfValue",n)*x:D=f(r,"background-height","pfValue",n)),!(I===0||D===0)){if(d==="contain"){var k=Math.min(v/I,x/D);I*=k,D*=k}else if(d==="cover"){var k=Math.max(v/I,x/D);I*=k,D*=k}var R=l-v/2,S=f(r,"background-position-x","units",n),O=f(r,"background-position-x","pfValue",n);S==="%"?R+=(v-I)*O:R+=O;var N=f(r,"background-offset-x","units",n),P=f(r,"background-offset-x","pfValue",n);N==="%"?R+=(v-I)*P:R+=P;var F=u-x/2,B=f(r,"background-position-y","units",n),$=f(r,"background-position-y","pfValue",n);B==="%"?F+=(x-D)*$:F+=$;var z=f(r,"background-offset-y","units",n),W=f(r,"background-offset-y","pfValue",n);z==="%"?F+=(x-D)*W:F+=W,b.pathCache&&(R-=l,F-=u,l=0,u=0);var j=t.globalAlpha;t.globalAlpha=T;var K=a.getImgSmoothing(t),ie=!1;if(E==="no"&&K?(a.setImgSmoothing(t,!1),ie=!0):E==="yes"&&!K&&(a.setImgSmoothing(t,!0),ie=!0),p==="no-repeat")_&&(t.save(),b.pathCache?t.clip(b.pathCache):(a.nodeShapes[a.getNodeShape(r)].draw(t,l,u,v,x,L,b),t.clip())),a.safeDrawImage(t,e,0,0,C,A,R,F,I,D),_&&t.restore();else{var Q=t.createPattern(e,p);t.fillStyle=Q,a.nodeShapes[a.getNodeShape(r)].draw(t,l,u,v,x,L,b),t.translate(R,F),t.fill(),t.translate(-R,-F)}t.globalAlpha=j,ie&&a.setImgSmoothing(t,K)}};Y0={};Y0.eleTextBiggerThanMin=function(t,e){if(!e){var r=t.cy().zoom(),n=this.getPixelRatio(),i=Math.ceil(sB(r*n));e=Math.pow(2,i)}var a=t.pstyle("font-size").pfValue*e,s=t.pstyle("min-zoomed-font-size").pfValue;return!(a<s)};Y0.drawElementText=function(t,e,r,n,i){var a=arguments.length>5&&arguments[5]!==void 0?arguments[5]:!0,s=this;if(n==null){if(a&&!s.eleTextBiggerThanMin(e))return}else if(n===!1)return;if(e.isNode()){var l=e.pstyle("label");if(!l||!l.value)return;var u=s.getLabelJustification(e);t.textAlign=u,t.textBaseline="bottom"}else{var h=e.element()._private.rscratch.badLine,f=e.pstyle("label"),d=e.pstyle("source-label"),p=e.pstyle("target-label");if(h||(!f||!f.value)&&(!d||!d.value)&&(!p||!p.value))return;t.textAlign="center",t.textBaseline="bottom"}var m=!r,g;r&&(g=r,t.translate(-g.x1,-g.y1)),i==null?(s.drawText(t,e,null,m,a),e.isEdge()&&(s.drawText(t,e,"source",m,a),s.drawText(t,e,"target",m,a))):s.drawText(t,e,i,m,a),r&&t.translate(g.x1,g.y1)};Y0.getFontCache=function(t){var e;this.fontCaches=this.fontCaches||[];for(var r=0;r<this.fontCaches.length;r++)if(e=this.fontCaches[r],e.context===t)return e;return e={context:t},this.fontCaches.push(e),e};Y0.setupTextStyle=function(t,e){var r=arguments.length>2&&arguments[2]!==void 0?arguments[2]:!0,n=e.pstyle("font-style").strValue,i=e.pstyle("font-size").pfValue+"px",a=e.pstyle("font-family").strValue,s=e.pstyle("font-weight").strValue,l=r?e.effectiveOpacity()*e.pstyle("text-opacity").value:1,u=e.pstyle("text-outline-opacity").value*l,h=e.pstyle("color").value,f=e.pstyle("text-outline-color").value;t.font=n+" "+s+" "+i+" "+a,t.lineJoin="round",this.colorFillStyle(t,h[0],h[1],h[2],l),this.colorStrokeStyle(t,f[0],f[1],f[2],u)};o(PP,"roundRect");Y0.getTextAngle=function(t,e){var r,n=t._private,i=n.rscratch,a=e?e+"-":"",s=t.pstyle(a+"text-rotation"),l=Wl(i,"labelAngle",e);return s.strValue==="autorotate"?r=t.isEdge()?l:0:s.strValue==="none"?r=0:r=s.pfValue,r};Y0.drawText=function(t,e,r){var n=arguments.length>3&&arguments[3]!==void 0?arguments[3]:!0,i=arguments.length>4&&arguments[4]!==void 0?arguments[4]:!0,a=e._private,s=a.rscratch,l=i?e.effectiveOpacity():1;if(!(i&&(l===0||e.pstyle("text-opacity").value===0))){r==="main"&&(r=null);var u=Wl(s,"labelX",r),h=Wl(s,"labelY",r),f,d,p=this.getLabelText(e,r);if(p!=null&&p!==""&&!isNaN(u)&&!isNaN(h)){this.setupTextStyle(t,e,i);var m=r?r+"-":"",g=Wl(s,"labelWidth",r),y=Wl(s,"labelHeight",r),v=e.pstyle(m+"text-margin-x").pfValue,x=e.pstyle(m+"text-margin-y").pfValue,b=e.isEdge(),w=e.pstyle("text-halign").value,_=e.pstyle("text-valign").value;b&&(w="center",_="center"),u+=v,h+=x;var T;switch(n?T=this.getTextAngle(e,r):T=0,T!==0&&(f=u,d=h,t.translate(f,d),t.rotate(T),u=0,h=0),_){case"top":break;case"center":h+=y/2;break;case"bottom":h+=y;break}var E=e.pstyle("text-background-opacity").value,L=e.pstyle("text-border-opacity").value,C=e.pstyle("text-border-width").pfValue,A=e.pstyle("text-background-padding").pfValue,I=e.pstyle("text-background-shape").strValue,D=I.indexOf("round")===0,k=2;if(E>0||C>0&&L>0){var R=u-A;switch(w){case"left":R-=g;break;case"center":R-=g/2;break}var S=h-y-A,O=g+2*A,N=y+2*A;if(E>0){var P=t.fillStyle,F=e.pstyle("text-background-color").value;t.fillStyle="rgba("+F[0]+","+F[1]+","+F[2]+","+E*l+")",D?PP(t,R,S,O,N,k):t.fillRect(R,S,O,N),t.fillStyle=P}if(C>0&&L>0){var B=t.strokeStyle,$=t.lineWidth,z=e.pstyle("text-border-color").value,W=e.pstyle("text-border-style").value;if(t.strokeStyle="rgba("+z[0]+","+z[1]+","+z[2]+","+L*l+")",t.lineWidth=C,t.setLineDash)switch(W){case"dotted":t.setLineDash([1,1]);break;case"dashed":t.setLineDash([4,2]);break;case"double":t.lineWidth=C/4,t.setLineDash([]);break;case"solid":t.setLineDash([]);break}if(D?PP(t,R,S,O,N,k,"stroke"):t.strokeRect(R,S,O,N),W==="double"){var j=C/2;D?PP(t,R+j,S+j,O-j*2,N-j*2,k,"stroke"):t.strokeRect(R+j,S+j,O-j*2,N-j*2)}t.setLineDash&&t.setLineDash([]),t.lineWidth=$,t.strokeStyle=B}}var K=2*e.pstyle("text-outline-width").pfValue;if(K>0&&(t.lineWidth=K),e.pstyle("text-wrap").value==="wrap"){var ie=Wl(s,"labelWrapCachedLines",r),Q=Wl(s,"labelLineHeight",r),ee=g/2,J=this.getLabelJustification(e);switch(J==="auto"||(w==="left"?J==="left"?u+=-g:J==="center"&&(u+=-ee):w==="center"?J==="left"?u+=-ee:J==="right"&&(u+=ee):w==="right"&&(J==="center"?u+=ee:J==="right"&&(u+=g))),_){case"top":h-=(ie.length-1)*Q;break;case"center":case"bottom":h-=(ie.length-1)*Q;break}for(var H=0;H<ie.length;H++)K>0&&t.strokeText(ie[H],u,h),t.fillText(ie[H],u,h),h+=Q}else K>0&&t.strokeText(p,u,h),t.fillText(p,u,h);T!==0&&(t.rotate(-T),t.translate(-f,-d))}}};w1={};w1.drawNode=function(t,e,r){var n=arguments.length>3&&arguments[3]!==void 0?arguments[3]:!0,i=arguments.length>4&&arguments[4]!==void 0?arguments[4]:!0,a=arguments.length>5&&arguments[5]!==void 0?arguments[5]:!0,s=this,l,u,h=e._private,f=h.rscratch,d=e.position();if(!(!xt(d.x)||!xt(d.y))&&!(a&&!e.visible())){var p=a?e.effectiveOpacity():1,m=s.usePaths(),g,y=!1,v=e.padding();l=e.width()+2*v,u=e.height()+2*v;var x;r&&(x=r,t.translate(-x.x1,-x.y1));for(var b=e.pstyle("background-image"),w=b.value,_=new Array(w.length),T=new Array(w.length),E=0,L=0;L<w.length;L++){var C=w[L],A=_[L]=C!=null&&C!=="none";if(A){var I=e.cy().style().getIndexedStyle(e,"background-image-crossorigin","value",L);E++,T[L]=s.getCachedImage(C,I,function(){h.backgroundTimestamp=Date.now(),e.emitAndNotify("background")})}}var D=e.pstyle("background-blacken").value,k=e.pstyle("border-width").pfValue,R=e.pstyle("background-opacity").value*p,S=e.pstyle("border-color").value,O=e.pstyle("border-style").value,N=e.pstyle("border-join").value,P=e.pstyle("border-cap").value,F=e.pstyle("border-position").value,B=e.pstyle("border-dash-pattern").pfValue,$=e.pstyle("border-dash-offset").pfValue,z=e.pstyle("border-opacity").value*p,W=e.pstyle("outline-width").pfValue,j=e.pstyle("outline-color").value,K=e.pstyle("outline-style").value,ie=e.pstyle("outline-opacity").value*p,Q=e.pstyle("outline-offset").value,ee=e.pstyle("corner-radius").value;ee!=="auto"&&(ee=e.pstyle("corner-radius").pfValue);var J=o(function(){var ye=arguments.length>0&&arguments[0]!==void 0?arguments[0]:R;s.eleFillStyle(t,e,ye)},"setupShapeColor"),H=o(function(){var ye=arguments.length>0&&arguments[0]!==void 0?arguments[0]:z;s.colorStrokeStyle(t,S[0],S[1],S[2],ye)},"setupBorderColor"),q=o(function(){var ye=arguments.length>0&&arguments[0]!==void 0?arguments[0]:ie;s.colorStrokeStyle(t,j[0],j[1],j[2],ye)},"setupOutlineColor"),Z=o(function(ye,U,Te,se){var Ee=s.nodePathCache=s.nodePathCache||[],Ae=age(Te==="polygon"?Te+","+se.join(","):Te,""+U,""+ye,""+ee),Pe=Ee[Ae],Me,me=!1;return Pe!=null?(Me=Pe,me=!0,f.pathCache=Me):(Me=new Path2D,Ee[Ae]=f.pathCache=Me),{path:Me,cacheHit:me}},"getPath"),ae=e.pstyle("shape").strValue,ue=e.pstyle("shape-polygon-points").pfValue;if(m){t.translate(d.x,d.y);var ce=Z(l,u,ae,ue);g=ce.path,y=ce.cacheHit}var te=o(function(){if(!y){var ye=d;m&&(ye={x:0,y:0}),s.nodeShapes[s.getNodeShape(e)].draw(g||t,ye.x,ye.y,l,u,ee,f)}m?t.fill(g):t.fill()},"drawShape"),De=o(function(){for(var ye=arguments.length>0&&arguments[0]!==void 0?arguments[0]:p,U=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0,Te=h.backgrounding,se=0,Ee=0;Ee<T.length;Ee++){var Ae=e.cy().style().getIndexedStyle(e,"background-image-containment","value",Ee);if(U&&Ae==="over"||!U&&Ae==="inside"){se++;continue}_[Ee]&&T[Ee].complete&&!T[Ee].error&&(se++,s.drawInscribedImage(t,T[Ee],e,Ee,ye))}h.backgrounding=se!==E,Te!==h.backgrounding&&e.updateStyle(!1)},"drawImages"),oe=o(function(){var ye=arguments.length>0&&arguments[0]!==void 0?arguments[0]:!1,U=arguments.length>1&&arguments[1]!==void 0?arguments[1]:p;s.hasPie(e)&&(s.drawPie(t,e,U),ye&&(m||s.nodeShapes[s.getNodeShape(e)].draw(t,d.x,d.y,l,u,ee,f)))},"drawPie"),ke=o(function(){var ye=arguments.length>0&&arguments[0]!==void 0?arguments[0]:p,U=(D>0?D:-D)*ye,Te=D>0?0:255;D!==0&&(s.colorFillStyle(t,Te,Te,Te,U),m?t.fill(g):t.fill())},"darken"),Fe=o(function(){if(k>0){if(t.lineWidth=k,t.lineCap=P,t.lineJoin=N,t.setLineDash)switch(O){case"dotted":t.setLineDash([1,1]);break;case"dashed":t.setLineDash(B),t.lineDashOffset=$;break;case"solid":case"double":t.setLineDash([]);break}if(F!=="center"){if(t.save(),t.lineWidth*=2,F==="inside")m?t.clip(g):t.clip();else{var ye=new Path2D;ye.rect(-l/2-k,-u/2-k,l+2*k,u+2*k),ye.addPath(g),t.clip(ye,"evenodd")}m?t.stroke(g):t.stroke(),t.restore()}else m?t.stroke(g):t.stroke();if(O==="double"){t.lineWidth=k/3;var U=t.globalCompositeOperation;t.globalCompositeOperation="destination-out",m?t.stroke(g):t.stroke(),t.globalCompositeOperation=U}t.setLineDash&&t.setLineDash([])}},"drawBorder"),Be=o(function(){if(W>0){if(t.lineWidth=W,t.lineCap="butt",t.setLineDash)switch(K){case"dotted":t.setLineDash([1,1]);break;case"dashed":t.setLineDash([4,2]);break;case"solid":case"double":t.setLineDash([]);break}var ye=d;m&&(ye={x:0,y:0});var U=s.getNodeShape(e),Te=k;F==="inside"&&(Te=0),F==="outside"&&(Te*=2);var se=(l+Te+(W+Q))/l,Ee=(u+Te+(W+Q))/u,Ae=l*se,Pe=u*Ee,Me=s.nodeShapes[U].points,me;if(m){var We=Z(Ae,Pe,U,Me);me=We.path}if(U==="ellipse")s.drawEllipsePath(me||t,ye.x,ye.y,Ae,Pe);else if(["round-diamond","round-heptagon","round-hexagon","round-octagon","round-pentagon","round-polygon","round-triangle","round-tag"].includes(U)){var Re=0,tt=0,gt=0;U==="round-diamond"?Re=(Te+Q+W)*1.4:U==="round-heptagon"?(Re=(Te+Q+W)*1.075,gt=-(Te/2+Q+W)/35):U==="round-hexagon"?Re=(Te+Q+W)*1.12:U==="round-pentagon"?(Re=(Te+Q+W)*1.13,gt=-(Te/2+Q+W)/15):U==="round-tag"?(Re=(Te+Q+W)*1.12,tt=(Te/2+W+Q)*.07):U==="round-triangle"&&(Re=(Te+Q+W)*(Math.PI/2),gt=-(Te+Q/2+W)/Math.PI),Re!==0&&(se=(l+Re)/l,Ae=l*se,["round-hexagon","round-tag"].includes(U)||(Ee=(u+Re)/u,Pe=u*Ee)),ee=ee==="auto"?gge(Ae,Pe):ee;for(var Et=Ae/2,vt=Pe/2,Ye=ee+(Te+W+Q)/2,Tt=new Array(Me.length/2),$e=new Array(Me.length/2),rt=0;rt<Me.length/2;rt++)Tt[rt]={x:ye.x+tt+Et*Me[rt*2],y:ye.y+gt+vt*Me[rt*2+1]};var ft,kt,er,dt,Xe=Tt.length;for(kt=Tt[Xe-1],ft=0;ft<Xe;ft++)er=Tt[ft%Xe],dt=Tt[(ft+1)%Xe],$e[ft]=bB(kt,er,dt,Ye),kt=er,er=dt;s.drawRoundPolygonPath(me||t,ye.x+tt,ye.y+gt,l*se,u*Ee,Me,$e)}else if(["roundrectangle","round-rectangle"].includes(U))ee=ee==="auto"?$0(Ae,Pe):ee,s.drawRoundRectanglePath(me||t,ye.x,ye.y,Ae,Pe,ee+(Te+W+Q)/2);else if(["cutrectangle","cut-rectangle"].includes(U))ee=ee==="auto"?lB():ee,s.drawCutRectanglePath(me||t,ye.x,ye.y,Ae,Pe,null,ee+(Te+W+Q)/4);else if(["bottomroundrectangle","bottom-round-rectangle"].includes(U))ee=ee==="auto"?$0(Ae,Pe):ee,s.drawBottomRoundRectanglePath(me||t,ye.x,ye.y,Ae,Pe,ee+(Te+W+Q)/2);else if(U==="barrel")s.drawBarrelPath(me||t,ye.x,ye.y,Ae,Pe);else if(U.startsWith("polygon")||["rhomboid","right-rhomboid","round-tag","tag","vee"].includes(U)){var ct=(Te+W+Q)/l;Me=y6(v6(Me,ct)),s.drawPolygonPath(me||t,ye.x,ye.y,l,u,Me)}else{var Lt=(Te+W+Q)/l;Me=y6(v6(Me,-Lt)),s.drawPolygonPath(me||t,ye.x,ye.y,l,u,Me)}if(m?t.stroke(me):t.stroke(),K==="double"){t.lineWidth=Te/3;var Rt=t.globalCompositeOperation;t.globalCompositeOperation="destination-out",m?t.stroke(me):t.stroke(),t.globalCompositeOperation=Rt}t.setLineDash&&t.setLineDash([])}},"drawOutline"),Ve=o(function(){i&&s.drawNodeOverlay(t,e,d,l,u)},"drawOverlay"),Ge=o(function(){i&&s.drawNodeUnderlay(t,e,d,l,u)},"drawUnderlay"),He=o(function(){s.drawElementText(t,e,null,n)},"drawText"),xe=e.pstyle("ghost").value==="yes";if(xe){var X=e.pstyle("ghost-offset-x").pfValue,fe=e.pstyle("ghost-offset-y").pfValue,he=e.pstyle("ghost-opacity").value,ge=he*p;t.translate(X,fe),q(),Be(),J(he*R),te(),De(ge,!0),H(he*z),Fe(),oe(D!==0||k!==0),De(ge,!1),ke(ge),t.translate(-X,-fe)}m&&t.translate(-d.x,-d.y),Ge(),m&&t.translate(d.x,d.y),q(),Be(),J(),te(),De(p,!0),H(),Fe(),oe(D!==0||k!==0),De(p,!1),ke(),m&&t.translate(-d.x,-d.y),He(),Ve(),r&&t.translate(x.x1,x.y1)}};x1e=o(function(e){if(!["overlay","underlay"].includes(e))throw new Error("Invalid state");return function(r,n,i,a,s){var l=this;if(n.visible()){var u=n.pstyle("".concat(e,"-padding")).pfValue,h=n.pstyle("".concat(e,"-opacity")).value,f=n.pstyle("".concat(e,"-color")).value,d=n.pstyle("".concat(e,"-shape")).value,p=n.pstyle("".concat(e,"-corner-radius")).value;if(h>0){if(i=i||n.position(),a==null||s==null){var m=n.padding();a=n.width()+2*m,s=n.height()+2*m}l.colorFillStyle(r,f[0],f[1],f[2],h),l.nodeShapes[d].draw(r,i.x,i.y,a+u*2,s+u*2,p),r.fill()}}}},"drawNodeOverlayUnderlay");w1.drawNodeOverlay=x1e("overlay");w1.drawNodeUnderlay=x1e("underlay");w1.hasPie=function(t){return t=t[0],t._private.hasPie};w1.drawPie=function(t,e,r,n){e=e[0],n=n||e.position();var i=e.cy().style(),a=e.pstyle("pie-size"),s=n.x,l=n.y,u=e.width(),h=e.height(),f=Math.min(u,h)/2,d=0,p=this.usePaths();p&&(s=0,l=0),a.units==="%"?f=f*a.pfValue:a.pfValue!==void 0&&(f=a.pfValue/2);for(var m=1;m<=i.pieBackgroundN;m++){var g=e.pstyle("pie-"+m+"-background-size").value,y=e.pstyle("pie-"+m+"-background-color").value,v=e.pstyle("pie-"+m+"-background-opacity").value*r,x=g/100;x+d>1&&(x=1-d);var b=1.5*Math.PI+2*Math.PI*d,w=2*Math.PI*x,_=b+w;g===0||d>=1||d+x>1||(t.beginPath(),t.moveTo(s,l),t.arc(s,l,f,b,_),t.closePath(),this.colorFillStyle(t,y[0],y[1],y[2],v),t.fill(),d+=x)}};mo={},dtt=100;mo.getPixelRatio=function(){var t=this.data.contexts[0];if(this.forcedPixelRatio!=null)return this.forcedPixelRatio;var e=this.cy.window(),r=t.backingStorePixelRatio||t.webkitBackingStorePixelRatio||t.mozBackingStorePixelRatio||t.msBackingStorePixelRatio||t.oBackingStorePixelRatio||t.backingStorePixelRatio||1;return(e.devicePixelRatio||1)/r};mo.paintCache=function(t){for(var e=this.paintCaches=this.paintCaches||[],r=!0,n,i=0;i<e.length;i++)if(n=e[i],n.context===t){r=!1;break}return r&&(n={context:t},e.push(n)),n};mo.createGradientStyleFor=function(t,e,r,n,i){var a,s=this.usePaths(),l=r.pstyle(e+"-gradient-stop-colors").value,u=r.pstyle(e+"-gradient-stop-positions").pfValue;if(n==="radial-gradient")if(r.isEdge()){var h=r.sourceEndpoint(),f=r.targetEndpoint(),d=r.midpoint(),p=G0(h,d),m=G0(f,d);a=t.createRadialGradient(d.x,d.y,0,d.x,d.y,Math.max(p,m))}else{var g=s?{x:0,y:0}:r.position(),y=r.paddedWidth(),v=r.paddedHeight();a=t.createRadialGradient(g.x,g.y,0,g.x,g.y,Math.max(y,v))}else if(r.isEdge()){var x=r.sourceEndpoint(),b=r.targetEndpoint();a=t.createLinearGradient(x.x,x.y,b.x,b.y)}else{var w=s?{x:0,y:0}:r.position(),_=r.paddedWidth(),T=r.paddedHeight(),E=_/2,L=T/2,C=r.pstyle("background-gradient-direction").value;switch(C){case"to-bottom":a=t.createLinearGradient(w.x,w.y-L,w.x,w.y+L);break;case"to-top":a=t.createLinearGradient(w.x,w.y+L,w.x,w.y-L);break;case"to-left":a=t.createLinearGradient(w.x+E,w.y,w.x-E,w.y);break;case"to-right":a=t.createLinearGradient(w.x-E,w.y,w.x+E,w.y);break;case"to-bottom-right":case"to-right-bottom":a=t.createLinearGradient(w.x-E,w.y-L,w.x+E,w.y+L);break;case"to-top-right":case"to-right-top":a=t.createLinearGradient(w.x-E,w.y+L,w.x+E,w.y-L);break;case"to-bottom-left":case"to-left-bottom":a=t.createLinearGradient(w.x+E,w.y-L,w.x-E,w.y+L);break;case"to-top-left":case"to-left-top":a=t.createLinearGradient(w.x+E,w.y+L,w.x-E,w.y-L);break}}if(!a)return null;for(var A=u.length===l.length,I=l.length,D=0;D<I;D++)a.addColorStop(A?u[D]:D/(I-1),"rgba("+l[D][0]+","+l[D][1]+","+l[D][2]+","+i+")");return a};mo.gradientFillStyle=function(t,e,r,n){var i=this.createGradientStyleFor(t,"background",e,r,n);if(!i)return null;t.fillStyle=i};mo.colorFillStyle=function(t,e,r,n,i){t.fillStyle="rgba("+e+","+r+","+n+","+i+")"};mo.eleFillStyle=function(t,e,r){var n=e.pstyle("background-fill").value;if(n==="linear-gradient"||n==="radial-gradient")this.gradientFillStyle(t,e,n,r);else{var i=e.pstyle("background-color").value;this.colorFillStyle(t,i[0],i[1],i[2],r)}};mo.gradientStrokeStyle=function(t,e,r,n){var i=this.createGradientStyleFor(t,"line",e,r,n);if(!i)return null;t.strokeStyle=i};mo.colorStrokeStyle=function(t,e,r,n,i){t.strokeStyle="rgba("+e+","+r+","+n+","+i+")"};mo.eleStrokeStyle=function(t,e,r){var n=e.pstyle("line-fill").value;if(n==="linear-gradient"||n==="radial-gradient")this.gradientStrokeStyle(t,e,n,r);else{var i=e.pstyle("line-color").value;this.colorStrokeStyle(t,i[0],i[1],i[2],r)}};mo.matchCanvasSize=function(t){var e=this,r=e.data,n=e.findContainerClientCoords(),i=n[2],a=n[3],s=e.getPixelRatio(),l=e.motionBlurPxRatio;(t===e.data.bufferCanvases[e.MOTIONBLUR_BUFFER_NODE]||t===e.data.bufferCanvases[e.MOTIONBLUR_BUFFER_DRAG])&&(s=l);var u=i*s,h=a*s,f;if(!(u===e.canvasWidth&&h===e.canvasHeight)){e.fontCaches=null;var d=r.canvasContainer;d.style.width=i+"px",d.style.height=a+"px";for(var p=0;p<e.CANVAS_LAYERS;p++)f=r.canvases[p],f.width=u,f.height=h,f.style.width=i+"px",f.style.height=a+"px";for(var p=0;p<e.BUFFER_COUNT;p++)f=r.bufferCanvases[p],f.width=u,f.height=h,f.style.width=i+"px",f.style.height=a+"px";e.textureMult=1,s<=1&&(f=r.bufferCanvases[e.TEXTURE_BUFFER],e.textureMult=2,f.width=u*e.textureMult,f.height=h*e.textureMult),e.canvasWidth=u,e.canvasHeight=h}};mo.renderTo=function(t,e,r,n){this.render({forcedContext:t,forcedZoom:e,forcedPan:r,drawAllLayers:!0,forcedPxRatio:n})};mo.render=function(t){t=t||cge();var e=t.forcedContext,r=t.drawAllLayers,n=t.drawOnlyNodeLayer,i=t.forcedZoom,a=t.forcedPan,s=this,l=t.forcedPxRatio===void 0?this.getPixelRatio():t.forcedPxRatio,u=s.cy,h=s.data,f=h.canvasNeedsRedraw,d=s.textureOnViewport&&!e&&(s.pinching||s.hoverData.dragging||s.swipePanning||s.data.wheelZooming),p=t.motionBlur!==void 0?t.motionBlur:s.motionBlur,m=s.motionBlurPxRatio,g=u.hasCompoundNodes(),y=s.hoverData.draggingEles,v=!!(s.hoverData.selecting||s.touchData.selecting);p=p&&!e&&s.motionBlurEnabled&&!v;var x=p;e||(s.prevPxRatio!==l&&(s.invalidateContainerClientCoordsCache(),s.matchCanvasSize(s.container),s.redrawHint("eles",!0),s.redrawHint("drag",!0)),s.prevPxRatio=l),!e&&s.motionBlurTimeout&&clearTimeout(s.motionBlurTimeout),p&&(s.mbFrames==null&&(s.mbFrames=0),s.mbFrames++,s.mbFrames<3&&(x=!1),s.mbFrames>s.minMbLowQualFrames&&(s.motionBlurPxRatio=s.mbPxRBlurry)),s.clearingMotionBlur&&(s.motionBlurPxRatio=1),s.textureDrawLastFrame&&!d&&(f[s.NODE]=!0,f[s.SELECT_BOX]=!0);var b=u.style(),w=u.zoom(),_=i!==void 0?i:w,T=u.pan(),E={x:T.x,y:T.y},L={zoom:w,pan:{x:T.x,y:T.y}},C=s.prevViewport,A=C===void 0||L.zoom!==C.zoom||L.pan.x!==C.pan.x||L.pan.y!==C.pan.y;!A&&!(y&&!g)&&(s.motionBlurPxRatio=1),a&&(E=a),_*=l,E.x*=l,E.y*=l;var I=s.getCachedZSortedEles();function D(ce,te,De,oe,ke){var Fe=ce.globalCompositeOperation;ce.globalCompositeOperation="destination-out",s.colorFillStyle(ce,255,255,255,s.motionBlurTransparency),ce.fillRect(te,De,oe,ke),ce.globalCompositeOperation=Fe}o(D,"mbclear");function k(ce,te){var De,oe,ke,Fe;!s.clearingMotionBlur&&(ce===h.bufferContexts[s.MOTIONBLUR_BUFFER_NODE]||ce===h.bufferContexts[s.MOTIONBLUR_BUFFER_DRAG])?(De={x:T.x*m,y:T.y*m},oe=w*m,ke=s.canvasWidth*m,Fe=s.canvasHeight*m):(De=E,oe=_,ke=s.canvasWidth,Fe=s.canvasHeight),ce.setTransform(1,0,0,1,0,0),te==="motionBlur"?D(ce,0,0,ke,Fe):!e&&(te===void 0||te)&&ce.clearRect(0,0,ke,Fe),r||(ce.translate(De.x,De.y),ce.scale(oe,oe)),a&&ce.translate(a.x,a.y),i&&ce.scale(i,i)}if(o(k,"setContextTransform"),d||(s.textureDrawLastFrame=!1),d){if(s.textureDrawLastFrame=!0,!s.textureCache){s.textureCache={},s.textureCache.bb=u.mutableElements().boundingBox(),s.textureCache.texture=s.data.bufferCanvases[s.TEXTURE_BUFFER];var R=s.data.bufferContexts[s.TEXTURE_BUFFER];R.setTransform(1,0,0,1,0,0),R.clearRect(0,0,s.canvasWidth*s.textureMult,s.canvasHeight*s.textureMult),s.render({forcedContext:R,drawOnlyNodeLayer:!0,forcedPxRatio:l*s.textureMult});var L=s.textureCache.viewport={zoom:u.zoom(),pan:u.pan(),width:s.canvasWidth,height:s.canvasHeight};L.mpan={x:(0-L.pan.x)/L.zoom,y:(0-L.pan.y)/L.zoom}}f[s.DRAG]=!1,f[s.NODE]=!1;var S=h.contexts[s.NODE],O=s.textureCache.texture,L=s.textureCache.viewport;S.setTransform(1,0,0,1,0,0),p?D(S,0,0,L.width,L.height):S.clearRect(0,0,L.width,L.height);var N=b.core("outside-texture-bg-color").value,P=b.core("outside-texture-bg-opacity").value;s.colorFillStyle(S,N[0],N[1],N[2],P),S.fillRect(0,0,L.width,L.height);var w=u.zoom();k(S,!1),S.clearRect(L.mpan.x,L.mpan.y,L.width/L.zoom/l,L.height/L.zoom/l),S.drawImage(O,L.mpan.x,L.mpan.y,L.width/L.zoom/l,L.height/L.zoom/l)}else s.textureOnViewport&&!e&&(s.textureCache=null);var F=u.extent(),B=s.pinching||s.hoverData.dragging||s.swipePanning||s.data.wheelZooming||s.hoverData.draggingEles||s.cy.animated(),$=s.hideEdgesOnViewport&&B,z=[];if(z[s.NODE]=!f[s.NODE]&&p&&!s.clearedForMotionBlur[s.NODE]||s.clearingMotionBlur,z[s.NODE]&&(s.clearedForMotionBlur[s.NODE]=!0),z[s.DRAG]=!f[s.DRAG]&&p&&!s.clearedForMotionBlur[s.DRAG]||s.clearingMotionBlur,z[s.DRAG]&&(s.clearedForMotionBlur[s.DRAG]=!0),f[s.NODE]||r||n||z[s.NODE]){var W=p&&!z[s.NODE]&&m!==1,S=e||(W?s.data.bufferContexts[s.MOTIONBLUR_BUFFER_NODE]:h.contexts[s.NODE]),j=p&&!W?"motionBlur":void 0;k(S,j),$?s.drawCachedNodes(S,I.nondrag,l,F):s.drawLayeredElements(S,I.nondrag,l,F),s.debug&&s.drawDebugPoints(S,I.nondrag),!r&&!p&&(f[s.NODE]=!1)}if(!n&&(f[s.DRAG]||r||z[s.DRAG])){var W=p&&!z[s.DRAG]&&m!==1,S=e||(W?s.data.bufferContexts[s.MOTIONBLUR_BUFFER_DRAG]:h.contexts[s.DRAG]);k(S,p&&!W?"motionBlur":void 0),$?s.drawCachedNodes(S,I.drag,l,F):s.drawCachedElements(S,I.drag,l,F),s.debug&&s.drawDebugPoints(S,I.drag),!r&&!p&&(f[s.DRAG]=!1)}if(s.showFps||!n&&f[s.SELECT_BOX]&&!r){var S=e||h.contexts[s.SELECT_BOX];if(k(S),s.selection[4]==1&&(s.hoverData.selecting||s.touchData.selecting)){var w=s.cy.zoom(),K=b.core("selection-box-border-width").value/w;S.lineWidth=K,S.fillStyle="rgba("+b.core("selection-box-color").value[0]+","+b.core("selection-box-color").value[1]+","+b.core("selection-box-color").value[2]+","+b.core("selection-box-opacity").value+")",S.fillRect(s.selection[0],s.selection[1],s.selection[2]-s.selection[0],s.selection[3]-s.selection[1]),K>0&&(S.strokeStyle="rgba("+b.core("selection-box-border-color").value[0]+","+b.core("selection-box-border-color").value[1]+","+b.core("selection-box-border-color").value[2]+","+b.core("selection-box-opacity").value+")",S.strokeRect(s.selection[0],s.selection[1],s.selection[2]-s.selection[0],s.selection[3]-s.selection[1]))}if(h.bgActivePosistion&&!s.hoverData.selecting){var w=s.cy.zoom(),ie=h.bgActivePosistion;S.fillStyle="rgba("+b.core("active-bg-color").value[0]+","+b.core("active-bg-color").value[1]+","+b.core("active-bg-color").value[2]+","+b.core("active-bg-opacity").value+")",S.beginPath(),S.arc(ie.x,ie.y,b.core("active-bg-size").pfValue/w,0,2*Math.PI),S.fill()}var Q=s.lastRedrawTime;if(s.showFps&&Q){Q=Math.round(Q);var ee=Math.round(1e3/Q);S.setTransform(1,0,0,1,0,0),S.fillStyle="rgba(255, 0, 0, 0.75)",S.strokeStyle="rgba(255, 0, 0, 0.75)",S.lineWidth=1,S.fillText("1 frame = "+Q+" ms = "+ee+" fps",0,20);var J=60;S.strokeRect(0,30,250,20),S.fillRect(0,30,250*Math.min(ee/J,1),20)}r||(f[s.SELECT_BOX]=!1)}if(p&&m!==1){var H=h.contexts[s.NODE],q=s.data.bufferCanvases[s.MOTIONBLUR_BUFFER_NODE],Z=h.contexts[s.DRAG],ae=s.data.bufferCanvases[s.MOTIONBLUR_BUFFER_DRAG],ue=o(function(te,De,oe){te.setTransform(1,0,0,1,0,0),oe||!x?te.clearRect(0,0,s.canvasWidth,s.canvasHeight):D(te,0,0,s.canvasWidth,s.canvasHeight);var ke=m;te.drawImage(De,0,0,s.canvasWidth*ke,s.canvasHeight*ke,0,0,s.canvasWidth,s.canvasHeight)},"drawMotionBlur");(f[s.NODE]||z[s.NODE])&&(ue(H,q,z[s.NODE]),f[s.NODE]=!1),(f[s.DRAG]||z[s.DRAG])&&(ue(Z,ae,z[s.DRAG]),f[s.DRAG]=!1)}s.prevViewport=L,s.clearingMotionBlur&&(s.clearingMotionBlur=!1,s.motionBlurCleared=!0,s.motionBlur=!0),p&&(s.motionBlurTimeout=setTimeout(function(){s.motionBlurTimeout=null,s.clearedForMotionBlur[s.NODE]=!1,s.clearedForMotionBlur[s.DRAG]=!1,s.motionBlur=!1,s.clearingMotionBlur=!d,s.mbFrames=0,f[s.NODE]=!0,f[s.DRAG]=!0,s.redraw()},dtt)),e||u.emit("render")};Nf={};Nf.drawPolygonPath=function(t,e,r,n,i,a){var s=n/2,l=i/2;t.beginPath&&t.beginPath(),t.moveTo(e+s*a[0],r+l*a[1]);for(var u=1;u<a.length/2;u++)t.lineTo(e+s*a[u*2],r+l*a[u*2+1]);t.closePath()};Nf.drawRoundPolygonPath=function(t,e,r,n,i,a,s){s.forEach(function(l){return o1e(t,l)}),t.closePath()};Nf.drawRoundRectanglePath=function(t,e,r,n,i,a){var s=n/2,l=i/2,u=a==="auto"?$0(n,i):Math.min(a,l,s);t.beginPath&&t.beginPath(),t.moveTo(e,r-l),t.arcTo(e+s,r-l,e+s,r,u),t.arcTo(e+s,r+l,e,r+l,u),t.arcTo(e-s,r+l,e-s,r,u),t.arcTo(e-s,r-l,e,r-l,u),t.lineTo(e,r-l),t.closePath()};Nf.drawBottomRoundRectanglePath=function(t,e,r,n,i,a){var s=n/2,l=i/2,u=a==="auto"?$0(n,i):a;t.beginPath&&t.beginPath(),t.moveTo(e,r-l),t.lineTo(e+s,r-l),t.lineTo(e+s,r),t.arcTo(e+s,r+l,e,r+l,u),t.arcTo(e-s,r+l,e-s,r,u),t.lineTo(e-s,r-l),t.lineTo(e,r-l),t.closePath()};Nf.drawCutRectanglePath=function(t,e,r,n,i,a,s){var l=n/2,u=i/2,h=s==="auto"?lB():s;t.beginPath&&t.beginPath(),t.moveTo(e-l+h,r-u),t.lineTo(e+l-h,r-u),t.lineTo(e+l,r-u+h),t.lineTo(e+l,r+u-h),t.lineTo(e+l-h,r+u),t.lineTo(e-l+h,r+u),t.lineTo(e-l,r+u-h),t.lineTo(e-l,r-u+h),t.closePath()};Nf.drawBarrelPath=function(t,e,r,n,i){var a=n/2,s=i/2,l=e-a,u=e+a,h=r-s,f=r+s,d=FP(n,i),p=d.widthOffset,m=d.heightOffset,g=d.ctrlPtOffsetPct*p;t.beginPath&&t.beginPath(),t.moveTo(l,h+m),t.lineTo(l,f-m),t.quadraticCurveTo(l+g,f,l+p,f),t.lineTo(u-p,f),t.quadraticCurveTo(u-g,f,u,f-m),t.lineTo(u,h+m),t.quadraticCurveTo(u-g,h,u-p,h),t.lineTo(l+p,h),t.quadraticCurveTo(l+g,h,l,h+m),t.closePath()};$me=Math.sin(0),Vme=Math.cos(0),KP={},QP={},b1e=Math.PI/40;for(R0=0*Math.PI;R0<2*Math.PI;R0+=b1e)KP[R0]=Math.sin(R0),QP[R0]=Math.cos(R0);Nf.drawEllipsePath=function(t,e,r,n,i){if(t.beginPath&&t.beginPath(),t.ellipse)t.ellipse(e,r,n/2,i/2,0,0,2*Math.PI);else for(var a,s,l=n/2,u=i/2,h=0*Math.PI;h<2*Math.PI;h+=b1e)a=e-l*KP[h]*$me+l*QP[h]*Vme,s=r+u*QP[h]*$me+u*KP[h]*Vme,h===0?t.moveTo(a,s):t.lineTo(a,s);t.closePath()};sb={};sb.createBuffer=function(t,e){var r=document.createElement("canvas");return r.width=t,r.height=e,[r,r.getContext("2d")]};sb.bufferCanvasImage=function(t){var e=this.cy,r=e.mutableElements(),n=r.boundingBox(),i=this.findContainerClientCoords(),a=t.full?Math.ceil(n.w):i[2],s=t.full?Math.ceil(n.h):i[3],l=xt(t.maxWidth)||xt(t.maxHeight),u=this.getPixelRatio(),h=1;if(t.scale!==void 0)a*=t.scale,s*=t.scale,h=t.scale;else if(l){var f=1/0,d=1/0;xt(t.maxWidth)&&(f=h*t.maxWidth/a),xt(t.maxHeight)&&(d=h*t.maxHeight/s),h=Math.min(f,d),a*=h,s*=h}l||(a*=u,s*=u,h*=u);var p=document.createElement("canvas");p.width=a,p.height=s,p.style.width=a+"px",p.style.height=s+"px";var m=p.getContext("2d");if(a>0&&s>0){m.clearRect(0,0,a,s),m.globalCompositeOperation="source-over";var g=this.getCachedZSortedEles();if(t.full)m.translate(-n.x1*h,-n.y1*h),m.scale(h,h),this.drawElements(m,g),m.scale(1/h,1/h),m.translate(n.x1*h,n.y1*h);else{var y=e.pan(),v={x:y.x*h,y:y.y*h};h*=e.zoom(),m.translate(v.x,v.y),m.scale(h,h),this.drawElements(m,g),m.scale(1/h,1/h),m.translate(-v.x,-v.y)}t.bg&&(m.globalCompositeOperation="destination-over",m.fillStyle=t.bg,m.rect(0,0,a,s),m.fill())}return p};o(ptt,"b64ToBlob");o(Ume,"b64UriToB64");o(w1e,"output");sb.png=function(t){return w1e(t,this.bufferCanvasImage(t),"image/png")};sb.jpg=function(t){return w1e(t,this.bufferCanvasImage(t),"image/jpeg")};T1e={};T1e.nodeShapeImpl=function(t,e,r,n,i,a,s,l){switch(t){case"ellipse":return this.drawEllipsePath(e,r,n,i,a);case"polygon":return this.drawPolygonPath(e,r,n,i,a,s);case"round-polygon":return this.drawRoundPolygonPath(e,r,n,i,a,s,l);case"roundrectangle":case"round-rectangle":return this.drawRoundRectanglePath(e,r,n,i,a,l);case"cutrectangle":case"cut-rectangle":return this.drawCutRectanglePath(e,r,n,i,a,s,l);case"bottomroundrectangle":case"bottom-round-rectangle":return this.drawBottomRoundRectanglePath(e,r,n,i,a,l);case"barrel":return this.drawBarrelPath(e,r,n,i,a)}};mtt=k1e,Kr=k1e.prototype;Kr.CANVAS_LAYERS=3;Kr.SELECT_BOX=0;Kr.DRAG=1;Kr.NODE=2;Kr.BUFFER_COUNT=3;Kr.TEXTURE_BUFFER=0;Kr.MOTIONBLUR_BUFFER_NODE=1;Kr.MOTIONBLUR_BUFFER_DRAG=2;o(k1e,"CanvasRenderer");Kr.redrawHint=function(t,e){var r=this;switch(t){case"eles":r.data.canvasNeedsRedraw[Kr.NODE]=e;break;case"drag":r.data.canvasNeedsRedraw[Kr.DRAG]=e;break;case"select":r.data.canvasNeedsRedraw[Kr.SELECT_BOX]=e;break}};gtt=typeof Path2D<"u";Kr.path2dEnabled=function(t){if(t===void 0)return this.pathsEnabled;this.pathsEnabled=!!t};Kr.usePaths=function(){return gtt&&this.pathsEnabled};Kr.setImgSmoothing=function(t,e){t.imageSmoothingEnabled!=null?t.imageSmoothingEnabled=e:(t.webkitImageSmoothingEnabled=e,t.mozImageSmoothingEnabled=e,t.msImageSmoothingEnabled=e)};Kr.getImgSmoothing=function(t){return t.imageSmoothingEnabled!=null?t.imageSmoothingEnabled:t.webkitImageSmoothingEnabled||t.mozImageSmoothingEnabled||t.msImageSmoothingEnabled};Kr.makeOffscreenCanvas=function(t,e){var r;if((typeof OffscreenCanvas>"u"?"undefined":Yi(OffscreenCanvas))!=="undefined")r=new OffscreenCanvas(t,e);else{var n=this.cy.window(),i=n.document;r=i.createElement("canvas"),r.width=t,r.height=e}return r};[y1e,Yc,Zu,TB,Y0,w1,mo,Nf,sb,T1e].forEach(function(t){ir(Kr,t)});ytt=[{name:"null",impl:i1e},{name:"base",impl:p1e},{name:"canvas",impl:mtt}],vtt=[{type:"layout",extensions:ket},{type:"renderer",extensions:ytt}],E1e={},S1e={};o(C1e,"setExtension");o(A1e,"getExtension");o(xtt,"setModule");o(btt,"getModule");ZP=o(function(){if(arguments.length===2)return A1e.apply(null,arguments);if(arguments.length===3)return C1e.apply(null,arguments);if(arguments.length===4)return btt.apply(null,arguments);if(arguments.length===5)return xtt.apply(null,arguments);hi("Invalid extension access syntax")},"extension");Qx.prototype.extension=ZP;vtt.forEach(function(t){t.extensions.forEach(function(e){C1e(t.type,e.name,e.impl)})});_1e=o(function t(){if(!(this instanceof t))return new t;this.length=0},"Stylesheet"),H0=_1e.prototype;H0.instanceString=function(){return"stylesheet"};H0.selector=function(t){var e=this.length++;return this[e]={selector:t,properties:[]},this};H0.css=function(t,e){var r=this.length-1;if(Zt(t))this[r].properties.push({name:t,value:e});else if(Vr(t))for(var n=t,i=Object.keys(n),a=0;a<i.length;a++){var s=i[a],l=n[s];if(l!=null){var u=Pa.properties[s]||Pa.properties[S6(s)];if(u!=null){var h=u.name,f=l;this[r].properties.push({name:h,value:f})}}}return this};H0.style=H0.css;H0.generateStyle=function(t){var e=new Pa(t);return this.appendToStyle(e)};H0.appendToStyle=function(t){for(var e=0;e<this.length;e++){var r=this[e],n=r.selector,i=r.properties;t.selector(n);for(var a=0;a<i.length;a++){var s=i[a];t.css(s.name,s.value)}}return t};wtt="3.30.2",sl=o(function(e){if(e===void 0&&(e={}),Vr(e))return new Qx(e);if(Zt(e))return ZP.apply(ZP,arguments)},"cytoscape");sl.use=function(t){var e=Array.prototype.slice.call(arguments,1);return e.unshift(sl),t.apply(null,e),this};sl.warnings=function(t){return oge(t)};sl.version=wtt;sl.stylesheet=sl.Stylesheet=_1e});var SB=Ni((ob,EB)=>{"use strict";o(function(e,r){typeof ob=="object"&&typeof EB=="object"?EB.exports=r():typeof define=="function"&&define.amd?define([],r):typeof ob=="object"?ob.layoutBase=r():e.layoutBase=r()},"webpackUniversalModuleDefinition")(ob,function(){return function(t){var e={};function r(n){if(e[n])return e[n].exports;var i=e[n]={i:n,l:!1,exports:{}};return t[n].call(i.exports,i,i.exports,r),i.l=!0,i.exports}return o(r,"__webpack_require__"),r.m=t,r.c=e,r.i=function(n){return n},r.d=function(n,i,a){r.o(n,i)||Object.defineProperty(n,i,{configurable:!1,enumerable:!0,get:a})},r.n=function(n){var i=n&&n.__esModule?o(function(){return n.default},"getDefault"):o(function(){return n},"getModuleExports");return r.d(i,"a",i),i},r.o=function(n,i){return Object.prototype.hasOwnProperty.call(n,i)},r.p="",r(r.s=26)}([function(t,e,r){"use strict";function n(){}o(n,"LayoutConstants"),n.QUALITY=1,n.DEFAULT_CREATE_BENDS_AS_NEEDED=!1,n.DEFAULT_INCREMENTAL=!1,n.DEFAULT_ANIMATION_ON_LAYOUT=!0,n.DEFAULT_ANIMATION_DURING_LAYOUT=!1,n.DEFAULT_ANIMATION_PERIOD=50,n.DEFAULT_UNIFORM_LEAF_NODE_SIZES=!1,n.DEFAULT_GRAPH_MARGIN=15,n.NODE_DIMENSIONS_INCLUDE_LABELS=!1,n.SIMPLE_NODE_SIZE=40,n.SIMPLE_NODE_HALF_SIZE=n.SIMPLE_NODE_SIZE/2,n.EMPTY_COMPOUND_NODE_SIZE=40,n.MIN_EDGE_LENGTH=1,n.WORLD_BOUNDARY=1e6,n.INITIAL_WORLD_BOUNDARY=n.WORLD_BOUNDARY/1e3,n.WORLD_CENTER_X=1200,n.WORLD_CENTER_Y=900,t.exports=n},function(t,e,r){"use strict";var n=r(2),i=r(8),a=r(9);function s(u,h,f){n.call(this,f),this.isOverlapingSourceAndTarget=!1,this.vGraphObject=f,this.bendpoints=[],this.source=u,this.target=h}o(s,"LEdge"),s.prototype=Object.create(n.prototype);for(var l in n)s[l]=n[l];s.prototype.getSource=function(){return this.source},s.prototype.getTarget=function(){return this.target},s.prototype.isInterGraph=function(){return this.isInterGraph},s.prototype.getLength=function(){return this.length},s.prototype.isOverlapingSourceAndTarget=function(){return this.isOverlapingSourceAndTarget},s.prototype.getBendpoints=function(){return this.bendpoints},s.prototype.getLca=function(){return this.lca},s.prototype.getSourceInLca=function(){return this.sourceInLca},s.prototype.getTargetInLca=function(){return this.targetInLca},s.prototype.getOtherEnd=function(u){if(this.source===u)return this.target;if(this.target===u)return this.source;throw"Node is not incident with this edge"},s.prototype.getOtherEndInGraph=function(u,h){for(var f=this.getOtherEnd(u),d=h.getGraphManager().getRoot();;){if(f.getOwner()==h)return f;if(f.getOwner()==d)break;f=f.getOwner().getParent()}return null},s.prototype.updateLength=function(){var u=new Array(4);this.isOverlapingSourceAndTarget=i.getIntersection(this.target.getRect(),this.source.getRect(),u),this.isOverlapingSourceAndTarget||(this.lengthX=u[0]-u[2],this.lengthY=u[1]-u[3],Math.abs(this.lengthX)<1&&(this.lengthX=a.sign(this.lengthX)),Math.abs(this.lengthY)<1&&(this.lengthY=a.sign(this.lengthY)),this.length=Math.sqrt(this.lengthX*this.lengthX+this.lengthY*this.lengthY))},s.prototype.updateLengthSimple=function(){this.lengthX=this.target.getCenterX()-this.source.getCenterX(),this.lengthY=this.target.getCenterY()-this.source.getCenterY(),Math.abs(this.lengthX)<1&&(this.lengthX=a.sign(this.lengthX)),Math.abs(this.lengthY)<1&&(this.lengthY=a.sign(this.lengthY)),this.length=Math.sqrt(this.lengthX*this.lengthX+this.lengthY*this.lengthY)},t.exports=s},function(t,e,r){"use strict";function n(i){this.vGraphObject=i}o(n,"LGraphObject"),t.exports=n},function(t,e,r){"use strict";var n=r(2),i=r(10),a=r(13),s=r(0),l=r(16),u=r(4);function h(d,p,m,g){m==null&&g==null&&(g=p),n.call(this,g),d.graphManager!=null&&(d=d.graphManager),this.estimatedSize=i.MIN_VALUE,this.inclusionTreeDepth=i.MAX_VALUE,this.vGraphObject=g,this.edges=[],this.graphManager=d,m!=null&&p!=null?this.rect=new a(p.x,p.y,m.width,m.height):this.rect=new a}o(h,"LNode"),h.prototype=Object.create(n.prototype);for(var f in n)h[f]=n[f];h.prototype.getEdges=function(){return this.edges},h.prototype.getChild=function(){return this.child},h.prototype.getOwner=function(){return this.owner},h.prototype.getWidth=function(){return this.rect.width},h.prototype.setWidth=function(d){this.rect.width=d},h.prototype.getHeight=function(){return this.rect.height},h.prototype.setHeight=function(d){this.rect.height=d},h.prototype.getCenterX=function(){return this.rect.x+this.rect.width/2},h.prototype.getCenterY=function(){return this.rect.y+this.rect.height/2},h.prototype.getCenter=function(){return new u(this.rect.x+this.rect.width/2,this.rect.y+this.rect.height/2)},h.prototype.getLocation=function(){return new u(this.rect.x,this.rect.y)},h.prototype.getRect=function(){return this.rect},h.prototype.getDiagonal=function(){return Math.sqrt(this.rect.width*this.rect.width+this.rect.height*this.rect.height)},h.prototype.getHalfTheDiagonal=function(){return Math.sqrt(this.rect.height*this.rect.height+this.rect.width*this.rect.width)/2},h.prototype.setRect=function(d,p){this.rect.x=d.x,this.rect.y=d.y,this.rect.width=p.width,this.rect.height=p.height},h.prototype.setCenter=function(d,p){this.rect.x=d-this.rect.width/2,this.rect.y=p-this.rect.height/2},h.prototype.setLocation=function(d,p){this.rect.x=d,this.rect.y=p},h.prototype.moveBy=function(d,p){this.rect.x+=d,this.rect.y+=p},h.prototype.getEdgeListToNode=function(d){var p=[],m,g=this;return g.edges.forEach(function(y){if(y.target==d){if(y.source!=g)throw"Incorrect edge source!";p.push(y)}}),p},h.prototype.getEdgesBetween=function(d){var p=[],m,g=this;return g.edges.forEach(function(y){if(!(y.source==g||y.target==g))throw"Incorrect edge source and/or target";(y.target==d||y.source==d)&&p.push(y)}),p},h.prototype.getNeighborsList=function(){var d=new Set,p=this;return p.edges.forEach(function(m){if(m.source==p)d.add(m.target);else{if(m.target!=p)throw"Incorrect incidency!";d.add(m.source)}}),d},h.prototype.withChildren=function(){var d=new Set,p,m;if(d.add(this),this.child!=null)for(var g=this.child.getNodes(),y=0;y<g.length;y++)p=g[y],m=p.withChildren(),m.forEach(function(v){d.add(v)});return d},h.prototype.getNoOfChildren=function(){var d=0,p;if(this.child==null)d=1;else for(var m=this.child.getNodes(),g=0;g<m.length;g++)p=m[g],d+=p.getNoOfChildren();return d==0&&(d=1),d},h.prototype.getEstimatedSize=function(){if(this.estimatedSize==i.MIN_VALUE)throw"assert failed";return this.estimatedSize},h.prototype.calcEstimatedSize=function(){return this.child==null?this.estimatedSize=(this.rect.width+this.rect.height)/2:(this.estimatedSize=this.child.calcEstimatedSize(),this.rect.width=this.estimatedSize,this.rect.height=this.estimatedSize,this.estimatedSize)},h.prototype.scatter=function(){var d,p,m=-s.INITIAL_WORLD_BOUNDARY,g=s.INITIAL_WORLD_BOUNDARY;d=s.WORLD_CENTER_X+l.nextDouble()*(g-m)+m;var y=-s.INITIAL_WORLD_BOUNDARY,v=s.INITIAL_WORLD_BOUNDARY;p=s.WORLD_CENTER_Y+l.nextDouble()*(v-y)+y,this.rect.x=d,this.rect.y=p},h.prototype.updateBounds=function(){if(this.getChild()==null)throw"assert failed";if(this.getChild().getNodes().length!=0){var d=this.getChild();if(d.updateBounds(!0),this.rect.x=d.getLeft(),this.rect.y=d.getTop(),this.setWidth(d.getRight()-d.getLeft()),this.setHeight(d.getBottom()-d.getTop()),s.NODE_DIMENSIONS_INCLUDE_LABELS){var p=d.getRight()-d.getLeft(),m=d.getBottom()-d.getTop();this.labelWidth>p&&(this.rect.x-=(this.labelWidth-p)/2,this.setWidth(this.labelWidth)),this.labelHeight>m&&(this.labelPos=="center"?this.rect.y-=(this.labelHeight-m)/2:this.labelPos=="top"&&(this.rect.y-=this.labelHeight-m),this.setHeight(this.labelHeight))}}},h.prototype.getInclusionTreeDepth=function(){if(this.inclusionTreeDepth==i.MAX_VALUE)throw"assert failed";return this.inclusionTreeDepth},h.prototype.transform=function(d){var p=this.rect.x;p>s.WORLD_BOUNDARY?p=s.WORLD_BOUNDARY:p<-s.WORLD_BOUNDARY&&(p=-s.WORLD_BOUNDARY);var m=this.rect.y;m>s.WORLD_BOUNDARY?m=s.WORLD_BOUNDARY:m<-s.WORLD_BOUNDARY&&(m=-s.WORLD_BOUNDARY);var g=new u(p,m),y=d.inverseTransformPoint(g);this.setLocation(y.x,y.y)},h.prototype.getLeft=function(){return this.rect.x},h.prototype.getRight=function(){return this.rect.x+this.rect.width},h.prototype.getTop=function(){return this.rect.y},h.prototype.getBottom=function(){return this.rect.y+this.rect.height},h.prototype.getParent=function(){return this.owner==null?null:this.owner.getParent()},t.exports=h},function(t,e,r){"use strict";function n(i,a){i==null&&a==null?(this.x=0,this.y=0):(this.x=i,this.y=a)}o(n,"PointD"),n.prototype.getX=function(){return this.x},n.prototype.getY=function(){return this.y},n.prototype.setX=function(i){this.x=i},n.prototype.setY=function(i){this.y=i},n.prototype.getDifference=function(i){return new DimensionD(this.x-i.x,this.y-i.y)},n.prototype.getCopy=function(){return new n(this.x,this.y)},n.prototype.translate=function(i){return this.x+=i.width,this.y+=i.height,this},t.exports=n},function(t,e,r){"use strict";var n=r(2),i=r(10),a=r(0),s=r(6),l=r(3),u=r(1),h=r(13),f=r(12),d=r(11);function p(g,y,v){n.call(this,v),this.estimatedSize=i.MIN_VALUE,this.margin=a.DEFAULT_GRAPH_MARGIN,this.edges=[],this.nodes=[],this.isConnected=!1,this.parent=g,y!=null&&y instanceof s?this.graphManager=y:y!=null&&y instanceof Layout&&(this.graphManager=y.graphManager)}o(p,"LGraph"),p.prototype=Object.create(n.prototype);for(var m in n)p[m]=n[m];p.prototype.getNodes=function(){return this.nodes},p.prototype.getEdges=function(){return this.edges},p.prototype.getGraphManager=function(){return this.graphManager},p.prototype.getParent=function(){return this.parent},p.prototype.getLeft=function(){return this.left},p.prototype.getRight=function(){return this.right},p.prototype.getTop=function(){return this.top},p.prototype.getBottom=function(){return this.bottom},p.prototype.isConnected=function(){return this.isConnected},p.prototype.add=function(g,y,v){if(y==null&&v==null){var x=g;if(this.graphManager==null)throw"Graph has no graph mgr!";if(this.getNodes().indexOf(x)>-1)throw"Node already in graph!";return x.owner=this,this.getNodes().push(x),x}else{var b=g;if(!(this.getNodes().indexOf(y)>-1&&this.getNodes().indexOf(v)>-1))throw"Source or target not in graph!";if(!(y.owner==v.owner&&y.owner==this))throw"Both owners must be this graph!";return y.owner!=v.owner?null:(b.source=y,b.target=v,b.isInterGraph=!1,this.getEdges().push(b),y.edges.push(b),v!=y&&v.edges.push(b),b)}},p.prototype.remove=function(g){var y=g;if(g instanceof l){if(y==null)throw"Node is null!";if(!(y.owner!=null&&y.owner==this))throw"Owner graph is invalid!";if(this.graphManager==null)throw"Owner graph manager is invalid!";for(var v=y.edges.slice(),x,b=v.length,w=0;w<b;w++)x=v[w],x.isInterGraph?this.graphManager.remove(x):x.source.owner.remove(x);var _=this.nodes.indexOf(y);if(_==-1)throw"Node not in owner node list!";this.nodes.splice(_,1)}else if(g instanceof u){var x=g;if(x==null)throw"Edge is null!";if(!(x.source!=null&&x.target!=null))throw"Source and/or target is null!";if(!(x.source.owner!=null&&x.target.owner!=null&&x.source.owner==this&&x.target.owner==this))throw"Source and/or target owner is invalid!";var T=x.source.edges.indexOf(x),E=x.target.edges.indexOf(x);if(!(T>-1&&E>-1))throw"Source and/or target doesn't know this edge!";x.source.edges.splice(T,1),x.target!=x.source&&x.target.edges.splice(E,1);var _=x.source.owner.getEdges().indexOf(x);if(_==-1)throw"Not in owner's edge list!";x.source.owner.getEdges().splice(_,1)}},p.prototype.updateLeftTop=function(){for(var g=i.MAX_VALUE,y=i.MAX_VALUE,v,x,b,w=this.getNodes(),_=w.length,T=0;T<_;T++){var E=w[T];v=E.getTop(),x=E.getLeft(),g>v&&(g=v),y>x&&(y=x)}return g==i.MAX_VALUE?null:(w[0].getParent().paddingLeft!=null?b=w[0].getParent().paddingLeft:b=this.margin,this.left=y-b,this.top=g-b,new f(this.left,this.top))},p.prototype.updateBounds=function(g){for(var y=i.MAX_VALUE,v=-i.MAX_VALUE,x=i.MAX_VALUE,b=-i.MAX_VALUE,w,_,T,E,L,C=this.nodes,A=C.length,I=0;I<A;I++){var D=C[I];g&&D.child!=null&&D.updateBounds(),w=D.getLeft(),_=D.getRight(),T=D.getTop(),E=D.getBottom(),y>w&&(y=w),v<_&&(v=_),x>T&&(x=T),b<E&&(b=E)}var k=new h(y,x,v-y,b-x);y==i.MAX_VALUE&&(this.left=this.parent.getLeft(),this.right=this.parent.getRight(),this.top=this.parent.getTop(),this.bottom=this.parent.getBottom()),C[0].getParent().paddingLeft!=null?L=C[0].getParent().paddingLeft:L=this.margin,this.left=k.x-L,this.right=k.x+k.width+L,this.top=k.y-L,this.bottom=k.y+k.height+L},p.calculateBounds=function(g){for(var y=i.MAX_VALUE,v=-i.MAX_VALUE,x=i.MAX_VALUE,b=-i.MAX_VALUE,w,_,T,E,L=g.length,C=0;C<L;C++){var A=g[C];w=A.getLeft(),_=A.getRight(),T=A.getTop(),E=A.getBottom(),y>w&&(y=w),v<_&&(v=_),x>T&&(x=T),b<E&&(b=E)}var I=new h(y,x,v-y,b-x);return I},p.prototype.getInclusionTreeDepth=function(){return this==this.graphManager.getRoot()?1:this.parent.getInclusionTreeDepth()},p.prototype.getEstimatedSize=function(){if(this.estimatedSize==i.MIN_VALUE)throw"assert failed";return this.estimatedSize},p.prototype.calcEstimatedSize=function(){for(var g=0,y=this.nodes,v=y.length,x=0;x<v;x++){var b=y[x];g+=b.calcEstimatedSize()}return g==0?this.estimatedSize=a.EMPTY_COMPOUND_NODE_SIZE:this.estimatedSize=g/Math.sqrt(this.nodes.length),this.estimatedSize},p.prototype.updateConnected=function(){var g=this;if(this.nodes.length==0){this.isConnected=!0;return}var y=new d,v=new Set,x=this.nodes[0],b,w,_=x.withChildren();for(_.forEach(function(I){y.push(I),v.add(I)});y.length!==0;){x=y.shift(),b=x.getEdges();for(var T=b.length,E=0;E<T;E++){var L=b[E];if(w=L.getOtherEndInGraph(x,this),w!=null&&!v.has(w)){var C=w.withChildren();C.forEach(function(I){y.push(I),v.add(I)})}}}if(this.isConnected=!1,v.size>=this.nodes.length){var A=0;v.forEach(function(I){I.owner==g&&A++}),A==this.nodes.length&&(this.isConnected=!0)}},t.exports=p},function(t,e,r){"use strict";var n,i=r(1);function a(s){n=r(5),this.layout=s,this.graphs=[],this.edges=[]}o(a,"LGraphManager"),a.prototype.addRoot=function(){var s=this.layout.newGraph(),l=this.layout.newNode(null),u=this.add(s,l);return this.setRootGraph(u),this.rootGraph},a.prototype.add=function(s,l,u,h,f){if(u==null&&h==null&&f==null){if(s==null)throw"Graph is null!";if(l==null)throw"Parent node is null!";if(this.graphs.indexOf(s)>-1)throw"Graph already in this graph mgr!";if(this.graphs.push(s),s.parent!=null)throw"Already has a parent!";if(l.child!=null)throw"Already has a child!";return s.parent=l,l.child=s,s}else{f=u,h=l,u=s;var d=h.getOwner(),p=f.getOwner();if(!(d!=null&&d.getGraphManager()==this))throw"Source not in this graph mgr!";if(!(p!=null&&p.getGraphManager()==this))throw"Target not in this graph mgr!";if(d==p)return u.isInterGraph=!1,d.add(u,h,f);if(u.isInterGraph=!0,u.source=h,u.target=f,this.edges.indexOf(u)>-1)throw"Edge already in inter-graph edge list!";if(this.edges.push(u),!(u.source!=null&&u.target!=null))throw"Edge source and/or target is null!";if(!(u.source.edges.indexOf(u)==-1&&u.target.edges.indexOf(u)==-1))throw"Edge already in source and/or target incidency list!";return u.source.edges.push(u),u.target.edges.push(u),u}},a.prototype.remove=function(s){if(s instanceof n){var l=s;if(l.getGraphManager()!=this)throw"Graph not in this graph mgr";if(!(l==this.rootGraph||l.parent!=null&&l.parent.graphManager==this))throw"Invalid parent node!";var u=[];u=u.concat(l.getEdges());for(var h,f=u.length,d=0;d<f;d++)h=u[d],l.remove(h);var p=[];p=p.concat(l.getNodes());var m;f=p.length;for(var d=0;d<f;d++)m=p[d],l.remove(m);l==this.rootGraph&&this.setRootGraph(null);var g=this.graphs.indexOf(l);this.graphs.splice(g,1),l.parent=null}else if(s instanceof i){if(h=s,h==null)throw"Edge is null!";if(!h.isInterGraph)throw"Not an inter-graph edge!";if(!(h.source!=null&&h.target!=null))throw"Source and/or target is null!";if(!(h.source.edges.indexOf(h)!=-1&&h.target.edges.indexOf(h)!=-1))throw"Source and/or target doesn't know this edge!";var g=h.source.edges.indexOf(h);if(h.source.edges.splice(g,1),g=h.target.edges.indexOf(h),h.target.edges.splice(g,1),!(h.source.owner!=null&&h.source.owner.getGraphManager()!=null))throw"Edge owner graph or owner graph manager is null!";if(h.source.owner.getGraphManager().edges.indexOf(h)==-1)throw"Not in owner graph manager's edge list!";var g=h.source.owner.getGraphManager().edges.indexOf(h);h.source.owner.getGraphManager().edges.splice(g,1)}},a.prototype.updateBounds=function(){this.rootGraph.updateBounds(!0)},a.prototype.getGraphs=function(){return this.graphs},a.prototype.getAllNodes=function(){if(this.allNodes==null){for(var s=[],l=this.getGraphs(),u=l.length,h=0;h<u;h++)s=s.concat(l[h].getNodes());this.allNodes=s}return this.allNodes},a.prototype.resetAllNodes=function(){this.allNodes=null},a.prototype.resetAllEdges=function(){this.allEdges=null},a.prototype.resetAllNodesToApplyGravitation=function(){this.allNodesToApplyGravitation=null},a.prototype.getAllEdges=function(){if(this.allEdges==null){for(var s=[],l=this.getGraphs(),u=l.length,h=0;h<l.length;h++)s=s.concat(l[h].getEdges());s=s.concat(this.edges),this.allEdges=s}return this.allEdges},a.prototype.getAllNodesToApplyGravitation=function(){return this.allNodesToApplyGravitation},a.prototype.setAllNodesToApplyGravitation=function(s){if(this.allNodesToApplyGravitation!=null)throw"assert failed";this.allNodesToApplyGravitation=s},a.prototype.getRoot=function(){return this.rootGraph},a.prototype.setRootGraph=function(s){if(s.getGraphManager()!=this)throw"Root not in this graph mgr!";this.rootGraph=s,s.parent==null&&(s.parent=this.layout.newNode("Root node"))},a.prototype.getLayout=function(){return this.layout},a.prototype.isOneAncestorOfOther=function(s,l){if(!(s!=null&&l!=null))throw"assert failed";if(s==l)return!0;var u=s.getOwner(),h;do{if(h=u.getParent(),h==null)break;if(h==l)return!0;if(u=h.getOwner(),u==null)break}while(!0);u=l.getOwner();do{if(h=u.getParent(),h==null)break;if(h==s)return!0;if(u=h.getOwner(),u==null)break}while(!0);return!1},a.prototype.calcLowestCommonAncestors=function(){for(var s,l,u,h,f,d=this.getAllEdges(),p=d.length,m=0;m<p;m++){if(s=d[m],l=s.source,u=s.target,s.lca=null,s.sourceInLca=l,s.targetInLca=u,l==u){s.lca=l.getOwner();continue}for(h=l.getOwner();s.lca==null;){for(s.targetInLca=u,f=u.getOwner();s.lca==null;){if(f==h){s.lca=f;break}if(f==this.rootGraph)break;if(s.lca!=null)throw"assert failed";s.targetInLca=f.getParent(),f=s.targetInLca.getOwner()}if(h==this.rootGraph)break;s.lca==null&&(s.sourceInLca=h.getParent(),h=s.sourceInLca.getOwner())}if(s.lca==null)throw"assert failed"}},a.prototype.calcLowestCommonAncestor=function(s,l){if(s==l)return s.getOwner();var u=s.getOwner();do{if(u==null)break;var h=l.getOwner();do{if(h==null)break;if(h==u)return h;h=h.getParent().getOwner()}while(!0);u=u.getParent().getOwner()}while(!0);return u},a.prototype.calcInclusionTreeDepths=function(s,l){s==null&&l==null&&(s=this.rootGraph,l=1);for(var u,h=s.getNodes(),f=h.length,d=0;d<f;d++)u=h[d],u.inclusionTreeDepth=l,u.child!=null&&this.calcInclusionTreeDepths(u.child,l+1)},a.prototype.includesInvalidEdge=function(){for(var s,l=this.edges.length,u=0;u<l;u++)if(s=this.edges[u],this.isOneAncestorOfOther(s.source,s.target))return!0;return!1},t.exports=a},function(t,e,r){"use strict";var n=r(0);function i(){}o(i,"FDLayoutConstants");for(var a in n)i[a]=n[a];i.MAX_ITERATIONS=2500,i.DEFAULT_EDGE_LENGTH=50,i.DEFAULT_SPRING_STRENGTH=.45,i.DEFAULT_REPULSION_STRENGTH=4500,i.DEFAULT_GRAVITY_STRENGTH=.4,i.DEFAULT_COMPOUND_GRAVITY_STRENGTH=1,i.DEFAULT_GRAVITY_RANGE_FACTOR=3.8,i.DEFAULT_COMPOUND_GRAVITY_RANGE_FACTOR=1.5,i.DEFAULT_USE_SMART_IDEAL_EDGE_LENGTH_CALCULATION=!0,i.DEFAULT_USE_SMART_REPULSION_RANGE_CALCULATION=!0,i.DEFAULT_COOLING_FACTOR_INCREMENTAL=.3,i.COOLING_ADAPTATION_FACTOR=.33,i.ADAPTATION_LOWER_NODE_LIMIT=1e3,i.ADAPTATION_UPPER_NODE_LIMIT=5e3,i.MAX_NODE_DISPLACEMENT_INCREMENTAL=100,i.MAX_NODE_DISPLACEMENT=i.MAX_NODE_DISPLACEMENT_INCREMENTAL*3,i.MIN_REPULSION_DIST=i.DEFAULT_EDGE_LENGTH/10,i.CONVERGENCE_CHECK_PERIOD=100,i.PER_LEVEL_IDEAL_EDGE_LENGTH_FACTOR=.1,i.MIN_EDGE_LENGTH=1,i.GRID_CALCULATION_CHECK_PERIOD=10,t.exports=i},function(t,e,r){"use strict";var n=r(12);function i(){}o(i,"IGeometry"),i.calcSeparationAmount=function(a,s,l,u){if(!a.intersects(s))throw"assert failed";var h=new Array(2);this.decideDirectionsForOverlappingNodes(a,s,h),l[0]=Math.min(a.getRight(),s.getRight())-Math.max(a.x,s.x),l[1]=Math.min(a.getBottom(),s.getBottom())-Math.max(a.y,s.y),a.getX()<=s.getX()&&a.getRight()>=s.getRight()?l[0]+=Math.min(s.getX()-a.getX(),a.getRight()-s.getRight()):s.getX()<=a.getX()&&s.getRight()>=a.getRight()&&(l[0]+=Math.min(a.getX()-s.getX(),s.getRight()-a.getRight())),a.getY()<=s.getY()&&a.getBottom()>=s.getBottom()?l[1]+=Math.min(s.getY()-a.getY(),a.getBottom()-s.getBottom()):s.getY()<=a.getY()&&s.getBottom()>=a.getBottom()&&(l[1]+=Math.min(a.getY()-s.getY(),s.getBottom()-a.getBottom()));var f=Math.abs((s.getCenterY()-a.getCenterY())/(s.getCenterX()-a.getCenterX()));s.getCenterY()===a.getCenterY()&&s.getCenterX()===a.getCenterX()&&(f=1);var d=f*l[0],p=l[1]/f;l[0]<p?p=l[0]:d=l[1],l[0]=-1*h[0]*(p/2+u),l[1]=-1*h[1]*(d/2+u)},i.decideDirectionsForOverlappingNodes=function(a,s,l){a.getCenterX()<s.getCenterX()?l[0]=-1:l[0]=1,a.getCenterY()<s.getCenterY()?l[1]=-1:l[1]=1},i.getIntersection2=function(a,s,l){var u=a.getCenterX(),h=a.getCenterY(),f=s.getCenterX(),d=s.getCenterY();if(a.intersects(s))return l[0]=u,l[1]=h,l[2]=f,l[3]=d,!0;var p=a.getX(),m=a.getY(),g=a.getRight(),y=a.getX(),v=a.getBottom(),x=a.getRight(),b=a.getWidthHalf(),w=a.getHeightHalf(),_=s.getX(),T=s.getY(),E=s.getRight(),L=s.getX(),C=s.getBottom(),A=s.getRight(),I=s.getWidthHalf(),D=s.getHeightHalf(),k=!1,R=!1;if(u===f){if(h>d)return l[0]=u,l[1]=m,l[2]=f,l[3]=C,!1;if(h<d)return l[0]=u,l[1]=v,l[2]=f,l[3]=T,!1}else if(h===d){if(u>f)return l[0]=p,l[1]=h,l[2]=E,l[3]=d,!1;if(u<f)return l[0]=g,l[1]=h,l[2]=_,l[3]=d,!1}else{var S=a.height/a.width,O=s.height/s.width,N=(d-h)/(f-u),P=void 0,F=void 0,B=void 0,$=void 0,z=void 0,W=void 0;if(-S===N?u>f?(l[0]=y,l[1]=v,k=!0):(l[0]=g,l[1]=m,k=!0):S===N&&(u>f?(l[0]=p,l[1]=m,k=!0):(l[0]=x,l[1]=v,k=!0)),-O===N?f>u?(l[2]=L,l[3]=C,R=!0):(l[2]=E,l[3]=T,R=!0):O===N&&(f>u?(l[2]=_,l[3]=T,R=!0):(l[2]=A,l[3]=C,R=!0)),k&&R)return!1;if(u>f?h>d?(P=this.getCardinalDirection(S,N,4),F=this.getCardinalDirection(O,N,2)):(P=this.getCardinalDirection(-S,N,3),F=this.getCardinalDirection(-O,N,1)):h>d?(P=this.getCardinalDirection(-S,N,1),F=this.getCardinalDirection(-O,N,3)):(P=this.getCardinalDirection(S,N,2),F=this.getCardinalDirection(O,N,4)),!k)switch(P){case 1:$=m,B=u+-w/N,l[0]=B,l[1]=$;break;case 2:B=x,$=h+b*N,l[0]=B,l[1]=$;break;case 3:$=v,B=u+w/N,l[0]=B,l[1]=$;break;case 4:B=y,$=h+-b*N,l[0]=B,l[1]=$;break}if(!R)switch(F){case 1:W=T,z=f+-D/N,l[2]=z,l[3]=W;break;case 2:z=A,W=d+I*N,l[2]=z,l[3]=W;break;case 3:W=C,z=f+D/N,l[2]=z,l[3]=W;break;case 4:z=L,W=d+-I*N,l[2]=z,l[3]=W;break}}return!1},i.getCardinalDirection=function(a,s,l){return a>s?l:1+l%4},i.getIntersection=function(a,s,l,u){if(u==null)return this.getIntersection2(a,s,l);var h=a.x,f=a.y,d=s.x,p=s.y,m=l.x,g=l.y,y=u.x,v=u.y,x=void 0,b=void 0,w=void 0,_=void 0,T=void 0,E=void 0,L=void 0,C=void 0,A=void 0;return w=p-f,T=h-d,L=d*f-h*p,_=v-g,E=m-y,C=y*g-m*v,A=w*E-_*T,A===0?null:(x=(T*C-E*L)/A,b=(_*L-w*C)/A,new n(x,b))},i.angleOfVector=function(a,s,l,u){var h=void 0;return a!==l?(h=Math.atan((u-s)/(l-a)),l<a?h+=Math.PI:u<s&&(h+=this.TWO_PI)):u<s?h=this.ONE_AND_HALF_PI:h=this.HALF_PI,h},i.doIntersect=function(a,s,l,u){var h=a.x,f=a.y,d=s.x,p=s.y,m=l.x,g=l.y,y=u.x,v=u.y,x=(d-h)*(v-g)-(y-m)*(p-f);if(x===0)return!1;var b=((v-g)*(y-h)+(m-y)*(v-f))/x,w=((f-p)*(y-h)+(d-h)*(v-f))/x;return 0<b&&b<1&&0<w&&w<1},i.HALF_PI=.5*Math.PI,i.ONE_AND_HALF_PI=1.5*Math.PI,i.TWO_PI=2*Math.PI,i.THREE_PI=3*Math.PI,t.exports=i},function(t,e,r){"use strict";function n(){}o(n,"IMath"),n.sign=function(i){return i>0?1:i<0?-1:0},n.floor=function(i){return i<0?Math.ceil(i):Math.floor(i)},n.ceil=function(i){return i<0?Math.floor(i):Math.ceil(i)},t.exports=n},function(t,e,r){"use strict";function n(){}o(n,"Integer"),n.MAX_VALUE=2147483647,n.MIN_VALUE=-2147483648,t.exports=n},function(t,e,r){"use strict";var n=function(){function h(f,d){for(var p=0;p<d.length;p++){var m=d[p];m.enumerable=m.enumerable||!1,m.configurable=!0,"value"in m&&(m.writable=!0),Object.defineProperty(f,m.key,m)}}return o(h,"defineProperties"),function(f,d,p){return d&&h(f.prototype,d),p&&h(f,p),f}}();function i(h,f){if(!(h instanceof f))throw new TypeError("Cannot call a class as a function")}o(i,"_classCallCheck");var a=o(function(f){return{value:f,next:null,prev:null}},"nodeFrom"),s=o(function(f,d,p,m){return f!==null?f.next=d:m.head=d,p!==null?p.prev=d:m.tail=d,d.prev=f,d.next=p,m.length++,d},"add"),l=o(function(f,d){var p=f.prev,m=f.next;return p!==null?p.next=m:d.head=m,m!==null?m.prev=p:d.tail=p,f.prev=f.next=null,d.length--,f},"_remove"),u=function(){function h(f){var d=this;i(this,h),this.length=0,this.head=null,this.tail=null,f?.forEach(function(p){return d.push(p)})}return o(h,"LinkedList"),n(h,[{key:"size",value:o(function(){return this.length},"size")},{key:"insertBefore",value:o(function(d,p){return s(p.prev,a(d),p,this)},"insertBefore")},{key:"insertAfter",value:o(function(d,p){return s(p,a(d),p.next,this)},"insertAfter")},{key:"insertNodeBefore",value:o(function(d,p){return s(p.prev,d,p,this)},"insertNodeBefore")},{key:"insertNodeAfter",value:o(function(d,p){return s(p,d,p.next,this)},"insertNodeAfter")},{key:"push",value:o(function(d){return s(this.tail,a(d),null,this)},"push")},{key:"unshift",value:o(function(d){return s(null,a(d),this.head,this)},"unshift")},{key:"remove",value:o(function(d){return l(d,this)},"remove")},{key:"pop",value:o(function(){return l(this.tail,this).value},"pop")},{key:"popNode",value:o(function(){return l(this.tail,this)},"popNode")},{key:"shift",value:o(function(){return l(this.head,this).value},"shift")},{key:"shiftNode",value:o(function(){return l(this.head,this)},"shiftNode")},{key:"get_object_at",value:o(function(d){if(d<=this.length()){for(var p=1,m=this.head;p<d;)m=m.next,p++;return m.value}},"get_object_at")},{key:"set_object_at",value:o(function(d,p){if(d<=this.length()){for(var m=1,g=this.head;m<d;)g=g.next,m++;g.value=p}},"set_object_at")}]),h}();t.exports=u},function(t,e,r){"use strict";function n(i,a,s){this.x=null,this.y=null,i==null&&a==null&&s==null?(this.x=0,this.y=0):typeof i=="number"&&typeof a=="number"&&s==null?(this.x=i,this.y=a):i.constructor.name=="Point"&&a==null&&s==null&&(s=i,this.x=s.x,this.y=s.y)}o(n,"Point"),n.prototype.getX=function(){return this.x},n.prototype.getY=function(){return this.y},n.prototype.getLocation=function(){return new n(this.x,this.y)},n.prototype.setLocation=function(i,a,s){i.constructor.name=="Point"&&a==null&&s==null?(s=i,this.setLocation(s.x,s.y)):typeof i=="number"&&typeof a=="number"&&s==null&&(parseInt(i)==i&&parseInt(a)==a?this.move(i,a):(this.x=Math.floor(i+.5),this.y=Math.floor(a+.5)))},n.prototype.move=function(i,a){this.x=i,this.y=a},n.prototype.translate=function(i,a){this.x+=i,this.y+=a},n.prototype.equals=function(i){if(i.constructor.name=="Point"){var a=i;return this.x==a.x&&this.y==a.y}return this==i},n.prototype.toString=function(){return new n().constructor.name+"[x="+this.x+",y="+this.y+"]"},t.exports=n},function(t,e,r){"use strict";function n(i,a,s,l){this.x=0,this.y=0,this.width=0,this.height=0,i!=null&&a!=null&&s!=null&&l!=null&&(this.x=i,this.y=a,this.width=s,this.height=l)}o(n,"RectangleD"),n.prototype.getX=function(){return this.x},n.prototype.setX=function(i){this.x=i},n.prototype.getY=function(){return this.y},n.prototype.setY=function(i){this.y=i},n.prototype.getWidth=function(){return this.width},n.prototype.setWidth=function(i){this.width=i},n.prototype.getHeight=function(){return this.height},n.prototype.setHeight=function(i){this.height=i},n.prototype.getRight=function(){return this.x+this.width},n.prototype.getBottom=function(){return this.y+this.height},n.prototype.intersects=function(i){return!(this.getRight()<i.x||this.getBottom()<i.y||i.getRight()<this.x||i.getBottom()<this.y)},n.prototype.getCenterX=function(){return this.x+this.width/2},n.prototype.getMinX=function(){return this.getX()},n.prototype.getMaxX=function(){return this.getX()+this.width},n.prototype.getCenterY=function(){return this.y+this.height/2},n.prototype.getMinY=function(){return this.getY()},n.prototype.getMaxY=function(){return this.getY()+this.height},n.prototype.getWidthHalf=function(){return this.width/2},n.prototype.getHeightHalf=function(){return this.height/2},t.exports=n},function(t,e,r){"use strict";var n=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(a){return typeof a}:function(a){return a&&typeof Symbol=="function"&&a.constructor===Symbol&&a!==Symbol.prototype?"symbol":typeof a};function i(){}o(i,"UniqueIDGeneretor"),i.lastID=0,i.createID=function(a){return i.isPrimitive(a)?a:(a.uniqueID!=null||(a.uniqueID=i.getString(),i.lastID++),a.uniqueID)},i.getString=function(a){return a==null&&(a=i.lastID),"Object#"+a},i.isPrimitive=function(a){var s=typeof a>"u"?"undefined":n(a);return a==null||s!="object"&&s!="function"},t.exports=i},function(t,e,r){"use strict";function n(m){if(Array.isArray(m)){for(var g=0,y=Array(m.length);g<m.length;g++)y[g]=m[g];return y}else return Array.from(m)}o(n,"_toConsumableArray");var i=r(0),a=r(6),s=r(3),l=r(1),u=r(5),h=r(4),f=r(17),d=r(27);function p(m){d.call(this),this.layoutQuality=i.QUALITY,this.createBendsAsNeeded=i.DEFAULT_CREATE_BENDS_AS_NEEDED,this.incremental=i.DEFAULT_INCREMENTAL,this.animationOnLayout=i.DEFAULT_ANIMATION_ON_LAYOUT,this.animationDuringLayout=i.DEFAULT_ANIMATION_DURING_LAYOUT,this.animationPeriod=i.DEFAULT_ANIMATION_PERIOD,this.uniformLeafNodeSizes=i.DEFAULT_UNIFORM_LEAF_NODE_SIZES,this.edgeToDummyNodes=new Map,this.graphManager=new a(this),this.isLayoutFinished=!1,this.isSubLayout=!1,this.isRemoteUse=!1,m!=null&&(this.isRemoteUse=m)}o(p,"Layout"),p.RANDOM_SEED=1,p.prototype=Object.create(d.prototype),p.prototype.getGraphManager=function(){return this.graphManager},p.prototype.getAllNodes=function(){return this.graphManager.getAllNodes()},p.prototype.getAllEdges=function(){return this.graphManager.getAllEdges()},p.prototype.getAllNodesToApplyGravitation=function(){return this.graphManager.getAllNodesToApplyGravitation()},p.prototype.newGraphManager=function(){var m=new a(this);return this.graphManager=m,m},p.prototype.newGraph=function(m){return new u(null,this.graphManager,m)},p.prototype.newNode=function(m){return new s(this.graphManager,m)},p.prototype.newEdge=function(m){return new l(null,null,m)},p.prototype.checkLayoutSuccess=function(){return this.graphManager.getRoot()==null||this.graphManager.getRoot().getNodes().length==0||this.graphManager.includesInvalidEdge()},p.prototype.runLayout=function(){this.isLayoutFinished=!1,this.tilingPreLayout&&this.tilingPreLayout(),this.initParameters();var m;return this.checkLayoutSuccess()?m=!1:m=this.layout(),i.ANIMATE==="during"?!1:(m&&(this.isSubLayout||this.doPostLayout()),this.tilingPostLayout&&this.tilingPostLayout(),this.isLayoutFinished=!0,m)},p.prototype.doPostLayout=function(){this.incremental||this.transform(),this.update()},p.prototype.update2=function(){if(this.createBendsAsNeeded&&(this.createBendpointsFromDummyNodes(),this.graphManager.resetAllEdges()),!this.isRemoteUse){for(var m,g=this.graphManager.getAllEdges(),y=0;y<g.length;y++)m=g[y];for(var v,x=this.graphManager.getRoot().getNodes(),y=0;y<x.length;y++)v=x[y];this.update(this.graphManager.getRoot())}},p.prototype.update=function(m){if(m==null)this.update2();else if(m instanceof s){var g=m;if(g.getChild()!=null)for(var y=g.getChild().getNodes(),v=0;v<y.length;v++)update(y[v]);if(g.vGraphObject!=null){var x=g.vGraphObject;x.update(g)}}else if(m instanceof l){var b=m;if(b.vGraphObject!=null){var w=b.vGraphObject;w.update(b)}}else if(m instanceof u){var _=m;if(_.vGraphObject!=null){var T=_.vGraphObject;T.update(_)}}},p.prototype.initParameters=function(){this.isSubLayout||(this.layoutQuality=i.QUALITY,this.animationDuringLayout=i.DEFAULT_ANIMATION_DURING_LAYOUT,this.animationPeriod=i.DEFAULT_ANIMATION_PERIOD,this.animationOnLayout=i.DEFAULT_ANIMATION_ON_LAYOUT,this.incremental=i.DEFAULT_INCREMENTAL,this.createBendsAsNeeded=i.DEFAULT_CREATE_BENDS_AS_NEEDED,this.uniformLeafNodeSizes=i.DEFAULT_UNIFORM_LEAF_NODE_SIZES),this.animationDuringLayout&&(this.animationOnLayout=!1)},p.prototype.transform=function(m){if(m==null)this.transform(new h(0,0));else{var g=new f,y=this.graphManager.getRoot().updateLeftTop();if(y!=null){g.setWorldOrgX(m.x),g.setWorldOrgY(m.y),g.setDeviceOrgX(y.x),g.setDeviceOrgY(y.y);for(var v=this.getAllNodes(),x,b=0;b<v.length;b++)x=v[b],x.transform(g)}}},p.prototype.positionNodesRandomly=function(m){if(m==null)this.positionNodesRandomly(this.getGraphManager().getRoot()),this.getGraphManager().getRoot().updateBounds(!0);else for(var g,y,v=m.getNodes(),x=0;x<v.length;x++)g=v[x],y=g.getChild(),y==null||y.getNodes().length==0?g.scatter():(this.positionNodesRandomly(y),g.updateBounds())},p.prototype.getFlatForest=function(){for(var m=[],g=!0,y=this.graphManager.getRoot().getNodes(),v=!0,x=0;x<y.length;x++)y[x].getChild()!=null&&(v=!1);if(!v)return m;var b=new Set,w=[],_=new Map,T=[];for(T=T.concat(y);T.length>0&&g;){for(w.push(T[0]);w.length>0&&g;){var E=w[0];w.splice(0,1),b.add(E);for(var L=E.getEdges(),x=0;x<L.length;x++){var C=L[x].getOtherEnd(E);if(_.get(E)!=C)if(!b.has(C))w.push(C),_.set(C,E);else{g=!1;break}}}if(!g)m=[];else{var A=[].concat(n(b));m.push(A);for(var x=0;x<A.length;x++){var I=A[x],D=T.indexOf(I);D>-1&&T.splice(D,1)}b=new Set,_=new Map}}return m},p.prototype.createDummyNodesForBendpoints=function(m){for(var g=[],y=m.source,v=this.graphManager.calcLowestCommonAncestor(m.source,m.target),x=0;x<m.bendpoints.length;x++){var b=this.newNode(null);b.setRect(new Point(0,0),new Dimension(1,1)),v.add(b);var w=this.newEdge(null);this.graphManager.add(w,y,b),g.add(b),y=b}var w=this.newEdge(null);return this.graphManager.add(w,y,m.target),this.edgeToDummyNodes.set(m,g),m.isInterGraph()?this.graphManager.remove(m):v.remove(m),g},p.prototype.createBendpointsFromDummyNodes=function(){var m=[];m=m.concat(this.graphManager.getAllEdges()),m=[].concat(n(this.edgeToDummyNodes.keys())).concat(m);for(var g=0;g<m.length;g++){var y=m[g];if(y.bendpoints.length>0){for(var v=this.edgeToDummyNodes.get(y),x=0;x<v.length;x++){var b=v[x],w=new h(b.getCenterX(),b.getCenterY()),_=y.bendpoints.get(x);_.x=w.x,_.y=w.y,b.getOwner().remove(b)}this.graphManager.add(y,y.source,y.target)}}},p.transform=function(m,g,y,v){if(y!=null&&v!=null){var x=g;if(m<=50){var b=g/y;x-=(g-b)/50*(50-m)}else{var w=g*v;x+=(w-g)/50*(m-50)}return x}else{var _,T;return m<=50?(_=9*g/500,T=g/10):(_=9*g/50,T=-8*g),_*m+T}},p.findCenterOfTree=function(m){var g=[];g=g.concat(m);var y=[],v=new Map,x=!1,b=null;(g.length==1||g.length==2)&&(x=!0,b=g[0]);for(var w=0;w<g.length;w++){var _=g[w],T=_.getNeighborsList().size;v.set(_,_.getNeighborsList().size),T==1&&y.push(_)}var E=[];for(E=E.concat(y);!x;){var L=[];L=L.concat(E),E=[];for(var w=0;w<g.length;w++){var _=g[w],C=g.indexOf(_);C>=0&&g.splice(C,1);var A=_.getNeighborsList();A.forEach(function(k){if(y.indexOf(k)<0){var R=v.get(k),S=R-1;S==1&&E.push(k),v.set(k,S)}})}y=y.concat(E),(g.length==1||g.length==2)&&(x=!0,b=g[0])}return b},p.prototype.setGraphManager=function(m){this.graphManager=m},t.exports=p},function(t,e,r){"use strict";function n(){}o(n,"RandomSeed"),n.seed=1,n.x=0,n.nextDouble=function(){return n.x=Math.sin(n.seed++)*1e4,n.x-Math.floor(n.x)},t.exports=n},function(t,e,r){"use strict";var n=r(4);function i(a,s){this.lworldOrgX=0,this.lworldOrgY=0,this.ldeviceOrgX=0,this.ldeviceOrgY=0,this.lworldExtX=1,this.lworldExtY=1,this.ldeviceExtX=1,this.ldeviceExtY=1}o(i,"Transform"),i.prototype.getWorldOrgX=function(){return this.lworldOrgX},i.prototype.setWorldOrgX=function(a){this.lworldOrgX=a},i.prototype.getWorldOrgY=function(){return this.lworldOrgY},i.prototype.setWorldOrgY=function(a){this.lworldOrgY=a},i.prototype.getWorldExtX=function(){return this.lworldExtX},i.prototype.setWorldExtX=function(a){this.lworldExtX=a},i.prototype.getWorldExtY=function(){return this.lworldExtY},i.prototype.setWorldExtY=function(a){this.lworldExtY=a},i.prototype.getDeviceOrgX=function(){return this.ldeviceOrgX},i.prototype.setDeviceOrgX=function(a){this.ldeviceOrgX=a},i.prototype.getDeviceOrgY=function(){return this.ldeviceOrgY},i.prototype.setDeviceOrgY=function(a){this.ldeviceOrgY=a},i.prototype.getDeviceExtX=function(){return this.ldeviceExtX},i.prototype.setDeviceExtX=function(a){this.ldeviceExtX=a},i.prototype.getDeviceExtY=function(){return this.ldeviceExtY},i.prototype.setDeviceExtY=function(a){this.ldeviceExtY=a},i.prototype.transformX=function(a){var s=0,l=this.lworldExtX;return l!=0&&(s=this.ldeviceOrgX+(a-this.lworldOrgX)*this.ldeviceExtX/l),s},i.prototype.transformY=function(a){var s=0,l=this.lworldExtY;return l!=0&&(s=this.ldeviceOrgY+(a-this.lworldOrgY)*this.ldeviceExtY/l),s},i.prototype.inverseTransformX=function(a){var s=0,l=this.ldeviceExtX;return l!=0&&(s=this.lworldOrgX+(a-this.ldeviceOrgX)*this.lworldExtX/l),s},i.prototype.inverseTransformY=function(a){var s=0,l=this.ldeviceExtY;return l!=0&&(s=this.lworldOrgY+(a-this.ldeviceOrgY)*this.lworldExtY/l),s},i.prototype.inverseTransformPoint=function(a){var s=new n(this.inverseTransformX(a.x),this.inverseTransformY(a.y));return s},t.exports=i},function(t,e,r){"use strict";function n(d){if(Array.isArray(d)){for(var p=0,m=Array(d.length);p<d.length;p++)m[p]=d[p];return m}else return Array.from(d)}o(n,"_toConsumableArray");var i=r(15),a=r(7),s=r(0),l=r(8),u=r(9);function h(){i.call(this),this.useSmartIdealEdgeLengthCalculation=a.DEFAULT_USE_SMART_IDEAL_EDGE_LENGTH_CALCULATION,this.idealEdgeLength=a.DEFAULT_EDGE_LENGTH,this.springConstant=a.DEFAULT_SPRING_STRENGTH,this.repulsionConstant=a.DEFAULT_REPULSION_STRENGTH,this.gravityConstant=a.DEFAULT_GRAVITY_STRENGTH,this.compoundGravityConstant=a.DEFAULT_COMPOUND_GRAVITY_STRENGTH,this.gravityRangeFactor=a.DEFAULT_GRAVITY_RANGE_FACTOR,this.compoundGravityRangeFactor=a.DEFAULT_COMPOUND_GRAVITY_RANGE_FACTOR,this.displacementThresholdPerNode=3*a.DEFAULT_EDGE_LENGTH/100,this.coolingFactor=a.DEFAULT_COOLING_FACTOR_INCREMENTAL,this.initialCoolingFactor=a.DEFAULT_COOLING_FACTOR_INCREMENTAL,this.totalDisplacement=0,this.oldTotalDisplacement=0,this.maxIterations=a.MAX_ITERATIONS}o(h,"FDLayout"),h.prototype=Object.create(i.prototype);for(var f in i)h[f]=i[f];h.prototype.initParameters=function(){i.prototype.initParameters.call(this,arguments),this.totalIterations=0,this.notAnimatedIterations=0,this.useFRGridVariant=a.DEFAULT_USE_SMART_REPULSION_RANGE_CALCULATION,this.grid=[]},h.prototype.calcIdealEdgeLengths=function(){for(var d,p,m,g,y,v,x=this.getGraphManager().getAllEdges(),b=0;b<x.length;b++)d=x[b],d.idealLength=this.idealEdgeLength,d.isInterGraph&&(m=d.getSource(),g=d.getTarget(),y=d.getSourceInLca().getEstimatedSize(),v=d.getTargetInLca().getEstimatedSize(),this.useSmartIdealEdgeLengthCalculation&&(d.idealLength+=y+v-2*s.SIMPLE_NODE_SIZE),p=d.getLca().getInclusionTreeDepth(),d.idealLength+=a.DEFAULT_EDGE_LENGTH*a.PER_LEVEL_IDEAL_EDGE_LENGTH_FACTOR*(m.getInclusionTreeDepth()+g.getInclusionTreeDepth()-2*p))},h.prototype.initSpringEmbedder=function(){var d=this.getAllNodes().length;this.incremental?(d>a.ADAPTATION_LOWER_NODE_LIMIT&&(this.coolingFactor=Math.max(this.coolingFactor*a.COOLING_ADAPTATION_FACTOR,this.coolingFactor-(d-a.ADAPTATION_LOWER_NODE_LIMIT)/(a.ADAPTATION_UPPER_NODE_LIMIT-a.ADAPTATION_LOWER_NODE_LIMIT)*this.coolingFactor*(1-a.COOLING_ADAPTATION_FACTOR))),this.maxNodeDisplacement=a.MAX_NODE_DISPLACEMENT_INCREMENTAL):(d>a.ADAPTATION_LOWER_NODE_LIMIT?this.coolingFactor=Math.max(a.COOLING_ADAPTATION_FACTOR,1-(d-a.ADAPTATION_LOWER_NODE_LIMIT)/(a.ADAPTATION_UPPER_NODE_LIMIT-a.ADAPTATION_LOWER_NODE_LIMIT)*(1-a.COOLING_ADAPTATION_FACTOR)):this.coolingFactor=1,this.initialCoolingFactor=this.coolingFactor,this.maxNodeDisplacement=a.MAX_NODE_DISPLACEMENT),this.maxIterations=Math.max(this.getAllNodes().length*5,this.maxIterations),this.totalDisplacementThreshold=this.displacementThresholdPerNode*this.getAllNodes().length,this.repulsionRange=this.calcRepulsionRange()},h.prototype.calcSpringForces=function(){for(var d=this.getAllEdges(),p,m=0;m<d.length;m++)p=d[m],this.calcSpringForce(p,p.idealLength)},h.prototype.calcRepulsionForces=function(){var d=arguments.length>0&&arguments[0]!==void 0?arguments[0]:!0,p=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!1,m,g,y,v,x=this.getAllNodes(),b;if(this.useFRGridVariant)for(this.totalIterations%a.GRID_CALCULATION_CHECK_PERIOD==1&&d&&this.updateGrid(),b=new Set,m=0;m<x.length;m++)y=x[m],this.calculateRepulsionForceOfANode(y,b,d,p),b.add(y);else for(m=0;m<x.length;m++)for(y=x[m],g=m+1;g<x.length;g++)v=x[g],y.getOwner()==v.getOwner()&&this.calcRepulsionForce(y,v)},h.prototype.calcGravitationalForces=function(){for(var d,p=this.getAllNodesToApplyGravitation(),m=0;m<p.length;m++)d=p[m],this.calcGravitationalForce(d)},h.prototype.moveNodes=function(){for(var d=this.getAllNodes(),p,m=0;m<d.length;m++)p=d[m],p.move()},h.prototype.calcSpringForce=function(d,p){var m=d.getSource(),g=d.getTarget(),y,v,x,b;if(this.uniformLeafNodeSizes&&m.getChild()==null&&g.getChild()==null)d.updateLengthSimple();else if(d.updateLength(),d.isOverlapingSourceAndTarget)return;y=d.getLength(),y!=0&&(v=this.springConstant*(y-p),x=v*(d.lengthX/y),b=v*(d.lengthY/y),m.springForceX+=x,m.springForceY+=b,g.springForceX-=x,g.springForceY-=b)},h.prototype.calcRepulsionForce=function(d,p){var m=d.getRect(),g=p.getRect(),y=new Array(2),v=new Array(4),x,b,w,_,T,E,L;if(m.intersects(g)){l.calcSeparationAmount(m,g,y,a.DEFAULT_EDGE_LENGTH/2),E=2*y[0],L=2*y[1];var C=d.noOfChildren*p.noOfChildren/(d.noOfChildren+p.noOfChildren);d.repulsionForceX-=C*E,d.repulsionForceY-=C*L,p.repulsionForceX+=C*E,p.repulsionForceY+=C*L}else this.uniformLeafNodeSizes&&d.getChild()==null&&p.getChild()==null?(x=g.getCenterX()-m.getCenterX(),b=g.getCenterY()-m.getCenterY()):(l.getIntersection(m,g,v),x=v[2]-v[0],b=v[3]-v[1]),Math.abs(x)<a.MIN_REPULSION_DIST&&(x=u.sign(x)*a.MIN_REPULSION_DIST),Math.abs(b)<a.MIN_REPULSION_DIST&&(b=u.sign(b)*a.MIN_REPULSION_DIST),w=x*x+b*b,_=Math.sqrt(w),T=this.repulsionConstant*d.noOfChildren*p.noOfChildren/w,E=T*x/_,L=T*b/_,d.repulsionForceX-=E,d.repulsionForceY-=L,p.repulsionForceX+=E,p.repulsionForceY+=L},h.prototype.calcGravitationalForce=function(d){var p,m,g,y,v,x,b,w;p=d.getOwner(),m=(p.getRight()+p.getLeft())/2,g=(p.getTop()+p.getBottom())/2,y=d.getCenterX()-m,v=d.getCenterY()-g,x=Math.abs(y)+d.getWidth()/2,b=Math.abs(v)+d.getHeight()/2,d.getOwner()==this.graphManager.getRoot()?(w=p.getEstimatedSize()*this.gravityRangeFactor,(x>w||b>w)&&(d.gravitationForceX=-this.gravityConstant*y,d.gravitationForceY=-this.gravityConstant*v)):(w=p.getEstimatedSize()*this.compoundGravityRangeFactor,(x>w||b>w)&&(d.gravitationForceX=-this.gravityConstant*y*this.compoundGravityConstant,d.gravitationForceY=-this.gravityConstant*v*this.compoundGravityConstant))},h.prototype.isConverged=function(){var d,p=!1;return this.totalIterations>this.maxIterations/3&&(p=Math.abs(this.totalDisplacement-this.oldTotalDisplacement)<2),d=this.totalDisplacement<this.totalDisplacementThreshold,this.oldTotalDisplacement=this.totalDisplacement,d||p},h.prototype.animate=function(){this.animationDuringLayout&&!this.isSubLayout&&(this.notAnimatedIterations==this.animationPeriod?(this.update(),this.notAnimatedIterations=0):this.notAnimatedIterations++)},h.prototype.calcNoOfChildrenForAllNodes=function(){for(var d,p=this.graphManager.getAllNodes(),m=0;m<p.length;m++)d=p[m],d.noOfChildren=d.getNoOfChildren()},h.prototype.calcGrid=function(d){var p=0,m=0;p=parseInt(Math.ceil((d.getRight()-d.getLeft())/this.repulsionRange)),m=parseInt(Math.ceil((d.getBottom()-d.getTop())/this.repulsionRange));for(var g=new Array(p),y=0;y<p;y++)g[y]=new Array(m);for(var y=0;y<p;y++)for(var v=0;v<m;v++)g[y][v]=new Array;return g},h.prototype.addNodeToGrid=function(d,p,m){var g=0,y=0,v=0,x=0;g=parseInt(Math.floor((d.getRect().x-p)/this.repulsionRange)),y=parseInt(Math.floor((d.getRect().width+d.getRect().x-p)/this.repulsionRange)),v=parseInt(Math.floor((d.getRect().y-m)/this.repulsionRange)),x=parseInt(Math.floor((d.getRect().height+d.getRect().y-m)/this.repulsionRange));for(var b=g;b<=y;b++)for(var w=v;w<=x;w++)this.grid[b][w].push(d),d.setGridCoordinates(g,y,v,x)},h.prototype.updateGrid=function(){var d,p,m=this.getAllNodes();for(this.grid=this.calcGrid(this.graphManager.getRoot()),d=0;d<m.length;d++)p=m[d],this.addNodeToGrid(p,this.graphManager.getRoot().getLeft(),this.graphManager.getRoot().getTop())},h.prototype.calculateRepulsionForceOfANode=function(d,p,m,g){if(this.totalIterations%a.GRID_CALCULATION_CHECK_PERIOD==1&&m||g){var y=new Set;d.surrounding=new Array;for(var v,x=this.grid,b=d.startX-1;b<d.finishX+2;b++)for(var w=d.startY-1;w<d.finishY+2;w++)if(!(b<0||w<0||b>=x.length||w>=x[0].length)){for(var _=0;_<x[b][w].length;_++)if(v=x[b][w][_],!(d.getOwner()!=v.getOwner()||d==v)&&!p.has(v)&&!y.has(v)){var T=Math.abs(d.getCenterX()-v.getCenterX())-(d.getWidth()/2+v.getWidth()/2),E=Math.abs(d.getCenterY()-v.getCenterY())-(d.getHeight()/2+v.getHeight()/2);T<=this.repulsionRange&&E<=this.repulsionRange&&y.add(v)}}d.surrounding=[].concat(n(y))}for(b=0;b<d.surrounding.length;b++)this.calcRepulsionForce(d,d.surrounding[b])},h.prototype.calcRepulsionRange=function(){return 0},t.exports=h},function(t,e,r){"use strict";var n=r(1),i=r(7);function a(l,u,h){n.call(this,l,u,h),this.idealLength=i.DEFAULT_EDGE_LENGTH}o(a,"FDLayoutEdge"),a.prototype=Object.create(n.prototype);for(var s in n)a[s]=n[s];t.exports=a},function(t,e,r){"use strict";var n=r(3);function i(s,l,u,h){n.call(this,s,l,u,h),this.springForceX=0,this.springForceY=0,this.repulsionForceX=0,this.repulsionForceY=0,this.gravitationForceX=0,this.gravitationForceY=0,this.displacementX=0,this.displacementY=0,this.startX=0,this.finishX=0,this.startY=0,this.finishY=0,this.surrounding=[]}o(i,"FDLayoutNode"),i.prototype=Object.create(n.prototype);for(var a in n)i[a]=n[a];i.prototype.setGridCoordinates=function(s,l,u,h){this.startX=s,this.finishX=l,this.startY=u,this.finishY=h},t.exports=i},function(t,e,r){"use strict";function n(i,a){this.width=0,this.height=0,i!==null&&a!==null&&(this.height=a,this.width=i)}o(n,"DimensionD"),n.prototype.getWidth=function(){return this.width},n.prototype.setWidth=function(i){this.width=i},n.prototype.getHeight=function(){return this.height},n.prototype.setHeight=function(i){this.height=i},t.exports=n},function(t,e,r){"use strict";var n=r(14);function i(){this.map={},this.keys=[]}o(i,"HashMap"),i.prototype.put=function(a,s){var l=n.createID(a);this.contains(l)||(this.map[l]=s,this.keys.push(a))},i.prototype.contains=function(a){var s=n.createID(a);return this.map[a]!=null},i.prototype.get=function(a){var s=n.createID(a);return this.map[s]},i.prototype.keySet=function(){return this.keys},t.exports=i},function(t,e,r){"use strict";var n=r(14);function i(){this.set={}}o(i,"HashSet"),i.prototype.add=function(a){var s=n.createID(a);this.contains(s)||(this.set[s]=a)},i.prototype.remove=function(a){delete this.set[n.createID(a)]},i.prototype.clear=function(){this.set={}},i.prototype.contains=function(a){return this.set[n.createID(a)]==a},i.prototype.isEmpty=function(){return this.size()===0},i.prototype.size=function(){return Object.keys(this.set).length},i.prototype.addAllTo=function(a){for(var s=Object.keys(this.set),l=s.length,u=0;u<l;u++)a.push(this.set[s[u]])},i.prototype.size=function(){return Object.keys(this.set).length},i.prototype.addAll=function(a){for(var s=a.length,l=0;l<s;l++){var u=a[l];this.add(u)}},t.exports=i},function(t,e,r){"use strict";var n=function(){function l(u,h){for(var f=0;f<h.length;f++){var d=h[f];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(u,d.key,d)}}return o(l,"defineProperties"),function(u,h,f){return h&&l(u.prototype,h),f&&l(u,f),u}}();function i(l,u){if(!(l instanceof u))throw new TypeError("Cannot call a class as a function")}o(i,"_classCallCheck");var a=r(11),s=function(){function l(u,h){i(this,l),(h!==null||h!==void 0)&&(this.compareFunction=this._defaultCompareFunction);var f=void 0;u instanceof a?f=u.size():f=u.length,this._quicksort(u,0,f-1)}return o(l,"Quicksort"),n(l,[{key:"_quicksort",value:o(function(h,f,d){if(f<d){var p=this._partition(h,f,d);this._quicksort(h,f,p),this._quicksort(h,p+1,d)}},"_quicksort")},{key:"_partition",value:o(function(h,f,d){for(var p=this._get(h,f),m=f,g=d;;){for(;this.compareFunction(p,this._get(h,g));)g--;for(;this.compareFunction(this._get(h,m),p);)m++;if(m<g)this._swap(h,m,g),m++,g--;else return g}},"_partition")},{key:"_get",value:o(function(h,f){return h instanceof a?h.get_object_at(f):h[f]},"_get")},{key:"_set",value:o(function(h,f,d){h instanceof a?h.set_object_at(f,d):h[f]=d},"_set")},{key:"_swap",value:o(function(h,f,d){var p=this._get(h,f);this._set(h,f,this._get(h,d)),this._set(h,d,p)},"_swap")},{key:"_defaultCompareFunction",value:o(function(h,f){return f>h},"_defaultCompareFunction")}]),l}();t.exports=s},function(t,e,r){"use strict";var n=function(){function s(l,u){for(var h=0;h<u.length;h++){var f=u[h];f.enumerable=f.enumerable||!1,f.configurable=!0,"value"in f&&(f.writable=!0),Object.defineProperty(l,f.key,f)}}return o(s,"defineProperties"),function(l,u,h){return u&&s(l.prototype,u),h&&s(l,h),l}}();function i(s,l){if(!(s instanceof l))throw new TypeError("Cannot call a class as a function")}o(i,"_classCallCheck");var a=function(){function s(l,u){var h=arguments.length>2&&arguments[2]!==void 0?arguments[2]:1,f=arguments.length>3&&arguments[3]!==void 0?arguments[3]:-1,d=arguments.length>4&&arguments[4]!==void 0?arguments[4]:-1;i(this,s),this.sequence1=l,this.sequence2=u,this.match_score=h,this.mismatch_penalty=f,this.gap_penalty=d,this.iMax=l.length+1,this.jMax=u.length+1,this.grid=new Array(this.iMax);for(var p=0;p<this.iMax;p++){this.grid[p]=new Array(this.jMax);for(var m=0;m<this.jMax;m++)this.grid[p][m]=0}this.tracebackGrid=new Array(this.iMax);for(var g=0;g<this.iMax;g++){this.tracebackGrid[g]=new Array(this.jMax);for(var y=0;y<this.jMax;y++)this.tracebackGrid[g][y]=[null,null,null]}this.alignments=[],this.score=-1,this.computeGrids()}return o(s,"NeedlemanWunsch"),n(s,[{key:"getScore",value:o(function(){return this.score},"getScore")},{key:"getAlignments",value:o(function(){return this.alignments},"getAlignments")},{key:"computeGrids",value:o(function(){for(var u=1;u<this.jMax;u++)this.grid[0][u]=this.grid[0][u-1]+this.gap_penalty,this.tracebackGrid[0][u]=[!1,!1,!0];for(var h=1;h<this.iMax;h++)this.grid[h][0]=this.grid[h-1][0]+this.gap_penalty,this.tracebackGrid[h][0]=[!1,!0,!1];for(var f=1;f<this.iMax;f++)for(var d=1;d<this.jMax;d++){var p=void 0;this.sequence1[f-1]===this.sequence2[d-1]?p=this.grid[f-1][d-1]+this.match_score:p=this.grid[f-1][d-1]+this.mismatch_penalty;var m=this.grid[f-1][d]+this.gap_penalty,g=this.grid[f][d-1]+this.gap_penalty,y=[p,m,g],v=this.arrayAllMaxIndexes(y);this.grid[f][d]=y[v[0]],this.tracebackGrid[f][d]=[v.includes(0),v.includes(1),v.includes(2)]}this.score=this.grid[this.iMax-1][this.jMax-1]},"computeGrids")},{key:"alignmentTraceback",value:o(function(){var u=[];for(u.push({pos:[this.sequence1.length,this.sequence2.length],seq1:"",seq2:""});u[0];){var h=u[0],f=this.tracebackGrid[h.pos[0]][h.pos[1]];f[0]&&u.push({pos:[h.pos[0]-1,h.pos[1]-1],seq1:this.sequence1[h.pos[0]-1]+h.seq1,seq2:this.sequence2[h.pos[1]-1]+h.seq2}),f[1]&&u.push({pos:[h.pos[0]-1,h.pos[1]],seq1:this.sequence1[h.pos[0]-1]+h.seq1,seq2:"-"+h.seq2}),f[2]&&u.push({pos:[h.pos[0],h.pos[1]-1],seq1:"-"+h.seq1,seq2:this.sequence2[h.pos[1]-1]+h.seq2}),h.pos[0]===0&&h.pos[1]===0&&this.alignments.push({sequence1:h.seq1,sequence2:h.seq2}),u.shift()}return this.alignments},"alignmentTraceback")},{key:"getAllIndexes",value:o(function(u,h){for(var f=[],d=-1;(d=u.indexOf(h,d+1))!==-1;)f.push(d);return f},"getAllIndexes")},{key:"arrayAllMaxIndexes",value:o(function(u){return this.getAllIndexes(u,Math.max.apply(null,u))},"arrayAllMaxIndexes")}]),s}();t.exports=a},function(t,e,r){"use strict";var n=o(function(){},"layoutBase");n.FDLayout=r(18),n.FDLayoutConstants=r(7),n.FDLayoutEdge=r(19),n.FDLayoutNode=r(20),n.DimensionD=r(21),n.HashMap=r(22),n.HashSet=r(23),n.IGeometry=r(8),n.IMath=r(9),n.Integer=r(10),n.Point=r(12),n.PointD=r(4),n.RandomSeed=r(16),n.RectangleD=r(13),n.Transform=r(17),n.UniqueIDGeneretor=r(14),n.Quicksort=r(24),n.LinkedList=r(11),n.LGraphObject=r(2),n.LGraph=r(5),n.LEdge=r(1),n.LGraphManager=r(6),n.LNode=r(3),n.Layout=r(15),n.LayoutConstants=r(0),n.NeedlemanWunsch=r(25),t.exports=n},function(t,e,r){"use strict";function n(){this.listeners=[]}o(n,"Emitter");var i=n.prototype;i.addListener=function(a,s){this.listeners.push({event:a,callback:s})},i.removeListener=function(a,s){for(var l=this.listeners.length;l>=0;l--){var u=this.listeners[l];u.event===a&&u.callback===s&&this.listeners.splice(l,1)}},i.emit=function(a,s){for(var l=0;l<this.listeners.length;l++){var u=this.listeners[l];a===u.event&&u.callback(s)}},t.exports=n}])})});var AB=Ni((lb,CB)=>{"use strict";o(function(e,r){typeof lb=="object"&&typeof CB=="object"?CB.exports=r(SB()):typeof define=="function"&&define.amd?define(["layout-base"],r):typeof lb=="object"?lb.coseBase=r(SB()):e.coseBase=r(e.layoutBase)},"webpackUniversalModuleDefinition")(lb,function(t){return function(e){var r={};function n(i){if(r[i])return r[i].exports;var a=r[i]={i,l:!1,exports:{}};return e[i].call(a.exports,a,a.exports,n),a.l=!0,a.exports}return o(n,"__webpack_require__"),n.m=e,n.c=r,n.i=function(i){return i},n.d=function(i,a,s){n.o(i,a)||Object.defineProperty(i,a,{configurable:!1,enumerable:!0,get:s})},n.n=function(i){var a=i&&i.__esModule?o(function(){return i.default},"getDefault"):o(function(){return i},"getModuleExports");return n.d(a,"a",a),a},n.o=function(i,a){return Object.prototype.hasOwnProperty.call(i,a)},n.p="",n(n.s=7)}([function(e,r){e.exports=t},function(e,r,n){"use strict";var i=n(0).FDLayoutConstants;function a(){}o(a,"CoSEConstants");for(var s in i)a[s]=i[s];a.DEFAULT_USE_MULTI_LEVEL_SCALING=!1,a.DEFAULT_RADIAL_SEPARATION=i.DEFAULT_EDGE_LENGTH,a.DEFAULT_COMPONENT_SEPERATION=60,a.TILE=!0,a.TILING_PADDING_VERTICAL=10,a.TILING_PADDING_HORIZONTAL=10,a.TREE_REDUCTION_ON_INCREMENTAL=!1,e.exports=a},function(e,r,n){"use strict";var i=n(0).FDLayoutEdge;function a(l,u,h){i.call(this,l,u,h)}o(a,"CoSEEdge"),a.prototype=Object.create(i.prototype);for(var s in i)a[s]=i[s];e.exports=a},function(e,r,n){"use strict";var i=n(0).LGraph;function a(l,u,h){i.call(this,l,u,h)}o(a,"CoSEGraph"),a.prototype=Object.create(i.prototype);for(var s in i)a[s]=i[s];e.exports=a},function(e,r,n){"use strict";var i=n(0).LGraphManager;function a(l){i.call(this,l)}o(a,"CoSEGraphManager"),a.prototype=Object.create(i.prototype);for(var s in i)a[s]=i[s];e.exports=a},function(e,r,n){"use strict";var i=n(0).FDLayoutNode,a=n(0).IMath;function s(u,h,f,d){i.call(this,u,h,f,d)}o(s,"CoSENode"),s.prototype=Object.create(i.prototype);for(var l in i)s[l]=i[l];s.prototype.move=function(){var u=this.graphManager.getLayout();this.displacementX=u.coolingFactor*(this.springForceX+this.repulsionForceX+this.gravitationForceX)/this.noOfChildren,this.displacementY=u.coolingFactor*(this.springForceY+this.repulsionForceY+this.gravitationForceY)/this.noOfChildren,Math.abs(this.displacementX)>u.coolingFactor*u.maxNodeDisplacement&&(this.displacementX=u.coolingFactor*u.maxNodeDisplacement*a.sign(this.displacementX)),Math.abs(this.displacementY)>u.coolingFactor*u.maxNodeDisplacement&&(this.displacementY=u.coolingFactor*u.maxNodeDisplacement*a.sign(this.displacementY)),this.child==null?this.moveBy(this.displacementX,this.displacementY):this.child.getNodes().length==0?this.moveBy(this.displacementX,this.displacementY):this.propogateDisplacementToChildren(this.displacementX,this.displacementY),u.totalDisplacement+=Math.abs(this.displacementX)+Math.abs(this.displacementY),this.springForceX=0,this.springForceY=0,this.repulsionForceX=0,this.repulsionForceY=0,this.gravitationForceX=0,this.gravitationForceY=0,this.displacementX=0,this.displacementY=0},s.prototype.propogateDisplacementToChildren=function(u,h){for(var f=this.getChild().getNodes(),d,p=0;p<f.length;p++)d=f[p],d.getChild()==null?(d.moveBy(u,h),d.displacementX+=u,d.displacementY+=h):d.propogateDisplacementToChildren(u,h)},s.prototype.setPred1=function(u){this.pred1=u},s.prototype.getPred1=function(){return pred1},s.prototype.getPred2=function(){return pred2},s.prototype.setNext=function(u){this.next=u},s.prototype.getNext=function(){return next},s.prototype.setProcessed=function(u){this.processed=u},s.prototype.isProcessed=function(){return processed},e.exports=s},function(e,r,n){"use strict";var i=n(0).FDLayout,a=n(4),s=n(3),l=n(5),u=n(2),h=n(1),f=n(0).FDLayoutConstants,d=n(0).LayoutConstants,p=n(0).Point,m=n(0).PointD,g=n(0).Layout,y=n(0).Integer,v=n(0).IGeometry,x=n(0).LGraph,b=n(0).Transform;function w(){i.call(this),this.toBeTiled={}}o(w,"CoSELayout"),w.prototype=Object.create(i.prototype);for(var _ in i)w[_]=i[_];w.prototype.newGraphManager=function(){var T=new a(this);return this.graphManager=T,T},w.prototype.newGraph=function(T){return new s(null,this.graphManager,T)},w.prototype.newNode=function(T){return new l(this.graphManager,T)},w.prototype.newEdge=function(T){return new u(null,null,T)},w.prototype.initParameters=function(){i.prototype.initParameters.call(this,arguments),this.isSubLayout||(h.DEFAULT_EDGE_LENGTH<10?this.idealEdgeLength=10:this.idealEdgeLength=h.DEFAULT_EDGE_LENGTH,this.useSmartIdealEdgeLengthCalculation=h.DEFAULT_USE_SMART_IDEAL_EDGE_LENGTH_CALCULATION,this.springConstant=f.DEFAULT_SPRING_STRENGTH,this.repulsionConstant=f.DEFAULT_REPULSION_STRENGTH,this.gravityConstant=f.DEFAULT_GRAVITY_STRENGTH,this.compoundGravityConstant=f.DEFAULT_COMPOUND_GRAVITY_STRENGTH,this.gravityRangeFactor=f.DEFAULT_GRAVITY_RANGE_FACTOR,this.compoundGravityRangeFactor=f.DEFAULT_COMPOUND_GRAVITY_RANGE_FACTOR,this.prunedNodesAll=[],this.growTreeIterations=0,this.afterGrowthIterations=0,this.isTreeGrowing=!1,this.isGrowthFinished=!1,this.coolingCycle=0,this.maxCoolingCycle=this.maxIterations/f.CONVERGENCE_CHECK_PERIOD,this.finalTemperature=f.CONVERGENCE_CHECK_PERIOD/this.maxIterations,this.coolingAdjuster=1)},w.prototype.layout=function(){var T=d.DEFAULT_CREATE_BENDS_AS_NEEDED;return T&&(this.createBendpoints(),this.graphManager.resetAllEdges()),this.level=0,this.classicLayout()},w.prototype.classicLayout=function(){if(this.nodesWithGravity=this.calculateNodesToApplyGravitationTo(),this.graphManager.setAllNodesToApplyGravitation(this.nodesWithGravity),this.calcNoOfChildrenForAllNodes(),this.graphManager.calcLowestCommonAncestors(),this.graphManager.calcInclusionTreeDepths(),this.graphManager.getRoot().calcEstimatedSize(),this.calcIdealEdgeLengths(),this.incremental){if(h.TREE_REDUCTION_ON_INCREMENTAL){this.reduceTrees(),this.graphManager.resetAllNodesToApplyGravitation();var E=new Set(this.getAllNodes()),L=this.nodesWithGravity.filter(function(I){return E.has(I)});this.graphManager.setAllNodesToApplyGravitation(L)}}else{var T=this.getFlatForest();if(T.length>0)this.positionNodesRadially(T);else{this.reduceTrees(),this.graphManager.resetAllNodesToApplyGravitation();var E=new Set(this.getAllNodes()),L=this.nodesWithGravity.filter(function(C){return E.has(C)});this.graphManager.setAllNodesToApplyGravitation(L),this.positionNodesRandomly()}}return this.initSpringEmbedder(),this.runSpringEmbedder(),!0},w.prototype.tick=function(){if(this.totalIterations++,this.totalIterations===this.maxIterations&&!this.isTreeGrowing&&!this.isGrowthFinished)if(this.prunedNodesAll.length>0)this.isTreeGrowing=!0;else return!0;if(this.totalIterations%f.CONVERGENCE_CHECK_PERIOD==0&&!this.isTreeGrowing&&!this.isGrowthFinished){if(this.isConverged())if(this.prunedNodesAll.length>0)this.isTreeGrowing=!0;else return!0;this.coolingCycle++,this.layoutQuality==0?this.coolingAdjuster=this.coolingCycle:this.layoutQuality==1&&(this.coolingAdjuster=this.coolingCycle/3),this.coolingFactor=Math.max(this.initialCoolingFactor-Math.pow(this.coolingCycle,Math.log(100*(this.initialCoolingFactor-this.finalTemperature))/Math.log(this.maxCoolingCycle))/100*this.coolingAdjuster,this.finalTemperature),this.animationPeriod=Math.ceil(this.initialAnimationPeriod*Math.sqrt(this.coolingFactor))}if(this.isTreeGrowing){if(this.growTreeIterations%10==0)if(this.prunedNodesAll.length>0){this.graphManager.updateBounds(),this.updateGrid(),this.growTree(this.prunedNodesAll),this.graphManager.resetAllNodesToApplyGravitation();var T=new Set(this.getAllNodes()),E=this.nodesWithGravity.filter(function(A){return T.has(A)});this.graphManager.setAllNodesToApplyGravitation(E),this.graphManager.updateBounds(),this.updateGrid(),this.coolingFactor=f.DEFAULT_COOLING_FACTOR_INCREMENTAL}else this.isTreeGrowing=!1,this.isGrowthFinished=!0;this.growTreeIterations++}if(this.isGrowthFinished){if(this.isConverged())return!0;this.afterGrowthIterations%10==0&&(this.graphManager.updateBounds(),this.updateGrid()),this.coolingFactor=f.DEFAULT_COOLING_FACTOR_INCREMENTAL*((100-this.afterGrowthIterations)/100),this.afterGrowthIterations++}var L=!this.isTreeGrowing&&!this.isGrowthFinished,C=this.growTreeIterations%10==1&&this.isTreeGrowing||this.afterGrowthIterations%10==1&&this.isGrowthFinished;return this.totalDisplacement=0,this.graphManager.updateBounds(),this.calcSpringForces(),this.calcRepulsionForces(L,C),this.calcGravitationalForces(),this.moveNodes(),this.animate(),!1},w.prototype.getPositionsData=function(){for(var T=this.graphManager.getAllNodes(),E={},L=0;L<T.length;L++){var C=T[L].rect,A=T[L].id;E[A]={id:A,x:C.getCenterX(),y:C.getCenterY(),w:C.width,h:C.height}}return E},w.prototype.runSpringEmbedder=function(){this.initialAnimationPeriod=25,this.animationPeriod=this.initialAnimationPeriod;var T=!1;if(f.ANIMATE==="during")this.emit("layoutstarted");else{for(;!T;)T=this.tick();this.graphManager.updateBounds()}},w.prototype.calculateNodesToApplyGravitationTo=function(){var T=[],E,L=this.graphManager.getGraphs(),C=L.length,A;for(A=0;A<C;A++)E=L[A],E.updateConnected(),E.isConnected||(T=T.concat(E.getNodes()));return T},w.prototype.createBendpoints=function(){var T=[];T=T.concat(this.graphManager.getAllEdges());var E=new Set,L;for(L=0;L<T.length;L++){var C=T[L];if(!E.has(C)){var A=C.getSource(),I=C.getTarget();if(A==I)C.getBendpoints().push(new m),C.getBendpoints().push(new m),this.createDummyNodesForBendpoints(C),E.add(C);else{var D=[];if(D=D.concat(A.getEdgeListToNode(I)),D=D.concat(I.getEdgeListToNode(A)),!E.has(D[0])){if(D.length>1){var k;for(k=0;k<D.length;k++){var R=D[k];R.getBendpoints().push(new m),this.createDummyNodesForBendpoints(R)}}D.forEach(function(S){E.add(S)})}}}if(E.size==T.length)break}},w.prototype.positionNodesRadially=function(T){for(var E=new p(0,0),L=Math.ceil(Math.sqrt(T.length)),C=0,A=0,I=0,D=new m(0,0),k=0;k<T.length;k++){k%L==0&&(I=0,A=C,k!=0&&(A+=h.DEFAULT_COMPONENT_SEPERATION),C=0);var R=T[k],S=g.findCenterOfTree(R);E.x=I,E.y=A,D=w.radialLayout(R,S,E),D.y>C&&(C=Math.floor(D.y)),I=Math.floor(D.x+h.DEFAULT_COMPONENT_SEPERATION)}this.transform(new m(d.WORLD_CENTER_X-D.x/2,d.WORLD_CENTER_Y-D.y/2))},w.radialLayout=function(T,E,L){var C=Math.max(this.maxDiagonalInTree(T),h.DEFAULT_RADIAL_SEPARATION);w.branchRadialLayout(E,null,0,359,0,C);var A=x.calculateBounds(T),I=new b;I.setDeviceOrgX(A.getMinX()),I.setDeviceOrgY(A.getMinY()),I.setWorldOrgX(L.x),I.setWorldOrgY(L.y);for(var D=0;D<T.length;D++){var k=T[D];k.transform(I)}var R=new m(A.getMaxX(),A.getMaxY());return I.inverseTransformPoint(R)},w.branchRadialLayout=function(T,E,L,C,A,I){var D=(C-L+1)/2;D<0&&(D+=180);var k=(D+L)%360,R=k*v.TWO_PI/360,S=Math.cos(R),O=A*Math.cos(R),N=A*Math.sin(R);T.setCenter(O,N);var P=[];P=P.concat(T.getEdges());var F=P.length;E!=null&&F--;for(var B=0,$=P.length,z,W=T.getEdgesBetween(E);W.length>1;){var j=W[0];W.splice(0,1);var K=P.indexOf(j);K>=0&&P.splice(K,1),$--,F--}E!=null?z=(P.indexOf(W[0])+1)%$:z=0;for(var ie=Math.abs(C-L)/F,Q=z;B!=F;Q=++Q%$){var ee=P[Q].getOtherEnd(T);if(ee!=E){var J=(L+B*ie)%360,H=(J+ie)%360;w.branchRadialLayout(ee,T,J,H,A+I,I),B++}}},w.maxDiagonalInTree=function(T){for(var E=y.MIN_VALUE,L=0;L<T.length;L++){var C=T[L],A=C.getDiagonal();A>E&&(E=A)}return E},w.prototype.calcRepulsionRange=function(){return 2*(this.level+1)*this.idealEdgeLength},w.prototype.groupZeroDegreeMembers=function(){var T=this,E={};this.memberGroups={},this.idToDummyNode={};for(var L=[],C=this.graphManager.getAllNodes(),A=0;A<C.length;A++){var I=C[A],D=I.getParent();this.getNodeDegreeWithChildren(I)===0&&(D.id==null||!this.getToBeTiled(D))&&L.push(I)}for(var A=0;A<L.length;A++){var I=L[A],k=I.getParent().id;typeof E[k]>"u"&&(E[k]=[]),E[k]=E[k].concat(I)}Object.keys(E).forEach(function(R){if(E[R].length>1){var S="DummyCompound_"+R;T.memberGroups[S]=E[R];var O=E[R][0].getParent(),N=new l(T.graphManager);N.id=S,N.paddingLeft=O.paddingLeft||0,N.paddingRight=O.paddingRight||0,N.paddingBottom=O.paddingBottom||0,N.paddingTop=O.paddingTop||0,T.idToDummyNode[S]=N;var P=T.getGraphManager().add(T.newGraph(),N),F=O.getChild();F.add(N);for(var B=0;B<E[R].length;B++){var $=E[R][B];F.remove($),P.add($)}}})},w.prototype.clearCompounds=function(){var T={},E={};this.performDFSOnCompounds();for(var L=0;L<this.compoundOrder.length;L++)E[this.compoundOrder[L].id]=this.compoundOrder[L],T[this.compoundOrder[L].id]=[].concat(this.compoundOrder[L].getChild().getNodes()),this.graphManager.remove(this.compoundOrder[L].getChild()),this.compoundOrder[L].child=null;this.graphManager.resetAllNodes(),this.tileCompoundMembers(T,E)},w.prototype.clearZeroDegreeMembers=function(){var T=this,E=this.tiledZeroDegreePack=[];Object.keys(this.memberGroups).forEach(function(L){var C=T.idToDummyNode[L];E[L]=T.tileNodes(T.memberGroups[L],C.paddingLeft+C.paddingRight),C.rect.width=E[L].width,C.rect.height=E[L].height})},w.prototype.repopulateCompounds=function(){for(var T=this.compoundOrder.length-1;T>=0;T--){var E=this.compoundOrder[T],L=E.id,C=E.paddingLeft,A=E.paddingTop;this.adjustLocations(this.tiledMemberPack[L],E.rect.x,E.rect.y,C,A)}},w.prototype.repopulateZeroDegreeMembers=function(){var T=this,E=this.tiledZeroDegreePack;Object.keys(E).forEach(function(L){var C=T.idToDummyNode[L],A=C.paddingLeft,I=C.paddingTop;T.adjustLocations(E[L],C.rect.x,C.rect.y,A,I)})},w.prototype.getToBeTiled=function(T){var E=T.id;if(this.toBeTiled[E]!=null)return this.toBeTiled[E];var L=T.getChild();if(L==null)return this.toBeTiled[E]=!1,!1;for(var C=L.getNodes(),A=0;A<C.length;A++){var I=C[A];if(this.getNodeDegree(I)>0)return this.toBeTiled[E]=!1,!1;if(I.getChild()==null){this.toBeTiled[I.id]=!1;continue}if(!this.getToBeTiled(I))return this.toBeTiled[E]=!1,!1}return this.toBeTiled[E]=!0,!0},w.prototype.getNodeDegree=function(T){for(var E=T.id,L=T.getEdges(),C=0,A=0;A<L.length;A++){var I=L[A];I.getSource().id!==I.getTarget().id&&(C=C+1)}return C},w.prototype.getNodeDegreeWithChildren=function(T){var E=this.getNodeDegree(T);if(T.getChild()==null)return E;for(var L=T.getChild().getNodes(),C=0;C<L.length;C++){var A=L[C];E+=this.getNodeDegreeWithChildren(A)}return E},w.prototype.performDFSOnCompounds=function(){this.compoundOrder=[],this.fillCompexOrderByDFS(this.graphManager.getRoot().getNodes())},w.prototype.fillCompexOrderByDFS=function(T){for(var E=0;E<T.length;E++){var L=T[E];L.getChild()!=null&&this.fillCompexOrderByDFS(L.getChild().getNodes()),this.getToBeTiled(L)&&this.compoundOrder.push(L)}},w.prototype.adjustLocations=function(T,E,L,C,A){E+=C,L+=A;for(var I=E,D=0;D<T.rows.length;D++){var k=T.rows[D];E=I;for(var R=0,S=0;S<k.length;S++){var O=k[S];O.rect.x=E,O.rect.y=L,E+=O.rect.width+T.horizontalPadding,O.rect.height>R&&(R=O.rect.height)}L+=R+T.verticalPadding}},w.prototype.tileCompoundMembers=function(T,E){var L=this;this.tiledMemberPack=[],Object.keys(T).forEach(function(C){var A=E[C];L.tiledMemberPack[C]=L.tileNodes(T[C],A.paddingLeft+A.paddingRight),A.rect.width=L.tiledMemberPack[C].width,A.rect.height=L.tiledMemberPack[C].height})},w.prototype.tileNodes=function(T,E){var L=h.TILING_PADDING_VERTICAL,C=h.TILING_PADDING_HORIZONTAL,A={rows:[],rowWidth:[],rowHeight:[],width:0,height:E,verticalPadding:L,horizontalPadding:C};T.sort(function(k,R){return k.rect.width*k.rect.height>R.rect.width*R.rect.height?-1:k.rect.width*k.rect.height<R.rect.width*R.rect.height?1:0});for(var I=0;I<T.length;I++){var D=T[I];A.rows.length==0?this.insertNodeToRow(A,D,0,E):this.canAddHorizontal(A,D.rect.width,D.rect.height)?this.insertNodeToRow(A,D,this.getShortestRowIndex(A),E):this.insertNodeToRow(A,D,A.rows.length,E),this.shiftToLastRow(A)}return A},w.prototype.insertNodeToRow=function(T,E,L,C){var A=C;if(L==T.rows.length){var I=[];T.rows.push(I),T.rowWidth.push(A),T.rowHeight.push(0)}var D=T.rowWidth[L]+E.rect.width;T.rows[L].length>0&&(D+=T.horizontalPadding),T.rowWidth[L]=D,T.width<D&&(T.width=D);var k=E.rect.height;L>0&&(k+=T.verticalPadding);var R=0;k>T.rowHeight[L]&&(R=T.rowHeight[L],T.rowHeight[L]=k,R=T.rowHeight[L]-R),T.height+=R,T.rows[L].push(E)},w.prototype.getShortestRowIndex=function(T){for(var E=-1,L=Number.MAX_VALUE,C=0;C<T.rows.length;C++)T.rowWidth[C]<L&&(E=C,L=T.rowWidth[C]);return E},w.prototype.getLongestRowIndex=function(T){for(var E=-1,L=Number.MIN_VALUE,C=0;C<T.rows.length;C++)T.rowWidth[C]>L&&(E=C,L=T.rowWidth[C]);return E},w.prototype.canAddHorizontal=function(T,E,L){var C=this.getShortestRowIndex(T);if(C<0)return!0;var A=T.rowWidth[C];if(A+T.horizontalPadding+E<=T.width)return!0;var I=0;T.rowHeight[C]<L&&C>0&&(I=L+T.verticalPadding-T.rowHeight[C]);var D;T.width-A>=E+T.horizontalPadding?D=(T.height+I)/(A+E+T.horizontalPadding):D=(T.height+I)/T.width,I=L+T.verticalPadding;var k;return T.width<E?k=(T.height+I)/E:k=(T.height+I)/T.width,k<1&&(k=1/k),D<1&&(D=1/D),D<k},w.prototype.shiftToLastRow=function(T){var E=this.getLongestRowIndex(T),L=T.rowWidth.length-1,C=T.rows[E],A=C[C.length-1],I=A.width+T.horizontalPadding;if(T.width-T.rowWidth[L]>I&&E!=L){C.splice(-1,1),T.rows[L].push(A),T.rowWidth[E]=T.rowWidth[E]-I,T.rowWidth[L]=T.rowWidth[L]+I,T.width=T.rowWidth[instance.getLongestRowIndex(T)];for(var D=Number.MIN_VALUE,k=0;k<C.length;k++)C[k].height>D&&(D=C[k].height);E>0&&(D+=T.verticalPadding);var R=T.rowHeight[E]+T.rowHeight[L];T.rowHeight[E]=D,T.rowHeight[L]<A.height+T.verticalPadding&&(T.rowHeight[L]=A.height+T.verticalPadding);var S=T.rowHeight[E]+T.rowHeight[L];T.height+=S-R,this.shiftToLastRow(T)}},w.prototype.tilingPreLayout=function(){h.TILE&&(this.groupZeroDegreeMembers(),this.clearCompounds(),this.clearZeroDegreeMembers())},w.prototype.tilingPostLayout=function(){h.TILE&&(this.repopulateZeroDegreeMembers(),this.repopulateCompounds())},w.prototype.reduceTrees=function(){for(var T=[],E=!0,L;E;){var C=this.graphManager.getAllNodes(),A=[];E=!1;for(var I=0;I<C.length;I++)L=C[I],L.getEdges().length==1&&!L.getEdges()[0].isInterGraph&&L.getChild()==null&&(A.push([L,L.getEdges()[0],L.getOwner()]),E=!0);if(E==!0){for(var D=[],k=0;k<A.length;k++)A[k][0].getEdges().length==1&&(D.push(A[k]),A[k][0].getOwner().remove(A[k][0]));T.push(D),this.graphManager.resetAllNodes(),this.graphManager.resetAllEdges()}}this.prunedNodesAll=T},w.prototype.growTree=function(T){for(var E=T.length,L=T[E-1],C,A=0;A<L.length;A++)C=L[A],this.findPlaceforPrunedNode(C),C[2].add(C[0]),C[2].add(C[1],C[1].source,C[1].target);T.splice(T.length-1,1),this.graphManager.resetAllNodes(),this.graphManager.resetAllEdges()},w.prototype.findPlaceforPrunedNode=function(T){var E,L,C=T[0];C==T[1].source?L=T[1].target:L=T[1].source;var A=L.startX,I=L.finishX,D=L.startY,k=L.finishY,R=0,S=0,O=0,N=0,P=[R,O,S,N];if(D>0)for(var F=A;F<=I;F++)P[0]+=this.grid[F][D-1].length+this.grid[F][D].length-1;if(I<this.grid.length-1)for(var F=D;F<=k;F++)P[1]+=this.grid[I+1][F].length+this.grid[I][F].length-1;if(k<this.grid[0].length-1)for(var F=A;F<=I;F++)P[2]+=this.grid[F][k+1].length+this.grid[F][k].length-1;if(A>0)for(var F=D;F<=k;F++)P[3]+=this.grid[A-1][F].length+this.grid[A][F].length-1;for(var B=y.MAX_VALUE,$,z,W=0;W<P.length;W++)P[W]<B?(B=P[W],$=1,z=W):P[W]==B&&$++;if($==3&&B==0)P[0]==0&&P[1]==0&&P[2]==0?E=1:P[0]==0&&P[1]==0&&P[3]==0?E=0:P[0]==0&&P[2]==0&&P[3]==0?E=3:P[1]==0&&P[2]==0&&P[3]==0&&(E=2);else if($==2&&B==0){var j=Math.floor(Math.random()*2);P[0]==0&&P[1]==0?j==0?E=0:E=1:P[0]==0&&P[2]==0?j==0?E=0:E=2:P[0]==0&&P[3]==0?j==0?E=0:E=3:P[1]==0&&P[2]==0?j==0?E=1:E=2:P[1]==0&&P[3]==0?j==0?E=1:E=3:j==0?E=2:E=3}else if($==4&&B==0){var j=Math.floor(Math.random()*4);E=j}else E=z;E==0?C.setCenter(L.getCenterX(),L.getCenterY()-L.getHeight()/2-f.DEFAULT_EDGE_LENGTH-C.getHeight()/2):E==1?C.setCenter(L.getCenterX()+L.getWidth()/2+f.DEFAULT_EDGE_LENGTH+C.getWidth()/2,L.getCenterY()):E==2?C.setCenter(L.getCenterX(),L.getCenterY()+L.getHeight()/2+f.DEFAULT_EDGE_LENGTH+C.getHeight()/2):C.setCenter(L.getCenterX()-L.getWidth()/2-f.DEFAULT_EDGE_LENGTH-C.getWidth()/2,L.getCenterY())},e.exports=w},function(e,r,n){"use strict";var i={};i.layoutBase=n(0),i.CoSEConstants=n(1),i.CoSEEdge=n(2),i.CoSEGraph=n(3),i.CoSEGraphManager=n(4),i.CoSELayout=n(6),i.CoSENode=n(5),e.exports=i}])})});var L1e=Ni((cb,_B)=>{"use strict";o(function(e,r){typeof cb=="object"&&typeof _B=="object"?_B.exports=r(AB()):typeof define=="function"&&define.amd?define(["cose-base"],r):typeof cb=="object"?cb.cytoscapeCoseBilkent=r(AB()):e.cytoscapeCoseBilkent=r(e.coseBase)},"webpackUniversalModuleDefinition")(cb,function(t){return function(e){var r={};function n(i){if(r[i])return r[i].exports;var a=r[i]={i,l:!1,exports:{}};return e[i].call(a.exports,a,a.exports,n),a.l=!0,a.exports}return o(n,"__webpack_require__"),n.m=e,n.c=r,n.i=function(i){return i},n.d=function(i,a,s){n.o(i,a)||Object.defineProperty(i,a,{configurable:!1,enumerable:!0,get:s})},n.n=function(i){var a=i&&i.__esModule?o(function(){return i.default},"getDefault"):o(function(){return i},"getModuleExports");return n.d(a,"a",a),a},n.o=function(i,a){return Object.prototype.hasOwnProperty.call(i,a)},n.p="",n(n.s=1)}([function(e,r){e.exports=t},function(e,r,n){"use strict";var i=n(0).layoutBase.LayoutConstants,a=n(0).layoutBase.FDLayoutConstants,s=n(0).CoSEConstants,l=n(0).CoSELayout,u=n(0).CoSENode,h=n(0).layoutBase.PointD,f=n(0).layoutBase.DimensionD,d={ready:o(function(){},"ready"),stop:o(function(){},"stop"),quality:"default",nodeDimensionsIncludeLabels:!1,refresh:30,fit:!0,padding:10,randomize:!0,nodeRepulsion:4500,idealEdgeLength:50,edgeElasticity:.45,nestingFactor:.1,gravity:.25,numIter:2500,tile:!0,animate:"end",animationDuration:500,tilingPaddingVertical:10,tilingPaddingHorizontal:10,gravityRangeCompound:1.5,gravityCompound:1,gravityRange:3.8,initialEnergyOnIncremental:.5};function p(v,x){var b={};for(var w in v)b[w]=v[w];for(var w in x)b[w]=x[w];return b}o(p,"extend");function m(v){this.options=p(d,v),g(this.options)}o(m,"_CoSELayout");var g=o(function(x){x.nodeRepulsion!=null&&(s.DEFAULT_REPULSION_STRENGTH=a.DEFAULT_REPULSION_STRENGTH=x.nodeRepulsion),x.idealEdgeLength!=null&&(s.DEFAULT_EDGE_LENGTH=a.DEFAULT_EDGE_LENGTH=x.idealEdgeLength),x.edgeElasticity!=null&&(s.DEFAULT_SPRING_STRENGTH=a.DEFAULT_SPRING_STRENGTH=x.edgeElasticity),x.nestingFactor!=null&&(s.PER_LEVEL_IDEAL_EDGE_LENGTH_FACTOR=a.PER_LEVEL_IDEAL_EDGE_LENGTH_FACTOR=x.nestingFactor),x.gravity!=null&&(s.DEFAULT_GRAVITY_STRENGTH=a.DEFAULT_GRAVITY_STRENGTH=x.gravity),x.numIter!=null&&(s.MAX_ITERATIONS=a.MAX_ITERATIONS=x.numIter),x.gravityRange!=null&&(s.DEFAULT_GRAVITY_RANGE_FACTOR=a.DEFAULT_GRAVITY_RANGE_FACTOR=x.gravityRange),x.gravityCompound!=null&&(s.DEFAULT_COMPOUND_GRAVITY_STRENGTH=a.DEFAULT_COMPOUND_GRAVITY_STRENGTH=x.gravityCompound),x.gravityRangeCompound!=null&&(s.DEFAULT_COMPOUND_GRAVITY_RANGE_FACTOR=a.DEFAULT_COMPOUND_GRAVITY_RANGE_FACTOR=x.gravityRangeCompound),x.initialEnergyOnIncremental!=null&&(s.DEFAULT_COOLING_FACTOR_INCREMENTAL=a.DEFAULT_COOLING_FACTOR_INCREMENTAL=x.initialEnergyOnIncremental),x.quality=="draft"?i.QUALITY=0:x.quality=="proof"?i.QUALITY=2:i.QUALITY=1,s.NODE_DIMENSIONS_INCLUDE_LABELS=a.NODE_DIMENSIONS_INCLUDE_LABELS=i.NODE_DIMENSIONS_INCLUDE_LABELS=x.nodeDimensionsIncludeLabels,s.DEFAULT_INCREMENTAL=a.DEFAULT_INCREMENTAL=i.DEFAULT_INCREMENTAL=!x.randomize,s.ANIMATE=a.ANIMATE=i.ANIMATE=x.animate,s.TILE=x.tile,s.TILING_PADDING_VERTICAL=typeof x.tilingPaddingVertical=="function"?x.tilingPaddingVertical.call():x.tilingPaddingVertical,s.TILING_PADDING_HORIZONTAL=typeof x.tilingPaddingHorizontal=="function"?x.tilingPaddingHorizontal.call():x.tilingPaddingHorizontal},"getUserOptions");m.prototype.run=function(){var v,x,b=this.options,w=this.idToLNode={},_=this.layout=new l,T=this;T.stopped=!1,this.cy=this.options.cy,this.cy.trigger({type:"layoutstart",layout:this});var E=_.newGraphManager();this.gm=E;var L=this.options.eles.nodes(),C=this.options.eles.edges();this.root=E.addRoot(),this.processChildrenList(this.root,this.getTopMostNodes(L),_);for(var A=0;A<C.length;A++){var I=C[A],D=this.idToLNode[I.data("source")],k=this.idToLNode[I.data("target")];if(D!==k&&D.getEdgesBetween(k).length==0){var R=E.add(_.newEdge(),D,k);R.id=I.id()}}var S=o(function(P,F){typeof P=="number"&&(P=F);var B=P.data("id"),$=T.idToLNode[B];return{x:$.getRect().getCenterX(),y:$.getRect().getCenterY()}},"getPositions"),O=o(function N(){for(var P=o(function(){b.fit&&b.cy.fit(b.eles,b.padding),v||(v=!0,T.cy.one("layoutready",b.ready),T.cy.trigger({type:"layoutready",layout:T}))},"afterReposition"),F=T.options.refresh,B,$=0;$<F&&!B;$++)B=T.stopped||T.layout.tick();if(B){_.checkLayoutSuccess()&&!_.isSubLayout&&_.doPostLayout(),_.tilingPostLayout&&_.tilingPostLayout(),_.isLayoutFinished=!0,T.options.eles.nodes().positions(S),P(),T.cy.one("layoutstop",T.options.stop),T.cy.trigger({type:"layoutstop",layout:T}),x&&cancelAnimationFrame(x),v=!1;return}var z=T.layout.getPositionsData();b.eles.nodes().positions(function(W,j){if(typeof W=="number"&&(W=j),!W.isParent()){for(var K=W.id(),ie=z[K],Q=W;ie==null&&(ie=z[Q.data("parent")]||z["DummyCompound_"+Q.data("parent")],z[K]=ie,Q=Q.parent()[0],Q!=null););return ie!=null?{x:ie.x,y:ie.y}:{x:W.position("x"),y:W.position("y")}}}),P(),x=requestAnimationFrame(N)},"iterateAnimated");return _.addListener("layoutstarted",function(){T.options.animate==="during"&&(x=requestAnimationFrame(O))}),_.runLayout(),this.options.animate!=="during"&&(T.options.eles.nodes().not(":parent").layoutPositions(T,T.options,S),v=!1),this},m.prototype.getTopMostNodes=function(v){for(var x={},b=0;b<v.length;b++)x[v[b].id()]=!0;var w=v.filter(function(_,T){typeof _=="number"&&(_=T);for(var E=_.parent()[0];E!=null;){if(x[E.id()])return!1;E=E.parent()[0]}return!0});return w},m.prototype.processChildrenList=function(v,x,b){for(var w=x.length,_=0;_<w;_++){var T=x[_],E=T.children(),L,C=T.layoutDimensions({nodeDimensionsIncludeLabels:this.options.nodeDimensionsIncludeLabels});if(T.outerWidth()!=null&&T.outerHeight()!=null?L=v.add(new u(b.graphManager,new h(T.position("x")-C.w/2,T.position("y")-C.h/2),new f(parseFloat(C.w),parseFloat(C.h)))):L=v.add(new u(this.graphManager)),L.id=T.data("id"),L.paddingLeft=parseInt(T.css("padding")),L.paddingTop=parseInt(T.css("padding")),L.paddingRight=parseInt(T.css("padding")),L.paddingBottom=parseInt(T.css("padding")),this.options.nodeDimensionsIncludeLabels&&T.isParent()){var A=T.boundingBox({includeLabels:!0,includeNodes:!1}).w,I=T.boundingBox({includeLabels:!0,includeNodes:!1}).h,D=T.css("text-halign");L.labelWidth=A,L.labelHeight=I,L.labelPos=D}if(this.idToLNode[T.data("id")]=L,isNaN(L.rect.x)&&(L.rect.x=0),isNaN(L.rect.y)&&(L.rect.y=0),E!=null&&E.length>0){var k;k=b.getGraphManager().add(b.newGraph(),L),this.processChildrenList(k,E,b)}}},m.prototype.stop=function(){return this.stopped=!0,this};var y=o(function(x){x("layout","cose-bilkent",m)},"register");typeof cytoscape<"u"&&y(cytoscape),e.exports=y}])})});function _tt(t,e,r,n,i){return t.insert("polygon",":first-child").attr("points",n.map(function(a){return a.x+","+a.y}).join(" ")).attr("transform","translate("+(i.width-e)/2+", "+r+")")}var Ttt,ktt,Ett,Stt,Ctt,Att,Ltt,Dtt,D1e,N1e,R1e=M(()=>{"use strict";Dl();hr();Ttt=12,ktt=o(function(t,e,r,n){e.append("path").attr("id","node-"+r.id).attr("class","node-bkg node-"+t.type2Str(r.type)).attr("d",`M0 ${r.height-5} v${-r.height+2*5} q0,-5 5,-5 h${r.width-2*5} q5,0 5,5 v${r.height-5} H0 Z`),e.append("line").attr("class","node-line-"+n).attr("x1",0).attr("y1",r.height).attr("x2",r.width).attr("y2",r.height)},"defaultBkg"),Ett=o(function(t,e,r){e.append("rect").attr("id","node-"+r.id).attr("class","node-bkg node-"+t.type2Str(r.type)).attr("height",r.height).attr("width",r.width)},"rectBkg"),Stt=o(function(t,e,r){let n=r.width,i=r.height,a=.15*n,s=.25*n,l=.35*n,u=.2*n;e.append("path").attr("id","node-"+r.id).attr("class","node-bkg node-"+t.type2Str(r.type)).attr("d",`M0 0 a${a},${a} 0 0,1 ${n*.25},${-1*n*.1} + a${l},${l} 1 0,1 ${n*.4},${-1*n*.1} + a${s},${s} 1 0,1 ${n*.35},${1*n*.2} + + a${a},${a} 1 0,1 ${n*.15},${1*i*.35} + a${u},${u} 1 0,1 ${-1*n*.15},${1*i*.65} + + a${s},${a} 1 0,1 ${-1*n*.25},${n*.15} + a${l},${l} 1 0,1 ${-1*n*.5},0 + a${a},${a} 1 0,1 ${-1*n*.25},${-1*n*.15} + + a${a},${a} 1 0,1 ${-1*n*.1},${-1*i*.35} + a${u},${u} 1 0,1 ${n*.1},${-1*i*.65} + + H0 V0 Z`)},"cloudBkg"),Ctt=o(function(t,e,r){let n=r.width,i=r.height,a=.15*n;e.append("path").attr("id","node-"+r.id).attr("class","node-bkg node-"+t.type2Str(r.type)).attr("d",`M0 0 a${a},${a} 1 0,0 ${n*.25},${-1*i*.1} + a${a},${a} 1 0,0 ${n*.25},0 + a${a},${a} 1 0,0 ${n*.25},0 + a${a},${a} 1 0,0 ${n*.25},${1*i*.1} + + a${a},${a} 1 0,0 ${n*.15},${1*i*.33} + a${a*.8},${a*.8} 1 0,0 0,${1*i*.34} + a${a},${a} 1 0,0 ${-1*n*.15},${1*i*.33} + + a${a},${a} 1 0,0 ${-1*n*.25},${i*.15} + a${a},${a} 1 0,0 ${-1*n*.25},0 + a${a},${a} 1 0,0 ${-1*n*.25},0 + a${a},${a} 1 0,0 ${-1*n*.25},${-1*i*.15} + + a${a},${a} 1 0,0 ${-1*n*.1},${-1*i*.33} + a${a*.8},${a*.8} 1 0,0 0,${-1*i*.34} + a${a},${a} 1 0,0 ${n*.1},${-1*i*.33} + + H0 V0 Z`)},"bangBkg"),Att=o(function(t,e,r){e.append("circle").attr("id","node-"+r.id).attr("class","node-bkg node-"+t.type2Str(r.type)).attr("r",r.width/2)},"circleBkg");o(_tt,"insertPolygonShape");Ltt=o(function(t,e,r){let n=r.height,a=n/4,s=r.width-r.padding+2*a,l=[{x:a,y:0},{x:s-a,y:0},{x:s,y:-n/2},{x:s-a,y:-n},{x:a,y:-n},{x:0,y:-n/2}];_tt(e,s,n,l,r)},"hexagonBkg"),Dtt=o(function(t,e,r){e.append("rect").attr("id","node-"+r.id).attr("class","node-bkg node-"+t.type2Str(r.type)).attr("height",r.height).attr("rx",r.padding).attr("ry",r.padding).attr("width",r.width)},"roundedRectBkg"),D1e=o(async function(t,e,r,n,i){let a=i.htmlLabels,s=n%(Ttt-1),l=e.append("g");r.section=s;let u="section-"+s;s<0&&(u+=" section-root"),l.attr("class",(r.class?r.class+" ":"")+"mindmap-node "+u);let h=l.append("g"),f=l.append("g"),d=r.descr.replace(/(<br\/*>)/g,` +`);await Si(f,d,{useHtmlLabels:a,width:r.width,classes:"mindmap-node-label"},i),a||f.attr("dy","1em").attr("alignment-baseline","middle").attr("dominant-baseline","middle").attr("text-anchor","middle");let p=f.node().getBBox(),[m]=Fo(i.fontSize);if(r.height=p.height+m*1.1*.5+r.padding,r.width=p.width+2*r.padding,r.icon)if(r.type===t.nodeType.CIRCLE)r.height+=50,r.width+=50,l.append("foreignObject").attr("height","50px").attr("width",r.width).attr("style","text-align: center;").append("div").attr("class","icon-container").append("i").attr("class","node-icon-"+s+" "+r.icon),f.attr("transform","translate("+r.width/2+", "+(r.height/2-1.5*r.padding)+")");else{r.width+=50;let g=r.height;r.height=Math.max(g,60);let y=Math.abs(r.height-g);l.append("foreignObject").attr("width","60px").attr("height",r.height).attr("style","text-align: center;margin-top:"+y/2+"px;").append("div").attr("class","icon-container").append("i").attr("class","node-icon-"+s+" "+r.icon),f.attr("transform","translate("+(25+r.width/2)+", "+(y/2+r.padding/2)+")")}else if(a){let g=(r.width-p.width)/2,y=(r.height-p.height)/2;f.attr("transform","translate("+g+", "+y+")")}else{let g=r.width/2,y=r.padding/2;f.attr("transform","translate("+g+", "+y+")")}switch(r.type){case t.nodeType.DEFAULT:ktt(t,h,r,s);break;case t.nodeType.ROUNDED_RECT:Dtt(t,h,r,s);break;case t.nodeType.RECT:Ett(t,h,r,s);break;case t.nodeType.CIRCLE:h.attr("transform","translate("+r.width/2+", "+ +r.height/2+")"),Att(t,h,r,s);break;case t.nodeType.CLOUD:Stt(t,h,r,s);break;case t.nodeType.BANG:Ctt(t,h,r,s);break;case t.nodeType.HEXAGON:Ltt(t,h,r,s);break}return t.setElementForId(r.id,l),r.height},"drawNode"),N1e=o(function(t,e){let r=t.getElementById(e.id),n=e.x||0,i=e.y||0;r.attr("transform","translate("+n+","+i+")")},"positionNode")});async function I1e(t,e,r,n,i){await D1e(t,e,r,n,i),r.children&&await Promise.all(r.children.map((a,s)=>I1e(t,e,a,n<0?s:n,i)))}function Ntt(t,e){e.edges().map((r,n)=>{let i=r.data();if(r[0]._private.bodyBounds){let a=r[0]._private.rscratch;Y.trace("Edge: ",n,i),t.insert("path").attr("d",`M ${a.startX},${a.startY} L ${a.midX},${a.midY} L${a.endX},${a.endY} `).attr("class","edge section-edge-"+i.section+" edge-depth-"+i.depth)}})}function O1e(t,e,r,n){e.add({group:"nodes",data:{id:t.id.toString(),labelText:t.descr,height:t.height,width:t.width,level:n,nodeId:t.id,padding:t.padding,type:t.type},position:{x:t.x,y:t.y}}),t.children&&t.children.forEach(i=>{O1e(i,e,r,n+1),e.add({group:"edges",data:{id:`${t.id}_${i.id}`,source:t.id,target:i.id,depth:n,section:i.section}})})}function Rtt(t,e){return new Promise(r=>{let n=ze("body").append("div").attr("id","cy").attr("style","display:none"),i=sl({container:document.getElementById("cy"),style:[{selector:"edge",style:{"curve-style":"bezier"}}]});n.remove(),O1e(t,i,e,0),i.nodes().forEach(function(a){a.layoutDimensions=()=>{let s=a.data();return{w:s.width,h:s.height}}}),i.layout({name:"cose-bilkent",quality:"proof",styleEnabled:!1,animate:!1}).run(),i.ready(a=>{Y.info("Ready",a),r(i)})})}function Mtt(t,e){e.nodes().map((r,n)=>{let i=r.data();i.x=r.position().x,i.y=r.position().y,N1e(t,i);let a=t.getElementById(i.nodeId);Y.info("Id:",n,"Position: (",r.position().x,", ",r.position().y,")",i),a.attr("transform",`translate(${r.position().x-i.width/2}, ${r.position().y-i.height/2})`),a.attr("attr",`apa-${n})`)})}var M1e,Itt,P1e,B1e=M(()=>{"use strict";kB();M1e=ka(L1e(),1);mr();Vt();ht();Hu();ni();R1e();hs();sl.use(M1e.default);o(I1e,"drawNodes");o(Ntt,"drawEdges");o(O1e,"addNodes");o(Rtt,"layoutMindmap");o(Mtt,"positionNodes");Itt=o(async(t,e,r,n)=>{Y.debug(`Rendering mindmap diagram +`+t);let i=n.db,a=i.getMindmap();if(!a)return;let s=de();s.htmlLabels=!1;let l=Oa(e),u=l.append("g");u.attr("class","mindmap-edges");let h=l.append("g");h.attr("class","mindmap-nodes"),await I1e(i,h,a,-1,s);let f=await Rtt(a,s);Ntt(u,f),Mtt(i,f),_o(void 0,l,s.mindmap?.padding??ur.mindmap.padding,s.mindmap?.useMaxWidth??ur.mindmap.useMaxWidth)},"draw"),P1e={draw:Itt}});var Ott,Ptt,F1e,z1e=M(()=>{"use strict";To();Ott=o(t=>{let e="";for(let r=0;r<t.THEME_COLOR_LIMIT;r++)t["lineColor"+r]=t["lineColor"+r]||t["cScaleInv"+r],aa(t["lineColor"+r])?t["lineColor"+r]=Dt(t["lineColor"+r],20):t["lineColor"+r]=Bt(t["lineColor"+r],20);for(let r=0;r<t.THEME_COLOR_LIMIT;r++){let n=""+(17-3*r);e+=` + .section-${r-1} rect, .section-${r-1} path, .section-${r-1} circle, .section-${r-1} polygon, .section-${r-1} path { + fill: ${t["cScale"+r]}; + } + .section-${r-1} text { + fill: ${t["cScaleLabel"+r]}; + } + .node-icon-${r-1} { + font-size: 40px; + color: ${t["cScaleLabel"+r]}; + } + .section-edge-${r-1}{ + stroke: ${t["cScale"+r]}; + } + .edge-depth-${r-1}{ + stroke-width: ${n}; + } + .section-${r-1} line { + stroke: ${t["cScaleInv"+r]} ; + stroke-width: 3; + } + + .disabled, .disabled circle, .disabled text { + fill: lightgray; + } + .disabled text { + fill: #efefef; + } + `}return e},"genSections"),Ptt=o(t=>` + .edge { + stroke-width: 3; + } + ${Ott(t)} + .section-root rect, .section-root path, .section-root circle, .section-root polygon { + fill: ${t.git0}; + } + .section-root text { + fill: ${t.gitBranchLabel0}; + } + .icon-container { + height:100%; + display: flex; + justify-content: center; + align-items: center; + } + .edge { + fill: none; + } + .mindmap-node-label { + dy: 1em; + alignment-baseline: middle; + text-anchor: middle; + dominant-baseline: middle; + text-align: center; + } +`,"getStyles"),F1e=Ptt});var G1e={};vr(G1e,{diagram:()=>Btt});var Btt,$1e=M(()=>{"use strict";Cpe();Lpe();B1e();z1e();Btt={db:_pe,renderer:P1e,parser:Spe,styles:F1e}});var LB,H1e,W1e=M(()=>{"use strict";LB=function(){var t=o(function(L,C,A,I){for(A=A||{},I=L.length;I--;A[L[I]]=C);return A},"o"),e=[1,4],r=[1,13],n=[1,12],i=[1,15],a=[1,16],s=[1,20],l=[1,19],u=[6,7,8],h=[1,26],f=[1,24],d=[1,25],p=[6,7,11],m=[1,31],g=[6,7,11,24],y=[1,6,13,16,17,20,23],v=[1,35],x=[1,36],b=[1,6,7,11,13,16,17,20,23],w=[1,38],_={trace:o(function(){},"trace"),yy:{},symbols_:{error:2,start:3,mindMap:4,spaceLines:5,SPACELINE:6,NL:7,KANBAN:8,document:9,stop:10,EOF:11,statement:12,SPACELIST:13,node:14,shapeData:15,ICON:16,CLASS:17,nodeWithId:18,nodeWithoutId:19,NODE_DSTART:20,NODE_DESCR:21,NODE_DEND:22,NODE_ID:23,SHAPE_DATA:24,$accept:0,$end:1},terminals_:{2:"error",6:"SPACELINE",7:"NL",8:"KANBAN",11:"EOF",13:"SPACELIST",16:"ICON",17:"CLASS",20:"NODE_DSTART",21:"NODE_DESCR",22:"NODE_DEND",23:"NODE_ID",24:"SHAPE_DATA"},productions_:[0,[3,1],[3,2],[5,1],[5,2],[5,2],[4,2],[4,3],[10,1],[10,1],[10,1],[10,2],[10,2],[9,3],[9,2],[12,3],[12,2],[12,2],[12,2],[12,1],[12,2],[12,1],[12,1],[12,1],[12,1],[14,1],[14,1],[19,3],[18,1],[18,4],[15,2],[15,1]],performAction:o(function(C,A,I,D,k,R,S){var O=R.length-1;switch(k){case 6:case 7:return D;case 8:D.getLogger().trace("Stop NL ");break;case 9:D.getLogger().trace("Stop EOF ");break;case 11:D.getLogger().trace("Stop NL2 ");break;case 12:D.getLogger().trace("Stop EOF2 ");break;case 15:D.getLogger().info("Node: ",R[O-1].id),D.addNode(R[O-2].length,R[O-1].id,R[O-1].descr,R[O-1].type,R[O]);break;case 16:D.getLogger().info("Node: ",R[O].id),D.addNode(R[O-1].length,R[O].id,R[O].descr,R[O].type);break;case 17:D.getLogger().trace("Icon: ",R[O]),D.decorateNode({icon:R[O]});break;case 18:case 23:D.decorateNode({class:R[O]});break;case 19:D.getLogger().trace("SPACELIST");break;case 20:D.getLogger().trace("Node: ",R[O-1].id),D.addNode(0,R[O-1].id,R[O-1].descr,R[O-1].type,R[O]);break;case 21:D.getLogger().trace("Node: ",R[O].id),D.addNode(0,R[O].id,R[O].descr,R[O].type);break;case 22:D.decorateNode({icon:R[O]});break;case 27:D.getLogger().trace("node found ..",R[O-2]),this.$={id:R[O-1],descr:R[O-1],type:D.getType(R[O-2],R[O])};break;case 28:this.$={id:R[O],descr:R[O],type:0};break;case 29:D.getLogger().trace("node found ..",R[O-3]),this.$={id:R[O-3],descr:R[O-1],type:D.getType(R[O-2],R[O])};break;case 30:this.$=R[O-1]+R[O];break;case 31:this.$=R[O];break}},"anonymous"),table:[{3:1,4:2,5:3,6:[1,5],8:e},{1:[3]},{1:[2,1]},{4:6,6:[1,7],7:[1,8],8:e},{6:r,7:[1,10],9:9,12:11,13:n,14:14,16:i,17:a,18:17,19:18,20:s,23:l},t(u,[2,3]),{1:[2,2]},t(u,[2,4]),t(u,[2,5]),{1:[2,6],6:r,12:21,13:n,14:14,16:i,17:a,18:17,19:18,20:s,23:l},{6:r,9:22,12:11,13:n,14:14,16:i,17:a,18:17,19:18,20:s,23:l},{6:h,7:f,10:23,11:d},t(p,[2,24],{18:17,19:18,14:27,16:[1,28],17:[1,29],20:s,23:l}),t(p,[2,19]),t(p,[2,21],{15:30,24:m}),t(p,[2,22]),t(p,[2,23]),t(g,[2,25]),t(g,[2,26]),t(g,[2,28],{20:[1,32]}),{21:[1,33]},{6:h,7:f,10:34,11:d},{1:[2,7],6:r,12:21,13:n,14:14,16:i,17:a,18:17,19:18,20:s,23:l},t(y,[2,14],{7:v,11:x}),t(b,[2,8]),t(b,[2,9]),t(b,[2,10]),t(p,[2,16],{15:37,24:m}),t(p,[2,17]),t(p,[2,18]),t(p,[2,20],{24:w}),t(g,[2,31]),{21:[1,39]},{22:[1,40]},t(y,[2,13],{7:v,11:x}),t(b,[2,11]),t(b,[2,12]),t(p,[2,15],{24:w}),t(g,[2,30]),{22:[1,41]},t(g,[2,27]),t(g,[2,29])],defaultActions:{2:[2,1],6:[2,2]},parseError:o(function(C,A){if(A.recoverable)this.trace(C);else{var I=new Error(C);throw I.hash=A,I}},"parseError"),parse:o(function(C){var A=this,I=[0],D=[],k=[null],R=[],S=this.table,O="",N=0,P=0,F=0,B=2,$=1,z=R.slice.call(arguments,1),W=Object.create(this.lexer),j={yy:{}};for(var K in this.yy)Object.prototype.hasOwnProperty.call(this.yy,K)&&(j.yy[K]=this.yy[K]);W.setInput(C,j.yy),j.yy.lexer=W,j.yy.parser=this,typeof W.yylloc>"u"&&(W.yylloc={});var ie=W.yylloc;R.push(ie);var Q=W.options&&W.options.ranges;typeof j.yy.parseError=="function"?this.parseError=j.yy.parseError:this.parseError=Object.getPrototypeOf(this).parseError;function ee(Ve){I.length=I.length-2*Ve,k.length=k.length-Ve,R.length=R.length-Ve}o(ee,"popStack");function J(){var Ve;return Ve=D.pop()||W.lex()||$,typeof Ve!="number"&&(Ve instanceof Array&&(D=Ve,Ve=D.pop()),Ve=A.symbols_[Ve]||Ve),Ve}o(J,"lex");for(var H,q,Z,ae,ue,ce,te={},De,oe,ke,Fe;;){if(Z=I[I.length-1],this.defaultActions[Z]?ae=this.defaultActions[Z]:((H===null||typeof H>"u")&&(H=J()),ae=S[Z]&&S[Z][H]),typeof ae>"u"||!ae.length||!ae[0]){var Be="";Fe=[];for(De in S[Z])this.terminals_[De]&&De>B&&Fe.push("'"+this.terminals_[De]+"'");W.showPosition?Be="Parse error on line "+(N+1)+`: +`+W.showPosition()+` +Expecting `+Fe.join(", ")+", got '"+(this.terminals_[H]||H)+"'":Be="Parse error on line "+(N+1)+": Unexpected "+(H==$?"end of input":"'"+(this.terminals_[H]||H)+"'"),this.parseError(Be,{text:W.match,token:this.terminals_[H]||H,line:W.yylineno,loc:ie,expected:Fe})}if(ae[0]instanceof Array&&ae.length>1)throw new Error("Parse Error: multiple actions possible at state: "+Z+", token: "+H);switch(ae[0]){case 1:I.push(H),k.push(W.yytext),R.push(W.yylloc),I.push(ae[1]),H=null,q?(H=q,q=null):(P=W.yyleng,O=W.yytext,N=W.yylineno,ie=W.yylloc,F>0&&F--);break;case 2:if(oe=this.productions_[ae[1]][1],te.$=k[k.length-oe],te._$={first_line:R[R.length-(oe||1)].first_line,last_line:R[R.length-1].last_line,first_column:R[R.length-(oe||1)].first_column,last_column:R[R.length-1].last_column},Q&&(te._$.range=[R[R.length-(oe||1)].range[0],R[R.length-1].range[1]]),ce=this.performAction.apply(te,[O,P,N,j.yy,ae[1],k,R].concat(z)),typeof ce<"u")return ce;oe&&(I=I.slice(0,-1*oe*2),k=k.slice(0,-1*oe),R=R.slice(0,-1*oe)),I.push(this.productions_[ae[1]][0]),k.push(te.$),R.push(te._$),ke=S[I[I.length-2]][I[I.length-1]],I.push(ke);break;case 3:return!0}}return!0},"parse")},T=function(){var L={EOF:1,parseError:o(function(A,I){if(this.yy.parser)this.yy.parser.parseError(A,I);else throw new Error(A)},"parseError"),setInput:o(function(C,A){return this.yy=A||this.yy||{},this._input=C,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},"setInput"),input:o(function(){var C=this._input[0];this.yytext+=C,this.yyleng++,this.offset++,this.match+=C,this.matched+=C;var A=C.match(/(?:\r\n?|\n).*/g);return A?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),C},"input"),unput:o(function(C){var A=C.length,I=C.split(/(?:\r\n?|\n)/g);this._input=C+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-A),this.offset-=A;var D=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),I.length-1&&(this.yylineno-=I.length-1);var k=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:I?(I.length===D.length?this.yylloc.first_column:0)+D[D.length-I.length].length-I[0].length:this.yylloc.first_column-A},this.options.ranges&&(this.yylloc.range=[k[0],k[0]+this.yyleng-A]),this.yyleng=this.yytext.length,this},"unput"),more:o(function(){return this._more=!0,this},"more"),reject:o(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError("Lexical error on line "+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true). +`+this.showPosition(),{text:"",token:null,line:this.yylineno});return this},"reject"),less:o(function(C){this.unput(this.match.slice(C))},"less"),pastInput:o(function(){var C=this.matched.substr(0,this.matched.length-this.match.length);return(C.length>20?"...":"")+C.substr(-20).replace(/\n/g,"")},"pastInput"),upcomingInput:o(function(){var C=this.match;return C.length<20&&(C+=this._input.substr(0,20-C.length)),(C.substr(0,20)+(C.length>20?"...":"")).replace(/\n/g,"")},"upcomingInput"),showPosition:o(function(){var C=this.pastInput(),A=new Array(C.length+1).join("-");return C+this.upcomingInput()+` +`+A+"^"},"showPosition"),test_match:o(function(C,A){var I,D,k;if(this.options.backtrack_lexer&&(k={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(k.yylloc.range=this.yylloc.range.slice(0))),D=C[0].match(/(?:\r\n?|\n).*/g),D&&(this.yylineno+=D.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:D?D[D.length-1].length-D[D.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+C[0].length},this.yytext+=C[0],this.match+=C[0],this.matches=C,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(C[0].length),this.matched+=C[0],I=this.performAction.call(this,this.yy,this,A,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),I)return I;if(this._backtrack){for(var R in k)this[R]=k[R];return!1}return!1},"test_match"),next:o(function(){if(this.done)return this.EOF;this._input||(this.done=!0);var C,A,I,D;this._more||(this.yytext="",this.match="");for(var k=this._currentRules(),R=0;R<k.length;R++)if(I=this._input.match(this.rules[k[R]]),I&&(!A||I[0].length>A[0].length)){if(A=I,D=R,this.options.backtrack_lexer){if(C=this.test_match(I,k[R]),C!==!1)return C;if(this._backtrack){A=!1;continue}else return!1}else if(!this.options.flex)break}return A?(C=this.test_match(A,k[D]),C!==!1?C:!1):this._input===""?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+`. Unrecognized text. +`+this.showPosition(),{text:"",token:null,line:this.yylineno})},"next"),lex:o(function(){var A=this.next();return A||this.lex()},"lex"),begin:o(function(A){this.conditionStack.push(A)},"begin"),popState:o(function(){var A=this.conditionStack.length-1;return A>0?this.conditionStack.pop():this.conditionStack[0]},"popState"),_currentRules:o(function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},"_currentRules"),topState:o(function(A){return A=this.conditionStack.length-1-Math.abs(A||0),A>=0?this.conditionStack[A]:"INITIAL"},"topState"),pushState:o(function(A){this.begin(A)},"pushState"),stateStackSize:o(function(){return this.conditionStack.length},"stateStackSize"),options:{"case-insensitive":!0},performAction:o(function(A,I,D,k){var R=k;switch(D){case 0:return this.pushState("shapeData"),I.yytext="",24;break;case 1:return this.pushState("shapeDataStr"),24;break;case 2:return this.popState(),24;break;case 3:let S=/\n\s*/g;return I.yytext=I.yytext.replace(S,"<br/>"),24;break;case 4:return 24;case 5:this.popState();break;case 6:return A.getLogger().trace("Found comment",I.yytext),6;break;case 7:return 8;case 8:this.begin("CLASS");break;case 9:return this.popState(),17;break;case 10:this.popState();break;case 11:A.getLogger().trace("Begin icon"),this.begin("ICON");break;case 12:return A.getLogger().trace("SPACELINE"),6;break;case 13:return 7;case 14:return 16;case 15:A.getLogger().trace("end icon"),this.popState();break;case 16:return A.getLogger().trace("Exploding node"),this.begin("NODE"),20;break;case 17:return A.getLogger().trace("Cloud"),this.begin("NODE"),20;break;case 18:return A.getLogger().trace("Explosion Bang"),this.begin("NODE"),20;break;case 19:return A.getLogger().trace("Cloud Bang"),this.begin("NODE"),20;break;case 20:return this.begin("NODE"),20;break;case 21:return this.begin("NODE"),20;break;case 22:return this.begin("NODE"),20;break;case 23:return this.begin("NODE"),20;break;case 24:return 13;case 25:return 23;case 26:return 11;case 27:this.begin("NSTR2");break;case 28:return"NODE_DESCR";case 29:this.popState();break;case 30:A.getLogger().trace("Starting NSTR"),this.begin("NSTR");break;case 31:return A.getLogger().trace("description:",I.yytext),"NODE_DESCR";break;case 32:this.popState();break;case 33:return this.popState(),A.getLogger().trace("node end ))"),"NODE_DEND";break;case 34:return this.popState(),A.getLogger().trace("node end )"),"NODE_DEND";break;case 35:return this.popState(),A.getLogger().trace("node end ...",I.yytext),"NODE_DEND";break;case 36:return this.popState(),A.getLogger().trace("node end (("),"NODE_DEND";break;case 37:return this.popState(),A.getLogger().trace("node end (-"),"NODE_DEND";break;case 38:return this.popState(),A.getLogger().trace("node end (-"),"NODE_DEND";break;case 39:return this.popState(),A.getLogger().trace("node end (("),"NODE_DEND";break;case 40:return this.popState(),A.getLogger().trace("node end (("),"NODE_DEND";break;case 41:return A.getLogger().trace("Long description:",I.yytext),21;break;case 42:return A.getLogger().trace("Long description:",I.yytext),21;break}},"anonymous"),rules:[/^(?:@\{)/i,/^(?:["])/i,/^(?:["])/i,/^(?:[^\"]+)/i,/^(?:[^}^"]+)/i,/^(?:\})/i,/^(?:\s*%%.*)/i,/^(?:kanban\b)/i,/^(?::::)/i,/^(?:.+)/i,/^(?:\n)/i,/^(?:::icon\()/i,/^(?:[\s]+[\n])/i,/^(?:[\n]+)/i,/^(?:[^\)]+)/i,/^(?:\))/i,/^(?:-\))/i,/^(?:\(-)/i,/^(?:\)\))/i,/^(?:\))/i,/^(?:\(\()/i,/^(?:\{\{)/i,/^(?:\()/i,/^(?:\[)/i,/^(?:[\s]+)/i,/^(?:[^\(\[\n\)\{\}@]+)/i,/^(?:$)/i,/^(?:["][`])/i,/^(?:[^`"]+)/i,/^(?:[`]["])/i,/^(?:["])/i,/^(?:[^"]+)/i,/^(?:["])/i,/^(?:[\)]\))/i,/^(?:[\)])/i,/^(?:[\]])/i,/^(?:\}\})/i,/^(?:\(-)/i,/^(?:-\))/i,/^(?:\(\()/i,/^(?:\()/i,/^(?:[^\)\]\(\}]+)/i,/^(?:.+(?!\(\())/i],conditions:{shapeDataEndBracket:{rules:[],inclusive:!1},shapeDataStr:{rules:[2,3],inclusive:!1},shapeData:{rules:[1,4,5],inclusive:!1},CLASS:{rules:[9,10],inclusive:!1},ICON:{rules:[14,15],inclusive:!1},NSTR2:{rules:[28,29],inclusive:!1},NSTR:{rules:[31,32],inclusive:!1},NODE:{rules:[27,30,33,34,35,36,37,38,39,40,41,42],inclusive:!1},INITIAL:{rules:[0,6,7,8,11,12,13,16,17,18,19,20,21,22,23,24,25,26],inclusive:!0}}};return L}();_.lexer=T;function E(){this.yy={}}return o(E,"Parser"),E.prototype=_,_.Parser=E,new E}();LB.parser=LB;H1e=LB});var ol,NB,DB,RB,$tt,Vtt,Y1e,Utt,Htt,Xi,Wtt,Ytt,qtt,Xtt,jtt,Ktt,Qtt,q1e,X1e=M(()=>{"use strict";Vt();fr();ht();hs();V5();ol=[],NB=[],DB=0,RB={},$tt=o(()=>{ol=[],NB=[],DB=0,RB={}},"clear"),Vtt=o(t=>{if(ol.length===0)return null;let e=ol[0].level,r=null;for(let n=ol.length-1;n>=0;n--)if(ol[n].level===e&&!r&&(r=ol[n]),ol[n].level<e)throw new Error('Items without section detected, found section ("'+ol[n].label+'")');return t===r?.level?null:r},"getSection"),Y1e=o(function(){return NB},"getSections"),Utt=o(function(){let t=[],e=[],r=Y1e(),n=de();for(let i of r){let a={id:i.id,label:Tr(i.label??"",n),isGroup:!0,ticket:i.ticket,shape:"kanbanSection",level:i.level,look:n.look};e.push(a);let s=ol.filter(l=>l.parentId===i.id);for(let l of s){let u={id:l.id,parentId:i.id,label:Tr(l.label??"",n),isGroup:!1,ticket:l?.ticket,priority:l?.priority,assigned:l?.assigned,icon:l?.icon,shape:"kanbanItem",level:l.level,rx:5,ry:5,cssStyles:["text-align: left"]};e.push(u)}}return{nodes:e,edges:t,other:{},config:de()}},"getData"),Htt=o((t,e,r,n,i)=>{let a=de(),s=a.mindmap?.padding??ur.mindmap.padding;switch(n){case Xi.ROUNDED_RECT:case Xi.RECT:case Xi.HEXAGON:s*=2}let l={id:Tr(e,a)||"kbn"+DB++,level:t,label:Tr(r,a),width:a.mindmap?.maxNodeWidth??ur.mindmap.maxNodeWidth,padding:s,isGroup:!1};if(i!==void 0){let h;i.includes(` +`)?h=i+` +`:h=`{ +`+i+` +}`;let f=fm(h,{schema:hm});if(f.shape&&(f.shape!==f.shape.toLowerCase()||f.shape.includes("_")))throw new Error(`No such shape: ${f.shape}. Shape names should be lowercase.`);f?.shape&&f.shape==="kanbanItem"&&(l.shape=f?.shape),f?.label&&(l.label=f?.label),f?.icon&&(l.icon=f?.icon.toString()),f?.assigned&&(l.assigned=f?.assigned.toString()),f?.ticket&&(l.ticket=f?.ticket.toString()),f?.priority&&(l.priority=f?.priority)}let u=Vtt(t);u?l.parentId=u.id||"kbn"+DB++:NB.push(l),ol.push(l)},"addNode"),Xi={DEFAULT:0,NO_BORDER:0,ROUNDED_RECT:1,RECT:2,CIRCLE:3,CLOUD:4,BANG:5,HEXAGON:6},Wtt=o((t,e)=>{switch(Y.debug("In get type",t,e),t){case"[":return Xi.RECT;case"(":return e===")"?Xi.ROUNDED_RECT:Xi.CLOUD;case"((":return Xi.CIRCLE;case")":return Xi.CLOUD;case"))":return Xi.BANG;case"{{":return Xi.HEXAGON;default:return Xi.DEFAULT}},"getType"),Ytt=o((t,e)=>{RB[t]=e},"setElementForId"),qtt=o(t=>{if(!t)return;let e=de(),r=ol[ol.length-1];t.icon&&(r.icon=Tr(t.icon,e)),t.class&&(r.cssClasses=Tr(t.class,e))},"decorateNode"),Xtt=o(t=>{switch(t){case Xi.DEFAULT:return"no-border";case Xi.RECT:return"rect";case Xi.ROUNDED_RECT:return"rounded-rect";case Xi.CIRCLE:return"circle";case Xi.CLOUD:return"cloud";case Xi.BANG:return"bang";case Xi.HEXAGON:return"hexgon";default:return"no-border"}},"type2Str"),jtt=o(()=>Y,"getLogger"),Ktt=o(t=>RB[t],"getElementById"),Qtt={clear:$tt,addNode:Htt,getSections:Y1e,getData:Utt,nodeType:Xi,getType:Wtt,setElementForId:Ytt,decorateNode:qtt,type2Str:Xtt,getLogger:jtt,getElementById:Ktt},q1e=Qtt});var Ztt,j1e,K1e=M(()=>{"use strict";Vt();ht();Hu();ni();hs();K5();sw();Ztt=o(async(t,e,r,n)=>{Y.debug(`Rendering kanban diagram +`+t);let a=n.db.getData(),s=de();s.htmlLabels=!1;let l=Oa(e),u=l.append("g");u.attr("class","sections");let h=l.append("g");h.attr("class","items");let f=a.nodes.filter(v=>v.isGroup),d=0,p=10,m=[],g=25;for(let v of f){let x=s?.kanban?.sectionWidth||200;d=d+1,v.x=x*d+(d-1)*p/2,v.width=x,v.y=0,v.height=x*3,v.rx=5,v.ry=5,v.cssClasses=v.cssClasses+" section-"+d;let b=await mm(u,v);g=Math.max(g,b?.labelBBox?.height),m.push(b)}let y=0;for(let v of f){let x=m[y];y=y+1;let b=s?.kanban?.sectionWidth||200,w=-b*3/2+g,_=w,T=a.nodes.filter(C=>C.parentId===v.id);for(let C of T){if(C.isGroup)throw new Error("Groups within groups are not allowed in Kanban diagrams");C.x=v.x,C.width=b-1.5*p;let I=(await gm(h,C,{config:s})).node().getBBox();C.y=_+I.height/2,await _v(C),_=C.y+I.height/2+p/2}let E=x.cluster.select("rect"),L=Math.max(_-w+3*p,50)+(g-25);E.attr("height",L)}_o(void 0,l,s.mindmap?.padding??ur.kanban.padding,s.mindmap?.useMaxWidth??ur.kanban.useMaxWidth)},"draw"),j1e={draw:Ztt}});var Jtt,ert,Q1e,Z1e=M(()=>{"use strict";To();Jtt=o(t=>{let e="";for(let n=0;n<t.THEME_COLOR_LIMIT;n++)t["lineColor"+n]=t["lineColor"+n]||t["cScaleInv"+n],aa(t["lineColor"+n])?t["lineColor"+n]=Dt(t["lineColor"+n],20):t["lineColor"+n]=Bt(t["lineColor"+n],20);let r=o((n,i)=>t.darkMode?Bt(n,i):Dt(n,i),"adjuster");for(let n=0;n<t.THEME_COLOR_LIMIT;n++){let i=""+(17-3*n);e+=` + .section-${n-1} rect, .section-${n-1} path, .section-${n-1} circle, .section-${n-1} polygon, .section-${n-1} path { + fill: ${r(t["cScale"+n],10)}; + stroke: ${r(t["cScale"+n],10)}; + + } + .section-${n-1} text { + fill: ${t["cScaleLabel"+n]}; + } + .node-icon-${n-1} { + font-size: 40px; + color: ${t["cScaleLabel"+n]}; + } + .section-edge-${n-1}{ + stroke: ${t["cScale"+n]}; + } + .edge-depth-${n-1}{ + stroke-width: ${i}; + } + .section-${n-1} line { + stroke: ${t["cScaleInv"+n]} ; + stroke-width: 3; + } + + .disabled, .disabled circle, .disabled text { + fill: lightgray; + } + .disabled text { + fill: #efefef; + } + + .node rect, + .node circle, + .node ellipse, + .node polygon, + .node path { + fill: ${t.background}; + stroke: ${t.nodeBorder}; + stroke-width: 1px; + } + + .kanban-ticket-link { + fill: ${t.background}; + stroke: ${t.nodeBorder}; + text-decoration: underline; + } + `}return e},"genSections"),ert=o(t=>` + .edge { + stroke-width: 3; + } + ${Jtt(t)} + .section-root rect, .section-root path, .section-root circle, .section-root polygon { + fill: ${t.git0}; + } + .section-root text { + fill: ${t.gitBranchLabel0}; + } + .icon-container { + height:100%; + display: flex; + justify-content: center; + align-items: center; + } + .edge { + fill: none; + } + .cluster-label, .label { + color: ${t.textColor}; + fill: ${t.textColor}; + } + .kanban-label { + dy: 1em; + alignment-baseline: middle; + text-anchor: middle; + dominant-baseline: middle; + text-align: center; + } +`,"getStyles"),Q1e=ert});var J1e={};vr(J1e,{diagram:()=>trt});var trt,eye=M(()=>{"use strict";W1e();X1e();K1e();Z1e();trt={db:q1e,renderer:j1e,parser:H1e,styles:Q1e}});var MB,ub,nye=M(()=>{"use strict";MB=function(){var t=o(function(l,u,h,f){for(h=h||{},f=l.length;f--;h[l[f]]=u);return h},"o"),e=[1,9],r=[1,10],n=[1,5,10,12],i={trace:o(function(){},"trace"),yy:{},symbols_:{error:2,start:3,SANKEY:4,NEWLINE:5,csv:6,opt_eof:7,record:8,csv_tail:9,EOF:10,"field[source]":11,COMMA:12,"field[target]":13,"field[value]":14,field:15,escaped:16,non_escaped:17,DQUOTE:18,ESCAPED_TEXT:19,NON_ESCAPED_TEXT:20,$accept:0,$end:1},terminals_:{2:"error",4:"SANKEY",5:"NEWLINE",10:"EOF",11:"field[source]",12:"COMMA",13:"field[target]",14:"field[value]",18:"DQUOTE",19:"ESCAPED_TEXT",20:"NON_ESCAPED_TEXT"},productions_:[0,[3,4],[6,2],[9,2],[9,0],[7,1],[7,0],[8,5],[15,1],[15,1],[16,3],[17,1]],performAction:o(function(u,h,f,d,p,m,g){var y=m.length-1;switch(p){case 7:let v=d.findOrCreateNode(m[y-4].trim().replaceAll('""','"')),x=d.findOrCreateNode(m[y-2].trim().replaceAll('""','"')),b=parseFloat(m[y].trim());d.addLink(v,x,b);break;case 8:case 9:case 11:this.$=m[y];break;case 10:this.$=m[y-1];break}},"anonymous"),table:[{3:1,4:[1,2]},{1:[3]},{5:[1,3]},{6:4,8:5,15:6,16:7,17:8,18:e,20:r},{1:[2,6],7:11,10:[1,12]},t(r,[2,4],{9:13,5:[1,14]}),{12:[1,15]},t(n,[2,8]),t(n,[2,9]),{19:[1,16]},t(n,[2,11]),{1:[2,1]},{1:[2,5]},t(r,[2,2]),{6:17,8:5,15:6,16:7,17:8,18:e,20:r},{15:18,16:7,17:8,18:e,20:r},{18:[1,19]},t(r,[2,3]),{12:[1,20]},t(n,[2,10]),{15:21,16:7,17:8,18:e,20:r},t([1,5,10],[2,7])],defaultActions:{11:[2,1],12:[2,5]},parseError:o(function(u,h){if(h.recoverable)this.trace(u);else{var f=new Error(u);throw f.hash=h,f}},"parseError"),parse:o(function(u){var h=this,f=[0],d=[],p=[null],m=[],g=this.table,y="",v=0,x=0,b=0,w=2,_=1,T=m.slice.call(arguments,1),E=Object.create(this.lexer),L={yy:{}};for(var C in this.yy)Object.prototype.hasOwnProperty.call(this.yy,C)&&(L.yy[C]=this.yy[C]);E.setInput(u,L.yy),L.yy.lexer=E,L.yy.parser=this,typeof E.yylloc>"u"&&(E.yylloc={});var A=E.yylloc;m.push(A);var I=E.options&&E.options.ranges;typeof L.yy.parseError=="function"?this.parseError=L.yy.parseError:this.parseError=Object.getPrototypeOf(this).parseError;function D(ie){f.length=f.length-2*ie,p.length=p.length-ie,m.length=m.length-ie}o(D,"popStack");function k(){var ie;return ie=d.pop()||E.lex()||_,typeof ie!="number"&&(ie instanceof Array&&(d=ie,ie=d.pop()),ie=h.symbols_[ie]||ie),ie}o(k,"lex");for(var R,S,O,N,P,F,B={},$,z,W,j;;){if(O=f[f.length-1],this.defaultActions[O]?N=this.defaultActions[O]:((R===null||typeof R>"u")&&(R=k()),N=g[O]&&g[O][R]),typeof N>"u"||!N.length||!N[0]){var K="";j=[];for($ in g[O])this.terminals_[$]&&$>w&&j.push("'"+this.terminals_[$]+"'");E.showPosition?K="Parse error on line "+(v+1)+`: +`+E.showPosition()+` +Expecting `+j.join(", ")+", got '"+(this.terminals_[R]||R)+"'":K="Parse error on line "+(v+1)+": Unexpected "+(R==_?"end of input":"'"+(this.terminals_[R]||R)+"'"),this.parseError(K,{text:E.match,token:this.terminals_[R]||R,line:E.yylineno,loc:A,expected:j})}if(N[0]instanceof Array&&N.length>1)throw new Error("Parse Error: multiple actions possible at state: "+O+", token: "+R);switch(N[0]){case 1:f.push(R),p.push(E.yytext),m.push(E.yylloc),f.push(N[1]),R=null,S?(R=S,S=null):(x=E.yyleng,y=E.yytext,v=E.yylineno,A=E.yylloc,b>0&&b--);break;case 2:if(z=this.productions_[N[1]][1],B.$=p[p.length-z],B._$={first_line:m[m.length-(z||1)].first_line,last_line:m[m.length-1].last_line,first_column:m[m.length-(z||1)].first_column,last_column:m[m.length-1].last_column},I&&(B._$.range=[m[m.length-(z||1)].range[0],m[m.length-1].range[1]]),F=this.performAction.apply(B,[y,x,v,L.yy,N[1],p,m].concat(T)),typeof F<"u")return F;z&&(f=f.slice(0,-1*z*2),p=p.slice(0,-1*z),m=m.slice(0,-1*z)),f.push(this.productions_[N[1]][0]),p.push(B.$),m.push(B._$),W=g[f[f.length-2]][f[f.length-1]],f.push(W);break;case 3:return!0}}return!0},"parse")},a=function(){var l={EOF:1,parseError:o(function(h,f){if(this.yy.parser)this.yy.parser.parseError(h,f);else throw new Error(h)},"parseError"),setInput:o(function(u,h){return this.yy=h||this.yy||{},this._input=u,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},"setInput"),input:o(function(){var u=this._input[0];this.yytext+=u,this.yyleng++,this.offset++,this.match+=u,this.matched+=u;var h=u.match(/(?:\r\n?|\n).*/g);return h?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),u},"input"),unput:o(function(u){var h=u.length,f=u.split(/(?:\r\n?|\n)/g);this._input=u+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-h),this.offset-=h;var d=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),f.length-1&&(this.yylineno-=f.length-1);var p=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:f?(f.length===d.length?this.yylloc.first_column:0)+d[d.length-f.length].length-f[0].length:this.yylloc.first_column-h},this.options.ranges&&(this.yylloc.range=[p[0],p[0]+this.yyleng-h]),this.yyleng=this.yytext.length,this},"unput"),more:o(function(){return this._more=!0,this},"more"),reject:o(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError("Lexical error on line "+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true). +`+this.showPosition(),{text:"",token:null,line:this.yylineno});return this},"reject"),less:o(function(u){this.unput(this.match.slice(u))},"less"),pastInput:o(function(){var u=this.matched.substr(0,this.matched.length-this.match.length);return(u.length>20?"...":"")+u.substr(-20).replace(/\n/g,"")},"pastInput"),upcomingInput:o(function(){var u=this.match;return u.length<20&&(u+=this._input.substr(0,20-u.length)),(u.substr(0,20)+(u.length>20?"...":"")).replace(/\n/g,"")},"upcomingInput"),showPosition:o(function(){var u=this.pastInput(),h=new Array(u.length+1).join("-");return u+this.upcomingInput()+` +`+h+"^"},"showPosition"),test_match:o(function(u,h){var f,d,p;if(this.options.backtrack_lexer&&(p={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(p.yylloc.range=this.yylloc.range.slice(0))),d=u[0].match(/(?:\r\n?|\n).*/g),d&&(this.yylineno+=d.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:d?d[d.length-1].length-d[d.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+u[0].length},this.yytext+=u[0],this.match+=u[0],this.matches=u,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(u[0].length),this.matched+=u[0],f=this.performAction.call(this,this.yy,this,h,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),f)return f;if(this._backtrack){for(var m in p)this[m]=p[m];return!1}return!1},"test_match"),next:o(function(){if(this.done)return this.EOF;this._input||(this.done=!0);var u,h,f,d;this._more||(this.yytext="",this.match="");for(var p=this._currentRules(),m=0;m<p.length;m++)if(f=this._input.match(this.rules[p[m]]),f&&(!h||f[0].length>h[0].length)){if(h=f,d=m,this.options.backtrack_lexer){if(u=this.test_match(f,p[m]),u!==!1)return u;if(this._backtrack){h=!1;continue}else return!1}else if(!this.options.flex)break}return h?(u=this.test_match(h,p[d]),u!==!1?u:!1):this._input===""?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+`. Unrecognized text. +`+this.showPosition(),{text:"",token:null,line:this.yylineno})},"next"),lex:o(function(){var h=this.next();return h||this.lex()},"lex"),begin:o(function(h){this.conditionStack.push(h)},"begin"),popState:o(function(){var h=this.conditionStack.length-1;return h>0?this.conditionStack.pop():this.conditionStack[0]},"popState"),_currentRules:o(function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},"_currentRules"),topState:o(function(h){return h=this.conditionStack.length-1-Math.abs(h||0),h>=0?this.conditionStack[h]:"INITIAL"},"topState"),pushState:o(function(h){this.begin(h)},"pushState"),stateStackSize:o(function(){return this.conditionStack.length},"stateStackSize"),options:{"case-insensitive":!0},performAction:o(function(h,f,d,p){var m=p;switch(d){case 0:return this.pushState("csv"),4;break;case 1:return 10;case 2:return 5;case 3:return 12;case 4:return this.pushState("escaped_text"),18;break;case 5:return 20;case 6:return this.popState("escaped_text"),18;break;case 7:return 19}},"anonymous"),rules:[/^(?:sankey-beta\b)/i,/^(?:$)/i,/^(?:((\u000D\u000A)|(\u000A)))/i,/^(?:(\u002C))/i,/^(?:(\u0022))/i,/^(?:([\u0020-\u0021\u0023-\u002B\u002D-\u007E])*)/i,/^(?:(\u0022)(?!(\u0022)))/i,/^(?:(([\u0020-\u0021\u0023-\u002B\u002D-\u007E])|(\u002C)|(\u000D)|(\u000A)|(\u0022)(\u0022))*)/i],conditions:{csv:{rules:[1,2,3,4,5,6,7],inclusive:!1},escaped_text:{rules:[6,7],inclusive:!1},INITIAL:{rules:[0,1,2,3,4,5,6,7],inclusive:!0}}};return l}();i.lexer=a;function s(){this.yy={}}return o(s,"Parser"),s.prototype=i,i.Parser=s,new s}();MB.parser=MB;ub=MB});var H6,W6,U6,art,IB,srt,OB,ort,lrt,crt,urt,iye,aye=M(()=>{"use strict";Vt();fr();ki();H6=[],W6=[],U6=new Map,art=o(()=>{H6=[],W6=[],U6=new Map,_r()},"clear"),IB=class{constructor(e,r,n=0){this.source=e;this.target=r;this.value=n}static{o(this,"SankeyLink")}},srt=o((t,e,r)=>{H6.push(new IB(t,e,r))},"addLink"),OB=class{constructor(e){this.ID=e}static{o(this,"SankeyNode")}},ort=o(t=>{t=je.sanitizeText(t,de());let e=U6.get(t);return e===void 0&&(e=new OB(t),U6.set(t,e),W6.push(e)),e},"findOrCreateNode"),lrt=o(()=>W6,"getNodes"),crt=o(()=>H6,"getLinks"),urt=o(()=>({nodes:W6.map(t=>({id:t.ID})),links:H6.map(t=>({source:t.source.ID,target:t.target.ID,value:t.value}))}),"getGraph"),iye={nodesMap:U6,getConfig:o(()=>de().sankey,"getConfig"),getNodes:lrt,getLinks:crt,getGraph:urt,addLink:srt,findOrCreateNode:ort,getAccTitle:Pr,setAccTitle:Rr,getAccDescription:Fr,setAccDescription:Br,getDiagramTitle:Jr,setDiagramTitle:ln,clear:art}});function hb(t,e){let r;if(e===void 0)for(let n of t)n!=null&&(r<n||r===void 0&&n>=n)&&(r=n);else{let n=-1;for(let i of t)(i=e(i,++n,t))!=null&&(r<i||r===void 0&&i>=i)&&(r=i)}return r}var sye=M(()=>{"use strict";o(hb,"max")});function T1(t,e){let r;if(e===void 0)for(let n of t)n!=null&&(r>n||r===void 0&&n>=n)&&(r=n);else{let n=-1;for(let i of t)(i=e(i,++n,t))!=null&&(r>i||r===void 0&&i>=i)&&(r=i)}return r}var oye=M(()=>{"use strict";o(T1,"min")});function k1(t,e){let r=0;if(e===void 0)for(let n of t)(n=+n)&&(r+=n);else{let n=-1;for(let i of t)(i=+e(i,++n,t))&&(r+=i)}return r}var lye=M(()=>{"use strict";o(k1,"sum")});var PB=M(()=>{"use strict";sye();oye();lye()});function hrt(t){return t.target.depth}function BB(t){return t.depth}function FB(t,e){return e-1-t.height}function fb(t,e){return t.sourceLinks.length?t.depth:e-1}function zB(t){return t.targetLinks.length?t.depth:t.sourceLinks.length?T1(t.sourceLinks,hrt)-1:0}var GB=M(()=>{"use strict";PB();o(hrt,"targetDepth");o(BB,"left");o(FB,"right");o(fb,"justify");o(zB,"center")});function E1(t){return function(){return t}}var cye=M(()=>{"use strict";o(E1,"constant")});function uye(t,e){return Y6(t.source,e.source)||t.index-e.index}function hye(t,e){return Y6(t.target,e.target)||t.index-e.index}function Y6(t,e){return t.y0-e.y0}function $B(t){return t.value}function frt(t){return t.index}function drt(t){return t.nodes}function prt(t){return t.links}function fye(t,e){let r=t.get(e);if(!r)throw new Error("missing: "+e);return r}function dye({nodes:t}){for(let e of t){let r=e.y0,n=r;for(let i of e.sourceLinks)i.y0=r+i.width/2,r+=i.width;for(let i of e.targetLinks)i.y1=n+i.width/2,n+=i.width}}function q6(){let t=0,e=0,r=1,n=1,i=24,a=8,s,l=frt,u=fb,h,f,d=drt,p=prt,m=6;function g(){let O={nodes:d.apply(null,arguments),links:p.apply(null,arguments)};return y(O),v(O),x(O),b(O),T(O),dye(O),O}o(g,"sankey"),g.update=function(O){return dye(O),O},g.nodeId=function(O){return arguments.length?(l=typeof O=="function"?O:E1(O),g):l},g.nodeAlign=function(O){return arguments.length?(u=typeof O=="function"?O:E1(O),g):u},g.nodeSort=function(O){return arguments.length?(h=O,g):h},g.nodeWidth=function(O){return arguments.length?(i=+O,g):i},g.nodePadding=function(O){return arguments.length?(a=s=+O,g):a},g.nodes=function(O){return arguments.length?(d=typeof O=="function"?O:E1(O),g):d},g.links=function(O){return arguments.length?(p=typeof O=="function"?O:E1(O),g):p},g.linkSort=function(O){return arguments.length?(f=O,g):f},g.size=function(O){return arguments.length?(t=e=0,r=+O[0],n=+O[1],g):[r-t,n-e]},g.extent=function(O){return arguments.length?(t=+O[0][0],r=+O[1][0],e=+O[0][1],n=+O[1][1],g):[[t,e],[r,n]]},g.iterations=function(O){return arguments.length?(m=+O,g):m};function y({nodes:O,links:N}){for(let[F,B]of O.entries())B.index=F,B.sourceLinks=[],B.targetLinks=[];let P=new Map(O.map((F,B)=>[l(F,B,O),F]));for(let[F,B]of N.entries()){B.index=F;let{source:$,target:z}=B;typeof $!="object"&&($=B.source=fye(P,$)),typeof z!="object"&&(z=B.target=fye(P,z)),$.sourceLinks.push(B),z.targetLinks.push(B)}if(f!=null)for(let{sourceLinks:F,targetLinks:B}of O)F.sort(f),B.sort(f)}o(y,"computeNodeLinks");function v({nodes:O}){for(let N of O)N.value=N.fixedValue===void 0?Math.max(k1(N.sourceLinks,$B),k1(N.targetLinks,$B)):N.fixedValue}o(v,"computeNodeValues");function x({nodes:O}){let N=O.length,P=new Set(O),F=new Set,B=0;for(;P.size;){for(let $ of P){$.depth=B;for(let{target:z}of $.sourceLinks)F.add(z)}if(++B>N)throw new Error("circular link");P=F,F=new Set}}o(x,"computeNodeDepths");function b({nodes:O}){let N=O.length,P=new Set(O),F=new Set,B=0;for(;P.size;){for(let $ of P){$.height=B;for(let{source:z}of $.targetLinks)F.add(z)}if(++B>N)throw new Error("circular link");P=F,F=new Set}}o(b,"computeNodeHeights");function w({nodes:O}){let N=hb(O,B=>B.depth)+1,P=(r-t-i)/(N-1),F=new Array(N);for(let B of O){let $=Math.max(0,Math.min(N-1,Math.floor(u.call(null,B,N))));B.layer=$,B.x0=t+$*P,B.x1=B.x0+i,F[$]?F[$].push(B):F[$]=[B]}if(h)for(let B of F)B.sort(h);return F}o(w,"computeNodeLayers");function _(O){let N=T1(O,P=>(n-e-(P.length-1)*s)/k1(P,$B));for(let P of O){let F=e;for(let B of P){B.y0=F,B.y1=F+B.value*N,F=B.y1+s;for(let $ of B.sourceLinks)$.width=$.value*N}F=(n-F+s)/(P.length+1);for(let B=0;B<P.length;++B){let $=P[B];$.y0+=F*(B+1),$.y1+=F*(B+1)}k(P)}}o(_,"initializeNodeBreadths");function T(O){let N=w(O);s=Math.min(a,(n-e)/(hb(N,P=>P.length)-1)),_(N);for(let P=0;P<m;++P){let F=Math.pow(.99,P),B=Math.max(1-F,(P+1)/m);L(N,F,B),E(N,F,B)}}o(T,"computeNodeBreadths");function E(O,N,P){for(let F=1,B=O.length;F<B;++F){let $=O[F];for(let z of $){let W=0,j=0;for(let{source:ie,value:Q}of z.targetLinks){let ee=Q*(z.layer-ie.layer);W+=R(ie,z)*ee,j+=ee}if(!(j>0))continue;let K=(W/j-z.y0)*N;z.y0+=K,z.y1+=K,D(z)}h===void 0&&$.sort(Y6),C($,P)}}o(E,"relaxLeftToRight");function L(O,N,P){for(let F=O.length,B=F-2;B>=0;--B){let $=O[B];for(let z of $){let W=0,j=0;for(let{target:ie,value:Q}of z.sourceLinks){let ee=Q*(ie.layer-z.layer);W+=S(z,ie)*ee,j+=ee}if(!(j>0))continue;let K=(W/j-z.y0)*N;z.y0+=K,z.y1+=K,D(z)}h===void 0&&$.sort(Y6),C($,P)}}o(L,"relaxRightToLeft");function C(O,N){let P=O.length>>1,F=O[P];I(O,F.y0-s,P-1,N),A(O,F.y1+s,P+1,N),I(O,n,O.length-1,N),A(O,e,0,N)}o(C,"resolveCollisions");function A(O,N,P,F){for(;P<O.length;++P){let B=O[P],$=(N-B.y0)*F;$>1e-6&&(B.y0+=$,B.y1+=$),N=B.y1+s}}o(A,"resolveCollisionsTopToBottom");function I(O,N,P,F){for(;P>=0;--P){let B=O[P],$=(B.y1-N)*F;$>1e-6&&(B.y0-=$,B.y1-=$),N=B.y0-s}}o(I,"resolveCollisionsBottomToTop");function D({sourceLinks:O,targetLinks:N}){if(f===void 0){for(let{source:{sourceLinks:P}}of N)P.sort(hye);for(let{target:{targetLinks:P}}of O)P.sort(uye)}}o(D,"reorderNodeLinks");function k(O){if(f===void 0)for(let{sourceLinks:N,targetLinks:P}of O)N.sort(hye),P.sort(uye)}o(k,"reorderLinks");function R(O,N){let P=O.y0-(O.sourceLinks.length-1)*s/2;for(let{target:F,width:B}of O.sourceLinks){if(F===N)break;P+=B+s}for(let{source:F,width:B}of N.targetLinks){if(F===O)break;P-=B}return P}o(R,"targetTop");function S(O,N){let P=N.y0-(N.targetLinks.length-1)*s/2;for(let{source:F,width:B}of N.targetLinks){if(F===O)break;P+=B+s}for(let{target:F,width:B}of O.sourceLinks){if(F===N)break;P-=B}return P}return o(S,"sourceTop"),g}var pye=M(()=>{"use strict";PB();GB();cye();o(uye,"ascendingSourceBreadth");o(hye,"ascendingTargetBreadth");o(Y6,"ascendingBreadth");o($B,"value");o(frt,"defaultId");o(drt,"defaultNodes");o(prt,"defaultLinks");o(fye,"find");o(dye,"computeLinkBreadths");o(q6,"Sankey")});function HB(){this._x0=this._y0=this._x1=this._y1=null,this._=""}function mye(){return new HB}var VB,UB,q0,mrt,WB,gye=M(()=>{"use strict";VB=Math.PI,UB=2*VB,q0=1e-6,mrt=UB-q0;o(HB,"Path");o(mye,"path");HB.prototype=mye.prototype={constructor:HB,moveTo:o(function(t,e){this._+="M"+(this._x0=this._x1=+t)+","+(this._y0=this._y1=+e)},"moveTo"),closePath:o(function(){this._x1!==null&&(this._x1=this._x0,this._y1=this._y0,this._+="Z")},"closePath"),lineTo:o(function(t,e){this._+="L"+(this._x1=+t)+","+(this._y1=+e)},"lineTo"),quadraticCurveTo:o(function(t,e,r,n){this._+="Q"+ +t+","+ +e+","+(this._x1=+r)+","+(this._y1=+n)},"quadraticCurveTo"),bezierCurveTo:o(function(t,e,r,n,i,a){this._+="C"+ +t+","+ +e+","+ +r+","+ +n+","+(this._x1=+i)+","+(this._y1=+a)},"bezierCurveTo"),arcTo:o(function(t,e,r,n,i){t=+t,e=+e,r=+r,n=+n,i=+i;var a=this._x1,s=this._y1,l=r-t,u=n-e,h=a-t,f=s-e,d=h*h+f*f;if(i<0)throw new Error("negative radius: "+i);if(this._x1===null)this._+="M"+(this._x1=t)+","+(this._y1=e);else if(d>q0)if(!(Math.abs(f*l-u*h)>q0)||!i)this._+="L"+(this._x1=t)+","+(this._y1=e);else{var p=r-a,m=n-s,g=l*l+u*u,y=p*p+m*m,v=Math.sqrt(g),x=Math.sqrt(d),b=i*Math.tan((VB-Math.acos((g+d-y)/(2*v*x)))/2),w=b/x,_=b/v;Math.abs(w-1)>q0&&(this._+="L"+(t+w*h)+","+(e+w*f)),this._+="A"+i+","+i+",0,0,"+ +(f*p>h*m)+","+(this._x1=t+_*l)+","+(this._y1=e+_*u)}},"arcTo"),arc:o(function(t,e,r,n,i,a){t=+t,e=+e,r=+r,a=!!a;var s=r*Math.cos(n),l=r*Math.sin(n),u=t+s,h=e+l,f=1^a,d=a?n-i:i-n;if(r<0)throw new Error("negative radius: "+r);this._x1===null?this._+="M"+u+","+h:(Math.abs(this._x1-u)>q0||Math.abs(this._y1-h)>q0)&&(this._+="L"+u+","+h),r&&(d<0&&(d=d%UB+UB),d>mrt?this._+="A"+r+","+r+",0,1,"+f+","+(t-s)+","+(e-l)+"A"+r+","+r+",0,1,"+f+","+(this._x1=u)+","+(this._y1=h):d>q0&&(this._+="A"+r+","+r+",0,"+ +(d>=VB)+","+f+","+(this._x1=t+r*Math.cos(i))+","+(this._y1=e+r*Math.sin(i))))},"arc"),rect:o(function(t,e,r,n){this._+="M"+(this._x0=this._x1=+t)+","+(this._y0=this._y1=+e)+"h"+ +r+"v"+ +n+"h"+-r+"Z"},"rect"),toString:o(function(){return this._},"toString")};WB=mye});var yye=M(()=>{"use strict";gye()});function X6(t){return o(function(){return t},"constant")}var vye=M(()=>{"use strict";o(X6,"default")});function xye(t){return t[0]}function bye(t){return t[1]}var wye=M(()=>{"use strict";o(xye,"x");o(bye,"y")});var Tye,kye=M(()=>{"use strict";Tye=Array.prototype.slice});function grt(t){return t.source}function yrt(t){return t.target}function vrt(t){var e=grt,r=yrt,n=xye,i=bye,a=null;function s(){var l,u=Tye.call(arguments),h=e.apply(this,u),f=r.apply(this,u);if(a||(a=l=WB()),t(a,+n.apply(this,(u[0]=h,u)),+i.apply(this,u),+n.apply(this,(u[0]=f,u)),+i.apply(this,u)),l)return a=null,l+""||null}return o(s,"link"),s.source=function(l){return arguments.length?(e=l,s):e},s.target=function(l){return arguments.length?(r=l,s):r},s.x=function(l){return arguments.length?(n=typeof l=="function"?l:X6(+l),s):n},s.y=function(l){return arguments.length?(i=typeof l=="function"?l:X6(+l),s):i},s.context=function(l){return arguments.length?(a=l??null,s):a},s}function xrt(t,e,r,n,i){t.moveTo(e,r),t.bezierCurveTo(e=(e+n)/2,r,e,i,n,i)}function YB(){return vrt(xrt)}var Eye=M(()=>{"use strict";yye();kye();vye();wye();o(grt,"linkSource");o(yrt,"linkTarget");o(vrt,"link");o(xrt,"curveHorizontal");o(YB,"linkHorizontal")});var Sye=M(()=>{"use strict";Eye()});function brt(t){return[t.source.x1,t.y0]}function wrt(t){return[t.target.x0,t.y1]}function j6(){return YB().source(brt).target(wrt)}var Cye=M(()=>{"use strict";Sye();o(brt,"horizontalSource");o(wrt,"horizontalTarget");o(j6,"default")});var Aye=M(()=>{"use strict";pye();GB();Cye()});var db,_ye=M(()=>{"use strict";db=class t{static{o(this,"Uid")}static{this.count=0}static next(e){return new t(e+ ++t.count)}constructor(e){this.id=e,this.href=`#${e}`}toString(){return"url("+this.href+")"}}});var Trt,krt,Lye,Dye=M(()=>{"use strict";Vt();mr();Aye();ni();_ye();Trt={left:BB,right:FB,center:zB,justify:fb},krt=o(function(t,e,r,n){let{securityLevel:i,sankey:a}=de(),s=S4.sankey,l;i==="sandbox"&&(l=ze("#i"+e));let u=i==="sandbox"?ze(l.nodes()[0].contentDocument.body):ze("body"),h=i==="sandbox"?u.select(`[id="${e}"]`):ze(`[id="${e}"]`),f=a?.width??s.width,d=a?.height??s.width,p=a?.useMaxWidth??s.useMaxWidth,m=a?.nodeAlignment??s.nodeAlignment,g=a?.prefix??s.prefix,y=a?.suffix??s.suffix,v=a?.showValues??s.showValues,x=n.db.getGraph(),b=Trt[m];q6().nodeId(I=>I.id).nodeWidth(10).nodePadding(10+(v?15:0)).nodeAlign(b).extent([[0,0],[f,d]])(x);let T=du(Z8);h.append("g").attr("class","nodes").selectAll(".node").data(x.nodes).join("g").attr("class","node").attr("id",I=>(I.uid=db.next("node-")).id).attr("transform",function(I){return"translate("+I.x0+","+I.y0+")"}).attr("x",I=>I.x0).attr("y",I=>I.y0).append("rect").attr("height",I=>I.y1-I.y0).attr("width",I=>I.x1-I.x0).attr("fill",I=>T(I.id));let E=o(({id:I,value:D})=>v?`${I} +${g}${Math.round(D*100)/100}${y}`:I,"getText");h.append("g").attr("class","node-labels").attr("font-family","sans-serif").attr("font-size",14).selectAll("text").data(x.nodes).join("text").attr("x",I=>I.x0<f/2?I.x1+6:I.x0-6).attr("y",I=>(I.y1+I.y0)/2).attr("dy",`${v?"0":"0.35"}em`).attr("text-anchor",I=>I.x0<f/2?"start":"end").text(E);let L=h.append("g").attr("class","links").attr("fill","none").attr("stroke-opacity",.5).selectAll(".link").data(x.links).join("g").attr("class","link").style("mix-blend-mode","multiply"),C=a?.linkColor??"gradient";if(C==="gradient"){let I=L.append("linearGradient").attr("id",D=>(D.uid=db.next("linearGradient-")).id).attr("gradientUnits","userSpaceOnUse").attr("x1",D=>D.source.x1).attr("x2",D=>D.target.x0);I.append("stop").attr("offset","0%").attr("stop-color",D=>T(D.source.id)),I.append("stop").attr("offset","100%").attr("stop-color",D=>T(D.target.id))}let A;switch(C){case"gradient":A=o(I=>I.uid,"coloring");break;case"source":A=o(I=>T(I.source.id),"coloring");break;case"target":A=o(I=>T(I.target.id),"coloring");break;default:A=C}L.append("path").attr("d",j6()).attr("stroke",A).attr("stroke-width",I=>Math.max(1,I.width)),_o(void 0,h,0,p)},"draw"),Lye={draw:krt}});var Nye,Rye=M(()=>{"use strict";Nye=o(t=>t.replaceAll(/^[^\S\n\r]+|[^\S\n\r]+$/g,"").replaceAll(/([\n\r])+/g,` +`).trim(),"prepareTextForParsing")});var Mye={};vr(Mye,{diagram:()=>Srt});var Ert,Srt,Iye=M(()=>{"use strict";nye();aye();Dye();Rye();Ert=ub.parse.bind(ub);ub.parse=t=>Ert(Nye(t));Srt={parser:ub,db:iye,renderer:Lye}});var Bye,qB,Lrt,Drt,Nrt,Rrt,Mrt,Rf,XB=M(()=>{"use strict";Ua();hs();hr();ki();Bye={packet:[]},qB=structuredClone(Bye),Lrt=ur.packet,Drt=o(()=>{let t=ws({...Lrt,...Sr().packet});return t.showBits&&(t.paddingY+=10),t},"getConfig"),Nrt=o(()=>qB.packet,"getPacket"),Rrt=o(t=>{t.length>0&&qB.packet.push(t)},"pushWord"),Mrt=o(()=>{_r(),qB=structuredClone(Bye)},"clear"),Rf={pushWord:Rrt,getPacket:Nrt,getConfig:Drt,clear:Mrt,setAccTitle:Rr,getAccTitle:Pr,setDiagramTitle:ln,getDiagramTitle:Jr,getAccDescription:Fr,setAccDescription:Br}});var Irt,Ort,Prt,Fye,zye=M(()=>{"use strict";Ng();ht();ox();XB();Irt=1e4,Ort=o(t=>{lf(t,Rf);let e=-1,r=[],n=1,{bitsPerRow:i}=Rf.getConfig();for(let{start:a,end:s,label:l}of t.blocks){if(s&&s<a)throw new Error(`Packet block ${a} - ${s} is invalid. End must be greater than start.`);if(a!==e+1)throw new Error(`Packet block ${a} - ${s??a} is not contiguous. It should start from ${e+1}.`);for(e=s??a,Y.debug(`Packet block ${a} - ${e} with label ${l}`);r.length<=i+1&&Rf.getPacket().length<Irt;){let[u,h]=Prt({start:a,end:s,label:l},n,i);if(r.push(u),u.end+1===n*i&&(Rf.pushWord(r),r=[],n++),!h)break;({start:a,end:s,label:l}=h)}}Rf.pushWord(r)},"populate"),Prt=o((t,e,r)=>{if(t.end===void 0&&(t.end=t.start),t.start>t.end)throw new Error(`Block start ${t.start} is greater than block end ${t.end}.`);return t.end+1<=e*r?[t,void 0]:[{start:t.start,end:e*r-1,label:t.label},{start:e*r,end:t.end,label:t.label}]},"getNextFittingBlock"),Fye={parse:o(async t=>{let e=await Gl("packet",t);Y.debug(e),Ort(e)},"parse")}});var Brt,Frt,Gye,$ye=M(()=>{"use strict";Hu();ni();Brt=o((t,e,r,n)=>{let i=n.db,a=i.getConfig(),{rowHeight:s,paddingY:l,bitWidth:u,bitsPerRow:h}=a,f=i.getPacket(),d=i.getDiagramTitle(),p=s+l,m=p*(f.length+1)-(d?0:s),g=u*h+2,y=Oa(e);y.attr("viewbox",`0 0 ${g} ${m}`),Zr(y,m,g,a.useMaxWidth);for(let[v,x]of f.entries())Frt(y,x,v,a);y.append("text").text(d).attr("x",g/2).attr("y",m-p/2).attr("dominant-baseline","middle").attr("text-anchor","middle").attr("class","packetTitle")},"draw"),Frt=o((t,e,r,{rowHeight:n,paddingX:i,paddingY:a,bitWidth:s,bitsPerRow:l,showBits:u})=>{let h=t.append("g"),f=r*(n+a)+a;for(let d of e){let p=d.start%l*s+1,m=(d.end-d.start+1)*s-i;if(h.append("rect").attr("x",p).attr("y",f).attr("width",m).attr("height",n).attr("class","packetBlock"),h.append("text").attr("x",p+m/2).attr("y",f+n/2).attr("class","packetLabel").attr("dominant-baseline","middle").attr("text-anchor","middle").text(d.label),!u)continue;let g=d.end===d.start,y=f-2;h.append("text").attr("x",p+(g?m/2:0)).attr("y",y).attr("class","packetByte start").attr("dominant-baseline","auto").attr("text-anchor",g?"middle":"start").text(d.start),g||h.append("text").attr("x",p+m).attr("y",y).attr("class","packetByte end").attr("dominant-baseline","auto").attr("text-anchor","end").text(d.end)}},"drawWord"),Gye={draw:Brt}});var zrt,Vye,Uye=M(()=>{"use strict";hr();zrt={byteFontSize:"10px",startByteColor:"black",endByteColor:"black",labelColor:"black",labelFontSize:"12px",titleColor:"black",titleFontSize:"14px",blockStrokeColor:"black",blockStrokeWidth:"1",blockFillColor:"#efefef"},Vye=o(({packet:t}={})=>{let e=ws(zrt,t);return` + .packetByte { + font-size: ${e.byteFontSize}; + } + .packetByte.start { + fill: ${e.startByteColor}; + } + .packetByte.end { + fill: ${e.endByteColor}; + } + .packetLabel { + fill: ${e.labelColor}; + font-size: ${e.labelFontSize}; + } + .packetTitle { + fill: ${e.titleColor}; + font-size: ${e.titleFontSize}; + } + .packetBlock { + stroke: ${e.blockStrokeColor}; + stroke-width: ${e.blockStrokeWidth}; + fill: ${e.blockFillColor}; + } + `},"styles")});var Hye={};vr(Hye,{diagram:()=>Grt});var Grt,Wye=M(()=>{"use strict";XB();zye();$ye();Uye();Grt={parser:Fye,db:Rf,renderer:Gye,styles:Vye}});var jB,Xye,jye=M(()=>{"use strict";jB=function(){var t=o(function(w,_,T,E){for(T=T||{},E=w.length;E--;T[w[E]]=_);return T},"o"),e=[1,7],r=[1,13],n=[1,14],i=[1,15],a=[1,19],s=[1,16],l=[1,17],u=[1,18],h=[8,30],f=[8,21,28,29,30,31,32,40,44,47],d=[1,23],p=[1,24],m=[8,15,16,21,28,29,30,31,32,40,44,47],g=[8,15,16,21,27,28,29,30,31,32,40,44,47],y=[1,49],v={trace:o(function(){},"trace"),yy:{},symbols_:{error:2,spaceLines:3,SPACELINE:4,NL:5,separator:6,SPACE:7,EOF:8,start:9,BLOCK_DIAGRAM_KEY:10,document:11,stop:12,statement:13,link:14,LINK:15,START_LINK:16,LINK_LABEL:17,STR:18,nodeStatement:19,columnsStatement:20,SPACE_BLOCK:21,blockStatement:22,classDefStatement:23,cssClassStatement:24,styleStatement:25,node:26,SIZE:27,COLUMNS:28,"id-block":29,end:30,block:31,NODE_ID:32,nodeShapeNLabel:33,dirList:34,DIR:35,NODE_DSTART:36,NODE_DEND:37,BLOCK_ARROW_START:38,BLOCK_ARROW_END:39,classDef:40,CLASSDEF_ID:41,CLASSDEF_STYLEOPTS:42,DEFAULT:43,class:44,CLASSENTITY_IDS:45,STYLECLASS:46,style:47,STYLE_ENTITY_IDS:48,STYLE_DEFINITION_DATA:49,$accept:0,$end:1},terminals_:{2:"error",4:"SPACELINE",5:"NL",7:"SPACE",8:"EOF",10:"BLOCK_DIAGRAM_KEY",15:"LINK",16:"START_LINK",17:"LINK_LABEL",18:"STR",21:"SPACE_BLOCK",27:"SIZE",28:"COLUMNS",29:"id-block",30:"end",31:"block",32:"NODE_ID",35:"DIR",36:"NODE_DSTART",37:"NODE_DEND",38:"BLOCK_ARROW_START",39:"BLOCK_ARROW_END",40:"classDef",41:"CLASSDEF_ID",42:"CLASSDEF_STYLEOPTS",43:"DEFAULT",44:"class",45:"CLASSENTITY_IDS",46:"STYLECLASS",47:"style",48:"STYLE_ENTITY_IDS",49:"STYLE_DEFINITION_DATA"},productions_:[0,[3,1],[3,2],[3,2],[6,1],[6,1],[6,1],[9,3],[12,1],[12,1],[12,2],[12,2],[11,1],[11,2],[14,1],[14,4],[13,1],[13,1],[13,1],[13,1],[13,1],[13,1],[13,1],[19,3],[19,2],[19,1],[20,1],[22,4],[22,3],[26,1],[26,2],[34,1],[34,2],[33,3],[33,4],[23,3],[23,3],[24,3],[25,3]],performAction:o(function(_,T,E,L,C,A,I){var D=A.length-1;switch(C){case 4:L.getLogger().debug("Rule: separator (NL) ");break;case 5:L.getLogger().debug("Rule: separator (Space) ");break;case 6:L.getLogger().debug("Rule: separator (EOF) ");break;case 7:L.getLogger().debug("Rule: hierarchy: ",A[D-1]),L.setHierarchy(A[D-1]);break;case 8:L.getLogger().debug("Stop NL ");break;case 9:L.getLogger().debug("Stop EOF ");break;case 10:L.getLogger().debug("Stop NL2 ");break;case 11:L.getLogger().debug("Stop EOF2 ");break;case 12:L.getLogger().debug("Rule: statement: ",A[D]),typeof A[D].length=="number"?this.$=A[D]:this.$=[A[D]];break;case 13:L.getLogger().debug("Rule: statement #2: ",A[D-1]),this.$=[A[D-1]].concat(A[D]);break;case 14:L.getLogger().debug("Rule: link: ",A[D],_),this.$={edgeTypeStr:A[D],label:""};break;case 15:L.getLogger().debug("Rule: LABEL link: ",A[D-3],A[D-1],A[D]),this.$={edgeTypeStr:A[D],label:A[D-1]};break;case 18:let k=parseInt(A[D]),R=L.generateId();this.$={id:R,type:"space",label:"",width:k,children:[]};break;case 23:L.getLogger().debug("Rule: (nodeStatement link node) ",A[D-2],A[D-1],A[D]," typestr: ",A[D-1].edgeTypeStr);let S=L.edgeStrToEdgeData(A[D-1].edgeTypeStr);this.$=[{id:A[D-2].id,label:A[D-2].label,type:A[D-2].type,directions:A[D-2].directions},{id:A[D-2].id+"-"+A[D].id,start:A[D-2].id,end:A[D].id,label:A[D-1].label,type:"edge",directions:A[D].directions,arrowTypeEnd:S,arrowTypeStart:"arrow_open"},{id:A[D].id,label:A[D].label,type:L.typeStr2Type(A[D].typeStr),directions:A[D].directions}];break;case 24:L.getLogger().debug("Rule: nodeStatement (abc88 node size) ",A[D-1],A[D]),this.$={id:A[D-1].id,label:A[D-1].label,type:L.typeStr2Type(A[D-1].typeStr),directions:A[D-1].directions,widthInColumns:parseInt(A[D],10)};break;case 25:L.getLogger().debug("Rule: nodeStatement (node) ",A[D]),this.$={id:A[D].id,label:A[D].label,type:L.typeStr2Type(A[D].typeStr),directions:A[D].directions,widthInColumns:1};break;case 26:L.getLogger().debug("APA123",this?this:"na"),L.getLogger().debug("COLUMNS: ",A[D]),this.$={type:"column-setting",columns:A[D]==="auto"?-1:parseInt(A[D])};break;case 27:L.getLogger().debug("Rule: id-block statement : ",A[D-2],A[D-1]);let O=L.generateId();this.$={...A[D-2],type:"composite",children:A[D-1]};break;case 28:L.getLogger().debug("Rule: blockStatement : ",A[D-2],A[D-1],A[D]);let N=L.generateId();this.$={id:N,type:"composite",label:"",children:A[D-1]};break;case 29:L.getLogger().debug("Rule: node (NODE_ID separator): ",A[D]),this.$={id:A[D]};break;case 30:L.getLogger().debug("Rule: node (NODE_ID nodeShapeNLabel separator): ",A[D-1],A[D]),this.$={id:A[D-1],label:A[D].label,typeStr:A[D].typeStr,directions:A[D].directions};break;case 31:L.getLogger().debug("Rule: dirList: ",A[D]),this.$=[A[D]];break;case 32:L.getLogger().debug("Rule: dirList: ",A[D-1],A[D]),this.$=[A[D-1]].concat(A[D]);break;case 33:L.getLogger().debug("Rule: nodeShapeNLabel: ",A[D-2],A[D-1],A[D]),this.$={typeStr:A[D-2]+A[D],label:A[D-1]};break;case 34:L.getLogger().debug("Rule: BLOCK_ARROW nodeShapeNLabel: ",A[D-3],A[D-2]," #3:",A[D-1],A[D]),this.$={typeStr:A[D-3]+A[D],label:A[D-2],directions:A[D-1]};break;case 35:case 36:this.$={type:"classDef",id:A[D-1].trim(),css:A[D].trim()};break;case 37:this.$={type:"applyClass",id:A[D-1].trim(),styleClass:A[D].trim()};break;case 38:this.$={type:"applyStyles",id:A[D-1].trim(),stylesStr:A[D].trim()};break}},"anonymous"),table:[{9:1,10:[1,2]},{1:[3]},{11:3,13:4,19:5,20:6,21:e,22:8,23:9,24:10,25:11,26:12,28:r,29:n,31:i,32:a,40:s,44:l,47:u},{8:[1,20]},t(h,[2,12],{13:4,19:5,20:6,22:8,23:9,24:10,25:11,26:12,11:21,21:e,28:r,29:n,31:i,32:a,40:s,44:l,47:u}),t(f,[2,16],{14:22,15:d,16:p}),t(f,[2,17]),t(f,[2,18]),t(f,[2,19]),t(f,[2,20]),t(f,[2,21]),t(f,[2,22]),t(m,[2,25],{27:[1,25]}),t(f,[2,26]),{19:26,26:12,32:a},{11:27,13:4,19:5,20:6,21:e,22:8,23:9,24:10,25:11,26:12,28:r,29:n,31:i,32:a,40:s,44:l,47:u},{41:[1,28],43:[1,29]},{45:[1,30]},{48:[1,31]},t(g,[2,29],{33:32,36:[1,33],38:[1,34]}),{1:[2,7]},t(h,[2,13]),{26:35,32:a},{32:[2,14]},{17:[1,36]},t(m,[2,24]),{11:37,13:4,14:22,15:d,16:p,19:5,20:6,21:e,22:8,23:9,24:10,25:11,26:12,28:r,29:n,31:i,32:a,40:s,44:l,47:u},{30:[1,38]},{42:[1,39]},{42:[1,40]},{46:[1,41]},{49:[1,42]},t(g,[2,30]),{18:[1,43]},{18:[1,44]},t(m,[2,23]),{18:[1,45]},{30:[1,46]},t(f,[2,28]),t(f,[2,35]),t(f,[2,36]),t(f,[2,37]),t(f,[2,38]),{37:[1,47]},{34:48,35:y},{15:[1,50]},t(f,[2,27]),t(g,[2,33]),{39:[1,51]},{34:52,35:y,39:[2,31]},{32:[2,15]},t(g,[2,34]),{39:[2,32]}],defaultActions:{20:[2,7],23:[2,14],50:[2,15],52:[2,32]},parseError:o(function(_,T){if(T.recoverable)this.trace(_);else{var E=new Error(_);throw E.hash=T,E}},"parseError"),parse:o(function(_){var T=this,E=[0],L=[],C=[null],A=[],I=this.table,D="",k=0,R=0,S=0,O=2,N=1,P=A.slice.call(arguments,1),F=Object.create(this.lexer),B={yy:{}};for(var $ in this.yy)Object.prototype.hasOwnProperty.call(this.yy,$)&&(B.yy[$]=this.yy[$]);F.setInput(_,B.yy),B.yy.lexer=F,B.yy.parser=this,typeof F.yylloc>"u"&&(F.yylloc={});var z=F.yylloc;A.push(z);var W=F.options&&F.options.ranges;typeof B.yy.parseError=="function"?this.parseError=B.yy.parseError:this.parseError=Object.getPrototypeOf(this).parseError;function j(oe){E.length=E.length-2*oe,C.length=C.length-oe,A.length=A.length-oe}o(j,"popStack");function K(){var oe;return oe=L.pop()||F.lex()||N,typeof oe!="number"&&(oe instanceof Array&&(L=oe,oe=L.pop()),oe=T.symbols_[oe]||oe),oe}o(K,"lex");for(var ie,Q,ee,J,H,q,Z={},ae,ue,ce,te;;){if(ee=E[E.length-1],this.defaultActions[ee]?J=this.defaultActions[ee]:((ie===null||typeof ie>"u")&&(ie=K()),J=I[ee]&&I[ee][ie]),typeof J>"u"||!J.length||!J[0]){var De="";te=[];for(ae in I[ee])this.terminals_[ae]&&ae>O&&te.push("'"+this.terminals_[ae]+"'");F.showPosition?De="Parse error on line "+(k+1)+`: +`+F.showPosition()+` +Expecting `+te.join(", ")+", got '"+(this.terminals_[ie]||ie)+"'":De="Parse error on line "+(k+1)+": Unexpected "+(ie==N?"end of input":"'"+(this.terminals_[ie]||ie)+"'"),this.parseError(De,{text:F.match,token:this.terminals_[ie]||ie,line:F.yylineno,loc:z,expected:te})}if(J[0]instanceof Array&&J.length>1)throw new Error("Parse Error: multiple actions possible at state: "+ee+", token: "+ie);switch(J[0]){case 1:E.push(ie),C.push(F.yytext),A.push(F.yylloc),E.push(J[1]),ie=null,Q?(ie=Q,Q=null):(R=F.yyleng,D=F.yytext,k=F.yylineno,z=F.yylloc,S>0&&S--);break;case 2:if(ue=this.productions_[J[1]][1],Z.$=C[C.length-ue],Z._$={first_line:A[A.length-(ue||1)].first_line,last_line:A[A.length-1].last_line,first_column:A[A.length-(ue||1)].first_column,last_column:A[A.length-1].last_column},W&&(Z._$.range=[A[A.length-(ue||1)].range[0],A[A.length-1].range[1]]),q=this.performAction.apply(Z,[D,R,k,B.yy,J[1],C,A].concat(P)),typeof q<"u")return q;ue&&(E=E.slice(0,-1*ue*2),C=C.slice(0,-1*ue),A=A.slice(0,-1*ue)),E.push(this.productions_[J[1]][0]),C.push(Z.$),A.push(Z._$),ce=I[E[E.length-2]][E[E.length-1]],E.push(ce);break;case 3:return!0}}return!0},"parse")},x=function(){var w={EOF:1,parseError:o(function(T,E){if(this.yy.parser)this.yy.parser.parseError(T,E);else throw new Error(T)},"parseError"),setInput:o(function(_,T){return this.yy=T||this.yy||{},this._input=_,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},"setInput"),input:o(function(){var _=this._input[0];this.yytext+=_,this.yyleng++,this.offset++,this.match+=_,this.matched+=_;var T=_.match(/(?:\r\n?|\n).*/g);return T?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),_},"input"),unput:o(function(_){var T=_.length,E=_.split(/(?:\r\n?|\n)/g);this._input=_+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-T),this.offset-=T;var L=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),E.length-1&&(this.yylineno-=E.length-1);var C=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:E?(E.length===L.length?this.yylloc.first_column:0)+L[L.length-E.length].length-E[0].length:this.yylloc.first_column-T},this.options.ranges&&(this.yylloc.range=[C[0],C[0]+this.yyleng-T]),this.yyleng=this.yytext.length,this},"unput"),more:o(function(){return this._more=!0,this},"more"),reject:o(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError("Lexical error on line "+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true). +`+this.showPosition(),{text:"",token:null,line:this.yylineno});return this},"reject"),less:o(function(_){this.unput(this.match.slice(_))},"less"),pastInput:o(function(){var _=this.matched.substr(0,this.matched.length-this.match.length);return(_.length>20?"...":"")+_.substr(-20).replace(/\n/g,"")},"pastInput"),upcomingInput:o(function(){var _=this.match;return _.length<20&&(_+=this._input.substr(0,20-_.length)),(_.substr(0,20)+(_.length>20?"...":"")).replace(/\n/g,"")},"upcomingInput"),showPosition:o(function(){var _=this.pastInput(),T=new Array(_.length+1).join("-");return _+this.upcomingInput()+` +`+T+"^"},"showPosition"),test_match:o(function(_,T){var E,L,C;if(this.options.backtrack_lexer&&(C={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(C.yylloc.range=this.yylloc.range.slice(0))),L=_[0].match(/(?:\r\n?|\n).*/g),L&&(this.yylineno+=L.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:L?L[L.length-1].length-L[L.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+_[0].length},this.yytext+=_[0],this.match+=_[0],this.matches=_,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(_[0].length),this.matched+=_[0],E=this.performAction.call(this,this.yy,this,T,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),E)return E;if(this._backtrack){for(var A in C)this[A]=C[A];return!1}return!1},"test_match"),next:o(function(){if(this.done)return this.EOF;this._input||(this.done=!0);var _,T,E,L;this._more||(this.yytext="",this.match="");for(var C=this._currentRules(),A=0;A<C.length;A++)if(E=this._input.match(this.rules[C[A]]),E&&(!T||E[0].length>T[0].length)){if(T=E,L=A,this.options.backtrack_lexer){if(_=this.test_match(E,C[A]),_!==!1)return _;if(this._backtrack){T=!1;continue}else return!1}else if(!this.options.flex)break}return T?(_=this.test_match(T,C[L]),_!==!1?_:!1):this._input===""?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+`. Unrecognized text. +`+this.showPosition(),{text:"",token:null,line:this.yylineno})},"next"),lex:o(function(){var T=this.next();return T||this.lex()},"lex"),begin:o(function(T){this.conditionStack.push(T)},"begin"),popState:o(function(){var T=this.conditionStack.length-1;return T>0?this.conditionStack.pop():this.conditionStack[0]},"popState"),_currentRules:o(function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},"_currentRules"),topState:o(function(T){return T=this.conditionStack.length-1-Math.abs(T||0),T>=0?this.conditionStack[T]:"INITIAL"},"topState"),pushState:o(function(T){this.begin(T)},"pushState"),stateStackSize:o(function(){return this.conditionStack.length},"stateStackSize"),options:{},performAction:o(function(T,E,L,C){var A=C;switch(L){case 0:return 10;case 1:return T.getLogger().debug("Found space-block"),31;break;case 2:return T.getLogger().debug("Found nl-block"),31;break;case 3:return T.getLogger().debug("Found space-block"),29;break;case 4:T.getLogger().debug(".",E.yytext);break;case 5:T.getLogger().debug("_",E.yytext);break;case 6:return 5;case 7:return E.yytext=-1,28;break;case 8:return E.yytext=E.yytext.replace(/columns\s+/,""),T.getLogger().debug("COLUMNS (LEX)",E.yytext),28;break;case 9:this.pushState("md_string");break;case 10:return"MD_STR";case 11:this.popState();break;case 12:this.pushState("string");break;case 13:T.getLogger().debug("LEX: POPPING STR:",E.yytext),this.popState();break;case 14:return T.getLogger().debug("LEX: STR end:",E.yytext),"STR";break;case 15:return E.yytext=E.yytext.replace(/space\:/,""),T.getLogger().debug("SPACE NUM (LEX)",E.yytext),21;break;case 16:return E.yytext="1",T.getLogger().debug("COLUMNS (LEX)",E.yytext),21;break;case 17:return 43;case 18:return"LINKSTYLE";case 19:return"INTERPOLATE";case 20:return this.pushState("CLASSDEF"),40;break;case 21:return this.popState(),this.pushState("CLASSDEFID"),"DEFAULT_CLASSDEF_ID";break;case 22:return this.popState(),this.pushState("CLASSDEFID"),41;break;case 23:return this.popState(),42;break;case 24:return this.pushState("CLASS"),44;break;case 25:return this.popState(),this.pushState("CLASS_STYLE"),45;break;case 26:return this.popState(),46;break;case 27:return this.pushState("STYLE_STMNT"),47;break;case 28:return this.popState(),this.pushState("STYLE_DEFINITION"),48;break;case 29:return this.popState(),49;break;case 30:return this.pushState("acc_title"),"acc_title";break;case 31:return this.popState(),"acc_title_value";break;case 32:return this.pushState("acc_descr"),"acc_descr";break;case 33:return this.popState(),"acc_descr_value";break;case 34:this.pushState("acc_descr_multiline");break;case 35:this.popState();break;case 36:return"acc_descr_multiline_value";case 37:return 30;case 38:return this.popState(),T.getLogger().debug("Lex: (("),"NODE_DEND";break;case 39:return this.popState(),T.getLogger().debug("Lex: (("),"NODE_DEND";break;case 40:return this.popState(),T.getLogger().debug("Lex: ))"),"NODE_DEND";break;case 41:return this.popState(),T.getLogger().debug("Lex: (("),"NODE_DEND";break;case 42:return this.popState(),T.getLogger().debug("Lex: (("),"NODE_DEND";break;case 43:return this.popState(),T.getLogger().debug("Lex: (-"),"NODE_DEND";break;case 44:return this.popState(),T.getLogger().debug("Lex: -)"),"NODE_DEND";break;case 45:return this.popState(),T.getLogger().debug("Lex: (("),"NODE_DEND";break;case 46:return this.popState(),T.getLogger().debug("Lex: ]]"),"NODE_DEND";break;case 47:return this.popState(),T.getLogger().debug("Lex: ("),"NODE_DEND";break;case 48:return this.popState(),T.getLogger().debug("Lex: ])"),"NODE_DEND";break;case 49:return this.popState(),T.getLogger().debug("Lex: /]"),"NODE_DEND";break;case 50:return this.popState(),T.getLogger().debug("Lex: /]"),"NODE_DEND";break;case 51:return this.popState(),T.getLogger().debug("Lex: )]"),"NODE_DEND";break;case 52:return this.popState(),T.getLogger().debug("Lex: )"),"NODE_DEND";break;case 53:return this.popState(),T.getLogger().debug("Lex: ]>"),"NODE_DEND";break;case 54:return this.popState(),T.getLogger().debug("Lex: ]"),"NODE_DEND";break;case 55:return T.getLogger().debug("Lexa: -)"),this.pushState("NODE"),36;break;case 56:return T.getLogger().debug("Lexa: (-"),this.pushState("NODE"),36;break;case 57:return T.getLogger().debug("Lexa: ))"),this.pushState("NODE"),36;break;case 58:return T.getLogger().debug("Lexa: )"),this.pushState("NODE"),36;break;case 59:return T.getLogger().debug("Lex: ((("),this.pushState("NODE"),36;break;case 60:return T.getLogger().debug("Lexa: )"),this.pushState("NODE"),36;break;case 61:return T.getLogger().debug("Lexa: )"),this.pushState("NODE"),36;break;case 62:return T.getLogger().debug("Lexa: )"),this.pushState("NODE"),36;break;case 63:return T.getLogger().debug("Lexc: >"),this.pushState("NODE"),36;break;case 64:return T.getLogger().debug("Lexa: (["),this.pushState("NODE"),36;break;case 65:return T.getLogger().debug("Lexa: )"),this.pushState("NODE"),36;break;case 66:return this.pushState("NODE"),36;break;case 67:return this.pushState("NODE"),36;break;case 68:return this.pushState("NODE"),36;break;case 69:return this.pushState("NODE"),36;break;case 70:return this.pushState("NODE"),36;break;case 71:return this.pushState("NODE"),36;break;case 72:return this.pushState("NODE"),36;break;case 73:return T.getLogger().debug("Lexa: ["),this.pushState("NODE"),36;break;case 74:return this.pushState("BLOCK_ARROW"),T.getLogger().debug("LEX ARR START"),38;break;case 75:return T.getLogger().debug("Lex: NODE_ID",E.yytext),32;break;case 76:return T.getLogger().debug("Lex: EOF",E.yytext),8;break;case 77:this.pushState("md_string");break;case 78:this.pushState("md_string");break;case 79:return"NODE_DESCR";case 80:this.popState();break;case 81:T.getLogger().debug("Lex: Starting string"),this.pushState("string");break;case 82:T.getLogger().debug("LEX ARR: Starting string"),this.pushState("string");break;case 83:return T.getLogger().debug("LEX: NODE_DESCR:",E.yytext),"NODE_DESCR";break;case 84:T.getLogger().debug("LEX POPPING"),this.popState();break;case 85:T.getLogger().debug("Lex: =>BAE"),this.pushState("ARROW_DIR");break;case 86:return E.yytext=E.yytext.replace(/^,\s*/,""),T.getLogger().debug("Lex (right): dir:",E.yytext),"DIR";break;case 87:return E.yytext=E.yytext.replace(/^,\s*/,""),T.getLogger().debug("Lex (left):",E.yytext),"DIR";break;case 88:return E.yytext=E.yytext.replace(/^,\s*/,""),T.getLogger().debug("Lex (x):",E.yytext),"DIR";break;case 89:return E.yytext=E.yytext.replace(/^,\s*/,""),T.getLogger().debug("Lex (y):",E.yytext),"DIR";break;case 90:return E.yytext=E.yytext.replace(/^,\s*/,""),T.getLogger().debug("Lex (up):",E.yytext),"DIR";break;case 91:return E.yytext=E.yytext.replace(/^,\s*/,""),T.getLogger().debug("Lex (down):",E.yytext),"DIR";break;case 92:return E.yytext="]>",T.getLogger().debug("Lex (ARROW_DIR end):",E.yytext),this.popState(),this.popState(),"BLOCK_ARROW_END";break;case 93:return T.getLogger().debug("Lex: LINK","#"+E.yytext+"#"),15;break;case 94:return T.getLogger().debug("Lex: LINK",E.yytext),15;break;case 95:return T.getLogger().debug("Lex: LINK",E.yytext),15;break;case 96:return T.getLogger().debug("Lex: LINK",E.yytext),15;break;case 97:return T.getLogger().debug("Lex: START_LINK",E.yytext),this.pushState("LLABEL"),16;break;case 98:return T.getLogger().debug("Lex: START_LINK",E.yytext),this.pushState("LLABEL"),16;break;case 99:return T.getLogger().debug("Lex: START_LINK",E.yytext),this.pushState("LLABEL"),16;break;case 100:this.pushState("md_string");break;case 101:return T.getLogger().debug("Lex: Starting string"),this.pushState("string"),"LINK_LABEL";break;case 102:return this.popState(),T.getLogger().debug("Lex: LINK","#"+E.yytext+"#"),15;break;case 103:return this.popState(),T.getLogger().debug("Lex: LINK",E.yytext),15;break;case 104:return this.popState(),T.getLogger().debug("Lex: LINK",E.yytext),15;break;case 105:return T.getLogger().debug("Lex: COLON",E.yytext),E.yytext=E.yytext.slice(1),27;break}},"anonymous"),rules:[/^(?:block-beta\b)/,/^(?:block\s+)/,/^(?:block\n+)/,/^(?:block:)/,/^(?:[\s]+)/,/^(?:[\n]+)/,/^(?:((\u000D\u000A)|(\u000A)))/,/^(?:columns\s+auto\b)/,/^(?:columns\s+[\d]+)/,/^(?:["][`])/,/^(?:[^`"]+)/,/^(?:[`]["])/,/^(?:["])/,/^(?:["])/,/^(?:[^"]*)/,/^(?:space[:]\d+)/,/^(?:space\b)/,/^(?:default\b)/,/^(?:linkStyle\b)/,/^(?:interpolate\b)/,/^(?:classDef\s+)/,/^(?:DEFAULT\s+)/,/^(?:\w+\s+)/,/^(?:[^\n]*)/,/^(?:class\s+)/,/^(?:(\w+)+((,\s*\w+)*))/,/^(?:[^\n]*)/,/^(?:style\s+)/,/^(?:(\w+)+((,\s*\w+)*))/,/^(?:[^\n]*)/,/^(?:accTitle\s*:\s*)/,/^(?:(?!\n||)*[^\n]*)/,/^(?:accDescr\s*:\s*)/,/^(?:(?!\n||)*[^\n]*)/,/^(?:accDescr\s*\{\s*)/,/^(?:[\}])/,/^(?:[^\}]*)/,/^(?:end\b\s*)/,/^(?:\(\(\()/,/^(?:\)\)\))/,/^(?:[\)]\))/,/^(?:\}\})/,/^(?:\})/,/^(?:\(-)/,/^(?:-\))/,/^(?:\(\()/,/^(?:\]\])/,/^(?:\()/,/^(?:\]\))/,/^(?:\\\])/,/^(?:\/\])/,/^(?:\)\])/,/^(?:[\)])/,/^(?:\]>)/,/^(?:[\]])/,/^(?:-\))/,/^(?:\(-)/,/^(?:\)\))/,/^(?:\))/,/^(?:\(\(\()/,/^(?:\(\()/,/^(?:\{\{)/,/^(?:\{)/,/^(?:>)/,/^(?:\(\[)/,/^(?:\()/,/^(?:\[\[)/,/^(?:\[\|)/,/^(?:\[\()/,/^(?:\)\)\))/,/^(?:\[\\)/,/^(?:\[\/)/,/^(?:\[\\)/,/^(?:\[)/,/^(?:<\[)/,/^(?:[^\(\[\n\-\)\{\}\s\<\>:]+)/,/^(?:$)/,/^(?:["][`])/,/^(?:["][`])/,/^(?:[^`"]+)/,/^(?:[`]["])/,/^(?:["])/,/^(?:["])/,/^(?:[^"]+)/,/^(?:["])/,/^(?:\]>\s*\()/,/^(?:,?\s*right\s*)/,/^(?:,?\s*left\s*)/,/^(?:,?\s*x\s*)/,/^(?:,?\s*y\s*)/,/^(?:,?\s*up\s*)/,/^(?:,?\s*down\s*)/,/^(?:\)\s*)/,/^(?:\s*[xo<]?--+[-xo>]\s*)/,/^(?:\s*[xo<]?==+[=xo>]\s*)/,/^(?:\s*[xo<]?-?\.+-[xo>]?\s*)/,/^(?:\s*~~[\~]+\s*)/,/^(?:\s*[xo<]?--\s*)/,/^(?:\s*[xo<]?==\s*)/,/^(?:\s*[xo<]?-\.\s*)/,/^(?:["][`])/,/^(?:["])/,/^(?:\s*[xo<]?--+[-xo>]\s*)/,/^(?:\s*[xo<]?==+[=xo>]\s*)/,/^(?:\s*[xo<]?-?\.+-[xo>]?\s*)/,/^(?::\d+)/],conditions:{STYLE_DEFINITION:{rules:[29],inclusive:!1},STYLE_STMNT:{rules:[28],inclusive:!1},CLASSDEFID:{rules:[23],inclusive:!1},CLASSDEF:{rules:[21,22],inclusive:!1},CLASS_STYLE:{rules:[26],inclusive:!1},CLASS:{rules:[25],inclusive:!1},LLABEL:{rules:[100,101,102,103,104],inclusive:!1},ARROW_DIR:{rules:[86,87,88,89,90,91,92],inclusive:!1},BLOCK_ARROW:{rules:[77,82,85],inclusive:!1},NODE:{rules:[38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,78,81],inclusive:!1},md_string:{rules:[10,11,79,80],inclusive:!1},space:{rules:[],inclusive:!1},string:{rules:[13,14,83,84],inclusive:!1},acc_descr_multiline:{rules:[35,36],inclusive:!1},acc_descr:{rules:[33],inclusive:!1},acc_title:{rules:[31],inclusive:!1},INITIAL:{rules:[0,1,2,3,4,5,6,7,8,9,12,15,16,17,18,19,20,24,27,30,32,34,37,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,93,94,95,96,97,98,99,105],inclusive:!0}}};return w}();v.lexer=x;function b(){this.yy={}}return o(b,"Parser"),b.prototype=v,v.Parser=b,new b}();jB.parser=jB;Xye=jB});function Krt(t){switch(Y.debug("typeStr2Type",t),t){case"[]":return"square";case"()":return Y.debug("we have a round"),"round";case"(())":return"circle";case">]":return"rect_left_inv_arrow";case"{}":return"diamond";case"{{}}":return"hexagon";case"([])":return"stadium";case"[[]]":return"subroutine";case"[()]":return"cylinder";case"((()))":return"doublecircle";case"[//]":return"lean_right";case"[\\\\]":return"lean_left";case"[/\\]":return"trapezoid";case"[\\/]":return"inv_trapezoid";case"<[]>":return"block_arrow";default:return"na"}}function Qrt(t){switch(Y.debug("typeStr2Type",t),t){case"==":return"thick";default:return"normal"}}function Zrt(t){switch(t.trim()){case"--x":return"arrow_cross";case"--o":return"arrow_circle";default:return"arrow_point"}}var ql,QB,KB,Kye,Qye,Urt,Jye,Hrt,K6,Wrt,Yrt,qrt,Xrt,eve,ZB,pb,jrt,Zye,Jrt,ent,tnt,rnt,nnt,int,ant,snt,ont,lnt,cnt,tve,rve=M(()=>{"use strict";SL();Ua();Vt();ht();fr();ki();ql=new Map,QB=[],KB=new Map,Kye="color",Qye="fill",Urt="bgFill",Jye=",",Hrt=de(),K6=new Map,Wrt=o(t=>je.sanitizeText(t,Hrt),"sanitizeText"),Yrt=o(function(t,e=""){let r=K6.get(t);r||(r={id:t,styles:[],textStyles:[]},K6.set(t,r)),e?.split(Jye).forEach(n=>{let i=n.replace(/([^;]*);/,"$1").trim();if(RegExp(Kye).exec(n)){let s=i.replace(Qye,Urt).replace(Kye,Qye);r.textStyles.push(s)}r.styles.push(i)})},"addStyleClass"),qrt=o(function(t,e=""){let r=ql.get(t);e!=null&&(r.styles=e.split(Jye))},"addStyle2Node"),Xrt=o(function(t,e){t.split(",").forEach(function(r){let n=ql.get(r);if(n===void 0){let i=r.trim();n={id:i,type:"na",children:[]},ql.set(i,n)}n.classes||(n.classes=[]),n.classes.push(e)})},"setCssClass"),eve=o((t,e)=>{let r=t.flat(),n=[];for(let i of r){if(i.label&&(i.label=Wrt(i.label)),i.type==="classDef"){Yrt(i.id,i.css);continue}if(i.type==="applyClass"){Xrt(i.id,i?.styleClass??"");continue}if(i.type==="applyStyles"){i?.stylesStr&&qrt(i.id,i?.stylesStr);continue}if(i.type==="column-setting")e.columns=i.columns??-1;else if(i.type==="edge"){let a=(KB.get(i.id)??0)+1;KB.set(i.id,a),i.id=a+"-"+i.id,QB.push(i)}else{i.label||(i.type==="composite"?i.label="":i.label=i.id);let a=ql.get(i.id);if(a===void 0?ql.set(i.id,i):(i.type!=="na"&&(a.type=i.type),i.label!==i.id&&(a.label=i.label)),i.children&&eve(i.children,i),i.type==="space"){let s=i.width??1;for(let l=0;l<s;l++){let u=rn(i);u.id=u.id+"-"+l,ql.set(u.id,u),n.push(u)}}else a===void 0&&n.push(i)}}e.children=n},"populateBlockDatabase"),ZB=[],pb={id:"root",type:"composite",children:[],columns:-1},jrt=o(()=>{Y.debug("Clear called"),_r(),pb={id:"root",type:"composite",children:[],columns:-1},ql=new Map([["root",pb]]),ZB=[],K6=new Map,QB=[],KB=new Map},"clear");o(Krt,"typeStr2Type");o(Qrt,"edgeTypeStr2Type");o(Zrt,"edgeStrToEdgeData");Zye=0,Jrt=o(()=>(Zye++,"id-"+Math.random().toString(36).substr(2,12)+"-"+Zye),"generateId"),ent=o(t=>{pb.children=t,eve(t,pb),ZB=pb.children},"setHierarchy"),tnt=o(t=>{let e=ql.get(t);return e?e.columns?e.columns:e.children?e.children.length:-1:-1},"getColumns"),rnt=o(()=>[...ql.values()],"getBlocksFlat"),nnt=o(()=>ZB||[],"getBlocks"),int=o(()=>QB,"getEdges"),ant=o(t=>ql.get(t),"getBlock"),snt=o(t=>{ql.set(t.id,t)},"setBlock"),ont=o(()=>console,"getLogger"),lnt=o(function(){return K6},"getClasses"),cnt={getConfig:o(()=>Sr().block,"getConfig"),typeStr2Type:Krt,edgeTypeStr2Type:Qrt,edgeStrToEdgeData:Zrt,getLogger:ont,getBlocksFlat:rnt,getBlocks:nnt,getEdges:int,setHierarchy:ent,getBlock:ant,setBlock:snt,getColumns:tnt,getClasses:lnt,clear:jrt,generateId:Jrt},tve=cnt});var Q6,unt,nve,ive=M(()=>{"use strict";To();Q6=o((t,e)=>{let r=z1,n=r(t,"r"),i=r(t,"g"),a=r(t,"b");return Hs(n,i,a,e)},"fade"),unt=o(t=>`.label { + font-family: ${t.fontFamily}; + color: ${t.nodeTextColor||t.textColor}; + } + .cluster-label text { + fill: ${t.titleColor}; + } + .cluster-label span,p { + color: ${t.titleColor}; + } + + + + .label text,span,p { + fill: ${t.nodeTextColor||t.textColor}; + color: ${t.nodeTextColor||t.textColor}; + } + + .node rect, + .node circle, + .node ellipse, + .node polygon, + .node path { + fill: ${t.mainBkg}; + stroke: ${t.nodeBorder}; + stroke-width: 1px; + } + .flowchart-label text { + text-anchor: middle; + } + // .flowchart-label .text-outer-tspan { + // text-anchor: middle; + // } + // .flowchart-label .text-inner-tspan { + // text-anchor: start; + // } + + .node .label { + text-align: center; + } + .node.clickable { + cursor: pointer; + } + + .arrowheadPath { + fill: ${t.arrowheadColor}; + } + + .edgePath .path { + stroke: ${t.lineColor}; + stroke-width: 2.0px; + } + + .flowchart-link { + stroke: ${t.lineColor}; + fill: none; + } + + .edgeLabel { + background-color: ${t.edgeLabelBackground}; + rect { + opacity: 0.5; + background-color: ${t.edgeLabelBackground}; + fill: ${t.edgeLabelBackground}; + } + text-align: center; + } + + /* For html labels only */ + .labelBkg { + background-color: ${Q6(t.edgeLabelBackground,.5)}; + // background-color: + } + + .node .cluster { + // fill: ${Q6(t.mainBkg,.5)}; + fill: ${Q6(t.clusterBkg,.5)}; + stroke: ${Q6(t.clusterBorder,.2)}; + box-shadow: rgba(50, 50, 93, 0.25) 0px 13px 27px -5px, rgba(0, 0, 0, 0.3) 0px 8px 16px -8px; + stroke-width: 1px; + } + + .cluster text { + fill: ${t.titleColor}; + } + + .cluster span,p { + color: ${t.titleColor}; + } + /* .cluster div { + color: ${t.titleColor}; + } */ + + div.mermaidTooltip { + position: absolute; + text-align: center; + max-width: 200px; + padding: 2px; + font-family: ${t.fontFamily}; + font-size: 12px; + background: ${t.tertiaryColor}; + border: 1px solid ${t.border2}; + border-radius: 2px; + pointer-events: none; + z-index: 100; + } + + .flowchartTitleText { + text-anchor: middle; + font-size: 18px; + fill: ${t.textColor}; + } +`,"getStyles"),nve=unt});var hnt,fnt,dnt,pnt,mnt,gnt,ynt,vnt,xnt,bnt,wnt,ave,sve=M(()=>{"use strict";ht();hnt=o((t,e,r,n)=>{e.forEach(i=>{wnt[i](t,r,n)})},"insertMarkers"),fnt=o((t,e,r)=>{Y.trace("Making markers for ",r),t.append("defs").append("marker").attr("id",r+"_"+e+"-extensionStart").attr("class","marker extension "+e).attr("refX",18).attr("refY",7).attr("markerWidth",190).attr("markerHeight",240).attr("orient","auto").append("path").attr("d","M 1,7 L18,13 V 1 Z"),t.append("defs").append("marker").attr("id",r+"_"+e+"-extensionEnd").attr("class","marker extension "+e).attr("refX",1).attr("refY",7).attr("markerWidth",20).attr("markerHeight",28).attr("orient","auto").append("path").attr("d","M 1,1 V 13 L18,7 Z")},"extension"),dnt=o((t,e,r)=>{t.append("defs").append("marker").attr("id",r+"_"+e+"-compositionStart").attr("class","marker composition "+e).attr("refX",18).attr("refY",7).attr("markerWidth",190).attr("markerHeight",240).attr("orient","auto").append("path").attr("d","M 18,7 L9,13 L1,7 L9,1 Z"),t.append("defs").append("marker").attr("id",r+"_"+e+"-compositionEnd").attr("class","marker composition "+e).attr("refX",1).attr("refY",7).attr("markerWidth",20).attr("markerHeight",28).attr("orient","auto").append("path").attr("d","M 18,7 L9,13 L1,7 L9,1 Z")},"composition"),pnt=o((t,e,r)=>{t.append("defs").append("marker").attr("id",r+"_"+e+"-aggregationStart").attr("class","marker aggregation "+e).attr("refX",18).attr("refY",7).attr("markerWidth",190).attr("markerHeight",240).attr("orient","auto").append("path").attr("d","M 18,7 L9,13 L1,7 L9,1 Z"),t.append("defs").append("marker").attr("id",r+"_"+e+"-aggregationEnd").attr("class","marker aggregation "+e).attr("refX",1).attr("refY",7).attr("markerWidth",20).attr("markerHeight",28).attr("orient","auto").append("path").attr("d","M 18,7 L9,13 L1,7 L9,1 Z")},"aggregation"),mnt=o((t,e,r)=>{t.append("defs").append("marker").attr("id",r+"_"+e+"-dependencyStart").attr("class","marker dependency "+e).attr("refX",6).attr("refY",7).attr("markerWidth",190).attr("markerHeight",240).attr("orient","auto").append("path").attr("d","M 5,7 L9,13 L1,7 L9,1 Z"),t.append("defs").append("marker").attr("id",r+"_"+e+"-dependencyEnd").attr("class","marker dependency "+e).attr("refX",13).attr("refY",7).attr("markerWidth",20).attr("markerHeight",28).attr("orient","auto").append("path").attr("d","M 18,7 L9,13 L14,7 L9,1 Z")},"dependency"),gnt=o((t,e,r)=>{t.append("defs").append("marker").attr("id",r+"_"+e+"-lollipopStart").attr("class","marker lollipop "+e).attr("refX",13).attr("refY",7).attr("markerWidth",190).attr("markerHeight",240).attr("orient","auto").append("circle").attr("stroke","black").attr("fill","transparent").attr("cx",7).attr("cy",7).attr("r",6),t.append("defs").append("marker").attr("id",r+"_"+e+"-lollipopEnd").attr("class","marker lollipop "+e).attr("refX",1).attr("refY",7).attr("markerWidth",190).attr("markerHeight",240).attr("orient","auto").append("circle").attr("stroke","black").attr("fill","transparent").attr("cx",7).attr("cy",7).attr("r",6)},"lollipop"),ynt=o((t,e,r)=>{t.append("marker").attr("id",r+"_"+e+"-pointEnd").attr("class","marker "+e).attr("viewBox","0 0 10 10").attr("refX",6).attr("refY",5).attr("markerUnits","userSpaceOnUse").attr("markerWidth",12).attr("markerHeight",12).attr("orient","auto").append("path").attr("d","M 0 0 L 10 5 L 0 10 z").attr("class","arrowMarkerPath").style("stroke-width",1).style("stroke-dasharray","1,0"),t.append("marker").attr("id",r+"_"+e+"-pointStart").attr("class","marker "+e).attr("viewBox","0 0 10 10").attr("refX",4.5).attr("refY",5).attr("markerUnits","userSpaceOnUse").attr("markerWidth",12).attr("markerHeight",12).attr("orient","auto").append("path").attr("d","M 0 5 L 10 10 L 10 0 z").attr("class","arrowMarkerPath").style("stroke-width",1).style("stroke-dasharray","1,0")},"point"),vnt=o((t,e,r)=>{t.append("marker").attr("id",r+"_"+e+"-circleEnd").attr("class","marker "+e).attr("viewBox","0 0 10 10").attr("refX",11).attr("refY",5).attr("markerUnits","userSpaceOnUse").attr("markerWidth",11).attr("markerHeight",11).attr("orient","auto").append("circle").attr("cx","5").attr("cy","5").attr("r","5").attr("class","arrowMarkerPath").style("stroke-width",1).style("stroke-dasharray","1,0"),t.append("marker").attr("id",r+"_"+e+"-circleStart").attr("class","marker "+e).attr("viewBox","0 0 10 10").attr("refX",-1).attr("refY",5).attr("markerUnits","userSpaceOnUse").attr("markerWidth",11).attr("markerHeight",11).attr("orient","auto").append("circle").attr("cx","5").attr("cy","5").attr("r","5").attr("class","arrowMarkerPath").style("stroke-width",1).style("stroke-dasharray","1,0")},"circle"),xnt=o((t,e,r)=>{t.append("marker").attr("id",r+"_"+e+"-crossEnd").attr("class","marker cross "+e).attr("viewBox","0 0 11 11").attr("refX",12).attr("refY",5.2).attr("markerUnits","userSpaceOnUse").attr("markerWidth",11).attr("markerHeight",11).attr("orient","auto").append("path").attr("d","M 1,1 l 9,9 M 10,1 l -9,9").attr("class","arrowMarkerPath").style("stroke-width",2).style("stroke-dasharray","1,0"),t.append("marker").attr("id",r+"_"+e+"-crossStart").attr("class","marker cross "+e).attr("viewBox","0 0 11 11").attr("refX",-1).attr("refY",5.2).attr("markerUnits","userSpaceOnUse").attr("markerWidth",11).attr("markerHeight",11).attr("orient","auto").append("path").attr("d","M 1,1 l 9,9 M 10,1 l -9,9").attr("class","arrowMarkerPath").style("stroke-width",2).style("stroke-dasharray","1,0")},"cross"),bnt=o((t,e,r)=>{t.append("defs").append("marker").attr("id",r+"_"+e+"-barbEnd").attr("refX",19).attr("refY",7).attr("markerWidth",20).attr("markerHeight",14).attr("markerUnits","strokeWidth").attr("orient","auto").append("path").attr("d","M 19,7 L9,13 L14,7 L9,1 Z")},"barb"),wnt={extension:fnt,composition:dnt,aggregation:pnt,dependency:mnt,lollipop:gnt,point:ynt,circle:vnt,cross:xnt,barb:bnt},ave=hnt});function Tnt(t,e){if(t===0||!Number.isInteger(t))throw new Error("Columns must be an integer !== 0.");if(e<0||!Number.isInteger(e))throw new Error("Position must be a non-negative integer."+e);if(t<0)return{px:e,py:0};if(t===1)return{px:0,py:e};let r=e%t,n=Math.floor(e/t);return{px:r,py:n}}function JB(t,e,r=0,n=0){Y.debug("setBlockSizes abc95 (start)",t.id,t?.size?.x,"block width =",t?.size,"sieblingWidth",r),t?.size?.width||(t.size={width:r,height:n,x:0,y:0});let i=0,a=0;if(t.children?.length>0){for(let m of t.children)JB(m,e);let s=knt(t);i=s.width,a=s.height,Y.debug("setBlockSizes abc95 maxWidth of",t.id,":s children is ",i,a);for(let m of t.children)m.size&&(Y.debug(`abc95 Setting size of children of ${t.id} id=${m.id} ${i} ${a} ${JSON.stringify(m.size)}`),m.size.width=i*(m.widthInColumns??1)+xi*((m.widthInColumns??1)-1),m.size.height=a,m.size.x=0,m.size.y=0,Y.debug(`abc95 updating size of ${t.id} children child:${m.id} maxWidth:${i} maxHeight:${a}`));for(let m of t.children)JB(m,e,i,a);let l=t.columns??-1,u=0;for(let m of t.children)u+=m.widthInColumns??1;let h=t.children.length;l>0&&l<u&&(h=l);let f=Math.ceil(u/h),d=h*(i+xi)+xi,p=f*(a+xi)+xi;if(d<r){Y.debug(`Detected to small siebling: abc95 ${t.id} sieblingWidth ${r} sieblingHeight ${n} width ${d}`),d=r,p=n;let m=(r-h*xi-xi)/h,g=(n-f*xi-xi)/f;Y.debug("Size indata abc88",t.id,"childWidth",m,"maxWidth",i),Y.debug("Size indata abc88",t.id,"childHeight",g,"maxHeight",a),Y.debug("Size indata abc88 xSize",h,"padding",xi);for(let y of t.children)y.size&&(y.size.width=m,y.size.height=g,y.size.x=0,y.size.y=0)}if(Y.debug(`abc95 (finale calc) ${t.id} xSize ${h} ySize ${f} columns ${l}${t.children.length} width=${Math.max(d,t.size?.width||0)}`),d<(t?.size?.width||0)){d=t?.size?.width||0;let m=l>0?Math.min(t.children.length,l):t.children.length;if(m>0){let g=(d-m*xi-xi)/m;Y.debug("abc95 (growing to fit) width",t.id,d,t.size?.width,g);for(let y of t.children)y.size&&(y.size.width=g)}}t.size={width:d,height:p,x:0,y:0}}Y.debug("setBlockSizes abc94 (done)",t.id,t?.size?.x,t?.size?.width,t?.size?.y,t?.size?.height)}function ove(t,e){Y.debug(`abc85 layout blocks (=>layoutBlocks) ${t.id} x: ${t?.size?.x} y: ${t?.size?.y} width: ${t?.size?.width}`);let r=t.columns??-1;if(Y.debug("layoutBlocks columns abc95",t.id,"=>",r,t),t.children&&t.children.length>0){let n=t?.children[0]?.size?.width??0,i=t.children.length*n+(t.children.length-1)*xi;Y.debug("widthOfChildren 88",i,"posX");let a=0;Y.debug("abc91 block?.size?.x",t.id,t?.size?.x);let s=t?.size?.x?t?.size?.x+(-t?.size?.width/2||0):-xi,l=0;for(let u of t.children){let h=t;if(!u.size)continue;let{width:f,height:d}=u.size,{px:p,py:m}=Tnt(r,a);if(m!=l&&(l=m,s=t?.size?.x?t?.size?.x+(-t?.size?.width/2||0):-xi,Y.debug("New row in layout for block",t.id," and child ",u.id,l)),Y.debug(`abc89 layout blocks (child) id: ${u.id} Pos: ${a} (px, py) ${p},${m} (${h?.size?.x},${h?.size?.y}) parent: ${h.id} width: ${f}${xi}`),h.size){let g=f/2;u.size.x=s+xi+g,Y.debug(`abc91 layout blocks (calc) px, pyid:${u.id} startingPos=X${s} new startingPosX${u.size.x} ${g} padding=${xi} width=${f} halfWidth=${g} => x:${u.size.x} y:${u.size.y} ${u.widthInColumns} (width * (child?.w || 1)) / 2 ${f*(u?.widthInColumns??1)/2}`),s=u.size.x+g,u.size.y=h.size.y-h.size.height/2+m*(d+xi)+d/2+xi,Y.debug(`abc88 layout blocks (calc) px, pyid:${u.id}startingPosX${s}${xi}${g}=>x:${u.size.x}y:${u.size.y}${u.widthInColumns}(width * (child?.w || 1)) / 2${f*(u?.widthInColumns??1)/2}`)}u.children&&ove(u,e),a+=u?.widthInColumns??1,Y.debug("abc88 columnsPos",u,a)}}Y.debug(`layout blocks (<==layoutBlocks) ${t.id} x: ${t?.size?.x} y: ${t?.size?.y} width: ${t?.size?.width}`)}function lve(t,{minX:e,minY:r,maxX:n,maxY:i}={minX:0,minY:0,maxX:0,maxY:0}){if(t.size&&t.id!=="root"){let{x:a,y:s,width:l,height:u}=t.size;a-l/2<e&&(e=a-l/2),s-u/2<r&&(r=s-u/2),a+l/2>n&&(n=a+l/2),s+u/2>i&&(i=s+u/2)}if(t.children)for(let a of t.children)({minX:e,minY:r,maxX:n,maxY:i}=lve(a,{minX:e,minY:r,maxX:n,maxY:i}));return{minX:e,minY:r,maxX:n,maxY:i}}function cve(t){let e=t.getBlock("root");if(!e)return;JB(e,t,0,0),ove(e,t),Y.debug("getBlocks",JSON.stringify(e,null,2));let{minX:r,minY:n,maxX:i,maxY:a}=lve(e),s=a-n,l=i-r;return{x:r,y:n,width:l,height:s}}var xi,knt,uve=M(()=>{"use strict";ht();Vt();xi=de()?.block?.padding??8;o(Tnt,"calculateBlockPosition");knt=o(t=>{let e=0,r=0;for(let n of t.children){let{width:i,height:a,x:s,y:l}=n.size??{width:0,height:0,x:0,y:0};Y.debug("getMaxChildSize abc95 child:",n.id,"width:",i,"height:",a,"x:",s,"y:",l,n.type),n.type!=="space"&&(i>e&&(e=i/(t.widthInColumns??1)),a>r&&(r=a))}return{width:e,height:r}},"getMaxChildSize");o(JB,"setBlockSizes");o(ove,"layoutBlocks");o(lve,"findBounds");o(cve,"layout")});function hve(t,e){e&&t.attr("style",e)}function Ent(t){let e=ze(document.createElementNS("http://www.w3.org/2000/svg","foreignObject")),r=e.append("xhtml:div"),n=t.label,i=t.isNode?"nodeLabel":"edgeLabel",a=r.append("span");return a.html(n),hve(a,t.labelStyle),a.attr("class",i),hve(r,t.labelStyle),r.style("display","inline-block"),r.style("white-space","nowrap"),r.attr("xmlns","http://www.w3.org/1999/xhtml"),e.node()}var Snt,cs,Z6=M(()=>{"use strict";mr();ht();Vt();fr();hr();Dl();o(hve,"applyStyle");o(Ent,"addHtmlLabel");Snt=o((t,e,r,n)=>{let i=t||"";if(typeof i=="object"&&(i=i[0]),xr(de().flowchart.htmlLabels)){i=i.replace(/\\n|\n/g,"<br />"),Y.debug("vertexText"+i);let a={isNode:n,label:x9(Ca(i)),labelStyle:e.replace("fill:","color:")};return Ent(a)}else{let a=document.createElementNS("http://www.w3.org/2000/svg","text");a.setAttribute("style",e.replace("color:","fill:"));let s=[];typeof i=="string"?s=i.split(/\\n|\n|<br\s*\/?>/gi):Array.isArray(i)?s=i:s=[];for(let l of s){let u=document.createElementNS("http://www.w3.org/2000/svg","tspan");u.setAttributeNS("http://www.w3.org/XML/1998/namespace","xml:space","preserve"),u.setAttribute("dy","1em"),u.setAttribute("x","0"),r?u.setAttribute("class","title-row"):u.setAttribute("class","row"),u.textContent=l.trim(),a.appendChild(u)}return a}},"createLabel"),cs=Snt});var dve,Cnt,fve,pve=M(()=>{"use strict";ht();dve=o((t,e,r,n,i)=>{e.arrowTypeStart&&fve(t,"start",e.arrowTypeStart,r,n,i),e.arrowTypeEnd&&fve(t,"end",e.arrowTypeEnd,r,n,i)},"addEdgeMarkers"),Cnt={arrow_cross:"cross",arrow_point:"point",arrow_barb:"barb",arrow_circle:"circle",aggregation:"aggregation",extension:"extension",composition:"composition",dependency:"dependency",lollipop:"lollipop"},fve=o((t,e,r,n,i,a)=>{let s=Cnt[r];if(!s){Y.warn(`Unknown arrow type: ${r}`);return}let l=e==="start"?"Start":"End";t.attr(`marker-${e}`,`url(${n}#${i}_${a}-${s}${l})`)},"addEdgeMarker")});function J6(t,e){de().flowchart.htmlLabels&&t&&(t.style.width=e.length*9+"px",t.style.height="12px")}var eF,$a,gve,yve,Ant,_nt,mve,vve,xve=M(()=>{"use strict";ht();Z6();Dl();mr();Vt();hr();fr();lL();Cv();pve();eF={},$a={},gve=o((t,e)=>{let r=de(),n=xr(r.flowchart.htmlLabels),i=e.labelType==="markdown"?Si(t,e.label,{style:e.labelStyle,useHtmlLabels:n,addSvgBackground:!0},r):cs(e.label,e.labelStyle),a=t.insert("g").attr("class","edgeLabel"),s=a.insert("g").attr("class","label");s.node().appendChild(i);let l=i.getBBox();if(n){let h=i.children[0],f=ze(i);l=h.getBoundingClientRect(),f.attr("width",l.width),f.attr("height",l.height)}s.attr("transform","translate("+-l.width/2+", "+-l.height/2+")"),eF[e.id]=a,e.width=l.width,e.height=l.height;let u;if(e.startLabelLeft){let h=cs(e.startLabelLeft,e.labelStyle),f=t.insert("g").attr("class","edgeTerminals"),d=f.insert("g").attr("class","inner");u=d.node().appendChild(h);let p=h.getBBox();d.attr("transform","translate("+-p.width/2+", "+-p.height/2+")"),$a[e.id]||($a[e.id]={}),$a[e.id].startLeft=f,J6(u,e.startLabelLeft)}if(e.startLabelRight){let h=cs(e.startLabelRight,e.labelStyle),f=t.insert("g").attr("class","edgeTerminals"),d=f.insert("g").attr("class","inner");u=f.node().appendChild(h),d.node().appendChild(h);let p=h.getBBox();d.attr("transform","translate("+-p.width/2+", "+-p.height/2+")"),$a[e.id]||($a[e.id]={}),$a[e.id].startRight=f,J6(u,e.startLabelRight)}if(e.endLabelLeft){let h=cs(e.endLabelLeft,e.labelStyle),f=t.insert("g").attr("class","edgeTerminals"),d=f.insert("g").attr("class","inner");u=d.node().appendChild(h);let p=h.getBBox();d.attr("transform","translate("+-p.width/2+", "+-p.height/2+")"),f.node().appendChild(h),$a[e.id]||($a[e.id]={}),$a[e.id].endLeft=f,J6(u,e.endLabelLeft)}if(e.endLabelRight){let h=cs(e.endLabelRight,e.labelStyle),f=t.insert("g").attr("class","edgeTerminals"),d=f.insert("g").attr("class","inner");u=d.node().appendChild(h);let p=h.getBBox();d.attr("transform","translate("+-p.width/2+", "+-p.height/2+")"),f.node().appendChild(h),$a[e.id]||($a[e.id]={}),$a[e.id].endRight=f,J6(u,e.endLabelRight)}return i},"insertEdgeLabel");o(J6,"setTerminalWidth");yve=o((t,e)=>{Y.debug("Moving label abc88 ",t.id,t.label,eF[t.id],e);let r=e.updatedPath?e.updatedPath:e.originalPath,n=de(),{subGraphTitleTotalMargin:i}=_u(n);if(t.label){let a=eF[t.id],s=t.x,l=t.y;if(r){let u=Ut.calcLabelPosition(r);Y.debug("Moving label "+t.label+" from (",s,",",l,") to (",u.x,",",u.y,") abc88"),e.updatedPath&&(s=u.x,l=u.y)}a.attr("transform",`translate(${s}, ${l+i/2})`)}if(t.startLabelLeft){let a=$a[t.id].startLeft,s=t.x,l=t.y;if(r){let u=Ut.calcTerminalLabelPosition(t.arrowTypeStart?10:0,"start_left",r);s=u.x,l=u.y}a.attr("transform",`translate(${s}, ${l})`)}if(t.startLabelRight){let a=$a[t.id].startRight,s=t.x,l=t.y;if(r){let u=Ut.calcTerminalLabelPosition(t.arrowTypeStart?10:0,"start_right",r);s=u.x,l=u.y}a.attr("transform",`translate(${s}, ${l})`)}if(t.endLabelLeft){let a=$a[t.id].endLeft,s=t.x,l=t.y;if(r){let u=Ut.calcTerminalLabelPosition(t.arrowTypeEnd?10:0,"end_left",r);s=u.x,l=u.y}a.attr("transform",`translate(${s}, ${l})`)}if(t.endLabelRight){let a=$a[t.id].endRight,s=t.x,l=t.y;if(r){let u=Ut.calcTerminalLabelPosition(t.arrowTypeEnd?10:0,"end_right",r);s=u.x,l=u.y}a.attr("transform",`translate(${s}, ${l})`)}},"positionEdgeLabel"),Ant=o((t,e)=>{let r=t.x,n=t.y,i=Math.abs(e.x-r),a=Math.abs(e.y-n),s=t.width/2,l=t.height/2;return i>=s||a>=l},"outsideNode"),_nt=o((t,e,r)=>{Y.debug(`intersection calc abc89: + outsidePoint: ${JSON.stringify(e)} + insidePoint : ${JSON.stringify(r)} + node : x:${t.x} y:${t.y} w:${t.width} h:${t.height}`);let n=t.x,i=t.y,a=Math.abs(n-r.x),s=t.width/2,l=r.x<e.x?s-a:s+a,u=t.height/2,h=Math.abs(e.y-r.y),f=Math.abs(e.x-r.x);if(Math.abs(i-e.y)*s>Math.abs(n-e.x)*u){let d=r.y<e.y?e.y-u-i:i-u-e.y;l=f*d/h;let p={x:r.x<e.x?r.x+l:r.x-f+l,y:r.y<e.y?r.y+h-d:r.y-h+d};return l===0&&(p.x=e.x,p.y=e.y),f===0&&(p.x=e.x),h===0&&(p.y=e.y),Y.debug(`abc89 topp/bott calc, Q ${h}, q ${d}, R ${f}, r ${l}`,p),p}else{r.x<e.x?l=e.x-s-n:l=n-s-e.x;let d=h*l/f,p=r.x<e.x?r.x+f-l:r.x-f+l,m=r.y<e.y?r.y+d:r.y-d;return Y.debug(`sides calc abc89, Q ${h}, q ${d}, R ${f}, r ${l}`,{_x:p,_y:m}),l===0&&(p=e.x,m=e.y),f===0&&(p=e.x),h===0&&(m=e.y),{x:p,y:m}}},"intersection"),mve=o((t,e)=>{Y.debug("abc88 cutPathAtIntersect",t,e);let r=[],n=t[0],i=!1;return t.forEach(a=>{if(!Ant(e,a)&&!i){let s=_nt(e,n,a),l=!1;r.forEach(u=>{l=l||u.x===s.x&&u.y===s.y}),r.some(u=>u.x===s.x&&u.y===s.y)||r.push(s),i=!0}else n=a,i||r.push(a)}),r},"cutPathAtIntersect"),vve=o(function(t,e,r,n,i,a,s){let l=r.points;Y.debug("abc88 InsertEdge: edge=",r,"e=",e);let u=!1,h=a.node(e.v);var f=a.node(e.w);f?.intersect&&h?.intersect&&(l=l.slice(1,r.points.length-1),l.unshift(h.intersect(l[0])),l.push(f.intersect(l[l.length-1]))),r.toCluster&&(Y.debug("to cluster abc88",n[r.toCluster]),l=mve(r.points,n[r.toCluster].node),u=!0),r.fromCluster&&(Y.debug("from cluster abc88",n[r.fromCluster]),l=mve(l.reverse(),n[r.fromCluster].node).reverse(),u=!0);let d=l.filter(_=>!Number.isNaN(_.y)),p=Do;r.curve&&(i==="graph"||i==="flowchart")&&(p=r.curve);let{x:m,y:g}=Z5(r),y=Ka().x(m).y(g).curve(p),v;switch(r.thickness){case"normal":v="edge-thickness-normal";break;case"thick":v="edge-thickness-thick";break;case"invisible":v="edge-thickness-thick";break;default:v=""}switch(r.pattern){case"solid":v+=" edge-pattern-solid";break;case"dotted":v+=" edge-pattern-dotted";break;case"dashed":v+=" edge-pattern-dashed";break}let x=t.append("path").attr("d",y(d)).attr("id",r.id).attr("class"," "+v+(r.classes?" "+r.classes:"")).attr("style",r.style),b="";(de().flowchart.arrowMarkerAbsolute||de().state.arrowMarkerAbsolute)&&(b=window.location.protocol+"//"+window.location.host+window.location.pathname+window.location.search,b=b.replace(/\(/g,"\\("),b=b.replace(/\)/g,"\\)")),dve(x,r,b,s,i);let w={};return u&&(w.updatedPath=l),w.originalPath=r.points,w},"insertEdge")});var Lnt,bve,wve=M(()=>{"use strict";Lnt=o(t=>{let e=new Set;for(let r of t)switch(r){case"x":e.add("right"),e.add("left");break;case"y":e.add("up"),e.add("down");break;default:e.add(r);break}return e},"expandAndDeduplicateDirections"),bve=o((t,e,r)=>{let n=Lnt(t),i=2,a=e.height+2*r.padding,s=a/i,l=e.width+2*s+r.padding,u=r.padding/2;return n.has("right")&&n.has("left")&&n.has("up")&&n.has("down")?[{x:0,y:0},{x:s,y:0},{x:l/2,y:2*u},{x:l-s,y:0},{x:l,y:0},{x:l,y:-a/3},{x:l+2*u,y:-a/2},{x:l,y:-2*a/3},{x:l,y:-a},{x:l-s,y:-a},{x:l/2,y:-a-2*u},{x:s,y:-a},{x:0,y:-a},{x:0,y:-2*a/3},{x:-2*u,y:-a/2},{x:0,y:-a/3}]:n.has("right")&&n.has("left")&&n.has("up")?[{x:s,y:0},{x:l-s,y:0},{x:l,y:-a/2},{x:l-s,y:-a},{x:s,y:-a},{x:0,y:-a/2}]:n.has("right")&&n.has("left")&&n.has("down")?[{x:0,y:0},{x:s,y:-a},{x:l-s,y:-a},{x:l,y:0}]:n.has("right")&&n.has("up")&&n.has("down")?[{x:0,y:0},{x:l,y:-s},{x:l,y:-a+s},{x:0,y:-a}]:n.has("left")&&n.has("up")&&n.has("down")?[{x:l,y:0},{x:0,y:-s},{x:0,y:-a+s},{x:l,y:-a}]:n.has("right")&&n.has("left")?[{x:s,y:0},{x:s,y:-u},{x:l-s,y:-u},{x:l-s,y:0},{x:l,y:-a/2},{x:l-s,y:-a},{x:l-s,y:-a+u},{x:s,y:-a+u},{x:s,y:-a},{x:0,y:-a/2}]:n.has("up")&&n.has("down")?[{x:l/2,y:0},{x:0,y:-u},{x:s,y:-u},{x:s,y:-a+u},{x:0,y:-a+u},{x:l/2,y:-a},{x:l,y:-a+u},{x:l-s,y:-a+u},{x:l-s,y:-u},{x:l,y:-u}]:n.has("right")&&n.has("up")?[{x:0,y:0},{x:l,y:-s},{x:0,y:-a}]:n.has("right")&&n.has("down")?[{x:0,y:0},{x:l,y:0},{x:0,y:-a}]:n.has("left")&&n.has("up")?[{x:l,y:0},{x:0,y:-s},{x:l,y:-a}]:n.has("left")&&n.has("down")?[{x:l,y:0},{x:0,y:0},{x:l,y:-a}]:n.has("right")?[{x:s,y:-u},{x:s,y:-u},{x:l-s,y:-u},{x:l-s,y:0},{x:l,y:-a/2},{x:l-s,y:-a},{x:l-s,y:-a+u},{x:s,y:-a+u},{x:s,y:-a+u}]:n.has("left")?[{x:s,y:0},{x:s,y:-u},{x:l-s,y:-u},{x:l-s,y:-a+u},{x:s,y:-a+u},{x:s,y:-a},{x:0,y:-a/2}]:n.has("up")?[{x:s,y:-u},{x:s,y:-a+u},{x:0,y:-a+u},{x:l/2,y:-a},{x:l,y:-a+u},{x:l-s,y:-a+u},{x:l-s,y:-u}]:n.has("down")?[{x:l/2,y:0},{x:0,y:-u},{x:s,y:-u},{x:s,y:-a+u},{x:l-s,y:-a+u},{x:l-s,y:-u},{x:l,y:-u}]:[{x:0,y:0}]},"getArrowPoints")});function Dnt(t,e){return t.intersect(e)}var Tve,kve=M(()=>{"use strict";o(Dnt,"intersectNode");Tve=Dnt});function Nnt(t,e,r,n){var i=t.x,a=t.y,s=i-n.x,l=a-n.y,u=Math.sqrt(e*e*l*l+r*r*s*s),h=Math.abs(e*r*s/u);n.x<i&&(h=-h);var f=Math.abs(e*r*l/u);return n.y<a&&(f=-f),{x:i+h,y:a+f}}var eS,tF=M(()=>{"use strict";o(Nnt,"intersectEllipse");eS=Nnt});function Rnt(t,e,r){return eS(t,e,e,r)}var Eve,Sve=M(()=>{"use strict";tF();o(Rnt,"intersectCircle");Eve=Rnt});function Mnt(t,e,r,n){var i,a,s,l,u,h,f,d,p,m,g,y,v,x,b;if(i=e.y-t.y,s=t.x-e.x,u=e.x*t.y-t.x*e.y,p=i*r.x+s*r.y+u,m=i*n.x+s*n.y+u,!(p!==0&&m!==0&&Cve(p,m))&&(a=n.y-r.y,l=r.x-n.x,h=n.x*r.y-r.x*n.y,f=a*t.x+l*t.y+h,d=a*e.x+l*e.y+h,!(f!==0&&d!==0&&Cve(f,d))&&(g=i*l-a*s,g!==0)))return y=Math.abs(g/2),v=s*h-l*u,x=v<0?(v-y)/g:(v+y)/g,v=a*u-i*h,b=v<0?(v-y)/g:(v+y)/g,{x,y:b}}function Cve(t,e){return t*e>0}var Ave,_ve=M(()=>{"use strict";o(Mnt,"intersectLine");o(Cve,"sameSign");Ave=Mnt});function Int(t,e,r){var n=t.x,i=t.y,a=[],s=Number.POSITIVE_INFINITY,l=Number.POSITIVE_INFINITY;typeof e.forEach=="function"?e.forEach(function(g){s=Math.min(s,g.x),l=Math.min(l,g.y)}):(s=Math.min(s,e.x),l=Math.min(l,e.y));for(var u=n-t.width/2-s,h=i-t.height/2-l,f=0;f<e.length;f++){var d=e[f],p=e[f<e.length-1?f+1:0],m=Ave(t,r,{x:u+d.x,y:h+d.y},{x:u+p.x,y:h+p.y});m&&a.push(m)}return a.length?(a.length>1&&a.sort(function(g,y){var v=g.x-r.x,x=g.y-r.y,b=Math.sqrt(v*v+x*x),w=y.x-r.x,_=y.y-r.y,T=Math.sqrt(w*w+_*_);return b<T?-1:b===T?0:1}),a[0]):t}var Lve,Dve=M(()=>{"use strict";_ve();Lve=Int;o(Int,"intersectPolygon")});var Ont,Nve,Rve=M(()=>{"use strict";Ont=o((t,e)=>{var r=t.x,n=t.y,i=e.x-r,a=e.y-n,s=t.width/2,l=t.height/2,u,h;return Math.abs(a)*s>Math.abs(i)*l?(a<0&&(l=-l),u=a===0?0:l*i/a,h=l):(i<0&&(s=-s),u=s,h=i===0?0:s*a/i),{x:r+u,y:n+h}},"intersectRect"),Nve=Ont});var Rn,rF=M(()=>{"use strict";kve();Sve();tF();Dve();Rve();Rn={node:Tve,circle:Eve,ellipse:eS,polygon:Lve,rect:Nve}});function Xl(t,e,r,n){return t.insert("polygon",":first-child").attr("points",n.map(function(i){return i.x+","+i.y}).join(" ")).attr("class","label-container").attr("transform","translate("+-e/2+","+r/2+")")}var _i,qn,nF=M(()=>{"use strict";Z6();Dl();Vt();mr();fr();hr();_i=o(async(t,e,r,n)=>{let i=de(),a,s=e.useHtmlLabels||xr(i.flowchart.htmlLabels);r?a=r:a="node default";let l=t.insert("g").attr("class",a).attr("id",e.domId||e.id),u=l.insert("g").attr("class","label").attr("style",e.labelStyle),h;e.labelText===void 0?h="":h=typeof e.labelText=="string"?e.labelText:e.labelText[0];let f=u.node(),d;e.labelType==="markdown"?d=Si(u,Tr(Ca(h),i),{useHtmlLabels:s,width:e.width||i.flowchart.wrappingWidth,classes:"markdown-node-label"},i):d=f.appendChild(cs(Tr(Ca(h),i),e.labelStyle,!1,n));let p=d.getBBox(),m=e.padding/2;if(xr(i.flowchart.htmlLabels)){let g=d.children[0],y=ze(d),v=g.getElementsByTagName("img");if(v){let x=h.replace(/<img[^>]*>/g,"").trim()==="";await Promise.all([...v].map(b=>new Promise(w=>{function _(){if(b.style.display="flex",b.style.flexDirection="column",x){let T=i.fontSize?i.fontSize:window.getComputedStyle(document.body).fontSize,L=parseInt(T,10)*5+"px";b.style.minWidth=L,b.style.maxWidth=L}else b.style.width="100%";w(b)}o(_,"setupImage"),setTimeout(()=>{b.complete&&_()}),b.addEventListener("error",_),b.addEventListener("load",_)})))}p=g.getBoundingClientRect(),y.attr("width",p.width),y.attr("height",p.height)}return s?u.attr("transform","translate("+-p.width/2+", "+-p.height/2+")"):u.attr("transform","translate(0, "+-p.height/2+")"),e.centerLabel&&u.attr("transform","translate("+-p.width/2+", "+-p.height/2+")"),u.insert("rect",":first-child"),{shapeSvg:l,bbox:p,halfPadding:m,label:u}},"labelHelper"),qn=o((t,e)=>{let r=e.node().getBBox();t.width=r.width,t.height=r.height},"updateNodeBounds");o(Xl,"insertPolygonShape")});var Pnt,Mve,Ive=M(()=>{"use strict";nF();ht();Vt();rF();Pnt=o(async(t,e)=>{e.useHtmlLabels||de().flowchart.htmlLabels||(e.centerLabel=!0);let{shapeSvg:n,bbox:i,halfPadding:a}=await _i(t,e,"node "+e.classes,!0);Y.info("Classes = ",e.classes);let s=n.insert("rect",":first-child");return s.attr("rx",e.rx).attr("ry",e.ry).attr("x",-i.width/2-a).attr("y",-i.height/2-a).attr("width",i.width+e.padding).attr("height",i.height+e.padding),qn(e,s),e.intersect=function(l){return Rn.rect(e,l)},n},"note"),Mve=Pnt});function iF(t,e,r,n){let i=[],a=o(l=>{i.push(l,0)},"addBorder"),s=o(l=>{i.push(0,l)},"skipBorder");e.includes("t")?(Y.debug("add top border"),a(r)):s(r),e.includes("r")?(Y.debug("add right border"),a(n)):s(n),e.includes("b")?(Y.debug("add bottom border"),a(r)):s(r),e.includes("l")?(Y.debug("add left border"),a(n)):s(n),t.attr("stroke-dasharray",i.join(" "))}var Ove,go,Pve,Bnt,Fnt,znt,Gnt,$nt,Vnt,Unt,Hnt,Wnt,Ynt,qnt,Xnt,jnt,Knt,Qnt,Znt,Jnt,eit,tit,Bve,rit,nit,Fve,tS,aF,zve,Gve=M(()=>{"use strict";mr();Vt();fr();ht();wve();Z6();rF();Ive();nF();Ove=o(t=>t?" "+t:"","formatClass"),go=o((t,e)=>`${e||"node default"}${Ove(t.classes)} ${Ove(t.class)}`,"getClassesFromNode"),Pve=o(async(t,e)=>{let{shapeSvg:r,bbox:n}=await _i(t,e,go(e,void 0),!0),i=n.width+e.padding,a=n.height+e.padding,s=i+a,l=[{x:s/2,y:0},{x:s,y:-s/2},{x:s/2,y:-s},{x:0,y:-s/2}];Y.info("Question main (Circle)");let u=Xl(r,s,s,l);return u.attr("style",e.style),qn(e,u),e.intersect=function(h){return Y.warn("Intersect called"),Rn.polygon(e,l,h)},r},"question"),Bnt=o((t,e)=>{let r=t.insert("g").attr("class","node default").attr("id",e.domId||e.id),n=28,i=[{x:0,y:n/2},{x:n/2,y:0},{x:0,y:-n/2},{x:-n/2,y:0}];return r.insert("polygon",":first-child").attr("points",i.map(function(s){return s.x+","+s.y}).join(" ")).attr("class","state-start").attr("r",7).attr("width",28).attr("height",28),e.width=28,e.height=28,e.intersect=function(s){return Rn.circle(e,14,s)},r},"choice"),Fnt=o(async(t,e)=>{let{shapeSvg:r,bbox:n}=await _i(t,e,go(e,void 0),!0),i=4,a=n.height+e.padding,s=a/i,l=n.width+2*s+e.padding,u=[{x:s,y:0},{x:l-s,y:0},{x:l,y:-a/2},{x:l-s,y:-a},{x:s,y:-a},{x:0,y:-a/2}],h=Xl(r,l,a,u);return h.attr("style",e.style),qn(e,h),e.intersect=function(f){return Rn.polygon(e,u,f)},r},"hexagon"),znt=o(async(t,e)=>{let{shapeSvg:r,bbox:n}=await _i(t,e,void 0,!0),i=2,a=n.height+2*e.padding,s=a/i,l=n.width+2*s+e.padding,u=bve(e.directions,n,e),h=Xl(r,l,a,u);return h.attr("style",e.style),qn(e,h),e.intersect=function(f){return Rn.polygon(e,u,f)},r},"block_arrow"),Gnt=o(async(t,e)=>{let{shapeSvg:r,bbox:n}=await _i(t,e,go(e,void 0),!0),i=n.width+e.padding,a=n.height+e.padding,s=[{x:-a/2,y:0},{x:i,y:0},{x:i,y:-a},{x:-a/2,y:-a},{x:0,y:-a/2}];return Xl(r,i,a,s).attr("style",e.style),e.width=i+a,e.height=a,e.intersect=function(u){return Rn.polygon(e,s,u)},r},"rect_left_inv_arrow"),$nt=o(async(t,e)=>{let{shapeSvg:r,bbox:n}=await _i(t,e,go(e),!0),i=n.width+e.padding,a=n.height+e.padding,s=[{x:-2*a/6,y:0},{x:i-a/6,y:0},{x:i+2*a/6,y:-a},{x:a/6,y:-a}],l=Xl(r,i,a,s);return l.attr("style",e.style),qn(e,l),e.intersect=function(u){return Rn.polygon(e,s,u)},r},"lean_right"),Vnt=o(async(t,e)=>{let{shapeSvg:r,bbox:n}=await _i(t,e,go(e,void 0),!0),i=n.width+e.padding,a=n.height+e.padding,s=[{x:2*a/6,y:0},{x:i+a/6,y:0},{x:i-2*a/6,y:-a},{x:-a/6,y:-a}],l=Xl(r,i,a,s);return l.attr("style",e.style),qn(e,l),e.intersect=function(u){return Rn.polygon(e,s,u)},r},"lean_left"),Unt=o(async(t,e)=>{let{shapeSvg:r,bbox:n}=await _i(t,e,go(e,void 0),!0),i=n.width+e.padding,a=n.height+e.padding,s=[{x:-2*a/6,y:0},{x:i+2*a/6,y:0},{x:i-a/6,y:-a},{x:a/6,y:-a}],l=Xl(r,i,a,s);return l.attr("style",e.style),qn(e,l),e.intersect=function(u){return Rn.polygon(e,s,u)},r},"trapezoid"),Hnt=o(async(t,e)=>{let{shapeSvg:r,bbox:n}=await _i(t,e,go(e,void 0),!0),i=n.width+e.padding,a=n.height+e.padding,s=[{x:a/6,y:0},{x:i-a/6,y:0},{x:i+2*a/6,y:-a},{x:-2*a/6,y:-a}],l=Xl(r,i,a,s);return l.attr("style",e.style),qn(e,l),e.intersect=function(u){return Rn.polygon(e,s,u)},r},"inv_trapezoid"),Wnt=o(async(t,e)=>{let{shapeSvg:r,bbox:n}=await _i(t,e,go(e,void 0),!0),i=n.width+e.padding,a=n.height+e.padding,s=[{x:0,y:0},{x:i+a/2,y:0},{x:i,y:-a/2},{x:i+a/2,y:-a},{x:0,y:-a}],l=Xl(r,i,a,s);return l.attr("style",e.style),qn(e,l),e.intersect=function(u){return Rn.polygon(e,s,u)},r},"rect_right_inv_arrow"),Ynt=o(async(t,e)=>{let{shapeSvg:r,bbox:n}=await _i(t,e,go(e,void 0),!0),i=n.width+e.padding,a=i/2,s=a/(2.5+i/50),l=n.height+s+e.padding,u="M 0,"+s+" a "+a+","+s+" 0,0,0 "+i+" 0 a "+a+","+s+" 0,0,0 "+-i+" 0 l 0,"+l+" a "+a+","+s+" 0,0,0 "+i+" 0 l 0,"+-l,h=r.attr("label-offset-y",s).insert("path",":first-child").attr("style",e.style).attr("d",u).attr("transform","translate("+-i/2+","+-(l/2+s)+")");return qn(e,h),e.intersect=function(f){let d=Rn.rect(e,f),p=d.x-e.x;if(a!=0&&(Math.abs(p)<e.width/2||Math.abs(p)==e.width/2&&Math.abs(d.y-e.y)>e.height/2-s)){let m=s*s*(1-p*p/(a*a));m!=0&&(m=Math.sqrt(m)),m=s-m,f.y-e.y>0&&(m=-m),d.y+=m}return d},r},"cylinder"),qnt=o(async(t,e)=>{let{shapeSvg:r,bbox:n,halfPadding:i}=await _i(t,e,"node "+e.classes+" "+e.class,!0),a=r.insert("rect",":first-child"),s=e.positioned?e.width:n.width+e.padding,l=e.positioned?e.height:n.height+e.padding,u=e.positioned?-s/2:-n.width/2-i,h=e.positioned?-l/2:-n.height/2-i;if(a.attr("class","basic label-container").attr("style",e.style).attr("rx",e.rx).attr("ry",e.ry).attr("x",u).attr("y",h).attr("width",s).attr("height",l),e.props){let f=new Set(Object.keys(e.props));e.props.borders&&(iF(a,e.props.borders,s,l),f.delete("borders")),f.forEach(d=>{Y.warn(`Unknown node property ${d}`)})}return qn(e,a),e.intersect=function(f){return Rn.rect(e,f)},r},"rect"),Xnt=o(async(t,e)=>{let{shapeSvg:r,bbox:n,halfPadding:i}=await _i(t,e,"node "+e.classes,!0),a=r.insert("rect",":first-child"),s=e.positioned?e.width:n.width+e.padding,l=e.positioned?e.height:n.height+e.padding,u=e.positioned?-s/2:-n.width/2-i,h=e.positioned?-l/2:-n.height/2-i;if(a.attr("class","basic cluster composite label-container").attr("style",e.style).attr("rx",e.rx).attr("ry",e.ry).attr("x",u).attr("y",h).attr("width",s).attr("height",l),e.props){let f=new Set(Object.keys(e.props));e.props.borders&&(iF(a,e.props.borders,s,l),f.delete("borders")),f.forEach(d=>{Y.warn(`Unknown node property ${d}`)})}return qn(e,a),e.intersect=function(f){return Rn.rect(e,f)},r},"composite"),jnt=o(async(t,e)=>{let{shapeSvg:r}=await _i(t,e,"label",!0);Y.trace("Classes = ",e.class);let n=r.insert("rect",":first-child"),i=0,a=0;if(n.attr("width",i).attr("height",a),r.attr("class","label edgeLabel"),e.props){let s=new Set(Object.keys(e.props));e.props.borders&&(iF(n,e.props.borders,i,a),s.delete("borders")),s.forEach(l=>{Y.warn(`Unknown node property ${l}`)})}return qn(e,n),e.intersect=function(s){return Rn.rect(e,s)},r},"labelRect");o(iF,"applyNodePropertyBorders");Knt=o((t,e)=>{let r;e.classes?r="node "+e.classes:r="node default";let n=t.insert("g").attr("class",r).attr("id",e.domId||e.id),i=n.insert("rect",":first-child"),a=n.insert("line"),s=n.insert("g").attr("class","label"),l=e.labelText.flat?e.labelText.flat():e.labelText,u="";typeof l=="object"?u=l[0]:u=l,Y.info("Label text abc79",u,l,typeof l=="object");let h=s.node().appendChild(cs(u,e.labelStyle,!0,!0)),f={width:0,height:0};if(xr(de().flowchart.htmlLabels)){let y=h.children[0],v=ze(h);f=y.getBoundingClientRect(),v.attr("width",f.width),v.attr("height",f.height)}Y.info("Text 2",l);let d=l.slice(1,l.length),p=h.getBBox(),m=s.node().appendChild(cs(d.join?d.join("<br/>"):d,e.labelStyle,!0,!0));if(xr(de().flowchart.htmlLabels)){let y=m.children[0],v=ze(m);f=y.getBoundingClientRect(),v.attr("width",f.width),v.attr("height",f.height)}let g=e.padding/2;return ze(m).attr("transform","translate( "+(f.width>p.width?0:(p.width-f.width)/2)+", "+(p.height+g+5)+")"),ze(h).attr("transform","translate( "+(f.width<p.width?0:-(p.width-f.width)/2)+", 0)"),f=s.node().getBBox(),s.attr("transform","translate("+-f.width/2+", "+(-f.height/2-g+3)+")"),i.attr("class","outer title-state").attr("x",-f.width/2-g).attr("y",-f.height/2-g).attr("width",f.width+e.padding).attr("height",f.height+e.padding),a.attr("class","divider").attr("x1",-f.width/2-g).attr("x2",f.width/2+g).attr("y1",-f.height/2-g+p.height+g).attr("y2",-f.height/2-g+p.height+g),qn(e,i),e.intersect=function(y){return Rn.rect(e,y)},n},"rectWithTitle"),Qnt=o(async(t,e)=>{let{shapeSvg:r,bbox:n}=await _i(t,e,go(e,void 0),!0),i=n.height+e.padding,a=n.width+i/4+e.padding,s=r.insert("rect",":first-child").attr("style",e.style).attr("rx",i/2).attr("ry",i/2).attr("x",-a/2).attr("y",-i/2).attr("width",a).attr("height",i);return qn(e,s),e.intersect=function(l){return Rn.rect(e,l)},r},"stadium"),Znt=o(async(t,e)=>{let{shapeSvg:r,bbox:n,halfPadding:i}=await _i(t,e,go(e,void 0),!0),a=r.insert("circle",":first-child");return a.attr("style",e.style).attr("rx",e.rx).attr("ry",e.ry).attr("r",n.width/2+i).attr("width",n.width+e.padding).attr("height",n.height+e.padding),Y.info("Circle main"),qn(e,a),e.intersect=function(s){return Y.info("Circle intersect",e,n.width/2+i,s),Rn.circle(e,n.width/2+i,s)},r},"circle"),Jnt=o(async(t,e)=>{let{shapeSvg:r,bbox:n,halfPadding:i}=await _i(t,e,go(e,void 0),!0),a=5,s=r.insert("g",":first-child"),l=s.insert("circle"),u=s.insert("circle");return s.attr("class",e.class),l.attr("style",e.style).attr("rx",e.rx).attr("ry",e.ry).attr("r",n.width/2+i+a).attr("width",n.width+e.padding+a*2).attr("height",n.height+e.padding+a*2),u.attr("style",e.style).attr("rx",e.rx).attr("ry",e.ry).attr("r",n.width/2+i).attr("width",n.width+e.padding).attr("height",n.height+e.padding),Y.info("DoubleCircle main"),qn(e,l),e.intersect=function(h){return Y.info("DoubleCircle intersect",e,n.width/2+i+a,h),Rn.circle(e,n.width/2+i+a,h)},r},"doublecircle"),eit=o(async(t,e)=>{let{shapeSvg:r,bbox:n}=await _i(t,e,go(e,void 0),!0),i=n.width+e.padding,a=n.height+e.padding,s=[{x:0,y:0},{x:i,y:0},{x:i,y:-a},{x:0,y:-a},{x:0,y:0},{x:-8,y:0},{x:i+8,y:0},{x:i+8,y:-a},{x:-8,y:-a},{x:-8,y:0}],l=Xl(r,i,a,s);return l.attr("style",e.style),qn(e,l),e.intersect=function(u){return Rn.polygon(e,s,u)},r},"subroutine"),tit=o((t,e)=>{let r=t.insert("g").attr("class","node default").attr("id",e.domId||e.id),n=r.insert("circle",":first-child");return n.attr("class","state-start").attr("r",7).attr("width",14).attr("height",14),qn(e,n),e.intersect=function(i){return Rn.circle(e,7,i)},r},"start"),Bve=o((t,e,r)=>{let n=t.insert("g").attr("class","node default").attr("id",e.domId||e.id),i=70,a=10;r==="LR"&&(i=10,a=70);let s=n.append("rect").attr("x",-1*i/2).attr("y",-1*a/2).attr("width",i).attr("height",a).attr("class","fork-join");return qn(e,s),e.height=e.height+e.padding/2,e.width=e.width+e.padding/2,e.intersect=function(l){return Rn.rect(e,l)},n},"forkJoin"),rit=o((t,e)=>{let r=t.insert("g").attr("class","node default").attr("id",e.domId||e.id),n=r.insert("circle",":first-child"),i=r.insert("circle",":first-child");return i.attr("class","state-start").attr("r",7).attr("width",14).attr("height",14),n.attr("class","state-end").attr("r",5).attr("width",10).attr("height",10),qn(e,i),e.intersect=function(a){return Rn.circle(e,7,a)},r},"end"),nit=o((t,e)=>{let r=e.padding/2,n=4,i=8,a;e.classes?a="node "+e.classes:a="node default";let s=t.insert("g").attr("class",a).attr("id",e.domId||e.id),l=s.insert("rect",":first-child"),u=s.insert("line"),h=s.insert("line"),f=0,d=n,p=s.insert("g").attr("class","label"),m=0,g=e.classData.annotations?.[0],y=e.classData.annotations[0]?"\xAB"+e.classData.annotations[0]+"\xBB":"",v=p.node().appendChild(cs(y,e.labelStyle,!0,!0)),x=v.getBBox();if(xr(de().flowchart.htmlLabels)){let C=v.children[0],A=ze(v);x=C.getBoundingClientRect(),A.attr("width",x.width),A.attr("height",x.height)}e.classData.annotations[0]&&(d+=x.height+n,f+=x.width);let b=e.classData.label;e.classData.type!==void 0&&e.classData.type!==""&&(de().flowchart.htmlLabels?b+="<"+e.classData.type+">":b+="<"+e.classData.type+">");let w=p.node().appendChild(cs(b,e.labelStyle,!0,!0));ze(w).attr("class","classTitle");let _=w.getBBox();if(xr(de().flowchart.htmlLabels)){let C=w.children[0],A=ze(w);_=C.getBoundingClientRect(),A.attr("width",_.width),A.attr("height",_.height)}d+=_.height+n,_.width>f&&(f=_.width);let T=[];e.classData.members.forEach(C=>{let A=C.getDisplayDetails(),I=A.displayText;de().flowchart.htmlLabels&&(I=I.replace(/</g,"<").replace(/>/g,">"));let D=p.node().appendChild(cs(I,A.cssStyle?A.cssStyle:e.labelStyle,!0,!0)),k=D.getBBox();if(xr(de().flowchart.htmlLabels)){let R=D.children[0],S=ze(D);k=R.getBoundingClientRect(),S.attr("width",k.width),S.attr("height",k.height)}k.width>f&&(f=k.width),d+=k.height+n,T.push(D)}),d+=i;let E=[];if(e.classData.methods.forEach(C=>{let A=C.getDisplayDetails(),I=A.displayText;de().flowchart.htmlLabels&&(I=I.replace(/</g,"<").replace(/>/g,">"));let D=p.node().appendChild(cs(I,A.cssStyle?A.cssStyle:e.labelStyle,!0,!0)),k=D.getBBox();if(xr(de().flowchart.htmlLabels)){let R=D.children[0],S=ze(D);k=R.getBoundingClientRect(),S.attr("width",k.width),S.attr("height",k.height)}k.width>f&&(f=k.width),d+=k.height+n,E.push(D)}),d+=i,g){let C=(f-x.width)/2;ze(v).attr("transform","translate( "+(-1*f/2+C)+", "+-1*d/2+")"),m=x.height+n}let L=(f-_.width)/2;return ze(w).attr("transform","translate( "+(-1*f/2+L)+", "+(-1*d/2+m)+")"),m+=_.height+n,u.attr("class","divider").attr("x1",-f/2-r).attr("x2",f/2+r).attr("y1",-d/2-r+i+m).attr("y2",-d/2-r+i+m),m+=i,T.forEach(C=>{ze(C).attr("transform","translate( "+-f/2+", "+(-1*d/2+m+i/2)+")");let A=C?.getBBox();m+=(A?.height??0)+n}),m+=i,h.attr("class","divider").attr("x1",-f/2-r).attr("x2",f/2+r).attr("y1",-d/2-r+i+m).attr("y2",-d/2-r+i+m),m+=i,E.forEach(C=>{ze(C).attr("transform","translate( "+-f/2+", "+(-1*d/2+m)+")");let A=C?.getBBox();m+=(A?.height??0)+n}),l.attr("style",e.style).attr("class","outer title-state").attr("x",-f/2-r).attr("y",-(d/2)-r).attr("width",f+e.padding).attr("height",d+e.padding),qn(e,l),e.intersect=function(C){return Rn.rect(e,C)},s},"class_box"),Fve={rhombus:Pve,composite:Xnt,question:Pve,rect:qnt,labelRect:jnt,rectWithTitle:Knt,choice:Bnt,circle:Znt,doublecircle:Jnt,stadium:Qnt,hexagon:Fnt,block_arrow:znt,rect_left_inv_arrow:Gnt,lean_right:$nt,lean_left:Vnt,trapezoid:Unt,inv_trapezoid:Hnt,rect_right_inv_arrow:Wnt,cylinder:Ynt,start:tit,end:rit,note:Mve,subroutine:eit,fork:Bve,join:Bve,class_box:nit},tS={},aF=o(async(t,e,r)=>{let n,i;if(e.link){let a;de().securityLevel==="sandbox"?a="_top":e.linkTarget&&(a=e.linkTarget||"_blank"),n=t.insert("svg:a").attr("xlink:href",e.link).attr("target",a),i=await Fve[e.shape](n,e,r)}else i=await Fve[e.shape](t,e,r),n=i;return e.tooltip&&i.attr("title",e.tooltip),e.class&&i.attr("class","node default "+e.class),tS[e.id]=n,e.haveCallback&&tS[e.id].attr("class",tS[e.id].attr("class")+" clickable"),n},"insertNode"),zve=o(t=>{let e=tS[t.id];Y.trace("Transforming node",t.diff,t,"translate("+(t.x-t.width/2-5)+", "+t.width/2+")");let r=8,n=t.diff||0;return t.clusterNode?e.attr("transform","translate("+(t.x+n-t.width/2)+", "+(t.y-t.height/2-r)+")"):e.attr("transform","translate("+t.x+", "+t.y+")"),n},"positionNode")});function $ve(t,e,r=!1){let n=t,i="default";(n?.classes?.length||0)>0&&(i=(n?.classes??[]).join(" ")),i=i+" flowchart-label";let a=0,s="",l;switch(n.type){case"round":a=5,s="rect";break;case"composite":a=0,s="composite",l=0;break;case"square":s="rect";break;case"diamond":s="question";break;case"hexagon":s="hexagon";break;case"block_arrow":s="block_arrow";break;case"odd":s="rect_left_inv_arrow";break;case"lean_right":s="lean_right";break;case"lean_left":s="lean_left";break;case"trapezoid":s="trapezoid";break;case"inv_trapezoid":s="inv_trapezoid";break;case"rect_left_inv_arrow":s="rect_left_inv_arrow";break;case"circle":s="circle";break;case"ellipse":s="ellipse";break;case"stadium":s="stadium";break;case"subroutine":s="subroutine";break;case"cylinder":s="cylinder";break;case"group":s="rect";break;case"doublecircle":s="doublecircle";break;default:s="rect"}let u=J_(n?.styles??[]),h=n.label,f=n.size??{width:0,height:0,x:0,y:0};return{labelStyle:u.labelStyle,shape:s,labelText:h,rx:a,ry:a,class:i,style:u.style,id:n.id,directions:n.directions,width:f.width,height:f.height,x:f.x,y:f.y,positioned:r,intersect:void 0,type:n.type,padding:l??Sr()?.block?.padding??0}}async function iit(t,e,r){let n=$ve(e,r,!1);if(n.type==="group")return;let i=Sr(),a=await aF(t,n,{config:i}),s=a.node().getBBox(),l=r.getBlock(n.id);l.size={width:s.width,height:s.height,x:0,y:0,node:a},r.setBlock(l),a.remove()}async function ait(t,e,r){let n=$ve(e,r,!0);if(r.getBlock(n.id).type!=="space"){let a=Sr();await aF(t,n,{config:a}),e.intersect=n?.intersect,zve(n)}}async function sF(t,e,r,n){for(let i of e)await n(t,i,r),i.children&&await sF(t,i.children,r,n)}async function Vve(t,e,r){await sF(t,e,r,iit)}async function Uve(t,e,r){await sF(t,e,r,ait)}async function Hve(t,e,r,n,i){let a=new Mr({multigraph:!0,compound:!0});a.setGraph({rankdir:"TB",nodesep:10,ranksep:10,marginx:8,marginy:8});for(let s of r)s.size&&a.setNode(s.id,{width:s.size.width,height:s.size.height,intersect:s.intersect});for(let s of e)if(s.start&&s.end){let l=n.getBlock(s.start),u=n.getBlock(s.end);if(l?.size&&u?.size){let h=l.size,f=u.size,d=[{x:h.x,y:h.y},{x:h.x+(f.x-h.x)/2,y:h.y+(f.y-h.y)/2},{x:f.x,y:f.y}];vve(t,{v:s.start,w:s.end,name:s.id},{...s,arrowTypeEnd:s.arrowTypeEnd,arrowTypeStart:s.arrowTypeStart,points:d,classes:"edge-thickness-normal edge-pattern-solid flowchart-link LS-a1 LE-b1"},void 0,"block",a,i),s.label&&(await gve(t,{...s,label:s.label,labelStyle:"stroke: #333; stroke-width: 1.5px;fill:none;",arrowTypeEnd:s.arrowTypeEnd,arrowTypeStart:s.arrowTypeStart,points:d,classes:"edge-thickness-normal edge-pattern-solid flowchart-link LS-a1 LE-b1"}),yve({...s,x:d[1].x,y:d[1].y},{originalPath:d}))}}}var Wve=M(()=>{"use strict";Ns();Ua();xve();Gve();hr();o($ve,"getNodeFromBlock");o(iit,"calculateBlockSize");o(ait,"insertBlockPositioned");o(sF,"performOperations");o(Vve,"calculateBlockSizes");o(Uve,"insertBlocks");o(Hve,"insertEdges")});var sit,oit,Yve,qve=M(()=>{"use strict";mr();Ua();sve();ht();ni();uve();Wve();sit=o(function(t,e){return e.db.getClasses()},"getClasses"),oit=o(async function(t,e,r,n){let{securityLevel:i,block:a}=Sr(),s=n.db,l;i==="sandbox"&&(l=ze("#i"+e));let u=i==="sandbox"?ze(l.nodes()[0].contentDocument.body):ze("body"),h=i==="sandbox"?u.select(`[id="${e}"]`):ze(`[id="${e}"]`);ave(h,["point","circle","cross"],n.type,e);let d=s.getBlocks(),p=s.getBlocksFlat(),m=s.getEdges(),g=h.insert("g").attr("class","block");await Vve(g,d,s);let y=cve(s);if(await Uve(g,d,s),await Hve(g,m,p,s,e),y){let v=y,x=Math.max(1,Math.round(.125*(v.width/v.height))),b=v.height+x+10,w=v.width+10,{useMaxWidth:_}=a;Zr(h,b,w,!!_),Y.debug("Here Bounds",y,v),h.attr("viewBox",`${v.x-5} ${v.y-5} ${v.width+10} ${v.height+10}`)}},"draw"),Yve={draw:oit,getClasses:sit}});var Xve={};vr(Xve,{diagram:()=>lit});var lit,jve=M(()=>{"use strict";jye();rve();ive();qve();lit={parser:Xye,db:tve,renderer:Yve,styles:nve}});var oF,lF,mb,Zve,cF,us,qc,rS,Jve,fit,gb,e2e,t2e,r2e,n2e,nS,Mf,iS=M(()=>{"use strict";oF={L:"left",R:"right",T:"top",B:"bottom"},lF={L:o(t=>`${t},${t/2} 0,${t} 0,0`,"L"),R:o(t=>`0,${t/2} ${t},0 ${t},${t}`,"R"),T:o(t=>`0,0 ${t},0 ${t/2},${t}`,"T"),B:o(t=>`${t/2},0 ${t},${t} 0,${t}`,"B")},mb={L:o((t,e)=>t-e+2,"L"),R:o((t,e)=>t-2,"R"),T:o((t,e)=>t-e+2,"T"),B:o((t,e)=>t-2,"B")},Zve=o(function(t){return us(t)?t==="L"?"R":"L":t==="T"?"B":"T"},"getOppositeArchitectureDirection"),cF=o(function(t){let e=t;return e==="L"||e==="R"||e==="T"||e==="B"},"isArchitectureDirection"),us=o(function(t){let e=t;return e==="L"||e==="R"},"isArchitectureDirectionX"),qc=o(function(t){let e=t;return e==="T"||e==="B"},"isArchitectureDirectionY"),rS=o(function(t,e){let r=us(t)&&qc(e),n=qc(t)&&us(e);return r||n},"isArchitectureDirectionXY"),Jve=o(function(t){let e=t[0],r=t[1],n=us(e)&&qc(r),i=qc(e)&&us(r);return n||i},"isArchitecturePairXY"),fit=o(function(t){return t!=="LL"&&t!=="RR"&&t!=="TT"&&t!=="BB"},"isValidArchitectureDirectionPair"),gb=o(function(t,e){let r=`${t}${e}`;return fit(r)?r:void 0},"getArchitectureDirectionPair"),e2e=o(function([t,e],r){let n=r[0],i=r[1];return us(n)?qc(i)?[t+(n==="L"?-1:1),e+(i==="T"?1:-1)]:[t+(n==="L"?-1:1),e]:us(i)?[t+(i==="L"?1:-1),e+(n==="T"?1:-1)]:[t,e+(n==="T"?1:-1)]},"shiftPositionByArchitectureDirectionPair"),t2e=o(function(t){return t==="LT"||t==="TL"?[1,1]:t==="BL"||t==="LB"?[1,-1]:t==="BR"||t==="RB"?[-1,-1]:[-1,1]},"getArchitectureDirectionXYFactors"),r2e=o(function(t){return t.type==="service"},"isArchitectureService"),n2e=o(function(t){return t.type==="junction"},"isArchitectureJunction"),nS=o(t=>t.data(),"edgeData"),Mf=o(t=>t.data(),"nodeData")});function Li(t){let e=de().architecture;return e?.[t]?e[t]:i2e[t]}var i2e,gr,dit,pit,mit,git,yit,vit,xit,bit,wit,Tit,kit,Eit,Sit,Cit,X0,yb=M(()=>{"use strict";hs();Vt();tE();ki();iS();i2e=ur.architecture,gr=new cf(()=>({nodes:{},groups:{},edges:[],registeredIds:{},config:i2e,dataStructures:void 0,elements:{}})),dit=o(()=>{gr.reset(),_r()},"clear"),pit=o(function({id:t,icon:e,in:r,title:n,iconText:i}){if(gr.records.registeredIds[t]!==void 0)throw new Error(`The service id [${t}] is already in use by another ${gr.records.registeredIds[t]}`);if(r!==void 0){if(t===r)throw new Error(`The service [${t}] cannot be placed within itself`);if(gr.records.registeredIds[r]===void 0)throw new Error(`The service [${t}]'s parent does not exist. Please make sure the parent is created before this service`);if(gr.records.registeredIds[r]==="node")throw new Error(`The service [${t}]'s parent is not a group`)}gr.records.registeredIds[t]="node",gr.records.nodes[t]={id:t,type:"service",icon:e,iconText:i,title:n,edges:[],in:r}},"addService"),mit=o(()=>Object.values(gr.records.nodes).filter(r2e),"getServices"),git=o(function({id:t,in:e}){gr.records.registeredIds[t]="node",gr.records.nodes[t]={id:t,type:"junction",edges:[],in:e}},"addJunction"),yit=o(()=>Object.values(gr.records.nodes).filter(n2e),"getJunctions"),vit=o(()=>Object.values(gr.records.nodes),"getNodes"),xit=o(t=>gr.records.nodes[t],"getNode"),bit=o(function({id:t,icon:e,in:r,title:n}){if(gr.records.registeredIds[t]!==void 0)throw new Error(`The group id [${t}] is already in use by another ${gr.records.registeredIds[t]}`);if(r!==void 0){if(t===r)throw new Error(`The group [${t}] cannot be placed within itself`);if(gr.records.registeredIds[r]===void 0)throw new Error(`The group [${t}]'s parent does not exist. Please make sure the parent is created before this group`);if(gr.records.registeredIds[r]==="node")throw new Error(`The group [${t}]'s parent is not a group`)}gr.records.registeredIds[t]="group",gr.records.groups[t]={id:t,icon:e,title:n,in:r}},"addGroup"),wit=o(()=>Object.values(gr.records.groups),"getGroups"),Tit=o(function({lhsId:t,rhsId:e,lhsDir:r,rhsDir:n,lhsInto:i,rhsInto:a,lhsGroup:s,rhsGroup:l,title:u}){if(!cF(r))throw new Error(`Invalid direction given for left hand side of edge ${t}--${e}. Expected (L,R,T,B) got ${r}`);if(!cF(n))throw new Error(`Invalid direction given for right hand side of edge ${t}--${e}. Expected (L,R,T,B) got ${n}`);if(gr.records.nodes[t]===void 0&&gr.records.groups[t]===void 0)throw new Error(`The left-hand id [${t}] does not yet exist. Please create the service/group before declaring an edge to it.`);if(gr.records.nodes[e]===void 0&&gr.records.groups[t]===void 0)throw new Error(`The right-hand id [${e}] does not yet exist. Please create the service/group before declaring an edge to it.`);let h=gr.records.nodes[t].in,f=gr.records.nodes[e].in;if(s&&h&&f&&h==f)throw new Error(`The left-hand id [${t}] is modified to traverse the group boundary, but the edge does not pass through two groups.`);if(l&&h&&f&&h==f)throw new Error(`The right-hand id [${e}] is modified to traverse the group boundary, but the edge does not pass through two groups.`);let d={lhsId:t,lhsDir:r,lhsInto:i,lhsGroup:s,rhsId:e,rhsDir:n,rhsInto:a,rhsGroup:l,title:u};gr.records.edges.push(d),gr.records.nodes[t]&&gr.records.nodes[e]&&(gr.records.nodes[t].edges.push(gr.records.edges[gr.records.edges.length-1]),gr.records.nodes[e].edges.push(gr.records.edges[gr.records.edges.length-1]))},"addEdge"),kit=o(()=>gr.records.edges,"getEdges"),Eit=o(()=>{if(gr.records.dataStructures===void 0){let t=Object.entries(gr.records.nodes).reduce((s,[l,u])=>(s[l]=u.edges.reduce((h,f)=>{if(f.lhsId===l){let d=gb(f.lhsDir,f.rhsDir);d&&(h[d]=f.rhsId)}else{let d=gb(f.rhsDir,f.lhsDir);d&&(h[d]=f.lhsId)}return h},{}),s),{}),e=Object.keys(t)[0],r={[e]:1},n=Object.keys(t).reduce((s,l)=>l===e?s:{...s,[l]:1},{}),i=o(s=>{let l={[s]:[0,0]},u=[s];for(;u.length>0;){let h=u.shift();if(h){r[h]=1,delete n[h];let f=t[h],[d,p]=l[h];Object.entries(f).forEach(([m,g])=>{r[g]||(l[g]=e2e([d,p],m),u.push(g))})}}return l},"BFS"),a=[i(e)];for(;Object.keys(n).length>0;)a.push(i(Object.keys(n)[0]));gr.records.dataStructures={adjList:t,spatialMaps:a}}return gr.records.dataStructures},"getDataStructures"),Sit=o((t,e)=>{gr.records.elements[t]=e},"setElementForId"),Cit=o(t=>gr.records.elements[t],"getElementById"),X0={clear:dit,setDiagramTitle:ln,getDiagramTitle:Jr,setAccTitle:Rr,getAccTitle:Pr,setAccDescription:Br,getAccDescription:Fr,addService:pit,getServices:mit,addJunction:git,getJunctions:yit,getNodes:vit,getNode:xit,addGroup:bit,getGroups:wit,addEdge:Tit,getEdges:kit,setElementForId:Sit,getElementById:Cit,getDataStructures:Eit};o(Li,"getConfigField")});var Ait,a2e,s2e=M(()=>{"use strict";Ng();ht();ox();yb();Ait=o((t,e)=>{lf(t,e),t.groups.map(e.addGroup),t.services.map(r=>e.addService({...r,type:"service"})),t.junctions.map(r=>e.addJunction({...r,type:"junction"})),t.edges.map(e.addEdge)},"populateDb"),a2e={parse:o(async t=>{let e=await Gl("architecture",t);Y.debug(e),Ait(e,X0)},"parse")}});var _it,o2e,l2e=M(()=>{"use strict";_it=o(t=>` + .edge { + stroke-width: ${t.archEdgeWidth}; + stroke: ${t.archEdgeColor}; + fill: none; + } + + .arrow { + fill: ${t.archEdgeArrowColor}; + } + + .node-bkg { + fill: none; + stroke: ${t.archGroupBorderColor}; + stroke-width: ${t.archGroupBorderWidth}; + stroke-dasharray: 8; + } + .node-icon-text { + display: flex; + align-items: center; + } + + .node-icon-text > div { + color: #fff; + margin: 1px; + height: fit-content; + text-align: center; + overflow: hidden; + display: -webkit-box; + -webkit-box-orient: vertical; + } +`,"getStyles"),o2e=_it});var hF=Ni((vb,uF)=>{"use strict";o(function(e,r){typeof vb=="object"&&typeof uF=="object"?uF.exports=r():typeof define=="function"&&define.amd?define([],r):typeof vb=="object"?vb.layoutBase=r():e.layoutBase=r()},"webpackUniversalModuleDefinition")(vb,function(){return function(t){var e={};function r(n){if(e[n])return e[n].exports;var i=e[n]={i:n,l:!1,exports:{}};return t[n].call(i.exports,i,i.exports,r),i.l=!0,i.exports}return o(r,"__webpack_require__"),r.m=t,r.c=e,r.i=function(n){return n},r.d=function(n,i,a){r.o(n,i)||Object.defineProperty(n,i,{configurable:!1,enumerable:!0,get:a})},r.n=function(n){var i=n&&n.__esModule?o(function(){return n.default},"getDefault"):o(function(){return n},"getModuleExports");return r.d(i,"a",i),i},r.o=function(n,i){return Object.prototype.hasOwnProperty.call(n,i)},r.p="",r(r.s=28)}([function(t,e,r){"use strict";function n(){}o(n,"LayoutConstants"),n.QUALITY=1,n.DEFAULT_CREATE_BENDS_AS_NEEDED=!1,n.DEFAULT_INCREMENTAL=!1,n.DEFAULT_ANIMATION_ON_LAYOUT=!0,n.DEFAULT_ANIMATION_DURING_LAYOUT=!1,n.DEFAULT_ANIMATION_PERIOD=50,n.DEFAULT_UNIFORM_LEAF_NODE_SIZES=!1,n.DEFAULT_GRAPH_MARGIN=15,n.NODE_DIMENSIONS_INCLUDE_LABELS=!1,n.SIMPLE_NODE_SIZE=40,n.SIMPLE_NODE_HALF_SIZE=n.SIMPLE_NODE_SIZE/2,n.EMPTY_COMPOUND_NODE_SIZE=40,n.MIN_EDGE_LENGTH=1,n.WORLD_BOUNDARY=1e6,n.INITIAL_WORLD_BOUNDARY=n.WORLD_BOUNDARY/1e3,n.WORLD_CENTER_X=1200,n.WORLD_CENTER_Y=900,t.exports=n},function(t,e,r){"use strict";var n=r(2),i=r(8),a=r(9);function s(u,h,f){n.call(this,f),this.isOverlapingSourceAndTarget=!1,this.vGraphObject=f,this.bendpoints=[],this.source=u,this.target=h}o(s,"LEdge"),s.prototype=Object.create(n.prototype);for(var l in n)s[l]=n[l];s.prototype.getSource=function(){return this.source},s.prototype.getTarget=function(){return this.target},s.prototype.isInterGraph=function(){return this.isInterGraph},s.prototype.getLength=function(){return this.length},s.prototype.isOverlapingSourceAndTarget=function(){return this.isOverlapingSourceAndTarget},s.prototype.getBendpoints=function(){return this.bendpoints},s.prototype.getLca=function(){return this.lca},s.prototype.getSourceInLca=function(){return this.sourceInLca},s.prototype.getTargetInLca=function(){return this.targetInLca},s.prototype.getOtherEnd=function(u){if(this.source===u)return this.target;if(this.target===u)return this.source;throw"Node is not incident with this edge"},s.prototype.getOtherEndInGraph=function(u,h){for(var f=this.getOtherEnd(u),d=h.getGraphManager().getRoot();;){if(f.getOwner()==h)return f;if(f.getOwner()==d)break;f=f.getOwner().getParent()}return null},s.prototype.updateLength=function(){var u=new Array(4);this.isOverlapingSourceAndTarget=i.getIntersection(this.target.getRect(),this.source.getRect(),u),this.isOverlapingSourceAndTarget||(this.lengthX=u[0]-u[2],this.lengthY=u[1]-u[3],Math.abs(this.lengthX)<1&&(this.lengthX=a.sign(this.lengthX)),Math.abs(this.lengthY)<1&&(this.lengthY=a.sign(this.lengthY)),this.length=Math.sqrt(this.lengthX*this.lengthX+this.lengthY*this.lengthY))},s.prototype.updateLengthSimple=function(){this.lengthX=this.target.getCenterX()-this.source.getCenterX(),this.lengthY=this.target.getCenterY()-this.source.getCenterY(),Math.abs(this.lengthX)<1&&(this.lengthX=a.sign(this.lengthX)),Math.abs(this.lengthY)<1&&(this.lengthY=a.sign(this.lengthY)),this.length=Math.sqrt(this.lengthX*this.lengthX+this.lengthY*this.lengthY)},t.exports=s},function(t,e,r){"use strict";function n(i){this.vGraphObject=i}o(n,"LGraphObject"),t.exports=n},function(t,e,r){"use strict";var n=r(2),i=r(10),a=r(13),s=r(0),l=r(16),u=r(5);function h(d,p,m,g){m==null&&g==null&&(g=p),n.call(this,g),d.graphManager!=null&&(d=d.graphManager),this.estimatedSize=i.MIN_VALUE,this.inclusionTreeDepth=i.MAX_VALUE,this.vGraphObject=g,this.edges=[],this.graphManager=d,m!=null&&p!=null?this.rect=new a(p.x,p.y,m.width,m.height):this.rect=new a}o(h,"LNode"),h.prototype=Object.create(n.prototype);for(var f in n)h[f]=n[f];h.prototype.getEdges=function(){return this.edges},h.prototype.getChild=function(){return this.child},h.prototype.getOwner=function(){return this.owner},h.prototype.getWidth=function(){return this.rect.width},h.prototype.setWidth=function(d){this.rect.width=d},h.prototype.getHeight=function(){return this.rect.height},h.prototype.setHeight=function(d){this.rect.height=d},h.prototype.getCenterX=function(){return this.rect.x+this.rect.width/2},h.prototype.getCenterY=function(){return this.rect.y+this.rect.height/2},h.prototype.getCenter=function(){return new u(this.rect.x+this.rect.width/2,this.rect.y+this.rect.height/2)},h.prototype.getLocation=function(){return new u(this.rect.x,this.rect.y)},h.prototype.getRect=function(){return this.rect},h.prototype.getDiagonal=function(){return Math.sqrt(this.rect.width*this.rect.width+this.rect.height*this.rect.height)},h.prototype.getHalfTheDiagonal=function(){return Math.sqrt(this.rect.height*this.rect.height+this.rect.width*this.rect.width)/2},h.prototype.setRect=function(d,p){this.rect.x=d.x,this.rect.y=d.y,this.rect.width=p.width,this.rect.height=p.height},h.prototype.setCenter=function(d,p){this.rect.x=d-this.rect.width/2,this.rect.y=p-this.rect.height/2},h.prototype.setLocation=function(d,p){this.rect.x=d,this.rect.y=p},h.prototype.moveBy=function(d,p){this.rect.x+=d,this.rect.y+=p},h.prototype.getEdgeListToNode=function(d){var p=[],m,g=this;return g.edges.forEach(function(y){if(y.target==d){if(y.source!=g)throw"Incorrect edge source!";p.push(y)}}),p},h.prototype.getEdgesBetween=function(d){var p=[],m,g=this;return g.edges.forEach(function(y){if(!(y.source==g||y.target==g))throw"Incorrect edge source and/or target";(y.target==d||y.source==d)&&p.push(y)}),p},h.prototype.getNeighborsList=function(){var d=new Set,p=this;return p.edges.forEach(function(m){if(m.source==p)d.add(m.target);else{if(m.target!=p)throw"Incorrect incidency!";d.add(m.source)}}),d},h.prototype.withChildren=function(){var d=new Set,p,m;if(d.add(this),this.child!=null)for(var g=this.child.getNodes(),y=0;y<g.length;y++)p=g[y],m=p.withChildren(),m.forEach(function(v){d.add(v)});return d},h.prototype.getNoOfChildren=function(){var d=0,p;if(this.child==null)d=1;else for(var m=this.child.getNodes(),g=0;g<m.length;g++)p=m[g],d+=p.getNoOfChildren();return d==0&&(d=1),d},h.prototype.getEstimatedSize=function(){if(this.estimatedSize==i.MIN_VALUE)throw"assert failed";return this.estimatedSize},h.prototype.calcEstimatedSize=function(){return this.child==null?this.estimatedSize=(this.rect.width+this.rect.height)/2:(this.estimatedSize=this.child.calcEstimatedSize(),this.rect.width=this.estimatedSize,this.rect.height=this.estimatedSize,this.estimatedSize)},h.prototype.scatter=function(){var d,p,m=-s.INITIAL_WORLD_BOUNDARY,g=s.INITIAL_WORLD_BOUNDARY;d=s.WORLD_CENTER_X+l.nextDouble()*(g-m)+m;var y=-s.INITIAL_WORLD_BOUNDARY,v=s.INITIAL_WORLD_BOUNDARY;p=s.WORLD_CENTER_Y+l.nextDouble()*(v-y)+y,this.rect.x=d,this.rect.y=p},h.prototype.updateBounds=function(){if(this.getChild()==null)throw"assert failed";if(this.getChild().getNodes().length!=0){var d=this.getChild();if(d.updateBounds(!0),this.rect.x=d.getLeft(),this.rect.y=d.getTop(),this.setWidth(d.getRight()-d.getLeft()),this.setHeight(d.getBottom()-d.getTop()),s.NODE_DIMENSIONS_INCLUDE_LABELS){var p=d.getRight()-d.getLeft(),m=d.getBottom()-d.getTop();this.labelWidth&&(this.labelPosHorizontal=="left"?(this.rect.x-=this.labelWidth,this.setWidth(p+this.labelWidth)):this.labelPosHorizontal=="center"&&this.labelWidth>p?(this.rect.x-=(this.labelWidth-p)/2,this.setWidth(this.labelWidth)):this.labelPosHorizontal=="right"&&this.setWidth(p+this.labelWidth)),this.labelHeight&&(this.labelPosVertical=="top"?(this.rect.y-=this.labelHeight,this.setHeight(m+this.labelHeight)):this.labelPosVertical=="center"&&this.labelHeight>m?(this.rect.y-=(this.labelHeight-m)/2,this.setHeight(this.labelHeight)):this.labelPosVertical=="bottom"&&this.setHeight(m+this.labelHeight))}}},h.prototype.getInclusionTreeDepth=function(){if(this.inclusionTreeDepth==i.MAX_VALUE)throw"assert failed";return this.inclusionTreeDepth},h.prototype.transform=function(d){var p=this.rect.x;p>s.WORLD_BOUNDARY?p=s.WORLD_BOUNDARY:p<-s.WORLD_BOUNDARY&&(p=-s.WORLD_BOUNDARY);var m=this.rect.y;m>s.WORLD_BOUNDARY?m=s.WORLD_BOUNDARY:m<-s.WORLD_BOUNDARY&&(m=-s.WORLD_BOUNDARY);var g=new u(p,m),y=d.inverseTransformPoint(g);this.setLocation(y.x,y.y)},h.prototype.getLeft=function(){return this.rect.x},h.prototype.getRight=function(){return this.rect.x+this.rect.width},h.prototype.getTop=function(){return this.rect.y},h.prototype.getBottom=function(){return this.rect.y+this.rect.height},h.prototype.getParent=function(){return this.owner==null?null:this.owner.getParent()},t.exports=h},function(t,e,r){"use strict";var n=r(0);function i(){}o(i,"FDLayoutConstants");for(var a in n)i[a]=n[a];i.MAX_ITERATIONS=2500,i.DEFAULT_EDGE_LENGTH=50,i.DEFAULT_SPRING_STRENGTH=.45,i.DEFAULT_REPULSION_STRENGTH=4500,i.DEFAULT_GRAVITY_STRENGTH=.4,i.DEFAULT_COMPOUND_GRAVITY_STRENGTH=1,i.DEFAULT_GRAVITY_RANGE_FACTOR=3.8,i.DEFAULT_COMPOUND_GRAVITY_RANGE_FACTOR=1.5,i.DEFAULT_USE_SMART_IDEAL_EDGE_LENGTH_CALCULATION=!0,i.DEFAULT_USE_SMART_REPULSION_RANGE_CALCULATION=!0,i.DEFAULT_COOLING_FACTOR_INCREMENTAL=.3,i.COOLING_ADAPTATION_FACTOR=.33,i.ADAPTATION_LOWER_NODE_LIMIT=1e3,i.ADAPTATION_UPPER_NODE_LIMIT=5e3,i.MAX_NODE_DISPLACEMENT_INCREMENTAL=100,i.MAX_NODE_DISPLACEMENT=i.MAX_NODE_DISPLACEMENT_INCREMENTAL*3,i.MIN_REPULSION_DIST=i.DEFAULT_EDGE_LENGTH/10,i.CONVERGENCE_CHECK_PERIOD=100,i.PER_LEVEL_IDEAL_EDGE_LENGTH_FACTOR=.1,i.MIN_EDGE_LENGTH=1,i.GRID_CALCULATION_CHECK_PERIOD=10,t.exports=i},function(t,e,r){"use strict";function n(i,a){i==null&&a==null?(this.x=0,this.y=0):(this.x=i,this.y=a)}o(n,"PointD"),n.prototype.getX=function(){return this.x},n.prototype.getY=function(){return this.y},n.prototype.setX=function(i){this.x=i},n.prototype.setY=function(i){this.y=i},n.prototype.getDifference=function(i){return new DimensionD(this.x-i.x,this.y-i.y)},n.prototype.getCopy=function(){return new n(this.x,this.y)},n.prototype.translate=function(i){return this.x+=i.width,this.y+=i.height,this},t.exports=n},function(t,e,r){"use strict";var n=r(2),i=r(10),a=r(0),s=r(7),l=r(3),u=r(1),h=r(13),f=r(12),d=r(11);function p(g,y,v){n.call(this,v),this.estimatedSize=i.MIN_VALUE,this.margin=a.DEFAULT_GRAPH_MARGIN,this.edges=[],this.nodes=[],this.isConnected=!1,this.parent=g,y!=null&&y instanceof s?this.graphManager=y:y!=null&&y instanceof Layout&&(this.graphManager=y.graphManager)}o(p,"LGraph"),p.prototype=Object.create(n.prototype);for(var m in n)p[m]=n[m];p.prototype.getNodes=function(){return this.nodes},p.prototype.getEdges=function(){return this.edges},p.prototype.getGraphManager=function(){return this.graphManager},p.prototype.getParent=function(){return this.parent},p.prototype.getLeft=function(){return this.left},p.prototype.getRight=function(){return this.right},p.prototype.getTop=function(){return this.top},p.prototype.getBottom=function(){return this.bottom},p.prototype.isConnected=function(){return this.isConnected},p.prototype.add=function(g,y,v){if(y==null&&v==null){var x=g;if(this.graphManager==null)throw"Graph has no graph mgr!";if(this.getNodes().indexOf(x)>-1)throw"Node already in graph!";return x.owner=this,this.getNodes().push(x),x}else{var b=g;if(!(this.getNodes().indexOf(y)>-1&&this.getNodes().indexOf(v)>-1))throw"Source or target not in graph!";if(!(y.owner==v.owner&&y.owner==this))throw"Both owners must be this graph!";return y.owner!=v.owner?null:(b.source=y,b.target=v,b.isInterGraph=!1,this.getEdges().push(b),y.edges.push(b),v!=y&&v.edges.push(b),b)}},p.prototype.remove=function(g){var y=g;if(g instanceof l){if(y==null)throw"Node is null!";if(!(y.owner!=null&&y.owner==this))throw"Owner graph is invalid!";if(this.graphManager==null)throw"Owner graph manager is invalid!";for(var v=y.edges.slice(),x,b=v.length,w=0;w<b;w++)x=v[w],x.isInterGraph?this.graphManager.remove(x):x.source.owner.remove(x);var _=this.nodes.indexOf(y);if(_==-1)throw"Node not in owner node list!";this.nodes.splice(_,1)}else if(g instanceof u){var x=g;if(x==null)throw"Edge is null!";if(!(x.source!=null&&x.target!=null))throw"Source and/or target is null!";if(!(x.source.owner!=null&&x.target.owner!=null&&x.source.owner==this&&x.target.owner==this))throw"Source and/or target owner is invalid!";var T=x.source.edges.indexOf(x),E=x.target.edges.indexOf(x);if(!(T>-1&&E>-1))throw"Source and/or target doesn't know this edge!";x.source.edges.splice(T,1),x.target!=x.source&&x.target.edges.splice(E,1);var _=x.source.owner.getEdges().indexOf(x);if(_==-1)throw"Not in owner's edge list!";x.source.owner.getEdges().splice(_,1)}},p.prototype.updateLeftTop=function(){for(var g=i.MAX_VALUE,y=i.MAX_VALUE,v,x,b,w=this.getNodes(),_=w.length,T=0;T<_;T++){var E=w[T];v=E.getTop(),x=E.getLeft(),g>v&&(g=v),y>x&&(y=x)}return g==i.MAX_VALUE?null:(w[0].getParent().paddingLeft!=null?b=w[0].getParent().paddingLeft:b=this.margin,this.left=y-b,this.top=g-b,new f(this.left,this.top))},p.prototype.updateBounds=function(g){for(var y=i.MAX_VALUE,v=-i.MAX_VALUE,x=i.MAX_VALUE,b=-i.MAX_VALUE,w,_,T,E,L,C=this.nodes,A=C.length,I=0;I<A;I++){var D=C[I];g&&D.child!=null&&D.updateBounds(),w=D.getLeft(),_=D.getRight(),T=D.getTop(),E=D.getBottom(),y>w&&(y=w),v<_&&(v=_),x>T&&(x=T),b<E&&(b=E)}var k=new h(y,x,v-y,b-x);y==i.MAX_VALUE&&(this.left=this.parent.getLeft(),this.right=this.parent.getRight(),this.top=this.parent.getTop(),this.bottom=this.parent.getBottom()),C[0].getParent().paddingLeft!=null?L=C[0].getParent().paddingLeft:L=this.margin,this.left=k.x-L,this.right=k.x+k.width+L,this.top=k.y-L,this.bottom=k.y+k.height+L},p.calculateBounds=function(g){for(var y=i.MAX_VALUE,v=-i.MAX_VALUE,x=i.MAX_VALUE,b=-i.MAX_VALUE,w,_,T,E,L=g.length,C=0;C<L;C++){var A=g[C];w=A.getLeft(),_=A.getRight(),T=A.getTop(),E=A.getBottom(),y>w&&(y=w),v<_&&(v=_),x>T&&(x=T),b<E&&(b=E)}var I=new h(y,x,v-y,b-x);return I},p.prototype.getInclusionTreeDepth=function(){return this==this.graphManager.getRoot()?1:this.parent.getInclusionTreeDepth()},p.prototype.getEstimatedSize=function(){if(this.estimatedSize==i.MIN_VALUE)throw"assert failed";return this.estimatedSize},p.prototype.calcEstimatedSize=function(){for(var g=0,y=this.nodes,v=y.length,x=0;x<v;x++){var b=y[x];g+=b.calcEstimatedSize()}return g==0?this.estimatedSize=a.EMPTY_COMPOUND_NODE_SIZE:this.estimatedSize=g/Math.sqrt(this.nodes.length),this.estimatedSize},p.prototype.updateConnected=function(){var g=this;if(this.nodes.length==0){this.isConnected=!0;return}var y=new d,v=new Set,x=this.nodes[0],b,w,_=x.withChildren();for(_.forEach(function(I){y.push(I),v.add(I)});y.length!==0;){x=y.shift(),b=x.getEdges();for(var T=b.length,E=0;E<T;E++){var L=b[E];if(w=L.getOtherEndInGraph(x,this),w!=null&&!v.has(w)){var C=w.withChildren();C.forEach(function(I){y.push(I),v.add(I)})}}}if(this.isConnected=!1,v.size>=this.nodes.length){var A=0;v.forEach(function(I){I.owner==g&&A++}),A==this.nodes.length&&(this.isConnected=!0)}},t.exports=p},function(t,e,r){"use strict";var n,i=r(1);function a(s){n=r(6),this.layout=s,this.graphs=[],this.edges=[]}o(a,"LGraphManager"),a.prototype.addRoot=function(){var s=this.layout.newGraph(),l=this.layout.newNode(null),u=this.add(s,l);return this.setRootGraph(u),this.rootGraph},a.prototype.add=function(s,l,u,h,f){if(u==null&&h==null&&f==null){if(s==null)throw"Graph is null!";if(l==null)throw"Parent node is null!";if(this.graphs.indexOf(s)>-1)throw"Graph already in this graph mgr!";if(this.graphs.push(s),s.parent!=null)throw"Already has a parent!";if(l.child!=null)throw"Already has a child!";return s.parent=l,l.child=s,s}else{f=u,h=l,u=s;var d=h.getOwner(),p=f.getOwner();if(!(d!=null&&d.getGraphManager()==this))throw"Source not in this graph mgr!";if(!(p!=null&&p.getGraphManager()==this))throw"Target not in this graph mgr!";if(d==p)return u.isInterGraph=!1,d.add(u,h,f);if(u.isInterGraph=!0,u.source=h,u.target=f,this.edges.indexOf(u)>-1)throw"Edge already in inter-graph edge list!";if(this.edges.push(u),!(u.source!=null&&u.target!=null))throw"Edge source and/or target is null!";if(!(u.source.edges.indexOf(u)==-1&&u.target.edges.indexOf(u)==-1))throw"Edge already in source and/or target incidency list!";return u.source.edges.push(u),u.target.edges.push(u),u}},a.prototype.remove=function(s){if(s instanceof n){var l=s;if(l.getGraphManager()!=this)throw"Graph not in this graph mgr";if(!(l==this.rootGraph||l.parent!=null&&l.parent.graphManager==this))throw"Invalid parent node!";var u=[];u=u.concat(l.getEdges());for(var h,f=u.length,d=0;d<f;d++)h=u[d],l.remove(h);var p=[];p=p.concat(l.getNodes());var m;f=p.length;for(var d=0;d<f;d++)m=p[d],l.remove(m);l==this.rootGraph&&this.setRootGraph(null);var g=this.graphs.indexOf(l);this.graphs.splice(g,1),l.parent=null}else if(s instanceof i){if(h=s,h==null)throw"Edge is null!";if(!h.isInterGraph)throw"Not an inter-graph edge!";if(!(h.source!=null&&h.target!=null))throw"Source and/or target is null!";if(!(h.source.edges.indexOf(h)!=-1&&h.target.edges.indexOf(h)!=-1))throw"Source and/or target doesn't know this edge!";var g=h.source.edges.indexOf(h);if(h.source.edges.splice(g,1),g=h.target.edges.indexOf(h),h.target.edges.splice(g,1),!(h.source.owner!=null&&h.source.owner.getGraphManager()!=null))throw"Edge owner graph or owner graph manager is null!";if(h.source.owner.getGraphManager().edges.indexOf(h)==-1)throw"Not in owner graph manager's edge list!";var g=h.source.owner.getGraphManager().edges.indexOf(h);h.source.owner.getGraphManager().edges.splice(g,1)}},a.prototype.updateBounds=function(){this.rootGraph.updateBounds(!0)},a.prototype.getGraphs=function(){return this.graphs},a.prototype.getAllNodes=function(){if(this.allNodes==null){for(var s=[],l=this.getGraphs(),u=l.length,h=0;h<u;h++)s=s.concat(l[h].getNodes());this.allNodes=s}return this.allNodes},a.prototype.resetAllNodes=function(){this.allNodes=null},a.prototype.resetAllEdges=function(){this.allEdges=null},a.prototype.resetAllNodesToApplyGravitation=function(){this.allNodesToApplyGravitation=null},a.prototype.getAllEdges=function(){if(this.allEdges==null){for(var s=[],l=this.getGraphs(),u=l.length,h=0;h<l.length;h++)s=s.concat(l[h].getEdges());s=s.concat(this.edges),this.allEdges=s}return this.allEdges},a.prototype.getAllNodesToApplyGravitation=function(){return this.allNodesToApplyGravitation},a.prototype.setAllNodesToApplyGravitation=function(s){if(this.allNodesToApplyGravitation!=null)throw"assert failed";this.allNodesToApplyGravitation=s},a.prototype.getRoot=function(){return this.rootGraph},a.prototype.setRootGraph=function(s){if(s.getGraphManager()!=this)throw"Root not in this graph mgr!";this.rootGraph=s,s.parent==null&&(s.parent=this.layout.newNode("Root node"))},a.prototype.getLayout=function(){return this.layout},a.prototype.isOneAncestorOfOther=function(s,l){if(!(s!=null&&l!=null))throw"assert failed";if(s==l)return!0;var u=s.getOwner(),h;do{if(h=u.getParent(),h==null)break;if(h==l)return!0;if(u=h.getOwner(),u==null)break}while(!0);u=l.getOwner();do{if(h=u.getParent(),h==null)break;if(h==s)return!0;if(u=h.getOwner(),u==null)break}while(!0);return!1},a.prototype.calcLowestCommonAncestors=function(){for(var s,l,u,h,f,d=this.getAllEdges(),p=d.length,m=0;m<p;m++){if(s=d[m],l=s.source,u=s.target,s.lca=null,s.sourceInLca=l,s.targetInLca=u,l==u){s.lca=l.getOwner();continue}for(h=l.getOwner();s.lca==null;){for(s.targetInLca=u,f=u.getOwner();s.lca==null;){if(f==h){s.lca=f;break}if(f==this.rootGraph)break;if(s.lca!=null)throw"assert failed";s.targetInLca=f.getParent(),f=s.targetInLca.getOwner()}if(h==this.rootGraph)break;s.lca==null&&(s.sourceInLca=h.getParent(),h=s.sourceInLca.getOwner())}if(s.lca==null)throw"assert failed"}},a.prototype.calcLowestCommonAncestor=function(s,l){if(s==l)return s.getOwner();var u=s.getOwner();do{if(u==null)break;var h=l.getOwner();do{if(h==null)break;if(h==u)return h;h=h.getParent().getOwner()}while(!0);u=u.getParent().getOwner()}while(!0);return u},a.prototype.calcInclusionTreeDepths=function(s,l){s==null&&l==null&&(s=this.rootGraph,l=1);for(var u,h=s.getNodes(),f=h.length,d=0;d<f;d++)u=h[d],u.inclusionTreeDepth=l,u.child!=null&&this.calcInclusionTreeDepths(u.child,l+1)},a.prototype.includesInvalidEdge=function(){for(var s,l=[],u=this.edges.length,h=0;h<u;h++)s=this.edges[h],this.isOneAncestorOfOther(s.source,s.target)&&l.push(s);for(var h=0;h<l.length;h++)this.remove(l[h]);return!1},t.exports=a},function(t,e,r){"use strict";var n=r(12);function i(){}o(i,"IGeometry"),i.calcSeparationAmount=function(a,s,l,u){if(!a.intersects(s))throw"assert failed";var h=new Array(2);this.decideDirectionsForOverlappingNodes(a,s,h),l[0]=Math.min(a.getRight(),s.getRight())-Math.max(a.x,s.x),l[1]=Math.min(a.getBottom(),s.getBottom())-Math.max(a.y,s.y),a.getX()<=s.getX()&&a.getRight()>=s.getRight()?l[0]+=Math.min(s.getX()-a.getX(),a.getRight()-s.getRight()):s.getX()<=a.getX()&&s.getRight()>=a.getRight()&&(l[0]+=Math.min(a.getX()-s.getX(),s.getRight()-a.getRight())),a.getY()<=s.getY()&&a.getBottom()>=s.getBottom()?l[1]+=Math.min(s.getY()-a.getY(),a.getBottom()-s.getBottom()):s.getY()<=a.getY()&&s.getBottom()>=a.getBottom()&&(l[1]+=Math.min(a.getY()-s.getY(),s.getBottom()-a.getBottom()));var f=Math.abs((s.getCenterY()-a.getCenterY())/(s.getCenterX()-a.getCenterX()));s.getCenterY()===a.getCenterY()&&s.getCenterX()===a.getCenterX()&&(f=1);var d=f*l[0],p=l[1]/f;l[0]<p?p=l[0]:d=l[1],l[0]=-1*h[0]*(p/2+u),l[1]=-1*h[1]*(d/2+u)},i.decideDirectionsForOverlappingNodes=function(a,s,l){a.getCenterX()<s.getCenterX()?l[0]=-1:l[0]=1,a.getCenterY()<s.getCenterY()?l[1]=-1:l[1]=1},i.getIntersection2=function(a,s,l){var u=a.getCenterX(),h=a.getCenterY(),f=s.getCenterX(),d=s.getCenterY();if(a.intersects(s))return l[0]=u,l[1]=h,l[2]=f,l[3]=d,!0;var p=a.getX(),m=a.getY(),g=a.getRight(),y=a.getX(),v=a.getBottom(),x=a.getRight(),b=a.getWidthHalf(),w=a.getHeightHalf(),_=s.getX(),T=s.getY(),E=s.getRight(),L=s.getX(),C=s.getBottom(),A=s.getRight(),I=s.getWidthHalf(),D=s.getHeightHalf(),k=!1,R=!1;if(u===f){if(h>d)return l[0]=u,l[1]=m,l[2]=f,l[3]=C,!1;if(h<d)return l[0]=u,l[1]=v,l[2]=f,l[3]=T,!1}else if(h===d){if(u>f)return l[0]=p,l[1]=h,l[2]=E,l[3]=d,!1;if(u<f)return l[0]=g,l[1]=h,l[2]=_,l[3]=d,!1}else{var S=a.height/a.width,O=s.height/s.width,N=(d-h)/(f-u),P=void 0,F=void 0,B=void 0,$=void 0,z=void 0,W=void 0;if(-S===N?u>f?(l[0]=y,l[1]=v,k=!0):(l[0]=g,l[1]=m,k=!0):S===N&&(u>f?(l[0]=p,l[1]=m,k=!0):(l[0]=x,l[1]=v,k=!0)),-O===N?f>u?(l[2]=L,l[3]=C,R=!0):(l[2]=E,l[3]=T,R=!0):O===N&&(f>u?(l[2]=_,l[3]=T,R=!0):(l[2]=A,l[3]=C,R=!0)),k&&R)return!1;if(u>f?h>d?(P=this.getCardinalDirection(S,N,4),F=this.getCardinalDirection(O,N,2)):(P=this.getCardinalDirection(-S,N,3),F=this.getCardinalDirection(-O,N,1)):h>d?(P=this.getCardinalDirection(-S,N,1),F=this.getCardinalDirection(-O,N,3)):(P=this.getCardinalDirection(S,N,2),F=this.getCardinalDirection(O,N,4)),!k)switch(P){case 1:$=m,B=u+-w/N,l[0]=B,l[1]=$;break;case 2:B=x,$=h+b*N,l[0]=B,l[1]=$;break;case 3:$=v,B=u+w/N,l[0]=B,l[1]=$;break;case 4:B=y,$=h+-b*N,l[0]=B,l[1]=$;break}if(!R)switch(F){case 1:W=T,z=f+-D/N,l[2]=z,l[3]=W;break;case 2:z=A,W=d+I*N,l[2]=z,l[3]=W;break;case 3:W=C,z=f+D/N,l[2]=z,l[3]=W;break;case 4:z=L,W=d+-I*N,l[2]=z,l[3]=W;break}}return!1},i.getCardinalDirection=function(a,s,l){return a>s?l:1+l%4},i.getIntersection=function(a,s,l,u){if(u==null)return this.getIntersection2(a,s,l);var h=a.x,f=a.y,d=s.x,p=s.y,m=l.x,g=l.y,y=u.x,v=u.y,x=void 0,b=void 0,w=void 0,_=void 0,T=void 0,E=void 0,L=void 0,C=void 0,A=void 0;return w=p-f,T=h-d,L=d*f-h*p,_=v-g,E=m-y,C=y*g-m*v,A=w*E-_*T,A===0?null:(x=(T*C-E*L)/A,b=(_*L-w*C)/A,new n(x,b))},i.angleOfVector=function(a,s,l,u){var h=void 0;return a!==l?(h=Math.atan((u-s)/(l-a)),l<a?h+=Math.PI:u<s&&(h+=this.TWO_PI)):u<s?h=this.ONE_AND_HALF_PI:h=this.HALF_PI,h},i.doIntersect=function(a,s,l,u){var h=a.x,f=a.y,d=s.x,p=s.y,m=l.x,g=l.y,y=u.x,v=u.y,x=(d-h)*(v-g)-(y-m)*(p-f);if(x===0)return!1;var b=((v-g)*(y-h)+(m-y)*(v-f))/x,w=((f-p)*(y-h)+(d-h)*(v-f))/x;return 0<b&&b<1&&0<w&&w<1},i.findCircleLineIntersections=function(a,s,l,u,h,f,d){var p=(l-a)*(l-a)+(u-s)*(u-s),m=2*((a-h)*(l-a)+(s-f)*(u-s)),g=(a-h)*(a-h)+(s-f)*(s-f)-d*d,y=m*m-4*p*g;if(y>=0){var v=(-m+Math.sqrt(m*m-4*p*g))/(2*p),x=(-m-Math.sqrt(m*m-4*p*g))/(2*p),b=null;return v>=0&&v<=1?[v]:x>=0&&x<=1?[x]:b}else return null},i.HALF_PI=.5*Math.PI,i.ONE_AND_HALF_PI=1.5*Math.PI,i.TWO_PI=2*Math.PI,i.THREE_PI=3*Math.PI,t.exports=i},function(t,e,r){"use strict";function n(){}o(n,"IMath"),n.sign=function(i){return i>0?1:i<0?-1:0},n.floor=function(i){return i<0?Math.ceil(i):Math.floor(i)},n.ceil=function(i){return i<0?Math.floor(i):Math.ceil(i)},t.exports=n},function(t,e,r){"use strict";function n(){}o(n,"Integer"),n.MAX_VALUE=2147483647,n.MIN_VALUE=-2147483648,t.exports=n},function(t,e,r){"use strict";var n=function(){function h(f,d){for(var p=0;p<d.length;p++){var m=d[p];m.enumerable=m.enumerable||!1,m.configurable=!0,"value"in m&&(m.writable=!0),Object.defineProperty(f,m.key,m)}}return o(h,"defineProperties"),function(f,d,p){return d&&h(f.prototype,d),p&&h(f,p),f}}();function i(h,f){if(!(h instanceof f))throw new TypeError("Cannot call a class as a function")}o(i,"_classCallCheck");var a=o(function(f){return{value:f,next:null,prev:null}},"nodeFrom"),s=o(function(f,d,p,m){return f!==null?f.next=d:m.head=d,p!==null?p.prev=d:m.tail=d,d.prev=f,d.next=p,m.length++,d},"add"),l=o(function(f,d){var p=f.prev,m=f.next;return p!==null?p.next=m:d.head=m,m!==null?m.prev=p:d.tail=p,f.prev=f.next=null,d.length--,f},"_remove"),u=function(){function h(f){var d=this;i(this,h),this.length=0,this.head=null,this.tail=null,f?.forEach(function(p){return d.push(p)})}return o(h,"LinkedList"),n(h,[{key:"size",value:o(function(){return this.length},"size")},{key:"insertBefore",value:o(function(d,p){return s(p.prev,a(d),p,this)},"insertBefore")},{key:"insertAfter",value:o(function(d,p){return s(p,a(d),p.next,this)},"insertAfter")},{key:"insertNodeBefore",value:o(function(d,p){return s(p.prev,d,p,this)},"insertNodeBefore")},{key:"insertNodeAfter",value:o(function(d,p){return s(p,d,p.next,this)},"insertNodeAfter")},{key:"push",value:o(function(d){return s(this.tail,a(d),null,this)},"push")},{key:"unshift",value:o(function(d){return s(null,a(d),this.head,this)},"unshift")},{key:"remove",value:o(function(d){return l(d,this)},"remove")},{key:"pop",value:o(function(){return l(this.tail,this).value},"pop")},{key:"popNode",value:o(function(){return l(this.tail,this)},"popNode")},{key:"shift",value:o(function(){return l(this.head,this).value},"shift")},{key:"shiftNode",value:o(function(){return l(this.head,this)},"shiftNode")},{key:"get_object_at",value:o(function(d){if(d<=this.length()){for(var p=1,m=this.head;p<d;)m=m.next,p++;return m.value}},"get_object_at")},{key:"set_object_at",value:o(function(d,p){if(d<=this.length()){for(var m=1,g=this.head;m<d;)g=g.next,m++;g.value=p}},"set_object_at")}]),h}();t.exports=u},function(t,e,r){"use strict";function n(i,a,s){this.x=null,this.y=null,i==null&&a==null&&s==null?(this.x=0,this.y=0):typeof i=="number"&&typeof a=="number"&&s==null?(this.x=i,this.y=a):i.constructor.name=="Point"&&a==null&&s==null&&(s=i,this.x=s.x,this.y=s.y)}o(n,"Point"),n.prototype.getX=function(){return this.x},n.prototype.getY=function(){return this.y},n.prototype.getLocation=function(){return new n(this.x,this.y)},n.prototype.setLocation=function(i,a,s){i.constructor.name=="Point"&&a==null&&s==null?(s=i,this.setLocation(s.x,s.y)):typeof i=="number"&&typeof a=="number"&&s==null&&(parseInt(i)==i&&parseInt(a)==a?this.move(i,a):(this.x=Math.floor(i+.5),this.y=Math.floor(a+.5)))},n.prototype.move=function(i,a){this.x=i,this.y=a},n.prototype.translate=function(i,a){this.x+=i,this.y+=a},n.prototype.equals=function(i){if(i.constructor.name=="Point"){var a=i;return this.x==a.x&&this.y==a.y}return this==i},n.prototype.toString=function(){return new n().constructor.name+"[x="+this.x+",y="+this.y+"]"},t.exports=n},function(t,e,r){"use strict";function n(i,a,s,l){this.x=0,this.y=0,this.width=0,this.height=0,i!=null&&a!=null&&s!=null&&l!=null&&(this.x=i,this.y=a,this.width=s,this.height=l)}o(n,"RectangleD"),n.prototype.getX=function(){return this.x},n.prototype.setX=function(i){this.x=i},n.prototype.getY=function(){return this.y},n.prototype.setY=function(i){this.y=i},n.prototype.getWidth=function(){return this.width},n.prototype.setWidth=function(i){this.width=i},n.prototype.getHeight=function(){return this.height},n.prototype.setHeight=function(i){this.height=i},n.prototype.getRight=function(){return this.x+this.width},n.prototype.getBottom=function(){return this.y+this.height},n.prototype.intersects=function(i){return!(this.getRight()<i.x||this.getBottom()<i.y||i.getRight()<this.x||i.getBottom()<this.y)},n.prototype.getCenterX=function(){return this.x+this.width/2},n.prototype.getMinX=function(){return this.getX()},n.prototype.getMaxX=function(){return this.getX()+this.width},n.prototype.getCenterY=function(){return this.y+this.height/2},n.prototype.getMinY=function(){return this.getY()},n.prototype.getMaxY=function(){return this.getY()+this.height},n.prototype.getWidthHalf=function(){return this.width/2},n.prototype.getHeightHalf=function(){return this.height/2},t.exports=n},function(t,e,r){"use strict";var n=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(a){return typeof a}:function(a){return a&&typeof Symbol=="function"&&a.constructor===Symbol&&a!==Symbol.prototype?"symbol":typeof a};function i(){}o(i,"UniqueIDGeneretor"),i.lastID=0,i.createID=function(a){return i.isPrimitive(a)?a:(a.uniqueID!=null||(a.uniqueID=i.getString(),i.lastID++),a.uniqueID)},i.getString=function(a){return a==null&&(a=i.lastID),"Object#"+a},i.isPrimitive=function(a){var s=typeof a>"u"?"undefined":n(a);return a==null||s!="object"&&s!="function"},t.exports=i},function(t,e,r){"use strict";function n(m){if(Array.isArray(m)){for(var g=0,y=Array(m.length);g<m.length;g++)y[g]=m[g];return y}else return Array.from(m)}o(n,"_toConsumableArray");var i=r(0),a=r(7),s=r(3),l=r(1),u=r(6),h=r(5),f=r(17),d=r(29);function p(m){d.call(this),this.layoutQuality=i.QUALITY,this.createBendsAsNeeded=i.DEFAULT_CREATE_BENDS_AS_NEEDED,this.incremental=i.DEFAULT_INCREMENTAL,this.animationOnLayout=i.DEFAULT_ANIMATION_ON_LAYOUT,this.animationDuringLayout=i.DEFAULT_ANIMATION_DURING_LAYOUT,this.animationPeriod=i.DEFAULT_ANIMATION_PERIOD,this.uniformLeafNodeSizes=i.DEFAULT_UNIFORM_LEAF_NODE_SIZES,this.edgeToDummyNodes=new Map,this.graphManager=new a(this),this.isLayoutFinished=!1,this.isSubLayout=!1,this.isRemoteUse=!1,m!=null&&(this.isRemoteUse=m)}o(p,"Layout"),p.RANDOM_SEED=1,p.prototype=Object.create(d.prototype),p.prototype.getGraphManager=function(){return this.graphManager},p.prototype.getAllNodes=function(){return this.graphManager.getAllNodes()},p.prototype.getAllEdges=function(){return this.graphManager.getAllEdges()},p.prototype.getAllNodesToApplyGravitation=function(){return this.graphManager.getAllNodesToApplyGravitation()},p.prototype.newGraphManager=function(){var m=new a(this);return this.graphManager=m,m},p.prototype.newGraph=function(m){return new u(null,this.graphManager,m)},p.prototype.newNode=function(m){return new s(this.graphManager,m)},p.prototype.newEdge=function(m){return new l(null,null,m)},p.prototype.checkLayoutSuccess=function(){return this.graphManager.getRoot()==null||this.graphManager.getRoot().getNodes().length==0||this.graphManager.includesInvalidEdge()},p.prototype.runLayout=function(){this.isLayoutFinished=!1,this.tilingPreLayout&&this.tilingPreLayout(),this.initParameters();var m;return this.checkLayoutSuccess()?m=!1:m=this.layout(),i.ANIMATE==="during"?!1:(m&&(this.isSubLayout||this.doPostLayout()),this.tilingPostLayout&&this.tilingPostLayout(),this.isLayoutFinished=!0,m)},p.prototype.doPostLayout=function(){this.incremental||this.transform(),this.update()},p.prototype.update2=function(){if(this.createBendsAsNeeded&&(this.createBendpointsFromDummyNodes(),this.graphManager.resetAllEdges()),!this.isRemoteUse){for(var m,g=this.graphManager.getAllEdges(),y=0;y<g.length;y++)m=g[y];for(var v,x=this.graphManager.getRoot().getNodes(),y=0;y<x.length;y++)v=x[y];this.update(this.graphManager.getRoot())}},p.prototype.update=function(m){if(m==null)this.update2();else if(m instanceof s){var g=m;if(g.getChild()!=null)for(var y=g.getChild().getNodes(),v=0;v<y.length;v++)update(y[v]);if(g.vGraphObject!=null){var x=g.vGraphObject;x.update(g)}}else if(m instanceof l){var b=m;if(b.vGraphObject!=null){var w=b.vGraphObject;w.update(b)}}else if(m instanceof u){var _=m;if(_.vGraphObject!=null){var T=_.vGraphObject;T.update(_)}}},p.prototype.initParameters=function(){this.isSubLayout||(this.layoutQuality=i.QUALITY,this.animationDuringLayout=i.DEFAULT_ANIMATION_DURING_LAYOUT,this.animationPeriod=i.DEFAULT_ANIMATION_PERIOD,this.animationOnLayout=i.DEFAULT_ANIMATION_ON_LAYOUT,this.incremental=i.DEFAULT_INCREMENTAL,this.createBendsAsNeeded=i.DEFAULT_CREATE_BENDS_AS_NEEDED,this.uniformLeafNodeSizes=i.DEFAULT_UNIFORM_LEAF_NODE_SIZES),this.animationDuringLayout&&(this.animationOnLayout=!1)},p.prototype.transform=function(m){if(m==null)this.transform(new h(0,0));else{var g=new f,y=this.graphManager.getRoot().updateLeftTop();if(y!=null){g.setWorldOrgX(m.x),g.setWorldOrgY(m.y),g.setDeviceOrgX(y.x),g.setDeviceOrgY(y.y);for(var v=this.getAllNodes(),x,b=0;b<v.length;b++)x=v[b],x.transform(g)}}},p.prototype.positionNodesRandomly=function(m){if(m==null)this.positionNodesRandomly(this.getGraphManager().getRoot()),this.getGraphManager().getRoot().updateBounds(!0);else for(var g,y,v=m.getNodes(),x=0;x<v.length;x++)g=v[x],y=g.getChild(),y==null||y.getNodes().length==0?g.scatter():(this.positionNodesRandomly(y),g.updateBounds())},p.prototype.getFlatForest=function(){for(var m=[],g=!0,y=this.graphManager.getRoot().getNodes(),v=!0,x=0;x<y.length;x++)y[x].getChild()!=null&&(v=!1);if(!v)return m;var b=new Set,w=[],_=new Map,T=[];for(T=T.concat(y);T.length>0&&g;){for(w.push(T[0]);w.length>0&&g;){var E=w[0];w.splice(0,1),b.add(E);for(var L=E.getEdges(),x=0;x<L.length;x++){var C=L[x].getOtherEnd(E);if(_.get(E)!=C)if(!b.has(C))w.push(C),_.set(C,E);else{g=!1;break}}}if(!g)m=[];else{var A=[].concat(n(b));m.push(A);for(var x=0;x<A.length;x++){var I=A[x],D=T.indexOf(I);D>-1&&T.splice(D,1)}b=new Set,_=new Map}}return m},p.prototype.createDummyNodesForBendpoints=function(m){for(var g=[],y=m.source,v=this.graphManager.calcLowestCommonAncestor(m.source,m.target),x=0;x<m.bendpoints.length;x++){var b=this.newNode(null);b.setRect(new Point(0,0),new Dimension(1,1)),v.add(b);var w=this.newEdge(null);this.graphManager.add(w,y,b),g.add(b),y=b}var w=this.newEdge(null);return this.graphManager.add(w,y,m.target),this.edgeToDummyNodes.set(m,g),m.isInterGraph()?this.graphManager.remove(m):v.remove(m),g},p.prototype.createBendpointsFromDummyNodes=function(){var m=[];m=m.concat(this.graphManager.getAllEdges()),m=[].concat(n(this.edgeToDummyNodes.keys())).concat(m);for(var g=0;g<m.length;g++){var y=m[g];if(y.bendpoints.length>0){for(var v=this.edgeToDummyNodes.get(y),x=0;x<v.length;x++){var b=v[x],w=new h(b.getCenterX(),b.getCenterY()),_=y.bendpoints.get(x);_.x=w.x,_.y=w.y,b.getOwner().remove(b)}this.graphManager.add(y,y.source,y.target)}}},p.transform=function(m,g,y,v){if(y!=null&&v!=null){var x=g;if(m<=50){var b=g/y;x-=(g-b)/50*(50-m)}else{var w=g*v;x+=(w-g)/50*(m-50)}return x}else{var _,T;return m<=50?(_=9*g/500,T=g/10):(_=9*g/50,T=-8*g),_*m+T}},p.findCenterOfTree=function(m){var g=[];g=g.concat(m);var y=[],v=new Map,x=!1,b=null;(g.length==1||g.length==2)&&(x=!0,b=g[0]);for(var w=0;w<g.length;w++){var _=g[w],T=_.getNeighborsList().size;v.set(_,_.getNeighborsList().size),T==1&&y.push(_)}var E=[];for(E=E.concat(y);!x;){var L=[];L=L.concat(E),E=[];for(var w=0;w<g.length;w++){var _=g[w],C=g.indexOf(_);C>=0&&g.splice(C,1);var A=_.getNeighborsList();A.forEach(function(k){if(y.indexOf(k)<0){var R=v.get(k),S=R-1;S==1&&E.push(k),v.set(k,S)}})}y=y.concat(E),(g.length==1||g.length==2)&&(x=!0,b=g[0])}return b},p.prototype.setGraphManager=function(m){this.graphManager=m},t.exports=p},function(t,e,r){"use strict";function n(){}o(n,"RandomSeed"),n.seed=1,n.x=0,n.nextDouble=function(){return n.x=Math.sin(n.seed++)*1e4,n.x-Math.floor(n.x)},t.exports=n},function(t,e,r){"use strict";var n=r(5);function i(a,s){this.lworldOrgX=0,this.lworldOrgY=0,this.ldeviceOrgX=0,this.ldeviceOrgY=0,this.lworldExtX=1,this.lworldExtY=1,this.ldeviceExtX=1,this.ldeviceExtY=1}o(i,"Transform"),i.prototype.getWorldOrgX=function(){return this.lworldOrgX},i.prototype.setWorldOrgX=function(a){this.lworldOrgX=a},i.prototype.getWorldOrgY=function(){return this.lworldOrgY},i.prototype.setWorldOrgY=function(a){this.lworldOrgY=a},i.prototype.getWorldExtX=function(){return this.lworldExtX},i.prototype.setWorldExtX=function(a){this.lworldExtX=a},i.prototype.getWorldExtY=function(){return this.lworldExtY},i.prototype.setWorldExtY=function(a){this.lworldExtY=a},i.prototype.getDeviceOrgX=function(){return this.ldeviceOrgX},i.prototype.setDeviceOrgX=function(a){this.ldeviceOrgX=a},i.prototype.getDeviceOrgY=function(){return this.ldeviceOrgY},i.prototype.setDeviceOrgY=function(a){this.ldeviceOrgY=a},i.prototype.getDeviceExtX=function(){return this.ldeviceExtX},i.prototype.setDeviceExtX=function(a){this.ldeviceExtX=a},i.prototype.getDeviceExtY=function(){return this.ldeviceExtY},i.prototype.setDeviceExtY=function(a){this.ldeviceExtY=a},i.prototype.transformX=function(a){var s=0,l=this.lworldExtX;return l!=0&&(s=this.ldeviceOrgX+(a-this.lworldOrgX)*this.ldeviceExtX/l),s},i.prototype.transformY=function(a){var s=0,l=this.lworldExtY;return l!=0&&(s=this.ldeviceOrgY+(a-this.lworldOrgY)*this.ldeviceExtY/l),s},i.prototype.inverseTransformX=function(a){var s=0,l=this.ldeviceExtX;return l!=0&&(s=this.lworldOrgX+(a-this.ldeviceOrgX)*this.lworldExtX/l),s},i.prototype.inverseTransformY=function(a){var s=0,l=this.ldeviceExtY;return l!=0&&(s=this.lworldOrgY+(a-this.ldeviceOrgY)*this.lworldExtY/l),s},i.prototype.inverseTransformPoint=function(a){var s=new n(this.inverseTransformX(a.x),this.inverseTransformY(a.y));return s},t.exports=i},function(t,e,r){"use strict";function n(d){if(Array.isArray(d)){for(var p=0,m=Array(d.length);p<d.length;p++)m[p]=d[p];return m}else return Array.from(d)}o(n,"_toConsumableArray");var i=r(15),a=r(4),s=r(0),l=r(8),u=r(9);function h(){i.call(this),this.useSmartIdealEdgeLengthCalculation=a.DEFAULT_USE_SMART_IDEAL_EDGE_LENGTH_CALCULATION,this.gravityConstant=a.DEFAULT_GRAVITY_STRENGTH,this.compoundGravityConstant=a.DEFAULT_COMPOUND_GRAVITY_STRENGTH,this.gravityRangeFactor=a.DEFAULT_GRAVITY_RANGE_FACTOR,this.compoundGravityRangeFactor=a.DEFAULT_COMPOUND_GRAVITY_RANGE_FACTOR,this.displacementThresholdPerNode=3*a.DEFAULT_EDGE_LENGTH/100,this.coolingFactor=a.DEFAULT_COOLING_FACTOR_INCREMENTAL,this.initialCoolingFactor=a.DEFAULT_COOLING_FACTOR_INCREMENTAL,this.totalDisplacement=0,this.oldTotalDisplacement=0,this.maxIterations=a.MAX_ITERATIONS}o(h,"FDLayout"),h.prototype=Object.create(i.prototype);for(var f in i)h[f]=i[f];h.prototype.initParameters=function(){i.prototype.initParameters.call(this,arguments),this.totalIterations=0,this.notAnimatedIterations=0,this.useFRGridVariant=a.DEFAULT_USE_SMART_REPULSION_RANGE_CALCULATION,this.grid=[]},h.prototype.calcIdealEdgeLengths=function(){for(var d,p,m,g,y,v,x,b=this.getGraphManager().getAllEdges(),w=0;w<b.length;w++)d=b[w],p=d.idealLength,d.isInterGraph&&(g=d.getSource(),y=d.getTarget(),v=d.getSourceInLca().getEstimatedSize(),x=d.getTargetInLca().getEstimatedSize(),this.useSmartIdealEdgeLengthCalculation&&(d.idealLength+=v+x-2*s.SIMPLE_NODE_SIZE),m=d.getLca().getInclusionTreeDepth(),d.idealLength+=p*a.PER_LEVEL_IDEAL_EDGE_LENGTH_FACTOR*(g.getInclusionTreeDepth()+y.getInclusionTreeDepth()-2*m))},h.prototype.initSpringEmbedder=function(){var d=this.getAllNodes().length;this.incremental?(d>a.ADAPTATION_LOWER_NODE_LIMIT&&(this.coolingFactor=Math.max(this.coolingFactor*a.COOLING_ADAPTATION_FACTOR,this.coolingFactor-(d-a.ADAPTATION_LOWER_NODE_LIMIT)/(a.ADAPTATION_UPPER_NODE_LIMIT-a.ADAPTATION_LOWER_NODE_LIMIT)*this.coolingFactor*(1-a.COOLING_ADAPTATION_FACTOR))),this.maxNodeDisplacement=a.MAX_NODE_DISPLACEMENT_INCREMENTAL):(d>a.ADAPTATION_LOWER_NODE_LIMIT?this.coolingFactor=Math.max(a.COOLING_ADAPTATION_FACTOR,1-(d-a.ADAPTATION_LOWER_NODE_LIMIT)/(a.ADAPTATION_UPPER_NODE_LIMIT-a.ADAPTATION_LOWER_NODE_LIMIT)*(1-a.COOLING_ADAPTATION_FACTOR)):this.coolingFactor=1,this.initialCoolingFactor=this.coolingFactor,this.maxNodeDisplacement=a.MAX_NODE_DISPLACEMENT),this.maxIterations=Math.max(this.getAllNodes().length*5,this.maxIterations),this.displacementThresholdPerNode=3*a.DEFAULT_EDGE_LENGTH/100,this.totalDisplacementThreshold=this.displacementThresholdPerNode*this.getAllNodes().length,this.repulsionRange=this.calcRepulsionRange()},h.prototype.calcSpringForces=function(){for(var d=this.getAllEdges(),p,m=0;m<d.length;m++)p=d[m],this.calcSpringForce(p,p.idealLength)},h.prototype.calcRepulsionForces=function(){var d=arguments.length>0&&arguments[0]!==void 0?arguments[0]:!0,p=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!1,m,g,y,v,x=this.getAllNodes(),b;if(this.useFRGridVariant)for(this.totalIterations%a.GRID_CALCULATION_CHECK_PERIOD==1&&d&&this.updateGrid(),b=new Set,m=0;m<x.length;m++)y=x[m],this.calculateRepulsionForceOfANode(y,b,d,p),b.add(y);else for(m=0;m<x.length;m++)for(y=x[m],g=m+1;g<x.length;g++)v=x[g],y.getOwner()==v.getOwner()&&this.calcRepulsionForce(y,v)},h.prototype.calcGravitationalForces=function(){for(var d,p=this.getAllNodesToApplyGravitation(),m=0;m<p.length;m++)d=p[m],this.calcGravitationalForce(d)},h.prototype.moveNodes=function(){for(var d=this.getAllNodes(),p,m=0;m<d.length;m++)p=d[m],p.move()},h.prototype.calcSpringForce=function(d,p){var m=d.getSource(),g=d.getTarget(),y,v,x,b;if(this.uniformLeafNodeSizes&&m.getChild()==null&&g.getChild()==null)d.updateLengthSimple();else if(d.updateLength(),d.isOverlapingSourceAndTarget)return;y=d.getLength(),y!=0&&(v=d.edgeElasticity*(y-p),x=v*(d.lengthX/y),b=v*(d.lengthY/y),m.springForceX+=x,m.springForceY+=b,g.springForceX-=x,g.springForceY-=b)},h.prototype.calcRepulsionForce=function(d,p){var m=d.getRect(),g=p.getRect(),y=new Array(2),v=new Array(4),x,b,w,_,T,E,L;if(m.intersects(g)){l.calcSeparationAmount(m,g,y,a.DEFAULT_EDGE_LENGTH/2),E=2*y[0],L=2*y[1];var C=d.noOfChildren*p.noOfChildren/(d.noOfChildren+p.noOfChildren);d.repulsionForceX-=C*E,d.repulsionForceY-=C*L,p.repulsionForceX+=C*E,p.repulsionForceY+=C*L}else this.uniformLeafNodeSizes&&d.getChild()==null&&p.getChild()==null?(x=g.getCenterX()-m.getCenterX(),b=g.getCenterY()-m.getCenterY()):(l.getIntersection(m,g,v),x=v[2]-v[0],b=v[3]-v[1]),Math.abs(x)<a.MIN_REPULSION_DIST&&(x=u.sign(x)*a.MIN_REPULSION_DIST),Math.abs(b)<a.MIN_REPULSION_DIST&&(b=u.sign(b)*a.MIN_REPULSION_DIST),w=x*x+b*b,_=Math.sqrt(w),T=(d.nodeRepulsion/2+p.nodeRepulsion/2)*d.noOfChildren*p.noOfChildren/w,E=T*x/_,L=T*b/_,d.repulsionForceX-=E,d.repulsionForceY-=L,p.repulsionForceX+=E,p.repulsionForceY+=L},h.prototype.calcGravitationalForce=function(d){var p,m,g,y,v,x,b,w;p=d.getOwner(),m=(p.getRight()+p.getLeft())/2,g=(p.getTop()+p.getBottom())/2,y=d.getCenterX()-m,v=d.getCenterY()-g,x=Math.abs(y)+d.getWidth()/2,b=Math.abs(v)+d.getHeight()/2,d.getOwner()==this.graphManager.getRoot()?(w=p.getEstimatedSize()*this.gravityRangeFactor,(x>w||b>w)&&(d.gravitationForceX=-this.gravityConstant*y,d.gravitationForceY=-this.gravityConstant*v)):(w=p.getEstimatedSize()*this.compoundGravityRangeFactor,(x>w||b>w)&&(d.gravitationForceX=-this.gravityConstant*y*this.compoundGravityConstant,d.gravitationForceY=-this.gravityConstant*v*this.compoundGravityConstant))},h.prototype.isConverged=function(){var d,p=!1;return this.totalIterations>this.maxIterations/3&&(p=Math.abs(this.totalDisplacement-this.oldTotalDisplacement)<2),d=this.totalDisplacement<this.totalDisplacementThreshold,this.oldTotalDisplacement=this.totalDisplacement,d||p},h.prototype.animate=function(){this.animationDuringLayout&&!this.isSubLayout&&(this.notAnimatedIterations==this.animationPeriod?(this.update(),this.notAnimatedIterations=0):this.notAnimatedIterations++)},h.prototype.calcNoOfChildrenForAllNodes=function(){for(var d,p=this.graphManager.getAllNodes(),m=0;m<p.length;m++)d=p[m],d.noOfChildren=d.getNoOfChildren()},h.prototype.calcGrid=function(d){var p=0,m=0;p=parseInt(Math.ceil((d.getRight()-d.getLeft())/this.repulsionRange)),m=parseInt(Math.ceil((d.getBottom()-d.getTop())/this.repulsionRange));for(var g=new Array(p),y=0;y<p;y++)g[y]=new Array(m);for(var y=0;y<p;y++)for(var v=0;v<m;v++)g[y][v]=new Array;return g},h.prototype.addNodeToGrid=function(d,p,m){var g=0,y=0,v=0,x=0;g=parseInt(Math.floor((d.getRect().x-p)/this.repulsionRange)),y=parseInt(Math.floor((d.getRect().width+d.getRect().x-p)/this.repulsionRange)),v=parseInt(Math.floor((d.getRect().y-m)/this.repulsionRange)),x=parseInt(Math.floor((d.getRect().height+d.getRect().y-m)/this.repulsionRange));for(var b=g;b<=y;b++)for(var w=v;w<=x;w++)this.grid[b][w].push(d),d.setGridCoordinates(g,y,v,x)},h.prototype.updateGrid=function(){var d,p,m=this.getAllNodes();for(this.grid=this.calcGrid(this.graphManager.getRoot()),d=0;d<m.length;d++)p=m[d],this.addNodeToGrid(p,this.graphManager.getRoot().getLeft(),this.graphManager.getRoot().getTop())},h.prototype.calculateRepulsionForceOfANode=function(d,p,m,g){if(this.totalIterations%a.GRID_CALCULATION_CHECK_PERIOD==1&&m||g){var y=new Set;d.surrounding=new Array;for(var v,x=this.grid,b=d.startX-1;b<d.finishX+2;b++)for(var w=d.startY-1;w<d.finishY+2;w++)if(!(b<0||w<0||b>=x.length||w>=x[0].length)){for(var _=0;_<x[b][w].length;_++)if(v=x[b][w][_],!(d.getOwner()!=v.getOwner()||d==v)&&!p.has(v)&&!y.has(v)){var T=Math.abs(d.getCenterX()-v.getCenterX())-(d.getWidth()/2+v.getWidth()/2),E=Math.abs(d.getCenterY()-v.getCenterY())-(d.getHeight()/2+v.getHeight()/2);T<=this.repulsionRange&&E<=this.repulsionRange&&y.add(v)}}d.surrounding=[].concat(n(y))}for(b=0;b<d.surrounding.length;b++)this.calcRepulsionForce(d,d.surrounding[b])},h.prototype.calcRepulsionRange=function(){return 0},t.exports=h},function(t,e,r){"use strict";var n=r(1),i=r(4);function a(l,u,h){n.call(this,l,u,h),this.idealLength=i.DEFAULT_EDGE_LENGTH,this.edgeElasticity=i.DEFAULT_SPRING_STRENGTH}o(a,"FDLayoutEdge"),a.prototype=Object.create(n.prototype);for(var s in n)a[s]=n[s];t.exports=a},function(t,e,r){"use strict";var n=r(3),i=r(4);function a(l,u,h,f){n.call(this,l,u,h,f),this.nodeRepulsion=i.DEFAULT_REPULSION_STRENGTH,this.springForceX=0,this.springForceY=0,this.repulsionForceX=0,this.repulsionForceY=0,this.gravitationForceX=0,this.gravitationForceY=0,this.displacementX=0,this.displacementY=0,this.startX=0,this.finishX=0,this.startY=0,this.finishY=0,this.surrounding=[]}o(a,"FDLayoutNode"),a.prototype=Object.create(n.prototype);for(var s in n)a[s]=n[s];a.prototype.setGridCoordinates=function(l,u,h,f){this.startX=l,this.finishX=u,this.startY=h,this.finishY=f},t.exports=a},function(t,e,r){"use strict";function n(i,a){this.width=0,this.height=0,i!==null&&a!==null&&(this.height=a,this.width=i)}o(n,"DimensionD"),n.prototype.getWidth=function(){return this.width},n.prototype.setWidth=function(i){this.width=i},n.prototype.getHeight=function(){return this.height},n.prototype.setHeight=function(i){this.height=i},t.exports=n},function(t,e,r){"use strict";var n=r(14);function i(){this.map={},this.keys=[]}o(i,"HashMap"),i.prototype.put=function(a,s){var l=n.createID(a);this.contains(l)||(this.map[l]=s,this.keys.push(a))},i.prototype.contains=function(a){var s=n.createID(a);return this.map[a]!=null},i.prototype.get=function(a){var s=n.createID(a);return this.map[s]},i.prototype.keySet=function(){return this.keys},t.exports=i},function(t,e,r){"use strict";var n=r(14);function i(){this.set={}}o(i,"HashSet"),i.prototype.add=function(a){var s=n.createID(a);this.contains(s)||(this.set[s]=a)},i.prototype.remove=function(a){delete this.set[n.createID(a)]},i.prototype.clear=function(){this.set={}},i.prototype.contains=function(a){return this.set[n.createID(a)]==a},i.prototype.isEmpty=function(){return this.size()===0},i.prototype.size=function(){return Object.keys(this.set).length},i.prototype.addAllTo=function(a){for(var s=Object.keys(this.set),l=s.length,u=0;u<l;u++)a.push(this.set[s[u]])},i.prototype.size=function(){return Object.keys(this.set).length},i.prototype.addAll=function(a){for(var s=a.length,l=0;l<s;l++){var u=a[l];this.add(u)}},t.exports=i},function(t,e,r){"use strict";function n(){}o(n,"Matrix"),n.multMat=function(i,a){for(var s=[],l=0;l<i.length;l++){s[l]=[];for(var u=0;u<a[0].length;u++){s[l][u]=0;for(var h=0;h<i[0].length;h++)s[l][u]+=i[l][h]*a[h][u]}}return s},n.transpose=function(i){for(var a=[],s=0;s<i[0].length;s++){a[s]=[];for(var l=0;l<i.length;l++)a[s][l]=i[l][s]}return a},n.multCons=function(i,a){for(var s=[],l=0;l<i.length;l++)s[l]=i[l]*a;return s},n.minusOp=function(i,a){for(var s=[],l=0;l<i.length;l++)s[l]=i[l]-a[l];return s},n.dotProduct=function(i,a){for(var s=0,l=0;l<i.length;l++)s+=i[l]*a[l];return s},n.mag=function(i){return Math.sqrt(this.dotProduct(i,i))},n.normalize=function(i){for(var a=[],s=this.mag(i),l=0;l<i.length;l++)a[l]=i[l]/s;return a},n.multGamma=function(i){for(var a=[],s=0,l=0;l<i.length;l++)s+=i[l];s*=-1/i.length;for(var u=0;u<i.length;u++)a[u]=s+i[u];return a},n.multL=function(i,a,s){for(var l=[],u=[],h=[],f=0;f<a[0].length;f++){for(var d=0,p=0;p<a.length;p++)d+=-.5*a[p][f]*i[p];u[f]=d}for(var m=0;m<s.length;m++){for(var g=0,y=0;y<s.length;y++)g+=s[m][y]*u[y];h[m]=g}for(var v=0;v<a.length;v++){for(var x=0,b=0;b<a[0].length;b++)x+=a[v][b]*h[b];l[v]=x}return l},t.exports=n},function(t,e,r){"use strict";var n=function(){function l(u,h){for(var f=0;f<h.length;f++){var d=h[f];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(u,d.key,d)}}return o(l,"defineProperties"),function(u,h,f){return h&&l(u.prototype,h),f&&l(u,f),u}}();function i(l,u){if(!(l instanceof u))throw new TypeError("Cannot call a class as a function")}o(i,"_classCallCheck");var a=r(11),s=function(){function l(u,h){i(this,l),(h!==null||h!==void 0)&&(this.compareFunction=this._defaultCompareFunction);var f=void 0;u instanceof a?f=u.size():f=u.length,this._quicksort(u,0,f-1)}return o(l,"Quicksort"),n(l,[{key:"_quicksort",value:o(function(h,f,d){if(f<d){var p=this._partition(h,f,d);this._quicksort(h,f,p),this._quicksort(h,p+1,d)}},"_quicksort")},{key:"_partition",value:o(function(h,f,d){for(var p=this._get(h,f),m=f,g=d;;){for(;this.compareFunction(p,this._get(h,g));)g--;for(;this.compareFunction(this._get(h,m),p);)m++;if(m<g)this._swap(h,m,g),m++,g--;else return g}},"_partition")},{key:"_get",value:o(function(h,f){return h instanceof a?h.get_object_at(f):h[f]},"_get")},{key:"_set",value:o(function(h,f,d){h instanceof a?h.set_object_at(f,d):h[f]=d},"_set")},{key:"_swap",value:o(function(h,f,d){var p=this._get(h,f);this._set(h,f,this._get(h,d)),this._set(h,d,p)},"_swap")},{key:"_defaultCompareFunction",value:o(function(h,f){return f>h},"_defaultCompareFunction")}]),l}();t.exports=s},function(t,e,r){"use strict";function n(){}o(n,"SVD"),n.svd=function(i){this.U=null,this.V=null,this.s=null,this.m=0,this.n=0,this.m=i.length,this.n=i[0].length;var a=Math.min(this.m,this.n);this.s=function(dt){for(var Xe=[];dt-- >0;)Xe.push(0);return Xe}(Math.min(this.m+1,this.n)),this.U=function(dt){var Xe=o(function ct(Lt){if(Lt.length==0)return 0;for(var Rt=[],zt=0;zt<Lt[0];zt++)Rt.push(ct(Lt.slice(1)));return Rt},"allocate");return Xe(dt)}([this.m,a]),this.V=function(dt){var Xe=o(function ct(Lt){if(Lt.length==0)return 0;for(var Rt=[],zt=0;zt<Lt[0];zt++)Rt.push(ct(Lt.slice(1)));return Rt},"allocate");return Xe(dt)}([this.n,this.n]);for(var s=function(dt){for(var Xe=[];dt-- >0;)Xe.push(0);return Xe}(this.n),l=function(dt){for(var Xe=[];dt-- >0;)Xe.push(0);return Xe}(this.m),u=!0,h=!0,f=Math.min(this.m-1,this.n),d=Math.max(0,Math.min(this.n-2,this.m)),p=0;p<Math.max(f,d);p++){if(p<f){this.s[p]=0;for(var m=p;m<this.m;m++)this.s[p]=n.hypot(this.s[p],i[m][p]);if(this.s[p]!==0){i[p][p]<0&&(this.s[p]=-this.s[p]);for(var g=p;g<this.m;g++)i[g][p]/=this.s[p];i[p][p]+=1}this.s[p]=-this.s[p]}for(var y=p+1;y<this.n;y++){if(function(dt,Xe){return dt&&Xe}(p<f,this.s[p]!==0)){for(var v=0,x=p;x<this.m;x++)v+=i[x][p]*i[x][y];v=-v/i[p][p];for(var b=p;b<this.m;b++)i[b][y]+=v*i[b][p]}s[y]=i[p][y]}if(function(dt,Xe){return dt&&Xe}(u,p<f))for(var w=p;w<this.m;w++)this.U[w][p]=i[w][p];if(p<d){s[p]=0;for(var _=p+1;_<this.n;_++)s[p]=n.hypot(s[p],s[_]);if(s[p]!==0){s[p+1]<0&&(s[p]=-s[p]);for(var T=p+1;T<this.n;T++)s[T]/=s[p];s[p+1]+=1}if(s[p]=-s[p],function(dt,Xe){return dt&&Xe}(p+1<this.m,s[p]!==0)){for(var E=p+1;E<this.m;E++)l[E]=0;for(var L=p+1;L<this.n;L++)for(var C=p+1;C<this.m;C++)l[C]+=s[L]*i[C][L];for(var A=p+1;A<this.n;A++)for(var I=-s[A]/s[p+1],D=p+1;D<this.m;D++)i[D][A]+=I*l[D]}if(h)for(var k=p+1;k<this.n;k++)this.V[k][p]=s[k]}}var R=Math.min(this.n,this.m+1);if(f<this.n&&(this.s[f]=i[f][f]),this.m<R&&(this.s[R-1]=0),d+1<R&&(s[d]=i[d][R-1]),s[R-1]=0,u){for(var S=f;S<a;S++){for(var O=0;O<this.m;O++)this.U[O][S]=0;this.U[S][S]=1}for(var N=f-1;N>=0;N--)if(this.s[N]!==0){for(var P=N+1;P<a;P++){for(var F=0,B=N;B<this.m;B++)F+=this.U[B][N]*this.U[B][P];F=-F/this.U[N][N];for(var $=N;$<this.m;$++)this.U[$][P]+=F*this.U[$][N]}for(var z=N;z<this.m;z++)this.U[z][N]=-this.U[z][N];this.U[N][N]=1+this.U[N][N];for(var W=0;W<N-1;W++)this.U[W][N]=0}else{for(var j=0;j<this.m;j++)this.U[j][N]=0;this.U[N][N]=1}}if(h)for(var K=this.n-1;K>=0;K--){if(function(dt,Xe){return dt&&Xe}(K<d,s[K]!==0))for(var ie=K+1;ie<a;ie++){for(var Q=0,ee=K+1;ee<this.n;ee++)Q+=this.V[ee][K]*this.V[ee][ie];Q=-Q/this.V[K+1][K];for(var J=K+1;J<this.n;J++)this.V[J][ie]+=Q*this.V[J][K]}for(var H=0;H<this.n;H++)this.V[H][K]=0;this.V[K][K]=1}for(var q=R-1,Z=0,ae=Math.pow(2,-52),ue=Math.pow(2,-966);R>0;){var ce=void 0,te=void 0;for(ce=R-2;ce>=-1&&ce!==-1;ce--)if(Math.abs(s[ce])<=ue+ae*(Math.abs(this.s[ce])+Math.abs(this.s[ce+1]))){s[ce]=0;break}if(ce===R-2)te=4;else{var De=void 0;for(De=R-1;De>=ce&&De!==ce;De--){var oe=(De!==R?Math.abs(s[De]):0)+(De!==ce+1?Math.abs(s[De-1]):0);if(Math.abs(this.s[De])<=ue+ae*oe){this.s[De]=0;break}}De===ce?te=3:De===R-1?te=1:(te=2,ce=De)}switch(ce++,te){case 1:{var ke=s[R-2];s[R-2]=0;for(var Fe=R-2;Fe>=ce;Fe--){var Be=n.hypot(this.s[Fe],ke),Ve=this.s[Fe]/Be,Ge=ke/Be;if(this.s[Fe]=Be,Fe!==ce&&(ke=-Ge*s[Fe-1],s[Fe-1]=Ve*s[Fe-1]),h)for(var He=0;He<this.n;He++)Be=Ve*this.V[He][Fe]+Ge*this.V[He][R-1],this.V[He][R-1]=-Ge*this.V[He][Fe]+Ve*this.V[He][R-1],this.V[He][Fe]=Be}}break;case 2:{var xe=s[ce-1];s[ce-1]=0;for(var X=ce;X<R;X++){var fe=n.hypot(this.s[X],xe),he=this.s[X]/fe,ge=xe/fe;if(this.s[X]=fe,xe=-ge*s[X],s[X]=he*s[X],u)for(var ne=0;ne<this.m;ne++)fe=he*this.U[ne][X]+ge*this.U[ne][ce-1],this.U[ne][ce-1]=-ge*this.U[ne][X]+he*this.U[ne][ce-1],this.U[ne][X]=fe}}break;case 3:{var ye=Math.max(Math.max(Math.max(Math.max(Math.abs(this.s[R-1]),Math.abs(this.s[R-2])),Math.abs(s[R-2])),Math.abs(this.s[ce])),Math.abs(s[ce])),U=this.s[R-1]/ye,Te=this.s[R-2]/ye,se=s[R-2]/ye,Ee=this.s[ce]/ye,Ae=s[ce]/ye,Pe=((Te+U)*(Te-U)+se*se)/2,Me=U*se*(U*se),me=0;(function(dt,Xe){return dt||Xe})(Pe!==0,Me!==0)&&(me=Math.sqrt(Pe*Pe+Me),Pe<0&&(me=-me),me=Me/(Pe+me));for(var We=(Ee+U)*(Ee-U)+me,Re=Ee*Ae,tt=ce;tt<R-1;tt++){var gt=n.hypot(We,Re),Et=We/gt,vt=Re/gt;if(tt!==ce&&(s[tt-1]=gt),We=Et*this.s[tt]+vt*s[tt],s[tt]=Et*s[tt]-vt*this.s[tt],Re=vt*this.s[tt+1],this.s[tt+1]=Et*this.s[tt+1],h)for(var Ye=0;Ye<this.n;Ye++)gt=Et*this.V[Ye][tt]+vt*this.V[Ye][tt+1],this.V[Ye][tt+1]=-vt*this.V[Ye][tt]+Et*this.V[Ye][tt+1],this.V[Ye][tt]=gt;if(gt=n.hypot(We,Re),Et=We/gt,vt=Re/gt,this.s[tt]=gt,We=Et*s[tt]+vt*this.s[tt+1],this.s[tt+1]=-vt*s[tt]+Et*this.s[tt+1],Re=vt*s[tt+1],s[tt+1]=Et*s[tt+1],u&&tt<this.m-1)for(var Tt=0;Tt<this.m;Tt++)gt=Et*this.U[Tt][tt]+vt*this.U[Tt][tt+1],this.U[Tt][tt+1]=-vt*this.U[Tt][tt]+Et*this.U[Tt][tt+1],this.U[Tt][tt]=gt}s[R-2]=We,Z=Z+1}break;case 4:{if(this.s[ce]<=0&&(this.s[ce]=this.s[ce]<0?-this.s[ce]:0,h))for(var $e=0;$e<=q;$e++)this.V[$e][ce]=-this.V[$e][ce];for(;ce<q&&!(this.s[ce]>=this.s[ce+1]);){var rt=this.s[ce];if(this.s[ce]=this.s[ce+1],this.s[ce+1]=rt,h&&ce<this.n-1)for(var ft=0;ft<this.n;ft++)rt=this.V[ft][ce+1],this.V[ft][ce+1]=this.V[ft][ce],this.V[ft][ce]=rt;if(u&&ce<this.m-1)for(var kt=0;kt<this.m;kt++)rt=this.U[kt][ce+1],this.U[kt][ce+1]=this.U[kt][ce],this.U[kt][ce]=rt;ce++}Z=0,R--}break}}var er={U:this.U,V:this.V,S:this.s};return er},n.hypot=function(i,a){var s=void 0;return Math.abs(i)>Math.abs(a)?(s=a/i,s=Math.abs(i)*Math.sqrt(1+s*s)):a!=0?(s=i/a,s=Math.abs(a)*Math.sqrt(1+s*s)):s=0,s},t.exports=n},function(t,e,r){"use strict";var n=function(){function s(l,u){for(var h=0;h<u.length;h++){var f=u[h];f.enumerable=f.enumerable||!1,f.configurable=!0,"value"in f&&(f.writable=!0),Object.defineProperty(l,f.key,f)}}return o(s,"defineProperties"),function(l,u,h){return u&&s(l.prototype,u),h&&s(l,h),l}}();function i(s,l){if(!(s instanceof l))throw new TypeError("Cannot call a class as a function")}o(i,"_classCallCheck");var a=function(){function s(l,u){var h=arguments.length>2&&arguments[2]!==void 0?arguments[2]:1,f=arguments.length>3&&arguments[3]!==void 0?arguments[3]:-1,d=arguments.length>4&&arguments[4]!==void 0?arguments[4]:-1;i(this,s),this.sequence1=l,this.sequence2=u,this.match_score=h,this.mismatch_penalty=f,this.gap_penalty=d,this.iMax=l.length+1,this.jMax=u.length+1,this.grid=new Array(this.iMax);for(var p=0;p<this.iMax;p++){this.grid[p]=new Array(this.jMax);for(var m=0;m<this.jMax;m++)this.grid[p][m]=0}this.tracebackGrid=new Array(this.iMax);for(var g=0;g<this.iMax;g++){this.tracebackGrid[g]=new Array(this.jMax);for(var y=0;y<this.jMax;y++)this.tracebackGrid[g][y]=[null,null,null]}this.alignments=[],this.score=-1,this.computeGrids()}return o(s,"NeedlemanWunsch"),n(s,[{key:"getScore",value:o(function(){return this.score},"getScore")},{key:"getAlignments",value:o(function(){return this.alignments},"getAlignments")},{key:"computeGrids",value:o(function(){for(var u=1;u<this.jMax;u++)this.grid[0][u]=this.grid[0][u-1]+this.gap_penalty,this.tracebackGrid[0][u]=[!1,!1,!0];for(var h=1;h<this.iMax;h++)this.grid[h][0]=this.grid[h-1][0]+this.gap_penalty,this.tracebackGrid[h][0]=[!1,!0,!1];for(var f=1;f<this.iMax;f++)for(var d=1;d<this.jMax;d++){var p=void 0;this.sequence1[f-1]===this.sequence2[d-1]?p=this.grid[f-1][d-1]+this.match_score:p=this.grid[f-1][d-1]+this.mismatch_penalty;var m=this.grid[f-1][d]+this.gap_penalty,g=this.grid[f][d-1]+this.gap_penalty,y=[p,m,g],v=this.arrayAllMaxIndexes(y);this.grid[f][d]=y[v[0]],this.tracebackGrid[f][d]=[v.includes(0),v.includes(1),v.includes(2)]}this.score=this.grid[this.iMax-1][this.jMax-1]},"computeGrids")},{key:"alignmentTraceback",value:o(function(){var u=[];for(u.push({pos:[this.sequence1.length,this.sequence2.length],seq1:"",seq2:""});u[0];){var h=u[0],f=this.tracebackGrid[h.pos[0]][h.pos[1]];f[0]&&u.push({pos:[h.pos[0]-1,h.pos[1]-1],seq1:this.sequence1[h.pos[0]-1]+h.seq1,seq2:this.sequence2[h.pos[1]-1]+h.seq2}),f[1]&&u.push({pos:[h.pos[0]-1,h.pos[1]],seq1:this.sequence1[h.pos[0]-1]+h.seq1,seq2:"-"+h.seq2}),f[2]&&u.push({pos:[h.pos[0],h.pos[1]-1],seq1:"-"+h.seq1,seq2:this.sequence2[h.pos[1]-1]+h.seq2}),h.pos[0]===0&&h.pos[1]===0&&this.alignments.push({sequence1:h.seq1,sequence2:h.seq2}),u.shift()}return this.alignments},"alignmentTraceback")},{key:"getAllIndexes",value:o(function(u,h){for(var f=[],d=-1;(d=u.indexOf(h,d+1))!==-1;)f.push(d);return f},"getAllIndexes")},{key:"arrayAllMaxIndexes",value:o(function(u){return this.getAllIndexes(u,Math.max.apply(null,u))},"arrayAllMaxIndexes")}]),s}();t.exports=a},function(t,e,r){"use strict";var n=o(function(){},"layoutBase");n.FDLayout=r(18),n.FDLayoutConstants=r(4),n.FDLayoutEdge=r(19),n.FDLayoutNode=r(20),n.DimensionD=r(21),n.HashMap=r(22),n.HashSet=r(23),n.IGeometry=r(8),n.IMath=r(9),n.Integer=r(10),n.Point=r(12),n.PointD=r(5),n.RandomSeed=r(16),n.RectangleD=r(13),n.Transform=r(17),n.UniqueIDGeneretor=r(14),n.Quicksort=r(25),n.LinkedList=r(11),n.LGraphObject=r(2),n.LGraph=r(6),n.LEdge=r(1),n.LGraphManager=r(7),n.LNode=r(3),n.Layout=r(15),n.LayoutConstants=r(0),n.NeedlemanWunsch=r(27),n.Matrix=r(24),n.SVD=r(26),t.exports=n},function(t,e,r){"use strict";function n(){this.listeners=[]}o(n,"Emitter");var i=n.prototype;i.addListener=function(a,s){this.listeners.push({event:a,callback:s})},i.removeListener=function(a,s){for(var l=this.listeners.length;l>=0;l--){var u=this.listeners[l];u.event===a&&u.callback===s&&this.listeners.splice(l,1)}},i.emit=function(a,s){for(var l=0;l<this.listeners.length;l++){var u=this.listeners[l];a===u.event&&u.callback(s)}},t.exports=n}])})});var dF=Ni((xb,fF)=>{"use strict";o(function(e,r){typeof xb=="object"&&typeof fF=="object"?fF.exports=r(hF()):typeof define=="function"&&define.amd?define(["layout-base"],r):typeof xb=="object"?xb.coseBase=r(hF()):e.coseBase=r(e.layoutBase)},"webpackUniversalModuleDefinition")(xb,function(t){return(()=>{"use strict";var e={45:(a,s,l)=>{var u={};u.layoutBase=l(551),u.CoSEConstants=l(806),u.CoSEEdge=l(767),u.CoSEGraph=l(880),u.CoSEGraphManager=l(578),u.CoSELayout=l(765),u.CoSENode=l(991),u.ConstraintHandler=l(902),a.exports=u},806:(a,s,l)=>{var u=l(551).FDLayoutConstants;function h(){}o(h,"CoSEConstants");for(var f in u)h[f]=u[f];h.DEFAULT_USE_MULTI_LEVEL_SCALING=!1,h.DEFAULT_RADIAL_SEPARATION=u.DEFAULT_EDGE_LENGTH,h.DEFAULT_COMPONENT_SEPERATION=60,h.TILE=!0,h.TILING_PADDING_VERTICAL=10,h.TILING_PADDING_HORIZONTAL=10,h.TRANSFORM_ON_CONSTRAINT_HANDLING=!0,h.ENFORCE_CONSTRAINTS=!0,h.APPLY_LAYOUT=!0,h.RELAX_MOVEMENT_ON_CONSTRAINTS=!0,h.TREE_REDUCTION_ON_INCREMENTAL=!0,h.PURE_INCREMENTAL=h.DEFAULT_INCREMENTAL,a.exports=h},767:(a,s,l)=>{var u=l(551).FDLayoutEdge;function h(d,p,m){u.call(this,d,p,m)}o(h,"CoSEEdge"),h.prototype=Object.create(u.prototype);for(var f in u)h[f]=u[f];a.exports=h},880:(a,s,l)=>{var u=l(551).LGraph;function h(d,p,m){u.call(this,d,p,m)}o(h,"CoSEGraph"),h.prototype=Object.create(u.prototype);for(var f in u)h[f]=u[f];a.exports=h},578:(a,s,l)=>{var u=l(551).LGraphManager;function h(d){u.call(this,d)}o(h,"CoSEGraphManager"),h.prototype=Object.create(u.prototype);for(var f in u)h[f]=u[f];a.exports=h},765:(a,s,l)=>{var u=l(551).FDLayout,h=l(578),f=l(880),d=l(991),p=l(767),m=l(806),g=l(902),y=l(551).FDLayoutConstants,v=l(551).LayoutConstants,x=l(551).Point,b=l(551).PointD,w=l(551).DimensionD,_=l(551).Layout,T=l(551).Integer,E=l(551).IGeometry,L=l(551).LGraph,C=l(551).Transform,A=l(551).LinkedList;function I(){u.call(this),this.toBeTiled={},this.constraints={}}o(I,"CoSELayout"),I.prototype=Object.create(u.prototype);for(var D in u)I[D]=u[D];I.prototype.newGraphManager=function(){var k=new h(this);return this.graphManager=k,k},I.prototype.newGraph=function(k){return new f(null,this.graphManager,k)},I.prototype.newNode=function(k){return new d(this.graphManager,k)},I.prototype.newEdge=function(k){return new p(null,null,k)},I.prototype.initParameters=function(){u.prototype.initParameters.call(this,arguments),this.isSubLayout||(m.DEFAULT_EDGE_LENGTH<10?this.idealEdgeLength=10:this.idealEdgeLength=m.DEFAULT_EDGE_LENGTH,this.useSmartIdealEdgeLengthCalculation=m.DEFAULT_USE_SMART_IDEAL_EDGE_LENGTH_CALCULATION,this.gravityConstant=y.DEFAULT_GRAVITY_STRENGTH,this.compoundGravityConstant=y.DEFAULT_COMPOUND_GRAVITY_STRENGTH,this.gravityRangeFactor=y.DEFAULT_GRAVITY_RANGE_FACTOR,this.compoundGravityRangeFactor=y.DEFAULT_COMPOUND_GRAVITY_RANGE_FACTOR,this.prunedNodesAll=[],this.growTreeIterations=0,this.afterGrowthIterations=0,this.isTreeGrowing=!1,this.isGrowthFinished=!1)},I.prototype.initSpringEmbedder=function(){u.prototype.initSpringEmbedder.call(this),this.coolingCycle=0,this.maxCoolingCycle=this.maxIterations/y.CONVERGENCE_CHECK_PERIOD,this.finalTemperature=.04,this.coolingAdjuster=1},I.prototype.layout=function(){var k=v.DEFAULT_CREATE_BENDS_AS_NEEDED;return k&&(this.createBendpoints(),this.graphManager.resetAllEdges()),this.level=0,this.classicLayout()},I.prototype.classicLayout=function(){if(this.nodesWithGravity=this.calculateNodesToApplyGravitationTo(),this.graphManager.setAllNodesToApplyGravitation(this.nodesWithGravity),this.calcNoOfChildrenForAllNodes(),this.graphManager.calcLowestCommonAncestors(),this.graphManager.calcInclusionTreeDepths(),this.graphManager.getRoot().calcEstimatedSize(),this.calcIdealEdgeLengths(),this.incremental){if(m.TREE_REDUCTION_ON_INCREMENTAL){this.reduceTrees(),this.graphManager.resetAllNodesToApplyGravitation();var R=new Set(this.getAllNodes()),S=this.nodesWithGravity.filter(function(P){return R.has(P)});this.graphManager.setAllNodesToApplyGravitation(S)}}else{var k=this.getFlatForest();if(k.length>0)this.positionNodesRadially(k);else{this.reduceTrees(),this.graphManager.resetAllNodesToApplyGravitation();var R=new Set(this.getAllNodes()),S=this.nodesWithGravity.filter(function(O){return R.has(O)});this.graphManager.setAllNodesToApplyGravitation(S),this.positionNodesRandomly()}}return Object.keys(this.constraints).length>0&&(g.handleConstraints(this),this.initConstraintVariables()),this.initSpringEmbedder(),m.APPLY_LAYOUT&&this.runSpringEmbedder(),!0},I.prototype.tick=function(){if(this.totalIterations++,this.totalIterations===this.maxIterations&&!this.isTreeGrowing&&!this.isGrowthFinished)if(this.prunedNodesAll.length>0)this.isTreeGrowing=!0;else return!0;if(this.totalIterations%y.CONVERGENCE_CHECK_PERIOD==0&&!this.isTreeGrowing&&!this.isGrowthFinished){if(this.isConverged())if(this.prunedNodesAll.length>0)this.isTreeGrowing=!0;else return!0;this.coolingCycle++,this.layoutQuality==0?this.coolingAdjuster=this.coolingCycle:this.layoutQuality==1&&(this.coolingAdjuster=this.coolingCycle/3),this.coolingFactor=Math.max(this.initialCoolingFactor-Math.pow(this.coolingCycle,Math.log(100*(this.initialCoolingFactor-this.finalTemperature))/Math.log(this.maxCoolingCycle))/100*this.coolingAdjuster,this.finalTemperature),this.animationPeriod=Math.ceil(this.initialAnimationPeriod*Math.sqrt(this.coolingFactor))}if(this.isTreeGrowing){if(this.growTreeIterations%10==0)if(this.prunedNodesAll.length>0){this.graphManager.updateBounds(),this.updateGrid(),this.growTree(this.prunedNodesAll),this.graphManager.resetAllNodesToApplyGravitation();var k=new Set(this.getAllNodes()),R=this.nodesWithGravity.filter(function(N){return k.has(N)});this.graphManager.setAllNodesToApplyGravitation(R),this.graphManager.updateBounds(),this.updateGrid(),m.PURE_INCREMENTAL?this.coolingFactor=y.DEFAULT_COOLING_FACTOR_INCREMENTAL/2:this.coolingFactor=y.DEFAULT_COOLING_FACTOR_INCREMENTAL}else this.isTreeGrowing=!1,this.isGrowthFinished=!0;this.growTreeIterations++}if(this.isGrowthFinished){if(this.isConverged())return!0;this.afterGrowthIterations%10==0&&(this.graphManager.updateBounds(),this.updateGrid()),m.PURE_INCREMENTAL?this.coolingFactor=y.DEFAULT_COOLING_FACTOR_INCREMENTAL/2*((100-this.afterGrowthIterations)/100):this.coolingFactor=y.DEFAULT_COOLING_FACTOR_INCREMENTAL*((100-this.afterGrowthIterations)/100),this.afterGrowthIterations++}var S=!this.isTreeGrowing&&!this.isGrowthFinished,O=this.growTreeIterations%10==1&&this.isTreeGrowing||this.afterGrowthIterations%10==1&&this.isGrowthFinished;return this.totalDisplacement=0,this.graphManager.updateBounds(),this.calcSpringForces(),this.calcRepulsionForces(S,O),this.calcGravitationalForces(),this.moveNodes(),this.animate(),!1},I.prototype.getPositionsData=function(){for(var k=this.graphManager.getAllNodes(),R={},S=0;S<k.length;S++){var O=k[S].rect,N=k[S].id;R[N]={id:N,x:O.getCenterX(),y:O.getCenterY(),w:O.width,h:O.height}}return R},I.prototype.runSpringEmbedder=function(){this.initialAnimationPeriod=25,this.animationPeriod=this.initialAnimationPeriod;var k=!1;if(y.ANIMATE==="during")this.emit("layoutstarted");else{for(;!k;)k=this.tick();this.graphManager.updateBounds()}},I.prototype.moveNodes=function(){for(var k=this.getAllNodes(),R,S=0;S<k.length;S++)R=k[S],R.calculateDisplacement();Object.keys(this.constraints).length>0&&this.updateDisplacements();for(var S=0;S<k.length;S++)R=k[S],R.move()},I.prototype.initConstraintVariables=function(){var k=this;this.idToNodeMap=new Map,this.fixedNodeSet=new Set;for(var R=this.graphManager.getAllNodes(),S=0;S<R.length;S++){var O=R[S];this.idToNodeMap.set(O.id,O)}var N=o(function ee(J){for(var H=J.getChild().getNodes(),q,Z=0,ae=0;ae<H.length;ae++)q=H[ae],q.getChild()==null?k.fixedNodeSet.has(q.id)&&(Z+=100):Z+=ee(q);return Z},"calculateCompoundWeight");if(this.constraints.fixedNodeConstraint){this.constraints.fixedNodeConstraint.forEach(function(H){k.fixedNodeSet.add(H.nodeId)});for(var R=this.graphManager.getAllNodes(),O,S=0;S<R.length;S++)if(O=R[S],O.getChild()!=null){var P=N(O);P>0&&(O.fixedNodeWeight=P)}}if(this.constraints.relativePlacementConstraint){var F=new Map,B=new Map;if(this.dummyToNodeForVerticalAlignment=new Map,this.dummyToNodeForHorizontalAlignment=new Map,this.fixedNodesOnHorizontal=new Set,this.fixedNodesOnVertical=new Set,this.fixedNodeSet.forEach(function(ee){k.fixedNodesOnHorizontal.add(ee),k.fixedNodesOnVertical.add(ee)}),this.constraints.alignmentConstraint){if(this.constraints.alignmentConstraint.vertical)for(var $=this.constraints.alignmentConstraint.vertical,S=0;S<$.length;S++)this.dummyToNodeForVerticalAlignment.set("dummy"+S,[]),$[S].forEach(function(J){F.set(J,"dummy"+S),k.dummyToNodeForVerticalAlignment.get("dummy"+S).push(J),k.fixedNodeSet.has(J)&&k.fixedNodesOnHorizontal.add("dummy"+S)});if(this.constraints.alignmentConstraint.horizontal)for(var z=this.constraints.alignmentConstraint.horizontal,S=0;S<z.length;S++)this.dummyToNodeForHorizontalAlignment.set("dummy"+S,[]),z[S].forEach(function(J){B.set(J,"dummy"+S),k.dummyToNodeForHorizontalAlignment.get("dummy"+S).push(J),k.fixedNodeSet.has(J)&&k.fixedNodesOnVertical.add("dummy"+S)})}if(m.RELAX_MOVEMENT_ON_CONSTRAINTS)this.shuffle=function(ee){var J,H,q;for(q=ee.length-1;q>=2*ee.length/3;q--)J=Math.floor(Math.random()*(q+1)),H=ee[q],ee[q]=ee[J],ee[J]=H;return ee},this.nodesInRelativeHorizontal=[],this.nodesInRelativeVertical=[],this.nodeToRelativeConstraintMapHorizontal=new Map,this.nodeToRelativeConstraintMapVertical=new Map,this.nodeToTempPositionMapHorizontal=new Map,this.nodeToTempPositionMapVertical=new Map,this.constraints.relativePlacementConstraint.forEach(function(ee){if(ee.left){var J=F.has(ee.left)?F.get(ee.left):ee.left,H=F.has(ee.right)?F.get(ee.right):ee.right;k.nodesInRelativeHorizontal.includes(J)||(k.nodesInRelativeHorizontal.push(J),k.nodeToRelativeConstraintMapHorizontal.set(J,[]),k.dummyToNodeForVerticalAlignment.has(J)?k.nodeToTempPositionMapHorizontal.set(J,k.idToNodeMap.get(k.dummyToNodeForVerticalAlignment.get(J)[0]).getCenterX()):k.nodeToTempPositionMapHorizontal.set(J,k.idToNodeMap.get(J).getCenterX())),k.nodesInRelativeHorizontal.includes(H)||(k.nodesInRelativeHorizontal.push(H),k.nodeToRelativeConstraintMapHorizontal.set(H,[]),k.dummyToNodeForVerticalAlignment.has(H)?k.nodeToTempPositionMapHorizontal.set(H,k.idToNodeMap.get(k.dummyToNodeForVerticalAlignment.get(H)[0]).getCenterX()):k.nodeToTempPositionMapHorizontal.set(H,k.idToNodeMap.get(H).getCenterX())),k.nodeToRelativeConstraintMapHorizontal.get(J).push({right:H,gap:ee.gap}),k.nodeToRelativeConstraintMapHorizontal.get(H).push({left:J,gap:ee.gap})}else{var q=B.has(ee.top)?B.get(ee.top):ee.top,Z=B.has(ee.bottom)?B.get(ee.bottom):ee.bottom;k.nodesInRelativeVertical.includes(q)||(k.nodesInRelativeVertical.push(q),k.nodeToRelativeConstraintMapVertical.set(q,[]),k.dummyToNodeForHorizontalAlignment.has(q)?k.nodeToTempPositionMapVertical.set(q,k.idToNodeMap.get(k.dummyToNodeForHorizontalAlignment.get(q)[0]).getCenterY()):k.nodeToTempPositionMapVertical.set(q,k.idToNodeMap.get(q).getCenterY())),k.nodesInRelativeVertical.includes(Z)||(k.nodesInRelativeVertical.push(Z),k.nodeToRelativeConstraintMapVertical.set(Z,[]),k.dummyToNodeForHorizontalAlignment.has(Z)?k.nodeToTempPositionMapVertical.set(Z,k.idToNodeMap.get(k.dummyToNodeForHorizontalAlignment.get(Z)[0]).getCenterY()):k.nodeToTempPositionMapVertical.set(Z,k.idToNodeMap.get(Z).getCenterY())),k.nodeToRelativeConstraintMapVertical.get(q).push({bottom:Z,gap:ee.gap}),k.nodeToRelativeConstraintMapVertical.get(Z).push({top:q,gap:ee.gap})}});else{var W=new Map,j=new Map;this.constraints.relativePlacementConstraint.forEach(function(ee){if(ee.left){var J=F.has(ee.left)?F.get(ee.left):ee.left,H=F.has(ee.right)?F.get(ee.right):ee.right;W.has(J)?W.get(J).push(H):W.set(J,[H]),W.has(H)?W.get(H).push(J):W.set(H,[J])}else{var q=B.has(ee.top)?B.get(ee.top):ee.top,Z=B.has(ee.bottom)?B.get(ee.bottom):ee.bottom;j.has(q)?j.get(q).push(Z):j.set(q,[Z]),j.has(Z)?j.get(Z).push(q):j.set(Z,[q])}});var K=o(function(J,H){var q=[],Z=[],ae=new A,ue=new Set,ce=0;return J.forEach(function(te,De){if(!ue.has(De)){q[ce]=[],Z[ce]=!1;var oe=De;for(ae.push(oe),ue.add(oe),q[ce].push(oe);ae.length!=0;){oe=ae.shift(),H.has(oe)&&(Z[ce]=!0);var ke=J.get(oe);ke.forEach(function(Fe){ue.has(Fe)||(ae.push(Fe),ue.add(Fe),q[ce].push(Fe))})}ce++}}),{components:q,isFixed:Z}},"constructComponents"),ie=K(W,k.fixedNodesOnHorizontal);this.componentsOnHorizontal=ie.components,this.fixedComponentsOnHorizontal=ie.isFixed;var Q=K(j,k.fixedNodesOnVertical);this.componentsOnVertical=Q.components,this.fixedComponentsOnVertical=Q.isFixed}}},I.prototype.updateDisplacements=function(){var k=this;if(this.constraints.fixedNodeConstraint&&this.constraints.fixedNodeConstraint.forEach(function(Q){var ee=k.idToNodeMap.get(Q.nodeId);ee.displacementX=0,ee.displacementY=0}),this.constraints.alignmentConstraint){if(this.constraints.alignmentConstraint.vertical)for(var R=this.constraints.alignmentConstraint.vertical,S=0;S<R.length;S++){for(var O=0,N=0;N<R[S].length;N++){if(this.fixedNodeSet.has(R[S][N])){O=0;break}O+=this.idToNodeMap.get(R[S][N]).displacementX}for(var P=O/R[S].length,N=0;N<R[S].length;N++)this.idToNodeMap.get(R[S][N]).displacementX=P}if(this.constraints.alignmentConstraint.horizontal)for(var F=this.constraints.alignmentConstraint.horizontal,S=0;S<F.length;S++){for(var B=0,N=0;N<F[S].length;N++){if(this.fixedNodeSet.has(F[S][N])){B=0;break}B+=this.idToNodeMap.get(F[S][N]).displacementY}for(var $=B/F[S].length,N=0;N<F[S].length;N++)this.idToNodeMap.get(F[S][N]).displacementY=$}}if(this.constraints.relativePlacementConstraint)if(m.RELAX_MOVEMENT_ON_CONSTRAINTS)this.totalIterations%10==0&&(this.shuffle(this.nodesInRelativeHorizontal),this.shuffle(this.nodesInRelativeVertical)),this.nodesInRelativeHorizontal.forEach(function(Q){if(!k.fixedNodesOnHorizontal.has(Q)){var ee=0;k.dummyToNodeForVerticalAlignment.has(Q)?ee=k.idToNodeMap.get(k.dummyToNodeForVerticalAlignment.get(Q)[0]).displacementX:ee=k.idToNodeMap.get(Q).displacementX,k.nodeToRelativeConstraintMapHorizontal.get(Q).forEach(function(J){if(J.right){var H=k.nodeToTempPositionMapHorizontal.get(J.right)-k.nodeToTempPositionMapHorizontal.get(Q)-ee;H<J.gap&&(ee-=J.gap-H)}else{var H=k.nodeToTempPositionMapHorizontal.get(Q)-k.nodeToTempPositionMapHorizontal.get(J.left)+ee;H<J.gap&&(ee+=J.gap-H)}}),k.nodeToTempPositionMapHorizontal.set(Q,k.nodeToTempPositionMapHorizontal.get(Q)+ee),k.dummyToNodeForVerticalAlignment.has(Q)?k.dummyToNodeForVerticalAlignment.get(Q).forEach(function(J){k.idToNodeMap.get(J).displacementX=ee}):k.idToNodeMap.get(Q).displacementX=ee}}),this.nodesInRelativeVertical.forEach(function(Q){if(!k.fixedNodesOnHorizontal.has(Q)){var ee=0;k.dummyToNodeForHorizontalAlignment.has(Q)?ee=k.idToNodeMap.get(k.dummyToNodeForHorizontalAlignment.get(Q)[0]).displacementY:ee=k.idToNodeMap.get(Q).displacementY,k.nodeToRelativeConstraintMapVertical.get(Q).forEach(function(J){if(J.bottom){var H=k.nodeToTempPositionMapVertical.get(J.bottom)-k.nodeToTempPositionMapVertical.get(Q)-ee;H<J.gap&&(ee-=J.gap-H)}else{var H=k.nodeToTempPositionMapVertical.get(Q)-k.nodeToTempPositionMapVertical.get(J.top)+ee;H<J.gap&&(ee+=J.gap-H)}}),k.nodeToTempPositionMapVertical.set(Q,k.nodeToTempPositionMapVertical.get(Q)+ee),k.dummyToNodeForHorizontalAlignment.has(Q)?k.dummyToNodeForHorizontalAlignment.get(Q).forEach(function(J){k.idToNodeMap.get(J).displacementY=ee}):k.idToNodeMap.get(Q).displacementY=ee}});else{for(var S=0;S<this.componentsOnHorizontal.length;S++){var z=this.componentsOnHorizontal[S];if(this.fixedComponentsOnHorizontal[S])for(var N=0;N<z.length;N++)this.dummyToNodeForVerticalAlignment.has(z[N])?this.dummyToNodeForVerticalAlignment.get(z[N]).forEach(function(J){k.idToNodeMap.get(J).displacementX=0}):this.idToNodeMap.get(z[N]).displacementX=0;else{for(var W=0,j=0,N=0;N<z.length;N++)if(this.dummyToNodeForVerticalAlignment.has(z[N])){var K=this.dummyToNodeForVerticalAlignment.get(z[N]);W+=K.length*this.idToNodeMap.get(K[0]).displacementX,j+=K.length}else W+=this.idToNodeMap.get(z[N]).displacementX,j++;for(var ie=W/j,N=0;N<z.length;N++)this.dummyToNodeForVerticalAlignment.has(z[N])?this.dummyToNodeForVerticalAlignment.get(z[N]).forEach(function(J){k.idToNodeMap.get(J).displacementX=ie}):this.idToNodeMap.get(z[N]).displacementX=ie}}for(var S=0;S<this.componentsOnVertical.length;S++){var z=this.componentsOnVertical[S];if(this.fixedComponentsOnVertical[S])for(var N=0;N<z.length;N++)this.dummyToNodeForHorizontalAlignment.has(z[N])?this.dummyToNodeForHorizontalAlignment.get(z[N]).forEach(function(H){k.idToNodeMap.get(H).displacementY=0}):this.idToNodeMap.get(z[N]).displacementY=0;else{for(var W=0,j=0,N=0;N<z.length;N++)if(this.dummyToNodeForHorizontalAlignment.has(z[N])){var K=this.dummyToNodeForHorizontalAlignment.get(z[N]);W+=K.length*this.idToNodeMap.get(K[0]).displacementY,j+=K.length}else W+=this.idToNodeMap.get(z[N]).displacementY,j++;for(var ie=W/j,N=0;N<z.length;N++)this.dummyToNodeForHorizontalAlignment.has(z[N])?this.dummyToNodeForHorizontalAlignment.get(z[N]).forEach(function(ae){k.idToNodeMap.get(ae).displacementY=ie}):this.idToNodeMap.get(z[N]).displacementY=ie}}}},I.prototype.calculateNodesToApplyGravitationTo=function(){var k=[],R,S=this.graphManager.getGraphs(),O=S.length,N;for(N=0;N<O;N++)R=S[N],R.updateConnected(),R.isConnected||(k=k.concat(R.getNodes()));return k},I.prototype.createBendpoints=function(){var k=[];k=k.concat(this.graphManager.getAllEdges());var R=new Set,S;for(S=0;S<k.length;S++){var O=k[S];if(!R.has(O)){var N=O.getSource(),P=O.getTarget();if(N==P)O.getBendpoints().push(new b),O.getBendpoints().push(new b),this.createDummyNodesForBendpoints(O),R.add(O);else{var F=[];if(F=F.concat(N.getEdgeListToNode(P)),F=F.concat(P.getEdgeListToNode(N)),!R.has(F[0])){if(F.length>1){var B;for(B=0;B<F.length;B++){var $=F[B];$.getBendpoints().push(new b),this.createDummyNodesForBendpoints($)}}F.forEach(function(z){R.add(z)})}}}if(R.size==k.length)break}},I.prototype.positionNodesRadially=function(k){for(var R=new x(0,0),S=Math.ceil(Math.sqrt(k.length)),O=0,N=0,P=0,F=new b(0,0),B=0;B<k.length;B++){B%S==0&&(P=0,N=O,B!=0&&(N+=m.DEFAULT_COMPONENT_SEPERATION),O=0);var $=k[B],z=_.findCenterOfTree($);R.x=P,R.y=N,F=I.radialLayout($,z,R),F.y>O&&(O=Math.floor(F.y)),P=Math.floor(F.x+m.DEFAULT_COMPONENT_SEPERATION)}this.transform(new b(v.WORLD_CENTER_X-F.x/2,v.WORLD_CENTER_Y-F.y/2))},I.radialLayout=function(k,R,S){var O=Math.max(this.maxDiagonalInTree(k),m.DEFAULT_RADIAL_SEPARATION);I.branchRadialLayout(R,null,0,359,0,O);var N=L.calculateBounds(k),P=new C;P.setDeviceOrgX(N.getMinX()),P.setDeviceOrgY(N.getMinY()),P.setWorldOrgX(S.x),P.setWorldOrgY(S.y);for(var F=0;F<k.length;F++){var B=k[F];B.transform(P)}var $=new b(N.getMaxX(),N.getMaxY());return P.inverseTransformPoint($)},I.branchRadialLayout=function(k,R,S,O,N,P){var F=(O-S+1)/2;F<0&&(F+=180);var B=(F+S)%360,$=B*E.TWO_PI/360,z=Math.cos($),W=N*Math.cos($),j=N*Math.sin($);k.setCenter(W,j);var K=[];K=K.concat(k.getEdges());var ie=K.length;R!=null&&ie--;for(var Q=0,ee=K.length,J,H=k.getEdgesBetween(R);H.length>1;){var q=H[0];H.splice(0,1);var Z=K.indexOf(q);Z>=0&&K.splice(Z,1),ee--,ie--}R!=null?J=(K.indexOf(H[0])+1)%ee:J=0;for(var ae=Math.abs(O-S)/ie,ue=J;Q!=ie;ue=++ue%ee){var ce=K[ue].getOtherEnd(k);if(ce!=R){var te=(S+Q*ae)%360,De=(te+ae)%360;I.branchRadialLayout(ce,k,te,De,N+P,P),Q++}}},I.maxDiagonalInTree=function(k){for(var R=T.MIN_VALUE,S=0;S<k.length;S++){var O=k[S],N=O.getDiagonal();N>R&&(R=N)}return R},I.prototype.calcRepulsionRange=function(){return 2*(this.level+1)*this.idealEdgeLength},I.prototype.groupZeroDegreeMembers=function(){var k=this,R={};this.memberGroups={},this.idToDummyNode={};for(var S=[],O=this.graphManager.getAllNodes(),N=0;N<O.length;N++){var P=O[N],F=P.getParent();this.getNodeDegreeWithChildren(P)===0&&(F.id==null||!this.getToBeTiled(F))&&S.push(P)}for(var N=0;N<S.length;N++){var P=S[N],B=P.getParent().id;typeof R[B]>"u"&&(R[B]=[]),R[B]=R[B].concat(P)}Object.keys(R).forEach(function($){if(R[$].length>1){var z="DummyCompound_"+$;k.memberGroups[z]=R[$];var W=R[$][0].getParent(),j=new d(k.graphManager);j.id=z,j.paddingLeft=W.paddingLeft||0,j.paddingRight=W.paddingRight||0,j.paddingBottom=W.paddingBottom||0,j.paddingTop=W.paddingTop||0,k.idToDummyNode[z]=j;var K=k.getGraphManager().add(k.newGraph(),j),ie=W.getChild();ie.add(j);for(var Q=0;Q<R[$].length;Q++){var ee=R[$][Q];ie.remove(ee),K.add(ee)}}})},I.prototype.clearCompounds=function(){var k={},R={};this.performDFSOnCompounds();for(var S=0;S<this.compoundOrder.length;S++)R[this.compoundOrder[S].id]=this.compoundOrder[S],k[this.compoundOrder[S].id]=[].concat(this.compoundOrder[S].getChild().getNodes()),this.graphManager.remove(this.compoundOrder[S].getChild()),this.compoundOrder[S].child=null;this.graphManager.resetAllNodes(),this.tileCompoundMembers(k,R)},I.prototype.clearZeroDegreeMembers=function(){var k=this,R=this.tiledZeroDegreePack=[];Object.keys(this.memberGroups).forEach(function(S){var O=k.idToDummyNode[S];if(R[S]=k.tileNodes(k.memberGroups[S],O.paddingLeft+O.paddingRight),O.rect.width=R[S].width,O.rect.height=R[S].height,O.setCenter(R[S].centerX,R[S].centerY),O.labelMarginLeft=0,O.labelMarginTop=0,m.NODE_DIMENSIONS_INCLUDE_LABELS){var N=O.rect.width,P=O.rect.height;O.labelWidth&&(O.labelPosHorizontal=="left"?(O.rect.x-=O.labelWidth,O.setWidth(N+O.labelWidth),O.labelMarginLeft=O.labelWidth):O.labelPosHorizontal=="center"&&O.labelWidth>N?(O.rect.x-=(O.labelWidth-N)/2,O.setWidth(O.labelWidth),O.labelMarginLeft=(O.labelWidth-N)/2):O.labelPosHorizontal=="right"&&O.setWidth(N+O.labelWidth)),O.labelHeight&&(O.labelPosVertical=="top"?(O.rect.y-=O.labelHeight,O.setHeight(P+O.labelHeight),O.labelMarginTop=O.labelHeight):O.labelPosVertical=="center"&&O.labelHeight>P?(O.rect.y-=(O.labelHeight-P)/2,O.setHeight(O.labelHeight),O.labelMarginTop=(O.labelHeight-P)/2):O.labelPosVertical=="bottom"&&O.setHeight(P+O.labelHeight))}})},I.prototype.repopulateCompounds=function(){for(var k=this.compoundOrder.length-1;k>=0;k--){var R=this.compoundOrder[k],S=R.id,O=R.paddingLeft,N=R.paddingTop,P=R.labelMarginLeft,F=R.labelMarginTop;this.adjustLocations(this.tiledMemberPack[S],R.rect.x,R.rect.y,O,N,P,F)}},I.prototype.repopulateZeroDegreeMembers=function(){var k=this,R=this.tiledZeroDegreePack;Object.keys(R).forEach(function(S){var O=k.idToDummyNode[S],N=O.paddingLeft,P=O.paddingTop,F=O.labelMarginLeft,B=O.labelMarginTop;k.adjustLocations(R[S],O.rect.x,O.rect.y,N,P,F,B)})},I.prototype.getToBeTiled=function(k){var R=k.id;if(this.toBeTiled[R]!=null)return this.toBeTiled[R];var S=k.getChild();if(S==null)return this.toBeTiled[R]=!1,!1;for(var O=S.getNodes(),N=0;N<O.length;N++){var P=O[N];if(this.getNodeDegree(P)>0)return this.toBeTiled[R]=!1,!1;if(P.getChild()==null){this.toBeTiled[P.id]=!1;continue}if(!this.getToBeTiled(P))return this.toBeTiled[R]=!1,!1}return this.toBeTiled[R]=!0,!0},I.prototype.getNodeDegree=function(k){for(var R=k.id,S=k.getEdges(),O=0,N=0;N<S.length;N++){var P=S[N];P.getSource().id!==P.getTarget().id&&(O=O+1)}return O},I.prototype.getNodeDegreeWithChildren=function(k){var R=this.getNodeDegree(k);if(k.getChild()==null)return R;for(var S=k.getChild().getNodes(),O=0;O<S.length;O++){var N=S[O];R+=this.getNodeDegreeWithChildren(N)}return R},I.prototype.performDFSOnCompounds=function(){this.compoundOrder=[],this.fillCompexOrderByDFS(this.graphManager.getRoot().getNodes())},I.prototype.fillCompexOrderByDFS=function(k){for(var R=0;R<k.length;R++){var S=k[R];S.getChild()!=null&&this.fillCompexOrderByDFS(S.getChild().getNodes()),this.getToBeTiled(S)&&this.compoundOrder.push(S)}},I.prototype.adjustLocations=function(k,R,S,O,N,P,F){R+=O+P,S+=N+F;for(var B=R,$=0;$<k.rows.length;$++){var z=k.rows[$];R=B;for(var W=0,j=0;j<z.length;j++){var K=z[j];K.rect.x=R,K.rect.y=S,R+=K.rect.width+k.horizontalPadding,K.rect.height>W&&(W=K.rect.height)}S+=W+k.verticalPadding}},I.prototype.tileCompoundMembers=function(k,R){var S=this;this.tiledMemberPack=[],Object.keys(k).forEach(function(O){var N=R[O];if(S.tiledMemberPack[O]=S.tileNodes(k[O],N.paddingLeft+N.paddingRight),N.rect.width=S.tiledMemberPack[O].width,N.rect.height=S.tiledMemberPack[O].height,N.setCenter(S.tiledMemberPack[O].centerX,S.tiledMemberPack[O].centerY),N.labelMarginLeft=0,N.labelMarginTop=0,m.NODE_DIMENSIONS_INCLUDE_LABELS){var P=N.rect.width,F=N.rect.height;N.labelWidth&&(N.labelPosHorizontal=="left"?(N.rect.x-=N.labelWidth,N.setWidth(P+N.labelWidth),N.labelMarginLeft=N.labelWidth):N.labelPosHorizontal=="center"&&N.labelWidth>P?(N.rect.x-=(N.labelWidth-P)/2,N.setWidth(N.labelWidth),N.labelMarginLeft=(N.labelWidth-P)/2):N.labelPosHorizontal=="right"&&N.setWidth(P+N.labelWidth)),N.labelHeight&&(N.labelPosVertical=="top"?(N.rect.y-=N.labelHeight,N.setHeight(F+N.labelHeight),N.labelMarginTop=N.labelHeight):N.labelPosVertical=="center"&&N.labelHeight>F?(N.rect.y-=(N.labelHeight-F)/2,N.setHeight(N.labelHeight),N.labelMarginTop=(N.labelHeight-F)/2):N.labelPosVertical=="bottom"&&N.setHeight(F+N.labelHeight))}})},I.prototype.tileNodes=function(k,R){var S=this.tileNodesByFavoringDim(k,R,!0),O=this.tileNodesByFavoringDim(k,R,!1),N=this.getOrgRatio(S),P=this.getOrgRatio(O),F;return P<N?F=O:F=S,F},I.prototype.getOrgRatio=function(k){var R=k.width,S=k.height,O=R/S;return O<1&&(O=1/O),O},I.prototype.calcIdealRowWidth=function(k,R){var S=m.TILING_PADDING_VERTICAL,O=m.TILING_PADDING_HORIZONTAL,N=k.length,P=0,F=0,B=0;k.forEach(function(Q){P+=Q.getWidth(),F+=Q.getHeight(),Q.getWidth()>B&&(B=Q.getWidth())});var $=P/N,z=F/N,W=Math.pow(S-O,2)+4*($+O)*(z+S)*N,j=(O-S+Math.sqrt(W))/(2*($+O)),K;R?(K=Math.ceil(j),K==j&&K++):K=Math.floor(j);var ie=K*($+O)-O;return B>ie&&(ie=B),ie+=O*2,ie},I.prototype.tileNodesByFavoringDim=function(k,R,S){var O=m.TILING_PADDING_VERTICAL,N=m.TILING_PADDING_HORIZONTAL,P=m.TILING_COMPARE_BY,F={rows:[],rowWidth:[],rowHeight:[],width:0,height:R,verticalPadding:O,horizontalPadding:N,centerX:0,centerY:0};P&&(F.idealRowWidth=this.calcIdealRowWidth(k,S));var B=o(function(ee){return ee.rect.width*ee.rect.height},"getNodeArea"),$=o(function(ee,J){return B(J)-B(ee)},"areaCompareFcn");k.sort(function(Q,ee){var J=$;return F.idealRowWidth?(J=P,J(Q.id,ee.id)):J(Q,ee)});for(var z=0,W=0,j=0;j<k.length;j++){var K=k[j];z+=K.getCenterX(),W+=K.getCenterY()}F.centerX=z/k.length,F.centerY=W/k.length;for(var j=0;j<k.length;j++){var K=k[j];if(F.rows.length==0)this.insertNodeToRow(F,K,0,R);else if(this.canAddHorizontal(F,K.rect.width,K.rect.height)){var ie=F.rows.length-1;F.idealRowWidth||(ie=this.getShortestRowIndex(F)),this.insertNodeToRow(F,K,ie,R)}else this.insertNodeToRow(F,K,F.rows.length,R);this.shiftToLastRow(F)}return F},I.prototype.insertNodeToRow=function(k,R,S,O){var N=O;if(S==k.rows.length){var P=[];k.rows.push(P),k.rowWidth.push(N),k.rowHeight.push(0)}var F=k.rowWidth[S]+R.rect.width;k.rows[S].length>0&&(F+=k.horizontalPadding),k.rowWidth[S]=F,k.width<F&&(k.width=F);var B=R.rect.height;S>0&&(B+=k.verticalPadding);var $=0;B>k.rowHeight[S]&&($=k.rowHeight[S],k.rowHeight[S]=B,$=k.rowHeight[S]-$),k.height+=$,k.rows[S].push(R)},I.prototype.getShortestRowIndex=function(k){for(var R=-1,S=Number.MAX_VALUE,O=0;O<k.rows.length;O++)k.rowWidth[O]<S&&(R=O,S=k.rowWidth[O]);return R},I.prototype.getLongestRowIndex=function(k){for(var R=-1,S=Number.MIN_VALUE,O=0;O<k.rows.length;O++)k.rowWidth[O]>S&&(R=O,S=k.rowWidth[O]);return R},I.prototype.canAddHorizontal=function(k,R,S){if(k.idealRowWidth){var O=k.rows.length-1,N=k.rowWidth[O];return N+R+k.horizontalPadding<=k.idealRowWidth}var P=this.getShortestRowIndex(k);if(P<0)return!0;var F=k.rowWidth[P];if(F+k.horizontalPadding+R<=k.width)return!0;var B=0;k.rowHeight[P]<S&&P>0&&(B=S+k.verticalPadding-k.rowHeight[P]);var $;k.width-F>=R+k.horizontalPadding?$=(k.height+B)/(F+R+k.horizontalPadding):$=(k.height+B)/k.width,B=S+k.verticalPadding;var z;return k.width<R?z=(k.height+B)/R:z=(k.height+B)/k.width,z<1&&(z=1/z),$<1&&($=1/$),$<z},I.prototype.shiftToLastRow=function(k){var R=this.getLongestRowIndex(k),S=k.rowWidth.length-1,O=k.rows[R],N=O[O.length-1],P=N.width+k.horizontalPadding;if(k.width-k.rowWidth[S]>P&&R!=S){O.splice(-1,1),k.rows[S].push(N),k.rowWidth[R]=k.rowWidth[R]-P,k.rowWidth[S]=k.rowWidth[S]+P,k.width=k.rowWidth[instance.getLongestRowIndex(k)];for(var F=Number.MIN_VALUE,B=0;B<O.length;B++)O[B].height>F&&(F=O[B].height);R>0&&(F+=k.verticalPadding);var $=k.rowHeight[R]+k.rowHeight[S];k.rowHeight[R]=F,k.rowHeight[S]<N.height+k.verticalPadding&&(k.rowHeight[S]=N.height+k.verticalPadding);var z=k.rowHeight[R]+k.rowHeight[S];k.height+=z-$,this.shiftToLastRow(k)}},I.prototype.tilingPreLayout=function(){m.TILE&&(this.groupZeroDegreeMembers(),this.clearCompounds(),this.clearZeroDegreeMembers())},I.prototype.tilingPostLayout=function(){m.TILE&&(this.repopulateZeroDegreeMembers(),this.repopulateCompounds())},I.prototype.reduceTrees=function(){for(var k=[],R=!0,S;R;){var O=this.graphManager.getAllNodes(),N=[];R=!1;for(var P=0;P<O.length;P++)if(S=O[P],S.getEdges().length==1&&!S.getEdges()[0].isInterGraph&&S.getChild()==null){if(m.PURE_INCREMENTAL){var F=S.getEdges()[0].getOtherEnd(S),B=new w(S.getCenterX()-F.getCenterX(),S.getCenterY()-F.getCenterY());N.push([S,S.getEdges()[0],S.getOwner(),B])}else N.push([S,S.getEdges()[0],S.getOwner()]);R=!0}if(R==!0){for(var $=[],z=0;z<N.length;z++)N[z][0].getEdges().length==1&&($.push(N[z]),N[z][0].getOwner().remove(N[z][0]));k.push($),this.graphManager.resetAllNodes(),this.graphManager.resetAllEdges()}}this.prunedNodesAll=k},I.prototype.growTree=function(k){for(var R=k.length,S=k[R-1],O,N=0;N<S.length;N++)O=S[N],this.findPlaceforPrunedNode(O),O[2].add(O[0]),O[2].add(O[1],O[1].source,O[1].target);k.splice(k.length-1,1),this.graphManager.resetAllNodes(),this.graphManager.resetAllEdges()},I.prototype.findPlaceforPrunedNode=function(k){var R,S,O=k[0];if(O==k[1].source?S=k[1].target:S=k[1].source,m.PURE_INCREMENTAL)O.setCenter(S.getCenterX()+k[3].getWidth(),S.getCenterY()+k[3].getHeight());else{var N=S.startX,P=S.finishX,F=S.startY,B=S.finishY,$=0,z=0,W=0,j=0,K=[$,W,z,j];if(F>0)for(var ie=N;ie<=P;ie++)K[0]+=this.grid[ie][F-1].length+this.grid[ie][F].length-1;if(P<this.grid.length-1)for(var ie=F;ie<=B;ie++)K[1]+=this.grid[P+1][ie].length+this.grid[P][ie].length-1;if(B<this.grid[0].length-1)for(var ie=N;ie<=P;ie++)K[2]+=this.grid[ie][B+1].length+this.grid[ie][B].length-1;if(N>0)for(var ie=F;ie<=B;ie++)K[3]+=this.grid[N-1][ie].length+this.grid[N][ie].length-1;for(var Q=T.MAX_VALUE,ee,J,H=0;H<K.length;H++)K[H]<Q?(Q=K[H],ee=1,J=H):K[H]==Q&&ee++;if(ee==3&&Q==0)K[0]==0&&K[1]==0&&K[2]==0?R=1:K[0]==0&&K[1]==0&&K[3]==0?R=0:K[0]==0&&K[2]==0&&K[3]==0?R=3:K[1]==0&&K[2]==0&&K[3]==0&&(R=2);else if(ee==2&&Q==0){var q=Math.floor(Math.random()*2);K[0]==0&&K[1]==0?q==0?R=0:R=1:K[0]==0&&K[2]==0?q==0?R=0:R=2:K[0]==0&&K[3]==0?q==0?R=0:R=3:K[1]==0&&K[2]==0?q==0?R=1:R=2:K[1]==0&&K[3]==0?q==0?R=1:R=3:q==0?R=2:R=3}else if(ee==4&&Q==0){var q=Math.floor(Math.random()*4);R=q}else R=J;R==0?O.setCenter(S.getCenterX(),S.getCenterY()-S.getHeight()/2-y.DEFAULT_EDGE_LENGTH-O.getHeight()/2):R==1?O.setCenter(S.getCenterX()+S.getWidth()/2+y.DEFAULT_EDGE_LENGTH+O.getWidth()/2,S.getCenterY()):R==2?O.setCenter(S.getCenterX(),S.getCenterY()+S.getHeight()/2+y.DEFAULT_EDGE_LENGTH+O.getHeight()/2):O.setCenter(S.getCenterX()-S.getWidth()/2-y.DEFAULT_EDGE_LENGTH-O.getWidth()/2,S.getCenterY())}},a.exports=I},991:(a,s,l)=>{var u=l(551).FDLayoutNode,h=l(551).IMath;function f(p,m,g,y){u.call(this,p,m,g,y)}o(f,"CoSENode"),f.prototype=Object.create(u.prototype);for(var d in u)f[d]=u[d];f.prototype.calculateDisplacement=function(){var p=this.graphManager.getLayout();this.getChild()!=null&&this.fixedNodeWeight?(this.displacementX+=p.coolingFactor*(this.springForceX+this.repulsionForceX+this.gravitationForceX)/this.fixedNodeWeight,this.displacementY+=p.coolingFactor*(this.springForceY+this.repulsionForceY+this.gravitationForceY)/this.fixedNodeWeight):(this.displacementX+=p.coolingFactor*(this.springForceX+this.repulsionForceX+this.gravitationForceX)/this.noOfChildren,this.displacementY+=p.coolingFactor*(this.springForceY+this.repulsionForceY+this.gravitationForceY)/this.noOfChildren),Math.abs(this.displacementX)>p.coolingFactor*p.maxNodeDisplacement&&(this.displacementX=p.coolingFactor*p.maxNodeDisplacement*h.sign(this.displacementX)),Math.abs(this.displacementY)>p.coolingFactor*p.maxNodeDisplacement&&(this.displacementY=p.coolingFactor*p.maxNodeDisplacement*h.sign(this.displacementY)),this.child&&this.child.getNodes().length>0&&this.propogateDisplacementToChildren(this.displacementX,this.displacementY)},f.prototype.propogateDisplacementToChildren=function(p,m){for(var g=this.getChild().getNodes(),y,v=0;v<g.length;v++)y=g[v],y.getChild()==null?(y.displacementX+=p,y.displacementY+=m):y.propogateDisplacementToChildren(p,m)},f.prototype.move=function(){var p=this.graphManager.getLayout();(this.child==null||this.child.getNodes().length==0)&&(this.moveBy(this.displacementX,this.displacementY),p.totalDisplacement+=Math.abs(this.displacementX)+Math.abs(this.displacementY)),this.springForceX=0,this.springForceY=0,this.repulsionForceX=0,this.repulsionForceY=0,this.gravitationForceX=0,this.gravitationForceY=0,this.displacementX=0,this.displacementY=0},f.prototype.setPred1=function(p){this.pred1=p},f.prototype.getPred1=function(){return pred1},f.prototype.getPred2=function(){return pred2},f.prototype.setNext=function(p){this.next=p},f.prototype.getNext=function(){return next},f.prototype.setProcessed=function(p){this.processed=p},f.prototype.isProcessed=function(){return processed},a.exports=f},902:(a,s,l)=>{function u(g){if(Array.isArray(g)){for(var y=0,v=Array(g.length);y<g.length;y++)v[y]=g[y];return v}else return Array.from(g)}o(u,"_toConsumableArray");var h=l(806),f=l(551).LinkedList,d=l(551).Matrix,p=l(551).SVD;function m(){}o(m,"ConstraintHandler"),m.handleConstraints=function(g){var y={};y.fixedNodeConstraint=g.constraints.fixedNodeConstraint,y.alignmentConstraint=g.constraints.alignmentConstraint,y.relativePlacementConstraint=g.constraints.relativePlacementConstraint;for(var v=new Map,x=new Map,b=[],w=[],_=g.getAllNodes(),T=0,E=0;E<_.length;E++){var L=_[E];L.getChild()==null&&(x.set(L.id,T++),b.push(L.getCenterX()),w.push(L.getCenterY()),v.set(L.id,L))}y.relativePlacementConstraint&&y.relativePlacementConstraint.forEach(function(ye){!ye.gap&&ye.gap!=0&&(ye.left?ye.gap=h.DEFAULT_EDGE_LENGTH+v.get(ye.left).getWidth()/2+v.get(ye.right).getWidth()/2:ye.gap=h.DEFAULT_EDGE_LENGTH+v.get(ye.top).getHeight()/2+v.get(ye.bottom).getHeight()/2)});var C=o(function(U,Te){return{x:U.x-Te.x,y:U.y-Te.y}},"calculatePositionDiff"),A=o(function(U){var Te=0,se=0;return U.forEach(function(Ee){Te+=b[x.get(Ee)],se+=w[x.get(Ee)]}),{x:Te/U.size,y:se/U.size}},"calculateAvgPosition"),I=o(function(U,Te,se,Ee,Ae){function Pe(vt,Ye){var Tt=new Set(vt),$e=!0,rt=!1,ft=void 0;try{for(var kt=Ye[Symbol.iterator](),er;!($e=(er=kt.next()).done);$e=!0){var dt=er.value;Tt.add(dt)}}catch(Xe){rt=!0,ft=Xe}finally{try{!$e&&kt.return&&kt.return()}finally{if(rt)throw ft}}return Tt}o(Pe,"setUnion");var Me=new Map;U.forEach(function(vt,Ye){Me.set(Ye,0)}),U.forEach(function(vt,Ye){vt.forEach(function(Tt){Me.set(Tt.id,Me.get(Tt.id)+1)})});var me=new Map,We=new Map,Re=new f;Me.forEach(function(vt,Ye){vt==0?(Re.push(Ye),se||(Te=="horizontal"?me.set(Ye,x.has(Ye)?b[x.get(Ye)]:Ee.get(Ye)):me.set(Ye,x.has(Ye)?w[x.get(Ye)]:Ee.get(Ye)))):me.set(Ye,Number.NEGATIVE_INFINITY),se&&We.set(Ye,new Set([Ye]))}),se&&Ae.forEach(function(vt){var Ye=[];if(vt.forEach(function(rt){se.has(rt)&&Ye.push(rt)}),Ye.length>0){var Tt=0;Ye.forEach(function(rt){Te=="horizontal"?(me.set(rt,x.has(rt)?b[x.get(rt)]:Ee.get(rt)),Tt+=me.get(rt)):(me.set(rt,x.has(rt)?w[x.get(rt)]:Ee.get(rt)),Tt+=me.get(rt))}),Tt=Tt/Ye.length,vt.forEach(function(rt){se.has(rt)||me.set(rt,Tt)})}else{var $e=0;vt.forEach(function(rt){Te=="horizontal"?$e+=x.has(rt)?b[x.get(rt)]:Ee.get(rt):$e+=x.has(rt)?w[x.get(rt)]:Ee.get(rt)}),$e=$e/vt.length,vt.forEach(function(rt){me.set(rt,$e)})}});for(var tt=o(function(){var Ye=Re.shift(),Tt=U.get(Ye);Tt.forEach(function($e){if(me.get($e.id)<me.get(Ye)+$e.gap)if(se&&se.has($e.id)){var rt=void 0;if(Te=="horizontal"?rt=x.has($e.id)?b[x.get($e.id)]:Ee.get($e.id):rt=x.has($e.id)?w[x.get($e.id)]:Ee.get($e.id),me.set($e.id,rt),rt<me.get(Ye)+$e.gap){var ft=me.get(Ye)+$e.gap-rt;We.get(Ye).forEach(function(kt){me.set(kt,me.get(kt)-ft)})}}else me.set($e.id,me.get(Ye)+$e.gap);Me.set($e.id,Me.get($e.id)-1),Me.get($e.id)==0&&Re.push($e.id),se&&We.set($e.id,Pe(We.get(Ye),We.get($e.id)))})},"_loop");Re.length!=0;)tt();if(se){var gt=new Set;U.forEach(function(vt,Ye){vt.length==0&>.add(Ye)});var Et=[];We.forEach(function(vt,Ye){if(gt.has(Ye)){var Tt=!1,$e=!0,rt=!1,ft=void 0;try{for(var kt=vt[Symbol.iterator](),er;!($e=(er=kt.next()).done);$e=!0){var dt=er.value;se.has(dt)&&(Tt=!0)}}catch(Lt){rt=!0,ft=Lt}finally{try{!$e&&kt.return&&kt.return()}finally{if(rt)throw ft}}if(!Tt){var Xe=!1,ct=void 0;Et.forEach(function(Lt,Rt){Lt.has([].concat(u(vt))[0])&&(Xe=!0,ct=Rt)}),Xe?vt.forEach(function(Lt){Et[ct].add(Lt)}):Et.push(new Set(vt))}}}),Et.forEach(function(vt,Ye){var Tt=Number.POSITIVE_INFINITY,$e=Number.POSITIVE_INFINITY,rt=Number.NEGATIVE_INFINITY,ft=Number.NEGATIVE_INFINITY,kt=!0,er=!1,dt=void 0;try{for(var Xe=vt[Symbol.iterator](),ct;!(kt=(ct=Xe.next()).done);kt=!0){var Lt=ct.value,Rt=void 0;Te=="horizontal"?Rt=x.has(Lt)?b[x.get(Lt)]:Ee.get(Lt):Rt=x.has(Lt)?w[x.get(Lt)]:Ee.get(Lt);var zt=me.get(Lt);Rt<Tt&&(Tt=Rt),Rt>rt&&(rt=Rt),zt<$e&&($e=zt),zt>ft&&(ft=zt)}}catch(yt){er=!0,dt=yt}finally{try{!kt&&Xe.return&&Xe.return()}finally{if(er)throw dt}}var Xn=(Tt+rt)/2-($e+ft)/2,or=!0,hn=!1,Tn=void 0;try{for(var Ur=vt[Symbol.iterator](),ri;!(or=(ri=Ur.next()).done);or=!0){var Mn=ri.value;me.set(Mn,me.get(Mn)+Xn)}}catch(yt){hn=!0,Tn=yt}finally{try{!or&&Ur.return&&Ur.return()}finally{if(hn)throw Tn}}})}return me},"findAppropriatePositionForRelativePlacement"),D=o(function(U){var Te=0,se=0,Ee=0,Ae=0;if(U.forEach(function(We){We.left?b[x.get(We.left)]-b[x.get(We.right)]>=0?Te++:se++:w[x.get(We.top)]-w[x.get(We.bottom)]>=0?Ee++:Ae++}),Te>se&&Ee>Ae)for(var Pe=0;Pe<x.size;Pe++)b[Pe]=-1*b[Pe],w[Pe]=-1*w[Pe];else if(Te>se)for(var Me=0;Me<x.size;Me++)b[Me]=-1*b[Me];else if(Ee>Ae)for(var me=0;me<x.size;me++)w[me]=-1*w[me]},"applyReflectionForRelativePlacement"),k=o(function(U){var Te=[],se=new f,Ee=new Set,Ae=0;return U.forEach(function(Pe,Me){if(!Ee.has(Me)){Te[Ae]=[];var me=Me;for(se.push(me),Ee.add(me),Te[Ae].push(me);se.length!=0;){me=se.shift();var We=U.get(me);We.forEach(function(Re){Ee.has(Re.id)||(se.push(Re.id),Ee.add(Re.id),Te[Ae].push(Re.id))})}Ae++}}),Te},"findComponents"),R=o(function(U){var Te=new Map;return U.forEach(function(se,Ee){Te.set(Ee,[])}),U.forEach(function(se,Ee){se.forEach(function(Ae){Te.get(Ee).push(Ae),Te.get(Ae.id).push({id:Ee,gap:Ae.gap,direction:Ae.direction})})}),Te},"dagToUndirected"),S=o(function(U){var Te=new Map;return U.forEach(function(se,Ee){Te.set(Ee,[])}),U.forEach(function(se,Ee){se.forEach(function(Ae){Te.get(Ae.id).push({id:Ee,gap:Ae.gap,direction:Ae.direction})})}),Te},"dagToReversed"),O=[],N=[],P=!1,F=!1,B=new Set,$=new Map,z=new Map,W=[];if(y.fixedNodeConstraint&&y.fixedNodeConstraint.forEach(function(ye){B.add(ye.nodeId)}),y.relativePlacementConstraint&&(y.relativePlacementConstraint.forEach(function(ye){ye.left?($.has(ye.left)?$.get(ye.left).push({id:ye.right,gap:ye.gap,direction:"horizontal"}):$.set(ye.left,[{id:ye.right,gap:ye.gap,direction:"horizontal"}]),$.has(ye.right)||$.set(ye.right,[])):($.has(ye.top)?$.get(ye.top).push({id:ye.bottom,gap:ye.gap,direction:"vertical"}):$.set(ye.top,[{id:ye.bottom,gap:ye.gap,direction:"vertical"}]),$.has(ye.bottom)||$.set(ye.bottom,[]))}),z=R($),W=k(z)),h.TRANSFORM_ON_CONSTRAINT_HANDLING){if(y.fixedNodeConstraint&&y.fixedNodeConstraint.length>1)y.fixedNodeConstraint.forEach(function(ye,U){O[U]=[ye.position.x,ye.position.y],N[U]=[b[x.get(ye.nodeId)],w[x.get(ye.nodeId)]]}),P=!0;else if(y.alignmentConstraint)(function(){var ye=0;if(y.alignmentConstraint.vertical){for(var U=y.alignmentConstraint.vertical,Te=o(function(me){var We=new Set;U[me].forEach(function(gt){We.add(gt)});var Re=new Set([].concat(u(We)).filter(function(gt){return B.has(gt)})),tt=void 0;Re.size>0?tt=b[x.get(Re.values().next().value)]:tt=A(We).x,U[me].forEach(function(gt){O[ye]=[tt,w[x.get(gt)]],N[ye]=[b[x.get(gt)],w[x.get(gt)]],ye++})},"_loop2"),se=0;se<U.length;se++)Te(se);P=!0}if(y.alignmentConstraint.horizontal){for(var Ee=y.alignmentConstraint.horizontal,Ae=o(function(me){var We=new Set;Ee[me].forEach(function(gt){We.add(gt)});var Re=new Set([].concat(u(We)).filter(function(gt){return B.has(gt)})),tt=void 0;Re.size>0?tt=b[x.get(Re.values().next().value)]:tt=A(We).y,Ee[me].forEach(function(gt){O[ye]=[b[x.get(gt)],tt],N[ye]=[b[x.get(gt)],w[x.get(gt)]],ye++})},"_loop3"),Pe=0;Pe<Ee.length;Pe++)Ae(Pe);P=!0}y.relativePlacementConstraint&&(F=!0)})();else if(y.relativePlacementConstraint){for(var j=0,K=0,ie=0;ie<W.length;ie++)W[ie].length>j&&(j=W[ie].length,K=ie);if(j<z.size/2)D(y.relativePlacementConstraint),P=!1,F=!1;else{var Q=new Map,ee=new Map,J=[];W[K].forEach(function(ye){$.get(ye).forEach(function(U){U.direction=="horizontal"?(Q.has(ye)?Q.get(ye).push(U):Q.set(ye,[U]),Q.has(U.id)||Q.set(U.id,[]),J.push({left:ye,right:U.id})):(ee.has(ye)?ee.get(ye).push(U):ee.set(ye,[U]),ee.has(U.id)||ee.set(U.id,[]),J.push({top:ye,bottom:U.id}))})}),D(J),F=!1;var H=I(Q,"horizontal"),q=I(ee,"vertical");W[K].forEach(function(ye,U){N[U]=[b[x.get(ye)],w[x.get(ye)]],O[U]=[],H.has(ye)?O[U][0]=H.get(ye):O[U][0]=b[x.get(ye)],q.has(ye)?O[U][1]=q.get(ye):O[U][1]=w[x.get(ye)]}),P=!0}}if(P){for(var Z=void 0,ae=d.transpose(O),ue=d.transpose(N),ce=0;ce<ae.length;ce++)ae[ce]=d.multGamma(ae[ce]),ue[ce]=d.multGamma(ue[ce]);var te=d.multMat(ae,d.transpose(ue)),De=p.svd(te);Z=d.multMat(De.V,d.transpose(De.U));for(var oe=0;oe<x.size;oe++){var ke=[b[oe],w[oe]],Fe=[Z[0][0],Z[1][0]],Be=[Z[0][1],Z[1][1]];b[oe]=d.dotProduct(ke,Fe),w[oe]=d.dotProduct(ke,Be)}F&&D(y.relativePlacementConstraint)}}if(h.ENFORCE_CONSTRAINTS){if(y.fixedNodeConstraint&&y.fixedNodeConstraint.length>0){var Ve={x:0,y:0};y.fixedNodeConstraint.forEach(function(ye,U){var Te={x:b[x.get(ye.nodeId)],y:w[x.get(ye.nodeId)]},se=ye.position,Ee=C(se,Te);Ve.x+=Ee.x,Ve.y+=Ee.y}),Ve.x/=y.fixedNodeConstraint.length,Ve.y/=y.fixedNodeConstraint.length,b.forEach(function(ye,U){b[U]+=Ve.x}),w.forEach(function(ye,U){w[U]+=Ve.y}),y.fixedNodeConstraint.forEach(function(ye){b[x.get(ye.nodeId)]=ye.position.x,w[x.get(ye.nodeId)]=ye.position.y})}if(y.alignmentConstraint){if(y.alignmentConstraint.vertical)for(var Ge=y.alignmentConstraint.vertical,He=o(function(U){var Te=new Set;Ge[U].forEach(function(Ae){Te.add(Ae)});var se=new Set([].concat(u(Te)).filter(function(Ae){return B.has(Ae)})),Ee=void 0;se.size>0?Ee=b[x.get(se.values().next().value)]:Ee=A(Te).x,Te.forEach(function(Ae){B.has(Ae)||(b[x.get(Ae)]=Ee)})},"_loop4"),xe=0;xe<Ge.length;xe++)He(xe);if(y.alignmentConstraint.horizontal)for(var X=y.alignmentConstraint.horizontal,fe=o(function(U){var Te=new Set;X[U].forEach(function(Ae){Te.add(Ae)});var se=new Set([].concat(u(Te)).filter(function(Ae){return B.has(Ae)})),Ee=void 0;se.size>0?Ee=w[x.get(se.values().next().value)]:Ee=A(Te).y,Te.forEach(function(Ae){B.has(Ae)||(w[x.get(Ae)]=Ee)})},"_loop5"),he=0;he<X.length;he++)fe(he)}y.relativePlacementConstraint&&function(){var ye=new Map,U=new Map,Te=new Map,se=new Map,Ee=new Map,Ae=new Map,Pe=new Set,Me=new Set;if(B.forEach(function(bt){Pe.add(bt),Me.add(bt)}),y.alignmentConstraint){if(y.alignmentConstraint.vertical)for(var me=y.alignmentConstraint.vertical,We=o(function(Ue){Te.set("dummy"+Ue,[]),me[Ue].forEach(function(Kt){ye.set(Kt,"dummy"+Ue),Te.get("dummy"+Ue).push(Kt),B.has(Kt)&&Pe.add("dummy"+Ue)}),Ee.set("dummy"+Ue,b[x.get(me[Ue][0])])},"_loop6"),Re=0;Re<me.length;Re++)We(Re);if(y.alignmentConstraint.horizontal)for(var tt=y.alignmentConstraint.horizontal,gt=o(function(Ue){se.set("dummy"+Ue,[]),tt[Ue].forEach(function(Kt){U.set(Kt,"dummy"+Ue),se.get("dummy"+Ue).push(Kt),B.has(Kt)&&Me.add("dummy"+Ue)}),Ae.set("dummy"+Ue,w[x.get(tt[Ue][0])])},"_loop7"),Et=0;Et<tt.length;Et++)gt(Et)}var vt=new Map,Ye=new Map,Tt=o(function(Ue){$.get(Ue).forEach(function(Kt){var pe=void 0,bi=void 0;Kt.direction=="horizontal"?(pe=ye.get(Ue)?ye.get(Ue):Ue,ye.get(Kt.id)?bi={id:ye.get(Kt.id),gap:Kt.gap,direction:Kt.direction}:bi=Kt,vt.has(pe)?vt.get(pe).push(bi):vt.set(pe,[bi]),vt.has(bi.id)||vt.set(bi.id,[])):(pe=U.get(Ue)?U.get(Ue):Ue,U.get(Kt.id)?bi={id:U.get(Kt.id),gap:Kt.gap,direction:Kt.direction}:bi=Kt,Ye.has(pe)?Ye.get(pe).push(bi):Ye.set(pe,[bi]),Ye.has(bi.id)||Ye.set(bi.id,[]))})},"_loop8"),$e=!0,rt=!1,ft=void 0;try{for(var kt=$.keys()[Symbol.iterator](),er;!($e=(er=kt.next()).done);$e=!0){var dt=er.value;Tt(dt)}}catch(bt){rt=!0,ft=bt}finally{try{!$e&&kt.return&&kt.return()}finally{if(rt)throw ft}}var Xe=R(vt),ct=R(Ye),Lt=k(Xe),Rt=k(ct),zt=S(vt),Xn=S(Ye),or=[],hn=[];Lt.forEach(function(bt,Ue){or[Ue]=[],bt.forEach(function(Kt){zt.get(Kt).length==0&&or[Ue].push(Kt)})}),Rt.forEach(function(bt,Ue){hn[Ue]=[],bt.forEach(function(Kt){Xn.get(Kt).length==0&&hn[Ue].push(Kt)})});var Tn=I(vt,"horizontal",Pe,Ee,or),Ur=I(Ye,"vertical",Me,Ae,hn),ri=o(function(Ue){Te.get(Ue)?Te.get(Ue).forEach(function(Kt){b[x.get(Kt)]=Tn.get(Ue)}):b[x.get(Ue)]=Tn.get(Ue)},"_loop9"),Mn=!0,yt=!1,Se=void 0;try{for(var at=Tn.keys()[Symbol.iterator](),At;!(Mn=(At=at.next()).done);Mn=!0){var pr=At.value;ri(pr)}}catch(bt){yt=!0,Se=bt}finally{try{!Mn&&at.return&&at.return()}finally{if(yt)throw Se}}var In=o(function(Ue){se.get(Ue)?se.get(Ue).forEach(function(Kt){w[x.get(Kt)]=Ur.get(Ue)}):w[x.get(Ue)]=Ur.get(Ue)},"_loop10"),On=!0,Ir=!1,kn=void 0;try{for(var _t=Ur.keys()[Symbol.iterator](),St;!(On=(St=_t.next()).done);On=!0){var pr=St.value;In(pr)}}catch(bt){Ir=!0,kn=bt}finally{try{!On&&_t.return&&_t.return()}finally{if(Ir)throw kn}}}()}for(var ge=0;ge<_.length;ge++){var ne=_[ge];ne.getChild()==null&&ne.setCenter(b[x.get(ne.id)],w[x.get(ne.id)])}},a.exports=m},551:a=>{a.exports=t}},r={};function n(a){var s=r[a];if(s!==void 0)return s.exports;var l=r[a]={exports:{}};return e[a](l,l.exports,n),l.exports}o(n,"__webpack_require__");var i=n(45);return i})()})});var c2e=Ni((bb,pF)=>{"use strict";o(function(e,r){typeof bb=="object"&&typeof pF=="object"?pF.exports=r(dF()):typeof define=="function"&&define.amd?define(["cose-base"],r):typeof bb=="object"?bb.cytoscapeFcose=r(dF()):e.cytoscapeFcose=r(e.coseBase)},"webpackUniversalModuleDefinition")(bb,function(t){return(()=>{"use strict";var e={658:a=>{a.exports=Object.assign!=null?Object.assign.bind(Object):function(s){for(var l=arguments.length,u=Array(l>1?l-1:0),h=1;h<l;h++)u[h-1]=arguments[h];return u.forEach(function(f){Object.keys(f).forEach(function(d){return s[d]=f[d]})}),s}},548:(a,s,l)=>{var u=function(){function d(p,m){var g=[],y=!0,v=!1,x=void 0;try{for(var b=p[Symbol.iterator](),w;!(y=(w=b.next()).done)&&(g.push(w.value),!(m&&g.length===m));y=!0);}catch(_){v=!0,x=_}finally{try{!y&&b.return&&b.return()}finally{if(v)throw x}}return g}return o(d,"sliceIterator"),function(p,m){if(Array.isArray(p))return p;if(Symbol.iterator in Object(p))return d(p,m);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),h=l(140).layoutBase.LinkedList,f={};f.getTopMostNodes=function(d){for(var p={},m=0;m<d.length;m++)p[d[m].id()]=!0;var g=d.filter(function(y,v){typeof y=="number"&&(y=v);for(var x=y.parent()[0];x!=null;){if(p[x.id()])return!1;x=x.parent()[0]}return!0});return g},f.connectComponents=function(d,p,m,g){var y=new h,v=new Set,x=[],b=void 0,w=void 0,_=void 0,T=!1,E=1,L=[],C=[],A=o(function(){var D=d.collection();C.push(D);var k=m[0],R=d.collection();R.merge(k).merge(k.descendants().intersection(p)),x.push(k),R.forEach(function(N){y.push(N),v.add(N),D.merge(N)});for(var S=o(function(){k=y.shift();var P=d.collection();k.neighborhood().nodes().forEach(function(z){p.intersection(k.edgesWith(z)).length>0&&P.merge(z)});for(var F=0;F<P.length;F++){var B=P[F];if(b=m.intersection(B.union(B.ancestors())),b!=null&&!v.has(b[0])){var $=b.union(b.descendants());$.forEach(function(z){y.push(z),v.add(z),D.merge(z),m.has(z)&&x.push(z)})}}},"_loop2");y.length!=0;)S();if(D.forEach(function(N){p.intersection(N.connectedEdges()).forEach(function(P){D.has(P.source())&&D.has(P.target())&&D.merge(P)})}),x.length==m.length&&(T=!0),!T||T&&E>1){w=x[0],_=w.connectedEdges().length,x.forEach(function(N){N.connectedEdges().length<_&&(_=N.connectedEdges().length,w=N)}),L.push(w.id());var O=d.collection();O.merge(x[0]),x.forEach(function(N){O.merge(N)}),x=[],m=m.difference(O),E++}},"_loop");do A();while(!T);return g&&L.length>0&&g.set("dummy"+(g.size+1),L),C},f.relocateComponent=function(d,p,m){if(!m.fixedNodeConstraint){var g=Number.POSITIVE_INFINITY,y=Number.NEGATIVE_INFINITY,v=Number.POSITIVE_INFINITY,x=Number.NEGATIVE_INFINITY;if(m.quality=="draft"){var b=!0,w=!1,_=void 0;try{for(var T=p.nodeIndexes[Symbol.iterator](),E;!(b=(E=T.next()).done);b=!0){var L=E.value,C=u(L,2),A=C[0],I=C[1],D=m.cy.getElementById(A);if(D){var k=D.boundingBox(),R=p.xCoords[I]-k.w/2,S=p.xCoords[I]+k.w/2,O=p.yCoords[I]-k.h/2,N=p.yCoords[I]+k.h/2;R<g&&(g=R),S>y&&(y=S),O<v&&(v=O),N>x&&(x=N)}}}catch(z){w=!0,_=z}finally{try{!b&&T.return&&T.return()}finally{if(w)throw _}}var P=d.x-(y+g)/2,F=d.y-(x+v)/2;p.xCoords=p.xCoords.map(function(z){return z+P}),p.yCoords=p.yCoords.map(function(z){return z+F})}else{Object.keys(p).forEach(function(z){var W=p[z],j=W.getRect().x,K=W.getRect().x+W.getRect().width,ie=W.getRect().y,Q=W.getRect().y+W.getRect().height;j<g&&(g=j),K>y&&(y=K),ie<v&&(v=ie),Q>x&&(x=Q)});var B=d.x-(y+g)/2,$=d.y-(x+v)/2;Object.keys(p).forEach(function(z){var W=p[z];W.setCenter(W.getCenterX()+B,W.getCenterY()+$)})}}},f.calcBoundingBox=function(d,p,m,g){for(var y=Number.MAX_SAFE_INTEGER,v=Number.MIN_SAFE_INTEGER,x=Number.MAX_SAFE_INTEGER,b=Number.MIN_SAFE_INTEGER,w=void 0,_=void 0,T=void 0,E=void 0,L=d.descendants().not(":parent"),C=L.length,A=0;A<C;A++){var I=L[A];w=p[g.get(I.id())]-I.width()/2,_=p[g.get(I.id())]+I.width()/2,T=m[g.get(I.id())]-I.height()/2,E=m[g.get(I.id())]+I.height()/2,y>w&&(y=w),v<_&&(v=_),x>T&&(x=T),b<E&&(b=E)}var D={};return D.topLeftX=y,D.topLeftY=x,D.width=v-y,D.height=b-x,D},f.calcParentsWithoutChildren=function(d,p){var m=d.collection();return p.nodes(":parent").forEach(function(g){var y=!1;g.children().forEach(function(v){v.css("display")!="none"&&(y=!0)}),y||m.merge(g)}),m},a.exports=f},816:(a,s,l)=>{var u=l(548),h=l(140).CoSELayout,f=l(140).CoSENode,d=l(140).layoutBase.PointD,p=l(140).layoutBase.DimensionD,m=l(140).layoutBase.LayoutConstants,g=l(140).layoutBase.FDLayoutConstants,y=l(140).CoSEConstants,v=o(function(b,w){var _=b.cy,T=b.eles,E=T.nodes(),L=T.edges(),C=void 0,A=void 0,I=void 0,D={};b.randomize&&(C=w.nodeIndexes,A=w.xCoords,I=w.yCoords);var k=o(function(z){return typeof z=="function"},"isFn"),R=o(function(z,W){return k(z)?z(W):z},"optFn"),S=u.calcParentsWithoutChildren(_,T),O=o(function $(z,W,j,K){for(var ie=W.length,Q=0;Q<ie;Q++){var ee=W[Q],J=null;ee.intersection(S).length==0&&(J=ee.children());var H=void 0,q=ee.layoutDimensions({nodeDimensionsIncludeLabels:K.nodeDimensionsIncludeLabels});if(ee.outerWidth()!=null&&ee.outerHeight()!=null)if(K.randomize)if(!ee.isParent())H=z.add(new f(j.graphManager,new d(A[C.get(ee.id())]-q.w/2,I[C.get(ee.id())]-q.h/2),new p(parseFloat(q.w),parseFloat(q.h))));else{var Z=u.calcBoundingBox(ee,A,I,C);ee.intersection(S).length==0?H=z.add(new f(j.graphManager,new d(Z.topLeftX,Z.topLeftY),new p(Z.width,Z.height))):H=z.add(new f(j.graphManager,new d(Z.topLeftX,Z.topLeftY),new p(parseFloat(q.w),parseFloat(q.h))))}else H=z.add(new f(j.graphManager,new d(ee.position("x")-q.w/2,ee.position("y")-q.h/2),new p(parseFloat(q.w),parseFloat(q.h))));else H=z.add(new f(this.graphManager));if(H.id=ee.data("id"),H.nodeRepulsion=R(K.nodeRepulsion,ee),H.paddingLeft=parseInt(ee.css("padding")),H.paddingTop=parseInt(ee.css("padding")),H.paddingRight=parseInt(ee.css("padding")),H.paddingBottom=parseInt(ee.css("padding")),K.nodeDimensionsIncludeLabels&&(H.labelWidth=ee.boundingBox({includeLabels:!0,includeNodes:!1,includeOverlays:!1}).w,H.labelHeight=ee.boundingBox({includeLabels:!0,includeNodes:!1,includeOverlays:!1}).h,H.labelPosVertical=ee.css("text-valign"),H.labelPosHorizontal=ee.css("text-halign")),D[ee.data("id")]=H,isNaN(H.rect.x)&&(H.rect.x=0),isNaN(H.rect.y)&&(H.rect.y=0),J!=null&&J.length>0){var ae=void 0;ae=j.getGraphManager().add(j.newGraph(),H),$(ae,J,j,K)}}},"processChildrenList"),N=o(function(z,W,j){for(var K=0,ie=0,Q=0;Q<j.length;Q++){var ee=j[Q],J=D[ee.data("source")],H=D[ee.data("target")];if(J&&H&&J!==H&&J.getEdgesBetween(H).length==0){var q=W.add(z.newEdge(),J,H);q.id=ee.id(),q.idealLength=R(b.idealEdgeLength,ee),q.edgeElasticity=R(b.edgeElasticity,ee),K+=q.idealLength,ie++}}b.idealEdgeLength!=null&&(ie>0?y.DEFAULT_EDGE_LENGTH=g.DEFAULT_EDGE_LENGTH=K/ie:k(b.idealEdgeLength)?y.DEFAULT_EDGE_LENGTH=g.DEFAULT_EDGE_LENGTH=50:y.DEFAULT_EDGE_LENGTH=g.DEFAULT_EDGE_LENGTH=b.idealEdgeLength,y.MIN_REPULSION_DIST=g.MIN_REPULSION_DIST=g.DEFAULT_EDGE_LENGTH/10,y.DEFAULT_RADIAL_SEPARATION=g.DEFAULT_EDGE_LENGTH)},"processEdges"),P=o(function(z,W){W.fixedNodeConstraint&&(z.constraints.fixedNodeConstraint=W.fixedNodeConstraint),W.alignmentConstraint&&(z.constraints.alignmentConstraint=W.alignmentConstraint),W.relativePlacementConstraint&&(z.constraints.relativePlacementConstraint=W.relativePlacementConstraint)},"processConstraints");b.nestingFactor!=null&&(y.PER_LEVEL_IDEAL_EDGE_LENGTH_FACTOR=g.PER_LEVEL_IDEAL_EDGE_LENGTH_FACTOR=b.nestingFactor),b.gravity!=null&&(y.DEFAULT_GRAVITY_STRENGTH=g.DEFAULT_GRAVITY_STRENGTH=b.gravity),b.numIter!=null&&(y.MAX_ITERATIONS=g.MAX_ITERATIONS=b.numIter),b.gravityRange!=null&&(y.DEFAULT_GRAVITY_RANGE_FACTOR=g.DEFAULT_GRAVITY_RANGE_FACTOR=b.gravityRange),b.gravityCompound!=null&&(y.DEFAULT_COMPOUND_GRAVITY_STRENGTH=g.DEFAULT_COMPOUND_GRAVITY_STRENGTH=b.gravityCompound),b.gravityRangeCompound!=null&&(y.DEFAULT_COMPOUND_GRAVITY_RANGE_FACTOR=g.DEFAULT_COMPOUND_GRAVITY_RANGE_FACTOR=b.gravityRangeCompound),b.initialEnergyOnIncremental!=null&&(y.DEFAULT_COOLING_FACTOR_INCREMENTAL=g.DEFAULT_COOLING_FACTOR_INCREMENTAL=b.initialEnergyOnIncremental),b.tilingCompareBy!=null&&(y.TILING_COMPARE_BY=b.tilingCompareBy),b.quality=="proof"?m.QUALITY=2:m.QUALITY=0,y.NODE_DIMENSIONS_INCLUDE_LABELS=g.NODE_DIMENSIONS_INCLUDE_LABELS=m.NODE_DIMENSIONS_INCLUDE_LABELS=b.nodeDimensionsIncludeLabels,y.DEFAULT_INCREMENTAL=g.DEFAULT_INCREMENTAL=m.DEFAULT_INCREMENTAL=!b.randomize,y.ANIMATE=g.ANIMATE=m.ANIMATE=b.animate,y.TILE=b.tile,y.TILING_PADDING_VERTICAL=typeof b.tilingPaddingVertical=="function"?b.tilingPaddingVertical.call():b.tilingPaddingVertical,y.TILING_PADDING_HORIZONTAL=typeof b.tilingPaddingHorizontal=="function"?b.tilingPaddingHorizontal.call():b.tilingPaddingHorizontal,y.DEFAULT_INCREMENTAL=g.DEFAULT_INCREMENTAL=m.DEFAULT_INCREMENTAL=!0,y.PURE_INCREMENTAL=!b.randomize,m.DEFAULT_UNIFORM_LEAF_NODE_SIZES=b.uniformNodeDimensions,b.step=="transformed"&&(y.TRANSFORM_ON_CONSTRAINT_HANDLING=!0,y.ENFORCE_CONSTRAINTS=!1,y.APPLY_LAYOUT=!1),b.step=="enforced"&&(y.TRANSFORM_ON_CONSTRAINT_HANDLING=!1,y.ENFORCE_CONSTRAINTS=!0,y.APPLY_LAYOUT=!1),b.step=="cose"&&(y.TRANSFORM_ON_CONSTRAINT_HANDLING=!1,y.ENFORCE_CONSTRAINTS=!1,y.APPLY_LAYOUT=!0),b.step=="all"&&(b.randomize?y.TRANSFORM_ON_CONSTRAINT_HANDLING=!0:y.TRANSFORM_ON_CONSTRAINT_HANDLING=!1,y.ENFORCE_CONSTRAINTS=!0,y.APPLY_LAYOUT=!0),b.fixedNodeConstraint||b.alignmentConstraint||b.relativePlacementConstraint?y.TREE_REDUCTION_ON_INCREMENTAL=!1:y.TREE_REDUCTION_ON_INCREMENTAL=!0;var F=new h,B=F.newGraphManager();return O(B.addRoot(),u.getTopMostNodes(E),F,b),N(F,B,L),P(F,b),F.runLayout(),D},"coseLayout");a.exports={coseLayout:v}},212:(a,s,l)=>{var u=function(){function b(w,_){for(var T=0;T<_.length;T++){var E=_[T];E.enumerable=E.enumerable||!1,E.configurable=!0,"value"in E&&(E.writable=!0),Object.defineProperty(w,E.key,E)}}return o(b,"defineProperties"),function(w,_,T){return _&&b(w.prototype,_),T&&b(w,T),w}}();function h(b,w){if(!(b instanceof w))throw new TypeError("Cannot call a class as a function")}o(h,"_classCallCheck");var f=l(658),d=l(548),p=l(657),m=p.spectralLayout,g=l(816),y=g.coseLayout,v=Object.freeze({quality:"default",randomize:!0,animate:!0,animationDuration:1e3,animationEasing:void 0,fit:!0,padding:30,nodeDimensionsIncludeLabels:!1,uniformNodeDimensions:!1,packComponents:!0,step:"all",samplingType:!0,sampleSize:25,nodeSeparation:75,piTol:1e-7,nodeRepulsion:o(function(w){return 4500},"nodeRepulsion"),idealEdgeLength:o(function(w){return 50},"idealEdgeLength"),edgeElasticity:o(function(w){return .45},"edgeElasticity"),nestingFactor:.1,gravity:.25,numIter:2500,tile:!0,tilingCompareBy:void 0,tilingPaddingVertical:10,tilingPaddingHorizontal:10,gravityRangeCompound:1.5,gravityCompound:1,gravityRange:3.8,initialEnergyOnIncremental:.3,fixedNodeConstraint:void 0,alignmentConstraint:void 0,relativePlacementConstraint:void 0,ready:o(function(){},"ready"),stop:o(function(){},"stop")}),x=function(){function b(w){h(this,b),this.options=f({},v,w)}return o(b,"Layout"),u(b,[{key:"run",value:o(function(){var _=this,T=this.options,E=T.cy,L=T.eles,C=[],A=void 0,I=void 0,D=[],k=void 0,R=[];T.fixedNodeConstraint&&(!Array.isArray(T.fixedNodeConstraint)||T.fixedNodeConstraint.length==0)&&(T.fixedNodeConstraint=void 0),T.alignmentConstraint&&(T.alignmentConstraint.vertical&&(!Array.isArray(T.alignmentConstraint.vertical)||T.alignmentConstraint.vertical.length==0)&&(T.alignmentConstraint.vertical=void 0),T.alignmentConstraint.horizontal&&(!Array.isArray(T.alignmentConstraint.horizontal)||T.alignmentConstraint.horizontal.length==0)&&(T.alignmentConstraint.horizontal=void 0)),T.relativePlacementConstraint&&(!Array.isArray(T.relativePlacementConstraint)||T.relativePlacementConstraint.length==0)&&(T.relativePlacementConstraint=void 0);var S=T.fixedNodeConstraint||T.alignmentConstraint||T.relativePlacementConstraint;S&&(T.tile=!1,T.packComponents=!1);var O=void 0,N=!1;if(E.layoutUtilities&&T.packComponents&&(O=E.layoutUtilities("get"),O||(O=E.layoutUtilities()),N=!0),L.nodes().length>0)if(N){var B=d.getTopMostNodes(T.eles.nodes());if(k=d.connectComponents(E,T.eles,B),k.forEach(function(oe){var ke=oe.boundingBox();R.push({x:ke.x1+ke.w/2,y:ke.y1+ke.h/2})}),T.randomize&&k.forEach(function(oe){T.eles=oe,C.push(m(T))}),T.quality=="default"||T.quality=="proof"){var $=E.collection();if(T.tile){var z=new Map,W=[],j=[],K=0,ie={nodeIndexes:z,xCoords:W,yCoords:j},Q=[];if(k.forEach(function(oe,ke){oe.edges().length==0&&(oe.nodes().forEach(function(Fe,Be){$.merge(oe.nodes()[Be]),Fe.isParent()||(ie.nodeIndexes.set(oe.nodes()[Be].id(),K++),ie.xCoords.push(oe.nodes()[0].position().x),ie.yCoords.push(oe.nodes()[0].position().y))}),Q.push(ke))}),$.length>1){var ee=$.boundingBox();R.push({x:ee.x1+ee.w/2,y:ee.y1+ee.h/2}),k.push($),C.push(ie);for(var J=Q.length-1;J>=0;J--)k.splice(Q[J],1),C.splice(Q[J],1),R.splice(Q[J],1)}}k.forEach(function(oe,ke){T.eles=oe,D.push(y(T,C[ke])),d.relocateComponent(R[ke],D[ke],T)})}else k.forEach(function(oe,ke){d.relocateComponent(R[ke],C[ke],T)});var H=new Set;if(k.length>1){var q=[],Z=L.filter(function(oe){return oe.css("display")=="none"});k.forEach(function(oe,ke){var Fe=void 0;if(T.quality=="draft"&&(Fe=C[ke].nodeIndexes),oe.nodes().not(Z).length>0){var Be={};Be.edges=[],Be.nodes=[];var Ve=void 0;oe.nodes().not(Z).forEach(function(Ge){if(T.quality=="draft")if(!Ge.isParent())Ve=Fe.get(Ge.id()),Be.nodes.push({x:C[ke].xCoords[Ve]-Ge.boundingbox().w/2,y:C[ke].yCoords[Ve]-Ge.boundingbox().h/2,width:Ge.boundingbox().w,height:Ge.boundingbox().h});else{var He=d.calcBoundingBox(Ge,C[ke].xCoords,C[ke].yCoords,Fe);Be.nodes.push({x:He.topLeftX,y:He.topLeftY,width:He.width,height:He.height})}else D[ke][Ge.id()]&&Be.nodes.push({x:D[ke][Ge.id()].getLeft(),y:D[ke][Ge.id()].getTop(),width:D[ke][Ge.id()].getWidth(),height:D[ke][Ge.id()].getHeight()})}),oe.edges().forEach(function(Ge){var He=Ge.source(),xe=Ge.target();if(He.css("display")!="none"&&xe.css("display")!="none")if(T.quality=="draft"){var X=Fe.get(He.id()),fe=Fe.get(xe.id()),he=[],ge=[];if(He.isParent()){var ne=d.calcBoundingBox(He,C[ke].xCoords,C[ke].yCoords,Fe);he.push(ne.topLeftX+ne.width/2),he.push(ne.topLeftY+ne.height/2)}else he.push(C[ke].xCoords[X]),he.push(C[ke].yCoords[X]);if(xe.isParent()){var ye=d.calcBoundingBox(xe,C[ke].xCoords,C[ke].yCoords,Fe);ge.push(ye.topLeftX+ye.width/2),ge.push(ye.topLeftY+ye.height/2)}else ge.push(C[ke].xCoords[fe]),ge.push(C[ke].yCoords[fe]);Be.edges.push({startX:he[0],startY:he[1],endX:ge[0],endY:ge[1]})}else D[ke][He.id()]&&D[ke][xe.id()]&&Be.edges.push({startX:D[ke][He.id()].getCenterX(),startY:D[ke][He.id()].getCenterY(),endX:D[ke][xe.id()].getCenterX(),endY:D[ke][xe.id()].getCenterY()})}),Be.nodes.length>0&&(q.push(Be),H.add(ke))}});var ae=O.packComponents(q,T.randomize).shifts;if(T.quality=="draft")C.forEach(function(oe,ke){var Fe=oe.xCoords.map(function(Ve){return Ve+ae[ke].dx}),Be=oe.yCoords.map(function(Ve){return Ve+ae[ke].dy});oe.xCoords=Fe,oe.yCoords=Be});else{var ue=0;H.forEach(function(oe){Object.keys(D[oe]).forEach(function(ke){var Fe=D[oe][ke];Fe.setCenter(Fe.getCenterX()+ae[ue].dx,Fe.getCenterY()+ae[ue].dy)}),ue++})}}}else{var P=T.eles.boundingBox();if(R.push({x:P.x1+P.w/2,y:P.y1+P.h/2}),T.randomize){var F=m(T);C.push(F)}T.quality=="default"||T.quality=="proof"?(D.push(y(T,C[0])),d.relocateComponent(R[0],D[0],T)):d.relocateComponent(R[0],C[0],T)}var ce=o(function(ke,Fe){if(T.quality=="default"||T.quality=="proof"){typeof ke=="number"&&(ke=Fe);var Be=void 0,Ve=void 0,Ge=ke.data("id");return D.forEach(function(xe){Ge in xe&&(Be={x:xe[Ge].getRect().getCenterX(),y:xe[Ge].getRect().getCenterY()},Ve=xe[Ge])}),T.nodeDimensionsIncludeLabels&&(Ve.labelWidth&&(Ve.labelPosHorizontal=="left"?Be.x+=Ve.labelWidth/2:Ve.labelPosHorizontal=="right"&&(Be.x-=Ve.labelWidth/2)),Ve.labelHeight&&(Ve.labelPosVertical=="top"?Be.y+=Ve.labelHeight/2:Ve.labelPosVertical=="bottom"&&(Be.y-=Ve.labelHeight/2))),Be==null&&(Be={x:ke.position("x"),y:ke.position("y")}),{x:Be.x,y:Be.y}}else{var He=void 0;return C.forEach(function(xe){var X=xe.nodeIndexes.get(ke.id());X!=null&&(He={x:xe.xCoords[X],y:xe.yCoords[X]})}),He==null&&(He={x:ke.position("x"),y:ke.position("y")}),{x:He.x,y:He.y}}},"getPositions");if(T.quality=="default"||T.quality=="proof"||T.randomize){var te=d.calcParentsWithoutChildren(E,L),De=L.filter(function(oe){return oe.css("display")=="none"});T.eles=L.not(De),L.nodes().not(":parent").not(De).layoutPositions(_,T,ce),te.length>0&&te.forEach(function(oe){oe.position(ce(oe))})}else console.log("If randomize option is set to false, then quality option must be 'default' or 'proof'.")},"run")}]),b}();a.exports=x},657:(a,s,l)=>{var u=l(548),h=l(140).layoutBase.Matrix,f=l(140).layoutBase.SVD,d=o(function(m){var g=m.cy,y=m.eles,v=y.nodes(),x=y.nodes(":parent"),b=new Map,w=new Map,_=new Map,T=[],E=[],L=[],C=[],A=[],I=[],D=[],k=[],R=void 0,S=void 0,O=1e8,N=1e-9,P=m.piTol,F=m.samplingType,B=m.nodeSeparation,$=void 0,z=o(function(){for(var Te=0,se=0,Ee=!1;se<$;){Te=Math.floor(Math.random()*S),Ee=!1;for(var Ae=0;Ae<se;Ae++)if(C[Ae]==Te){Ee=!0;break}if(!Ee)C[se]=Te,se++;else continue}},"randomSampleCR"),W=o(function(Te,se,Ee){for(var Ae=[],Pe=0,Me=0,me=0,We=void 0,Re=[],tt=0,gt=1,Et=0;Et<S;Et++)Re[Et]=O;for(Ae[Me]=Te,Re[Te]=0;Me>=Pe;){me=Ae[Pe++];for(var vt=T[me],Ye=0;Ye<vt.length;Ye++)We=w.get(vt[Ye]),Re[We]==O&&(Re[We]=Re[me]+1,Ae[++Me]=We);I[me][se]=Re[me]*B}if(Ee){for(var Tt=0;Tt<S;Tt++)I[Tt][se]<A[Tt]&&(A[Tt]=I[Tt][se]);for(var $e=0;$e<S;$e++)A[$e]>tt&&(tt=A[$e],gt=$e)}return gt},"BFS"),j=o(function(Te){var se=void 0;if(Te){se=Math.floor(Math.random()*S),R=se;for(var Ae=0;Ae<S;Ae++)A[Ae]=O;for(var Pe=0;Pe<$;Pe++)C[Pe]=se,se=W(se,Pe,Te)}else{z();for(var Ee=0;Ee<$;Ee++)W(C[Ee],Ee,Te,!1)}for(var Me=0;Me<S;Me++)for(var me=0;me<$;me++)I[Me][me]*=I[Me][me];for(var We=0;We<$;We++)D[We]=[];for(var Re=0;Re<$;Re++)for(var tt=0;tt<$;tt++)D[Re][tt]=I[C[tt]][Re]},"allBFS"),K=o(function(){for(var Te=f.svd(D),se=Te.S,Ee=Te.U,Ae=Te.V,Pe=se[0]*se[0]*se[0],Me=[],me=0;me<$;me++){Me[me]=[];for(var We=0;We<$;We++)Me[me][We]=0,me==We&&(Me[me][We]=se[me]/(se[me]*se[me]+Pe/(se[me]*se[me])))}k=h.multMat(h.multMat(Ae,Me),h.transpose(Ee))},"sample"),ie=o(function(){for(var Te=void 0,se=void 0,Ee=[],Ae=[],Pe=[],Me=[],me=0;me<S;me++)Ee[me]=Math.random(),Ae[me]=Math.random();Ee=h.normalize(Ee),Ae=h.normalize(Ae);for(var We=0,Re=N,tt=N,gt=void 0;;){We++;for(var Et=0;Et<S;Et++)Pe[Et]=Ee[Et];if(Ee=h.multGamma(h.multL(h.multGamma(Pe),I,k)),Te=h.dotProduct(Pe,Ee),Ee=h.normalize(Ee),Re=h.dotProduct(Pe,Ee),gt=Math.abs(Re/tt),gt<=1+P&>>=1)break;tt=Re}for(var vt=0;vt<S;vt++)Pe[vt]=Ee[vt];for(We=0,tt=N;;){We++;for(var Ye=0;Ye<S;Ye++)Me[Ye]=Ae[Ye];if(Me=h.minusOp(Me,h.multCons(Pe,h.dotProduct(Pe,Me))),Ae=h.multGamma(h.multL(h.multGamma(Me),I,k)),se=h.dotProduct(Me,Ae),Ae=h.normalize(Ae),Re=h.dotProduct(Me,Ae),gt=Math.abs(Re/tt),gt<=1+P&>>=1)break;tt=Re}for(var Tt=0;Tt<S;Tt++)Me[Tt]=Ae[Tt];E=h.multCons(Pe,Math.sqrt(Math.abs(Te))),L=h.multCons(Me,Math.sqrt(Math.abs(se)))},"powerIteration");u.connectComponents(g,y,u.getTopMostNodes(v),b),x.forEach(function(U){u.connectComponents(g,y,u.getTopMostNodes(U.descendants().intersection(y)),b)});for(var Q=0,ee=0;ee<v.length;ee++)v[ee].isParent()||w.set(v[ee].id(),Q++);var J=!0,H=!1,q=void 0;try{for(var Z=b.keys()[Symbol.iterator](),ae;!(J=(ae=Z.next()).done);J=!0){var ue=ae.value;w.set(ue,Q++)}}catch(U){H=!0,q=U}finally{try{!J&&Z.return&&Z.return()}finally{if(H)throw q}}for(var ce=0;ce<w.size;ce++)T[ce]=[];x.forEach(function(U){for(var Te=U.children().intersection(y);Te.nodes(":childless").length==0;)Te=Te.nodes()[0].children().intersection(y);var se=0,Ee=Te.nodes(":childless")[0].connectedEdges().length;Te.nodes(":childless").forEach(function(Ae,Pe){Ae.connectedEdges().length<Ee&&(Ee=Ae.connectedEdges().length,se=Pe)}),_.set(U.id(),Te.nodes(":childless")[se].id())}),v.forEach(function(U){var Te=void 0;U.isParent()?Te=w.get(_.get(U.id())):Te=w.get(U.id()),U.neighborhood().nodes().forEach(function(se){y.intersection(U.edgesWith(se)).length>0&&(se.isParent()?T[Te].push(_.get(se.id())):T[Te].push(se.id()))})});var te=o(function(Te){var se=w.get(Te),Ee=void 0;b.get(Te).forEach(function(Ae){g.getElementById(Ae).isParent()?Ee=_.get(Ae):Ee=Ae,T[se].push(Ee),T[w.get(Ee)].push(Te)})},"_loop"),De=!0,oe=!1,ke=void 0;try{for(var Fe=b.keys()[Symbol.iterator](),Be;!(De=(Be=Fe.next()).done);De=!0){var Ve=Be.value;te(Ve)}}catch(U){oe=!0,ke=U}finally{try{!De&&Fe.return&&Fe.return()}finally{if(oe)throw ke}}S=w.size;var Ge=void 0;if(S>2){$=S<m.sampleSize?S:m.sampleSize;for(var He=0;He<S;He++)I[He]=[];for(var xe=0;xe<$;xe++)k[xe]=[];return m.quality=="draft"||m.step=="all"?(j(F),K(),ie(),Ge={nodeIndexes:w,xCoords:E,yCoords:L}):(w.forEach(function(U,Te){E.push(g.getElementById(Te).position("x")),L.push(g.getElementById(Te).position("y"))}),Ge={nodeIndexes:w,xCoords:E,yCoords:L}),Ge}else{var X=w.keys(),fe=g.getElementById(X.next().value),he=fe.position(),ge=fe.outerWidth();if(E.push(he.x),L.push(he.y),S==2){var ne=g.getElementById(X.next().value),ye=ne.outerWidth();E.push(he.x+ge/2+ye/2+m.idealEdgeLength),L.push(he.y)}return Ge={nodeIndexes:w,xCoords:E,yCoords:L},Ge}},"spectralLayout");a.exports={spectralLayout:d}},579:(a,s,l)=>{var u=l(212),h=o(function(d){d&&d("layout","fcose",u)},"register");typeof cytoscape<"u"&&h(cytoscape),a.exports=h},140:a=>{a.exports=t}},r={};function n(a){var s=r[a];if(s!==void 0)return s.exports;var l=r[a]={exports:{}};return e[a](l,l.exports,n),l.exports}o(n,"__webpack_require__");var i=n(579);return i})()})});var S1,j0,mF=M(()=>{"use strict";Kc();S1=o(t=>`<g><rect width="80" height="80" style="fill: #087ebf; stroke-width: 0px;"/>${t}</g>`,"wrapIcon"),j0={prefix:"mermaid-architecture",height:80,width:80,icons:{database:{body:S1('<path id="b" data-name="4" d="m20,57.86c0,3.94,8.95,7.14,20,7.14s20-3.2,20-7.14" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><path id="c" data-name="3" d="m20,45.95c0,3.94,8.95,7.14,20,7.14s20-3.2,20-7.14" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><path id="d" data-name="2" d="m20,34.05c0,3.94,8.95,7.14,20,7.14s20-3.2,20-7.14" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><ellipse id="e" data-name="1" cx="40" cy="22.14" rx="20" ry="7.14" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><line x1="20" y1="57.86" x2="20" y2="22.14" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><line x1="60" y1="57.86" x2="60" y2="22.14" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/>')},server:{body:S1('<rect x="17.5" y="17.5" width="45" height="45" rx="2" ry="2" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><line x1="17.5" y1="32.5" x2="62.5" y2="32.5" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><line x1="17.5" y1="47.5" x2="62.5" y2="47.5" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><g><path d="m56.25,25c0,.27-.45.5-1,.5h-10.5c-.55,0-1-.23-1-.5s.45-.5,1-.5h10.5c.55,0,1,.23,1,.5Z" style="fill: #fff; stroke-width: 0px;"/><path d="m56.25,25c0,.27-.45.5-1,.5h-10.5c-.55,0-1-.23-1-.5s.45-.5,1-.5h10.5c.55,0,1,.23,1,.5Z" style="fill: none; stroke: #fff; stroke-miterlimit: 10;"/></g><g><path d="m56.25,40c0,.27-.45.5-1,.5h-10.5c-.55,0-1-.23-1-.5s.45-.5,1-.5h10.5c.55,0,1,.23,1,.5Z" style="fill: #fff; stroke-width: 0px;"/><path d="m56.25,40c0,.27-.45.5-1,.5h-10.5c-.55,0-1-.23-1-.5s.45-.5,1-.5h10.5c.55,0,1,.23,1,.5Z" style="fill: none; stroke: #fff; stroke-miterlimit: 10;"/></g><g><path d="m56.25,55c0,.27-.45.5-1,.5h-10.5c-.55,0-1-.23-1-.5s.45-.5,1-.5h10.5c.55,0,1,.23,1,.5Z" style="fill: #fff; stroke-width: 0px;"/><path d="m56.25,55c0,.27-.45.5-1,.5h-10.5c-.55,0-1-.23-1-.5s.45-.5,1-.5h10.5c.55,0,1,.23,1,.5Z" style="fill: none; stroke: #fff; stroke-miterlimit: 10;"/></g><g><circle cx="32.5" cy="25" r=".75" style="fill: #fff; stroke: #fff; stroke-miterlimit: 10;"/><circle cx="27.5" cy="25" r=".75" style="fill: #fff; stroke: #fff; stroke-miterlimit: 10;"/><circle cx="22.5" cy="25" r=".75" style="fill: #fff; stroke: #fff; stroke-miterlimit: 10;"/></g><g><circle cx="32.5" cy="40" r=".75" style="fill: #fff; stroke: #fff; stroke-miterlimit: 10;"/><circle cx="27.5" cy="40" r=".75" style="fill: #fff; stroke: #fff; stroke-miterlimit: 10;"/><circle cx="22.5" cy="40" r=".75" style="fill: #fff; stroke: #fff; stroke-miterlimit: 10;"/></g><g><circle cx="32.5" cy="55" r=".75" style="fill: #fff; stroke: #fff; stroke-miterlimit: 10;"/><circle cx="27.5" cy="55" r=".75" style="fill: #fff; stroke: #fff; stroke-miterlimit: 10;"/><circle cx="22.5" cy="55" r=".75" style="fill: #fff; stroke: #fff; stroke-miterlimit: 10;"/></g>')},disk:{body:S1('<rect x="20" y="15" width="40" height="50" rx="1" ry="1" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><ellipse cx="24" cy="19.17" rx=".8" ry=".83" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><ellipse cx="56" cy="19.17" rx=".8" ry=".83" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><ellipse cx="24" cy="60.83" rx=".8" ry=".83" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><ellipse cx="56" cy="60.83" rx=".8" ry=".83" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><ellipse cx="40" cy="33.75" rx="14" ry="14.58" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><ellipse cx="40" cy="33.75" rx="4" ry="4.17" style="fill: #fff; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><path d="m37.51,42.52l-4.83,13.22c-.26.71-1.1,1.02-1.76.64l-4.18-2.42c-.66-.38-.81-1.26-.33-1.84l9.01-10.8c.88-1.05,2.56-.08,2.09,1.2Z" style="fill: #fff; stroke-width: 0px;"/>')},internet:{body:S1('<circle cx="40" cy="40" r="22.5" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><line x1="40" y1="17.5" x2="40" y2="62.5" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><line x1="17.5" y1="40" x2="62.5" y2="40" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><path d="m39.99,17.51c-15.28,11.1-15.28,33.88,0,44.98" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><path d="m40.01,17.51c15.28,11.1,15.28,33.88,0,44.98" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><line x1="19.75" y1="30.1" x2="60.25" y2="30.1" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/><line x1="19.75" y1="49.9" x2="60.25" y2="49.9" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/>')},cloud:{body:S1('<path d="m65,47.5c0,2.76-2.24,5-5,5H20c-2.76,0-5-2.24-5-5,0-1.87,1.03-3.51,2.56-4.36-.04-.21-.06-.42-.06-.64,0-2.6,2.48-4.74,5.65-4.97,1.65-4.51,6.34-7.76,11.85-7.76.86,0,1.69.08,2.5.23,2.09-1.57,4.69-2.5,7.5-2.5,6.1,0,11.19,4.38,12.28,10.17,2.14.56,3.72,2.51,3.72,4.83,0,.03,0,.07-.01.1,2.29.46,4.01,2.48,4.01,4.9Z" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 2px;"/>')},unknown:RS,blank:{body:S1("")}}}});var u2e,h2e,f2e,d2e,p2e=M(()=>{"use strict";Kc();Vt();Dl();yb();mF();iS();u2e=o(async function(t,e){let r=Li("padding"),n=Li("iconSize"),i=n/2,a=n/6,s=a/2;await Promise.all(e.edges().map(async l=>{let{source:u,sourceDir:h,sourceArrow:f,sourceGroup:d,target:p,targetDir:m,targetArrow:g,targetGroup:y,label:v}=nS(l),{x,y:b}=l[0].sourceEndpoint(),{x:w,y:_}=l[0].midpoint(),{x:T,y:E}=l[0].targetEndpoint(),L=r+4;if(d&&(us(h)?x+=h==="L"?-L:L:b+=h==="T"?-L:L+18),y&&(us(m)?T+=m==="L"?-L:L:E+=m==="T"?-L:L+18),!d&&X0.getNode(u)?.type==="junction"&&(us(h)?x+=h==="L"?i:-i:b+=h==="T"?i:-i),!y&&X0.getNode(p)?.type==="junction"&&(us(m)?T+=m==="L"?i:-i:E+=m==="T"?i:-i),l[0]._private.rscratch){let C=t.insert("g");if(C.insert("path").attr("d",`M ${x},${b} L ${w},${_} L${T},${E} `).attr("class","edge"),f){let A=us(h)?mb[h](x,a):x-s,I=qc(h)?mb[h](b,a):b-s;C.insert("polygon").attr("points",lF[h](a)).attr("transform",`translate(${A},${I})`).attr("class","arrow")}if(g){let A=us(m)?mb[m](T,a):T-s,I=qc(m)?mb[m](E,a):E-s;C.insert("polygon").attr("points",lF[m](a)).attr("transform",`translate(${A},${I})`).attr("class","arrow")}if(v){let A=rS(h,m)?"XY":us(h)?"X":"Y",I=0;A==="X"?I=Math.abs(x-T):A==="Y"?I=Math.abs(b-E)/1.5:I=Math.abs(x-T)/2;let D=C.append("g");if(await Si(D,v,{useHtmlLabels:!1,width:I,classes:"architecture-service-label"},de()),D.attr("dy","1em").attr("alignment-baseline","middle").attr("dominant-baseline","middle").attr("text-anchor","middle"),A==="X")D.attr("transform","translate("+w+", "+_+")");else if(A==="Y")D.attr("transform","translate("+w+", "+_+") rotate(-90)");else if(A==="XY"){let k=gb(h,m);if(k&&Jve(k)){let R=D.node().getBoundingClientRect(),[S,O]=t2e(k);D.attr("dominant-baseline","auto").attr("transform",`rotate(${-1*S*O*45})`);let N=D.node().getBoundingClientRect();D.attr("transform",` + translate(${w}, ${_-R.height/2}) + translate(${S*N.width/2}, ${O*N.height/2}) + rotate(${-1*S*O*45}, 0, ${R.height/2}) + `)}}}}}))},"drawEdges"),h2e=o(async function(t,e){let n=Li("padding")*.75,i=Li("fontSize"),s=Li("iconSize")/2;await Promise.all(e.nodes().map(async l=>{let u=Mf(l);if(u.type==="group"){let{h,w:f,x1:d,y1:p}=l.boundingBox();t.append("rect").attr("x",d+s).attr("y",p+s).attr("width",f).attr("height",h).attr("class","node-bkg");let m=t.append("g"),g=d,y=p;if(u.icon){let v=m.append("g");v.html(`<g>${await wo(u.icon,{height:n,width:n,fallbackPrefix:j0.prefix})}</g>`),v.attr("transform","translate("+(g+s+1)+", "+(y+s+1)+")"),g+=n,y+=i/2-1-2}if(u.label){let v=m.append("g");await Si(v,u.label,{useHtmlLabels:!1,width:f,classes:"architecture-service-label"},de()),v.attr("dy","1em").attr("alignment-baseline","middle").attr("dominant-baseline","start").attr("text-anchor","start"),v.attr("transform","translate("+(g+s+4)+", "+(y+s+2)+")")}}}))},"drawGroups"),f2e=o(async function(t,e,r){for(let n of r){let i=e.append("g"),a=Li("iconSize");if(n.title){let h=i.append("g");await Si(h,n.title,{useHtmlLabels:!1,width:a*1.5,classes:"architecture-service-label"},de()),h.attr("dy","1em").attr("alignment-baseline","middle").attr("dominant-baseline","middle").attr("text-anchor","middle"),h.attr("transform","translate("+a/2+", "+a+")")}let s=i.append("g");if(n.icon)s.html(`<g>${await wo(n.icon,{height:a,width:a,fallbackPrefix:j0.prefix})}</g>`);else if(n.iconText){s.html(`<g>${await wo("blank",{height:a,width:a,fallbackPrefix:j0.prefix})}</g>`);let d=s.append("g").append("foreignObject").attr("width",a).attr("height",a).append("div").attr("class","node-icon-text").attr("style",`height: ${a}px;`).append("div").html(n.iconText),p=parseInt(window.getComputedStyle(d.node(),null).getPropertyValue("font-size").replace(/\D/g,""))??16;d.attr("style",`-webkit-line-clamp: ${Math.floor((a-2)/p)};`)}else s.append("path").attr("class","node-bkg").attr("id","node-"+n.id).attr("d",`M0 ${a} v${-a} q0,-5 5,-5 h${a} q5,0 5,5 v${a} H0 Z`);i.attr("class","architecture-service");let{width:l,height:u}=i._groups[0][0].getBBox();n.width=l,n.height=u,t.setElementForId(n.id,i)}return 0},"drawServices"),d2e=o(function(t,e,r){r.forEach(n=>{let i=e.append("g"),a=Li("iconSize");i.append("g").append("rect").attr("id","node-"+n.id).attr("fill-opacity","0").attr("width",a).attr("height",a),i.attr("class","architecture-junction");let{width:l,height:u}=i._groups[0][0].getBBox();i.width=l,i.height=u,t.setElementForId(n.id,i)})},"drawJunctions")});function Lit(t,e){t.forEach(r=>{e.add({group:"nodes",data:{type:"service",id:r.id,icon:r.icon,label:r.title,parent:r.in,width:Li("iconSize"),height:Li("iconSize")},classes:"node-service"})})}function Dit(t,e){t.forEach(r=>{e.add({group:"nodes",data:{type:"junction",id:r.id,parent:r.in,width:Li("iconSize"),height:Li("iconSize")},classes:"node-junction"})})}function Nit(t,e){e.nodes().map(r=>{let n=Mf(r);if(n.type==="group")return;n.x=r.position().x,n.y=r.position().y,t.getElementById(n.id).attr("transform","translate("+(n.x||0)+","+(n.y||0)+")")})}function Rit(t,e){t.forEach(r=>{e.add({group:"nodes",data:{type:"group",id:r.id,icon:r.icon,label:r.title,parent:r.in},classes:"node-group"})})}function Mit(t,e){t.forEach(r=>{let{lhsId:n,rhsId:i,lhsInto:a,lhsGroup:s,rhsInto:l,lhsDir:u,rhsDir:h,rhsGroup:f,title:d}=r,p=rS(r.lhsDir,r.rhsDir)?"segments":"straight",m={id:`${n}-${i}`,label:d,source:n,sourceDir:u,sourceArrow:a,sourceGroup:s,sourceEndpoint:u==="L"?"0 50%":u==="R"?"100% 50%":u==="T"?"50% 0":"50% 100%",target:i,targetDir:h,targetArrow:l,targetGroup:f,targetEndpoint:h==="L"?"0 50%":h==="R"?"100% 50%":h==="T"?"50% 0":"50% 100%"};e.add({group:"edges",data:m,classes:p})})}function Iit(t){let e=t.map(i=>{let a={},s={};return Object.entries(i).forEach(([l,[u,h]])=>{a[h]||(a[h]=[]),s[u]||(s[u]=[]),a[h].push(l),s[u].push(l)}),{horiz:Object.values(a).filter(l=>l.length>1),vert:Object.values(s).filter(l=>l.length>1)}}),[r,n]=e.reduce(([i,a],{horiz:s,vert:l})=>[[...i,...s],[...a,...l]],[[],[]]);return{horizontal:r,vertical:n}}function Oit(t){let e=[],r=o(i=>`${i[0]},${i[1]}`,"posToStr"),n=o(i=>i.split(",").map(a=>parseInt(a)),"strToPos");return t.forEach(i=>{let a=Object.fromEntries(Object.entries(i).map(([h,f])=>[r(f),h])),s=[r([0,0])],l={},u={L:[-1,0],R:[1,0],T:[0,1],B:[0,-1]};for(;s.length>0;){let h=s.shift();if(h){l[h]=1;let f=a[h];if(f){let d=n(h);Object.entries(u).forEach(([p,m])=>{let g=r([d[0]+m[0],d[1]+m[1]]),y=a[g];y&&!l[g]&&(s.push(g),e.push({[oF[p]]:y,[oF[Zve(p)]]:f,gap:1.5*Li("iconSize")}))})}}}}),e}function Pit(t,e,r,n,{spatialMaps:i}){return new Promise(a=>{let s=ze("body").append("div").attr("id","cy").attr("style","display:none"),l=sl({container:document.getElementById("cy"),style:[{selector:"edge",style:{"curve-style":"straight",label:"data(label)","source-endpoint":"data(sourceEndpoint)","target-endpoint":"data(targetEndpoint)"}},{selector:"edge.segments",style:{"curve-style":"segments","segment-weights":"0","segment-distances":[.5],"edge-distances":"endpoints","source-endpoint":"data(sourceEndpoint)","target-endpoint":"data(targetEndpoint)"}},{selector:"node",style:{"compound-sizing-wrt-labels":"include"}},{selector:"node[label]",style:{"text-valign":"bottom","text-halign":"center","font-size":`${Li("fontSize")}px`}},{selector:".node-service",style:{label:"data(label)",width:"data(width)",height:"data(height)"}},{selector:".node-junction",style:{width:"data(width)",height:"data(height)"}},{selector:".node-group",style:{padding:`${Li("padding")}px`}}]});s.remove(),Rit(r,l),Lit(t,l),Dit(e,l),Mit(n,l);let u=Iit(i),h=Oit(i),f=l.layout({name:"fcose",quality:"proof",styleEnabled:!1,animate:!1,nodeDimensionsIncludeLabels:!1,idealEdgeLength(d){let[p,m]=d.connectedNodes(),{parent:g}=Mf(p),{parent:y}=Mf(m);return g===y?1.5*Li("iconSize"):.5*Li("iconSize")},edgeElasticity(d){let[p,m]=d.connectedNodes(),{parent:g}=Mf(p),{parent:y}=Mf(m);return g===y?.45:.001},alignmentConstraint:u,relativePlacementConstraint:h});f.one("layoutstop",()=>{function d(p,m,g,y){let v,x,{x:b,y:w}=p,{x:_,y:T}=m;x=(y-w+(b-g)*(w-T)/(b-_))/Math.sqrt(1+Math.pow((w-T)/(b-_),2)),v=Math.sqrt(Math.pow(y-w,2)+Math.pow(g-b,2)-Math.pow(x,2));let E=Math.sqrt(Math.pow(_-b,2)+Math.pow(T-w,2));v=v/E;let L=(_-b)*(y-w)-(T-w)*(g-b);switch(!0){case L>=0:L=1;break;case L<0:L=-1;break}let C=(_-b)*(g-b)+(T-w)*(y-w);switch(!0){case C>=0:C=1;break;case C<0:C=-1;break}return x=Math.abs(x)*L,v=v*C,{distances:x,weights:v}}o(d,"getSegmentWeights"),l.startBatch();for(let p of Object.values(l.edges()))if(p.data?.()){let{x:m,y:g}=p.source().position(),{x:y,y:v}=p.target().position();if(m!==y&&g!==v){let x=p.sourceEndpoint(),b=p.targetEndpoint(),{sourceDir:w}=nS(p),[_,T]=qc(w)?[x.x,b.y]:[b.x,x.y],{weights:E,distances:L}=d(x,b,_,T);p.style("segment-distances",L),p.style("segment-weights",E)}}l.endBatch(),f.run()}),f.run(),l.ready(d=>{Y.info("Ready",d),a(l)})})}var m2e,Bit,g2e,y2e=M(()=>{"use strict";Kc();kB();m2e=ka(c2e(),1);mr();ht();Hu();ni();yb();mF();iS();p2e();Mb([{name:j0.prefix,icons:j0}]);sl.use(m2e.default);o(Lit,"addServices");o(Dit,"addJunctions");o(Nit,"positionNodes");o(Rit,"addGroups");o(Mit,"addEdges");o(Iit,"getAlignments");o(Oit,"getRelativeConstraints");o(Pit,"layoutArchitecture");Bit=o(async(t,e,r,n)=>{let i=n.db,a=i.getServices(),s=i.getJunctions(),l=i.getGroups(),u=i.getEdges(),h=i.getDataStructures(),f=Oa(e),d=f.append("g");d.attr("class","architecture-edges");let p=f.append("g");p.attr("class","architecture-services");let m=f.append("g");m.attr("class","architecture-groups"),await f2e(i,p,a),d2e(i,p,s);let g=await Pit(a,s,l,u,h);await u2e(d,g),await h2e(m,g),Nit(i,g),_o(void 0,f,Li("padding"),Li("useMaxWidth"))},"draw"),g2e={draw:Bit}});var v2e={};vr(v2e,{diagram:()=>Fit});var Fit,x2e=M(()=>{"use strict";s2e();yb();l2e();y2e();Fit={parser:a2e,db:X0,renderer:g2e,styles:o2e}});var Eat={};vr(Eat,{default:()=>kat});Kc();MS();$f();var WX="c4",s7e=o(t=>/^\s*C4Context|C4Container|C4Component|C4Dynamic|C4Deployment/.test(t),"detector"),o7e=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(HX(),UX));return{id:WX,diagram:t}},"loader"),l7e={id:WX,detector:s7e,loader:o7e},YX=l7e;var jie="flowchart",dPe=o((t,e)=>e?.flowchart?.defaultRenderer==="dagre-wrapper"||e?.flowchart?.defaultRenderer==="elk"?!1:/^\s*graph/.test(t),"detector"),pPe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(fT(),hT));return{id:jie,diagram:t}},"loader"),mPe={id:jie,detector:dPe,loader:pPe},Kie=mPe;var Qie="flowchart-v2",gPe=o((t,e)=>e?.flowchart?.defaultRenderer==="dagre-d3"?!1:(e?.flowchart?.defaultRenderer==="elk"&&(e.layout="elk"),/^\s*graph/.test(t)&&e?.flowchart?.defaultRenderer==="dagre-wrapper"?!0:/^\s*flowchart/.test(t)),"detector"),yPe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(fT(),hT));return{id:Qie,diagram:t}},"loader"),vPe={id:Qie,detector:gPe,loader:yPe},Zie=vPe;var Aae="er",qPe=o(t=>/^\s*erDiagram/.test(t),"detector"),XPe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(Cae(),Sae));return{id:Aae,diagram:t}},"loader"),jPe={id:Aae,detector:qPe,loader:XPe},_ae=jPe;var Fue="gitGraph",x$e=o(t=>/^\s*gitGraph/.test(t),"detector"),b$e=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(Bue(),Pue));return{id:Fue,diagram:t}},"loader"),w$e={id:Fue,detector:x$e,loader:b$e},zue=w$e;var mhe="gantt",lVe=o(t=>/^\s*gantt/.test(t),"detector"),cVe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(phe(),dhe));return{id:mhe,diagram:t}},"loader"),uVe={id:mhe,detector:lVe,loader:cVe},ghe=uVe;var She="info",gVe=o(t=>/^\s*info/.test(t),"detector"),yVe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(Ehe(),khe));return{id:She,diagram:t}},"loader"),Che={id:She,detector:gVe,loader:yVe};var Phe="pie",DVe=o(t=>/^\s*pie/.test(t),"detector"),NVe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(Ohe(),Ihe));return{id:Phe,diagram:t}},"loader"),Bhe={id:Phe,detector:DVe,loader:NVe};var Khe="quadrantChart",jVe=o(t=>/^\s*quadrantChart/.test(t),"detector"),KVe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(jhe(),Xhe));return{id:Khe,diagram:t}},"loader"),QVe={id:Khe,detector:jVe,loader:KVe},Qhe=QVe;var Efe="xychart",dUe=o(t=>/^\s*xychart-beta/.test(t),"detector"),pUe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(kfe(),Tfe));return{id:Efe,diagram:t}},"loader"),mUe={id:Efe,detector:dUe,loader:pUe},Sfe=mUe;var $fe="requirement",UUe=o(t=>/^\s*requirement(Diagram)?/.test(t),"detector"),HUe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(Gfe(),zfe));return{id:$fe,diagram:t}},"loader"),WUe={id:$fe,detector:UUe,loader:HUe},Vfe=WUe;var mde="sequence",XHe=o(t=>/^\s*sequenceDiagram/.test(t),"detector"),jHe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(pde(),dde));return{id:mde,diagram:t}},"loader"),KHe={id:mde,detector:XHe,loader:jHe},gde=KHe;var Lde="class",_We=o((t,e)=>e?.class?.defaultRenderer==="dagre-wrapper"?!1:/^\s*classDiagram/.test(t),"detector"),LWe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(_de(),Ade));return{id:Lde,diagram:t}},"loader"),DWe={id:Lde,detector:_We,loader:LWe},Dde=DWe;var Mde="classDiagram",RWe=o((t,e)=>/^\s*classDiagram/.test(t)&&e?.class?.defaultRenderer==="dagre-wrapper"?!0:/^\s*classDiagram-v2/.test(t),"detector"),MWe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(Rde(),Nde));return{id:Mde,diagram:t}},"loader"),IWe={id:Mde,detector:RWe,loader:MWe},Ide=IWe;var S0e="state",LYe=o((t,e)=>e?.state?.defaultRenderer==="dagre-wrapper"?!1:/^\s*stateDiagram/.test(t),"detector"),DYe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(E0e(),k0e));return{id:S0e,diagram:t}},"loader"),NYe={id:S0e,detector:LYe,loader:DYe},C0e=NYe;var L0e="stateDiagram",MYe=o((t,e)=>!!(/^\s*stateDiagram-v2/.test(t)||/^\s*stateDiagram/.test(t)&&e?.state?.defaultRenderer==="dagre-wrapper"),"detector"),IYe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(_0e(),A0e));return{id:L0e,diagram:t}},"loader"),OYe={id:L0e,detector:MYe,loader:IYe},D0e=OYe;var Y0e="journey",rqe=o(t=>/^\s*journey/.test(t),"detector"),nqe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(W0e(),H0e));return{id:Y0e,diagram:t}},"loader"),iqe={id:Y0e,detector:rqe,loader:nqe},q0e=iqe;ht();Hu();ni();var aqe=o((t,e,r)=>{Y.debug(`rendering svg for syntax error +`);let n=Oa(e),i=n.append("g");n.attr("viewBox","0 0 2412 512"),Zr(n,100,512,!0),i.append("path").attr("class","error-icon").attr("d","m411.313,123.313c6.25-6.25 6.25-16.375 0-22.625s-16.375-6.25-22.625,0l-32,32-9.375,9.375-20.688-20.688c-12.484-12.5-32.766-12.5-45.25,0l-16,16c-1.261,1.261-2.304,2.648-3.31,4.051-21.739-8.561-45.324-13.426-70.065-13.426-105.867,0-192,86.133-192,192s86.133,192 192,192 192-86.133 192-192c0-24.741-4.864-48.327-13.426-70.065 1.402-1.007 2.79-2.049 4.051-3.31l16-16c12.5-12.492 12.5-32.758 0-45.25l-20.688-20.688 9.375-9.375 32.001-31.999zm-219.313,100.687c-52.938,0-96,43.063-96,96 0,8.836-7.164,16-16,16s-16-7.164-16-16c0-70.578 57.422-128 128-128 8.836,0 16,7.164 16,16s-7.164,16-16,16z"),i.append("path").attr("class","error-icon").attr("d","m459.02,148.98c-6.25-6.25-16.375-6.25-22.625,0s-6.25,16.375 0,22.625l16,16c3.125,3.125 7.219,4.688 11.313,4.688 4.094,0 8.188-1.563 11.313-4.688 6.25-6.25 6.25-16.375 0-22.625l-16.001-16z"),i.append("path").attr("class","error-icon").attr("d","m340.395,75.605c3.125,3.125 7.219,4.688 11.313,4.688 4.094,0 8.188-1.563 11.313-4.688 6.25-6.25 6.25-16.375 0-22.625l-16-16c-6.25-6.25-16.375-6.25-22.625,0s-6.25,16.375 0,22.625l15.999,16z"),i.append("path").attr("class","error-icon").attr("d","m400,64c8.844,0 16-7.164 16-16v-32c0-8.836-7.156-16-16-16-8.844,0-16,7.164-16,16v32c0,8.836 7.156,16 16,16z"),i.append("path").attr("class","error-icon").attr("d","m496,96.586h-32c-8.844,0-16,7.164-16,16 0,8.836 7.156,16 16,16h32c8.844,0 16-7.164 16-16 0-8.836-7.156-16-16-16z"),i.append("path").attr("class","error-icon").attr("d","m436.98,75.605c3.125,3.125 7.219,4.688 11.313,4.688 4.094,0 8.188-1.563 11.313-4.688l32-32c6.25-6.25 6.25-16.375 0-22.625s-16.375-6.25-22.625,0l-32,32c-6.251,6.25-6.251,16.375-0.001,22.625z"),i.append("text").attr("class","error-text").attr("x",1440).attr("y",250).attr("font-size","150px").style("text-anchor","middle").text("Syntax error in text"),i.append("text").attr("class","error-text").attr("x",1250).attr("y",400).attr("font-size","100px").style("text-anchor","middle").text(`mermaid version ${r}`)},"draw"),yP={draw:aqe},X0e=yP;var sqe={db:{},renderer:yP,parser:{parse:o(()=>{},"parse")}},j0e=sqe;var K0e="flowchart-elk",oqe=o((t,e={})=>/^\s*flowchart-elk/.test(t)||/^\s*flowchart|graph/.test(t)&&e?.flowchart?.defaultRenderer==="elk"?(e.layout="elk",!0):!1,"detector"),lqe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(fT(),hT));return{id:K0e,diagram:t}},"loader"),cqe={id:K0e,detector:oqe,loader:lqe},Q0e=cqe;var kpe="timeline",_qe=o(t=>/^\s*timeline/.test(t),"detector"),Lqe=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(Tpe(),wpe));return{id:kpe,diagram:t}},"loader"),Dqe={id:kpe,detector:_qe,loader:Lqe},Epe=Dqe;var V1e="mindmap",Ftt=o(t=>/^\s*mindmap/.test(t),"detector"),ztt=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>($1e(),G1e));return{id:V1e,diagram:t}},"loader"),Gtt={id:V1e,detector:Ftt,loader:ztt},U1e=Gtt;var tye="kanban",rrt=o(t=>/^\s*kanban/.test(t),"detector"),nrt=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(eye(),J1e));return{id:tye,diagram:t}},"loader"),irt={id:tye,detector:rrt,loader:nrt},rye=irt;var Oye="sankey",Crt=o(t=>/^\s*sankey-beta/.test(t),"detector"),Art=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(Iye(),Mye));return{id:Oye,diagram:t}},"loader"),_rt={id:Oye,detector:Crt,loader:Art},Pye=_rt;var Yye="packet",$rt=o(t=>/^\s*packet-beta/.test(t),"detector"),Vrt=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(Wye(),Hye));return{id:Yye,diagram:t}},"loader"),qye={id:Yye,detector:$rt,loader:Vrt};var Kve="block",cit=o(t=>/^\s*block-beta/.test(t),"detector"),uit=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(jve(),Xve));return{id:Kve,diagram:t}},"loader"),hit={id:Kve,detector:cit,loader:uit},Qve=hit;var b2e="architecture",zit=o(t=>/^\s*architecture/.test(t),"detector"),Git=o(async()=>{let{diagram:t}=await Promise.resolve().then(()=>(x2e(),v2e));return{id:b2e,diagram:t}},"loader"),$it={id:b2e,detector:zit,loader:Git},w2e=$it;$f();Vt();var T2e=!1,C1=o(()=>{T2e||(T2e=!0,Qf("error",j0e,t=>t.toLowerCase().trim()==="error"),Qf("---",{db:{clear:o(()=>{},"clear")},styles:{},renderer:{draw:o(()=>{},"draw")},parser:{parse:o(()=>{throw new Error("Diagrams beginning with --- are not valid. If you were trying to use a YAML front-matter, please ensure that you've correctly opened and closed the YAML front-matter with un-indented `---` blocks")},"parse")},init:o(()=>null,"init")},t=>t.toLowerCase().trimStart().startsWith("---")),Bb(YX,rye,Ide,Dde,_ae,ghe,Che,Bhe,Vfe,gde,Q0e,Zie,Kie,U1e,Epe,zue,D0e,C0e,q0e,Qhe,Pye,qye,Sfe,Qve,w2e))},"addDiagrams");ht();$f();Vt();var k2e=o(async()=>{Y.debug("Loading registered diagrams");let e=(await Promise.allSettled(Object.entries(Gf).map(async([r,{detector:n,loader:i}])=>{if(i)try{ay(r)}catch{try{let{diagram:a,id:s}=await i();Qf(s,a,n)}catch(a){throw Y.error(`Failed to load external diagram with key ${r}. Removing from detectors.`),delete Gf[r],a}}}))).filter(r=>r.status==="rejected");if(e.length>0){Y.error(`Failed to load ${e.length} external diagrams`);for(let r of e)Y.error(r);throw new Error(`Failed to load ${e.length} external diagrams`)}},"loadRegisteredDiagrams");ht();mr();var aS="comm",sS="rule",oS="decl";var E2e="@import";var S2e="@keyframes";var C2e="@layer";var gF=Math.abs,wb=String.fromCharCode;function lS(t){return t.trim()}o(lS,"trim");function Tb(t,e,r){return t.replace(e,r)}o(Tb,"replace");function A2e(t,e,r){return t.indexOf(e,r)}o(A2e,"indexof");function K0(t,e){return t.charCodeAt(e)|0}o(K0,"charat");function If(t,e,r){return t.slice(e,r)}o(If,"substr");function yo(t){return t.length}o(yo,"strlen");function _2e(t){return t.length}o(_2e,"sizeof");function A1(t,e){return e.push(t),t}o(A1,"append");var cS=1,_1=1,L2e=0,ll=0,Di=0,D1="";function uS(t,e,r,n,i,a,s,l){return{value:t,root:e,parent:r,type:n,props:i,children:a,line:cS,column:_1,length:s,return:"",siblings:l}}o(uS,"node");function D2e(){return Di}o(D2e,"char");function N2e(){return Di=ll>0?K0(D1,--ll):0,_1--,Di===10&&(_1=1,cS--),Di}o(N2e,"prev");function cl(){return Di=ll<L2e?K0(D1,ll++):0,_1++,Di===10&&(_1=1,cS++),Di}o(cl,"next");function Ju(){return K0(D1,ll)}o(Ju,"peek");function kb(){return ll}o(kb,"caret");function hS(t,e){return If(D1,t,e)}o(hS,"slice");function L1(t){switch(t){case 0:case 9:case 10:case 13:case 32:return 5;case 33:case 43:case 44:case 47:case 62:case 64:case 126:case 59:case 123:case 125:return 4;case 58:return 3;case 34:case 39:case 40:case 91:return 2;case 41:case 93:return 1}return 0}o(L1,"token");function R2e(t){return cS=_1=1,L2e=yo(D1=t),ll=0,[]}o(R2e,"alloc");function M2e(t){return D1="",t}o(M2e,"dealloc");function fS(t){return lS(hS(ll-1,yF(t===91?t+2:t===40?t+1:t)))}o(fS,"delimit");function I2e(t){for(;(Di=Ju())&&Di<33;)cl();return L1(t)>2||L1(Di)>3?"":" "}o(I2e,"whitespace");function O2e(t,e){for(;--e&&cl()&&!(Di<48||Di>102||Di>57&&Di<65||Di>70&&Di<97););return hS(t,kb()+(e<6&&Ju()==32&&cl()==32))}o(O2e,"escaping");function yF(t){for(;cl();)switch(Di){case t:return ll;case 34:case 39:t!==34&&t!==39&&yF(Di);break;case 40:t===41&&yF(t);break;case 92:cl();break}return ll}o(yF,"delimiter");function P2e(t,e){for(;cl()&&t+Di!==57;)if(t+Di===84&&Ju()===47)break;return"/*"+hS(e,ll-1)+"*"+wb(t===47?t:cl())}o(P2e,"commenter");function B2e(t){for(;!L1(Ju());)cl();return hS(t,ll)}o(B2e,"identifier");function G2e(t){return M2e(dS("",null,null,null,[""],t=R2e(t),0,[0],t))}o(G2e,"compile");function dS(t,e,r,n,i,a,s,l,u){for(var h=0,f=0,d=s,p=0,m=0,g=0,y=1,v=1,x=1,b=0,w="",_=i,T=a,E=n,L=w;v;)switch(g=b,b=cl()){case 40:if(g!=108&&K0(L,d-1)==58){A2e(L+=Tb(fS(b),"&","&\f"),"&\f",gF(h?l[h-1]:0))!=-1&&(x=-1);break}case 34:case 39:case 91:L+=fS(b);break;case 9:case 10:case 13:case 32:L+=I2e(g);break;case 92:L+=O2e(kb()-1,7);continue;case 47:switch(Ju()){case 42:case 47:A1(Vit(P2e(cl(),kb()),e,r,u),u),(L1(g||1)==5||L1(Ju()||1)==5)&&yo(L)&&If(L,-1,void 0)!==" "&&(L+=" ");break;default:L+="/"}break;case 123*y:l[h++]=yo(L)*x;case 125*y:case 59:case 0:switch(b){case 0:case 125:v=0;case 59+f:x==-1&&(L=Tb(L,/\f/g,"")),m>0&&(yo(L)-d||y===0&&g===47)&&A1(m>32?z2e(L+";",n,r,d-1,u):z2e(Tb(L," ","")+";",n,r,d-2,u),u);break;case 59:L+=";";default:if(A1(E=F2e(L,e,r,h,f,i,l,w,_=[],T=[],d,a),a),b===123)if(f===0)dS(L,e,E,E,_,a,d,l,T);else switch(p===99&&K0(L,3)===110?100:p){case 100:case 108:case 109:case 115:dS(t,E,E,n&&A1(F2e(t,E,E,0,0,i,l,w,i,_=[],d,T),T),i,T,d,l,n?_:T);break;default:dS(L,E,E,E,[""],T,0,l,T)}}h=f=m=0,y=x=1,w=L="",d=s;break;case 58:d=1+yo(L),m=g;default:if(y<1){if(b==123)--y;else if(b==125&&y++==0&&N2e()==125)continue}switch(L+=wb(b),b*y){case 38:x=f>0?1:(L+="\f",-1);break;case 44:l[h++]=(yo(L)-1)*x,x=1;break;case 64:Ju()===45&&(L+=fS(cl())),p=Ju(),f=d=yo(w=L+=B2e(kb())),b++;break;case 45:g===45&&yo(L)==2&&(y=0)}}return a}o(dS,"parse");function F2e(t,e,r,n,i,a,s,l,u,h,f,d){for(var p=i-1,m=i===0?a:[""],g=_2e(m),y=0,v=0,x=0;y<n;++y)for(var b=0,w=If(t,p+1,p=gF(v=s[y])),_=t;b<g;++b)(_=lS(v>0?m[b]+" "+w:Tb(w,/&\f/g,m[b])))&&(u[x++]=_);return uS(t,e,r,i===0?sS:l,u,h,f,d)}o(F2e,"ruleset");function Vit(t,e,r,n){return uS(t,e,r,aS,wb(D2e()),If(t,2,-2),0,n)}o(Vit,"comment");function z2e(t,e,r,n,i){return uS(t,e,r,oS,If(t,0,n),If(t,n+1,-1),n,i)}o(z2e,"declaration");function pS(t,e){for(var r="",n=0;n<t.length;n++)r+=e(t[n],n,t,e)||"";return r}o(pS,"serialize");function $2e(t,e,r,n){switch(t.type){case C2e:if(t.children.length)break;case E2e:case oS:return t.return=t.return||t.value;case aS:return"";case S2e:return t.return=t.value+"{"+pS(t.children,n)+"}";case sS:if(!yo(t.value=t.props.join(",")))return""}return yo(r=pS(t.children,n))?t.return=t.value+"{"+r+"}":""}o($2e,"stringify");sC();Kw();JI();var Uit="graphics-document document";function V2e(t,e){t.attr("role",Uit),e!==""&&t.attr("aria-roledescription",e)}o(V2e,"setA11yDiagramInfo");function U2e(t,e,r,n){if(t.insert!==void 0){if(r){let i=`chart-desc-${n}`;t.attr("aria-describedby",i),t.insert("desc",":first-child").attr("id",i).text(r)}if(e){let i=`chart-title-${n}`;t.attr("aria-labelledby",i),t.insert("title",":first-child").attr("id",i).text(e)}}}o(U2e,"addSVGa11yTitleDescription");ip();Ua();Ua();Vt();$f();IS();hr();var N1=class t{constructor(e,r,n,i,a){this.type=e;this.text=r;this.db=n;this.parser=i;this.renderer=a}static{o(this,"Diagram")}static async fromText(e,r={}){let n=Sr(),i=np(e,n);e=IX(e)+` +`;try{ay(i)}catch{let h=KF(i);if(!h)throw new rp(`Diagram ${i} not found.`);let{id:f,diagram:d}=await h();Qf(f,d)}let{db:a,parser:s,renderer:l,init:u}=ay(i);return s.parser&&(s.parser.yy=a),a.clear?.(),u?.(n),r.title&&a.setDiagramTitle?.(r.title),await s.parse(e),new t(i,e,a,s,l)}async render(e,r){await this.renderer.draw(this.text,e,r,this)}getParser(){return this.parser}getType(){return this.type}};fr();var H2e=[];var W2e=o(()=>{H2e.forEach(t=>{t()}),H2e=[]},"attachFunctions");ht();var Y2e=o(t=>t.replace(/^\s*%%(?!{)[^\n]+\n?/gm,"").trimStart(),"cleanupComments");Pb();V5();function q2e(t){let e=t.match(Ob);if(!e)return{text:t,metadata:{}};let r=fm(e[1],{schema:hm})??{};r=typeof r=="object"&&!Array.isArray(r)?r:{};let n={};return r.displayMode&&(n.displayMode=r.displayMode.toString()),r.title&&(n.title=r.title.toString()),r.config&&(n.config=r.config),{text:t.slice(e[0].length),metadata:n}}o(q2e,"extractFrontMatter");hr();var Hit=o(t=>t.replace(/\r\n?/g,` +`).replace(/<(\w+)([^>]*)>/g,(e,r,n)=>"<"+r+n.replace(/="([^"]*)"/g,"='$1'")+">"),"cleanupText"),Wit=o(t=>{let{text:e,metadata:r}=q2e(t),{displayMode:n,title:i,config:a={}}=r;return n&&(a.gantt||(a.gantt={}),a.gantt.displayMode=n),{title:i,config:a,text:e}},"processFrontmatter"),Yit=o(t=>{let e=Ut.detectInit(t)??{},r=Ut.detectDirective(t,"wrap");return Array.isArray(r)?e.wrap=r.some(({type:n})=>n==="wrap"):r?.type==="wrap"&&(e.wrap=!0),{text:RX(t),directive:e}},"processDirectives");function vF(t){let e=Hit(t),r=Wit(e),n=Yit(r.text),i=ws(r.config,n.directive);return t=Y2e(n.text),{code:t,title:r.title,config:i}}o(vF,"preprocessDiagram");QC();Hb();hr();function X2e(t){let e=new TextEncoder().encode(t),r=Array.from(e,n=>String.fromCodePoint(n)).join("");return btoa(r)}o(X2e,"toBase64");var qit=5e4,Xit="graph TB;a[Maximum text size in diagram exceeded];style a fill:#faa",jit="sandbox",Kit="loose",Qit="http://www.w3.org/2000/svg",Zit="http://www.w3.org/1999/xlink",Jit="http://www.w3.org/1999/xhtml",eat="100%",tat="100%",rat="border:0;margin:0;",nat="margin:0",iat="allow-top-navigation-by-user-activation allow-popups",aat='The "iframe" tag is not supported by your browser.',sat=["foreignobject"],oat=["dominant-baseline"];function Z2e(t){let e=vF(t);return V1(),Hz(e.config??{}),e}o(Z2e,"processAndSetConfigs");async function lat(t,e){C1();try{let{code:r,config:n}=Z2e(t);return{diagramType:(await J2e(r)).type,config:n}}catch(r){if(e?.suppressErrors)return!1;throw r}}o(lat,"parse");var j2e=o((t,e,r=[])=>` +.${t} ${e} { ${r.join(" !important; ")} !important; }`,"cssImportantStyles"),cat=o((t,e=new Map)=>{let r="";if(t.themeCSS!==void 0&&(r+=` +${t.themeCSS}`),t.fontFamily!==void 0&&(r+=` +:root { --mermaid-font-family: ${t.fontFamily}}`),t.altFontFamily!==void 0&&(r+=` +:root { --mermaid-alt-font-family: ${t.altFontFamily}}`),e instanceof Map){let s=t.htmlLabels??t.flowchart?.htmlLabels?["> *","span"]:["rect","polygon","ellipse","circle","path"];e.forEach(l=>{cr(l.styles)||s.forEach(u=>{r+=j2e(l.id,u,l.styles)}),cr(l.textStyles)||(r+=j2e(l.id,"tspan",(l?.textStyles||[]).map(u=>u.replace("color","fill"))))})}return r},"createCssStyles"),uat=o((t,e,r,n)=>{let i=cat(t,r),a=F$(e,i,t.themeVariables);return pS(G2e(`${n}{${a}}`),$2e)},"createUserStyles"),hat=o((t="",e,r)=>{let n=t;return!r&&!e&&(n=n.replace(/marker-end="url\([\d+./:=?A-Za-z-]*?#/g,'marker-end="url(#')),n=Ca(n),n=n.replace(/<br>/g,"<br/>"),n},"cleanUpSvgCode"),fat=o((t="",e)=>{let r=e?.viewBox?.baseVal?.height?e.viewBox.baseVal.height+"px":tat,n=X2e(`<body style="${nat}">${t}</body>`);return`<iframe style="width:${eat};height:${r};${rat}" src="data:text/html;charset=UTF-8;base64,${n}" sandbox="${iat}"> + ${aat} +</iframe>`},"putIntoIFrame"),K2e=o((t,e,r,n,i)=>{let a=t.append("div");a.attr("id",r),n&&a.attr("style",n);let s=a.append("svg").attr("id",e).attr("width","100%").attr("xmlns",Qit);return i&&s.attr("xmlns:xlink",i),s.append("g"),t},"appendDivSvgG");function Q2e(t,e){return t.append("iframe").attr("id",e).attr("style","width: 100%; height: 100%;").attr("sandbox","")}o(Q2e,"sandboxedIframe");var dat=o((t,e,r,n)=>{t.getElementById(e)?.remove(),t.getElementById(r)?.remove(),t.getElementById(n)?.remove()},"removeExistingElements"),pat=o(async function(t,e,r){C1();let n=Z2e(e);e=n.code;let i=Sr();Y.debug(i),e.length>(i?.maxTextSize??qit)&&(e=Xit);let a="#"+t,s="i"+t,l="#"+s,u="d"+t,h="#"+u,f=o(()=>{let R=ze(p?l:h).node();R&&"remove"in R&&R.remove()},"removeTempElements"),d=ze("body"),p=i.securityLevel===jit,m=i.securityLevel===Kit,g=i.fontFamily;if(r!==void 0){if(r&&(r.innerHTML=""),p){let k=Q2e(ze(r),s);d=ze(k.nodes()[0].contentDocument.body),d.node().style.margin=0}else d=ze(r);K2e(d,t,u,`font-family: ${g}`,Zit)}else{if(dat(document,t,u,s),p){let k=Q2e(ze("body"),s);d=ze(k.nodes()[0].contentDocument.body),d.node().style.margin=0}else d=ze("body");K2e(d,t,u)}let y,v;try{y=await N1.fromText(e,{title:n.title})}catch(k){if(i.suppressErrorRendering)throw f(),k;y=await N1.fromText("error"),v=k}let x=d.select(h).node(),b=y.type,w=x.firstChild,_=w.firstChild,T=y.renderer.getClasses?.(e,y),E=uat(i,b,T,a),L=document.createElement("style");L.innerHTML=E,w.insertBefore(L,_);try{await y.renderer.draw(e,t,dx,y)}catch(k){throw i.suppressErrorRendering?f():X0e.draw(e,t,dx),k}let C=d.select(`${h} svg`),A=y.db.getAccTitle?.(),I=y.db.getAccDescription?.();gat(b,C,A,I),d.select(`[id="${t}"]`).selectAll("foreignobject > *").attr("xmlns",Jit);let D=d.select(h).node().innerHTML;if(Y.debug("config.arrowMarkerAbsolute",i.arrowMarkerAbsolute),D=hat(D,p,xr(i.arrowMarkerAbsolute)),p){let k=d.select(h+" svg").node();D=fat(D,k)}else m||(D=ah.sanitize(D,{ADD_TAGS:sat,ADD_ATTR:oat,HTML_INTEGRATION_POINTS:{foreignobject:!0}}));if(W2e(),v)throw v;return f(),{diagramType:b,svg:D,bindFunctions:y.db.bindFunctions}},"render");function mat(t={}){let e=Gn({},t);e?.fontFamily&&!e.themeVariables?.fontFamily&&(e.themeVariables||(e.themeVariables={}),e.themeVariables.fontFamily=e.fontFamily),$z(e),e?.theme&&e.theme in ko?e.themeVariables=ko[e.theme].getThemeVariables(e.themeVariables):e&&(e.themeVariables=ko.default.getThemeVariables(e.themeVariables));let r=typeof e=="object"?QS(e):ZS();M1(r.logLevel),C1()}o(mat,"initialize");var J2e=o((t,e={})=>{let{code:r}=vF(t);return N1.fromText(r,e)},"getDiagramFromText");function gat(t,e,r,n){V2e(e,t),U2e(e,r,n,e.attr("id"))}o(gat,"addA11yInfo");var Of=Object.freeze({render:pat,parse:lat,getDiagramFromText:J2e,initialize:mat,getConfig:Sr,setConfig:Yb,getSiteConfig:ZS,updateSiteConfig:Vz,reset:o(()=>{V1()},"reset"),globalReset:o(()=>{V1(ih)},"globalReset"),defaultConfig:ih});M1(Sr().logLevel);V1(Sr());Fv();hr();var yat=o((t,e,r)=>{Y.warn(t),i9(t)?(r&&r(t.str,t.hash),e.push({...t,message:t.str,error:t})):(r&&r(t),t instanceof Error&&e.push({str:t.message,message:t.message,hash:t.name,error:t}))},"handleError"),exe=o(async function(t={querySelector:".mermaid"}){try{await vat(t)}catch(e){if(i9(e)&&Y.error(e.str),eh.parseError&&eh.parseError(e),!t.suppressErrors)throw Y.error("Use the suppressErrors option to suppress these errors"),e}},"run"),vat=o(async function({postRenderCallback:t,querySelector:e,nodes:r}={querySelector:".mermaid"}){let n=Of.getConfig();Y.debug(`${t?"":"No "}Callback function found`);let i;if(r)i=r;else if(e)i=document.querySelectorAll(e);else throw new Error("Nodes and querySelector are both undefined");Y.debug(`Found ${i.length} diagrams`),n?.startOnLoad!==void 0&&(Y.debug("Start On Load: "+n?.startOnLoad),Of.updateSiteConfig({startOnLoad:n?.startOnLoad}));let a=new Ut.InitIDGenerator(n.deterministicIds,n.deterministicIDSeed),s,l=[];for(let u of Array.from(i)){Y.info("Rendering diagram: "+u.id);if(u.getAttribute("data-processed"))continue;u.setAttribute("data-processed","true");let h=`mermaid-${a.next()}`;s=u.innerHTML,s=Ib(Ut.entityDecode(s)).trim().replace(/<br\s*\/?>/gi,"<br/>");let f=Ut.detectInit(s);f&&Y.debug("Detected early reinit: ",f);try{let{svg:d,bindFunctions:p}=await ixe(h,s,u);u.innerHTML=d,t&&await t(h),p&&p(u)}catch(d){yat(d,l,eh.parseError)}}if(l.length>0)throw l[0]},"runThrowsErrors"),txe=o(function(t){Of.initialize(t)},"initialize"),xat=o(async function(t,e,r){Y.warn("mermaid.init is deprecated. Please use run instead."),t&&txe(t);let n={postRenderCallback:r,querySelector:".mermaid"};typeof e=="string"?n.querySelector=e:e&&(e instanceof HTMLElement?n.nodes=[e]:n.nodes=e),await exe(n)},"init"),bat=o(async(t,{lazyLoad:e=!0}={})=>{C1(),Bb(...t),e===!1&&await k2e()},"registerExternalDiagrams"),rxe=o(function(){if(eh.startOnLoad){let{startOnLoad:t}=Of.getConfig();t&&eh.run().catch(e=>Y.error("Mermaid failed to initialize",e))}},"contentLoaded");if(typeof document<"u"){window.addEventListener("load",rxe,!1)}var wat=o(function(t){eh.parseError=t},"setParseErrorHandler"),mS=[],xF=!1,nxe=o(async()=>{if(!xF){for(xF=!0;mS.length>0;){let t=mS.shift();if(t)try{await t()}catch(e){Y.error("Error executing queue",e)}}xF=!1}},"executeQueue"),Tat=o(async(t,e)=>new Promise((r,n)=>{let i=o(()=>new Promise((a,s)=>{Of.parse(t,e).then(l=>{a(l),r(l)},l=>{Y.error("Error parsing",l),eh.parseError?.(l),s(l),n(l)})}),"performCall");mS.push(i),nxe().catch(n)}),"parse"),ixe=o((t,e,r)=>new Promise((n,i)=>{let a=o(()=>new Promise((s,l)=>{Of.render(t,e,r).then(u=>{s(u),n(u)},u=>{Y.error("Error parsing",u),eh.parseError?.(u),l(u),i(u)})}),"performCall");mS.push(a),nxe().catch(i)}),"render"),eh={startOnLoad:!0,mermaidAPI:Of,parse:Tat,render:ixe,init:xat,run:exe,registerExternalDiagrams:bat,registerLayoutLoaders:CD,initialize:txe,parseError:void 0,contentLoaded:rxe,setParseErrorHandler:wat,detectType:np,registerIconPacks:Mb},kat=eh;return pxe(Eat);})(); +/*! Check if previously processed */ +/*! + * Wait for document loaded before starting the execution + */ +/*! Bundled license information: + +dompurify/dist/purify.es.mjs: + (*! @license DOMPurify 3.2.1 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.2.1/LICENSE *) + +js-yaml/dist/js-yaml.mjs: + (*! js-yaml 4.1.0 https://github.com/nodeca/js-yaml @license MIT *) + +lodash-es/lodash.js: + (** + * @license + * Lodash (Custom Build) <https://lodash.com/> + * Build: `lodash modularize exports="es" -o ./` + * Copyright OpenJS Foundation and other contributors <https://openjsf.org/> + * Released under MIT license <https://lodash.com/license> + * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE> + * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors + *) + +cytoscape/dist/cytoscape.esm.mjs: + (*! + Embeddable Minimum Strictly-Compliant Promises/A+ 1.1.1 Thenable + Copyright (c) 2013-2014 Ralf S. Engelschall (http://engelschall.com) + Licensed under The MIT License (http://opensource.org/licenses/MIT) + *) + (*! + Event object based on jQuery events, MIT license + + https://jquery.org/license/ + https://tldrlegal.com/license/mit-license + https://github.com/jquery/jquery/blob/master/src/event.js + *) + (*! Bezier curve function generator. Copyright Gaetan Renaudeau. MIT License: http://en.wikipedia.org/wiki/MIT_License *) + (*! Runge-Kutta spring physics function generator. Adapted from Framer.js, copyright Koen Bok. MIT License: http://en.wikipedia.org/wiki/MIT_License *) +*/ +globalThis.mermaid = globalThis.__esbuild_esm_mermaid.default; diff --git a/docs/decisions/ADR-01_Integration_Repository_Placement.md b/docs/decisions/ADR-01_Integration_Repository_Placement.md new file mode 100644 index 0000000..8296eac --- /dev/null +++ b/docs/decisions/ADR-01_Integration_Repository_Placement.md @@ -0,0 +1,214 @@ +# ADR-01 Integration Repository Placement / 統合リポジトリの置き場 + +> **Summary:** Where the code that combines the public cores, the `-private` security versions and the subsystems is kept: new private repositories `RDM-<name>-dev2027` inside RCOSDP, with a `develop` integration branch and `upstream/*` tracking branches, never in this public repository. +> **概要:** 公開コア・`-private` セキュリティ版・サブシステムを重ねたコードをどこに置くか。RCOSDP 内に新設する非公開リポジトリ `RDM-<name>-dev2027` に置き、`develop` を統合ブランチ、`upstream/*` を追跡ブランチとする。公開のこのリポジトリには置かない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.6 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.5 — 2026-11-05. **Learned:** a rule written as "every repository" must say what happens to the repositories it cannot apply to (private-only, identical tips), or reviewers will read a gap (review r3, R3-01). / 「すべてのリポジトリ」と書いた規則は、当てはまらないもの(private 専用、先端同一)の扱いも書かないと、レビューで穴として読まれると分かった(レビュー r3、R3-01)。 + 0.4 — 2026-11-05. **Learned:** a strict public-first reconstruction needs the public upstream recorded in the manifest; Shibboleth-SP had a public upstream that was mirrored but not recorded (review SR-02). / 公開が先の厳密再構築には、公開上流が manifest に記録されている必要がある。Shibboleth-SP はミラーされていたのに記録がなかった(レビュー SR-02)。 + 0.3 — 2026-11-05. **Learned:** the owner prefers a literal, reproducible integration order over a convenient bootstrap, so the first construction is redone public-first on a new branch and proposed as a superseding pull request. / 所有者は便利な初回構築より、文字どおり再現できる統合順を選ぶと分かった。初回構築は新しいブランチで「公開が先」にやり直し、置き換えの PR として提案する。 + 0.2 — 2026-11-05. **Learned:** the first construction of a `-dev2027` repository cannot literally replay "public → private → adopted PRs", so the rule needs a stated bootstrap interpretation; it is proposed in §5 and awaits the owner. / `-dev2027` の初回構築では「公開 → private → 採用 PR」を文字どおり再現できないため、初回構築の解釈を明文化する必要があると分かった。§5 に提案し所有者の承認を待つ。 + 0.1 — 2026-11-05. **Learned:** GitHub refuses a fork inside the same organization, so "fork and integrate" had to become "new repository with history pushed", and that in turn made the no-force-push and no-delete rules the only way to keep the pushed history trustworthy. / GitHub は同じ組織内へのフォークを許さないため「フォークして統合」は「履歴を push した新規リポジトリ」になり、その結果 force push 禁止と削除禁止が、push した履歴を信じられるものに保つ唯一の手段だと分かった。 +- Status: Accepted by the owner, 2026-11-05 (plan-interview). +- Records a decision for: [POL-01 §2 item 5](../policy/POL-01_Developer_Environment_2027_Position.md) · [SPEC-01 Manifest](../spec/01_manifest.md) · [SPEC-05 Upstream Tracking](../spec/05_upstream_tracking.md) +- Related: [docs/README.md](../README.md) · [SPEC-00 Overview](../spec/00_overview.md) · [ADR-02 Network Model](ADR-02_Network_Model.md) · [ADR-04 AI Autonomy and Roles](ADR-04_AI_Autonomy_and_Roles.md) · [REF-01 Glossary](../reference/REF-01_Glossary.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Context + +A *decision record* (ADR) explains why we chose one way and not another. This one is about where the integration code lives. + +We must combine, without contradiction, three groups of code kept in GitHub *repositories* (folders that remember every change): + +- six public cores: `RDM-osf.io`, `RDM-waterbutler`, `RDM-modular-file-renderer`, `RDM-ember-osf-web`, `RDM-cas-overlay`, `RDM-wiki-frontend`; +- six `-private` security-verified versions, each of which already contains the history of its public core (so it is a superset, not a rival); +- five private subsystems: y-websocket, OASys (a private GRDM subsystem added in M3; see [REF-01](../reference/REF-01_Glossary.md)), Shibboleth-SP, rdmcp (the standard plug through which AI assistants talk to GRDM; see [REF-01](../reference/REF-01_Glossary.md)), aipf_mcp_data_grdm. Two of them also have a public upstream that the manifest records and the integration repository tracks as `upstream/public-<branch>`: y-websocket (RDM-y-websocket, `master`) and Shibboleth-SP (RDM-Shibboleth-SP, `main`). OASys, rdmcp and aipf_mcp_data_grdm are private-only, so their first construction starts from the `-private` tip (review SR-02, 2026-11-05). + +Three constraints shaped the choice: + +1. **Same-organization forks are impossible.** On GitHub a *fork* (your own copy of someone's repository that remembers where it came from) cannot be created inside the same organization that owns the original. All these repositories are in RCOSDP, so a plain fork is unavailable. +2. **Write boundary.** The agents on this plan may write only to this repository (`RDM-developer-guide`) and to repositories they create. Existing repositories, including the `-private` ones, are read-only to us. Deleting a repository or branch and *force-pushing* (overwriting shared history) are forbidden. +3. **This repository is public.** Members abroad read it. Anything derived from `-private` code — files, patches, even URLs of private repositories — must not appear here. + +### 2. Options considered + +```toon +options[4]{id,option,keeps_private_code_private,within_write_boundary,upstream_follow_cost,verdict}: + A,"New private repositories RDM-<name>-dev2027 in RCOSDP, history pushed, develop = integration, upstream/* tracking",yes,yes,low,chosen + B,"Fork to a personal GitHub account",no,yes,low,rejected + C,"Keep patches inside this public repository and apply at install time",no,yes,high,rejected + D,"Use the -private repositories directly as the canon and integrate there",yes,no,low,rejected +``` + +- **B** puts code derived from private sources under a personal account, outside the organization's access control. Rejected. +- **C** keeps a pile of *patches* (small text files describing changes) that must be re-fitted every time an upstream repository moves; with eleven moving upstreams the conflicts arrive faster than they are solved, and any patch touching `-private` code would leak it into a public repository. Rejected. +- **D** would be the simplest, but we are not allowed to write to the `-private` repositories, and integrating in them would mix verification work with security verification history. Rejected. + +### 3. Decision + +1. For each of the eleven upstream repositories, create a **private** repository in RCOSDP named `RDM-<name>-dev2027` (for example `RDM-osf.io-dev2027`). Push the full history of the public core so that `git log` remains truthful and *SHAs* (fingerprints of commits) match upstream. +2. Branches in each `-dev2027` repository: + - `develop` — the integration branch; the only branch the installer builds from (its SHA is recorded in the manifest, see [SPEC-01](../spec/01_manifest.md)); + - one tracking branch per upstream listed in the manifest, named `upstream/<kind>-<branch>` where `<kind>` is `public`, `private`, or `cos` and `<branch>` is the upstream branch name with `/` replaced by `-` ([SPEC-01 §4](../spec/01_manifest.md#4-rules) rule 7); + - `upstream/public-<branch>` — an exact *mirror* (identical copy, refreshed automatically) of the public core's default branch: `upstream/public-develop` for osf.io (the main web application), waterbutler (the file-transfer service), mfr (the file preview service), cas-overlay (the real login server), wiki-frontend (the wiki editor pages); `upstream/public-master` for ember-osf-web (the newer web pages) and y-websocket; the role of every component is listed in [REF-01](../reference/REF-01_Glossary.md); + - `upstream/private-<branch>` — a mirror of the `-private` default branch: `upstream/private-develop`, `upstream/private-master` (ember-osf-web, y-websocket), or `upstream/private-main` (OASys, Shibboleth-SP, rdmcp, aipf_mcp_data_grdm). Shibboleth-SP additionally has `upstream/public-main`; OASys, rdmcp and aipf_mcp_data_grdm have no public upstream and only the private branch; + - `upstream/cos-develop` — a mirror of the CenterForOpenScience original, for reference only (not for wiki-frontend, which has no COS original); + - a second upstream of the same kind gets a tag: `upstream/private-sec-test-fix-sec-test` mirrors `RDM-osf.io-private` (branch `fix/sec-test`) as a candidate. + Mirrors are refreshed daily ([SPEC-05](../spec/05_upstream_tracking.md)). +3. **Integration order** on `develop`: public `develop` → `-private` → adopted *pull requests* (proposed changes waiting for review; see [REF-01](../reference/REF-01_Glossary.md)). Merged upstream changes (a merge accepts a change into the shared branch; see [REF-01](../reference/REF-01_Glossary.md)) are taken in full; unmerged PRs are adopted one by one, security and authentication first, and listed as candidates in the manifest. +4. **No force-push, no deletion.** Conflicts are solved by new commits in a PR (pull request: a proposed change waiting for review; see [REF-01](../reference/REF-01_Glossary.md)), never by rewriting history. Branches are archived with a tag rather than deleted. +5. **Nothing from a `-dev2027` repository is copied into this public repository** except names, branch names, SHAs, dates and PR numbers. Image (the recipe and ingredients a container is made from; see [REF-01](../reference/REF-01_Glossary.md)) builds from `-private` code go only to local Docker (the tool that builds images and runs containers; see [REF-01](../reference/REF-01_Glossary.md)) or to a private registry, never to a public one. + +```mermaid +flowchart TD + PUB["public core<br/>default branch"] -->|daily mirror| UP1["upstream/public-<branch>"] + PRV["-private<br/>default branch"] -->|daily mirror| UP2["upstream/private-<branch>"] + COS["CenterForOpenScience<br/>develop"] -->|daily mirror| UP3["upstream/cos-develop"] + UP1 -->|1. merge| DEV["develop (integration)"] + UP2 -->|2. merge| DEV + PRS["adopted PRs<br/>(security, auth first)"] -->|3. PR, Codex review| DEV + UP3 -.->|reference only| DEV + DEV -->|"name + SHA"| MAN["manifest/upstreams.json<br/>(public repository)"] +``` + +### 4. Consequences + +- **Good:** one place per component where "public + private + adopted PRs" is resolved; the installer needs only a name and a SHA; daily mirrors keep diffs small; history is complete and auditable. +- **Good:** the write boundary is respected without asking for new permissions on existing repositories. +- **Cost:** eleven more repositories to watch. Mitigated by automation in [SPEC-05](../spec/05_upstream_tracking.md) and the status board. +- **Cost:** `-dev2027` repositories are private, so GitHub Actions (GitHub's robot that runs checks whenever code changes; see [REF-01](../reference/REF-01_Glossary.md)) minutes and self-hosted runner usage count against the Team plan. Accepted. +- **Risk — leakage into this public repository.** A single careless copy of a file, a stack trace or a URL from a `-dev2027` or `-private` repository would publish private security work. Controls: secret scanning in CI (continuous integration: automatic checks on every change; see [REF-01](../reference/REF-01_Glossary.md)) is mandatory; reviewers check every PR to this repository for private paths and URLs; the manifest schema allows only names, branches, SHAs, dates and PR numbers; documents name private repositories but never link to them ([SPEC-06 §5](../spec/06_documentation_conventions.md)). +- **Risk — drift between public and private cores.** On 2026-11-05 the public `RDM-osf.io` develop was newer than its `-private` counterpart. The integration order (public first, then private) and daily mirrors make such drift visible as a merge, not as a silent overwrite. +- **Open:** how to treat `RDM-osf.io-private` (branch `fix/sec-test`), which is distinct from `RDM-osf.io-develop-private`. It is mirrored as `upstream/private-sec-test-fix-sec-test` and listed in the manifest with `status: candidate` ([SPEC-01 §4](../spec/01_manifest.md#4-rules) rule 6); the owner decides whether it is merged. + +--- + +### 5. Bootstrap of the integration order (decided 2026-11-05: strict reconstruction) + +**Status:** the owner **rejected** the proposed interpretation "seed from the `-private` tip and merge the newer public tip" (review r1/r2 of RDM-osf.io-dev2027 PR #1, finding R2). The integration order of [SPEC-01 §4](../spec/01_manifest.md) applies literally, also to the first construction. + +**Scope.** The procedure applies to every component that has a public upstream recorded in the manifest (the six cores, y-websocket, Shibboleth-SP). Components with a private upstream only (OASys, rdmcp, aipf_mcp_data_grdm) have nothing public to start from: their `develop` starts at the `-private` tip and no reconstruction is made. When the public and private tips are the same commit (wiki-frontend on 2026-11-05) there is nothing to join, so no integration pull request is opened until the two diverge. + +**Procedure for every component in scope:** + +1. Start a branch `integrate/strict-<YYYYMMDD>` at the tip of `upstream/public-<branch>`. +2. Merge `upstream/private-<branch>` into it with a normal two-parent merge (`--no-ff`), resolving conflicts on the branch. +3. Re-apply adopted PRs from the manifest, each as its own merge. +4. Open a pull request from that branch to `develop`. The `develop` branch is never force-pushed or deleted; the pull request supersedes any earlier integration pull request, which is closed with a comment pointing to the new one. +5. Review by REV (the role that independently reviews each change; see [REF-01](../reference/REF-01_Glossary.md)), check by QAE (the role that checks that the work is correct; see [REF-01](../reference/REF-01_Glossary.md)), merge by the owner (ADR-04). + +**Consequence:** the first `develop` of each repository in scope (seeded from the `-private` tip during bootstrap) stays in history. The strictly reconstructed branch is merged on top of it, so from the first strict merge onward every `develop` carries the public-first order. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 背景 + +「決定の記録」(ADR)は、なぜその道を選び、ほかを選ばなかったかを残すメモです。この記録は、統合コードをどこに置くかについてのものです。 + +GitHub の「リポジトリ」(変更を全部覚えているフォルダ)に置かれた三つの群のコードを、矛盾なく重ねる必要があります。 + +- 公開コア 6 本: `RDM-osf.io`、`RDM-waterbutler`、`RDM-modular-file-renderer`、`RDM-ember-osf-web`、`RDM-cas-overlay`、`RDM-wiki-frontend`。 +- `-private` のセキュリティ検証版 6 本。いずれも対応する公開コアの履歴を含んでいる(つまり対立ではなく上位互換)。 +- 非公開サブシステム 5 本: y-websocket、OASys(M3 で加える GRDM の非公開サブシステム。[REF-01](../reference/REF-01_Glossary.md))、Shibboleth-SP、rdmcp(AI アシスタントが標準の差し込み口で GRDM と話す仕組み。[REF-01](../reference/REF-01_Glossary.md))、aipf_mcp_data_grdm。このうち 2 本には公開の上流もあり、manifest に記録して統合リポジトリで `upstream/public-<branch>` として追跡する: y-websocket(RDM-y-websocket、`master`)と Shibboleth-SP(RDM-Shibboleth-SP、`main`)。OASys、rdmcp、aipf_mcp_data_grdm は private のみで、初回構築は `-private` の先端から始める(レビュー SR-02、2026-11-05)。 + +選択を決めた制約は三つです。 + +1. **同じ組織内へのフォークはできない。** GitHub の「フォーク」(他人のリポジトリの自分用の写しで、出どころを覚えているもの)は、元のリポジトリを持つ組織の中には作れません。対象は全部 RCOSDP にあるので、普通のフォークは使えません。 +2. **書込の境界。** この計画のエージェントが書き込めるのは、このリポジトリ(`RDM-developer-guide`)と自分で新設したリポジトリだけです。`-private` を含む既存リポジトリは読み取り専用です。リポジトリやブランチの削除と「force push」(共有の履歴の上書き)は禁止です。 +3. **このリポジトリは公開。** 海外のメンバーが読みます。`-private` 由来のもの — ファイル、パッチ、非公開リポジトリの URL まで — をここに出してはいけません。 + +### 2. 検討した選択肢 + +```toon +options[4]{id,option,keeps_private_code_private,within_write_boundary,upstream_follow_cost,verdict}: + A,"RCOSDP 内に非公開の RDM-<name>-dev2027 を新設、履歴を push、develop = 統合、upstream/* で追跡",yes,yes,low,採用 + B,"個人の GitHub アカウントへフォーク",no,yes,low,不採用 + C,"公開のこのリポジトリにパッチを同梱し導入時に当てる",no,yes,high,不採用 + D,"-private リポジトリを直接正本にしてそこで統合",yes,no,low,不採用 +``` + +- **B** は非公開由来のコードを、組織のアクセス管理の外にある個人アカウントの下に出します。不採用。 +- **C** は「パッチ」(変更内容を書いた小さな文字ファイル)の山を持ち、上流が動くたびに当て直す必要があります。11 本の上流が動くと、衝突は解く速さより早く届きます。しかも `-private` に触るパッチは公開リポジトリへの漏えいになります。不採用。 +- **D** は最も単純ですが、`-private` リポジトリへの書込は許されておらず、そこで統合するとセキュリティ検証の履歴と統合作業が混ざります。不採用。 + +### 3. 決定 + +1. 上流 11 本それぞれに、RCOSDP 内に **非公開** のリポジトリ `RDM-<name>-dev2027`(例: `RDM-osf.io-dev2027`)を新設します。公開コアの全履歴を push し、`git log` が本当のことを示し、「SHA」(コミットの指紋)が上流と一致するようにします。 +2. 各 `-dev2027` のブランチ: + - `develop` — 統合ブランチ。インストーラーが組み立てる唯一のブランチ(その SHA を manifest に記録。[SPEC-01](../spec/01_manifest.md))。 + - manifest に載せた上流ごとに一本の追跡ブランチ。名前は `upstream/<kind>-<branch>` で、`<kind>` は `public`・`private`・`cos`、`<branch>` は上流のブランチ名の `/` を `-` に置き換えたもの([SPEC-01 §4](../spec/01_manifest.md#4-規則) の規則 7)。 + - `upstream/public-<branch>` — 公開コアの既定ブランチの正確な「ミラー」(自動で更新される同一の写し)。osf.io(中心の Web アプリ)・waterbutler(ファイルを出し入れする部品)・mfr(ファイルのプレビューの部品)・cas-overlay(本物のログインサーバ)・wiki-frontend(Wiki の編集画面)は `upstream/public-develop`、ember-osf-web(新しい方の Web 画面)と y-websocket は `upstream/public-master`。各部品の役割は [REF-01](../reference/REF-01_Glossary.md) にある。 + - `upstream/private-<branch>` — `-private` の既定ブランチのミラー。`upstream/private-develop`、`upstream/private-master`(ember-osf-web、y-websocket)、または `upstream/private-main`(OASys、Shibboleth-SP、rdmcp、aipf_mcp_data_grdm)。Shibboleth-SP には加えて `upstream/public-main` があり、OASys・rdmcp・aipf_mcp_data_grdm は公開上流がなく private のブランチだけを持つ。 + - `upstream/cos-develop` — CenterForOpenScience 本家のミラー。参照のみ(COS 本家のない wiki-frontend にはない)。 + - 同じ kind の二つ目の上流にはタグを挟む。`upstream/private-sec-test-fix-sec-test` は `RDM-osf.io-private`(ブランチ `fix/sec-test`)を候補として写したもの。 + ミラーは日次で更新します([SPEC-05](../spec/05_upstream_tracking.md))。 +3. **`develop` への統合順**: 公開 `develop` → `-private` → 採用した「プルリクエスト」(レビュー待ちの変更の提案。[REF-01](../reference/REF-01_Glossary.md))。上流でマージ(変更を共有のブランチへ受け入れること。[REF-01](../reference/REF-01_Glossary.md))済みの変更は全件取り込み、未マージ PR はセキュリティ・認証系を先に一件ずつ採否を決め、候補は manifest に載せます。 +4. **force push なし、削除なし。** 衝突は PR 上の新しいコミットで解き、履歴は書き換えません。ブランチは削除せずタグで保管します。 +5. **`-dev2027` から公開のこのリポジトリへ写すのは、名前、ブランチ名、SHA、日付、PR 番号だけ。** `-private` 由来のコードから作るイメージ(コンテナの元になるレシピと材料。[REF-01](../reference/REF-01_Glossary.md))は、ローカルの Docker(イメージを作りコンテナを動かす道具。[REF-01](../reference/REF-01_Glossary.md))か非公開レジストリにだけ置き、公開レジストリには出しません。 + +```mermaid +flowchart TD + PUB["公開コア<br/>既定ブランチ"] -->|日次ミラー| UP1["upstream/public-<branch>"] + PRV["-private<br/>既定ブランチ"] -->|日次ミラー| UP2["upstream/private-<branch>"] + COS["CenterForOpenScience<br/>develop"] -->|日次ミラー| UP3["upstream/cos-develop"] + UP1 -->|1. マージ| DEV["develop(統合)"] + UP2 -->|2. マージ| DEV + PRS["採用 PR<br/>(セキュリティ・認証を先に)"] -->|3. PR と Codex レビュー| DEV + UP3 -.->|参照のみ| DEV + DEV -->|"名前と SHA"| MAN["manifest/upstreams.json<br/>(公開リポジトリ)"] +``` + +### 4. 結果 + +- **良い点:** 「公開+非公開+採用 PR」を解く場所が部品ごとに一つになる。インストーラーは名前と SHA だけで足りる。日次ミラーで差分が小さく保たれる。履歴が完全で監査できる。 +- **良い点:** 既存リポジトリへの新しい権限を求めずに、書込の境界を守れる。 +- **コスト:** 見守るリポジトリが 11 本増える。[SPEC-05](../spec/05_upstream_tracking.md) の自動化と進捗ボードで和らげる。 +- **コスト:** `-dev2027` は非公開のため、GitHub Actions(コードが変わるたびに検査を走らせる GitHub のロボット。[REF-01](../reference/REF-01_Glossary.md))の実行時間とセルフホストランナーの利用が Team プランの枠を使う。受け入れる。 +- **リスク — 公開のこのリポジトリへの漏えい。** `-dev2027` や `-private` からファイル、スタックトレース、URL を一つ不注意に写すだけで、非公開のセキュリティ作業が公開されます。対策: CI(continuous integration。変更ごとに自動で走る検査。[REF-01](../reference/REF-01_Glossary.md))の秘密スキャンを必須にする。レビュワはこのリポジトリへの全 PR で非公開のパスと URL を確かめる。manifest のスキーマは名前・ブランチ・SHA・日付・PR 番号しか許さない。文書は非公開リポジトリを名前で呼び、リンクしない([SPEC-06 §5](../spec/06_documentation_conventions.md))。 +- **リスク — 公開と非公開のずれ。** 2026-11-05 時点で公開 `RDM-osf.io` の develop は `-private` より新しかった。統合順(公開を先、次に非公開)と日次ミラーにより、こうしたずれは黙った上書きではなくマージとして見えます。 +- **未決:** `RDM-osf.io-develop-private` とは別物の `RDM-osf.io-private`(ブランチ `fix/sec-test`)の扱い。`upstream/private-sec-test-fix-sec-test` としてミラーし、manifest には `status: candidate` で載せています([SPEC-01 §4](../spec/01_manifest.md#4-規則) の規則 6)。マージするかは所有者が決めます。 + +--- + +### 5. 統合順の初回構築(2026-11-05 決定: 厳密に再構築する) + +**状態:** 所有者は「`-private` の先端を起点にして、より新しい公開の先端をマージする」という解釈の提案を **退けた**(RDM-osf.io-dev2027 PR #1 のレビュー r1/r2、指摘 R2)。[SPEC-01 §4](../spec/01_manifest.md) の統合順は、初回構築にも文字どおり適用する。 + +**適用範囲。** この手順は、manifest に公開上流が記録されている部品すべて(コア 6 本、y-websocket、Shibboleth-SP)に適用する。private の上流しかない部品(OASys、rdmcp、aipf_mcp_data_grdm)には起点にする公開物がないため、`develop` は `-private` の先端から始め、再構築は行わない。公開と private の先端が同じコミットのとき(2026-11-05 の wiki-frontend)は結合するものがないので、両者が分岐するまで統合 PR は出さない。 + +**範囲内の各部品の手順:** + +1. `upstream/public-<branch>` の先端からブランチ `integrate/strict-<YYYYMMDD>` を切る。 +2. そこへ `upstream/private-<branch>` を通常の 2 親マージ(`--no-ff`)で取り込み、衝突はそのブランチ上で解消する。 +3. manifest の採用 PR を、それぞれ独立したマージとして再適用する。 +4. そのブランチから `develop` へ PR を出す。`develop` は force push も削除もしない。この PR は以前の統合 PR を置き換え、以前の PR は新しい PR を示すコメントを付けて閉じる。 +5. REV(担当レビュワ。各変更を独立に見直す役割。[REF-01](../reference/REF-01_Glossary.md))のレビュー、QAE(QA担当。成果が正しいか検査する役割。[REF-01](../reference/REF-01_Glossary.md))の検査、所有者のマージ(ADR-04)。 + +**結果:** 範囲内の各リポジトリの最初の `develop`(初回構築で `-private` の先端から作ったもの)は履歴に残る。厳密に再構築したブランチはその上にマージされるので、最初の厳密マージ以降、どの `develop` も「公開が先」の順序を持つ。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Fork | Your own copy of someone's repository that remembers where it came from. | 他人のリポジトリの自分用の写し。出どころを覚えている。 | +| Mirror | An identical copy that is refreshed automatically. | 自動で更新される、そっくり同じ写し。 | +| Pull request (PR) | A proposed change waiting for someone to review and accept it. | 誰かが見て受け入れるのを待っている、変更の提案。 | +| Patch | A small text file that describes a change to code. | コードの変更内容を書いた小さな文字ファイル。 | +| Force push | Overwriting shared history; forbidden here. | 共有の履歴の上書き。ここでは禁止。 | + +Full shared glossary: [REF-01 Glossary](../reference/REF-01_Glossary.md). diff --git a/docs/decisions/ADR-02_Network_Model.md b/docs/decisions/ADR-02_Network_Model.md new file mode 100644 index 0000000..93e07c5 --- /dev/null +++ b/docs/decisions/ADR-02_Network_Model.md @@ -0,0 +1,188 @@ +# ADR-02 Network Model / ネットワーク方式 + +> **Summary:** We drop the upstream loopback alias `192.168.168.167` (which needed `sudo` and exposed services to the local network) and use the Docker Compose internal network for service-to-service traffic plus `127.0.0.1`-only publishing for the browser. +> **概要:** 上流のループバック別名 `192.168.168.167`(`sudo` が要り、サービスを LAN に露出した)をやめ、サービス間は Docker Compose の内部ネットワーク、ブラウザ向けは `127.0.0.1` だけへの公開にする。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.2 — 2026-11-05. **Learned:** Docker cannot publish ports from an internal network, so "one internal network" became two networks with an explicit egress switch (PR #21 review r1, finding 8). / Docker は内部ネットワークからポートを公開できないため、「内部ネットワーク一つ」は二つのネットワークと明示的な egress の切替になった(PR #21 レビュー r1、指摘 8)。 + 0.1 — 2026-11-05. **Learned:** the alias existed only so that one address worked both inside containers and in the browser; once services talk by Compose service name and the browser talks to `127.0.0.1`, no shared address is needed and the `sudo` step disappears with it. / 別名は「一つのアドレスがコンテナの中でもブラウザでも通る」ためだけに存在していた。サービス間が Compose のサービス名で、ブラウザが `127.0.0.1` で話せば共通アドレスは不要になり、`sudo` の手順も一緒に消えると分かった。 +- Status: Accepted by the owner, 2026-11-05 (plan-interview). +- Records a decision for: [POL-01 §5](../policy/POL-01_Developer_Environment_2027_Position.md) · [SPEC-02 Installer CLI](../spec/02_installer_cli.md) · [SPEC-03 Security Gate](../spec/03_security_gate.md) +- Related: [docs/README.md](../README.md) · [SPEC-00 Overview](../spec/00_overview.md) · [SPEC-04 Acceptance Tests](../spec/04_acceptance_tests.md) · [ADR-01](ADR-01_Integration_Repository_Placement.md) · [ADR-03](ADR-03_Staged_Security_Gate.md) · [REF-01 Glossary](../reference/REF-01_Glossary.md) · legacy guide `docs/guides/environment/README.md` (moved from `Environment.md`) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Context + +The upstream `docker-compose.yml` of `RDM-osf.io` and its `README-docker-compose.md` ask the developer to add `192.168.168.167` as an *alias* (an extra name or address for the same thing) on the *loopback* interface (the network path that leads back to your own computer; `127.0.0.1` and `localhost` are its usual names). The alias is configured with administrator rights: + +- macOS: `sudo ifconfig lo0 alias 192.168.168.167/24` +- Linux: an interface configuration or `ip addr add` with `sudo` +- Windows: `netsh interface ip add address "Loopback" 192.168.168.167 255.255.255.0` as administrator + +The reason is a single address that works in two places. *Containers* (boxes that hold one program and everything it needs) talk to each other — the `web` service calls `wb` (waterbutler), `mfr` and `fakecas`; the browser on the host also needs those addresses in redirects and in JavaScript. Giving the host a fixed alias and publishing every *port* (a numbered door on an address through which one program listens) on `0.0.0.0` made both paths use one address. + +This conflicts with three rules of the 2027 environment ([POL-01](../policy/POL-01_Developer_Environment_2027_Position.md)): + +1. **localhost only** (localhost is the network address that leads back to your own computer; see [REF-01](../reference/REF-01_Glossary.md)) — nothing listens on an address reachable from the local network; +2. **no LAN exposure** — `0.0.0.0` publishing is not allowed, because a development instance with EOL (end-of-life: no longer fixed by its makers; see [REF-01](../reference/REF-01_Glossary.md)) components must never be reachable by a neighbour on the same Wi-Fi; +3. **no sudo** — the installer runs as an ordinary user, so it is safe to run on a laptop managed by someone else and simple to run in CI (continuous integration: automatic checks on every change; see [REF-01](../reference/REF-01_Glossary.md)). + +The alias also fails in practice: it disappears after reboot on macOS, Windows setups were never confirmed, and port `5000` collides with macOS AirPlay Receiver on macOS 15 and later (the legacy guide already recommends remapping it). + +### 2. Options considered + +```toon +options[3]{id,option,needs_sudo,lan_exposure,matches_upstream_docs,test_matrix,verdict}: + A,"Keep the 192.168.168.167 loopback alias as upstream does",yes,yes,yes,1,rejected + B,"Drop the alias: Compose internal network for services, 127.0.0.1 publishing for the browser",no,no,no,1,chosen + C,"Support both, selected by --legacy-network",partly,partly,partly,2,rejected +``` + +- **A** keeps upstream documents literally true but violates all three rules above. Rejected. +- **C** doubles the test matrix (every acceptance test twice) and keeps `sudo` code paths alive in the installer. Rejected; a developer who really needs the alias can still follow the upstream README by hand, outside the installer. + +### 3. Decision + +1. **Service-to-service traffic uses the internal Compose network `grdm` (`internal: true`).** Every service addresses another by its Compose service name (`web`, `api`, `wb`, `mfr`, `fakecas`, `cas`, `postgres`, `elasticsearch`, `rabbitmq`, `redis`, `mongo`); the built-in DNS of Docker (the tool that builds images and runs containers; see [REF-01](../reference/REF-01_Glossary.md)) resolves them, no fixed IP addresses. An internal network has no egress. Browser-facing services are additionally attached to the plain bridge `grdm-edge`, from which their ports are published on `127.0.0.1` (decision 2). A service that needs the Internet is attached to `grdm-edge` explicitly with `compose render --egress`, recorded in `runtime/.env` (`GRDM_EGRESS_SERVICES`); the default grants none. +2. **Browser-facing traffic is published on `127.0.0.1` only.** The generated Compose file writes `127.0.0.1:<host-port>:<container-port>`, never `0.0.0.0` or a bare port. The default host ports are defined once, in the ports table of [SPEC-02 §4](../spec/02_installer_cli.md#2-en-ports) (`5000` web, `8000` api, `8001` admin, `7777` wb, `7778` mfr, `8080` fakecas, `4200` ember). The installer checks each port is free and remaps on collision (macOS AirPlay on `5000` is the known case), recording the mapping in `runtime/.env` and the install report. +3. **Settings that differ from upstream documents are rewritten by the installer**, not by hand: + - `website/settings/local.py` and `api/base/settings/local.py`: `DOMAIN`, `API_DOMAIN`, `WATERBUTLER_URL`, `MFR_SERVER_URL`, `CAS_SERVER_URL` and similar — the *internal* URLs use service names, the *external* (browser) URLs use `http://127.0.0.1:<port>/`; + - `.docker-compose.env`, `.docker-compose.wb.env`, `.docker-compose.mfr.env`, `.docker-compose.sharejs.env`: hostnames and ports as above; secrets are random values generated at install time ([SPEC-03](../spec/03_security_gate.md)); + - `runtime/docker-compose.yml` is generated from the manifest and the host profile ([SPEC-02 §3](../spec/02_installer_cli.md#english)); the upstream `docker-compose.yml` files in the integration repositories are left untouched so upstream diffs stay clean. +4. **`grdm-dev health --network`** fails if any container port is listening on an address other than `127.0.0.1` on the host ([SPEC-04](../spec/04_acceptance_tests.md)). +5. **Browser behaviour:** acceptance tests and users open `http://127.0.0.1:5000/`. `localhost` is accepted as an equivalent in docs, but the installer writes `127.0.0.1` to avoid IPv6 `::1` surprises in Node-based services. + +```mermaid +flowchart LR + subgraph OLD["Old: loopback alias (upstream)"] + H1["Host: sudo ifconfig lo0 alias<br/>192.168.168.167"] + B1["Browser → 192.168.168.167:5000"] + W1["web"] -->|"192.168.168.167:7777"| WB1["wb"] + W1 -->|"192.168.168.167:8080"| FC1["fakecas"] + B1 --> W1 + H1 -. "0.0.0.0 publishing<br/>reachable from LAN" .-> W1 + end + subgraph NEW["New: internal network + 127.0.0.1 (chosen)"] + B2["Browser → 127.0.0.1:5000"] + subgraph NET["compose network (private DNS)"] + W2["web"] -->|"http://wb:7777"| WB2["wb"] + W2 -->|"http://fakecas:8080"| FC2["fakecas"] + end + B2 -->|"127.0.0.1:5000 → web"| W2 + B2 -->|"127.0.0.1:7777 → wb"| WB2 + end +``` + +### 4. Consequences + +- **Exposure to be aware of.** The seven browser-facing services (`web`, `api`, `admin`, `wb`, `mfr`, `fakecas`, `ember_osf_web`) sit on the ordinary bridge `grdm-edge` so that their ports can be published; on that network they also have outbound access to the Internet. All other services have no egress by default. Add-on development against external providers from a non-publishing service requires `compose render --egress <service>`; every grant, implicit or explicit, is visible to the security gate. + +- **Good:** no `sudo`, nothing survives a reboot that must be redone, nothing is reachable from the LAN, the same Compose file works on macOS, Ubuntu and WSL2 (a way to run Linux inside Windows; see [REF-01](../reference/REF-01_Glossary.md)), and CI can run it unmodified. +- **Good:** fewer moving parts for the security gate — the "listening address" check in [SPEC-03](../spec/03_security_gate.md) becomes a one-line rule. +- **Cost — divergence from upstream documents.** `README-docker-compose.md` in the public cores still describes the alias. Every place where our settings differ is explained in the environment guide at `docs/guides/environment/README.md`, with a table "upstream says / we do / why". Developers who copy commands from upstream must read that table first. +- **Cost — redirects and absolute URLs.** OSF (the software GRDM is built on; see [REF-01](../reference/REF-01_Glossary.md)) builds absolute URLs from `DOMAIN` and `API_DOMAIN`; if a service receives an internal name and echoes it to the browser, the browser cannot resolve it. The installer therefore separates internal and external URL settings, and the acceptance tests include a redirect-chain check (login via fakecas, file download via wb, preview via mfr). +- **Cost — Chrome cookie sharing.** The legacy guide noted that Chrome did not share cookies between fakecas and the web UI under the alias. With everything on `127.0.0.1` and distinct ports, cookies are per host, so the same caution applies; the login scenario of the acceptance tests (Chromium, [SPEC-04 §1](../spec/04_acceptance_tests.md#english)) catches it. +- **Not provided:** access from another machine on the LAN (for example, testing from a phone). If needed later, it is a separate, explicit decision, not a flag. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 背景 + +`RDM-osf.io` の上流 `docker-compose.yml` と `README-docker-compose.md` は、開発者に `192.168.168.167` を「ループバック」(自分の計算機へ戻ってくるネットワークの道。普段は `127.0.0.1` や `localhost` と呼ぶ)の「別名」(同じものに付ける追加の名前やアドレス)として足すよう求めます。この設定には管理者権限が要ります。 + +- macOS: `sudo ifconfig lo0 alias 192.168.168.167/24` +- Linux: インタフェース設定ファイル、または `sudo` 付きの `ip addr add` +- Windows: 管理者で `netsh interface ip add address "Loopback" 192.168.168.167 255.255.255.0` + +理由は、一つのアドレスを二つの場所で通すためです。「コンテナ」(一つのプログラムと必要なものを入れた箱)同士が話す — `web` が `wb`(waterbutler)、`mfr`、`fakecas` を呼ぶ — 一方で、ホストのブラウザも転送先や JavaScript の中でそのアドレスを必要とします。ホストに固定の別名を付け、全「ポート」(一つのアドレスに付いた番号付きの扉。プログラムはここで待つ)を `0.0.0.0` で公開すれば、両方の道が一つのアドレスで済んだのです。 + +これは 2027 版の三つの規則([POL-01](../policy/POL-01_Developer_Environment_2027_Position.md))と衝突します。 + +1. **localhost のみ**(localhost は自分の計算機へ戻るネットワークの住所。[REF-01](../reference/REF-01_Glossary.md))— LAN から届くアドレスで待つものを置かない。 +2. **LAN への露出なし** — `0.0.0.0` での公開は認めない。EOL(end of life。作った人がもう直さない。[REF-01](../reference/REF-01_Glossary.md))部品を含む開発インスタンスが、同じ Wi-Fi の隣人から届いてはならない。 +3. **sudo 不要** — インストーラーは一般ユーザーで動く。他人が管理するノート PC でも安全に、CI(continuous integration。変更ごとに自動で走る検査。[REF-01](../reference/REF-01_Glossary.md))でも簡単に動かせる。 + +別名は実務でもつまずきます。macOS では再起動で消え、Windows は動作未確認で、ポート `5000` は macOS 15 以降の AirPlay レシーバーと衝突します(旧手引きが既に付け替えを勧めています)。 + +### 2. 検討した選択肢 + +```toon +options[3]{id,option,needs_sudo,lan_exposure,matches_upstream_docs,test_matrix,verdict}: + A,"上流どおり 192.168.168.167 のループバック別名を維持",yes,yes,yes,1,不採用 + B,"別名を廃止。サービス間は Compose 内部ネットワーク、ブラウザ向けは 127.0.0.1 で公開",no,no,no,1,採用 + C,"両対応。--legacy-network で切替",partly,partly,partly,2,不採用 +``` + +- **A** は上流文書を文字どおり正しいままにしますが、上の三つの規則をすべて破ります。不採用。 +- **C** は試験の組み合わせを倍にし(全受入試験を二度)、インストーラーに `sudo` の経路を残します。不採用。本当に別名が要る開発者は、インストーラーの外で上流 README を手で追えます。 + +### 3. 決定 + +1. **サービス間通信は内部 Compose ネットワーク `grdm`(`internal: true`)を使う。** 各サービスは相手を Compose のサービス名(`web`、`api`、`wb`、`mfr`、`fakecas`、`cas`、`postgres`、`elasticsearch`、`rabbitmq`、`redis`、`mongo`)で呼び、Docker(イメージを作りコンテナを動かす道具。[REF-01](../reference/REF-01_Glossary.md))内蔵の DNS(名前をアドレスに変える電話帳)が解決する。固定 IP は使わない。内部ネットワークには外向き通信がない。ブラウザ向けサービスは通常の bridge `grdm-edge` にも接続し、そこから `127.0.0.1` にポートを公開する(決定 2)。インターネットが必要なサービスは `compose render --egress` で明示的に `grdm-edge` へ接続し、`runtime/.env`(`GRDM_EGRESS_SERVICES`)に記録する。既定では何も与えない。 +2. **ブラウザ向けの公開は `127.0.0.1` だけ。** 生成する Compose ファイルには `127.0.0.1:<ホスト側ポート>:<コンテナ側ポート>` と書き、`0.0.0.0` やポート番号だけの書き方はしません。既定のホスト側ポートは [SPEC-02 §4](../spec/02_installer_cli.md#2-ja-ports) のポート表で一度だけ定めます(`5000` web、`8000` api、`8001` admin、`7777` wb、`7778` mfr、`8080` fakecas、`4200` ember)。インストーラーは各ポートの空きを確かめ、衝突時(macOS の AirPlay と `5000` が既知)は付け替えて `runtime/.env` と導入報告書に記録します。 +3. **上流文書と異なる設定は、手ではなくインストーラーが書き換える。** + - `website/settings/local.py` と `api/base/settings/local.py`: `DOMAIN`、`API_DOMAIN`、`WATERBUTLER_URL`、`MFR_SERVER_URL`、`CAS_SERVER_URL` およびその類。「内部」の URL はサービス名、「外部」(ブラウザ)の URL は `http://127.0.0.1:<ポート>/`。 + - `.docker-compose.env`、`.docker-compose.wb.env`、`.docker-compose.mfr.env`、`.docker-compose.sharejs.env`: ホスト名とポートは上記のとおり。秘密は導入時に乱数で生成([SPEC-03](../spec/03_security_gate.md))。 + - `runtime/docker-compose.yml` は manifest とホストのプロファイルから生成([SPEC-02 §3](../spec/02_installer_cli.md#japanese))。統合リポジトリ内の上流の `docker-compose.yml` には触れず、上流との差分を汚しません。 +4. **`grdm-dev health --network`** は、ホスト上で `127.0.0.1` 以外のアドレスで待つコンテナのポートがあれば不合格にします([SPEC-04](../spec/04_acceptance_tests.md))。 +5. **ブラウザの挙動:** 受入試験と利用者は `http://127.0.0.1:5000/` を開きます。文書では `localhost` も同義として認めますが、Node 系サービスで IPv6 の `::1` に化ける事故を避けるため、インストーラーは `127.0.0.1` を書きます。 + +```mermaid +flowchart LR + subgraph OLD["旧: ループバック別名(上流)"] + H1["ホスト: sudo ifconfig lo0 alias<br/>192.168.168.167"] + B1["ブラウザ → 192.168.168.167:5000"] + W1["web"] -->|"192.168.168.167:7777"| WB1["wb"] + W1 -->|"192.168.168.167:8080"| FC1["fakecas"] + B1 --> W1 + H1 -. "0.0.0.0 公開<br/>LAN から届く" .-> W1 + end + subgraph NEW["新: 内部ネットワーク+127.0.0.1(採用)"] + B2["ブラウザ → 127.0.0.1:5000"] + subgraph NET["compose ネットワーク(内部 DNS)"] + W2["web"] -->|"http://wb:7777"| WB2["wb"] + W2 -->|"http://fakecas:8080"| FC2["fakecas"] + end + B2 -->|"127.0.0.1:5000 → web"| W2 + B2 -->|"127.0.0.1:7777 → wb"| WB2 + end +``` + +### 4. 結果 + +- **知っておくべき露出。** ブラウザ向けの 7 サービス(`web`、`api`、`admin`、`wb`、`mfr`、`fakecas`、`ember_osf_web`)はポートを公開するために通常の bridge `grdm-edge` にいて、その網ではインターネットへの外向き通信もできる。それ以外のサービスには既定で外向き通信がない。公開しないサービスから外部プロバイダへ向かうアドオン開発には `compose render --egress <service>` が要り、暗黙・明示を問わずすべての付与はセキュリティの門から見える。 + +- **良い点:** `sudo` が不要。再起動後にやり直す手順がない。LAN から届くものがない。同じ Compose ファイルが macOS・Ubuntu・WSL2(Windows の中で Linux を動かす仕組み。[REF-01](../reference/REF-01_Glossary.md))で動き、CI でもそのまま動く。 +- **良い点:** セキュリティ門の部品が減る。[SPEC-03](../spec/03_security_gate.md) の「待ち受けアドレス」の検査が一行の規則になる。 +- **コスト — 上流文書との差。** 公開コアの `README-docker-compose.md` は今も別名を説明しています。私たちの設定が異なる箇所はすべて `docs/guides/environment/README.md` の環境手引きで、「上流はこう/私たちはこう/理由」の表にして説明します。上流からコマンドを写す開発者は、まずその表を読みます。 +- **コスト — 転送と絶対 URL。** OSF(GRDM の土台になったソフト。[REF-01](../reference/REF-01_Glossary.md))は `DOMAIN` と `API_DOMAIN` から絶対 URL を作ります。サービスが内部名を受け取ってブラウザへそのまま返すと、ブラウザは解決できません。そのためインストーラーは内部用と外部用の URL 設定を分け、受入試験に転送連鎖の確認(fakecas でのログイン、wb でのダウンロード、mfr でのプレビュー)を含めます。 +- **コスト — Chrome の Cookie 共有。** 旧手引きは、別名の下では Chrome が fakecas と Web UI の間で Cookie を共有しないと注意していました。すべて `127.0.0.1` で別ポートでも Cookie はホスト単位なので、同じ注意が残ります。受入試験のログインのシナリオ(Chromium。[SPEC-04 §1](../spec/04_acceptance_tests.md#japanese))がこれを検出します。 +- **提供しないもの:** LAN 上の別の計算機からのアクセス(例: スマートフォンからの確認)。後で必要になれば、フラグではなく別の明示的な決定にします。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Loopback / localhost | The network path that leads back to your own computer; `127.0.0.1`. | 自分の計算機へ戻ってくるネットワークの道。`127.0.0.1`。 | +| Alias | An extra name or address for the same thing. | 同じものに付ける追加の名前やアドレス。 | +| Port | A numbered door on an address through which one program listens. | アドレスに付いた番号付きの扉。プログラムはここで待つ。 | +| DNS | The phone book that turns a name into an address. | 名前をアドレスに変える電話帳。 | +| Docker Compose | A tool that starts many containers together from one file. | 一つのファイルから多くのコンテナをまとめて起こす道具。 | +| sudo | Running a command with administrator rights. | 管理者の権限でコマンドを動かすこと。 | + +Full shared glossary: [REF-01 Glossary](../reference/REF-01_Glossary.md). diff --git a/docs/decisions/ADR-03_Staged_Security_Gate.md b/docs/decisions/ADR-03_Staged_Security_Gate.md new file mode 100644 index 0000000..033d334 --- /dev/null +++ b/docs/decisions/ADR-03_Staged_Security_Gate.md @@ -0,0 +1,174 @@ +# ADR-03 Staged Security Gate / セキュリティの門の段階化 + +> **Summary:** We want zero vulnerabilities that would resist a top-tier AI attacker, but every current base image is end-of-life. We decided on a gate that starts as "report plus a shrinking allow-list" at M1 and becomes "zero CRITICAL/HIGH plus a passing AI red team" at M5, instead of enforcing zero from the first day or warning forever. +> **概要:** 最上位の AI 攻撃者にも耐える脆弱性ゼロを目指すが、現行のベースイメージはすべてサポート終了である。初日からゼロを強制する案も、ずっと警告だけの案も採らず、M1 では「報告+減っていく許容リスト」、M5 では「CRITICAL/HIGH ゼロ+AI レッドチーム合格」へ厳しくなる門を採った。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-06. **Learned:** the baseline's "no stage, no allow-list" needed one explicit carve-out — recorded, reviewed and shrinking hardening exceptions for EOL images — or every real install would have contradicted the ADR (PR #33 review r1 R1-03). / 基本対策の「段階も許容リストもない」には、EOL イメージのための記録・見直し・縮小される堅牢化の例外という明示の切り出しが一つ要った。さもなければ実機導入のたびに ADR と矛盾した(PR #33 レビュー r1 R1-03)。 + 0.2 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.1 — 2026-11-05. **Learned:** a safety rule that cannot be met on the day it is written is not a rule but a wish; writing the schedule down turns the wish into something we can measure at each milestone. / 書いた日に守れない安全規則は規則ではなく願いにすぎず、予定表として書くことで、節目ごとに測れるものになると分かった。 +- Status: Accepted (owner, 2026-11-05). Review date: at the start of M4. +- Related: [SPEC-03 Security Gate](../spec/03_security_gate.md) · [SPEC-00 Overview](../spec/00_overview.md) · [SPEC-02 Installer CLI](../spec/02_installer_cli.md) · [SPEC-05 Upstream Tracking](../spec/05_upstream_tracking.md) · [SPEC-06 Documentation Conventions](../spec/06_documentation_conventions.md) · [POL-01 Position](../policy/POL-01_Developer_Environment_2027_Position.md) · [ADR-01 Integration Repository Placement](ADR-01_Integration_Repository_Placement.md) · [ADR-02 Network Model](ADR-02_Network_Model.md) · [ADR-04 AI Autonomy and Roles](ADR-04_AI_Autonomy_and_Roles.md) · [docs/README.md](../README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Context + +The owner's final goal for the developer environment 2027 ([POL-01](../policy/POL-01_Developer_Environment_2027_Position.md)) is to remove *vulnerabilities* (known weak spots that an attacker could use) until the system resists even a top-tier AI attacker, and to keep removing them with AI agents even if COS (the Center for Open Science, the US group that makes OSF; see [REF-01](../reference/REF-01_Glossary.md)) discontinues OSF (the research-sharing software GRDM is built on; see [REF-01](../reference/REF-01_Glossary.md)). A *security gate* (a checkpoint an install must pass) is the tool that makes this measurable: see [SPEC-03](../spec/03_security_gate.md). + +The starting point is far from zero. The *base images* (the ready-made operating system and language layers our containers are built on) used by the six core repositories are all *end-of-life* (EOL: the maker no longer publishes security fixes): + +```toon +base_images_2026_11[9]{service,base,eol_status}: + osf.io,"node:12 + Python 3.6",EOL + waterbutler,"Python 3.6",EOL + mfr,"Python 3.5",EOL + ember-osf-web,"node:8",EOL + cas-overlay,"JDK 8",EOL + postgres,"9.6",EOL + mongo,"3.4",EOL + elasticsearch,"2.x",EOL + elasticsearch,"6.3.1",EOL +``` + +A first scan with Trivy (a scanner that reads our images and lists the security holes it knows about; see [REF-01](../reference/REF-01_Glossary.md)) of such a stack reports hundreds of CVEs (a CVE is the public ID number given to one known security hole; see [REF-01](../reference/REF-01_Glossary.md)), dozens of them HIGH or CRITICAL, and most of them cannot be fixed without the Python 3.13 port planned for M4 and the middleware consolidation planned for M5. If the gate demanded zero at M1, no install would ever complete, and we would have no running baseline to measure the acceptance tests of [SPEC-04](../spec/04_acceptance_tests.md) against. On the other hand, a gate that only warns gives nobody a reason to fix anything, and the final goal would never be reached. + +### 2. Options considered + +| Option | Description | Why rejected / chosen | +|---|---|---| +| A. Enforce zero from M1 | `grdm-dev install` stops on any HIGH or CRITICAL from the first day. | Rejected. Every install would fail. There would be no running environment to port against, no regression baseline, and no evidence of what the fixes change. | +| B. Warn only, forever | Scan, print the counts, never stop. | Rejected. Contradicts the owner's goal. The counts would stay high because nothing forces them down. Overseas distribution (M5) would ship known weaknesses. | +| **C. Staged gate with a shrinking allow-list (chosen)** | M1–M3: baseline controls are mandatory; CVEs are reported and listed in an allow-list whose entry count must never grow between milestones. M4: fail on HIGH/CRITICAL not allow-listed; first AI red team. M5: fail on any CRITICAL/HIGH; AI red team reports zero unresolved intrusion paths. | Chosen. Installs run from day one, the direction of travel is enforced by the never-increasing count, and the final state equals the owner's goal. | + +A variant of C that counted only CRITICAL at M4 was considered and dropped: the Python 3.13 port removes most HIGH findings at the same time, so splitting the threshold would buy nothing. + +### 3. Decision + +1. The gate follows the schedule in [SPEC-03 §5.2](../spec/03_security_gate.md). The current milestone is stored in `manifest/milestone.json` and only the owner changes it. +2. The *baseline controls* of [SPEC-03 §3](../spec/03_security_gate.md) (random secrets with mode 0600, publish only on `127.0.0.1`, internal network, non-root, no privileged, resource limits, pinned digests, secret scanning in CI) have **no stage and no allow-list**. They fail the gate at every milestone, including M1. The non-root, read-only and capability controls admit *bounded hardening exceptions* recorded per service in `manifest/hardening.json` ([SPEC-03 §3.3](../spec/03_security_gate.md#english)): each names the relaxed controls, the upstream reason, a review date and the milestone that removes it, is reported by `scan --baseline`, may not grow after M3, and is not an allow-list entry (PR #33 review r1 R1-03). +3. The *allow-list* (`manifest/allowlist.json`) is the only way to pass a known finding. Every entry carries a CVE id, component, reason, owner, and expiry date. The entry count is compared with the previous milestone's baseline and **must never increase**. Only the owner approves additions. +4. From M4, any HIGH or CRITICAL finding not in the allow-list stops `grdm-dev install` with exit code 50 ([SPEC-02](../spec/02_installer_cli.md)). +5. At M5 and in steady state, CRITICAL and HIGH must be zero, the allow-list may contain no CRITICAL or HIGH entry, and the AI red team ([SPEC-03 §6](../spec/03_security_gate.md)) must report zero unresolved intrusion paths. +6. The environment is documented as development-only and never exposed outside `127.0.0.1` while any allow-list entry exists ([ADR-02](ADR-02_Network_Model.md)). + +```mermaid +flowchart LR + M1[M1<br/>report + allow-list created] --> M2[M2<br/>count ≤ M1] + M2 --> M3[M3<br/>count ≤ M2] + M3 --> M4[M4<br/>fail on HIGH/CRITICAL<br/>first AI red team] + M4 --> M5[M5<br/>zero CRITICAL/HIGH<br/>red team: zero paths] + M5 --> S[steady state<br/>daily scan, auto fix PR] +``` + +### 4. Consequences + +Positive: + +- Installs work from M1, so acceptance tests and the Python 3.13 port have a running baseline. +- Every milestone has a number the owner can check: the allow-list count, which may only go down. +- The final state (M5) is exactly the owner's goal, written in a form that `grdm-dev scan` can verify. +- The non-staged baseline controls mean that even an M1 install is not exposed to the LAN and has no default passwords. + +Negative and how we handle them: + +- Between M1 and M3 the environment knowingly runs EOL software. We state this in every report header and in [docs/README.md](../README.md), and we keep the environment on `127.0.0.1` only. +- The allow-list needs maintenance: expiry dates force re-evaluation at each milestone. AID (AI開発担当者) proposes, REV (担当レビュワ) and QAE (QA担当) check, the owner approves ([ADR-04](ADR-04_AI_Autonomy_and_Roles.md)). +- The jump from M3 to M4 is large. The M4 switch is therefore done only after the Python 3.13 port lands, and this decision is reviewed at the start of M4 (see §5). + +### 5. Review + +This decision is reviewed at the start of M4. Questions to answer then: whether the allow-list count has in fact decreased at M2 and M3; whether the M4 threshold should include MEDIUM for network-facing services; and which model and runner the AI red team uses (open item in [POL-01](../policy/POL-01_Developer_Environment_2027_Position.md)). + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 背景 + +開発環境 2027 版の所有者の最終ゴール([POL-01](../policy/POL-01_Developer_Environment_2027_Position.md))は、「脆弱性」(攻撃者が侵入に使えると分かっている弱い所)を最上位の AI 攻撃者にも耐えるまで除去し、COS(OSF を作る米国の団体 Center for Open Science。[REF-01](../reference/REF-01_Glossary.md))が OSF(GRDM の土台になった研究共有ソフト。[REF-01](../reference/REF-01_Glossary.md))を廃止しても AI エージェントで除去を続けることです。「セキュリティの門」(導入が必ず通る検問所)は、これを測れるようにする道具です([SPEC-03](../spec/03_security_gate.md))。 + +出発点はゼロから遠い所にあります。コア 6 本が使う「ベースイメージ」(コンテナの土台になる、出来合いの OS と言語の層)は、すべて「サポート終了」(EOL。作り手が安全上の修正を出さなくなった状態)です。 + +```toon +base_images_2026_11[9]{service,base,eol_status}: + osf.io,"node:12 + Python 3.6",EOL + waterbutler,"Python 3.6",EOL + mfr,"Python 3.5",EOL + ember-osf-web,"node:8",EOL + cas-overlay,"JDK 8",EOL + postgres,"9.6",EOL + mongo,"3.4",EOL + elasticsearch,"2.x",EOL + elasticsearch,"6.3.1",EOL +``` + +この構成を Trivy(イメージを読んで既知の穴を並べるスキャナ。[REF-01](../reference/REF-01_Glossary.md))で初めてスキャンすると数百件の CVE(既知の穴一つに付けられた公開の番号。[REF-01](../reference/REF-01_Glossary.md))が出て、そのうち数十件が HIGH か CRITICAL で、大半は M4 予定の Python 3.13 移植と M5 予定のミドルウェア集約なしには直せません。門が M1 でゼロを求めれば、導入は一度も完了せず、[SPEC-04](../spec/04_acceptance_tests.md) の受入試験を測る動く基準環境も得られません。逆に、警告だけの門では誰にも直す理由がなく、最終ゴールには永遠に届きません。 + +### 2. 検討した選択肢 + +| 選択肢 | 内容 | 退けた・採った理由 | +|---|---|---| +| A. M1 からゼロを強制 | 初日から HIGH か CRITICAL が一件でもあれば `grdm-dev install` を止める。 | 退けた。すべての導入が失敗する。移植の土台となる動く環境も、回帰の基準も、修正が何を変えたかの証拠も得られない。 | +| B. ずっと警告のみ | スキャンして件数を出すだけで、止めない。 | 退けた。所有者のゴールと矛盾する。減らす力が働かず件数は高いまま。海外配布(M5)で既知の弱点を出荷することになる。 | +| **C. 減っていく許容リスト付きの段階的な門(採用)** | M1〜M3: 基本対策は必須。CVE は報告し、節目をまたいで件数が増えない許容リストに載せる。M4: 許容リスト外の HIGH/CRITICAL で停止。初回の AI レッドチーム。M5: CRITICAL/HIGH が一件でもあれば停止。AI レッドチームが未解決の侵入経路ゼロを報告。 | 採用。初日から導入が動き、「増えない件数」が進む方向を強制し、最終状態が所有者のゴールと一致する。 | + +C の変種として、M4 では CRITICAL だけを数える案も検討して落としました。Python 3.13 移植が HIGH の大半も同時に取り除くため、基準を分けても得るものがないからです。 + +### 3. 決定 + +1. 門は [SPEC-03 §5.2](../spec/03_security_gate.md) の予定表に従う。現在の節目は `manifest/milestone.json` に置き、変更できるのは所有者だけ。 +2. [SPEC-03 §3](../spec/03_security_gate.md) の「基本対策」(乱数の秘密をモード 0600 で、`127.0.0.1` のみ公開、内部ネットワーク、非 root、privileged なし、資源制限、ダイジェスト固定、CI での秘密スキャン)には**段階も許容リストもない**。M1 を含むすべての節目で門を落とす。非 root・読み取り専用・capability の統制には、サービスごとに `manifest/hardening.json` に記録する*限定された堅牢化の例外*がある([SPEC-03 §3.3](../spec/03_security_gate.md#japanese))。各項目は緩める統制・上流側の理由・見直し日・除く節目を持ち、`scan --baseline` が報告し、M3 以降は増やせず、許容リストの項目ではない(PR #33 レビュー r1 R1-03)。 +3. 既知の検出を通す唯一の方法は「許容リスト」(`manifest/allowlist.json`)。各項目は CVE 番号、部品、理由、担当、期限を持つ。件数は前の節目の基準と比べ、**決して増えてはならない**。追加の承認は所有者だけ。 +4. M4 から、許容リストにない HIGH・CRITICAL の検出は `grdm-dev install` を終了コード 50 で止める([SPEC-02](../spec/02_installer_cli.md))。 +5. M5 と恒常運用では、CRITICAL と HIGH はゼロ、許容リストに CRITICAL・HIGH の項目があってはならず、AI レッドチーム([SPEC-03 §6](../spec/03_security_gate.md))が未解決の侵入経路ゼロを報告しなければならない。 +6. 許容リストに項目がある間は、環境を開発専用と明記し、`127.0.0.1` の外へ出さない([ADR-02](ADR-02_Network_Model.md))。 + +```mermaid +flowchart LR + M1[M1<br/>報告+許容リスト作成] --> M2[M2<br/>件数 ≤ M1] + M2 --> M3[M3<br/>件数 ≤ M2] + M3 --> M4[M4<br/>HIGH/CRITICAL で停止<br/>初回 AI レッドチーム] + M4 --> M5[M5<br/>CRITICAL/HIGH ゼロ<br/>レッドチーム: 経路ゼロ] + M5 --> S[恒常運用<br/>日次スキャン・自動修正 PR] +``` + +### 4. 結果 + +良い点: + +- M1 から導入が動くので、受入試験と Python 3.13 移植に動く基準環境がある。 +- 各節目に所有者が確かめられる数字がある。許容リストの件数で、減る方向にしか動かない。 +- 最終状態(M5)は所有者のゴールそのもので、`grdm-dev scan` が検証できる形で書かれている。 +- 段階のない基本対策により、M1 の導入でも LAN に露出せず、既定のパスワードもない。 + +悪い点とその扱い: + +- M1〜M3 の間、環境は承知の上でサポート終了のソフトを動かす。これを全報告のヘッダと [docs/README.md](../README.md) に明記し、環境を `127.0.0.1` だけに留める。 +- 許容リストには手入れが要る。期限が各節目で再評価を強制する。AID(AI開発担当者)が提案し、REV(担当レビュワ)と QAE(QA担当)が確認し、所有者が承認する([ADR-04](ADR-04_AI_Autonomy_and_Roles.md))。 +- M3 から M4 への段差が大きい。そのため M4 への切替は Python 3.13 移植が入った後にだけ行い、この決定を M4 の開始時に見直す(§5)。 + +### 5. 見直し + +この決定は M4 の開始時に見直します。そのとき答える問い: M2・M3 で許容リストの件数が実際に減ったか。ネットワークに面するサービスについて M4 の基準に MEDIUM を含めるべきか。AI レッドチームに使うモデルと実行基盤をどうするか([POL-01](../policy/POL-01_Developer_Environment_2027_Position.md) の未決事項)。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| End-of-life (EOL) | The maker no longer publishes security fixes for that version. | 作り手がその版の安全上の修正を出さなくなった状態。 | +| Base image | The ready-made OS and language layer a container is built on. | コンテナの土台になる、出来合いの OS と言語の層。 | +| Allow-list | Known findings we accept for a limited time, with a reason and an owner. | 理由と担当を付けて期限付きで受け入れる既知の検出の一覧。 | +| Threshold | The line that decides pass or fail. | 合格と不合格を分ける線。 | +| Exit code | The number a program returns when it finishes; 0 means success. | プログラムが終わるときに返す番号。0 は成功。 | diff --git a/docs/decisions/ADR-04_AI_Autonomy_and_Roles.md b/docs/decisions/ADR-04_AI_Autonomy_and_Roles.md new file mode 100644 index 0000000..b406285 --- /dev/null +++ b/docs/decisions/ADR-04_AI_Autonomy_and_Roles.md @@ -0,0 +1,242 @@ +# ADR-04 AI Autonomy and Roles / AI の自律度と役割 + +> **Summary:** AI agents detect vulnerabilities, write fix pull requests, review them, and run regression and acceptance tests on their own. Humans keep two actions: merge and publish. This record names who plays which role (AID, QAE, REV, owner), what the agents may never do, and the one question left open. +> **概要:** AI エージェントは脆弱性の検出、修正 PR の作成、レビュー、回帰・受入試験の実行までを自律的に行う。人に残すのはマージと公開の二つ。誰がどの役割(AID・QAE・REV・所有者)を担うか、エージェントが決してしてはならないこと、残した一つの未決事項を記す。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.7 — 2026-11-10. **Learned:** a merge condition stated as "every check green" is vacuously true when no check exists, so the condition must say what happens without CI. / 「すべての検査が緑」という条件は、検査が一つもないと形の上で成り立ってしまう。CI がないときの扱いを条件に書く必要がある。 + 0.6 — 2026-11-10. **Learned:** a delegation that names a model stops applying when another model continues the work, so the owner has to extend it explicitly. / モデルを名指しした委任は、別のモデルが作業を引き継ぐと適用できない。所有者が明示して広げる必要がある。 +- Version / 版: 0.5 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.4 — 2026-11-06. **Learned:** per-PR delegation questions interrupt the owner several times a day during a review-heavy milestone; a standing delegation with explicit conditions and an expiry keeps the human rule while removing the waits. / レビューの多い節目では PR ごとの委任確認が一日に何度も所有者を止める。条件と期限を明示した常設委任なら、人の規則を保ちつつ待ちをなくせる。 + 0.3 — 2026-11-06. **Learned:** each delegated merge batch is recorded before it is executed, with the review records that justify it, so that the human-merge rule stays auditable. / 委任されたマージは一括でも実行前に、根拠となるレビュー記録とともに記録し、「人がマージする」規則を監査できる状態に保つ。 + 0.2 — 2026-11-05. **Learned:** a one-time delegation must be written down with scope, grantor and evidence before it is used, or the human-merge rule erodes silently. / 一回限りの委任でも、使う前に範囲・許可者・証跡を書き残さなければ「人がマージする」規則が静かに崩れると分かった。 + 0.1 — 2026-11-05. **Learned:** the line between "automatic" and "human" is easiest to defend when it sits on two concrete commands, merge and publish, rather than on a judgment such as "important changes". / 「自動」と「人」の境目は、「重要な変更」のような判断ではなく、マージと公開という二つの具体的な操作に置くと最も守りやすいと分かった。 +- Status: Accepted (owner, 2026-11-05). Review date: after steady-state operation has run for one month (open question in §5). +- Related: [SPEC-00 Overview](../spec/00_overview.md) · [SPEC-02 Installer CLI](../spec/02_installer_cli.md) · [SPEC-03 Security Gate](../spec/03_security_gate.md) · [SPEC-04 Acceptance Tests](../spec/04_acceptance_tests.md) · [SPEC-05 Upstream Tracking](../spec/05_upstream_tracking.md) · [SPEC-06 Documentation Conventions](../spec/06_documentation_conventions.md) · [POL-01 Position](../policy/POL-01_Developer_Environment_2027_Position.md) · [ADR-01 Integration Repository Placement](ADR-01_Integration_Repository_Placement.md) · [ADR-02 Network Model](ADR-02_Network_Model.md) · [ADR-03 Staged Security Gate](ADR-03_Staged_Security_Gate.md) · [docs/README.md](../README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Context + +The owner's goal ([POL-01](../policy/POL-01_Developer_Environment_2027_Position.md)) is that GRDM keeps being provided even if COS (the Center for Open Science, the US group that makes OSF; see [REF-01](../reference/REF-01_Glossary.md)) discontinues OSF (the research-sharing software GRDM is built on; see [REF-01](../reference/REF-01_Glossary.md)), through *continuous vulnerability remediation* (finding and fixing weak spots again and again, every day, not once) done by *AI agents* (programs that read, write, and test code on their own when given a task). The security gate of [SPEC-03](../spec/03_security_gate.md) produces a daily list of findings; someone must turn each finding into a fix. + +At the same time, the development policy POL-05 of the GRDM core repository, which this repository inherits, draws two lines that must not move: + +- **An author never accepts their own work.** The one who wrote a change does not judge whether it passes. +- **Merge and publish are human actions.** (Merge: accepting a change into the shared branch; see [REF-01](../reference/REF-01_Glossary.md).) No agent commits to the main branch or publishes an image or a release. + +The question is how much of the path between "finding" and "merge" AI agents may walk alone. + +### 2. Options considered + +| Option | Description | Why rejected / chosen | +|---|---|---| +| 1. Detect only | Agents scan and open issues; humans do everything else. | Rejected. Does not scale to daily findings across eleven repositories. The owner would be the bottleneck, and the goal of continued provision without COS would not be met. | +| **2. Detect → fix PR → review → automatic regression and acceptance; humans merge and publish (chosen)** | Agents do all the work that produces evidence. Humans do the two actions that change what others receive. | Chosen. Keeps both POL-05 lines intact. Author (AID), reviewer (REV), and judge (QAE) are three different agents, so no one accepts their own work. The owner sees a PR with review and test evidence attached and only decides. | +| 3. Auto-merge after review | Same as 2, but the PR merges itself when review and tests pass. | Rejected for now. Conflicts with POL-05 "merge by humans". A narrow exception for vulnerability-only fixes is kept as an open question (§5). | + +### 3. Decision + +#### 3.1 Roles + +Role abbreviations follow the table in `AGENTS.md`. In records, write the abbreviation with the Japanese role name, for example `AID(AI開発担当者)`. + +```toon +roles[4]{abbr,ja_name,who,runs_on,does}: + AID,AI開発担当者,"Orca Open Code 2 workers","local LLM Qwen 3 Coder Next (model id lmstudio/qwen3-coder-next-mlx)","implement to spec, write fix PRs, propose allow-list entries" + QAE,QA担当,"Claude Code Fable","Claude Code session on Mac Studio","check implementations, run regression and acceptance (SPEC-04), judge pass/fail, write correction requests" + REV,担当レビュワ,"Codex Astra (model id gpt-6-astra)","Orca worker","independent review of every PR; record in docs/reviews/ and as a PR comment" + owner,所有者,"Yusuke Komiyama","human","merge, publish, exceptions, milestone changes, red-team approval" +``` + +The three agent roles are played by three different models on purpose, so that an error habit of one model is not shared by its reviewer or its judge. + +#### 3.2 Flow + +```mermaid +flowchart LR + S[grdm-dev scan<br/>daily finding] --> A[AID<br/>fix PR on a branch] + A --> R[REV<br/>review → docs/reviews/ + PR comment] + R -- changes requested --> A + R -- approved --> Q[QAE<br/>regression + acceptance<br/>SPEC-04] + Q -- fail → correction request --> A + Q -- pass --> O[Owner<br/>merge] + O --> P[Owner<br/>publish image / release] +``` + +- Every step up to and including QAE's judgment is automatic and may run without a human present. +- The owner merges with `gh pr merge` (Japanese subject) or declines. The owner publishes images to `ghcr.io/rcosdp` and tags releases. +- *Subagents* (helper agents an agent starts to split its work) are unlimited in number. The role that started them is responsible for their output. + +#### 3.3 Evidence trail + +Every PR carries, before the owner sees it: + +1. The finding it fixes (CVE id or scan report path from [SPEC-03 §7](../spec/03_security_gate.md)). +2. REV's review record in `docs/reviews/YYYY-MM-DD_<Title>_rN.md` and the same text as a PR comment. +3. QAE's test record: the `grdm-dev accept` and `grdm-dev scan` TOON (a compact text form of JSON; see [REF-01](../reference/REF-01_Glossary.md)) excerpts, pass or fail, and the commit SHA (the fingerprint of one commit; see [REF-01](../reference/REF-01_Glossary.md)) tested. +4. A Japanese commit subject with a scoped prefix (`fix(security):`). + +A PR without all four is not ready for the owner; QAE returns it to AID. + +#### 3.4 Forbidden for every agent + +- `git push --force` to any branch, ever. +- Deleting branches, tags, repositories, images, or data of any kind. +- Writing (push, PR creation, issue creation, comments) to any upstream repository: RCOSDP public cores, RCOSDP `-private` variants, or CenterForOpenScience. Agents write only to this repository and to the `-dev2027` repositories. +- Merging to `develop` or any protected branch; enabling auto-merge; changing branch protection. +- Publishing images, releases, or documentation sites. +- Copying `-private` code, secrets, or private repository URLs into this public repository ([ADR-01](ADR-01_Integration_Repository_Placement.md)). +- Running red-team techniques against anything outside the isolated environment ([SPEC-03 §6](../spec/03_security_gate.md)). + +### 4. Consequences + +- Remediation keeps pace with daily scans without waiting for human working hours; the owner's work shrinks to reading evidence and clicking merge. +- Three different models in three roles raise the cost of a shared blind spot and satisfy "no self-acceptance" structurally. +- Local LLM (large language model: an AI that reads and writes text; see [REF-01](../reference/REF-01_Glossary.md)) workers (AID) have variable quality. The spec-first rule (specifications in `docs/spec/` are written before work is handed to AID) and the QAE check are the compensation. A PR that fails QAE twice is closed and restarted from the spec. +- Running three agent systems costs Mac Studio resources. Concurrency of Open Code 2 (the AI program that writes our code; see [REF-01](../reference/REF-01_Glossary.md)) workers is an open item of [POL-01](../policy/POL-01_Developer_Environment_2027_Position.md). +- Review time from the owner is the only remaining latency. If it becomes the bottleneck for vulnerability fixes, §5 is revisited. + +### 5. Open question + +**Should vulnerability-only fixes be allowed to auto-merge after REV approval and QAE pass?** Arguments for: faster closure of HIGH findings in steady state. Arguments against: POL-05 keeps merge human; a wrong automatic merge in a security path is the most expensive kind of error. Decision deferred until steady-state operation has run for about one month and the owner has seen the real volume and quality of fix PRs. Until then, option 2 stands as written. + +--- + +### Recorded exceptions + +| Date | Exception | Scope | Granted by | Evidence | +|---|---|---|---|---| +| 2026-11-05 | QAE (Claude Code Fable) merges PR #19 of RDM-developer-guide itself, using the repository administrator path of the branch protection because the author cannot approve its own pull request | This one pull request only. Merge, not approve; no other repository | Owner, in the session dialogue | REV r3 record `docs/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3.md` (approve recommended), CI 6/6 green on the merged head | +| 2026-11-06 | QAE (Claude Code Fable) merges, under the owner's explicit delegation given in the session dialogue: RDM-developer-guide PR #20 (manifest: Shibboleth-SP public upstream; ADR-01 §3/§5; Codex r4 pass) and PR #21 (installer M2 stage 1; Codex r5 pass, CI 6/6), and the seven strict-reconstruction pull requests in the private `-dev2027` repositories (Codex r1 pass for five, r2 confirmation for osf.io #2 and Shibboleth-SP #1). Repository-administrator path because the author cannot approve its own pull requests | These nine pull requests only; merge, not approve; no force-push | Owner, in the session dialogue (2026-11-06) | Review records `docs/reviews/2026-11-05_RDM-developer-guide_PR20_*_r4.md`, `2026-11-06_RDM-developer-guide_PR21_Installer_r5.md`, `2026-11-05_dev2027_Strict_Reconstruction_PRs_r1.md`/`_r2.md` | +| 2026-11-06 | **Standing delegation for milestone M2:** QAE (Claude Code Fable) merges any pull request in RDM-developer-guide or a `-dev2027` repository once REV (Codex Astra) has recorded a pass verdict in `docs/reviews/` and every CI check is green on the merged head. Each merge is still listed in this table or in the status board with its review record. Publishing (tags, releases, registry pushes) stays with the owner | Pull requests only, while M2 is in progress; revoked automatically when M2 is marked done on the status board unless renewed | Owner, in the session dialogue (2026-11-06) | This row; per-merge references in `docs/status/README.md` | +| 2026-11-10 | **Extension of the M2 standing delegation:** the Claude Code session continuing this work (Opus 5.5), acting as QAE, merges under the same conditions and scope as the row above, using the repository-administrator path because the author cannot approve its own pull requests | Same as the row above; expires with it | Owner, in the session dialogue (2026-11-10) | This row; per-merge references in `docs/status/README.md` | +| 2026-11-10 | **Repositories without CI:** `RDM-wiki-frontend-dev2027`, `RDM-y-websocket-dev2027` and `RDM-cas-overlay-dev2027` have no workflow, so "every CI check green" cannot be met. Their pull requests are merged on a REV pass plus the local test results recorded in the pull request body. y-websocket PR #2 was merged before this ruling, by a check that treated an empty check list as green; that is recorded here and the merge check now requires at least one check where CI exists | Same as the M2 standing delegation | Owner, in the session dialogue (2026-11-10) | Review records `docs/reviews/2026-11-10_RDM-y-websocket-dev2027_*`, `*_RDM-wiki-frontend-dev2027_*`, `*_RDM-cas-overlay-dev2027_*` | + +The rule "merge and publish are human" is unchanged; every further merge needs its own recorded exception or the owner's hand. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 背景 + +所有者のゴール([POL-01](../policy/POL-01_Developer_Environment_2027_Position.md))は、COS(OSF を作る米国の団体 Center for Open Science。[REF-01](../reference/REF-01_Glossary.md))が OSF(GRDM の土台になった研究共有ソフト。[REF-01](../reference/REF-01_Glossary.md))を廃止しても、「AI エージェント」(課題を与えると自分でコードを読み・書き・試すプログラム)による「継続的な脆弱性対応」(弱い所を一度でなく毎日くり返し見つけて直すこと)で GRDM の提供を続けることです。[SPEC-03](../spec/03_security_gate.md) の門は毎日検出の一覧を出します。誰かがその一件一件を修正に変えなければなりません。 + +一方で、このリポジトリが継承する GRDM コアの開発方針 POL-05 は、動かしてはならない二本の線を引いています。 + +- **作者は自分の成果を受け入れない。** 変更を書いた者が合否を判定しない。 +- **マージと公開は人の操作。**(マージ=変更を共有ブランチへ受け入れること。[REF-01](../reference/REF-01_Glossary.md))どのエージェントも主ブランチにコミットせず、イメージやリリースを公開しない。 + +問いは、「検出」から「マージ」までの道のどこまでを AI エージェントが一人で歩いてよいかです。 + +### 2. 検討した選択肢 + +| 選択肢 | 内容 | 退けた・採った理由 | +|---|---|---| +| 1. 検出のみ | エージェントはスキャンして issue を開き、残りは人が行う。 | 退けた。11 本のリポジトリで毎日出る検出に追いつかない。所有者がボトルネックになり、COS なしで提供を続けるゴールに届かない。 | +| **2. 検出 → 修正 PR → レビュー → 回帰・受入の自動実行。マージと公開は人(採用)** | 証拠を作る仕事はすべてエージェントが行う。他者が受け取るものを変える二つの操作だけを人が行う。 | 採用。POL-05 の二本の線をそのまま守れる。作者(AID)、レビュワ(REV)、判定者(QAE)が別々のエージェントなので、誰も自分の成果を受け入れない。所有者はレビューと試験の証拠が付いた PR を見て、決めるだけでよい。 | +| 3. レビュー後に自動マージ | 2 と同じだが、レビューと試験に合格すると PR が自分でマージされる。 | 今は退けた。POL-05 の「マージは人」と衝突する。脆弱性修正だけの狭い例外は未決事項として残す(§5)。 | + +### 3. 決定 + +#### 3.1 役割 + +役割の略称は `AGENTS.md` の対応表に従います。記録では `AID(AI開発担当者)` のように略称と日本語の役割名を併記します。 + +```toon +roles[4]{abbr,ja_name,who,runs_on,does}: + AID,AI開発担当者,"Orca の Open Code 2 ワーカー","ローカル LLM Qwen 3 Coder Next(モデル ID lmstudio/qwen3-coder-next-mlx)","仕様どおりの実装、修正 PR の作成、許容リスト項目の提案" + QAE,QA担当,"Claude Code Fable","Mac Studio 上の Claude Code セッション","実装の検査、回帰・受入の実行(SPEC-04)、合否の判定、修正指示の作成" + REV,担当レビュワ,"Codex Astra(モデル ID gpt-6-astra)","Orca ワーカー","全 PR の独立レビュー。docs/reviews/ と PR コメントに記録" + owner,所有者,"込山悠介","人","マージ、公開、例外、節目の変更、レッドチームの承認" +``` + +三つのエージェントの役割を三つの異なるモデルに割り当てるのは意図的です。一つのモデルの間違いの癖を、そのレビュワや判定者が共有しないようにするためです。 + +#### 3.2 流れ + +```mermaid +flowchart LR + S[grdm-dev scan<br/>日次の検出] --> A[AID<br/>ブランチに修正 PR] + A --> R[REV<br/>レビュー → docs/reviews/+PR コメント] + R -- 修正要求 --> A + R -- 承認 --> Q[QAE<br/>回帰+受入<br/>SPEC-04] + Q -- 不合格 → 修正指示 --> A + Q -- 合格 --> O[所有者<br/>マージ] + O --> P[所有者<br/>イメージ・リリースの公開] +``` + +- QAE の判定までのすべての段階は自動で、人がいなくても動いてよい。 +- 所有者は `gh pr merge`(日本語の件名)でマージするか、却下する。所有者が `ghcr.io/rcosdp` にイメージを公開し、リリースにタグを付ける。 +- 「サブエージェント」(エージェントが仕事を分けるために起こす補助のエージェント)の数に制限はない。起こした役割がその成果に責任を持つ。 + +#### 3.3 証跡 + +所有者が見る前に、すべての PR は次を持ちます。 + +1. 直す検出(CVE 番号か、[SPEC-03 §7](../spec/03_security_gate.md) のスキャン報告のパス)。 +2. REV のレビュー記録 `docs/reviews/YYYY-MM-DD_<題>_rN.md` と、同じ文の PR コメント。 +3. QAE の試験記録: `grdm-dev accept` と `grdm-dev scan` の TOON(JSON を短く書いた文字の形。[REF-01](../reference/REF-01_Glossary.md))抄録、合否、試験したコミット SHA(コミット一つの指紋。[REF-01](../reference/REF-01_Glossary.md))。 +4. 接頭辞付きの日本語のコミット件名(`fix(security):`)。 + +四つがそろわない PR は所有者に出す状態ではなく、QAE が AID へ戻します。 + +#### 3.4 すべてのエージェントに禁止すること + +- どのブランチへも、いつでも、`git push --force` をしない。 +- ブランチ、タグ、リポジトリ、イメージ、あらゆるデータを削除しない。 +- 上流リポジトリ(RCOSDP の公開コア、RCOSDP の `-private` 版、CenterForOpenScience)へ書き込まない(push、PR 作成、issue 作成、コメント)。エージェントが書くのはこのリポジトリと `-dev2027` 群だけ。 +- `develop` や保護されたブランチへマージしない。自動マージを有効にしない。ブランチ保護を変えない。 +- イメージ、リリース、文書サイトを公開しない。 +- `-private` のコード、秘密、非公開リポジトリの URL をこの公開リポジトリに写さない([ADR-01](ADR-01_Integration_Repository_Placement.md))。 +- 隔離環境の外のどこにもレッドチームの手法を使わない([SPEC-03 §6](../spec/03_security_gate.md))。 + +### 4. 結果 + +- 修正が人の勤務時間を待たずに日次スキャンと同じ速さで進む。所有者の仕事は証拠を読んでマージを押すことに縮む。 +- 三つの役割に三つの異なるモデルを置くことで、共通の盲点が生まれにくくなり、「自己受入の禁止」が構造として満たされる。 +- ローカル LLM(大規模言語モデル。文章を読み書きする AI。[REF-01](../reference/REF-01_Glossary.md))のワーカー(AID)は品質がばらつく。仕様先行の決まり(`docs/spec/` の仕様を書いてから AID に渡す)と QAE の検査がその補いになる。QAE に二度落ちた PR は閉じ、仕様からやり直す。 +- 三つのエージェント体系を動かすと Mac Studio の資源を使う。Open Code 2(コードを書く AI プログラム。[REF-01](../reference/REF-01_Glossary.md))ワーカーの同時実行数は [POL-01](../policy/POL-01_Developer_Environment_2027_Position.md) の未決事項。 +- 残る待ち時間は所有者のレビュー時間だけ。それが脆弱性修正のボトルネックになったら §5 を見直す。 + +### 5. 未決事項 + +**脆弱性修正だけの PR に、REV 承認と QAE 合格の後の自動マージを認めるか。** 賛成の理由: 恒常運用で HIGH の検出をより早く閉じられる。反対の理由: POL-05 はマージを人に残している。セキュリティの経路での誤った自動マージは最も高くつく種類の誤りである。恒常運用を約一か月回し、所有者が修正 PR の実際の量と質を見てから決める。それまでは選択肢 2 を書いたとおりに適用する。 + +--- + +### 記録した例外 + +| 日付 | 例外 | 範囲 | 許可者 | 証跡 | +|---|---|---|---|---| +| 2026-11-05 | QAE(Claude Code Fable)が RDM-developer-guide 自身の PR #19 をマージする。作者は自分の PR を承認できないため、ブランチ保護の管理者経路を使う | この PR 1 件のみ。承認ではなくマージ。他リポジトリには及ばない | 所有者(セッション内の対話) | REV r3 記録 `docs/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3.md`(approve 推奨)、マージ対象 head で CI 6/6 合格 | +| 2026-11-06 | QAE(Claude Code Fable)が、セッション内で所有者が明示した委任により次をマージする: RDM-developer-guide PR #20(manifest: Shibboleth-SP の公開上流、ADR-01 §3/§5。Codex r4 合格)と PR #21(インストーラー M2 第 1 段。Codex r5 合格、CI 6/6)、および非公開 `-dev2027` リポジトリの厳密再構築 PR 7 本(Codex r1 で 5 本合格、osf.io #2 と Shibboleth-SP #1 は r2 で対応確認)。作者は自分の PR を承認できないためリポジトリ管理者の経路を使う | この 9 件の PR のみ。承認ではなくマージ。force push なし | 所有者(セッション内の対話、2026-11-06) | レビュー記録 `docs/reviews/2026-11-05_RDM-developer-guide_PR20_*_r4.md`、`2026-11-06_RDM-developer-guide_PR21_Installer_r5.md`、`2026-11-05_dev2027_Strict_Reconstruction_PRs_r1.md`/`_r2.md` | +| 2026-11-06 | **節目 M2 の間の常設委任:** REV(Codex Astra)が `docs/reviews/` に合格の判定を記録し、マージ対象の head で CI がすべて緑の PR は、RDM-developer-guide と `-dev2027` のいずれでも QAE(Claude Code Fable)がマージする。各マージはこの表か進捗ボードにレビュー記録とともに残す。公開(タグ・リリース・レジストリへの push)は引き続き所有者が行う | PR のみ。M2 進行中に限る。進捗ボードで M2 が完了になった時点で、更新がなければ自動的に失効 | 所有者(セッション内の対話、2026-11-06) | この行と、`docs/status/README.md` のマージごとの参照 | +| 2026-11-10 | **節目 M2 の常設委任の拡張:** この作業を継続する Claude Code セッション(Opus 5.5)が QAE として、上の行と同じ条件と範囲でマージする。作者は自分の PR を承認できないためリポジトリ管理者の経路を使う | 上の行と同じ。同時に失効する | 所有者(セッション内の対話、2026-11-10) | この行と、`docs/status/README.md` のマージごとの参照 | +| 2026-11-10 | **CI のないリポジトリ:** `RDM-wiki-frontend-dev2027`、`RDM-y-websocket-dev2027`、`RDM-cas-overlay-dev2027` にはワークフローがなく「CI がすべて緑」を満たせない。これらの PR は REV の合格と、PR 本文に記録したローカル試験の結果を条件にマージする。y-websocket PR #2 はこの判断の前に、空の結果を緑とみなす確認でマージした。その事実をここに記録し、CI のあるリポジトリでは結果が 1 件以上あることをマージの条件に加えた | M2 の常設委任と同じ | 所有者(セッション内の対話、2026-11-10) | レビュー記録 `docs/reviews/2026-11-10_RDM-y-websocket-dev2027_*`、`*_RDM-wiki-frontend-dev2027_*`、`*_RDM-cas-overlay-dev2027_*` | + +「マージと公開は人が行う」という規則は変わらない。以後のマージはそれぞれ例外の記録か所有者の手を要する。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| AI agent | A program that reads, writes, and tests code on its own when given a task. | 課題を与えると自分でコードを読み・書き・試すプログラム。 | +| Subagent | A helper agent that an agent starts to split its work. | エージェントが仕事を分けるために起こす補助のエージェント。 | +| Pull request (PR) | A proposed change that others can review before it joins the main code. | 主なコードに入る前に、他の人が確かめられる変更の提案。 | +| Merge | Joining a reviewed change into the main branch. | レビュー済みの変更を主ブランチに入れること。 | +| Publish | Making an image, release, or site available to others. | イメージ、リリース、サイトを他の人が使える状態にすること。 | +| Force push | Overwriting shared history on a branch; it can erase other people's work. | 共有された履歴を上書きすること。他の人の作業を消すことがある。 | +| Self-acceptance | An author judging that their own work passes. | 作者が自分の成果を合格と判定すること。 | diff --git a/docs/decisions/ADR-05_Test_IdP_for_Shibboleth.md b/docs/decisions/ADR-05_Test_IdP_for_Shibboleth.md new file mode 100644 index 0000000..48ba1dd --- /dev/null +++ b/docs/decisions/ADR-05_Test_IdP_for_Shibboleth.md @@ -0,0 +1,220 @@ +# ADR-05 Test IdP for Shibboleth / Shibboleth 用テスト IdP + +> **Summary:** The `--auth shibboleth` profile needs a login server that the Shibboleth SP can trust without the Internet. We compared a ready-made SimpleSAMLphp image, Keycloak's SAML server, and the Shibboleth IdP itself, and chose to build our own tiny `test-idp` image from the official SimpleSAMLphp release on `php:8.3-apache`: small, scriptable, arm64 and amd64, non-root, read-only, and populated only with clearly labelled mock users. +> **概要:** `--auth shibboleth` プロファイルには、インターネットなしで Shibboleth SP が信頼できるログインサーバが要る。既製の SimpleSAMLphp イメージ、Keycloak の SAML サーバ、Shibboleth IdP 本体を比べ、SimpleSAMLphp 公式リリースを `php:8.3-apache` に載せた自前の小さな `test-idp` イメージを組むことにした。小さく、設定を機械で書け、arm64 と amd64 で動き、非 root・読み取り専用で、明確に模擬と分かる利用者だけを持つ。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.2 — 2026-11-06. **Learned:** an attribute contract is only real when both sides name the attributes explicitly and a test compares the two files: the generic SimpleSAMLphp `name2oid` map has no GakuNin names, the first OIDs we wrote for `jaOrganizationName`/`jaDisplayName` were the GakuNin arc's `jasn`/`jaou` numbers, and the OID proposed in review (`1.2.392.200453.100.20.1`) is not in the GakuNin standard either; only the published 学認技術運用基準 settles it (§3.7). A mock rule with silent test exemptions is no rule: the one controlled-vocabulary exception is now written down and encoded as an allow-list (§3.5). / 属性の契約は、双方が属性名を明示し、試験が二つのファイルを比べたときにだけ本物になる。SimpleSAMLphp 汎用の `name2oid` に GakuNin の名前はなく、最初に書いた `jaOrganizationName`/`jaDisplayName` の OID は GakuNin の枝の `jasn`/`jaou` の番号で、レビューで示された OID(`1.2.392.200453.100.20.1`)も学認の基準には存在しない。公開された学認技術運用基準だけが決め手になる(§3.7)。試験に黙った例外を持つ模擬規則は規則ではない。語彙統制による唯一の例外を明文化し、許可一覧として符号化した(§3.5)。 + - 0.1 — 2026-11-06. **Learned:** every ready-made test IdP image we found fails at least one baseline control of SPEC-03 §3 (root, amd64 only, floating tag, or a Java heap larger than the rest of the profile), so the smallest honest option is to own the image: a few lines of Dockerfile over an official multi-arch base, with the configuration rendered from templates like every other service. / 見つけた既製のテスト IdP イメージはどれも SPEC-03 §3 の基本対策のどこかに外れる(root、amd64 のみ、動くタグ、プロファイル全体より大きい Java ヒープ)。だから最も小さく正直な選択は、公式のマルチアーキテクチャのベースに数行の Dockerfile を載せた自前のイメージを持ち、設定はほかのサービスと同じくテンプレートから描画することだと分かった。 +- Status: Proposed for the owner's approval, 2026-11-06 (M3 preparation). Review date: start of M4. +- Records a decision for: [SPEC-04 §5](../spec/04_acceptance_tests.md#english) · [SPEC-02 §4](../spec/02_installer_cli.md#2-en-ports) · [SPEC-03 §3](../spec/03_security_gate.md#english) +- Related: [docs/README.md](../README.md) · [ADR-02 Network Model](ADR-02_Network_Model.md) · [ADR-03 Staged Security Gate](ADR-03_Staged_Security_Gate.md) · [POL-01 Position](../policy/POL-01_Developer_Environment_2027_Position.md) · [REF-01 Glossary](../reference/REF-01_Glossary.md) · `installer/grdm_dev/templates/idp/README.md` · `installer/acceptance/fixtures/idp/README.md` + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Context + +GakuNin RDM (GakuNin is Japan's academic network for logging in with a university account; see [REF-01](../reference/REF-01_Glossary.md)) logs institutional users in through *Shibboleth* (the software universities use for single sign-on): the *SP* (service provider, the GRDM-side part that trusts a login) receives a *SAML* (the document format an IdP and an SP use to pass a login result; see [REF-01](../reference/REF-01_Glossary.md)) message from the institution's *IdP* (identity provider, the server that checks who you are). The `full` profile with `--auth shibboleth` ([SPEC-02 §4](../spec/02_installer_cli.md#2-en-ports)) removes `fakecas` and starts `shibboleth_sp` (built from `RDM-Shibboleth-SP-dev2027`, Apache httpd + shibd on a CentOS base) plus a bundled `test_idp`, so that acceptance scenario S5 ([SPEC-04 §5.1](../spec/04_acceptance_tests.md#english)) can prove the SP → IdP → GRDM path with one success and one rejection case. + +The developer environment imposes conditions that a production IdP never meets: + +1. **Offline.** The `grdm` network has no egress ([ADR-02](ADR-02_Network_Model.md)); metadata, certificates and users must come from files the installer renders. +2. **Two architectures.** Mac Studio (arm64) and Ubuntu amd64 ([POL-01](../policy/POL-01_Developer_Environment_2027_Position.md)); an amd64-only image runs under emulation on arm64, slowly and with a `build_platform` exception. +3. **Baseline controls** of [SPEC-03 §3](../spec/03_security_gate.md#english): non-root, `read_only`, `cap_drop: [ALL]`, digest-pinned image, resource limits. `manifest/hardening.json` already carries exceptions for `shibboleth_sp` and `test_idp` (the latter written for a Java IdP); each exception is a debt with a review date. +4. **Loopback (the network path back to your own computer; see [REF-01](../reference/REF-01_Glossary.md)), plain HTTP.** The browser must reach both the SP and the IdP, and the acceptance guard allows only `http://127.0.0.1:<port>` ([SPEC-04 §3.4](../spec/04_acceptance_tests.md#english)). TLS on loopback would add nothing and would break the guard. +5. **GakuNin attributes.** The mock users must carry what GakuNin releases — `eduPersonPrincipalName`, `eduPersonTargetedID` and its successor `pairwise-id`, `mail`, `o`, `jaOrganizationName`, `eduPersonAffiliation`, `eduPersonScopedAffiliation`, `eduPersonEntitlement`, `isMemberOf` — with Japanese values where GakuNin defines them. +6. **Mock, never real.** POL-05 §4 (the canon in `niirdcplus`, linked from [POL-01](../policy/POL-01_Developer_Environment_2027_Position.md)) separates mock data from real data; names like `Test User 01` are not safe enough in a screenshot. + +### 2. Options considered + +```toon +options[4]{id,option,offline,arm64_and_amd64,non_root_read_only,image_size,scriptable_config,gakunin_attributes,maintenance,verdict}: + A,"Ready-made SimpleSAMLphp image (kristophjunge/test-saml-idp style)",yes,"no (amd64 only)","no (root, writes config at start)","~400 MB","partly (2 users via env vars; more needs a rebuild)","partly (static attributes only)","unmaintained, SimpleSAMLphp 1.x, floating tag",rejected + B,"Keycloak as SAML IdP (quay.io/keycloak/keycloak, realm import)",yes,yes,"yes (uid 1000) but read_only needs several volumes","~600 MB + 1 GB heap","yes (realm JSON)","yes (attribute mappers; ePTID/pairwise-id need custom mappers)","heavy; slow start (40-90 s); more RAM than any core service",rejected + C,"Shibboleth IdP (Jetty + Java, community images)",yes,"partly (unofficial images, mostly amd64)","no (root, writes idp.home)","~700 MB + heap","partly (XML, many files, hand-tuned)","yes (closest to GakuNin)","complex; a day of configuration for a test fixture",rejected + D,"Own image `test-idp`: official SimpleSAMLphp 2.x release tarball on php:8.3-apache, Apache on 8080 as uid 1000",yes,"yes (official multi-arch base)","yes (tmpfs for log, data, run)","~150 MB","yes (config, metadata and users rendered from templates/idp/)","yes (authsources + authproc TargetedID / PairwiseID)","a 20-line Dockerfile we own; SimpleSAMLphp 2.x is maintained",chosen +``` + +- **A** is the usual quick answer and fails three conditions at once: amd64 only, root, and users limited to two environment variables. Its SimpleSAMLphp 1.x line is end-of-life. Rejected. +- **B** works everywhere and is non-root, but a Keycloak container costs more memory than `web` and takes longer to start than the whole `core` profile; `eduPersonTargetedID` and `pairwise-id` need custom protocol mappers that nobody on the team would read. A test fixture must not be the heaviest service in the stack. Rejected. +- **C** is the most faithful to GakuNin and the least suited to a fixture: Java, large configuration, no official container image, root. If a future scenario needs IdP-side behaviour that only Shibboleth has (attribute release policies, consent), this decision is revisited. Rejected for M3. +- **D** gives us everything the scenario needs in a small image whose every line we can read: the official `php:8.3-apache` base is multi-arch and maintained; SimpleSAMLphp 2.x is the current line; Apache can listen on `8080` as uid `1000` with `/run`, `/tmp`, `log/` and `data/` on tmpfs, so `read_only: true` and `cap_drop: [ALL]` hold; users and attributes are PHP arrays that the installer renders from templates. **Chosen.** + +### 3. Decision + +1. **Component.** A new manifest component `test-idp` (role `subsystem`, profile `full`, platforms `linux/arm64` and `linux/amd64`, no upstream) provides the service `test_idp`; it is built by `grdm-dev build` like any other component from a Dockerfile of a few lines: `php:8.3-apache` pinned by digest, the official SimpleSAMLphp release tarball pinned by SHA-256, Apache configured to listen on `8080`, `USER 1000:1000`. `test_idp` leaves the `services[]` of `Shibboleth-SP`. The `test_idp` exception in `manifest/hardening.json` is removed when the image lands (follow-up F-3/F-4 in `installer/grdm_dev/templates/idp/README.md`). +2. **Network and ports.** `test_idp` publishes `127.0.0.1:<GRDM_PORT_TEST_IDP>` (default `8081`) and `shibboleth_sp` publishes `127.0.0.1:<GRDM_PORT_SHIBBOLETH_SP>` (default `8082`); both therefore sit on `grdm-edge` like the other browser-facing services ([ADR-02 §3](ADR-02_Network_Model.md#english)). Both speak plain HTTP; the SP runs `handlerSSL="false"` and its session cookie is `HttpOnly; SameSite=Lax` without `Secure`. The two rows are added to the ports table of [SPEC-02 §4](../spec/02_installer_cli.md#2-en-ports) (follow-up F-4). +3. **Configuration is rendered, never hand-edited.** `installer/grdm_dev/templates/idp/` holds `config.php`, `authsources.php`, `saml20-idp-hosted.php`, `saml20-sp-remote.php` for the IdP and `shibboleth2.xml`, `attribute-map.xml`, `idp-metadata.xml` for the SP, with `${...}` placeholders for ports, entityIDs and certificates that `compose render` fills from `runtime/.env` (follow-up F-1). EntityIDs are the services' own loopback URLs. +4. **Keys and secrets come from `secrets init`.** It generates `TEST_IDP_SECRET_SALT`, `TEST_IDP_ADMIN_PASSWORD` and two self-signed RSA-2048 pairs (`idp.key`/`idp.crt`, `sp.key`/`sp.crt`, keys mode `0600`) under `runtime/config/idp/cert/`; `secrets rotate` regenerates them (follow-up F-2). No default value exists anywhere ([SPEC-03 §3.1](../spec/03_security_gate.md#english)). +5. **Mock-attribute rule.** Every user and every attribute value of the test IdP is invented and visibly so: values start with `mock-`, `MOCK` or `モック`, or end in `@idp.mock.test`; group and entitlement URIs live under `https://idp.mock.test/`; surnames are `MOCK-USER`, given names `mock-…`; the file carries a `MOCK` label. **One explicit exception:** `eduPersonAffiliation` is a controlled vocabulary and the SP rule of item 6 can only be exercised with real vocabulary values, so exactly `member`, `faculty`, `student`, `affiliate` are allowed there and nowhere else; the fixture records this under `affiliation_vocabulary_exception` and the unit test encodes it as an allow-list of exactly those values (`AFFILIATION_ALLOW_LIST`). The canonical list is `installer/acceptance/fixtures/idp/mock_users.json` (bilingual README beside it); `authsources.php.tmpl` must agree per user and per attribute (the test parses both and compares structures, not substrings). Real institution attributes never enter `installer/`. +6. **Rejection rule of S5.** The SP's RequestMap requires `eduPersonAffiliation` to contain `member` (the common GakuNin value, `SP_REQUIRED_AFFILIATION`); `mock-user-noaff` carries only `affiliate` and must stop at the SP's 403 page with no GRDM session. [SPEC-04 §5](../spec/04_acceptance_tests.md#english) states the scenario. +7. **Attribute contract (wire names).** `saml20-idp-hosted.php.tmpl` defines the friendly-name → wire-name map `$gakuninWireNames` explicitly and feeds it to `core:AttributeMap`; the generic `name2oid` map is not loaded (it has no GakuNin names). `attributes.NameFormat` is the SAML 2.0 URI format. `sp-attribute-map.xml` decodes exactly those names, and `installer/tests/test_compose.py` parses both files and fails when the sets differ for any attribute the fixtures carry. `core:AttributeLimit` releases only the mapped names, so `uid` never leaves the IdP. + +```toon +wire_names[14]{friendly,wire_name,source,sp_decoder}: + eduPersonPrincipalName,urn:oid:1.3.6.1.4.1.5923.1.1.1.6,eduPerson,Scoped + eduPersonAffiliation,urn:oid:1.3.6.1.4.1.5923.1.1.1.1,eduPerson,String + eduPersonScopedAffiliation,urn:oid:1.3.6.1.4.1.5923.1.1.1.9,eduPerson,Scoped + eduPersonEntitlement,urn:oid:1.3.6.1.4.1.5923.1.1.1.7,eduPerson,String + isMemberOf,urn:oid:1.3.6.1.4.1.5923.1.5.1.1,eduMember,String + eduPersonTargetedID,urn:oid:1.3.6.1.4.1.5923.1.1.1.10,"eduPerson; 学認技術運用基準 Ver. 2.6 別添 6. (NameID-valued)",NameID + pairwise-id,urn:oasis:names:tc:SAML:attribute:pairwise-id,"SAML V2.0 Subject Identifier Attributes Profile; not in the GakuNin list — optional",Scoped + mail,urn:oid:0.9.2342.19200300.100.1.3,RFC 4524,String + displayName,urn:oid:2.16.840.1.113730.3.1.241,RFC 2798,String + givenName,urn:oid:2.5.4.42,RFC 4519,String + sn,urn:oid:2.5.4.4,RFC 4519,String + o,urn:oid:2.5.4.10,RFC 4519,String + jaOrganizationName,urn:oid:1.3.6.1.4.1.32264.1.1.4,"学認技術運用基準 Ver. 2.6 別添 2. (friendlyName jao); NII GakuNinShibInstall 属性リスト",String + jaDisplayName,urn:oid:1.3.6.1.4.1.32264.1.1.3,"学認技術運用基準 Ver. 2.6 別添 15.; NII GakuNinShibInstall 属性リスト",String +``` + + *Verification record (2026-11-06).* The GakuNin schema OIDs were read from the published standard 学認技術運用基準 Ver. 2.6 (`gakunin.jp/sites/default/files/2024-03/gakunin_technical_application_standard_v2.6.pdf`, 別添: `2. jaOrganizationName … "urn:oid:1.3.6.1.4.1.32264.1.1.4" friendlyName jao`; `15. jaDisplayName … "urn:oid:1.3.6.1.4.1.32264.1.1.3"`) and cross-checked against the NII page 属性リスト (GakuNinShibInstall, nii-auth.atlassian.net, pages/44401186: `jasn .1, jaGivenName .2, jaDisplayName .3, jao .4, jaou .5, gakuninScopedPersonalUniqueCode .6`) and a university IdP attribute page (idp-test.account.tsukuba.ac.jp). `1.3.6.1.4.1.32264` is NII's enterprise arc. Version 0.1 of this record used `.1` and `.5` for the two names (those are `jasn` and `jaou`); the review of 2026-11-06 proposed `1.2.392.200453.100.20.1`, which appears in none of the three sources and is therefore not used. SimpleSAMLphp `attributemap/name2oid.php` (tag v2.3.0) contains neither Japanese name, hence the explicit map. + + *eduPersonTargetedID and pairwise-id on SimpleSAMLphp 2.x (verified against tag v2.5.3.1 source, the current release of 2026-08-09).* `core:TargetedID` with `nameId => true` writes `$state['Attributes']['eduPersonTargetedID']` as a `NameID` object with `Format` persistent, `NameQualifier` = IdP entityID, `SPNameQualifier` = SP entityID — the exact form 学認技術運用基準 §6 prescribes; SimpleSAMLphp serialises a NameID object only under `attributeencodings => ['urn:oid:1.3.6.1.4.1.5923.1.1.1.10' => 'raw']` (saml20-idp-hosted reference; `core:TargetedID` manual, Internet2 example), otherwise it casts it to a string, so the template sets that encoding and the SP uses `NameIDAttributeDecoder`. `saml:PairwiseID` (subclass of `saml:SubjectID`) requires `identifyingAttribute` and `scopeAttribute`; it takes the first value of the scope attribute, keeps the part after the first `@` (`member@idp.mock.test` → `idp.mock.test`, which matches `SCOPE_PATTERN`), and writes the attribute under `SAML2\Constants::ATTR_PAIRWISE_ID` = `urn:oasis:names:tc:SAML:attribute:pairwise-id` itself, so it is not renamed by the map and is listed separately in `core:AttributeLimit`. Both identifiers are therefore *derived* at login from `uid`; the fixture stores neither and says so under `derived_identifiers`. Whether GRDM consumes `pairwise-id` is still confirmed at M3 against `RDM-Shibboleth-SP-dev2027`; the attribute is optional and harmless if ignored. + +```mermaid +flowchart LR + B["Browser (Playwright)<br/>127.0.0.1 only"] + subgraph EDGE["grdm-edge (published on 127.0.0.1)"] + W["web :5000"] + SP["shibboleth_sp :8082<br/>Apache + shibd, plain HTTP"] + IDP["test_idp :8081<br/>php:8.3-apache + SimpleSAMLphp 2.x<br/>uid 1000, read-only"] + end + B -->|"1 /login?campaign=institution"| W + W -->|"2 302"| B + B -->|"3 /Shibboleth.sso/Login"| SP + SP -->|"4 302 AuthnRequest"| B + B -->|"5 mock-user-01 / mock-pass-01"| IDP + IDP -->|"6 SAML Response (auto-POST form)"| B + B -->|"7 /Shibboleth.sso/SAML2/POST"| SP + SP -->|"8 attributes (eppn, mail, affiliation, o)"| W + W -->|"9 302 /dashboard + osf cookie"| B +``` + +### 4. Consequences + +- **Good:** the fixture obeys the same controls as the product services (non-root, read-only, pinned, loopback), so the security gate needs no new exception; it starts in seconds and costs about 128 MB. +- **Good:** a reviewer can read every line that defines a mock user, and `grdm-dev accept` can select S5 from the mock list without a second source of truth. +- **Cost:** we own a Dockerfile. It changes when SimpleSAMLphp publishes a release; `grdm-dev upstream` does not track it, so the version pin is reviewed at every milestone with the other base images ([ADR-03](ADR-03_Staged_Security_Gate.md)). +- **Cost:** the SP runs plain HTTP on loopback, unlike any production SP. The configuration is development-only by construction (loopback entityIDs, `handlerSSL="false"`); the environment guide must say so where it explains the Shibboleth profile. +- **Open:** the wire names are verified against the published standard, not yet against the SP that `RDM-Shibboleth-SP-dev2027` builds; its `attribute-map.xml` is compared at M3 (follow-up F-1). The ids (`eppn`, `persistent-id`, `affiliation`, …) are the Shibboleth SP defaults and may be renamed to what `cas-bridge`/`web` read. +- **Open:** whether the real RDM institution login passes through `cas-overlay` before the SP or reaches the SP directly is confirmed against `RDM-Shibboleth-SP-dev2027` at M3; the acceptance design marks the entry path `TODO(M3)`. If `cas-overlay` is in the path, the SP template gains a `CAS_INTERNAL_URL` and the RequestMap moves accordingly; the IdP side does not change. +- **Not provided:** a discovery service, multiple IdPs, encryption of assertions, or a GakuNin metadata feed. Each would be a new decision. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 背景 + +GakuNin RDM(GakuNin=学認。大学のアカウントでログインするための日本の学術ネットワーク。[REF-01](../reference/REF-01_Glossary.md))は機関の利用者を *Shibboleth*(大学がシングルサインオンに使うソフトウェア)でログインさせます。*SP*(サービスプロバイダ。ログイン結果を信頼する GRDM 側の部品)が、機関の *IdP*(アイデンティティプロバイダ。「あなたが誰か」を確かめるサーバ)から *SAML*(IdP と SP がログイン結果を渡し合う文書の形式。[REF-01](../reference/REF-01_Glossary.md))のメッセージを受け取ります。`--auth shibboleth` 付きの `full` プロファイル([SPEC-02 §4](../spec/02_installer_cli.md#2-ja-ports))は `fakecas` を外し、`shibboleth_sp`(`RDM-Shibboleth-SP-dev2027` から組む CentOS ベースの Apache httpd + shibd)と同梱の `test_idp` を起動します。受入シナリオ S5([SPEC-04 §5.1](../spec/04_acceptance_tests.md#japanese))が SP → IdP → GRDM の経路を成功と拒否の各一件で示すためです。 + +開発環境には、本番の IdP が満たさない条件があります。 + +1. **オフライン。** `grdm` ネットワークに外向き通信はない([ADR-02](ADR-02_Network_Model.md))。メタデータ・証明書・利用者はインストーラーが描画するファイルから来なければならない。 +2. **二つのアーキテクチャ。** Mac Studio(arm64)と Ubuntu の amd64([POL-01](../policy/POL-01_Developer_Environment_2027_Position.md))。amd64 だけのイメージは arm64 でエミュレーションになり、遅く、`build_platform` の例外が要る。 +3. **[SPEC-03 §3](../spec/03_security_gate.md#japanese) の基本対策。** 非 root、`read_only`、`cap_drop: [ALL]`、ダイジェスト固定、資源制限。`manifest/hardening.json` には既に `shibboleth_sp` と `test_idp`(後者は Java の IdP を想定して書かれた)の例外があり、例外はどれも見直し期日付きの負債である。 +4. **ループバック(自分の計算機へ戻るネットワークの道。[REF-01](../reference/REF-01_Glossary.md))の平文 HTTP。** ブラウザは SP と IdP の両方に届く必要があり、受入の監視は `http://127.0.0.1:<port>` しか通さない([SPEC-04 §3.4](../spec/04_acceptance_tests.md#japanese))。ループバック上の TLS は何も足さず、監視を壊す。 +5. **GakuNin の属性。** 模擬利用者は GakuNin が送る属性 — `eduPersonPrincipalName`、`eduPersonTargetedID` とその後継 `pairwise-id`、`mail`、`o`、`jaOrganizationName`、`eduPersonAffiliation`、`eduPersonScopedAffiliation`、`eduPersonEntitlement`、`isMemberOf` — を、GakuNin が定める日本語値も含めて持つ。 +6. **模擬であり、実在ではない。** POL-05 §4(`niirdcplus` の正本。[POL-01](../policy/POL-01_Developer_Environment_2027_Position.md) からリンク)は模擬データと実データを分ける。`Test User 01` のような名前はスクリーンショットの中では十分に安全でない。 + +### 2. 検討した選択肢 + +```toon +options[4]{id,option,offline,arm64_and_amd64,non_root_read_only,image_size,scriptable_config,gakunin_attributes,maintenance,verdict}: + A,"既製の SimpleSAMLphp イメージ(kristophjunge/test-saml-idp 系)",yes,"no(amd64 のみ)","no(root。起動時に設定を書く)","約 400 MB","一部(環境変数で 2 利用者。それ以上は再ビルド)","一部(静的属性のみ)","保守されていない。SimpleSAMLphp 1.x。動くタグ",不採用 + B,"Keycloak を SAML IdP に(quay.io/keycloak/keycloak、レルムの取り込み)",yes,yes,"yes(uid 1000)。ただし read_only には複数のボリュームが要る","約 600 MB+ヒープ 1 GB","yes(レルム JSON)","yes(属性マッパー。ePTID と pairwise-id は独自マッパー)","重い。起動 40〜90 秒。コアのどのサービスより多い RAM",不採用 + C,"Shibboleth IdP(Jetty+Java。コミュニティのイメージ)",yes,"一部(非公式イメージ。ほぼ amd64)","no(root。idp.home に書く)","約 700 MB+ヒープ","一部(XML が多数。手で調整)","yes(GakuNin に最も近い)","複雑。試験用の部品に設定一日",不採用 + D,"自前イメージ `test-idp`。SimpleSAMLphp 2.x 公式リリースの tarball を php:8.3-apache に載せ、Apache を 8080 で uid 1000 として動かす",yes,"yes(公式のマルチアーキテクチャのベース)","yes(log・data・run は tmpfs)","約 150 MB","yes(設定・メタデータ・利用者を templates/idp/ から描画)","yes(authsources+authproc の TargetedID / PairwiseID)","自分たちが持つ 20 行の Dockerfile。SimpleSAMLphp 2.x は保守中",採用 +``` + +- **A** はよく使われる手軽な答えですが、三つの条件を同時に外します。amd64 のみ、root、利用者は環境変数二つまで。SimpleSAMLphp 1.x 系はサポート終了です。不採用。 +- **B** はどこでも動き非 root ですが、Keycloak のコンテナは `web` より多くのメモリを使い、`core` プロファイル全体より起動が遅い。`eduPersonTargetedID` と `pairwise-id` にはチームの誰も読まない独自のプロトコルマッパーが要ります。試験用の部品がスタックで最も重いサービスになってはいけません。不採用。 +- **C** は GakuNin に最も忠実で、部品としては最も不向きです。Java、大量の設定、公式コンテナイメージなし、root。将来、Shibboleth にしかない IdP 側の挙動(属性送出ポリシー、同意画面)がシナリオに要るなら、この決定を見直します。M3 では不採用。 +- **D** は、全行を読める小さなイメージでシナリオに必要なものをすべて与えます。公式の `php:8.3-apache` はマルチアーキテクチャで保守されており、SimpleSAMLphp 2.x は現行系。Apache は `/run`・`/tmp`・`log/`・`data/` を tmpfs に置けば uid `1000` で `8080` を待ち受けられ、`read_only: true` と `cap_drop: [ALL]` が成り立つ。利用者と属性は PHP の配列で、インストーラーがテンプレートから描画する。**採用。** + +### 3. 決定 + +1. **部品。** manifest に新しい部品 `test-idp`(role `subsystem`、profile `full`、platforms `linux/arm64` と `linux/amd64`、上流なし)を置き、サービス `test_idp` を提供する。ほかの部品と同じく `grdm-dev build` が数行の Dockerfile から組む。ダイジェスト固定の `php:8.3-apache`、SHA-256 固定の SimpleSAMLphp 公式リリース tarball、`8080` を待ち受ける Apache 設定、`USER 1000:1000`。`test_idp` は `Shibboleth-SP` の `services[]` から外す。イメージができたら `manifest/hardening.json` の `test_idp` の例外を外す(`installer/grdm_dev/templates/idp/README.md` の後続 F-3/F-4)。 +2. **ネットワークとポート。** `test_idp` は `127.0.0.1:<GRDM_PORT_TEST_IDP>`(既定 `8081`)、`shibboleth_sp` は `127.0.0.1:<GRDM_PORT_SHIBBOLETH_SP>`(既定 `8082`)を公開し、ほかのブラウザ向けサービスと同じく `grdm-edge` に乗る([ADR-02 §3](ADR-02_Network_Model.md#japanese))。両方とも平文 HTTP で、SP は `handlerSSL="false"`、セッション cookie は `Secure` なしの `HttpOnly; SameSite=Lax`。二行を [SPEC-02 §4](../spec/02_installer_cli.md#2-ja-ports) のポート表に加える(後続 F-4)。 +3. **設定は描画し、手で直さない。** `installer/grdm_dev/templates/idp/` に IdP 用の `config.php`・`authsources.php`・`saml20-idp-hosted.php`・`saml20-sp-remote.php` と SP 用の `shibboleth2.xml`・`attribute-map.xml`・`idp-metadata.xml` を置き、ポート・entityID・証明書の `${...}` プレースホルダを `compose render` が `runtime/.env` から埋める(後続 F-1)。entityID はサービス自身のループバック URL とする。 +4. **鍵と秘密は `secrets init` から。** `TEST_IDP_SECRET_SALT`、`TEST_IDP_ADMIN_PASSWORD`、自己署名の RSA-2048 鍵対二組(`idp.key`/`idp.crt`、`sp.key`/`sp.crt`。鍵はモード `0600`)を `runtime/config/idp/cert/` に生成し、`secrets rotate` で作り直す(後続 F-2)。既定値はどこにもない([SPEC-03 §3.1](../spec/03_security_gate.md#japanese))。 +5. **模擬属性の規則。** テスト IdP の利用者と属性値はすべて作り物で、見てそう分かる。値は `mock-`・`MOCK`・`モック` で始まるか、`@idp.mock.test` で終わる。グループと entitlement の URI は `https://idp.mock.test/` の下。姓は `MOCK-USER`、名は `mock-…`。ファイルは `MOCK` の表示を持つ。**明示的な例外は一つ。** `eduPersonAffiliation` は語彙が統制されており、6 の SP 規則は実在の語彙値でしか試せない。そこでこの属性に限り `member`・`faculty`・`student`・`affiliate` の四つだけを許し、ほかの属性では許さない。フィクスチャは `affiliation_vocabulary_exception` にこれを記録し、単体試験は正確にこの四値の許可一覧(`AFFILIATION_ALLOW_LIST`)として符号化する。正本は `installer/acceptance/fixtures/idp/mock_users.json`(隣に二言語の README)。`authsources.php.tmpl` は利用者・属性単位でこれと一致しなければならない(試験は両方を構文解析して構造で比べ、部分文字列では比べない)。実在の機関属性は `installer/` に決して入れない。 +6. **S5 の拒否規則。** SP の RequestMap は `eduPersonAffiliation` が `member`(GakuNin の共通値。`SP_REQUIRED_AFFILIATION`)を含むことを求める。`mock-user-noaff` は `affiliate` しか持たず、SP の 403 画面で止まり GRDM のセッションは作られない。シナリオは [SPEC-04 §5](../spec/04_acceptance_tests.md#japanese) に書く。 +7. **属性の契約(ワイヤ上の名前)。** `saml20-idp-hosted.php.tmpl` は属性名 → ワイヤ名の対応表 `$gakuninWireNames` を明示的に定義して `core:AttributeMap` に渡す。汎用の `name2oid` は読み込まない(GakuNin の名前がない)。`attributes.NameFormat` は SAML 2.0 の URI 形式。`sp-attribute-map.xml` はちょうどその名前を復号し、`installer/tests/test_compose.py` が両ファイルを構文解析して、フィクスチャが持つどの属性でも集合が違えば失敗する。`core:AttributeLimit` は対応表の名前だけを送出するので `uid` は IdP の外へ出ない。 + +```toon +wire_names[14]{friendly,wire_name,source,sp_decoder}: + eduPersonPrincipalName,urn:oid:1.3.6.1.4.1.5923.1.1.1.6,eduPerson,Scoped + eduPersonAffiliation,urn:oid:1.3.6.1.4.1.5923.1.1.1.1,eduPerson,String + eduPersonScopedAffiliation,urn:oid:1.3.6.1.4.1.5923.1.1.1.9,eduPerson,Scoped + eduPersonEntitlement,urn:oid:1.3.6.1.4.1.5923.1.1.1.7,eduPerson,String + isMemberOf,urn:oid:1.3.6.1.4.1.5923.1.5.1.1,eduMember,String + eduPersonTargetedID,urn:oid:1.3.6.1.4.1.5923.1.1.1.10,"eduPerson。学認技術運用基準 Ver. 2.6 別添 6.(NameID 値)",NameID + pairwise-id,urn:oasis:names:tc:SAML:attribute:pairwise-id,"SAML V2.0 Subject Identifier Attributes Profile。学認の一覧にはない — 任意",Scoped + mail,urn:oid:0.9.2342.19200300.100.1.3,RFC 4524,String + displayName,urn:oid:2.16.840.1.113730.3.1.241,RFC 2798,String + givenName,urn:oid:2.5.4.42,RFC 4519,String + sn,urn:oid:2.5.4.4,RFC 4519,String + o,urn:oid:2.5.4.10,RFC 4519,String + jaOrganizationName,urn:oid:1.3.6.1.4.1.32264.1.1.4,"学認技術運用基準 Ver. 2.6 別添 2.(friendlyName jao)。NII GakuNinShibInstall 属性リスト",String + jaDisplayName,urn:oid:1.3.6.1.4.1.32264.1.1.3,"学認技術運用基準 Ver. 2.6 別添 15.。NII GakuNinShibInstall 属性リスト",String +``` + + *検証記録(2026-11-06)。* GakuNin スキーマの OID は公開された学認技術運用基準 Ver. 2.6(`gakunin.jp/sites/default/files/2024-03/gakunin_technical_application_standard_v2.6.pdf`。別添 `2. jaOrganizationName … "urn:oid:1.3.6.1.4.1.32264.1.1.4" friendlyName jao`、`15. jaDisplayName … "urn:oid:1.3.6.1.4.1.32264.1.1.3"`)から読み取り、NII の「属性リスト」ページ(GakuNinShibInstall、nii-auth.atlassian.net、pages/44401186。`jasn .1、jaGivenName .2、jaDisplayName .3、jao .4、jaou .5、gakuninScopedPersonalUniqueCode .6`)と大学 IdP の属性一覧(idp-test.account.tsukuba.ac.jp)で突き合わせた。`1.3.6.1.4.1.32264` は NII の企業番号の枝である。本記録の 0.1 は二つの名前に `.1` と `.5` を使っていた(それぞれ `jasn` と `jaou` の番号)。2026-11-06 のレビューは `1.2.392.200453.100.20.1` を提示したが、三つの出典のどれにもなく、採用しない。SimpleSAMLphp の `attributemap/name2oid.php`(タグ v2.3.0)には日本語の名前がどちらもないため、対応表を明示する。 + + *SimpleSAMLphp 2.x での eduPersonTargetedID と pairwise-id(現行リリース 2026-08-09 のタグ v2.5.3.1 のソースで確認)。* `core:TargetedID` に `nameId => true` を与えると、`$state['Attributes']['eduPersonTargetedID']` に `Format` persistent、`NameQualifier` = IdP の entityID、`SPNameQualifier` = SP の entityID を持つ `NameID` オブジェクトを書く。学認技術運用基準 §6 が定める形そのものである。SimpleSAMLphp が NameID オブジェクトを要素として直列化するのは `attributeencodings => ['urn:oid:1.3.6.1.4.1.5923.1.1.1.10' => 'raw']` のときだけ(saml20-idp-hosted リファレンス。`core:TargetedID` マニュアルの Internet2 例)で、それ以外は文字列に変換してしまうため、テンプレートはこの符号化を設定し、SP は `NameIDAttributeDecoder` を使う。`saml:PairwiseID`(`saml:SubjectID` の派生)は `identifyingAttribute` と `scopeAttribute` を必須とし、スコープ属性の最初の値の最初の `@` より後ろを取り(`member@idp.mock.test` → `idp.mock.test`。`SCOPE_PATTERN` に合う)、属性を `SAML2\Constants::ATTR_PAIRWISE_ID` = `urn:oasis:names:tc:SAML:attribute:pairwise-id` の名前で自ら書く。だから対応表では改名されず、`core:AttributeLimit` に別途列挙する。二つの識別子はいずれもログイン時に `uid` から*導出*され、フィクスチャはどちらも保持せず、`derived_identifiers` にそう書く。GRDM が `pairwise-id` を使うかは M3 で `RDM-Shibboleth-SP-dev2027` と照合する。任意の属性であり、無視されても害はない。 + +```mermaid +flowchart LR + B["ブラウザ(Playwright)<br/>127.0.0.1 のみ"] + subgraph EDGE["grdm-edge(127.0.0.1 に公開)"] + W["web :5000"] + SP["shibboleth_sp :8082<br/>Apache+shibd。平文 HTTP"] + IDP["test_idp :8081<br/>php:8.3-apache+SimpleSAMLphp 2.x<br/>uid 1000。読み取り専用"] + end + B -->|"1 /login?campaign=institution"| W + W -->|"2 302"| B + B -->|"3 /Shibboleth.sso/Login"| SP + SP -->|"4 302 AuthnRequest"| B + B -->|"5 mock-user-01 / mock-pass-01"| IDP + IDP -->|"6 SAML Response(自動 POST フォーム)"| B + B -->|"7 /Shibboleth.sso/SAML2/POST"| SP + SP -->|"8 属性(eppn・mail・affiliation・o)"| W + W -->|"9 302 /dashboard+osf cookie"| B +``` + +### 4. 結果 + +- **良い点:** 部品が製品のサービスと同じ対策(非 root、読み取り専用、固定、ループバック)に従うので、セキュリティの門に新しい例外が要らない。数秒で起動し、約 128 MB で済む。 +- **良い点:** 模擬利用者を定める全行をレビュワが読め、`grdm-dev accept` は第二の正本なしに模擬一覧から S5 を選べる。 +- **コスト:** Dockerfile を自分たちで持つ。SimpleSAMLphp のリリースごとに変わり、`grdm-dev upstream` は追跡しないので、版の固定はほかのベースイメージと一緒に節目ごとに見直す([ADR-03](ADR-03_Staged_Security_Gate.md))。 +- **コスト:** SP は本番のどの SP とも違い、ループバックの平文 HTTP で動く。設定は作りからして開発専用(ループバックの entityID、`handlerSSL="false"`)であり、環境手引きの Shibboleth プロファイルの説明にそう書く。 +- **未決:** ワイヤ名は公開された基準と照合済みだが、`RDM-Shibboleth-SP-dev2027` が組む SP とはまだ照合していない。その `attribute-map.xml` は M3 で比べる(後続 F-1)。id(`eppn`・`persistent-id`・`affiliation` など)は Shibboleth SP の既定値で、`cas-bridge`/`web` が読む名前に改める可能性がある。 +- **未決:** 実際の RDM の機関ログインが SP の前に `cas-overlay` を通るのか、SP に直接届くのかは、M3 で `RDM-Shibboleth-SP-dev2027` と照合する。受入の設計は入口のパスを `TODO(M3)` としている。`cas-overlay` が経路にあるなら SP のテンプレートに `CAS_INTERNAL_URL` が加わり RequestMap もそれに合わせて動くが、IdP 側は変わらない。 +- **提供しないもの:** ディスカバリサービス、複数の IdP、アサーションの暗号化、GakuNin のメタデータ配信。それぞれ新しい決定になる。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| IdP / SP | The server that checks who you are / the service that trusts that answer. | 「あなたが誰か」を確かめるサーバ/その答えを信頼するサービス。 | +| SAML | The message format an IdP and an SP use to pass a login result. | IdP と SP がログイン結果を渡し合うための文書の形式。 | +| Shibboleth | The software universities use for single sign-on; GRDM's SP is built on it. | 大学がシングルサインオンに使うソフトウェア。GRDM の SP はこれで作る。 | +| GakuNin | The Japanese academic access federation that GRDM logs in through. | GRDM がログインに使う、日本の学術認証フェデレーション。 | +| SimpleSAMLphp | A small PHP program that can act as a SAML IdP or SP. | SAML の IdP や SP になれる小さな PHP のプログラム。 | +| Keycloak | An identity server from Red Hat that speaks SAML and OpenID Connect. | SAML と OpenID Connect を話す Red Hat 製の認証サーバ。 | +| entityID | The unique name of an IdP or SP in SAML, usually a URL. | SAML における IdP や SP の一意な名前。たいてい URL。 | +| Mock | Invented data that stands in for the real thing in a test. | 試験で本物の代わりに使う、作り物のデータ。 | diff --git a/docs/decisions/ADR-06_Wiki_Frontend_Overlay.md b/docs/decisions/ADR-06_Wiki_Frontend_Overlay.md new file mode 100644 index 0000000..57860c8 --- /dev/null +++ b/docs/decisions/ADR-06_Wiki_Frontend_Overlay.md @@ -0,0 +1,134 @@ +# ADR-06 Wiki Frontend Overlay / Wiki フロントエンドのオーバーレイ + +> **Summary:** The `wiki-frontend` repository is not a service and not a runtime image. Its Dockerfile is a copy of osf.io's that COPYs osf.io paths the wiki-frontend checkout does not contain (so it cannot be built alone; real install run 4) and that skips every Python step, running only `yarn run webpack-prod` (so its image cannot replace the osf.io image either). We treat it as an *overlay*: its image is built from the osf.io checkout with the wiki-frontend files copied over it, tagged with both commits, and run **once** by the Compose service `wiki_assets`, which copies the webpack output into the named volume `wiki_static`; `web`, `api`, `admin` and `worker` mount that volume read-only. This is the pattern upstream osf.io's own `assets` service uses. +> **概要:** `wiki-frontend` リポジトリはサービスでも実行用イメージでもない。その Dockerfile は osf.io のものの写しで、wiki-frontend の checkout には無い osf.io のパスを COPY する(だから単独では組めない。実機第 4 回)うえ、Python の手順をすべて飛ばして `yarn run webpack-prod` だけを走らせる(だからそのイメージで osf.io のイメージを置き換えることもできない)。これを「オーバーレイ」として扱う。osf.io の checkout に wiki-frontend のファイルを重ねた木からイメージを組み、両コミットをタグに持たせ、Compose サービス `wiki_assets` が **一度だけ** 動かして webpack の出力を名前付きボリューム `wiki_static` へ写す。`web`・`api`・`admin`・`worker` はそのボリュームを読み取り専用で mount する。上流 osf.io 自身の `assets` サービスと同じ型である。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-06. **Learned:** on Docker Desktop for macOS a bind volume is presented to containers as root:root, `chown` inside the container is silently ignored, and yet any uid can write; so `wiki_static_init` is harmless there but `wiki_assets`' `test -w` guard failed although the copy would have worked (real install run 8). The guard now proves writability by creating and removing a marker file. / macOS の Docker Desktop では bind ボリュームはコンテナに root:root として見え、コンテナ内の `chown` は黙って無視され、それでもどの uid でも書ける。そのため `wiki_static_init` は無害だが、`wiki_assets` の `test -w` の番は、写しが成功したはずなのに失敗した(実機第 8 回)。番は目印ファイルを作って消すことで書けることを証明する形に変えた。 + 0.2 — 2026-11-06. **Learned:** a test of the generated JSON tests neither Compose interpolation nor filesystem ownership (PR #30 review r1): Compose expanded the copier's `$src`/`$dst` to empty strings before the shell ran, and a fresh bind volume is owned by the host user, so the non-root copier could not write to it. Commands must be escaped (`$$`), checked through Compose's own parser, and a volume needs a deliberate owner step (root with `CAP_CHOWN` only, as a documented exception). / 生成した JSON の試験は Compose の変数展開もファイル所有権も検査しないと分かった(PR #30 レビュー r1)。Compose は写し手の `$src`/`$dst` をシェルより前に空文字へ展開し、新しい bind ボリュームはホストの利用者の所有なので非 root の写し手は書けなかった。command は `$$` でエスケープして Compose 自身の解析器で検査し、ボリュームには所有者を決める段(記録した例外としての root + `CAP_CHOWN` のみ)が要る。 + 0.1 — 2026-11-06. **Learned:** a repository with a Dockerfile is not necessarily a buildable component, and an image that builds is not necessarily a runtime: the fourth real install on Mac Studio failed at the first `COPY ./addons/*/requirements.txt` of the wiki-frontend Dockerfile, and reading that Dockerfile showed it is osf.io's with the Python steps commented out, so the image it would produce holds only a webpack bundle. The manifest needs `overlay_of` ("built from that component's tree plus my files"), and the installer needs one-shot services that move a build output into a volume. / Dockerfile があるリポジトリが必ず組める部品とは限らず、組めるイメージが必ず実行環境とも限らないと分かった。Mac Studio での第 4 回実導入は wiki-frontend の Dockerfile の最初の `COPY ./addons/*/requirements.txt` で止まり、その Dockerfile を読むと osf.io のものから Python の手順をコメントアウトした写しで、できるイメージは webpack の束しか持たない。manifest には「あの部品の木に自分のファイルを重ねて組む」を表す `overlay_of` が要り、インストーラーにはビルド成果をボリュームへ移す一回限りのサービスが要る。 +- Status: Proposed for the owner's approval, 2026-11-06 (M2). Review date: start of M4, together with the `prebuilt_image` fallbacks. +- Records a decision for: [SPEC-01 §3](../spec/01_manifest.md#english) (`overlay_of`, image tag rule, MC-14) · [SPEC-02 §4](../spec/02_installer_cli.md#2-en-ports) (`wiki_assets`, volume `wiki_static`) · [SPEC-00 §2](../spec/00_overview.md#english) +- Related: [docs/decisions/README.md](README.md) · [docs/README.md](../README.md) · [PR #30 review r1](../reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r1.md) · [ADR-01 Integration repository placement](ADR-01_Integration_Repository_Placement.md) · [ADR-02 Network Model](ADR-02_Network_Model.md) · [SPEC-03 §3](../spec/03_security_gate.md#english) · [DEMO-20 Core install on Mac Studio](../demo/20_core_install_mac_studio.md) · [REF-01 Glossary](../reference/REF-01_Glossary.md) · `installer/grdm_dev/build.py` · `installer/grdm_dev/templates/wiki_assets.json` · `tools/manifest_check.py` + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Context + +The manifest ([SPEC-01](../spec/01_manifest.md#english)) listed `wiki-frontend` as a core component with one Compose *service* (a container that Compose starts) named `wiki`, and the installer tried to build it like every other core: clone `RDM-wiki-frontend-dev2027` at the pinned commit and run `docker buildx build` on that checkout. + +The fourth real install on Mac Studio (2026-11-06, [DEMO-20](../demo/20_core_install_mac_studio.md)) stopped at `build` with exit 30: *image build failed — component wiki-frontend: docker buildx build exited 1*. BuildKit reported, for dozens of `COPY` lines at once, `failed to calculate checksum ... "/addons/metadata/static": not found`, `"/addons/gitlab/requirements.txt": not found`, `"/addons/zotero/static": not found` and so on. + +Reading the two repositories side by side explains it: + +- The wiki-frontend checkout contains only `addons/wiki/static/` (the Milkdown editor: `wikiPageMilkdown.js`, `heading.js`, `image.js`, `link.js`, ...), `website/static/js/` (`wikiTree.js`, `fangorn.js`, `pages/wiki-edit-page.js`), `website/static/vendor/knockout-sortable`, `package.json`, `yarn.lock`, `webpack.common.config.js`, `webpack.prod.config.js`, `Dockerfile`, `.jshintrc`, `.travis.yml` and a one-line `README.md`: "This is RDM wiki code for bundle with webpack5". +- Its `Dockerfile` is osf.io's Dockerfile with small edits: `FROM node:21-alpine` instead of `node:12-alpine3.9`, the application's `pip install` of `requirements.txt` and the add-on requirements, `collectstatic` and `pybabel` commented out (the Alpine Python 3 packages themselves are still installed and `python3 -m compileall` still runs), the admin `yarn install` commented out, and `yarn run webpack-prod` left in. It still `COPY`s `./requirements.txt`, `./addons/<name>/requirements.txt` for twenty-odd add-ons, `./admin/package.json ./admin/yarn.lock`, `./website/settings/`, `./api/base/settings/`, and `./addons/<name>/static/` for every add-on. None of these exist in the wiki-frontend tree; all of them exist in `RDM-osf.io-dev2027`. Because the application's Python dependencies are never installed, the image it produces has Node, the `node_modules`, a bare Python 3 and the webpack output — and no Flask or Django that could serve `web`, `api`, `admin` or `worker`. +- Its `package.json` keeps the name `osf` and version `20.14.0` of osf.io and upgrades `webpack` from `3.8.1` to `^5.93.0` (plus `webpack-cli` 5, `terser-webpack-plugin` 5, `assets-webpack-plugin` 7 and the `@milkdown/*` 7.3.6 editor packages). `webpack.common.config.js` keeps a single entry, `wiki-edit-page`, where osf.io's config lists forty pages (and has `wiki-edit-page` commented out), and drops the add-on entry discovery; `webpack.prod.config.js` replaces `UglifyJsPlugin` and `CommonsChunkPlugin` (webpack 3) with `TerserPlugin` and `optimization.splitChunks` (webpack 5). +- Both configs write to the same place: `output.path = <repo>/website/static/public/js` (in the image, `/code/website/static/public/js/`), `filename: '[name].[chunkhash].js'` in production, a `vendor.[hash].js` split chunk, and `SaveAssetsJson()` writes `webpack-assets.json` to the working directory (`/code/webpack-assets.json`). So the overlay build produces `wiki-edit-page.<chunkhash>.js`, `vendor.<hash>.js`, their source maps and a `webpack-assets.json` with those two entries. In the osf.io image the very same directory holds osf.io's forty bundles and its own `webpack-assets.json` (read by `website/util/paths.py` for the `webpack_asset` Mako filter). + +So `wiki-frontend` is a *bundle builder* for osf.io's tree: a newer Node base, webpack 5 and the Milkdown editor sources, meant to be laid over the osf.io source before webpack runs. It has no process of its own and its image cannot run the application. Its real-time counterpart, `y-websocket` (the Yjs WebSocket server for co-editing), is a separate repository with its own server and stays a service. + +### 2. Options considered + +```toon +options[4]{id,option,builds_today,honest_about_contents,runtime_correct,fits_spec01,verdict}: + A,"Separate `wiki` service built from the wiki-frontend checkout (status quo)","no (COPY of osf.io paths fails on the first step)","no (there is no wiki server to run)",no,no,"impossible; rejected" + B,"One image: build osf.io from the merged tree with the wiki-frontend Dockerfile, tag `grdm-dev/osf.io:<osf>-<wiki>`, run web/api/admin/worker from it","yes","yes (both commits in the tag)","no (the Dockerfile skips pip, collectstatic and pybabel: no Python runtime for web/api/admin/worker)","partly (one field)","rejected" + C,"Prebuilt osf.io image from a registry, pinned by digest (like ember-osf-web and cas-overlay until M4)","yes","no (nobody can show which commits are inside; and the osf.io image is the one image we must build from source)",unknown,"no (bypasses the build-from-pinned-source guarantee for the central component)",rejected + D,"Two images: osf.io built normally; the overlay built from the merged tree as `grdm-dev/wiki-frontend:<osf>-<wiki>` and run once by `wiki_assets` to copy the bundle into the volume `wiki_static`, mounted read-only by web/api/admin/worker (upstream osf.io's `assets` pattern)","yes","yes (both commits in the overlay tag; osf.io keeps its own)","yes (osf.io image unchanged; only static files added)","yes (`overlay_of` + one-shot service)",chosen +``` + +Option B was the first design of this record and is kept here because its rejection reason is the one that matters: the overlay Dockerfile is a build tool, not an application image. Option C would have hidden the problem: the whole point of the integration repositories ([ADR-01](ADR-01_Integration_Repository_Placement.md)) is that the central `osf.io` image is built from pinned commits that we can name. + +### 3. Decision + +1. **Manifest.** A component may carry `overlay_of: "<base id>"` ([SPEC-01 §3](../spec/01_manifest.md#english)). It keeps its own `integration_repo`, `integration_sha`, `upstreams[]` and PR lists, so the weekly integration PR and the upstream tracking ([SPEC-05](../spec/05_upstream_tracking.md)) work unchanged. Its `services[]` are one-shot services. `wiki-frontend` gets `overlay_of: "osf.io"`, `services: ["wiki_static_init", "wiki_assets"]`, `profile: core` and a `note`. +2. **Checker.** `grdm-dev manifest check` adds MC-14: the base exists, is not `infra`, is not an overlay and has no `prebuilt_image`; the overlay is not `infra` and has no `prebuilt_image`; a base takes at most one overlay. The installer refuses an overlay service whose template is not `one_shot: true` (also reported as MC-14). +3. **Build.** `grdm-dev build` builds `osf.io` as before (`grdm-dev/osf.io:<osf_sha12>`). For the overlay it syncs the base checkout too (once per run), recreates `runtime/src/_overlay/wiki-frontend/` as a copy of the osf.io checkout without `.git` with the wiki-frontend files copied over it without `.git` (the overlay's version wins where both have a file: `Dockerfile`, `package.json`, `yarn.lock`, the webpack configs, `addons/wiki/static/*`), and runs `docker buildx build -f <context>/Dockerfile <context>` tagged `grdm-dev/wiki-frontend:<osf_sha12>-<wiki_sha12>` (with `--push`, `ghcr.io/rcosdp/wiki-frontend:<same>`), with the labels `org.gakunin-rdm.overlay-of=osf.io` and `org.gakunin-rdm.base-sha=<osf_sha12>`. The build report row carries `overlay_of`, `base_repo`, `base_sha12` and `image_tag`; `compose render` reads `image_tag`. +4. **Compose.** Two one-shot templates (profile `core`, `one_shot: true`, rendered with `restart: "no"`), both running the overlay image: + - `wiki_static_init` (review r1 R1-02): a fresh named volume is a bind directory under `runtime/volumes/` created by the host user with `mkdir`, so on a Linux host whose uid is not 1000 the non-root copier cannot write to it. This container runs as root with `cap_drop: [ALL]` and only `CAP_CHOWN` added back — a documented exception in `manifest/hardening.json` (controls `user`, `cap_add`; review 2027-01-31; target M4) — executes only `chown 1000:1000 /wiki_static` and exits. It never runs `chmod`: with only `CAP_CHOWN`, a root process cannot change the mode of a directory owned by another uid (that needs `CAP_FOWNER`), and the bind directory is owned by the host user, so the mode `0755` is set on the host by `compose render` only when it first creates `runtime/volumes/<name>/`; an existing directory (possibly already handed to uid 1000) is left untouched, so re-rendering after the ownership change cannot fail (reviews r2–r4). `chown` is idempotent, so re-runs are safe. `read_only`, `no-new-privileges` and the internal network stay. It touches nothing but the volume mount. + - `wiki_assets`: runs as `1000:1000` with `cap_drop: [ALL]`, `no-new-privileges`, a read-only root filesystem and `/tmp` on tmpfs (no exception), waits for `wiki_static_init` with `condition: service_completed_successfully`, requires a `wiki-edit-page.<chunkhash>.js` under `/code/website/static/public/js/` (exit 1 otherwise: a missing bundle is never an empty success), proves that it can create a file in `/wiki_static` (a marker file created and removed; `test -w` is a false negative on Docker Desktop for macOS, run 8), copies the directory with `cp -R` (no ownership preservation, which `cp -a` would attempt as uid 1000 on root-owned build output) into the volume at `/wiki_static`, adds `/code/webpack-assets.json` and the unhashed alias `wiki-edit-page.js`, then prunes files that are no longer in the source — copy first, prune after, so a running consumer never sees an empty directory — and exits 0. + `web`, `api`, `admin` and `worker` mount `wiki_static` read-only at **`/code/website/static/public/js/wiki/`** and list `wiki_assets` in `depends_on` with `condition: service_completed_successfully` (Compose long form; plain dependencies become `condition: service_started`). In the `minimum` profile both one-shots are absent and the dependency is dropped. Because Compose interpolates `$VAR` in every string of the file before the container shell runs (review r1 R1-01 reproduced `ls "" >/dev/null; find "" ...` from `$src`/`$dst`), `compose render` escapes every `$` of a template `command` as `$$`; only `environment` values carry `${KEY}` from `runtime/.env`. A unit test re-implements Compose's interpolation over the rendered file with every key `secrets init` writes, and a second test runs `docker compose config` read-only when the CLI is present. + **Why a subpath and not the directory itself.** The overlay's `output.path` is the same directory the osf.io image's own `webpack-prod` fills. Mounting the volume *at* `/code/website/static/public/js` would hide osf.io's forty bundles, and copying the overlay's `webpack-assets.json` over osf.io's would break the `webpack_asset` filter for every other page. The overlay image's directory contains only the overlay's output (its config has one entry), so copying it whole into a *subdirectory* is non-destructive: `/static/public/js/wiki/wiki-edit-page.js` is served by the existing static route, the vendor chunk resolves relative to it, and nothing of osf.io is shadowed. +5. **Health and plan.** `health` treats a service with `restart: "no"` as healthy once it has `exited` with code 0 (`health: completed`); still running or non-zero is a failure. `plan` and `compose render` show `wiki_assets` with origin `overlay` and `build_from: RDM-wiki-frontend-dev2027@<sha12> over RDM-osf.io-dev2027@<sha12> (overlay of osf.io)`. The `wiki` template is deleted; [SPEC-02 §4](../spec/02_installer_cli.md#2-en-ports) lists `wiki_static_init` and `wiki_assets` in `core`. + +### 4. Consequences + +- The osf.io image used by `web`, `api`, `admin` and `worker` is unchanged and still built from osf.io's own Dockerfile. The wiki editor bundle arrives as files in a volume, so a new wiki-frontend commit changes only the overlay tag and the volume contents. +- `wiki-frontend` contributes two one-shot services, no port, and one narrow hardening exception (`wiki_static_init`: root with `CAP_CHOWN` only, for the volume owner fix). The same host-owned-volume question applies to `ember_osf_web_dist` and the other volumes written by non-root services; they are reviewed with the M4 volume-provisioning target of that exception. The acceptance scenario C4 (Wiki collaborative edit, [SPEC-04 §4](../spec/04_acceptance_tests.md#english)) exercises `web`, `y_websocket` and `sharejs`, as before. +- `y-websocket` stays a separate service (`y_websocket`, profile `core`): it is a server, not a bundle. +- **Follow-up, tracked (review r1 R1-03).** osf.io's `addons/wiki/templates/edit.mako` (line 733 at `356a997eb5fe`) loads `/static/js/pages/wiki-edit-page.js` (the raw source), not a built bundle, and osf.io's own webpack config has the `wiki-edit-page` entry commented out. The new bundle is therefore not used by the page until `RDM-osf.io-dev2027` references **`/static/public/js/wiki/wiki-edit-page.js`** (or teaches `webpack_asset` the overlay's `webpack-assets.json` under `/code/website/static/public/js/wiki/`). That change is made in the integration repository, not here; it is listed as an open item on the [status board](../status/README.md) ("統合リポジトリ側の edit.mako 配線(M2 第 5 回で確認)") and in the manifest `note` of `wiki-frontend`. Real install run 5 must show the editor page loading the bundle and its `vendor.<hash>.js` chunk in a browser and the C4 collaborative edit passing before M2 is called working; the overlay build itself (does `yarn run webpack-prod` succeed in the merged tree, is `node:21-alpine` multi-arch), a fresh-volume copy on a host whose uid is not 1000, and a re-run that replaces the bundle under running consumers are confirmed and recorded in [DEMO-20](../demo/20_core_install_mac_studio.md) at the same time. +- Review at M4: when osf.io's Dockerfile is modernized, decide whether the wiki-frontend overlay is merged into the osf.io repository (one webpack build) or stays an overlay; the `overlay_of` and one-shot mechanisms remain available for any other repository of the same shape. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 背景 + +manifest([SPEC-01](../spec/01_manifest.md#japanese))は `wiki-frontend` をコア部品とし、`wiki` という Compose の「サービス」(Compose が起動するコンテナ)を一つ持たせていた。インストーラーはほかのコアと同じに、`RDM-wiki-frontend-dev2027` を固定コミットで clone し、その checkout で `docker buildx build` を走らせようとした。 + +Mac Studio での第 4 回実導入(2026-11-06、[DEMO-20](../demo/20_core_install_mac_studio.md))は `build` で終了 30 になった。「image build failed — component wiki-frontend: docker buildx build exited 1」。BuildKit は何十行もの `COPY` について一度に `failed to calculate checksum ... "/addons/metadata/static": not found`、`"/addons/gitlab/requirements.txt": not found`、`"/addons/zotero/static": not found` などを報告した。 + +二つのリポジトリを並べて読むと理由が分かる。 + +- wiki-frontend の checkout にあるのは `addons/wiki/static/`(Milkdown エディタ: `wikiPageMilkdown.js`、`heading.js`、`image.js`、`link.js` など)、`website/static/js/`(`wikiTree.js`、`fangorn.js`、`pages/wiki-edit-page.js`)、`website/static/vendor/knockout-sortable`、`package.json`、`yarn.lock`、`webpack.common.config.js`、`webpack.prod.config.js`、`Dockerfile`、`.jshintrc`、`.travis.yml`、そして一行の `README.md`「This is RDM wiki code for bundle with webpack5」だけである。 +- その `Dockerfile` は osf.io の Dockerfile に小さな手を入れたものである。`FROM node:12-alpine3.9` を `node:21-alpine` に、アプリケーションの `requirements.txt` とアドオン要件の `pip install`、`collectstatic`、`pybabel` をコメントアウト(Alpine の Python 3 パッケージ自体は入り、`python3 -m compileall` も走る)、admin の `yarn install` もコメントアウト、`yarn run webpack-prod` は残す。それでも `./requirements.txt`、二十数個のアドオンの `./addons/<name>/requirements.txt`、`./admin/package.json ./admin/yarn.lock`、`./website/settings/`、`./api/base/settings/`、全アドオンの `./addons/<name>/static/` を `COPY` する。どれも wiki-frontend の木には無く、すべて `RDM-osf.io-dev2027` にある。アプリケーションの Python 依存が入らないので、できるイメージには Node と `node_modules`、素の Python 3、webpack の出力しか無く、`web`・`api`・`admin`・`worker` を動かす Flask も Django も入っていない。 +- `package.json` は osf.io の名前 `osf` と版 `20.14.0` のまま、`webpack` を `3.8.1` から `^5.93.0` に上げている(`webpack-cli` 5、`terser-webpack-plugin` 5、`assets-webpack-plugin` 7、エディタの `@milkdown/*` 7.3.6 も)。`webpack.common.config.js` は osf.io 側の四十ページのエントリ(そこでは `wiki-edit-page` がコメントアウトされている)を `wiki-edit-page` 一つに絞り、アドオンのエントリ探索を外す。`webpack.prod.config.js` は webpack 3 の `UglifyJsPlugin`・`CommonsChunkPlugin` を webpack 5 の `TerserPlugin`・`optimization.splitChunks` に置き換える。 +- 両設定の出力先は同じである。`output.path = <repo>/website/static/public/js`(イメージ内では `/code/website/static/public/js/`)、本番の `filename` は `[name].[chunkhash].js`、`vendor.[hash].js` の分割チャンク、`SaveAssetsJson()` が作業ディレクトリ(`/code/webpack-assets.json`)に `webpack-assets.json` を書く。つまりオーバーレイのビルドは `wiki-edit-page.<chunkhash>.js`、`vendor.<hash>.js`、その source map、二項目だけの `webpack-assets.json` を作る。osf.io のイメージでは同じディレクトリに osf.io の四十本の束と自前の `webpack-assets.json`(`website/util/paths.py` が Mako フィルタ `webpack_asset` のために読む)がある。 + +つまり `wiki-frontend` は osf.io の木のための「束を組む道具」である。新しい Node ベース、webpack 5、Milkdown エディタのソースを、webpack を走らせる前に osf.io のソースの上へ重ねるためのものだ。自分で動かすプロセスは無く、そのイメージでアプリケーションは動かない。共同編集の相方 `y-websocket`(Yjs の WebSocket サーバ)は独立したリポジトリで自分のサーバを持つので、サービスのままとする。 + +### 2. 検討した選択肢 + +```toon +options[4]{id,option,builds_today,honest_about_contents,runtime_correct,fits_spec01,verdict}: + A,"wiki-frontend の checkout から組む独立サービス `wiki`(現状)","いいえ(osf.io のパスの COPY が最初の段で失敗)","いいえ(動かす wiki サーバが無い)",いいえ,いいえ,"不可能。却下" + B,"イメージ一つ: 重ねた木から wiki-frontend の Dockerfile で osf.io を組み `grdm-dev/osf.io:<osf>-<wiki>` とし、web/api/admin/worker をそれで動かす","はい","はい(両コミットがタグに)","いいえ(Dockerfile が pip・collectstatic・pybabel を飛ばすので web/api/admin/worker の Python 実行環境が無い)","一部(項目一つ)","却下" + C,"レジストリの事前ビルド済み osf.io イメージをダイジェスト固定で使う(M4 までの ember-osf-web・cas-overlay と同じ)","はい","いいえ(中のコミットを誰も示せない。しかも osf.io のイメージこそ元から組むべき唯一のもの)",不明,"いいえ(中心部品で「固定した元から組む」保証を外す)",却下 + D,"イメージ二つ: osf.io は通常どおり組む。オーバーレイは重ねた木から `grdm-dev/wiki-frontend:<osf>-<wiki>` として組み、`wiki_assets` が一度動かして束をボリューム `wiki_static` へ写し、web/api/admin/worker が読み取り専用で mount する(上流 osf.io の `assets` の型)","はい","はい(オーバーレイのタグに両コミット。osf.io は自分のタグを保つ)","はい(osf.io のイメージは不変。静的ファイルを足すだけ)","はい(`overlay_of` + 一回限りのサービス)",採用 +``` + +B はこの記録の最初の案で、却下理由こそが肝心なので残す。オーバーレイの Dockerfile はビルド道具であってアプリケーションのイメージではない。C は問題を隠すだけだった。統合リポジトリ([ADR-01](ADR-01_Integration_Repository_Placement.md))の眼目は、中心の `osf.io` イメージを名指しできる固定コミットから組むことにある。 + +### 3. 決定 + +1. **manifest。** 部品は `overlay_of: "<ベースの id>"` を持てる([SPEC-01 §3](../spec/01_manifest.md#japanese))。自分の `integration_repo`、`integration_sha`、`upstreams[]`、PR の一覧はそのまま持つので、週次統合 PR と上流追跡([SPEC-05](../spec/05_upstream_tracking.md))は変わらず動く。`services[]` は一回限りのサービスである。`wiki-frontend` には `overlay_of: "osf.io"`、`services: ["wiki_static_init", "wiki_assets"]`、`profile: core`、`note` を書く。 +2. **検査。** `grdm-dev manifest check` に MC-14 を足す。ベースが存在し、`infra` でなく、オーバーレイでなく、`prebuilt_image` を持たない。オーバーレイは `infra` でなく、`prebuilt_image` を持たない。ベース一つにオーバーレイは最大一つ。インストーラーはテンプレートが `one_shot: true` でないオーバーレイのサービスを拒む(これも MC-14 として報告)。 +3. **build。** `grdm-dev build` は `osf.io` をこれまでどおり組む(`grdm-dev/osf.io:<osf の sha12>`)。オーバーレイについては、ベースの checkout も同期し(一回の実行で一度)、`runtime/src/_overlay/wiki-frontend/` を osf.io checkout の `.git` 抜きの写しとして作り直し、その上に wiki-frontend のファイルを `.git` 抜きで重ね(両方にあるファイル `Dockerfile`、`package.json`、`yarn.lock`、webpack 設定、`addons/wiki/static/*` はオーバーレイ側が勝つ)、`docker buildx build -f <context>/Dockerfile <context>` を `grdm-dev/wiki-frontend:<osf の sha12>-<wiki の sha12>`(`--push` では `ghcr.io/rcosdp/wiki-frontend:<同じ>`)のタグと、ラベル `org.gakunin-rdm.overlay-of=osf.io`・`org.gakunin-rdm.base-sha=<osf の sha12>` で走らせる。ビルド報告の行に `overlay_of`、`base_repo`、`base_sha12`、`image_tag` を持たせ、`compose render` は `image_tag` を読む。 +4. **compose。** 一回限りのテンプレートを二つ置く(profile `core`、`one_shot: true`、`restart: "no"` で出力)。どちらもオーバーレイのイメージを動かす。 + - `wiki_static_init`(レビュー r1 R1-02): 新しい名前付きボリュームは `runtime/volumes/` 配下にホストの利用者が `mkdir` で作る bind ディレクトリなので、uid が 1000 でない Linux ホストでは非 root の写し手が書けない。このコンテナは root で `cap_drop: [ALL]` に `CAP_CHOWN` だけを戻して動き(`manifest/hardening.json` に記した例外。controls は `user`・`cap_add`、見直し 2027-01-31、目標 M4)、`chown 1000:1000 /wiki_static` だけを実行して終了する。`chmod` は行わない。`CAP_CHOWN` しか無い root は他の uid が所有するディレクトリのモードを変えられず(`CAP_FOWNER` が要る)、bind ディレクトリの所有者はホストの利用者なので、モード `0755` は `compose render` が `runtime/volumes/<name>/` を初めて作るときだけホスト側で設定し、既存のディレクトリ(すでに uid 1000 に渡っているかもしれない)には触れないので、所有者が変わった後の再描画が失敗することはない(レビュー r2〜r4)。`chown` は冪等なので再実行しても安全。`read_only`・`no-new-privileges`・内部ネットワークはそのまま。ボリュームの mount 以外には触れない。 + - `wiki_assets`: 利用者 `1000:1000`、`cap_drop: [ALL]`、`no-new-privileges`、読み取り専用ルート、tmpfs の `/tmp`(例外なし)で動き、`wiki_static_init` を `condition: service_completed_successfully` で待ち、`/code/website/static/public/js/` に `wiki-edit-page.<chunkhash>.js` があることを要求し(無ければ exit 1。束が無いのに成功にはしない)、`/wiki_static` にファイルを作れることを証明し(目印ファイルを作って消す。macOS の Docker Desktop では `test -w` が偽陰性になる。第 8 回)、`cp -R`(所有権を保たない。uid 1000 の `cp -a` は root 所有のビルド成果で失敗しうる)でディレクトリを `/wiki_static` のボリュームへ写し、`/code/webpack-assets.json` とハッシュ無しの別名 `wiki-edit-page.js` を加え、元に無くなったファイルを後から消す(先に写し、後で間引く。動いている利用側が空のディレクトリを見ることはない)、そして 0 で終了する。 + `web`・`api`・`admin`・`worker` は `wiki_static` を **`/code/website/static/public/js/wiki/`** に読み取り専用で mount し、`depends_on` に `wiki_assets` を `condition: service_completed_successfully` で載せる(Compose の長い形。普通の依存は `condition: service_started` になる)。`minimum` プロファイルでは二つの一回限りサービスが無く、依存は落とされる。Compose はファイル中のすべての文字列の `$VAR` をコンテナのシェルより前に展開する(レビュー r1 R1-01 は `$src`/`$dst` から `ls "" >/dev/null; find "" ...` を再現した)ので、`compose render` はテンプレートの `command` の `$` をすべて `$$` にエスケープする。`runtime/.env` の `${KEY}` を運ぶのは `environment` の値だけ。単体試験は `secrets init` が書く全キーで Compose の展開を再実装して出力ファイルに適用し、もう一つの試験は CLI があるときに `docker compose config` を読み取り専用で走らせる。 + **なぜディレクトリそのものでなく下位パスか。** オーバーレイの `output.path` は、osf.io のイメージ自身の `webpack-prod` が満たすディレクトリと同じである。ボリュームを `/code/website/static/public/js` に mount すると osf.io の四十本の束が隠れ、オーバーレイの `webpack-assets.json` で osf.io のものを上書きすれば他の全ページの `webpack_asset` フィルタが壊れる。オーバーレイのイメージのそのディレクトリにはオーバーレイの出力しか無い(設定のエントリは一つ)ので、丸ごと「下位ディレクトリ」へ写すのは非破壊である。`/static/public/js/wiki/wiki-edit-page.js` は既存の静的ルートで配信され、vendor チャンクはそれに相対で解決し、osf.io のものは何も隠れない。 +5. **health と plan。** `health` は `restart: "no"` のサービスを、終了コード 0 の `exited` で健康(`health: completed`)とみなす。まだ動いている、または 0 以外なら失敗。`plan` と `compose render` は `wiki_assets` を origin `overlay`、`build_from: RDM-wiki-frontend-dev2027@<sha12> over RDM-osf.io-dev2027@<sha12> (overlay of osf.io)` で示す。テンプレート `wiki` は削除し、[SPEC-02 §4](../spec/02_installer_cli.md#2-ja-ports) は `core` に `wiki_static_init` と `wiki_assets` を載せる。 + +### 4. 結果 + +- `web`・`api`・`admin`・`worker` が使う osf.io のイメージは変わらず、osf.io 自身の Dockerfile から組まれる。Wiki エディタの束はボリュームのファイルとして届くので、wiki-frontend の新しいコミットが変えるのはオーバーレイのタグとボリュームの中身だけである。 +- `wiki-frontend` が持ち込むのは一回限りのサービス二つで、ポートは無く、hardening の例外は狭いもの一つ(`wiki_static_init`: ボリュームの所有者を直すための root と `CAP_CHOWN` のみ)。ホスト所有のボリュームという同じ問題は `ember_osf_web_dist` など非 root サービスが書く他のボリュームにもあり、その例外の M4 目標(ボリューム準備段)で一緒に見直す。受入シナリオ C4(Wiki 共同編集、[SPEC-04 §4](../spec/04_acceptance_tests.md#japanese))はこれまでどおり `web`・`y_websocket`・`sharejs` を使う。 +- `y-websocket` は独立サービス(`y_websocket`、profile `core`)のまま。サーバであって束ではない。 +- **追跡中の残件(レビュー r1 R1-03)。** osf.io の `addons/wiki/templates/edit.mako`(`356a997eb5fe` の 733 行)は `/static/js/pages/wiki-edit-page.js`(生のソース)を読み込み、組んだ束ではない。osf.io 自身の webpack 設定でも `wiki-edit-page` のエントリはコメントアウトされている。したがって `RDM-osf.io-dev2027` が **`/static/public/js/wiki/wiki-edit-page.js`** を参照する(または `/code/website/static/public/js/wiki/` のオーバーレイの `webpack-assets.json` を `webpack_asset` に読ませる)までは、新しい束はページに使われない。この変更は統合リポジトリ側で行い、ここでは行わない。[進捗ボード](../status/README.md)の残件(「統合リポジトリ側の edit.mako 配線(M2 第 5 回で確認)」)と `wiki-frontend` の manifest `note` に載せた。実機第 5 回で、エディタのページが束と `vendor.<hash>.js` チャンクをブラウザで読み込み、C4 の共同編集が通ることを示してから M2 を動作したと呼ぶ。オーバーレイのビルドそのもの(重ねた木で `yarn run webpack-prod` が通るか、`node:21-alpine` が多アーキテクチャか)、uid が 1000 でないホストでの新規ボリュームへの写し、動いている利用側の下で束を置き換える再実行も、同時に確かめて [DEMO-20](../demo/20_core_install_mac_studio.md) に記録する。 +- M4 で見直す。osf.io の Dockerfile を近代化する時に、wiki-frontend のオーバーレイを osf.io のリポジトリに統合する(webpack ビルドを一つにする)かオーバーレイのまま置くかを決める。`overlay_of` と一回限りのサービスの仕組みは、同じ形のほかのリポジトリにも使える。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Overlay | A set of files laid over another repository's tree before the image is built; its image is a build tool, not a server. | イメージを組む前にほかのリポジトリの木の上に重ねるファイルの組。そのイメージはビルド道具でサーバではない。 | +| One-shot service | A Compose service whose container runs once, does its job and exits (`restart: "no"`); others wait for it with `service_completed_successfully`. | 一度動いて仕事を終えたら終了する Compose のサービス(`restart: "no"`)。ほかは `service_completed_successfully` でそれを待つ。 | +| Build context | The directory `docker buildx build` reads files from; every `COPY` source must be inside it. | `docker buildx build` がファイルを読む場所。`COPY` の元はすべてこの中に無ければならない。 | +| webpack | The tool that bundles many JavaScript files into the few files a browser downloads; osf.io uses version 3, the overlay version 5. | 多くの JavaScript をブラウザが読む少数のファイルに束ねる道具。osf.io は版 3、オーバーレイは版 5。 | +| Named volume | A directory Docker keeps outside any container (here under `runtime/volumes/<name>`) that several services can mount. | コンテナの外に Docker が保つディレクトリ(ここでは `runtime/volumes/<名前>`)。複数のサービスが mount できる。 | +| Milkdown | The Markdown editor component used by the GRDM wiki pages. | GRDM の Wiki ページが使う Markdown エディタ部品。 | diff --git a/docs/decisions/ADR-07_Native_Builds_of_EOL_Middleware.md b/docs/decisions/ADR-07_Native_Builds_of_EOL_Middleware.md new file mode 100644 index 0000000..63440e5 --- /dev/null +++ b/docs/decisions/ADR-07_Native_Builds_of_EOL_Middleware.md @@ -0,0 +1,233 @@ +# ADR-07 Native Builds of EOL Middleware / EOL ミドルウェアのネイティブビルド + +> **Summary:** Some middleware the current GakuNin RDM needs (Elasticsearch 2.4.6 first) is end of life and only ships `linux/amd64` images. Running such an image under emulation on Apple Silicon is not merely slow: Elasticsearch 2 took 38 minutes to open its port on a fresh data directory (real install run 19), and the same program on a native arm64 JRE starts in 5 seconds. We decide to **build such images ourselves, natively for both architectures, from the official release artefact on a digest-pinned base**, declared in the manifest as `image_build: {context, tag}` with a Dockerfile under `installer/images/<id>/`, until the milestone that retires the middleware (M5 for Elasticsearch 2). The native image also runs as the hardening default (non-root, read-only), so the service's own hardening exception disappears (the owner-init one-shot stays, see §2.4). +> **概要:** 現在の GakuNin RDM が必要とするミドルウェアの一部(まず Elasticsearch 2.4.6)は EOL で、`linux/amd64` のイメージしか配布されていない。Apple Silicon でそれをエミュレーションで動かすのは「遅い」で済まない。Elasticsearch 2 は新しいデータディレクトリでポートを開くまで 38 分かかり(実機第 19 回)、同じプログラムは arm64 ネイティブの JRE なら 5 秒で起動する。**公式のリリース成果物からダイジェスト固定のベース上に、両アーキテクチャ向けのイメージを自分たちでネイティブに組む**ことを決める。manifest では `image_build: {context, tag}` として宣言し、Dockerfile は `installer/images/<id>/` に置き、そのミドルウェアを退役させる節目(Elasticsearch 2 は M5)まで続ける。ネイティブのイメージは堅牢化の既定(非 root・読み取り専用)で動くので、サービス自身の堅牢化の例外が消える(所有者初期化の一回限りサービスは残る。§2.4)。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.9 — 2026-11-10. **Learned:** an unset connection URL does not fail, it falls back to a default built from other settings: osf.io pointed its mongo client at PostgreSQL, so a client fixed to verify TLS still needs the installer to name the server and the trust anchor (RDM-osf.io-dev2027 PR #9). / 接続 URL が未設定でも失敗せず、他の設定から組み立てた既定値に落ちる。osf.io は mongo のクライアントを PostgreSQL に向けていたので、TLS を検証するよう直したクライアントにも、インストーラーが接続先と信頼の起点を渡す必要があると分かった(RDM-osf.io-dev2027 PR #9)。 + 0.8 — 2026-11-10. **Learned:** a byte count does not make a key usable by its consumer: a manually written key may be 43 `!` or 32 quoted spaces, so every CAS key must also be in the base64url alphabet, must not be a published default, and the TGC encryption key must decode canonically to 32 bytes (PR #39 review r1 R1-01). / バイト数だけでは、鍵が使う側で使えるとは言えない。手で書いた鍵は感嘆符 43 個や引用符で囲んだ空白 32 個でありうる。そこで CAS の鍵はすべて base64url の文字に限り、公開された既定値を拒み、TGC の暗号鍵は 32 バイトへ正準に復号できなければならない(PR #39 レビュー r1 R1-01)。 + 0.7 — 2026-11-10. **Learned:** a prebuilt image also freezes out every later fix, and an installer key that nothing reads looks healthy until the real program starts, so CAS moved to a native build from its pinned commit and its keys now carry the names and lengths the image needs (§7). / 事前ビルド済みイメージは後の修正もすべて締め出す。また誰も読まないインストーラのキーは、実際のプログラムが起動するまで正常に見える。そこで CAS は固定コミットからのネイティブビルドに移し、キーにはイメージが要する名前と長さを与えた(§7)。 + 0.6 — 2026-11-10. **Learned:** review r1 of MFR PR #5 showed that a rename does not prove a transfer is complete and a conversion semaphore does not bound connections, so each transfer now has a declared length, a hard deadline and an authenticated, dedicated path. / MFR PR #5 のレビュー r1 で、名前の変更は転送の完了を保証せず、変換のセマフォは接続数を制限しないと分かった。転送ごとに宣言された長さ、固い期限、認証された専用の経路を持たせた。 + 0.5 — 2026-11-10. **Learned:** when a socket protocol cannot cross a version boundary, moving the conversion behind a plain HTTP interface decoupled the two ends and let the converter drop its shared volume and its hardening entry; for sharejs, the driver under the adapter could be replaced without touching the protocol, keeping the OT behaviour. / ソケットのプロトコルが版の境界を越えられないとき、変換を素朴な HTTP に移すと両端が切り離され、変換側は共有ボリュームと堅牢化の項目を手放せた。sharejs はアダプタの下のドライバーだけを置き換えられ、OT の動作を保てた。 + 0.4 — 2026-11-10. **Learned:** a reproducible lockfile can preserve a fixable vulnerability, so the fix belongs in the lockfile of the component and is pinned here, and the upgrade path stays reachable before authentication because the browser client depends on the 4401 close (PR #37 review r2). / 再現可能なロックは修正可能な脆弱性も固定しうるので、修正はその部品のロックで行ってここで固定する。ブラウザのクライアントが 4401 の close に依存するため、upgrade の経路は認証の前でも到達できる(PR #37 レビュー r2)。 + 0.3 — 2026-11-10. **Learned:** a rebuilt image is only as safe as the commit and dependency set it is built from, so the image must be tested at the authenticating commit with its lockfile and frozen modules, and a data-volume upgrade needs a restorable snapshot rather than an image reference to go back to (PR #37 review r1). / 組み直したイメージの安全性は、組む元のコミットと依存の組で決まる。認証を含むコミットとロックファイル、固定したモジュールでそのイメージを試験しなければならず、データボリュームの更新には戻る先のイメージ参照でなく復元できる snapshot が要る(PR #37 レビュー r1)。 + 0.2 — 2026-11-10. **Learned:** a lower CVE count proves nothing about the client on the other end of a socket: a current LibreOffice scanned far cleaner yet could not serve MFR's 6.1 UNO client, so each image change needs its real client path proven. / CVE の件数が減ってもソケットの相手のクライアントについては何も証明しない。現行の LibreOffice は検出がはるかに少なかったが MFR の 6.1 の UNO クライアントには応えられなかった。イメージの変更ごとに実際のクライアントの経路を証明する必要がある。 + 0.1 — 2026-11-06. **Learned:** a cold start measures what a warm host hides: an emulated JDK 8 service spends tens of minutes initialising every time its data directory is new, and no timeout makes that acceptable; the program itself starts in seconds when it runs natively (real install run 19, PR #33 review r1). / コールドスタートは温まったホストが隠すものを測る。エミュレーションされた JDK 8 のサービスはデータディレクトリが新しいたびに数十分を初期化に費やし、どんなタイムアウトでもそれは許容できない。プログラム自体はネイティブで動かせば数秒で起動する(実機第 19 回、PR #33 レビュー r1)。 +- Status: Proposed for the owner's approval, 2026-11-06 (M2). Review date: start of M5 (Elasticsearch 2 retired); the rule itself stays for any later EOL middleware. +- Records a decision for: [SPEC-01 §3](../spec/01_manifest.md#english) (`image_build`, MC-15) · [SPEC-02 §3](../spec/02_installer_cli.md#english) (`build` of repo-local images) · [SPEC-03 §3.3](../spec/03_security_gate.md#english) (exception list) +- Related: [docs/decisions/README.md](README.md) · [ADR-03 Staged security gate](ADR-03_Staged_Security_Gate.md) · [ADR-06 Wiki frontend overlay](ADR-06_Wiki_Frontend_Overlay.md) · [DEMO-20 run 19](../demo/20_core_install_mac_studio.md#english) · [PR #33 review r1](../reviews/2026-11-06_RDM-developer-guide_PR33_Startup_Fixes_r1.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Context + +The development environment must start on Apple Silicon (arm64) and on amd64 (the CPU type of ordinary PCs and servers; see [REF-01](../reference/REF-01_Glossary.md)) hosts ([SPEC-00 §4](../spec/00_overview.md#english)). The osf.io (the main part of GRDM: the website and its API; see [REF-01](../reference/REF-01_Glossary.md)) of today still needs Elasticsearch (the search engine inside GRDM; see [REF-01](../reference/REF-01_Glossary.md)) 2.x (retired at M5 with ES 8, [POL-01 §4](../policy/POL-01_Developer_Environment_2027_Position.md#english)). The only official image, `elasticsearch:2` on Docker (the tool that builds images and runs containers; see [REF-01](../reference/REF-01_Glossary.md)) Hub, is `linux/amd64` only; PR (a pull request, a proposed change reviewed before it is merged; see [REF-01](../reference/REF-01_Glossary.md)) #32 made Compose run it under emulation (the `build_platform` of SPEC-01). + +Real install run 19 — the first cold start, with fresh volumes — showed the cost: the container burned two CPU cores for 38 minutes between `initializing ...` and `started`, while `osf_init` gave up waiting for the search engine after 5 minutes and the whole `up` failed. A trial of the official `elasticsearch-2.4.6.tar.gz` (27.3 MB, SHA-256 verified) on an arm64 `eclipse-temurin:8-jre` container reached `started` in 5 seconds. The slowness is the x86-64 image under Rosetta (Docker Desktop's amd64 emulation on Apple Silicon; see [REF-01](../reference/REF-01_Glossary.md)), not the program. + +The same shape — an EOL (end of life: software its maker no longer fixes; see [REF-01](../reference/REF-01_Glossary.md)) program that only ships amd64 images — exists for other infra components (unoconv, sharejs, fakecas until M4) and may recur before M5. + +### 2. Decision + +1. **Manifest** (the file that lists every component with its pinned commit; see [REF-01](../reference/REF-01_Glossary.md)). An `infra` component may carry `image_build: {"context": "<repo-relative directory>", "tag": "<recipe version>"}` ([SPEC-01 §3](../spec/01_manifest.md#english), rule MC-15): the directory holds a `Dockerfile`, the tag names the recipe (bump it when the Dockerfile changes), a `note` says why the official image cannot be used and until which milestone, and `prebuilt_image` / `build_platform` are excluded. `base_image` and `base_image_digest` name the digest-pinned base the Dockerfile starts from. +2. **Build.** `grdm-dev build` builds such a component from the repository directory for the host platform (or `--platform`), tags it `grdm-dev/<id>:<tag>`, records it in the build report with status `built`, and `--push` publishes `ghcr.io/rcosdp/<id>:<tag>`; `compose render` writes that reference as `image:`, `scan` scans it like any other image. No clone, no integration repository: the component stays `infra`. +3. **Dockerfile rules.** The artefact is the upstream's official release (tarball, deb or jar) fetched by URL with a checksum that is verified in the build; the base image is digest-pinned; the fetch runs in a `--platform=$BUILDPLATFORM` stage so that `curl`, `sha256sum` and `tar` never run under emulation (tar fails with "Function not implemented" under Rosetta); the final stage only copies files, runs as uid 1000 and needs no writable root except declared `tmpfs`/volumes. The image is a development artefact: no plugins, no site-specific configuration. `fakecas` is the recorded exception for a project with no release artefact: it is compiled from a checksum-verified commit archive with frozen `go.mod`/`go.sum`, and runs as uid 65534 as its service template always has. +4. **Scope.** First applied to `elasticsearch2` (`installer/images/elasticsearch2/`, tag `2.4.6-1`). The elasticsearch hardening exception (`read_only`) of PR #33 is removed: the native image runs as uid 1000 on a read-only root, like elasticsearch 6. The one-shot `elasticsearch_data_init` stays, now on the native image as an explicit root with `CAP_CHOWN` only, because the bind-mounted data directory belongs to the host user (or to uid 101 after PR #33) and image layers cannot change a mounted tree (review r1 R1-01); that step later became the generic `volume_owner_init` ([SPEC-03 §3.3](../spec/03_security_gate.md#english)). Other amd64-only infra images stay under emulation until they become a start-up problem or reach their modernization milestone; each switch is one PR with its own run record. `elasticsearch6` (`6.8.23-1`) and `fakecas` (`9a9ddd73b225-2`) moved on 2026-11-10 (§5); `elasticsearch6` also lost its `read_only` hardening entry. `cas-overlay` is the first integration-repository component on this path: its own Dockerfile follows these rules and needs no recipe here (§7). +5. **Retirement.** `target_image` keeps naming the milestone that removes the middleware (ES 2 → M5). A native build is a bridge, not a reason to keep EOL software. + +### 3. Options considered + +```toon +options[4]{option,cold_start,hardening,maintenance,chosen}: + A,"official elasticsearch:2 under emulation (PR #32)","38 minutes on Apple Silicon","root + chown step, exception","none","no" + B,"wait longer / larger timeouts","unchanged, only hidden","unchanged","none","no" + C,"third-party arm64 images of ES 2","unknown provenance, unpinnable","unknown","depends on a stranger","no" + D,"build natively from the official tarball on a pinned JRE (this ADR)","5 seconds","uid 1000, read-only, no exception","one Dockerfile per image, checksum pinned","yes" +``` + +### 4. Consequences + +- Cold starts on Apple Silicon are bounded by the osf.io migrations and the ember build, not by a 40-minute search engine. +- One fewer entry in `manifest/hardening.json` (the elasticsearch service itself); the baseline report shrinks ([SPEC-03 §3.3](../spec/03_security_gate.md#english)). +- The repository now holds a Dockerfile for third-party software. It is a build recipe, not a fork: the artefact is upstream's, verified by checksum; Trivy (a scanner that reads our images and lists the holes it knows about; see [REF-01](../reference/REF-01_Glossary.md)) scans the resulting image like any other. +- CI (continuous integration: the checks that run automatically on every pull request; see [REF-01](../reference/REF-01_Glossary.md)) must build `image_build` components for both platforms (amd64 on the GitHub runner, arm64 on the Mac Studio runner, SPEC-02 §10) so a recipe change is caught before a developer hits it. + +### 5. Image vulnerability reduction (2026-11-10) + +Counts are Trivy 0.75 `image --offline-scan` with the local database of 2026-11-05, CRITICAL/HIGH findings as reported, without the Python 3.13 port. "Before" images are amd64 except y-websocket and rabbitmq, which are arm64. Every "after" image was measured on both arm64 and amd64, with equal counts on each. The tested y-websocket (the real-time co-editing server for the Wiki; see [REF-01](../reference/REF-01_Glossary.md)) commit is `09eb0a9f4af623760a15e100790381560b9e8ce0`, the head of the integration repository's `security/ws-update` branch (`bf2cd67051025416de028f6edd16c83d3fc8ba79` plus `ws` 6.2.6 in the lockfile). + +```toon +results[6]{image,before,after,outcome,proof}: + elasticsearch6,37/236,2/50,"adopted: OSS 6.8.23 on Temurin 11 (image_build)","osf.io's django-elasticsearch-metrics wrote a template, documents and an aggregation on both architectures; a copy of a 6.3.1 data volume upgraded and validated; rollback demonstrated (§6)" + fakecas,1/57,0/2,"adopted: pinned commit with current Go and frozen modules (image_build)","login form, ticket validation, login redirect, and 404 for an unknown ticket against postgres on both architectures; two uncached builds gave the same binary hash" + y-websocket,1/12,0/0,"adopted: JWT-enforcing commit with ws 6.2.6, npm ci from its lockfile, no npm or yarn at run time, Node 24 LTS (build_dockerfile)","no, bad-signature, expired, wrong-document, no-exp, alg-none and duplicate tokens closed 4401 with zero frames; a valid token converged two Yjs providers; a missing secret refuses to start; both architectures" + rabbitmq,0/7,0/7,"digest pinned; 3.13.7 is already the newest image of the 3-management tag","same image as the running one" + unoconv,147/1140,1/98,"adopted: Debian 13 LibreOffice 25.2 behind a convert service (image_build)","MFR docx, xlsx and pptx to PDF on arm64 and amd64 (text with Japanese verified); see below" + sharejs,394/1588,0/0,"adopted: Node 24 with a mongoskin shim on mongodb 3.7 (image_build)","two ShareJS clients converged, documents survived a server restart and osf.io's pymongo read them; see below" +``` + +A rejected y-websocket upgrade still passes `handleUpgrade` and is then closed with 4401, and this stays: a browser cannot read the reason of an HTTP 401 on a WebSocket upgrade, SPEC-04 C4 and S1 require 4401 with zero frames, and the wiki client's token recovery keys on that code. Refusing earlier would be a joint change to the client and SPEC-04; the two `ws` advisories on that path are fixed by 6.2.6. The two fakecas findings are `dgrijalva/jwt-go` and `labstack/echo` v3, which upstream's module requires and which have no fixed version in that line. The remaining elasticsearch6 findings are jars inside the 6.8.23 release (netty, jackson, snakeyaml, bouncycastle and Elasticsearch itself) plus `apt` in the JRE base; Elastic published no later 6.8 release (6.8.24 answers 404), and M5 removes this line. + +**unoconv.** LibreOffice from Debian 12 (7.4) and Debian 13 (25.2) cannot serve MFR's LibreOffice 6.1 UNO client (`Binary URP bridge disposed during call`), so MFR now posts each document to a small HTTP service in this image, which runs `soffice --convert-to` with its own directory and profile per request. The service has a size limit, a time limit and a bounded queue; the target format is an allow-listed token. MFR no longer shares its temporary directory with the converter, which runs as uid 1000 on a read-only root with no capabilities and a size-limited tmpfs, on the internal network; its hardening entry is removed. The 1/98 are Debian-unfixed findings (25 of them are the Python packages the service needs). Each request authenticates with `UNOCONV_CONVERT_SECRET` before its body is read, connections are served by a fixed worker pool and a bounded queue with hard deadlines, and the converter and MFR share a dedicated internal network (`grdm-convert`) that no other service joins. Per-job directories are resource separation, not a sandbox between concurrent jobs, which run under one uid. The switch needs the MFR change (`UNOCONV_CONVERT_URL`) merged first; until then the old image keeps working with the old default. + +**sharejs.** Node 24 with mongodb 1.4.40 never called back over TLS, so `vendor/mongoskin` replaces the part of the mongoskin API that livedb-mongo uses on top of mongodb 3.7 (the last driver line that supports the mongo:3.4 server), and ws 8 replaces ws 0.4. The connection verifies the server certificate and host name against `MONGO_TLS_CA_FILE`: mongo creates its certificate once, keeps the key in `mongo_data`, and copies only the public certificate to `mongo_tls`, which sharejs mounts read-only. osf.io's own pymongo client (`addons/wiki/utils.py` `share_db()`) verifies the same way since RDM-osf.io-dev2027 PR #9: `compose render` writes `SHAREJS_DB_URL=mongodb://mongo:27017/sharejs?ssl=true` and `SHAREJS_DB_CA_FILE=/mongo-tls/mongodb.crt` into `osf.env` and mounts `mongo_tls` read-only in web, api, admin and worker, and `share_db()` refuses any URL option that would weaken the check. Before that, osf.io had no `SHAREJS_DB_URL` here and assembled `mongodb://postgres:5432/sharejs` from `DB_HOST` and `OSF_DB_PORT`. The sharejs server itself changes by five lines. **What osf.io still needs it for:** the wiki editor moved to y-websocket and no longer loads sharejs in the browser (`wiki-edit-page` bundle from RDM-wiki-frontend; the repository's `wikiPage.js` runs only through the legacy fallback when no bundle is installed, which does not happen in this environment), but the text editor on the file page still does (`view_file.mako` loads `//<sharejs>/text.js` and `share.js`; `website/static/js/filepage/editor.js` uses `ShareJSDoc`), and osf.io still reads mongo through `addons/wiki/utils.py` `share_db()` and `WikiVersion.get_draft`, called from `wiki_page_draft`. In this environment sharejs has no published port, so the file page's editor already shows only a spinner (`addons/wiki/settings/defaults.py` gives the browser `localhost:7007`). Retiring sharejs and mongo is a separate decision: it needs a replacement for that editor, removal of `share_db`, `get_draft` and the `/draft/` route, and a data decision about drafts already stored in mongo. + +### 6. Upgrading an existing Elasticsearch 6.3.1 data volume + +The data under `runtime/volumes/elasticsearch6_data` moves from 6.3.1 (default distribution) to 6.8.23 (OSS) when the new image starts on it. Reverting the image reference does not recover it: once 6.8.23 has written the directory, go back by restoring a snapshot taken before the upgrade ([Elastic 6.8 upgrade guide](https://www.elastic.co/guide/en/elasticsearch/reference/6.8/setup-upgrade.html)). Metrics are development data, so a developer may also choose to discard the directory. Otherwise, with `E=http://<address of the node>:9200`: + +1. **Record the old cluster.** `curl $E/` (version and `build_flavor`), `curl "$E/_cat/plugins?v"`, `curl "$E/_cat/templates?h=name"` and `curl "$E/_cluster/state/metadata?filter_path=metadata.licenses.license.type,metadata.ml.jobs,metadata.ml.datafeeds"`. +2. **Stop the writers.** Stop `web`, `api`, `admin` and `worker`, then `elasticsearch6`. +3. **Take and verify a snapshot.** Start a one-off `docker.elastic.co/elasticsearch/elasticsearch:6.3.1` with `--platform linux/amd64`, `--user 1000:1000`, the data directory mounted, an empty directory owned by uid 1000 mounted at `/snapshots`, and `-e discovery.type=single-node -e xpack.security.enabled=false -e path.repo=/snapshots`. Then `PUT $E/_snapshot/preupgrade` with `{"type":"fs","settings":{"location":"/snapshots/preupgrade"}}`, `POST $E/_snapshot/preupgrade/_verify`, and `PUT "$E/_snapshot/preupgrade/before-6-8?wait_for_completion=true"` with `{"indices":"*","include_global_state":true}`. Require `"state":"SUCCESS"` and `"failed":0`. Stop the container. +4. **Upgrade a disposable copy.** Copy the data directory to a new directory owned by uid 1000, start the 6.8.23 image on the copy as the `elasticsearch6` template does, and check the templates, the document counts and an aggregation. Only then start the real service on the real directory. +5. **On failure, restore to a clean 6.3.1.** Empty the data directory, start the one-off 6.3.1 container of step 3 on it, register the repository with `"readonly":true`, `POST "$E/_snapshot/preupgrade/before-6-8/_restore?wait_for_completion=true"` with `{"indices":"*","include_global_state":true}`, repeat the checks, and stay on the previous revision of this repository. + +Demonstrated on 2026-11-10 with throwaway containers and volumes, never the running stack. The 6.3.1 cluster was the default distribution with x-pack modules, plugins `ingest-geoip` and `ingest-user-agent`, no ML jobs or datafeeds, and 15 X-Pack or Logstash templates beside the application's. Three documents written through osf.io's client were snapshotted (`SUCCESS`, 1 shard, 0 failed); a copy upgraded to 6.8.23 returned the template, 3 documents and the aggregation; a clean 6.3.1 restored from the snapshot returned the same. On 6.8.23 OSS the unknown `licenses` metadata is logged and skipped. The x-pack templates stay in the upgraded copy; nothing uses them. A cluster with ML jobs, security users or other X-Pack state was not tested, so step 1 decides whether this procedure applies. + +### 7. The login server built from the integration repository (2026-11-10) + +`cas-overlay`, our CAS (Central Authentication Service: the real login server; see [REF-01](../reference/REF-01_Glossary.md)), ran a prebuilt `linux/amd64` image, because Maven hung for 8 hours under emulation (DEMO-20 run 3). That image could not carry the security fixes merged into the integration repository. The repository's own Dockerfile is now native: at commit `22610b7681a29241365108e5129bcd43ade4610e`, Maven and the jetty configuration run on the build host's architecture and the final stage only copies files. So the component needs neither `prebuilt_image` nor `build_platform`, and no `build_dockerfile` of ours. The `cas` hardening entry is gone: the service runs as uid 1000 on a read-only root, with only `/tmp` writable. + +**Settings.** `compose render` writes all of `/etc/cas/cas.properties` and one service definition in `/etc/cas/services`, which allows only the published web URL. The mount replaces the image's definitions, which name other hosts. The Secure cookie flags are off because the stack is plain HTTP on loopback. Secrets reach CAS only through the environment. + +**Keys.** The old `CAS_TGC_*` and `CAS_WEBFLOW_*` keys had no effect: Spring reads `tgc.encryption.key` from `TGC_ENCRYPTION_KEY`, and nothing reads a webflow key. They are retired. `runtime/.env` now holds `TGC_ENCRYPTION_KEY` (43 characters), `TGC_SIGNING_KEY` (86 characters), `OSF_API_INSTITUTIONS_AUTH_JWESECRET` (exactly 32 bytes) and `OSF_API_INSTITUTIONS_AUTH_JWTSECRET` (at least 32 bytes). The last two also become osf.io's `JWE_SECRET` and `JWT_SECRET`, in `api/base/settings`. CAS itself does not check the TGC keys, so `secrets init` and `compose render` check all four: the length, the base64url alphabet (no whitespace or quotes), no published default (compared by SHA-256, so the repository does not hold them), and for `TGC_ENCRYPTION_KEY`, which CAS reads as a JWK octet value, a canonical decoding to 32 bytes. The signing key and the institution keys are used as raw characters and are not decoded. + +**Order.** CAS validates the migrated `osf` schema at start and exits 254 on an empty database, so it waits for `osf_init` with `service_completed_successfully`. + +**Upgrading an existing `runtime/.env`.** `compose render` stops with exit 2 and names the four missing keys. `grdm-dev secrets rotate` adds them, and it also replaces every other secret and recreates the running containers with the existing Compose file. Then run `compose render`, `build --component cas-overlay` and `up`. To keep the other secrets, append the four keys by hand with those lengths and that alphabet, and skip `rotate`. + +**Proof on 2026-11-10, on arm64.** The project was a throwaway `cas-int`, derived from the rendered file with only `cas` and what it waits for, plus a loopback port for the test; the running stack was not touched. The osf.io image ran the real migrations on a new database (`osf_init` exit 0), so this is the first check of the `validate` step against the real GRDM schema. + +```toon +results[8]{check,result}: + "image","built by grdm-dev build, arm64, base digest label present" + "container","uid 1000, read-only root, cap_drop ALL, no-new-privileges, 0 restarts" + "start","Jetty started in 19 s after osf_init; no Missing table or unresolved placeholder" + "GET /login","200; JSESSIONID has HttpOnly and no Secure" + "wrong password","200 with an error, no ticket, no TGC" + "right password (user created through osf.io, bcrypt_sha256)","302 to the web URL with a service ticket; TGC has HttpOnly and no Secure" + "/p3/serviceValidate","authenticationSuccess for the user's GUID; the same ticket again gives INVALID_TICKET" + "unregistered service","200 not-authorized page with no login form" +``` + +**Not verified.** osf.io still logs in through fakecas, because this change does not switch the auth provider. The redirect back into a running web service, institution login with the JWE and JWT keys, TOTP, ORCiD and a real amd64 host (the integration repository's PR tested amd64 under Rosetta before its last secret changes) were not exercised. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 背景 + +開発環境は Apple Silicon(arm64)と amd64 のホストの両方で起動しなければならない([SPEC-00 §4](../spec/00_overview.md#japanese))。現在の osf.io はまだ Elasticsearch 2.x を必要とする(M5 で ES 8 に替えて退役。[POL-01 §4](../policy/POL-01_Developer_Environment_2027_Position.md#japanese))。唯一の公式イメージ Docker Hub の `elasticsearch:2` は `linux/amd64` のみで、PR #32 は Compose にエミュレーションで動かさせた(SPEC-01 の `build_platform`)。 + +実機第 19 回 — 新しいボリュームでの最初のコールドスタート — がその代償を示した。コンテナは `initializing ...` から `started` まで 38 分間 CPU 2 コアを使い続け、一方 `osf_init` は 5 分で検索エンジンを待つのを諦めて `up` 全体が失敗した。公式の `elasticsearch-2.4.6.tar.gz`(27.3 MB、SHA-256 検証済み)を arm64 の `eclipse-temurin:8-jre` コンテナで試すと 5 秒で `started` に達した。遅いのは Rosetta(Apple Silicon 上の Docker Desktop の amd64 エミュレーション。[REF-01](../reference/REF-01_Glossary.md))下の x86-64 イメージであって、プログラムではない。 + +同じ形 — amd64 のイメージしか配布されない EOL のプログラム — は他の基盤部品(M4 までの unoconv・sharejs・fakecas)にもあり、M5 までにまた現れうる。 + +### 2. 決定 + +1. **manifest。** `infra` の部品は `image_build: {"context": "<リポジトリ相対のディレクトリ>", "tag": "<レシピの版>"}` を持てる([SPEC-01 §3](../spec/01_manifest.md#japanese)、規則 MC-15)。ディレクトリには `Dockerfile` があり、tag はレシピの版(Dockerfile を変えたら上げる)、`note` には公式イメージが使えない理由とどの節目までかを書き、`prebuilt_image` と `build_platform` は併用できない。`base_image` と `base_image_digest` は Dockerfile が出発点にするダイジェスト固定のベースを指す。 +2. **ビルド。** `grdm-dev build` はその部品をリポジトリのディレクトリからホストのプラットフォーム(または `--platform`)向けに組み、`grdm-dev/<id>:<tag>` のタグを付け、ビルド報告に `built` として記録し、`--push` では `ghcr.io/rcosdp/<id>:<tag>` へ公開する。`compose render` はその参照を `image:` に書き、`scan` は他のイメージと同じに検査する。clone も統合リポジトリも無く、部品は `infra` のままである。 +3. **Dockerfile の規則。** 成果物は上流の公式リリース(tarball・deb・jar)で、URL から取得しビルド中にチェックサムを検証する。ベースイメージはダイジェスト固定。取得は `--platform=$BUILDPLATFORM` の段で行い、`curl`・`sha256sum`・`tar` をエミュレーション下で動かさない(tar は Rosetta 下で「Function not implemented」で失敗する)。最終段はファイルを写すだけで、uid 1000 で動き、宣言した `tmpfs`/ボリューム以外に書込可能なルートを要しない。イメージは開発用の成果物であり、プラグインもサイト固有の設定も持たない。`fakecas` はリリース成果物の無いプロジェクトとして記録した例外で、チェックサムを検証したコミットのアーカイブから、固定した `go.mod`/`go.sum` でコンパイルし、サービス定義のとおり uid 65534 で動く。 +4. **範囲。** まず `elasticsearch2`(`installer/images/elasticsearch2/`、tag `2.4.6-1`)に適用する。PR #33 の elasticsearch の堅牢化例外(`read_only`)は取り除く。ネイティブのイメージは elasticsearch 6 と同じく uid 1000・読み取り専用ルートで動く。一回限りの `elasticsearch_data_init` は残し、ネイティブイメージを明示の root・`CAP_CHOWN` のみで動かす。bind マウントしたデータディレクトリはホストの利用者(PR #33 の後は uid 101)の所有で、イメージの層ではマウントした木を変えられないからである(レビュー r1 R1-01)。この段は後に汎用の `volume_owner_init` になった([SPEC-03 §3.3](../spec/03_security_gate.md#japanese))。他の amd64 のみの基盤イメージは、起動の問題になるか近代化の節目に達するまでエミュレーションのままとし、切り替えは一つずつ PR と実機記録を伴って行う。`elasticsearch6`(`6.8.23-1`)と `fakecas`(`9a9ddd73b225-2`)は 2026-11-10 に移行した(§5)。`elasticsearch6` の `read_only` の堅牢化項目も消えた。`cas-overlay` はこの道を取る最初の統合リポジトリの部品で、自身の Dockerfile がこれらの規則に従うので本リポジトリのレシピは要らない(§7)。 +5. **退役。** `target_image` は引き続きそのミドルウェアを除く節目を指す(ES 2 → M5)。ネイティブビルドは橋であり、EOL ソフトウェアを残す理由ではない。 + +### 3. 検討した選択肢 + +```toon +options[4]{option,cold_start,hardening,maintenance,chosen}: + A,"公式 elasticsearch:2 をエミュレーション(PR #32)","Apple Silicon で 38 分","root+chown の段、例外あり","なし","いいえ" + B,"もっと長く待つ/タイムアウトを伸ばす","変わらず、隠れるだけ","変わらず","なし","いいえ" + C,"第三者の arm64 版 ES 2 イメージ","出自不明、固定不可","不明","他人次第","いいえ" + D,"公式 tarball から固定 JRE 上にネイティブで組む(本 ADR)","5 秒","uid 1000・読み取り専用・例外なし","イメージごとに Dockerfile 一つ、チェックサム固定","はい" +``` + +### 4. 影響 + +- Apple Silicon のコールドスタートの上限は osf.io の migration と ember のビルドで決まり、40 分の検索エンジンではなくなる。 +- `manifest/hardening.json` の項目が一つ減る(elasticsearch サービス自身)。基本対策の報告が小さくなる([SPEC-03 §3.3](../spec/03_security_gate.md#japanese))。 +- リポジトリに第三者ソフトウェアの Dockerfile が入る。これはフォークではなくビルドのレシピで、成果物は上流のものをチェックサムで検証したもの。Trivy はできたイメージを他と同じに検査する。 +- CI は `image_build` の部品を両プラットフォームで組まなければならない(amd64 は GitHub ランナー、arm64 は Mac Studio ランナー。SPEC-02 §10)。レシピの変更を開発者が踏む前に捕まえるためである。 + +### 5. イメージの脆弱性削減(2026-11-10) + +件数は Trivy 0.75 の `image --offline-scan`(ローカルのデータベースは 2026-11-05 版)による CRITICAL/HIGH の報告値で、Python 3.13 への移植は含まない。「前」のイメージは y-websocket と rabbitmq が arm64、それ以外は amd64。「後」のイメージはすべて arm64 と amd64 の両方で測り、件数は同じだった。試験した y-websocket のコミットは `09eb0a9f4af623760a15e100790381560b9e8ce0` で、統合リポジトリの `security/ws-update` ブランチの先頭である(`bf2cd67051025416de028f6edd16c83d3fc8ba79` にロックの `ws` 6.2.6 を加えたもの)。 + +```toon +results[6]{image,before,after,outcome,proof}: + elasticsearch6,37/236,2/50,"採用: Temurin 11 上の OSS 6.8.23(image_build)","osf.io の django-elasticsearch-metrics が両アーキテクチャでテンプレート・文書・集計を実行。6.3.1 のデータボリュームの写しを更新して検証し、復旧も実証(§6)" + fakecas,1/57,0/2,"採用: 固定コミットを現行の Go と固定したモジュールで組む(image_build)","両アーキテクチャで postgres に対しログイン画面、チケット検証、ログイン後の転送、未知のチケットの 404。キャッシュなしの 2 回のビルドでバイナリのハッシュが一致" + y-websocket,1/12,0/0,"採用: ws 6.2.6 を含む JWT を強制するコミット、ロックファイルからの npm ci、実行時に npm・yarn 無し、Node 24 LTS(build_dockerfile)","トークン無し・署名不正・期限切れ・別文書・exp 無し・alg none・重複は 4401 で閉じフレーム 0。有効なトークンで 2 つの Yjs プロバイダが収束。秘密鍵無しでは起動拒否。両アーキテクチャ" + rabbitmq,0/7,0/7,"ダイジェストを固定。3.13.7 は 3-management タグの最新イメージ","動作中のものと同じイメージ" + unoconv,147/1140,1/98,"採用: 変換サービス越しの Debian 13 LibreOffice 25.2(image_build)","MFR で docx・xlsx・pptx を arm64・amd64 で PDF に変換し日本語の本文を確認。下記" + sharejs,394/1588,0/0,"採用: Node 24 と mongodb 3.7 上の mongoskin 互換層(image_build)","2 つの ShareJS クライアントが収束し、サーバー再起動後も文書を保持し、osf.io の pymongo でも読めた。下記" +``` + +拒否された y-websocket の upgrade は `handleUpgrade` を通った後で 4401 で閉じ、この動作は維持する。ブラウザは WebSocket の upgrade に対する HTTP 401 の理由を読めず、SPEC-04 の C4 と S1 は 4401 とフレーム 0 を求め、wiki のクライアントのトークン回復はこのコードで動く。より前で拒否するにはクライアントと SPEC-04 を一緒に変える必要がある。その経路にある `ws` の勧告 2 件は 6.2.6 で修正した。fakecas の 2 件は上流のモジュールが要する `dgrijalva/jwt-go` と `labstack/echo` v3 で、その系統に修正版は無い。elasticsearch6 に残る検出は 6.8.23 のリリースに含まれる jar(netty・jackson・snakeyaml・bouncycastle・Elasticsearch 本体)と JRE ベースの `apt` である。Elastic は後続の 6.8 を出しておらず(6.8.24 は 404)、M5 でこの系統ごと除く。 + +**unoconv。** Debian 12(7.4)と Debian 13(25.2)の LibreOffice は MFR の 6.1 の UNO クライアントには応えられない(`Binary URP bridge disposed during call`)。そこで MFR は文書をこのイメージの小さな HTTP サービスに送り、サービスは要求ごとに専用のディレクトリとプロファイルで `soffice --convert-to` を動かす。サイズ・時間の上限と同時実行の上限を持ち、変換先の形式は許可された語に限る。MFR は一時ディレクトリを変換側と共有しなくなり、変換側は uid 1000・読み取り専用ルート・capability なし・サイズ上限つき tmpfs で内部ネットワークだけで動くので、堅牢化の項目を削除した。残る 1/98 は Debian で未修正の検出で、うち 25 件はサービスに必要な Python のパッケージである。要求は本文を読む前に `UNOCONV_CONVERT_SECRET` で認証し、接続は固定のワーカーと有限の待ち行列で固い期限のもとに処理し、変換側と MFR は他のサービスが参加しない専用の内部ネットワーク(`grdm-convert`)を共有する。ジョブごとのディレクトリは資源の分離であり、同じ uid で動く同時実行のジョブの間のサンドボックスではない。切り替えには MFR の変更(`UNOCONV_CONVERT_URL`)の取り込みが先に必要で、それまでは旧イメージと旧来の既定のまま動く。 + +**sharejs。** mongodb 1.4.40 は Node 24 の TLS でコールバックを返さないので、`vendor/mongoskin` で livedb-mongo が使う mongoskin の API を mongodb 3.7(mongo:3.4 を扱える最後のドライバー系統)の上に置き換え、ws 0.4 を ws 8 にした。接続はサーバー証明書とホスト名を `MONGO_TLS_CA_FILE` で検証する。mongo は証明書を一度だけ作り、鍵を `mongo_data` に置き、公開証明書だけを `mongo_tls` に写し、sharejs はそれを読み取り専用でマウントする。osf.io 自身の pymongo(`addons/wiki/utils.py` の `share_db()`)も RDM-osf.io-dev2027 PR #9 以降は同じ方法で検証する。`compose render` は `osf.env` に `SHAREJS_DB_URL=mongodb://mongo:27017/sharejs?ssl=true` と `SHAREJS_DB_CA_FILE=/mongo-tls/mongodb.crt` を書き、web・api・admin・worker に `mongo_tls` を読み取り専用でマウントする。`share_db()` は検証を弱める URL のオプションを拒否する。それ以前のこの環境では osf.io に `SHAREJS_DB_URL` が無く、`DB_HOST` と `OSF_DB_PORT` から `mongodb://postgres:5432/sharejs` を組み立てていた。sharejs 本体の変更は 5 行である。**osf.io がまだ必要とするもの:** wiki エディタは y-websocket に移行し、ブラウザで sharejs を読み込まない(RDM-wiki-frontend の `wiki-edit-page` バンドル。リポジトリの `wikiPage.js` が動くのはバンドルが無いときの旧経路だけで、この環境では起きない)。しかしファイルページのテキストエディタはまだ使う(`view_file.mako` が `//<sharejs>/text.js` と `share.js` を読み、`website/static/js/filepage/editor.js` が `ShareJSDoc` を使う)。また osf.io は `addons/wiki/utils.py` の `share_db()` と `WikiVersion.get_draft`(`wiki_page_draft` から呼ばれる)で mongo を読み続けている。この環境の sharejs は公開ポートを持たないので、ファイルページのエディタはすでにスピナーのままである(`addons/wiki/settings/defaults.py` はブラウザに `localhost:7007` を渡す)。sharejs と mongo の退役は別の判断である。そのエディタの代替、`share_db`・`get_draft`・`/draft/` 経路の除去、mongo に既にある下書きの扱いが必要になる。 + +### 6. 既存の Elasticsearch 6.3.1 データボリュームの更新 + +新しいイメージを起動すると、`runtime/volumes/elasticsearch6_data` のデータは 6.3.1(default 配布)から 6.8.23(OSS)へ移る。イメージ参照を戻しても復旧にはならない。6.8.23 が一度ディレクトリに書いたら、戻るには更新前に取った snapshot を復元する([Elastic 6.8 更新ガイド](https://www.elastic.co/guide/en/elasticsearch/reference/6.8/setup-upgrade.html))。メトリクスは開発用のデータなので、開発者はディレクトリを捨てることも選べる。そうしない場合は、`E=http://<ノードのアドレス>:9200` として次の手順による。 + +1. **旧クラスタを記録する。** `curl $E/`(版と `build_flavor`)、`curl "$E/_cat/plugins?v"`、`curl "$E/_cat/templates?h=name"`、`curl "$E/_cluster/state/metadata?filter_path=metadata.licenses.license.type,metadata.ml.jobs,metadata.ml.datafeeds"`。 +2. **書き手を止める。** `web`・`api`・`admin`・`worker` を止め、次に `elasticsearch6` を止める。 +3. **snapshot を取り確認する。** 一回限りの `docker.elastic.co/elasticsearch/elasticsearch:6.3.1` を `--platform linux/amd64`・`--user 1000:1000` で起動する。データディレクトリと、`/snapshots` に uid 1000 所有の空ディレクトリをマウントし、`-e discovery.type=single-node -e xpack.security.enabled=false -e path.repo=/snapshots` を渡す。`PUT $E/_snapshot/preupgrade` に `{"type":"fs","settings":{"location":"/snapshots/preupgrade"}}`、`POST $E/_snapshot/preupgrade/_verify`、`PUT "$E/_snapshot/preupgrade/before-6-8?wait_for_completion=true"` に `{"indices":"*","include_global_state":true}` を送り、`"state":"SUCCESS"` と `"failed":0` を確かめてコンテナを止める。 +4. **使い捨ての写しを更新する。** データディレクトリを uid 1000 所有の新しいディレクトリへ写し、`elasticsearch6` のテンプレートと同じ設定で 6.8.23 のイメージを写しの上で起動し、テンプレート・文書数・集計を確かめる。その後で初めて本来のディレクトリでサービスを起動する。 +5. **失敗したら空の 6.3.1 へ復元する。** データディレクトリを空にし、手順 3 の 6.3.1 のコンテナをその上で起動し、リポジトリを `"readonly":true` で登録し、`POST "$E/_snapshot/preupgrade/before-6-8/_restore?wait_for_completion=true"` に `{"indices":"*","include_global_state":true}` を送って同じ確認をし、本リポジトリの以前の版に留まる。 + +2026-11-10 に使い捨てのコンテナとボリュームで実証した。稼働中のスタックには触れていない。6.3.1 のクラスタは x-pack モジュールを持つ default 配布で、プラグインは `ingest-geoip` と `ingest-user-agent`、ML のジョブと datafeed は無く、アプリケーションのもののほかに X-Pack と Logstash のテンプレートが 15 個あった。osf.io のクライアントで書いた文書 3 件を snapshot し(`SUCCESS`、1 シャード、失敗 0)、6.8.23 へ更新した写しはテンプレート・文書 3 件・集計を返し、snapshot から復元した空の 6.3.1 も同じものを返した。6.8.23 OSS では未知の `licenses` メタデータはログに出て読み飛ばされる。x-pack のテンプレートは更新後の写しに残るが、使うものは無い。ML ジョブやセキュリティのユーザーなどの X-Pack の状態を持つクラスタは試験していないので、この手順が当てはまるかは手順 1 で判断する。 + +### 7. 統合リポジトリから組むログインサーバー(2026-11-10) + +`cas-overlay`(CAS。Central Authentication Service、実際のログインサーバー。[REF-01](../reference/REF-01_Glossary.md))は、エミュレーション下で Maven が 8 時間止まったため(DEMO-20 第 3 回)、事前ビルド済みの `linux/amd64` イメージで動かしていた。そのイメージには統合リポジトリに取り込んだセキュリティ修正が入らない。統合リポジトリ自身の Dockerfile はネイティブになった。コミット `22610b7681a29241365108e5129bcd43ade4610e` では Maven と jetty の設定はビルドホストのアーキテクチャで動き、最終段はファイルを写すだけである。そこでこの部品には `prebuilt_image` も `build_platform` も本リポジトリの `build_dockerfile` も要らない。`cas` の堅牢化の項目は消えた。サービスは uid 1000・読み取り専用ルートで動き、書き込めるのは `/tmp` だけである。 + +**設定。** `compose render` は `/etc/cas/cas.properties` の全体と、`/etc/cas/services` のサービス定義を一つ書く。定義は公開された web の URL だけを許可する。この mount はイメージの定義(別のホストを指す)を置き換える。スタックはループバック上の平文 HTTP なので、Cookie の Secure は切る。秘密は環境変数だけで CAS に渡す。 + +**キー。** 旧来の `CAS_TGC_*` と `CAS_WEBFLOW_*` は効いていなかった。Spring は `tgc.encryption.key` を `TGC_ENCRYPTION_KEY` から読み、webflow の鍵は何も読まない。これらは廃止した。`runtime/.env` は `TGC_ENCRYPTION_KEY`(43 文字)、`TGC_SIGNING_KEY`(86 文字)、`OSF_API_INSTITUTIONS_AUTH_JWESECRET`(ちょうど 32 バイト)、`OSF_API_INSTITUTIONS_AUTH_JWTSECRET`(32 バイト以上)を持つ。後の二つは `api/base/settings` の osf.io の `JWE_SECRET` と `JWT_SECRET` にもなる。TGC の鍵は CAS 自身が検査しないので、`secrets init` と `compose render` が四つとも検査する。長さ、base64url の文字(空白や引用符は不可)、公開された既定値でないこと(SHA-256 で照合するのでリポジトリは値を持たない)、そして CAS が JWK のオクテット値として読む `TGC_ENCRYPTION_KEY` については 32 バイトへの正準な復号である。署名鍵と機関の鍵は文字のまま使われるので復号しない。 + +**順序。** CAS は起動時にマイグレーション済みの `osf` スキーマを検証し、空のデータベースでは終了 254 で止まる。そこで `osf_init` を `service_completed_successfully` で待つ。 + +**既存の `runtime/.env` の更新。** `compose render` は足りない四つのキーの名前を示して終了 2 で止まる。`grdm-dev secrets rotate` はこれらを加えるが、他の秘密もすべて作り直し、既存の Compose ファイルで動作中のコンテナを再作成する。その後 `compose render`、`build --component cas-overlay`、`up` を実行する。他の秘密を保ちたいときは、`rotate` をせず、上記の長さと文字で四つのキーを手で追記する。 + +**2026-11-10 の実証(arm64)。** 使い捨てのプロジェクト `cas-int` で行った。生成したファイルから `cas` とそれが待つものだけを取り出し、試験用のループバックのポートを加えたもので、動作中のスタックには触れていない。osf.io のイメージが新しいデータベースに実際のマイグレーションを適用した(`osf_init` は終了 0)。したがって実際の GRDM スキーマに対する `validate` の確認はこれが最初である。 + +```toon +results[8]{check,result}: + "イメージ","grdm-dev build で組み、arm64、ベースのダイジェストのラベルあり" + "コンテナ","uid 1000、読み取り専用ルート、cap_drop ALL、no-new-privileges、再起動 0 回" + "起動","osf_init の後 19 秒で Jetty が起動。Missing table と未解決のプレースホルダは無し" + "GET /login","200。JSESSIONID は HttpOnly で Secure なし" + "誤ったパスワード","200 でエラー表示、チケットなし、TGC なし" + "正しいパスワード(osf.io で作成した利用者、bcrypt_sha256)","web の URL へ 302 でサービスチケットを発行。TGC は HttpOnly で Secure なし" + "/p3/serviceValidate","利用者の GUID で authenticationSuccess。同じチケットの再使用は INVALID_TICKET" + "未登録のサービス","200 の未許可ページでログインフォームなし" +``` + +**未確認。** osf.io のログインは引き続き fakecas を使う。本変更は認証の提供元を切り替えないからである。動作中の web への戻り、JWE/JWT の鍵を使う機関ログイン、TOTP、ORCiD、実機の amd64 ホスト(統合リポジトリの PR は最後の秘密の変更より前に Rosetta 下の amd64 で試験した)は実行していない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| EOL (end of life) | Software whose maker no longer fixes it. | 作った人がもう直さないソフトウェア。 | +| Emulation | Running a program built for one kind of CPU on another kind, slower but working. | ある種類の CPU 向けに作ったプログラムを別の CPU で動かすこと。遅いが動く。 | +| Rosetta | Apple's translator that lets x86-64 programs run on Apple Silicon; Docker Desktop can use it for amd64 containers. | x86-64 のプログラムを Apple Silicon で動かす Apple の翻訳機。Docker Desktop は amd64 コンテナにこれを使える。 | +| Checksum | A short fingerprint of a file; if one byte changes, the fingerprint changes. | ファイルの短い指紋。1 バイトでも変わると指紋も変わる。 | +| Digest | A checksum of a container image, so the same image is pulled every time. | コンテナイメージのチェックサム。毎回同じイメージが取れる。 | +| JRE | The part of Java needed to run programs, without the compiler. | Java のプログラムを動かすために必要な部分。コンパイラは含まない。 | +| Cold start | Starting with empty data: nothing cached, nothing initialised. | 空のデータからの起動。キャッシュも初期化済みのものも無い。 | diff --git a/docs/decisions/ADR-08_Per_OS_Installer_Entry_Points.md b/docs/decisions/ADR-08_Per_OS_Installer_Entry_Points.md new file mode 100644 index 0000000..07f81d8 --- /dev/null +++ b/docs/decisions/ADR-08_Per_OS_Installer_Entry_Points.md @@ -0,0 +1,152 @@ +# ADR-08 Per-OS Installer Entry Points / OS ごとのインストーラーの入口 + +> **Summary:** `installer/install.sh` assumes that Python, git, Docker and the scanners already exist, and Windows has no entry point at all. We decide to add three thin, consent-based prerequisite scripts, one per OS, that prepare the host and always end by running `install.sh`, so there is still one decision path. This relaxes "never needs `sudo`" for those scripts only. +> **概要:** `installer/install.sh` は Python・git・Docker・スキャナーが既にあることを前提にしており、Windows には入口そのものがない。OS ごとに一つ、同意に基づく薄い前提条件スクリプトを三つ加え、ホストを準備したうえで必ず `install.sh` を実行して終わることを決める。判断の道筋は一つのままである。「`sudo` を必要としない」という規則は、これらのスクリプトに限って緩める。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.4 — 2026-11-13. **Learned:** approval does not wait for every row of §5: the owner accepted this record on 2026-11-13 ("一括で承認、M2 完了") while real amd64 hardware and WSL2 (Windows 11) are still unrun and the §9 workflows still wait for a token with the `workflow` scope, so those stay open as M3 items on the [status board](../status/README.md#english) instead of blocking the decision. / 承認は §5 のすべての行を待たない。所有者は 2026-11-13 にこの記録を承認した(「一括で承認、M2 完了」)。amd64 の実機と WSL2(Windows 11)は未実行で、§9 のワークフローは `workflow` スコープのトークンをまだ待つので、それらは決定を止めず、[進捗ボード](../status/README.md#japanese)の M3 の残件として開いたまま残す。 + 0.3 — 2026-11-10. **Learned:** the decision can land before its CI: the workflows of §9 need a token with the `workflow` scope, so they wait on branch `feat/per-os-installers` and the per-OS scripts are checked by hand and by DEMO-21 until then. / 決定は CI より先に入れられる。§9 のワークフローには `workflow` スコープのトークンが要るので、ブランチ `feat/per-os-installers` で待ち、それまで OS ごとのスクリプトは手と DEMO-21 で確かめる。 + 0.2 — 2026-11-10. **Learned:** the first real run of `install-ubuntu.sh`, on an Ubuntu 24.04 arm64 virtual machine, settled two rows of §5 and showed that a distribution's own emulator package is not a safe prerequisite: it crashed inside a build, so emulation now comes from a digest-pinned image ([DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md)). / `install-ubuntu.sh` の最初の実際の実行(Ubuntu 24.04 arm64 の仮想マシン)で §5 の二行が決着し、ディストリビューション自身のエミュレーターのパッケージは安全な前提条件ではないと分かった。ビルドの中で落ちたので、エミュレーションはダイジェストで固定したイメージから入れる([DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md))。 + 0.1 — 2026-11-10. **Learned:** "the installer checks each prerequisite" only moved the first failure later: without Trivy and gitleaks an otherwise perfect install still stops with exit 51 at its `scan` step, so prerequisites are everything the whole sequence needs, not only what its first step needs. / 「インストーラーが各前提条件を確認する」は最初の失敗を後ろへずらしただけだった。Trivy と gitleaks が無いと、ほかが完璧でも導入は `scan` の段で終了 51 になる。前提条件とは最初の段に要るものではなく、一連の手順全体に要るものである。 +- Status: Accepted by the owner, 2026-11-13 (proposed 2026-11-10, M2). Review date: after the first recorded run of each script on owner hardware. +- Records a decision for: [SPEC-02 §1, §2.3, §8, §9, §10](../spec/02_installer_cli.md#english) +- Parent index / 親索引: [Decision records](README.md) +- Related: [ADR-03 Staged security gate](ADR-03_Staged_Security_Gate.md) · [ADR-07 Native builds of EOL middleware](ADR-07_Native_Builds_of_EOL_Middleware.md) · [SPEC-04 §8](../spec/04_acceptance_tests.md#english) · [Environment guide](../guides/environment/README.md#english) +- Used by: [SPEC-02](../spec/02_installer_cli.md#english) · [Environment guide](../guides/environment/README.md#english) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Context + +An audit of the branch on 2026-11-10 found these gaps. Each was checked against the files. + +- Windows has no entry point, although [SPEC-02 §8](../spec/02_installer_cli.md#english) requires Windows 11 to work. +- No script installs Docker (the tool that builds images and runs containers; see [REF-01](../reference/REF-01_Glossary.md)), Python, buildx (Docker's helper that builds one image for several kinds of computer; see [REF-01](../reference/REF-01_Glossary.md)) or git. `install.sh` only prints a hint for Python. +- `grdm-dev install` stops with exit 51 at its `scan` step when `trivy` or `gitleaks` is missing, and nothing installs them. +- The repository had no `.gitattributes`. A clone with `core.autocrlf=true` turns the first line of `install.sh` into `#!/usr/bin/env bash` plus a CR (carriage return, the extra character Windows puts at the end of a line). The kernel then fails to find the interpreter, so the script's own CRLF guard never runs. The guard's hint also used `sed -i ""`, which only BSD `sed` accepts. +- No workflow runs `install.sh`, Compose (the Docker tool that starts many containers from one file; see [REF-01](../reference/REF-01_Glossary.md)), macOS, Windows or arm runners. The Windows CI (continuous integration: the checks that run automatically; see [REF-01](../reference/REF-01_Glossary.md)) build of SPEC-02 §8 and the amd64 (the CPU type of ordinary PCs and servers; see [REF-01](../reference/REF-01_Glossary.md)) build of SPEC-04 §8 did not exist. + +### 2. Decision + +1. **Three scripts, one decision path.** `installer/install-ubuntu.sh`, `installer/install-macos.sh` and `installer/install-windows.ps1` only prepare the host. Each ends by running `installer/install.sh`, passing other arguments unchanged. Windows reaches it through `install-ubuntu.sh` inside WSL2 (a way to run Linux inside Windows; see [REF-01](../reference/REF-01_Glossary.md)). No OS difference moves into `grdm-dev`. +2. **`sudo` is allowed here and only here.** `install.sh` and `grdm-dev` keep the rule that they never need `sudo` (a way to run a command as the computer's administrator). The prerequisite scripts may use it, after consent. +3. **Consent.** Detection is read-only. Each script lists its changes first and asks once; joining the `docker` group has its own question, because that group is equivalent to administrator rights. `--yes` (`-Yes` on Windows) gives consent up front. With no terminal and no `--yes` the script stops with exit 2. `--dry-run` (`-DryRun`) prints the plan and changes nothing. +4. **Exit codes.** The scripts reuse 2, 10 and 11 of `messages.tsv`. No number is added. +5. **Trusted sources only; nothing is piped into a shell.** + - Ubuntu: Docker's apt (Ubuntu's package installer) repository. The signing key is accepted only when its fingerprint is `9DC8 5822 9FC7 DD38 854A E2D8 8D81 803C 0EBF CD88`. Trivy (a scanner that reads our images and lists the holes it knows about; see [REF-01](../reference/REF-01_Glossary.md)) 0.75.0 and gitleaks 8.21.2 come from their GitHub releases and must match a SHA-256 (a file's fingerprint) pinned in the script, then go to `~/.local/bin`. + - macOS: Homebrew (a package manager for macOS) formulae, whose bottles Homebrew checks. Homebrew itself is not installed by the script, because its official one-line installer pipes a download into a shell; the script points to the signed `.pkg`. + - Windows: `wsl.exe` from Microsoft. Docker Desktop is detected, never installed, because its licence is the user's decision. The same applies on macOS. +6. **The clone stays out of `/mnt/c`.** `install-windows.ps1` accepts only one folder name under the WSL home directory, and `install-ubuntu.sh` refuses a checkout under `/mnt/` inside WSL. +7. **Tokens.** The integration repositories are private. The scripts say how to give git access (`gh auth login`, then `gh auth setup-git`) and never ask for, read or store a token. +8. **Line endings.** `.gitattributes` forces LF for shell scripts, Dockerfiles and the files that run in Linux containers. It is an explicit list, because `* text=auto` would rewrite legacy files. The CRLF hint now uses `perl -pi -e`, which works on macOS, Ubuntu and WSL. +9. **CI.** `installer-prereq-lint.yml` runs on every pull request: `bash -n`, shellcheck (a tool that finds mistakes in shell scripts), the PowerShell parser on `windows-latest`, and each script's dry run. `installer-full.yml` is `workflow_dispatch` only (started by hand) and does a full `minimum` install on `ubuntu-24.04` and `ubuntu-24.04-arm`. It reads the repository secret `GRDM_INTEGRATION_READ_TOKEN`, a read-only token that the owner creates, and passes it to git through a credential helper in one step's environment, so it is never written to disk. This workflow is what fulfils SPEC-04 §8's amd64 build, by hand. **Pending:** both workflows and `.github/scripts/Test-PowerShellSyntax.ps1` wait on branch `feat/per-os-installers` for a push with a token that has the `workflow` scope. + +### 3. Options considered + +```toon +options[4]{option,decision_path,risk,chosen}: + A,"only print better hints (today)",one,"every new user repeats the same manual steps; Windows stays unserved",no + B,"put OS bootstrap inside grdm-dev",one but mixed,"grdm-dev would need sudo and would break SPEC-02 §1; Python must exist first",no + C,"one cross-platform script",one,"PowerShell and bash cannot share a file; Windows must drive WSL from outside anyway",no + D,"thin per-OS scripts that end at install.sh (this ADR)",one,"three small scripts to keep working; only owner hardware proves them fully",yes +``` + +### 4. Consequences + +- A new developer on a supported OS needs one command, plus any manual step that the script names. +- The Docker signing-key fingerprint and four SHA-256 values must be updated by hand when those versions change. That is deliberate. +- The manual workflow must exist on the default branch before GitHub lets anyone start it. + +<a id="en-limits"></a> +### 5. What hosted runners cannot prove + +| Claim | Status on GitHub-hosted runners | +|---|---| +| Docker Engine installed from Docker's apt repository | Not exercised when the runner image already has Docker 27 or newer, because the script then skips it. **Proven on a clean Ubuntu 24.04 arm64 virtual machine** ([DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md)); amd64 still needs a clean machine. | +| WSL2 on `windows-latest` | **Unverified.** Nested virtualization (a virtual machine inside a virtual machine, which WSL2 needs) is doubtful on these runners, and no full run has been attempted. CI only parses the script and does a dry run. | +| UAC prompt, restart after enabling WSL, first-user creation, Docker Desktop's WSL integration | Need a person and real Windows 11 hardware. UAC is the Windows prompt that asks for administrator rights. | +| macOS with Docker Desktop | Hosted macOS runners provide no Docker engine, so CI is dry-run only. M2 acceptance on the Mac Studio remains the evidence. | +| amd64 emulation on arm64 Ubuntu | **Proven on a virtual machine** ([DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md)): Ubuntu's `qemu-user-static` 8.2.2 crashed, so the script registers QEMU from a digest-pinned `tonistiigi/binfmt` image. Not persistent across reboots. | + +The SPEC-02 §8 phrase "checked in CI as build-only" for Windows is withdrawn: CI checks the Windows script's syntax and dry run only. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 背景 + +2026-11-10 にこのブランチを監査し、次の不足を見つけた。いずれもファイルと突き合わせて確かめた。 + +- [SPEC-02 §8](../spec/02_installer_cli.md#japanese) は Windows 11 で動くことを求めているのに、Windows の入口がない。 +- Docker(イメージを作りコンテナを動かす道具。[REF-01](../reference/REF-01_Glossary.md))、Python、buildx(一つのイメージを何種類かの計算機向けに作る Docker の助手。[REF-01](../reference/REF-01_Glossary.md))、git を入れるスクリプトがない。`install.sh` は Python の案内を表示するだけである。 +- `trivy` か `gitleaks` が無いと `grdm-dev install` は `scan` の段で終了 51 になるが、それらを入れるものがない。 +- `.gitattributes` が無かった。`core.autocrlf=true` で clone すると `install.sh` の 1 行目は `#!/usr/bin/env bash` の後に CR(Windows が行末に足す余分な文字)が付く。すると OS がインタープリタを見つけられず、スクリプト自身の CRLF 検査は動かない。その検査の案内も BSD の `sed` だけが受け付ける `sed -i ""` だった。 +- `install.sh`、Compose(一つのファイルから多くのコンテナを起こす Docker の道具。[REF-01](../reference/REF-01_Glossary.md))、macOS、Windows、arm のランナーを動かすワークフローがなかった。SPEC-02 §8 の Windows の CI(自動で動く検査。[REF-01](../reference/REF-01_Glossary.md))ビルドと SPEC-04 §8 の amd64(普通の PC やサーバーの CPU の種類。[REF-01](../reference/REF-01_Glossary.md))ビルドは存在しなかった。 + +### 2. 決定 + +1. **スクリプトは三つ、判断の道筋は一つ。** `installer/install-ubuntu.sh`・`installer/install-macos.sh`・`installer/install-windows.ps1` はホストの準備だけを行う。どれも最後に `installer/install.sh` を実行し、ほかの引数はそのまま渡す。Windows は WSL2(Windows の中で Linux を動かす仕組み。[REF-01](../reference/REF-01_Glossary.md))の中の `install-ubuntu.sh` を通ってそこへ至る。OS の違いを `grdm-dev` に持ち込まない。 +2. **`sudo` はここだけで認める。** `install.sh` と `grdm-dev` は引き続き `sudo`(コンピュータの管理者としてコマンドを動かす仕組み)を必要としない。前提条件スクリプトは同意の後に使ってよい。 +3. **同意。** 判定は読むだけである。各スクリプトは変更点を先に示し、一度尋ねる。`docker` グループへの追加は管理者権限と同等なので、別に尋ねる。`--yes`(Windows は `-Yes`)は同意を先に与える。端末が無く `--yes` も無ければ終了 2 で止まる。`--dry-run`(`-DryRun`)は予定を表示するだけで何も変えない。 +4. **終了コード。** `messages.tsv` の 2・10・11 を使い回し、番号を増やさない。 +5. **信頼できる配布元だけを使い、ダウンロードをシェルへ流し込まない。** + - Ubuntu: Docker の apt(Ubuntu のパッケージ導入の道具)リポジトリ。署名鍵は指紋が `9DC8 5822 9FC7 DD38 854A E2D8 8D81 803C 0EBF CD88` のときだけ受け入れる。Trivy 0.75.0 と gitleaks 8.21.2 は GitHub のリリースから取り、スクリプトに固定した SHA-256(ファイルの指紋)との一致を確かめて `~/.local/bin` に置く。 + - macOS: Homebrew(macOS のパッケージ管理の道具)の formula を使い、bottle の検証は Homebrew が行う。Homebrew 自体はスクリプトでは入れない。公式の一行の導入方法がダウンロードをシェルへ流し込むからであり、署名付きの `.pkg` を案内する。 + - Windows: Microsoft の `wsl.exe`。Docker Desktop は検出するだけで入れない。ライセンスは利用者が判断することだからである。macOS も同じである。 +6. **clone を `/mnt/c` に置かない。** `install-windows.ps1` は WSL のホームの下のフォルダ名一つだけを受け付け、`install-ubuntu.sh` は WSL の中で `/mnt/` の下のチェックアウトを拒む。 +7. **トークン。** 統合リポジトリは非公開である。スクリプトは git に権限を与える方法(`gh auth login` の後に `gh auth setup-git`)を案内するだけで、トークンを尋ねず、読まず、保存しない。 +8. **改行。** `.gitattributes` はシェルスクリプト、Dockerfile、Linux コンテナで動くファイルの改行を LF に固定する。`* text=auto` は旧いファイルを書き換えてしまうので、明示の一覧にする。CRLF の案内は macOS・Ubuntu・WSL で動く `perl -pi -e` に改めた。 +9. **CI。** `installer-prereq-lint.yml` はすべての PR で動く。`bash -n`、shellcheck(シェルスクリプトの誤りを見つける道具)、`windows-latest` での PowerShell パーサー、各スクリプトの dry run である。`installer-full.yml` は `workflow_dispatch` のみ(手で起動する)で、`ubuntu-24.04` と `ubuntu-24.04-arm` で `minimum` の完全な導入を行う。リポジトリのシークレット `GRDM_INTEGRATION_READ_TOKEN`(所有者が作る読み取り専用のトークン)を読み、一つの段の環境に置いた認証ヘルパーで git に渡すので、ディスクには書かれない。SPEC-04 §8 の amd64 ビルドは、このワークフローを手で動かすことで満たす。**保留中:** 二つのワークフローと `.github/scripts/Test-PowerShellSyntax.ps1` は、`workflow` スコープを持つトークンでの push をブランチ `feat/per-os-installers` で待つ。 + +### 3. 検討した選択肢 + +```toon +options[4]{option,decision_path,risk,chosen}: + A,"案内を良くするだけ(現状)",一つ,"新しい利用者が毎回同じ手作業を繰り返す。Windows は対応しないまま",いいえ + B,"OS の準備を grdm-dev に入れる",一つだが混在,"grdm-dev に sudo が要り SPEC-02 §1 を破る。Python が先に要る",いいえ + C,"全 OS 共通のスクリプト一つ",一つ,"PowerShell と bash は一つのファイルを共有できない。Windows はどのみち外から WSL を動かす",いいえ + D,"install.sh で終わる OS ごとの薄いスクリプト(本 ADR)",一つ,"小さなスクリプト三つの保守が要る。完全な証明は所有者の実機だけができる",はい +``` + +### 4. 影響 + +- 対応 OS の新しい開発者は、コマンド一つと、スクリプトが名指しする手作業だけで済む。 +- Docker の署名鍵の指紋と四つの SHA-256 は、版を変えるときに手で更新する。これは意図したことである。 +- 手動のワークフローは、既定のブランチに入ってからでないと GitHub で起動できない。 + +<a id="ja-limits"></a> +### 5. ホスト型ランナーでは証明できないこと + +| 主張 | GitHub ホスト型ランナーでの状況 | +|---|---| +| Docker の apt リポジトリからの Docker Engine の導入 | ランナーのイメージに Docker 27 以上があると、スクリプトは飛ばすので試されない。**まっさらな Ubuntu 24.04 arm64 の仮想マシンで実証済み**([DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md))。amd64 はまだまっさらな機械が要る。 | +| `windows-latest` での WSL2 | **未検証。** WSL2 に要る入れ子の仮想化(仮想マシンの中の仮想マシン)はこのランナーでは疑わしく、完全な実行は試していない。CI はスクリプトの解析と dry run だけを行う。 | +| UAC の確認、WSL 有効化後の再起動、最初の利用者の作成、Docker Desktop の WSL 連携 | 人と実機の Windows 11 が要る。UAC は管理者権限を求める Windows の確認画面である。 | +| macOS と Docker Desktop | ホスト型の macOS ランナーには Docker エンジンが無いので、CI は dry run のみ。証拠は引き続き Mac Studio での M2 受入である。 | +| arm64 の Ubuntu での amd64 エミュレーション | **仮想マシンで実証済み**([DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md))。Ubuntu の `qemu-user-static` 8.2.2 は落ちたので、スクリプトはダイジェストで固定した `tonistiigi/binfmt` イメージから QEMU を登録する。再起動をまたいでは残らない。 | + +SPEC-02 §8 の Windows の「CI ではビルド確認のみ」という記述は取り下げる。CI が確かめるのは Windows のスクリプトの構文と dry run だけである。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Prerequisite | Something that must already be in place before a step can work. | ある段が動く前に揃っていなければならないもの。 | +| Consent | The user saying yes before a change is made. | 変更の前に利用者が「はい」と言うこと。 | +| Dry run | A practice run that only says what would happen. | 何が起きるかを言うだけの予行演習。 | +| Fingerprint | A short value that identifies one key or file exactly. | 一つの鍵やファイルを正確に見分ける短い値。 | +| CRLF / LF | The two ways of ending a line: Windows uses CRLF, Linux and macOS use LF. | 行の終わり方の二種類。Windows は CRLF、Linux と macOS は LF。 | +| BOM | Invisible bytes at the start of a file that say how its text is encoded. | ファイルの先頭にある、文字の符号化を示す見えないバイト。 | +| Hosted runner | A temporary machine that GitHub lends to run CI. | CI を動かすために GitHub が貸してくれる一時的な計算機。 | diff --git a/docs/decisions/ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md b/docs/decisions/ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md new file mode 100644 index 0000000..67d77c0 --- /dev/null +++ b/docs/decisions/ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md @@ -0,0 +1,229 @@ +# ADR-12 PostgreSQL 18 and the Data Directory Upgrade / PostgreSQL 18 とデータディレクトリの更新 + +> **Summary:** The developer environment moves from PostgreSQL 9.6 (end of life since 2021) to **PostgreSQL 18.6**, the newest released major, pinned by its index digest. osf.io's Django 1.11.28 with psycopg2 2.7.3 ran its migrations and 807 database tests on 18 with exactly the same outcome as on 9.6 (781 passed, the same 13 failed or erred on both), and CAS and fakecas logged in against it. CAS's JDBC driver 42.1.4 cannot answer SCRAM, so host authentication stays `md5` until CAS gets a newer driver. An existing 9.6 data directory is moved by a new command, `grdm-dev db upgrade`: a dump with the new major's `pg_dumpall` and a restore into a fresh directory, compared table by table, with the old directory kept beside it for `grdm-dev db rollback`; a durable journal and a lock shared with `up` and `reset` let the next command finish or roll back a process crash at any point (tested by injection at every boundary); durability across power loss rests on fsync ordering and was not tested physically. `up` refuses a data directory of another major (exit 15). +> **概要:** 開発環境の PostgreSQL を 9.6(2021 年に EOL)から、リリース済みで最新の **PostgreSQL 18.6** へ移し、インデックスのダイジェストで固定する。osf.io の Django 1.11.28 と psycopg2 2.7.3 は 18 の上で migration と 807 件のデータベース試験を実行し、結果は 9.6 とまったく同じだった(781 件合格、両方で同じ 13 件が失敗かエラー)。CAS と fakecas も 18 に対してログインできた。CAS の JDBC ドライバー 42.1.4 は SCRAM に応えられないので、ホスト認証は CAS が新しいドライバーを持つまで `md5` のままにする。既存の 9.6 のデータディレクトリは新しいコマンド `grdm-dev db upgrade` で移す。新しい版の `pg_dumpall` でダンプし、新しいディレクトリへ復元し、表ごとに突き合わせ、旧ディレクトリは `grdm-dev db rollback` のために隣に残す。永続的な操作記録と、`up`・`reset` と共有するロックにより、どの時点のプロセスのクラッシュも次のコマンドが完了か巻き戻しできる(すべての境界で注入して試験)。電源断をまたぐ永続性は fsync の順序に依り、物理的には試験していない。`up` は別の版のデータディレクトリを拒む(終了 15)。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.4 — 2026-11-13. **Learned:** accepting a record and finishing its milestone are separate: the owner accepted this record on 2026-11-13 ("一括で承認、M2 完了") while M5, which it prepares, is still open, so the rows it leaves (SCRAM once CAS has a newer JDBC driver, a run on amd64 or a Linux host) stay on the [status board](../status/README.md#english). / 記録の承認と節目の完了は別である。所有者は 2026-11-13 にこの記録を承認した(「一括で承認、M2 完了」)が、この記録が下準備する M5 はまだ開いている。残る行(CAS が新しい JDBC ドライバーを持った後の SCRAM、amd64 や Linux のホストでの実行)は[進捗ボード](../status/README.md#japanese)に残す。 + 0.3 — 2026-11-10. **Learned:** recovery has failure modes of its own: a compensation can fail too, a rename is not durable until its directory is synced, and a lock that only some commands take excludes nothing; the journal is now retired only on a verified state, every recovery rename is synced before the record, and `up` and `reset` take the same lock (PR #42 review r2). / 復旧にも固有の失敗がある。補償も失敗しうるし、改名はそのディレクトリを sync するまで永続ではなく、一部のコマンドしか取らないロックは何も排除しない。そこで操作記録は確かめた状態でだけ消し、復旧の改名はすべて記録の前に sync し、`up` と `reset` も同じロックを取るようにした(PR #42 レビュー r2)。 + 0.2 — 2026-11-10. **Learned:** a verified restore says nothing about a crash between two renames or a server that was never stopped: the operation now owns its containers and directories through a durable journal and a lock, every later `db` command, `reset` and `up` finish or roll it back, and a major that cannot be read is a refusal (PR #42 review r1). / 照合済みの復元は、二つの改名の間のクラッシュや止まらなかったサーバーについて何も言わない。そこで操作は永続的な操作記録とロックでコンテナとディレクトリを所有し、後続の `db` コマンド・`reset`・`up` が完了か巻き戻しを行い、読めない版は拒否にした(PR #42 レビュー r1)。 + 0.1 — 2026-11-10. **Learned:** a database upgrade is proven by the clients, not by the server starting: the server and Django were fine on 18, while the CAS driver failed only once the password was stored as SCRAM, and PostgreSQL 18 rejected a catalogue query that 9.6 accepted (`text || "char"`), so the verification query itself had to be tested on both majors. / データベースの更新は、サーバーが起動したことではなくクライアントで証明される。サーバーと Django は 18 で問題なかったが、CAS のドライバーはパスワードが SCRAM で保存されたときにだけ失敗した。また PostgreSQL 18 は 9.6 が受け付けたカタログの問い合わせ(`text || "char"`)を拒んだので、照合の問い合わせ自体も両方の版で試す必要があった。 +- Status: Accepted by the owner, 2026-11-13 (proposed 2026-11-10, M5 groundwork). Review date: when CAS moves to a JDBC driver with SCRAM, or when PostgreSQL 19 is released. +- Records a decision for: [SPEC-02 §3](../spec/02_installer_cli.md#english) (`db`, the `up` refusal) and §6 (exit 15) · `manifest/upstreams.json` (`postgres`) · `installer/grdm_dev/templates/postgres.json` +- Related: [docs/decisions/README.md](README.md) · [ADR-07 Native builds of EOL middleware](ADR-07_Native_Builds_of_EOL_Middleware.md) · [ADR-13 Retiring Elasticsearch 2 and MongoDB](ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md) · [Status board](../status/README.md#english) · [SPEC-03 §3.3](../spec/03_security_gate.md#english) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Context + +The milestone M5 on the [status board](../status/README.md#english) asks for PostgreSQL 15 or later. The stack ran `postgres:9.6`, which its maker stopped fixing in November 2021. Three programs talk to it: + +```toon +clients[3]{client,driver,measured_in}: + "osf.io (web, api, admin, worker, osf_init)","Django 1.11.28, psycopg2 2.7.3 linked against libpq 11.11","grdm-dev/osf.io:fe90e5c39e66" + "CAS (cas-overlay)","PostgreSQL JDBC 42.1.4 under Hibernate 4.3.10 and c3p0","WEB-INF/lib of grdm-dev/cas-overlay:22610b7681a2" + "fakecas","Go lib/pq v1.10.9","installer/images/fakecas/go.mod" +``` + +Django 1.11 documents PostgreSQL 9.3 and later with no upper bound, so only a measurement can say which major works. PostgreSQL 19 is still a beta on Docker Hub (`19beta1`), so 18 is the newest released major. + +### 2. Decision + +1. **Image.** `postgres:18.6` pinned by its index digest (`base_image_digest` in the manifest), for `linux/arm64` and `linux/amd64`. The one-shots `volume_owner_init` and `volume_access_check_*` run the same image; its GNU coreutils pass their checks (measured). +2. **Template.** The 18 image moved `PGDATA` to `/var/lib/postgresql/18/docker` and declares a volume at `/var/lib/postgresql`. The template sets `PGDATA=/var/lib/postgresql/data`, the mount point of `postgres_data`, and puts a tmpfs on `/var/lib/postgresql` so that Compose creates no anonymous volume there (measured: the container has only the data volume and the init-script mount). +3. **Authentication stays md5.** `POSTGRES_INITDB_ARGS` keeps `--auth-host=md5`; with it, initdb also writes `password_encryption = md5`, and the entrypoint's catch-all line is `host all all all md5`. With `scram-sha-256` instead, CAS failed every connection with `The authentication type 10 is not supported` (measured). SCRAM becomes the default when CAS ships a JDBC driver of 42.2 or later — a change in the integration repository and an owner item. PostgreSQL 18 logs a deprecation warning when an md5 password is set; it still works. This is a temporary compatibility exception accepted for this isolated developer network only, not a claim about internal networks in general. The way out (review r1): separate login roles for CAS and osf.io (both use `postgres` today), a SCRAM verifier set anew for osf.io's role (osf.io's libpq 11 supports SCRAM; changing `password_encryption` does not convert an existing verifier), and a currently patched JDBC driver for CAS rather than the historical minimum 42.2. +4. **Moving existing data: `grdm-dev db upgrade`.** A server refuses a data directory of another major, so the data is dumped and restored, never changed in place. The operation owns everything it creates through a journal, so that a process crash at any point leaves either the old or the new cluster usable, or — when even a compensating rename fails — keeps the journal so that `up` refuses and `db recover` retries (review r1 R1-01, R1-02; r2 R2-01): + 1. **Checks, nothing started yet.** Every service stopped (`grdm-dev down`); the data major readable and known; free disk measured on the backups and the volumes filesystems (§5); a confirmation (`--yes` skips). + 2. **Journal and lock.** `runtime/db-operation.json` is written (fsync, atomic rename) before any container, volume or directory exists, and names all of them. An exclusive `flock` on `runtime/db-operation.lock` is held for the whole operation, including the service check and the confirmation; `up` takes the same lock from its checks until Compose has started the containers, and `reset` from its checks until the deletion ends, so none of them can run between another's checks and its action (R2-02); the kernel releases it when the process ends, however it ends, so a second `db` command waits for no dead process. SIGTERM and SIGHUP are handled like Ctrl-C. + 3. **Source.** The old major (`postgres:9.6`, pinned by digest) starts on the existing directory with no network and no TCP listener; its socket is in a throwaway Docker volume. The new major's `pg_dumpall` (the PostgreSQL rule: dump with the newer client) runs as the host user and writes `runtime/backups/postgres-<old>-to-<new>-<timestamp>/dumpall.sql` (0600 in a 0700 directory). Then the old server is stopped, removed, and proved gone with `docker ps -a` before anything else starts; a failure to prove it keeps the journal. + 4. **Target.** The new major initialises `runtime/volumes/postgres_data.pg<new>-<timestamp>.new` with the rendered initdb arguments, `PGDATA` and command; the superuser password reaches initdb through a 0600 file deleted as soon as the container exists. The dump is restored with `ON_ERROR_STOP`; the only line removed is `CREATE ROLE postgres;` (initdb made that role; its `ALTER ROLE` with the old verifier stays). `vacuumdb --analyze-only` follows and the derived `restore.sql` is deleted. Both servers run with `log_min_error_statement=panic`, so a failing statement — which may carry row data or a password verifier — is not written to the container log. + 5. **Verification, and its limit.** Per database: every table's row count, every sequence's `last_value` and `is_called`, and the extension names; across the cluster: every role's attributes and an MD5 of its password verifier (never the verifier). Databases and roles are separate namespaces, so a database called `roles` keeps its check. Any difference stops before a rename. Equal results do not prove equal row contents or extension versions (extensions are recreated at the new server's default version); `pg_dumpall` with `ON_ERROR_STOP` is what moves the data. + 6. **Swap.** The new server is removed and proved gone; the journal is marked `swap` (fsync) and only then `postgres_data` is renamed to `postgres_data.pg<old>-<timestamp>` and the new directory to `postgres_data`. A failed second rename is compensated by renaming the first back. Then `upgrade.json` is written and the journal deleted. The renames stay inside `runtime/volumes/`, because on Linux the data belongs to uid 999 and a host user may rename such a directory within its parent but not move it to another one. + + **Recovery** (`grdm-dev db recover`, and first in `db upgrade`, `db rollback`, `reset` and `up`): every container and volume named in the journal is removed and proved gone; if Docker cannot answer or a container cannot be removed, the journal stays and `up` refuses. Before the `swap` mark the old directory was never written by the new major, so the operation is rolled back and the half-built new directory is named for deletion. After the mark the directories are inspected and the swap is finished (the data was already verified); if it cannot be finished, the journal is retired only when the old directory is proved back in place with its major, otherwise it stays (R2-01). Every rename of a recovery is followed by an fsync of `runtime/volumes/` before the record is written and the journal deleted, and a failed directory fsync is an error (only a filesystem that cannot sync directories, EINVAL or ENOTSUP, is accepted) (R2-03). An empty `postgres_data` that `compose render` created during the gap is removed first, so `up` never starts a fresh cluster in place of a pending swap. `grdm-dev db status` shows both majors and any pending operation. `grdm-dev db rollback` runs under the same lock and journal and puts the kept directory back; the old revision of this repository must then be checked out and `compose render` run, and until then `up` stops with exit 15. +5. **`up` refuses a mismatch and fails closed.** After recovery and before Compose starts anything, `up` compares `PG_VERSION` with the major of the rendered image and stops with exit 15 when they differ, when `PG_VERSION` is unparseable or not ASCII (R2-04), when a non-empty directory has none, or when the version cannot be read at all — on Linux it is read by uid 999 in a throwaway container, and a failure of that container is a refusal, not a pass (R1-04). Only an absent or empty directory counts as "no cluster yet". +6. **Hardening.** The `postgres` exception in `manifest/hardening.json` stays: the official entrypoint still starts as root. Both servers of `db upgrade` run with exactly that exception's capabilities, a read-only root and no network. + +### 3. Options considered + +```toon +options[4]{option,what_it_does,why_not_or_why,chosen}: + A,"pg_upgrade (in place or copy)","needs both majors' binaries in one image (only third-party images ship that); --link writes the old directory; text indexes built under glibc 2.24 (Debian 9, the 9.6 image) would be reused under glibc 2.41 (Debian 13, the 18 image) although the collation rules changed in glibc 2.28","no" + B,"dump with the new pg_dumpall, restore into a new directory (this ADR)","two official images; the old directory is never written by the new major; indexes are rebuilt under the new glibc; a 290 MB development cluster moved in 37 seconds","yes" + C,"discard the data (grdm-dev reset)","always possible, loses every project and user of the developer","offered, not the default" + D,"stop at 15, 16 or 17","18 passed the same tests and is supported longest (to November 2030)","no" +``` + +### 4. Proof (2026-11-10, arm64, throwaway Compose projects `m5-*`) + +The running stack `grdm-dev` was never touched. The projects were derived from a file rendered by `compose render` into a throwaway checkout under `.m5-tmp/`; the 9.6 cluster came from a full `osf_init` (migrate, `populate_institutions`, `register_oauth_scopes`) plus one user created through osf.io. + +```toon +results[10]{check,result}: + "osf_init on a new PostgreSQL 18.6 cluster","exit 0: 673 migrations, 68 institutions, OAuth scopes" + "osf.io DB test modules on 18 and on 9.6 (test_node, test_user, test_guid, test_institution, test_analytics, api_tests/institutions/views, osfstorage test_models)","both: 781 passed, 3 failed, 10 errors, 13 skipped; the failing and erroring tests are the same set on both majors (ES6 metrics fixtures and three existing failures)" + "CAS on 18 with md5","wrong password 200 without a ticket; right password 302 with a ticket; /p3/serviceValidate authenticationSuccess" + "CAS on 18 with scram-sha-256","every connection: PSQLException The authentication type 10 is not supported" + "fakecas on 18","known user and key 302 with a ticket; wrong key 404; unknown user 404" + "up on a 9.6 directory with the 18 template","exit 15 before any docker compose call" + "db upgrade 9.6 to 18 (real command, project renamed m5-pgup)","exit 0 in 37 s: 3 databases (osf 262 tables with 16030 rows, cas 9 tables), 531 tables, sequences and extensions equal before and after" + "the stack on the upgraded directory","osf_init: No migrations to apply; CAS login of the user created on 9.6 (302, serviceValidate success); fakecas 302" + "db rollback, then 9.6 on the directory","exit 0; PostgreSQL 9.6.24 starts, 68 institutions and 673 migrations, the user is there; up stops with exit 15 until the old revision is rendered" + "failure path (first attempts)","initdb without a password, then a catalogue query PostgreSQL 18 rejects: both stopped with exit 15 with postgres_data untouched; both fixed. Recovery from crashes and interruptions is shown in §4.1" +``` + +The first run at 512 MiB, the limit `compose render --memory-gib 16` gives `osf_init`, had the migrating Python process killed twice for memory; `osf_init` retried and finished. That limit is independent of the PostgreSQL major and is left for a separate change. + +#### 4.1 Recovery after review r1 (2026-11-10, a new 9.6 copy, the real command with the project renamed `m5-pgup`) + +The 9.6 cluster was rebuilt with `osf_init` and one user, plus a database named `roles` and a sequence set with `setval('s', 5, false)`, so that both review cases are in real data. + +```toon +recovery[7]{check,result}: + "SIGKILL of grdm-dev while the 9.6 server ran","journal left (phase prepare), server still running; the next up removed it and its volume, rolled back, then stopped with exit 15 (9.6 data, 18 image); 0 helper containers or volumes left" + "SIGTERM while the 18 server ran","exit 15 in process: interrupted, rolled back; 0 helper containers or volumes; journal deleted; postgres_data still 9.6" + "db upgrade after both interruptions","exit 0; 524 objects equal across 4 databases (cas, osf, postgres, roles) and 1 role" + "the stack on the upgraded directory","osf_init: No migrations to apply; CAS login of the user created on 9.6 (302, serviceValidate success); fakecas 302" + "edge data","roles.t has 2 rows; sequence s keeps last_value 5 and is_called false, nextval returns 5" + "db rollback","exit 0; the record is marked rolled_back_at; 9.6.24 starts on the directory with 673 migrations and the user; up stops with exit 15" + "unit tests with injected failures","rc failure, KeyboardInterrupt and an uncatchable crash at each of 6 steps; both renames of upgrade and rollback (crash and EIO); each of 4 journal writes (ENOSPC); ENOSPC in dump, filter and restore; Docker not answering; a container that cannot be removed; a concurrent second process; an empty postgres_data created by compose render" +``` + +### 5. For developers + +Run from the root of your checkout, after pulling this change. Expected results are in the comments. + +```sh +grdm-dev compose render # exit 0: the postgres service is now postgres:18.6 +grdm-dev down # exit 0 +grdm-dev db status # state: upgrade-needed, data_major: 9.6, image_major: 18 +grdm-dev db upgrade # asks first (--yes skips); exit 0, last line: PostgreSQL 9.6 → 18 done +grdm-dev up # exit 0, ready at the web URL +``` + +If `db upgrade` stops (exit 15) or the terminal dies, run `grdm-dev db status`, then `grdm-dev db recover` or simply `grdm-dev up`: both finish or roll back the operation and say which. A developer who does not need the data may run `grdm-dev reset` instead. + +**Disk.** Before the old server starts, the command needs free space for twice the cluster plus 64 MiB on the filesystem of `runtime/backups/` (dump and its filtered copy) and twice the cluster plus 1 GiB on the filesystem of `runtime/volumes/` (the new cluster with rebuilt indexes, and WAL up to `max_wal_size`); on one filesystem, the sum. This is an estimate, not a guarantee: a logical dump can exceed the cluster (bytea is written as hex, compressed values are written expanded). A disk that fills anyway fails the step: before the swap the old cluster stays in place; after the swap (the record cannot be written) recovery finishes the new cluster and retries the record, keeping the journal until it is written. The kept directory and the dump may be deleted once the new cluster is trusted; `reset` deletes the kept directory with the rest of `runtime/volumes/`, and the dump under `runtime/backups/` survives it. + +### 6. Not verified + +An amd64 host; a Linux host where the data belongs to uid 999 (the container reads of `PG_VERSION` and of the size, and the in-parent renames, are unit-tested, not run there); a real crash between the two renames (unit-tested with an injected crash, not timed against a real kill); clusters with extensions other than `plpgsql`; SCRAM with a newer CAS driver. The production GRDM is not affected: this is the developer environment. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 背景 + +[ステータスボード](../status/README.md#japanese)の節目 M5 は PostgreSQL 15 以降を求めている。スタックは `postgres:9.6` で動いており、これは 2021 年 11 月に作り手が修正をやめた版である。これに接続するプログラムは三つある。 + +```toon +clients[3]{client,driver,measured_in}: + "osf.io(web・api・admin・worker・osf_init)","Django 1.11.28、libpq 11.11 にリンクした psycopg2 2.7.3","grdm-dev/osf.io:fe90e5c39e66" + "CAS(cas-overlay)","Hibernate 4.3.10 と c3p0 の下の PostgreSQL JDBC 42.1.4","grdm-dev/cas-overlay:22610b7681a2 の WEB-INF/lib" + "fakecas","Go の lib/pq v1.10.9","installer/images/fakecas/go.mod" +``` + +Django 1.11 の文書は PostgreSQL 9.3 以降を挙げ、上限を書いていない。そのため、どの版が動くかは測定でしか分からない。Docker Hub の PostgreSQL 19 はまだベータ(`19beta1`)なので、リリース済みで最新の版は 18 である。 + +### 2. 決定 + +1. **イメージ。** `postgres:18.6` をインデックスのダイジェストで固定する(manifest の `base_image_digest`)。`linux/arm64` と `linux/amd64` の両方。一回限りの `volume_owner_init` と `volume_access_check_*` も同じイメージで動き、その GNU coreutils で確認を通った(測定)。 +2. **テンプレート。** 18 のイメージは `PGDATA` を `/var/lib/postgresql/18/docker` に移し、`/var/lib/postgresql` にボリュームを宣言している。テンプレートは `PGDATA=/var/lib/postgresql/data`(`postgres_data` のマウント先)を設定し、`/var/lib/postgresql` に tmpfs を置いて、Compose がそこに無名ボリュームを作らないようにする(測定: コンテナのマウントはデータのボリュームと初期化スクリプトだけ)。 +3. **認証は md5 のまま。** `POSTGRES_INITDB_ARGS` は `--auth-host=md5` を保つ。これで initdb は `password_encryption = md5` も書き、entrypoint が加える包括の行は `host all all all md5` になる。代わりに `scram-sha-256` にすると、CAS はすべての接続で `The authentication type 10 is not supported` で失敗した(測定)。SCRAM を既定にするのは、CAS が 42.2 以降の JDBC ドライバーを持ったときである。これは統合リポジトリの変更で、所有者の判断事項である。PostgreSQL 18 は md5 のパスワードを設定すると非推奨の警告をログに出すが、動作はする。これはこの隔離された開発ネットワークに限って受け入れる暫定の互換性の例外であり、内部ネットワーク一般の安全性を言うものではない。抜け出す道(レビュー r1): CAS と osf.io のログインロールを分け(今は両方が `postgres`)、osf.io のロールに SCRAM の検証子を設定し直し(osf.io の libpq 11 は SCRAM に対応する。`password_encryption` を変えても既存の検証子は変わらない)、CAS には歴史的な最低版 42.2 ではなく現在保守されている修正版の JDBC ドライバーを選ぶ。 +4. **既存データの移行: `grdm-dev db upgrade`。** サーバーは別の版のデータディレクトリを拒むので、データはダンプして復元し、その場では決して変えない。操作は自分が作るものすべてを操作記録で所有し、どの時点でプロセスがクラッシュしても旧か新のどちらかのクラスタが使える状態に残る。補償の改名まで失敗したときは操作記録を残し、`up` は拒み `db recover` が再試行する(レビュー r1 R1-01、R1-02、r2 R2-01)。 + 1. **確認(まだ何も起動しない)。** 全サービスが停止している(`grdm-dev down`)。データの版が読めて既知である。バックアップとボリュームのファイルシステムの空き容量を測る(§5)。確認を得る(`--yes` で省く)。 + 2. **操作記録とロック。** コンテナ・ボリューム・ディレクトリを一つも作る前に `runtime/db-operation.json` を書き(fsync と原子的な改名)、そのすべての名前を記す。サービスの確認と確認の問いを含め、操作の間ずっと `runtime/db-operation.lock` の排他 `flock` を持つ。`up` は確認から Compose がコンテナを起動するまで、`reset` は確認から削除が終わるまで同じロックを取るので、どれも他の確認と実行の間に割り込めない(R2-02)。プロセスがどう終わってもカーネルがそれを解放するので、二つ目の `db` コマンドが死んだプロセスを待つことはない。SIGTERM と SIGHUP は Ctrl-C と同じに扱う。 + 3. **移行元。** 旧版(ダイジェスト固定の `postgres:9.6`)を既存のディレクトリの上で、ネットワークなし・TCP の待ち受けなしで起動する。ソケットは使い捨ての Docker ボリュームに置く。新しい版の `pg_dumpall`(PostgreSQL の原則: 新しい方のクライアントでダンプする)をホストの利用者として動かし、`runtime/backups/postgres-<旧>-to-<新>-<時刻>/dumpall.sql`(0700 のディレクトリの中の 0600)に書く。次に旧サーバーを止めて削除し、他の何かを起動する前に `docker ps -a` で消えたことを証明する。証明できなければ操作記録を残す。 + 4. **移行先。** 新しい版が、生成済みの initdb 引数・`PGDATA`・コマンドで `runtime/volumes/postgres_data.pg<新>-<時刻>.new` を初期化する。スーパーユーザーのパスワードは、コンテナができた時点で消す 0600 のファイルで initdb に渡す。ダンプは `ON_ERROR_STOP` で復元する。取り除く行は `CREATE ROLE postgres;` だけ(initdb がそのロールを作った。旧検証子を持つ `ALTER ROLE` は残る)。続けて `vacuumdb --analyze-only` を実行し、派生した `restore.sql` を消す。二つのサーバーは `log_min_error_statement=panic` で動くので、失敗した文(行のデータやパスワードの検証子を含みうる)はコンテナのログに書かれない。 + 5. **照合とその限界。** データベースごとに全表の行数、全シーケンスの `last_value` と `is_called`、拡張の名前を、クラスタ全体で全ロールの属性とパスワード検証子の MD5(検証子そのものではない)を比べる。データベースとロールは別の名前空間なので、`roles` という名のデータベースも自分の照合を保つ。違いが一つでもあれば改名の前に止まる。一致しても行の中身や拡張の版の一致は証明しない(拡張は新しいサーバーの既定の版で作り直される)。データを移すのは `ON_ERROR_STOP` 付きの `pg_dumpall` である。 + 6. **切替。** 新サーバーを削除して消えたことを証明し、操作記録に `swap` の印を付けて(fsync)から初めて、`postgres_data` を `postgres_data.pg<旧>-<時刻>` に、新しいディレクトリを `postgres_data` に改名する。二つ目の改名に失敗したら一つ目を戻して補償する。その後 `upgrade.json` を書き、操作記録を消す。改名は `runtime/volumes/` の中に留める。Linux ではデータが uid 999 の所有で、ホストの利用者はその種のディレクトリを同じ親の中では改名できても、別の親へは移せないからである。 + + **復旧**(`grdm-dev db recover`。`db upgrade`・`db rollback`・`reset`・`up` も最初に行う): 操作記録にあるコンテナとボリュームをすべて削除し、消えたことを証明する。Docker が答えないか削除できなければ操作記録は残り、`up` は拒む。`swap` の印の前は、旧ディレクトリに新しい版が一度も書いていないので巻き戻し、作りかけの新ディレクトリを削除してよいものとして示す。印の後はディレクトリを調べて切替を完了する(データは照合済み)。完了できなければ、旧ディレクトリが版とともに元の場所に戻ったと確かめたときだけ操作記録を消し、そうでなければ残す(R2-01)。復旧の改名のたびに、記録を書き操作記録を消す前に `runtime/volumes/` を fsync し、ディレクトリの fsync の失敗は誤りとする(ディレクトリを sync できないファイルシステムの EINVAL・ENOTSUP だけは受け入れる)(R2-03)。その間に `compose render` が作った空の `postgres_data` は先に取り除くので、`up` が保留中の切替の代わりに新しい空のクラスタを作ることはない。`grdm-dev db status` は両方の版と保留中の操作を表示する。`grdm-dev db rollback` は同じロックと操作記録のもとで残したディレクトリを戻す。その後は本リポジトリの以前の版を取り出して `compose render` を実行する必要があり、それまで `up` は終了 15 で止まる。 +5. **`up` は不一致を拒み、閉じて失敗する。** 復旧の後、Compose が何かを起動する前に、`up` は `PG_VERSION` と生成済みイメージの版を比べ、違うとき、`PG_VERSION` が解析できないか ASCII でないとき(R2-04)、空でないディレクトリに `PG_VERSION` が無いとき、版がそもそも読めないときに終了 15 で止まる。Linux では使い捨てのコンテナの中で uid 999 が読み、そのコンテナの失敗は通過ではなく拒否である(R1-04)。「まだクラスタが無い」とみなすのは、ディレクトリが無いか空のときだけである。 +6. **堅牢化。** `manifest/hardening.json` の `postgres` の例外は残る。公式の entrypoint は今も root で始まるからである。`db upgrade` の二つのサーバーはちょうどその例外の capability と読み取り専用ルートで、ネットワークなしで動く。 + +### 3. 検討した選択肢 + +```toon +options[4]{option,what_it_does,why_not_or_why,chosen}: + A,"pg_upgrade(その場、または複写)","両方の版のバイナリが一つのイメージに要る(それを配るのは第三者のイメージだけ)。--link は旧ディレクトリに書く。glibc 2.24(Debian 9、9.6 のイメージ)で作った文字列の索引を、照合規則が glibc 2.28 で変わったのに glibc 2.41(Debian 13、18 のイメージ)の下でそのまま使うことになる","いいえ" + B,"新しい pg_dumpall でダンプし新しいディレクトリへ復元(本 ADR)","公式イメージ二つ。旧ディレクトリに新しい版は一度も書かない。索引は新しい glibc の下で作り直される。290 MB の開発用クラスタが 37 秒で移った","はい" + C,"データを捨てる(grdm-dev reset)","常に可能だが、開発者のプロジェクトと利用者をすべて失う","選べるが既定ではない" + D,"15・16・17 で止める","18 は同じ試験に合格し、保守期間が最も長い(2030 年 11 月まで)","いいえ" +``` + +### 4. 実証(2026-11-10、arm64、使い捨ての Compose プロジェクト `m5-*`) + +稼働中のスタック `grdm-dev` には一度も触れていない。プロジェクトは `.m5-tmp/` の下の使い捨てのチェックアウトで `compose render` が生成したファイルから導いた。9.6 のクラスタは完全な `osf_init`(migrate、`populate_institutions`、`register_oauth_scopes`)と、osf.io で作った利用者一人から成る。 + +```toon +results[10]{check,result}: + "新しい PostgreSQL 18.6 のクラスタでの osf_init","終了 0: migration 673 件、機関 68、OAuth のスコープ" + "18 と 9.6 での osf.io の DB 試験モジュール(test_node、test_user、test_guid、test_institution、test_analytics、api_tests/institutions/views、osfstorage の test_models)","両方とも 781 合格、3 失敗、10 エラー、13 スキップ。失敗とエラーの試験は両方の版で同じ集合(ES6 のメトリクスの準備と既存の失敗 3 件)" + "md5 の 18 での CAS","誤ったパスワードは 200 でチケットなし。正しいパスワードは 302 でチケットあり。/p3/serviceValidate は authenticationSuccess" + "scram-sha-256 の 18 での CAS","すべての接続で PSQLException The authentication type 10 is not supported" + "18 での fakecas","既知の利用者と鍵で 302 とチケット。誤った鍵は 404。未知の利用者は 404" + "18 のテンプレートで 9.6 のディレクトリに up","docker compose を一度も呼ばずに終了 15" + "db upgrade 9.6 から 18(実際のコマンド、プロジェクト名を m5-pgup に変更)","37 秒で終了 0: データベース 3(osf は 262 表・16030 行、cas は 9 表)、表・シーケンス・拡張 531 件が前後で一致" + "更新したディレクトリでのスタック","osf_init: No migrations to apply。9.6 で作った利用者の CAS ログイン(302、serviceValidate 成功)。fakecas は 302" + "db rollback の後、そのディレクトリで 9.6","終了 0。PostgreSQL 9.6.24 が起動し、機関 68・migration 673 件・利用者がそろう。以前の版を生成するまで up は終了 15 で止まる" + "失敗の経路(最初の試行)","パスワードなしの initdb、次に PostgreSQL 18 が拒むカタログの問い合わせ。どちらも postgres_data を変えずに終了 15 で止まり、両方とも修正した。クラッシュと中断からの復旧は §4.1" +``` + +最初の実行では、`compose render --memory-gib 16` が `osf_init` に与える 512 MiB の上限で、migrate する Python のプロセスがメモリ不足で 2 回止められ、`osf_init` が再試行して完了した。この上限は PostgreSQL の版と無関係なので、別の変更に回す。 + +#### 4.1 レビュー r1 の後の復旧(2026-11-10、新しい 9.6 の写し、プロジェクト名を `m5-pgup` にした実際のコマンド) + +9.6 のクラスタを `osf_init` と利用者一人で作り直し、`roles` という名のデータベースと `setval('s', 5, false)` で設定したシーケンスを加え、レビューの二つの例が実データにあるようにした。 + +```toon +recovery[7]{check,result}: + "9.6 サーバーの稼働中に grdm-dev を SIGKILL","操作記録(phase prepare)が残り、サーバーは動いたまま。次の up がそれとボリュームを削除して巻き戻し、終了 15(データ 9.6、イメージ 18)。補助のコンテナとボリュームは 0" + "18 サーバーの稼働中に SIGTERM","プロセス内で終了 15: 中断、巻き戻し。補助のコンテナとボリュームは 0、操作記録は削除、postgres_data は 9.6 のまま" + "二つの中断の後の db upgrade","終了 0。4 データベース(cas、osf、postgres、roles)とロール 1 で 524 件が一致" + "更新したディレクトリでのスタック","osf_init: No migrations to apply。9.6 で作った利用者の CAS ログイン(302、serviceValidate 成功)。fakecas は 302" + "境界のデータ","roles.t は 2 行。シーケンス s は last_value 5 と is_called false を保ち、nextval は 5 を返す" + "db rollback","終了 0。記録に rolled_back_at が付く。9.6.24 がそのディレクトリで起動し、migration 673 件と利用者がそろう。up は終了 15 で止まる" + "障害を注入した単体試験","6 段階それぞれで rc の失敗・KeyboardInterrupt・捕捉できないクラッシュ。更新と巻き戻しの両方の改名(クラッシュと EIO)。4 回の操作記録の書込みそれぞれ(ENOSPC)。ダンプ・加工・復元の ENOSPC。答えない Docker。削除できないコンテナ。同時に動く二つ目のプロセス。compose render が作った空の postgres_data" +``` + +### 5. 開発者へ + +この変更を取り込んだ後、自分のチェックアウトのルートで実行する。期待する結果はコメントに書いた。 + +```sh +grdm-dev compose render # 終了 0: postgres サービスは postgres:18.6 になる +grdm-dev down # 終了 0 +grdm-dev db status # state: upgrade-needed、data_major: 9.6、image_major: 18 +grdm-dev db upgrade # 先に確認する(--yes で省く)。終了 0、最後の行: PostgreSQL 9.6 → 18 done +grdm-dev up # 終了 0、web の URL で準備完了 +``` + +`db upgrade` が止まった(終了 15)か端末が落ちたときは、`grdm-dev db status` の後に `grdm-dev db recover`、または単に `grdm-dev up` を実行する。どちらも操作を完了か巻き戻しし、どちらにしたかを示す。データが要らない開発者は代わりに `grdm-dev reset` を使ってよい。 + +**容量。** 旧サーバーを起動する前に、`runtime/backups/` のファイルシステムにクラスタの 2 倍と 64 MiB(ダンプとその加工した写し)、`runtime/volumes/` のファイルシステムにクラスタの 2 倍と 1 GiB(索引を作り直した新しいクラスタと、`max_wal_size` までの WAL)の空きを求める。同じファイルシステムならその和。これは見積りであって保証ではない。論理ダンプはクラスタより大きくなりうる(bytea は 16 進で、圧縮された値は展開して書かれる)。それでも満杯になればその段階が失敗する。切替の前なら旧クラスタが元の場所に残り、切替の後(記録が書けない)なら復旧が新クラスタを完了させ、記録を書けるまで操作記録を残して再試行する。新しいクラスタを信頼できたら、残したディレクトリとダンプは消してよい。`reset` は残したディレクトリを `runtime/volumes/` の残りと一緒に消し、`runtime/backups/` の下のダンプは残す。 + +### 6. 未確認 + +amd64 のホスト。データが uid 999 の所有になる Linux のホスト(`PG_VERSION` と容量のコンテナでの読み取り、同じ親の中での改名は単体試験で確かめたが、そこでは動かしていない)。二つの改名の間の実際のクラッシュ(注入したクラッシュで単体試験したが、実際の kill で狙ってはいない)。`plpgsql` 以外の拡張を持つクラスタ。新しい CAS のドライバーでの SCRAM。本番の GRDM には影響しない。これは開発環境の話である。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Major version | The first number of a PostgreSQL release (9.6, 18); a server reads only data directories of its own major. | PostgreSQL のリリースの最初の番号(9.6、18)。サーバーは自分と同じ版のデータディレクトリしか読まない。 | +| Dump and restore | Writing every database out as SQL, then replaying it into a new server. | すべてのデータベースを SQL として書き出し、新しいサーバーで再生すること。 | +| SCRAM | The password exchange PostgreSQL uses by default since 14; older drivers only know md5. | PostgreSQL が 14 から既定で使うパスワードのやり取り。古いドライバーは md5 しか知らない。 | +| Data directory | The folder where PostgreSQL keeps a whole cluster; here `runtime/volumes/postgres_data`. | PostgreSQL がクラスタ全体を置くフォルダ。ここでは `runtime/volumes/postgres_data`。 | diff --git a/docs/decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md b/docs/decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md new file mode 100644 index 0000000..8675aa3 --- /dev/null +++ b/docs/decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md @@ -0,0 +1,204 @@ +# ADR-13 Retiring Elasticsearch 2 and MongoDB / Elasticsearch 2 と MongoDB の退役 + +> **Summary:** Measured findings and a proposal for the two remaining M5 removals. **Elasticsearch 2:** osf.io's search code cannot run on Elasticsearch 6.8 or OpenSearch 2.19, even after a shim for the missing Content-Type header: an index holds one mapping type only, and every query fails to parse. Turning search off (`SEARCH_ENGINE = None`) keeps writes working but makes five read endpoints answer 500 or `null`; a prototype patch of about 50 lines makes all of them answer well-formed empty results and moves contributor search to PostgreSQL with the same institution rule. A real port to Elasticsearch 8 or OpenSearch works on an affected code surface of about 5,300 lines in the integration repository. **MongoDB:** only sharejs uses it. osf.io's own reader (the `/draft/` route) resolves to `mongodb://postgres:5432/sharejs` in this environment and times out after 30 s. The only browser feature on sharejs is the file page's text editor, whose real-time co-editing is what retiring sharejs removes (since PR #40 sharejs is published on 127.0.0.1:7007; the editor was not exercised in a browser here); the exact steps are listed. On 2026-11-10 the owner chose the port to Elasticsearch 8 with full-text search, and the move of the file-page editor to y-websocket before sharejs and mongo are retired; both are in progress (§4). +> **概要:** M5 に残る二つの撤去について、測定した事実と提案をまとめる。**Elasticsearch 2:** osf.io の検索コードは、欠けている Content-Type ヘッダーを補う互換層を入れても、Elasticsearch 6.8 でも OpenSearch 2.19 でも動かない。一つのインデックスは一つのマッピング型しか持てず、すべての問い合わせが構文解析で失敗する。検索を切る(`SEARCH_ENGINE = None`)と書き込みは動くが、読み取りの五つの入口が 500 か `null` を返す。約 50 行の試作パッチで、そのすべてが形の整った空の結果を返し、協力者の検索は同じ機関の規則のまま PostgreSQL に移る。Elasticsearch 8 か OpenSearch への本当の移植は、統合リポジトリの約 5,300 行の影響範囲での作業になる。**MongoDB:** 使うのは sharejs だけである。osf.io 自身の読み手(`/draft/` 経路)はこの環境では `mongodb://postgres:5432/sharejs` を指して 30 秒で時間切れになる。sharejs に乗るブラウザの機能はファイルページのテキストエディタだけで、sharejs の退役で失われるのはその実時間の共同編集である(PR #40 以降 sharejs は 127.0.0.1:7007 で公開されている。ここではブラウザでエディタを試していない)。正確な手順を挙げる。2026-11-10 に所有者は、全文検索を保った Elasticsearch 8 への移植と、sharejs と mongo の退役に先立つファイルページのエディタの y-websocket への移行を選んだ。どちらも進行中である(§4)。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.5 — 2026-11-13. **Learned:** a record whose choices the owner has already acted on still needs its own acceptance, or its header keeps saying "stays Proposed" after the work is merged: the owner accepted it on 2026-11-13 ("一括で承認、M2 完了") together with ADR-08, ADR-12 and ADR-14. / 所有者がすでにその選択に沿って動いた記録でも、記録そのものの承認が要る。さもないと作業がマージされた後も見出しが「提案中のまま」と言い続ける。所有者は 2026-11-13 に ADR-08・ADR-12・ADR-14 とともにこれを承認した(「一括で承認、M2 完了」)。 + 0.4 — 2026-11-12. **Learned:** a retirement plan is finished when the consumer is gone, not when the replacement exists: sharejs and mongo could leave the installer only after osf.io's own reader (PR #12) was removed, and the ES 2 service only after osf.io's client moved (PR #11), so §6 records the order the installer followed and what is still left (Elasticsearch 6 for the metrics client). / 退役の計画は、置き換えができたときでなく、使う側がなくなったときに終わる。sharejs と mongo がインストーラーから消えてよいのは osf.io 自身の読み手(PR #12)が消えた後であり、ES 2 のサービスは osf.io のクライアントが移った後(PR #11)だった。§6 は、インストーラーが従った順序と、まだ残るもの(メトリクスのクライアントのための Elasticsearch 6)を記録する。 + 0.3 — 2026-11-10. **Learned:** the header must say what the body records: once §4 held the owner's choices, "nothing yet" was wrong, while the record stays Proposed (PR #42 review r2). / 見出しは本文が記録するものを言わなければならない。§4 が所有者の選択を持った時点で「まだ無い」は誤りになったが、記録自体は提案中のまま(PR #42 レビュー r2)。 + 0.2 — 2026-11-10. **Learned:** a finding is only as wide as its measurement: the drafts claim covered one reader, the line count is a code surface rather than work measured, and "every page" meant the probed entry points; and once the owner has chosen, the record keeps the options as the reasons for the choice (§4, PR #42 review r1). / 事実の広さは測定の広さまでである。下書きの主張は一つの読み手にしか及ばず、行数は作業量の実測ではなくコードの範囲で、「すべてのページ」は調べた入口のことだった。所有者が選んだ後は、選択肢を選んだ理由として記録に残す(§4、PR #42 レビュー r1)。 + 0.1 — 2026-11-10. **Learned:** a setting that "disables" a backend is not a supported mode until every reader handles the empty answer: `SEARCH_ENGINE = None` was accepted by every write path and broke every read path, and a client library pinned to an old server fails on the first header before any real incompatibility shows. / バックエンドを「無効にする」設定は、すべての読み手が空の答えを扱えるまで、支えられた動作モードではない。`SEARCH_ENGINE = None` はすべての書き込みの経路に受け入れられ、すべての読み取りの経路を壊した。また古いサーバーに合わせたクライアントライブラリは、本当の非互換が見える前に最初のヘッダーで失敗する。 +- Status: Accepted by the owner, 2026-11-13 (proposed 2026-11-10, M5 groundwork). The owner chose the paths on 2026-11-10 (§4); the installer side of both is implemented in §6 (ADR-14 for Elasticsearch 8). +- Records a decision for: the owner's chosen direction of 2026-11-10 (§4) — the Elasticsearch 8 port and the move of the file-page editor to y-websocket before sharejs and mongo are retired. The record itself was accepted by the owner on 2026-11-13; the implementations are other pull requests: this one removes nothing. It will change `manifest/upstreams.json` (`elasticsearch2`, `mongo`, `sharejs`), [SPEC-04](../spec/04_acceptance_tests.md#english) (C4 services) and the osf.io integration repository. +- Related: [docs/decisions/README.md](README.md) · [ADR-07 §5](ADR-07_Native_Builds_of_EOL_Middleware.md#english) (sharejs on Node 24) · [ADR-12 PostgreSQL 18](ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md) · [Status board](../status/README.md#english) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Context + +The status board's M5 row says "ES2 and mongo removed; ES8". Elasticsearch 2.4.6 runs today as a native build (ADR-07), MongoDB 3.4 as the official image with a hardening exception. Both are end of life. All measurements below used osf.io image `grdm-dev/osf.io:fe90e5c39e66` (integration commit `fe90e5c39e660f464bb8fcc9ae4028119b958d19`) on PostgreSQL 18 in the throwaway project `m5-pg18a`, with a probe that creates a project through API v2 and calls the search entry points: `/api/v1/search/`, `/search/`, contributor search (`website.search.search.search_contributor`, the function behind `/api/v1/user/search/`), `/v2/search/`, `/v2/search/users/`, `/v2/search/projects/`. + +### 2. Elasticsearch 2: findings + +```toon +search_modes[7]{mode,create_index_and_writes,reads}: + "ES 2.4.6 (today)","all succeed","all 200 with results" + "search off (SEARCH_ENGINE = None)","project creation 201","/api/v1/search/ 500 TypeError; /v2/search/* 500 TypeError; contributor search returns null; /search/ page 200 but its requests fail" + "ES 6.8.23, unchanged client","every call: Content-Type header [] is not supported","every call fails the same way" + "ES 6.8.23 + Content-Type shim (8 lines)","index created; institutions indexed; projects and users rejected: Rejecting mapping update to [website] as the final mapping would have more than 1 type","every search 400: [query_string] cannot use [fields] parameter in conjunction with [default_field]" + "OpenSearch 2.19.5, unchanged client","index created; indexing fails in the client: TypeError string indices must be integers","Content-Type header [] is not supported" + "OpenSearch 2.19.5 + shim","same TypeError on indexing","every search 400 (same query error)" + "search off + prototype patch (about 50 lines)","project creation 201","every entry point 200 with a well-formed empty result; contributor search returns the user from PostgreSQL" +``` + +The client is `elasticsearch2` 2.5.0 (the old Python client under a renamed package); the ES 6 client in the image (`elasticsearch` 6.3.1) is used only for metrics. Code bound to the ES 2 client and query language: `website/search/` (elastic_search.py 1,951 lines, util.py 626, search.py 223, views.py 422), `website/search_migration/` (1,293), `api/search/views.py` (711) and `addons/metadata/search.py` (123) — about 5,300 lines. It keeps twelve document types (project, component, registration, user, file, wiki, comment, institution, preprint, group, metadata, collectionSubmission) in one index `website`, uses `query_string` with both `fields` and `default_field`, and the old `filtered` query. + +**Smallest supported path: search off with a patch.** The prototype replaces `website.search.search.search` with a function that returns `{'results': [], 'counts': {'total': 0}, 'aggs': {…: 0}, …}` (the API v2 paginator reads `aggs.total` and `counts.<type>`) and `search_contributor` with a PostgreSQL query: active, registered, not merged users whose full name contains every word or whose username equals the query, excluding the given users, and limited to the current user's institutions when the user has any (the rule of the ES query). The search page, API v2 search and the private-search features then return nothing. No core acceptance scenario (C1–C6) calls a search endpoint. `osf_init` no longer needs to wait for a search engine. + +**Costs.** + +```toon +paths[3]{path,where,cost,keeps}: + "A: keep ES 2.4.6 (native build, ADR-07)","nothing","an EOL engine stays past M5; the M5 row is not met","full search" + "B: search off + patch (prototype measured)","osf.io integration repository (about 50 lines in website/search, tests for the five entry points); installer: drop elasticsearch2, the osf_init wait loop and ELASTIC_URI","no full-text search of projects, files, wikis or metadata; contributor search becomes substring matching without kana normalisation or fuzziness","writes, contributor search with the institution rule; every probed entry point answers 200" + "C: port to Elasticsearch 8 or OpenSearch","osf.io integration repository: work on an affected code surface of about 5,300 lines — a size of the code bound to ES 2, not a measured count of lines to change — (one index per document type or a type field, the query builders, the client, the Japanese analyzer setup, the search migration)","weeks of work and its own review; a new image and data volume","full search on a supported engine" +``` + +### 3. MongoDB and sharejs: findings + +1. **Clients of mongo.** In the installer only `sharejs` connects (`SHAREJS_DB_URL=mongodb://mongo:27017/sharejs?ssl=true`). osf.io has a pymongo reader, `addons/wiki/utils.py` `share_db()`, but its URL is built from `DB_HOST` and `DB_PORT`, which this environment sets for PostgreSQL: it resolves to `mongodb://postgres:5432/sharejs`, and a read raised `ServerSelectionTimeoutError` after 30.3 s (measured). +2. **Callers of that reader.** `WikiVersion.get_draft` and `get_sharejs_content`, both only through `wiki_page_draft` (route `/project/<pid>/wiki/<wname>/draft/`). The current wiki editor (`wikiPageMilkdown.js` of RDM-wiki-frontend-dev2027 at `5985d18b75da4105a610ac041b838c45f295de7d`) stores `urls.draft` but never requests it; only the legacy `ShareJSDoc.js`/`WikiEditor.js` do. `delete_share_doc` and `migrate_uuid` have no callers outside tests. `broadcast_to_sharejs` (on wiki rename and delete) posts to `localhost:7007` and ignores a connection error. +3. **Browser.** The file page loads `//<sharejs>/text.js` and `share.js` (`view_file.mako`), and its Edit panel (`filepage/editor.js`, `ShareJSDocFile.js`, 350 lines) uses ShareJS. When these measurements were taken (installer at `03c7358`) the browser was given `localhost:7007` and sharejs published no port, so the panel showed only a spinner (ADR-07 §5). PR #40 published sharejs on `127.0.0.1:7007` and gives the browser that URL, so the panel can now reach sharejs; it was not exercised in a browser for this record. +4. **Acceptance.** SPEC-04 C4 lists `sharejs` among its services, but the scenario tests the wiki over `y_websocket` only. + +**What the file page loses:** real-time co-editing of a text file in the Edit panel. Choice (a) below drops it; choice (b) rebuilds it on y-websocket like the wiki. + +**Retirement plan (in this order).** + +1. *osf.io integration repository, first PR.* Choose the file-page editor: (a) a plain editor that saves through WaterButler as today, without co-editing, or (b) a Yjs document per file on y-websocket, with a token from osf.io (`generate_y_websocket_token` with a file-scoped room and a WRITE check) and an editor binding. Remove the sharejs script tags from `view_file.mako`; remove `wiki_page_draft` and its route, `WikiVersion.get_draft`, `get_sharejs_content`, `delete_share_doc`, `migrate_uuid`, `share_db`, `broadcast_to_sharejs` with its calls, and `update_active_sharejs`; the `SHAREJS_*` settings; `pymongo==3.7.1` from `requirements.txt`; the sharejs parts of the tests in `addons/wiki/tests/` (5 files) and `tests/test_addons.py`. Keep `wiki_private_uuids` and `get_sharejs_uuid`: y-websocket room names come from them. +2. *Data.* Before removal, a developer who wants the drafts runs `mongoexport` of `sharejs.docs` into `runtime/backups/`; otherwise they are discarded. The measured wiki reader (`share_db`) cannot reach them here (item 1 above); that does not prove that no draft text reached a saved file, because the file page saves its text through its own HTTP PUT. +3. *This repository, second PR.* Remove the `mongo` and `sharejs` components, `templates/mongo.json`, `templates/sharejs.json`, `installer/images/sharejs/`, `sharejs.env`, the published port 7007 and the browser's `SHAREJS_URL` from `compose render` (PR #40), the volumes `mongo_data` and `mongo_tls`, the `mongo` entry of `manifest/hardening.json`, `SHAREJS_SECRET` from the templates and `secrets.py` once osf.io stops reading it, and `sharejs` from the C4 services in SPEC-04. Bump the osf.io pin to the commit of step 1. + +### 4. Owner decisions (2026-11-10) + +1. **Elasticsearch 2: path C now.** osf.io search is ported to Elasticsearch 8, keeping full-text search; the work is in progress in the osf.io integration repository. Path B stays recorded as the measured fallback, not the plan. +2. **File page: choice (b).** The file-page editor moves from sharejs to y-websocket; then sharejs and mongo are retired by the steps of §3 (in progress). The drafts question (step 2) follows from that work. +3. **Also decided for M4 (recorded here because it was decided the same day):** freecad is removed from MFR, and the remaining OS packages for which the distribution publishes no fix are allow-listed. + +### 5. The prototype of path B (author-reported) + +The measurement logs and the prototype were throwaway files; their numbers in §2 are as reported by the author. The prototype, for reproduction, was loaded before Django set up the search module: + +```python +import math +from django.db.models import Q +from website.search import search as _search + + +def _empty(*args, **kwargs): + counts = dict.fromkeys(('total', 'users', 'projects', 'components', 'registrations', 'files', + 'institutions', 'collectionSubmissions'), 0) + return {'results': [], 'counts': {'total': 0}, 'aggs': counts, 'tags': [], 'typeAliases': {}} + + +def search_contributor(query, page=0, size=10, exclude=None, current_user=None): + from osf.models import OSFUser + from website.profile.utils import profile_image_url + from website import settings + qs = OSFUser.objects.filter(is_active=True, is_registered=True, merged_by__isnull=True) + for word in (query or '').split(): + qs = qs.filter(Q(fullname__icontains=word) | Q(username__iexact=word)) + if exclude: + qs = qs.exclude(id__in=[u.id for u in exclude]) + if current_user and current_user.affiliated_institutions.exists(): + qs = qs.filter(affiliated_institutions__in=current_user.affiliated_institutions.all()).distinct() + total = qs.count() + users = [{'fullname': u.fullname, 'id': u._id, 'employment': None, 'education': None, 'social': u.social_links, + 'n_projects_in_common': -1 if current_user and current_user._id == u._id + else (current_user.n_projects_in_common(u) if current_user else 0), + 'profile_image_url': profile_image_url(settings.PROFILE_IMAGE_PROVIDER, u, use_ssl=True, + size=settings.PROFILE_IMAGE_MEDIUM), + 'profile_url': u.profile_url, 'registered': u.is_registered, 'active': u.is_active} + for u in qs.order_by('fullname')[page * size:(page + 1) * size]] + return {'users': users, 'total': total, 'pages': math.ceil(total / size), 'page': page} + + +_search.search = _empty +_search.search_contributor = search_contributor +``` + +### 6. Implementation in the installer (2026-11-12) + +The order the installer followed, one consumer at a time: + +1. *RDM-osf.io-dev2027 PR #12* (merged): the file page and the wiki edit on y-websocket and osf.io no longer reads MongoDB (`pymongo` stays only for `bson`). Only then were `sharejs`, `mongo`, `templates/sharejs.json`, `templates/mongo.json`, `installer/images/sharejs/`, `sharejs.env`, the loopback port 7007, `SHAREJS_URL`, the volumes `mongo_data` and `mongo_tls`, `SHAREJS_SECRET` and the mongo hardening exception removed. y-websocket gained a volume (`y_websocket_data`) and `YPERSISTENCE=/data` with `YPERSISTENCE_DOC_PREFIX=file-`, so drafts of file rooms survive a restart and the last user leaving (the question of step 2); wiki rooms stay in memory. osf.io receives `Y_WEBSOCKET_INTERNAL_URL` (it deletes the room of a replaced file version) and the shared secret. +2. *RDM-osf.io-dev2027 PR #11*: Elasticsearch 8, recorded in [ADR-14](ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md). The `elasticsearch2` component, `templates/elasticsearch.json` (kept as a pointer for review links) and the recipe `installer/images/elasticsearch2/` (kept as a pointer) are gone; the osf_init wait loop for the emulated ES 2 became `invoke search_ensure_index`. +3. *Left:* `elasticsearch6` (the metrics client), PostgreSQL 15 or later is done (ADR-12). M5's "ES2 and mongo removed" is therefore met in the installer; the rest of M5 (zero CRITICAL/HIGH, red team) is not part of this record. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 背景 + +ステータスボードの M5 の行は「ES2・mongo 廃止。ES8」と書く。Elasticsearch 2.4.6 は今ネイティブのビルド(ADR-07)で、MongoDB 3.4 は公式イメージと堅牢化の例外で動いている。どちらも EOL である。以下の測定はすべて、使い捨てのプロジェクト `m5-pg18a` の PostgreSQL 18 の上で osf.io のイメージ `grdm-dev/osf.io:fe90e5c39e66`(統合コミット `fe90e5c39e660f464bb8fcc9ae4028119b958d19`)を使った。調べる道具は API v2 でプロジェクトを作り、検索の入口を呼ぶ: `/api/v1/search/`、`/search/`、協力者の検索(`website.search.search.search_contributor`。`/api/v1/user/search/` の中身)、`/v2/search/`、`/v2/search/users/`、`/v2/search/projects/`。 + +### 2. Elasticsearch 2: 事実 + +```toon +search_modes[7]{mode,create_index_and_writes,reads}: + "ES 2.4.6(現状)","すべて成功","すべて 200 で結果あり" + "検索を切る(SEARCH_ENGINE = None)","プロジェクト作成は 201","/api/v1/search/ は 500 TypeError。/v2/search/* は 500 TypeError。協力者の検索は null。/search/ のページは 200 だが中の要求が失敗" + "ES 6.8.23、クライアントは変更なし","すべての呼び出しが Content-Type header [] is not supported","すべて同じ理由で失敗" + "ES 6.8.23 と Content-Type の互換層(8 行)","インデックス作成と機関の登録は成功。プロジェクトと利用者は Rejecting mapping update to [website] as the final mapping would have more than 1 type で拒否","すべての検索が 400: [query_string] cannot use [fields] parameter in conjunction with [default_field]" + "OpenSearch 2.19.5、クライアントは変更なし","インデックス作成は成功。登録はクライアント内で TypeError string indices must be integers","Content-Type header [] is not supported" + "OpenSearch 2.19.5 と互換層","登録は同じ TypeError","すべての検索が 400(同じ問い合わせの誤り)" + "検索を切る+試作パッチ(約 50 行)","プロジェクト作成は 201","すべての入口が 200 で形の整った空の結果。協力者の検索は PostgreSQL から利用者を返す" +``` + +クライアントは `elasticsearch2` 2.5.0(古い Python クライアントを別名のパッケージにしたもの)である。イメージにある ES 6 のクライアント(`elasticsearch` 6.3.1)はメトリクスにしか使われない。ES 2 のクライアントと問い合わせ言語に結びついたコードは、`website/search/`(elastic_search.py 1,951 行、util.py 626、search.py 223、views.py 422)、`website/search_migration/`(1,293)、`api/search/views.py`(711)、`addons/metadata/search.py`(123)で、約 5,300 行になる。一つのインデックス `website` に十二種類の文書型(project・component・registration・user・file・wiki・comment・institution・preprint・group・metadata・collectionSubmission)を置き、`query_string` に `fields` と `default_field` を両方渡し、古い `filtered` の問い合わせを使う。 + +**支えられる最小の道: 検索を切ってパッチを当てる。** 試作は `website.search.search.search` を `{'results': [], 'counts': {'total': 0}, 'aggs': {…: 0}, …}` を返す関数に置き換え(API v2 のページ分けは `aggs.total` と `counts.<型>` を読む)、`search_contributor` を PostgreSQL の問い合わせに置き換える。対象は有効・登録済み・未統合の利用者で、氏名がすべての語を含むか利用者名が問い合わせと一致するもの。指定された利用者を除き、今の利用者が機関に属していればその機関に限る(ES の問い合わせと同じ規則)。検索ページ、API v2 の検索、非公開検索の機能は何も返さなくなる。コアの受入シナリオ(C1〜C6)はどれも検索の入口を呼ばない。`osf_init` は検索エンジンを待つ必要がなくなる。 + +**代償。** + +```toon +paths[3]{path,where,cost,keeps}: + "A: ES 2.4.6 を残す(ネイティブのビルド、ADR-07)","なし","EOL のエンジンが M5 の後も残る。M5 の行を満たさない","検索のすべて" + "B: 検索を切る+パッチ(試作を測定済み)","osf.io の統合リポジトリ(website/search に約 50 行と、五つの入口の試験)。インストーラーでは elasticsearch2、osf_init の待ちの繰り返し、ELASTIC_URI を除く","プロジェクト・ファイル・wiki・メタデータの全文検索がなくなる。協力者の検索は部分一致になり、かなの正規化とあいまい一致がなくなる","書き込み、機関の規則つきの協力者の検索。調べた入口はすべて 200" + "C: Elasticsearch 8 か OpenSearch へ移植","osf.io の統合リポジトリ: 約 5,300 行の影響範囲での作業(ES 2 に結びついたコードの大きさであり、変える行数の実測ではない)(文書型ごとのインデックスか型の欄、問い合わせの組み立て、クライアント、日本語の解析器の設定、検索の移行)","数週間の作業と独自のレビュー。新しいイメージとデータボリューム","支えられたエンジンでの検索のすべて" +``` + +### 3. MongoDB と sharejs: 事実 + +1. **mongo のクライアント。** インストーラーの中で接続するのは `sharejs` だけである(`SHAREJS_DB_URL=mongodb://mongo:27017/sharejs?ssl=true`)。osf.io には pymongo の読み手 `addons/wiki/utils.py` の `share_db()` があるが、その URL は `DB_HOST` と `DB_PORT` から作られ、この環境ではそれが PostgreSQL 向けに設定されている。結果は `mongodb://postgres:5432/sharejs` になり、読み取りは 30.3 秒後に `ServerSelectionTimeoutError` で失敗した(測定)。 +2. **その読み手を呼ぶもの。** `WikiVersion.get_draft` と `get_sharejs_content` で、どちらも `wiki_page_draft`(経路 `/project/<pid>/wiki/<wname>/draft/`)からしか呼ばれない。今の wiki エディタ(RDM-wiki-frontend-dev2027 の `5985d18b75da4105a610ac041b838c45f295de7d` の `wikiPageMilkdown.js`)は `urls.draft` を保持するが要求はしない。要求するのは旧来の `ShareJSDoc.js` と `WikiEditor.js` だけである。`delete_share_doc` と `migrate_uuid` を試験の外で呼ぶものは無い。`broadcast_to_sharejs`(wiki の改名と削除のとき)は `localhost:7007` へ送り、接続の誤りは無視する。 +3. **ブラウザ。** ファイルページは `//<sharejs>/text.js` と `share.js` を読み込み(`view_file.mako`)、その編集パネル(`filepage/editor.js`、`ShareJSDocFile.js`、350 行)は ShareJS を使う。測定の時点(インストーラーは `03c7358`)ではブラウザに `localhost:7007` が渡され、sharejs はポートを公開しなかったので、パネルはスピナーのままだった(ADR-07 §5)。PR #40 は sharejs を `127.0.0.1:7007` で公開し、ブラウザにその URL を渡すので、パネルは今は sharejs に届きうる。この記録のためにブラウザでは試していない。 +4. **受入。** SPEC-04 の C4 はサービスに `sharejs` を挙げるが、シナリオが試すのは `y_websocket` 上の wiki だけである。 + +**ファイルページが失うもの:** 編集パネルでのテキストファイルの実時間の共同編集。下の (a) ではそれを手放し、(b) では wiki と同じく y-websocket の上に作り直す。 + +**退役の手順(この順で)。** + +1. *osf.io の統合リポジトリ、最初の PR。* ファイルページのエディタを選ぶ。(a) 共同編集なしで今と同じく WaterButler を通して保存する素のエディタ、または (b) y-websocket 上のファイルごとの Yjs 文書。トークンは osf.io から出し(ファイル単位の部屋と WRITE の確認を加えた `generate_y_websocket_token`)、エディタの結び付けを使う。`view_file.mako` から sharejs の script タグを除く。`wiki_page_draft` とその経路、`WikiVersion.get_draft`、`get_sharejs_content`、`delete_share_doc`、`migrate_uuid`、`share_db`、`broadcast_to_sharejs` とその呼び出し、`update_active_sharejs` を除く。`SHAREJS_*` の設定、`requirements.txt` の `pymongo==3.7.1`、`addons/wiki/tests/` の試験(5 ファイル)と `tests/test_addons.py` の sharejs の部分も除く。`wiki_private_uuids` と `get_sharejs_uuid` は残す。y-websocket の部屋の名前がそこから作られるからである。 +2. *データ。* 撤去の前に、下書きが欲しい開発者は `sharejs.docs` を `mongoexport` で `runtime/backups/` に書き出す。そうでなければ捨てる。測定した wiki の読み手(`share_db`)はここでは下書きに届かない(上の 1)。ただしファイルページは自分の HTTP PUT で本文を保存するので、下書きの文が保存済みのファイルに一度も届いていないことの証明にはならない。 +3. *本リポジトリ、二つ目の PR。* 部品 `mongo` と `sharejs`、`templates/mongo.json`、`templates/sharejs.json`、`installer/images/sharejs/`、`compose render` の `sharejs.env`、公開ポート 7007、ブラウザ向けの `SHAREJS_URL`(PR #40)、ボリューム `mongo_data` と `mongo_tls`、`manifest/hardening.json` の `mongo` の項目を除く。`SHAREJS_SECRET` は osf.io が読まなくなった後でテンプレートと `secrets.py` から除く。SPEC-04 の C4 のサービスから `sharejs` を除く。osf.io の固定を手順 1 のコミットに上げる。 + +### 4. 所有者の判断(2026-11-10) + +1. **Elasticsearch 2: 道 C を今行う。** osf.io の検索を全文検索を保ったまま Elasticsearch 8 へ移植する。作業は osf.io の統合リポジトリで進行中である。道 B は測定した代替として記録に残すが、計画ではない。 +2. **ファイルページ: (b) を選ぶ。** ファイルページのエディタを sharejs から y-websocket へ移し、その後 §3 の手順で sharejs と mongo を退役させる(進行中)。下書きの扱い(手順 2)はその作業の中で決まる。 +3. **M4 についても同日に決定(同じ日の決定なのでここに記録する):** MFR から freecad を除き、配布元が修正を出していない残りの OS パッケージは許容リストに入れる。 + +### 5. 道 B の試作(著者の報告) + +測定のログと試作は使い捨てのファイルだったので、§2 の数値は著者の報告による。再現のための試作を英語の節 §5 に載せた。Django が検索のモジュールを用意する前に読み込んだ。 + +### 6. インストーラーでの実施(2026-11-12) + +インストーラーが従った順序。使う側を一つずつなくした。 + +1. *RDM-osf.io-dev2027 PR #12*(マージ済み): ファイルページと wiki が y-websocket で編集され、osf.io は MongoDB を読まなくなった(`pymongo` は `bson` のためだけに残る)。それを待って初めて、`sharejs`、`mongo`、`templates/sharejs.json`、`templates/mongo.json`、`installer/images/sharejs/`、`sharejs.env`、ループバックのポート 7007、`SHAREJS_URL`、ボリューム `mongo_data` と `mongo_tls`、`SHAREJS_SECRET`、mongo の堅牢化の例外を外した。y-websocket にはボリューム(`y_websocket_data`)と `YPERSISTENCE=/data`、`YPERSISTENCE_DOC_PREFIX=file-` を与え、ファイルの部屋の下書きが再起動と最後の利用者の退出を越えて残るようにした(手順 2 の問い)。wiki の部屋はメモリのまま。osf.io には `Y_WEBSOCKET_INTERNAL_URL`(置き換えたファイル版の部屋を消すため)と共通の秘密を渡す。 +2. *RDM-osf.io-dev2027 PR #11*: Elasticsearch 8([ADR-14](ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md))。部品 `elasticsearch2`、`templates/elasticsearch.json`(レビューのリンクのため指し示すだけのファイルとして残す)、レシピ `installer/images/elasticsearch2/`(同じく指し示すだけ)は無くなり、エミュレーションの ES 2 を待つ osf_init のループは `invoke search_ensure_index` になった。 +3. *残り:* `elasticsearch6`(メトリクスのクライアント)。PostgreSQL 15 以降は済んでいる(ADR-12)。したがって M5 の「ES2・mongo 廃止」はインストーラーでは満たされ、M5 の残り(CRITICAL/HIGH ゼロ、レッドチーム)はこの記録の対象ではない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Mapping type | A kind of document inside an Elasticsearch index; from version 6 an index may hold only one. | Elasticsearch のインデックスの中の文書の種類。版 6 からは一つのインデックスに一つしか置けない。 | +| Compatibility shim | A small piece of code that makes an old client speak to a newer server. | 古いクライアントを新しいサーバーと話せるようにする小さなコード。 | +| ShareJS | The older real-time co-editing server; it keeps documents in MongoDB. | 旧来の実時間共同編集サーバー。文書を MongoDB に置く。 | +| y-websocket | The co-editing server the wiki uses now. | wiki が今使う共同編集サーバー。 | diff --git a/docs/decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md b/docs/decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md new file mode 100644 index 0000000..4e13a4e --- /dev/null +++ b/docs/decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md @@ -0,0 +1,108 @@ +# ADR-14 Elasticsearch 8 with TLS and Authentication / TLS と認証つきの Elasticsearch 8 + +> **Summary:** osf.io's full-text search runs on Elasticsearch 8.19.24 (RDM-osf.io-dev2027 PR #11), so the installer replaces the Elasticsearch 2 service with `elasticsearch8`: the official multi-architecture image pinned by its index digest plus the two Japanese-analysis plugins, TLS with a certificate authority of the installation's own, authentication on, scripts off, no published port, and a role-limited user for osf.io (`grdm_osf`, every privilege on `website*` and `private__website*` only) created by a one-shot step. The root filesystem stays read-only: the official entrypoint writes a keystore into `config/`, so `config/` is a tmpfs that our entrypoint fills. The record also names what this change does not do: the ES 2 data is not migrated (`invoke migrate_search` rebuilds the index), and Elasticsearch 6 stays for the metrics client. +> **概要:** osf.io の全文検索は Elasticsearch 8.19.24 で動く(RDM-osf.io-dev2027 PR #11)ので、インストーラーは Elasticsearch 2 のサービスを `elasticsearch8` に替える。インデックスのダイジェストで固定した公式のマルチアーキテクチャイメージに日本語解析の二つのプラグインを足し、導入ごとの認証局による TLS、認証あり、スクリプトなし、ポート非公開とし、osf.io には権限を絞った利用者(`grdm_osf`。`website*` と `private__website*` にだけすべての権限)を一回きりの手順で作る。読み取り専用のルートは保つ。公式の entrypoint が `config/` にキーストアを書くので、`config/` は tmpfs にして自前の entrypoint が中身を入れる。この記録は、この変更がしないことも示す。ES 2 のデータは移さず(`invoke migrate_search` が索引を作り直す)、Elasticsearch 6 はメトリクスのクライアントのために残す。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-13. **Learned:** acceptance closes the decision, not its open points: the owner accepted this record on 2026-11-13 ("一括で承認、M2 完了") after the merged osf.io pin `90b10661c8dc` passed 14 of 14, while `elasticsearch6` for metrics and the allow-list review of the image's Ubuntu packages stay open, and from M3 any new allow-list entry must be balanced by a removal because the ceiling is the M2 count of 58. / 承認は決定を閉じるが、その未了の点は閉じない。所有者は、マージ後の osf.io の固定版 `90b10661c8dc` が 14 件中 14 件に合格した後の 2026-11-13 にこの記録を承認した(「一括で承認、M2 完了」)。メトリクスのための `elasticsearch6` と、イメージの Ubuntu パッケージの許容リストの見直しは未了のまま残る。M3 からは上限が M2 の件数 58 なので、許容リストに項目を足すには別の項目を外す必要がある。 + 0.2 — 2026-11-13. **Learned:** an upgrade instruction has to be checked against the order the installer actually enforces, not against what each command does alone: `secrets rotate` changes every credential, drops a retired key and recreates containers from the Compose file as it was last rendered, so putting it before `compose render` is an unnecessary credential change that can fail or roll back before the new configuration exists; the upgrade that keeps the existing values is `secrets init --missing`, then render, build, render, up (PR #56 review r1 R1-02). / 更新の手順は、各コマンド単体の働きでなく、インストーラーが実際に求める順序に照らして確かめなければならない。`secrets rotate` はすべての資格情報を替え、廃止したキーを捨て、最後に生成した Compose ファイルのままコンテナを再作成するので、`compose render` の前に置くのは不要な資格情報の変更で、新しい設定ができる前に失敗や巻き戻しを起こしうる。既存の値を保つ更新は `secrets init --missing`、そのあと render、build、render、up である(PR #56 レビュー r1 R1-02)。 + 0.1 — 2026-11-12. **Learned:** a "read-only root" claim for a service is only true when its entrypoint has been run that way: Elasticsearch 8's official entrypoint writes a keystore into `config/` and its security layer reads TLS files only from `config/`, so both the tmpfs and the copy of the certificate into it had to be found by starting the image under the real hardening, not by reading its documentation. / サービスが「読み取り専用のルート」で動くという主張は、その entrypoint を実際にその条件で動かして初めて本当になる。Elasticsearch 8 の公式 entrypoint は `config/` にキーストアを書き、セキュリティ層は TLS のファイルを `config/` からしか読まないので、tmpfs と証明書の複写の両方は、文書を読むのでなく、実際の堅牢化の下でイメージを起動して初めて分かった。 +- Status: Accepted by the owner, 2026-11-13 (proposed 2026-11-12, M5). Review date: when django-elasticsearch-metrics supports Elasticsearch 8 (then `elasticsearch6` goes), or at the next Elasticsearch 8 minor. +- Records a decision for: `manifest/upstreams.json` (`elasticsearch8` replaces `elasticsearch2`) · `installer/images/elasticsearch8/` · `installer/grdm_dev/templates/elasticsearch8.json`, `elasticsearch8_setup.json` and the osf.io templates · [SPEC-02](../spec/02_installer_cli.md#english) (services, secrets, volumes) · [SPEC-01](../spec/01_manifest.md#english) +- Related: [ADR-13 Retiring Elasticsearch 2 and MongoDB](ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md) (path C of its §2 is this record's change) · [ADR-07 Native builds of EOL middleware](ADR-07_Native_Builds_of_EOL_Middleware.md) · [ADR-02 Network model](ADR-02_Network_Model.md) · [Status board](../status/README.md#english) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Context + +[ADR-13](ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md) measured that osf.io's search cannot run on Elasticsearch 6.8 or OpenSearch and left three paths; the owner chose the port to Elasticsearch 8 with full-text search (path C, 2026-11-10). The osf.io side is RDM-osf.io-dev2027 PR #11: the client is `elasticsearch7` 7.17.13 in compatibility mode, one index `website_v1` with the alias `website` and a `doc_type` field, the `_all` field replaced by `all_text`, a Japanese analyzer built on `analysis-kuromoji`, and a permission filter that keeps private content out of the answers. It connects with `ELASTIC_URI`, `ELASTIC_USERNAME`, `ELASTIC_PASSWORD` and `ELASTIC_CA_CERTS` and refuses to send credentials over anything but https. + +The installer has to give it a server it can use under the baseline every other service meets (non-root, read-only root, no added capabilities, no published port, secrets only in `runtime/.env`). + +### 2. Decision + +1. **One image, `grdm-dev/elasticsearch8:8.19.24-1`** (`image_build`, as ADR-07 does for the other infra recipes). The base is the official `docker.elastic.co/elasticsearch/elasticsearch:8.19.24` pinned by its index digest (`sha256:d6dfe6626d64…`), which has native arm64 and amd64 variants, so nothing is compiled or emulated. The recipe adds `analysis-kuromoji` and `analysis-icu` and nothing else. +2. **Two services from it.** `elasticsearch8` is the node. `elasticsearch8_setup` is a one-shot that waits for a yellow cluster with the bootstrap superuser, then creates, by idempotent `PUT`, the role `grdm_osf` (cluster `monitor`; all privileges on `website*` and `private__website*`) and the user `grdm_osf`. osf.io receives only that user's password. The superuser's password reaches only the two elasticsearch8 services. +3. **TLS with the installation's own CA.** At first start the entrypoint creates a CA and a server certificate for `elasticsearch8`, `localhost` and `127.0.0.1`, keeps the server key in the data volume and discards the CA key. Only the public `ca.crt` is published, into the small volume `elasticsearch8_ca`, which osf.io mounts read-only as `ELASTIC_CA_CERTS`. This replaces the mongo pattern of ADR-07 and PR #43 (a certificate made once, trusted by exact file), and the trust is again by file, never by disabling verification. +4. **Security settings that ES 2 did not have.** `xpack.security` on, TLS on the REST port (the transport port is not reachable on a single node), `script.allowed_types: none` (ES 8 enables Painless by default; the search never needs it), machine learning and the GeoIP download off, `action.destructive_requires_name`, and disk watermarks given in bytes so that a large disk that is nearly full does not stop writes while a small one still does. +5. **Read-only root.** `config/` is a tmpfs because the official entrypoint creates `elasticsearch.keystore` there (it holds the bootstrap password); our `grdm-entrypoint.sh` copies the image's pristine `config.dist/` into it (plain `cp -R`: the tmpfs root belongs to root, so a times-preserving copy fails), copies the TLS files into `config/tls/` (Elasticsearch 8.19 reads SSL files only under `config/`) and execs the official entrypoint. Logs and `/tmp` are tmpfs, data is the named volume `elasticsearch8_data`. No hardening exception. +6. **Health.** The Compose health check accepts HTTP 401 on the TLS port: the server answers over TLS with a certificate that chains to the CA while it holds no credential. `elasticsearch8_setup` then waits for the cluster with the credential. +7. **Memory.** Heap 768 MiB, floor 1536 MiB. With the setup one-shot (64 MiB) it replaces ES 2 (1024), mongo (256) and sharejs (128): the core floors add up to 8512 MiB, a lower bound of 11.9 GiB (SPEC-02 §8). +8. **osf_init.** Before `populate_institutions` it runs `invoke search_ensure_index`, which creates `website_v1` and the alias with the full mapping. Without it the first write creates the index with a dynamic mapping and `doc_type` becomes a text field, which breaks aggregations (PR #11). +9. **What is not done.** The ES 2 data is not migrated: after the first `up` on an existing installation, `invoke migrate_search` rebuilds the index from PostgreSQL. `elasticsearch6` stays: django-elasticsearch-metrics speaks the ES 6 protocol, and its removal waits for that client. The old directory `runtime/volumes/elasticsearch_data` is left in place (`grdm-dev` never deletes data it does not manage); it can be removed by hand. + +### 3. Options considered + +```toon +options[4]{option,reason_for_not_choosing}: + "ES 8 with security off","one flag, but a search server that accepts any client on the internal network is the exposure ADR-02 exists to avoid; the password and the CA cost one script and one volume" + "Certificates made by the host (the installer, openssl on the host)","adds a host prerequisite (openssl) and a way for key files to be wrong on Windows; the image already has openssl and unzip" + "elasticsearch-certutil in an init one-shot with its own volume for the key","the key would be readable by whoever mounts the volume; keeping it in the data volume that only the node mounts is simpler" + "Writable root for the keystore","one hardening exception for a file that is a few hundred bytes; a tmpfs removes the exception" +``` + +### 4. Consequences + +- A new secret pair, `ELASTIC8_PASSWORD` and `ELASTIC8_OSF_PASSWORD`; `SHAREJS_SECRET` is retired (ADR-13). An installation whose `runtime/.env` predates them runs `grdm-dev secrets init --missing` (it adds only the absent keys, keeps every existing value including the PostgreSQL and RabbitMQ passwords, drops `SHAREJS_SECRET` and needs no running stack), then `compose render`, `build`, `compose render` again and `up`, and once `invoke migrate_search`; the canonical order is in [the environment guide §8](../guides/environment/README.md#english). `secrets rotate` is not part of this upgrade: it changes every credential and recreates containers from the Compose file as it was last rendered, which at that point still names the retired key and services (SPEC-02 §3: render before any rotate). +- Three images change at once for an existing installation (osf.io, y-websocket, ember-osf-web), and the volumes `elasticsearch8_data`, `elasticsearch8_ca` and `y_websocket_data` appear. +- The ES 2 image recipe (`installer/images/elasticsearch2/`) is kept only as a pointer file, because review records link to it (SPEC-06 §8). +- Open: the scan allow-list for the new image's Ubuntu packages is not yet reviewed (SPEC-03 §5.1). The scans after this change have recorded the image's findings (2 HIGH and 30 MEDIUM from Trivy, listed per package and not allow-listed; [DEMO-20](../demo/20_core_install_mac_studio.md#english)); no entry has been proposed or reviewed yet. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ English version](#english) + +### 1. 背景 + +[ADR-13](ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md) は、osf.io の検索が Elasticsearch 6.8 でも OpenSearch でも動かないことを測り、三つの道を残した。所有者は全文検索を保った Elasticsearch 8 への移植(道 C)を 2026-11-10 に選んだ。osf.io 側は RDM-osf.io-dev2027 の PR #11 である。クライアントは `elasticsearch7` 7.17.13 の互換モードで、索引は一つ(`website_v1`、別名 `website`)に `doc_type` 欄を持たせ、`_all` は `all_text` に替え、日本語の解析器は `analysis-kuromoji` で作り、非公開の内容を答えに出さない権限の絞り込みを保つ。接続は `ELASTIC_URI`・`ELASTIC_USERNAME`・`ELASTIC_PASSWORD`・`ELASTIC_CA_CERTS` で行い、https 以外では認証情報を送らない。 + +インストーラーは、ほかのすべてのサービスが満たす基準(非 root、読み取り専用のルート、capability を足さない、ポートを公開しない、秘密は `runtime/.env` だけ)の下で使えるサーバーをこれに与えなければならない。 + +### 2. 決定 + +1. **イメージは一つ、`grdm-dev/elasticsearch8:8.19.24-1`**(ADR-07 がほかの infra のレシピに行うのと同じ `image_build`)。ベースは公式の `docker.elastic.co/elasticsearch/elasticsearch:8.19.24` をインデックスのダイジェスト(`sha256:d6dfe6626d64…`)で固定したもの。arm64 と amd64 のネイティブ版があるので、組むものも、エミュレーションするものもない。レシピが足すのは `analysis-kuromoji` と `analysis-icu` だけである。 +2. **そこから二つのサービス。** `elasticsearch8` はノード。`elasticsearch8_setup` は一回きりの手順で、ブートストラップの管理者で cluster が yellow になるのを待ち、冪等な `PUT` でロール `grdm_osf`(cluster は `monitor`、`website*` と `private__website*` にすべての権限)と利用者 `grdm_osf` を作る。osf.io が受け取るのはその利用者のパスワードだけで、管理者のパスワードは二つの elasticsearch8 サービスにしか届かない。 +3. **導入ごとの認証局による TLS。** 初回起動で entrypoint が認証局と、`elasticsearch8`・`localhost`・`127.0.0.1` のサーバー証明書を作り、サーバー鍵をデータボリュームに残し、認証局の鍵は捨てる。公開するのは公開の `ca.crt` だけで、小さなボリューム `elasticsearch8_ca` に置き、osf.io が `ELASTIC_CA_CERTS` として読み取り専用で mount する。これは ADR-07 と PR #43 の mongo の型(一度だけ作った証明書をファイルそのもので信頼する)を引き継ぐもので、信頼は今回もファイルであり、検証を切ることはない。 +4. **ES 2 に無かったセキュリティ設定。** `xpack.security` を有効にし、REST のポートを TLS にし(単一ノードなので transport のポートには届かない)、`script.allowed_types: none`(ES 8 は Painless を既定で有効にするが、検索には要らない)、機械学習と GeoIP のダウンロードを切り、`action.destructive_requires_name` を有効にし、ディスクの watermark をバイトで与える(大きなディスクがほぼ満杯でも書き込みが止まらず、小さなディスクなら止まる)。 +5. **読み取り専用のルート。** 公式の entrypoint が `elasticsearch.keystore`(ブートストラップのパスワードを持つ)を `config/` に作るので、`config/` は tmpfs にする。自前の `grdm-entrypoint.sh` がイメージの元のままの `config.dist/` をそこへ写し(`cp -R`。tmpfs の根は root のものなので、時刻を保つ複写は失敗する)、TLS のファイルを `config/tls/` へ写し(Elasticsearch 8.19 は SSL のファイルを `config/` の下からしか読まない)、公式の entrypoint を exec する。ログと `/tmp` は tmpfs、データは名前つきボリューム `elasticsearch8_data`。堅牢化の例外はない。 +6. **ヘルス。** Compose のヘルスチェックは TLS のポートでの HTTP 401 を受け入れる。認証情報を持たない相手に、認証局に連なる証明書で TLS の応答をする、という意味である。そのあと `elasticsearch8_setup` が認証情報つきで cluster を待つ。 +7. **メモリ。** ヒープ 768 MiB、下限 1536 MiB。setup の一回きりの手順(64 MiB)と合わせて ES 2(1024)・mongo(256)・sharejs(128)に替わり、core の下限の合計は 8512 MiB、下限値は 11.9 GiB になる(SPEC-02 §8)。 +8. **osf_init。** `populate_institutions` の前に `invoke search_ensure_index` を実行し、`website_v1` と別名を完全なマッピングで作る。これが無いと最初の書き込みが動的マッピングで索引を作り、`doc_type` が text になって集計が壊れる(PR #11)。 +9. **しないこと。** ES 2 のデータは移さない。既存の導入では、最初の `up` のあと `invoke migrate_search` が PostgreSQL から索引を作り直す。`elasticsearch6` は残す。django-elasticsearch-metrics が ES 6 のプロトコルを話すので、撤去はそのクライアントを待つ。古い `runtime/volumes/elasticsearch_data` はそのまま残す(`grdm-dev` は自分が管理しないデータを消さない)。手で消してよい。 + +### 3. 検討した選択肢 + +```toon +options[4]{option,reason_for_not_choosing}: + "セキュリティを切った ES 8","フラグ一つで済むが、内部ネットワークのどのクライアントも受け入れる検索サーバーは ADR-02 が避けようとする露出である。パスワードと認証局のための費用はスクリプト一つとボリューム一つ" + "ホスト(インストーラー、ホストの openssl)が証明書を作る","ホストに openssl という前提を足し、Windows で鍵ファイルが壊れる道を作る。イメージにはすでに openssl と unzip がある" + "init の一回きりの手順で elasticsearch-certutil を動かし、鍵を専用ボリュームに置く","そのボリュームを mount した者に鍵が読める。ノードだけが mount するデータボリュームに置くほうが簡単" + "キーストアのためにルートを書き込み可にする","数百バイトのファイルのために堅牢化の例外を一つ作る。tmpfs なら例外が要らない" +``` + +### 4. 結果 + +- 秘密が二つ増える(`ELASTIC8_PASSWORD`、`ELASTIC8_OSF_PASSWORD`)。`SHAREJS_SECRET` は退役する(ADR-13)。これらより前に作られた `runtime/.env` の導入は、`grdm-dev secrets init --missing`(足りないキーだけを足し、PostgreSQL と RabbitMQ のパスワードを含む既存の値はすべて保ち、`SHAREJS_SECRET` を捨てる。稼働中のスタックは要らない)を実行し、続けて `compose render`、`build`、もう一度 `compose render`、`up`、そして一度だけ `invoke migrate_search` を実行する。正本の順序は[環境ガイド §8](../guides/environment/README.md#japanese)にある。`secrets rotate` はこの更新に含めない。すべての資格情報を替え、最後に生成した Compose ファイルのままコンテナを再作成するが、その時点のファイルはまだ廃止したキーとサービスを名指ししている(SPEC-02 §3: rotate の前に render)。 +- 既存の導入では三つのイメージ(osf.io、y-websocket、ember-osf-web)が同時に変わり、ボリューム `elasticsearch8_data`・`elasticsearch8_ca`・`y_websocket_data` が現れる。 +- ES 2 のイメージのレシピ(`installer/images/elasticsearch2/`)は、レビュー記録がそれにリンクするため、指し示すだけのファイルとして残す(SPEC-06 §8)。 +- 未了: 新しいイメージの Ubuntu パッケージに対する検査の許容リストはまだ見直していない(SPEC-03 §5.1)。この変更のあとの検査はイメージの検出を記録済み(Trivy の HIGH 2 件と MEDIUM 30 件。パッケージごとに列挙し、許容はしていない。[DEMO-20](../demo/20_core_install_mac_studio.md#japanese))で、項目の提案も見直しもまだ行っていない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Keystore | A small file where Elasticsearch keeps secret settings such as the bootstrap password. | Elasticsearch が、ブートストラップのパスワードのような秘密の設定を入れておく小さなファイル。 | +| Certificate authority (CA) | The party whose signature makes a certificate trusted; here one made per installation, with its private key discarded. | 署名によって証明書を信頼できるものにする主体。ここでは導入ごとに作り、秘密鍵は捨てる。 | +| Tmpfs | A memory-backed folder inside a container; it vanishes when the container stops. | コンテナの中のメモリ上のフォルダ。コンテナが止まると消える。 | +| One-shot | A container that does one job and exits; Compose treats exit code 0 as success. | 一つの仕事をして終了するコンテナ。Compose は終了コード 0 を成功として扱う。 | diff --git a/docs/decisions/README.md b/docs/decisions/README.md new file mode 100644 index 0000000..85aa887 --- /dev/null +++ b/docs/decisions/README.md @@ -0,0 +1,129 @@ +# Decision Records / 決定の記録 + +> **Summary:** Documents explaining why we chose one way and not another: integration repository placement, network model, staged security gate, AI autonomy and roles, the test IdP, the wiki-frontend overlay, native builds of EOL middleware, per-OS installer entry points, PostgreSQL 18 with its data upgrade, the retirement of Elasticsearch 2 and MongoDB, and Elasticsearch 8 with TLS and authentication. Each record captures the context, options considered, and final decision. +> **概要:** なぜその道を選び、ほかを選ばなかったかを説明する文書:統合リポジトリの置き場、ネットワーク方式、セキュリティ門の段階化、AI の自律度と役割、テスト IdP、wiki-frontend のオーバーレイ、EOL ミドルウェアのネイティブビルド、OS ごとのインストーラーの入口、PostgreSQL 18 とデータの更新、Elasticsearch 2 と MongoDB の退役、TLS と認証つきの Elasticsearch 8。各記録は文脈、検討した選択肢、最終決定を捉えます。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.8 — 2026-11-13. **Learned:** an index that keeps the status inside the purpose text, and only for some rows, cannot be read at a glance: when the owner accepted ADR-08, ADR-12, ADR-13 and ADR-14 together on 2026-11-13 ("一括で承認、M2 完了"), the state of the other records had to be looked up file by file, so both tables now have a status column taken from each record's Status line. / 状態を目的の文の中に、しかも一部の行にだけ書く索引は、一目では読めない。所有者が 2026-11-13 に ADR-08・ADR-12・ADR-13・ADR-14 をまとめて承認したとき(「一括で承認、M2 完了」)、ほかの記録の状態はファイルを一つずつ見なければ分からなかった。そこで両方の表に、各記録の Status 行から取った状態の列を置いた。 + 0.7 — 2026-11-12. **Learned:** an index of decision records has to say which numbers are free and which are taken in other trees, so the next record (ADR-14) was numbered by reading this table instead of guessing; a decision that the data tier needed twice (ADR-13's path C) now has its implementation record (ADR-14). / 決定記録の索引は、どの番号が空きでどれが別の木で使われているかを言わなければならない。次の記録(ADR-14)は推測でなく、この表を読んで番号を付けた。データ層が二度要した決定(ADR-13 の道 C)に、実装の記録(ADR-14)ができた。 + 0.6 — 2026-11-10. **Learned:** a rule like "never needs sudo" has to name what it covers, so giving hosts a bootstrap became an architecture decision (ADR-08) instead of an exception nobody records. / 「sudo を必要としない」のような規則は対象を名指ししなければならない。ホストを準備する段を設けることは、誰も記録しない例外ではなく設計判断(ADR-08)になった。 + 0.5 — 2026-11-10. **Learned:** a data-tier change is two records, not one: the PostgreSQL move is proposed with its proof (ADR-12), while the removal of Elasticsearch 2 and MongoDB still needs owner choices (ADR-13); ADR-08 to ADR-11 stay reserved or planned for records on other branches. / データ層の変更は一つでなく二つの記録になる。PostgreSQL の移行は証明つきで提案し(ADR-12)、Elasticsearch 2 と MongoDB の撤去はまだ所有者の選択を要する(ADR-13)。ADR-08〜ADR-11 は他のブランチの記録のために予約・予定のまま残す。 + 0.4 — 2026-11-06. **Learned:** a cold start turned an emulation cost into an architecture decision (ADR-07): EOL amd64-only middleware is built natively. / コールドスタートがエミュレーションのコストを設計判断(ADR-07)に変えた。amd64 のみの EOL ミドルウェアはネイティブで組む。 + 0.3 — 2026-11-06. **Learned:** a repository that cannot be built alone because its Dockerfile belongs to another tree is an architecture decision (overlay, not service) and needs its own record (ADR-06). / Dockerfile が別の木に属していて単独で組めないリポジトリは、サービスでなくオーバーレイという設計上の決定であり、独自の記録(ADR-06)が要ると分かった。 + 0.2 — 2026-11-06. **Learned:** a test fixture that logs people in is an architecture choice like any other service, so it needs its own record (ADR-05) rather than a note in a template. / 人をログインさせる試験用の部品も他のサービスと同じ設計上の選択であり、テンプレートの注記ではなく独自の記録(ADR-05)が要ると分かった。 + 0.1 — 2026-11-05. **Learned:** writing decisions as records turned subjective choices into objective, reviewable documents that explain the reasoning behind each rule. / 決定を記録として残すことで、主観的な選択を客観的でレビュー可能な文書にし、各ルールの背後にある推論を説明できるようになったと分かった。 +- Normative for: [ADR-01 Integration Repository Placement](./ADR-01_Integration_Repository_Placement.md) through [ADR-08 Per-OS Installer Entry Points](./ADR-08_Per_OS_Installer_Entry_Points.md), and [ADR-12 PostgreSQL 18 and Data Directory Upgrade](./ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md) [ADR-13 Retiring Elasticsearch 2 and MongoDB](./ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md) and [ADR-14 Elasticsearch 8 with TLS and Authentication](./ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md); ADR-09 to ADR-11 are reserved or planned. +- Related: [../README.md](../README.md) · [policy/](../policy/README.md) · [spec/](../spec/README.md) · [reference/REF-01_Glossary.md](./../reference/REF-01_Glossary.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. What belongs here + +A *decision record* (ADR) explains why we chose one way and not another. This folder contains: + +| ID | File | Purpose | Status | +|---|---|---|---| +| ADR-01 | [ADR-01_Integration_Repository_Placement.md](./ADR-01_Integration_Repository_Placement.md) | Where integration code lives: new private repos, not in this public repo. | Accepted 2026-11-05 | +| ADR-02 | [ADR-02_Network_Model.md](./ADR-02_Network_Model.md) | Drop loopback alias 192.168.168.167; use Compose internal network and 127.0.0.1 only. | Accepted 2026-11-05 | +| ADR-03 | [ADR-03_Staged_Security_Gate.md](./ADR-03_Staged_Security_Gate.md) | Gate starts as report-only at M1, becomes zero CRITICAL/HIGH plus red team pass at M5. | Accepted 2026-11-05 | +| ADR-04 | [ADR-04_AI_Autonomy_and_Roles.md](./ADR-04_AI_Autonomy_and_Roles.md) | AI detects, fixes, reviews, tests; humans merge and publish. | Accepted 2026-11-05 | +| ADR-05 | [ADR-05_Test_IdP_for_Shibboleth.md](./ADR-05_Test_IdP_for_Shibboleth.md) | Bundled test IdP for `--auth shibboleth`: our own SimpleSAMLphp image on `php:8.3-apache`, mock attributes prefixed `mock-`. | Proposed 2026-11-06 | +| ADR-06 | [ADR-06_Wiki_Frontend_Overlay.md](./ADR-06_Wiki_Frontend_Overlay.md) | wiki-frontend is an overlay of osf.io (`overlay_of`): a bundle-builder image from the merged tree, tagged `<osf_sha12>-<wiki_sha12>`, run once by `wiki_assets` into the volume `wiki_static`; no `wiki` server. | Proposed 2026-11-06 | +| ADR-07 | [ADR-07_Native_Builds_of_EOL_Middleware.md](./ADR-07_Native_Builds_of_EOL_Middleware.md) | EOL middleware that only ships amd64 images is built natively for both architectures from the official artefact on a digest-pinned base (`image_build`, MC-15); first Elasticsearch 2.4.6, which took 38 minutes to start under emulation and 5 seconds natively (real install run 19). | Proposed 2026-11-06 | +| ADR-08 | [ADR-08_Per_OS_Installer_Entry_Points.md](./ADR-08_Per_OS_Installer_Entry_Points.md) | Thin, consent-based prerequisite scripts for Ubuntu, macOS and Windows that all end at `install.sh`; `sudo` is allowed there only. | **Accepted 2026-11-13** (owner) | +| ADR-12 | [ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md](./ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md) | PostgreSQL 9.6 → 18.6 (digest-pinned); md5 host auth until CAS has a SCRAM-capable JDBC driver; `grdm-dev db upgrade` dumps and restores with verification and keeps the old directory, `db rollback` puts it back, `up` refuses a mismatched major (exit 15). | **Accepted 2026-11-13** (owner) | +| ADR-13 | [ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md](./ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md) | Measured: osf.io search does not run on ES 6.8 or OpenSearch; search off needs a ~50-line patch; mongo serves only sharejs, whose file-page co-editing is what retirement removes. Retirement steps; owner decisions of 2026-11-10: ES 8 port with full-text search, file-page editor on y-websocket. | **Accepted 2026-11-13** (owner) | +| ADR-14 | [ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md](./ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md) | Elasticsearch 8.19.24 (official image by digest, kuromoji and icu) replaces ES 2: TLS with the installation's own CA, authentication, scripts off, a `grdm_osf` user limited to `website*`, no published port, read-only root with a tmpfs `config/`; ES 2 data is rebuilt by `invoke migrate_search`. | **Accepted 2026-11-13** (owner) | + +Reserved or planned numbers (no record in this tree yet): + +| Number | Topic | +|---|---| +| ADR-09 | Planned: repository branching strategy | +| ADR-10 | Planned: tool version policy (Docker, Python, Node.js) | +| ADR-11 | Planned: open source license compatibility | + +### 2. Creating a new decision record + +1. Name the file `ADR-NN_<Title>.md` (two-digit number, next available). +2. Follow [SPEC-06 documentation conventions](../spec/06_documentation_conventions.md). +3. Include: context, options considered (use TOON if multiple), decision, rationale. +4. Link to related policies and specifications. +5. The owner approves. + +### 3. How decision records relate to other documents + +```mermaid +flowchart TD + P[Policy: position] --> A[Decision record: why we chose this] + S[Spec: rules to implement] --> A + A --> C[Code: implement the rule] +``` + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. ここに属するもの + +「決定の記録」(ADR)は、なぜその道を選び、ほかを選ばなかったかを説明する文書です。このフォルダには次が含まれます: + +| ID | ファイル | 目的 | 状態 | +|---|---|---|---| +| ADR-01 | [ADR-01_Integration_Repository_Placement.md](./ADR-01_Integration_Repository_Placement.md) | 統合コードの置き場:新設非公開リポジトリ、この公開リポジトリには置かない。 | 承認 2026-11-05 | +| ADR-02 | [ADR-02_Network_Model.md](./ADR-02_Network_Model.md) | ループバック別名 192.168.168.167 を廃止;Compose 内部ネットワークと 127.0.0.1 のみを使う。 | 承認 2026-11-05 | +| ADR-03 | [ADR-03_Staged_Security_Gate.md](./ADR-03_Staged_Security_Gate.md) | 門は M1 では報告のみ、M5 で CRITICAL/HIGH ゼロ+レッドチーム合格へ。 | 承認 2026-11-05 | +| ADR-04 | [ADR-04_AI_Autonomy_and_Roles.md](./ADR-04_AI_Autonomy_and_Roles.md) | AI は検出・修正・レビュー・試験;人はマージと公開。 | 承認 2026-11-05 | +| ADR-05 | [ADR-05_Test_IdP_for_Shibboleth.md](./ADR-05_Test_IdP_for_Shibboleth.md) | `--auth shibboleth` 用の同梱テスト IdP:`php:8.3-apache` 上の自前 SimpleSAMLphp イメージ、`mock-` 接頭辞の模擬属性。 | 提案 2026-11-06 | +| ADR-06 | [ADR-06_Wiki_Frontend_Overlay.md](./ADR-06_Wiki_Frontend_Overlay.md) | wiki-frontend は osf.io のオーバーレイ(`overlay_of`):重ねた木から束を組むイメージ(タグ `<osf の sha12>-<wiki の sha12>`)を `wiki_assets` が一度動かしてボリューム `wiki_static` へ写す。`wiki` サーバは無い。 | 提案 2026-11-06 | +| ADR-07 | [ADR-07_Native_Builds_of_EOL_Middleware.md](./ADR-07_Native_Builds_of_EOL_Middleware.md) | amd64 のイメージしか無い EOL ミドルウェアは、公式成果物からダイジェスト固定のベース上に両アーキテクチャ向けにネイティブで組む(`image_build`、MC-15)。まず Elasticsearch 2.4.6。エミュレーションでは起動に 38 分、ネイティブでは 5 秒(実機第 19 回)。 | 提案 2026-11-06 | +| ADR-08 | [ADR-08_Per_OS_Installer_Entry_Points.md](./ADR-08_Per_OS_Installer_Entry_Points.md) | Ubuntu・macOS・Windows の同意に基づく薄い前提条件スクリプト。どれも `install.sh` で終わる。`sudo` はここだけで認める。 | **承認 2026-11-13**(所有者) | +| ADR-12 | [ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md](./ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md) | PostgreSQL 9.6 → 18.6(ダイジェスト固定)。CAS が SCRAM に対応した JDBC ドライバーを持つまでホスト認証は md5。`grdm-dev db upgrade` は照合つきでダンプと復元を行い旧ディレクトリを残し、`db rollback` はそれを戻し、`up` は版の不一致を拒む(終了 15)。 | **承認 2026-11-13**(所有者) | +| ADR-13 | [ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md](./ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md) | 測定: osf.io の検索は ES 6.8 でも OpenSearch でも動かない。検索を切るには約 50 行のパッチが要る。mongo は sharejs にしか使われず、退役で失うのはそのファイルページの共同編集である。退役の手順。2026-11-10 の所有者の判断: 全文検索を保つ ES 8 への移植、ファイルページのエディタの y-websocket への移行。 | **承認 2026-11-13**(所有者) | +| ADR-14 | [ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md](./ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md) | Elasticsearch 8.19.24(公式イメージをダイジェストで固定、kuromoji と icu つき)が ES 2 に替わる。導入ごとの CA による TLS、認証、スクリプトなし、`website*` に限った利用者 `grdm_osf`、ポート非公開、tmpfs の `config/` を持つ読み取り専用ルート。ES 2 のデータは `invoke migrate_search` が作り直す。 | **承認 2026-11-13**(所有者) | + +予約済み・予定の番号(この木にはまだ記録が無い): + +| 番号 | トピック | +|---|---| +| ADR-09 | 予定: リポジトリのブランチ戦略 | +| ADR-10 | 予定: 道具版方針(Docker、Python、Node.js) | +| ADR-11 | 予定: オープンソースライセンスの互換性 | + +### 2. 新しい決定記録をつくるには + +1. ファイル名を `ADR-NN_<題>.md`(2 桁の番号、次に空いているもの)にする。 +2. [SPEC-06 文書規約](../spec/06_documentation_conventions.md)に従う。 +3. 文脈、検討した選択肢(複数ある場合は TOON 使用)、決定、理由を含む。 +4. 関連する方針と仕様へリンクする。 +5. 所有者が承認。 + +### 3. 決定記録が他の文書とどう関係するか + +```mermaid +flowchart TD + P[方針:立場] --> A[決定の記録:なぜこの道を選んだか] + S[仕様:実装するルール] --> A + A --> C[コード:ルールを実装] +``` + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Decision record (ADR) | A note explaining why we chose one way and not another. | なぜその道を選び、ほかを選ばなかったかのメモ。 | +| Context | The problem or situation that requires a decision. | 決定を必要とする問題や状況。 | +| Options considered | The alternatives evaluated before choosing one. | 選択する前に評価した代替案。 | +| Rationale | The reasoning behind the final decision. | 最終決定の背後にある推論。 | +| Policy | A statement of our position on what we will and will not do. | 我々が何をし、何をしないかの立場。 | diff --git a/docs/demo/20_core_install_mac_studio.md b/docs/demo/20_core_install_mac_studio.md new file mode 100644 index 0000000..0f907b1 --- /dev/null +++ b/docs/demo/20_core_install_mac_studio.md @@ -0,0 +1,1239 @@ +# DEMO-20 Core Install on Mac Studio / Mac Studio でのコア導入記録 + +> **Summary:** What actually happened when `./installer/install.sh --yes --no-open --profile core` was run on the Mac Studio (Apple Silicon). One entry per run; nothing is edited after the fact. +> **概要:** Mac Studio(Apple Silicon)で `./installer/install.sh --yes --no-open --profile core` を実行したときに実際に起きたこと。実行ごとに 1 節。後から書き換えない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.22 — 2026-11-13. **Learned:** code that was only unit-tested is not yet a fact about the stack: the stricter ZAP sign-in exception ran once on the live Mac Studio stack, where the probe inside the ZAP image worked and `web` was recorded as skipped behind sign-in while `admin` and `ember_osf_web` were scanned, and that run is the evidence the unit tests could not give (PR #56 review r2 asked for it). / 単体試験だけで確かめた処理は、まだスタックについての事実ではない。厳しくした ZAP のサインイン除外を、稼働中の Mac Studio のスタックで一度実行した。ZAP のイメージ内の探りは動き、`web` はサインインの壁の向こうとして飛ばされ、`admin` と `ember_osf_web` が検査された。単体試験が与えられなかった証拠はこの実行である(PR #56 レビュー r2 が求めた)。 + 0.21 — 2026-11-13. **Learned:** a tool row that reads `ok (3 targets)` is not a statement that three targets were scanned: under mandatory sign-in the earlier scan logic counted a skipped `web` as a scanned target, and the raw report of the complete scan is not committed, so the committed record cannot show per target what ZAP did; the correction says so, and the scan code now reports skipped targets separately (PR #56 review r1 R1-01). / `ok (3 targets)` と読める行は、三つの対象を検査したという主張ではない。必須サインインのもとでは、以前の検査の処理は飛ばした `web` を検査済みの対象に数えていた。完走した検査の生レポートはコミットしていないので、コミット済みの記録だけでは、ZAP が対象ごとに何をしたか示せない。この訂正はそれを述べ、検査の処理は対象外を別に報告するようになった(PR #56 レビュー r1 R1-01)。 + 0.20 — 2026-11-13. **Learned:** a candidate is proven again on the merge commits before it counts: the three pull requests merged under their own review, osf.io was pinned to the merged develop tip `90b10661c8dc`, the stack was rebuilt and brought up on it, and the same 14 of 14 and a complete scan (exit 0, 6,264 open findings) were recorded; the rebuild reused Docker's layer cache, so the 55-minute cold build time of 0.19 was not measured again. / 候補は、マージコミットでもう一度確かめて初めて数に入る。三つの PR がそれぞれのレビューを経てマージされ、osf.io をマージ後の develop 先端 `90b10661c8dc` に固定し、その上でスタックを組み直して起動し、同じ 14 件中 14 件と完走した検査(終了 0、未解決 6,264 件)を記録した。組み直しは Docker のレイヤーキャッシュを使ったので、0.19 のコールド 55 分は測り直していない。 + 0.19 — **Learned:** a candidate that combines unmerged pull requests proves the installer, not the pull requests: the first acceptance run found three defects that none of the unit tests or any single PR could show (a development server that stalls on Django 2.2, a CDN script the static ember names, a WaterButler that sends no CORS header), and the run that passes records exactly which commits it combined and that they are not pushed. / 未マージの PR を組み合わせた候補が証明するのは、PR でなくインストーラーである。最初の受入は、単体試験にも一つの PR にも見えない欠陥を三つ見つけた(Django 2.2 で止まる開発用サーバー、静的な ember が名指しする CDN のスクリプト、CORS ヘッダーを送らない WaterButler)。合格した実行は、組み合わせたコミットが何で、push されていないことを正確に記録する。 + 0.18 — 2026-11-11. **Learned:** an allow-list that only reproduces today's numbers is not yet safe. After exact package matching and the no-fix condition ([PR #45 review r1](../reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r1.md) R1-01), the same 177 findings are accepted, while a fix published later reopens its finding. Review r1 R1-03 also corrected the wiki-frontend pin in the 11-of-12 entry and the 0.17 summary. / 今日の件数を再現するだけの許容リストは、まだ安全ではない。パッケージの厳密な照合と修正版なしの条件([PR #45 レビュー r1](../reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r1.md) R1-01)の後も許容されるのは同じ 177 件だが、後から修正版が出た検出は再び数えられる。あわせてレビュー r1 の R1-03 により、12 件中 11 件の節の wiki-frontend の固定版と 0.17 の要約を訂正した。 + 0.17 — 2026-11-11. **Learned:** a fix proven on an unmerged head is proven again on its merge commit before it counts: the same 12 of 12 and the same Trivy totals at MFR `9771b8cf` show that the merge changed nothing (the whole scan has one more ZAP MEDIUM, 10,983 → 10,984). / 未マージの先頭で確かめた修正は、マージコミットでもう一度確かめて初めて数に入る。MFR `9771b8cf` で同じ 12 件中 12 件、同じ Trivy の件数になったことで、マージで何も変わっていないと分かる(検査全体では ZAP の MEDIUM が 1 件増え、10,983 → 10,984)。 + 0.16 — 2026-11-11. **Learned:** the narrowest fix for a broken hop is to stop changing the URL the other service built, not to teach the client a second origin: once MFR requests osf.io's `/<guid>/` URL unchanged again, osf.io answers the internal WaterButler URL itself, so previews pass with the credential pair unchanged. / 壊れた転送の最も狭い直し方は、相手のサービスが組み立てた URL を変えるのをやめることで、利用側に別の origin を教えることではない。MFR が osf.io の `/<guid>/` の URL を再び変えずに要求すると、osf.io 自身が内部向けの WaterButler の URL を返すので、資格情報の組を変えずにプレビューが通る。 + 0.15 — 2026-11-11. **Learned:** a service's own tests with a stubbed OSF cannot prove a hop that the real osf.io answers differently: the Python 3.13 MFR asks `/download/<guid>/`, whose redirect names the browser's WaterButler URL instead of the internal one, so only the full acceptance run on the real stack found that previews break; and a shared Docker disk that fills up turns build and scan steps into misleading errors ("not signed", ZAP rc 3). / OSF をスタブにしたサービス自身の試験では、本物の osf.io が違う答えを返す経路は証明できない。Python 3.13 の MFR は `/download/<guid>/` を要求し、そのリダイレクトは内部でなくブラウザ向けの WaterButler の URL を指すため、プレビューが壊れることは実スタックでの受入の全件実行で初めて分かった。また共有の Docker のディスクが満杯になると、ビルドや検査の手順は紛らわしいエラー(「not signed」、ZAP の rc 3)になる。 + 0.14 — 2026-11-10. **Learned:** "only its institution's users" is proven only when a user of another institution exists and is absent, so the cited run now seeds one and is a fresh 12-of-12 run (PR #40 review r1 R1-01). / 「自機関の利用者だけ」は、別機関の利用者が存在してかつ表示されないときに初めて示せる。そのため引用する実行を、それを種データに含む新しい 12 件中 12 件の実行に替えた(PR #40 レビュー r1 R1-01)。 + 0.13 — 2026-11-10. **Learned:** a security fix is proven only by a rejection case that runs against the image containing it, so the full acceptance run is repeated after every pin change. / セキュリティ修正は、その修正を含むイメージに対して拒否ケースを実行して初めて証明される。固定版を変えるたびに受入を全件やり直す。 + 0.12 — 2026-11-10. **Learned:** a stack that starts and passes health can still have a broken trust link: osf.io kept its upstream default HMAC key while WaterButler signed with a generated one, and only a real upload exposed it. / 起動してヘルス検査に通る環境でも、信頼の連携が壊れていることがある。osf.io は上流の既定の HMAC 鍵のまま、WaterButler は生成した鍵で署名しており、実際のアップロードで初めて露見した。 + 0.11 — 2026-11-06. **Learned:** the cold start passes once the one emulated service that could not start natively is built natively (ADR-07): 31 minutes from empty volumes to a scanned, reported environment, bounded by the ember build and the migrations. / ネイティブで起動できなかった唯一のエミュレーションのサービスをネイティブで組む(ADR-07)と、コールドスタートは通る。空のボリュームから検査・報告済みの環境まで 31 分で、上限は ember のビルドと migration。 + 0.10 — 2026-11-06. **Learned:** a warm success is not a cold-start success: with fresh volumes the emulated Elasticsearch 2 took 38 minutes to open its port and the database initialisation gave up; the same program on a native arm64 JRE starts in 5 seconds, so EOL amd64-only middleware must be built natively instead of emulated (review r1 of PR #33 asked for the cold start). / 温まった状態の成功はコールドスタートの成功ではない。新しいボリュームではエミュレーション下の Elasticsearch 2 がポートを開くまで 38 分かかり、データベース初期化が諦めた。同じプログラムは arm64 ネイティブの JRE で 5 秒で起動するので、amd64 しか無い EOL ミドルウェアはエミュレーションでなくネイティブで組む(PR #33 のレビュー r1 がコールドスタートを求めた)。 + 0.9 — 2026-11-06. **Learned:** the install command succeeds end to end on run 18; the scanners found what the staged gate (ADR-03) predicted for an EOL stack, so the number to beat at M4/M5 is now written down instead of guessed. / 第 18 回で導入コマンドが端から端まで成功した。スキャナーは段階化した門(ADR-03)が EOL スタックに予測したとおりの結果を出し、M4/M5 で下回るべき数が推測ではなく記録になった。 + 0.8 — 2026-11-06. **Learned:** after the images, the application layer fails for installer reasons that only a real start reveals — settings keys read at import, Compose's stdin and tmpfs semantics, a memory budget larger than the Docker VM, and a database that nobody initialised; and an unhandled 500 in osf.io's development server leaks a database connection. / イメージの後、アプリケーション層は実際に起動しないと分からないインストーラー側の理由で失敗する。import 時に読まれる設定キー、Compose の stdin と tmpfs の意味、Docker VM より大きいメモリ予算、誰も初期化していないデータベース。そして osf.io の開発サーバーの未処理の 500 はデータベース接続を漏らす。 + 0.7 — 2026-11-06. **Learned:** once every image builds, the next failures are per-image start-up facts under the hardening baseline and under Rosetta emulation; and a Docker Desktop bind directory lies about ownership (`chown` is a no-op, `test -w` fails, writes succeed), so a container must probe by doing, not by asking. / すべてのイメージが組めた後の失敗は、hardening 基準と Rosetta エミュレーションの下でのイメージごとの起動の事実である。また Docker Desktop の bind ディレクトリは所有権について嘘をつく(`chown` は無効、`test -w` は失敗、書込は成功)ので、コンテナは尋ねるのではなく実際に試して確かめなければならない。 + 0.6 — 2026-11-06. **Learned:** when a component is an overlay, its dependency manifest can drift from the base it is applied to; the base's new modules then fail to resolve inside the overlay's lock file, so SPEC-05 integration must diff the two manifests every week. / 部品がオーバーレイのとき、その依存一覧は重ねる先の基底からずれうる。基底が新しく使うモジュールはオーバーレイ側のロックファイルの中で解決できなくなるため、SPEC-05 の統合では毎週二つの一覧の差分を取らなければならない。 + 0.5 — 2026-11-06. **Learned:** a repository can be an overlay rather than a service; the installer must know the shape of each component (built, prebuilt, overlay) before it can build anything; and, independently, a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / リポジトリはサービスではなくオーバーレイであることがある。インストーラーは組む前に各部品の形(built・prebuilt・overlay)を知っていなければならない。また別に、用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.4 — 2026-11-06. **Learned:** a repository can be an overlay rather than a service; the installer must know the shape of each component (built, prebuilt, overlay) before it can build anything. / リポジトリはサービスではなくオーバーレイであることがある。インストーラーは組む前に各部品の形(built・prebuilt・overlay)を知っていなければならない。 +- Version / 版: 0.4 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 + 0.3 — 2026-11-06. **Learned:** CPU emulation can turn an EOL build into a silent hang rather than an error, so hung builds need an operator timeout and a prebuilt fallback until modernization. / CPU エミュレーションは EOL のビルドをエラーではなく無言のハングに変えうる。近代化までは、ハングしたビルドに操作者の打ち切りと配布済みイメージの代替が要る。 + 0.2 — 2026-11-05. **Learned:** emulation solves missing arm64 wheels but not a base image that current Docker refuses outright; that needs a prebuilt fallback until the Dockerfile is modernized. / エミュレーションは arm64 の wheel 不足を解くが、現行 Docker が取得そのものを拒むベースイメージには効かない。Dockerfile を近代化するまでは配布済みイメージの代替が要る。 + 0.1 — 2026-11-05. **Learned:** the first real run proved the stop-at-first-failure design and exposed that an EOL Python 3.5 image cannot be built for arm64, which the specifications had only predicted. / 最初の実行で「最初の失敗で止まる」設計が働くことと、EOL の Python 3.5 イメージは arm64 で組めないこと(仕様では予測だった)が実証された。 +- Normative source: [SPEC-02 Installer CLI](../spec/02_installer_cli.md) · [SPEC-04 Acceptance Tests](../spec/04_acceptance_tests.md) +- Related: [docs/demo/README.md](README.md) · [docs/status/README.md](../status/README.md) · [ADR-03 Staged Security Gate](../decisions/ADR-03_Staged_Security_Gate.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Run 1 — 2026-11-05, branch `feat/m2-installer` (PR #21, before review fixes) + +Host (from `grdm-dev doctor`): macOS 27.2, arm64 (the CPU type of Apple Silicon, the chips Apple puts in its Macs since 2020; see [REF-01](../reference/REF-01_Glossary.md)), 128 GiB memory, Docker (the tool that builds images and runs containers; see [REF-01](../reference/REF-01_Glossary.md)) 29.5.2, Compose 5.6.0, buildx (Docker's helper that builds one image for several kinds of computer; see [REF-01](../reference/REF-01_Glossary.md)) present. Supported, Docker OK. + +```toon +run1: + command: ./installer/install.sh --yes --no-open --profile core + env: GRDM_WITH_ACCEPT=1 + result: exit 30 (image build failed) + steps[5]{step,code,status}: + doctor,0,ok + plan,0,ok + "secrets init",0,ok + "compose render",0,ok + build,30,failed + images[3]{component,platform,status,note}: + osf.io,linux/arm64,built,"2.92 GB; Debian buster archive packages (EOL base)" + waterbutler,linux/arm64,built,1.28 GB + modular-file-renderer,linux/arm64,build-failed,"pip: no matching distribution for pandas==0.25.1 on Python 3.5 / arm64" +``` + +What this proves: + +- The bootstrap (`install.sh` → `.venv/` → `grdm-dev install`) works end to end on a clean macOS shell. +- The sequence stops at the first failing step and returns that step's exit code (30), as [SPEC-02 §2.1](../spec/02_installer_cli.md) requires; nothing was started. +- The EOL (end-of-life: no longer fixed by their makers; see [REF-01](../reference/REF-01_Glossary.md)) base images (see [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md)) are not only a security problem but a build problem on Apple Silicon. + +Decision taken: components whose base cannot be built for arm64 (modular-file-renderer, ember-osf-web, cas-overlay) get `build_platform: linux/amd64` in the manifest ([SPEC-01](../spec/01_manifest.md)) and run under emulation until M4 modernizes them. Run 2 will be recorded below after the review fixes land. + +### Run 2 — 2026-11-05, branch `feat/m2-installer` (after review fixes r1, commit 3149c76 + 1c2a925) + +Same host. Changes since run 1: `build_platform: linux/amd64` for modular-file-renderer, ember-osf-web and cas-overlay; two networks (`grdm` internal, `grdm-edge` publishing); PostgreSQL (the main database; see [REF-01](../reference/REF-01_Glossary.md)) 9.6 `auth-host=md5`. + +```toon +run2: + command: ./installer/install.sh --yes --no-open --profile core + result: exit 30 (image build failed) + steps[5]{step,code,status}: + "secrets init",0,"skipped (runtime/.env exists)" + doctor,0,ok + plan,0,ok + "compose render",0,ok + build,30,failed + images[4]{component,platform,status,note}: + osf.io,linux/arm64,built,cached from run 1 + waterbutler,linux/arm64,built,cached from run 1 + modular-file-renderer,linux/amd64,built,"emulated build succeeded (pandas 0.25.1 has an amd64 wheel)" + ember-osf-web,linux/amd64,build-failed,"base image quay.io/centerforopenscience/ember-base is a Docker manifest v2 schema 1 image; current Docker refuses to pull it" +``` + +What this proves: + +- `build_platform` works: the component that could not be built for arm64 in run 1 now builds under emulation. +- `secrets init` is idempotent (kept the existing `runtime/.env`), and re-rendering did not move ports. +- The ember-osf-web Dockerfile cannot be built at all with current Docker, independent of CPU. This is a defect of the EOL base, to be fixed in the integration repository at M4. + +Decision taken: add a documented, digest-pinned `prebuilt_image` fallback to the manifest ([SPEC-01](../spec/01_manifest.md)) for ember-osf-web until M4, using the distribution image the legacy guide relied on. Run 3 will be recorded below. + +### Run 3 — 2026-11-05/06, branch `feat/m2-installer` (after review fixes r2, with `prebuilt_image` for ember-osf-web) + +Same host (Docker via colima 29.5.2). Changes since run 2: ember-osf-web uses a digest-pinned `prebuilt_image`; run 1–2 images cached. + +```toon +run3: + command: ./installer/install.sh --yes --no-open --profile core + result: "exit 30 (image build failed) after the operator stopped a hung emulated build" + steps[5]{step,code,status}: + "secrets init",0,"skipped (runtime/.env exists)" + doctor,0,ok + plan,0,ok + "compose render",0,ok + build,30,failed + images[5]{component,platform,status,note}: + osf.io,linux/arm64,built,cached + waterbutler,linux/arm64,built,cached + modular-file-renderer,linux/amd64,built,cached + ember-osf-web,linux/amd64,prebuilt,"digest-pinned distribution image pulled as designed" + cas-overlay,linux/amd64,build-failed,"maven:3.3-jdk-8 Dockerfile; Maven build under qemu emulation produced no output for 8 h 08 m at 0% CPU; stopped by the operator (buildx exit 130)" +``` + +What this proves: + +- The `prebuilt_image` fallback works end to end: the digest-pinned reference is pulled for the component's platform, the build report row says `prebuilt`, and `compose render` writes that same reference as the service's `image:` (no local re-tagging). +- An EOL Java 8 / Maven 3.3 build under CPU emulation is not viable on this host: it hung rather than failed. The stop-at-first-failure rule still held (exit 30, nothing started). + +Decision taken: cas-overlay also uses a digest-pinned `prebuilt_image` (the distribution image's `linux/amd64` manifest) until M4 modernizes its Dockerfile; recorded in the manifest note. Run 4 will be recorded below. + +### Run 4 — 2026-11-06, develop after PR #28 (cas-overlay prebuilt) + +Same host. Changes since run 3: cas-overlay uses a digest-pinned `prebuilt_image`. + +```toon +run4: + command: ./installer/install.sh --yes --no-open --profile core + result: exit 30 (image build failed) + steps[5]{step,code,status}: + "secrets init",0,"skipped (runtime/.env exists)" + doctor,0,ok + plan,0,ok + "compose render",0,ok + build,30,failed + images[6]{component,platform,status,note}: + osf.io,linux/arm64,built,cached + waterbutler,linux/arm64,built,cached + modular-file-renderer,linux/amd64,built,cached + ember-osf-web,linux/amd64,prebuilt,cached pull + cas-overlay,linux/amd64,prebuilt,"digest-pinned distribution image pulled" + wiki-frontend,linux/arm64,build-failed,"Dockerfile COPYs addons/*/requirements.txt, admin/yarn.lock, website/... that exist only in the osf.io tree" +``` + +What this proves: + +- The cas-overlay fallback works; every remaining failure now comes from how a component is *shaped*, not from CPU or base-image age. +- wiki-frontend is not a standalone service: its repository holds only `website/static`, `addons/wiki`, webpack 5 configs and a Dockerfile derived from osf.io's. It is an overlay to be applied on the osf.io source tree and it produces a webpack bundle, not a runtime image. + +Decision taken: [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md). The manifest marks wiki-frontend as `overlay_of: osf.io`; `build` creates a merged context (osf.io checkout + overlay files) and builds a bundle-builder image; `compose render` adds a one-shot `wiki_assets` service that copies the bundle into a named volume mounted read-only by the osf.io services. The osf.io image itself stays built from its own Dockerfile. Run 5 is recorded below. + +### Run 5 — 2026-11-06, develop 9b1b643 (after PR #30, wiki-frontend as overlay) + +Same host. Changes since run 4: wiki-frontend is `overlay_of: osf.io` (ADR-06); `build` assembles the merged context and `compose render` adds `wiki_static_init` and `wiki_assets`. + +```toon +run5: + command: ./installer/install.sh --yes --no-open --profile core + result: exit 30 (image build failed) + steps[5]{step,code,status}: + "secrets init",0,"skipped (runtime/.env exists)" + doctor,0,ok + plan,0,ok + "compose render",0,"ok (fakecas port 8080 held by another process; 8081 chosen)" + build,30,failed + images[6]{component,platform,status,note}: + osf.io,linux/arm64,built,cached (356a997eb5fe) + waterbutler,linux/arm64,built,cached (e9b1ac266374) + modular-file-renderer,linux/amd64,built,cached (dac70e2209f9) + ember-osf-web,linux/amd64,prebuilt,cached pull + cas-overlay,linux/amd64,prebuilt,cached pull + wiki-frontend,linux/arm64,build-failed,"overlay context assembled; failed at Dockerfile step 85 of 86: webpack 5.93.0 stopped with 2 errors: osfHelpers.js and comment.js require linkify-html, absent from the overlay's package.json" +``` + +What this proves: + +- The overlay mechanism works up to the bundle step: the merged context (osf.io checkout + wiki-frontend files, wiki-frontend Dockerfile) is assembled, yarn installs from the overlay lock file, and webpack runs over the osf.io JavaScript. +- The remaining failure is an *integration drift* between two upstreams, not an installer defect: RDM-osf.io develop upgraded linkifyjs 2 → 4 and added linkify-html on 2026-11-01, while the wiki-frontend overlay's `package.json` / `yarn.lock` dated from 2025-06. Because the overlay's lock file wins, the osf.io code could not resolve the new module. + +Decision taken: the fix belongs in the integration repository RDM-wiki-frontend-dev2027 (PR #2: linkify-html and sift added; linkifyjs, bootstrap-datepicker, highlight.js and less aligned with osf.io develop; yarn.lock regenerated inside node:21-alpine). Verified before the PR: the same overlay context with the synced files built on this host with `docker buildx build --platform linux/arm64` (webpack 5.93.0, 0 errors, 4 warnings: 1 about the unset `mode`, 3 performance recommendations) and the image holds `website/static/public/js/wiki-edit-page.<chunkhash>.js`, which is what `wiki_assets` copies. After the merge, the manifest `integration_sha` was updated (PR #31) and runs 6–8 are recorded below. Lesson for [SPEC-05](../spec/05_upstream_tracking.md#english): an overlay's dependency manifest must be diffed against its base at every weekly integration. + +### Runs 6–8 — 2026-11-06, develop 757dc37 + PR #32 and PR #33 branches + +Same host. Three short runs, each stopping one step later than the one before. + +```toon +run6: + branch: develop 757dc37 (wiki-frontend integration_sha cd96330f after RDM-wiki-frontend-dev2027 PR #2) + command: ./installer/install.sh --yes --no-open --profile core + result: exit 40 (docker compose up exited 1) + build: "all six components passed for the first time (wiki-frontend overlay built; osf.io, waterbutler, mfr cached; ember and cas prebuilt)" + up: "`elasticsearch:2` pull failed: no matching manifest for linux/arm64" +run7: + branch: fix/infra-amd64-platform (PR #32: build_platform linux/amd64 on elasticsearch2, elasticsearch6, sharejs, unoconv, fakecas) + result: exit 40 (docker compose up exited 1) + up: "all nine infra images pulled (the five amd64-only ones under platform pinning); then the bind volumes failed to mount because this run was started from a worktree under /private/tmp, outside Docker Desktop's shared paths — an operator error, not an installer defect; torn down with `docker compose down -v`" +run8: + branch: fix/infra-amd64-platform, started from the main checkout + result: exit 40 (docker compose up exited 1) + up: "16 of 21 services created; postgres, mongo, rabbitmq, redis, elasticsearch6, fakecas, wb, wb_worker, mfr up; four failures below; web/api/admin/worker never started because they wait for wiki_assets" + failures[4]{service,symptom,cause,fix}: + wiki_assets,"exit 1: /wiki_static is not writable by 1000","Docker Desktop for macOS presents a bind directory as root:root, ignores `chown`, yet lets any uid write; `test -w` is therefore a false negative","real write probe (create and delete a marker file) instead of `test -w` (PR #33)" + cas,"restart loop: Could not create local repository at /root/.m2repo","the prebuilt distribution image starts `mvn jetty:run` with its Maven repository under /root (0700) and writes target/ at start; user 1000:1000 and read-only root block both","hardening exception for cas (user, read_only; no capability) until M4 bakes the war (PR #33)" + elasticsearch,"restart loop: runtime: failed to create new OS thread (have 2 already; errno=22)","gosu in the EOL elasticsearch:2 image is an old Go binary that aborts under Rosetta (Docker Desktop's amd64 emulation on Apple Silicon)","run as the image's elasticsearch user (uid 101) so the entrypoint skips chown and gosu; the exception shrinks to read_only only (PR #33)" + unoconv,"restart loop: chown: changing ownership of '/home': Operation not permitted","the entrypoint runs `chown -R www-data /home` as root with every capability dropped","CAP_CHOWN added to the unoconv exception (PR #33)" +``` + +What this proves: + +- The build stage is done for the core profile on Apple Silicon: six components, three built locally, two prebuilt, one overlay. +- `up` now fails only on how individual EOL images start under two constraints they were never written for: the hardening baseline (non-root, read-only, no capabilities) and amd64 emulation through Rosetta. Each failure is an image-specific fact recorded in `manifest/hardening.json` with a review date and a modernization target. +- Docker Desktop's file sharing changes the meaning of ownership tests inside containers; a probe must try the real operation. + +### Runs 9–12 — 2026-11-06, branch fix/run8-startup (PR #33), started from the main checkout + +Same host. Each run fixed what the previous one exposed; `build` passed every time (all cached). + +```toon +run9: + fixes_applied: "wiki_assets write probe; elasticsearch as uid 101; unoconv CAP_CHOWN; cas exception" + result: exit 40 (not healthy after 300s: web, api, admin, worker, ember_osf_web) + state: "17 of 21 up; wiki_assets exited 0 (bundle copied); web KeyError EXTERNAL_EMBER_APPS['preprints']; api/admin/worker `OSError: [Errno 25] Not a tty` from invoke's stdin thread; ember still building" +run10: + fixes_applied: "local.py gains preprints/reviews keys; stdin_open on web/api/admin/worker" + result: exit 40 (not healthy after 300s) + state: "web/api/worker `Read-only file system: /code/website/static/built/nodeCategories.json`; api/admin/worker `ModuleNotFoundError: debug_toolbar` (DEBUG_MODE=True imports a dev-only package the image lacks); ember OOM-killed twice at its 6.3 GiB limit; docker info shows the Docker VM has 47 GiB while the budget was scaled from the host's 128 GiB" +run11: + fixes_applied: "tmpfs on website/static/built; DEBUG_MODE=False; ember weight 4, 8 GiB floor, JOBS=2; two-pass memory scaling capped by the Docker VM; up timeout 900 s" + result: exit 40 (not healthy after 900s: web, api, admin, worker, ember_osf_web) + state: "web/api/admin/worker `PermissionError` on the same file: Compose's short `tmpfs` entry mounts 0755 root-owned (docker run --tmpfs gives 1777); ember building without OOM" +run12: + fixes_applied: "tmpfs entries rendered with :mode=1777" + result: exit 40 (not healthy after 900s: web, api, admin, ember_osf_web) + state: "worker healthy; web answers 500: `relation \"osf_institution\" does not exist` (fresh database, no migrations); each 500 leaked one postgres connection of the development server until `FATAL: too many clients already` (98 of 100 held by web); ember served HTTP 200 about 25 minutes after its start" +``` + +What this proves: + +- Everything below the osf.io application starts on Apple Silicon under the hardening baseline: 17 services up, both wiki one-shots exited 0 with the bundle in the volume. +- Three classes of defect were in the installer, not in the images: generated settings missing keys upstream code reads at import; Compose details (stdin, tmpfs mode, memory budget vs Docker VM); and the absence of a database initialisation step that upstream's README leaves to the operator. +- The osf.io development server leaks a database connection on every request that ends in an unhandled error; `max_connections=500` is a safety margin, the real fix is to make `/` not fail. + +Decisions taken (PR #33, [SPEC-02 §4 and §7](../spec/02_installer_cli.md#english)): a one-shot `osf_init` (migrate, institutions, OAuth scopes) that web/api/admin/worker wait for; ember-osf-web builds its `dist/` once into the named volume with a fingerprint of its URL settings and serves it with `ember serve --path` (first build 10–25 minutes under emulation, later starts seconds); ember's backend URLs come from the published loopback ports and `{{AUTH_URL}}`; `up` waits 900 s by default. Runs 13–18 are recorded below. + +### Run 13 — 2026-11-06, branch fix/run8-startup with `osf_init` + +```toon +run13: + result: exit 40 (docker compose up exited 1: service "osf_init" didn't complete successfully) + osf_init: "`manage.py migrate` and `scripts.populate_institutions -e test -a` succeeded at the first attempt (postgres and the emulated elasticsearch:2 were already up from run 12); `scripts.register_oauth_scopes` failed with `Read-only file system: /code/logs/register_oauth_scopes.py.<timestamp>.log` — scripts/utils.py adds a per-run file logger under /code/logs" + fix: "tmpfs /code/logs on osf_init, web, api, admin and worker (run 14)" +``` + +### Run 14 — 2026-11-06, with tmpfs /code/logs + +```toon +run14: + result: exit 40 (not healthy after 900s: web, api, admin, ember_osf_web) + osf_init: "exited 0 (migrate, institutions, OAuth scopes)" + web: "HTTP 500 on `/`: PROXY_EMBER_APPS forwards the root page to ember_osf_web, which was still building (ConnectionError to ember_osf_web:4200); one postgres connection held, no leak" + api_admin: "`DatabaseWrapper objects created in a thread can only be used in that same thread`, also without autoreload: api/base/wsgi.py monkey-patches gevent when website.settings.DEBUG_MODE is False (set so in run 11 to avoid debug_toolbar); SECURE_MODE = not DEBUG_MODE would also have switched the servers to TLS had local.py not pinned it to False" + fix: "DEBUG_MODE back to True; Django DEBUG = False per project through api_local.py and a new admin_local.py (mounted at admin/base/settings/local.py); health probes web at /login/, which renders without ember (run 15)" +``` + +### Run 15 — 2026-11-06, DEBUG_MODE restored, per-project DEBUG off, web probed at /login/ + +```toon +run15: + result: "exit 40 — `up` passed (0, ok) for the first time; `health --network` failed (40): not healthy web/api/admin, see below" + ember_osf_web: "served HTTP 200 about 13 minutes after its start (dist built into the volume); web `/` then answered 200 as well" + api: "the running container kept the failed process from run 14 because only a mounted file changed (Compose recreates nothing); after `docker restart` it answered 302 on `/`" + admin: "still `ModuleNotFoundError: debug_toolbar`: admin/base/settings/defaults.py appends debug_toolbar and nplusone to INSTALLED_APPS and MIDDLEWARE at import, reading DEBUG_MODE before local.py runs, so `DEBUG = False` alone is too late; then `400 DisallowedHost` for 127.0.0.1" + fix: "admin_local.py strips the two apps and middlewares and adds 127.0.0.1/localhost/admin to ALLOWED_HOSTS; after re-render and restart admin answered 302 (run 16 is the clean run)" +``` + +### Run 16 — 2026-11-06, clean run with every fix: `up` passes without manual repairs + +```toon +run16: + command: ./installer/install.sh --yes --no-open --profile core + result: exit 40 (stopped at `health --network`) + steps[7]{step,code,status}: + "secrets init",0,"skipped (runtime/.env exists)" + doctor,0,ok + plan,0,ok + "compose render",0,"ok (memory budget uses the Docker VM's 47.0 GiB, not the host's 128.0 GiB; ember and fakecas keep their ports)" + build,0,"ok (all cached)" + up,0,"ok — ready: http://127.0.0.1:5000/ (22 services; the three one-shots exited 0)" + "health --network",40,"failed: `ControlCe listens on *:5000 (not loopback; project port, owner not visible)`" +``` + +What this proves: + +- The core profile starts end to end on Apple Silicon under the hardening baseline, and `up` declares it ready on the loopback URL. Milestone M2's "one command" now reaches the application. +- The `--network` check found a wildcard listener on port 5000 that is not ours: macOS's AirPlay Receiver (ControlCenter) binds `*:5000` and `*:7000`; our `web` is bound to `127.0.0.1:5000` beside it and answers (the kernel prefers the specific address). The check treated any non-loopback listener on a project port as a failure. + +Decision taken: `health --network` keeps failing for listeners that belong to Docker (our published ports leaking to a non-loopback address, [ADR-02](../decisions/ADR-02_Network_Model.md)) and for a wildcard listener on a project port whose owner is not visible (fail closed); a *named* foreign process on a project port is reported as a warning row (`foreign-listener`) so the operator can move the port with `GRDM_PORT_<SERVICE>` if they want to. Run 17 is recorded below. + +### Run 17 — 2026-11-06, foreign listeners reported as warnings: `up` and `health --network` pass, `scan` starts + +```toon +run17: + command: ./installer/install.sh --yes --no-open --profile core + result: exit 51 (stopped at `scan`: semgrep not found on PATH) + steps[8]{step,code,status}: + "secrets init",0,"skipped (runtime/.env exists)" + doctor,0,ok + plan,0,ok + "compose render",0,ok + build,0,"ok (all cached)" + up,0,"ok — ready: http://127.0.0.1:5000/" + "health --network",0,"ok with one warning: foreign-listener ControlCe on *:5000 (macOS AirPlay Receiver)" + scan,51,"failed: semgrep not found on PATH; trivy 0.75.0 scanned 25 targets first" + trivy_findings[4]{severity,count}: + CRITICAL,1894 + HIGH,8620 + MEDIUM,10047 + LOW,3955 + trivy_problems: "sbom/scan of src/RDM-cas-overlay-dev2027 rc 1 (prebuilt component, no checkout); sbom/scan of the repository rc 1" +``` + +What this proves: + +- The first two gates of M2 are passed on the real host: one command brings the core profile up and the loopback-only rule holds. +- The vulnerability count of the EOL images (Python 3.5/3.6, node 8/12, JDK 8, ES 2/6, mongo 3.4) is what [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) expected for M1–M3: report and allow-list now, HIGH stops at M4, zero CRITICAL/HIGH at M5. +- `scan` has two defects of its own: Semgrep (a tool that reads source code looking for dangerous patterns; see [REF-01](../reference/REF-01_Glossary.md)) is not installed by the bootstrap although SPEC-03 runs it locally, and Trivy (a scanner that reads our images and lists the holes it knows about; see [REF-01](../reference/REF-01_Glossary.md)) is pointed at a source directory that a prebuilt component never clones. + +Decision taken: the bootstrap installs Semgrep into the same `.venv` as `grdm-dev` and `scan` looks for tools next to its own interpreter; Trivy skips the source directory of prebuilt components and reports why a target was skipped. Run 18 is recorded below (exit 0). + +### Run 18 — 2026-11-06, Semgrep in `.venv`, Trivy offline and target-aware: **the whole command succeeds** + +```toon +run18: + command: ./installer/install.sh --yes --no-open --profile core + result: exit 0 — "GakuNin RDM developer environment is ready: http://127.0.0.1:5000/" + steps[9]{step,code,status}: + "secrets init",0,"skipped (runtime/.env exists)" + doctor,0,ok + plan,0,ok + "compose render",0,"ok (ports kept; memory budget from the Docker VM's 47.0 GiB)" + build,0,"ok (all cached)" + up,0,"ok — 22 services, ready on the loopback URL" + "health --network",0,"ok (warning: foreign-listener ControlCe on *:5000)" + scan,0,"ok — gate report-only: pass" + report,0,ok + scan_tools[4]{tool,version,targets,result}: + trivy,0.75.0,22,"ok (skipped: stale checkouts of the prebuilt cas-overlay and ember-osf-web, the assembled _overlay/ context)" + semgrep,1.184.0,4,ok + gitleaks,8.30.1,1,ok + zap,stable,3,ok + findings_by_severity[5]{severity,trivy,zap,total}: + CRITICAL,1835,0,1835 + HIGH,8290,1,8291 + MEDIUM,9763,9,9772 + LOW,3886,13,3899 + INFO,0,5,5 + milestone_in_report: "M1 — manifest/milestone.json is owner-maintained (SPEC-03 §5.2) and still says M1; the gate rule is report-only either way" + allow_list: "0 entries, 0 allow-listed; 10126 findings over the M4 threshold (HIGH or above) are reported, not blocking, at M2" +``` + +What this proves: + +- **M2's one-command install works on the Mac Studio**: eighteen runs after the first attempt, `./installer/install.sh --yes --no-open --profile core` goes from a clean shell to a ready URL, through the loopback check, the scanners and the report, with exit 0. +- Every stop between run 1 and run 18 was a fact about an EOL image or an installer detail that only a real start could reveal; each is recorded above with its fix and its document. +- The vulnerability baseline of the EOL stack is now measured: Trivy alone reports 1835 CRITICAL and 8290 HIGH findings (ZAP adds 1 HIGH), almost all from the images (Python 3.5/3.6, node 8/12, JDK 8, Elasticsearch 2/6, mongo 3.4). This is the number M4 and M5 must drive to zero; the allow-list stays empty rather than hiding it. + +Next on M2: the Playwright (a tool that drives a real browser to test web pages; see [REF-01](../reference/REF-01_Glossary.md)) acceptance suite (C1–C6) against this running stack, and the osf.io wiki editor page wiring (C4) in RDM-osf.io-dev2027. + +### Run 19 — 2026-11-06, cold start after the review-r1 fixes (volumes removed, `runtime/` recreated) + +```toon +run19: + preparation: "`docker compose down -v`; runtime/ moved aside (images kept)" + command: ./installer/install.sh --yes --no-open --profile core + result: exit 40 (docker compose up exited 1: service "osf_init" didn't complete successfully) + steps[6]{step,code,status}: + doctor,0,ok + plan,0,ok + "secrets init",0,"ok (new runtime/.env)" + "compose render",0,"ok (fakecas 8080 busy → 8081; budget from the 47 GiB VM)" + build,0,"ok (all cached)" + up,40,"failed after 11 minutes" + one_shots[4]{service,result}: + elasticsearch_data_init,"exited 0 (chown 101:101; on Docker Desktop the chown is a no-op and the directory is writable anyway)" + wiki_static_init,"exited 0" + wiki_assets,"exited 0 (bundle copied)" + osf_init,"exited 1: migrate ran all migrations on the empty database; populate_institutions then failed 30 times in 5 minutes — Elasticsearch 2 refused connections" + elasticsearch2: "the container was running at 200 % CPU but had not opened port 9200: the EOL elasticsearch:2 image (JDK 8, linux/amd64) under Rosetta logged `initializing ...` at 03:31:52 and `started` at 04:09:57 — 38 minutes of start-up" + native_trial: "the official elasticsearch-2.4.6 tarball (27.3 MB, sha256 5f7e4bb7…cfc6f) on an arm64 eclipse-temurin:8-jre container: `initialized` and `started` 5 seconds after launch" +``` + +What this proves: + +- The cold start exposes the one remaining emulation cost that no timeout can hide: a JDK 8 service under Rosetta takes about 40 minutes to initialise, every time its data directory is new, and the whole stack waits for it. +- Run with a native arm64 JRE the same Elasticsearch 2.4.6 starts in seconds; the problem is the x86-64 image, not the program. + +Decision taken: for this PR, `osf_init` waits up to 30 minutes for Elasticsearch and ember-osf-web no longer depends on web/api, so its own long build runs in parallel; run 20 continued the same cold start and passed `up` (below). For the next PR: build a multi-architecture `grdm-dev/elasticsearch2` image from the official tarball on a digest-pinned Temurin 8 JRE (checksum verified, non-root, no owner-init container) and record the rule in an ADR — EOL middleware that only ships amd64 images is built natively for arm64 until the milestone that retires it. + +### Run 20 — 2026-11-06, the same cold start continued once Elasticsearch had started + +```toon +run20: + command: ./installer/install.sh --yes --no-open --profile core + result: exit 51 (stopped at `scan`: semgrep incomplete) + steps[8]{step,code,status}: + "secrets init",0,"skipped (runtime/.env from run 19)" + doctor,0,ok + plan,0,ok + "compose render",0,ok + build,0,"ok (cached)" + up,0,"ok — ready: http://127.0.0.1:5000/ on the fresh volumes: osf_init completed (migrations already applied in run 19, institutions imported once Elasticsearch answered), ember built its dist into the new volume" + "health --network",0,"ok (warning: foreign-listener ControlCe on *:5000)" + scan,51,"semgrep reported 148 errors: per-file rule timeouts (default 5 s) — all of them in `runtime.run18-123040/`, the run-18 runtime moved aside inside the repository for this cold start (only `runtime/` was git-ignored, and Semgrep follows .gitignore); the scan is marked incomplete and the gate fails closed" + rerun_after_fix: "`grdm-dev scan` and `grdm-dev report` on the same stack after moving that directory out of the repository, adding `runtime.*/` to .gitignore and letting Semgrep treat rule timeouts as coverage warnings: scan exit 0 (gate report-only: pass; trivy/semgrep/gitleaks/zap all ok; the same 1835/8291/9772/3899/5 totals as run 18), report exit 0" +``` + +What this proves: + +- With Elasticsearch finally up, the cold start completes through `up` and the loopback check: the database initialisation, the wiki bundle and the ember build all work from empty volumes. +- The cold start therefore completes end to end: `up`, `health --network`, `scan` and `report` all exit 0 on fresh volumes once Elasticsearch has started. The `scan` stop was self-inflicted (an operator's copy of `runtime/` inside the repository) and exposed two hardening points that are now in place: `runtime.*/` is ignored, and a Semgrep rule timeout is recorded as a coverage warning instead of failing the gate closed. + +### Run 21 — 2026-11-06, cold start with the native Elasticsearch 2 image (ADR-07): **30 minutes from empty volumes to ready, exit 0** + +```toon +run21: + preparation: "`docker compose down -v`; runtime/ moved out of the repository (images kept); branch feat/native-elasticsearch2-image on develop f37a029" + command: ./installer/install.sh --yes --no-open --profile core + result: exit 0 — "GakuNin RDM developer environment is ready: http://127.0.0.1:5000/" (04:53:51 → 05:24:34 UTC, 30 min 43 s) + steps[9]{step,code,status}: + doctor,0,ok + plan,0,ok + "secrets init",0,"ok (new runtime/.env)" + "compose render",0,ok + build,0,"ok — grdm-dev/elasticsearch2:2.4.6-1 built natively from installer/images/elasticsearch2 (cached layers), the rest cached" + up,0,"ok — containers created 04:54:40; elasticsearch `started` 04:54:49 (6 s after its container started); osf_init exited 0 at 04:59:45 (all migrations + institutions + OAuth scopes, 5 min); web/api/admin/worker started 04:59:46; ember served at 05:18:54 (24 min build, in parallel)" + "health --network",0,"ok (warning: foreign-listener ControlCe on *:5000)" + scan,0,"ok — gate report-only: pass; trivy 22 targets, semgrep 4, gitleaks 1, zap 3; no timeouts" + report,0,ok + trivy_totals_vs_run_18[4]{severity,run18_trivy,run21_trivy}: + CRITICAL,1835,1769 + HIGH,8290,8030 + MEDIUM,9763,9550 + LOW,3886,3676 + elasticsearch2_image: "grdm-dev/elasticsearch2:2.4.6-1 — 58 findings on the image (2 HIGH, 52 MEDIUM, 4 LOW) from the Elasticsearch 2.4.6 jars and the Temurin 8 base, plus 1 LOW on the recipe file installer/images/elasticsearch2/Dockerfile; the Docker Hub elasticsearch:2 image it replaces carried the bulk of the difference above" +``` + +What this proves: + +- A **cold start works end to end**: with nothing but the images cached, one command reaches a ready, scanned, reported environment in 31 minutes on Apple Silicon. The remaining wall time is the ember build (24 min, now in parallel) and the osf.io migrations (5 min). +- The native Elasticsearch 2 starts in 6 seconds where the emulated one needed 38 minutes (run 19), runs as uid 1000 on a read-only root with no hardening exception and no owner-init container, and carries fewer known vulnerabilities than the official amd64 image. +- Milestone M2's install criterion ([status board](../status/README.md#english)) is met on the Mac Studio for the core profile, warm and cold. What remains for M2 is the Playwright acceptance. + +Evidence (run 1): full log kept in the session scratchpad only (contains package download noise, no secrets). The `runtime/` directory on the Mac Studio holds `.env` (0600), the rendered Compose file and two built images; it is git-ignored. + +### Acceptance runs — 2026-11-09/10, stack of run 22 (osf.io 389415a4) + +| Run id | Scope | Result | +|---|---|---| +| [`acc-20261109T131214Z-f2ee77`](runs/acc-20261109T131214Z-f2ee77/results.toon) | C1 | 2 of 2 pass | +| [`acc-20261109T131240Z-00dff9`](runs/acc-20261109T131240Z-00dff9/results.toon) | Core C1–C6 | 3 of 12 pass | +| [`acc-20261109T170208Z-9ebf01`](runs/acc-20261109T170208Z-9ebf01/results.toon) | C3 after the HMAC fix | 2 of 2 pass | + +What the runs found: + +- **Login.** Seeded users had `have_email=False`, so GRDM redirected them to the e-mail settings page and the dashboard never loaded. The seed now sets it to true. +- **Upload (C3, C5).** WaterButler received 401 from every signed callback to web. `/api/v1/files/auth/` answered 200, so the JWE/JWT link was fine. Measured by hash of the values: web's `DEFAULT_HMAC_SECRET` was still the upstream default `changeme`, while WaterButler signed with generated keys, two different ones. osf.io has one verifier, so both WaterButler signers and osf.io now use `WATERBUTLER_HMAC_SECRET`, and `OSFSTORAGE_HMAC_SECRET` is no longer generated. This also removes a weakness: with the default key, anyone able to reach web could forge a callback. +- **External assets.** Known assets stay blocked and are only counted ([SPEC-04](../spec/04_acceptance_tests.md#english)). Google Analytics is removed from the built ember configuration. + +Open after these runs: C2, C4, C5 and C6 still fail (selectors, wiki bundle wiring, preview, admin path). + +### Acceptance run — 2026-11-10, every merged security fix, 12 of 12 + +Run [`acc-20261110T015520Z-ab4cc7`](runs/acc-20261110T015520Z-ab4cc7/results.toon): **12 of 12 pass**. The stack was built from the pins in this branch (osf.io `fe90e5c3`, WaterButler `45e97a51`, MFR `749e58d3`, wiki-frontend `5985d18b`, y-websocket `d4d1cfae`, cas-overlay `22610b76`), after `secrets rotate` added the keys the new CAS and conversion service need. + +| Scenario | Success | Rejection | What made it pass | +|---|---|---|---| +| C1 Login | pass | pass (401) | seed `have_email` | +| C2 Project | pass | pass (403) | selectors | +| C3 Files | pass | pass (403) | one HMAC key for WaterButler and osf.io | +| C4 Wiki | pass | pass (4401) | JWT on the y-websocket upgrade, token refresh in the client, bundle path in `edit.mako` | +| C5 Preview | pass | pass (401) | MFR forwards credentials only on the OSF→WaterButler hop; Google Analytics removed from the PDF viewer | +| C6 Admin | pass | pass (403) | admin assets served locally, so no CDN request; an affiliated institution admin sees a member of its institution, and neither an unaffiliated user nor a user of a second institution, in the list and in an explicit search | + +One run before this one failed on C5 and C6 although the fixes were merged: `compose render` had run before `build`, and it takes image tags from the last build record, so the old images kept running. Rendering again after the build fixed it. + +### Acceptance run — 2026-11-11, Python 3.13 WaterButler and MFR on PostgreSQL 18, 11 of 12 + +Started from the main checkout on `feat/pin-py313-wb-mfr`. Pins: WaterButler `3319c106` and MFR `f9da1db3` (both on `python:3.13-slim@sha256:e48f59cd…ed90`, Python 3.13.18, Debian 13), osf.io `8fc45de4`, wiki-frontend `5985d18b` (built on the osf.io base `8fc45de4`, image tag `8fc45de461fd-5985d18b75da`), y-websocket `d4d1cfae`, cas-overlay `22610b76`, PostgreSQL 18.6. MFR is now built natively for arm64 (`build_platform` removed) and without freecad, so CAD previews (.step/.stp) are removed by owner decision. + +| Step | Exit | Result | +|---|---|---| +| `db upgrade` | 0 | PostgreSQL 9.6 → 18 by dump and restore (4.8 MB dump, 531 objects compared equal); the old directory is kept as `postgres_data.pg9.6-20261111T111040Z` | +| `build` | 30 | First try: WaterButler's `apt-get upgrade` failed with "not enough free space": the Docker disk shared with other work on this host was full. Superseded `grdm-dev/*` tags of earlier pins were removed (no build cache was pruned). Second try built osf.io, WaterButler, MFR, cas-overlay, wiki-frontend and y-websocket; elasticsearch2 then failed in `apt-get update` ("not signed", the same full disk). Its existing image, built on 2026-11-10 from inputs unchanged since 2026-11-06, was used. | +| `compose render` after `build` | 0 | no stale build tags | +| `up` | 0 | 24 services healthy; `wb` and `wb_worker` run as uid 1000 (user `waterbutler`), `mfr` as uid 1000; the Celery 5.6.3 worker is ready. No new secret was needed, and the templates and `wb.env`/`mfr.env` are unchanged. | +| `accept --seed --only core` | 60 | Run [`acc-20261111T115949Z-ab529c`](runs/acc-20261111T115949Z-ab529c/results.toon): **11 of 12 pass**; C5 success fails (below) | +| `scan` | 51 | Trivy, Semgrep and gitleaks complete; baseline pass; ZAP produced no report (rc 3) for all three targets while the Docker disk had 0 bytes free | +| `report` | 0 | | + +**C5 success (preview) fails in the integration repositories, not in the installer.** MFR answered 400 for the render request. MFR's log shows `ClientConnectorError: Cannot connect to host 127.0.0.1:7777`, and web's log shows the request MFR now makes: `GET /download/<guid>/?direct&mode=render&action=download` from the MFR container, answered 302. MFR `f9da1db3` (taken from upstream #9) rewrites an OSF URL of the form `/<guid>/` to `/download/<guid>/`. In osf.io `8fc45de4`, the route `/<guid>/` builds the WaterButler URL with `_internal=(mode == 'render')`, so MFR received `http://wb:7777`. The route `/download/<guid>/` (`persistent_file_download`) builds it without `_internal`, so MFR receives the browser's `WATERBUTLER_URL` (`http://127.0.0.1:7777`), which is unreachable inside the container and is also not a credential target. The fix belongs to MFR (do not rewrite render URLs for GRDM) or to osf.io (`persistent_file_download` honours `mode=render` like the other route). C5 rejection (401) still passes. + +Trivy CRITICAL/HIGH per target (`critical/high`): + +```toon +trivy_critical_high: + db: "2026-11-10 19:01 UTC (before: scan_20261110T022540Z, DB 2026-11-10 01:02 UTC)" + targets[23]{target,before,after,note}: + waterbutler,13/178,0/47,"45e97a51 → 3319c106; all 47 Debian 13 without a fix, allow-listed" + modular-file-renderer,53/410,3/127,"749e58d3 → f9da1db3; all 130 Debian 13 without a fix, allow-listed" + osf.io,118/566,118/566,"fe90e5c3 → 8fc45de4" + wiki-frontend,65/332,65/332,"" + rdm-ember-osf-web,407/1911,407/1911,prebuilt + cas-overlay,43/105,43/105,"" + postgres,11/117,2/147,"9.6 → 18.6 (Debian 13)" + unoconv,1/100,1/156,"same image, newer DB" + redis,1/37,1/37,"" + elasticsearch2,5/18,5/18,"" + elasticsearch6,2/50,2/50,"" + rabbitmq,0/7,0/7,"" + mongo,0/2,0/2,"" + fakecas,0/2,0/2,"" + sharejs,0/0,0/0,"" + y-websocket,0/0,0/0,"" + src/RDM-waterbutler-dev2027,2/32,0/0,lockfiles + src/RDM-modular-file-renderer-dev2027,14/79,0/0,lockfiles + src/RDM-osf.io-dev2027,55/279,55/279,lockfiles + src/RDM-wiki-frontend-dev2027,21/107,21/107,lockfiles + src/RDM-cas-overlay-dev2027,6/20,6/20,lockfiles + src/RDM-y-websocket-dev2027,0/0,0/0,lockfiles + repo,0/30,0/30,"" + total: "817/4382 → 729/3943 (open 726/3769, allow-listed 3/174 by 58 entries)" +``` + +The allow-list now holds 58 entries (one per image and CVE, scoped with the new `image` field of [SPEC-03 §5.1](../spec/03_security_gate.md#english), review date 2026-12-31). The milestone is M1 (report-only), so the count is reported; the ceiling in `manifest/allowlist.baseline.json` is the owner's decision at the milestone exit. + +### Acceptance run — 2026-11-11, MFR fix for previews, 12 of 12 + +Same host, branch and pins as the run above, except MFR: the main checkout's manifest was pointed, locally and uncommitted, at `2c4a88a6`, the head of RDM-modular-file-renderer-dev2027 PR #7. That commit stops rewriting osf.io's `/<guid>/?direct&mode=render&action=download` to `/download/<guid>/` and requests the URL as osf.io built it, so osf.io's `/<guid>/` route answers the internal WaterButler URL (`_internal=True` for `mode=render`). The credential pair stays `http://web:5000` → `http://wb:7777`. Its tests also show that the browser-facing `127.0.0.1:7777`, `localhost`, lookalike hosts and other ports are refused before any request or get no credentials. The committed pin stays `f9da1db3` until PR #7 merges. Its merge commit is then pinned. + +The Docker disk had been enlarged to 400 GiB (193 GB free before the run). + +| Step | Exit | Result | +|---|---|---| +| `compose render` | 0 | | +| `build` | 0 | MFR built natively at `2c4a88a663ca`; the other components from cache, elasticsearch2 rebuilt | +| `compose render` after `build` | 0 | no stale build tags | +| `up` | 0 | 24 services healthy; `mfr` runs `grdm-dev/modular-file-renderer:2c4a88a663ca` | +| `accept --seed --only core` | 0 | Run `acc-20261111T122608Z-2d3599`: **12 of 12 pass**. The evidence directory stays local and is not committed in this PR. C5 success answers 200, and C5 rejection still answers 401. web's log shows MFR requesting `GET /<guid>/?direct&mode=render&action=download` (302), and MFR's log has no `ClientConnectorError`. | +| `scan` | 0 | All five parts complete: baseline pass, and Trivy, Semgrep, gitleaks and ZAP ok. ZAP produced reports again for its three targets. Gate: report-only, pass | +| `report` | 0 | | + +Scan totals (`scan_20261111T123133Z`): 10,983 findings, of which 726 CRITICAL, 3,782 HIGH, 4,147 MEDIUM, 2,322 LOW and 6 INFO; 177 more are allow-listed by the 58 entries. Trivy CRITICAL/HIGH open: 726/3,769, unchanged from the run above. The MFR change is code only and adds no package. Semgrep: 12 HIGH. gitleaks: 0. ZAP: 1 HIGH, 8 MEDIUM, 12 LOW, 6 INFO. + +Before this, C5 was reproduced on the unfixed MFR `f9da1db3` (run `acc-20261111T121734Z-7329b7`, C5 only: success 400, rejection 401), with the same log lines as the run above. + +### Acceptance run — 2026-11-11, MFR pinned at the merge of PR #7, 12 of 12 + +RDM-modular-file-renderer-dev2027 PR #7 merged as `9771b8cf`. Its tree is identical to the head `2c4a88a6` used above. The manifest now pins MFR at `9771b8cf`, and the note no longer says the fix is unmerged. The other pins are unchanged. + +| Step | Exit | Result | +|---|---|---| +| `compose render` | 0 | | +| `build` | 0 | MFR built natively at `9771b8cfb352` | +| `compose render` after `build` | 0 | no stale build tags | +| `up` | 0 | 24 services healthy; `mfr` runs `grdm-dev/modular-file-renderer:9771b8cfb352` | +| `accept --seed --only core` | 0 | Run [`acc-20261111T132104Z-530071`](runs/acc-20261111T132104Z-530071/results.toon): **12 of 12 pass**. C5 success returns 200 and C5 rejection 401. gitleaks found nothing in the run folder, so it is committed. | +| `scan` | 0 | `scan_20261111T132607Z`: baseline pass; Trivy (23 targets), Semgrep, gitleaks and ZAP (3 targets) ok; gate report-only, pass | +| `report` | 0 | | + +Scan totals: 10,984 findings, of which 726 CRITICAL, 3,782 HIGH, 4,148 MEDIUM, 2,322 LOW and 6 INFO. A further 177 are allow-listed by the 58 entries. By tool: Trivy 726/3,769/4,139/2,310 (CRITICAL/HIGH/MEDIUM/LOW), Semgrep 12 HIGH, gitleaks 0, ZAP 1 HIGH, 9 MEDIUM, 12 LOW and 6 INFO. These are the same as the run above, except for one more ZAP MEDIUM. + +**After PR #45 review r1 (same stack, 2026-11-11 14:18 UTC).** The allow-list matcher was changed (R1-01). Each of the 58 entries now names the exact `name@version` packages of its image, taken from the raw Trivy reports. A Trivy finding is accepted only while its `FixedVersion` is empty and its `Status` is a no-fix status, and only for the OS packages of that image. `scan` and `report` were run again, and both exited 0. `scan_20261111T141804Z` has the same totals as above: 10,984 open findings and 177 allow-listed, matched by all 58 entries. Replaying the stored reports `20261111T132241Z` through the new matcher gives the same 177. The new unit tests show that the old matcher accepted a fixed version, an unrelated package and a name prefix. + +### Acceptance run — 2026-11-12, local osf.io candidate with Elasticsearch 8, y-websocket only, mandatory sign-in and the admin second factor, 14 of 14 + +Stack: the installer at branch `feat/installer-osf-integration` on the Mac Studio (project `grdm-dev`, Colima), from the previous pins and PostgreSQL 18. osf.io is a **local candidate, not a pushed commit**: RDM-osf.io-dev2027 develop `73ff43b3c2` (with #13 Django 2.2, #12 y-websocket editor, #14 render URL) merged with the heads of the open PR #8 (mandatory sign-in, `c9d293dd1a`), #10 (admin two-step sign-in, `834d1b62c0`) and #11 (Elasticsearch 8, `b4bc134188`); conflicts resolved by hand in `admin/common_auth/urls.py`, `admin/base/settings/defaults.py`, `api/base/authentication/backends.py`, `website/search/views.py`, `api/search/views.py`, `website/search/elastic_search.py` and `.github/scripts/ci/run-tests.sh`, which the three PRs will meet again when they are rebased). The manifest pins it at `9e1fb9c8597d` (served through a local bare mirror and `GIT_CONFIG_*` `url.<mirror>.insteadOf`; the installer has no local-source mechanism and gained none). y-websocket `97252369cf` (PR #5) and ember-osf-web `4180cb58bb` (PR #2, #3) are real merge commits. + +| Step | Exit | Result | +|---|---|---| +| `secrets rotate` | 40 | Rolled back by design: the old stack's former ember image did not become healthy in 300 s while the builds ran, so the old `runtime/.env` was restored; this is why `secrets init --missing` was added | +| `secrets init --missing` | 0 | Added `ELASTIC8_PASSWORD` and `ELASTIC8_OSF_PASSWORD`, dropped `SHAREJS_SECRET`; no other value changed | +| `compose render` | 0 | | +| `build` | 0 | osf.io `9e1fb9c8597d` (about 55 min cold: `scipy` and friends compile on Alpine 3.9), y-websocket, ember-osf-web (static nginx), wiki-frontend overlay `9e1fb9c8597d-5985d18b75da`, `elasticsearch8:8.19.24-1` | +| `compose render` after `build` | 0 | no stale build tags | +| `up` | 0 | 23 services healthy; `elasticsearch8` healthy in 25 s; `osf_init` applied the merge migrations and `addons_twofactor` 0006/0007 and wrote the institutions into Elasticsearch 8; the sharejs, mongo and Elasticsearch 2 containers were removed as orphans | +| `accept --seed --only core` (first) | 60 | 13 failing, three installer defects found and fixed (below) | +| `accept --seed --only core` (final) | 0 | Run [`acc-20261111T230217Z-d8363c`](runs/acc-20261111T230217Z-d8363c/results.toon): **14 of 14 pass** (C1–C7, success and rejection) | +| `scan` | 0 | `scan_20261111T231702Z` (commit `a14fb70`): baseline pass with no new exception (mongo's is gone, elasticsearch8 needs none); Trivy 22 targets, Semgrep, gitleaks ok; ZAP: `web` skipped with a note, `admin` and `ember_osf_web` scanned; gate report-only, pass | + +Defects found by the first acceptance run on the candidate, each fixed in the installer with a test: + +1. **`api` and `admin` stalled for 30 s at a time** (C2, C4, C6, C7 timed out; 12 errors at teardown). Django 2.2's development server keeps a connection open, and `runserver --nothreading` (what `invoke apiserver` starts) waits on a browser's idle second connection until the socket times out. Both now run the threaded `manage.py runserver`. +2. **C1 and every browser scenario failed the loopback guard** on `https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/4.4.2/zxcvbn.js`, which the static ember `index.html` names although the build ships `/zxcvbn.js`. It is a version-pinned entry of the known external assets, and a finding for the ember repository. +3. **The file page could not read its file** (C7, "Could not GET file contents"): the 3.13 WaterButler sends no CORS header when `CORS_ALLOW_ORIGIN` is empty. `wb.env` now lists exactly web's and ember's origins. + +Checked on the same stack outside the scenarios: an authenticated owner finds a private project through `/api/v1/search/` and API v2 (1 hit), another user finds none (0), user search returns only the user themself, anonymous search answers 401 (PR #8's boundary on the Elasticsearch 8 index); an administrator without TOTP lands on `/account/login/two-factor/setup/` and the admin pages redirect to the sign-in without the second factor; y-websocket's LevelDB in `y_websocket_data` holds the file rooms. Not run: amd64, a Linux host, the Shibboleth profile with admin `idp` mode, `ENABLE_PUBLIC_ACCESS=true`, the unpushed `images.yml` smoke test, and a migration of an installation that holds Elasticsearch 2 data (`invoke migrate_search`). + +Scan totals: 6,200 findings (CRITICAL 314, HIGH 1,875, MEDIUM 2,654, LOW 1,353, INFO 4) and 177 allow-listed by the 58 entries; the totals fell from 10,984 (CRITICAL 726, HIGH 3,782) because Elasticsearch 2, MongoDB and sharejs left the stack. The new `elasticsearch8` image adds 2 HIGH and 30 MEDIUM Trivy findings (listed per package, not allow-listed). `allowlist_baseline` is still 0 against 58 entries, so the M2 count condition stays open (status board). + +### Acceptance run — 2026-11-12 (UTC), merged final pins, 14 of 14 + +Stack: the installer at commit `f223f2c` of branch `feat/installer-osf-integration` (merged with `develop` at the PR #52 merge), on the same Mac Studio and the same running project `grdm-dev`, upgraded in place from the 0.19 candidate. Every pin is now a merge commit of its repository: osf.io `90b10661c8dc` (RDM-osf.io-dev2027 `develop` after #8 `66ce3a573c`, #10 `24108e0fe3`, #11 `90b10661c8`), ember-osf-web `4d505f000f8d` (#4), y-websocket `97252369cf`; the other pins are unchanged. The wiki-frontend overlay tag follows the osf.io pin (`90b10661c8dc-5985d18b75da`). #8 was merged without R7-01 (the CI job that needs the `workflow` token scope; tracked as issue #16 of RDM-osf.io-dev2027). + +```toon +steps[9]{step,exit,result}: + "secrets init --missing",0,"nothing added or dropped (the Elasticsearch 8 secrets exist already)" + "compose render",0,"tags `grdm-dev/osf.io:90b10661c8dc`, `grdm-dev/ember-osf-web:4d505f000f8d`" + "build",0,"9 min 7 s (22:23:26Z to 22:32:33Z) with Docker's layer cache; not a cold build" + "compose render after build",0,"no stale build tags" + "up",0,"68 s; web, api, admin, worker, ember_osf_web recreated on the new images; 23 services healthy" + "health --network",0,"23 services, 16 loopback bindings; one warning: a foreign listener (`ControlCe`, macOS) on *:5000" + "invoke migrate_search",0,"13 s; the index was rebuilt on Elasticsearch 8 (the `private__website` alias now points to `private__website_v2`; the seeded data held almost nothing to migrate)" + "accept --seed --only core",0,"run acc-20261112T223428Z-fda84a: 14 passed, 0 failed, 0 error, 0 skipped" + "scan and report",0,"scan 2 min 55 s at commit f223f2c; report exit 0" +``` + +Migrations `addons_twofactor` 0006 and 0007 show as applied inside the `web` container. Run [`acc-20261112T223428Z-fda84a`](runs/acc-20261112T223428Z-fda84a/results.toon): C1 to C7, success and rejection, all pass (C4 and C7 rejections close the WebSocket with 4401; C6 rejection is 403; C5 rejection is 401); the netguard counted 138 known external requests and blocked them. + +Scan (`scan_20261112T223858Z`, milestone M1): baseline pass; Trivy 0.75.0 (22 targets), Semgrep 1.184.0 (4), gitleaks 8.30.1 (1) and ZAP (3) all ok with no problems; gate report-only, pass. Open findings: 6,264 (CRITICAL 314, HIGH 1,889, MEDIUM 2,656, LOW 1,401, INFO 4), plus 177 allow-listed by the 58 entries; `allowlist_baseline` is still 0. By tool: Trivy 6,239, ZAP 13, Semgrep 12, gitleaks 0. The 0.19 candidate had 6,200; the 64 more are not analysed here (the osf.io pin moved from the candidate to the merged tips and dependencies resolve at build time). The Mac scan finished with exit 0, unlike the amd64 emulation scan ([DEMO-22](22_core_install_ubuntu_amd64_lima.md#english)), where the Trivy call for the ember-osf-web image hit its 5-minute limit. + +What this run does not show: a cold install from an empty `runtime/` on the final pins (the stack was upgraded in place, which is also why the build was fast), a search index rebuilt from real Elasticsearch 2 data (the seeded installation held almost none), the `images.yml` smoke test and the per-OS workflow files (they wait for the `workflow` token scope), a Shibboleth `idp` admin login, and `ENABLE_PUBLIC_ACCESS=true`. + +**Correction and limit of the ZAP row (0.21).** "ZAP (3) all ok with no problems" above must be read with this: that scan ran the earlier code, which excused `web` whenever ZAP's message named an address other than the target's own, and counted the three targets whether or not they were scanned. With mandatory sign-in (the default and the setting of this run) `web` answers an anonymous request only with a redirect that ZAP cannot follow; in the previous run on the same stack (`scan_20261111T231702Z`, above) `web` was skipped with a note and only `admin` and `ember_osf_web` were scanned. So the most this row supports is that `admin` and `ember_osf_web` were scanned, with 13 ZAP findings in the total; it does **not** show that ZAP scanned `web` or anything behind sign-in. That is an inference from the earlier run, not a reading of this run: the raw report `scan_20261112T223858Z` is not in the committed acceptance folder, so neither the 6,264 count nor the per-target ZAP coverage is independently rederivable from this repository; both are the operator's recorded result. The exception was also weaker than it looked (it accepted a redirect to any unreachable host); the scan code now requires the rendered sign-in configuration and a probe that shows the redirect to the configured address, lists a skipped target under `skipped_targets` instead of counting it, and keeps exit 51 otherwise ([SPEC-03 §4.3](../spec/03_security_gate.md#english)). That stricter code has been tested with unit tests only; it was **not** run against the Mac Studio stack, so the next scan on it is still to be recorded. + +**The stricter ZAP code on the live stack (0.22).** On 2026-11-13 `grdm-dev --yes scan --dynamic` ran on the Mac Studio stack at `ca2a010` (the merge of PR #56) and exited 0 in 1 min 18 s. The probe inside the ZAP image (`python3`, one request, redirects not followed) worked: `web` (`http://web:5000`) was recorded as skipped behind sign-in with the note "ZAP NOT RUN on web ... an anonymous request is redirected (verified by a probe) to the configured sign-in address 127.0.0.1:8081 ... so no page behind sign-in was scanned", and was not counted as scanned. `admin` and `ember_osf_web` were scanned, with 13 ZAP findings (8 and 5, as the operator recorded). The severity split of those findings is not asserted here: no report of this run is committed, so "no HIGH finding" is not established by this record, and the gate result `pass` under the report-only rule does not imply it. This is one run by the operator: the raw report is not committed, so it is a recorded result, not independently rederivable here. It does not show that anything behind sign-in was scanned; that still needs an authenticated scan. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 第 1 回 — 2026-11-05、ブランチ `feat/m2-installer`(PR #21、レビュー修正前) + +ホスト(`grdm-dev doctor` より): macOS 27.2、arm64(2020 年から Apple が Mac に入れているチップ Apple Silicon の CPU の種類。[REF-01](../reference/REF-01_Glossary.md))、メモリ 128 GiB、Docker(イメージを作りコンテナを動かす道具。[REF-01](../reference/REF-01_Glossary.md))29.5.2、Compose 5.6.0、buildx(一つのイメージを何種類かの計算機向けに作る Docker の助手。[REF-01](../reference/REF-01_Glossary.md))あり。対応ホスト、Docker 正常。 + +```toon +run1: + command: ./installer/install.sh --yes --no-open --profile core + env: GRDM_WITH_ACCEPT=1 + result: "終了コード 30(イメージのビルド失敗)" + steps[5]{step,code,status}: + doctor,0,ok + plan,0,ok + "secrets init",0,ok + "compose render",0,ok + build,30,failed + images[3]{component,platform,status,note}: + osf.io,linux/arm64,built,"2.92 GB。Debian buster のアーカイブからパッケージ取得(EOL ベース)" + waterbutler,linux/arm64,built,1.28 GB + modular-file-renderer,linux/arm64,build-failed,"pip: Python 3.5 / arm64 向けの pandas==0.25.1 が存在しない" +``` + +これで分かったこと: + +- ブートストラップ(`install.sh` → `.venv/` → `grdm-dev install`)は、素の macOS のシェルで端から端まで動く。 +- 手順は最初に失敗した段階で止まり、その段階の終了コード(30)を返す。[SPEC-02 §2.1](../spec/02_installer_cli.md) のとおりで、サービスは何も起動していない。 +- EOL(end of life。作った人がもう直さない。[REF-01](../reference/REF-01_Glossary.md))のベースイメージ([ADR-03](../decisions/ADR-03_Staged_Security_Gate.md))は安全性の問題だけでなく、Apple Silicon ではビルドの問題でもある。 + +決めたこと: arm64 で組めない部品(modular-file-renderer、ember-osf-web、cas-overlay)は manifest に `build_platform: linux/amd64` を持たせ([SPEC-01](../spec/01_manifest.md))、M4 で近代化するまでエミュレーションで動かす。第 2 回はレビュー修正の反映後に下へ追記する。 + +### 第 2 回 — 2026-11-05、ブランチ `feat/m2-installer`(レビュー r1 対応後、コミット 3149c76 + 1c2a925) + +同じホスト。第 1 回からの変更: modular-file-renderer・ember-osf-web・cas-overlay に `build_platform: linux/amd64`、ネットワークを二つ(内部の `grdm` と公開用の `grdm-edge`)、PostgreSQL(主なデータベース。[REF-01](../reference/REF-01_Glossary.md))9.6 の `auth-host=md5`。 + +```toon +run2: + command: ./installer/install.sh --yes --no-open --profile core + result: "終了コード 30(イメージのビルド失敗)" + steps[5]{step,code,status}: + "secrets init",0,"skipped(runtime/.env があるため)" + doctor,0,ok + plan,0,ok + "compose render",0,ok + build,30,failed + images[4]{component,platform,status,note}: + osf.io,linux/arm64,built,第 1 回のキャッシュ + waterbutler,linux/arm64,built,第 1 回のキャッシュ + modular-file-renderer,linux/amd64,built,"エミュレーションでのビルドに成功(pandas 0.25.1 に amd64 の wheel がある)" + ember-osf-web,linux/amd64,build-failed,"ベースイメージ quay.io/centerforopenscience/ember-base が Docker の manifest v2 schema 1 形式で、現行 Docker は取得を拒否する" +``` + +これで分かったこと: + +- `build_platform` は働く。第 1 回で arm64 向けに組めなかった部品が、エミュレーションで組めた。 +- `secrets init` は冪等(既存の `runtime/.env` を保持)で、再描画でポートは動かなかった。 +- ember-osf-web の Dockerfile は CPU に関係なく現行 Docker ではまったく組めない。EOL ベースの欠陥であり、M4 で統合リポジトリ側を直す。 + +決めたこと: M4 まで、ember-osf-web には manifest の記録付き・ダイジェスト固定の `prebuilt_image`(旧ガイドが頼っていた配布イメージ)を使う([SPEC-01](../spec/01_manifest.md))。第 3 回は下へ追記する。 + +### 第 3 回 — 2026-11-05/06、ブランチ `feat/m2-installer`(レビュー r2 対応後、ember-osf-web に `prebuilt_image`) + +同じホスト(Docker は colima 29.5.2)。第 2 回からの変更: ember-osf-web はダイジェスト固定の `prebuilt_image`。第 1〜2 回のイメージはキャッシュ。 + +```toon +run3: + command: ./installer/install.sh --yes --no-open --profile core + result: "終了コード 30(イメージのビルド失敗)。ハングしたエミュレーションビルドを操作者が停止" + steps[5]{step,code,status}: + "secrets init",0,"skipped(runtime/.env があるため)" + doctor,0,ok + plan,0,ok + "compose render",0,ok + build,30,failed + images[5]{component,platform,status,note}: + osf.io,linux/arm64,built,キャッシュ + waterbutler,linux/arm64,built,キャッシュ + modular-file-renderer,linux/amd64,built,キャッシュ + ember-osf-web,linux/amd64,prebuilt,"ダイジェスト固定の配布イメージを設計どおり取得" + cas-overlay,linux/amd64,build-failed,"maven:3.3-jdk-8 の Dockerfile。qemu エミュレーション下の Maven ビルドが CPU 0% のまま 8 時間 08 分出力なし。操作者が停止(buildx 終了 130)" +``` + +これで分かったこと: + +- `prebuilt_image` の代替は端から端まで働く: ダイジェスト固定の参照を部品のプラットフォームで取得し、ビルド報告の行は `prebuilt`、`compose render` はその同じ参照をサービスの `image:` に書く(ローカルでのタグ付け直しはしない)。 +- EOL の Java 8 / Maven 3.3 を CPU エミュレーションで組むのはこのホストでは現実的でなく、失敗ではなくハングした。「最初の失敗で止まる」規則は守られた(終了 30、何も起動していない)。 + +決めたこと: cas-overlay も M4 で Dockerfile を近代化するまで、配布イメージの `linux/amd64` マニフェストをダイジェスト固定の `prebuilt_image` として使う。manifest の note に記録。第 4 回は下へ追記する。 + +### 第 4 回 — 2026-11-06、PR #28 マージ後の develop(cas-overlay は prebuilt) + +同じホスト。第 3 回からの変更: cas-overlay はダイジェスト固定の `prebuilt_image`。 + +```toon +run4: + command: ./installer/install.sh --yes --no-open --profile core + result: "終了コード 30(イメージのビルド失敗)" + steps[5]{step,code,status}: + "secrets init",0,"skipped(runtime/.env があるため)" + doctor,0,ok + plan,0,ok + "compose render",0,ok + build,30,failed + images[6]{component,platform,status,note}: + osf.io,linux/arm64,built,キャッシュ + waterbutler,linux/arm64,built,キャッシュ + modular-file-renderer,linux/amd64,built,キャッシュ + ember-osf-web,linux/amd64,prebuilt,取得済みキャッシュ + cas-overlay,linux/amd64,prebuilt,"ダイジェスト固定の配布イメージを取得" + wiki-frontend,linux/arm64,build-failed,"Dockerfile が osf.io の木にしかない addons/*/requirements.txt、admin/yarn.lock、website/… を COPY する" +``` + +これで分かったこと: + +- cas-overlay の代替は働く。残る失敗はすべて部品の「形」に由来し、CPU やベースイメージの古さではない。 +- wiki-frontend は独立したサービスではない。リポジトリには `website/static`、`addons/wiki`、webpack 5 の設定、osf.io 派生の Dockerfile しかなく、osf.io のソースツリーに重ねて webpack の束を作るオーバーレイである。実行用イメージは作らない。 + +決めたこと: [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md)。manifest で wiki-frontend を `overlay_of: osf.io` とし、`build` は重ねたコンテキスト(osf.io のチェックアウト+オーバーレイ)から束を作るイメージを組み、`compose render` は一回限りの `wiki_assets` サービスを加えて束を名前付きボリュームへ写し、osf.io のサービスが読み取り専用でマウントする。osf.io のイメージ自体は従来どおり自分の Dockerfile で組む。第 5 回は下に記した。 + +### 第 5 回 — 2026-11-06、develop 9b1b643(PR #30 マージ後、wiki-frontend はオーバーレイ) + +同じホスト。第 4 回からの変更: wiki-frontend は `overlay_of: osf.io`(ADR-06)。`build` が重ねたコンテキストを組み立て、`compose render` が `wiki_static_init` と `wiki_assets` を加える。 + +```toon +run5: + command: ./installer/install.sh --yes --no-open --profile core + result: "終了コード 30(イメージのビルド失敗)" + steps[5]{step,code,status}: + "secrets init",0,"skipped(runtime/.env があるため)" + doctor,0,ok + plan,0,ok + "compose render",0,"ok(fakecas の 8080 番は別プロセスが使用中のため 8081 番を選択)" + build,30,failed + images[6]{component,platform,status,note}: + osf.io,linux/arm64,built,キャッシュ(356a997eb5fe) + waterbutler,linux/arm64,built,キャッシュ(e9b1ac266374) + modular-file-renderer,linux/amd64,built,キャッシュ(dac70e2209f9) + ember-osf-web,linux/amd64,prebuilt,取得済みキャッシュ + cas-overlay,linux/amd64,prebuilt,取得済みキャッシュ + wiki-frontend,linux/arm64,build-failed,"オーバーレイのコンテキストは組み立てられ、Dockerfile 86 段のうち 85 段目で失敗: webpack 5.93.0 がエラー 2 件で停止: osfHelpers.js と comment.js が要求する linkify-html がオーバーレイ側の package.json にない" +``` + +これで分かったこと: + +- オーバーレイの仕組みは束を作る段の直前まで端から端まで働く。重ねたコンテキスト(osf.io のチェックアウト+wiki-frontend のファイル、wiki-frontend の Dockerfile)が組み立てられ、yarn はオーバーレイ側のロックファイルから導入し、webpack は osf.io の JavaScript を処理した。 +- 残る失敗はインストーラーの欠陥ではなく、二つの上流の間の*統合のずれ*である。RDM-osf.io の develop は 2026-11-01 に linkifyjs を 2 系から 4 系へ更新し linkify-html を追加したが、wiki-frontend オーバーレイの `package.json` / `yarn.lock` は 2025-06 のままだった。オーバーレイ側のロックファイルが優先されるため、osf.io のコードが新しいモジュールを解決できなかった。 + +決めたこと: 修正は統合リポジトリ RDM-wiki-frontend-dev2027 側で行う(PR #2: linkify-html と sift を追加、linkifyjs・bootstrap-datepicker・highlight.js・less を osf.io develop に合わせ、yarn.lock を node:21-alpine 内で再生成)。PR の前に検証: 同期後のファイルを置いた同じオーバーレイのコンテキストを本ホストで `docker buildx build --platform linux/arm64` して成功(webpack 5.93.0、エラー 0、警告 4: `mode` 未設定 1 件、性能推奨 3 件)。イメージには `wiki_assets` が写す `website/static/public/js/wiki-edit-page.<chunkhash>.js` がある。マージ後に manifest の `integration_sha` を更新し(PR #31)、第 6〜8 回を下に記した。[SPEC-05](../spec/05_upstream_tracking.md#japanese) への教訓: オーバーレイの依存一覧は、週次の統合のたびに基底と差分を取らなければならない。 + +### 第 6〜8 回 — 2026-11-06、develop 757dc37 + PR #32・PR #33 のブランチ + +同じホスト。短い 3 回で、毎回ひとつ先の段で止まった。 + +```toon +run6: + branch: develop 757dc37(RDM-wiki-frontend-dev2027 PR #2 後の wiki-frontend integration_sha cd96330f) + command: ./installer/install.sh --yes --no-open --profile core + result: "終了コード 40(docker compose up が 1 で終了)" + build: "6 部品すべてが初めて通過(wiki-frontend オーバーレイをビルド。osf.io・waterbutler・mfr はキャッシュ。ember・cas は prebuilt)" + up: "`elasticsearch:2` の取得失敗: no matching manifest for linux/arm64" +run7: + branch: fix/infra-amd64-platform(PR #32: elasticsearch2・elasticsearch6・sharejs・unoconv・fakecas に build_platform linux/amd64) + result: "終了コード 40(docker compose up が 1 で終了)" + up: "基盤イメージ 9 本すべて取得(amd64 専用の 5 本はプラットフォーム固定で)。その後、/private/tmp 配下の作業用 worktree から実行したため bind ボリュームが Docker Desktop の共有パス外になりマウント失敗。操作者の誤りでインストーラーの欠陥ではない。`docker compose down -v` で片付けた" +run8: + branch: fix/infra-amd64-platform(本体チェックアウトから実行) + result: "終了コード 40(docker compose up が 1 で終了)" + up: "21 サービス中 16 を作成。postgres・mongo・rabbitmq・redis・elasticsearch6・fakecas・wb・wb_worker・mfr は起動。下の 4 件が失敗。web/api/admin/worker は wiki_assets を待つため起動せず" + failures[4]{service,symptom,cause,fix}: + wiki_assets,"exit 1: /wiki_static is not writable by 1000","macOS の Docker Desktop は bind ディレクトリを root:root として見せ `chown` を無視するが、どの uid でも書ける。したがって `test -w` は偽陰性","`test -w` の代わりに実際に目印ファイルを作って消す書込プローブ(PR #33)" + cas,"再起動ループ: Could not create local repository at /root/.m2repo","配布イメージは起動時に `mvn jetty:run` を走らせ、Maven リポジトリは /root(0700)配下、target/ も起動時に書く。user 1000:1000 と読み取り専用ルートの両方が阻む","cas に hardening 例外(user・read_only。capability 追加なし)。M4 で war を焼き込むまで(PR #33)" + elasticsearch,"再起動ループ: runtime: failed to create new OS thread (have 2 already; errno=22)","EOL の elasticsearch:2 イメージの gosu は古い Go バイナリで、Rosetta(Apple Silicon 上の Docker Desktop の amd64 エミュレーション)の下で異常終了する","イメージの elasticsearch ユーザー(uid 101)で直接動かし、entrypoint の chown と gosu を飛ばす。例外は read_only だけに縮小(PR #33)" + unoconv,"再起動ループ: chown: changing ownership of '/home': Operation not permitted","entrypoint が全 capability を落とした root で `chown -R www-data /home` を実行する","unoconv の例外に CAP_CHOWN を追加(PR #33)" +``` + +これで分かったこと: + +- Apple Silicon の core プロファイルで、ビルドの段は完了した。6 部品のうち 3 本はローカルでビルド、2 本は prebuilt、1 本はオーバーレイ。 +- `up` の失敗は、EOL の各イメージが想定していなかった二つの制約、すなわち hardening の基準(非 root・読み取り専用・capability なし)と Rosetta による amd64 エミュレーションの下での起動の仕方だけに残った。各失敗はイメージ固有の事実として `manifest/hardening.json` に見直し日と近代化の目標とともに記録した。 +- Docker Desktop のファイル共有はコンテナ内の所有権テストの意味を変える。プローブは実際の操作を試さなければならない。 + +### 第 9〜12 回 — 2026-11-06、ブランチ fix/run8-startup(PR #33)、本体チェックアウトから実行 + +同じホスト。毎回、前の回が露わにしたものを直した。`build` は毎回通過(すべてキャッシュ)。 + +```toon +run9: + fixes_applied: "wiki_assets の書込プローブ。elasticsearch を uid 101 で。unoconv に CAP_CHOWN。cas の例外" + result: "終了コード 40(300 秒で未健康: web, api, admin, worker, ember_osf_web)" + state: "21 中 17 が起動。wiki_assets は 0 で終了(束を写した)。web は KeyError EXTERNAL_EMBER_APPS['preprints']。api/admin/worker は invoke の stdin スレッドの `OSError: [Errno 25] Not a tty`。ember はビルド中" +run10: + fixes_applied: "local.py に preprints/reviews のキー。web/api/admin/worker に stdin_open" + result: "終了コード 40(300 秒で未健康)" + state: "web/api/worker は `Read-only file system: /code/website/static/built/nodeCategories.json`。api/admin/worker は `ModuleNotFoundError: debug_toolbar`(DEBUG_MODE=True がイメージに無い開発専用パッケージを import する)。ember は 6.3 GiB の上限で 2 回 OOM。docker info では Docker VM は 47 GiB なのに予算はホストの 128 GiB から算出していた" +run11: + fixes_applied: "website/static/built に tmpfs。DEBUG_MODE=False。ember は weight 4・下限 8 GiB・JOBS=2。二段階のメモリ配分を Docker VM で上限化。up の待ち時間 900 秒" + result: "終了コード 40(900 秒で未健康: web, api, admin, worker, ember_osf_web)" + state: "web/api/admin/worker は同じファイルで `PermissionError`。Compose の短い `tmpfs` 記法は root 所有の 0755 で mount する(docker run --tmpfs は 1777)。ember は OOM なしでビルド中" +run12: + fixes_applied: "tmpfs の項目を :mode=1777 付きで出力" + result: "終了コード 40(900 秒で未健康: web, api, admin, ember_osf_web)" + state: "worker は健康。web は 500: `relation \"osf_institution\" does not exist`(新しいデータベースで migration 未実施)。500 のたびに開発サーバーが postgres の接続を 1 本漏らし `FATAL: too many clients already` に至った(100 本中 98 本を web が保持)。ember は起動から約 25 分後に HTTP 200 を返した" +``` + +これで分かったこと: + +- osf.io アプリケーションより下のものは、hardening の基準の下で Apple Silicon 上ですべて起動する。17 サービスが起動し、wiki の一回限り 2 本は束をボリュームに置いて 0 で終了した。 +- 欠陥の三つの類はイメージではなくインストーラーにあった。上流コードが import 時に読むキーが生成設定に無いこと、Compose の細部(stdin・tmpfs のモード・Docker VM に対するメモリ予算)、そして上流 README が操作者に任せているデータベース初期化の段が無いこと。 +- osf.io の開発サーバーは、未処理のエラーで終わる要求ごとにデータベース接続を 1 本漏らす。`max_connections=500` は安全余裕であり、本当の修正は `/` を失敗させないこと。 + +決めたこと(PR #33、[SPEC-02 §4・§7](../spec/02_installer_cli.md#japanese)): web/api/admin/worker が待つ一回限りの `osf_init`(migrate・機関・OAuth スコープ)。ember-osf-web は URL 設定の指紋とともに `dist/` を名前付きボリュームへ一度だけ組み `ember serve --path` で配信(エミュレーション下の初回ビルドは 10〜25 分、以後は数秒)。ember のバックエンド URL は公開したループバックのポートと `{{AUTH_URL}}` から。`up` は既定で 900 秒待つ。第 13〜18 回は下に記す。 + +### 第 13 回 — 2026-11-06、`osf_init` 入りのブランチ fix/run8-startup + +```toon +run13: + result: "終了コード 40(docker compose up が 1: service \"osf_init\" didn't complete successfully)" + osf_init: "`manage.py migrate` と `scripts.populate_institutions -e test -a` は初回で成功(postgres とエミュレーション下の elasticsearch:2 は第 12 回から起動していた)。`scripts.register_oauth_scopes` は `Read-only file system: /code/logs/register_oauth_scopes.py.<timestamp>.log` で失敗。scripts/utils.py が /code/logs に実行ごとのログファイルを作る" + fix: "osf_init・web・api・admin・worker に tmpfs /code/logs(第 14 回)" +``` + +### 第 14 回 — 2026-11-06、tmpfs /code/logs 付き + +```toon +run14: + result: "終了コード 40(900 秒で未健康: web, api, admin, ember_osf_web)" + osf_init: "0 で終了(migrate・機関・OAuth スコープ)" + web: "`/` で HTTP 500: PROXY_EMBER_APPS がトップページを ember_osf_web へ転送するが、ember はまだビルド中(ember_osf_web:4200 への ConnectionError)。postgres 接続は 1 本のまま、漏れなし" + api_admin: "`DatabaseWrapper objects created in a thread can only be used in that same thread`。autoreload を切っても同じ。api/base/wsgi.py は website.settings.DEBUG_MODE が False のとき gevent をモンキーパッチする(第 11 回で debug_toolbar を避けるため False にしていた)。local.py で False に固定していなければ SECURE_MODE = not DEBUG_MODE がサーバーを TLS に切り替えてもいた" + fix: "DEBUG_MODE を True に戻す。Django の DEBUG はプロジェクトごとに api_local.py と新設の admin_local.py(admin/base/settings/local.py に mount)で False。health は web を ember 無しで描画できる /login/ で探査(第 15 回)" +``` + +### 第 15 回 — 2026-11-06、DEBUG_MODE を戻し、プロジェクトごとの DEBUG を切り、web は /login/ で探査 + +```toon +run15: + result: "終了コード 40 — `up` は初めて通過(0, ok)、`health --network` が失敗(40): web/api/admin が未健康。下記" + ember_osf_web: "起動から約 13 分で HTTP 200(dist をボリュームへ組んだ)。web の `/` もその後 200" + api: "mount したファイルだけが変わったため Compose は何も作り直さず、第 14 回で失敗したプロセスが残っていた。`docker restart` 後は `/` に 302" + admin: "依然 `ModuleNotFoundError: debug_toolbar`。admin/base/settings/defaults.py は import 時に DEBUG_MODE を読んで debug_toolbar と nplusone を INSTALLED_APPS と MIDDLEWARE に加えるので、local.py の `DEBUG = False` だけでは遅い。続いて 127.0.0.1 に対する `400 DisallowedHost`" + fix: "admin_local.py で二つのアプリとミドルウェアを外し、ALLOWED_HOSTS に 127.0.0.1/localhost/admin を加える。再描画と再起動の後、admin は 302(第 16 回がクリーンな実行)" +``` + +### 第 16 回 — 2026-11-06、全修正を適用したクリーンな実行: 手作業の修復なしで `up` が通った + +```toon +run16: + command: ./installer/install.sh --yes --no-open --profile core + result: "終了コード 40(`health --network` で停止)" + steps[7]{step,code,status}: + "secrets init",0,"skipped(runtime/.env があるため)" + doctor,0,ok + plan,0,ok + "compose render",0,"ok(メモリ予算はホストの 128.0 GiB でなく Docker VM の 47.0 GiB を使う。ember と fakecas はポートを維持)" + build,0,"ok(すべてキャッシュ)" + up,0,"ok — ready: http://127.0.0.1:5000/(22 サービス。一回限りの 3 本は 0 で終了)" + "health --network",40,"failed: `ControlCe listens on *:5000 (not loopback; project port, owner not visible)`" +``` + +これで分かったこと: + +- core プロファイルは hardening の基準の下で Apple Silicon 上で端から端まで起動し、`up` はループバックの URL で準備完了を宣言する。節目 M2 の「一発導入」はアプリケーションに到達した。 +- `--network` の検査は 5000 番の、我々のものでないワイルドカードの待ち受けを見つけた。macOS の AirPlay レシーバー(ControlCenter)は `*:5000` と `*:7000` を bind する。我々の `web` はその横で `127.0.0.1:5000` に bind して応答している(カーネルは具体的な番地を優先する)。検査はプロジェクトのポート上のループバック以外の待ち受けをすべて失敗と扱っていた。 + +決めたこと: `health --network` は、Docker に属する待ち受け(我々の公開ポートがループバック以外へ漏れている場合。[ADR-02](../decisions/ADR-02_Network_Model.md))と、所有者の見えないプロジェクトのポート上のワイルドカードの待ち受け(安全側に失敗)は引き続き失敗にする。プロジェクトのポート上の*名前の分かる*他プロセスは警告の行(`foreign-listener`)として報告し、操作者が望めば `GRDM_PORT_<SERVICE>` でポートを移せるようにする。第 17 回は下へ追記する。 + +### 第 17 回 — 2026-11-06、他プロセスの待ち受けを警告に: `up` と `health --network` が合格、`scan` が始まる + +```toon +run17: + command: ./installer/install.sh --yes --no-open --profile core + result: "終了コード 51(`scan` で停止: semgrep が PATH にない)" + steps[8]{step,code,status}: + "secrets init",0,"skipped(runtime/.env があるため)" + doctor,0,ok + plan,0,ok + "compose render",0,ok + build,0,"ok(すべてキャッシュ)" + up,0,"ok — ready: http://127.0.0.1:5000/" + "health --network",0,"ok。警告 1 件: foreign-listener ControlCe on *:5000(macOS の AirPlay レシーバー)" + scan,51,"failed: semgrep が PATH にない。その前に trivy 0.75.0 が 25 対象を検査" + trivy_findings[4]{severity,count}: + CRITICAL,1894 + HIGH,8620 + MEDIUM,10047 + LOW,3955 + trivy_problems: "src/RDM-cas-overlay-dev2027 の sbom/scan が rc 1(prebuilt 部品で checkout が無い)。リポジトリ自身の sbom/scan が rc 1" +``` + +これで分かったこと: + +- M2 の最初の二つの門は実機で通った。一つのコマンドで core プロファイルが起動し、ループバック限定の規則が守られている。 +- EOL イメージ群(Python 3.5/3.6、node 8/12、JDK 8、ES 2/6、mongo 3.4)の脆弱性件数は、[ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) が M1〜M3 に想定したとおりである。今は報告と許容リスト、M4 で HIGH 停止、M5 で CRITICAL/HIGH ゼロ。 +- `scan` 自体に欠陥が二つある。SPEC-03 はローカルでも Semgrep を動かすのにブートストラップが Semgrep を入れていないこと、prebuilt 部品が決して clone しないソースディレクトリに Trivy を向けていること。 + +決めたこと: ブートストラップは Semgrep を `grdm-dev` と同じ `.venv` に入れ、`scan` は自分のインタープリタの隣でも道具を探す。Trivy は prebuilt 部品のソースディレクトリを飛ばし、飛ばした理由を報告する。第 18 回は下に記した(終了コード 0)。 + +### 第 18 回 — 2026-11-06、Semgrep を `.venv` に、Trivy はオフラインで対象を選ぶ: **コマンド全体が成功** + +```toon +run18: + command: ./installer/install.sh --yes --no-open --profile core + result: "終了コード 0 — GakuNin RDM developer environment is ready: http://127.0.0.1:5000/" + steps[9]{step,code,status}: + "secrets init",0,"skipped(runtime/.env があるため)" + doctor,0,ok + plan,0,ok + "compose render",0,"ok(ポートは維持。メモリ予算は Docker VM の 47.0 GiB から)" + build,0,"ok(すべてキャッシュ)" + up,0,"ok — 22 サービス、ループバックの URL で準備完了" + "health --network",0,"ok(警告: foreign-listener ControlCe on *:5000)" + scan,0,"ok — 門は報告のみ: 合格" + report,0,ok + scan_tools[4]{tool,version,targets,result}: + trivy,0.75.0,22,"ok(飛ばしたもの: prebuilt の cas-overlay と ember-osf-web の古い checkout、組み立てた _overlay/ の文脈)" + semgrep,1.184.0,4,ok + gitleaks,8.30.1,1,ok + zap,stable,3,ok + findings_by_severity[5]{severity,trivy,zap,total}: + CRITICAL,1835,0,1835 + HIGH,8290,1,8291 + MEDIUM,9763,9,9772 + LOW,3886,13,3899 + INFO,0,5,5 + milestone_in_report: "M1 — manifest/milestone.json は所有者が保守し(SPEC-03 §5.2)まだ M1。門の規則はどちらでも報告のみ" + allow_list: "0 件、許容 0 件。M4 の閾値(HIGH 以上)を超える 10126 件は M2 では報告のみで、停止させない" +``` + +これで分かったこと: + +- **M2 の一発導入は Mac Studio で動く**。最初の試みから 18 回目で、`./installer/install.sh --yes --no-open --profile core` は素のシェルから準備完了の URL まで、ループバック検査・スキャナー・報告書を通して終了コード 0 で到達する。 +- 第 1 回から第 18 回の間の停止はすべて、EOL イメージの事実か、実際に起動しないと分からないインストーラーの細部だった。それぞれ上に修正と文書とともに記録した。 +- EOL スタックの脆弱性の基準値が測れた。Trivy 単独で CRITICAL 1835 件、HIGH 8290 件(ZAP が HIGH 1 件を加える)で、ほぼすべてがイメージ由来(Python 3.5/3.6、node 8/12、JDK 8、Elasticsearch 2/6、mongo 3.4)。これが M4 と M5 でゼロにすべき数であり、許容リストは隠すためには使わず空のままにする。 + +M2 の次: この起動したスタックに対する Playwright 受入(C1〜C6)と、RDM-osf.io-dev2027 側の Wiki エディタページの配線(C4)。 + +### 第 19 回 — 2026-11-06、レビュー r1 対応後のコールドスタート(ボリューム削除、`runtime/` 新規) + +```toon +run19: + preparation: "`docker compose down -v`。runtime/ を退避(イメージは保持)" + command: ./installer/install.sh --yes --no-open --profile core + result: "終了コード 40(docker compose up が 1: service \"osf_init\" didn't complete successfully)" + steps[6]{step,code,status}: + doctor,0,ok + plan,0,ok + "secrets init",0,"ok(新しい runtime/.env)" + "compose render",0,"ok(fakecas の 8080 は使用中→8081。予算は 47 GiB の VM から)" + build,0,"ok(すべてキャッシュ)" + up,40,"11 分後に失敗" + one_shots[4]{service,result}: + elasticsearch_data_init,"0 で終了(chown 101:101。Docker Desktop では chown は無効だがどの uid でも書ける)" + wiki_static_init,"0 で終了" + wiki_assets,"0 で終了(束を写した)" + osf_init,"1 で終了: migrate は空のデータベースに全 migration を適用。続く populate_institutions は 5 分間に 30 回失敗 — Elasticsearch 2 が接続を拒否" + elasticsearch2: "コンテナは CPU 200 % で動いていたが 9200 番を開いていなかった。EOL の elasticsearch:2 イメージ(JDK 8、linux/amd64)は Rosetta 下で 03:31:52 に `initializing ...`、04:09:57 に `started` — 起動に 38 分" + native_trial: "公式の elasticsearch-2.4.6 tarball(27.3 MB、sha256 5f7e4bb7…cfc6f)を arm64 の eclipse-temurin:8-jre コンテナで起動: 5 秒で `initialized`・`started`" +``` + +これで分かったこと: + +- コールドスタートは、どんなタイムアウトでも隠せない最後のエミュレーションのコストを露わにした。JDK 8 のサービスは Rosetta 下で、データディレクトリが新しいたびに初期化に約 40 分かかり、スタック全体がそれを待つ。 +- 同じ Elasticsearch 2.4.6 を arm64 ネイティブの JRE で動かすと数秒で起動する。問題は x86-64 のイメージであってプログラムではない。 + +決めたこと: 本 PR では `osf_init` が Elasticsearch を最長 30 分待ち、ember-osf-web は web/api に依存しなくして自身の長いビルドを並行させる。第 20 回は同じコールドスタートの続きで `up` を通した(下記)。次の PR では、公式 tarball からダイジェスト固定の Temurin 8 JRE 上にマルチアーキテクチャの `grdm-dev/elasticsearch2` イメージを組み(チェックサム検証、非 root、所有者初期化コンテナ不要)、その規則を ADR に記す — amd64 のイメージしか無い EOL ミドルウェアは、退役する節目まで arm64 向けにネイティブで組む。 + +### 第 20 回 — 2026-11-06、Elasticsearch が起動してから同じコールドスタートを続行 + +```toon +run20: + command: ./installer/install.sh --yes --no-open --profile core + result: "終了コード 51(`scan` で停止: semgrep が不完全)" + steps[8]{step,code,status}: + "secrets init",0,"skipped(第 19 回の runtime/.env)" + doctor,0,ok + plan,0,ok + "compose render",0,ok + build,0,"ok(キャッシュ)" + up,0,"ok — ready: http://127.0.0.1:5000/。新しいボリューム上で osf_init が完了(migration は第 19 回で適用済み、Elasticsearch が応答してから機関を投入)、ember は新しいボリュームへ dist を組んだ" + "health --network",0,"ok(警告: foreign-listener ControlCe on *:5000)" + scan,51,"semgrep がエラー 148 件を報告: ファイルごとのルールのタイムアウト(既定 5 秒)— すべて `runtime.run18-123040/`、このコールドスタートのためにリポジトリ内へ退避した第 18 回の runtime の中(git-ignore は `runtime/` だけで、Semgrep は .gitignore に従う)。検査は不完全と記録され、門は安全側に失敗" + rerun_after_fix: "そのディレクトリをリポジトリ外へ移し、.gitignore に `runtime.*/` を加え、Semgrep のルールのタイムアウトを網羅性の警告として扱うようにした後、同じスタックで `grdm-dev scan` と `grdm-dev report`: scan 終了 0(門は報告のみ: 合格。trivy/semgrep/gitleaks/zap すべて ok。件数は第 18 回と同じ 1835/8291/9772/3899/5)、report 終了 0" +``` + +これで分かったこと: + +- Elasticsearch がようやく起動すると、コールドスタートは `up` とループバック検査を通る。データベース初期化、wiki の束、ember のビルドはいずれも空のボリュームから動く。 +- したがってコールドスタートは端から端まで完了する。Elasticsearch が起動した後は、新しいボリューム上で `up`・`health --network`・`scan`・`report` がすべて終了 0。`scan` の停止は自分で招いたもの(操作者がリポジトリ内に置いた `runtime/` の写し)で、いま入れた二つの堅牢化点を露わにした。`runtime.*/` を無視すること、Semgrep のルールのタイムアウトは門を安全側に落とすのでなく網羅性の警告として記録すること。 + +### 第 21 回 — 2026-11-06、ネイティブ Elasticsearch 2 イメージ(ADR-07)でのコールドスタート: **空のボリュームから準備完了まで 30 分、終了コード 0** + +```toon +run21: + preparation: "`docker compose down -v`。runtime/ をリポジトリ外へ退避(イメージは保持)。ブランチ feat/native-elasticsearch2-image(develop f37a029 上)" + command: ./installer/install.sh --yes --no-open --profile core + result: "終了コード 0 — GakuNin RDM developer environment is ready: http://127.0.0.1:5000/(04:53:51 → 05:24:34 UTC、30 分 43 秒)" + steps[9]{step,code,status}: + doctor,0,ok + plan,0,ok + "secrets init",0,"ok(新しい runtime/.env)" + "compose render",0,ok + build,0,"ok — grdm-dev/elasticsearch2:2.4.6-1 を installer/images/elasticsearch2 からネイティブに組む(層はキャッシュ)。他もキャッシュ" + up,0,"ok — コンテナ作成 04:54:40。elasticsearch は 04:54:49 に `started`(コンテナ起動から 6 秒)。osf_init は 04:59:45 に 0 で終了(全 migration+機関+OAuth スコープ、5 分)。web/api/admin/worker は 04:59:46 に起動。ember は 05:18:54 に配信開始(24 分のビルド、並行)" + "health --network",0,"ok(警告: foreign-listener ControlCe on *:5000)" + scan,0,"ok — 門は報告のみ: 合格。trivy 22 対象、semgrep 4、gitleaks 1、zap 3。タイムアウトなし" + report,0,ok + trivy_totals_vs_run_18[4]{severity,run18_trivy,run21_trivy}: + CRITICAL,1835,1769 + HIGH,8290,8030 + MEDIUM,9763,9550 + LOW,3886,3676 + elasticsearch2_image: "grdm-dev/elasticsearch2:2.4.6-1 — イメージに 58 件(HIGH 2・MEDIUM 52・LOW 4)。Elasticsearch 2.4.6 の jar と Temurin 8 ベース由来。加えてレシピの installer/images/elasticsearch2/Dockerfile に LOW 1 件。置き換えた Docker Hub の elasticsearch:2 が上の差分の大半を抱えていた" +``` + +これで分かったこと: + +- **コールドスタートが端から端まで動く**。イメージのキャッシュ以外は何も無い状態から、一つのコマンドで Apple Silicon 上 31 分で準備完了・検査済み・報告済みの環境に達する。残る所要時間は ember のビルド(24 分、いまは並行)と osf.io の migration(5 分)。 +- ネイティブの Elasticsearch 2 はエミュレーションで 38 分かかったところ(第 19 回)を 6 秒で起動し、uid 1000・読み取り専用ルートで堅牢化の例外も所有者初期化コンテナも無く動き、公式の amd64 イメージより既知の脆弱性が少ない。 +- 節目 M2 の導入基準([進捗ボード](../status/README.md#japanese))は、core プロファイルについて Mac Studio 上で温・冷ともに満たした。M2 に残るのは Playwright 受入。 + +証跡(第 1 回): 全ログはセッションの作業領域にのみ保管(パッケージ取得の出力が大半で、秘密は含まない)。Mac Studio の `runtime/` には `.env`(0600)、生成した Compose ファイル、ビルド済みイメージ 2 つがあり、git では無視される。 + +### 受入試験の実行 — 2026-11-09/10、第 22 回のスタック(osf.io 389415a4) + +| 実行 ID | 範囲 | 結果 | +|---|---|---| +| [`acc-20261109T131214Z-f2ee77`](runs/acc-20261109T131214Z-f2ee77/results.toon) | C1 | 2 件中 2 件合格 | +| [`acc-20261109T131240Z-00dff9`](runs/acc-20261109T131240Z-00dff9/results.toon) | コア C1〜C6 | 12 件中 3 件合格 | +| [`acc-20261109T170208Z-9ebf01`](runs/acc-20261109T170208Z-9ebf01/results.toon) | HMAC 修正後の C3 | 2 件中 2 件合格 | + +分かったこと: + +- **ログイン。** 種データのユーザーは `have_email=False` で、GRDM がメール設定画面へ転送し、ダッシュボードが表示されなかった。種データで true に設定した。 +- **アップロード(C3、C5)。** web への署名付きコールバックがすべて 401 になっていた。`/api/v1/files/auth/` は 200 で、JWE/JWT の連携は正常だった。値のハッシュで比較すると、web の `DEFAULT_HMAC_SECRET` は上流の既定値 `changeme` のままで、WaterButler は生成した 2 種類の別の鍵で署名していた。osf.io の検証器は 1 つなので、WaterButler の 2 つの署名と osf.io を `WATERBUTLER_HMAC_SECRET` に統一し、`OSFSTORAGE_HMAC_SECRET` は生成しないようにした。既定の鍵では web に届く者がコールバックを偽造できたため、この弱点も解消した。 +- **外部資産。** 既知の資産は遮断を続け、件数のみ記録する([SPEC-04](../spec/04_acceptance_tests.md#japanese))。Google Analytics はビルド後の ember の設定から削除した。 + +この時点の残件: C2、C4、C5、C6 は未合格(セレクタ、wiki バンドルの配線、プレビュー、管理画面のパス)。 + +### 受入の実行 — 2026-11-10、マージ済みのセキュリティ修正をすべて含む、12 件中 12 件 + +実行 [`acc-20261110T015520Z-ab4cc7`](runs/acc-20261110T015520Z-ab4cc7/results.toon): **12 件中 12 件合格**。このブランチの固定版(osf.io `fe90e5c3`、WaterButler `45e97a51`、MFR `749e58d3`、wiki-frontend `5985d18b`、y-websocket `d4d1cfae`、cas-overlay `22610b76`)から組み、新しい CAS と変換サービスが要る鍵を `secrets rotate` で加えたスタックで実行した。 + +| シナリオ | 成功 | 拒否 | 合格させたもの | +|---|---|---|---| +| C1 ログイン | 合格 | 合格(401) | 種データの `have_email` | +| C2 プロジェクト | 合格 | 合格(403) | セレクタ | +| C3 ファイル | 合格 | 合格(403) | WaterButler と osf.io の HMAC 鍵を一つに | +| C4 Wiki | 合格 | 合格(4401) | y-websocket の接続時の JWT、クライアントのトークン更新、`edit.mako` のバンドルの場所 | +| C5 プレビュー | 合格 | 合格(401) | MFR は OSF から WaterButler への転送でだけ資格情報を渡す。PDF ビューアから Google Analytics を削除 | +| C6 管理画面 | 合格 | 合格(403) | 管理画面の資産をローカルで配信し CDN へ出ない。所属機関の管理者には、一覧でも明示の検索でも、自機関の利用者が見え、無所属の利用者と別機関の利用者は見えない | + +この直前の実行は、修正をマージ済みなのに C5 と C6 で失敗した。`compose render` を `build` より先に実行しており、render は直前のビルド記録からイメージのタグを取るため、古いイメージのまま動いていた。ビルドのあとに render し直して解決した。 + +### 受入の実行 — 2026-11-11、PostgreSQL 18 上の Python 3.13 の WaterButler と MFR、12 件中 11 件 + +ブランチ `feat/pin-py313-wb-mfr`、本体のチェックアウトから実行。固定版: WaterButler `3319c106` と MFR `f9da1db3`(どちらも `python:3.13-slim@sha256:e48f59cd…ed90`、Python 3.13.18、Debian 13)、osf.io `8fc45de4`、wiki-frontend `5985d18b`(osf.io の基底 `8fc45de4` の上に組み、イメージのタグは `8fc45de461fd-5985d18b75da`)、y-websocket `d4d1cfae`、cas-overlay `22610b76`、PostgreSQL 18.6。MFR は arm64 向けにネイティブで組むようになり(`build_platform` を削除)、freecad を含まないため、所有者の判断で CAD のプレビュー(.step/.stp)は廃止した。 + +| 手順 | 終了 | 結果 | +|---|---|---| +| `db upgrade` | 0 | PostgreSQL 9.6 → 18 をダンプと復元で移行(ダンプ 4.8 MB、531 個のオブジェクトが一致)。旧ディレクトリは `postgres_data.pg9.6-20261111T111040Z` として残る | +| `build` | 30 | 1 回目: WaterButler の `apt-get upgrade` が「空き容量不足」で失敗。このホストの他の作業と共有する Docker のディスクが満杯だった。以前の固定版の `grdm-dev/*` のタグのうち不要になったものを削除した(ビルドキャッシュは削除していない)。2 回目は osf.io・WaterButler・MFR・cas-overlay・wiki-frontend・y-websocket を組めたが、elasticsearch2 が `apt-get update` で失敗(「not signed」。同じくディスク満杯)。2026-11-06 以降入力が変わっていない、2026-11-10 に組んだ既存のイメージを使った。 | +| `build` 後の `compose render` | 0 | 古いビルドのタグなし | +| `up` | 0 | 24 サービスが正常。`wb` と `wb_worker` は uid 1000(利用者 `waterbutler`)、`mfr` は uid 1000 で動き、Celery 5.6.3 のワーカーは準備完了。新しい秘密は不要で、テンプレートと `wb.env`/`mfr.env` は変えていない。 | +| `accept --seed --only core` | 60 | 実行 [`acc-20261111T115949Z-ab529c`](runs/acc-20261111T115949Z-ab529c/results.toon): **12 件中 11 件合格**。C5 の成功ケースが失敗(下記) | +| `scan` | 51 | Trivy・Semgrep・gitleaks は完了し、基本対策は合格。ZAP は Docker のディスクの空きが 0 バイトの間、3 つの対象すべてで報告を出さなかった(rc 3) | +| `report` | 0 | | + +**C5 の成功ケース(プレビュー)の失敗はインストーラーでなく統合リポジトリ側にある。** MFR は描画要求に 400 を返した。MFR のログは `ClientConnectorError: Cannot connect to host 127.0.0.1:7777`、web のログは MFR が新たに送る要求 `GET /download/<guid>/?direct&mode=render&action=download`(MFR のコンテナから、応答 302)を示す。MFR `f9da1db3`(上流 #9 から取り込み)は `/<guid>/` の形の OSF の URL を `/download/<guid>/` に書き換える。osf.io `8fc45de4` では、`/<guid>/` の経路は WaterButler の URL を `_internal=(mode == 'render')` で作るので、MFR は `http://wb:7777` を受け取っていた。`/download/<guid>/` の経路(`persistent_file_download`)は `_internal` なしで作るので、MFR はブラウザ向けの `WATERBUTLER_URL`(`http://127.0.0.1:7777`)を受け取る。これはコンテナ内からは届かず、資格情報の送り先でもない。直すのは MFR(GRDM では描画の URL を書き換えない)か osf.io(`persistent_file_download` がもう一方の経路と同じく `mode=render` に従う)である。C5 の拒否ケース(401)は合格のまま。 + +Trivy の CRITICAL/HIGH(対象ごと、`critical/high`): + +```toon +trivy_critical_high: + db: "2026-11-10 19:01 UTC(前: scan_20261110T022540Z、DB 2026-11-10 01:02 UTC)" + targets[23]{target,before,after,note}: + waterbutler,13/178,0/47,"45e97a51 → 3319c106; 47 件すべて修正版の無い Debian 13、許容リスト" + modular-file-renderer,53/410,3/127,"749e58d3 → f9da1db3; 130 件すべて修正版の無い Debian 13、許容リスト" + osf.io,118/566,118/566,"fe90e5c3 → 8fc45de4" + wiki-frontend,65/332,65/332,"" + rdm-ember-osf-web,407/1911,407/1911,prebuilt + cas-overlay,43/105,43/105,"" + postgres,11/117,2/147,"9.6 → 18.6 (Debian 13)" + unoconv,1/100,1/156,"同じイメージ、新しい DB" + redis,1/37,1/37,"" + elasticsearch2,5/18,5/18,"" + elasticsearch6,2/50,2/50,"" + rabbitmq,0/7,0/7,"" + mongo,0/2,0/2,"" + fakecas,0/2,0/2,"" + sharejs,0/0,0/0,"" + y-websocket,0/0,0/0,"" + src/RDM-waterbutler-dev2027,2/32,0/0,lockfiles + src/RDM-modular-file-renderer-dev2027,14/79,0/0,lockfiles + src/RDM-osf.io-dev2027,55/279,55/279,lockfiles + src/RDM-wiki-frontend-dev2027,21/107,21/107,lockfiles + src/RDM-cas-overlay-dev2027,6/20,6/20,lockfiles + src/RDM-y-websocket-dev2027,0/0,0/0,lockfiles + repo,0/30,0/30,"" + total: "817/4382 → 729/3943(未許容 726/3769、58 項目で許容 3/174)" +``` + +許容リストは 58 項目になった(イメージと CVE ごとに 1 項目。[SPEC-03 §5.1](../spec/03_security_gate.md#japanese) の新しい `image` 欄で範囲を限定し、見直し日は 2026-12-31)。節目は M1(報告のみ)なので件数は報告にとどまる。`manifest/allowlist.baseline.json` の上限は節目の終了時に所有者が決める。 + +### 受入の実行 — 2026-11-11、プレビューを直した MFR、12 件中 12 件 + +ホスト・ブランチ・固定版は上の実行と同じだが、MFR だけが違う。本体のチェックアウトの manifest を、手元で未コミットのまま `2c4a88a6` に向けた。これは RDM-modular-file-renderer-dev2027 PR #7 の先頭のコミットで、osf.io の `/<guid>/?direct&mode=render&action=download` を `/download/<guid>/` に書き換えるのをやめ、osf.io が組み立てたとおりの URL を要求する。そのため osf.io の `/<guid>/` の経路が内部向けの WaterButler の URL を返す(`mode=render` では `_internal=True`)。資格情報の組は `http://web:5000` → `http://wb:7777` のまま変わらない。PR #7 の試験は、ブラウザ向けの `127.0.0.1:7777`、`localhost`、似た名前のホスト、別ポートが、要求の前に拒否されるか、資格情報を受け取らないことも示す。コミット済みの固定版は PR #7 のマージまで `f9da1db3` のままにし、マージ後にそのマージコミットを固定する。 + +Docker のディスクは 400 GiB に拡張済みだった(実行前の空きは 193 GB)。 + +| 手順 | 終了 | 結果 | +|---|---|---| +| `compose render` | 0 | | +| `build` | 0 | MFR を `2c4a88a663ca` でネイティブに組んだ。他の部品はキャッシュ、elasticsearch2 は組み直し | +| `build` 後の `compose render` | 0 | 古いビルドのタグなし | +| `up` | 0 | 24 サービスが正常。`mfr` は `grdm-dev/modular-file-renderer:2c4a88a663ca` で動く | +| `accept --seed --only core` | 0 | 実行 `acc-20261111T122608Z-2d3599`: **12 件中 12 件合格**。証跡のディレクトリは手元に残し、この PR ではコミットしない。C5 の成功ケースは 200 を返し、拒否ケースは 401 のまま。web のログには MFR からの `GET /<guid>/?direct&mode=render&action=download`(302)が残り、MFR のログに `ClientConnectorError` は無い。 | +| `scan` | 0 | 5 つの部分すべてが完了した。基本対策は合格、Trivy・Semgrep・gitleaks・ZAP は ok。ZAP は 3 つの対象すべてで再び報告を出した。門は報告のみで合格 | +| `report` | 0 | | + +検査の件数(`scan_20261111T123133Z`): 10,983 件。内訳は CRITICAL 726、HIGH 3,782、MEDIUM 4,147、LOW 2,322、INFO 6。これとは別に 58 項目の許容リストで 177 件を許容した。Trivy の未許容の CRITICAL/HIGH は 726/3,769 で、上の実行と変わらない。MFR の変更はコードだけで、パッケージは増えていない。Semgrep: HIGH 12。gitleaks: 0。ZAP: HIGH 1、MEDIUM 8、LOW 12、INFO 6。 + +これに先立ち、直す前の MFR `f9da1db3` で C5 を再現した(実行 `acc-20261111T121734Z-7329b7`、C5 のみ。成功ケース 400、拒否ケース 401)。ログの内容は上の実行と同じだった。 + +### 受入の実行 — 2026-11-11、PR #7 のマージで MFR を固定、12 件中 12 件 + +RDM-modular-file-renderer-dev2027 PR #7 は `9771b8cf` としてマージされた。その中身は上で使った先頭 `2c4a88a6` と同じである。manifest は MFR を `9771b8cf` に固定し、注記から未マージの記述を除いた。他の固定版は変えていない。 + +| 手順 | 終了 | 結果 | +|---|---|---| +| `compose render` | 0 | | +| `build` | 0 | MFR を `9771b8cfb352` でネイティブに組んだ | +| `build` 後の `compose render` | 0 | 古いビルドのタグなし | +| `up` | 0 | 24 サービスが正常。`mfr` は `grdm-dev/modular-file-renderer:9771b8cfb352` で動く | +| `accept --seed --only core` | 0 | 実行 [`acc-20261111T132104Z-530071`](runs/acc-20261111T132104Z-530071/results.toon): **12 件中 12 件合格**。C5 の成功ケースは 200、拒否ケースは 401。実行フォルダを gitleaks で検査して何も見つからなかったので、コミットした。 | +| `scan` | 0 | `scan_20261111T132607Z`: 基本対策は合格。Trivy(23 対象)・Semgrep・gitleaks・ZAP(3 対象)は ok。門は報告のみで合格 | +| `report` | 0 | | + +検査の件数: 10,984 件。内訳は CRITICAL 726、HIGH 3,782、MEDIUM 4,148、LOW 2,322、INFO 6。これとは別に、58 項目の許容リストで 177 件を許容した。道具ごとの内訳: Trivy 726/3,769/4,139/2,310(CRITICAL/HIGH/MEDIUM/LOW)、Semgrep は HIGH 12、gitleaks は 0、ZAP は HIGH 1・MEDIUM 9・LOW 12・INFO 6。ZAP の MEDIUM が 1 件多いことを除けば、上の実行と同じである。 + +**PR #45 レビュー r1 の後(同じスタック、2026-11-11 14:18 UTC)。** 許容リストの照合を変えた(R1-01)。58 項目はそれぞれ、自分のイメージの正確な `name@version` のパッケージを名指しする。一覧は Trivy の生の報告から取った。Trivy の検出を許容するのは、`FixedVersion` が空で `Status` が修正版なしの状態の間だけで、対象はそのイメージの OS パッケージだけである。`scan` と `report` をやり直し、どちらも終了 0 だった。`scan_20261111T141804Z` の件数は上と同じで、未許容が 10,984 件、許容が 177 件。177 件は 58 項目すべてが当てはまった結果である。保存した報告 `20261111T132241Z` を新しい照合に通しても同じ 177 件になる。新しい単体試験では、古い照合が修正版のある検出、名指していないパッケージ、名前の前方一致を許容していたことが示された。 + +### 受入の実行 — 2026-11-12、ローカルの osf.io 候補、Elasticsearch 8・y-websocket のみ・必須サインイン・管理者の第二要素、14 件中 14 件 + +スタック: Mac Studio(プロジェクト `grdm-dev`、Colima)で、ブランチ `feat/installer-osf-integration` のインストーラーを、以前の固定版と PostgreSQL 18 から進めた。osf.io は**ローカルの候補で、push 済みのコミットではない**。RDM-osf.io-dev2027 の develop `73ff43b3c2`(#13 Django 2.2、#12 y-websocket のエディタ、#14 の render URL を含む)に、開いている PR #8(必須サインイン、`c9d293dd1a`)、#10(管理画面の 2 段階サインイン、`834d1b62c0`)、#11(Elasticsearch 8、`b4bc134188`)の先頭をマージしたもの。手で解消した競合は `admin/common_auth/urls.py`、`admin/base/settings/defaults.py`、`api/base/authentication/backends.py`、`website/search/views.py`、`api/search/views.py`、`website/search/elastic_search.py`、`.github/scripts/ci/run-tests.sh` で、三つの PR はリベースのときに同じものに出会う。manifest は `9e1fb9c8597d` に固定した(ローカルの bare ミラーと、`GIT_CONFIG_*` の `url.<ミラー>.insteadOf` で渡した。インストーラーにローカル参照の仕組みは無く、足してもいない)。y-websocket `97252369cf`(PR #5)と ember-osf-web `4180cb58bb`(PR #2・#3)は実際のマージコミットである。 + +| 手順 | 終了 | 結果 | +|---|---|---| +| `secrets rotate` | 40 | 設計どおり巻き戻した。ビルド中で旧スタックの以前の ember イメージが 300 秒で健全にならず、古い `runtime/.env` を戻した。このため `secrets init --missing` を足した | +| `secrets init --missing` | 0 | `ELASTIC8_PASSWORD` と `ELASTIC8_OSF_PASSWORD` を足し、`SHAREJS_SECRET` を捨てた。ほかの値は変えていない | +| `compose render` | 0 | | +| `build` | 0 | osf.io `9e1fb9c8597d`(コールドで約 55 分。Alpine 3.9 で `scipy` などをコンパイルする)、y-websocket、ember-osf-web(静的な nginx)、wiki-frontend のオーバーレイ `9e1fb9c8597d-5985d18b75da`、`elasticsearch8:8.19.24-1` | +| `build` 後の `compose render` | 0 | 古いビルドのタグなし | +| `up` | 0 | 23 サービスが正常。`elasticsearch8` は 25 秒で健全。`osf_init` が統合の migration と `addons_twofactor` の 0006・0007 を適用し、機関を Elasticsearch 8 へ書いた。sharejs・mongo・Elasticsearch 2 のコンテナは孤児として消えた | +| `accept --seed --only core`(最初) | 60 | 13 件失敗。インストーラーの欠陥を三つ見つけ、直した(下記) | +| `accept --seed --only core`(最終) | 0 | 実行 [`acc-20261111T230217Z-d8363c`](runs/acc-20261111T230217Z-d8363c/results.toon): **14 件中 14 件合格**(C1〜C7、成功と拒否) | +| `scan` | 0 | `scan_20261111T231702Z`(コミット `a14fb70`): 基本対策は合格で、新しい例外なし(mongo の例外は消え、elasticsearch8 は要らない)。Trivy 22 対象・Semgrep・gitleaks は ok。ZAP は `web` を注つきで飛ばし、`admin` と `ember_osf_web` を検査。門は報告のみで合格 | + +候補での最初の受入が見つけた欠陥。いずれもインストーラーで試験つきで直した。 + +1. **`api` と `admin` が 30 秒ずつ止まった**(C2・C4・C6・C7 がタイムアウト、後片付けで 12 件のエラー)。Django 2.2 の開発用サーバーは接続を開いたままにし、`runserver --nothreading`(`invoke apiserver` が起動する)はブラウザの使われない二本目の接続を、ソケットがタイムアウトするまで待つ。どちらもスレッドありの `manage.py runserver` で動かす。 +2. **C1 とすべてのブラウザのシナリオがループバックの監視に失敗した**。対象は `https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/4.4.2/zxcvbn.js` で、ビルドが `/zxcvbn.js` を同梱するのに、静的な ember の `index.html` がそれを名指しする。版つきで既知の外部アセットに足し、ember リポジトリへの指摘にした。 +3. **ファイルページが自分のファイルを読めなかった**(C7、「Could not GET file contents」)。3.13 の WaterButler は `CORS_ALLOW_ORIGIN` が空だと CORS ヘッダーを送らない。`wb.env` に web と ember の起点だけを列挙した。 + +同じスタックでシナリオの外から確認したこと。認証した所有者は `/api/v1/search/` と API v2 で非公開プロジェクトを見つけ(1 件)、別の利用者は見つけず(0 件)、利用者検索は本人だけを返し、匿名の検索は 401(PR #8 の境界が Elasticsearch 8 の索引で保たれる)。TOTP 未登録の管理者は `/account/login/two-factor/setup/` へ着き、第二要素なしでは管理画面がサインインへ転送される。`y_websocket_data` の LevelDB にファイルの部屋がある。未確認: amd64、Linux のホスト、管理者の `idp` モードの Shibboleth プロファイル、`ENABLE_PUBLIC_ACCESS=true`、push していない `images.yml` の smoke test、Elasticsearch 2 のデータを持つ導入の移行(`invoke migrate_search`)。 + +検査の件数: 6,200 件(CRITICAL 314、HIGH 1,875、MEDIUM 2,654、LOW 1,353、INFO 4)。これとは別に、58 項目の許容リストで 177 件を許容した。Elasticsearch 2・MongoDB・sharejs がスタックから消えたので、10,984 件(CRITICAL 726、HIGH 3,782)から減った。新しい `elasticsearch8` イメージは Trivy で HIGH 2 件と MEDIUM 30 件を足す(パッケージ単位で記録し、許容はしていない)。`allowlist_baseline` は 58 項目に対しまだ 0 なので、M2 の件数の条件は開いたままである(状況表)。 + +### 受入実行 — 2026-11-12(UTC)、マージ後の最終の固定版、14 件中 14 件 + +スタック: ブランチ `feat/installer-osf-integration` のコミット `f223f2c`(PR #52 のマージ時点の `develop` を取り込み済み)のインストーラーを、同じ Mac Studio の動いている同じプロジェクト `grdm-dev` に、0.19 の候補から上書きで適用した。固定版はすべて各リポジトリのマージコミットになった。osf.io `90b10661c8dc`(RDM-osf.io-dev2027 の `develop`。#8 `66ce3a573c`、#10 `24108e0fe3`、#11 `90b10661c8` のマージ後)、ember-osf-web `4d505f000f8d`(#4)、y-websocket `97252369cf`。ほかの固定版は変わらない。wiki-frontend のオーバーレイのタグは osf.io の固定版に従う(`90b10661c8dc-5985d18b75da`)。#8 は R7-01(`workflow` 権限の要る CI ジョブ。RDM-osf.io-dev2027 の issue #16 で追跡)を除いてマージした。 + +```toon +steps[9]{step,exit,result}: + "secrets init --missing",0,"追加も削除も無し(Elasticsearch 8 の秘密は既にある)" + "compose render",0,"タグ `grdm-dev/osf.io:90b10661c8dc`、`grdm-dev/ember-osf-web:4d505f000f8d`" + "build",0,"9 分 7 秒(22:23:26Z〜22:32:33Z)。Docker のレイヤーキャッシュを使ったので、コールドビルドではない" + "build 後の compose render",0,"古いビルドのタグは無し" + "up",0,"68 秒。web・api・admin・worker・ember_osf_web が新しいイメージで作り直され、23 サービスが healthy" + "health --network",0,"23 サービス、ループバックの bind は 16 件。警告が 1 件: *:5000 の他者のリスナー(`ControlCe`、macOS)" + "invoke migrate_search",0,"13 秒。Elasticsearch 8 で索引を作り直した(`private__website` のエイリアスが `private__website_v2` を指す。種データには移す内容がほとんど無かった)" + "accept --seed --only core",0,"実行 acc-20261112T223428Z-fda84a: 合格 14、失敗 0、エラー 0、skip 0" + "scan と report",0,"scan はコミット f223f2c で 2 分 55 秒、report は終了 0" +``` + +`web` コンテナの中で `addons_twofactor` の migration 0006 と 0007 が適用済みと出る。実行 [`acc-20261112T223428Z-fda84a`](runs/acc-20261112T223428Z-fda84a/results.toon): C1〜C7 の成功と拒否がすべて合格(C4・C7 の拒否は WebSocket が 4401 で閉じ、C6 の拒否は 403、C5 の拒否は 401)。netguard は既知の外部要求 138 件を数えて遮断した。 + +検査(`scan_20261112T223858Z`、節目 M1): baseline は pass。Trivy 0.75.0(22 対象)、Semgrep 1.184.0(4)、gitleaks 8.30.1(1)、ZAP(3)はすべて ok で問題なし。ゲートは report-only で pass。未解決は 6,264 件(CRITICAL 314、HIGH 1,889、MEDIUM 2,656、LOW 1,401、INFO 4)。これとは別に、58 項目の許容リストで 177 件を許容した。`allowlist_baseline` は今も 0。ツール別は Trivy 6,239、ZAP 13、Semgrep 12、gitleaks 0。0.19 の候補は 6,200 件で、増えた 64 件は分析していない(osf.io の固定版が候補からマージ後の先端に移り、依存はビルド時に解決されるため)。Mac の検査は終了 0 で完走した。amd64 のエミュレーションでの検査([DEMO-22](22_core_install_ubuntu_amd64_lima.md#japanese))では、ember-osf-web のイメージの Trivy 呼び出しが 5 分の制限に達した。 + +この実行が示さないこと: 最終の固定版での空の `runtime/` からのコールドな導入(上書きで進めたので、ビルドが速かった理由でもある)、本物の Elasticsearch 2 のデータからの索引の再構築(種データのみで、ほぼ空)、`images.yml` のスモーク試験と per-OS のワークフローファイル(`workflow` 権限待ち)、Shibboleth の `idp` での管理者ログイン、`ENABLE_PUBLIC_ACCESS=true`。 + +**ZAP の行の訂正と限界(0.21)。** 上の「ZAP(3)はすべて ok で問題なし」は次のように読む。この検査は以前の処理で動き、ZAP のメッセージが対象自身と違うアドレスを示せば `web` を除外し、三つの対象を検査したかどうかにかかわらず数えていた。必須サインイン(既定で、この実行の設定)では、`web` は匿名の要求に ZAP が追えない転送しか返さない。同じスタックの前回の実行(上の `scan_20261111T231702Z`)では `web` は注つきで飛ばされ、`admin` と `ember_osf_web` だけが検査された。したがってこの行が支えるのは、`admin` と `ember_osf_web` を検査し、合計に ZAP の検出 13 件があることまでで、ZAP が `web` やサインインの向こうを検査したことは**示さない**。これは前回の実行からの推定で、この実行を読んだ結果ではない。生レポート `scan_20261112T223858Z` はコミット済みの受入フォルダにないので、6,264 件も ZAP の対象ごとの網羅も、このリポジトリから独立に再導出できず、どちらも作業者の記録である。除外は見かけより弱かった(届かない任意のホストへの転送を受け入れた)。検査の処理は今は、生成済みのサインイン設定と、設定済みのアドレスへの転送を示す探りを求め、対象外を数えずに `skipped_targets` に載せ、それ以外は終了 51 のままにする([SPEC-03 §4.3](../spec/03_security_gate.md#japanese))。この厳しくした処理は単体試験でだけ確かめ、Mac Studio のスタックでは**実行していない**。そのスタックでの次の検査の記録は未了である。 + +**ライブのスタックでの厳しくした ZAP の処理(0.22)。** 2026-11-13 に、Mac Studio のスタック(PR #56 のマージ `ca2a010`)で `grdm-dev --yes scan --dynamic` を実行し、1 分 18 秒、終了 0 だった。ZAP のイメージ内の探り(`python3`、要求は一回、転送は追わない)は動いた。`web`(`http://web:5000`)は注「ZAP NOT RUN on web ... an anonymous request is redirected (verified by a probe) to the configured sign-in address 127.0.0.1:8081 ... so no page behind sign-in was scanned」つきでサインインの壁の向こうとして飛ばされ、検査済みには数えられなかった。`admin` と `ember_osf_web` は検査され、ZAP の検出は 13 件(8 件と 5 件。作業者の記録)。これらの重大度の内訳は、ここでは主張しない。この実行のレポートをコミットしていないので、「HIGH の検出は無い」はこの記録からは言えず、report-only の規則での `pass` もそれを意味しない。これは作業者の一回の実行で、生レポートはコミットしていないため、記録された結果であり、ここから独立に再導出できない。サインインの向こうを検査したことは示さない。それには認証つきの検査が要る。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Emulation | Running a program built for one kind of CPU on another kind, slower but working. | ある種類の CPU 向けに作ったプログラムを別の CPU で動かすこと。遅いが動く。 | +| Wheel | A ready-made package of Python code for one CPU type; if none exists, pip must compile it. | ある CPU 向けにできあがった Python の部品の箱。無いと pip が自分で組み立てる。 | diff --git a/docs/demo/21_core_install_ubuntu_arm64_lima.md b/docs/demo/21_core_install_ubuntu_arm64_lima.md new file mode 100644 index 0000000..351a1f0 --- /dev/null +++ b/docs/demo/21_core_install_ubuntu_arm64_lima.md @@ -0,0 +1,552 @@ +# DEMO-21 Core Install on Ubuntu 24.04 arm64 / Ubuntu 24.04 arm64 でのコア導入記録 + +> **Summary:** What actually happened when `installer/install-ubuntu.sh --yes --profile core` was run on a fresh Ubuntu 24.04 arm64 virtual machine, as an ordinary user whose uid is not 1000. One entry per run; nothing is edited after the fact. +> **概要:** 新しい Ubuntu 24.04 arm64 の仮想マシンで、uid が 1000 でない一般利用者として `installer/install-ubuntu.sh --yes --profile core` を実行したときに実際に起きたこと。実行ごとに 1 節。後から書き換えない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.5 — 2026-11-13. **Learned:** a "cold" install on a VM that has run the project before is never cold in the places that bite: Docker named volumes remember the checkout that created them, so a new checkout silently opened the old one's data and failed on a password 8 minutes into `up`; and a VM's own DNS forwarder, not the installer, stopped the build of modular-file-renderer until Docker was given a caching resolver. With those two handled, the final pins install in 694 s from cached layers, all 14 acceptance tests pass (C7 included), and `scan` and `report` exit 0 (only the acceptance run is committed evidence; the other measurements are operator-recorded, see the provenance note in the final-pins section). / このプロジェクトを以前に動かした VM での「コールド」な導入は、問題になる箇所では決してコールドにならない。Docker の名前付きボリュームは作ったチェックアウトを覚えていて、新しいチェックアウトは古いものの データを黙って開き、`up` の 8 分後にパスワードで失敗した。また modular-file-renderer のビルドを止めたのはインストーラーではなく VM 自身の DNS 転送で、Docker にキャッシュ付きリゾルバーを与えるまで通らなかった。この二つを片付けると、最終の固定版はキャッシュ済みの層から 694 秒で入り、受入試験は C7 を含む 14 件がすべて合格し、`scan` と `report` は終了 0 だった(コミットした証跡は受入試験の実行だけで、ほかの測定は運用者の記録。最終の固定版の節の出所の注記を参照)。 + 0.4 — 2026-11-10. **Learned:** fix 4b changed files that cannot be published yet: `installer-prereq-lint.yml` and its helper wait on branch `feat/per-os-installers` for a token with the `workflow` scope, so on develop Semgrep has no workflow of this branch to read. / 修正 4b が変えたファイルはまだ公開できない。`installer-prereq-lint.yml` とその補助は `workflow` スコープのトークンをブランチ `feat/per-os-installers` で待つので、develop では Semgrep が読むこのブランチのワークフローは無い。 + 0.3 — 2026-11-10. **Learned:** the first Linux run of `grdm-dev db upgrade`, as uid 2001, moved PostgreSQL 9.6 to 18 in 12 seconds with 531 objects verified, and with develop's acceptance fixes the core suite passes 12 of 12 on Linux arm64 too; and the setup record had understated an exposure: the host's `~/.config/gh` was readable in the VM until the home mount was removed, so `install-ubuntu.sh` now stops when it finds credentials on a shared folder. / uid 2001 での `grdm-dev db upgrade` の Linux での最初の実行は、PostgreSQL 9.6 を 18 へ 12 秒で移し、531 個の対象を照合した。develop の受入試験の修正を入れると、コアの試験は Linux arm64 でも 12 件中 12 件合格する。また準備の記録は露出を小さく書いていた。ホームの mount を外すまで、ホストの `~/.config/gh` は VM から読めた。そこで `install-ubuntu.sh` は共有フォルダに資格情報を見つけると止まる。 + 0.2 — 2026-11-10. **Learned:** a Linux host user whose uid is not 1000 is the case that finds ownership bugs the Mac hides: after the volumes (PR #36) it was the ZAP report directory, and only the full sequence through `scan` and `report` (run 4, exit 0) shows that none is left on this host. / uid が 1000 でない Linux のホスト利用者こそ、Mac が隠す所有者の不具合を見つける。ボリューム(PR #36)の次は ZAP の報告ディレクトリだった。この機械に残りが無いと示せるのは、`scan` と `report` まで通した一連の実行(第 4 回、終了 0)だけである。 + 0.1 — 2026-11-10. **Learned:** the dry runs of [ADR-08](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md) could not show three Linux facts that a real run did: Ubuntu's own amd64 emulator crashes inside a long build, QEMU makes the first ember build twice as slow as on the Mac, and the cloud image lacks a library that the acceptance browser's driver needs. / [ADR-08](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md) の dry run では分からず、実際の実行で分かった Linux の事実が三つあった。Ubuntu 自身の amd64 エミュレーターは長いビルドの中で落ち、QEMU では ember の初回ビルドが Mac の 2 倍遅く、クラウドイメージには受入試験のブラウザのドライバーが要るライブラリが無い。 +- Normative source: [SPEC-02 Installer CLI](../spec/02_installer_cli.md) · [SPEC-04 Acceptance Tests](../spec/04_acceptance_tests.md) +- Related: [docs/demo/README.md](README.md) · [DEMO-20 Core install on Mac Studio](20_core_install_mac_studio.md) · [ADR-08 Per-OS installer entry points](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Setup — 2026-11-10, branch `feat/per-os-installers` rebased onto develop 03c7358 + +The host is the Mac Studio of [DEMO-20](20_core_install_mac_studio.md) (128 GiB). The test machine is a Lima virtual machine (Lima runs Linux inside macOS with Apple's virtualization; a *virtual machine* is a whole computer simulated by software) named `grdm-ubuntu2404`: + +```toon +vm: + name: grdm-ubuntu2404 + tool: limactl 2.2.1, vmType vz, no Rosetta + image: ubuntu-24.04-server-cloudimg-arm64 (release-20260926), Ubuntu 24.04.5 LTS + cpus: 8 + memory: 40 GiB + disk: 120 GiB + user: "grdm, uid 2001 gid 2001, passwordless sudo (a developer with sudo, not root)" + checkout: "/home/grdm/RDM-developer-guide on the VM's own disk (cloned from a git bundle, so Linux owners and modes are real)" + shared_from_host: "/mnt/mirrors only, read-only: bare mirrors of the six integration repositories (git clone --mirror on the host)" + git_config: "url.file:///mnt/mirrors/<repo>.git.insteadOf https://github.com/RCOSDP/<repo>.git; no token in the VM" +``` + +> **Warning:** Lima's Ubuntu template also mounts the host home directory read-only, even when the configuration lists its own mounts, because the template's list is merged in. That would have shown the host's GitHub credentials inside the VM. The home mount was removed from the instance configuration before any repository was copied, and the VM restarted with only `/mnt/mirrors`. + +On arm64 (the CPU type of Apple Silicon and many servers; see [REF-01](../reference/REF-01_Glossary.md)), Linux runs the two amd64-only components (amd64 is the CPU type of most PCs and cloud servers; see [REF-01](../reference/REF-01_Glossary.md)), modular-file-renderer (the file preview service) and ember-osf-web (the newer web pages of GRDM), under emulation (running a program built for one kind of CPU on another, slower but working). Docker (the tool that builds images and runs containers; see [REF-01](../reference/REF-01_Glossary.md)) Desktop on the Mac emulates with Rosetta; plain Linux uses QEMU (a free CPU emulator) registered in the kernel's binfmt_misc table. + +### Run 1 — fresh VM, the one command + +```toon +run1: + command: ./installer/install-ubuntu.sh --yes --profile core + started: 2026-11-10T11:24+09:00 + result: exit 30 (image build failed) after 2868 s + prerequisites[6]{step,result}: + "apt: python3-venv",installed + "Docker apt key",fingerprint 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 verified + "Docker Engine",29.9.3 with Compose 5.7.0 and buildx + "amd64 emulation","apt qemu-user-static 1:8.2.2+ds-0ubuntu1.18 (flags OPF)" + "trivy 0.75.0, gitleaks 8.21.2",SHA-256 verified into ~/.local/bin + "docker group","usermod, then this run continued under sg docker" + steps[5]{step,code,status}: + doctor,0,"ok: ubuntu 24.04 arm64, 39.1 GiB, 111.9 GiB free, official, no problems" + plan,0,ok + "secrets init",0,ok + "compose render",0,ok + build,30,failed + images[3]{component,platform,status,note}: + osf.io,linux/arm64,built,"about 30 min: pandas and scipy compiled from source on Alpine" + waterbutler,linux/arm64,built,"" + modular-file-renderer,linux/amd64,build-failed,"libgvc6 post-install: x86_64-binfmt-P: QEMU internal SIGSEGV, exit 139" +``` + +What this proves: + +- The prerequisite script works on a fresh Ubuntu 24.04 arm64 machine: signed Docker repository, pinned scanners, the docker group question, and the hand-over to `install.sh` inside `sg docker`. +- The private repositories were read from read-only mirrors through `insteadOf`; `doctor`'s `git ls-remote` check passed without any token. +- **Failure 1:** Ubuntu 24.04's `qemu-user-static` crashes inside modular-file-renderer's build, 48 minutes into the run. + +Isolation test, one minute each: `apt-get install libgvc6` in a `debian:buster-slim` amd64 container. + +```toon +qemu_isolation[4]{emulator,result}: + "Ubuntu qemu-user-static 8.2.2 (apt)","QEMU internal SIGSEGV, apt exit 100" + "tonistiigi/binfmt qemu-v8.1.5",installed + "tonistiigi/binfmt qemu-v9.2.2",installed + "tonistiigi/binfmt qemu-v10.2.3-68",installed +``` + +The crash belongs to Ubuntu's 8.2.2 build, not to a QEMU version range, so only that build is refused. + +**Fix 1** (`fix(installer)`): `install-ubuntu.sh` no longer installs `qemu-user-static`; it registers QEMU from `tonistiigi/binfmt:qemu-v10.2.3-68`, pinned by digest, and replaces a registered Ubuntu 8.2.2 handler (`--uninstall qemu-x86_64`, then `--install amd64`). `doctor` reads the registered interpreter's `--version` and stops with exit 13 before the build when it is the measured-bad build, printing the replacement command. + +### Run 2 — same VM, QEMU 10.2.3 registered by hand + +```toon +run2: + command: ./installer/install.sh --yes --profile core + result: exit 40 (health) after 3929 s + steps[6]{step,code,status}: + "secrets init",0,"skipped (runtime/.env exists)" + doctor,0,ok + plan,0,ok + "compose render",0,ok + build,0,"ok: 12 components, modular-file-renderer built under QEMU 10.2.3" + up,40,"not healthy after 1800s: ember_osf_web" + ownership: "volume_owner_init, volume_access_check_1000 and volume_access_check_999 completed with host uid 2001" + ember_first_build: "container start 03:43:05Z, port 4200 answered 04:27:20Z: 44 min 15 s, one core busy" + health_after_ember: "grdm-dev health exit 0, 24 services ok" +``` + +What this proves: + +- The ownership handling of PR (pull request: a proposed change waiting for review; see [REF-01](../reference/REF-01_Glossary.md)) #36 works for a host user whose uid is not 1000: every writer could use its volume, and the volumes stay owned by the container uids. +- **Failure 2:** QEMU builds ember about twice as slowly as Rosetta (13–25 minutes in DEMO-20). The single-threaded build cannot use more CPUs, so `up`'s 1800 s wait stopped an install that would have become healthy. + +**Fix 2** (`fix(installer)`): on Linux arm64, when the profile has amd64 services, `up` waits 5400 s by default (about twice the measurement); `--timeout` still overrides it. macOS and amd64 keep 1800 s. + +### Acceptance attempt 1 — stack of run 2 + +`grdm-dev health` exited 0. Installing the browser failed before any test: `playwright install --with-deps chromium` exited 127 because the Node.js driver of Playwright (a robot that drives a web browser to test a website; see [REF-01](../reference/REF-01_Glossary.md)) could not load `libatomic.so.1`, which the Ubuntu 24.04 cloud image does not contain. `grdm-dev accept` then exited 2 (no Chromium). + +**Failure 3, fix 3** (`fix(installer)`): `install-ubuntu.sh` adds `libatomic1` to its apt packages when `GRDM_WITH_ACCEPT=1`, and on Linux `grdm-dev accept` prints `sudo apt-get install -y libatomic1` before, and `playwright install-deps chromium` after, the existing install command. With `libatomic1` installed by hand, `playwright install --with-deps chromium` exited 0. + +### Acceptance run — stack of run 2 (osf.io 389415a4) + +| Run ID | Scope | Result | +|---|---|---| +| [`acc-20261110T043053Z-5c5dae`](runs/acc-20261110T043053Z-5c5dae/results.toon) | Core C1–C6 | 5 of 12 passed | + +C1 and C3 pass in both cases, C2's rejection passes. The other seven fail for the reasons DEMO-20 recorded on develop (project-name selector, wiki bundle wiring, preview, admin path, and ShareJS assets on port 7007); they are fixed on the separate branch `fix/accept-c2-c6`, which this branch does not contain. No failure here is specific to Linux. + +### Run 3 — the fixed scripts from the broken state, cold start + +Before the run: the checkout moved to commit 48859d7 (fixes 1–3), Ubuntu's 8.2.2 handler was registered again (`systemctl restart systemd-binfmt`), `libatomic1` was removed, and `grdm-dev reset --yes` emptied `runtime/volumes/` (exit 0; the files belonged to container uids). With Ubuntu's handler registered, `grdm-dev doctor` exited 13 and printed the replacement command. + +```toon +run3: + command: GRDM_WITH_ACCEPT=1 ./installer/install-ubuntu.sh --yes --profile core + started: 2026-11-10T04:40:11Z + result: exit 51 (scanner incomplete) after 2828 s + plan[2]: + "sudo: install apt packages: libatomic1" + "sudo: replace the registered amd64 emulator (qemu-x86_64 version 8.2.2 ...) with QEMU from tonistiigi/binfmt:qemu-v10.2.3-68@sha256:400a4873..." + steps[8]{step,code,status}: + "secrets init",0,"skipped (runtime/.env exists)" + doctor,0,ok + plan,0,ok + "compose render",0,ok + build,0,"ok (cached)" + up,0,"ok within the 5400 s wait; ember's first build again about 40 min" + "health --network",0,"ok, every port on 127.0.0.1" + scan,51,"semgrep incomplete; zap incomplete" +``` + +What this proves: fixes 1–3 work end to end, and the reset of PR #36 works for uid 2001. Two new failures stop `scan`: + +- **Failure 4a:** ZAP (the OWASP website scanner, which runs as uid 1000 in its container) could not write its report into `runtime/reports/`, owned by uid 2001; `zap-baseline` exited 0 without a report for all three targets. Docker Desktop's bind mounts ignore owners, so the Mac never showed it. +- **Failure 4b:** Semgrep (a tool that reads source code looking for dangerous patterns; see [REF-01](../reference/REF-01_Glossary.md)) 1.184.0 reported four "Internal matching error"s on `.github/workflows/installer-prereq-lint.yml`, a file this branch adds. Semgrep reads `run:` blocks as shell; the inline PowerShell of the Windows job breaks its engine (removing that job alone made the errors disappear). + +**Fix 4** (`fix(installer)`, commit 0c46a82): each ZAP target gets its own work directory under `runtime/reports/`, mode 0777 inside the 0700 `runtime/`, removed after the masked copy is saved; the PowerShell parse moved to `.github/scripts/Test-PowerShellSyntax.ps1`, and each PowerShell `run:` is a one-line call. Semgrep's `p/default` and `p/github-actions` then report no error on the workflows. + +### Acceptance run — stack of run 3 + +| Run ID | Scope | Result | +|---|---|---| +| [`acc-20261110T052932Z-f1da54`](runs/acc-20261110T052932Z-f1da54/results.toon) | Core C1–C6 | 5 of 12 passed (same cases as above) | + +Chromium was installed with the command that `grdm-dev accept` now prints on Linux: `playwright install chromium` exited 0 and `playwright install-deps chromium` exited 0. + +### Run 4 — commit 0c46a82, the one command: **exit 0** + +```toon +run4: + command: GRDM_WITH_ACCEPT=1 ./installer/install-ubuntu.sh --yes --profile core + started: 2026-11-10T05:34:32Z + result: exit 0 after 204 s (images cached, volumes kept from run 3) + prerequisites: "All prerequisites are already present; nothing to change." + steps[9]{step,code,status}: + "secrets init",0,"skipped (runtime/.env exists)" + doctor,0,ok + plan,0,ok + "compose render",0,ok + build,0,ok + up,0,ok + "health --network",0,ok + scan,0,"ok: trivy 23 targets, semgrep 4 packs, gitleaks, zap 3 targets; gate report-only, pass" + report,0,ok + url: "http://127.0.0.1:5000/" + health_after: "grdm-dev health exit 0" +``` + +Findings by severity (report-only at M1, [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md)): 817 critical, 4355 high, 4392 medium, 2164 low, 5 info. + +### Correction to the setup — the home mount did expose the credentials + +The warning in the setup says the home mount "would have shown" the host's GitHub credentials. That understates it. The VM's first boot mounted `/Users/<user>` read-only, and a directory listing confirmed it, so `~/.config/gh/hosts.yml` was readable inside the VM from the first boot until the mount was removed from `lima.yaml` and the VM restarted, a few minutes later. Nothing read the file, and no repository or tool had been copied into the VM by then. Since commit 45b49be, `install-ubuntu.sh` stops with exit 10 when a shared folder (virtiofs, 9p, sshfs and similar) holds `.config/gh/hosts.yml`, `.git-credentials`, `.netrc` or `.docker/config.json`. The environment guide now has the Lima steps: delete the `"~"` mount before the first start, then check `mount`. + +### Run 5 — rebased onto develop 50740b1 (PR #40–#43), database upgrade + +PostgreSQL (the main database where GRDM keeps its records; see [REF-01](../reference/REF-01_Glossary.md)) moved from 9.6 to 18.6 on develop (PR #42, [ADR-12](../decisions/ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md)), so the existing data had to be upgraded before `up`. The branch was rebased twice; the commits named above became 8538324 (fixes 1–3, was 48859d7) and 05ff502 (fix 4, was 0c46a82). The host mirrors were refreshed with `git fetch`. The manifest now pins osf.io 8fc45de4; WaterButler (45e97a51) and modular-file-renderer (749e58d3) stay at their pinned commits. + +```toon +run5: + head: 45b49be + steps[10]{step,code,seconds,note}: + down,0,3,"" + doctor,0,0,"" + "compose render",0,1,"" + build,0,14,"images already built from the same pins" + "db status",0,10,"data 9.6, image 18 (postgres:18.6, digest pinned): upgrade-needed" + "db upgrade",0,12,"see below" + "db status",0,0,"data 18: current" + up,0,296,"healthy; ember's built pages were kept in their volume" + "secrets rotate",0,293,"every secret regenerated, containers recreated, healthy" + health,0,0,"" + db_upgrade: + user: "grdm, uid 2001 (the data directory belongs to uid 999)" + steps: "start-old, count-old, dump, stop-old, init-new, restore, verify, stop-new, swap: all ok" + dump_bytes: 4546929 + verified: "531 objects compared (row counts per table, sequences, extensions) in 3 databases (cas, osf, postgres) and 1 role" + kept: "runtime/volumes/postgres_data.pg9.6-20261110T055459Z" +``` + +### Acceptance run — stack of run 5: **12 of 12** + +| Run ID | Scope | Result | +|---|---|---| +| [`acc-20261110T060511Z-80ee06`](runs/acc-20261110T060511Z-80ee06/results.toon) | Core C1–C6 | **12 of 12 passed**, exit 0 | + +### Run 6 — the one command on the same stack + +`GRDM_WITH_ACCEPT=1 ./installer/install-ubuntu.sh --yes --profile core` exited 0 after 273 s: every step through `scan` (Trivy, Semgrep, gitleaks and ZAP all `ok`) and `report`. `grdm-dev health` exited 0 afterwards. Findings by severity: 808 critical, 4328 high, 4470 medium, 2267 low, 6 info. + +### Final pins, cold one-command install — 2026-11-13, branch `feat/installer-osf-integration` head cb93d48 (PR #56) + +The same VM `grdm-ubuntu2404` (stopped since 2026-11-10; started for this test), the same user (uid 2001), a **new, empty checkout directory** cloned from a git bundle of cb93d48, and the same read-only mirrors, refreshed on the host (osf.io now at the pinned 90b10661) plus one more, ember-osf-web, which the final pins need. Pins: osf.io 90b10661, WaterButler 3319c106, modular-file-renderer 9771b8cf, ember-osf-web 4d505f00, cas-overlay 22610b76, wiki-frontend 5985d18b, y-websocket 97252369. + +**Provenance of this section.** Only the acceptance run `acc-20261113T021549Z-92641d` is committed as evidence (`docs/demo/runs/`): it shows 14 of 14 tests passed, both C7 cases included, in about 59 seconds. Everything else here — the durations of the five install runs, the DNS-burst measurements, the real exit 13 of the volume guard, the `scan` and `report` exit codes and times, and the VM's starting contents — was recorded by the operator agent from the VM's terminal output; the raw logs are not committed and have not been independently checked. + +**What "cold" means here, honestly.** The VM was not new. At the start Docker held 25 images (29.3 GB) and 18.4 GB of build cache from the runs of 2026-11-10: older `grdm-dev` images of osf.io, WaterButler, modular-file-renderer, wiki-frontend, y-websocket, fakecas, sharejs, Elasticsearch 2 and 6, unoconv 25.2-1 and cas-overlay 22610b76 (the last two equal to today's pins), the former prebuilt ember image, the ZAP image, `redis:7`, `postgres`, `rabbitmq`, `mongo:3.4`, the three QEMU installer images and `debian:buster-slim`, plus the old checkout's stopped stack, 19 Docker volumes (11 of them the old stack's named `grdm-dev_*` volumes) and the old checkout's `runtime/`. The prerequisites (Docker 29.9.3, scanners, apt packages) were already present, so the "prerequisites" half of `install-ubuntu.sh` only had to replace the registered emulator. The old stack was stopped with its own `grdm-dev down` and nothing else was deleted. The new checkout's `runtime/` did not exist; osf.io, WaterButler, modular-file-renderer, ember-osf-web and wiki-frontend were all rebuilt from their new pins, with base layers from the build cache. + +```toon +final_pins_runs[5]{run,command,started_utc,exit,seconds,cause}: + 1,"GRDM_WITH_ACCEPT=1 ./installer/install-ubuntu.sh --yes --profile core",2026-11-12T23:50:01Z,30,2444,"modular-file-renderer: uv sync, dns error (Try again) after osf.io 36.7 min and WaterButler 2.3 min had built" + 2,"same",2026-11-13T00:34:03Z,30,36,"same cause, another package" + 3,"same, after Docker was given a caching resolver",2026-11-13T00:44:26Z,30,3678,"ember static stage: apk upgrade stalled 55 min on an idle connection; I killed apk" + 4,"same",2026-11-13T01:46:03Z,40,789,"up: osf_init password authentication failed; the volumes belonged to the older checkout" + 5,"same, after the volumes were released",2026-11-13T02:00:28Z,0,694,"all nine steps ok" +``` + +Run 5 is the first run whose result is a pass; no run was interrupted by the tester except run 3's stalled `apk`. + +**Failure 5 (environment): the VM's DNS forwarder drops bursts.** `uv sync` in the modular-file-renderer Dockerfile opens up to 50 downloads at once; each build container asks the VM's resolver (Lima's user-mode network, 192.168.5.2) directly, with no cache. Measured with `dig` from inside the VM against that address, 30 simultaneous queries for `files.pythonhosted.org` all succeeded, 60 failed for every AAAA query (the A queries succeeded), and 120 failed for every AAAA query and one A query, while the VM's own systemd-resolved stub (127.0.0.53) answered 120 of 120. The same build passes with `UV_CONCURRENT_DOWNLOADS=4` (51 s) and with `--network host` (1 min 41 s), and fails every time as built (three attempts, about 25 s each). Sequential lookups and 200 parallel `getent` calls from a container did not fail, which is why `grdm-dev doctor` and the quick tests never showed it. This is a property of Lima's network, not of the installer, and the pinned Dockerfile is not this repository's. The VM was changed, not the installer: systemd-resolved listens also on the Docker bridge address (`DNSStubListenerExtra=172.17.0.1`) and Docker's `daemon.json` has `"dns": ["172.17.0.1"]`. In the installer, `build` now says so: when a failed build's output shows DNS failing, the exit 30 message names it and where to look (`fix(installer)`). + +**Failure 6 (environment): one stalled download.** In run 3 ember-osf-web's Node stage (its production build step took 122 s) finished (it builds on the host's own arm64 now, not under QEMU), then `apk upgrade --no-cache` in the nginx stage stayed 55 minutes on one connection that had received 217 719 bytes and then nothing (`ss`: `lastrcv` 3 587 s). `apk` has no read timeout and `build` has no watchdog, so the install would have waited until a human looked. Killing `apk` failed the build, and the rerun passed that step at once. Not fixed: a stalled download of a third party is not the installer's to repair, but a silent `build` is something an operator needs to be able to see; see the note below. + +**Failure 7 (installer): a second checkout opened the first one's database.** Run 4 built everything and failed in `up` after 8 minutes (13 minutes into the run): `osf_init` retried `migrate` against postgres, which logged `password authentication failed for user "postgres"` for every attempt. The rendered Compose file binds `postgres_data` and seven other volumes to `runtime/volumes/<name>` of the new checkout, but Docker had already created the volumes `grdm-dev_postgres_data` and others on 2026-11-10 for the old checkout (`docker volume inspect`: `device` is the old checkout's path), keeps the options of the day a volume was created, and Compose reuses an existing volume without comparing. So postgres started on the old data and the new `runtime/.env`'s random password did not match. Anyone who clones the repository into a second directory, or moves it, meets this. **Fix** (`fix(installer)`, tests included): `grdm-dev up` compares the bindings of the rendered file with `docker volume inspect` before starting anything and stops with exit 13, naming each volume and printing the way out (`grdm-dev down` in the other checkout, then `docker volume rm <names>`; the files stay on disk); it deletes nothing, and a missing volume or an unreadable answer is not a problem. On this VM, with the fix applied to the checkout, `up` returned exit 13 and named eight volumes; with the fix removed again, `grdm-dev reset --yes` in the new checkout (which runs `down --volumes` and empties its `runtime/volumes/`) released them, and run 5 started from empty volumes. + +**Run 5, the one command: exit 0 after 694 s.** `GRDM_WITH_ACCEPT=1 ./installer/install-ubuntu.sh --yes --profile core` at head cb93d48 (the fix commit is not part of it). Prerequisites: "All prerequisites are already present". Steps: `secrets init` skipped (`runtime/.env` from run 1), `doctor`, `plan`, `compose render`, `build` (about 1 min, every layer cached by runs 1 to 4), `up` (7 min 7 s from empty volumes: PostgreSQL 18 initialised, `osf_init` migrations, Elasticsearch 8 setup), `health --network`, `scan` (about 3 min 22 s) and `report`, all exit 0; URL `http://127.0.0.1:5000/`. Every service is built for linux/arm64: ember-osf-web and modular-file-renderer no longer need amd64 emulation. + +| After run 5 | Command | Exit | Time | +|---|---|---|---| +| health | `grdm-dev health --network` | 0 | 1 s | +| acceptance, first try | `GRDM_WITH_ACCEPT=1 .venv/bin/grdm-dev --yes accept --seed --only core` | 2 | 0 s: no Chromium yet, the message prints the install command | +| Chromium | `playwright install chromium`, then `playwright install-deps chromium` (the printed commands) | 0, 0 | 32 s, 57 s | +| acceptance | the same command | 0 | 59 s: **14 of 14** including C7 ([`acc-20261113T021549Z-92641d`](runs/acc-20261113T021549Z-92641d/results.toon)); none of the suite's hard waits timed out | +| scan | `grdm-dev --yes scan` | 0 | 113 s: Trivy 22 targets (version 0.75.0), Semgrep 4 packs, gitleaks, ZAP 2 scanned and 1 skipped behind sign-in (`web`: the sign-in address is not reachable from the scanner); gate report-only, pass; 314 critical, 1835 high, 2653 medium, 1298 low, 4 info; Trivy's 5-minute limit per call did not bite | +| report | `grdm-dev --yes report` | 0 | 0 s: `partial` before the acceptance run (the accept report was absent), `complete` after it | + +**Observations, not changed.** (1) With these pins no component is amd64-only, yet `install-ubuntu.sh` still asks for `sudo` to replace the registered amd64 emulator (and runs a privileged container to do it); that step could be conditional on the profile having an amd64 service, as the 5400 s wait already is. (2) `GRDM_WITH_ACCEPT=1` at install time adds the Playwright package and `libatomic1`, not the Chromium browser: acceptance needs the two printed commands once more. (3) Between runs 1 and 5 the BuildKit cache grew from 18.4 GB to 38.0 GB and the disk from 51 GB to 81 GB used, so `doctor`'s 40 GiB free-disk advice (36.2 GiB free at the end here) is about right for a second build. (4) osf.io alone took 36.7 minutes to build in run 1 on 8 CPUs, with only the base layers cached; run 5's 694 s is therefore not a cold-start time, and the cold total of runs 1 to 5, from 23:50:01Z to 02:12:02Z, is 2 h 22 min including the 55-minute stall and about 40 minutes of diagnosis. + +### What remains + +- **Ubuntu 24.04 amd64:** not run. No emulation is needed there, so failures 1, 2 and the arm64 part of 3 do not apply; failure 4a (ZAP as uid 1000) and the PR #36 ownership path do, and need a clean amd64 machine. +- **WSL2** (a way to run Linux inside Windows; see [REF-01](../reference/REF-01_Glossary.md)): not run. Docker comes from Docker Desktop, whose bind mounts behave like the Mac's, so 4a is not expected there; the checkout must be inside WSL. It needs Windows 11 hardware ([ADR-08 §5](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md)). +- **Emulation after a reboot:** the QEMU registration is not persistent. While Ubuntu's `qemu-user-static` is installed, its 8.2.2 handler returns at boot; `doctor` then stops with exit 13, and running `install-ubuntu.sh` again replaces it. +- **Acceptance:** done in run 5 (12 of 12) after develop took the fixes of PR #40. +- **CI workflows:** `installer-prereq-lint.yml`, `installer-full.yml` and the helper of fix 4b, `.github/scripts/Test-PowerShellSyntax.ps1`, are pending on branch `feat/per-os-installers` until they are pushed with a token that has the `workflow` scope. Everything else of this record is on develop. +- **Cold start time:** with images already built, `up` from empty volumes took about 40 minutes on this VM, nearly all of it ember's first build under QEMU. Building the images from nothing took about 60 minutes more (runs 1 and 2). + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 準備 — 2026-11-10、develop 03c7358 へ rebase したブランチ `feat/per-os-installers` + +ホストは [DEMO-20](20_core_install_mac_studio.md) の Mac Studio(128 GiB)。試験機は Lima の仮想マシン `grdm-ubuntu2404` である(Lima は Apple の仮想化機能で macOS の中に Linux を動かす道具。*仮想マシン* はソフトウェアで模した一台のコンピュータ): + +```toon +vm: + name: grdm-ubuntu2404 + tool: limactl 2.2.1、vmType vz、Rosetta なし + image: ubuntu-24.04-server-cloudimg-arm64(release-20260926)、Ubuntu 24.04.5 LTS + cpus: 8 + memory: 40 GiB + disk: 120 GiB + user: "grdm、uid 2001・gid 2001、パスワードなしの sudo(root ではなく sudo を持つ開発者)" + checkout: "VM 自身のディスク上の /home/grdm/RDM-developer-guide(git bundle から clone。Linux の所有者とモードが本物になる)" + shared_from_host: "/mnt/mirrors だけを読み取り専用で共有: 統合リポジトリ 6 本の bare ミラー(ホストで git clone --mirror)" + git_config: "url.file:///mnt/mirrors/<repo>.git.insteadOf https://github.com/RCOSDP/<repo>.git。VM にトークンは置かない" +``` + +> **Warning:** Lima の Ubuntu テンプレートは、設定に独自の mount を書いてもテンプレート側の一覧が併合されるため、ホストのホームディレクトリを読み取り専用で mount する。そのままではホストの GitHub 資格情報が VM から見えてしまう。リポジトリを入れる前にインスタンスの設定からホームの mount を外し、`/mnt/mirrors` だけで VM を再起動した。 + +arm64(Apple Silicon や多くのサーバーの CPU の種類。[REF-01](../reference/REF-01_Glossary.md))の Linux では、amd64 専用の部品 modular-file-renderer と ember-osf-web をエミュレーション(ある CPU 向けのプログラムを別の CPU で動かすこと。遅いが動く)で動かす。Mac の Docker Desktop は Rosetta でエミュレーションするが、素の Linux はカーネルの binfmt_misc 表に登録した QEMU(無償の CPU エミュレーター)を使う。 + +### 第 1 回 — 新しい VM で一つのコマンド + +```toon +run1: + command: ./installer/install-ubuntu.sh --yes --profile core + started: 2026-11-10T11:24+09:00 + result: 2868 秒後に終了 30(イメージのビルド失敗) + prerequisites[6]{step,result}: + "apt: python3-venv",導入 + "Docker の apt 鍵",指紋 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 を検証 + "Docker Engine",29.9.3、Compose 5.7.0 と buildx + "amd64 エミュレーション","apt の qemu-user-static 1:8.2.2+ds-0ubuntu1.18(flags OPF)" + "trivy 0.75.0、gitleaks 8.21.2",SHA-256 を検証して ~/.local/bin へ + "docker グループ","usermod の後、この実行は sg docker の下で続行" + steps[5]{step,code,status}: + doctor,0,"ok: ubuntu 24.04 arm64、39.1 GiB、空き 111.9 GiB、公式、問題なし" + plan,0,ok + "secrets init",0,ok + "compose render",0,ok + build,30,failed + images[3]{component,platform,status,note}: + osf.io,linux/arm64,built,"約 30 分: Alpine で pandas と scipy をソースから組む" + waterbutler,linux/arm64,built,"" + modular-file-renderer,linux/amd64,build-failed,"libgvc6 の post-install: x86_64-binfmt-P: QEMU internal SIGSEGV、終了 139" +``` + +分かったこと: + +- 前提条件スクリプトは新しい Ubuntu 24.04 arm64 で動く。署名付きの Docker リポジトリ、固定したスキャナー、docker グループの確認、`sg docker` の中での `install.sh` への引き継ぎ。 +- 非公開リポジトリは `insteadOf` で読み取り専用のミラーから読めた。`doctor` の `git ls-remote` の確認はトークン無しで通った。 +- **失敗 1:** Ubuntu 24.04 の `qemu-user-static` が、実行開始から 48 分後、modular-file-renderer のビルドの中で落ちる。 + +切り分け(各 1 分): amd64 の `debian:buster-slim` コンテナで `apt-get install libgvc6`。 + +```toon +qemu_isolation[4]{emulator,result}: + "Ubuntu の qemu-user-static 8.2.2(apt)","QEMU internal SIGSEGV、apt 終了 100" + "tonistiigi/binfmt qemu-v8.1.5",導入できた + "tonistiigi/binfmt qemu-v9.2.2",導入できた + "tonistiigi/binfmt qemu-v10.2.3-68",導入できた +``` + +落ちるのは QEMU の版の範囲ではなく Ubuntu の 8.2.2 のビルドなので、拒むのはそのビルドだけにした。 + +**修正 1**(`fix(installer)`): `install-ubuntu.sh` は `qemu-user-static` を入れず、ダイジェストで固定した `tonistiigi/binfmt:qemu-v10.2.3-68` から QEMU を登録し、登録済みの Ubuntu 8.2.2 は置き換える(`--uninstall qemu-x86_64` の後に `--install amd64`)。`doctor` は登録済みインタープリターの `--version` を読み、落ちると実測したビルドならビルドの前に終了 13 で止まり、置き換えのコマンドを表示する。 + +### 第 2 回 — 同じ VM、QEMU 10.2.3 を手で登録 + +```toon +run2: + command: ./installer/install.sh --yes --profile core + result: 3929 秒後に終了 40(health) + steps[6]{step,code,status}: + "secrets init",0,"skipped(runtime/.env あり)" + doctor,0,ok + plan,0,ok + "compose render",0,ok + build,0,"ok: 12 部品。modular-file-renderer は QEMU 10.2.3 で組めた" + up,40,"1800 秒後も ember_osf_web が健康でない" + ownership: "volume_owner_init、volume_access_check_1000、volume_access_check_999 がホストの uid 2001 で完了" + ember_first_build: "コンテナ起動 03:43:05Z、4200 番が応答 04:27:20Z: 44 分 15 秒、使うのは 1 コア" + health_after_ember: "grdm-dev health 終了 0、24 サービスが ok" +``` + +分かったこと: + +- PR #36 の所有者処理は uid が 1000 でないホストの利用者でも働く。書き手はすべて自分のボリュームを使え、ボリュームはコンテナの uid の所有のままである。 +- **失敗 2:** QEMU は ember の組み立てに Rosetta(DEMO-20 で 13〜25 分)のおよそ 2 倍かかる。単一スレッドのビルドなので CPU を増やしても速くならず、`up` の 1800 秒の待ちが、健康になるはずの導入を止めた。 + +**修正 2**(`fix(installer)`): Linux arm64 でプロファイルに amd64 のサービスがあるとき、`up` の既定の待ちは 5400 秒(実測のおよそ 2 倍)。`--timeout` で上書きできる。macOS と amd64 は 1800 秒のまま。 + +### 受入試験の試み 1 — 第 2 回のスタック + +`grdm-dev health` は終了 0。試験の前にブラウザの導入で失敗した。Playwright の Node.js ドライバーが `libatomic.so.1` を読めず、`playwright install --with-deps chromium` は終了 127 だった。Ubuntu 24.04 のクラウドイメージにはこのライブラリが無い。続く `grdm-dev accept` は終了 2(Chromium が無い)。 + +**失敗 3・修正 3**(`fix(installer)`): `install-ubuntu.sh` は `GRDM_WITH_ACCEPT=1` のとき apt パッケージに `libatomic1` を加え、Linux の `grdm-dev accept` は既存の導入コマンドの前に `sudo apt-get install -y libatomic1`、後に `playwright install-deps chromium` を表示する。`libatomic1` を手で入れると `playwright install --with-deps chromium` は終了 0 だった。 + +### 受入試験の実行 — 第 2 回のスタック(osf.io 389415a4) + +| 実行 ID | 範囲 | 結果 | +|---|---|---| +| [`acc-20261110T043053Z-5c5dae`](runs/acc-20261110T043053Z-5c5dae/results.toon) | コア C1〜C6 | 12 件中 5 件合格 | + +C1 と C3 は両方のケースで合格し、C2 の拒否も合格した。残る 7 件の失敗は、DEMO-20 が develop で記録した理由と同じ(プロジェクト名のセレクタ、wiki バンドルの配線、プレビュー、管理画面のパス、7007 番の ShareJS の資産)で、このブランチが含まない別ブランチ `fix/accept-c2-c6` で直している。Linux に固有の失敗は無い。 + +### 第 3 回 — 壊れた状態から修正後のスクリプトで、コールドスタート + +実行前に、チェックアウトをコミット 48859d7(修正 1〜3)へ移し、Ubuntu の 8.2.2 を再登録し(`systemctl restart systemd-binfmt`)、`libatomic1` を削除し、`grdm-dev reset --yes` で `runtime/volumes/` を空にした(終了 0。ファイルはコンテナの uid の所有だった)。Ubuntu の登録がある状態で `grdm-dev doctor` は終了 13 となり、置き換えのコマンドを表示した。 + +```toon +run3: + command: GRDM_WITH_ACCEPT=1 ./installer/install-ubuntu.sh --yes --profile core + started: 2026-11-10T04:40:11Z + result: 2828 秒後に終了 51(スキャナーが不完全) + plan[2]: + "sudo: apt パッケージを入れる: libatomic1" + "sudo: 登録済みの amd64 エミュレーター(qemu-x86_64 version 8.2.2 ...)を tonistiigi/binfmt:qemu-v10.2.3-68@sha256:400a4873... の QEMU に置き換える" + steps[8]{step,code,status}: + "secrets init",0,"skipped(runtime/.env あり)" + doctor,0,ok + plan,0,ok + "compose render",0,ok + build,0,"ok(キャッシュ)" + up,0,"5400 秒の待ちの中で ok。ember の初回ビルドは今回も約 40 分" + "health --network",0,"ok。すべてのポートが 127.0.0.1" + scan,51,"semgrep が不完全、zap が不完全" +``` + +分かったこと: 修正 1〜3 は端から端まで働き、PR #36 の reset も uid 2001 で働く。新しい失敗が二つ `scan` を止めた。 + +- **失敗 4a:** ZAP(OWASP のウェブサイト検査器。コンテナの中では uid 1000 で動く)が、uid 2001 の所有の `runtime/reports/` に報告を書けず、`zap-baseline` は三つの対象すべてで報告なしに終了 0 だった。Docker Desktop の bind mount は所有者を無視するので、Mac では表に出なかった。 +- **失敗 4b:** Semgrep 1.184.0 が、このブランチで加えた `.github/workflows/installer-prereq-lint.yml` に「Internal matching error」を 4 件出した。Semgrep は `run:` をシェルとして読み、Windows のジョブのインラインの PowerShell でエンジンが壊れる(そのジョブだけを除くとエラーが消えた)。 + +**修正 4**(`fix(installer)`、コミット 0c46a82): ZAP の対象ごとに `runtime/reports/` の下に専用の作業ディレクトリを作り、0700 の `runtime/` の中で 0777 にし、マスクした写しを保存した後に消す。PowerShell の構文確認は `.github/scripts/Test-PowerShellSyntax.ps1` に移し、PowerShell の `run:` は一行の呼び出しにした。その後、Semgrep の `p/default` と `p/github-actions` はワークフローにエラーを出さない。 + +### 受入試験の実行 — 第 3 回のスタック + +| 実行 ID | 範囲 | 結果 | +|---|---|---| +| [`acc-20261110T052932Z-f1da54`](runs/acc-20261110T052932Z-f1da54/results.toon) | コア C1〜C6 | 12 件中 5 件合格(上と同じケース) | + +Chromium は、Linux の `grdm-dev accept` が今は表示するコマンドで入れた。`playwright install chromium` は終了 0、`playwright install-deps chromium` も終了 0。 + +### 第 4 回 — コミット 0c46a82、一つのコマンド: **終了 0** + +```toon +run4: + command: GRDM_WITH_ACCEPT=1 ./installer/install-ubuntu.sh --yes --profile core + started: 2026-11-10T05:34:32Z + result: 204 秒後に終了 0(イメージはキャッシュ、ボリュームは第 3 回のまま) + prerequisites: "前提条件はすべて揃っています。変更するものはありません。" + steps[9]{step,code,status}: + "secrets init",0,"skipped(runtime/.env あり)" + doctor,0,ok + plan,0,ok + "compose render",0,ok + build,0,ok + up,0,ok + "health --network",0,ok + scan,0,"ok: trivy 23 対象、semgrep 4 パック、gitleaks、zap 3 対象。門は report-only で合格" + report,0,ok + url: "http://127.0.0.1:5000/" + health_after: "grdm-dev health 終了 0" +``` + +重大度ごとの検出数(M1 では報告のみ、[ADR-03](../decisions/ADR-03_Staged_Security_Gate.md)): critical 817、high 4355、medium 4392、low 2164、info 5。 + +### 準備の訂正 — ホームの mount は資格情報を実際に見せていた + +準備の Warning は、ホームの mount がホストの GitHub 資格情報を「見せてしまうところだった」と書いたが、それは小さく書きすぎである。VM の最初の起動で `/Users/<user>` が読み取り専用で mount され、ディレクトリの一覧で確かめた。最初の起動から、`lima.yaml` から mount を外して VM を再起動するまでの数分間、`~/.config/gh/hosts.yml` は VM の中から読めた。そのファイルを読んだものは無く、その時点で VM にはリポジトリも道具も入れていなかった。コミット 45b49be 以降、`install-ubuntu.sh` は共有フォルダ(virtiofs・9p・sshfs など)に `.config/gh/hosts.yml`・`.git-credentials`・`.netrc`・`.docker/config.json` があると終了 10 で止まる。環境ガイドには Lima の手順(最初の起動の前に `"~"` の mount を消し、`mount` で確かめる)を加えた。 + +### 第 5 回 — develop 50740b1(PR #40〜#43)へ rebase、PostgreSQL 18 + +develop で PostgreSQL(GRDM が記録を保つ主なデータベース。[REF-01](../reference/REF-01_Glossary.md))が 9.6 から 18.6 に上がった(PR #42、[ADR-12](../decisions/ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md))ので、`up` の前に既存のデータを移す必要があった。ブランチを 2 度 rebase したので、上に書いたコミットは 8538324(修正 1〜3、旧 48859d7)と 05ff502(修正 4、旧 0c46a82)になった。ホストのミラーは `git fetch` で更新した。manifest は osf.io を 8fc45de4 に固定し、WaterButler(45e97a51)と modular-file-renderer(749e58d3)は固定したコミットのまま。 + +```toon +run5: + head: 45b49be + steps[10]{step,code,seconds,note}: + down,0,3,"" + doctor,0,0,"" + "compose render",0,1,"" + build,0,14,"同じ固定から組んだイメージが既にある" + "db status",0,10,"データ 9.6、イメージ 18(postgres:18.6、ダイジェスト固定): upgrade-needed" + "db upgrade",0,12,"下を参照" + "db status",0,0,"データ 18: current" + up,0,296,"健康。ember の組み上がったページはボリュームに残っていた" + "secrets rotate",0,293,"秘密をすべて作り直し、コンテナを再作成して健康" + health,0,0,"" + db_upgrade: + user: "grdm、uid 2001(データディレクトリは uid 999 の所有)" + steps: "start-old、count-old、dump、stop-old、init-new、restore、verify、stop-new、swap: すべて ok" + dump_bytes: 4546929 + verified: "3 つのデータベース(cas、osf、postgres)と 1 つのロールで 531 個の対象(表ごとの行数、シーケンス、拡張)を照合" + kept: "runtime/volumes/postgres_data.pg9.6-20261110T055459Z" +``` + +### 受入試験の実行 — 第 5 回のスタック: **12 件中 12 件** + +| 実行 ID | 範囲 | 結果 | +|---|---|---| +| [`acc-20261110T060511Z-80ee06`](runs/acc-20261110T060511Z-80ee06/results.toon) | コア C1〜C6 | **12 件中 12 件合格**、終了 0 | + +### 第 6 回 — 同じスタックで一つのコマンド + +`GRDM_WITH_ACCEPT=1 ./installer/install-ubuntu.sh --yes --profile core` は 273 秒で終了 0。`scan`(Trivy・Semgrep・gitleaks・ZAP がすべて `ok`)と `report` まですべての段が通った。その後の `grdm-dev health` も終了 0。重大度ごとの検出数: critical 808、high 4328、medium 4470、low 2267、info 6。 + +### 最終の固定版、コールドの一つのコマンド — 2026-11-13、ブランチ `feat/installer-osf-integration` の先頭 cb93d48(PR #56) + +同じ VM `grdm-ubuntu2404`(2026-11-10 から停止。この試験のために起動)、同じ利用者(uid 2001)、cb93d48 の git bundle から clone した**新しい空のチェックアウトのディレクトリ**、同じ読み取り専用のミラー(ホストで更新し、osf.io は固定の 90b10661)に、最終の固定版が要る ember-osf-web を一つ加えた。固定: osf.io 90b10661、WaterButler 3319c106、modular-file-renderer 9771b8cf、ember-osf-web 4d505f00、cas-overlay 22610b76、wiki-frontend 5985d18b、y-websocket 97252369。 + +**この節の出所。** 証跡としてコミットしてあるのは受入試験の実行 `acc-20261113T021549Z-92641d`(`docs/demo/runs/`)だけで、C7 の二つの場合を含む 14 件中 14 件の合格を約 59 秒で示す。ほかのすべて — 5 回の導入の所要時間、DNS の同時問い合わせの測定、ボリューム検査の実機での終了 13、`scan` と `report` の終了コードと時間、VM の開始時の中身 — は、運用者のエージェントが VM の端末出力から記録したもので、生ログはコミットしておらず、独立に確かめてもいない。 + +**ここでの「コールド」の正直な意味。** VM は新品ではなかった。開始時に Docker には 2026-11-10 の実行が残したイメージ 25 個(29.3 GB)とビルドキャッシュ 18.4 GB があった。古い `grdm-dev` イメージ(osf.io、WaterButler、modular-file-renderer、wiki-frontend、y-websocket、fakecas、sharejs、Elasticsearch 2 と 6、unoconv 25.2-1、cas-overlay 22610b76。最後の二つは今回の固定と同じ)、以前の prebuilt の ember イメージ、ZAP のイメージ、`redis:7`、`postgres`、`rabbitmq`、`mongo:3.4`、QEMU 導入用イメージ三つ、`debian:buster-slim`、さらに古いチェックアウトの停止済みのスタックと Docker のボリューム 19 個(うち 11 個は古いスタックの名前付き `grdm-dev_*`)と古い `runtime/`。前提条件(Docker 29.9.3、スキャナー、apt パッケージ)も既にあり、`install-ubuntu.sh` の「前提条件」の半分がすることは登録済みのエミュレーターの置き換えだけだった。古いスタックはそのチェックアウトの `grdm-dev down` で止め、ほかは何も消していない。新しいチェックアウトの `runtime/` は無く、osf.io・WaterButler・modular-file-renderer・ember-osf-web・wiki-frontend は新しい固定からすべて組み直した(基底の層はビルドキャッシュから)。 + +```toon +final_pins_runs[5]{run,command,started_utc,exit,seconds,cause}: + 1,"GRDM_WITH_ACCEPT=1 ./installer/install-ubuntu.sh --yes --profile core",2026-11-12T23:50:01Z,30,2444,"modular-file-renderer: uv sync で dns error(Try again)。その前に osf.io が 36.7 分、WaterButler が 2.3 分で組み上がった" + 2,"同じ",2026-11-13T00:34:03Z,30,36,"同じ原因、別のパッケージ" + 3,"同じ(Docker にキャッシュ付きリゾルバーを与えた後)",2026-11-13T00:44:26Z,30,3678,"ember の static 段: apk upgrade が止まった接続で 55 分待った。apk を私が kill した" + 4,"同じ",2026-11-13T01:46:03Z,40,789,"up: osf_init が password authentication failed。ボリュームは古いチェックアウトのもの" + 5,"同じ(ボリュームを解放した後)",2026-11-13T02:00:28Z,0,694,"9 段すべて ok" +``` + +合格した最初の実行は第 5 回である。試験者が止めたのは第 3 回の止まった `apk` だけである。 + +**失敗 5(環境): VM の DNS 転送がバーストを落とす。** modular-file-renderer の Dockerfile の `uv sync` は最大 50 本のダウンロードを同時に始め、ビルド用コンテナはそれぞれ VM のリゾルバー(Lima のユーザーモードのネットワーク、192.168.5.2)へキャッシュなしで直接問い合わせる。VM の中からそのアドレスへ `dig` で測ると、`files.pythonhosted.org` への同時 30 問い合わせはすべて成功し、60 では AAAA の問い合わせがすべて失敗し(A は成功)、120 では AAAA のすべてと A の 1 件が失敗した。VM 自身の systemd-resolved のスタブ(127.0.0.53)は 120 件すべてに答えた。同じビルドは `UV_CONCURRENT_DOWNLOADS=4`(51 秒)でも `--network host`(1 分 41 秒)でも通り、そのままだと毎回失敗した(3 回、各約 25 秒)。逐次の問い合わせや、コンテナからの並列 200 件の `getent` は失敗しなかったので、`grdm-dev doctor` や簡単な試験では表に出なかった。これは Lima のネットワークの性質で、インストーラーのものではなく、固定した Dockerfile もこのリポジトリのものではない。変えたのは VM で、インストーラーではない。systemd-resolved が Docker のブリッジのアドレスでも待ち受け(`DNSStubListenerExtra=172.17.0.1`)、Docker の `daemon.json` を `"dns": ["172.17.0.1"]` にした。インストーラーでは `build` が原因を言うようにした。失敗したビルドの出力に名前解決の失敗があれば、終了 30 のメッセージがそれと確かめる場所を示す(`fix(installer)`)。 + +**失敗 6(環境): 一本のダウンロードが止まった。** 第 3 回で ember-osf-web の Node の段(本番ビルドの段が 122 秒)は終わった(今はホスト自身の arm64 で組み、QEMU を使わない)。その後 nginx の段の `apk upgrade --no-cache` が、217 719 バイトを受けた後は何も来ない一本の接続で 55 分止まった(`ss` の `lastrcv` は 3 587 秒)。`apk` には読み取りのタイムアウトが無く、`build` には監視が無いので、人が見るまで待ち続けるところだった。`apk` を kill するとビルドは失敗し、再実行ではその段はすぐ通った。直していない。第三者のダウンロードが止まるのはインストーラーの直すことではないが、`build` が黙っていることは運用者に見える必要がある。下の備考を参照。 + +**失敗 7(インストーラー): 二つ目のチェックアウトが一つ目のデータベースを開いた。** 第 4 回はすべてを組み、`up` の 8 分後(実行の 13 分後)に失敗した。`osf_init` が postgres に `migrate` を再試行し、postgres は試行のたびに `password authentication failed for user "postgres"` を記録した。render した Compose ファイルは `postgres_data` ほか 7 個のボリュームを新しいチェックアウトの `runtime/volumes/<名前>` に結び付けているが、Docker には古いチェックアウトのために 2026-11-10 に作った `grdm-dev_postgres_data` などが既にあり(`docker volume inspect` の `device` は古いチェックアウトのパス)、Docker はボリュームを作った日のオプションを覚え、Compose は比べずに既存のボリュームを再利用する。そのため postgres は古いデータで起動し、新しい `runtime/.env` のランダムなパスワードは合わなかった。リポジトリを二つ目のディレクトリへ clone する人も、移した人も、これに当たる。**修正**(`fix(installer)`、試験つき): `grdm-dev up` は何かを起動する前に、render したファイルの結び付けを `docker volume inspect` と比べ、違えば終了 13 で止まり、ボリュームの名前と出口(もう一方のチェックアウトで `grdm-dev down`、続けて `docker volume rm <名前>`。ファイルはディスクに残る)を示す。何も削除せず、無いボリュームや読めない応答は問題にしない。この VM で修正をチェックアウトに当てると `up` は終了 13 を返して 8 個のボリュームを名指しした。修正を外した後、新しいチェックアウトの `grdm-dev reset --yes`(`down --volumes` を行い `runtime/volumes/` を空にする)でそれらを解放し、第 5 回は空のボリュームから始まった。 + +**第 5 回、一つのコマンド: 694 秒で終了 0。** cb93d48(修正のコミットは含まない)で `GRDM_WITH_ACCEPT=1 ./installer/install-ubuntu.sh --yes --profile core`。前提条件は「前提条件はすべて揃っています」。段: `secrets init` は skipped(第 1 回の `runtime/.env`)、`doctor`、`plan`、`compose render`、`build`(約 1 分。第 1〜4 回で全層がキャッシュ済み)、`up`(空のボリュームから 7 分 7 秒: PostgreSQL 18 の初期化、`osf_init` の migrate、Elasticsearch 8 の設定)、`health --network`、`scan`(約 3 分 22 秒)、`report` がすべて終了 0。URL は `http://127.0.0.1:5000/`。すべてのサービスは linux/arm64 で組まれ、ember-osf-web と modular-file-renderer は amd64 のエミュレーションを要さない。 + +| 第 5 回の後 | コマンド | 終了 | 時間 | +|---|---|---|---| +| health | `grdm-dev health --network` | 0 | 1 秒 | +| 受入試験、最初 | `GRDM_WITH_ACCEPT=1 .venv/bin/grdm-dev --yes accept --seed --only core` | 2 | 0 秒: Chromium が無く、導入のコマンドを表示した | +| Chromium | `playwright install chromium`、続けて `playwright install-deps chromium`(表示されたコマンド) | 0、0 | 32 秒、57 秒 | +| 受入試験 | 同じコマンド | 0 | 59 秒: C7 を含む **14 件中 14 件**([`acc-20261113T021549Z-92641d`](runs/acc-20261113T021549Z-92641d/results.toon))。試験の固定の待ちは時間切れにならなかった | +| scan | `grdm-dev --yes scan` | 0 | 113 秒: Trivy 22 対象(版 0.75.0)、Semgrep 4 パック、gitleaks、ZAP は 2 対象を検査しサインインの奥の 1 件(`web`。サインインのアドレスにスキャナーが届かない)を飛ばした。門は report-only で合格。critical 314、high 1835、medium 2653、low 1298、info 4。Trivy の 1 回 5 分の上限には掛からなかった | +| report | `grdm-dev --yes report` | 0 | 0 秒: 受入試験の前は `partial`(accept の報告が無い)、後は `complete` | + +**備考(変えていない)。** (1) この固定では amd64 専用の部品が無いのに、`install-ubuntu.sh` は登録済みの amd64 エミュレーターの置き換えに `sudo` を求める(特権コンテナも動かす)。5400 秒の待ちと同じく、プロファイルに amd64 のサービスがあるときだけにできる。(2) 導入時の `GRDM_WITH_ACCEPT=1` が加えるのは Playwright のパッケージと `libatomic1` で、Chromium のブラウザではない。受入試験は表示される 2 つのコマンドをもう一度要する。(3) 第 1 回から第 5 回の間に BuildKit のキャッシュは 18.4 GB から 38.0 GB に、ディスクは使用 51 GB から 81 GB に増えた。`doctor` の空き 40 GiB の勧め(ここでは最後に 36.2 GiB)は二度目のビルドに対してほぼ妥当である。(4) 第 1 回の osf.io だけで、8 CPU・基底の層のみキャッシュ済みで 36.7 分かかった。第 5 回の 694 秒はコールドの時間ではなく、第 1〜5 回のコールドの合計は 23:50:01Z から 02:12:02Z の 2 時間 22 分で、55 分の停止と約 40 分の原因調べを含む。 + +### 残っていること + +- **Ubuntu 24.04 amd64:** 未実行。エミュレーションが要らないので、失敗 1・2 と 3 の arm64 の部分は当てはまらない。失敗 4a(uid 1000 の ZAP)と PR #36 の所有者処理は当てはまるので、まっさらな amd64 の機械が要る。 +- **WSL2:** 未実行。Docker は Docker Desktop から来て、その bind mount は Mac と同じく振る舞うので 4a は起きないと見込む。チェックアウトは WSL の中に置く。Windows 11 の実機が要る([ADR-08 §5](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md))。 +- **再起動後のエミュレーション:** QEMU の登録は残らない。Ubuntu の `qemu-user-static` が入っている間は起動時に 8.2.2 が戻り、`doctor` が終了 13 で止まる。`install-ubuntu.sh` をもう一度実行すると置き換える。 +- **受入試験:** develop が PR #40 の修正を取り込んだ後、第 5 回で完了(12 件中 12 件)。 +- **CI のワークフロー:** `installer-prereq-lint.yml`・`installer-full.yml` と修正 4b の補助 `.github/scripts/Test-PowerShellSyntax.ps1` は、`workflow` スコープのトークンで push されるまでブランチ `feat/per-os-installers` で保留中。この記録のほかの部分はすべて develop にある。 +- **コールドスタートの時間:** イメージが組めている状態で、空のボリュームからの `up` はこの VM で約 40 分。ほぼすべてが QEMU での ember の初回ビルドである。何も無い状態からのイメージのビルドには、さらに約 60 分かかった(第 1・2 回)。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Virtual machine | A whole computer simulated by software, inside a real one. | 本物のコンピュータの中でソフトウェアが模した、一台のコンピュータ。 | +| Emulation | Running a program built for one kind of CPU on another kind, slower but working. | ある種類の CPU 向けに作ったプログラムを別の CPU で動かすこと。遅いが動く。 | +| QEMU | A free program that emulates a CPU; Linux uses it to run amd64 programs on arm64. | CPU を模す無償のプログラム。Linux は arm64 で amd64 のプログラムを動かすのに使う。 | +| binfmt_misc | The Linux table that says which program runs a file of a foreign CPU type. | 別の CPU 向けのファイルをどのプログラムで動かすかを決める Linux の表。 | +| Mirror | An identical copy of a repository, here read-only and made on the host. | リポジトリの同一の写し。ここではホストで作った読み取り専用のもの。 | diff --git a/docs/demo/22_core_install_ubuntu_amd64_lima.md b/docs/demo/22_core_install_ubuntu_amd64_lima.md new file mode 100644 index 0000000..2e72392 --- /dev/null +++ b/docs/demo/22_core_install_ubuntu_amd64_lima.md @@ -0,0 +1,540 @@ +# DEMO-22 Core Install on Ubuntu 24.04 amd64 under QEMU / Ubuntu 24.04 amd64(QEMU 上)でのコア導入記録 + +> **Summary:** What happened when `installer/install-ubuntu.sh --yes --profile core` was run on a fresh Ubuntu 24.04 amd64 virtual machine that is fully emulated by QEMU on an Apple Silicon Mac, as an ordinary user whose uid is not 1000. One entry per run; nothing is edited after the fact. +> **概要:** Apple Silicon の Mac 上で QEMU が全体をエミュレーションする新しい Ubuntu 24.04 amd64 の仮想マシンで、uid が 1000 でない一般利用者として `installer/install-ubuntu.sh --yes --profile core` を実行したときに起きたこと。実行ごとに 1 節。後から書き換えない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.7 — 2026-11-14. **Learned:** the one command was run on amd64 with the final pins and every stage is now shown, but it never returned 0 in a single run, and each stop had a different owner: a missing mirror mapping in the VM (environment), Docker's old volumes (the guard of DEMO-21 0.5, working as designed), a ZAP failure on one target (not reproduced, cause unresolved), and Elasticsearch 8, whose health check allowed 2.5 minutes for a start that took 8 min 10 s under full-system emulation (an installer defect: fixed by widening the window to 17–26 minutes; the restart that passed was run with an earlier 120-try version of the fix, and the final 100 tries still exceed that start more than twice); with that, `accept --seed --wait-scale 10` passed 14 of 14 including C4 and C7 (the first clean run of the committed suite on amd64), and `scan --trivy-timeout 45m` plus `report` exited 0, while the default 5-minute Trivy limit was no longer the problem because ember-osf-web is now a small static image, so the knob was not shown to be needed here. / 最終の固定版で amd64 に一つのコマンドを実行し、すべての工程が示せた。ただし一回の実行で終了 0 にはならず、止まる原因は毎回違った。VM 内のミラー対応の欠け(環境)、Docker の古いボリューム(DEMO-21 0.5 のガードが設計どおり働いた)、1 対象での ZAP の失敗(再現せず、原因は未解決)、そして Elasticsearch 8 で、機械全体のエミュレーションで 8 分 10 秒かかる起動にヘルスチェックが 2.5 分しか許さなかった(インストーラーの不具合。窓を 17〜26 分に広げて直した。通った再起動は修正の以前の版(120 回)で実行したもので、最終の 100 回もその起動の 2 倍以上を許す)。これにより `accept --seed --wait-scale 10` は C4・C7 を含む 14 件中 14 件が合格した(コミットした試験を amd64 で素のまま走らせた最初の完全な結果)。`scan --trivy-timeout 45m` と `report` は終了 0 だった。ただし既定の 5 分の Trivy の制限はもう問題でなかった(ember-osf-web は小さな静的イメージになった)ので、このつまみがここで要ると示したわけではない。 + 0.6 — 2026-11-13. **Learned:** the two open amd64 items were each a missing knob, not a missing fix: a slow host had no way to stretch the suite's waits (so C4 could only pass on an uncommitted patched copy) and `scan` had no way to give Trivy more than its 5 minutes per call; `accept --wait-scale N` and `scan --trivy-timeout DURATION` now exist and are covered by unit tests, and on the Mac stack `accept --seed --wait-scale 3` passed 14 of 14 and recorded `wait_scale: 3.0` ([`acc-20261113T024626Z-b2178f`](runs/acc-20261113T024626Z-b2178f/results.toon)), which shows the knob works and says nothing about amd64; neither has been run on an amd64 stack yet, so the 11 of 12 and the exit 51 above stand as recorded. / amd64 で残っていた二つは、どちらも欠けていた修正ではなく欠けていたつまみだった。遅い機械にはスイートの待ちを伸ばす手段が無く(C4 は未コミットのパッチのコピーでしか通らなかった)、`scan` には Trivy に 1 回 5 分より多くを与える手段が無かった。`accept --wait-scale N` と `scan --trivy-timeout DURATION` ができて単体試験で覆われたが、Mac のスタックでは `accept --seed --wait-scale 3` が 14 件中 14 件合格して `wait_scale: 3.0` を記録した([`acc-20261113T024626Z-b2178f`](runs/acc-20261113T024626Z-b2178f/results.toon))。これはつまみが働くことを示すだけで、amd64 については何も言わない。どちらも amd64 のスタックではまだ実行しておらず、上の 12 件中 11 件と終了 51 は記録のままである。 + 0.5 — 2026-11-12. **Learned:** a result must carry its provenance and its limits: the run-3 numbers are the author's transcription of VM-local output, not committed raw evidence; an exit 51 and an M1 report-only "pass" are both true and say different things; and a repeatable Trivy deadline on one image is an observation whose cause (emulation, load, image size) is still being investigated, not a finding about the installer. / 結果は、出所と限界を添えなければならない。第 3 回の数値は VM 内の出力を著者が書き写したもので、コミットした生の証跡ではない。終了 51 と M1 の report-only の「pass」はどちらも真で、言うことが違う。また 1 つのイメージでの Trivy の期限切れが再現したのは観察であり、その原因(エミュレーション、負荷、イメージの大きさ)は調査中で、インストーラーについての所見ではない。 + 0.4 — 2026-11-12. **Learned:** the security gate is the part of the install that is hardest on an emulated machine and still the part that must be shown: `scan` ran to its end in 1 h 13 min 30 s and exited 51 (a scanner was incomplete), because Trivy's fixed 5-minute limit stopped on the 7 GB ember image, which was scanned in DEMO-21 on a machine without full-system emulation; the gate itself said pass at M1 because it is report-only, so an exit 51 and a "pass" can both be true and a reader must read both. / セキュリティゲートは、エミュレーションの機械で最も重い工程だが、それでも示さなければならない工程である。`scan` は 1 時間 13 分 30 秒で最後まで走り、終了 51(スキャナーの一部が未完)で終わった。Trivy の固定の 5 分の制限が 7 GB の ember イメージで切れたためで、DEMO-21 では機械全体のエミュレーションでない機械で走査できた。ゲート自体は M1 の report-only なので pass と言った。つまり終了 51 と「pass」は両立し、読者は両方を読まなければならない。 + 0.3 — 2026-11-12. **Learned:** a record must say what each statement is: the compile times are observations, "a working day" and "about nine hours" are extrapolations, the explanation of the DNS stall is a hypothesis, and the stages that were not run (`scan`, `report`) must never sit in a list of stages that were; the wiki page's 30-second `goto` is the only acceptance failure, and a rerun with waits about ten times longer passed, in a patched copy only. / 記録は、各文が何かを言わなければならない。コンパイル時間は観察、「1 営業日」と「約 9 時間」は外挿、DNS の停止の説明は仮説であり、実行していない工程(`scan`・`report`)を実行した工程の一覧に入れてはならない。wiki ページの 30 秒の `goto` が受入の唯一の失敗で、待ちを約 10 倍にした再実行は(パッチを当てたコピーだけで)合格した。 + 0.2 — 2026-11-12. **Learned:** once the images exist, the stages that were run behind `build` (`up`, `health --network`, acceptance) showed nothing specific to amd64: `up` was healthy and `health --network` exited 0 with all 24 services on `127.0.0.1`, and the core acceptance suite passed 11 of 12 on a machine where every browser page takes about ten times longer; the one failure is a 30-second page-load timeout, which cannot be told from a real wiki fault on emulation alone, so only real amd64 hardware can settle it. And the acceptance runner needs `--seed` and its own browser folder, which a reader who follows an older record by memory forgets. / イメージさえあれば、`build` より後ろで実行した工程(`up`、`health --network`、受入)に amd64 に固有のことは見えなかった。`up` は健康になり、`health --network` は 24 サービスすべてが `127.0.0.1` で終了 0、コアの受入試験は、ブラウザの表示が約 10 倍遅い機械で 12 件中 11 件合格した。失敗の 1 件は 30 秒のページ読み込みのタイムアウトで、エミュレーションだけでは本物の wiki の不具合と区別できず、決着できるのは実際の amd64 の機械だけである。また受入試験の実行には `--seed` と専用のブラウザ置き場が要り、古い記録を記憶で追う読者は忘れる。 + 0.1 — 2026-11-12. **Learned:** a virtual machine that emulates a whole amd64 computer on Apple Silicon is a good test of the Ubuntu amd64 prerequisites and of every image that builds from binary packages, but not of an image that compiles scientific Python from source: osf.io's numpy, pandas and scipy took about ten times as long as under Rosetta (an extrapolation of that ratio puts the one command at about nine hours, not measured to the end), and `install` could not even be told to wait longer in `up`. / Apple Silicon 上で amd64 のコンピュータ全体をエミュレーションする仮想マシンは、Ubuntu amd64 の前提条件と、バイナリのパッケージから組むイメージの試験には向く。しかし科学計算の Python をソースから組むイメージには向かない。osf.io の numpy・pandas・scipy は Rosetta の約 10 倍かかり(この比の外挿では一つのコマンドは約 9 時間。最後までは測っていない)、`install` に `up` の待ちを延ばすよう伝える手段すらなかった。 +- Normative source: [SPEC-02 Installer CLI](../spec/02_installer_cli.md) · [SPEC-04 Acceptance Tests](../spec/04_acceptance_tests.md) +- Related: [DEMO-21 Core install on Ubuntu arm64](21_core_install_ubuntu_arm64_lima.md) · [DEMO-20 Core install on Mac Studio](20_core_install_mac_studio.md) · [ADR-08 Per-OS installer entry points](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md) · [docs/demo/README.md](README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Setup — 2026-11-12, branch `fix/ubuntu-amd64` on develop b81628f + +The host is the Mac Studio (Apple M1 Ultra, 20 cores, 128 GiB) of [DEMO-20](20_core_install_mac_studio.md). The test machine is a Lima virtual machine (Lima runs Linux inside macOS; a *virtual machine* is a whole computer simulated by software) named `grdm-ubuntu2404-amd64`. Unlike the arm64 machine of [DEMO-21](21_core_install_ubuntu_arm64_lima.md), which Apple's virtualization runs at nearly native speed, an amd64 machine on Apple Silicon can only be emulated: QEMU (a free CPU emulator) translates every amd64 instruction, in software, for the whole machine including its kernel. + +```toon +vm: + name: grdm-ubuntu2404-amd64 + tool: "limactl 2.3.0 (brew pulled it in as a dependency of lima-additional-guestagents), QEMU 11.1.3" + vmType: qemu + arch: x86_64 + image: ubuntu-24.04-server-cloudimg-amd64 (release-20261017), Ubuntu 24.04.5 LTS + cpus: 8 + memory: 32 GiB + disk: 160 GiB + user: "grdm, uid 2002 gid 2002 (set with the user: key of the Lima configuration), passwordless sudo, not root" + checkout: "/home/grdm/RDM-developer-guide on the VM's own disk, cloned from a git bundle of branch fix/ubuntu-amd64" + shared_from_host: "/mnt/mirrors only, read-only (9p): bare mirrors of the six integration repositories, refreshed with git fetch on the host" + git_config: "url.file:///mnt/mirrors/<repo>.git.insteadOf https://github.com/RCOSDP/<repo>.git; no token in the VM" + boot: "limactl create about 2.5 min (image download), first start 1 min 45 s" +``` + +Two host tools were missing: `brew install qemu lima-additional-guestagents` (Lima's amd64 guest agent is a separate package). The arm64 VM `grdm-ubuntu2404` was not started, changed or deleted; it stayed stopped while Lima moved from 2.2.1 to 2.3.0. + +> **Warning:** Lima merged the template's home mount into the configuration again: `limactl create` printed a configuration whose `mounts:` still ended with `- location: "~"`. It was removed from `~/.lima/grdm-ubuntu2404-amd64/lima.yaml` before the first start. Inside the VM `mount | grep -E 'virtiofs|9p|sshfs'` lists only `/mnt/mirrors`, and `~/.config` does not exist. + +The pins are those of develop b81628f (nothing was changed by hand; osf.io is being merged by another coordinator, so a later develop may differ): + +```toon +pins[8]{component,pin}: + osf.io,8fc45de461fd + waterbutler,3319c1067916 + modular-file-renderer,9771b8cfb352 + cas-overlay,22610b7681a2 + wiki-frontend,"5985d18b75da on osf.io 8fc45de461fd" + y-websocket,d4d1cfaed2e4 + ember-osf-web,"prebuilt niicloudoperation/rdm-ember-osf-web@sha256:65ee1fae52a3..." + postgres,"18.6 (digest pinned)" +``` + +### Run 1 — fresh VM, the one command + +```toon +run1: + command: GRDM_WITH_ACCEPT=1 ./installer/install-ubuntu.sh --yes --profile core + started: 2026-11-12T00:21:12Z + result: stopped by hand 5 h 27 min after the start (5 h 12 min inside build), no exit code of its own + prerequisites[5]{step,result}: + "apt: python3-venv libatomic1",installed + "Docker apt key",fingerprint 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 verified + "Docker Engine",29.9.3 with Compose 5.7.1 and buildx + "trivy 0.75.0, gitleaks 8.21.2",SHA-256 verified into ~/.local/bin + "docker group","usermod, then this run continued under sg docker" + steps[6]{step,code,status}: + doctor,0,"ok: ubuntu 24.04 amd64, 31.3 GiB, 150.7 GiB free, official, no problems" + plan,0,ok + "secrets init",0,ok + "compose render",0,ok + build,-,"osf.io still compiling after 5 h 12 min (started 00:35:54Z, stopped 05:48Z)" + "up ... report",-,not reached +``` + +What this proves: + +- The prerequisite script needs no emulation step on amd64: the plan lists apt packages, Docker's signed repository, two scanners and the docker group, and nothing about QEMU or binfmt. This is the first run on amd64. +- The private repositories were read from the read-only mirrors through `insteadOf`; `doctor`'s `git ls-remote` check passed without any token. +- **Finding 1 (doctor is silent):** `doctor` printed no line about amd64 emulation, so a reader could not tell "not needed" from "not checked". **Fix 1** (`fix(installer)`): the report carries `amd64_emulation: not needed (host is amd64)` on an amd64 host, `ready (a binfmt handler is registered)` on Linux arm64 with a working handler, and nothing on macOS. + +### Failure 2 — an emulation-only limit: osf.io's scientific Python + +The `osf.io` image (Python 3.6 on Alpine, whose C library has no ready-made wheels) compiles numpy 1.15.4, pandas 1.1.0 and scipy from source in one `RUN` step. Nine other images of the profile built natively in the VM and are not the problem (ember-osf-web is prebuilt; wiki-frontend builds on the osf.io image, so it was not built in the VM but imported from the Rosetta VM, see Run 2): + +```toon +native_builds_in_the_vm[9]{component,minutes}: + y-websocket,3.2 + sharejs,1.9 + elasticsearch2,4.0 + elasticsearch6,4.9 + fakecas,6.6 + waterbutler,13.6 + cas-overlay,12.1 + modular-file-renderer,16.7 + unoconv,9.5 +``` + +(They ran four and five at a time, started by hand with `grdm-dev build --component`, so the times include contention; all exited 0.) The compile step of osf.io, measured three ways: + +```toon +osf_compile[4]{step,qemu_system_vm,rosetta_vm,ratio}: + "numpy 1.15.4 (setup.py install)","971 s","118 s","8.2x" + "pandas 1.1.0 (wheel)","4298 s","411 s","10.5x" + "scipy (wheel)","more than 6400 s, not finished when stopped","about 1000 s","6x or more" + "whole RUN step","not finished after 5 h 12 min","3298 s (55 min)","about 10x is an extrapolation, not measured" +``` + +The *rosetta_vm* column is a second, temporary Lima VM (`vmType: vz`, arm64 Ubuntu with Rosetta registered, the same read-only mirror, no home mount) that built the same commit with `docker buildx build --platform linux/amd64`: the whole osf.io image took 64 min 11 s there. The first three rows are observations. Everything about the whole step, a working day, or "about nine hours" is an extrapolation of the ratio (3298 s times roughly ten), because the emulated step was stopped. I did not run the step on real amd64 hardware, so how long it takes there is not measured; I expect it to be no slower than the Rosetta figure, which is an expectation, not a result. The limit seen here therefore belongs to full-system emulation, not to the installer or the image. **No timeout of the installer applies to `build`: `--timeout` belongs to `up` alone and neither shortens nor extends `build`, and nothing was changed for it.** + +### Run 2 — the same VM, osf.io and wiki-frontend images built under Rosetta and loaded + +To test everything after `build`, the two images that cannot be built here were produced in the Rosetta VM from the same pinned commits (`osf.io` with `docker buildx build`, `wiki-frontend` with `grdm-dev build --component wiki-frontend --platform linux/amd64`), moved with `docker save | gzip`, `limactl cp` and `docker load`, and carry the tags the installer would give them. The steps that were then run one by one are `grdm-dev up`, `health --network` and `accept`; `scan` and `report` were **not** run. This is **not** a proof of the one command, and it proves nothing about the stages not run: it shows only that, with these two imported images, the stack came up healthy and passed most of the core acceptance suite. + +The ember-osf-web container had been started earlier with `docker compose up -d ember_osf_web` so that its first build ran in parallel with the image work (it has no `depends_on`, as the manifest note says): + +```toon +ember_first_build: + container_start: 2026-11-12T04:14:00Z + built: 2026-11-12T05:58:42Z + serving_4200: 2026-11-12T06:00:05Z + duration: "1 h 44 min 42 s to the build, 1 h 46 min to the port (QEMU system emulation, one core busy); 44 min 15 s under user-mode QEMU on arm64 (DEMO-21)" +``` + +```toon +run2: + command: "grdm-dev --yes --profile core up --no-open --timeout 7200, then health --network, then accept" + up: + started: 2026-11-12T06:03:36Z + finished: 2026-11-12T08:23:03Z + result: "exit 0 after 2 h 19 min 27 s, healthy: true (the wait was 7200 s)" + osf_init: "about 2 h 15 min: 650 migration files and the registration-schema data migrations, one core busy; osf_init: done at 08:18:49Z" + health_network: "exit 0, loopback_only: true, 9 project ports (1234, 4200, 5000, 7007, 7777, 7778, 8000, 8001, 8080) on 127.0.0.1, 24 services" + not_run: "scan and report (see What remains)" +``` + +`up` takes 2 h 19 min here (it was 296 s on an already migrated arm64 stack in [DEMO-21](21_core_install_ubuntu_arm64_lima.md) run 5); nearly all of it is `osf_init`'s Django migrations. The default wait (1800 s) would have stopped it with exit 40, which is the case fix 2 is for. The checkout's volumes were created by uid 2002 and the containers' uids, with no ownership error (`volume_owner_init` and both `volume_access_check` services exited 0). + +### Acceptance — five runs, two of them without `--seed` (my omission) + +```toon +accept[5]{run_id,scope,seeded,passed,failed,error,skipped,note}: + acc-20261112T083417Z-f2b524,"all, core C1-C6 and S1-S5",no,1,3,8,10,"the test users did not exist: fakecas printed 'User ... not found'; my omission, grdm-dev accept needs --seed on a fresh stack" + acc-20261112T085656Z-c69ad2,"all",yes,11,1,0,10,"core C1-C6: 11 of 12 passed; the 10 skipped are S1-S5, whose modules carry an unconditional skip(reason=M3), so they are skipped whatever the profile" + acc-20261112T092035Z-e4c24d,"C4 only",no,0,1,1,0,"again without --seed: the users did not exist, so C4 success failed and C4 rejection errored; this run says nothing about the wiki page" + acc-20261112T092701Z-876a61,"C4 only",yes,1,1,0,0,"C4 rejection passed again, C4 success failed again at the same 30 s goto" + acc-20261112T095258Z-308ef1,"C4 only, longer waits",yes,2,0,0,0,"both C4 cases passed; the waits were lengthened only in the VM's working copy, see below" +``` + +Evidence: [`acc-20261112T083417Z-f2b524`](runs/acc-20261112T083417Z-f2b524/results.toon) (no seed), [`acc-20261112T085656Z-c69ad2`](runs/acc-20261112T085656Z-c69ad2/results.toon) (core 11 of 12 in 21 min 29 s), [`acc-20261112T092035Z-e4c24d`](runs/acc-20261112T092035Z-e4c24d/results.toon) (C4 only, no seed) [`acc-20261112T092701Z-876a61`](runs/acc-20261112T092701Z-876a61/results.toon) (C4 only, seeded) and [`acc-20261112T095258Z-308ef1`](runs/acc-20261112T095258Z-308ef1/results.toon) (C4 only, seeded, longer waits). Chromium was installed with the command `grdm-dev accept` prints: `PLAYWRIGHT_BROWSERS_PATH=.venv/.playwright playwright install chromium` (my first install used Playwright's default folder, and `accept` refused with exit 2 until the command above was run). + +The one failure that is about the product, C4 success, is `Page.goto: Timeout 30000ms exceeded` while opening `/<node>/wiki/home/?edit&view&menu` with `domcontentloaded`, in both seeded runs, in the same place. Every other seeded C-scenario takes 30–119 s here; a Mac run takes seconds, so the suite's hard-coded waits (30 s for a page, 60 s for the login, 120 s for a test, SPEC-04 §3.3) are tight on this machine. Whether the wiki page needs more than 30 s only because of emulation or because of a fault was not known at the first write-up. **This is not claimed as an emulation-only limit.** The C4 rejection case, which uses the same page, passed in both seeded runs. + +**Rerun with longer waits (review r1).** The VM's working copy of the acceptance suite was patched, and the patch was **not** committed and is not in this branch: the page-load, click and selector waits of `test_c4_wiki_collab.py` from 30/60 s to 600 s, `COLLAB_BOUND_MS` from 30 s to 300 s, the login waits of `conftest.py` to 300 s, and `TEST_TIMEOUT_S` from 120 s to 1500 s. With that, `accept --seed --only C4` passed both cases (exit 0): C4 success took 182.6 s, where the unpatched run gave up at 30 s on the first page, and the rejection case took 107.8 s. So on this machine the failure goes away when the waits are about ten times longer, which fits a slow page rather than a broken one. It is one rerun of one scenario on a patched copy, not a clean 12 of 12 of the committed suite, and it does not show how long the wiki page takes on real hardware; the fixed waits of SPEC-04 §3.3 stay as they are and nothing was changed for this. + +**Fix 2** (`fix(installer)`): `grdm-dev install` accepts `--timeout SECONDS` and passes it to `up`, so a slow host can use the one command (`./installer/install-ubuntu.sh --yes --profile core --timeout 14400`). It affects `up` only: it neither shortens nor extends `build`. Before, `install` had no way to extend the 1800 s wait of `up`, and an install that was merely slow in `up` ended with exit 40 and had to be continued by hand. An explicit `--timeout 0` is passed on as 0 (review r1 R5). The default is unchanged: 1800 s on macOS and amd64, 5400 s on Linux arm64 with amd64 services; no measurement here shows that a native amd64 host needs more. + +**Observation (no fix):** while `playwright install-deps` ran during the heavy start, the guest's name resolution timed out for a while (`apt` printed `Ign:` for every repository; `curl` failed with `Resolving timed out`); the same commands worked a minute later, and the command was successful. I did not diagnose it. My hypothesis is that it is the user-mode network of QEMU under full load rather than an installer fault; nothing was captured that would confirm it. + +### Run 3 — `scan` and `report` on the stack of run 2 + +> **Note on provenance:** every number in this section (start time, elapsed times, exit codes, image size, installed tool versions, tool completion and target counts, findings, the 177 allow-list matches, the baseline exceptions, the ZAP write success and the manual reruns) is an observation the author transcribed from output in the VM. It was not verified independently from raw evidence in this repository: the scan reports, SBOMs and timing logs stayed in the VM's `runtime/reports/` and are not committed, so a reviewer who has only this repository can check the arithmetic and the code paths in `installer/grdm_dev/scan.py`, but not the measurements themselves. + +The stack of run 2 was still healthy (19 containers) after PR #50 was merged (develop 32e2344). The VM's checkout is at b81628f (the `commit` field of the scan report), whose `installer/grdm_dev/scan.py` is identical to develop's at 32e2344. Both commands were run as the ordinary user (uid 2002), with the scanners installed by `install-ubuntu.sh` (Trivy 0.75.0, gitleaks 8.21.2, Semgrep 1.185.0 from the venv, ZAP `ghcr.io/zaproxy/zaproxy:stable` in Docker). + +```toon +run3: + commands: "grdm-dev --yes --profile core scan, then report" + started: 2026-11-12T12:50:52Z + scan: + exit: "51 (scanner incomplete) after 1 h 13 min 30 s" + gate: "pass (report-only at M1, ADR-03)" + parts[5]: baseline, trivy, semgrep, gitleaks, zap + report: "exit 0 after 5 s" + durations[5]{tool,duration,note}: + "trivy, the image part","about 38 min","the image targets ran first; two calls on the ember-osf-web image and one on cas-overlay exited 1" + "trivy fs + semgrep","about 5 min","Semgrep 2 min 41 s, 4 packs" + gitleaks,"1 min 47 s","ok" + zap,"30 min 53 s","web 24 min, admin 3 min 47 s, ember_osf_web 3 min 8 s; the reports were written by uid 1000 into the uid-2002 checkout (DEMO-21 failure 4a does not recur)" + "baseline controls",seconds,"pass with 10 accepted exceptions (postgres, volume_owner_init, mongo, rabbitmq)" + tools[4]{tool,version,result}: + trivy,0.75.0,"incomplete: sbom and scan of the ember-osf-web image, and the sbom of cas-overlay, exited 1" + semgrep,1.185.0,"ok, 1 rule timeout on installer/tests/test_compose.py (a coverage warning at M1)" + gitleaks,8.21.2,ok + zap,stable,"ok, 3 targets (web, admin, ember_osf_web)" + trivy_targets: "22 in all: 16 images, 5 integration source checkouts, 1 repository (scan.py counts all three kinds)" + trivy_outputs: "21 vulnerability-scan outputs (all but the ember image) and 20 SBOMs (all but the ember image and cas-overlay)" + findings_total: "5959, an incomplete total (see below)" + findings_by_severity: "critical 298, high 1726, medium 2560, low 1369, info 6" + by_tool: "trivy 5931 (critical 298, high 1725, medium 2551, low 1357); zap 28 (high 1, medium 9, low 12, info 6); semgrep 0; gitleaks 0" + allowlist: "58 entries in manifest/allowlist.json; 177 findings matched (author-reported); M1 entry-count baseline 0 (allowlist_baseline); over_threshold 2024" + gate_rule: report-only +``` + +How to read it: + +- **Exit 51 is an observed, repeatable result for one image.** Trivy has a fixed default limit of 5 minutes per call (`scan.py` passes no `--timeout`). The ember-osf-web image (about 7 GB, prebuilt) did not finish its SBOM or its vulnerability scan inside it, and a manual rerun of the SBOM ended with `FATAL ... context deadline exceeded` after 5 min 3 s. What I observed ends there. That this is caused by emulation, by load or by the image's size is an explanation I am investigating, **not established**: the same image was scanned in [DEMO-21](21_core_install_ubuntu_arm64_lima.md) on a machine without full-system emulation (23 targets there, a different set, so the 22 here is not a count of missing ones). I have not shown it to be an installer fault either. +- **The cas-overlay SBOM** also exited 1 during the run; its vulnerability scan did not fail. Run alone afterwards, the same SBOM took 3.6 s and exited 0. `scan` hides Trivy's message (`--quiet`), so I did not capture why it failed during the run. Its cause is **unresolved** and stays in the remaining work. +- **What is covered and what is not.** Of 22 Trivy targets, 21 have a vulnerability-scan result; the ember image has none, so its vulnerabilities are missing. 20 have an SBOM; the ember image and cas-overlay do not. Complete SBOM-plus-scan coverage is therefore 20 of 22. +- **The totals are an incomplete total.** The 5959 findings (and the Trivy 5931) are findings left after allow-list matching (the 177 matched findings are counted separately), over 21 of 22 targets, plus **three** HIGH diagnostic findings that `scan` adds for the failed calls (`SCAN-FAILED` for ember, `SBOM-FAILED` for ember and for cas-overlay, `scan.py` lines 850–858). The ember image's vulnerabilities are not in the totals; the diagnostics are. The true total for a complete scan is not known and is not "larger by a known amount". +- **Semgrep, gitleaks and ZAP completed** on the amd64 VM; Semgrep and gitleaks reported nothing, ZAP reported 28 alerts on three targets. +- **The gate said pass** because the milestone is M1 and the rule is report-only ([ADR-03](../decisions/ADR-03_Staged_Security_Gate.md)): 2024 critical and high findings are over the threshold and are counted, not blocking. `scan` still exits 51 when a scanner is incomplete, whatever the gate says. The allow-list has 58 entries and 177 findings matched (one entry can match several findings); `allowlist_baseline` is not a count of matches but the entry-count baseline recorded for M1 in `manifest/allowlist.baseline.json`, which is 0. +- `report` exited 0 and bundles the `doctor`, `plan`, `health`, `scan` and `accept` reports of this stack. They stay in the VM and are not committed, which is the limit described at the top of this section. +- A decision to consider, not changed here: passing a configurable Trivy `--timeout` from `scan` may reduce the deadline-limited runs; it needs a rerun to show that, and it guarantees neither an exit 0 nor any security conclusion. Since 0.6 `scan --trivy-timeout 30m` exists (SPEC-03 §4.1) and is not yet run on this stack. + +### Final pins, one command — 2026-11-13/14, develop fb9ccdc (PR #60) + +The same VM `grdm-ubuntu2404-amd64` (stopped since 2026-11-13 morning; started for this test, 2 min 10 s to boot), the same user (uid 2002), a **new, empty checkout** `~/rdm-final` made from a git bundle of develop fb9ccdc (the host is the Mac Studio, and the whole machine is emulated, so the first 10 hours 45 minutes are the build), and the same read-only mirrors, refreshed on the host for the final pins plus `RDM-ember-osf-web-dev2027`. Pins: osf.io 90b10661, WaterButler 3319c106, modular-file-renderer 9771b8cf, ember-osf-web 4d505f00, cas-overlay 22610b76, wiki-frontend 5985d18b, y-websocket 97252369. + +**Provenance of this section.** Only the acceptance run [`acc-20261113T192132Z-1cf20d`](runs/acc-20261113T192132Z-1cf20d/results.toon) is committed as evidence (`docs/demo/runs/`): 14 of 14 tests passed with `wait_scale: 10.0`. Everything else — the four one-command runs and the separate `up` that checked the fix, their exit codes and durations, the Elasticsearch start times, the DNS measurement, the exit 13 text of the volume guard, the `scan` and `report` exit codes and times, the finding counts and the VM's starting contents — was recorded by the operator agent from the VM's terminal and report files. The raw logs and reports stayed in the VM and are not committed; they have not been checked independently. + +**What "cold" means here, honestly.** The VM was not new, and the checkout was. At the start Docker held 17 images (21.8 GB) and 9.2 GB of build cache from 2026-11-12: older `grdm-dev` images of osf.io 8fc45de4 and wiki-frontend, y-websocket d4d1cfae, Elasticsearch 2 and 6, ShareJS, fakecas, unoconv, and modular-file-renderer 9771b8cf, WaterButler 3319c106 and cas-overlay 22610b76 (the last three equal to today's pins), plus `redis`, `postgres`, `rabbitmq`, `mongo:3.4`, the ZAP image and the former prebuilt ember image, and the old checkout's stack (running again after the VM boot) with its 11 named volumes. The prerequisites (Docker 29.9.3 with Compose and buildx, trivy 0.75.0, gitleaks 8.21.2, `libatomic1`, `python3-venv`) were already present, so `install-ubuntu.sh` only printed "All prerequisites are already present". On amd64 it asked for no `sudo` and ran no emulator container: the arm64 observation that it replaces the amd64 emulator does not apply here. The new checkout had no `runtime/`, no `.venv`, no Chromium. osf.io 90b10661, wiki-frontend, ember-osf-web 4d505f00, y-websocket 97252369 and Elasticsearch 8 were built from nothing but base layers; the other images were already equal to today's pins. The old stack was stopped with its own `grdm-dev down` (30 s) before the first run. + +```toon +final_pins_runs[4]{run,command,started_utc,exit,seconds,cause}: + 1,"GRDM_WITH_ACCEPT=1 ./installer/install-ubuntu.sh --yes --profile core --timeout 14400",2026-11-13T05:14:06Z,13,257,"doctor: Git cannot read RDM-ember-osf-web-dev2027 (environment: the VM's git config redirected six mirrors, not the seventh)" + 2,"same",2026-11-13T05:18:43Z,13,38735,"build exit 0 after 10 h 45 min; then `up` stopped by the volume guard (DEMO-21 0.5): eight volumes of the 2026-11-12 checkout" + 3,"same, after the eight volumes were removed",2026-11-13T16:04:43Z,40,341,"up: elasticsearch8 unhealthy (installer defect: the health window was shorter than an emulated start)" + 4,"same, after Elasticsearch had finished starting on its own",2026-11-13T16:16:37Z,51,10713,"doctor to health --network ok, up 2 h 22 min; the install's own scan stage: ZAP admin rc 3 (not reproduced, cause unresolved)" +``` + +**No run returned 0.** I could not make the one command succeed in a single go on this VM; the stack was assembled by the four runs above plus the stages below, run by hand. This is the honest state, and each stop is explained next. + +**Failure 1 (environment): the seventh mirror.** `doctor` stopped with exit 13 after 257 s (including the venv): the VM's `git config` had `url.<mirror>.insteadOf` for six integration repositories, not for `RDM-ember-osf-web-dev2027`, which the final pins need. I added the seventh redirect (and the host mirror already held it at 4d505f00). Environment only; `doctor`'s message was correct. + +**Failure 2 (not a defect): the volume guard.** Run 2 built for 10 h 45 min 35 s (see below) and `up` then stopped with exit 13, naming the eight volumes `grdm-dev_elasticsearch6_data`, `ember_osf_web_dist`, `osfstoragecache`, `postgres_data`, `rabbitmq_data`, `redis_data`, `wb_tmp`, `wiki_static`, each bound to `/home/grdm/RDM-developer-guide/runtime/volumes/...`, with the way out. I had already run `grdm-dev down` in the old checkout; I then ran the printed `docker volume rm` for exactly those eight names (the three volumes of the retired services stayed), and run 3 started from empty volumes. This is the guard of DEMO-21 0.5 doing what it was built for, in a second case; it cost nothing but the order of my steps, because the guard ran after the 10-hour build. A guard that ran before `build` would have said so 10 hours earlier; that is an idea, not a change. + +**Failure 3 (installer): Elasticsearch 8 was marked unhealthy by a slow start.** Run 3 ended in 341 s with exit 40, `dependency failed to start: container grdm-dev-elasticsearch8-1 is unhealthy`. The template's check (`start_period` 30 s, interval 10 s, 12 tries) allows a start about 150 s. Elasticsearch 8 needs 8 min 10 s here (container started 16:07:48Z, `started` in its log at 16:15:58Z) because the JVM and the plugin loading run under full-system amd64 emulation; the container kept starting and turned healthy by itself at about 16:16Z. `up --timeout` cannot help: it bounds Compose's wait, not the container's own check. This is **an installer defect on a slow host**, not an Elasticsearch fault (the log shows only the harmless jansi native-library warning before the normal start). **Fix** (`fix(installer)`, test included): the check allows 30 s plus 100 tries, each 10 s apart and up to 5 s long, so 17 to 26 minutes, which is twice the measured start or more and ends inside the default 1800 s wait of `up`, and costs a fast host nothing because a start that is up passes at once. Verification: after run 4 the fixed template (then 120 tries; review r1 lowered it to 100 so that the longest window ends inside `up`'s health wait, which still allows more than twice this start) was put into this checkout, the stack was re-rendered and `up` was run, which recreated Elasticsearch 8 (a cold start of the container, with its data volume): it started again in 8 min 10 s (20:13:20Z to 20:21:31Z), the container became healthy inside the window, and `grdm-dev --yes --profile core up --no-open --timeout 3600` exited 0 after 1262 s (the `osf_init` one-shot re-ran; the rest is waiting). That is one repeat on one machine; it does not show the one command passing from nothing, because the checkout of run 4 already had the stack. + +**Run 4 (exit 51): `up` passed, the scan stage did not.** With Elasticsearch 8 already healthy from run 3's start, `build` (cached, about 3 min), `up` (2 h 22 min by the report times, 18:41:32Z; nearly all of it `osf_init`'s migrations, as in run 2 of the first record) and `health --network` (exit 0) passed. The install's own `scan` stage then exited 51: ZAP reported "no ZAP report for http://admin:8001 (rc 3)" while Trivy (22 targets, with the default 5-minute limit per call), Semgrep and gitleaks were `ok`. I did not capture ZAP's own output. The standalone `scan` rerun below scanned `admin` and exited 0, so the failure did not repeat; its cause is **unresolved** (the hypothesis, not tested, is that `admin` was still slow just after the long `up`). It is not claimed as an installer fault or as emulation. + +**Build time (operator-recorded; run 2).** The whole `build` took 10 h 45 min 35 s from the start of run 2 (05:18:43Z) to the report at 16:04:15Z, about 33 minutes of which were `git clone` of osf.io from the read-only mirror over the 9p share (the mirror prints "filtering not recognized by server" and sends the full history). The osf.io image took until about 14:05Z; its Python `RUN` step was at 25 493 s (7 h 05 min) in its last pip output and ended within minutes of that, with numpy, pandas and scipy compiled from source (earlier extrapolation of about 9 hours for the one command, DEMO-22 0.1, was low for the build alone: 10 h 45 min, but the compile did not take ten times the Rosetta figure of 55 minutes, it took about eight times). wiki-frontend, ember-osf-web (the Node stage 2462 s) and the small images followed, ending at 16:04Z. Elasticsearch 8, y-websocket, elasticsearch6, unoconv and fakecas built natively in minutes. + +```toon +after_run4[6]{stage,command,exit,seconds,result}: + health,"grdm-dev health --network",0,15,"loopback_only: true, 8 project ports on 127.0.0.1, 17 containers up" + accept_first_try,"GRDM_WITH_ACCEPT=1 grdm-dev --yes accept --seed --wait-scale 10",2,0,"no Chromium under .venv/.playwright; the message prints the two install commands" + chromium,"PLAYWRIGHT_BROWSERS_PATH=.venv/.playwright playwright install chromium, then install-deps chromium (printed)",0,304,"no stalled download, no retry" + accept,"GRDM_WITH_ACCEPT=1 grdm-dev --yes accept --seed --wait-scale 10",0,1689,"14 passed, 0 failed, 10 skipped (S1 to S5, unconditional M3 skip); wait_scale 10.0; precheck 23 services healthy" + scan,"grdm-dev --yes scan --trivy-timeout 45m",0,1322,"gate report-only: pass; findings 6170 (critical 314, high 1835, medium 2719, low 1298, info 4); 177 allow-listed over 58 entries; over_threshold 2149" + report,"grdm-dev --yes report",0,5,"overall: complete" +``` + +**Acceptance: 14 of 14** ([`acc-20261113T192132Z-1cf20d`](runs/acc-20261113T192132Z-1cf20d/results.toon), committed). Each test, with its duration under `--wait-scale 10`: + +| Scenario | success | rejection | +|---|---|---| +| C1 Login via fakecas | passed, 52.8 s | passed, 0.4 s (401) | +| C2 Create project | passed, 126.1 s | passed, 74.0 s (403) | +| C3 Upload and download file | passed, 52.3 s | passed, 82.3 s (403) | +| **C4 Wiki collaborative edit** | **passed, 165.8 s** | passed, 107.2 s (close code 4401) | +| C5 File preview | passed, 86.5 s | passed, 73.6 s (401) | +| C6 Institution admin screen | passed, 42.6 s | passed, 22.0 s (403) | +| **C7 File page collaborative edit** | **passed, 203.1 s** | passed, 142.8 s (close code 4401) | + +S1 to S5 were skipped (their modules skip unconditionally until M3). C4 success, which failed twice at the 30 s wait in 0.1 and passed once only on an uncommitted patched copy, passed here on the committed suite with `--wait-scale 10`, in 165.8 s (the patched copy took 182.6 s); whether the default waits would still fail on the final pins was not tried; the expectation that they would is why PR #60 added the knob. That is one run on one emulated machine: it shows the knob works on amd64 and that C4 and C7 work there, and says nothing about how long the wiki page takes on real hardware. + +**Scan.** `scan --trivy-timeout 45m` exited 0 after 1322 s (started 19:49:50Z): Trivy 0.75.0 (22 targets), Semgrep 1.185.0 (1 rule timeout on `installer/tests/test_compose.py`, a coverage warning at M1), gitleaks 8.21.2, and ZAP on `admin` and `ember_osf_web`, with `web` skipped because an anonymous request is redirected to the sign-in address `127.0.0.1:8080`, which the scanner cannot reach (the same note as arm64). The gate said pass because it is report-only at M1 ([ADR-03](../decisions/ADR-03_Staged_Security_Gate.md)); 2149 critical and high findings are over the threshold and counted, not blocking. The Trivy deadline of DEMO-22 run 3 did not recur, and not because of the longer limit: the install's own scan in run 4 used the default 5 minutes and Trivy was also `ok` on all 22 targets, because the ember-osf-web image is now a small static nginx image instead of the 7 GB prebuilt one. So `--trivy-timeout` is shown to work (the flag was accepted and the scan completed), not shown to be needed on this stack. The cas-overlay SBOM failure of run 3 also did not recur. + +**Environment checks that found nothing.** DNS bursts (the arm64 failure 5) were measured first: 30, 60 and 120 simultaneous AAAA plus A queries for `files.pythonhosted.org` from inside the VM, against QEMU's resolver (192.168.5.3, not Lima's 192.168.5.2) and against systemd-resolved (127.0.0.53), all succeeded, so no resolver or `daemon.json` change was made. The `apk` stall of arm64 failure 6 did not occur. No VM change was made except the seventh mirror redirect (run 1) and, for the fix verification only, the patched template in the checkout. + +### What remains + +- **One uninterrupted run of the one command on Ubuntu amd64:** not done; since 0.7 the stages have all been run here with the final pins (see the final-pins section: four runs of the one command ended 13, 13, 40 and 51 for four different reasons, and the remaining stages were run by hand with exit 0), but the one command has not yet returned 0 in a single go; the next run on an empty VM or real hardware, with the Elasticsearch 8 window widened, is still to be done. Earlier text: not done. It needs real amd64 hardware (a cloud virtual machine or a PC); on this machine it is estimated at about 9 hours (an extrapolation of the 10x ratio, not measured to the end), and the time on real hardware is not measured. Checked on amd64 so far: prerequisites, `doctor`, `git` access through mirrors, uid 2002, and nine images built natively. Not built on amd64 here: osf.io and wiki-frontend (imported from the Rosetta VM). +- **`scan` and `report`:** since 0.7 run with the final pins: `scan --trivy-timeout 45m` exit 0 and `report` exit 0 (operator-recorded; the ZAP failure on `admin` in the install's own scan, rc 3, did not repeat and is unexplained). Earlier text: run in run 3 (exit 51 and 0, see above; the numbers are the author's transcription, not committed evidence). Still open from it: the ember-osf-web image's Trivy SBOM and vulnerability scan, which reproducibly passed the 5-minute limit here and whose cause is not established (a longer limit, a host without full-system emulation or something else); and the cas-overlay SBOM, whose failure in the run is **unexplained**. The ZAP report directory of DEMO-21 failure 4a is shown on an amd64 host (the ZAP reports were written). +- **C4 success:** since 0.7 passed with the committed suite and `accept --seed --wait-scale 10` (14 of 14, C4 and C7 included, committed evidence); with the default waits on this VM it has not been rerun, and real hardware has not been tried. Earlier text: failed twice at the suite's 30 s wait and passed once with waits about ten times longer (patched copy, not committed); a clean run of the committed suite on real amd64 hardware, or a decision to make the waits configurable, is still open. Since 0.6 the waits can be stretched by `grdm-dev accept --wait-scale N` (SPEC-04 §3), so the committed suite no longer needs a patched copy; a run with it on this VM or on real hardware is still to be done. +- **WSL2:** not run ([DEMO-21](21_core_install_ubuntu_arm64_lima.md) lists why). +- **Pins:** the 0.7 runs used develop fb9ccdc (osf.io 90b10661 and the other final pins); the runs of 0.1 to 0.5 used develop b81628f; osf.io's pin will change when the other coordinator's merge lands. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 準備 — 2026-11-12、develop b81628f 上のブランチ `fix/ubuntu-amd64` + +ホストは [DEMO-20](20_core_install_mac_studio.md) の Mac Studio(Apple M1 Ultra、20 コア、128 GiB)。試験機は Lima の仮想マシン `grdm-ubuntu2404-amd64` である(Lima は macOS の中で Linux を動かす道具。*仮想マシン* はソフトウェアで模した一台のコンピュータ)。Apple の仮想化機能がほぼ本来の速度で動かす [DEMO-21](21_core_install_ubuntu_arm64_lima.md) の arm64 の機械と違い、Apple Silicon 上の amd64 の機械はエミュレーションしかできない。QEMU(無償の CPU エミュレーター)が、カーネルを含む機械全体の amd64 の命令を一つずつソフトウェアで翻訳する。 + +```toon +vm: + name: grdm-ubuntu2404-amd64 + tool: "limactl 2.3.0(lima-additional-guestagents の依存として brew が入れた)、QEMU 11.1.3" + vmType: qemu + arch: x86_64 + image: ubuntu-24.04-server-cloudimg-amd64(release-20261017)、Ubuntu 24.04.5 LTS + cpus: 8 + memory: 32 GiB + disk: 160 GiB + user: "grdm、uid 2002・gid 2002(Lima の設定の user: キーで指定)、パスワードなしの sudo、root ではない" + checkout: "VM 自身のディスク上の /home/grdm/RDM-developer-guide。ブランチ fix/ubuntu-amd64 の git bundle から clone" + shared_from_host: "/mnt/mirrors だけを読み取り専用(9p)で共有: 統合リポジトリ 6 本の bare ミラー。ホストで git fetch して更新" + git_config: "url.file:///mnt/mirrors/<repo>.git.insteadOf https://github.com/RCOSDP/<repo>.git。VM にトークンは置かない" + boot: "limactl create 約 2.5 分(イメージの取得)、最初の起動 1 分 45 秒" +``` + +ホストに足りない道具が二つあった。`brew install qemu lima-additional-guestagents`(Lima の amd64 用ゲストエージェントは別のパッケージ)。arm64 の VM `grdm-ubuntu2404` は、起動も変更も削除もしていない。Lima が 2.2.1 から 2.3.0 に上がる間も停止したままだった。 + +> **Warning:** Lima はテンプレートのホームの mount をまた併合した。`limactl create` が出した設定の `mounts:` の末尾に `- location: "~"` が残っていた。最初の起動の前に `~/.lima/grdm-ubuntu2404-amd64/lima.yaml` から外した。VM の中で `mount | grep -E 'virtiofs|9p|sshfs'` に出るのは `/mnt/mirrors` だけで、`~/.config` は存在しない。 + +固定(pin)は develop b81628f のもので、手では何も変えていない(osf.io は別の担当が統合中なので、後の develop では変わりうる): + +```toon +pins[8]{component,pin}: + osf.io,8fc45de461fd + waterbutler,3319c1067916 + modular-file-renderer,9771b8cfb352 + cas-overlay,22610b7681a2 + wiki-frontend,"osf.io 8fc45de461fd の上の 5985d18b75da" + y-websocket,d4d1cfaed2e4 + ember-osf-web,"ビルド済み niicloudoperation/rdm-ember-osf-web@sha256:65ee1fae52a3..." + postgres,"18.6(ダイジェスト固定)" +``` + +### 第 1 回 — 新しい VM で一つのコマンド + +```toon +run1: + command: GRDM_WITH_ACCEPT=1 ./installer/install-ubuntu.sh --yes --profile core + started: 2026-11-12T00:21:12Z + result: 開始の 5 時間 27 分後(build の中で 5 時間 12 分後)に手で止めた。自分の終了コードは無い + prerequisites[5]{step,result}: + "apt: python3-venv libatomic1",導入 + "Docker の apt 鍵",指紋 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 を検証 + "Docker Engine",29.9.3、Compose 5.7.1 と buildx + "trivy 0.75.0、gitleaks 8.21.2",SHA-256 を検証して ~/.local/bin へ + "docker グループ","usermod の後、この実行は sg docker の下で続行" + steps[6]{step,code,status}: + doctor,0,"ok: ubuntu 24.04 amd64、31.3 GiB、空き 150.7 GiB、公式、問題なし" + plan,0,ok + "secrets init",0,ok + "compose render",0,ok + build,-,"osf.io が 5 時間 12 分後もコンパイル中(開始 00:35:54Z、停止 05:48Z)" + "up ... report",-,未到達 +``` + +分かったこと: + +- amd64 の前提条件スクリプトにエミュレーションの手順は要らない。計画には apt のパッケージ、Docker の署名付きリポジトリ、二つのスキャナー、docker グループだけが並び、QEMU も binfmt も出ない。amd64 での最初の実行である。 +- 非公開リポジトリは `insteadOf` で読み取り専用のミラーから読めた。`doctor` の `git ls-remote` の確認はトークン無しで通った。 +- **所見 1(doctor が黙る):** `doctor` は amd64 エミュレーションについて一行も出さず、読む人は「要らない」と「確かめていない」を区別できなかった。**修正 1**(`fix(installer)`): 報告に、amd64 のホストでは `amd64_emulation: not needed (host is amd64)`、動く handler のある Linux arm64 では `ready (a binfmt handler is registered)` を載せる。macOS では何も載せない。 + +### 失敗 2 — エミュレーションだけの限界: osf.io の科学計算 Python + +`osf.io` イメージ(Alpine 上の Python 3.6。Alpine の C ライブラリには出来合いの wheel が無い)は、numpy 1.15.4、pandas 1.1.0、scipy を一つの `RUN` 手順でソースからコンパイルする。このプロファイルのほかの 9 つのイメージは VM の中でネイティブに組め、問題ではない(ember-osf-web はビルド済み。wiki-frontend は osf.io のイメージの上に組むので VM では組まず、Rosetta の VM から輸入した。第 2 回を参照): + +```toon +native_builds_in_the_vm[9]{component,minutes}: + y-websocket,3.2 + sharejs,1.9 + elasticsearch2,4.0 + elasticsearch6,4.9 + fakecas,6.6 + waterbutler,13.6 + cas-overlay,12.1 + modular-file-renderer,16.7 + unoconv,9.5 +``` + +(手で `grdm-dev build --component` を 4 本・5 本ずつ同時に動かしたので、時間には競合が入る。すべて終了 0。)osf.io のコンパイル手順を 3 通りで測った: + +```toon +osf_compile[4]{step,qemu_system_vm,rosetta_vm,ratio}: + "numpy 1.15.4(setup.py install)","971 秒","118 秒","8.2 倍" + "pandas 1.1.0(wheel)","4298 秒","411 秒","10.5 倍" + "scipy(wheel)","6400 秒超、止めた時点で未完","約 1000 秒","6 倍以上" + "RUN 手順全体","5 時間 12 分後も未完","3298 秒(55 分)","約 10 倍は外挿で、実測ではない" +``` + +*rosetta_vm* の列は、同じコミットを `docker buildx build --platform linux/amd64` で組んだ、もう一つの一時的な Lima VM(`vmType: vz`、Rosetta を登録した arm64 の Ubuntu、同じ読み取り専用ミラー、ホームの mount なし)の値で、osf.io のイメージ全体が 64 分 11 秒だった。最初の 3 行は観察である。手順全体、1 営業日、「約 9 時間」はいずれも、エミュレーションの手順を途中で止めたため、比(3298 秒の約 10 倍)からの外挿である。実際の amd64 の機械ではこの手順を実行しておらず、そこでの所要時間は測っていない。Rosetta の値より遅くはならないと期待するが、これは期待であり結果ではない。したがってここで見えた限界は、機械全体のエミュレーションのものであり、インストーラーでもイメージでもない。**`build` に効くインストーラーのタイムアウトは無い。`--timeout` は `up` だけのもので、`build` を短くも長くもせず、そのための変更もしていない。** + +### 第 2 回 — 同じ VM、Rosetta で組んだ osf.io と wiki-frontend のイメージを読み込む + +`build` より後のすべてを試すため、ここで組めない 2 つのイメージを、同じ固定コミットから Rosetta の VM で作った(`osf.io` は `docker buildx build`、`wiki-frontend` は `grdm-dev build --component wiki-frontend --platform linux/amd64`)。`docker save | gzip`、`limactl cp`、`docker load` で運び、インストーラーが付けるのと同じタグにした。その後に一つずつ実行した工程は `grdm-dev up`、`health --network`、`accept` で、`scan` と `report` は実行して**いない**。これは一つのコマンドの証明では**なく**、実行していない工程については何も証明しない。この 2 つの輸入したイメージで、stack が健康に起動し、コアの受入試験の大半に合格したことを示すだけである。 + +ember-osf-web のコンテナは先に `docker compose up -d ember_osf_web` で起動し、初回ビルドをイメージ作りと並行させた(マニフェストの注記のとおり `depends_on` が無い): + +```toon +ember_first_build: + container_start: 2026-11-12T04:14:00Z + built: 2026-11-12T05:58:42Z + serving_4200: 2026-11-12T06:00:05Z + duration: "ビルドまで 1 時間 44 分 42 秒、ポートまで 1 時間 46 分(QEMU の機械全体のエミュレーション、使うのは 1 コア)。arm64 のユーザーモード QEMU では 44 分 15 秒(DEMO-21)" +``` + +```toon +run2: + command: "grdm-dev --yes --profile core up --no-open --timeout 7200、続いて health --network、続いて accept" + up: + started: 2026-11-12T06:03:36Z + finished: 2026-11-12T08:23:03Z + result: "2 時間 19 分 27 秒後に終了 0、healthy: true(待ちは 7200 秒)" + osf_init: "約 2 時間 15 分: migration ファイル 650 個と登録スキーマのデータ migration、使うのは 1 コア。osf_init: done は 08:18:49Z" + health_network: "終了 0、loopback_only: true、プロジェクトのポート 9 個(1234、4200、5000、7007、7777、7778、8000、8001、8080)が 127.0.0.1、24 サービス" + not_run: "scan と report(残っていること を参照)" +``` + +ここでは `up` に 2 時間 19 分かかった([DEMO-21](21_core_install_ubuntu_arm64_lima.md) の第 5 回の、移行済みの arm64 の stack では 296 秒)。ほとんどが `osf_init` の Django の migration である。既定の待ち(1800 秒)なら終了 40 で止まっていた。修正 2 はこの場合のためにある。ボリュームは uid 2002 とコンテナの uid が作り、所有者のエラーは無かった(`volume_owner_init` と二つの `volume_access_check` が終了 0)。 + +### 受入試験 — 5 回、うち 2 回は `--seed` なし(私の漏れ) + +```toon +accept[5]{run_id,scope,seeded,passed,failed,error,skipped,note}: + acc-20261112T083417Z-f2b524,"全部、コア C1-C6 と S1-S5",なし,1,3,8,10,"試験用の利用者が無く、fakecas が 'User ... not found' と出した。私の漏れ。新しい stack の grdm-dev accept には --seed が要る" + acc-20261112T085656Z-c69ad2,"全部",あり,11,1,0,10,"コア C1-C6: 12 件中 11 件合格。skipped の 10 件は S1-S5 で、そのモジュールは無条件の skip(reason=M3) を持つので、プロファイルによらず skip される" + acc-20261112T092035Z-e4c24d,"C4 のみ",なし,0,1,1,0,"またも --seed なし: 利用者が無く、C4 の success は failed、rejection は error。この実行は wiki ページについて何も言わない" + acc-20261112T092701Z-876a61,"C4 のみ",あり,1,1,0,0,"C4 の rejection はまた合格、C4 の success はまた同じ 30 秒の goto で失敗" + acc-20261112T095258Z-308ef1,"C4 のみ、待ちを延ばした",あり,2,0,0,0,"C4 の 2 ケースとも合格。待ちを延ばしたのは VM の作業コピーだけ。下を参照" +``` + +証跡: [`acc-20261112T083417Z-f2b524`](runs/acc-20261112T083417Z-f2b524/results.toon)(seed なし)、[`acc-20261112T085656Z-c69ad2`](runs/acc-20261112T085656Z-c69ad2/results.toon)(コア 12 件中 11 件、21 分 29 秒)、[`acc-20261112T092035Z-e4c24d`](runs/acc-20261112T092035Z-e4c24d/results.toon)(C4 のみ、seed なし)、[`acc-20261112T092701Z-876a61`](runs/acc-20261112T092701Z-876a61/results.toon)(C4 のみ、seed あり)、[`acc-20261112T095258Z-308ef1`](runs/acc-20261112T095258Z-308ef1/results.toon)(C4 のみ、seed あり、待ちを延ばした)。Chromium は `grdm-dev accept` が表示するコマンド `PLAYWRIGHT_BROWSERS_PATH=.venv/.playwright playwright install chromium` で入れた(最初は Playwright の既定の置き場に入れたため、このコマンドを実行するまで `accept` は終了 2 で拒んだ)。 + +製品に関わる失敗は C4 の success の 1 件で、`/<node>/wiki/home/?edit&view&menu` を `domcontentloaded` まで開くときの `Page.goto: Timeout 30000ms exceeded` である。seed ありの 2 回とも同じ場所で起きた。seed ありのほかの C のシナリオはここで 30〜119 秒かかる。Mac なら数秒である。試験の固定の待ち(ページ 30 秒、ログイン 60 秒、1 件 120 秒、SPEC-04 §3.3)はこの機械では短い。wiki のページが 30 秒を超えるのがエミュレーションのためだけか、不具合のためかは、最初の書き込みの時点では分からなかった。**エミュレーションだけの限界とは主張しない。** 同じページを使う C4 の rejection は seed ありの 2 回とも合格した。 + +**待ちを延ばした再実行(レビュー r1)。** VM の中の受入試験の作業コピーにパッチを当てた。このパッチはコミット**しておらず**、このブランチには無い。`test_c4_wiki_collab.py` のページ読み込み・クリック・セレクターの待ちを 30/60 秒から 600 秒へ、`COLLAB_BOUND_MS` を 30 秒から 300 秒へ、`conftest.py` のログインの待ちを 300 秒へ、`TEST_TIMEOUT_S` を 120 秒から 1500 秒へ。これで `accept --seed --only C4` は 2 ケースとも合格した(終了 0)。C4 の success は 182.6 秒で、パッチなしの実行は最初のページで 30 秒で諦めた。rejection は 107.8 秒だった。つまりこの機械では、待ちを約 10 倍にすると失敗が消え、壊れたページではなく遅いページと整合する。ただしこれはパッチを当てたコピーでの 1 シナリオの 1 回の再実行であり、コミットした試験の 12 件中 12 件という意味ではなく、実機で wiki ページがどれだけかかるかも示さない。SPEC-04 §3.3 の固定の待ちは変えておらず、この件のための変更もしていない。 + +**修正 2**(`fix(installer)`): `grdm-dev install` が `--timeout 秒` を受け取って `up` に渡す。遅い機械でも一つのコマンドが使える(`./installer/install-ubuntu.sh --yes --profile core --timeout 14400`)。効くのは `up` だけで、`build` を短くも長くもしない。以前の `install` には `up` の 1800 秒の待ちを延ばす手段が無く、`up` が単に遅いだけの導入が終了 40 で終わり、手で続けるしかなかった。明示した `--timeout 0` は 0 のまま渡す(レビュー r1 R5)。既定は変えない: macOS と amd64 は 1800 秒、amd64 のサービスがある Linux arm64 は 5400 秒。ネイティブの amd64 がそれ以上を要することを示す測定は、ここには無い。 + +**観察(修正なし):** 重い起動の最中に `playwright install-deps` を実行したとき、ゲストの名前解決がしばらくタイムアウトした(`apt` がすべてのリポジトリに `Ign:` と出し、`curl` が `Resolving timed out` で失敗した)。一分後には同じコマンドが通り、コマンドは成功した。原因は調べていない。仮説は、全負荷の QEMU のユーザーモードネットワークの挙動でありインストーラーの不具合ではない、というものだが、それを裏付ける記録は取っていない。 + +### 第 3 回 — 第 2 回の stack での `scan` と `report` + +> **出所についての注記:** この節のすべての数値(開始時刻、所要時間、終了コード、イメージの大きさ、導入したツールの版、ツールの完了と対象数、指摘、許容リストの 177 件の一致、baseline の例外、ZAP の書き込みの成功、手動の再実行)は、著者が VM の中の出力から書き写した観察である。このリポジトリの生の証跡からは独立に検証していない。`scan` の報告、SBOM、時間のログは VM の `runtime/reports/` に残してコミットしていないので、このリポジトリだけを持つレビュワに確かめられるのは、算術と `installer/grdm_dev/scan.py` のコードの経路で、測定そのものではない。 + +PR #50 のマージ後(develop 32e2344)も、第 2 回の stack はまだ健康だった(コンテナ 19 個)。VM の checkout は b81628f(`scan` の報告の `commit` 欄)で、その `installer/grdm_dev/scan.py` は 32e2344 の develop と同一である。どちらのコマンドも一般利用者(uid 2002)で実行し、スキャナーは `install-ubuntu.sh` が入れたもの(Trivy 0.75.0、gitleaks 8.21.2、venv の Semgrep 1.185.0、Docker の ZAP `ghcr.io/zaproxy/zaproxy:stable`)。 + +```toon +run3: + commands: "grdm-dev --yes --profile core scan、続いて report" + started: 2026-11-12T12:50:52Z + scan: + exit: "51(スキャナー未完)、1 時間 13 分 30 秒後" + gate: "pass(M1 の report-only、ADR-03)" + parts[5]: baseline, trivy, semgrep, gitleaks, zap + report: "終了 0、5 秒" + durations[5]{tool,duration,note}: + "trivy の image の部分","約 38 分","image の対象が先に走った。ember-osf-web イメージの 2 回と cas-overlay の 1 回の呼び出しが終了 1" + "trivy fs と semgrep","約 5 分","Semgrep は 2 分 41 秒、4 パック" + gitleaks,"1 分 47 秒","ok" + zap,"30 分 53 秒","web 24 分、admin 3 分 47 秒、ember_osf_web 3 分 8 秒。uid 1000 が uid 2002 の checkout に報告を書けた(DEMO-21 の失敗 4a は再発しない)" + "baseline controls",数秒,"pass、承認済みの例外 10 件(postgres、volume_owner_init、mongo、rabbitmq)" + tools[4]{tool,version,result}: + trivy,0.75.0,"未完: ember-osf-web イメージの sbom と scan、cas-overlay の sbom が終了 1" + semgrep,1.185.0,"ok、installer/tests/test_compose.py でルールのタイムアウト 1 件(M1 では網羅の警告)" + gitleaks,8.21.2,ok + zap,stable,"ok、3 対象(web、admin、ember_osf_web)" + trivy_targets: "全部で 22: image 16、統合ソースの checkout 5、リポジトリ 1(scan.py は 3 種類すべてを数える)" + trivy_outputs: "脆弱性走査の出力 21(ember イメージ以外すべて)、SBOM 20(ember イメージと cas-overlay 以外すべて)" + findings_total: "5959。不完全な合計(下を参照)" + findings_by_severity: "critical 298、high 1726、medium 2560、low 1369、info 6" + by_tool: "trivy 5931(critical 298、high 1725、medium 2551、low 1357)、zap 28(high 1、medium 9、low 12、info 6)、semgrep 0、gitleaks 0" + allowlist: "manifest/allowlist.json に 58 項目、177 件の指摘が一致(著者報告)、M1 の項目数基準 0(allowlist_baseline)、over_threshold 2024" + gate_rule: report-only +``` + +読み方: + +- **終了 51 は、1 つのイメージで観察された再現する結果である。** Trivy には 1 回の呼び出しにつき既定で 5 分の固定の制限がある(`scan.py` は `--timeout` を渡さない)。ember-osf-web のイメージ(約 7 GB、ビルド済み)は、その中で SBOM も脆弱性の走査も終わらず、SBOM の手動の再実行は 5 分 3 秒後に `FATAL ... context deadline exceeded` で終わった。観察はここまでである。原因がエミュレーションか、負荷か、イメージの大きさかは、私が調べている説明であり、**確立していない**。同じイメージは、機械全体のエミュレーションでない機械の [DEMO-21](21_core_install_ubuntu_arm64_lima.md) では走査できた(そこは 23 対象で、集合が違うので、ここの 22 は欠けた数ではない)。インストーラーの不具合だとも示していない。 +- **cas-overlay の SBOM** も実行中は終了 1 だった。脆弱性の走査は失敗していない。後で単独で実行すると、同じ SBOM は 3.6 秒で終了 0 だった。`scan` は Trivy のメッセージを隠す(`--quiet`)ので、実行中になぜ失敗したかは記録していない。原因は**未解決**で、残りの作業に残る。 +- **何が対象で何がそうでないか。** Trivy の 22 対象のうち、21 に脆弱性の走査結果があり、ember イメージには無いので、その脆弱性は欠けている。SBOM があるのは 20 で、ember イメージと cas-overlay には無い。SBOM と走査の両方が揃うのは 22 のうち 20 である。 +- **合計は不完全な合計である。** 5959 件(と Trivy の 5931 件)は、許容リストとの照合の後に残った指摘(一致した 177 件は別に数える)で、22 対象のうち 21 のもの、に、失敗した呼び出しのために `scan` が足す **3 件**の HIGH の診断(ember の `SCAN-FAILED`、ember と cas-overlay の `SBOM-FAILED`。`scan.py` の 850〜858 行)を加えたものである。ember イメージの脆弱性は合計に入っておらず、診断は入っている。完全な走査での真の合計は分からず、「既知の量だけ多い」とも言えない。 +- **Semgrep、gitleaks、ZAP は amd64 VM で完走した。** Semgrep と gitleaks は何も報告せず、ZAP は 3 対象で 28 件の警告を出した。 +- **ゲートは pass と言った。** 節目が M1 で規則が report-only だからである([ADR-03](../decisions/ADR-03_Staged_Security_Gate.md))。重大と高の 2024 件はしきい値を超えて数えられるが、止めはしない。ゲートが何と言っても、スキャナーが未完なら `scan` は終了 51 で終わる。許容リストは 58 項目で 177 件の指摘が一致した(1 項目が複数の指摘に一致しうる)。`allowlist_baseline` は一致の数ではなく、`manifest/allowlist.baseline.json` に M1 について記録された項目数の基準で、0 である。 +- `report` は終了 0 で、この stack の `doctor`・`plan`・`health`・`scan`・`accept` の報告をまとめた。それらは VM に残してコミットしていない。これがこの節の冒頭に書いた限界である。 +- 検討する価値があるが、ここでは変えない判断: `scan` が設定可能な Trivy の `--timeout` を渡すと、期限で切れる実行が減る可能性がある。それを示すには再実行が要り、終了 0 も、安全性の結論も保証しない。 0.6 から `scan --trivy-timeout 30m` がある(SPEC-03 §4.1)。このスタックではまだ実行していない。 + +### 最終の固定版、一つのコマンド — 2026-11-13/14、develop fb9ccdc(PR #60) + +同じ VM `grdm-ubuntu2404-amd64`(2026-11-13 の朝から停止。この試験のために起動、起動に 2 分 10 秒)、同じ利用者(uid 2002)、develop fb9ccdc の git bundle から作った**新しい空のチェックアウト** `~/rdm-final`、そして最終の固定版のために更新した読み取り専用ミラー(ホスト側で更新)に `RDM-ember-osf-web-dev2027` を加えたもの。ホストは Mac Studio なので、すべてエミュレーションである。固定: osf.io 90b10661、WaterButler 3319c106、modular-file-renderer 9771b8cf、ember-osf-web 4d505f00、cas-overlay 22610b76、wiki-frontend 5985d18b、y-websocket 97252369。 + +**この節の出所。** 証跡としてコミットしたのは受入試験の実行 [`acc-20261113T192132Z-1cf20d`](runs/acc-20261113T192132Z-1cf20d/results.toon) だけである(`docs/demo/runs/`)。`wait_scale: 10.0` で 14 件中 14 件合格。それ以外、つまり 4 回の一つのコマンドの実行と修正を確かめた単独の `up` の終了コード・時間、Elasticsearch の起動時刻、DNS の測定、ボリュームのガードの終了 13 の文、`scan` と `report` の終了コードと時間、指摘件数、VM の開始時の中身は、運用担当のエージェントが VM の端末と報告ファイルから記録した。生のログと報告は VM に残してコミットしておらず、独立には確かめていない。 + +**ここでの「コールド」の正直な意味。** VM は新品でなく、チェックアウトは新品だった。開始時に Docker は 2026-11-12 のイメージ 17 個(21.8 GB)と 9.2 GB のビルドキャッシュを持っていた。古い `grdm-dev` の osf.io 8fc45de4 と wiki-frontend、y-websocket d4d1cfae、Elasticsearch 2 と 6、ShareJS、fakecas、unoconv、そして modular-file-renderer 9771b8cf・WaterButler 3319c106・cas-overlay 22610b76(この三つは今日の固定と同じ)、さらに `redis`、`postgres`、`rabbitmq`、`mongo:3.4`、ZAP のイメージ、以前のビルド済み ember イメージ、そして VM の起動後にまた動いていた古いチェックアウトの stack(名前付きボリューム 11 個)である。前提条件(Docker 29.9.3 と Compose・buildx、trivy 0.75.0、gitleaks 8.21.2、`libatomic1`、`python3-venv`)は既にあったので、`install-ubuntu.sh` は「前提条件はすべて揃っています」と出しただけだった。amd64 では `sudo` を求めず、エミュレーターのコンテナも走らせなかった。amd64 のエミュレーターを置き換えるという arm64 の観察は、ここには当てはまらない。新しいチェックアウトには `runtime/`、`.venv`、Chromium が無かった。osf.io 90b10661、wiki-frontend、ember-osf-web 4d505f00、y-websocket 97252369、Elasticsearch 8 は、ベースのレイヤーだけを使って一から組んだ。ほかのイメージは今日の固定と同じものが既にあった。古い stack は最初の実行の前に自分の `grdm-dev down` で止めた(30 秒)。 + +```toon +final_pins_runs[4]{run,command,started_utc,exit,seconds,cause}: + 1,"GRDM_WITH_ACCEPT=1 ./installer/install-ubuntu.sh --yes --profile core --timeout 14400",2026-11-13T05:14:06Z,13,257,"doctor: Git が RDM-ember-osf-web-dev2027 を読めない(環境: VM の git 設定が 6 つのミラーを転送し、7 つ目を転送していなかった)" + 2,"同じ",2026-11-13T05:18:43Z,13,38735,"build は 10 時間 45 分で終了 0。その後 `up` がボリュームのガード(DEMO-21 0.5)で停止: 2026-11-12 のチェックアウトのボリューム 8 個" + 3,"同じ、8 個のボリュームを削除した後",2026-11-13T16:04:43Z,40,341,"up: elasticsearch8 が unhealthy(インストーラーの不具合: ヘルスチェックの窓がエミュレーション下の起動より短い)" + 4,"同じ、Elasticsearch が自分で起動し終えた後",2026-11-13T16:16:37Z,51,10713,"doctor から health --network は ok、up は 2 時間 22 分。導入自身の scan の段: ZAP の admin が rc 3(再現せず、原因は未解決)" +``` + +**終了 0 になった実行はない。** この VM では一つのコマンドを一度で成功させられず、stack は上の 4 回の実行と、手で実行した下の各工程で組み上がった。これが正直な状態で、それぞれの停止を次に説明する。 + +**失敗 1(環境): 7 つ目のミラー。** `doctor` は 257 秒後(venv の作成を含む)に終了 13 で止まった。VM の `git config` には統合リポジトリ 6 つの `url.<ミラー>.insteadOf` があり、最終の固定版が要る `RDM-ember-osf-web-dev2027` の分が無かった。7 つ目の転送を足した(ホストのミラーは既に 4d505f00 を持っていた)。環境だけの問題で、`doctor` のメッセージは正しかった。 + +**失敗 2(不具合ではない): ボリュームのガード。** 第 2 回は 10 時間 45 分 35 秒の `build`(下記)を終え、`up` が終了 13 で止まった。ガードは 8 個のボリューム `grdm-dev_elasticsearch6_data`、`ember_osf_web_dist`、`osfstoragecache`、`postgres_data`、`rabbitmq_data`、`redis_data`、`wb_tmp`、`wiki_static` を名指しした。各々は `/home/grdm/RDM-developer-guide/runtime/volumes/...` に結び付いており、出口も示された。古いチェックアウトでは先に `grdm-dev down` を実行しておいた。そして表示された `docker volume rm` をその 8 個の名前だけで実行した(退役したサービスの 3 個は残した)。第 3 回は空のボリュームから始まった。これは DEMO-21 0.5 のガードが、二つ目の場面で作られた目的どおり働いたものである。10 時間の `build` の後にガードが働いたので、私の手順の順序が変わった以外に費用はなかった。`build` の前に働くガードなら、10 時間前にそう言えた。これは案であり、変更ではない。 + +**失敗 3(インストーラー): Elasticsearch 8 が、遅い起動のために unhealthy とされた。** 第 3 回は 341 秒で終了 40、`dependency failed to start: container grdm-dev-elasticsearch8-1 is unhealthy` で終わった。テンプレートのチェック(`start_period` 30 秒、間隔 10 秒、12 回)が許す起動は約 150 秒である。ここでの Elasticsearch 8 は 8 分 10 秒かかった(コンテナの開始 16:07:48Z、ログの `started` が 16:15:58Z)。JVM とプラグインの読み込みが機械全体の amd64 エミュレーションの下で動くためである。コンテナは起動を続け、約 16:16Z に自分で healthy になった。`up --timeout` は助けにならない。これは Compose の待ちを区切るもので、コンテナ自身のチェックではない。これは遅いホストでの**インストーラーの不具合**であり、Elasticsearch の不具合ではない(ログには、通常の起動の前に無害な jansi のネイティブライブラリの警告があるだけ)。**修正**(`fix(installer)`、試験つき): チェックを 30 秒に加えて 100 回(間隔 10 秒、1 回は最長 5 秒)、17〜26 分まで許す。実測の起動の 2 倍以上で、`up` の既定の健康の待ち 1800 秒の内に終わり、速いホストには費用がかからない(起動できていればすぐ通る)。確認: 第 4 回の後、修正したテンプレート(当時は 120 回。レビュー r1 で、最長の窓が `up` の健康の待ちの内に終わるよう 100 回に下げた。100 回でもこの起動の 2 倍以上を許す)をこのチェックアウトに入れ、stack を render し直して `up` を実行した。Elasticsearch 8 は再作成され(データのボリュームつきの、コンテナのコールドな起動)、また 8 分 10 秒で起動し(20:13:20Z から 20:21:31Z)、コンテナは窓の内に healthy になり、`grdm-dev --yes --profile core up --no-open --timeout 3600` は 1262 秒で終了 0 になった(一回きりの `osf_init` が再実行され、残りは待ち)。これは 1 台での 1 回の再現であり、第 4 回のチェックアウトには既に stack があったので、一つのコマンドが何もない状態から通ることを示すものではない。 + +**第 4 回(終了 51): `up` は通り、scan の段は通らなかった。** Elasticsearch 8 は第 3 回の起動で既に healthy だったので、`build`(キャッシュ済み、約 3 分)、`up`(報告の時刻で 2 時間 22 分、18:41:32Z。ほとんどが `osf_init` の migration で、最初の記録の第 2 回と同じ)、`health --network`(終了 0)が通った。導入自身の `scan` の段は終了 51 だった。ZAP が「no ZAP report for http://admin:8001 (rc 3)」と言い、Trivy(22 対象、1 回の呼び出し 5 分の既定の制限つき)、Semgrep、gitleaks は `ok` だった。ZAP 自身の出力は取っていない。下の単独の `scan` の再実行では `admin` も走査されて終了 0 だったので、この失敗は再現せず、原因は**未解決**である(仮説は、長い `up` の直後で `admin` がまだ遅かったこと。未検証)。インストーラーの不具合とも、エミュレーションとも主張しない。 + +**ビルドの時間(運用担当の記録。第 2 回)。** `build` 全体は第 2 回の開始(05:18:43Z)から 16:04:15Z の報告まで 10 時間 45 分 35 秒だった。そのうち約 33 分は、読み取り専用ミラーからの osf.io の `git clone`(9p の共有越し。ミラーは「filtering not recognized by server」と出して全履歴を送る)である。osf.io のイメージは約 14:05Z までかかり、その Python の `RUN` の段は、numpy・pandas・scipy をソースから組む pip の最後の出力が 25 493 秒(7 時間 5 分)で、その数分後に終わった(最初の記録 0.1 の、一つのコマンドで約 9 時間という外挿は、`build` だけで 10 時間 45 分なので低かった。ただしコンパイルが Rosetta の 55 分の 10 倍かかったのではなく、約 8 倍だった)。wiki-frontend、ember-osf-web(Node の段 2462 秒)、小さなイメージがそれに続き、16:04Z に終わった。Elasticsearch 8・y-websocket・elasticsearch6・unoconv・fakecas はネイティブに数分で組めた。 + +```toon +after_run4[6]{stage,command,exit,seconds,result}: + health,"grdm-dev health --network",0,15,"loopback_only: true、127.0.0.1 の 8 つのプロジェクトポート、17 コンテナが稼働" + accept_first_try,"GRDM_WITH_ACCEPT=1 grdm-dev --yes accept --seed --wait-scale 10",2,0,".venv/.playwright に Chromium が無い。メッセージが二つの導入コマンドを表示する" + chromium,"PLAYWRIGHT_BROWSERS_PATH=.venv/.playwright playwright install chromium、続けて install-deps chromium(表示されたもの)",0,304,"停止したダウンロードなし、再試行なし" + accept,"GRDM_WITH_ACCEPT=1 grdm-dev --yes accept --seed --wait-scale 10",0,1689,"14 件合格、0 件失敗、10 件スキップ(S1〜S5、M3 までの無条件スキップ)。wait_scale 10.0。事前確認で 23 サービスが healthy" + scan,"grdm-dev --yes scan --trivy-timeout 45m",0,1322,"ゲートは report-only で pass。指摘 6170(critical 314、high 1835、medium 2719、low 1298、info 4)、58 項目で 177 件が許容済み、over_threshold 2149" + report,"grdm-dev --yes report",0,5,"overall: complete" +``` + +**受入試験: 14 件中 14 件**([`acc-20261113T192132Z-1cf20d`](runs/acc-20261113T192132Z-1cf20d/results.toon)、コミット済み)。各試験と、`--wait-scale 10` での所要時間: + +| シナリオ | success | rejection | +|---|---|---| +| C1 fakecas でのログイン | 合格、52.8 秒 | 合格、0.4 秒(401) | +| C2 プロジェクトの作成 | 合格、126.1 秒 | 合格、74.0 秒(403) | +| C3 ファイルのアップロードとダウンロード | 合格、52.3 秒 | 合格、82.3 秒(403) | +| **C4 wiki の共同編集** | **合格、165.8 秒** | 合格、107.2 秒(close code 4401) | +| C5 ファイルのプレビュー | 合格、86.5 秒 | 合格、73.6 秒(401) | +| C6 機関の管理画面 | 合格、42.6 秒 | 合格、22.0 秒(403) | +| **C7 ファイルページの共同編集** | **合格、203.1 秒** | 合格、142.8 秒(close code 4401) | + +S1〜S5 はスキップされた(それらのモジュールは M3 まで無条件にスキップする)。0.1 で 30 秒の待ちに 2 回失敗し、未コミットのパッチのコピーでだけ 1 回通った C4 の success は、ここではコミットしたスイートが `--wait-scale 10` で 165.8 秒で合格した(パッチのコピーでは 182.6 秒)。最終の固定版で既定の待ちのままなら失敗するかは試していない。失敗するという予想が、PR #60 がつまみを足した理由である。これは 1 台のエミュレーションの機械での 1 回であり、つまみが amd64 で働くことと、C4・C7 がそこで動くことを示すが、実機で wiki のページにどれだけかかるかについては何も言わない。 + +**scan。** `scan --trivy-timeout 45m` は 1322 秒(開始 19:49:50Z)で終了 0 になった。Trivy 0.75.0(22 対象)、Semgrep 1.185.0(`installer/tests/test_compose.py` で規則のタイムアウト 1 件、M1 では範囲の警告)、gitleaks 8.21.2、`admin` と `ember_osf_web` への ZAP。`web` は、匿名の要求がスキャナーから届かないサインインのアドレス `127.0.0.1:8080` へ転送されるためスキップされた(arm64 と同じ注記)。ゲートは M1 で report-only なので pass と言った([ADR-03](../decisions/ADR-03_Staged_Security_Gate.md))。重大と高の 2149 件はしきい値を超えて数えられるが止めはしない。DEMO-22 第 3 回の Trivy の期限切れは再現しなかったが、それは長い制限のためではない。第 4 回の導入自身の scan は既定の 5 分で、Trivy は 22 対象すべてで `ok` だった。ember-osf-web のイメージが 7 GB のビルド済みでなく、小さな静的 nginx のイメージになったからである。したがって `--trivy-timeout` は、働くこと(フラグが受理されて走査が完了した)は示したが、このスタックで要ることは示していない。第 3 回の cas-overlay の SBOM の失敗も再現しなかった。 + +**何も見つけなかった環境の確認。** DNS のバースト(arm64 の失敗 5)は最初に測った。VM の中から `files.pythonhosted.org` への AAAA と A の同時問い合わせ 30・60・120 件を、QEMU のリゾルバー(Lima の 192.168.5.2 でなく 192.168.5.3)と systemd-resolved(127.0.0.53)に向けて測り、すべて成功したので、リゾルバーも `daemon.json` も変えていない。arm64 の失敗 6 の `apk` の停止は起きなかった。VM への変更は、7 つ目のミラーの転送(第 1 回)と、修正の確認のためだけにチェックアウトに入れたパッチ済みテンプレートだけである。 + +### 残っていること + +- **Ubuntu amd64 で中断しない一つのコマンドの実行:** 未実施。0.7 で最終の固定版のすべての工程をここで実行した(最終の固定版の節。一つのコマンドの 4 回の実行は、四つの違う理由で 13、13、40、51 で終わり、残りの工程は手で実行して終了 0)。ただし一つのコマンドが一度で終了 0 になったことはない。Elasticsearch 8 の窓を広げた状態での、空の VM か実機での次の実行が残っている。以前の文: 未実施。実際の amd64 の機械(クラウドの仮想マシンや PC)が要る。この機械では約 9 時間と見積もる(10 倍の比の外挿で、最後までは測っていない)。実機での時間は測っていない。amd64 でこれまでに確かめたこと: 前提条件、`doctor`、ミラー経由の `git` の読み取り、uid 2002、9 つのイメージのネイティブビルド。ここで amd64 では組んでいないもの: osf.io と wiki-frontend(Rosetta の VM から輸入)。 +- **`scan` と `report`:** 0.7 で最終の固定版で実行した。`scan --trivy-timeout 45m` は終了 0、`report` は終了 0(運用担当の記録。導入自身の scan で `admin` の ZAP が rc 3 で失敗したのは再現せず、原因は不明)。以前の文: 第 3 回で実施した(終了 51 と 0。上記。数値は著者の書き写しで、コミットした証跡ではない)。残っているのは、ここで 5 分の制限を再現して超えた ember-osf-web イメージの Trivy の SBOM と脆弱性の走査(原因は確立していない。長い制限か、機械全体のエミュレーションでないホストか、別の理由か)と、実行中に失敗した原因が**不明**の cas-overlay の SBOM である。DEMO-21 の失敗 4a の ZAP の報告ディレクトリは、amd64 のホストでも示せた(ZAP の報告が書かれた)。 +- **C4 の success:** 0.7 で、コミットしたスイートと `accept --seed --wait-scale 10` で合格した(C4・C7 を含む 14 件中 14 件、コミット済みの証跡)。この VM で既定の待ちのままの再実行はしておらず、実機でも試していない。以前の文: 試験の 30 秒の待ちで 2 回失敗し、待ちを約 10 倍にして 1 回合格した(パッチを当てたコピー、未コミット)。コミットした試験を実際の amd64 の機械で素のまま実行すること、または待ちを設定可能にする判断は、まだ残っている。 0.6 から待ちは `grdm-dev accept --wait-scale N`(SPEC-04 §3)で伸ばせるので、コミットしたスイートはパッチ付きのコピーを要しない。この VM か実機での実行はまだ残っている。 +- **WSL2:** 未実施(理由は [DEMO-21](21_core_install_ubuntu_arm64_lima.md))。 +- **pin:** 0.7 の実行は develop fb9ccdc(osf.io 90b10661 と他の最終の固定)のもの。0.1〜0.5 の実行は develop b81628f のもの。別の担当の統合が入ると osf.io の pin は変わる。 diff --git a/docs/demo/README.md b/docs/demo/README.md new file mode 100644 index 0000000..ba9ea9d --- /dev/null +++ b/docs/demo/README.md @@ -0,0 +1,97 @@ +# Demonstration Records / 実証記録 + +> **Summary:** Records of what was actually done: acceptance runs, integration test results. Each record lives under `demo/runs/` and includes results.toon, screenshots, and traces. +> **概要:** 実際にやったことの記録:受入試験、統合試験結果。各記録は `demo/runs/` の下にあり、results.toon、スクリーンショット、トレースを含みます。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** a milestone can only be called passed if the acceptance run that passed it is recorded with its evidence; this folder is where that evidence lives. / 節目を「合格」と呼べるのは、合格した受入実行が証跡とともに記録されているときだけであり、その置き場がこのフォルダだと分かった。 +- Normative for: [SPEC-04 Acceptance Tests](../spec/04_acceptance_tests.md), [SPEC-03 Security Gate](../spec/03_security_gate.md). +- Related: [../README.md](../README.md) · [status/](../status/README.md) · [demo/runs/](runs/README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. What belongs here + +A *demo* record documents what was actually done, including acceptance and integration tests. This folder contains: + +| Subfolder | Purpose | +|---|---| +| [runs/](runs/README.md) | Individual run results: `acc-<timestamp>-<6 hex>/` with evidence. | + +The record format is defined in [SPEC-04 §7](../spec/04_acceptance_tests.md): + +```toon +evidence: + results.toon: one line per test with id, case, status, duration_ms, http_status + results.json: same data, canonical + junit.xml: for CI and GitHub checks tab + screenshots/: <test>_<case>.png, taken only on failure + trace/: Playwright trace zip, only on failure, kept 14 days in CI +``` + +### 2. Open items (no entries yet / まだありません) + +| Date | Title | Status | +|---|---|---| +| — | — | — | + +### 3. Creating a new demo record + +1. Run `grdm-dev accept` (acceptance) or `grdm-dev health --network` (integration). +2. The record is written to `docs/demo/runs/<run_id>/`. +3. Link the run folder from status reports or milestone documents. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. ここに属するもの + +「実証」記録は、実際にやったこと(受入試験、統合試験)を文書化します。このフォルダには次が含まれます: + +| サブフォルダ | 目的 | +|---|---| +| [runs/](runs/README.md) | 個別の実行結果:`acc-<時刻>-<6 桁の16進>/` に証跡が置かれる。 | + +記録形式は [SPEC-04 §7](../spec/04_acceptance_tests.md) に定められています: + +```toon +証跡: + results.toon: 試験ごとに一行。id・case・status・duration_ms・http_status + results.json: 同じデータの正本 + junit.xml: CI と GitHub の checks タブ向け + screenshots/: <試験>_<ケース>.png。失敗時だけ撮る + trace/: Playwright のトレース zip。失敗時だけ。CI では 14 日保持 +``` + +### 2. 未解決項目(まだありません / no entries yet) + +| 日付 | タイトル | ステータス | +|---|---|---| +| — | — | — | + +### 3. 新しい実証記録をつくるには + +1. `grdm-dev accept`(受入)または `grdm-dev health --network`(統合)を実行する。 +2. 記録は `docs/demo/runs/<実行ID>/` に書かれる。 +3. 状況報告や節目文書へ実行フォルダにリンクする。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Demo record | A document of what was actually done, including acceptance and integration tests. | 実際にやったこと(受入試験、統合試験)を文書化したもの。 | +| Evidence | Files that prove a test run: results, screenshots, traces. | 試験実行を証明するファイル:結果、スクリーンショット、トレース。 | +| Acceptance test | A check that the whole thing does what the user asked for. | 全体が利用者の望みどおりに動くかの確認。 | +| Integration test | A check that several pieces work together. | いくつかの部品が一緒に動くかの確認。 | diff --git a/docs/demo/runs/README.md b/docs/demo/runs/README.md new file mode 100644 index 0000000..158a6c6 --- /dev/null +++ b/docs/demo/runs/README.md @@ -0,0 +1,70 @@ +# Acceptance Run Records / 受入実行の記録 + +> **Summary:** Each run of `grdm-dev accept` writes its evidence into a folder here, named by run id. Only runs cited by DEMO-20 are committed. +> **概要:** `grdm-dev accept` を実行するたびに、その証跡が実行 ID 名のフォルダとしてここに書かれます。リポジトリには DEMO-20 が引用する実行だけを置きます。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.4 — 2026-11-10. **Learned:** failure output of a committed run (`acc-20261109T131240Z-00dff9`) printed disposable test identities and passwords, because the masking set held only `runtime/.env` values; all three committed run folders were put through the same masking logic once (only that run changed, and no result changed), and these records are otherwise never edited (PR #35 review r1, R1-01). / マスク対象が `runtime/.env` の値だけだったため、コミット済みの実行 `acc-20261109T131240Z-00dff9` の失敗出力に、使い捨て試験アカウントの識別子とパスワードが含まれていた。コミット済みの三実行すべてに同じマスク処理を一度だけ適用し(変わったのはこの実行のみで、結果は不変)、それ以外の編集は行わない(PR #35 レビュー r1、R1-01)。 +- Version / 版: 0.3 — 2026-11-10. **Learned:** only the runs a record cites are kept in the repository; the others stay local. / リポジトリに残すのは記録が引用する実行だけで、他は手元に置く。 + 0.2 — 2026-11-05. **Learned:** traces are raw and may hold secrets, so the public evidence folder keeps only screenshots and masked text (PR #21 review r2). / トレースは生で秘密を含み得るため、公開の証跡フォルダにはスクリーンショットとマスク済みの文字だけを置く(PR #21 レビュー r2)。 + 0.1 — 2026-11-05. **Learned:** the evidence folder must exist with a stated layout before the first run, so that SPEC-04 and the demo index can link to it. / 最初の実行の前に、証跡フォルダと決まった中身をここに書いておく必要があると分かった。SPEC-04 と実証の索引がリンクできるようにするためである。 +- Normative source: [SPEC-04 Acceptance Tests](../../spec/04_acceptance_tests.md) +- Related: [docs/demo/README.md](../README.md) · [docs/status/README.md](../../status/README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### What is stored here + +Every run of the acceptance tests (automated browser tests that check the environment works, see [SPEC-04](../../spec/04_acceptance_tests.md)) creates one folder `runs/<run_id>/` with: + +| File | Meaning | +|---|---| +| `results.toon` | Human- and AI-readable summary (TOON: a compact text form of JSON) | +| `results.json` | The same data for machines (canonical) | +| `junit.xml` | Test results in the format CI tools read | +| `screenshots/` | Only when a test failed: what the browser saw. Browser traces are not kept here; with `--trace` they go to `runtime/reports/quarantine/<run_id>/`, which is private and git-ignored | + +Records are written by `grdm-dev accept`; do not edit them by hand. No secrets are ever written here: seeded test identities and passwords count as secrets and are masked too. + +### Current state + +Runs cited by [DEMO-20](../20_core_install_mac_studio.md#english) are kept here. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### ここに置くもの + +受入試験(環境が動くことを確かめる自動のブラウザ試験。[SPEC-04](../../spec/04_acceptance_tests.md) 参照)を実行するたびに、`runs/<run_id>/` というフォルダが一つ作られ、次が入ります。 + +| ファイル | 意味 | +|---|---| +| `results.toon` | 人と AI が読む要約(TOON: JSON を短い文字で表した形) | +| `results.json` | 機械が読む同じデータ(正本) | +| `junit.xml` | CI の道具が読む形式の試験結果 | +| `screenshots/` | 試験が失敗したときだけ: ブラウザが見ていた画面。ブラウザのトレースはここには置かない。`--trace` のときは `runtime/reports/quarantine/<run_id>/`(非公開、git 管理外)へ | + +記録は `grdm-dev accept` が書きます。手で編集しないでください。秘密情報はここに書かれません。試験用に作るアカウントの識別子とパスワードも秘密情報として伏せます。 + +### いまの状態 + +[DEMO-20](../20_core_install_mac_studio.md#japanese) が引用する実行をここに置いています。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Run id | A short unique name for one test run, like a receipt number. | 一回の試験実行につける短い名前。レシート番号のようなもの。 | +| JUnit XML | A standard file format that test tools use to report pass/fail. | 試験の道具が合否を報告するときの標準の形式。 | diff --git a/docs/demo/runs/acc-20261109T131214Z-f2ee77/collector.json b/docs/demo/runs/acc-20261109T131214Z-f2ee77/collector.json new file mode 100644 index 0000000..c499498 --- /dev/null +++ b/docs/demo/runs/acc-20261109T131214Z-f2ee77/collector.json @@ -0,0 +1,24 @@ +[ + { + "nodeid": "test_c1_login.py::test_c1_login_success[chromium]", + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "status": "passed", + "duration_ms": 5393, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c1_login.py::test_c1_login_rejection", + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "status": "passed", + "duration_ms": 375, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261109T131214Z-f2ee77/junit.xml b/docs/demo/runs/acc-20261109T131214Z-f2ee77/junit.xml new file mode 100644 index 0000000..bb432c2 --- /dev/null +++ b/docs/demo/runs/acc-20261109T131214Z-f2ee77/junit.xml @@ -0,0 +1 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="2" time="5.792" timestamp="2026-11-09T22:12:25.485228+09:00" hostname="redacted-host"><testcase classname="test_c1_login" name="test_c1_login_success[chromium]" time="5.394"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="7" /></properties></testcase><testcase classname="test_c1_login" name="test_c1_login_rejection" time="0.377"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="0" /></properties></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261109T131214Z-f2ee77/pytest.log b/docs/demo/runs/acc-20261109T131214Z-f2ee77/pytest.log new file mode 100644 index 0000000..c9875ec --- /dev/null +++ b/docs/demo/runs/acc-20261109T131214Z-f2ee77/pytest.log @@ -0,0 +1,10 @@ +.. [100%] +=============================== warnings summary =============================== +test_c1_login.py::test_c1_login_success[chromium] + test_c1_login.py:10: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c1_login.py::test_c1_login_rejection + test_c1_login.py:20: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +2 passed, 2 warnings in 5.79s diff --git a/docs/demo/runs/acc-20261109T131214Z-f2ee77/results.json b/docs/demo/runs/acc-20261109T131214Z-f2ee77/results.json new file mode 100644 index 0000000..2953a12 --- /dev/null +++ b/docs/demo/runs/acc-20261109T131214Z-f2ee77/results.json @@ -0,0 +1,52 @@ +{ + "run_id": "acc-20261109T131214Z-f2ee77", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-09T13:12:14Z", + "duration_ms": 19419, + "only": "C1", + "seeded": true, + "precheck": { + "healthy": true, + "services": 23 + }, + "pytest_returncode": 0, + "evidence_dir": "docs/demo/runs/acc-20261109T131214Z-f2ee77", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C1" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 2, + "failed": 0, + "error": 0, + "skipped": 0, + "total": 2, + "known_external_blocked": 7 + }, + "tests": [ + { + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "test": "test_c1_login_success[chromium]", + "status": "passed", + "duration_ms": 5393, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "test": "test_c1_login_rejection", + "status": "passed", + "duration_ms": 375, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261109T131214Z-f2ee77/results.toon b/docs/demo/runs/acc-20261109T131214Z-f2ee77/results.toon new file mode 100644 index 0000000..0b13272 --- /dev/null +++ b/docs/demo/runs/acc-20261109T131214Z-f2ee77/results.toon @@ -0,0 +1,27 @@ +accept: + run_id: acc-20261109T131214Z-f2ee77 + base_url: "http://127.0.0.1:5000" + started: "2026-11-09T13:12:14Z" + duration_ms: 19419 + only: C1 + seeded: true + precheck: + healthy: true + services: 23 + pytest_returncode: 0 + evidence_dir: docs/demo/runs/acc-20261109T131214Z-f2ee77 + tracing: off + trace_quarantine: null + expected_scenarios[1]: + - C1 + incomplete_scenarios[0]: + summary: + passed: 2 + failed: 0 + error: 0 + skipped: 0 + total: 2 + known_external_blocked: 7 + tests[2]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C1,Login via fakecas,success,"test_c1_login_success[chromium]",passed,5393,200,null,7 + C1,Login via fakecas,rejection,test_c1_login_rejection,passed,375,401,null,0 diff --git a/docs/demo/runs/acc-20261109T131240Z-00dff9/collector.json b/docs/demo/runs/acc-20261109T131240Z-00dff9/collector.json new file mode 100644 index 0000000..39e9ce4 --- /dev/null +++ b/docs/demo/runs/acc-20261109T131240Z-00dff9/collector.json @@ -0,0 +1,134 @@ +[ + { + "nodeid": "test_c1_login.py::test_c1_login_success[chromium]", + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "status": "passed", + "duration_ms": 4184, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_success[chromium]", + "id": "C2", + "name": "Create project", + "case": "success", + "status": "failed", + "duration_ms": 33825, + "http_status": null, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_rejection[chromium]", + "id": "C2", + "name": "Create project", + "case": "rejection", + "status": "passed", + "duration_ms": 6303, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "success", + "status": "failed", + "duration_ms": 3701, + "http_status": null, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "status": "failed", + "duration_ms": 5358, + "http_status": null, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "failed", + "duration_ms": 66834, + "http_status": null, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "failed", + "duration_ms": 65895, + "http_status": null, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_success[chromium]", + "id": "C5", + "name": "File preview", + "case": "success", + "status": "failed", + "duration_ms": 7944, + "http_status": null, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_rejection[chromium]", + "id": "C5", + "name": "File preview", + "case": "rejection", + "status": "failed", + "duration_ms": 2979, + "http_status": null, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_success[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "status": "error", + "duration_ms": 691, + "http_status": 404, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_rejection[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "status": "failed", + "duration_ms": 1952, + "http_status": null, + "evidence": null, + "known_external_blocked": 3 + }, + { + "nodeid": "test_c1_login.py::test_c1_login_rejection", + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "status": "passed", + "duration_ms": 89, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261109T131240Z-00dff9/junit.xml b/docs/demo/runs/acc-20261109T131240Z-00dff9/junit.xml new file mode 100644 index 0000000..1c40760 --- /dev/null +++ b/docs/demo/runs/acc-20261109T131240Z-00dff9/junit.xml @@ -0,0 +1,372 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="1" failures="9" skipped="0" tests="13" time="200.235" timestamp="2026-11-09T22:12:50.773057+09:00" hostname="redacted-host"><testcase classname="test_c1_login" name="test_c1_login_success[chromium]" time="4.185"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="7" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_success[chromium]" time="33.827"><properties><property name="known_external_blocked" value="7" /></properties><failure message="playwright._impl._errors.TimeoutError: Page.fill: Timeout 30000ms exceeded. Call log: - waiting for locator("input#projectName, input[name='title']")">logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'> +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0x109732f00> +run_id = 'acc-20261109T131240Z-00dff9' +record_property = <function record_property.<locals>.append_property at 0x109733270> + + @pytest.mark.case("success") + def test_c2_create_project_success(logged_in_page, base_url, api_url, api_write, run_id, record_property): + """A new project created in the UI appears with its title and the user as admin.""" + page = logged_in_page + title = f"acceptance C2 {run_id}" + page.goto(base_url + sel.PATHS["new_project"], wait_until="domcontentloaded") + page.click(sel.WEB["create_project_button"]) +> page.fill(sel.WEB["create_project_title"], title) + +installer/acceptance/test_c2_create_project.py:18: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +.venv/lib/python3.14/site-packages/playwright/sync_api/_generated.py:17698: in fill + self._sync( +.venv/lib/python3.14/site-packages/playwright/_impl/_page.py:932: in fill + return await self._main_frame.fill(**locals_to_params(locals())) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.14/site-packages/playwright/_impl/_frame.py:641: in fill + await self._fill(**locals_to_params(locals())) +.venv/lib/python3.14/site-packages/playwright/_impl/_frame.py:653: in _fill + await self._channel.send("fill", self._timeout, locals_to_params(locals())) +.venv/lib/python3.14/site-packages/playwright/_impl/_connection.py:78: in send + return await self._connection.wrap_api_call( +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl._connection.Connection object at 0x1092ed010> +cb = <function Channel.send.<locals>.<lambda> at 0x109731d20> +is_internal = False, title = None + + async def wrap_api_call( + self, cb: Callable[[], Any], is_internal: bool = False, title: str = None + ) -> Any: + if self._api_zone.get(): + return await cb() + task = asyncio.current_task(self._loop) + parsed_st = _attach_api_call_information( + getattr(task, "__pw_stack__", None) or _capture_stack_trace(), + is_internal, + title, + ) + self._api_zone.set(parsed_st) + try: + return await cb() + except Exception as error: +> raise rewrite_error(error, f"{parsed_st['apiName']}: {error}") from None +E playwright._impl._errors.TimeoutError: Page.fill: Timeout 30000ms exceeded. +E Call log: +E - waiting for locator("input#projectName, input[name='title']") + +.venv/lib/python3.14/site-packages/playwright/_impl/_connection.py:636: TimeoutError</failure></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_rejection[chromium]" time="6.304"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_success[chromium]" time="3.703"><properties><property name="known_external_blocked" value="4" /></properties><failure message="AssertionError: upload failed: 401 {"message_short": "Unauthorized", "message_long": "You must <a href=\"/login/?next=http://web:5000/api/v1/etrvf/osfstorage/6af1c701c38b200015a219ae/children/?user_id=nxvcg&payload=eyJ0aW1lIjogMTc5NDIzMDExN30%3D&signature=***\">log in<\/a> assert 401 in (200, 201) [+1 more line; full report in element text]">logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'>, project = 'etrvf' +service_url = <function service_url.<locals>._url at 0x1095acb40> +tmp_txt = b'grdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm a...ta\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm' +run_id = 'acc-20261109T131240Z-00dff9' +record_property = <function record_property.<locals>.append_property at 0x10aca9220> + + @pytest.mark.case("success") + def test_c3_file_upload_success(logged_in_page, project, service_url, tmp_txt, run_id, record_property): + """Upload 1 MiB through waterbutler, download it back, bytes must be identical.""" + ctx = logged_in_page.context + wb = service_url("wb") +> entity = upload(ctx, wb, project, f"c3-{run_id}.txt", tmp_txt) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c3_file_upload.py:34: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +context = <BrowserContext browser=<Browser type=<BrowserType name=chromium executable_path=~/ai-development/GitHub...um-1248/chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing> version=156.0.8078.4>> +wb_url = 'http://127.0.0.1:7777', node_id = 'etrvf' +name = 'c3-acc-20261109T131240Z-00dff9.txt' +data = b'grdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm a...ta\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm' + + def upload(context, wb_url: str, node_id: str, name: str, data: bytes): + """PUT bytes to waterbutler with the session cookie; returns the waterbutler file entity (dict). + + TODO(M2): confirm waterbutler accepts the `osf` session cookie forwarded by Playwright and that + the response is 201 with data.attributes.path / links.download. + """ + resp = api(context).put(wb_url + sel.WATERBUTLER["upload"].format(node_id=node_id, name=name), + data=data, headers={"Content-Type": "application/octet-stream"}) +> assert resp.status in (200, 201), f"upload failed: {resp.status} {resp.text()[:300]}" +E AssertionError: upload failed: 401 {"message_short": "Unauthorized", "message_long": "You must <a href=\"/login/?next=http://web:5000/api/v1/etrvf/osfstorage/6af1c701c38b200015a219ae/children/?user_id=nxvcg&payload=eyJ0aW1lIjogMTc5NDIzMDExN30%3D&signature=***\">log in<\/a> +E assert 401 in (200, 201) +E + where 401 = <APIResponse url='http://127.0.0.1:7777/v1/resources/etrvf/providers/osfstorage/?kind=file&name=c3-acc-20261109T131240Z-00dff9.txt' status=401 status_text='Unauthorized'>.status + +installer/acceptance/test_c3_file_upload.py:19: AssertionError</failure></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_rejection[chromium]" time="5.359"><properties><property name="known_external_blocked" value="8" /></properties><failure message="AssertionError: upload failed: 401 {"message_short": "Unauthorized", "message_long": "You must <a href=\"/login/?next=http://web:5000/api/v1/4jm8q/osfstorage/6af1c705c38b200015a219b4/children/?user_id=nxvcg&payload=eyJ0aW1lIjogMTc5NDIzMDEyM30%3D&signature=***\">log in<\/a> assert 401 in (200, 201) [+1 more line; full report in element text]">logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'>, project = '4jm8q' +context_b = <BrowserContext browser=<Browser type=<BrowserType name=chromium executable_path=~/ai-development/GitHub...um-1248/chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing> version=156.0.8078.4>> +service_url = <function service_url.<locals>._url at 0x1095acb40> +tmp_txt = b'grdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm a...ta\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm' +run_id = 'acc-20261109T131240Z-00dff9' +api_context = <function api_context.<locals>._new at 0x10a8638a0> +record_property = <function record_property.<locals>.append_property at 0x10a863cc0> + + @pytest.mark.case("rejection") + def test_c3_file_upload_rejection(logged_in_page, project, context_b, service_url, tmp_txt, run_id, api_context, + record_property): + """Anonymous GET of a private file -> 401/403; a signed-in NON-contributor (user_b) PUT -> 403.""" + ctx = logged_in_page.context + wb = service_url("wb") +> entity = upload(ctx, wb, project, f"c3-private-{run_id}.txt", tmp_txt[:1024]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c3_file_upload.py:49: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +context = <BrowserContext browser=<Browser type=<BrowserType name=chromium executable_path=~/ai-development/GitHub...um-1248/chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing> version=156.0.8078.4>> +wb_url = 'http://127.0.0.1:7777', node_id = '4jm8q' +name = 'c3-private-acc-20261109T131240Z-00dff9.txt' +data = b'grdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm a...mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock dat' + + def upload(context, wb_url: str, node_id: str, name: str, data: bytes): + """PUT bytes to waterbutler with the session cookie; returns the waterbutler file entity (dict). + + TODO(M2): confirm waterbutler accepts the `osf` session cookie forwarded by Playwright and that + the response is 201 with data.attributes.path / links.download. + """ + resp = api(context).put(wb_url + sel.WATERBUTLER["upload"].format(node_id=node_id, name=name), + data=data, headers={"Content-Type": "application/octet-stream"}) +> assert resp.status in (200, 201), f"upload failed: {resp.status} {resp.text()[:300]}" +E AssertionError: upload failed: 401 {"message_short": "Unauthorized", "message_long": "You must <a href=\"/login/?next=http://web:5000/api/v1/4jm8q/osfstorage/6af1c705c38b200015a219b4/children/?user_id=nxvcg&payload=eyJ0aW1lIjogMTc5NDIzMDEyM30%3D&signature=***\">log in<\/a> +E assert 401 in (200, 201) +E + where 401 = <APIResponse url='http://127.0.0.1:7777/v1/resources/4jm8q/providers/osfstorage/?kind=file&name=c3-private-acc-20261109T131240Z-00dff9.txt' status=401 status_text='Unauthorized'>.status + +installer/acceptance/test_c3_file_upload.py:19: AssertionError</failure></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="66.836"><properties><property name="known_external_blocked" value="13" /></properties><failure message="playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. Call log: - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible">two_contexts = (<Page url='http://127.0.0.1:5000/aynvc/wiki/home/?edit&view&menu'>, <Page url='http://127.0.0.1:5000/dashboard'>) +login = <function login.<locals>._login at 0x10acf5b10> +user_a = {'email': '***', 'password': '***'} +user_b = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0x10a861170> +add_contributor = <function add_contributor.<locals>._add at 0x10a861a60> +run_id = 'acc-20261109T131240Z-00dff9' +record_property = <function record_property.<locals>.append_property at 0x10a8637f0> + + @pytest.mark.case("success") + def test_c4_wiki_collab_success(two_contexts, login, user_a, user_b, base_url, api_url, api_write, add_contributor, + run_id, record_property): + """Both users open the same wiki page; text typed by B appears in A's editor and text typed by A in B's.""" + page_a, page_b = two_contexts + login(page_a, user_a) + login(page_b, user_b) + + created = api_write(page_a.context, "POST", api_url + sel.API["nodes"], { + "data": {"type": "nodes", "attributes": {"title": "acceptance C4", "category": "project", "public": False}} + }) + assert created.status == 201, created.text()[:200] + node_id = created.json()["data"]["id"] + try: + add_contributor(page_a.context, node_id, user_id_of(page_b.context, api_url), "write") + +> resp_a = _open_editor(page_a, base_url, node_id) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c4_wiki_collab.py:53: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/test_c4_wiki_collab.py:26: in _open_editor + page.wait_for_selector(sel.WEB["wiki_editor"], timeout=60_000) +.venv/lib/python3.14/site-packages/playwright/sync_api/_generated.py:21370: in wait_for_selector + self._sync( +.venv/lib/python3.14/site-packages/playwright/_impl/_page.py:431: in wait_for_selector + return await self._main_frame.wait_for_selector(**locals_to_params(locals())) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.14/site-packages/playwright/_impl/_frame.py:395: in wait_for_selector + await self._channel.send( +.venv/lib/python3.14/site-packages/playwright/_impl/_connection.py:78: in send + return await self._connection.wrap_api_call( +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl._connection.Connection object at 0x1092ed010> +cb = <function Channel.send.<locals>.<lambda> at 0x109a71d20> +is_internal = False, title = None + + async def wrap_api_call( + self, cb: Callable[[], Any], is_internal: bool = False, title: str = None + ) -> Any: + if self._api_zone.get(): + return await cb() + task = asyncio.current_task(self._loop) + parsed_st = _attach_api_call_information( + getattr(task, "__pw_stack__", None) or _capture_stack_trace(), + is_internal, + title, + ) + self._api_zone.set(parsed_st) + try: + return await cb() + except Exception as error: +> raise rewrite_error(error, f"{parsed_st['apiName']}: {error}") from None +E playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. +E Call log: +E - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible + +.venv/lib/python3.14/site-packages/playwright/_impl/_connection.py:636: TimeoutError</failure></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="65.896"><properties><property name="known_external_blocked" value="13" /></properties><failure message="playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. Call log: - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible">two_contexts = (<Page url='http://127.0.0.1:5000/mw2t7/wiki/home/?edit&view&menu'>, <Page url='about:blank'>) +login = <function login.<locals>._login at 0x10a6ae090> +user_a = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', project = 'mw2t7' +record_property = <function record_property.<locals>.append_property at 0x1098ab740> + + @pytest.mark.case("rejection") + def test_c4_wiki_collab_rejection(two_contexts, login, user_a, base_url, project, record_property): + """A logged-out context connecting to the wiki websocket is closed with code 4401.""" + page_a, page_anon = two_contexts + login(page_a, user_a) +> _open_editor(page_a, base_url, project) + +installer/acceptance/test_c4_wiki_collab.py:72: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/test_c4_wiki_collab.py:26: in _open_editor + page.wait_for_selector(sel.WEB["wiki_editor"], timeout=60_000) +.venv/lib/python3.14/site-packages/playwright/sync_api/_generated.py:21370: in wait_for_selector + self._sync( +.venv/lib/python3.14/site-packages/playwright/_impl/_page.py:431: in wait_for_selector + return await self._main_frame.wait_for_selector(**locals_to_params(locals())) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.14/site-packages/playwright/_impl/_frame.py:395: in wait_for_selector + await self._channel.send( +.venv/lib/python3.14/site-packages/playwright/_impl/_connection.py:78: in send + return await self._connection.wrap_api_call( +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl._connection.Connection object at 0x1092ed010> +cb = <function Channel.send.<locals>.<lambda> at 0x109c29220> +is_internal = False, title = None + + async def wrap_api_call( + self, cb: Callable[[], Any], is_internal: bool = False, title: str = None + ) -> Any: + if self._api_zone.get(): + return await cb() + task = asyncio.current_task(self._loop) + parsed_st = _attach_api_call_information( + getattr(task, "__pw_stack__", None) or _capture_stack_trace(), + is_internal, + title, + ) + self._api_zone.set(parsed_st) + try: + return await cb() + except Exception as error: +> raise rewrite_error(error, f"{parsed_st['apiName']}: {error}") from None +E playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. +E Call log: +E - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible + +.venv/lib/python3.14/site-packages/playwright/_impl/_connection.py:636: TimeoutError</failure></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="7.946"><properties><property name="known_external_blocked" value="4" /></properties><failure message="AssertionError: upload failed: 401 {"message_short": "Unauthorized", "message_long": "You must <a href=\"/login/?next=http://web:5000/api/v1/nkm63/osfstorage/6af1c78fc38b200015a219c7/children/?user_id=nxvcg&payload=eyJ0aW1lIjogMTc5NDIzMDI1OX0%3D&signature=***\">log in<\/a> assert 401 in (200, 201) [+1 more line; full report in element text]">logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'>, project = 'nkm63' +base_url = 'http://127.0.0.1:5000' +service_url = <function service_url.<locals>._url at 0x1095acb40> +tmp_pdf = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' +run_id = 'acc-20261109T131240Z-00dff9' +record_property = <function record_property.<locals>.append_property at 0x10a6efcc0> + + @pytest.mark.case("success") + def test_c5_file_preview_success(logged_in_page, project, base_url, service_url, tmp_pdf, run_id, record_property): + """An uploaded PDF renders inside the mfr iframe (mfr answers 200 for the render request).""" + page = logged_in_page +> entity = upload(page.context, service_url("wb"), project, f"c5-{run_id}.pdf", tmp_pdf) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c5_file_preview.py:20: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +context = <BrowserContext browser=<Browser type=<BrowserType name=chromium executable_path=~/ai-development/GitHub...um-1248/chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing> version=156.0.8078.4>> +wb_url = 'http://127.0.0.1:7777', node_id = 'nkm63' +name = 'c5-acc-20261109T131240Z-00dff9.pdf' +data = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' + + def upload(context, wb_url: str, node_id: str, name: str, data: bytes): + """PUT bytes to waterbutler with the session cookie; returns the waterbutler file entity (dict). + + TODO(M2): confirm waterbutler accepts the `osf` session cookie forwarded by Playwright and that + the response is 201 with data.attributes.path / links.download. + """ + resp = api(context).put(wb_url + sel.WATERBUTLER["upload"].format(node_id=node_id, name=name), + data=data, headers={"Content-Type": "application/octet-stream"}) +> assert resp.status in (200, 201), f"upload failed: {resp.status} {resp.text()[:300]}" +E AssertionError: upload failed: 401 {"message_short": "Unauthorized", "message_long": "You must <a href=\"/login/?next=http://web:5000/api/v1/nkm63/osfstorage/6af1c78fc38b200015a219c7/children/?user_id=nxvcg&payload=eyJ0aW1lIjogMTc5NDIzMDI1OX0%3D&signature=***\">log in<\/a> +E assert 401 in (200, 201) +E + where 401 = <APIResponse url='http://127.0.0.1:7777/v1/resources/nkm63/providers/osfstorage/?kind=file&name=c5-acc-20261109T131240Z-00dff9.pdf' status=401 status_text='Unauthorized'>.status + +installer/acceptance/test_c3_file_upload.py:19: AssertionError</failure></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_rejection[chromium]" time="2.982"><properties><property name="known_external_blocked" value="4" /></properties><failure message="AssertionError: upload failed: 401 {"message_short": "Unauthorized", "message_long": "You must <a href=\"/login/?next=http://web:5000/api/v1/vxdkw/osfstorage/6af1c797c38b200015a219cd/children/?user_id=nxvcg&payload=eyJ0aW1lIjogMTc5NDIzMDI2N30%3D&signature=***\">log in<\/a> assert 401 in (200, 201) [+1 more line; full report in element text]">logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'>, project = 'vxdkw' +service_url = <function service_url.<locals>._url at 0x1095acb40> +tmp_pdf = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' +run_id = 'acc-20261109T131240Z-00dff9' +api_context = <function api_context.<locals>._new at 0x109887e20> +record_property = <function record_property.<locals>.append_property at 0x1098868d0> + + @pytest.mark.case("rejection") + def test_c5_file_preview_rejection(logged_in_page, project, service_url, tmp_pdf, run_id, api_context, record_property): + """The preview URL of a private file without a session -> 401/403.""" + page = logged_in_page + wb = service_url("wb") +> entity = upload(page.context, wb, project, f"c5-private-{run_id}.pdf", tmp_pdf) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c5_file_preview.py:34: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +context = <BrowserContext browser=<Browser type=<BrowserType name=chromium executable_path=~/ai-development/GitHub...um-1248/chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing> version=156.0.8078.4>> +wb_url = 'http://127.0.0.1:7777', node_id = 'vxdkw' +name = 'c5-private-acc-20261109T131240Z-00dff9.pdf' +data = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' + + def upload(context, wb_url: str, node_id: str, name: str, data: bytes): + """PUT bytes to waterbutler with the session cookie; returns the waterbutler file entity (dict). + + TODO(M2): confirm waterbutler accepts the `osf` session cookie forwarded by Playwright and that + the response is 201 with data.attributes.path / links.download. + """ + resp = api(context).put(wb_url + sel.WATERBUTLER["upload"].format(node_id=node_id, name=name), + data=data, headers={"Content-Type": "application/octet-stream"}) +> assert resp.status in (200, 201), f"upload failed: {resp.status} {resp.text()[:300]}" +E AssertionError: upload failed: 401 {"message_short": "Unauthorized", "message_long": "You must <a href=\"/login/?next=http://web:5000/api/v1/vxdkw/osfstorage/6af1c797c38b200015a219cd/children/?user_id=nxvcg&payload=eyJ0aW1lIjogMTc5NDIzMDI2N30%3D&signature=***\">log in<\/a> +E assert 401 in (200, 201) +E + where 401 = <APIResponse url='http://127.0.0.1:7777/v1/resources/vxdkw/providers/osfstorage/?kind=file&name=c5-private-acc-20261109T131240Z-00dff9.pdf' status=401 status_text='Unauthorized'>.status + +installer/acceptance/test_c3_file_upload.py:19: AssertionError</failure></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="0.689"><properties><property name="http_status" value="404" /></properties><failure message="AssertionError: institution users page returned 404 assert (<Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>> is not None and 404 == 200) + where 404 = <Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>>.status">page = <Page url='http://127.0.0.1:8001/institutions/1/users/'> +service_url = <function service_url.<locals>._url at 0x1095acb40> +admin_user = {'email': '***', 'password': '***'} +record_property = <function record_property.<locals>.append_property at 0x10a88a6c0> + + @pytest.mark.case("success") + def test_c6_admin_success(page, service_url, admin_user, record_property): + """The institution admin signs in to the admin app and sees the institution's user list.""" + admin_url = service_url("admin") + _admin_login(page, admin_url, admin_user) + # TODO(M2): the institution id of the seeded admin; "1" assumes the first institution created by --seed. + resp = page.goto(admin_url + sel.ADMIN["institution_users"].format(institution_id="1"), wait_until="domcontentloaded") + record_property("http_status", resp.status if resp else None) +> assert resp is not None and resp.status == 200, f"institution users page returned {resp and resp.status}" +E AssertionError: institution users page returned 404 +E assert (<Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>> is not None and 404 == 200) +E + where 404 = <Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>>.status + +installer/acceptance/test_c6_admin.py:27: AssertionError</failure></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="0.003"><properties><property name="http_status" value="404" /><property name="known_external_blocked" value="0" /></properties><error message="failed on teardown with "Failed: request(s) would have left the machine: ['http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css']"">request = <SubRequest 'external_guard' for <Function test_c6_admin_success[chromium]>> + + @pytest.fixture(autouse=True) + def external_guard(request): + """Collect the loopback-guard offenders of one test and fail it if any guard (browser, websocket, + API) saw a URL that would have left the machine. Every browser context is created by our + `new_context` below (pytest-playwright's default `context` fixture calls it too), which attaches + the guard itself; requesting `context` from here created a fixture cycle + (external_guard -> context -> new_context -> external_guard, first real acceptance run).""" + offenders: list[str] = [] + before = len(_OFFENDERS) + known_before = len(_KNOWN_EXTERNAL) + yield offenders + offenders.extend(_OFFENDERS[before:]) + request.node.user_properties.append(("known_external_blocked", len(_KNOWN_EXTERNAL) - known_before)) + if offenders: +> pytest.fail(f"request(s) would have left the machine: {offenders[:5]}") +E Failed: request(s) would have left the machine: ['http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css'] + +installer/acceptance/conftest.py:274: Failed</error></testcase><testcase classname="test_c6_admin" name="test_c6_admin_rejection[chromium]" time="1.953"><properties><property name="known_external_blocked" value="3" /></properties><failure message="AssertionError: admin screen answered 404 to an ordinary user assert 404 in (301, 302, 303, 307, 403) + where 404 = <APIResponse url='http://127.0.0.1:8001/institutions/1/users/' status=404 status_text='Not Found'>.status">logged_in_page = <Page url='http://127.0.0.1:5000/dashboard/'> +service_url = <function service_url.<locals>._url at 0x1095acb40> +api_url = 'http://127.0.0.1:8000' +record_property = <function record_property.<locals>.append_property at 0x10992b690> + + @pytest.mark.case("rejection") + def test_c6_admin_rejection(logged_in_page, service_url, api_url, record_property): + """An ordinary user opening the admin URL -> 403 or redirect to login; the API answers exactly 403.""" + client = api(logged_in_page.context) + admin_url = service_url("admin") + screen = client.get(admin_url + sel.ADMIN["institution_users"].format(institution_id="1"), max_redirects=0) +> assert screen.status in (301, 302, 303, 307, 403), f"admin screen answered {screen.status} to an ordinary user" +E AssertionError: admin screen answered 404 to an ordinary user +E assert 404 in (301, 302, 303, 307, 403) +E + where 404 = <APIResponse url='http://127.0.0.1:8001/institutions/1/users/' status=404 status_text='Not Found'>.status + +installer/acceptance/test_c6_admin.py:37: AssertionError</failure></testcase><testcase classname="test_c1_login" name="test_c1_login_rejection" time="0.090"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="0" /></properties></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261109T131240Z-00dff9/pytest.log b/docs/demo/runs/acc-20261109T131240Z-00dff9/pytest.log new file mode 100644 index 0000000..3bb61ed --- /dev/null +++ b/docs/demo/runs/acc-20261109T131240Z-00dff9/pytest.log @@ -0,0 +1,454 @@ +.F.FFFFFFFEF. [100%] +==================================== ERRORS ==================================== +_____________ ERROR at teardown of test_c6_admin_success[chromium] _____________ + +request = <SubRequest 'external_guard' for <Function test_c6_admin_success[chromium]>> + + @pytest.fixture(autouse=True) + def external_guard(request): + """Collect the loopback-guard offenders of one test and fail it if any guard (browser, websocket, + API) saw a URL that would have left the machine. Every browser context is created by our + `new_context` below (pytest-playwright's default `context` fixture calls it too), which attaches + the guard itself; requesting `context` from here created a fixture cycle + (external_guard -> context -> new_context -> external_guard, first real acceptance run).""" + offenders: list[str] = [] + before = len(_OFFENDERS) + known_before = len(_KNOWN_EXTERNAL) + yield offenders + offenders.extend(_OFFENDERS[before:]) + request.node.user_properties.append(("known_external_blocked", len(_KNOWN_EXTERNAL) - known_before)) + if offenders: +> pytest.fail(f"request(s) would have left the machine: {offenders[:5]}") +E Failed: request(s) would have left the machine: ['http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css'] + +installer/acceptance/conftest.py:274: Failed +=================================== FAILURES =================================== +___________________ test_c2_create_project_success[chromium] ___________________ + +logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'> +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0x109732f00> +run_id = 'acc-20261109T131240Z-00dff9' +record_property = <function record_property.<locals>.append_property at 0x109733270> + + @pytest.mark.case("success") + def test_c2_create_project_success(logged_in_page, base_url, api_url, api_write, run_id, record_property): + """A new project created in the UI appears with its title and the user as admin.""" + page = logged_in_page + title = f"acceptance C2 {run_id}" + page.goto(base_url + sel.PATHS["new_project"], wait_until="domcontentloaded") + page.click(sel.WEB["create_project_button"]) +> page.fill(sel.WEB["create_project_title"], title) + +installer/acceptance/test_c2_create_project.py:18: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +.venv/lib/python3.14/site-packages/playwright/sync_api/_generated.py:17698: in fill + self._sync( +.venv/lib/python3.14/site-packages/playwright/_impl/_page.py:932: in fill + return await self._main_frame.fill(**locals_to_params(locals())) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.14/site-packages/playwright/_impl/_frame.py:641: in fill + await self._fill(**locals_to_params(locals())) +.venv/lib/python3.14/site-packages/playwright/_impl/_frame.py:653: in _fill + await self._channel.send("fill", self._timeout, locals_to_params(locals())) +.venv/lib/python3.14/site-packages/playwright/_impl/_connection.py:78: in send + return await self._connection.wrap_api_call( +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl._connection.Connection object at 0x1092ed010> +cb = <function Channel.send.<locals>.<lambda> at 0x109731d20> +is_internal = False, title = None + + async def wrap_api_call( + self, cb: Callable[[], Any], is_internal: bool = False, title: str = None + ) -> Any: + if self._api_zone.get(): + return await cb() + task = asyncio.current_task(self._loop) + parsed_st = _attach_api_call_information( + getattr(task, "__pw_stack__", None) or _capture_stack_trace(), + is_internal, + title, + ) + self._api_zone.set(parsed_st) + try: + return await cb() + except Exception as error: +> raise rewrite_error(error, f"{parsed_st['apiName']}: {error}") from None +E playwright._impl._errors.TimeoutError: Page.fill: Timeout 30000ms exceeded. +E Call log: +E - waiting for locator("input#projectName, input[name='title']") + +.venv/lib/python3.14/site-packages/playwright/_impl/_connection.py:636: TimeoutError +____________________ test_c3_file_upload_success[chromium] _____________________ + +logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'>, project = 'etrvf' +service_url = <function service_url.<locals>._url at 0x1095acb40> +tmp_txt = b'grdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm a...ta\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm' +run_id = 'acc-20261109T131240Z-00dff9' +record_property = <function record_property.<locals>.append_property at 0x10aca9220> + + @pytest.mark.case("success") + def test_c3_file_upload_success(logged_in_page, project, service_url, tmp_txt, run_id, record_property): + """Upload 1 MiB through waterbutler, download it back, bytes must be identical.""" + ctx = logged_in_page.context + wb = service_url("wb") +> entity = upload(ctx, wb, project, f"c3-{run_id}.txt", tmp_txt) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c3_file_upload.py:34: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +context = <BrowserContext browser=<Browser type=<BrowserType name=chromium executable_path=~/ai-development/GitHub...um-1248/chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing> version=156.0.8078.4>> +wb_url = 'http://127.0.0.1:7777', node_id = 'etrvf' +name = 'c3-acc-20261109T131240Z-00dff9.txt' +data = b'grdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm a...ta\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm' + + def upload(context, wb_url: str, node_id: str, name: str, data: bytes): + """PUT bytes to waterbutler with the session cookie; returns the waterbutler file entity (dict). + + TODO(M2): confirm waterbutler accepts the `osf` session cookie forwarded by Playwright and that + the response is 201 with data.attributes.path / links.download. + """ + resp = api(context).put(wb_url + sel.WATERBUTLER["upload"].format(node_id=node_id, name=name), + data=data, headers={"Content-Type": "application/octet-stream"}) +> assert resp.status in (200, 201), f"upload failed: {resp.status} {resp.text()[:300]}" +E AssertionError: upload failed: 401 {"message_short": "Unauthorized", "message_long": "You must <a href=\"/login/?next=http://web:5000/api/v1/etrvf/osfstorage/6af1c701c38b200015a219ae/children/?user_id=nxvcg&payload=eyJ0aW1lIjogMTc5NDIzMDExN30%3D&signature=***\">log in<\/a> +E assert 401 in (200, 201) +E + where 401 = <APIResponse url='http://127.0.0.1:7777/v1/resources/etrvf/providers/osfstorage/?kind=file&name=c3-acc-20261109T131240Z-00dff9.txt' status=401 status_text='Unauthorized'>.status + +installer/acceptance/test_c3_file_upload.py:19: AssertionError +___________________ test_c3_file_upload_rejection[chromium] ____________________ + +logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'>, project = '4jm8q' +context_b = <BrowserContext browser=<Browser type=<BrowserType name=chromium executable_path=~/ai-development/GitHub...um-1248/chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing> version=156.0.8078.4>> +service_url = <function service_url.<locals>._url at 0x1095acb40> +tmp_txt = b'grdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm a...ta\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm' +run_id = 'acc-20261109T131240Z-00dff9' +api_context = <function api_context.<locals>._new at 0x10a8638a0> +record_property = <function record_property.<locals>.append_property at 0x10a863cc0> + + @pytest.mark.case("rejection") + def test_c3_file_upload_rejection(logged_in_page, project, context_b, service_url, tmp_txt, run_id, api_context, + record_property): + """Anonymous GET of a private file -> 401/403; a signed-in NON-contributor (user_b) PUT -> 403.""" + ctx = logged_in_page.context + wb = service_url("wb") +> entity = upload(ctx, wb, project, f"c3-private-{run_id}.txt", tmp_txt[:1024]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c3_file_upload.py:49: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +context = <BrowserContext browser=<Browser type=<BrowserType name=chromium executable_path=~/ai-development/GitHub...um-1248/chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing> version=156.0.8078.4>> +wb_url = 'http://127.0.0.1:7777', node_id = '4jm8q' +name = 'c3-private-acc-20261109T131240Z-00dff9.txt' +data = b'grdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm a...mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock data\ngrdm acceptance acc-20261109T131240Z-00dff9 mock dat' + + def upload(context, wb_url: str, node_id: str, name: str, data: bytes): + """PUT bytes to waterbutler with the session cookie; returns the waterbutler file entity (dict). + + TODO(M2): confirm waterbutler accepts the `osf` session cookie forwarded by Playwright and that + the response is 201 with data.attributes.path / links.download. + """ + resp = api(context).put(wb_url + sel.WATERBUTLER["upload"].format(node_id=node_id, name=name), + data=data, headers={"Content-Type": "application/octet-stream"}) +> assert resp.status in (200, 201), f"upload failed: {resp.status} {resp.text()[:300]}" +E AssertionError: upload failed: 401 {"message_short": "Unauthorized", "message_long": "You must <a href=\"/login/?next=http://web:5000/api/v1/4jm8q/osfstorage/6af1c705c38b200015a219b4/children/?user_id=nxvcg&payload=eyJ0aW1lIjogMTc5NDIzMDEyM30%3D&signature=***\">log in<\/a> +E assert 401 in (200, 201) +E + where 401 = <APIResponse url='http://127.0.0.1:7777/v1/resources/4jm8q/providers/osfstorage/?kind=file&name=c3-private-acc-20261109T131240Z-00dff9.txt' status=401 status_text='Unauthorized'>.status + +installer/acceptance/test_c3_file_upload.py:19: AssertionError +____________________ test_c4_wiki_collab_success[chromium] _____________________ + +two_contexts = (<Page url='http://127.0.0.1:5000/aynvc/wiki/home/?edit&view&menu'>, <Page url='http://127.0.0.1:5000/dashboard'>) +login = <function login.<locals>._login at 0x10acf5b10> +user_a = {'email': '***', 'password': '***'} +user_b = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0x10a861170> +add_contributor = <function add_contributor.<locals>._add at 0x10a861a60> +run_id = 'acc-20261109T131240Z-00dff9' +record_property = <function record_property.<locals>.append_property at 0x10a8637f0> + + @pytest.mark.case("success") + def test_c4_wiki_collab_success(two_contexts, login, user_a, user_b, base_url, api_url, api_write, add_contributor, + run_id, record_property): + """Both users open the same wiki page; text typed by B appears in A's editor and text typed by A in B's.""" + page_a, page_b = two_contexts + login(page_a, user_a) + login(page_b, user_b) + + created = api_write(page_a.context, "POST", api_url + sel.API["nodes"], { + "data": {"type": "nodes", "attributes": {"title": "acceptance C4", "category": "project", "public": False}} + }) + assert created.status == 201, created.text()[:200] + node_id = created.json()["data"]["id"] + try: + add_contributor(page_a.context, node_id, user_id_of(page_b.context, api_url), "write") + +> resp_a = _open_editor(page_a, base_url, node_id) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c4_wiki_collab.py:53: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/test_c4_wiki_collab.py:26: in _open_editor + page.wait_for_selector(sel.WEB["wiki_editor"], timeout=60_000) +.venv/lib/python3.14/site-packages/playwright/sync_api/_generated.py:21370: in wait_for_selector + self._sync( +.venv/lib/python3.14/site-packages/playwright/_impl/_page.py:431: in wait_for_selector + return await self._main_frame.wait_for_selector(**locals_to_params(locals())) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.14/site-packages/playwright/_impl/_frame.py:395: in wait_for_selector + await self._channel.send( +.venv/lib/python3.14/site-packages/playwright/_impl/_connection.py:78: in send + return await self._connection.wrap_api_call( +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl._connection.Connection object at 0x1092ed010> +cb = <function Channel.send.<locals>.<lambda> at 0x109a71d20> +is_internal = False, title = None + + async def wrap_api_call( + self, cb: Callable[[], Any], is_internal: bool = False, title: str = None + ) -> Any: + if self._api_zone.get(): + return await cb() + task = asyncio.current_task(self._loop) + parsed_st = _attach_api_call_information( + getattr(task, "__pw_stack__", None) or _capture_stack_trace(), + is_internal, + title, + ) + self._api_zone.set(parsed_st) + try: + return await cb() + except Exception as error: +> raise rewrite_error(error, f"{parsed_st['apiName']}: {error}") from None +E playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. +E Call log: +E - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible + +.venv/lib/python3.14/site-packages/playwright/_impl/_connection.py:636: TimeoutError +___________________ test_c4_wiki_collab_rejection[chromium] ____________________ + +two_contexts = (<Page url='http://127.0.0.1:5000/mw2t7/wiki/home/?edit&view&menu'>, <Page url='about:blank'>) +login = <function login.<locals>._login at 0x10a6ae090> +user_a = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', project = 'mw2t7' +record_property = <function record_property.<locals>.append_property at 0x1098ab740> + + @pytest.mark.case("rejection") + def test_c4_wiki_collab_rejection(two_contexts, login, user_a, base_url, project, record_property): + """A logged-out context connecting to the wiki websocket is closed with code 4401.""" + page_a, page_anon = two_contexts + login(page_a, user_a) +> _open_editor(page_a, base_url, project) + +installer/acceptance/test_c4_wiki_collab.py:72: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/test_c4_wiki_collab.py:26: in _open_editor + page.wait_for_selector(sel.WEB["wiki_editor"], timeout=60_000) +.venv/lib/python3.14/site-packages/playwright/sync_api/_generated.py:21370: in wait_for_selector + self._sync( +.venv/lib/python3.14/site-packages/playwright/_impl/_page.py:431: in wait_for_selector + return await self._main_frame.wait_for_selector(**locals_to_params(locals())) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.14/site-packages/playwright/_impl/_frame.py:395: in wait_for_selector + await self._channel.send( +.venv/lib/python3.14/site-packages/playwright/_impl/_connection.py:78: in send + return await self._connection.wrap_api_call( +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl._connection.Connection object at 0x1092ed010> +cb = <function Channel.send.<locals>.<lambda> at 0x109c29220> +is_internal = False, title = None + + async def wrap_api_call( + self, cb: Callable[[], Any], is_internal: bool = False, title: str = None + ) -> Any: + if self._api_zone.get(): + return await cb() + task = asyncio.current_task(self._loop) + parsed_st = _attach_api_call_information( + getattr(task, "__pw_stack__", None) or _capture_stack_trace(), + is_internal, + title, + ) + self._api_zone.set(parsed_st) + try: + return await cb() + except Exception as error: +> raise rewrite_error(error, f"{parsed_st['apiName']}: {error}") from None +E playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. +E Call log: +E - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible + +.venv/lib/python3.14/site-packages/playwright/_impl/_connection.py:636: TimeoutError +____________________ test_c5_file_preview_success[chromium] ____________________ + +logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'>, project = 'nkm63' +base_url = 'http://127.0.0.1:5000' +service_url = <function service_url.<locals>._url at 0x1095acb40> +tmp_pdf = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' +run_id = 'acc-20261109T131240Z-00dff9' +record_property = <function record_property.<locals>.append_property at 0x10a6efcc0> + + @pytest.mark.case("success") + def test_c5_file_preview_success(logged_in_page, project, base_url, service_url, tmp_pdf, run_id, record_property): + """An uploaded PDF renders inside the mfr iframe (mfr answers 200 for the render request).""" + page = logged_in_page +> entity = upload(page.context, service_url("wb"), project, f"c5-{run_id}.pdf", tmp_pdf) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c5_file_preview.py:20: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +context = <BrowserContext browser=<Browser type=<BrowserType name=chromium executable_path=~/ai-development/GitHub...um-1248/chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing> version=156.0.8078.4>> +wb_url = 'http://127.0.0.1:7777', node_id = 'nkm63' +name = 'c5-acc-20261109T131240Z-00dff9.pdf' +data = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' + + def upload(context, wb_url: str, node_id: str, name: str, data: bytes): + """PUT bytes to waterbutler with the session cookie; returns the waterbutler file entity (dict). + + TODO(M2): confirm waterbutler accepts the `osf` session cookie forwarded by Playwright and that + the response is 201 with data.attributes.path / links.download. + """ + resp = api(context).put(wb_url + sel.WATERBUTLER["upload"].format(node_id=node_id, name=name), + data=data, headers={"Content-Type": "application/octet-stream"}) +> assert resp.status in (200, 201), f"upload failed: {resp.status} {resp.text()[:300]}" +E AssertionError: upload failed: 401 {"message_short": "Unauthorized", "message_long": "You must <a href=\"/login/?next=http://web:5000/api/v1/nkm63/osfstorage/6af1c78fc38b200015a219c7/children/?user_id=nxvcg&payload=eyJ0aW1lIjogMTc5NDIzMDI1OX0%3D&signature=***\">log in<\/a> +E assert 401 in (200, 201) +E + where 401 = <APIResponse url='http://127.0.0.1:7777/v1/resources/nkm63/providers/osfstorage/?kind=file&name=c5-acc-20261109T131240Z-00dff9.pdf' status=401 status_text='Unauthorized'>.status + +installer/acceptance/test_c3_file_upload.py:19: AssertionError +___________________ test_c5_file_preview_rejection[chromium] ___________________ + +logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'>, project = 'vxdkw' +service_url = <function service_url.<locals>._url at 0x1095acb40> +tmp_pdf = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' +run_id = 'acc-20261109T131240Z-00dff9' +api_context = <function api_context.<locals>._new at 0x109887e20> +record_property = <function record_property.<locals>.append_property at 0x1098868d0> + + @pytest.mark.case("rejection") + def test_c5_file_preview_rejection(logged_in_page, project, service_url, tmp_pdf, run_id, api_context, record_property): + """The preview URL of a private file without a session -> 401/403.""" + page = logged_in_page + wb = service_url("wb") +> entity = upload(page.context, wb, project, f"c5-private-{run_id}.pdf", tmp_pdf) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c5_file_preview.py:34: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +context = <BrowserContext browser=<Browser type=<BrowserType name=chromium executable_path=~/ai-development/GitHub...um-1248/chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing> version=156.0.8078.4>> +wb_url = 'http://127.0.0.1:7777', node_id = 'vxdkw' +name = 'c5-private-acc-20261109T131240Z-00dff9.pdf' +data = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' + + def upload(context, wb_url: str, node_id: str, name: str, data: bytes): + """PUT bytes to waterbutler with the session cookie; returns the waterbutler file entity (dict). + + TODO(M2): confirm waterbutler accepts the `osf` session cookie forwarded by Playwright and that + the response is 201 with data.attributes.path / links.download. + """ + resp = api(context).put(wb_url + sel.WATERBUTLER["upload"].format(node_id=node_id, name=name), + data=data, headers={"Content-Type": "application/octet-stream"}) +> assert resp.status in (200, 201), f"upload failed: {resp.status} {resp.text()[:300]}" +E AssertionError: upload failed: 401 {"message_short": "Unauthorized", "message_long": "You must <a href=\"/login/?next=http://web:5000/api/v1/vxdkw/osfstorage/6af1c797c38b200015a219cd/children/?user_id=nxvcg&payload=eyJ0aW1lIjogMTc5NDIzMDI2N30%3D&signature=***\">log in<\/a> +E assert 401 in (200, 201) +E + where 401 = <APIResponse url='http://127.0.0.1:7777/v1/resources/vxdkw/providers/osfstorage/?kind=file&name=c5-private-acc-20261109T131240Z-00dff9.pdf' status=401 status_text='Unauthorized'>.status + +installer/acceptance/test_c3_file_upload.py:19: AssertionError +_______________________ test_c6_admin_success[chromium] ________________________ + +page = <Page url='http://127.0.0.1:8001/institutions/1/users/'> +service_url = <function service_url.<locals>._url at 0x1095acb40> +admin_user = {'email': '***', 'password': '***'} +record_property = <function record_property.<locals>.append_property at 0x10a88a6c0> + + @pytest.mark.case("success") + def test_c6_admin_success(page, service_url, admin_user, record_property): + """The institution admin signs in to the admin app and sees the institution's user list.""" + admin_url = service_url("admin") + _admin_login(page, admin_url, admin_user) + # TODO(M2): the institution id of the seeded admin; "1" assumes the first institution created by --seed. + resp = page.goto(admin_url + sel.ADMIN["institution_users"].format(institution_id="1"), wait_until="domcontentloaded") + record_property("http_status", resp.status if resp else None) +> assert resp is not None and resp.status == 200, f"institution users page returned {resp and resp.status}" +E AssertionError: institution users page returned 404 +E assert (<Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>> is not None and 404 == 200) +E + where 404 = <Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>>.status + +installer/acceptance/test_c6_admin.py:27: AssertionError +______________________ test_c6_admin_rejection[chromium] _______________________ + +logged_in_page = <Page url='http://127.0.0.1:5000/dashboard/'> +service_url = <function service_url.<locals>._url at 0x1095acb40> +api_url = 'http://127.0.0.1:8000' +record_property = <function record_property.<locals>.append_property at 0x10992b690> + + @pytest.mark.case("rejection") + def test_c6_admin_rejection(logged_in_page, service_url, api_url, record_property): + """An ordinary user opening the admin URL -> 403 or redirect to login; the API answers exactly 403.""" + client = api(logged_in_page.context) + admin_url = service_url("admin") + screen = client.get(admin_url + sel.ADMIN["institution_users"].format(institution_id="1"), max_redirects=0) +> assert screen.status in (301, 302, 303, 307, 403), f"admin screen answered {screen.status} to an ordinary user" +E AssertionError: admin screen answered 404 to an ordinary user +E assert 404 in (301, 302, 303, 307, 403) +E + where 404 = <APIResponse url='http://127.0.0.1:8001/institutions/1/users/' status=404 status_text='Not Found'>.status + +installer/acceptance/test_c6_admin.py:37: AssertionError +=============================== warnings summary =============================== +test_c1_login.py::test_c1_login_success[chromium] + test_c1_login.py:10: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_success[chromium] + test_c2_create_project.py:11: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_rejection[chromium] + test_c2_create_project.py:39: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_success[chromium] + test_c3_file_upload.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] + test_c3_file_upload.py:43: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:37: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] + test_c4_wiki_collab.py:67: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_success[chromium] + test_c5_file_preview.py:16: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] + test_c5_file_preview.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_success[chromium] + test_c6_admin.py:19: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_rejection[chromium] + test_c6_admin.py:31: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c1_login.py::test_c1_login_rejection + test_c1_login.py:20: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +=========================== short test summary info ============================ +ERROR installer/acceptance/test_c6_admin.py::test_c6_admin_success[chromium] +FAILED installer/acceptance/test_c2_create_project.py::test_c2_create_project_success[chromium] +FAILED installer/acceptance/test_c3_file_upload.py::test_c3_file_upload_success[chromium] +FAILED installer/acceptance/test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] +FAILED installer/acceptance/test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] +FAILED installer/acceptance/test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] +FAILED installer/acceptance/test_c5_file_preview.py::test_c5_file_preview_success[chromium] +FAILED installer/acceptance/test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] +FAILED installer/acceptance/test_c6_admin.py::test_c6_admin_success[chromium] +FAILED installer/acceptance/test_c6_admin.py::test_c6_admin_rejection[chromium] +9 failed, 3 passed, 10 deselected, 12 warnings, 1 error in 200.23s (0:03:20) diff --git a/docs/demo/runs/acc-20261109T131240Z-00dff9/results.json b/docs/demo/runs/acc-20261109T131240Z-00dff9/results.json new file mode 100644 index 0000000..79ff7e5 --- /dev/null +++ b/docs/demo/runs/acc-20261109T131240Z-00dff9/results.json @@ -0,0 +1,167 @@ +{ + "run_id": "acc-20261109T131240Z-00dff9", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-09T13:12:40Z", + "duration_ms": 213507, + "only": "core", + "seeded": true, + "precheck": { + "healthy": true, + "services": 23 + }, + "pytest_returncode": 1, + "evidence_dir": "docs/demo/runs/acc-20261109T131240Z-00dff9", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C1", + "C2", + "C3", + "C4", + "C5", + "C6" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 3, + "failed": 8, + "error": 1, + "skipped": 0, + "total": 12, + "known_external_blocked": 71 + }, + "tests": [ + { + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "test": "test_c1_login_success[chromium]", + "status": "passed", + "duration_ms": 4184, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C2", + "name": "Create project", + "case": "success", + "test": "test_c2_create_project_success[chromium]", + "status": "failed", + "duration_ms": 33825, + "http_status": null, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C2", + "name": "Create project", + "case": "rejection", + "test": "test_c2_create_project_rejection[chromium]", + "status": "passed", + "duration_ms": 6303, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "success", + "test": "test_c3_file_upload_success[chromium]", + "status": "failed", + "duration_ms": 3701, + "http_status": null, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "test": "test_c3_file_upload_rejection[chromium]", + "status": "failed", + "duration_ms": 5358, + "http_status": null, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "failed", + "duration_ms": 66834, + "http_status": null, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "failed", + "duration_ms": 65895, + "http_status": null, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C5", + "name": "File preview", + "case": "success", + "test": "test_c5_file_preview_success[chromium]", + "status": "failed", + "duration_ms": 7944, + "http_status": null, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C5", + "name": "File preview", + "case": "rejection", + "test": "test_c5_file_preview_rejection[chromium]", + "status": "failed", + "duration_ms": 2979, + "http_status": null, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "test": "test_c6_admin_success[chromium]", + "status": "error", + "duration_ms": 691, + "http_status": 404, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "test": "test_c6_admin_rejection[chromium]", + "status": "failed", + "duration_ms": 1952, + "http_status": null, + "evidence": null, + "known_external_blocked": 3 + }, + { + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "test": "test_c1_login_rejection", + "status": "passed", + "duration_ms": 89, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261109T131240Z-00dff9/results.toon b/docs/demo/runs/acc-20261109T131240Z-00dff9/results.toon new file mode 100644 index 0000000..32565d2 --- /dev/null +++ b/docs/demo/runs/acc-20261109T131240Z-00dff9/results.toon @@ -0,0 +1,42 @@ +accept: + run_id: acc-20261109T131240Z-00dff9 + base_url: "http://127.0.0.1:5000" + started: "2026-11-09T13:12:40Z" + duration_ms: 213507 + only: core + seeded: true + precheck: + healthy: true + services: 23 + pytest_returncode: 1 + evidence_dir: docs/demo/runs/acc-20261109T131240Z-00dff9 + tracing: off + trace_quarantine: null + expected_scenarios[6]: + - C1 + - C2 + - C3 + - C4 + - C5 + - C6 + incomplete_scenarios[0]: + summary: + passed: 3 + failed: 8 + error: 1 + skipped: 0 + total: 12 + known_external_blocked: 71 + tests[12]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C1,Login via fakecas,success,"test_c1_login_success[chromium]",passed,4184,200,null,7 + C2,Create project,success,"test_c2_create_project_success[chromium]",failed,33825,null,null,7 + C2,Create project,rejection,"test_c2_create_project_rejection[chromium]",passed,6303,403,null,8 + C3,Upload and download file,success,"test_c3_file_upload_success[chromium]",failed,3701,null,null,4 + C3,Upload and download file,rejection,"test_c3_file_upload_rejection[chromium]",failed,5358,null,null,8 + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",failed,66834,null,null,13 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",failed,65895,null,null,13 + C5,File preview,success,"test_c5_file_preview_success[chromium]",failed,7944,null,null,4 + C5,File preview,rejection,"test_c5_file_preview_rejection[chromium]",failed,2979,null,null,4 + C6,Institution admin screen,success,"test_c6_admin_success[chromium]",error,691,404,null,0 + C6,Institution admin screen,rejection,"test_c6_admin_rejection[chromium]",failed,1952,null,null,3 + C1,Login via fakecas,rejection,test_c1_login_rejection,passed,89,401,null,0 diff --git a/docs/demo/runs/acc-20261109T170208Z-9ebf01/collector.json b/docs/demo/runs/acc-20261109T170208Z-9ebf01/collector.json new file mode 100644 index 0000000..7f35b5a --- /dev/null +++ b/docs/demo/runs/acc-20261109T170208Z-9ebf01/collector.json @@ -0,0 +1,24 @@ +[ + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "success", + "status": "passed", + "duration_ms": 14680, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "status": "passed", + "duration_ms": 6095, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + } +] diff --git a/docs/demo/runs/acc-20261109T170208Z-9ebf01/junit.xml b/docs/demo/runs/acc-20261109T170208Z-9ebf01/junit.xml new file mode 100644 index 0000000..d08c39a --- /dev/null +++ b/docs/demo/runs/acc-20261109T170208Z-9ebf01/junit.xml @@ -0,0 +1 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="2" time="20.794" timestamp="2026-11-10T02:02:19.019239+09:00" hostname="redacted-host"><testcase classname="test_c3_file_upload" name="test_c3_file_upload_success[chromium]" time="14.681"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="4" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_rejection[chromium]" time="6.095"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261109T170208Z-9ebf01/pytest.log b/docs/demo/runs/acc-20261109T170208Z-9ebf01/pytest.log new file mode 100644 index 0000000..93f9392 --- /dev/null +++ b/docs/demo/runs/acc-20261109T170208Z-9ebf01/pytest.log @@ -0,0 +1,10 @@ +.. [100%] +=============================== warnings summary =============================== +test_c3_file_upload.py::test_c3_file_upload_success[chromium] + test_c3_file_upload.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] + test_c3_file_upload.py:43: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +2 passed, 2 warnings in 20.79s diff --git a/docs/demo/runs/acc-20261109T170208Z-9ebf01/results.json b/docs/demo/runs/acc-20261109T170208Z-9ebf01/results.json new file mode 100644 index 0000000..7470c6e --- /dev/null +++ b/docs/demo/runs/acc-20261109T170208Z-9ebf01/results.json @@ -0,0 +1,52 @@ +{ + "run_id": "acc-20261109T170208Z-9ebf01", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-09T17:02:08Z", + "duration_ms": 34074, + "only": "C3", + "seeded": true, + "precheck": { + "healthy": true, + "services": 23 + }, + "pytest_returncode": 0, + "evidence_dir": "docs/demo/runs/acc-20261109T170208Z-9ebf01", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C3" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 2, + "failed": 0, + "error": 0, + "skipped": 0, + "total": 2, + "known_external_blocked": 12 + }, + "tests": [ + { + "id": "C3", + "name": "Upload and download file", + "case": "success", + "test": "test_c3_file_upload_success[chromium]", + "status": "passed", + "duration_ms": 14680, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "test": "test_c3_file_upload_rejection[chromium]", + "status": "passed", + "duration_ms": 6095, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + } + ] +} diff --git a/docs/demo/runs/acc-20261109T170208Z-9ebf01/results.toon b/docs/demo/runs/acc-20261109T170208Z-9ebf01/results.toon new file mode 100644 index 0000000..04bf884 --- /dev/null +++ b/docs/demo/runs/acc-20261109T170208Z-9ebf01/results.toon @@ -0,0 +1,27 @@ +accept: + run_id: acc-20261109T170208Z-9ebf01 + base_url: "http://127.0.0.1:5000" + started: "2026-11-09T17:02:08Z" + duration_ms: 34074 + only: C3 + seeded: true + precheck: + healthy: true + services: 23 + pytest_returncode: 0 + evidence_dir: docs/demo/runs/acc-20261109T170208Z-9ebf01 + tracing: off + trace_quarantine: null + expected_scenarios[1]: + - C3 + incomplete_scenarios[0]: + summary: + passed: 2 + failed: 0 + error: 0 + skipped: 0 + total: 2 + known_external_blocked: 12 + tests[2]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C3,Upload and download file,success,"test_c3_file_upload_success[chromium]",passed,14680,200,null,4 + C3,Upload and download file,rejection,"test_c3_file_upload_rejection[chromium]",passed,6095,403,null,8 diff --git a/docs/demo/runs/acc-20261110T014431Z-2b91e6/collector.json b/docs/demo/runs/acc-20261110T014431Z-2b91e6/collector.json new file mode 100644 index 0000000..07ebc8c --- /dev/null +++ b/docs/demo/runs/acc-20261110T014431Z-2b91e6/collector.json @@ -0,0 +1,134 @@ +[ + { + "nodeid": "test_c1_login.py::test_c1_login_success[chromium]", + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "status": "passed", + "duration_ms": 5064, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_success[chromium]", + "id": "C2", + "name": "Create project", + "case": "success", + "status": "passed", + "duration_ms": 8151, + "http_status": 200, + "evidence": null, + "known_external_blocked": 14 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_rejection[chromium]", + "id": "C2", + "name": "Create project", + "case": "rejection", + "status": "passed", + "duration_ms": 6748, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "success", + "status": "passed", + "duration_ms": 8581, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "status": "passed", + "duration_ms": 6130, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "passed", + "duration_ms": 10562, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 7088, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_success[chromium]", + "id": "C5", + "name": "File preview", + "case": "success", + "status": "passed", + "duration_ms": 20795, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_rejection[chromium]", + "id": "C5", + "name": "File preview", + "case": "rejection", + "status": "passed", + "duration_ms": 10232, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_success[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "status": "passed", + "duration_ms": 873, + "http_status": 200, + "evidence": null, + "known_external_blocked": 3 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_rejection[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "status": "passed", + "duration_ms": 2463, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "nodeid": "test_c1_login.py::test_c1_login_rejection", + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "status": "passed", + "duration_ms": 176, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261110T014431Z-2b91e6/junit.xml b/docs/demo/runs/acc-20261110T014431Z-2b91e6/junit.xml new file mode 100644 index 0000000..91128c8 --- /dev/null +++ b/docs/demo/runs/acc-20261110T014431Z-2b91e6/junit.xml @@ -0,0 +1 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="12" time="86.930" timestamp="2026-11-10T10:44:46.361613+09:00" hostname="redacted-host"><testcase classname="test_c1_login" name="test_c1_login_success[chromium]" time="5.065"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="7" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_success[chromium]" time="8.152"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="14" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_rejection[chromium]" time="6.750"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_success[chromium]" time="8.583"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="4" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_rejection[chromium]" time="6.132"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="10.564"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="18" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="7.090"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="13" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="20.796"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_rejection[chromium]" time="10.234"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="0.874"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="3" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_rejection[chromium]" time="2.466"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="3" /></properties></testcase><testcase classname="test_c1_login" name="test_c1_login_rejection" time="0.177"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="0" /></properties></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261110T014431Z-2b91e6/pytest.log b/docs/demo/runs/acc-20261110T014431Z-2b91e6/pytest.log new file mode 100644 index 0000000..87f2b10 --- /dev/null +++ b/docs/demo/runs/acc-20261110T014431Z-2b91e6/pytest.log @@ -0,0 +1,40 @@ +............ [100%] +=============================== warnings summary =============================== +test_c1_login.py::test_c1_login_success[chromium] + test_c1_login.py:10: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_success[chromium] + test_c2_create_project.py:11: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_rejection[chromium] + test_c2_create_project.py:39: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_success[chromium] + test_c3_file_upload.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] + test_c3_file_upload.py:43: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:55: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] + test_c4_wiki_collab.py:85: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_success[chromium] + test_c5_file_preview.py:16: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] + test_c5_file_preview.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_success[chromium] + test_c6_admin.py:19: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_rejection[chromium] + test_c6_admin.py:33: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c1_login.py::test_c1_login_rejection + test_c1_login.py:20: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +12 passed, 10 deselected, 12 warnings in 86.92s (0:01:26) diff --git a/docs/demo/runs/acc-20261110T014431Z-2b91e6/results.json b/docs/demo/runs/acc-20261110T014431Z-2b91e6/results.json new file mode 100644 index 0000000..9d0b1ee --- /dev/null +++ b/docs/demo/runs/acc-20261110T014431Z-2b91e6/results.json @@ -0,0 +1,167 @@ +{ + "run_id": "acc-20261110T014431Z-2b91e6", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-10T01:44:31Z", + "duration_ms": 105989, + "only": "core", + "seeded": true, + "precheck": { + "healthy": true, + "services": 24 + }, + "pytest_returncode": 0, + "evidence_dir": "docs/demo/runs/acc-20261110T014431Z-2b91e6", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C1", + "C2", + "C3", + "C4", + "C5", + "C6" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 12, + "failed": 0, + "error": 0, + "skipped": 0, + "total": 12, + "known_external_blocked": 96 + }, + "tests": [ + { + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "test": "test_c1_login_success[chromium]", + "status": "passed", + "duration_ms": 5064, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C2", + "name": "Create project", + "case": "success", + "test": "test_c2_create_project_success[chromium]", + "status": "passed", + "duration_ms": 8151, + "http_status": 200, + "evidence": null, + "known_external_blocked": 14 + }, + { + "id": "C2", + "name": "Create project", + "case": "rejection", + "test": "test_c2_create_project_rejection[chromium]", + "status": "passed", + "duration_ms": 6748, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "success", + "test": "test_c3_file_upload_success[chromium]", + "status": "passed", + "duration_ms": 8581, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "test": "test_c3_file_upload_rejection[chromium]", + "status": "passed", + "duration_ms": 6130, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "passed", + "duration_ms": 10562, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "passed", + "duration_ms": 7088, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C5", + "name": "File preview", + "case": "success", + "test": "test_c5_file_preview_success[chromium]", + "status": "passed", + "duration_ms": 20795, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C5", + "name": "File preview", + "case": "rejection", + "test": "test_c5_file_preview_rejection[chromium]", + "status": "passed", + "duration_ms": 10232, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "test": "test_c6_admin_success[chromium]", + "status": "passed", + "duration_ms": 873, + "http_status": 200, + "evidence": null, + "known_external_blocked": 3 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "test": "test_c6_admin_rejection[chromium]", + "status": "passed", + "duration_ms": 2463, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "test": "test_c1_login_rejection", + "status": "passed", + "duration_ms": 176, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261110T014431Z-2b91e6/results.toon b/docs/demo/runs/acc-20261110T014431Z-2b91e6/results.toon new file mode 100644 index 0000000..4e6b894 --- /dev/null +++ b/docs/demo/runs/acc-20261110T014431Z-2b91e6/results.toon @@ -0,0 +1,42 @@ +accept: + run_id: acc-20261110T014431Z-2b91e6 + base_url: "http://127.0.0.1:5000" + started: "2026-11-10T01:44:31Z" + duration_ms: 105989 + only: core + seeded: true + precheck: + healthy: true + services: 24 + pytest_returncode: 0 + evidence_dir: docs/demo/runs/acc-20261110T014431Z-2b91e6 + tracing: off + trace_quarantine: null + expected_scenarios[6]: + - C1 + - C2 + - C3 + - C4 + - C5 + - C6 + incomplete_scenarios[0]: + summary: + passed: 12 + failed: 0 + error: 0 + skipped: 0 + total: 12 + known_external_blocked: 96 + tests[12]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C1,Login via fakecas,success,"test_c1_login_success[chromium]",passed,5064,200,null,7 + C2,Create project,success,"test_c2_create_project_success[chromium]",passed,8151,200,null,14 + C2,Create project,rejection,"test_c2_create_project_rejection[chromium]",passed,6748,403,null,8 + C3,Upload and download file,success,"test_c3_file_upload_success[chromium]",passed,8581,200,null,4 + C3,Upload and download file,rejection,"test_c3_file_upload_rejection[chromium]",passed,6130,403,null,8 + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",passed,10562,200,null,18 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",passed,7088,4401,null,13 + C5,File preview,success,"test_c5_file_preview_success[chromium]",passed,20795,200,null,9 + C5,File preview,rejection,"test_c5_file_preview_rejection[chromium]",passed,10232,401,null,9 + C6,Institution admin screen,success,"test_c6_admin_success[chromium]",passed,873,200,null,3 + C6,Institution admin screen,rejection,"test_c6_admin_rejection[chromium]",passed,2463,403,null,3 + C1,Login via fakecas,rejection,test_c1_login_rejection,passed,176,401,null,0 diff --git a/docs/demo/runs/acc-20261110T015520Z-ab4cc7/collector.json b/docs/demo/runs/acc-20261110T015520Z-ab4cc7/collector.json new file mode 100644 index 0000000..9581d96 --- /dev/null +++ b/docs/demo/runs/acc-20261110T015520Z-ab4cc7/collector.json @@ -0,0 +1,134 @@ +[ + { + "nodeid": "test_c1_login.py::test_c1_login_success[chromium]", + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "status": "passed", + "duration_ms": 5103, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_success[chromium]", + "id": "C2", + "name": "Create project", + "case": "success", + "status": "passed", + "duration_ms": 7847, + "http_status": 200, + "evidence": null, + "known_external_blocked": 14 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_rejection[chromium]", + "id": "C2", + "name": "Create project", + "case": "rejection", + "status": "passed", + "duration_ms": 7110, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "success", + "status": "passed", + "duration_ms": 3954, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "status": "passed", + "duration_ms": 6047, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "passed", + "duration_ms": 10163, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 6774, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_success[chromium]", + "id": "C5", + "name": "File preview", + "case": "success", + "status": "passed", + "duration_ms": 10977, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_rejection[chromium]", + "id": "C5", + "name": "File preview", + "case": "rejection", + "status": "passed", + "duration_ms": 9919, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_success[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "status": "passed", + "duration_ms": 1184, + "http_status": 200, + "evidence": null, + "known_external_blocked": 5 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_rejection[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "status": "passed", + "duration_ms": 2181, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "nodeid": "test_c1_login.py::test_c1_login_rejection", + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "status": "passed", + "duration_ms": 164, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261110T015520Z-ab4cc7/junit.xml b/docs/demo/runs/acc-20261110T015520Z-ab4cc7/junit.xml new file mode 100644 index 0000000..ea887e3 --- /dev/null +++ b/docs/demo/runs/acc-20261110T015520Z-ab4cc7/junit.xml @@ -0,0 +1 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="12" time="71.490" timestamp="2026-11-10T10:55:38.514782+09:00" hostname="redacted-host"><testcase classname="test_c1_login" name="test_c1_login_success[chromium]" time="5.105"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="7" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_success[chromium]" time="7.848"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="14" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_rejection[chromium]" time="7.111"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_success[chromium]" time="3.955"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="4" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_rejection[chromium]" time="6.048"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="10.164"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="18" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="6.775"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="13" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="10.979"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_rejection[chromium]" time="9.920"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="1.186"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="5" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_rejection[chromium]" time="2.183"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="3" /></properties></testcase><testcase classname="test_c1_login" name="test_c1_login_rejection" time="0.165"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="0" /></properties></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261110T015520Z-ab4cc7/pytest.log b/docs/demo/runs/acc-20261110T015520Z-ab4cc7/pytest.log new file mode 100644 index 0000000..ccdd828 --- /dev/null +++ b/docs/demo/runs/acc-20261110T015520Z-ab4cc7/pytest.log @@ -0,0 +1,40 @@ +............ [100%] +=============================== warnings summary =============================== +test_c1_login.py::test_c1_login_success[chromium] + test_c1_login.py:10: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_success[chromium] + test_c2_create_project.py:11: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_rejection[chromium] + test_c2_create_project.py:39: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_success[chromium] + test_c3_file_upload.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] + test_c3_file_upload.py:43: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:55: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] + test_c4_wiki_collab.py:85: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_success[chromium] + test_c5_file_preview.py:16: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] + test_c5_file_preview.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_success[chromium] + test_c6_admin.py:28: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_rejection[chromium] + test_c6_admin.py:48: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c1_login.py::test_c1_login_rejection + test_c1_login.py:20: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +12 passed, 10 deselected, 12 warnings in 71.48s (0:01:11) diff --git a/docs/demo/runs/acc-20261110T015520Z-ab4cc7/results.json b/docs/demo/runs/acc-20261110T015520Z-ab4cc7/results.json new file mode 100644 index 0000000..0a7246c --- /dev/null +++ b/docs/demo/runs/acc-20261110T015520Z-ab4cc7/results.json @@ -0,0 +1,167 @@ +{ + "run_id": "acc-20261110T015520Z-ab4cc7", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-10T01:55:20Z", + "duration_ms": 93336, + "only": "core", + "seeded": true, + "precheck": { + "healthy": true, + "services": 24 + }, + "pytest_returncode": 0, + "evidence_dir": "docs/demo/runs/acc-20261110T015520Z-ab4cc7", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C1", + "C2", + "C3", + "C4", + "C5", + "C6" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 12, + "failed": 0, + "error": 0, + "skipped": 0, + "total": 12, + "known_external_blocked": 98 + }, + "tests": [ + { + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "test": "test_c1_login_success[chromium]", + "status": "passed", + "duration_ms": 5103, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C2", + "name": "Create project", + "case": "success", + "test": "test_c2_create_project_success[chromium]", + "status": "passed", + "duration_ms": 7847, + "http_status": 200, + "evidence": null, + "known_external_blocked": 14 + }, + { + "id": "C2", + "name": "Create project", + "case": "rejection", + "test": "test_c2_create_project_rejection[chromium]", + "status": "passed", + "duration_ms": 7110, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "success", + "test": "test_c3_file_upload_success[chromium]", + "status": "passed", + "duration_ms": 3954, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "test": "test_c3_file_upload_rejection[chromium]", + "status": "passed", + "duration_ms": 6047, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "passed", + "duration_ms": 10163, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "passed", + "duration_ms": 6774, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C5", + "name": "File preview", + "case": "success", + "test": "test_c5_file_preview_success[chromium]", + "status": "passed", + "duration_ms": 10977, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C5", + "name": "File preview", + "case": "rejection", + "test": "test_c5_file_preview_rejection[chromium]", + "status": "passed", + "duration_ms": 9919, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "test": "test_c6_admin_success[chromium]", + "status": "passed", + "duration_ms": 1184, + "http_status": 200, + "evidence": null, + "known_external_blocked": 5 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "test": "test_c6_admin_rejection[chromium]", + "status": "passed", + "duration_ms": 2181, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "test": "test_c1_login_rejection", + "status": "passed", + "duration_ms": 164, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261110T015520Z-ab4cc7/results.toon b/docs/demo/runs/acc-20261110T015520Z-ab4cc7/results.toon new file mode 100644 index 0000000..ba020dd --- /dev/null +++ b/docs/demo/runs/acc-20261110T015520Z-ab4cc7/results.toon @@ -0,0 +1,42 @@ +accept: + run_id: acc-20261110T015520Z-ab4cc7 + base_url: "http://127.0.0.1:5000" + started: "2026-11-10T01:55:20Z" + duration_ms: 93336 + only: core + seeded: true + precheck: + healthy: true + services: 24 + pytest_returncode: 0 + evidence_dir: docs/demo/runs/acc-20261110T015520Z-ab4cc7 + tracing: off + trace_quarantine: null + expected_scenarios[6]: + - C1 + - C2 + - C3 + - C4 + - C5 + - C6 + incomplete_scenarios[0]: + summary: + passed: 12 + failed: 0 + error: 0 + skipped: 0 + total: 12 + known_external_blocked: 98 + tests[12]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C1,Login via fakecas,success,"test_c1_login_success[chromium]",passed,5103,200,null,7 + C2,Create project,success,"test_c2_create_project_success[chromium]",passed,7847,200,null,14 + C2,Create project,rejection,"test_c2_create_project_rejection[chromium]",passed,7110,403,null,8 + C3,Upload and download file,success,"test_c3_file_upload_success[chromium]",passed,3954,200,null,4 + C3,Upload and download file,rejection,"test_c3_file_upload_rejection[chromium]",passed,6047,403,null,8 + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",passed,10163,200,null,18 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",passed,6774,4401,null,13 + C5,File preview,success,"test_c5_file_preview_success[chromium]",passed,10977,200,null,9 + C5,File preview,rejection,"test_c5_file_preview_rejection[chromium]",passed,9919,401,null,9 + C6,Institution admin screen,success,"test_c6_admin_success[chromium]",passed,1184,200,null,5 + C6,Institution admin screen,rejection,"test_c6_admin_rejection[chromium]",passed,2181,403,null,3 + C1,Login via fakecas,rejection,test_c1_login_rejection,passed,164,401,null,0 diff --git a/docs/demo/runs/acc-20261110T043053Z-5c5dae/collector.json b/docs/demo/runs/acc-20261110T043053Z-5c5dae/collector.json new file mode 100644 index 0000000..e2c0fa4 --- /dev/null +++ b/docs/demo/runs/acc-20261110T043053Z-5c5dae/collector.json @@ -0,0 +1,134 @@ +[ + { + "nodeid": "test_c1_login.py::test_c1_login_success[chromium]", + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "status": "passed", + "duration_ms": 6150, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_success[chromium]", + "id": "C2", + "name": "Create project", + "case": "success", + "status": "failed", + "duration_ms": 34486, + "http_status": null, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_rejection[chromium]", + "id": "C2", + "name": "Create project", + "case": "rejection", + "status": "passed", + "duration_ms": 5448, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "success", + "status": "passed", + "duration_ms": 8718, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "status": "passed", + "duration_ms": 10933, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "failed", + "duration_ms": 66819, + "http_status": null, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "failed", + "duration_ms": 65666, + "http_status": null, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_success[chromium]", + "id": "C5", + "name": "File preview", + "case": "success", + "status": "error", + "duration_ms": 69402, + "http_status": null, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_rejection[chromium]", + "id": "C5", + "name": "File preview", + "case": "rejection", + "status": "failed", + "duration_ms": 3182, + "http_status": 400, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_success[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "status": "error", + "duration_ms": 737, + "http_status": 404, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_rejection[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "status": "failed", + "duration_ms": 2408, + "http_status": null, + "evidence": null, + "known_external_blocked": 3 + }, + { + "nodeid": "test_c1_login.py::test_c1_login_rejection", + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "status": "passed", + "duration_ms": 47, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261110T043053Z-5c5dae/junit.xml b/docs/demo/runs/acc-20261110T043053Z-5c5dae/junit.xml new file mode 100644 index 0000000..1e57d45 --- /dev/null +++ b/docs/demo/runs/acc-20261110T043053Z-5c5dae/junit.xml @@ -0,0 +1,298 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="2" failures="7" skipped="0" tests="14" time="274.541" timestamp="2026-11-10T13:31:04.249465+09:00" hostname="redacted-host"><testcase classname="test_c1_login" name="test_c1_login_success[chromium]" time="6.151"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="7" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_success[chromium]" time="34.488"><properties><property name="known_external_blocked" value="7" /></properties><failure message="playwright._impl._errors.TimeoutError: Page.fill: Timeout 30000ms exceeded. Call log: - waiting for locator("input#projectName, input[name='title']")">logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'> +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0xebde57f47ce0> +run_id = 'acc-20261110T043053Z-5c5dae' +record_property = <function record_property.<locals>.append_property at 0xebde57f46b60> + + @pytest.mark.case("success") + def test_c2_create_project_success(logged_in_page, base_url, api_url, api_write, run_id, record_property): + """A new project created in the UI appears with its title and the user as admin.""" + page = logged_in_page + title = f"acceptance C2 {run_id}" + page.goto(base_url + sel.PATHS["new_project"], wait_until="domcontentloaded") + page.click(sel.WEB["create_project_button"]) +> page.fill(sel.WEB["create_project_title"], title) + +installer/acceptance/test_c2_create_project.py:18: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:17731: in fill + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:1229: in fill + return await self._main_frame.fill( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:736: in fill + return await self._channel.fill( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0xebde57f17530> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0xebde57f447c0> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.fill: Timeout 30000ms exceeded. +E Call log: +E - waiting for locator("input#projectName, input[name='title']") + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError</failure></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_rejection[chromium]" time="5.449"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_success[chromium]" time="8.719"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="4" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_rejection[chromium]" time="10.935"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="66.820"><properties><property name="known_external_blocked" value="13" /></properties><failure message="playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. Call log: - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible">two_contexts = (<Page url='http://127.0.0.1:5000/kd2pa/wiki/home/?edit&view&menu'>, <Page url='http://127.0.0.1:5000/dashboard'>) +login = <function login.<locals>._login at 0xebde567a8860> +user_a = {'email': '***', 'password': '***'} +user_b = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0xebde567ab560> +add_contributor = <function add_contributor.<locals>._add at 0xebde57b48220> +run_id = 'acc-20261110T043053Z-5c5dae' +record_property = <function record_property.<locals>.append_property at 0xebde57b48400> + + @pytest.mark.case("success") + def test_c4_wiki_collab_success(two_contexts, login, user_a, user_b, base_url, api_url, api_write, add_contributor, + run_id, record_property): + """Both users open the same wiki page; text typed by B appears in A's editor and text typed by A in B's.""" + page_a, page_b = two_contexts + login(page_a, user_a) + login(page_b, user_b) + + created = api_write(page_a.context, "POST", api_url + sel.API["nodes"], { + "data": {"type": "nodes", "attributes": {"title": "acceptance C4", "category": "project", "public": False}} + }) + assert created.status == 201, created.text()[:200] + node_id = created.json()["data"]["id"] + try: + add_contributor(page_a.context, node_id, user_id_of(page_b.context, api_url), "write") + +> resp_a = _open_editor(page_a, base_url, node_id) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c4_wiki_collab.py:53: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/test_c4_wiki_collab.py:26: in _open_editor + page.wait_for_selector(sel.WEB["wiki_editor"], timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21403: in wait_for_selector + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:464: in wait_for_selector + return await self._main_frame.wait_for_selector( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:418: in wait_for_selector + result = await self._channel.waitForSelector( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:398: in _mapped + return mapper(await awaitable) + ^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0xebde577b4d10> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0xebde578a8f40> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. +E Call log: +E - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError</failure></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="65.667"><properties><property name="known_external_blocked" value="13" /></properties><failure message="playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. Call log: - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible">two_contexts = (<Page url='http://127.0.0.1:5000/6d8pg/wiki/home/?edit&view&menu'>, <Page url='about:blank'>) +login = <function login.<locals>._login at 0xebde5796ca40> +user_a = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', project = '6d8pg' +record_property = <function record_property.<locals>.append_property at 0xebde57933d80> + + @pytest.mark.case("rejection") + def test_c4_wiki_collab_rejection(two_contexts, login, user_a, base_url, project, record_property): + """A logged-out context connecting to the wiki websocket is closed with code 4401.""" + page_a, page_anon = two_contexts + login(page_a, user_a) +> _open_editor(page_a, base_url, project) + +installer/acceptance/test_c4_wiki_collab.py:72: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/test_c4_wiki_collab.py:26: in _open_editor + page.wait_for_selector(sel.WEB["wiki_editor"], timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21403: in wait_for_selector + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:464: in wait_for_selector + return await self._main_frame.wait_for_selector( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:418: in wait_for_selector + result = await self._channel.waitForSelector( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:398: in _mapped + return mapper(await awaitable) + ^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0xebde57bbcbc0> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0xebde57f47420> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. +E Call log: +E - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError</failure></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="69.261"><failure message="playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. Call log: - waiting for locator("iframe#mfrIframe, iframe[src*='render']") to be visible">logged_in_page = <Page url='http://127.0.0.1:5000/27efg/'>, project = 'c5q8w' +base_url = 'http://127.0.0.1:5000' +service_url = <function service_url.<locals>._url at 0xebde57f09260> +tmp_pdf = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' +run_id = 'acc-20261110T043053Z-5c5dae' +record_property = <function record_property.<locals>.append_property at 0xebde57b1cfe0> + + @pytest.mark.case("success") + def test_c5_file_preview_success(logged_in_page, project, base_url, service_url, tmp_pdf, run_id, record_property): + """An uploaded PDF renders inside the mfr iframe (mfr answers 200 for the render request).""" + page = logged_in_page + entity = upload(page.context, service_url("wb"), project, f"c5-{run_id}.pdf", tmp_pdf) + mfr = service_url("mfr") + with page.expect_response(lambda r: same_origin(r.url, mfr) and "/render" in r.url, timeout=90_000) as render: + page.goto(_file_page_url(base_url, project, entity["attributes"]["path"]), wait_until="domcontentloaded") +> page.wait_for_selector(sel.WEB["file_preview_iframe"], timeout=60_000) + +installer/acceptance/test_c5_file_preview.py:24: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21403: in wait_for_selector + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:464: in wait_for_selector + return await self._main_frame.wait_for_selector( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:418: in wait_for_selector + result = await self._channel.waitForSelector( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:398: in _mapped + return mapper(await awaitable) + ^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0xebde57cbdb80> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0xebde57d839c0> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. +E Call log: +E - waiting for locator("iframe#mfrIframe, iframe[src*='render']") to be visible + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError</failure></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="0.142"><properties><property name="known_external_blocked" value="8" /></properties><error message="failed on teardown with "Failed: request(s) would have left the machine: ['http://localhost:7007/text.js', 'http://localhost:7007/share.js']"">request = <SubRequest 'external_guard' for <Function test_c5_file_preview_success[chromium]>> + + @pytest.fixture(autouse=True) + def external_guard(request): + """Collect the loopback-guard offenders of one test and fail it if any guard (browser, websocket, + API) saw a URL that would have left the machine. Every browser context is created by our + `new_context` below (pytest-playwright's default `context` fixture calls it too), which attaches + the guard itself; requesting `context` from here created a fixture cycle + (external_guard -> context -> new_context -> external_guard, first real acceptance run).""" + offenders: list[str] = [] + before = len(_OFFENDERS) + known_before = len(_KNOWN_EXTERNAL) + yield offenders + offenders.extend(_OFFENDERS[before:]) + request.node.user_properties.append(("known_external_blocked", len(_KNOWN_EXTERNAL) - known_before)) + if offenders: +> pytest.fail(f"request(s) would have left the machine: {offenders[:5]}") +E Failed: request(s) would have left the machine: ['http://localhost:7007/text.js', 'http://localhost:7007/share.js'] + +installer/acceptance/conftest.py:274: Failed</error></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_rejection[chromium]" time="3.184"><properties><property name="http_status" value="400" /><property name="known_external_blocked" value="4" /></properties><failure message="AssertionError: anonymous preview returned 400 assert 400 in (401, 403) + where 400 = <APIResponse url='http://127.0.0.1:7778/render?url=http://127.0.0.1:7777/v1/resources/x7uv2/providers/osfstorage/6af29f17c91ee600098cbf54' status=400 status_text='Bad Request'>.status">logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'>, project = 'x7uv2' +service_url = <function service_url.<locals>._url at 0xebde57f09260> +tmp_pdf = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' +run_id = 'acc-20261110T043053Z-5c5dae' +api_context = <function api_context.<locals>._new at 0xebde57b48860> +record_property = <function record_property.<locals>.append_property at 0xebde5795ade0> + + @pytest.mark.case("rejection") + def test_c5_file_preview_rejection(logged_in_page, project, service_url, tmp_pdf, run_id, api_context, record_property): + """The preview URL of a private file without a session -> 401/403.""" + page = logged_in_page + wb = service_url("wb") + entity = upload(page.context, wb, project, f"c5-private-{run_id}.pdf", tmp_pdf) + file_url = download_link(entity, wb, project) + anon = api_context() + resp = anon.get(service_url("mfr") + sel.MFR["render"].format(file_url=file_url)) + record_property("http_status", resp.status) +> assert resp.status in (401, 403), f"anonymous preview returned {resp.status}" +E AssertionError: anonymous preview returned 400 +E assert 400 in (401, 403) +E + where 400 = <APIResponse url='http://127.0.0.1:7778/render?url=http://127.0.0.1:7777/v1/resources/x7uv2/providers/osfstorage/6af29f17c91ee600098cbf54' status=400 status_text='Bad Request'>.status + +installer/acceptance/test_c5_file_preview.py:39: AssertionError</failure></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="0.736"><properties><property name="http_status" value="404" /></properties><failure message="AssertionError: institution users page returned 404 assert (<Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>> is not None and 404 == 200) + where 404 = <Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>>.status">page = <Page url='http://127.0.0.1:8001/institutions/1/users/'> +service_url = <function service_url.<locals>._url at 0xebde57f09260> +admin_user = {'email': '***', 'password': '***'} +record_property = <function record_property.<locals>.append_property at 0xebde569085e0> + + @pytest.mark.case("success") + def test_c6_admin_success(page, service_url, admin_user, record_property): + """The institution admin signs in to the admin app and sees the institution's user list.""" + admin_url = service_url("admin") + _admin_login(page, admin_url, admin_user) + # TODO(M2): the institution id of the seeded admin; "1" assumes the first institution created by --seed. + resp = page.goto(admin_url + sel.ADMIN["institution_users"].format(institution_id="1"), wait_until="domcontentloaded") + record_property("http_status", resp.status if resp else None) +> assert resp is not None and resp.status == 200, f"institution users page returned {resp and resp.status}" +E AssertionError: institution users page returned 404 +E assert (<Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>> is not None and 404 == 200) +E + where 404 = <Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>>.status + +installer/acceptance/test_c6_admin.py:27: AssertionError</failure></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="0.003"><properties><property name="http_status" value="404" /><property name="known_external_blocked" value="0" /></properties><error message="failed on teardown with "Failed: request(s) would have left the machine: ['http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css']"">request = <SubRequest 'external_guard' for <Function test_c6_admin_success[chromium]>> + + @pytest.fixture(autouse=True) + def external_guard(request): + """Collect the loopback-guard offenders of one test and fail it if any guard (browser, websocket, + API) saw a URL that would have left the machine. Every browser context is created by our + `new_context` below (pytest-playwright's default `context` fixture calls it too), which attaches + the guard itself; requesting `context` from here created a fixture cycle + (external_guard -> context -> new_context -> external_guard, first real acceptance run).""" + offenders: list[str] = [] + before = len(_OFFENDERS) + known_before = len(_KNOWN_EXTERNAL) + yield offenders + offenders.extend(_OFFENDERS[before:]) + request.node.user_properties.append(("known_external_blocked", len(_KNOWN_EXTERNAL) - known_before)) + if offenders: +> pytest.fail(f"request(s) would have left the machine: {offenders[:5]}") +E Failed: request(s) would have left the machine: ['http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css'] + +installer/acceptance/conftest.py:274: Failed</error></testcase><testcase classname="test_c6_admin" name="test_c6_admin_rejection[chromium]" time="2.409"><properties><property name="known_external_blocked" value="3" /></properties><failure message="AssertionError: admin screen answered 404 to an ordinary user assert 404 in (301, 302, 303, 307, 403) + where 404 = <APIResponse url='http://127.0.0.1:8001/institutions/1/users/' status=404 status_text='Not Found'>.status">logged_in_page = <Page url='http://127.0.0.1:5000/dashboard/'> +service_url = <function service_url.<locals>._url at 0xebde57f09260> +api_url = 'http://127.0.0.1:8000' +record_property = <function record_property.<locals>.append_property at 0xebde57933ce0> + + @pytest.mark.case("rejection") + def test_c6_admin_rejection(logged_in_page, service_url, api_url, record_property): + """An ordinary user opening the admin URL -> 403 or redirect to login; the API answers exactly 403.""" + client = api(logged_in_page.context) + admin_url = service_url("admin") + screen = client.get(admin_url + sel.ADMIN["institution_users"].format(institution_id="1"), max_redirects=0) +> assert screen.status in (301, 302, 303, 307, 403), f"admin screen answered {screen.status} to an ordinary user" +E AssertionError: admin screen answered 404 to an ordinary user +E assert 404 in (301, 302, 303, 307, 403) +E + where 404 = <APIResponse url='http://127.0.0.1:8001/institutions/1/users/' status=404 status_text='Not Found'>.status + +installer/acceptance/test_c6_admin.py:37: AssertionError</failure></testcase><testcase classname="test_c1_login" name="test_c1_login_rejection" time="0.048"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="0" /></properties></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261110T043053Z-5c5dae/pytest.log b/docs/demo/runs/acc-20261110T043053Z-5c5dae/pytest.log new file mode 100644 index 0000000..6e17875 --- /dev/null +++ b/docs/demo/runs/acc-20261110T043053Z-5c5dae/pytest.log @@ -0,0 +1,376 @@ +.F...FFFEFFEF. [100%] +==================================== ERRORS ==================================== +_________ ERROR at teardown of test_c5_file_preview_success[chromium] __________ + +request = <SubRequest 'external_guard' for <Function test_c5_file_preview_success[chromium]>> + + @pytest.fixture(autouse=True) + def external_guard(request): + """Collect the loopback-guard offenders of one test and fail it if any guard (browser, websocket, + API) saw a URL that would have left the machine. Every browser context is created by our + `new_context` below (pytest-playwright's default `context` fixture calls it too), which attaches + the guard itself; requesting `context` from here created a fixture cycle + (external_guard -> context -> new_context -> external_guard, first real acceptance run).""" + offenders: list[str] = [] + before = len(_OFFENDERS) + known_before = len(_KNOWN_EXTERNAL) + yield offenders + offenders.extend(_OFFENDERS[before:]) + request.node.user_properties.append(("known_external_blocked", len(_KNOWN_EXTERNAL) - known_before)) + if offenders: +> pytest.fail(f"request(s) would have left the machine: {offenders[:5]}") +E Failed: request(s) would have left the machine: ['http://localhost:7007/text.js', 'http://localhost:7007/share.js'] + +installer/acceptance/conftest.py:274: Failed +_____________ ERROR at teardown of test_c6_admin_success[chromium] _____________ + +request = <SubRequest 'external_guard' for <Function test_c6_admin_success[chromium]>> + + @pytest.fixture(autouse=True) + def external_guard(request): + """Collect the loopback-guard offenders of one test and fail it if any guard (browser, websocket, + API) saw a URL that would have left the machine. Every browser context is created by our + `new_context` below (pytest-playwright's default `context` fixture calls it too), which attaches + the guard itself; requesting `context` from here created a fixture cycle + (external_guard -> context -> new_context -> external_guard, first real acceptance run).""" + offenders: list[str] = [] + before = len(_OFFENDERS) + known_before = len(_KNOWN_EXTERNAL) + yield offenders + offenders.extend(_OFFENDERS[before:]) + request.node.user_properties.append(("known_external_blocked", len(_KNOWN_EXTERNAL) - known_before)) + if offenders: +> pytest.fail(f"request(s) would have left the machine: {offenders[:5]}") +E Failed: request(s) would have left the machine: ['http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css'] + +installer/acceptance/conftest.py:274: Failed +=================================== FAILURES =================================== +___________________ test_c2_create_project_success[chromium] ___________________ + +logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'> +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0xebde57f47ce0> +run_id = 'acc-20261110T043053Z-5c5dae' +record_property = <function record_property.<locals>.append_property at 0xebde57f46b60> + + @pytest.mark.case("success") + def test_c2_create_project_success(logged_in_page, base_url, api_url, api_write, run_id, record_property): + """A new project created in the UI appears with its title and the user as admin.""" + page = logged_in_page + title = f"acceptance C2 {run_id}" + page.goto(base_url + sel.PATHS["new_project"], wait_until="domcontentloaded") + page.click(sel.WEB["create_project_button"]) +> page.fill(sel.WEB["create_project_title"], title) + +installer/acceptance/test_c2_create_project.py:18: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:17731: in fill + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:1229: in fill + return await self._main_frame.fill( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:736: in fill + return await self._channel.fill( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0xebde57f17530> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0xebde57f447c0> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.fill: Timeout 30000ms exceeded. +E Call log: +E - waiting for locator("input#projectName, input[name='title']") + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError +____________________ test_c4_wiki_collab_success[chromium] _____________________ + +two_contexts = (<Page url='http://127.0.0.1:5000/kd2pa/wiki/home/?edit&view&menu'>, <Page url='http://127.0.0.1:5000/dashboard'>) +login = <function login.<locals>._login at 0xebde567a8860> +user_a = {'email': '***', 'password': '***'} +user_b = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0xebde567ab560> +add_contributor = <function add_contributor.<locals>._add at 0xebde57b48220> +run_id = 'acc-20261110T043053Z-5c5dae' +record_property = <function record_property.<locals>.append_property at 0xebde57b48400> + + @pytest.mark.case("success") + def test_c4_wiki_collab_success(two_contexts, login, user_a, user_b, base_url, api_url, api_write, add_contributor, + run_id, record_property): + """Both users open the same wiki page; text typed by B appears in A's editor and text typed by A in B's.""" + page_a, page_b = two_contexts + login(page_a, user_a) + login(page_b, user_b) + + created = api_write(page_a.context, "POST", api_url + sel.API["nodes"], { + "data": {"type": "nodes", "attributes": {"title": "acceptance C4", "category": "project", "public": False}} + }) + assert created.status == 201, created.text()[:200] + node_id = created.json()["data"]["id"] + try: + add_contributor(page_a.context, node_id, user_id_of(page_b.context, api_url), "write") + +> resp_a = _open_editor(page_a, base_url, node_id) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c4_wiki_collab.py:53: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/test_c4_wiki_collab.py:26: in _open_editor + page.wait_for_selector(sel.WEB["wiki_editor"], timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21403: in wait_for_selector + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:464: in wait_for_selector + return await self._main_frame.wait_for_selector( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:418: in wait_for_selector + result = await self._channel.waitForSelector( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:398: in _mapped + return mapper(await awaitable) + ^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0xebde577b4d10> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0xebde578a8f40> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. +E Call log: +E - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError +___________________ test_c4_wiki_collab_rejection[chromium] ____________________ + +two_contexts = (<Page url='http://127.0.0.1:5000/6d8pg/wiki/home/?edit&view&menu'>, <Page url='about:blank'>) +login = <function login.<locals>._login at 0xebde5796ca40> +user_a = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', project = '6d8pg' +record_property = <function record_property.<locals>.append_property at 0xebde57933d80> + + @pytest.mark.case("rejection") + def test_c4_wiki_collab_rejection(two_contexts, login, user_a, base_url, project, record_property): + """A logged-out context connecting to the wiki websocket is closed with code 4401.""" + page_a, page_anon = two_contexts + login(page_a, user_a) +> _open_editor(page_a, base_url, project) + +installer/acceptance/test_c4_wiki_collab.py:72: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/test_c4_wiki_collab.py:26: in _open_editor + page.wait_for_selector(sel.WEB["wiki_editor"], timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21403: in wait_for_selector + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:464: in wait_for_selector + return await self._main_frame.wait_for_selector( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:418: in wait_for_selector + result = await self._channel.waitForSelector( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:398: in _mapped + return mapper(await awaitable) + ^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0xebde57bbcbc0> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0xebde57f47420> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. +E Call log: +E - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError +____________________ test_c5_file_preview_success[chromium] ____________________ + +logged_in_page = <Page url='http://127.0.0.1:5000/27efg/'>, project = 'c5q8w' +base_url = 'http://127.0.0.1:5000' +service_url = <function service_url.<locals>._url at 0xebde57f09260> +tmp_pdf = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' +run_id = 'acc-20261110T043053Z-5c5dae' +record_property = <function record_property.<locals>.append_property at 0xebde57b1cfe0> + + @pytest.mark.case("success") + def test_c5_file_preview_success(logged_in_page, project, base_url, service_url, tmp_pdf, run_id, record_property): + """An uploaded PDF renders inside the mfr iframe (mfr answers 200 for the render request).""" + page = logged_in_page + entity = upload(page.context, service_url("wb"), project, f"c5-{run_id}.pdf", tmp_pdf) + mfr = service_url("mfr") + with page.expect_response(lambda r: same_origin(r.url, mfr) and "/render" in r.url, timeout=90_000) as render: + page.goto(_file_page_url(base_url, project, entity["attributes"]["path"]), wait_until="domcontentloaded") +> page.wait_for_selector(sel.WEB["file_preview_iframe"], timeout=60_000) + +installer/acceptance/test_c5_file_preview.py:24: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21403: in wait_for_selector + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:464: in wait_for_selector + return await self._main_frame.wait_for_selector( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:418: in wait_for_selector + result = await self._channel.waitForSelector( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:398: in _mapped + return mapper(await awaitable) + ^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0xebde57cbdb80> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0xebde57d839c0> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. +E Call log: +E - waiting for locator("iframe#mfrIframe, iframe[src*='render']") to be visible + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError +___________________ test_c5_file_preview_rejection[chromium] ___________________ + +logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'>, project = 'x7uv2' +service_url = <function service_url.<locals>._url at 0xebde57f09260> +tmp_pdf = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' +run_id = 'acc-20261110T043053Z-5c5dae' +api_context = <function api_context.<locals>._new at 0xebde57b48860> +record_property = <function record_property.<locals>.append_property at 0xebde5795ade0> + + @pytest.mark.case("rejection") + def test_c5_file_preview_rejection(logged_in_page, project, service_url, tmp_pdf, run_id, api_context, record_property): + """The preview URL of a private file without a session -> 401/403.""" + page = logged_in_page + wb = service_url("wb") + entity = upload(page.context, wb, project, f"c5-private-{run_id}.pdf", tmp_pdf) + file_url = download_link(entity, wb, project) + anon = api_context() + resp = anon.get(service_url("mfr") + sel.MFR["render"].format(file_url=file_url)) + record_property("http_status", resp.status) +> assert resp.status in (401, 403), f"anonymous preview returned {resp.status}" +E AssertionError: anonymous preview returned 400 +E assert 400 in (401, 403) +E + where 400 = <APIResponse url='http://127.0.0.1:7778/render?url=http://127.0.0.1:7777/v1/resources/x7uv2/providers/osfstorage/6af29f17c91ee600098cbf54' status=400 status_text='Bad Request'>.status + +installer/acceptance/test_c5_file_preview.py:39: AssertionError +_______________________ test_c6_admin_success[chromium] ________________________ + +page = <Page url='http://127.0.0.1:8001/institutions/1/users/'> +service_url = <function service_url.<locals>._url at 0xebde57f09260> +admin_user = {'email': '***', 'password': '***'} +record_property = <function record_property.<locals>.append_property at 0xebde569085e0> + + @pytest.mark.case("success") + def test_c6_admin_success(page, service_url, admin_user, record_property): + """The institution admin signs in to the admin app and sees the institution's user list.""" + admin_url = service_url("admin") + _admin_login(page, admin_url, admin_user) + # TODO(M2): the institution id of the seeded admin; "1" assumes the first institution created by --seed. + resp = page.goto(admin_url + sel.ADMIN["institution_users"].format(institution_id="1"), wait_until="domcontentloaded") + record_property("http_status", resp.status if resp else None) +> assert resp is not None and resp.status == 200, f"institution users page returned {resp and resp.status}" +E AssertionError: institution users page returned 404 +E assert (<Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>> is not None and 404 == 200) +E + where 404 = <Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>>.status + +installer/acceptance/test_c6_admin.py:27: AssertionError +______________________ test_c6_admin_rejection[chromium] _______________________ + +logged_in_page = <Page url='http://127.0.0.1:5000/dashboard/'> +service_url = <function service_url.<locals>._url at 0xebde57f09260> +api_url = 'http://127.0.0.1:8000' +record_property = <function record_property.<locals>.append_property at 0xebde57933ce0> + + @pytest.mark.case("rejection") + def test_c6_admin_rejection(logged_in_page, service_url, api_url, record_property): + """An ordinary user opening the admin URL -> 403 or redirect to login; the API answers exactly 403.""" + client = api(logged_in_page.context) + admin_url = service_url("admin") + screen = client.get(admin_url + sel.ADMIN["institution_users"].format(institution_id="1"), max_redirects=0) +> assert screen.status in (301, 302, 303, 307, 403), f"admin screen answered {screen.status} to an ordinary user" +E AssertionError: admin screen answered 404 to an ordinary user +E assert 404 in (301, 302, 303, 307, 403) +E + where 404 = <APIResponse url='http://127.0.0.1:8001/institutions/1/users/' status=404 status_text='Not Found'>.status + +installer/acceptance/test_c6_admin.py:37: AssertionError +=============================== warnings summary =============================== +test_c1_login.py::test_c1_login_success[chromium] + test_c1_login.py:10: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_success[chromium] + test_c2_create_project.py:11: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_rejection[chromium] + test_c2_create_project.py:39: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_success[chromium] + test_c3_file_upload.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] + test_c3_file_upload.py:43: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:37: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] + test_c4_wiki_collab.py:67: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_success[chromium] + test_c5_file_preview.py:16: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] + test_c5_file_preview.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_success[chromium] + test_c6_admin.py:19: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_rejection[chromium] + test_c6_admin.py:31: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c1_login.py::test_c1_login_rejection + test_c1_login.py:20: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +=========================== short test summary info ============================ +ERROR installer/acceptance/test_c5_file_preview.py::test_c5_file_preview_success[chromium] +ERROR installer/acceptance/test_c6_admin.py::test_c6_admin_success[chromium] +FAILED installer/acceptance/test_c2_create_project.py::test_c2_create_project_success[chromium] +FAILED installer/acceptance/test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] +FAILED installer/acceptance/test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] +FAILED installer/acceptance/test_c5_file_preview.py::test_c5_file_preview_success[chromium] +FAILED installer/acceptance/test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] +FAILED installer/acceptance/test_c6_admin.py::test_c6_admin_success[chromium] +FAILED installer/acceptance/test_c6_admin.py::test_c6_admin_rejection[chromium] +7 failed, 5 passed, 10 deselected, 12 warnings, 2 errors in 274.54s (0:04:34) diff --git a/docs/demo/runs/acc-20261110T043053Z-5c5dae/results.json b/docs/demo/runs/acc-20261110T043053Z-5c5dae/results.json new file mode 100644 index 0000000..64d2cd6 --- /dev/null +++ b/docs/demo/runs/acc-20261110T043053Z-5c5dae/results.json @@ -0,0 +1,167 @@ +{ + "run_id": "acc-20261110T043053Z-5c5dae", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-10T04:30:53Z", + "duration_ms": 288154, + "only": "core", + "seeded": true, + "precheck": { + "healthy": true, + "services": 24 + }, + "pytest_returncode": 1, + "evidence_dir": "docs/demo/runs/acc-20261110T043053Z-5c5dae", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C1", + "C2", + "C3", + "C4", + "C5", + "C6" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 5, + "failed": 5, + "error": 2, + "skipped": 0, + "total": 12, + "known_external_blocked": 75 + }, + "tests": [ + { + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "test": "test_c1_login_success[chromium]", + "status": "passed", + "duration_ms": 6150, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C2", + "name": "Create project", + "case": "success", + "test": "test_c2_create_project_success[chromium]", + "status": "failed", + "duration_ms": 34486, + "http_status": null, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C2", + "name": "Create project", + "case": "rejection", + "test": "test_c2_create_project_rejection[chromium]", + "status": "passed", + "duration_ms": 5448, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "success", + "test": "test_c3_file_upload_success[chromium]", + "status": "passed", + "duration_ms": 8718, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "test": "test_c3_file_upload_rejection[chromium]", + "status": "passed", + "duration_ms": 10933, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "failed", + "duration_ms": 66819, + "http_status": null, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "failed", + "duration_ms": 65666, + "http_status": null, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C5", + "name": "File preview", + "case": "success", + "test": "test_c5_file_preview_success[chromium]", + "status": "error", + "duration_ms": 69402, + "http_status": null, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C5", + "name": "File preview", + "case": "rejection", + "test": "test_c5_file_preview_rejection[chromium]", + "status": "failed", + "duration_ms": 3182, + "http_status": 400, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "test": "test_c6_admin_success[chromium]", + "status": "error", + "duration_ms": 737, + "http_status": 404, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "test": "test_c6_admin_rejection[chromium]", + "status": "failed", + "duration_ms": 2408, + "http_status": null, + "evidence": null, + "known_external_blocked": 3 + }, + { + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "test": "test_c1_login_rejection", + "status": "passed", + "duration_ms": 47, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261110T043053Z-5c5dae/results.toon b/docs/demo/runs/acc-20261110T043053Z-5c5dae/results.toon new file mode 100644 index 0000000..a0192b3 --- /dev/null +++ b/docs/demo/runs/acc-20261110T043053Z-5c5dae/results.toon @@ -0,0 +1,42 @@ +accept: + run_id: acc-20261110T043053Z-5c5dae + base_url: "http://127.0.0.1:5000" + started: "2026-11-10T04:30:53Z" + duration_ms: 288154 + only: core + seeded: true + precheck: + healthy: true + services: 24 + pytest_returncode: 1 + evidence_dir: docs/demo/runs/acc-20261110T043053Z-5c5dae + tracing: off + trace_quarantine: null + expected_scenarios[6]: + - C1 + - C2 + - C3 + - C4 + - C5 + - C6 + incomplete_scenarios[0]: + summary: + passed: 5 + failed: 5 + error: 2 + skipped: 0 + total: 12 + known_external_blocked: 75 + tests[12]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C1,Login via fakecas,success,"test_c1_login_success[chromium]",passed,6150,200,null,7 + C2,Create project,success,"test_c2_create_project_success[chromium]",failed,34486,null,null,7 + C2,Create project,rejection,"test_c2_create_project_rejection[chromium]",passed,5448,403,null,8 + C3,Upload and download file,success,"test_c3_file_upload_success[chromium]",passed,8718,200,null,4 + C3,Upload and download file,rejection,"test_c3_file_upload_rejection[chromium]",passed,10933,403,null,8 + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",failed,66819,null,null,13 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",failed,65666,null,null,13 + C5,File preview,success,"test_c5_file_preview_success[chromium]",error,69402,null,null,8 + C5,File preview,rejection,"test_c5_file_preview_rejection[chromium]",failed,3182,400,null,4 + C6,Institution admin screen,success,"test_c6_admin_success[chromium]",error,737,404,null,0 + C6,Institution admin screen,rejection,"test_c6_admin_rejection[chromium]",failed,2408,null,null,3 + C1,Login via fakecas,rejection,test_c1_login_rejection,passed,47,401,null,0 diff --git a/docs/demo/runs/acc-20261110T052932Z-f1da54/collector.json b/docs/demo/runs/acc-20261110T052932Z-f1da54/collector.json new file mode 100644 index 0000000..eebc34a --- /dev/null +++ b/docs/demo/runs/acc-20261110T052932Z-f1da54/collector.json @@ -0,0 +1,134 @@ +[ + { + "nodeid": "test_c1_login.py::test_c1_login_success[chromium]", + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "status": "passed", + "duration_ms": 5626, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_success[chromium]", + "id": "C2", + "name": "Create project", + "case": "success", + "status": "failed", + "duration_ms": 34432, + "http_status": null, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_rejection[chromium]", + "id": "C2", + "name": "Create project", + "case": "rejection", + "status": "passed", + "duration_ms": 5452, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "success", + "status": "passed", + "duration_ms": 13162, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "status": "passed", + "duration_ms": 15381, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "failed", + "duration_ms": 66597, + "http_status": null, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "failed", + "duration_ms": 66844, + "http_status": null, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_success[chromium]", + "id": "C5", + "name": "File preview", + "case": "success", + "status": "error", + "duration_ms": 64234, + "http_status": null, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_rejection[chromium]", + "id": "C5", + "name": "File preview", + "case": "rejection", + "status": "failed", + "duration_ms": 3587, + "http_status": 400, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_success[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "status": "error", + "duration_ms": 670, + "http_status": 404, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_rejection[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "status": "failed", + "duration_ms": 2277, + "http_status": null, + "evidence": null, + "known_external_blocked": 3 + }, + { + "nodeid": "test_c1_login.py::test_c1_login_rejection", + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "status": "passed", + "duration_ms": 47, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261110T052932Z-f1da54/junit.xml b/docs/demo/runs/acc-20261110T052932Z-f1da54/junit.xml new file mode 100644 index 0000000..28d39e2 --- /dev/null +++ b/docs/demo/runs/acc-20261110T052932Z-f1da54/junit.xml @@ -0,0 +1,298 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="2" failures="7" skipped="0" tests="14" time="278.879" timestamp="2026-11-10T14:29:42.567289+09:00" hostname="redacted-host"><testcase classname="test_c1_login" name="test_c1_login_success[chromium]" time="5.629"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="7" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_success[chromium]" time="34.434"><properties><property name="known_external_blocked" value="7" /></properties><failure message="playwright._impl._errors.TimeoutError: Page.fill: Timeout 30000ms exceeded. Call log: - waiting for locator("input#projectName, input[name='title']")">logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'> +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0xf59ac21e3c40> +run_id = 'acc-20261110T052932Z-f1da54' +record_property = <function record_property.<locals>.append_property at 0xf59ac21e37e0> + + @pytest.mark.case("success") + def test_c2_create_project_success(logged_in_page, base_url, api_url, api_write, run_id, record_property): + """A new project created in the UI appears with its title and the user as admin.""" + page = logged_in_page + title = f"acceptance C2 {run_id}" + page.goto(base_url + sel.PATHS["new_project"], wait_until="domcontentloaded") + page.click(sel.WEB["create_project_button"]) +> page.fill(sel.WEB["create_project_title"], title) + +installer/acceptance/test_c2_create_project.py:18: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:17731: in fill + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:1229: in fill + return await self._main_frame.fill( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:736: in fill + return await self._channel.fill( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0xf59ac2060f80> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0xf59ac21e3ec0> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.fill: Timeout 30000ms exceeded. +E Call log: +E - waiting for locator("input#projectName, input[name='title']") + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError</failure></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_rejection[chromium]" time="5.453"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_success[chromium]" time="13.164"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="4" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_rejection[chromium]" time="15.382"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="66.599"><properties><property name="known_external_blocked" value="13" /></properties><failure message="playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. Call log: - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible">two_contexts = (<Page url='http://127.0.0.1:5000/emu7y/wiki/home/?edit&view&menu'>, <Page url='http://127.0.0.1:5000/dashboard'>) +login = <function login.<locals>._login at 0xf59ac213fb00> +user_a = {'email': '***', 'password': '***'} +user_b = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0xf59ac18d5080> +add_contributor = <function add_contributor.<locals>._add at 0xf59ac18d5580> +run_id = 'acc-20261110T052932Z-f1da54' +record_property = <function record_property.<locals>.append_property at 0xf59ac18d5e40> + + @pytest.mark.case("success") + def test_c4_wiki_collab_success(two_contexts, login, user_a, user_b, base_url, api_url, api_write, add_contributor, + run_id, record_property): + """Both users open the same wiki page; text typed by B appears in A's editor and text typed by A in B's.""" + page_a, page_b = two_contexts + login(page_a, user_a) + login(page_b, user_b) + + created = api_write(page_a.context, "POST", api_url + sel.API["nodes"], { + "data": {"type": "nodes", "attributes": {"title": "acceptance C4", "category": "project", "public": False}} + }) + assert created.status == 201, created.text()[:200] + node_id = created.json()["data"]["id"] + try: + add_contributor(page_a.context, node_id, user_id_of(page_b.context, api_url), "write") + +> resp_a = _open_editor(page_a, base_url, node_id) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c4_wiki_collab.py:53: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/test_c4_wiki_collab.py:26: in _open_editor + page.wait_for_selector(sel.WEB["wiki_editor"], timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21403: in wait_for_selector + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:464: in wait_for_selector + return await self._main_frame.wait_for_selector( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:418: in wait_for_selector + result = await self._channel.waitForSelector( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:398: in _mapped + return mapper(await awaitable) + ^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0xf59ac21fb7a0> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0xf59ac21e3f60> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. +E Call log: +E - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError</failure></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="66.847"><properties><property name="known_external_blocked" value="13" /></properties><failure message="playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. Call log: - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible">two_contexts = (<Page url='http://127.0.0.1:5000/pk8qs/wiki/home/?edit&view&menu'>, <Page url='about:blank'>) +login = <function login.<locals>._login at 0xf59ac18d7c40> +user_a = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', project = 'pk8qs' +record_property = <function record_property.<locals>.append_property at 0xf59ac0ab7380> + + @pytest.mark.case("rejection") + def test_c4_wiki_collab_rejection(two_contexts, login, user_a, base_url, project, record_property): + """A logged-out context connecting to the wiki websocket is closed with code 4401.""" + page_a, page_anon = two_contexts + login(page_a, user_a) +> _open_editor(page_a, base_url, project) + +installer/acceptance/test_c4_wiki_collab.py:72: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/test_c4_wiki_collab.py:26: in _open_editor + page.wait_for_selector(sel.WEB["wiki_editor"], timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21403: in wait_for_selector + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:464: in wait_for_selector + return await self._main_frame.wait_for_selector( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:418: in wait_for_selector + result = await self._channel.waitForSelector( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:398: in _mapped + return mapper(await awaitable) + ^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0xf59ac1fa6ff0> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0xf59ac21d5c60> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. +E Call log: +E - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError</failure></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="64.103"><failure message="playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. Call log: - waiting for locator("iframe#mfrIframe, iframe[src*='render']") to be visible">logged_in_page = <Page url='http://127.0.0.1:5000/e9fkz/'>, project = '3eqsj' +base_url = 'http://127.0.0.1:5000' +service_url = <function service_url.<locals>._url at 0xf59ac2137e20> +tmp_pdf = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' +run_id = 'acc-20261110T052932Z-f1da54' +record_property = <function record_property.<locals>.append_property at 0xf59ac207a480> + + @pytest.mark.case("success") + def test_c5_file_preview_success(logged_in_page, project, base_url, service_url, tmp_pdf, run_id, record_property): + """An uploaded PDF renders inside the mfr iframe (mfr answers 200 for the render request).""" + page = logged_in_page + entity = upload(page.context, service_url("wb"), project, f"c5-{run_id}.pdf", tmp_pdf) + mfr = service_url("mfr") + with page.expect_response(lambda r: same_origin(r.url, mfr) and "/render" in r.url, timeout=90_000) as render: + page.goto(_file_page_url(base_url, project, entity["attributes"]["path"]), wait_until="domcontentloaded") +> page.wait_for_selector(sel.WEB["file_preview_iframe"], timeout=60_000) + +installer/acceptance/test_c5_file_preview.py:24: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21403: in wait_for_selector + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:464: in wait_for_selector + return await self._main_frame.wait_for_selector( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:418: in wait_for_selector + result = await self._channel.waitForSelector( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:398: in _mapped + return mapper(await awaitable) + ^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0xf59ac1b72d20> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0xf59ac207d440> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. +E Call log: +E - waiting for locator("iframe#mfrIframe, iframe[src*='render']") to be visible + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError</failure></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="0.133"><properties><property name="known_external_blocked" value="8" /></properties><error message="failed on teardown with "Failed: request(s) would have left the machine: ['http://localhost:7007/text.js', 'http://localhost:7007/share.js']"">request = <SubRequest 'external_guard' for <Function test_c5_file_preview_success[chromium]>> + + @pytest.fixture(autouse=True) + def external_guard(request): + """Collect the loopback-guard offenders of one test and fail it if any guard (browser, websocket, + API) saw a URL that would have left the machine. Every browser context is created by our + `new_context` below (pytest-playwright's default `context` fixture calls it too), which attaches + the guard itself; requesting `context` from here created a fixture cycle + (external_guard -> context -> new_context -> external_guard, first real acceptance run).""" + offenders: list[str] = [] + before = len(_OFFENDERS) + known_before = len(_KNOWN_EXTERNAL) + yield offenders + offenders.extend(_OFFENDERS[before:]) + request.node.user_properties.append(("known_external_blocked", len(_KNOWN_EXTERNAL) - known_before)) + if offenders: +> pytest.fail(f"request(s) would have left the machine: {offenders[:5]}") +E Failed: request(s) would have left the machine: ['http://localhost:7007/text.js', 'http://localhost:7007/share.js'] + +installer/acceptance/conftest.py:274: Failed</error></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_rejection[chromium]" time="3.588"><properties><property name="http_status" value="400" /><property name="known_external_blocked" value="4" /></properties><failure message="AssertionError: anonymous preview returned 400 assert 400 in (401, 403) + where 400 = <APIResponse url='http://127.0.0.1:7778/render?url=http://127.0.0.1:7777/v1/resources/9s8zt/providers/osfstorage/6af2acda8924f6000909d245' status=400 status_text='Bad Request'>.status">logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'>, project = '9s8zt' +service_url = <function service_url.<locals>._url at 0xf59ac2137e20> +tmp_pdf = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' +run_id = 'acc-20261110T052932Z-f1da54' +api_context = <function api_context.<locals>._new at 0xf59ac18def20> +record_property = <function record_property.<locals>.append_property at 0xf59ac1e72e80> + + @pytest.mark.case("rejection") + def test_c5_file_preview_rejection(logged_in_page, project, service_url, tmp_pdf, run_id, api_context, record_property): + """The preview URL of a private file without a session -> 401/403.""" + page = logged_in_page + wb = service_url("wb") + entity = upload(page.context, wb, project, f"c5-private-{run_id}.pdf", tmp_pdf) + file_url = download_link(entity, wb, project) + anon = api_context() + resp = anon.get(service_url("mfr") + sel.MFR["render"].format(file_url=file_url)) + record_property("http_status", resp.status) +> assert resp.status in (401, 403), f"anonymous preview returned {resp.status}" +E AssertionError: anonymous preview returned 400 +E assert 400 in (401, 403) +E + where 400 = <APIResponse url='http://127.0.0.1:7778/render?url=http://127.0.0.1:7777/v1/resources/9s8zt/providers/osfstorage/6af2acda8924f6000909d245' status=400 status_text='Bad Request'>.status + +installer/acceptance/test_c5_file_preview.py:39: AssertionError</failure></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="0.668"><properties><property name="http_status" value="404" /></properties><failure message="AssertionError: institution users page returned 404 assert (<Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>> is not None and 404 == 200) + where 404 = <Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>>.status">page = <Page url='http://127.0.0.1:8001/institutions/1/users/'> +service_url = <function service_url.<locals>._url at 0xf59ac2137e20> +admin_user = {'email': '***', 'password': '***'} +record_property = <function record_property.<locals>.append_property at 0xf59ac1e71da0> + + @pytest.mark.case("success") + def test_c6_admin_success(page, service_url, admin_user, record_property): + """The institution admin signs in to the admin app and sees the institution's user list.""" + admin_url = service_url("admin") + _admin_login(page, admin_url, admin_user) + # TODO(M2): the institution id of the seeded admin; "1" assumes the first institution created by --seed. + resp = page.goto(admin_url + sel.ADMIN["institution_users"].format(institution_id="1"), wait_until="domcontentloaded") + record_property("http_status", resp.status if resp else None) +> assert resp is not None and resp.status == 200, f"institution users page returned {resp and resp.status}" +E AssertionError: institution users page returned 404 +E assert (<Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>> is not None and 404 == 200) +E + where 404 = <Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>>.status + +installer/acceptance/test_c6_admin.py:27: AssertionError</failure></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="0.003"><properties><property name="http_status" value="404" /><property name="known_external_blocked" value="0" /></properties><error message="failed on teardown with "Failed: request(s) would have left the machine: ['http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css']"">request = <SubRequest 'external_guard' for <Function test_c6_admin_success[chromium]>> + + @pytest.fixture(autouse=True) + def external_guard(request): + """Collect the loopback-guard offenders of one test and fail it if any guard (browser, websocket, + API) saw a URL that would have left the machine. Every browser context is created by our + `new_context` below (pytest-playwright's default `context` fixture calls it too), which attaches + the guard itself; requesting `context` from here created a fixture cycle + (external_guard -> context -> new_context -> external_guard, first real acceptance run).""" + offenders: list[str] = [] + before = len(_OFFENDERS) + known_before = len(_KNOWN_EXTERNAL) + yield offenders + offenders.extend(_OFFENDERS[before:]) + request.node.user_properties.append(("known_external_blocked", len(_KNOWN_EXTERNAL) - known_before)) + if offenders: +> pytest.fail(f"request(s) would have left the machine: {offenders[:5]}") +E Failed: request(s) would have left the machine: ['http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css'] + +installer/acceptance/conftest.py:274: Failed</error></testcase><testcase classname="test_c6_admin" name="test_c6_admin_rejection[chromium]" time="2.279"><properties><property name="known_external_blocked" value="3" /></properties><failure message="AssertionError: admin screen answered 404 to an ordinary user assert 404 in (301, 302, 303, 307, 403) + where 404 = <APIResponse url='http://127.0.0.1:8001/institutions/1/users/' status=404 status_text='Not Found'>.status">logged_in_page = <Page url='http://127.0.0.1:5000/dashboard/'> +service_url = <function service_url.<locals>._url at 0xf59ac2137e20> +api_url = 'http://127.0.0.1:8000' +record_property = <function record_property.<locals>.append_property at 0xf59ac0680360> + + @pytest.mark.case("rejection") + def test_c6_admin_rejection(logged_in_page, service_url, api_url, record_property): + """An ordinary user opening the admin URL -> 403 or redirect to login; the API answers exactly 403.""" + client = api(logged_in_page.context) + admin_url = service_url("admin") + screen = client.get(admin_url + sel.ADMIN["institution_users"].format(institution_id="1"), max_redirects=0) +> assert screen.status in (301, 302, 303, 307, 403), f"admin screen answered {screen.status} to an ordinary user" +E AssertionError: admin screen answered 404 to an ordinary user +E assert 404 in (301, 302, 303, 307, 403) +E + where 404 = <APIResponse url='http://127.0.0.1:8001/institutions/1/users/' status=404 status_text='Not Found'>.status + +installer/acceptance/test_c6_admin.py:37: AssertionError</failure></testcase><testcase classname="test_c1_login" name="test_c1_login_rejection" time="0.048"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="0" /></properties></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261110T052932Z-f1da54/pytest.log b/docs/demo/runs/acc-20261110T052932Z-f1da54/pytest.log new file mode 100644 index 0000000..2d8fc8c --- /dev/null +++ b/docs/demo/runs/acc-20261110T052932Z-f1da54/pytest.log @@ -0,0 +1,376 @@ +.F...FFFEFFEF. [100%] +==================================== ERRORS ==================================== +_________ ERROR at teardown of test_c5_file_preview_success[chromium] __________ + +request = <SubRequest 'external_guard' for <Function test_c5_file_preview_success[chromium]>> + + @pytest.fixture(autouse=True) + def external_guard(request): + """Collect the loopback-guard offenders of one test and fail it if any guard (browser, websocket, + API) saw a URL that would have left the machine. Every browser context is created by our + `new_context` below (pytest-playwright's default `context` fixture calls it too), which attaches + the guard itself; requesting `context` from here created a fixture cycle + (external_guard -> context -> new_context -> external_guard, first real acceptance run).""" + offenders: list[str] = [] + before = len(_OFFENDERS) + known_before = len(_KNOWN_EXTERNAL) + yield offenders + offenders.extend(_OFFENDERS[before:]) + request.node.user_properties.append(("known_external_blocked", len(_KNOWN_EXTERNAL) - known_before)) + if offenders: +> pytest.fail(f"request(s) would have left the machine: {offenders[:5]}") +E Failed: request(s) would have left the machine: ['http://localhost:7007/text.js', 'http://localhost:7007/share.js'] + +installer/acceptance/conftest.py:274: Failed +_____________ ERROR at teardown of test_c6_admin_success[chromium] _____________ + +request = <SubRequest 'external_guard' for <Function test_c6_admin_success[chromium]>> + + @pytest.fixture(autouse=True) + def external_guard(request): + """Collect the loopback-guard offenders of one test and fail it if any guard (browser, websocket, + API) saw a URL that would have left the machine. Every browser context is created by our + `new_context` below (pytest-playwright's default `context` fixture calls it too), which attaches + the guard itself; requesting `context` from here created a fixture cycle + (external_guard -> context -> new_context -> external_guard, first real acceptance run).""" + offenders: list[str] = [] + before = len(_OFFENDERS) + known_before = len(_KNOWN_EXTERNAL) + yield offenders + offenders.extend(_OFFENDERS[before:]) + request.node.user_properties.append(("known_external_blocked", len(_KNOWN_EXTERNAL) - known_before)) + if offenders: +> pytest.fail(f"request(s) would have left the machine: {offenders[:5]}") +E Failed: request(s) would have left the machine: ['http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 'http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css'] + +installer/acceptance/conftest.py:274: Failed +=================================== FAILURES =================================== +___________________ test_c2_create_project_success[chromium] ___________________ + +logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'> +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0xf59ac21e3c40> +run_id = 'acc-20261110T052932Z-f1da54' +record_property = <function record_property.<locals>.append_property at 0xf59ac21e37e0> + + @pytest.mark.case("success") + def test_c2_create_project_success(logged_in_page, base_url, api_url, api_write, run_id, record_property): + """A new project created in the UI appears with its title and the user as admin.""" + page = logged_in_page + title = f"acceptance C2 {run_id}" + page.goto(base_url + sel.PATHS["new_project"], wait_until="domcontentloaded") + page.click(sel.WEB["create_project_button"]) +> page.fill(sel.WEB["create_project_title"], title) + +installer/acceptance/test_c2_create_project.py:18: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:17731: in fill + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:1229: in fill + return await self._main_frame.fill( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:736: in fill + return await self._channel.fill( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0xf59ac2060f80> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0xf59ac21e3ec0> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.fill: Timeout 30000ms exceeded. +E Call log: +E - waiting for locator("input#projectName, input[name='title']") + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError +____________________ test_c4_wiki_collab_success[chromium] _____________________ + +two_contexts = (<Page url='http://127.0.0.1:5000/emu7y/wiki/home/?edit&view&menu'>, <Page url='http://127.0.0.1:5000/dashboard'>) +login = <function login.<locals>._login at 0xf59ac213fb00> +user_a = {'email': '***', 'password': '***'} +user_b = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0xf59ac18d5080> +add_contributor = <function add_contributor.<locals>._add at 0xf59ac18d5580> +run_id = 'acc-20261110T052932Z-f1da54' +record_property = <function record_property.<locals>.append_property at 0xf59ac18d5e40> + + @pytest.mark.case("success") + def test_c4_wiki_collab_success(two_contexts, login, user_a, user_b, base_url, api_url, api_write, add_contributor, + run_id, record_property): + """Both users open the same wiki page; text typed by B appears in A's editor and text typed by A in B's.""" + page_a, page_b = two_contexts + login(page_a, user_a) + login(page_b, user_b) + + created = api_write(page_a.context, "POST", api_url + sel.API["nodes"], { + "data": {"type": "nodes", "attributes": {"title": "acceptance C4", "category": "project", "public": False}} + }) + assert created.status == 201, created.text()[:200] + node_id = created.json()["data"]["id"] + try: + add_contributor(page_a.context, node_id, user_id_of(page_b.context, api_url), "write") + +> resp_a = _open_editor(page_a, base_url, node_id) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c4_wiki_collab.py:53: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/test_c4_wiki_collab.py:26: in _open_editor + page.wait_for_selector(sel.WEB["wiki_editor"], timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21403: in wait_for_selector + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:464: in wait_for_selector + return await self._main_frame.wait_for_selector( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:418: in wait_for_selector + result = await self._channel.waitForSelector( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:398: in _mapped + return mapper(await awaitable) + ^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0xf59ac21fb7a0> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0xf59ac21e3f60> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. +E Call log: +E - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError +___________________ test_c4_wiki_collab_rejection[chromium] ____________________ + +two_contexts = (<Page url='http://127.0.0.1:5000/pk8qs/wiki/home/?edit&view&menu'>, <Page url='about:blank'>) +login = <function login.<locals>._login at 0xf59ac18d7c40> +user_a = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', project = 'pk8qs' +record_property = <function record_property.<locals>.append_property at 0xf59ac0ab7380> + + @pytest.mark.case("rejection") + def test_c4_wiki_collab_rejection(two_contexts, login, user_a, base_url, project, record_property): + """A logged-out context connecting to the wiki websocket is closed with code 4401.""" + page_a, page_anon = two_contexts + login(page_a, user_a) +> _open_editor(page_a, base_url, project) + +installer/acceptance/test_c4_wiki_collab.py:72: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/test_c4_wiki_collab.py:26: in _open_editor + page.wait_for_selector(sel.WEB["wiki_editor"], timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21403: in wait_for_selector + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:464: in wait_for_selector + return await self._main_frame.wait_for_selector( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:418: in wait_for_selector + result = await self._channel.waitForSelector( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:398: in _mapped + return mapper(await awaitable) + ^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0xf59ac1fa6ff0> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0xf59ac21d5c60> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. +E Call log: +E - waiting for locator(".CodeMirror textarea, textarea#editor") to be visible + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError +____________________ test_c5_file_preview_success[chromium] ____________________ + +logged_in_page = <Page url='http://127.0.0.1:5000/e9fkz/'>, project = '3eqsj' +base_url = 'http://127.0.0.1:5000' +service_url = <function service_url.<locals>._url at 0xf59ac2137e20> +tmp_pdf = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' +run_id = 'acc-20261110T052932Z-f1da54' +record_property = <function record_property.<locals>.append_property at 0xf59ac207a480> + + @pytest.mark.case("success") + def test_c5_file_preview_success(logged_in_page, project, base_url, service_url, tmp_pdf, run_id, record_property): + """An uploaded PDF renders inside the mfr iframe (mfr answers 200 for the render request).""" + page = logged_in_page + entity = upload(page.context, service_url("wb"), project, f"c5-{run_id}.pdf", tmp_pdf) + mfr = service_url("mfr") + with page.expect_response(lambda r: same_origin(r.url, mfr) and "/render" in r.url, timeout=90_000) as render: + page.goto(_file_page_url(base_url, project, entity["attributes"]["path"]), wait_until="domcontentloaded") +> page.wait_for_selector(sel.WEB["file_preview_iframe"], timeout=60_000) + +installer/acceptance/test_c5_file_preview.py:24: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21403: in wait_for_selector + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:464: in wait_for_selector + return await self._main_frame.wait_for_selector( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:418: in wait_for_selector + result = await self._channel.waitForSelector( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:398: in _mapped + return mapper(await awaitable) + ^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0xf59ac1b72d20> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0xf59ac207d440> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_selector: Timeout 60000ms exceeded. +E Call log: +E - waiting for locator("iframe#mfrIframe, iframe[src*='render']") to be visible + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError +___________________ test_c5_file_preview_rejection[chromium] ___________________ + +logged_in_page = <Page url='http://127.0.0.1:5000/dashboard'>, project = '9s8zt' +service_url = <function service_url.<locals>._url at 0xf59ac2137e20> +tmp_pdf = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' +run_id = 'acc-20261110T052932Z-f1da54' +api_context = <function api_context.<locals>._new at 0xf59ac18def20> +record_property = <function record_property.<locals>.append_property at 0xf59ac1e72e80> + + @pytest.mark.case("rejection") + def test_c5_file_preview_rejection(logged_in_page, project, service_url, tmp_pdf, run_id, api_context, record_property): + """The preview URL of a private file without a session -> 401/403.""" + page = logged_in_page + wb = service_url("wb") + entity = upload(page.context, wb, project, f"c5-private-{run_id}.pdf", tmp_pdf) + file_url = download_link(entity, wb, project) + anon = api_context() + resp = anon.get(service_url("mfr") + sel.MFR["render"].format(file_url=file_url)) + record_property("http_status", resp.status) +> assert resp.status in (401, 403), f"anonymous preview returned {resp.status}" +E AssertionError: anonymous preview returned 400 +E assert 400 in (401, 403) +E + where 400 = <APIResponse url='http://127.0.0.1:7778/render?url=http://127.0.0.1:7777/v1/resources/9s8zt/providers/osfstorage/6af2acda8924f6000909d245' status=400 status_text='Bad Request'>.status + +installer/acceptance/test_c5_file_preview.py:39: AssertionError +_______________________ test_c6_admin_success[chromium] ________________________ + +page = <Page url='http://127.0.0.1:8001/institutions/1/users/'> +service_url = <function service_url.<locals>._url at 0xf59ac2137e20> +admin_user = {'email': '***', 'password': '***'} +record_property = <function record_property.<locals>.append_property at 0xf59ac1e71da0> + + @pytest.mark.case("success") + def test_c6_admin_success(page, service_url, admin_user, record_property): + """The institution admin signs in to the admin app and sees the institution's user list.""" + admin_url = service_url("admin") + _admin_login(page, admin_url, admin_user) + # TODO(M2): the institution id of the seeded admin; "1" assumes the first institution created by --seed. + resp = page.goto(admin_url + sel.ADMIN["institution_users"].format(institution_id="1"), wait_until="domcontentloaded") + record_property("http_status", resp.status if resp else None) +> assert resp is not None and resp.status == 200, f"institution users page returned {resp and resp.status}" +E AssertionError: institution users page returned 404 +E assert (<Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>> is not None and 404 == 200) +E + where 404 = <Response url='http://127.0.0.1:8001/institutions/1/users/' request=<Request url='http://127.0.0.1:8001/institutions/1/users/' method='GET'>>.status + +installer/acceptance/test_c6_admin.py:27: AssertionError +______________________ test_c6_admin_rejection[chromium] _______________________ + +logged_in_page = <Page url='http://127.0.0.1:5000/dashboard/'> +service_url = <function service_url.<locals>._url at 0xf59ac2137e20> +api_url = 'http://127.0.0.1:8000' +record_property = <function record_property.<locals>.append_property at 0xf59ac0680360> + + @pytest.mark.case("rejection") + def test_c6_admin_rejection(logged_in_page, service_url, api_url, record_property): + """An ordinary user opening the admin URL -> 403 or redirect to login; the API answers exactly 403.""" + client = api(logged_in_page.context) + admin_url = service_url("admin") + screen = client.get(admin_url + sel.ADMIN["institution_users"].format(institution_id="1"), max_redirects=0) +> assert screen.status in (301, 302, 303, 307, 403), f"admin screen answered {screen.status} to an ordinary user" +E AssertionError: admin screen answered 404 to an ordinary user +E assert 404 in (301, 302, 303, 307, 403) +E + where 404 = <APIResponse url='http://127.0.0.1:8001/institutions/1/users/' status=404 status_text='Not Found'>.status + +installer/acceptance/test_c6_admin.py:37: AssertionError +=============================== warnings summary =============================== +test_c1_login.py::test_c1_login_success[chromium] + test_c1_login.py:10: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_success[chromium] + test_c2_create_project.py:11: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_rejection[chromium] + test_c2_create_project.py:39: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_success[chromium] + test_c3_file_upload.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] + test_c3_file_upload.py:43: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:37: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] + test_c4_wiki_collab.py:67: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_success[chromium] + test_c5_file_preview.py:16: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] + test_c5_file_preview.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_success[chromium] + test_c6_admin.py:19: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_rejection[chromium] + test_c6_admin.py:31: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c1_login.py::test_c1_login_rejection + test_c1_login.py:20: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +=========================== short test summary info ============================ +ERROR installer/acceptance/test_c5_file_preview.py::test_c5_file_preview_success[chromium] +ERROR installer/acceptance/test_c6_admin.py::test_c6_admin_success[chromium] +FAILED installer/acceptance/test_c2_create_project.py::test_c2_create_project_success[chromium] +FAILED installer/acceptance/test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] +FAILED installer/acceptance/test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] +FAILED installer/acceptance/test_c5_file_preview.py::test_c5_file_preview_success[chromium] +FAILED installer/acceptance/test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] +FAILED installer/acceptance/test_c6_admin.py::test_c6_admin_success[chromium] +FAILED installer/acceptance/test_c6_admin.py::test_c6_admin_rejection[chromium] +7 failed, 5 passed, 10 deselected, 12 warnings, 2 errors in 278.88s (0:04:38) diff --git a/docs/demo/runs/acc-20261110T052932Z-f1da54/results.json b/docs/demo/runs/acc-20261110T052932Z-f1da54/results.json new file mode 100644 index 0000000..a81d197 --- /dev/null +++ b/docs/demo/runs/acc-20261110T052932Z-f1da54/results.json @@ -0,0 +1,167 @@ +{ + "run_id": "acc-20261110T052932Z-f1da54", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-10T05:29:32Z", + "duration_ms": 292743, + "only": "core", + "seeded": true, + "precheck": { + "healthy": true, + "services": 24 + }, + "pytest_returncode": 1, + "evidence_dir": "docs/demo/runs/acc-20261110T052932Z-f1da54", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C1", + "C2", + "C3", + "C4", + "C5", + "C6" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 5, + "failed": 5, + "error": 2, + "skipped": 0, + "total": 12, + "known_external_blocked": 75 + }, + "tests": [ + { + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "test": "test_c1_login_success[chromium]", + "status": "passed", + "duration_ms": 5626, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C2", + "name": "Create project", + "case": "success", + "test": "test_c2_create_project_success[chromium]", + "status": "failed", + "duration_ms": 34432, + "http_status": null, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C2", + "name": "Create project", + "case": "rejection", + "test": "test_c2_create_project_rejection[chromium]", + "status": "passed", + "duration_ms": 5452, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "success", + "test": "test_c3_file_upload_success[chromium]", + "status": "passed", + "duration_ms": 13162, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "test": "test_c3_file_upload_rejection[chromium]", + "status": "passed", + "duration_ms": 15381, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "failed", + "duration_ms": 66597, + "http_status": null, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "failed", + "duration_ms": 66844, + "http_status": null, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C5", + "name": "File preview", + "case": "success", + "test": "test_c5_file_preview_success[chromium]", + "status": "error", + "duration_ms": 64234, + "http_status": null, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C5", + "name": "File preview", + "case": "rejection", + "test": "test_c5_file_preview_rejection[chromium]", + "status": "failed", + "duration_ms": 3587, + "http_status": 400, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "test": "test_c6_admin_success[chromium]", + "status": "error", + "duration_ms": 670, + "http_status": 404, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "test": "test_c6_admin_rejection[chromium]", + "status": "failed", + "duration_ms": 2277, + "http_status": null, + "evidence": null, + "known_external_blocked": 3 + }, + { + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "test": "test_c1_login_rejection", + "status": "passed", + "duration_ms": 47, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261110T052932Z-f1da54/results.toon b/docs/demo/runs/acc-20261110T052932Z-f1da54/results.toon new file mode 100644 index 0000000..1f7e559 --- /dev/null +++ b/docs/demo/runs/acc-20261110T052932Z-f1da54/results.toon @@ -0,0 +1,42 @@ +accept: + run_id: acc-20261110T052932Z-f1da54 + base_url: "http://127.0.0.1:5000" + started: "2026-11-10T05:29:32Z" + duration_ms: 292743 + only: core + seeded: true + precheck: + healthy: true + services: 24 + pytest_returncode: 1 + evidence_dir: docs/demo/runs/acc-20261110T052932Z-f1da54 + tracing: off + trace_quarantine: null + expected_scenarios[6]: + - C1 + - C2 + - C3 + - C4 + - C5 + - C6 + incomplete_scenarios[0]: + summary: + passed: 5 + failed: 5 + error: 2 + skipped: 0 + total: 12 + known_external_blocked: 75 + tests[12]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C1,Login via fakecas,success,"test_c1_login_success[chromium]",passed,5626,200,null,7 + C2,Create project,success,"test_c2_create_project_success[chromium]",failed,34432,null,null,7 + C2,Create project,rejection,"test_c2_create_project_rejection[chromium]",passed,5452,403,null,8 + C3,Upload and download file,success,"test_c3_file_upload_success[chromium]",passed,13162,200,null,4 + C3,Upload and download file,rejection,"test_c3_file_upload_rejection[chromium]",passed,15381,403,null,8 + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",failed,66597,null,null,13 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",failed,66844,null,null,13 + C5,File preview,success,"test_c5_file_preview_success[chromium]",error,64234,null,null,8 + C5,File preview,rejection,"test_c5_file_preview_rejection[chromium]",failed,3587,400,null,4 + C6,Institution admin screen,success,"test_c6_admin_success[chromium]",error,670,404,null,0 + C6,Institution admin screen,rejection,"test_c6_admin_rejection[chromium]",failed,2277,null,null,3 + C1,Login via fakecas,rejection,test_c1_login_rejection,passed,47,401,null,0 diff --git a/docs/demo/runs/acc-20261110T060511Z-80ee06/collector.json b/docs/demo/runs/acc-20261110T060511Z-80ee06/collector.json new file mode 100644 index 0000000..a2bab7f --- /dev/null +++ b/docs/demo/runs/acc-20261110T060511Z-80ee06/collector.json @@ -0,0 +1,134 @@ +[ + { + "nodeid": "test_c1_login.py::test_c1_login_success[chromium]", + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "status": "passed", + "duration_ms": 6656, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_success[chromium]", + "id": "C2", + "name": "Create project", + "case": "success", + "status": "passed", + "duration_ms": 8540, + "http_status": 200, + "evidence": null, + "known_external_blocked": 14 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_rejection[chromium]", + "id": "C2", + "name": "Create project", + "case": "rejection", + "status": "passed", + "duration_ms": 5779, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "success", + "status": "passed", + "duration_ms": 9143, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "status": "passed", + "duration_ms": 11009, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "passed", + "duration_ms": 12032, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 9106, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_success[chromium]", + "id": "C5", + "name": "File preview", + "case": "success", + "status": "passed", + "duration_ms": 10892, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_rejection[chromium]", + "id": "C5", + "name": "File preview", + "case": "rejection", + "status": "passed", + "duration_ms": 3912, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_success[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "status": "passed", + "duration_ms": 1061, + "http_status": 200, + "evidence": null, + "known_external_blocked": 5 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_rejection[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "status": "passed", + "duration_ms": 2442, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "nodeid": "test_c1_login.py::test_c1_login_rejection", + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "status": "passed", + "duration_ms": 49, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261110T060511Z-80ee06/junit.xml b/docs/demo/runs/acc-20261110T060511Z-80ee06/junit.xml new file mode 100644 index 0000000..d58be98 --- /dev/null +++ b/docs/demo/runs/acc-20261110T060511Z-80ee06/junit.xml @@ -0,0 +1 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="12" time="80.700" timestamp="2026-11-10T15:05:29.743559+09:00" hostname="redacted-host"><testcase classname="test_c1_login" name="test_c1_login_success[chromium]" time="6.657"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="7" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_success[chromium]" time="8.541"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="14" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_rejection[chromium]" time="5.781"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_success[chromium]" time="9.145"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="4" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_rejection[chromium]" time="11.011"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="12.033"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="18" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="9.108"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="13" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="10.894"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_rejection[chromium]" time="3.913"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="1.062"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="5" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_rejection[chromium]" time="2.443"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="3" /></properties></testcase><testcase classname="test_c1_login" name="test_c1_login_rejection" time="0.051"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="0" /></properties></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261110T060511Z-80ee06/pytest.log b/docs/demo/runs/acc-20261110T060511Z-80ee06/pytest.log new file mode 100644 index 0000000..3630ca3 --- /dev/null +++ b/docs/demo/runs/acc-20261110T060511Z-80ee06/pytest.log @@ -0,0 +1,40 @@ +............ [100%] +=============================== warnings summary =============================== +test_c1_login.py::test_c1_login_success[chromium] + test_c1_login.py:10: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_success[chromium] + test_c2_create_project.py:11: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_rejection[chromium] + test_c2_create_project.py:39: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_success[chromium] + test_c3_file_upload.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] + test_c3_file_upload.py:43: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:55: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] + test_c4_wiki_collab.py:85: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_success[chromium] + test_c5_file_preview.py:16: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] + test_c5_file_preview.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_success[chromium] + test_c6_admin.py:28: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_rejection[chromium] + test_c6_admin.py:48: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c1_login.py::test_c1_login_rejection + test_c1_login.py:20: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +12 passed, 10 deselected, 12 warnings in 80.70s (0:01:20) diff --git a/docs/demo/runs/acc-20261110T060511Z-80ee06/results.json b/docs/demo/runs/acc-20261110T060511Z-80ee06/results.json new file mode 100644 index 0000000..aa62276 --- /dev/null +++ b/docs/demo/runs/acc-20261110T060511Z-80ee06/results.json @@ -0,0 +1,167 @@ +{ + "run_id": "acc-20261110T060511Z-80ee06", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-10T06:05:11Z", + "duration_ms": 102835, + "only": "core", + "seeded": true, + "precheck": { + "healthy": true, + "services": 24 + }, + "pytest_returncode": 0, + "evidence_dir": "docs/demo/runs/acc-20261110T060511Z-80ee06", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C1", + "C2", + "C3", + "C4", + "C5", + "C6" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 12, + "failed": 0, + "error": 0, + "skipped": 0, + "total": 12, + "known_external_blocked": 98 + }, + "tests": [ + { + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "test": "test_c1_login_success[chromium]", + "status": "passed", + "duration_ms": 6656, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C2", + "name": "Create project", + "case": "success", + "test": "test_c2_create_project_success[chromium]", + "status": "passed", + "duration_ms": 8540, + "http_status": 200, + "evidence": null, + "known_external_blocked": 14 + }, + { + "id": "C2", + "name": "Create project", + "case": "rejection", + "test": "test_c2_create_project_rejection[chromium]", + "status": "passed", + "duration_ms": 5779, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "success", + "test": "test_c3_file_upload_success[chromium]", + "status": "passed", + "duration_ms": 9143, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "test": "test_c3_file_upload_rejection[chromium]", + "status": "passed", + "duration_ms": 11009, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "passed", + "duration_ms": 12032, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "passed", + "duration_ms": 9106, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C5", + "name": "File preview", + "case": "success", + "test": "test_c5_file_preview_success[chromium]", + "status": "passed", + "duration_ms": 10892, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C5", + "name": "File preview", + "case": "rejection", + "test": "test_c5_file_preview_rejection[chromium]", + "status": "passed", + "duration_ms": 3912, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "test": "test_c6_admin_success[chromium]", + "status": "passed", + "duration_ms": 1061, + "http_status": 200, + "evidence": null, + "known_external_blocked": 5 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "test": "test_c6_admin_rejection[chromium]", + "status": "passed", + "duration_ms": 2442, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "test": "test_c1_login_rejection", + "status": "passed", + "duration_ms": 49, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261110T060511Z-80ee06/results.toon b/docs/demo/runs/acc-20261110T060511Z-80ee06/results.toon new file mode 100644 index 0000000..33db2f2 --- /dev/null +++ b/docs/demo/runs/acc-20261110T060511Z-80ee06/results.toon @@ -0,0 +1,42 @@ +accept: + run_id: acc-20261110T060511Z-80ee06 + base_url: "http://127.0.0.1:5000" + started: "2026-11-10T06:05:11Z" + duration_ms: 102835 + only: core + seeded: true + precheck: + healthy: true + services: 24 + pytest_returncode: 0 + evidence_dir: docs/demo/runs/acc-20261110T060511Z-80ee06 + tracing: off + trace_quarantine: null + expected_scenarios[6]: + - C1 + - C2 + - C3 + - C4 + - C5 + - C6 + incomplete_scenarios[0]: + summary: + passed: 12 + failed: 0 + error: 0 + skipped: 0 + total: 12 + known_external_blocked: 98 + tests[12]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C1,Login via fakecas,success,"test_c1_login_success[chromium]",passed,6656,200,null,7 + C2,Create project,success,"test_c2_create_project_success[chromium]",passed,8540,200,null,14 + C2,Create project,rejection,"test_c2_create_project_rejection[chromium]",passed,5779,403,null,8 + C3,Upload and download file,success,"test_c3_file_upload_success[chromium]",passed,9143,200,null,4 + C3,Upload and download file,rejection,"test_c3_file_upload_rejection[chromium]",passed,11009,403,null,8 + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",passed,12032,200,null,18 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",passed,9106,4401,null,13 + C5,File preview,success,"test_c5_file_preview_success[chromium]",passed,10892,200,null,9 + C5,File preview,rejection,"test_c5_file_preview_rejection[chromium]",passed,3912,401,null,9 + C6,Institution admin screen,success,"test_c6_admin_success[chromium]",passed,1061,200,null,5 + C6,Institution admin screen,rejection,"test_c6_admin_rejection[chromium]",passed,2442,403,null,3 + C1,Login via fakecas,rejection,test_c1_login_rejection,passed,49,401,null,0 diff --git a/docs/demo/runs/acc-20261111T115949Z-ab529c/collector.json b/docs/demo/runs/acc-20261111T115949Z-ab529c/collector.json new file mode 100644 index 0000000..dec8eee --- /dev/null +++ b/docs/demo/runs/acc-20261111T115949Z-ab529c/collector.json @@ -0,0 +1,134 @@ +[ + { + "nodeid": "test_c1_login.py::test_c1_login_success[chromium]", + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "status": "passed", + "duration_ms": 8565, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_success[chromium]", + "id": "C2", + "name": "Create project", + "case": "success", + "status": "passed", + "duration_ms": 10287, + "http_status": 200, + "evidence": null, + "known_external_blocked": 14 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_rejection[chromium]", + "id": "C2", + "name": "Create project", + "case": "rejection", + "status": "passed", + "duration_ms": 8446, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "success", + "status": "passed", + "duration_ms": 4916, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "status": "passed", + "duration_ms": 7180, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "passed", + "duration_ms": 11544, + "http_status": 200, + "evidence": null, + "known_external_blocked": 19 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 7735, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_success[chromium]", + "id": "C5", + "name": "File preview", + "case": "success", + "status": "failed", + "duration_ms": 7090, + "http_status": 400, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_rejection[chromium]", + "id": "C5", + "name": "File preview", + "case": "rejection", + "status": "passed", + "duration_ms": 6540, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_success[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "status": "passed", + "duration_ms": 1292, + "http_status": 200, + "evidence": null, + "known_external_blocked": 5 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_rejection[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "status": "passed", + "duration_ms": 2388, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "nodeid": "test_c1_login.py::test_c1_login_rejection", + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "status": "passed", + "duration_ms": 148, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261111T115949Z-ab529c/junit.xml b/docs/demo/runs/acc-20261111T115949Z-ab529c/junit.xml new file mode 100644 index 0000000..6e13fa3 --- /dev/null +++ b/docs/demo/runs/acc-20261111T115949Z-ab529c/junit.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="0" failures="1" skipped="0" tests="12" time="76.223" timestamp="2026-11-11T21:00:12.051983+09:00" hostname="redacted-host"><testcase classname="test_c1_login" name="test_c1_login_success[chromium]" time="8.566"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="7" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_success[chromium]" time="10.289"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="14" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_rejection[chromium]" time="8.448"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_success[chromium]" time="4.918"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="4" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_rejection[chromium]" time="7.182"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="11.546"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="19" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="7.735"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="13" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="7.091"><properties><property name="http_status" value="400" /><property name="known_external_blocked" value="9" /></properties><failure message="AssertionError: mfr render returned 400 assert 400 == 200 + where 400 = <Response url='http://127.0.0.1:7778/render?url=http://web:5000/fwk3d/?direct%26mode=render%26action=download%26public...Title=OSF%20%7C%20c5-acc-20261111T115949Z-ab529c.pdf&parentUrl=http%3A%2F%2F127.0.0.1%3A5000%2Ffwk3d%2F' method='GET'>>.status [+1 more line; full report in element text]">logged_in_page = <Page url='http://127.0.0.1:5000/fwk3d/'>, project = 'q4j2x' +base_url = 'http://127.0.0.1:5000' +service_url = <function service_url.<locals>._url at 0x10b6e1220> +tmp_pdf = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' +run_id = 'acc-20261111T115949Z-ab529c' +record_property = <function record_property.<locals>.append_property at 0x10bdc8510> + + @pytest.mark.case("success") + def test_c5_file_preview_success(logged_in_page, project, base_url, service_url, tmp_pdf, run_id, record_property): + """An uploaded PDF renders inside the mfr iframe (mfr answers 200 for the render request).""" + page = logged_in_page + entity = upload(page.context, service_url("wb"), project, f"c5-{run_id}.pdf", tmp_pdf) + mfr = service_url("mfr") + with page.expect_response(lambda r: same_origin(r.url, mfr) and "/render" in r.url, timeout=90_000) as render: + page.goto(_file_page_url(base_url, project, entity["attributes"]["path"]), wait_until="domcontentloaded") + page.wait_for_selector(sel.WEB["file_preview_iframe"], timeout=60_000) + record_property("http_status", render.value.status) +> assert render.value.status == 200, f"mfr render returned {render.value.status}" +E AssertionError: mfr render returned 400 +E assert 400 == 200 +E + where 400 = <Response url='http://127.0.0.1:7778/render?url=http://web:5000/fwk3d/?direct%26mode=render%26action=download%26public...Title=OSF%20%7C%20c5-acc-20261111T115949Z-ab529c.pdf&parentUrl=http%3A%2F%2F127.0.0.1%3A5000%2Ffwk3d%2F' method='GET'>>.status +E + where <Response url='http://127.0.0.1:7778/render?url=http://web:5000/fwk3d/?direct%26mode=render%26action=download%26public...Title=OSF%20%7C%20c5-acc-20261111T115949Z-ab529c.pdf&parentUrl=http%3A%2F%2F127.0.0.1%3A5000%2Ffwk3d%2F' method='GET'>> = <playwright._impl._sync_base.EventInfo object at 0x10b7670e0>.value + +installer/acceptance/test_c5_file_preview.py:26: AssertionError</failure></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_rejection[chromium]" time="6.543"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="1.293"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="5" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_rejection[chromium]" time="2.390"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="3" /></properties></testcase><testcase classname="test_c1_login" name="test_c1_login_rejection" time="0.149"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="0" /></properties></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261111T115949Z-ab529c/pytest.log b/docs/demo/runs/acc-20261111T115949Z-ab529c/pytest.log new file mode 100644 index 0000000..06c7fca --- /dev/null +++ b/docs/demo/runs/acc-20261111T115949Z-ab529c/pytest.log @@ -0,0 +1,69 @@ +.......F.... [100%] +=================================== FAILURES =================================== +____________________ test_c5_file_preview_success[chromium] ____________________ + +logged_in_page = <Page url='http://127.0.0.1:5000/fwk3d/'>, project = 'q4j2x' +base_url = 'http://127.0.0.1:5000' +service_url = <function service_url.<locals>._url at 0x10b6e1220> +tmp_pdf = b'%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Ty...%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n' +run_id = 'acc-20261111T115949Z-ab529c' +record_property = <function record_property.<locals>.append_property at 0x10bdc8510> + + @pytest.mark.case("success") + def test_c5_file_preview_success(logged_in_page, project, base_url, service_url, tmp_pdf, run_id, record_property): + """An uploaded PDF renders inside the mfr iframe (mfr answers 200 for the render request).""" + page = logged_in_page + entity = upload(page.context, service_url("wb"), project, f"c5-{run_id}.pdf", tmp_pdf) + mfr = service_url("mfr") + with page.expect_response(lambda r: same_origin(r.url, mfr) and "/render" in r.url, timeout=90_000) as render: + page.goto(_file_page_url(base_url, project, entity["attributes"]["path"]), wait_until="domcontentloaded") + page.wait_for_selector(sel.WEB["file_preview_iframe"], timeout=60_000) + record_property("http_status", render.value.status) +> assert render.value.status == 200, f"mfr render returned {render.value.status}" +E AssertionError: mfr render returned 400 +E assert 400 == 200 +E + where 400 = <Response url='http://127.0.0.1:7778/render?url=http://web:5000/fwk3d/?direct%26mode=render%26action=download%26public...Title=OSF%20%7C%20c5-acc-20261111T115949Z-ab529c.pdf&parentUrl=http%3A%2F%2F127.0.0.1%3A5000%2Ffwk3d%2F' method='GET'>>.status +E + where <Response url='http://127.0.0.1:7778/render?url=http://web:5000/fwk3d/?direct%26mode=render%26action=download%26public...Title=OSF%20%7C%20c5-acc-20261111T115949Z-ab529c.pdf&parentUrl=http%3A%2F%2F127.0.0.1%3A5000%2Ffwk3d%2F' method='GET'>> = <playwright._impl._sync_base.EventInfo object at 0x10b7670e0>.value + +installer/acceptance/test_c5_file_preview.py:26: AssertionError +=============================== warnings summary =============================== +test_c1_login.py::test_c1_login_success[chromium] + test_c1_login.py:10: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_success[chromium] + test_c2_create_project.py:11: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_rejection[chromium] + test_c2_create_project.py:39: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_success[chromium] + test_c3_file_upload.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] + test_c3_file_upload.py:43: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:55: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] + test_c4_wiki_collab.py:85: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_success[chromium] + test_c5_file_preview.py:16: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] + test_c5_file_preview.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_success[chromium] + test_c6_admin.py:28: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_rejection[chromium] + test_c6_admin.py:48: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c1_login.py::test_c1_login_rejection + test_c1_login.py:20: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +=========================== short test summary info ============================ +FAILED installer/acceptance/test_c5_file_preview.py::test_c5_file_preview_success[chromium] +1 failed, 11 passed, 10 deselected, 12 warnings in 76.22s (0:01:16) diff --git a/docs/demo/runs/acc-20261111T115949Z-ab529c/results.json b/docs/demo/runs/acc-20261111T115949Z-ab529c/results.json new file mode 100644 index 0000000..bf61768 --- /dev/null +++ b/docs/demo/runs/acc-20261111T115949Z-ab529c/results.json @@ -0,0 +1,167 @@ +{ + "run_id": "acc-20261111T115949Z-ab529c", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-11T11:59:49Z", + "duration_ms": 102885, + "only": "core", + "seeded": true, + "precheck": { + "healthy": true, + "services": 24 + }, + "pytest_returncode": 1, + "evidence_dir": "docs/demo/runs/acc-20261111T115949Z-ab529c", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C1", + "C2", + "C3", + "C4", + "C5", + "C6" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 11, + "failed": 1, + "error": 0, + "skipped": 0, + "total": 12, + "known_external_blocked": 99 + }, + "tests": [ + { + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "test": "test_c1_login_success[chromium]", + "status": "passed", + "duration_ms": 8565, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C2", + "name": "Create project", + "case": "success", + "test": "test_c2_create_project_success[chromium]", + "status": "passed", + "duration_ms": 10287, + "http_status": 200, + "evidence": null, + "known_external_blocked": 14 + }, + { + "id": "C2", + "name": "Create project", + "case": "rejection", + "test": "test_c2_create_project_rejection[chromium]", + "status": "passed", + "duration_ms": 8446, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "success", + "test": "test_c3_file_upload_success[chromium]", + "status": "passed", + "duration_ms": 4916, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "test": "test_c3_file_upload_rejection[chromium]", + "status": "passed", + "duration_ms": 7180, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "passed", + "duration_ms": 11544, + "http_status": 200, + "evidence": null, + "known_external_blocked": 19 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "passed", + "duration_ms": 7735, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C5", + "name": "File preview", + "case": "success", + "test": "test_c5_file_preview_success[chromium]", + "status": "failed", + "duration_ms": 7090, + "http_status": 400, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C5", + "name": "File preview", + "case": "rejection", + "test": "test_c5_file_preview_rejection[chromium]", + "status": "passed", + "duration_ms": 6540, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "test": "test_c6_admin_success[chromium]", + "status": "passed", + "duration_ms": 1292, + "http_status": 200, + "evidence": null, + "known_external_blocked": 5 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "test": "test_c6_admin_rejection[chromium]", + "status": "passed", + "duration_ms": 2388, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "test": "test_c1_login_rejection", + "status": "passed", + "duration_ms": 148, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261111T115949Z-ab529c/results.toon b/docs/demo/runs/acc-20261111T115949Z-ab529c/results.toon new file mode 100644 index 0000000..d975ab4 --- /dev/null +++ b/docs/demo/runs/acc-20261111T115949Z-ab529c/results.toon @@ -0,0 +1,42 @@ +accept: + run_id: acc-20261111T115949Z-ab529c + base_url: "http://127.0.0.1:5000" + started: "2026-11-11T11:59:49Z" + duration_ms: 102885 + only: core + seeded: true + precheck: + healthy: true + services: 24 + pytest_returncode: 1 + evidence_dir: docs/demo/runs/acc-20261111T115949Z-ab529c + tracing: off + trace_quarantine: null + expected_scenarios[6]: + - C1 + - C2 + - C3 + - C4 + - C5 + - C6 + incomplete_scenarios[0]: + summary: + passed: 11 + failed: 1 + error: 0 + skipped: 0 + total: 12 + known_external_blocked: 99 + tests[12]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C1,Login via fakecas,success,"test_c1_login_success[chromium]",passed,8565,200,null,7 + C2,Create project,success,"test_c2_create_project_success[chromium]",passed,10287,200,null,14 + C2,Create project,rejection,"test_c2_create_project_rejection[chromium]",passed,8446,403,null,8 + C3,Upload and download file,success,"test_c3_file_upload_success[chromium]",passed,4916,200,null,4 + C3,Upload and download file,rejection,"test_c3_file_upload_rejection[chromium]",passed,7180,403,null,8 + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",passed,11544,200,null,19 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",passed,7735,4401,null,13 + C5,File preview,success,"test_c5_file_preview_success[chromium]",failed,7090,400,null,9 + C5,File preview,rejection,"test_c5_file_preview_rejection[chromium]",passed,6540,401,null,9 + C6,Institution admin screen,success,"test_c6_admin_success[chromium]",passed,1292,200,null,5 + C6,Institution admin screen,rejection,"test_c6_admin_rejection[chromium]",passed,2388,403,null,3 + C1,Login via fakecas,rejection,test_c1_login_rejection,passed,148,401,null,0 diff --git a/docs/demo/runs/acc-20261111T132104Z-530071/collector.json b/docs/demo/runs/acc-20261111T132104Z-530071/collector.json new file mode 100644 index 0000000..3de877f --- /dev/null +++ b/docs/demo/runs/acc-20261111T132104Z-530071/collector.json @@ -0,0 +1,134 @@ +[ + { + "nodeid": "test_c1_login.py::test_c1_login_success[chromium]", + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "status": "passed", + "duration_ms": 5939, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_success[chromium]", + "id": "C2", + "name": "Create project", + "case": "success", + "status": "passed", + "duration_ms": 9424, + "http_status": 200, + "evidence": null, + "known_external_blocked": 14 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_rejection[chromium]", + "id": "C2", + "name": "Create project", + "case": "rejection", + "status": "passed", + "duration_ms": 7866, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "success", + "status": "passed", + "duration_ms": 4684, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "status": "passed", + "duration_ms": 7268, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "passed", + "duration_ms": 11838, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 7668, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_success[chromium]", + "id": "C5", + "name": "File preview", + "case": "success", + "status": "passed", + "duration_ms": 7131, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_rejection[chromium]", + "id": "C5", + "name": "File preview", + "case": "rejection", + "status": "passed", + "duration_ms": 6259, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_success[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "status": "passed", + "duration_ms": 1427, + "http_status": 200, + "evidence": null, + "known_external_blocked": 5 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_rejection[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "status": "passed", + "duration_ms": 2467, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "nodeid": "test_c1_login.py::test_c1_login_rejection", + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "status": "passed", + "duration_ms": 175, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261111T132104Z-530071/junit.xml b/docs/demo/runs/acc-20261111T132104Z-530071/junit.xml new file mode 100644 index 0000000..f145ac5 --- /dev/null +++ b/docs/demo/runs/acc-20261111T132104Z-530071/junit.xml @@ -0,0 +1 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="12" time="72.219" timestamp="2026-11-11T22:21:25.166549+09:00" hostname="redacted-host"><testcase classname="test_c1_login" name="test_c1_login_success[chromium]" time="5.940"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="7" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_success[chromium]" time="9.425"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="14" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_rejection[chromium]" time="7.868"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_success[chromium]" time="4.685"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="4" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_rejection[chromium]" time="7.269"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="11.840"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="18" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="7.670"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="13" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="7.133"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_rejection[chromium]" time="6.260"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="1.428"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="5" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_rejection[chromium]" time="2.469"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="3" /></properties></testcase><testcase classname="test_c1_login" name="test_c1_login_rejection" time="0.176"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="0" /></properties></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261111T132104Z-530071/pytest.log b/docs/demo/runs/acc-20261111T132104Z-530071/pytest.log new file mode 100644 index 0000000..804da91 --- /dev/null +++ b/docs/demo/runs/acc-20261111T132104Z-530071/pytest.log @@ -0,0 +1,40 @@ +............ [100%] +=============================== warnings summary =============================== +test_c1_login.py::test_c1_login_success[chromium] + test_c1_login.py:10: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_success[chromium] + test_c2_create_project.py:11: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_rejection[chromium] + test_c2_create_project.py:39: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_success[chromium] + test_c3_file_upload.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] + test_c3_file_upload.py:43: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:55: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] + test_c4_wiki_collab.py:85: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_success[chromium] + test_c5_file_preview.py:16: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] + test_c5_file_preview.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_success[chromium] + test_c6_admin.py:28: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_rejection[chromium] + test_c6_admin.py:48: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c1_login.py::test_c1_login_rejection + test_c1_login.py:20: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +12 passed, 10 deselected, 12 warnings in 72.21s (0:01:12) diff --git a/docs/demo/runs/acc-20261111T132104Z-530071/results.json b/docs/demo/runs/acc-20261111T132104Z-530071/results.json new file mode 100644 index 0000000..b5ed725 --- /dev/null +++ b/docs/demo/runs/acc-20261111T132104Z-530071/results.json @@ -0,0 +1,167 @@ +{ + "run_id": "acc-20261111T132104Z-530071", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-11T13:21:04Z", + "duration_ms": 97331, + "only": "core", + "seeded": true, + "precheck": { + "healthy": true, + "services": 24 + }, + "pytest_returncode": 0, + "evidence_dir": "docs/demo/runs/acc-20261111T132104Z-530071", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C1", + "C2", + "C3", + "C4", + "C5", + "C6" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 12, + "failed": 0, + "error": 0, + "skipped": 0, + "total": 12, + "known_external_blocked": 98 + }, + "tests": [ + { + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "test": "test_c1_login_success[chromium]", + "status": "passed", + "duration_ms": 5939, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C2", + "name": "Create project", + "case": "success", + "test": "test_c2_create_project_success[chromium]", + "status": "passed", + "duration_ms": 9424, + "http_status": 200, + "evidence": null, + "known_external_blocked": 14 + }, + { + "id": "C2", + "name": "Create project", + "case": "rejection", + "test": "test_c2_create_project_rejection[chromium]", + "status": "passed", + "duration_ms": 7866, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "success", + "test": "test_c3_file_upload_success[chromium]", + "status": "passed", + "duration_ms": 4684, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "test": "test_c3_file_upload_rejection[chromium]", + "status": "passed", + "duration_ms": 7268, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "passed", + "duration_ms": 11838, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "passed", + "duration_ms": 7668, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C5", + "name": "File preview", + "case": "success", + "test": "test_c5_file_preview_success[chromium]", + "status": "passed", + "duration_ms": 7131, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C5", + "name": "File preview", + "case": "rejection", + "test": "test_c5_file_preview_rejection[chromium]", + "status": "passed", + "duration_ms": 6259, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "test": "test_c6_admin_success[chromium]", + "status": "passed", + "duration_ms": 1427, + "http_status": 200, + "evidence": null, + "known_external_blocked": 5 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "test": "test_c6_admin_rejection[chromium]", + "status": "passed", + "duration_ms": 2467, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "test": "test_c1_login_rejection", + "status": "passed", + "duration_ms": 175, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261111T132104Z-530071/results.toon b/docs/demo/runs/acc-20261111T132104Z-530071/results.toon new file mode 100644 index 0000000..d7c86d8 --- /dev/null +++ b/docs/demo/runs/acc-20261111T132104Z-530071/results.toon @@ -0,0 +1,42 @@ +accept: + run_id: acc-20261111T132104Z-530071 + base_url: "http://127.0.0.1:5000" + started: "2026-11-11T13:21:04Z" + duration_ms: 97331 + only: core + seeded: true + precheck: + healthy: true + services: 24 + pytest_returncode: 0 + evidence_dir: docs/demo/runs/acc-20261111T132104Z-530071 + tracing: off + trace_quarantine: null + expected_scenarios[6]: + - C1 + - C2 + - C3 + - C4 + - C5 + - C6 + incomplete_scenarios[0]: + summary: + passed: 12 + failed: 0 + error: 0 + skipped: 0 + total: 12 + known_external_blocked: 98 + tests[12]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C1,Login via fakecas,success,"test_c1_login_success[chromium]",passed,5939,200,null,7 + C2,Create project,success,"test_c2_create_project_success[chromium]",passed,9424,200,null,14 + C2,Create project,rejection,"test_c2_create_project_rejection[chromium]",passed,7866,403,null,8 + C3,Upload and download file,success,"test_c3_file_upload_success[chromium]",passed,4684,200,null,4 + C3,Upload and download file,rejection,"test_c3_file_upload_rejection[chromium]",passed,7268,403,null,8 + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",passed,11838,200,null,18 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",passed,7668,4401,null,13 + C5,File preview,success,"test_c5_file_preview_success[chromium]",passed,7131,200,null,9 + C5,File preview,rejection,"test_c5_file_preview_rejection[chromium]",passed,6259,401,null,9 + C6,Institution admin screen,success,"test_c6_admin_success[chromium]",passed,1427,200,null,5 + C6,Institution admin screen,rejection,"test_c6_admin_rejection[chromium]",passed,2467,403,null,3 + C1,Login via fakecas,rejection,test_c1_login_rejection,passed,175,401,null,0 diff --git a/docs/demo/runs/acc-20261111T230217Z-d8363c/collector.json b/docs/demo/runs/acc-20261111T230217Z-d8363c/collector.json new file mode 100644 index 0000000..17e5c60 --- /dev/null +++ b/docs/demo/runs/acc-20261111T230217Z-d8363c/collector.json @@ -0,0 +1,156 @@ +[ + { + "nodeid": "test_c1_login.py::test_c1_login_success[chromium]", + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "status": "passed", + "duration_ms": 1539, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_success[chromium]", + "id": "C2", + "name": "Create project", + "case": "success", + "status": "passed", + "duration_ms": 3778, + "http_status": 200, + "evidence": null, + "known_external_blocked": 16 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_rejection[chromium]", + "id": "C2", + "name": "Create project", + "case": "rejection", + "status": "passed", + "duration_ms": 3660, + "http_status": 403, + "evidence": null, + "known_external_blocked": 10 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "success", + "status": "passed", + "duration_ms": 2669, + "http_status": 200, + "evidence": null, + "known_external_blocked": 5 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "status": "passed", + "duration_ms": 3852, + "http_status": 403, + "evidence": null, + "known_external_blocked": 10 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "passed", + "duration_ms": 6925, + "http_status": 200, + "evidence": null, + "known_external_blocked": 20 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 3884, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 15 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_success[chromium]", + "id": "C5", + "name": "File preview", + "case": "success", + "status": "passed", + "duration_ms": 5099, + "http_status": 200, + "evidence": null, + "known_external_blocked": 10 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_rejection[chromium]", + "id": "C5", + "name": "File preview", + "case": "rejection", + "status": "passed", + "duration_ms": 3946, + "http_status": 401, + "evidence": null, + "known_external_blocked": 10 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_success[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "status": "passed", + "duration_ms": 1659, + "http_status": 200, + "evidence": null, + "known_external_blocked": 6 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_rejection[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "status": "passed", + "duration_ms": 653, + "http_status": 403, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c7_file_editor.py::test_c7_file_editor_success[chromium]", + "id": "C7", + "name": "File page collaborative edit", + "case": "success", + "status": "passed", + "duration_ms": 7720, + "http_status": 200, + "evidence": null, + "known_external_blocked": 22 + }, + { + "nodeid": "test_c7_file_editor.py::test_c7_file_editor_rejection[chromium]", + "id": "C7", + "name": "File page collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 6172, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 20 + }, + { + "nodeid": "test_c1_login.py::test_c1_login_rejection", + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "status": "passed", + "duration_ms": 69, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261111T230217Z-d8363c/junit.xml b/docs/demo/runs/acc-20261111T230217Z-d8363c/junit.xml new file mode 100644 index 0000000..0ce12f5 --- /dev/null +++ b/docs/demo/runs/acc-20261111T230217Z-d8363c/junit.xml @@ -0,0 +1 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="14" time="51.701" timestamp="2026-11-12T08:02:35.692198+09:00" hostname="redacted-host"><testcase classname="test_c1_login" name="test_c1_login_success[chromium]" time="1.540"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_success[chromium]" time="3.780"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="16" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_rejection[chromium]" time="3.662"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="10" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_success[chromium]" time="2.670"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="5" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_rejection[chromium]" time="3.854"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="10" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="6.927"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="20" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="3.886"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="15" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="5.101"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="10" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_rejection[chromium]" time="3.948"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="10" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="1.660"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="6" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_rejection[chromium]" time="0.655"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="4" /></properties></testcase><testcase classname="test_c7_file_editor" name="test_c7_file_editor_success[chromium]" time="7.722"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="22" /></properties></testcase><testcase classname="test_c7_file_editor" name="test_c7_file_editor_rejection[chromium]" time="6.173"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="20" /></properties></testcase><testcase classname="test_c1_login" name="test_c1_login_rejection" time="0.071"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="0" /></properties></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261111T230217Z-d8363c/pytest.log b/docs/demo/runs/acc-20261111T230217Z-d8363c/pytest.log new file mode 100644 index 0000000..e6609b6 --- /dev/null +++ b/docs/demo/runs/acc-20261111T230217Z-d8363c/pytest.log @@ -0,0 +1,46 @@ +.............. [100%] +=============================== warnings summary =============================== +test_c1_login.py::test_c1_login_success[chromium] + test_c1_login.py:10: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_success[chromium] + test_c2_create_project.py:11: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_rejection[chromium] + test_c2_create_project.py:39: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_success[chromium] + test_c3_file_upload.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] + test_c3_file_upload.py:43: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:55: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] + test_c4_wiki_collab.py:85: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_success[chromium] + test_c5_file_preview.py:16: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] + test_c5_file_preview.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_success[chromium] + test_c6_admin.py:40: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_rejection[chromium] + test_c6_admin.py:60: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c7_file_editor.py::test_c7_file_editor_success[chromium] + test_c7_file_editor.py:45: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c7_file_editor.py::test_c7_file_editor_rejection[chromium] + test_c7_file_editor.py:75: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c1_login.py::test_c1_login_rejection + test_c1_login.py:20: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +14 passed, 10 deselected, 14 warnings in 51.70s diff --git a/docs/demo/runs/acc-20261111T230217Z-d8363c/results.json b/docs/demo/runs/acc-20261111T230217Z-d8363c/results.json new file mode 100644 index 0000000..a4023d3 --- /dev/null +++ b/docs/demo/runs/acc-20261111T230217Z-d8363c/results.json @@ -0,0 +1,190 @@ +{ + "run_id": "acc-20261111T230217Z-d8363c", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-11T23:02:17Z", + "duration_ms": 74164, + "only": "core", + "seeded": true, + "precheck": { + "healthy": true, + "services": 23 + }, + "pytest_returncode": 0, + "evidence_dir": "docs/demo/runs/acc-20261111T230217Z-d8363c", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C1", + "C2", + "C3", + "C4", + "C5", + "C6", + "C7" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 14, + "failed": 0, + "error": 0, + "skipped": 0, + "total": 14, + "known_external_blocked": 157 + }, + "tests": [ + { + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "test": "test_c1_login_success[chromium]", + "status": "passed", + "duration_ms": 1539, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C2", + "name": "Create project", + "case": "success", + "test": "test_c2_create_project_success[chromium]", + "status": "passed", + "duration_ms": 3778, + "http_status": 200, + "evidence": null, + "known_external_blocked": 16 + }, + { + "id": "C2", + "name": "Create project", + "case": "rejection", + "test": "test_c2_create_project_rejection[chromium]", + "status": "passed", + "duration_ms": 3660, + "http_status": 403, + "evidence": null, + "known_external_blocked": 10 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "success", + "test": "test_c3_file_upload_success[chromium]", + "status": "passed", + "duration_ms": 2669, + "http_status": 200, + "evidence": null, + "known_external_blocked": 5 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "test": "test_c3_file_upload_rejection[chromium]", + "status": "passed", + "duration_ms": 3852, + "http_status": 403, + "evidence": null, + "known_external_blocked": 10 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "passed", + "duration_ms": 6925, + "http_status": 200, + "evidence": null, + "known_external_blocked": 20 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "passed", + "duration_ms": 3884, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 15 + }, + { + "id": "C5", + "name": "File preview", + "case": "success", + "test": "test_c5_file_preview_success[chromium]", + "status": "passed", + "duration_ms": 5099, + "http_status": 200, + "evidence": null, + "known_external_blocked": 10 + }, + { + "id": "C5", + "name": "File preview", + "case": "rejection", + "test": "test_c5_file_preview_rejection[chromium]", + "status": "passed", + "duration_ms": 3946, + "http_status": 401, + "evidence": null, + "known_external_blocked": 10 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "test": "test_c6_admin_success[chromium]", + "status": "passed", + "duration_ms": 1659, + "http_status": 200, + "evidence": null, + "known_external_blocked": 6 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "test": "test_c6_admin_rejection[chromium]", + "status": "passed", + "duration_ms": 653, + "http_status": 403, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C7", + "name": "File page collaborative edit", + "case": "success", + "test": "test_c7_file_editor_success[chromium]", + "status": "passed", + "duration_ms": 7720, + "http_status": 200, + "evidence": null, + "known_external_blocked": 22 + }, + { + "id": "C7", + "name": "File page collaborative edit", + "case": "rejection", + "test": "test_c7_file_editor_rejection[chromium]", + "status": "passed", + "duration_ms": 6172, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 20 + }, + { + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "test": "test_c1_login_rejection", + "status": "passed", + "duration_ms": 69, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261111T230217Z-d8363c/results.toon b/docs/demo/runs/acc-20261111T230217Z-d8363c/results.toon new file mode 100644 index 0000000..b56aad6 --- /dev/null +++ b/docs/demo/runs/acc-20261111T230217Z-d8363c/results.toon @@ -0,0 +1,45 @@ +accept: + run_id: acc-20261111T230217Z-d8363c + base_url: "http://127.0.0.1:5000" + started: "2026-11-11T23:02:17Z" + duration_ms: 74164 + only: core + seeded: true + precheck: + healthy: true + services: 23 + pytest_returncode: 0 + evidence_dir: docs/demo/runs/acc-20261111T230217Z-d8363c + tracing: off + trace_quarantine: null + expected_scenarios[7]: + - C1 + - C2 + - C3 + - C4 + - C5 + - C6 + - C7 + incomplete_scenarios[0]: + summary: + passed: 14 + failed: 0 + error: 0 + skipped: 0 + total: 14 + known_external_blocked: 157 + tests[14]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C1,Login via fakecas,success,"test_c1_login_success[chromium]",passed,1539,200,null,9 + C2,Create project,success,"test_c2_create_project_success[chromium]",passed,3778,200,null,16 + C2,Create project,rejection,"test_c2_create_project_rejection[chromium]",passed,3660,403,null,10 + C3,Upload and download file,success,"test_c3_file_upload_success[chromium]",passed,2669,200,null,5 + C3,Upload and download file,rejection,"test_c3_file_upload_rejection[chromium]",passed,3852,403,null,10 + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",passed,6925,200,null,20 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",passed,3884,4401,null,15 + C5,File preview,success,"test_c5_file_preview_success[chromium]",passed,5099,200,null,10 + C5,File preview,rejection,"test_c5_file_preview_rejection[chromium]",passed,3946,401,null,10 + C6,Institution admin screen,success,"test_c6_admin_success[chromium]",passed,1659,200,null,6 + C6,Institution admin screen,rejection,"test_c6_admin_rejection[chromium]",passed,653,403,null,4 + C7,File page collaborative edit,success,"test_c7_file_editor_success[chromium]",passed,7720,200,null,22 + C7,File page collaborative edit,rejection,"test_c7_file_editor_rejection[chromium]",passed,6172,4401,null,20 + C1,Login via fakecas,rejection,test_c1_login_rejection,passed,69,401,null,0 diff --git a/docs/demo/runs/acc-20261112T083417Z-f2b524/collector.json b/docs/demo/runs/acc-20261112T083417Z-f2b524/collector.json new file mode 100644 index 0000000..30f4b8b --- /dev/null +++ b/docs/demo/runs/acc-20261112T083417Z-f2b524/collector.json @@ -0,0 +1,244 @@ +[ + { + "nodeid": "test_c1_login.py::test_c1_login_success[chromium]", + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "status": "failed", + "duration_ms": 77375, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_success[chromium]", + "id": "C2", + "name": "Create project", + "case": "success", + "status": "error", + "duration_ms": 66031, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_rejection[chromium]", + "id": "C2", + "name": "Create project", + "case": "rejection", + "status": "error", + "duration_ms": 66035, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "success", + "status": "error", + "duration_ms": 66374, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "status": "error", + "duration_ms": 66140, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "failed", + "duration_ms": 66970, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "error", + "duration_ms": 68000, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_success[chromium]", + "id": "C5", + "name": "File preview", + "case": "success", + "status": "error", + "duration_ms": 65581, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_rejection[chromium]", + "id": "C5", + "name": "File preview", + "case": "rejection", + "status": "error", + "duration_ms": 66033, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_success[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "status": "failed", + "duration_ms": 17119, + "http_status": null, + "evidence": null, + "known_external_blocked": 3 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_rejection[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "status": "error", + "duration_ms": 65757, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s1_y_websocket.py::test_s1_y_websocket_success[chromium]", + "id": "S1", + "name": "y-websocket", + "case": "success", + "status": "skipped", + "duration_ms": 3, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s1_y_websocket.py::test_s1_y_websocket_rejection[chromium]", + "id": "S1", + "name": "y-websocket", + "case": "rejection", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s2_rdmcp.py::test_s2_rdmcp_success[chromium]", + "id": "S2", + "name": "rdmcp (MCP endpoint)", + "case": "success", + "status": "skipped", + "duration_ms": 1, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s2_rdmcp.py::test_s2_rdmcp_rejection[chromium]", + "id": "S2", + "name": "rdmcp (MCP endpoint)", + "case": "rejection", + "status": "skipped", + "duration_ms": 1, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s3_aipf.py::test_s3_aipf_success[chromium]", + "id": "S3", + "name": "aipf_mcp_data_grdm", + "case": "success", + "status": "skipped", + "duration_ms": 1, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s3_aipf.py::test_s3_aipf_rejection[chromium]", + "id": "S3", + "name": "aipf_mcp_data_grdm", + "case": "rejection", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s4_oasys.py::test_s4_oasys_success[chromium]", + "id": "S4", + "name": "OASys", + "case": "success", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s5_shibboleth.py::test_s5_shibboleth_success[chromium]", + "id": "S5", + "name": "Shibboleth-SP via test IdP", + "case": "success", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s5_shibboleth.py::test_s5_shibboleth_rejection[chromium]", + "id": "S5", + "name": "Shibboleth-SP via test IdP", + "case": "rejection", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c1_login.py::test_c1_login_rejection", + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "status": "passed", + "duration_ms": 869, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s4_oasys.py::test_s4_oasys_rejection", + "id": "S4", + "name": "OASys", + "case": "rejection", + "status": "skipped", + "duration_ms": 429, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261112T083417Z-f2b524/junit.xml b/docs/demo/runs/acc-20261112T083417Z-f2b524/junit.xml new file mode 100644 index 0000000..80a28a2 --- /dev/null +++ b/docs/demo/runs/acc-20261112T083417Z-f2b524/junit.xml @@ -0,0 +1,765 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="8" failures="3" skipped="10" tests="22" time="723.081" timestamp="2026-11-12T17:34:24.789840+09:00" hostname="redacted-host"><testcase classname="test_c1_login" name="test_c1_login_success[chromium]" time="77.375"><properties><property name="known_external_blocked" value="0" /></properties><failure message="playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. =========================== logs =========================== waiting for navigation until "load" ============================================================">page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e34cc0180> +user_a = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000' +record_property = <function record_property.<locals>.append_property at 0x761e34cc1800> + + @pytest.mark.case("success") + def test_c1_login_success(page, login, user_a, base_url, record_property): + """Test user signs in through fakecas and lands on the dashboard.""" +> login(page, user_a) + +installer/acceptance/test_c1_login.py:13: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError</failure></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_success[chromium]" time="66.032"><properties><property name="known_external_blocked" value="0" /></properties><error message="failed on setup with "playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. =========================== logs =========================== waiting for navigation until "load" ============================================================"">page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e34cfc9a0> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError</error></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_rejection[chromium]" time="66.036"><properties><property name="known_external_blocked" value="0" /></properties><error message="failed on setup with "playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. =========================== logs =========================== waiting for navigation until "load" ============================================================"">page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e349edbc0> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError</error></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_success[chromium]" time="66.375"><properties><property name="known_external_blocked" value="0" /></properties><error message="failed on setup with "playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. =========================== logs =========================== waiting for navigation until "load" ============================================================"">page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e349f6a20> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError</error></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_rejection[chromium]" time="66.140"><properties><property name="known_external_blocked" value="0" /></properties><error message="failed on setup with "playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. =========================== logs =========================== waiting for navigation until "load" ============================================================"">page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e349ec220> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError</error></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="66.971"><properties><property name="known_external_blocked" value="0" /></properties><failure message="playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. =========================== logs =========================== waiting for navigation until "load" ============================================================">two_contexts = (<Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'>, <Page url='about:blank'>) +login = <function login.<locals>._login at 0x761e349a4cc0> +user_a = {'email': '***', 'password': '***'} +user_b = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0x761e349a51c0> +add_contributor = <function add_contributor.<locals>._add at 0x761e349a5300> +run_id = 'acc-20261112T083417Z-f2b524' +record_property = <function record_property.<locals>.append_property at 0x761e349bf1a0> + + @pytest.mark.case("success") + def test_c4_wiki_collab_success(two_contexts, login, user_a, user_b, base_url, api_url, api_write, add_contributor, + run_id, record_property): + """Both users open the same wiki page; text typed by B appears in A's editor and text typed by A in B's.""" + page_a, page_b = two_contexts +> login(page_a, user_a) + +installer/acceptance/test_c4_wiki_collab.py:60: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError</failure></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="68.002"><properties><property name="known_external_blocked" value="0" /></properties><error message="failed on setup with "playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. =========================== logs =========================== waiting for navigation until "load" ============================================================"">page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e34995080> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError</error></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="65.582"><properties><property name="known_external_blocked" value="0" /></properties><error message="failed on setup with "playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. =========================== logs =========================== waiting for navigation until "load" ============================================================"">page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e347bf1a0> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError</error></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_rejection[chromium]" time="66.033"><properties><property name="known_external_blocked" value="0" /></properties><error message="failed on setup with "playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. =========================== logs =========================== waiting for navigation until "load" ============================================================"">page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e34796700> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError</error></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="17.121"><properties><property name="known_external_blocked" value="3" /></properties><failure message="AssertionError: /user_identification_information_admin/ returned 403 assert (<Response url='http://127.0.0.1:8001/user_identification_information_admin/' request=<Request url='http://127.0.0.1:8001/user_identification_information_admin/' method='GET'>> is not None and 403 == 200) + where 403 = <Response url='http://127.0.0.1:8001/user_identification_information_admin/' request=<Request url='http://127.0.0.1:8001/user_identification_information_admin/' method='GET'>>.status">page = <Page url='http://127.0.0.1:8001/user_identification_information_admin/'> +service_url = <function service_url.<locals>._url at 0x761e34c81620> +admin_user = {'email': '***', 'password': '***'} +user_a = {'email': '***', 'password': '***'} +institution_member = {'email': '***', 'password': '***'} +other_institution_member = {'email': '***', 'password': '***'} +record_property = <function record_property.<locals>.append_property at 0x761e347bc400> + + @pytest.mark.case("success") + def test_c6_admin_success(page, service_url, admin_user, user_a, institution_member, other_institution_member, + record_property): + """An affiliated institution admin (staff, not superuser) sees the users of its institution, and only those: + not a user of no institution, and not a user of another institution (seeded by `grdm-dev accept --seed`).""" + admin_url = service_url("admin") + _admin_login(page, admin_url, admin_user) +> table = _listed(page, admin_url, sel.ADMIN["institution_users"]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c6_admin.py:35: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +page = <Page url='http://127.0.0.1:8001/user_identification_information_admin/'> +admin_url = 'http://127.0.0.1:8001' +path = '/user_identification_information_admin/' + + def _listed(page, admin_url: str, path: str) -> str: + resp = page.goto(admin_url + path, wait_until="domcontentloaded") +> assert resp is not None and resp.status == 200, f"{path} returned {resp and resp.status}" +E AssertionError: /user_identification_information_admin/ returned 403 +E assert (<Response url='http://127.0.0.1:8001/user_identification_information_admin/' request=<Request url='http://127.0.0.1:8001/user_identification_information_admin/' method='GET'>> is not None and 403 == 200) +E + where 403 = <Response url='http://127.0.0.1:8001/user_identification_information_admin/' request=<Request url='http://127.0.0.1:8001/user_identification_information_admin/' method='GET'>>.status + +installer/acceptance/test_c6_admin.py:23: AssertionError</failure></testcase><testcase classname="test_c6_admin" name="test_c6_admin_rejection[chromium]" time="65.758"><properties><property name="known_external_blocked" value="0" /></properties><error message="failed on setup with "playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. =========================== logs =========================== waiting for navigation until "load" ============================================================"">page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e349b0e00> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError</error></testcase><testcase classname="test_s1_y_websocket" name="test_s1_y_websocket_success[chromium]" time="0.005"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s1_y_websocket.py:65: M3</skipped></testcase><testcase classname="test_s1_y_websocket" name="test_s1_y_websocket_rejection[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s1_y_websocket.py:91: M3</skipped></testcase><testcase classname="test_s2_rdmcp" name="test_s2_rdmcp_success[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s2_rdmcp.py:80: M3</skipped></testcase><testcase classname="test_s2_rdmcp" name="test_s2_rdmcp_rejection[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s2_rdmcp.py:99: M3</skipped></testcase><testcase classname="test_s3_aipf" name="test_s3_aipf_success[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s3_aipf.py:78: M3</skipped></testcase><testcase classname="test_s3_aipf" name="test_s3_aipf_rejection[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s3_aipf.py:96: M3</skipped></testcase><testcase classname="test_s4_oasys" name="test_s4_oasys_success[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s4_oasys.py:45: M3</skipped></testcase><testcase classname="test_s5_shibboleth" name="test_s5_shibboleth_success[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s5_shibboleth.py:97: M3</skipped></testcase><testcase classname="test_s5_shibboleth" name="test_s5_shibboleth_rejection[chromium]" time="0.003"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s5_shibboleth.py:121: M3</skipped></testcase><testcase classname="test_c1_login" name="test_c1_login_rejection" time="0.870"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="0" /></properties></testcase><testcase classname="test_s4_oasys" name="test_s4_oasys_rejection" time="0.430"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s4_oasys.py:65: M3</skipped></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261112T083417Z-f2b524/pytest.log b/docs/demo/runs/acc-20261112T083417Z-f2b524/pytest.log new file mode 100644 index 0000000..3758f02 --- /dev/null +++ b/docs/demo/runs/acc-20261112T083417Z-f2b524/pytest.log @@ -0,0 +1,837 @@ +FEEEEFEEEFEsssssssss.s [100%] +==================================== ERRORS ==================================== +__________ ERROR at setup of test_c2_create_project_success[chromium] __________ + +page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e34cfc9a0> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError +_________ ERROR at setup of test_c2_create_project_rejection[chromium] _________ + +page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e349edbc0> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError +___________ ERROR at setup of test_c3_file_upload_success[chromium] ____________ + +page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e349f6a20> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError +__________ ERROR at setup of test_c3_file_upload_rejection[chromium] ___________ + +page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e349ec220> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError +__________ ERROR at setup of test_c4_wiki_collab_rejection[chromium] ___________ + +page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e34995080> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError +___________ ERROR at setup of test_c5_file_preview_success[chromium] ___________ + +page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e347bf1a0> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError +__________ ERROR at setup of test_c5_file_preview_rejection[chromium] __________ + +page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e34796700> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError +_____________ ERROR at setup of test_c6_admin_rejection[chromium] ______________ + +page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e349b0e00> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError +=================================== FAILURES =================================== +_______________________ test_c1_login_success[chromium] ________________________ + +page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x761e34cc0180> +user_a = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000' +record_property = <function record_property.<locals>.append_property at 0x761e34cc1800> + + @pytest.mark.case("success") + def test_c1_login_success(page, login, user_a, base_url, record_property): + """Test user signs in through fakecas and lands on the dashboard.""" +> login(page, user_a) + +installer/acceptance/test_c1_login.py:13: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError +____________________ test_c4_wiki_collab_success[chromium] _____________________ + +two_contexts = (<Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'>, <Page url='about:blank'>) +login = <function login.<locals>._login at 0x761e349a4cc0> +user_a = {'email': '***', 'password': '***'} +user_b = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0x761e349a51c0> +add_contributor = <function add_contributor.<locals>._add at 0x761e349a5300> +run_id = 'acc-20261112T083417Z-f2b524' +record_property = <function record_property.<locals>.append_property at 0x761e349bf1a0> + + @pytest.mark.case("success") + def test_c4_wiki_collab_success(two_contexts, login, user_a, user_b, base_url, api_url, api_write, add_contributor, + run_id, record_property): + """Both users open the same wiki page; text typed by B appears in A's editor and text typed by A in B's.""" + page_a, page_b = two_contexts +> login(page_a, user_a) + +installer/acceptance/test_c4_wiki_collab.py:60: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError +_______________________ test_c6_admin_success[chromium] ________________________ + +page = <Page url='http://127.0.0.1:8001/user_identification_information_admin/'> +service_url = <function service_url.<locals>._url at 0x761e34c81620> +admin_user = {'email': '***', 'password': '***'} +user_a = {'email': '***', 'password': '***'} +institution_member = {'email': '***', 'password': '***'} +other_institution_member = {'email': '***', 'password': '***'} +record_property = <function record_property.<locals>.append_property at 0x761e347bc400> + + @pytest.mark.case("success") + def test_c6_admin_success(page, service_url, admin_user, user_a, institution_member, other_institution_member, + record_property): + """An affiliated institution admin (staff, not superuser) sees the users of its institution, and only those: + not a user of no institution, and not a user of another institution (seeded by `grdm-dev accept --seed`).""" + admin_url = service_url("admin") + _admin_login(page, admin_url, admin_user) +> table = _listed(page, admin_url, sel.ADMIN["institution_users"]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c6_admin.py:35: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +page = <Page url='http://127.0.0.1:8001/user_identification_information_admin/'> +admin_url = 'http://127.0.0.1:8001' +path = '/user_identification_information_admin/' + + def _listed(page, admin_url: str, path: str) -> str: + resp = page.goto(admin_url + path, wait_until="domcontentloaded") +> assert resp is not None and resp.status == 200, f"{path} returned {resp and resp.status}" +E AssertionError: /user_identification_information_admin/ returned 403 +E assert (<Response url='http://127.0.0.1:8001/user_identification_information_admin/' request=<Request url='http://127.0.0.1:8001/user_identification_information_admin/' method='GET'>> is not None and 403 == 200) +E + where 403 = <Response url='http://127.0.0.1:8001/user_identification_information_admin/' request=<Request url='http://127.0.0.1:8001/user_identification_information_admin/' method='GET'>>.status + +installer/acceptance/test_c6_admin.py:23: AssertionError +=============================== warnings summary =============================== +test_c1_login.py::test_c1_login_success[chromium] + test_c1_login.py:10: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:55: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_success[chromium] + test_c6_admin.py:28: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c1_login.py::test_c1_login_rejection + test_c1_login.py:20: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +=========================== short test summary info ============================ +SKIPPED [1] installer/acceptance/test_s1_y_websocket.py:65: M3 +SKIPPED [1] installer/acceptance/test_s1_y_websocket.py:91: M3 +SKIPPED [1] installer/acceptance/test_s2_rdmcp.py:80: M3 +SKIPPED [1] installer/acceptance/test_s2_rdmcp.py:99: M3 +SKIPPED [1] installer/acceptance/test_s3_aipf.py:78: M3 +SKIPPED [1] installer/acceptance/test_s3_aipf.py:96: M3 +SKIPPED [1] installer/acceptance/test_s4_oasys.py:45: M3 +SKIPPED [1] installer/acceptance/test_s5_shibboleth.py:97: M3 +SKIPPED [1] installer/acceptance/test_s5_shibboleth.py:121: M3 +SKIPPED [1] installer/acceptance/test_s4_oasys.py:65: M3 +ERROR installer/acceptance/test_c2_create_project.py::test_c2_create_project_success[chromium] +ERROR installer/acceptance/test_c2_create_project.py::test_c2_create_project_rejection[chromium] +ERROR installer/acceptance/test_c3_file_upload.py::test_c3_file_upload_success[chromium] +ERROR installer/acceptance/test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] +ERROR installer/acceptance/test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] +ERROR installer/acceptance/test_c5_file_preview.py::test_c5_file_preview_success[chromium] +ERROR installer/acceptance/test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] +ERROR installer/acceptance/test_c6_admin.py::test_c6_admin_rejection[chromium] +FAILED installer/acceptance/test_c1_login.py::test_c1_login_success[chromium] +FAILED installer/acceptance/test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] +FAILED installer/acceptance/test_c6_admin.py::test_c6_admin_success[chromium] +3 failed, 1 passed, 10 skipped, 4 warnings, 8 errors in 723.08s (0:12:03) diff --git a/docs/demo/runs/acc-20261112T083417Z-f2b524/results.json b/docs/demo/runs/acc-20261112T083417Z-f2b524/results.json new file mode 100644 index 0000000..6ef4a0d --- /dev/null +++ b/docs/demo/runs/acc-20261112T083417Z-f2b524/results.json @@ -0,0 +1,282 @@ +{ + "run_id": "acc-20261112T083417Z-f2b524", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-12T08:34:17Z", + "duration_ms": 732089, + "only": null, + "seeded": false, + "precheck": { + "healthy": true, + "services": 24 + }, + "pytest_returncode": 1, + "evidence_dir": "docs/demo/runs/acc-20261112T083417Z-f2b524", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C1", + "C2", + "C3", + "C4", + "C5", + "C6", + "S1", + "S2", + "S3", + "S4", + "S5" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 1, + "failed": 3, + "error": 8, + "skipped": 10, + "total": 22, + "known_external_blocked": 3 + }, + "tests": [ + { + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "test": "test_c1_login_success[chromium]", + "status": "failed", + "duration_ms": 77375, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C2", + "name": "Create project", + "case": "success", + "test": "test_c2_create_project_success[chromium]", + "status": "error", + "duration_ms": 66031, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C2", + "name": "Create project", + "case": "rejection", + "test": "test_c2_create_project_rejection[chromium]", + "status": "error", + "duration_ms": 66035, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "success", + "test": "test_c3_file_upload_success[chromium]", + "status": "error", + "duration_ms": 66374, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "test": "test_c3_file_upload_rejection[chromium]", + "status": "error", + "duration_ms": 66140, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "failed", + "duration_ms": 66970, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "error", + "duration_ms": 68000, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C5", + "name": "File preview", + "case": "success", + "test": "test_c5_file_preview_success[chromium]", + "status": "error", + "duration_ms": 65581, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C5", + "name": "File preview", + "case": "rejection", + "test": "test_c5_file_preview_rejection[chromium]", + "status": "error", + "duration_ms": 66033, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "test": "test_c6_admin_success[chromium]", + "status": "failed", + "duration_ms": 17119, + "http_status": null, + "evidence": null, + "known_external_blocked": 3 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "test": "test_c6_admin_rejection[chromium]", + "status": "error", + "duration_ms": 65757, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S1", + "name": "y-websocket", + "case": "success", + "test": "test_s1_y_websocket_success[chromium]", + "status": "skipped", + "duration_ms": 3, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S1", + "name": "y-websocket", + "case": "rejection", + "test": "test_s1_y_websocket_rejection[chromium]", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S2", + "name": "rdmcp (MCP endpoint)", + "case": "success", + "test": "test_s2_rdmcp_success[chromium]", + "status": "skipped", + "duration_ms": 1, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S2", + "name": "rdmcp (MCP endpoint)", + "case": "rejection", + "test": "test_s2_rdmcp_rejection[chromium]", + "status": "skipped", + "duration_ms": 1, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S3", + "name": "aipf_mcp_data_grdm", + "case": "success", + "test": "test_s3_aipf_success[chromium]", + "status": "skipped", + "duration_ms": 1, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S3", + "name": "aipf_mcp_data_grdm", + "case": "rejection", + "test": "test_s3_aipf_rejection[chromium]", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S4", + "name": "OASys", + "case": "success", + "test": "test_s4_oasys_success[chromium]", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S5", + "name": "Shibboleth-SP via test IdP", + "case": "success", + "test": "test_s5_shibboleth_success[chromium]", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S5", + "name": "Shibboleth-SP via test IdP", + "case": "rejection", + "test": "test_s5_shibboleth_rejection[chromium]", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "test": "test_c1_login_rejection", + "status": "passed", + "duration_ms": 869, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S4", + "name": "OASys", + "case": "rejection", + "test": "test_s4_oasys_rejection", + "status": "skipped", + "duration_ms": 429, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261112T083417Z-f2b524/results.toon b/docs/demo/runs/acc-20261112T083417Z-f2b524/results.toon new file mode 100644 index 0000000..23939cb --- /dev/null +++ b/docs/demo/runs/acc-20261112T083417Z-f2b524/results.toon @@ -0,0 +1,57 @@ +accept: + run_id: acc-20261112T083417Z-f2b524 + base_url: "http://127.0.0.1:5000" + started: "2026-11-12T08:34:17Z" + duration_ms: 732089 + only: null + seeded: false + precheck: + healthy: true + services: 24 + pytest_returncode: 1 + evidence_dir: docs/demo/runs/acc-20261112T083417Z-f2b524 + tracing: off + trace_quarantine: null + expected_scenarios[11]: + - C1 + - C2 + - C3 + - C4 + - C5 + - C6 + - S1 + - S2 + - S3 + - S4 + - S5 + incomplete_scenarios[0]: + summary: + passed: 1 + failed: 3 + error: 8 + skipped: 10 + total: 22 + known_external_blocked: 3 + tests[22]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C1,Login via fakecas,success,"test_c1_login_success[chromium]",failed,77375,null,null,0 + C2,Create project,success,"test_c2_create_project_success[chromium]",error,66031,null,null,0 + C2,Create project,rejection,"test_c2_create_project_rejection[chromium]",error,66035,null,null,0 + C3,Upload and download file,success,"test_c3_file_upload_success[chromium]",error,66374,null,null,0 + C3,Upload and download file,rejection,"test_c3_file_upload_rejection[chromium]",error,66140,null,null,0 + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",failed,66970,null,null,0 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",error,68000,null,null,0 + C5,File preview,success,"test_c5_file_preview_success[chromium]",error,65581,null,null,0 + C5,File preview,rejection,"test_c5_file_preview_rejection[chromium]",error,66033,null,null,0 + C6,Institution admin screen,success,"test_c6_admin_success[chromium]",failed,17119,null,null,3 + C6,Institution admin screen,rejection,"test_c6_admin_rejection[chromium]",error,65757,null,null,0 + S1,y-websocket,success,"test_s1_y_websocket_success[chromium]",skipped,3,null,null,0 + S1,y-websocket,rejection,"test_s1_y_websocket_rejection[chromium]",skipped,2,null,null,0 + S2,rdmcp (MCP endpoint),success,"test_s2_rdmcp_success[chromium]",skipped,1,null,null,0 + S2,rdmcp (MCP endpoint),rejection,"test_s2_rdmcp_rejection[chromium]",skipped,1,null,null,0 + S3,aipf_mcp_data_grdm,success,"test_s3_aipf_success[chromium]",skipped,1,null,null,0 + S3,aipf_mcp_data_grdm,rejection,"test_s3_aipf_rejection[chromium]",skipped,0,null,null,0 + S4,OASys,success,"test_s4_oasys_success[chromium]",skipped,0,null,null,0 + S5,Shibboleth-SP via test IdP,success,"test_s5_shibboleth_success[chromium]",skipped,2,null,null,0 + S5,Shibboleth-SP via test IdP,rejection,"test_s5_shibboleth_rejection[chromium]",skipped,2,null,null,0 + C1,Login via fakecas,rejection,test_c1_login_rejection,passed,869,401,null,0 + S4,OASys,rejection,test_s4_oasys_rejection,skipped,429,null,null,0 diff --git a/docs/demo/runs/acc-20261112T085656Z-c69ad2/collector.json b/docs/demo/runs/acc-20261112T085656Z-c69ad2/collector.json new file mode 100644 index 0000000..44396df --- /dev/null +++ b/docs/demo/runs/acc-20261112T085656Z-c69ad2/collector.json @@ -0,0 +1,244 @@ +[ + { + "nodeid": "test_c1_login.py::test_c1_login_success[chromium]", + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "status": "passed", + "duration_ms": 66568, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_success[chromium]", + "id": "C2", + "name": "Create project", + "case": "success", + "status": "passed", + "duration_ms": 118946, + "http_status": 200, + "evidence": null, + "known_external_blocked": 15 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_rejection[chromium]", + "id": "C2", + "name": "Create project", + "case": "rejection", + "status": "passed", + "duration_ms": 77981, + "http_status": 403, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "success", + "status": "passed", + "duration_ms": 49868, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "status": "passed", + "duration_ms": 81458, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "failed", + "duration_ms": 108170, + "http_status": null, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 105772, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 12 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_success[chromium]", + "id": "C5", + "name": "File preview", + "case": "success", + "status": "passed", + "duration_ms": 82007, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_rejection[chromium]", + "id": "C5", + "name": "File preview", + "case": "rejection", + "status": "passed", + "duration_ms": 72413, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_success[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "status": "passed", + "duration_ms": 31356, + "http_status": 200, + "evidence": null, + "known_external_blocked": 5 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_rejection[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "status": "passed", + "duration_ms": 29494, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "nodeid": "test_s1_y_websocket.py::test_s1_y_websocket_success[chromium]", + "id": "S1", + "name": "y-websocket", + "case": "success", + "status": "skipped", + "duration_ms": 7, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s1_y_websocket.py::test_s1_y_websocket_rejection[chromium]", + "id": "S1", + "name": "y-websocket", + "case": "rejection", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s2_rdmcp.py::test_s2_rdmcp_success[chromium]", + "id": "S2", + "name": "rdmcp (MCP endpoint)", + "case": "success", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s2_rdmcp.py::test_s2_rdmcp_rejection[chromium]", + "id": "S2", + "name": "rdmcp (MCP endpoint)", + "case": "rejection", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s3_aipf.py::test_s3_aipf_success[chromium]", + "id": "S3", + "name": "aipf_mcp_data_grdm", + "case": "success", + "status": "skipped", + "duration_ms": 1, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s3_aipf.py::test_s3_aipf_rejection[chromium]", + "id": "S3", + "name": "aipf_mcp_data_grdm", + "case": "rejection", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s4_oasys.py::test_s4_oasys_success[chromium]", + "id": "S4", + "name": "OASys", + "case": "success", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s5_shibboleth.py::test_s5_shibboleth_success[chromium]", + "id": "S5", + "name": "Shibboleth-SP via test IdP", + "case": "success", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s5_shibboleth.py::test_s5_shibboleth_rejection[chromium]", + "id": "S5", + "name": "Shibboleth-SP via test IdP", + "case": "rejection", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c1_login.py::test_c1_login_rejection", + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "status": "passed", + "duration_ms": 344, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s4_oasys.py::test_s4_oasys_rejection", + "id": "S4", + "name": "OASys", + "case": "rejection", + "status": "skipped", + "duration_ms": 720, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261112T085656Z-c69ad2/junit.xml b/docs/demo/runs/acc-20261112T085656Z-c69ad2/junit.xml new file mode 100644 index 0000000..70131d7 --- /dev/null +++ b/docs/demo/runs/acc-20261112T085656Z-c69ad2/junit.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="0" failures="1" skipped="10" tests="22" time="830.091" timestamp="2026-11-12T18:03:17.709762+09:00" hostname="redacted-host"><testcase classname="test_c1_login" name="test_c1_login_success[chromium]" time="66.569"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="7" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_success[chromium]" time="118.947"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="15" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_rejection[chromium]" time="77.983"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="7" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_success[chromium]" time="49.870"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="4" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_rejection[chromium]" time="81.460"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="108.171"><properties><property name="known_external_blocked" value="13" /></properties><failure message="playwright._impl._errors.TimeoutError: Page.goto: Timeout 30000ms exceeded. Call log: - navigating to "http://127.0.0.1:5000/2up7e/wiki/home/?edit&view&menu", waiting until "domcontentloaded"">two_contexts = (<Page url='http://127.0.0.1:5000/2up7e/wiki/home/?edit&view&menu'>, <Page url='http://127.0.0.1:5000/dashboard'>) +login = <function login.<locals>._login at 0x79c1ab0cfa60> +user_a = {'email': '***', 'password': '***'} +user_b = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0x79c1ab0cdf80> +add_contributor = <function add_contributor.<locals>._add at 0x79c1ab0cc2c0> +run_id = 'acc-20261112T085656Z-c69ad2' +record_property = <function record_property.<locals>.append_property at 0x79c1ab0cc220> + + @pytest.mark.case("success") + def test_c4_wiki_collab_success(two_contexts, login, user_a, user_b, base_url, api_url, api_write, add_contributor, + run_id, record_property): + """Both users open the same wiki page; text typed by B appears in A's editor and text typed by A in B's.""" + page_a, page_b = two_contexts + login(page_a, user_a) + login(page_b, user_b) + + created = api_write(page_a.context, "POST", api_url + sel.API["nodes"], { + "data": {"type": "nodes", "attributes": {"title": "acceptance C4", "category": "project", "public": False}} + }) + assert created.status == 201, created.text()[:200] + node_id = created.json()["data"]["id"] + try: + add_contributor(page_a.context, node_id, user_id_of(page_b.context, api_url), "write") + +> resp_a = _open_editor(page_a, base_url, node_id) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c4_wiki_collab.py:71: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/test_c4_wiki_collab.py:32: in _open_editor + resp = page.goto(_wiki_edit_url(base_url, node_id), wait_until="domcontentloaded") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:18561: in goto + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:600: in goto + return await self._main_frame.goto( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:217: in goto + await self._channel.goto( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:398: in _mapped + return mapper(await awaitable) + ^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0x79c1ab03fa10> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0x79c1aae46480> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.goto: Timeout 30000ms exceeded. +E Call log: +E - navigating to "http://127.0.0.1:5000/2up7e/wiki/home/?edit&view&menu", waiting until "domcontentloaded" + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError</failure></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="105.774"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="12" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="82.009"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_rejection[chromium]" time="72.415"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="31.358"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="5" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_rejection[chromium]" time="29.495"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="3" /></properties></testcase><testcase classname="test_s1_y_websocket" name="test_s1_y_websocket_success[chromium]" time="0.008"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s1_y_websocket.py:65: M3</skipped></testcase><testcase classname="test_s1_y_websocket" name="test_s1_y_websocket_rejection[chromium]" time="0.003"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s1_y_websocket.py:91: M3</skipped></testcase><testcase classname="test_s2_rdmcp" name="test_s2_rdmcp_success[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s2_rdmcp.py:80: M3</skipped></testcase><testcase classname="test_s2_rdmcp" name="test_s2_rdmcp_rejection[chromium]" time="0.003"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s2_rdmcp.py:99: M3</skipped></testcase><testcase classname="test_s3_aipf" name="test_s3_aipf_success[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s3_aipf.py:78: M3</skipped></testcase><testcase classname="test_s3_aipf" name="test_s3_aipf_rejection[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s3_aipf.py:96: M3</skipped></testcase><testcase classname="test_s4_oasys" name="test_s4_oasys_success[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s4_oasys.py:45: M3</skipped></testcase><testcase classname="test_s5_shibboleth" name="test_s5_shibboleth_success[chromium]" time="0.003"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s5_shibboleth.py:97: M3</skipped></testcase><testcase classname="test_s5_shibboleth" name="test_s5_shibboleth_rejection[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s5_shibboleth.py:121: M3</skipped></testcase><testcase classname="test_c1_login" name="test_c1_login_rejection" time="0.345"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="0" /></properties></testcase><testcase classname="test_s4_oasys" name="test_s4_oasys_rejection" time="0.721"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s4_oasys.py:65: M3</skipped></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261112T085656Z-c69ad2/pytest.log b/docs/demo/runs/acc-20261112T085656Z-c69ad2/pytest.log new file mode 100644 index 0000000..97ede74 --- /dev/null +++ b/docs/demo/runs/acc-20261112T085656Z-c69ad2/pytest.log @@ -0,0 +1,120 @@ +.....F.....sssssssss.s [100%] +=================================== FAILURES =================================== +____________________ test_c4_wiki_collab_success[chromium] _____________________ + +two_contexts = (<Page url='http://127.0.0.1:5000/2up7e/wiki/home/?edit&view&menu'>, <Page url='http://127.0.0.1:5000/dashboard'>) +login = <function login.<locals>._login at 0x79c1ab0cfa60> +user_a = {'email': '***', 'password': '***'} +user_b = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0x79c1ab0cdf80> +add_contributor = <function add_contributor.<locals>._add at 0x79c1ab0cc2c0> +run_id = 'acc-20261112T085656Z-c69ad2' +record_property = <function record_property.<locals>.append_property at 0x79c1ab0cc220> + + @pytest.mark.case("success") + def test_c4_wiki_collab_success(two_contexts, login, user_a, user_b, base_url, api_url, api_write, add_contributor, + run_id, record_property): + """Both users open the same wiki page; text typed by B appears in A's editor and text typed by A in B's.""" + page_a, page_b = two_contexts + login(page_a, user_a) + login(page_b, user_b) + + created = api_write(page_a.context, "POST", api_url + sel.API["nodes"], { + "data": {"type": "nodes", "attributes": {"title": "acceptance C4", "category": "project", "public": False}} + }) + assert created.status == 201, created.text()[:200] + node_id = created.json()["data"]["id"] + try: + add_contributor(page_a.context, node_id, user_id_of(page_b.context, api_url), "write") + +> resp_a = _open_editor(page_a, base_url, node_id) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c4_wiki_collab.py:71: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/test_c4_wiki_collab.py:32: in _open_editor + resp = page.goto(_wiki_edit_url(base_url, node_id), wait_until="domcontentloaded") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:18561: in goto + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:600: in goto + return await self._main_frame.goto( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:217: in goto + await self._channel.goto( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:398: in _mapped + return mapper(await awaitable) + ^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0x79c1ab03fa10> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0x79c1aae46480> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.goto: Timeout 30000ms exceeded. +E Call log: +E - navigating to "http://127.0.0.1:5000/2up7e/wiki/home/?edit&view&menu", waiting until "domcontentloaded" + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError +=============================== warnings summary =============================== +test_c1_login.py::test_c1_login_success[chromium] + test_c1_login.py:10: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_success[chromium] + test_c2_create_project.py:11: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_rejection[chromium] + test_c2_create_project.py:39: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_success[chromium] + test_c3_file_upload.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] + test_c3_file_upload.py:43: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:55: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] + test_c4_wiki_collab.py:85: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_success[chromium] + test_c5_file_preview.py:16: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] + test_c5_file_preview.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_success[chromium] + test_c6_admin.py:28: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_rejection[chromium] + test_c6_admin.py:48: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c1_login.py::test_c1_login_rejection + test_c1_login.py:20: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +=========================== short test summary info ============================ +SKIPPED [1] installer/acceptance/test_s1_y_websocket.py:65: M3 +SKIPPED [1] installer/acceptance/test_s1_y_websocket.py:91: M3 +SKIPPED [1] installer/acceptance/test_s2_rdmcp.py:80: M3 +SKIPPED [1] installer/acceptance/test_s2_rdmcp.py:99: M3 +SKIPPED [1] installer/acceptance/test_s3_aipf.py:78: M3 +SKIPPED [1] installer/acceptance/test_s3_aipf.py:96: M3 +SKIPPED [1] installer/acceptance/test_s4_oasys.py:45: M3 +SKIPPED [1] installer/acceptance/test_s5_shibboleth.py:97: M3 +SKIPPED [1] installer/acceptance/test_s5_shibboleth.py:121: M3 +SKIPPED [1] installer/acceptance/test_s4_oasys.py:65: M3 +FAILED installer/acceptance/test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] +1 failed, 11 passed, 10 skipped, 12 warnings in 830.04s (0:13:50) diff --git a/docs/demo/runs/acc-20261112T085656Z-c69ad2/results.json b/docs/demo/runs/acc-20261112T085656Z-c69ad2/results.json new file mode 100644 index 0000000..b0169ce --- /dev/null +++ b/docs/demo/runs/acc-20261112T085656Z-c69ad2/results.json @@ -0,0 +1,282 @@ +{ + "run_id": "acc-20261112T085656Z-c69ad2", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-12T08:56:56Z", + "duration_ms": 1288938, + "only": null, + "seeded": true, + "precheck": { + "healthy": true, + "services": 24 + }, + "pytest_returncode": 1, + "evidence_dir": "docs/demo/runs/acc-20261112T085656Z-c69ad2", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C1", + "C2", + "C3", + "C4", + "C5", + "C6", + "S1", + "S2", + "S3", + "S4", + "S5" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 11, + "failed": 1, + "error": 0, + "skipped": 10, + "total": 22, + "known_external_blocked": 92 + }, + "tests": [ + { + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "test": "test_c1_login_success[chromium]", + "status": "passed", + "duration_ms": 66568, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C2", + "name": "Create project", + "case": "success", + "test": "test_c2_create_project_success[chromium]", + "status": "passed", + "duration_ms": 118946, + "http_status": 200, + "evidence": null, + "known_external_blocked": 15 + }, + { + "id": "C2", + "name": "Create project", + "case": "rejection", + "test": "test_c2_create_project_rejection[chromium]", + "status": "passed", + "duration_ms": 77981, + "http_status": 403, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "success", + "test": "test_c3_file_upload_success[chromium]", + "status": "passed", + "duration_ms": 49868, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "test": "test_c3_file_upload_rejection[chromium]", + "status": "passed", + "duration_ms": 81458, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "failed", + "duration_ms": 108170, + "http_status": null, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "passed", + "duration_ms": 105772, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 12 + }, + { + "id": "C5", + "name": "File preview", + "case": "success", + "test": "test_c5_file_preview_success[chromium]", + "status": "passed", + "duration_ms": 82007, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C5", + "name": "File preview", + "case": "rejection", + "test": "test_c5_file_preview_rejection[chromium]", + "status": "passed", + "duration_ms": 72413, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "test": "test_c6_admin_success[chromium]", + "status": "passed", + "duration_ms": 31356, + "http_status": 200, + "evidence": null, + "known_external_blocked": 5 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "test": "test_c6_admin_rejection[chromium]", + "status": "passed", + "duration_ms": 29494, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "id": "S1", + "name": "y-websocket", + "case": "success", + "test": "test_s1_y_websocket_success[chromium]", + "status": "skipped", + "duration_ms": 7, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S1", + "name": "y-websocket", + "case": "rejection", + "test": "test_s1_y_websocket_rejection[chromium]", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S2", + "name": "rdmcp (MCP endpoint)", + "case": "success", + "test": "test_s2_rdmcp_success[chromium]", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S2", + "name": "rdmcp (MCP endpoint)", + "case": "rejection", + "test": "test_s2_rdmcp_rejection[chromium]", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S3", + "name": "aipf_mcp_data_grdm", + "case": "success", + "test": "test_s3_aipf_success[chromium]", + "status": "skipped", + "duration_ms": 1, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S3", + "name": "aipf_mcp_data_grdm", + "case": "rejection", + "test": "test_s3_aipf_rejection[chromium]", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S4", + "name": "OASys", + "case": "success", + "test": "test_s4_oasys_success[chromium]", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S5", + "name": "Shibboleth-SP via test IdP", + "case": "success", + "test": "test_s5_shibboleth_success[chromium]", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S5", + "name": "Shibboleth-SP via test IdP", + "case": "rejection", + "test": "test_s5_shibboleth_rejection[chromium]", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "test": "test_c1_login_rejection", + "status": "passed", + "duration_ms": 344, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S4", + "name": "OASys", + "case": "rejection", + "test": "test_s4_oasys_rejection", + "status": "skipped", + "duration_ms": 720, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261112T085656Z-c69ad2/results.toon b/docs/demo/runs/acc-20261112T085656Z-c69ad2/results.toon new file mode 100644 index 0000000..1034cdf --- /dev/null +++ b/docs/demo/runs/acc-20261112T085656Z-c69ad2/results.toon @@ -0,0 +1,57 @@ +accept: + run_id: acc-20261112T085656Z-c69ad2 + base_url: "http://127.0.0.1:5000" + started: "2026-11-12T08:56:56Z" + duration_ms: 1288938 + only: null + seeded: true + precheck: + healthy: true + services: 24 + pytest_returncode: 1 + evidence_dir: docs/demo/runs/acc-20261112T085656Z-c69ad2 + tracing: off + trace_quarantine: null + expected_scenarios[11]: + - C1 + - C2 + - C3 + - C4 + - C5 + - C6 + - S1 + - S2 + - S3 + - S4 + - S5 + incomplete_scenarios[0]: + summary: + passed: 11 + failed: 1 + error: 0 + skipped: 10 + total: 22 + known_external_blocked: 92 + tests[22]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C1,Login via fakecas,success,"test_c1_login_success[chromium]",passed,66568,200,null,7 + C2,Create project,success,"test_c2_create_project_success[chromium]",passed,118946,200,null,15 + C2,Create project,rejection,"test_c2_create_project_rejection[chromium]",passed,77981,403,null,7 + C3,Upload and download file,success,"test_c3_file_upload_success[chromium]",passed,49868,200,null,4 + C3,Upload and download file,rejection,"test_c3_file_upload_rejection[chromium]",passed,81458,403,null,8 + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",failed,108170,null,null,13 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",passed,105772,4401,null,12 + C5,File preview,success,"test_c5_file_preview_success[chromium]",passed,82007,200,null,9 + C5,File preview,rejection,"test_c5_file_preview_rejection[chromium]",passed,72413,401,null,9 + C6,Institution admin screen,success,"test_c6_admin_success[chromium]",passed,31356,200,null,5 + C6,Institution admin screen,rejection,"test_c6_admin_rejection[chromium]",passed,29494,403,null,3 + S1,y-websocket,success,"test_s1_y_websocket_success[chromium]",skipped,7,null,null,0 + S1,y-websocket,rejection,"test_s1_y_websocket_rejection[chromium]",skipped,2,null,null,0 + S2,rdmcp (MCP endpoint),success,"test_s2_rdmcp_success[chromium]",skipped,0,null,null,0 + S2,rdmcp (MCP endpoint),rejection,"test_s2_rdmcp_rejection[chromium]",skipped,2,null,null,0 + S3,aipf_mcp_data_grdm,success,"test_s3_aipf_success[chromium]",skipped,1,null,null,0 + S3,aipf_mcp_data_grdm,rejection,"test_s3_aipf_rejection[chromium]",skipped,0,null,null,0 + S4,OASys,success,"test_s4_oasys_success[chromium]",skipped,2,null,null,0 + S5,Shibboleth-SP via test IdP,success,"test_s5_shibboleth_success[chromium]",skipped,2,null,null,0 + S5,Shibboleth-SP via test IdP,rejection,"test_s5_shibboleth_rejection[chromium]",skipped,2,null,null,0 + C1,Login via fakecas,rejection,test_c1_login_rejection,passed,344,401,null,0 + S4,OASys,rejection,test_s4_oasys_rejection,skipped,720,null,null,0 diff --git a/docs/demo/runs/acc-20261112T092035Z-e4c24d/collector.json b/docs/demo/runs/acc-20261112T092035Z-e4c24d/collector.json new file mode 100644 index 0000000..ea87fe5 --- /dev/null +++ b/docs/demo/runs/acc-20261112T092035Z-e4c24d/collector.json @@ -0,0 +1,24 @@ +[ + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "failed", + "duration_ms": 76464, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "error", + "duration_ms": 68628, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261112T092035Z-e4c24d/junit.xml b/docs/demo/runs/acc-20261112T092035Z-e4c24d/junit.xml new file mode 100644 index 0000000..c2efdf0 --- /dev/null +++ b/docs/demo/runs/acc-20261112T092035Z-e4c24d/junit.xml @@ -0,0 +1,154 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="1" failures="1" skipped="0" tests="2" time="152.250" timestamp="2026-11-12T18:20:39.931762+09:00" hostname="redacted-host"><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="76.465"><properties><property name="known_external_blocked" value="0" /></properties><failure message="playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. =========================== logs =========================== waiting for navigation until "load" ============================================================">two_contexts = (<Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'>, <Page url='about:blank'>) +login = <function login.<locals>._login at 0x7ea9fe034040> +user_a = {'email': '***', 'password': '***'} +user_b = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0x7ea9fe0340e0> +add_contributor = <function add_contributor.<locals>._add at 0x7ea9fe035620> +run_id = 'acc-20261112T092035Z-e4c24d' +record_property = <function record_property.<locals>.append_property at 0x7ea9fe0358a0> + + @pytest.mark.case("success") + def test_c4_wiki_collab_success(two_contexts, login, user_a, user_b, base_url, api_url, api_write, add_contributor, + run_id, record_property): + """Both users open the same wiki page; text typed by B appears in A's editor and text typed by A in B's.""" + page_a, page_b = two_contexts +> login(page_a, user_a) + +installer/acceptance/test_c4_wiki_collab.py:60: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError</failure></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="68.628"><properties><property name="known_external_blocked" value="0" /></properties><error message="failed on setup with "playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. =========================== logs =========================== waiting for navigation until "load" ============================================================"">page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x7ea9fdf0dc60> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError</error></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261112T092035Z-e4c24d/pytest.log b/docs/demo/runs/acc-20261112T092035Z-e4c24d/pytest.log new file mode 100644 index 0000000..4efb9a6 --- /dev/null +++ b/docs/demo/runs/acc-20261112T092035Z-e4c24d/pytest.log @@ -0,0 +1,171 @@ +FE [100%] +==================================== ERRORS ==================================== +__________ ERROR at setup of test_c4_wiki_collab_rejection[chromium] ___________ + +page = <Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'> +login = <function login.<locals>._login at 0x7ea9fdf0dc60> +user_a = {'email': '***', 'password': '***'} + + @pytest.fixture + def logged_in_page(page, login, user_a): +> login(page, user_a) + +installer/acceptance/conftest.py:344: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError +=================================== FAILURES =================================== +____________________ test_c4_wiki_collab_success[chromium] _____________________ + +two_contexts = (<Page url='http://127.0.0.1:8080/login?service=http%3A%2F%2F127.0.0.1%3A5000%2Fdashboard%2F'>, <Page url='about:blank'>) +login = <function login.<locals>._login at 0x7ea9fe034040> +user_a = {'email': '***', 'password': '***'} +user_b = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0x7ea9fe0340e0> +add_contributor = <function add_contributor.<locals>._add at 0x7ea9fe035620> +run_id = 'acc-20261112T092035Z-e4c24d' +record_property = <function record_property.<locals>.append_property at 0x7ea9fe0358a0> + + @pytest.mark.case("success") + def test_c4_wiki_collab_success(two_contexts, login, user_a, user_b, base_url, api_url, api_write, add_contributor, + run_id, record_property): + """Both users open the same wiki page; text typed by B appears in A's editor and text typed by A in B's.""" + page_a, page_b = two_contexts +> login(page_a, user_a) + +installer/acceptance/test_c4_wiki_collab.py:60: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/conftest.py:338: in _login + page.wait_for_url(re.compile(re.escape(base_url) + r"/(dashboard|myprojects)"), timeout=60_000) +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:21479: in wait_for_url + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:713: in wait_for_url + return await self._main_frame.wait_for_url( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:356: in wait_for_url + await self.wait_for_navigation(url=url, wait_until=wait_until, timeout=timeout) +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: in run_async + return await func() + ^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:285: in rest + navigated_event: "channels.FrameNavigatedEvent" = await wait + ^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:201: in wait_for_promise + raise rewrite_error_message( +.venv/lib/python3.12/site-packages/playwright/_impl/waiter.py:184: in wait_for_promise + result = await race([promise, *self._failures]) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +awaitables = [<Future pending cb=[_handled() at .venv/lib/python3.12/site-packages/playwright/_impl/...e-packages/playwright/_impl/utils/tasks.py:33]>, <Future finished exception=TimeoutError('Timeout 60000ms exceeded.')>] + + async def race(awaitables: Sequence[Awaitable[Any]]) -> Any: + """`Promise.race(awaitables)`: the result, or the error, of the first awaitable + that settles. When several have settled, the first in the list wins. + + The coroutines in the list run as tasks, which are cancelled when the race ends. + A future or a task in the list runs on, as in JS. The errors of the losers are + marked as handled, as Promise.race() handles them. + """ + futures: List["asyncio.Future[Any]"] = [] + owned: List["asyncio.Future[Any]"] = [] + for awaitable in awaitables: + if asyncio.isfuture(awaitable): + futures.append(awaitable) + else: + task: "asyncio.Future[Any]" = asyncio.ensure_future(awaitable) + futures.append(task) + owned.append(task) + for future in futures: + future.add_done_callback(_handled) + try: + await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED) + finally: + winner = next((f for f in futures if f.done()), None) + for task in owned: + if task is not winner: + task.cancel() + assert winner is not None +> return winner.result() + ^^^^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.wait_for_url: Timeout 60000ms exceeded. +E =========================== logs =========================== +E waiting for navigation until "load" +E ============================================================ + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/tasks.py:131: TimeoutError +=============================== warnings summary =============================== +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:55: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +=========================== short test summary info ============================ +ERROR installer/acceptance/test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] +FAILED installer/acceptance/test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] +1 failed, 1 warning, 1 error in 152.14s (0:02:32) diff --git a/docs/demo/runs/acc-20261112T092035Z-e4c24d/results.json b/docs/demo/runs/acc-20261112T092035Z-e4c24d/results.json new file mode 100644 index 0000000..e523031 --- /dev/null +++ b/docs/demo/runs/acc-20261112T092035Z-e4c24d/results.json @@ -0,0 +1,52 @@ +{ + "run_id": "acc-20261112T092035Z-e4c24d", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-12T09:20:35Z", + "duration_ms": 157263, + "only": "C4", + "seeded": false, + "precheck": { + "healthy": true, + "services": 24 + }, + "pytest_returncode": 1, + "evidence_dir": "docs/demo/runs/acc-20261112T092035Z-e4c24d", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C4" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 0, + "failed": 1, + "error": 1, + "skipped": 0, + "total": 2, + "known_external_blocked": 0 + }, + "tests": [ + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "failed", + "duration_ms": 76464, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "error", + "duration_ms": 68628, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261112T092035Z-e4c24d/results.toon b/docs/demo/runs/acc-20261112T092035Z-e4c24d/results.toon new file mode 100644 index 0000000..8a13c00 --- /dev/null +++ b/docs/demo/runs/acc-20261112T092035Z-e4c24d/results.toon @@ -0,0 +1,27 @@ +accept: + run_id: acc-20261112T092035Z-e4c24d + base_url: "http://127.0.0.1:5000" + started: "2026-11-12T09:20:35Z" + duration_ms: 157263 + only: C4 + seeded: false + precheck: + healthy: true + services: 24 + pytest_returncode: 1 + evidence_dir: docs/demo/runs/acc-20261112T092035Z-e4c24d + tracing: off + trace_quarantine: null + expected_scenarios[1]: + - C4 + incomplete_scenarios[0]: + summary: + passed: 0 + failed: 1 + error: 1 + skipped: 0 + total: 2 + known_external_blocked: 0 + tests[2]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",failed,76464,null,null,0 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",error,68628,null,null,0 diff --git a/docs/demo/runs/acc-20261112T092701Z-876a61/collector.json b/docs/demo/runs/acc-20261112T092701Z-876a61/collector.json new file mode 100644 index 0000000..be76d2d --- /dev/null +++ b/docs/demo/runs/acc-20261112T092701Z-876a61/collector.json @@ -0,0 +1,24 @@ +[ + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "failed", + "duration_ms": 114799, + "http_status": null, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 105280, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 12 + } +] diff --git a/docs/demo/runs/acc-20261112T092701Z-876a61/junit.xml b/docs/demo/runs/acc-20261112T092701Z-876a61/junit.xml new file mode 100644 index 0000000..5c76d56 --- /dev/null +++ b/docs/demo/runs/acc-20261112T092701Z-876a61/junit.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="0" failures="1" skipped="0" tests="2" time="224.207" timestamp="2026-11-12T18:33:19.144459+09:00" hostname="redacted-host"><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="114.800"><properties><property name="known_external_blocked" value="13" /></properties><failure message="playwright._impl._errors.TimeoutError: Page.goto: Timeout 30000ms exceeded. Call log: - navigating to "http://127.0.0.1:5000/hxuw9/wiki/home/?edit&view&menu", waiting until "domcontentloaded"">two_contexts = (<Page url='http://127.0.0.1:5000/hxuw9/wiki/home/?edit&view&menu'>, <Page url='http://127.0.0.1:5000/dashboard'>) +login = <function login.<locals>._login at 0x74d130058220> +user_a = {'email': '***', 'password': '***'} +user_b = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0x74d1300582c0> +add_contributor = <function add_contributor.<locals>._add at 0x74d130059800> +run_id = 'acc-20261112T092701Z-876a61' +record_property = <function record_property.<locals>.append_property at 0x74d130059a80> + + @pytest.mark.case("success") + def test_c4_wiki_collab_success(two_contexts, login, user_a, user_b, base_url, api_url, api_write, add_contributor, + run_id, record_property): + """Both users open the same wiki page; text typed by B appears in A's editor and text typed by A in B's.""" + page_a, page_b = two_contexts + login(page_a, user_a) + login(page_b, user_b) + + created = api_write(page_a.context, "POST", api_url + sel.API["nodes"], { + "data": {"type": "nodes", "attributes": {"title": "acceptance C4", "category": "project", "public": False}} + }) + assert created.status == 201, created.text()[:200] + node_id = created.json()["data"]["id"] + try: + add_contributor(page_a.context, node_id, user_id_of(page_b.context, api_url), "write") + +> resp_a = _open_editor(page_a, base_url, node_id) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c4_wiki_collab.py:71: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/test_c4_wiki_collab.py:32: in _open_editor + resp = page.goto(_wiki_edit_url(base_url, node_id), wait_until="domcontentloaded") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:18561: in goto + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:600: in goto + return await self._main_frame.goto( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:217: in goto + await self._channel.goto( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:398: in _mapped + return mapper(await awaitable) + ^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0x74d12ffd3320> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0x74d12fea1e40> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.goto: Timeout 30000ms exceeded. +E Call log: +E - navigating to "http://127.0.0.1:5000/hxuw9/wiki/home/?edit&view&menu", waiting until "domcontentloaded" + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError</failure></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="105.281"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="12" /></properties></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261112T092701Z-876a61/pytest.log b/docs/demo/runs/acc-20261112T092701Z-876a61/pytest.log new file mode 100644 index 0000000..3022ff5 --- /dev/null +++ b/docs/demo/runs/acc-20261112T092701Z-876a61/pytest.log @@ -0,0 +1,80 @@ +F. [100%] +=================================== FAILURES =================================== +____________________ test_c4_wiki_collab_success[chromium] _____________________ + +two_contexts = (<Page url='http://127.0.0.1:5000/hxuw9/wiki/home/?edit&view&menu'>, <Page url='http://127.0.0.1:5000/dashboard'>) +login = <function login.<locals>._login at 0x74d130058220> +user_a = {'email': '***', 'password': '***'} +user_b = {'email': '***', 'password': '***'} +base_url = 'http://127.0.0.1:5000', api_url = 'http://127.0.0.1:8000' +api_write = <function api_write.<locals>._write at 0x74d1300582c0> +add_contributor = <function add_contributor.<locals>._add at 0x74d130059800> +run_id = 'acc-20261112T092701Z-876a61' +record_property = <function record_property.<locals>.append_property at 0x74d130059a80> + + @pytest.mark.case("success") + def test_c4_wiki_collab_success(two_contexts, login, user_a, user_b, base_url, api_url, api_write, add_contributor, + run_id, record_property): + """Both users open the same wiki page; text typed by B appears in A's editor and text typed by A in B's.""" + page_a, page_b = two_contexts + login(page_a, user_a) + login(page_b, user_b) + + created = api_write(page_a.context, "POST", api_url + sel.API["nodes"], { + "data": {"type": "nodes", "attributes": {"title": "acceptance C4", "category": "project", "public": False}} + }) + assert created.status == 201, created.text()[:200] + node_id = created.json()["data"]["id"] + try: + add_contributor(page_a.context, node_id, user_id_of(page_b.context, api_url), "write") + +> resp_a = _open_editor(page_a, base_url, node_id) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +installer/acceptance/test_c4_wiki_collab.py:71: +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +installer/acceptance/test_c4_wiki_collab.py:32: in _open_editor + resp = page.goto(_wiki_edit_url(base_url, node_id), wait_until="domcontentloaded") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/sync_api/_generated.py:18561: in goto + self._sync( +.venv/lib/python3.12/site-packages/playwright/_impl/page.py:600: in goto + return await self._main_frame.goto( +.venv/lib/python3.12/site-packages/playwright/_impl/frame.py:217: in goto + await self._channel.goto( +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:398: in _mapped + return mapper(await awaitable) + ^^^^^^^^^^^^^^^ +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:387: in finish + raise e from None +.venv/lib/python3.12/site-packages/playwright/_impl/channel_owner.py:352: in finish + result = await zone.run_async(lambda: awaitable) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + +self = <playwright._impl.utils.zones.Zone object at 0x74d12ffd3320> +func = <function ChannelOwner._wrap_api_call.<locals>.finish.<locals>.<lambda> at 0x74d12fea1e40> + + async def run_async(self, func: Callable[[], Awaitable[R]]) -> R: + # Python: run() of an async function. The coroutine runs when it is awaited, + # so the zone must be current while it is awaited, not while it is created. + token = *** + try: +> return await func() + ^^^^^^^^^^^^ +E playwright._impl._errors.TimeoutError: Page.goto: Timeout 30000ms exceeded. +E Call log: +E - navigating to "http://127.0.0.1:5000/hxuw9/wiki/home/?edit&view&menu", waiting until "domcontentloaded" + +.venv/lib/python3.12/site-packages/playwright/_impl/utils/zones.py:58: TimeoutError +=============================== warnings summary =============================== +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:55: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] + test_c4_wiki_collab.py:85: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +=========================== short test summary info ============================ +FAILED installer/acceptance/test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] +1 failed, 1 passed, 2 warnings in 224.09s (0:03:44) diff --git a/docs/demo/runs/acc-20261112T092701Z-876a61/results.json b/docs/demo/runs/acc-20261112T092701Z-876a61/results.json new file mode 100644 index 0000000..dfa5f79 --- /dev/null +++ b/docs/demo/runs/acc-20261112T092701Z-876a61/results.json @@ -0,0 +1,52 @@ +{ + "run_id": "acc-20261112T092701Z-876a61", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-12T09:27:01Z", + "duration_ms": 674667, + "only": "C4", + "seeded": true, + "precheck": { + "healthy": true, + "services": 24 + }, + "pytest_returncode": 1, + "evidence_dir": "docs/demo/runs/acc-20261112T092701Z-876a61", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C4" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 1, + "failed": 1, + "error": 0, + "skipped": 0, + "total": 2, + "known_external_blocked": 25 + }, + "tests": [ + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "failed", + "duration_ms": 114799, + "http_status": null, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "passed", + "duration_ms": 105280, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 12 + } + ] +} diff --git a/docs/demo/runs/acc-20261112T092701Z-876a61/results.toon b/docs/demo/runs/acc-20261112T092701Z-876a61/results.toon new file mode 100644 index 0000000..fead53c --- /dev/null +++ b/docs/demo/runs/acc-20261112T092701Z-876a61/results.toon @@ -0,0 +1,27 @@ +accept: + run_id: acc-20261112T092701Z-876a61 + base_url: "http://127.0.0.1:5000" + started: "2026-11-12T09:27:01Z" + duration_ms: 674667 + only: C4 + seeded: true + precheck: + healthy: true + services: 24 + pytest_returncode: 1 + evidence_dir: docs/demo/runs/acc-20261112T092701Z-876a61 + tracing: off + trace_quarantine: null + expected_scenarios[1]: + - C4 + incomplete_scenarios[0]: + summary: + passed: 1 + failed: 1 + error: 0 + skipped: 0 + total: 2 + known_external_blocked: 25 + tests[2]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",failed,114799,null,null,13 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",passed,105280,4401,null,12 diff --git a/docs/demo/runs/acc-20261112T095258Z-308ef1/collector.json b/docs/demo/runs/acc-20261112T095258Z-308ef1/collector.json new file mode 100644 index 0000000..fdcb620 --- /dev/null +++ b/docs/demo/runs/acc-20261112T095258Z-308ef1/collector.json @@ -0,0 +1,24 @@ +[ + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "passed", + "duration_ms": 182550, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 107832, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 12 + } +] diff --git a/docs/demo/runs/acc-20261112T095258Z-308ef1/junit.xml b/docs/demo/runs/acc-20261112T095258Z-308ef1/junit.xml new file mode 100644 index 0000000..3808d27 --- /dev/null +++ b/docs/demo/runs/acc-20261112T095258Z-308ef1/junit.xml @@ -0,0 +1 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="2" time="290.970" timestamp="2026-11-12T18:59:16.177178+09:00" hostname="redacted-host"><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="182.551"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="18" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="107.832"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="12" /></properties></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261112T095258Z-308ef1/pytest.log b/docs/demo/runs/acc-20261112T095258Z-308ef1/pytest.log new file mode 100644 index 0000000..fc29cae --- /dev/null +++ b/docs/demo/runs/acc-20261112T095258Z-308ef1/pytest.log @@ -0,0 +1,10 @@ +.. [100%] +=============================== warnings summary =============================== +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:55: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] + test_c4_wiki_collab.py:85: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +2 passed, 2 warnings in 290.86s (0:04:50) diff --git a/docs/demo/runs/acc-20261112T095258Z-308ef1/results.json b/docs/demo/runs/acc-20261112T095258Z-308ef1/results.json new file mode 100644 index 0000000..332576d --- /dev/null +++ b/docs/demo/runs/acc-20261112T095258Z-308ef1/results.json @@ -0,0 +1,52 @@ +{ + "run_id": "acc-20261112T095258Z-308ef1", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-12T09:52:58Z", + "duration_ms": 745761, + "only": "C4", + "seeded": true, + "precheck": { + "healthy": true, + "services": 24 + }, + "pytest_returncode": 0, + "evidence_dir": "docs/demo/runs/acc-20261112T095258Z-308ef1", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C4" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 2, + "failed": 0, + "error": 0, + "skipped": 0, + "total": 2, + "known_external_blocked": 30 + }, + "tests": [ + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "passed", + "duration_ms": 182550, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "passed", + "duration_ms": 107832, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 12 + } + ] +} diff --git a/docs/demo/runs/acc-20261112T095258Z-308ef1/results.toon b/docs/demo/runs/acc-20261112T095258Z-308ef1/results.toon new file mode 100644 index 0000000..b72f2d6 --- /dev/null +++ b/docs/demo/runs/acc-20261112T095258Z-308ef1/results.toon @@ -0,0 +1,27 @@ +accept: + run_id: acc-20261112T095258Z-308ef1 + base_url: "http://127.0.0.1:5000" + started: "2026-11-12T09:52:58Z" + duration_ms: 745761 + only: C4 + seeded: true + precheck: + healthy: true + services: 24 + pytest_returncode: 0 + evidence_dir: docs/demo/runs/acc-20261112T095258Z-308ef1 + tracing: off + trace_quarantine: null + expected_scenarios[1]: + - C4 + incomplete_scenarios[0]: + summary: + passed: 2 + failed: 0 + error: 0 + skipped: 0 + total: 2 + known_external_blocked: 30 + tests[2]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",passed,182550,200,null,18 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",passed,107832,4401,null,12 diff --git a/docs/demo/runs/acc-20261112T223428Z-fda84a/collector.json b/docs/demo/runs/acc-20261112T223428Z-fda84a/collector.json new file mode 100644 index 0000000..ff41515 --- /dev/null +++ b/docs/demo/runs/acc-20261112T223428Z-fda84a/collector.json @@ -0,0 +1,156 @@ +[ + { + "nodeid": "test_c1_login.py::test_c1_login_success[chromium]", + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "status": "passed", + "duration_ms": 2876, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_success[chromium]", + "id": "C2", + "name": "Create project", + "case": "success", + "status": "passed", + "duration_ms": 5519, + "http_status": 200, + "evidence": null, + "known_external_blocked": 14 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_rejection[chromium]", + "id": "C2", + "name": "Create project", + "case": "rejection", + "status": "passed", + "duration_ms": 4558, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "success", + "status": "passed", + "duration_ms": 3755, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "status": "passed", + "duration_ms": 4671, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "passed", + "duration_ms": 8969, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 4935, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_success[chromium]", + "id": "C5", + "name": "File preview", + "case": "success", + "status": "passed", + "duration_ms": 6090, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_rejection[chromium]", + "id": "C5", + "name": "File preview", + "case": "rejection", + "status": "passed", + "duration_ms": 5267, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_success[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "status": "passed", + "duration_ms": 1849, + "http_status": 200, + "evidence": null, + "known_external_blocked": 6 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_rejection[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "status": "passed", + "duration_ms": 809, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "nodeid": "test_c7_file_editor.py::test_c7_file_editor_success[chromium]", + "id": "C7", + "name": "File page collaborative edit", + "case": "success", + "status": "passed", + "duration_ms": 10296, + "http_status": 200, + "evidence": null, + "known_external_blocked": 22 + }, + { + "nodeid": "test_c7_file_editor.py::test_c7_file_editor_rejection[chromium]", + "id": "C7", + "name": "File page collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 7473, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 17 + }, + { + "nodeid": "test_c1_login.py::test_c1_login_rejection", + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "status": "passed", + "duration_ms": 113, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261112T223428Z-fda84a/junit.xml b/docs/demo/runs/acc-20261112T223428Z-fda84a/junit.xml new file mode 100644 index 0000000..b96d4fa --- /dev/null +++ b/docs/demo/runs/acc-20261112T223428Z-fda84a/junit.xml @@ -0,0 +1 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="14" time="67.272" timestamp="2026-11-13T07:34:48.028943+09:00" hostname="redacted-host"><testcase classname="test_c1_login" name="test_c1_login_success[chromium]" time="2.877"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="7" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_success[chromium]" time="5.521"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="14" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_rejection[chromium]" time="4.560"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_success[chromium]" time="3.757"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="4" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_rejection[chromium]" time="4.673"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="8.971"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="18" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="4.936"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="13" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="6.092"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_rejection[chromium]" time="5.269"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="1.850"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="6" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_rejection[chromium]" time="0.811"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="3" /></properties></testcase><testcase classname="test_c7_file_editor" name="test_c7_file_editor_success[chromium]" time="10.297"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="22" /></properties></testcase><testcase classname="test_c7_file_editor" name="test_c7_file_editor_rejection[chromium]" time="7.474"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="17" /></properties></testcase><testcase classname="test_c1_login" name="test_c1_login_rejection" time="0.114"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="0" /></properties></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261112T223428Z-fda84a/pytest.log b/docs/demo/runs/acc-20261112T223428Z-fda84a/pytest.log new file mode 100644 index 0000000..b9f4467 --- /dev/null +++ b/docs/demo/runs/acc-20261112T223428Z-fda84a/pytest.log @@ -0,0 +1,46 @@ +.............. [100%] +=============================== warnings summary =============================== +test_c1_login.py::test_c1_login_success[chromium] + test_c1_login.py:10: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_success[chromium] + test_c2_create_project.py:11: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_rejection[chromium] + test_c2_create_project.py:39: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_success[chromium] + test_c3_file_upload.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] + test_c3_file_upload.py:43: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:55: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] + test_c4_wiki_collab.py:85: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_success[chromium] + test_c5_file_preview.py:16: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] + test_c5_file_preview.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_success[chromium] + test_c6_admin.py:40: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_rejection[chromium] + test_c6_admin.py:60: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c7_file_editor.py::test_c7_file_editor_success[chromium] + test_c7_file_editor.py:45: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c7_file_editor.py::test_c7_file_editor_rejection[chromium] + test_c7_file_editor.py:75: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c1_login.py::test_c1_login_rejection + test_c1_login.py:20: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +14 passed, 10 deselected, 14 warnings in 67.27s (0:01:07) diff --git a/docs/demo/runs/acc-20261112T223428Z-fda84a/results.json b/docs/demo/runs/acc-20261112T223428Z-fda84a/results.json new file mode 100644 index 0000000..d1f6cb2 --- /dev/null +++ b/docs/demo/runs/acc-20261112T223428Z-fda84a/results.json @@ -0,0 +1,190 @@ +{ + "run_id": "acc-20261112T223428Z-fda84a", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-12T22:34:28Z", + "duration_ms": 91628, + "only": "core", + "seeded": true, + "precheck": { + "healthy": true, + "services": 23 + }, + "pytest_returncode": 0, + "evidence_dir": "docs/demo/runs/acc-20261112T223428Z-fda84a", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C1", + "C2", + "C3", + "C4", + "C5", + "C6", + "C7" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 14, + "failed": 0, + "error": 0, + "skipped": 0, + "total": 14, + "known_external_blocked": 138 + }, + "tests": [ + { + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "test": "test_c1_login_success[chromium]", + "status": "passed", + "duration_ms": 2876, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C2", + "name": "Create project", + "case": "success", + "test": "test_c2_create_project_success[chromium]", + "status": "passed", + "duration_ms": 5519, + "http_status": 200, + "evidence": null, + "known_external_blocked": 14 + }, + { + "id": "C2", + "name": "Create project", + "case": "rejection", + "test": "test_c2_create_project_rejection[chromium]", + "status": "passed", + "duration_ms": 4558, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "success", + "test": "test_c3_file_upload_success[chromium]", + "status": "passed", + "duration_ms": 3755, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "test": "test_c3_file_upload_rejection[chromium]", + "status": "passed", + "duration_ms": 4671, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "passed", + "duration_ms": 8969, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "passed", + "duration_ms": 4935, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C5", + "name": "File preview", + "case": "success", + "test": "test_c5_file_preview_success[chromium]", + "status": "passed", + "duration_ms": 6090, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C5", + "name": "File preview", + "case": "rejection", + "test": "test_c5_file_preview_rejection[chromium]", + "status": "passed", + "duration_ms": 5267, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "test": "test_c6_admin_success[chromium]", + "status": "passed", + "duration_ms": 1849, + "http_status": 200, + "evidence": null, + "known_external_blocked": 6 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "test": "test_c6_admin_rejection[chromium]", + "status": "passed", + "duration_ms": 809, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "id": "C7", + "name": "File page collaborative edit", + "case": "success", + "test": "test_c7_file_editor_success[chromium]", + "status": "passed", + "duration_ms": 10296, + "http_status": 200, + "evidence": null, + "known_external_blocked": 22 + }, + { + "id": "C7", + "name": "File page collaborative edit", + "case": "rejection", + "test": "test_c7_file_editor_rejection[chromium]", + "status": "passed", + "duration_ms": 7473, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 17 + }, + { + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "test": "test_c1_login_rejection", + "status": "passed", + "duration_ms": 113, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261112T223428Z-fda84a/results.toon b/docs/demo/runs/acc-20261112T223428Z-fda84a/results.toon new file mode 100644 index 0000000..6ea27b1 --- /dev/null +++ b/docs/demo/runs/acc-20261112T223428Z-fda84a/results.toon @@ -0,0 +1,45 @@ +accept: + run_id: acc-20261112T223428Z-fda84a + base_url: "http://127.0.0.1:5000" + started: "2026-11-12T22:34:28Z" + duration_ms: 91628 + only: core + seeded: true + precheck: + healthy: true + services: 23 + pytest_returncode: 0 + evidence_dir: docs/demo/runs/acc-20261112T223428Z-fda84a + tracing: off + trace_quarantine: null + expected_scenarios[7]: + - C1 + - C2 + - C3 + - C4 + - C5 + - C6 + - C7 + incomplete_scenarios[0]: + summary: + passed: 14 + failed: 0 + error: 0 + skipped: 0 + total: 14 + known_external_blocked: 138 + tests[14]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C1,Login via fakecas,success,"test_c1_login_success[chromium]",passed,2876,200,null,7 + C2,Create project,success,"test_c2_create_project_success[chromium]",passed,5519,200,null,14 + C2,Create project,rejection,"test_c2_create_project_rejection[chromium]",passed,4558,403,null,8 + C3,Upload and download file,success,"test_c3_file_upload_success[chromium]",passed,3755,200,null,4 + C3,Upload and download file,rejection,"test_c3_file_upload_rejection[chromium]",passed,4671,403,null,8 + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",passed,8969,200,null,18 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",passed,4935,4401,null,13 + C5,File preview,success,"test_c5_file_preview_success[chromium]",passed,6090,200,null,9 + C5,File preview,rejection,"test_c5_file_preview_rejection[chromium]",passed,5267,401,null,9 + C6,Institution admin screen,success,"test_c6_admin_success[chromium]",passed,1849,200,null,6 + C6,Institution admin screen,rejection,"test_c6_admin_rejection[chromium]",passed,809,403,null,3 + C7,File page collaborative edit,success,"test_c7_file_editor_success[chromium]",passed,10296,200,null,22 + C7,File page collaborative edit,rejection,"test_c7_file_editor_rejection[chromium]",passed,7473,4401,null,17 + C1,Login via fakecas,rejection,test_c1_login_rejection,passed,113,401,null,0 diff --git a/docs/demo/runs/acc-20261113T021549Z-92641d/collector.json b/docs/demo/runs/acc-20261113T021549Z-92641d/collector.json new file mode 100644 index 0000000..169bf2c --- /dev/null +++ b/docs/demo/runs/acc-20261113T021549Z-92641d/collector.json @@ -0,0 +1,156 @@ +[ + { + "nodeid": "test_c1_login.py::test_c1_login_success[chromium]", + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "status": "passed", + "duration_ms": 1363, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_success[chromium]", + "id": "C2", + "name": "Create project", + "case": "success", + "status": "passed", + "duration_ms": 3164, + "http_status": 200, + "evidence": null, + "known_external_blocked": 12 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_rejection[chromium]", + "id": "C2", + "name": "Create project", + "case": "rejection", + "status": "passed", + "duration_ms": 2126, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "success", + "status": "passed", + "duration_ms": 1466, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "status": "passed", + "duration_ms": 2446, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "passed", + "duration_ms": 5899, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 3113, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_success[chromium]", + "id": "C5", + "name": "File preview", + "case": "success", + "status": "passed", + "duration_ms": 3485, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_rejection[chromium]", + "id": "C5", + "name": "File preview", + "case": "rejection", + "status": "passed", + "duration_ms": 2413, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_success[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "status": "passed", + "duration_ms": 1216, + "http_status": 200, + "evidence": null, + "known_external_blocked": 6 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_rejection[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "status": "passed", + "duration_ms": 621, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "nodeid": "test_c7_file_editor.py::test_c7_file_editor_success[chromium]", + "id": "C7", + "name": "File page collaborative edit", + "case": "success", + "status": "passed", + "duration_ms": 6170, + "http_status": 200, + "evidence": null, + "known_external_blocked": 20 + }, + { + "nodeid": "test_c7_file_editor.py::test_c7_file_editor_rejection[chromium]", + "id": "C7", + "name": "File page collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 5031, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 17 + }, + { + "nodeid": "test_c1_login.py::test_c1_login_rejection", + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "status": "passed", + "duration_ms": 138, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261113T021549Z-92641d/junit.xml b/docs/demo/runs/acc-20261113T021549Z-92641d/junit.xml new file mode 100644 index 0000000..ed54e6a --- /dev/null +++ b/docs/demo/runs/acc-20261113T021549Z-92641d/junit.xml @@ -0,0 +1 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="14" time="38.741" timestamp="2026-11-13T11:16:06.016472+09:00" hostname="redacted-host"><testcase classname="test_c1_login" name="test_c1_login_success[chromium]" time="1.365"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="7" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_success[chromium]" time="3.165"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="12" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_rejection[chromium]" time="2.128"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_success[chromium]" time="1.467"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="4" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_rejection[chromium]" time="2.447"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="5.901"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="18" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="3.115"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="13" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="3.486"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_rejection[chromium]" time="2.415"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="1.217"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="6" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_rejection[chromium]" time="0.623"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="3" /></properties></testcase><testcase classname="test_c7_file_editor" name="test_c7_file_editor_success[chromium]" time="6.172"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="20" /></properties></testcase><testcase classname="test_c7_file_editor" name="test_c7_file_editor_rejection[chromium]" time="5.033"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="17" /></properties></testcase><testcase classname="test_c1_login" name="test_c1_login_rejection" time="0.140"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="0" /></properties></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261113T021549Z-92641d/pytest.log b/docs/demo/runs/acc-20261113T021549Z-92641d/pytest.log new file mode 100644 index 0000000..f7f3aee --- /dev/null +++ b/docs/demo/runs/acc-20261113T021549Z-92641d/pytest.log @@ -0,0 +1,46 @@ +.............. [100%] +=============================== warnings summary =============================== +test_c1_login.py::test_c1_login_success[chromium] + test_c1_login.py:10: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_success[chromium] + test_c2_create_project.py:11: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_rejection[chromium] + test_c2_create_project.py:39: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_success[chromium] + test_c3_file_upload.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] + test_c3_file_upload.py:43: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:55: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] + test_c4_wiki_collab.py:85: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_success[chromium] + test_c5_file_preview.py:16: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] + test_c5_file_preview.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_success[chromium] + test_c6_admin.py:40: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_rejection[chromium] + test_c6_admin.py:60: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c7_file_editor.py::test_c7_file_editor_success[chromium] + test_c7_file_editor.py:45: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c7_file_editor.py::test_c7_file_editor_rejection[chromium] + test_c7_file_editor.py:75: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c1_login.py::test_c1_login_rejection + test_c1_login.py:20: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +14 passed, 10 deselected, 14 warnings in 38.74s diff --git a/docs/demo/runs/acc-20261113T021549Z-92641d/results.json b/docs/demo/runs/acc-20261113T021549Z-92641d/results.json new file mode 100644 index 0000000..0b94c4b --- /dev/null +++ b/docs/demo/runs/acc-20261113T021549Z-92641d/results.json @@ -0,0 +1,190 @@ +{ + "run_id": "acc-20261113T021549Z-92641d", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-13T02:15:49Z", + "duration_ms": 58735, + "only": "core", + "seeded": true, + "precheck": { + "healthy": true, + "services": 23 + }, + "pytest_returncode": 0, + "evidence_dir": "docs/demo/runs/acc-20261113T021549Z-92641d", + "tracing": "off", + "trace_quarantine": null, + "expected_scenarios": [ + "C1", + "C2", + "C3", + "C4", + "C5", + "C6", + "C7" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 14, + "failed": 0, + "error": 0, + "skipped": 0, + "total": 14, + "known_external_blocked": 134 + }, + "tests": [ + { + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "test": "test_c1_login_success[chromium]", + "status": "passed", + "duration_ms": 1363, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C2", + "name": "Create project", + "case": "success", + "test": "test_c2_create_project_success[chromium]", + "status": "passed", + "duration_ms": 3164, + "http_status": 200, + "evidence": null, + "known_external_blocked": 12 + }, + { + "id": "C2", + "name": "Create project", + "case": "rejection", + "test": "test_c2_create_project_rejection[chromium]", + "status": "passed", + "duration_ms": 2126, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "success", + "test": "test_c3_file_upload_success[chromium]", + "status": "passed", + "duration_ms": 1466, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "test": "test_c3_file_upload_rejection[chromium]", + "status": "passed", + "duration_ms": 2446, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "passed", + "duration_ms": 5899, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "passed", + "duration_ms": 3113, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C5", + "name": "File preview", + "case": "success", + "test": "test_c5_file_preview_success[chromium]", + "status": "passed", + "duration_ms": 3485, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C5", + "name": "File preview", + "case": "rejection", + "test": "test_c5_file_preview_rejection[chromium]", + "status": "passed", + "duration_ms": 2413, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "test": "test_c6_admin_success[chromium]", + "status": "passed", + "duration_ms": 1216, + "http_status": 200, + "evidence": null, + "known_external_blocked": 6 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "test": "test_c6_admin_rejection[chromium]", + "status": "passed", + "duration_ms": 621, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "id": "C7", + "name": "File page collaborative edit", + "case": "success", + "test": "test_c7_file_editor_success[chromium]", + "status": "passed", + "duration_ms": 6170, + "http_status": 200, + "evidence": null, + "known_external_blocked": 20 + }, + { + "id": "C7", + "name": "File page collaborative edit", + "case": "rejection", + "test": "test_c7_file_editor_rejection[chromium]", + "status": "passed", + "duration_ms": 5031, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 17 + }, + { + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "test": "test_c1_login_rejection", + "status": "passed", + "duration_ms": 138, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261113T021549Z-92641d/results.toon b/docs/demo/runs/acc-20261113T021549Z-92641d/results.toon new file mode 100644 index 0000000..43de6a1 --- /dev/null +++ b/docs/demo/runs/acc-20261113T021549Z-92641d/results.toon @@ -0,0 +1,45 @@ +accept: + run_id: acc-20261113T021549Z-92641d + base_url: "http://127.0.0.1:5000" + started: "2026-11-13T02:15:49Z" + duration_ms: 58735 + only: core + seeded: true + precheck: + healthy: true + services: 23 + pytest_returncode: 0 + evidence_dir: docs/demo/runs/acc-20261113T021549Z-92641d + tracing: off + trace_quarantine: null + expected_scenarios[7]: + - C1 + - C2 + - C3 + - C4 + - C5 + - C6 + - C7 + incomplete_scenarios[0]: + summary: + passed: 14 + failed: 0 + error: 0 + skipped: 0 + total: 14 + known_external_blocked: 134 + tests[14]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C1,Login via fakecas,success,"test_c1_login_success[chromium]",passed,1363,200,null,7 + C2,Create project,success,"test_c2_create_project_success[chromium]",passed,3164,200,null,12 + C2,Create project,rejection,"test_c2_create_project_rejection[chromium]",passed,2126,403,null,8 + C3,Upload and download file,success,"test_c3_file_upload_success[chromium]",passed,1466,200,null,4 + C3,Upload and download file,rejection,"test_c3_file_upload_rejection[chromium]",passed,2446,403,null,8 + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",passed,5899,200,null,18 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",passed,3113,4401,null,13 + C5,File preview,success,"test_c5_file_preview_success[chromium]",passed,3485,200,null,9 + C5,File preview,rejection,"test_c5_file_preview_rejection[chromium]",passed,2413,401,null,9 + C6,Institution admin screen,success,"test_c6_admin_success[chromium]",passed,1216,200,null,6 + C6,Institution admin screen,rejection,"test_c6_admin_rejection[chromium]",passed,621,403,null,3 + C7,File page collaborative edit,success,"test_c7_file_editor_success[chromium]",passed,6170,200,null,20 + C7,File page collaborative edit,rejection,"test_c7_file_editor_rejection[chromium]",passed,5031,4401,null,17 + C1,Login via fakecas,rejection,test_c1_login_rejection,passed,138,401,null,0 diff --git a/docs/demo/runs/acc-20261113T024626Z-b2178f/collector.json b/docs/demo/runs/acc-20261113T024626Z-b2178f/collector.json new file mode 100644 index 0000000..15a4b0f --- /dev/null +++ b/docs/demo/runs/acc-20261113T024626Z-b2178f/collector.json @@ -0,0 +1,266 @@ +[ + { + "nodeid": "test_c1_login.py::test_c1_login_success[chromium]", + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "status": "passed", + "duration_ms": 2602, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_success[chromium]", + "id": "C2", + "name": "Create project", + "case": "success", + "status": "passed", + "duration_ms": 4163, + "http_status": 200, + "evidence": null, + "known_external_blocked": 14 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_rejection[chromium]", + "id": "C2", + "name": "Create project", + "case": "rejection", + "status": "passed", + "duration_ms": 3817, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "success", + "status": "passed", + "duration_ms": 2940, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "status": "passed", + "duration_ms": 4125, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "passed", + "duration_ms": 7767, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 4449, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_success[chromium]", + "id": "C5", + "name": "File preview", + "case": "success", + "status": "passed", + "duration_ms": 5700, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_rejection[chromium]", + "id": "C5", + "name": "File preview", + "case": "rejection", + "status": "passed", + "duration_ms": 4251, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_success[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "status": "passed", + "duration_ms": 1656, + "http_status": 200, + "evidence": null, + "known_external_blocked": 6 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_rejection[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "status": "passed", + "duration_ms": 698, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "nodeid": "test_c7_file_editor.py::test_c7_file_editor_success[chromium]", + "id": "C7", + "name": "File page collaborative edit", + "case": "success", + "status": "passed", + "duration_ms": 8792, + "http_status": 200, + "evidence": null, + "known_external_blocked": 22 + }, + { + "nodeid": "test_c7_file_editor.py::test_c7_file_editor_rejection[chromium]", + "id": "C7", + "name": "File page collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 6475, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 17 + }, + { + "nodeid": "test_s1_y_websocket.py::test_s1_y_websocket_success[chromium]", + "id": "S1", + "name": "y-websocket", + "case": "success", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s1_y_websocket.py::test_s1_y_websocket_rejection[chromium]", + "id": "S1", + "name": "y-websocket", + "case": "rejection", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s2_rdmcp.py::test_s2_rdmcp_success[chromium]", + "id": "S2", + "name": "rdmcp (MCP endpoint)", + "case": "success", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s2_rdmcp.py::test_s2_rdmcp_rejection[chromium]", + "id": "S2", + "name": "rdmcp (MCP endpoint)", + "case": "rejection", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s3_aipf.py::test_s3_aipf_success[chromium]", + "id": "S3", + "name": "aipf_mcp_data_grdm", + "case": "success", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s3_aipf.py::test_s3_aipf_rejection[chromium]", + "id": "S3", + "name": "aipf_mcp_data_grdm", + "case": "rejection", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s4_oasys.py::test_s4_oasys_success[chromium]", + "id": "S4", + "name": "OASys", + "case": "success", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s5_shibboleth.py::test_s5_shibboleth_success[chromium]", + "id": "S5", + "name": "Shibboleth-SP via test IdP", + "case": "success", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s5_shibboleth.py::test_s5_shibboleth_rejection[chromium]", + "id": "S5", + "name": "Shibboleth-SP via test IdP", + "case": "rejection", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c1_login.py::test_c1_login_rejection", + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "status": "passed", + "duration_ms": 58, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s4_oasys.py::test_s4_oasys_rejection", + "id": "S4", + "name": "OASys", + "case": "rejection", + "status": "skipped", + "duration_ms": 34, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261113T024626Z-b2178f/junit.xml b/docs/demo/runs/acc-20261113T024626Z-b2178f/junit.xml new file mode 100644 index 0000000..dd5f0f3 --- /dev/null +++ b/docs/demo/runs/acc-20261113T024626Z-b2178f/junit.xml @@ -0,0 +1 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="0" failures="0" skipped="10" tests="24" time="57.669" timestamp="2026-11-13T11:46:46.008823+09:00" hostname="redacted-host"><testcase classname="test_c1_login" name="test_c1_login_success[chromium]" time="2.604"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="7" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_success[chromium]" time="4.165"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="14" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_rejection[chromium]" time="3.818"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_success[chromium]" time="2.941"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="4" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_rejection[chromium]" time="4.126"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="7.768"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="18" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="4.451"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="13" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="5.702"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_rejection[chromium]" time="4.253"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="1.657"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="6" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_rejection[chromium]" time="0.700"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="3" /></properties></testcase><testcase classname="test_c7_file_editor" name="test_c7_file_editor_success[chromium]" time="8.793"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="22" /></properties></testcase><testcase classname="test_c7_file_editor" name="test_c7_file_editor_rejection[chromium]" time="6.476"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="17" /></properties></testcase><testcase classname="test_s1_y_websocket" name="test_s1_y_websocket_success[chromium]" time="0.000"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s1_y_websocket.py:65: M3</skipped></testcase><testcase classname="test_s1_y_websocket" name="test_s1_y_websocket_rejection[chromium]" time="0.000"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s1_y_websocket.py:91: M3</skipped></testcase><testcase classname="test_s2_rdmcp" name="test_s2_rdmcp_success[chromium]" time="0.000"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s2_rdmcp.py:80: M3</skipped></testcase><testcase classname="test_s2_rdmcp" name="test_s2_rdmcp_rejection[chromium]" time="0.000"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s2_rdmcp.py:99: M3</skipped></testcase><testcase classname="test_s3_aipf" name="test_s3_aipf_success[chromium]" time="0.000"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s3_aipf.py:78: M3</skipped></testcase><testcase classname="test_s3_aipf" name="test_s3_aipf_rejection[chromium]" time="0.000"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s3_aipf.py:96: M3</skipped></testcase><testcase classname="test_s4_oasys" name="test_s4_oasys_success[chromium]" time="0.000"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s4_oasys.py:46: M3</skipped></testcase><testcase classname="test_s5_shibboleth" name="test_s5_shibboleth_success[chromium]" time="0.000"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s5_shibboleth.py:97: M3</skipped></testcase><testcase classname="test_s5_shibboleth" name="test_s5_shibboleth_rejection[chromium]" time="0.000"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s5_shibboleth.py:121: M3</skipped></testcase><testcase classname="test_c1_login" name="test_c1_login_rejection" time="0.060"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="0" /></properties></testcase><testcase classname="test_s4_oasys" name="test_s4_oasys_rejection" time="0.034"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s4_oasys.py:66: M3</skipped></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261113T024626Z-b2178f/pytest.log b/docs/demo/runs/acc-20261113T024626Z-b2178f/pytest.log new file mode 100644 index 0000000..8617785 --- /dev/null +++ b/docs/demo/runs/acc-20261113T024626Z-b2178f/pytest.log @@ -0,0 +1,57 @@ +.............sssssssss.s [100%] +=============================== warnings summary =============================== +test_c1_login.py::test_c1_login_success[chromium] + test_c1_login.py:11: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_success[chromium] + test_c2_create_project.py:11: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_rejection[chromium] + test_c2_create_project.py:39: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_success[chromium] + test_c3_file_upload.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] + test_c3_file_upload.py:43: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:55: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] + test_c4_wiki_collab.py:85: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_success[chromium] + test_c5_file_preview.py:17: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] + test_c5_file_preview.py:30: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_success[chromium] + test_c6_admin.py:40: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_rejection[chromium] + test_c6_admin.py:60: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c7_file_editor.py::test_c7_file_editor_success[chromium] + test_c7_file_editor.py:45: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c7_file_editor.py::test_c7_file_editor_rejection[chromium] + test_c7_file_editor.py:75: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c1_login.py::test_c1_login_rejection + test_c1_login.py:21: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +=========================== short test summary info ============================ +SKIPPED [1] installer/acceptance/test_s1_y_websocket.py:65: M3 +SKIPPED [1] installer/acceptance/test_s1_y_websocket.py:91: M3 +SKIPPED [1] installer/acceptance/test_s2_rdmcp.py:80: M3 +SKIPPED [1] installer/acceptance/test_s2_rdmcp.py:99: M3 +SKIPPED [1] installer/acceptance/test_s3_aipf.py:78: M3 +SKIPPED [1] installer/acceptance/test_s3_aipf.py:96: M3 +SKIPPED [1] installer/acceptance/test_s4_oasys.py:46: M3 +SKIPPED [1] installer/acceptance/test_s5_shibboleth.py:97: M3 +SKIPPED [1] installer/acceptance/test_s5_shibboleth.py:121: M3 +SKIPPED [1] installer/acceptance/test_s4_oasys.py:66: M3 +14 passed, 10 skipped, 14 warnings in 57.66s diff --git a/docs/demo/runs/acc-20261113T024626Z-b2178f/results.json b/docs/demo/runs/acc-20261113T024626Z-b2178f/results.json new file mode 100644 index 0000000..41730b1 --- /dev/null +++ b/docs/demo/runs/acc-20261113T024626Z-b2178f/results.json @@ -0,0 +1,306 @@ +{ + "run_id": "acc-20261113T024626Z-b2178f", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-13T02:46:26Z", + "duration_ms": 80971, + "only": null, + "seeded": true, + "precheck": { + "healthy": true, + "services": 23 + }, + "pytest_returncode": 0, + "evidence_dir": "docs/demo/runs/acc-20261113T024626Z-b2178f", + "tracing": "off", + "wait_scale": 3.0, + "trace_quarantine": null, + "expected_scenarios": [ + "C1", + "C2", + "C3", + "C4", + "C5", + "C6", + "C7", + "S1", + "S2", + "S3", + "S4", + "S5" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 14, + "failed": 0, + "error": 0, + "skipped": 10, + "total": 24, + "known_external_blocked": 138 + }, + "tests": [ + { + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "test": "test_c1_login_success[chromium]", + "status": "passed", + "duration_ms": 2602, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C2", + "name": "Create project", + "case": "success", + "test": "test_c2_create_project_success[chromium]", + "status": "passed", + "duration_ms": 4163, + "http_status": 200, + "evidence": null, + "known_external_blocked": 14 + }, + { + "id": "C2", + "name": "Create project", + "case": "rejection", + "test": "test_c2_create_project_rejection[chromium]", + "status": "passed", + "duration_ms": 3817, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "success", + "test": "test_c3_file_upload_success[chromium]", + "status": "passed", + "duration_ms": 2940, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "test": "test_c3_file_upload_rejection[chromium]", + "status": "passed", + "duration_ms": 4125, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "passed", + "duration_ms": 7767, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "passed", + "duration_ms": 4449, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C5", + "name": "File preview", + "case": "success", + "test": "test_c5_file_preview_success[chromium]", + "status": "passed", + "duration_ms": 5700, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C5", + "name": "File preview", + "case": "rejection", + "test": "test_c5_file_preview_rejection[chromium]", + "status": "passed", + "duration_ms": 4251, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "test": "test_c6_admin_success[chromium]", + "status": "passed", + "duration_ms": 1656, + "http_status": 200, + "evidence": null, + "known_external_blocked": 6 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "test": "test_c6_admin_rejection[chromium]", + "status": "passed", + "duration_ms": 698, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "id": "C7", + "name": "File page collaborative edit", + "case": "success", + "test": "test_c7_file_editor_success[chromium]", + "status": "passed", + "duration_ms": 8792, + "http_status": 200, + "evidence": null, + "known_external_blocked": 22 + }, + { + "id": "C7", + "name": "File page collaborative edit", + "case": "rejection", + "test": "test_c7_file_editor_rejection[chromium]", + "status": "passed", + "duration_ms": 6475, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 17 + }, + { + "id": "S1", + "name": "y-websocket", + "case": "success", + "test": "test_s1_y_websocket_success[chromium]", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S1", + "name": "y-websocket", + "case": "rejection", + "test": "test_s1_y_websocket_rejection[chromium]", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S2", + "name": "rdmcp (MCP endpoint)", + "case": "success", + "test": "test_s2_rdmcp_success[chromium]", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S2", + "name": "rdmcp (MCP endpoint)", + "case": "rejection", + "test": "test_s2_rdmcp_rejection[chromium]", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S3", + "name": "aipf_mcp_data_grdm", + "case": "success", + "test": "test_s3_aipf_success[chromium]", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S3", + "name": "aipf_mcp_data_grdm", + "case": "rejection", + "test": "test_s3_aipf_rejection[chromium]", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S4", + "name": "OASys", + "case": "success", + "test": "test_s4_oasys_success[chromium]", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S5", + "name": "Shibboleth-SP via test IdP", + "case": "success", + "test": "test_s5_shibboleth_success[chromium]", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S5", + "name": "Shibboleth-SP via test IdP", + "case": "rejection", + "test": "test_s5_shibboleth_rejection[chromium]", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "test": "test_c1_login_rejection", + "status": "passed", + "duration_ms": 58, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S4", + "name": "OASys", + "case": "rejection", + "test": "test_s4_oasys_rejection", + "status": "skipped", + "duration_ms": 34, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261113T024626Z-b2178f/results.toon b/docs/demo/runs/acc-20261113T024626Z-b2178f/results.toon new file mode 100644 index 0000000..a80f57a --- /dev/null +++ b/docs/demo/runs/acc-20261113T024626Z-b2178f/results.toon @@ -0,0 +1,61 @@ +accept: + run_id: acc-20261113T024626Z-b2178f + base_url: "http://127.0.0.1:5000" + started: "2026-11-13T02:46:26Z" + duration_ms: 80971 + only: null + seeded: true + precheck: + healthy: true + services: 23 + pytest_returncode: 0 + evidence_dir: docs/demo/runs/acc-20261113T024626Z-b2178f + tracing: off + wait_scale: 3.0 + trace_quarantine: null + expected_scenarios[12]: + - C1 + - C2 + - C3 + - C4 + - C5 + - C6 + - C7 + - S1 + - S2 + - S3 + - S4 + - S5 + incomplete_scenarios[0]: + summary: + passed: 14 + failed: 0 + error: 0 + skipped: 10 + total: 24 + known_external_blocked: 138 + tests[24]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C1,Login via fakecas,success,"test_c1_login_success[chromium]",passed,2602,200,null,7 + C2,Create project,success,"test_c2_create_project_success[chromium]",passed,4163,200,null,14 + C2,Create project,rejection,"test_c2_create_project_rejection[chromium]",passed,3817,403,null,8 + C3,Upload and download file,success,"test_c3_file_upload_success[chromium]",passed,2940,200,null,4 + C3,Upload and download file,rejection,"test_c3_file_upload_rejection[chromium]",passed,4125,403,null,8 + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",passed,7767,200,null,18 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",passed,4449,4401,null,13 + C5,File preview,success,"test_c5_file_preview_success[chromium]",passed,5700,200,null,9 + C5,File preview,rejection,"test_c5_file_preview_rejection[chromium]",passed,4251,401,null,9 + C6,Institution admin screen,success,"test_c6_admin_success[chromium]",passed,1656,200,null,6 + C6,Institution admin screen,rejection,"test_c6_admin_rejection[chromium]",passed,698,403,null,3 + C7,File page collaborative edit,success,"test_c7_file_editor_success[chromium]",passed,8792,200,null,22 + C7,File page collaborative edit,rejection,"test_c7_file_editor_rejection[chromium]",passed,6475,4401,null,17 + S1,y-websocket,success,"test_s1_y_websocket_success[chromium]",skipped,0,null,null,0 + S1,y-websocket,rejection,"test_s1_y_websocket_rejection[chromium]",skipped,0,null,null,0 + S2,rdmcp (MCP endpoint),success,"test_s2_rdmcp_success[chromium]",skipped,0,null,null,0 + S2,rdmcp (MCP endpoint),rejection,"test_s2_rdmcp_rejection[chromium]",skipped,0,null,null,0 + S3,aipf_mcp_data_grdm,success,"test_s3_aipf_success[chromium]",skipped,0,null,null,0 + S3,aipf_mcp_data_grdm,rejection,"test_s3_aipf_rejection[chromium]",skipped,0,null,null,0 + S4,OASys,success,"test_s4_oasys_success[chromium]",skipped,0,null,null,0 + S5,Shibboleth-SP via test IdP,success,"test_s5_shibboleth_success[chromium]",skipped,0,null,null,0 + S5,Shibboleth-SP via test IdP,rejection,"test_s5_shibboleth_rejection[chromium]",skipped,0,null,null,0 + C1,Login via fakecas,rejection,test_c1_login_rejection,passed,58,401,null,0 + S4,OASys,rejection,test_s4_oasys_rejection,skipped,34,null,null,0 diff --git a/docs/demo/runs/acc-20261113T192132Z-1cf20d/collector.json b/docs/demo/runs/acc-20261113T192132Z-1cf20d/collector.json new file mode 100644 index 0000000..d9f5e16 --- /dev/null +++ b/docs/demo/runs/acc-20261113T192132Z-1cf20d/collector.json @@ -0,0 +1,266 @@ +[ + { + "nodeid": "test_c1_login.py::test_c1_login_success[chromium]", + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "status": "passed", + "duration_ms": 52771, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_success[chromium]", + "id": "C2", + "name": "Create project", + "case": "success", + "status": "passed", + "duration_ms": 126068, + "http_status": 200, + "evidence": null, + "known_external_blocked": 12 + }, + { + "nodeid": "test_c2_create_project.py::test_c2_create_project_rejection[chromium]", + "id": "C2", + "name": "Create project", + "case": "rejection", + "status": "passed", + "duration_ms": 74040, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "success", + "status": "passed", + "duration_ms": 52310, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]", + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "status": "passed", + "duration_ms": 82283, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "status": "passed", + "duration_ms": 165799, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]", + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 107221, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_success[chromium]", + "id": "C5", + "name": "File preview", + "case": "success", + "status": "passed", + "duration_ms": 86534, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c5_file_preview.py::test_c5_file_preview_rejection[chromium]", + "id": "C5", + "name": "File preview", + "case": "rejection", + "status": "passed", + "duration_ms": 73626, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_success[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "status": "passed", + "duration_ms": 42560, + "http_status": 200, + "evidence": null, + "known_external_blocked": 6 + }, + { + "nodeid": "test_c6_admin.py::test_c6_admin_rejection[chromium]", + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "status": "passed", + "duration_ms": 21960, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "nodeid": "test_c7_file_editor.py::test_c7_file_editor_success[chromium]", + "id": "C7", + "name": "File page collaborative edit", + "case": "success", + "status": "passed", + "duration_ms": 203126, + "http_status": 200, + "evidence": null, + "known_external_blocked": 20 + }, + { + "nodeid": "test_c7_file_editor.py::test_c7_file_editor_rejection[chromium]", + "id": "C7", + "name": "File page collaborative edit", + "case": "rejection", + "status": "passed", + "duration_ms": 142779, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 16 + }, + { + "nodeid": "test_s1_y_websocket.py::test_s1_y_websocket_success[chromium]", + "id": "S1", + "name": "y-websocket", + "case": "success", + "status": "skipped", + "duration_ms": 5, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s1_y_websocket.py::test_s1_y_websocket_rejection[chromium]", + "id": "S1", + "name": "y-websocket", + "case": "rejection", + "status": "skipped", + "duration_ms": 5, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s2_rdmcp.py::test_s2_rdmcp_success[chromium]", + "id": "S2", + "name": "rdmcp (MCP endpoint)", + "case": "success", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s2_rdmcp.py::test_s2_rdmcp_rejection[chromium]", + "id": "S2", + "name": "rdmcp (MCP endpoint)", + "case": "rejection", + "status": "skipped", + "duration_ms": 1, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s3_aipf.py::test_s3_aipf_success[chromium]", + "id": "S3", + "name": "aipf_mcp_data_grdm", + "case": "success", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s3_aipf.py::test_s3_aipf_rejection[chromium]", + "id": "S3", + "name": "aipf_mcp_data_grdm", + "case": "rejection", + "status": "skipped", + "duration_ms": 1, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s4_oasys.py::test_s4_oasys_success[chromium]", + "id": "S4", + "name": "OASys", + "case": "success", + "status": "skipped", + "duration_ms": 1, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s5_shibboleth.py::test_s5_shibboleth_success[chromium]", + "id": "S5", + "name": "Shibboleth-SP via test IdP", + "case": "success", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s5_shibboleth.py::test_s5_shibboleth_rejection[chromium]", + "id": "S5", + "name": "Shibboleth-SP via test IdP", + "case": "rejection", + "status": "skipped", + "duration_ms": 4, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_c1_login.py::test_c1_login_rejection", + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "status": "passed", + "duration_ms": 368, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + }, + { + "nodeid": "test_s4_oasys.py::test_s4_oasys_rejection", + "id": "S4", + "name": "OASys", + "case": "rejection", + "status": "skipped", + "duration_ms": 922, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + } +] diff --git a/docs/demo/runs/acc-20261113T192132Z-1cf20d/junit.xml b/docs/demo/runs/acc-20261113T192132Z-1cf20d/junit.xml new file mode 100644 index 0000000..dc4d7b5 --- /dev/null +++ b/docs/demo/runs/acc-20261113T192132Z-1cf20d/junit.xml @@ -0,0 +1 @@ +<?xml version="1.0" encoding="utf-8"?><testsuites name="pytest tests"><testsuite name="pytest" errors="0" failures="0" skipped="10" tests="24" time="1234.848" timestamp="2026-11-14T04:27:39.794623+09:00" hostname="redacted-host"><testcase classname="test_c1_login" name="test_c1_login_success[chromium]" time="52.773"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="7" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_success[chromium]" time="126.070"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="12" /></properties></testcase><testcase classname="test_c2_create_project" name="test_c2_create_project_rejection[chromium]" time="74.042"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_success[chromium]" time="52.312"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="4" /></properties></testcase><testcase classname="test_c3_file_upload" name="test_c3_file_upload_rejection[chromium]" time="82.285"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="8" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_success[chromium]" time="165.800"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="18" /></properties></testcase><testcase classname="test_c4_wiki_collab" name="test_c4_wiki_collab_rejection[chromium]" time="107.223"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="13" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_success[chromium]" time="86.535"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c5_file_preview" name="test_c5_file_preview_rejection[chromium]" time="73.628"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="9" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_success[chromium]" time="42.562"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="6" /></properties></testcase><testcase classname="test_c6_admin" name="test_c6_admin_rejection[chromium]" time="21.962"><properties><property name="http_status" value="403" /><property name="known_external_blocked" value="3" /></properties></testcase><testcase classname="test_c7_file_editor" name="test_c7_file_editor_success[chromium]" time="203.128"><properties><property name="http_status" value="200" /><property name="known_external_blocked" value="20" /></properties></testcase><testcase classname="test_c7_file_editor" name="test_c7_file_editor_rejection[chromium]" time="142.780"><properties><property name="http_status" value="4401" /><property name="known_external_blocked" value="16" /></properties></testcase><testcase classname="test_s1_y_websocket" name="test_s1_y_websocket_success[chromium]" time="0.006"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s1_y_websocket.py:65: M3</skipped></testcase><testcase classname="test_s1_y_websocket" name="test_s1_y_websocket_rejection[chromium]" time="0.006"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s1_y_websocket.py:91: M3</skipped></testcase><testcase classname="test_s2_rdmcp" name="test_s2_rdmcp_success[chromium]" time="0.003"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s2_rdmcp.py:80: M3</skipped></testcase><testcase classname="test_s2_rdmcp" name="test_s2_rdmcp_rejection[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s2_rdmcp.py:99: M3</skipped></testcase><testcase classname="test_s3_aipf" name="test_s3_aipf_success[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s3_aipf.py:78: M3</skipped></testcase><testcase classname="test_s3_aipf" name="test_s3_aipf_rejection[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s3_aipf.py:96: M3</skipped></testcase><testcase classname="test_s4_oasys" name="test_s4_oasys_success[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s4_oasys.py:46: M3</skipped></testcase><testcase classname="test_s5_shibboleth" name="test_s5_shibboleth_success[chromium]" time="0.002"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s5_shibboleth.py:97: M3</skipped></testcase><testcase classname="test_s5_shibboleth" name="test_s5_shibboleth_rejection[chromium]" time="0.005"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s5_shibboleth.py:121: M3</skipped></testcase><testcase classname="test_c1_login" name="test_c1_login_rejection" time="0.370"><properties><property name="http_status" value="401" /><property name="known_external_blocked" value="0" /></properties></testcase><testcase classname="test_s4_oasys" name="test_s4_oasys_rejection" time="0.923"><skipped type="pytest.skip" message="M3">installer/acceptance/test_s4_oasys.py:66: M3</skipped></testcase></testsuite></testsuites> \ No newline at end of file diff --git a/docs/demo/runs/acc-20261113T192132Z-1cf20d/pytest.log b/docs/demo/runs/acc-20261113T192132Z-1cf20d/pytest.log new file mode 100644 index 0000000..4b7f9bf --- /dev/null +++ b/docs/demo/runs/acc-20261113T192132Z-1cf20d/pytest.log @@ -0,0 +1,57 @@ +.............sssssssss.s [100%] +=============================== warnings summary =============================== +test_c1_login.py::test_c1_login_success[chromium] + test_c1_login.py:11: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_success[chromium] + test_c2_create_project.py:11: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c2_create_project.py::test_c2_create_project_rejection[chromium] + test_c2_create_project.py:39: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_success[chromium] + test_c3_file_upload.py:29: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c3_file_upload.py::test_c3_file_upload_rejection[chromium] + test_c3_file_upload.py:43: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium] + test_c4_wiki_collab.py:55: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium] + test_c4_wiki_collab.py:85: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_success[chromium] + test_c5_file_preview.py:17: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c5_file_preview.py::test_c5_file_preview_rejection[chromium] + test_c5_file_preview.py:30: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_success[chromium] + test_c6_admin.py:40: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c6_admin.py::test_c6_admin_rejection[chromium] + test_c6_admin.py:60: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c7_file_editor.py::test_c7_file_editor_success[chromium] + test_c7_file_editor.py:45: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c7_file_editor.py::test_c7_file_editor_rejection[chromium] + test_c7_file_editor.py:75: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +test_c1_login.py::test_c1_login_rejection + test_c1_login.py:21: PytestWarning: record_property is incompatible with junit_family 'xunit2' (use 'legacy' or 'xunit1') + +-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html +=========================== short test summary info ============================ +SKIPPED [1] installer/acceptance/test_s1_y_websocket.py:65: M3 +SKIPPED [1] installer/acceptance/test_s1_y_websocket.py:91: M3 +SKIPPED [1] installer/acceptance/test_s2_rdmcp.py:80: M3 +SKIPPED [1] installer/acceptance/test_s2_rdmcp.py:99: M3 +SKIPPED [1] installer/acceptance/test_s3_aipf.py:78: M3 +SKIPPED [1] installer/acceptance/test_s3_aipf.py:96: M3 +SKIPPED [1] installer/acceptance/test_s4_oasys.py:46: M3 +SKIPPED [1] installer/acceptance/test_s5_shibboleth.py:97: M3 +SKIPPED [1] installer/acceptance/test_s5_shibboleth.py:121: M3 +SKIPPED [1] installer/acceptance/test_s4_oasys.py:66: M3 +14 passed, 10 skipped, 14 warnings in 1234.77s (0:20:34) diff --git a/docs/demo/runs/acc-20261113T192132Z-1cf20d/results.json b/docs/demo/runs/acc-20261113T192132Z-1cf20d/results.json new file mode 100644 index 0000000..b2f237d --- /dev/null +++ b/docs/demo/runs/acc-20261113T192132Z-1cf20d/results.json @@ -0,0 +1,306 @@ +{ + "run_id": "acc-20261113T192132Z-1cf20d", + "base_url": "http://127.0.0.1:5000", + "started": "2026-11-13T19:21:32Z", + "duration_ms": 1677136, + "only": null, + "seeded": true, + "precheck": { + "healthy": true, + "services": 23 + }, + "pytest_returncode": 0, + "evidence_dir": "docs/demo/runs/acc-20261113T192132Z-1cf20d", + "tracing": "off", + "wait_scale": 10.0, + "trace_quarantine": null, + "expected_scenarios": [ + "C1", + "C2", + "C3", + "C4", + "C5", + "C6", + "C7", + "S1", + "S2", + "S3", + "S4", + "S5" + ], + "incomplete_scenarios": [], + "summary": { + "passed": 14, + "failed": 0, + "error": 0, + "skipped": 10, + "total": 24, + "known_external_blocked": 133 + }, + "tests": [ + { + "id": "C1", + "name": "Login via fakecas", + "case": "success", + "test": "test_c1_login_success[chromium]", + "status": "passed", + "duration_ms": 52771, + "http_status": 200, + "evidence": null, + "known_external_blocked": 7 + }, + { + "id": "C2", + "name": "Create project", + "case": "success", + "test": "test_c2_create_project_success[chromium]", + "status": "passed", + "duration_ms": 126068, + "http_status": 200, + "evidence": null, + "known_external_blocked": 12 + }, + { + "id": "C2", + "name": "Create project", + "case": "rejection", + "test": "test_c2_create_project_rejection[chromium]", + "status": "passed", + "duration_ms": 74040, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "success", + "test": "test_c3_file_upload_success[chromium]", + "status": "passed", + "duration_ms": 52310, + "http_status": 200, + "evidence": null, + "known_external_blocked": 4 + }, + { + "id": "C3", + "name": "Upload and download file", + "case": "rejection", + "test": "test_c3_file_upload_rejection[chromium]", + "status": "passed", + "duration_ms": 82283, + "http_status": 403, + "evidence": null, + "known_external_blocked": 8 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "success", + "test": "test_c4_wiki_collab_success[chromium]", + "status": "passed", + "duration_ms": 165799, + "http_status": 200, + "evidence": null, + "known_external_blocked": 18 + }, + { + "id": "C4", + "name": "Wiki collaborative edit", + "case": "rejection", + "test": "test_c4_wiki_collab_rejection[chromium]", + "status": "passed", + "duration_ms": 107221, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 13 + }, + { + "id": "C5", + "name": "File preview", + "case": "success", + "test": "test_c5_file_preview_success[chromium]", + "status": "passed", + "duration_ms": 86534, + "http_status": 200, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C5", + "name": "File preview", + "case": "rejection", + "test": "test_c5_file_preview_rejection[chromium]", + "status": "passed", + "duration_ms": 73626, + "http_status": 401, + "evidence": null, + "known_external_blocked": 9 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "success", + "test": "test_c6_admin_success[chromium]", + "status": "passed", + "duration_ms": 42560, + "http_status": 200, + "evidence": null, + "known_external_blocked": 6 + }, + { + "id": "C6", + "name": "Institution admin screen", + "case": "rejection", + "test": "test_c6_admin_rejection[chromium]", + "status": "passed", + "duration_ms": 21960, + "http_status": 403, + "evidence": null, + "known_external_blocked": 3 + }, + { + "id": "C7", + "name": "File page collaborative edit", + "case": "success", + "test": "test_c7_file_editor_success[chromium]", + "status": "passed", + "duration_ms": 203126, + "http_status": 200, + "evidence": null, + "known_external_blocked": 20 + }, + { + "id": "C7", + "name": "File page collaborative edit", + "case": "rejection", + "test": "test_c7_file_editor_rejection[chromium]", + "status": "passed", + "duration_ms": 142779, + "http_status": 4401, + "evidence": null, + "known_external_blocked": 16 + }, + { + "id": "S1", + "name": "y-websocket", + "case": "success", + "test": "test_s1_y_websocket_success[chromium]", + "status": "skipped", + "duration_ms": 5, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S1", + "name": "y-websocket", + "case": "rejection", + "test": "test_s1_y_websocket_rejection[chromium]", + "status": "skipped", + "duration_ms": 5, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S2", + "name": "rdmcp (MCP endpoint)", + "case": "success", + "test": "test_s2_rdmcp_success[chromium]", + "status": "skipped", + "duration_ms": 2, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S2", + "name": "rdmcp (MCP endpoint)", + "case": "rejection", + "test": "test_s2_rdmcp_rejection[chromium]", + "status": "skipped", + "duration_ms": 1, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S3", + "name": "aipf_mcp_data_grdm", + "case": "success", + "test": "test_s3_aipf_success[chromium]", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S3", + "name": "aipf_mcp_data_grdm", + "case": "rejection", + "test": "test_s3_aipf_rejection[chromium]", + "status": "skipped", + "duration_ms": 1, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S4", + "name": "OASys", + "case": "success", + "test": "test_s4_oasys_success[chromium]", + "status": "skipped", + "duration_ms": 1, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S5", + "name": "Shibboleth-SP via test IdP", + "case": "success", + "test": "test_s5_shibboleth_success[chromium]", + "status": "skipped", + "duration_ms": 0, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S5", + "name": "Shibboleth-SP via test IdP", + "case": "rejection", + "test": "test_s5_shibboleth_rejection[chromium]", + "status": "skipped", + "duration_ms": 4, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "C1", + "name": "Login via fakecas", + "case": "rejection", + "test": "test_c1_login_rejection", + "status": "passed", + "duration_ms": 368, + "http_status": 401, + "evidence": null, + "known_external_blocked": 0 + }, + { + "id": "S4", + "name": "OASys", + "case": "rejection", + "test": "test_s4_oasys_rejection", + "status": "skipped", + "duration_ms": 922, + "http_status": null, + "evidence": null, + "known_external_blocked": 0 + } + ] +} diff --git a/docs/demo/runs/acc-20261113T192132Z-1cf20d/results.toon b/docs/demo/runs/acc-20261113T192132Z-1cf20d/results.toon new file mode 100644 index 0000000..9a4231f --- /dev/null +++ b/docs/demo/runs/acc-20261113T192132Z-1cf20d/results.toon @@ -0,0 +1,61 @@ +accept: + run_id: acc-20261113T192132Z-1cf20d + base_url: "http://127.0.0.1:5000" + started: "2026-11-13T19:21:32Z" + duration_ms: 1677136 + only: null + seeded: true + precheck: + healthy: true + services: 23 + pytest_returncode: 0 + evidence_dir: docs/demo/runs/acc-20261113T192132Z-1cf20d + tracing: off + wait_scale: 10.0 + trace_quarantine: null + expected_scenarios[12]: + - C1 + - C2 + - C3 + - C4 + - C5 + - C6 + - C7 + - S1 + - S2 + - S3 + - S4 + - S5 + incomplete_scenarios[0]: + summary: + passed: 14 + failed: 0 + error: 0 + skipped: 10 + total: 24 + known_external_blocked: 133 + tests[24]{id,name,case,test,status,duration_ms,http_status,evidence,known_external_blocked}: + C1,Login via fakecas,success,"test_c1_login_success[chromium]",passed,52771,200,null,7 + C2,Create project,success,"test_c2_create_project_success[chromium]",passed,126068,200,null,12 + C2,Create project,rejection,"test_c2_create_project_rejection[chromium]",passed,74040,403,null,8 + C3,Upload and download file,success,"test_c3_file_upload_success[chromium]",passed,52310,200,null,4 + C3,Upload and download file,rejection,"test_c3_file_upload_rejection[chromium]",passed,82283,403,null,8 + C4,Wiki collaborative edit,success,"test_c4_wiki_collab_success[chromium]",passed,165799,200,null,18 + C4,Wiki collaborative edit,rejection,"test_c4_wiki_collab_rejection[chromium]",passed,107221,4401,null,13 + C5,File preview,success,"test_c5_file_preview_success[chromium]",passed,86534,200,null,9 + C5,File preview,rejection,"test_c5_file_preview_rejection[chromium]",passed,73626,401,null,9 + C6,Institution admin screen,success,"test_c6_admin_success[chromium]",passed,42560,200,null,6 + C6,Institution admin screen,rejection,"test_c6_admin_rejection[chromium]",passed,21960,403,null,3 + C7,File page collaborative edit,success,"test_c7_file_editor_success[chromium]",passed,203126,200,null,20 + C7,File page collaborative edit,rejection,"test_c7_file_editor_rejection[chromium]",passed,142779,4401,null,16 + S1,y-websocket,success,"test_s1_y_websocket_success[chromium]",skipped,5,null,null,0 + S1,y-websocket,rejection,"test_s1_y_websocket_rejection[chromium]",skipped,5,null,null,0 + S2,rdmcp (MCP endpoint),success,"test_s2_rdmcp_success[chromium]",skipped,2,null,null,0 + S2,rdmcp (MCP endpoint),rejection,"test_s2_rdmcp_rejection[chromium]",skipped,1,null,null,0 + S3,aipf_mcp_data_grdm,success,"test_s3_aipf_success[chromium]",skipped,0,null,null,0 + S3,aipf_mcp_data_grdm,rejection,"test_s3_aipf_rejection[chromium]",skipped,1,null,null,0 + S4,OASys,success,"test_s4_oasys_success[chromium]",skipped,1,null,null,0 + S5,Shibboleth-SP via test IdP,success,"test_s5_shibboleth_success[chromium]",skipped,0,null,null,0 + S5,Shibboleth-SP via test IdP,rejection,"test_s5_shibboleth_rejection[chromium]",skipped,4,null,null,0 + C1,Login via fakecas,rejection,test_c1_login_rejection,passed,368,401,null,0 + S4,OASys,rejection,test_s4_oasys_rejection,skipped,922,null,null,0 diff --git a/docs/guides/README.md b/docs/guides/README.md new file mode 100644 index 0000000..ef67272 --- /dev/null +++ b/docs/guides/README.md @@ -0,0 +1,49 @@ +# Guides / ガイド + +> **Summary:** Collection of guides for RDM addon development and environment setup +> **概要:** RDM アドオン開発と環境セットアップのためのガイド集 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05 +- Normative for: `docs/guides/` +- Related: [SPEC-06 Documentation Conventions](../spec/06_documentation_conventions.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Available Guides + +| Title | Description | +|---|---| +| [Environment](environment/README.md) | Development environment setup with Docker Compose and the 2027 installer | +| [EC2](ec2/README.md) | Setting up RDM on Amazon EC2 | +| [Skeleton](skeleton/README.md) | Creating your first addon using the skeleton template | +| [Storage Addon](storage-addon/README.md) | Building storage addons for external services | +| [Screen Expansion](screen-expansion/README.md) | Adding dashboard widgets and page tabs | +| [API](api/README.md) | Using and exposing APIs in addons | +| [Admin Addon](admin-addon/README.md) | Creating administrator-level addons with institutional management | + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 利用可能なガイド + +| タイトル | 説明 | +|---|---| +| [環境](environment/README.md) | Docker Compose と 2027 インストーラーでの開発環境セットアップ | +| [EC2](ec2/README.md) | Amazon EC2 への RDM セットアップ | +| [スケルトン](skeleton/README.md) | スケルトンテンプレートを使用した最初のアドオン作成 | +| [ストレージアドオン](storage-addon/README.md) | 外部サービス用のストレージアドオン構築 | +| [画面拡張](screen-expansion/README.md) | ダッシュボードウィジェットとページタブの追加 | +| [API](api/README.md) | アドオンでの API の使用と公開 | +| [管理者アドオン](admin-addon/README.md) | 機関管理機能を持つ管理者レベルのアドオン作成 | + diff --git a/docs/guides/admin-addon/README.legacy.md b/docs/guides/admin-addon/README.legacy.md new file mode 100644 index 0000000..8e0c3d2 --- /dev/null +++ b/docs/guides/admin-addon/README.legacy.md @@ -0,0 +1,384 @@ +# アドオンの機関管理機能の利用 + +ユーザの所属機関が管理できる「機関管理機能」において、アドオンに関する機能(RDM Addon)について説明します。 + +具体的には、以下の方法を説明します。 + +- アドオンに共通する機関管理機能を、新しく追加したアドオンで利用できるようにする方法 ([スケルトン アドオンの機関管理機能の対応](#スケルトン-アドオンの機関管理機能の対応)) +- 機関管理機能に新しい機能を追加する方法 ([Admin Notesの実装](#admin-notesの実装)) + +すべてのアドオンに共通する機関管理機能は、現在(2021年2月執筆時点)、アドオンの無効化機能のみです。機関ごとに、指定したアドオンを無効にすることができます。無効なアドオンは、ユーザーやプロジェクトのアドオン設定画面に表示されなくなり、利用もできなくなります。 + +## 前提条件 + +[開発環境の準備](../Environment.md#開発環境でRDMを起動する) のガイドに従い、開発環境にてRDMを起動しているものとします。 + +> 本ガイドでは機関管理機能を利用するため、`admin` と `admin_assets` サービスも起動してください。 + +動作確認のためのユーザは、 [開発環境の準備#ユーザを機関に所属させる](../Environment.md#ユーザを機関に所属させる) および [開発環境の準備#adminアクセス可能なユーザへと変更する](../Environment.md#adminアクセス可能なユーザへと変更する) のガイドに従い、何かしらの機関に所属し、その機関の機関管理者であるとします。 + + +# アドオンの機関管理機能の設計 + +## ファイルの構成 + +機関管理機能もアドオンと同様に[Django](https://www.djangoproject.com/)アプリケーションの形式で記述されます。ただし、OSF.io本体やアドオンとは若干中身が異なります。 + +アドオンの機関管理機能(RDM Addon)の基本的なファイル配置は以下のようになります(Force to useに関するファイルは記載していません)。 + +``` +/admin/ +├── rdm_addons ... アドオンの機関管理機能のモジュール +│ ├── api_v1 ... APIモジュール +│ │ ├── __init__.py ... モジュールの定義 +│ │ ├── urls.py ... APIのViewのルーティング定義 +│ │ └── views.py ... APIのViewの定義 +│ ├── __init__.py ... モジュールの定義 +│ ├── decorators.py ... デコレーターの定義 +│ ├── urls.py ... Viewのルーティング定義 +│ ├── utils.py ... ユーティリティ関数の定義 +│ └── views.py ... Viewの定義 +├── static ... Webブラウザから読み込むことを想定した静的ファイル +│ ├── css/rdm_addons.css ... アドオンの機関管理機能設定のCSSファイル +│ └── rdm_addons ... アドオンの機関管理機能設定のJavaScriptディレクトリ +│ ├── アドオン名 ...アドオンごとのJavaScriptディレクトリ +│ │ ├── アドオン名RdmConfig.js ... アドオンごとの機関管理機能設定の定義 +│ │ └── rdm-cfg.js ... アドオンごとの機関管理機能設定のエントリとなるJavaScriptファイル +│ ├── rdm-addons-page.js ... アドオンの機関管理機能設定のエントリとなるJavaScriptファイル +│ └── rdmAddonSettings.js ... アドオンの機関管理機能設定の定義 +├── templates ... テンプレートディレクトリ +│ └── rdm_addons ... アドオンの機関管理機能設定のテンプレートディレクトリ +│ ├── addons ... アドオンごとのテンプレートディレクトリ +│ │ └── アドオン名_institution_settings.html ... アドオンの機関管理機能設定のテンプレートファイル +│ ├── addon_list.html ... アドオン一覧画面のテンプレートファイル +│ └── institution_list.html ... 機関一覧画面のテンプレートファイル +└── translations ... 国際化ディレクトリ + ├── en/LC_MESSAGES ... 英語の国際化ディレクトリ + │ └── django.po ... 機関管理画面のテンプレートの国際化設定ファイル + ├── ja/LC_MESSAGES ... 日本語の国際化ディレクトリ + │ └── django.po ... 機関管理画面のテンプレートの国際化設定ファイル + └── django.pot ... 機関管理画面のテンプレートの国際化設定ファイル +``` + +機関管理機能のモデル定義は `/osf/models/` 以下に置きます。 + +``` +/osf/models/ +└── rdm_addons.py ... アドオンの機関管理機能設定のモデル定義 +``` + +JavaScriptで使う国際化設定は `/website/translations/` 以下のファイルに記述します。 + +``` +/website/translations/ +├── en/LC_MESSAGES ... 英語の国際化ディレクトリ +│ └── js_messages.po ... 機関管理機能のJavaScriptで使う国際化設定ファイル +├── ja/LC_MESSAGES ... 日本語の国際化ディレクトリ +│ └── js_messages.po ... 機関管理機能のJavaScriptで使う国際化設定ファイル +└── js_messages.pot ... 機関管理機能のJavaScriptで使う国際化設定ファイル +``` + +テストファイルは `/admin_tests/` 以下に置きます。 + +``` +/admin_tests/ +└── rdm_addons ... アドオンの機関管理機能設定のテスト + ├── api_v1 + │ ├── __init__.py + │ └── test_views.py + ├── __init__.py + ├── factories.py + └── test_views.py +``` + +## アドオンの機関管理機能のモジュール構成 + +アドオンと同様、Djangoの作法に従い、Model-Viewアーキテクチャにより実装します。 + +### Modelの構成 + +機関ごとのアドオンの設定を保持する `RdmAddonOption` モデルおよび `RdmAddonNoInstitutionOption` モデルが [osf/models/rdm_addons.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/osf/models/rdm_addons.py) に定義されています。設定項目を追加する場合は、これらモデルを変更します。 + +### Viewの構成 + +Viewの定義方法はアドオンと異なっているように見えますが、基本的な考え方は同じです。 + +ルーティング(アドオンにおける`routes.py`)は [admin/rdm_addons/urls.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/rdm_addons/urls.py) に定義し、各View処理は [admin/rdm_addons/views.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/rdm_addons/views.py) に定義します。 + +APIに関するView定義は、 [admin/rdm_addons/api_v1/urls.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/rdm_addons/api_v1/urls.py) と [admin/rdm_addons/api_v1/views.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/rdm_addons/api_v1/views.py) に定義します。 + +### フレームワークによって提供されるView + +HTMLテンプレートとJavaScriptの定義方法や、利用できるライブラリは、アドオンと似ています。 + +HTMLテンプレートファイルは [admin/templates/rdm_addons/](https://github.com/RCOSDP/RDM-osf.io/tree/develop/admin/templates/rdm_addons) 以下に配置します。拡張子が`.html`ですが、アドオンと同様に、テンプレート言語 [mako](https://www.makotemplates.org/) で記述します。 +各アドオンに関する設定画面のテンプレートファイルは、デフォルトで [admin/templates/rdm_addons/addons/institution_settings_default.html](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/templates/rdm_addons/addons/institution_settings_default.html) が使用されます。個別にテンプレートファイルを指定する方法は [#UI の追加](#uiの追加) で説明します。 + +各画面で読み込むJavaScriptファイルは [admin/static/js/rdm_addons/](https://github.com/RCOSDP/RDM-osf.io/tree/develop/admin/static/js/rdm_addons) 以下に配置します。テンプレートを動的に操作するためのJavaScriptのライブラリには [Knockout.js](https://knockoutjs.com/) を利用することができます。 +アドオンと違い、追加したエントリーファイルは [admin/webpack.admin.config.js](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/webpack.admin.config.js) の `entry` プロパティに追加する必要があることに注意してください。設定方法は [#UI の追加](#uiの追加) で説明します。 + +各画面に関するスタイル定義は [admin/static/css/rdm_addons.css](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/static/css/rdm_addons.css) にまとめて記述します。 + +> 機関管理者画面では、ember-osf-webで利用できるようなUI Componentは提供されていませんが、 [Bootstrap3](https://getbootstrap.com/docs/3.3/) のCSSやコンポーネントを利用することができます。 + +### テストコード + +テストコードは [admin_tests/rdm_addons](https://github.com/RCOSDP/RDM-osf.io/tree/develop/admin_tests/rdm_addons) 以下に作成します。 + +### Migrations定義 + +Migrationsファイルは [osf/migrations](https://github.com/RCOSDP/RDM-osf.io/tree/develop/osf/migrations) 以下に作成されます。Migrationsファイルの構造はアドオンと同様です。 + +### 国際化 + +HTMLテンプレートで使う国際化設定は [admin/translations/](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/translations/) 以下の `django.pot` および `django.po` に定義します。 + +JavaScriptで使う国際化設定は [website/translations/](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/translations/) 以下の `js_messages.pot` および `js_messages.po` に定義します。 + +定義方法や使い方は、 [ScreenExpansion#国際化](../ScreenExpansion/README.md#国際化) で説明しています。HTMLファイル内で文字列を国際化する方法は、makoと同様です。 + +> JavaScriptだけ、`website/translations/` 以下のファイルに定義することに気をつけてください。 + + +# スケルトン アドオンの機関管理機能の対応 + +`myskelton` という識別名のアドオンを、機関管理機能で管理するための実装を例に説明します。 + +[スケルトンの作成#スケルトン アドオンの実装](../Skelton/README.md#スケルトン-アドオンの実装) に従い、スケルトン アドオンの実装が完了していることを前提とします。 + +## addons.myskelton モジュールの変更 + +> ストレージアドオンの場合、この変更は不要です。 + +機関管理機能で管理するアドオンは、`AppConfig.config` に `accounts` が含まれている必要があります。 +`AppConfig.config` に `accounts` が含まれているアドオンは、ユーザのアドオンアカウント構成画面に表示され、デフォルトではOAuthの認証設定UIを含むテンプレートが参照されます。スケルトン アドオンは認証設定が不要なので、アドオン名を表示するだけのテンプレートを定義して、それを参照するようにします。 + +まずは [user_settings.mako](addon/templates/user_settings.mako) を `addons/myskelton/templates/user_settings.mako` に、[user-cfg.js](addon/static/user-cfg.js) を `addons/myskelton/static/user-cfg.js` にコピーします。 + +次に、`addons/myskelton/apps.py` を以下のように変更します。 +変更例はサンプル [apps.py](addon/apps.py) を参照してください。 + +```diff +class AddonAppConfig(BaseAddonAppConfig): + +- configs = ['node'] ++ configs = ['node', 'accounts'] + + node_settings_template = os.path.join(TEMPLATE_PATH, 'node_settings.mako') ++ user_settings_template = os.path.join(TEMPLATE_PATH, 'user_settings.mako') + + # 他変更なし +``` + + +## RDMコードの変更 + +### admin/base/settings/defaults.py への追加 + +[admin/base/settings/defaults.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/base/settings/defaults.py) の `INSTALLED_APPS` にアドオン名を、`MIGRATION_MODULES` にキーがアドオン名のプロパティを追加します。 + +> `INSTALLED_APPS` に追加する値は `addons.アドオン名` ですが、`MIGRATION_MODULES` に追加するキー名は `addons_アドオン名` です。`.` と `_` の違いに注意してください。 + +デフォルトでは、Force to useという、機関に属するプロジェクトでアドオンを強制的に有効にする機能が利用できます。しかし、この機能を利用するためには、認証情報を保存するための仕組みをアドオンに実装しておく必要があります。スケルトン アドオンは認証情報を持たないため、`UNSUPPORTED_FORCE_TO_USE_ADDONS` にアドオン名を追加し、この機能を無効にします。 + +実装例はサンプル [defaults.py](config/admin/base/settings/defaults.py) を参照してください。 + + +# スケルトン アドオンの機関管理機能の動作確認 + +スケルトン アドオンを機関管理機能で管理してみましょう。 + +変更したファイルに関連するサービスを再起動します。 + +``` +$ docker compose restart web api assets admin +``` + +これでサービスへの反映は完了です。機関管理機能でスケルトン アドオンの設定を変更できることを確認するには、以下のような操作を実施します。 + +1. RDM Web UIにアクセスする `http://localhost:5000` +1. 「アドオンアカウント構成」ページを開く。 +1. My Skeltonアドオンが表示されていることを確認する。 + ![Configure Addon Account](./images/configure_addon_account.png) +1. 機関管理機能のWeb UIにアクセスする `http://localhost:8001` +1. RDM Addonsページを開く。 +1. 自分の所属機関のページを開く。 +1. My Skeltonアドオンの左のチェックボックスを外し、アドオンを無効化する。 + ![Disable Addon](./images/admin_disable_addon1.png) +1. 再度、RDM Web UIで「アドオンアカウント構成」ページを開く。 +1. My Skeltonアドオンが表示されていないことを確認する。 + +以上でスケルトン アドオンの機関管理機能の動作確認は完了です! + + +# Admin Notesの実装 + +ここでは、機関管理者が、スケルトン アドオンに関するユーザへの注意書きを設定できる Admin Notes という機能の実装を例に説明します。 + +[スケルトン アドオンの機関管理機能の対応](#スケルトン-アドオンの機関管理機能の対応) が完了していることを前提とします。 + +## RDMコードの変更 + +### RdmAddonOption モデルの変更 + +[osf/models/rdm_addons.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/osf/models/rdm_addons.py) の `RdmAddonOption` モデルおよび `RdmAddonNoInstitutionOption` モデルに、Admin Notesの内容を保存する `admin_notes` カラムを追加します。 +変更例はサンプル [rdm_addons.py](osf/models/rdm_addons.py) を参照してください。 + +### APIの追加 + +Admin Notesを取得・設定するためのAPIを追加します。 + +[admin/rdm_addons/api_v1/views.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/rdm_addons/api_v1/views.py) に `AdminNotesView` クラスを追加します。 +変更例はサンプル [views.py](admin/rdm_addons/api_v1/views.py) を参照してください。 + +[admin/rdm_addons/api_v1/urls.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/rdm_addons/api_v1/urls.py) に `AdminNotesView` へのルーティング設定を追加します。 +変更例はサンプル [urls.py](admin/rdm_addons/api_v1/urls.py) を参照してください。 + +### UIの追加 + +Admin Notesを設定するためのUIを追加します。 +今回は、スケルトン アドオンに対してのみAdmin Notesを設定できるように、スケルトン アドオン用の設定UIを作成します。 + +以下に従って、テンプレートファイルとJavaScriptファイルをコピーします。 + +- [myskelton_institution_settings.html](admin/templates/rdm_addons/addons/myskelton_institution_settings.html) を `admin/templates/rdm_addons/addons/myskelton_institution_settings.html` にコピーする。 +- [myskeltonRdmConfig.js](admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js) を `admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js` にコピーする。 +- [rdm-cfg.js](admin/static/js/rdm_addons/myskelton/rdm-cfg.js) を `admin/static/js/rdm_addons/myskelton/rdm-cfg.js` にコピーする。 + +作成したテンプレートファイルを読み込むように、 [admin/rdm_addons/utils.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/rdm_addons/utils.py) の `get_institusion_settings_template()` 関数の一部を変更します。 +変更例はサンプル [utils.py](admin/rdm_addons/utils.py) を参照してください。 + +作成したJavaScriptファイルを読み込むように、 [admin/webpack.admin.config.js](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/webpack.admin.config.js) の `entry` に `rdm-myskelton-cfg` プロパティを追加します。 +変更例はサンプル [webpack.admin.config.js](config/admin/webpack.admin.config.js) を参照してください。 + +アドオンの機関管理機能UIで読み込まれるCSSファイル [admin/static/css/rdm_addons.css](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin/static/css/rdm_addons.css) に、Admin Notesに関するCSSを追加します。 +変更例はサンプル [rdm_addons.css](admin/static/css/rdm_addons.css) を参照してください。 + +## addons.myskelton モジュールの変更 + +Admin Notesの内容をプロジェクトの「アドオンを構成」ページに表示するための変更を加えます。 + +### APIの追加 + +Admin Notesを取得するためのAPIを追加します。 + +`addons/myskelton/views.py` に `myskelton_get_admin_notes` 関数を追加します。 +変更例はサンプル [views.py](addon/views.py) を参照してください。 + +`addons/myskelton/routes.py` に `myskelton_get_admin_notes` へのルーティング設定を追加します。 +変更例はサンプル [routes.py](addon/routes.py) を参照してください。 + +### UIの追加 + +Admin Notesを表示するためのUIを追加します。 + +`addons/myskelton/templates/node_settings.mako` にAdmin Notesを表示するテンプレートを追加します。 +変更例はサンプル [node_settings.mako](addon/templates/node_settings.mako) を参照してください。 + +`addons/myskelton/static/node-cfg.js` にAdmin Notesを読み込む関数とAdmin Notesの内容を保持する変数を追加します。 +変更例はサンプル [node-cfg.js](addon/static/node-cfg.js) を参照してください。 + +## 国際化 + +[website/translations/](https://github.com/RCOSDP/RDM-osf.io/tree/develop/website/translations) 以下のファイル `js_messages.*` の末尾に、Admin Notesに関する国際化設定を追加します。 +変更例はサンプル [website/translations/](website/translations/) を参照してください。 + +[admin/translations/](https://github.com/RCOSDP/RDM-osf.io/tree/develop/admin/translations) 以下の各ファイルの末尾に、Admin Notesに関する国際化設定を追加します。 +変更例はサンプル [admin/translations/](admin/translations/) を参照してください。 + +## テストファイルの変更 + +### admin_tests/rdm_addons/api_v1/test_views.py の変更 + +機関管理機能に追加したAPIのテストを追加します。 + +[admin_tests/rdm_addons/api_v1/test_views.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/admin_tests/rdm_addons/api_v1/test_views.py) に、Admin Notes取得・設定APIをテストする `TestAdminNotesView` クラスを追加します。 +変更例はサンプル [test_views.py](admin_tests/rdm_addons/api_v1/test_views.py) を参照してください。 + +### addons/myskelton/tests/test_view.py の変更 + +スケルトン アドオンのAdmin Notesの取得APIのテストを追加します。 + +`addons/myskelton/tests/test_view.py` に、Admin Notes取得APIをテストする `TestAdminNotesViews` クラスを追加します。 +変更例はサンプル [test_views.py](addon/tests/test_view.py) を参照してください。 + +## Migrationsファイルの作成 + +makemigrations コマンドを実行して、Migrationsファイルを作成します。 + +``` +$ docker compose run --rm web python3 manage.py makemigrations +``` + +上記の出力中に以下のような出力が現れれば成功です。 + +> `osf/migrations` 配下に作成されるファイル名は、作成日時やRDMのバージョンによって異なります。 + +``` +Migrations for 'osf': + osf/migrations/0214_auto_20210214_1431.py + - Add field admin_notes to rdmaddonnoinstitutionoption + - Add field admin_notes to rdmaddonoption +``` + +## テスト + +アドオンの機関管理機能におけるAdmin Notesに関するユニットテストは、以下のコマンドで実行できます。 + +``` +$ docker compose run --rm web invoke test_module -m admin_tests/rdm_addons/api_v1/test_views.py::TestAdminNotesView +``` + +スケルトン アドオンにおけるAdmin Notesに関するユニットテストは、以下のコマンドで実行できます。 + +``` +$ docker compose run --rm web invoke test_module -m addons/myskelton/tests/test_view.py::TestAdminNotesViews +``` + +# Admin Notesの動作確認 + +Admin Notesの動作を確認してみましょう。 + +## DBマイグレーション + +マイグレーションを実行し、Migrations定義をPostgreSQLサービスに反映します。 + +``` +$ docker compose run --rm web python3 manage.py migrate +``` + +## 国際化のコンパイル + +テンプレートファイルの国際化設定を適用するために、国際化ファイルをコンパイルします。 + +``` +$ docker compose run --rm web pybabel compile -D django -d ./admin/translations +``` + +## サービスの再起動 + +変更したファイルに関するサービスを再起動します。 + +``` +$ docker compose restart web api assets admin admin_assets +``` + +これでサービスへの反映は完了です。 + +## Admin Notesを試す + +Admin Notesの設定および表示の確認をするには、以下のような操作を実施します。 + +1. 機関管理機能のWeb UIにアクセスする。 `http://localhost:8001` +1. アドオン利用制御(RDM Addons)ページを開く。 +1. 自分の所属機関のページを開く。 +1. My Skeltonアドオンの中の管理者ノート(Admin Notes)の下にあるテキストボックスに任意のテキストを入力し、保存する。 + ![Edit Admin Notes](./images/edit_admin_notes.png) +1. RDM Web UIにアクセスする。 `http://localhost:5000` +1. 適当なプロジェクトを作成する。 +1. 「アドオン」ページを開く。 +1. My Skeltonアドオンを有効化する。 +1. 「アドオンを構成」のMy Skeltonの欄に、設定したAdmin Notesが表示されていることを確認する。 + ![View Admin Notes](./images/view_admin_notes.png) + +以上でAdmin Notesの動作確認は完了です! diff --git a/docs/guides/admin-addon/README.md b/docs/guides/admin-addon/README.md new file mode 100644 index 0000000..5c90bd7 --- /dev/null +++ b/docs/guides/admin-addon/README.md @@ -0,0 +1,90 @@ +# Admin Addon Guide / 管理者アドオンガイド + +> **Summary:** Guide to creating administrator-level RDM addons with institutional management features +> **概要:** 機関管理機能を持つ管理者レベルの RDM アドオンを作成する手引き + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05 +- Normative for: `docs/guides/admin-addon/` +- Related: [SPEC-06 Documentation Conventions](../../spec/06_documentation_conventions.md) · [Skeleton Guide](../skeleton/README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Overview + +This guide shows how to create administrator-level RDM addons that include: + +- **Institutional management**: Control addon availability per institution +- **Admin Notes**: Display special messages to users from administrators + +The administrator interface runs on a separate port (default 8001) and allows institutional administrators to manage addon settings. + +### Prerequisites + +- Basic understanding of Python, Django, and Django admin interface +- The development environment set up following the [Environment Guide](../environment/README.md) +- Completed the [Skeleton Addon Guide](../skeleton/README.md) and [API Guide](../api/README.md) + +### Quick start + +1. Create your addon using the skeleton as a base +2. Add institutional management features to your addon +3. Create admin templates and JavaScript configurations +4. Deploy with admin services (`admin`, `admin_assets`) +5. Configure institutional administrators' access + +### Legacy content + +The legacy admin addon instructions are kept verbatim in `README.legacy.md` for reference and will be rewritten per milestone. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 概要 + +このガイドは、以下の機能を持つ管理者レベルの RDM アドオンを作成する方法を示します: + +- **機関管理**: 機関ごとにアドオンの利用可否を制御 +- **管理者ノート**: 管理者からユーザーに特別なメッセージを表示 + +管理者画面は別のポート(デフォルト 8001)で実行され、機関管理者がアドオン設定を管理できます。 + +### 前提条件 + +- Python, Django, Django 管理画面の基本的な理解 +- [環境ガイド](../environment/README.md)に従って開発環境をセットアップしていること +- [スケルトンアドオンガイド](../skeleton/README.md)と [API ガイド](../api/README.md)を完了していること + +### クイックスタート + +1. スケルトンをベースにアドオンを作成する +2. アドオンに機関管理機能を追加する +3. 管理者テンプレートと JavaScript 設定を作成する +4. admin サービス(admin, admin_assets)でデプロイする +5. 機関管理者のアクセスを設定する + +### 過去のコンテンツ + +過去の管理者アドオンの手順は、参考のために `README.legacy.md` にそのまま残しており、マイルストーンごとに書き直す予定です。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Institutional management | Controlling which addons are available to each institution. | 各機関に対してどのアドオンを利用可能にするかを制御すること。 | +| Admin interface | A separate page where institutional administrators manage settings. | 機関管理者が設定を管理するための別のページ。 | +| Admin Notes | Special messages that administrators can display to users. | 管理者がユーザーに表示できる特別なメッセージ。 | +| Institution | An organization (like a university or company) that uses RDM. | RDM を使用する組織(大学や会社など)。 | + diff --git a/AdminRDMAddonGuide/addon/apps.py b/docs/guides/admin-addon/addon/apps.py similarity index 100% rename from AdminRDMAddonGuide/addon/apps.py rename to docs/guides/admin-addon/addon/apps.py diff --git a/AdminRDMAddonGuide/addon/routes.py b/docs/guides/admin-addon/addon/routes.py similarity index 100% rename from AdminRDMAddonGuide/addon/routes.py rename to docs/guides/admin-addon/addon/routes.py diff --git a/AdminRDMAddonGuide/addon/static/node-cfg.js b/docs/guides/admin-addon/addon/static/node-cfg.js similarity index 100% rename from AdminRDMAddonGuide/addon/static/node-cfg.js rename to docs/guides/admin-addon/addon/static/node-cfg.js diff --git a/AdminRDMAddonGuide/addon/static/user-cfg.js b/docs/guides/admin-addon/addon/static/user-cfg.js similarity index 100% rename from AdminRDMAddonGuide/addon/static/user-cfg.js rename to docs/guides/admin-addon/addon/static/user-cfg.js diff --git a/AdminRDMAddonGuide/addon/templates/node_settings.mako b/docs/guides/admin-addon/addon/templates/node_settings.mako similarity index 100% rename from AdminRDMAddonGuide/addon/templates/node_settings.mako rename to docs/guides/admin-addon/addon/templates/node_settings.mako diff --git a/AdminRDMAddonGuide/addon/templates/user_settings.mako b/docs/guides/admin-addon/addon/templates/user_settings.mako similarity index 100% rename from AdminRDMAddonGuide/addon/templates/user_settings.mako rename to docs/guides/admin-addon/addon/templates/user_settings.mako diff --git a/AdminRDMAddonGuide/addon/tests/test_view.py b/docs/guides/admin-addon/addon/tests/test_view.py similarity index 100% rename from AdminRDMAddonGuide/addon/tests/test_view.py rename to docs/guides/admin-addon/addon/tests/test_view.py diff --git a/AdminRDMAddonGuide/addon/views.py b/docs/guides/admin-addon/addon/views.py similarity index 100% rename from AdminRDMAddonGuide/addon/views.py rename to docs/guides/admin-addon/addon/views.py diff --git a/AdminRDMAddonGuide/admin/rdm_addons/api_v1/urls.py b/docs/guides/admin-addon/admin/rdm_addons/api_v1/urls.py similarity index 100% rename from AdminRDMAddonGuide/admin/rdm_addons/api_v1/urls.py rename to docs/guides/admin-addon/admin/rdm_addons/api_v1/urls.py diff --git a/AdminRDMAddonGuide/admin/rdm_addons/api_v1/views.py b/docs/guides/admin-addon/admin/rdm_addons/api_v1/views.py similarity index 100% rename from AdminRDMAddonGuide/admin/rdm_addons/api_v1/views.py rename to docs/guides/admin-addon/admin/rdm_addons/api_v1/views.py diff --git a/AdminRDMAddonGuide/admin/rdm_addons/utils.py b/docs/guides/admin-addon/admin/rdm_addons/utils.py similarity index 100% rename from AdminRDMAddonGuide/admin/rdm_addons/utils.py rename to docs/guides/admin-addon/admin/rdm_addons/utils.py diff --git a/AdminRDMAddonGuide/admin/static/css/rdm_addons.css b/docs/guides/admin-addon/admin/static/css/rdm_addons.css similarity index 100% rename from AdminRDMAddonGuide/admin/static/css/rdm_addons.css rename to docs/guides/admin-addon/admin/static/css/rdm_addons.css diff --git a/AdminRDMAddonGuide/admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js b/docs/guides/admin-addon/admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js similarity index 100% rename from AdminRDMAddonGuide/admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js rename to docs/guides/admin-addon/admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js diff --git a/AdminRDMAddonGuide/admin/static/js/rdm_addons/myskelton/rdm-cfg.js b/docs/guides/admin-addon/admin/static/js/rdm_addons/myskelton/rdm-cfg.js similarity index 100% rename from AdminRDMAddonGuide/admin/static/js/rdm_addons/myskelton/rdm-cfg.js rename to docs/guides/admin-addon/admin/static/js/rdm_addons/myskelton/rdm-cfg.js diff --git a/AdminRDMAddonGuide/admin/templates/rdm_addons/addons/myskelton_institution_settings.html b/docs/guides/admin-addon/admin/templates/rdm_addons/addons/myskelton_institution_settings.html similarity index 100% rename from AdminRDMAddonGuide/admin/templates/rdm_addons/addons/myskelton_institution_settings.html rename to docs/guides/admin-addon/admin/templates/rdm_addons/addons/myskelton_institution_settings.html diff --git a/AdminRDMAddonGuide/admin/translations/django.pot b/docs/guides/admin-addon/admin/translations/django.pot similarity index 100% rename from AdminRDMAddonGuide/admin/translations/django.pot rename to docs/guides/admin-addon/admin/translations/django.pot diff --git a/AdminRDMAddonGuide/admin/translations/en/LC_MESSAGES/django.po b/docs/guides/admin-addon/admin/translations/en/LC_MESSAGES/django.po similarity index 100% rename from AdminRDMAddonGuide/admin/translations/en/LC_MESSAGES/django.po rename to docs/guides/admin-addon/admin/translations/en/LC_MESSAGES/django.po diff --git a/AdminRDMAddonGuide/admin/translations/ja/LC_MESSAGES/django.po b/docs/guides/admin-addon/admin/translations/ja/LC_MESSAGES/django.po similarity index 100% rename from AdminRDMAddonGuide/admin/translations/ja/LC_MESSAGES/django.po rename to docs/guides/admin-addon/admin/translations/ja/LC_MESSAGES/django.po diff --git a/AdminRDMAddonGuide/admin_tests/rdm_addons/api_v1/test_views.py b/docs/guides/admin-addon/admin_tests/rdm_addons/api_v1/test_views.py similarity index 100% rename from AdminRDMAddonGuide/admin_tests/rdm_addons/api_v1/test_views.py rename to docs/guides/admin-addon/admin_tests/rdm_addons/api_v1/test_views.py diff --git a/AdminRDMAddonGuide/config/admin/base/settings/defaults.py b/docs/guides/admin-addon/config/admin/base/settings/defaults.py similarity index 100% rename from AdminRDMAddonGuide/config/admin/base/settings/defaults.py rename to docs/guides/admin-addon/config/admin/base/settings/defaults.py diff --git a/AdminRDMAddonGuide/config/admin/webpack.admin.config.js b/docs/guides/admin-addon/config/admin/webpack.admin.config.js similarity index 100% rename from AdminRDMAddonGuide/config/admin/webpack.admin.config.js rename to docs/guides/admin-addon/config/admin/webpack.admin.config.js diff --git a/AdminRDMAddonGuide/images/admin_disable_addon1.png b/docs/guides/admin-addon/images/admin_disable_addon1.png similarity index 100% rename from AdminRDMAddonGuide/images/admin_disable_addon1.png rename to docs/guides/admin-addon/images/admin_disable_addon1.png diff --git a/AdminRDMAddonGuide/images/configure_addon_account.png b/docs/guides/admin-addon/images/configure_addon_account.png similarity index 100% rename from AdminRDMAddonGuide/images/configure_addon_account.png rename to docs/guides/admin-addon/images/configure_addon_account.png diff --git a/AdminRDMAddonGuide/images/edit_admin_notes.png b/docs/guides/admin-addon/images/edit_admin_notes.png similarity index 100% rename from AdminRDMAddonGuide/images/edit_admin_notes.png rename to docs/guides/admin-addon/images/edit_admin_notes.png diff --git a/AdminRDMAddonGuide/images/view_admin_notes.png b/docs/guides/admin-addon/images/view_admin_notes.png similarity index 100% rename from AdminRDMAddonGuide/images/view_admin_notes.png rename to docs/guides/admin-addon/images/view_admin_notes.png diff --git a/AdminRDMAddonGuide/osf/models/rdm_addons.py b/docs/guides/admin-addon/osf/models/rdm_addons.py similarity index 100% rename from AdminRDMAddonGuide/osf/models/rdm_addons.py rename to docs/guides/admin-addon/osf/models/rdm_addons.py diff --git a/AdminRDMAddonGuide/website/translations/en/LC_MESSAGES/js_messages.po b/docs/guides/admin-addon/website/translations/en/LC_MESSAGES/js_messages.po similarity index 100% rename from AdminRDMAddonGuide/website/translations/en/LC_MESSAGES/js_messages.po rename to docs/guides/admin-addon/website/translations/en/LC_MESSAGES/js_messages.po diff --git a/AdminRDMAddonGuide/website/translations/ja/LC_MESSAGES/js_messages.po b/docs/guides/admin-addon/website/translations/ja/LC_MESSAGES/js_messages.po similarity index 100% rename from AdminRDMAddonGuide/website/translations/ja/LC_MESSAGES/js_messages.po rename to docs/guides/admin-addon/website/translations/ja/LC_MESSAGES/js_messages.po diff --git a/AdminRDMAddonGuide/website/translations/js_messages.pot b/docs/guides/admin-addon/website/translations/js_messages.pot similarity index 100% rename from AdminRDMAddonGuide/website/translations/js_messages.pot rename to docs/guides/admin-addon/website/translations/js_messages.pot diff --git a/APIGuide/Decorators.md b/docs/guides/api/Decorators.md similarity index 100% rename from APIGuide/Decorators.md rename to docs/guides/api/Decorators.md diff --git a/docs/guides/api/README.legacy.md b/docs/guides/api/README.legacy.md new file mode 100644 index 0000000..b1c5629 --- /dev/null +++ b/docs/guides/api/README.legacy.md @@ -0,0 +1,318 @@ +# APIの利用 + +RDMが研究データを効果的に管理するためには、外部システムとの連携や既存のRDMアドオンとの連携を行う必要が出てくるでしょう。 +このような時、外部システムやRDMおよびアドオンの間の境界面、特にAPI(Application Programming Interface)を意識しながら機能を実装することで、メンテナンス性を維持したり、今後の拡張を容易にしたりすることができます。 + +本ドキュメントではアドオンにおける実装に着目し、アドオンを外部システムから操作可能にする方法([アドオンAPIの公開](#アドオンAPIの公開))と、アドオンからRDMを操作する方法([既存APIによる操作](#既存APIによる操作))の2つの観点で説明します。 + +# アドオンAPIの公開 + +アドオンの機能に対して、他のシステムからアクセス可能にするためのAPIの考え方、定義方法を説明します。 + +## APIの実装 + +外部システムがアドオンの機能に対してアクセスする場合は、HTTP(S)によるRESTful API呼び出しを利用するのが便利です。 +RDMアドオンは [スケルトン](../Skelton) の追加方法で説明したように、Djangoアプリケーションの形で実装されます。 +そのため、DjangoやRDMが提供する各種補助機能を利用することができます。 + +HTTP(S)で呼び出し可能なエンドポイントを定義する場合、ビューにより実装するのが一般的です。 +[スケルトンの作成#Viewの構成](../Skelton#viewの構成) に示すように、定義は以下の2種類から構成されます。 + +- Routes ... View処理をどのパスにマッピングし、どのような形式で出力するか。出力にはJSON形式や、HTMLのテンプレートを指定することができる +- Views ... View処理の内容 + +Routesは以下のようにパスとMethod(GET, POST, PUT, DELETE, ...)と、その組み合わせに対してどの関数を実行するか、その実行結果をどのように出力するかを定義します。 +例えば、[画面拡張の例](../ScreenExpansion)では以下のように定義しています。 + +``` +api_routes = { + 'rules': [ + ... + Rule([ # (1) + '/project/<pid>/{}/config'.format(SHORT_NAME), + '/project/<pid>/node/<nid>/{}/config'.format(SHORT_NAME), + ], 'get', views.myscreen_get_config_ember, json_renderer), + Rule([ # (2) + '/project/<pid>/{}/config'.format(SHORT_NAME), + '/project/<pid>/node/<nid>/{}/config'.format(SHORT_NAME), + ], 'patch', views.myscreen_set_config_ember, json_renderer), + ... + ], +} +``` + +ルール(1)は、`/project/<pid>/アドオン名/config` というエンドポイントへの`GET`リクエストに対する処理を、viewsモジュールで定義した`myscreen_get_config_ember`という関数に行わせることを定義しています。`json_renderer`は、関数の戻り値として返されたオブジェクトを +JSONに変換、レスポンスとして返すことを定義しています。 +同様に、ルール(2)は`PATCH`リクエストに対しては`myscreen_set_config_ember`で処理することを示しています。 + +Viewsでは、以下のように関数を定義しています。 + +``` +@must_be_valid_project +@must_have_permission('admin') +@must_have_addon(SHORT_NAME, 'node') +def myscreen_get_config_ember(**kwargs): + node = kwargs['node'] or kwargs['project'] + addon = node.get_addon(SHORT_NAME) + return {'data': {'id': node._id, 'type': 'myscreen-config', + 'attributes': { + 'param1': addon.get_param_1() + }}} + +@must_be_valid_project +@must_have_permission('admin') +@must_have_addon(SHORT_NAME, 'node') +def myscreen_set_config_ember(**kwargs): + node = kwargs['node'] or kwargs['project'] + addon = node.get_addon(SHORT_NAME) + try: + config = request.json['data']['attributes'] + param_1 = config['param1'] + except KeyError: + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + + addon.set_param_1(param_1) + return {'data': {'id': node._id, 'type': 'myscreen-config', + 'attributes': { + 'param1': param_1 + }}} +``` + +いずれも、`@must_`から始まるデコレータと、`def`から始まる関数定義ブロックから構成されます。 +デコレータは、これらの関数に関する認可の要否や、使用可能なプロジェクトの条件を定義しています。 +また、`kwargs`には関数に与えられた引数が格納されます。`node`や`project`には、Django Modelが格納されます。 +(デコレータの定義によっては、格納されない場合もあります。) +アドオンはこれらのオブジェクトを介して、RDM内のデータベースの内容を操作することができます。 +([画面拡張の例](../ScreenExpansion)では、Emberで定義した画面からこれらのエンドポイントに対してリクエストを出しています。) + +これらのロジックの記述方法は一般的なDjangoのルールに則っています。したがって、DjangoやFlaskなどのPythonの +Webアプリケーションフレームワークの知識があれば比較的簡単に実装することができるでしょう。 +また、RDMではアクセス制御やプロジェクトの制限に便利なデコレータを提供しています。[RDMが提供するデコレータ一覧](Decorators.md)を参考にしてください。 + + +## APIのセキュリティ + +APIアクセスは適切なユーザ、またはシステムからのみ利用可能なようにアクセス制御を行う必要があります。 +アクセス制御方式の実現方法として、ユーザによる認可を経てアクセスを行う方式と、独自のセキュリティ機構を設ける方式について説明します。 + +### ユーザによる認可 + +先のViewsの例では、 `@must_have_permission('admin')` という形で、この操作は`admin`権限を持っているユーザにしか実施できないことを宣言しています。 +他にも、`write`権限が必要であるとか、様々な権限のコントロールが考えられます。 + +ここで重要なのは、**ユーザによって、操作可能な範囲が異なる**という点と、**ユーザはアドオンを無制限に信頼してくれるわけではない**という点です。 +ユーザの識別はWebアプリケーションにとっては当たり前のことですが、APIによる操作を考える場合にも非常に重要な点となります。 +ただ、APIのリクエスト側に*「私はxxです」*という申告を求めるわけにはいきません。詐称される可能性があるからです。 +また、秘密の情報(パスワード・秘密鍵等)で操作の主が認証できたとしても、そのユーザはこのアドオンを無制限に信頼してくれると考えるべきではありません。 +(RDM自体は信頼して使ってもらうことになりますが、RDMのAPIにアクセスするソフトウェアは信頼されているとは限りません。) +そのため、「このアドオンは情報yyの読み込みだけをします」であるとか、「読み込みと書き込みをします」であるとか、範囲を限定してユーザへの許可を求めることになります。 + +#### Personal Access Tokenによる認可 + +このような、ユーザの権限を行使するための機構の一つが、Personal Access Tokenです。RDMのユーザの [設定] 画面から、 [パーソナルアクセストークン] で取得することができます。 + +![パーソナルアクセストークン](./images/personal-access-token.png) + +[新規トークン] ボタンをクリックすると、新規トークンを発行することができます。 + +![新規トークン](./images/new-token.png) + +新規トークンの発行の際に、スコープという複数のチェック項目が現れます。これが認可の範囲を示しています。(詳細は [スコープの定義](#スコープの定義) を参照してください。) +[作成] ボタンをクリックして得たトークン(Access Token)はアプリケーションなどから`Authorization: Bearer`ヘッダを通して与えることで、APIにアクセスすることができるようになります。このようにすると、トークンの発行主の持つ権限と、(必要に応じて)スコープにより定義された認可範囲、 `@must_have_permission` などのデコレータによって定義された制約の検証が行われ、アクセスの許可・不許可が決定されます。 + +この方法は後述する [OAuthによる認可](#OAuthによる認可) 方式と異なり、Callback URLなどの準備が不要な一方、ユーザによるアクセストークン発行が必要なこと、そのアクセストークンが漏洩した際にユーザの協力を得ながら解決する必要があることなどから、開発中に利用できる便利な方式程度に考えるべきでしょう。 + +#### OAuthによる認可 + +Personal Access Tokenはユーザに手動でトークンを作成させ、トークンを何らかの方式でアプリケーションに渡す必要がありますが、RDMはOAuth https://tools.ietf.org/html/rfc6749 をサポートしており、OAuthによりアプリケーションとRDMの間で認可情報のやりとりを実現することができます。 + +アプリケーションがOAuthを通じてユーザから操作の認可を得るためには、RDMからConsumer KeyとConsumer Secretという情報を得る必要があります。 +この情報は、RDMのユーザの [設定] 画面から、 [開発者アプリ] で取得することができます。 + +![開発者アプリ](./images/dev-application.png) + +APIに対してアクセスするアプリケーションは、OAuth 2.0に対応したクライアントライブラリを用いてOAuth認可フローを実装する必要があります。 +アプリケーションはOAuth認可フローを通して、ユーザにRDMへのログインと認可を求め、認可されるとAccess Token(または、要求した`access_type`が`offline`の場合、Refresh TokenとAccess Token)を取得することができます。あとはPersonal Access Tokenと同様に、`Authorization: Bearer`ヘッダにAccess Tokenを与えることで、APIアクセスを行うことができます。 + +頻繁に利用される可能性があるAccess Tokenは、悪用を防ぐために短時間(1時間)で期限切れとなるよう設計されています。そのため、認可を受けてから、長期間にわたってその認可された操作を実施したい場合は、Refresh Tokenを用いてAccess Tokenを定期的に新規取得する必要があります。 +これらの処理は、多くの場合OAuth対応クライアントライブラリにロジックが用意されており、RDMが提供するエンドポイントのURLを与えれば実現できます。 +(参考: エンドポイントの情報や可能な操作は https://github.com/RCOSDP/RDM-cas-overlay#web-server-authorization に記載されている。) + +> OAuthを用いたAPIの認可をローカル環境で試すためには、開発環境構築時に [cas-overlayを含む構成で起動する](../Environment.md#cas-overlayを含む構成で起動する) 必要があります。 + +### 独自方式によるアクセス制御: Signing API requestsの例 + +RDMはアドオンに関してサンドボックスのような隔離モデルは採用しておらず、アドオンからRDM本体と同様の操作が実施することができます。 +これは、様々な処理をアドオンとして実現できる一方、その強力な自由度を悪用されないよう、アドオンでは適切な権限制御を行う必要があります。 + +先に示したのはユーザの認可を経て処理を実施する方式ですが、アドオンによっては、必ずしも操作主体となるユーザを限定しない形で振舞う必要があるかもしれません。 +このような場合に関してRDMは特別なセキュリティ機構を提供していないため、独自に外部システム(アドオン呼び出し元)とアドオンの間で取り決めをし、不正なユーザがアクセスすることができないようにセキュリティ機構を実装する必要があります。 + +このような機構を実現する場合に最も簡単な方法は、第三者が推測しにくいトークンを外部システムとアドオンの間で決め、アドオンはこのトークンをともなうリクエストのみを許可する方式です。 +この方式は実現が容易な一方、中間者攻撃などリクエストの内容が奪われてしまうとこのトークンも漏洩してしまうという問題があります。(攻撃者は秘密のトークンを用いて自由にアドオンを操作できてしまう。) + +このような攻撃への対策として、秘密のトークンそのものをリクエストに含めるのではなく、秘密のトークンと、その他の情報を合わせたハッシュ値を計算し、そのハッシュをリクエストに含めることが考えられます。これにより、受信側は同様のハッシュ計算を行なって送信側のハッシュ値との比較を行うことで、送信側が秘密のトークンを所持しているかを検証することができます。 + +例として、IQB-RIMSアドオンの場合は、アドオンの設定情報に基づいたハッシュを生成し、独自のHTTPヘッダ `X-RDM-Token` に格納するようにしています。 +これにより、あるプロジェクトにアタッチされたアドオンにおいてハッシュが漏洩したとしても、別のアドオンに対して悪用はできないように配慮しています。 +ハッシュ生成処理は、[RDMが提供するデコレータ一覧](Decorators.md)のようにデコレータとして定義することで、再利用性を高めています。 + +``` +def must_have_valid_hash(): + """Decorator factory that ensures that a request have valid X-RDM-Token header. + :returns: Decorator function + """ + def wrapper(func): + + @functools.wraps(func) + def wrapped(*args, **kwargs): + owner = kwargs['node'] + addon = owner.get_addon(IQBRIMSAddonConfig.short_name) + if addon is None: + raise HTTPError(http.BAD_REQUEST) + secret = addon.get_secret() + process_def_id = addon.get_process_definition_id() + valid_hash = hashlib.sha256((secret + process_def_id + owner._id).encode('utf8')).hexdigest() + request_hash = request.headers.get('X-RDM-Token', None) + logger.debug('must_have_valid_hash: request_hash={}'.format(request_hash)) + logger.debug('must_have_valid_hash: valid_hash={}'.format(valid_hash)) + if request_hash != valid_hash: + raise HTTPError( + http.FORBIDDEN, + data={'message_long': ('User has restricted access to this page.')} + ) + return func(*args, **kwargs) + + return wrapped + + return wrapper +``` +(引用: https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/iqbrims/utils.py#L142) + +このように定義した独自の `addons.iqbrims.utils.must_have_valid_hash` デコレータを用いて、 +個々のViewsへのアクセスの際にハッシュ値の計算・設定が必要なことを明示しています。 + +``` +@must_be_valid_project +@must_have_addon(SHORT_NAME, 'node') +@must_have_valid_hash() # Hashの設定が必要なことを示す +def iqbrims_post_workflow_state(**kwargs): + node = kwargs['node'] or kwargs['project'] + ... # Viewsの処理 +``` +(引用: https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/iqbrims/views.py#L229) + +これらのハッシュ計算にどの程度のリスクを想定するかは利用形態によって異なります。例えば、Amazon S3のSigning and authenticating REST requests https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html では、送信時刻を含むリクエストヘッダをハッシュ計算の対象に含めることで、ハッシュ値を含むリクエストが漏洩しても、同じオブジェクトに対するリクエストは以後不可能なように配慮がなされています。ハッシュ値の計算にどのような要素を使うかはアドオンの実装に依存する部分ではありますが、たとえリクエストが漏洩したとしても、その影響範囲がある程度限定的になるよう配慮してハッシュ計算を実装する必要があるでしょう。 + + + +# 既存APIによる操作 + +RDMは多くの機能をAPIとして提供しているため、すでにある機能については積極的に活用すべきでしょう。また、内部ではDjangoの規則にしたがって作成されたDjango Modelを介してデータベースの管理を行なっているため、この本章では、OSF APIv2による操作とDjango Modelによるモデルの直接操作に関して説明します。 + +## OSF APIv2 による外部からの操作 + +OSF APIv2はRDMが備えるRESTful APIです。OSF APIv2ドキュメント https://developer.osf.io/ で説明されている通り、プロジェクトに対して様々な操作を実施することができます。 + +これらのAPIは外部システムからの呼び出しに利用される他、Emberベースのアプリケーションからの操作にも利用されます。また、JSON-API https://jsonapi.org/format/1.0/ に準拠した形式で提供されます。 + +### スコープの定義 + +APIの操作にはOAuthにて説明したように、適切なスコープを指定する必要があります。 +RDMにて指定可能なスコープは `oauth_scopes.public_scopes` として定義されます。 + +- https://github.com/RCOSDP/RDM-osf.io/blob/develop/framework/auth/oauth_scopes.py#L291-L363 + +これらのスコープは`CoreScopes` https://github.com/RCOSDP/RDM-osf.io/blob/develop/framework/auth/oauth_scopes.py#L23 の組み合わせとして表現されます。 +それぞれの操作がどのようなスコープを要求するかは、Viewクラスに定義されます。例えば、NodeListに関する操作 ( https://developer.osf.io/#operation/nodes_list や https://developer.osf.io/#operation/nodes_create ) であれば、 + +``` +class NodeList(JSONAPIBaseView, bulk_views.BulkUpdateJSONAPIView, bulk_views.BulkDestroyJSONAPIView, bulk_views.ListBulkCreateJSONAPIView, NodesFilterMixin, WaterButlerMixin, NodeOptimizationMixin): + """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_list). + """ + permission_classes = ( + drf_permissions.IsAuthenticatedOrReadOnly, + base_permissions.TokenHasScope, + ) + required_read_scopes = [CoreScopes.NODE_BASE_READ] + required_write_scopes = [CoreScopes.NODE_BASE_WRITE] + model_class = apps.get_model('osf.AbstractNode') + + parser_classes = (JSONAPIMultipleRelationshipsParser, JSONAPIMultipleRelationshipsParserForRegularJSON,) + serializer_class = NodeSerializer + ... +``` +(引用: https://github.com/RCOSDP/RDM-osf.io/blob/develop/api/nodes/views.py#L228-L229) + +のように、 `required_read_scopes` と `required_write_scopes` として、必要なスコープが定義されます。 + + +## Django Modelによる内部からの操作 + +RDMはDjangoアプリケーションとして構成されているため、データベースへのアクセスはDjango Modelを介して行います。 +この操作の例として、`django.dispatch.receiver` によるモデル変更検知と、 `osf.models` 内のオブジェクトを介した操作例を示します。 + +``` +from django.dispatch import receiver +... +from osf.models import Contributor, RdmAddonOption, AbstractNode + +... + +@receiver(post_save, sender=Node) +def add_iqbrims_addon(sender, instance, created, **kwargs): + if IQBRIMSAddonConfig.short_name not in ws_settings.ADDONS_AVAILABLE_DICT: + return + + inst_ids = instance.affiliated_institutions.values('id') + addon_option = RdmAddonOption.objects.filter( + provider=IQBRIMSAddonConfig.short_name, + institution_id__in=Subquery(inst_ids), + management_node__isnull=False, + is_allowed=True + ).first() + if addon_option is None: + return + if addon_option.organizational_node is not None and \ + not addon_option.organizational_node.is_contributor(instance.creator): + return + + instance.add_addon(IQBRIMSAddonConfig.short_name, auth=None, log=False) +``` +(引用: https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/iqbrims/models.py#L309-L327) + +以下で、注目すべきコードについてそれぞれ説明します。 + +### receiverによるモデル変更検知 + +`django.dispatch.receiver` デコレータを用いることで、特定のModelに変更が生じた場合の処理を記述することができます。 + +``` +@receiver(post_save, sender=Node) +def add_iqbrims_addon(sender, instance, created, **kwargs): + ... +``` + +この例の場合は、`post_save`を指定していますので、Node型(プロジェクトはこの型のオブジェクトで表現されます)を持つオブジェクトの更新後に、`add_iqbrims_addon`関数が呼び出されます。 + +> `post_save`のほか、検知可能な変更操作は、 https://docs.djangoproject.com/en/3.1/ref/signals/ に列挙されています。 +> RDM内では、 `pre_save`, `post_save`, `post_delete`, `m2m_changed` がすでに使用されています。 + +### osf.modelsによるモデル操作 + +`django.dispatch.receiver(post_save, sender=Node)` デコレータの場合は、第2引数の `instance` オブジェクトにNodeへの参照が格納されます。 +Django Modelは `osf.models` に定義してあります。例えば Node Modelならば、 https://github.com/RCOSDP/RDM-osf.io/blob/develop/osf/models/node.py#L2457 で定義されています。 + +例えば、プロジェクト内で特定のアドオンを有効化したい場合は、 `add_addon`関数 https://github.com/RCOSDP/RDM-osf.io/blob/develop/osf/models/node.py#L2290 を呼び出すことで実現できます。 + +``` +@receiver(post_save, sender=Node) +def add_iqbrims_addon(sender, instance, created, **kwargs): + ... + + instance.add_addon(IQBRIMSAddonConfig.short_name, auth=None, log=False) +``` + +このようにして、直接Modelを操作することで、RDMに対して様々な作用を与えることができます。 +モデル操作は自由に変更を行える一方、ユーザがこれらの変更を適切に理解できるようにする配慮を行う必要があります。 +さもないと、「何かが勝手に自身のプロジェクトを壊した」と思ってしまうかもしれません。アドオンが、ユーザ自身に許可された範囲で様々な変更を実施しているように、ユーザに理解してもらえるような動作を設計することが重要です。 diff --git a/docs/guides/api/README.md b/docs/guides/api/README.md new file mode 100644 index 0000000..3168bec --- /dev/null +++ b/docs/guides/api/README.md @@ -0,0 +1,89 @@ +# API Guide / API ユーガイド + +> **Summary:** Guide to using and exposing APIs in RDM addons +> **概要:** RDM アドオンで API を使用および公開する手引き + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05 +- Normative for: `docs/guides/api/` +- Related: [SPEC-06 Documentation Conventions](../../spec/06_documentation_conventions.md) · [Skeleton Guide](../skeleton/README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Overview + +This guide explains how to: + +- **Expose your addon's functionality via API**: Allow other systems to access your addon +- **Use existing APIs in your addon**: Interact with RDM and other addons + +RDM addons can be accessed via HTTP(S) RESTful APIs, enabling integration with external systems and other RDM addons. + +### Prerequisites + +- Basic understanding of Python, Django, and REST APIs +- The development environment set up following the [Environment Guide](../environment/README.md) +- Completed the [Skeleton Addon Guide](../skeleton/README.md) + +### Quick start + +1. Define Routes and Views in your addon to create API endpoints +2. Use decorators to control access (authentication, permissions) +3. Test your API with curl or Postman +4. Integrate with external systems using standard HTTP requests + +### Legacy content + +The legacy API guide instructions are kept verbatim in `README.legacy.md` for reference and will be rewritten per milestone. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 概要 + +このガイドでは、以下の方法を説明します: + +- **アドオンの機能を API で公開**: 他のシステムがアドオンにアクセスできるようにする +- **既存の API をアドオンで使用**: RDM や他のアドオンと連携する + +RDM アドオンは HTTP(S) RESTful API でアクセス可能で、外部システムや他の RDM アドオンとの連携ができます。 + +### 前提条件 + +- Python, Django, REST API の基本的な理解 +- [環境ガイド](../environment/README.md)に従って開発環境をセットアップしていること +- [スケルトンアドオンガイド](../skeleton/README.md)を完了していること + +### クイックスタート + +1. アドオンでルートとビューを定義して API エンドポイントを作成する +2. デコレーターを使用してアクセスを制御(認証、権限) +3. curl や Postman で API をテストする +4. 標準的な HTTP リクエストを使用して外部システムと連携する + +### 過去のコンテンツ + +過去の API ガイドの手順は、参考のために `README.legacy.md` にそのまま残しており、マイルストーンごとに書き直す予定です。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| API (Application Programming Interface) | A way for programs to talk to each other using HTTP requests. | プログラムが HTTP リクエストを使用して通信する方法。 | +| RESTful API | An API that follows standard HTTP methods (GET, POST, PUT, DELETE). | 標準的な HTTP メソッド(GET, POST, PUT, DELETE)に従った API。 | +| Decorator | A special marker that controls who can access an API endpoint. | API エンドポイントへのアクセスを制御する特別なマーク。 | +| Authentication | Verifying who is making the API request (like a username and password). | API リクエストを作成した人が誰かを確認すること(ユーザー名とパスワードのようなもの)。 | +| Authorization | Checking what the user is allowed to do after logging in. | ログインした後のユーザーが何をできるかを確認すること。 | + diff --git a/APIGuide/images/dev-application.png b/docs/guides/api/images/dev-application.png similarity index 100% rename from APIGuide/images/dev-application.png rename to docs/guides/api/images/dev-application.png diff --git a/APIGuide/images/new-token.png b/docs/guides/api/images/new-token.png similarity index 100% rename from APIGuide/images/new-token.png rename to docs/guides/api/images/new-token.png diff --git a/APIGuide/images/personal-access-token.png b/docs/guides/api/images/personal-access-token.png similarity index 100% rename from APIGuide/images/personal-access-token.png rename to docs/guides/api/images/personal-access-token.png diff --git a/docs/guides/ec2/README.legacy.md b/docs/guides/ec2/README.legacy.md new file mode 100644 index 0000000..fb94a49 --- /dev/null +++ b/docs/guides/ec2/README.legacy.md @@ -0,0 +1,398 @@ +# OSF evaluation on AWS EC2 + +## Quick Start Guide + +For setting up this project on your local environment, follow these steps: + +### 1. Change to Project Directory + +Setup for git: +```bash +git config --global user.name 'Your github account name' +git config --global user.email 'Your email address' +git config --global core.editor 'code --wait' +git config --global merge.tool 'code --wait "$MERGED"' +git config --global push.default simple +git config --list # githuconfig confirmation +``` + +You need generate and register your github token in your gitconfig. + +link: https://docs.github.com/ja/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens + +Navigate to the project root directory: +```bash +git clone https://github.com/RCOSDP/RDM-osf.io.git +git clone -b develop https://github.com/RCOSDP/RDM-ember-osf-web.git +git clone https://github.com/RCOSDP/RDM-modular-file-renderer.git +git clone https://github.com/RCOSDP/RDM-waterbutler.git +``` + + +### 2. Docker Build +setup docker and docker compose. + +link: https://docs.docker.jp/v1.12/compose/install.html + +link: https://docs.docker.com/engine/install/ubuntu/ + +Build Docker images for each module: +```bash +sudo docker build RDM-ember-osf-web -t rdm-osf-web:dev +sudo docker build RDM-modular-file-renderer -t rdm-mfr:dev +sudo docker build RDM-waterbutler -t rdm-wb:dev +sudo docker build RDM-osf.io -t rdm-osf:dev +``` + +### 3. Setup Loopback Interface + + +Configure your loopback interface on your machine: +```bash +sudo apt install net-tools +sudo ifconfig lo:0 192.168.168.167 netmask 255.255.255.255 up +``` + +### 4. Change to Module Directory + +Navigate to the module directory: +```bash +cd RDM-osf.io/ +``` + +### 5. Copy and Update Local Settings + +Copy the local settings of the project: +```bash +cp ./website/settings/local-dist.py ./website/settings/local.py +cp ./api/base/settings/local-dist.py ./api/base/settings/local.py +cp ./admin/base/settings/local-dist.py ./admin/base/settings/local.py +cp ./tasks/local-dist.py ./tasks/local.py +``` + +Update the local settings of the project: +RDM-osf.io/.docker-compose.env +```bash + +DOMAIN=http://ec2.compute-1.amazonaws.com:5000 +INTERNAL_DOMAIN=http://web:5000 +API_DOMAIN=http://api.ec2.compute-1.amazonaws.com:8000 +ELASTIC_URI=elasticsearch:9200 +ELASTIC6_URI=elasticsearch6:9201 +OSF_DB_HOST=postgres +DB_HOST=mongo +WATERBUTLER_URL=http://files.ec2.compute-1.amazonaws.com:7777 +WATERBUTLER_INTERNAL_URL=http://wb:7777 +CAS_SERVER_URL=http://accounts.ec2.compute-1.amazonaws.com:8080 +MFR_SERVER_URL=http://mfr.ec2.compute-1.amazonaws.com:7778 +#SHARE_URL=http://192.168.168.167:8000 +BROKER_URL=amqp://guest:guest@rabbitmq:5672 +REDIS_URL=redis://192.168.168.167:6379/1 + +ADMIN_URL=http://admin.ec2.compute-1.amazonaws.com:8001 +ADMIN_INTERNAL_DOCKER_URL=http://admin:8001 + + +``` +RDM-osf.io/.docker-compose.osf-web.env +```bash +OSF_COOKIE_DOMAIN=.ec2.compute-1.amazonaws.com +OSF_URL=http://ec2.compute-1.amazonaws.com:5000 +OSF_API_URL=http://api.ec2.compute-1.amazonaws.com:8000 +OSF_MFR_URL=http://mfr.ec2.compute-1.amazonaws.com:7778 +OSF_RENDER_URL=http://mfr.ec2.compute-1.amazonaws.com:7778/render +OSF_FILE_URL=http://files.ec2.compute-1.amazonaws.com:7777 +OSF_HELP_URL=http://ec2.compute-1.amazonaws.com:5000/help +OSF_COOKIE_LOGIN_URL=http://accounts.ec2.compute-1.amazonaws.com:8080/login +OSF_OAUTH_URL=http://accounts.ec2.compute-1.amazonaws.com:8080/oauth2/profile +SHARE_BASE_URL=https://share.osf.io/ +SHARE_API_URL=https://share.osf.io/api/v2 +SHARE_SEARCH_URL=https://share.osf.io/api/v2/search/creativeworks/_search +CAS_URL=http://accounts.ec2.compute-1.amazonaws.com:8080 + +``` + +RDM-osf.io/.docker-compose.wb.env + +```bash +DEBUG= +SERVER_CONFIG_DEBUG= +SERVER_CONFIG_HMAC_SECRET=changeme +SERVER_CONFIG_ADDRESS=0.0.0.0 +SERVER_CONFIG_DOMAIN=http://ec2.compute-1.amazonaws.com:7777 +OSF_AUTH_CONFIG_API_URL=http://ec2.compute-1.amazonaws.com:5000/api/v1/files/auth/ +OSF_URL=http://ec2.compute-1.amazonaws.com:5000 + +TASKS_CONFIG_BROKER_URL=amqp://guest:guest@rabbitmq:5672// +``` + +RDM-osf.io/.docker-compose.mfr.env +```bash + +DEBUG= +SERVER_CONFIG_DEBUG= +SERVER_CONFIG_HMAC_SECRET=changeme + +SERVER_CONFIG_ADDRESS=0.0.0.0 +SERVER_CONFIG_ALLOWED_PROVIDER_DOMAINS='http://192.168.168.167:5000/ http://192.168.168.167:7777/ http://mfr:7777/ http://ec2.compute-1.amazonaws.com:5000/ http://files.ec2.compute-1.amazonaws.com:7777/' + +UNOCONV_PORT_2002_TCP_ADDR=192.168.168.167 +EXTENSION_CONFIG_LOCAL_DEVELOPMENT=1 + + +``` + +RDM-osf.io/admin/base/settings/local.py +```bash +SESSION_COOKIE_DOMAIN = 'ec2.compute-1.amazonaws.com' +from .defaults import * + +ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', 'localhost,osf.io').split(',') + +``` + + +RDM-osf.io/docker-compose.override.yml + +```bash +version: "3.4" + +services: + mfr_requirements: + image: rdm-mfr:dev + mfr: + image: rdm-mfr:dev + wb_requirements: + image: rdm-wb:dev + wb: + image: rdm-wb:dev + wb_worker: + image: rdm-wb:dev + ember_osf_web: + image: rdm-osf-web:dev + environment: + - BACKEND=env + env_file: + - .docker-compose.osf-web.env + volumes: + - ../RDM-ember-osf-web:/code:cached + - ember_osf_web_dist_vol:/code/dist + requirements: + image: rdm-osf:dev + assets: + image: rdm-osf:dev + admin_assets: + image: rdm-osf:dev + worker: + image: rdm-osf:dev + admin: + image: rdm-osf:dev + api: + image: rdm-osf:dev + web: + image: rdm-osf:dev + preprints: + environment: + - BACKEND=env + env_file: + - .docker-compose.osf-web.env + fakecas: + image: quay.io/centerforopenscience/fakecas:master + command: fakecas -host=0.0.0.0:8080 -osfhost=ec2.compute-1.amazonaws.com:5000 -dbaddress=postgres://postgres@postgres:5432/osf?sslmode=disable + registries: + environment: + - BACKEND=env + env_file: + - .docker-compose.osf-web.env + reviews: + environment: + - BACKEND=env + env_file: + - .docker-compose.osf-web.env +``` + +RDM-osf.io/website/settings/local.py +```bash +DOMAIN = PROTOCOL + 'ec2.compute-1.amazonaws.com:5000/' +INTERNAL_DOMAIN = DOMAIN +API_DOMAIN = PROTOCOL + 'ec2.compute-1.amazonaws.com:8000/' +OSF_COOKIE_DOMAIN = 'ec2.compute-1.amazonaws.com' + +``` + + +### 6. Docker Compose Up Requirements + +Ensure you have the required services running: +```bash +sudo docker compose up requirements wb_requirements mfr_requirements +``` + +### 7. Start Core Component Services (Detached) + +Spin up denpent services: +```bash +sudo docker compose up -d elasticsearch elasticsearch6 postgres mongo rabbitmq +``` + +### 8. Assets Setup + +Remove your existing node_modules and start the assets: +```bash +sudo rm -Rf ./node_modules +sudo rm -Rf ./website/static/vendor/bower_components +sudo rm -Rf ./admin/node_modules +sudo rm -Rf ./admin/static/vendor/bower_components +sudo docker compose up -d assets admin_assets +``` + +### 9. More Services + +Upgrade dependency +RDM-osf.io/requirements/dev.txt +```bash +pytest-xdist==1.34.0 +``` + +Start additional services: +```bash +sudo docker compose up -d unoconv mfr wb fakecas sharejs +``` + +### 10. Database Migration +When starting with an empty database you will need to run migrations and populate preprint providers. +Perform database migrations: +```bash +sudo docker compose run --rm web python3 manage.py migrate +``` +See the [Running arbitrary commands](RDM-osf.io/README-docker-compose.md#running-arbitrary-commands) section below for instructions. + +### 11. Run the Project + +Finally start the OSF Web, API Server, and Preprints (Detached): +```bash +sudo docker compose up -d wb_worker worker web api admin preprints ember_osf_web registries reviews +``` + +We can see containers and images list. +```bash +sudo docker iamges +sudo docker ps +``` + + +We can see the rdm page through browser. + +link : https://EC2-url:5000/ + +![top page](/images/rdmTop.png) + + +Once you follow these steps, you should have a local environment up and running for development. + +## Configuration Guide + +### 1. Let's Encrypt Setup +**Configure AWS Credentials** + +Use the AWS CLI Docker image to configure your AWS credentials: + +```bash +sudo docker run --rm -it -v "/root/.aws:/root/.aws" amazon/aws-cli configure +``` +**Verify AWS Credentials** +Nii has a Certificate Management Service link: https://certs.nii.ac.jp/ . You can contact to them if your service is created on NII infrastructure. + +Verify if your AWS credentials are working and have nominal access to Route 53: + +``` +sudo docker run --rm -it -v "/root/.aws:/root/.aws" amazon/aws-cli route53 list-hosted-zones +``` +**Request a Let's Encrypt Wildcard Certificate** + +Use the certbot/dns-route53 Docker image to request a wildcard certificate, forwarding your AWS credentials: + +``` +certbot certonly --dns-route53 --domain "your.com" --domain "*.your.com" +``` + +**Automate Certificate Renewal** + +Create systemd timer to automate certificate renewal, then daemon-reload, enable, and start the timer. +Create /etc/systemd/system/certbot.service. For the docker command, remove --it for non-interactive execution by systemd, and pass /usr/bin to the container to allow execution of systemctl by --deploy-hook: +``` +[Unit] +Description=Let's Encrypt certificate renewal + +[Service] +Type=oneshot +ExecStart=certbot renew --dns-route53 --quiet --agree-tos --deploy-hook "cd /home/ubuntu/RDM-osf.io && sudo docker compose restart web admin wb fakecas ember_osf_web preprints registries reviews" +``` + +Then create /etc/systemd/system/certbot.timer: +``` +[Unit] +Description=Monthly renewal of Let's Encrypt certificates + +[Timer] +OnCalendar=monthly +RandomizedDelaySec=12 hours +Persistent=true + +[Install] +WantedBy=timers.target +``` + +### 2. User Management + +**Setup SMTP**rdm + +We need to setup smtp and mailutils. We can install postfix with local only and deefault hostname +```bash +apt install postfix mailutils +``` + +/etc/postfix/main.cf +```bash + +mynetworks = 10.0.0.0/0 # your network +inet_interfaces = all # +``` + +Test for sending mail +```bash +echo "test" | mail -s test root@ip-1-1-1-1.ap-northeast-1.compute.internal +``` + +```bash +root@ip-1-1-1-1:/etc/postfix# mail +"/var/mail/root": 1 message 1 new +>N 1 root Mon Mar 4 05:29 14/656 test +? 1 ### input number +From: root <root@ip-1-1-1-1.ap-northeast-1.compute.internal> +test +``` + + +**Create User** + +Method 1: +Create a user via register link: https://EC2-url:5000/register/ + +Method 2: +Create a user directly through the RDM shell. +```bash +docker compose run --rm web invoke shell +``` +Create an OSF User with python code: +```python +user = OSFUser.create(username=<your_user@cos.io>,password=<password>,fullname=<full name>) +``` +> **Note:** User's registration status is to be shifted to True by adding `user.is_registered = True` `user.have_email = True` and `user.date_confirmed = timezone.now()`. Due to the lack of an inherited mail server in local environment, the newly created account is unable to send confirmation emails making the account unconfirmed. + +Save your user with `user.save()` +Commit the changes with `commit()` + +**Admin User** + +Please refer to [RDM-osf.io/admin/README.md](RDM-osf.io/admin/README.md) for instructions on how to make existing user super admin. diff --git a/docs/guides/ec2/README.md b/docs/guides/ec2/README.md new file mode 100644 index 0000000..def83fa --- /dev/null +++ b/docs/guides/ec2/README.md @@ -0,0 +1,85 @@ +# EC2 Development Environment / EC2 での開発環境 + +> **Summary:** Guide to setting up the GakuNin RDM development environment on Amazon EC2 +> **概要:** Amazon EC2 に GakuNin RDM の開発環境を構築する手引き + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.1 — 2026-11-05 +- Normative for: `docs/guides/ec2/` +- Related: [SPEC-06 Documentation Conventions](../../spec/06_documentation_conventions.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Overview + +This guide shows how to set up the GakuNin RDM (GakuNin is Japan's academic network for logging in with a university account; see [REF-01](../../reference/REF-01_Glossary.md)) development environment on an Amazon EC2 instance. + +### Prerequisites + +- An AWS account +- Basic familiarity with Linux command-line tools +- SSH access to your EC2 instance + +### Quick start on EC2 + +1. Launch an EC2 instance (Ubuntu 22.04 or Amazon Linux 2 recommended) +2. Install Docker (the tool that builds images and runs containers; see [REF-01](../../reference/REF-01_Glossary.md)) and Docker Compose (a tool that starts many containers together from one file; see [REF-01](../../reference/REF-01_Glossary.md)) +3. Clone this repository +4. Run `./installer/install.sh --yes` +5. Configure your EC2 security group to allow HTTP (port 80) and SSH (port 22) +6. Open http://localhost:5000 (localhost means your own computer; see [REF-01](../../reference/REF-01_Glossary.md)) in your browser + +> This command is available from milestone M2. + +### Legacy content + +The legacy EC2 setup instructions are kept verbatim in `README.legacy.md` for reference and will be rewritten per milestone. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 概要 + +このガイドは、Amazon EC2 上に GakuNin RDM(GakuNin=学認。大学のアカウントでログインするための日本の学術ネットワーク。[REF-01](../../reference/REF-01_Glossary.md))の開発環境を構築する方法を示します。 + +### 前提条件 + +- AWS アカウント +- Linux コマンドラインツールの基本的な使い方の理解 +- EC2 インスタンスへの SSH アクセス + +### EC2 でのクイックスタート + +1. EC2 インスタンスを起動する(Ubuntu 22.04 または Amazon Linux 2 を推奨) +2. Docker(イメージを作りコンテナを動かす道具。[REF-01](../../reference/REF-01_Glossary.md))と Docker Compose(一つのファイルから多くのコンテナをまとめて起こす道具。[REF-01](../../reference/REF-01_Glossary.md))をインストールする +3. このリポジトリを clone する +4. `./installer/install.sh --yes` を実行する +5. EC2 のセキュリティグループで HTTP (ポート 80) と SSH (ポート 22) を許可する +6. ブラウザで http://localhost:5000(localhost は自分の計算機のこと。[REF-01](../../reference/REF-01_Glossary.md))を開く + +> このコマンドは M2 マイルストーンから利用可能です。 + +### 過去のコンテンツ + +過去の EC2 へのセットアップ手順は、参考のために `README.legacy.md` にそのまま残しており、マイルストーンごとに書き直す予定です。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| EC2 (Elastic Compute Cloud) | Amazon's service to run virtual computers on the internet. | アマゾンがインターネット上で仮想コンピュータを実行するサービス。 | +| Security group | A virtual firewall that controls traffic to your EC2 instance. | EC2 インスタンスへのアクセスを制御する仮想のファイアウォール。 | +| SSH (Secure Shell) | A secure way to log in to your remote computer and run commands. | リモートのコンピュータに安全にログインしてコマンドを実行する方法。 | diff --git a/docs/guides/environment/README.legacy.md b/docs/guides/environment/README.legacy.md new file mode 100644 index 0000000..df0825c --- /dev/null +++ b/docs/guides/environment/README.legacy.md @@ -0,0 +1,394 @@ +# 開発環境の準備 + +RDMは複数のマイクロサービスから構成されます。開発時にもこれらのサービスを動作させる必要がありますが、 +1つ1つのサービスを自身のOSに合わせてインストールしようとすると非常に手間がかかります。 + +そのため、Docker Compose を用いて開発環境を構築する方法が [RDM-osf.ioドキュメント](https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md) にて説明されています。 + +Dockerを用いることで、OS等の環境の差異をコンテナにより吸収することができます。本ドキュメントでは [README-docker-compose.md](https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md) に補助的な説明を加えていきます。 + +# サービスの構成 + +`docker-compose.yml`に定義されているサービスは以下の通りです。 + +![Docker Compose](./images/docker-compose.png) + +(Generated by https://github.com/pmsipilot/docker-compose-viz) + +図中の円はポート番号, 矩形はサービスを示しています。 +サービスは大きく分けて以下の5種類に分類できます。(括弧はインストールされるRCOSDP内リポジトリ) + +* データ保存・共有サービス: postgres, elasticsearch, elasticsearch6, rabbitmq, mongo +* 基本サービス: web, api, admin, worker ([RDM-osf.io](https://github.com/RCOSDP/RDM-osf.io/)), wb, wb_worker ([RDM-waterbutler](https://github.com/RCOSDP/RDM-waterbutler/)) +* UIサービス: ember_osf_web ([RDM-ember-osf-web](https://github.com/RCOSDP/RDM-ember-osf-web)), mfr ([RDM-modular-file-renderer](https://github.com/RCOSDP/RDM-modular-file-renderer)), unoconv, registries, preprints, reviews, sharejs +* テスト用認証サービス: fakecas +* ユーティリティサービス: requirements ([RDM-osf.io](https://github.com/RCOSDP/RDM-osf.io/)), mfr_requirements ([RDM-modular-file-renderer](https://github.com/RCOSDP/RDM-modular-file-renderer)), wb_requirements ([RDM-waterbutler](https://github.com/RCOSDP/RDM-waterbutler/)), assets, admin_assets ([RDM-osf.io](https://github.com/RCOSDP/RDM-osf.io/)) + +> GRDMでは preprints, registries は使用しません。 + +# 基本的な流れ + +1. DockerとOSのセットアップ - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#docker-and-os-setup + * Docker Composeを利用可能にするためにDocker Engineを自身の環境にインストールします。 + * RDMのサービス同士が互いに通信できるように、ループバックデバイスとして `192.168.168.167` を設定します。 + * ※注意: OSX ならびに Ubuntu については動作実績がありますが、Windows については動作が確認されていません。 +2. アプリケーションの設定 - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#application-configuration + * WebサーバとAPIサーバに関する、Djangoの設定ファイル `local.py` を準備します。特に変更の必要がなければ、それぞれの `local-dist.py` をコピーして使用します。 + * RDM-osf.io, RDM-waterbutlerリポジトリを使用するよう、Docker Composeサービス定義ファイルを変更します。`docker-compose.yml` を直接変更するのではなく、 `docker-compose.override.yml` を変更することで、誤って開発環境固有の情報をリポジトリにコミットすることを防止することができます。 +3. アプリケーションの実行 - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#application-runtime + * このDocker Compose環境は、Dockerイメージをベースに各サービスを起動しますが、PythonモジュールやNodeモジュールはイメージとは異なるボリュームに保持します。(開発中に更新される可能性を想定しているものと思われます。) そのため、サービス実行前に `docker compose up requirements mfr_requirements wb_requirements` を実施することで、必要なライブラリを各コンテナにインストールする必要があります。 +4. ツールの利用 - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#running-arbitrary-commands + * DjangoのMigrationファイルの作成や、RDMが保持するModelの確認、テストの実行など、Docker Compose経由でコマンドを実行することで、容易にこれらのコマンドを実行できます。 +5. 環境のリセット - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#cleanup--docker-reset + * Dockerを使うことで得られる恩恵の1つは、開発環境をいつでもリセットできるという点です。開発時の試行錯誤の副作用の蓄積を簡単にリセットし、動作確認を確実に行うことができます。 + +# 開発環境のカスタマイズ + +初期状態では `docker-compose.yml` は `quay.io/centerforopenscience/` からイメージを取得するようになっています。 + +GakuNin RDMの最新Docker Imageをベースに開発を行うには、これらのイメージを差し替える必要があります。以下の内容を `docker-compose.override.yml` に記述してください。 +(`docker-compose.yml` と同じディレクトリに作成してください。) + +``` +# Apple Silicon搭載Macの場合、platform指定のコメントアウト部分を外してARM版イメージを使用してください。 +services: + fakecas: + image: niicloudoperation/rdm-fakecas:latest + # platform: linux/arm64 + # Apple Silicon搭載Macの場合、以下のコメントアウト部分を外してARM版Elasticsearchイメージを使用してください。 + # elasticsearch: + # image: quay.io/centerforopenscience/elasticsearch:es6-arm-6.3.1 + # platform: linux/arm64 + admin: + image: niicloudoperation/rdm-osf.io:latest + # platform: linux/arm64 + environment: + AWS_EC2_METADATA_DISABLED: "true" + admin_assets: + image: niicloudoperation/rdm-osf.io:latest + # platform: linux/arm64 + api: + image: niicloudoperation/rdm-osf.io:latest + # platform: linux/arm64 + assets: + image: niicloudoperation/rdm-osf.io:latest + # platform: linux/arm64 + requirements: + image: niicloudoperation/rdm-osf.io:latest + # platform: linux/arm64 + command: + - /bin/bash + - -c + - apk add --no-cache --virtual .build-deps build-base linux-headers python3-dev musl-dev libxml2-dev libxslt-dev postgresql-dev libffi-dev libpng-dev freetype-dev jpeg-dev && + invoke requirements --all && + (python3 -m compileall /usr/lib/python3.6 || true) && + rm -Rf /python3.6/* && + cp -Rf -p /usr/lib/python3.6 / + web: + image: niicloudoperation/rdm-osf.io:latest + # platform: linux/arm64 + environment: + OAUTHLIB_INSECURE_TRANSPORT: '1' + # macOS 15.1.1以降の場合、5000ポートが使用されている場合があります。その場合は以下のコメントアウトをはずしてポートを変更してください。 + # また、 `.docker-compose.env`, `.docker-compose.mfr.env`, `.docker-compose.wb.env` のポート指定 `:5000` にも同様の + # 変更を行ってください。 + # ports: !override + # - 5001:5000 + worker: + image: niicloudoperation/rdm-osf.io:latest + # platform: linux/arm64 + ember_osf_web: + image: niicloudoperation/rdm-ember-osf-web:latest + # platform: linux/amd64 + cas: + image: niicloudoperation/rdm-cas-overlay:latest + # platform: linux/amd64 + mfr: + image: niicloudoperation/rdm-modular-file-renderer:latest + # platform: linux/amd64 + # ローカルのRDM-modular-file-rendererを試したい場合 + # volumes: + # - ../RDM-modular-file-renderer:/code + mfr_requirements: + image: niicloudoperation/rdm-modular-file-renderer:latest + # platform: linux/amd64 + # ローカルのRDM-modular-file-rendererを試したい場合 + # volumes: + # - ../RDM-modular-file-renderer:/code + wb: + image: niicloudoperation/rdm-waterbutler:latest + # platform: linux/arm64 + # ローカルのRDM-waterbutlerを試したい場合 + # volumes: + # - ../RDM-waterbutler:/code + wb_worker: + image: niicloudoperation/rdm-waterbutler:latest + # platform: linux/arm64 + # ローカルのRDM-waterbutlerを試したい場合 + # volumes: + # - ../RDM-waterbutler:/code + wb_requirements: + image: niicloudoperation/rdm-waterbutler:latest + # platform: linux/arm64 + # ローカルのRDM-waterbutlerを試したい場合 + # volumes: + # - ../RDM-waterbutler:/code +``` + + +Apple Silicon搭載Macの場合、`docker-compose.yml`のelasticsearchの制限に関するコメントアウト部分を外してください。 +Elasticsearch は並列分散処理ができるクラスタ設計されており、複数ノードでの連携を前提としています。開発環境のような単一ノードでの利用の場合はクラスタ機能を使う必要がないため、この設定を行うことで「シングルノードモード」で動作させるように指定します。またElasticsearch は起動時に「bootstrap チェック」という一連のシステム環境の検証を行います。その一部に system call filter の設定確認が含まれており、これはセキュリティ向上のために OS レベルの制限(システムコールのフィルタリング)を利用する機能です。しかし、Docker や他のコンテナ環境ではこのチェックが原因で起動エラーとなることがあります。 +ホスト側のデフォルトのulimit値がアプリケーションの要件を満たさない場合があるため、コンテナ内でのリソース制限を明示的に解除します。 + + +``` + elasticsearch: + image: elasticsearch:2 + ports: + - 9200:9200 + volumes: + - elasticsearch_data_vol:/usr/share/elasticsearch/data +# environment: +# - "ES_JAVA_OPTS=-Des.bootstrap.system_call_filter=false" +# ulimits: +# memlock: +# soft: -1 +# hard: -1 + stdin_open: true + + # Temporary: Remove when we've upgraded to ES6 + elasticsearch6: + image: docker.elastic.co/elasticsearch/elasticsearch:6.3.1 + ports: + - 9201:9200 + volumes: + - elasticsearch6_data_vol:/usr/share/elasticsearch/data + # environment: + # - "discovery.type=single-node" + # - "ES_JAVA_OPTS=-Des.bootstrap.system_call_filter=false" + # ulimits: + # memlock: + # soft: -1 + # hard: -1 + stdin_open: true +``` + +# 開発環境でRDMを起動する + +## サービスを起動する + +[Quickstart: Running all OSF services in the background](https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#quickstart-running-all-osf-services-in-the-background) に示されているように、以下のコマンドでサービスを実行することができます。 + +``` +# ライブラリのインストール - 初回/ライブラリ定義変更時だけ必要 +$ docker compose up requirements mfr_requirements wb_requirements +# DBのマイグレーション - 初回/DB定義変更時だけ必要 +$ docker compose run --rm web python3 manage.py migrate + +# Metadataアドオン用フラグを設定する - 初回だけ必要 +$ docker compose run --rm web python3 manage.py waffle_flag ember_edit_draft_registration_page --everyone + +$ docker compose up -d assets admin_assets mfr wb wb_worker fakecas sharejs worker web api admin ember_osf_web +``` + +> https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md では preprints, registries の起動について紹介していますが、GRDMでは preprints, registries は提供しないため無視してください。 + +### シンプルな構成で起動する + +動作確認したい内容に応じて、 mfr, admin_assets, admin, sharejs を除外することもできます。 +例えば、fakecasで認証し、プロジェクト作成、ファイル管理を確認したいだけであれば、 + +``` +# ライブラリのインストール - 初回/ライブラリ定義変更時だけ必要 +$ docker compose up requirements wb_requirements +# DBのマイグレーション - 初回/DB定義変更時だけ必要 +$ docker compose run --rm web python3 manage.py migrate + +# Metadataアドオン用フラグを設定する - 初回だけ必要 +$ docker compose run --rm web python3 manage.py waffle_flag ember_edit_draft_registration_page --everyone + +$ docker compose up -d assets wb wb_worker fakecas worker web api ember_osf_web +``` + +でも十分でしょう。`docker compose ps`で異常終了しているサービスがいないことを確認します。 +`docker compose ps`の出力例は以下の通りです。`docker compose up -d`で指定したサービスが`Up`であることを確認します。 + +``` +$ docker compose ps + Name Command State Ports +------------------------------------------------------------------------------------------------------------------------------------------------------------------- +rdm2-osfio_api_1 docker-entrypoint.sh invok ... Up 0.0.0.0:8000->8000/tcp +rdm2-osfio_assets_1 docker-entrypoint.sh invok ... Up +rdm2-osfio_elasticsearch_1 /docker-entrypoint.sh elas ... Up 0.0.0.0:9200->9200/tcp, 9300/tcp +rdm2-osfio_ember_osf_web_1 docker-entrypoint.sh /bin/ ... Up 0.0.0.0:41953->41953/tcp, 0.0.0.0:4200->4200/tcp +rdm2-osfio_fakecas_1 fakecas -host=0.0.0.0:8080 ... Up 0.0.0.0:8080->8080/tcp +rdm2-osfio_postgres_1 docker-entrypoint.sh /bin/ ... Up 0.0.0.0:5432->5432/tcp +rdm2-osfio_rabbitmq_1 docker-entrypoint.sh rabbi ... Up 15671/tcp, 0.0.0.0:15672->15672/tcp, 25672/tcp, 4369/tcp, 5671/tcp, 0.0.0.0:5672->5672/tcp +rdm2-osfio_requirements_1 docker-entrypoint.sh /bin/ ... Exit 0 +rdm2-osfio_wb_1 invoke server Up 0.0.0.0:7777->7777/tcp +rdm2-osfio_wb_requirements_1 /bin/bash -c invoke instal ... Exit 0 +rdm2-osfio_wb_worker_1 invoke celery Up 7777/tcp +rdm2-osfio_web_1 docker-entrypoint.sh invok ... Up 0.0.0.0:5000->5000/tcp +rdm2-osfio_worker_1 docker-entrypoint.sh invok ... Up + +``` + +### cas-overlayを含む構成で起動する + +fakecasは手軽にRDMの動作確認を行えますが、OAuthの動作確認などはできません。OAuthを用いたアプリケーションの開発時には、fakecasではなくcas-overlayを使ったテストが必要になります。このような場合、以下のようにfakecasの代わりに cas サービスを起動します。 + +``` +# ライブラリのインストール - 初回/ライブラリ定義変更時だけ必要 +$ docker compose up requirements wb_requirements +# DBのマイグレーション - 初回/DB定義変更時だけ必要 +$ docker compose run --rm web python3 manage.py migrate + +# Metadataアドオン用フラグを設定する - 初回だけ必要 +$ docker compose run --rm web python3 manage.py waffle_flag ember_edit_draft_registration_page --everyone + +# fakecasではなくcasをサービスに指定する +$ docker compose up -d assets wb wb_worker cas worker web api ember_osf_web + +# OAuthのスコープを登録する +$ docker compose run --rm web python3 -m scripts.register_oauth_scopes +``` + +casはfakecasとは異なり、ログイン時に ユーザ作成手順(後述) において入力したパスワードが必要になります。他の操作方法はfakecasと同様です。 + +## Web UIを開く + +サービスが起動したことを確認したら、 `http://localhost:5000` にアクセスし動作を確認してみましょう。 + +ログは `docker compose logs` コマンドで確認できます。ember_osf_webコンテナは起動にある程度時間がかかりますが、この状態を確認するには、以下のコマンドを入力します。 + +``` +$ docker compose logs -f ember_osf_web +... +Build successful (xxxxxms) – Serving on http://0.0.0.0:4200/ +``` + +## テスト用ユーザを作成する + +`http://localhost:5000` が正常に参照できたら、`Sign Up`を行いましょう。以下の手順で行います。 + +1. `Sign Up`ボタンを押し、ユーザ登録画面を開く +1. ユーザ登録画面に適当なユーザ名、Eメールアドレスとパスワードを入力する +1. デバッグログにEメール到達確認用のURL(`http://localhost:5000/confirm/xxxxx/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/`)が出力されるので、 `docker compose logs web` で確認する + + > 本番環境の場合はここでEメールアドレス宛に到達確認用のURLを含むメールが届きますが、SMTPサーバを指定していないのでメールは送信されません。 + +1. 到達確認用のURLをブラウザでアクセスする + +> ブラウザはFirefoxを使用してください。Chromeの場合は、FakeCASとWeb UIの間でCookieが共有されず正常動作しない場合があります。 + +## 動作確認を実施する + +これでユーザの作成は完了です。以降は、ログイン画面から、登録したEメールアドレスのみでログインできます。(開発用途に限定して利用してください。) + +# コマンドの実行例 + +## ユニットテストを実行する + +全てのユニットテストを実行するには、以下のようにコマンドを入力します。 +`requirements` サービスによりテストに必要なライブラリがインストールされ、`invoke test`でテストが実行できます。 + +``` +# 初回だけ必要 +$ docker compose up requirements + +$ docker compose run --rm web invoke test +``` + +テストコードを限定する方法は https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#application-tests に記載されています。 + +## Migrationファイルを作成する + +RDM-osf.ioはDjangoアプリケーションとして実装されています。モデルの変更を行った場合、適切にデータベーススキーマに変更が反映されるよう、Migrationsファイルを作成する必要があります。 +以下のコマンドを入力することで、Djangoの管理コマンド `makemigrations` を実行できます。 + +``` +$ docker compose run --rm web python3 manage.py makemigrations +``` + +作成したMigrationsファイルは、以下のコマンドで `postgres`サービスに反映できます。 + +``` +$ docker compose run --rm web python3 manage.py migrate +``` + +## ユーザを機関に所属させる + +機関に関する機能を試すためには、ユーザを機関に所属させる必要があります。 +このような場合は、以下の手順を実施してください。 + +まず、実行中のRDMのデータベースに機関の情報を登録します。これは初回だけ必要です。 + +``` +$ docker compose run --rm web python3 -m scripts.populate_institutions -e test -a +``` + +上記のコマンドを実行すると、`Virginia Tech [Test]` などの機関名を持つ機関が登録されます。 + +次に、shell機能を使って、ユーザに機関を紐付けます。以下のコマンドを実行します。 + +``` +$ docker compose run --rm web invoke shell +``` + +上記コマンドを実行すると、以下のようなプロンプトが現れますので、Pythonスクリプトで処理を指示します。下記のようにスクリプトを実行すると、指定したEmailアドレスを持つユーザのモデルを取得することができます。 + +``` +In[1]: user = OSFUser.objects.get(username='登録したEmailアドレス') + +In [2]: user +Out[2]: <OSFUser('登録したEmailアドレス') with guid '登録されたユーザID'> +``` + +ユーザが所属する機関のリストは、`user.affiliated_institutions`で管理されます。このリストに、先に登録した機関に対応する`Institution`オブジェクトを追加すると、ユーザを機関に所属させることができます。 + +``` +# 機関名は例えば Virginia Tech [Test] 等: [i.name for i in Institution.objects.all()] で確認できる +In [4]: user.affiliated_institutions.add(Institution.objects.get(name='機関名')) +``` + +変数を編集したら、モデルに対して`save`メソッドを呼び出し、`commit`も忘れないようにしておきましょう。 + +``` +In [5]: user.save() + +In [6]: commit() +Transaction committed. +New transaction opened. +``` + +これでユーザを機関に所属させることができました。試しに、New Projectから新規プロジェクトの作成を実施してみましょう。所属のところに、Institutionで指定した機関が表示されます。 + +![Institution](./images/institution.png) + +## adminアクセス可能なユーザへと変更する + +管理者機能は `http://localhost:8001/` からアクセスすることができます。 +ユーザがadminアクセス可能かどうかは `is_staff` プロパティで定義することができます。 + +`is_staff`の編集には、shell機能を使います。 + +``` +$ docker compose run --rm web invoke shell +``` + +shellから以下のようにコマンドを実行することで、指定したユーザの `is_staff` プロパティを変更することができます。 + +``` +In[1]: user = OSFUser.objects.get(username='登録したEmailアドレス') + +In [2]: user +Out[2]: <OSFUser('登録したEmailアドレス') with guid '登録されたユーザID'> + +In [3]: user.is_staff = True + +In [4]: user.save() + +In [5]: commit() +Transaction committed. +New transaction opened. +``` diff --git a/docs/guides/environment/README.md b/docs/guides/environment/README.md new file mode 100644 index 0000000..6d4b011 --- /dev/null +++ b/docs/guides/environment/README.md @@ -0,0 +1,878 @@ +# Environment guide / 環境設定と開発環境 + +> **Summary:** How to install the 2027 developer environment for GakuNin (Japan's academic identity federation) RDM using the installer script, including prerequisites, step-by-step commands, everyday operations, security notes, and troubleshooting. All services run on `127.0.0.1` with no host network changes. +> **概要:** GakuNin(日本の学術認証連携)RDM の 2027 開発環境をインストーラーで導入する手順。前提条件、ステップごとのコマンド、日常操作、セキュリティ注意点、トラブルシューティングを含む。すべてのサービスは `127.0.0.1` で動作し、ホストのネットワーク設定は変えません。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 1.11 — 2026-11-13. **Learned:** a sentence that names the current milestone is live state, not history, so it changes in the same PR as `manifest/milestone.json`: the owner closed M2 on 2026-11-13, the file now says M3, and from now on `scan` fails with exit 50 if the allow-list grows past 58 entries. / 現在の節目を名指す文は履歴ではなく現在の状態なので、`manifest/milestone.json` と同じ PR で変える。所有者は 2026-11-13 に M2 を閉じ、ファイルは M3 になった。これからは許容リストが 58 項目を超えると `scan` は終了 50 で失敗する。 + 1.10 — 2026-11-13. **Learned:** a scan line that reads `ok` has to say what it did not scan: with mandatory sign-in ZAP cannot enter `web`, and the report now lists that target as skipped (`skipped_targets`), not as scanned (PR #56 review r1 R1-01). / `ok` と読める検査の行は、検査しなかったものを言わなければならない。必須サインインでは ZAP は `web` に入れず、報告はその対象を検査済みでなく対象外(`skipped_targets`)として載せる(PR #56 レビュー r1 R1-01)。 + 1.9 — 2026-11-12. **Learned:** an upgrade guide has to be an order of commands, because each step needs the one before: the new secrets must exist before `compose render`, `compose render` before `build` (tags) and again after it, and the search index rebuild only after `up`; `secrets rotate` is not that first step, since it needs a healthy old stack and rolled back here when the former ember image took more than 300 seconds to start. / アップグレードの手引きはコマンドの順序でなければならない。どの段も前の段を要するからである。新しい秘密は `compose render` の前に、`compose render` は `build`(タグ)の前と後に、検索の索引の再構築は `up` の後に要る。`secrets rotate` はその最初の段ではない。健康な旧スタックを要し、ここでは以前の ember のイメージの起動が 300 秒を超えて巻き戻った。 + 1.8 — 2026-11-11. **Learned:** a troubleshooting entry that names a workaround goes stale the day the workaround ends: ember-osf-web is built from source again as a static image, so the DEMO-20 cases now say that the prebuilt image was the past state and what `build` does now (RDM-ember-osf-web-dev2027 PR #2 review r1 R1-03). / 回避策を名指しする障害対応の項は、その回避策が終わった日に古くなる。ember-osf-web は再びソースから静的なイメージとして組まれるので、DEMO-20 の事例は事前ビルド済みのイメージが過去の状態だったことと、いまの `build` の動きを書くようにした(RDM-ember-osf-web-dev2027 PR #2 レビュー r1 R1-03)。 + 1.7 — 2026-11-12. **Learned:** the guide must not promise what an option cannot do: `--timeout` lengthens only the wait of `up`, never the build ([PR #50 review r1](../../reviews/README.md) R2). / 手引きは、オプションにできないことを約束してはならない。`--timeout` が延ばすのは `up` の待ちだけで、ビルドではない([PR #50 レビュー r1](../../reviews/README.md) R2)。 + 1.6 — 2026-11-12. **Learned:** an amd64 test machine on Apple Silicon is a fully emulated computer, so it needs two more host tools and a long first start, and it compiled osf.io's scientific Python about ten times slower than Rosetta did (a full build there was not finished after 5 h 12 min); the guide now says so and says how to give `up` a longer wait through the one command, which does not shorten the build ([DEMO-22](../../demo/22_core_install_ubuntu_amd64_lima.md)). / Apple Silicon 上の amd64 の試験機は全体をエミュレーションする計算機なので、ホストの道具が二つ多く要り、最初の起動も長く、osf.io の科学計算の Python のコンパイルは Rosetta の約 10 倍遅かった(そこでのビルド全体が 5 時間 12 分後も未完)。手引きはそれを書き、一つのコマンドで `up` の待ちを延ばす方法も示す(ビルドは短くならない)([DEMO-22](../../demo/22_core_install_ubuntu_amd64_lima.md))。 + 1.5 — 2026-11-10. **Learned:** a safety check should say what it does not cover: the shared-folder check looks for four names directly under each shared mount point, decoded as the kernel escapes them, not for every credential anywhere ([PR #44 review r1](../../reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r1.md) R1). / 安全のための検査は、何を見ないかも言うべきである。共有フォルダの検査は、カーネルのエスケープを復号した各共有 mount 先の直下にある四つの名前だけを探し、どこにある資格情報でも見つけるわけではない([PR #44 レビュー r1](../../reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r1.md) R1)。 + 1.4 — 2026-11-10. **Learned:** a test VM is only isolated if nothing of the host is shared by default: Lima's Ubuntu template mounted the host home and showed `~/.config/gh` inside the VM, so the Lima steps below share only read-only mirrors and `install-ubuntu.sh` stops when credentials are visible ([DEMO-21](../../demo/21_core_install_ubuntu_arm64_lima.md)). / テスト用の VM は、既定でホストの何も共有しないときだけ隔離されている。Lima の Ubuntu テンプレートはホームを mount し `~/.config/gh` を VM から見せたので、下の Lima の手順は読み取り専用のミラーだけを共有し、`install-ubuntu.sh` は資格情報が見えると止まる([DEMO-21](../../demo/21_core_install_ubuntu_arm64_lima.md))。 + 1.3 — 2026-11-10. **Learned:** on a Linux server image the acceptance browser needs two more steps than on a Mac, a library for Playwright's driver and Chromium's system libraries, so §3.9 lists them ([DEMO-21](../../demo/21_core_install_ubuntu_arm64_lima.md)). / Linux のサーバーイメージでは受入試験のブラウザに Mac より二つ多い手順、Playwright のドライバー用のライブラリと Chromium のシステムライブラリが要るので、§3.9 に載せた([DEMO-21](../../demo/21_core_install_ubuntu_arm64_lima.md))。 +- Version / 版: 1.2 — 2026-11-10. **Learned:** telling a reader that the installer checks each prerequisite is not the same as helping them get one, so the guide now starts from a script for each OS ([ADR-08](../../decisions/ADR-08_Per_OS_Installer_Entry_Points.md)). / 「インストーラーが前提条件を確認する」と伝えることは、それを揃える手助けにはならない。そこで手引きは OS ごとのスクリプトから始める([ADR-08](../../decisions/ADR-08_Per_OS_Installer_Entry_Points.md))。 +- Version / 版: 1.1 — 2026-11-06. **Learned:** the Project Metadata edit page needs a waffle flag that no setup step turned on, so the legacy startup steps now set `ember_edit_draft_registration_page` once after the first migration (PR #17); the 2027 installer has no equivalent step yet. / Project Metadata の編集画面には、どの手順も有効にしていなかった waffle フラグが必要なため、旧ガイドの起動手順に初回マイグレーション後の `ember_edit_draft_registration_page` 設定を追加した(PR #17)。2027 インストーラーには相当する手順がまだ無いと分かった。 +- Version / 版: 1.0 — 2026-11-06. **Learned:** full startup is not yet verified by a recorded run: the ember-osf-web (the browser interface) base image is end-of-life and current Docker (the tool that runs containers: boxes that each hold one program and everything it needs) refuses to pull it, so the manifest (the list of components and the exact source revisions they are built from) already configures a digest-pinned prebuilt image for ember-osf-web as a fallback until M4 modernizes its Dockerfile (DEMO-20, `manifest/upstreams.json`). / 完全な起動はまだ実行記録で検証できていない。ember-osf-web(ブラウザ画面)のベースイメージがサポート終了で現行 Docker(コンテナ=一つのプログラムと必要なものを入れた箱を動かす道具)が取得を拒むため、M4 で Dockerfile を近代化するまでの代替として、manifest(部品と、それを組む正確なソース版の一覧)にはダイジェスト固定の配布済みイメージがすでに設定されている(DEMO-20、`manifest/upstreams.json`)。 +- Version / 版: 0.1 — 2026-11-05. Initial bilingual skeleton pointing to the legacy guide. / 旧ガイドを指す最初の二言語の骨組み。 +- Normative for: `docs/guides/environment/` +- Parent index / 親索引: [Guides](../README.md) +- Related: [SPEC-02 Installer CLI](../../spec/02_installer_cli.md) · [ADR-02 Network Model](../../decisions/ADR-02_Network_Model.md) · [ADR-03 Staged Security Gate](../../decisions/ADR-03_Staged_Security_Gate.md) · [SPEC-03 Security Gate](../../spec/03_security_gate.md) · [SPEC-04 Acceptance Tests](../../spec/04_acceptance_tests.md) · [SPEC-06 Documentation Conventions](../../spec/06_documentation_conventions.md) · [DEMO-20 Core Install on Mac Studio](../../demo/20_core_install_mac_studio.md) · [REF-01 Glossary](../../reference/REF-01_Glossary.md) +- Used by: [Guides index](../README.md) · [DEMO-20 Core Install on Mac Studio](../../demo/20_core_install_mac_studio.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Quick start + +Install the 2027 developer environment for [GakuNin](../../reference/REF-01_Glossary.md#english) RDM with these three commands: + +```bash +git clone https://github.com/RCOSDP/RDM-developer-guide.git +cd RDM-developer-guide +./installer/install.sh --yes +``` + +When the installer completes, `grdm-dev up` opens your browser at the web URL it reports. The default is `http://127.0.0.1:5000`, but if port (a numbered door a program listens on) 5000 was busy the installer chose another port and recorded it in `runtime/.env` as `GRDM_PORT_WEB`; always use the URL or port printed in the report rather than assuming 5000. + +> **Caveat (2026-11-06):** a complete startup of the `core` profile (a named subset of services to run) has not yet been verified by a recorded run. The [ember-osf-web](../../reference/REF-01_Glossary.md#english) Dockerfile cannot be built with current [Docker](../../reference/REF-01_Glossary.md#english), so the manifest already runs a digest-pinned prebuilt image for that component (see §3.5 and §6). Expect the next recorded run in DEMO-20. + +#### Prerequisites by OS + +- **macOS 14 or newer, Apple Silicon (arm64):** Docker Desktop installed +- **Ubuntu 24.04, amd64 (the Intel/AMD type of CPU; Apple Silicon is arm64) or arm64:** Docker Engine installed +- **Windows 11 with WSL2 (Windows Subsystem for Linux 2, a way to run Ubuntu inside Windows; see [REF-01](../../reference/REF-01_Glossary.md#english)) and Ubuntu 24.04:** Docker Desktop installed + +> **Note:** The installer checks each prerequisite. It exits with code 10 if your host is unsupported and 11 if Docker is missing, not running, or lacks the Compose or buildx (multi-platform image builder) plugin. See [SPEC-02 §8](../../spec/02_installer_cli.md#english) for the full host list. + +#### Prepare the host with the per-OS script + +If your computer does not have the prerequisites yet, run the script for your OS instead of `install.sh`. Each one shows what it will change, asks before any administrator action, and ends by running `install.sh`. Add `--yes` to consent to everything in advance, or `--dry-run` to only see the plan. Run them from the repository folder. + +| OS | Command | +|---|---| +| Ubuntu 24.04 | `./installer/install-ubuntu.sh` | +| macOS (Apple Silicon) | `./installer/install-macos.sh` | +| Windows 11 (in PowerShell) | `powershell -ExecutionPolicy Bypass -File .\installer\install-windows.ps1` | + +Expected result: the plan is printed, and after your answer the installer's report ends with the web URL. + +On Windows you only need this one script file from the repository. It enables WSL2, installs Ubuntu 24.04, checks Docker Desktop and its WSL integration, and clones the repository inside WSL, never under `/mnt/c`, because the Windows disk is slow from WSL and changes line endings. Read the script before you run it. `-ExecutionPolicy Bypass` applies to this one run only. + +> **Note:** The integration repositories are private. Before the build, give git your own access where the install runs (inside WSL on Windows), for example `gh auth login` and then `gh auth setup-git`. The scripts never ask for, read or store a token. + +#### Trying the Ubuntu script in a Lima VM on a Mac + +[Lima](https://lima-vm.io/) (a tool that runs Linux virtual machines on macOS) is a quick way to test the Ubuntu path on a Mac ([DEMO-21](../../demo/21_core_install_ubuntu_arm64_lima.md)). + +> **Warning:** Lima's Ubuntu template mounts your home directory into the VM (read-only), even when your configuration lists its own `mounts:`, because the template's list is merged in. Your `~/.config/gh/hosts.yml`, which holds your GitHub token, is then readable inside the VM. `install-ubuntu.sh` stops with exit 10 when one of `.config/gh/hosts.yml`, `.git-credentials`, `.netrc` or `.docker/config.json` exists directly under the mount point of a shared folder. It does not search deeper, so the steps below still matter. + +Write the VM configuration, create the VM, then remove the home mount **before** you start it. Run on the Mac: + +```bash +limactl create --name grdm-ubuntu2404 --tty=false my-vm.yaml # base: template:ubuntu-24.04, your own mounts +# open ~/.lima/grdm-ubuntu2404/lima.yaml and delete the line - location: "~" +limactl start grdm-ubuntu2404 +limactl shell grdm-ubuntu2404 -- mount | grep -E 'virtiofs|9p|sshfs' +``` + +Expected result: only the folders you chose are listed; no line ends in your home directory. + +To test **Ubuntu amd64** on an Apple Silicon Mac, set `vmType: qemu` and `arch: x86_64` in `my-vm.yaml` and run `brew install qemu lima-additional-guestagents` first (Lima needs QEMU and the amd64 guest agent for this). The whole virtual machine is then emulated, so expect everything to be many times slower than on real hardware, and give the first start a long `--timeout`. To make the user a non-root user whose uid is not 1000, add `user: {name: grdm, uid: 2002, home: /home/grdm}` ([DEMO-22](../../demo/22_core_install_ubuntu_amd64_lima.md)). + +To give the VM the private repositories without a token, share read-only bare mirrors (`git clone --mirror` on the Mac) and point git at them inside the VM with `git config --global url."file:///<mirror>.git".insteadOf https://github.com/RCOSDP/<repo>.git`. + +> **Note:** Docker Desktop is never installed by these scripts, because its licence depends on your organisation. Homebrew is not installed either; `install-macos.sh` tells you where to get its signed package. See [ADR-08](../../decisions/ADR-08_Per_OS_Installer_Entry_Points.md) for the reasons. + +--- + +### 2. What you get + +The installer creates a self-contained environment under `runtime/` with no changes to your host network. It uses two Docker Compose (the tool that starts several containers together from one file) networks: + +- **Internal network `grdm`** — services talk to each other using Compose service names (e.g., `web`, `api`, `postgres`). No ports are published and there is no route to the Internet. +- **Publishing network `grdm-edge`** — the seven browser-facing services (`web`, `api`, `admin`, `wb`, `mfr`, `fakecas`, `ember_osf_web`) also attach here so their ports can be published on `127.0.0.1`. Because it is an ordinary bridge network, these seven services already have outbound (egress) access; no other service does unless you grant it (§4). + +```mermaid +flowchart TD + subgraph HOST["Host computer (macOS / Ubuntu / WSL2)"] + BROWSER["Browser → http://127.0.0.1:GRDM_PORT_WEB"] + subgraph DOCKER["Docker Compose"] + INTERNAL[internal network grdm] + PUBLISHING[public bridge network grdm-edge] + end + end + + subgraph SERVICES["Running services"] + web[web (default port 5000)] + api[api (default port 8000)] + postgres[postgres] + rabbitmq[rabbitmq] + end + + BROWSER -->|"127.0.0.1:<web port>"| web + web -->|"http://api:8000"| api + api -->|"postgres:5432"| postgres + web -->|"rabbitmq:5672"| rabbitmq + + BROWSER --- PUBLISHING + web --- PUBLISHING + api --- PUBLISHING + + web --- INTERNAL + api --- INTERNAL + postgres --- INTERNAL + rabbitmq --- INTERNAL +``` + +--- + +### 3. Step by step + +`./installer/install.sh --yes` creates a Python virtual environment at `.venv/` (a *venv* is a private folder of Python and its libraries, separate from the system), installs `grdm-dev` into it, and then runs `grdm-dev install`. That command executes the following steps in this exact order and stops at the first non-zero exit ([SPEC-02 §2.1](../../spec/02_installer_cli.md#english), `installer/grdm_dev/install.py`): + +1. `doctor` +2. `plan` +3. `secrets init` — only when `runtime/.env` does not exist yet +4. `compose render` +5. `build` +6. `up` +7. `health --network` +8. `scan` +9. `report` + +The acceptance tests (`accept`, §3.9) are **not** part of this sequence; run them manually afterwards. The subsections below describe each step so you can also run it on its own after the bootstrap has created `.venv/`. + +#### 3.1 `grdm-dev doctor` + +Check that your host meets all requirements (run on its own after the bootstrap created `.venv/`): + +```bash +.venv/bin/grdm-dev doctor +``` + +**Success:** You see a TOON report (TOON is a compact text form of JSON data that people and AI read easily; see [REF-01](../../reference/REF-01_Glossary.md#english)) showing your OS, CPU, memory, free disk, and Docker version. + +**Failure exit codes:** `10` — unsupported host (OS, CPU, memory, or Python < 3.11); `11` — Docker missing, not running, or Compose / buildx plugin absent. + +#### 3.2 `grdm-dev plan` + +See which images will be built and which services will start: + +```bash +.venv/bin/grdm-dev plan --profile core +``` + +A *manifest* is the list of components and the exact source revisions they are built from (`manifest/upstreams.json`; see [REF-01](../../reference/REF-01_Glossary.md#english)). A *profile* is a named subset of services to run: `minimum`, `core` (default), or `full` ([SPEC-02 §4](../../spec/02_installer_cli.md#english)). The choice is saved in `runtime/.env` as `GRDM_PROFILE` and reused later. + +**Success:** You see a TOON report with the services and their published ports. + +**Failure exit code:** `20` — manifest invalid or TOON excerpt disagrees with JSON. + +#### 3.3 `grdm-dev secrets init` + +Generate random secrets and write them to `runtime/.env` with mode `0600` (owner read/write only): + +```bash +.venv/bin/grdm-dev secrets init +``` + +**Success:** A new `runtime/.env` file appears with random database passwords, Django secret key, and CAS (the sign-in service protocol GRDM uses) keys. + +**Failure exit code:** `2` — usage error (e.g., missing `--force` if `runtime/.env` exists). + +> **Security note:** The installer *never* writes default or example passwords. Every secret is generated from your OS's random source. + +#### 3.4 `grdm-dev compose render` + +Generate the Docker Compose file from the manifest and profile: + +```bash +.venv/bin/grdm-dev compose render --profile core +``` + +**Success (exit `0`):** `runtime/docker-compose.yml` appears with all services configured for your host, and any port that had to move away from its default is reported. + +**Failure exit codes:** `20` — manifest invalid; `2` — usage error, for example `runtime/.env` is missing (run `secrets init` first) or `--egress` names an unknown service; `12` — a required port is in use and no free alternative was found within +100 (§6). + +#### 3.5 `grdm-dev build` + +Build or pull all images: + +```bash +.venv/bin/grdm-dev build +``` + +**Success:** All images are built or pulled, and a TOON report shows their status (`built`, `prebuilt`, ...). + +**Failure exit code:** `30` — image build or prebuilt pull failed (e.g., an EOL base cannot be built for arm64 without emulation). *EOL* means end of life: the vendor no longer fixes bugs or security holes ([REF-01](../../reference/REF-01_Glossary.md#english)). *Emulation* means running an `linux/amd64` image on an arm64 CPU through Docker's built-in CPU translation; it is slower but works for most images. + +> **Real cases from DEMO-20:** +> +> - **modular-file-renderer (the file preview service):** Built with emulation (`build_platform: linux/amd64`) because `pandas==0.25.1` has no arm64 *wheel* (a prebuilt Python package file; without one, pip must compile from source, which fails on this EOL base). +> - **ember-osf-web:** At the time, the source build failed on every CPU because the base image used Docker manifest v2 schema 1, which current Docker refuses, so the manifest carried a digest-pinned `prebuilt_image` that `build` pulled instead (DEMO-20). The Dockerfile has since been modernized (RDM-ember-osf-web-dev2027 PR #2): `build` builds ember-osf-web from its pinned commit on your own CPU, without emulation, into a static nginx image, and the row says `built`. + +#### 3.6 `grdm-dev up` + +Start all services and wait for health: + +```bash +.venv/bin/grdm-dev up --profile core +``` + +**Success:** All services report healthy, and the browser opens at the web URL `up` reports (`http://127.0.0.1:<GRDM_PORT_WEB>`, default port 5000). Add `--no-open` to skip the browser. + +**Failure exit code:** `40` — one or more services did not become healthy within the timeout. + +#### 3.7 `grdm-dev health` and `health --network` + +Manually check service health: + +```bash +.venv/bin/grdm-dev health # service responses only +.venv/bin/grdm-dev health --network # also verify that every published port listens on 127.0.0.1 only +``` + +**Success:** All services report healthy; with `--network`, the report also shows `loopback_only: true`. + +**Failure exit code:** `40` — one or more services are unhealthy; with `--network`, also when any container port is bound to an address other than `127.0.0.1`. Plain `health` does **not** check host exposure, so only `health --network` proves loopback-only publishing. The automatic `install` sequence runs `health --network`. + +#### 3.8 `grdm-dev scan` + +Run the whole security gate of [SPEC-03](../../spec/03_security_gate.md): + +```bash +.venv/bin/grdm-dev scan +``` + +Without flags, `scan` runs every part: baseline controls, the Trivy (a scanner that lists known weaknesses in images) image scanner's SBOM (software bill of materials: the list of every part inside an image) and CVE list (a CVE is a public identifier for one known security weakness), the gitleaks secret scan, Semgrep (static analysis that reads source code for dangerous patterns), and the OWASP ZAP (a scanner that probes the running website the way an attacker would) dynamic baseline. The flags `--baseline`, `--secrets`, and `--dynamic` each run **one part only** and are *not* the whole gate: + +```bash +.venv/bin/grdm-dev scan --baseline # subset: baseline controls of runtime/docker-compose.yml and runtime/.env only +.venv/bin/grdm-dev scan --secrets # subset: gitleaks over the repository only +.venv/bin/grdm-dev scan --dynamic # subset: OWASP ZAP baseline only (needs healthy services) +``` + +**Gate rule by milestone** (`manifest/milestone.json`, currently M3 since the owner closed M2 on 2026-11-13, so the allow-list may hold at most the M2 count of 58 entries, see the [status board](../../status/README.md#english); [ADR-03](../../decisions/ADR-03_Staged_Security_Gate.md), [SPEC-03 §5](../../spec/03_security_gate.md)): the gate data — `manifest/milestone.json`, the allow-list `manifest/allowlist.json` (the written list of known findings accepted for a limited time) and its baseline `manifest/allowlist.baseline.json` — must be readable and well-formed at every milestone, M1 included: an unreadable file or an allow-list entry missing one of its six fields exits `50` (SPEC-03 §5.1 rule 1). Baseline-control violations (default secrets, publishing outside loopback, `privileged: true`, a missing `grdm` internal network) also exit `50` at every milestone. Only with valid gate data and passing baseline controls are M1–M3 *report-only* for vulnerability findings: the run exits `0` and records them. From M2 the allow-list may not grow: `scan` compares the entry count with `manifest/allowlist.baseline.json` and a larger count exits `50` (at M1 the count is only reported). At M4 any HIGH or CRITICAL finding not in the allow-list exits `50`; in addition, passing M4 requires that the first real AI red-team run (authorized attack testing of the isolated environment, [SPEC-03 §6](../../spec/03_security_gate.md)) has been completed and every intrusion path it found has been fixed or allow-listed — the red-team *preflight* (`grdm-dev redteam preflight`, a readiness check that proves isolation before a run) is not that run. At M5 every CRITICAL or HIGH finding exits `50`, allow-listed or not; the allow-list may contain no CRITICAL or HIGH entry (`scan` exits `50` if it does); and the AI red team must report zero unresolved intrusion paths. `scan` itself enforces the data validity, baseline, count, and severity rules; the M4 red-team completion and the M5 zero-paths result are milestone acceptance requirements that the owner records with the red-team evidence (SPEC-03 §6–7), not checks `scan` performs. + +**Success:** Exit `0`; the report under `runtime/reports/scan_<date>.json` (plus TOON) shows the baseline controls passed and the findings for the current milestone. + +**Failure exit codes:** `50` — gate failed for the current milestone (see rule above); `51` — a scanner could not run (Trivy, gitleaks, or Semgrep missing, or its vulnerability database could not be downloaded); `52` — `--dynamic` was requested while services are unhealthy. + +**Limit of the dynamic part:** with mandatory sign-in (`ENABLE_PUBLIC_ACCESS=false`, the default) `web` answers an anonymous request only with a redirect to the sign-in page, which ZAP cannot open. When the scan itself confirms that redirect and that it goes to the configured sign-in address, `web` is listed under `skipped_targets` with a note "ZAP NOT RUN on web" and the run can still exit `0`; the pages behind sign-in were then **not** scanned by ZAP. Any other failure to reach a target, such as a redirect elsewhere, stays exit `51`. + +#### 3.9 `grdm-dev accept` (manual, separate step) + +The acceptance tests ([SPEC-04](../../spec/04_acceptance_tests.md)) are not run by `install`. They need the optional Python extra and a Chromium build in the **existing** `.venv/`, installed once: + +```bash +.venv/bin/pip install -e "installer[accept]" +PLAYWRIGHT_BROWSERS_PATH=.venv/.playwright .venv/bin/playwright install chromium +``` + +On Linux (Ubuntu 24.04) two more commands are needed, both with `sudo` ([DEMO-21](../../demo/21_core_install_ubuntu_arm64_lima.md)). Run this one **before** the two commands above, because Playwright's driver does not start without it: + +```bash +sudo apt-get install -y libatomic1 +``` + +and this one **after** them, to add Chromium's system libraries (it asks for `sudo` itself): + +```bash +PLAYWRIGHT_BROWSERS_PATH=.venv/.playwright .venv/bin/playwright install-deps chromium +``` + +Then run the tests with `--seed`, which creates disposable test users, runs the browser scenarios, and removes those users again within the same run (there is no persistent seed step): + +```bash +.venv/bin/grdm-dev accept --seed +``` + +**Success:** All tests pass, and a report is written under `docs/demo/runs/<run-id>/`. + +**Failure exit codes:** `2` — the extra or Chromium is not installed (the message repeats the two commands above); `40` — the integration precheck failed, so the browser tests did not start (fix health first); `60` — one or more tests failed. + +> **Tip:** `--only <scenario>` runs one scenario; `--headed` shows the browser window. + +--- + +### 4. Everyday commands + +#### Start, stop, reset + +```bash +.venv/bin/grdm-dev up # start services and wait for health +.venv/bin/grdm-dev down # stop containers, keep volumes +.venv/bin/grdm-dev reset # stop and delete runtime/volumes/ +``` + +> **Tip:** Add `--yes` to skip confirmation prompts. + +#### View logs + +```bash +docker compose -f runtime/docker-compose.yml logs -f web api +``` + +> **Note:** The generated `runtime/docker-compose.yml` uses the service names from the manifest. + +#### Change profile + +```bash +.venv/bin/grdm-dev compose render --profile full --yes +.venv/bin/grdm-dev up --yes +``` + +#### Egress control + +The seven publishing services on `grdm-edge` (`web`, `api`, `admin`, `wb`, `mfr`, `fakecas`, `ember_osf_web`) already have outbound access to the Internet. Every other service has none by default ([ADR-02 §4](../../decisions/ADR-02_Network_Model.md#english)). `--egress` adds that access for the services you name, by attaching them to `grdm-edge` too: + +```bash +# Requires the full profile (rdmcp and aipf_mcp_data_grdm are not in core); select it first or in the same command. +.venv/bin/grdm-dev compose render --profile full --egress rdmcp,aipf_mcp_data_grdm +.venv/bin/grdm-dev compose render --egress none # clear the saved grant +``` + +The choice is saved in `runtime/.env` as `GRDM_EGRESS_SERVICES`, kept on later renders, shown by `scan --baseline`, and cleared with `--egress none`. Naming a service that is not in the selected profile is a usage error (exit 2). + +#### Default ports + +| Service | Host port | Profile | +|---|---|---| +| web | 5000 | minimum | +| api | 8000 | minimum | +| admin | 8001 | core | +| wb (WaterButler) | 7777 | core | +| mfr (Modular File Renderer) | 7778 | core | +| fakecas | 8080 | minimum | +| ember_osf_web | 4200 | core | + +> **Note:** If a port is in use (e.g., macOS AirPlay on 5000), `compose render` finds the next free port and records it in `runtime/.env` as `GRDM_PORT_<SERVICE>`; see §6. + +--- + +### 5. Security notes + +The installer implements these controls from milestone M1 ([SPEC-03 §3](../../spec/03_security_gate.md#english)): + +- **Secrets:** All passwords and keys are generated at install time with random values, written to `runtime/.env` (mode `0600`), and never committed to Git. +- **Network:** Services talk on an internal Compose network (`internal: true`). Browser-facing ports are published *only* on `127.0.0.1`; `health --network` verifies it. +- **[Container](../../reference/REF-01_Glossary.md#english) hardening:** Non-root (the program does not run as the all-powerful administrator user) user, read-only root filesystem, and `cap_drop: [ALL]` are the defaults for every service, together with resource limits (memory, CPU, process count). `privileged: true` is forbidden everywhere. A service that cannot tolerate one of the defaults (for example the PostgreSQL, RabbitMQ, or Elasticsearch images, which must write inside the image at start-up) gets a documented per-service exception in [`manifest/hardening.json`](../../../manifest/hardening.json), naming the relaxed control, the reason, the review date, and the milestone at which it is to be removed. Read-only roots therefore apply where the service tolerates them, not to every service. +- **Supply chain:** Images are pulled by digest (exact fingerprint), never a floating tag such as `latest`. +- **Sign-in:** Since RDM-osf.io-dev2027 PR #8 every data page and API route needs a signed-in user (`ENABLE_PUBLIC_ACCESS=false`, the default); `grdm-dev compose render --public-access true` turns anonymous viewing of public projects back on. The admin app asks a one-time code after the password (PR #10): an administrator without one is sent to an enrolment page on the first sign-in, and every administrator signs in again after an upgrade. +- **Search:** Elasticsearch 8 is reached over TLS with its own certificate authority and a user limited to the search indices; no port is published ([ADR-14](../../decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md)). + +> These are the requirements the installer enforces; whether a given running environment satisfies them is shown by `health --network` and `scan`, not by this guide. + +> **What the installer does *not* protect:** +> +> - Attacks on your operating system itself (e.g., kernel vulnerabilities) +> - Phishing of the developer +> - The production GRDM service (this guide is for development only) + +--- + +### 6. Troubleshooting + +#### A port is in use (exit 12) + +`compose render` starts from the port you requested or the one saved in `runtime/.env` (`GRDM_PORT_<SERVICE>`; the SPEC-02 §4 default if neither exists) and searches up to 100 ports above it for a free one. Ports already held by this project's own running containers are kept. If another program holds the port, the service moves to the first free candidate, the choice is recorded as `GRDM_PORT_<SERVICE>`, and the render reports it. Exit code 12 happens only when no free alternative exists in that range. + +**Fix:** Stop the other program if you want the original port back, or simply use the port `compose render` / `plan` reports. + +```bash +# macOS: AirPlay shares port 5000 +sudo lsof -i :5000 +# Kill the process if you do not need AirPlay +``` + +#### Docker missing (exit 11) + +`doctor` fails if Docker is not installed, not running, or lacks the Compose plugin. + +**Fix:** Install Docker Desktop (macOS, Windows) or Docker Engine (Ubuntu). Version ≥ 27 with Compose v2 plugin is required. On Ubuntu, `./installer/install-ubuntu.sh` installs Docker Engine for you. + +#### Build failed (exit 30) + +This happens when an image cannot be built for your CPU architecture or a prebuilt image cannot be pulled. + +**Real cases from DEMO-20:** + +1. **modular-file-renderer on arm64:** Built successfully with `build_platform: linux/amd64` (emulation) because the base Python 3.5 image has no arm64 wheel for `pandas==0.25.1`. +2. **ember-osf-web on any platform:** The source build failed because the base image used Docker manifest v2 schema 1, which current Docker refuses to pull. + +**Current state:** ember-osf-web no longer uses a `prebuilt_image`: its modernized Dockerfile (RDM-ember-osf-web-dev2027 PR #2) runs the ember-cli build in a Node stage on your own CPU and produces a static nginx image, so `build` builds it like the other components (`manifest/upstreams.json`). That Node stage needs several GiB of Docker engine memory while it runs; if the ember-osf-web build fails with exit 30, check the engine's memory first. + +#### Health check failed (exit 40) + +`health` fails if a service does not respond. `health --network` additionally fails if any published port listens on an address other than `127.0.0.1`; the plain command does not perform that check. + +**Fix:** Check logs with `docker compose -f runtime/docker-compose.yml logs <service>`, then restart the service. For a non-loopback listener, inspect `runtime/docker-compose.yml` (every `ports:` entry must start with `127.0.0.1:`) and re-run `compose render`. + +--- + +### 7. What changed since the old guide + +The rows below compare what `README.legacy.md` actually describes with the 2027 installer. + +| Old way (README.legacy.md) | New way (2027 installer) | Why | +|---|---|---| +| Configure a loopback alias `192.168.168.167` on the host (needs `sudo`) so services can reach each other | Internal network `grdm` with Compose service names + publishing network `grdm-edge` on `127.0.0.1` | No `sudo`, no host network change, no LAN exposure, same setup on macOS/Ubuntu/WSL2 ([ADR-02](../../decisions/ADR-02_Network_Model.md)) | +| Copy `local-dist.py` to `local.py` for web and api by hand; one URL serves both the browser and the services | Generated settings separate *internal* URLs (service names) from *external* browser URLs (`http://127.0.0.1:<port>/`) | Redirects and absolute URLs work from the browser without the alias ([ADR-02 §4](../../decisions/ADR-02_Network_Model.md#english)) | +| Hand-written `docker-compose.override.yml` that swaps images to `niicloudoperation/*:latest` and carries commented `platform:` lines per CPU | `grdm-dev compose render` generates `runtime/docker-compose.yml` from the manifest and profile; `platform:` comes from the manifest's `build_platform` | No manual edits, no host-specific file to commit by mistake, same output for everyone | +| Start from distribution images (`niicloudoperation/*:latest`, `quay.io/centerforopenscience/*`) and install Python/Node modules into volumes with the `*_requirements` services | Build from manifest-pinned source revisions; prebuilt images only as documented, digest-pinned exceptions | Exact reproducibility, no floating tags, no stale module volumes | +| Uncomment Elasticsearch limits and single-node settings in `docker-compose.yml` by hand on Apple Silicon | `compose render` writes resource limits scaled from `doctor` and per-service exceptions from `manifest/hardening.json` | One generated file instead of per-host edits | +| Default credentials shipped by the upstream Compose files (e.g., `postgres`/`postgres`; [SPEC-03 §3.1](../../spec/03_security_gate.md#english)) | Random secrets in `runtime/.env` (mode 0600), generated by `secrets init`; `scan --baseline` fails if a default remains | No default credentials left behind | + +> **Note:** The old instructions are kept verbatim in `README.legacy.md` for historical reference. The legacy guide itself never documented default passwords; they come from the upstream Compose files it relied on. + +### 8. Latest changes + +- **2026-11-12 — Elasticsearch 8, y-websocket only, mandatory sign-in, admin two-step sign-in (ADR-13 §6, ADR-14).** An existing installation upgrades in this order: `git pull`; `grdm-dev secrets init --missing` (adds `ELASTIC8_PASSWORD` and `ELASTIC8_OSF_PASSWORD`, keeps every other value, drops `SHAREJS_SECRET`); `grdm-dev compose render`; `grdm-dev build`; `grdm-dev compose render` again; `grdm-dev up`; then once `docker compose exec web invoke migrate_search` to rebuild the search index from PostgreSQL (the Elasticsearch 2 data is not moved; `runtime/volumes/elasticsearch_data`, `mongo_data` and `mongo_tls` are no longer used and can be removed by hand). `sharejs` and `mongo` are gone, so port 7007 is no longer published. The first administrator sign-in after the upgrade asks to enrol a one-time code; keep the recovery codes it shows once. +- **2026-11-06 — Waffle flag for the Metadata addon (PR #17).** The legacy startup steps in [`README.legacy.md`](README.legacy.md) now run `docker compose run --rm web python3 manage.py waffle_flag ember_edit_draft_registration_page --everyone` once, right after the first database migration, in each of the three startup variants. A *waffle flag* (a named on/off switch stored in the database that turns a feature on for chosen users) is required to open the Project Metadata edit page of the Metadata addon. The 2027 installer (`grdm-dev`) does not run this step yet; if you need the Metadata addon, run the same `manage.py waffle_flag` command against the `web` service by hand. Incorporated from PR #17 by yacchin1205 (2026-11-06). + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. クイックスタート + +[GakuNin](../../reference/REF-01_Glossary.md#japanese) RDM の 2027 開発環境を以下の三つのコマンドで導入します: + +```bash +git clone https://github.com/RCOSDP/RDM-developer-guide.git +cd RDM-developer-guide +./installer/install.sh --yes +``` + +インストーラーが完了すると、`grdm-dev up` が報告した web の URL をブラウザで開きます。既定は `http://127.0.0.1:5000` ですが、ポート(プログラムが待ち受ける番号付きの入口)5000 が使用中だった場合はインストーラーが別のポートを選び、`runtime/.env` に `GRDM_PORT_WEB` として記録しています。5000 と決めつけず、必ず報告に表示された URL またはポートを使ってください。 + +> **注意(2026-11-06 時点):** `core` プロファイル(起動するサービスの名前付きの組)の完全な起動は、まだ実行記録で検証できていません。[ember-osf-web](../../reference/REF-01_Glossary.md#japanese) の Dockerfile は現行 [Docker](../../reference/REF-01_Glossary.md#japanese) では組めないため、manifest はこの部品についてダイジェスト固定の配布済みイメージをすでに使う設定になっています(§3.5・§6)。次の実行記録は DEMO-20 に追記されます。 + +#### OS ごとの前提条件 + +- **macOS 14 以上、Apple Silicon (arm64):** Docker Desktop をインストール済み +- **Ubuntu 24.04、amd64(Intel/AMD 系の CPU の種類。Apple Silicon は arm64)または arm64:** Docker Engine をインストール済み +- **Windows 11 + WSL2(Windows Subsystem for Linux 2。Windows の中で Ubuntu を動かす仕組み。[REF-01](../../reference/REF-01_Glossary.md#japanese))の Ubuntu 24.04:** Docker Desktop をインストール済み + +> **Note:** インストーラーは各前提条件を確認します。ホストが未対応なら終了コード 10、Docker が無い・動いていない・Compose や buildx(複数 CPU 向けイメージを作る機能)プラグインが無いなら 11 で終わります。対応ホストの一覧は [SPEC-02 §8](../../spec/02_installer_cli.md#japanese) を参照。 + +#### OS ごとのスクリプトでホストを準備する + +前提条件がまだ揃っていないコンピュータでは、`install.sh` の代わりに OS に合ったスクリプトを実行します。どれも変更点を示し、管理者の操作の前に尋ね、最後に `install.sh` を実行します。`--yes` を付けると先にすべて同意し、`--dry-run` を付けると予定を見るだけです。リポジトリのフォルダで実行します。 + +| OS | コマンド | +|---|---| +| Ubuntu 24.04 | `./installer/install-ubuntu.sh` | +| macOS(Apple Silicon) | `./installer/install-macos.sh` | +| Windows 11(PowerShell で) | `powershell -ExecutionPolicy Bypass -File .\installer\install-windows.ps1` | + +期待する結果: 予定が表示され、答えた後にインストーラーの報告が web の URL で終わります。 + +Windows で必要なのは、リポジトリのこのスクリプトファイル一つだけです。WSL2 を有効にし、Ubuntu 24.04 を入れ、Docker Desktop と WSL 連携を確認し、リポジトリを WSL の中に clone します。Windows のディスクは WSL から遅く改行も変わるので、`/mnt/c` の下には決して置きません。実行する前にスクリプトを読んでください。`-ExecutionPolicy Bypass` はこの一回の実行だけに効きます。 + +> **Note:** 統合リポジトリは非公開です。ビルドの前に、導入を実行する場所(Windows では WSL の中)で git に自分の権限を設定してください。例: `gh auth login` の後に `gh auth setup-git`。スクリプトはトークンを尋ねず、読まず、保存しません。 + +#### Mac の Lima VM で Ubuntu のスクリプトを試す + +[Lima](https://lima-vm.io/)(macOS で Linux の仮想マシンを動かす道具)を使うと、Mac で Ubuntu の手順を手早く試せます([DEMO-21](../../demo/21_core_install_ubuntu_arm64_lima.md))。 + +> **Warning:** Lima の Ubuntu テンプレートは、設定に独自の `mounts:` を書いても一覧が併合されるため、ホームディレクトリを VM に(読み取り専用で)mount します。すると GitHub のトークンを持つ `~/.config/gh/hosts.yml` が VM の中から読めます。`install-ubuntu.sh` は、共有フォルダの mount 先の直下に `.config/gh/hosts.yml`・`.git-credentials`・`.netrc`・`.docker/config.json` のどれかがあると終了 10 で止まります。それより深くは探さないので、下の手順はやはり必要です。 + +VM の設定を書いて VM を作り、起動する**前に**ホームの mount を外します。Mac で実行します: + +```bash +limactl create --name grdm-ubuntu2404 --tty=false my-vm.yaml # base: template:ubuntu-24.04 と独自の mounts +# ~/.lima/grdm-ubuntu2404/lima.yaml を開き、 - location: "~" の行を消す +limactl start grdm-ubuntu2404 +limactl shell grdm-ubuntu2404 -- mount | grep -E 'virtiofs|9p|sshfs' +``` + +期待する結果: 自分で選んだフォルダだけが表示され、ホームディレクトリで終わる行はありません。 + +Apple Silicon の Mac で **Ubuntu amd64** を試すには、`my-vm.yaml` に `vmType: qemu` と `arch: x86_64` を書き、先に `brew install qemu lima-additional-guestagents` を実行します(Lima はこのために QEMU と amd64 のゲストエージェントを使います)。仮想マシン全体をエミュレーションするので、実機よりずっと遅く、最初の起動の `--timeout` は長くします。uid が 1000 でない一般利用者にするには `user: {name: grdm, uid: 2002, home: /home/grdm}` を足します([DEMO-22](../../demo/22_core_install_ubuntu_amd64_lima.md))。 + +トークン無しで VM に非公開リポジトリを渡すには、読み取り専用の bare ミラー(Mac で `git clone --mirror`)を共有し、VM の中で `git config --global url."file:///<ミラー>.git".insteadOf https://github.com/RCOSDP/<リポジトリ>.git` として git をそこへ向けます。 + +> **Note:** これらのスクリプトは Docker Desktop を入れません。ライセンスが所属組織によるからです。Homebrew も入れません。`install-macos.sh` が署名付きパッケージの入手先を案内します。理由は [ADR-08](../../decisions/ADR-08_Per_OS_Installer_Entry_Points.md) にあります。 + +--- + +### 2. 得られるもの + +インストーラーはホストのネットワーク設定を一切変えず、`runtime/` の下に自己完結型の環境を作ります。二つの Docker Compose(一つの設定ファイルから複数のコンテナをまとめて起こす道具)ネットワークを使います: + +- **内部ネットワーク `grdm`** — サービス間は Compose のサービス名(例: `web`, `api`, `postgres`)で通信します。ポートは公開されず、インターネットへの経路もありません。 +- **公開ネットワーク `grdm-edge`** — ブラウザが届く必要のある 7 サービス(`web`, `api`, `admin`, `wb`, `mfr`, `fakecas`, `ember_osf_web`)がここにも接続し、`127.0.0.1` にポートを公開します。通常の bridge ネットワークなので、この 7 サービスは外向き通信(egress)がすでに可能です。それ以外のサービスは、明示的に付与しない限り外向き通信を持ちません(§4)。 + +```mermaid +flowchart TD + subgraph HOST["ホスト(macOS / Ubuntu / WSL2)"] + BROWSER["ブラウザ → http://127.0.0.1:GRDM_PORT_WEB"] + subgraph DOCKER["Docker Compose"] + INTERNAL[内部ネットワーク grdm] + PUBLISHING[通常 bridge ネットワーク grdm-edge] + end + end + + subgraph SERVICES["稼働中のサービス"] + web[web(既定ポート 5000)] + api[api(既定ポート 8000)] + postgres[postgres] + rabbitmq[rabbitmq] + end + + BROWSER -->|"127.0.0.1:<web ポート>"| web + web -->|"http://api:8000"| api + api -->|"postgres:5432"| postgres + web -->|"rabbitmq:5672"| rabbitmq + + BROWSER --- PUBLISHING + web --- PUBLISHING + api --- PUBLISHING + + web --- INTERNAL + api --- INTERNAL + postgres --- INTERNAL + rabbitmq --- INTERNAL +``` + +--- + +### 3. ステップごとの手順 + +`./installer/install.sh --yes` は `.venv/` に Python の仮想環境(venv。システムとは別の、Python とライブラリだけの私用フォルダ)を作り、そこへ `grdm-dev` をインストールしてから `grdm-dev install` を実行します。このコマンドは次の手順をこの順番どおりに実行し、最初に 0 以外で終わった段で止まります([SPEC-02 §2.1](../../spec/02_installer_cli.md#japanese)、`installer/grdm_dev/install.py`): + +1. `doctor` +2. `plan` +3. `secrets init` — `runtime/.env` がまだ無いときだけ +4. `compose render` +5. `build` +6. `up` +7. `health --network` +8. `scan` +9. `report` + +受入試験(`accept`、§3.9)はこの自動手順に**含まれません**。導入後に手動で実行します。以下の各節は各手順の説明で、初期準備が `.venv/` を作った後なら単独でも実行できます。 + +#### 3.1 `grdm-dev doctor` + +ホストがすべての前提条件を満たすか確認します(初期準備で `.venv/` ができた後に単独で実行): + +```bash +.venv/bin/grdm-dev doctor +``` + +**成功:** OS、CPU、メモリ、空き容量、Docker のバージョンを TOON(JSON のデータを短く書いたテキスト形式。人にも AI にも読みやすい。[REF-01](../../reference/REF-01_Glossary.md#japanese))で表示します。 + +**失敗終了コード:** `10` — 対応外のホスト(OS・CPU・メモリ、または Python < 3.11)。`11` — Docker が無い、動いていない、または Compose / buildx プラグインが無い。 + +#### 3.2 `grdm-dev plan` + +どのイメージを作り、どのサービスを起動するか確認します: + +```bash +.venv/bin/grdm-dev plan --profile core +``` + +*manifest*(マニフェスト)は、どの部品をどの正確なソース版から組むかの一覧です(`manifest/upstreams.json`。[REF-01](../../reference/REF-01_Glossary.md#japanese))。*プロファイル*は起動するサービスの名前付きの組で、`minimum`・`core`(既定)・`full` があります([SPEC-02 §4](../../spec/02_installer_cli.md#japanese))。選択は `runtime/.env` に `GRDM_PROFILE` として保存され、次回以降も使われます。 + +**成功:** サービスと公開ポートの TOON レポートが表示されます。 + +**失敗終了コード:** `20` — manifest が不正、または TOON の抄録が JSON と一致しない。 + +#### 3.3 `grdm-dev secrets init` + +乱数の秘密を生成し、モード 0600(所有者のみ読み書き可)で `runtime/.env` に書きます: + +```bash +.venv/bin/grdm-dev secrets init +``` + +**成功:** `runtime/.env` が乱数のデータベースパスワード、Django の秘密鍵、CAS(GRDM が使うサインインの仕組み)の鍵で生成されます。 + +**失敗終了コード:** `2` — 使用法の誤り(例: `runtime/.env` があるのに `--force` が足りない)。 + +> **Security note:** インストーラーは *決して* 既定値や例のパスワードを書きません。すべての秘密は OS の乱数源から生成されます。 + +#### 3.4 `grdm-dev compose render` + +manifest とプロファイルから Docker Compose ファイルを生成します: + +```bash +.venv/bin/grdm-dev compose render --profile core +``` + +**成功(終了コード `0`):** `runtime/docker-compose.yml` がホストに合わせて設定されたサービスで生成され、既定から移動したポートがあれば報告されます。 + +**失敗終了コード:** `20` — manifest が不正。`2` — 使用法の誤り(例: `runtime/.env` が無い(先に `secrets init` を実行)、`--egress` に知らないサービス名を指定)。`12` — 必要なポートが使用中で、+100 の範囲に空きの代替が無い(§6)。 + +#### 3.5 `grdm-dev build` + +すべてのイメージをビルドまたは取得します: + +```bash +.venv/bin/grdm-dev build +``` + +**成功:** 全イメージがビルドまたは取得され、TOON レポートにその状態(`built`、`prebuilt` など)が表示されます。 + +**失敗終了コード:** `30` — イメージのビルドまたは配布済みイメージの取得に失敗(例: EOL ベースが arm64 でエミュレーションなしに組めない)。*EOL* は end of life、つまり作った人がバグや穴を直してくれなくなった状態です([REF-01](../../reference/REF-01_Glossary.md#japanese))。*エミュレーション*は Docker 内蔵の CPU 変換で `linux/amd64` のイメージを arm64 の CPU 上で動かすことで、遅くなりますが多くのイメージで動きます。 + +> **DEMO-20 の実際のケース:** +> +> - **modular-file-renderer(ファイルのプレビューを作るサービス):** `pandas==0.25.1` の arm64 *wheel*(ビルド済みの Python パッケージファイル。無いと pip がソースから組む必要があり、この EOL ベースでは失敗する)が存在しないため、`build_platform: linux/amd64`(エミュレーション)で正常にビルド。 +> - **ember-osf-web:** 当時は、ベースイメージが現行 Docker の拒否する Docker manifest v2 schema 1 を使っていたため、ソースからのビルドはどの CPU でも失敗し、manifest にはダイジェスト固定の `prebuilt_image` を設定して `build` がビルドの代わりにそれを取得していました(DEMO-20)。その後 Dockerfile は近代化されました(RDM-ember-osf-web-dev2027 PR #2)。いまの `build` は ember-osf-web を固定コミットからお使いの CPU 上でエミュレーションなしに静的な nginx のイメージへ組み、行は `built` になります。 + +#### 3.6 `grdm-dev up` + +全サービスを起動し、健康になるまで待ちます: + +```bash +.venv/bin/grdm-dev up --profile core +``` + +**成功:** 全サービスが健康と報告し、`up` が報告する web の URL(`http://127.0.0.1:<GRDM_PORT_WEB>`、既定ポート 5000)でブラウザが開きます。ブラウザを開かないなら `--no-open` を付けます。 + +**失敗終了コード:** `40` — 一つ以上のサービスが制限時間内に健康にならなかった。 + +#### 3.7 `grdm-dev health` と `health --network` + +手動でサービスの健康を確認します: + +```bash +.venv/bin/grdm-dev health # サービスの応答のみ +.venv/bin/grdm-dev health --network # 加えて、公開ポートがすべて 127.0.0.1 だけで待ち受けているか検証 +``` + +**成功:** 全サービスが健康と報告します。`--network` 付きなら報告に `loopback_only: true` も表示されます。 + +**失敗終了コード:** `40` — 一つ以上のサービスが不健康。`--network` 付きなら、コンテナのポートが `127.0.0.1` 以外のアドレスに結び付いている場合も。通常の `health` はホストへの露出を**検査しない**ため、ループバック限定公開を証明できるのは `health --network` だけです。自動の `install` 手順は `health --network` を実行します。 + +#### 3.8 `grdm-dev scan` + +[SPEC-03](../../spec/03_security_gate.md) のセキュリティ門を全部動かします: + +```bash +.venv/bin/grdm-dev scan +``` + +フラグなしの `scan` はすべての部分を実行します。基本対策、Trivy(イメージの中の既知の弱点を一覧にするスキャナー)の SBOM(ソフトウェア部品表。イメージに入っている部品の一覧)と CVE 一覧(CVE は既知の弱点一つに付く公開番号)、gitleaks の秘密検査、Semgrep(ソースコードから危険なパターンを探す静的解析)、OWASP ZAP の動的検査(攻撃者のように稼働中のサイトを調べる道具)です。`--baseline`・`--secrets`・`--dynamic` はそれぞれ**一部分だけ**を動かす限定検査で、全検査では*ありません*: + +```bash +.venv/bin/grdm-dev scan --baseline # 限定: runtime/docker-compose.yml と runtime/.env の基本対策のみ +.venv/bin/grdm-dev scan --secrets # 限定: リポジトリに対する gitleaks のみ +.venv/bin/grdm-dev scan --dynamic # 限定: OWASP ZAP の baseline のみ(健康なサービスが必要) +``` + +**節目ごとの門の規則**(`manifest/milestone.json`、現在は M3。所有者が 2026-11-13 に M2 を閉じたので、許容リストは M2 の件数 58 項目までしか持てない。[進捗ボード](../../status/README.md#japanese)を参照。[ADR-03](../../decisions/ADR-03_Staged_Security_Gate.md)、[SPEC-03 §5](../../spec/03_security_gate.md)): 門のデータ、すなわち `manifest/milestone.json`、許容リスト `manifest/allowlist.json`(知っていて期限付きで受け入れる検出を書いた一覧)とその基準 `manifest/allowlist.baseline.json` は、M1 を含むどの節目でも読めて形が正しくなければならない。読めないファイルや、六つの欄のどれかが欠けた許容リスト項目は終了 `50`(SPEC-03 §5.1 第1項)。基本対策の違反(既定の秘密、ループバック以外への公開、`privileged: true`、内部ネットワーク `grdm` の欠落)もどの節目でも終了 `50`。門のデータが有効で基本対策に合格した場合に限り、M1〜M3 では脆弱性の指摘は*報告のみ*(終了 `0` で記録する)。M2 からは許容リストを増やしてはならない。`scan` は項目数を `manifest/allowlist.baseline.json` と比べ、増えていれば終了 `50`(M1 では件数を報告するだけ)。M4 では許容リストにない HIGH または CRITICAL の指摘が一件でもあれば終了 `50`。加えて M4 の合格には、初回の実際の AI レッドチーム(隔離環境に対して許可を受けて行う攻撃検証。[SPEC-03 §6](../../spec/03_security_gate.md))を完了し、見つかった侵入経路をすべて修正か許容リスト登録していることが必要で、レッドチームの*事前確認*(`grdm-dev redteam preflight`。実施前に隔離を証明する準備の検査)はこの実検証ではない。M5 では CRITICAL か HIGH の指摘は許容リストにあっても一件で終了 `50`。許容リストに CRITICAL・HIGH の項目があってはならず(あれば `scan` は終了 `50`)、AI レッドチームが未解決の侵入経路ゼロを報告しなければならない。`scan` 自身が強制するのはデータ有効性・基本対策・件数・重大度の規則であり、M4 のレッドチーム完了と M5 の経路ゼロは、所有者がレッドチームの証跡とともに記録する節目の受入条件で(SPEC-03 §6–7)、`scan` が検査するものではない。 + +**成功:** 終了 `0`。`runtime/reports/scan_<日付>.json`(と TOON)の報告に、基本対策の合格と現在の節目での指摘が示されます。 + +**失敗終了コード:** `50` — 現在の節目で門に落ちた(上の規則)。`51` — スキャナーが動かせない(Trivy・gitleaks・Semgrep が無い、または脆弱性データベースを取得できない)。`52` — サービスが健康でないのに `--dynamic` を求めた。 + +**動的部分の限界:** 必須サインイン(`ENABLE_PUBLIC_ACCESS=false`、既定)では、`web` は匿名の要求にサインインのページへの転送しか返さず、ZAP はそれを開けません。スキャン自身がその転送を確かめ、転送先が設定済みのサインインのアドレスであるときだけ、`web` は注「ZAP NOT RUN on web」つきで `skipped_targets` に載り、終了 `0` になりえます。このときサインインの向こうのページは ZAP では**検査されていません**。転送先が別の場所であるなど、対象に届かないほかの失敗は終了 `51` のままです。 + +#### 3.9 `grdm-dev accept`(手動・別手順) + +受入試験([SPEC-04](../../spec/04_acceptance_tests.md))は `install` では実行されません。**既存の** `.venv/` に、任意の Python 追加依存と Chromium を一度だけ準備します: + +```bash +.venv/bin/pip install -e "installer[accept]" +PLAYWRIGHT_BROWSERS_PATH=.venv/.playwright .venv/bin/playwright install chromium +``` + +Linux(Ubuntu 24.04)では、`sudo` を使うコマンドがあと二つ要ります([DEMO-21](../../demo/21_core_install_ubuntu_arm64_lima.md))。次のコマンドは上の二つの**前に**実行します。これが無いと Playwright のドライバーが起動しません: + +```bash +sudo apt-get install -y libatomic1 +``` + +次のコマンドは上の二つの**後に**実行し、Chromium のシステムライブラリを入れます(自分で `sudo` を求めます): + +```bash +PLAYWRIGHT_BROWSERS_PATH=.venv/.playwright .venv/bin/playwright install-deps chromium +``` + +次に `--seed` を付けて試験を実行します。`--seed` は使い捨ての試験利用者を作成し、ブラウザのシナリオを実行し、同じ一回の実行の中でその利用者を削除します(事前に別途「シード」しておく手順はありません): + +```bash +.venv/bin/grdm-dev accept --seed +``` + +**成功:** 全試験が合格し、`docs/demo/runs/<run-id>/` に報告が書かれます。 + +**失敗終了コード:** `2` — 追加依存または Chromium が未準備(メッセージに上の二つのコマンドが表示される)。`40` — 統合の事前確認に失敗し、ブラウザ試験を開始しなかった(先に health を直す)。`60` — 一件以上の試験が失敗した。 + +> **Tip:** `--only <シナリオ>` で一つだけ実行、`--headed` でブラウザの画面を表示します。 + +--- + +### 4. 日常操作 + +#### 起動、停止、リセット + +```bash +.venv/bin/grdm-dev up # サービス起動し健康になるまで待つ +.venv/bin/grdm-dev down # コンテナ停止、ボリュームを残す +.venv/bin/grdm-dev reset # 停止し runtime/volumes/ を削除 +``` + +> **Tip:** 確認プロンプトを省くには `--yes` を追加。 + +#### ログの確認 + +```bash +docker compose -f runtime/docker-compose.yml logs -f web api +``` + +> **Note:** 生成された `runtime/docker-compose.yml` は manifest のサービス名を使います。 + +#### プロファイルの変更 + +```bash +.venv/bin/grdm-dev compose render --profile full --yes +.venv/bin/grdm-dev up --yes +``` + +#### 外向き通信(egress)の制御 + +`grdm-edge` 上の公開サービス 7 種(`web`, `api`, `admin`, `wb`, `mfr`, `fakecas`, `ember_osf_web`)は、インターネットへの外向き通信がすでに可能です。それ以外のサービスは既定では持ちません([ADR-02 §4](../../decisions/ADR-02_Network_Model.md#japanese))。`--egress` は指定したサービスを `grdm-edge` にも接続して、その外向き通信を追加します: + +```bash +# full プロファイルが前提(rdmcp と aipf_mcp_data_grdm は core に含まれない)。先に選ぶか、同じコマンドで指定する。 +.venv/bin/grdm-dev compose render --profile full --egress rdmcp,aipf_mcp_data_grdm +.venv/bin/grdm-dev compose render --egress none # 保存した付与を消す +``` + +選択は `runtime/.env` の `GRDM_EGRESS_SERVICES` に保存され、以降の render でも維持され、`scan --baseline` の報告に表示され、`--egress none` で消去されます。選択中のプロファイルに無いサービス名を指定すると使用法の誤り(終了 2)です。 + +#### 既定のポート + +| サービス | ホスト側ポート | プロファイル | +|---|---|---| +| web | 5000 | minimum | +| api | 8000 | minimum | +| admin | 8001 | core | +| wb (WaterButler) | 7777 | core | +| mfr (Modular File Renderer) | 7778 | core | +| fakecas | 8080 | minimum | +| ember_osf_web | 4200 | core | + +> **Note:** ポートが使用中なら(例: macOS の AirPlay と 5000)、`compose render` が次の空きポートを取り、`runtime/.env` に `GRDM_PORT_<SERVICE>` として記録します(§6)。 + +--- + +### 5. セキュリティ注意点 + +インストーラーは M1 から次の対策を実装します([SPEC-03 §3](../../spec/03_security_gate.md#japanese)): + +- **秘密:** 全パスワードと鍵は導入時に乱数で生成し、`runtime/.env`(モード `0600`)に書き、決して Git にコミットしません。 +- **ネットワーク:** サービスは内部 Compose ネットワーク(`internal: true`)で通信します。ブラウザ向けのポートは `127.0.0.1` に*だけ*公開され、`health --network` がそれを検証します。 +- **[コンテナ](../../reference/REF-01_Glossary.md#japanese)堅牢化:** 非 root ユーザー(全権限を持つ管理者ユーザーでプログラムを動かさない)、読み取り専用ルートファイルシステム、`cap_drop: [ALL]` が全サービスの既定で、資源制限(メモリ、CPU、プロセス数)も付きます。`privileged: true` はどこでも禁止です。既定に耐えられないサービス(例: 起動時にイメージ内へ書き込む必要がある PostgreSQL・RabbitMQ・Elasticsearch のイメージ)には、[`manifest/hardening.json`](../../../manifest/hardening.json) にサービスごとの記録付き例外があり、緩める対策、理由、見直し日、解消予定の節目を明記します。したがって読み取り専用ルートは「耐えられるサービス」に適用され、全サービスではありません。 +- **サプライチェーン:** イメージは「ダイジェスト」(正確な指紋)で取得し、`latest` のような動くタグは使いません。 +- **サインイン:** RDM-osf.io-dev2027 PR #8 以降、すべてのデータのページと API の経路でサインインが必要です(`ENABLE_PUBLIC_ACCESS=false`、既定)。`grdm-dev compose render --public-access true` で、公開プロジェクトの匿名閲覧を戻せます。管理アプリはパスワードのあとにワンタイムコードを求めます(PR #10)。コードを登録していない管理者は、最初のサインインで登録画面へ送られ、アップグレードの後はすべての管理者がもう一度サインインします。 +- **検索:** Elasticsearch 8 には、導入ごとの認証局による TLS と、検索の索引に限った利用者で接続し、ポートは公開しません([ADR-14](../../decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md))。 + +> 上記はインストーラーが課す要求事項です。実際の稼働環境がそれを満たしているかは、このガイドではなく `health --network` と `scan` の結果が示します。 + +> **インストーラーが守らないもの:** +> +> - OS 自体への攻撃(例: カーネルの脆弱性) +> - 開発者へのフィッシング +> - 本番 GRDM サービス(このガイドは開発用のみ) + +--- + +### 6. トラブルシューティング + +#### ポートが使用中(終了コード 12) + +`compose render` は、要求したポートまたは `runtime/.env` に保存されたポート(`GRDM_PORT_<SERVICE>`。どちらも無ければ SPEC-02 §4 の既定)を起点に、そこから最大 100 上まで空きポートを探します。このプロジェクト自身の稼働中コンテナが持つポートはそのまま保ちます。別のプログラムがポートを使っていれば、サービスは最初に見つかった空きの候補へ移り、その選択が `GRDM_PORT_<SERVICE>` として記録され、render が報告します。終了コード 12 になるのは、その範囲に空きの代替がまったくないときだけです。 + +**対応:** 元のポートを使いたければ相手のプログラムを止める。そうでなければ `compose render` / `plan` が示すポートをそのまま使う。 + +```bash +# macOS: AirPlay はポート 5000 を使う +sudo lsof -i :5000 +# AirPlay が不要ならプロセスを終了させる +``` + +#### Docker が無い(終了コード 11) + +`doctor` は Docker がインストールされていない、動いていない、または Compose プラグインがないと失敗します。 + +**対応:** Docker Desktop(macOS・Windows)または Docker Engine(Ubuntu)をインストール。版 ≥ 27、Compose v2 プラグインが必要です。Ubuntu では `./installer/install-ubuntu.sh` が Docker Engine を入れます。 + +#### ビルド失敗(終了コード 30) + +イメージがコンピュータのアーキテクチャで組めない、または配布済みイメージを取得できないときに起きます。 + +**DEMO-20 の実際のケース:** + +1. **modular-file-renderer on arm64:** ベース Python 3.5 イメージが arm64 向けの `pandas==0.25.1` wheel を持たないため、`build_platform: linux/amd64`(エミュレーション)で正常にビルド。 +2. **ember-osf-web on 任意プラットフォーム:** ベースイメージが Docker manifest v2 schema 1 を使っていたため、現行 Docker が取得を拒み、ソースからのビルドは失敗していた。 + +**現状:** ember-osf-web はもう `prebuilt_image` を使いません。近代化した Dockerfile(RDM-ember-osf-web-dev2027 PR #2)は ember-cli のビルドをお使いの CPU 上の Node の段で実行して静的な nginx のイメージを作るので、`build` はほかの部品と同じようにこれを組みます(`manifest/upstreams.json`)。この Node の段は動いている間 Docker エンジンのメモリを数 GiB 使います。ember-osf-web のビルドが終了 30 で失敗したら、まずエンジンのメモリを確かめてください。 + +#### 健康確認失敗(終了コード 40) + +`health` はサービスが応答しないと失敗します。`health --network` はさらに、公開ポートが `127.0.0.1` 以外のアドレスで待ち受けていると失敗します。通常のコマンドはこの検査を行いません。 + +**対応:** `docker compose -f runtime/docker-compose.yml logs <service>` でログを確認し、サービスを再起動します。ループバック以外の待受があれば `runtime/docker-compose.yml` を確認し(すべての `ports:` は `127.0.0.1:` で始まる必要がある)、`compose render` をやり直します。 + +--- + +### 7. 過去のガイドとの違い + +以下の表は、`README.legacy.md` が実際に記述している方法と 2027 インストーラーを比較します。 + +| 過去の方法(README.legacy.md) | 新しい方法(2027 インストーラー) | 理由 | +|---|---|---| +| サービス同士が通信できるよう、ホストにループバック別名 `192.168.168.167` を設定する(`sudo` が必要) | Compose のサービス名で通信する内部ネットワーク `grdm` + `127.0.0.1` に公開する公開ネットワーク `grdm-edge` | `sudo` 不要、ホストのネットワーク変更なし、LAN への露出なし、macOS/Ubuntu/WSL2 で同じ設定([ADR-02](../../decisions/ADR-02_Network_Model.md)) | +| web と api の `local-dist.py` を手で `local.py` にコピーする。一つの URL をブラウザとサービスの両方が使う | 生成される設定は*内部* URL(サービス名)と*外部*のブラウザ用 URL(`http://127.0.0.1:<ポート>/`)を分ける | 別名なしでも転送と絶対 URL がブラウザから正しく動く([ADR-02 §4](../../decisions/ADR-02_Network_Model.md#japanese)) | +| イメージを `niicloudoperation/*:latest` に差し替え、CPU ごとの `platform:` 行をコメントで持つ `docker-compose.override.yml` を手書きする | `grdm-dev compose render` が manifest とプロファイルから `runtime/docker-compose.yml` を生成する。`platform:` は manifest の `build_platform` から決まる | 手動編集なし、ホスト固有のファイルを誤ってコミットしない、全員同じ出力 | +| 配布イメージ(`niicloudoperation/*:latest`、`quay.io/centerforopenscience/*`)から起動し、Python/Node モジュールは `*_requirements` サービスでボリュームにインストールする | manifest で固定したソース版からビルドする。配布済みイメージは記録付き・ダイジェスト固定の例外に限る | 精密な再現性、動くタグなし、古いモジュールのボリュームなし | +| Apple Silicon では `docker-compose.yml` の Elasticsearch の制限・シングルノード設定のコメントを手で外す | `compose render` が `doctor` の結果から資源制限を、`manifest/hardening.json` からサービスごとの例外を書く | ホストごとの編集ではなく一つの生成ファイル | +| 上流の Compose ファイルが同梱する既定認証情報(例: `postgres`/`postgres`。[SPEC-03 §3.1](../../spec/03_security_gate.md#japanese)) | `secrets init` が生成する乱数の秘密を `runtime/.env`(モード 0600)に置く。既定値が残れば `scan --baseline` が失敗する | 既定認証情報を残さない | + +> **Note:** 過去の手順は参考のために `README.legacy.md` にそのまま残しています。旧ガイド自体は既定パスワードを記述しておらず、それは旧ガイドが頼っていた上流の Compose ファイルに由来します。 + +### 8. 最近の変更 + +- **2026-11-12 — Elasticsearch 8、y-websocket だけ、必須サインイン、管理者の 2 段階サインイン(ADR-13 §6、ADR-14)。** 既存の導入は次の順でアップグレードします。`git pull`、`grdm-dev secrets init --missing`(`ELASTIC8_PASSWORD` と `ELASTIC8_OSF_PASSWORD` を足し、ほかの値は変えず、`SHAREJS_SECRET` を捨てます)、`grdm-dev compose render`、`grdm-dev build`、もう一度 `grdm-dev compose render`、`grdm-dev up`。そのあと一度だけ `docker compose exec web invoke migrate_search` で検索の索引を PostgreSQL から作り直します(Elasticsearch 2 のデータは移しません。`runtime/volumes/elasticsearch_data`・`mongo_data`・`mongo_tls` はもう使われないので、手で消せます)。`sharejs` と `mongo` は無くなったので、ポート 7007 はもう公開されません。アップグレード後の最初の管理者のサインインはワンタイムコードの登録を求めます。一度だけ表示されるリカバリーコードを保管してください。 +- **2026-11-06 — Metadata アドオン用の waffle フラグ設定(PR #17)。** [`README.legacy.md`](README.legacy.md) の起動手順では、3 通りの起動手順それぞれで、初回の DB マイグレーション直後に `docker compose run --rm web python3 manage.py waffle_flag ember_edit_draft_registration_page --everyone` を一度実行するようになりました。*waffle フラグ*(データベースに保存される名前付きのオン/オフのスイッチで、選んだ利用者に機能を有効にするもの)は、Metadata アドオンの Project Metadata 編集画面を開くために必要です。2027 インストーラー(`grdm-dev`)にはまだこの手順が無いため、Metadata アドオンが必要な場合は同じ `manage.py waffle_flag` コマンドを `web` サービスに対して手で実行してください。Incorporated from PR #17 by yacchin1205 (2026-11-06). + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Container | A box that holds one program and everything it needs, so it runs the same on any computer. | 一つのプログラムと必要なものを一箱に入れて、どのコンピュータでも同じように動かすための箱。 | +| Docker Compose | A tool that starts many containers together from one description file. | 一つの設定ファイルから多くのコンテナをまとめて起こす道具。 | +| Loopback / 127.0.0.1 | The address that means "this same computer"; nothing outside can reach it. | 「この同じコンピュータ」を指す番地。外からは届かない。 | +| Internal network | A private network inside Docker that services use to talk without publishing ports. | Docker の中だけにある私設ネットワークで、ポートを公開せずにコンテナ同士が通信できる。 | +| Egress | Traffic sent from a service to the outside network (the Internet). | サービスから外部ネットワーク(インターネット)へ出る通信。 | +| Manifest | The list of components and the exact source revisions they are built from (`manifest/upstreams.json`). | 部品と、それを組む正確なソース版の一覧(`manifest/upstreams.json`)。 | +| Profile | A named subset of services to run: `minimum`, `core`, or `full`. | 起動するサービスの名前付きの組。`minimum`・`core`・`full`。 | +| TOON | A compact text form of JSON data that people and AI read easily. | JSON のデータを短く書いたテキスト形式。人にも AI にも読みやすい。 | +| Digest | The exact fingerprint of one image version (`sha256:...`). | 一つのイメージ版の正確な指紋(`sha256:...` の形式)。 | +| Non-root user | A regular user account (not the computer's administrator). | コンピュータの管理者でない通常のユーザアカウント。 | +| EOL | End of life: the vendor no longer fixes bugs or security holes. | end of life。作った人がバグや穴を直してくれなくなった状態。 | +| Wheel | A prebuilt Python package file; without one, pip must compile from source. | ビルド済みの Python パッケージファイル。無いと pip がソースから組む必要がある。 | +| Emulation | Running an image built for another CPU (e.g., `linux/amd64` on arm64) through Docker's CPU translation. | 別の CPU 向けのイメージ(例: arm64 上で `linux/amd64`)を Docker の CPU 変換で動かすこと。 | +| WSL2 | Windows Subsystem for Linux 2: a way to run Linux inside Windows. | Windows Subsystem for Linux 2。Windows の中で Linux を動かす仕組み。 | +| CVE | A public record number for one known security weakness (e.g., `CVE-2026-12345`). | 一つの既知の弱点に付く公開の番号(例: `CVE-2026-12345`)。 | +| Baseline controls | Security checks that every install must pass from milestone M1. | M1 から全導入に必須のセキュリティチェック。 | +| Milestone (M1–M5) | A numbered stage of the 2027 plan; the security gate gets stricter at each one. | 2027 計画の番号付き段階。セキュリティ門は段階ごとに厳しくなる。 | diff --git a/images/docker-compose.png b/docs/guides/environment/images/docker-compose.png similarity index 100% rename from images/docker-compose.png rename to docs/guides/environment/images/docker-compose.png diff --git a/images/institution.png b/docs/guides/environment/images/institution.png similarity index 100% rename from images/institution.png rename to docs/guides/environment/images/institution.png diff --git a/images/rdmTop.png b/docs/guides/environment/images/rdmTop.png similarity index 100% rename from images/rdmTop.png rename to docs/guides/environment/images/rdmTop.png diff --git a/docs/guides/screen-expansion/README.legacy.md b/docs/guides/screen-expansion/README.legacy.md new file mode 100644 index 0000000..611b93e --- /dev/null +++ b/docs/guides/screen-expansion/README.legacy.md @@ -0,0 +1,709 @@ +# 画面拡張アドオンの作成 + +以下の機能を持つ画面拡張アドオンを実装します。 + +- プロジェクトダッシュボード上のアドオンのウィジェッド +- プロジェクトのナビゲーションバーから遷移できるアドオンの画面タブ(Emberを利用) + +基本的なアドオンの概要は[スケルトンの作成](../Skelton/README.md)を参照してください。 + +## 前提条件 + +[開発環境の準備](../Environment.md#開発環境でRDMを起動する)のガイドに従い、開発環境にてRDMを起動しているものとします。 + +# 画面拡張アドオンの設計 + +## サービスの構成 + +画面拡張アドオンは以下の2つの要素から構成されます。 + +- OSF.ioサービスで動作するAddon: ユーザ・プロジェクト設定の管理 +- ember-osf-webサービスで動作する画面タブモジュール: 画面タブのView定義 + +ember-osf-webは、 [Ember.js](https://www.emberjs.com) をベースとしたOSFのフロントエンドUIの実装です。もともと、OSF.ioがフロントエンドも担当していましたが、COSはEmber.jsベースのコードに移行を進めています。 + +現在はosf-web(OSF.io)が外部からのリクエストを受け、要求されたエンドポイントをember-osf-webがサポートしていると判断される場合は、osf-webがember-osf-webに対してリクエストを転送する形式を取っています。実際のデータベースに対する操作は、従来のosf-api(OSF.io apiserver)が担います。ember-osf関連のフロントエンドは、必要に応じてAPIサーバへの問い合わせを行うことで、データベースに対する変更やストレージに対する操作を実施することができます。 + +## ファイルの構成 + +典型的なファイル配置は以下のようになります。 + +### OSF.io Addonのファイル構成 + +> クラス構成はスケルトン アドオンと同様です。 + +``` +/addons/アドオン名/ +├── __init__.py ... モジュールの定義 +├── apps.py ... (**) アプリケーションの定義 +├── models.py ... モデルの定義 +├── requirements.txt ... 利用するPythonモジュールの定義 +├── routes.py ... (**) View(Routes)の定義 +├── settings ... 設定を定義するモジュール +│ ├── defaults.py ... デフォルト設定の定義 +│ └── __init__.py ... 設定の定義 +├── static ... Webブラウザから読み込むことを想定した静的ファイル +│   ├── comicon.png ... アドオンのアイコン +│   ├── アドオン名.css ... (*) ウィジェットのCSSファイル +│   ├── node-cfg.js ... Node設定のエントリとなるJavaScriptファイル +│   └── widget-cfg.js ... (*) ウィジェットのJavaScriptファイル +├── templates ... テンプレートディレクトリ +│   └── <アドオン名>_node_settings.mako ... Node設定パネル +├── tests ... テストコード +│   ├── __init__.py +│   ├── conftest.py +│   ├── factories.py +│   ├── test_model.py +│   ├── (**) test_view.py +│   └── utils.py +├── utils.py ... (*) ユーティリティ関数の定義 +└── views.py ... (**) View(Views)の定義 +``` + +`(*)`が付いているファイルはスケルトン アドオンには存在しないファイルです。 +`(**)`が付いているファイルはスケルトン アドオンに存在しますが、変更が加えられているファイルです。 + +### ember-osf-web 画面タブのファイル構成 + +``` +app +├── guid-node/アドオン名 ... アドオンの画面タブモジュール定義 +│ ├── controller.ts ... 画面タブのコントローラ定義 +│ ├── route.ts ... 画面タブのルーティング定義 +│ ├── styles.scss ... 画面タブのCSS(SCSS)定義 +│ └── template.hbs ... 画面タブのテンプレートファイル +├── models/モデル名.ts ... 画面タブで使うモデル定義 +├── adapters/モデル名.ts ... 画面タブで使うモデルのアダプタ定義 +└── serializers/モデル名.ts ... 画面タブで使うモデルのシリアライザ定義 + +tests ... テストコード +├── acceptance/guid-node/アドオン名-test.ts +└── unit/guid-node/アドオン名/controller-test.ts + +mirage ... アダプタ接続先APIのテスト用モック定義 +├── factories/モデル名.ts +└── views/モデル名.ts +``` + +## OSF.io Addonのモジュール構成 + +スケルトン アドオンと大きな違いはありません。スケルトン アドオンとの違いを中心に説明していきます。 + +### Modelの構成 + +Modelの構成はスケルトン アドオンと同じです。 + +### Viewの構成 + +スケルトン アドオンのViewsおよびRoutesの定義に、画面タブ用の定義を追加します。 + +画面タブでアドオンのデータをやり取りするには、ember-osf-webに新しくモデルを定義し、そのモデルに対応するJSON APIをOSF.io側に定義する必要があります。 +データは以下のような [JSON:API](https://jsonapi.org/) で定められたフォーマットでやり取りします。 + +``` +{ + "data": { + "id": nodeのID + "type": "モデル名", + "attributes": データのDictionary + } +} +``` + +My Screenアドオンの場合、以下のようにRoutesとViewsを定義します。 + +- [routes.py](osf.io/addon/routes.py) +- [views.py](osf.io/addon/views.py) + +### フレームワークによって提供されるView + +アドオンのウィジェット定義を追加します。 + +ウィジェットテンプレートは [website/templates/util/render_addon_widget.mako](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/templates/util/render_addon_widget.mako) に定義します。 +ウィジェットテンプレートの設定は [website/project/views/node.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/project/views/node.py) に定義します。 + +ウィジェットで使うJavaScriptは `/addons/アドオン名/static/widget-cfg.js` で、CSSは `/addons/アドオン名/static/アドオン名.css` で定義します。CSSはJavaScriptファイルから `require()` を使って読み込みます。 + +My Screenアドオンの場合、以下のように定義します。 + +- [render_addon_widget.mako](osf.io/website/templates/util/render_addon_widget.mako) +- [node.py](osf.io/website/project/views/node.py) +- [widget-cfg.js](osf.io/addon/static/widget-cfg.js) +- [myscreen.css](osf.io/addon/static/myscreen.css) + +### 国際化 + +国際化の設定は [website/translations/](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/translations/) 以下のファイルに、以下のように定義します。 + +``` +msgid メッセージID +msgstr 国際化後の文字列 +``` + +`*.pot` ファイルには `msgstr` を `""` (空文字)にして定義します。 +`messages.*` にはmakoのテンプレートファイルで使う国際化設定を、 `js_messages.*` にはJavaScriptで使う国際化設定を定義します。 + +JavaScriptで文字列を国際化するのは、以下のように書きます。 + +``` +var _ = require('js/rdmGettext')._; +const localizedStr = _('メッセージID'); +``` + +makoで文字列を国際化するのは、以下のように書きます。 + +``` +${_("メッセージID")} +``` + +### 設定モジュール + +設定モジュールはスケルトン アドオンと同じです。 + +### AddonAppConfigの定義 + +ウィジェットと画面タブを有効にするために、 `/addons/アドオン名/app.py` の `AddonAppConfig.views` に、`'widget'` と `'page'` を追加します。 + +``` +class AddonAppConfig(BaseAddonAppConfig): + # 中略 + views = ['widget', 'page'] + # 中略 +``` + +My Screenアドオンの場合、以下のように定義します。 + +- [apps.py](osf.io/addon/apps.py) + +### テストコード + +スケルトン アドオンと同様に、ユニットテストを定義します。 +My Screenアドオンの場合、以下のように定義します。 + +- [tests/](osf.io/addon/tests/) + +## ember-osf-web 画面タブのモジュール構成 + +ember-osf-webは [TypeScript](https://www.typescriptlang.org) によって実装されます。 +アプリケーションのコードは [app/](https://github.com/RCOSDP/RDM-ember-osf-web/blob/master/app/) に実装されます。 + +ember-osf-webは、OSFの画面を構成するページを単位としてモジュール分割されています。 + +### router.ts +[router.ts](https://github.com/RCOSDP/RDM-ember-osf-web/blob/master/app/router.ts) は、ページ全体を束ねるルーティング定義ファイルです。 + +例えば、 `/プロジェクトID/アドオン名` というパスを追加する場合は、 `Router.map` に渡す関数に以下を追加します。 + +``` +this.route('guid-node', { path: '--node/:guid' }, function() { + this.route('アドオン名'); +}); +``` + +このパスにリクエストが与えられると、 `app/guid-node/アドオン名` で定義されたページに処理が移行します。 + +### ページの実装 + +#### 画面の実装 +画面の実装は [Handlebars templating library](https://handlebarsjs.com/) を使用して、 `template.hbs` ファイルに定義します。 + +画面上の文字列は全て国際化を考慮し、 [translations/en-us.yml](https://github.com/RCOSDP/RDM-ember-osf-web/blob/master/translations/en-us.yml) に定義された値を埋め込む必要があります。 + +My Screenアドオンの場合、以下のように定義します。 + +- [template.hbs](ember-osf-web/app/guid-node/myscreen/template.hbs) +- [translations/en-us.yml](ember-osf-web/translations/en-us.yml) + +> [ボタン](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/lib/osf-components/addon/components/osf-button) や [DatePicker](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/lib/osf-components/addon/components/validated-input/date) 、 [ダイアログボックス](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/lib/osf-components/addon/components/osf-dialog) などは、別のコンポーネントとして定義することで再利用できるようになっています。 +> [lib/osf-components](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/lib/osf-components) のコードを確認して、コンポーネントを利用しましょう。 + +#### コントローラの定義 +画面に埋め込む変数やハンドラの制御はコントローラが担います。 +コントローラには `template.hbs` に埋め込まれる変数やイベントに対する処理を記述します。 + +My Screenアドオンの場合、以下のように定義します。 + +- [controller.ts](ember-osf-web/app/guid-node/myscreen/controller.ts) + +また、コントローラとバックエンドのやり取りは、Ember Dataが提供する [DS.Store](https://api.emberjs.com/ember-data/release/classes/Store) オブジェクトを経由して行われます。 +DS.Storeで操作可能なオブジェクトは [models](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/app/models) に定義され、 [adapters](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/app/adapters) に定義されたルールに基づき、APIサーバを介したオブジェクトの操作を行います。 + +なお、APIサーバは [JSON:API](https://jsonapi.org/) に則っていることを前提とすることで、adapterは細かなエンドポイント生成処理を定義することなく、APIサーバとの連携を実現することができます。 +エンドポイント生成処理をカスタマイズしたい場合は、 [serializers](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/app/serializers) に定義を追加します。 + +My Screenアドオンの場合、`myscreen-config` というmodelと、対応するadapterおよびserializerを以下のように定義します。 + +- [models/myscreen-config.ts](ember-osf-web/app/models/myscreen-config.ts) +- [adapters/myscreen-config.ts](ember-osf-web/app/adapters/myscreen-config.ts) +- [serializers/myscreen-config.ts](ember-osf-web/app/serializers/myscreen-config.ts) + +#### スタイルの定義 +スタイルは [Sass(SCSS)](https://sass-lang.com/) を使用して、 `styles.scss` ファイルに定義します。 +My Screenアドオンの場合、以下のように定義します。 + +- [styles.scss](ember-osf-web/app/guid-node/myscreen/styles.scss) + +#### ルーティングの定義 +モジュールに関する追加の経路定義を `route.ts` に定義します。 +My Screenアドオンの場合、以下のように定義します。 + +- [route.ts](ember-osf-web/app/guid-node/myscreen/route.ts) + +### テストコード + +テストコードは [tests/](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/tests/) に定義します。 +テストに使うAPIのモックは、 [Mirage](https://miragejs.com/) を使用して [mirage/](https://github.com/RCOSDP/RDM-ember-osf-web/tree/master/mirage/) に定義します。 + +My Screenアドオンの場合、以下のように定義します。 + +- [tests/](ember-osf-web/tests) +- [mirage/](ember-osf-web/mirage) + + +# My Screenアドオンの実装 + +ここでは、 `myscreen` という識別名のアドオンの実装を例に説明します。アドオンの完全名は `My Screen` とします。 + +アドオン名は様々な場所に埋め込まれています。アドオン名を変更したい場合は、以降で追加・変更するファイル名やコードの `myscreen` 、 `My Screen` 、 `MyScreen` という文字列を変更してください。 + +## OSF.ioへの実装 + +### addons.myscreen モジュールの定義 + +スケルトン アドオンと同様に、[アドオンの実装例(`osf.io/addon/`)](osf.io/addon/)を `addons/myscreen` ディレクトリにコピーします。 + +### RDMコードの変更 + +スケルトン アドオンと同様に、RDMのコードをいくつか変更します。 + +- [addons.json](https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons.json) + - 変更例のサンプル: [addons.json](osf.io/config/addons.json) +- [framework/addons/data/addons.json](https://github.com/RCOSDP/RDM-osf.io/blob/develop/framework/addons/data/addons.json) + - 変更例のサンプル: [addons.json](osf.io/config/framework/addons/data/addons.json) +- [Dockerfile](https://github.com/RCOSDP/RDM-osf.io/blob/develop/Dockerfile) + - 変更例のサンプル: [Dockerfile](osf.io/config/Dockerfile) +- [api/base/settings/defaults.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/api/base/settings/defaults.py) + - 変更例のサンプル: [defaults.py](osf.io/config/api/base/settings/defaults.py) + +#### ウィジェットテンプレートの変更 + +[website/templates/util/render_addon_widget.mako](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/templates/util/render_addon_widget.mako) に、ウィジェットのテンプレート定義を追加します。 + +``` +% if addon_name == 'myscreen': + <div id="myscreen-content" class="scripted"> + <!-- ko if: loading --> + <div>${_("Loading")}</div> + <!-- /ko --> + <!-- ko if: loadFailed --> + <div class="text-danger">${_("Error occurred")}</div> + <!-- /ko --> + <!-- ko if: loadCompleted --> + <h5 style="padding: 0.2em;">${_("My Screen Test")}</h5> + <div> + <label data-bind="text: param_1_label"></label> + <p data-bind="text: param_1"></p> + </div> + <!-- /ko --> + </div> +% endif +``` + +[website/project/views/node.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/project/views/node.py) の `view_project()` 関数に、My Screenアドオンのウィジェットデータを読み込むコードを追加します。 + +``` +def view_project(auth, node, **kwargs): + # 中略 + addons_widget_data = { + # 中略 + 'myscreen': None + } + + if 'myscreen' in ret['addons']: + addons_widget_data['myscreen'] = serialize_myscreen_widget(node) + # 中略 +``` + +それぞれの変更例は、サンプル [render_addon_widget.mako](osf.io/website/templates/util/render_addon_widget.mako) と [node.py](osf.io/website/project/views/node.py) を参照してください。 + +#### 国際化ファイルの変更 + +[website/translations/](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/translations/) 以下の各国際化ファイルに、アドオンで表示する文字列の国際化設定を追加します。 + +`website/translations/messages.pot` と `website/translations/en/LC_MESSAGES/messages.po`: + +``` +#: website/templates/util/render_addon_widget.mako:245 +msgid "My Screen Test" +msgstr "" +``` + +`website/translations/ja/LC_MESSAGES/messages.po`: + +``` +#: website/templates/util/render_addon_widget.mako:245 +msgid "My Screen Test" +msgstr "My Screen テスト" +``` + +`website/translations/js_messages.pot` と `website/translations/en/LC_MESSAGES/js_messages.po`: + +``` +#: addons/myscreen/static/widget-cfg.js:22 +msgid "My Screen Param1 Label" +msgstr "" +``` + +`website/translations/ja/LC_MESSAGES/js_messages.po`: + +``` +#: addons/myscreen/static/widget-cfg.js:22 +msgid "My Screen Param1 Label" +msgstr "パラメーター1" +``` + +変更例は、サンプル [translations/](osf.io/website/translations/) を参照してください。 + +### Migrationsファイルの作成 + +`makemigrations` コマンドを実行して、Migrationsファイルを作成します。 + +``` +$ docker compose run --rm web python3 manage.py makemigrations +``` + +上記の出力中に以下のような出力が現れれば成功です。 + +``` +Migrations for 'addons_myscreen': + addons/myscreen/migrations/0001_initial.py + - Create model NodeSettings + - Add field user_settings to nodesettings +``` + +### Widgetの表示位置のカスタマイズ + +デフォルトでは、アドオンのWidgetはダッシュボードの左カラムの下部(FileViewerの下)に、アドオンの名前順で表示されます。表示位置を変更する場合は、 [website/templates/project/project.mako](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/templates/project/project.mako) ファイルを編集します。 + +> 今後、プロジェクトダッシュボードの表示もEmber化されることが考えられます。その場合は、Ember側も合わせて変更する必要があります。 + +左カラムの一番上(Wikiウィジェットの上)に表示したい場合は、以下のように修正します。 + +```diff +@@ -431,6 +431,10 @@ + + <div class="col-sm-12 col-md-6 osf-dash-col"> + ++ % if 'myscreen' in addons_enabled and addons['myscreen']['has_widget']: ++ ${ render_addon_widget.render_addon_widget('myscreen', addons_widget_data['myscreen']) } ++ % endif ++ + %if user['show_wiki_widget']: + ${ render_addon_widget.render_addon_widget('wiki', addons_widget_data['wiki']) } + %endif +@@ -470,7 +474,7 @@ + <!-- Show widgets in left column if present --> + % for addon in addons_enabled: + % if addons[addon]['has_widget']: +- %if addon != 'wiki' and addon != 'iqbrims': ## We already show the wiki widget at the top ++ %if addon != 'wiki' and addon != 'iqbrims' and addon != 'myscreen': ## We already show the wiki widget at the top + ${ render_addon_widget.render_addon_widget(addon, addons_widget_data[addon]) } + %endif + % endif +``` + +右カラムの一番上に表示したい場合は、以下のように修正します。 + +```diff +@@ -470,7 +470,7 @@ + <!-- Show widgets in left column if present --> + % for addon in addons_enabled: + % if addons[addon]['has_widget']: +- %if addon != 'wiki' and addon != 'iqbrims': ## We already show the wiki widget at the top ++ %if addon != 'wiki' and addon != 'iqbrims' and addon != 'myscreen': ## We already show the wiki widget at the top + ${ render_addon_widget.render_addon_widget(addon, addons_widget_data[addon]) } + %endif + % endif + % endfor + % else: + <!-- If no widgets, show components --> + ${children()} + % endif + + </div> + + <div class="col-sm-12 col-md-6 osf-dash-col"> ++ % if 'myscreen' in addons_enabled and addons['myscreen']['has_widget']: ++ ${ render_addon_widget.render_addon_widget('myscreen', addons_widget_data['myscreen']) } ++ % endif ++ + % if addons: + <!-- Show IQB-RIMS widgets in right column if present --> + % for addon in addons_enabled: +``` + +変更例は、サンプル [project.mako](osf.io/website/templates/project/project.mako) を参照してください。 + +### 画面タブリンクの表示位置のカスタマイズ + +デフォルトでは、アドオン画面タブのリンクはナビゲーションバーのFiles(ファイル)タブの右に、アドオンの名前順で表示されます。表示位置を変更する場合は、[website/templates/project/project_header.mako](https://github.com/RCOSDP/RDM-osf.io/blob/develop/website/templates/project/project_header.mako) ファイルを編集します。 + +> アドオン画面タブなどのember-osf-webが提供するViewを開いているときは、ember-osf-webで定義した `node-navbar` コンポーネントのテンプレート(後述)に従って表示されます。 + +アドオンリストの最後(Analytics(分析)の前)に表示する場合は、以下のように修正します。 + +```diff +@@ -43,7 +43,7 @@ + <!-- Add-on tabs --> + % for addon in addons_enabled: + +- % if addons[addon]['has_page']: ++ % if addon != 'myscreen' and addons[addon]['has_page']: + <li> + <a href="${node['url']}${addons[addon]['short_name']}"> + + % if addons[addon]['icon'] and addons[addon]['has_page_icon']: + <img src="${addons[addon]['icon']}" class="addon-logo"/> + % endif + ${addons[addon]['full_name']} + </a> + </li> + % endif + % endfor + ++ % if 'myscreen' in addons_enabled and addons['myscreen']['has_page']: ++ <li> ++ <a href="${node['url']}${addons['myscreen']['short_name']}"> ++ ++ % if addons['myscreen']['icon'] and addons['myscreen']['has_page_icon']: ++ <img src="${addons['myscreen']['icon']}" class="addon-logo"/> ++ % endif ++ ${addons['myscreen']['full_name']} ++ </a> ++ </li> ++ % endif ++ + % if project_analytics: + % if node['is_public'] or user['is_contributor_or_group_member']: + <li><a href="${node['url']}analytics/">${ _("Analytics") }</a></li> +``` + +変更例は、サンプル [project_header.mako](osf.io/website/templates/project/project_header.mako) を参照してください。 + +### アドオンのテスト + +以下のコマンドで、OSF.ioに追加したMy Screenアドオンのユニットテストを実行できます。 + +``` +$ docker compose run --rm web invoke test_module -m addons/myscreen/tests/ +``` + +## ember-osf-webへの実装 + +### 画面タブの実装 + +[画面タブの実装例(`ember-osf-web/app/guid-node/myscreen/`)](ember-osf-web/app/guid-node/myscreen/) を `app/guid-node/myscreen` ディレクトリにコピーします。 + +### myscreen-config モデルの定義 + +My Screenアドオンの画面タブでは、NodeSettingsの `param_1` プロパティに対応する `param1` プロパティを持つ、 `MyScreenConfig` モデルを定義して扱います。`MyScreenConfig` モデルと、アダプタ、シリアライザを、それぞれ以下のようにコピーします。 + +- [MyScreenConfigモデルの実装例](ember-osf-web/app/models/myscreen-config.ts) を `app/models/myscreen-config.ts` にコピーします。 +- [MyScreenConfigアダプタの実装例](ember-osf-web/app/adapters/myscreen-config.ts) を `app/adapters/myscreen-config.ts` にコピーします。 +- [MyScreenConfigシリアライザの実装例](ember-osf-web/app/serializers/myscreen-config.ts) を `app/serializers/myscreen-config.ts` にコピーします。 + +### テストコードの定義 + +画面タブに関するテストコード例と、テストに利用するMirageのコード例を、それぞれ以下のようにコピーします。 + +- [画面タブのコントローラの単体テストのコード例](ember-osf-web/tests/acceptance/guid-node/myscreen-test.ts) を `tests/acceptance/guid-node/myscreen-test.ts` にコピーします。 +- [画面タブの受け入れテストのコード例](ember-osf-web/tests/unit/guid-node/myscreen/controller-test.ts) を `tests/unit/guid-node/myscreen/controller-test.ts` にコピーします。 +- [MyScreenConfigのMirage Factoryコード例](ember-osf-web/mirage/factories/myscreen-config.ts) を `mirage/factories/myscreen-config.ts` にコピーします。 +- [MyScreenConfigのMirage Viewsコード例](ember-osf-web/mirage/views/myscreen-config.ts) を `mirage/views/myscreen-config.ts` にコピーします。 + +### RDMコードの変更 + +#### ルーティングの設定 + +[app/router.ts](https://github.com/RCOSDP/RDM-ember-osf-web/blob/develop/app/router.ts) に、アドオンの画面タブページへのルーティング設定を追加します。 + +``` +this.route('guid-node', { path: '--node/:guid' }, function() { + this.mount('analytics-page', { as: 'analytics' }); + this.route('forks'); + this.route('iqbrims'); + this.route('myscreen'); // 追加 + this.route('registrations'); + this.route('drafts', { path: '/drafts/:draftId' }, function() { + this.route('register'); + }); +}); +``` + +変更例は、サンプル [router.ts](ember-osf-web/app/router.ts) を参照してください。 + +#### ナビゲーションバー定義の変更 + +ember-osf-webが提供するViewから見えるプロジェクトのナビゲーションバーで、画面タブのリンクを表示するために、テンプレートファイル [lib/osf-components/addon/components/node-navbar/template.hbs](https://github.com/RCOSDP/RDM-ember-osf-web/blob/develop/lib/osf-components/addon/components/node-navbar/template.hbs) にコードを追加します。 + +``` +{{#if this.myscreenEnabled }} + {{node-navbar/link node=@node useLinkTo=false destination='myscreen'}} +{{/if}} +``` + +RDMでMy Screenアドオンが有効でないときはリンクを表示しないようにするために、コンポーネント定義ファイル [lib/osf-components/addon/components/node-navbar/component.ts](https://github.com/RCOSDP/RDM-ember-osf-web/blob/develop/lib/osf-components/addon/components/node-navbar/component.ts) に `myscreenEnabled` プロパティを追加します。 + +``` +@computed('node.addons.[]') +get myscreenEnabled(): Promise<boolean> | null { + if (!this.node) { + return null; + } + const node = this.node; + return (async () => { + const addons = await node.addons; + if (!addons) { + return false; + } + const myscreen = addons.filter(addon => addon.id === 'myscreen'); + return myscreen.length > 0; + })(); +} +``` + +ナビゲーションバーのテスト [tests/integration/components/node-navbar/component-test.ts](https://github.com/RCOSDP/RDM-ember-osf-web/blob/develop/tests/integration/components/node-navbar/component-test.ts) も修正します。 + +それぞれの変更例は、サンプル [template.hbs](ember-osf-web/lib/osf-components/addon/components/node-navbar/template.hbs) 、 [component.ts](ember-osf-web/lib/osf-components/addon/components/node-navbar/component.ts) 、 [component-test.ts](ember-osf-web/tests/integration/components/node-navbar/component-test.ts) を参照してください。 + +#### 国際化ファイルの変更 + +[translations/en-us.yml](https://github.com/RCOSDP/RDM-ember-osf-web/blob/develop/translations/en-us.yml) に、My Screenアドオンの画面タブで表示する文字列の国際化設定を追加します。 + +``` +myscreen: + page_title: '{nodeTitle} My Screen' + header: 'My Screen' + loading: 'Loading My Screen config...' + param1: 'Param 1' + save_button: 'Save' + failed_to_submit: 'Failed to save' + placeholders: + param1: 'anything' +``` + +変更例は、サンプル [en-us.yml](ember-osf-web/translations/en-us.yml) を参照してください。 + +#### Mirage定義の変更 + +追加したMirageコードを利用してAPIをモックするように、 [mirage/config.ts](https://github.com/RCOSDP/RDM-ember-osf-web/blob/develop/mirage/config.ts) に以下を追加します。 + +``` +this.get('/project/:id/myscreen/config', myscreenConfig); +``` + +変更例は、サンプル [config.ts](ember-osf-web/mirage/config.ts) を参照してください。 + +### docker-compose.override.yml の追加 + +変更したコードを使うように、RDMの `docker-compose.override.yml` で osf-ember-web サービスの `volumes` を指定します。 + +例えば、以下のようなディレクトリ階層の場合は、 + +``` +. +├── RDM-osf.io +│   ├── docker-compose.override.yml +│   └── docker-compose.yml +└── RDM-ember-osf-web +``` + +`RDM-osf.io/docker-compose.override.yml` の内容を以下のようにします。 + +``` +version: "3.4" + +services: + ember_osf_web: + volumes: + - ../RDM-ember-osf-web:/code +``` + +### 画面タブのテスト + +以下のコマンドで、ember-osf-webに追加したMy Screen 画面タブのテストを実行できます。 + +コントローラの単体テスト: + +``` +$ docker compose run --rm ember_osf_web yarn test --module 'Unit | Controller | guid-node/myscreen' +``` + +ナビゲーションバーの結合テスト: + +``` +$ docker compose run --rm ember_osf_web yarn test --module 'Integration | Component | node-navbar' +``` + +画面タブの受け入れテスト: + +``` +$ docker compose run --rm ember_osf_web yarn test --module 'Acceptance | guid-node/myscreen' +``` + +ファイルを指定してlintを実行するのは、以下のコマンドを実行します。 + +``` +$ docker compose run --rm ember_osf_web node_modules/.bin/eslint --ext js,ts --max-warnings=0 'app/guid-node/myscreen' 'app/**/myscreen-config.ts' 'app/router.ts' 'lib/osf-components/addon/components/node-navbar/component.ts' 'tests/integration/components/node-navbar/component-test.ts' 'mirage/config.ts' +$ docker compose run --rm ember_osf_web node_modules/.bin/tslint -p . 'app/guid-node/myscreen/**/*.ts' 'app/**/myscreen-config.ts' 'app/router.ts' 'lib/osf-components/addon/components/node-navbar/component.ts' 'tests/integration/components/node-navbar/component-test.ts' 'mirage/config.ts' +$ docker compose run --rm ember_osf_web node_modules/.bin/stylelint 'app/guid-node/myscreen/**/*.scss' +$ docker compose run --rm ember_osf_web node_modules/.bin/ember-template-lint 'app/guid-node/myscreen/**/*.hbs' 'lib/osf-components/addon/components/node-navbar/template.hbs' +``` + + +# My Screenアドオンの動作確認 + +My Screenアドオンの動作確認をしてみましょう。 + +## DBマイグレーション + +マイグレーションを実行し、Migrations定義をPostgreSQLサービスに反映します。 + +``` +$ docker compose run --rm web python3 manage.py migrate +``` + +## 国際化のコンパイル + +`.mako` ファイルの国際化設定を適用するために、国際化ファイルをコンパイルします。 + +``` +$ docker compose run --rm web pybabel compile -d ./website/translations +``` + +> `.js` ファイルの国際化設定は、 `assets` サービスの再起動時に適用されます。 + +## サービスの再起動 + +変更したファイルに関連するサービスを再起動します。 + +``` +$ docker compose restart assets web api ember_osf_web +``` + +これでサービスへの反映は完了です。 + +## ストレージアドオンを試す + +My Screenアドオンの有効化手順は、スケルトン アドオンと同様です。 +My Screenアドオンを有効化すると、プロジェクトダッシュボードにウィジェットが表示され、ナビゲーションバーに画面タブのリンクが表示されます。 + +![Project Dashboard](./images/project_dashboard.png) + +画面タブのリンクをクリックすると、画面タブのページを表示できます。 + +![Addon Tab](./images/addon_tab.png) + +ここで設定した `param_1` プロパティの値が、ウィジェットに表示されます。 + +以上でMy Screenアドオンの動作確認は完了です! diff --git a/docs/guides/screen-expansion/README.md b/docs/guides/screen-expansion/README.md new file mode 100644 index 0000000..96515f3 --- /dev/null +++ b/docs/guides/screen-expansion/README.md @@ -0,0 +1,99 @@ +# Screen Expansion Addon / 画面拡張アドオン + +> **Summary:** Guide to creating RDM screen expansion addons with dashboard widgets and page tabs +> **概要:** ダッシュボードウィジェットとページタブを持つ RDM 画面拡張アドオンを作成する手引き + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-06. **Learned:** Mako caches templates by file name in some RDM run modes, so sample templates must carry the addon name as a prefix (PR #14). / Mako は RDM の動作モードによってテンプレートをファイル名でキャッシュするため、サンプルのテンプレート名にはアドオン名の接頭辞が必要だと分かった(PR #14)。 +- Version / 版: 0.1 — 2026-11-05 +- Normative for: `docs/guides/screen-expansion/` +- Related: [SPEC-06 Documentation Conventions](../../spec/06_documentation_conventions.md) · [Skeleton Guide](../skeleton/README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Overview + +This guide shows how to create RDM screen expansion addons that add: + +- **Dashboard widgets**: Small UI elements on the project dashboard +- **Page tabs**: New pages accessible from the project navigation bar + +Screen expansion addons use Ember.js for the frontend and Django for the backend. + +### Prerequisites + +- Basic understanding of Python, Django, and JavaScript +- The development environment set up following the [Environment Guide](../environment/README.md) +- Completed the [Skeleton Addon Guide](../skeleton/README.md) + +### Quick start + +1. Create your addon using the skeleton as a base +2. Add widget template and configuration files +3. Add Ember.js page tab (route, controller, template) +4. Configure RDM to display your widget and tab +5. Test both the widget and page tab + +### Legacy content + +The legacy screen expansion addon instructions are kept verbatim in `README.legacy.md` for reference and will be rewritten per milestone. + +### Latest changes + +- **2026-11-06 — Mako template file names get the addon name as a prefix (PR #14).** In [`README.legacy.md`](README.legacy.md) and the sample code, `osf.io/addon/templates/node_settings.mako` is now [`myscreen_node_settings.mako`](osf.io/addon/templates/myscreen_node_settings.mako), and `osf.io/addon/apps.py` points to the new name. Reason: Mako (the template language used for the addon settings panel) caches templates by file name in some RDM run modes, so two addons that each ship a `node_settings.mako` can display the wrong panel. Incorporated from PR #14 by shun-nakazawa (2026-11-06). + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 概要 + +このガイドは、以下の機能を持つ RDM 画面拡張アドオンを作成する方法を示します: + +- **ダッシュボードウィジェット**: プロジェクトダッシュボード上の小さな UI 要素 +- **ページタブ**: プロジェクトのナビゲーションバーからアクセスできる新しいページ + +画面拡張アドオンは、フロントエンドに Ember.js、バックエンドに Django を使用します。 + +### 前提条件 + +- Python, Django, JavaScript の基本的な理解 +- [環境ガイド](../environment/README.md)に従って開発環境をセットアップしていること +- [スケルトンアドオンガイド](../skeleton/README.md)を完了していること + +### クイックスタート + +1. スケルトンをベースにアドオンを作成する +2. ウィジェットのテンプレートと設定ファイルを追加する +3. Ember.js のページタブ(ルート、コントローラー、テンプレート)を追加する +4. RDM を設定してウィジェットとタブを表示する +5. ウィジェットとページタブの両方をテストする + +### 過去のコンテンツ + +過去の画面拡張アドオンの手順は、参考のために `README.legacy.md` にそのまま残しており、マイルストーンごとに書き直す予定です。 + +### 最近の変更 + +- **2026-11-06 — mako テンプレートのファイル名の先頭にアドオン名を付ける(PR #14)。** [`README.legacy.md`](README.legacy.md) とサンプルコードで、`osf.io/addon/templates/node_settings.mako` は [`myscreen_node_settings.mako`](osf.io/addon/templates/myscreen_node_settings.mako) になり、`osf.io/addon/apps.py` も新しい名前を指します。理由: Mako(アドオン設定画面のテンプレート言語)は RDM の動作モードによってテンプレートをファイル名でキャッシュするため、`node_settings.mako` を持つアドオンが複数あると別のアドオンの画面が表示されることがあります。Incorporated from PR #14 by shun-nakazawa (2026-11-06). + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Screen expansion addon | An addon that adds new UI elements and pages to RDM. | RDM に新しい UI 要素とページを追加するアドオン。 | +| Dashboard widget | A small UI element displayed on the project dashboard. | プロジェクトダッシュボードに表示される小さな UI 要素。 | +| Page tab | A new page accessible from the project navigation bar. | プロジェクトのナビゲーションバーからアクセスできる新しいページ。 | +| Ember.js | A JavaScript framework for building interactive web applications. | インタラクティブなウェブアプリケーションを構築するための JavaScript フレームワーク。 | + diff --git a/ScreenExpansion/ember-osf-web/app/adapters/myscreen-config.ts b/docs/guides/screen-expansion/ember-osf-web/app/adapters/myscreen-config.ts similarity index 100% rename from ScreenExpansion/ember-osf-web/app/adapters/myscreen-config.ts rename to docs/guides/screen-expansion/ember-osf-web/app/adapters/myscreen-config.ts diff --git a/ScreenExpansion/ember-osf-web/app/guid-node/myscreen/controller.ts b/docs/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/controller.ts similarity index 100% rename from ScreenExpansion/ember-osf-web/app/guid-node/myscreen/controller.ts rename to docs/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/controller.ts diff --git a/ScreenExpansion/ember-osf-web/app/guid-node/myscreen/route.ts b/docs/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/route.ts similarity index 100% rename from ScreenExpansion/ember-osf-web/app/guid-node/myscreen/route.ts rename to docs/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/route.ts diff --git a/ScreenExpansion/ember-osf-web/app/guid-node/myscreen/styles.scss b/docs/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/styles.scss similarity index 100% rename from ScreenExpansion/ember-osf-web/app/guid-node/myscreen/styles.scss rename to docs/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/styles.scss diff --git a/ScreenExpansion/ember-osf-web/app/guid-node/myscreen/template.hbs b/docs/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/template.hbs similarity index 100% rename from ScreenExpansion/ember-osf-web/app/guid-node/myscreen/template.hbs rename to docs/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/template.hbs diff --git a/ScreenExpansion/ember-osf-web/app/models/myscreen-config.ts b/docs/guides/screen-expansion/ember-osf-web/app/models/myscreen-config.ts similarity index 100% rename from ScreenExpansion/ember-osf-web/app/models/myscreen-config.ts rename to docs/guides/screen-expansion/ember-osf-web/app/models/myscreen-config.ts diff --git a/ScreenExpansion/ember-osf-web/app/router.ts b/docs/guides/screen-expansion/ember-osf-web/app/router.ts similarity index 100% rename from ScreenExpansion/ember-osf-web/app/router.ts rename to docs/guides/screen-expansion/ember-osf-web/app/router.ts diff --git a/ScreenExpansion/ember-osf-web/app/serializers/myscreen-config.ts b/docs/guides/screen-expansion/ember-osf-web/app/serializers/myscreen-config.ts similarity index 100% rename from ScreenExpansion/ember-osf-web/app/serializers/myscreen-config.ts rename to docs/guides/screen-expansion/ember-osf-web/app/serializers/myscreen-config.ts diff --git a/ScreenExpansion/ember-osf-web/lib/osf-components/addon/components/node-navbar/component.ts b/docs/guides/screen-expansion/ember-osf-web/lib/osf-components/addon/components/node-navbar/component.ts similarity index 100% rename from ScreenExpansion/ember-osf-web/lib/osf-components/addon/components/node-navbar/component.ts rename to docs/guides/screen-expansion/ember-osf-web/lib/osf-components/addon/components/node-navbar/component.ts diff --git a/ScreenExpansion/ember-osf-web/lib/osf-components/addon/components/node-navbar/template.hbs b/docs/guides/screen-expansion/ember-osf-web/lib/osf-components/addon/components/node-navbar/template.hbs similarity index 100% rename from ScreenExpansion/ember-osf-web/lib/osf-components/addon/components/node-navbar/template.hbs rename to docs/guides/screen-expansion/ember-osf-web/lib/osf-components/addon/components/node-navbar/template.hbs diff --git a/ScreenExpansion/ember-osf-web/mirage/config.ts b/docs/guides/screen-expansion/ember-osf-web/mirage/config.ts similarity index 100% rename from ScreenExpansion/ember-osf-web/mirage/config.ts rename to docs/guides/screen-expansion/ember-osf-web/mirage/config.ts diff --git a/ScreenExpansion/ember-osf-web/mirage/factories/myscreen-config.ts b/docs/guides/screen-expansion/ember-osf-web/mirage/factories/myscreen-config.ts similarity index 100% rename from ScreenExpansion/ember-osf-web/mirage/factories/myscreen-config.ts rename to docs/guides/screen-expansion/ember-osf-web/mirage/factories/myscreen-config.ts diff --git a/ScreenExpansion/ember-osf-web/mirage/views/myscreen-config.ts b/docs/guides/screen-expansion/ember-osf-web/mirage/views/myscreen-config.ts similarity index 100% rename from ScreenExpansion/ember-osf-web/mirage/views/myscreen-config.ts rename to docs/guides/screen-expansion/ember-osf-web/mirage/views/myscreen-config.ts diff --git a/ScreenExpansion/ember-osf-web/tests/acceptance/guid-node/myscreen-test.ts b/docs/guides/screen-expansion/ember-osf-web/tests/acceptance/guid-node/myscreen-test.ts similarity index 100% rename from ScreenExpansion/ember-osf-web/tests/acceptance/guid-node/myscreen-test.ts rename to docs/guides/screen-expansion/ember-osf-web/tests/acceptance/guid-node/myscreen-test.ts diff --git a/ScreenExpansion/ember-osf-web/tests/integration/components/node-navbar/component-test.ts b/docs/guides/screen-expansion/ember-osf-web/tests/integration/components/node-navbar/component-test.ts similarity index 100% rename from ScreenExpansion/ember-osf-web/tests/integration/components/node-navbar/component-test.ts rename to docs/guides/screen-expansion/ember-osf-web/tests/integration/components/node-navbar/component-test.ts diff --git a/ScreenExpansion/ember-osf-web/tests/unit/guid-node/myscreen/controller-test.ts b/docs/guides/screen-expansion/ember-osf-web/tests/unit/guid-node/myscreen/controller-test.ts similarity index 100% rename from ScreenExpansion/ember-osf-web/tests/unit/guid-node/myscreen/controller-test.ts rename to docs/guides/screen-expansion/ember-osf-web/tests/unit/guid-node/myscreen/controller-test.ts diff --git a/ScreenExpansion/ember-osf-web/translations/en-us.yml b/docs/guides/screen-expansion/ember-osf-web/translations/en-us.yml similarity index 100% rename from ScreenExpansion/ember-osf-web/translations/en-us.yml rename to docs/guides/screen-expansion/ember-osf-web/translations/en-us.yml diff --git a/ScreenExpansion/images/addon_tab.png b/docs/guides/screen-expansion/images/addon_tab.png similarity index 100% rename from ScreenExpansion/images/addon_tab.png rename to docs/guides/screen-expansion/images/addon_tab.png diff --git a/ScreenExpansion/images/project_dashboard.png b/docs/guides/screen-expansion/images/project_dashboard.png similarity index 100% rename from ScreenExpansion/images/project_dashboard.png rename to docs/guides/screen-expansion/images/project_dashboard.png diff --git a/ScreenExpansion/osf.io/addon/__init__.py b/docs/guides/screen-expansion/osf.io/addon/__init__.py similarity index 100% rename from ScreenExpansion/osf.io/addon/__init__.py rename to docs/guides/screen-expansion/osf.io/addon/__init__.py diff --git a/docs/guides/screen-expansion/osf.io/addon/apps.py b/docs/guides/screen-expansion/osf.io/addon/apps.py new file mode 100644 index 0000000..4d65f1e --- /dev/null +++ b/docs/guides/screen-expansion/osf.io/addon/apps.py @@ -0,0 +1,51 @@ +# -*- coding: utf-8 -*- +import os +from addons.base.apps import BaseAddonAppConfig +from . import SHORT_NAME, FULL_NAME + + +HERE = os.path.dirname(os.path.abspath(__file__)) +TEMPLATE_PATH = os.path.join( + HERE, + 'templates' +) + + +class AddonAppConfig(BaseAddonAppConfig): + + short_name = SHORT_NAME + name = 'addons.{}'.format(SHORT_NAME) + label = 'addons_{}'.format(SHORT_NAME) + + full_name = FULL_NAME + + owners = ['node'] + + views = [ + # widget: ここから + 'widget', + # widget: ここまで + # ember: ここから + 'page' + # ember: ここまで + ] + + configs = ['node'] + + categories = ['other'] + + node_settings_template = os.path.join(TEMPLATE_PATH, 'myscreen_node_settings.mako') + + @property + def routes(self): + from . import routes + return [ + # ember: ここから + routes.page_routes, + # ember: ここまで + routes.api_routes + ] + + @property + def node_settings(self): + return self.get_model('NodeSettings') diff --git a/ScreenExpansion/osf.io/addon/migrations/__init__.py b/docs/guides/screen-expansion/osf.io/addon/migrations/__init__.py similarity index 100% rename from ScreenExpansion/osf.io/addon/migrations/__init__.py rename to docs/guides/screen-expansion/osf.io/addon/migrations/__init__.py diff --git a/ScreenExpansion/osf.io/addon/models.py b/docs/guides/screen-expansion/osf.io/addon/models.py similarity index 100% rename from ScreenExpansion/osf.io/addon/models.py rename to docs/guides/screen-expansion/osf.io/addon/models.py diff --git a/ScreenExpansion/osf.io/addon/requirements.txt b/docs/guides/screen-expansion/osf.io/addon/requirements.txt similarity index 100% rename from ScreenExpansion/osf.io/addon/requirements.txt rename to docs/guides/screen-expansion/osf.io/addon/requirements.txt diff --git a/ScreenExpansion/osf.io/addon/routes.py b/docs/guides/screen-expansion/osf.io/addon/routes.py similarity index 100% rename from ScreenExpansion/osf.io/addon/routes.py rename to docs/guides/screen-expansion/osf.io/addon/routes.py diff --git a/ScreenExpansion/osf.io/addon/settings/__init__.py b/docs/guides/screen-expansion/osf.io/addon/settings/__init__.py similarity index 100% rename from ScreenExpansion/osf.io/addon/settings/__init__.py rename to docs/guides/screen-expansion/osf.io/addon/settings/__init__.py diff --git a/ScreenExpansion/osf.io/addon/settings/defaults.py b/docs/guides/screen-expansion/osf.io/addon/settings/defaults.py similarity index 100% rename from ScreenExpansion/osf.io/addon/settings/defaults.py rename to docs/guides/screen-expansion/osf.io/addon/settings/defaults.py diff --git a/ScreenExpansion/osf.io/addon/static/comicon.png b/docs/guides/screen-expansion/osf.io/addon/static/comicon.png similarity index 100% rename from ScreenExpansion/osf.io/addon/static/comicon.png rename to docs/guides/screen-expansion/osf.io/addon/static/comicon.png diff --git a/ScreenExpansion/osf.io/addon/static/myscreen.css b/docs/guides/screen-expansion/osf.io/addon/static/myscreen.css similarity index 100% rename from ScreenExpansion/osf.io/addon/static/myscreen.css rename to docs/guides/screen-expansion/osf.io/addon/static/myscreen.css diff --git a/ScreenExpansion/osf.io/addon/static/node-cfg.js b/docs/guides/screen-expansion/osf.io/addon/static/node-cfg.js similarity index 100% rename from ScreenExpansion/osf.io/addon/static/node-cfg.js rename to docs/guides/screen-expansion/osf.io/addon/static/node-cfg.js diff --git a/ScreenExpansion/osf.io/addon/static/widget-cfg.js b/docs/guides/screen-expansion/osf.io/addon/static/widget-cfg.js similarity index 100% rename from ScreenExpansion/osf.io/addon/static/widget-cfg.js rename to docs/guides/screen-expansion/osf.io/addon/static/widget-cfg.js diff --git a/ScreenExpansion/osf.io/addon/templates/node_settings.mako b/docs/guides/screen-expansion/osf.io/addon/templates/myscreen_node_settings.mako similarity index 100% rename from ScreenExpansion/osf.io/addon/templates/node_settings.mako rename to docs/guides/screen-expansion/osf.io/addon/templates/myscreen_node_settings.mako diff --git a/ScreenExpansion/osf.io/addon/tests/__init__.py b/docs/guides/screen-expansion/osf.io/addon/tests/__init__.py similarity index 100% rename from ScreenExpansion/osf.io/addon/tests/__init__.py rename to docs/guides/screen-expansion/osf.io/addon/tests/__init__.py diff --git a/ScreenExpansion/osf.io/addon/tests/conftest.py b/docs/guides/screen-expansion/osf.io/addon/tests/conftest.py similarity index 100% rename from ScreenExpansion/osf.io/addon/tests/conftest.py rename to docs/guides/screen-expansion/osf.io/addon/tests/conftest.py diff --git a/ScreenExpansion/osf.io/addon/tests/factories.py b/docs/guides/screen-expansion/osf.io/addon/tests/factories.py similarity index 100% rename from ScreenExpansion/osf.io/addon/tests/factories.py rename to docs/guides/screen-expansion/osf.io/addon/tests/factories.py diff --git a/ScreenExpansion/osf.io/addon/tests/test_model.py b/docs/guides/screen-expansion/osf.io/addon/tests/test_model.py similarity index 100% rename from ScreenExpansion/osf.io/addon/tests/test_model.py rename to docs/guides/screen-expansion/osf.io/addon/tests/test_model.py diff --git a/ScreenExpansion/osf.io/addon/tests/test_view.py b/docs/guides/screen-expansion/osf.io/addon/tests/test_view.py similarity index 100% rename from ScreenExpansion/osf.io/addon/tests/test_view.py rename to docs/guides/screen-expansion/osf.io/addon/tests/test_view.py diff --git a/ScreenExpansion/osf.io/addon/tests/utils.py b/docs/guides/screen-expansion/osf.io/addon/tests/utils.py similarity index 100% rename from ScreenExpansion/osf.io/addon/tests/utils.py rename to docs/guides/screen-expansion/osf.io/addon/tests/utils.py diff --git a/ScreenExpansion/osf.io/addon/utils.py b/docs/guides/screen-expansion/osf.io/addon/utils.py similarity index 100% rename from ScreenExpansion/osf.io/addon/utils.py rename to docs/guides/screen-expansion/osf.io/addon/utils.py diff --git a/ScreenExpansion/osf.io/addon/views.py b/docs/guides/screen-expansion/osf.io/addon/views.py similarity index 100% rename from ScreenExpansion/osf.io/addon/views.py rename to docs/guides/screen-expansion/osf.io/addon/views.py diff --git a/ScreenExpansion/osf.io/config/Dockerfile b/docs/guides/screen-expansion/osf.io/config/Dockerfile similarity index 100% rename from ScreenExpansion/osf.io/config/Dockerfile rename to docs/guides/screen-expansion/osf.io/config/Dockerfile diff --git a/ScreenExpansion/osf.io/config/addons.json b/docs/guides/screen-expansion/osf.io/config/addons.json similarity index 100% rename from ScreenExpansion/osf.io/config/addons.json rename to docs/guides/screen-expansion/osf.io/config/addons.json diff --git a/ScreenExpansion/osf.io/config/api/base/settings/defaults.py b/docs/guides/screen-expansion/osf.io/config/api/base/settings/defaults.py similarity index 100% rename from ScreenExpansion/osf.io/config/api/base/settings/defaults.py rename to docs/guides/screen-expansion/osf.io/config/api/base/settings/defaults.py diff --git a/ScreenExpansion/osf.io/config/framework/addons/data/addons.json b/docs/guides/screen-expansion/osf.io/config/framework/addons/data/addons.json similarity index 100% rename from ScreenExpansion/osf.io/config/framework/addons/data/addons.json rename to docs/guides/screen-expansion/osf.io/config/framework/addons/data/addons.json diff --git a/ScreenExpansion/osf.io/website/project/views/node.py b/docs/guides/screen-expansion/osf.io/website/project/views/node.py similarity index 100% rename from ScreenExpansion/osf.io/website/project/views/node.py rename to docs/guides/screen-expansion/osf.io/website/project/views/node.py diff --git a/ScreenExpansion/osf.io/website/templates/project/project.mako b/docs/guides/screen-expansion/osf.io/website/templates/project/project.mako similarity index 100% rename from ScreenExpansion/osf.io/website/templates/project/project.mako rename to docs/guides/screen-expansion/osf.io/website/templates/project/project.mako diff --git a/ScreenExpansion/osf.io/website/templates/project/project_header.mako b/docs/guides/screen-expansion/osf.io/website/templates/project/project_header.mako similarity index 100% rename from ScreenExpansion/osf.io/website/templates/project/project_header.mako rename to docs/guides/screen-expansion/osf.io/website/templates/project/project_header.mako diff --git a/ScreenExpansion/osf.io/website/templates/util/render_addon_widget.mako b/docs/guides/screen-expansion/osf.io/website/templates/util/render_addon_widget.mako similarity index 100% rename from ScreenExpansion/osf.io/website/templates/util/render_addon_widget.mako rename to docs/guides/screen-expansion/osf.io/website/templates/util/render_addon_widget.mako diff --git a/ScreenExpansion/osf.io/website/translations/en/LC_MESSAGES/js_messages.po b/docs/guides/screen-expansion/osf.io/website/translations/en/LC_MESSAGES/js_messages.po similarity index 100% rename from ScreenExpansion/osf.io/website/translations/en/LC_MESSAGES/js_messages.po rename to docs/guides/screen-expansion/osf.io/website/translations/en/LC_MESSAGES/js_messages.po diff --git a/ScreenExpansion/osf.io/website/translations/en/LC_MESSAGES/messages.po b/docs/guides/screen-expansion/osf.io/website/translations/en/LC_MESSAGES/messages.po similarity index 100% rename from ScreenExpansion/osf.io/website/translations/en/LC_MESSAGES/messages.po rename to docs/guides/screen-expansion/osf.io/website/translations/en/LC_MESSAGES/messages.po diff --git a/ScreenExpansion/osf.io/website/translations/ja/LC_MESSAGES/js_messages.po b/docs/guides/screen-expansion/osf.io/website/translations/ja/LC_MESSAGES/js_messages.po similarity index 100% rename from ScreenExpansion/osf.io/website/translations/ja/LC_MESSAGES/js_messages.po rename to docs/guides/screen-expansion/osf.io/website/translations/ja/LC_MESSAGES/js_messages.po diff --git a/ScreenExpansion/osf.io/website/translations/ja/LC_MESSAGES/messages.mo b/docs/guides/screen-expansion/osf.io/website/translations/ja/LC_MESSAGES/messages.mo similarity index 100% rename from ScreenExpansion/osf.io/website/translations/ja/LC_MESSAGES/messages.mo rename to docs/guides/screen-expansion/osf.io/website/translations/ja/LC_MESSAGES/messages.mo diff --git a/ScreenExpansion/osf.io/website/translations/ja/LC_MESSAGES/messages.po b/docs/guides/screen-expansion/osf.io/website/translations/ja/LC_MESSAGES/messages.po similarity index 100% rename from ScreenExpansion/osf.io/website/translations/ja/LC_MESSAGES/messages.po rename to docs/guides/screen-expansion/osf.io/website/translations/ja/LC_MESSAGES/messages.po diff --git a/ScreenExpansion/osf.io/website/translations/js_messages.pot b/docs/guides/screen-expansion/osf.io/website/translations/js_messages.pot similarity index 100% rename from ScreenExpansion/osf.io/website/translations/js_messages.pot rename to docs/guides/screen-expansion/osf.io/website/translations/js_messages.pot diff --git a/ScreenExpansion/osf.io/website/translations/messages.pot b/docs/guides/screen-expansion/osf.io/website/translations/messages.pot similarity index 100% rename from ScreenExpansion/osf.io/website/translations/messages.pot rename to docs/guides/screen-expansion/osf.io/website/translations/messages.pot diff --git a/docs/guides/skeleton/README.legacy.md b/docs/guides/skeleton/README.legacy.md new file mode 100644 index 0000000..dc7bcba --- /dev/null +++ b/docs/guides/skeleton/README.legacy.md @@ -0,0 +1,353 @@ +# スケルトンの作成 + +アドオン開発の第一歩として、以下のような単純な機能を持つ「スケルトン」アドオンを実装します。 + +スケルトンは以下の機能を持つものとします。 + +- 任意のプロジェクトにてスケルトンを有効化可能 +- スケルトンは `param_1` というパラメータを持ち、プロジェクトごとに異なる値を設定することができる +- `param_1` パラメータはプロジェクトのアドオン設定画面で設定することができる + +## 前提条件 + +本ドキュメントの実施にあたり、以下の前提条件を満たしているものとします。 + +* [RDM-osf.ioリポジトリ](https://github.com/RCOSDP/RDM-osf.io)をフォークし、ローカル環境にcloneしていること + * 特に指定がない限りはdevelopブランチからアドオン開発用ブランチ(例えば、 `feature/myskelton-addon`)を作成し作業する + * アドオン開発用ブランチには定期的にdevelopブランチをpullして変更を取り込む +* cloneしたアドオン開発用ブランチで、 [開発環境の準備](../Environment.md#開発環境でRDMを起動する) のガイドに従い、開発用RDMを起動していること + +# RDMアドオンの設計 + +## ファイルの構成 + +RDMにおいてアドオンは[Django](https://www.djangoproject.com/)アプリケーションの形式で記述されます。以下のようなファイルおよびクラスから構成されます。 + +![クラス構成](./images/class.png) + +典型的なファイル配置は以下のようになります。 + +``` +/addons/アドオン名/ +├── __init__.py ... モジュールの定義 +├── apps.py ... アプリケーションの定義 +├── models.py ... モデルの定義 +├── requirements.txt ... 利用するPythonモジュールの定義 +├── routes.py ... View(Routes)の定義 +├── settings ... 設定を定義するモジュール。ここにlocal.pyを配置することでカスタマイズできる。 +│ ├── defaults.py ... デフォルト設定の定義 +│ └── __init__.py ... 設定の定義 +├── static ... Webブラウザから読み込むことを想定した静的ファイル +│ ├── comicon.png ... アドオンのアイコン +│ └── node-cfg.js ... Node設定を定義するJavaScriptファイル +├── templates ... テンプレートディレクトリ +│ └── <アドオン名>_node_settings.mako ... Node設定パネル +├── tests ... テストコード +│ ├── conftest.py +│ ├── factories.py +│ ├── test_model.py +│ ├── test_view.py +│ └── utils.py +└── views.py ... View(Views)の定義 +``` + +## アドオンのモジュール構成 + +アドオンはDjangoの作法に従い、Model-Viewアーキテクチャにより実装します。それぞれの責務は以下のように分担されます。 + +- Model ... ユーザとNode(プロジェクト)それぞれに対応したモデルを実装する。それぞれのモデルには認証情報やプロジェクト固有の情報を格納することができる +- View ... アドオンに応じた設定、データ取得、保存処理など、HTTP上のエンドポイント(パス)を定義する + +Modelはフレームワークにより自動的にそれぞれの利用者、プロジェクトに対応して生成、管理され、永続化されるのに対し、Viewはアプリケーションがロードされる際に構築されます。 +フレームワークによりそれぞれのライフサイクルが適切に管理されるので、アドオン開発者は機能面の実装に注力することができます。 + +### Modelの構成 + +Node(プロジェクト)に関する情報や、ユーザごとの情報(認証情報等)を記録、管理したい場合、Modelを定義します。 + +UserSettingsは利用者ごとにインスタンスが生成され、永続化されます。また、NodeSettingsはプロジェクトごとにインスタンスが生成、永続化されます。これらのインスタンスの生成や破棄をアドオンのコードが行うことは原則としてありません。 + +スケルトンの場合、以下のようにNodeに関するModelを定義します。 + +- [addons.myskelton.NodeSettings](addon/models.py) + +NodeSettingsは永続化すべきプロパティと、各種setterとgetterを定義しています。 + +### Viewの構成 + +Viewは[FlaskのPluggable Views](http://flask.pocoo.org/docs/0.10/views/)のように、サービス上のパスと処理の関係を定義します。定義はRoutesとViewsの2種類の要素から構成されます。 + +- Routes ... View処理をどのパスにマッピングし、どのような形式で出力するか。出力にはJSON形式や、HTMLのテンプレートを指定することができる +- Views ... View処理の内容 + +Routesは以下のようにパスとMethod(GET, POST, PUT, DELETE, ...)と、その組み合わせに対してどの関数を実行するか、その実行結果をどのように出力するかを定義します。 + +各View処理には、その処理の実行における前提をPythonのデコレータの形で記述することができます。指定可能なデコレータには以下のようなものがあります。 + +- `framework.auth.decorators.must_be_logged_in` ... ユーザがログインしている状態である場合にのみ呼び出し可能であることを宣言する。引数にはauthパラメータが追加され、認証しているユーザに関する情報を得ることができる +- `website.project.decorators.must_have_addon` ... アドオンに関する情報を必要とすることを宣言する。第1引数にはアドオン名を(例では `myskelton`)、第2引数には'user'か'node'のいずれかを定義する。('node'にした場合は、パスは /project/<pid>/ から始める必要がある) +- `website.project.decorators.must_have_permission` ... 必要なパーミッションを宣言する。引数には'write', 'read', 'admin'のいずれかを指定する。 + + +スケルトンの場合、以下のようにRoutesとViewsを定義します。 + +- [api_routes](addon/routes.py) +- [myskelton_get_config, myskelton_set_config](addon/views.py) + +コンテキストに応じてデコレータを宣言しておくことで、Viewの処理の中でModel(利用者が操作対象としているUserやNode)を参照することができます。 + +### フレームワークによって提供されるView + +Routes, Viewsを使うことでさまざまなAPIやインタフェースを定義することができますが、アドオンが持つ利用者用設定画面(認証情報の入力画面)とプロジェクト用設定画面(プロジェクトでアドオンを有効化した場合の設定画面)はフレームワークによってあらかじめテンプレート化されています。 + +- [<アドオン名>_node_settings.mako](addon/templates/myskelton_node_settings.mako) + +このファイルは、テンプレート言語 [mako](https://www.makotemplates.org/) で記述されます。 +`mako` ファイルのファイル名の先頭にはアドオン名を書きます。 + +テンプレートを動的に操作するためのJavaScriptのライブラリにはKnockout.jsを利用することができます。JavaScriptコードについては、アドオンのstaticディレクトリにて定義することができます。 + +- [node-cfg.js](addon/static/node-cfg.js) + +また、staticディレクトリにはアドオンのアイコンを定義する必要があります。 + +- [comicon.png](addon/static/comicon.png) + +### 設定モジュール + +アドオンの動作を環境によりカスタマイズ可能にするため、settingsモジュールを用意します。 + +- [settings](addon/settings/) + +[RDMのアプリケーション設定](../Environment.md#基本的な流れ)と同様に、settingsディレクトリ内に `local.py` ファイルを定義することで、アドオンの動作をカスタマイズできるようになります。 +設定値は `defaults.py` で定義します。スケルトンの場合、以下のように定義します。 + +- [defaults.py](addon/settings/defaults.py) + +### テストコード + +アドオンのユニットテストを定義します。スケルトンの場合、以下のようにModelのテスト(`test_model.py`)とViewのテスト(`test_view.py`)を定義しています。 + +- [tests](addon/tests) + +### Migrations定義 + +Migrationsファイルは、Modelの内容をRDBのテーブルに対応づけをするために使用します。Modelの内容はバージョンによって変化しますから、各バージョンごとに適切にテーブルの変更がなされるよう、Migrationsファイルを適切に定義する必要があります。 +スケルトンの場合、空の `__init__.py` を定義しています。 + +- [migrations](addon/migrations/) + +[Migrationsファイルの作成](#Migrationsファイルの作成)にて作成方法を説明します。 + +# スケルトン アドオンの実装 + +ここでは、 `myskelton` という識別名のアドオンの実装を例に説明します。 + +## addons.myskelton モジュールの定義 + +[スケルトンコードの例](addon/)を `addons/myskelton` ディレクトリにコピーします。[ファイルの構成](#ファイルの構成)で示したツリー構造となるようにコピーしてください。 + +このスケルトンでは、アドオン名(識別名)を`myskelton`としています。 +識別名はモジュール名と一致させる必要がありますので、`myskelton`以外の名前にしたい場合は、`addons/(識別名)` ディレクトリに[スケルトンコード](addon/)を配置するようにしてください。 + +また、この名前を変更したい場合は、以下のコードを変更する必要があります。 + +- [SHORT_NAME(Python)](addon/__init__.py) +- [SHORT_NAME(JavaScript)](addon/static/node-cfg.js) +- [view関数のプレフィックス(myskelton_*)](addon/views.py) - [参照元](addon/routes.py) + +また、アドオンの完全名を `My Skelton` としています。これは、Web UIでの表示等に使われます。この名前を変更したい場合は、以下のコードを変更する必要があります。 + +- [AddonAppConfig.full_name](addon/apps.py) + +## RDMコードの変更 + +追加したアドオンをRDMに認識させるために、RDMのコードをいくつか変更します。 + +### addons.json の変更 + +[addons.json](https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons.json) に、アドオンに関する情報を追加します。このファイルはJSONファイル形式であり、キーごとに以下の値を登録します。 + +変更例はサンプル [addons.json](config/addons.json) を参照してください。 + +- `addons` ... 利用可能なアドオン一覧。必ず登録する +- `addons_default` ... プロジェクト作成時にデフォルトで有効になるアドオン一覧 +- `addons_archivable` ... アドオンごとのアーカイブに関する情報 +- `addons_commentable` ... コメント可能なアドオン一覧 +- `addons_description` ... アドオン名と説明の定義 + + ``` + "myskelton": "My Skelton Addon is ..." + ``` + +- `addons_url` ... アドオンの関連URLの定義 + + ``` + "myskelton": "https://dummy.nii.ac.jp/myskelton" + ``` + +### framework/addons/data/addons.json の変更 + +[framework/addons/data/addons.json](https://github.com/RCOSDP/RDM-osf.io/blob/develop/framework/addons/data/addons.json) に、アドオン登録時のメッセージリソースを登録します。 +`addons` オブジェクトに、アドオンの完全名(`AddonAppConfig.full_name` に相当)をキーとして情報を登録します。 + +変更例はサンプル [addons.json](config/framework/addons/data/addons.json) を参照してください。 + +> この定義ファイルの内容は画面表示のためだけに利用され、動作には影響しません。 + +``` +"My Skelton": { + "Permissions": { + "status": "none", + "text": "The GakuNin RDM does not affect the permissions of My Skelton." + }, + "View / download file versions": { + "status": "none", + "text": "The My Skelton add-on does not provide Storage Features." + }, + "Add / update files": { + "status": "none", + "text": "The My Skelton add-on does not provide Storage Features." + }, + "Delete files": { + "status": "none", + "text": "The My Skelton add-on does not provide Storage Features." + }, + "Logs": { + "status": "none", + "text": "The My Skelton add-on does not provide Storage Features." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component copies information about linked My Skelton but the GakuNin RDM does not affect authentication of My Skelton." + }, + "Registering": { + "status": "none", + "text": "My Skelton information will not be registered." + } +} +``` + +このメッセージの国際化については [国際化メッセージファイルの作成](#国際化メッセージファイルの作成)を参照してください。 + +### Dockerfile の変更 + +[Dockerfile](https://github.com/RCOSDP/RDM-osf.io/blob/develop/Dockerfile) に、アドオン関連のファイルコピー定義を追加します。 + +変更例はサンプル [Dockerfile](config/Dockerfile) を参照してください。 + + +- requirements.txtのコピー + ``` + COPY ./addons/myskelton/requirements.txt ./addons/myskelton/ + ``` + +- staticディレクトリの変更 + ``` + COPY ./addons/myskelton/static/ ./addons/myskelton/static/ + ``` + +### api/base/settings/defaults.py への追加 + +[api/base/settings/defaults.py](https://github.com/RCOSDP/RDM-osf.io/blob/develop/api/base/settings/defaults.py) の `INSTALLED_APPS` にアドオン名を追加します。 + +変更例はサンプル [defaults.py](config/api/base/settings/defaults.py) を参照してください。 + +``` +'addons.myskelton', +``` + +## Migrationsファイルの作成 + +Modelで定義したプロパティがRDBに保存されるよう、`makemigrations`コマンドを実行します。このコマンドを実行すると、 `addons/myskelton/migrations` にPythonファイルが作成されます。 + +``` +$ docker compose run --rm web python3 manage.py makemigrations +``` + +上記の出力中に以下の出力が現れれば成功です。現れない場合、RDMがアドオンを認識していない可能性があります。特に`addons.json`, `api/base/settings/defaults.py`の設定が漏れていないかどうかを確認してください。 + +``` +Migrations for 'addons_myskelton': + addons/myskelton/migrations/0001_initial.py + - Create model NodeSettings +``` + +## 国際化メッセージファイルの作成 + +国際化メッセージファイルの定義ファイルは以下のコマンドで生成することができます。 + +> このセクションの実施時は各サービスを停止状態にしてください。 + +``` +# framework/addons/data/addons.jsonに定義されたメッセージをJavaScriptファイルへと変換する +$ docker compose run --rm web python3 -m scripts.generate_addons_translations + +# メッセージ定義テンプレートファイル website/translations/js_messages.pot を更新する +$ docker compose run --rm web pybabel extract -F ./website/settings/babel_js.cfg -o ./website/translations/js_messages.pot . + +# メッセージ定義ファイル website/translations/ja/LC_MESSAGES/js_messages.po を更新する +$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/en/LC_MESSAGES/js_messages.po -l en +$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/ja/LC_MESSAGES/js_messages.po -l ja +``` + +上記を実行すると、`website/translations/ja/LC_MESSAGES/js_messages.po`にある英語メッセージと日本語メッセージの対応づけが更新されます。 +変更例のサンプル [js_messages.po](config/website/translations/ja/LC_MESSAGES/js_messages.po) を参考に日本語メッセージを追加してください。 + +``` +#: scripts/translations/messages_addonsJson.js:45 +msgid "" +"\n" +"\n" +"<h3>My Skelton Add-on Terms</h3>\n" +"\n" +... +msgstr "" +"\n" +"\n" +"<h3>My Skelton アドオン規約</h3>\n" +"\n" +"<table class=\"table table-bordered table-addon-terms\">\n" +... +``` + +このメッセージを追加後、`assets`サービスの再起動時にメッセージ定義が反映されます。 + +## スケルトンのテスト + +これでアドオンのコードの作成は完了です。以下のコマンドで追加した `addons/myskelton` のユニットテストを実行してみましょう。 + +``` +$ docker compose run --rm web invoke test_module -m addons/myskelton/tests/ +``` + +# スケルトン アドオンの動作確認 + +スケルトン アドオンを動作確認をしてみましょう。 +アドオンには新規に定義されたModelが含まれていますので、Migrations定義をサービス中のPostgreSQLサービスに反映しましょう。 + +``` +$ docker compose run --rm web python3 manage.py migrate +``` + +また、新規にJavaScriptファイルを追加したので、新たなファイルがロード対象となるように、`RDM-osf.io`をイメージとしたサービスの再起動を実施します。 + +``` +$ docker compose restart assets web api +``` + +これでサービスへの反映は完了です。スケルトン アドオンを試すには、以下のような操作を実施します。 + +1. RDM Web UIにアクセスする `http://localhost:5000` +1. 適当なプロジェクトを作成する + ![Create Project](./images/create-project.png) + +1. Add-onsページを開く +1. My Skeltonアドオンを有効化する + ![Enable Addon](./images/enable-addon.png) + +これで、`myskelton_node_settings.mako`で定義したNode設定画面が現れます。テキストボックスに入力した値が `param_1` プロパティに反映される様子が確認できるはずです。 + +![Addon](./images/enabled-addon.png) + +以上でスケルトンアドオンの動作確認は完了です! diff --git a/docs/guides/skeleton/README.md b/docs/guides/skeleton/README.md new file mode 100644 index 0000000..8e46639 --- /dev/null +++ b/docs/guides/skeleton/README.md @@ -0,0 +1,99 @@ +# Skeleton Addon / スケルトンアドオン + +> **Summary:** Guide to creating your first RDM addon using the skeleton template +> **概要:** スケルトンテンプレートを使用して最初の RDM アドオンを作成する手引き + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-06. **Learned:** Mako caches templates by file name in some RDM run modes, so sample templates must carry the addon name as a prefix (PR #14). / Mako は RDM の動作モードによってテンプレートをファイル名でキャッシュするため、サンプルのテンプレート名にはアドオン名の接頭辞が必要だと分かった(PR #14)。 +- Version / 版: 0.1 — 2026-11-05 +- Normative for: `docs/guides/skeleton/` +- Related: [SPEC-06 Documentation Conventions](../../spec/06_documentation_conventions.md) · [Environment Guide](../environment/README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Overview + +This guide shows how to create your first RDM addon using the skeleton template. A skeleton addon is a simple addon with basic features that you can customize to build your own functionality. + +The skeleton addon has the following capabilities: + +- Can be enabled in any project +- Has a parameter `param_1` that can be set differently for each project +- The `param_1` parameter can be configured in the project's addon settings page + +### Prerequisites + +- A fork of the [RDM-osf.io repository](https://github.com/RCOSDP/RDM-osf.io) +- The development environment set up following the [Environment Guide](../environment/README.md) + +### Quick start + +1. Copy the skeleton code to `addons/your-addon-name` +2. Update the addon name in all required files +3. Modify RDM code to register your addon (addons.json, Dockerfile, etc.) +4. Run migrations and restart services +5. Enable your addon in a project and test it + +### Legacy content + +The legacy skeleton addon instructions are kept verbatim in `README.legacy.md` for reference and will be rewritten per milestone. + +### Latest changes + +- **2026-11-06 — Mako template file names get the addon name as a prefix (PR #14).** In [`README.legacy.md`](README.legacy.md) and the sample code, `addon/templates/node_settings.mako` is now [`myskelton_node_settings.mako`](addon/templates/myskelton_node_settings.mako), and `addon/apps.py` points to the new name. Reason: Mako (the template language used for the addon settings panel) caches templates by file name in some RDM run modes, so two addons that each ship a `node_settings.mako` can display the wrong panel. Incorporated from PR #14 by shun-nakazawa (2026-11-06). + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 概要 + +このガイドは、スケルトンテンプレートを使用して最初の RDM アドオンを作成する方法を示します。スケルトンアドオンは、カスタマイズして独自の機能を構築できる基本的な機能を持つシンプルなアドオンです。 + +スケルトンの機能は以下の通りです: + +- 任意のプロジェクトで有効化可能 +- `param_1` というパラメータを持ち、プロジェクトごとに異なる値を設定可能 +- `param_1` パラメータはプロジェクトのアドオン設定画面で設定可能 + +### 前提条件 + +- [RDM-osf.io リポジトリ](https://github.com/RCOSDP/RDM-osf.io)をフォークしていること +- [環境ガイド](../environment/README.md)に従って開発環境をセットアップしていること + +### クイックスタート + +1. スケルトンコードを `addons/アドオン名` にコピーする +2. すべての必要なファイルでアドオン名を更新する +3. RDM のコードを修正してアドオンを登録する(addons.json, Dockerfile など) +4. マイグレーションを実行してサービスを再起動する +5. プロジェクトでアドオンを有効化してテストする + +### 過去のコンテンツ + +過去のスケルトンアドオンの手順は、参考のために `README.legacy.md` にそのまま残しており、マイルストーンごとに書き直す予定です。 + +### 最近の変更 + +- **2026-11-06 — mako テンプレートのファイル名の先頭にアドオン名を付ける(PR #14)。** [`README.legacy.md`](README.legacy.md) とサンプルコードで、`addon/templates/node_settings.mako` は [`myskelton_node_settings.mako`](addon/templates/myskelton_node_settings.mako) になり、`addon/apps.py` も新しい名前を指します。理由: Mako(アドオン設定画面のテンプレート言語)は RDM の動作モードによってテンプレートをファイル名でキャッシュするため、`node_settings.mako` を持つアドオンが複数あると別のアドオンの画面が表示されることがあります。Incorporated from PR #14 by shun-nakazawa (2026-11-06). + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Addon | A small program that adds new features to RDM. | RDM に新しい機能を追加する小さなプログラム。 | +| Skeleton | A template or sample code that you can customize to build your own program. | 独自のプログラムを構築するためにカスタマイズできるテンプレートやサンプルコード。 | +| Parameter | A value that you can change to modify how the addon works. | アドオンの動作を変更するために変更できる値。 | +| Migration | A script that updates the database when you change the data structure. | データ構造を変更したときにデータベースを更新するスクリプト。 | + diff --git a/Skelton/addon/__init__.py b/docs/guides/skeleton/addon/__init__.py similarity index 100% rename from Skelton/addon/__init__.py rename to docs/guides/skeleton/addon/__init__.py diff --git a/docs/guides/skeleton/addon/apps.py b/docs/guides/skeleton/addon/apps.py new file mode 100644 index 0000000..064c7eb --- /dev/null +++ b/docs/guides/skeleton/addon/apps.py @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +""" +本アドオンの各種プロパティを定義する +""" + +import os +from addons.base.apps import BaseAddonAppConfig +from . import SHORT_NAME + + +HERE = os.path.dirname(os.path.abspath(__file__)) +TEMPLATE_PATH = os.path.join( + HERE, + 'templates' +) + + +# `__init__.py` の `default_app_config` により本ファイル内の`AddonAppConfig`が参照される +class AddonAppConfig(BaseAddonAppConfig): + + short_name = SHORT_NAME + name = 'addons.{}'.format(SHORT_NAME) + label = 'addons_{}'.format(SHORT_NAME) + + full_name = 'My Skelton' + + owners = ['node'] + + views = [] + configs = ['node'] + + categories = ['other'] + + include_js = {} + + include_css = {} + + node_settings_template = os.path.join(TEMPLATE_PATH, 'myskelton_node_settings.mako') + + @property + def routes(self): + from . import routes + return [routes.api_routes] + + @property + def node_settings(self): + return self.get_model('NodeSettings') diff --git a/Skelton/addon/migrations/__init__.py b/docs/guides/skeleton/addon/migrations/__init__.py similarity index 100% rename from Skelton/addon/migrations/__init__.py rename to docs/guides/skeleton/addon/migrations/__init__.py diff --git a/Skelton/addon/models.py b/docs/guides/skeleton/addon/models.py similarity index 100% rename from Skelton/addon/models.py rename to docs/guides/skeleton/addon/models.py diff --git a/Skelton/addon/requirements.txt b/docs/guides/skeleton/addon/requirements.txt similarity index 100% rename from Skelton/addon/requirements.txt rename to docs/guides/skeleton/addon/requirements.txt diff --git a/Skelton/addon/routes.py b/docs/guides/skeleton/addon/routes.py similarity index 100% rename from Skelton/addon/routes.py rename to docs/guides/skeleton/addon/routes.py diff --git a/Skelton/addon/settings/__init__.py b/docs/guides/skeleton/addon/settings/__init__.py similarity index 100% rename from Skelton/addon/settings/__init__.py rename to docs/guides/skeleton/addon/settings/__init__.py diff --git a/Skelton/addon/settings/defaults.py b/docs/guides/skeleton/addon/settings/defaults.py similarity index 100% rename from Skelton/addon/settings/defaults.py rename to docs/guides/skeleton/addon/settings/defaults.py diff --git a/Skelton/addon/static/comicon.png b/docs/guides/skeleton/addon/static/comicon.png similarity index 100% rename from Skelton/addon/static/comicon.png rename to docs/guides/skeleton/addon/static/comicon.png diff --git a/Skelton/addon/static/node-cfg.js b/docs/guides/skeleton/addon/static/node-cfg.js similarity index 100% rename from Skelton/addon/static/node-cfg.js rename to docs/guides/skeleton/addon/static/node-cfg.js diff --git a/Skelton/addon/templates/node_settings.mako b/docs/guides/skeleton/addon/templates/myskelton_node_settings.mako similarity index 100% rename from Skelton/addon/templates/node_settings.mako rename to docs/guides/skeleton/addon/templates/myskelton_node_settings.mako diff --git a/Skelton/addon/tests/__init__.py b/docs/guides/skeleton/addon/tests/__init__.py similarity index 100% rename from Skelton/addon/tests/__init__.py rename to docs/guides/skeleton/addon/tests/__init__.py diff --git a/Skelton/addon/tests/conftest.py b/docs/guides/skeleton/addon/tests/conftest.py similarity index 100% rename from Skelton/addon/tests/conftest.py rename to docs/guides/skeleton/addon/tests/conftest.py diff --git a/Skelton/addon/tests/factories.py b/docs/guides/skeleton/addon/tests/factories.py similarity index 100% rename from Skelton/addon/tests/factories.py rename to docs/guides/skeleton/addon/tests/factories.py diff --git a/Skelton/addon/tests/test_model.py b/docs/guides/skeleton/addon/tests/test_model.py similarity index 100% rename from Skelton/addon/tests/test_model.py rename to docs/guides/skeleton/addon/tests/test_model.py diff --git a/Skelton/addon/tests/test_view.py b/docs/guides/skeleton/addon/tests/test_view.py similarity index 100% rename from Skelton/addon/tests/test_view.py rename to docs/guides/skeleton/addon/tests/test_view.py diff --git a/Skelton/addon/tests/utils.py b/docs/guides/skeleton/addon/tests/utils.py similarity index 100% rename from Skelton/addon/tests/utils.py rename to docs/guides/skeleton/addon/tests/utils.py diff --git a/Skelton/addon/views.py b/docs/guides/skeleton/addon/views.py similarity index 100% rename from Skelton/addon/views.py rename to docs/guides/skeleton/addon/views.py diff --git a/Skelton/config/Dockerfile b/docs/guides/skeleton/config/Dockerfile similarity index 100% rename from Skelton/config/Dockerfile rename to docs/guides/skeleton/config/Dockerfile diff --git a/Skelton/config/addons.json b/docs/guides/skeleton/config/addons.json similarity index 100% rename from Skelton/config/addons.json rename to docs/guides/skeleton/config/addons.json diff --git a/Skelton/config/api/base/settings/defaults.py b/docs/guides/skeleton/config/api/base/settings/defaults.py similarity index 100% rename from Skelton/config/api/base/settings/defaults.py rename to docs/guides/skeleton/config/api/base/settings/defaults.py diff --git a/Skelton/config/framework/addons/data/addons.json b/docs/guides/skeleton/config/framework/addons/data/addons.json similarity index 100% rename from Skelton/config/framework/addons/data/addons.json rename to docs/guides/skeleton/config/framework/addons/data/addons.json diff --git a/Skelton/config/website/translations/ja/LC_MESSAGES/js_messages.po b/docs/guides/skeleton/config/website/translations/ja/LC_MESSAGES/js_messages.po similarity index 100% rename from Skelton/config/website/translations/ja/LC_MESSAGES/js_messages.po rename to docs/guides/skeleton/config/website/translations/ja/LC_MESSAGES/js_messages.po diff --git a/Skelton/images/class.png b/docs/guides/skeleton/images/class.png similarity index 100% rename from Skelton/images/class.png rename to docs/guides/skeleton/images/class.png diff --git a/Skelton/images/class.uml b/docs/guides/skeleton/images/class.uml similarity index 100% rename from Skelton/images/class.uml rename to docs/guides/skeleton/images/class.uml diff --git a/Skelton/images/create-project.png b/docs/guides/skeleton/images/create-project.png similarity index 100% rename from Skelton/images/create-project.png rename to docs/guides/skeleton/images/create-project.png diff --git a/Skelton/images/enable-addon.png b/docs/guides/skeleton/images/enable-addon.png similarity index 100% rename from Skelton/images/enable-addon.png rename to docs/guides/skeleton/images/enable-addon.png diff --git a/Skelton/images/enabled-addon.png b/docs/guides/skeleton/images/enabled-addon.png similarity index 100% rename from Skelton/images/enabled-addon.png rename to docs/guides/skeleton/images/enabled-addon.png diff --git a/docs/guides/storage-addon/README.legacy.md b/docs/guides/storage-addon/README.legacy.md new file mode 100644 index 0000000..b7a0664 --- /dev/null +++ b/docs/guides/storage-addon/README.legacy.md @@ -0,0 +1,878 @@ +# ストレージアドオンの作成 + +具体的なストレージアドオンの例として、[NextCloud](https://nextcloud.com/)と接続するストレージアドオンを実装します。このアドオンをNextCloudアドオンと名付け、`nextcloud_plugin`という独立したPythonパッケージとして実装します。 + +本ドキュメントは以下の流れで構成されています。 + +1. **[開発環境の準備](#開発環境の準備)**: osf.io・GravyValet・WaterButler・angular-osf からなる開発環境を、[Caddy](https://caddyserver.com/)による単一オリジンプロキシとともに起動します。 +2. **[ストレージアドオンの設計](#ストレージアドオンの設計)**: ストレージアドオンを構成する3要素(osf.io Addon / GravyValet Addon Imp / WaterButler Provider)とその実装方法を説明します。 +3. **[ストレージアドオンの利用方法](#ストレージアドオンの利用方法)**: 作成したアドオンを各サービスにインストール・設定します。 +4. **[NextCloud アドオンの動作確認](#nextcloud-アドオンの動作確認)**: NextCloud を接続先として、実際にファイル操作を試します。 + +本ガイドと合わせて、実装済みの参考例である [`nextcloud_plugin`](https://github.com/chiku-samugari/nextcloud_plugin) のソースコードを参照することを推奨します。 + +# 開発環境の準備 + +ストレージアドオンの開発に先立って、開発環境の準備方法を説明します。開発環境は以下の5つの要素から構成されます。 + +- **osf.io**: バックエンドの中核。ユーザ情報を保持し、WebサーバとAPIサーバを提供します。`osf.io` ディレクトリの Compose プロジェクトとして起動します。 +- **GravyValet**: アドオンについての情報(接続先サービス・認証情報・設定)を管理します。`gravyvalet` ディレクトリの Compose プロジェクトとして起動します。 +- **WaterButler**: ストレージサービスへのファイルアクセスを担います。`waterbutler` ディレクトリのCompose プロジェクトとして起動します。 +- **angular-osf**: フロントエンド。`angular-osf` ディレクトリで `ng serve` により起動します。 +- **Caddy**: 上記4サービスを単一オリジン(`http://localhost`)に束ねるリバースプロキシ(Dockerコンテナとして起動)。 + +このように、バックエンドを [osf.io](https://github.com/CenterForOpenScience/osf.io)・[GravyValet](https://github.com/CenterForOpenScience/gravyvalet)・[WaterButler](https://github.com/CenterForOpenScience/waterbutler) が、フロントエンドを [angular-osf](https://github.com/CenterForOpenScience/angular-osf) が担います。 +[`RDM-osf.io` を中心とした従来の構成](../Environment.md)では、バックエンドとフロントエンド、すべてのサービスが1つの`docker-compose[.override].yml`(単一のComposeプロジェクト)にまとめられていましたが、本構成ではosf.io・GravyValet・WaterButler ・angular-osfはそれぞれ独立したリポジトリで扱い、それぞれのディレクトリで独立したDocker Composeプロジェクトとして起動します(angular-osfは`ng serve`(開発サーバ)で起動します)。 +ブラウザから見ると、これらは本来別々のオリジンで動作します。しかしosf.io の認証(セッションCookie、CASのログイン往復、同一オリジンへのリダイレクト制約)は、フロントエンドとバックエンドが単一のオリジンで提供されることを前提としています。そこで開発環境では、[Caddy](https://caddyserver.com/)による**単一オリジンのリバースプロキシ**を`http://localhost`に立て、アクセスを各サービスへ振り分けます。 + +![単一オリジンプロキシによるルーティング(ブラウザ → Caddy → 各サービス)](images/proxy-routing.png) + +> **ブラウザ向けURLと、コンテナ間URLは別物です。** ブラウザ向けURLは `http://localhost`(Caddy 経由)に統一しますが、コンテナ間の通信(DB・CAS検証・サーバサイドのAPI/WB呼び出しなど)は、ループバックエイリアス `192.168.168.167`(osf.io のローカル開発の慣例)を用います。単一オリジンにするのは *ブラウザ向け* のみです。 + +## 前提条件・共通の準備 + +開発環境に以下のソフトウェアを準備します。 + +- **Docker**と**Docker Compose** +- **Node.js**と`npx` +- osf.io・GravyValet・WaterButler・angular-osf の各リポジトリを取得 +- **ループバックエイリアス `192.168.168.167`** を設定 + + ```bash + $ sudo ifconfig lo:0 192.168.168.167 netmask 255.255.255.255 up + ``` + +以降で追加する設定は、新規ユーザの登録に関するスイッチの既定値を指定するために編集する`features.yaml`以外はリポジトリにコミットされない**上書き用ファイル**(`docker-compose.override.yml`, `.docker-compose.local.env`, `config.json`, `Caddyfile` など)に記述します。追跡対象のファイルは upstream の値のまま変更しません。 + +## osf.io の準備と起動 + +`osf.io`ディレクトリで作業します。 + +### 設定の上書き + +まずWebサーバとAPIサーバに関するDjangoの設定ファイル`local.py`を準備します。特に変更の必要がなければ、それぞれの`local-dist.py`をコピーして使用します。 +```bash +$ cp api/base/settings/local-dist.py api/base/settings/local.py +$ cp website/settings/local-dist.py website/settings/local.py +``` + +`web` / `api` / `worker`は`.docker-compose.env`を読み込みます。このファイルはリポジトリの保持する内容から変えず、上書き用のenvファイル`.docker-compose.local.env`を以下の内容で作成します。 + +```dotenv +DOMAIN=http://localhost/ +API_DOMAIN=http://localhost/ +WATERBUTLER_URL=http://localhost +``` + +また、このファイルを`web` / `api` / `worker`が読み込むようにサービスの設定を上書きします。これも同様に、`osf.io/docker-compose.yml`を変更するのではなく、`osf.io/docker-compose.override.yml`を作ることで設定を上書きします。`osf.io/docker-compose.override.yml`を以下の内容で作成します。 + +```yaml +services: + web: + env_file: [.docker-compose.env, .docker-compose.local.env] + api: + env_file: [.docker-compose.env, .docker-compose.local.env] + worker: + env_file: [.docker-compose.env, .docker-compose.local.env] +``` + +### ライブラリのインストールとMigration + +ライブラリのインストールとMigrationを実行するコマンドを実行します。1つ目については依存するライブラリが変更されたとき、2つ目についてはモデルなどのDB定義の定義に変更があった際に実行する必要があります。サービスの起動毎に毎回実行する必要があるものではありません。 + +```bash +# ライブラリのインストール(初回/依存定義の変更時) +$ docker compose up requirements + +# DBのMigration(初回/DB定義の変更時) +$ docker compose run --rm web python3 manage.py migrate +``` + +### サービスの起動 + +以下のコマンドでストレージサービスアドオンの開発に必要なサービスを起動します。 + +```bash +$ docker compose up -d assets fakecas worker web api +``` + +新規ユーザの登録を行なう場合は `mailhog` が必要な場合があるので、これを追加して起動します。これについて詳細は[「新規ユーザの登録とメール確認」](#新規ユーザの登録とメール確認)を参照してください。。 + +```bash +$ docker compose up -d assets fakecas worker web api mailhog +``` + +また、管理者機能が必要な場合には、`admin`と`admin_assets`を追加して起動してください。 + +```bash +$ docker compose up -d assets fakecas worker web api admin_assets admin +``` + +## GravyValet の準備と起動 + +`gravyvalet` ディレクトリで作業します。まず以下の内容で`docker-compose.override.yml`を作成します。 + +```yaml +services: + gravyvalet: + environment: + OSF_BASE_URL: "http://localhost" + celeryworker: + environment: + OSF_BASE_URL: "http://localhost" + celerybeat: + environment: + OSF_BASE_URL: "http://localhost" + postgres: + image: postgres:17 +``` + +GravyValetには`local.py`のフックがなく、環境変数がフックです。環境変数`OSF_BASE_URL`から、受理するリソースURIの接頭辞(`ALLOWED_RESOURCE_URI_PREFIXES`)を導出します。プロキシのオリジンを指定し、プロジェクト(`http://localhost/<guid>`)のリソースを認識させます。一方、`OSF_API_BASE_URL`はそのままにします。こちらはGravyValetがosf.io API を呼ぶ際に`192.168.168.167`エイリアス経由で使う値であり、ブラウザ向けではありません。 + +また、`docker-compose.yml`では`postgres`サービスのイメージとして`postgres:latest`を指定しており、起動できないケースが確認されています。`postgres:17`を指定しているのはそのための対処です。 + +続いて以下のコマンドで初期化を実施します。 + +```bash +$ docker compose up -d --build +$ docker compose exec gravyvalet python manage.py migrate +$ docker compose exec gravyvalet python manage.py fill_external_services +$ docker compose exec gravyvalet python manage.py createsuperuser +``` + +`migrate`はMigrationの実行で、初回以外にもモデルの追加や変更があったときに実行します。`fill_external_services`はGravyValetのコードベースに組み込まれているアドオン実装からExternalServiceを一通り作るコマンドで、組み込まれているストレージアドオン(S3やGoogleDriveなど)を利用することができるようになりますが、必須ではありません。`createsuperuser`によりGravyValetの管理者を作成し、`localhost:8004/admin`にブラウザでアクセスしてExternalServiceを追加することもできます。本ドキュメントで作成するアドオンからもExternalServiceを作る必要があるので、この管理者を作ることは必須です。普段の起動は`docker compose up -d`のみで十分です。 + +### 補足 + +- GravyValetのコンテナは`gravyvalet`という名前です。例えば、GravyValetのログは以下のようにして確認することができます。 + ```bash + $ docker compose logs -f waterbutler + ``` + +- Postgresは`postgres`コンテナで動作しており、DBを直接見たい場合はユーザを`postgres`、DBとして`gravyvalet`を指定します。 + ```bash + $ docker compose exec postgres psql -U postgres -W gravyvalet + ``` + +## WaterButler の準備と起動 + +`waterbutler` ディレクトリで作業します。WaterButlerリポジトリには`docker-compose.yml`が含まれていません。以下の内容の`docker-compose.yml`を作成します。 + +```yaml +services: + waterbutler: + build: + context: . + command: > + bash -c " + gosu www-data /code/.venv/bin/python -m invoke server + " + restart: unless-stopped + env_file: + - .docker-compose.env + ports: + - 7777:7777 + volumes: + - ./:/code:cached + - /code/.venv + stdin_open: true + depends_on: + - celery + + celery: + build: + context: . + command: + gosu www-data /code/.venv/bin/python -m invoke celery + restart: unless-stopped + environment: + C_FORCE_ROOT: 1 + env_file: + - .docker-compose.env + stdin_open: true +``` + +続いて、以下のコマンドで起動します。 + +```bash +$ docker compose up -d --build +``` + +### 補足 + +- WaterButlerのコンテナは`waterbutler`という名前です。例えばWaterButlerのログは以下のコマンドで確認することができます。 + ```bash + $ docker compose logs -f waterbutler + ``` + +## angular-osf の準備と起動 + +`angular-osf` ディレクトリで作業します。まず依存パッケージをインストールします。これは初回だけ実行します。 + +```bash +$ npm install +``` + +次に`src/assets/config/config.json`を以下の内容で作成します。このファイルは`.gitignore`によりgit管理から外されている設定ファイルです。これがないとangular-osfはステージング環境を指します。 + +```json +{ + "webUrl": "http://localhost", + "apiDomainUrl": "http://localhost", + "addonsApiUrl": "http://localhost/v1", + "casUrl": "http://localhost:8080", + "recaptchaSiteKey": "<recaptcha-site-key>", + "sentryDsn": "", + "googleTagManagerId": "", + "newRelicEnabled": false +} +``` + +開発サーバは **`development`** 構成で起動します(i.e. `src/environments/environment.development.ts`)。 + +```bash +$ npx ng serve --configuration development --host 0.0.0.0 --port 4200 --poll 2000 +``` + +## Caddyを用いた単一オリジンプロキシの起動 + +任意の場所に `Caddyfile`というファイルを以下の内容で作成します。 + +```caddyfile +{ + admin off + auto_https off +} + +http://localhost { + # osf.io API (Django, :8000) + @api path /v2 /v2/* /_/* + handle @api { reverse_proxy 127.0.0.1:8000 } + + # WaterButler (ファイル操作) — /v1 より前に置くこと(GravyValet は /v1/resource-references を使う) + @wb path /v1/resources/* + handle @wb { reverse_proxy 127.0.0.1:7777 } + + # GravyValet (アドオンサービス, Django, :8004) + @gv path /v1 /v1/* + handle @gv { reverse_proxy 127.0.0.1:8004 } + + # GravyValet のアドオンアイコン + @gvicons path /static/provider_icons/* /static/*/icons/* + handle @gvicons { reverse_proxy 127.0.0.1:8004 } + + # osf.io web + CAS (Flask, :5000) — /confirm は新規ユーザのメール確認リンク(後述) + @flask path /login /login/* /logout /logout/* /oauth /oauth/* /api/v1 /api/v1/* /download /download/* /confirm /confirm/* + handle @flask { reverse_proxy 127.0.0.1:5000 } + + # angular-osf の開発サーバ (:4200) — Host は "localhost" のまま(localhost:4200 に書き換えない) + handle { reverse_proxy 127.0.0.1:4200 } +} +``` + +このファイルが配置されたディレクトリで以下のコマンドを実行することで起動します。 + +```bash +$ docker run -d --name osf-proxy --restart unless-stopped --network host -v "$PWD/Caddyfile:/etc/caddy/Caddyfile:ro" caddy:2 +``` + +## 起動手順のまとめ + +ここまでに述べた内容は、開発環境を初めて構成するときに必要な初期化を含んでおり、手順の多くは初めて構成するときにのみ必要なものです。そのような手順を省くと以下の通りになります。初回以外はこの手順により開発環境を立ち上げることができます。 + +```bash +# 0) ループバックエイリアス +$ sudo ifconfig lo:0 192.168.168.167 netmask 255.255.255.255 up + +# 1) バックエンド +$ cd /path/to/osf.io && docker compose up -d assets fakecas worker web api # mailhog, admin, admin_assetsは必要に応じて追加 +$ cd /path/to/gravyvalet && docker compose up -d +$ cd /path/to/waterbutler && docker compose up -d + +# 2) angular-osf の開発サーバ(別ターミナルで起動、コンパイルに十数秒かかる) +$ cd /path/to/angular-osf +$ npx ng serve --configuration development --host 0.0.0.0 --port 4200 --poll 2000 + +# 3) プロキシ +$ cd /path/to/Caddyfile +$ docker start osf-proxy # 初回は「単一オリジンプロキシ」の docker run を使用 +``` + +## Web UIを開く・動作確認 + +ブラウザで **http://localhost/** を開きます。osf.io のホームページが表示され、`Sign in` から fakecas を経由してサインインできます。ダッシュボード・プロジェクト・ファイルの参照まで、すべて単一の `http://localhost` オリジンで提供されます。 + +簡易的なヘルスチェック: + +```bash +$ curl -s -o /dev/null -w '%{http_code}\n' http://localhost/ # 200 (angular-osf) +$ curl -s -o /dev/null -w '%{http_code}\n' http://localhost/v2/ # 200 (API) +``` + +## 新規ユーザの登録とメール確認 + +以前からosf.ioを利用してローカルに開発環境を整備していて、既にユーザを登録済みの場合、そのような既存ユーザは fakecas 経由で引き続きサインインできます。しかし、現在のosf.ioで **新規にユーザを登録** するには、確認メールの仕組みに追加の準備が必要です。osf.io の通知(Notification)基盤が刷新され確認メールの送信経路が変わったため、ローカル環境では以下の3点を揃える必要があります。 + +### MailHog と `enable_mailhog` スイッチ + +確認メールは ローカル用のダミーSMTPサーバであるMailHog で受け取ります。加えて `enable_mailhog` の waffle スイッチを有効化します。これが無効(既定)のままだと送信は SendGrid 経路となり、ローカルにはAPIキーがないため送信時に例外が発生します。この例外により登録リクエストのトランザクションがロールバックされ、 **未確認ユーザ自体が作成されません** 。 + +`osf/features.yaml` の該当スイッチ(`enable_mailhog`)を `active: true` に変更し、以下で反映します。 + +```bash +$ docker compose run --rm web python3 manage.py manage_switch_flags +``` + +> `manage.py waffle_switch enable_mailhog on` でも一時的に有効化できますが、`migrate` のたびに `features.yaml` の値(既定は無効)にリセットされます。 + +以上を実施した後、ブラウザで`http://localhost`にアクセスして "Sign Up" ボタンから新規ユーザの登録を実行できます。ただし、登録確認のためにアクセスするURLは `web` コンテナのログから探し出してアクセスする必要があります。`web` コンテナのログから最新の確認URLだけを取り出すには次のようにします。 + +```bash +$ docker compose logs web | grep -oE 'http://localhost/confirm/[A-Za-z0-9]+/[A-Za-z0-9]+/' | tail -1 +``` + +一般的なユーザ登録の流れでは、ユーザが登録時に提出したメールアドレスにこの確認用URLを含むメールが送信され、ユーザはこのURLを入手することになります。このためのメール本文を生成し、メールを確認するためには[次節](#通知テンプレートの投入)を実施してください。 + +### 通知テンプレートの投入 + +ユーザ登録確認メールの件名と本文は DBの `NotificationType` レコードのテンプレートから生成されますが、新規のDBではテンプレートが空のため、 **本文が空・件名が `None`** のメールになります。以下のコマンドで、`notifications.yaml` と各テンプレートファイルから内容をDBに投入します。 + +```bash +$ docker compose run --rm web python3 manage.py populate_notification_types +``` + +> **2時間キャッシュに注意。** `NotificationType` はアプリのプロセス内で最大2時間キャッシュされます(`ttl_cached_property`)。確認メールは web プロセス内で同期的に送信されるため、テンプレート投入前に一度でも確認メールを送っていると、投入後もしばらく空メールが送られ続けます。投入後はアプリのコンテナを再起動してキャッシュを破棄してください(初回登録より前に投入を済ませていれば再起動は不要です)。 + +```bash +$ docker compose restart web api worker # osf.io ディレクトリで実行 +``` + +> `features.yaml` の `populate_notification_types` スイッチは `migrate` 時の**自動投入**(`post_migrate` フック)を制御するもので、上記のようにコマンドを直接実行する場合は変更不要です。投入されるのは `NotificationType` の **データ(行)** であり、waffle スイッチの状態とは異なり `migrate` で消えることはありません(一度投入すれば維持されます)。一方、前掲の `enable_mailhog` は送信のたびに参照される実行時スイッチであり、`migrate` で `features.yaml` の値に戻ります。したがって、`migrate `のたびに`enable_mailhog` を `true` にする手順を実施するか、`features.yaml` を変更して既定値を `true` にしておくことが必要になります。 + +### Caddy の `/confirm` ルート + +確認メールのリンク `http://localhost/confirm/<uid>/<token>/` は osf.io(Flask, :5000)が処理するルートです。「[Caddyを用いた単一オリジンプロキシの起動](#caddyを用いた単一オリジンプロキシの起動)」の `Caddyfile` では、この `/confirm` を `@flask` に含めています。含めないと angular-osf(SPA)側に振り分けられ、`/v2/guids/confirm/` として解決されようとして 404 になります。 + +### 動作確認 + +1. ブラウザで **http://localhost/** を開き、サインアップします。 +2. MailHogのWeb UI **http://localhost:8025** を開くと、件名 **「OSF Account Verification」** のメールが届いています。本文には確認URLが含まれているので、そのURLを開きます。 +3. Flask がメール確認を完了し、CAS(検証キー)によるログインを経てダッシュボードに遷移すれば成功です。 + +確認URLは、MailHog の Web UI のほか、`mailhog` コンテナのログからも取得できます(ログを追う運用に慣れている場合に便利です)。MailHog は受信したメール本文をログに出力するため、「[通知テンプレートの投入](#通知テンプレートの投入)」を済ませて本文が生成されていれば、以下のように最新の確認URLを取り出せます。 + +```bash +$ docker compose logs mailhog | grep -oE 'http://localhost/confirm/[A-Za-z0-9]+/[A-Za-z0-9]+/' | tail -1 +``` + +以上で開発環境の準備は完了です。 + +# ストレージアドオンの設計 + +## ストレージアドオンの構成 + +1つのストレージサービスを扱うために以下の**3要素**を実装します。 + +- **osf.io Addon**: osf.io上で動作するDjangoアプリケーション。ファイルとフォルダのモデルを持ち、アドオンの登録を担います。 +- **GravyValet Addon Imp**: GravyValet上で動作するDjangoアプリケーション。フォルダ内容の一覧やWaterButler向け設定の生成を担います。 +- **WaterButler Provider**: WaterButler上で動作する実装。実際のストレージへのアクセス、すなわちファイルの取得や移動・名称変更・削除といった処理を担います。 + +これら3要素を1つの独立したPythonパッケージにまとめ、各サービス(osf.io / GravyValet / WaterButler)へ`pip` / `poetry`でインストールして利用します。`osf.io` / `GravyValet` / `WaterButler`のソースコード内にアドオンを埋め込む必要はありません。実装済みの参考例としてNextCloudと接続するストレージアドオンである[`nextcloud_plugin`](https://github.com/chiku-samugari/nextcloud_plugin)パッケージとS3互換ストレージと接続するストレージアドオン[`s3compat_plugin`](https://github.com/chiku-samugari/s3compat_plugin)パッケージがあります。 + +> GravyValet導入前は「osf.io Addon」と「WaterButler Provider」の2要素でしたが、GravyValetの導入により「Addon Imp」が加わりました。Addon Impは通常はGravyValet本体に組み込まれますが、本ガイドではGravyValet本体を変更せずに動的にAddon Impを追加できる**Foreign Addon Imp**の仕組みを利用します。 + +![ストレージアドオン構成(1つのパッケージを3サービスへインストール)](images/architecture.png) + +## ファイルの構成 + +ストレージアドオンの典型的なレイアウトは以下のようになります。`nextcloud_plugin` を例としています。 + +``` +nextcloud_plugin/ +├── pyproject.toml ... パッケージ定義、依存関係の宣言、WaterButlerエントリポイントの定義 +├── README.md +└── src/nextcloud_plugin/ + ├── addon/ ... osf.io Addonパッケージ + ├── addon_imp/ ... GravyValet Addon Impパッケージ + └── provider/ ... WaterButler Providerパッケージ +``` + +### osf.io Addon のファイル構成 + +``` +src/nextcloud_plugin/addon/ +├── __init__.py ... パッケージ初期化ファイル +├── apps.py ... アプリケーションの定義 +├── models.py ... FileNodeモデル3クラスと`UserSettings`, `NodeSettings`の定義 +├── provider.py ... 認証プロバイダの定義 +├── serializer.py ... Node/User設定をJSON化するシリアライザの定義 +├── routes.py / views.py ... View(Routes/Views)の定義 +├── settings/ ... 設定モジュール +│ ├── __init__.py +│ └── defaults.py ... デフォルト設定(ホストの Django settings から`getattr`で上書き可能) +├── typedmodel_workaround.py ... `TypedModelRejoinMixin`を提供 +└── migrations/ ... このaddonのMigration(パッケージに同梱する) +``` + +> ストレージアドオンではフロントエンドを提供しません。接続・設定・フォルダ選択・ファイルブラウズのUIは`angular-osf`と`GravyValet`が提供します。従来必要だったアドオンごとのmakoテンプレート(`node_settings.mako`等)、`*-cfg.js` / `*Config.js`、Fangornのカスタマイズ、ログ表示用JSON(`*LogActionList.json`)、`storageAddons.json`への登録、JavaScriptメッセージの国際化(pybabel)などは不要です。 + +### GravyValet Addon Impのファイル構成 + +``` +src/nextcloud_plugin/addon_imp/ +├── __init__.py +├── apps.py ... アプリケーションの定義 +├── imp.py ... AddonImpの実装 +└── static/{AppConfig.name}/icons/ ... アドオンのアイコンを配置するディレクトリ +``` + +### WaterButler Providerのファイル構成 + +``` +src/nextcloud_plugin/provider/ +├── __init__.py +├── provider.py ... Provider の定義 +├── metadata.py ... Metadata の定義 +├── settings.py ... デフォルト設定の定義 +└── utils.py ... (必要に応じて)ユーティリティ +``` + +## 識別名について + +ストレージアドオンでは1つのストレージサービスを表す**1つの識別名(例: `nextcloud`)**を3要素で一貫して使う必要があります。これらが一致していない場合、ファイル操作時にAddonやProviderの解決に失敗します。 + +| 識別子 | 場所 | 値の例 | +|:-------------------|:----------------------------------------------|:------------| +| `short_name` | osf.io AddonのAppConfig | `nextcloud` | +| `_provider` | osf.io AddonのFileNodeモデル | `nextcloud` | +| `addon_imp_name` | GravyValet Addon ImpのForeignAddonImpConfig | `NEXTCLOUD` | +| `wb_key` | GravyValet のExternalStorageService | `nextcloud` | +| エントリポイント名 | WaterButler Providerの`pyproject.toml` | `nextcloud` | + +より正確には以下の関係を満たす必要があります。 + +``` +short_name == _provider == addon_imp_name.lower() == wb_key == WaterButler エントリポイント名 +``` + +加えて、osf.io Addonにおいて以下の2つはいずれも`addons_<short_name>`という形式にする必要があります(例: `addons_nextcloud`)。 + ++ AppConfigの`label`クラス属性 ( 例: `NextcloudAddonAppConfig.label`) ++ FileNodeの`app_label`Metaオプション (例: `NextcloudFileNode.Meta.app_label`) + +## osf.io Addonのモジュール構成 + +### AppConfig + +`apps.py`に、`BaseAddonAppConfig`を継承した`AppConfig`を定義し、`name`、`short_name`([前章](#識別名について)を参照)、`label`(= `addons_<short_name>`)、`full_name`(画面表示用)を設定します。さらに、`ready()`メソッドで`rejoin_models()`を呼び出します。 + +NextCloudの場合は、`nextcloud_plugin`パッケージの [`src/nextcloud_plugin/addon/apps.py`](https://github.com/chiku-samugari/nextcloud_plugin/blob/main/src/nextcloud_plugin/addon/apps.py) を参照してください。要点は以下のとおりです。 + +```python +class NextcloudAddonAppConfig(BaseAddonAppConfig): + name = 'nextcloud_plugin.addon' + short_name = 'nextcloud' + label = 'addons_nextcloud' + full_name = 'Nextcloud' + categories = ['storage'] + # ... + + def ready(self): + super().ready() + from .models import NextcloudFileNode, NextcloudFile, NextcloudFolder + from .typedmodel_workaround import rejoin_models + rejoin_models(NextcloudFileNode, NextcloudFile, NextcloudFolder) +``` + +### Model の構成 + +`models.py`に以下のModelを定義します。 + +- `UserSettings`: ユーザーに関する情報(認証情報等) +- `NodeSettings`: プロジェクトに関する情報 +- `アドオン名FileNode`: ファイル・フォルダオブジェクトの親定義 +- `アドオン名File`: ファイルオブジェクトの定義 +- `アドオン名Folder`: フォルダオブジェクトの定義 + +ファイルノードの3クラス(`FileNode` / `File` / `Folder`)は、**明示的にプロキシモデル**として定義し、TypedModelに再登録する必要があります。具体的には以下のようにします。 + +- `アドオン名FileNode` の基底クラスに `TypedModelRejoinMixin` を含める。 +- 3 クラスとも `Meta.proxy = True` を指定する。 +- `アドオン名FileNode` に `_provider = '<short_name>'`、`db_owner = 'osf'`、`Meta.app_label = 'addons_<short_name>'` を設定する。 + +この手順に従うことで、[AppConfig.ready()](#appconfig)で呼び出す`rejoin_models()`がTypedModelへの再登録を実施します。 + +```python +class NextcloudFileNode(TypedModelRejoinMixin, BaseFileNode): + _provider = 'nextcloud' + db_owner = 'osf' + class Meta: + proxy = True + app_label = 'addons_nextcloud' + +class NextcloudFolder(NextcloudFileNode, Folder): + class Meta: + proxy = True + +class NextcloudFile(NextcloudFileNode, File): + version_identifier = 'version' + class Meta: + proxy = True +``` + +> `BaseFileNode`クラスはTypedModelで管理されていますが、そのままではMigrationがosf.io側に生成されてしまい、ストレージアドオンを独立したPythonパッケージとして配布できません。プロキシモデルに明示的な`app_label`を与えるとMigrationがストレージアドオン側に生成されますが、TypedModelはこのようなクラスの管理を止めてしまいます。`TypedModelRejoinMixin`と`ready()`内の`rejoin_models()`により、これらのクラスを`db_owner`(= `osf`)をキーとしてTypedModelのレジストリへ再登録し、この問題を回避しています。詳細は`nextcloud_plugin`の[`src/nextcloud_plugin/addon/typedmodel_workaround.py`](https://github.com/chiku-samugari/nextcloud_plugin/blob/main/src/nextcloud_plugin/addon/typedmodel_workaround.py)を参照してください。 + +`UserSettings`と`NodeSettings`は、OAuth認証をしない場合であってもそれぞれ`BaseOAuthUserSettings`と`BaseOAuthNodeSettings`(`NodeSettings`はさらに`BaseStorageAddon`)を継承し、`oauth_provider`に認証プロバイダクラス(`アドオン名Provider`)を指定します。認証プロバイダクラスは`provider.py`に定義します(`models.py`に定義されている場合もあります)。OAuthを用いる場合は`osf.models.external.ExternalProvider`を、ユーザー名・パスワードなどを用いる場合は`osf.models.external.BasicAuthProviderMixin`を継承します。NextCloudはWebDAVのユーザー名・パスワード認証を用いるため、後者を使用します。 + +NextCloudアドオンでの具体例は`nextcloud_plugin`パッケージの以下のファイルを参照してください。 + +- [`src/nextcloud_plugin/addon/models.py`](https://github.com/chiku-samugari/nextcloud_plugin/blob/main/src/nextcloud_plugin/addon/models.py) +- [`src/nextcloud_plugin/addon/provider.py`](https://github.com/chiku-samugari/nextcloud_plugin/blob/main/src/nextcloud_plugin/addon/provider.py) + +### シリアライザ + +`serializer.py`に`アドオン名Serializer`(`addons.base.serializer.StorageAddonSerializer`を継承)を定義します。これは、アドオンの`NodeSettings` / `UserSettings`を、設定画面やAPIが扱えるJSON形式に変換するものです。次節「Viewの構成」で用いる`addons.base.generic_views`は、このシリアライザを介して設定情報を入出力します。 + +主にシリアライズする情報は以下のとおりです。 + +- **接続先フォルダ**(`serialized_folder`): プロジェクトに紐付けたフォルダの名前とパス。 +- **各種エンドポイントURL**(`addon_serialized_urls`): 認証情報の追加・一覧・インポート、認証解除、フォルダ一覧取得、設定保存などのURL。 +- **Node設定 / User設定**(`serialized_node_settings` / `serialized_user_settings`): 認証状態や接続先などの設定値。 + +また、`credentials_are_valid()`により、保存された認証情報が有効か(実際にストレージへ接続できるか)を検証します。 + +NextCloudアドオンでの具体例は[`src/nextcloud_plugin/addon/serializer.py`](https://github.com/chiku-samugari/nextcloud_plugin/blob/main/src/nextcloud_plugin/addon/serializer.py)を参照してください。 + + +### Viewの構成 + +`views.py`には、アドオンのアカウント設定やフォルダ取得などのエンドポイントを定義します。一部のViewは[シリアライザ](#シリアライザ)と`addons.base.generic_views`モジュールを利用することで簡潔に定義することができます。 + +```python +import_auth = addons.base.generic_views.import_auth(SHORT_NAME, Serializer) +``` + +`generic_views`で提供していないView処理を追加したい場合や、View処理をカスタマイズしたい場合は、以下のように`views.py`に個別の関数を定義します。 + +```python +@must_have_addon(SHORT_NAME, 'user') +@must_have_addon(SHORT_NAME, 'node') +def nextcloud_folder_list(node_addon, user_addon, **kwargs): + """ Returns all the subsequent folders under the folder id passed. + Not easily generalizable due to `path` kwarg. + """ + path = request.args.get('path') + return node_addon.get_folders(path=path) +``` + +NextCloud の場合の具体例は、`nextcloud_plugin` パッケージの以下のファイルを参照してください。 + +- [`src/nextcloud_plugin/addon/routes.py`](https://github.com/chiku-samugari/nextcloud_plugin/blob/main/src/nextcloud_plugin/addon/routes.py) +- [`src/nextcloud_plugin/addon/views.py`](https://github.com/chiku-samugari/nextcloud_plugin/blob/main/src/nextcloud_plugin/addon/views.py) + +### 設定モジュール + +ストレージアドオンごとの固有の設定は`settings/defaults.py` で定義とデフォルト値を設定し、osf.ioのDjango settings から`getattr` で上書きする形で読み込むようにします。これにより、サービス管理者がパッケージの中身を編集することなく、`api/base/settings/local.py`で設定を上書きできます。したがって、これらの設定項目はREADMEに明記する必要があります。 + +```python +# src/nextcloud_plugin/addon/settings/defaults.py +from django.conf import settings as _osf + +USE_SSL = getattr(_osf, 'NEXTCLOUD_USE_SSL', True) +MAX_UPLOAD_SIZE = getattr(_osf, 'NEXTCLOUD_MAX_UPLOAD_SIZE', 5 * 1024) +``` + +> 接続先ホストや「選択可能なホストの一覧」などの**サービス単位の設定は、GravyValetの`ExternalStorageService`で管理します**。`ExternalStorageService`はAddon Impなどを元に作られる、DB上のデータです。つまり、そのようなデータはソースコードの形では保持しません。 + +### Migration + +FileNodeモデルが必要とするMigrationを以下の手順で作成し、パッケージに同梱します。 + +1. osf.io AddonのMigration以外の部分を完成させる +2. 開発環境のosf.ioにosf.io Addonをインストールする + - インストール方法は[ストレージアドオンの利用方法](#ストレージアドオンの利用方法)を参照 +3. `makemigrations`を**アプリケーションラベル(`addons_<short_name>`)を明示して**実行する + - `docker compose run --rm web python3 manage.py makemigrations addons_nextcloud` +4. 生成されたMigrationファイルからosf側への依存(`('osf', '0XXX_...')`)を手作業で取り除き、ストレージアドオンの一部として`addon/migrations/`に配置してパッケージに同梱する + - osf.ioの特定のMigration履歴にストレージアドオンパッケージを固定しないため + +## GravyValet Addon Impのモジュール構成 + +GravyValet Addon Impは、`gravyvalet.addon_toolkit.interfaces.storage`の`StorageAddonHttpRequestorImp`(HTTPベース)または`StorageAddonClientRequestorImp[T]`(クライアントライブラリベース)を継承して実装します。GravyValet本体に組み込まれた既存のAddon Imp(`gravyvalet/addon_imps/storage/*.py`)は良い実装例です。例えばNextCloudはWebDAV を用いるため、`owncloud.py`のAddon Impが近い実装例となります。 + +`apps.py`には`ForeignAddonImpConfig`を継承したAppConfigを定義し、以下を実装・設定します。 + +- `imp`: AddonImp 実装クラスを返すプロパティ。 +- `addon_imp_name`: このAddon Impの一意な識別名(大文字、例: `NEXTCLOUD`)を返すプロパティ。`addon_service.common.known_imps.KnownAddonImps`に列挙された名前、および既存のストレージアドオンで使われている値と衝突しない値を返します。 +- `name`: Djangoアプリのインポートパス(例: `nextcloud_plugin.addon_imp`)。アイコンの静的ファイルは`static/{name}/icons/` に配置します。 +- `label`: Django アプリのラベル。**一意な値を明示的に設定します**(例: `nextcloud_addon_imp`)。Django はラベルを省略するとパスの末尾(`addon_imp`)を使うため、これを省略したストレージアドオンを複数使うとGravyValet が起動できなくなります。 + +```python +class NextcloudForeignAddonImpConfig(ForeignAddonImpConfig): + name = "nextcloud_plugin.addon_imp" + label = "nextcloud_addon_imp" + + @property + def imp(self): + return NextcloudStorageImp + + @property + def addon_imp_name(self): + return "NEXTCLOUD" +``` + +`addon_imp_name`と`name` の値はREADME にも明記する必要があります。`addon_imp_name`はサービス管理者がこのストレージアドオンを設定する際に利用する値であり、サービス管理者が知る必要のある値です。`name`は他の同様なストレージアドオンパッケージが同じ値を使うことを避ける必要があり、ストレージアドオンの開発者が知る必要のある値です。 + +`imp.py`で定義するAddon Imp本体ではストレージのブラウズ(`list_root_items` / `list_child_items` / `get_item_info`)や認証検証(`get_external_account_id`)などを実装します。また、`build_wb_config()` メソッドで、WaterButler Provider に渡す設定(`settings`)を生成します。NextCloud の場合、接続先フォルダ・ホスト・SSL 検証フラグを返します。 + +```python +async def build_wb_config(self) -> dict: + # ... + return { + "folder": f"/{folder_path}", + "host": root_host, + "verify_ssl": True, + } +``` + +具体的な実装例は`nextcloud_plugin` パッケージの以下のファイルを参照してください。 + +- [`src/nextcloud_plugin/addon_imp/apps.py`](https://github.com/chiku-samugari/nextcloud_plugin/blob/main/src/nextcloud_plugin/addon_imp/apps.py) +- [`src/nextcloud_plugin/addon_imp/imp.py`](https://github.com/chiku-samugari/nextcloud_plugin/blob/main/src/nextcloud_plugin/addon_imp/imp.py) + +## WaterButler Providerのモジュール構成 + +WaterButler ProviderはWaterButlerが提供する`waterbutler.core.provider.BaseProvider`を継承して実装します。`metadata.py`にはフォルダ・ファイルのメタデータとリビジョンを表すクラスを、`provider.py`にはストレージへ接続し CRUD 操作を行うProviderクラスを定義します。 + +Provider が提供する主なメソッドは以下のとおりです。 + +| 関数名 | 引数 | 戻り値 | 処理 | +|:------|:----|:------|:-----| +| `validate_v1_path` | path, **kwargs | WaterButlerPath | 文字列で与えられたパス情報(`path`)を検証し、属性付きの WaterButlerPath オブジェクトを返す。 | +| `validate_path` | path, **kwargs | WaterButlerPath | 同上(廃止予定の v0 仕様との互換性維持のため、2 つのメソッドに分かれている)。 | +| `download` | path, accept_url=False, version=None, range=None, **kwargs | Stream | 指定されたパス(`path`)のデータをダウンロードする。戻り値にはデータアクセス用の Stream を返す。 | +| `upload` | stream, path, conflict='replace', **kwargs | Metadata | 指定されたパス(`path`)に指定されたデータ(`stream`)をアップロードする。戻り値にはアップロードしたファイルを示す Metadata を返す。 | +| `delete` | path, confirm_delete=0, **kwargs | なし | 指定されたパス(`path`)のファイル・フォルダを削除する。 | +| `revisions` | path, **kwargs | List(Revision) | 指定されたパス(`path`)のリビジョン情報を取得する。 | +| `metadata` | path, revision=None, **kwargs | Metadata or List(Metadata) | 指定されたパス(`path`)のメタデータを取得する。`path` が file の場合 `Metadata`、directory の場合 `List(Metadata)` を返す。 | +| `create_folder` | path, folder_precheck=True, **kwargs | Metadata | 指定されたパスにフォルダを作成する。戻り値には作成したフォルダを示す Metadata を返す。 | +| `can_intra_copy` | dest_provider, path=None | Bool | 指定された送信先 Provider(`dest_provider`), パス(`path`)に対して intra_copy(内部コピー: ストレージサービス上でのコピー)が可能かどうかを判定する。これが False の場合、いったん一時ディレクトリに download して dest に upload する操作となる。 | +| `can_intra_move` | dest_provider, path=None | Bool | 指定された送信先 Provider(`dest_provider`), パス(`path`)に対して intra_move(内部移動: ストレージサービス中での移動)が可能かどうかを判定する。これが False の場合、いったん一時ディレクトリに download し dest に upload、コピー元ファイルを delete する操作となる。 | +| `intra_copy` | dest_provider, src_path, dest_path | Bool | 内部コピーを実施する。成功すれば True を返す。 | +| `intra_move` | dest_provider, src_path, dest_path | Bool | 内部移動を実施する。成功すれば True を返す。 | + +Providerクラスの`NAME`には[前述の識別名](#識別名について)を指定します(例: `nextcloud`)。 + +```python +class NextcloudProvider(provider.BaseProvider): + NAME = 'nextcloud' + + def __init__(self, auth, credentials, settings, **kwargs): + super().__init__(auth, credentials, settings, **kwargs) + self.folder = settings['folder'] + self.verify_ssl = settings['verify_ssl'] + self.url = credentials['host'] + self._auth = aiohttp.BasicAuth(credentials['username'], credentials['password']) +``` + +WaterButlerは`pyproject.toml`の`[tool.poetry.plugins."waterbutler.providers"]`に登録されたエントリポイントからProviderを発見します。**このエントリポイント名が、[前述の識別名](#識別名について)になります。** + +```toml +[tool.poetry.plugins."waterbutler.providers"] +nextcloud = "nextcloud_plugin.provider.provider:NextcloudProvider" +``` + +NextCloud での実装例は`nextcloud_plugin` パッケージの以下のファイルを参照してください。 + +- [`src/nextcloud_plugin/provider/provider.py`](https://github.com/chiku-samugari/nextcloud_plugin/blob/main/src/nextcloud_plugin/provider/provider.py) +- [`src/nextcloud_plugin/provider/metadata.py`](https://github.com/chiku-samugari/nextcloud_plugin/blob/main/src/nextcloud_plugin/provider/metadata.py) + +## 認証情報・設定情報の委譲 + +WaterButler Providerが実際のストレージに接続するには、認証情報(`credentials`)と設定情報(`settings`)が必要です。本ドキュメントの想定する構成においてはこれらは**GravyValetが管理し、WaterButlerへ渡します**(従来の構成ではosf.io Addonの`NodeSettings.serialize_waterbutler_credentials()` / `serialize_waterbutler_settings()`が担っていました)。 + +![認証情報・設定情報の委譲フロー(osf.io → GravyValet → WaterButler)](images/delegation.png) + +- 設定情報(`settings`)はGravyValet Addon Impの`build_wb_config()`が生成 + - NextCloud の場合は接続先フォルダ・ホスト・SSL 検証フラグ +- 認証情報(`credentials`)はGravyValet が管理する認証アカウント(ユーザーが接続時に入力した値)から渡される + - NextCloud の場合はホスト・ユーザー名・パスワード + +WaterButler Provider側では、コンストラクタ(`__init__`)の引数`credentials`と`settings`に、それぞれDictionary型で受け取ります。NextCloudの場合は以下のように受け取ります。 + +```python +def __init__(self, auth, credentials, settings, **kwargs): + super().__init__(auth, credentials, settings, **kwargs) + self.folder = settings['folder'] # build_wb_config() が生成 + self.verify_ssl = settings['verify_ssl'] # build_wb_config() が生成 + self.url = credentials['host'] # GravyValet のアカウントから + self._auth = aiohttp.BasicAuth(credentials['username'], credentials['password']) +``` + +## Recent Activity の記録 + +何らかのユーザー操作を契機としてアドオンに対して行われた操作は、Recent Activity という形で記録できます。Recent Activityは[NodeLog モデル](https://github.com/CenterForOpenScience/osf.io/blob/develop/osf/models/nodelog.py) により表現され、Node(プロジェクトに対応するモデル)の`add_log`メソッドで記録します。 + +```python +self.owner.add_log( + '{0}_{1}'.format(SHORT_NAME, action), + auth=auth, + params={ + 'project': self.owner.parent_id, + 'node': self.owner._id, + 'path': metadata['materialized'], + 'folder': self.folder_id, + 'urls': { + 'view': url, + 'download': url + '?action=download', + }, + }, +) +``` + +- `action` ... ログのアクション種別。`アドオン名_アクション名` の形式。 +- `params` ... ログのパラメータ。任意の dict を指定できる。 +- `auth` ... 操作を実施したユーザーの情報([framework.auth.Auth クラス](https://github.com/CenterForOpenScience/osf.io/blob/develop/framework/auth/core.py) のインスタンス)。 + +> ログの表示(どのメッセージをどう描画するか)は`angular-osf`フロントエンドが担当します。`RDM-osf.io`の`アドオン名LogActionList.json` / `アドオン名AnonymousLogActionList.json`やpybabel によるJavaScriptメッセージの国際化は不要です。 + +# ストレージアドオンの利用方法 + +作成したストレージアドオンは独立したPythonパッケージなので、`pip`や`poetry`を利用して各サービスにインストールします。特に、osf.io Addonのための[Migrationを作成する必要がある](#migration)ので、ここでは開発環境へのインストール方法を、NextCloud用のストレージアドオンパッケージである[`nextcloud_plugin`](https://github.com/chiku-samugari/nextcloud_plugin)を例にとって説明します。[開発環境の準備](#開発環境の準備)のガイドに従って開発環境にてosf.io, GravyValet, WaterButler, angular-osfを起動しているものとします。特に、osf.io, GravyValet, WaterButlerがそれぞれのディレクトリ、すなわち独立したComposeプロジェクトとして起動されている前提であることに注意してください。 + +## osf.io + +本節での作業は`osf.io`ディレクトリにて実施します。 + +1. `docker-compose.override.yml`に、`nextcloud_plugin`のコードベースをボリュームとして追加 + ``` + services: + web: + volumes: + - /path/to/nextcloud_plugin/:/nextcloud_plugin:cached + api: + volumes: + - /path/to/nextcloud_plugin/:/nextcloud_plugin:cached + worker: + volumes: + - /path/to/nextcloud_plugin/:/nextcloud_plugin:cached + ``` + +2. ストレージアドオンパッケージを`api`/`web`/`worker`コンテナにインストール + - `docker compose exec web pip install -e /nextcloud_plugin` + - `docker compose exec api pip install -e /nextcloud_plugin` + - `docker compose exec worker pip install -e /nextcloud_plugin` + +3. `api/base/settings/local.py`の`INSTALLED_APPS`に、osf.io Addonパッケージを追加 + + ```python + INSTALLED_APPS += ('nextcloud_plugin.addon',) + ``` + +ここで使う値はAppConfigの`name`の値です。 + +4. `api/base/settings/local.py`の`ADDONS_FOLDER_CONFIGURABLE`に、`short_name`の値を追加 + + ```python + ADDONS_FOLDER_CONFIGURABLE += ['nextcloud'] + ``` + +5. `addons.json`の`addons`リストに`short_name`の値を追加する + + ```json + "addons": [ ..., "nextcloud" ], + ``` + +必要に応じて `addons_archivable` 等にも追加します。 + +6. サービスを再起動する + - `docker compose restart` + +> GravyValetを利用する場合、`storageAddons.json`への追記は不要です。 + +## GravyValet + +本節の作業は`gravyvalet`ディレクトリにて実施します。 + +1. `docker-compose.override.yml`に、`nextcloud_plugin`のコードベースをボリュームとして追加 + ``` + services: + gravyvalet: + volumes: + - /path/to/nextcloud_plugin/:/nextcloud_plugin:cached + ``` +2. ストレージアドオンパッケージを`gravyvalet`コンテナにインストール + - `docker compose exec gravyvalet poetry add --editable /nextcloud_plugin` + +3. `app/settings.py`の`INSTALLED_APPS`に、Addon Impのパッケージ(`name`)を追加 + + ```python + INSTALLED_APPS += ('nextcloud_plugin.addon_imp',) + ``` + +4. `app/settings.py`の`ADDON_IMPS`にエントリを追加する。**キーは`addon_imp_name`(`"NEXTCLOUD"`)、値は一意な5000以上の整数**(パッケージ名をキーにしないこと。前述の[命名規則](#識別名について)の注意を参照)。 + + ```python + ADDON_IMPS = { + # ... + "NEXTCLOUD": 5001, + } + ``` + +5. GravyValetのサービスを再起動します。 + - `docker compose restart` + +6. GravyValetの管理画面`localhost:8004/admin`から、NextCloud用の`ExternalStorageService`を作成します。**`wb_key`には`short_name`の値(`"nextcloud"`)を指定します**(= WaterButlerのエントリポイント名)。NextCloudのように接続先ホストをユーザーごとに入力させる場合、Service Typeを`HOSTED`とし、`api_base_url`は空にします。また、NextCloudはユーザ名とパスワードでの認証を用いるのでCredentials Formatとしては`USERNAME_PASSWORD`を指定します。 + +![NextCloud用のExternalStorageServiceの設定例](images/gravyvalet-add-external-storage-service.png) + +## WaterButler + +1. `docker-compose.override.yml`に、`nextcloud_plugin`のコードベースをボリュームとして追加 + ``` + services: + waterbutler: + volumes: + - /path/to/nextcloud_plugin/:/nextcloud_plugin:cached + ``` + +2. ストレージアドオンパッケージを`waterbutler`コンテナにインストール + - `docker compose exec waterbutler poetry add --editable /nextcloud_plugin` + +3. WaterButlerのサービスを再起動 + - `docker compose restart` + +> **明示的な再起動が必須です。** editable installでは、パッケージへのパスを記した`.pth`ファイルがインタプリタ起動時にのみ読み込まれます。そのため起動済みのプロセスはインストール後も新しいProviderを認識せず(`ProviderNotFound`となる)、必ずプロセスを再起動する必要があります。 + +Providerは`waterbutler.providers`エントリポイントから自動的に発見されます。 + +# NextCloud アドオンの動作確認 + +NextCloud アドオンの動作確認をしてみましょう。 + +## NextCloud サービスの起動 + +接続先のNextCloudサービスを起動します。動作確認にはNextCloud公式のDockerイメージが手軽です。 + +``` +$ docker run -d --name nextcloud-test -p 8081:80 nextcloud:stable +``` + +ブラウザで `http://localhost:8081` を開き、セットアップウィザードに従って管理者ユーザーを作成します。 + +> WaterButler / GravyValetの各コンテナからNextCloudへ到達できる必要があります。osf.ioと同じホストで実行する場合は、`localhost`ではなくコンテナから到達可能なアドレス(osf.ioのローカル開発で用いるループバックエイリアス`192.168.168.167`など)を使用します。また、NextCloud側の`trusted_domains`に、そのアドレス(例: `192.168.168.167:8081`)を追加する必要がある場合があります。 + +## ExternalStorageServiceの作成 + +前述の「[ストレージアドオンの利用方法](#gravyvalet)」に従い、`ExternalStorageService`を作成します(`wb_key`は`nextcloud`、Credentials Formatは`USERNAME_PASSWORD`, Service Typeは`HOSTED`、`api_base_url` は空)。 + +## ストレージアドオンを試す + +angular-osf の画面から、以下のような操作を実施します。 + +1. アカウント設定画面で、NextCloud アドオンのアカウントを接続します。`Host URL` には NextCloud のホスト(例: `http://192.168.168.167:8081/`)、ユーザー名・パスワードには NextCloud のログイン情報を入力します。 +2. 適当なプロジェクトを作成し、NextCloud アドオンを有効化します。 +3. フォルダピッカーで、プロジェクトに紐付けるフォルダを選択します。 +4. プロジェクトのFilesから、NextCloudに対してフォルダ作成・アップロード・ダウンロード・削除・移動・コピーなどができることを確認します。 + +以上でNextCloudアドオンの動作確認は完了です。 diff --git a/docs/guides/storage-addon/README.md b/docs/guides/storage-addon/README.md new file mode 100644 index 0000000..b16d172 --- /dev/null +++ b/docs/guides/storage-addon/README.md @@ -0,0 +1,105 @@ +# Storage Addon / ストレージアドオン + +> **Summary:** Guide to creating an RDM storage addon that connects to external storage services +> **概要:** 外部ストレージサービスに接続する RDM ストレージアドオンを作成する手引き + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-06. **Learned:** the legacy guide was rewritten upstream for the GravyValet stack (PR #18), so the sample-code layout this overview assumed (Addon on osf.io + Provider on WaterButler, My MinIO sample) no longer exists in `README.legacy.md`; the overview must be realigned in a later milestone. / 旧ガイドが上流で GravyValet 構成向けに書き直された(PR #18)ため、この概要が前提にしていたサンプルコードの配置(osf.io 側 Addon + WaterButler 側 Provider、My MinIO 例)は `README.legacy.md` に存在しなくなった。概要は後のマイルストーンで合わせ直す必要があると分かった。 +- Version / 版: 0.1 — 2026-11-05 +- Normative for: `docs/guides/storage-addon/` +- Related: [SPEC-06 Documentation Conventions](../../spec/06_documentation_conventions.md) · [Skeleton Guide](../skeleton/README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Overview + +This guide shows how to create an RDM storage addon that connects to external storage services like AWS S3 or MinIO. Storage addons consist of two parts: + +- **Addon** (runs on OSF.io): Manages user and project settings +- **Provider** (runs on WaterButler): Handles actual storage access + +The Addon receives authentication credentials and settings from users, while the Provider uses this information to communicate with the actual storage service. + +### Prerequisites + +- Basic understanding of Python and Django +- The development environment set up following the [Environment Guide](../environment/README.md) +- Completed the [Skeleton Addon Guide](../skeleton/README.md) + +### Quick start + +1. Create your addon using the skeleton as a base +2. Implement the Provider class for your storage service +3. Configure authentication and authorization between Addon and Provider +4. Test file operations (upload, download, delete) +5. Deploy and test with your storage service + +### Legacy content + +The legacy storage addon instructions are kept verbatim except the one `recaptchaSiteKey` placeholder in `README.legacy.md` for reference and will be rewritten per milestone. + +### Latest changes + +- 2026-11-06 (QAE): in the ported text the sample `recaptchaSiteKey` value was replaced by the placeholder `<recaptcha-site-key>`; the original was Google's public reCAPTCHA test key, but this public repository keeps no key-shaped literals (the secret scan rejects them). + +- **2026-11-06 — Legacy guide rewritten for the GravyValet architecture (PR #18).** [`README.legacy.md`](README.legacy.md) now describes building a storage addon as an independent Python package (the worked example is a NextCloud addon, `nextcloud_plugin`) on the current OSF stack: osf.io, GravyValet (a new service that keeps addon connection settings and credentials on behalf of osf.io), WaterButler (the service that reads and writes files on the storage) and angular-osf (the new browser front end), tied together by a Caddy (a small web server used here as a *reverse proxy*: one front door at `http://localhost` that forwards each request to the right service) single-origin proxy. The former My MinIO sample code under `osf.io/` and `waterbutler/` was removed by that rewrite, and the class diagrams were replaced by Mermaid (a text format that is drawn as a diagram) sources and PNG renders in `images/`. The overview above still describes the two-part Addon/Provider model and will be aligned with the new text in a later milestone. Incorporated from PR #18 by chiku-samugari (2026-11-06). +- **2026-11-06 — Mako template file names get the addon name as a prefix (PR #14).** Mako (the template language used for the addon settings panels) caches templates by file name in some RDM run modes, so `user_settings.mako` must be named `<addon>_user_settings.mako`. The change was applied to the My MinIO legacy text and sample code first, and then superseded by the PR #18 rewrite above, which removed that sample; the rule itself is kept in the [Skeleton guide](../skeleton/README.md) and the [Screen Expansion guide](../screen-expansion/README.md). Incorporated from PR #14 by shun-nakazawa (2026-11-06). + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 概要 + +このガイドは、AWS S3 や MinIO のような外部ストレージサービスに接続する RDM ストレージアドオンを作成する方法を示します。ストレージアドオンは以下の2つの部分から構成されます: + +- **アドオン** (OSF.io 上で実行): ユーザーとプロジェクトの設定を管理 +- **プロバイダ** (WaterButler 上で実行): 実際のストレージアクセスを処理 + +アドオンがユーザーから認証情報と設定を受け取り、プロバイダがその情報を使用して実際のストレージサービスと通信します。 + +### 前提条件 + +- Python と Django の基本的な理解 +- [環境ガイド](../environment/README.md)に従って開発環境をセットアップしていること +- [スケルトンアドongaon ガイド](../skeleton/README.md)を完了していること + +### クイックスタート + +1. スケルトンをベースにアドオンを作成する +2. ストレージサービス用のプロバイダクラスを実装する +3. アドオンとプロバイダ間の認証と認可を設定する +4. ファイル操作(アップロード、ダウンロード、削除)をテストする +5. デプロイしてストレージサービスでテストする + +### 過去のコンテンツ + +過去のストレージアドオンの手順は、参考のために `README.legacy.md` にそのまま残しており、マイルストーンごとに書き直す予定です。 + +### 最近の変更 + +- 2026-11-06(QAE): 移植した本文のサンプル値 `recaptchaSiteKey` をプレースホルダー `<recaptcha-site-key>` に置き換えた。元の値は Google 公開の reCAPTCHA 試験用キーだが、公開リポジトリには鍵の形をしたリテラルを置かない(秘密スキャンが拒否する)。 + +- **2026-11-06 — 旧ガイドを GravyValet 構成向けに全面改訂(PR #18)。** [`README.legacy.md`](README.legacy.md) は、現在の OSF 構成(osf.io、GravyValet(アドオンの接続先・認証情報・設定を osf.io に代わって保管する新しいサービス)、WaterButler(ストレージ上のファイルを読み書きするサービス)、angular-osf(新しいブラウザ画面))の上で、ストレージアドオンを独立した Python パッケージとして作る手順(例は NextCloud アドオン `nextcloud_plugin`)を説明するようになりました。各サービスは Caddy(ここでは*リバースプロキシ*=`http://localhost` という一つの入口で受けて各サービスへ振り分ける小さな Web サーバ)による単一オリジンのプロキシで束ねます。この改訂により `osf.io/`・`waterbutler/` 配下の旧 My MinIO サンプルコードは削除され、クラス図は `images/` の Mermaid(文字で書くと図として描かれる書式)のソースと PNG に置き換わりました。上の概要は従来の Addon/Provider 二部構成の説明のままであり、後のマイルストーンで新しい本文に合わせます。Incorporated from PR #18 by chiku-samugari (2026-11-06). +- **2026-11-06 — mako テンプレートのファイル名の先頭にアドオン名を付ける(PR #14)。** Mako(アドオン設定画面のテンプレート言語)は RDM の動作モードによってテンプレートをファイル名でキャッシュするため、`user_settings.mako` は `<アドオン名>_user_settings.mako` という名前にします。この変更は My MinIO の旧本文とサンプルコードに先に適用した後、上記 PR #18 の改訂でサンプルごと置き換えられました。規則そのものは[スケルトンガイド](../skeleton/README.md)と[画面拡張ガイド](../screen-expansion/README.md)に残っています。Incorporated from PR #14 by shun-nakazawa (2026-11-06). + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Storage addon | An addon that connects RDM to external storage services like AWS S3. | AWS S3 のような外部ストレージサービスに RDM を接続するアドオン。 | +| Provider | A component that actually communicates with the storage service. | ストレージサービスと実際に通信するコンポーネント。 | +| Authentication | The process of verifying who you are (like a username and password). | あなたが誰であるかを確認するプロセス(ユーザー名とパスワードのようなもの)。 | +| Authorization | The process of checking what you are allowed to do after logging in. | ログインした後、あなたが何をできるかを確認するプロセス。 | + diff --git a/docs/guides/storage-addon/images/architecture.mmd b/docs/guides/storage-addon/images/architecture.mmd new file mode 100644 index 0000000..9424593 --- /dev/null +++ b/docs/guides/storage-addon/images/architecture.mmd @@ -0,0 +1,13 @@ +flowchart LR + subgraph PLUGIN["nextcloud_plugin(単一の Python パッケージ)"] + direction TB + A["addon<br/>(osf.io アドオン)"] + I["addon_imp<br/>(GravyValet Addon Imp)"] + P["provider<br/>(WaterButler Provider)"] + end + FE["angular-osf<br/>(フロントエンド)"] --> OSF[("osf.io")] + FE --> GV[("GravyValet")] + FE --> WB[("WaterButler")] + A -. "pip install" .-> OSF + I -. "poetry install" .-> GV + P -. "poetry install" .-> WB diff --git a/docs/guides/storage-addon/images/architecture.png b/docs/guides/storage-addon/images/architecture.png new file mode 100644 index 0000000..3d8f73c Binary files /dev/null and b/docs/guides/storage-addon/images/architecture.png differ diff --git a/StorageAddon/images/authorize-addon.png b/docs/guides/storage-addon/images/authorize-addon.png similarity index 100% rename from StorageAddon/images/authorize-addon.png rename to docs/guides/storage-addon/images/authorize-addon.png diff --git a/StorageAddon/images/configure-addon.png b/docs/guides/storage-addon/images/configure-addon.png similarity index 100% rename from StorageAddon/images/configure-addon.png rename to docs/guides/storage-addon/images/configure-addon.png diff --git a/docs/guides/storage-addon/images/delegation.mmd b/docs/guides/storage-addon/images/delegation.mmd new file mode 100644 index 0000000..6c08565 --- /dev/null +++ b/docs/guides/storage-addon/images/delegation.mmd @@ -0,0 +1,14 @@ +sequenceDiagram + participant FE as angular-osf + participant OSF as osf.io + participant GV as GravyValet + participant WB as WaterButler + participant NC as NextCloud + FE->>OSF: ファイル操作要求(provider = nextcloud) + OSF->>GV: 認証情報・設定を要求(wb_key = nextcloud) + Note over GV: Addon Imp の build_wb_config() が settings を生成し、<br/>認証アカウントから credentials を取得 + GV-->>OSF: credentials + settings + OSF->>WB: make_provider(credentials, settings) + WB->>NC: WebDAV でアクセス(CRUD) + NC-->>WB: 応答 + WB-->>FE: 応答 diff --git a/docs/guides/storage-addon/images/delegation.png b/docs/guides/storage-addon/images/delegation.png new file mode 100644 index 0000000..39f8a80 Binary files /dev/null and b/docs/guides/storage-addon/images/delegation.png differ diff --git a/StorageAddon/images/enable-addon.png b/docs/guides/storage-addon/images/enable-addon.png similarity index 100% rename from StorageAddon/images/enable-addon.png rename to docs/guides/storage-addon/images/enable-addon.png diff --git a/StorageAddon/images/enabled-addon.png b/docs/guides/storage-addon/images/enabled-addon.png similarity index 100% rename from StorageAddon/images/enabled-addon.png rename to docs/guides/storage-addon/images/enabled-addon.png diff --git a/StorageAddon/images/filled-credential.png b/docs/guides/storage-addon/images/filled-credential.png similarity index 100% rename from StorageAddon/images/filled-credential.png rename to docs/guides/storage-addon/images/filled-credential.png diff --git a/docs/guides/storage-addon/images/gravyvalet-add-external-storage-service.png b/docs/guides/storage-addon/images/gravyvalet-add-external-storage-service.png new file mode 100644 index 0000000..80c3a87 Binary files /dev/null and b/docs/guides/storage-addon/images/gravyvalet-add-external-storage-service.png differ diff --git a/docs/guides/storage-addon/images/naming.mmd b/docs/guides/storage-addon/images/naming.mmd new file mode 100644 index 0000000..482dbce --- /dev/null +++ b/docs/guides/storage-addon/images/naming.mmd @@ -0,0 +1,8 @@ +flowchart TB + KEY(["識別名 canonical key = nextcloud"]) + KEY --> SN["osf.io アドオン<br/>short_name = nextcloud"] + KEY --> PV["osf.io アドオン<br/>_provider = nextcloud"] + KEY --> WK["GravyValet<br/>wb_key = nextcloud"] + KEY --> AI["GravyValet<br/>addon_imp_name = NEXTCLOUD<br/>.lower() = nextcloud"] + KEY --> EP["WaterButler<br/>エントリポイント名 = nextcloud"] + KEY --> LB["osf.io アドオン<br/>label / app_label = addons_nextcloud"] diff --git a/docs/guides/storage-addon/images/naming.png b/docs/guides/storage-addon/images/naming.png new file mode 100644 index 0000000..cc7599a Binary files /dev/null and b/docs/guides/storage-addon/images/naming.png differ diff --git a/docs/guides/storage-addon/images/proxy-routing.mmd b/docs/guides/storage-addon/images/proxy-routing.mmd new file mode 100644 index 0000000..4863354 --- /dev/null +++ b/docs/guides/storage-addon/images/proxy-routing.mmd @@ -0,0 +1,7 @@ +flowchart LR + B["ブラウザ<br/>http://localhost"] --> C{{"Caddy<br/>単一オリジン<br/>リバースプロキシ"}} + C -->|"/v2, /_/"| API[("osf.io API<br/>:8000")] + C -->|"/v1/resources/*"| WB[("WaterButler<br/>:7777")] + C -->|"/v1, /static/*/icons"| GV[("GravyValet<br/>:8004")] + C -->|"/login /logout /oauth /api/v1 /download"| CAS[("osf.io web/CAS<br/>:5000")] + C -->|"上記以外すべて"| NG[("angular-osf<br/>:4200")] diff --git a/docs/guides/storage-addon/images/proxy-routing.png b/docs/guides/storage-addon/images/proxy-routing.png new file mode 100644 index 0000000..d6704a5 Binary files /dev/null and b/docs/guides/storage-addon/images/proxy-routing.png differ diff --git a/StorageAddon/images/select-current-folder.png b/docs/guides/storage-addon/images/select-current-folder.png similarity index 100% rename from StorageAddon/images/select-current-folder.png rename to docs/guides/storage-addon/images/select-current-folder.png diff --git a/StorageAddon/images/successful-authorization-addon.png b/docs/guides/storage-addon/images/successful-authorization-addon.png similarity index 100% rename from StorageAddon/images/successful-authorization-addon.png rename to docs/guides/storage-addon/images/successful-authorization-addon.png diff --git a/docs/handoff/README.md b/docs/handoff/README.md new file mode 100644 index 0000000..f721a7c --- /dev/null +++ b/docs/handoff/README.md @@ -0,0 +1,80 @@ +# Hand-off Records / 引継ぎ記録 + +> **Summary:** Requests to other teams or agents: each record is a dated file named YYYY-MM-DD_<Title>.md. Hand-offs may request review, merge approval, or other actions from external teams. +> **概要:** 他のチームやエージェントへの依頼:各記録は日付付きファイル、YYYY-MM-DD_<Title>.md の形式。引継ぎはレビュー、マージ承認、その他のアクションを外部チームに依頼することがあります。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** without a hand-off record, it was unclear what was requested of Codex Astra; naming convention makes the request searchable and trackable. / 引継ぎ記録がなければ、Codex Astra に何を依頼したか分からず、命名規則で要求が検索可能で追跡可能になると分かった。 +- Normative for: Hand-off records naming convention, review record naming. +- Related: [../README.md](../README.md) · [reviews/](../reviews/README.md) · [status/](../status/README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. What belongs here + +A *hand-off* is a request to another team or agent. This folder contains: + +| Type | Naming convention | Description | +|---|---|---| +| Hand-off | `YYYY-MM-DD_<Title>.md` | Request to external team (review, merge, deploy). | +| Review | `YYYY-MM-DD_<Title>_rN.md` | Review record written by REV (Codex Astra). | + +### 2. Open items (no entries yet / まだありません) + +| Date | Title | Requested by | Status | +|---|---|---|---| +| — | — | — | — | + +### 3. Creating a new hand-off record + +1. Name the file `YYYY-MM-DD_<Title>.md`. +2. Describe: what is ready, who should review, what decision is needed. +3. Link to related PRs and documents. +4. Assign the hand-off to the appropriate team (REV, owner, deployment). + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. ここに属するもの + +「引継ぎ」は他のチームやエージェントへの依頼です。このフォルダには次が含まれます: + +| 種別 | 命名規則 | 説明 | +|---|---|---| +| 引継ぎ | `YYYY-MM-DD_<Title>.md` | 外部チームへの依頼(レビュー、マージ、配備)。 | +| レビュー | `YYYY-MM-DD_<Title>_rN.md` | REV(Codex Astra)が書くレビュー記録。 | + +### 2. 未解決項目(まだありません / no entries yet) + +| 日付 | タイトル | 依頼者 | ステータス | +|---|---|---|---| +| — | — | — | — | + +### 3. 新しい引継ぎ記録をつくるには + +1. ファイル名を `YYYY-MM-DD_<Title>.md` にする。 +2. 記述:いつ準備ができているか、誰がレビューすべきか、どのような決断が必要か。 +3. 関連する PR と文書へリンクする。 +4. 引継ぎを適切なチーム(REV、所有者、配備)に割り当てる。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Hand-off | A request to another team or agent. | 他のチームやエージェントへの依頼。 | +| Record | A document that captures an event or request. | イベントや要求を記録する文書。 | +| Review | An independent assessment of a pull request. | プルリクエストの独立した評価。 | +| Merge approval | Permission from the owner to merge a PR. | PR をマージするための所有者の承認。 | +| Deploy | Release a version to production. | 本番環境へのバージョンリリース。 | diff --git a/docs/policy/POL-01_Developer_Environment_2027_Position.md b/docs/policy/POL-01_Developer_Environment_2027_Position.md new file mode 100644 index 0000000..775f72f --- /dev/null +++ b/docs/policy/POL-01_Developer_Environment_2027_Position.md @@ -0,0 +1,185 @@ +# POL-01 Position on the Developer Environment 2027 / 開発環境 2027 版の位置づけ + +> **Summary:** Our stance on why and how we build the GakuNin RDM developer environment 2027: one-shot, multi-architecture, security-first, kept alive by AI agents with humans deciding merge and publication, documented in public while integration code stays private. +> **概要:** GakuNin RDM の開発環境 2027 版を、なぜ・どのように作るかの立場。一発導入、複数アーキテクチャ、安全第一、AI エージェントが保ち、マージと公開は人が決める。文書は公開し、統合コードは非公開に置く。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.1 — 2026-11-05. **Learned:** writing the stance down first showed that "public documentation, private code" is not a detail but the rule every other document depends on, because this repository is read abroad and must never carry private code. / 立場を先に書いてみると、「文書は公開、コードは非公開」が細部ではなく他の全文書の前提だと分かった。このリポジトリは海外からも読まれ、非公開のコードを一片でも置けないからである。 +- Applies to: everything under this repository and the integration repositories named `RDM-<name>-dev2027`. +- Related: [docs/README.md](../README.md) · [SPEC-00 Overview](../spec/00_overview.md) · [SPEC-01 Manifest](../spec/01_manifest.md) · [SPEC-02 Installer CLI](../spec/02_installer_cli.md) · [SPEC-03 Security Gate](../spec/03_security_gate.md) · [SPEC-04 Acceptance Tests](../spec/04_acceptance_tests.md) · [SPEC-05 Upstream Tracking](../spec/05_upstream_tracking.md) · [SPEC-06 Documentation Conventions](../spec/06_documentation_conventions.md) · [ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md) · [ADR-02](../decisions/ADR-02_Network_Model.md) · [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) · [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) · [REF-01 Glossary](../reference/REF-01_Glossary.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Why this policy exists + +GakuNin RDM (GakuNin is Japan's academic network for logging in with a university account; see [REF-01](../reference/REF-01_Glossary.md)) is the research data management service of NII, built on OSF (the Open Science Framework, a web service for sharing research projects, made by COS, the Center for Open Science in the United States). Our copies of the OSF code live in GitHub *repositories* (a repository is a folder whose every change is remembered, so you can always go back) owned by the RCOSDP organization. There are six public core repositories, six `-private` security-verified versions of them, and five private subsystems. Today nobody can install all of them together in one step, and the base images they run on reached *EOL* (end of life: the makers no longer fix bugs or security holes in them). + +A *policy* is the position we take. This one says what the "developer environment 2027" is for, what we will and will not do, and where every piece lives. Rules for implementers are in the specifications; the reasons behind individual choices are in the decision records. + +### 2. Our stance + +1. **Goal.** One command installs a developer environment that combines the public core `develop` branches, the `-private` security versions, and the subsystems, on macOS (Apple Silicon), Ubuntu 24.04 (amd64 and arm64) and Windows 11 with WSL2 (a way to run Linux inside Windows; see [REF-01](../reference/REF-01_Glossary.md)). It can be handed to partners abroad. AI agents (programs that read, write and test code on their own, under rules we set) keep it secure, so GakuNin RDM continues even if COS stops maintaining OSF. +2. **Modernize rather than tolerate.** When an old library or base image carries known *vulnerabilities* (weak spots an attacker could use), we move to a current version, even when that takes longer. We do not ship a known hole because fixing it is work. +3. **Remove vulnerabilities until top-tier AI attackers fail.** The bar is not "no scanner warnings" but "an approved AI red team (a team whose job is to attack our own system, in an isolated network, to find holes before real attackers do) finds no unresolved way in". We reach that bar in stages through a *security gate* (a checkpoint the build must pass before anyone may use it), defined in [SPEC-03](../spec/03_security_gate.md) and [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md): report-only at first, stop on HIGH at M4, zero CRITICAL/HIGH plus red-team pass at M5. +4. **Humans decide; AI does the work.** AI detects, fixes, reviews and tests. A human decides to *merge* (accept a change into the shared branch), to publish, and to grant exceptions. No AI merges its own work, and no author accepts their own change. Details in [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md). +5. **This repository is public and holds no code from private sources.** It contains documentation, the *manifest* (a list naming each upstream repository and the exact *SHA*, the fingerprint of one commit, that we build from) and the *installer* (the program that sets everything up). Integration code lives in private repositories named `RDM-<name>-dev2027`. We name them in text but never link to them by URL. Scanning for secrets (a secret is a password or key that must never be written where others can read it; see [REF-01](../reference/REF-01_Glossary.md)) in CI (continuous integration: automatic checks that run on every change) is mandatory. +6. **Documents are bilingual and newcomer-readable.** English first, Japanese second, on the same page, with glossary notes on every technical term the first time it appears. Rules in [SPEC-06](../spec/06_documentation_conventions.md); shared terms in [REF-01](../reference/REF-01_Glossary.md). +7. **Relationship to upstream policies.** This repository is GRDM-specific. The cross-cutting canon — the charter, folder rules (POL-02), human/AI responsibilities (POL-05), pull request rules (SPEC-10) and installer form (SPEC-11) — stays in `RDM-grdm-core-test` and `niirdcplus`. We link to it and never copy it, so there is only one place to fix a rule. +8. **Role model and write boundary.** Roles use the three-letter codes of the owning team: AID (AI developer: Orca Open Code 2 workers on a local LLM), QAE (QA engineer: Claude Code Fable), REV (reviewer: Codex Astra), and the owner for policy, acceptance, merge and publication. The agents working on this plan may write only to this repository and to newly created `RDM-<name>-dev2027` repositories. They never write to existing upstream repositories, never delete a repository or branch, and never *force-push* (overwrite shared history). + +### 3. Where things live + +```mermaid +flowchart LR + subgraph PUBLIC["Public (RCOSDP)"] + DG["RDM-developer-guide<br/>docs/ · manifest/ · installer/<br/>names + SHAs only"] + CORE["6 public cores<br/>RDM-osf.io, RDM-waterbutler, RDM-modular-file-renderer,<br/>RDM-ember-osf-web, RDM-cas-overlay, RDM-wiki-frontend"] + CANON["Cross-cutting canon<br/>RDM-grdm-core-test · niirdcplus<br/>(POL-02, POL-05, SPEC-10, SPEC-11)"] + end + subgraph PRIVATE["Private (RCOSDP)"] + PRIV["6 -private security versions<br/>+ 5 private subsystems"] + DEV["RDM-<name>-dev2027 × 11<br/>develop = integration<br/>upstream/* tracking branches"] + end + COS["CenterForOpenScience/*<br/>(reference tracking only)"] + CORE -->|"upstream/public-<branch>"| DEV + PRIV -->|"upstream/private-<branch>"| DEV + COS -->|"upstream/cos-develop"| DEV + DEV -->|"SHA recorded in manifest"| DG + CANON -.->|"linked, never copied"| DG + DG -->|"installer builds from SHAs"| LOCAL["Developer machine<br/>127.0.0.1 only, non-root"] +``` + +Read the picture from left to right: upstream code flows into the private integration repositories; only names and SHAs flow into this public repository; the installer on a developer machine builds from those SHAs. + +### 4. Milestone ladder + +The canonical plan is kept by the owner; the excerpt is in TOON (a compact text form of JSON that people and AI both read easily). + +```toon +milestones[5]{id,goal,gate,proof}: + M1,"docs skeleton, manifest, 11 dev2027 integration repos","report-only scan, allow-list recorded","Codex-reviewed PR merged to develop" + M2,"6 cores install in one shot on Mac Studio (arm64); amd64 build passes","report-only, allow-list count recorded","Playwright acceptance: login, project, file up/down, wiki co-edit, preview, institution admin; success + rejection" + M3,"5 subsystems start (y-websocket, OASys, Shibboleth-SP + test IdP, rdmcp, aipf_mcp_data_grdm)","allow-list smaller than M2","one success + one rejection case per subsystem" + M4,"waterbutler, mfr, osf.io on Python 3.13","install stops on HIGH or above; first AI red team","regression of M2/M3 acceptance passes" + M5,"ES2 and mongo 3.4 retired; ES8 and PostgreSQL 15+","zero CRITICAL/HIGH; AI red team finds no unresolved path","distributable abroad; licenses settled" +steady_state: + daily: "upstream mirror, diff report, CVE scan" + weekly: "AI integration PR → Codex review → regression and acceptance" + human_only: "merge, publish, exceptions" +``` + +Deadlines are set by the owner when each milestone starts. + +### 5. What we will not do + +- We will not keep the loopback *alias* `192.168.168.167` that needed `sudo` (administrator rights) and exposed services to the local network. See [ADR-02](../decisions/ADR-02_Network_Model.md). +- We will not place private code, secrets, or private repository URLs in this repository. +- We will not let an AI merge or publish, nor let an author accept their own change. +- We will not copy the upstream charter or policies here; we link. +- We will not push images built from `-private` code to a public registry. + +### 6. How this policy is used + +Specifications ([SPEC-00](../spec/00_overview.md) to [SPEC-06](../spec/06_documentation_conventions.md)) implement this stance. Decision records ([ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md) to [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md)) explain the individual choices. When a specification and this policy disagree, fix both in one commit and record what was learned in the version line. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. なぜこの方針があるのか + +GakuNin RDM(GakuNin=学認。大学のアカウントでログインするための日本の学術ネットワーク。[REF-01](../reference/REF-01_Glossary.md))は NII の研究データ管理サービスで、OSF(Open Science Framework。研究プロジェクトを共有する Web サービス。米国の COS = Center for Open Science が作った)を土台にしています。OSF のコードの私たちの写しは、RCOSDP という GitHub の組織が持つ「リポジトリ」(変更を全部覚えているフォルダ。いつでも前に戻せる)にあります。公開コアが 6 本、それに対応する `-private` のセキュリティ検証版が 6 本、非公開のサブシステムが 5 本です。いま、これら全部を一度に導入する手段はありません。しかも動かしている土台のイメージは全部 EOL(end of life。作った人がバグや穴を直してくれなくなった状態)です。 + +「方針」は私たちの立場を書いたものです。この方針は、「開発環境 2027 版」が何のためにあり、何をし、何をせず、それぞれの部品がどこに置かれるかを述べます。実装する人が守る規則は仕様に、個々の選択の理由は決定の記録にあります。 + +### 2. 私たちの立場 + +1. **ゴール。** 一つのコマンドで、公開コアの `develop`、`-private` のセキュリティ版、サブシステムを重ねた開発環境が、macOS(Apple Silicon)、Ubuntu 24.04(amd64 と arm64)、Windows 11 の WSL2(Windows の中で Linux を動かす仕組み。[REF-01](../reference/REF-01_Glossary.md))に入ります。海外の協力者にも渡せます。AI エージェント(私たちの決めた規則のもとで、自分でコードを読み・書き・試すプログラム)が安全に保ち、COS が OSF の保守をやめても GakuNin RDM を続けられます。 +2. **我慢せず最新化する。** 古いライブラリや土台のイメージに既知の「脆弱性」(攻撃者が使える弱い場所)があれば、時間がかかっても現行版へ移ります。直すのが大変だからといって、既知の穴を残して出荷しません。 +3. **最上位の AI 攻撃者が失敗するまで脆弱性を除く。** 基準は「スキャナの警告がない」ではなく、「承認された AI レッドチーム(本物の攻撃者より先に穴を見つけるために、隔離したネットワークの中で自分たちのシステムを攻める係)が、未解決の侵入経路を見つけない」です。そこへは「セキュリティ門」(通らないと使えない検問所)を段階的に厳しくして到達します。[SPEC-03](../spec/03_security_gate.md) と [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) に定義し、最初は報告のみ、M4 で HIGH 停止、M5 で CRITICAL/HIGH ゼロとレッドチーム合格を必須にします。 +4. **人が決め、AI が働く。** AI は検出・修正・レビュー・試験を行います。「マージ」(変更を共有ブランチへ受け入れること)、公開、例外の付与は人が決めます。AI は自分の成果をマージせず、作者は自分の変更を受け入れません。詳細は [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md)。 +5. **このリポジトリは公開で、非公開由来のコードを持たない。** 置くのは文書、「manifest」(取り込む上流リポジトリの名前と、どのコミットから作るかを示す「SHA」= コミット一つの指紋、を並べた一覧)、「インストーラー」(全部を組み立てるプログラム)だけです。統合コードは `RDM-<name>-dev2027` という非公開リポジトリに置きます。文中では名前だけを書き、URL は書きません。CI(continuous integration。変更ごとに自動で走る検査)での秘密(他人が読める場所に書いてはいけないパスワードや鍵。[REF-01](../reference/REF-01_Glossary.md))のスキャンを必須にします。 +6. **文書は二言語で、新入社員が読める。** 同じページに英語を先、日本語を後に置き、専門用語には初出で用語注を付けます。規則は [SPEC-06](../spec/06_documentation_conventions.md)、共通の用語は [REF-01](../reference/REF-01_Glossary.md)。 +7. **上流方針との関係。** このリポジトリは GRDM 固有です。横断の正本 — 憲章、置き場の規則(POL-02)、人と AI の責任(POL-05)、PR の規則(SPEC-10)、インストーラーの型(SPEC-11)— は `RDM-grdm-core-test` と `niirdcplus` にあります。リンクで指し、写しません。規則を直す場所を一つにするためです。 +8. **役割モデルと書込の境界。** 役割は所属チームの 3 文字略称で表します。AID(AI開発担当者。ローカル LLM で動く Orca の Open Code 2 ワーカー)、QAE(QA担当。Claude Code Fable)、REV(担当レビュワ。Codex Astra)、そして方針・受入・マージ・公開を担う所有者です。この計画で働くエージェントが書き込めるのは、このリポジトリと、新設の `RDM-<name>-dev2027` だけです。既存の上流リポジトリには書かず、リポジトリやブランチを削除せず、「force push」(共有の履歴の上書き)をしません。 + +### 3. 物の置き場 + +```mermaid +flowchart LR + subgraph PUBLIC["公開(RCOSDP)"] + DG["RDM-developer-guide<br/>docs/ · manifest/ · installer/<br/>名前と SHA のみ"] + CORE["公開コア 6 本<br/>RDM-osf.io, RDM-waterbutler, RDM-modular-file-renderer,<br/>RDM-ember-osf-web, RDM-cas-overlay, RDM-wiki-frontend"] + CANON["横断の正本<br/>RDM-grdm-core-test · niirdcplus<br/>(POL-02, POL-05, SPEC-10, SPEC-11)"] + end + subgraph PRIVATE["非公開(RCOSDP)"] + PRIV["-private セキュリティ版 6 本<br/>+ 非公開サブシステム 5 本"] + DEV["RDM-<name>-dev2027 × 11<br/>develop = 統合<br/>upstream/* 追跡ブランチ"] + end + COS["CenterForOpenScience/*<br/>(参照追跡のみ)"] + CORE -->|"upstream/public-<branch>"| DEV + PRIV -->|"upstream/private-<branch>"| DEV + COS -->|"upstream/cos-develop"| DEV + DEV -->|"SHA を manifest に記録"| DG + CANON -.->|"リンクのみ、写さない"| DG + DG -->|"インストーラーが SHA から組み立て"| LOCAL["開発者の計算機<br/>127.0.0.1 のみ、非 root"] +``` + +左から右へ読みます。上流のコードは非公開の統合リポジトリへ流れ、公開のこのリポジトリへは名前と SHA だけが流れ、開発者の計算機のインストーラーがその SHA から組み立てます。 + +### 4. 節目のはしご + +計画の正本は所有者が持ちます。抄録は TOON(JSON を短い字下げ付きの文字で表した形。人も AI も読みやすい)で示します。 + +```toon +milestones[5]{id,goal,gate,proof}: + M1,"docs 骨格・manifest・dev2027 統合リポジトリ 11 本","報告のみ、許容リストを記録","Codex レビュー済み PR が develop にマージ" + M2,"コア 6 本が Mac Studio(arm64)で一発導入、amd64 はビルド確認","報告のみ、許容リスト件数を記録","Playwright 受入: ログイン・プロジェクト・ファイル上下載・Wiki 共同編集・プレビュー・機関管理。成功+拒否" + M3,"サブシステム 5 本が起動(y-websocket, OASys, Shibboleth-SP+テスト IdP, rdmcp, aipf_mcp_data_grdm)","許容リストが M2 より少ない","各 1 本の正常系+拒否ケース" + M4,"waterbutler・mfr・osf.io を Python 3.13 へ","HIGH 以上で導入停止、AI レッドチーム初回","M2/M3 受入の回帰が合格" + M5,"ES2・mongo 3.4 を廃止、ES8・PostgreSQL 15 以降","CRITICAL/HIGH ゼロ、AI レッドチームが未解決経路ゼロ","海外配布可、ライセンス整理済み" +steady_state: + daily: "上流ミラー、差分報告、CVE スキャン" + weekly: "AI 統合 PR → Codex レビュー → 回帰・受入" + human_only: "マージ、公開、例外" +``` + +各節目の期限は、着手時に所有者が決めます。 + +### 5. しないこと + +- `sudo`(管理者権限)が要り、サービスを LAN に露出させていたループバックの別名 `192.168.168.167` は使いません。[ADR-02](../decisions/ADR-02_Network_Model.md) を参照。 +- このリポジトリに非公開のコード、秘密、非公開リポジトリの URL を置きません。 +- AI にマージや公開をさせません。作者に自分の変更を受け入れさせません。 +- 上流の憲章や方針をここに写しません。リンクします。 +- `-private` 由来のコードから作ったイメージを公開レジストリに出しません。 + +### 6. この方針の使い方 + +仕様([SPEC-00](../spec/00_overview.md)〜[SPEC-06](../spec/06_documentation_conventions.md))がこの立場を実装します。決定の記録([ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md)〜[ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md))が個々の選択の理由を説明します。仕様とこの方針が食い違ったら、同じコミットで両方を直し、版の行に分かったことを書きます。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Repository | A folder that remembers every change, so you can always go back. | 変更を全部覚えているフォルダ。いつでも前に戻せる。 | +| SHA | The fingerprint of one saved change (commit); no two are alike. | 保存した変更(コミット)一つの指紋。同じものは二つない。 | +| Manifest | The list of which repositories, at which SHA, we build from. | どのリポジトリのどの SHA から組み立てるかの一覧。 | +| EOL | End of life: the makers no longer fix it. | 作った人が直してくれなくなった状態。 | +| Security gate | A checkpoint the build must pass before anyone may use it. | 通らないと使えない検問所。 | +| AI red team | A team that attacks our own system, in isolation, to find holes first. | 隔離した中で自分のシステムを攻めて、穴を先に見つける係。 | +| Force push | Overwriting shared history on GitHub; forbidden here. | GitHub 上の共有の履歴を上書きすること。ここでは禁止。 | + +Full shared glossary: [REF-01 Glossary](../reference/REF-01_Glossary.md). diff --git a/docs/policy/README.md b/docs/policy/README.md new file mode 100644 index 0000000..a47f584 --- /dev/null +++ b/docs/policy/README.md @@ -0,0 +1,105 @@ +# Policy / 方針 + +> **Summary:** Documents stating our position on what we will and will not do: developer environment goals, security stance, human/AI responsibilities. Each document states our position on a topic; specifications implement the stance. +> **概要:** 我々が何をし、何をしないかの立場を述べる文書:開発環境のゴール、セキュリティの姿勢、人と AI の責任。各文書はトピックに関する私たちの立場を述べ、仕様がその立場を実装します。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.1 — 2026-11-05. **Learned:** writing the stance down first showed that "public documentation, private code" is not a detail but the rule every other document depends on. / 立場を先に書いてみると、「文書は公開、コードは非公開」が細部ではなく他の全文書の前提だと分かった。 +- Normative for: [POL-01 Position](./POL-01_Developer_Environment_2027_Position.md) and future policy documents. +- Related: [../README.md](../README.md) · [../spec/](../spec/) · [decisions/](../decisions/) · [reference/REF-01_Glossary.md](./../reference/REF-01_Glossary.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. What belongs here + +A *policy* is the position we take. This folder contains: + +| File | Purpose | +|---|---| +| [POL-01_Developer_Environment_2027_Position.md](./POL-01_Developer_Environment_2027_Position.md) | Our stance on why and how we build the developer environment 2027. | + +Future policies may include: + +| Topic | Description | +|---|---| +| POL-02 | Folder and file naming rules | +| POL-03 | Pull request rules | +| POL-04 | Release process | +| POL-05 | Human/AI responsibilities | + +### 2. How policies relate to other documents + +```mermaid +flowchart TD + P[Policy: position on a topic] --> S[Spec: rules to implement] + P --> A[Decision record: why we chose this] + S --> C[Code: implement the rule] + A --> C +``` + +### 3. Creating a new policy + +1. Name the file `POL-NN_<Title>.md` (two-digit number). +2. Follow [SPEC-06 documentation conventions](../spec/06_documentation_conventions.md). +3. Link to other documents that depend on this policy. +4. The owner approves; AID (the role that writes code and documents to the specification; see [REF-01](../reference/REF-01_Glossary.md)) writes the implementation spec. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. ここに属するもの + +「方針」は私たちの立場を書いたものです。このフォルダには次が含まれます: + +| ファイル | 目的 | +|---|---| +| [POL-01_Developer_Environment_2027_Position.md](./POL-01_Developer_Environment_2027_Position.md) | 開発環境 2027 版を、なぜ・どのように作るかの立場。 | + +今後の方針として以下が考えられます: + +| トピック | 説明 | +|---|---| +| POL-02 | フォルダとファイル命名規則 | +| POL-03 | プルリクエスト規則 | +| POL-04 | リリースプロセス | +| POL-05 | 人と AI の責任 | + +### 2. 方針が他の文書とどう関係するか + +```mermaid +flowchart TD + P[方針:トピックに関する立場] --> S[仕様:実装するルール] + P --> A[決定の記録:なぜこの道を選んだか] + S --> C[コード:ルールを実装] + A --> C +``` + +### 3. 新しい方針を作るには + +1. ファイル名を `POL-NN_<題>.md`(2 桁の番号)にする。 +2. [SPEC-06 文書規約](../spec/06_documentation_conventions.md)に従う。 +3. この方針に依存する他の文書へリンクする。 +4. 所有者が承認;AID(AI開発担当者。仕様どおりにコードと文書を書く役割。[REF-01](../reference/REF-01_Glossary.md))が実装仕様を書く。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Policy | A statement of our position on what we will and will not do. | 我々が何をし、何をしないかの立場。 | +| Spec | A rule book that implementers must follow. | 実装する人が守るルールブック。 | +| Decision record (ADR) | A note explaining why we chose one way and not another. | なぜその道を選び、ほかを選ばなかったかのメモ。 | +| Implementation | Writing code that follows the spec. | 仕様に従ってコードを書くこと。 | +| Owner | The human who approves policies. | 方針を承認する人。 | diff --git a/docs/reference/README.md b/docs/reference/README.md new file mode 100644 index 0000000..9b35f7b --- /dev/null +++ b/docs/reference/README.md @@ -0,0 +1,93 @@ +# Reference / 参考 + +> **Summary:** External facts such as the shared glossary, tool versions, upstream metadata. Reference documents contain fixed information that other documents link to. +> **概要:** 共通用語集、道具の版、上流メタデータなどの外部事実。参考文書は他の文書がリンクする固定情報を持ちます。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** a shared glossary is needed because the same term (for example "upstream" or "port") appears in several specifications and must mean one thing everywhere. / 同じ用語(例:「上流」「ポート」)が複数の仕様に出てくるため、どこでも一つの意味になるよう共通の用語集が必要だと分かった。 +- Normative for: [REF-01 Glossary](./REF-01_Glossary.md) and future reference documents. +- Related: [../README.md](../README.md) · [policy/](../policy/README.md) · [spec/](../spec/README.md) · [decisions/](../decisions/README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. What belongs here + +A *reference* document contains external facts that other documents link to. This folder contains: + +| ID | File | Purpose | +|---|---|---| +| REF-01 | [REF-01_Glossary.md](./REF-01_Glossary.md) | The shared glossary: technical terms with one-line notes for everyone and precise meanings for engineers. | + +Future reference documents may include: + +| ID | Topic | +|---|---| +| REF-02 | Tool versions and compatibility matrix | +| REF-03 | Upstream repository metadata (default branches, tags) | + +### 2. How reference documents are used + +Reference documents are linked from other documents using relative links: + +- Glossary terms: `[term](../reference/REF-01_Glossary.md#english)` (section anchor) +- Tool versions: `[docker](../reference/REF-02_Tool_Versions.md#english)` (file link) + +### 3. Creating a new reference document + +1. Name the file `REF-NN_<Title>.md` (two-digit number, next available). +2. Follow [SPEC-06 documentation conventions](../spec/06_documentation_conventions.md). +3. Include only fixed facts, not opinions or processes. +4. Link from documents that need the reference. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. ここに属するもの + +「参考」文書は他の文書がリンクする外部事実を含みます。このフォルダには次が含まれます: + +| ID | ファイル | 目的 | +|---|---|---| +| REF-01 | [REF-01_Glossary.md](./REF-01_Glossary.md) | 共通用語集:専門用語に、誰向けに一行の注と技術者向けの正確な意味を付ける。 | + +今後の参考文書として以下が考えられます: + +| ID | トピック | +|---|---| +| REF-02 | 道具の版と互換性マトリクス | +| REF-03 | 上流リポジトリメタデータ(既定ブランチ、タグ) | + +### 2. 参考文書がどう使われるか + +参考文書は他の文書から相対リンクで参照されます: + +- 用語集の語: `[用語](../reference/REF-01_Glossary.md#japanese)`(節アンカー) +- 道具の版: `[docker](../reference/REF-02_Tool_Versions.md#japanese)`(ファイルリンク) + +### 3. 新しい参考文書をつくるには + +1. ファイル名を `REF-NN_<題>.md`(2 桁の番号、次に空いているもの)にする。 +2. [SPEC-06 文書規約](../spec/06_documentation_conventions.md)に従う。 +3. 意見やプロセスではなく、固定事実だけを含む。 +4. 参考が必要な文書へリンクする。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Reference | A document containing external facts that other documents link to. | 他の文書がリンクする外部事実を含む文書。 | +| Glossary | A collection of technical terms with explanations. | 専門用語の集合。 | +| Link | A navigational element that jumps to another part of a document. | 文書の別の部分へ飛ぶナビゲーション要素。 | +| Anchor | A bookmark inside a page that a link can jump to. | ページの中の「しおり」。リンクで飛べる。 | diff --git a/docs/reference/REF-01_Glossary.md b/docs/reference/REF-01_Glossary.md new file mode 100644 index 0000000..a98b5bf --- /dev/null +++ b/docs/reference/REF-01_Glossary.md @@ -0,0 +1,278 @@ +# REF-01 Glossary / 用語集 + +> **Summary:** The shared glossary that [SPEC-06 §3](../spec/06_documentation_conventions.md) refers to. Every technical term used in this project, with a one-line explanation a primary-school child could follow, the precise meaning for engineers, and where the term is used. +> **概要:** [SPEC-06 §3](../spec/06_documentation_conventions.md) が指す共通用語集。このプロジェクトで使う専門用語を、小学生にも分かる一行、技術者向けの正確な意味、使われる場所の三つで説明する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-12. **Learned:** a glossary row that says "today" is stale the day the component is replaced, so the Elasticsearch and MongoDB rows now name the records (ADR-14, ADR-13 §6) that hold the current state. / 「現在は」と書いた用語の行は、その部品が替わった日に古くなる。Elasticsearch と MongoDB の行は、現在の状態を持つ記録(ADR-14、ADR-13 §6)を指すようにした。 + 0.2 — 2026-11-10. **Learned:** a glossary row that names a version goes stale with the first upgrade, so the PostgreSQL row now names the record that set the version (ADR-12). / 版を書いた用語の行は最初の更新で古くなるので、PostgreSQL の行は版を決めた記録(ADR-12)を示す。 + 0.1 — 2026-11-05. **Learned:** listing every term in one place showed that about a third of them (CAS, SAML, IdP/SP, Shibboleth, GakuNin) belong to one topic — login — and that newcomers stumble there first, so the login terms were written to read as one connected story. / 全部の語を一か所に並べてみると、約三分の一(CAS、SAML、IdP/SP、Shibboleth、GakuNin)が「ログイン」という一つの話題に属し、新入社員はまずそこでつまずくと分かった。そこでログインの語は一つの続いた話として読めるように書いた。 +- Applies to: every document in this repository. Documents still add a short note on first use and link here ([SPEC-06 §3](../spec/06_documentation_conventions.md)). `grdm-dev docs check` uses the **Term** column of the English table as its word list. +- Related: [docs/README.md](../README.md) · [SPEC-00 Overview](../spec/00_overview.md) · [SPEC-01 Manifest](../spec/01_manifest.md) · [SPEC-02 Installer CLI](../spec/02_installer_cli.md) · [SPEC-03 Security Gate](../spec/03_security_gate.md) · [SPEC-04 Acceptance Tests](../spec/04_acceptance_tests.md) · [SPEC-05 Upstream Tracking](../spec/05_upstream_tracking.md) · [POL-01](../policy/POL-01_Developer_Environment_2027_Position.md) · [ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md) · [ADR-02](../decisions/ADR-02_Network_Model.md) · [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) · [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### How to read the table + +- **For everyone** is the one-line note that documents copy on first use. +- **For engineers** is the precise meaning. When the two differ in emphasis, the engineer column wins for implementation. +- **Where used** names the documents or commands where the term matters most. Links are relative; private `-dev2027` repositories are named, never linked. +- Terms are grouped by topic, then alphabetical inside the group. Add a term in both halves in the same commit. + +### A. Git and GitHub + +| Term | For everyone | For engineers | Where used | +|---|---|---|---| +| Repository | A folder that remembers every change, so you can always go back. | A Git object store plus working tree, hosted on GitHub under the RCOSDP organization. | everywhere | +| Branch | A separate line of work in a repository, like a side road that can rejoin the main road. | A movable pointer to a commit; `develop` is the integration branch, `upstream/*` are tracking branches. | [ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md), [SPEC-05](../spec/05_upstream_tracking.md) | +| Commit | One saved step of changes with a message saying why. | A snapshot of the tree with parent pointers, author, and message; subjects are Japanese here. | [SPEC-06 §6](../spec/06_documentation_conventions.md) | +| SHA | The fingerprint of one commit; no two are alike. | The SHA-1 (40 hex chars) identifying a commit; the manifest pins full SHAs. | [SPEC-01](../spec/01_manifest.md) | +| Fork | Your own copy of someone's repository that remembers where it came from. | A GitHub-side copy with an upstream link; impossible inside the same organization. | [ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md) | +| Upstream | The original place a copy came from; changes flow down from it. | The source repository or branch we mirror and merge from; tracking branches are named `upstream/<kind>-<branch>` (for example `upstream/public-develop`, `upstream/private-master`, `upstream/cos-develop`). | [SPEC-01 §4](../spec/01_manifest.md), [SPEC-05](../spec/05_upstream_tracking.md) | +| Mirror | An identical copy that is refreshed automatically. | A branch kept equal to an upstream ref by a daily fetch and fast-forward; never edited directly. | [SPEC-05](../spec/05_upstream_tracking.md) | +| Pull request (PR) | A proposed change waiting for someone to review and accept it. | A GitHub review unit; every change to `develop` goes through one; reviewed by REV, checked by QAE, merged by the owner. | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | +| Merge | Accepting a change into the shared branch. | Creating a merge commit on the target branch; here only a human merges; no force-push. | [POL-01 §2](../policy/POL-01_Developer_Environment_2027_Position.md) | +| Manifest | The list of which repositories, at which SHA, we build from. | `manifest/upstreams.json` (canonical) with a TOON excerpt; names, branches, SHAs, dates, PR numbers only. | [SPEC-01](../spec/01_manifest.md) | +| GitHub Actions | GitHub's robot that runs checks whenever code changes. | GitHub's CI service; workflows under `.github/workflows/` run link checks, secret scans, MkDocs, Semgrep, amd64 builds, Trivy. | [SPEC-03](../spec/03_security_gate.md) | +| Self-hosted runner | Our own computer that GitHub's robot borrows to run checks. | A GitHub Actions runner on the Mac Studio for arm64 builds and Playwright acceptance; private repositories only. | [SPEC-04](../spec/04_acceptance_tests.md) | +| CI | Continuous integration: automatic checks on every change. | The set of required workflows that must pass before a PR can be merged. | [SPEC-03](../spec/03_security_gate.md) | + +### B. Containers and platforms + +| Term | For everyone | For engineers | Where used | +|---|---|---|---| +| Container | A box that holds one program and everything it needs, so it runs the same anywhere. | An isolated process group sharing the host kernel, created from an image; runs non-root here. | [SPEC-02](../spec/02_installer_cli.md) | +| Image | The recipe and ingredients a container is made from. | A layered, read-only filesystem built from a Dockerfile; built locally by default, optionally pushed to a private registry. | [SPEC-02](../spec/02_installer_cli.md) | +| Docker | The tool that builds images and runs containers. | Docker Engine 27 or newer (29.x on the Mac Studio) with the Compose and buildx plugins; the only container runtime supported by the installer. | [SPEC-02](../spec/02_installer_cli.md) | +| Docker Compose | A tool that starts many containers together from one file. | The `docker compose` plugin (v2 or newer; 5.x on the Mac Studio) reading the generated `runtime/docker-compose.yml`; provides the internal network and DNS. | [ADR-02](../decisions/ADR-02_Network_Model.md) | +| buildx | Docker's helper that builds one image for several kinds of computer at once. | The BuildKit-based builder; `--platform linux/amd64,linux/arm64` produces multi-architecture images. | [SPEC-02](../spec/02_installer_cli.md) | +| Multi-architecture (arm64 / amd64) | Making the same program run on both kinds of computer chip. | Building images for `linux/arm64` (Apple Silicon, ARM servers) and `linux/amd64` (Intel/AMD); the installer selects `platform` automatically. | [SPEC-02](../spec/02_installer_cli.md) | +| Apple Silicon | The chips Apple puts in its Macs since 2020. | arm64 CPUs (M-series); the primary development target on the Mac Studio. | [SPEC-00](../spec/00_overview.md) | +| WSL2 | A way to run Linux inside Windows. | Windows Subsystem for Linux 2; Docker Desktop with the WSL2 backend is the supported Windows 11 path. | [SPEC-02](../spec/02_installer_cli.md) | +| Loopback / localhost | The network path that leads back to your own computer. | The `lo` interface; `127.0.0.1` (IPv4) and `::1` (IPv6); the only publishing address allowed. | [ADR-02](../decisions/ADR-02_Network_Model.md) | +| Port | A numbered door on an address through which one program listens. | A TCP/UDP port; default host ports (`5000` web, `8000` api, `8001` admin, `7777` wb, `7778` mfr, `8080` fakecas, `4200` ember) are defined in the ports table of SPEC-02 §4. | [SPEC-02 §4](../spec/02_installer_cli.md#2-en-ports), [ADR-02](../decisions/ADR-02_Network_Model.md) | +| Non-root | Running as an ordinary user, not as the all-powerful administrator. | Containers run with a non-zero UID; no `sudo` anywhere in the installer. | [SPEC-03](../spec/03_security_gate.md) | +| venv | A private box of Python tools for one project so projects do not fight. | A Python virtual environment; the installer, `grdm-dev`, and Playwright tests share one venv. | [SPEC-02](../spec/02_installer_cli.md) | +| EOL | End of life: the makers no longer fix bugs or security holes. | A version past its vendor support date; all current upstream base images are EOL and are replaced in M4–M5. | [POL-01 §1](../policy/POL-01_Developer_Environment_2027_Position.md) | + +### C. Security + +| Term | For everyone | For engineers | Where used | +|---|---|---|---| +| Vulnerability | A weak spot an attacker could use to get in. | A security defect, typically tracked as a CVE with a severity rating. | [SPEC-03](../spec/03_security_gate.md) | +| CVE | A public ID number given to one known security hole. | Common Vulnerabilities and Exposures identifier (`CVE-YYYY-NNNNN`) with CVSS severity; gate thresholds are CRITICAL/HIGH. | [SPEC-03](../spec/03_security_gate.md), [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) | +| SBOM | A full list of every ingredient inside our software. | Software Bill of Materials (CycloneDX or SPDX) produced per image by Trivy. | [SPEC-03](../spec/03_security_gate.md) | +| Secret | A password or key that must never be written where others can read it. | Credentials and tokens; generated as random values at install time, never committed; secret scanning is mandatory in CI. | [SPEC-03](../spec/03_security_gate.md) | +| Allow-list | A short list of known problems we have looked at and accept for now. | Accepted CVEs with reason, owner, and expiry in `manifest/allowlist.json`; the count must shrink at each milestone. | [SPEC-03 §5](../spec/03_security_gate.md), [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) | +| Security gate | A checkpoint the build must pass before anyone may use it. | The staged policy: report-only (M1–M3), stop on HIGH (M4), zero CRITICAL/HIGH plus red-team pass (M5). | [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) | +| Trivy | A scanner that reads our images and lists the holes it knows about. | Aqua Security's scanner for images and filesystems; produces SBOM and CVE reports; Grype is the alternative. | [SPEC-03](../spec/03_security_gate.md) | +| Semgrep | A tool that reads source code looking for dangerous patterns. | Static analysis (SAST) with rule packs; runs in CI on every PR; CodeQL is the alternative. | [SPEC-03](../spec/03_security_gate.md) | +| OWASP ZAP | A tool that pokes at a running website the way an attacker would. | Dynamic application security testing (DAST) proxy from OWASP; run against the local instance only. | [SPEC-03](../spec/03_security_gate.md) | +| Red team | People or programs that attack our own system on purpose to find holes first. | Approved AI red team working only against our own instance inside an isolated network; approval procedure in SPEC-03. | [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) | + +### D. Testing and quality + +| Term | For everyone | For engineers | Where used | +|---|---|---|---| +| Unit test | A check that one small piece works on its own. | A test of a single function or class in isolation; Python `unittest`/pytest. | [SPEC-04](../spec/04_acceptance_tests.md) | +| Integration test | A check that several pieces work together. | A test across service boundaries (for example web calls wb through the Compose network). | [SPEC-04](../spec/04_acceptance_tests.md) | +| Acceptance test | A check that the whole thing does what the user asked for. | End-to-end scenarios through the browser: login, project creation, file up/download, wiki co-edit, preview, institution admin; each with a success and a rejection case. | [SPEC-04](../spec/04_acceptance_tests.md) | +| Regression test | A check that something that used to work still works. | Re-running earlier acceptance and unit suites after each change; required before merge. | [SPEC-04](../spec/04_acceptance_tests.md) | +| Playwright | A robot that drives a web browser to test a website. | Playwright for Python running in the shared venv against Chromium on `127.0.0.1`. | [SPEC-04](../spec/04_acceptance_tests.md) | + +### E. Documents and data formats + +| Term | For everyone | For engineers | Where used | +|---|---|---|---| +| MkDocs | A tool that turns Markdown files into a website. | MkDocs with the Material theme; `grdm-dev docs` builds `site/`; published on GitHub Pages. | [SPEC-06 §5](../spec/06_documentation_conventions.md) | +| Mermaid | A way to draw diagrams by typing text. | Fenced ```` ```mermaid ```` blocks rendered by GitHub and MkDocs; the only allowed form for architecture and flow diagrams. | [SPEC-06 §4](../spec/06_documentation_conventions.md) | +| TOON | A compact text form of JSON data that people and AI read easily. | Token-Oriented Object Notation; used for data in documents; canonical data stays in JSON/YAML and `grdm-dev manifest check` verifies they agree. | [SPEC-06 §4](../spec/06_documentation_conventions.md) | +| JSON | A plain-text way to write data with braces and quotes that programs read easily. | JavaScript Object Notation; canonical format for the manifest and reports. | [SPEC-01](../spec/01_manifest.md) | +| YAML | A plain-text way to write data with indentation that people read easily. | Used for Compose files, MkDocs, and GitHub Actions workflows. | [SPEC-02](../spec/02_installer_cli.md) | + +### F. Login and identity + +| Term | For everyone | For engineers | Where used | +|---|---|---|---| +| CAS | A login service that many websites share: log in once, use them all. | Central Authentication Service protocol; GRDM's `cas-overlay` implements it and OSF web/api trust it. | [SPEC-04](../spec/04_acceptance_tests.md) | +| fakecas | A pretend CAS for developers: any name logs in, no password. | A tiny Go service standing in for cas-overlay in development; mutually exclusive with Shibboleth in acceptance. | [ADR-02](../decisions/ADR-02_Network_Model.md), [SPEC-04](../spec/04_acceptance_tests.md) | +| SAML | A standard way for one website to tell another "yes, this person has logged in". | Security Assertion Markup Language 2.0; XML assertions between IdP and SP. | [SPEC-04](../spec/04_acceptance_tests.md) | +| IdP / SP | IdP is the place where you log in; SP is the website that trusts it. | Identity Provider and Service Provider in SAML; a test IdP container is bundled for acceptance. | [SPEC-04](../spec/04_acceptance_tests.md) | +| Shibboleth | Software that makes SAML login work for universities. | The Shibboleth SP (Apache module) in `RDM-Shibboleth-SP`; the subsystem that connects GRDM to GakuNin. | [SPEC-00](../spec/00_overview.md) | +| GakuNin | Japan's academic network for logging in with your university account. | The Japanese academic access management federation operated by NII; GRDM accepts GakuNin IdPs through Shibboleth. | [SPEC-00](../spec/00_overview.md) | + +### G. GRDM components and upstream + +| Term | For everyone | For engineers | Where used | +|---|---|---|---| +| OSF / COS | OSF is the website for sharing research that GRDM is built on; COS is the group in the US that makes it. | Open Science Framework by the Center for Open Science; `CenterForOpenScience/*` is tracked as `upstream/cos-develop`. | [ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md) | +| osf.io | The main part of GRDM: the website and its API. | Django application (`RDM-osf.io`); services `web`, `api`, `admin`, `worker`. | [SPEC-00](../spec/00_overview.md) | +| waterbutler (wb) | The part that moves files in and out of storage. | Python/aiohttp file-access service (`RDM-waterbutler`); services `wb`, `wb_worker`. | [SPEC-00](../spec/00_overview.md) | +| modular-file-renderer (mfr) | The part that shows a preview of a file in the browser. | Python/aiohttp rendering service (`RDM-modular-file-renderer`); service `mfr`. | [SPEC-00](../spec/00_overview.md) | +| ember-osf-web | The newer web pages of GRDM. | Ember.js front end (`RDM-ember-osf-web`); service `ember_osf_web`. | [SPEC-00](../spec/00_overview.md) | +| cas-overlay | GRDM's real login server. | Apereo CAS overlay (`RDM-cas-overlay`, JDK); service `cas`. | [SPEC-00](../spec/00_overview.md) | +| wiki-frontend | The wiki editor pages. | Front end for the GRDM wiki (`RDM-wiki-frontend`), paired with y-websocket for live co-editing. | [SPEC-00](../spec/00_overview.md) | +| y-websocket | The helper that lets two people edit the same wiki page at once. | Yjs WebSocket server (`RDM-y-webocket-develop-private`; repository name carries the upstream spelling) for collaborative editing. | [SPEC-00](../spec/00_overview.md) | +| OASys | A GRDM subsystem (private) added in M3. | Subsystem from `RDM-OASys-main-private`; scope and tests defined in M3. | [SPEC-00](../spec/00_overview.md) | +| rdmcp / MCP | A way for AI assistants to talk to GRDM through a standard plug. | Model Context Protocol server for GRDM (`RDM-rdmcp-private`). | [SPEC-00](../spec/00_overview.md) | +| AIPF | A GRDM data connector for the AI platform (private). | `RDM-aipf_mcp_data_grdm-private`, an MCP data source for GRDM. | [SPEC-00](../spec/00_overview.md) | +| Elasticsearch | The search engine inside GRDM. | ES 8.19 for osf.io's search ([ADR-14](../decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md)); ES 6.8 stays only for the metrics client. | [POL-01 §4](../policy/POL-01_Developer_Environment_2027_Position.md) | +| PostgreSQL | The main database where GRDM keeps its records. | PostgreSQL 18 (ADR-12); it was 9.6 until 2026-11. | [POL-01 §4](../policy/POL-01_Developer_Environment_2027_Position.md) | +| MongoDB | An older database GRDM still uses for a few things. | MongoDB 3.4 (sharejs); retired together with sharejs ([ADR-13 §6](../decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md#english)). | [POL-01 §4](../policy/POL-01_Developer_Environment_2027_Position.md) | +| RabbitMQ | The message queue: a line where jobs wait for a worker. | AMQP broker used by Celery workers in osf.io. | [SPEC-00](../spec/00_overview.md) | +| Redis | A very fast memory store used for caching and sessions. | In-memory key-value store used by osf.io and wb/mfr. | [SPEC-00](../spec/00_overview.md) | + +### H. AI tools and roles + +| Term | For everyone | For engineers | Where used | +|---|---|---|---| +| LLM / local LLM | A large language model is an AI that reads and writes text; a local one runs on our own computer. | A local LLM (Qwen 3 Coder Next via LM Studio) powers AID workers; nothing from private code is sent to external models without the data-handling rules in POL-05. | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | +| Orca | The desk where our AI workers sit: it opens workspaces and terminals for them. | The orchestration tool that runs Open Code 2 and Codex workers in separate worktrees. | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | +| Open Code 2 | The AI program that writes the code (our AID worker). | The implementation agent running on the local LLM inside Orca. | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | +| Codex | The AI program that reviews every PR (our REV). | Codex Astra (`gpt-6-astra`) as an Orca worker; records reviews in `docs/reviews/` and PR comments. | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | +| Claude Code | The AI program that writes specifications and checks results (our QAE). | Claude Code (Fable) running this plan's QA, regression and acceptance judgement. | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | +| AID | AI Developer: the role that writes code and documents to spec. | Role code from the team table; held by Open Code 2 workers. | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | +| QAE | QA Engineer: the role that checks and judges. | Role code; held by Claude Code Fable. | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | +| REV | Reviewer: the role that independently reviews each PR. | Role code; held by Codex Astra. | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 表の読み方 + +- **みんな向け** は、文書が初出で写す一行の注です。 +- **技術者向け** は正確な意味です。重点が違うときは、実装では技術者向けの列が優先します。 +- **使われる場所** は、その語が最も効く文書やコマンドです。リンクは相対で、非公開の `-dev2027` は名前だけを書きリンクしません。 +- 語は話題で分け、その中では英語の表と同じ順です。語を足すときは、英和の両方を同じコミットで足します。 + +### A. Git と GitHub + +| 用語 | みんな向け | 技術者向け | 使われる場所 | +|---|---|---|---| +| リポジトリ(repository) | 変更を全部覚えているフォルダ。いつでも前に戻せる。 | Git のオブジェクト保存庫と作業ツリー。RCOSDP 組織の GitHub に置く。 | 全文書 | +| ブランチ(branch) | リポジトリの中の別の作業の道。脇道で、あとで本道に戻れる。 | コミットを指す動くポインタ。`develop` が統合ブランチ、`upstream/*` が追跡ブランチ。 | [ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md)、[SPEC-05](../spec/05_upstream_tracking.md) | +| コミット(commit) | 変更の一歩を、理由のメッセージ付きで保存したもの。 | ツリーのスナップショットに親・作者・メッセージが付いたもの。件名は日本語。 | [SPEC-06 §6](../spec/06_documentation_conventions.md) | +| SHA | コミット一つの指紋。同じものは二つない。 | コミットを識別する SHA-1(16 進 40 文字)。manifest は完全な SHA を固定する。 | [SPEC-01](../spec/01_manifest.md) | +| フォーク(fork) | 他人のリポジトリの自分用の写し。出どころを覚えている。 | GitHub 側の写しで upstream へのリンクを持つ。同じ組織内には作れない。 | [ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md) | +| 上流(upstream) | 写しの元の場所。変更はそこから流れてくる。 | ミラーしマージする元のリポジトリやブランチ。追跡ブランチの名前は `upstream/<kind>-<branch>`(例: `upstream/public-develop`、`upstream/private-master`、`upstream/cos-develop`)。 | [SPEC-01 §4](../spec/01_manifest.md)、[SPEC-05](../spec/05_upstream_tracking.md) | +| ミラー(mirror) | 自動で更新される、そっくり同じ写し。 | 日次の fetch と fast-forward で上流の参照と等しく保つブランチ。直接編集しない。 | [SPEC-05](../spec/05_upstream_tracking.md) | +| プルリクエスト(PR) | 誰かが見て受け入れるのを待っている、変更の提案。 | GitHub のレビュー単位。`develop` への変更はすべて PR を通り、REV がレビュー、QAE が検査、所有者がマージ。 | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | +| マージ(merge) | 変更を共有のブランチへ受け入れること。 | 対象ブランチにマージコミットを作ること。ここでは人だけがマージし、force push はしない。 | [POL-01 §2](../policy/POL-01_Developer_Environment_2027_Position.md) | +| manifest | どのリポジトリのどの SHA から組み立てるかの一覧。 | `manifest/upstreams.json`(正本)と TOON 抄録。名前・ブランチ・SHA・日付・PR 番号のみ。 | [SPEC-01](../spec/01_manifest.md) | +| GitHub Actions | コードが変わるたびに検査を走らせる GitHub のロボット。 | GitHub の CI。`.github/workflows/` のワークフローがリンク検査・秘密スキャン・MkDocs・Semgrep・amd64 ビルド・Trivy を走らせる。 | [SPEC-03](../spec/03_security_gate.md) | +| セルフホストランナー | GitHub のロボットが検査のために借りる、私たちの計算機。 | Mac Studio 上の GitHub Actions ランナー。arm64 ビルドと Playwright 受入に使い、非公開リポジトリ限定。 | [SPEC-04](../spec/04_acceptance_tests.md) | +| CI | continuous integration。変更ごとに自動で走る検査。 | PR をマージする前に合格が必須のワークフローの集まり。 | [SPEC-03](../spec/03_security_gate.md) | + +### B. コンテナと実行環境 + +| 用語 | みんな向け | 技術者向け | 使われる場所 | +|---|---|---|---| +| コンテナ(container) | 一つのプログラムと必要なものを一箱に入れ、どこでも同じように動かす箱。 | ホストのカーネルを共有する隔離されたプロセス群。イメージから作り、ここでは非 root で動かす。 | [SPEC-02](../spec/02_installer_cli.md) | +| イメージ(image) | コンテナを作るためのレシピと材料。 | Dockerfile から作る層状の読み取り専用ファイルシステム。既定はローカルビルド、任意で非公開レジストリへ。 | [SPEC-02](../spec/02_installer_cli.md) | +| Docker | イメージを作り、コンテナを動かす道具。 | Docker Engine 27 以上(Mac Studio では 29.x)と Compose・buildx プラグイン。インストーラーが対応する唯一のコンテナ実行基盤。 | [SPEC-02](../spec/02_installer_cli.md) | +| Docker Compose | 一つのファイルから多くのコンテナをまとめて起こす道具。 | 生成した `runtime/docker-compose.yml` を読む `docker compose` プラグイン(v2 以上。Mac Studio では 5.x)。内部ネットワークと DNS を提供する。 | [ADR-02](../decisions/ADR-02_Network_Model.md) | +| buildx | 一つのイメージを何種類かの計算機向けに一度に作る Docker の助手。 | BuildKit ベースのビルダー。`--platform linux/amd64,linux/arm64` で複数アーキテクチャのイメージを作る。 | [SPEC-02](../spec/02_installer_cli.md) | +| マルチアーキテクチャ(arm64 / amd64) | 同じプログラムを、二種類のチップの計算機で動かすこと。 | `linux/arm64`(Apple Silicon、ARM サーバ)と `linux/amd64`(Intel/AMD)向けのイメージを作る。インストーラーが `platform` を自動判定する。 | [SPEC-02](../spec/02_installer_cli.md) | +| Apple Silicon | 2020 年から Apple が Mac に入れているチップ。 | arm64 の CPU(M シリーズ)。Mac Studio 上の主な開発対象。 | [SPEC-00](../spec/00_overview.md) | +| WSL2 | Windows の中で Linux を動かす仕組み。 | Windows Subsystem for Linux 2。WSL2 バックエンドの Docker Desktop が Windows 11 で対応する経路。 | [SPEC-02](../spec/02_installer_cli.md) | +| ループバック / localhost | 自分の計算機へ戻ってくるネットワークの道。 | `lo` インタフェース。`127.0.0.1`(IPv4)と `::1`(IPv6)。公開を許す唯一のアドレス。 | [ADR-02](../decisions/ADR-02_Network_Model.md) | +| ポート(port) | アドレスに付いた番号付きの扉。プログラムはここで待つ。 | TCP/UDP のポート。既定のホスト側ポート(`5000` web、`8000` api、`8001` admin、`7777` wb、`7778` mfr、`8080` fakecas、`4200` ember)は SPEC-02 §4 のポート表で定める。 | [SPEC-02 §4](../spec/02_installer_cli.md#2-ja-ports)、[ADR-02](../decisions/ADR-02_Network_Model.md) | +| 非 root(non-root) | なんでもできる管理者ではなく、普通の利用者として動かすこと。 | コンテナは 0 以外の UID で動く。インストーラーのどこにも `sudo` がない。 | [SPEC-03](../spec/03_security_gate.md) | +| venv | プロジェクトごとの Python 道具箱。プロジェクト同士がけんかしない。 | Python の仮想環境。インストーラー、`grdm-dev`、Playwright 試験が一つの venv を共有する。 | [SPEC-02](../spec/02_installer_cli.md) | +| EOL | end of life。作った人がバグや穴を直してくれなくなった状態。 | ベンダーのサポート期限を過ぎた版。現在の上流の土台イメージはすべて EOL で、M4〜M5 で置き換える。 | [POL-01 §1](../policy/POL-01_Developer_Environment_2027_Position.md) | + +### C. セキュリティ + +| 用語 | みんな向け | 技術者向け | 使われる場所 | +|---|---|---|---| +| 脆弱性(vulnerability) | 攻撃者が入り込める弱い場所。 | セキュリティ上の欠陥。多くは CVE として深刻度付きで追跡される。 | [SPEC-03](../spec/03_security_gate.md) | +| CVE | 既知の穴一つに付けられた公開の番号。 | Common Vulnerabilities and Exposures の識別子(`CVE-YYYY-NNNNN`)と CVSS 深刻度。門の閾値は CRITICAL/HIGH。 | [SPEC-03](../spec/03_security_gate.md)、[ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) | +| SBOM | ソフトウェアの中身の材料をすべて書いた一覧。 | Software Bill of Materials(CycloneDX か SPDX)。Trivy がイメージごとに出す。 | [SPEC-03](../spec/03_security_gate.md) | +| 秘密(secret) | 他人が読める場所に書いてはいけないパスワードや鍵。 | 資格情報とトークン。導入時に乱数で生成し、コミットしない。CI の秘密スキャンは必須。 | [SPEC-03](../spec/03_security_gate.md) | +| 許容リスト(allow-list) | 見た上で今は受け入れる、既知の問題の短い一覧。 | 理由・担当・期限付きで受け入れた CVE を `manifest/allowlist.json` に置く。件数は節目ごとに減らす。 | [SPEC-03 §5](../spec/03_security_gate.md)、[ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) | +| セキュリティ門(security gate) | 通らないと使えない検問所。 | 段階方式: 報告のみ(M1〜M3)、HIGH で停止(M4)、CRITICAL/HIGH ゼロとレッドチーム合格(M5)。 | [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) | +| Trivy | イメージを読んで、知っている穴を並べるスキャナ。 | Aqua Security のイメージ・ファイルシステム用スキャナ。SBOM と CVE 報告を出す。代替は Grype。 | [SPEC-03](../spec/03_security_gate.md) | +| Semgrep | ソースコードを読んで危ない書き方を探す道具。 | ルールパック付きの静的解析(SAST)。全 PR の CI で走る。代替は CodeQL。 | [SPEC-03](../spec/03_security_gate.md) | +| OWASP ZAP | 動いている Web サイトを、攻撃者のやり方でつつく道具。 | OWASP の動的アプリケーションセキュリティ試験(DAST)プロキシ。ローカルインスタンスだけに向ける。 | [SPEC-03](../spec/03_security_gate.md) | +| レッドチーム(red team) | 穴を先に見つけるために、わざと自分のシステムを攻める人やプログラム。 | 承認済み AI レッドチーム。隔離ネットワーク内の自環境だけを対象にする。承認手順は SPEC-03。 | [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) | + +### D. 試験と品質 + +| 用語 | みんな向け | 技術者向け | 使われる場所 | +|---|---|---|---| +| 単体試験(unit test) | 小さな部品一つが単独で動くかの確認。 | 関数やクラス一つを切り離して試す。Python の `unittest`/pytest。 | [SPEC-04](../spec/04_acceptance_tests.md) | +| 統合試験(integration test) | いくつかの部品が一緒に動くかの確認。 | サービスの境界をまたぐ試験(例: web が Compose ネットワーク経由で wb を呼ぶ)。 | [SPEC-04](../spec/04_acceptance_tests.md) | +| 受入試験(acceptance test) | 全体が利用者の望みどおりに動くかの確認。 | ブラウザを通した端から端までのシナリオ: ログイン、プロジェクト作成、ファイル上下載、Wiki 共同編集、プレビュー、機関管理。各シナリオに成功と拒否のケース。 | [SPEC-04](../spec/04_acceptance_tests.md) | +| 回帰試験(regression test) | 前に動いていたものが、今も動くかの確認。 | 変更ごとに以前の受入・単体の一式を再実行する。マージ前に必須。 | [SPEC-04](../spec/04_acceptance_tests.md) | +| Playwright | Web ブラウザを操作して Web サイトを試すロボット。 | Playwright for Python。共有 venv で、`127.0.0.1` の Chromium に対して走る。 | [SPEC-04](../spec/04_acceptance_tests.md) | + +### E. 文書とデータ形式 + +| 用語 | みんな向け | 技術者向け | 使われる場所 | +|---|---|---|---| +| MkDocs | Markdown のファイルを Web サイトに変える道具。 | Material テーマの MkDocs。`grdm-dev docs` が `site/` を作り、GitHub Pages で公開。 | [SPEC-06 §5](../spec/06_documentation_conventions.md) | +| Mermaid | 文字を打って図を描く仕組み。 | ```` ```mermaid ```` のコードブロック。GitHub と MkDocs が描画する。構成図・流れ図はこれだけを許す。 | [SPEC-06 §4](../spec/06_documentation_conventions.md) | +| TOON | JSON のデータを短く字下げで書いた形。人にも AI にも読みやすい。 | Token-Oriented Object Notation。文書内のデータに使う。正本は JSON/YAML に置き、`grdm-dev manifest check` が一致を確かめる。 | [SPEC-06 §4](../spec/06_documentation_conventions.md) | +| JSON | 波括弧と引用符でデータを書く、プログラムが読みやすい文字の形。 | JavaScript Object Notation。manifest と報告書の正本の形式。 | [SPEC-01](../spec/01_manifest.md) | +| YAML | 字下げでデータを書く、人が読みやすい文字の形。 | Compose ファイル、MkDocs、GitHub Actions のワークフローに使う。 | [SPEC-02](../spec/02_installer_cli.md) | + +### F. ログインと身元 + +| 用語 | みんな向け | 技術者向け | 使われる場所 | +|---|---|---|---| +| CAS | たくさんの Web サイトが共有するログイン係。一度ログインすれば全部使える。 | Central Authentication Service プロトコル。GRDM の `cas-overlay` が実装し、OSF の web/api がそれを信頼する。 | [SPEC-04](../spec/04_acceptance_tests.md) | +| fakecas | 開発者向けの「にせもの CAS」。どんな名前でもパスワードなしで入れる。 | 開発で cas-overlay の代わりに立つ小さな Go のサービス。受入では Shibboleth と排他。 | [ADR-02](../decisions/ADR-02_Network_Model.md)、[SPEC-04](../spec/04_acceptance_tests.md) | +| SAML | ある Web サイトが別のサイトに「この人は確かにログインした」と伝える標準の方法。 | Security Assertion Markup Language 2.0。IdP と SP の間の XML アサーション。 | [SPEC-04](../spec/04_acceptance_tests.md) | +| IdP / SP | IdP はログインする場所、SP はそれを信じる Web サイト。 | SAML の Identity Provider と Service Provider。受入のためにテスト用 IdP コンテナを同梱する。 | [SPEC-04](../spec/04_acceptance_tests.md) | +| Shibboleth | 大学向けに SAML ログインを動かすソフト。 | `RDM-Shibboleth-SP` の Shibboleth SP(Apache モジュール)。GRDM を GakuNin につなぐサブシステム。 | [SPEC-00](../spec/00_overview.md) | +| GakuNin(学認) | 大学のアカウントでログインするための日本の学術ネットワーク。 | NII が運営する日本の学術アクセス管理フェデレーション。GRDM は Shibboleth 経由で GakuNin の IdP を受け入れる。 | [SPEC-00](../spec/00_overview.md) | + +### G. GRDM の部品と上流 + +| 用語 | みんな向け | 技術者向け | 使われる場所 | +|---|---|---|---| +| OSF / COS | OSF は GRDM の土台になった研究共有の Web サイト。COS はそれを作る米国の団体。 | Center for Open Science の Open Science Framework。`CenterForOpenScience/*` を `upstream/cos-develop` として追跡する。 | [ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md) | +| osf.io | GRDM の中心。Web サイトと API。 | Django アプリケーション(`RDM-osf.io`)。サービスは `web`、`api`、`admin`、`worker`。 | [SPEC-00](../spec/00_overview.md) | +| waterbutler(wb) | ファイルを保管場所へ出し入れする部品。 | Python/aiohttp のファイルアクセスサービス(`RDM-waterbutler`)。サービスは `wb`、`wb_worker`。 | [SPEC-00](../spec/00_overview.md) | +| modular-file-renderer(mfr) | ファイルのプレビューをブラウザに見せる部品。 | Python/aiohttp の描画サービス(`RDM-modular-file-renderer`)。サービスは `mfr`。 | [SPEC-00](../spec/00_overview.md) | +| ember-osf-web | GRDM の新しい方の Web 画面。 | Ember.js のフロントエンド(`RDM-ember-osf-web`)。サービスは `ember_osf_web`。 | [SPEC-00](../spec/00_overview.md) | +| cas-overlay | GRDM の本物のログインサーバ。 | Apereo CAS のオーバーレイ(`RDM-cas-overlay`、JDK)。サービスは `cas`。 | [SPEC-00](../spec/00_overview.md) | +| wiki-frontend | Wiki の編集画面。 | GRDM Wiki のフロントエンド(`RDM-wiki-frontend`)。共同編集は y-websocket と組む。 | [SPEC-00](../spec/00_overview.md) | +| y-websocket | 二人が同じ Wiki ページを同時に編集できるようにする裏方。 | 共同編集のための Yjs WebSocket サーバ(`RDM-y-webocket-develop-private`。リポジトリ名は上流の綴りのまま)。 | [SPEC-00](../spec/00_overview.md) | +| OASys | M3 で加える GRDM のサブシステム(非公開)。 | `RDM-OASys-main-private` のサブシステム。範囲と試験は M3 で定める。 | [SPEC-00](../spec/00_overview.md) | +| rdmcp / MCP | AI アシスタントが標準の差し込み口で GRDM と話す仕組み。 | GRDM 向けの Model Context Protocol サーバ(`RDM-rdmcp-private`)。 | [SPEC-00](../spec/00_overview.md) | +| AIPF | AI 基盤向けの GRDM データ接続部品(非公開)。 | `RDM-aipf_mcp_data_grdm-private`。GRDM の MCP データソース。 | [SPEC-00](../spec/00_overview.md) | +| Elasticsearch | GRDM の中の検索エンジン。 | osf.io の検索は ES 8.19([ADR-14](../decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md))。ES 6.8 はメトリクスのクライアントのためだけに残る。 | [POL-01 §4](../policy/POL-01_Developer_Environment_2027_Position.md) | +| PostgreSQL | GRDM が記録を保存する主なデータベース。 | PostgreSQL 18(ADR-12)。2026-11 までは 9.6。 | [POL-01 §4](../policy/POL-01_Developer_Environment_2027_Position.md) | +| MongoDB | GRDM が一部でまだ使っている古いデータベース。 | MongoDB 3.4(sharejs 用)。sharejs とともに退役した([ADR-13 §6](../decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md#japanese))。 | [POL-01 §4](../policy/POL-01_Developer_Environment_2027_Position.md) | +| RabbitMQ | メッセージの待ち行列。仕事が作業者を待つ列。 | osf.io の Celery ワーカーが使う AMQP ブローカー。 | [SPEC-00](../spec/00_overview.md) | +| Redis | キャッシュやセッションに使う、とても速いメモリの保管庫。 | osf.io と wb/mfr が使うインメモリのキー値ストア。 | [SPEC-00](../spec/00_overview.md) | + +### H. AI の道具と役割 + +| 用語 | みんな向け | 技術者向け | 使われる場所 | +|---|---|---|---| +| LLM / ローカル LLM | 大規模言語モデルは文章を読み書きする AI。ローカル版は自分の計算機で動く。 | ローカル LLM(LM Studio 経由の Qwen 3 Coder Next)が AID ワーカーを動かす。非公開コード由来のものは、POL-05 のデータ取り扱い規則なしに外部モデルへ送らない。 | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | +| Orca | AI ワーカーの作業机。作業場と端末を開いてあげる。 | Open Code 2 と Codex のワーカーを別々の worktree で動かすオーケストレーション道具。 | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | +| Open Code 2 | コードを書く AI プログラム(私たちの AID ワーカー)。 | Orca の中でローカル LLM で動く実装エージェント。 | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | +| Codex | 全 PR をレビューする AI プログラム(私たちの REV)。 | Orca ワーカーとしての Codex Astra(`gpt-6-astra`)。レビューを `docs/reviews/` と PR コメントに記録する。 | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | +| Claude Code | 仕様を書き、結果を検査する AI プログラム(私たちの QAE)。 | この計画の QA・回帰・受入の判定を担う Claude Code(Fable)。 | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | +| AID | AI開発担当者。仕様どおりにコードと文書を書く役割。 | チームの対応表の役割略称。Open Code 2 ワーカーが担う。 | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | +| QAE | QA担当。検査し判定する役割。 | 役割略称。Claude Code Fable が担う。 | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | +| REV | 担当レビュワ。各 PR を独立にレビューする役割。 | 役割略称。Codex Astra が担う。 | [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) | + +--- + +## Glossary / 用語 + +The tables above are the glossary. Documents that use a term from the **Term / 用語** column add a short note on first use and link to the matching section (for example `[REF-01 §C](../reference/REF-01_Glossary.md#english)`). / 上の表そのものが用語集です。**Term / 用語** 列の語を使う文書は、初出で短い注を付け、該当する節へリンクします。 diff --git a/docs/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1.md b/docs/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1.md new file mode 100644 index 0000000..0a3e0f4 --- /dev/null +++ b/docs/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1.md @@ -0,0 +1,140 @@ +# REV M1 Skeleton PR Review r1 / M1 文書骨格 PR レビュー r1 + +> **Summary:** Request changes on PR #19: private repository URLs remain in public text, the secret scanner has no enabled detection rules, despite green CI. Validation and specification defects also need correction. +> **概要:** PR #19 は修正要求。公開文書に非公開リポジトリ URL が残り、秘密スキャナーの検出規則が有効でなく、CI 合格でも保護を保証できません。検査と仕様の不具合も修正が必要です。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** passing local checks did not establish specification compliance: independent parsing found malformed blocks, and source inspection found missing validation. / ローカル検査の合格だけでは仕様準拠を示せず、独立した構文解析とコード確認で構文不正と未実装の検査を確認した。 +- Applies to: PR #19, `feat/m1-skeleton` → `develop`, final reviewed head `1a01c3b1352fb58cfa100e6d200c737213b70464` (updated during review from `df7a4ce`). +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-01](../spec/01_manifest.md) · [SPEC-02](../spec/02_installer_cli.md). +- Used by: owner merge decision and the author's correction pass. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and terms + +**Request changes.** A PR (pull request) is a proposed change awaiting review; this verdict is a review recommendation, not a GitHub approval or merge. P1 means fix before merge because a protection is ineffective or a required check fails; P2 means a reproducible correctness or documentation defect. CI means the automated checks GitHub runs. See the [shared glossary](../reference/REF-01_Glossary.md). + +### Findings, highest severity first + +1. **R1 — P1: prohibited private URLs are published as negative examples.** `manifest/README.md:48–49,102–103` contains actual HTTPS and SSH addresses for the private integration repository. Calling them “never write” examples still publishes them and violates SPEC-06 §5 and the task's publication rule. The PR body's “private URL grep: none” is incorrect. Replace them with non-address prose; scan all tracked files, not just the two data files. No private URL is repeated in this review. + +2. **R2 — P1: gitleaks runs with zero detection rules.** `.gitleaks.toml:6–28` supplies only an allowlist (exceptions to detection), no rules and no `[extend] useDefault = true`. `default = true` at line 28 is inside `[allowlist]` and is not a supported setting that enables defaults. The pinned version's [configuration source](https://github.com/gitleaks/gitleaks/blob/v8.21.2/config/config.go) defines `Extend.UseDefault` and no such allowlist field. The workflow explicitly selects this config at `.github/workflows/security.yml:23`, so its green “68 commits scanned / no leaks found” is not evidence of an effective secret scan. Enable the default rules, remove unsupported `entropy`, and replace the global unanchored 40-hex exemption with narrowly justified exceptions: secret values can also be 40 hex characters. Verify a synthetic secret is rejected without placing it in Git, then rescan history with redacted output. Add a separate private-URL policy check; default secret rules alone do not enforce that policy. + +3. **R3 — P2: declared Trivy coverage is not delivered.** `docs/spec/03_security_gate.md:234,458` promises gitleaks, Semgrep and Trivy on every PR, but `.github/workflows/security.yml:11–59` has no Trivy job. Implement it or explicitly delimit M1's delivered scope. The original Semgrep failure (77 findings) was resolved during review in `1a01c3b` by action SHA pinning and documented exclusions for generated output and legacy examples; [the latest job passes](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42009965678/job/127186166129). That initial failure is no longer an open finding. The owner should explicitly accept the documented legacy deferral. + +4. **R4 — P2: manifest validation does not enforce its advertised contract.** `tools/manifest_check.py:225–235` checks JSON and searches text for URLs, but never calls `validate_toon` or compares JSON and TOON (the compact data notation). Missing TOON passes; changing any TOON SHA, profile, repository, or PR number passes. `validate_component` at lines 122–146 checks only four required fields and validates a SHA only if present. An in-memory component with invalid role and an upstream with no SHA returns no errors; a synthetic token also passes `validate_no_secrets`. Implement SPEC-01 MC-01–11/13 or explicitly document which checks are deferred, without claiming equivalence. The current files do agree semantically, but CI cannot keep them that way. Keep the helper's exit 1 distinct from the future CLI's specified exit 20, or align and document the interface. + +5. **R5 — P2: ZAP is instructed to scan itself.** `docs/spec/03_security_gate.md:98,322` starts ZAP (a scanner of a running web application) inside a container on the internal network, then targets `127.0.0.1:5000/8001/4200`. Loopback in that container names ZAP itself, not the web/admin/ember containers or the host. This conflicts with `docs/decisions/ADR-02_Network_Model.md:53–57,131–135`, which separates service-name traffic inside Compose from host loopback traffic. Specify internal service names and container ports for ZAP, retaining SPEC-02's host-port table for browsers and host-side checks; include port-remapping behavior. + +6. **R6 — P2: one diagram and three data blocks do not parse.** With the site's Mermaid 11.4.1 parser (text-to-diagram syntax), `docs/spec/04_acceptance_tests.md:94` fails: the semicolon in the English sequence-diagram note starts another statement. Use supported note text/escaping and regenerate HTML. TOON 4.4.0 rejects `docs/spec/02_installer_cli.md:133–134,138` because unquoted commas turn two-column exit-code rows into extra columns. `docs/status/upstream/README.md:38–46,92–100` declares 11 tabular rows but supplies an object-style item and an ellipsis. Supply a valid one-item example, or all 11 correctly shaped items. These errors survive MkDocs strict because it does not parse those embedded languages. The Japanese SPEC-04 diagram parses, so the two rendered halves differ. + +7. **R7 — P2: the documentation checker silently skips promised checks and scope.** `tools/docs_check.py:18–43` checks only `docs/` plus root README and excludes legacy content, leaving `manifest/README.md`, installer README and old-path pointers outside SPEC-06 coverage. Lines 96–98 skip every link containing `#`, even when its file does not exist; a call with `absent-file.md#english` returns no errors. Lines 123–126 perform no TOON parity or glossary warning check, despite `docs/spec/06_documentation_conventions.md:87–95`. Check the file portion before the fragment, cover new Markdown throughout the repository, and document an explicit legacy-format exception. The existing 35-file pass is only a subset check. + +8. **R8 — P2: M2 acceptance criteria contradict the profile definition.** `docs/spec/04_acceptance_tests.md:54,59,122` makes C4 depend on `y_websocket`, allows it to skip in `core`, yet requires all C1–C6 success and rejection cases green for M2. SPEC-02's profile table at `docs/spec/02_installer_cli.md:96–99` places that service in `full`; the manifest agrees. Define whether M2 includes this service or explicitly defers C4 to M3, and update both language halves. Otherwise a skipped test can be mistaken for a completed milestone. + +### What was verified + +All commands ran from the repository root. These read-only checks returned exit 0; the second initially reported 35 files; after the concurrent asset-index addition and this review it reported 37 files: + +```sh +python3 tools/manifest_check.py +python3 tools/docs_check.py +``` + +The requested comparison was 506 files changed, 246,242 insertions and 3,246 deletions: + +```sh +git diff develop...feat/m1-skeleton --stat +``` + +- Searched tracked text across the full tree, including site HTML, search-index JSON, legacy Markdown, hidden workflow files, and manifest files. Found the four prohibited URL occurrences in R1. Token-format/private-key searches found no additional matching credential. Legacy default JWT/JWE/test-token values and guest broker credentials exist; these are inherited examples, not verified live credentials. The EC2 legacy guide at lines 364/372 and its HTML/search-index copies contain a clearly placeholder-shaped internal hostname. Institutional support addresses and test emails are not evidence of personal-data leakage. No claim of exhaustive secret clearance is made, especially given R2. +- Visually sampled `new-token.png`, `dev-application.png` and `filled-credential.png`: the first has no issued token, while sensitive application/credential values in the latter two are blurred or password-masked. Other images were not exhaustively inspected; a text search cannot inspect their pixels. +- Observed actual GitHub runs: docs links and MkDocs strict pass, manifest passes, gitleaks exits 0 with the R2 limitation, Semgrep initially failed but the latest head passes all five checks (R3 records the remaining coverage gap). Successful jobs establish usable YAML, action versions, Python 3.11 and pinned MkDocs requirements on the hosted runner. The gitleaks Docker invocation and Semgrep container actually start. Local Docker daemon was unavailable, so containers were not rerun locally. +- Independently parsed all 34 Mermaid and 44 TOON fences in tracked Markdown using Mermaid 11.4.1, a DOM shim (browser-like objects for the parser), and `@toon-format/toon` 4.4.0 installed in a temporary directory outside the repository. Results: 33/34 Mermaid and 41/44 TOON pass. Parsed `manifest/upstreams.toon` and compared its specified projection with JSON: equal, including upstream fields and adopted PRs. This establishes semantic equality, not byte-for-byte output from an unimplemented CLI generator. +- Checked JSON required component fields, roles, profiles, core platforms, SHA shape, service names and tracking-name rules. Counted 20 components, 11 integration repositories, 8 adopted PRs and 25 candidates, matching the PR body. The requested authenticated branch query for `RDM-osf.io-dev2027` returns `develop`, `integrate/public-develop-20261105`, `upstream/public-develop`, `upstream/private-develop`, `upstream/cos-develop`, and `upstream/private-sec-test-fix-sec-test`; all four required tracking branches match SPEC-01 rule 7. Reachability and all 11 repositories' creation/mirroring were not independently audited. +- Compared SPEC-01–05 with ADR-02 and REF-01. The seven default host ports agree; exit 20/40/50–53/60 and principal subcommand names agree at specification level. R5 and R8 are behavioral contradictions despite matching numbers. Legacy guides are intentionally historical; they should not be read as current installation procedures. +- English/Japanese core sections largely align. First-use explanations exist for central terms but full SPEC-06 term-by-term compliance is not established. “Learned” claims about the eleven-upstream survey (`SPEC-05:8`) and newcomer behavior (`REF-01:8`) lack linked evidence in this PR; they are unverified, not proven fabricated. Provide the evidence or phrase them as design rationale. No mixed-language corruption was identified in the reviewed normative text. +- The claimed normative documents, guide pointers, committed site, requirements, and two workflows exist. M2 installer/acceptance implementations are not claimed M1 deliveries. The initial integration-order exception remains explicitly proposed in ADR-01 §5. Commit messages and the PR body carry a Claude session link; its accessibility/content was not inspected. + +### Owner decisions + +Resolve R1–R8 before merging. Decide the M1 Semgrep/Trivy enforcement scope, the M2 C4 scope, and whether to accept ADR-01 §5's bootstrap interpretation. Decide whether the Claude session link belongs in public metadata after assessing its sharing visibility; no session content is reproduced here. Approving the bootstrap exception must be reflected in SPEC-01 and the affected records, not silently treated as already approved. Add evidence for empirical “Learned” claims or reword them. Author corrections should regenerate `site/` and rerun both parser checks and hosted CI. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と用語 + +**Request changes(修正要求)。** PR(プルリクエスト)はレビューを待つ変更提案です。この判定は推奨であり、GitHub の承認やマージではありません。P1 は保護機能が無効または必須検査が失敗するためマージ前に修正すべきもの、P2 は再現可能な仕様・文書・検査の不具合です。CI は GitHub が自動実行する検査です。[共通用語集](../reference/REF-01_Glossary.md)も参照してください。 + +### 重大度順の指摘 + +1. **R1 — P1: 禁止例に実際の非公開 URL を掲載。** `manifest/README.md:48–49,102–103` に非公開統合リポジトリの HTTPS/SSH アドレスが計4件あります。「書かない例」でも公開に当たり、SPEC-06 §5 と今回の公開ルールに違反します。PR 本文の「private URL grep 検出なし」は誤りです。アドレスを含まない説明に置き換え、データ2ファイルだけでなく追跡対象の全ファイルを検査してください。このレビューには該当 URL を転記していません。 + +2. **R2 — P1: gitleaks の検出規則がゼロ。** `.gitleaks.toml:6–28` には allowlist(検出から除外する条件)しかなく、規則も `[extend] useDefault = true` もありません。28行の `default = true` は `[allowlist]` 内にあり、既定規則を有効にする設定ではありません。固定版の[設定コード](https://github.com/gitleaks/gitleaks/blob/v8.21.2/config/config.go)は `Extend.UseDefault` を定義し、該当 allowlist 項目は定義していません。`.github/workflows/security.yml:23` がこの設定を指定するため、「68 commits scanned / no leaks found」の成功表示は有効な秘密検査の証拠になりません。既定規則を有効化し、未対応の `entropy` を削除し、全域の40桁16進除外を根拠のある狭い例外へ変更してください。秘密も40桁16進になり得ます。Git に入れない模擬秘密で拒否を確認し、伏字で履歴を再検査してください。非公開 URL は既定の秘密規則だけでは禁止できないため、別の公開ポリシー検査も必要です。 + +3. **R3 — P2: 約束した Trivy の検査がない。** `docs/spec/03_security_gate.md:234,458` は全 PR で gitleaks・Semgrep・Trivy を要求しますが、`.github/workflows/security.yml:11–59` に Trivy ジョブはありません。実装するか M1 の提供範囲を明示してください。初回 Semgrep の77件の失敗は、レビュー中の `1a01c3b` で action SHA 固定と生成物・旧サンプルの理由付き除外により解消し、[最新ジョブは合格](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42009965678/job/127186166129)しています。初回失敗は未解決指摘ではありません。所有者は記録された旧資料の延期を明示的に受け入れる必要があります。 + +4. **R4 — P2: manifest 検査が契約を実施しない。** `tools/manifest_check.py:225–235` は JSON 検査と URL 検索のみで、`validate_toon` の呼び出しも JSON と TOON(短いデータ記法)の比較もありません。TOON 欠落、SHA・profile・repo・PR 番号の変更が合格します。122–146行の `validate_component` は必須4項目だけを検査し、SHA は存在するときだけ検査します。メモリ上の試験で不正 role と SHA のない upstream が無指摘、模擬 token も `validate_no_secrets` を通過しました。SPEC-01 MC-01–11/13 を実装するか、未実装項目を明示し同等と主張しないでください。現行データは一致しますが CI は一致を維持できません。補助ツールの終了1と将来 CLI の終了20は別契約として明示するか統一してください。 + +5. **R5 — P2: ZAP が自分自身を検査する指定。** `docs/spec/03_security_gate.md:98,322` は ZAP(稼働中の Web アプリを検査する道具)を内部ネットワークのコンテナで起動し、`127.0.0.1:5000/8001/4200` を対象にします。そのループバックは ZAP 自身であり、web/admin/ember やホストではありません。`docs/decisions/ADR-02_Network_Model.md:53–57,131–135` の内部サービス名とホスト側ループバックの分離に反します。ZAP には内部サービス名・コンテナ側ポートを指定し、SPEC-02 のホスト側表はブラウザとホスト側検査に使ってください。ポート付け替え時の動作も定めてください。 + +6. **R6 — P2: 図1件・データ3件が構文不正。** サイトと同じ Mermaid 11.4.1(文字から図を作る記法)のパーサーで `docs/spec/04_acceptance_tests.md:94` が失敗します。英語のシーケンス図の注のセミコロンが別の文として解釈されます。対応する記法に直し HTML を再生成してください。TOON 4.4.0 では `docs/spec/02_installer_cli.md:133–134,138` の非引用カンマで終了コード表の列が増えて失敗します。`docs/status/upstream/README.md:38–46,92–100` は11行の表を宣言しつつオブジェクト形式1件と省略記号を載せています。正しい1件の例か11件の表にしてください。MkDocs strict はこれらの内部言語を構文解析しないため見逃します。日本語の SPEC-04 図は解析でき、英和の表示が異なります。 + +7. **R7 — P2: docs チェッカーが範囲と約束した検査を省略。** `tools/docs_check.py:18–43` は `docs/` とルート README だけを検査し旧資料を除外します。`manifest/README.md`、installer README、旧パスの誘導は SPEC-06 検査の対象外です。96–98行は `#` を含むリンクを丸ごと無視し、ファイル自体がない `absent-file.md#english` も無指摘です。123–126行には `docs/spec/06_documentation_conventions.md:87–95` が約束する TOON 一致検査・用語注警告もありません。フラグメントより前のファイルを検査し、新しい Markdown 全体を対象にして、旧資料の形式例外は規約にも明記してください。35件合格は部分検査にすぎません。 + +8. **R8 — P2: M2 受入基準と profile が矛盾。** `docs/spec/04_acceptance_tests.md:54,59,122` は C4 に `y_websocket` を要求し、`core` ではスキップを認めながら、M2 では C1–C6 の成功・拒否ケース全合格を要求します。`docs/spec/02_installer_cli.md:96–99` はそのサービスを `full` に置き、manifest も一致します。M2 に当該サービスを含めるか C4 を M3 に延期するかを決め、両言語を修正してください。スキップを節目完了と誤認するおそれがあります。 + +### 確認したこと + +すべてリポジトリルートで実行しました。次の読み取り検査は終了0で、後者は初回35ファイル、並行した assets 索引追加と本レビュー追加後は37ファイル合格でした。 + +```sh +python3 tools/manifest_check.py +python3 tools/docs_check.py +``` + +指定の差分は506ファイル、追加246,242行、削除3,246行でした。 + +```sh +git diff develop...feat/m1-skeleton --stat +``` + +- サイト HTML・検索 JSON・旧 Markdown・隠し workflow・manifest を含む追跡対象テキスト全体を検索し、R1 の禁止 URL 4件を確認しました。token 形式・秘密鍵の検索では追加の該当認証情報は見つかりませんでした。旧 JWT/JWE/test-token の既定値と guest の接続情報は存在しますが、引き継いだ例であり生きた認証情報とは確認していません。EC2 旧資料364/372行と HTML/検索コピーに明らかな仮値形式の内部ホスト名があります。組織サポートアドレスや試験メールを個人情報漏洩の証拠とは扱いません。特に R2 があるため完全な秘密クリアランスは主張しません。 +- `new-token.png`、`dev-application.png`、`filled-credential.png` を目視確認しました。最初は未発行画面、後二つの機微な値はぼかしまたはパスワード伏字です。他の画像は網羅的に見ていません。文字検索では画素を検査できません。 +- GitHub の実行で docs リンク・MkDocs strict・manifest は合格、gitleaks は R2 の制限付きで終了0、Semgrep は初回失敗しましたが最新 head では5検査すべて合格です(R3 は残る検査範囲の不一致です)。成功ジョブから、YAML・action バージョン・Python 3.11・固定 MkDocs 依存は hosted runner で利用可能と確認できます。gitleaks の Docker 呼び出しと Semgrep コンテナは起動しています。ローカル Docker daemon は利用できず再実行していません。 +- 追跡 Markdown の Mermaid 34件・TOON 44件を Mermaid 11.4.1、DOM shim(パーサー用にブラウザのオブジェクトを用意する仕組み)、`@toon-format/toon` 4.4.0 で独立解析しました。依存はリポジトリ外の一時ディレクトリに置きました。合格は Mermaid 33/34、TOON 41/44。manifest の TOON は解析でき、上流全項目と採用 PR を含む規定の抄録が JSON と意味的に一致しました。未実装 CLI の生成結果とのバイト単位一致は証明していません。 +- JSON の必須部品項目、role、profile、コアの platform、SHA 形式、サービス名、追跡名規則を確認しました。部品20、統合リポジトリ11、採用 PR 8、候補25で PR 本文と一致します。指定の認証付きブランチ照会で `RDM-osf.io-dev2027` は `develop`、`integrate/public-develop-20261105`、`upstream/public-develop`、`upstream/private-develop`、`upstream/cos-develop`、`upstream/private-sec-test-fix-sec-test` を返しました。必須追跡4本は SPEC-01 規則7と一致します。到達性と11リポジトリすべての作成・ミラーは独立監査していません。 +- SPEC-01〜05 と ADR-02、REF-01 を比較しました。ホスト側既定7ポート、終了20/40/50〜53/60、主要サブコマンド名は仕様間で一致します。R5/R8 は数値が一致していても動作が矛盾する点です。旧ガイドは歴史資料であり現行導入手順ではありません。 +- 英和の主要節は概ね対応し、中心用語には初出説明がありますが、全専門語の SPEC-06 準拠までは確認できていません。上流11本の調査(`SPEC-05:8`)と新入社員の行動(`REF-01:8`)の Learned は PR 内に根拠リンクがなく、未検証です。捏造と断定はしません。証拠を添えるか設計理由として記述してください。確認した規範文書に混在言語による文字の破損は見つかりませんでした。 +- 主張される規範文書・ガイド誘導・コミット済み site・依存ファイル・workflow 2本は存在します。M2 のインストーラー・受入実装は M1 の提供物とは主張されていません。初回統合順の例外は ADR-01 §5 で提案中と明記されています。コミットメッセージと PR 本文には Claude セッションリンクがあり、公開状態や内容は調べていません。 + +### 所有者が決めること + +マージ前に R1〜R8 を解消してください。M1 の Semgrep/Trivy の合否範囲、M2 の C4 の範囲、ADR-01 §5 の初回構築解釈を決める必要があります。Claude セッションリンクの共有状態を確認し、公開メタデータに残すか判断してください。セッション内容は転載していません。初回構築の例外を認める場合は SPEC-01 と関連記録へ反映し、承認済みと黙って扱わないでください。実証を述べる Learned には根拠を添えるか表現を直してください。作者の修正後は `site/` を再生成し、構文解析と hosted CI を再実行してください。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| PR | A change proposed for review and merging. | レビューと統合を求める変更提案。 | +| CI | Checks run automatically when code changes. | 変更時に自動実行する検査。 | +| SHA | A fingerprint identifying a Git commit. | Git の変更記録を識別する指紋。 | +| TOON | A compact way to write structured data as text. | 構造を持つデータを短い文字で書く形式。 | +| Mermaid | Text that a renderer turns into a diagram. | 描画処理が図に変える文字の記法。 | +| Loopback | An address pointing back to the same host or container. | 自分自身のホストまたはコンテナを指す番地。 | +| Allowlist | Explicit exceptions to a check. | 検査から除外すると明示した例外。 | +| Parser | A program that checks and reads a notation's structure. | 記法の構造を検査して読み取るプログラム。 | diff --git a/docs/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2.md b/docs/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2.md new file mode 100644 index 0000000..5f4ba91 --- /dev/null +++ b/docs/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2.md @@ -0,0 +1,134 @@ +# REV M1 Skeleton PR Review r2 / M1 文書骨格 PR 再レビュー r2 + +> **Summary:** Request changes on PR #19 at bf320ed. Most r1 corrections are verified, but the publication-policy scan skips published files and the manifest validator accepts invalid types or crashes on malformed input. +> **概要:** PR #19 の bf320ed は修正要求。r1 の修正は大半を確認しましたが、公開ポリシー検査の公開ファイル除外と、manifest 検査の不正型受理・例外終了が残っています。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** green regression tests and workflows can coexist with an uncovered policy path and malformed-input failures; independent rejection cases exposed both. / 回帰試験と workflow が合格しても、方針検査の対象漏れと不正入力処理の不具合は残り得る。独立した拒否ケースで両方を確認した。 +- Applies to: PR #19, `feat/m1-skeleton` → `develop`, head `bf320ede99936ee4987356b0b3fece1cb8844cda`. +- Related: [Review index](README.md) · [r1](2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1.md) · [SPEC-01](../spec/01_manifest.md) · [SPEC-06](../spec/06_documentation_conventions.md). +- Used by: the owner's merge decision and the author's next correction. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Request changes.** A PR (pull request) is a proposed change awaiting review. This is a recommendation, not a GitHub approval. CI (continuous integration) means automated checks; all current workflows pass, but the rejection cases below do not. P1 blocks merge for ineffective publication protection; P2 is a correctness defect; P3 is a documentation correction. Terms are also explained in the [shared glossary](../reference/REF-01_Glossary.md). + +### Remaining findings + +1. **R2-01 — P1: the private-URL policy excludes published material.** `tools/manifest_check.py:566–575,603–612` excludes all `site/`, `*.legacy.md`, and nested legacy sample files, then filters remaining files by suffix. The workflow at `.github/workflows/security.yml:110–113` describes an all-tracked-files policy. Temporary-directory tests placed the same synthetic prohibited address in `site/index.html`, `docs/guides/api/README.legacy.md`, and `docs/guides/api/addon/x.py`: `run_policy_scan(root, [path])` returned zero findings for each; the control `docs/README.md` returned one. A formatting or Semgrep legacy exception must not become an exception to public disclosure rules. Gitleaks default secret rules do not enforce private-repository URL policy. Remove these path exemptions from the publication-policy scan and inspect every tracked readable text file, including generated HTML/search data and legacy sources. Add positive detection tests for each previously excluded category. The independent full-tree scan found no current matching address/token; this finding concerns the ineffective gate, not a new demonstrated leak. + +2. **R2-02 — P2: schema validation accepts invalid types and breaks its exit-code contract.** `tools/manifest_check.py:169–170` compares `schema_version` with `1` without requiring an integer distinct from boolean; `232–234` checks only the keys of `target_image`, not their values. Against temporary copies of the real JSON and unchanged TOON, `--manifest-only` returned **0** for `schema_version: true`, and separately for `target_image.M4: true`. Both violate SPEC-01's types. Also `components: "bad"` returned **1** with `AttributeError`, and a component `role: []` returned **1** with `TypeError`; invalid manifests must produce findings and exit **20**. Evidence: unguarded set membership at `204`, followed by unconditional TOON comparison at `629–631` and projection of unvalidated objects at `491–500`. Validate scalar and container types before set membership/projection, reject boolean schema versions, validate target-image values, and stop dependent checks when structural validation fails. Add subprocess tests asserting exit 20 with no traceback for malformed JSON shapes. Existing valid-file/TOON checks are substantially improved, but r1 R4 is only partially resolved. + +3. **R2-03 — P3: the documented fragment-check behavior is stale.** `docs/spec/06_documentation_conventions.md:96,185` says fragments are not verified, while `tools/docs_check.py:212–249` verifies both same-file and Markdown-target anchors. Update both languages to describe the behavior actually implemented. The implementation is useful; weakening it is unnecessary. + +### Disposition of r1 findings + +| r1 | Result | Evidence / remaining scope | +|---|---|---| +| R1 private URLs in examples | Resolved for current tree | `manifest/README.md` uses prose; full tracked-text scan without exclusions found zero policy matches. | +| R2 gitleaks rules disabled | Resolved | `[extend] useDefault = true`; four whole-line patterns with `regexTarget = "line"`; no path exemption. Hosted scan reports 70 commits and no leaks. Author reports a synthetic-secret rejection; I did not independently rerun that container test. | +| R3 missing Trivy | Resolved | SHA-pinned filesystem scan and report artifact are present; M1 report-only scope is explicit in SPEC-03. Both Trivy steps and artifact upload succeed. | +| R4 manifest validation | Partially resolved | Required fields, TOON comparison and failure modes are implemented; R2-01 and R2-02 remain. | +| R5 ZAP loopback | Resolved at specification level | SPEC-03 uses Compose service names and container ports, separates host remapping, and updates both languages/diagrams. No running installer is delivered at M1, so runtime connectivity was not tested. | +| R6 Mermaid/TOON syntax | Resolved | All 34 Mermaid blocks and 44 TOON blocks parse independently. | +| R7 docs-check scope | Substantially resolved | All tracked Markdown is classified; legacy/pointer exceptions and the present SHA-only excerpt check are explicit; missing file plus fragment is checked; glossary warnings exist. R2-03 is the remaining wording correction. | +| R8 C4/M2/core conflict | Resolved | `y_websocket` belongs to `core` in SPEC-00/02 and manifest JSON/TOON; SPEC-04 requires C4 in both core/full without skipping. | + +TOON is a compact notation for structured data; Mermaid is a notation that turns text into diagrams. The documentation excerpt check intentionally tests SHA membership only, as now disclosed in SPEC-06; it does not prove arbitrary excerpt-field equality. The manifest's standalone TOON comparison checks its prescribed fields. + +### Verification and limits + +From the repository root, these checks succeeded: + +```sh +python3 tools/manifest_check.py +python3 tools/docs_check.py +python3 -m unittest discover -s tools/tests -v +``` + +The documentation checker reported 45 checked files, 8 exempt files and 111 nonblocking glossary warnings. All 46 unit tests passed. The new untracked r2 file was separately checked directly through the checker API; it is not included in the tracked-file counts. + +The independent parser harness from r1, outside the repository, used Mermaid 11.4.1 and TOON 4.4.0. All 34/44 blocks parsed; the JSON projection and standalone TOON were semantically equal. Negative cases used temporary files only and left the tracked source unchanged. The correction commit changes 69 files, with 5,755 insertions and 523 deletions relative to `1a01c3b`. + +The authenticated GitHub connector confirmed the same PR head and successful [documentation workflow](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42013224920) and [security workflow](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42013224919), including all four security jobs. The gitleaks log confirms the Docker invocation scans 70 commits. Local `gh` could not reach the API in this session, so connected GitHub tools supplied remote evidence. Posting the review comment was attempted once but rejected because the tool requires approval while this session uses approval policy `never`; no r2 comment was posted. No new independent audit of all private integration repositories, image pixels, or deployed installer behavior was performed. + +### Owner decisions + +Fix R2-01/R2-02 before merge and update R2-03 in both languages. The earlier owner decisions remain: ADR-01 §5 bootstrap interpretation, public retention of the Claude session link, and acceptance of the documented legacy Semgrep deferral. The new `core` definition resolves the C4 ambiguity; retain that scope explicitly. M1 Trivy findings are reports, not a claim that vulnerabilities are absent. Regenerate `site/` after documentation changes and rerun rejection tests and CI. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**Request changes(修正要求)。** PR(プルリクエスト)はレビューを待つ変更提案です。この判定は推奨であり GitHub の承認ではありません。CI(継続的インテグレーション)は変更を自動検査する仕組みです。現行 workflow は合格していますが、次の拒否ケースが不正です。P1 は公開保護が無効になるマージ阻害事項、P2 は正しさの不具合、P3 は文書の修正です。[共通用語集](../reference/REF-01_Glossary.md)も参照してください。 + +### 残る指摘 + +1. **R2-01 — P1: 非公開 URL の方針検査が公開物を除外。** `tools/manifest_check.py:566–575,603–612` は `site/` 全体、`*.legacy.md`、旧サンプルの下位ファイルを除外し、残りも拡張子で絞ります。`.github/workflows/security.yml:110–113` は全追跡ファイルを対象と説明しています。一時ディレクトリで同じ模擬禁止アドレスを `site/index.html`、`docs/guides/api/README.legacy.md`、`docs/guides/api/addon/x.py` に置き、`run_policy_scan(root, [path])` が各0件、対照の `docs/README.md` は1件と再現しました。旧資料の形式・Semgrep 例外を公開禁止事項の例外にしてはいけません。gitleaks の既定秘密規則は非公開リポジトリ URL の公開方針を検査しません。公開方針検査のパス除外をなくし、生成 HTML・検索データ・旧資料も含め、追跡された読み取り可能なテキスト全体を対象にしてください。各除外カテゴリで検出する試験を追加してください。除外なしの独立検索では現在の該当アドレス・token は0件でした。新たな漏洩の実証ではなく、検査が漏洩を拒否できない指摘です。 + +2. **R2-02 — P2: 不正な型を受理し、終了コード契約も破る。** `tools/manifest_check.py:169–170` は `schema_version` を `1` と比較するだけで真偽値を整数から区別せず、`232–234` は `target_image` のキーだけを見て値の型を検査しません。現行 JSON の一時コピーと変更していない TOON で、`schema_version: true` と、別ケースの `target_image.M4: true` がいずれも `--manifest-only` で **終了0** になりました。ともに SPEC-01 の型に反します。また `components: "bad"` は `AttributeError`、部品の `role: []` は `TypeError` で **終了1** になります。不正 manifest は指摘を出し **終了20** にする契約です。根拠は204行の型未確認の集合所属判定、629–631行の無条件 TOON 比較、491–500行の未検証オブジェクトからの抄録生成です。集合判定・抄録生成の前に型を検査し、真偽値の schema version を拒否し、target-image の値も検証し、構造不正時には依存する検査を止めてください。不正な JSON 構造で traceback なし・終了20を確かめるサブプロセス試験が必要です。正常ファイル・TOON 検査は大幅に改善しましたが r1 R4 は一部未解決です。 + +3. **R2-03 — P3: フラグメント検査の説明が古い。** `docs/spec/06_documentation_conventions.md:96,185` はフラグメントを検査しないと説明しますが、`tools/docs_check.py:212–249` は同一ファイル・リンク先 Markdown のアンカーを検査しています。両言語を実装に合わせて更新してください。実装は有用なので弱める必要はありません。 + +### r1 各指摘の扱い + +| r1 | 結果 | 根拠・残る範囲 | +|---|---|---| +| R1 禁止例の private URL | 現在のツリーでは解消 | `manifest/README.md` は散文化。除外なしの追跡テキスト検索で方針該当0件。 | +| R2 gitleaks 無効 | 解消 | `[extend] useDefault = true`、行全体に限定した4パターンと `regexTarget = "line"`、パス除外なし。hosted 検査は70コミットで検出なし。作者は模擬秘密の拒否も報告していますが、そのコンテナ試験は独立再実行していません。 | +| R3 Trivy 欠落 | 解消 | SHA 固定の filesystem 検査と報告 artifact があり、SPEC-03 に M1 報告のみの範囲を明示。Trivy の2ステップと artifact アップロードが成功。 | +| R4 manifest 検査 | 一部解消 | 必須項目、TOON 比較、拒否処理は実装。R2-01/R2-02 が残る。 | +| R5 ZAP loopback | 仕様上解消 | SPEC-03 は Compose サービス名・コンテナ側ポートを使用し、ホストの付け替えと分離。英和と図を更新。M1 は稼働インストーラーを提供しないため実接続は未検証。 | +| R6 Mermaid/TOON 構文 | 解消 | Mermaid 34件・TOON 44件が独立解析ですべて合格。 | +| R7 docs-check 範囲 | 大半を解消 | 全追跡 Markdown を分類し、旧資料・誘導の例外と現段階の SHA 限定抄録検査を明記。file#fragment の欠落ファイルを検査し、用語警告もある。説明修正 R2-03 が残る。 | +| R8 C4/M2/core 矛盾 | 解消 | SPEC-00/02 と manifest JSON/TOON が `y_websocket` を `core` に配置。SPEC-04 は core/full 双方で C4 必須・スキップなし。 | + +TOON は構造を持つデータの短い記法、Mermaid は文字から図を作る記法です。文書の抄録検査は SPEC-06 に明示されたとおり SHA の存在確認のみであり、任意の項目の一致を証明するものではありません。manifest の独立した TOON 比較では規定された項目を比較します。 + +### 検証と限界 + +リポジトリルートで次の検査が成功しました。 + +```sh +python3 tools/manifest_check.py +python3 tools/docs_check.py +python3 -m unittest discover -s tools/tests -v +``` + +文書検査は45ファイル検査、8ファイル例外、合否を左右しない用語警告111件でした。単体試験46件はすべて合格です。未追跡の新規 r2 文書はチェッカー API で別途直接確認し、追跡ファイル件数には含まれません。 + +r1 で用意したリポジトリ外の独立パーサーは Mermaid 11.4.1 と TOON 4.4.0 を使用しました。34/44ブロックすべてが解析でき、JSON の規定抄録と独立 TOON は意味的に一致しました。拒否ケースは一時ファイルのみで行い、追跡ソースを変更していません。修正コミットは `1a01c3b` 比で69ファイル、追加5,755行、削除523行です。 + +認証済み GitHub コネクターで PR の同一 head と、[docs workflow](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42013224920)・[security workflow](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42013224919) の成功を確認し、security の4ジョブもすべて成功しています。gitleaks ログは Docker 呼び出しと70コミットの検査を確認できます。このセッションのローカル `gh` は API に接続できなかったため、接続済み GitHub ツールでリモート情報を確認しました。コメント投稿は1回試みましたが、ツールが承認を要求し、このセッションは approval policy が `never` のため拒否されました。r2 コメントは未投稿です。非公開統合リポジトリ全体、画像の画素、導入済みインストーラーの動作について新しい独立監査はしていません。 + +### 所有者の判断事項 + +マージ前に R2-01/R2-02 を修正し、R2-03 を両言語で直してください。従来の所有者判断事項である ADR-01 §5 の初回構築解釈、Claude セッションリンクの公開保持、旧資料の Semgrep 延期承認は残ります。新しい `core` 定義で C4 の曖昧さは解消したため、この範囲を明示的に維持してください。M1 の Trivy は報告であり、脆弱性ゼロの宣言ではありません。文書修正後は `site/` を再生成し、拒否ケースと CI を再実行してください。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| PR | A change proposed for review and merging. | レビューと統合を求める変更提案。 | +| CI | Automated checks of changes. | 変更に対する自動検査。 | +| Schema | The permitted fields and value types of data. | データに許す項目と値の型。 | +| TOON | A compact text notation for structured data. | 構造を持つデータを短く書く文字形式。 | +| Mermaid | Text notation rendered as diagrams. | 図として描画する文字の記法。 | +| SHA | A fingerprint identifying one commit. | 一つのコミットを指す指紋。 | +| Exit code | A number returned when a program finishes. | プログラムが終了時に返す数。 | +| Fragment / anchor | A link suffix and its destination within a page. | ページ内の場所を指すリンク末尾と、その行き先。 | diff --git a/docs/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3.md b/docs/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3.md new file mode 100644 index 0000000..e7ffa4b --- /dev/null +++ b/docs/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3.md @@ -0,0 +1,141 @@ +# REV M1 Skeleton PR Review r3 / REV(担当レビュワ)M1 文書骨格 PR 再レビュー r3 + +> **Summary:** Approve recommendation for PR (pull request: a proposed change) #19 at 413520e. All three r2 findings are resolved; no regression was found in the r1 corrections within the checks recorded here. +> **概要:** PR(プルリクエスト: 変更提案)#19 の 413520e は approve 推奨。r2 の3件は解消し、記録した検査の範囲では r1 修正の回帰も見つかりませんでした。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** replaying the earlier failing inputs confirms both rejection and safe reporting; a passing normal-input check alone cannot establish either. / 過去に失敗した入力の再実行で、拒否と安全な報告の両方を確かめられた。正常入力の合格だけでは両方を保証できない。 +- Applies to: PR #19, `feat/m1-skeleton` → `develop`, head `413520e20a98862d7eb5b203bdda1900d49019ac`. +- Related: [Review index](README.md) · [r1](2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1.md) · [r2](2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2.md) · [SPEC-01](../spec/01_manifest.md) · [SPEC-06](../spec/06_documentation_conventions.md). +- Used by: the owner's integration decision under [ADR-01 §5](../decisions/ADR-01_Integration_Repository_Placement.md#english). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Approve. No remaining technical findings from r2 and no newly identified regression in r1 fixes.** This is an independent review recommendation, not a GitHub approval or merge. The three owner decisions remain open. CI (continuous integration: automatic checks of changes) passes on the exact reviewed head. See the [shared glossary](../reference/REF-01_Glossary.md) for background terms. + +### Resolution of r2 findings + +1. **R2-01 resolved.** `scan_policy` in `tools/manifest_check.py` scans tracked files without path or extension exclusions. An independent temporary copy detected a runtime-built prohibited address on line 2 in each of seven paths: `site/index.html`, `site/search/search_index.json`, `docs/guides/api/README.legacy.md`, `docs/guides/api/addon/x.py`, `docs/README.md`, `Dockerfile`, and `assets/data.unknownext`. Each direct call returned one finding; the temporary Git repository's command-line policy check rejected the files with exit code (the completion status number) 1. Neither output included the matched address. The real tree reports 451 scanned, 62 skipped as non-UTF-8 (not readable in the expected text encoding), zero over 5 MB, and zero findings. Binary/size skip accounting and detection in former exclusions are covered by tests. Source inspection also shows unreadable files are recorded as skipped; this is a technical read limitation, not a path exemption. The scan does not inspect image pixels. + +2. **R2-02 resolved.** `STRUCT_TOP`, `STRUCT_COMPONENT`, `STRUCT_UPSTREAM`, and `STRUCT_PR` declare field types; `validate_structure` runs before value comparisons and TOON (a compact text form of structured data) projection. Integer validation explicitly excludes booleans. The independent copy used the real JSON (structured data written as named fields), with the real TOON unchanged. Each original rejection case—`schema_version: true`, `target_image.M4: true`, `components: "bad"`, and component `role: []`—now reports the relevant MC (manifest-check rule) finding, exits 20, and produces no traceback (an internal error stack). The unchanged copy exits 0. Structural failures do not attempt MC-11 comparison. Added subprocess tests in `tools/tests/test_manifest_check.py` assert these outcomes and additional malformed shapes; all pass. + +3. **R2-03 resolved.** SPEC-06 §8 version 0.3 now describes file and fragment checking in both languages. The implementation checks same-file anchors (page bookmarks) and anchors/headings in Markdown targets. Independent negative checks reject a missing file with fragment, a missing same-file anchor, and a missing anchor in an existing Markdown file; an existing `#english` target passes. `tools/docs_check.py` is unchanged from r2. + +### Regression check of r1 fixes + +| r1 finding | r3 evidence and disposition | +|---|---| +| R1 published private addresses | Resolved: real-tree policy scan has zero findings, and old excluded locations now reject synthetic cases. | +| R2 disabled gitleaks | Resolved: unchanged `[extend] useDefault = true`, four whole-line exceptions, no path exception; hosted secret scan passes. gitleaks is the secret-detection tool. Its synthetic-secret container test was not independently rerun in r3. | +| R3 missing Trivy | Resolved: unchanged pinned filesystem job and report artifact, with explicit M1 report-only scope; hosted job passes. Trivy is the vulnerability/configuration scanner; a green report-only job does not mean zero vulnerabilities. | +| R4 incomplete manifest validation | Resolved for the reviewed defects: 66 checker tests pass, normal JSON/TOON comparison passes, and original malformed-input cases now reject correctly. | +| R5 ZAP scans itself | Still resolved in both language specifications: ZAP (the running-web-application scanner) uses service names and internal ports; host port remapping does not change those targets. Specification unchanged since r2; no deployed installer test was performed. | +| R6 malformed diagram/data blocks | All 34 Mermaid (text-defined diagram) blocks reparse successfully using the existing Mermaid 11.4.1 harness. All 34 Mermaid and 44 TOON blocks are unchanged from r2; the 44 TOON blocks retain r2's independent parse evidence rather than a new external-parser run. | +| R7 documentation checker gaps | Resolved within the disclosed M1 scope: checker tests pass, fragment rejection was independently reproduced, and explicit legacy-format exceptions and SHA-only excerpt checking remain documented. SHA is a revision fingerprint; excerpt checking does not prove equality of arbitrary fields. | +| R8 C4/core/M2 conflict | Still resolved: unchanged JSON/TOON and SPEC-00/02/04 place `y_websocket` in `core` and require C4 in both core/full without skipping. | + +### Reproduction and CI evidence + +Run these commands from the repository root; all returned 0: + +```sh +python3 tools/manifest_check.py +python3 tools/docs_check.py +python3 -m unittest discover -s tools/tests -v +gh pr checks 19 -R RCOSDP/RDM-developer-guide +``` + +The unit suite reports **66 tests passed**. Documentation checking reports **46 checked files, 8 exempt files, and 116 nonblocking glossary warnings** before adding this untracked review. The new review is checked separately through `check_file`; tracked-file enumeration does not include it yet. + +The independent negative cases ran only in `scratchpad/rev-r3-toxvm83j/` under the task's designated temporary directory. The checker and real manifest files were copied there; synthetic addresses were assembled at runtime and never written to this repository. The four original type mutations were tested separately with unchanged TOON. No production file was mutated for rejection tests. + +Using only `gh`, PR (pull request: a proposed change) metadata and both run records confirmed head `413520e20a98862d7eb5b203bdda1900d49019ac`. All six checks pass: MkDocs (the documentation-to-website tool) site build, links, manifest/policy, gitleaks, Semgrep (source-code pattern checking), and Trivy. Both the [documentation run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42014695527) and [security run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42014695443) conclude `success`. The generated SPEC-06 site page changed along with its source. This review does not newly audit private integration repositories, session-link contents, all image pixels, or deployed installer behavior. + +### Remaining owner decisions + +- **ADR-01 §5 bootstrap interpretation:** the initial integration-order interpretation remains explicitly proposed and awaiting the owner. This recommendation does not approve that exception; record the owner's decision and align affected normative records if accepted. +- **Claude-Session link retention:** decide whether to retain the session link in public metadata after checking sharing visibility. The link's contents were not inspected or republished. +- **Legacy Semgrep deferral:** explicitly accept or reject the documented M2/M3 deferral of historical sample-code findings. Publication-policy scanning now covers those paths even while Semgrep exceptions remain. + +No code correction is requested by r3. The coordinator still needs to integrate this review record and handle the owner decisions; no commit, push, approval, or merge was performed by this reviewer. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**Approve。r2 の技術的指摘は残っておらず、r1 修正に新しい回帰も見つかりませんでした。** 独立レビューの推奨であり、GitHub の承認やマージ操作ではありません。所有者の判断3点は未決です。CI(変更を自動検査する仕組み)は、確認対象と同じ head で合格しています。背景用語は[共通用語集](../reference/REF-01_Glossary.md)も参照してください。 + +### r2 指摘の解消確認 + +1. **R2-01 解消。** `tools/manifest_check.py` の `scan_policy` はパス・拡張子の除外なく追跡ファイルを検査します。独立した一時コピーで、実行時に組み立てた禁止アドレスを7種類のパスの2行目に配置しました。対象は `site/index.html`、`site/search/search_index.json`、`docs/guides/api/README.legacy.md`、`docs/guides/api/addon/x.py`、`docs/README.md`、`Dockerfile`、`assets/data.unknownext` です。直接呼出しは各1件を検出し、一時 Git リポジトリのコマンドライン検査も終了コード(処理結果を表す数)1で拒否しました。出力に一致アドレスはありません。実ツリーは451ファイル検査、UTF-8(想定する文字の符号化方式)で読めない62ファイルをスキップ、5 MB超は0件、検出0件でした。旧除外領域の検出とバイナリ・サイズ別の集計は試験でも確認しました。コード上は読取不能もスキップとして記録します。これは読取の技術的限界であり、パス例外ではありません。画像の画素は検査しません。 + +2. **R2-02 解消。** `STRUCT_TOP`、`STRUCT_COMPONENT`、`STRUCT_UPSTREAM`、`STRUCT_PR` が項目の型を宣言し、`validate_structure` が値の比較と TOON(構造化データを短く表す文字形式)の抄録生成に先行します。整数判定は真偽値を明示的に除きます。独立コピーでは実際の JSON(名前付き項目で書く構造化データ)を使用し、TOON は変更していません。元の4ケース `schema_version: true`、`target_image.M4: true`、`components: "bad"`、部品の `role: []` はすべて対応する MC(manifest 検査規則)の指摘を出し、終了20、traceback(内部エラーの呼出し履歴)なしでした。無変更コピーは終了0です。構造不正時は MC-11 比較を実行しません。`tools/tests/test_manifest_check.py` に追加された子プロセス試験もこれらと追加の不正構造を検査し、すべて合格しました。 + +3. **R2-03 解消。** SPEC-06 §8 の版0.3は、両言語ともファイルとフラグメントの検査を説明しています。実装は同一ファイルのアンカー(ページ内のしおり)とリンク先 Markdown のアンカー・見出しを検査します。独立試験で、存在しないファイルにフラグメントを付けたリンク、同一ファイルの欠落アンカー、存在する Markdown 内の欠落アンカーを拒否し、存在する `#english` は合格しました。`tools/docs_check.py` は r2 から変更されていません。 + +### r1 修正の回帰確認 + +| r1 指摘 | r3 の根拠と扱い | +|---|---| +| R1 非公開アドレス掲載 | 解消。実ツリーの方針検出0件。旧除外領域の模擬ケースも拒否。 | +| R2 gitleaks 無効 | 解消。`[extend] useDefault = true`、行全体に限定した4例外、パス例外なしを維持し、hosted 検査も合格。gitleaks は秘密検出ツール。模擬秘密のコンテナ試験は r3 で独立再実行していません。 | +| R3 Trivy 欠落 | 解消。版固定のファイルシステム検査・報告保存と M1 報告のみの範囲は不変で、hosted 検査も合格。Trivy は脆弱性・設定の検査ツールで、報告のみの合格は脆弱性ゼロを意味しません。 | +| R4 manifest 検査不足 | レビュー対象の不具合は解消。66試験と正常 JSON/TOON 比較が合格し、元の不正型を正しく拒否。 | +| R5 ZAP が自身を検査 | 英和仕様上の解消を維持。ZAP(稼働中の Web アプリを検査するツール)はサービス名・内部ポートを使用し、ホスト側ポート変更で対象は変わりません。仕様は r2 から不変。導入済みインストーラーは未検証。 | +| R6 図・データの構文 | 既存 Mermaid 11.4.1 検証器で Mermaid(文字で図を定義する記法)34ブロックが再解析に合格。Mermaid 34件と TOON 44件はすべて r2 と同一。TOON は外部解析器の新規実行ではなく、r2 の独立解析の根拠を引き継ぎます。 | +| R7 文書検査の不足 | 明示された M1 範囲では解消。試験合格とフラグメント拒否の独立再現を確認。旧形式の例外と SHA 限定の抄録検査は明記を維持。SHA は版を識別する指紋で、抄録の任意項目の同一性は保証しません。 | +| R8 C4/core/M2 矛盾 | 解消を維持。JSON/TOON と SPEC-00/02/04 は不変で、`y_websocket` を `core` に含め、core/full とも C4 必須・スキップなし。 | + +### 再現と CI の根拠 + +リポジトリルートで次を実行し、すべて終了0でした。 + +```sh +python3 tools/manifest_check.py +python3 tools/docs_check.py +python3 -m unittest discover -s tools/tests -v +gh pr checks 19 -R RCOSDP/RDM-developer-guide +``` + +単体試験は **66件合格**。新規の未追跡 r3 記録を追加する前の文書検査は **46ファイル検査、8例外、合否を左右しない用語警告116件** でした。新規記録は `check_file` で別途検査し、まだ追跡ファイル件数には含めていません。 + +独立した拒否試験は、指定一時ディレクトリ配下の `scratchpad/rev-r3-toxvm83j/` のみで行いました。検査プログラムと実 manifest をコピーし、模擬禁止アドレスは実行時に組み立て、このリポジトリには一切書いていません。元の型不正4件は、TOON 無変更で個別に試験しました。拒否試験のために本体ファイルを変更していません。 + +GitHub の確認には `gh` だけを使い、PR 情報と両 run が head `413520e20a98862d7eb5b203bdda1900d49019ac` を指すと確認しました。MkDocs(文書を Web サイトにする道具)の構築、リンク、manifest/方針、gitleaks、Semgrep(ソースコードの危険な書き方の検査)、Trivy の6件すべてが合格です。[docs run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42014695527) と [security run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42014695443) はいずれも `success` でした。生成された SPEC-06 のサイトページも元文書とともに変更されています。非公開統合リポジトリ、セッションリンクの内容、画像全画素、導入済みインストーラーは新規監査していません。 + +### 所有者に残る判断 + +- **ADR-01 §5 の初回構築解釈:** 提案・所有者承認待ちのままです。この推奨で例外を承認したことにはなりません。所有者の決定を記録し、承認時は関連する規範記録を整合させてください。 +- **Claude-Session リンク保持:** 共有範囲を確認したうえで、公開メタデータに保持するか判断してください。リンクの内容は閲覧・再掲載していません。 +- **旧資料の Semgrep 延期:** 歴史的サンプルの指摘を M2/M3 へ延期する記録について、明示的に承認または却下してください。Semgrep 例外が残る領域も、公開方針検査は対象に含めます。 + +r3 はコード修正を要求しません。調整担当にはレビュー記録の取り込みと所有者判断の整理が残ります。レビュワはコミット、push、承認、マージを行っていません。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| PR | A proposed change awaiting review. | レビューを求める変更提案。 | +| CI | Automatic checks of changes. | 変更の自動検査。 | +| Exit code | The number a program returns on completion. | 処理終了時に返す結果の数。 | +| JSON / TOON | Text formats for structured data. | 構造化データを文字で書く形式。 | +| MC | A named manifest-validation rule. | manifest 検査規則の識別子。 | +| Anchor / fragment | A page bookmark and the link suffix naming it. | ページ内のしおりと、その場所を指すリンク末尾。 | +| SHA | A revision fingerprint. | 版を識別する指紋。 | +| Traceback | An internal error's call history. | 内部エラーの呼出し履歴。 | +| Bootstrap | The first construction before routine updates. | 通常更新を始める前の初回構築。 | diff --git a/docs/reviews/2026-11-05_RDM-developer-guide_PR20_Manifest_Shibboleth_r3.md b/docs/reviews/2026-11-05_RDM-developer-guide_PR20_Manifest_Shibboleth_r3.md new file mode 100644 index 0000000..688d140 --- /dev/null +++ b/docs/reviews/2026-11-05_RDM-developer-guide_PR20_Manifest_Shibboleth_r3.md @@ -0,0 +1,95 @@ +# REV PR20 Manifest Shibboleth review r3 / Manifest Shibboleth レビュー r3 + +> **Summary:** The Shibboleth-SP tracking bullets are corrected and the manifest checks pass. Request changes because ADR-01 §5 still requires a public starting point for private-only components. +> **概要:** Shibboleth-SP の追跡記述は修正済みで manifest 検査も合格です。ADR-01 §5 が private 専用部品にも公開起点を要求するため、要修正とします。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** fixing tracking bullets does not resolve a conflicting universal bootstrap procedure. / 追跡の箇条書きを直しても、全対象に適用する初回構築手順の矛盾は解消しないと分かった。 +- Applies to: [PR #20](https://github.com/RCOSDP/RDM-developer-guide/pull/20), reviewed by REV(担当レビュワ, Codex Astra). A PR is a proposed change / PR は変更の提案です。 +- Related: [Review index](README.md) · [r2](2026-11-05_dev2027_Strict_Reconstruction_PRs_r2.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-01](../spec/01_manifest.md) · [ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Integration status](../status/README.md), QAE and the owner for verification and acceptance / QAE(QA担当)と所有者の検証・採否判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Verdict: request changes.** R2-01's §3 correction is complete; its requested §5 scope correction remains open as R3-01 (P2, a correctness issue requiring a fix before acceptance). + +A repository stores change history; a branch names a path through it. A commit is a saved change and its SHA is its fingerprint. A manifest is the component packing list, an upstream is its original source, and ADR is a decision record. See the [shared glossary](../reference/REF-01_Glossary.md). + +Reviewed head `b4bfc9919c26df67544328fabd265fe424c3126f`, from `fix/manifest-shibboleth-public` to `develop`. Files were read through `gh api` at that exact head; the local `feat/m2-installer` checkout was not used as PR evidence. The correction is commit `488e61ca154910055cd2509c9af0fb9e9821b147`; the later head commit adds the r1/r2 review records. This is a written verdict, not a GitHub approval or request-changes review action. + +### Resolved: Shibboleth-SP tracking and manifest + +Both ADR-01 §1 halves identify public `RDM-Shibboleth-SP` on `main`. Both §3 bullets (lines 60 and 150) now explicitly add `upstream/public-main`, retain `upstream/private-main`, and limit the no-public-upstream statement to OASys, rdmcp and aipf_mcp_data_grdm. For Shibboleth-SP, §5's public-first construction agrees with those statements. + +JSON (structured text data) and TOON (its compact text form) agree on the two Shibboleth-SP upstream rows, their order, and all seven fields. The public row names `RDM-Shibboleth-SP`, branch `main`, kind `public`, tracking branch `upstream/public-main`, status `merged`, SHA `7f1125bb2f5bccdce1b1fc55d1dcff602bc7d38a`, and date `2026-11-05`. The private row remains second, with SHA `218b07f4143834278e5289a2c95ee8fe6ff01cf1` and `upstream/private-main`. + +### R3-01: §5 still includes components without a public upstream + +At ADR-01 lines **96–99** (English) and **186–189** (Japanese), §5 says the procedure applies to every integration repository and directs the reader to start at `upstream/public-<branch>`, then merge the private branch. Yet §1 and §3 explicitly say OASys, rdmcp and aipf_mcp_data_grdm have only private upstreams and start at the private tip. Following §5 for these three components requires a nonexistent public starting point. The universal consequence at lines **104 / 194** also needs the same scope limitation. + +**Required correction:** in both language halves, restrict the public-first §5 procedure and consequence to components with a public upstream. Explicitly refer private-only components to the §1 private-tip start rule. Preserve the public-first rule for Shibboleth-SP. This is the outstanding §5 request already recorded in r2, not a new manifest defect. + +### Verification evidence and limits + +CI means automatic checks after a change. All six checks returned pass: Build MkDocs Site, Check Links, Manifest validation and private-URL policy, Secret scan (gitleaks), Semgrep static analysis, and Trivy filesystem scan. Trivy remains report-only at M1 (the first delivery milestone). + +The [manifest job log](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42019352111/job/127217919499) explicitly runs `python3 tools/manifest_check.py --manifest-only` and reports zero findings and PASSED, including JSON/TOON parity. This CI run belongs to head `b4bfc9919c26df67544328fabd265fe424c3126f`; it tested the proposed merge `3a7df1f`. The contents API confirms both manifest files have identical file fingerprints at the PR head and that merge: JSON `40d14dc2847028e126c4b485546af4a31f4f4f16`, TOON `93d34734b443001548a5374aed97e790149c3428`. Thus the parity result covers the reviewed files. No local checker execution is claimed. + +GitHub access used only `gh`. No merge, approval, closure, push, or commit was performed. The local record was manually checked for bilingual structure, anchors, Jump, version, glossary and relative-link targets. The coordinator still needs to publish and index this record; the author needs to fix R3-01 and obtain re-review. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**判定: request changes(要修正)。** R2-01 の §3 修正は完了しました。依頼済みの §5 の範囲修正は R3-01(P2、受け入れ前に直すべき正しさの問題)として残ります。 + +リポジトリは変更履歴の保管場所、ブランチは履歴の道筋の名前です。コミットは保存した変更、SHA はその指紋です。manifest は部品の梱包表、上流は元の取得先、ADR は決定の記録です。[共通用語集](../reference/REF-01_Glossary.md)も参照してください。 + +対象 head は `b4bfc9919c26df67544328fabd265fe424c3126f`、`fix/manifest-shibboleth-public` から `develop` への変更です。対象 head 固定の `gh api` で読み、ローカルの `feat/m2-installer` は PR の証拠に使っていません。修正は `488e61ca154910055cd2509c9af0fb9e9821b147`、後続の head コミットは r1/r2 記録の追加です。文章による判定であり、GitHub の承認・変更要求レビュー操作ではありません。 + +### 解決済み: Shibboleth-SP の追跡と manifest + +ADR-01 §1 の両言語は公開 `RDM-Shibboleth-SP` の `main` を示します。§3 の両言語の箇条書き(60行と150行)は `upstream/public-main` を明記し、`upstream/private-main` も保持し、「公開上流なし」を OASys・rdmcp・aipf_mcp_data_grdm に限定しました。Shibboleth-SP については §5 の公開起点手順も一致します。 + +JSON(構造のある文字データ)と TOON(その短い表記)は、Shibboleth-SP の上流2行、順序、全7項目が一致します。公開行は `RDM-Shibboleth-SP`、branch `main`、kind `public`、tracking_branch `upstream/public-main`、status `merged`、SHA `7f1125bb2f5bccdce1b1fc55d1dcff602bc7d38a`、日付 `2026-11-05` です。非公開行は2番目で、SHA `218b07f4143834278e5289a2c95ee8fe6ff01cf1` と `upstream/private-main` を保持します。 + +### R3-01: §5 が公開上流のない部品も対象にしている + +ADR-01 の **96〜99行**(英語)と **186〜189行**(日本語)は、全統合リポジトリに対し `upstream/public-<branch>` から始めて非公開ブランチを取り込むよう要求しています。しかし §1・§3 は OASys・rdmcp・aipf_mcp_data_grdm が private 専用であり、private の先端から始めると明記しています。この3部品で §5 に従うと、存在しない公開起点が必要になります。**104行 / 194行**の全対象に向けた結果の記述にも同じ範囲の限定が必要です。 + +**必要な修正:** 英日両方で §5 の公開起点手順と結果を、公開上流がある部品に限定してください。private 専用部品は §1 の private 先端からの開始規則を参照させてください。Shibboleth-SP の公開起点は維持します。r2 に記録済みの §5 修正依頼の残件であり、新しい manifest の不備ではありません。 + +### 検証証跡と限界 + +CI は変更後の自動検査です。6件すべて成功しました。MkDocs サイト構築、リンク、manifest と非公開 URL 規則、gitleaks、Semgrep、Trivy です。Trivy は M1(最初の開発到達点)では報告のみです。 + +[manifest 検査ログ](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42019352111/job/127217919499)には `python3 tools/manifest_check.py --manifest-only` の実行と、JSON/TOON 突合を含む指摘0件・PASSED が記録されています。head `b4bfc9919c26df67544328fabd265fe424c3126f` に対応する CI は仮のマージ `3a7df1f` を検査しました。contents API で両地点のファイル指紋を照合し、JSON は `40d14dc2847028e126c4b485546af4a31f4f4f16`、TOON は `93d34734b443001548a5374aed97e790149c3428` とそれぞれ一致しました。このため突合結果はレビュー対象にも適用できます。ローカルで検査を実行したとは主張しません。 + +GitHub へのアクセスは `gh` のみで、マージ・承認・クローズ・push・commit はしていません。ローカル記録の英日構成、アンカー、Jump、版、用語注、相対リンク先を手動確認しました。調整担当による記録の公開・索引追加と、作成者による R3-01 修正・再レビューが残ります。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| PR | A proposed change for review. | レビューする変更の提案。 | +| SHA | A saved change or file's fingerprint. | 保存した変更やファイルの指紋。 | +| Tracking branch | A named copy following a source branch. | 元のブランチを追いかける写し。 | +| Bootstrap | The first construction of an environment. | 環境を最初に組み立てること。 | +| CI | Checks that run automatically after changes. | 変更後に自動で動く検査。 | +| JSON / TOON | Structured text data and its compact notation. | 構造のある文字データとその短い表記。 | +| QAE | Quality Assurance Engineer. | QA担当。 | diff --git a/docs/reviews/2026-11-05_RDM-developer-guide_PR20_Manifest_Shibboleth_r4.md b/docs/reviews/2026-11-05_RDM-developer-guide_PR20_Manifest_Shibboleth_r4.md new file mode 100644 index 0000000..154d0cd --- /dev/null +++ b/docs/reviews/2026-11-05_RDM-developer-guide_PR20_Manifest_Shibboleth_r4.md @@ -0,0 +1,115 @@ +# REV PR20 Manifest Shibboleth review r4 / Manifest Shibboleth レビュー r4 + +> **Summary:** R3-01 is resolved in both languages. The scope, starting points and manifest agree, and all six automatic checks pass. +> **概要:** R3-01 は英日とも解消しました。適用範囲・起点・manifest は整合し、自動検査6件はすべて成功です。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** an explicit scope and equal-tip exception make the public-first rule usable without inventing a public source for private-only components. / 適用範囲と先端同一の例外を明記すれば、private 専用部品に架空の公開元を要求せず公開起点の規則を運用できると分かった。 +- Applies to: [PR #20](https://github.com/RCOSDP/RDM-developer-guide/pull/20), REV(担当レビュワ, Codex Astra). PR means a proposed change / PR は変更の提案。 +- Related: [Review index](README.md) · [r3](2026-11-05_RDM-developer-guide_PR20_Manifest_Shibboleth_r3.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-01](../spec/01_manifest.md) · [ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md) · [Manifest](../../manifest/upstreams.json) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Integration status](../status/README.md), QAE (quality assurance reviewer / QA担当) and the owner for acceptance / 所有者の採否判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Verdict: pass; R3-01 resolved. No blocking finding remains in this re-review.** This is a written assessment, not a GitHub approval action. + +A repository stores change history; a branch names a path through it. A commit is a saved change, its SHA is its fingerprint, and its tip is the latest commit on a branch. A manifest is the component packing list, an upstream is an original source, and ADR is a decision record. See the [shared glossary](../reference/REF-01_Glossary.md). + +Reviewed head `d50de429baa799cea924b4520e799c9c13047a52`, from `fix/manifest-shibboleth-public` to `develop`. Evidence came from `gh pr diff 20`, the base64-decoded contents API for ADR-01 at the requested branch, head-pinned contents, and the previous r3 record. The local checkout was not used as evidence of the proposed change. + +### R3-01 resolution and language parity + +ADR-01 §5 Scope at lines **97 / 189** now limits public-first reconstruction to the six cores, y-websocket and Shibboleth-SP. Both language halves explicitly start OASys, rdmcp and aipf_mcp_data_grdm at the private tip without reconstruction. Both also defer an integration PR when public and private tips are identical until they diverge. Procedure headings at **99 / 191** and Consequence at **107 / 199** carry the same scope restriction. Version **0.5** records the lesson in both languages and preserves prior versions. + +This agrees with §1's private-only start rule and §3's source classification. Shibboleth-SP retains both `upstream/public-main` and `upstream/private-main`; its public-first procedure remains applicable. The general public-first order in §3 is read with the explicit §5 exceptions. Existing history-preservation and owner-merge steps remain intact. + +### Manifest consistency + +JSON (structured text data) and TOON (its compact notation) agree on the two Shibboleth-SP entries, their order and all seven fields. Public `RDM-Shibboleth-SP`, branch `main`, kind `public`, tracking branch `upstream/public-main`, status `merged`, SHA `7f1125bb2f5bccdce1b1fc55d1dcff602bc7d38a`, and fetched date `2026-11-05` precede the unchanged private entry with SHA `218b07f4143834278e5289a2c95ee8fe6ff01cf1` and `upstream/private-main`. + +The six cores and y-websocket also have public entries. OASys, rdmcp and aipf_mcp_data_grdm have only private entries. Both wiki-frontend entries record `203d32fab60aad8d78e9b743987519252f99b817`, supporting the dated equal-tip example. This review checks the bootstrap exception; it does not certify completion of separately adopted PR work. + +### Verification and remaining work + +CI means checks run automatically after a change. `gh pr checks 20` returned six passes. Both the [documentation run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42020131602) and [security and manifest run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42020131555) report the reviewed head and conclusion `success`. + +Results are recorded in TOON (compact text data): + +```toon +checks[6]{name,result}: + Build MkDocs Site,pass + Check Links,pass + Manifest validation and private-URL policy,pass + Secret scan (gitleaks),pass + Semgrep static analysis,pass + Trivy filesystem scan (report only at M1),pass +``` + +Trivy remains report-only at M1, the first delivery milestone. No local checker execution is claimed. The review record was manually checked for bilingual parity, anchors, Jump, version, glossary and relative links against the PR tree. GitHub access used only `gh`; no merge, approval, closure, push or commit was performed. Publication and indexing of this local record, QAE verification and the owner's merge decision remain with the coordinator's workflow. Other integration PRs are outside this verdict. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**判定: pass(合格)。R3-01 は解消し、今回の再レビューで阻害指摘は残りません。** 文章による判定であり、GitHub の承認操作ではありません。 + +リポジトリは変更履歴の保管場所、ブランチは履歴の道筋の名前です。コミットは保存した変更、SHA はその指紋、先端はブランチの最新コミットです。manifest は部品の梱包表、上流は元の取得先、ADR は決定の記録です。[共通用語集](../reference/REF-01_Glossary.md)も参照してください。 + +対象 head は `d50de429baa799cea924b4520e799c9c13047a52`、`fix/manifest-shibboleth-public` から `develop` への変更です。`gh pr diff 20`、指定ブランチの contents API から base64 復号した ADR-01、head 固定のファイル、前回 r3 記録を根拠にしました。ローカルの作業状態は提案変更の証拠に使っていません。 + +### R3-01 の解消と英日対応 + +ADR-01 §5 の適用範囲(**97行 / 189行**)は公開起点の再構築をコア6本・y-websocket・Shibboleth-SP に限定しました。英日とも OASys・rdmcp・aipf_mcp_data_grdm は private の先端から始め、再構築しないと明記しています。公開と private の先端が同一なら分岐まで統合 PR を出さない例外も一致します。手順見出し(**99行 / 191行**)と結果(**107行 / 199行**)も同じ範囲に限定されています。版 **0.5** は両言語で学びを記録し、過去の版を保持しています。 + +§1 の private 専用の開始規則、§3 の取得元の分類と一致します。Shibboleth-SP は `upstream/public-main` と `upstream/private-main` の両方を保持し、公開起点の手順の対象です。§3 の一般的な公開起点の順序は §5 の明示的な例外と合わせて読めます。既存履歴の保持と所有者によるマージの手順は維持されています。 + +### Manifest の整合性 + +JSON(構造のある文字データ)と TOON(その短い表記)は、Shibboleth-SP の上流2件、順序、全7項目が一致します。公開 `RDM-Shibboleth-SP`、branch `main`、kind `public`、tracking_branch `upstream/public-main`、status `merged`、SHA `7f1125bb2f5bccdce1b1fc55d1dcff602bc7d38a`、取得日 `2026-11-05` が先で、SHA `218b07f4143834278e5289a2c95ee8fe6ff01cf1` と `upstream/private-main` の非公開項目は不変です。 + +コア6本と y-websocket にも公開項目があり、OASys・rdmcp・aipf_mcp_data_grdm は非公開項目だけです。wiki-frontend の両項目は `203d32fab60aad8d78e9b743987519252f99b817` を記録し、日付付きの先端同一の例と整合します。今回は初回構築の例外を確認したもので、別途採用する PR の作業完了を認定するものではありません。 + +### 検証と残作業 + +CI は変更後の自動検査です。`gh pr checks 20` は6件すべて成功でした。[文書検査](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42020131602)と[セキュリティ・manifest 検査](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42020131555)は、いずれも対象 head と結論 `success` を返しました。 + +結果を TOON(データの短い文字表記)で記録します。 + +```toon +checks[6]{name,result}: + Build MkDocs Site,pass + Check Links,pass + Manifest validation and private-URL policy,pass + Secret scan (gitleaks),pass + Semgrep static analysis,pass + Trivy filesystem scan (report only at M1),pass +``` + +Trivy は M1(最初の開発到達点)では報告のみです。ローカルで検査を実行したとは主張しません。レビュー記録の英日対応、アンカー、Jump、版、用語注、相対リンク先を PR のファイル一覧と手動照合しました。GitHub へのアクセスは `gh` のみで、マージ・承認・クローズ・push・commit はしていません。ローカル記録の公開・索引追加、QAE の検証、所有者のマージ判断は調整担当の手順に委ねます。他の統合 PR は今回の判定範囲外です。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| PR | A proposed change for review. | レビューする変更の提案。 | +| SHA | Fingerprint of a saved change. | 保存した変更の指紋。 | +| Tip | Latest commit on a branch. | ブランチの最新の変更。 | +| Reconstruction | Rebuilding combined history from the stated starting point. | 指定した起点から統合履歴を組み直すこと。 | +| CI | Checks run automatically after changes. | 変更後の自動検査。 | +| JSON / TOON | Structured text data and its compact notation. | 構造のある文字データとその短い表記。 | +| QAE | Quality assurance reviewer. | QA担当。 | diff --git a/docs/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1.md b/docs/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1.md new file mode 100644 index 0000000..a59db81 --- /dev/null +++ b/docs/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1.md @@ -0,0 +1,205 @@ +# REV PR21 Installer review r1 / インストーラーレビュー r1 + +> **Summary:** Independent review of PR #21 at `6985d0600c2a9dcec5c50331aebcb60fb4f23b13`. Changes requested: security checks can pass unsafe states, generated settings fail their own baseline, and acceptance evidence is incomplete. +> **概要:** PR #21 の `6985d0600c2a9dcec5c50331aebcb60fb4f23b13` を独立レビューした。安全でない状態を検査が合格させ、生成設定が自身の必須検査に落ち、受入証跡も不足するため修正を要求する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** passing isolated command tests does not prove that generated configuration, scanners, and credential rotation agree. / コマンド単独の試験だけでは、生成設定・検査・認証情報更新の整合は証明できないと分かった。 +- Applies to: PR #21, `feat/m2-installer` → `develop`; independent REV review, no merge or approval. +- Related: [Review index](README.md) · [SPEC-01](../spec/01_manifest.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-04](../spec/04_acceptance_tests.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-02](../decisions/ADR-02_Network_Model.md) · [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) · [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Installer](../../installer/README.md) · [Acceptance suite](../../installer/acceptance/README.md) · [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and method + +**Changes requested.** P1 means a defect to fix before relying on the installer; P2 means a functional or contract defect requiring correction. A security gate is a check that decides whether the environment is safe enough to use. Docker (a tool for running separate application boxes) is the tool that runs applications in separate containers; Compose describes those containers together. Unit tests replace external programs with controlled responses and do not prove real container behavior. + +Reviewed the PR (a proposed change) body and diff through `gh`, the specified rules, source, tests, templates, manifests (lists of selected versions), and the supplied upstream reference files. Ran the required checks and all 21 leaf command helps plus root help. Reproductions used temporary directories and injected runners; no real Docker build, startup, registry push, or attack was run. No product source was modified. + +The remote head moved to `1caaaceb4d436db99a35aa159a7abd9586df6462` before publication. This review remains scoped to the requested `6985d06`; it does not certify the newer revision. A final repository docs check passed on the changed tracked set (49 checked, 8 exempt, 121 warnings), superseding the local docs failure only for that changed workspace. + +### Ranked findings + +1. **P1 — Rotation does not replace live credentials.** `installer/grdm_dev/secrets.py:232,246` writes new values, then `installer/grdm_dev/lifecycle.py:54` calls `docker compose restart`. Existing containers retain their original environment; the captured command confirms no recreation. Database initialization passwords also do not change passwords in an existing database. After a captured secret, the old credential therefore remains usable while `.env` claims a different value. Implement coordinated application/database rotation and recreation, with failure recovery and an old-credential rejection test (SPEC-03 §6). + +2. **P1 — Baseline validation both misses root and rejects the shipped configuration.** `installer/grdm_dev/scan.py:252-295` accepts any nonempty `user`, including `0:0`; a synthetic root service with `cap_drop: ALL` and loopback ports returns no findings. It does not validate `.env` mode/defaults, resource limits, or network isolation. Conversely, rendering the actual core manifest and hardening exceptions produces five `BASE-USER` failures: postgres, elasticsearch, mongo, rabbitmq, unoconv. The validator never reads those exceptions. Reconcile the non-root rule with the approved exception contract, then test renderer output through the real baseline checker; the current install cannot reach a successful full gate even if startup succeeds. + +3. **P1 — Network health silently ignores listeners without visible process ownership.** `installer/grdm_dev/health.py:174-204` filters exclusively by Docker process name. On Linux, unprivileged `ss -ltnp` can show a root-owned wildcard listener without its process field. Feeding `LISTEN 0 4096 0.0.0.0:5000 0.0.0.0:*` yields no offending socket and no error. Correlate actual project port bindings through Docker inspection and fail closed when ownership cannot be established. Cover Docker Desktop on macOS and Linux without elevated privileges. + +4. **P1 — The red-team egress probe cannot establish isolation.** `installer/grdm_dev/redteam.py:24,90-99` probes `example.invalid`, which cannot resolve even on an unrestricted network, and labels wget failure as blocked. It runs a fresh Alpine container, not the attacker container whose other network attachments and routes matter. Checking the selected network's `Internal` flag does not close that gap. Verify the actual attacker network namespace against controlled reachable destinations, distinguishing probe failure from proven isolation; also validate the approval record's scope and owner rather than file existence alone (`:114-119`). + +5. **P1 — Scanner errors can become clean results and the scan omits infrastructure images.** `installer/grdm_dev/scan.py:398-407` accepts Semgrep (a source-code checker) JSON (structured machine-readable text) regardless of nonzero exit or its `errors` array; exit 2 with `{"errors":[{"message":"failed"}],"results":[]}` is reported as `result: ok`. `:355-395` selects only locally tagged `grdm-dev/` images, excluding postgres, Redis (a fast data store), Mongo and other images actually used by Compose; integration lockfiles are not explicitly scanned once local images exist. SBOM (a list of software parts) generation failures only add notes. Return 51 for incomplete scanners and enumerate all project images and required lockfiles (SPEC-03 §4); use all four required Semgrep packs, not only `p/default`. + +6. **P1 — Acceptance logs bypass secret masking.** `installer/grdm_dev/accept.py:307,318,320` prints seed/cleanup subprocess output and writes pytest output verbatim under `docs/demo/runs/`. Unlike `scan.py` and `report_cmd.py`, this path never applies `.env` masking. An injected synthetic secret in runner output was copied unchanged to `pytest.log`. Exceptions can include credentials, and traces can include session material. Sanitize output before persistence or display, restrict evidence permissions, and test the evidence paths with synthetic `.env` values; do not rely on later report bundling to clean already-written files. + +7. **P1 — Acceptance's network guard does not cover every request.** `installer/acceptance/conftest.py:136-156` installs only browser routing. Calls through `context.request` and independently created API request contexts (for example `installer/acceptance/test_c3_file_upload.py:29,41-43`) are not intercepted by that browser route and may follow external redirects. The download URL prefix assertion also accepts lookalike hostnames. Parse exact origins and guard API requests, redirects, WebSockets, and service-worker traffic, or enforce isolation outside the browser; SPEC-04 §3.4 promises every non-loopback request is blocked. + +8. **P1 — The generated network has no Docker internal isolation flag.** `installer/grdm_dev/compose.py:316` emits only a named bridge, without `internal: true`. The actual rendered core configuration confirms this. A regular bridge permits outbound routes, contrary to the internal-network baseline in SPEC-03 §3.2 and ADR-03 §3.2. Make the intended isolation explicit and verify it on Docker Desktop; if ordinary development requires egress, obtain a normative change instead of claiming that the existing output enforces the baseline. + +9. **P2 — Private repository URL fails the mandatory policy check.** `installer/tests/test_build.py:88` contains a full private integration repository URL. Production `build.py:64-66` correctly composes its URL at runtime, but the test violates the same names-only policy. Construct the expected value from separate components without committing a private URL. `tools/manifest_check.py` and the tools regression suite both reject this exact line. No apparent live token was found in the diff search; that limited search is not a full secret-scanner certification. + +10. **P2 — Rendering a running installation changes its own ports.** `installer/grdm_dev/compose.py:116-153,649` treats every occupied port as foreign. Re-running install while its own web service occupies 5000 assigns 5001 and rewrites URLs; repeated runs keep moving. The idempotence test at `installer/tests/test_compose.py:180` uses a checker that always returns free (`:40`), so it cannot detect this. Preserve project-owned bindings and test both own-service and unrelated-process collisions. + +11. **P2 — `build --push` attempts to publish the local tag as well.** `installer/grdm_dev/build.py:123-127` supplies both `grdm-dev/<component>` and `ghcr.io/rcosdp/<component>` with `--push`. The unqualified first tag addresses Docker Hub, outside the promised private GHCR destination, and can fail authorization or publish to the wrong registry. Use only the GHCR tag for push; keep local tags for load. Test the complete argument list and the absence of other registry destinations. + +12. **P2 — Acceptance omits the mandatory integration precheck and has weak success criteria.** `installer/grdm_dev/accept.py:265-320` proceeds directly to pytest after dependency/path checks; a fake successful pytest yields exit 0 with no health/integration call and zero collected result rows. SPEC-04 §2 requires integration first. C2 supplies `['admin']` when permissions are missing (`installer/acceptance/test_c2_create_project.py:31`); C3 tests anonymous PUT instead of a signed-in non-contributor (`test_c3_file_upload.py:35-48`); C4 checks only B-to-A propagation (`test_c4_wiki_collab.py:47-53`); C6 accepts API 404 although the contract requires 403 (`test_c6_admin.py:39-40`). Require the specified success and rejection evidence and fail incomplete runs. Check Chromium's executable, not merely a nonempty browser directory (`accept.py:277-279`). + +13. **P2 — Installed package omits its acceptance suite.** `installer/pyproject.toml:25-30` packages only `grdm_dev`, messages and templates; `installer/grdm_dev/accept.py:44` searches a sibling `acceptance` directory. In a non-editable installation that suite is absent. Include it in the distribution or resolve it explicitly from the selected repository. The PR's console-script/data-file smoke test does not validate acceptance execution from the installed package. + +14. **P2 — Documentation and reported validation are not green at the reviewed head.** The PR-added `docs/reviews/2026-11-05_RDM-developer-guide_PR20_Manifest_Shibboleth_r3.md:10` links to the absent `2026-11-05_dev2027_Strict_Reconstruction_PRs_r2.md`; confirmed in the remote head through `gh api`. The first docs run reports that broken link; later runs report the tracked review file missing locally. Installer tests consequently fail their repository docs check. Report this workspace change separately from the confirmed remote-head broken link. Fix the link and update the PR's passing-test claims after rerunning on a stable checkout. + +### Coverage, contract gaps, and evidence + +The following are observations, not additional security approvals. Secret (a password or key) generation uses random values and writes `.env` as 0600 inside a 0700 directory. Rendered files preserve secret references rather than values, bind published ports to 127.0.0.1, set `cap_drop: ALL` and `no-new-privileges`, and use non-root users except the reasoned hardening exceptions. The old alias occurs in prohibition checks/tests and historical material in the diff; it is not emitted by the renderer or added to the host. Report masking covers known `.env` string values of length at least eight; it is not universal redaction of unknown secrets. + +All requested helps returned 0 and the 13 message codes agree with SPEC-02 §6. `upstream mirror/integrate` exist only as exit-2 placeholders (`installer/grdm_dev/upstream.py:1-32`), so full §3 conformance is not delivered; the PR body does not explicitly claim those two functions. Non-interactive confirmation is implemented for reset through `Context.confirm`; there is no general no-terminal/without-`--yes` rejection for install or seed. Resolve the distinction between the global flag's “required without a terminal” wording and §7's question-specific rule. `secrets init` keeps an existing file by refusing with exit 2, consistent with §3's overwrite prohibition but not a repeated-success interpretation of §7. + +The staged thresholds correctly distinguish M1 reporting, M2/M3 count ceilings, M4 open HIGH/CRITICAL and M5 high-severity allow-list restrictions. Expired entries stop suppressing findings. However, malformed milestone JSON silently falls back to M1 (`scan.py:100-112,560-566`), and no next-milestone expiry boundary is enforced; these are further fail-closed contract gaps to address before later milestones. The current scan also does not implement the promised `docs/status/security_<milestone>.md` excerpt or an M5 unresolved-red-team-path check. + +SPEC-01 adds matching `integration_sha` rows in both halves, but the Japanese row is English. All current integration pins remain null, explicitly disallowed for M2 acceptance. SPEC-04's browser-install wording is consistent in both languages. The README files have bilingual anchors, Jump, versions and glossary tables; the installer README still lacks an Applies-to line and a link to its acceptance child, and its test procedure is inline rather than a complete fenced procedure required by SPEC-06. Compared the generated local settings with the supplied upstream reference; URL separation is present, but runtime consumer names, authentication paths and writable directory ownership still require stage-two validation. + +Observed results (TOON is a compact text form for structured data; these are review observations, not mirrored canonical data): + +```toon +checks[6]{check,result}: + installer_unittest,"174 run; 1 failure in test_docs" + tools_unittest,"66 run; 1 failure in tracked private-URL policy" + manifest_check,"exit 1; test_build.py:88 private URL" + docs_check,"exit 1; PR20 review link or locally missing tracked file" + cli_help,"root and 21 leaf helps exit 0" + bash_syntax,"bash -n passes; no executable Bash-4-only construct found" +``` + +Commands were run from the repository root; expected merge-ready results are zero exits: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/manifest_check.py +python3 tools/docs_check.py +PYTHONPATH=installer python3 -m grdm_dev.cli --help +bash -n installer/install.sh +``` + +### Required second stage on Mac Studio + +**Real-Docker build, up, and acceptance are deferred to stage two, as the PR body states; none is certified by this review.** After fixing the findings, verify all of the following before declaring M2 complete: + +- Pin integration SHAs (exact source revisions) and base-image digests (exact image identities), then build cleanly on arm64 (the Apple Silicon CPU family); verify Dockerfile selection, image tags and Compose image identity, and separately verify amd64 (the Intel/AMD CPU family)/multi-platform behavior. +- Start minimum/core and test volume ownership, non-root startup, read-only paths, capability exceptions and resource limits. Verify the settings consumers against the pinned upstream code, not only the reference sample. +- Measure host listeners on macOS, loopback accessibility, internal connectivity and egress isolation. Test an AirPlay port collision and repeat install/render/up without changing existing project ports. +- Rotate secrets on an initialized database and prove new credentials work while old credentials fail; inject a synthetic credential into failure output and inspect every report/log/trace for leakage. +- Run the full scanner suite against every running image and integration lockfile, including scanner failure, allow-list expiry/count and staged threshold cases; verify generated hardening passes the intended baseline. +- Run C1–C6 success/rejection cases through Chromium, verify fakecas (a test login server) redirects/cookies, file byte equality and preview, two-way Wiki convergence and 4401 rejection, and institution-scoped admin behavior. Confirm seed APIs, exact selectors and cleanup, including partial seeding failure; retain sanitized JSON/TOON evidence under `docs/demo/runs/`. +- Exercise non-editable installation and its acceptance resources. Treat S1–S5 (currently unconditional M3 skips), Shibboleth (a system for institution logins) wiring, and upstream automation placeholders as remaining scope, not delivered acceptance. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と方法 + +**修正要求。** P1 はインストーラーを信頼する前に直す欠陥、P2 は機能または契約の欠陥を表す。セキュリティの門とは、安全に使えるかを決める検査である。Docker は分離された箱でプログラムを動かす道具、Compose は複数の箱をまとめて記述する仕組みである。単体テストは外部の道具を決まった応答に置き換えるため、実機の動作を証明しない。 + +`gh` で PR(変更案)の本文と差分を読み、指定仕様、実装、試験、テンプレート、manifest(採用版の一覧)、指定された上流参考ファイルを照合した。必須検査と root および末端 21 コマンドの help を実行した。再現には一時ディレクトリと差し替え関数を使った。実 Docker のビルド・起動・イメージ公開・攻撃は行わず、製品のソースは変更していない。 + +公開前にリモート head は `1caaaceb4d436db99a35aa159a7abd9586df6462` へ進んだ。このレビューは指定された `6985d06` が対象で、新版を認証しない。変更後の追跡対象に対する最終 docs 検査は合格した(検査 49、除外 8、警告 121)。これは変更後の作業場所についてのみ、先のローカル文書検査失敗を更新する。 + +### 重要度順の指摘 + +1. **P1 — 秘密の更新が稼働中の認証情報を置き換えない。** `installer/grdm_dev/secrets.py:232,246` は新値を保存するが、`installer/grdm_dev/lifecycle.py:54` は `docker compose restart` だけを呼ぶ。既存の箱の環境変数は変わらず、既存データベースのパスワードも初期化用環境変数では変わらない。呼出引数の再現でも再作成がなかった。漏洩した旧認証情報が使える一方で `.env` だけ新値になる。アプリとデータベースを協調更新し、失敗回復と旧値拒否を試験する(SPEC-03 §6)。 + +2. **P1 — 必須検査が root を見逃し、同梱の生成結果を拒否する。** `installer/grdm_dev/scan.py:252-295` は `user` が空でなければ許し、`0:0`、`cap_drop: ALL`、ループバック公開の合成設定を指摘ゼロで通した。`.env` の権限・既定値、資源制限、ネットワーク隔離も調べない。逆に実 manifest と hardening 例外から core を生成すると postgres、elasticsearch、mongo、rabbitmq、unoconv の五つが `BASE-USER` になる。検査が例外を読まないためである。非 root 規則と承認済み例外の契約を整え、生成結果を実検査へ渡す試験を追加する。現状は起動しても全体検査を成功できない。 + +3. **P1 — プロセス所有者が見えない待受をネットワーク検査が無視する。** `installer/grdm_dev/health.py:174-204` は Docker のプロセス名だけで抽出する。Linux の一般権限の `ss -ltnp` は root 所有の待受のプロセス欄を省略する場合がある。`LISTEN 0 4096 0.0.0.0:5000 0.0.0.0:*` を与えると違反もエラーもゼロになる。Docker の実際の公開設定と照合し、所有関係が不明なら合格させない。macOS の Docker Desktop と一般権限の Linux を試験する。 + +4. **P1 — レッドチームの外向き通信検査が隔離を証明できない。** `installer/grdm_dev/redteam.py:24,90-99` は通常の接続でも名前解決できない `example.invalid` に接続し、失敗を遮断と判定する。実際の攻撃側の箱でなく、新しい Alpine の箱を使うため、別ネットワークへの接続や経路も確認できない。指定ネットワークの `Internal` 属性だけでは不足する。管理された接続可能な宛先に対して実際の攻撃側の環境で検査し、検査不能と遮断を分ける。承認記録も存在だけでなく所有者と対象範囲を検証する(`:114-119`)。 + +5. **P1 — スキャナーのエラーが正常扱いになり、基盤イメージが漏れる。** `installer/grdm_dev/scan.py:398-407` は Semgrep の終了値と `errors` 配列を確認しない。終了 2、エラーあり、結果空の JSON(機械が読む構造化データ)を渡しても `result: ok` となる。`:355-395` は `grdm-dev/` イメージだけを選び、実際に使う postgres、Redis、Mongo などを除外する。ローカルイメージがあれば統合側の依存固定ファイルも明示的に検査しない。構成部品一覧の生成失敗も注記だけである。不完全な検査は 51 とし、全イメージ・依存固定ファイルと、`p/default` 以外も含む必須四組の Semgrep 規則を検査する(SPEC-03 §4)。 + +6. **P1 — 受入ログが秘密のマスクを通らない。** `installer/grdm_dev/accept.py:307,318,320` は seed・cleanup の出力を表示し、pytest の出力を `docs/demo/runs/` にそのまま書く。`scan.py` と `report_cmd.py` と違い `.env` の値を隠さない。差し替え関数の合成秘密文字列が `pytest.log` に残ることを確認した。例外や追跡記録には認証情報が入る場合がある。表示・保存前のマスクと証跡の権限制限を行い、合成 `.env` 値で全出力を試験する。後の報告集約だけでは既存ファイルを消毒できない。 + +7. **P1 — 受入の通信制限が全要求を覆わない。** `installer/acceptance/conftest.py:136-156` はブラウザ経路だけを遮断する。`context.request` や独立した API 要求の文脈(例 `installer/acceptance/test_c3_file_upload.py:29,41-43`)はその経路を通らず、外部への転送を追える。ダウンロード URL の前方一致も似たホスト名を許す。正確な接続先を解析し、API・転送・WebSocket・service worker を制限するかブラウザ外で隔離する。SPEC-04 §3.4 の約束は全非ループバック要求の遮断である。 + +8. **P1 — 生成ネットワークに Docker の内部隔離属性がない。** `installer/grdm_dev/compose.py:316` は名前付き bridge だけを生成し、`internal: true` がない。実 core の生成結果でも確認した。通常の bridge は外向き経路を持ち、SPEC-03 §3.2 と ADR-03 §3.2 の内部ネットワーク必須対策に合わない。隔離設定を明示し Docker Desktop で確認する。通常開発で外向き通信が必要なら、現出力が必須対策を満たすと主張せず規範側の変更を行う。 + +9. **P2 — 非公開リポジトリ URL が必須方針検査に落ちる。** `installer/tests/test_build.py:88` に非公開統合リポジトリの URL 全体が直書きされる。本体 `build.py:64-66` は実行時に組み立てているが、試験も名前だけの方針に従う必要がある。期待値を別々の部品から組み立てる。`tools/manifest_check.py` と tools の回帰試験がこの行を拒否した。差分検索で実トークンらしい値は見つけなかったが、完全な秘密検査の認証ではない。 + +10. **P2 — 稼働中に再生成すると自身のポートが移動する。** `installer/grdm_dev/compose.py:116-153,649` は使用中ポートをすべて他者のものと扱う。自分の web が 5000 を使っていると再導入で 5001 に変わり、URL を書き換える。繰返すたびに移動する。`installer/tests/test_compose.py:180` の再実行試験は常に空きと返す関数(`:40`)のため検出できない。自分の公開設定を保持し、自身と他プロセスの両方の衝突を試験する。 + +11. **P2 — `build --push` がローカル用タグも公開しようとする。** `installer/grdm_dev/build.py:123-127` は `--push` に `grdm-dev/<component>` と `ghcr.io/rcosdp/<component>` の両方を渡す。最初の省略形式は Docker Hub を指すため、認証失敗や意図しない公開先への送信になる。push は GHCR 用タグだけにし、ローカル用は load に限定する。引数全体と余分な公開先がないことを試験する。 + +12. **P2 — 受入が必須の統合事前検査をせず、合格条件も弱い。** `installer/grdm_dev/accept.py:265-320` は依存・パス確認後に直接 pytest を呼ぶ。合成 pytest の正常終了だけで、health・統合検査なし、結果行ゼロでも 0 になった。SPEC-04 §2 は統合検査を先に要求する。C2 は権限欠落時に `['admin']` を補う(`installer/acceptance/test_c2_create_project.py:31`)。C3 はログイン済み非参加者でなく匿名 PUT(`test_c3_file_upload.py:35-48`)、C4 は B→A の片方向(`test_c4_wiki_collab.py:47-53`)、C6 は契約の 403 に加えて 404 も許す(`test_c6_admin.py:39-40`)。所定の成功・拒否証跡を必須にし、不完全実行を失敗させる。ブラウザも空でないディレクトリでなく実行ファイルを検査する(`accept.py:277-279`)。 + +13. **P2 — 通常インストールの配布物に受入スイートがない。** `installer/pyproject.toml:25-30` は `grdm_dev` と messages・templates だけを同梱するが、`installer/grdm_dev/accept.py:44` は隣の `acceptance` を探す。非 editable 導入では存在しない。配布物へ含めるか、指定リポジトリから明示的に解決する。PR の console script とデータファイルの確認だけでは受入実行を証明できない。 + +14. **P2 — 文書検査と PR の合格報告が一致しない。** PR が追加する `docs/reviews/2026-11-05_RDM-developer-guide_PR20_Manifest_Shibboleth_r3.md:10` は存在しない `2026-11-05_dev2027_Strict_Reconstruction_PRs_r2.md` を参照する。`gh api` で対象 head の内容も確認した。最初の docs 検査はリンク切れ、その後は追跡済みレビュー自体がローカルで見つからないと報告した。installer 試験も文書検査で落ちる。作業場所の変化と、対象 head で確認したリンク切れを区別して扱う。修正後に安定した checkout で再検査し、PR 本文の全件合格記載を更新する。 + +### 確認範囲・契約の不足・証拠 + +次は観測であり追加の安全承認ではない。秘密は乱数生成され `.env` は 0600、親は 0700 で保存する。生成ファイルは秘密の値でなく参照を保持し、公開は 127.0.0.1、`cap_drop: ALL` と `no-new-privileges` を設定し、理由付き例外以外は非 root にする。旧別名は差分の禁止検査・試験・歴史資料に現れるが、生成結果やホスト設定には追加しない。報告のマスクは `.env` にある八文字以上の既知の文字列が対象であり、未知の秘密をすべて消す仕組みではない。 + +全 help は 0、13 個のメッセージコードは SPEC-02 §6 と一致した。`upstream mirror/integrate` は終了 2 の未実装入口である(`installer/grdm_dev/upstream.py:1-32`)。§3 全体への準拠は未達だが、PR 本文はこの二機能を明示的に主張していない。非対話確認は reset で `Context.confirm` を通す。install・seed 全般には端末なし・`--yes` なしの拒否がない。グローバルフラグの「端末なしで必須」と §7 の質問に対する規則の違いを整理する。`secrets init` は既存ファイルを残して 2 を返す。§3 の上書き拒否には合うが、§7 を再実行でも成功と読むなら一致しない。 + +段階別の判定は M1 報告、M2/M3 件数上限、M4 未許容 HIGH/CRITICAL、M5 高重大度の許容禁止を区別する。期限切れは抑制対象から外れる。ただし milestone JSON の破損は M1 に戻る(`scan.py:100-112,560-566`)。次の節目より前という期限境界も検証しない。後続段階までに、検査不能なら通さない契約へ直す必要がある。約束された `docs/status/security_<milestone>.md` の抄録と、M5 の未解決侵入経路確認も未実装である。 + +SPEC-01 の `integration_sha` 行は両半分で対応するが、日本語側も英文のままである。現在の統合 pin(正確な版の指定)はすべて null で、M2 受入には不可と明記される。SPEC-04 のブラウザ導入説明は英和一致する。両 README は英和アンカー・Jump・版・用語表を備えるが、installer README は適用対象行と子の acceptance へのリンクがなく、試験手順も SPEC-06 の完全なコードブロックでなく本文内表記である。生成 local 設定を指定の上流参考と照合し、内外 URL の分離は確認した。実際の利用側の設定名、認証経路、書込ディレクトリ所有者は第二段階で検証する。 + +観測結果を TOON(構造化データを短く書く文字形式)で記す。正本の転載ではなくレビュー実測である。 + +```toon +checks[6]{check,result}: + installer_unittest,"174 件実行; test_docs で 1 件失敗" + tools_unittest,"66 件実行; 非公開 URL 方針で 1 件失敗" + manifest_check,"終了 1; test_build.py:88 非公開 URL" + docs_check,"終了 1; PR20 レビューのリンクまたはローカル追跡ファイル欠落" + cli_help,"root と末端 21 個の help が終了 0" + bash_syntax,"bash -n 合格; Bash 4 専用の実行構文なし" +``` + +リポジトリのルートで実行した。統合可能な状態ではすべて終了 0 を期待する。 + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/manifest_check.py +python3 tools/docs_check.py +PYTHONPATH=installer python3 -m grdm_dev.cli --help +bash -n installer/install.sh +``` + +### Mac Studio で必須の第二段階 + +**実 Docker の build・up・受入は PR 本文のとおり第二段階へ延期され、このレビューでは認証していない。** 指摘修正後、M2 完了前に次を実施する。 + +- 統合 SHA(ソースの正確な版)と基盤 digest(イメージの正確な識別値)を固定し arm64 で新規ビルドする。Dockerfile 選択、タグと Compose の参照一致、別途 amd64・複数環境向けのビルドを確認する。 +- minimum/core を起動し、保存領域の所有者、非 root 起動、読取専用パス、権限例外、資源制限を確認する。設定を読む実コードも固定した上流版と突き合わせる。 +- macOS の実待受、ループバック接続、内部通信、外向き隔離を測る。AirPlay 衝突と再導入・再生成・再起動でも自身のポートが変わらないことを確認する。 +- 初期化済みデータベースの秘密を更新し、新値成功・旧値拒否を確認する。合成秘密を異常出力へ入れ、全報告・ログ・追跡記録に漏れがないか確認する。 +- 全稼働イメージと統合側の依存固定ファイルを検査し、検査不能、許容期限・件数、段階別閾値も確認する。生成 hardening が意図した必須検査を通ることを確認する。 +- Chromium で C1–C6 の成功・拒否を実行する。fakecas の転送と cookie、ファイル一致とプレビュー、Wiki の双方向同期と 4401、所属機関の管理画面を確認する。seed API・セレクタ・部分失敗時も含む後片付けを確定し、秘密を除いた JSON/TOON を `docs/demo/runs/` に残す。 +- 非 editable 導入で受入資源を確認する。現在 M3 として無条件スキップする S1–S5、Shibboleth 接続、上流自動化の未実装入口は、受入済みでなく残作業とする。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| P1 / P2 | Before-reliance defect / functional or contract defect. | 信頼する前に直す欠陥/機能・契約の欠陥。 | +| Credential rotation | Replace keys and make the previous keys stop working. | 鍵を交換し、以前の鍵を使えなくすること。 | +| Loopback | An address that leads back to the same computer. | 同じ計算機へ戻るアドレス。 | +| Egress | A connection leaving the isolated environment. | 隔離環境から外へ向かう通信。 | +| Runner | A function that executes an external program, replaced in tests. | 外部プログラムを実行し、試験で置き換える関数。 | +| Registry | A service that stores and distributes container images. | コンテナのイメージを保管・配布する場所。 | +| Idempotence | Repeating an operation preserves the intended state. | 繰返しても意図した状態を保つこと。 | diff --git a/docs/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2.md b/docs/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2.md new file mode 100644 index 0000000..8af2d55 --- /dev/null +++ b/docs/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2.md @@ -0,0 +1,199 @@ +# REV PR21 Installer review r2 / インストーラーレビュー r2 + +> **Summary:** Re-review of all 14 r1 findings at `3149c7601f8e199d599c5e0abb721d87f56e2696`. Changes requested: three security defects and two implementation/documentation contract defects remain despite 247 passing unit tests. +> **概要:** `3149c7601f8e199d599c5e0abb721d87f56e2696` で r1 の14件を再レビューした。単体テスト247件は合格したが、安全性の欠陥3件と実装・文書の契約不一致2件が残るため修正を要求する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** correcting the original examples is insufficient when failure artefacts and alternative probe paths bypass the same protection. / 元の再現例を直しても、失敗時の証跡や別の検査経路が同じ保護を迂回するなら十分ではないと分かった。 +- Applies to: PR #21, `feat/m2-installer` → `develop`; REV (担当レビュワ), independent r2, no approval or merge. +- Related: [Review index](README.md) · [r1](2026-11-05_RDM-developer-guide_PR21_Installer_r1.md) · [SPEC-01](../spec/01_manifest.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-04](../spec/04_acceptance_tests.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-02](../decisions/ADR-02_Network_Model.md) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Installer](../../installer/README.md) · [Acceptance suite](../../installer/acceptance/README.md) · [Status board](../status/README.md) · [Mac Studio run record](../demo/20_core_install_mac_studio.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Changes requested.** P1 means a safety defect to fix before reliance; P2 means an implementation or documentation contract defect. A unit test replaces external programs with controlled responses; it does not certify a real installation. Docker (a tool for running applications in separate boxes) runs applications in separate containers; Compose describes those containers together. A secret is a password or key; egress is traffic leaving a network. + +Terminology: PR (a proposed change), CI (automatic checks), Semgrep (a source-code checker), Playwright (a browser automation tool), arm64 (the Apple Silicon CPU family), amd64 (the Intel/AMD CPU family), and mfr (the file-preview service). + +Read the r1 record, the fixes in `1caaace`, `ae273d4`, and `3149c76`, source, tests, and the requested specifications. GitHub access used `gh` only. No Docker command was executed against the real daemon, and no product source, commit, push, approval, merge, or closure was made. Local probes used temporary directories, synthetic secrets, and injected command runners. The second real install, if running, was left alone. + +The shared checkout and remote head advanced to `1c2a925d6af687129e8f9c23f06d629db58996c0` during review. That commit changes only Semgrep annotations in `accept.py` and a synthetic test literal in `test_accept.py`. Downloaded the exact `3149c76` archive through `gh api`, repeated all 247 installer tests and the probes with that source, and checked its documentation separately. Findings refer to `3149c76`; the newer CI result is reported separately. + +### Remaining findings + +1. **R2-01 — P1: retained browser traces still contain secrets (r1 #6 partially fixed).** `installer/grdm_dev/accept.py:275` enables `--tracing retain-on-failure`, but `sanitize_run_dir` at lines 359–363 masks only `junit.xml`, `collector.json`, and `pytest.log`. Files under `artifacts/` only receive permission changes. Reproduction: write a synthetic `.env` value into both `pytest.log` and a `trace.network` member of `artifacts/trace.zip`, then call `sanitize_run_dir(run_dir, [value])`. The log is masked; the ZIP member still contains the exact value. Browser traces may carry cookies, headers and response bodies, so 0600 permissions do not satisfy the no-secret evidence contract. Sanitize retained trace contents and other exported artefacts, or disable/quarantine them until safe; add a ZIP-content assertion. The existing test named “every evidence file” covers text files only. + +2. **R2-02 — P1: the API guard allows redirects to bypass the origin check (r1 #7 partially fixed).** `installer/acceptance/conftest.py:162` uses `kwargs.setdefault("max_redirects", 0)`. Calling `GuardedRequest(...).get("http://127.0.0.1:5000", max_redirects=20)` passes 20 unchanged to the underlying request context; captured arguments confirm it. A local response can therefore redirect externally before the response URL is checked. A later failure cannot undo the request, and an external hop returning to loopback is invisible to the final-URL check. Force zero redirects and validate each manually followed hop, or reject the override. Also, `guard_context` silently omits WebSocket routing when the method is absent (`:204`), while `pyproject.toml:19` permits Playwright 1.47; enforce a compatible capability/version or fail closed. Exact-origin parsing, guarded core call sites, and blocked service workers are improvements, but do not close these paths. + +3. **R2-03 — P1: a broken attacker-side probe is still classified as proven isolation (r1 #4 partially fixed).** `installer/grdm_dev/redteam.py:207–220` maps every nonzero `nc` execution to `GRDM_REACH_FAIL`, then to `unreachable`. Reproduction without network access: place a stub `nc` on PATH that exits 2 (representing unsupported options), execute `probe_script("192.0.2.1", 443)` through `/bin/sh`, and pass its output to `verdict`. The shell exits 0, emits `GRDM_REACH_FAIL`, and receives `unreachable`, not `inconclusive`. The positive control uses another container's binary, so it cannot validate the attacker's tool. The HTTP fallback against port 443 can likewise fail after making a connection. Use a known TCP probe, verify its operation in the attacker environment, distinguish tool/protocol errors from blocked connections, and return 53 on uncertainty. The new missing-tool, absent-marker, failed-control, attachment, and approval-field tests pass, but do not cover this case. + +4. **R2-04 — P2: explicitly granted egress fails the baseline (r1 #8/#2 follow-up).** `installer/grdm_dev/scan.py:487–489` rejects every non-publishing service on a non-internal network, without reading the recorded `GRDM_EGRESS_SERVICES` grant. Reproduction: render the real core manifest with `egress="worker"`; rendering returns 0 and records the choice, but `check_baseline(compose_path, hardening_path, env_path)` emits `BASE-NETWORK` for `worker`. The same render without egress has zero findings and 14 accepted hardening controls. SPEC-03 §3.2 explicitly says a recorded grant is not a baseline violation. Validate the recorded grant against actual attachments, accept the authorized service, and still reject undeclared attachments; add a renderer-to-baseline test for both cases. + +5. **R2-05 — P2: the changed documentation still omits or misstates contracts.** SPEC-01 mentions `build_platform` in its new version note, but neither §3 schema table defines the field, accepted values, optionality, or precedence. Its Japanese `integration_sha` row remains entirely English. SPEC-02 §3 still describes the build default as host-only although components now choose amd64, and calls `redteam preflight` read-only although it creates/removes a canary container/network. ADR-02 §3 describes dual attachment for published services, but §4 says “no egress by default”; those seven services already have an ordinary bridge attachment without an explicit grant. Correct both language halves together and describe that exposure plainly. The two halves of the new SPEC-03 §3.2/§6, ADR-02 §3/§4, and SPEC-02 changed rows are otherwise materially equivalent; parity alone does not make the statements accurate. + +### Disposition of all 14 r1 findings + +“Resolved” means the reported code-level defect is corrected in this review scope; real-Docker confirmation remains a separate stage. Each row uses the original r1 number. + +| r1 | r2 disposition | Evidence | +|---|---|---| +| 1 | Resolved at code/test level | Live PostgreSQL/RabbitMQ changes, old/new authentication checks and force recreation replace restart. Injected RabbitMQ failure returns 40 and restores both `.env` and the PostgreSQL fake store. Health-failure rollback test also passes. Real stores remain unverified. | +| 2 | Original cases resolved | `user: 0:0` now emits `BASE-USER`; actual core render yields zero findings and 14 accepted exception controls. Environment mode/defaults, exceptions and expiry are tested. See R2-04 for explicit egress. | +| 3 | Resolved | Ownerless `LISTEN 0 4096 0.0.0.0:5000 0.0.0.0:*` is now a project-port violation; the corresponding command test returns 40. Inspect/ps address and command-failure tests pass. | +| 4 | Partial | Actual attacker attachment, canary control and approval scope/date checks added; inconclusive tests return 53. Broken-tool path remains R2-03. | +| 5 | Resolved for reported cases | Semgrep exit 2 with `errors` yields incomplete/51; all four local packs are invoked. Tests cover every Compose image, integration filesystem scans, failed SBOM generation and failed image scans. | +| 6 | Partial | Synthetic values are masked in logs, result text and seed/cleanup messages; owner-only modes pass. Trace ZIP still leaks (R2-01). | +| 7 | Partial | Exact origins and guarded API/browser contexts added; redirects and absent WebSocket interception remain R2-02. | +| 8 | Partial | `grdm.internal: true` is generated; published services additionally use `grdm-edge`, now described normatively. Explicit egress and documentation remain R2-04/R2-05. | +| 9 | Resolved | Private URL literal removed; manifest/private-URL policy check passes on the shared checkout and CI. | +| 10 | Resolved | Re-render with own web listener on 5000 preserves `127.0.0.1:5000:5000`; foreign collision/remap tests pass. | +| 11 | Resolved | Captured push arguments contain one tag, `ghcr.io/rcosdp/web:abc123`, and no local registry destination; load-form test also passes. | +| 12 | Resolved for reported cases | Health precheck precedes pytest; missing Chromium, zero rows and missing rejection fail. C2 checks actual permissions, C3 uses a signed-in non-contributor, C4 checks both directions, C6 requires API 403. Selectors and real integration still need stage two. | +| 13 | Resolved | Non-editable install into a temporary target resolves the installed acceptance package, with 11 scenario files, `conftest.py` and `pytest.ini`, outside the checkout. | +| 14 | Original link/check failure resolved | Required docs check passes. At requested head Semgrep CI fails; follow-up `1c2a925` makes all six CI jobs pass. New documentation defects are R2-05. | + +### Validation and documentation evidence + +Observed results, not a canonical manifest (TOON is a compact text form for structured data): + +```toon +checks[7]{check,result}: + pinned_installer_tests,"247 run; OK at 3149c76" + pinned_docs_check,"PASSED; 51 checked; 8 exempt; 126 warnings" + shared_installer_tests,"247 run; OK" + shared_docs_check,"PASSED before this review; 51 checked; 8 exempt; 126 warnings" + installed_package,"non-editable install OK; 11 scenario files plus conftest and pytest.ini" + requested_head_ci,"5 pass; Semgrep fail" + followup_head_ci,"1c2a925: all 6 pass" +``` + +Run from the repository root; expected result is exit 0. Tests use fake external runners and do not change Docker state: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +python3 -m unittest discover -s tools/tests +gh pr checks 21 --repo RCOSDP/RDM-developer-guide +``` + +The shared-checkout tools suite also passed all 66 tests; the manifest/private-URL policy check passed with zero findings. The [Playwright 1.47 generated API](https://github.com/microsoft/playwright-python/blob/v1.47.0/playwright/sync_api/_generated.py), retrieved through `gh api`, has no `route_web_socket` method. + +The original Semgrep failure reports two 0700 directory-mode findings and one synthetic JWT literal. Do not weaken owner-only permissions to satisfy it; the follow-up uses documented suppression and a constructed test string. [Requested-head CI](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42023479058) and [follow-up CI](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42023972325) are distinct evidence. + +Packaging initially generated `installer/build/` inside the temporary archive and caused an extra docs-check failure there. Removed only that temporary build output and reran: 51 checked, zero errors. The archive has no Git metadata, so its private-URL policy scan cannot run; the real-checkout policy check and CI supply that evidence. This tooling artefact is not attributed to the PR. The new, untracked review was additionally passed directly to `docs_check.check_file`: zero errors; the tracked-file command alone does not include it. + +DEMO-20 run 1 has matching English/Japanese commands, host facts, five step outcomes and three image outcomes. It accurately labels the attempt as exit 30 before startup, not a completed installation. The source build flow supports stopping at the first failed component. However, the full log exists only in the author's session scratchpad, so the recorded host measurements, sizes and package failure were not independently re-established here. The failed mfr build alone does not prove ember/cas cannot build on arm64, nor prove the chosen amd64 builds succeed. “runtime holds two built images” should distinguish Docker's image store from files under `runtime/`. No claim is made about run 2 or M2 acceptance completion. + +### Required follow-up + +Fix R2-01–R2-05 and add tests that traverse the failing paths, then re-review the resulting head. Keep real install/build/startup, credential rejection against initialized stores, browser C1–C6 and actual network behavior as stage-two evidence. Existing M3 skips and upstream command placeholders are not delivered acceptance. This review grants no red-team execution or merge approval. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**修正要求。** P1 は信頼する前に直す安全性の欠陥、P2 は実装または文書の契約不一致を表す。単体テストは外部プログラムを決まった応答へ置き換えるもので、実機導入の証明ではない。Docker はプログラムを分離したコンテナで動かし、Compose はその箱をまとめて記述する。秘密とはパスワードや鍵、egress とはネットワークの外へ出る通信である。 + +用語注: PR(変更案)、CI(自動検査)、Semgrep(ソースコード検査道具)、Playwright(ブラウザ操作の自動化道具)、arm64(Apple Silicon の CPU 系列)、amd64(Intel/AMD の CPU 系列)、mfr(ファイルプレビュー用サービス)。 + +r1、`1caaace`・`ae273d4`・`3149c76` の修正、ソース、テスト、指定仕様を確認した。GitHub 操作は `gh` のみ。実 Docker へのコマンド実行、製品ソース変更、commit・push・approve・merge・close はしていない。再現は一時ディレクトリ・合成秘密・差し替えた実行関数を使用した。実行中の可能性がある第2回の実機導入には触れていない。 + +レビュー中に共有 checkout と remote head が `1c2a925d6af687129e8f9c23f06d629db58996c0` へ進んだ。この変更は `accept.py` の Semgrep 注釈と `test_accept.py` の合成リテラルだけである。`gh api` で正確な `3149c76` のアーカイブを取得し、そのソースで247件と再現試験を実行し、文書も別途検査した。指摘の対象は `3149c76` とし、新しい CI 結果は分けて記載する。 + +### 残る指摘 + +1. **R2-01 — P1: 保存するブラウザ trace に秘密が残る(r1 #6 は一部解消)。** `installer/grdm_dev/accept.py:275` は `--tracing retain-on-failure` を指定するが、359〜363行の `sanitize_run_dir` は `junit.xml`・`collector.json`・`pytest.log` しかマスクしない。`artifacts/` 以下は権限変更だけである。再現では、合成 `.env` 値を `pytest.log` と `artifacts/trace.zip` の `trace.network` メンバーに入れ、`sanitize_run_dir(run_dir, [value])` を実行した。ログは消えたが ZIP 内には同じ値が残った。trace は cookie・ヘッダ・応答本文を持ち得るため、0600 だけでは証跡へ秘密を書かない契約を満たさない。trace 内部と他の出力を無害化するか、安全になるまで無効化・隔離し、ZIP 内部の検査を追加する。「every evidence file」という既存テストはテキストだけを検査している。 + +2. **R2-02 — P1: API の転送が通信ガードを迂回する(r1 #7 は一部解消)。** `installer/acceptance/conftest.py:162` は `kwargs.setdefault("max_redirects", 0)` である。`GuardedRequest(...).get("http://127.0.0.1:5000", max_redirects=20)` を呼ぶと、下位の要求に20がそのまま渡ることを引数捕捉で確認した。ローカル応答から外部へ転送すると、応答 URL の確認前に通信が発生する。後からの失敗では取り消せず、外部を経てループバックへ戻る場合は最終 URL 検査でも分からない。転送を強制的に0にして各転送先を確認するか、上書きを拒否する。また `guard_context:204` は WebSocket ルーティングのメソッドが無い場合に黙って省略し、`pyproject.toml:19` は Playwright 1.47 を許す。必要な機能・版を必須にするか、検査不能なら停止する。正確な origin 判定、コア試験のラップ、service worker 禁止は改善だが、これらの経路は残る。 + +3. **R2-03 — P1: 攻撃側の壊れた疎通検査を隔離の証明と誤認する(r1 #4 は一部解消)。** `installer/grdm_dev/redteam.py:207–220` は `nc` のすべての非ゼロ終了を `GRDM_REACH_FAIL`、さらに `unreachable` と扱う。通信しない再現として、未対応オプションを模した終了2の `nc` スタブを PATH に置き、`/bin/sh` で `probe_script("192.0.2.1", 443)` を実行して `verdict` へ渡した。シェルは終了0で `GRDM_REACH_FAIL` を出し、`inconclusive` でなく `unreachable` となる。対照試験は別コンテナの別の実行ファイルなので攻撃側の道具を検証できない。443への HTTP 代替処理も接続後に失敗し得る。既知の TCP 検査を用い、攻撃側で道具自体の動作を確認し、道具・プロトコルの異常と通信遮断を区別し、不確かなら53を返す。道具欠落・マーカー欠落・対照失敗・接続先・承認欄の追加試験は合格したが、この経路を覆わない。 + +4. **R2-04 — P2: 明示的に許可した外向き通信を baseline が拒否する(r1 #8/#2 の続き)。** `installer/grdm_dev/scan.py:487–489` は、ポートを公開しないサービスの外部ネットワーク接続を、記録済みの `GRDM_EGRESS_SERVICES` を見ずに拒否する。実 core manifest を `egress="worker"` で生成すると終了0で選択も記録されるが、`check_baseline(compose_path, hardening_path, env_path)` は `worker` の `BASE-NETWORK` を返した。外向き許可なしなら検出0件、hardening 例外対策14件を受理する。SPEC-03 §3.2 は記録した許可を違反としないと明記する。許可記録と実接続を照合し、許可済みは通し、未申告は拒否する生成→検査の試験を追加する。 + +5. **R2-05 — P2: 変更文書にも契約の欠落・誤記がある。** SPEC-01 は新版履歴に `build_platform` を挙げるが、両言語の §3 の表に型・許容値・任意性・優先順位の定義がない。日本語 `integration_sha` 行も全文英語のままである。SPEC-02 §3 は部品が amd64 を選ぶようになっても build 既定をホストのみと記し、カナリアのコンテナ・ネットワークを作成・削除する `redteam preflight` を read-only とする。ADR-02 §3 は公開サービスの二重接続を説明するが、§4 は「既定では外向き通信がない」と述べる。その7サービスは明示許可なしでも通常 bridge に接続する。両言語を同時に直し、外へ通信できる範囲を明記する。新しい SPEC-03 §3.2/§6、ADR-02 §3/§4、SPEC-02 の変更行は、それ以外では英和の意味が対応するが、翻訳一致だけでは内容の正しさにならない。 + +### r1 全14件の判定 + +「解消」は報告されたコード上の欠陥が対象範囲で直ったという意味で、実 Docker の確認は別段階である。番号は r1 と同じ。 + +| r1 | r2 判定 | 証拠 | +|---|---|---| +| 1 | コード・試験上解消 | PostgreSQL/RabbitMQ の実効更新、新旧認証確認、強制再作成へ変更。RabbitMQ 失敗注入で40を返し `.env` と PostgreSQL の模擬値を旧値へ復元。再作成後 health 失敗の復旧試験も合格。実 DB は未確認。 | +| 2 | 元の再現は解消 | `user: 0:0` は `BASE-USER`。実 core 生成は検出0、例外対策14件受理。環境ファイルの権限・既定値・例外・期限も試験済み。明示 egress は R2-04。 | +| 3 | 解消 | 所有者なしの `LISTEN 0 4096 0.0.0.0:5000 0.0.0.0:*` はプロジェクトポート違反。対応コマンド試験は40。inspect/ps の公開先と道具失敗の試験も合格。 | +| 4 | 一部解消 | 実攻撃側の接続網・カナリア対照・承認範囲と日付を追加。不確かな場合の試験は53。壊れた道具は R2-03。 | +| 5 | 報告した経路は解消 | Semgrep 終了2+errors は incomplete/51。ローカル4パック、全 Compose イメージ、統合ソースの filesystem、SBOM 失敗、イメージ検査失敗を試験。 | +| 6 | 一部解消 | ログ・結果テキスト・seed/cleanup 出力の合成秘密をマスクし、所有者限定権限も合格。trace ZIP は R2-01。 | +| 7 | 一部解消 | 正確な origin と API/browser のガード追加。転送と WebSocket 遮断欠落は R2-02。 | +| 8 | 一部解消 | `grdm.internal: true` を生成し、公開サービスは仕様改定どおり `grdm-edge` にも接続。明示 egress と文書は R2-04/R2-05。 | +| 9 | 解消 | 非公開 URL 直書きを除去。共有 checkout と CI の manifest/非公開 URL 方針検査合格。 | +| 10 | 解消 | 自身の web が5000使用中でも再生成後は `127.0.0.1:5000:5000`。他プロセスの衝突・再割当試験も合格。 | +| 11 | 解消 | push 引数のタグは `ghcr.io/rcosdp/web:abc123` の一つで、ローカルタグの送信先なし。load 形式の試験も合格。 | +| 12 | 報告した経路は解消 | pytest 前の health、Chromium 実体、結果0行・拒否行欠落の失敗を確認。C2 実権限、C3 ログイン済み非参加者、C4 双方向、C6 API 403 を要求。実セレクタ・統合は第二段階。 | +| 13 | 解消 | 一時領域へ非 editable 導入し、checkout 外で同梱 acceptance を解決。シナリオ11ファイル、conftest、pytest.ini を確認。 | +| 14 | 元のリンク・検査失敗は解消 | 必須文書検査合格。指定 head の Semgrep CI は失敗したが、追補 `1c2a925` は6ジョブすべて合格。新たな文書欠陥は R2-05。 | + +### 検証と文書証跡 + +実測であり manifest 正本の転載ではない。TOON は構造化データを短く表す文字形式である。 + +```toon +checks[7]{check,result}: + pinned_installer_tests,"3149c76 で247件; OK" + pinned_docs_check,"合格; 51検査; 8除外; 126警告" + shared_installer_tests,"247件; OK" + shared_docs_check,"本レビュー追加前に合格; 51検査; 8除外; 126警告" + installed_package,"非 editable 導入成功; シナリオ11ファイルと conftest・pytest.ini" + requested_head_ci,"5合格; Semgrep失敗" + followup_head_ci,"1c2a925: 6件すべて合格" +``` + +リポジトリ root から実行し、期待値は終了0。単体テストは外部実行を模擬するため Docker の状態を変更しない。 + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +python3 -m unittest discover -s tools/tests +gh pr checks 21 --repo RCOSDP/RDM-developer-guide +``` + +共有 checkout の tools テストも66件すべて合格し、manifest/非公開 URL 方針検査は検出0件で合格した。`gh api` で取得した [Playwright 1.47 の生成 API](https://github.com/microsoft/playwright-python/blob/v1.47.0/playwright/sync_api/_generated.py) に `route_web_socket` メソッドがないことも確認した。 + +元の Semgrep 失敗は0700ディレクトリ権限2箇所と合成 JWT リテラル1箇所である。権限を緩めて直すべきではなく、追補は根拠付き除外とテスト文字列の構築を使用する。[指定 head の CI](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42023479058) と [追補 CI](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42023972325) は別の証跡である。 + +パッケージ試験が一時アーカイブ内に `installer/build/` を作り、その一時領域の文書検査が追加で失敗した。その生成物だけを除去して再実行し、51件検査・エラー0となった。アーカイブには Git 情報がないので非公開 URL 方針検査を実行できず、実 checkout と CI の検査を証拠とした。この検証作業の生成物による失敗を PR の欠陥とは扱わない。未追跡の新レビュー自体も `docs_check.check_file` へ直接渡し、エラー0を確認した。追跡済みファイルだけを見る通常コマンドには含まれないためである。 + +DEMO-20 第1回は、英和でコマンド・ホスト情報・5段階の結果・3イメージの結果が一致する。起動前の終了30と明記し、導入完了と誤記していない。build の制御も最初の失敗で止まる。ただし全ログは作者のセッション作業領域にしかなく、ホスト実測・サイズ・パッケージ失敗を本レビューで独立再確認したわけではない。mfr の失敗だけでは ember/cas の arm64 不可や amd64 成功を証明しない。また「runtime にビルド済みイメージ2つ」は Docker のイメージ保管場所と runtime のファイルを区別すべきである。第2回や M2 受入完了は認定していない。 + +### 必要な次の作業 + +R2-01〜R2-05 を直し、失敗経路を通る試験を加えて、その head を再レビューする。実導入・build・起動、初期化済み DB の旧認証拒否、ブラウザ C1〜C6、実ネットワーク挙動は第二段階の証跡とする。M3 向け skip と upstream の未実装入口は受入完了ではない。本レビューはレッドチーム実行やマージの承認ではない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Baseline | Checks that every installation must pass. | すべての導入が通る必須検査。 | +| Trace | A saved record of browser actions and network exchanges. | ブラウザ操作と通信を保存した記録。 | +| Origin | The exact scheme, host and port of a URL. | URL の方式・ホスト・ポートの組合せ。 | +| Canary / control | A known reachable target used to check the probe itself. | 検査自体が動くか確かめる既知の接続先。 | +| Rollback | Restore the previous working values after a failure. | 失敗後に以前の値へ戻す処理。 | +| CI | Automatic checks run for a proposed code change. | 変更案に対して自動で実行する検査。 | +| SBOM | A list of the software parts in an image or project. | イメージやプロジェクトに入るソフトウェア部品の一覧。 | diff --git a/docs/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r3.md b/docs/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r3.md new file mode 100644 index 0000000..ddaaf27 --- /dev/null +++ b/docs/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r3.md @@ -0,0 +1,169 @@ +# REV PR21 Installer review r3 / インストーラーレビュー r3 + +> **Summary:** The five r2 findings are resolved on their reported paths at `9fbb734`. Changes requested for one new prebuilt-image reporting defect; passing checks do not establish a completed real installation. +> **概要:** `9fbb734` で r2 の5件は報告された経路の修正を確認した。事前ビルド済みイメージの結果記録に新しい不一致が1件あるため修正要求とする。検査合格は実機導入完了を意味しない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** a fallback must report only the platforms it actually handled, even when the ordinary build accepts a platform list. / 通常のビルドが複数プラットフォームを受け付けても、代替経路の記録は実際に処理した対象だけでなければならないと分かった。 +- Applies to: PR (proposed change / 変更案) #21, `feat/m2-installer` → `develop`, head `9fbb7340f96957f3e56ca6034d3b303fe4cc58c0`; REV(担当レビュワ), independent review / 独立レビュー. +- Related: [Review index](README.md) · [r2](2026-11-05_RDM-developer-guide_PR21_Installer_r2.md) · [SPEC-01](../spec/01_manifest.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-04](../spec/04_acceptance_tests.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-02](../decisions/ADR-02_Network_Model.md) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Installer](../../installer/README.md) · [Acceptance suite](../../installer/acceptance/README.md) · [Status board](../status/README.md) · [Mac Studio run record](../demo/20_core_install_mac_studio.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Changes requested: R3-01 (P2, implementation/reporting contract).** R2-01–R2-05 are resolved for the reported cases. No approval, merge, close, commit or push was performed. GitHub access used `gh` only. All command runners that could change Docker (the container execution tool) state were replaced with fakes; no real installation or red-team run was started. Synthetic secrets and temporary directories were used. Compared local file bytes with the requested head's Git blob hashes through `gh api`: all 325 tracked files under `installer/`, `tools/`, `manifest/` and `docs/` matched before writing this record. + +Terminology: arm64 (Apple Silicon CPU family), amd64 (Intel/AMD CPU family), modular-file-renderer (file-preview service), ember-osf-web (browser-facing application). + +### Disposition of r2 + +| Finding | Result | Reproduced evidence | +|---|---|---| +| R2-01 | Resolved for reported trace leak | Put the same synthetic secret into `pytest.log`, ZIP member `trace.network`, and `resources/body`; after `sanitize_run_dir`, log and network member are `***`, and the response body member is removed. Default tracing is off. The execution path moves trace ZIPs into private quarantine before sanitizing public evidence. | +| R2-02 | Resolved | `GuardedRequest(...).get("http://127.0.0.1:5000", max_redirects=20)` raises `ValueError` with zero underlying calls. A context without WebSocket interception raises `RuntimeError`. All 10 guard tests pass in `.venv`, covering hop validation and the missing capability. | +| R2-03 | Resolved for broken-tool probe | A temporary `nc` executable containing `exit 2`, with the real generated shell probe, emits `GRDM_SELFTEST_FAIL tool=nc open-port-rc=2 closed-port-rc=2`; `verdict` returns `inconclusive`, not proven isolation. The probe never reaches the external target. | +| R2-04 | Resolved | Render the real core manifest with `egress="worker"` using fake external runners: exit 0; baseline findings empty; one `accepted-egress` entry for worker, network `grdm-edge`, source `env`. The suite also rejects undeclared attachments and stale grants. | +| R2-05 | Resolved for reported omissions/misstatements | Both SPEC-01 §3 tables now describe `build_platform`, absence behavior, example `linux/amd64`, override precedence and infra restriction; Japanese `integration_sha` is translated. SPEC-02 build describes CLI → component → host precedence, and redteam preflight explicitly creates/removes a canary container/network. ADR-02 §4 explicitly names seven publishing services with outbound Internet access. | + +The platform rows give an example rather than an exhaustive accepted-value grammar; MC-10 currently type-checks `build_platform`. This review does not claim exhaustive platform-value validation. + +### New finding + +**R3-01 — P2: prebuilt multi-platform requests silently drop platforms but record all as handled.** In [build.py](../../installer/grdm_dev/build.py), `pull_argv` (line 168) uses only `platforms[0]`; the prebuilt branch (lines 211–217) records `",".join(platforms)` and returns success. With the real manifest and an injected runner, select `ember-osf-web`, set `platform="linux/amd64,linux/arm64"`, and set `push=True`: the only call is `docker pull --platform linux/amd64 <pinned-reference>`, exit is 0, and the result reports `platforms: linux/amd64,linux/arm64`, `status: prebuilt`, `push: true`. No arm64 operation occurs. The same truncation follows without `--push` because `pull_argv` is independent of that flag. The new fallback thus misstates work performed, and SPEC-02's general multi-platform push description does not define the exception. + +Reject unsupported multi-platform requests for a prebuilt component before pulling, or implement each requested platform and report actual results. Define whether `--push` is rejected or explicitly skipped for prebuilt components, and make the result/documentation reflect that policy. Add a regression test checking both invoked arguments and recorded platforms; do not require real Docker for this test. + +### Prebuilt and trace contracts + +SPEC-01's English/Japanese `prebuilt_image` rows agree: digest pin, explanatory note, no infra/private-repository reference, bypass of source provenance, removal by M4. MC-06 checks syntax, a nonempty note, prohibited reference forms and infra role; it does not prove registry accessibility or that a free-text note actually explains a milestone. The real note states the schema-1 build failure and M4 removal. The real reference is: + +```text +niicloudoperation/rdm-ember-osf-web@sha256:65ee1fae52a33ec7dbc42546f5b3a240dddd70eb963d1ebe2ededa80135cc2e7 +``` + +A default fake-runner build of this component makes exactly one pull for `linux/amd64`, records `prebuilt`, and makes no clone/build call. Rendered `ember_osf_web.image` equals that digest reference and its platform is `linux/amd64`. Unit tests cover pull failure returning 30; manifest tests cover missing digest/note, private references, infra usage and the actual entry. No registry pull or independent image provenance/architecture verification was performed here. + +SPEC-04 §7, acceptance README and demo-runs README consistently describe tracing off by default, opt-in failure traces under `runtime/reports/quarantine/<run_id>/`, and the raw cookie/body risk. The main installer README does not make a conflicting trace promise. Source moves ZIPs before sanitizing the remaining evidence and restricts quarantine directories/files to 0700/0600. Quarantine is raw, not an exportable sanitized artifact. The ZIP probe establishes removal of the tested secret, not a general guarantee about image pixels, metadata or arbitrary encodings. + +DEMO-20 run 2 has equivalent English/Japanese steps and image outcomes. It records exit 30 at ember-osf-web after the amd64 modular-file-renderer build, not startup success; this motivates the fallback but does not prove it completes installation. Measurements and registry claims in that run were read, not independently repeated. Real startup, initialized-store credential rejection, browser acceptance and actual network behavior remain separate evidence. + +### Validation + +Observed results (TOON is a compact structured-text format; these are review observations, not canonical manifest data): + +```toon +checks[7]{check,result}: + installer_unittest,"288 run; OK; 10 skipped because system Python lacks pytest" + guard_tests_venv,"10 run; OK; covers the 10 system-Python skips" + tools_unittest,"77 run; OK" + docs_check,"PASSED; 52 checked; 8 exempt; 127 warnings before this record" + manifest_check,"PASSED; zero findings" + head_file_comparison,"325 files match 9fbb734" + github_ci,"all 6 checks pass on 9fbb734" +``` + +Run from the repository root; each command completed with exit 0: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +PYTHONPATH=installer:installer/tests .venv/bin/python -m unittest test_accept.GuardedRequestTests +gh pr checks 21 --repo RCOSDP/RDM-developer-guide +``` + +CI (automatic checks) evidence: [documentation](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42027270163) and [security/manifest](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42027270050). The new untracked review passed separately through `docs_check.check_file` with zero errors and warnings, because the normal command selects tracked files. Fix R3-01 and re-review; this verdict is not a real-install acceptance or a merge authorization. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**修正要求: R3-01(P2、実装と結果記録の契約不一致)。** R2-01〜R2-05 は報告されたケースの解消を確認した。approve・merge・close・commit・push はしていない。GitHub 操作は `gh` のみ。Docker(コンテナ実行の道具)の状態を変え得る実行関数は偽物に置き換え、実機導入もレッドチーム実行も開始していない。合成秘密と一時ディレクトリを使った。`gh api` で指定 head の Git blob ハッシュとローカルを比較し、記録作成前の `installer/`・`tools/`・`manifest/`・`docs/` の追跡済み325ファイルがすべて一致した。 + +用語注: arm64(Apple Silicon の CPU 系列)、amd64(Intel/AMD の CPU 系列)、modular-file-renderer(ファイルプレビュー用サービス)、ember-osf-web(ブラウザ向けアプリケーション)。 + +### r2 の処置 + +| 指摘 | 結果 | 再現した証拠 | +|---|---|---| +| R2-01 | 報告された trace 漏えいは解消 | `pytest.log`、ZIP の `trace.network` と `resources/body` に同じ合成秘密を置いた。`sanitize_run_dir` 後、ログと network は `***`、応答本文メンバーは削除された。既定の trace は無効で、実行経路は公開証跡の無害化前に ZIP を隔離する。 | +| R2-02 | 解消 | `GuardedRequest(...).get("http://127.0.0.1:5000", max_redirects=20)` は下位呼出し0件で `ValueError`。WebSocket を遮断できない context は `RuntimeError`。転送先と機能欠落を含む guard 10試験が `.venv` で合格した。 | +| R2-03 | 壊れた道具の経路は解消 | 終了2の一時 `nc` で実際の生成シェルを実行すると `GRDM_SELFTEST_FAIL tool=nc open-port-rc=2 closed-port-rc=2`。`verdict` は隔離成功でなく `inconclusive`。外部宛て検査には進まない。 | +| R2-04 | 解消 | 実 core manifest を外部実行関数だけ偽物にして `egress="worker"` で生成すると終了0。baseline 指摘0件で、worker・`grdm-edge`・source `env` の `accepted-egress` が1件。未記録の接続と古い許可の拒否試験も合格した。 | +| R2-05 | 報告された欠落・誤記は解消 | SPEC-01 §3 の両表に `build_platform`、省略時、`linux/amd64` の例、優先順位、infra 制約がある。`integration_sha` の和訳もある。SPEC-02 は CLI → 部品 → ホストの順序と preflight のカナリア作成・削除を明記。ADR-02 §4 は公開7サービスの外向き通信を明示した。 | + +プラットフォーム欄は例示であり、許容値の網羅的な文法ではない。現在 MC-10 は `build_platform` の型を検査する。値の網羅的な妥当性検査まで確認したとはしない。 + +### 新しい指摘 + +**R3-01 — P2: prebuilt の複数プラットフォーム指定を切り捨て、全件処理したように記録する。** [build.py](../../installer/grdm_dev/build.py) の `pull_argv`(168行)は `platforms[0]` だけを使うが、prebuilt 分岐(211〜217行)は全件を `",".join(platforms)` で記録して成功する。実 manifest と差し替えた実行関数で `ember-osf-web`、`platform="linux/amd64,linux/arm64"`、`push=True` を選ぶと、呼出しは `docker pull --platform linux/amd64 <固定参照>` だけで終了0、結果は `platforms: linux/amd64,linux/arm64`、`status: prebuilt`、`push: true` になる。arm64 の処理はない。`pull_argv` は push に依存しないため、`--push` なしでも切捨ては同じ。SPEC-02 の複数プラットフォーム push の一般説明にも例外の定義がない。 + +prebuilt で未対応の複数指定は pull 前に拒否するか、指定をすべて処理して実績を記録すること。prebuilt に対する `--push` を拒否するか明示的にスキップするかも定義し、結果と文書を合わせること。実 Docker を使わず、呼出し引数と記録したプラットフォームの両方を見る回帰試験を追加すること。 + +### prebuilt と trace の契約 + +SPEC-01 の英和 `prebuilt_image` 行は、ダイジェスト固定、説明 note、infra・非公開リポジトリ参照禁止、ソース由来保証の除外、M4 での撤去について一致している。MC-06 は構文・空でない note・禁止参照・infra を検査するが、レジストリ到達性や note に本当に節目の説明があるかまでは証明しない。実 note には schema 1 の失敗と M4 撤去が書かれている。実参照は次のとおり。 + +```text +niicloudoperation/rdm-ember-osf-web@sha256:65ee1fae52a33ec7dbc42546f5b3a240dddd70eb963d1ebe2ededa80135cc2e7 +``` + +既定の偽実行では `linux/amd64` の pull が1回、記録は `prebuilt`、clone・build は0回。生成した `ember_osf_web.image` は同じ参照、platform は `linux/amd64`。単体試験は pull 失敗の終了30、manifest 試験は digest/note 欠落、非公開参照、infra、実エントリーを検査している。実 pull と独立した画像の由来・アーキテクチャ検証は行っていない。 + +SPEC-04 §7、acceptance README、demo-runs README は、既定の trace 無効、明示指定時の失敗 trace の `runtime/reports/quarantine/<run_id>/` への隔離、生の cookie・本文の危険を整合して説明する。installer 本体の README に矛盾する trace 保証はない。実装は残りの証跡の無害化前に ZIP を移し、隔離先はディレクトリ0700・ファイル0600。隔離物は生データであり、公開できる無害化済み証跡ではない。ZIP 再現は試した秘密の除去を示すだけで、画像の画素・メタデータ・任意の符号化までの保証ではない。 + +DEMO-20 run 2 の英和の手順・画像結果は一致している。amd64 の modular-file-renderer 成功後、ember-osf-web で終了30と記録され、起動成功とはしていない。これは代替経路の動機だが、導入完了の証明ではない。測定値とレジストリに関する記録は読んだだけで再実行していない。実起動、初期化済みストアでの旧資格情報拒否、ブラウザ受入、実ネットワーク挙動は別の証拠として残る。 + +### 検証 + +観測結果(TOON は構造化データの短い表記。manifest の正本ではない): + +```toon +checks[7]{check,result}: + installer_unittest,"288件; OK; system Python に pytest がないため10件スキップ" + guard_tests_venv,"10件; OK; system Python のスキップ分を補完" + tools_unittest,"77件; OK" + docs_check,"PASSED; 記録作成前52件検査・8件除外・127警告" + manifest_check,"PASSED; 指摘0件" + head_file_comparison,"325ファイルが9fbb734と一致" + github_ci,"9fbb734の6チェックがすべて成功" +``` + +リポジトリのルートで次を実行し、すべて終了0を確認した。 + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +PYTHONPATH=installer:installer/tests .venv/bin/python -m unittest test_accept.GuardedRequestTests +gh pr checks 21 --repo RCOSDP/RDM-developer-guide +``` + +CI(自動検査)の証拠: [文書](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42027270163)、[セキュリティ・manifest](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42027270050)。通常の文書検査は追跡済みファイルを選ぶため、新規記録は `docs_check.check_file` で別途検査し、エラー・警告とも0件だった。R3-01 を修正して再レビューすること。実機受入の合格やマージ承認は与えない。 + +## Glossary / 用語 + +| Term | English | 日本語 | +|---|---|---| +| REV | Reviewer | 担当レビュワ | +| Digest | Content fingerprint identifying an image | イメージの内容を固定する指紋 | +| Prebuilt image | Already-built application package | 既に組み立てられた実行用の包み | +| Egress | Outbound network traffic | 外へ出る通信 | +| Quarantine | Private storage excluded from public evidence | 公開証跡に含めない隔離保管 | +| Probe | Small check of a condition | 状態を調べる小さな検査 | +| P2 | Implementation or documentation contract defect | 実装・文書の契約不一致 | diff --git a/docs/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r4.md b/docs/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r4.md new file mode 100644 index 0000000..10aa034 --- /dev/null +++ b/docs/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r4.md @@ -0,0 +1,141 @@ +# REV PR21 Installer review r4 / インストーラーレビュー r4 + +> **Summary:** The multi-platform pull defect is fixed at `6df8c4b`; previous verified fixes show no regression. Changes requested only for the remaining prebuilt `--push` policy/reporting part of R3-01. +> **概要:** `6df8c4b` で複数プラットフォームの取得不具合は解消し、確認済み修正の後退はない。R3-01 のうち prebuilt の `--push` 方針・結果表示が残るため、その部分のみ修正要求とする。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** checking every requested platform fixes pull accounting, but does not define what a push request means for a prebuilt component. / 全指定対象を検査すれば取得実績は正しくなるが、事前ビルド済み部品への送信要求の意味は別途定義が必要と分かった。 +- Applies to: PR (proposed change / 変更案) [#21](https://github.com/RCOSDP/RDM-developer-guide/pull/21), `feat/m2-installer` → `develop`, head `6df8c4b20b810fc8cf67b5786f63e933f0be8c07`; REV(担当レビュワ). +- Related: [Review index](README.md) · [r1](2026-11-05_RDM-developer-guide_PR21_Installer_r1.md) · [r2](2026-11-05_RDM-developer-guide_PR21_Installer_r2.md) · [r3](2026-11-05_RDM-developer-guide_PR21_Installer_r3.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Installer](../../installer/README.md) · [Status board](../status/README.md) · [Mac Studio run record](../demo/20_core_install_mac_studio.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Changes requested: R3-01 partially resolved; only the prebuilt `--push` contract remains (P2, behavior/documentation mismatch).** No new regression was found in the previously verified R1/R2 fixes. This is a code/test review, not real-install acceptance. GitHub access used `gh` only; no approve, merge, close, commit or push operation was performed. Docker (the tool running application boxes) state was not changed. External operations in build probes used fake runners (functions returning controlled answers). + +The remote comparison from `9fbb734` to `6df8c4b` contains only `build.py`, `test_build.py` and the r3 review record. Before writing r4, all 326 tracked files under `installer/`, `tools/`, `manifest/` and `docs/` matched the requested head's blob hashes (file-content fingerprints), obtained through `gh api`. Thus the prior security and documentation fixes are unchanged; the installer and tools suites were rerun to check integration regressions. Earlier real-install limitations remain unchanged. + +### R3-01: pull accounting resolved + +[build.py](../../installer/grdm_dev/build.py), lines 164–171 and 213–229, now passes a single platform (operating-system/processor target) to `pull_argv(reference, platform)` and calls it once for every requested target. It continues after an individual failure, records only successful targets in `pulled`, sets `pull-failed` if any return code is nonzero, and exits 30 through the existing error path. `platforms` retains the requested list. The host fallback still makes one pull when the list is empty. + +[test_build.py](../../installer/tests/test_build.py), lines 252–274, adds `test_prebuilt_multi_platform_pulls_each_and_fails_on_any`. For `linux/arm64,linux/amd64`, a simulated arm64 (Apple Silicon processor family) failure produces exactly two pulls, exit 30, `pull-failed`, and `pulled=linux/amd64`. arm64 (Apple Silicon processor family) and amd64 (Intel/AMD processor family) identify processor targets. The existing single-platform success/failure and source-build tests still pass. + +An independent temporary-fixture probe additionally tested both `push=False` and `push=True` with four outcomes: both successful, first failing, second failing, and both failing. All eight cases asserted the exact ordered pull arguments, exit code, status and successful-target list. Both targets are attempted in every case; all-success exits 0, any failure exits 30, and both-failed records an empty `pulled` string. No real image was downloaded. + +### Remaining part of R3-01 + +**P2: prebuilt `--push` is silently skipped without a defined exception.** With only a prebuilt component selected, `platform="linux/arm64,linux/amd64"`, `push=True` and two successful fake pulls, the command returns 0. Its report has top-level `push: true`, row `status: prebuilt`, and two successful `pulled` targets; the only operations are two `docker pull` calls. There is no push operation or explicit skipped-push result. The warning only says the component is not built from its source repository. See [build.py](../../installer/grdm_dev/build.py), lines 213–230 and 244. + +[SPEC-02](../spec/02_installer_cli.md), English line 80 and Japanese line 272, still says `--push` sends the multi-architecture manifest to GHCR (the image distribution service), without defining a prebuilt exception. The r3 requested remedy explicitly included rejecting or explicitly skipping prebuilt push and aligning the result and documentation. Commit (saved change) `6df8c4b` addresses the platform loop but leaves that remedy unchanged. A caller requesting publication can receive success with no published image. + +Reject this combination before pulling, or define a deliberate skip in both language halves and report it explicitly per component. Add a test for the chosen policy, including a prebuilt-only successful-pull request with `--push`. Do not interpret the top-level flag, which records input, as proof that anything was published. + +### Regression evidence and validation + +The r1 source-build push destination remains the single GHCR tag; the prebuilt branch does not alter that path. R1 credential rotation/rollback, listener checks, baseline checks, scanner failure handling, port preservation, acceptance collection and packaging retain their previous code. R2 trace quarantine (private storage for raw browser records), redirect/WebSocket guards, broken-probe detection, recorded egress (outbound traffic) grants and bilingual contract corrections are unchanged from r3. The full suites and the separately executed guard tests pass. This confirms no regression in the verified scope, not new real-store, browser or network evidence. + +Observed results in TOON (compact structured text); these are review observations, not canonical manifest data: + +```toon +checks[5]{check,result}: + installer_unittest,"289 run; OK; 10 skipped because system Python lacks pytest" + guard_tests_venv,"10 run; OK; covers those 10 skips" + tools_unittest,"77 run; OK" + independent_prebuilt_matrix,"8 cases; all assertions pass" + github_ci,"6 checks pass at 6df8c4b" +``` + +Commands executed from the repository root, each with exit 0: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +PYTHONPATH=installer:installer/tests .venv/bin/python -m unittest test_accept.GuardedRequestTests +python3 -m unittest discover -s tools/tests +gh pr checks 21 --repo RCOSDP/RDM-developer-guide +``` + +Terminology: PR (proposed change), Manifest (component inventory), Secret (password or key), Trivy (dependency vulnerability scanner), Semgrep (source-code pattern checker), MkDocs (documentation website builder). + +CI (automatic checks) passed: Build MkDocs Site, Check Links, Manifest validation and private-URL policy, Secret scan (gitleaks), Semgrep static analysis, and Trivy filesystem scan (report only at M1). These are the six checks attached to the [reviewed PR](https://github.com/RCOSDP/RDM-developer-guide/pull/21). The new review file was also checked directly with `tools.docs_check.check_file` because it is not yet tracked. + +Real startup, initialized-store credential rejection, browser acceptance and actual network behavior remain separate stage-two evidence. The ongoing real installation was not touched. No merge authorization is given. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**修正要求: R3-01 は部分解消。残るのは prebuilt の `--push` 契約のみ(P2、動作と文書の不一致)。** 確認済みの R1/R2 修正に新たな後退は見つからなかった。コードと試験のレビューであり、実機導入の受入判定ではない。GitHub 操作は `gh` のみで、approve・merge・close・commit・push はしていない。Docker(アプリケーションの箱を動かす道具)の状態は変えていない。build の追加検査では外部操作を偽 runner(決まった応答を返す関数)に差し替えた。 + +`9fbb734` から `6df8c4b` のリモート差分は `build.py`、`test_build.py`、r3 記録のみ。r4 作成前に `gh api` で指定 head の blob ハッシュ(ファイル内容の指紋)を取得し、`installer/`・`tools/`・`manifest/`・`docs/` の追跡済み326ファイルすべての一致を確認した。従来の安全対策と文書修正は変わっておらず、組合せによる後退も確認するため installer と tools の試験を再実行した。従来の実機未検証範囲はそのまま残る。 + +### R3-01: 取得実績の不具合は解消 + +[build.py](../../installer/grdm_dev/build.py) の164〜171行・213〜229行は、`pull_argv(reference, platform)` に単一プラットフォーム(OS・プロセッサの対象)を渡し、指定対象ごとに1回呼び出す。途中で失敗しても残りを取得し、成功した対象だけを `pulled` に記録する。一つでも非ゼロ終了なら `pull-failed` とし、既存のエラー経路で終了30を返す。`platforms` は要求一覧を保持する。空の一覧でもホスト既定の pull を1回行う。 + +[test_build.py](../../installer/tests/test_build.py) の252〜274行に `test_prebuilt_multi_platform_pulls_each_and_fails_on_any` が加わった。`linux/arm64,linux/amd64` の arm64 取得を失敗させ、pull が正確に2回、終了30、`pull-failed`、`pulled=linux/amd64` を確認する。arm64 と amd64 はプロセッサの系列名。単一対象の成功・失敗とソースビルドの既存試験も合格した。 + +さらに独立した一時データで、`push=False` と `push=True` のそれぞれについて全成功・先頭失敗・後続失敗・両方失敗を検査した。8ケースすべてで pull 引数の順序と全内容、終了値、状態、成功対象一覧を照合した。毎回両対象を試し、全成功なら終了0、失敗があれば終了30、両方失敗なら `pulled` は空文字になる。実イメージは取得していない。 + +### R3-01 の残件 + +**P2: prebuilt の `--push` は例外を定義せず暗黙に省略される。** prebuilt 部品だけを選択し、`platform="linux/arm64,linux/amd64"`、`push=True` として偽 pull を2回成功させると終了0になる。結果は最上位に `push: true`、部品に `status: prebuilt` と成功した2対象の `pulled` を記録するが、実行するのは `docker pull` の2回だけ。送信処理も、送信を省略したという明示的な結果もない。警告はソースリポジトリからビルドしないことだけを述べる。[build.py](../../installer/grdm_dev/build.py) の213〜230行・244行が該当する。 + +[SPEC-02](../spec/02_installer_cli.md) の英語80行・日本語272行は、`--push` が複数アーキテクチャの manifest を GHCR(イメージの配布先)へ送ると記載したままで、prebuilt の例外を定義していない。r3 は prebuilt の push を拒否するか明示的に省略し、結果と文書を揃えることも要求した。`6df8c4b` は対象ごとのループを直したが、この要求は未対応。公開を要求した利用者が、何も公開されていない成功結果を受け取り得る。 + +取得前にこの組合せを拒否するか、意図した省略として両言語の仕様で定義し、部品単位で明示的に記録すること。prebuilt のみを選び pull が成功する `--push` 要求を含め、採用した方針を試験すること。最上位のフラグは入力の記録であり、公開済みの証拠とは解釈しない。 + +### 回帰確認と検証 + +r1 のソースビルドの push 先は引き続き単一 GHCR タグであり、prebuilt 分岐はその経路を変更しない。R1 の資格情報更新・巻戻し、待受検査、baseline 検査、スキャン失敗処理、ポート維持、受入結果収集、パッケージ化は従来のコードを保つ。R2 の trace 隔離(ブラウザの生記録の非公開保管)、転送・WebSocket の通信制限、壊れた検査道具の検出、記録された egress(外向き通信)許可、英和の契約修正は r3 から不変。全体試験と別実行した通信制限試験も合格した。確認済み範囲の後退がないことを示し、新たな実ストア・ブラウザ・ネットワークの証拠ではない。 + +観測結果を TOON(構造化データの短い文字表記)で示す。manifest の正本ではない。 + +```toon +checks[5]{check,result}: + installer_unittest,"289件; OK; system Python に pytest がないため10件スキップ" + guard_tests_venv,"10件; OK; スキップ分を補完" + tools_unittest,"77件; OK" + independent_prebuilt_matrix,"8ケース; 全アサーション合格" + github_ci,"6df8c4b の6チェック成功" +``` + +リポジトリルートから次を実行し、各終了0を確認した。 + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +PYTHONPATH=installer:installer/tests .venv/bin/python -m unittest test_accept.GuardedRequestTests +python3 -m unittest discover -s tools/tests +gh pr checks 21 --repo RCOSDP/RDM-developer-guide +``` + +用語注: PR(変更案)、Manifest(部品の一覧)、Secret(パスワードや鍵)、Trivy(依存部品の弱点を検査する道具)、Semgrep(コードのパターンを検査する道具)、MkDocs(文書をサイトにする道具)。 + +CI(自動検査)は Build MkDocs Site、Check Links、Manifest validation and private-URL policy、Secret scan (gitleaks)、Semgrep static analysis、Trivy filesystem scan (report only at M1) の6件が成功した。[対象 PR](https://github.com/RCOSDP/RDM-developer-guide/pull/21) に付いた検査である。新規レビューは未追跡のため `tools.docs_check.check_file` でも直接検査した。 + +実起動、初期化済みストアでの旧資格情報拒否、ブラウザ受入、実ネットワーク挙動は第二段階の証拠として別途必要。進行中の実機導入には触れていない。マージ承認は与えない。 + +## Glossary / 用語 + +| Term | English | 日本語 | +|---|---|---| +| REV | Reviewer | 担当レビュワ | +| Prebuilt | Already-built application image | 既に組み立てた実行用イメージ | +| Pull / push | Download / publish an image | イメージの取得/公開 | +| Platform | Operating-system and processor target | OS とプロセッサの対象 | +| Runner | Function executing or simulating a command | コマンドを実行または模擬する関数 | +| Regression | Previously working behavior becomes broken | 動いていた機能が変更で壊れること | +| P2 | Behavior or documentation contract defect | 動作または文書の契約不一致 | diff --git a/docs/reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1.md b/docs/reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1.md new file mode 100644 index 0000000..657ada0 --- /dev/null +++ b/docs/reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1.md @@ -0,0 +1,72 @@ +# PR #1 public develop merge — REV review r1 / 公開 develop 統合レビュー + +**Jump:** [English](#english) · [日本語](#japanese) + +Version: 0.1 — 2026-11-05 + +Learned / 分かったこと: the merge preserves both upstream histories and the private tree outside two public files; conflict-free integration does not establish test correctness or compliance with the documented integration order. + +Reviewer: REV(担当レビュワ, Codex Astra) + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** review r1 of RDM-osf.io-dev2027 PR #1 by REV (Codex Astra); header lines added by QAE for SPEC-06 compliance, body unchanged. / REV(Codex Astra)による PR #1 のレビュー r1。見出し行は SPEC-06 準拠のため QAE が追加し、本文は変更していない。 +- Related: [docs/reviews/README.md](README.md) · [ADR-04 AI Autonomy and Roles](../decisions/ADR-04_AI_Autonomy_and_Roles.md) · [SPEC-01 Manifest](../spec/01_manifest.md) + +--- + +<a id="english"></a> +## English + +### Verdict: request changes + +Reviewed repository `RCOSDP/RDM-osf.io-dev2027`, PR #1, head `546969eb33f42e35be5dc5c5ac8bfe55e3ef0bbc`. This is a review recommendation, not a submitted approval or merge. No production-code regression or loss of private hardening was found in the two-file delta. Resolve R1 and R2 before merging; R3 is an owner disclosure decision. + +### Findings, ranked by severity + +1. **R1 — Medium (P2): the new anonymous API 2.10 test supplies authentication.** At head, `api_tests/users/views/test_user_detail.py:260–262`, `test_social_values_old_version_not_logged_in` passes `auth=user_one` while expecting 401. The same test's 2.9 request at lines 256–258 omits authentication; successful authenticated requests at lines 234–248 use `user_one.auth`. Consequently the 2.10 case is not a clean test of absent credentials: rejection of the supplied authentication can satisfy the assertion, or helper handling can fail before the intended assertion. Remove the `auth` argument and run both versions' anonymous and authenticated cases. This defect originates in public commit `3243fd7`; preserve that history and add a follow-up fix. Runtime failure is not claimed: the test suite was not executed. +2. **R2 — Medium (P2): the stated integration order does not describe the actual topology.** PR body “内容” item 2 and merge commit body line 4 claim the SPEC-01 public → private → adopted-PR order. However the first parent is the already-private tip `3f4c9cd`, and the second is newer public tip `bacfe64`. [SPEC-01 §4 rule 3](../spec/01_manifest.md#4-rules) fixes the order. This is a private-seeded incremental public merge, not a literal execution of that recipe. The non-overlap makes the resulting content safe from a private/public conflict in this instance, but does not resolve the policy statement. Correct the PR explanation and record the owner's accepted bootstrap/incremental interpretation or exception in documentation; if strict reconstruction is required, propose it separately without rewriting or force-pushing upstream history. An additional commit can clarify the historical commit's assertion without amending it. +3. **R3 — Low (P3): a conversation-session URL is retained in metadata.** PR body line 14 and merge commit body line 8 (`Claude-Session`) contain a link to an individual AI session. It is not a private repository URL, and no access token or password was found in the inspected PR metadata/delta. The session's contents and access controls were not inspected, so it is not proven to expose secrets. The owner should decide whether this provenance link belongs in durable metadata; remove it from the editable PR body if unnecessary. Do not reproduce the URL in public review records or rewrite history merely to remove a non-secret reference. + +### Verification and evidence + +- Read `gh pr view 1 -R RCOSDP/RDM-osf.io-dev2027 --json title,body,commits,files` (also head/base SHA) and `gh pr diff 1 -R RCOSDP/RDM-osf.io-dev2027`. +- `gh api repos/RCOSDP/RDM-osf.io-dev2027/commits/546969eb33f42e35be5dc5c5ac8bfe55e3ef0bbc` confirms exactly two parents: `3f4c9cd32e2e118f42a6b5aacbe2a5ff066a8a38` and `bacfe64fdc002f09df47145fc17f57630772ac82`. This is a real merge, not a squash. The three public commits retain their original SHAs: `5f78e37d591986ace4d241c992c1454e8af0a632` (permission), `3243fd7943428cb5e0c1f3a741b354dfa1369bdb` (tests), and `bacfe64fdc002f09df47145fc17f57630772ac82` (public PR merge). Historical force-push activity cannot be established from this snapshot alone. +- The requested compare endpoint `compare/upstream/public-develop...upstream/private-develop` reports divergence: private ahead 161, behind 3, common ancestor `b7eacc4c2f2a50f72f3489fc9c3d105b46ea8108`. Its 260 changed files do not include either incoming file; thus there is no net file overlap, including private security changes. This checks net changes, not every transient edit in 161 commits. +- Compared the pinned private tip → PR head against common ancestor → pinned public tip using the compare API. Both return exactly `api/users/views.py` and `api_tests/users/views/test_user_detail.py`; both patches and final blob SHAs match. No other private-base files change. This establishes preservation of the private tree, including hardening outside these files, rather than relying only on the PR's “no conflicts” claim. +- `api/users/views.py:177–184` requires authentication while retaining current-user/write and token-scope permissions. Inspected the test changes, `api_tests/conftest.py:10–11`, and `tests/json_api_test_app.py:41–51` to identify the test application. Authenticated cross-user access remains tested in `test_get`. +- The new integration commit uses a scoped Japanese `merge(upstream):` subject and includes reason, validation, and the explicit deferral of build/acceptance to M2. These requested convention elements are present; R2 concerns factual accuracy. Existing English upstream subjects should not be rewritten to enforce local style. +- Manually inspected all four PR commit messages, PR body and two-file patch for secrets/credentials/private URLs. Found the session reference described in R3, no obvious credential and no private repository URL. This is not a full-history or automated secret scan. +- GitHub checks at inspection: JavaScript/TypeScript CodeQL passed; Python CodeQL and two `build-image` jobs were pending. No local build, application test, or acceptance test was run. Pending checks are not passes, and static tree preservation is not proof of runtime compatibility. + +### Owner decisions before merge + +Require R1's follow-up test correction and targeted execution evidence. Resolve R2's integration-order interpretation and accurately document it without rewriting upstream history. Decide R3's session-link retention and whether to accept deferring broader build/acceptance testing to M2; obtain the final required CI results. Explicitly accept that anonymous user-detail reads, including view-only-link requests, are now denied; validate dependent clients at M2. Preserve both upstream histories with a normal merge, not squash/rebase. This review makes no changes to the reviewed repository beyond the single requested PR comment. + +<a id="japanese"></a> +## 日本語 + +### 判定: request changes(修正要求) + +対象は `RCOSDP/RDM-osf.io-dev2027` PR #1、head `546969eb33f42e35be5dc5c5ac8bfe55e3ef0bbc`。これはレビュー上の推奨判定であり、承認やマージ操作ではありません。2ファイルの差分から、本番コードの回帰や非公開側のセキュリティ変更の消失は見つかりませんでした。マージ前に R1・R2 を解決し、R3 は所有者が情報公開の観点から判断してください。 + +### 重要度順の指摘 + +1. **R1 — 中(P2): 未ログインの API 2.10 試験に認証引数が残っています。** head の `api_tests/users/views/test_user_detail.py:260–262` は `test_social_values_old_version_not_logged_in` で `auth=user_one` を渡し、401 を期待しています。同じ試験の 2.9(256–258行)は認証なし、認証成功ケース(234–248行)は `user_one.auth` です。2.10 は資格情報が存在しない場合の純粋な試験になっておらず、渡した認証の拒否でも期待値を満たす、またはヘルパーの扱いによって検証前に失敗する可能性があります。`auth` 引数を除去し、両バージョンの未認証・認証済みケースを実行してください。公開コミット `3243fd7` 由来なので、その履歴を保持して追加コミットで修正します。試験未実行のため、実行時の失敗を断定するものではありません。 +2. **R2 — 中(P2): 説明する統合順と実際の履歴が一致しません。** PR本文「内容」の2項目とマージコミット本文4行目は SPEC-01 の公開 → 非公開 → 採用PR の順を主張しています。しかし第1親は既に非公開側を含む `3f4c9cd`、第2親が新しい公開側 `bacfe64` です。[SPEC-01 §4 規則3](../spec/01_manifest.md#4-rules) の手順を文字どおり実施した形ではなく、非公開側起点の増分公開マージです。今回は差分ファイルが重ならず非公開・公開間の競合による消失はありませんが、規則との説明上の不一致は残ります。PR説明を訂正し、初期化・増分更新として認める解釈または例外を所有者判断として文書化してください。厳密な再構築が必要なら、上流履歴の書換えや force-push をせず別途提案します。過去コミットの説明は amend ではなく追加コミットで補足できます。 +3. **R3 — 低(P3): 会話セッションへのURLがメタデータにあります。** PR本文14行目、マージコミット本文8行目の `Claude-Session` に個別AIセッションへのリンクがあります。非公開リポジトリURLではなく、検査したメタデータ・差分にはアクセストークンやパスワードは見つかりませんでした。セッション内容とアクセス制御は確認していないため、秘密漏えいとは断定しません。所有者は永続メタデータに残す必要性を判断し、不要なら編集可能なPR本文から除去してください。公開レビュー記録にURLを転載せず、秘密でない参照を消すだけの目的で履歴を書き換えないでください。 + +### 確認方法と根拠 + +- 指定された `gh pr view`(title/body/commits/files、追加で head/base SHA)と `gh pr diff` を確認しました。 +- head のコミットAPIが返した親は `3f4c9cd32e2e118f42a6b5aacbe2a5ff066a8a38` と `bacfe64fdc002f09df47145fc17f57630772ac82` の2つです。squash ではなく真のマージです。公開側の権限修正 `5f78e37d591986ace4d241c992c1454e8af0a632`、試験修正 `3243fd7943428cb5e0c1f3a741b354dfa1369bdb`、公開PRマージ `bacfe64fdc002f09df47145fc17f57630772ac82` は元のSHAで保持されています。この時点の履歴だけから過去の force-push 有無までは判断できません。 +- 指定の `compare/upstream/public-develop...upstream/private-develop` は private ahead 161 / behind 3、共通祖先 `b7eacc4c2f2a50f72f3489fc9c3d105b46ea8108` を返しました。非公開側の変更260ファイルと、今回の2ファイルとの積集合は空です。セキュリティ変更を含む最終差分の重複はありません。161コミット中の一時的な編集すべてを調べたという意味ではありません。 +- 固定した非公開tip→PR head と、共通祖先→固定した公開tip を compare API で比較しました。双方とも `api/users/views.py` と `api_tests/users/views/test_user_detail.py` の2ファイルだけで、patch と最終blob SHAも一致します。それ以外の非公開側ファイルは変更されておらず、関連するセキュリティ強化の保持を「衝突なし」という説明以外の根拠で確認しました。 +- `api/users/views.py:177–184` で認証必須化と、本人による更新・トークンスコープ権限の保持を確認しました。試験差分、`api_tests/conftest.py:10–11`、`tests/json_api_test_app.py:41–51` で試験アプリも確認しています。認証済み別ユーザーからの参照は `test_get` に残っています。 +- 新しい統合コミットは日本語の `merge(upstream):`、理由、検証、ビルド・受入の M2 延期を明記し、指定された形式要素を満たしています。R2 は事実関係の問題です。既存の英語上流コミットをローカル規約に合わせて書き換える必要はありません。 +- PRの4コミットのメッセージ、本文、2ファイルの差分を目視確認しました。R3 のセッション参照以外に明白な資格情報・非公開リポジトリURLはありません。全履歴の検査や自動秘密スキャンではありません。 +- 確認時点では JavaScript/TypeScript CodeQL が成功、Python CodeQL と2件の `build-image` は pending でした。ローカルのビルド・アプリ試験・受入試験は実行していません。pending は成功ではなく、静的なツリー保持だけでは動作互換性を保証しません。 + +### マージ前に所有者が決めること + +R1 の追加修正と対象試験の実行結果を求めてください。R2 の統合順の扱いを決め、上流履歴を書き換えず正確に記録してください。R3 のリンク保持と、広範なビルド・受入を M2 に延期することの受容可否を判断し、必須CIの最終結果を確認してください。view-onlyリンクを含め未認証のユーザー詳細参照が拒否される変更を明示的に受容し、依存クライアントは M2 で検証します。squash/rebase ではなく通常マージで両上流の履歴を保持してください。このレビューでは指定されたPRコメント1件以外、対象リポジトリを変更しません。 diff --git a/docs/reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2.md b/docs/reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2.md new file mode 100644 index 0000000..015e381 --- /dev/null +++ b/docs/reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2.md @@ -0,0 +1,80 @@ +# PR #1 public develop merge — REV review r2 / 公開 develop 統合再レビュー + +**Jump:** [English](#english) · [日本語](#japanese) + +Version: 0.1 — 2026-11-05 + +Learned / 分かったこと: the anonymous test correction preserves upstream history; explaining an initial integration exception does not itself constitute owner acceptance. / 未認証試験は履歴を保持して修正されたが、初回統合の例外を説明することと所有者が承認することは別である。 + +Reviewer: REV(担当レビュワ, Codex Astra) + +Previous record: [r1](2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1.md) + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** review r2 of RDM-osf.io-dev2027 PR #1 by REV (Codex Astra); header lines added by QAE for SPEC-06 compliance, body unchanged. / REV(Codex Astra)による PR #1 のレビュー r2。見出し行は SPEC-06 準拠のため QAE が追加し、本文は変更していない。 +- Related: [docs/reviews/README.md](README.md) · [ADR-04 AI Autonomy and Roles](../decisions/ADR-04_AI_Autonomy_and_Roles.md) · [SPEC-01 Manifest](../spec/01_manifest.md) + +--- + +<a id="english"></a> +## English + +### Verdict: request changes — R1 code correction verified; R2 owner decision outstanding + +Re-reviewed `RCOSDP/RDM-osf.io-dev2027` PR #1 at head `ef2be2c815e2432c86d89e0480e77674710f5912`. No new code defect was found in the follow-up. This verdict concerns the unresolved integration-policy decision, not a request to rewrite the merge. No approval or merge was submitted. + +### Findings and disposition + +| Priority / ID | Status | Evidence and remaining action | +|---|---|---| +| P2 / R2 | Partially resolved; owner decision pending | PR body lines 2–3 now correctly describe a private-seeded incremental merge. Line 7 nevertheless says the initial construction “satisfied” SPEC-01, while line 8 requests owner approval to document that interpretation in ADR-01. [SPEC-01 §4](../spec/01_manifest.md#4-rules), currently line 94, still fixes public → private → adopted PRs; [ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md), lines 52–59, still describes public-history initialization and the same order. Record the owner's acceptance and align the normative documentation before treating the exception as settled. Until then, label it a proposed interpretation rather than established compliance. | +| P2 / R1 | Code issue resolved; runtime evidence deferred | `api_tests/users/views/test_user_detail.py:260–262` now calls the API 2.10 endpoint without an `auth` argument and expects 401, matching the 2.9 anonymous case. The follow-up changes exactly one line. Both authenticated-version cases remain present. No further code correction is requested for R1; targeted execution remains unverified and is explicitly deferred to M2 in the PR. | +| P3 / R3 | Retained as requested; owner decision pending, not a demonstrated secret | The assignment says the session reference is mandatory report metadata and is retained for owner judgment. The PR and follow-up commit retain it. This review accepts that stated handling and does not demand deletion or history rewriting. No obvious credential was found in the updated metadata or delta; session access controls/content were not inspected. The URL is not reproduced here. | + +The new PR body's “private is a superset” statement should be understood relative to the shared older public history, not to the newer `bacfe64` tip: the r1 comparison showed private ahead 161 and behind 3. Non-overlapping net changes support this particular integration's content preservation, not a general exception to ordering policy. + +### What was verified + +- Re-read `gh pr view 1 -R RCOSDP/RDM-osf.io-dev2027 --json title,body,commits,files,headRefOid,baseRefOid` and the full `gh pr diff`. +- The commit API confirms `ef2be2c815e2432c86d89e0480e77674710f5912` has exactly one parent, the previously reviewed merge `546969eb33f42e35be5dc5c5ac8bfe55e3ef0bbc`. Its sole patch removes the authentication argument from one test request. +- Rechecked that merge's two parents: private `3f4c9cd32e2e118f42a6b5aacbe2a5ff066a8a38` and public `bacfe64fdc002f09df47145fc17f57630772ac82`. All three original public commits and the original integration merge remain in the PR's commit list. The new head is an ordinary follow-up commit, not itself a merge; ancestry is preserved. +- Fetched the test file at the exact new head. Python AST parsing succeeded, and a targeted structural assertion confirmed that both `get` calls in `test_social_values_old_version_not_logged_in` omit `auth`. This is syntax/structure verification, not an application test or HTTP result. +- The PR still changes only the original two files. Since the delta from r1 is solely that public-origin test correction, r1's private-tree preservation finding remains applicable; the 260-file comparison was not rerun. Production permission changes are unchanged. +- The new Japanese `fix(api-tests):` commit includes a reason, explicit test non-execution, M2 validation plans, and an explanation of the proposed R2 interpretation. It corrects the historical explanation without amending existing commits. +- `gh pr checks` for the new head reported both CodeQL languages and both `build-image` jobs pending (exit 8). The PR body's statement that JS/TS CodeQL passed is from an earlier run and does not establish success for this head. No runtime test or build was performed by this reviewer. + +### Before merging + +The owner must accept or reject the initial-construction interpretation and record the accepted policy consistently in ADR-01/SPEC-01. The owner must also decide whether M2 deferral of targeted runtime verification is acceptable, retain the session reference under the stated reporting requirement, and confirm final required CI results for this head. The anonymous user-detail access restriction remains an intentional behavior change to cover in acceptance testing. Use a normal merge preserving upstream history. No force-push, approval, merge, or repository code edit was performed during this re-review; the only remote write is the requested r2 comment. + +<a id="japanese"></a> +## 日本語 + +### 判定: request changes(修正要求)— R1 のコード修正を確認、R2 の所有者判断が未決 + +対象は `RCOSDP/RDM-osf.io-dev2027` PR #1、head `ef2be2c815e2432c86d89e0480e77674710f5912`。追加修正に新しいコード不具合は見つかりませんでした。この判定は統合規則の解釈が未決であることによるもので、マージ履歴の書換えを求めるものではありません。承認・マージ操作は行っていません。 + +### 指摘と対応状況 + +| 重要度 / ID | 状況 | 根拠と残作業 | +|---|---|---| +| P2 / R2 | 一部解決・所有者判断待ち | PR本文2–3行目は private 起点の増分マージを正しく説明しています。一方、7行目では初回構築で SPEC-01 を「満たした」とし、8行目では ADR-01 に解釈を記録する所有者承認を求めています。[SPEC-01 §4](../spec/01_manifest.md#4-rules) の現94行目は公開→private→採用PRを固定し、[ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md) の52–59行目も公開履歴による初期化と同じ順序を規定しています。例外を確定扱いにする前に、所有者の受容を記録し規範文書と整合させてください。それまでは適合済みではなく「提案する解釈」と記述します。 | +| P2 / R1 | コード上は解決・実行証跡は延期 | `api_tests/users/views/test_user_detail.py:260–262` の2.10要求は `auth` 引数なしで401を期待し、2.9未認証ケースと一致しています。追加修正はこの1行だけです。認証済みの両バージョンの試験も残っています。R1 の追加コード修正は求めませんが、対象試験の実行は未検証で、PRはM2への延期を明記しています。 | +| P3 / R3 | 指示どおり保持・所有者判断待ち、秘密値とは断定せず | 今回の依頼ではセッション参照を帳票の必須メタデータとして保持し、所有者判断に委ねるとされています。PRと追加コミットに保持されています。その扱いを受け入れ、削除や履歴書換えは求めません。更新メタデータ・差分に明白な資格情報は見つかりませんでしたが、セッションの内容・アクセス制御は未確認です。URLは本記録に転載しません。 | + +PR本文の「private は上位互換」は共通の古い公開履歴に対する説明として扱う必要があります。新しい公開tip `bacfe64` に対しては、r1で private ahead 161 / behind 3 を確認しています。最終差分が重ならないことは今回の内容保持の根拠ですが、統合順の一般的な例外を成立させる根拠ではありません。 + +### 確認したこと + +- `gh pr view` で title/body/commits/files/headRefOid/baseRefOid を再取得し、`gh pr diff` の全差分を確認しました。 +- コミットAPIで新head `ef2be2c815e2432c86d89e0480e77674710f5912` の親が、前回レビューした `546969eb33f42e35be5dc5c5ac8bfe55e3ef0bbc` の1つだけであることを確認しました。差分は試験要求の認証引数を除く1行だけです。 +- 元マージの親が private `3f4c9cd32e2e118f42a6b5aacbe2a5ff066a8a38` と public `bacfe64fdc002f09df47145fc17f57630772ac82` の2つであることを再確認しました。公開3コミットと元の統合コミットもPRのコミット一覧に残っています。新head自体は通常の追加コミットであり、マージではありません。祖先履歴は保持されています。 +- 新headに固定して試験ファイルを取得しました。Python AST構文解析と対象メソッド内の2つの `get` 呼出しに `auth` がないことを確認する構造検査が成功しました。これは構文・構造の検証であり、アプリ試験やHTTP結果の確認ではありません。 +- PRの変更ファイルは引き続き元の2ファイルのみです。r1以降の差分は公開由来の試験1行だけなので、r1の非公開側ツリー保持の結論は引き続き有効です。260ファイルの比較は再実行していません。本番の権限変更も変わっていません。 +- 追加コミットは日本語の `fix(api-tests):` を用い、理由、試験未実行、M2での検証予定、R2の解釈提案を明記しています。既存コミットをamendせず、過去の説明を補足しています。 +- 新headの `gh pr checks` は両言語のCodeQLと2件の `build-image` がすべてpending(終了値8)でした。PR本文のJS/TS CodeQL合格は以前の実行の記載であり、このheadの成功証跡ではありません。レビュワによる実行試験・ビルドは行っていません。 + +### マージ前に必要な判断 + +所有者は初回構築の解釈を採否判断し、受容した規則をADR-01/SPEC-01と整合する形で記録してください。対象試験の動作検証をM2へ延期することの受容可否、帳票要件に基づくセッション参照の保持、新headの必須CI最終結果も確認してください。未認証ユーザー詳細参照の拒否は意図的な動作変更として受入試験に含めます。上流履歴を保持する通常マージを用いてください。再レビューではforce-push・承認・マージ・対象コード編集は行わず、リモートへの書込みは指定されたr2コメントだけです。 diff --git a/docs/reviews/2026-11-05_dev2027_Strict_Reconstruction_PRs_r1.md b/docs/reviews/2026-11-05_dev2027_Strict_Reconstruction_PRs_r1.md new file mode 100644 index 0000000..551d2f5 --- /dev/null +++ b/docs/reviews/2026-11-05_dev2027_Strict_Reconstruction_PRs_r1.md @@ -0,0 +1,133 @@ +# REV Strict reconstruction review r1 / 厳密再構築レビュー r1 + +> **Summary:** Eight pull requests (proposed changes, PRs) were independently reviewed against the recorded upstream history. Three need changes; five pass the reconstruction checks. +> **概要:** 8件のプルリクエスト(変更の提案、PR)を上流履歴の記録と独立に照合しました。3件は要修正、5件は再構築検査合格です。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** identical file trees do not prove the required parent history, and reconstruction can drop a previously reviewed test correction. / ファイル内容が同一でも必要な親履歴は証明できず、再構築で以前の試験修正が脱落し得ると分かった。 +- Applies to: the eight PRs listed in the comparison table; review date 2026-11-05; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [ADR-01 §5](../decisions/ADR-01_Integration_Repository_Placement.md#english) · [SPEC-01](../spec/01_manifest.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Manifest](../../manifest/upstreams.json) · [Previous osf.io review r2](2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2.md). +- Used by: [Integration status](../status/README.md), QAE(QA担当)and the owner for the merge decision. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +Component notes: osf.io (the main web application), waterbutler (the file transfer service), modular-file-renderer (the file preview service), ember-osf-web (the browser interface), cas-overlay (the sign-in service), wiki-frontend (the wiki editor), and y-websocket (the shared-editing connection service). SHA (a saved change’s fingerprint), CI (automatic checks after changes), and QAE (Quality Assurance Engineer / QA担当) follow the [shared glossary](../reference/REF-01_Glossary.md). + +**Needs changes overall:** osf.io #2, wiki-frontend #1, and Shibboleth-SP #1. The other five pass the requested history and content checks. These are review conclusions, not GitHub approvals. No merge, approval, close, push, or commit was performed. + +All eight were open, created on 2026-11-05, and targeted `integrate/strict-20261105` → `develop`. Their shared title is a Japanese `merge(upstream):` strict-reconstruction subject. All new merge subjects use that scoped prefix and Japanese wording. Inherited upstream subjects are not new commits requiring translation. + +A SHA is a fingerprint identifying a saved change. A parent is the preceding saved change; a two-parent merge joins two histories. A tree records the complete file contents. “Parents verified” means exactly two parents, ordered public tip then private tip, both equal to the relevant `sha` fields in the manifest. The fork/start requirement is verified by the merge's first parent, not by chronological order in a comparison result: the first new integration commit is the merge, while the public tip is its starting point. + +| Repository / リポジトリ | PR | Parents verified / 親確認 | Files changed vs private tip / 非公開先端との差分 | Verdict / 判定 | +|---|---|---|---|---| +| `RDM-osf.io-dev2027` | #2 | yes | 2: `api/users/views.py`, `api_tests/users/views/test_user_detail.py` | Needs changes | +| `RDM-waterbutler-dev2027` | #1 | yes | 0 (tree SHA equal / ツリー SHA 一致) | Reconstruction checks pass | +| `RDM-modular-file-renderer-dev2027` | #1 | yes | 0 (tree SHA equal / ツリー SHA 一致) | Reconstruction checks pass | +| `RDM-ember-osf-web-dev2027` | #1 | yes | 0 (tree SHA equal / ツリー SHA 一致) | Reconstruction checks pass | +| `RDM-cas-overlay-dev2027` | #1 | yes | 0 (tree SHA equal / ツリー SHA 一致) | Reconstruction checks pass | +| `RDM-wiki-frontend-dev2027` | #1 | no | 0 (tree SHA equal / ツリー SHA 一致) | Needs changes | +| `RDM-y-websocket-dev2027` | #1 | yes | 0 (tree SHA equal / ツリー SHA 一致) | Reconstruction checks pass | +| `RDM-Shibboleth-SP-dev2027` | #1 | no | 0 (tree SHA equal / ツリー SHA 一致) | Needs changes | + +### Findings + +1. **P2 / SR-01 — wiki-frontend #1 does not use either recorded tip as a parent.** Both manifest tips and both tracking branches are `203d32fab60aad8d78e9b743987519252f99b817`. Actual parents are `ed9f9d1c308b66f18c3875c4d761eda41edb1d76` and `90c8f680641616779af2ae6a3b2d224258704e17`. Comparing the recorded private tip to the head reports diverged, ahead 1 / behind 1, with merge base `90c8f680641616779af2ae6a3b2d224258704e17`. The tree is identical, but the recorded tip itself is absent from head ancestry. The body incorrectly claims the current tracking tips were merged. Because public and private tips are identical, an ordinary merge has nothing to join, even with `--no-ff`. Document an owner-accepted identical-tip procedure and correct the PR; do not substitute older ancestors to manufacture compliance or rewrite existing history. + +2. **P2 / SR-02 — Shibboleth-SP #1 has no manifest-backed public parent.** The first parent and `upstream/public-main` are `7f1125bb2f5bccdce1b1fc55d1dcff602bc7d38a`; the second parent matches recorded private tip `218b07f4143834278e5289a2c95ee8fe6ff01cf1`. The manifest contains only the private upstream, and ADR-01 §3 explicitly describes this component as private-only. The first parent is an ancestor of the private tip (private ahead 3 / behind 0), and the resulting tree equals private. That proves content preservation, not public provenance. Either establish and record the genuine public upstream with its SHA, or document the private-only bootstrap exception and align the PR body. Do not certify the current generic public-first claim as manifest-verified. + +3. **P2 / SR-03 — osf.io #2 drops the prior anonymous-test correction.** The reconstruction reproduces the public tip exactly in the two changed files, including the already-reviewed defect. At public-origin `api_tests/users/views/test_user_detail.py:261`, the API 2.10 request in `test_social_values_old_version_not_logged_in` still supplies `auth=user_one` while expecting 401; the API 2.9 request omits authentication. The prior PR #1 head `ef2be2c815e2432c86d89e0480e77674710f5912` had removed that argument. Restore the one-line correction as a separate history-preserving follow-up and run the targeted test when the environment is available. Keep the strict merge as the audited integration checkpoint; a follow-up fix naturally makes the final head a one-parent commit. PR #1 is closed, as expected. + +### History and content evidence + +GitHub access used only `gh`: `gh api` PR metadata, commit objects with parents/tree SHAs, tracking refs, and `compare/<private-tip>...<head>`, plus public-to-private and public-to-head comparisons. For osf.io, the reverse private-to-public comparison and exact-head file content were also read. Raw API responses and private patches were kept outside this public repository. The table lists the only changed paths, both independently confirmed as public-origin changes. + +- **osf.io:** private is ahead 161 / behind 3 relative to public, so this is the sole genuine divergence among the seven manifest public/private pairs. The three public-only commits are `5f78e37d591986ace4d241c992c1454e8af0a632`, `3243fd7943428cb5e0c1f3a741b354dfa1369bdb`, and `bacfe64fdc002f09df47145fc17f57630772ac82`. The 260 private-side changed files and two public-side changed files do not overlap. Head differs from private in exactly those two public files, with identical blob SHAs (file fingerprints) to public; no additional resolution delta was found. This supports the body's conflict-free merge claim without relying on its uninspected local log. Parsing the test into Python's syntax tree independently confirmed that the two requests have different authentication arguments; this is structural verification, not execution of the application. +- **waterbutler, modular-file-renderer, ember-osf-web, cas-overlay, y-websocket:** private contains public, respectively ahead 18, 1, 2, 1, 1 and behind 0. Each head has the exact ordered manifest parents and the exact private tree SHA; the private-to-head comparison reports zero changed files. No content conflict resolution is present. +- **wiki-frontend:** manifest tips are identical, yet the actual merge joins older ancestors. A zero-file three-dot comparison alone would be insufficient because it compares from the merge base. Direct tree-SHA equality additionally proves content equality, while SR-01 remains a history defect. +- **Shibboleth-SP:** the actual first parent is already contained by private, so there is no divergent content to resolve. There is no manifest public tip for the requested comparison; SR-02 remains unresolved. + +The following observed evidence is written in TOON (a compact row format); it records the actual heads and parents, including mismatches, rather than mirroring the manifest. + +```toon +reviewed_heads[8]{repo,pr,head,parent1,parent2}: + RDM-osf.io-dev2027,2,7401f769c308286f443a0aa42b841da61b8617b2,bacfe64fdc002f09df47145fc17f57630772ac82,3f4c9cd32e2e118f42a6b5aacbe2a5ff066a8a38 + RDM-waterbutler-dev2027,1,cf05d525717beaa48df952776b19013f9e47075e,004f407fefb071f1dc924d09f99916b1d5ea3561,722557612d3432fbbcd2b952f70660588dd7b4f4 + RDM-modular-file-renderer-dev2027,1,2743aaecbd2859e8443e0a8fb152851f510f94a2,8990b184e04ec8c9b83d25123187a7a2cfb32909,571b74fa17ea421f72d46f6e2136936c68bd8d73 + RDM-ember-osf-web-dev2027,1,9fe33ca153ab13be886449845cb920a1c7e301ca,13dab2e19ea4e083c91e87c1cb793cb206b8a119,79f4c2719e340ceb438bfbae1bfd356008fb6e91 + RDM-cas-overlay-dev2027,1,2761d6604b97f3cc4f0f69bcef0a8a43a0d514c3,ba95f6f87ddeb84bd990690199cd1d72d7e0c2a0,84d14baa130309e1a2b9447e75dba5e0c0fa0212 + RDM-wiki-frontend-dev2027,1,7f77c9b4e01153acb27baf99a09bb9eb7a584883,ed9f9d1c308b66f18c3875c4d761eda41edb1d76,90c8f680641616779af2ae6a3b2d224258704e17 + RDM-y-websocket-dev2027,1,8c5ef6820839467e15dbdfa2dbffff0af68523df,51eb21d35bd37b197514e6cc67409b7c8a2dc130,e16d995eb362fcc8c53e545ba39a835e5af853b9 + RDM-Shibboleth-SP-dev2027,1,e4b93ea528da9bb03a713ed9cd8ce630b8c09947,7f1125bb2f5bccdce1b1fc55d1dcff602bc7d38a,218b07f4143834278e5289a2c95ee8fe6ff01cf1 +``` + +### Metadata, limits, and remaining work + +No obvious credentials or private GitHub repository URLs were found in any PR body. All eight bodies do contain the same external AI-session reference. Its access control and contents were not inspected, so “no private URLs of any kind” cannot be certified. The prior osf.io r2 record treats this reference as retained report metadata for owner judgment; no secret exposure is asserted and the URL is not reproduced here. The owner still needs to settle that metadata handling. + +Adopted PRs are explicitly deferred to later individual PRs by this assignment and the PR bodies; none is credited as reapplied here. ADR-01 §5 currently places their reapplication before opening the integration PR, so the staged delivery wording should be reconciled before claiming completion of the entire procedure. Five passing reconstruction checks do not establish completed adoption or runtime readiness. Builds, application tests, full secret scanning, and CI results were not validated. Current graph evidence does not prove the historical absence of force-push events. The author reports conflict-free automatic merges; API content checks found no manual resolution delta requiring further review. + +Required next steps are SR-01/SR-02 policy and PR corrections, SR-03 test restoration, later adopted-PR reviews, QAE verification, and the owner's merge decision. Requested review comments are posted with the prefix `REV(担当レビュワ, Codex Astra)レビュー r1:`; the local record must be published by the coordinator's normal workflow. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +部品の用語注: osf.io(中心の Web アプリ)、waterbutler(ファイル転送)、modular-file-renderer(ファイルのプレビュー)、ember-osf-web(ブラウザ画面)、cas-overlay(ログイン)、wiki-frontend(Wiki 編集画面)、y-websocket(共同編集の通信)。SHA(保存した変更の指紋)、CI(変更後の自動検査)、QAE(Quality Assurance Engineer / QA担当)は[共通用語集](../reference/REF-01_Glossary.md)も参照してください。 + +**総合判定は要修正:** osf.io #2、wiki-frontend #1、Shibboleth-SP #1。ほかの5件は依頼された履歴・内容の検査に合格です。これはレビュー判定であり、GitHub の承認操作ではありません。マージ・承認・クローズ・push・commit は実施していません。 + +8件とも2026-11-05作成で open、対象は `integrate/strict-20261105` → `develop` です。共通題名は日本語の `merge(upstream):` 厳密再構築で、新しいマージコミットの件名もこの接頭辞と日本語を用いています。継承した上流の件名を翻訳する必要はありません。 + +SHA は保存した変更の指紋、親はその前の変更、二親マージは二つの履歴を結ぶ変更、ツリーは全ファイルの内容を表します。「親確認 yes」は親がちょうど二つで、公開先端、非公開先端の順に manifest の `sha` と一致することです。起点は比較結果の時系列順ではなく、マージの第一親で検証しました。新しい統合コミットはマージ自体で、公開先端はその開始地点です。 + +| Repository / リポジトリ | PR | Parents verified / 親確認 | Files changed vs private tip / 非公開先端との差分 | Verdict / 判定 | +|---|---|---|---|---| +| `RDM-osf.io-dev2027` | #2 | yes | 2: `api/users/views.py`, `api_tests/users/views/test_user_detail.py` | 要修正 | +| `RDM-waterbutler-dev2027` | #1 | yes | 0 (tree SHA equal / ツリー SHA 一致) | 再構築検査合格 | +| `RDM-modular-file-renderer-dev2027` | #1 | yes | 0 (tree SHA equal / ツリー SHA 一致) | 再構築検査合格 | +| `RDM-ember-osf-web-dev2027` | #1 | yes | 0 (tree SHA equal / ツリー SHA 一致) | 再構築検査合格 | +| `RDM-cas-overlay-dev2027` | #1 | yes | 0 (tree SHA equal / ツリー SHA 一致) | 再構築検査合格 | +| `RDM-wiki-frontend-dev2027` | #1 | no | 0 (tree SHA equal / ツリー SHA 一致) | 要修正 | +| `RDM-y-websocket-dev2027` | #1 | yes | 0 (tree SHA equal / ツリー SHA 一致) | 再構築検査合格 | +| `RDM-Shibboleth-SP-dev2027` | #1 | no | 0 (tree SHA equal / ツリー SHA 一致) | 要修正 | + +### 指摘 + +1. **P2 / SR-01 — wiki-frontend #1 の親は記録された先端ではありません。** manifest の公開・非公開先端と両追跡ブランチはすべて `203d32fab60aad8d78e9b743987519252f99b817`。実際の親は `ed9f9d1c308b66f18c3875c4d761eda41edb1d76` と `90c8f680641616779af2ae6a3b2d224258704e17` です。非公開先端から head の比較は diverged、ahead 1 / behind 1、共通祖先は `90c8f680641616779af2ae6a3b2d224258704e17` です。内容は同一でも、記録された先端自体が head の祖先にありません。現在の追跡先端をマージしたという本文は不正確です。公開・非公開の先端が同一なら `--no-ff` でも通常マージの対象がありません。同一先端の場合の手順を所有者判断として記録し、PR を修正してください。古い祖先の代用や既存履歴の書換えで適合扱いにしないでください。 + +2. **P2 / SR-02 — Shibboleth-SP #1 の公開親を manifest で裏付けられません。** 第一親と `upstream/public-main` は `7f1125bb2f5bccdce1b1fc55d1dcff602bc7d38a`、第二親は記録された非公開先端 `218b07f4143834278e5289a2c95ee8fe6ff01cf1` と一致します。manifest は非公開上流だけで、ADR-01 §3 も公開上流なしと記載しています。第一親は非公開先端の祖先(非公開側 ahead 3 / behind 0)で、結果のツリーも非公開先端と一致します。内容保持は証明できますが公開由来は証明できません。本物の公開上流と SHA を確認して記録するか、非公開専用の場合の初回手順を文書化し、PR 本文を整合させてください。 + +3. **P2 / SR-03 — osf.io #2 で未認証テストの修正が脱落しています。** 変更2ファイルは公開先端と同一で、既知の問題も再現しています。公開由来の `api_tests/users/views/test_user_detail.py:261` にある `test_social_values_old_version_not_logged_in` の API 2.10 要求は `auth=user_one` を渡しながら401を期待します。2.9要求には認証引数がありません。旧 PR #1 の head `ef2be2c815e2432c86d89e0480e77674710f5912` ではこの引数を除いていました。履歴を保持する独立した追加修正で1行を復元し、環境が用意できたら対象試験を実行してください。厳密マージは監査済みの統合地点として保持し、追加修正後の最終 head が一親になることは区別します。PR #1 は予定どおり closed でした。 + +### 履歴・内容の根拠 + +GitHub の操作には `gh` のみを使用しました。`gh api` で PR 情報、親とツリー SHA を含むコミット情報、追跡参照、`compare/<private-tip>...<head>`、公開から非公開・head の比較を取得しました。osf.io は非公開から公開の逆向き比較と head 固定のファイルも確認しました。生の応答と非公開パッチは公開リポジトリ外に置きました。表の変更2パスは、いずれも公開由来と独立確認済みです。 + +- **osf.io:** 公開に対して非公開は ahead 161 / behind 3。manifest に公開・非公開がある7件で唯一、本当に履歴が分岐しています。公開のみの3コミットは `5f78e37d591986ace4d241c992c1454e8af0a632`、`3243fd7943428cb5e0c1f3a741b354dfa1369bdb`、`bacfe64fdc002f09df47145fc17f57630772ac82`。非公開側260ファイルと公開側2ファイルの変更集合は重なりません。非公開先端から head の差分はその公開2ファイルのみで、blob SHA(ファイル内容の指紋)も公開と一致します。追加の競合解消差分はなく、未確認のローカルログに依存せず衝突なしという本文を裏付けます。Python の構文解析でも二つの試験要求の認証引数が異なると確認しました。アプリケーション試験の実行ではありません。 +- **waterbutler、modular-file-renderer、ember-osf-web、cas-overlay、y-websocket:** 非公開は公開を含み、順に ahead 18、1、2、1、1、すべて behind 0。head の二親は manifest と順序まで一致し、ツリー SHA は非公開先端と一致、比較の変更ファイル数も0です。内容の競合解消はありません。 +- **wiki-frontend:** manifest の両先端は同一なのに、実マージは古い祖先を結んでいます。三点比較は共通祖先からの差分なので0ファイルだけでは不十分です。直接のツリー SHA 一致でも内容同一を確認しましたが、SR-01 の履歴不備は残ります。 +- **Shibboleth-SP:** 実際の第一親は非公開に含まれ、内容の分岐はありません。依頼された比較に使える公開先端が manifest にないため SR-02 は未解決です。 + +[英語節](#english)の TOON(行を短く書くデータ形式)は、8件の実 head と両親の全 SHA を記録しています。manifest の写しではなく、不一致も含む観測値です。 + +### 本文・検証限界・残作業 + +どの PR 本文にも明白な資格情報や非公開 GitHub リポジトリの URL は見つかりませんでした。ただし8件すべてに同じ外部 AI セッション参照があります。内容とアクセス制御は未確認のため、あらゆる非公開 URL がないとは保証できません。以前の osf.io r2 記録では、所有者判断用の帳票情報として保持されています。秘密漏えいとは断定せず、URL も転載しません。このメタデータの扱いは所有者判断として残ります。 + +採用 PR は今回の依頼と本文で後続の個別 PR に延期されており、今回は再適用済みと扱いません。ADR-01 §5 の現行記載は統合 PR 作成前に再適用する順序なので、手順全体の完了を宣言する前に段階的な実施との文言整合が必要です。5件の再構築検査合格は、採用完了や動作準備完了を意味しません。ビルド、アプリ試験、全体の秘密スキャン、CI 結果は検証していません。現在の履歴だけでは過去の force-push 不在も証明できません。作者は自動マージで衝突なしと報告し、API の内容確認でも追加検討が必要な手動解消差分は見つかりませんでした。 + +残作業は SR-01/SR-02 の規則・PR 修正、SR-03 のテスト修正復元、後続採用 PR のレビュー、QAE(QA担当)の検証、所有者のマージ判断です。指定コメントは `REV(担当レビュワ, Codex Astra)レビュー r1:` で投稿し、ローカル記録の公開は調整担当の通常手順に委ねます。 diff --git a/docs/reviews/2026-11-05_dev2027_Strict_Reconstruction_PRs_r2.md b/docs/reviews/2026-11-05_dev2027_Strict_Reconstruction_PRs_r2.md new file mode 100644 index 0000000..e81b6ee --- /dev/null +++ b/docs/reviews/2026-11-05_dev2027_Strict_Reconstruction_PRs_r2.md @@ -0,0 +1,129 @@ +# REV Strict reconstruction review r2 / 厳密再構築レビュー r2 + +> **Summary:** The restored test preserves the strict merge, and the proposed manifest proves the public Shibboleth-SP parent. The guide still needs a bilingual correction in ADR-01 §3; wiki-frontend develop retains its original tip. +> **概要:** 復元した試験修正は厳密マージを保持し、提案中の manifest は Shibboleth-SP の公開親を裏付けます。ガイドの ADR-01 §3 は英日とも修正が必要です。wiki-frontend の develop は元の先端を保持しています。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05. **Learned:** correcting the context and manifest does not correct a contradictory decision paragraph; an unchanged merge can safely receive a separate test fix. / 背景と manifest を直しても矛盾する決定節は直らず、既存マージを保ったまま独立した試験修正を追加できると分かった。 +- Applies to: the three follow-up pull requests (PRs, proposed changes) and wiki-frontend closure check; REV(担当レビュワ, Codex Astra), 2026-11-05. +- Related: [Review index](README.md) · [r1](2026-11-05_dev2027_Strict_Reconstruction_PRs_r1.md) · [SPEC-01](../spec/01_manifest.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Integration status](../status/README.md), QAE(QA担当)and the owner for subsequent verification and merge decisions. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdicts + +A repository stores change history; a branch names a line of that history. A commit is one saved change and its SHA is its fingerprint. A parent is the preceding commit; a merge joins histories. A manifest is the component packing list, an upstream is its original source, and ADR means decision record. See the [shared glossary](../reference/REF-01_Glossary.md). + +| Item | Verdict | r1 finding | +|---|---|---| +| RDM-developer-guide #20 | Needs changes: R2-01 | SR-02 documentation correction incomplete | +| RDM-osf.io-dev2027 #2 | Requested history and one-line fix checks pass | SR-03 code correction resolved; execution pending | +| RDM-Shibboleth-SP-dev2027 #1 | Parent/manifest consistency passes against proposed #20 | SR-02 provenance proved; guide correction and landing pending | +| RDM-wiki-frontend-dev2027 #1 | Closure and unchanged develop confirmed | SR-01 avoided by abandoning the PR, not by certifying its history | + +These are review verdicts, not GitHub approval actions. GitHub access used only `gh`. No merge, approval, closure, push, commit, deletion, or source change was performed by this reviewer. + +### R2-01: ADR-01 §3 still denies the public Shibboleth-SP upstream (P2) + +At guide #20 head `04997aa4ce0daba6e3d4cbc6c850f60d6256044c`, the complete three-file change was reviewed. The branch is `fix/manifest-shibboleth-public` → `develop`, and the PR is open. The added public manifest entry passes the SPEC-01 schema checks: bare repository name `RDM-Shibboleth-SP`, branch `main`, kind `public`, tracking branch `upstream/public-main`, status `merged`, full 40-character SHA, and fetched date `2026-11-05`. Public precedes private. JSON formatting and all seven added upstream fields agree with the TOON excerpt (compact text data); its upstream count changes from one to two. Running the existing manifest checker against the exact-head downloaded JSON and TOON returned no findings, including parity checks. + +The ADR version advances from 0.3 to 0.4 with bilingual learning and preserved history. Both language halves update **§1 Context**, explaining public y-websocket and Shibboleth-SP, and private-only OASys, rdmcp and aipf_mcp_data_grdm. Contrary to the PR description and requested fix, **§3 Decision is unchanged**. At lines **60 and 150**, it still includes Shibboleth-SP among components with “no public upstream and only this branch.” The adjacent public-branch list also omits `upstream/public-main` for Shibboleth-SP. A reader implementing the decision would omit the newly required mirror. + +**Required correction:** in both §3 language halves, explicitly list Shibboleth-SP's public-main mirror and separate it from the three private-only components while retaining its private-main mirror. Keep §1, §3 and the manifest consistent. The generic §5 procedure still assumes a public upstream for every repository; scope it to components that have one, consistent with the newly stated private-only start rule. Re-run documentation and manifest checks after the correction. This is a documentation defect; the added manifest data itself is valid. + +The requested `gh pr checks 20 -R RCOSDP/RDM-developer-guide` returned six passes: Build MkDocs Site, Check Links, Manifest validation and private-URL policy, Secret scan (gitleaks), Semgrep static analysis, and Trivy filesystem scan. Trivy is explicitly report-only at M1 (the first delivery checkpoint). CI (automatic checks) cannot detect the contradictory prose here. + +### osf.io #2: SR-03 restoration is append-only + +The exact current head is `bfcff220b447dd45123a448f75d06aa2eb22ab3c`. Its sole parent is the unchanged strict merge `7401f769c308286f443a0aa42b841da61b8617b2` recorded in r1. That merge still has ordered parents `bacfe64fdc002f09df47145fc17f57630772ac82` (public) and `3f4c9cd32e2e118f42a6b5aacbe2a5ff066a8a38` (private). Identical commit identity preserves the merge's contents, parents and message. + +The old-head-to-new-head comparison is ahead 1 / behind 0, with only `bfcff220…`. Its only changed file is `api_tests/users/views/test_user_detail.py`, one deletion and one addition: removal of the authentication argument from the API 2.10 anonymous-request test. The patch is identical to `ef2be2c815e2432c86d89e0480e77674710f5912`; the commit message carries the matching cherry-pick `-x` origin trailer (a record of where the copied change came from). No other code change was introduced. This proves an append-only transition from the r1 checkpoint, not the historical absence of every possible force-push event. + +The copied message also retains PR #1's obsolete private-first interpretation. Treat that as inherited historical text, not current policy: PR #2's body and the verified parent graph describe public-first construction. Do not amend the preserved commits to clean up this wording. The targeted application test was not executed in this review; QAE still needs execution evidence when the environment is available. No runtime or CI verdict is inferred for this private PR. + +### Shibboleth-SP #1: public parent is established + +The head remains `e4b93ea528da9bb03a713ed9cd8ce630b8c09947`. Its first parent is `7f1125bb2f5bccdce1b1fc55d1dcff602bc7d38a`, exactly the added #20 public entry. The second parent is the unchanged private entry `218b07f4143834278e5289a2c95ee8fe6ff01cf1`. GitHub reports `RCOSDP/RDM-Shibboleth-SP` as public with default branch `main`; its current `main` and the integration repository's `upstream/public-main` both equal that first parent. The integration `develop` exists at the private tip. Thus the public source is independently established, not inferred from a tracking-branch name. + +SR-02's missing provenance is addressed by the proposed manifest. Full documentation resolution remains dependent on fixing R2-01 and landing #20; this review does not treat an open guide PR as already canonical on develop. The reconstruction commit does not need to be rewritten. + +### wiki-frontend: develop remains intact + +PR #1 is closed and unmerged. The QAE closing comment says the equal-tip script amended the original tip's message and the resulting branch will remain unused under the no-delete rule. Independently, `develop` is still `203d32fab60aad8d78e9b743987519252f99b817`; the retained `integrate/strict-20261105` branch is `7f77c9b4e01153acb27baf99a09bb9eb7a584883`. Both commits have the same two parents and the same file-tree fingerprint `5d71d0f5ea8bf2092e1bcbd743de986460a207f9`, consistent with the reported amendment. The abandoned PR is not credited as a valid strict reconstruction. Current develop identity is confirmed; no claim is made about every historical ref movement. + +### Remaining work + +Fix R2-01 and re-review #20 before owner acceptance; execute the targeted osf.io test through QAE. The r1 reservations about later adopted-PR work, ADR-01 §5 ordering, and external session-reference handling remain outside this narrow follow-up. Publish and index this local record through the coordinator's normal workflow. Private repository URLs and raw private patches are not included in this public record. The exact new file was checked directly with the documentation checker (zero errors; glossary warnings remain) and the publication-policy scanner (zero findings). One Japanese r2 comment was posted to each requested PR; comment IDs are 6656821579 (guide #20), 6656822217 (osf.io #2), and 6656822926 (Shibboleth-SP #1). + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +リポジトリは変更履歴の保管場所、ブランチはその履歴の道筋の名前です。コミットは保存した変更、SHA はその指紋、親は直前の変更、マージは履歴を結ぶ操作です。manifest は部品の梱包表、上流は元の取得先、ADR は決定の記録です。[共通用語集](../reference/REF-01_Glossary.md)も参照してください。 + +| 対象 | 判定 | r1 の指摘 | +|---|---|---| +| RDM-developer-guide #20 | 要修正: R2-01 | SR-02 の文書修正が未完 | +| RDM-osf.io-dev2027 #2 | 依頼された履歴・1行修正の検査合格 | SR-03 のコード修正は解決、実行は未確認 | +| RDM-Shibboleth-SP-dev2027 #1 | 提案中の #20 に対する親・manifest 整合は合格 | SR-02 の公開由来は確認、ガイド修正・統合待ち | +| RDM-wiki-frontend-dev2027 #1 | クローズと develop 保持を確認 | PR の放棄で SR-01 を回避、履歴の適合認定ではない | + +レビュー判定であり、GitHub の承認操作ではありません。GitHub へのアクセスは `gh` のみです。レビュワによるマージ・承認・クローズ・push・commit・削除・ソース変更は行っていません。 + +### R2-01: ADR-01 §3 に「Shibboleth-SP は公開上流なし」が残る(P2) + +ガイド #20 の head `04997aa4ce0daba6e3d4cbc6c850f60d6256044c` の全3ファイルを確認しました。`fix/manifest-shibboleth-public` → `develop` の open PR です。追加項目は SPEC-01 の形に適合します。名前は `RDM-Shibboleth-SP`、branch は `main`、kind は `public`、tracking_branch は `upstream/public-main`、status は `merged`、SHA は完全な40文字、取得日は `2026-11-05`。公開項目は非公開項目の前にあります。JSON の書式と追加7フィールドは TOON(データを短く書く形式)と一致し、上流件数も1から2になります。head 固定で取得した JSON/TOON に既存 manifest 検査を実行し、突合を含め指摘0件でした。 + +ADR は版0.3から0.4へ更新され、英日の学びと過去の版を保持しています。英日とも **§1 背景**で y-websocket と Shibboleth-SP の公開上流、および OASys・rdmcp・aipf_mcp_data_grdm の private 専用を説明しました。しかし依頼と PR 本文が示す **§3 決定は未修正**です。**60行と150行**は今も Shibboleth-SP を「公開の上流がないのでこの一本だけ」に含めています。直前の公開追跡ブランチ一覧も Shibboleth-SP の `upstream/public-main` を欠きます。決定節に従う読者は必要なミラーを作り損ねます。 + +**必要な修正:** §3 の英日両方に Shibboleth-SP の public-main を明記し、private-main も保持しつつ private 専用3部品と区別してください。§1・§3・manifest を一致させてください。§5 も全リポジトリに公開上流がある前提なので、公開上流を持つ部品への手順であると範囲を明確にし、新たに示した private 専用の開始規則と揃えてください。修正後に文書・manifest 検査を再実行します。追加した manifest データ自体の不備ではなく文書上の不整合です。 + +指定の `gh pr checks 20 -R RCOSDP/RDM-developer-guide` は全6件成功でした。MkDocs サイト構築、リンク、manifest と非公開 URL 規則、gitleaks、Semgrep、Trivy です。Trivy は M1(最初の開発到達点)では報告のみです。CI(自動検査)の成功ではこの文章の矛盾を検出できません。 + +### osf.io #2: SR-03 は履歴を保持して復元 + +現在の head は `bfcff220b447dd45123a448f75d06aa2eb22ab3c`。唯一の親は r1 で記録した厳密マージ `7401f769c308286f443a0aa42b841da61b8617b2` です。その親は公開 `bacfe64fdc002f09df47145fc17f57630772ac82`、非公開 `3f4c9cd32e2e118f42a6b5aacbe2a5ff066a8a38` の順で不変です。コミットの同一性により内容・親・メッセージの保持を確認できます。 + +旧 head からの比較は ahead 1 / behind 0、追加は `bfcff220…` のみです。変更は `api_tests/users/views/test_user_detail.py` の1行削除・1行追加だけで、API 2.10 の未認証要求から認証引数を外しています。パッチは `ef2be2c815e2432c86d89e0480e77674710f5912` と同一で、メッセージの cherry-pick `-x`(変更のコピー元を残す記録)もその SHA を指します。他のコード変更はありません。r1 地点から追記だけの履歴であることを確認しましたが、過去の全 force push 不在まで証明するものではありません。 + +コピーされたメッセージには PR #1 当時の古い private 起点解釈も残ります。これは過去から継承した文章であり、現在の規則ではありません。PR #2 本文と親関係は公開起点を示します。文章整理のために保存済みコミットを amend しないでください。対象アプリ試験は今回実行しておらず、環境が用意できた時点で QAE(QA担当)の実行証跡が必要です。この非公開 PR の実行結果や CI 判定を推定していません。 + +### Shibboleth-SP #1: 公開親を確認 + +head は `e4b93ea528da9bb03a713ed9cd8ce630b8c09947` のままです。第一親 `7f1125bb2f5bccdce1b1fc55d1dcff602bc7d38a` は #20 の追加公開項目と完全一致し、第二親 `218b07f4143834278e5289a2c95ee8fe6ff01cf1` も既存の非公開項目と一致します。GitHub は `RCOSDP/RDM-Shibboleth-SP` を公開、既定ブランチを `main` と返しました。その `main` と統合先の `upstream/public-main` は第一親と同一です。統合先 `develop` は非公開先端に存在します。追跡ブランチ名からの推測でなく、公開元そのものを確認しました。 + +提案 manifest により SR-02 の公開由来不足は解消できます。ただし文書全体の解決は R2-01 の修正と #20 の統合に依存します。open のガイド PR を develop の正本へ反映済みとは扱いません。再構築コミットの書換えは不要です。 + +### wiki-frontend: develop は元のまま + +PR #1 は closed、未マージです。QAE の終了コメントは、同一先端のときスクリプトが元コミットのメッセージを amend し、削除禁止のためブランチを残して使わないと説明しています。独立確認でも `develop` は `203d32fab60aad8d78e9b743987519252f99b817` のまま、残存する `integrate/strict-20261105` は `7f77c9b4e01153acb27baf99a09bb9eb7a584883` です。両コミットは同じ二親と同じファイルツリーの指紋 `5d71d0f5ea8bf2092e1bcbd743de986460a207f9` を持ち、amend の説明と整合します。放棄した PR を適合する厳密再構築とは認定しません。現在の develop の同一性を確認したもので、過去の全参照移動を保証するものではありません。 + +### 残作業 + +R2-01 を修正して #20 を再レビュー後、所有者が採否を判断します。QAE による osf.io 対象試験の実行が残ります。後続の採用 PR、ADR-01 §5 の順序、外部セッション参照の扱いについての r1 の留保は、今回の限定した追跡レビューで解決していません。ローカル記録の公開と索引追加は調整担当の通常手順で進めてください。公開記録には非公開リポジトリ URL や生の非公開パッチを含めていません。新規ファイルを文書検査へ直接渡してエラー0件(用語注の警告は残存)、公開規則スキャンで指摘0件でした。指定3 PR に日本語 r2 コメントを各1件投稿しました。コメント ID は 6656821579(ガイド #20)、6656822217(osf.io #2)、6656822926(Shibboleth-SP #1)です。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| PR | A proposed change for review. | レビューする変更の提案。 | +| SHA | Fingerprint of a saved change. | 保存した変更の指紋。 | +| Parent | Commit directly preceding another commit. | ある変更の直前の変更。 | +| Append-only | Add changes without replacing existing history. | 既存履歴を置換せず変更を足すこと。 | +| CI | Checks run automatically after changes. | 変更後の自動検査。 | +| QAE | Quality Assurance Engineer. | QA担当。 | +| TOON | Compact text notation for structured data. | 構造のあるデータを短く書く形式。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR21_Installer_r5.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR21_Installer_r5.md new file mode 100644 index 0000000..b6785ce --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR21_Installer_r5.md @@ -0,0 +1,126 @@ +# REV PR21 Installer review r5 / インストーラーレビュー r5 + +> **Summary:** The remaining prebuilt publication policy finding is resolved at `c5ec1cf`; no regression was found in the previously verified scope. The code/test review passes; real-install acceptance remains separate. +> **概要:** `c5ec1cf` で事前ビルド済みイメージの公開方針に関する残件は解消し、確認済み範囲に後退はない。コード・試験レビューは合格。実機導入の受入は別途必要。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** a publication request can deliberately exclude third-party images when the exception and actual outcome are explicit in both the specification and report. / 第三者のイメージを公開要求から意図的に除外するには、仕様と結果の両方で例外と実績を明示すればよいと分かった。 +- Applies to: PR (proposed change / 変更案) [#21](https://github.com/RCOSDP/RDM-developer-guide/pull/21), “feat(installer): grdm-dev インストーラー実装(M2 第 1 段)”, head `c5ec1cf2ca66e9e079bd52f151439f602b1f00f9`; REV (reviewer / 担当レビュワ). +- Related: [Review index](README.md) · [r4](2026-11-05_RDM-developer-guide_PR21_Installer_r4.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Installer](../../installer/README.md) · [Status board](../status/README.md) · [Mac Studio run record](../demo/20_core_install_mac_studio.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**PASS for code/test review: R3-01 is fully resolved; no blocking findings remain in the reviewed scope.** This verdict does not grant merge authorization or real-install acceptance. GitHub access used `gh` only; no approve, merge, close, commit or push operation was performed. Docker (the tool running application boxes) state was not changed; additional probes used fake runners (functions returning controlled command results). + +The remote comparison from `6df8c4b` to `c5ec1cf` changes only the r4 record, [SPEC-02](../spec/02_installer_cli.md), [build.py](../../installer/grdm_dev/build.py) and [test_build.py](../../installer/tests/test_build.py). Before writing r5, all 327 files under `installer/`, `tools/`, `manifest/` and `docs/` in the requested remote tree matched their local file-content fingerprints, checked against `gh api` output. + +### Resolution and English/Japanese parity + +In `build.py`, lines 212–235, a prebuilt image (an already-built application package) still follows the pull (download) loop once per requested platform (operating-system/processor target). With `--push`, successful pulls report `status: prebuilt-not-pushed` and `pushed: false`, and a warning explains the third-party publication exception. The branch continues before source synchronization or buildx (the image builder), so it cannot re-publish the image to GHCR (the image distribution service). A failed pull still takes precedence: `pull-failed`, successful targets only in `pulled`, and exit 30. Without `--push`, success remains `prebuilt` with `pushed: false`. The top-level `push` field records the request, not publication evidence. + +SPEC-02 §3's build row in both languages states the same contract: one pull per requested platform, no re-publication of third-party prebuilt images to `ghcr.io/rcosdp` even with `--push`, and explicit `prebuilt-not-pushed` / `pushed: false` reporting. Both retain `pull-failed` → exit 30 and the source-build publication behavior. The explicit exception resolves the r4 mismatch. + +`test_prebuilt_with_push_is_pulled_but_never_pushed` asserts success, no buildx build call, no `ghcr.io` argument, and the exact status/false flag. It does not directly assert that a pull occurred; the existing pull tests and an independent eight-case probe supply that evidence. The probe covered `push=False/True` with both targets succeeding, either target failing, and both failing. It asserted exact ordered pull-only arguments, exit code, status, `pushed: false`, and the successful-target list. All eight cases passed without downloading an image. + +### Regression evidence and validation + +R1 source-build publication still uses only the GHCR tag. Credential rotation/rollback, listener checks, baseline checks, scanner failure handling, port preservation, acceptance collection and packaging are unchanged. R2 trace quarantine (private storage for raw browser records), redirect/WebSocket guards, broken-probe detection, recorded egress (outbound traffic) grants and prior bilingual corrections are unchanged. R3's per-platform pull accounting remains intact and was exercised with and without `--push`. + +Observed results in TOON (compact structured text), not canonical manifest (component inventory) data: + +```toon +checks[6]{check,result}: + installer_unittest,"290 run; OK; 10 skipped because system Python lacks pytest" + guard_tests_venv,"10 run; OK; covers those 10 skips" + tools_unittest,"77 run; OK" + independent_prebuilt_matrix,"8 cases; all assertions pass" + docs_check,"54 checked; 8 exempt; 127 existing glossary warnings; exit 0" + github_ci,"6 checks pass at c5ec1cf" +``` + +Commands executed from the repository root, each with exit 0: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +PYTHONPATH=installer:installer/tests .venv/bin/python -m unittest test_accept.GuardedRequestTests +python3 -m unittest discover -s tools/tests +python3 tools/docs_check.py +gh pr checks 21 --repo RCOSDP/RDM-developer-guide +``` + +Terminology: Manifest (component inventory), Secret (password or key), MkDocs (documentation site builder), Semgrep (code-pattern checker), Trivy (dependency vulnerability scanner). + +CI (automatic checks) passed: Build MkDocs Site, Check Links, Manifest validation and private-URL policy, Secret scan (gitleaks), Semgrep static analysis, and Trivy filesystem scan (report only at M1). MkDocs builds the documentation site; Secret means a password or key; Semgrep checks code patterns; Trivy checks dependencies for vulnerabilities. The untracked r5 file was additionally checked directly with `tools.docs_check.check_file`. + +Real startup, initialized-store rejection of old credentials, browser acceptance and actual network behavior remain separate stage-two evidence. The ongoing installation was not touched. No implementation changes are requested by r5. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**コード・試験レビュー合格: R3-01 は完全解消。確認範囲に阻害指摘は残らない。** マージ権限の付与や実機導入の受入判定ではない。GitHub 操作は `gh` のみで、approve・merge・close・commit・push はしていない。Docker(アプリケーションの箱を動かす道具)の状態は変えていない。追加検査では偽 runner(決まったコマンド結果を返す関数)を使った。 + +`6df8c4b` から `c5ec1cf` のリモート差分は r4 記録、[SPEC-02](../spec/02_installer_cli.md)、[build.py](../../installer/grdm_dev/build.py)、[test_build.py](../../installer/tests/test_build.py) のみ。r5 作成前に指定リモート版の `installer/`・`tools/`・`manifest/`・`docs/` の327ファイルについて、`gh api` の内容指紋とローカルファイルの一致を確認した。 + +### 解消内容と英和の一致 + +`build.py` の212〜235行では、prebuilt image(組み立て済みの実行用パッケージ)を要求された platform(OS・プロセッサの対象)ごとに pull(取得)する。`--push` 時の取得成功は `status: prebuilt-not-pushed` と `pushed: false` を報告し、第三者の成果物を再公開しない旨を警告する。ソース同期や buildx(イメージを組み立てる道具)より前で次の部品へ進むため、GHCR(イメージ配布サービス)への再公開は起こらない。取得失敗があればそちらを優先し、`pull-failed`、成功対象だけの `pulled`、終了30を維持する。`--push` なしの成功は `prebuilt`、`pushed: false`。最上位の `push` は要求を表し、公開実績ではない。 + +SPEC-02 §3 の build 行は両言語で同じ契約を示す。要求された対象ごとに取得し、`--push` でも第三者の prebuilt を `ghcr.io/rcosdp` へ再公開せず、`prebuilt-not-pushed` / `pushed: false` を明示する。両言語とも `pull-failed` → 終了30とソースビルドの公開動作を維持する。明示的な例外により r4 の不一致は解消した。 + +`test_prebuilt_with_push_is_pulled_but_never_pushed` は成功、buildx build 呼出しなし、引数に `ghcr.io` なし、正確な status と false を検証する。この新試験単体には取得実行の直接検証がないが、既存の取得試験と独立した8ケースの検査で補った。追加検査は `push=False/True` のそれぞれで両対象成功・片方ずつ失敗・両方失敗を扱う。順序も含めた取得専用の引数、終了値、status、`pushed: false`、成功対象一覧を検証し、8ケースすべて合格した。実イメージは取得していない。 + +### 後退確認と検証 + +R1 のソースビルド公開先は GHCR タグのみを維持する。資格情報の更新・巻戻し、待受検査、baseline 検査、スキャン失敗処理、ポート維持、受入結果収集、パッケージ化は不変。R2 の trace 隔離(ブラウザ生記録の非公開保管)、転送・WebSocket の通信制限、壊れた検査道具の検出、記録された egress(外向き通信)許可、以前の英和修正も不変。R3 の対象別取得実績は維持され、`--push` の有無それぞれで検証した。 + +TOON(構造化データの短い文字表記)による観測結果。manifest(部品一覧)の正本ではない。 + +```toon +checks[6]{check,result}: + installer_unittest,"290件; OK; system Python に pytest がないため10件スキップ" + guard_tests_venv,"10件; OK; スキップ分を補完" + tools_unittest,"77件; OK" + independent_prebuilt_matrix,"8ケース; 全アサーション合格" + docs_check,"54件検査; 8件免除; 既存の用語注警告127件; 終了0" + github_ci,"c5ec1cf の6チェック成功" +``` + +リポジトリルートから実行し、各終了0を確認した。 + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +PYTHONPATH=installer:installer/tests .venv/bin/python -m unittest test_accept.GuardedRequestTests +python3 -m unittest discover -s tools/tests +python3 tools/docs_check.py +gh pr checks 21 --repo RCOSDP/RDM-developer-guide +``` + +CI(自動検査)は Build MkDocs Site、Check Links、Manifest validation and private-URL policy、Secret scan (gitleaks)、Semgrep static analysis、Trivy filesystem scan (report only at M1) の6件が成功。MkDocs は文書サイト生成、Secret はパスワードや鍵、Semgrep はコードパターン検査、Trivy は依存部品の弱点検査を指す。未追跡の r5 ファイルは `tools.docs_check.check_file` でも直接検査した。 + +実起動、初期化済みストアでの旧資格情報拒否、ブラウザ受入、実ネットワーク挙動は第二段階の証拠として別途必要。進行中の導入には触れていない。r5 からの実装修正要求はない。 + +## Glossary / 用語 + +| Term | English | 日本語 | +|---|---|---| +| REV | Reviewer | 担当レビュワ | +| Prebuilt | Already-built application image | 組み立て済みの実行用イメージ | +| Pull / push | Download / publish an image | イメージの取得/公開 | +| Platform | Operating-system and processor target | OS とプロセッサの対象 | +| Regression | Previously working behavior becomes broken | 動いていた機能が変更で壊れること | +| Runner | Function executing or simulating a command | コマンドを実行または模擬する関数 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR22_Integration_Sha_r2.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR22_Integration_Sha_r2.md new file mode 100644 index 0000000..7aba1bd --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR22_Integration_Sha_r2.md @@ -0,0 +1,77 @@ +# REV PR22 integration revision review r2 / PR22 統合版レビュー r2 + +> **Summary:** Both r1 findings are resolved. The revised history agrees with GitHub, both languages agree, and all six automated checks pass; minor documentation navigation improvements remain. +> **概要:** r1 の二指摘は解決した。修正後の履歴は GitHub と一致し、日英の内容も対応し、自動検査六件は合格。軽微な文書案内の改善が残る。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** a closed proposal and a merged replacement need separate historical labels; passing automated checks does not prove complete document navigation. / 閉じた提案と統合された代替提案は履歴を分けて記す必要があり、自動検査の成功だけでは文書案内の完全性を保証できないと分かった。 +- Applies to: [PR #22](https://github.com/RCOSDP/RDM-developer-guide/pull/22), a pull request (proposed change), titled `fix(manifest): dev2027 各 develop の先端を integration_sha に固定`; reviewer REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-06 documentation rules](../spec/06_documentation_conventions.md) · [SPEC-01 component list](../spec/01_manifest.md) · [r1 for PR22/25](2026-11-06_RDM-developer-guide_PR22_PR25_r1.md) · [r1 for PR23/24](2026-11-06_RDM-developer-guide_PR23_PR24_r1.md) · [Shared glossary](../reference/REF-01_Glossary.md) +- Used by: [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Scope and verdict + +**Pass with non-blocking documentation nits.** Findings 22-01 and 22-02 are resolved; no new blocking issue was found. This is a review recommendation, not a GitHub approval. + +Reviewed head (latest saved revision) `00d370076c1ad4c42dc2d5d0a68ed61120fe3824`, from `fix/manifest-integration-sha` to `develop`, on 2026-11-06 JST (Japan time). GitHub CLI (the `gh` command-line client) supplied the proposal diff, files, proposal histories and automated-check results. This revision changes the status board and adds two historical r1 review records. The manifest (component list with fixed revisions) is unchanged from r1, so the eleven SHA (revision fingerprint) checks recorded in r1 were not all repeated. No local tests, approval, merge, close, commit, push or Docker state changes were performed. + +### Resolution and evidence + +- **22-01 resolved:** board lines 39 and 80 now identify RDM-wiki-frontend-dev2027 #1 as closed without merge because the source tips were identical. GitHub reports `CLOSED`, closure `2026-11-05T11:21:58Z`, and no merge time. The closing comment explains the identical tips and abandoned amended proposal. The public, private and integration develop tips queried during r2 all equal `203d32fab60aad8d78e9b743987519252f99b817`. Both languages preserve the seven-merge count without counting wiki as a merge. +- **22-02 resolved:** board line 8 advances to version 0.4 dated 2026-11-06 with a bilingual Learned statement, retaining earlier versions. Lines 42 and 83 mark osf.io #1 historical/superseded. GitHub reports #1 closed without merge at `2026-11-05T11:11:49Z`; its closing comment records rejection of the bootstrap interpretation and replacement by #2. Proposal #2 is merged at `2026-11-05T19:25:02Z`, or 2026-11-06 in Japan. The revised English and Japanese rows agree. +- **Added records:** both r1 files have one title, bilingual summaries, Jump, explicit language anchors, reciprocal links, version 0.1 with Learned, scope, parent/specification/Used-by links and a final bilingual glossary. Their findings, verdicts and limitations correspond between languages. They retain historical reviewed heads and do not claim that PR23–25 issues were resolved by PR22. Their earlier execution claims were read as historical evidence, not rerun in r2. + +### Minor documentation follow-up + +**22-r2-01 / P3 (minor, non-blocking):** SPEC-06 §5 requires the folder index to list its documents with bilingual descriptions. `docs/reviews/README.md` still has an empty section 3 and does not link either newly added record. Add both entries, a version update and Learned line during documentation upkeep. Also add the shared-glossary link to the PR22/25 record's first-use notes for SHA, manifest and TOON (compact structured text); the PR23/24 record already includes that link. The required page structure passes, but full editorial compliance should not be inferred from green checks. + +### Automated checks and limits + +CI (automated checks run by GitHub) has six passing checks: Build MkDocs Site, Check Links, Manifest validation and private-URL policy, Secret scan (gitleaks), Semgrep static analysis, and Trivy filesystem scan. Both the [documentation run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42096020326) and [security run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42096020278) report success for the exact reviewed head. Trivy is explicitly report-only at M1; success is not proof of a vulnerability-free runtime. No full startup or acceptance execution was assessed. The r2 record is a local handoff artifact and was not part of those CI runs. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 範囲と判定 + +**合格、軽微な文書改善あり(非阻害)。** 22-01 と 22-02 は解決し、新しい阻害事項は見つからなかった。レビュー上の推奨であり、GitHub の承認操作ではない。 + +2026-11-06 日本時間に、`fix/manifest-integration-sha` から `develop` への変更の先端(最新保存版)`00d370076c1ad4c42dc2d5d0a68ed61120fe3824` を確認した。GitHub CLI(端末から GitHub を操作する `gh`)で差分、ファイル、提案の履歴、自動検査結果を取得した。今回の版は進捗ボードを変更し、過去の r1 記録二件を追加する。manifest(部品と固定版の一覧)は r1 から無変更のため、r1 に記録した十一件の SHA(保存版の指紋)の照合すべては再実行していない。ローカル試験、承認、マージ、閉鎖、commit、push、Docker の状態変更は行っていない。 + +### 解決状況と根拠 + +- **22-01 解決:** ボード 39・80 行は RDM-wiki-frontend-dev2027 #1 を、取得元の両先端が同一のためマージせず閉鎖したと記す。GitHub は `CLOSED`、閉鎖時刻 `2026-11-05T11:21:58Z`、マージ時刻なしを返した。閉鎖コメントも同一先端と書き換えられた提案の不採用を説明する。r2 で確認した公開・非公開・統合先の develop はすべて `203d32fab60aad8d78e9b743987519252f99b817`。日英とも wiki をマージに数えず、七件という数を維持する。 +- **22-02 解決:** ボード 8 行は日英 Learned 付きの版 0.4、2026-11-06 となり、旧版を残す。42・83 行は osf.io #1 を履歴・置き換え済みとする。GitHub の #1 は `2026-11-05T11:11:49Z` にマージせず閉鎖され、閉鎖コメントは初回構築解釈の却下と #2 への置き換えを記録する。#2 は `2026-11-05T19:25:02Z`、日本時間 2026-11-06 にマージ済み。修正行の日英は一致する。 +- **追加記録:** 両 r1 ファイルは単一題名、日英概要、Jump、明示的な言語アンカー、相互リンク、Learned 付き版 0.1、対象範囲、親索引・仕様・Used-by リンク、末尾の日英用語集を備える。指摘・判定・限界は日英で対応する。過去のレビュー対象先端を保持し、PR23〜25 の問題を PR22 で解決したとは述べていない。過去の試験実行の記述は履歴の証拠として読み、r2 で再実行していない。 + +### 軽微な文書改善 + +**22-r2-01 / P3(軽微、非阻害):** SPEC-06 §5 はフォルダ索引に各文書と日英の説明を求める。`docs/reviews/README.md` の第 3 節は空のままで、追加二記録へのリンクがない。文書整備時に両項目、版更新、Learned を追加する。また PR22/25 記録の SHA・manifest・TOON(構造化データを短く書く形式)の初出注に共通用語集リンクを補う。PR23/24 記録には既にリンクがある。必須ページ構造は満たすが、自動検査成功だけで編集規約全体の遵守を断定しない。 + +### 自動検査と限界 + +CI(GitHub が実行する自動検査)は Build MkDocs Site、Check Links、Manifest validation and private-URL policy、Secret scan (gitleaks)、Semgrep static analysis、Trivy filesystem scan の六件が合格。[文書実行](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42096020326)と[セキュリティ実行](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42096020278)の成功が対象先端そのものに対応することも確認した。Trivy は M1 では報告のみであり、成功は稼働環境に脆弱性がない証拠ではない。完全起動・受入実行は評価していない。r2 記録はローカルの引継ぎ成果物であり、この CI 実行には含まれない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| PR | A proposed change for review. | 点検するために提出する変更案。 | +| SHA | A fingerprint identifying a saved revision. | 保存版を特定する指紋。 | +| Manifest | A list of components and their fixed revisions. | 部品と固定する版の一覧。 | +| CI | Checks run automatically for a proposed change. | 変更案に対して自動実行する検査。 | +| Superseded | Replaced by a later proposal. | 後の提案に置き換えられた状態。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR22_PR25_r1.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR22_PR25_r1.md new file mode 100644 index 0000000..8525f31 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR22_PR25_r1.md @@ -0,0 +1,163 @@ +# REV PR22 and PR25 review r1 / PR22・PR25 レビュー r1 + +> **Summary:** Independent review of the pinned integration revisions and the 2027 environment guide. Both proposals need documentation corrections; all eleven integration revisions and the manifest excerpt passed verification. +> **概要:** 統合版の固定と 2027 環境ガイドを独立レビューした。両提案とも文書修正が必要だが、統合版 11 件とマニフェスト抄録の照合は合格した。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** correct pinned revisions do not prove that status history or the documented security commands are correct; each requires separate evidence. / 固定版が正しくても、進捗履歴やセキュリティ検査コマンドの説明が正しい証拠にはならず、それぞれの根拠が必要と分かった。 +- Applies to: PR (pull request, a proposed change awaiting review) #22 and #25 of RDM-developer-guide; reviewer REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-01](../spec/01_manifest.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-02](../decisions/ADR-02_Network_Model.md) +- Used by: [Status board](../status/README.md) · [Environment guide](../guides/environment/README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Scope and verdicts + +Working brief: review both proposals using GitHub CLI reads, compare their claims with the specifications and implementation, record findings bilingually, and post one Japanese comment per proposal. No approval, merge, commit, push, or Docker execution was performed. + +A SHA is the 40-character fingerprint of a saved code revision. A manifest is a list of components and their fixed revisions. TOON is a compact text representation of structured data. Evidence was fetched with `gh pr diff` and `gh api .../contents/<path>?ref=<branch>`; line numbers refer to the reviewed proposal files and the fetched develop reference files. + +- **PR #22: changes requested for the status wording (22-01); revision pinning passes.** Reviewed public proposal head `c3cdf706a83a45a94c403bdbafe9fc2f1e31f8e0`. +- **PR #25: changes requested, including two high-priority security-check descriptions.** Reviewed public proposal head `b37c71e1024611485aebb6d9d8b63878b7ae4db6`. +- Reference develop revision: `e2f3858eac63b990a27158314889c406aa9a42a6`. No full startup, image build, browser acceptance test, or live security scan was attempted. Verdicts are review recommendations, not GitHub approval/review submissions. + +### PR #22 verification + +All eleven non-infrastructure components have lowercase 40-hex `integration_sha` values matching their integration repository's live develop tip. The following is review evidence, not a canonical manifest excerpt; private repositories are named without links. + +```toon +verified[11]{repository,develop_tip_matches,hex40}: + RDM-osf.io-dev2027,yes,yes + RDM-waterbutler-dev2027,yes,yes + RDM-modular-file-renderer-dev2027,yes,yes + RDM-ember-osf-web-dev2027,yes,yes + RDM-cas-overlay-dev2027,yes,yes + RDM-wiki-frontend-dev2027,yes,yes + RDM-y-websocket-dev2027,yes,yes + RDM-OASys-dev2027,yes,yes + RDM-Shibboleth-SP-dev2027,yes,yes + RDM-rdmcp-dev2027,yes,yes + RDM-aipf_mcp_data_grdm-dev2027,yes,yes +``` + +The branch-tip check used `gh api repos/RCOSDP/<repo>/branches/develop --jq .commit.sha`. Wiki also matches both RDM-wiki-frontend and RDM-wiki-frontend-develop-private develop tips. OASys, rdmcp, and aipf match the main tips of RDM-OASys-main-private, RDM-rdmcp-private, and RDM-aipf_mcp_data_grdm-private respectively. Infrastructure entries were excluded from remote queries. + +From a temporary copy, the following check returned exit 0 and zero findings: + +```bash +cd /tmp/rev-pr22-pr25 +python3 tools/manifest_check.py --manifest-only +``` + +This validates the manifest and TOON projection. The projection does not include `integration_sha`, so the unchanged TOON file is correct. A repository-wide policy scan was not claimed from this partial temporary copy. + +The seven strict reconstruction merges were confirmed through `gh pr list --state merged --base develop`: osf.io #2 and waterbutler, modular-file-renderer, ember-osf-web, cas-overlay, y-websocket, Shibboleth-SP #1. They occurred on 2026-11-05 at 19:25 UTC, which is 2026-11-06 JST; the board's date is correct in the team's timezone. + +### Ranked findings for PR #22 + +- **22-01 / P2 — Correct “no PR” to “PR #1 closed without merge; tips identical.”** `docs/status/README.md:38` and `:79` say wiki-frontend had no PR. GitHub reports RDM-wiki-frontend-dev2027 #1 created at 2026-11-05 11:09:10 UTC and closed at 11:21:58 UTC, with no merge. The identical-tip claim is verified, but the historical claim is false in both languages. Keep the seven-merge count and correct the wiki history. +- **22-02 / P3 — Update the board's version and clarify superseded review status.** `docs/status/README.md:8` retains the November 5 version despite this edit; SPEC-06 §6 requires a version update with the change. Existing rows `:41` / `:82` still present osf.io #1 decisions as pending although #1 is closed and #2 merged. These stale rows predate this proposal; mark them historical/superseded when touching the board. + +### Ranked findings for PR #25 + +All guide evidence below refers to `docs/guides/environment/README.md`; each pair gives English and Japanese lines. + +- **25-01 / P1 — The “whole security gate” command skips vulnerability analysis.** Lines 180–188 / 509–517 use `scan --baseline --secrets` and promise CVE (a public identifier for a known weakness) threshold results. SPEC-02 §3 and `installer/grdm_dev/scan.py:902`, `:932`, `:940`, `:944` show that these flags select only baseline and secret checks; Trivy, Semgrep and ZAP run in the unfiltered scan. Show `scan` for the full gate, or accurately label the subset; explain milestone rules and missing-scanner exit 51 (and exit 52 for unavailable dynamic checks). +- **25-02 / P1 — The documented health command does not check host exposure.** Lines 171–176 / 500–505 and 309 / 638 promise rejection of non-loopback listeners for plain `health`. SPEC-02 §3, SPEC-03 §3.2 and `installer/grdm_dev/health.py:314`, `:330` require `health --network` for that check. Add the flag wherever that guarantee is made, preventing a healthy response from being mistaken for proof of network isolation. +- **25-03 / P2 — Correct exit-code claims.** Lines 95 / 424 classify missing Docker as 10, but SPEC-02 §6 assigns 11. Lines 135 / 464 say rendering never fails and call 0 a failure code; `installer/grdm_dev/compose.py:746`, `:750`, `:775`, `:784` return 20, 2 and 12. Document 0 as success and the real failure cases; this also removes the contradiction with the guide's own troubleshooting section. +- **25-04 / P2 — Distinguish the installation sequence from optional manual tests.** Lines 83 / 412 say the installer runs all listed steps; lines 90 / 419 invoke the entire installer under the doctor heading. SPEC-02 §2.1 and `installer/grdm_dev/install.py:39`–`:51` instead run doctor → plan → secrets → render → build → up → health --network → scan → report, without accept. Show the doctor-only command after bootstrap and place acceptance outside that automatic sequence. +- **25-05 / P2 — Make acceptance instructions executable and describe seed lifetime.** Lines 195–202 / 524–531 omit the optional Python dependencies and Chromium preparation required by SPEC-02 §2.2 and `installer/grdm_dev/accept.py:574`–`:585`. They also suggest running `accept --seed` first to prepare users, but `:619`–`:636` creates users, runs tests, then removes them in the same invocation. Show setup in the existing virtual environment and run the desired acceptance test with `--seed`; do not imply a persistent preparatory seed step. +- **25-06 / P2 — Do not promise read-only roots for every service.** Lines 265 / 594 overstate SPEC-03 §3.3 (`docs/spec/03_security_gate.md:74`), which permits documented per-service exceptions in `manifest/hardening.json`. Explain the exception mechanism and link its record. The random-secret, 0600 file mode, loopback-only publishing and digest-policy statements otherwise match SPEC-03 §3 as requirements, without proving live compliance. +- **25-07 / P2 — Use the chosen port in quick-start results.** Lines 29 / 358 and 162 / 491 hardcode port 5000 although the guide correctly describes reassignment at 280 / 609. `installer/grdm_dev/compose.py:210` searches from the requested port through +100, preserving owned bindings, and `:784` returns 12 only if none is free. Tell readers to use the reported URL or recorded port. The +100 description should say “requested/saved port”, not always “default”, because saved overrides also feed the search. +- **25-08 / P2 — Correct the current fallback state and bilingual timing.** Line 8 explicitly labels full startup unverified, which is good, but says in English that fallback images will be added *once* Dockerfiles update while Japanese says *until* they update. The ember fallback is already present in `manifest/upstreams.json:409` and `:415` (note and prebuilt image); DEMO-20 records the decision. State that it is already configured until modernization and preserve the unverified-startup caveat near quick start. A failed source build does not prove the configured fallback also fails. +- **25-09 / P2 — Ground the old/new table in the actual legacy guide.** Lines 321–322 / 650–651 attribute manual `docker pull` and `postgres/postgres` credentials to README.legacy.md, but neither appears there. Its lines 33, 36–39 and 47–56 describe the alias, copied local settings, Compose overrides and image-based startup. Replace unsupported attributions with those concrete differences, including internal/external URL settings required by ADR-02 §4; if retaining default credentials, attribute them to upstream Compose files/SPEC-03 §3.1 rather than the legacy guide. +- **25-10 / P3 — Complete SPEC-06 form and newcomer explanations.** Anchors, Jump, Version 1.0 and Learned exist, but the previous 0.1 version is removed (line 8); parent-index and Used-by links are absent (line 10); a glossary interrupts the English/Japanese halves (line 328) and is repeated at 657. Terms TOON, manifest, profile, EOL, wheel, WSL2 and emulation lack first-use notes (examples: 35, 93, 109, 147–152). Add short explanations and shared-glossary links. Remove the incorrect “Ventura” label from “macOS 14” at 33 / 362, and preserve the numeric SPEC-02 host requirement. Explain that the seven publishing services already have outbound access; `--egress` adds it for others, and `--egress none` clears the saved choice (ADR-02:85; compose.py:14–18). The egress example at 238 / 567 needs the full profile selected; it is valid after the preceding full-profile step, but fails for a reader still using default core. + +Comments posted: [PR #22 r1](https://github.com/RCOSDP/RDM-developer-guide/pull/22#issuecomment-6667432843) · [PR #25 r1](https://github.com/RCOSDP/RDM-developer-guide/pull/25#issuecomment-6667433707). The review record passed the SPEC-06 mechanical checks for anchors, Jump, version, links and TOON with zero errors. + +### Additional checks and limits + +The seven default port rows agree with SPEC-02 §4. The two-network model and persisted `GRDM_EGRESS_SERVICES` agree with ADR-02; the diagram should also attach web to the internal network to depict its service calls (guide:74 / 403; compose.py:365). The `--yes`, `--profile`, `--egress`, `--seed`, build, down and reset command names/flags exist in SPEC-02. The missing flags and misleading outcomes are ranked separately. Git clone, cd, Docker logs and lsof are supporting shell commands, not grdm-dev subcommands specified by SPEC-02. + +Both language halves mostly mirror one another, including the defects; the fallback timing mismatch is called out above. The manifest checker's private-URL/token text scanner reported zero findings for the proposed guide. No private repository URL is reproduced here. Fix the findings in both languages and re-review; full startup still needs a separate recorded run. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 範囲と判定 + +作業要約: GitHub CLI で両提案を読み、仕様・実装と照合し、日英記録と各提案への日本語コメントを作成する。承認、マージ、コミット、push、Docker 実行は行っていない。 + +SHA は保存済みコード版を表す 40 文字の指紋、マニフェストは部品と固定版の一覧、TOON は構造化データの短いテキスト表現である。根拠は `gh pr diff` と `gh api .../contents/<path>?ref=<branch>` で取得した。行番号は対象提案ファイルと取得時の develop 参照資料に対応する。 + +- **PR #22: 進捗文言の修正要求(22-01)。版固定の検証は合格。** 対象先端は `c3cdf706a83a45a94c403bdbafe9fc2f1e31f8e0`。 +- **PR #25: 修正要求。セキュリティ検査説明に優先度の高い指摘が 2 件。** 対象先端は `b37c71e1024611485aebb6d9d8b63878b7ae4db6`。 +- develop 参照版は `e2f3858eac63b990a27158314889c406aa9a42a6`。完全起動、イメージのビルド、ブラウザ受入試験、稼働環境のセキュリティ検査は未実施。判定はレビュー上の推奨で、GitHub の承認・レビュー送信ではない。 + +### PR #22 の検証 + +英語節の TOON に列挙した統合リポジトリ 11 件すべてで、小文字 40 桁 16 進の `integration_sha` と実際の develop 先端が一致した。確認方法は `gh api repos/RCOSDP/<repo>/branches/develop --jq .commit.sha`。基盤サービスはリモート照合から除外した。 + +Wiki は RDM-wiki-frontend と RDM-wiki-frontend-develop-private の develop 両先端とも一致。OASys・rdmcp・aipf は、それぞれ RDM-OASys-main-private・RDM-rdmcp-private・RDM-aipf_mcp_data_grdm-private の main 先端とも一致した。非公開リポジトリは名前のみを記録する。 + +一時コピー `/tmp/rev-pr22-pr25` を作業ディレクトリとして実行した検査は終了コード 0、指摘 0 件だった。 + +```bash +cd /tmp/rev-pr22-pr25 +python3 tools/manifest_check.py --manifest-only +``` + +検査範囲はマニフェストと TOON 抄録の一致。抄録には `integration_sha` が含まれないため、TOON が無変更なのは正しい。この部分コピーからリポジトリ全体のポリシー検査に合格したとは主張しない。 + +厳密再構築 7 本のマージは `gh pr list --state merged --base develop` で確認した。osf.io #2、および waterbutler・modular-file-renderer・ember-osf-web・cas-overlay・y-websocket・Shibboleth-SP の #1 である。UTC では 2026-11-05 19:25、JST では 2026-11-06 であり、ボードの日付はチームの時間帯と合う。 + +### PR #22 の優先順位付き指摘 + +- **22-01 / P2 — 「PR なし」を「#1 を未マージで閉鎖、先端同一」に修正。** `docs/status/README.md:38`・`:79` は wiki-frontend に PR がなかったとするが、実際には RDM-wiki-frontend-dev2027 #1 が 2026-11-05 11:09:10 UTC に作成され、11:21:58 UTC に未マージで閉鎖された。先端同一は確認済み。7 本のマージ数を保ち、両言語で履歴を直す。 +- **22-02 / P3 — ボードの版を更新し、置換済みレビューを明示。** `docs/status/README.md:8` が 11 月 5 日の版のままで、変更と同時の版更新を求める SPEC-06 §6 に合わない。既存の `:41`・`:82` は osf.io #1 の判断を待機中とするが、#1 は閉鎖済み、#2 はマージ済み。この行は既存の不整合であり、ボード更新時に履歴・置換済みと分かるようにする。 + +### PR #25 の優先順位付き指摘 + +対象行はすべて `docs/guides/environment/README.md`。英語/日本語の順に示す。 + +- **25-01 / P1 — 「全セキュリティ検査」のコマンドが脆弱性解析を省く。** 180–188/509–517 行の `scan --baseline --secrets` は基本対策と秘密情報の検査だけを選択する。CVE(既知の弱点に付く公開番号)の基準内判定を保証しない。SPEC-02 §3、`installer/grdm_dev/scan.py:902`・`:932`・`:940`・`:944` が根拠。全検査なら `scan` にし、限定検査ならその範囲を明示する。節目ごとの判定と、検査ツール不足の 51、動的検査が実行不能な場合の 52 も説明する。 +- **25-02 / P1 — 記載の健康確認ではホスト公開先を検査しない。** 171–176/500–505 行、および 309/638 行は通常の `health` でループバック以外の待受を検出するとする。SPEC-02 §3、SPEC-03 §3.2、`installer/grdm_dev/health.py:314`・`:330` に従い、その保証をする箇所は `health --network` に修正する。応答の正常だけでネットワーク隔離が確認できたと誤認させない。 +- **25-03 / P2 — 終了コードを修正。** 95/424 行は Docker 不足を 10 とするが、SPEC-02 §6 では 11。135/464 行は render が失敗しないとし、成功の 0 を失敗コードとしているが、`installer/grdm_dev/compose.py:746`・`:750`・`:775`・`:784` は 20・2・12 を返す。実際の成功・失敗条件を示し、トラブル対応節との矛盾を解消する。 +- **25-04 / P2 — 自動導入の順序と任意の手動試験を分ける。** 83/412 行は全掲載手順が自動実行されるとし、doctor 節の 90/419 行は導入全体を呼ぶ。SPEC-02 §2.1 と `installer/grdm_dev/install.py:39`–`:51` の順序は doctor → plan → secrets → render → build → up → health --network → scan → report で、accept を含まない。初期準備後の doctor 単独コマンドを示し、受入試験を任意操作として分ける。 +- **25-05 / P2 — 受入試験の準備と試験利用者の寿命を正確にする。** 195–202/524–531 行は SPEC-02 §2.2 と `installer/grdm_dev/accept.py:574`–`:585` が要求する追加 Python 依存と Chromium の準備を欠く。`accept --seed` を先に実行して利用者を準備する説明も不正確で、`:619`–`:636` は一回の呼出しで作成・試験・削除まで行う。既存の仮想環境内での準備と、実際に実行する試験への `--seed` 指定を示す。 +- **25-06 / P2 — 全サービスの読み取り専用ルートを保証しない。** 265/594 行は SPEC-03 §3.3(`docs/spec/03_security_gate.md:74`)の「対応できるサービスのみ」と `manifest/hardening.json` の例外を落としている。例外の仕組みと記録へのリンクを付ける。乱数の秘密、0600、ループバック限定公開、ダイジェスト固定方針は SPEC-03 §3 の要求と合うが、稼働環境での遵守を実証したわけではない。 +- **25-07 / P2 — 起動結果には選ばれたポートを案内する。** 29/358 行と 162/491 行は 5000 固定だが、280/609 行では正しく再割当を説明している。`installer/grdm_dev/compose.py:210` は指定値から +100 まで探索し、自プロジェクトの待受を保持し、`:784` は代替がない場合だけ 12 を返す。出力 URL または保存ポートを使うよう案内する。保存済み指定値も探索元になるため「既定から +100」は「要求・保存ポートから +100」に直す。 +- **25-08 / P2 — 代替イメージの現状と日英の時期を揃える。** 8 行の完全起動未検証という明記は適切だが、英語は Dockerfile 更新「後」、日本語は更新「まで」代替を追加すると読める。ember の代替は `manifest/upstreams.json:409`・`:415` の注記・prebuilt_image に既に存在し、DEMO-20 に決定が記録されている。近代化まで設定済みであることを示し、クイックスタートにも未検証の注意を置く。ソースビルド失敗だけで設定済み代替の失敗を断定しない。 +- **25-09 / P2 — 新旧比較表を旧ガイドの実際の記述に基づかせる。** 321–322/650–651 行が旧方法とする `docker pull` と `postgres/postgres` は README.legacy.md に登場しない。旧 33・36–39・47–56 行にある別名、local 設定のコピー、Compose 上書き、イメージによる起動を比較する。ADR-02 §4 が要求する内部・外部 URL 設定の違いも加える。既定認証情報を残す場合は旧ガイドではなく上流 Compose/SPEC-03 §3.1 に帰属させる。 +- **25-10 / P3 — SPEC-06 の体裁と初学者向け注を補う。** アンカー、Jump、Version 1.0、Learned はある。一方、旧版 0.1 が削除(8 行)、親索引・Used-by が欠落(10 行)、用語集が英語と日本語の間に挿入(328 行)され末尾 657 行でも重複する。TOON、manifest、profile、EOL、wheel、WSL2、エミュレーションの初出注がない(例: 35・93・109・147–152 行)。短い説明と共通用語集リンクを補う。33/362 行の「macOS 14 (Ventura)」は誤った名称を外し、SPEC-02 の数値条件を維持する。公開サービス 7 種は既に外向き通信が可能、`--egress` は他サービスに追加し `--egress none` で保存設定を消すと明示する(ADR-02:85、compose.py:14–18)。238/567 行の例は full 選択後なら有効だが、既定 core のままなら失敗するため前提を添える。 + +投稿済みコメント: [PR #22 r1](https://github.com/RCOSDP/RDM-developer-guide/pull/22#issuecomment-6667432843) · [PR #25 r1](https://github.com/RCOSDP/RDM-developer-guide/pull/25#issuecomment-6667433707)。本記録の SPEC-06 機械検査(アンカー・Jump・版・リンク・TOON)はエラー 0 件だった。 + +### その他の照合と限界 + +既定ポート 7 行は SPEC-02 §4 と一致。二つのネットワークと `GRDM_EGRESS_SERVICES` の保存は ADR-02 と一致する。図にも web の内部ネットワーク接続を追加するとサービス間通信を正しく表せる(ガイド:74/403、compose.py:365)。`--yes`・`--profile`・`--egress`・`--seed`、build・down・reset のコマンド名とフラグは SPEC-02 に存在する。不足フラグ・誤った結果説明は個別に指摘した。git clone、cd、Docker logs、lsof は補助的なシェル操作で、SPEC-02 の grdm-dev サブコマンドではない。 + +日英の大部分は不具合も含め対応し、代替導入時期の相違を個別に指摘した。マニフェスト検査ツールの非公開 URL・トークン文字列検査では、提案ガイドの指摘は 0 件だった。この記録にも非公開リポジトリ URL を載せていない。両言語を修正して再レビューし、完全起動は別途実行記録で実証する。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| REV | Reviewer responsible for checking a proposed change. | 変更案を点検する担当レビュワ。 | +| P1 / P2 / P3 | High-priority correction / normal correction / minor documentation improvement. | 優先度の高い修正/通常修正/軽微な文書改善。 | +| Branch tip | The latest saved revision on a named line of development. | 名前付き開発系列の最新保存版。 | +| Parity | Two representations say the same thing. | 二つの表現の内容が一致すること。 | +| Egress | Traffic sent from a service to the outside network. | サービスから外部ネットワークへ出る通信。 | +| Baseline | Minimum security checks required for every installation. | 毎回の導入に必要な最低限の安全確認。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR23_PR24_r1.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR23_PR24_r1.md new file mode 100644 index 0000000..2ac086f --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR23_PR24_r1.md @@ -0,0 +1,104 @@ +# REV PR23 / PR24 review r1 / PR23・PR24 レビュー r1 + +> **Summary:** Both changes need revisions. Passing unit tests miss mirror retry behavior and several IdP contract mismatches. +> **概要:** 両変更とも修正が必要。単体試験は成功するが、ミラー再試行と IdP 契約の不一致を検出できていない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** simulated commands and string-presence checks can pass while retries and attribute contracts remain broken. / コマンドの模擬と文字列の存在確認が成功しても、再試行と属性の契約は壊れたままになり得ると分かった。 +- Applies to: PR #23 `80855952d8457f8d94e763ce4737afb0cb7ae652`; PR #24 `35ae779597c977156a4d8679519935741089d90a`; base `develop`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-05](../spec/05_upstream_tracking.md) · [SPEC-04](../spec/04_acceptance_tests.md) · [SPEC-02](../spec/02_installer_cli.md) · [ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md). +- Used by: [Upstream status](../status/upstream/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and validation + +PR (a proposed code change) #23: **Changes requested**. PR #24: **Changes requested**, evaluated as M3 preparation, not completed acceptance. P1 means a high-priority functional failure; P2 means a contract or correctness issue to fix before accepting this proposal. SHA (a commit's identity), IdP (the service that checks a login), and SP (the service that consumes its answer) are used here ([shared glossary](../reference/REF-01_Glossary.md)). File:line evidence refers to the reviewed PR head, not the local develop checkout. + +The following command ran in each supplied worktree (a separate checkout). It executes unit tests, not live containers: + +```sh +PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=installer python3 -m unittest discover -s installer/tests +``` + +```toon +results[2]{pr,tests,skipped,result}: + 23,308,10,OK + 24,295,10,OK +``` + +No production fixes, commits, pushes, approvals, merges, or Docker (a tool that runs isolated programs) state changes were performed. S1–S5 remain skipped designs; these results do not prove working authentication. + +### Ranked findings: PR #23 + +1. **U1 — P1: First dry-run prevents subsequent publication.** `installer/grdm_dev/upstream.py:194–220,229–235`: when the origin tracking branch is absent, `previous` falls back to the local branch. After dry-run has fetched that branch, a real run sees an unchanged local tip and never pushes it. The same problem follows a failed first push. Reproduced with the existing FakeGit and an origin containing only develop: dry-run exit 0, real run exit 0, zero push calls, origin still only develop. Compare publication against the remote's existence/SHA separately from the local fast-forward check. Add dry-run→real and failed-first-push→retry tests. +2. **U2 — P1: Rerun resets local integration work.** `installer/grdm_dev/upstream.py:370–379` checks only the remote branch, then uses `checkout -B`. A locally existing integration branch, including a manually committed conflict resolution after the documented abort workflow, is reset to the base. Reject an existing local branch too and use non-resetting branch creation. `installer/tests/test_upstream.py:479` covers only the remote case. This also means dry-run has persistent local side effects; it is not a side-effect-free preview. +3. **U3 — P1: Report publication checks out a branch over generated files.** `installer/grdm_dev/templates/workflows/upstream-mirror.yml:90–96,120–126`: reports are generated on develop before switching to the existing status branch. If that branch has reports absent from develop, the new untracked reports obstruct checkout; if develop has older reports, modified tracked files can obstruct it. Prepare the status checkout first or generate outside it and copy afterward. Also make failure-report publication explicit: line 113 lacks `always()`, so a failing mirror skips the public status push even though the artifact upload runs. Validate a second scheduled run and a failed fetch. +4. **U4 — P2: Exit 1 has no canonical CLI entry.** `installer/grdm_dev/upstream.py:68,303–305,482–484` returns 1 for operational failures. SPEC-05 now documents this, so it is not undocumented at module level; however SPEC-02 §6 (`docs/spec/02_installer_cli.md:135–152`) calls `messages.tsv` canonical and requires a distinct code for a new cause. Neither that table nor the shared messages are updated. Add an explicit bilingual upstream exception and canonical message/code, or adopt a new documented code consistently. A source comment alone does not reconcile the contracts. + +### Ranked findings: PR #24 + +1. **I1 — P1: Japanese attributes have the wrong wire identifiers and no explicit IdP mapping.** `installer/grdm_dev/templates/idp/sp-attribute-map.xml:37–39` uses `1.3.6.1.4.1.32264.1.1.1` for jaOrganizationName, whereas the required GakuNin (Japan’s academic login federation) OID is `1.2.392.200453.100.20.1`. jaDisplayName is also placed under that unrelated namespace. `saml20-idp-hosted.php.tmpl:30` relies on the generic `name2oid` map; inspection of the [upstream map at a fixed commit](https://github.com/simplesamlphp/simplesamlphp/blob/f79834309f34d6aa0de3cf88ed39dda752f40138/attributemap/name2oid.php) found neither Japanese name. Supply an explicit verified GakuNin mapping on both sides and test emitted names against decoded names. Also verify pairwise-id conversion for the pinned release. A TODO does not make these templates a valid attribute contract. +2. **I2 — P2: Mock rule and test exceptions disagree.** `installer/acceptance/fixtures/idp/mock_users.json:24–27` contains `sn: USER` and bare `member`/`faculty`; other users do likewise. ADR-05 §3.5 and the bilingual fixtures README promise visibly mock-prefixed values, but `installer/tests/test_compose.py:504–506` silently exempts affiliations and `USER`. No real identity was found, but the requested all-values rule is not enforced. Use a visibly mock surname and reconcile controlled-vocabulary affiliations explicitly with the normative mock policy and rejection rule. Lines 498–503 only search values anywhere in PHP text, so swapping values between users can still pass; compare per-user/per-attribute structures. +3. **I3 — P2: S2 accepts HTTP 200 where SPEC-04 requires 403.** `installer/acceptance/test_s2_rdmcp.py:104–110` substitutes a JSON (structured text data) error's `http_status` for transport status 200. SPEC-04 §5's English and Japanese S2 rows require 403; unlike S3, they provide no alternative response form. Require actual HTTP 403 or amend both specification halves with the intended alternative before unskipping. Add a check that HTTP 200 carrying an embedded 403 is rejected under the present contract. + +### Other checks and limits + +PR #23 uses non-forced tracking fetch refspecs and explicit non-forced pushes. Public→private→adopted-PR order, candidate/COS (Center for Open Science) exclusion, private-only skip, identical-tip no-op, and conflict abort/exit 1 are covered by the fake runner. Report writers use selected names/SHAs/counts; grep and tests at `test_upstream.py:325–350,403–414` check URL absence. Raw subprocess output is streamed to stderr, so this assurance applies to stored mirror reports, not every execution log. SHA parsing (`upstream.py:126–129`) trusts the first output line without validating hexadecimal shape. Archive pruning (`244–255`) accepts every date-shaped stem, irrespective of suffix, and will fail on a date-named directory; narrow it to regular `.json`/`.toon` files and test the boundary. Existing tests cover normal archives, not those cases. + +Workflow actions are pinned to 40-character SHAs; credentials are placeholders with separate source-read/integration-write and report-write scopes, and no actual secret is present. Each component writes the same latest/archive paths, so shared status publication also needs aggregation or per-component paths to preserve all repositories' reports. SPEC-05 explicitly allows local fetch/report/merge operations during dry-run; the narrower no-remote-write promise is implemented, while the task's literal no-side-effects criterion is not. + +PR #24's ePPN, affiliation, targeted ID, mail, and organization OIDs match the supplied expected values. ADR-05 compares four options and records tradeoffs; English/Japanese decision content and SPEC-04 tables correspond. Numerical image-size/startup claims are estimates without measurements in this PR. Fixtures README is bilingual. Compose tests cover 127.0.0.1 publishing on grdm-edge, read-only mounts and existing hardening exceptions. Actual test_idp still lacks non-root/read_only enforcement because the old Java exception remains; F-3/F-4 explicitly defer exception removal and the separate image. This is disclosed preparation debt, not evidence that the proposed baseline already works. F-1/F-2/F-5 likewise defer rendering, secrets and institution setup. S1's 4401/zero-frame rejection, S3's explicit denial, S4's 401 and S5's SP 403/no-cookie/API 401 designs broadly match their table contracts; only S2 has the concrete mismatch above. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と検証 + +PR(コード変更の提案)#23 は **修正要求**。#24 も **修正要求**。#24 は M3 の準備として評価し、受入完了とは扱わない。P1 は優先度の高い機能障害、P2 は採用前に直す契約・正確性の問題。SHA はコミットを識別する値、IdP はログインを確認し、SP はその回答を利用する部品([共通用語集](../reference/REF-01_Glossary.md))。ファイル:行番号はレビュー対象の PR 先端に対応し、ローカル develop の行番号ではない。 + +指定の各 worktree(別の作業用チェックアウト)で英語節の単体試験コマンドを実行した。#23 は 308 件、#24 は 295 件で、各 10 件スキップ、いずれも OK。製品の修正、commit、push、承認、merge、Docker の状態変更はしていない。S1〜S5 はスキップ付き設計のままであり、この結果は認証の実動を証明しない。 + +### 優先順の指摘: PR #23 + +1. **U1 — P1: 初回 dry-run 後に公開されない。** `installer/grdm_dev/upstream.py:194–220,229–235` は、origin に追跡ブランチがないとローカル値を previous に使う。dry-run が一度取得すると、本実行は変更なしと判定して push しない。初回 push 失敗後も同じ。既存 FakeGit で origin を develop のみにして再現し、dry-run 0、本実行 0、push 0 回、origin は develop のみだった。リモートの存在/SHA とローカルの fast-forward 判定を分け、dry-run→本実行と初回 push 失敗→再試行を検査する。 +2. **U2 — P1: 再実行がローカル統合作業をリセットする。** `upstream.py:370–379` はリモートだけ確認して `checkout -B` する。文書に従って衝突を手で解きコミットしたローカル統合ブランチも開始点へ戻る。ローカル既存ブランチも拒否し、リセットしない作成方法を使う。`test_upstream.py:479` はリモートしか検査しない。dry-run にも持続するローカル副作用がある。 +3. **U3 — P1: 生成済み報告が status ブランチへの切替を妨げる。** `installer/grdm_dev/templates/workflows/upstream-mirror.yml:90–96,120–126` は develop 上で報告を書いてから切り替える。status にだけ既存報告があれば未追跡ファイル、develop に古い報告があれば変更済みファイルが切替を妨げ得る。status の作業場所を先に用意するか、外で生成して後から複写する。113 行に `always()` がないため、ミラー失敗時は成果物を保存しても公開 status は更新されない。二回目の日次実行と fetch 失敗で検証する。 +4. **U4 — P2: 終了 1 が CLI 正本にない。** `upstream.py:68,303–305,482–484` の終了 1 は SPEC-05 には明記されたが、SPEC-02 §6(`docs/spec/02_installer_cli.md:135–152`)の正本 `messages.tsv` と番号規則には反映されていない。上流コマンドの例外と正本メッセージ/番号を英和で明記するか、新しい番号を一貫して割り当てる。ソースのコメントだけでは契約は整合しない。 + +### 優先順の指摘: PR #24 + +1. **I1 — P1: 日本語属性の識別子が誤り、IdP 側の明示対応表もない。** `installer/grdm_dev/templates/idp/sp-attribute-map.xml:37–39` の jaOrganizationName は `1.3.6.1.4.1.32264.1.1.1` だが、要求された GakuNin OID は `1.2.392.200453.100.20.1`。jaDisplayName も別系統の番号である。`saml20-idp-hosted.php.tmpl:30` が使う汎用 `name2oid` は、英語節に固定コミットで示した上流ファイルでは日本語二属性を含まない。双方に検証済みの明示対応表を置き、送出名と受信名の一致を検査する。固定するリリースで pairwise-id の変換も確認する。TODO では有効な属性契約にならない。 +2. **I2 — P2: 模擬値規則と試験の例外が不一致。** `installer/acceptance/fixtures/idp/mock_users.json:24–27` に `sn: USER` と裸の `member`/`faculty` があり、他の利用者も同様。ADR-05 §3.5 と英和 README は模擬と分かる接頭辞を約束する一方、`test_compose.py:504–506` が所属と `USER` を黙って例外化する。実在の個人情報は見つからなかったが、全値規則は守られていない。姓を明白な模擬値にし、所属の標準語彙を使う例外は正本方針と拒否規則に明示的に整合させる。498〜503 行は PHP 全体から値を探すだけで、利用者間の入替を見逃すため、利用者・属性単位で構造比較する。 +3. **I3 — P2: S2 が仕様の 403 に対して HTTP 200 を許す。** `installer/acceptance/test_s2_rdmcp.py:104–110` は HTTP 200 を JSON 内の `http_status` に置き換える。SPEC-04 §5 の英和 S2 行は 403 を要求し、S3 と違い代替形式を許していない。実際の HTTP 403 を要求するか、スキップ解除前に英和仕様を変更する。現契約では「HTTP 200 内に 403」は不合格になることを検査する。 + +### その他の確認と限界 + +#23 の追跡 fetch と push は強制指定なし。公開→非公開→採用 PR、候補/COS の除外、private 専用スキップ、先端一致の無操作、衝突時 abort/終了 1 は模擬実行器で検査される。報告は選んだ名前/SHA/件数から構築し、`test_upstream.py:325–350,403–414` と grep で URL 不在を確認した。ただし実コマンドの生出力は stderr に流れるので、保存ミラー報告への保証であり全ログの保証ではない。SHA 読取(`upstream.py:126–129`)は最初の行を16進形式検査なしで信頼する。アーカイブ削除(244〜255 行)は拡張子を問わず日付名を対象にし、日付名のディレクトリでは失敗する。通常の `.json`/`.toon` ファイルに限定し境界例を検査するとよい。 + +workflow の action は40桁 SHA 固定で、認証情報は取得元読取/統合先書込と報告先書込の別プレースホルダ。実秘密はない。各部品が同じ latest/archive を書くため、全リポジトリの報告を残すには集約または部品別の保存先も必要。SPEC-05 は dry-run 中のローカル fetch・報告・merge を明記しており、リモートを書かない狭い意味では実装されるが、依頼の文字どおりの「副作用なし」ではない。 + +#24 の ePPN、affiliation、targeted ID、mail、o の OID は指定の期待値と一致。ADR-05 は四案と代償を記録し、英和の決定内容と SPEC-04 表は対応する。容量・起動時間の数値は PR 内に測定根拠のない見積り。fixtures README は二言語。Compose 試験は grdm-edge 上の 127.0.0.1 公開、読取専用マウント、既存の強化例外を検査する。実際の test_idp は古い Java 例外のため非 root/read_only が未適用で、F-3/F-4 に例外解除と専用イメージを明示的に延期している。準備段階の未完事項であり、基本対策の実動証拠ではない。F-1/F-2/F-5 も描画・秘密・機関設定を延期。S1 の 4401/文書フレーム0、S3 の明示拒否、S4 の401、S5 の SP 403/cookie なし/API 401 は概ね表と一致し、具体的な不一致は前述の S2。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Fast-forward | Advancing a branch without replacing its history. | 履歴を置き換えず枝を先へ進めること。 | +| Mock | Invented data used for a test. | 試験用の作り物のデータ。 | +| OID | A numeric name identifying an attribute. | 属性を識別する数字の名前。 | +| SAML | The message format used to pass a login result. | ログイン結果を渡す文書形式。 | +| Dry-run | A preview; its permitted local writes must be stated. | 予行。許されるローカル書込を明記する必要がある。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR23_PR25_r2.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR23_PR25_r2.md new file mode 100644 index 0000000..7750dae --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR23_PR25_r2.md @@ -0,0 +1,156 @@ +# REV PR23 and PR25 review r2 / PR23・PR25 レビュー r2 + +> **Summary:** PR #23 resolves U1–U4; the requested regression checks pass. PR #25 fixes the unsafe command examples but still needs an accurate staged security-gate explanation. +> **概要:** PR #23 は U1〜U4 を解消し、指定の回帰検査に合格。PR #25 は危険なコマンド例を修正したが、段階別セキュリティ門の説明に修正が残る。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** replacing a partial scan command is insufficient when its new explanation omits enforced milestone rules; retry tests must compare published state rather than local state. / 部分検査のコマンドを置き換えても、説明が実際に強制する節目の規則を省けば不十分であり、再試行の試験はローカル状態ではなく公開済み状態と比較する必要があると分かった。 +- Applies to: RCOSDP/RDM-developer-guide PR #23 and #25; reviewer REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-04](../spec/04_acceptance_tests.md) · [SPEC-05](../spec/05_upstream_tracking.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-02](../decisions/ADR-02_Network_Model.md) · [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md). +- Used by: [Environment guide](../guides/environment/README.md) · [Upstream status](../status/upstream/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Scope and verdicts + +A PR (pull request) is a proposed change. A SHA is the fingerprint of a saved revision. A worktree is a separate working copy. A security gate is a checkpoint that determines whether an installation may pass ([shared glossary](../reference/REF-01_Glossary.md)). + +- **PR #23: U1–U4 resolved; acceptable for the requested r2 scope.** Reviewed SHA `58f0d4d7dc374b1c24fd8d4d4337b28a624d46dd`. +- **PR #25: changes requested, P2 remaining.** Reviewed SHA `82f102ba844bdd7d5ea5144b62d2fda5c2894062`. + +These are review recommendations, not GitHub approvals. Remote reads used `gh`; no approval, merge, close, commit, push, or Docker state change was performed. The r1 records were read from the supplied sibling `wt-isha` checkout because they were not yet available through the develop contents API. File and line evidence below refers to the reviewed worktrees. The principal #23 implementation, tests, workflow and SPEC-02, and the #25 guide were byte-compared against GitHub contents at the stated SHAs and matched. + +Comments posted: [PR #23 r2](https://github.com/RCOSDP/RDM-developer-guide/pull/23#issuecomment-6667810457) · [PR #25 r2](https://github.com/RCOSDP/RDM-developer-guide/pull/25#issuecomment-6667810925). The repository documentation check including this record passed: 62 files, 8 exempt, 184 warnings. + +### PR #23: U1–U4 verification + +1. **U1 resolved.** `installer/grdm_dev/upstream.py`, `mirror_component`, takes `previous` and `to_publish` from origin (the published repository), resets local tracking references to that value, and deletes stale local references when origin lacks them. Independent FakeGit probes (a simulated Git command runner) with origin containing only develop produced: dry-run → real exits 0 → 0, one push, five origin references; failed first push → retry exits 70 → 0, two push attempts, five origin references. This explicitly covers the initially absent branch case as well as the submitted retry test with existing branches. +2. **U2 resolved.** `integrate_component` refuses both existing remote and local integration branches and uses `switch -c`, which cannot reset an existing branch. An independently injected local branch retained its SHA, returned 70, and caused no switch, checkout, merge or push call. Dry-run (a preview with the documented local operations) used detached HEAD, created no integration branch, and a subsequent real invocation succeeded. Detached HEAD means working at a revision without attaching changes to a named branch; local fetches, merge objects and reports remain permitted by SPEC-05. +3. **U3 resolved by source inspection.** The workflow template prepares a separate `status/` checkout before report generation and writes reports directly into that checkout. Existing reports on a second run therefore do not precede a branch switch. Upload uses `always()` and status publication uses `always() && inputs.dry_run != true`; a failed mirror can publish its failure report while the job remains failed. This was a control-flow review, not execution of a hosted Actions job or authenticated publication. Multiple components still share latest/archive destinations; aggregation and cross-repository publication races remain deployment limitations already noted in r1. +4. **U4 resolved.** `UPSTREAM_FAILED = 70`, both language messages in `messages.tsv`, `_fail`, SPEC-02 §6 and both SPEC-05 halves agree. Each SPEC-02 TOON block (a compact structured-text table) declares **14 rows and contains 14 rows**. English/Japanese code sequences match the 14 canonical message rows exactly; the new meanings correspond in both languages. Failure probes returned 70 with the canonical message; conflict and other failure cases passed the submitted tests. + +Run from the supplied `wt-upstream` root; bytecode creation was disabled to avoid incidental checkout writes: + +```sh +PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=installer python3 -m unittest discover -s installer/tests +``` + +```toon +validation[2]{check,total,skipped,result}: + installer-unit-tests,312,10,OK + spec02-exit-code-rows-per-language,14,0,match +``` + +The independent probes imported `FakeGit`, `UpstreamBase` and fixtures from `installer/tests/test_upstream.py`, used temporary directories and asserted command calls and final references. They did not contact or modify integration repositories. Unit tests do not prove live startup, authentication or hosted workflow execution. + +### PR #25: disposition of every r1 finding + +Both English and Japanese halves were checked against SPEC-02/03/04, ADR-02/03, `install.py`, `compose.py`, `health.py`, `scan.py`, `accept.py` and `README.legacy.md` in the supplied guide worktree. + +| r1 finding | r2 result in both languages | +|---|---| +| 25-01 | Partial: §3.8 now correctly uses unfiltered `scan`, labels subset flags, and gives 51/52; the new milestone explanation remains incomplete (R2-25-01). | +| 25-02 | Resolved: §3.7, security notes and troubleshooting distinguish plain health from `health --network`; installation uses the latter. | +| 25-03 | Resolved: doctor uses 10/11 correctly; render lists success 0 and failures 20/2/12, matching `compose.py:740–784`. | +| 25-04 | Resolved: §3 lists the actual nine-step sequence, conditionally initializes secrets, puts acceptance outside it, and shows doctor-only execution. | +| 25-05 | Resolved: §3.9 installs the acceptance extra and Chromium in the existing venv, then runs `accept --seed`; users live within that invocation, matching `accept.py:574–636`. Cleanup failure remains an implementation limitation, not a persistent preparatory seed step. | +| 25-06 | Resolved: §5 explains per-service hardening exceptions and links `manifest/hardening.json`; read-only roots are no longer promised universally. | +| 25-07 | Resolved: quick start and up use the reported URL; §6 starts the +100 port search from requested/saved values and preserves owned bindings, matching `compose.py:210–235`. | +| 25-08 | Resolved: header, quick-start caveat, build and troubleshooting agree that the digest-pinned fallback already exists until M4; full startup remains explicitly unverified. | +| 25-09 | Resolved: §7 uses the legacy guide's alias, local settings, overrides and image/module-volume setup, distinguishes internal/external URLs, and attributes default credentials to upstream Compose/SPEC-03 rather than legacy prose. | +| 25-10 | Substantially resolved: old version retained, parent/Used-by links supplied, one final bilingual glossary, macOS 14 corrected, new term explanations, seven-service outbound access and full-profile/`--egress none` examples corrected; first-use placement remains a P3 note (R2-25-02). | + +### Remaining findings for PR #25 + +**R2-25-01 / P2 — Complete the gate rule in §3.8 (guide lines 213 / 568).** Both halves say M4 fails on unlisted HIGH and M1–M3 findings are report-only with exit 0. ADR-03 §3 points 3–5 and SPEC-03 §5 require unlisted **CRITICAL as well as HIGH** to fail M4, and a non-growing allow-list at M2/M3. An allow-list is the recorded set of temporarily accepted findings. `scan.py:864–892` implements those constraints and also rejects malformed gate data. Independent calls to `gate_decision` rejected (a) M4 with one unlisted CRITICAL and (b) each of M2 and M3 with count 2 against baseline 1. These failed gates map to exit 50 when scanners run successfully. State both severities, the count constraint and the validity requirement; qualify the early-stage exit-0 statement. SPEC-02's short M4 row also says HIGH only, so copying that summary does not resolve its disagreement with ADR-03, SPEC-03 and the implementation. + +**R2-25-02 / P3 — Move short definitions to actual first use.** The quick-start caveats use profile and manifest at lines 34 / 389, while their explanations arrive in §3.2 at lines 123 / 478. The header also uses manifest earlier. SPEC-06 §3 asks for a first-use note. Put the short definitions at the early occurrence or link directly to a nearby explanation. This is a documentation polish item; the glossary now exists and the structural corrections are effective. + +Run from the supplied `docs-env-guide` worktree root: + +```sh +python3 tools/docs_check.py +``` + +Result: **PASSED, 59 files checked, 8 exempt, 165 warnings**. Warnings were not silently treated as zero findings. The checker does not establish semantic correctness of the gate explanation. No complete install, live scan, browser acceptance run or Docker operation was performed; those remain separate execution evidence. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 範囲と判定 + +PR は変更提案、SHA は保存した版を識別する指紋、worktree は別の作業コピー、セキュリティ門は導入を合格にできるか判断する検査である([共通用語集](../reference/REF-01_Glossary.md))。 + +- **PR #23: U1〜U4 解消。指定の r2 範囲では採用可能。** 対象 SHA は `58f0d4d7dc374b1c24fd8d4d4337b28a624d46dd`。 +- **PR #25: P2 が残り、修正要求。** 対象 SHA は `82f102ba844bdd7d5ea5144b62d2fda5c2894062`。 + +判定はレビュー上の推奨であり GitHub 承認ではない。リモートの読取は `gh` を使用し、承認・マージ・閉鎖・commit・push・Docker の状態変更はしていない。r1 記録は develop の contents API にまだ無かったため、指定場所の隣にある `wt-isha` から読んだ。根拠のファイル・行番号は対象 worktree に対応する。#23 の主要実装・試験・workflow・SPEC-02 と #25 のガイドは、明記した SHA の GitHub contents とバイト単位で一致した。 + +投稿済みコメント: [PR #23 r2](https://github.com/RCOSDP/RDM-developer-guide/pull/23#issuecomment-6667810457) · [PR #25 r2](https://github.com/RCOSDP/RDM-developer-guide/pull/25#issuecomment-6667810925)。この記録を含むリポジトリ文書検査も合格(62 ファイル、8 除外、184 警告)。 + +### PR #23: U1〜U4 の確認 + +1. **U1 解消。** `upstream.py` の `mirror_component` は公開先 origin の状態で `previous` と `to_publish` を決める。ローカル参照を公開済みの値に合わせ、公開先に無い参照は古いローカル値を削除する。FakeGit(Git コマンドを模擬する実行器)で origin を develop のみにした独立検査では、dry-run→本実行が終了 0→0、push 1 回、origin の参照 5 本。初回 push 失敗→再試行は終了 70→0、push 試行 2 回、参照 5 本。提出された既存ブランチの再試行試験に加え、初回の未作成ブランチでも確認した。 +2. **U2 解消。** `integrate_component` はリモート・ローカル双方の既存統合ブランチを拒否し、既存ブランチを戻せない `switch -c` を使う。独立検査で注入したローカルブランチの SHA は変わらず、終了 70、switch・checkout・merge・push は 0 回だった。dry-run(許可されたローカル操作を伴う予行)は detached HEAD(名前付きブランチに結び付けず版を作業対象にする状態)を使い、統合ブランチを作らず、その後の本実行は成功した。ローカル fetch、マージの保存物、報告の書込は SPEC-05 が許す操作として残る。 +3. **U3 はソース確認で解消。** workflow は報告生成前に独立した `status/` を用意し、その中へ直接報告を書く。二回目の既存報告がブランチ切替より前に生成される構造はなくなった。成果物保存は `always()`、status 公開は `always() && inputs.dry_run != true` なので、ミラー失敗時も報告を公開でき、ジョブは失敗のままになる。制御フローの確認であり、Actions 本番ジョブや認証付き公開の実行ではない。複数部品が latest/archive を共有する集約とリポジトリをまたぐ同時公開は、r1 で挙げた導入上の制約として残る。 +4. **U4 解消。** `UPSTREAM_FAILED = 70`、`messages.tsv` の英和メッセージ、`_fail`、SPEC-02 §6、SPEC-05 両言語が整合する。SPEC-02 の TOON(構造化データを短く書く形式)は英和とも **宣言 14 行、実数 14 行**。コード列は正本のメッセージ 14 行と完全一致し、新しい意味も英和で対応する。独立した失敗検査は正本文言付き終了 70、衝突を含む提出試験も成功した。 + +指定の `wt-upstream` のルートで実行した。付随する書込を避けるため Python バイトコード作成を無効にした。 + +```sh +PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=installer python3 -m unittest discover -s installer/tests +``` + +結果は **312 件、10 件スキップ、OK**。終了コードの照合は両言語とも 14 行一致。独立検査は `installer/tests/test_upstream.py` の FakeGit、UpstreamBase、試験データを読み込み、一時ディレクトリでコマンド呼出と最終参照を検査した。統合リポジトリには接続・変更していない。単体試験は実起動・認証・本番 workflow の証明ではない。 + +### PR #25: r1 全指摘の処置 + +英語と日本語の両方を、指定 worktree の SPEC-02/03/04、ADR-02/03、`install.py`、`compose.py`、`health.py`、`scan.py`、`accept.py`、`README.legacy.md` と照合した。 + +| r1 指摘 | 両言語の r2 結果 | +|---|---| +| 25-01 | 一部解消。§3.8 はフラグなし scan、限定フラグ、51/52 を正しく記述。ただし新しい段階別規則に不足(R2-25-01)。 | +| 25-02 | 解消。§3.7、注意点、障害対処で通常 health と health --network を区別し、自動導入は後者。 | +| 25-03 | 解消。doctor の 10/11、render の成功 0 と失敗 20/2/12 が compose.py:740–784 と整合。 | +| 25-04 | 解消。実際の 9 段、条件付き秘密生成、別手順の受入試験、doctor 単独実行を記載。 | +| 25-05 | 解消。§3.9 は既存 venv に追加依存と Chromium を準備して accept --seed を実行。利用者は同じ実行内で作成・削除され accept.py:574–636 と整合。削除失敗は実装上の制約であり、永続的な事前 seed 手順ではない。 | +| 25-06 | 解消。§5 はサービス別の堅牢化例外と hardening.json を示し、全サービスの読み取り専用ルートを約束しない。 | +| 25-07 | 解消。開始手順と up は報告 URL、§6 は要求値・保存値から +100 と自分の待受維持を説明し compose.py:210–235 と整合。 | +| 25-08 | 解消。ヘッダ・開始時の注意・ビルド・対処が、代替は設定済みで M4 まで維持と一致。完全起動の未検証も明示。 | +| 25-09 | 解消。§7 は旧ガイドにある別名、設定コピー、override、配布イメージとモジュールのボリュームを根拠に比較。内部/外部 URL を区別し、既定認証情報は上流 Compose/SPEC-03 に帰属。 | +| 25-10 | 概ね解消。旧版、親/Used-by リンク、末尾の用語集一つ、macOS 14、用語注、公開 7 サービスの外向き通信、full と --egress none の例を修正。初出位置は P3 として残る(R2-25-02)。 | + +### PR #25 の残る指摘 + +**R2-25-01 / P2 — §3.8 の門の規則を補完する(ガイド 213 / 568 行)。** 両言語は M4 を許容リスト外の HIGH、M1〜M3 を報告のみ・終了 0 と説明する。しかし ADR-03 §3 の 3〜5 項と SPEC-03 §5 は、M4 で **CRITICAL と HIGH の両方**、M2/M3 で許容リスト件数が増えないことを要求する。許容リストとは、一時的に認めた検出の記録一覧である。`scan.py:864–892` はこれらを実装し、門のデータが不正な場合も拒否する。`gate_decision` の独立検査では、M4 に許容外 CRITICAL 1 件、M2 と M3 それぞれに基準 1 件に対し 2 件を渡し、すべて不合格となった。スキャナーが正常に実行できた場合は終了 50 に対応する。両重大度、件数制約、データの有効性を記載し、初期段階の終了 0 を条件付きにする。SPEC-02 の短い M4 行も HIGH のみなので、その要約のコピーでは ADR-03・SPEC-03・実装との不一致は解消しない。 + +**R2-25-02 / P3 — 短い用語説明を本当の初出へ移す。** 開始時の注意 34 / 389 行に profile・manifest が登場するが、説明は §3.2 の 123 / 478 行までない。ヘッダにも manifest が先にある。SPEC-06 §3 は初出注を求めるため、先の位置に短い説明を置くか、近くの説明へ直接リンクする。文書の仕上げに関する指摘であり、用語集と構造の修正自体は有効である。 + +指定 `docs-env-guide` worktree のルートで実行した。 + +```sh +python3 tools/docs_check.py +``` + +結果は **PASSED、59 ファイル検査、8 除外、165 警告**。警告を指摘ゼロと扱ってはいない。この検査は門の説明の意味的な正しさを保証しない。完全導入・実スキャン・ブラウザ受入・Docker 操作は実施せず、別の実行証跡として残る。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Regression probe | A small check that repeats a previously failing situation. | 以前失敗した状況を繰り返す小さな検査。 | +| P2 / P3 | P2 needs correction before accepting; P3 is documentation polish. | P2 は採用前の修正、P3 は文書の仕上げ。 | +| Canonical | The authoritative source other copies must match. | 他の写しが一致すべき正本。 | +| CRITICAL / HIGH | Two separate severity categories for known weaknesses. | 既知の弱点の重大さを示す、別々の二段階。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR24_M3_Prep_r2.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR24_M3_Prep_r2.md new file mode 100644 index 0000000..ccfada0 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR24_M3_Prep_r2.md @@ -0,0 +1,107 @@ +# REV PR24 M3 preparation review r2 / PR24 M3 準備レビュー r2 + +> **Summary:** The three previous findings are resolved, and the author's Japanese attribute identifiers are correct. One new automated security-check failure still needs revision. +> **概要:** 前回の三指摘は解消し、日本語属性の識別子は著者の訂正が正しい。新たな自動セキュリティ検査の不合格一件は修正が必要。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** primary sources must settle identifier disputes, including errors introduced by a reviewer; a passing regression test can still fail the security gate. / 識別子の争いはレビュワ自身の誤りも含め一次資料で決着すべきで、回帰試験が成功してもセキュリティ検査には失敗し得ると分かった。 +- Applies to: [PR #24](https://github.com/RCOSDP/RDM-developer-guide/pull/24), `feat/m3-idp-prep`, SHA (commit identity / コミット識別子) `ae883a457e1815848edbace846bd02d836827fce`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r1](2026-11-06_RDM-developer-guide_PR23_PR24_r1.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-04](../spec/04_acceptance_tests.md) · [Shared glossary / 共通用語集](../reference/REF-01_Glossary.md). +- Used by: [Upstream status](../status/upstream/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Needs revision: R2-01, a failing CI (automated checks) gate.** I1–I3 are resolved for M3 preparation. This is a review judgment, not a GitHub approval. S1–S5 remain skipped acceptance designs; no live authentication or container execution was validated. + +### Independent source check and correction to r1 + +I independently searched and read the official [GakuNin technical application standard Ver. 2.6, Annex 1](https://www.gakunin.jp/sites/default/files/2024-03/gakunin_technical_application_standard_v2.6.pdf). Items 2, 4, 11, 13 and 15 identify the suffixes under `1.3.6.1.4.1.32264.1.1` as jaOrganizationName `.4` (friendlyName `jao`), jaOrganizationalUnitName `.5` (`jaou`), jaSurname `.1` (`jasn`), jaGivenName `.2`, and jaDisplayName `.3`. The OID (numeric attribute identifier) `1.2.392.200453.100.20.1` proposed in r1 is not supported by that standard and does not occur in its extracted text. **I retract that r1 recommendation.** The author's correction and ADR-05 §3.7 evidence are correct; r1's original `.1`/`.5` mapping was also incorrect. + +### Resolution of I1–I3 + +- **I1 resolved.** The IdP (login provider) explicitly maps all fixture attributes to wire names; the SP (receiver of the login result) has the matching 14 names. `saml20-idp-hosted.php.tmpl` generates identifiers before mapping, then applies `AttributeLimit` with `default => false`; `uid` is excluded. The targeted identifier uses `nameId => true` and `attributeencodings` set to `raw`, paired with `NameIDAttributeDecoder`. The pairwise identifier retains its own standard name and uses a scoped decoder. The test parses both configuration files, compares the name sets, checks the Japanese OIDs, encodings and decoder types, and verifies the intended filter configuration. This is a static contract check, not a captured SAML (login message) exchange. +- **I2 resolved.** Surnames are visibly `MOCK-USER`. ADR-05 §3.5, both fixture README language sections, and the fixture explicitly restrict the affiliation exception to four values. The test compares user/password keys and every attribute/value list structurally; swapped users' attributes no longer pass. It checks that the rejection user lacks `member` and the success user has it. This local test vocabulary is not a claim that every value is in the Ver. 2.6 GakuNin subset: Annex 1 item 7 lists faculty/staff/student/member; `affiliate` is used here to exercise rejection. +- **I3 resolved functionally.** S2 now requires actual HTTP (web response) status 401 and 403. The regression test rejects HTTP 200 with an embedded 403, ordinary 200, and 404. Its method of loading the helper creates R2-01. + +I additionally read upstream SimpleSAMLphp tag `v2.5.3.1` through the GitHub API: `AttributeMap` preserves unmapped attributes; `AttributeLimit` removes attributes outside its explicit list; `TargetedID` creates the NameID-valued attribute; `SubjectID` extracts the domain after `@`; `PairwiseID` writes `ATTR_PAIRWISE_ID`. The [hosted IdP reference](https://github.com/simplesamlphp/simplesamlphp/blob/v2.5.3.1/docs/simplesamlphp-reference-idp-hosted.md) documents the raw encoding. The tag is the inspected source version, not proof that the future image has been pinned or run. + +### Remaining finding + +**R2-01 — P2 (fix before acceptance): new S2 regression test fails the security gate.** `installer/tests/test_compose.py:649` executes an extracted syntax-tree function with `exec(compile(...), ns)`. [Semgrep job 127494009322](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42098283699/job/127494009322) reports `python.lang.security.audit.exec-detected.exec-detected` at this exact line and exits 1. This is a real failing check, not evidence of attacker-controlled execution: the input is the repository's own acceptance module. Move the dependency-free status helper into an importable module shared by acceptance and unit tests, and import it normally. Preserve the negative tests and rerun the unit suite and CI. Do not weaken the global security gate. + +### Validation and limits + +Run from the supplied `scratchpad/wt-m3` root; its branch reference matched the reviewed SHA. Both commands exited 0: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 tools/docs_check.py +``` + +The unit suite ran 298 tests with 10 skipped. The documentation checker passed 62 files, exempted 8 and reported 166 warnings. These are results for the supplied PR worktree, before adding this review record to the coordinator checkout. + +The post-push check used: + +```sh + gh pr checks 24 --repo RCOSDP/RDM-developer-guide +``` + +Its final result was five passed checks (links, documentation build, manifest/private-URL policy, secret scan and report-only filesystem scan), with Semgrep failed. The failure log was retrieved with `gh run view 42098283699 --repo RCOSDP/RDM-developer-guide --log-failed`. + +Follow-ups F-1–F-5, actual attribute exchange with the built SP, the image/version pin, rendering, secrets, institution login routing and removal of existing hardening exceptions remain M3 work. No production files, commits, pushes, approvals, merges, issue closures or Docker state changes were made by this review. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**修正要求: R2-01、CI(自動検査)の不合格。** I1〜I3 は M3 準備として解消した。これはレビュー判定であり GitHub の承認操作ではない。S1〜S5 はスキップ付き受入設計であり、認証やコンテナの実動は検証していない。 + +### 一次資料の独立確認と r1 の訂正 + +公式の[学認技術運用基準 Ver. 2.6 別添1](https://www.gakunin.jp/sites/default/files/2024-03/gakunin_technical_application_standard_v2.6.pdf)を独立に検索し読んだ。項目2・4・11・13・15では、`1.3.6.1.4.1.32264.1.1` 配下で jaOrganizationName は `.4`(friendlyName `jao`)、jaOrganizationalUnitName は `.5`(`jaou`)、jaSurname は `.1`(`jasn`)、jaGivenName は `.2`、jaDisplayName は `.3`。r1 で提案した OID(属性を識別する番号)`1.2.392.200453.100.20.1` は基準に根拠がなく、抽出テキストにも出現しない。**r1 の当該推奨を撤回する。** 著者の訂正と ADR-05 §3.7 の根拠は正しく、修正前の `.1`/`.5` の割当ても誤りだった。 + +### I1〜I3 の解消 + +- **I1 解消。** IdP(ログイン提供側)が模擬属性を送信名へ明示的に変換し、SP(ログイン結果を受け取る側)も同じ14名を定義する。`saml20-idp-hosted.php.tmpl` は識別子生成→名前変換→`default => false` の `AttributeLimit` の順で、`uid` を除外する。targeted identifier は `nameId => true` と `raw` の `attributeencodings`、受信側は `NameIDAttributeDecoder`。pairwise identifier は標準の名前を保持し、scope を扱う decoder を使う。試験は両設定を構文解析して送受信名集合、日本語 OID、符号化、decoder 型、フィルタ設定を検査する。これは静的な契約検査で、SAML(ログイン結果の文書)の実送受信ではない。 +- **I2 解消。** 姓は `MOCK-USER`。ADR-05 §3.5、英和の fixture README、fixture の全てが所属語彙の例外を四値に明示限定する。試験は利用者/パスワードのキーと属性・値の一覧を構造比較し、利用者間の属性入替を見逃さない。拒否用利用者に `member` がなく、成功用にあることも検査する。このローカル試験用語彙を Ver. 2.6 学認の部分集合と同一視しない。別添1項目7は faculty/staff/student/member を列挙し、ここでの `affiliate` は拒否試験に使う。 +- **I3 は機能上解消。** S2 は HTTP(Web 応答)の実ステータス401・403を要求する。回帰試験は内部データに403を含む200、通常の200、404を拒否する。ただし補助関数の読み込み方法が R2-01 を発生させた。 + +さらに GitHub API で SimpleSAMLphp のタグ `v2.5.3.1` を確認した。`AttributeMap` は未対応属性を保持し、`AttributeLimit` は明示一覧以外を除外する。`TargetedID` は NameID 型属性を生成し、`SubjectID` は `@` 後のドメインを抽出、`PairwiseID` は `ATTR_PAIRWISE_ID` に出力する。[IdP 設定リファレンス](https://github.com/simplesamlphp/simplesamlphp/blob/v2.5.3.1/docs/simplesamlphp-reference-idp-hosted.md)にも raw 符号化が記載される。これは確認したソースの版であり、将来のイメージが固定・実行済みという意味ではない。 + +### 残る指摘 + +**R2-01 — P2(採用前に修正): S2 回帰試験がセキュリティ検査を失敗させる。** `installer/tests/test_compose.py:649` が抽出した構文木の関数を `exec(compile(...), ns)` で実行する。[Semgrep job 127494009322](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42098283699/job/127494009322) は同じ行で `python.lang.security.audit.exec-detected.exec-detected` を報告し終了1となった。実際の検査不合格であるが、入力はリポジトリ自身の受入モジュールであり、攻撃者による実行の証拠ではない。依存のないステータス検査関数を受入・単体試験で共有する通常 import 可能なモジュールへ移し、否定例を維持して単体試験と CI を再実行する。全体の検査規則は弱めない。 + +### 検証と限界 + +指定された `scratchpad/wt-m3` のルートで英語節の二コマンドを実行した。ブランチ参照はレビュー対象 SHA と一致した。いずれも終了0で、単体試験298件・スキップ10件、文書検査は62ファイル成功・8除外・166警告だった。これはコーディネータ側へレビュー記録を追加する前の PR 作業場所での結果である。 + +push 後の `gh pr checks 24 --repo RCOSDP/RDM-developer-guide` は最終的に5件成功(リンク、文書ビルド、manifest/非公開URL方針、秘密検査、報告専用のファイル検査)、Semgrep が不合格。英語節の `gh run view` コマンドで失敗ログも取得した。 + +後続 F-1〜F-5、構築した SP との実送受信、イメージ/版固定、設定生成、秘密情報、機関ログイン経路、既存の強化例外解除は M3 の作業として残る。このレビューでは製品ファイルの変更、commit、push、承認、merge、Issue の終了、Docker の状態変更は行っていない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Fixture | Invented input for a repeatable test. | 繰り返せる試験に使う作り物の入力。 | +| Wire name | The attribute name actually sent between services. | サービス間で実際に送る属性名。 | +| Decoder | A component that reads a received value. | 受け取った値を読み取る部品。 | +| Semgrep | A tool that searches source code for suspect patterns. | ソースコードから注意が必要な形を探す道具。 | +| Regression test | A test preventing a fixed error from returning. | 修正済みの誤りが戻らないようにする試験。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR24_M3_Prep_r3.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR24_M3_Prep_r3.md new file mode 100644 index 0000000..d640b24 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR24_M3_Prep_r3.md @@ -0,0 +1,93 @@ +# REV PR24 M3 preparation review r3 / PR24 M3 準備レビュー r3 + +> **Summary:** R2-01 is resolved and all six automated checks pass. The updated head has a reproducible unit-test failure, so revision is still required. +> **概要:** R2-01 は解消し、自動検査6件は成功した。更新された先端で単体試験の失敗が再現するため、引き続き修正を要求する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** a green security gate does not prove the local unit suite passes after integrating other changes. / 他の変更を統合した後は、セキュリティ検査の成功だけでローカル単体試験の成功を判断できない。 +- Applies to: [PR #24](https://github.com/RCOSDP/RDM-developer-guide/pull/24), `feat/m3-idp-prep`, SHA (commit identity / コミット識別子) `4d1826e467188fe2797fc1ff2d6660112b6883bf`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r2](2026-11-06_RDM-developer-guide_PR24_M3_Prep_r2.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Shared glossary / 共通用語集](../reference/REF-01_Glossary.md). +- Used by: [Upstream status](../status/upstream/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and resolution + +**Needs revision: R3-01. R2-01 is resolved.** This is a review judgment, not a GitHub approval. The review targets the helper extraction and requested verification; it does not repeat the completed r2 attribute review or certify live authentication. + +Commit `805cabed071cb65bd594638e23597e3dcf21af78` moves `transport_status_must_be` unchanged into `acceptance.netguard`, a module that needs only Python's standard library. The acceptance test and unit test import it normally. The tests retain acceptance of HTTP (web response) statuses 401/403 and rejection of status 200 with embedded 403, ordinary 200, 404, and non-JSON 200. No dynamic `exec` or built-in `compile` call remains in the searched test directories. The four remaining `re.compile` calls in acceptance files build text patterns, not executable Python. + +The head changed during review from `19d0461` to `4d1826e` after integration of `develop`. I checked the three helper-related files plus the manifest data, loader and failing test against the exact remote head using the GitHub API (a programmatic way to read GitHub); all six matched byte for byte. + +### R3-01 — P2: full unit suite fails on the integrated head + +`installer/tests/test_manifest.py:60`, `ManifestLoadTests.test_build_sha_prefers_public_merged_upstream`, assumes WaterButler's build identity equals the merged public upstream identity. The current manifest has `integration_sha`; `installer/grdm_dev/manifest.py:116` correctly prioritizes that explicit identity. Actual: `e9b1ac266374d4f477083b327d9620badfc15ad9`; expected by the stale test: `004f407fefb071f1dc924d09f99916b1d5ea3561`. The failure reproduces both in the complete suite and the manifest-only suite. It arrived with the integrated manifest state and is unrelated to the helper extraction, but prevents reporting this head's unit suite as passing. + +Update the test to cover explicit integration priority and public/private fallback with controlled fixtures (test input data), instead of assuming the live manifest lacks an integration identity. Rerun the full suite. Do not change the correct loader priority merely to satisfy the old expectation. + +### Validation and limits + +Commands ran in the supplied `scratchpad/wt-m3` root: + +```sh +rg -n '\b(exec|compile)\s*\(' installer/tests installer/acceptance +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +PYTHONPATH=installer python3 -m unittest discover -s installer/tests -p test_manifest.py +python3 -m py_compile installer/acceptance/*.py +python3 tools/docs_check.py +gh pr checks 24 --repo RCOSDP/RDM-developer-guide +``` + +The final full run executed 320 tests with one failure and 10 skips (exit 1). The manifest-only run executed 17 tests with the same one failure (exit 1). Compilation succeeded (exit 0). Documentation validation passed 66 files, exempted 8 and reported 193 warnings before adding this review. The initial 298-test run overlapped the branch update and failed its documentation-wrapper test; a subsequent standalone documentation check passed, so that initial run is not treated as stable-head evidence. + +CI (automated checks) passed all six checks on `4d1826e`: links, documentation build, manifest/private-URL policy, secret scan, Semgrep (security pattern checking), and the report-only filesystem scan. Both workflow runs identify that exact head: [documentation run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42099269258) and [security run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42099269059). [Semgrep job](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42099269059/job/127497448989) passed in 42 seconds. These checks do not erase the independently observed unit failure. + +S1–S5 remain skipped acceptance designs; live authentication and container execution were not tested. The r2 M3 follow-ups remain. No implementation edits, commits, pushes, approvals, merges, closures or Docker state changes were made. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と解消 + +**修正要求: R3-01。R2-01 は解消。** これはレビュー判定で、GitHub の承認操作ではない。補助関数の切り出しと指定検証を対象とし、完了済みの r2 属性レビューの再実施や実認証の保証はしない。 + +コミット `805cabed071cb65bd594638e23597e3dcf21af78` は `transport_status_must_be` を内容を変えず、Python 標準機能だけに依存する `acceptance.netguard` へ移した。受入試験と単体試験は通常の import で読み込む。HTTP(Web 応答)の401/403を受け入れ、内部に403を持つ200、通常の200、404、JSON形式でない200を拒否する試験を維持した。検索した試験ディレクトリには動的な `exec` や組み込み `compile` の呼出しは残らない。受入ファイルに残る4件の `re.compile` は文字列パターンを作り、Pythonコードを実行しない。 + +レビュー中に `develop` が統合され、先端が `19d0461` から `4d1826e` に変わった。補助関数関連3ファイルと、manifestデータ・読込処理・失敗した試験を GitHub API(プログラムからGitHubを読む仕組み)で厳密な先端と比較し、6ファイルすべてのバイト一致を確認した。 + +### R3-01 — P2: 統合後の先端で単体試験全体が不合格 + +`installer/tests/test_manifest.py:60` の `ManifestLoadTests.test_build_sha_prefers_public_merged_upstream` は、WaterButler のビルド識別子が統合済み公開上流の識別子と同じと仮定する。現在のmanifestには `integration_sha` があり、`installer/grdm_dev/manifest.py:116` は正しくその明示値を優先する。実値は `e9b1ac266374d4f477083b327d9620badfc15ad9`、古い試験の期待値は `004f407fefb071f1dc924d09f99916b1d5ea3561`。全体実行とmanifest試験単独の両方で再現した。統合されたmanifest状態によるもので補助関数の切り出しとは無関係だが、この先端の単体試験を成功とは報告できない。 + +固定したfixture(試験用入力データ)で、明示された統合識別子の優先と公開・非公開上流への代替選択を検査するよう試験を更新し、全体を再実行する。現在のmanifestに統合識別子がないと仮定しない。古い期待値に合わせて正しい読込優先順位を変更しない。 + +### 検証と限界 + +指定された `scratchpad/wt-m3` ルートで英語節のコマンドを実行した。最後の全体実行は320件、失敗1件、スキップ10件(終了1)。manifest単独は17件、同じ失敗1件(終了1)。構文確認は成功(終了0)。文書検査はこのレビュー追加前に66ファイル成功、8除外、193警告。最初の298件の実行はブランチ更新と重なり文書検査のラッパー試験で失敗したが、その後の文書検査単独は成功したため、初回は安定した先端の検証結果として扱わない。 + +CI(自動検査)は `4d1826e` で6件すべて成功した。対象はリンク、文書ビルド、manifest/非公開URL方針、秘密検査、Semgrep(危険なコードの形を探す検査)、報告専用のファイル検査。[文書の実行記録](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42099269258)と[セキュリティの実行記録](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42099269059)の双方で同じ先端を確認した。[Semgrepのジョブ](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42099269059/job/127497448989)は42秒で成功。ただし、独立に観測した単体試験の失敗は残る。 + +S1〜S5 はスキップ付き受入設計であり、実認証やコンテナの実行は未検証。r2 のM3後続作業は残る。実装変更、コミット、push、承認、マージ、閉鎖、Docker状態変更は行っていない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| SHA | Identity of a saved code revision. | 保存したコードの版を識別する値。 | +| CI | Automatic checks run after a change. | 変更後に自動で行う検査。 | +| HTTP status | The response number sent by a web server. | Webサーバーが返す応答番号。 | +| Fixture | Controlled input used by a test. | 試験に使う固定した入力。 | +| Semgrep | A tool that finds selected patterns in code. | コードから指定のパターンを探す道具。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR24_M3_Prep_r4.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR24_M3_Prep_r4.md new file mode 100644 index 0000000..ab26290 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR24_M3_Prep_r4.md @@ -0,0 +1,143 @@ +# REV PR24 M3 preparation review r4 / PR24 M3 準備レビュー r4 + +> **Summary:** R3-01 is resolved. The complete local unit suite and all eight automated checks pass; earlier fixes remain intact. +> **概要:** R3-01 は解消。ローカル単体試験全体と自動検査8件が成功し、過去の修正も維持されている。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** testing selection precedence and running the suite in CI prevents an integration pin from invalidating an obsolete expectation. / 選択優先順位の試験と CI での全体実行により、統合先の固定値が古い期待値を無効にする問題を検出できる。 +- Applies to: [PR #24](https://github.com/RCOSDP/RDM-developer-guide/pull/24), `feat/m3-idp-prep`, SHA (saved revision identifier / 保存した版の識別子) `76d8bbb55018a83d3681e1c2dccc91fe50a6b9a9`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r3](2026-11-06_RDM-developer-guide_PR24_M3_Prep_r3.md) · [r2](2026-11-06_RDM-developer-guide_PR24_M3_Prep_r2.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Shared glossary / 共通用語集](../reference/REF-01_Glossary.md). +- Used by: [Upstream status](../status/upstream/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Acceptable for M3 preparation: no blocking findings. R3-01 is resolved; I1–I3 and R2-01 remain resolved.** This is a review judgment, not a GitHub approval. Live authentication remains outside this preparation review. + +### Evidence and regression review + +[PR #26](https://github.com/RCOSDP/RDM-developer-guide/pull/26) is merged, with merge commit `1a3baba609d2a1b98c259a028cb761418dec160c`. The comparison from r3 head `4d1826e` to the reviewed head changes only the unit-test workflow, `installer/tests/test_manifest.py`, and three review records. No M3 implementation or existing regression test changed in that comparison. + +**R3-01:** `test_build_sha_precedence_integration_sha_then_public_then_private` replaces the stale expectation. It checks the explicit integration value, then clears integration values in a copied manifest (component configuration) and checks both the merged public WaterButler identity and the merged private OASys identity. The correct loader priority is unchanged. The copied inputs still depend on the repository manifest; they are not fully independent fixed fixtures (controlled test inputs). + +**I1:** The passing contract test still compares all emitted IdP (login provider) names with SP (login receiver) names, checks Japanese identifiers, targeted-identifier raw encoding and decoder types, and verifies generation, mapping and filtering with `uid` excluded. The r2 correction of the Japanese identifier recommendation remains valid; no new external-source audit was needed for these unchanged files. + +**I2:** Structural comparison still checks each mock user's credentials and attributes. Visible mock values, the four-value affiliation exception, and success/rejection membership checks remain covered. + +**I3 / R2-01:** S2 still requires actual HTTP status (web response number) 401/403. Its normally imported `acceptance.netguard` helper rejects 200 with embedded 403, ordinary 200, 404 and non-JSON 200. Searching the test directories found no dynamic `exec` or built-in `compile`; the four `re.compile` calls only build text patterns. Semgrep (code-pattern security checking) passes. + +Eleven local files matched the exact remote head byte for byte using `gh api`: the manifest test, loader, manifest data, unit workflow, compose tests, netguard, S2, hosted IdP template, SP attribute map, authentication-source template and mock-user fixture. + +### Validation + +Commands ran in the supplied `scratchpad/wt-m3` root. Expected outcomes are `OK` and all checks passing: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +gh pr checks 24 --repo RCOSDP/RDM-developer-guide +gh run view 42101447467 --repo RCOSDP/RDM-developer-guide --json headSha,conclusion,jobs +python3 tools/docs_check.py +``` + +Observed results use TOON (compact structured text); they are observations, not a canonical data-file excerpt: + +```toon +local_installer: + tests: 320 + failures: 0 + errors: 0 + skipped: 10 + exit: 0 +ci: + passed: 8 + failed: 0 + python_versions: "3.11, 3.12" +``` + +CI (automated checks) passed documentation build, links, manifest/private-URL policy, secret scan, Semgrep, the report-only filesystem scan, and both Unit tests jobs. [Unit-test run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42101447467) reports success and the exact reviewed head; both jobs successfully ran installer tests, tools tests and package installation checks. Hosted pull-request checkout checks the proposed merge with the base branch. [Documentation run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42101447445) and [security run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42101447635) supply the other six checks. + +Documentation validation after adding this review passed: 69 files checked, 8 exempt, 199 warnings, exit 0. + +### Limits and remaining work + +Ten skipped unit tests and the skipped S1–S5 acceptance designs do not demonstrate live authentication. The r2 M3 follow-ups remain: image/version pinning, rendering, secrets, actual attribute exchange, institution login routing and removal of hardening exceptions. No implementation edits, commits, pushes, approvals, merges, closures or Docker state changes were performed. Recording this review in version control and deciding subsequent integration remain with the coordinator. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**M3 準備として受入可能。阻害指摘なし。R3-01 は解消し、I1〜I3/R2-01 も解消を維持。** これはレビュー判定であり、GitHub の承認操作ではない。実認証は今回の準備レビューの対象外。 + +### 根拠と回帰確認 + +[PR #26](https://github.com/RCOSDP/RDM-developer-guide/pull/26) は統合済みで、マージコミットは `1a3baba609d2a1b98c259a028cb761418dec160c`。r3 の先端 `4d1826e` と対象先端との差分は、単体試験ワークフロー、`installer/tests/test_manifest.py`、レビュー記録3件のみ。M3 の実装と既存の回帰試験はこの比較で変更されていない。 + +**R3-01:** 古い期待値は `test_build_sha_precedence_integration_sha_then_public_then_private` に置換された。明示された統合先の値を検査し、複製した manifest(部品構成)で統合先の値を消してから、WaterButler の統合済み公開上流と OASys の統合済み非公開上流の双方を検査する。正しい読込優先順位は変わらない。複製入力は実manifestに依存し、完全に独立した固定fixture(試験用入力)ではない。 + +**I1:** 成功した契約試験は、IdP(ログイン提供側)と SP(ログイン受信側)の属性名集合、日本語識別子、targeted identifier の raw 符号化と decoder 型を引き続き検査する。識別子生成・名前変換・属性制限と `uid` の除外も確認する。r2 の日本語識別子推奨の訂正は有効であり、変更のないファイルについて外部一次資料の再調査は行っていない。 + +**I2:** 利用者ごとの認証情報と属性の構造比較を維持する。模擬値と分かる表記、所属語彙の四値限定例外、成功用・拒否用利用者の所属確認も試験されている。 + +**I3/R2-01:** S2 は実際の HTTP ステータス(Web応答番号)401/403を要求する。通常の import で読み込む `acceptance.netguard` の補助関数は、内部に403を含む200、通常の200、404、JSON形式でない200を拒否する。試験ディレクトリの検索で動的 `exec` や組み込み `compile` はなく、4件の `re.compile` は文字列パターンの生成のみ。Semgrep(危険なコードの形を探す検査)も成功。 + +ローカル11ファイルを `gh api` で厳密な対象先端とバイト照合した。対象はmanifest試験・読込処理・データ、単体試験ワークフロー、compose試験、netguard、S2、hosted IdPテンプレート、SP属性対応表、認証情報テンプレート、模擬利用者fixture。 + +### 検証 + +指定された `scratchpad/wt-m3` ルートで次を実行した。期待結果は `OK` と全検査成功。 + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +gh pr checks 24 --repo RCOSDP/RDM-developer-guide +gh run view 42101447467 --repo RCOSDP/RDM-developer-guide --json headSha,conclusion,jobs +python3 tools/docs_check.py +``` + +実測結果を TOON(短い構造化テキスト)で示す。正本データファイルの写しではない。 + +```toon +local_installer: + tests: 320 + failures: 0 + errors: 0 + skipped: 10 + exit: 0 +ci: + passed: 8 + failed: 0 + python_versions: "3.11, 3.12" +``` + +CI(自動検査)は文書構築、リンク、manifest/非公開URL方針、秘密検査、Semgrep、報告専用ファイル走査、Unit testsの2件がすべて成功。[単体試験の実行記録](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42101447467) は対象先端と一致し、成功を報告している。両ジョブともinstaller試験、tools試験、パッケージ導入検査を成功した。ホスト側のpull-request checkoutはベースとの仮マージを検査する。[文書実行記録](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42101447445)と[セキュリティ実行記録](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42101447635)が残り6件の根拠。 + +この記録追加後の文書検査は成功。69ファイル検査、8除外、199警告、終了0。 + +### 限界と残作業 + +単体試験のスキップ10件と、スキップ付きのS1〜S5受入設計は実認証の証明ではない。r2 のM3後続作業であるイメージ/版の固定、設定生成、秘密情報、属性の実送受信、機関ログイン経路、堅牢化例外の除去は残る。実装変更、commit、push、承認、merge、close、Docker状態変更は行っていない。記録の版管理への追加と後続の統合判断は連携調整側に残る。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| SHA | Identifier of a saved revision. | 保存した版の識別子。 | +| CI | Automatic checks triggered by changes. | 変更をきっかけとする自動検査。 | +| IdP / SP | Login provider / receiver. | ログインの提供側/受信側。 | +| Fixture | Controlled input for a test. | 試験に使う入力データ。 | +| HTTP status | Web server response number. | Webサーバーの応答番号。 | +| TOON | Compact structured text for data. | データを短く表す構造化テキスト。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR25_Environment_Guide_r3.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR25_Environment_Guide_r3.md new file mode 100644 index 0000000..e809b55 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR25_Environment_Guide_r3.md @@ -0,0 +1,74 @@ +# REV Environment guide review r3 / 環境ガイドレビュー r3 + +> **Summary:** The two requested milestone thresholds are corrected in both languages, but the gate explanation still omits mandatory validity and red-team conditions. Changes requested; first-use notes remain a minor issue. +> **概要:** 指摘した二つの段階別しきい値は日英とも修正されたが、門の説明には必須のデータ有効性・攻撃検証の条件が残る。修正要求。初出注も軽微な残件。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** correct severity thresholds alone do not describe all mandatory gate conditions, and a passing text checker does not prove first-use placement or translation parity. / 重大度のしきい値だけ正しくても必須条件を網羅できず、文書検査の成功だけでは初出位置と翻訳の対応を証明できないと分かった。 +- Applies to: [PR #25](https://github.com/RCOSDP/RDM-developer-guide/pull/25) (a proposed change / 変更提案), revision `8b73ff0615dbdd5c5705c534bfb89de1870cd557`; reviewer REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r2 record](2026-11-06_RDM-developer-guide_PR23_PR25_r2.md) · [SPEC-03](../spec/03_security_gate.md) · [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Environment guide](../guides/environment/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and evidence + +**Changes requested (P2: correct before acceptance).** The security gate (the checkpoint deciding whether a run passes) in guide §3.8, lines 213 and 568, now names both HIGH and CRITICAL (two levels of weakness severity) at M4 and the non-increasing allow-list (temporary accepted findings) count. These two parts of R2-25-01 are resolved and agree between English and Japanese and with SPEC-03 §5 / ADR-03 §3. + +**R3-25-01 / P2 — Complete the remaining gate conditions in both paragraphs.** R2-25-01 explicitly requested a validity condition, which is still absent. SPEC-03 §5.1 rule 1 requires malformed entries to fail with exit 50 even at M1; `installer/grdm_dev/scan.py:868–881` also rejects unreadable gate data. Qualify early-stage exit 0 on valid gate data and passing baseline controls. State that count enforcement starts at M2 (SPEC-03 §5.2; `scan.py:52–57,881`), rather than making the current M1 count behavior ambiguous. Also distinguish the AI red team (authorized attack testing of an isolated system) from its preflight (a readiness check): SPEC-03 §5.2 requires an actual first run and fixed or accepted paths at M4, and zero unresolved intrusion paths plus no HIGH/CRITICAL allow-list entries at M5; ADR-03 §3.5 confirms the M5 requirements. The guide mentions only a passing M5 preflight and current findings, which cannot establish those outcomes. Add the conditions or explicitly separate the implemented scan checks from milestone acceptance requirements. + +**R2-25-02 / P3 (minor wording issue) remains.** The English body adds useful explanations for the requested terms, but profile and manifest are still unexplained at lines 34 / 389 (manifest also occurs in header line 8), with definitions deferred to lines 123 / 478. GakuNin (Japan's academic identity federation) and ember-osf-web (the browser interface) also occur in the header before the new body notes. Port (a numbered listening endpoint) first occurs at line 32, while its note appears at line 320 as the malformed phrase `Port (a numbered door a program listens on)s`. Container (a box holding a program and its dependencies) is explained at line 302, after earlier plural uses. Move notes to actual first use and fix that plural. Most added English explanations have no matching Japanese note; for example lines 24/379, 39/394, 48/403, 137/492 and 169/524. Operational gate wording has parity; explanatory notes do not yet have full parity under SPEC-06 §2–3. + +### Validation and limits + +The local guide was byte-compared with the remote file at the reviewed revision using `gh api` and matched. Remote access used `gh` only. Run from `/Users/komiyama/orca/workspaces/RDM-developer-guide/docs-env-guide`: + +```sh +python3 tools/docs_check.py --all-warnings +``` + +Before adding this record: **PASSED**, 60 files checked, 8 exempt, 158 warnings. Exactly two warnings remain for the guide: line 34, `Docker` (the tool that runs program containers), and line 318, `Port`. These are checker results, not a complete inventory of first-use issues; the checker examines the English half with a heuristic. + +```sh +gh pr checks 25 --repo RCOSDP/RDM-developer-guide +``` + +All six CI (automatic checks on submitted changes) checks passed: site build, links, manifest/private-URL policy, secret scan, static analysis, and filesystem vulnerability scan. Evidence: [documentation run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42098734680) and [security run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42098734830). No live installation, scan, attack test, or container state change was performed. This verdict is a review recommendation, not a platform approval; no approval, merge, close, commit or push was performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と根拠 + +**修正要求(P2:採用前に修正)。** ガイド §3.8、213 / 568 行のセキュリティ門(実行を合格にするか判断する検査)は、M4 の HIGH と CRITICAL(弱点の重大さの二段階)、許容リスト(一時的に認めた検出の一覧)の件数非増加を明記した。R2-25-01 のこの二点は解消し、英和および SPEC-03 §5 / ADR-03 §3 と整合する。 + +**R3-25-01 / P2 — 両段落に残る門の必須条件を補完する。** R2-25-01 が明示的に求めたデータ有効性の条件は未記載。SPEC-03 §5.1 第1項は不正な項目を M1 でも終了50とし、`installer/grdm_dev/scan.py:868–881` も読めない門データを拒否する。初期段階の終了0を、データが有効で基本対策に合格した場合に限定する。件数の強制は M2 からと明記し、現行 M1 の動作を曖昧にしない(SPEC-03 §5.2、`scan.py:52–57,881`)。さらに AI レッドチーム(隔離環境で許可を受けて行う攻撃検証)と事前確認(実施準備の検査)を区別する。SPEC-03 §5.2 は M4 で初回の実検証と発見経路の修正または許容、M5 で未解決侵入経路ゼロと HIGH/CRITICAL の許容項目ゼロを要求し、ADR-03 §3.5 も M5 の条件を確認している。ガイドは M5 の事前確認合格と現在の検出だけを挙げ、それだけでは要求結果を証明できない。条件を補記するか、実装済み scan の検査と節目の受入条件を明確に分ける。 + +**R2-25-02 / P3(軽微な文言課題)は継続。** 英語本文の用語説明は増えたが、34 / 389 行の profile・manifest は未説明(manifest はヘッダ8行にも登場)で、定義は123 / 478行までない。GakuNin(日本の学術認証連携)と ember-osf-web(ブラウザ画面)も本文注より前にヘッダに登場する。Port(プログラムが待ち受ける番号)は32行が初出だが、320行の注は `Port (a numbered door a program listens on)s` と不自然な複数形になっている。Container(プログラムと必要なものを入れる箱)の説明は302行で、それ以前に複数形がある。実際の初出へ移し、複数形を直す。追加された英語の注の多くは対応する日本語注を欠く(例:24/379、39/394、48/403、137/492、169/524行)。門の動作説明は英和一致するが、説明注は SPEC-06 §2–3 の完全な対応に至っていない。 + +### 検証と限界 + +指定作業コピーのガイドは、対象版のリモートファイルを `gh api` で取得し、バイト単位で一致した。リモート操作は `gh` のみ。英語側に示した作業ディレクトリで `python3 tools/docs_check.py --all-warnings` を実行し、この記録の追加前は **合格、60ファイル、8除外、158警告**。対象ガイドの警告は34行 `Docker`(プログラムの箱を動かす道具)、318行 `Port` の **2件**。これは検査器の結果であり、初出問題の全件数ではない。検査器は英語部分を簡易的な判定で調べる。 + +`gh pr checks 25 --repo RCOSDP/RDM-developer-guide` では CI(変更を自動検査する仕組み)の6件すべて成功。サイト生成、リンク、部品一覧・非公開URL方針、秘密検査、静的解析、ファイル脆弱性検査を確認した。証跡は [文書検査](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42098734680) と [セキュリティ検査](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42098734830)。実導入・実スキャン・攻撃検証・コンテナ状態変更は未実施。判定はレビュー上の推奨であり、承認操作ではない。承認・マージ・閉鎖・commit・push は行っていない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Milestone | A numbered stage of the plan. | 計画の番号付きの節目。 | +| Baseline controls | Minimum protections required at every stage. | 全段階で必要な最低限の保護。 | +| Preflight | A readiness check before an actual test. | 実検証の前に準備を確認する検査。 | +| Parity | Both language versions convey the same information. | 両言語が同じ情報を伝えること。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR25_Environment_Guide_r4.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR25_Environment_Guide_r4.md new file mode 100644 index 0000000..c5a7f4e --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR25_Environment_Guide_r4.md @@ -0,0 +1,114 @@ +# REV Environment guide review r4 / 環境ガイドレビュー r4 + +> **Summary:** The remaining gate conditions and the requested first-use explanations are corrected in both languages. No outstanding findings in this re-review; recommended for acceptance. +> **概要:** 残っていた門の条件と、指摘対象の初出説明は日英とも修正済み。今回の再レビューに残件はなく、採用を推奨する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** separating automated checks from recorded acceptance evidence makes the staged security requirements understandable without claiming that a readiness check performs attack testing. / 自動検査と記録による受入証跡を分けることで、準備確認が攻撃検証を実施するかのように説明せず、段階別の安全要件を伝えられると分かった。 +- Applies to: [PR #25](https://github.com/RCOSDP/RDM-developer-guide/pull/25) (a proposed change / 変更提案), revision `5bf1e59b7c55ab46268475679e5e140c35a3db9f`; reviewer REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r3 record](2026-11-06_RDM-developer-guide_PR25_Environment_Guide_r3.md) · [SPEC-03](../spec/03_security_gate.md) · [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Environment guide](../guides/environment/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Recommended for acceptance; no outstanding findings in the requested re-review scope.** R3-25-01 and R2-25-02 are resolved. This is a review recommendation, not a platform approval or permission to merge. + +### Gate conditions and language comparison + +The security gate (a checkpoint deciding whether a run passes) in §3.8 was compared line by line, including commands, explanatory notes, success wording and failure codes: English lines 197–217 and Japanese lines 552–572. The paragraphs at 213 / 568 agree clause by clause with [SPEC-03 §5](../spec/03_security_gate.md#english) and [ADR-03 §3](../decisions/ADR-03_Staged_Security_Gate.md#english): + +| Condition checked | Result in both languages | +|---|---| +| Validity at every milestone (numbered stage), including M1 | Unreadable gate data and an allow-list entry missing a required field cause exit 50. The allow-list is the written list of findings accepted temporarily. | +| Baseline controls (minimum protections) | Violations cause exit 50 at every milestone. | +| M1–M3 findings | Reporting without severity failure is conditional on valid data and passing baseline controls; the next sentence retains the count restriction. | +| Allow-list count | Non-increase starts at M2 against the recorded baseline; M1 reports the count. | +| M4 | Unlisted HIGH or CRITICAL findings fail; the first real AI red-team run (authorized attack testing of isolated targets) must finish, with every path fixed or allow-listed. | +| Preflight | A readiness and isolation check is explicitly distinct from the actual red-team run. | +| M5 | Any HIGH or CRITICAL finding fails even if allow-listed; no entries at those severity levels may remain, and there must be zero unresolved intrusion paths. | +| Enforcement boundary | The scan enforces validity, baseline, count and severity; the owner records M4 completion and M5 zero-path evidence separately for milestone acceptance. | + +The implementation agrees: [`scan.py`](../../installer/grdm_dev/scan.py), lines 52–57 map the milestones, lines 865–897 decide the gate, and lines 961–997 validate entries, separate accepted findings, select the baseline count and choose the exit code. The M5 check includes both HIGH/CRITICAL entries and accepted HIGH/CRITICAL findings. Scanner failures still take exit 51 precedence and an explicit dynamic scan with unhealthy services takes exit 52; §3.8 lists those separate execution failures. No claim is made that a successful scan proves the red-team outcome. + +### First-use notes + +The requested notes now appear at their actual first prose use: GakuNin (Japan's academic identity federation) in header lines 3 / 4; ember-osf-web (browser interface), Docker (the tool running program containers), container (a box holding a program and its dependencies), and manifest (the component and source-version list) in bilingual header line 8; port (a numbered listening endpoint) at 32 / 387; and profile (a named group of services) at 34 / 389. The malformed plural in troubleshooting is now ordinary “Ports” at line 320, with equivalent Japanese at 675. + +The added Japanese notes match English for amd64 (a CPU type) at 39 / 394, Docker Compose (starting multiple containers from one file) at 48 / 403, CAS (the sign-in mechanism) at 137 / 492, modular-file-renderer (file previews) at 169 / 524, Trivy (known-weakness scanning) at 205 / 560, and non-root (running without administrator powers) at 302 / 657. The related shared-glossary links and the remaining §3.8 explanations also agree. This closes the specific first-use placement and translation issues from r3; a checker pass alone was not used to establish that agreement. + +### Validation and limits + +The local guide, SPEC-03, ADR-03 and `scan.py` were byte-compared against the remote files at the reviewed revision, retrieved using `gh api`; all four matched. Remote operations used `gh` only. From `/Users/komiyama/orca/workspaces/RDM-developer-guide/docs-env-guide`: + +```sh +python3 tools/docs_check.py --all-warnings +gh pr checks 25 --repo RCOSDP/RDM-developer-guide +``` + +Before adding this record, the documentation check **passed: 61 files checked, 8 exempt, 156 warnings repository-wide, zero warnings for the guide**. All six CI (automatic checks on submitted changes) checks passed: site build, links, manifest/private-URL policy, secret scan, static analysis and filesystem vulnerability scan. Evidence: [documentation run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42100584655) and [security run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42100584538). + +The new, untracked review record was checked directly with `tools.docs_check.check_file` and `load_glossary_terms`: zero errors and zero warnings. The normal command only enumerates tracked files. + +No live installation, scan, attack test or container state change was performed. Full startup remains unverified, as the guide already states. No approval, merge, close, commit or push was performed; the review record is left locally for the coordinator to integrate. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**採用推奨。指定された再レビュー範囲に残件なし。** R3-25-01 と R2-25-02 は解消した。これはレビュー上の推奨であり、プラットフォーム上の承認操作やマージ許可ではない。 + +### 門の条件と英和比較 + +§3.8 のセキュリティ門(実行の合否を判断する検査)を、コマンド・説明注・成功時の記述・失敗コードも含めて行ごとに比較した。英語197〜217行と日本語552〜572行が対象。213 / 568行の段落は節ごとに対応し、[SPEC-03 §5](../spec/03_security_gate.md#japanese) と [ADR-03 §3](../decisions/ADR-03_Staged_Security_Gate.md#japanese) に整合する。 + +| 確認条件 | 両言語での結果 | +|---|---| +| M1 を含む全節目(計画の番号付き段階)の有効性 | 読めない門データ、必須欄を欠く許容リスト項目は終了50。許容リストは検出を期限付きで受け入れる一覧。 | +| 基本対策(最低限の保護) | 違反は全節目で終了50。 | +| M1〜M3 の検出 | データ有効・基本対策合格を条件に、重大度による失敗なしで報告する。次の文で件数制約も維持する。 | +| 許容リスト件数 | 記録した基準からの非増加を M2 から要求し、M1 は件数報告のみ。 | +| M4 | 未許容の HIGH・CRITICAL は失敗。初回の実際の AI レッドチーム(隔離対象への許可された攻撃検証)を完了し、全経路を修正か許容登録する。 | +| 事前確認 | 準備と隔離の検査であり、実際の攻撃検証とは明確に区別する。 | +| M5 | 許容済みでも HIGH・CRITICAL の検出は失敗。その重大度の許容項目を残さず、未解決侵入経路もゼロにする。 | +| 強制範囲 | scan が有効性・基本対策・件数・重大度を検査し、所有者が M4 完了と M5 経路ゼロの証跡を節目受入のため別途記録する。 | + +実装も一致する。[`scan.py`](../../installer/grdm_dev/scan.py) の52〜57行が段階を対応付け、865〜897行が門を判定し、961〜997行が項目検証・許容済み検出の分離・基準件数選択・終了コード決定を行う。M5 の検査は HIGH・CRITICAL の許容項目と許容済み検出の両方を含む。スキャナー実行失敗では終了51が優先し、明示的な動的検査でサービスが不健康なら終了52になる。§3.8 はこれら実行上の失敗を別に示している。scan 成功が攻撃検証の結果を証明するという記述はない。 + +### 初出注 + +指摘対象の注は実際の本文初出に移った。GakuNin(日本の学術認証連携)はヘッダ3 / 4行、ember-osf-web(ブラウザ画面)・Docker(プログラムの箱を動かす道具)・コンテナ(プログラムと必要なものを入れる箱)・manifest(部品とソース版の一覧)は二言語のヘッダ8行、ポート(待受の番号)は32 / 387行、プロファイル(サービスの名前付きの組)は34 / 389行。トラブルシューティングの不自然な複数形は320行で通常の “Ports” に修正され、日本語675行と対応する。 + +日本語の追加注は、amd64(CPU の種類)39 / 394行、Docker Compose(複数の箱を一つのファイルから起こす道具)48 / 403行、CAS(サインインの仕組み)137 / 492行、modular-file-renderer(ファイルのプレビュー)169 / 524行、Trivy(既知の弱点の検査)205 / 560行、非 root(管理者権限で動かさない)302 / 657行で英語と一致する。関連する共通用語集リンクと §3.8 の残りの説明も対応する。r3 の初出位置・翻訳の具体的な指摘は解消した。この一致の判定は文書検査器の成功だけに頼っていない。 + +### 検証と限界 + +指定作業コピーのガイド・SPEC-03・ADR-03・`scan.py` を、`gh api` で取得した対象版のリモートファイルとバイト比較し、4件とも一致した。リモート操作は `gh` のみ。英語側に示したディレクトリで同じ二つのコマンドを実行した。 + +この記録の追加前の文書検査は **合格、61ファイル確認、8除外、リポジトリ全体156警告、対象ガイドは0警告**。CI(変更を自動検査する仕組み)はサイト生成・リンク・部品一覧と非公開URL方針・秘密検査・静的解析・ファイル脆弱性検査の6件すべて成功。証跡は [文書検査](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42100584655) と [セキュリティ検査](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42100584538)。 + +新規の未追跡レビュー記録は `tools.docs_check.check_file` と `load_glossary_terms` で直接検査し、エラー0・警告0。通常のコマンドは追跡済みファイルだけを列挙する。 + +実導入・実スキャン・攻撃検証・コンテナ状態変更は未実施。完全起動はガイドの既存記述どおり未検証。承認・マージ・閉鎖・commit・push は行っておらず、レビュー記録は取り込みを行う調整役のためローカルに残す。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Severity | How serious a weakness is; HIGH and CRITICAL are the two upper levels discussed here. | 弱点の重大さ。HIGH と CRITICAL はここで扱う上位二段階。 | +| Acceptance evidence | Recorded results used to decide whether a stage is complete. | 段階の完了を判断するために記録した結果。 | +| Parity | Both language versions convey the same information. | 両言語が同じ情報を伝えること。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR26_CI_Unittests_r1.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR26_CI_Unittests_r1.md new file mode 100644 index 0000000..7ee80a9 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR26_CI_Unittests_r1.md @@ -0,0 +1,95 @@ +# REV PR #26 Unit test CI review r1 / 単体テスト CI レビュー r1 + +> **Summary:** Request changes for one missing private-upstream fallback assertion; the new automated checks pass and their workflow is appropriately restricted. +> **概要:** 非公開上流へのフォールバック検証が一つ欠けるため修正を要請。新しい自動検査は成功し、実行権限も適切。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** an integration pin on a private-only component can hide the loss of its fallback test. / 非公開上流だけを持つ部品でも、統合先の固定値があるとフォールバック検証の消失が隠れる。 +- Applies to: [PR #26](https://github.com/RCOSDP/RDM-developer-guide/pull/26), `fix/ci-unittests` → `develop`, head `8db7a15c1d8fb4b3be42e47e2e17e9d776eac1f2`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-01](../spec/01_manifest.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and finding + +**Request changes — one P2 finding.** P2 means a normal-priority correction needed before accepting this review. The PR (proposed code change) fixes the immediate failure introduced by pinned integration commits, but does not fully protect the three-level selection rule it claims to test. This is a review verdict, not a GitHub approval or submitted change-request review. + +**R1 / P2 — Restore the private fallback assertion on the synthetic manifest.** At `installer/tests/test_manifest.py:69–70`, OASys (an auxiliary GRDM component) has a nonempty `integration_sha`, so the assertion exercises the integration value. Its private upstream SHA (commit identifier) is also identical to that value. At lines 75–84 the synthetic manifest (a copied component configuration) removes every integration pin, but only waterbutler (the file-transfer component) is asserted. Consequently, an implementation that returns no value for a private-only component without an integration pin passes this test. An in-memory mutation (temporarily replacing behavior without editing files) that entirely removes private fallback survived both the focused test and all 312 installer tests (10 skips, no failures or errors). Add an assertion for `man2.component("OASys").build_sha` against its merged private upstream SHA, after confirming the synthetic integration pin is absent. The mutated implementation must then fail and the correct implementation must pass. + +The existing assertions are **not tautological**: expected values come from manifest input fields rather than from the property being tested. Waterbutler's integration, public and private values differ. Separate in-memory mutations that ignore integration pins or prefer private over public both failed the focused test. R1 is missing branch coverage, not a claim that the entire test is meaningless. A small explicit fixture with distinct values could further reduce future dependence on the real manifest, but is not required to resolve R1. + +### Workflow review + +CI (automatic checks on proposed changes; see the [shared glossary](../reference/REF-01_Glossary.md)) runs for pull requests and pushes to `develop`. Both actions are pinned to full commit identifiers matching `security.yml`: checkout `11d5960a326750d5838078e36cf38b85af677262` and setup-python `a26af69be951a213d495a4c3e4e4022e16d87065`. The workflow grants only `contents: read`, requests no secrets or write permissions, and does not use `pull_request_target`. This is appropriate least privilege for the task. + +The matrix (the same checks repeated for different Python versions) covers 3.11, the package's minimum, and 3.12. This is a sensible initial compatibility check, not exhaustive coverage of the unbounded `>=3.11` declaration. `fail-fast: false` preserves both results. Each job runs both suites, installs the package into an isolated environment, and executes `grdm-dev --version`. No blocking workflow issue was found. Tools tests already ran in `security.yml`; this PR adds installer coverage and package installation checks while repeating tools coverage across both versions. + +### Evidence and limits + +Reviewed both changed files and compared six relevant local files byte-for-byte with contents fetched using `gh` at the stated PR head: the test, implementation, manifest, both workflows and package metadata. Executed the suites from the supplied `wt-ci` worktree root. These commands should finish with `OK`: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +``` + +Local Python was 3.14.8. The installer suite ran 312 tests with 10 skips and no failures; tools ran 77 with no failures. The skips remain a coverage limitation. No Docker (a tool for running applications in isolated containers) state changes were made. Local package installation was not repeated; the hosted jobs independently provide that evidence. + +`gh pr checks 26 --repo RCOSDP/RDM-developer-guide` showed all eight jobs passing, including both new Unit Tests jobs. Run `42099550786` reports the exact head identifier recorded in the header and a successful pull-request event. Its logs show 312 installer tests with 10 skips, 77 tools tests and `grdm-dev 0.1.0` for each matrix entry. GitHub's standard pull-request checkout tests the proposed merge with the base branch; the run's head identity is confirmed, not misrepresented as a head-only checkout. Green checks do not resolve R1. + +The author needs to add the missing synthetic OASys assertion and rerun both suites and CI. No source edits, commits, pushes, approvals, merges or closures were performed in this review. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +**修正要請 — P2 が1件。** P2 はレビュー受入前に必要な通常優先度の修正です。この PR(変更提案)は統合先の固定値による直近の失敗を直しますが、検査すると述べる三段階の選択規則を完全には守れていません。これは文書上の判定であり、GitHub の承認や変更要求レビューの送信ではありません。 + +**R1 / P2 — 合成マニフェストで private フォールバックの検証を復元してください。** `installer/tests/test_manifest.py:69–70` の OASys(GRDM の補助部品)は `integration_sha` が非空のため、統合先の値を検証しています。非公開上流の SHA(コミットの識別子)も同じ値です。75–84 行では合成マニフェスト(部品構成を複製したデータ)の統合固定値を全て消していますが、検証は waterbutler(ファイル転送を担当する部品)だけです。そのため、統合固定値のない非公開上流だけの部品に値を返さない実装でも成功します。ファイルを書き換えずメモリ内で動作を一時差し替える変異試験で、private フォールバックを丸ごと削除しても当該テストと installer 全312件(10 skip・失敗およびエラーなし)が成功しました。合成側の統合固定値が空であることを確認し、`man2.component("OASys").build_sha` が merged の非公開上流 SHA と等しいことを検証してください。変異実装では失敗し、正しい実装では成功する必要があります。 + +既存の検証は**同義反復ではありません**。期待値は検証対象のプロパティではなく入力データから得ています。waterbutler の統合先・公開上流・非公開上流の値は異なります。統合固定値を無視する変異と、公開より非公開を優先する変異は、それぞれ当該テストで失敗しました。R1 は一分岐の検査欠落であり、テスト全体が無意味という指摘ではありません。異なる値を持つ小さな専用データを使うと実データへの依存も減らせますが、R1 解消の必須条件ではありません。 + +### ワークフローの確認 + +CI(変更提案を自動検査する仕組み。[共通用語集](../reference/REF-01_Glossary.md)参照)は pull request と `develop` への push で動きます。二つの action は完全なコミット識別子に固定され、`security.yml` と一致します。checkout は `11d5960a326750d5838078e36cf38b85af677262`、setup-python は `a26af69be951a213d495a4c3e4e4022e16d87065` です。権限は `contents: read` のみで、秘密情報・書込み権限を要求せず、`pull_request_target` も使いません。必要最小限の権限として適切です。 + +matrix(Python の版を変えて同じ検査を繰り返す仕組み)は、パッケージの最低要件 3.11 と 3.12 を対象とします。初期の互換性検査として妥当ですが、上限のない `>=3.11` 宣言の全範囲を網羅するものではありません。`fail-fast: false` で両方の結果を残します。各ジョブは両テスト群を実行し、分離環境へパッケージを導入して `grdm-dev --version` を実行します。ワークフローに阻害事項はありません。tools のテストは既に `security.yml` にあり、今回 installer とパッケージ導入の検査が追加され、tools も両バージョンで繰り返されます。 + +### 証拠と限界 + +変更2ファイルを確認し、関連するローカル6ファイル(テスト・実装・マニフェスト・両ワークフロー・パッケージ定義)を、指定 head から `gh` で取得した内容とバイト単位で照合しました。指定された `wt-ci` のルートで両テスト群を実行しました。次のコマンドは `OK` で終了することを期待します。 + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +``` + +ローカルは Python 3.14.8 でした。installer は312件中10件 skip・失敗なし、tools は77件・失敗なしです。skip 分は検査範囲の限界として残ります。Docker(アプリを分離した箱で動かす道具)の状態変更はありません。ローカルでパッケージ導入は再実行せず、ホスト側の実行結果で確認しました。 + +`gh pr checks 26 --repo RCOSDP/RDM-developer-guide` で、新設の Unit Tests 2件を含む全8ジョブの成功を確認しました。run `42099550786` の head 識別子はヘッダ記載値と一致し、pull-request イベントが成功しています。ログは各 Python 版で installer 312件・10 skip、tools 77件、`grdm-dev 0.1.0` を示します。GitHub 標準の pull-request checkout はベースとの仮マージを検査します。run が対象 head に属することを確認したのであり、head 単体の checkout と同一視していません。CI 成功だけでは R1 は解消しません。 + +作者は合成 OASys の検証を追加し、両テスト群と CI を再実行する必要があります。このレビューでソース編集・commit・push・承認・merge・close は行っていません。 + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| SHA | Identifier for a particular saved code revision. | 保存されたコードの特定の版を指す識別子。 | +| Integration pin | A recorded revision of the combined code to build. | 組み立て対象の統合コードの版を固定した値。 | +| Fallback | The next choice when the preferred value is absent. | 優先する値がないときに使う次の選択肢。 | +| Mutation test | Temporarily introduce a fault and check whether tests catch it. | わざと一時的に誤りを入れ、検査が見つけるかを確かめる試験。 | +| CI | Automatic checks triggered by code changes. | コード変更をきっかけに実行される自動検査。 | +| Matrix | Repeating checks under several selected conditions. | 条件を変えて同じ検査を繰り返す設定。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR26_CI_Unittests_r2.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR26_CI_Unittests_r2.md new file mode 100644 index 0000000..123f796 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR26_CI_Unittests_r2.md @@ -0,0 +1,116 @@ +# REV PR #26 Unit test CI review r2 / 単体テスト CI レビュー r2 + +> **Summary:** The missing private fallback check now detects the regression. Accept the revision with no blocking findings. +> **概要:** 欠けていた非公開上流への代替選択の検査が、不具合を検出することを確認。阻害指摘なしで修正を受入可能と判定。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** a direct assertion on the private-only component catches loss of the final selection branch. / 非公開上流だけの部品を直接検証すると、最後の選択分岐の消失を検出できる。 +- Applies to: [PR #26](https://github.com/RCOSDP/RDM-developer-guide/pull/26), `fix/ci-unittests` → `develop`, head (reviewed revision) `55e7c6ad450895c11bad88900afbbb828f00ba18`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r1](2026-11-06_RDM-developer-guide_PR26_CI_Unittests_r1.md) · [SPEC-01](../spec/01_manifest.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Accept — R1 / P2 resolved; no blocking findings.** P2 denotes a normal-priority correction. This is a written review verdict, not a submitted GitHub approval. Scope is the change since r1 and its verification at the stated head. + +At `installer/tests/test_manifest.py:81–85`, the synthetic manifest (a copied component configuration) now checks OASys, a private-only component, against its merged private upstream SHA (saved revision identifier). The preceding loop sets every `integration_sha` to `None`, so this exercises fallback (the next choice when the preferred value is absent). The expected value comes from input data, independently of `build_sha`. The additional inequality against waterbutler, the file-transfer component, also passes. The workflow is unchanged from r1. + +### Verification + +The six local files covering the test, implementation, manifest, test/security workflows and package metadata matched bytes fetched with `gh` at the reviewed head. Tests ran from the supplied `wt-ci` worktree (separate checkout), using Python 3.14.8. Result data uses TOON (compact structured text); these are observed results, not a mirror of a canonical JSON file. + +```toon +local_results[4]{check,run,failures,errors,skips}: + installer,312,0,0,10 + tools,77,0,0,0 + focused_original,1,0,0,0 + focused_private_fallback_removed,1,1,0,0 +``` + +An in-memory mutation test (temporarily introducing a fault without editing source files) replaced only `("public", "private")` with `("public",)` in `Component.build_sha`. Integration selection and public fallback remained intact. The focused test failed at line 84, the new OASys equality, with `None != 'b3860fda51722bbd0faffbe1d49684125e381af3'`. The original implementation passed before and after the temporary replacement. Thus the exact mutation that survived r1 is now detected. + +Run the ordinary suites from the repository root; both should finish with `OK`: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +``` + +CI (automatic checks on proposed changes; [glossary](../reference/REF-01_Glossary.md)) showed all eight checks passing: documentation build, links, manifest/private-URL policy, secret scan, static analysis, filesystem scan, and Unit tests for Python 3.11 and 3.12. The filesystem scan remains report-only at M1. Check with: + +```sh +gh pr checks 26 --repo RCOSDP/RDM-developer-guide +gh run view 42100389902 --repo RCOSDP/RDM-developer-guide --json headSha,conclusion,event +``` + +Run `42100389902` reported `success`, `pull_request`, and the exact reviewed head. Logs for each Python version show 312 installer tests with 10 skips, 77 tools tests, and `grdm-dev 0.1.0` after package installation. The hosted pull-request checkout tests the proposed merge with the base branch, rather than a head-only checkout. + +### Limits and remaining work + +The ten skipped tests remain unverified, and the synthetic case still depends on real manifest data. Neither limitation blocks resolution of R1. No application source was changed; no commits, pushes, approvals, merges, closures or Docker state changes were performed. The coordinator retains responsibility for recording this report in version control and any later integration action. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**受入可能 — R1 / P2 解消、阻害指摘なし。** P2 は通常優先度の修正です。これは文書上のレビュー判定であり、GitHub の承認送信ではありません。対象は r1 以後の変更と、ヘッダ記載の head(検査対象の版)での検証です。 + +`installer/tests/test_manifest.py:81–85` で、合成マニフェスト(部品構成を複製したデータ)の OASys(非公開上流だけを持つ部品)を、merged の非公開上流 SHA(保存された版の識別子)と比較しています。直前のループが全 `integration_sha` を `None` にするため、フォールバック(優先値がない場合の次の選択肢)を検証できます。期待値は入力データ由来であり、`build_sha` とは独立しています。waterbutler(ファイル転送を担う部品)との不一致検証も成功しました。ワークフローは r1 から変更されていません。 + +### 検証 + +テスト・実装・マニフェスト・テストとセキュリティのワークフロー・パッケージ定義の計6ファイルを、対象 head から `gh` で取得した内容とバイト単位で照合しました。指定 `wt-ci` ワークツリー(独立した作業用コピー)で Python 3.14.8 により実行しました。試験結果は TOON(短い構造化テキスト)で表記します。実測値であり、正本 JSON の写しではありません。 + +```toon +local_results[4]{check,run,failures,errors,skips}: + installer,312,0,0,10 + tools,77,0,0,0 + focused_original,1,0,0,0 + focused_private_fallback_removed,1,1,0,0 +``` + +メモリ内の変異試験(ソースを編集せず一時的に誤りを入れる検査)で、`Component.build_sha` の `("public", "private")` だけを `("public",)` に置換しました。統合先選択と公開上流への代替選択は残しています。当該テストは新設の OASys 等値検証である84行目で `None != 'b3860fda51722bbd0faffbe1d49684125e381af3'` により失敗しました。元の実装は差し替えの前後とも成功しました。したがって r1 で見逃した同じ変異を検出できています。 + +リポジトリのルートで通常の両テスト群を実行します。期待結果は両方 `OK` です。 + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +``` + +CI(変更提案の自動検査。[共通用語集](../reference/REF-01_Glossary.md))は全8件成功でした。文書構築、リンク、マニフェストと非公開 URL 方針、秘密情報走査、静的解析、ファイルシステム走査、Python 3.11 と 3.12 の Unit tests が対象です。ファイルシステム走査は M1 の報告専用のままです。確認コマンドは次のとおりです。 + +```sh +gh pr checks 26 --repo RCOSDP/RDM-developer-guide +gh run view 42100389902 --repo RCOSDP/RDM-developer-guide --json headSha,conclusion,event +``` + +run `42100389902` は `success`・`pull_request` で、head も対象の版と一致しました。各 Python 版のログで installer 312件・10 skip、tools 77件、パッケージ導入後の `grdm-dev 0.1.0` を確認しました。ホスト側の pull-request checkout はベースとの仮マージを検査しており、head 単体の checkout ではありません。 + +### 限界と残作業 + +skip 10件は未検証で、合成データは引き続き実マニフェストに依存します。いずれも R1 解消の阻害事項ではありません。アプリのソース変更、commit、push、承認、merge、close、Docker の状態変更は行っていません。記録の版管理への追加と、その後の統合判断は連携調整側に残ります。 + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| SHA | Identifier of a saved revision. | 保存された版の識別子。 | +| Fallback | Next choice when a preferred value is absent. | 優先値がない場合の次の選択肢。 | +| Mutation test | Deliberately introduce a fault and check detection. | 故意に誤りを入れ、検出を確かめる試験。 | +| CI | Automatic checks triggered by changes. | 変更をきっかけとする自動検査。 | +| TOON | Compact structured text for data. | データを短く表す構造化テキスト。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR27_Legacy_Ports_r1.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR27_Legacy_Ports_r1.md new file mode 100644 index 0000000..bdadff8 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR27_Legacy_Ports_r1.md @@ -0,0 +1,129 @@ +# REV PR #27 Legacy ports review r1 / 旧変更の移植レビュー r1 + +> **Summary:** The historical changes were ported faithfully, with correct attribution and bilingual summaries. Request changes because the new storage guide makes the mandatory secret scan fail. +> **概要:** 旧変更の移植は原文に忠実で、出典と英和の要約も対応している。新しいストレージ手引きにより必須の秘密情報検査が失敗するため、修正を求める。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** byte-identical historical imports can introduce a new scanner finding even when documentation checks pass. / 原文とバイト単位で一致する移植でも、文書検査が通る一方で秘密情報検査の新しい検出を生むことがある。 +- Applies to: [PR #27](https://github.com/RCOSDP/RDM-developer-guide/pull/27) (a proposed change), `docs/port-legacy-prs` → `develop`, head (reviewed revision) `b8594c363a990a3b43119a0a29229766e24b4a59`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and required correction + +**Request changes — R1 / P2: resolve the failing secret scan before integration.** P2 means a normal-priority correction that blocks acceptance here. This is a written verdict, not a GitHub approval or formal change-request submission. + +At `docs/guides/storage-addon/README.legacy.md:224`, the imported `recaptchaSiteKey` value triggers `generic-api-key` in gitleaks (a tool that searches for possible passwords and keys). The [failed job](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42103742174/job/127513010846) scanned 113 commits and found one match. Its downloaded report identifies this exact file, line and reviewed revision; this is introduced by the port, not an unrelated historical finding. [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) keeps secret scanning mandatory at every milestone. + +The value is in a browser-facing reCAPTCHA site-key field and appears to be the standard public test value; the scanner finding alone does not establish a leaked credential. Confirm its public-test provenance and add a narrowly anchored, exact-value and field-specific false-positive exception with an explanation, following `.gitleaks.toml`'s existing pattern. Do not exempt the whole guide or all keys. This approach preserves the requested source-byte equality. Rerun the full-history scan and require a passing result; merely replacing the latest text does not remove the detected historical revision. No real secret was otherwise identified in the changed text, diagram sources or inspected screenshot, but an unconditional security PASS is not justified while this check fails. + +### Fidelity, attribution and order + +All 70 changed paths in the supplied `wt-legacy` worktree (separate checkout) matched the remote PR (proposed change) file blobs (stored file contents) or expected removals. GitHub access used `gh`; no fetch, commit, push, approval, merge, closure or Docker (a tool for running isolated programs) state change was performed. + +For [PR #14](https://github.com/RCOSDP/RDM-developer-guide/pull/14), the added and removed hunk lines from `gh pr diff 14` match after mapping old paths to the new guide paths: both surviving legacy guides, both `apps.py` references and both unchanged-content template renames. For [PR #17](https://github.com/RCOSDP/RDM-developer-guide/pull/17), all nine added lines match `gh pr diff 17`: the same Metadata feature-switch command occurs immediately after migration in all three startup variants. + +For [PR #18](https://github.com/RCOSDP/RDM-developer-guide/pull/18), the storage legacy text equals the file fetched through the contents API (a service for reading repository files) from `chiku-samugari/RDM-developer-guide` at `f65fac76da40674a15e39163c9f2331572fd1535`: 55,793 bytes, SHA-256 (a file-content fingerprint) `80575425bebff58ce5ffdb9de80c0c12e8ee93de4c78432c1a2047768d0a2ad5`. All 59 storage file changes match the source file list after path mapping, excluding only the newly edited bilingual wrapper. This includes nine additions, six old diagram removals and 43 old sample-code removals, plus the rewritten guide. All nine added assets also equal the source bytes. + +Author logins match the source PR metadata: #14 `shun-nakazawa`, #17 `yacchin1205`, #18 `chiku-samugari`. Their original opening dates in UTC are 2023-10-24, 2025-08-09 and 2026-07-12. The attribution date `2026-11-06` is the incorporation date, not the original opening date; the port's timestamp `2026-11-05T20:27:23Z` falls on November 6 in Japan. Both language halves consistently use that incorporation date. + +The commit message records #14 → #17 → #18. The resulting files are consistent with that order, and both halves of the storage wrapper explicitly explain that #18 supersedes #14's storage changes while the prefix rule survives in the skeleton and screen-expansion guides. Because this is a single squashed commit, intermediate execution order cannot independently be recovered from history; no stronger claim is made. + +### Images, URLs and document checks + +The additions are five valid PNG images (a standard raster image format) and four readable Mermaid (text that describes diagrams) sources. PNG signatures, every chunk checksum and the end of each file were valid, with no trailing payload. The four sources contain ordinary flow or sequence diagrams without executable directives. The administration screenshot shows service settings and empty connection fields, not passwords or tokens. + +No private repository URL was found in added text. The two contributor plugin repositories are public according to GitHub metadata, and the hosted private-URL policy check passes. A literal private-address example does exist at legacy line 873: an HTTP URL using `192.168.168.167` on port 8081. Lines 30, 39 and 863 explicitly define it as a local loopback alias for development, not an undisclosed internal service. Thus “no private URLs” is satisfied for private repositories or undisclosed endpoints, not as a literal ban on private address space. The retained legacy instructions do modify a host alias; they remain historical material, not a verified 2027 installation procedure. + +The four edited wrapper READMEs retain Summary/概要, Jump, language anchors, matching English/Japanese changes, version increments with learned lessons, and inline explanations for the new feature switch, template system and service names. `tools/docs_check.py --all-warnings` reports no warnings for those four files. Existing broader text and glossary conventions were not rewritten. SPEC-06 §8 exempts legacy text and sample assets from the new document format, so preserving the original PNG diagrams is appropriate here. + +From the supplied worktree root, run the documentation check; the observed result is PASS: + +```sh +python3 tools/docs_check.py --all-warnings +``` + +The following observed results use TOON (compact structured text); they do not mirror a canonical data file. + +```toon +checks[4]{check,result,detail}: + docs_check,PASS,73 checked / 8 exempt / 197 existing glossary warnings + edited_wrappers,PASS,zero glossary warnings in the four edited READMEs + hosted_checks,PARTIAL,seven pass / secret scan fails + runtime,NOT_RUN,documentation review only / no Docker state changes +``` + +The storage wrapper already acknowledges its older two-part overview and defers alignment to a later milestone. This review accepts that explicit scope boundary and does not claim to validate the rewritten guide by running its services. The coordinator must resolve R1, record this report in version control and arrange the next review before integration. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と必要な修正 + +**修正要求 — R1 / P2: 統合前に秘密情報検査の失敗を解消すること。** P2 は通常優先度の修正で、今回は受入を妨げる。これは文書上の判定であり、GitHub の承認や正式な変更要求の操作ではない。 + +`docs/guides/storage-addon/README.legacy.md:224` の `recaptchaSiteKey` が gitleaks(パスワードや鍵の疑いがある文字列を探す道具)の `generic-api-key` に一致する。[失敗した検査](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42103742174/job/127513010846)は113件の変更履歴を走査し、1件を検出した。取得した報告はこのファイル・行・レビュー対象の版を指しており、無関係な過去の検出ではなく移植による追加である。[ADR-03](../decisions/ADR-03_Staged_Security_Gate.md)では秘密情報検査は全段階で必須となる。 + +ブラウザに渡す reCAPTCHA のサイトキー欄であり、標準の公開テスト値と考えられる。検出だけで認証情報の漏えいとは断定しない。公開テスト値である出典を確認し、`.gitleaks.toml` の既存方式に沿って、対象フィールドと完全一致する値だけを行全体で限定する誤検出除外を説明付きで追加すること。手引き全体や鍵全般を除外しない。この方法なら原文とのバイト一致を維持できる。全履歴の再検査を成功させる必要があり、最新版の本文だけを置き換えても検出済みの過去の版は消えない。変更本文・図のソース・確認した画面画像に、それ以外の実際の秘密情報は見つからなかったが、この検査が失敗した状態で無条件の安全合格とは判定できない。 + +### 忠実性・出典・順序 + +指定された `wt-legacy` 作業ツリー(別の作業用コピー)の変更70パスは、遠隔の変更提案に保存されたファイル内容または削除予定と一致した。GitHub へのアクセスには `gh` を使い、取得用の git fetch、コミット、プッシュ、承認、マージ、終了処理、Docker の状態変更は行っていない。 + +[PR #14](https://github.com/RCOSDP/RDM-developer-guide/pull/14) は `gh pr diff 14` の追加・削除行を旧パスから新パスへ対応付けて比較した。残存する旧ガイド2件、`apps.py` の参照2件、内容を維持したテンプレート名変更2件が一致した。[PR #17](https://github.com/RCOSDP/RDM-developer-guide/pull/17) は `gh pr diff 17` の追加9行が一致し、3通りすべての起動手順で同じ Metadata 機能スイッチ設定が移行処理の直後に置かれている。 + +[PR #18](https://github.com/RCOSDP/RDM-developer-guide/pull/18) は contents API(保存されたファイルを読む窓口)で `chiku-samugari/RDM-developer-guide` の `f65fac76da40674a15e39163c9f2331572fd1535` から本文を取得した。移植先の旧本文は55,793バイトで完全一致し、SHA-256(ファイル内容の指紋)は `80575425bebff58ce5ffdb9de80c0c12e8ee93de4c78432c1a2047768d0a2ad5`。新しく編集した英和の案内 README を除き、ストレージ関連59変更の一覧はパス対応後に一致した。内訳は9追加、旧図6削除、旧サンプル43削除、本文1改訂である。追加素材9点も原本とバイト単位で一致した。 + +作者のログイン名は元の提案情報と一致する。#14 は `shun-nakazawa`、#17 は `yacchin1205`、#18 は `chiku-samugari`。元の提案作成日は UTC でそれぞれ2023-10-24、2025-08-09、2026-07-12である。出典行の `2026-11-06` は元の提案日ではなく取込日を表す。移植の記録時刻 `2026-11-05T20:27:23Z` は日本時間では11月6日であり、英和とも取込日として整合する。 + +変更記録には #14 → #17 → #18 の順序が記され、最終ファイルもその順序と整合する。ストレージの案内 README は両言語で、#18 が #14 のストレージ変更を置き換えたことと、接頭辞の規則はスケルトン・画面拡張の手引きに残ることを明記している。変更履歴は一つにまとめられているため、中間の実行順そのものを履歴から独立に復元することはできない。 + +### 画像・URL・文書検査 + +追加は正しい PNG(標準的な画像形式)5点と、読める Mermaid(文字で図を表す方式)ソース4点。PNG の識別情報・全区画の検査値・終端を確認し、終端後の余分なデータはなかった。ソースは通常の構成図・手順図で、実行指示を含まない。管理画面の画像はサービス設定と空の接続欄を示し、パスワードやトークンを示していない。 + +追加本文に非公開リポジトリの URL は見つからなかった。作者のプラグイン用リポジトリ2件は GitHub の情報で公開を確認し、遠隔の非公開 URL 方針検査も合格している。ただし旧本文873行には、`192.168.168.167` の8081番ポートを指す HTTP の例がある。30・39・863行は、これを開発用に設定するローカルのループバック別名と説明しており、未知の内部サービスの公開ではない。「非公開 URL なし」は非公開リポジトリ・未公開の接続先という意味では満たすが、私用アドレス空間の文字列が一切ないという意味では満たさない。旧手順にはホストの別名設定が含まれるが、歴史資料であり、検証済みの2027年用導入手順ではない。 + +編集された案内 README 4件は Summary/概要、Jump、言語アンカー、対応する英和の変更節、学びを記した版更新、新しい機能スイッチ・テンプレート方式・サービス名の説明を維持する。`tools/docs_check.py --all-warnings` ではこの4件への警告はない。既存本文全体の文体・用語注は書き直していない。SPEC-06 §8 は旧本文とサンプル素材を新形式の対象外としているため、原本の PNG 図の保存はこの範囲で妥当である。 + +指定された作業ツリーのルートで次を実行し、PASS を確認した。 + +```sh +python3 tools/docs_check.py --all-warnings +``` + +検査結果は TOON(短い構造化テキスト)で記す。正本のデータファイルの写しではない。 + +```toon +checks[4]{check,result,detail}: + docs_check,PASS,73件検査 / 8件対象外 / 既存用語警告197件 + edited_wrappers,PASS,編集した案内README4件の用語警告なし + hosted_checks,PARTIAL,7件合格 / 秘密情報検査は失敗 + runtime,NOT_RUN,文書レビューのみ / Docker状態変更なし +``` + +ストレージの案内 README は、概要が旧二部構成のままであり後の段階で整合させると明記している。その範囲設定は受け入れるが、改訂手引きのサービスを実行して検証したとは判断しない。担当調整者には R1 の解消、報告書の履歴への記録、統合前の再レビュー手配が残る。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Fidelity | Keeping the source change intact when moving it. | 移植時に元の変更を保つこと。 | +| Attribution | Naming the original author and the source change. | 元の作者と変更元を記すこと。 | +| False positive | A harmless value reported as a possible problem. | 問題のない値を問題の疑いとして報告すること。 | +| Site key | A browser-visible identifier for a website integration. | Web サイトの連携を示す、ブラウザに見える識別子。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR27_Legacy_Ports_r2.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR27_Legacy_Ports_r2.md new file mode 100644 index 0000000..9f7b0ef --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR27_Legacy_Ports_r2.md @@ -0,0 +1,100 @@ +# REV PR #27 Legacy ports review r2 / 旧変更の移植レビュー r2 + +> **Summary:** Accept the documented single-value substitution as a fidelity exception, but keep R1 open because the new exception can suppress other findings on the same line. +> **概要:** 明記された一つの値の置換は忠実性の例外として受け入れる。ただし新しい除外規則が同じ行の別の検出まで抑制し得るため、R1 は未解決とする。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** an exact public value used as a substring exception can still suppress unrelated findings when matching whole lines. / 公開値だけを指定しても、行を対象とした部分一致の除外では同じ行の別の検出まで抑制し得る。 +- Applies to: [PR #27](https://github.com/RCOSDP/RDM-developer-guide/pull/27) (a proposed change), head (reviewed revision) `5bbd815bca91dfcd0eb75f28df6de73351334429` (including the replacement in `55c935f`). +- Reviewer: REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r1](2026-11-06_RDM-developer-guide_PR27_Legacy_Ports_r1.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Request changes — R1 / P2 remains open.** P2 denotes a normal-priority correction required before acceptance. The fidelity exception is acceptable; the security-check correction is incomplete. A concise r2 comment accompanies this report; no approval was submitted. + +### Fidelity of the replacement + +The replacement commit `55c935f` changes only the storage legacy guide and its bilingual wrapper. I fetched the new files through `gh` and verified that the supplied worktree (separate working copy) contains those exact bytes. Against the original source at `f65fac76da40674a15e39163c9f2331572fd1535`, the legacy guide equals exactly one substitution of the `recaptchaSiteKey` string value with `<recaptcha-site-key>`. No other source text differs. Its new size is 55,773 bytes; SHA-256 (a fingerprint of file contents) is `a20b29b7a9dd06ee527c21ba6de15b38b63889f3183c28e382b0ab7efe7a53c6`. + +The change preserves the original authorship and describes the exception in both language halves. Consequently, describe the result as “faithful except for the documented site-key placeholder,” not byte-identical to the source. The nine assets, removed samples, other two source changes and supersession explanation were unchanged since r1; those earlier checks still apply. The placeholder is not a usable site key and requires a suitable value before anyone follows that legacy setup; this review does not establish runtime behavior. + +### R1: constrain the new history exception to the complete field line + +During review, the head advanced from `55c935f` to `5bbd815`. The latest revision adds a public-test-key exception and cites Google's FAQ in `.gitleaks.toml:28–31`. The [full-history secret scan now passes](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42104638730/job/127516113691). The earlier historical scan failure is therefore addressed, but the exception is broader than requested in r1. + +The configuration uses `regexTarget = "line"`, while the new expression is only the literal test value, without anchors or a field name. Consequently, any detected secret on any source line containing that public value can be allowlisted. I parsed the remote configuration and confirmed that its expression also matches a synthetic JSON (structured text with named fields) line with both the public site-key field and an unrelated `other_secret` field. This verifies the matching weakness without using a real secret; it is not a fresh scanner execution. + +Replace the substring exception with a complete-line expression restricted to the JSON `recaptchaSiteKey` field and that exact public value, allowing only indentation and the expected trailing comma. Keep the source explanation and default detection rules. This matches the existing configuration's explicit whole-line policy and the r1 requested correction. Rerun the full-history scan after that change. Do not exclude whole files or weaken scanning. The replacement alone in `55c935f` did not remove the original value from history; the additional exception in the latest head is what changed the scan result. + +All eight hosted checks pass at `5bbd815`, including secret scanning, static analysis, the report-only filesystem scan, private-URL policy, documentation build, links and both unit-test versions. Passing checks do not test the overly broad exception described here. + +### Document form and verification + +The new explanation is bilingual and the existing anchors and Jump links remain. A minor SPEC-06 §6 issue is that the wrapper header stays at version 0.2 despite this separate edit; add a new learned-lesson version entry. Its “kept verbatim” wording should also explicitly allow the documented placeholder exception. These editorial notes do not change the single-value fidelity finding. + +From the supplied worktree root, the following command completed with PASS: 73 checked files, 8 exemptions and 197 glossary warnings, the same counts as r1. + +```sh +python3 tools/docs_check.py --all-warnings +``` + +The replacement files and unchanged workflow were verified at `55c935f`; the subsequent comparison and new scanner configuration were read at `5bbd815`. The latest revision also records r1 in the review folder. No application services were run. No commits, pushes, approvals, merges, closures or container-state changes were made. Remaining work is to narrow the exception, repeat the scan, correct the small document-form notes and request re-review. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**修正要求 — R1 / P2 は未解決。** P2 は受入前に必要な通常優先度の修正を表す。忠実性の例外は受け入れるが、秘密情報検査の修正は未完了である。この報告に対応する短い r2 コメントを投稿し、承認操作は行っていない。 + +### 置換の忠実性 + +置換コミット `55c935f` では、ストレージの旧本文と英和の案内だけが変わっている。`gh` で新しいファイルを取得し、指定された作業ツリー(別の作業用コピー)とバイト単位で一致することを確認した。元の `f65fac76da40674a15e39163c9f2331572fd1535` の本文と比べると、`recaptchaSiteKey` の文字列値を `<recaptcha-site-key>` に置き換えた一か所だけが異なる。それ以外の原文は同一である。新しい大きさは55,773バイト、SHA-256(ファイル内容の指紋)は `a20b29b7a9dd06ee527c21ba6de15b38b63889f3183c28e382b0ab7efe7a53c6`。 + +元の作者表記を保ち、例外を両言語で説明している。このため「明記したサイトキーの代替文字列を除いて忠実」と評価できるが、「原文とバイト単位で一致」とは評価できない。素材9点、サンプル削除、他の二つの変更元、後の改訂による置換説明は r1 以降変更されておらず、前回の確認が引き続き適用される。代替文字列は利用できるサイトキーではなく、旧設定を実行するには適切な値への置換が必要である。実行時の動作は今回検証していない。 + +### R1: 履歴用の新しい除外をフィールド行全体に限定する + +レビュー中に head が `55c935f` から `5bbd815` へ更新された。最新版は `.gitleaks.toml:28–31` に公開テストキーの除外と Google の FAQ の出典を追加し、[全履歴の秘密情報検査は合格した](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42104638730/job/127516113691)。前の履歴検査失敗には対処しているが、除外範囲は r1 の要求より広い。 + +設定は `regexTarget = "line"` で行を対象とする一方、新しい式はテスト値の文字列だけで、行頭・行末の指定やフィールド名がない。そのため、その公開値を含む任意のソース行では別の秘密情報の検出も除外され得る。遠隔の設定を読み取り、公開サイトキー欄と無関係な `other_secret` 欄を一行に含めた人工的な JSON でも、この式が一致することを確認した。実際の秘密情報を使わずに一致範囲の問題を確認したもので、検査ツールそのものの再実行ではない。 + +この部分一致の除外を、JSON の `recaptchaSiteKey` フィールドとその公開値だけに限定した行全体の式へ変更すること。字下げと必要な末尾のカンマ以外の追加内容は許さない。出典の説明と既定の検出規則は維持する。これは設定内の既存の行全体方針および r1 の要求に沿う。変更後に全履歴検査を再実行すること。ファイル全体の除外や走査の縮小は行わない。`55c935f` の置換だけでは元の値は履歴から消えず、最新版の追加除外によって検査結果が変わった点も区別する。 + +`5bbd815` の遠隔検査は8本すべて合格した。秘密情報検査、静的解析、報告専用のファイル検査、非公開 URL 方針、文書ビルド、リンク、二つの版での単体テストを含む。ただし合格した検査は、ここで指摘した除外範囲の広さを検証していない。 + +### 文書の形式と検証 + +追記の説明は英和で対応し、既存のアンカーと Jump リンクも維持する。軽微な SPEC-06 §6 の問題として、別の編集を加えたのに案内の版は0.2のままなので、学びを示す新しい版の行を追加すること。「そのまま保存」という表現にも、明記された代替文字列の例外を反映するとよい。これらの文章上の指摘は、一つの値だけが異なるという忠実性の判断を変えない。 + +指定された作業ツリーのルートで次を実行し、73件検査・8件対象外・用語警告197件で PASS した。件数は r1 と同じである。 + +```sh +python3 tools/docs_check.py --all-warnings +``` + +置換ファイルと不変の実行定義は `55c935f` で照合し、その後の差分と新しい検査設定は `5bbd815` で確認した。最新版は r1 の報告書もレビュー用フォルダに追加している。アプリケーションのサービスは起動していない。コミット・プッシュ・承認・マージ・終了処理・コンテナ状態変更も行っていない。除外範囲の限定、検査の再実行、軽微な文書形式の修正、再レビューの依頼が残る。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Placeholder | Text that must be replaced with a suitable value. | 適切な値に置き換えて使う仮の文字列。 | +| Fidelity exception | An explicitly recorded difference from the source. | 原文との違いを明記して認めること。 | +| Ancestor | An earlier saved revision included in later history. | 後の履歴に含まれる、過去に保存された版。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR27_Legacy_Ports_r3.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR27_Legacy_Ports_r3.md new file mode 100644 index 0000000..525ee1c --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR27_Legacy_Ports_r3.md @@ -0,0 +1,84 @@ +# REV PR #27 Legacy ports review r3 / 旧変更の移植レビュー r3 + +> **Summary:** The narrowly anchored exception resolves R1. Accept the implementation with minor documentation notes, with all eight hosted checks passing on the reviewed revision. +> **概要:** 行全体に限定した除外により R1 は解決した。軽微な文書上の注記を残して実装を受け入れる。対象の版で遠隔検査8本すべての成功も確認した。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** an exact field-and-value line exception preserves detection of additional fields on the same line. / フィールドと値を行全体で限定すれば、同じ行に追加された別の欄を除外しない。 +- Applies to: [PR #27](https://github.com/RCOSDP/RDM-developer-guide/pull/27) (a proposed change), head (reviewed revision) `abc7689352e65e757d0284bb408c2cc43c246c7e`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r2](2026-11-06_RDM-developer-guide_PR27_Legacy_Ports_r2.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Accept with minor notes — R1 resolved; no remaining blocking implementation findings.** All eight hosted checks pass, including the [full-history secret scan](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42105028993/job/127517449360), documentation build, links, private-URL policy, static analysis, report-only filesystem scan and both unit-test versions. This is a written review verdict, not a submitted approval or a merge action. + +### Verification + +The remote `.gitleaks.toml` now restricts the exception to a complete `recaptchaSiteKey` field line containing the exact public test value, with optional indentation and trailing comma. Gitleaks (a tool that searches for possible secrets) still uses `regexTarget = "line"` and its default rules. The exception retains its public-source explanation and does not exempt a file or a class of keys. + +I parsed the configuration fetched at the reviewed revision and tested all allowlist expressions against six synthetic lines. The original field with and without its comma matched. A different field name, a different value, an appended second field and a prepended second field did not match any allowlist expression. This independently verifies that the r2 same-line bypass is closed. It is a direct expression test, not an independent rerun of the coordinator's reported scanner exit-1 experiment. + +The two storage guide files and scanner configuration in the supplied worktree (separate working copy) matched the remote revision byte for byte. The legacy text has not changed since r2: its only difference from source #18 remains the documented site-key placeholder. The English “verbatim” sentence now explicitly acknowledges that exception. Earlier image, deletion, attribution and other port checks remain applicable because those files are unchanged. + +Run from the supplied worktree root; the observed result is PASS, 75 checked files, 8 exemptions and 197 glossary warnings: + +```sh +python3 tools/docs_check.py --all-warnings +``` + +### Minor notes and limits + +The Japanese “legacy content” sentence still says the original is preserved as-is, although its “latest changes” section explains the exception. Align that short sentence with the corrected English sentence when polishing the guide. The wrapper also remains at version 0.2; a new learned-lesson version entry would complete the SPEC-06 §6 follow-up noted in r2. Neither note affects the exact-value security correction or conceals the already bilingual substitution explanation. + +Application services were not run. No commits, pushes, approvals, merges, closures or container-state changes were performed. The coordinator retains integration responsibility and should retain the passing hosted-check evidence for this revision. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**軽微な注記付きで受入可能 — R1 は解決、実装の阻害指摘は残らない。** 遠隔検査8本すべての合格を確認した。[全履歴の秘密情報検査](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42105028993/job/127517449360)、文書ビルド、リンク、非公開 URL 方針、静的解析、報告専用のファイル検査、二つの版の単体テストを含む。文書上の判定であり、承認やマージの操作ではない。 + +### 検証 + +遠隔の `.gitleaks.toml` は、公開テスト値そのものを持つ `recaptchaSiteKey` 欄の一行全体に除外を限定した。字下げと末尾のカンマだけを任意に許す。Gitleaks(秘密情報の疑いを探す道具)は `regexTarget = "line"` と既定の検出規則を維持する。公開出典の説明も残り、ファイル全体や鍵の種類全体は除外していない。 + +対象の版から設定を取得・解析し、人工的な6行に対して全除外式を検証した。元の欄はカンマあり・なしの両方で一致した。異なる欄名、異なる値、同じ行の後方への別欄追加、前方への別欄追加はいずれの除外式にも一致しなかった。r2 の同一行での除外回避が解消したことを独立に確認した。これは式そのものの検証であり、調整者が報告した検査ツールの exit 1 実験を独立に再実行したものではない。 + +指定された作業ツリー(別の作業用コピー)のストレージ手引き2件と検査設定は、遠隔の対象版とバイト単位で一致した。旧本文は r2 以降変わっておらず、元の #18 との差は説明済みのサイトキー代替文字列だけである。英語の「原文のまま」の文は、この例外を明記するようになった。画像・削除・出典・他の移植については変更がないため、以前の検証が引き続き適用される。 + +指定された作業ツリーのルートで次を実行した結果、75件検査・8件対象外・用語警告197件で PASS となった。 + +```sh +python3 tools/docs_check.py --all-warnings +``` + +### 軽微な注記と限界 + +日本語の「過去のコンテンツ」の短い文はまだ「そのまま」となっているが、「最近の変更」には例外の説明がある。文書を整える際に、短い文も修正済みの英語に合わせるとよい。案内の版も0.2のままであり、学びを記した新しい版を追加すれば r2 の SPEC-06 §6 の指摘への対応が完了する。どちらも値を限定した秘密情報検査の修正には影響せず、すでに英和で書かれた置換理由を隠すものでもない。 + +アプリケーションのサービスは起動していない。コミット・プッシュ・承認・マージ・終了処理・コンテナ状態変更は行っていない。調整者が統合の責任を持ち、この版の遠隔検査合格の証拠を残すこと。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Anchored expression | A matching rule fixed to the start and end of a line. | 行頭から行末までを固定して一致させる規則。 | +| Allowlist | Explicit exceptions to a check. | 検査の対象から明示的に除く条件。 | +| Placeholder | Temporary text to replace with a suitable value before use. | 利用前に適切な値へ置き換える仮の文字列。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR28_Cas_Prebuilt_r1.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR28_Cas_Prebuilt_r1.md new file mode 100644 index 0000000..9bdf0a0 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR28_Cas_Prebuilt_r1.md @@ -0,0 +1,117 @@ +# REV PR #28 CAS prebuilt review r1 / CAS 配布イメージレビュー r1 + +> **Summary:** The pinned image and manifest checks pass, and the revised tests pass. Hold acceptance for a factual wording correction and the failing secret scan. +> **概要:** 固定したイメージとマニフェスト検査、修正後のテストは成功。事実に関する文言修正と秘密情報走査の失敗解消まで受入を保留する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** a successful prebuilt pull does not prove retagging, and passing manifest checks does not establish a clean history scan. / 配布イメージの取得成功はタグ付けの実施を証明せず、マニフェスト検査の成功は履歴の秘密情報走査の成功を意味しない。 +- Applies to: [PR #28](https://github.com/RCOSDP/RDM-developer-guide/pull/28), `fix/manifest-cas-prebuilt` → `develop`, head (reviewed revision / 検査した版) `cc2e9c37fa891697e08e9ef24bf35a41308bb427`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-01](../spec/01_manifest.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [DEMO-20](../demo/20_core_install_mac_studio.md) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and findings + +**Hold — R1 wording correction and R2 security-check disposition required.** This is a written verdict, not GitHub approval. The manifest (component configuration) change itself satisfies SPEC-01. + +**R1 / P2 — Correct the claimed retagging in both languages.** DEMO-20 lines 103 and 199 say “image tagged for Compose” and “Compose 用のタグ付け”. The prebuilt branch in `installer/grdm_dev/build.py` pulls the digest reference and records that same reference; it does not run a tag operation. Compose (the tool that connects the application containers) uses the reference directly, as specified in SPEC-01. Replace the wording with “digest reference used by Compose” and its Japanese equivalent. The run log supports a successful pull and a `prebuilt` report row, not retagging. P2 means an ordinary correction needed before acceptance. + +**R2 / gate — Secret scan is red.** Latest CI (automatic checks on a proposed change; [glossary](../reference/REF-01_Glossary.md)) has seven passing checks and one failure: [gitleaks job](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42105829745/job/127520265415). Its report identifies `generic-api-key` at `docs/guides/storage-addon/README.legacy.md:224`, historical commit `b8594c363a990a3b43119a0a29229766e24b4a59`. The offending value is deliberately not reproduced. This is outside the PR's changed files; the report alone does not establish whether it is a live secret or a false positive. Resolve or document an evidence-based disposition and obtain a successful check; do not describe CI as fully passing. + +### Verification + +The three changed files and `manifest/upstreams.toon` matched bytes fetched with `gh` at the reviewed head. The supplied `wt-cas` checkout was used for local checks. TOON is compact structured text; the following block records observations rather than mirroring canonical JSON. + +```toon +checks[5]{check,result}: + manifest_check,"PASS; MC-11 parity and private-reference policy included" + manifest_toon_check,"PASS; byte-for-byte generated excerpt unchanged" + docs_check,"PASS; 73 files checked; 197 warnings" + installer_tests,"PASS; 320 tests; 10 skipped" + latest_ci,"7 PASS; secret scan FAIL" +``` + +A digest (content fingerprint) pins `niicloudoperation/rdm-cas-overlay` to `sha256:d2f018a957162c4bcaeefdd1645ec7516d0a670199e1813712d91b9e676fa661`. Read-only registry inspection confirmed it is the `linux/amd64` image manifest, not the parent index (`sha256:7644e519dbd9393527257df7f4703cc67e7e52c141eaf831740696177f2a9b17`) or the `unknown/unknown` attestation. The public image reference contains no private repository reference. Its note explains the emulated Maven hang and explicitly requires removal at M4 (the modernization milestone). The TOON excerpt does not project the changed note or `prebuilt_image`, so leaving it unchanged is correct. + +Run 3 in both languages agrees on the command, five steps, five images, ember prebuilt success, CAS cancellation with buildx exit 130, and installer exit 30. The local session evidence `scratchpad/install-run3.log` confirms the prebuilt report, cancellation, failure at build, and `INSTALL_EXIT=30`; no later startup step is recorded. The supplied operator observation of 8 h 08 m at 0% CPU is consistently translated, but the log has no independent wall-clock/CPU measurement establishing those exact values. Those remain operator-reported observations, not measurements reproduced by this review. The version increases from 0.2 to 0.3 with bilingual Learned text and preserves prior entries. + +The new membership assertions correctly remove the assumption that ember is the only prebuilt component while retaining checks that ember switches back to a source build when its fallback is removed. Both hosted Python 3.11/3.12 test jobs now pass; the two earlier failures at head `86dfd11` are resolved. + +From the reviewed checkout root, reproduce the local checks and inspect the registry/CI with: + +```sh +python3 tools/manifest_check.py +PYTHONPATH=installer python3 -m grdm_dev.cli manifest toon --check +python3 tools/docs_check.py +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +docker buildx imagetools inspect niicloudoperation/rdm-cas-overlay:latest +gh pr checks 28 --repo RCOSDP/RDM-developer-guide +``` + +Expect the local checks to pass and the image platform/digest to match the recorded observation; the last command currently exits nonzero for the secret scan. No real installation or Docker state change was performed. Ten skipped tests, exact CPU/time telemetry, and CAS application behavior remain unverified. The coordinator owns corrections, recording the review in version control, and later integration. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +**保留 — R1 の文言修正と R2 のセキュリティ検査の処置が必要。** 文書上の判定であり、GitHub の承認送信ではありません。マニフェスト(部品の構成表)の変更自体は SPEC-01 を満たします。 + +**R1 / P2 — 両言語のタグ付け実施の記述を修正してください。** DEMO-20 の103行目と199行目は “image tagged for Compose”/「Compose 用のタグ付け」としています。`installer/grdm_dev/build.py` の prebuilt 分岐は digest 参照を取得し、同じ参照を記録します。タグ操作は行いません。Compose(アプリの各コンテナをつなぐ道具)は SPEC-01 のとおり参照を直接使用します。「Compose が digest 参照を使用」に相当する表現へ英和とも直してください。実行ログが裏付けるのは取得成功と `prebuilt` 報告行であり、タグ付けではありません。P2 は受入前に必要な通常優先度の修正です。 + +**R2 / ゲート — 秘密情報走査が失敗しています。** 最新 CI(変更提案の自動検査。[用語集](../reference/REF-01_Glossary.md))は7件成功・1件失敗です。[gitleaks ジョブ](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42105829745/job/127520265415) の報告は、履歴上のコミット `b8594c363a990a3b43119a0a29229766e24b4a59` の `docs/guides/storage-addon/README.legacy.md:224` に `generic-api-key` を検出しています。検出値は転載していません。PR の変更ファイル外ですが、報告だけでは実際の秘密か誤検知かを確定できません。解消するか根拠ある処置を記録し、検査成功を確認してください。CI 全件成功とは扱えません。 + +### 検証 + +変更3ファイルと `manifest/upstreams.toon` を、対象 head から `gh` で取得した内容とバイト単位で照合しました。ローカル検査は指定された `wt-cas` の作業用コピーで行いました。TOON は短い構造化テキストです。次の値は実測結果であり、正本 JSON の写しではありません。 + +```toon +checks[5]{check,result}: + manifest_check,"成功; MC-11 一致と非公開参照ポリシーを含む" + manifest_toon_check,"成功; 生成した抄録とバイト単位で一致" + docs_check,"成功; 73 ファイル; 警告 197 件" + installer_tests,"成功; 320 テスト; 10 skip" + latest_ci,"7 成功; 秘密情報走査 失敗" +``` + +digest(内容の指紋)は `niicloudoperation/rdm-cas-overlay` を `sha256:d2f018a957162c4bcaeefdd1645ec7516d0a670199e1813712d91b9e676fa661` に固定しています。配布先への読み取り専用の照会で、これは `linux/amd64` のイメージマニフェストであり、親インデックス(`sha256:7644e519dbd9393527257df7f4703cc67e7e52c141eaf831740696177f2a9b17`)や `unknown/unknown` の証明用データではないと確認しました。公開イメージの参照に非公開リポジトリ参照はありません。note はエミュレーション下の Maven ハングと、M4(近代化の節目)での撤去を明記しています。TOON 抄録には変更した note と `prebuilt_image` を含めないため、抄録を変更しないことは正しい対応です。 + +第3回の英和は、コマンド、5手順、5イメージ、ember の prebuilt 成功、buildx 終了130による CAS 中断、installer 終了30が一致します。セッション内の `scratchpad/install-run3.log` で prebuilt 報告、中断、build での失敗、`INSTALL_EXIT=30` を確認しました。後続の起動手順の記録はありません。依頼で提供された「8時間08分・CPU 0%」の操作者観察は英和で一致しますが、ログにはその正確な値を独立に証明する経過時刻・CPU 測定がありません。この値は操作者からの報告であり、本レビューで再測定した値ではありません。版は0.2から0.3へ上がり、英和の Learned と以前の版の記録を保持しています。 + +新しい所属検証は「ember だけが prebuilt」という前提を取り除き、ember の代替設定を外すと元から組み立てることの検査を維持しています。ホスト側の Python 3.11/3.12 の両テストジョブは成功し、旧 head `86dfd11` の2件の失敗は解消しています。 + +対象作業コピーのルートから、次のコマンドでローカル検査と配布先・CI の照会を再現できます。 + +```sh +python3 tools/manifest_check.py +PYTHONPATH=installer python3 -m grdm_dev.cli manifest toon --check +python3 tools/docs_check.py +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +docker buildx imagetools inspect niicloudoperation/rdm-cas-overlay:latest +gh pr checks 28 --repo RCOSDP/RDM-developer-guide +``` + +ローカル検査の成功と、記録したイメージの対象環境・digest との一致が期待結果です。最後のコマンドは現在、秘密情報走査の失敗で非ゼロ終了します。実機導入と Docker の状態変更は行っていません。skip 10件、正確な CPU・経過時間の計測、CAS アプリの動作は未検証です。修正、レビューの版管理への記録、その後の統合判断は連携調整側に残ります。 + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Prebuilt image | A packaged program built beforehand. | あらかじめ組み立てたプログラムの配布物。 | +| Digest | Fingerprint identifying exact content. | 同じ内容を特定する指紋。 | +| Manifest | Configuration or image description. | 構成やイメージの説明表。 | +| CI | Automatic checks on a change. | 変更に対する自動検査。 | +| TOON | Compact structured text. | 短い構造化テキスト。 | +| Tag | A name attached to an image. | イメージに付ける名前。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR28_Cas_Prebuilt_r2.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR28_Cas_Prebuilt_r2.md new file mode 100644 index 0000000..33f4ef8 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR28_Cas_Prebuilt_r2.md @@ -0,0 +1,98 @@ +# REV PR #28 CAS prebuilt review r2 / CAS 配布イメージレビュー r2 + +> **Summary:** Both r1 findings are resolved. The corrected explanation matches the implementation, and all eight hosted checks pass on the reviewed revision. +> **概要:** r1 の指摘2件は解決した。修正した説明は実装と一致し、対象の版で遠隔検査8件すべての成功を確認した。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** a history scan can detect another fetched branch, so its failure must be traced to the scanned revision and exact exception before judging a change. / 履歴検査は取得した別ブランチも検出するため、変更を判定する前に検出した版と限定的な除外条件を追う必要がある。 +- Applies to: [PR #28](https://github.com/RCOSDP/RDM-developer-guide/pull/28) (a proposed change / 変更提案), reviewed head (revision / 対象の版) `e2cd59d4662b81d9ebf653d6b99a7671821bf79f`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r1](2026-11-06_RDM-developer-guide_PR28_Cas_Prebuilt_r1.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [DEMO-20](../demo/20_core_install_mac_studio.md) · [Shared glossary](../reference/REF-01_Glossary.md). +- Used by: [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Accept — R1 and R2 resolved; no remaining blocking findings in this re-review.** This is a written verdict, not a GitHub approval. CI (automatic checks on a change; [glossary](../reference/REF-01_Glossary.md)) is 8/8 passing at the reviewed head. + +### R1: implementation and wording agree + +Both run-3 paragraphs in DEMO-20 now describe a prebuilt image (a program packaged beforehand) pulled for the component platform, a `prebuilt` build-report row, and the same reference written as Compose `image:` without local retagging. Compose is the tool that connects application containers; a container is a box holding a program and its dependencies. + +In `installer/grdm_dev/build.py`, `component_platforms` selects the requested or configured platform, `pull_argv` builds the pull command, and the prebuilt branch of `run` records the original reference and skips the source-build branch. Its successful non-push status is `prebuilt`. In `installer/grdm_dev/manifest.py`, `Component.image_reference` returns `prebuilt_image` directly and `services_for_profile` assigns it to the service. In `installer/grdm_dev/compose.py`, `render_service` writes `svc.image` as `image:`. There is no retagging in that path. The English and Japanese corrections match this behavior. + +### R2: history-scan explanation and correction confirmed + +The historical finding recorded in r1 is `docs/guides/storage-addon/README.legacy.md:224` at `b8594c363a990a3b43119a0a29229766e24b4a59`. Fetching that file confirms the documented public reCAPTCHA test site key in the `recaptchaSiteKey` field. The value is not repeated here. The commit appears in [PR #27](https://github.com/RCOSDP/RDM-developer-guide/pull/27), whose source branch was `docs/port-legacy-prs`. Comparing that commit with the old PR #28 head `cc2e9c37fa891697e08e9ef24bf35a41308bb427` returns diverged histories; it was not an ancestor of that old head. + +`.github/workflows/security.yml` checks out with `fetch-depth: 0` and runs gitleaks v8.21.2 (a possible-secret detector) with `detect --source . --config .gitleaks.toml --redact --exit-code 1`, without restricting `--log-opts`. The version's `sources/git.go`, fetched through `gh`, defaults to `git log -p -U0 --full-history --all`. Thus the scan covers all fetched refs (names pointing to revisions), not only the PR's changed files or its own ancestry. The old failed job reports 118 commits scanned and one finding. This supports the explanation that another fetched branch caused the earlier failure. + +PR #27 merged at `2026-11-05T20:49:37Z` as `3b42699fdb7f237db641391297b7ec66c8744ce2`. That commit is the second parent of the reviewed PR #28 merge commit. Its `.gitleaks.toml` contains the exact test-value exception with `regexTarget = "line"`, start/end anchors, the named field, optional surrounding whitespace and an optional comma. Default rules remain enabled. The exception is line-specific, not path-scoped; it does not exempt a whole file, arbitrary keys, or extra fields on that line. The [PR #27 r3 record](2026-11-06_RDM-developer-guide_PR27_Legacy_Ports_r3.md) also records its positive and negative expression checks. + +### Verification and limits + +The eight passing checks are documentation build, links, manifest/private-URL policy, gitleaks, Semgrep, report-only Trivy, and unit tests on Python 3.11 and 3.12. The [security run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42107195852) reports `success` for the exact reviewed head. Trivy passing remains report-only and does not assert that no vulnerabilities exist. + +From any directory with authenticated `gh`, reproduce the hosted-check inspection: + +```sh +gh pr checks 28 --repo RCOSDP/RDM-developer-guide +gh api repos/RCOSDP/RDM-developer-guide/actions/runs/42107195852 --jq '{head_sha,conclusion}' +``` + +Expected: eight `pass` rows and exit 0; the run reports the reviewed head and `success`. Repository content and hosted evidence were inspected with `gh`; local tests and installation were not rerun. The r1 registry verification and runtime limitations remain applicable. No Docker state was changed. Recording the review in version control and the integration decision remain with the coordinator. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**受入可能 — R1・R2 は解決し、今回の再レビュー範囲に阻害指摘は残らない。** 文書上の判定であり、GitHub の承認操作ではない。対象の版で CI(変更に対する自動検査。[用語集](../reference/REF-01_Glossary.md))8件すべての成功を確認した。 + +### R1: 実装と記述の一致 + +DEMO-20 の第3回の英和両段落は、prebuilt image(あらかじめ組み立てたプログラムの配布物)を部品の対象環境向けに取得し、ビルド報告を `prebuilt` とし、同じ参照を Compose の `image:` に書くと説明している。ローカルでタグを付け直すとはしていない。Compose はアプリのコンテナをつなぐ道具であり、コンテナはプログラムと必要な部品を入れた箱である。 + +`installer/grdm_dev/build.py` の `component_platforms` は指定または設定した対象環境を選び、`pull_argv` は取得コマンドを作る。`run` の prebuilt 分岐は元の参照を報告に記録し、ソースからのビルド分岐を通らない。push を指定しない成功時の状態は `prebuilt` である。`installer/grdm_dev/manifest.py` の `Component.image_reference` は `prebuilt_image` を直接返し、`services_for_profile` がサービスに設定する。`installer/grdm_dev/compose.py` の `render_service` は `svc.image` を `image:` に書く。この経路にタグ付け直しはなく、英和の修正文は動作と一致する。 + +### R2: 履歴検査の説明と修正を確認 + +r1 が記録した検出箇所は、`b8594c363a990a3b43119a0a29229766e24b4a59` の `docs/guides/storage-addon/README.legacy.md:224` である。その版のファイルを取得し、`recaptchaSiteKey` 欄に説明済みの公開 reCAPTCHA テスト用サイトキーがあると確認した。値は転載しない。このコミットは、元ブランチが `docs/port-legacy-prs` の [PR #27](https://github.com/RCOSDP/RDM-developer-guide/pull/27) に含まれる。PR #28 の旧 head `cc2e9c37fa891697e08e9ef24bf35a41308bb427` との比較は履歴の分岐を示し、その旧 head の祖先ではなかった。 + +`.github/workflows/security.yml` は `fetch-depth: 0` で取得し、gitleaks v8.21.2(秘密情報の疑いを探す道具)を `detect --source . --config .gitleaks.toml --redact --exit-code 1` で実行する。`--log-opts` による制限はない。`gh` で取得した同版の `sources/git.go` は既定で `git log -p -U0 --full-history --all` を使う。そのため PR の変更ファイルや祖先だけでなく、取得した全参照(版を指す名前)の履歴が走査対象になる。旧失敗ジョブも118コミット走査・1件検出を記録している。取得した別ブランチが以前の失敗を起こしたという説明と整合する。 + +PR #27 は `2026-11-05T20:49:37Z` に `3b42699fdb7f237db641391297b7ec66c8744ce2` として統合された。このコミットは、今回の PR #28 の対象マージコミットの第2親である。対象の `.gitleaks.toml` は `regexTarget = "line"`、行頭・行末の固定、欄名と公開テスト値の完全指定を持つ。前後の空白とカンマだけが任意であり、既定の検出規則も有効なままである。除外は行に限定され、パス限定ではない。ファイル全体、任意の鍵、同じ行の追加欄を除外しない。[PR #27 r3 記録](2026-11-06_RDM-developer-guide_PR27_Legacy_Ports_r3.md) にも、一致すべき行と一致すべきでない行の検証がある。 + +### 検証と限界 + +成功した8件は、文書ビルド、リンク、マニフェスト・非公開 URL 方針、gitleaks、Semgrep、報告専用の Trivy、Python 3.11・3.12 の単体テストである。[セキュリティ実行](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42107195852) は対象 head そのもので `success` となっている。Trivy は報告専用のままであり、成功は脆弱性がないという意味ではない。 + +認証済みの `gh` が使える任意のディレクトリから遠隔検査を確認できる。 + +```sh +gh pr checks 28 --repo RCOSDP/RDM-developer-guide +gh api repos/RCOSDP/RDM-developer-guide/actions/runs/42107195852 --jq '{head_sha,conclusion}' +``` + +期待結果は8行の `pass` と終了0、実行結果の対象 head 一致と `success` である。リポジトリの内容と遠隔の証拠は `gh` で確認し、ローカルテストや実機導入は再実行していない。r1 の配布先検証と実行時の未検証事項は引き続き適用される。Docker の状態変更は行っていない。レビューの版管理への記録と統合判断は調整者に残る。 + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Prebuilt image | A program packaged beforehand. | あらかじめ組み立てたプログラムの配布物。 | +| CI | Automatic checks on a proposed change. | 変更提案に対する自動検査。 | +| Ref | A name pointing to a revision. | 版を指す名前。 | +| Allowlist | Explicit exceptions to a check. | 検査から明示的に除く条件。 | +| Retagging | Attaching another image name. | イメージに別の名前を付けること。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR29_Glossary_Notes_r1.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR29_Glossary_Notes_r1.md new file mode 100644 index 0000000..57740f8 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR29_Glossary_Notes_r1.md @@ -0,0 +1,146 @@ +# PR29 Glossary notes review r1 / 用語注レビュー r1 + +> **Summary:** Changes requested: first-use placement and shared-glossary links remain incomplete, although tests and continuous checks pass. +> **概要:** 要修正。テストと継続検査は合格したが、初出への配置と共通用語集へのリンクに不足が残る。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** a case-sensitive glossary check can pass a later capitalized occurrence while missing an earlier lowercase or plural use. / 大文字小文字を区別する用語検査は、前にある小文字・複数形の使用を見落とし、後の大文字の使用だけで合格し得る。 +- Applies to: RCOSDP/RDM-developer-guide PR #29, head `8ce2065d841f7e24f567da3100035ed5e00a3abc`. +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [REF-01](../reference/REF-01_Glossary.md) · [PR #29](https://github.com/RCOSDP/RDM-developer-guide/pull/29) +- Used by: the PR author and the next review round. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Changes requested.** R1-01 and R1-02 must be resolved before acceptance; R1-03 is a smaller readability improvement. Reviewed all 22 changed Markdown documents and the checker/test changes. All 24 local files match the remote head's Git blob hashes (fingerprints of file contents). No commit, push, approval, merge, or Docker state change was performed. + +### R1-01 — P2: move notes to the first prose use + +The new notes sometimes explain a later capitalized spelling rather than the first actual use. Examples at the reviewed head: + +- [Manifest README](../../manifest/README.md): `commit` already appears at line 21, while its new explanation is at line 39; Japanese has the same gap at lines 75/93. English `pull request` at line 35 also precedes the new note at line 40. +- [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md): English `CVEs` at line 39 precedes the new `CVE` note at line 55. Japanese correctly explains it at line 114, in the corresponding first paragraph. The translations exist, but the first-use placement is not equivalent. +- [SPEC-03](../spec/03_security_gate.md): prose already uses `container` at line 65 before the new note at line 74. `allow-list` occurs at lines 24 and 54 before its explanation at line 137. The warning locations are headings only because the checker matches the capitalized glossary spellings. +- [Mac Studio demo](../demo/20_core_install_mac_studio.md): the newly added arm64 note introduces `Apple Silicon` at lines 24/120 before its explanation at lines 47/143. Explain new terms introduced inside notes too. + +Move or consolidate the notes at the earliest prose occurrence in each language, considering case, plurals and expanded names. Recheck all changed notes under that rule. The existing case-sensitive warning implementation need not be redesigned in this PR, but eight warnings cannot be described as proof that only heading-first-use gaps remain. + +### R1-02 — P2: supply the required shared-glossary links + +[SPEC-06 §3](../spec/06_documentation_conventions.md#english) requires a short note **plus a link** for terms in the shared glossary. Most additions supply only parentheses. For example, the Docker notes in [installer README](../../installer/README.md) lines 30/50 and MkDocs notes in [docs README](../README.md) lines 55/99 have no REF-01 link at their first use. A link to another specification or a later glossary table does not give the promised first-use reference. + +Add matching REF-01 links with the first-use notes in both languages, consistently across the changed documents. Keep them outside existing code spans and existing link labels/destinations. + +### R1-03 — P3: explain roles and proposals, not just their expansions + +Some new notes still presume technical knowledge: [SPEC-04](../spec/04_acceptance_tests.md) lines 134/136 says `QAE (QA engineer)` and `PR (pull request)`; the Japanese equivalents say `QA担当` and `プルリクエスト`. These are counterparts, but do not independently meet the primary-school-language goal. Prefer “the person who checks that the work is correct” and “a proposed change waiting for review,” with equivalent Japanese wording. The longer PR explanation already used elsewhere in the patch is suitable. + +### Checks and accepted aspects + +The new explanations generally agree with REF-01 and have English/Japanese counterparts; R1-01 and R1-03 qualify the placement/readability result. No unintended change to normative obligations was found. The intentional SPEC-06 §8 exception matches the implementation. Diff searches and comparison of code spans and Markdown link tokens found no injected notes inside existing code spans, links, headings or tables; version additions are learning records, not term-note injections. + +Exempting review records from glossary warnings is justified by preserving the reviewer's words. The exception does not bypass anchors, Jump, version, links or data parity. The new unit test covers an exempt review, a non-exempt specification and the REF-01/index predicates. Additional temporary probes confirmed that missing anchors, Jump, version and broken links still fail for a review file while its glossary warning stays suppressed. Adding those negative cases to the committed test would strengthen regression protection. The directory-wide exemption also covers the review index and future records, as the updated specification states. + +Commands were run from the supplied worktree root. These are recorded verification commands, not changes to the system: + +```sh +python3 tools/docs_check.py --all-warnings +python3 -m unittest discover -s tools/tests +gh pr checks 29 --repo RCOSDP/RDM-developer-guide +``` + +The documentation check passed: 78 checked files, eight legacy/sample exemptions and eight warnings; review files produced no glossary warnings. All 78 unit tests passed. All eight remote checks passed: site build, links, manifest policy, secret scan, static analysis, filesystem scan and unit tests on Python 3.11/3.12. + +The warning classification from manual inspection is recorded here as TOON (a compact text list of records; see [REF-01](../reference/REF-01_Glossary.md#english)). Paths are relative to the repository root. + +```toon +warnings[8]{file,line,term,assessment}: + docs/spec/03_security_gate.md,84,CI,heading precedes explained prose + docs/spec/03_security_gate.md,72,Container,earlier unexplained prose at 65 + docs/spec/03_security_gate.md,84,Secret,already explained in prose at 58 + docs/spec/03_security_gate.md,133,Allow-list,earlier unexplained prose at 24 and 54 + docs/spec/03_security_gate.md,99,Semgrep,heading precedes explained prose + docs/spec/03_security_gate.md,103,OWASP ZAP,heading precedes explained prose + docs/spec/04_acceptance_tests.md,81,Shibboleth,heading precedes explained prose + docs/spec/05_upstream_tracking.md,149,COS,heading precedes explained prose +``` + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**要修正。** 合格には R1-01 と R1-02 の解消が必要。R1-03 は軽微な読みやすさの改善事項。変更された Markdown 22 文書と検査器・テストを確認した。ローカルの対象 24 ファイルは、リモート先端の Git blob ハッシュ(ファイル内容の指紋)と一致した。commit・push・approve・merge・Docker の状態変更は行っていない。 + +### R1-01 — P2: 本文の本当の初出へ注を移す + +新しい注が、実際の初出ではなく、後に登場する大文字の表記を説明している場合がある。レビュー対象先端の例: + +- [Manifest README](../../manifest/README.md): 英語は 21 行に `commit` があるが、新しい説明は 39 行。日本語も 75 行と 93 行で同じ問題がある。英語の `pull request` も 35 行にあり、注は 40 行。 +- [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md): 英語は 39 行の `CVEs` より後の 55 行に `CVE` の注がある。日本語は対応する最初の段落の 114 行で正しく説明している。訳はあるが初出への配置が対応していない。 +- [SPEC-03](../spec/03_security_gate.md): 新しい注は 74 行だが、本文の `container` は 65 行に既にある。`allow-list` も 24 行・54 行にあり、説明は 137 行。警告位置が見出しになるのは、検査器が用語集の大文字表記に一致させるため。 +- [Mac Studio 実証](../demo/20_core_install_mac_studio.md): 新しい arm64 注自体が 24 行・120 行で `Apple Silicon` を使い、その説明は 47 行・143 行。注の中で新たに使う用語にも説明が必要。 + +大文字小文字、複数形、略語の展開を考慮し、両言語で最初の本文使用へ注を移すかまとめること。変更した注全体をこの基準で再確認すること。この PR で既存の大小文字を区別する検査を作り直す必要はないが、「警告8件だから残るのは見出し初出だけ」とは結論できない。 + +### R1-02 — P2: 共通用語集への必須リンクを付ける + +[SPEC-06 §3](../spec/06_documentation_conventions.md#japanese) は共通用語集の語に「短い注とリンク」を要求する。追加の多くは括弧だけである。例えば [installer README](../../installer/README.md) の 30 行・50 行の Docker 注、[docs README](../README.md) の 55 行・99 行の MkDocs 注には初出の REF-01 リンクがない。他の仕様へのリンクや後の用語表では、初出で約束された参照を提供できない。 + +変更対象全体で、両言語の初出注に対応する REF-01 リンクを追加すること。既存のコードスパンや既存リンクのラベル・リンク先の中には入れないこと。 + +### R1-03 — P3: 略語の展開だけでなく役割と提案を説明する + +新しい注の一部はなお専門知識を前提とする。[SPEC-04](../spec/04_acceptance_tests.md) の 134 行・136 行は `QAE (QA engineer)`、`PR (pull request)`、日本語は `QA担当`、`プルリクエスト` となっている。対訳はあるが、それだけでは小学生にも分かる説明にならない。「作業が正しいか確かめる人」「レビューを待っている変更の提案」のように日英で説明するとよい。差分の他の箇所にある長めの PR 説明は適切。 + +### 検査と認められる点 + +新しい説明は概ね REF-01 と整合し、日英の対応がある。ただし配置と読みやすさには R1-01・R1-03 の留保がある。規範文の義務を意図せず変更した箇所は見つからなかった。意図的な SPEC-06 §8 の例外は実装と一致する。差分検索とコードスパン・Markdown リンクの比較では、既存のコード・リンク・見出し・表の中への注の混入はなかった。版の追加は学びの記録であり用語注の混入ではない。 + +レビュー記録の用語警告除外は、レビュワの原文を保つ理由で妥当。アンカー、Jump、版、リンク、データ一致の検査は迂回しない。追加テストは除外するレビュー、除外しない仕様、REF-01 と索引の判定を覆う。一時ファイルによる追加検証でも、レビューの用語警告は抑制しつつ、アンカー・Jump・版の欠落と壊れたリンクは失敗した。この異常系も正式なテストに入れると回帰防止が強くなる。フォルダ全体の除外は、更新後の仕様どおりレビュー索引と将来の記録も含む。 + +指定 worktree のルートで実行した確認コマンド: + +```sh +python3 tools/docs_check.py --all-warnings +python3 -m unittest discover -s tools/tests +gh pr checks 29 --repo RCOSDP/RDM-developer-guide +``` + +文書検査は合格。検査 78 ファイル、旧資料・サンプルの除外 8、警告 8。レビュー記録の用語警告はゼロ。単体テスト 78 件はすべて合格。リモートのサイト生成・リンク・manifest 方針・秘密スキャン・静的解析・ファイルシステムスキャン・Python 3.11/3.12 の単体テストの計 8 チェックもすべて合格。 + +警告の手動判定を TOON(記録を短く書く文字の形。[REF-01](../reference/REF-01_Glossary.md#japanese))で残す。パスはリポジトリのルートからの相対。 + +```toon +warnings[8]{file,line,term,assessment}: + docs/spec/03_security_gate.md,84,CI,見出しの後の本文で説明済み + docs/spec/03_security_gate.md,72,Container,65行の本文が先で未説明 + docs/spec/03_security_gate.md,84,Secret,58行の本文で既に説明済み + docs/spec/03_security_gate.md,133,Allow-list,24行と54行の本文が先で未説明 + docs/spec/03_security_gate.md,99,Semgrep,見出しの後の本文で説明済み + docs/spec/03_security_gate.md,103,OWASP ZAP,見出しの後の本文で説明済み + docs/spec/04_acceptance_tests.md,81,Shibboleth,見出しの後の本文で説明済み + docs/spec/05_upstream_tracking.md,149,COS,見出しの後の本文で説明済み +``` + +--- + +## Glossary / 用語 + +| Term | English | 日本語 | +|---|---|---| +| First prose use | The earliest use in readable body text, outside code, headings, tables and link labels. | コード・見出し・表・リンクラベル以外の、読む本文での最初の使用。 | +| False positive | A warning that reports a problem where the requirement is already met. | 要求を満たしているのに問題として出る警告。 | +| P2 / P3 | A required correction / a smaller improvement in this review. | このレビューでの要修正事項/軽微な改善事項。 | +| Regression test | A check that an earlier working behavior still works after a change. | 変更後も以前の正しい動きが保たれているかの検査。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR29_Glossary_Notes_r2.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR29_Glossary_Notes_r2.md new file mode 100644 index 0000000..8af8630 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR29_Glossary_Notes_r2.md @@ -0,0 +1,144 @@ +# PR29 Glossary notes review r2 / 用語注レビュー r2 + +> **Summary:** Changes requested: most first-use corrections are sound, but English CI and several Japanese explanations or glossary links remain incomplete. +> **概要:** 要修正。初出の修正は概ね妥当だが、英語の CI と日本語の説明・用語集リンクに不足が残る。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** a warning located at a heading is not harmless unless the following prose actually explains the term, and English-only checks cannot establish bilingual completeness. / 警告が見出しを指していても本文に説明がなければ無害ではなく、英語だけの検査では日英の完備を確認できないと分かった。 +- Applies to: RCOSDP/RDM-developer-guide PR #29, head `3a29f28a441662d748f908ccf31a2d1c853bf519`, correction `ffd64c016f89f98184d19d0bf339b735cf583bcd`. +- Related: [Review index](README.md) · [r1](2026-11-06_RDM-developer-guide_PR29_Glossary_Notes_r1.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [REF-01](../reference/REF-01_Glossary.md) · [PR #29](https://github.com/RCOSDP/RDM-developer-guide/pull/29) +- Used by: the PR author and the next review round; [review index](README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Changes requested.** R1-01's named placement problems are resolved, but R1-02 and R1-03 are not fully resolved in both languages. Reviewed the 22 existing Markdown documents changed by the PR, the checker and tests, and the r1 record. The following findings concern documentation completeness, not executable behavior. + +### R2-01 — P2: CI is still unexplained in English + +[SPEC-03](../spec/03_security_gate.md#english) line 84 is a heading containing CI, but its first body-text use at line 101 and later use at line 241 have no explanation or REF-01 link. The Japanese counterpart at line 314 has both. Add an English explanation such as “automatic checks on every change” with the glossary link, preferably in §3.5 to match Japanese. This warning is not merely a heading false positive: the claimed explanation does not exist. The r1 warning assessment was too generous on this point and is corrected here. + +### R2-02 — P2: finish the Japanese counterparts and links + +[SPEC-04](../spec/04_acceptance_tests.md#japanese) line 255 still says only `QAE(QA担当)`, with no REF-01 link; English line 134 now explains the role and links it. This is the exact R1-03 example, and leaves R1-02 unresolved too. Use “成果が正しいか検査する役割” and the matching link in Japanese. + +Other counterparts missed by the link sweep are [ADR-05](../decisions/ADR-05_Test_IdP_for_Shibboleth.md#japanese) line 120 (SAML has an explanation but no REF-01 link, unlike English line 24), [SPEC-01](../spec/01_manifest.md#japanese) line 172 (PR has neither the English line 40 explanation nor its glossary link), and [manifest README](../../manifest/README.md#japanese) line 79 (TOON still links only to SPEC-06, unlike English line 25). Add the matching glossary references and the missing PR explanation. These Japanese omissions existed before the corrective commit, but are within r1's request to complete both halves; this review does not claim they are new regressions. + +### Verified corrections and remaining warnings + +The named R1-01 examples now have explanations and REF-01 links at the first body-text use in both halves: manifest commit/SHA at 21/75 and pull request at 35/89; ADR-03 CVEs/CVE at 39/114; SPEC-03 allow-list at 24/252 and container at 65/293; demo arm64 and Apple Silicon together at 24/120. SPEC-03 image is explained at 74/302. ADR-01 merge/pull requests at 66/158 and SPEC-05 merge at 125/272 also precede the later capitalized uses. These locations exclude headings, tables, code, link labels, and header metadata, consistently with r1. + +The revised REV/QAE notes in ADR-01, AID notes in the policy index and SPEC-05, QAE notes in the specification index, and Shibboleth notes in the root README, SPEC-00 and SPEC-04 give roles or behavior in both languages. The SPEC-04 Japanese QAE exception is R2-02. Installer Docker and docs-index MkDocs links are present in both halves; ADR-01's component list has a shared sentence-end REF-01 link in both halves. The link sweep is substantial but not complete. + +All 12 warning locations were inspected individually. The claimed split of eight heading locations and four later capitalized prose locations is mechanically accurate, but does not prove that all twelve are harmless. The following is review data in TOON (a compact text record format; see [REF-01](../reference/REF-01_Glossary.md)). Line numbers refer to the reviewed head. + +```toon +warnings[12]{file,line,term,assessment}: + ADR-01,103,Merge,explained at 66 and Japanese 158 + SPEC-03,84,CI,heading but English prose lacks explanation R2-01 + SPEC-03,72,Container,explained earlier at 65 and Japanese 293 + SPEC-03,97,Image,explained earlier at 74 and Japanese 302 + SPEC-03,84,Secret,earlier explanation at 58 and Japanese 286 + SPEC-03,133,Allow-list,explained earlier at 24 and Japanese 252 + SPEC-03,99,Semgrep,explained at 101 and Japanese 329 + SPEC-03,103,OWASP ZAP,explained at 105 and Japanese 333 + SPEC-04,81,Shibboleth,explained at 83 and Japanese 204 + SPEC-05,126,Merge,explained earlier at 125 and Japanese 272 + SPEC-05,149,COS,explained at 151 and Japanese 298 + manifest README,39,Commit,explained earlier at 21 and Japanese 75 +``` + +### Verification and limits + +From the supplied worktree root, these commands passed: + +```sh +python3 tools/docs_check.py --all-warnings +python3 -m unittest discover -s tools/tests +gh pr checks 29 --repo RCOSDP/RDM-developer-guide +``` + +The documentation checker checked 79 files, exempted eight legacy/sample files, and emitted 12 warnings. All 79 unit tests passed. All eight remote checks passed at the requested head: site build, links, manifest policy, secret scan, static analysis, filesystem scan, and Python 3.11/3.12 unit tests. The checker only checks English glossary occurrences and does not enforce glossary-link presence, so these passes do not resolve R2-01/R2-02. + +Comparison against both the PR base `5975c43` and r1 head `8ce2065` found no removed or altered existing inline-code spans, fenced blocks, or Markdown link tokens in the 22 existing documents. New notes and links remain outside those existing tokens. The review-record exemption is limited to glossary warnings; the added negative test asserts failures for a missing Japanese anchor, Version and broken link. It does not explicitly assert a missing Jump line, although that check remains enabled in the implementation. No checker redesign is required for acceptance. + +Only this r2 record was written locally, and one Japanese review comment is to be posted. No source fixes, commit, push, approval, merge, close, or Docker state changes are part of this review. The author must finish R2-01/R2-02 before acceptance. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**要修正。** R1-01 で名指しした配置の問題は解消したが、R1-02・R1-03 は両言語で完了していない。PR が変更する既存 Markdown 22 文書、検査器とテスト、r1 記録を確認した。以下は実行時の動作ではなく文書の完備性の指摘である。 + +### R2-01 — P2: 英語の CI が未説明 + +[SPEC-03](../spec/03_security_gate.md#english) の 84 行は CI を含む見出しだが、本文の初出 101 行と後出 241 行にも説明・REF-01 リンクがない。日本語の 314 行には両方ある。「変更ごとに自動で走る検査」に相当する英語の説明と用語集リンクを、できれば日本語と同じ §3.5 に加える。この警告は単なる見出し由来の誤検出ではなく、説明自体が存在しない。r1 のこの警告への判定は甘かったため、ここで訂正する。 + +### R2-02 — P2: 日本語の対訳とリンクを仕上げる + +[SPEC-04](../spec/04_acceptance_tests.md#japanese) 255 行は今も `QAE(QA担当)` だけで REF-01 リンクがない。英語の 134 行には役割の説明とリンクが加わった。これは R1-03 で挙げた箇所そのもので、R1-02 も未解消である。日本語にも「成果が正しいか検査する役割」と対応するリンクを加える。 + +リンク補完で漏れた他の対訳は、[ADR-05](../decisions/ADR-05_Test_IdP_for_Shibboleth.md#japanese) 120 行の SAML(説明はあるが英語 24 行と異なり REF-01 リンクなし)、[SPEC-01](../spec/01_manifest.md#japanese) 172 行の PR(英語 40 行にある説明も用語集リンクもなし)、[manifest README](../../manifest/README.md#japanese) 79 行の TOON(英語 25 行と異なり SPEC-06 へのリンクだけ)。対応する用語集参照と、PR の説明を補う。これらの日本語側の不足は修正コミット以前からあるが、r1 の「両言語を完成させる」という要求の範囲内であり、新規の退行と主張するものではない。 + +### 確認できた修正と残る警告 + +R1-01 の名指し箇所には両言語の本文初出に説明と REF-01 リンクがある。manifest の commit/SHA は 21/75 行、pull request は 35/89 行、ADR-03 の CVEs/CVE は 39/114 行、SPEC-03 の allow-list は 24/252 行、container は 65/293 行、実証の arm64 と Apple Silicon は同じ注の 24/120 行。SPEC-03 の image は 74/302 行。ADR-01 の merge/pull requests は 66/158 行、SPEC-05 の merge は 125/272 行で後の大文字表記より前にある。r1 と同様に見出し・表・コード・リンクラベル・ヘッダのメタデータは本文初出の対象から除いている。 + +ADR-01 の REV/QAE、方針索引と SPEC-05 の AID、仕様索引の QAE、ルート README・SPEC-00・SPEC-04 の Shibboleth は両言語で役割や動作を説明している。SPEC-04 の日本語 QAE の例外が R2-02。installer の Docker と docs 索引の MkDocs にも両言語のリンクがあり、ADR-01 の部品一覧には両言語で文末の共通 REF-01 リンクがある。リンク補完は大幅に進んだが完了ではない。 + +12 警告を一つずつ確認した。「見出しの位置が8件、後出の大文字本文が4件」という位置の分類自体は正しいが、12件とも無害という意味にはならない。手動判定を TOON(記録を短く書く文字形式。[REF-01](../reference/REF-01_Glossary.md))で残す。行番号はレビュー対象先端のもの。 + +```toon +warnings[12]{file,line,term,assessment}: + ADR-01,103,Merge,66行と日本語158行で説明済み + SPEC-03,84,CI,見出しだが英語本文にも説明なし R2-01 + SPEC-03,72,Container,前の65行と日本語293行で説明済み + SPEC-03,97,Image,前の74行と日本語302行で説明済み + SPEC-03,84,Secret,前の58行と日本語286行に説明あり + SPEC-03,133,Allow-list,前の24行と日本語252行で説明済み + SPEC-03,99,Semgrep,101行と日本語329行で説明済み + SPEC-03,103,OWASP ZAP,105行と日本語333行で説明済み + SPEC-04,81,Shibboleth,83行と日本語204行で説明済み + SPEC-05,126,Merge,前の125行と日本語272行で説明済み + SPEC-05,149,COS,151行と日本語298行で説明済み + manifest README,39,Commit,前の21行と日本語75行で説明済み +``` + +### 検証と限界 + +指定 worktree のルートで以下が合格した。 + +```sh +python3 tools/docs_check.py --all-warnings +python3 -m unittest discover -s tools/tests +gh pr checks 29 --repo RCOSDP/RDM-developer-guide +``` + +文書検査は79ファイルを検査、旧資料・サンプル8件を除外し、12警告。単体テスト79件は全件合格。指定先端のリモート8チェック(サイト生成、リンク、manifest 方針、秘密スキャン、静的解析、ファイルシステムスキャン、Python 3.11/3.12 単体テスト)もすべて合格した。用語検査は英語だけを見ており、用語集リンクの存在は強制しないため、合格しても R2-01/R2-02 は解消しない。 + +PR の基点 `5975c43` と r1 先端 `8ce2065` の両方との比較で、既存22文書のコードスパン・コードブロック・Markdown リンクの削除や改変はなかった。新しい注とリンクは既存のそれらの外に置かれている。レビュー記録の例外は用語警告だけで、追加の異常系テストは日本語アンカー・Version の欠落と壊れたリンクの失敗を確認する。Jump 行欠落の明示的な検証はこのテストにないが、実装では検査が有効なまま。この PR の受入に検査器の再設計は不要。 + +ローカルにはこの r2 記録だけを作成し、日本語コメントを1件投稿する。本文の修正、commit・push・approve・merge・close、Docker の状態変更はレビュー作業に含めない。受入前に作者による R2-01/R2-02 の完了が必要。 + +--- + +## Glossary / 用語 + +| Term | English | 日本語 | +|---|---|---| +| P2 | A correction required before this review accepts the change. | このレビューが受け入れる前に必要な修正。 | +| False positive | A warning even though the requirement is already satisfied. | 要求を満たしているのに出る警告。 | +| Regression | Previously correct behavior that a change breaks. | 変更によって以前の正しい動きが壊れること。 | +| CI | Automatic checks that run when a change is proposed or saved. | 変更を提案・保存したときに自動で走る検査。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR29_Glossary_Notes_r3.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR29_Glossary_Notes_r3.md new file mode 100644 index 0000000..fcbfb8f --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR29_Glossary_Notes_r3.md @@ -0,0 +1,102 @@ +# PR29 Glossary notes review r3 / 用語注レビュー r3 + +> **Summary:** Changes requested: the five requested additions are present and bilingual, but the PR glossary link in SPEC-01 remains after its first body-text use. +> **概要:** 要修正。指定5箇所の補完と日英の対応は確認できたが、SPEC-01 の PR の用語集リンクは本文初出より後にある。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** checking the location named in an earlier finding is insufficient; the first body-text occurrence must also be checked in each language. / 前回指摘の位置だけでは不十分で、両言語の本文初出も確認する必要があると分かった。 +- Applies to: RCOSDP/RDM-developer-guide PR #29, head `149513c699c0fbf8f69013d299d3921f19b50b72`, correction `32ccdf2000c5c1ac9921bcdb44d444f04f5ed61a`. +- Related: [Review index](README.md) · [r2](2026-11-06_RDM-developer-guide_PR29_Glossary_Notes_r2.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [REF-01](../reference/REF-01_Glossary.md) · [PR #29](https://github.com/RCOSDP/RDM-developer-guide/pull/29) +- Used by: the author and the next reviewer; [review index](README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Changes requested.** R2-01 is resolved. All four additions explicitly requested by R2-02 are present, but its PR link placement needs one further correction under SPEC-06 §3. No executable behavior was changed by the corrective commit. This is REV's review verdict, not a GitHub approval. + +### Verified corrections + +[SPEC-03 §3.5](../spec/03_security_gate.md#english) line 86 explains CI as automatic checks on every change and links REF-01, matching Japanese line 314. This is the first body-text CI occurrence in each half; the heading at line 84 may remain unannotated under the placement interpretation used in r1/r2. R2-01 is resolved even though the automated warning remains. + +[SPEC-04](../spec/04_acceptance_tests.md#japanese) line 255 now explains QAE as the role checking that work is correct and links REF-01, matching English line 134. [ADR-05](../decisions/ADR-05_Test_IdP_for_Shibboleth.md#japanese) line 120 links its SAML explanation to REF-01, matching English line 24. [Manifest README](../../manifest/README.md#japanese) line 79 adds REF-01 alongside the existing SPEC-06 link and explains TOON consistently with English line 25. These notes are at the first body-text uses in both halves, excluding headings, header metadata, tables, code and link labels as in the preceding reviews. + +[SPEC-01](../spec/01_manifest.md#japanese) line 172 now explains PR as a proposed change awaiting review and links REF-01, matching English line 40. This satisfies the specific r2 request at the warning paragraph, but not the first-use link requirement described in R3-01. + +### R3-01 — P2: put the PR glossary link at the first body-text use in both halves + +[SPEC-01](../spec/01_manifest.md#english) line 26 already explains “pull requests (*PRs*, proposed changes waiting to be merged)” without a REF-01 link. Its Japanese counterpart at line 158 likewise explains PR without that link. These are ordinary prose in §1, before the linked notes at lines 40/172 in §2. SPEC-06 §3 requires a short note **plus a link at first use**. Add a REF-01 link beside the existing explanation at lines 26 and 158; keep the explanations outside existing code and link tokens. No wording change to executable examples is needed. + +This omission predates `32ccdf2`; it is not a regression introduced by that commit. The r2 review named only the later warning paragraph and missed these earlier occurrences. That oversight is corrected here rather than treating the successful requested edit as sufficient evidence of placement compliance. + +### Verification and limits + +Run from the supplied worktree root; all commands completed successfully: + +```sh +python3 tools/docs_check.py --all-warnings +python3 -m unittest discover -s tools/tests +gh pr checks 29 --repo RCOSDP/RDM-developer-guide +``` + +The checker passed with 80 files checked, eight exempt and the same 12 warnings recorded in r2. The CI warning now has a valid explanation in the following paragraph; the other eleven warning locations are unchanged by the correction. All 79 unit tests passed. All eight remote checks passed at the reviewed head: site build, links, manifest policy, secret scan, static analysis, filesystem scan, and Python 3.11/3.12 unit tests. The first remote observation had static analysis pending; the final observation confirmed its pass. These checks do not enforce Japanese glossary completeness or first-use glossary-link presence. + +The corrective diff changes only the five requested prose lines, preserving existing code spans, fenced blocks and links. The new untracked review record is checked separately with the documentation checker's per-file function because the normal command enumerates tracked files. Only this r3 record is written locally, and one Japanese PR comment is posted; no commit, push, approval, merge, close or Docker state change is performed. The author still needs to address R3-01 and include the review record in the branch. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**要修正。** R2-01 は解消。R2-02 が明示した4箇所の補完もあるが、PR のリンク配置には SPEC-06 §3 に基づく追加修正が必要。修正コミットは実行時の動作を変えていない。これは REV(担当レビュワ)の判定であり、GitHub の承認操作ではない。 + +### 確認した修正 + +[SPEC-03 §3.5](../spec/03_security_gate.md#english) 86行は CI を変更ごとの自動検査と説明し、REF-01 にリンクしており、日本語314行と対応する。両言語とも本文初出にある。84行の見出しは r1/r2 と同じ配置解釈により注を付けなくてよい。自動警告は残るが R2-01 は解消した。 + +[SPEC-04](../spec/04_acceptance_tests.md#japanese) 255行は QAE を「成果が正しいか検査する役割」と説明し、REF-01 にリンクして英語134行と対応する。[ADR-05](../decisions/ADR-05_Test_IdP_for_Shibboleth.md#japanese) 120行の SAML 注には REF-01 リンクが付き、英語24行と対応する。[manifest README](../../manifest/README.md#japanese) 79行は既存 SPEC-06 リンクに REF-01 を加え、TOON の説明も英語25行と整合する。先行レビューと同様、見出し・ヘッダのメタデータ・表・コード・リンクラベルを除くと、これらは両言語の本文初出に置かれている。 + +[SPEC-01](../spec/01_manifest.md#japanese) 172行は PR をレビュー待ちの変更の提案と説明し、REF-01 にリンクして英語40行と対応する。r2 が警告段落に求めた修正は満たすが、R3-01 の本文初出リンク要件は満たしていない。 + +### R3-01 — P2: PR の用語集リンクを両言語の本文初出に置く + +[SPEC-01](../spec/01_manifest.md#english) 26行には既に “pull requests (*PRs*, proposed changes waiting to be merged)” という説明があるが、REF-01 リンクがない。日本語158行も PR の説明はあるがリンクがない。いずれも §1 の通常の本文で、リンクを付けた §2 の40/172行より前にある。SPEC-06 §3 は初出に短い注とリンクの両方を求める。26行と158行の既存の説明に REF-01 リンクを添えること。既存のコードやリンクの内部には注を入れない。実行例の変更は不要。 + +これは `32ccdf2` より前からある不足で、同コミットが生んだ退行ではない。r2 は後の警告段落だけを名指しし、それ以前の出現を見落としていた。要求どおりの修正が済んだことだけで配置規則も満たしたとはせず、その見落としをここで訂正する。 + +### 検証と限界 + +指定 worktree のルートで次を実行し、すべて成功した。 + +```sh +python3 tools/docs_check.py --all-warnings +python3 -m unittest discover -s tools/tests +gh pr checks 29 --repo RCOSDP/RDM-developer-guide +``` + +文書検査は80ファイルを検査、8件を除外し、r2 と同じ12警告で合格。CI の警告は直後の本文に説明が存在する状態になり、ほかの11警告位置は今回の修正で変わらない。単体テスト79件は全件合格。対象先端のリモート8チェック(サイト生成、リンク、manifest 方針、秘密スキャン、静的解析、ファイルシステムスキャン、Python 3.11/3.12 単体テスト)も全件合格。初回確認では静的解析が実行中だったが、最終確認では合格を確認した。これらの検査は日本語の用語注の完備や初出での用語集リンクの存在を強制しない。 + +修正差分は指定5箇所の本文行だけで、既存コードスパン・コードブロック・リンクは保持されている。通常の文書検査は追跡済みファイルを列挙するため、未追跡の新規レビュー記録は検査器のファイル単位の関数で別途確認する。ローカルにはこの r3 記録だけを書き、日本語の PR コメントを1件投稿する。commit・push・approve・merge・close、Docker 状態変更は行わない。作者による R3-01 の修正とレビュー記録のブランチへの収録が残る。 + +--- + +## Glossary / 用語 + +| Term | English | 日本語 | +|---|---|---| +| CI | Automatic checks on each change. | 変更ごとに自動で走る検査。 | +| PR | A proposed change awaiting review. | レビュー待ちの変更の提案。 | +| QAE | The role checking that work is correct. | 成果が正しいか検査する役割。 | +| SAML | A format for passing login results. | ログイン結果を渡し合う文書の形式。 | +| TOON | A compact text form of structured data. | 構造のあるデータを短く書く文字形式。 | +| P2 | A correction required before review acceptance. | レビューの受入前に必要な修正。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR29_Glossary_Notes_r4.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR29_Glossary_Notes_r4.md new file mode 100644 index 0000000..8b764d3 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR29_Glossary_Notes_r4.md @@ -0,0 +1,98 @@ +# PR29 Glossary notes review r4 / 用語注レビュー r4 + +> **Summary:** Accepted for the r4 re-review: R3-01 is resolved in both languages, and all required checks pass. +> **概要:** r4 再レビューは受入可。R3-01 は両言語で解消し、必要な検査はすべて合格した。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** the existing first-use explanation needs its glossary link beside it in both language halves. / 既存の初出説明に添える用語集リンクは、両言語で確認する必要があると分かった。 +- Applies to: RCOSDP/RDM-developer-guide PR #29, head `66add8ef9d391fc03c1ceb8ec1be1bbb660fa55a`. +- Related: [Review index](README.md) · [r3](2026-11-06_RDM-developer-guide_PR29_Glossary_Notes_r3.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [REF-01](../reference/REF-01_Glossary.md) · [PR #29](https://github.com/RCOSDP/RDM-developer-guide/pull/29) +- Used by: the author and integration reviewer; [review index](README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Accepted; no open findings in this re-review.** R3-01, the sole open r3 item, is resolved. This is REV's review verdict, not a GitHub approval. The review covers the two corrective commits `b3de101fef548e2d0450678be40e712db399af2c` and `66add8ef9d391fc03c1ceb8ec1be1bbb660fa55a` relative to r3's reviewed head `149513c699c0fbf8f69013d299d3921f19b50b72`. + +[SPEC-01](../spec/01_manifest.md#english) line 26 now links REF-01 inside the existing explanation of pull requests (PRs: proposed changes waiting to be merged). Its [Japanese counterpart](../spec/01_manifest.md#japanese) at line 158 contains the same explanation and link. Both links resolve to the shared glossary at the first body-text use under the placement interpretation established in r3. Header metadata remains outside that interpretation. The later notes at lines 40/172 remain intact. + +The cumulative correction changes only those two prose lines and adds the r3 record. Existing code spans, fenced examples and prior links are preserved; executable behavior is unchanged. + +### Verification and limits + +Run from the supplied worktree root; each command must finish successfully: + +```sh +python3 tools/docs_check.py --all-warnings +python3 -m unittest discover -s tools/tests +gh pr checks 29 --repo RCOSDP/RDM-developer-guide +``` + +Observed results are recorded in TOON (a compact text form for structured data): + +```toon +verification[3]{check,result,detail}: + documentation,pass,81 checked / 8 exempt / 12 existing warnings + unit-tests,pass,79 tests + remote-ci,pass,8 checks at 66add8ef9d391fc03c1ceb8ec1be1bbb660fa55a +``` + +CI (automatic checks on changes) passed for site build, links, manifest policy, secret scan, static analysis, filesystem scan, and Python 3.11/3.12 unit tests. The remote head matches the local reviewed head. The 12 glossary warnings have the same locations and terms as r3; they are non-failing and unchanged by these corrections. Automated checks do not enforce Japanese glossary completeness or first-use glossary-link presence, so the two corrected prose locations were inspected manually. + +The untracked r4 record is also checked directly with the documentation checker's per-file function because the normal command enumerates tracked files. Incorporating this record into the branch remains with the author. No commit, push, approval, merge, close or Docker state change is part of this review. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**受入可。この再レビューの未解決指摘はない。** r3 の唯一の未解決項目 R3-01 は解消した。これは REV のレビュー判定であり、GitHub の承認操作ではない。対象は r3 の確認先端 `149513c699c0fbf8f69013d299d3921f19b50b72` 以降の修正コミット `b3de101fef548e2d0450678be40e712db399af2c` と `66add8ef9d391fc03c1ceb8ec1be1bbb660fa55a`。 + +[SPEC-01 英語](../spec/01_manifest.md#english)26行は既存の PR(マージを待つ変更の提案)の説明内に REF-01 リンクが付いた。[日本語](../spec/01_manifest.md#japanese)158行にも同じ説明とリンクがある。リンク先は共通用語集に解決し、r3 で採用した配置解釈における本文初出に両方が置かれている。ヘッダのメタデータはこの解釈の対象外。後続の40/172行の注も保持されている。 + +修正全体はこの本文2行と r3 記録の追加だけ。既存コードスパン・コード例・既存リンクは保持され、実行時の動作変更はない。 + +### 検証と限界 + +指定 worktree のルートで実行し、各コマンドが成功終了することを確認する。 + +```sh +python3 tools/docs_check.py --all-warnings +python3 -m unittest discover -s tools/tests +gh pr checks 29 --repo RCOSDP/RDM-developer-guide +``` + +実測結果を TOON(構造のあるデータを短く書く文字形式)で記録する。 + +```toon +verification[3]{check,result,detail}: + 文書検査,合格,81件検査 / 8件除外 / 既存12警告 + 単体テスト,合格,79件 + リモートCI,合格,66add8ef9d391fc03c1ceb8ec1be1bbb660fa55a の8チェック +``` + +CI(変更に対する自動検査)はサイト生成、リンク、manifest 方針、秘密スキャン、静的解析、ファイルシステムスキャン、Python 3.11/3.12 単体テストの全件が合格。リモート先端とローカルの確認先端は一致した。用語注12警告の位置と用語は r3 と同じで、今回の修正による変化はなく、不合格扱いではない。自動検査は日本語の用語注の完備や初出の用語集リンクを強制しないため、修正した本文2箇所は手動で確認した。 + +通常の文書検査は追跡済みファイルを列挙するため、未追跡の r4 記録は検査器のファイル単位関数でも直接確認する。記録のブランチへの収録は作者に残る。commit・push・approve・merge・close、Docker 状態変更はこのレビューでは行わない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| PR | A proposed change awaiting review and merge; see [REF-01](../reference/REF-01_Glossary.md). | レビューとマージを待つ変更の提案。[REF-01](../reference/REF-01_Glossary.md)。 | +| CI | Automatic checks on changes; see [REF-01](../reference/REF-01_Glossary.md). | 変更に対する自動検査。[REF-01](../reference/REF-01_Glossary.md)。 | +| TOON | A compact text form for structured data. | 構造のあるデータを短く書く文字形式。 | +| Head | The latest commit being reviewed. | レビュー対象の先端コミット。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r1.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r1.md new file mode 100644 index 0000000..19f0cc8 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r1.md @@ -0,0 +1,97 @@ +# PR30 Wiki Overlay Review r1 / Wiki オーバーレイレビュー r1 + +> **Summary:** Revision required: Compose expands the copier's shell variables before execution, preventing core startup. Volume permissions and browser wiring also need resolution. +> **概要:** 要修正。Compose がコピー処理のシェル変数を実行前に展開するため core が起動できない。ボリューム権限とブラウザへの接続も解決が必要。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** Testing generated JSON does not test Compose interpolation or filesystem ownership. / 生成 JSON の試験だけでは Compose の変数展開やファイル所有権を検査できない。 +- Applies to: PR #30, head `0b6f660de38458c46428659bb3d837ec2eab4f0c`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-01](../spec/01_manifest.md) · [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md). +- Used by: [DEMO-20](../demo/20_core_install_mac_studio.md) and the PR author for the next revision. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and findings + +**Needs revision.** No approval, merge, commit, push, or Docker state changes were performed. A successful test suite does not establish a working Wiki editor. + +1. **R1-01 — P1, definite startup failure:** `installer/grdm_dev/templates/wiki_assets.json:9` embeds `$src`, `$dst`, and `$f` in Compose command text. Compose substitutes host variables before the container shell runs. A temporary core render followed by read-only `docker compose -f <generated file> config --format json` warned that these variables were unset and produced `ls "" >/dev/null; find "" -mindepth 1 -delete; cp -a ""/. ""/`. With `set -e`, the copier fails immediately, and all four dependent application services cannot start. Escape shell variables as `$$src`, `$$dst`, `$$f`, or use a script file; add a test of the actual Compose-parsed command. +2. **R1-02 — P1, first-run permissions:** `compose.py` creates `runtime/volumes/wiki_static` with ordinary `mkdir` and binds it through a local-driver volume; the copier runs as `1000:1000` without capabilities. The temporary render created a directory owned by UID 501 with mode 0755. On native Linux with a non-1000 installer UID, the copier cannot write there; Desktop permission mapping needs separate verification. Provide a deliberate ownership/provisioning strategy and test a fresh volume with a non-1000 host user. Do not resolve this by silently removing the hardening controls. +3. **R1-03 — P2, editor wiring remains missing:** the actual osf.io checkout's `addons/wiki/templates/edit.mako:733` still loads `/static/js/pages/wiki-edit-page.js`, while the new mount provides `/static/public/js/wiki/wiki-edit-page.js`. Neither the base image nor its template is changed here. ADR-06 openly records this unfinished step; the new bundle therefore is not yet used by the page. Track and pin the integration-repository fix, then demonstrate editor load and collaborative editing before declaring M2 working. Verify vendor/chunk loading in a browser rather than assuming that the alias alone is sufficient. + +### Verified implementation and evidence + +Read-only source checks used wiki commit `203d32fab60aad8d78e9b743987519252f99b817` and osf.io commit `356a997eb5fe7d4aa49c05a0bbcf736a3cf1e31f`. The wiki Dockerfile requires many base-only paths; webpack has the single `wiki-edit-page` entry and production output `website/static/public/js` with hashed names. Python application dependency installation, pybabel and collectstatic are commented out, so this image cannot serve the Python application. The literal claim “every Python step is commented out” is inaccurate: Python packages are installed and `python3 -m compileall /usr/lib/python3.6 || true` remains active. Narrow that wording in both languages. + +Context assembly recreates the destination, excludes `.git` at every level, and copies the overlay over the base; ordinary overlapping files use the overlay version. Tests cover replacement and removal of stale context files. The tag and rendered image are `grdm-dev/wiki-frontend:356a997eb5fe-203d32fab60a`; build reports carry both source identities and the combined tag. The base keeps its own image. Rendered `wiki_assets` has user `1000:1000`, `cap_drop: [ALL]`, `no-new-privileges:true`, `read_only: true`, `restart: "no"`, no published port, and only the internal network. All four consumers mount the subdirectory read-only and wait for successful completion; minimum drops the dependency. + +MC-14 rejects unknown/self/infra/overlay/prebuilt bases, infra/prebuilt overlays, and multiple overlays per base. The installer checks the one-shot template flag. Empty-string `overlay_of` is treated as absent rather than rejected despite the documented “when present” rule; tighten validation or document that normalization. Health correctly handles explicit zero/nonzero exit codes, but missing, null, and empty exit codes are also accepted as success; unknown completion should fail closed. + +ADR-06, SPEC-00/01/02, and DEMO-20 carry corresponding English/Japanese changes and version learning notes; no substantive translation mismatch was found. Anchors and Jump links pass the documentation checker. ADR-06 links to the docs root but omits its immediate parent index, contrary to SPEC-06 §5; add `docs/decisions/README.md`. DEMO-20 records run 4's missing-COPY failure, not a successful overlay build or startup. + +Additional runtime risks: `cp -a` attempts to retain root-owned build metadata under UID 1000; verify Alpine/BusyBox exit behavior and use a copy strategy that does not require ownership preservation. Clearing the shared directory before copying is not atomic: a retry or update can expose missing files to already-running consumers. Initial dependency ordering is correct once the copier succeeds, but does not protect a running application during asset replacement. Require a nonempty expected bundle/manifest before returning success. The actual merged image build, fresh-volume copy, restart/update behavior and browser acceptance were not run because Docker state changes were prohibited. + +### Validation + +Executed from the review worktree: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/manifest_check.py +python3 tools/docs_check.py +gh pr checks 30 --repo RCOSDP/RDM-developer-guide +``` + +Installer: 340 tests, OK, 10 skipped. Tools: 86 tests, OK. Manifest: zero findings. Documentation before adding this record: 79 files checked, eight exempt, 215 nonblocking glossary warnings. All eight GitHub checks passed, including Python 3.11/3.12 tests. None of these tests caught R1-01; the separate Compose parser check did. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +**要修正。** approve・merge・commit・push、および Docker の状態変更は行っていない。試験成功だけでは Wiki エディタの動作を証明できない。 + +1. **R1-01 — P1、確定した起動失敗:** `installer/grdm_dev/templates/wiki_assets.json:9` の `$src`・`$dst`・`$f` はコンテナのシェルより先に Compose がホスト変数として展開する。一時ディレクトリで core を生成し、読み取り専用の `docker compose -f <生成ファイル> config --format json` で確認すると未設定警告が出て、`ls "" >/dev/null; find "" -mindepth 1 -delete; cp -a ""/. ""/` になった。`set -e` により直ちに失敗し、依存する四つのアプリサービスも起動できない。`$$src`・`$$dst`・`$$f` とするかスクリプトファイルへ移し、Compose 解析後のコマンドを試験する。 +2. **R1-02 — P1、初回の権限:** `compose.py` は通常の `mkdir` で `runtime/volumes/wiki_static` を作り、local driver で bind する。コピー側は capability のない `1000:1000`。一時生成では UID 501、0755 のディレクトリになった。ネイティブ Linux で実行者の UID が 1000 以外なら書き込めない。Desktop の権限変換は別途検証が必要。所有権を明示的に準備する方法と、非 1000 ホストユーザーによる新規ボリューム試験を追加する。防御設定を黙って外して解決しない。 +3. **R1-03 — P2、画面への接続が未実装:** 実 osf.io checkout の `addons/wiki/templates/edit.mako:733` は `/static/js/pages/wiki-edit-page.js` を読む。新規 mount は `/static/public/js/wiki/wiki-edit-page.js` に置くが、この PR はベースイメージもテンプレートも変更しない。ADR-06 は未完と明記しているが、新しい束はまだ画面で利用されない。統合リポジトリの修正を追跡して固定し、M2 動作を宣言する前にエディタ表示・共同編集を実証する。別名ファイルだけで十分と仮定せず、vendor/chunk の読み込みもブラウザで確認する。 + +### 実装確認と証跡 + +読み取り専用で確認したコミットは wiki が `203d32fab60aad8d78e9b743987519252f99b817`、osf.io が `356a997eb5fe7d4aa49c05a0bbcf736a3cf1e31f`。wiki の Dockerfile は多数のベース側パスを必要とし、webpack の entry は `wiki-edit-page` 一つ、production 出力先は `website/static/public/js`、ファイル名にはハッシュが付く。Python アプリ依存の導入・pybabel・collectstatic はコメントアウトされ、このイメージは Python アプリを動かせない。ただし「すべての Python 手順がコメントアウト」は不正確で、Python パッケージ導入と `python3 -m compileall /usr/lib/python3.6 || true` は残る。英和とも表現を限定する。 + +文脈の組み立てはコピー先を作り直し、各階層の `.git` を除外し、ベースの上へオーバーレイをコピーする。通常の同名ファイルはオーバーレイが優先され、置換と古い文脈の除去は試験済み。タグと生成イメージは `grdm-dev/wiki-frontend:356a997eb5fe-203d32fab60a`。報告には双方の元と結合タグが入り、ベースは独自イメージを保持する。生成された `wiki_assets` は `1000:1000`、`cap_drop: [ALL]`、`no-new-privileges:true`、`read_only: true`、`restart: "no"`、公開ポートなし、内部ネットワークのみ。四つの利用側はサブディレクトリを読み取り専用で mount し、成功終了を待つ。minimum では依存を除く。 + +MC-14 は不明・自身・infra・overlay・prebuilt のベース、infra/prebuilt のオーバーレイ、同一ベースへの複数オーバーレイを拒否し、installer は一回限りのテンプレート印を検査する。ただし空文字の `overlay_of` は「存在するとき」という仕様に反して省略扱いになる。検証を強めるか正規化を明記する。health は明示的な終了コード 0/非 0 を扱うが、欠落・null・空文字まで成功とする。結果不明は成功にしない。 + +ADR-06・SPEC-00/01/02・DEMO-20 の英和変更と版の学習記録は対応し、実質的な翻訳不一致は見つからなかった。アンカーと Jump は文書検査を通過した。ADR-06 は docs ルートにリンクするが直属の親索引がなく SPEC-06 §5 に不足するため `docs/decisions/README.md` を加える。DEMO-20 の第 4 回は COPY 元欠落による失敗記録であり、オーバーレイのビルド・起動成功記録ではない。 + +追加リスク: `cp -a` は root 所有のビルド成果の属性を UID 1000 で保持しようとするため、Alpine/BusyBox での終了結果を確認し、所有権保持を必要としない方法にする。共有ディレクトリを消してからコピーする更新は不可分ではなく、再試行・更新中に稼働済み利用側からファイルが消える。初回の依存順序はコピー成功後なら正しいが、稼働中の更新は保護しない。成功扱いの前に期待する束と manifest が存在して空でないことも確認する。Docker 状態変更は禁止のため、実ビルド・新規ボリュームコピー・再起動更新・ブラウザ受入は未実施。 + +### 検証 + +実行コマンドは英語部のコードブロックのとおり。installer は 340 件 OK(10 skip)、tools は 86 件 OK、manifest は指摘 0。本記録追加前の文書検査は 79 ファイル、例外 8、非阻害の用語警告 215 で成功。GitHub の八つの検査は Python 3.11/3.12 を含め全成功。それらでは R1-01 を検出できず、別途実施した Compose 解析で検出した。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Overlay | Files laid over a base source tree before building. | 組む前にベースの木へ重ねるファイル。 | +| Compose | A tool that reads a file and coordinates containers. | ファイルを読んで複数の実行環境を動かす道具。 | +| UID | Numeric identity used to decide file access. | ファイルへのアクセスを決める利用者番号。 | +| Bundle / chunk | Browser code packaged into one or several files. | ブラウザ用コードをまとめたファイル。 | +| One-shot | A process that completes and exits. | 処理を終えたら終了するプログラム。 | +| SHA / tag | Commit identity / image name suffix. | コミットの識別値/イメージ名の末尾。 | +| CI | Automated checks run for proposed changes. | 変更案を自動で検査する仕組み。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r2.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r2.md new file mode 100644 index 0000000..c74b0d7 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r2.md @@ -0,0 +1,100 @@ +# PR30 Wiki Overlay Review r2 / Wiki オーバーレイレビュー r2 + +> **Summary:** Revision required: interpolation is fixed, but the ownership initializer cannot chmod after chown with CAP_CHOWN alone on Linux. +> **概要:** 要修正。変数展開は修正済みだが、Linux では CAP_CHOWN だけの初期化処理が chown 後の chmod に失敗する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** permission checks apply after each ownership change; a passing Compose parser does not execute those checks. / 所有者変更後の各操作には改めて権限検査があり、Compose の解析成功はその実行を検証しない。 +- Applies to: PR #30, head `7b79e3e90193c08a7d8925687b88f6fd561bdd66`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r1](2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r1.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md). +- Used by: [DEMO-20](../demo/20_core_install_mac_studio.md) · [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and blocking finding + +**Needs revision. R2-01 — P1: the initializer fails after changing ownership.** In `installer/grdm_dev/templates/wiki_static_init.json:9`, the command is `set -e; chown 1000:1000 /wiki_static; chmod 0755 /wiki_static; ls -ld /wiki_static`. The rendered service drops ALL capabilities and adds only CHOWN, with no user override (the intended root image user). After chown, root is no longer the directory owner. Linux chmod requires the owning filesystem UID or CAP_FOWNER; CAP_CHOWN does not grant this. Thus chmod returns EPERM on an ordinary Linux filesystem, even when the mode is already 0755, and `set -e` terminates the initializer. Both successful-completion dependencies then block `wiki_assets` and its four consumers. R1-02 remains unresolved. + +The kernel's [v6.12 attribute check](https://github.com/torvalds/linux/blob/v6.12/fs/attr.c) calls `inode_owner_or_capable` for ATTR_MODE and returns EPERM on failure; the [owner check](https://github.com/torvalds/linux/blob/v6.12/fs/inode.c) accepts the owner or CAP_FOWNER. These sources were read through `gh api`. This is a source-based finding, not a claimed container reproduction: Docker state changes were prohibited. Remove the unnecessary chmod if provisioning guarantees suitable mode, or implement an explicit permission strategy (including the hardening exception if a further capability is needed). Merely moving chmod before chown is insufficient when the fresh directory belongs to a nonzero host UID. Add a Linux execution test for a fresh non-1000-owned directory and a repeat invocation. + +### Rechecked fixes and remaining acceptance + +- **R1-01 resolved:** `compose.py` doubles every dollar in command strings/list entries. A separate temporary core render used fake values for all 17 `secrets.SECRET_KEYS`; `REQUIRED_SECRETS` exactly equals that tuple. The generated command contains `$$src`, `$$dst`, `$$bundle`, `$$f`, `$$n`, and `$$(...)`. Docker Compose 5.6.0 `config --format json` returned zero with empty stderr and preserved these escapes in its round-trippable output; no empty-variable substitution occurred. The interpolation-model test and real parser test both pass. +- **R1-02 partially implemented, blocked by R2-01:** the generated init service has `cap_drop: [ALL]`, `cap_add: [CHOWN]`, `read_only: true`, `no-new-privileges:true`, and `restart: "no"`. Its hardening exception records a reason, review date 2027-01-31 and M4 target. `web → wiki_assets → wiki_static_init` uses `service_completed_successfully` at both edges; api/admin/worker also await wiki_assets. This ordering correctly propagates the init failure rather than bypassing it. +- **Copier improvements verified:** UID 1000 uses `cp -R`, rejects absence of `wiki-edit-page.*.js`, copies before pruning and checks the alias is nonempty. Copy-before-prune reduces the empty-directory window but does not make updates atomic or preserve old hashed chunks for already-open pages. Actual first-run copying and updates remain untested here. +- **R1-03 tracked, not functionally resolved:** ADR-06 §4, the manifest note and both status-board languages explicitly retain edit.mako integration wiring and browser/C4 acceptance as follow-up. This is adequate visibility for the separate integration work, not evidence that M2 works. The manifest/template phrase “verified in real install run 5” should be read as the planned verification; the status board still says open. Record the integration commit and browser results before declaring acceptance. + +The additional r1 observations about empty overlay values and unknown one-shot exit codes are not closed by this targeted re-review. No approval, merge, commit, push or Docker state change was performed; only the requested review record and PR comment were written. + +### Validation + +Run from the review worktree root: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/manifest_check.py +python3 tools/docs_check.py +gh pr checks 30 --repo RCOSDP/RDM-developer-guide +``` + +The separate parser probe used the test helpers `make_root` and `render`, with a fake .env generated directly from SECRET_KEYS and an injected empty Compose-ps result. It ran `docker compose -f <temporary-root>/runtime/docker-compose.yml config --format json`; no daemon mutation was requested. Evidence counts before adding this record: + +```toon +validation[5]{check,result,detail}: + installer,pass,343 tests; 10 skipped + tools,pass,89 tests + manifest_check,pass,zero findings + docs_check,pass,84 files; 8 exempt; 19 warnings + github_checks,pass,all 8 checks including Python 3.11 and 3.12 +``` + +The tracked-file documentation check was repeated: 84 files checked, eight exempt, 19 warnings, passed. The new untracked record was additionally checked directly with docs_check.check_file and passed. Green checks do not cover execution of the restricted-capability chmod. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と阻害指摘 + +**要修正。R2-01 — P1: 所有者変更後に初期化処理が失敗する。** `installer/grdm_dev/templates/wiki_static_init.json:9` は `set -e; chown 1000:1000 /wiki_static; chmod 0755 /wiki_static; ls -ld /wiki_static` を実行する。生成サービスは ALL を drop し CHOWN だけを追加し、user の上書きはない(想定はイメージ既定の root)。chown 後の root はディレクトリ所有者ではない。Linux の chmod は所有者の filesystem UID または CAP_FOWNER を要求し、CAP_CHOWN では許可されない。通常の Linux ファイルシステムでは元から 0755 でも EPERM になり、`set -e` で初期化が失敗する。成功終了を待つ二段の依存により wiki_assets と四つの利用サービスも起動できない。R1-02 は未解決。 + +カーネルの [v6.12 属性検査](https://github.com/torvalds/linux/blob/v6.12/fs/attr.c) は ATTR_MODE に `inode_owner_or_capable` を呼び、失敗時に EPERM を返す。[所有者検査](https://github.com/torvalds/linux/blob/v6.12/fs/inode.c) が許可するのは所有者または CAP_FOWNER。これらを `gh api` で確認した。Docker 状態変更は禁止なのでコンテナでの再現ではなく、ソースに基づく指摘である。準備段階で適切なモードを保証するなら不要な chmod を除くか、明示的な権限戦略を実装する(権限を追加するなら hardening の例外も更新)。新規ディレクトリが非 0 のホスト UID 所有なら、chmod を chown より前に移すだけでは不十分。非 1000 所有の新規ディレクトリと再実行を扱う Linux 実行試験を追加する。 + +### 修正の再確認と受入残件 + +- **R1-01 解決:** `compose.py` は command の文字列・配列要素のドル記号を二重化する。別途 core を一時生成し、全 17 個の `secrets.SECRET_KEYS` に偽値を設定した。`REQUIRED_SECRETS` はそのタプルと完全一致。生成コマンドに `$$src`・`$$dst`・`$$bundle`・`$$f`・`$$n`・`$$(...)` がある。Docker Compose 5.6.0 の `config --format json` は終了 0、stderr は空で、再読込可能な出力にもエスケープを保持し、空文字への展開は起きなかった。展開モデルと実パーサの試験は両方成功。 +- **R1-02 部分実装、R2-01 が阻害:** 生成された init は `cap_drop: [ALL]`・`cap_add: [CHOWN]`・`read_only: true`・`no-new-privileges:true`・`restart: "no"`。hardening の例外には理由・見直し日 2027-01-31・M4 目標がある。`web → wiki_assets → wiki_static_init` の両段が `service_completed_successfully`。api/admin/worker も wiki_assets を待つ。この依存は初期化失敗を迂回せず正しく伝える。 +- **コピー改善を確認:** UID 1000 で `cp -R` を使い、`wiki-edit-page.*.js` の不在を失敗とし、コピー後に間引き、別名ファイルが空でないことを検査する。先にコピーすれば空ディレクトリの時間は減るが、更新は不可分ではなく、開いたままのページ用の旧ハッシュ付きチャンクも保持しない。実際の初回コピーと更新は未検証。 +- **R1-03 は追跡済み、機能としては未解決:** ADR-06 §4・manifest の note・進捗ボードの英和に edit.mako の統合側配線とブラウザ/C4 受入が残件として明記された。別の統合作業を可視化するには十分だが M2 動作の証拠ではない。manifest/template の “verified in real install run 5” は予定の検証として読む必要があり、進捗ボードは未着手。受入宣言前に統合コミットとブラウザ結果を記録する。 + +r1 の追加観察である空の overlay 値と one-shot 終了コード不明時の扱いは、今回の限定再レビューでは解決扱いにしない。approve・merge・commit・push・Docker 状態変更は行わず、指定のレビュー記録と PR コメントだけを書いた。 + +### 検証 + +実行コマンドは英語部のコードブロックのとおり。独立したパーサ確認は試験補助 `make_root` と `render` を利用し、SECRET_KEYS 全体から偽 .env を作り、Compose ps の空結果を注入した。`docker compose -f <一時ルート>/runtime/docker-compose.yml config --format json` を実行し、デーモンの変更は要求していない。 + +installer は 343 件成功(10 skip)、tools は 89 件成功、manifest は指摘 0。本記録追加前の docs_check は 84 ファイル・例外 8・警告 19 で成功。GitHub は Python 3.11/3.12 を含む八つの検査すべて成功。追跡済み文書の再検査は 84 ファイル・例外 8・警告 19 で成功。新規の未追跡レビュー記録は docs_check.check_file で個別に検査して成功。これらの成功は、権限を限定した chmod の実行を保証しない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Capability | A named Linux permission granted separately from other powers. | Linux の権限を機能ごとに分けたもの。 | +| CHOWN / FOWNER | Permission to change ownership / bypass ownership checks for operations such as chmod. | 所有者変更の権限/chmod などの所有者検査を越える権限。 | +| EPERM | An operation was rejected for lack of permission. | 権限不足で操作を拒否したことを示す結果。 | +| UID | Numeric user identity used for file access. | ファイルへのアクセスを決める利用者番号。 | +| Compose | Tool that reads service definitions and coordinates containers. | サービス定義を読んでコンテナを動かす道具。 | +| One-shot | A process that completes its work and exits. | 仕事を終えたら終了する処理。 | +| C4 | The Wiki collaborative-editing acceptance scenario. | Wiki 共同編集の受入試験。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r3.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r3.md new file mode 100644 index 0000000..c6f2883 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r3.md @@ -0,0 +1,106 @@ +# PR30 Wiki Overlay Review r3 / Wiki オーバーレイレビュー r3 + +> **Summary:** Needs revision: moving chmod before chown does not fix host-owned bind directories or repeat initialization. +> **概要:** 要修正。chmod を chown より前に移しても、ホスト所有の bind ディレクトリと初期化の再実行は直らない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** UID 0 without CAP_FOWNER cannot chmod another user's directory; changing command order does not change the initial owner or make initialization repeatable. / CAP_FOWNER のない UID 0 は他ユーザー所有のディレクトリを chmod できず、順序変更は初期所有者も再実行の可否も変えない。 +- Applies to: PR #30, head `bff97b61eae15034c7a0d79fec284526350d2af8`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r2](2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r2.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md). +- Used by: [DEMO-20](../demo/20_core_install_mac_studio.md) · [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Needs revision. R2-01 remains open — P1.** At `installer/grdm_dev/templates/wiki_static_init.json:9`, `set -e; chmod 0755 /wiki_static; chown 1000:1000 /wiki_static` still fails on an ordinary Linux host. The initializer drops ALL capabilities (separately granted Linux powers) and adds only CHOWN. `compose.py:859` creates the directory with the installer's host identity, and `compose.py:450` exposes it through a bind mount (a container path backed by an existing host directory). Mounting it does not transfer ownership to container root. For a host UID other than 0, including UID 1000, the initial chmod returns EPERM. `set -e` stops before chown, so the successful-completion dependency blocks wiki_assets and its four consumers. + +Even if a fresh directory actually belongs to root, the order change only helps the first invocation: chown leaves it owned by 1000, and a subsequent invocation fails at chmod. Setting a mode already equal to 0755 does not bypass the ownership check. These conclusions assume ordinary non-idmapped, rootful Linux bind mounts; no Docker execution reproduction was performed. + +### Kernel rule and correction required + +Linux v6.12 [setattr_prepare in fs/attr.c](https://github.com/torvalds/linux/blob/adc218676eef25575469234709c2d87185ca223a/fs/attr.c) checks `inode_owner_or_capable` for ATTR_MODE and returns `-EPERM` on failure. [inode_owner_or_capable in fs/inode.c](https://github.com/torvalds/linux/blob/adc218676eef25575469234709c2d87185ca223a/fs/inode.c) accepts an inode owner matching `current_fsuid()`, accounting for mount ID mapping, or a mapped owner plus CAP_FOWNER in the current user namespace. There is no unconditional UID-0 exemption. CAP_CHOWN authorizes ownership changes, not chmod. + +CAP_DAC_OVERRIDE is **not a substitute for CAP_FOWNER**. [generic_permission in fs/namei.c](https://github.com/torvalds/linux/blob/adc218676eef25575469234709c2d87185ca223a/fs/namei.c) uses it for ordinary read/write/search permission failures; it does not satisfy the separate chmod ownership check. With searchable container ancestors and the intended 0755 directory, DAC override is not required for this owner/mode operation. More restrictive ancestors can separately require search permission; that is not the reported EPERM. The kernel files and tag-to-commit resolution were read through `gh api`. + +Implement an explicit repeatable permission strategy. If keeping unconditional chmod, grant and document CAP_FOWNER alongside CHOWN, with a Linux execution test under the exact capability set. Alternatively, guarantee the intended mode during provisioning and remove the unnecessary chmod; account for existing directories and restrictive umasks rather than assuming mkdir always yields 0755. Test a fresh nonzero/non-1000 host owner, UID 1000, root ownership, and a second invocation. Update the template note and both ADR-06 halves: their explanation currently assumes root owns a directory that they also describe as host-user-owned. + +The added assertion at `installer/tests/test_compose.py:730–732` verifies text order only. It cannot prove chmod is authorized and currently preserves the faulty command. This is the same unresolved R2-01, not a new independent blocker. The integration wiring and browser/C4 acceptance left open in r2 remain outside this targeted re-review. + +### Validation + +Commands run from the review worktree root: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/manifest_check.py +python3 tools/docs_check.py +PYTHONPATH=installer:installer/tests python3 -m unittest -v test_compose.ComposeRenderTests.test_docker_compose_config_accepts_the_rendered_file +git diff --check +gh pr checks 30 --repo RCOSDP/RDM-developer-guide +``` + +Observed results, not canonical manifest data: + +```toon +validation[6]{check,result,detail}: + installer,pass,343 tests; 10 skipped + tools,pass,89 tests + manifest_check,pass,zero findings + docs_check,pass,85 files; 8 exempt; 19 warnings + compose_parser,pass,read-only docker compose config; explicit test passed without skip + github_checks,pass,all 8 checks including Python 3.11 and 3.12 +``` + +`git diff --check` passed. The untracked r3 record was checked separately using `docs_check.check_file`. A first targeted test command used the nonexistent class name ComposeTests and failed to load; the corrected ComposeRenderTests command passed. Local HEAD matched the PR head. Green parser/unit/CI checks do not execute the restricted-capability initializer. No approval, merge, commit, push or Docker state change was performed; only the requested record and one PR comment were written. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**要修正。R2-01 は未解決 — P1。** `installer/grdm_dev/templates/wiki_static_init.json:9` の `set -e; chmod 0755 /wiki_static; chown 1000:1000 /wiki_static` は通常の Linux ホストで引き続き失敗する。初期化処理は capability(個別に与える Linux の権限)を ALL drop し CHOWN だけ追加する。`compose.py:859` は実行したホストユーザーの所有でディレクトリを作り、`:450` は bind mount(ホストの既存ディレクトリをコンテナ内に見せる仕組み)として公開する。mount しても所有者はコンテナの root に変わらない。ホスト UID が 0 以外なら、1000 も含めて最初の chmod が EPERM になる。`set -e` が chown より前に停止させ、成功終了待ちの依存により wiki_assets と四つの利用サービスも起動できない。 + +初期ディレクトリが本当に root 所有でも、順序変更が効くのは初回だけである。chown 後は UID 1000 所有なので、再実行の chmod が失敗する。既に 0755 でも所有者検査は省略されない。通常の ID マッピングを変更しない rootful Linux bind mount を前提とした判断であり、Docker 実行による再現は行っていない。 + +### カーネル規則と必要な修正 + +Linux v6.12 の [fs/attr.c の setattr_prepare](https://github.com/torvalds/linux/blob/adc218676eef25575469234709c2d87185ca223a/fs/attr.c) は ATTR_MODE に対して `inode_owner_or_capable` を検査し、失敗なら `-EPERM` を返す。[fs/inode.c の inode_owner_or_capable](https://github.com/torvalds/linux/blob/adc218676eef25575469234709c2d87185ca223a/fs/inode.c) が許すのは、mount の ID 対応を考慮した所有者と `current_fsuid()` の一致、または所有者の ID 対応があり現在のユーザー名前空間で CAP_FOWNER がある場合である。UID 0 の無条件な例外はない。CAP_CHOWN は所有者変更を許すが chmod は許さない。 + +**CAP_DAC_OVERRIDE は CAP_FOWNER の代わりにならない。** [fs/namei.c の generic_permission](https://github.com/torvalds/linux/blob/adc218676eef25575469234709c2d87185ca223a/fs/namei.c) は通常の読取り・書込み・経路探索の拒否を越えるために使うが、chmod の別の所有者検査は満たさない。コンテナ内の祖先パスを探索でき、想定どおり 0755 なら、この所有者・モード操作に DAC override は不要である。祖先の権限が厳しければ別途探索権限が必要になり得るが、今回の EPERM とは別問題。カーネル各ファイルとタグからコミットへの対応は `gh api` で確認した。 + +再実行できる権限戦略を実装する必要がある。無条件の chmod を残すなら CHOWN に加え CAP_FOWNER を与え、例外を記録し、実際と同じ権限構成で Linux 実行試験を行う。代案は準備段階でモードを保証し、不要な chmod を除くこと。ただし既存ディレクトリと厳しい umask を扱い、mkdir が必ず 0755 になると仮定しない。非 0・非 1000 のホスト所有、UID 1000 所有、root 所有、および再実行を試験する。テンプレートの注と ADR-06 の英和両方も修正する。現在の説明はホストユーザー所有と述べながら root 所有を前提にしている。 + +追加された `installer/tests/test_compose.py:730–732` の検査は文字列の順序しか確認しない。chmod の権限は検証できず、現在は誤ったコマンドを固定している。これは新たな独立指摘ではなく、同じ R2-01 の未解決である。r2 で残した統合側配線とブラウザ/C4 受入は、今回の限定再レビューでも未完了のまま。 + +### 検証 + +実行コマンドは英語部に記載した。installer は 343 件成功(10 skip)、tools は 89 件成功、manifest は指摘 0、docs_check は 85 ファイル・例外 8・警告 19 で成功。読み取り専用の docker compose config を使う個別試験も skip なしで成功。GitHub は Python 3.11/3.12 を含む八つの検査すべて成功し、ローカル HEAD と PR head は一致した。 + +`git diff --check` は成功。未追跡の r3 記録は `docs_check.check_file` で別途検査した。個別試験の最初の呼出しは存在しない ComposeTests クラスを指定して読込みに失敗したが、ComposeRenderTests に直した呼出しは成功した。解析・単体・CI の成功は権限を限定した初期化処理の実行を検証しない。approve・merge・commit・push・Docker 状態変更は行わず、指定記録と PR コメント一件のみを書いた。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| UID / fsuid | Numeric user identity / identity used for filesystem checks. | 利用者の番号/ファイル操作の検査に使う番号。 | +| Capability | A separately granted Linux power. | 個別に与える Linux の権限。 | +| CAP_CHOWN | Permits changing file ownership. | ファイル所有者の変更を許す。 | +| CAP_FOWNER | Bypasses ownership checks for operations such as chmod. | chmod などの所有者検査を越える。 | +| CAP_DAC_OVERRIDE | Bypasses ordinary file access permissions, not chmod's ownership check. | 通常のアクセス権限を越えるが chmod の所有者検査は越えない。 | +| EPERM | Operation rejected for lack of permission. | 権限不足による操作拒否。 | +| Bind mount | Exposes an existing host path inside a container. | 既存のホストパスをコンテナ内に見せる仕組み。 | +| C4 | Wiki collaborative-editing acceptance scenario. | Wiki 共同編集の受入試験。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r4.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r4.md new file mode 100644 index 0000000..a696175 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r4.md @@ -0,0 +1,101 @@ +# PR30 Wiki Overlay Review r4 / Wiki オーバーレイレビュー r4 + +> **Summary:** Needs revision: the initializer is corrected, but host-side chmod breaks rendering after ownership transfer. +> **概要:** 要修正。初期化コンテナは直ったが、所有権移転後のホスト側 chmod が再 render を壊す。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** provisioning must distinguish newly created host-owned directories from existing container-owned directories. / 準備処理では、新規のホスト所有ディレクトリと既存のコンテナ所有ディレクトリを区別する必要がある。 +- Applies to: PR #30, head `ae9c6f02ccf0cc666ec7aabfc8730534275d9906`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r3](2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r3.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md). +- Used by: [DEMO-20](../demo/20_core_install_mac_studio.md) · [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and finding + +**Needs revision. R2-01 remains open at the provisioning lifecycle level — P1.** The container command now correctly omits chmod, but `installer/grdm_dev/compose.py:857–863` runs `os.chmod(vol_dir, 0o755)` unconditionally for every volume, including existing directories. `mkdir(exist_ok=True)` does not establish ownership. On ordinary rootful Linux bind mounts, after wiki_static_init changes ownership to UID 1000, a non-root installer user with a different UID cannot chmod that directory on the next `compose render`. Even an unchanged 0755 mode requires ownership or CAP_FOWNER. The result is EPERM and an uncaught PermissionError. Other service-owned volume directories are also exposed to this unconditional operation. + +Set the intended mode while a newly created directory is owned by the provisioning user; avoid chmod of existing foreign-owned directories that already have the required mode. Define validation and actionable recovery for an existing directory with an unsuitable mode, rather than silently ignoring errors. Restrict mode changes to directories whose permission policy actually requires them. Add a regression for render → initializer ownership transfer → render with a host UID other than 0 or 1000, plus restrictive umask and existing-directory cases. The current same-owner rerender test never transfers ownership and therefore cannot detect this regression. Both ADR-06 halves describe setting mode “when it creates” the directory, but implementation does it on every render; align that wording with the corrected lifecycle. + +### Kernel reasoning and rendered output + +Linux v6.12 [chown_ok and chgrp_ok in fs/attr.c](https://github.com/torvalds/linux/blob/adc218676eef25575469234709c2d87185ca223a/fs/attr.c) accept `capable_wrt_inode_uidgid(..., CAP_CHOWN)` regardless of whether the caller owns the inode. With ordinary mapped UIDs/GIDs and a searchable path, root with CHOWN alone can change host ownership to 1000:1000 and repeat that same operation. `setattr_prepare` separately checks `inode_owner_or_capable` for ATTR_MODE; [fs/inode.c](https://github.com/torvalds/linux/blob/adc218676eef25575469234709c2d87185ca223a/fs/inode.c) requires matching fsuid or mapped ownership plus CAP_FOWNER. CHOWN does not satisfy chmod. These kernel sources were retrieved with `gh api`; no Linux container execution or Docker state changes were performed. Namespace mapping, filesystem and security-module restrictions remain separate conditions. + +The rendered command is `set -e; chown 1000:1000 /wiki_static; ls -ld /wiki_static`, with ALL dropped and only CHOWN added. Read-only root filesystem, no-new-privileges, completion dependency, and consumer read-only mounts remain covered by tests. Fresh rendering under umask 077 produced mode 0755; same-owner rendering twice succeeded. A targeted Python mock that raises Linux's expected EPERM only for chmod of the existing wiki_static directory confirmed that rerender propagates PermissionError; this is a control-flow test, not a real ownership-transfer execution test. The initializer itself is now repeatable by kernel reasoning; the complete host workflow is not. + +### Validation + +Commands were run from the review worktree root: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/manifest_check.py +python3 tools/docs_check.py +PYTHONPATH=installer:installer/tests python3 -m unittest -v test_compose.ComposeRenderTests.test_docker_compose_config_accepts_the_rendered_file test_compose.ComposeRenderTests.test_idempotent_rerun_reports_unchanged +git diff --check +gh pr checks 30 --repo RCOSDP/RDM-developer-guide +``` + +Observed results, not canonical manifest data: + +```toon +validation[5]{check,result,detail}: + installer,pass,343 tests; 10 skipped at ae9c6f0 + tools,pass,89 tests + manifest_check,pass,zero findings + docs_check,pass,86 files; 8 exempt; 19 warnings + targeted_tests,pass,read-only compose config and same-owner rerender; neither skipped +``` + +Tools/checker/parser results were obtained at c3bdd0d; the only subsequent change at ae9c6f0 replaces `self.root` with `root` in the new test, verified by diff. The installer suite was rerun successfully at ae9c6f0. The earlier AttributeError in local and Python 3.11/3.12 CI tests is fixed and is not an open finding. The r4 file is checked separately with `docs_check.check_file` because it is untracked. Final CI at ae9c6f0: seven checks pass, including both Python versions; Semgrep fails on the same line 863 finding. The new head’s failed-job log was checked. `git diff --check` and the r4 document check passed. The prior head's Semgrep job failed on the new 0755 chmod at line 863 (`python.lang.security.audit.insecure-file-permissions.insecure-file-permissions`); this is a real gate failure, not proof that directories should use 0644. Resolve the gate with the corrected implementation and a justified narrow exception if needed; directory traversal requires execute permission. + +Integration wiring and browser/C4 acceptance remain outside this targeted re-review. No approve, merge, commit, push or Docker state change was performed; only this review record and the requested PR comment were written. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +**要修正。準備から再実行までを含めると R2-01 は未解決 — P1。** コンテナ内 chmod は正しく除去されたが、`installer/grdm_dev/compose.py:857–863` は既存も含む全ボリュームへ毎回 `os.chmod(vol_dir, 0o755)` を実行する。`mkdir(exist_ok=True)` は所有権を保証しない。通常の rootful Linux bind mount では wiki_static_init が UID 1000 に変更した後、別 UID の非 root ホスト利用者による次回の `compose render` は chmod できず、EPERM と未捕捉の PermissionError で失敗する。既に 0755 でも所有者または CAP_FOWNER が必要である。他サービスが所有するボリュームもこの無条件操作の対象になる。 + +新規作成してホスト利用者が所有する間にモードを設定し、必要なモードを満たす他者所有の既存ディレクトリには chmod しないこと。不適切なモードの既存ディレクトリには、エラーの握り潰しではなく検証と具体的な復旧方法を定義すること。モード変更はその権限方針が必要な対象に限定すること。ホスト UID が 0・1000 以外で render → 初期化による所有権移転 → render の回帰試験、および厳しい umask・既存ディレクトリの試験が必要。既存の再 render 試験は所有権を移さないので検出できない。ADR-06 の英和両方は「作るとき」と記すが、実装は毎回実行するため、修正後の動作と一致させる必要がある。 + +### カーネル規則と出力 + +Linux v6.12 の [fs/attr.c](https://github.com/torvalds/linux/blob/adc218676eef25575469234709c2d87185ca223a/fs/attr.c) の chown_ok・chgrp_ok は `capable_wrt_inode_uidgid(..., CAP_CHOWN)` があれば所有者一致を必要としない。通常の ID 対応と探索可能なパスでは CHOWN のみを持つ root がホスト所有から 1000:1000 へ変更でき、同じ chown の再実行もできる。一方 ATTR_MODE は [fs/inode.c](https://github.com/torvalds/linux/blob/adc218676eef25575469234709c2d87185ca223a/fs/inode.c) の inode_owner_or_capable により fsuid 一致または ID 対応と CAP_FOWNER を必要とする。CHOWN は chmod の権限にならない。ソースは gh api で確認し、Linux コンテナ実行・Docker 状態変更はしていない。名前空間の ID 対応、ファイルシステム、セキュリティ機構の制約は別条件である。 + +生成コマンドは `set -e; chown 1000:1000 /wiki_static; ls -ld /wiki_static`。ALL drop と CHOWN のみの追加、読取り専用 root filesystem、no-new-privileges、成功終了待ち、利用側の読取り専用 mount を試験で確認した。umask 077 でも新規ディレクトリは 0755 となり、同じ所有者での二回の render は成功した。既存 wiki_static への chmod だけで Linux 相当の EPERM を返す Python mock では PermissionError の伝播を確認した。これは制御フローの試験であり実際の所有権移転試験ではない。初期化コンテナの再実行はカーネル規則上正しいが、ホストを含む一連の処理は再実行できない。 + +### 検証 + +コマンドは英語部に記載。最新版 ae9c6f0 の installer は 343 件成功(10 skip)。tools 89 件、manifest 指摘 0、docs 86 ファイル・例外 8・警告 19、個別の読取り専用 compose config と同一所有者再 render は成功し、個別試験は skip なし。tools・checker・parser は c3bdd0d で検証し、その後の変更がテストの `self.root` → `root` 一箇所のみであることを差分確認した。旧 head の AttributeError は修正済みで未解決指摘に含めない。未追跡の r4 文書は docs_check.check_file で別途検査する。 + +最新版 ae9c6f0 の CI は Python 両版を含む七件成功、Semgrep 一件失敗。最新版の失敗ログも同じ行 863 の指摘と確認した。git diff --check と r4 文書の個別検査は成功。旧 head の Semgrep は新規 chmod 0755 の行 863 を insecure-file-permissions として拒否した。これは検査ゲートの失敗だが、ディレクトリを 0644 にすべきという根拠ではない。修正実装と、必要なら理由を明示した限定例外で解決すること。ディレクトリ探索には実行権限が必要である。 + +統合側配線とブラウザ/C4 受入は限定再レビューの対象外。approve・merge・commit・push・Docker 状態変更は行わず、指定記録と依頼された PR コメントのみを書く。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| UID / fsuid | User number / identity used for filesystem checks. | 利用者番号/ファイル操作の検査に使う番号。 | +| Capability | A separately granted Linux power. | 個別に与える Linux の権限。 | +| CAP_CHOWN | Permits changing ownership. | 所有権の変更を許す。 | +| CAP_FOWNER | Bypasses ownership checks such as chmod's. | chmod などの所有者検査を越える。 | +| EPERM | Operation rejected for insufficient permission. | 権限不足による操作拒否。 | +| umask | Removes permissions from newly created files or directories. | 新規ファイル・ディレクトリの権限を制限する値。 | +| Bind mount | Exposes an existing host path inside a container. | ホストの既存パスをコンテナ内に見せる仕組み。 | +| C4 | Wiki collaborative-editing acceptance scenario. | Wiki 共同編集の受入試験。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r5.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r5.md new file mode 100644 index 0000000..c75f4dd --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r5.md @@ -0,0 +1,99 @@ +# PR30 Wiki Overlay Review r5 / Wiki オーバーレイレビュー r5 + +> **Summary:** The normal provisioning and rerender lifecycle is corrected; revision is still required because Semgrep fails on the new regression test. +> **概要:** 通常の初期準備と再 render の不具合は修正済み。ただし新しい回帰試験で Semgrep が失敗しており、要修正。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** a justified scanner exception in production code does not cover the same operation in regression fixtures. / 本体コードの根拠付き検査例外は、回帰試験の同じ操作には適用されない。 +- Applies to: PR #30, head `b9a26c707b3798f1d569ba659826f4d689ee8c2b`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r4](2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r4.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md). +- Used by: [DEMO-20](../demo/20_core_install_mac_studio.md) · [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and finding + +**Needs revision: R5-01 — P2, failing Semgrep gate.** The [failed CI job](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42126552100/job/127592113223) reports exactly one finding: `installer/tests/test_compose.py:926`, `os.chmod(vol, 0o700)`, rule `python.lang.security.audit.insecure-file-permissions.insecure-file-permissions`. The production chmod's narrow annotation is effective; the regression fixture has no matching exception. Add a narrowly justified exception for this temporary directory fixture, or create its intended mode without triggering the rule, then obtain passing Semgrep on the new head. Do not change a directory to 0644 to satisfy this generic message: traversal needs execute permission. This is a gate failure, not evidence that an owner-only temporary directory is insecure. + +**R2-01 is closed for the normal sequential lifecycle.** `_ensure_volume_dir()` returns before mkdir/chmod when the path exists. Its fresh-directory path sets 0755 while the host owns it. The existing-directory unit test asserts chmod is never called even when a call would raise PermissionError, and preserves 0700. An additional full-render probe under umask 077 verified fresh wiki_static mode 0755; rerender with every volume chmod forced to raise PermissionError succeeded, preserving uid, gid and mode. This is a control-flow regression, not a real Linux ownership-transfer test. + +### First-run ordering and limits + +Host render creates the bind directory before startup. `wiki_static_init` then performs only `chown 1000:1000 /wiki_static` with ALL capabilities dropped and CHOWN added. `wiki_assets`, running as 1000:1000, waits for successful initializer completion, copies with `cp -R`, and exits successfully before web/api/admin/worker can start through their completion dependencies. Those consumers mount only the wiki subdirectory read-only. The existing output assertions and read-only Compose parser check pass. Setting mode on the host before chown avoids the CAP_FOWNER issue; rerender now leaves transferred ownership and mode alone. Both ADR-06 language halves describe this change consistently. + +The PermissionError handler on the fresh path tolerates a concurrent ownership change but does not guarantee 0755 if chmod actually fails. The exists/mkdir sequence is not atomic, and existing directories with unsuitable permissions are not repaired. These are limits of the supported sequential workflow, not a recurrence of unconditional rerender chmod. No concurrent provisioner, real Linux chown, container startup or browser/C4 acceptance was executed. Existing filesystem/namespace restrictions still apply; ADR's statement that rerender cannot fail should be read specifically as removal of this chmod failure. + +### Validation + +Commands run from the review worktree root: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/manifest_check.py +python3 tools/docs_check.py +PYTHONPATH=installer:installer/tests python3 -m unittest -v test_compose.ComposeRenderTests.test_docker_compose_config_accepts_the_rendered_file test_compose.ComposeRenderTests.test_idempotent_rerun_reports_unchanged test_compose.VolumeDirOwnershipTests +git diff --check +gh pr checks 30 --repo RCOSDP/RDM-developer-guide +gh run view 42126552100 --repo RCOSDP/RDM-developer-guide --log-failed +``` + +Observed results, not canonical manifest data: + +```toon +validation[7]{check,result,detail}: + installer,pass,345 tests; 10 skipped + tools,pass,89 tests + manifest_check,pass,zero findings + docs_check,pass,87 checked; 8 exempt; 19 warnings + targeted_tests,pass,4 tests; none skipped; read-only compose config included + render_probe,pass,umask 077; guarded rerender; uid/gid/mode preserved + CI,fail,7 checks pass; Semgrep fails on test_compose.py:926 +``` + +The untracked r5 record is also checked directly with `docs_check.check_file`; git diff whitespace checks pass. No approve, merge, close, commit, push or Docker state change was performed. Only the requested review record and PR comment were written. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +**要修正: R5-01 — P2、Semgrep ゲート失敗。** [失敗した CI ジョブ](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42126552100/job/127592113223) の指摘は一件で、`installer/tests/test_compose.py:926` の `os.chmod(vol, 0o700)`、規則は `python.lang.security.audit.insecure-file-permissions.insecure-file-permissions`。本体 chmod の限定注記は効いているが、回帰試験側には同じ例外が無い。一時ディレクトリの試験準備である根拠を付けた限定例外、または規則に抵触しないモード設定方法を採用し、新 head の Semgrep 成功を確認すること。この一般的な警告に合わせてディレクトリを 0644 にしてはいけない。探索には実行権限が必要である。所有者だけが使う一時ディレクトリが危険という指摘ではなく、検査ゲートの失敗である。 + +**通常の逐次実行における R2-01 は解決。** `_ensure_volume_dir()` は既存パスなら mkdir/chmod より前に戻る。新規パスだけ、ホストが所有する間に 0755 を設定する。既存ディレクトリの単体試験は、呼べば PermissionError になる chmod を呼ばないことと、0700 の維持を検証する。追加の full-render 検証では umask 077 でも新規 wiki_static が 0755 となり、全ボリュームへの chmod を PermissionError にする再 render も成功し、uid・gid・mode が維持された。これは制御フローの回帰試験で、Linux 上の実際の所有権移転試験ではない。 + +### 初回の順序と限界 + +ホストの render が起動前に bind ディレクトリを作る。次に `wiki_static_init` が ALL drop・CHOWN のみ追加で `chown 1000:1000 /wiki_static` だけを実行する。`wiki_assets` は 1000:1000 で初期化の成功終了を待ち、`cp -R` でコピーする。web/api/admin/worker はコピーの成功終了を待って起動し、wiki 下位ディレクトリだけを読取り専用で mount する。既存の生成内容検証と読取り専用 Compose parser 検査は成功。chown 前にホストで mode を設定するため CAP_FOWNER 問題を避け、再 render は移転後の所有者と mode に触れない。ADR-06 の英和両部もこの変更と一致する。 + +新規パスの PermissionError 捕捉は同時の所有権変更を許容するが、実際に chmod が失敗すれば 0755 は保証しない。exists/mkdir は不可分な操作ではなく、不適切な権限の既存ディレクトリも修復しない。これは対応する逐次実行の限界であり、無条件の再 render chmod の再発ではない。同時の準備処理、Linux での実 chown、コンテナ起動、ブラウザ/C4 受入は実施していない。ファイルシステム・名前空間の制約は残り、ADR の「再描画が失敗することはない」はこの chmod 失敗の解消に限定して読む必要がある。 + +### 検証 + +実行コマンドと結果一覧は英語部に記載。installer は 345 件成功(10 skip)、tools は 89 件成功、manifest は指摘 0。docs は 87 件検査・8 例外・19 警告で成功。個別四試験は skip 無しで成功し、読取り専用 compose config を含む。umask 077 と chmod 拒否を組み合わせた再 render の追加検証も成功。CI は七件成功、Semgrep だけが新規試験の行 926 で失敗した。 + +未追跡の r5 記録は `docs_check.check_file` で別途検査し、git diff の空白検査も成功。approve・merge・close・commit・push・Docker 状態変更は行わず、指定のレビュー記録と PR コメントのみを書く。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| CI | Automated checks run for a change. | 変更ごとに自動実行する検査。 | +| Semgrep | A scanner that matches source code against rules. | ソースを規則と照合する検査器。 | +| UID / GID | User / group numbers identifying an owner. | 所有者を表す利用者/グループ番号。 | +| Mode / umask | Permission bits / a filter on new permissions. | 権限ビット/新規権限を制限する値。 | +| Bind mount | A host path exposed inside a container. | ホストのパスをコンテナ内へ見せる仕組み。 | +| CAP_CHOWN / CAP_FOWNER | Ownership-changing power / ownership-check bypass. | 所有者変更の権限/所有者検査を越える権限。 | +| C4 | Wiki collaborative-editing acceptance scenario. | Wiki 共同編集の受入試験。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r6.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r6.md new file mode 100644 index 0000000..fb52e13 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r6.md @@ -0,0 +1,94 @@ +# PR30 Wiki Overlay Review r6 / Wiki オーバーレイレビュー r6 + +> **Summary:** R5-01 is resolved by a justified, single-rule exception on one temporary test fixture line. All eight CI checks pass; no blocking findings remain in this re-review. +> **概要:** 一時的な試験準備の一行に対する根拠付きの単一規則例外で R5-01 は解消。CI 全8件が成功し、今回の再レビューに阻害指摘は残らない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** an owner-only directory fixture can justify a line-local scanner exception while retaining the permission-preservation regression test. / 所有者だけが使う試験用ディレクトリには、権限維持の回帰試験を残したまま、一行限定の検査例外を正当化できる。 +- Applies to: [PR #30](https://github.com/RCOSDP/RDM-developer-guide/pull/30), head `3bb0d88762ec78105f7465b5325afbe0cb4b96a7`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r5](2026-11-06_RDM-developer-guide_PR30_Wiki_Overlay_r5.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md). +- Used by: [DEMO-20](../demo/20_core_install_mac_studio.md) · [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Pass — R5-01 closed; no blocking findings.** This is the reviewer's verdict, not a GitHub approval or merge. The reviewed change from r5 head `b9a26c707b3798f1d569ba659826f4d689ee8c2b` consists of the r5 record and one comment replacement at `installer/tests/test_compose.py:926`. Product code and test execution behavior are unchanged. + +The inline `nosemgrep` annotation names only `python.lang.security.audit.insecure-file-permissions.insecure-file-permissions`. It applies to the single `os.chmod(vol, 0o700)` fixture statement, with a reason explaining the simulated mode after ownership transfer. There is no blanket suppression or scanner configuration change. `vol` is created inside `tempfile.TemporaryDirectory()`; 0700 permits only the owner to read, write and traverse it. The test still asserts that rerender never calls chmod for an existing directory and preserves 0700. The fixture simulates the lifecycle; it does not actually transfer ownership to another user. The rationale is therefore accurate within that stated simulation. + +### Validation + +Commands executed from the review worktree root: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/manifest_check.py +python3 tools/docs_check.py +PYTHONPATH=installer:installer/tests python3 -m unittest -v test_compose.ComposeRenderTests.test_docker_compose_config_accepts_the_rendered_file test_compose.ComposeRenderTests.test_idempotent_rerun_reports_unchanged test_compose.VolumeDirOwnershipTests +git diff --check +gh pr checks 30 --repo RCOSDP/RDM-developer-guide +gh run view 42127071522 --repo RCOSDP/RDM-developer-guide --json headSha,conclusion,status +``` + +Observed review results, not canonical manifest data: + +```toon +validation[7]{check,result,detail}: + installer,pass,345 tests; 10 skipped + tools,pass,89 tests + manifest_check,pass,zero findings + docs_check,pass,88 checked; 8 exempt; 19 warnings + targeted_tests,pass,4 tests; none skipped; read-only compose config included + whitespace,pass,git diff --check + CI,pass,all 8 checks on reviewed head; Semgrep included +``` + +The eight passing checks are Build MkDocs Site, Check Links, Manifest validation and private-URL policy, Secret scan (gitleaks), Semgrep static analysis, Trivy filesystem scan (report only at M1), and Unit tests (installer, tools) on Python 3.11 and 3.12. The [security run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42127071522) completed successfully with the reviewed head; its [Semgrep job](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42127071522/job/127593858516) passed. The [test run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42127071518) and [documentation run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42127071544) supply the other checks. The untracked r6 record is checked separately using `tools.docs_check.check_file`. + +### Limits + +The r5 acceptance limits remain: no real Linux ownership-transfer test, concurrent provisioning, container startup or browser/C4 acceptance was performed. Read-only Compose parsing changes no Docker state. This comment-only fix does not reopen the resolved normal sequential lifecycle finding R2-01. The 19 existing documentation warnings remain non-failing. Only this review record and the requested PR comment are written; no approve, merge, close, commit or push is performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**合格 — R5-01 解消、阻害指摘なし。** これはレビュワの判定であり、GitHub の承認・マージ操作ではない。r5 の head `b9a26c707b3798f1d569ba659826f4d689ee8c2b` からの変更は、r5 記録の追加と `installer/tests/test_compose.py:926` のコメント一箇所の置換だけ。本体コードと試験の実行動作は変わっていない。 + +行内の `nosemgrep` は `python.lang.security.audit.insecure-file-permissions.insecure-file-permissions` だけを指定する。対象は試験準備の `os.chmod(vol, 0o700)` 一文で、所有権移転後のモードを模擬する理由が付いている。一括抑制や検査設定の変更はない。`vol` は `tempfile.TemporaryDirectory()` 内に作られ、0700 は所有者だけに読取り・書込み・探索を許す。既存ディレクトリの再 render では chmod を呼ばず、0700 を維持する検証も残っている。試験はライフサイクルを模擬するもので、実際に別利用者へ所有権を移転してはいない。注記の理由は、その模擬という範囲で正確である。 + +### 検証 + +実行コマンドと結果一覧は英語部に記載。installer は345件実行・成功(10件 skip)、tools は89件成功。manifest は指摘0、docs は88件検査・8例外・19警告で成功。個別4試験は skip なしで成功し、読取り専用 compose config を含む。空白検査も成功し、未追跡の r6 記録は `tools.docs_check.check_file` で別途検査する。 + +CI は対象 head の全8件が成功。内訳は MkDocs 構築、リンク検査、manifest・非公開 URL 方針、gitleaks、Semgrep、Trivy(M1 では報告のみ)、Python 3.11 と3.12 の単体試験。[セキュリティ実行](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42127071522) の head 一致と成功終了、および [Semgrep ジョブ](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42127071522/job/127593858516) の成功を確認した。他の検査は[試験実行](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42127071518)と[文書実行](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42127071544)に対応する。 + +### 限界 + +r5 の受入範囲の限界は継続する。Linux 上の実際の所有権移転、同時準備処理、コンテナ起動、ブラウザ/C4 受入は実施していない。読取り専用の Compose 構文検査は Docker の状態を変更しない。コメントだけの修正であり、通常の逐次実行について解決済みの R2-01 を再開する理由はない。既存の文書警告19件は失敗扱いではない。指定のレビュー記録と PR コメントだけを書き、approve・merge・close・commit・push は行わない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| CI | Automatic checks for each change. | 変更ごとに走る自動検査。 | +| Semgrep / nosemgrep | Source-code scanner / a comment suppressing a specified finding. | ソース検査器/指定した指摘を抑制するコメント。 | +| Fixture | Temporary setup used by a test. | 試験のための一時的な準備。 | +| Mode 0700 / chmod | Owner-only directory permissions / the operation setting permissions. | 所有者専用のディレクトリ権限/権限を設定する操作。 | +| Regression test | A test that catches a previously fixed bug returning. | 修正済み不具合の再発を検知する試験。 | +| C4 | Wiki collaborative-editing acceptance scenario. | Wiki 共同編集の受入試験。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR31_Manifest_Wiki_Run5_r1.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR31_Manifest_Wiki_Run5_r1.md new file mode 100644 index 0000000..7046711 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR31_Manifest_Wiki_Run5_r1.md @@ -0,0 +1,89 @@ +# PR31 Manifest and run 5 review r1 / マニフェスト・第5回導入レビュー r1 + +> **Summary:** Pass with three non-blocking documentation corrections. The pinned integration commit is correct, policy checks pass, and the run log supports the recorded failure and remaining work. +> **概要:** 文書の軽微な訂正3件を付して合格。固定した統合コミットは正しく、ポリシー検査は合格し、実行ログは記録された失敗と残件を裏付ける。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** passing automated checks does not establish the accuracy of step counts, warning categories or translated completion claims; those need comparison with the logs. / 自動検査の合格だけでは段数・警告の分類・翻訳の完了表現の正しさは分からず、ログとの照合が必要である。 +- Applies to: RCOSDP/RDM-developer-guide PR #31; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-01](../spec/01_manifest.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Wiki PR #2 review](2026-11-06_RDM-wiki-frontend-dev2027_PR2_JS_Deps_Sync_r1.md). +- Used by: [DEMO-20](../demo/20_core_install_mac_studio.md) · [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Pass with non-blocking documentation nits R1-01–R1-03; no blocking findings.** This verdict is not a GitHub approval. Reviewed head `06684b2f5f75dccd149431f8211e9f0f8cecca16`; all four changed local files match that head byte for byte. Scope covers the manifest pin/note, DEMO-20 run 5, the status board and the imported wiki PR #2 review. The git-ignored `runtime` symlink was not inspected and Docker state was not changed. + +### Findings + +- **R1-01 — low:** DEMO-20 lines 162/318 say 85 of 86 Dockerfile steps passed. `install-run5.log` line 1601 identifies the failing instruction as `[85/86]`; step 85 did not pass. Change both languages to “failed at step 85 of 86”. +- **R1-02 — low:** DEMO-20 lines 170/326 classify all four successful-build warnings as performance warnings. `wiki-overlay-test-build.log` lines 320–342 show one missing `mode` configuration warning and three performance warnings. The imported wiki PR #2 review already records this distinction. Correct both languages to “four webpack warnings: one mode configuration warning and three performance warnings”; no code change is needed. +- **R1-03 — low, EN/JA parity:** DEMO-20 line 170 says run 6 “is recorded below”, but no run 6 entry exists. Japanese line 326 describes a future addition, and the status board says run 6 is next. Change the English to “run 6 will be recorded after it is executed” and keep the Japanese future tense. + +### Evidence and checks + +GitHub's develop-branch API returns `cd96330f01e2e4b719912350487f3290f7b3b24a`, exactly matching `wiki-frontend.integration_sha`; wiki PR #2 reports the same merge commit and is merged. Repository references remain names only, with no private-repository URLs introduced. The manifest note correctly leaves editor-template/browser verification pending. + +The run 5 log supports exit 30 at `build`, successful preceding steps, three built components with the recorded commit prefixes, two prebuilt components, fakecas remapping from 8080 to 8081, and two missing `linkify-html` errors in `comment.js` and `osfHelpers.js`. The separate overlay test log supports successful webpack output and image export. Logs alone do not independently attest every historical date, the exact test-build input commits, its requested platform or final image filesystem; no runtime/browser acceptance is claimed by this review. + +Both edited document versions are 0.6 with bilingual learned notes. Anchors, Jump links, relative links and the imported review format pass SPEC-06 checks; substantive new EN/JA content agrees except R1-03. The status board correctly keeps M2 in progress, moves the editor-template item into its M2 table and leaves startup, health, scanning and acceptance pending. GitHub confirms PRs #21–#30 are merged. + +Observed results, not canonical manifest data; commands ran from the review worktree root: + +```toon +checks[5]{command,result}: + "python3 tools/manifest_check.py","PASS; zero findings" + "python3 tools/docs_check.py","PASS; 90 files checked, 8 exempt, 19 non-failing glossary warnings" + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","OK; 345 tests, 10 skipped" + "python3 -m unittest discover -s tools/tests","OK; 89 tests" + "gh pr checks 31 --repo RCOSDP/RDM-developer-guide","PASS; all 8 checks" +``` + +The new untracked review is also checked directly through the documentation checker's `check_file` function, because its normal file enumeration includes tracked files only. Remaining work is the three prose corrections, then the already-open run 6 and M2 acceptance work; no merge, approval, closure, commit or push was performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**軽微な文書指摘 R1-01〜R1-03 を付して合格。阻害指摘なし。** GitHub の承認操作ではない。対象 head は `06684b2f5f75dccd149431f8211e9f0f8cecca16` で、変更4ファイルのローカル内容はすべてその head とバイト単位で一致する。manifest の固定値・注記、DEMO-20 第5回、進捗表、取り込まれた wiki PR #2 レビューを確認した。git 無視対象の `runtime` シンボリックリンクは調査せず、Docker の状態も変更していない。 + +### 指摘 + +- **R1-01 — 軽微:** DEMO-20 の162/318行は86段中85段を通過したと書くが、`install-run5.log` の1601行で失敗した命令は `[85/86]`。85段目は通過していない。英和とも「86段中85段目で失敗」に訂正する。 +- **R1-02 — 軽微:** DEMO-20 の170/326行は成功ビルドの警告4件すべてを性能関連とする。`wiki-overlay-test-build.log` の320〜342行では `mode` 未設定が1件、性能関連が3件。取り込んだ wiki PR #2 レビューもこの区別を記録している。英和とも「webpack 警告4件(mode 未設定1件、性能関連3件)」に訂正する。コード変更は不要。 +- **R1-03 — 軽微・英和対応:** DEMO-20 の英語170行は第6回を既に記録したと読めるが、第6回の節はない。日本語326行は今後の追記を述べ、進捗表も第6回を次の作業としている。英語を「第6回は実行後に記録する」に直し、日本語の未来表現を保つ。 + +### 証跡と検査 + +GitHub の develop ブランチ API は `cd96330f01e2e4b719912350487f3290f7b3b24a` を返し、`wiki-frontend.integration_sha` と完全一致する。wiki PR #2 も同じマージコミットを持ち、マージ済み。リポジトリ参照は名前のみで、非公開リポジトリの URL は追加されていない。manifest の注記はエディタのテンプレートとブラウザ検証を正しく未完としている。 + +第5回ログは `build` での終了30、それ以前の手順成功、記載のコミット接頭辞を持つ3部品のビルド、2部品の配布済みイメージ利用、fakecas の8080から8081への変更、`comment.js` と `osfHelpers.js` における `linkify-html` 不足のエラー2件を裏付ける。別のオーバーレイ試験ログは webpack 出力とイメージ export の成功を裏付ける。ログだけでは過去の日付のすべて、試験ビルドの入力コミット、指定プラットフォーム、最終イメージのファイル内容を独立には証明できない。本レビューは実行時・ブラウザ受入の成功を主張しない。 + +変更した両文書は版0.6で、学びの記載は英和対応している。アンカー、Jump、相対リンク、取り込んだレビューの形式は SPEC-06 検査に合格し、新規本文の内容も R1-03 を除き対応する。進捗表は M2 を進行中に保ち、エディタのテンプレート項目を M2 表に移し、起動・稼働確認・検査・受入を未完としている。PR #21〜#30 のマージ済み状態を GitHub で確認した。 + +英語部の TOON は正本でなく、レビュー作業ツリーのルートで実行した検査結果。manifest 検査は指摘0、docs 検査は90ファイル確認・8除外・非失敗の用語注警告19件で合格。installer は345テスト中10スキップで成功、tools は89テスト成功、PR の8チェックもすべて成功した。 + +通常の文書検査は追跡済みファイルだけを列挙するため、新規未追跡のレビューは検査器の `check_file` 関数でも直接確認する。残件は文章の訂正3件と、既に未完とされる第6回・M2受入の作業。merge・approve・close・commit・push は行っていない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Integration SHA | Exact commit fingerprint selected for a combined component. | 統合した部品に使うコミットを特定する指紋。 | +| Overlay | Files placed over another source tree before building. | ビルド前に別のソースの木へ重ねるファイル。 | +| Non-blocking finding | A correction that does not prevent accepting the change. | 変更の採用を妨げない訂正事項。 | +| Acceptance | Checking that the working system meets its intended use. | 動くシステムが目的を満たすか確かめること。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR32_Infra_Build_Platform_r1.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR32_Infra_Build_Platform_r1.md new file mode 100644 index 0000000..106955a --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR32_Infra_Build_Platform_r1.md @@ -0,0 +1,120 @@ +# PR32 Infra build platform review r1 / 基盤イメージのプラットフォーム指定レビュー r1 + +> **Summary:** Pass with one non-blocking validation gap. All five selected images lack arm64, and every other current infra image supports it. +> **概要:** 検証の軽微な不足1件を付して合格。指定5イメージには arm64 がなく、現在の他の基盤イメージはすべて対応する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** selecting amd64 fixes image acquisition, but a successful pull does not establish successful startup. / amd64 指定でイメージ取得は解決するが、取得成功だけでは起動成功を証明しない。 +- Applies to: RCOSDP/RDM-developer-guide PR #32; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-01](../spec/01_manifest.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [PR #32](https://github.com/RCOSDP/RDM-developer-guide/pull/32). +- Used by: [DEMO-20](../demo/20_core_install_mac_studio.md) · [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and finding + +**Pass with non-blocking R1-01; no blocking findings.** Reviewed local and remote head `1bcc1a783ee3db82c7c498b4d2d62b746d412097`, branch `fix/infra-amd64-platform`. This is a review verdict, not GitHub approval. No merge, approval, commit, push or Docker state change was performed. + +**R1-01 — low:** `tools/manifest_check.py:160,499–507` accepts `build_platform` as string/null and does not prohibit it on infra, so MC-10 does not contradict the newly allowed configuration. However, the new SPEC-01 requirement to accompany an infra pin with a `note` is not enforced. An in-memory copy with `elasticsearch2.note = None` still returns zero findings from `validate_manifest`. Add a missing/blank-note rejection and regression test in a follow-up. All five actual entries include meaningful reasons and M4/M5 exit milestones, so this gap does not invalidate this PR's manifest. + +### Registry and rendering evidence + +Read-only `docker manifest inspect --verbose <image>` succeeded for all nine current `role: infra` base images. These are observations of current tags on 2026-11-06, not immutable digest guarantees; target M4/M5 images were not the scope. The observations are not canonical manifest data. + +```toon +images[9]{component,image,linux_amd64,linux_arm64}: + postgres,postgres:9.6,yes,yes + elasticsearch2,elasticsearch:2,yes,no + elasticsearch6,docker.elastic.co/elasticsearch/elasticsearch:6.3.1,yes,no + mongo,mongo:3.4,yes,yes + rabbitmq,rabbitmq:3-management,yes,yes + redis,redis:7,yes,yes + sharejs,quay.io/centerforopenscience/sharejs:develop,yes,no + unoconv,centerforopenscience/unoconv,yes,no + fakecas,quay.io/centerforopenscience/fakecas:master,yes,no +``` + +`installer/grdm_dev/compose.py:812–816` collects component pins for all selected services without excluding infra; lines 364–366 use that value before the host platform and emit `platform:`. `installer/tests/test_compose.py:72–75,95–113` derives expected values from the repository manifest and checks every rendered core service, covering all five changed services, including the `elasticsearch2` → `elasticsearch` name mapping. SPEC-01 version 0.8 and both language rows agree on the note requirement, affected images, emulation and Compose behavior. No unrelated manifest fields changed. + +The supplied local `install-run7.log` records successful pulls at lines 1068 (fakecas), 2342 (ES6), 2623 (ES2), 2766 (sharejs) and 2817 (unoconv); lines 2983–2990 report their `linux/amd64` pins. Lines 2876–2878 then report a missing host directory for `rabbitmq_data`. This supports the pull fix, not complete startup, health or acceptance. The reviewer did not rerun installation. + +### Checks + +Commands ran from the review worktree root. Results are observed review data. + +```toon +checks[5]{command,result}: + "python3 tools/manifest_check.py","PASS; zero manifest/policy findings" + "python3 tools/docs_check.py","PASS; 91 checked, 8 exempt, 19 non-failing warnings" + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","OK; 345 tests, 10 skipped" + "python3 -m unittest discover -s tools/tests","OK; 89 tests" + "gh pr checks 32 --repo RCOSDP/RDM-developer-guide","PASS; all 8 checks" +``` + +The new untracked review is checked separately through `tools.docs_check.check_file`, because the command enumerates tracked files. Startup after the volume-path repair and the optional R1-01 follow-up remain outside this review's completed verification. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +**軽微な R1-01 を付して合格。阻害指摘なし。** ローカルとリモートの先端 `1bcc1a783ee3db82c7c498b4d2d62b746d412097`、ブランチ `fix/infra-amd64-platform` を確認した。これはレビュー判定であり GitHub の承認ではない。マージ・承認・コミット・push・Docker の状態変更は行っていない。 + +**R1-01 — 軽微:** `tools/manifest_check.py:160,499–507` は `build_platform` を文字列/null として受理し、infra で禁止していないため、MC-10 は今回許可された設定に矛盾しない。ただし、SPEC-01 が新たに求める infra 指定時の `note` 併記は検査しない。メモリ上のコピーで `elasticsearch2.note = None` にしても `validate_manifest` の指摘はゼロだった。後続で未指定・空の注記を拒否する検査と回帰試験を追加するとよい。実際の5件には理由と M4/M5 の解消時期があるため、この不足は今回のマニフェストを不合格にするものではない。 + +### レジストリと描画の証拠 + +読み取り専用の `docker manifest inspect --verbose <image>` は、現在の `role: infra` の全9ベースイメージで成功した。2026-11-06 時点のタグの観測であり、不変のダイジェストを保証するものではない。将来の M4/M5 向けイメージは対象外とした。次は観測値であり、マニフェストの正本ではない。 + +```toon +images[9]{component,image,linux_amd64,linux_arm64}: + postgres,postgres:9.6,yes,yes + elasticsearch2,elasticsearch:2,yes,no + elasticsearch6,docker.elastic.co/elasticsearch/elasticsearch:6.3.1,yes,no + mongo,mongo:3.4,yes,yes + rabbitmq,rabbitmq:3-management,yes,yes + redis,redis:7,yes,yes + sharejs,quay.io/centerforopenscience/sharejs:develop,yes,no + unoconv,centerforopenscience/unoconv,yes,no + fakecas,quay.io/centerforopenscience/fakecas:master,yes,no +``` + +`installer/grdm_dev/compose.py:812–816` は infra を除外せず全選択サービスの指定を集め、364–366 行はホストより優先して `platform:` に出力する。`installer/tests/test_compose.py:72–75,95–113` はリポジトリのマニフェストから期待値を取り、core の全出力サービスを検査するため、変更5件と `elasticsearch2` → `elasticsearch` の名前対応も対象になる。SPEC-01 の版 0.8 と英和両方の行は、注記必須・対象イメージ・エミュレーション・Compose の挙動で一致する。無関係なマニフェスト項目の変更はない。 + +提供されたローカルの `install-run7.log` は、1068 行(fakecas)、2342 行(ES6)、2623 行(ES2)、2766 行(sharejs)、2817 行(unoconv)に取得成功を記録し、2983–2990 行に各 `linux/amd64` 指定を記録する。その後の 2876–2878 行は `rabbitmq_data` 用ホストディレクトリの不足を報告する。取得修正の証拠にはなるが、起動・健康状態・受入の完了を示すものではない。レビュワによる導入再実行は行っていない。 + +### 検査 + +コマンドはレビュー用作業ツリーのルートで実行した。結果はレビュー時の観測値である。 + +```toon +checks[5]{command,result}: + "python3 tools/manifest_check.py","合格; manifest/policy 指摘ゼロ" + "python3 tools/docs_check.py","合格; 91件検査, 8件除外, 非失敗警告19件" + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","OK; 345試験, 10件スキップ" + "python3 -m unittest discover -s tools/tests","OK; 89試験" + "gh pr checks 32 --repo RCOSDP/RDM-developer-guide","全8件合格" +``` + +文書検査コマンドは追跡済みファイルを列挙するため、新規の未追跡レビューは `tools.docs_check.check_file` で別途検査する。ボリュームのパス修復後の起動検証と、任意の R1-01 対応は今回完了した検証の範囲外として残る。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Platform | The operating system and processor family an image targets. | イメージが動く OS と CPU の種類。 | +| Manifest | A list describing components or the image variants a registry offers. | 部品の設定、または配布されるイメージの種類を記した一覧。 | +| Emulation | Running instructions intended for another processor family. | 別の CPU 向けの命令を読み替えて動かすこと。 | +| Pull | Downloading an image; it does not prove the service started. | イメージの取得。サービスの起動成功は意味しない。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR33_Startup_Fixes_r1.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR33_Startup_Fixes_r1.md new file mode 100644 index 0000000..2c413ab --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR33_Startup_Fixes_r1.md @@ -0,0 +1,126 @@ +# PR33 Startup fixes review r1 / 起動修正レビュー r1 + +> **Summary:** Changes requested: Linux volume ownership and persistent frontend cache invalidation need fixes; the security contract and evidence need reconciliation. +> **概要:** 修正要求。Linux のボリューム所有権と永続フロントエンドキャッシュの更新判定を修正し、安全性の規約と証跡の記述を整合させる必要がある。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** a successful warm install does not establish portable volume ownership or correct invalidation of persisted build output. / 準備済み環境での導入成功だけでは、別 OS のボリューム所有権や永続ビルド成果の更新判定の正しさは証明できない。 +- Applies to: RCOSDP/RDM-developer-guide PR #33, head `38768abc620c1e8cc1908530ea72e6a3d5cff690`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-02](../decisions/ADR-02_Network_Model.md) · [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) · [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md). +- Used by: [DEMO-20](../demo/20_core_install_mac_studio.md) · [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Changes requested.** R1-01 is P1; R1-02–R1-04 are P2; R1-05–R1-06 are P3. These are review findings, not a GitHub approval or merge action. The PR body and squashed commit message were read first; the local branch matches the remote head. No implementation files were changed and no installation or Docker state change was performed. + +### Findings + +**R1-01 — P1: prepare Elasticsearch's data directory for uid 101 before dropping root.** [elasticsearch.json](../../installer/grdm_dev/templates/elasticsearch.json), lines 10–14 and 22–23, now forces `101:101`, while [compose.py](../../installer/grdm_dev/compose.py), lines 854–869, creates its bind directory as the host user with mode 0755. A normal Linux/WSL developer with uid 1000 therefore gives uid 101 no write permission. The entrypoint's ownership step is deliberately bypassed and no owner-initialisation dependency replaces it. A fresh minimum/core install cannot initialise Elasticsearch, and `osf_init` then cannot finish its institution import. The template note acknowledges the problem but postpones it to M4; that does not preserve supported Linux startup. Add an idempotent, narrowly privileged ownership step before Elasticsearch, or an equivalent platform-aware preparation, and verify a fresh directory owned by a uid other than 101. This conclusion follows from the generated permissions; Linux runtime was not available for execution. + +**R1-02 — P2: include the frontend image/build identity in the persisted fingerprint.** [ember_osf_web.json](../../installer/grdm_dev/templates/ember_osf_web.json), line 7, tests only eight environment values and `dist/index.html`. Updating `prebuilt_image` to a corrected digest with unchanged URLs leaves the named `ember_osf_web_dist` directory and `.grdm-build` unchanged, so the new container serves JavaScript from the old image indefinitely. Include the immutable image/source identity and a build-recipe version in the fingerprint, with a test that an image change rebuilds while an identical restart reuses output. Quoting and Compose dollar escaping are otherwise consistent: the renderer doubles dollars and the container shell receives the original quoted expressions. + +**R1-03 — P2: reconcile the new root exception with the mandatory security contract.** [hardening.json](../../manifest/hardening.json), the new `cas` entry, relaxes `user` and `read_only`; generated CAS therefore uses the image's root default. The entry has a concrete reason, review date and M4 target, and adds no capability. However, SPEC-03 §3.3 still says every service is non-root and only explicitly permits read-only/capability exceptions, while ADR-03 §3.2 says non-root has no stage or allow-list and fails at every milestone. Extending the existing exception mechanism to another root service without aligning that contract makes a reported baseline pass ambiguous. Either preserve the written non-root requirement or explicitly document the bounded hardening-exception policy, its authority and enforcement in both SPEC-03 and ADR-03; keep it distinct from the CVE allow-list. This is a specification/implementation inconsistency, not a claim that the CAS container is privileged. + +**R1-04 — P2: detect an infeasible memory floor before claiming a VM-capped budget.** [compose.py](../../installer/grdm_dev/compose.py), lines 309–334 and 935–951, correctly redistributes shares when floors fit, but silently emits all floors when they do not. With the actual core templates an 8 GiB VM produces 16,256 MiB of limits against a 5,734.4 MiB budget; Ember alone gets 8,192 MiB. A 16 GiB VM also produces 16,256 MiB against an 11,468.8 MiB budget. This is now likely with the new 8 GiB Ember floor, and the added 8 GiB VM test only asserts the reported `memory_gib`, not feasible allocation. Reject an infeasible profile before startup with the required VM memory, or require an explicit documented overcommit choice; add a sum-of-floors test. At 47 GiB the allocation is correct: 33,680 MiB ≤ 33,689.6 MiB. Explicit `--memory-gib` also bypasses VM detection, so describe it as an override rather than an unconditional cap. + +**R1-05 — P3: correct the run history and distinguish scanner totals.** [DEMO-20](../demo/20_core_install_mac_studio.md), both run-15 sections, says the run timed out in `up`, and run 16 is labelled its first success. The supplied `install-run15.log` final table instead has `up,0,ok` and `health --network,40,failed`. Keep intermediate manual repairs separate from the final recorded result. The PR body and status board call 1835/8291/9772/3899 Trivy counts, but `scan_latest.json` contains combined counts: Trivy alone is 1835/8290/9763/3886; ZAP contributes HIGH 1, MEDIUM 9, LOW 13 and INFO 5. Also reconcile the claimed 352 installer tests with this exact head's observed 350 (10 skipped), and identify that the scan report's actual `milestone` is `M1` even though the work is an M2 deliverable. The successful run-18 exit 0, 22 Trivy targets and zero allow-list entries are confirmed. Correct both languages and the PR description. + +**R1-06 — P3: update the authoritative status row and retain the unknown-owner qualification.** [Status board](../status/README.md) §1 still says runs 1–5 only and `up`/`health`/`scan` not reached in both languages, contradicting its updated §2b and its rule that §1 is authoritative. Update that row to run 18 while leaving acceptance pending. DEMO-20's run-16 decision also says only Docker-owned listeners fail; retain the additional owner-less wildcard failure explicitly. The implementation correctly still fails that case, so this is documentation drift, not a weakened runtime check. + +### Verified behavior and limits + +The hardening additions retain `cap_drop: [ALL]`, `no-new-privileges`, resource limits and loopback publishing. Unoconv adds only CHOWN for its recorded startup ownership operation. CAS remains internal-only by default. `osf_init` runs as uid 1000 with no added capabilities, read-only settings and explicit writable temporary paths; dependent services wait for successful completion. Sticky `mode=1777` allows the non-root writers without making the root filesystem writable. PostgreSQL's 500 connections is a bounded mitigation, not a repair for the recorded connection leak. + +The iterative memory allocation terminates and honors floors without exceeding the 70% budget when floors fit. Default autodetection selects the smaller positive host/engine memory. In-memory checks covered 8, 16, 47 and 128 GiB; no Docker memory settings were changed. `AUTH_URL` resolves a remapped fakecas port (8081) and the web port (5050) for Shibboleth without requiring fakecas in that profile. Browser authentication acceptance was not rerun. + +Network tests retain failures for unknown-owner wildcard listeners and Docker-owned wildcard listeners. Live project binding failures from `ps`/`inspect` remain fatal independently of the foreign-process warning. Trivy's filesystem-only `--offline-scan`, recorded prebuilt/assembled-overlay skips and repository exclusions match SPEC-03 §4.1; image scans remain included and tool failures remain incomplete. Offline Maven dependency resolution is reduced coverage, not evidence of zero vulnerabilities. Semgrep's PATH-first, interpreter-adjacent fallback is used for both its scan and version calls, and bootstrap installs the scan extra by default. + +The EN/JA additions broadly correspond, including the erroneous history noted in R1-05–R1-06. SPEC-02 0.8, SPEC-03 0.5, ADR-06 0.3 and status 0.7 were inspected. Run 18 reuses `.env`, cached builds and persistent state: its success establishes completion on that host, not a fresh-volume or all-platform acceptance pass. The 900-second wait remains shorter than the documented worst-case 25-minute first Ember build; that cold-start scenario was not re-executed. + +### Evidence and checks + +Observed review data, not canonical manifest data. Commands were run from the supplied worktree root. + +```toon +checks[5]{command,result}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","PASS: 350 tests, 10 skipped" + "python3 -m unittest discover -s tools/tests","PASS: 90 tests" + "python3 tools/manifest_check.py","PASS: zero findings" + "python3 tools/docs_check.py","PASS: 92 checked, 8 exempt, 20 non-failing glossary warnings" + "gh pr checks 33 --repo RCOSDP/RDM-developer-guide","PASS: all 8 checks" +``` + +Evidence read: supplied scratchpad `install-run6.log` through `install-run18.log` (final results 40 for 6–16, 51 for 17, 0 for 18); main checkout `runtime/reports/scan_latest.json` dated `2026-11-06T03:13:00Z`, recorded commit `5bde10e`. Those historical logs/report are not a run of the reviewed squashed head. The new untracked review is additionally checked through `tools.docs_check.check_file`; the normal checker lists tracked files only. Fixes, fresh Linux/cold-start validation and C1–C6 acceptance remain for the author/QA. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**修正要求。** R1-01 は P1、R1-02〜R1-04 は P2、R1-05〜R1-06 は P3。レビュー判定であり GitHub の承認・マージではない。最初に PR 本文と squash コミット本文を読み、指定 worktree とリモートの先端一致を確認した。実装ファイルの変更、導入の再実行、Docker の状態変更は行っていない。 + +### 指摘 + +**R1-01 — P1: uid 101 へ移行する前に Elasticsearch のデータ所有権を準備する。** [elasticsearch.json](../../installer/grdm_dev/templates/elasticsearch.json) 10〜14・22〜23 行は `101:101` を強制するが、[compose.py](../../installer/grdm_dev/compose.py) 854〜869 行は bind ディレクトリをホスト利用者の所有・0755 で作る。通常の Linux/WSL の uid 1000 利用者では uid 101 に書込権限がない。起動時の所有権修正を意図的に飛ばし、代替の初期化依存もないため、新規 minimum/core 導入で Elasticsearch が初期化できず、`osf_init` の機関投入も完了しない。テンプレート注は問題を認めて M4 に延期しているが、対応 OS の起動を維持できない。必要最小限の権限で冪等に所有権を準備する段か、同等の OS 別準備を追加し、101 以外の uid 所有の新規ディレクトリで検証すること。生成される権限からの結論であり、Linux 実機での再現実行はしていない。 + +**R1-02 — P2: 永続 fingerprint にフロントエンドのイメージ・ビルド識別子を含める。** [ember_osf_web.json](../../installer/grdm_dev/templates/ember_osf_web.json) 7 行は環境変数 8 個と `dist/index.html` しか検査しない。URL を変えずに修正版の `prebuilt_image` digest に更新しても、名前付き `ember_osf_web_dist` と `.grdm-build` は残り、新しいコンテナが古い JavaScript を配信し続ける。不変のイメージ/ソース識別子とビルド手順の版を fingerprint に含め、イメージ更新で再構築、同一条件の再起動では再利用する試験を追加すること。引用符と Compose の dollar escape は整合している。描画時にドルを二重化し、コンテナのシェルへ元の引用付き式が渡る。 + +**R1-03 — P2: root 例外追加と必須の安全性規約を整合させる。** [hardening.json](../../manifest/hardening.json) の新しい `cas` 項目は `user` と `read_only` を緩和し、生成 CAS はイメージ既定の root で動く。具体的理由、見直し日、M4 目標があり、capability は追加しない。しかし SPEC-03 §3.3 は全サービス非 root とし、明示的に許すのは read-only/capability の例外で、ADR-03 §3.2 は非 root に段階も許容リストもなく全節目で失敗すると定める。既存の例外機構をさらに root サービスへ広げるなら、baseline 合格の意味を明確にする必要がある。非 root 規則を維持するか、限定的な hardening 例外の方針・権限・検査を SPEC-03 と ADR-03 の両方へ明記し、CVE 許容リストと区別すること。仕様と実装の不一致であり、CAS が privileged だという指摘ではない。 + +**R1-04 — P2: 下限の合計がメモリ予算に収まらない場合を事前検出する。** [compose.py](../../installer/grdm_dev/compose.py) 309〜334・935〜951 行の配分は下限が収まる場合には正しいが、収まらないと全下限を黙って出力する。実際の core テンプレートでは 8 GiB VM に対して予算 5734.4 MiB、制限合計 16256 MiB、Ember 単独 8192 MiB となる。16 GiB VM でも予算 11468.8 MiB に対して合計 16256 MiB。今回の Ember 8 GiB 下限で起こりやすくなり、追加された 8 GiB VM 試験は報告の `memory_gib` しか確認しない。起動前に必要 VM メモリを示して拒否するか、明示的に記録する過剰割当の選択を要求し、下限合計の試験を追加すること。47 GiB では 33680 MiB ≤ 33689.6 MiB で正しい。明示的な `--memory-gib` は VM 検出を迂回するため、無条件の上限ではなく上書き指定として説明する必要もある。 + +**R1-05 — P3: 実行履歴とスキャナ別件数を修正する。** [DEMO-20](../demo/20_core_install_mac_studio.md) の英和第15回は `up` の時間切れ、第16回は初成功と書くが、指定 `install-run15.log` の末尾は `up,0,ok` と `health --network,40,failed`。途中の手動修正と最終記録を分けること。PR 本文と進捗ボードが Trivy 件数とする 1835/8291/9772/3899 は `scan_latest.json` の全体合計で、Trivy 単独は 1835/8290/9763/3886、ZAP は HIGH 1・MEDIUM 9・LOW 13・INFO 5。installer 352 件という記載も、同じ先端で観測した 350 件(10 skip)と整合させること。M2 作業であっても scan 報告の実際の `milestone` は `M1` と区別する必要がある。第18回の exit 0、Trivy 22 対象、許容リスト 0 件は確認できた。英和と PR 本文を修正すること。 + +**R1-06 — P3: 正本の進捗行を更新し、所有者不明の失敗条件を残す。** [進捗ボード](../status/README.md) §1 は両言語とも実行1〜5回のみ、`up`/`health`/`scan` 未到達のままで、更新した §2b および §1 を正本とする規則と矛盾する。受入未完了を維持して第18回へ更新すること。DEMO-20 第16回の決定も Docker 所有だけ失敗と書くため、所有者不明のワイルドカードも失敗する条件を明記すること。実装はその条件を維持しており、実行時の弱体化ではなく記述のずれである。 + +### 確認済みの挙動と限界 + +hardening 変更後も `cap_drop: [ALL]`、`no-new-privileges`、資源制限、ループバック公開を維持する。unoconv の追加は起動時所有権操作に必要な CHOWN のみ。CAS は既定で内部ネットワークのみ。`osf_init` は uid 1000、capability 追加なし、設定は読取専用、書込箇所は明示的な一時領域で、利用側は成功終了を待つ。sticky な `mode=1777` はルート全体を書込可能にせず非 root の書込を許す。PostgreSQL 500 接続は上限付きの緩和であり、接続漏れそのものの修正ではない。 + +反復的なメモリ配分は終了し、下限が収まれば 70% 予算内で下限を満たす。既定検出はホスト/engine の正の小さい値を採る。8・16・47・128 GiB をメモリ内で検査し、Docker 設定は変えていない。`AUTH_URL` は fakecas の変更後ポート 8081、Shibboleth 時は web の 5050 を解決し、後者に fakecas を要求しない。ブラウザの認証受入は再実行していない。 + +ネットワーク試験は、所有者不明と Docker 所有のワイルドカードの両方で失敗を維持する。`ps`/`inspect` の実際の公開違反も他プロセス警告とは独立して失敗する。Trivy の filesystem 限定 `--offline-scan`、理由を記録する prebuilt/組立 overlay の除外、repo 除外は SPEC-03 §4.1 と一致し、イメージ検査と道具失敗の未完了扱いは残る。Maven のオフライン依存解決は検査範囲を狭めるのであり、脆弱性ゼロの証明ではない。Semgrep の PATH 優先・実行中 Python の隣への fallback は scan と version の両方に使われ、bootstrap は既定で scan extra を入れる。 + +英和の追加部分は、R1-05〜R1-06 の誤記を含め概ね対応する。SPEC-02 0.8、SPEC-03 0.5、ADR-06 0.3、進捗0.7を確認した。第18回は `.env`、ビルドキャッシュ、永続状態を再利用しており、そのホストでの完走を示すが、新規ボリュームや全 OS の受入合格を示さない。900 秒の待機は、記録された最悪25分の初回 Ember ビルドより短く、その初回条件は再実行していない。 + +### 証跡と検証 + +指定 worktree のルートで実行した観測結果であり、manifest の正本データではない。 + +```toon +checks[5]{command,result}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","合格: 350 件、10 skip" + "python3 -m unittest discover -s tools/tests","合格: 90 件" + "python3 tools/manifest_check.py","合格: 指摘 0" + "python3 tools/docs_check.py","合格: 92 検査、8 除外、非失敗の用語警告 20" + "gh pr checks 33 --repo RCOSDP/RDM-developer-guide","合格: 全 8 checks" +``` + +指定 scratchpad の `install-run6.log`〜`install-run18.log` を確認した(最終終了コードは6〜16回が40、17回が51、18回が0)。main checkout の `runtime/reports/scan_latest.json` は日時 `2026-11-06T03:13:00Z`、記録コミット `5bde10e`。これらは過去の証跡であり、レビューした squash 先端の実行ではない。通常の検査は追跡ファイルのみ列挙するため、新規未追跡レビューは `tools.docs_check.check_file` でも検査する。修正、新規 Linux/初回起動の検証、C1〜C6 受入は作者/QA の残件。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| UID | The numeric identity that owns files and runs a program. | ファイルの所有者や実行者を示す番号。 | +| Fingerprint | A stored value used to decide whether saved output still matches its inputs. | 保存した成果が入力と一致するか判定する値。 | +| Capability | One specific operating-system permission given to a process. | プログラムへ与える OS 操作権限の一つ。 | +| Memory floor | The minimum memory assigned to a service. | サービスへ割り当てるメモリの下限。 | +| Warm install | An install that reuses existing data or build output. | 既存のデータやビルド成果を再利用する導入。 | +| P1 / P2 / P3 | High / medium / low review priority. | 高/中/低のレビュー優先度。 | + +Shared terminology: [REF-01](../reference/REF-01_Glossary.md). diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR33_Startup_Fixes_r2.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR33_Startup_Fixes_r2.md new file mode 100644 index 0000000..80c40a8 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR33_Startup_Fixes_r2.md @@ -0,0 +1,120 @@ +# PR33 Startup fixes review r2 / 起動修正レビュー r2 + +> **Summary:** Changes requested: host-dependent memory tests fail in CI, and the new Semgrep timeout exemption can pass incomplete scans even at M4/M5. The R1 implementation fixes are substantially present, with regression evidence and small documentation corrections still outstanding. +> **概要:** 修正要求。ホスト依存のメモリ試験が CI で失敗し、新しい Semgrep 時間切れ例外は M4/M5 でも未完了の検査を合格にする。R1 の実装修正は概ね反映されたが、回帰試験の証跡と小さな文書訂正が残る。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** local success can hide host-memory-dependent tests, and a timeout warning changes the security gate at every milestone unless explicitly bounded. / ローカル合格はホストメモリ依存の試験を隠し得る。時間切れの警告化は明示的に限定しなければ全節目の安全性判定を変える。 +- Applies to: RCOSDP/RDM-developer-guide PR #33, head `abb89dc4b5ac5f0b6063857e12ce31838edf58f9`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [R1](2026-11-06_RDM-developer-guide_PR33_Startup_Fixes_r1.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md). +- Used by: [DEMO-20](../demo/20_core_install_mac_studio.md) · [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and findings + +**Changes requested.** R2-01 and R2-02 are P2, R2-03 is P3. This is a review verdict, not GitHub approval. The supplied worktree and remote head matched; changes since `38768ab` and the R1 record were inspected. No implementation changes, commit, push, approval, merge, installation or Docker state changes were performed. + +**R2-01 — P2: isolate host memory in the new VM tests.** [test_compose.py](../../installer/tests/test_compose.py), lines 283–323, stubs `docker info` but leaves `detect_memory_gib()` reading the real machine. Both `test_memory_budget_uses_docker_vm_when_smaller` and `test_sum_of_floors_fits_the_documented_minimum_vm` therefore fail on a host below the core floor even when the fake VM has 48/24 GiB. Both Python 3.11 and 3.12 jobs fail with `10 != 0` in [CI run 42165059610](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42165059610). Independently setting the detected host to 7 GiB reproduced exit 10 for both fake VMs: the 23-service floor is 16,320 MiB but the selected budget is 5,017 MiB. Mock host memory to a known larger value and assert the selected VM value exactly; separately test a smaller host. Preserve production's smaller-of-host-and-engine rule. R1-04's production fix is correct, but its verification is not complete until these jobs pass. + +**R2-02 — P2: retain an incomplete result for unbounded Semgrep timeouts.** [scan.py](../../installer/grdm_dev/scan.py), lines 784–799, removes all errors whose type starts with `Timeout` from scanner problems, regardless of milestone, affected file count or rule coverage. Lines 1044–1052 then allow exit 0. Using the existing fake runner with a valid baseline, empty findings and one timeout reproduced `gate=pass`, exit 0 at M1, M4 and M5. A security rule that never completed cannot establish a clean result; three timeouts can also drop the rest of a file. This weakens the previous fail-closed behavior beyond the run-20 operator-copy problem. Keep the 30-second timeout and runtime-copy exclusion, but make unresolved timeouts incomplete (51), or define an explicitly bounded early-milestone policy in SPEC-03/ADR-03 and keep strict milestones fail-closed, with regression tests for mixed errors and M4/M5. The module and function docstrings still promise that scanner errors mean incomplete. The inspected successful real report had Semgrep `ok` with no timeout warning, so it does not demonstrate a need to exempt timeouts at strict milestones. + +**R2-03 — P3: finish the evidence/documentation reconciliation.** The PR body still says 352 installer tests after R1, although this head has 354, and its change summary still says the default `up` wait is 900 seconds although the implementation is 1800. Its tests should distinguish local success from the two failed CI jobs. The Japanese authoritative M2 row in [status/README.md](../status/README.md) says acceptance is unexecuted (`未実施`) while §2b records a first real run with 0/12 passing; use “not passed” in both languages. The historical run-18 wording can remain explicitly historical. + +### R1 disposition + +- **R1-01: implementation resolved; Linux execution evidence remains.** The new `elasticsearch_data_init.json` (template removed by ADR-07, PR #34) runs `chown 101:101 /data` once, with root and only CHOWN restored, read-only root and no-new-privileges retained. Elasticsearch depends on successful completion. This fixes ownership of a fresh host-owned directory without recursive ownership changes. Run 19 records init exit 0 on Docker Desktop; it does not test Linux ownership enforcement on a uid-1000 directory. No such Linux runtime validation was performed here. +- **R1-02: implementation resolved; requested regression test remains.** `SERVICE_IMAGE` is populated from `svc.image`, and Ember fingerprints `GRDM_IMAGE`, recipe version 1 and the existing URL inputs before deciding to reuse `dist`. The current prebuilt reference is digest-pinned. The changed tests contain no focused image-change/restart reuse test; add the requested test proving a changed digest rebuilds and unchanged inputs reuse output. +- **R1-03: resolved.** SPEC-03 §3.3 and ADR-03 §3.2 now explicitly distinguish bounded hardening exceptions from the vulnerability allow-list, name relaxed controls, reason, review date and removal milestone, and describe reporting/enforcement. Existing tests cover expired exceptions, root forms, matching capabilities and unconditional privileged/no-new-privileges failures. Milestone limits on exception growth/removal remain policy obligations, not a claim of a new automated count gate. +- **R1-04: implementation resolved; tests blocked by R2-01.** Infeasible floors raise `MemoryBudgetError` and return 10 before Compose output; explicit memory overrides permit documented overcommit. The 16,320 MiB core floor fits a 24 GiB budget. SPEC-02 §8 describes the override and minimum memory. +- **R1-05: substantially resolved, residual R2-03.** DEMO-20 corrects run 15 to `up=0`, network health failure; scanner totals now separate Trivy from ZAP and identify the report's M1 milestone. The PR body fixes scanner counts but its test count is stale. +- **R1-06: original corrections resolved, residual R2-03.** Both authoritative rows now report run-18 completion and DEMO-20 retains failure for unknown-owner wildcard listeners. The newer acceptance attempt requires the small Japanese row correction noted above. + +### New changes and execution limits + +Ember no longer waits for web/api, so its static build can run alongside database initialisation. `osf_init` now retries institution population 180 times with 10-second sleeps; the “30 minutes” is approximate because each attempt also takes time. The lifecycle wait is 1800 seconds. These reduce serial waiting but do not fix the recorded 38-minute emulated Elasticsearch start. That root cause is explicitly assigned to the follow-up native-image/ADR-07 work, not demanded in this PR. Run 20 continued run 19's state; it is not evidence of a new uninterrupted fresh-volume installation of this exact head. Browser acceptance and native Linux ownership validation remain outstanding. + +The `.gitignore` addition excludes operator copies named `runtime.*/`. The Semgrep tests verify the new arguments and mixed-error failure, but intentionally encode the unbounded success behavior identified in R2-02. No actual scanner or Docker operation was rerun by this review. + +### Evidence and checks + +Observed results from the supplied worktree, not canonical manifest data: + +```toon +checks[5]{command,result}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","PASS: 354 tests, 10 skipped" + "python3 -m unittest discover -s tools/tests","PASS: 90 tests" + "python3 tools/manifest_check.py","PASS: zero findings" + "python3 tools/docs_check.py","PASS: 93 checked, 8 exempt, 21 non-failing warnings" + "gh pr checks 33 --repo RCOSDP/RDM-developer-guide","FAIL: Python 3.11/3.12 unit jobs; other 6 checks pass" +``` + +Read the supplied scratchpad logs `install-run19-coldstart.log`, `install-run20-coldstart-continued.log` and `install-run20b-scan-report.log`: respectively exit 40 at `up`, exit 51 at `scan` after up/health success, and successful scan/report rerun. The main-checkout `runtime/reports/scan_latest.json` was readable at first inspection: M1, commit `5bde10e`, exit 0, Trivy/Semgrep/gitleaks/ZAP all `ok`, targets 22/4/1/3, no Semgrep warnings. It was absent at a second metadata read; it is mutable historical evidence, not an immutable run of `abb89dc`. The reviewer did not modify it. The new untracked review is checked separately with `tools.docs_check.check_file` because the normal checker lists tracked files only. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +**修正要求。** R2-01・R2-02 は P2、R2-03 は P3。レビュー判定であり GitHub の承認ではない。指定 worktree とリモート先端の一致を確認し、`38768ab` 以降の変更と R1 記録を検査した。実装変更、commit、push、承認、merge、導入実行、Docker 状態変更は行っていない。 + +**R2-01 — P2: 新しい VM 試験のホストメモリを固定する。** [test_compose.py](../../installer/tests/test_compose.py) 283〜323 行は `docker info` だけを差し替え、`detect_memory_gib()` は実機を読む。そのため `test_memory_budget_uses_docker_vm_when_smaller` と `test_sum_of_floors_fits_the_documented_minimum_vm` は、模擬 VM が48/24 GiB でもホストが core の下限未満なら失敗する。[CI run 42165059610](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42165059610) の Python 3.11・3.12 は両方とも `10 != 0` で失敗した。検出ホストを7 GiB に固定した独立再現でも両 VM は終了10となった。23サービスの下限合計16,320 MiB に対し選択予算は5,017 MiB。ホストメモリを既知の大きい値へ差し替え、選択された VM 値を等値で検査し、小さいホストの場合は別に試験すること。本番のホスト/engine の小さい方を採る規則は維持する。R1-04 の本番修正は正しいが、CI 合格まで検証は未完了。 + +**R2-02 — P2: 無制限の Semgrep 時間切れを未完了として残す。** [scan.py](../../installer/grdm_dev/scan.py) 784〜799 行は、節目・対象ファイル数・規則の検査範囲によらず、型が `Timeout` で始まる全エラーを問題一覧から除く。1044〜1052 行はその結果、終了0を許す。既存の模擬 runner に正常な基本対策、検出事項なし、時間切れ1件を与えると M1・M4・M5 のすべてで `gate=pass`、終了0を再現した。完了しなかった安全性規則から問題なしとは言えず、3回の時間切れでファイルの残りも除外され得る。第20回の操作者のコピー問題を超えて、従来の安全側に失敗する規則を弱めている。30秒への延長と runtime コピー除外は残し、未解決の時間切れを未完了(51)にするか、SPEC-03/ADR-03 に初期節目だけの限定方針を定め、厳格な節目は未完了として失敗させ、混在エラーと M4/M5 の回帰試験を追加すること。モジュールと関数の説明も依然としてスキャナ自身のエラーは未完了と約束している。確認した実機成功報告の Semgrep は時間切れ警告なしの `ok` で、厳格な節目で例外が必要という証拠にはならない。 + +**R2-03 — P3: 証跡と文書の整合を仕上げる。** PR 本文は R1 後の installer 試験352件とするが、本先端は354件で、変更要約の `up` 既定900秒も実装1800秒と異なる。検証欄はローカル成功と CI 2件失敗を区別すること。[status/README.md](../status/README.md) の日本語の正本 M2 行は受入「未実施」とする一方、§2b は実機初回0/12合格を記録しているため、両言語とも「未合格」とすること。第18回の記述は過去の記録と明示して残せる。 + +### R1 各項目の扱い + +- **R1-01: 実装修正済み。Linux 実行証跡は残件。** 新しい `elasticsearch_data_init.json` (template removed by ADR-07, PR #34) は root と CHOWN だけで `chown 101:101 /data` を一度実行し、読取専用 root と no-new-privileges を維持する。Elasticsearch は成功終了を待つ。再帰変更をせず新規のホスト所有ディレクトリを修正する。第19回は Docker Desktop で init 終了0だが、Linux の uid 1000 所有ディレクトリでの権限検証ではなく、本レビューでも Linux 実行はしていない。 +- **R1-02: 実装修正済み。要求した回帰試験は残件。** `SERVICE_IMAGE` は `svc.image` から入り、Ember は既存 URL に加えて `GRDM_IMAGE` と手順版1を指紋へ含めて dist 再利用を判定する。現在の prebuilt は digest 固定。変更した試験にはイメージ変更/再起動再利用の専用試験がないため、digest 変更で再構築し、同じ入力なら再利用する要求済み試験を追加すること。 +- **R1-03: 解決。** SPEC-03 §3.3 と ADR-03 §3.2 が限定された堅牢化例外と脆弱性許容リストを区別し、緩める統制・理由・見直し日・除去節目・報告と検査を明示する。既存試験は期限切れ、root の各表記、capability の一致、privileged/no-new-privileges の無条件失敗を検査する。節目ごとの件数増加・除去制限は方針上の義務であり、新しい自動件数検査の実装を確認したという意味ではない。 +- **R1-04: 実装修正済み。試験は R2-01 が未解決。** 下限超過は `MemoryBudgetError` で Compose 出力前に終了10となり、明示メモリ指定は文書化した過剰割当を許す。core の下限16,320 MiB は24 GiB の予算に収まる。SPEC-02 §8 は上書きと必要メモリを説明する。 +- **R1-05: 概ね解決、R2-03 が残件。** DEMO-20 は第15回を `up=0`・network health 失敗へ訂正し、Trivy/ZAP の件数と報告の M1 節目を区別した。PR 本文もスキャナ件数は訂正したが試験件数が古い。 +- **R1-06: 元の訂正は解決、R2-03 が残件。** 正本の英和両行は第18回完走を反映し、DEMO-20 は所有者不明のワイルドカードの失敗を維持した。新しい受入実行に合わせた日本語行の小修正が必要。 + +### 追加変更と実行の限界 + +Ember は web/api を待たず、静的ビルドを DB 初期化と並行できる。`osf_init` は機関投入を10秒間隔で180回まで再試行する。「30分」は各試行の実行時間もあるため概算である。lifecycle の待機は1800秒。直列待ちを減らすが、記録されたエミュレーション下の Elasticsearch 起動38分を解消しない。その根本原因は指定どおり後続の native image/ADR-07 作業に分離し、本 PR での修正を要求しない。第20回は第19回の状態を継続したため、この先端を新規ボリュームから中断なしで一度に導入できた証跡ではない。ブラウザ受入と Linux 所有権検証は残件。 + +`.gitignore` は操作者のコピー `runtime.*/` を除外する。Semgrep 試験は引数変更と混在エラーの失敗を検査するが、R2-02 の無制限の成功も意図的に固定している。本レビューでは実スキャナや Docker 操作を再実行していない。 + +### 証跡と検証 + +指定 worktree での観測結果であり、manifest の正本データではない。 + +```toon +checks[5]{command,result}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","合格: 354 件、10 skip" + "python3 -m unittest discover -s tools/tests","合格: 90 件" + "python3 tools/manifest_check.py","合格: 指摘 0" + "python3 tools/docs_check.py","合格: 93 検査、8 除外、非失敗の警告 21" + "gh pr checks 33 --repo RCOSDP/RDM-developer-guide","失敗: Python 3.11/3.12 unit jobs、他 6 checks は合格" +``` + +指定 scratchpad の `install-run19-coldstart.log`、`install-run20-coldstart-continued.log`、`install-run20b-scan-report.log` を確認した。順に up で終了40、up/health 成功後 scan で終了51、scan/report 再実行成功である。main checkout の `runtime/reports/scan_latest.json` は初回閲覧時に M1、記録コミット `5bde10e`、終了0、Trivy/Semgrep/gitleaks/ZAP はすべて `ok`、対象22/4/1/3、Semgrep 警告なしだった。2回目のメタデータ確認時にはファイルが存在しなかったため、変更可能な過去の証跡であり `abb89dc` の不変の実行記録ではない。レビュワは変更していない。通常の文書検査は追跡済みだけを列挙するので、新規未追跡のレビューは `tools.docs_check.check_file` で別途検査する。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| CI | Automated checks run on the hosted change. | 提案した変更をサーバー上で自動検査する仕組み。 | +| Fingerprint | Stored input identity used to decide whether output can be reused. | 成果を再利用してよいか判定する入力の識別値。 | +| Fail-closed | An incomplete safety check prevents success. | 安全性検査が未完了なら成功させない扱い。 | +| Memory floor | Minimum memory assigned to a service. | サービスへ割り当てるメモリの下限。 | +| Regression test | A repeatable check that prevents a fixed defect returning. | 修正した不具合の再発を防ぐ繰り返し可能な検査。 | +| P2 / P3 | Medium / low review priority. | 中/低のレビュー優先度。 | + +Shared terminology: [REF-01](../reference/REF-01_Glossary.md). diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR33_Startup_Fixes_r3.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR33_Startup_Fixes_r3.md new file mode 100644 index 0000000..d0f3f07 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR33_Startup_Fixes_r3.md @@ -0,0 +1,101 @@ +# PR33 Startup fixes review r3 / 起動修正レビュー r3 + +> **Summary:** Pass with documentation nits: the two functional R2 findings are resolved and all eight CI checks pass. Test-count and version metadata still need correction. +> **概要:** 文書の軽微な残件付きで合格。R2 の機能面の指摘2件は解決し、CI 8件はすべて合格。試験件数と版の記録には訂正が残る。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** passing automated checks does not ensure that review evidence counts and specification versions match the reviewed revision. / 自動検査の合格だけでは、証跡の試験件数と仕様の版がレビュー対象に一致するとは限らない。 +- Applies to: RCOSDP/RDM-developer-guide PR #33, head `ee61da1f27a0ad2fa03d2f4148f5acaaf31f5fa6`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [R1](2026-11-06_RDM-developer-guide_PR33_Startup_Fixes_r1.md) · [R2](2026-11-06_RDM-developer-guide_PR33_Startup_Fixes_r2.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-06](../spec/06_documentation_conventions.md). +- Used by: [Status board](../status/README.md) · [DEMO-20](../demo/20_core_install_mac_studio.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and R2 disposition + +**Pass with nits. No blocking functional finding in the R2 follow-up.** This is a review verdict, not GitHub approval. Local HEAD and the remote PR head matched. The review inspected the new commit against R2 and ran the requested checks. + +- **R2-01 resolved.** [test_compose.py](../../installer/tests/test_compose.py) patches `detect_memory_gib` inside the VM-render helper. The 128/48 GiB and 64/24 GiB host/VM cases assert exactly 48 and 24 GiB. The new 16/48 GiB case checks exit 10 and the 16 GiB budget diagnostic. Production's smaller-of-host-and-VM rule is preserved. Both hosted Python jobs now pass. +- **R2-02 resolved functionally.** [scan.py](../../installer/grdm_dev/scan.py) passes `strict` from the milestone policy: timeout-only results warn at M1–M3 and become incomplete/exit 51 at M4–M5. SPEC-03 §4.2 states that boundary in both languages. The regression test exercises all five milestones, and the existing mixed-error case remains. An additional reviewer probe supplied mixed timeout/ordinary errors with scanner exit 0 at each of M1–M5; all five returned 51, proving ordinary errors cannot be hidden by a successful process exit. The function docstring is updated; the module docstring still needs the early-milestone exception. +- **R2-03 partly resolved.** Both M2 rows now say acceptance has not passed, first run 0/12. The PR body correctly says 1800 seconds and explains the earlier failed CI jobs. Its current test total remains stale (see R3-01). + +### Nonblocking documentation findings + +**R3-01 — P3: correct the current installer test count.** The requested discovery command ran **356 tests, 10 skipped**, not the PR body's “354 after r2” or the head commit message's 357. The new commit adds two test methods to the prior 354; milestone subtests do not add separately discovered tests. Correct the editable PR verification paragraph to 356 and retain historical counts with their revisions; no history rewrite is requested. + +**R3-02 — P3: finish policy metadata and explanatory text.** SPEC-03 §4.2 contains the new policy, but its header is still **0.6**, not the requested 0.7. Add the 0.7 learned/version entry per SPEC-06 §6. Update scan.py's module-level statement that every scanner error is incomplete to mention the documented M1–M3 timeout exception. The PR summary's SPEC-03 0.5 label is also stale if intended as the current version. These are documentation mismatches, not a failure of strict-milestone enforcement. + +### Evidence and limits + +Observed results in the supplied worktree; this is review evidence, not canonical manifest data. + +```toon +checks[5]{command,result}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","PASS: 356 tests, 10 skipped" + "python3 -m unittest discover -s tools/tests","PASS: 90 tests" + "python3 tools/manifest_check.py","PASS: zero findings" + "python3 tools/docs_check.py","PASS: 94 checked, 8 exempt, 21 non-failing warnings" + "gh pr checks 33 --repo RCOSDP/RDM-developer-guide","PASS: all 8, including Python 3.11 and 3.12 unit-test jobs" +``` + +CI evidence: [unit tests](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42165776059), [documentation](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42165776076), [security and manifest](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42165776130). The new untracked review is checked separately with `tools.docs_check.check_file` because the normal checker enumerates tracked files. + +R1's remaining Linux ownership execution evidence, focused Ember image-change/reuse regression test, browser acceptance, and fresh uninterrupted cold-start evidence are not supplied by this rerun. They remain as recorded in R2; no claim of completed M2 acceptance is made. No installation, real scanner, Docker state change, implementation edit, commit, push, approval or merge was performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と R2 の対応状況 + +**軽微な文書残件付きで合格。R2 対応に機能面の阻害事項なし。** GitHub の承認ではなくレビュー判定である。ローカル HEAD と PR の先端は一致した。新しいコミットを R2 と照合し、指定検査を実行した。 + +- **R2-01 解決。** [test_compose.py](../../installer/tests/test_compose.py) の VM 描画補助内で `detect_memory_gib` を差し替えている。ホスト/VM が128/48 GiB と64/24 GiB の場合に選択値48、24 GiB を等値で検査する。新しい16/48 GiB の場合は終了10と16 GiB の予算診断を確認する。本番のホスト/VM の小さい方を選ぶ規則は維持され、CI の Python 両ジョブも合格した。 +- **R2-02 機能面は解決。** [scan.py](../../installer/grdm_dev/scan.py) は節目の方針から `strict` を渡し、時間切れのみなら M1〜M3 は警告、M4〜M5 は不完全/終了51になる。SPEC-03 §4.2 は英和とも境界を明記した。回帰試験は全5節目を通り、既存の混在エラー試験も維持される。追加のレビュワ検査では、時間切れと通常エラーの混在をスキャナ終了0で M1〜M5 それぞれに与え、全5件が終了51となった。プロセスの成功で通常エラーが隠れないことを確認した。関数の説明は更新されたが、モジュールの説明には初期節目の例外追記が残る。 +- **R2-03 一部解決。** M2 の両行は受入未合格・初回0/12となった。PR 本文は1800秒と以前の CI 失敗の経緯を正しく記す。ただし現在の試験総数は古い(R3-01)。 + +### 阻害しない文書指摘 + +**R3-01 — P3: 現在の installer 試験件数を訂正する。** 指定の discovery コマンドは **356件、10 skip** だった。PR 本文の「r2 対応後354件」でも先端コミット本文の357件でもない。新コミットは従来354件に試験メソッド2件を追加し、節目ごとの subtest は独立した検出試験数に加算されない。編集可能な PR 検証段落を356件へ訂正し、過去の件数は対象版とともに残すこと。履歴の書換えは要求しない。 + +**R3-02 — P3: 方針の版情報と説明を仕上げる。** SPEC-03 §4.2 に新方針はあるが、ヘッダは指定された0.7ではなく **0.6** のままである。SPEC-06 §6 に従い0.7の学び・版の行を追加すること。scan.py のモジュール冒頭の「スキャナ自身の全エラーは不完全」という説明にも M1〜M3 の時間切れ例外を追記すること。PR 要約の SPEC-03 0.5 も現行版を指すなら古い。厳格な節目の強制処理の失敗ではなく文書上の不一致である。 + +### 証跡と限界 + +指定 worktree での観測結果であり、manifest の正本データではない。 + +```toon +checks[5]{command,result}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","合格: 356件、10 skip" + "python3 -m unittest discover -s tools/tests","合格: 90件" + "python3 tools/manifest_check.py","合格: 指摘0" + "python3 tools/docs_check.py","合格: 94検査、8除外、非失敗の警告21" + "gh pr checks 33 --repo RCOSDP/RDM-developer-guide","合格: 全8件、Python 3.11・3.12の単体試験ジョブを含む" +``` + +CI 証跡: [単体試験](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42165776059)・[文書](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42165776076)・[安全性と manifest](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42165776130)。通常の検査は追跡済みファイルを列挙するため、新規未追跡のレビューは `tools.docs_check.check_file` で別途確認する。 + +R1 から残る Linux 所有権の実行証跡、Ember のイメージ変更/再利用の専用回帰試験、ブラウザ受入、新規状態から中断なしのコールドスタート証跡は今回の再検査では得ていない。R2 に記録したままの残件であり、M2 受入完了を主張しない。導入、実スキャナ、Docker 状態変更、実装修正、commit、push、承認、merge は行っていない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| CI | Automated checks on the hosted change. | サーバー上で変更を自動検査する仕組み。 | +| VM | A virtual computer with its own memory budget. | 独自のメモリ予算を持つ仮想のコンピュータ。 | +| Coverage gap | A part of the intended scan that did not finish. | 予定した検査のうち完了していない部分。 | +| Regression test | A repeatable check against a defect returning. | 不具合の再発を防ぐ繰り返し可能な検査。 | +| P3 / nit | A low-priority, nonblocking correction. | 阻害しない軽微な訂正。 | + +Shared terminology: [REF-01](../reference/REF-01_Glossary.md). diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR34_Native_ES2_r1.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR34_Native_ES2_r1.md new file mode 100644 index 0000000..b828bb8 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR34_Native_ES2_r1.md @@ -0,0 +1,157 @@ +# PR34 Native Elasticsearch 2 review r1 / ネイティブ Elasticsearch 2 レビュー r1 + +> **Summary:** Request changes: the native recipe improves cold starts, but volume ownership, manifest validation, provenance labels and recipe CI need fixes. +> **概要:** 要修正。ネイティブ化はコールドスタートを改善するが、ボリューム所有権、manifest 検証、出自ラベル、レシピ CI に修正が必要。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** a successful fresh Docker Desktop run does not validate Linux volume ownership or malformed manifest inputs. / Docker Desktop の新規起動成功では Linux のボリューム所有権や不正な manifest 入力を検証できない。 +- Applies to: RCOSDP/RDM-developer-guide PR #34, head `340eca174f0582d1d178038f2546a4aa58b8ec86`, base `f37a02933394e9fbb3e4bf83b5d114117bfaa92e`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [ADR-07](../decisions/ADR-07_Native_Builds_of_EOL_Middleware.md) · [SPEC-01](../spec/01_manifest.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-06](../spec/06_documentation_conventions.md). +- Used by: [Status board](../status/README.md) · [DEMO-20](../demo/20_core_install_mac_studio.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and findings + +**Request changes.** No P1 finding. R1-01 through R1-04 are P2; R1-05 is P3. No approval, merge, commit, push or running-stack change was performed. + +#### R1-01 (P2): Preserve write access when changing the data owner + +[elasticsearch.json](../../installer/grdm_dev/templates/elasticsearch.json), lines 10–23, removes the owner-init dependency and switches to uid 1000. However, `compose.py::_ensure_volume_dir` creates host-owned directories with mode 0755 and leaves existing directories untouched. On Linux, an existing PR #33 data tree owned by uid 101 cannot be written by uid 1000; a fresh install by a host user other than uid 1000 also fails. Image-layer `COPY --chown` cannot change the bind-mounted tree. This regresses the ownership fix that PR #33 supplied, regardless of the similar existing ES6 assumption. Provide safe provisioning/migration for the actual mounted data and verify both existing uid-101 data and fresh non-1000 host ownership without deleting data. Run 21 on Docker Desktop does not exercise Linux ownership enforcement; no Linux runtime reproduction was attempted here. + +#### R1-02 (P2): Validate presence and resolved containment of image_build + +[manifest_check.py](../../tools/manifest_check.py), lines 522–536, accepts these independently reproduced invalid inputs with **zero findings**: + +- `image_build: {}` skips MC-15 entirely. `manifest.parse(...).component('elasticsearch2').image_reference()` then returns the Temurin base image, and the component is no longer built as Elasticsearch. +- A tag containing a trailing newline (`"valid\n"`) passes `re.match(...$)` and produces an invalid image reference. +- A context named `escape` that is a symlink to a temporary directory outside the repository, containing a Dockerfile, passes the lexical path check and `is_file()`. This defeats the promised repository-local context boundary; the same issue applies to a symlinked Dockerfile. + +Check key presence rather than truthiness, use full-string tag validation, and resolve both context and Dockerfile against the actual repository root before accepting them. Add negative tests for these cases, absolute/parent paths, prebuilt exclusivity and missing notes. The symlink reproduction used isolated temporary directories and a patched checker root; no repository symlink or Docker build was created. + +#### R1-03 (P2): Record the base digest in the resulting image + +[Dockerfile](../../installer/images/elasticsearch2/Dockerfile), lines 32–40, and `build.py::buildx_argv` set no base-image digest label. SPEC-03 §3.4 explicitly requires locally built images to carry it. Read-only `docker image inspect grdm-dev/elasticsearch2:2.4.6-1` confirms that the image has component/recipe labels and inherited Ubuntu labels, but no Temurin base digest. Put the actual pinned base digest in an image label and test/inspect the resulting value; the manifest entry alone does not satisfy the image provenance requirement. + +#### R1-04 (P2): Implement the recipe build checks promised by ADR-07 + +[ADR-07 §4](../decisions/ADR-07_Native_Builds_of_EOL_Middleware.md#english) requires CI builds of `image_build` components on amd64 and arm64. The repository workflows only run Python/package checks, docs and security filesystem checks; all eight PR checks can pass without building this Dockerfile. The build unit tests use a fake runner and a `FROM scratch` fixture, so they cannot catch a broken download, digest or architecture-specific recipe. Add CI execution of the actual recipe for both targets with recorded results, or explicitly record an approved temporary deferral and its gate/owner. The PR body's manual dual-architecture build claim is not an automated regression check; this review did not rebuild either target. + +#### R1-05 (P3): Separate image findings from Dockerfile findings + +[DEMO-20 run 21](../demo/20_core_install_mac_studio.md#english) and the PR body call 59 findings (2 HIGH, 52 MEDIUM, 5 LOW) findings of the native image itself. In the supplied `scan_latest.json`, the image location `grdm-dev/elasticsearch2:2.4.6-1` accounts for **58** (2 HIGH, 52 MEDIUM, 4 LOW); the remaining LOW belongs to the repository Dockerfile scan (`component: installer/images/elasticsearch2/Dockerfile`). Correct both language halves and the PR body, or explicitly label 59 as image-plus-recipe findings. Overall Trivy totals are correct. + +### Validation and scope + +The required commands were run from the reviewed worktree: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/manifest_check.py +python3 tools/docs_check.py +gh pr checks 34 --repo RCOSDP/RDM-developer-guide +``` + +```toon +checks[5]{check,result}: + installer,"361 run; OK; 10 skipped" + tools,"91 run; OK" + manifest_check,"PASSED; zero manifest/policy findings" + docs_check,"PASSED; 22 non-failing glossary warnings" + github,"8 checks pass" +``` + +A separate fake-runner failure of the native image build returned exit **30**. Local/registry tagging and `--push` behavior match ADR-07. Component image references and service origin `image` are wired correctly for valid inputs. Compose uses uid 1000, read-only root, logs tmpfs and the host platform, without an amd64 override. Active installer/manifest/spec references to the deleted one-shot are removed; remaining mentions describe history or assert its absence. + +The Dockerfile pins both FROM bases, verifies the official tarball SHA-256 before extraction, fetches on `$BUILDPLATFORM`, and has no final-stage RUN or plugin installation. The final stage uses uid 1000 and explicit writable mounts. The fetch-stage apt packages and Dockerfile syntax frontend are not themselves content-pinned, so this is not a claim of completely immutable build tooling. No private code, private URL or secret was found in the new recipe/configuration; the public-repository policy scan passed. JNA arm64 limitations are disclosed. ADR-07 English/Japanese decisions agree and its anchors, Jump, version and glossary are present. + +The supplied `install-run21-coldstart-native-es.log` starts at 04:53:51 UTC and ends at 05:24:34 with all nine steps and overall exit 0: 30 minutes 43 seconds. The scan report is dated 05:24:33, baseline/gate pass, tools successful with 22/4/1/3 targets, and Trivy totals 1769/8030/9550/3676 for CRITICAL/HIGH/MEDIUM/LOW. Its commit field is `5bde10e`, not this PR head; it is run evidence, not independent proof of an exact-head rerun. Fresh-volume preparation and six-second ES startup are documented operator observations, not independently reproduced here. + +The checked status board is **0.8**, not the requested 0.9; its cold-start row agrees with the supplied log and acceptance remains open. SPEC-02 §4 and SPEC-03 §3.3 remove the obsolete service/exception in both languages; both README indexes link ADR-07. Minor editorial cleanup remains: the decisions index adds a fourth status cell to a three-column table and still reserves ADR-07 for a future branching decision; modified root README/SPEC-02/SPEC-03 headers were not version-bumped as SPEC-06 §6 requests. Historical review references should remain historical rather than being erased. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +**要修正。** P1 はなし。R1-01〜R1-04 は P2、R1-05 は P3。承認・マージ・コミット・push・稼働スタックの変更は行っていない。 + +#### R1-01 (P2): データ所有者変更後も書込可能にする + +[elasticsearch.json](../../installer/grdm_dev/templates/elasticsearch.json) 10〜23 行は所有者初期化への依存を削除し、uid 1000 に切り替える。しかし `compose.py::_ensure_volume_dir` はホスト所有・0755 のディレクトリを作り、既存ディレクトリには手を加えない。Linux では PR #33 で uid 101 所有になったデータへ uid 1000 は書き込めず、新規導入でもホストの uid が 1000 以外なら失敗する。イメージの `COPY --chown` では bind mount の所有権は直らない。ES6 に同様の前提があっても、PR #33 の所有権修正を失う点は変わらない。実際のマウント先を安全に準備・移行し、uid 101 の既存データと uid 1000 以外のホストによる新規導入を、データ削除なしで検証すること。Docker Desktop の第21回では Linux の所有権強制を検証できず、本レビューでも Linux 実機再現はしていない。 + +#### R1-02 (P2): image_build の存在と解決後のパス境界を検証する + +[manifest_check.py](../../tools/manifest_check.py) 522〜536 行に対し、次の不正入力を個別に与えて**指摘ゼロ**になることを再現した。 + +- `image_build: {}` は MC-15 を通らない。`manifest.parse(...).component('elasticsearch2').image_reference()` は Temurin ベースを返し、Elasticsearch をビルドしなくなる。 +- 末尾に改行があるタグ `"valid\n"` は `re.match(...$)` を通り、不正なイメージ参照になる。 +- リポジトリ外の Dockerfile を含む一時ディレクトリへの symlink `escape` は文字列検査と `is_file()` を通る。リポジトリ内 context という境界が守られず、Dockerfile 自体の symlink も同様。 + +真偽値でなくキーの存在を検査し、タグを全文一致で検査し、context と Dockerfile の解決後パスが実際のリポジトリ内にあることを確認すること。これらと絶対・親パス、prebuilt 併用、note 欠落の拒否試験を追加すること。symlink 再現は一時ディレクトリと検査器 root の差し替えだけで行い、リポジトリ内 symlink 作成や Docker build はしていない。 + +#### R1-03 (P2): 生成イメージにベース digest を記録する + +[Dockerfile](../../installer/images/elasticsearch2/Dockerfile) 32〜40 行と `build.py::buildx_argv` はベース digest のラベルを設定しない。SPEC-03 §3.4 はローカルビルドイメージへの記録を要求する。読み取り専用の `docker image inspect grdm-dev/elasticsearch2:2.4.6-1` でも、component/recipe と継承した Ubuntu ラベルだけで Temurin のベース digest がないことを確認した。実際の固定ベース digest をラベルに入れ、生成値を試験・inspect で確認すること。manifest に書くだけではイメージの出自要件を満たさない。 + +#### R1-04 (P2): ADR-07 が約束するレシピの CI ビルドを実装する + +[ADR-07 §4](../decisions/ADR-07_Native_Builds_of_EOL_Middleware.md#japanese) は `image_build` の amd64/arm64 両方の CI ビルドを要求する。現行 workflow は Python/package、文書、ファイルシステムのセキュリティ検査だけで、Dockerfile を一度も組まずに PR の8検査が通る。単体試験は fake runner と `FROM scratch` を使うため、取得先・digest・アーキテクチャ固有の破損を検出できない。実際のレシピを両対象で組む CI と結果記録を追加するか、承認された一時延期と担当・解除条件を明記すること。PR 本文の手動両アーキテクチャビルドの記載は自動回帰検査ではなく、本レビューでは再ビルドしていない。 + +#### R1-05 (P3): イメージの指摘と Dockerfile の指摘を分ける + +[DEMO-20 第21回](../demo/20_core_install_mac_studio.md#japanese) と PR 本文は59件(HIGH 2・MEDIUM 52・LOW 5)をネイティブイメージ自体の指摘としている。提供された `scan_latest.json` では location が `grdm-dev/elasticsearch2:2.4.6-1` のものは **58件**(HIGH 2・MEDIUM 52・LOW 4)。残りの LOW 1件はリポジトリの Dockerfile 検査(`component: installer/images/elasticsearch2/Dockerfile`)である。英和と PR 本文を直すか、59件はイメージとレシピの合計だと明記すること。Trivy 全体の集計値は正しい。 + +### 検証と範囲 + +レビュー対象 worktree のルートで指定コマンドを実行した。 + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/manifest_check.py +python3 tools/docs_check.py +gh pr checks 34 --repo RCOSDP/RDM-developer-guide +``` + +```toon +checks[5]{check,result}: + installer,"361件実行・OK・10件skip" + tools,"91件実行・OK" + manifest_check,"PASSED・manifest/policy指摘ゼロ" + docs_check,"PASSED・用語注の非阻害警告22件" + github,"8検査合格" +``` + +追加の fake runner 試験でネイティブビルド失敗が終了 **30** になることを確認した。ローカル/registry のタグと `--push` は ADR-07 に合う。正常入力での Component の参照と Service の origin `image` は正しく接続されている。Compose は uid 1000・read_only・logs tmpfs・ホストの platform を使い、amd64 強制指定はない。削除した one-shot の現行 installer/manifest/spec 参照は除かれ、残る言及は履歴か不在の検査である。 + +Dockerfile は両 FROM の digest を固定し、公式 tarball の SHA-256 を展開前に検証し、取得を `$BUILDPLATFORM` で行う。最終段の RUN やプラグイン導入はなく、uid 1000 と明示した書込マウントを使う。取得段の apt パッケージと Dockerfile syntax frontend 自体は内容固定されておらず、ビルド用ツール全体の完全固定を確認したという意味ではない。追加レシピ・設定に非公開コード・非公開 URL・秘密は見つからず、公開リポジトリの policy 検査も合格。JNA の arm64 制約は明記されている。ADR-07 の英和の決定は対応し、anchors・Jump・版・用語集もある。 + +提供された `install-run21-coldstart-native-es.log` は UTC 04:53:51 から05:24:34までの30分43秒で、9段階すべてと全体が終了0。scan 報告は05:24:33、baseline/gate pass、各ツール成功、対象数22/4/1/3、Trivy は CRITICAL/HIGH/MEDIUM/LOW の順に1769/8030/9550/3676で一致する。ただし報告の commit 欄は本 PR head でなく `5bde10e`。実行証跡として扱い、head そのものの独立再実行証明とはしない。空ボリュームの準備と ES の6秒起動は操作者の記録であり、ここで独立再現はしていない。 + +確認した進捗ボードは指定の0.9でなく **0.8**。コールドスタート行はログと一致し、受入試験は未完のまま。SPEC-02 §4 と SPEC-03 §3.3 は英和とも不要なサービス・例外を除き、両 README 索引は ADR-07 にリンクしている。軽微な編集残件として、decisions 索引の3列の表に4列目の状態を足していること、将来の分岐方針にも ADR-07 を予約していること、変更した root README/SPEC-02/SPEC-03 の版を SPEC-06 §6どおり更新していないことがある。過去のレビューの言及は消さず履歴として保つべきである。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| UID | Numeric identity used to decide who may write files. | ファイルに書ける人を判定する番号。 | +| Bind mount | A host directory shown inside a container. | ホストのディレクトリをコンテナ内に見せる仕組み。 | +| Digest | Fingerprint naming exact image content. | イメージの内容を特定する指紋。 | +| CI | Automated checks on proposed changes. | 変更案に対して自動実行する検査。 | +| Symlink | A filesystem entry pointing to another path. | 別のパスを指すファイルシステム上の項目。 | +| P2 / P3 | Normal-priority fix / lower-priority correction. | 通常優先度の修正/低優先度の訂正。 | diff --git a/docs/reviews/2026-11-06_RDM-developer-guide_PR34_Native_ES2_r2.md b/docs/reviews/2026-11-06_RDM-developer-guide_PR34_Native_ES2_r2.md new file mode 100644 index 0000000..61416ba --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-developer-guide_PR34_Native_ES2_r2.md @@ -0,0 +1,121 @@ +# PR34 Native Elasticsearch 2 review r2 / ネイティブ Elasticsearch 2 レビュー r2 + +> **Summary:** The four implementation findings are resolved and all nine checks pass; the PR description still needs the R1-05 correction. +> **概要:** 実装の4指摘は解消し、9検査すべて合格。PR 本文には R1-05 の訂正が残る。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** correcting repository evidence does not also correct the PR description, and an image smoke test does not exercise migration of an existing bind-mounted tree. / リポジトリの証跡を訂正しても PR 本文は直らず、イメージの起動試験だけでは既存 bind マウントの移行を検証できない。 +- Applies to: RCOSDP/RDM-developer-guide PR #34, head `1a8102de7c1d150daefdd931bbbb4cf6c5572b97`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r1](2026-11-06_RDM-developer-guide_PR34_Native_ES2_r1.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-07](../decisions/ADR-07_Native_Builds_of_EOL_Middleware.md). +- Used by: [Status board](../status/README.md) · [DEMO-20](../demo/20_core_install_mac_studio.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Request changes, documentation only (P3).** R1-01 through R1-04 are resolved at code-review scope. No new P1/P2 finding. R1-05 is partially resolved: both DEMO-20 language halves are corrected, but the current PR description still reports 59 findings on the image itself. This is a review verdict, not a GitHub approval or merge. + +### Re-review evidence + +- **R1-01 — resolved in implementation.** [The init template](../../installer/grdm_dev/templates/elasticsearch_data_init.json) runs the native image with explicit `run_as: "0:0"`; [compose.py](../../installer/grdm_dev/compose.py) applies that user only under the recorded user exception. [hardening.json](../../manifest/hardening.json) grants only `CHOWN`, with a review date and removal milestone. The root filesystem stays read-only, capabilities are otherwise dropped, and no-new-privileges stays enabled. The command recursively assigns the data tree to `1000:1000`, and Elasticsearch waits for successful completion. Rendering tests confirm the image, root user, capability, restart policy and dependency. This addresses fresh host-owned 0755 directories and ordinary uid-101 trees without deleting contents. No Linux migration runtime test was run here; the new image workflow uses a fresh Docker-managed volume and does not test the owner-init service or an existing uid-101 bind mount. +- **R1-02 — resolved.** [MC-15](../../tools/manifest_check.py) checks key presence, rejects empty/malformed objects, uses full-string tag matching, and resolves both context and Dockerfile within the repository. Escaping symlinks are refused; in-repository symlinks are not categorically forbidden. [manifest.parse](../../installer/grdm_dev/manifest.py) rejects an empty or incomplete object instead of silently selecting the base image. Added negative tests pass. Independent temporary-directory probes also confirmed rejection of an escaping Dockerfile symlink and `prebuilt_image` coexistence; those two cases are not explicit additions in the committed tests. +- **R1-03 — resolved.** [Dockerfile](../../installer/images/elasticsearch2/Dockerfile) declares OCI base name, base digest and version labels. Its default base digest matches the manifest. [build.py](../../installer/grdm_dev/build.py) passes `base_image_digest` through `--label`; the unit test asserts the actual argument. The image workflow also checks that the built image carries a `sha256:` base label. That smoke assertion checks presence, not equality with the manifest; equality was checked statically for this head. +- **R1-04 — resolved.** [Image recipes](../../.github/workflows/images.yml) uses SHA-pinned actions, enumerates declared recipes, builds `linux/amd64` and `linux/arm64` without pushing, then loads and smoke-tests Elasticsearch on amd64. [Run 42198484299](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42198484299) passed in 51 seconds. Its logs show both target stages, successful tarball verification/build, and the successful amd64 smoke step. All nine PR checks pass. arm64 runtime startup is outside this workflow's evidence. +- **R1-05 — partially resolved.** [DEMO-20](../demo/20_core_install_mac_studio.md) lines 439 and 866 now separate 58 image findings (2 HIGH, 52 MEDIUM, 4 LOW) from one LOW Dockerfile finding. SPEC-02, SPEC-03 and ADR-07 now describe the retained owner-init service and exception consistently in both languages. + +### Remaining correction: R2-01 (P3) + +Update the [PR #34 description](https://github.com/RCOSDP/RDM-developer-guide/pull/34): its measurement section still says “59” image findings (HIGH 2 / MEDIUM 52 / LOW 5), and its change list still says `elasticsearch_data_init` and both exceptions were removed. Report 58 image findings plus one Dockerfile LOW, retain the owner-init service and its exception, and remove only the Elasticsearch service's exception. Refresh the test counts to 362 installer / 92 tools. This completes R1-05 and makes the summary match the reviewed change. + +Non-blocking editorial remnants: the Dockerfile introductory comment still says “no owner-init container”, the Elasticsearch template note ends by claiming replacement of its owner-init one-shot, and SPEC-02 still describes Elasticsearch as emulated in the `osf_init` paragraph. These should be aligned with the corrected normative paragraphs. The r1 editorial notes about index formatting/version headers were not the implementation acceptance gate for r2. + +### Validation and limits + +Executed from the reviewed worktree root: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/manifest_check.py +python3 tools/docs_check.py +gh pr checks 34 --repo RCOSDP/RDM-developer-guide +``` + +```toon +checks[5]{check,result}: + installer,"362 run; OK; 10 skipped" + tools,"92 run; OK" + manifest_check,"PASSED; zero findings" + docs_check,"PASSED; 22 existing non-failing glossary warnings" + github,"9 checks pass; Image recipes included" +``` + +The newly written, untracked r2 file was additionally checked directly with `tools.docs_check.check_file`, because the normal command only enumerates tracked files. No running-stack change, local Docker build, commit, push, approval, merge or close was performed. The earlier run-21 cold-start evidence was not rerun and remains evidence for its recorded revision, not an exact-head full installation. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**要修正。ただし文書のみ(P3)。** R1-01〜R1-04 はコードレビューの範囲で解消。新たな P1/P2 はない。R1-05 は部分解消で、DEMO-20 の英和は直ったが、現在の PR 本文は依然としてイメージ自体の指摘を59件としている。これはレビューの判定であり、GitHub 上の承認やマージではない。 + +### 再レビューの根拠 + +- **R1-01 — 実装修正を確認。** [初期化テンプレート](../../installer/grdm_dev/templates/elasticsearch_data_init.json) はネイティブイメージを明示の `run_as: "0:0"` で実行する。[compose.py](../../installer/grdm_dev/compose.py) は記録された user 例外がある場合だけそのユーザーを適用する。[hardening.json](../../manifest/hardening.json) は `CHOWN` のみを許し、見直し日と除去する節目を持つ。ルートは読み取り専用、他の capability は除去、no-new-privileges は有効のまま。データの木を再帰的に `1000:1000` にし、Elasticsearch は正常終了を待つ。生成試験でイメージ・root・capability・再起動方針・依存関係を確認した。ホスト所有の新規0755ディレクトリと通常の uid-101 の木を、内容を削除せず扱える実装になった。ただし Linux 上の移行実行試験はしていない。新 workflow は Docker 管理の新規ボリュームを使い、所有者初期化サービスや既存 uid-101 の bind マウントは試さない。 +- **R1-02 — 解消。** [MC-15](../../tools/manifest_check.py) はキーの存在を見て空・不正な object を拒否し、タグを全文一致で検査し、context と Dockerfile の両方を解決してリポジトリ境界を確認する。外部へ出る symlink は拒否するが、内部への symlink まで一律禁止する仕様ではない。[manifest.parse](../../installer/grdm_dev/manifest.py) は空または不完全な object を拒否し、黙ってベースイメージを選ばない。追加の負例試験は合格。一時ディレクトリによる独立検査でも、外へ出る Dockerfile symlink と `prebuilt_image` 併用の拒否を確認した。この2ケースはコミット済み試験には明示的に追加されていない。 +- **R1-03 — 解消。** [Dockerfile](../../installer/images/elasticsearch2/Dockerfile) に OCI の base name・base digest・version ラベルがある。既定のベース digest は manifest と一致する。[build.py](../../installer/grdm_dev/build.py) は `base_image_digest` を `--label` に渡し、単体試験が実際の引数を検査する。イメージ workflow も生成物に `sha256:` の base ラベルがあることを確かめる。この起動試験の assertion は存在確認であり manifest との一致までは見ない。一致は今回の head の静的確認で検証した。 +- **R1-04 — 解消。** [Image recipes](../../.github/workflows/images.yml) は SHA 固定の action を使い、宣言されたレシピを列挙し、push せず `linux/amd64` と `linux/arm64` を組み、amd64 の Elasticsearch をロードして起動試験する。[実行42198484299](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/42198484299) は51秒で成功。ログで両対象段、tarball 検証・ビルド、amd64 の起動試験成功を確認した。PR の9検査すべて合格。arm64 の実行時起動はこの workflow の証明範囲外。 +- **R1-05 — 部分解消。** [DEMO-20](../demo/20_core_install_mac_studio.md) の439・866行はイメージ58件(HIGH 2・MEDIUM 52・LOW 4)と Dockerfile の LOW 1件を分けた。SPEC-02・SPEC-03・ADR-07 も所有者初期化サービスと例外の維持を英和で対応して記載している。 + +### 残る訂正: R2-01(P3) + +[PR #34 本文](https://github.com/RCOSDP/RDM-developer-guide/pull/34)を更新すること。計測節はまだイメージ「59件」(HIGH 2・MEDIUM 52・LOW 5)で、変更一覧も `elasticsearch_data_init` と両例外を削除したとしている。イメージ58件+Dockerfile の LOW 1件に分け、所有者初期化サービスとその例外は維持し、Elasticsearch サービス自身の例外だけを除去したとする。試験数も installer 362件/tools 92件へ更新する。これで R1-05 が完了し、要約がレビュー対象の変更と一致する。 + +非阻害の編集残件: Dockerfile 冒頭の “no owner-init container”、Elasticsearch テンプレートの note 末尾の初期化サービスを置き換えたという記述、SPEC-02 の `osf_init` 段落で Elasticsearch をエミュレーション下とする記述も、訂正済みの規範的段落に合わせたい。r1 の索引整形・版ヘッダーの編集注は、r2 の実装受入ゲートとはしていない。 + +### 検証と限界 + +レビュー対象 worktree のルートで実行した。 + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/manifest_check.py +python3 tools/docs_check.py +gh pr checks 34 --repo RCOSDP/RDM-developer-guide +``` + +```toon +checks[5]{check,result}: + installer,"362件実行・OK・10件skip" + tools,"92件実行・OK" + manifest_check,"PASSED・指摘ゼロ" + docs_check,"PASSED・既存の非阻害用語警告22件" + github,"9検査合格・Image recipes を含む" +``` + +新規の未追跡 r2 ファイルは `tools.docs_check.check_file` で直接追加検査した。通常コマンドは追跡済みファイルだけを列挙するためである。稼働スタック変更・ローカル Docker build・commit・push・承認・merge・close は行っていない。第21回のコールドスタートは再実行しておらず、記録された版の証跡であって今回の head での完全インストールの証明ではない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| UID | Number identifying a file owner. | ファイル所有者を表す番号。 | +| Bind mount | A host directory made visible inside a container. | ホストのディレクトリをコンテナ内に見せる仕組み。 | +| Digest | Fingerprint identifying exact image content. | イメージの内容を特定する指紋。 | +| Symlink | A filesystem entry that points to another path. | 別のパスを指す項目。 | +| Smoke test | A short check that a program starts and responds. | 起動して応答することを見る短い試験。 | +| P3 | Lower-priority correction. | 低優先度の訂正。 | diff --git a/docs/reviews/2026-11-06_RDM-osf.io-dev2027_PR3_CAS_Internal_URL_r1.md b/docs/reviews/2026-11-06_RDM-osf.io-dev2027_PR3_CAS_Internal_URL_r1.md new file mode 100644 index 0000000..623c4b3 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-osf.io-dev2027_PR3_CAS_Internal_URL_r1.md @@ -0,0 +1,101 @@ +# REV PR3 CAS internal URL review r1 / CAS 内部 URL レビュー r1 + +> **Summary:** The browser/server address split is correct; no blocking defect was found. Test coverage has two non-blocking gaps, and runtime integration remains unverified. +> **概要:** ブラウザとサーバーのアドレス分離は正しく、阻害する不具合は見つからなかった。テストには非阻害の補強点が二つあり、実環境の結合動作は未検証。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** CAS profile URLs also enter template context, so address separation must be checked through consumers as well as request builders. / CAS の profile URL はテンプレートの文脈にも渡るため、通信の組み立て側だけでなく利用側まで確認する必要がある。 +- Applies to: `RCOSDP/RDM-osf.io-dev2027` PR #3, `feat/cas-internal-server-url` → `develop`, head `d1c8fe922057ea2b66035512726bcf881419ebe2`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-02](../decisions/ADR-02_Network_Model.md) · [REF-01](../reference/REF-01_Glossary.md). +- Used by: [SPEC-04 acceptance tests / 受入試験](../spec/04_acceptance_tests.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**PASS with non-blocking test suggestions.** This is a source review, not a GitHub approval or authorization to merge. CAS (the shared login service) keeps its browser address while server requests can use a Compose service name, matching ADR-02 without a loopback alias. The local branch reference matches the reviewed head. GitHub reports exactly three changed files: `framework/auth/cas.py`, `website/settings/defaults.py`, and `tests/test_cas_client_internal_url.py`; the complete diff contains no unrelated changes. + +### Call-site audit + +| Path | Evidence and result | +|---|---| +| Ticket validation | `framework/auth/cas.py:118–125` sends GET to `INTERNAL_URL/p3/serviceValidate`; the service parameter remains the caller's external URL. `make_response_from_ticket` uses `get_client()`. | +| OAuth profile | `cas.py:99–102,139–143` uses `INTERNAL_URL/oauth2/profile`. `framework/auth/core.py:89` and `api/base/authentication/drf.py:283` obtain that client. | +| Token revocation | `cas.py:104–107,188–192` sends POST to `INTERNAL_URL/oauth2/revoke`. Application/token API deletion flows through `osf/models/oauth.py:73–75,88–89,143–147` and the same client. | +| Browser login/logout | `cas.py:81,94` retains `BASE_URL`; wrappers and nested logout/login chains retain it. Authentication views, profile views, project decorators and contributor views all use these helpers. Institution campaigns at `framework/auth/views.py:252,397` are unchanged. | +| Literal external addresses | `website/routes.py:179,183`, `website/profile/utils.py:64,74`, and `api/institutions/authentication.py:252` construct browser-facing login/MFA destinations. `framework/auth/views.py:1127` validates browser return destinations. Keeping `CAS_SERVER_URL` is correct. | +| Template context | `website/routes.py:184` now supplies an internal profile URL to context. Searches of templates and JavaScript found no consumer of that CAS context value; other profile URLs are user/add-on links. No active browser request or redirect regression was found, but future consumers must not use this internal value in the browser. | +| Admin | Search found no separate CAS HTTP request or redirect implementation in `admin`; no missed direct server call was found across the four requested trees. | + +### Compatibility and tests + +`get_client()` uses `getattr(settings, 'CAS_INTERNAL_SERVER_URL', None)`, and the constructor falls back with `internal_base_url or base_url`. An absent setting, explicit `None`, or an empty string preserves the old address; existing one-argument constructors still work. Defaults add only `CAS_INTERNAL_SERVER_URL = None`. + +The new `tests/test_*.py` file, `Test*` class, `test_*` methods and `monkeypatch` fixture fit pytest 5.0.0 and the repository's `pytest.ini`; there is no test-path restriction excluding it. The nested fake response and byte-string XML are valid Python 3.6 syntax by inspection. The authentication-failure XML returns an unauthenticated response without raising, so the new validation test is structurally sound. Root `conftest.py` still loads application dependencies and automatic fixtures: this is not an independently runnable dependency-free test. + +**N1 — non-blocking:** `tests/test_cas_client_internal_url.py:13` replaces text in the profile URL and therefore does not test fallback ticket validation. Replace it with a direct profile assertion and mock the actual default-address `service_validate` request; also assert that the external service query parameter is unchanged. + +**N2 — non-blocking:** all three tests construct `CasClient` directly. Add `get_client()` cases for a configured internal setting and an absent setting to protect the configuration wiring. The implementation is correct by inspection, but removing that wiring would leave these tests green. + +### Validation limits + +Compilation of all three changed Python files succeeded with local Python 3.15.2; existing invalid-escape warnings in defaults at lines 2119–2121 are outside this diff. This does not prove execution under Python 3.6. No pytest suite, live CAS/browser scenario, or Docker operation was run. GitHub checks were pending when inspected. Runtime login, profile, revocation and redirect-chain acceptance checks remain for the integration environment; no code changes are requested as a blocking condition. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**PASS(テスト補強の非阻害提案あり)。** ソースのレビューであり、GitHub の承認やマージ許可ではない。CAS(共通のログインサービス)のブラウザ用アドレスを保ち、サーバー通信だけ Compose のサービス名に切り替える実装は、ループバック別名を使わない ADR-02 と整合する。ローカルのブランチ参照は対象 head と一致した。GitHub の変更ファイルは `framework/auth/cas.py`、`website/settings/defaults.py`、`tests/test_cas_client_internal_url.py` の三つだけで、全差分に無関係な変更はなかった。 + +### 呼び出し箇所の監査 + +| 経路 | 根拠と結果 | +|---|---| +| チケット検証 | `framework/auth/cas.py:118–125` の GET は `INTERNAL_URL/p3/serviceValidate` に向かう。service 引数は呼び出し元の外部 URL のまま。`make_response_from_ticket` は `get_client()` を使う。 | +| OAuth profile | `cas.py:99–102,139–143` は `INTERNAL_URL/oauth2/profile` を使う。`framework/auth/core.py:89` と `api/base/authentication/drf.py:283` はこのクライアントを取得する。 | +| トークン失効 | `cas.py:104–107,188–192` の POST は `INTERNAL_URL/oauth2/revoke` に向かう。アプリ・トークン削除 API は `osf/models/oauth.py:73–75,88–89,143–147` 経由で同じクライアントを使う。 | +| ブラウザのログイン・ログアウト | `cas.py:81,94` は `BASE_URL` を維持。ラッパーと入れ子の logout/login も同様。認証ビュー、プロフィールビュー、プロジェクトのデコレーターと共同編集者ビューはこれらを使う。`framework/auth/views.py:252,397` の機関ログイン campaign も不変。 | +| 外部アドレスの直接使用 | `website/routes.py:179,183`、`website/profile/utils.py:64,74`、`api/institutions/authentication.py:252` はブラウザ用 login/MFA 転送先を作る。`framework/auth/views.py:1127` はブラウザの戻り先を検証する。`CAS_SERVER_URL` の維持が正しい。 | +| テンプレートの文脈 | `website/routes.py:184` は内部 profile URL を文脈に渡すようになる。テンプレートと JavaScript を検索したが、この CAS 用の値の利用先はなかった。他の profile URL は利用者やアドオンへのリンク。稼働するブラウザ通信・転送の退行は見つからなかったが、将来この内部値をブラウザで使ってはならない。 | +| 管理画面 | `admin` に独立した CAS HTTP 通信・転送の実装はなかった。指定の四つのツリー全体で、切り替え漏れの直接サーバー通信は見つからなかった。 | + +### 互換性とテスト + +`get_client()` は `getattr(settings, 'CAS_INTERNAL_SERVER_URL', None)` を使い、コンストラクターは `internal_base_url or base_url` で元のアドレスに戻る。設定の欠落、明示的な `None`、空文字列では従来のアドレスを保つ。既存の引数一つの呼び出しも動く。既定値の追加は `CAS_INTERNAL_SERVER_URL = None` だけ。 + +追加ファイルの `tests/test_*.py`、`Test*` クラス、`test_*` メソッド、`monkeypatch` は pytest 5.0.0 と既存 `pytest.ini` の規約に合い、収集対象から除外する設定もない。内部クラスの偽応答とバイト列 XML は目視上 Python 3.6 で有効な構文。認証失敗 XML は例外ではなく未認証の応答になるため、新しい検証テストの構造は正しい。ルートの `conftest.py` はアプリの依存関係と自動 fixture を読み込むため、依存なしで単独実行できるテストではない。 + +**N1 — 非阻害:** `tests/test_cas_client_internal_url.py:13` は profile URL の文字を置換しており、既定アドレスでのチケット検証を試していない。profile の直接比較と、既定アドレスへの実際の `service_validate` を模擬する検証に置き換え、外部 service クエリー引数が保たれることも確認するとよい。 + +**N2 — 非阻害:** 三つのテストはすべて `CasClient` を直接作る。内部設定あり・設定欠落の `get_client()` テストを足して、設定の受け渡しを保護するとよい。実装は目視上正しいが、この受け渡しを消しても現状のテストは通る。 + +### 検証の限界 + +変更した Python 三ファイルはローカル Python 3.15.2 の構文コンパイルに成功した。defaults の 2119–2121 行に既存のエスケープ警告が出たが差分外。これは Python 3.6 での実行証明ではない。pytest スイート、実際の CAS・ブラウザ操作、Docker 操作は実行していない。確認時の GitHub 検査は実行待ち・実行中だった。ログイン・profile・失効・転送連鎖の受入試験は統合環境に残るが、阻害条件として求めるコード修正はない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| CAS | The shared service that verifies login. | 共通のログイン確認サービス。 | +| Internal URL | An address used between services. | サービス同士で使う住所。 | +| Redirect | A response telling a browser where to go next. | ブラウザに次の行き先を伝える応答。 | +| OAuth token revocation | Cancelling a credential used to access a service. | サービスへアクセスするための資格情報を無効にすること。 | +| pytest fixture | Test setup supplied automatically or by parameter name. | 自動または引数名で受け取る試験の準備処理。 | +| Non-blocking | A suggested improvement that does not prevent acceptance. | 受入を妨げない改善提案。 | + +Shared terms / 共通用語: [REF-01 Glossary](../reference/REF-01_Glossary.md). diff --git a/docs/reviews/2026-11-06_RDM-wiki-frontend-dev2027_PR2_JS_Deps_Sync_r1.md b/docs/reviews/2026-11-06_RDM-wiki-frontend-dev2027_PR2_JS_Deps_Sync_r1.md new file mode 100644 index 0000000..1067d11 --- /dev/null +++ b/docs/reviews/2026-11-06_RDM-wiki-frontend-dev2027_PR2_JS_Deps_Sync_r1.md @@ -0,0 +1,90 @@ +# PR2 JS dependency sync review r1 / JS 依存同期レビュー r1 + +> **Summary:** Pass with one non-blocking correction to the verification description. All six dependency changes match osf.io develop, the webpack 5 stack is preserved, and the lock graph has no missing or stale selectors. +> **概要:** 検証説明に軽微な訂正事項1件を付して合格。依存変更6件は osf.io develop と一致し、webpack 5 系を維持し、ロックの依存グラフに欠落・不要な選択子はない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-06. **Learned:** dependency pruning is justified by graph reachability, while a successful build can still include a configuration warning alongside performance warnings. / 依存の削除はグラフの到達性で説明でき、成功したビルドでも性能警告に加えて設定警告が含まれる。 +- Applies to: RCOSDP/RDM-wiki-frontend-dev2027 PR #2; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md). +- Used by: [DEMO-20](../demo/20_core_install_mac_studio.md) · [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Pass with a non-blocking documentation nit (R1-01). No blocking code findings.** This is a review verdict, not a GitHub approval. Scope is only `package.json` and `yarn.lock`, base `203d32fab60aad8d78e9b743987519252f99b817` to head `ed6f6369efead0528538964fcfdedd3233c4e4b4`. GitHub reports exactly these two changed files. The local wiki base files match the base blobs byte for byte. The supplied local osf.io manifest matches remote develop `356a997eb5fe7d4aa49c05a0bbcf736a3cf1e31f` byte for byte. + +### Dependency and lock review + +Observed comparisons (review evidence, not canonical manifest data): + +```toon +dependencies[6]{name,base,head_and_osfio,locked}: + bootstrap-datepicker,1.9.0,1.10.1,1.10.1 + highlight.js,~8.4.0,~9.18.2,9.18.5 + less,^2.5.3,^2.7.3,2.7.3 + linkify-html,absent,^4.4.0,4.4.0 + linkifyjs,^2.0.3,^4.4.0,4.4.0 + sift,absent,^17.0.1,17.1.4 +``` + +These are the only manifest changes. No dependency is removed, and all other fields, including development dependencies and scripts, are unchanged. Webpack `^5.93.0`, webpack-cli `^5.1.4`, terser-webpack-plugin `^5.3.10`, assets-webpack-plugin `^7.1.1`, file-loader `^6.2.0`, url-loader `^4.1.1`, the Milkdown packages, Yjs packages and browser shims remain. The six named build-tool lock blocks are identical to base. + +A read-only Python inspection parsed every Yarn v1 block and traversed both `dependencies` and `optionalDependencies` from all 118 manifest roots, including development dependencies. All 1,468 selectors in 1,218 blocks are reachable, with zero missing selectors and zero stale selectors. The six new direct resolutions satisfy their declared ranges. The 48 removed selectors follow replacement of the old roots and pruning of their unused branches: linkifyjs 2's optional React/React DOM tree and less 2.7.2's request 2.83 branch. Less 2.7.3 uses the retained request 2.81.0 block. Datepicker now requires jQuery `>=3.4.0 <4.0.0`, satisfied by the retained 3.7.1 resolution; 3.5.1 becomes unused. The only shared selector with changed block contents is jQuery `>= 1.7.2`, which gains an integrity field without changing version or resolved URL. + +Both Git dependency declarations and their complete lock blocks are unchanged: dropzone `aba21eb6b82cc823ac7a7a53d6e035791c082bae` and treebeard `d2bb8f6f8104fcac040402727f431c26722b269e`. No webpack-5-specific dependency loss was found. + +### Build evidence and R1-01 + +The supplied `wiki-overlay-test-build.log` under `/private/tmp/claude-501/-Users-komiyama-ai-development-GitHub-RDM-developer-guide/8d9d37a4-fc91-4879-8396-0dc9a3134401/scratchpad/` supports the success claim: step #89 runs Yarn 1.22.19 with `--frozen-lockfile`, completes installation, emits `wiki-edit-page.86ca01eae33ec9d1a99b.js` (5.76 MiB) and `vendor.0da9662a5ff6f2b6b710.js` (2.65 MiB), and reports webpack 5.93.0 compiled with four warnings. Step #91 completes export and unpacking of `grdm-dev/wiki-frontend:deps-test`. + +**R1-01 — low, non-blocking:** the PR body calls all four warnings performance recommendations. One is actually the missing webpack `mode` configuration; the other three concern asset size, entrypoint size and performance recommendations. Correct the description to “four webpack warnings: one mode configuration warning and three performance warnings.” Installation also reports peer-dependency warnings, and Docker reports legacy ENV syntax; the build nevertheless completes. No configuration change is requested in this dependency-only PR. + +The build claim is plausible, but the log does not attest the exact input commits or explicitly show the requested platform, nor independently prove final filesystem contents. I did not rerun installation or build, inspect the image, change Docker state, or test browser/C4 acceptance. This review confirms static lock consistency and corroborates the supplied build evidence; it does not certify runtime behavior. Only the requested review record and one PR comment are written, without commit, push, approval, merge or closure. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**軽微な説明訂正(R1-01)を付して合格。コードの阻害指摘なし。** GitHub の承認操作ではなくレビュワの判定。対象は base `203d32fab60aad8d78e9b743987519252f99b817` から head `ed6f6369efead0528538964fcfdedd3233c4e4b4` の `package.json` と `yarn.lock` のみ。GitHub 上の変更ファイルもこの2件だけ。ローカル wiki base の両ファイルは base の内容とバイト単位で一致する。指定のローカル osf.io manifest も remote develop `356a997eb5fe7d4aa49c05a0bbcf736a3cf1e31f` とバイト単位で一致する。 + +### 依存とロックの検査 + +英語部の6件の比較が全 manifest 差分であり、すべて osf.io develop の指定値と一致する。依存削除はなく、開発依存・scripts を含む他のフィールドは不変。Webpack `^5.93.0`、webpack-cli `^5.1.4`、terser-webpack-plugin `^5.3.10`、assets-webpack-plugin `^7.1.1`、file-loader `^6.2.0`、url-loader `^4.1.1`、Milkdown、Yjs、ブラウザ用補完依存を維持している。列挙した6ビルドツールのロックブロックも base と同一。 + +読取り専用の Python 検査で Yarn v1 の全ブロックを解析し、開発依存を含む manifest の118起点から `dependencies` と `optionalDependencies` を走査した。1,218ブロックの1,468選択子すべてに到達し、欠落0・不要な選択子0。新しい直接依存6件の解決版も指定範囲内にある。削除された48選択子は、旧起点の置換と不要になった枝の除去で説明できる。linkifyjs 2 の任意依存 React/React DOM 系と、less 2.7.2 の request 2.83 系が主な対象。less 2.7.3 は残存する request 2.81.0 を使う。Datepicker の jQuery 要件は `>=3.4.0 <4.0.0` となり、既存の3.7.1で満たし、3.5.1は不要になる。共通選択子でブロック本文が変わるのは jQuery `>= 1.7.2` のみで、版・取得先を保って integrity を追加している。 + +Git 依存は宣言とロックの全ブロックがともに不変。dropzone は `aba21eb6b82cc823ac7a7a53d6e035791c082bae`、treebeard は `d2bb8f6f8104fcac040402727f431c26722b269e` のまま。webpack 5 固有依存の欠落は見つからなかった。 + +### ビルド証跡と R1-01 + +英語部にパスを記した指定ログは成功主張を裏付ける。#89 で Yarn 1.22.19 の `--frozen-lockfile` によるインストールが完了し、`wiki-edit-page.86ca01eae33ec9d1a99b.js`(5.76 MiB)と `vendor.0da9662a5ff6f2b6b710.js`(2.65 MiB)を出力、webpack 5.93.0 が警告4件で完了する。#91 では `grdm-dev/wiki-frontend:deps-test` の export と unpacking が完了している。 + +**R1-01 — 軽微・非阻害:** PR 本文は警告4件をすべて性能推奨とするが、1件は webpack の `mode` 未設定。残る3件が asset size、entrypoint size、performance recommendations。「webpack 警告4件(mode 未設定1件、性能関連3件)」へ説明を訂正してほしい。別途、インストール時の peer dependency 警告と Docker の旧 ENV 構文警告もあるが、ビルドは完了する。依存だけを変更するこの PR に設定修正は求めない。 + +ビルド成功主張は妥当と判断するが、ログだけでは入力コミットの完全一致、指定プラットフォームの明示、最終ファイルシステムの内容までは独立に証明できない。インストール・ビルドの再実行、イメージの調査、Docker 状態変更、ブラウザ/C4 受入試験は行っていない。静的なロック整合と提供ログの裏付けを確認したもので、実行時動作の保証ではない。指定レビュー記録と PR コメント1件だけを書き、commit・push・approve・merge・close は行わない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Overlay | Files placed over another source tree before building. | ビルド前に別のソースの木へ重ねるファイル。 | +| Lock selector | A package name and requested range identifying a locked resolution. | 固定した取得版を指すパッケージ名と要求範囲の組。 | +| Reachability | Whether following dependencies from the manifest can reach a lock entry. | manifest から依存をたどってロック項目へ到達できること。 | +| Frozen lockfile | Installation using the existing lock without rewriting it. | 既存ロックを書き換えず利用するインストール。 | +| Peer dependency | A package another package expects its caller to provide. | 呼び出す側に用意を求める依存パッケージ。 | +| C4 | Wiki collaborative-editing acceptance scenario. | Wiki 共同編集の受入シナリオ。 | diff --git a/docs/reviews/2026-11-07_RDM-osf.io-dev2027_PR4_Wiki_Bundle_Path_r1.md b/docs/reviews/2026-11-07_RDM-osf.io-dev2027_PR4_Wiki_Bundle_Path_r1.md new file mode 100644 index 0000000..447d1a0 --- /dev/null +++ b/docs/reviews/2026-11-07_RDM-osf.io-dev2027_PR4_Wiki_Bundle_Path_r1.md @@ -0,0 +1,88 @@ +# Review r1: Wiki bundle path / Wiki バンドル参照先レビュー + +> **Summary:** The new script URL matches the developer overlay and Flask static configuration. Changes are requested because non-overlay deployments have no demonstrated step that installs the required bundle at that URL. +> **概要:** 新しいスクリプト URL は開発用オーバーレイと Flask の静的配信設定に一致する。オーバーレイを使わない配備では必要な束の配置手順が確認できないため、修正を求める。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-07. **Learned:** a valid static URL does not establish that every deployment produces its target file. / 静的 URL が正しくても、すべての配備で参照先ファイルが作られるとは限らない。 +- Applies to: `RCOSDP/RDM-osf.io-dev2027` PR #4, `feat/wiki-overlay-bundle-path` → `develop`, head `7f5aae9d3f53161b8f63ab2e0b4e59c5c1a98c91`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md) · [wiki_assets template](../../installer/grdm_dev/templates/wiki_assets.json). +- Used by / 利用先: [DEMO-20](../demo/20_core_install_mac_studio.md) · [SPEC-04 acceptance / 受入](../spec/04_acceptance_tests.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Changes requested: one deployment-contract issue (R1-01, P2).** The path change is correct for the ADR-06 developer environment. This is a review conclusion, not a GitHub approval or merge. The patch changes one executable line and adds four Mako comment lines. + +### R1-01: provide the bundle in non-overlay deployments + +Location: `addons/wiki/templates/edit.mako:737`. The new URL is unconditional. A clean deployment built only with this repository's Dockerfile or ordinary asset pipeline does not create `website/static/public/js/wiki/wiki-edit-page.js`. The editor request therefore returns 404 unless an external deployment step supplies it. The repository's Dockerfile runs its own `webpack-prod` (`Dockerfile:188`), whose wiki entry is disabled; `package.json:104` selects `webpack.prod.config.js`, which imports the active common config. Neither its Compose assets service (`docker-compose.yml:413`) nor repository-wide searches revealed a wiki overlay copier or alias creation step. Generated `website/static/public/` is ignored (`.gitignore:114`); the target directory is absent in the inspected checkout. + +The known provider is specifically RDM-developer-guide's `wiki_assets`: it copies the overlay output, adds the unhashed alias, and makes it available through `wiki_static` mounted at `/code/website/static/public/js/wiki/`. That satisfies the developer environment contract; it is not evidence that a production deployment already runs it. No production environment was inspected, so this is a reproducible missing prerequisite for deployments without that provider, not a claim of an observed production outage. The old raw source also contains CommonJS `require` calls and was already unsuitable as an ordinary browser script; reverting to that source is not a working fallback. + +Before treating the change as generally deployable, document and connect an equivalent production build/copy/mount or static-server publication step. It must install the overlay bundle, its `wiki-edit-page.js` alias and every required chunk under the new URL prefix before serving the changed template. If this branch intentionally supports only the developer overlay, explicitly state that deployment restriction and the prerequisite in deployment documentation. Verify the new URL and required chunks return JavaScript successfully and run C4 with the intended deployment configuration. + +### Other requested checks + +**References and shadowing:** a repository-wide search, including hidden configuration files but excluding Git internals, found no other active template, route, or test referring to the old URL. Translation `.po`/`.pot` files retain source-location comments. `webpack.common.config.js:37` has the wiki entry commented out. `webpack.common.config.js_org:25` retains an active entry in a backup file, but the configured build does not import that file. Automatic add-on discovery only considers `files.js`, `node-cfg.js`, `user-cfg.js`, `file-detail.js`, and `widget-cfg.js` (`webpack.common.config.js:108`); it cannot recreate `wiki-edit-page`. Consequently the current osf.io build has no same-name wiki editor bundle to shadow. Its production output remains in `website/static/public/js` (`webpack.prod.config.js:44`); mounting only the `wiki/` subdirectory preserves the other page bundles and the root asset manifest. The old raw source remains reachable through the generic static route if retained on disk; changing the template does not remove that route or file. + +**Static serving:** `framework/flask/__init__.py:13–17` constructs Flask with `settings.STATIC_FOLDER` and `settings.STATIC_URL_PATH`. `website/settings/defaults.py:23–27` sets these to `website/static` and `/static`. Thus `/static/public/js/wiki/wiki-edit-page.js` maps to `website/static/public/js/wiki/wiki-edit-page.js` without a dedicated wiki route, provided the file exists and settings are not overridden. A production reverse proxy/CDN serving `/static` must publish the same subtree; its live configuration was not available. + +**Mako comments:** line-leading `##` is valid single-line Mako comment syntax. The same template already uses it at line 11; the upstream Mako lexer also recognizes `##` in `match_control_line`. The four new comments are template comments, not browser-visible HTML. The unquoted constant `src` value is unchanged in form and contains no characters that require quoting for HTML parsing; no new syntax defect was found. + +### Evidence and limits + +Read the PR metadata/diff with `gh`, confirmed the local branch ref equals the reviewed head, searched local source/configuration, and read ADR-06 and the installer template. The Mako lexer was read with `gh api repos/sqlalchemy/mako/contents/mako/lexer.py`; no external web tool was used. Local Python environments lack Mako, so no full template render was performed. No build, browser/C4 run, live HTTP check, or production inspection was performed. No Docker state, application source, commits, branches, or merge/approval state was changed. The review file was checked directly with `tools.docs_check.check_file` because it is untracked. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**要修正:配備の前提に関する指摘 1 件(R1-01、P2)。** ADR-06 の開発環境に対するパス変更は正しい。これはレビューの判定であり、GitHub の承認やマージではない。差分は実行内容 1 行の変更と Mako コメント 4 行の追加である。 + +### R1-01:オーバーレイを使わない配備にも束の配置手順が必要 + +対象:`addons/wiki/templates/edit.mako:737`。新 URL は無条件で使われる。本リポジトリの Dockerfile または通常のアセット生成だけでクリーン配備すると、`website/static/public/js/wiki/wiki-edit-page.js` は作られない。外部の配備処理で補わなければ、エディタのリクエストは 404 になる。Dockerfile は自身の `webpack-prod` を実行する(`Dockerfile:188`)が、Wiki エントリは無効である。`package.json:104` が選ぶ `webpack.prod.config.js` は有効な common 設定を読み込む。Compose の assets サービス(`docker-compose.yml:413`)およびリポジトリ全体の検索でも、Wiki オーバーレイのコピーや別名作成の処理は見つからなかった。生成先 `website/static/public/` は追跡対象外(`.gitignore:114`)であり、調査した checkout に対象ディレクトリは無い。 + +確認できた供給元は RDM-developer-guide の `wiki_assets` である。オーバーレイの成果物を写し、ハッシュ無しの別名を作り、`wiki_static` を `/code/website/static/public/js/wiki/` に mount して提供する。これは開発環境の前提を満たすが、本番配備でも実行される証拠ではない。本番環境自体は調査していないため、供給処理が無い配備で再現する前提不足の指摘であり、実際の本番障害を観測したという意味ではない。旧ソースにも CommonJS の `require` があり、通常のブラウザ用スクリプトとして元から不適切だった。旧パスへの復帰は動作する代替手段にならない。 + +一般の配備に適用可能とする前に、同等の本番ビルド・コピー・mount または静的サーバへの公開手順を文書化し、配備に組み込むこと。変更後のテンプレートを公開する前に、オーバーレイの束、その別名 `wiki-edit-page.js`、必要な全チャンクを新 URL の配下へ配置する必要がある。このブランチが開発用オーバーレイだけを対象とするなら、その制限と前提を配備文書に明記すること。意図した配備構成で新 URL と必要なチャンクが正常に JavaScript を返すこと、および C4 を確認すること。 + +### ほかの確認事項 + +**参照と隠蔽:** Git 内部を除き隠し設定ファイルも含めたリポジトリ全体の検索で、旧 URL を使う別の有効なテンプレート・ルート・テストは見つからなかった。翻訳の `.po` / `.pot` にソース位置コメントは残る。`webpack.common.config.js:37` の Wiki エントリはコメントアウトされている。バックアップ `webpack.common.config.js_org:25` には有効なエントリが残るが、設定済みのビルドはこれを読み込まない。アドオン自動検出の対象は `files.js`・`node-cfg.js`・`user-cfg.js`・`file-detail.js`・`widget-cfg.js` のみ(`webpack.common.config.js:108`)で、`wiki-edit-page` を再生成しない。そのため現行 osf.io ビルドの同名エディタ束を隠すことはない。本体の本番出力先は `website/static/public/js`(`webpack.prod.config.js:44`)のままで、`wiki/` のみの mount は他ページの束とルートのアセット一覧を保つ。旧ソースがディスク上に残れば汎用静的ルートから引き続き配信される。テンプレート変更は旧ルートやファイルを削除しない。 + +**静的配信:** `framework/flask/__init__.py:13–17` は `settings.STATIC_FOLDER` と `settings.STATIC_URL_PATH` を指定して Flask を作る。`website/settings/defaults.py:23–27` はそれぞれ `website/static` と `/static` を設定する。したがってファイルが存在し設定が上書きされなければ、新 URL は `website/static/public/js/wiki/wiki-edit-page.js` に対応し、Wiki 専用ルートは不要である。本番のリバースプロキシや CDN が `/static` を配信する場合も同じ下位ディレクトリの公開が必要だが、実環境の設定は確認できていない。 + +**Mako コメント:** 行頭の `##` は正しい一行コメント構文である。同じテンプレートの 11 行目にも用例があり、上流 Mako の lexer の `match_control_line` も `##` を認識する。追加された 4 行はテンプレートコメントであり、ブラウザに HTML として出ない。引用符の無い定数の `src` は従来と同じ形式であり、HTML 解析で引用符を必須とする文字も含まないため、新たな構文上の問題はない。 + +### 根拠と未検証範囲 + +`gh` で PR 情報と差分を読み、ローカルのブランチ参照が対象 head と一致することを確認し、ソース・設定の検索と ADR-06・インストーラーテンプレートの読解を行った。Mako lexer は `gh api repos/sqlalchemy/mako/contents/mako/lexer.py` で確認し、外部 Web ツールは使っていない。ローカル Python 環境に Mako が無いため完全なテンプレート描画は行っていない。ビルド、ブラウザ/C4、実 HTTP、本番調査は未実施。Docker 状態、アプリケーションソース、コミット、ブランチ、マージ・承認状態は変更していない。レビュー記録は未追跡ファイルなので `tools.docs_check.check_file` を直接呼んで検査した。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Bundle | JavaScript files combined into browser-executable output. | JavaScript をブラウザで動かせる形に束ねた成果物。 | +| Overlay | Files built on top of another repository's source tree. | 別リポジトリのソースにファイルを重ねてビルドする仕組み。 | +| Alias | A stable filename pointing to or copying a versioned output. | 版ごとの成果物を参照・複製する固定の別名。 | +| Chunk | A separate JavaScript piece required by a bundle. | 束の動作に必要な、分割された JavaScript ファイル。 | +| Mako | The server-side template language used by the editor page. | エディタページをサーバ側で生成するテンプレート言語。 | +| C4 | The Wiki collaborative-editing acceptance scenario. | Wiki 共同編集の受入シナリオ。 | +| P2 | A normal-priority issue to resolve before general deployment. | 一般配備前に解決する通常優先度の指摘。 | diff --git a/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR2_Security_Absorb_r1.md b/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR2_Security_Absorb_r1.md new file mode 100644 index 0000000..21aecd9 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR2_Security_Absorb_r1.md @@ -0,0 +1,82 @@ +# REV RDM-cas-overlay-dev2027 PR2 security absorption r1 / セキュリティ吸収レビュー r1 + +> **Summary:** Independent review of PR2 at `82a3a056ce7402f7c5f61a8bcb407c464bc474ce`. Verdict: Changes required / 要修正. +> **概要:** PR2の対象head `82a3a056ce7402f7c5f61a8bcb407c464bc474ce` を独立レビューした。判定: Changes required / 要修正。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Security defaults improve, but HTTP integration and remaining token logging prevent an unconditional absorption verdict. / 安全な既定値への改善はあるが、HTTP統合と残存トークンログのため無条件の吸収可とは判定できない。 +- Applies to / 対象: RCOSDP/RDM-cas-overlay-dev2027 PR2, exact head recorded above; review only. +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) +- Used by / 利用先: [Documentation index / 文書索引](../README.md), coordinator's absorption decision / 調整担当の吸収判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Findings + +[P1, integration regression] cas-server-webapp/src/main/webapp/WEB-INF/web.xml:253 hard-codes Secure for JSESSIONID, while installer/grdm_dev/compose.py:783 configures HTTP CAS. jsession.cookie.secure is not consumed by code; changing cas.properties cannot override the descriptor. On ordinary HTTP origins the session cookie will not be returned, breaking multi-request login/webflow. Browser-specific loopback exceptions are not a deployment contract. Provide a reproducible, explicit local HTTP override or HTTPS end to end, retain secure production defaults, and exercise a complete real-CAS login. README instructions to edit source manually are insufficient for the generated installer/image path. TGC also defaults to Secure. + +[P1, existing integration prerequisite] compose.py:780–791 emits none of the five cas.rateLimiting.* values required without defaults by WEB-INF/spring-configuration/loginRateLimiting.xml:27–44. propertyFileConfigurer.xml:39–41 loads one properties resource; it does not merge shipped etc defaults. If the generated file is selected, unresolved placeholders prevent context creation; the new 50/5 policy is not inherited. Supply failureRangeInSeconds, failureThreshold, usernameParameter, startDelay and repeatInterval together, and test the rendered configuration. This omission predates the PR; it blocks claiming installer compatibility rather than being a new source regression. Also resolve the actual file path: the installer mounts /code/etc/cas.properties, while the dist Dockerfile CMD selects /etc/cas/cas.properties; the dev Maven path selects the former. The current manifest uses a prebuilt image, so source changes alone do not prove deployed behavior. + +[P2, incomplete log hardening] cas-server-support-osf/src/main/java/org/pac4j/oauth/client/OrcidClient.java:254 still passes the complete Scribe accessToken object to DEBUG logging immediately before using its token in the Bearer header (:258). Scribe Token.toString exposes token and secret (upstream 1.3.6 source inspected via gh, matching pac4j 1.7.1 dependencies); OrcidToken in pac4j 1.7.1 does not override toString. Runtime logging was not executed locally. Remove this raw object logging or explicitly mask getToken(), and add an ORCiD log-capture test. This is a pre-existing residual path outside the modified OAuth module, not a newly introduced leak. Other credential-object logs in ClientAction:189 and AbstractClientAuthenticationHandler:97 also need dependency-aware audit. Do not claim all plaintext token paths are eliminated. + +### Correct changes and test validity + +TokenIdMasker hashes the entire identifier and retains only an allow-listed type prefix and 12 hex characters; unknown prefixes and Bearer inputs do not reveal credential substrings. Response-body logging in the modified controllers is redacted. JpaTokenRegistry:62,68 still logs token objects, but these repository token classes do not override toString; that alone is not evidence of a plaintext-token leak. + +TotpUtils:105–115 compares fixed-length ASCII values using MessageDigest.isEqual and non-short-circuit |= across every configured interval. It removes early match exit and keeps leading-zero codes valid. Tests include fixed-time vectors, adjacent windows and invalid ranges. String.format and JVM behavior mean this is not a proof that the entire routine has identical timing; replay prevention remains explicitly out of scope. + +CookieAndRateLimitDefaultsTests checks repository strings and a numeric ratio, not servlet behavior, Spring startup with rendered properties, forwarded-header spoofing or actual throttling. TokenIdMaskerTests tests the helper, not all logging call sites. The 50/5 interval is 10 seconds after a failure, including a following correct password; IP/username scoping and trusted proxy header handling remain prerequisites. + +### Evidence, limits and remaining work + +Compared the exact head against e3620a25dd45173f5c16a6cd68e1b8b6c37e26c6 in a fresh scratch clone. gh pr checks reports no checks for this branch. Maven/JDK were not available for local execution; Java tests and real HTTP login were not run. Findings derive from source and installer configuration, not a claim of observed stack failure. No Docker state was changed and runtime/.env was not read. + +Resolve the three findings with an explicit installer contract, rendered-config startup test, real HTTP/HTTPS login test and log-capture regression. No approval, merge, push or commit was performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 指摘 + +[P1・統合時の回帰] cas-server-webapp/src/main/webapp/WEB-INF/web.xml:253がJSESSIONIDのSecureを固定する一方、installer/grdm_dev/compose.py:783はHTTP CASを設定する。jsession.cookie.secureを読むコードはなく、cas.propertiesでは記述子を上書きできない。通常のHTTP originではセッションCookieが戻らず、複数リクエストにまたがるログイン・webflowが壊れる。ブラウザー依存のloopback例外を運用契約にしてはいけない。再現可能で明示的なローカルHTTP上書き、または全経路HTTPSを用意し、本番の安全な既定値を保ち、実CASのログイン完了まで試験する。READMEの手動ソース編集だけでは生成インストーラー・イメージの経路を満たさない。TGCもSecureが既定になる。 + +[P1・既存の統合前提不足] compose.py:780–791は、WEB-INF/spring-configuration/loginRateLimiting.xml:27–44が既定値なしで要求するcas.rateLimiting.*の5値を一つも出力しない。propertyFileConfigurer.xml:39–41は単一のpropertiesを読み、同梱etcの既定値を併合しない。生成ファイルが選ばれると未解決プレースホルダーでコンテキスト作成が止まり、新しい50/5の方針も継承しない。failureRangeInSeconds、failureThreshold、usernameParameter、startDelay、repeatIntervalをまとめて供給し、生成設定を試験する。この欠落はPR以前から存在し、新規ソース回帰ではなくインストーラー適合の主張を阻害する。実際の読込み先も解決が必要で、installerは/code/etc/cas.propertiesへmountするがdist DockerfileのCMDは/etc/cas/cas.propertiesを選び、dev Mavenは前者を選ぶ。現manifestは事前ビルドイメージを使うためソース変更だけで配備動作は保証できない。 + +[P2・ログ対策の不足] cas-server-support-osf/src/main/java/org/pac4j/oauth/client/OrcidClient.java:254は依然ScribeのaccessTokenオブジェクト全体をDEBUGへ渡し、直後の:258でそのtokenをBearerヘッダーに使う。Scribe Token.toStringはtokenとsecretを露出する(ghでpac4j 1.7.1の依存に一致する上流1.3.6のソースを確認)。pac4j 1.7.1のOrcidTokenはtoStringを上書きしない。ログの実動作はローカル未実行。生オブジェクトのログを削除するかgetToken()を明示的にマスクし、ORCiDのログ捕捉試験を追加する。変更したOAuthモジュール外に残る既存経路で、新規に導入された漏えいではない。ClientAction:189とAbstractClientAuthenticationHandler:97の資格情報オブジェクトのログも依存実装を含めて監査する。「全経路で平文トークンを除去済み」とは言えない。 + +### 正しい変更とテストの妥当性 + +TokenIdMaskerは識別子全体をハッシュ化し、許可した種別接頭辞と16進12文字だけを残す。不明な接頭辞とBearer入力から秘密文字列を残さない。変更したcontrollerの応答本文ログは伏せられる。JpaTokenRegistry:62,68はtokenオブジェクトをログに渡すが、このリポジトリのtokenクラスはtoStringを上書きしないため、それだけで平文漏えいと判断しない。 + +TotpUtils:105–115は固定長ASCIIをMessageDigest.isEqualで比較し、短絡しない|=で全時間区間を処理する。一致時の早期終了をなくし、先頭ゼロのコードも有効に保つ。固定時刻のベクトル、隣接区間、範囲外入力のテストがある。String.formatやJVMの動作があるため処理全体の時間一致の証明ではなく、再利用防止は明示的に範囲外である。 + +CookieAndRateLimitDefaultsTestsが調べるのはリポジトリ内の文字列と比率で、servlet動作、生成propertiesによるSpring起動、転送ヘッダー偽装、実際の試行制限は調べない。TokenIdMaskerTestsも補助関数の試験であり全ログ呼出しの検査ではない。50/5は失敗後10秒の間隔を意味し、その後の正しいパスワードも対象になる。IP・ユーザー名単位の制限と信頼できるプロキシのヘッダー処理が前提となる。 + +### 根拠・制限・残作業 + +新しいscratch cloneで対象headをe3620a25dd45173f5c16a6cd68e1b8b6c37e26c6と比較した。gh pr checksはこのブランチにチェックなしと返した。ローカルにMaven/JDKがなく、Javaテストと実HTTPログインは未実行。指摘はソースとインストーラー設定に基づき、実スタックの障害を観測したという主張ではない。Docker状態を変更せずruntime/.envも読んでいない。 + +3指摘を明示的なインストーラー契約、生成設定での起動試験、実HTTP/HTTPSログイン試験、ログ捕捉の回帰試験で解消する。承認、マージ、push、commitは行っていない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| PR / head | Proposed change / exact version reviewed. | 変更案/調べた正確な版。 | +| P1 / P2 / P3 | High / medium / low review priority. | 高/中/低の修正優先度。 | +| Secret / token | A private value used to prove identity or sign data. | 本人確認や署名に使う秘密の値。 | +| Regression | A change that breaks previously working behavior. | 以前動いた機能が変更で壊れること。 | +| CI / mock | Automated checks / a substitute used in a test. | 自動検査/試験用の代役。 | +| Secure cookie | A browser value restricted to secure transport. | 安全な通信経路に送信を限定するブラウザーの値。 | diff --git a/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR2_Security_Absorb_r2.md b/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR2_Security_Absorb_r2.md new file mode 100644 index 0000000..08c2310 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR2_Security_Absorb_r2.md @@ -0,0 +1,65 @@ +# REV RDM-cas-overlay-dev2027 PR2 security absorption r2 / セキュリティ吸収レビュー r2 + +> **Summary:** Changes requested: the three r1 fixes are sound at source level, but another local OAuth path logs usable tokens and authorization codes. The unexplained real-CAS 503 is a tracked deployment prerequisite, not independently a source-absorption blocker. +> **概要:** 要修正。r1の3修正はソース上妥当だが、別のローカルOAuth経路が利用可能なトークンと認可コードをログに残す。原因不明の実CAS 503は配備前に追跡すべき課題で、それだけでソース吸収を止めるものではない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Masking token objects does not cover secrets embedded in redirect URLs; source absorption and deployment acceptance need separate verdicts. / トークンオブジェクトのマスクだけではリダイレクトURL内の秘密を保護できず、ソース吸収と配備受入れの判定を分ける必要がある。 +- Applies to / 対象: RCOSDP/RDM-cas-overlay-dev2027 PR2, head `cb89a187dcf14a02d05eca63286e7e95b2c1ae72`, base `e3620a25dd45173f5c16a6cd68e1b8b6c37e26c6`. +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [r1](2026-11-10_RDM-cas-overlay-dev2027_PR2_Security_Absorb_r1.md) +- Used by / 利用先: [Documentation index / 文書索引](../README.md), coordinator's absorption decision / 調整担当の吸収判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and remaining finding + +**Changes requested. [P2] Remove raw OAuth callback URL logging.** In `cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeCallbackActionController.java:149–155`, the token response appends `accessToken.getId()` to the URL fragment and logs the entire URL. Lines 163–167 likewise log the authorization code in the query. `OAuth20WrapperController.java:144` routes to this controller. DEBUG logging therefore still exposes usable bearer tokens and authorization codes despite masking their creation in `CentralOAuthServiceImpl`. This is a pre-existing local application path, not a new regression or an unmodified dependency. It falls within the requested other-token-path audit and the token-log hardening scope. Root WARN suppresses it by default, but enabling DEBUG reintroduces the leak. Remove these URL log statements or log non-secret metadata, and add log-capture regression tests for both response types while preserving redirect behavior. Do not hash an entire URL as a substitute for reviewing which fields may be logged. + +### r1 fixes verified + +JSESSIONID: `SessionCookieSecurityListener.java:56–79` sets Secure unless the trimmed, case-insensitive value is exactly false. Missing keys, unrecognized values and caught file-read failures keep Secure enabled. `web.xml:90–94` registers the listener before Spring initialization and retains both Secure and HttpOnly in the cookie descriptor. The resource selector matches the `cas.properties.filepath` selector and default in `propertyFileConfigurer.xml`. Seven mock-context tests cover false, case/whitespace, true, absent key, invalid value, unreadable file and missing default resource. This resolves the hard-coded-cookie finding at source level; mock tests do not prove actual response headers or login continuity. Both TGC and JSESSIONID require explicit false for local HTTP. + +Rate limiting: `loginRateLimiting.xml:27–29,43–44` supplies all five defaults: range 50 seconds, threshold 5, username parameter username, start delay 1000 ms and repeat interval 5000 ms. Omitted keys no longer create unresolved placeholders for these five properties. The failure interval remains 10 seconds, not five permitted attempts per 50 seconds. The new test checks source strings and the ratio; it is not a Spring startup or behavioral throttling test. Explicit weaker configuration still overrides defaults. The generated installer configuration remains insufficient for real CAS, as the PR body now discloses. + +ORCiD: `OrcidClient.java:256–260` logs only `TokenIdMasker.mask(accessToken.getToken())`, never the Scribe object or secret. Its new capture test invokes the real method with a mocked network request, checks that token and secret are absent, requires the masked line, and verifies the unchanged Bearer header. Removing the credentials object log in `AbstractClientAuthenticationHandler` and replacing it with a client name in `ClientAction` closes the two r1 credential sites. Other modified OAuth token/code/ticket call sites use the masker and response-body redaction. Registry token-object logging alone is not evidence of leakage because the local token classes do not override toString. Remaining client/profile objects, ORCiD response bodies, exception text and dependency logs are not certified secret-free; the callback finding is directly demonstrated by local data flow without depending on their behavior. + +### 503, integration follow-up and evidence limits + +The author reports that complete properties removed unresolved placeholders but real CAS still returned 503 during context initialization; the cause is unknown. Real HTTP/HTTPS login and Set-Cookie checks were not run. Do not classify the 503 as harmless or attribute it to this PR without evidence. It does **not independently block source absorption**: the installer routes authentication to fakecas and the manifest pins a prebuilt CAS image, so this source merge neither switches the login provider nor deploys the fixes. This is also why current stack health cannot validate these fixes. + +Track a real-CAS deployment follow-up before removing the prebuilt image or switching authentication: capture and resolve the first startup exception, compare base/head under the same complete configuration if needed, verify actual property mounts for dev and dist, then exercise complete HTTP development and HTTPS secure-default login, JSESSIONID/TGC Set-Cookie attributes and session continuity, and real throttling. Record image provenance and prove that the reviewed code is deployed. The PR body and this record track the gap; no separate issue was created under the one-comment authorization. The P2 callback leak, rather than the 503 alone, determines this review's changes-requested verdict. The owner's informed decision to absorb the proposal-only source PRs is accepted and is not a finding. + +Reviewed a fresh scratch clone at the exact head, compared r1 and base, inspected listener wiring, tests, log data flows, installer routing and manifest. `git diff --check` passed; `gh pr checks` reports no checks. Local Maven is absent and Java reports no installed runtime, so no Java tests or CAS runtime checks were executed independently. The PR author reports OAuth 106 and OSF 32 passing tests and a successful WAR build; those are author evidence, not this reviewer's execution. No Docker operations, runtime/.env access, approval, merge, close, push or commit occurred. Only this uncommitted record and one PR review comment are produced. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と残存指摘 + +**要修正(changes requested)。[P2] OAuthのコールバックURLの生ログを除去する。** `cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeCallbackActionController.java:149–155`はtoken応答のURLフラグメントに`accessToken.getId()`を追加し、URL全体をログに出す。163–167行もクエリ内の認可コードをログに出す。`OAuth20WrapperController.java:144`からこのcontrollerへ到達する。`CentralOAuthServiceImpl`で生成時のログをマスクしても、DEBUGでは利用可能なBearerトークンと認可コードが残る。新規回帰でも未変更の依存ライブラリでもなく、既存のローカル実装経路である。依頼された他トークン経路の監査とログ保護の範囲に該当する。既定のRoot WARNでは出ないが、DEBUGを有効にすると漏れる。URLのログを削除するか秘密を含まない情報だけにし、両応答形式のログ捕捉回帰試験とリダイレクト維持を確認する。URL全体のハッシュ化だけで、ログ項目の精査を代替しない。 + +### r1修正の確認 + +JSESSIONID: `SessionCookieSecurityListener.java:56–79`は空白を除いた大文字小文字を問わないfalseだけでSecureを外す。キー欠落、不明な値、捕捉されたファイル読取り失敗ではSecureを維持する。`web.xml:90–94`はSpring初期化前にlistenerを登録し、CookieのSecureとHttpOnlyも維持する。読込み先と既定値は`propertyFileConfigurer.xml`の`cas.properties.filepath`に一致する。7件のmock試験はfalse、大文字・空白、true、キー欠落、不正値、読めないファイル、既定resource欠落を扱う。固定設定の指摘はソース上解消したが、mockでは実応答ヘッダーやログイン継続を証明できない。開発用HTTPにはTGCとJSESSIONID双方で明示的なfalseが必要である。 + +試行制限: `loginRateLimiting.xml:27–29,43–44`に5値すべての既定値がある。範囲50秒、閾値5、ユーザー名パラメーターusername、開始遅延1000ms、反復間隔5000msである。省略時、この5キーが未解決placeholderにはならない。失敗後の間隔は10秒であり、50秒に5回を許可する意味ではない。新試験はソース文字列と比率を調べ、Spring起動や実際の制限動作は調べない。明示した弱い設定は引き続き既定値を上書きできる。生成インストーラー設定だけでは実CASを起動できない点はPR本文で開示されている。 + +ORCiD: `OrcidClient.java:256–260`は`TokenIdMasker.mask(accessToken.getToken())`だけをログに渡し、Scribeオブジェクトやsecretを渡さない。追加試験は通信をmockにした実メソッドを呼び、tokenとsecretがログにないこと、マスク行の存在、Bearerヘッダーの維持を確認する。`AbstractClientAuthenticationHandler`の資格情報ログ削除と`ClientAction`のクライアント名への置換でr1の2経路も解消した。他の変更済みOAuthトークン・コード・チケットのログはマスクされ、応答本文は伏せられている。registryのtokenオブジェクトはローカルクラスがtoStringを上書きしていないため、それだけで漏えいとはしない。残るclient/profileオブジェクト、ORCiD応答本文、例外文字列、依存内部ログまで秘密がないと認定してはいない。今回のコールバック指摘は、それらに依存せずローカルの値の流れだけで確認できる。 + +### 503、統合の追跡事項、根拠の制限 + +著者報告では、必要propertiesを揃えると未解決placeholderはなくなったが、コンテキスト初期化で実CASが503になり、原因は不明である。実HTTP/HTTPSログインとSet-Cookieは未確認である。証拠なく無害ともPR起因とも判断しない。ただし**503だけではソース吸収の阻害要因としない**。インストーラーは認証をfakecasへ向け、manifestは事前ビルドCASイメージを固定しているため、このソースのマージだけでは認証先も稼働コードも切り替わらない。同じ理由で、現在のスタックの正常動作も今回の修正の検証にはならない。 + +事前ビルドイメージ廃止または認証先切替前の追跡事項として、最初の起動例外の採取と解決、必要なら同一完全設定によるbase/head比較、dev/distの実mountと読込み先確認、開発HTTPと安全な既定値のHTTPSでのログイン完了、JSESSIONID/TGCのSet-Cookie属性とセッション継続、実際の試行制限を実施する。使用イメージの由来とレビュー済みコードの配備も確認する。PR本文とこの記録に未完了事項を残し、コメント1件という許可範囲のため別Issueは作成していない。今回の要修正判定の理由は503単独ではなくP2のコールバック漏えいである。所有者が提案・マージ不可という題名を承知して吸収を決定した点は受け入れ、指摘にしない。 + +専用scratch cloneの正確なheadでr1/baseとの差分、listener登録、試験、ログの値の流れ、インストーラーの認証経路とmanifestを確認した。`git diff --check`は成功し、`gh pr checks`はチェックなしだった。ローカルMavenはなく、Javaもruntime未導入と返したため、Java試験とCAS実動作は独立実行していない。OAuth 106件・OSF 32件成功とWARビルド成功は著者報告であり、レビュワの実行結果ではない。Docker操作、runtime/.env参照、approve、merge、close、push、commitは行っていない。未コミットのこの記録とPRコメント1件のみを作成する。 diff --git a/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR2_Security_Absorb_r3.md b/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR2_Security_Absorb_r3.md new file mode 100644 index 0000000..25921ee --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR2_Security_Absorb_r3.md @@ -0,0 +1,65 @@ +# CAS PR2 Security absorption review r3 / CASセキュリティ吸収レビュー r3 + +> **Summary:** Pass for source absorption: callback and profile ticket logs are masked; real-CAS deployment remains a tracked prerequisite. +> **概要:** ソース吸収は合格。コールバックとprofileのticketログ対策を確認し、実CAS配備は追跡する前提条件として残す。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Removing generated callback URLs from logs closes the demonstrated leak without changing redirects. / 生成したコールバックURLをログから除くと、転送を変えずに実証済み漏えいを解消できる。 +- Applies to: RDM-cas-overlay-dev2027 PR #2, head `0b89ae8a898112230ce7c81b1665f0e4c7d997bd`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [r2](2026-11-10_RDM-cas-overlay-dev2027_PR2_Security_Absorb_r2.md). +- Used by: the coordinator's source-absorption decision and follow-up verification. / 調整担当のソース吸収判断と後続検証。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and closure + +**Pass for source absorption.** Reviewed the fresh scratch clone, r2, the final commit and the OAuth/OSF module log call sites, including multiline arguments. No remaining directly demonstrated raw OAuth token/code/ticket logging was found in the audited local paths. This verdict does not certify all dependencies or deployment behavior. + +`OAuth20AuthorizeCallbackActionController.java:153–171` now logs `redirectUri`, not the callback URL containing the generated access token fragment or authorization-code query. Both redirect return values still use the unchanged callback URL. Line 114 masks `loginTicketId`. `OAuth20ProfileController.java:162–166` masks both the service ticket and access token in its ERROR branch; earlier inbound Bearer/token logs also use `TokenIdMasker`. The masker retains only known type prefixes and a truncated SHA-256 fingerprint, with no clear-ID fallback. The r2 callback finding is closed. + +The three new `OAuth20TokenLoggingTests` execute token/code callbacks and profile validation failure with captured DEBUG/ERROR output, reject four secret sentinel IDs, and require useful log output. Callback tests also assert that redirects still contain their required token/code. These are meaningful regressions, not just source-string assertions. Their test setup uses mocks and does not prove a live login. + +The other local OAuth grant, refresh, revoke, metadata and callback identifier logs use masking; sensitive response-body logs are redacted. The r1 ORCiD request-token masking and removal of direct credential-object logging remain intact. `JpaTokenRegistry` logs token objects, but the local token classes have no `toString` override exposing their IDs, so this alone is not a demonstrated token leak. Remaining `userProfile`, SAML attribute/credential objects, state, registered redirect URI, ORCiD response bodies and exception/dependency logs are not certified secret-free. No new concrete usable-token path was established there; broader logging/privacy hardening remains outside this closure. + +### Evidence and deployment prerequisite + +`git diff --check` passed. Maven is absent and `java -version` exits 1 with no installed runtime, so this reviewer did not independently execute Java tests or a WAR build. The PR body reports OAuth 109 and OSF 32 tests passing and mutation checks that fail when these log protections are reverted; those remain author evidence. The independent evidence is source/data-flow review and test inspection. + +Real CAS still returning 503 is a **tracked prerequisite before deploying this source or switching authentication**, not an additional source-absorption blocker. Resolve the first startup exception, verify complete configuration and dev/dist mounts, prove image provenance, and exercise real HTTP/HTTPS login, JSESSIONID/TGC Secure/HttpOnly behavior, session continuity and throttling. The prebuilt image/fakecas arrangement cannot prove these source changes are running. The PR body and r2/r3 records track this gap; no separate issue was created under the one-comment authorization. + +No Docker command, grdm-dev stack change, runtime credential-file read, commit, push, approval, merge or closure occurred. The record remains uncommitted; one Japanese PR comment carries this verdict. + +GitHub reports no checks (gh pr checks exit 1); this is absence of CI evidence, not a failed test. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と解決状況 + +**ソース吸収は合格(pass)。** 専用scratch clone、r2、最終コミット、OAuth/OSF両モジュールの複数行を含むログ引数を確認した。監査したローカル経路では、OAuth token/code/ticketの生ログが残ると直接実証できる箇所は見つからなかった。依存ライブラリ全体や配備動作を認定する判定ではない。 + +`OAuth20AuthorizeCallbackActionController.java:153–171` は、生成したaccess tokenのfragmentや認可codeのqueryを含むcallback URLではなく `redirectUri` を記録する。戻り値の転送先は従来のcallback URLのまま。114行の `loginTicketId` もマスクする。`OAuth20ProfileController.java:162–166` はERROR分岐のservice ticketとaccess token双方をマスクし、入口のBearer/tokenログも `TokenIdMasker` を使う。マスクは既知の型接頭辞と短縮SHA-256指紋だけを残し、生IDへのfallbackはない。r2のコールバック指摘は解決した。 + +新規 `OAuth20TokenLoggingTests` 3件はtoken/code callbackとprofile検証失敗を実行し、DEBUG/ERRORを捕捉して4種の秘密IDがないことと有用なログの存在を検査する。callback試験は転送先に必要なtoken/codeが残ることも確認する。単なるソース文字列検査ではない有効な回帰試験である。ただしmockによる試験であり実ログインの証明ではない。 + +他のローカルOAuth発行・更新・失効・metadata・callbackのIDログはマスクし、秘密を含む応答本文ログは伏せている。r1のORCiD要求tokenのマスクと直接の資格情報オブジェクトログの除去も維持している。`JpaTokenRegistry` はtokenオブジェクトを記録するが、ローカルtokenクラスにIDを露出する `toString` 上書きはなく、それだけで漏えいとはしない。残る `userProfile`、SAML属性/資格情報オブジェクト、state、登録redirect URI、ORCiD応答本文、例外/依存内部のログが秘密を含まないとは認定しない。そこから新たな利用可能tokenの具体的経路は実証しておらず、広範なログ/プライバシー強化は今回の解決確認の範囲外である。 + +### 根拠と配備前提条件 + +`git diff --check` は成功。Mavenはなく、`java -version` はruntime未導入で1終了したため、レビュワはJava試験とWARビルドを独立実行していない。PR本文はOAuth109件・OSF32件合格と、保護を戻すと失敗するmutation検査を報告しているが、これらは著者の証跡である。独立した根拠はソースと値の流れのレビュー、試験内容の確認である。 + +実CASの503は、**今回のソース配備または認証切替の前に追跡する前提条件**であり、追加のソース吸収阻害要因にはしない。最初の起動例外を解消し、完全な設定とdev/distのmount、イメージ由来を確認し、実HTTP/HTTPSログイン、JSESSIONID/TGCのSecure/HttpOnly、セッション継続、試行制限を検証すること。prebuiltイメージ/fakecas構成の正常動作は今回のソースが稼働している証拠にはならない。PR本文とr2/r3で追跡し、コメント1件という許可範囲のため別Issueは作っていない。 + +Dockerコマンド、grdm-devスタック変更、runtime資格情報ファイル参照、commit、push、approve、merge、closeは行っていない。記録は未コミットのまま残し、日本語PRコメント1件で判定を伝える。 + +GitHubはチェックなし(gh pr checks終了1)と報告した。試験失敗ではなくCI証跡がないという意味である。 diff --git a/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR3_Real_Startup_r1.md b/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR3_Real_Startup_r1.md new file mode 100644 index 0000000..d3c535c --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR3_Real_Startup_r1.md @@ -0,0 +1,69 @@ +# REV PR3 Real startup review r1 / 実起動レビュー r1 + +> **Summary:** Changes requested: the deterministic logging fix and native build layout are sound, but the distribution image still includes reusable TGC keys. +> **概要:** changes requested。ロギング修正とネイティブビルド構成は妥当ですが、配布イメージに再利用可能な TGC 鍵が残ります。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** runtime secret injection does not remove fixed keys copied into image layers. / 実行時に秘密を注入しても、イメージ層へコピーした固定鍵は消えません。 +- Applies to: RCOSDP/RDM-cas-overlay-dev2027 PR #3, head `c488b319db226bf1f818fa687a23911c31242adb`. +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md). +- Used by: PR #3 revision and coordinator integration decision. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and required change + +**Changes requested — R1-01 (P2): remove usable fixed TGC keys from the shipped configuration.** `Dockerfile:35` copies `etc/cas.properties` into `dist-config`; lines 41–45 only rewrite paths, and line 51 copies that file into the final image. The source file contains nonempty 43-character encryption and 86-character signing keys. They are inherited examples, not evidence of leaked deployment credentials, but they remain usable shared cryptographic defaults. The comment requiring per-deployment generation and a runtime bind mount do not remove them from image layers. A deployment that omits its key injection can retain known keys once its other configuration is supplied. + +Remove these usable defaults from the image input, require deployment-specific keys, and verify that missing keys fail closed without logging generated or supplied key material. Verify that the resulting image contains neither fixed keys nor deployment credentials and that an environment-only key configuration still starts. This finding concerns the changed distribution recipe carrying forward unsafe defaults; it does not claim the documented probe used those defaults. + +### Checks and evidence + +The listener choice is deterministic: `Log4jContextInitializer.java:49` directly constructs `Log4jServletContextListener`; no set iteration or reflection selects a listener. The overlay XML points its `log4jInitialization` bean to that class. Maven unpacks the support module into application classes and the local web resources supply the overlay. Four added tests cover lifecycle creation, the wrong listener's failure, repeat initialization, and unreadable resource handling. XML parsing passed for both new production XML files and the test logging configuration; unit tests and WAR packaging were not rerun in this review. + +Both Maven and Jetty bases have explicit SHA-256 digest pins. Both executable build stages use `$BUILDPLATFORM`; the final target inherits the requested architecture and only copies artifacts. The same Jetty digest is used for configuration and runtime. This supports native build execution and preserves Java 8; it is not a claim of byte-reproducible Maven dependencies. Registry index contents and the reported unpublished output digest were not independently fetched or rebuilt under the read-only review scope. + +The final stage sets `USER 1000:1000`, clears the inherited entrypoint, and sets the Java temporary directory to `/tmp`. The logging configuration uses console output. Read-only root and tmpfs are runtime options, not enforcement by the Dockerfile. PR evidence reports successful hardened startup; this review did not operate Docker. `throwUnavailableOnStartupException=true` is present; actual process exit is author-reported evidence. + +The new logger emits the listener class name, not keys or passwords. No new secret build argument or environment assignment was introduced. This source inspection does not certify every upstream logging path or actual image layer. The fixed keys identified in R1-01 prevent an unconditional “no secrets baked in” conclusion. + +The PR body documents `DATABASE_PASSWORD`, `OSF_DATABASE_PASSWORD`, `TGC_ENCRYPTION_KEY` (43 base64url characters / 32 bytes), and `TGC_SIGNING_KEY` (86 characters / 64 bytes), and explains that `CAS_TGC_*` does not map to the configured properties. It documents the read-only configuration mount, `/tmp`, migration completion ordering, and service allow-list changes. These are PR-level instructions; they have not been applied to the installer. + +### Stated limits + +Real GRDM schema validation, OAuth table matching, TOTP, ORCiD, institution login, the dev stage, and webapp module unit tests remain unverified. The minimal probe schema and author-reported successful login do not establish integration readiness. The first amd64 emulated startup exceeded 244 seconds and was stopped; a second reached HTTP 200 in 116 seconds. The cause remains unknown and must inform later timeout testing; it is not evidence that native Maven builds failed. These are accepted scope limits, not additional blockers for this startup change. The dev stage is not covered by the distribution stage's non-root guarantee. No Docker state, runtime/.env, commits, pushes, merges, or approvals were touched. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と必要な修正 + +**Changes requested — R1-01(P2):配布設定から使用可能な固定 TGC 鍵を除去してください。** `Dockerfile:35` は `etc/cas.properties` を `dist-config` にコピーし、41〜45 行はパスだけを変更し、51 行で最終イメージへコピーします。元ファイルには 43 文字の暗号鍵と 86 文字の署名鍵が設定されています。既存のサンプル値であり、実環境の秘密漏えいを示すものではありませんが、共通の使用可能な暗号鍵として残ります。環境ごとに生成するよう求める注記や実行時マウントでは、イメージ層から鍵は消えません。他の設定を用意しても鍵の注入を忘れると、既知の鍵が残り得ます。 + +イメージ入力から使用可能な既定鍵を除き、環境固有の鍵を必須にしてください。鍵がない場合は安全に起動を拒否し、生成鍵や指定鍵をログへ出さないことを確認してください。完成イメージに固定鍵・実環境の秘密がなく、環境変数だけで鍵を指定した構成が起動することも確認してください。変更された配布レシピが危険な既定値を引き継ぐ点の指摘であり、報告された起動試験がその鍵を使ったという指摘ではありません。 + +### 確認事項と根拠 + +リスナー選択は決定的です。`Log4jContextInitializer.java:49` は `Log4jServletContextListener` を直接生成し、集合の順序やリフレクションで選びません。上書き XML の `log4jInitialization` bean は新クラスを参照します。Maven はサポートモジュールをアプリケーションクラスへ展開し、ローカルの Web リソースが上書き設定を供給します。追加試験 4 件はライフサイクル生成、誤ったリスナーの失敗、再初期化、読めないリソースを扱います。新規の本番 XML 2 件と試験用ログ設定の XML 構文解析は成功しました。単体試験と WAR 作成は再実行していません。 + +Maven と Jetty のベースは SHA-256 ダイジェストで固定されています。処理を実行する両ビルドステージは `$BUILDPLATFORM` を使い、最終ステージは要求されたアーキテクチャを継承して成果物だけをコピーします。設定作成と実行には同じ Jetty ダイジェストを使います。ネイティブビルドと Java 8 維持に整合しますが、Maven 依存物までバイト単位で再現可能との保証ではありません。読み取り中心のレビュー範囲では、レジストリ索引の内容や未公開の出力ダイジェストを独立に取得・再ビルドしていません。 + +最終ステージは `USER 1000:1000` を設定し、継承した entrypoint を解除し、Java 一時領域を `/tmp` に設定します。ログ設定は標準出力を使います。読み取り専用ルートと tmpfs は実行時の指定であり、Dockerfile による強制ではありません。PR は堅牢化条件での起動成功を報告していますが、レビュワは Docker を操作していません。`throwUnavailableOnStartupException=true` は存在し、実際のプロセス終了は作者の報告による証拠です。 + +新しいロガーが出力するのはリスナークラス名で、鍵やパスワードではありません。秘密のビルド引数や環境変数代入も追加していません。このソース確認は上流の全ログ経路や実イメージ層の安全性を保証しません。R1-01 の固定鍵により「秘密の焼き込みなし」とは無条件に判定できません。 + +PR 本文には `DATABASE_PASSWORD`、`OSF_DATABASE_PASSWORD`、`TGC_ENCRYPTION_KEY`(base64url 43 文字/32 バイト)、`TGC_SIGNING_KEY`(86 文字/64 バイト)が記載され、`CAS_TGC_*` が設定キーに対応しない点も明示されています。設定の読み取り専用マウント、`/tmp`、マイグレーション完了の起動順、サービス許可定義も記載されています。PR 上の手順であり、インストーラにはまだ反映されていません。 + +### 明示された制限 + +実 GRDM スキーマの validate、OAuth テーブル照合、TOTP、ORCiD、機関ログイン、dev ステージ、webapp モジュール単体試験は未検証です。最小試験スキーマと作者報告のログイン成功は、統合準備完了を意味しません。amd64 エミュレーションの初回起動は 244 秒を超えて打ち切られ、2 回目は 116 秒で HTTP 200 になりました。原因未特定として後続のタイムアウト試験に引き継ぐ事項であり、ネイティブ Maven ビルドの失敗を示すものではありません。これらは今回の範囲制限として扱い、追加の修正必須事項にはしません。dev ステージに配布ステージの非 root 保証は適用されません。Docker 状態、runtime/.env、コミット、push、merge、approve は操作していません。 diff --git a/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR3_Real_Startup_r2.md b/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR3_Real_Startup_r2.md new file mode 100644 index 0000000..6b6868e --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR3_Real_Startup_r2.md @@ -0,0 +1,73 @@ +# REV PR3 Real startup review r2 / 実起動レビュー r2 + +> **Summary:** Changes requested: R1-01 is addressed for TGC, but usable fixed institution-login JWE/JWT secrets remain in the distribution image. +> **概要:** changes requested。TGC の R1-01 は対応済みですが、機関ログイン用の使用可能な固定 JWE/JWT 秘密が配布イメージに残ります。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** removing cookie keys does not remove other usable shared authentication secrets from the same image. / Cookie 鍵の除去だけでは、同じイメージの別の使用可能な共通認証秘密は除去できません。 +- Applies to: RCOSDP/RDM-cas-overlay-dev2027 PR #3; delta `c488b319db226bf1f818fa687a23911c31242adb..96de2b60f6d2a3568cb47fe37a325b631f286d36`. +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [r1](2026-11-10_RDM-cas-overlay-dev2027_PR3_Real_Startup_r1.md). +- Used by: PR #3 revision and [review integration](README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and blocker + +**Changes requested — R2-01 (P2): remove usable default institution-login JWE/JWT secrets.** `etc/cas.properties:105–106` still supplies fixed values, each exactly 32 ASCII bytes. `Dockerfile:35,51` copies them into the final image without removal. `cas-server-webapp/src/main/webapp/WEB-INF/cas-servlet.xml:359–360` injects them into the institution-login action. In `OpenScienceFrameworkPrincipalFromRequestRemoteUserNonInteractiveCredentialsAction.java:718–726`, they are passed directly as bytes to HS256 `MACSigner` and direct A256GCM `DirectEncrypter`. The setters at lines 854–859 only assign values. These are usable cryptographic defaults, not inert placeholders. Supplying the other deployment settings while omitting these overrides leaves known keys in use. Whether a particular OSF receiver accepts the resulting token depends on its matching configuration; this review does not claim a demonstrated deployed authentication bypass. + +This is the same class as R1-01 and remains within review of the new distribution recipe and its remediation. Remove these values from shipped configuration, require deployment-specific secrets for the enabled institution-login path, and fail closed when absent or empty. An explicitly disabled path may instead refuse all institution authentication without a fallback. Verify missing-secret behavior, runtime-only injection, absence from image layers, and no secret logging. Add regression coverage for these defaults as well as TGC. + +### R1-01 verification and remaining-item decisions + +**R1-01: addressed for TGC.** The new commit removes both assignments and adds `shippedConfigurationCarriesNoTicketGrantingCookieKeys`, which asserts their absence from the parsed source properties. An independent tracked-file scan found neither old TGC literal at the reviewed head. `ticketGrantingTicketCookieGenerator.xml:47–48` retains mandatory placeholders without fallback. This supports refusal when keys are absent. The test checks source configuration, not startup, layers, or key quality. + +The author reports arm64 exit 254 for both keys missing, signing key missing, and both empty; successful environment-only login and ticket validation; no supplied keys in logs; and no old TGC literals in either architecture's layers, including nested archives. These runtime and artifact results were not independently reproduced. The source change and reported evidence resolve the TGC-specific finding, not a broader claim that the image carries no usable fixed secrets. + +| Remaining item | Blocks this revision? | Reason | +|---|---|---| +| Short supplied TGC keys accepted | No; follow-up hardening | Requires explicit operator-supplied weak values, unlike omission selecting a known shared default. The documented 43/86-character requirement remains; add decoded-length/format validation and tests before broader deployment. Startup with `abc` does not demonstrate successful login. | +| Old TGC keys in Git history | No | They must be treated as compromised examples and never reused; rotate any deployment that used them. `.dockerignore` excludes `.git`, and the head no longer contains the literals. History rewriting is not required to fix this image. | +| Default JWE/JWT values in image | **Yes: R2-01** | Both are usable 32-byte keys consumed by the active crypto code, with no explicit override required. | +| ORCiD example values in image | No on available evidence | `etc/cas.properties:87–88` contains descriptive client-ID/secret placeholders, passed to the external provider by `authenticationDelegation.xml:29–30`. No evidence shows these are registered, working credentials; they are not locally accepted symmetric authentication keys. Remove or require explicit configuration when enabling ORCiD, and never describe these placeholders as verified credentials. | +| No post-change amd64 startup | No | This delta only removes configuration values and adds a source test; it changes no architecture-specific runtime code. Both-architecture builds/layer checks and arm64 startup are author-reported. Post-change amd64 startup remains unverified; r1's emulation timeout uncertainty remains. | + +### Scope and evidence limits + +Reviewed one new commit, the PR body, and relevant consumers in an isolated scratch clone at the exact head. No Java unit tests, Maven build, Docker operation, image inspection, or live startup was independently run. No grdm-dev state or runtime/.env was touched. No commit, push, merge, approval, or close was performed; the only GitHub write is one review comment. The r1 limits on real GRDM schema, TOTP, ORCiD, institution-login integration, and dev stage remain. This record is uncommitted. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と修正必須事項 + +**Changes requested — R2-01(P2):使用可能な機関ログイン用 JWE/JWT 既定秘密を除去してください。** `etc/cas.properties:105–106` には、それぞれ正確に ASCII 32 バイトの固定値が残ります。`Dockerfile:35,51` は除去せず最終イメージへコピーします。`cas-server-webapp/src/main/webapp/WEB-INF/cas-servlet.xml:359–360` が機関ログイン処理へ注入します。`OpenScienceFrameworkPrincipalFromRequestRemoteUserNonInteractiveCredentialsAction.java:718–726` は、そのバイト列を HS256 の `MACSigner` と direct A256GCM の `DirectEncrypter` に直接渡します。854〜859 行の setter は代入だけです。これは無効な仮文字列ではなく、使用可能な暗号鍵の既定値です。他の配備設定を与えてこの上書きを省略すると、既知の鍵を使用します。OSF 側がトークンを受理するかは相手の設定との一致に依存し、実環境での認証迂回を実証したという主張ではありません。 + +R1-01 と同じ問題であり、新しい配布レシピとその修正のレビュー範囲内です。配布設定から値を除去し、有効な機関ログイン経路には環境固有の秘密を必須とし、未設定・空文字で安全に拒否してください。明示的に無効化した経路なら、代替鍵を使わず機関認証をすべて拒否する方式でも構いません。未設定時の挙動、実行時のみの注入、イメージ層からの除去、秘密のログ非出力を確認し、TGC に加えてこれらの既定値にも回帰試験を追加してください。 + +### R1-01 の確認と残存事項の判定 + +**R1-01:TGC について対応済み。** 新コミットは両代入を除去し、読み込んだソース設定にキーが存在しないことを検査する `shippedConfigurationCarriesNoTicketGrantingCookieKeys` を追加しています。独立した追跡ファイル検索では、対象 head に旧 TGC 鍵の文字列はありませんでした。`ticketGrantingTicketCookieGenerator.xml:47–48` は代替値なしの必須参照を維持しており、鍵がない場合の起動拒否と整合します。追加試験が確認するのはソース設定であり、実起動・イメージ層・鍵の品質ではありません。 + +作者は arm64 で両鍵未設定・署名鍵未設定・両鍵空文字が exit 254、環境変数のみでログインとチケット検証が成功、指定鍵のログ出力なし、両アーキテクチャの全層と内部アーカイブに旧 TGC 鍵なしと報告しています。実行時および成果物の結果は独立に再現していません。ソース変更と報告された証拠により TGC 固有の指摘は解決しますが、「イメージに使用可能な固定秘密がない」という広い主張は成立しません。 + +| 残存事項 | 今回の修正を阻害するか | 理由 | +|---|---|---| +| 短い指定 TGC 鍵を受理 | しない。後続の強化事項 | 明示的に弱い値を指定した場合であり、省略による既知の共通鍵の選択とは異なります。43/86 文字の要件を維持し、広い配備の前にデコード後の長さ・形式検証と試験を追加すべきです。`abc` での起動成功はログイン成功を示しません。 | +| Git 履歴の旧 TGC 鍵 | しない | 公開済みの例として再利用禁止とし、使用した環境では交換が必要です。`.dockerignore` は `.git` を除外し、head に旧文字列はありません。イメージ修正のための履歴書換えは不要です。 | +| イメージ内の JWE/JWT 既定値 | **する:R2-01** | 使用可能な 32 バイト鍵を暗号処理が使い、明示的な上書きは必須ではありません。 | +| ORCiD 例示値 | 現在の証拠ではしない | `etc/cas.properties:87–88` は説明的な client-ID/secret の仮値で、`authenticationDelegation.xml:29–30` から外部プロバイダに渡されます。登録済みで動作する資格情報という証拠はなく、ローカルに受理する対称認証鍵とは異なります。ORCiD 有効化時には除去または明示設定必須とし、有効性確認済みの資格情報と扱わないでください。 | +| 変更後の amd64 未起動 | しない | 差分は設定値除去とソース試験だけで、アーキテクチャ固有の実行コードを変更しません。両アーキのビルド・層検査と arm64 起動は作者報告です。変更後の amd64 起動は未確認で、r1 のエミュレーション起動遅延の不確実性も残ります。 | + +### 範囲と証拠の制限 + +専用 scratch clone の正確な head で、新規 1 コミット、PR 本文、関連する利用箇所を確認しました。Java 単体試験、Maven ビルド、Docker 操作、イメージ検査、実起動は独立に実行していません。grdm-dev の状態と runtime/.env は操作していません。commit、push、merge、approve、close は行わず、GitHub への書き込みはレビューコメント 1 件だけです。実 GRDM スキーマ、TOTP、ORCiD、機関ログイン統合、dev ステージについて r1 の制限が残ります。この記録は未コミットです。 diff --git a/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR3_Real_Startup_r3.md b/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR3_Real_Startup_r3.md new file mode 100644 index 0000000..ec41784 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-cas-overlay-dev2027_PR3_Real_Startup_r3.md @@ -0,0 +1,77 @@ +# REV PR3 Real startup review r3 / 実起動レビュー r3 + +> **Summary:** Pass for the R2-01 remediation at b02e0b90f0. Shipped institution-login defaults are removed and mandatory runtime keys are validated without including their values in new errors. +> **概要:** b02e0b90f0 の R2-01 修正は pass。機関ログインの配布既定鍵が除去され、実行時の必須鍵を検査し、新しいエラーには値を含めません。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** removing defaults needs mandatory references and blank-value validation; source review and reported artifact checks provide different evidence. / 既定値除去には必須参照と空値検査も必要であり、ソース確認と報告された成果物検査は異なる証拠です。 +- Applies to: RCOSDP/RDM-cas-overlay-dev2027 PR #3; delta `96de2b60f6d2a3568cb47fe37a325b631f286d36..b02e0b90f00def52fa5c47e479cc60d1085bff02`. +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [r2](2026-11-10_RDM-cas-overlay-dev2027_PR3_Real_Startup_r2.md). +- Used by: PR #3 revision and [review integration](README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Pass — R2-01 addressed; no new blocking finding in this delta.** This is a scoped review verdict, not GitHub approval or authorization to deploy. R1-01 remains resolved as recorded in r2. + +### Independent source evidence + +`etc/cas.properties:104–107` now documents runtime environment injection without either JWE/JWT assignment. `cas-servlet.xml:359–360` retains mandatory placeholders without fallback. Its non-lazy action bean receives both values through setters; `propertyFileConfigurer.xml:41` does not ignore unresolved placeholders. Missing values therefore prevent normal context initialization rather than silently choosing a shared key. + +`OpenScienceFrameworkPrincipalFromRequestRemoteUserNonInteractiveCredentialsAction.java:863–901` rejects null, empty, and whitespace-only values, requires exactly 32 bytes for JWE and at least 32 bytes for JWT, and assigns only after validation. The length calculation uses the same `getBytes()` conversion as the signer and encrypter at lines 722 and 729. New exception messages contain only property names and requirements; there is no new secret logging or generated fallback. Explicit UTF-8 would improve cross-host portability for non-ASCII keys, but this is not a blocker for removal of usable defaults. + +`InstitutionAuthSecretValidationTests` covers the 31/32/33-byte boundaries, null/empty/blank rejection, and value-free errors. `CookieAndRateLimitDefaultsTests.shippedConfigurationCarriesNoInstitutionLoginSecrets` checks absence of both properties. These tests were inspected, not executed independently. + +An independent tracked-file search found the old JWE/JWT literals only in `src/test/java/io/cos/cas/mock/MockOsfRemoteAuthenticateAction.java`. The distribution stages copy configuration and the production WAR, not the source tree or test JAR. Maven separates test resources; the webapp uses the normal OSF JAR. `.dockerignore` excludes Git history. The build-stage source tree, caches, and the `dev` target are outside the claim that final `dist` layers lack old test literals. No build-time secret arguments or environment defaults were added. `git diff --check` passed and the isolated clone remained clean. + +### Author-reported runtime and artifact evidence + +The PR body reports arm64 exit 254 for either missing key, empty keys, JWE lengths 31/33, and JWT length 31. With keys provided only through environment variables, startup, password login, ST validation, wrong-password rejection, and throttling succeeded; supplied values were absent from logs. The 31-byte rejection versus 32-byte startup supports the environment-to-setter wiring. Password login is not an institution-login end-to-end test. + +The author reports successful oauth 109 / osf 41 tests and mutation failures for the three relevant regression tests. For both architecture images, all ten layers each, nested WAR/JAR contents, and configuration blobs were scanned: old JWE/JWT and TGC literals, assignment patterns, and four supplied keys had zero matches; a non-secret control matched twice. The reported local OCI index is `sha256:5a1799d930b77a339f62cdd0a5aff9e6a1dfea07d91444e12c7e9653d7a53a7d`. These results support closure together with the source changes, but were not independently reproduced or verified against image bytes by this reviewer. + +### Limits and follow-up + +No Docker operations, Maven/Java test runs, live startup, or image inspection were performed in this round. No grdm-dev state or runtime/.env was touched. The only GitHub write is one PR comment; there was no commit, push, merge, approval, or close. This record is uncommitted. + +OSF receiver defaults remain outside this CAS delta: configure matching deployment-specific keys on both sides and never reuse historical examples. Actual institution login, real GRDM schema validation, TOTP, ORCiD, the dev target, and post-change amd64 startup remain unverified as previously recorded. TGC key-quality hardening remains a follow-up. The verdict does not broaden these claims or certify all possible logging configurations. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**Pass — R2-01 は対応済み。この差分に新しい阻害事項はありません。** 範囲を限定したレビュー判定であり、GitHub の approve や配備の許可ではありません。R1-01 は r2 の記録どおり解決済みです。 + +### 独立したソース確認 + +`etc/cas.properties:104–107` は JWE/JWT の代入を除去し、実行時の環境変数注入を説明しています。`cas-servlet.xml:359–360` は代替値なしの必須参照を維持します。遅延生成でない action bean の setter に両値が渡され、`propertyFileConfigurer.xml:41` は未解決参照を無視しません。したがって未設定なら共通鍵を選ばず、コンテキストの正常初期化を拒否します。 + +`OpenScienceFrameworkPrincipalFromRequestRemoteUserNonInteractiveCredentialsAction.java:863–901` は null・空文字・空白のみを拒否し、JWE は正確に 32 バイト、JWT は 32 バイト以上を要求して検査後に代入します。長さ計算は 722・729 行の署名・暗号処理と同じ `getBytes()` を使います。新しい例外はプロパティ名と要件だけを含み、秘密のログ出力や自動生成の代替鍵は追加されていません。UTF-8 の明示は非 ASCII 鍵の環境間互換性を改善しますが、使用可能な既定値除去の blocker ではありません。 + +`InstitutionAuthSecretValidationTests` は 31/32/33 バイト境界、null・空文字・空白の拒否、エラーへの値の非出力を検査します。`CookieAndRateLimitDefaultsTests.shippedConfigurationCarriesNoInstitutionLoginSecrets` は両プロパティの不在を検査します。試験コードを確認しましたが、独立には実行していません。 + +追跡ファイルの独立検索では、旧 JWE/JWT 文字列は `src/test/java/io/cos/cas/mock/MockOsfRemoteAuthenticateAction.java` だけに残ります。配布ステージは設定と本番 WAR をコピーし、ソースツリーや試験 JAR はコピーしません。Maven は試験リソースを分離し、webapp は通常の OSF JAR を使います。`.dockerignore` は Git 履歴を除外します。ビルドステージのソース、キャッシュ、`dev` ターゲットは「最終 dist 層に旧試験値がない」という主張の対象外です。ビルド時の秘密引数や環境既定値は追加されていません。`git diff --check` は成功し、専用 clone に変更はありません。 + +### 作者報告の実行時・成果物の証拠 + +PR 本文は arm64 で、どちらかの鍵の未設定、空文字、JWE の 31/33 バイト、JWT の 31 バイトを exit 254 と報告しています。環境変数だけで鍵を与えた場合は起動、パスワードログイン、ST 検証、誤パスワード拒否、制限が成功し、指定値のログ出力はありませんでした。31 バイトで拒否、32 バイトで起動という結果は環境変数から setter への配線を裏付けます。パスワードログインは機関ログイン全体の試験ではありません。 + +作者は oauth 109 件/osf 41 件の成功と関連回帰試験 3 件の変異試験での失敗を報告しています。両アーキの各 10 層、内部 WAR/JAR、設定 blob を検索し、旧 JWE/JWT・TGC 文字列、代入パターン、指定した 4 鍵は検出 0 件、秘密でない対照値は 2 件でした。報告されたローカル OCI 索引は `sha256:5a1799d930b77a339f62cdd0a5aff9e6a1dfea07d91444e12c7e9653d7a53a7d` です。ソース修正と合わせて解決を支持しますが、レビュワはこれらを独立再現せず、イメージの実バイトも検証していません。 + +### 制限と後続事項 + +今回は Docker 操作、Maven/Java 試験、実起動、イメージ検査を実施していません。grdm-dev の状態と runtime/.env は操作していません。GitHub への書き込みは PR コメント 1 件のみで、commit・push・merge・approve・close はしていません。この記録は未コミットです。 + +OSF 受信側の既定値は CAS 差分の範囲外です。両側へ一致する環境固有鍵を設定し、履歴の例示値を再利用しないでください。実際の機関ログイン、実 GRDM スキーマ検証、TOTP、ORCiD、dev ターゲット、変更後の amd64 起動は従前どおり未確認です。TGC の鍵品質強化は後続事項です。この判定は未確認事項を確認済みにせず、あらゆるログ設定を保証しません。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR35_Acceptance_HMAC_r1.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR35_Acceptance_HMAC_r1.md new file mode 100644 index 0000000..02d60fe --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR35_Acceptance_HMAC_r1.md @@ -0,0 +1,90 @@ +# Review r1: Acceptance and HMAC / 受入試験と HMAC のレビュー + +> **Summary:** The HMAC wiring is consistent, but public credential evidence and two fail-closed gaps require changes. +> **概要:** HMAC の配線は整合しているが、公開証跡の資格情報と、安全側に停止する検証の二つの穴について修正が必要。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** passing acceptance cases does not prove that evidence is safe to publish or that exception matching fails closed. / 受入ケースの合格だけでは、証跡の公開安全性や例外判定が安全側に停止することは証明できない。 +- Applies to: RCOSDP/RDM-developer-guide PR #35, `fix/accept-chromium-paths` → `develop`, three commits, head `4f70cfa6acf3d837e7f33a0ebb4b9369718fe4d4`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-03 §3.1](../spec/03_security_gate.md#english) · [SPEC-04 §3 rule 4](../spec/04_acceptance_tests.md#english). +- Used by / 利用先: [DEMO-20](../demo/20_core_install_mac_studio.md) · [Status board](../status/README.md) · [Run records](../demo/runs/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and findings + +**Changes requested.** P1 means fix before merge because the public evidence violates the secrets baseline; P2 means a correctness gap requiring correction. No approval or merge was performed. + +**R1-01 [P1] — Mask disposable credentials before publishing evidence.** In `docs/demo/runs/acc-20261109T131240Z-00dff9/pytest.log:166–167,237,369` and `junit.xml:130–131,198,321`, assertion output includes user dictionaries with plaintext password values. No values are reproduced here. `installer/grdm_dev/accept.py:585,621,657–658` constructs the masking set from the environment file, but never adds the generated users or their derived OSF passwords. These are authentication material even if the accounts are intended to be disposable; cleanup can fail and is only a warning. The new `osf_account_password()` derives the OSF password from the published identity, so masking only the password dictionary key is insufficient. SPEC-03 §3.1 forbids secrets in reports/logs, and runs README 0.3 promises none are written. Sanitize the committed text artifacts, include both fakecas identities/credentials and derived OSF passwords in masking before any seed error or report is emitted, and add a failure-output regression covering pytest, JUnit and collector artifacts. Prefer independent random OSF passwords. Verify exposed accounts have been deleted; handle already-published copies according to repository policy. Do not describe disposable passwords as exempt secrets. + +**R1-02 [P2] — Constrain external-asset prefixes to actual asset routes.** `installer/acceptance/netguard.py:31–35,80–82` uses unrestricted `startswith`; consequently a stylesheet request to `https://fonts.googleapis.com/css-unlisted` is treated as known, aborted and counted without failing. `/css2` is also silently covered although only `/css` is named. The directory prefixes for CDN libraries likewise accept arbitrary filenames/versions. Host, type, credentials, port and scheme checks are sound, and requests remain blocked: this is a false acceptance verdict, not demonstrated network egress. SPEC-04 explicitly permits prefixes, but its claim that unlisted requests fail is broader than this matching proves. Define exact stylesheet endpoints and bounded directory/file patterns for the known assets, document the intended scope, and test prefix lookalikes and unknown paths. Keep API requests and navigation/WebSocket requests failing. + +**R1-03 [P2] — Validate the decoded GA configuration instead of a raw substring.** `installer/grdm_dev/templates/ember_osf_web.json:7` does not require its HTML replacement to match. Missing/reordered attributes or changed quoting can therefore produce a successful no-op. The subsequent raw `grep GoogleAnalytics` is not a semantic verification of the URI-encoded JSON: an adapter name encoded as `%47oogleAnalytics` decodes to `GoogleAnalytics` but is invisible to that grep. With a changed valid meta-tag layout, both checks can pass while the adapter remains. In addition, cached builds bypass the check entirely. Parse and require exactly one expected configuration tag, validate `metricsAdapters`, remove the adapter, then decode and assert its absence before every serve (including cache hits). Add executable tests for the normal case, missing/no-match tag, alternative encoding and cached output. Current tests only inspect command substrings and cannot establish fail-closed behavior. This is source-level analysis, not a claim that the pinned image currently emits the alternative layout. + +### Requested cross-checks + +**HMAC:** Checked the pinned integration source with GitHub read-only APIs: WaterButler `core/utils.py` uses server settings; `core/provider.py:891–898` uses `providers/osfstorage/settings.py`; osf.io `framework/auth/signing.py:84` uses website `DEFAULT_HMAC_SECRET`. Both signer environment keys in `wb` and `wb_worker` now resolve to `WATERBUTLER_HMAC_SECRET`. Every template mounting the generated website `local.py` (`web`, `api`, `admin`, `worker`, `osf_init`) receives that key. No missing consumer was found. Removing the JWT fallback is correct: `compose.run` rejects a missing required HMAC key before rendering, and the previous secret generator already generated it. + +For an existing environment containing both old keys, re-rendering selects the existing WaterButler key consistently; the old OSF storage key is unused. Rotation creates a new shared HMAC key and recreates services using the rendered configuration. **Maintenance note [P3]:** removal from `SECRET_KEYS` makes `run_init --force` and `run_rotate` preserve `OSFSTORAGE_HMAC_SECRET` as a non-secret setting (`secrets.py:300`); it is neither removed nor rotated. Remove obsolete credential keys explicitly and cover legacy environments in tests. This is stale-secret retention, not an active signing mismatch after re-render. Rotation does not re-render an old Compose file, so upgrade guidance should explicitly require re-rendering before recreation/rotation. No real environment file was read. + +**Other changes:** `have_email=True` addresses the email-setup redirect. Fakecas's hidden password field is no longer blindly filled. The Chromium additions cover the stated new macOS application and headless-shell layouts without changing executable checks; they do not prove the installed Playwright revision is compatible. In-place writes preserve bind-mounted inodes; unchanged files remain untouched and new files retain atomic creation. Changed files are now non-atomic during writing, so concurrent readers can observe partial content; document/restrict rendering during active imports or add protection if concurrent rendering is supported. No demonstrated regression in the stated sequential workflow was found. + +**Rejection cases:** C1 still requires a redirect to login and an anonymous API 401. `follow_redirects=False` returns the first redirect only after checking its Location is loopback. C3's anonymous 401/403 and authenticated non-contributor 403 remain unchanged. The fixture-cycle repair attaches guards through `new_context`, including default contexts, and keeps service workers blocked. No authorization rejection assertion was relaxed. R1-02 is the newly weakened network rejection boundary. New tests do not exercise the GA transform, inode retention, legacy-key migration or all new browser layouts behaviorally. + +**Documentation:** DEMO-20 0.12 and status board 0.9 correctly distinguish C1/C3 success/rejection passes from the pre-fix core run (3 passed, 8 failed, 1 error out of 12), and leave C2/C4/C5/C6 open. These are supplied run records, not an independent live rerun. The HMAC explanation matches the wiring. GA removal is correct for the expected build shape but its unconditional guarantee needs R1-03. Runs README 0.3 accurately limits committed runs to the three cited runs, but its no-secrets promise is contradicted by R1-01. Acceptance seed comments still say the browser types an email as password, while the new helper normally skips the hidden password field; update that explanation. + +### Validation and limits + +In the specified checkout, ran `PYTHONPATH=installer python3 -m unittest discover -s installer/tests`: 363 tests, OK, 10 skipped (acceptance conftest unavailable to this interpreter). `python3 tools/docs_check.py`: pass, 22 glossary warnings. `python3 tools/manifest_check.py`: pass, zero findings. `git diff --check`: clean. The untracked review record is checked separately because the normal docs checker enumerates tracked files. No installation, acceptance execution, Docker state changes, runtime secret inspection, commit, push, approval or merge. Only this review record and the requested single PR comment are deliverables. Remaining work: fixes and focused regression evidence for R1-01–03, followed by re-review; C2/C4/C5/C6 remain separate acceptance work. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +**Changes requested(要修正)。** P1 は公開証跡が秘密の基本対策に反するためマージ前の修正が必要な問題、P2 は修正が必要な正しさの問題。承認やマージは行っていない。 + +**R1-01 [P1] — 使い捨て資格情報も公開前にマスクする。** `docs/demo/runs/acc-20261109T131240Z-00dff9/pytest.log:166–167,237,369` と `junit.xml:130–131,198,321` の assertion 出力に、平文パスワードを含むユーザー辞書がある。値はここに転載しない。`installer/grdm_dev/accept.py:585,621,657–658` は環境ファイルからマスク対象を作るが、生成した試験ユーザーや派生した OSF パスワードを追加しない。使い捨て予定でも認証情報であり、削除失敗は警告だけである。追加された `osf_account_password()` は公開された識別子からパスワードを導出するため、辞書の password 欄だけを消しても足りない。SPEC-03 §3.1 はログ・報告の秘密を禁じ、runs README 0.3 も秘密を書かないと約束している。コミット済みの文字証跡をマスクし、seed エラーや報告を出す前に fakecas の識別子・資格情報と OSF パスワードをマスク対象へ追加すること。pytest・JUnit・collector の失敗出力を回帰検証すること。OSF パスワードは独立した乱数が望ましい。露出したアカウントの削除を確認し、公開済みコピーはリポジトリ方針に従って処理すること。使い捨てを秘密の例外にしない。 + +**R1-02 [P2] — 外部資産の一致範囲を実際の資産ルートに絞る。** `installer/acceptance/netguard.py:31–35,80–82` の無制限な `startswith` により、stylesheet の `https://fonts.googleapis.com/css-unlisted` が既知として中断・集計され、試験を失敗にしない。明記された `/css` 以外の `/css2` も暗黙に含む。CDN ライブラリのディレクトリも任意のファイル名・版に一致する。ホスト・種類・資格情報・ポート・scheme の確認は適切で、通信は遮断される。これは合否の偽陰性であり、外部流出を観測した指摘ではない。SPEC-04 は prefix を許すが、「一覧外は失敗する」という説明は現判定で保証できる範囲より広い。stylesheet は正確な endpoint、その他は境界のあるディレクトリ・ファイル条件を定め、意図した範囲を文書化し、似た prefix と未知パスをテストすること。API・画面遷移・WebSocket の拒否を維持すること。 + +**R1-03 [P2] — GA 設定は復号して検証する。** `installer/grdm_dev/templates/ember_osf_web.json:7` は HTML 置換の一致を必須にしていない。属性順・引用符の変更やタグ欠落で、何もしなくても成功する。後続の生文字列に対する `grep GoogleAnalytics` は URI 符号化された JSON の意味を検証しない。たとえば `%47oogleAnalytics` は復号後に `GoogleAnalytics` になるが grep には見えず、有効な meta タグの形式変更と組み合わさると両検査を通って adapter が残る。キャッシュ済みビルドでは検査全体を飛ばす。期待する設定タグが正確に一つあることと `metricsAdapters` の形を確認し、除去後も復号して不在を検証すること。キャッシュ時も含め、serve 前に必ず検証すること。正常形、タグ欠落・不一致、別の符号化、キャッシュ成果物の実行テストが必要。現テストはコマンド内の文字列確認だけで、安全側に停止する証明にならない。これはソース上の分析であり、固定イメージが現在その別形式を生成するという主張ではない。 + +### 指定された確認事項 + +**HMAC:** GitHub の読み取り API で固定された統合ソースを確認した。WaterButler の `core/utils.py` は server settings、`core/provider.py:891–898` は `providers/osfstorage/settings.py`、osf.io の `framework/auth/signing.py:84` は website の `DEFAULT_HMAC_SECRET` を使う。`wb`・`wb_worker` の両署名器の環境キーは `WATERBUTLER_HMAC_SECRET` に統一されている。生成した website `local.py` を mount する全サービス(`web`・`api`・`admin`・`worker`・`osf_init`)にも渡され、漏れはなかった。JWT fallback の削除は適切。HMAC キーが欠ければ compose render が拒否し、旧生成処理も同キーを生成していた。 + +旧キー二つを持つ環境でも、再 render 後は既存の WaterButler キーで揃い、旧 OSF storage キーは未使用になる。rotate は新しい共通鍵を生成し、render 済み設定でサービスを再作成する。**保守指摘 [P3]:** `SECRET_KEYS` からの削除で `run_init --force`・`run_rotate` は `OSFSTORAGE_HMAC_SECRET` を非秘密設定として残す(`secrets.py:300`)。削除も更新もしない。廃止した資格情報キーを明示的に消し、旧環境のテストを加えること。これは不要な秘密の残留であり、再 render 後の署名不一致ではない。rotate 自体は古い Compose を再 render しないので、更新手順には再作成・rotate 前の再 render を明記するとよい。実際の環境ファイルは読んでいない。 + +**その他:** `have_email=True` はメール設定への転送を解消する。fakecas の不可視パスワード欄を無条件に fill しなくなった。Chromium の追加パスは示された新しい macOS アプリと headless shell を対象にし、実行可能性の確認は維持するが、導入済み Playwright の版との互換性までは証明しない。既存ファイルへの上書きは mount の inode を保持し、同一内容は書かず、新規作成は原子的なまま。変更時の書込みは非原子的になり、同時に読む処理が途中の内容を見得る。並行 render を扱うなら、import 中の render 制限を文書化するか保護を設けること。指定された逐次の流れでの具体的な回帰は見つからなかった。 + +**拒否ケース:** C1 のログインへの redirect と匿名 API 401 は維持される。`follow_redirects=False` でも Location が loopback であることを確認してから最初の応答を返す。C3 の匿名 401/403 と認証済み非共同研究者 403 は変更されていない。fixture 循環の修正後も、既定 context を含め `new_context` で guard が付き、service worker を遮断する。権限拒否 assertion の緩和はない。ネットワーク拒否の新しい緩和は R1-02。追加テストは GA 変換・inode 保持・旧鍵移行・新ブラウザ配置全体の動作を検証していない。 + +**文書:** DEMO-20 0.12 と進捗表 0.9 は C1/C3 の成功・拒否合格と、修正前のコア実行(12 件中 3 passed・8 failed・1 error)を正しく区別し、C2/C4/C5/C6 を残件にしている。これは提供された実行記録で、独立した実機再試験ではない。HMAC の説明は配線に一致する。GA 除去は想定形式では正しいが、無条件の保証には R1-03 の修正が必要。runs README 0.3 の「引用した三実行のみを保持」は合っているが、「秘密を書かない」は R1-01 と矛盾する。seed のコメントはまだメールをパスワードとしてブラウザが入力すると述べるが、新 helper は通常不可視欄を飛ばすので説明を合わせること。 + +### 検証と限界 + +指定 checkout で `PYTHONPATH=installer python3 -m unittest discover -s installer/tests` を実行:363 件、OK、10 skip(この Python では acceptance conftest を import できない)。`python3 tools/docs_check.py` は合格、用語注の警告 22 件。`python3 tools/manifest_check.py` は合格、検出ゼロ。`git diff --check` は問題なし。通常の文書検査は追跡ファイルだけを列挙するため、未追跡のレビュー記録は別に検証する。install・accept・Docker 状態変更・runtime の秘密参照・commit・push・承認・マージは行っていない。成果物はこの記録と依頼された PR コメント一件だけ。残件は R1-01〜03 の修正と絞った回帰検証、その後の再レビュー。C2/C4/C5/C6 は別途残る受入作業である。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| HMAC | A shared-key signature used to check who sent a message. | 共通の秘密鍵で送信元を確かめる署名。 | +| Fail closed | Stop when safety cannot be established. | 安全を確認できないときに停止すること。 | +| Inode | The file identity a mounted file continues to refer to. | mount が参照し続けるファイルの実体の識別情報。 | +| Masking | Replace sensitive values before saving or displaying them. | 保存・表示の前に秘密の値を伏せること。 | +| GA | Google Analytics, a browser analytics adapter. | ブラウザの利用状況を送る Google Analytics の部品。 | diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR35_Acceptance_HMAC_r2.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR35_Acceptance_HMAC_r2.md new file mode 100644 index 0000000..bde0e17 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR35_Acceptance_HMAC_r2.md @@ -0,0 +1,78 @@ +# Review r2: Acceptance and HMAC / 受入試験と HMAC の再レビュー + +> **Summary:** The r1 code findings are resolved; squash merge is acceptable with the explicitly recorded local-credential residual and live-container validation limit. +> **概要:** r1 のコード指摘は解決。ローカル資格情報の残留と実コンテナ未検証を明示したうえで、squash merge を許容する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** sanitizing the current evidence does not revoke credentials already published in history, and executable guard tests do not replace validation in the pinned container. / 現在の証跡のマスクは履歴に公開済みの資格情報を失効させず、guard の実行テストも固定コンテナでの検証の代わりにはならない。 +- Applies to: RCOSDP/RDM-developer-guide PR #35, `fix/accept-chromium-paths` → `develop`; review delta `4f70cfa..e4ad66e`, head `e4ad66e00e5cfb256a66a2b8e56239347671d6bb`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r1 record](2026-11-10_RDM-developer-guide_PR35_Acceptance_HMAC_r1.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-04](../spec/04_acceptance_tests.md). +- Used by / 利用先: [DEMO-20](../demo/20_core_install_mac_studio.md) · [Status board](../status/README.md) · [Run records](../demo/runs/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Merge acceptable for the reviewed head, with the residual and limits recorded below.** No new merge-blocking regression was found. This is a review verdict, not a GitHub approval or merge. The updated PR body corrects its earlier deletion claim: 33 disposable accounts remain in the local database, and their deletion is deferred until the current acceptance work finishes. That statement is acknowledged, not independently verified against the database. + +### Resolution of r1 + +**R1-01 [P1]: code and current evidence resolved; historical exposure accepted as a bounded residual.** `seed_users()` now generates an independent `secrets.token_urlsafe(24)` OSF password for each user. `seed_secret_values()` joins the masking set before any seed call, including identities, fakecas credentials and OSF passwords; raw, lower-case, XML/JSON-escaped and URL-quoted values are covered. Failure tests exercise seed errors, pytest output, JUnit, collector and result artifacts. The two changed historical text artifacts exactly equal the current sanitizer applied to their old contents; no unmasked disposable mailbox was found in the tracked run text. No credential values are reproduced here. The cleanup query now uses `username__icontains`, matching OSF's lower-cased usernames; its test checks the generated query, not deletion against a real database. The seed explanation now matches the login helper. + +**R1-02 [P2]: resolved.** Full-path matching replaces unrestricted prefixes: exact `/css` and `/css2`, a three-component numeric version and the named es6-shim/MathJax file, or a 32-character hexadecimal gravatar hash / exact `placeholder`. Versions and query parameters are intentionally not pinned by this rule; it bounds the asset route and does not permit network access. Unknown files, suffixes, prefix lookalikes, wrong resource types, ports and credentials remain rejected. API, navigation and WebSocket requests remain outside the exception. SPEC-04 0.8 describes the scope. A read-only GitHub check of `RDM-osf.io-dev2027` at `389415a473361fdaa3c347e84d95639b9096a9e9`, `addons/wiki/templates/edit.mako:4`, confirms the Material Symbols stylesheet uses `/css2`; making it explicit preserves a real pinned dependency rather than adding an unrelated endpoint. + +**R1-03 [P2]: resolved at source and local execution level.** The Node guard requires exactly one matching config tag, parses URI-decoded JSON, validates the adapter list, removes GA and reloads the result to verify absence. Missing/duplicate tags, malformed encoding/config, alternative attribute ordering/quotes, encoded adapter names and cached output have executable coverage. The shell runs the guard after the build conditional and before every serve, with `set -e`; failed verification prevents serving and recording a fresh successful fingerprint. Recipe `3` is part of that fingerprint. An additional temporary-directory shell check changing recipe `2` to `3` observed `build`, then `serve`. This is not a general HTML security parser; the relevant generated-page cases pass, and unsupported representations stop startup. Execution in the real pinned container is still unverified and is not claimed here. + +**r1 maintenance [P3]: resolved.** `OBSOLETE_SECRET_KEYS` removes `OSFSTORAGE_HMAC_SECRET` in both `init --force` and successful `rotate`, with a legacy-environment regression test retaining an unrelated port setting. SPEC-02 0.9 explicitly requires `compose render` before rotation or recreation after upgrade. Rollback on failed rotation retains the original environment as designed. No HMAC consumer wiring changed in this delta, so the r1 wiring conclusion stands. + +### Historical credentials and remaining work + +The plaintext in pushed commit `4f70cfa` remains available in history and copies; force-push is forbidden. Squash merge places the sanitized final tree on `develop`, but does **not** erase the old commit, PR references or existing copies. Nevertheless, accepting that residual for this merge is reasonable on the stated facts: these are disposable credentials valid only on one Mac's loopback-bound development stack, not shared or production credentials; current evidence and future OSF password generation have been corrected; and the PR openly tracks the 33 remaining accounts. This is a contextual risk acceptance, not an exception declaring disposable credentials non-secret or a claim that they have been revoked. Delete and verify removal of the remaining accounts after the active acceptance work, as the PR promises; do not carry those exposed accounts into a shared or externally reachable environment. That operational cleanup remains open and was not performed by this review. + +C2/C4/C5/C6 remain separate acceptance work. The new GA guard still needs a real-container check. The r1 note about non-atomic writes during concurrent rendering remains unchanged; this delta does not introduce a new demonstrated regression in the stated sequential workflow. + +### Validation and scope + +In the specified checkout: `PYTHONPATH=installer python3 -m unittest discover -s installer/tests` passed, 384 tests with 10 skips (acceptance conftest dependencies unavailable to this interpreter); the 15 Node guard/command tests ran rather than skipping. `python3 -m unittest discover -s tools/tests` also passed, 92 tests. `python3 tools/docs_check.py` passed with 101 files checked, 8 exempt and 22 glossary warnings. `python3 tools/manifest_check.py` passed with zero findings. `git diff --check` was clean. The untracked r2 record was checked separately with the docs checker's `check_file` function, because the normal command enumerates tracked files. + +Only the uncommitted r2 record and one requested Japanese PR comment were written. No install, acceptance run, Docker state change, real runtime environment-file access, commit, push, approval, close or merge was performed. Tests used temporary fixtures and stub runners; those do not establish real-container behavior or real-account deletion. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**下記の残余リスクと検証限界を明記したうえで、対象 head はマージ可。** 新しいマージ阻害回帰は見つからなかった。これはレビュー判定であり、GitHub の approve や merge は行っていない。PR 本文は以前の削除済みという説明を訂正し、使い捨てアカウント33件がローカルDBに残り、進行中の受入作業終了後に削除するとしている。この申告を確認したが、DBへの独立検証はしていない。 + +### r1 指摘の解決 + +**R1-01 [P1]:コードと現在の証跡は解決。履歴の露出は限定された残余リスクとして受容。** `seed_users()` は利用者ごとに独立した `secrets.token_urlsafe(24)` の OSF パスワードを生成する。`seed_secret_values()` は seed 呼出し前に識別子・fakecas資格情報・OSFパスワードをマスク対象へ加え、生値・小文字・XML/JSONエスケープ・URL符号化を扱う。失敗テストは seed エラー、pytest、JUnit、collector、結果成果物を検証する。変更された過去の文字証跡2件は、旧内容に現在のマスク処理を適用した結果と完全一致し、追跡中の実行文字証跡に未マスクの試験メールアドレスはなかった。値は転載しない。cleanup は `username__icontains` となり、OSFの小文字化と整合する。テストは生成クエリを検証するもので、実DBでの削除は検証していない。seed の説明もログイン helper と一致した。 + +**R1-02 [P2]:解決。** 無制限な先頭一致をパス全体の一致へ変更した。対象は正確な `/css`・`/css2`、数値3成分の版と指定された es6-shim / MathJax のファイル名、32桁の16進gravatarハッシュまたは正確な `placeholder` に限る。この規則は版とqueryを固定せず、資産ルートの範囲を制限するもので、通信は許可しない。未知ファイル・suffix・似たprefix・異なる資産種類・port・資格情報は拒否し、API・画面遷移・WebSocketも例外にしない。SPEC-04 0.8 の説明と整合する。GitHubの読み取りで `RDM-osf.io-dev2027` の固定SHA `389415a473361fdaa3c347e84d95639b9096a9e9`、`addons/wiki/templates/edit.mako:4` に Material Symbols の `/css2` があることを確認した。無関係なendpointの追加ではなく、実在する固定依存の明示化である。 + +**R1-03 [P2]:ソースとローカル実行の水準で解決。** Node guard は対象設定タグが一つだけであることを求め、URI復号後のJSONとadapter一覧を検証し、GAを除いて再読込し、不在を確認する。タグ欠落・重複、不正符号化・設定、属性順・引用符の変更、符号化されたadapter名、キャッシュ済み出力に実行テストがある。shell はビルド条件分岐の後、毎回の serve 前に guard を実行し、`set -e` により失敗時は配信と新しい成功fingerprintの記録を止める。recipe `3` もfingerprintに入る。別途、一時ディレクトリでrecipe `2`→`3`のshell実行を確認し、`build`→`serve`を観測した。汎用HTMLセキュリティパーサではないが、対象の生成ページ形式を検証し、未対応の表現は起動を止める。固定された実コンテナでの実行は未検証であり、合格とは主張しない。 + +**r1 保守指摘 [P3]:解決。** `OBSOLETE_SECRET_KEYS` により `init --force` と成功した `rotate` の両方で `OSFSTORAGE_HMAC_SECRET` が消える。旧環境の回帰テストは無関係なport設定が保持されることも確認する。SPEC-02 0.9 は更新後のrotate・再作成前に `compose render` が必要と明記する。rotate失敗時のrollbackは設計どおり元の環境を保持する。今回の差分でHMAC利用側の配線は変わらず、r1の配線結論を維持する。 + +### 履歴の資格情報と残件 + +push済みの `4f70cfa` の平文は履歴・複製に残り、force-pushは禁止されている。squash mergeはマスク済みの最終treeを `develop` に載せるが、旧commit・PR参照・既存の複製を消さない。それでも、申告された条件下では今回のマージに対して残余リスクの受容は妥当である。対象は一台のMacのloopback限定開発環境だけで有効な使い捨て資格情報で、共有環境・本番の秘密ではなく、現在の証跡と以後のOSFパスワード生成は修正され、残存33件もPRに明示されている。これは状況に限定したリスク受容であり、使い捨て資格情報を秘密の例外とする判断でも、失効済みとの主張でもない。PRの約束どおり、進行中の受入作業後に残存アカウントを削除して削除結果を確認し、露出したアカウントを共有環境や外部到達可能な環境へ持ち込まないこと。この運用上の削除は残件で、本レビューでは実施していない。 + +C2/C4/C5/C6は別途の受入作業として残る。新しいGA guardも実コンテナでの確認が必要。並行render時の非原子的な書込みというr1の注意点は変わらず、今回の差分では想定された逐次実行に新しい具体的回帰を認めなかった。 + +### 検証と範囲 + +指定checkoutで `PYTHONPATH=installer python3 -m unittest discover -s installer/tests` は384件合格、10件skip(このPythonではacceptance conftestの依存が不足)。Node guard / commandの15テストはskipせず実行された。`python3 -m unittest discover -s tools/tests` も92件合格。`python3 tools/docs_check.py` は101ファイル検査・8件免除・用語警告22件で合格。`python3 tools/manifest_check.py` は検出ゼロで合格。`git diff --check` は問題なし。通常の文書検査は追跡ファイルのみを列挙するため、未追跡のr2記録は文書チェッカーの `check_file` で別途検証した。 + +書込みは未コミットのr2記録と指定された日本語PRコメント一件のみ。install・accept実行・Docker状態変更・実runtime環境ファイル参照・commit・push・approve・close・mergeは行っていない。テストは一時fixtureとstub実行器を使用しており、実コンテナ動作や実アカウント削除を証明しない。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r1.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r1.md new file mode 100644 index 0000000..1c92b25 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r1.md @@ -0,0 +1,113 @@ +# PR36 Preflight and ownership review r1 / 事前検査と所有者設定のレビュー r1 + +> **Summary:** Changes are required at head `af2ea6ef96cde42efeff60df7e0a36cc8e91cd97`: deletion confinement and shared-volume permissions are not established, and the mandatory policy check fails. +> **概要:** head `af2ea6ef96cde42efeff60df7e0a36cc8e91cd97` は要修正。削除範囲の制限と共有領域の権限を保証できず、必須の方針検査も失敗する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** a root process with capabilities removed is still subject to file permissions, and restricting a container path does not restrict the host path behind its bind mount. / capability を除いた root もファイル権限に従い、コンテナ内のパスを限定しても bind 元のホストパスを限定したことにはならない。 +- Applies to: [PR #36](https://github.com/RCOSDP/RDM-developer-guide/pull/36), `feat/installer-preflight` → `develop`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-03 §3](../spec/03_security_gate.md#english) · [SPEC-06](../spec/06_documentation_conventions.md) · [Hardening exceptions](../../manifest/hardening.json). +- Used by: PR #36 remediation and re-review. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and evidence boundary + +**Changes required.** Read the specified contracts and the complete implementation changes against `origin/develop`. A container is an isolated process environment; Docker is the tool running it ([REF-01](../reference/REF-01_Glossary.md)). A bind mount makes a host directory visible inside that environment. Capability means a separately granted administrator permission. Findings below distinguish static conclusions from actual tests. No stack operation, real reset, container execution, credential access, commit or push was performed. The checkout's secret environment file was not read or modified. Unit tests use their own temporary fixtures. + +### Findings + +1. **R1-01 [HIGH] Validate the host deletion boundary before mounting it.** In [lifecycle.py](../../installer/grdm_dev/lifecycle.py), lines 153–171, `exists()` accepts `runtime/volumes` when it is a symbolic link to an unrelated directory. `wipe_argv` line 141 then supplies that path to Docker, which mounts the resolved target; `find /volumes -mindepth 1 -delete` deletes that target's contents. The later host `rmtree` rejection is too late. An independent temporary-directory probe with an injected, nonexecuting runner confirmed that the wipe is submitted for such a link and only the fallback returns 14; the sentinel remained intact because Docker was never run. Reject symlinked volume roots and escaping parent paths before any destructive action, and test both cases. Inner symlinks are different: the generated `find` does not request link following. Nested host mounts also need an explicit boundary policy. The same host-path issue affects ownership: [compose.py](../../installer/grdm_dev/compose.py) lines 577–582 and `_ensure_volume_dir` accept preexisting symlinked bind sources, so the new privileged owner step can change ownership outside the intended volume tree. Validate every bind source; do not rely on the `/volumes` container prefix. + +2. **R1-02 [HIGH] Include the root writer when assigning `wb_tmp`.** `volume_owners` in compose.py lines 387–398 skips every service with a `user` exception. It assigns `wb_tmp` to `1000:1000` through wb/wb_worker/mfr, but [unoconv](../../installer/grdm_dev/templates/unoconv.json) mounts it writable as `/tmp`, uses it as HOME, and runs as root with only CHOWN restored. Fresh directories are mode 0755; uid 0 without DAC_OVERRIDE cannot create LibreOffice profile/temporary files in a uid-1000 directory. This affects Linux hosts with uid 1000 as well as other uids; root is not an automatic permission bypass. Unoconv also has no dependency on the owner step. Provide a compatible shared-directory/group or user arrangement and ordering, with documented bounded exceptions only if necessary. Verify real conversion as well as startup on Linux; the present tests only compare generated strings. macOS file sharing can mask this failure. + +3. **R1-03 [MEDIUM] The ownership shortcut does not safely repair existing trees.** compose.py lines 401–407 checks only the top directory. If its owner is already correct, differently owned descendants remain unusable. If it differs and contains another user's 0700 directory, root with CHOWN alone cannot walk that directory; recursive chown can fail after partial changes. A subsequent attempt can skip the now-correct root, leaving the incomplete repair undetected. This contradicts the claimed handling of older trees and recovery by rerunning. Define a migration/recovery contract, avoid marking a partially repaired tree complete, and test private descendants, mixed ownership and retry after failure. Fresh ordinary 0755 trees work; this finding concerns existing/private trees. Do not fix this by silently weakening the blanket security baseline. + +4. **R1-04 [MEDIUM] Path prefixes are not filesystem/share probes.** [host.py](../../installer/grdm_dev/host.py) lines 306–329 rejects all WSL paths under `/mnt` as Windows drives, including Linux filesystems mounted there, and misses Windows drives mounted elsewhere. On macOS it rejects shared paths outside HOME (except `/Volumes`) without inspecting the engine's sharing configuration. Thus a valid explicitly shared `/private/tmp` checkout is rejected, while an unshared external volume merely warns and passes. Use mount/filesystem facts for the WSL permission requirement and a safe engine visibility check or an explicit supported override for macOS. The Colima observation alone does not establish a universal Docker Desktop restriction. The current guards are useful conservative heuristics, not proof of mount availability or mode enforcement. + +5. **R1-05 [MEDIUM] The required manifest/policy check fails on the new test fixture.** `python3 tools/manifest_check.py` exits 1: `installer/tests/test_preflight.py:25` contains a URL to the private integration repository. Manifest data itself has zero findings; the policy scan has one. Use a synthetic public/example target for the secret-output test without retaining a private-repository URL in tracked text. The fixture value is deliberately not reproduced here. + +6. **R1-06 [LOW] Preserve the previous review verbatim.** The two link destinations in [PR34 r2](2026-11-06_RDM-developer-guide_PR34_Native_ES2_r2.md), lines 27 and 75, change to a commit-pinned URL. The link-only repair preserves meaning and is understandable after deleting the template, but SPEC-06 §8 says review records remain verbatim and provides no link-repair exception. Restore the record and preserve its target through a compatible pointer, or obtain an explicit policy resolution and record a separate correction. Do not silently reinterpret the historical reviewer’s record. + +### Remaining requested checks + +- **Baseline and mount ownership:** the generic step has explicit root, only CHOWN, read-only root, no-new-privileges, no restart, and the internal network. Its exception has a review date and removal milestone; replacing two exceptions with one does not itself weaken SPEC-03. The change expands the directories this privileged process can access, so source confinement still matters (R1-01). Derived owners are 999:999 for redis_data and 1000:1000 for elasticsearch_data, elasticsearch6_data, ember_osf_web_dist, wiki_static, osfstoragecache and wb_tmp. Postgres, Mongo and RabbitMQ retain their self-managed ownership. GNU recursive chown does not request `-L` or `-H`; no ordinary descendant-symlink traversal exploit was established. Unvalidated bind sources remain a separate problem. Current volume names are fixed templates; no user-controlled shell-name injection was established. +- **Host behavior:** a fresh uid-1000 Linux tree usually skips the 1000 owner operations; Redis still needs uid 999. Other host uids need the owner step. This does not solve R1-02 or R1-03. The blanket claim that macOS chown is always a no-op is not established across Docker Desktop and Colima sharing backends; no macOS runtime verification was performed here. +- **Reset ordering and results:** confirmation remains before `down`; noninteractive refusal is exit 2, interactive cancellation 0, and stop failure returns without wiping. The helper has no network, no image pull, a read-only root, and only DAC_OVERRIDE/FOWNER. Ignoring its status is acceptable only because successful host deletion establishes the result; failed host deletion returns 14. This does not mitigate deletion of a redirected target beforehand (R1-01). +- **Credentials and fail-open:** `ls-remote` uses a constructed token-free URL, `GIT_TERMINAL_PROMPT=0`, `GCM_INTERACTIVE=never`, and `LC_ALL=C`; its raw output is classified but not emitted. The output-secret regression test passes. Timeout/DNS/connectivity failures are deliberately warnings, so doctor exit 0 means access remains unverified, not proven. This can allow a long installation to begin offline; it is an availability/preflight gap, not a bypass of the later security scan, and the documented behavior is explicit. `--strict` makes warnings fatal. Build disables terminal prompts but does not additionally disable every helper GUI. No real token or Git helper configuration was inspected. +- **Memory and CPU:** the profile floor is sum(mem_min_mb)/1024/0.70, consistent with rendering. Calculated needs are about 4.821429, 22.678571 and 24.107143 GiB for minimum/core/full with default authentication; the independent 8 GiB host minimum still applies. Detection uses the smaller known host/engine memory; explicit memory is a knowing overcommit. Engine NCPU now precedes the host count for rendering; unknown engine CPU falls back to the host and is not a guarantee. Doctor itself does not verify CPU quota. Unknown memory, unreadable emulation state and an unreadable manifest can still skip proof with warnings. Linux emulation reads the client's binfmt state, which does not prove a remote engine's state. These limitations are not covered by the passing string/mock tests as runtime claims. + +### Validation + +Run from the PR checkout: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +``` + +Unit tests: 437 run in 19.355 seconds, OK with 10 skipped. Documentation check: exit 0, 102 files checked, 8 exempt, 22 warnings. Manifest/policy check: exit 1, one policy finding (R1-05). The new untracked review was also checked directly with `tools.docs_check.check_file`; the ordinary command only enumerates tracked files. Linux permission analysis is static; no isolated Linux runtime reproduction was claimed. Required next work is remediation and re-review, including Linux shared-volume/migration tests and deletion-boundary regression tests. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と根拠の範囲 + +**要修正。** 指定仕様と `origin/develop` からの実装差分を確認した。コンテナは隔離された実行環境で、Docker はそれを動かす道具([REF-01](../reference/REF-01_Glossary.md))。bind mount はホストのディレクトリをその中へ見せる仕組み、capability は個別に付与する管理権限である。静的判断と実行した検査を区別する。スタック操作、実際の reset、コンテナ実行、資格情報へのアクセス、commit、push はしていない。この checkout の秘密環境ファイルは読み書きしていない。単体試験は専用の一時 fixture を使う。 + +### 指摘 + +1. **R1-01 [HIGH] mount 前にホストの削除境界を検証する。** [lifecycle.py](../../installer/grdm_dev/lifecycle.py) 153–171 行の `exists()` は、無関係のディレクトリへ向く `runtime/volumes` の symbolic link も受け入れる。141 行で Docker にそのパスを渡すと解決先が mount され、`find /volumes -mindepth 1 -delete` は解決先の内容を削除する。後段のホスト `rmtree` による拒否では遅い。一時ディレクトリと実行しない fake runner による独立検査で、このリンクでも wipe が発行され、fallback だけが14を返すことを確認した。Docker を実行していないため目印ファイルは残った。破壊操作前にリンク化したルートと親経路の逸脱を拒否し、両方を試験する。内部のリンクは別で、生成した `find` はリンク追跡を指定していない。入れ子のホスト mount にも境界方針が要る。所有者操作にも同じ問題があり、[compose.py](../../installer/grdm_dev/compose.py) 577–582 行と `_ensure_volume_dir` は既存のリンク化した bind 元を受け入れるため、新しい所有者初期化が対象外の所有者を変え得る。コンテナ内の `/volumes` という接頭辞でなく、各 bind 元を検証する。 + +2. **R1-02 [HIGH] `wb_tmp` の所有者決定に root の書き手を含める。** compose.py 387–398 行は `user` 例外のあるサービスを全て飛ばす。wb/wb_worker/mfr から `wb_tmp` を `1000:1000` にする一方、[unoconv](../../installer/grdm_dev/templates/unoconv.json) はそこを `/tmp` と HOME に使い、root に CHOWN だけを戻して動く。新規領域は0755なので、DAC_OVERRIDE のない uid 0 は uid 1000 の領域に LibreOffice の設定・一時ファイルを作れない。Linux ホストの uid が1000でも他の値でも該当する。root は自動的な権限回避ではない。unoconv は所有者初期化にも依存しない。共有ディレクトリ・グループまたは実行ユーザーと順序を整え、必要な例外だけを根拠付きで記録する。Linux で起動と実変換を試験する。現行試験は生成文字列の比較であり、macOS の共有実装では問題が隠れ得る。 + +3. **R1-03 [MEDIUM] 所有者の省略判定では既存ツリーを安全に修復できない。** compose.py 401–407 行は最上位だけを調べる。最上位が正しくても配下の異なる所有者は残る。最上位が異なり他ユーザーの0700領域があれば、CHOWN だけの root は中へ入れず、再帰操作が途中で失敗し得る。再試行では既に変更した最上位を見て省略し、不完全な修復を見逃し得る。旧ツリー対応と再実行による回復の主張に反する。移行・回復の契約を定め、部分変更を完了と判定せず、private な配下・混在所有者・失敗後再試行を試験する。新規の通常0755領域は扱えるが、既存/private ツリーは別である。基準全体を黙って緩和して直してはならない。 + +4. **R1-04 [MEDIUM] パスの接頭辞は filesystem・共有の検査ではない。** [host.py](../../installer/grdm_dev/host.py) 306–329 行は WSL の `/mnt` 以下を全て Windows ドライブと判定し、そこに mount した Linux filesystem まで拒否する一方、別の場所の Windows ドライブを見逃す。macOS はエンジンの共有設定を調べず HOME 外(`/Volumes` を除く)を拒否する。明示共有した有効な `/private/tmp` を拒否し、未共有の外付け領域は警告だけで通す。WSL は mount/filesystem の事実で権限要件を判断し、macOS は安全な可視性検査または明示的な対応 override を用意する。Colima での観測だけでは Docker Desktop 共通の制約を証明できない。現行 guard は保守的な目安であり、可視性・mode の証明ではない。 + +5. **R1-05 [MEDIUM] 必須の manifest/方針検査が追加 fixture で失敗する。** `python3 tools/manifest_check.py` は exit 1。`installer/tests/test_preflight.py:25` に非公開統合リポジトリの URL がある。manifest データの指摘は0件、方針検査が1件。秘密を出力しない試験には公開/example の架空対象を使い、追跡対象の文章に非公開 URL を残さない。fixture の値はここへ転載しない。 + +6. **R1-06 [LOW] 過去レビューの原文を保持する。** [PR34 r2](2026-11-06_RDM-developer-guide_PR34_Native_ES2_r2.md) 27・75 行のリンク先2箇所を commit 固定 URL へ変更している。削除した template へのリンク修復として意味を保つ合理性はあるが、SPEC-06 §8 はレビューを原文のまま残すと定め、リンク修復の例外はない。原文を戻し互換の誘導ファイルで対象を残すか、明示的な方針解決を得て別の訂正記録を残す。過去のレビュワ記録を黙って読み替えない。 + +### その他の指定確認 + +- **基準・所有者:** 汎用段は明示 root、CHOWN のみ、読み取り専用 root、no-new-privileges、再起動なし、内部ネットワーク。例外に期限と除去の節目があり、2例外を1例外にすること自体は SPEC-03 の弱体化ではない。ただし privileged な処理が触れる範囲は増えるため R1-01 が重要。導出した所有者は redis_data が999:999、elasticsearch_data・elasticsearch6_data・ember_osf_web_dist・wiki_static・osfstoragecache・wb_tmp が1000:1000。Postgres・Mongo・RabbitMQ は自身の所有者管理を保つ。GNU の再帰 chown に `-L`・`-H` はなく、通常の配下リンクをたどる攻撃は確認していない。bind 元の未検証とは別問題である。現行 volume 名は固定 template で、ユーザー指定名の shell 注入も確認していない。 +- **ホスト差:** Linux の新規 uid-1000 領域では1000向け処理を通常省略するが Redis は999への設定が必要。他のホスト uid は所有者設定が必要。いずれも R1-02・R1-03 は解消しない。macOS の chown が常に無操作という説明は Docker Desktop・Colima の共有方式全体で証明されておらず、今回は macOS 実行検査をしていない。 +- **reset と終了値:** 確認は down より前。非対話の拒否は2、対話の取消は0、停止失敗なら削除しない。helper はネットワークなし・pullなし・読み取り専用 root・DAC_OVERRIDE/FOWNER のみ。helper の終了値を無視しても、ホスト側削除の成功で結果を証明する構造は成立する。ホスト削除失敗は14。ただし先行して外部対象を消す R1-01 は防げない。 +- **資格情報・fail-open:** `ls-remote` は組み立てたトークンなし URL、`GIT_TERMINAL_PROMPT=0`、`GCM_INTERACTIVE=never`、`LC_ALL=C` を使い、生出力を分類するだけで表示しない。秘密出力の回帰試験は合格。timeout・DNS・接続失敗は意図して警告なので、doctor の0は権限を証明した意味ではなく未確認も含む。offline で長い導入を始め得るが、これは可用性・事前検査の不足であり後段の security scan の迂回ではない。仕様にも明記され、`--strict` は警告を失敗にする。build は端末 prompt を止めるが全 helper の GUI まで追加で止めてはいない。実トークンや Git helper 設定は調べていない。 +- **メモリ・CPU:** floor 合計/1024/0.70 は生成側と一致。既定認証で minimum/core/full の必要量は約4.821429・22.678571・24.107143 GiB。別途ホスト最低8 GiBが適用される。既知のホストとエンジンの小さい値を使い、明示 memory は承知の過剰割当。生成時の CPU はエンジン NCPU をホストより優先する。取得不能ならホストに戻るため保証ではない。doctor 自体は CPU quota を検証しない。メモリ不明・emulation 不明・manifest 読取失敗では警告等で証明を省く余地がある。Linux emulation はクライアント側の binfmt を読むため、remote engine の状態は証明しない。合格した mock・文字列試験からこれらの実行時保証を主張できない。 + +### 検証 + +PR checkout で次を実行した。 + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +``` + +単体試験は437件、19.355秒、10件 skip で合格。文書検査は exit 0、102ファイル、8免除、警告22件。manifest/方針検査は exit 1、指摘1件(R1-05)。通常の文書検査は追跡済みファイルだけなので、未追跡の新規レビューも `tools.docs_check.check_file` で直接検査した。Linux の権限判断は静的解析であり、隔離 Linux での再現実行を主張しない。修正・再レビューと、Linux 共有領域/移行試験および削除境界の回帰試験が残る。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| UID/GID | Numeric user/group identities used for filesystem permissions. | ファイル権限に使うユーザー・グループの番号。 | +| DAC_OVERRIDE | Permission to bypass ordinary file access checks. | 通常のファイルアクセス権限を越える権限。 | +| CHOWN | Permission to change file ownership; it does not grant directory access. | 所有者を変更する権限。ディレクトリへのアクセス権は与えない。 | +| Symbolic link | A filesystem reference to another path. | 別のパスを指すファイルシステム上の参照。 | +| Fail-open | Continuing when a check cannot establish its result. | 検査結果を確定できなくても処理を続けること。 | diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r2.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r2.md new file mode 100644 index 0000000..99095c5 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r2.md @@ -0,0 +1,99 @@ +# PR36 Preflight and ownership review r2 / 事前検査と所有者設定のレビュー r2 + +> **Summary:** Changes required at `4cf3a22`: reset confinement and ownership success still have gaps; all required automated checks pass. +> **概要:** `4cf3a22` は要修正。reset の範囲制限と所有者設定の成功判定に不足が残る。必須の自動検査はすべて合格。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** a path check expires when the path changes, and a successful command does not prove that ownership changed. / パスが変われば検証結果は古くなり、コマンドの成功だけでは所有者の変更を証明できない。 +- Applies to: [PR #36](https://github.com/RCOSDP/RDM-developer-guide/pull/36), head `4cf3a22ea89ff428d4b4fe3228b21bd1029445f5`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r1](2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r1.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-06 §8](../spec/06_documentation_conventions.md#english). +- Used by: PR #36 remediation and the next review. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and boundary + +**Changes required.** Reviewed r1, the `af2ea6e..4cf3a22` diff, surrounding implementation and contracts, and the PR head through GitHub. No real Docker command, stack mutation, installation, credential-file access, commit, push, approval or merge was performed. Temporary fixtures and nonexecuting runners supplied independent probes; the ownership probe is a shell script running against the existing test filesystem model, not a Linux kernel test. + +### Findings + +1. **R2-01 [HIGH; R1-01 remains open] Revalidate at each destructive transition.** [lifecycle.py](../../installer/grdm_dev/lifecycle.py) lines 165–179 validates once, before `down --volumes`, and then passes the path to the root wipe and host deletion without rechecking. An independent temporary-directory probe replaced `volumes` with an outside symlink inside the fake `down` runner. The wipe was submitted for the substituted path; only host `rmtree` subsequently returned exit 14. The sentinel stayed intact because the runner never executed Docker. Revalidate after down and immediately before the wipe and host deletion, reject changed directory identities, and test substitutions at both transitions. Validation in render/up is also a snapshot, not an atomic guarantee across Docker's bind resolution. Document the residual time-of-check/time-of-use (TOCTOU) limit and a trusted, non-concurrently-mutated checkout assumption, or provide stronger confinement; repeated checks alone cannot eliminate every race. + +2. **R2-02 [HIGH; R1-01 remains open] Preserve the mount boundary in the host fallback too.** [compose.py](../../installer/grdm_dev/compose.py) lines 1011–1027 examines only immediate volume entries and compares device numbers. [lifecycle.py](../../installer/grdm_dev/lifecycle.py) line 179 then calls ordinary `shutil.rmtree`, which has no filesystem boundary guard. Thus a writable nested mount skipped by the container's `find -xdev` is traversed by the fallback and its contents can be removed before removing the mountpoint itself fails. Same-filesystem bind mounts also evade a device-number comparison and `-xdev`; `runtime`/the volumes root being mounts is not checked either. This contradicts SPEC-02's claim that deeper mounts are not crossed. Refuse mounted sources/descendants using mount-aware evidence, including same-device bind mounts, or implement an equally bounded deletion path and retain the failure result instead of traversing skipped mounts. This is a static finding; no mount or destructive runtime reproduction was performed. + +3. **R2-03 [MEDIUM; R1-03 partially open] Do not infer a safe filesystem from an ownership mismatch.** [compose.py](../../installer/grdm_dev/compose.py) lines 428–435 returns success for any top-level `chown` that exits zero without attaining the requested UID/GID. That does not establish a macOS share or prove that the actual non-root writers can use it. The final directory pass has no read-back either. In an independent extension of the existing fake filesystem, a final directory chown silently did nothing: the generated shell exited 0 and left a private directory at `0:0`, although its writer needs `1000:1000`. Restrict any no-ownership exception to an explicitly established backend with writer-access evidence; unexpected mismatches must fail. Verify directory hand-back as well as files and cover a silently ineffective chown. Normal nonzero chown failures do propagate through `set -e`; this finding is about ineffective operations reported as success. Changing to GNU tools improves the known image case but does not itself prove every mounted filesystem's result. + +4. **R2-04 [MEDIUM; R1-04 partially open] A rejected bind mount must be a failed prerequisite.** [doctor.py](../../installer/grdm_dev/doctor.py) lines 122–139 treats every exit 125 as a warning, including a Docker engine response that explicitly denies the requested mount. With default non-strict doctor, that allows installation to proceed even when the engine has positively rejected sharing; `GRDM_DOCKER_SHARED=1` was not needed. Distinguish an explicit mount/sharing rejection from an unavailable image or an inconclusive probe, return exit 13 for the former, and test the denied-mount branch. Keep the explicit override visible in the report. The existing tests cover missing files and a pull failure, but not an engine-denied mount. + +### Closure assessment and requested details + +- **R1-01: partially addressed, not closed.** Existing root/runtime/volume symlinks and immediate different-device volumes are rejected before reset/up; render validates selected bind names. R2-01 and R2-02 remain. +- **R1-02: functional correction present; runtime evidence remains external.** Unoconv now waits for ownership and receives CHOWN plus DAC_OVERRIDE, with ALL otherwise dropped. The [exception](../../manifest/hardening.json) names the image, shared private files, a conversion observation, review date `2027-01-31`, and M4 replacement through unoserver. It meets SPEC-03's recorded-exception fields. DAC_OVERRIDE is sufficient for both reading private inputs and creating files in uid-1000 `/tmp`; a read-only bypass would not suffice. It is not a path-scoped permission: an exploited document converter can bypass discretionary access checks throughout its writable container filesystem and shared `wb_tmp`. The internal network and no-new-privileges do not remove that risk. The claim that a shared group is impossible is an assertion about the unchanged image/private-file arrangement, not proof that running the converter as the writer UID or preparing group permissions cannot work. Treat this as a transitional recorded exception, not proof of globally minimal privilege. Prefer a non-root converter during the recorded modernization. This reviewer did not repeat real conversion; the manifest's reported observation has no attached reproducible log in this diff. +- **R1-03: substantially improved, partially open.** Every run walks the tree; private directories are temporarily owned by root, files are assigned first, directories deepest-first, and retry does not trust the top directory. Model tests cover mixed owners, nested 0700, interruption, failure and retry, and 000 refusal. R2-03 remains. The initial ownership transfer also changes a directory's group to root temporarily; failure can leave this intermediate state until retry, as the documented recovery model allows. No broad new owner-step capability was added. +- **Image responsibility:** the manifest now assigns `volume_owner_init` to `postgres`, the template agrees, and rendering tests assert the same image as the postgres service. Its own exception remains root + CHOWN only, read-only root, no-new-privileges, no restart; postgres's broader service exception is not inherited. Selecting GNU tools instead of the observed ineffective uutils is explicitly explained. The actual image is `postgres:9.6` with `base_image_digest: null`, not digest-pinned; SPEC-01 permits null until pinning, but SPEC-02/doctor's “pinned image” wording overstates this. Record/pin the measured image before relying on reproducible GNU behavior across platforms; no claim of actual image inspection is made here. +- **R1-04: WSL correction closed; macOS partial.** WSL2 creates a temporary file in the checkout, performs chmod 0600, reads its mode back and removes it. This replaces path-prefix guessing. Unknown results warn; they do not prove permissions. macOS uses a read-only manifest bind, no network, dropped capabilities and no-new-privileges; the override skips it with a warning. R2-04 remains. The probe lists a known filename rather than proving file identity or all runtime mounts; a stale remote checkout could satisfy it. It may pull the mutable postgres tag, so the table's “read-only” label describes the bind, not all engine effects. +- **R1-05: closed.** The policy fixture is corrected; manifest/policy scan exits 0 with no findings. +- **R1-06: closed.** PR34 r2 is byte-for-byte unchanged relative to `origin/develop`; the relative links are restored. The retired [template pointer](../../installer/grdm_dev/templates/elasticsearch_data_init.json) explicitly explains its historical purpose, and no component lists it as a service. This preserves the review verbatim under SPEC-06 §8; the pointer is not the old runnable implementation. + +### Validation + +From the PR checkout: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +PYTHONPATH=installer python3 -m unittest discover -s tools/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +``` + +Installer: exit 0, 461 tests, 27.026 seconds, 10 skipped. Tools: exit 0, 92 tests, 3.691 seconds. Documentation: exit 0, 103 files checked, 8 exempt, 22 warnings. Manifest/policy: exit 0, zero findings, 595 scanned and 63 non-UTF-8 files skipped. The new untracked r2 record was additionally checked directly with `tools.docs_check.check_file`, because the ordinary checker enumerates tracked files. Passing model/string tests do not establish actual Linux conversion, macOS sharing or WSL2 runtime behavior. Fix the four findings, add the corresponding regressions, and obtain isolated OS/runtime evidence without using the live development stack. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**要修正。** r1、`af2ea6e..4cf3a22` の差分、周辺実装と仕様、GitHub の PR head を確認した。実際の Docker コマンド、スタック変更、導入、資格情報ファイルへのアクセス、commit、push、approve、merge はしていない。独立検査は一時領域と実行しない runner を使用した。所有者検査は既存のファイルシステム模型上で生成シェルを動かしたもので、Linux カーネルの実行試験ではない。 + +### 指摘 + +1. **R2-01 [HIGH; R1-01 未解決] 破壊操作の各段階で再検証する。** [lifecycle.py](../../installer/grdm_dev/lifecycle.py) 165–179 行は `down --volumes` 前に一度だけ検証し、その後の root wipe とホスト削除には再検証せずパスを渡す。独立した一時領域検査で、fake down の中で volumes を外部へのリンクへ差し替えると、そのパスへの wipe が発行され、後段の rmtree だけが14を返した。Docker は実行していないため目印は無傷。down 後、wipe とホスト削除の直前に再検証し、ディレクトリの同一性の変化も拒み、各境界での差し替えを試験する。render/up の検証も一時点の確認で、Docker が bind 元を解決するまでの原子性は保証しない。検査から使用までに変わる競合(TOCTOU)の限界と、信頼された checkout を同時に変更しない前提を明記するか、より強い制限を設ける。再検証だけではすべての競合を消せない。 + +2. **R2-02 [HIGH; R1-01 未解決] ホスト側削除にも mount 境界を適用する。** [compose.py](../../installer/grdm_dev/compose.py) 1011–1027 行は直下の volume と device 番号だけを調べる。[lifecycle.py](../../installer/grdm_dev/lifecycle.py) 179 行の通常の `shutil.rmtree` はファイルシステム境界を守らない。コンテナの `find -xdev` が飛ばした書込可能な深い mount もホスト側は辿り、mount 点自体の削除に失敗する前に中身を消し得る。同じ filesystem の bind mount は device 番号と `-xdev` の両方を通過し、runtime/volumes ルート自体の mount も検査しない。SPEC-02 の「深い mount を越えない」と矛盾する。同じ device の bind を含め mount 情報で拒否するか、同じ境界を守る削除を実装し、飛ばした mount を後段で辿らず失敗として残す。静的指摘であり、mount 作成や破壊的な実機再現はしていない。 + +3. **R2-03 [MEDIUM; R1-03 一部未解決] 所有者の不一致から安全な filesystem と判定しない。** [compose.py](../../installer/grdm_dev/compose.py) 428–435 行は chown が0でも目標 UID/GID にならなければ成功で戻る。これだけでは macOS 共有とも、実際の非 root の書き手が使えるとも証明できない。最後のディレクトリ変更も読み返さない。既存模型を独立に拡張し、最後のディレクトリ chown が黙って無効になる場合を試すと、生成シェルは0で終わり、1000:1000 が必要な private ディレクトリが0:0に残った。所有者を保持しない例外は、確認した共有方式と書き手のアクセス証拠に限定し、予期しない不一致は失敗にする。ファイルだけでなくディレクトリの返却も確認し、成功を返す無効な変更を試験する。通常の非0の chown は set -e で停止する。GNU への変更は既知のイメージ問題を改善するが、各 mount の変更結果まで証明しない。 + +4. **R2-04 [MEDIUM; R1-04 一部未解決] bind mount の明示拒否は前提失敗にする。** [doctor.py](../../installer/grdm_dev/doctor.py) 122–139 行は exit 125 をすべて警告にするため、エンジンが mount を明示的に拒否した場合も通常の doctor は導入を続けさせる。`GRDM_DOCKER_SHARED=1` を明示する必要さえない。共有/mount の明示拒否とイメージ取得不能・判定不能を区別し、前者は13にして試験を追加する。override は報告に残す。既存試験はファイル不在と pull 失敗を扱うが、エンジンの mount 拒否は扱わない。 + +### r1 の判定と指定事項 + +- **R1-01: 一部修正、未解決。** 既存の runtime/ルート/volume のリンクと直下の別 device を reset/up 前に拒否し、render も対象 bind 名を検証する。R2-01・02 が残る。 +- **R1-02: 機能修正あり、実行証拠は外部。** unoconv は所有者設定を待ち、CHOWN と DAC_OVERRIDE 以外を除去する。[例外](../../manifest/hardening.json) はイメージ、共有 private ファイル、変換の観測、見直し日2027-01-31、M4 の unoserver 置換を記録し、SPEC-03 の欄を満たす。DAC_OVERRIDE は private 入力の読取と uid1000 の /tmp への作成に十分で、読取専用の回避権限だけでは足りない。ただしパス限定の権限ではなく、文書変換器を侵害されれば書込可能なコンテナ filesystem と wb_tmp 全体で通常のアクセス検査を越え得る。内部ネットワークと no-new-privileges はその危険を除かない。「共有 group は不可能」は現イメージと private ファイル構成についての説明であり、書き手 UID で動かす方法や group 権限準備の不可能性までは証明していない。記録された暫定例外として扱い、全体で最小権限と断定しない。予定された近代化で非 root の変換器を優先する。今回実変換は再試験しておらず、manifest の観測に対応する再現ログは差分に添付されていない。 +- **R1-03: 大きく改善、一部未解決。** 毎回全体を辿り、private ディレクトリを一時的に root 所有にし、ファイルを先に、ディレクトリを深い順に返す。最上位だけを信頼せず再試行する。模型は所有者混在、入れ子0700、中断、失敗と再試行、000拒否を試す。R2-03 が残る。一時的に group も root へ変えるため、失敗後は再試行まで中間状態が残り得るが、これは文書化した回復モデル内。所有者段に広い capability は増やしていない。 +- **イメージの責務:** manifest は volume_owner_init を postgres に所属させ、template と生成試験も一致する。自身の例外は root+CHOWN のみ、read-only、no-new-privileges、再起動なしで、postgres サービスの広い例外は継承しない。無効だった uutils から GNU を選んだ理由は明記されている。ただし実際は `postgres:9.6`、digest は null で固定 digest ではない。SPEC-01 は固定まで null を許すが、SPEC-02/doctor の「固定イメージ」は過大な表現。プラットフォーム間で GNU の実測挙動に依存する前に実測イメージを記録・固定する。今回イメージ実体は検査していない。 +- **R1-04: WSL 修正は解決、macOS は一部。** checkout に一時ファイルを作り chmod 0600 を読み返して消す方式になり、接頭辞の推測を除いた。不明は警告であり証明ではない。macOS は manifest を read-only bind し、ネットワークなし・capability 除去・no-new-privileges で確認し、override は警告付きで省略する。R2-04 が残る。既知のファイル名の一覧だけなので、内容の同一性や全 runtime mount までは証明せず、古い remote checkout でも通り得る。mutable な postgres tag を pull し得るため、表の「読むだけ」は bind についてでありエンジンの全副作用についてではない。 +- **R1-05: 解決。** fixture 修正済み、manifest/方針検査は0件・終了0。 +- **R1-06: 解決。** PR34 r2 は origin/develop とバイト単位で同一で、相対リンクが復元された。廃止 [template pointer](../../installer/grdm_dev/templates/elasticsearch_data_init.json) は歴史的用途を説明し、どの部品もサービスに列挙しない。SPEC-06 §8 の原文保持を満たす。pointer は旧実行実装そのものではない。 + +### 検証 + +PR checkout で実行した。 + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +PYTHONPATH=installer python3 -m unittest discover -s tools/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +``` + +installer は終了0、461件、27.026秒、10 skip。tools は終了0、92件、3.691秒。文書は終了0、103件、8免除、22警告。manifest/方針は終了0、指摘0件、595走査、非UTF-8の63件を省略。通常の文書検査は追跡済みファイルを列挙するため、新規未追跡 r2 も tools.docs_check.check_file で直接検査した。模型・文字列試験の合格は実 Linux 変換、macOS 共有、WSL2 実行の証明ではない。4指摘の修正と回帰追加、および実機開発スタックを使わない隔離 OS/実行証拠が残る。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r3.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r3.md new file mode 100644 index 0000000..8afe3fa --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r3.md @@ -0,0 +1,76 @@ +# PR36 Preflight and ownership review r3 / 事前検査と所有者設定のレビュー r3 + +> **Summary:** Changes requested at `46bccc0`: reset and mount rejection fixes are present, but the ownership exception still permits inaccessible descendants and the new write probe can truncate existing data. +> **概要:** `46bccc0` は要修正。reset と mount 拒否の修正を確認したが、所有者例外はアクセス不能な子孫を見逃し、新規書込検査は既存データを切り詰め得る。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** writing at a volume root does not prove access to its descendants, and a probe must never reuse an existing filename. / ボリューム直下への書込みは子孫へのアクセスを証明せず、検査は既存のファイル名を再利用してはならない。 +- Applies to: [PR #36](https://github.com/RCOSDP/RDM-developer-guide/pull/36), head `46bccc00b3c417580f5e7bf36652e97fb2195899`; REV(担当レビュワ, Codex Astra). +- Related: [r2](2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r2.md) · [Review index](README.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-06 §8](../spec/06_documentation_conventions.md#english). +- Used by: PR #36 remediation and subsequent review. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and findings + +**Changes requested.** Read r2, reviewed `4cf3a22..46bccc0` and surrounding implementation, and confirmed the open PR head with `gh pr view`. Two code issues remain; unperformed hardware startup tests are not the reason for this verdict. + +1. **R3-01 [MEDIUM; R2-03 partially open] The allowlist fallback checks only the root's usability.** [compose.py](../../installer/grdm_dev/compose.py) lines 443–444 returns before inspecting descendants whenever the top chown is ineffective and the filesystem name matches `virtiofs`, `fakeowner`, `fuse.grpcfuse`, `fuse.sshfs` or `9p`. Lines 458–461 test only a file directly under that root. An independent invocation of the existing shell/filesystem model used a root at `0:0` mode `0777`, a private child at `999:999` mode `0700`, and its file at `999:999` mode `0600`, with ineffective chown. `FS_TYPE=ext4` correctly exited 1; `FS_TYPE=9p` exited 0, left the private tree unchanged and delegated to the access check. A uid-1000 root write is allowed by `0777`, while that uid cannot traverse the child. Thus an incorrect allowlist assumption can pass both stages without detecting the unusable data; the logged exception is visible, but the access failure is silent. This is a model counterexample, not a claim to have measured a particular 9p backend. Verify required access to existing descendants as the actual writer without modifying their contents, or refuse the exception unless the backend/access contract is established sufficiently to exclude this case. Add the writable-root/inaccessible-child regression. An unlisted filesystem with an ineffective top chown now fails correctly, and normal file and directory hand-back results are read back correctly. + +2. **R3-02 [MEDIUM; regression] The write probe may destroy pre-existing data.** [compose.py](../../installer/grdm_dev/compose.py) line 461 runs `: > "$v/.grdm-write-probe"` and then removes that fixed path. An existing regular file is truncated and removed; an existing symlink is followed and its writable target truncated before the link is removed. A temporary-directory probe executing the generated shell, changing only its `/volumes/` prefix to the temporary directory, placed this symlink onto a sentinel containing `KEEP`: the command exited 0, the sentinel became zero bytes, and the symlink disappeared. No Docker or application data was used. This also applies to a target in the same mounted volume and needs no concurrent attacker. Use exclusive creation of a fresh temporary file (for example `mktemp` in the volume) and cleanup only the newly created file; cover both existing regular files and symlinks. + +### r2 closure assessment + +- **R2-01: closed within the documented snapshot boundary.** `volume_root_identity` records device, inode and file type using `lstat`. `run_reset` compares identity and repeats path validation before down, after down before wiping, and after wiping before host removal. The substitution tests reject symlinks, changed directory identities and newly appearing mounts. If the root disappears after down, host deletion is skipped. SPEC-02 explicitly assumes no concurrent mutation and documents the remaining check/use race; same-inode directory replacement is not atomically excluded. No stronger atomic guarantee is claimed. +- **R2-02: closed for the stated host mount-table model.** Linux parses and decodes `/proc/self/mountinfo`; macOS parses `/sbin/mount` and accommodates the Data prefix. Mounts at runtime, volumes, and any depth below volumes are refused, including same-device binds. Read failure returns `None` and refuses. Tests cover depth, boundaries, escapes and unreadable tables. This reads the host process's mount namespace; no real mount experiment was performed. +- **R2-03: partially closed; R3-01 remains.** File verification and per-directory read-back catch silently ineffective chown, and a no-progress private-directory pass fails. The UID 1000/999 checks drop all capabilities and wait for ownership; current profile writers, including the shared-volume unoconv, wait for the relevant check. Unlisted/unknown filesystem mismatches fail. The allowlist's fallback is still insufficient when the root is writable but an existing descendant is inaccessible. The newly added check also introduces R3-02. +- **R2-04: closed for explicit mount-denial diagnostics.** Engine output matching mount denial, unshared paths, invalid mounts or a missing bind source is a prerequisite problem even on exit 125, and doctor returns 13. The denied-mount regression passes. Inconclusive image/network failures still warn, and the explicit override remains reported. + +### Validation and limits + +All required commands completed with exit **0**: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +PYTHONPATH=installer python3 -m unittest discover -s tools/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +``` + +Installer: 478 tests, 30.224 seconds, 10 skipped. Tools: 92 tests, 3.052 seconds. Documentation: 104 checked, 8 exempt, 22 warnings. Manifest/policy: zero findings, 598 scanned, 63 non-UTF-8 skipped. The new untracked r3 document is additionally checked directly with `tools.docs_check.check_file`, since the standard check enumerates tracked files. + +Independent probes used only temporary files and the existing filesystem model. No grdm-dev stack mutation, Docker command, install/up/down/reset, credential-file access, commit, push, approval, merge or closure was performed. Real Linux, WSL2 and Docker Desktop startup remain unverified and are deferred to the later workflow_dispatch and owner hardware; that stated limit is not a blocker in this review. Fix R3-01 and R3-02 and add regressions before passing the code review. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +**要修正(changes requested)。** r2、`4cf3a22..46bccc0` と周辺実装を読み、`gh pr view` で open の PR head を確認した。コード上の2点が残る。実機起動未検証を理由にした判定ではない。 + +1. **R3-01 [MEDIUM; R2-03 一部未解決] allowlist 例外は直下の使用可否しか確認しない。** [compose.py](../../installer/grdm_dev/compose.py) 443–444 行は最上位 chown が無効で filesystem 名が `virtiofs`、`fakeowner`、`fuse.grpcfuse`、`fuse.sshfs`、`9p` なら子孫を調べず戻り、458–461 行は直下のファイル作成だけを試す。既存のシェル/filesystem 模型を独立に呼び出し、root を `0:0`・`0777`、private 子ディレクトリを `999:999`・`0700`、そのファイルを `999:999`・`0600`、chown を無効にした。`FS_TYPE=ext4` は正しく1で終了したが、`FS_TYPE=9p` は0で終了し private ツリーを残してアクセス検査へ委ねた。uid1000 は `0777` の直下に作成できる一方、子へ入れない。allowlist の想定が誤っている場合、両段を通過して既存データのアクセス不能を見逃す。例外のログは出るがアクセス失敗は黙って通る。これは模型による反例であり、特定の9p実装を実測した主張ではない。実際の書き手として既存子孫に必要なアクセスを内容変更なしで検査するか、この場合を排除できる backend/access 契約が確立するまで例外を拒否する。直下は書込可・子はアクセス不可の回帰試験を追加する。未登録 filesystem の無効な最上位 chown は正しく失敗し、通常経路のファイルとディレクトリの返却も読み返している。 + +2. **R3-02 [MEDIUM; 新規退行] 書込検査が既存データを破壊し得る。** [compose.py](../../installer/grdm_dev/compose.py) 461 行は固定名に `: > "$v/.grdm-write-probe"` を実行し、そのパスを削除する。既存の通常ファイルなら切り詰めて削除し、symlink なら書込可能なリンク先を切り詰めてからリンクを消す。一時ディレクトリで生成シェルの `/volumes/` 接頭辞だけを変更し、`KEEP` を入れた sentinel へのリンクを置く独立検査を実行した。終了0で sentinel は0バイトになり、リンクも消えた。Docker やアプリの実データは使っていない。同じ volume 内のリンク先でも成立し、同時変更は不要。volume 内で `mktemp` などの排他的な新規作成を使い、自分が作成したファイルだけを片付ける。既存通常ファイルと symlink の両方を回帰試験する。 + +### r2 の解決状況 + +- **R2-01: 文書化した snapshot 境界内で解決。** `volume_root_identity` は `lstat` の device/inode/type を記録し、`run_reset` は down 前、down 後の wipe 前、wipe 後のホスト削除前に同一性とパスを再検証する。差し替え試験はリンク、別ディレクトリ、新しい mount を拒む。down 後に root が消えればホスト削除は省略する。SPEC-02 は同時変更をしない前提と検証から使用までの競合を明記しており、同じ inode を再利用するディレクトリ差し替えの原子的排除までは保証しない。 +- **R2-02: 示したホスト mount 表モデル内で解決。** Linux は `/proc/self/mountinfo` と escape、macOS は `/sbin/mount` と Data 接頭辞を扱う。runtime/volumes 自体と volumes 以下の任意の深さの mount を、同じ device の bind を含め拒否する。読取失敗は `None` で拒否。深さ・境界・escape・読取不能の試験を確認した。ホストプロセスの mount namespace を読む実装であり、実 mount 実験はしていない。 +- **R2-03: 一部解決、R3-01 が残る。** ファイル検査と各ディレクトリの読み返しは無効な chown を検知し、private ディレクトリの処理が進まない場合も失敗する。UID1000/999 の検査は capability をすべて除去して所有者設定を待ち、現 profile の書き手と共有 volume の unoconv は対応する検査を待つ。未登録/不明 filesystem の不一致は失敗する。ただし直下は書込可で既存子孫がアクセス不能なら例外は不十分。検査の追加は R3-02 も導入している。 +- **R2-04: 明示的な mount 拒否診断について解決。** mount 拒否、非共有パス、不正 mount、bind 元不在を示す engine 出力は125でも前提失敗となり doctor は13を返す。拒否の回帰試験は合格。イメージ/ネットワークの判定不能は警告、明示 override は報告に残る。 + +### 検証と限界 + +英語側に記載した4コマンドはすべて終了 **0**。installer は478件・30.224秒・10 skip、tools は92件・3.052秒、文書は104件・8免除・22警告、manifest/方針は指摘0件・598走査・非UTF-8の63件を省略した。通常の検査は追跡済みファイルだけを列挙するため、新規未追跡 r3 も `tools.docs_check.check_file` で直接検査する。 + +独立検査は一時ファイルと既存模型だけを使用した。grdm-dev スタック変更、Docker コマンド、install/up/down/reset、資格情報ファイル参照、commit、push、approve、merge、close はしていない。実 Linux・WSL2・Docker Desktop の起動は未検証で、後続 workflow_dispatch と所有者の実機へ委ねる。この明示された限界自体はブロッカーにしない。コードレビュー合格には R3-01・02 の修正と回帰試験が残る。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r4.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r4.md new file mode 100644 index 0000000..aef6aaf --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r4.md @@ -0,0 +1,86 @@ +# PR36 Preflight and ownership review r4 / 事前検査と所有者設定のレビュー r4 + +> **Summary:** Changes requested: the two r3 examples are fixed, but a failed traversal is still reported as usable. +> **概要:** 要修正。r3の2例は解消したが、走査失敗を使用可能と報告する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** A successful final pipeline command does not prove that the directory traversal succeeded. / パイプライン末尾の成功はディレクトリ走査の成功を証明しない。 +- Applies to: RDM-developer-guide PR #36, head `e7eb684209bc740d991da99c9e2832e2c2e11573`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [r3](2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r3.md) · [SPEC-02](../spec/02_installer_cli.md). +- Used by: the coordinator's source-absorption decision and follow-up verification. / 調整担当のソース吸収判断と後続検証。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and finding + +**Changes requested. R4-01 [P2]: propagate traversal failures before releasing writers.** In [compose.py](../../installer/grdm_dev/compose.py), line 470 assigns `bad=$(find ... -print | head -n 1)`. POSIX `sh` takes the pipeline status from `head`, so `set -e` does not reject a failed `find`. A directory read/stat failure such as an I/O error can produce only stderr and exit 1; `bad` is empty and line 472 prints `usable`, allowing dependent writers to start despite an incomplete check. This especially matters on the ownership-ignoring filesystem fallback, where this walk is the evidence for access to existing data. + +An independent fault-injection probe executed the unchanged generated shell with its volume prefix redirected into a temporary directory. Only `find` was replaced with a program printing `find: existing-child: Input/output error` to stderr and exiting 1. Real `mktemp` and `rm` ran. The overall exit was **0**, stdout reported `usable by 501`, and no probe file remained. This demonstrates the shell's error propagation, not a measured fault in a particular VM filesystem. No concurrent path mutation is needed. Collect/check the traversal status independently of truncating its output, refuse on failure, and add a regression for failed traversal with no matching stdout; account for intentional early termination if retaining `head`. + +### r3 closure and regression review + +**R3-01: the reported inaccessible-child case is fixed, but R4-01 prevents full closure of fail-closed access verification.** The generated check runs as uid 1000 or 999 with capabilities dropped, after owner initialization; writers wait on successful completion. GNU `find` now checks read/search/write access on directories and readability on non-symlink files, pruning denied directories. The writable-root/private-child, unreadable-file, read-only-directory and usable-tree model tests pass. The walk does not follow symlinks or cross filesystem boundaries. Read-only regular files are intentionally accepted; this is the documented access contract, not a guarantee that every file can be modified. The test model is not an actual uid-1000 kernel execution on this Mac. + +**R3-02: closed.** `mktemp "$v/.grdm-write-probe.XXXXXX"` creates exclusively and cleanup removes only its returned pathname. Tests using actual temporary files confirm preservation of a pre-existing fixed-name regular file, a symlink and its target, and removal of only the new probe. The earlier fixed-name truncation is gone. The documented no-concurrent-mutation boundary still applies. + +Read r3 and the r3-to-head patch plus surrounding owner/dependency logic. The earlier reset identity, mount-table rejection and mount-denial exit handling remain covered by the full tests; no further regression was identified in that scope. + +### Validation and limits + +In a fresh private scratch clone at the exact head, ran: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +PYTHONPATH=installer python3 -m unittest discover -s tools/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +``` + +Observed results, not author claims: + +```toon +checks[4]{name,exit,result}: + installer,0,486 tests / 10 skipped / 33.316 seconds + tools,0,92 tests / 3.016 seconds + docs_check,0,105 checked / 8 exempt / 22 warnings + manifest_check,0,599 scanned / 63 non-UTF-8 skipped / zero findings +``` + +`git diff --check` passed. The separate fault-injection result is a review finding despite the passing suite. Scratch evidence is `/private/tmp/rev-8275-oBBpKc/`, including `probe_pr36.py` and the four check logs. This new untracked record is checked directly with `tools.docs_check.check_file`; the normal checker lists tracked files. Real Linux/WSL2/Docker Desktop startup is still a later hardware prerequisite, not the reason for changes requested. No Docker command, stack mutation, runtime credential-file access, source edit, commit, push, approval, merge or closure was performed. Only the uncommitted record and one PR comment are delivered. + +GitHub checks were all passing at review time. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +**要修正(changes requested)。R4-01 [P2]: 走査失敗を伝播してから書き手を起動すること。** [compose.py](../../installer/grdm_dev/compose.py) 470行は `bad=$(find ... -print | head -n 1)` としている。POSIX `sh` のパイプライン終了値は `head` の値になるため、`set -e` は `find` の失敗を拒否しない。ディレクトリ読取り/statのI/Oエラーなどで標準エラーだけを出して1終了すると、`bad` は空のまま472行で `usable` を表示し、不完全な検査でも依存する書き手が起動する。所有者変更を保持しないfilesystemの例外では、この走査が既存データへのアクセスを確認する根拠なので特に重要である。 + +独立した障害注入で、生成シェルのvolume接頭辞だけを一時ディレクトリへ変更した。`find` だけを `find: existing-child: Input/output error` を標準エラーへ出して1終了するプログラムに置換し、`mktemp` と `rm` は実物を使った。全体は **0終了**、標準出力は `usable by 501`、検査ファイルは残らなかった。特定VMの実障害を測定したものではなく、シェルの失敗伝播を実証したもの。同時パス変更は不要である。走査の終了値を出力の切詰めとは独立して検査し、失敗時は拒否すること。標準出力に該当パスが出ない走査失敗の回帰試験を追加し、`head` を残す場合は意図した早期終了も扱うこと。 + +### r3の解決状況と回帰確認 + +**R3-01: 報告されたアクセス不能な子の例は解消したが、失敗時拒否の確認はR4-01が残る。** 生成検査は所有者初期化後、capabilityを除去したuid1000/999で実行し、書き手は成功を待つ。GNU `find` はディレクトリの読取り・検索・書込みと、symlink以外のファイルの読取りを調べ、拒否したディレクトリをpruneする。直下書込可/private子、読取不能ファイル、読取専用ディレクトリ、使用可能ツリーの模型試験が合格した。symlinkを辿らずfilesystem境界を越えない。読取専用の通常ファイルは意図的に許す文書上の契約であり、全ファイルの変更可能性を保証するものではない。Mac上の模型試験はuid1000での実kernel検査ではない。 + +**R3-02: 解決。** `mktemp "$v/.grdm-write-probe.XXXXXX"` で排他的に作成し、返されたパスだけを削除する。実際の一時ファイルによる試験で、既存固定名の通常ファイル、symlinkとリンク先の保存、新規検査ファイルだけの削除を確認した。以前の固定名による切詰めはなくなった。文書化された同時変更なしの境界は引き続き適用される。 + +r3、r3からheadの差分、周辺の所有者設定と依存関係を確認した。以前のreset同一性検査、mount表による拒否、mount拒否時の終了処理は全体試験で引き続き確認され、この範囲では追加の退行を認めなかった。 + +### 検証と限界 + +正確なheadの専用scratch cloneで英語側の4コマンドを実行し、すべて0終了した。installerは486件・10 skip・33.316秒、toolsは92件・3.016秒、docs_checkは105件・8免除・22警告、manifest_checkは599走査・非UTF-8の63件省略・指摘0件だった。著者の報告ではなく独立実行結果である。`git diff --check` も成功した。試験合格とは別に、障害注入結果を指摘として残す。 + +証跡は `/private/tmp/rev-8275-oBBpKc/` の `probe_pr36.py` と4検査のログにある。通常のdocs_checkは追跡済みファイルを列挙するため、新規未追跡の記録は `tools.docs_check.check_file` でも直接検査する。実Linux/WSL2/Docker Desktop起動は後続の実機前提条件であり、要修正の理由ではない。Dockerコマンド、スタック変更、runtime資格情報ファイル参照、ソース修正、commit、push、approve、merge、closeは行わず、未コミット記録とPRコメント1件だけを成果物とする。 + +レビュー時のGitHubチェックはすべて成功していた。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r5.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r5.md new file mode 100644 index 0000000..af0c1a9 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r5.md @@ -0,0 +1,80 @@ +# PR36 Preflight and ownership review r5 / 事前検査と所有者設定のレビュー r5 + +> **Summary:** Pass for R4-01 and regressions introduced by its fix. Failed walks now stop both checks. +> **概要:** R4-01の修正とその回帰確認は合格。走査失敗は両検査を停止する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Capturing a walk without a pipeline and checking its status preserves failure even when stdout is empty. / パイプなしで走査結果を取得して終了値を確認すると、標準出力が空でも失敗を伝播できる。 +- Applies to: PR #36, `e7eb684..ccb1159`, head `ccb1159a2fb492a90987f41c00dd551740abca67`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [r4](2026-11-10_RDM-developer-guide_PR36_Preflight_Ownership_r4.md) · [SPEC-02](../spec/02_installer_cli.md). +- Used by: the coordinator's source-absorption decision and subsequent platform verification. / 調整担当のソース吸収判断と後続の実機検証。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Pass. R4-01 is closed; no new finding in this fix and its regressions.** Reviewed the r4 finding, the exact patch, and surrounding generated shell and test harness in [compose.py](../../installer/grdm_dev/compose.py) and [test_preflight.py](../../installer/tests/test_preflight.py). This verdict is scoped to the requested round, not a fresh review of all PR changes. + +The access walk and both owner listing walks no longer pipe through `head`. Each command substitution explicitly exits 1 on failure. The opening walk is in the loop body, so the loop-condition exception to `set -e` cannot hide its failure. The remaining modifying walks are standalone commands under `set -e`, and `fix` is invoked directly, outside conditional/AND/OR contexts. The root `stat` is now a standalone assignment under `set -e`; its failure cannot select the ownership-ignoring filesystem fallback. Existing directory read-back rejects an empty failed `stat` result as unequal to the required owner. No additional success-masking path was identified in this scope. + +Whole output is retained instead of truncating at one path. Output is used as quoted diagnostic/comparison text, not reinterpreted as path arguments. This removes early-pipe termination concerns; storage now scales with the matching output. No large-tree performance claim is made. + +### Independent verification + +The four new fault tests execute the generated shell, with only filesystem tools modeled. Their selectors distinguish opening, verification and access listings; the injected failure emits stderr and exits 1 with empty stdout. Loading the two old generator functions from `e7eb684` into memory made **all four tests fail with actual shell exit 0**, without harness errors. Restoring the head functions made **all four pass**. This includes the failed-root-stat case on virtiofs. + +A separate counter-based injection failed each of six owner `find` invocations independently: opening listing, opening mutation, repeated listing, file mutation, file verification and directory hand-back. Every run exited 1 and contained the injected diagnostic. A separate access probe used real `mktemp` and `rm` in a temporary directory and replaced only `find`: exit 1, empty stdout, no `usable by`, and no probe left behind. These are shell/model tests on macOS, not Linux permission or VM filesystem measurements. + +From the designated checkout root, independently ran: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +PYTHONPATH=installer python3 -m unittest discover -s tools/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +git diff --check e7eb684..ccb1159 +``` + +Observed results: + +```toon +checks[5]{name,exit,result}: + installer,0,490 tests / 10 skipped / 33.209 seconds + tools,0,92 tests / 2.959 seconds + docs_check,0,106 checked / 8 exempt / 22 warnings + manifest_check,0,600 scanned / 63 non-UTF-8 skipped / zero findings + diff_check,0,no whitespace errors +``` + +Evidence: `/tmp/pr36-r5-rfBLb5/` contains four check logs and `probe.py` / `probe.log`. The new untracked review record is checked separately with `tools.docs_check.check_file`, since the normal checker lists tracked files. GitHub head matched the requested head and all reported checks were successful. Real Linux/WSL2/Docker Desktop startup remains subsequent platform verification. No Docker command or stack mutation, runtime credential-file access, source edit, commit, push, approval, merge or closure was performed. Deliverables are this uncommitted record and one PR comment. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**合格(pass)。R4-01は解決。この修正とその回帰範囲で新規指摘なし。** r4の指摘、指定差分、[compose.py](../../installer/grdm_dev/compose.py)の生成シェルと[test_preflight.py](../../installer/tests/test_preflight.py)の試験基盤を確認した。今回の判定は指定された範囲に限り、PR全体の新規全面レビューではない。 + +アクセス走査と所有者設定の2つの列挙走査から `head` へのパイプが除去され、各コマンド置換は失敗時に明示的に1終了する。開放走査はループ本体に入り、条件式では `set -e` が無効になる問題も解消した。残る変更用走査は `set -e` 下の独立したコマンドで、`fix` 呼出しも条件式やAND/ORリストの外にある。直下の `stat` は独立した代入になり、失敗して所有者を保持しないfilesystemの例外へ進むことはない。既存のディレクトリ読戻しでも、失敗した `stat` の空出力は必要な所有者と不一致になって拒否される。この範囲で追加の成功への誤変換は認めなかった。 + +最初の1パスに切り詰めず全出力を保持するが、引用された診断・比較文字列として使い、パス引数として再解釈しない。パイプの早期終了問題はなくなり、保持量は一致した出力の量に応じる。大規模ツリーの性能を測定したという主張はしない。 + +### 独立検証 + +追加4テストは、filesystemコマンドを模型に置換して生成シェルを実行する。開放・検証・アクセスの列挙を区別して障害を注入し、標準エラーだけを出して1終了する。`e7eb684` の旧生成関数2つをメモリ内に読み込むと、**シェルが実際に0終了して4件すべて失敗**し、試験基盤のエラーはなかった。headの関数に戻すと**4件すべて成功**した。virtiofsでの直下 `stat` 失敗も含む。 + +別の呼出し回数による障害注入で、所有者設定の6回の `find`(開放列挙、開放変更、再列挙、ファイル変更、ファイル検証、ディレクトリ返却)を個別に失敗させ、すべて1終了と注入した診断を確認した。別のアクセス試験では一時ディレクトリで実際の `mktemp` と `rm` を使用し、`find` だけを失敗させた。1終了、標準出力は空、`usable by` 表示なし、検査ファイルの残存なしだった。macOS上のシェルと模型の試験であり、Linuxの権限やVM filesystemの実測ではない。 + +指定checkoutのルートで英語側の5コマンドを独立実行し、すべて0終了した。installerは490件・10 skip・33.209秒、toolsは92件・2.959秒、docs_checkは106件・8免除・22警告、manifest_checkは600走査・非UTF-8の63件省略・指摘0件、差分の空白検査も成功した。 + +証跡は `/tmp/pr36-r5-rfBLb5/` の4検査ログと `probe.py` / `probe.log`。通常のdocs_checkは追跡済みファイルを列挙するため、新規未追跡のレビュー記録は `tools.docs_check.check_file` でも個別検査する。GitHubのheadは指定値と一致し、表示されたチェックはすべて成功していた。実Linux/WSL2/Docker Desktop起動は後続の実機検証として残る。Dockerコマンド・スタック変更、runtime資格情報ファイル参照、ソース修正、commit、push、approve、merge、closeは行っていない。成果物は未コミットの本記録とPRコメント1件。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR37_Image_Vuln_Reduction_r1.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR37_Image_Vuln_Reduction_r1.md new file mode 100644 index 0000000..b5d7b1f --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR37_Image_Vuln_Reduction_r1.md @@ -0,0 +1,111 @@ +# REV PR37 Image vulnerability reduction r1 / イメージ脆弱性削減レビュー r1 + +> **Summary:** Changes requested at a08e364. The selected y-websocket source has no JWT enforcement, rebuild inputs drift, and upgrade recovery and image smoke coverage remain incomplete. +> **概要:** a08e364 は要修正。選択された y-websocket のソースには JWT 認証が無く、再ビルドの入力が変動し、更新時の復旧手順とイメージ起動試験が不足している。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** an authenticated integration branch does not secure an image built from an older pinned commit, and pinned base images do not freeze application dependencies. / 統合ブランチに認証があっても古い固定コミットから組むイメージは保護されず、ベースイメージの固定だけではアプリケーション依存は固定されない。 +- Applies to: PR #37, head `a08e364e56ace461754033775e756978c268c4bd`, base `fc5eb5bae5a2a531b23dd50ac52247c8329149df`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-01](../spec/01_manifest.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-07](../decisions/ADR-07_Native_Builds_of_EOL_Middleware.md) +- Used by: [PR #37](https://github.com/RCOSDP/RDM-developer-guide/pull/37). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Changes requested.** Read the specifications and ADR before reviewing the complete change. Reviewed pinned integration sources through read-only GitHub API calls; private source text and private URLs are not reproduced here. No Docker operation, live-stack change, or access to `runtime/.env` was performed. No build, migration, login, or vulnerability scan was independently repeated. Only this review file is added locally, without a commit; one Japanese PR comment records the verdict. + +### Findings + +1. **R1-01 — P1: select and verify the authenticated y-websocket source.** [Manifest](../../manifest/upstreams.json) lines 579–580 still select `93251589af25bb65a1397d55a9e787d55d56e9aa`; the [new recipe](../../installer/images/y-websocket/Dockerfile) lines 19–23 copies and executes that source. Its `bin/server.cjs` upgrades every connection without authorization, and `bin/utils.cjs` contains no JWT gate. The integration repository's current `develop`, `bf2cd67051025416de028f6edd16c83d3fc8ba79`, instead loads `auth.cjs`, requires a secret, and enforces token/document authorization. Merely supplying `JWT_SECRET` through Compose cannot enable code absent from the pinned source. The old pin predates this PR, but adopting a rebuilt image with “JWT unverified” does not prove the authenticated client path required by SPEC-03's new version note. Update to a reviewed authentication-bearing pin and test the exact image: valid token and two-client convergence; absent, invalid, expired and wrong-document tokens rejected before document frames; missing secret fails startup. Correct the PR/ADR evidence to identify the tested SHA. + +2. **R1-02 — P2: freeze fakecas module upgrades.** [Dockerfile](../../installer/images/fakecas/Dockerfile) line 19 runs `go get` on four `@latest` modules, followed by `go mod tidy`. The source archive and builder digest are fixed, but the module graph is not. A fresh build can change its binary, toolchain requirements and vulnerability count while retaining tag `9a9ddd73b225-1`. Commit exact upgraded module versions and checksums, build in read-only module mode, and record the resolved versions with the scan evidence. The upstream commit was confirmed through GitHub as an actual CenterForOpenScience/fakecas commit dated 2024-05-22; the provenance problem is the additional unpinned dependencies, not an invented source commit. + +3. **R1-03 — P2: use y-websocket's dependency lock.** [Dockerfile](../../installer/images/y-websocket/Dockerfile) lines 12–13 copy only `package.json` and execute `npm install --omit=dev`; the pinned checkout already has `package-lock.json`. Production and peer dependencies use ranges. The later `COPY . .` can place the original lockfile into the image even though the installed modules were resolved without it. Copy the reviewed lock alongside the package manifest and use `npm ci --omit=dev`; scan and authenticate that exact result. Removing npm/yarn from the final stage is useful, but does not make the runtime dependencies reproducible. + +4. **R1-04 — P2: document and demonstrate ES rollback before switching an existing volume.** [Manifest](../../manifest/upstreams.json) lines 829–852 and the unchanged data-volume mount switch existing 6.3.1 data to 6.8.23. ADR-07 §5 records forward recovery of three documents, but contains no pre-upgrade snapshot, restore instructions, or rollback verification. Elastic supports a 6.x-to-later-6.y upgrade but requires a backup for rollback; reverting the image reference is not a recovery procedure ([Elastic 6.8 upgrade guide](https://www.elastic.co/guide/en/elasticsearch/reference/6.8/setup-upgrade.html)). Add an operator procedure that stops writers, takes and verifies a pre-upgrade snapshot, upgrades a disposable copy, validates templates/documents/aggregations, and restores the pre-upgrade snapshot to a clean 6.3.1 cluster on failure. Record the distribution and any X-Pack metadata/plugins present in the old cluster. Keep this test separate from the live grdm-dev stack. + +5. **R1-05 — P2: close the declared image smoke-test gap.** [Image workflow](../../.github/workflows/images.yml) lines 48–64 builds the new `image_build` recipes, but its runtime case handles only `elasticsearch2`. Elasticsearch6 and fakecas therefore receive no startup or client smoke check; `build_dockerfile` y-websocket is outside the recipe enumeration entirely. The PR acknowledges only the ES6 branch gap. Add isolated hardened ES6 and fakecas checks and an authenticated y-websocket check, with the required database fixture and both platform build coverage. A credential limitation explains why the workflow was omitted but does not verify the omitted behavior. The existing image build check was still pending when inspected; no CI success is claimed for it. + +### Checks that passed and remaining evidence limits + +MC-16 enforces the declared checkout, note, exclusion and path rules. Its build tests verify that `-f` changes while the checkout stays the context and the base digest becomes a label. Additional temporary-directory probes accepted a normal recipe and rejected a symlink escaping the root, traversal, absolute path, directory, empty string and null (exit 0). No MC-16 defect was reproduced. Recipe identity remaining only the integration SHA is an explicit current specification choice; it makes recording the recipe revision especially important. + +All explicit base references in the three recipes are digest-pinned. Elasticsearch verifies the upstream archive with SHA-512 before extraction, and fakecas verifies the commit archive with SHA-256. Fetch/cross-compilation stages use the build platform; the ES final stage copies the pre-created keystore and sets uid 1000. These are source-level checks, not independent download/hash or multi-architecture build results. Fakecas uses uid 65534, consistent with its service template, although ADR-07's generic rule still says uid 1000 and official release artifacts; clarify the documented exception for a source build. + +An in-memory rendering of the real service templates confirmed ES6 and y-websocket as uid 1000, fakecas as uid 65534, all with read-only root, `cap_drop: ALL` and `no-new-privileges`. ES6 logs and `/tmp` are writable tmpfs; data remains a named volume handled by the generic owner initializer. Removing the ES6 exception is structurally consistent. RabbitMQ and unoconv retain their recorded user/read-only/capability exceptions; sharejs retains the default non-root/read-only baseline. None was dynamically proven by this review. + +The pinned osf.io requirements use `elasticsearch==6.3.1` and `django-elasticsearch-metrics==5.0.0`, separately from `elasticsearch2==2.5.0`. The claimed template/write/aggregation operations do not inherently require X-Pack, so OSS is a plausible fit for that limited usage. The forward data recovery and complete client-path compatibility remain author-reported evidence, not an independently reproduced guarantee for arbitrary 6.3.1 cluster metadata. + +ADR-07's English/Japanese counts agree with the PR: ES6 37/236 → 2/50, fakecas 1/57 → 0/2, y-websocket 1/12 → 0/0, RabbitMQ 0/7 → 0/7, unoconv 147/1140 unchanged, sharejs 394/1588 unchanged (CRITICAL/HIGH). They correctly distinguish rejected candidate results and disclose the database date and architecture difference. No raw scan report/image digest supporting these measurements is attached in the changed files, so this review verifies transcription only. Preserve raw reports, exact image IDs/digests, resolved dependencies and probe commands, particularly after R1-01–03. ADR-07 should explicitly state the JWT evidence gap; it currently reports only convergence. Its old `elasticsearch_data_init` wording should also be reconciled with the generic `volume_owner_init`. SPEC-01 has two separate 0.10 header entries; consolidate them on revision. + +### Executed validation + +Commands ran from the reviewed checkout root. The following is a review observation record, not a canonical manifest excerpt. + +```toon +checks[5]{command,result,exit}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","493 tests; 10 skipped",0 + "python3 -m unittest discover -s tools/tests","93 tests",0 + "python3 tools/docs_check.py","107 files; 8 exempt; 23 warnings before adding this review",0 + "python3 tools/manifest_check.py","manifest 0 findings; policy 605 scanned, 63 skipped, 0 findings",0 + "in-memory service render and temporary MC-16 path probes","expected controls and path rejections",0 +``` + +The initial installer test invocation without `PYTHONPATH=installer` exited 1 with import errors (27 discovered, 20 errors); rerunning with the repository CI command produced the passing result recorded here. The ten skips were reported, not counted as executed successes. No commit, push, approval, merge or close was performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**Changes requested(要修正)。** 仕様と ADR を読んでから差分全体を確認した。固定された統合ソースは GitHub API の読取で確認し、非公開ソースの本文や非公開 URL はここに転載しない。Docker 操作、稼働スタックの変更、`runtime/.env` の参照は行っていない。ビルド、移行、ログイン、脆弱性走査の独立再実行はしていない。ローカルにはレビュー文書だけを追加し、コミットせず、日本語の PR コメント1件で判定を記録する。 + +### 指摘 + +1. **R1-01 — P1: 認証を含む y-websocket のソースを選び、検証する。** [manifest](../../manifest/upstreams.json) 579–580行は依然として `93251589af25bb65a1397d55a9e787d55d56e9aa` を選び、[新レシピ](../../installer/images/y-websocket/Dockerfile) 19–23行はそのソースをコピーして起動する。その `bin/server.cjs` は認可せず全接続を upgrade し、`bin/utils.cjs` にも JWT の検査はない。一方、統合リポジトリの現在の `develop`、`bf2cd67051025416de028f6edd16c83d3fc8ba79` は `auth.cjs` を読み、秘密鍵を必須にしてトークンと文書の認可を実施している。Compose で `JWT_SECRET` を渡すだけでは、固定ソースに無い機能は有効にならない。古い固定値は本 PR より前から存在するが、「JWT 未検証」の組み直したイメージを採用しても SPEC-03 の新版が求める認証込みの実経路は証明できない。レビュー済みの認証実装を含むコミットへ更新し、そのイメージで有効トークンによる2クライアントの収束、トークン無し・不正・期限切れ・別文書の拒否と文書フレーム非送信、秘密鍵無しの起動拒否を確認する。PR/ADR に検証した SHA を明記する。 + +2. **R1-02 — P2: fakecas の依存更新を固定する。** [Dockerfile](../../installer/images/fakecas/Dockerfile) 19行は4モジュールを `@latest` で取得して `go mod tidy` する。ソースアーカイブとビルダーの digest が固定でも、モジュール構成は固定されない。新規ビルドでバイナリ、必要な Go の版、脆弱性件数が変わっても tag は `9a9ddd73b225-1` のままである。更新後の厳密な版とチェックサムを管理し、モジュール変更を禁止してビルドし、解決した版を走査証跡に残す。指定コミットは CenterForOpenScience/fakecas に実在する2024-05-22のコミットと確認した。問題は架空の出自ではなく、その上に加える未固定の依存である。 + +3. **R1-03 — P2: y-websocket の依存ロックを使う。** [Dockerfile](../../installer/images/y-websocket/Dockerfile) 12–13行は `package.json` だけをコピーして `npm install --omit=dev` を実行するが、固定 checkout には既に `package-lock.json` がある。実行時依存と peer 依存に範囲指定がある。後段の `COPY . .` は、実際のインストールに使わなかった元のロックをイメージへ入れうる。レビュー済みのロックを package manifest と一緒にコピーし、`npm ci --omit=dev` を使い、その結果を走査・認証試験する。最終段から npm/yarn を除くことは有効だが、実行時依存の再現性は保証しない。 + +4. **R1-04 — P2: 既存ボリューム切替前の ES 復旧手順を記録・実証する。** [manifest](../../manifest/upstreams.json) 829–852行と従来のデータマウントは、既存の6.3.1データを6.8.23へ切り替える。ADR-07 §5 は3文書の前進移行を記録するが、更新前 snapshot、復元手順、復旧検証が無い。Elastic は6.xから後の6.yへの更新を認めるが、戻すにはバックアップを必要とする。イメージ参照を戻すだけでは復旧手順にならない([Elastic 6.8 更新ガイド](https://www.elastic.co/guide/en/elasticsearch/reference/6.8/setup-upgrade.html))。書込停止、更新前 snapshot の取得と確認、使い捨てコピーの更新、template・文書・集計の検証、失敗時に空の6.3.1クラスタへ更新前 snapshot を復元する手順を追加する。旧クラスタの配布形態と X-Pack のメタデータ・プラグインの有無も記録する。稼働中の grdm-dev とは別に検証する。 + +5. **R1-05 — P2: 起動試験の不足を閉じる。** [イメージ workflow](../../.github/workflows/images.yml) 48–64行は新しい `image_build` レシピを組むが、実行時の分岐は `elasticsearch2` だけである。ES6 と fakecas の起動・クライアント試験は無く、`build_dockerfile` の y-websocket は列挙対象外である。PR は ES6 の分岐不足だけを明記している。必要なデータベースを含む隔離環境で、堅牢化した ES6・fakecas、認証した y-websocket の試験と両アーキテクチャのビルド検証を追加する。認証権限の制限は workflow を含めなかった理由にはなるが、その挙動の検証にはならない。確認時の image build check は pending であり、CI 成功とは扱っていない。 + +### 確認できた点と証跡の限界 + +MC-16 は仕様にある checkout、note、併用禁止、パス制限を検査している。ビルド試験は context を固定 checkout のまま保って `-f` だけを替え、base digest をラベルへ渡すことを確認する。追加の一時ディレクトリでの検査では通常のレシピを許可し、root 外への symlink、親への遡上、絶対パス、ディレクトリ、空文字、null を拒否した(終了0)。MC-16 の不具合は再現していない。レシピの識別が統合 SHA の tag のままなのは現仕様の明示的な選択であり、レシピ版を証跡へ残すことが特に重要になる。 + +3レシピの明示的なベース参照はすべて digest 固定である。ES は展開前に upstream archive を SHA-512 で、fakecas はコミット archive を SHA-256 で検証する。取得・クロスコンパイル段は build platform を使い、ES 最終段は作成済み keystore をコピーして uid 1000 を設定する。これはソース上の確認で、独立したダウンロード・ハッシュ照合や複数アーキテクチャのビルド結果ではない。fakecas の uid 65534 はサービス定義と一致するが、ADR-07 の一般則はまだ uid 1000 と公式リリース成果物を指定しているため、ソースビルドに対する例外を文書化したい。 + +実テンプレートをメモリ内で描画し、ES6 と y-websocket は uid 1000、fakecas は uid 65534、すべて読み取り専用 root・`cap_drop: ALL`・`no-new-privileges` になると確認した。ES6 のログと `/tmp` は tmpfs、データは汎用所有者初期化の対象である名前付きボリュームに残る。ES6 の堅牢化例外削除は構造上整合する。RabbitMQ と unoconv は記録済みの user/read-only/capability 例外を維持し、sharejs は非 root・read-only の既定を維持する。今回これらの実行時動作は実証していない。 + +固定された osf.io の requirements は `elasticsearch==6.3.1` と `django-elasticsearch-metrics==5.0.0` を使い、`elasticsearch2==2.5.0` は別に存在する。主張される template・書込・集計自体に X-Pack は必要でなく、限定された用途には OSS の選択は妥当と考えられる。ただし前進移行とクライアント全経路の互換性は作者の報告であり、任意の6.3.1クラスタのメタデータへの独立した保証ではない。 + +ADR-07 の英和の件数は PR と一致する。ES6 37/236 → 2/50、fakecas 1/57 → 0/2、y-websocket 1/12 → 0/0、RabbitMQ 0/7 → 0/7、unoconv 147/1140 据置、sharejs 394/1588 据置(CRITICAL/HIGH)。不採用候補の結果も区別し、DB の日付とアーキテクチャ差を明記している。変更ファイルには測定を裏付ける raw scan report とイメージ digest が添付されておらず、今回確認できるのは転記の一致までである。特に R1-01–03 の修正後、raw report、厳密なイメージ ID/digest、解決した依存、検証コマンドを残す。ADR-07 は収束だけでなく JWT の証跡不足を明示する必要がある。また古い `elasticsearch_data_init` の記述を汎用 `volume_owner_init` と整合させたい。SPEC-01 の0.10ヘッダが2つある点も改版時に統合したい。 + +### 実行した検証 + +作業ディレクトリは対象 checkout のルート。次はレビューの観測記録であり、正本 manifest の抄録ではない。 + +```toon +checks[5]{command,result,exit}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","493件、うち10件スキップ",0 + "python3 -m unittest discover -s tools/tests","93件",0 + "python3 tools/docs_check.py","レビュー追加前107ファイル、8除外、23警告",0 + "python3 tools/manifest_check.py","manifest 0件、policy 605走査・63除外・指摘0件",0 + "メモリ内サービス描画と一時領域のMC-16パス検査","期待する統制とパス拒否",0 +``` + +最初に `PYTHONPATH=installer` を付けずに実行した installer 試験は import error で終了1(27件検出、20エラー)だった。リポジトリの CI と同じコマンドで再実行して記載の合格結果を得た。10件のスキップは実行済みの合格として数えていない。commit・push・approve・merge・close は行っていない。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR37_Image_Vuln_Reduction_r2.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR37_Image_Vuln_Reduction_r2.md new file mode 100644 index 0000000..3b02191 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR37_Image_Vuln_Reduction_r2.md @@ -0,0 +1,85 @@ +# REV PR37 Image vulnerability reduction r2 / イメージ脆弱性削減レビュー r2 + +> **Summary:** Changes requested at 95bf10e: reproducibility is fixed, but the locked ws version has two fixable HIGH vulnerabilities. +> **概要:** 95bf10e は要修正。再現性は改善したが、固定された ws に修正可能な HIGH が2件残る。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** a reproducible lockfile can preserve fixable vulnerabilities, and JWT rejection does not bypass the WebSocket upgrade parser. / 再現可能なロックでも修正可能な脆弱性を固定しうる。JWT を拒否しても WebSocket の upgrade 処理は通る。 +- Applies to: PR #37, head `95bf10e71ee926aeef58c5841f15b4820db4b813`, delta `a08e364..95bf10e`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r1](2026-11-10_RDM-developer-guide_PR37_Image_Vuln_Reduction_r1.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-07](../decisions/ADR-07_Native_Builds_of_EOL_Middleware.md) +- Used by: [PR #37](https://github.com/RCOSDP/RDM-developer-guide/pull/37). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Changes requested. R2-01 / P2: upgrade ws to 6.2.4 or a reviewed later compatible version in the integration lockfile, then pin that commit here.** Keep `npm ci`; do not restore floating installation. The exact pinned lock resolves runtime `ws` to 6.2.2. The maintainer advisories identify a header-count crash fixed in 6.2.3 ([GHSA-3h5v-q93c-6h6q](https://github.com/websockets/ws/security/advisories/GHSA-3h5v-q93c-6h6q)) and fragment-memory exhaustion fixed in 6.2.4 ([GHSA-96hv-2xvq-fx4p](https://github.com/websockets/ws/security/advisories/GHSA-96hv-2xvq-fx4p)). Both are HIGH. The server calls `handleUpgrade` even when authorization fails, before closing 4401; authentication is therefore not evidence that the handshake parser is unreachable. Payload limits alone do not establish immunity to both advisories. No exploit was run. + +The current M1 gate is report-only, so 0 CRITICAL / 2 HIGH is not itself a mandatory gate failure. Nevertheless, retaining an available same-major patch solely because its lockfile belongs to another repository is inadequate for this vulnerability-reduction change. Upgrade the integration lock, rerun both-platform builds, JWT rejection/convergence checks and scans, and update the image IDs and ADR counts. This is a review change request, not a claim that the M1 scanner must fail. + +### R1 disposition + +1. **R1-01: resolved on source and reported image evidence.** Manifest now pins `bf2cd67051025416de028f6edd16c83d3fc8ba79`. Read-only GitHub API inspection confirms HS256 verification, required secret/expiry/subject, document binding and duplicate-token rejection. PR evidence reports seven rejected-token cases with close 4401 and zero frames, valid two-provider convergence, and missing-secret exit 1 on both server architectures. +2. **R1-02: resolved.** The recipe copies exact `go.mod`/`go.sum`, removes `@latest` and tidy, sets `GOTOOLCHAIN=local` and `GOFLAGS=-mod=readonly`, downloads/verifies modules and bumps the tag to `9a9ddd73b225-2`. Crypto/net/sys/text are 0.58.0/0.62.0/0.50.0/0.44.0. The PR records identical binary SHA-256 from two uncached builds; reproducibility was not independently rebuilt here. +3. **R1-03: mechanical fix resolved; security follow-up R2-01 remains.** The recipe copies the lock and uses `npm ci --omit=dev`. The new 0/2 replaces the earlier unlocked 0/0 honestly, but should be removed with the available ws patch. +4. **R1-04: resolved for the documented limited cluster.** ADR-07 §6 records writers stopped, verified pre-upgrade snapshot, disposable-copy upgrade, and restoration to clean 6.3.1. The reported three documents, template and aggregation survive both paths. Distribution, plugins and X-Pack metadata are recorded. ML/security-state clusters are explicitly untested; this is not general OSS migration approval. These are author-reported isolated tests, not reviewer-repeated recovery. +5. **R1-05: accepted with a stated automation limit.** Per this review's scope, equivalent local smoke evidence is sufficient while the owner's workflow token scope is pending. PR evidence names image IDs for all three images on arm64/amd64, hardened runtime controls, ES metrics-client operations, fakecas PostgreSQL fixture/login/ticket paths, and y-websocket authentication/convergence. Clients ran on arm64, including against amd64 servers. Existing image CI succeeded but still enumerates only `image_build` and smoke-tests ES2; it does not prove the new runtime checks or y-websocket build. The proposed workflow is not applied, and its fakecas curl form is explicitly unexecuted. Preserve this limitation until the owner applies and validates automation; it is not an additional blocker for r2. + +### Validation and limits + +The full delta and r1 record were read. GitHub reports all nine checks successful at the reviewed head. Private integration source was inspected through read-only API calls and is not reproduced here. No Docker command, live-stack change, `runtime/.env` read, build, scan or runtime authentication test was performed by this reviewer. The PR now supplies six image IDs, scan summaries and a binary hash; raw scan/probe logs are not attached in the delta. Runtime acceptance relies on the stated author evidence. + +Commands run from the reviewed checkout root; this TOON is an observation record, not canonical manifest data: + +```toon +checks[4]{command,result,exit}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","493 tests; 10 skipped",0 + "python3 -m unittest discover -s tools/tests","93 tests",0 + "python3 tools/docs_check.py","108 checked; 8 exempt; 24 non-failing warnings",0 + "python3 tools/manifest_check.py","0 findings; policy 608 scanned and 63 skipped",0 +``` + +The untracked r2 file is checked separately using `docs_check.check_file`, because the normal checker enumerates tracked files. Only r2 is added locally, without staging or commit, and one Japanese PR comment is posted. No approval, merge, close or push is performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**Changes requested(要修正)。R2-01 / P2: 統合リポジトリのロックで ws を6.2.4以降の互換性を確認した版へ更新し、そのコミットをここで固定する。** `npm ci` は維持する。固定ロックの実行時 `ws` は6.2.2である。開発元の勧告では、ヘッダ数によるクラッシュは6.2.3([GHSA-3h5v-q93c-6h6q](https://github.com/websockets/ws/security/advisories/GHSA-3h5v-q93c-6h6q))、断片によるメモリ枯渇は6.2.4([GHSA-96hv-2xvq-fx4p](https://github.com/websockets/ws/security/advisories/GHSA-96hv-2xvq-fx4p))で修正され、両方 HIGH である。サーバーは認可失敗時も `handleUpgrade` を呼んでから4401で閉じるため、JWT 認証だけでは handshake 処理へ到達しない証明にならない。payload 制限だけでも両勧告への安全性は証明できない。攻撃実証は行っていない。 + +現在の M1 は報告のみで、0 CRITICAL / 2 HIGH 自体は必須ゲート違反ではない。ただし同一メジャーに修正版があり、ロックが別リポジトリにあるという理由だけでは、この脆弱性削減変更で据え置く根拠として不十分である。統合側のロック更新、両アーキテクチャのビルド、JWT 拒否と収束、走査を再実施し、イメージ ID と ADR の件数を更新する。これはレビュー上の修正要求であり、M1 のスキャナーが失敗すべきという主張ではない。 + +### r1 の確認結果 + +1. **R1-01: ソースと報告されたイメージ証跡で解決。** manifest は `bf2cd67051025416de028f6edd16c83d3fc8ba79` を固定した。GitHub API の読取で HS256、秘密鍵・期限・主体の必須化、文書との対応、重複トークンの拒否を確認した。PR は両サーバーアーキテクチャで7種の拒否が4401・フレーム0、有効トークンの2クライアント収束、秘密鍵無しの終了1を報告している。 +2. **R1-02: 解決。** 厳密な `go.mod`/`go.sum` をコピーし、`@latest` と tidy を除去した。`GOTOOLCHAIN=local`、`GOFLAGS=-mod=readonly`、モジュール取得・検証を使用し、tag は `9a9ddd73b225-2`。crypto/net/sys/text は0.58.0/0.62.0/0.50.0/0.44.0。PR にキャッシュなし2回のバイナリ SHA-256 一致がある。独立再ビルドはしていない。 +3. **R1-03: ロック使用の修正は解決。安全性は R2-01 が残る。** `npm ci --omit=dev` とロックのコピーを確認した。非固定時の0/0から0/2への訂正は適切だが、利用可能な ws 修正版で解消すべきである。 +4. **R1-04: 記載の限定されたクラスタについて解決。** ADR-07 §6 に書込停止、更新前 snapshot の検証、使い捨てコピーの更新、空の6.3.1への復元がある。3文書・template・集計が両経路で保たれたと報告される。配布形態、プラグイン、X-Pack メタデータを記録し、ML・security 状態を持つクラスタは未試験と明示する。一般的な OSS 移行の承認ではない。作者の隔離試験報告であり、レビュワによる再実証ではない。 +5. **R1-05: 自動化の限界を明記して受容。** 今回の依頼に従い、所有者の workflow 用 token scope 待ちの間は同等のローカル smoke 証跡を受容する。PR は3イメージ×arm64/amd64の ID、堅牢化、ES metrics クライアント操作、fakecas の PostgreSQL フィクスチャと login/ticket 経路、y-websocket 認証と収束を記録している。クライアントは amd64 サーバーに対しても arm64 上で動作した。既存 image CI は成功したが、`image_build` の列挙と ES2 の smoke だけで、新規 runtime 試験や y-websocket ビルドを証明しない。提案 workflow は未適用で、fakecas の curl 形式も未実行と明記されている。所有者による適用・検証までこの限界を残す。r2 の追加阻害要因とはしない。 + +### 検証と限界 + +差分全体と r1 を読み、対象 head の GitHub check 9件の成功を確認した。非公開の統合ソースは読取 API で確認し、転載していない。レビュワは Docker 操作、稼働スタック変更、`runtime/.env` 参照、ビルド、走査、実行時認証試験をしていない。PR には6イメージの ID、走査集計、バイナリ hash が追加されたが、差分には raw scan/probe log が無く、実行時の受容は作者の証跡による。 + +対象 checkout ルートで実行した観測記録。正本 manifest の抄録ではない。 + +```toon +checks[4]{command,result,exit}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","493件、10件スキップ",0 + "python3 -m unittest discover -s tools/tests","93件",0 + "python3 tools/docs_check.py","108件確認、8除外、非失敗警告24件",0 + "python3 tools/manifest_check.py","指摘0件、policy 608走査・63除外",0 +``` + +通常の docs_check は追跡ファイルだけを列挙するため、未追跡の r2 は `docs_check.check_file` で別途検査する。ローカル追加は r2 のみで、stage・commit せず、日本語 PR コメントを1件投稿する。approve・merge・close・push は行わない。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR37_Image_Vuln_Reduction_r3.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR37_Image_Vuln_Reduction_r3.md new file mode 100644 index 0000000..89e928f --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR37_Image_Vuln_Reduction_r3.md @@ -0,0 +1,65 @@ +# REV PR37 Image vulnerability reduction r3 / イメージ脆弱性削減レビュー r3 + +> **Summary:** Pass for 95bf10e..88e4268; R2-01 is resolved by pinning the reviewed ws update. +> **概要:** 95bf10e..88e4268 は合格。レビュー済み ws 更新の固定で R2-01 は解決した。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** the dependency fix and the consuming manifest must name the same tested commit while preserving the browser's authentication contract. / 依存修正と利用側manifestは同じ試験済みコミットを指し、ブラウザの認証契約を維持する必要がある。 +- Applies to: PR #37, head `88e4268b12dfdb14777840ca5c2db0c7c2880a09`, delta `95bf10e..88e4268` only; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r2](2026-11-10_RDM-developer-guide_PR37_Image_Vuln_Reduction_r2.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-04](../spec/04_acceptance_tests.md) · [ADR-07](../decisions/ADR-07_Native_Builds_of_EOL_Middleware.md). +- Used by: [PR #37](https://github.com/RCOSDP/RDM-developer-guide/pull/37). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Pass. R2-01 resolved; no new blocking findings in this delta.** The manifest pins `09eb0a9f4af623760a15e100790381560b9e8ce0`, whose only change from the authenticating parent is ws 6.2.6 in the lockfile. The expected image tag follows that SHA. The Docker recipe still uses `npm ci --omit=dev`. ADR-07's English and Japanese sections agree on the new SHA, reported 0/0 scan result and reason for keeping 4401 after upgrade. The r2 record is preserved. + +Independent review of integration PR #4 found the same-major patch compatible with the used APIs and passed 25 authentication tests plus room-release on macOS Node v26.12.0. Invalid-token cases assert 4401 and zero document messages; valid providers converge and rejected sockets cannot write. SPEC-04 and the wiki recovery client require 4401. The [browser protocol contract](https://websockets.spec.whatwg.org/#feedback-from-the-protocol) does not expose failed HTTP handshake reasons, so moving rejection to HTTP 401 would require a coordinated contract/client change. This does not remove the unauthenticated handshake surface; the ws patch addresses the two reported advisories. + +### Checks and remaining limits + +Commands ran from the assigned checkout root. Observation record, not canonical manifest data: + +```toon +checks[4]{command,result,exit}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","493 tests; 10 skipped",0 + "python3 -m unittest discover -s tools/tests","93 tests",0 + "python3 tools/docs_check.py","109 checked; 8 exempt; 24 non-failing warnings",0 + "python3 tools/manifest_check.py","609 scanned; 63 skipped; zero findings",0 +``` + +Both-platform image rebuilds, authentication probes and Trivy 0/0 are author-reported PR evidence, including new image IDs; this review did not repeat builds or scans. R1-05's accepted automation limitation remains: the workflow proposal is unapplied, and the fakecas curl form is unexecuted. Merge integration PR #4 before relying on its pin as integrated history; if merge changes its SHA, repin and revalidate. No other r1 findings were reopened outside the requested delta. No Docker state changes or `runtime/.env` access occurred. Only this uncommitted review record is added to the assigned checkout, checked separately with `docs_check.check_file` because it is untracked, with one Japanese PR comment and no approval, merge, close, push or commit. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**Pass(合格)。R2-01解決。この差分に新たな阻害指摘なし。** manifest は `09eb0a9f4af623760a15e100790381560b9e8ce0` を固定し、認証実装済み親コミットからの変更はロックのws 6.2.6のみである。期待するイメージタグも同じSHAに追従する。Dockerレシピの `npm ci --omit=dev` は維持される。ADR-07の英和は新SHA、報告された走査0/0、upgrade後の4401を維持する理由で一致し、r2記録は保持される。 + +統合PR #4の独立確認で、同一メジャーパッチは使用APIと互換性があり、macOS Node v26.12.0で認証25件とroom-releaseに合格した。不正トークンのケースは4401・文書メッセージ0を検査し、正常なproviderは収束し、拒否接続は書き込めない。SPEC-04とwikiの回復クライアントは4401を必要とする。[ブラウザのプロトコル契約](https://websockets.spec.whatwg.org/#feedback-from-the-protocol)はHTTP handshake失敗の理由を公開しないため、HTTP401への変更には契約とクライアントの同時変更が必要となる。未認証handshake経路は残るが、指摘された2勧告にはwsパッチで対応している。 + +### 検査と残る限界 + +指定checkoutルートで実行した。正本manifestではなく観測記録である。 + +```toon +checks[4]{command,result,exit}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","493件; 10件スキップ",0 + "python3 -m unittest discover -s tools/tests","93件",0 + "python3 tools/docs_check.py","109件確認; 8除外; 非失敗警告24件",0 + "python3 tools/manifest_check.py","609走査; 63除外; 指摘0件",0 +``` + +両アーキテクチャの再ビルド、認証probe、Trivy0/0は新しいイメージIDを含む作者のPR証跡であり、レビュワによるビルド・走査再実行ではない。R1-05で受容した自動化の限界は継続し、workflow案は未適用、fakecasのcurl形式は未実行である。統合済み履歴として固定を利用する前に統合PR #4をmergeし、merge方式でSHAが変わる場合は再固定・再検証する。指定差分外のr1指摘は再審査していない。Docker状態変更や `runtime/.env` 参照は行っていない。指定checkoutへの追加は未commitのr3記録のみ。未追跡のため `docs_check.check_file` で別途検査し、日本語PRコメントを1件投稿する。approve・merge・close・push・commitは行わない。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR39_CAS_Native_Image_r1.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR39_CAS_Native_Image_r1.md new file mode 100644 index 0000000..27cb907 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR39_CAS_Native_Image_r1.md @@ -0,0 +1,83 @@ +# REV PR39 CAS native image review r1 / CAS ネイティブイメージのレビュー r1 + +> **Summary:** Changes requested: generated keys are usable, but validation accepts manually supplied keys that CAS cannot use. +> **概要:** 修正要求。生成する鍵は使えるが、手動で設定した CAS が使えない鍵を検証が受理する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** A byte count alone does not establish that a key is usable by its consumer. / バイト数だけでは、鍵を使う側で利用可能とは保証できない。 +- Applies to: PR #39, head `bfa031c8b22b4504a9d370f8edbfac7515c158b0`, base `021dce68a334750ac249c6f94e8f86074db7a369`; REV(担当レビュワ, Codex Astra). +- Related: [Reviews](README.md) · [SPEC-01](../spec/01_manifest.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-07](../decisions/ADR-07_Native_Builds_of_EOL_Middleware.md). +- Used by: [PR #39](https://github.com/RCOSDP/RDM-developer-guide/pull/39). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and required change + +**Changes requested — R1-01 (P2): validate usable keys before rendering.** In `installer/grdm_dev/secrets.py:230–238`, `cas_key_problems` checks only UTF-8 byte lengths. The documented manual migration can therefore supply an encryption key consisting of 43 exclamation marks, or quoted institution JWE/JWT keys consisting of 32 spaces. All three independently return no validation findings and `compose render` exits 0. I reproduced this using temporary test roots, synthetic inputs, and the existing mocked render helper; no real credentials or running stack were used. + +CAS 4.1.5's `DefaultCipherExecutor` interprets the TGC encryption key as the base64url octet value of a JWK; 43 arbitrary characters do not guarantee a 32-byte encryption key. The pinned integration's institution-secret setters explicitly reject blank values, including the accepted 32-space examples. This defeats the new pre-start check and permits a stopped CAS or a failure when issuing its cookie after a manual upgrade. Validate the TGC encryption alphabet and decoded byte count, reject blank institution keys, and add negative render tests that require exit 2, no generated Compose file, and diagnostics containing key names only. Keep the valid generated keys passing. Do not incorrectly decode the TGC signing key when matching CAS: that implementation consumes its raw string bytes for signing. + +### Checks completed + +- Generation uses `token_urlsafe`: TGC encryption is 43 ASCII characters encoding 32 random bytes; signing is 86 ASCII characters from 64 random bytes (CAS uses the 86 raw bytes); institution JWE is exactly 32 ASCII bytes from 24 random bytes; JWT is 43 ASCII bytes, satisfying the 32-byte minimum. Generated values meet the consumer requirements. +- Checked CAS integration commit `22610b7681a29241365108e5129bcd43ade4610e` and osf.io integration commit `389415a473361fdaa3c347e84d95639b9096a9e9` through read-only GitHub API calls. The same institution variables feed CAS and all five osf.io service templates; generated `api_local.py` assigns UTF-8 bytes to `JWE_SECRET` and `JWT_SECRET`, loaded after API defaults. The institution authentication consumer decrypts and verifies with those settings. +- New secrets appear as environment references, not literals in command arguments, properties, Python settings, service JSON, or reports. Secret writes use mode 0600 under a 0700 runtime directory; generated config files use 0644 and contain no secret values. Both forced init and rotate remove the four retired CAS keys. This is a static assessment of the new path, not an assertion about every pre-existing secret-handling path. +- The service regex escapes the loopback address and fixes the scheme, port, and following slash. It cannot accept a different hostname, user-info authority, or port suffix; allowing all paths on that one web origin is intentional. The missing terminal `$` does not broaden the permitted origin. The Secure overrides are in the generated loopback HTTP development configuration; the pinned image defaults remain secure. CAS has no published host port and osf.io continues to use fakecas. +- CAS waits for successful `osf_init`; its root is read-only, uid/gid is 1000, capabilities are dropped, no-new-privileges is set, and only `/tmp` is writable. Its hardening exception is removed without adding another. +- The pinned Dockerfile runs Maven and Jetty setup in BUILDPLATFORM stages and only copies in the target stage. Both base digests are pinned; the manifest runtime base digest matches the Dockerfile and is passed as a build label. The prebuilt and amd64 override are removed. Manifest MC checks and policy checks pass. + +### Verification and limits + +Commands were run from the reviewed checkout. These are review-run results, not canonical manifest data. + +```toon +checks[4]{command,result,exit_code}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","525 tests; 10 skipped",0 + "python3 -m unittest discover -s tools/tests","93 tests",0 + "python3 tools/docs_check.py","pass; glossary warnings only",0 + "python3 tools/manifest_check.py","manifest and policy: zero findings",0 +``` + +No image build, real CAS startup, institution-login round trip, TOTP, ORCiD, or native amd64 execution was performed in this review. ADR-07's arm64 runtime results are author evidence, not independently repeated results. The checkout's real `runtime/.env` was not read or modified, and no Docker stack state was changed. R1-01 remains for the implementer; no production code was modified. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と必須修正 + +**Changes requested(修正要求)— R1-01(P2):使える鍵であることを生成前に検証する。** `installer/grdm_dev/secrets.py:230–238` の `cas_key_problems` は UTF-8 バイト数だけを検査する。文書の手動移行手順では、感嘆符 43 個の TGC 暗号鍵、または引用符で囲んだ空白 32 個の機関 JWE/JWT 鍵を設定できる。各ケースとも検証指摘は空で、`compose render` は終了 0 になった。一時テストルート、合成入力、既存のモック付き render ヘルパーで再現し、実際の認証情報や稼働スタックは使っていない。 + +CAS 4.1.5 の `DefaultCipherExecutor` は TGC 暗号鍵を JWK の base64url オクテット値として扱うため、任意の 43 文字では 32 バイトの暗号鍵を保証できない。固定された統合版の機関秘密 setter は空白のみを明示的に拒否し、今回受理された空白 32 個も該当する。起動前検査を通過しても、手動移行後に CAS が止まるか Cookie 発行時に失敗する。TGC 暗号鍵の文字集合と復号後バイト数を検査し、機関鍵の空白のみを拒否してほしい。異常入力で終了 2、Compose ファイル未生成、鍵名だけの診断を確かめる負例試験を加え、正しい生成鍵は引き続き受理すること。CAS の署名側は文字列の生バイトを使うため、TGC 署名鍵まで復号する検証にはしないこと。 + +### 確認した事項 + +- 生成は `token_urlsafe` を使う。TGC 暗号鍵は乱数 32 バイトを表す ASCII 43 文字、署名鍵は乱数 64 バイトからの ASCII 86 文字(CAS は生の 86 バイトを使う)、機関 JWE は乱数 24 バイトからの ASCII 32 バイト、JWT は ASCII 43 バイトで最小 32 バイトを満たす。生成値自体は利用側の条件に合う。 +- 読み取り専用 GitHub API で CAS 統合コミット `22610b7681a29241365108e5129bcd43ade4610e` と osf.io 統合コミット `389415a473361fdaa3c347e84d95639b9096a9e9` を確認した。同一の機関変数を CAS と osf.io の 5 サービステンプレートに渡し、生成 `api_local.py` が `JWE_SECRET` と `JWT_SECRET` を UTF-8 バイトにして既定設定の後で読み込む。機関認証の実装もこれらで復号・署名検証する。 +- 新しい秘密は環境変数参照であり、引数・properties・Python 設定・サービス JSON・レポートに値を埋め込まない。秘密ファイルは 0700 の runtime ディレクトリ内に 0600 で書き、生成設定は 0644 で秘密値を含まない。強制 init と rotate の双方で旧 CAS 4 キーを除く。これは新経路の静的確認であり、既存の全秘密処理の保証ではない。 +- サービス正規表現はループバックをエスケープし、scheme・port・直後のスラッシュを固定する。別ホスト、ユーザー情報付き authority、port の接尾辞は許可しない。同一 web origin の全パス許可は意図された範囲で、末尾 `$` が無くても origin は広がらない。Secure の解除は生成されるループバック HTTP 開発設定にあり、固定イメージの既定は secure のまま。CAS はホストにポートを公開せず、osf.io は引き続き fakecas を使う。 +- CAS は `osf_init` 成功を待つ。読み取り専用ルート、uid/gid 1000、capability 除去、no-new-privileges、書込可能場所は `/tmp` のみ。CAS の堅牢化例外を除き、新しい例外はない。 +- 固定 Dockerfile は Maven と Jetty 設定を BUILDPLATFORM 段で行い、対象アーキテクチャの最終段はコピーのみ。両ベースの digest を固定し、manifest の実行時ベース digest は Dockerfile と一致して build label に渡る。prebuilt と amd64 固定を除去。manifest の MC 検査と policy 検査は合格した。 + +### 検証と限界 + +実行場所は対象 checkout。次はレビュー実行結果で、manifest の正本データではない。 + +```toon +checks[4]{command,result,exit_code}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","525 件、10 件 skip",0 + "python3 -m unittest discover -s tools/tests","93 件",0 + "python3 tools/docs_check.py","合格、用語注の警告のみ",0 + "python3 tools/manifest_check.py","manifest と policy の指摘 0",0 +``` + +本レビューではイメージビルド、実 CAS 起動、機関ログイン往復、TOTP、ORCiD、実機 amd64 実行は行っていない。ADR-07 の arm64 実行結果は作者の証跡であり、独立再実行ではない。checkout の実 `runtime/.env` は読み書きせず、Docker スタックの状態も変更していない。R1-01 の修正は実装担当に残る。実装コードは変更していない。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR39_CAS_Native_Image_r2.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR39_CAS_Native_Image_r2.md new file mode 100644 index 0000000..d28d552 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR39_CAS_Native_Image_r2.md @@ -0,0 +1,73 @@ +# REV PR39 CAS native image review r2 / CAS ネイティブイメージのレビュー r2 + +> **Summary:** Pass. R1-01 is closed; no regression requiring changes was found in the scoped diff. +> **概要:** 合格。R1-01 は解消し、対象差分に修正を要する回帰は見つからなかった。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Canonical decoding and published-key fingerprints can reject unusable keys before rendering without exposing their values. / 正準な復号と公開鍵値の指紋照合により、値を露出せず生成前に使えない鍵を拒否できる。 +- Applies to: PR #39, diff `bfa031c8b22b4504a9d370f8edbfac7515c158b0..aa48404f71481cf181c618b78593324f91bea19f`; REV(担当レビュワ, Codex Astra). +- Related: [Reviews](README.md) · [Review r1](2026-11-10_RDM-developer-guide_PR39_CAS_Native_Image_r1.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-07](../decisions/ADR-07_Native_Builds_of_EOL_Middleware.md). +- Used by: [PR #39](https://github.com/RCOSDP/RDM-developer-guide/pull/39). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and evidence + +**Pass — R1-01 closed.** Review was limited to its fix and regressions introduced by the specified diff. No new required change was found. + +- All four CAS keys are checked for length and the unpadded base64url alphabet. Whitespace, literal quotes, punctuation outside that alphabet, and forbidden defaults are rejected. Existing dotenv syntax removes surrounding quotes before validation; a quoted valid value remains valid, while quoted spaces are rejected. +- Only `TGC_ENCRYPTION_KEY` is decoded. Its 43-character alphabet-checked input safely decodes to 32 bytes; re-encoding rejects noncanonical trailing bits. Signing and institution keys retain raw-string semantics. The added tests cover this distinction and padding rejection; 100 independently generated key sets also passed validation. +- Read-only GitHub API retrieval of `etc/cas.properties` at CAS PR #3 base `c4a7666364aebf58880fed44a304a21d29d3c29b` independently confirmed that all four published values match the SHA-256 denylist. Each value was rejected by validation and rendering; values were not printed or copied into this report. +- Independent temporary-root probes covered those four published values and 20 further invalid inputs across the four keys: wrong-alphabet values, both quote styles around spaces, trailing punctuation and `changeme`. Every render returned 2, named the affected key without its value in stdout/stderr, and left a byte-for-byte file inventory unchanged. This verifies no output file was created or overwritten, beyond the added unit tests' Compose-file assertion. Docker calls were mocked. +- The render guard remains before generated files and port updates. SPEC-02 and ADR-07 describe the same alphabet, digest and decoding rules. No unrelated implementation change was introduced in this diff. + +### Verification and limits + +Commands ran from the specified checkout. Results are review observations, not canonical manifest data. + +```toon +checks[4]{command,result,exit_code}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","531 tests; 10 skipped",0 + "python3 -m unittest discover -s tools/tests","93 tests",0 + "python3 tools/docs_check.py","pass; 24 glossary warnings",0 + "python3 tools/manifest_check.py","manifest and policy: zero findings",0 +``` + +The independent probes exited 0. The untracked r2 report was checked separately through `docs_check.check_file`, since the main checker enumerates tracked files. No production code was modified, and this report is uncommitted. The checkout's real `runtime/.env` was not read or modified; no Docker stack state was changed. No image build or real CAS/institution-login execution was repeated. No required review finding remains in scope; runtime evidence retains r1's limits. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と根拠 + +**Pass(合格)— R1-01 解消。** 指定差分の修正と、それによる回帰に限定して確認した。新しい必須修正はない。 + +- CAS の全 4 キーで長さとパディングなしの base64url 文字集合を検査する。空白、値に含まれる引用符、集合外の記号、禁止既定値を拒否する。既存の dotenv 構文では外側の引用符を検証前に除くため、引用符で囲んだ正常値は有効で、引用符で囲んだ空白は拒否される。 +- 復号は `TGC_ENCRYPTION_KEY` のみ。文字集合を検査した 43 文字は安全に 32 バイトへ復号でき、再符号化との比較で末尾の非正準ビットを拒否する。署名鍵と機関鍵は生文字列として扱う。追加試験はこの違いとパディング拒否を確認し、独立に生成した 100 組の鍵も検証を通過した。 +- 読み取り専用 GitHub API で CAS PR #3 の base `c4a7666364aebf58880fed44a304a21d29d3c29b` の `etc/cas.properties` を取得し、公開済みの 4 値すべてが SHA-256 拒否リストに一致することを独立確認した。各値は検証・render とも拒否された。値は出力せず、記録にも転記していない。 +- 独立した一時ルートの試験で、その公開済み 4 値と、全 4 キーに対する異常入力 20 件を確認した。集合外文字、両形式の引用符で囲んだ空白、末尾の記号、`changeme` が対象。全件で render は終了 2、標準出力・標準エラーには値を出さず対象キー名を示し、ファイル一覧と全内容は実行前後で一致した。追加単体試験の Compose ファイル未生成だけでなく、他の出力ファイルの作成・上書きもないことを確かめた。Docker 呼び出しはモック化した。 +- render の検査は生成ファイルの書込・ポート更新より前にある。SPEC-02 と ADR-07 は同じ文字集合・指紋・復号規則を説明する。差分に無関係な実装変更はない。 + +### 検証と限界 + +指定 checkout で実行した。次はレビュー実測であり、manifest の正本データではない。 + +```toon +checks[4]{command,result,exit_code}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests","531 件、10 件 skip",0 + "python3 -m unittest discover -s tools/tests","93 件",0 + "python3 tools/docs_check.py","合格、用語注の警告 24 件",0 + "python3 tools/manifest_check.py","manifest と policy の指摘 0",0 +``` + +独立試験は終了 0。主検査は追跡済みファイルを列挙するため、未追跡の r2 記録は `docs_check.check_file` で別途検査した。実装コードは変更せず、この記録も未コミット。checkout の実 `runtime/.env` は読み書きせず、Docker スタックの状態も変更していない。イメージビルド、実 CAS・機関ログイン実行は再実施していない。対象範囲の必須指摘は残らず、実行時証跡の限界は r1 と同じ。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR40_Acceptance_All_Pass_r1.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR40_Acceptance_All_Pass_r1.md new file mode 100644 index 0000000..f711476 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR40_Acceptance_All_Pass_r1.md @@ -0,0 +1,111 @@ +# PR40 Acceptance review r1 / 受入全件合格のレビュー r1 + +> **Summary:** Changes requested: C6 does not establish cross-institution isolation, and two operational records need correction. The recorded twelve passes and unchanged rejection statuses are consistent with the submitted evidence. +> **概要:** 要修正。C6 は機関間の分離を証明できず、運用記録にも二点の修正が必要。記録された十二件の合格と変更されていない拒否ステータスは提出証跡と一致する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** excluding an unaffiliated account does not prove that an institution administrator cannot see another institution's members. / 無所属のアカウントを除外できても、機関管理者が他機関の利用者を見られないことは証明できない。 +- Applies to: RCOSDP/RDM-developer-guide PR #40, head `2998b5293f983c3d3d8521b928394013689413e6`, branch `fix/accept-c2-c6`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-04](../spec/04_acceptance_tests.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md). +- Used by: [DEMO-20](../demo/20_core_install_mac_studio.md) · [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and findings + +**Changes requested.** Review performed in an independent clean clone under `/tmp/pr40-rev-ngfGaK/repo`. No application fix, commit, push, merge, approval, closure, live-stack mutation, or live credential-file access was performed. One PR comment accompanies this uncommitted record. + +**R1-01 (P2): C6 does not prove institution isolation.** `installer/acceptance/test_c6_admin.py:20–30` checks that one member of the administrator's institution is present and that unaffiliated `user_a` is absent. The seed in `installer/grdm_dev/accept.py:252–259` creates no member of a different institution. A broken listing that returns every affiliated user would pass both assertions. I executed the actual success function extracted through Python AST with a fake page containing the expected member plus an unrelated institution member: it passed. This is an assertion counterexample, not a claim that the live application leaks users. Seed a second, distinct institution and a member belonging only to it; prove the administrator is affiliated only with the first; assert the second member is absent from the relevant complete or explicitly searched listing. Preserve the current positive and unaffiliated checks and exact API rejection status. Repeat C6 and the core run before claiming that the administrator sees “only” its institution's users in DEMO-20. + +**R1-02 (P2): document the development-only static-file exception.** `installer/grdm_dev/templates/admin.json:5–11` now uses `manage.py runserver ... --insecure`. Generated host publication is constrained to `127.0.0.1` by `compose.py:587`, and this is a development installer, so I found no newly exposed host interface. However, SPEC-02 and DEMO-20 do not explain this flag, its need with DEBUG false, or its loopback development restriction. The PR body, a test comment, and a historical review mentioning a needed adjustment do not replace the shipped operating contract. Add matching English/Japanese documentation explaining the static-asset purpose and that this command is not a production deployment mechanism; keep loopback binding enforced. + +**R1-03 (P3): reconcile the status board's Wiki item.** `docs/status/README.md:62` and its Japanese counterpart still mark the `edit.mako` wiring/browser verification as open or not started, immediately before the new all-green C1–C6 row. DEMO-20 attributes C4 success to that wiring, and results.json records C4 success. Close or accurately qualify the old item in both languages with the relevant review/run reference so the board has one consistent status. + +### Checks of the requested behavior + +C1–C6 rejection expectations were not relaxed: the run records 401, 403, 403, 4401, 401 and 403 respectively. C4 waits at most 30 seconds for peer awareness before typing, still gives each newly typed marker only five seconds to propagate, and requires both markers in both independent editors. Removing `.ProseMirror-yjs-cursor` from a cloned DOM removes presence-widget text, not persisted document content or the live editor; it cannot create a missing remote marker. This change does not hide a content-sync failure under the stated scenario. + +C5 rejection reads `window.contextVars.file.urls.render`, verifies the MFR origin, and requests that exact embedded URL through the cookie-less guarded API context. It retains the 401/403 requirement. The MFR configuration limits credential-source origins to `http://web:5000` and credential-target origins to `http://wb:7777`; the patch adds no wildcard origin. The web token key maps to the same secret used by y-websocket. + +The administrator is seeded as staff and not superuser, with the first non-deleted institution; its OSF password reaches pytest via `GRDM_ACCEPT_ADMIN_OSF_PASSWORD`. `seed_secret_values` includes every seeded OSF password and identity before subprocess output can be reported. Seed failures, cleanup warnings, pytest output, collected results and textual evidence pass through masking. The seed command still carries the password inside the existing shell snippet, but the runner captures its output rather than logging the command. No new credential logging path was found. The evidence directory contains five textual files, no browser traces or screenshots; manual inspection and redacted gitleaks found no credentials. This is a checked finding, not a guarantee against every possible secret format. + +The newly published y_websocket and sharejs ports use the common loopback-only renderer and are listed in both SPEC-02 port tables (1234 and 7007). Unit coverage checks remapping and the browser URLs. The admin static flag remains subject to R1-02. + +The ADR-04 new row has matching English/Japanese scope. GitHub read APIs report zero workflows for each of the three named repositories; y-websocket PR #2 is merged with an empty check rollup and has local test results in its body, consistent with the stated incident. The owner's private session authorization and the historical merge-check implementation cannot be independently established from this repository or these read APIs; they remain attributed statements, not newly verified authorization. + +The canonical [results.json](../demo/runs/acc-20261110T014431Z-2b91e6/results.json), collector, JUnit, pytest log and TOON agree on twelve passing core cases, no failures or skips, and the stated rejection statuses. Results record 96 known external requests blocked, not zero external attempts; this is allowed by the current SPEC-04 exception list. DEMO-20's six component short pins match the manifest, but results.json does not attest running image digests, so the exact deployed image provenance remains author-reported. Live acceptance was not rerun under the no-stack-change instruction. The numeric all-pass claim is supported; its C6 interpretation and the board item need the corrections above. + +### Local validation + +Commands ran from the scratch clone, using its source and disposable test fixtures. The unit suite's Docker Compose parser check is read-only; no Docker state-changing command was issued. + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +gitleaks dir docs/demo/runs/acc-20261110T014431Z-2b91e6 --redact --no-banner --report-path /tmp/pr40-rev-ngfGaK/gitleaks.json +``` + +```toon +validation[5]{check,exit_code,result}: + installer_unit,0,535 tests; 10 skipped + tools_unit,0,93 tests + docs_check,0,138 files before review; 25 warnings; 8 exempt + manifest_check,0,zero manifest and policy findings + evidence_gitleaks,0,no leaks found +``` + +The documentation check after adding this review also exited 0 (138 tracked files; 25 warnings). Because the new report is untracked, it was separately checked with the same checker’s `check_file` function: zero errors. Logs remain in the scratch parent directory. Required follow-up is R1-01–R1-03, refreshed acceptance evidence, and re-review; no merge verdict of pass is granted. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +**Changes requested(要修正)。** `/tmp/pr40-rev-ngfGaK/repo` の独立したクリーンクローンで確認した。アプリ修正、commit、push、merge、approve、close、稼働スタックの変更、稼働環境の資格情報ファイル参照はしていない。この未コミット記録と PR コメント一件を提出する。 + +**R1-01(P2): C6 は機関間の分離を証明しない。** `installer/acceptance/test_c6_admin.py:20–30` は、自機関の一人が表示され、無所属の `user_a` が表示されないことだけを確認する。`installer/grdm_dev/accept.py:252–259` の種データに他機関だけに所属する利用者はいない。そのため「全機関の所属者を返す」不具合があっても両方の条件を満たす。実際の成功関数を Python AST で抽出し、自機関の利用者と他機関の利用者を含む偽ページで実行すると合格した。これは判定の反例であり、稼働アプリの漏えいを実証したものではない。異なる第二機関とそこだけに所属する利用者を用意し、管理者が第一機関だけに所属することを確認したうえで、一覧全体または明示的な検索で他機関の利用者が表示されないことを確認してほしい。現行の正常表示・無所属の除外・API の厳密な拒否ステータスを維持し、C6 とコア全件を再実行してから DEMO-20 の「自機関の利用者だけ」という主張を確定する。 + +**R1-02(P2): 静的ファイル配信の開発専用例外を文書化する。** `installer/grdm_dev/templates/admin.json:5–11` は `manage.py runserver ... --insecure` を使う。`compose.py:587` がホスト公開を `127.0.0.1` に限定し、開発用インストーラーであるため、新たなホスト外向け公開は見つからない。ただし SPEC-02 と DEMO-20 は、このフラグ、DEBUG false で必要な理由、ループバック開発専用という制約を説明していない。PR 本文、試験のコメント、必要な調整に触れた過去のレビューは、配布される運用契約の代わりにはならない。静的資産の配信用であり本番配備用のコマンドではないことを英和で記し、ループバックの強制を維持してほしい。 + +**R1-03(P3): 進捗ボードの Wiki 項目を整合させる。** `docs/status/README.md:62` と日本語の対応行は、`edit.mako` の配線とブラウザ確認を未解決・未着手のままとし、直後で C1〜C6 全件合格とする。DEMO-20 はその配線を C4 合格の理由に挙げ、results.json も C4 成功を記録する。両言語の古い項目を解決済み、または実態に合う限定的な残件へ変更し、レビューと実行への参照を付けてほしい。 + +### 指定された挙動の確認 + +C1〜C6 の拒否期待値は緩められていない。実行で記録された値は順に 401、403、403、4401、401、403。C4 は入力前に相手の存在通知を最大 30 秒待つが、入力した各マーカーの伝播期限は五秒のままで、独立した双方のエディタに両マーカーを要求する。複製 DOM からの `.ProseMirror-yjs-cursor` 除去は存在通知の文字を除くだけで、保存本文や実エディタを変更せず、欠けた相手のマーカーを作れない。指定シナリオにおける本文同期失敗を隠す変更ではない。 + +C5 拒否は `window.contextVars.file.urls.render` を読み、MFR の起点を検証し、その埋込 URL 自体を cookie のない保護付き API context で要求する。401/403 の条件は維持する。MFR の資格情報転送元は `http://web:5000`、転送先は `http://wb:7777` だけで、ワイルドカードは加えていない。web のトークン鍵も y-websocket と同じ秘密へ接続する。 + +管理者は staff かつ非 superuser とし、最初の未削除機関に所属させる。OSF パスワードは `GRDM_ACCEPT_ADMIN_OSF_PASSWORD` 環境変数で pytest へ渡す。`seed_secret_values` はサブプロセス出力が報告される前に全員の OSF パスワードと識別情報を対象にする。種データ作成失敗、後片付けの警告、pytest 出力、集約結果、文字形式の証跡は伏せ字処理を通る。既存の種データ作成コマンドではパスワードを shell snippet 内に含むが、runner は出力を捕捉し、コマンドをログへ出さない。新たな資格情報のログ出力経路は見つからなかった。証跡は文字ファイル五個でトレース・画像はなく、目視と伏せ字付き gitleaks では資格情報を検出しなかった。これは検査結果であり、あらゆる秘密形式への無条件の保証ではない。 + +新たに公開する y_websocket と sharejs は共通のループバック限定描画を使い、SPEC-02 の英和両方のポート表に 1234 と 7007 がある。単体試験はポート変更とブラウザ URL を確認する。admin の静的配信フラグについては R1-02 が残る。 + +ADR-04 の追加行は英和で範囲が一致する。GitHub の読取 API では記載された三リポジトリのワークフローはすべてゼロで、y-websocket PR #2 は空の check rollup のままマージ済み、本文にはローカル試験結果があり、記載された事象と一致する。所有者の非公開セッション内の承認と過去のマージ判定実装は、このリポジトリや読取 API から独立に確定できない。記録上の説明として扱い、新たに検証済みの権限とは扱わない。 + +正本の [results.json](../demo/runs/acc-20261110T014431Z-2b91e6/results.json)、collector、JUnit、pytest log、TOON は、コア十二件合格・失敗とスキップなし・拒否ステータスで一致する。既知の外部要求は 96 件遮断されており、外部要求の試行ゼロではない。現行 SPEC-04 の例外一覧に沿う。DEMO-20 の六構成要素の短縮 SHA は manifest と一致するが、results.json は実行イメージの digest を証明しないため、実際の配備イメージの由来は著者報告の範囲に留まる。スタック変更禁止の指示に従い、実受入は再実行していない。全件合格という数値は裏付けられるが、C6 の解釈とボード項目には修正が必要。 + +### ローカル検証 + +クローン内のソースと使い捨て試験データで実行した。単体試験の Docker Compose 構文確認は読取専用で、Docker の状態を変更するコマンドは実行していない。再現コマンドは英語節のコードブロックに示す。 + +```toon +validation[5]{check,exit_code,result}: + installer_unit,0,535 件; 10 件スキップ + tools_unit,0,93 件 + docs_check,0,レビュー追加前 138 ファイル; 警告 25 件; 対象外 8 件 + manifest_check,0,manifest と policy の指摘ゼロ + evidence_gitleaks,0,秘密の検出なし +``` + +レビュー追加後の文書検査も終了 0(追跡済み 138 ファイル、警告 25 件)。新規記録は未追跡なので、同じ検査の `check_file` 関数でも別途確認し、エラーはゼロだった。ログは scratch の親ディレクトリに保存した。残件は R1-01〜R1-03、受入証跡の更新、再レビューであり、マージへ進める合格判定は与えない。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR40_Acceptance_All_Pass_r2.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR40_Acceptance_All_Pass_r2.md new file mode 100644 index 0000000..aa84dfb --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR40_Acceptance_All_Pass_r2.md @@ -0,0 +1,94 @@ +# PR40 Acceptance review r2 / 受入全件合格のレビュー r2 + +> **Summary:** Pass for the reviewed revision: R1-01–R1-03 are resolved for the installer-provisioned development stack. The refreshed evidence and local checks support the recorded acceptance result. +> **概要:** 対象版は合格。インストーラーが構築する開発スタックについて R1-01〜R1-03 は解決した。更新証跡とローカル検査は記録された受入結果を裏付ける。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** a fake listing must exercise both the ordinary list and the targeted search, because either path can lose its institution filter independently. / 一覧と個別検索では機関フィルターが別々に失われうるため、偽の一覧による検証は両方の経路を試す必要がある。 +- Applies to: RCOSDP/RDM-developer-guide PR #40, head `ca2bf1b8be416406bf3b77860785014c7407b36e`, diff `2998b52..ca2bf1b`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [Review r1](2026-11-10_RDM-developer-guide_PR40_Acceptance_All_Pass_r1.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-04](../spec/04_acceptance_tests.md) · [SPEC-06](../spec/06_documentation_conventions.md). +- Used by: [DEMO-20](../demo/20_core_install_mac_studio.md) · [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and resolution + +**Pass. No blocking findings in the reviewed delta.** Reviewed in the clean clone `/tmp/rdm-pr40-rev-r2-20261110`. This record is uncommitted. No application changes, commits, pushes, approvals, merges, closures, Docker state changes, or live `runtime/.env` access were performed. One Japanese PR comment accompanies the review. + +**R1-01 resolved for the provisioned stack.** The seed assigns the administrator and the member only the first non-deleted institution (`[0:1]`), and the other member only the second (`[1:2]`); the administrator remains staff and not superuser. The separate fixture and environment variable reach C6. The ordinary list requires the own member and excludes both the unaffiliated user and the other member. E-mail search positively finds the own member and excludes the other member. I ran the actual imported C6 success function through its fake-page helper: the correctly filtered listing passed, a list containing the other member failed with “a user of another institution is in the institution's list”, and a list that leaked only on the other member's explicit search failed with “searching for a user of another institution lists it”. The exact 403 API rejection remains unchanged. + +The institution seed relies on the installer initialization, rather than creating new institutions itself. `osf_init.json` runs `scripts.populate_institutions -e test -a` before the dependent services. A read through the GitHub API of that script at the pinned osf.io `fe90e5c3` found 68 distinct test entries, including `a2jlab` and `asu`. The two slices therefore select distinct institutions in the provisioned stack. The snippet does not assert the selected count: an independently altered database with fewer than two non-deleted institutions is outside this verified prerequisite. This is a nonblocking hardening opportunity, not proof of the live database's contents. + +**R1-02 resolved.** SPEC-02 now explains in English and Japanese that `--insecure` serves static assets with `DEBUG = False`, is only for development, and requires loopback host publication; production must serve static assets through its own server. The existing loopback renderer and unit checks remain. The operating contract is now explicit; repeating the full explanation in DEMO-20 is unnecessary. + +**R1-03 resolved.** Both board halves close the old `edit.mako` item and cite C4 2/2 in `acc-20261110T015520Z-ab4cc7`. GitHub read data confirms integration PR #4 merged on 2026-11-09 with `7acc9abf9e9e73b62c5882323ef4d5bcaefd6dc9`. Both DEMO-20 halves and both board halves cite the refreshed run and agree with its twelve passes. + +### Suppressions, unit-test import and evidence + +The delta adds exactly two line-scoped, rule-specific `nosemgrep` annotations in C4 for `javascript.lang.security.detect-insecure-websocket.detect-insecure-websocket`. One is on a comment quoting upstream JavaScript, and one is on the local `ws://` URL. The following assertion checks the parsed origin against exactly `127.0.0.1` before socket use. Both annotations explain their reason and add no blanket exclusion. They are minimal and justified; Semgrep itself was not rerun in this review. + +Commit `ca2bf1b` replaces AST compilation plus `exec()` in the C6 unit helper with `importlib.import_module` of the real acceptance module. Temporary pytest/conftest stubs provide only decorators and the unused API dependency. The actual test and helper bodies are unchanged, module state is scoped by `mock.patch.dict`, and the fake-page checks demonstrate that assertions are still effective. There is no suppression of the removed exec finding. + +The canonical [results.json](../demo/runs/acc-20261110T015520Z-ab4cc7/results.json), collector and JUnit agree on 12 passed, zero failures/errors/skips; TOON and pytest log agree. Rejection statuses C1–C6 are 401/403/403/4401/401/403. There are 98 known external requests blocked, not zero attempted requests. The run reports seeded core execution and pytest exit 0. Evidence parity was independently checked with assertions. Live acceptance was not rerun, and running image digests and actual database affiliations are not attested by results.json. The DEMO-20 prose is slightly broader for unaffiliated users: their exclusion is asserted in the ordinary list, while explicit searches cover the own and other-institution members. This does not weaken the requested cross-institution test. + +### Local validation + +Run from the scratch clone root; tests use disposable fixtures, including synthetic credential files. The Docker Compose parser test is read-only. + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +``` + +```toon +validation[6]{check,exit_code,result}: + installer_unit,0,537 tests; 10 skipped + tools_unit,0,93 tests + docs_check,0,139 tracked files; 8 exempt; 25 warnings + manifest_check,0,zero manifest and policy findings + independent_fake_listing,0,filtered passes; list leak and search-only leak rejected + evidence_parity,0,12 passing cases and rejection statuses agree +``` + +Logs: `/tmp/rdm-pr40-r2-check-0.log` through `/tmp/rdm-pr40-r2-check-3.log`, in command order. The untracked review was separately checked with `tools.docs_check.check_file`: zero errors. No required revision remains for this reviewed scope; this verdict is not a merge operation. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と解決状況 + +**Pass(合格)。対象差分にブロッカーなし。** クリーンクローン `/tmp/rdm-pr40-rev-r2-20261110` で確認し、記録は未コミットとした。アプリ変更、commit、push、approve、merge、close、Docker の状態変更、稼働環境の `runtime/.env` 参照はしていない。日本語の PR コメント一件を添える。 + +**R1-01 は構築済みスタックを前提に解決。** 管理者と自機関の利用者を最初の未削除機関だけ(`[0:1]`)、他機関の利用者を二番目だけ(`[1:2]`)へ所属させる。管理者は staff かつ非 superuser のまま。他機関の fixture と環境変数は C6 に届く。一覧は自機関の利用者の存在、無所属と他機関の利用者の不在を要求する。メール検索は自機関を見つけ、他機関を除外する。実際に import した C6 成功関数を偽ページで実行し、正常な絞り込みは合格、一覧に他機関を混ぜる場合は「a user of another institution is in the institution's list」で失敗、他機関の明示検索だけが漏れる場合も「searching for a user of another institution lists it」で失敗した。API の厳密な 403 拒否は維持している。 + +種データ作成は機関を新設せず、インストーラーの初期化に依存する。`osf_init.json` は依存サービスの起動前に `scripts.populate_institutions -e test -a` を実行する。固定した osf.io `fe90e5c3` のスクリプトを GitHub API で読むと、`a2jlab` と `asu` を含む異なる 68 件の test データがあった。この構築手順では二つのスライスは別機関を選ぶ。一方、snippet は選択件数を assert しないため、独自に変更され未削除機関が二件未満となった DB は確認済みの前提外となる。これは非ブロッカーの堅牢化余地であり、稼働 DB の内容を実証したという意味ではない。 + +**R1-02 解決。** SPEC-02 の英和で、`DEBUG = False` で静的資産を配信するための `--insecure`、開発専用・ホスト公開はループバック限定という制約、本番では自前のサーバーで配信することを説明した。既存のループバック描画と単体検査も維持した。運用契約が明記されたため、説明全文を DEMO-20 に重複させる必要はない。 + +**R1-03 解決。** ボード両言語で古い `edit.mako` 項目を完了とし、`acc-20261110T015520Z-ab4cc7` の C4 2/2 を引用した。GitHub の読取結果で、統合 PR #4 は 2026-11-09 に `7acc9abf9e9e73b62c5882323ef4d5bcaefd6dc9` としてマージ済みと確認した。DEMO-20 とボードの英和すべてが更新実行を引用し、十二件合格と一致する。 + +### 抑止・単体試験の import・証跡 + +差分の `nosemgrep` 追加は C4 の二行だけで、どちらも `javascript.lang.security.detect-insecure-websocket.detect-insecure-websocket` の指定付き。一方は上流 JavaScript を引用したコメント、他方はローカル `ws://` URL で、直後の assert が socket 使用前に解析した起点を厳密に `127.0.0.1` へ限定する。理由を併記し、包括的な除外を増やしていないため、最小限で妥当。今回 Semgrep 自体は再実行していない。 + +`ca2bf1b` は C6 単体試験 helper の AST コンパイルと `exec()` を、実際の受入モジュールの `importlib.import_module` に置き換えた。一時的な pytest/conftest stub は decorator と未使用の API 依存だけを提供し、試験と helper 本体はそのまま。モジュール状態は `mock.patch.dict` の範囲で扱い、偽ページで assert が有効なことも確認した。除去した exec 指摘への抑止は加えていない。 + +正本の [results.json](../demo/runs/acc-20261110T015520Z-ab4cc7/results.json)、collector、JUnit は 12 件合格・失敗/エラー/スキップゼロで一致し、TOON と pytest log も一致する。C1〜C6 の拒否値は 401/403/403/4401/401/403。既知の外部要求を 98 件遮断しており、要求試行ゼロではない。seeded の core 実行、pytest 終了 0 が記録され、証跡間の一致は独立した assert でも確認した。実受入は再実行せず、実行イメージ digest と稼働 DB の所属そのものは results.json が証明しない。DEMO-20 は無所属利用者について少し広く述べているが、無所属の除外は通常一覧で確認し、明示検索は自機関と他機関の利用者を対象とする。この表現差は依頼された機関間の試験を弱めない。 + +### ローカル検証 + +scratch クローン直下で、合成した資格情報ファイルを含む使い捨て fixture により英語節の四コマンドを実行した。Docker Compose の構文試験は読取専用。installer は 537 件(10 件スキップ)、tools は 93 件で、ともに終了 0。docs_check は追跡済み 139 ファイル・対象外 8・警告 25 で終了 0、manifest_check も manifest と policy の指摘ゼロで終了 0。独立した偽一覧検証と証跡整合検証も終了 0。 + +ログはコマンド順に `/tmp/rdm-pr40-r2-check-0.log`〜`/tmp/rdm-pr40-r2-check-3.log`。未追跡の記録は `tools.docs_check.check_file` で別途検査しエラーゼロ。対象範囲の必須修正は残っていない。この判定自体はマージ操作ではない。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR40_Acceptance_All_Pass_r3.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR40_Acceptance_All_Pass_r3.md new file mode 100644 index 0000000..76278bf --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR40_Acceptance_All_Pass_r3.md @@ -0,0 +1,53 @@ +# PR40 Acceptance review r3 / 受入全件合格のレビュー r3 + +> **Summary:** Pass for the final Semgrep exclusion change. It documents a prose-only exception without removing executable sources or secret-scanning coverage. +> **概要:** 最終コミットの Semgrep 除外変更は合格。散文に限定した例外の理由があり、実行ソースや秘密情報検査の対象を減らしていない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** generic source matching can flag verbatim review prose, so an exclusion must be judged separately from executable coverage and secret detection. / 汎用のソース照合は原文保存するレビューの散文も検出するため、除外は実行コードの網羅性と秘密情報検査を分けて評価する必要がある。 +- Applies to: RCOSDP/RDM-developer-guide PR #40; REV(担当レビュワ, Codex Astra); head `36ac2e4ae0110d2daef95ca31ce73f0f653700c7`; delta `8c9de2d..36ac2e4` only. +- Related: [Review index](README.md) · [Review r2](2026-11-10_RDM-developer-guide_PR40_Acceptance_All_Pass_r2.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-06](../spec/06_documentation_conventions.md). +- Used by: [Status board](../status/README.md) · [DEMO-20](../demo/20_core_install_mac_studio.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Pass. No required changes in the reviewed delta.** The clean clone is `/tmp/rev-task_af4f588ae569/RDM-developer-guide`. The last commit changes only `.semgrepignore`: three reason lines and `docs/reviews/*.md`. The reason identifies verbatim review records, SPEC-06 §8 and generic matches of quoted WebSocket prose. SPEC-03 §4.2 targets source-code analysis; §3.5 separately requires blocking secret detection and reasoned false-positive handling. SPEC-06 preserves records verbatim; it is not itself blanket permission to disable scanners. This bounded exception is acceptable on the inspected content and independent secret coverage. + +The failed parent security run `42742048792` reports exactly two insecure-WebSocket findings in r2 prose, at lines 34 and 84. These describe existing C4 annotations; they do not create connections. All 91 tracked files in `docs/reviews/` are Markdown, mode `100644`, with no symlinks or executable-mode files. A search found no script or iframe tags. The inspected installer, tools, workflows and MkDocs configuration show no path that executes these review records or their fenced snippets; MkDocs renders documentation. Executable Python, JavaScript, shell, workflow and template paths are outside the new pattern. Markdown is not intrinsically safe: adding executable embedded content or an execution mechanism here would require revisiting the exception. + +Secret coverage remains independent. `.gitleaks.toml` enables default rules and has no path allowlist; the unchanged CI job scans full Git history. Trivy still includes its secret scanner and skips only `site`; it is report-only. The blocking private-URL/token policy scans all tracked text without path exemptions. The new Semgrep pattern does not affect these paths or configurations. Local `python3 tools/manifest_check.py --policy-only` passed: 659 scanned, 63 non-UTF-8 skipped, zero findings. This is policy validation, not a substitute for gitleaks. + +### Narrower alternatives and evidence limits + +An exact r2 filename would fix today's two findings with the smallest coverage loss. A dated `*_r*.md` pattern would also retain the review index. Either is a reasonable optional refinement, but not a required correction: the present directory is dedicated to review prose and the same immutable-record issue applies to subsequent rounds. Inline suppression would edit the preserved record. A rule-specific path exception would preserve other Semgrep checks but requires maintaining rule configuration around the remote packs. Disabling the WebSocket rule globally would weaken executable coverage and is worse. The existing directory-plus-extension boundary and explicit reason are proportionate; this is not an exception for secrets or future executable material. + +GitHub reports security run `42743153258` successful at the exact reviewed head, including Semgrep, gitleaks, Trivy and the policy job. Docs and both unit-test jobs also passed; the image-build job was pending when inspected. This verdict is limited to the final exclusion change and does not assert that every PR job has finished. Semgrep and gitleaks were not rerun locally; CI evidence was read through `gh`. No Docker commands, live credential access, application edits, commits, pushes, approvals, merges or closures were performed. This record remains uncommitted, and one Japanese PR comment accompanies it. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**Pass(合格)。対象差分に必須修正なし。** クリーンクローンは `/tmp/rev-task_af4f588ae569/RDM-developer-guide`。最終コミットは `.semgrepignore` に理由三行と `docs/reviews/*.md` だけを追加する。理由は原文保存するレビュー記録、SPEC-06 §8、引用した WebSocket の散文への汎用照合を具体的に挙げる。SPEC-03 §4.2 はソースコードの静的解析を扱い、§3.5 は失敗を伴う秘密情報検査と理由付きの誤検出対応を別途要求する。SPEC-06 の原文保存規定そのものが検査の包括的無効化を許すわけではないが、確認した内容と独立した秘密情報検査に照らし、この限定例外は妥当。 + +親コミットの失敗した security 実行 `42742048792` は r2 の散文 34・84 行だけに平文 WebSocket の指摘二件を出している。既存の C4 抑止を説明する文章であり、接続を実行しない。`docs/reviews/` の追跡済み 91 ファイルはすべて Markdown、mode `100644` で、実行属性もシンボリックリンクもない。script・iframe タグは検索で見つからなかった。確認した installer・tools・workflow・MkDocs 設定に、記録やコードブロックを実行する経路はなく、MkDocs は文書を描画する。Python・JavaScript・shell・workflow・template の実行経路は新しいパターンの対象外。Markdown 自体が安全を保証するわけではなく、実行される埋込内容や実行機構を導入する際には例外の再評価が必要となる。 + +秘密情報検査は独立して維持される。`.gitleaks.toml` は既定規則を有効にし、パス単位の許容指定がなく、変更のない CI は Git 全履歴を検査する。Trivy も secret 検査を含み、除外は `site` だけで、報告のみの位置付け。失敗を伴う private URL/token ポリシー検査はパス例外なしで追跡済みテキストを調べる。新しい Semgrep パターンはこれらの設定・経路に影響しない。ローカルの `python3 tools/manifest_check.py --policy-only` は 659 件検査・非 UTF-8 の 63 件をスキップ・指摘ゼロで合格した。これはポリシー確認であり、gitleaks の代用ではない。 + +### より狭い代案と証拠の限界 + +r2 のファイル名を個別指定すれば、今日の二件に対する除外範囲は最小になる。日付付き `*_r*.md` に絞ればレビュー索引も検査に残せる。どちらも任意の改善として合理的だが、現在のディレクトリはレビューの散文専用で、以後の記録にも原文保存の事情が共通するため、必須修正ではない。行内の抑止追記は保存記録を書き換える。規則別のパス除外なら他の Semgrep 検査を残せる一方、遠隔の規則パックを扱う設定の保守が必要になる。WebSocket 規則の全体無効化は実行ソースの検査を弱めるため劣る。ディレクトリと拡張子を限定し理由を明示する現状は相応であり、秘密情報や将来の実行内容を許容する例外ではない。 + +GitHub の security 実行 `42743153258` は対象 head で成功し、Semgrep・gitleaks・Trivy・ポリシーの各 job が合格した。docs と単体試験の両 job も合格し、確認時のイメージビルドは pending だった。判定は最終の除外変更に限定し、全 PR job の完了を意味しない。Semgrep と gitleaks はローカルで再実行せず、CI の証拠を `gh` で読んだ。Docker 操作、稼働環境の資格情報参照、アプリ変更、commit・push・approve・merge・close は行っていない。記録は未コミットで、日本語 PR コメント一件を添える。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR41_Render_Stale_Tags_r1.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR41_Render_Stale_Tags_r1.md new file mode 100644 index 0000000..d60acea --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR41_Render_Stale_Tags_r1.md @@ -0,0 +1,98 @@ +# REV-PR41 Render stale tags review r1 / 古いビルドタグの render レビュー r1 + +> **Summary:** Pass: stale records yield manifest pins, a visible warning and a structured report. +> **概要:** 判定は pass。古い記録の代わりに manifest の固定値を使い、警告と構造化報告を出す。 + +**Jump:** [English](#english) · [日本語](#japanese) + +Version / 版: 0.1 — 2026-11-10. **Learned:** A build record is historical evidence and must not override the desired pin. / ビルド記録は履歴であり、動かすべき固定値を上書きしてはならない。 + +**Applies to:** RCOSDP/RDM-developer-guide PR #41, head `4ce0922ada43e7fa3deca2c303acdeded6f1327f`. + +**Related:** [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-02](../spec/02_installer_cli.md) + +**Used by:** [Review index](README.md), coordinator acceptance decision. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and inspected behavior + +**Pass.** `split_stale_build_tags()` removes a mismatched recorded tag before `services_for_profile()` chooses image references. Built components use `integration_sha` or the merged-upstream pin; overlays compare both base and overlay halves. Matching records remain usable, unpinned components retain the record, deleted components are ignored, and warnings are restricted to rendered components. Failed-build records are excluded by `built_image_tags()`. The tests verify all four osf services and the wiki overlay use current pins and contain no old tag. + +`stale_build_tags` reports `component`, `pinned`, `recorded` and `image`; stderr names the mismatch and instructs `grdm-dev build`, then `grdm-dev up`. Render remains exit 0 because install renders before building. SPEC-02 version 0.18 describes this contract consistently in both languages. + +The generated service has the exact desired image reference, with no alternate old tag or build fallback. `lifecycle.run_up()` propagates nonzero Compose exit as exit 40 before health success; its unit test covers this. An unavailable exact image fails instead of selecting an old tag. Compose may attempt to pull the exact reference under its default policy; this change does not enforce local-only availability or cryptographic image provenance. Missing-image behavior was checked by code and injected-runner tests, not a live Docker start. No Docker state was changed and no live runtime/.env was accessed; tests create disposable runtime fixtures. + +### Suppression assessment + +The single-rule `nosemgrep` at `installer/images/unoconv/convert_service.py:111` is justified. `Popen` receives a list, leaves `shell=False`, uses explicit executable configuration and constructs `--fsize` from an integer. Request target is allowlisted by `FORMATS`; extension must fully match `[a-z0-9]{1,10}`; the source path is a generated temporary directory plus `input.<ext>`. Request input cannot select an executable or add shell syntax/filter options. `CONVERT_SOFFICE` and `CONVERT_PRLIMIT` are trusted process configuration, not request values. Minor wording precision: these two executable overrides currently use code defaults rather than being explicitly emitted by compose render; this does not invalidate the suppression. No broad scanner disable was added. + +### Verification + +Run from `/private/tmp/rev-6914/guide` with the system PATH `python3` (`/opt/homebrew/bin/python3`, Python 3.15.2): + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +``` + +```toon +checks[4]{check,result,exit}: + installer unit tests,539 run and 10 skipped,0 + tools unit tests,93 passed,0 + docs_check,141 checked and 8 exempt and 25 warnings,0 + manifest_check,PASSED,0 +``` + +Logs are `/private/tmp/rev-6914/installer-tests-python3.log`, `tools-tests-python3.log`, `docs-python3.log` and `manifest-python3.log`. An initial `/usr/bin/python3` (macOS Python 3.9.6) attempt ran 414 installer tests with 12 errors and 10 skips, exit 1: existing union annotations in tests require newer Python. That interpreter's tools/docs/manifest checks each exited 0. The requested PATH `python3` run passed; no source was changed to accommodate the old interpreter. + +No source changes, commits, pushes, approvals, merges or close actions. This review file is uncommitted. One Japanese PR comment reports pass. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と確認した動作 + +**Pass。** `split_stale_build_tags()` は `services_for_profile()` がイメージを選ぶ前に、不一致の記録タグを除外する。組み立てる部品は `integration_sha` または統合済み上流の固定値を使い、overlay はベースと overlay の両側を比較する。一致した記録は維持し、固定値のない部品は記録を利用し、削除済み部品は無視する。警告対象は render された部品に限る。失敗したビルド記録は `built_image_tags()` で除外される。テストは osf の4サービスと wiki overlay が現在の固定値を使い、古いタグを含まないことを確認する。 + +`stale_build_tags` は `component`・`pinned`・`recorded`・`image` を報告する。標準エラーは不一致と `grdm-dev build` の後に `grdm-dev up` を実行する対処を示す。install はビルド前に render するため終了0を維持する。SPEC-02 0.18 はこの契約を英日で一致して説明している。 + +生成されたサービスは指定した正確なイメージ参照を持ち、古いタグやビルドへの代替経路はない。`lifecycle.run_up()` は Compose の非0終了を、健康確認の成功より前に終了40として伝播し、単体テストも確認している。指定のイメージを取得できなければ古いタグを選ばず失敗する。Compose の既定方針では正確な参照の pull を試す可能性があり、この変更はローカル限定やイメージの暗号学的な来歴を強制しない。イメージ欠落時の挙動はコードと差し替え runner のテストで確認し、実 Docker 起動はしていない。Docker 状態変更や実環境 runtime/.env の参照はなく、テストは使い捨ての runtime fixture を作る。 + +### 抑制コメントの評価 + +`installer/images/unoconv/convert_service.py:111` の単一ルール向け `nosemgrep` は妥当。`Popen` はリストを受け取り、`shell=False` のままで、実行ファイルはプロセス設定、`--fsize` は整数から構成する。要求の target は `FORMATS` の許可集合に限定し、拡張子は `[a-z0-9]{1,10}` に完全一致させる。入力パスは生成した一時ディレクトリと `input.<ext>` である。要求から実行ファイルを選択したり、シェル構文・フィルターオプションを追加したりできない。`CONVERT_SOFFICE`・`CONVERT_PRLIMIT` は要求値ではなく信頼するプロセス設定。表現上の軽微な補足として、この2値は現在 compose render が明示設定するのではなくコードの既定値を使うが、抑制の妥当性を損なわない。スキャナー全体の無効化はない。 + +### 検証 + +`/private/tmp/rev-6914/guide` で PATH 上のシステム `python3`(`/opt/homebrew/bin/python3`、Python 3.15.2)を使う: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +``` + +```toon +checks[4]{check,result,exit}: + installer 単体テスト,539件実行・10件スキップ,0 + tools 単体テスト,93件成功,0 + docs_check,141件検査・8件免除・25件警告,0 + manifest_check,PASSED,0 +``` + +ログは `/private/tmp/rev-6914/installer-tests-python3.log`、`tools-tests-python3.log`、`docs-python3.log`、`manifest-python3.log`。最初に `/usr/bin/python3`(macOS Python 3.9.6)で試した installer 検査は414件実行・12エラー・10スキップで終了1だった。既存テストの union 型注釈に新しい Python が必要なため。同インタープリターでも tools・docs・manifest の検査は各終了0。指定の PATH `python3` では成功し、古い環境に合わせたソース変更はしていない。 + +ソース変更・commit・push・承認・merge・close は行っていない。この記録は未コミット。日本語の PR コメント1件で pass を報告する。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR42_PostgreSQL18_r1.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR42_PostgreSQL18_r1.md new file mode 100644 index 0000000..09e8813 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR42_PostgreSQL18_r1.md @@ -0,0 +1,123 @@ +# PR42 PostgreSQL 18 review r1 / PostgreSQL 18 レビュー r1 + +> **Summary:** Changes requested. Failure recovery can leave the active data directory missing or a migration server running, and the version guard fails open when the version cannot be read. +> **概要:** 要修正。障害復旧で稼働用データディレクトリが消えた状態や移行用サーバーが動いた状態が残り、版を読めない場合は起動の防護も通過する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** successful restore checks do not establish recoverability across directory renames and process interruption. / 復元の検査が成功しても、ディレクトリの改名やプロセス中断をまたぐ復旧可能性は証明されない。 +- Applies to: RCOSDP/RDM-developer-guide PR #42, head `2b6a02a741b68cdf4bedfc369801ccb2bb0a8d68`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-02](../spec/02_installer_cli.md) · [ADR-12](../decisions/ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md) · [ADR-13](../decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md) +- Used by: [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Changes requested.** Review used a clean scratch clone and synthetic fake-runner probes. No real Docker stack, existing runtime secrets, main checkout, commits, pushes, approvals or merges were used. Both ADRs remain Proposed; this review does not approve the owner decisions. Real migration, Linux uid 999 ownership, amd64 execution, image registry contents and browser acceptance were not independently exercised. + +### Required changes + +1. **R1-01 · P1 — Make swap and rollback recoverable.** In [database.py](../../installer/grdm_dev/database.py), lines 458–474 rename the current directory away, rename the replacement in, and only then write `upgrade.json`. Failure of the second rename returns 15 while claiming the current directory is unchanged, but that directory is absent. A fault-injection probe reproduced exactly this state with no rollback record. A failure writing the record after both renames raises an uncaught `OSError` and leaves a completed swap without its rollback record. Rollback lines 501–506 have the same two-rename gap. A subsequent `up` can interpret an absent path as a fresh installation. Persist a durable operation journal before mutation, recover or refuse incomplete operations, compensate recoverable rename failures, and prevent `up` from initializing a missing path during pending recovery. Add failure tests at both renames and at each journal write, including rollback. Individual renames do not make the pair atomic. + +2. **R1-02 · P1 — Verify shutdown and handle interruption before releasing migration ownership.** `_stop` (lines 280–283) ignores both return codes; lines 420–421 and 455–456 remove the server from tracking regardless. A probe returning failure for every stop/remove still completed the upgrade with exit 0 and a success record. The exception handler catches neither `KeyboardInterrupt` nor termination signals: interrupting dump left zero stop calls. The standalone migration servers are outside the Compose project checked by `_no_running_services`. Consequently a later command can start a second server against the same directory after interruption or failed shutdown, risking corruption. Require successful shutdown plus state verification before swapping; keep ownership tracking on failures; add cleanup for catchable interruption and a persistent lock/journal that blocks `up`, upgrade and rollback after a crash. Test interruption during source start, dump, destination start, restore, verification and swap. Forced termination needs recovery on the next invocation, not just a `finally` block. + +3. **R1-03 · P2 — Check disk capacity before starting the source.** Lines 399–415 start the old cluster without a disk-space check. Both `dumpall.sql` and its near-identical `restore.sql` remain alongside the new cluster and the old directory. ADR-12 §4's “twice the data” wording does not account clearly for two logical dump copies, new indexes and WAL, or separate filesystems for backups and volumes. Exhaustion can also prevent the post-swap record write described in R1-01. Check both destination filesystems with a conservative margin before any source startup, explain the estimate and its limitations, and test ENOSPC in dumping, filtering, restore and journal writes. Do not promise that a fixed multiple of physical cluster size is sufficient for arbitrary data. + +4. **R1-04 · P2 — Fail closed on an unreadable version.** `preflight` lines 157–159 treat `None` (failed inspection) like `''` (no cluster). A probe supplying an unreadable version returned `None`, permitting Compose instead of exit 15. This matters particularly for uid 999 directories when the helper container fails to run. Distinguish an established empty directory from an unknown version and refuse unknown/unparseable versions before Compose; test the fallback's failure as well as its success. + +5. **R1-05 · P2 — Cover the promised sequence and database inventory.** `SNAPSHOT_SQL` lines 64–74 records only sequence `last_value`, not `is_called`, even though identical values with different `is_called` yield different next IDs. `snapshot` line 248 overwrites a real database named `roles` with the role-name list, removing its table/sequence checks completely. Separate the database and role namespaces and compare sequence state including `is_called`; test both cases. Counts, extension names and role names are useful checks but do not prove row-content equality, role attributes or extension versions. State that boundary accurately rather than claiming that snapshot equality means every row moved intact. Normal `pg_dumpall`/`ON_ERROR_STOP` restoration is a sound starting point; these findings concern the advertised verification guarantee. + +### Authentication, hardening and documentation + +**MD5 judgment:** acceptable only as a temporary, explicitly accepted compatibility exception for this isolated developer network, not as a general security claim about internal networks. PostgreSQL documents MD5 as weaker and deprecated; an MD5 HBA rule automatically negotiates SCRAM for roles whose stored verifier is SCRAM. Separate CAS and osf.io login roles therefore permit CAS MD5 and osf.io SCRAM concurrently, after verifying osf.io's actual libpq supports SCRAM and resetting its password with SCRAM encryption. Merely changing a role setting does not convert an existing verifier. Currently `compose.py` lines 878 and 963–967 give both clients the same `postgres` role, so separation and credential/configuration changes are prerequisites. JDBC 42.2 introduced SCRAM for Java 8+, but a supported patched driver should be selected rather than treating the historical minimum as the upgrade target. Sources: [PostgreSQL password authentication](https://www.postgresql.org/docs/18/auth-password.html), [JDBC 42.2 release](https://www.postgresql.org/about/news/jdbc-4220-released-1825/). + +**Pinning and permissions:** the target manifest and source-image constant contain full SHA-256 pins. The template retains explicit PGDATA and the parent tmpfs. Migration servers use no network, no TCP listener, read-only roots, no-new-privileges and the five documented capabilities; the version helper uses uid 999 and a read-only mount. Backup mode 0700 and files 0600 are appropriate. The password is passed through an env file rather than argv, and the normal application report does not print it. These static checks do not verify registry digest provenance or Linux execution. Also test restoration failures for sensitive SQL/COPY data in PostgreSQL container logs: suppressing Python subprocess output alone cannot establish the requirement that secrets never reach logs. + +**ADR-13 accuracy:** pinned osf.io source was read through GitHub at `fe90e5c39e660f464bb8fcc9ae4028119b958d19`. The search decorator returns `None` with search disabled, ES2 code uses typed documents and filtered queries, wiki defaults build the Mongo URL from PostgreSQL settings unless explicitly overridden, and the file editor uses ShareJS and independently saves text by HTTP PUT. These support the broad migration concerns. However, the failed wiki draft reader does not prove that no ShareJS draft content ever reached saved files: narrow that claim to the measured wiki reader. Treat about 5,300 lines as the affected code surface, not a measured requirement to rewrite every line, and “every page loads” as limited to the measured endpoints. The prototype patch, complete measurement logs and post-PR40 browser result were not available in this PR, so their numerical and universal claims remain author-reported. No Mongo or ES service is removed by this PR. The new ADRs have bilingual sections and Proposed status; docs_check passes. ADR-12's inline operational command sequence should become a fenced procedure with working directory and expected results under SPEC-06 §3, and its unconditional failure/unchanged-directory promises must be corrected with R1-01/R1-02. + +### Validation evidence + +These are review measurements, not canonical manifest data. System Python was `/usr/bin/python3` 3.9.6. + +```toon +checks[5]{check,exit,result}: + "full unit suite",1,"431 tests; 12 errors; 10 skipped" + "database unit suite",0,"17 tests passed" + "docs_check before review",0,"144 files; 8 exempt; 37 warnings" + "manifest_check",0,"0 findings; 665 tracked files scanned" + "synthetic failure probes",0,"second rename leaves current absent; stop failures report success; interruption skips cleanup; journal failure escapes; unknown version allowed" +``` + +All 12 suite errors arise from the Python 3.9-incompatible annotation in `test_compose.py:38` and dependent imports. That file is unchanged from base `48d0134347e681c00ebb95246eab26f9e7de3c92`; the full suite is nevertheless **not green** on system Python. The database tests do pass. Logs and the isolated probe script are in `/tmp/pr42-rev-yvCJXJ/`; they contain synthetic fixtures only. + +Reproduce from the scratch clone root; expected exits are shown in the measurement block: + +```sh +PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests +PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests -p test_database.py +/usr/bin/python3 tools/docs_check.py +/usr/bin/python3 tools/manifest_check.py +/usr/bin/python3 /tmp/pr42-rev-yvCJXJ/probe.py +``` + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**要修正(changes requested)。** 作業用の独立クローンと疑似 runner による障害注入を使った。実 Docker スタック、既存の runtime の秘密情報、主チェックアウトには接触せず、コミット・push・承認・マージを行っていない。両 ADR は Proposed のままで、所有者の判断を承認していない。実移行、Linux の uid 999 所有、amd64 実行、レジストリ内のイメージ内容、ブラウザ受入は独立に実施していない。 + +### 必須修正 + +1. **R1-01 · P1 — 切替と巻戻しを復旧可能にする。** [database.py](../../installer/grdm_dev/database.py) 458–474 行は現行ディレクトリを退避し、新ディレクトリを移し、その後で初めて `upgrade.json` を書く。二回目の改名に失敗させると終了 15 だが、報告の「現行は無変更」に反して現行パスが消え、巻戻し記録も無かった。切替後の記録書込み失敗は未捕捉の `OSError` となる。巻戻しの 501–506 行にも二回の改名の隙間がある。後続の `up` が空の新規環境と解釈しかねない。変更前に永続的な操作記録を書き、不完全な操作を復旧するか拒否し、回復可能な改名失敗を補償すること。復旧待ちの `up` に初期化させないこと。両改名と各記録書込みの失敗を巻戻しも含めて試験する。一回ずつの改名が原子的でも、二回全体は原子的ではない。 + +2. **R1-02 · P1 — 停止を検証し、中断後も移行の占有を管理する。** `_stop`(280–283 行)は停止と削除の終了値を無視し、呼出し側は成功扱いで追跡対象から外す。すべての停止・削除を失敗させても移行は終了 0 と成功記録になった。ダンプ中の `KeyboardInterrupt` では停止呼出しが一度も無かった。例外処理はこれや終了シグナルを扱わず、単独起動した移行サーバーは Compose の稼働検査の外にいる。そのため次のコマンドが同じディレクトリに二つ目のサーバーを起動し、破損する危険がある。切替前に停止成功と状態確認を要求し、失敗時は追跡を保持すること。捕捉可能な中断の cleanup と、クラッシュ後に `up`・upgrade・rollback を止める永続ロック/操作記録が必要。旧版起動・ダンプ・新版起動・復元・照合・切替の各段階で中断試験を行うこと。強制終了には次回の復旧が必要で、`finally` だけでは足りない。 + +3. **R1-03 · P2 — 旧版起動前に空き容量を検査する。** 399–415 行には容量検査がない。新旧クラスタに加えて、ほぼ同じ内容の `dumpall.sql` と `restore.sql` の両方が残る。ADR-12 §4 の「データの二倍」では二つの論理ダンプ、新しい索引、WAL、バックアップとボリュームが別ファイルシステムの場合を明確に説明していない。容量不足は R1-01 の切替後の記録にも影響する。両保存先に保守的な余裕を見て事前検査し、見積りの限界を説明すること。ダンプ・加工・復元・記録の ENOSPC を試験し、物理サイズの固定倍率で任意のデータに十分とは約束しないこと。 + +4. **R1-04 · P2 — 版の読取り失敗を拒否する。** `preflight` 157–159 行は `None`(検査失敗)を空文字(クラスタなし)と同じ扱いにする。読取り不能を与えると拒否理由なしになり、終了 15 でなく Compose へ進めた。uid 999 所有のパスで補助コンテナが起動できない場合に問題となる。空であると確認できた場合と不明な場合を区別し、版不明・解析不能なら Compose 前に拒否すること。代替読取りの成功だけでなく失敗も試験すること。 + +5. **R1-05 · P2 — シーケンスと DB 一覧の検証範囲を補う。** 64–74 行は `last_value` のみを記録し、次に発行される ID を変える `is_called` を比較しない。248 行は実在する `roles` という DB の検査結果をロール名一覧で上書きし、その表とシーケンスの比較を失う。DB とロールの名前空間を分け、`is_called` を含めて比較し、両例を試験すること。行数・拡張名・ロール名の比較は有用だが、行内容、ロール属性、拡張の版の一致まで証明しない。比較一致が全行の完全な移行を意味するという表現を狭めること。通常の `pg_dumpall` と `ON_ERROR_STOP` は妥当な出発点で、この指摘は検証保証の範囲に対するもの。 + +### 認証・堅牢化・文書 + +**MD5 の判断:** この隔離された開発ネットワークに限定し、明示的に受容する暫定互換性例外としては許容できる。内部ネットワーク一般の安全性を保証するものではない。PostgreSQL は MD5 を弱く非推奨とし、MD5 の HBA 規則でも保存済み検証子が SCRAM なら SCRAM を選ぶ。従って CAS と osf.io のログインロールを分け、osf.io の実際の libpq の対応を確認して SCRAM 形式でパスワードを設定し直せば併存できる。ロールの設定値だけ変えても既存検証子は変換されない。現状は `compose.py` 878、963–967 行で両者が `postgres` を共用しているため、ロール分離と資格情報・設定変更が前提。JDBC 42.2 は Java 8 以降向けに SCRAM を導入したが、更新先は歴史的最低版でなく保守済み修正版を選ぶべきである。根拠: [PostgreSQL 認証仕様](https://www.postgresql.org/docs/18/auth-password.html)、[JDBC 42.2 リリース](https://www.postgresql.org/about/news/jdbc-4220-released-1825/)。 + +**固定と権限:** 移行先 manifest と移行元定数は完全な SHA-256 固定を持つ。テンプレートは明示的 PGDATA と親 tmpfs を維持する。移行サーバーはネットワーク・TCP なし、読取り専用 root、no-new-privileges、記録済みの五 capability を使う。版読取りは uid 999 と読取り専用 mount を使う。バックアップ 0700、ファイル 0600 は適切。通常経路では秘密値は argv でなく env file を通り、アプリケーションの報告に出ない。ただしレジストリの真正性や Linux 実行を確認したわけではない。復元失敗時に秘密を含む SQL/COPY データが PostgreSQL コンテナログへ出ないことも試験すべきで、Python 側の subprocess 出力を捨てるだけではログへの秘密流出禁止を証明できない。 + +**ADR-13 の正確さ:** osf.io の固定コミット `fe90e5c39e660f464bb8fcc9ae4028119b958d19` の関連ソースを GitHub 経由で読んだ。無効時に検索 decorator が `None` を返すこと、ES2 の型と filtered query、環境変数で上書きされなければ PostgreSQL 設定から Mongo URL を組み立てる wiki 設定、ShareJS を使いつつ HTTP PUT で保存するファイルエディタは、移行上の懸念を裏付ける。ただし wiki の draft reader の失敗から、ShareJS の下書き内容が保存済みファイルに一度も到達していないとは証明できない。測定した wiki reader に主張を限定すること。約 5,300 行は影響するコード範囲であり全行書直しの実測量ではない。「すべてのページが表示」は測定した入口に限るべきである。試作パッチ、完全な測定ログ、PR40 後のブラウザ結果は PR 内にないため、数値と普遍的な主張は著者報告のまま。今回 Mongo/ES の撤去はない。新 ADR は英和構成と Proposed を備え docs_check は通る。ADR-12 のインライン操作列は SPEC-06 §3 に従う実行場所・期待結果付き fenced 手順にし、無条件の「失敗時無変更」の約束は R1-01/R1-02 と一緒に修正すること。 + +### 検証結果 + +レビューでの測定であり manifest の正本データではない。システム Python は `/usr/bin/python3` 3.9.6。 + +```toon +checks[5]{check,exit,result}: + "全単体試験",1,"431 件; エラー 12; スキップ 10" + "database 単体試験",0,"17 件合格" + "記録追加前 docs_check",0,"144 ファイル; 例外 8; 警告 37" + "manifest_check",0,"指摘 0; 追跡ファイル 665 件走査" + "疑似障害注入",0,"第二改名失敗で現行消失; 停止失敗でも成功; 中断で cleanup なし; 記録失敗は未捕捉; 版不明を許可" +``` + +全試験の 12 エラーは Python 3.9 で解釈できない `test_compose.py:38` の型注釈とその依存 import に由来する。このファイルは base `48d0134347e681c00ebb95246eab26f9e7de3c92` から無変更だが、システム Python で全試験合格とは報告しない。database の 17 件は合格した。ログと独立 probe は `/tmp/pr42-rev-yvCJXJ/` にあり、疑似データのみを扱う。 + +独立クローンのルートで再現する。期待する終了値は測定表の通り。 + +```sh +PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests +PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests -p test_database.py +/usr/bin/python3 tools/docs_check.py +/usr/bin/python3 tools/manifest_check.py +/usr/bin/python3 /tmp/pr42-rev-yvCJXJ/probe.py +``` diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR42_PostgreSQL18_r2.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR42_PostgreSQL18_r2.md new file mode 100644 index 0000000..6b9ee7f --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR42_PostgreSQL18_r2.md @@ -0,0 +1,119 @@ +# PR42 PostgreSQL 18 review r2 / PostgreSQL 18 レビュー r2 + +> **Summary:** Changes requested. Ordinary interruption recovery improves substantially, but recovery can discard its journal after failed compensation, and lifecycle operations do not share the migration lock throughout their critical sections. +> **概要:** 要修正。通常の中断復旧は大きく改善したが、補償失敗後に復旧記録を捨てる経路があり、起動・リセットとの排他も完結していない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** recovery itself needs failure tests and durability ordering; a journal and a lock are insufficient when a recovery error deletes the journal or another command bypasses the lock. / 復旧自身にも障害試験と永続化の順序が要る。復旧の失敗で記録を削除したり、別コマンドがロックを迂回したりすると、記録とロックがあるだけでは守れない。 +- Applies to: RCOSDP/RDM-developer-guide PR #42, diff `2b6a02a..5780b16`, head `5780b16e1592c070f62de6a56832b50c1914e649`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r1](2026-11-10_RDM-developer-guide_PR42_PostgreSQL18_r1.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-02](../spec/02_installer_cli.md) · [ADR-12](../decisions/ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md) · [ADR-13](../decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md). +- Used by: [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and required changes + +**Changes requested.** All supplied unit suites pass on system Python, but the independent probes reproduce two unsafe recovery/concurrency cases. References are to [database.py](../../installer/grdm_dev/database.py) and [lifecycle.py](../../installer/grdm_dev/lifecycle.py) at the reviewed head. + +1. **R2-01 · P1 — Keep the journal if compensation also fails (R1-01 remains open).** `recover` lines 576–581 and 589–594 catch every `OSError` from `_swap` and delete the journal while claiming the current directory is unchanged. `_swap` lines 606–611 can raise because both the replacement rename and the compensating rename failed, leaving the current directory absent. Reproduction: crash before the first swap rename, then recover with the first rename successful and the next two returning EIO. Both upgrade and rollback recovery return **0**, with **no current directory and no journal**. A later `up` can treat that missing directory as a new installation. Distinguish a verified compensated result from an incomplete swap; preserve the journal and return 15 unless the actual directory state establishes a safe completed outcome. Cover repeat failures during recovery, including failed compensation. + +2. **R2-02 · P1 — Serialize lifecycle changes with migration, including the period before journal creation (R1-02 remains open).** `recover_pending` lines 627–631 bypasses the lock when no journal exists, and releases it before `up` starts Compose or `reset` deletes volumes. Upgrade/rollback check running services before confirmation and before writing the journal. A second `up` can therefore start PostgreSQL after rollback checked for stopped services but before rollback swaps its data directories. An injected interleaving at `Context.confirm` reproduced a Compose `up` call while rollback held its lock; rollback then returned 0 and replaced the current 18 directory with 9.6. A simpler held-lock/no-journal probe also reached Compose. The fake health result was exit 40, not a DB refusal; no real server was started. Make lifecycle and DB commands use the same lock even when no journal exists, and hold it through the start/deletion operation and necessary checks. Test both directions of the race and `reset`. + +3. **R2-03 · P1 — Persist recovered renames before retiring the journal (R1-01 remains open).** Recovery's direct renames at lines 571, 573 and 596 never sync the volumes parent before writing the record and deleting the journal. The normal `_swap` path does sync it, showing the intended ordering. A probe recovering a crash between the two renames observed exit 0 and no volumes-parent sync for both upgrade and rollback. On a power loss, the record/journal deletion can survive without the recovered directory rename; process-exception tests cannot prove power-loss durability. Also `_fsync_dir` lines 284–294 silently ignores open/fsync errors, so even the initial write-ahead journal may be treated as durable after EIO. Sync every affected directory before declaring recovery complete, propagate unexpected durability errors while retaining recoverability, and test sync failures and ordering. No physical power-loss test was performed; the missing ordering is established by code inspection and call instrumentation. + +4. **R2-04 · P2 — Convert invalid encoding in PG_VERSION into exit 15 (R1-04 partially open).** `data_major` line 184 reads ASCII but catches only filesystem exceptions. A PG_VERSION containing byte `0xff` raises an uncaught `UnicodeDecodeError` through `up`; it does not return the documented refusal code 15. Compose is not reached, so this is an error-contract defect rather than a fail-open start. Treat decoding failures as an unknown version and add a test through the command entry point. + +### R1 closure and owner decisions + +**R1-03 closed for the reviewed scope:** disk capacity is checked before source startup; same/different filesystem budgets include both dump copies, the replacement cluster and margins; the documentation states the estimate is not a guarantee. Supplied low-space and ENOSPC tests pass. **R1-05 closed:** the SQL includes `is_called`, database snapshots use a separate namespace from roles, and tests detect a changed `roles` database and sequence state. Snapshot equality is correctly limited to counts/state/names/selected role attributes, not row-content equality. R1-01/R1-02 remain open for the findings above; R1-04 is otherwise improved and fails closed for ordinary unreadable, missing-in-nonempty and malformed ASCII cases. + +ADR-13 now records the owner's choices: Elasticsearch 8 with full-text search; the file-page editor on y-websocket before retiring sharejs/mongo; MFR freecad removal and allow-listing distribution packages without fixes. These are recorded choices, not implementations validated by PR #42. The draft export/discard decision remains for the migration work. The narrower claims about affected code size, probed endpoints and the wiki draft reader address r1; prototype measurements are explicitly author-reported. Minor editorial inconsistency: the header still says “Records a decision for: nothing yet” although §4 records choices; align that line while retaining the distinction between chosen direction and the Proposed record. No further owner approval is inferred by this review. + +ADR-12's unconditional claim that a crash at any point is recoverable is premature until R2-01–03 are resolved. Its disk paragraph also says a full disk leaves the old cluster in place, while the supplied post-swap ENOSPC tests intentionally finish the new cluster; describe both safe recovery outcomes. + +### Validation and limits + +Clean clone: `/tmp/pr42-rev-r2/repo`; system interpreter: `/usr/bin/python3` 3.9.6. These are review measurements, not canonical manifest data. + +```toon +checks[5]{check,exit,result}: + "installer unit suite",0,"573 tests; 10 skipped" + "tools unit suite",0,"93 tests passed" + "docs_check before report",0,"145 files; 8 exempt; 36 warnings" + "manifest_check",0,"0 findings; 666 tracked files scanned; 63 skipped" + "independent synthetic probes",0,"single-crash boundaries recover; repeated rename failure, lock bypass, missing directory sync and decode exception reproduced" +``` + +The independent script exercised 162 injected crash boundaries (128 upgrade, 34 rollback), all recovered under the single-crash model. It wraps both sides of every observed Docker call, durable JSON write, rename/replace, fsync, mkdir/unlink, snapshot, readiness check, restore-file construction and journal removal in successful upgrade and rollback traces. Each injected uncatchable exception is followed by recovery and checks for a readable current major, no pending journal, no tracked server and an upgrade record when current is 18. It also probes repeated recovery failures and the lifecycle interleaving. This is a synthetic process-crash model, not emulated filesystem persistence or a real kill of Docker. Supplied tests additionally cover catchable interruption, SIGTERM, stop/removal failures, a competing DB process, disk checks and inventory comparisons. + +Logs and runnable probe are `/tmp/pr42-rev-r2/{units,tools-units,docs,manifest,probe}.log` and `/tmp/pr42-rev-r2/probe.py`. Reproduce from the clone root; expected exits are 0 (probe exit 0 means the reported behavior was reproduced, not that the implementation passed review): + +```sh +PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests +/usr/bin/python3 -m unittest discover -s tools/tests +/usr/bin/python3 tools/docs_check.py +/usr/bin/python3 tools/manifest_check.py +/usr/bin/python3 /tmp/pr42-rev-r2/probe.py +``` + +No real grdm-dev Docker state or existing runtime/.env was accessed; unit fixtures use temporary synthetic credentials. No commit, push, approval, merge or closure was performed. Real migration, SQL execution on both PostgreSQL versions, Linux ownership, amd64 execution, power-loss persistence and browser acceptance were not independently exercised. The real-operation evidence in ADR-12 remains author-reported. The untracked report was also checked directly with `docs_check.check_file` (0 errors). Only this review file is added to the clone; the probe and logs are outside it. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と必須修正 + +**要修正(changes requested)。** システム Python で提供された単体試験はすべて合格したが、独立試験で復旧と競合の危険な経路を再現した。行番号は対象 head の [database.py](../../installer/grdm_dev/database.py) と [lifecycle.py](../../installer/grdm_dev/lifecycle.py) を指す。 + +1. **R2-01 · P1 — 補償も失敗した場合は記録を保持する(R1-01 未解決)。** `recover` 576–581、589–594 行は `_swap` の全 `OSError` を捕捉し、現行は無変更と報告して記録を削除する。しかし `_swap` 606–611 行は、置換の改名と補償の改名が両方失敗し、現行が消えた場合にも例外を送出する。最初の改名前にクラッシュさせ、次の復旧で一回目だけ成功、二・三回目を EIO にすると、upgrade と rollback の両方で **終了 0、現行パスなし、記録なし** となった。後続 `up` は新規環境として扱い得る。補償成功を実際のディレクトリ状態で確認し、不完全なら記録を保持して終了 15 にすること。復旧中の再障害・補償失敗を試験すること。 + +2. **R2-02 · P1 — 記録作成前も含め、起動・リセットと移行を排他にする(R1-02 未解決)。** `recover_pending` 627–631 行は記録がなければロックを取らず、記録があっても Compose 起動やボリューム削除前に解放する。upgrade/rollback は停止検査後に確認を求め、その後で記録を書く。この間に別の `up` が起動すると、rollback は使用中のデータを改名する。`Context.confirm` で割り込ませると、rollback がロック保持中にも Compose `up` に到達し、rollback は終了 0 で現行を 18 から 9.6 へ替えた。ロックだけを保持する試験でも起動に到達した。疑似 health の終了値は 40 であり DB 拒否ではない。実サーバーは起動していない。記録の有無によらず共通ロックを取り、必要な検査から起動・削除まで保持すること。逆順の競合と `reset` も試験すること。 + +3. **R2-03 · P1 — 復旧改名を永続化してから記録を捨てる(R1-01 未解決)。** 復旧の直接改名(571、573、596 行)には volumes 親の同期がなく、記録更新・削除へ進む。通常の `_swap` は同期している。二回の改名の間でクラッシュさせた後の復旧では、upgrade/rollback とも終了 0 だが volumes 親の同期は一度もなかった。電源断で記録更新・削除だけが残り、改名が残らない可能性がある。さらに `_fsync_dir` 284–294 行は open/fsync の失敗を無視し、先行記録の EIO でも永続化済み扱いになる。影響する親を同期してから完了とし、予期しない永続化失敗を返して復旧可能性を残すこと。同期の失敗と順序を試験すること。物理的な電源断は行っておらず、コードと呼出し記録で順序の欠落を確認した。 + +4. **R2-04 · P2 — PG_VERSION の文字コード不正も終了 15 にする(R1-04 一部未解決)。** `data_major` 184 行は ASCII で読むが、捕捉するのはファイルシステムの例外だけである。`0xff` を含む PG_VERSION では `up` から未捕捉の `UnicodeDecodeError` が出る。Compose には到達しないため、誤起動ではなく終了値の契約違反である。版不明として扱い、コマンド入口から終了 15 を試験すること。 + +### R1 の解決状況と所有者の判断 + +**R1-03 は今回の範囲で解決。** 旧サーバー起動前に容量を検査し、同一/別ファイルシステムで二つのダンプ・新クラスタ・余裕を計算する。固定倍率は保証ではないと明示され、空き不足・ENOSPC の試験も合格した。**R1-05 は解決。** SQL は `is_called` を含み、DB とロールの名前空間を分け、`roles` DB とシーケンスの変化を検出する。比較は行数・状態・名前・一部ロール属性までで、行内容の同一性は保証しないと明記した。R1-01/R1-02 は前記の理由で未解決。R1-04 は通常の読取り不能・非空ディレクトリの版欠落・不正な ASCII については拒否するよう改善した。 + +ADR-13 は所有者の選択として、全文検索を維持した Elasticsearch 8、sharejs/mongo 退役前のファイルエディタの y-websocket 移行、MFR freecad 撤去と配布元の修正がない OS パッケージの許容を記録した。PR #42 が実装・検証した結果ではない。下書きの書出し/破棄は移行作業で決める事項として残る。影響コード量・測定した入口・wiki の下書き reader へ主張を狭め、試作の測定を著者報告とした点は r1 に対応する。軽微な文言として、§4 に選択を記録しながらヘッダは “Records a decision for: nothing yet” のままなので、方向の決定と記録の Proposed 状態を区別して整合させたい。このレビューが追加の所有者承認を与えるものではない。 + +ADR-12 の「どの時点のクラッシュも復旧」は R2-01–03 解決前には強すぎる。また容量不足なら旧クラスタがそのまま残るとの記述に対し、切替後 ENOSPC の単体試験は新版への復旧完了を期待する。安全な二つの復旧結果を説明すること。 + +### 検証と限界 + +独立クローンは `/tmp/pr42-rev-r2/repo`、システム Python は `/usr/bin/python3` 3.9.6。次はレビュー測定であり manifest の正本ではない。 + +```toon +checks[5]{check,exit,result}: + "installer 単体試験",0,"573 件; 10 件スキップ" + "tools 単体試験",0,"93 件合格" + "記録追加前 docs_check",0,"145 ファイル; 例外 8; 警告 36" + "manifest_check",0,"指摘 0; 追跡 666 ファイル走査; 63 件スキップ" + "独立疑似試験",0,"単発クラッシュから復旧; 連続改名失敗・ロック迂回・親同期欠落・デコード例外を再現" +``` + +独立スクリプトは 162 箇所(upgrade 128、rollback 34)にクラッシュを注入し、単発クラッシュモデルでは全件復旧した。成功する upgrade/rollback の全観測 Docker 呼出し、永続 JSON 書込み、rename/replace、fsync、mkdir/unlink、snapshot、起動待ち、復元ファイル作成、記録削除の前後に捕捉不能の例外を注入した。次回復旧で現行版が読めること、記録と追跡サーバーが残らないこと、現行 18 なら upgrade 記録があることを検査した。復旧の連続障害と起動の割込みも試した。これは疑似プロセスクラッシュであり、ファイルシステム永続化の模擬や実 Docker の kill ではない。提供試験では通常の中断、SIGTERM、停止・削除失敗、別 DB プロセス、容量、照合も検証した。 + +ログは `/tmp/pr42-rev-r2/{units,tools-units,docs,manifest,probe}.log`、再現用スクリプトは `/tmp/pr42-rev-r2/probe.py`。クローンのルートで次を実行すると全コマンドの期待終了値は 0。probe の 0 は問題の再現成功であり、レビュー合格ではない。 + +```sh +PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests +/usr/bin/python3 -m unittest discover -s tools/tests +/usr/bin/python3 tools/docs_check.py +/usr/bin/python3 tools/manifest_check.py +/usr/bin/python3 /tmp/pr42-rev-r2/probe.py +``` + +実 grdm-dev の Docker 状態と既存 runtime/.env には触れていない。単体試験の資格情報は一時ディレクトリの疑似値である。コミット・push・承認・マージ・close は行っていない。実移行、両 PostgreSQL 版での SQL 実行、Linux 所有権、amd64、電源断の永続化、ブラウザ受入は独立検証していない。ADR-12 の実運用測定は著者報告として扱う。未追跡のレビュー記録も `docs_check.check_file` で直接検査し、エラー 0 を確認した。クローン内への追加はこのレビューのみで、probe とログは外に置いた。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR42_PostgreSQL18_r3.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR42_PostgreSQL18_r3.md new file mode 100644 index 0000000..4919ee5 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR42_PostgreSQL18_r3.md @@ -0,0 +1,100 @@ +# PR42 PostgreSQL 18 review r3 / PostgreSQL 18 レビュー r3 + +> **Summary:** Changes requested: the four r2 reproductions are fixed, but a durability error during pending recovery escapes the `db upgrade` command instead of returning 15. +> **概要:** 要修正。r2 の四つの再現事象は修正済みだが、保留中の復旧で同期に失敗すると `db upgrade` は終了 15 を返さず例外を外へ出す。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** propagating durability errors also requires every command that invokes recovery to translate them into its documented exit code. / 永続化の失敗を伝える修正には、復旧を呼ぶすべてのコマンドで、その失敗を規定の終了値へ変換する必要がある。 +- Applies to: RCOSDP/RDM-developer-guide PR #42, diff `5780b16..7e61df3`, head `7e61df3c84207c9342745f5c80d18ac708f0bb63`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r2](2026-11-10_RDM-developer-guide_PR42_PostgreSQL18_r2.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-02](../spec/02_installer_cli.md) · [ADR-12](../decisions/ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md). +- Used by: [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and finding + +**Changes requested. R3-01 · P2: translate recovery OSError in `db upgrade` to exit 15.** In [database.py](../../installer/grdm_dev/database.py), `run_upgrade` (lines 751–760) catches only `UpgradeError`, but `_upgrade_locked` calls `recover` at line 765 before entering its later error handler. With a pending swap whose two renames have finished, an EIO from `_fsync_dir(current.parent)` in `recover` (line 608) escapes through the actual `cli.main` entry point as an uncaught `OSError`. The CLI catches only KeyboardInterrupt. The new strict fsync behavior exposes this route; `run_recover` and `run_rollback` already catch both exception types. + +Independent reproduction: create a valid pending upgrade at the swap boundary, perform its two renames without retiring its journal (the state after a crash before record creation), inject EIO for the volumes-parent sync, then call `cli.main(['--root', fixture_root, '--yes', 'db', 'upgrade'])` with a fake Docker runner. It raises OSError rather than returning 15. Current remains PostgreSQL 18 and the journal remains; a later fault-free `db recover` succeeds. This is an error-contract defect, not observed data loss or a fail-open start. Catch OSError around the complete locked upgrade including initial recovery, retain the journal, and add an entry-point test for this state. + +### R2 closure and regression checks + +- **R2-01 closed:** both upgrade and rollback recovery return 15 and retain the journal when replacement and compensation renames both fail. Persistent subsequent failures also refuse `up` and recovery; removing the fault permits recovery to finish with the expected major and no journal. +- **R2-02 closed:** the common lock excludes `up` even without a journal and throughout rollback confirmation. Independent callbacks during Compose start, reset shutdown and reset deletion reject all three DB actions with 15. Supplied tests also check the reverse reset direction and a competing process. No real Docker command was executed by these probes. +- **R2-03 original reproduction fixed; R3-01 remains:** recovered upgrade/rollback renames sync the volumes parent before journal removal, and EIO is no longer swallowed. Supplied ordering and persistent-sync-error tests pass. The documented EINVAL/ENOTSUP exceptions remain intentional; process-crash tests do not prove power-loss durability. +- **R2-04 closed:** non-ASCII PG_VERSION now returns 15 through `up`, without starting Compose; supplied tests also cover unreadable helper output. + +The original 162-point matrix (128 upgrade, 34 rollback) passes unchanged in boundary count. It injects an uncatchable exception before and after every observed Docker call, durable JSON write, rename/replace, fsync, mkdir/unlink, snapshot, readiness wait, restore-file construction and journal removal. Recovery checks a readable current major, absence of a pending journal and tracked servers, and an upgrade record when current is 18. Double failures and lifecycle interleavings are separate probes. ADR-12 now distinguishes pre-swap and post-swap disk-full outcomes; ADR-13 aligns its header with the recorded owner choices. No other blocking regression was found in the scoped diff. + +### Validation and limits + +Clean clone: `/tmp/pr42-rev-r3/repo`; system Python: `/usr/bin/python3` 3.9.6. Results are review measurements, not canonical manifest data. + +```toon +checks[6]{check,exit,result}: + "installer unit suite",0,"583 tests; 10 skipped" + "tools unit suite",0,"93 tests" + "docs_check",0,"146 files; 8 exempt; 36 warnings" + "manifest_check",0,"0 findings; 667 tracked files scanned; 63 skipped" + "independent r2 probes",0,"162 crash boundaries plus double failures, lock, sync and encoding checks pass" + "extra probes",0,"concurrency passes; R3-01 uncaught exception reproduced; later recovery passes" +``` + +Run from the clone root; all listed script exits are 0. The extra probe's exit 0 means the defect was reproduced, not review approval. Logs and scripts are outside the clone in `/tmp/pr42-rev-r3/`. + +```sh +PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests +/usr/bin/python3 -m unittest discover -s tools/tests +/usr/bin/python3 tools/docs_check.py +/usr/bin/python3 tools/manifest_check.py +/usr/bin/python3 /tmp/pr42-rev-r3/probe.py +/usr/bin/python3 /tmp/pr42-rev-r3/extra.py +``` + +The untracked review was checked directly with `docs_check.check_file` (0 errors). Only this report is added to the clone; no commit, push, merge, approval or closure is performed. One Japanese PR comment reports the verdict. Existing runtime/.env and the grdm-dev Docker stack were not accessed or changed; fixtures use temporary synthetic credentials. Real PostgreSQL migration, Linux ownership, amd64, physical power loss and browser acceptance were not independently exercised. The matrix models process interruptions, not filesystem persistence or live Docker kills. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +**要修正(changes requested)。R3-01 · P2: `db upgrade` の復旧中の OSError を終了 15 にする。** [database.py](../../installer/grdm_dev/database.py) の `run_upgrade`(751–760 行)は `UpgradeError` だけを捕捉するが、`_upgrade_locked` は後段の例外処理より前(765 行)で `recover` を呼ぶ。二つの改名が完了し操作記録が残っている状態で、`recover` の `_fsync_dir(current.parent)`(608 行)が EIO になると、実際の `cli.main` から未捕捉の OSError が出る。CLI が捕捉するのは KeyboardInterrupt だけである。今回の fsync 失敗を伝える修正でこの経路が表面化した。`run_recover` と `run_rollback` は両例外を捕捉済みである。 + +独立再現では、切替直前の有効な操作記録を作り、二つの改名だけを完了させた(記録作成前のクラッシュ後に相当)。volumes 親の同期へ EIO を注入し、疑似 Docker を使って `cli.main(['--root', fixture_root, '--yes', 'db', 'upgrade'])` を呼ぶと、15 を返さず OSError が出た。現行は PostgreSQL 18、操作記録も残り、障害を除いた後の `db recover` は成功する。観測したのは終了値の契約違反であり、データ喪失や誤起動ではない。ロック内の初回復旧を含む全体で OSError を捕捉し、操作記録を保持して 15 を返すこと。この状態をコマンド入口から試験すること。 + +### R2 の解決と回帰確認 + +- **R2-01 解決。** upgrade/rollback とも置換・補償の改名が二重に失敗すると終了 15 で記録を保持した。障害が続く間は `up` と復旧を拒否し、除去後は期待する版へ復旧して記録が消える。 +- **R2-02 解決。** 記録なしでも共通ロックが `up` を拒否し、rollback の確認中も排他が続く。Compose 起動、reset の停止・削除中に三つの DB 操作を割り込ませる独立試験はすべて 15 で拒否した。提供試験は逆向きの reset と別プロセスの競合も検証する。独立試験で実 Docker コマンドは実行していない。 +- **R2-03 元の再現は修正済み、R3-01 が残る。** upgrade/rollback の復旧改名で記録削除前に volumes 親を同期し、EIO も無視しなくなった。提供された順序・同期失敗の試験も合格した。文書にある EINVAL/ENOTSUP の例外扱いは意図的である。プロセスクラッシュ試験は電源断の永続化を証明しない。 +- **R2-04 解決。** 非 ASCII の PG_VERSION は `up` から終了 15 になり Compose は起動しない。提供試験は補助コンテナ出力のデコード失敗も確認する。 + +元の 162 箇所(upgrade 128、rollback 34)の試験は同じ件数で全件合格した。観測した Docker 呼出し、永続 JSON 書込み、rename/replace、fsync、mkdir/unlink、snapshot、起動待ち、復元ファイル作成、記録削除の前後で捕捉不能な例外を注入する。復旧後に現行版が読めること、記録と追跡サーバーが残らないこと、現行 18 なら upgrade 記録があることを検査した。二重障害と競合は別途試験した。ADR-12 は容量不足の切替前後の結果を区別し、ADR-13 は見出しを所有者の選択記録に合わせた。対象差分に他の必須修正は見つからなかった。 + +### 検証と限界 + +クリーン clone は `/tmp/pr42-rev-r3/repo`、システム Python は `/usr/bin/python3` 3.9.6。次はレビュー測定であり manifest の正本ではない。 + +```toon +checks[6]{check,exit,result}: + "installer 単体試験",0,"583 件; 10 件スキップ" + "tools 単体試験",0,"93 件" + "docs_check",0,"146 ファイル; 例外 8; 警告 36" + "manifest_check",0,"指摘 0; 追跡 667 ファイル走査; 63 件スキップ" + "独立 r2 試験",0,"162 クラッシュ箇所と二重障害・排他・同期・文字コード試験に合格" + "追加試験",0,"競合試験合格; R3-01 の例外を再現; 後続復旧は成功" +``` + +再現コマンドは英語節と同じで clone のルートから実行する。各スクリプトの終了値は 0。追加試験の 0 は不具合の再現成功であり、レビュー合格ではない。ログとスクリプトは clone 外の `/tmp/pr42-rev-r3/` に置いた。 + +未追跡のレビューは `docs_check.check_file` で直接検査し、エラー 0 を確認した。clone 内への追加はこの記録のみで、commit・push・merge・approve・close は行わない。日本語の PR コメント一件で判定を報告する。既存 runtime/.env と grdm-dev の Docker 状態にはアクセスも変更もしておらず、試験の資格情報は一時ディレクトリの疑似値である。実 PostgreSQL 移行、Linux 所有権、amd64、物理電源断、ブラウザ受入は独立検証していない。この行列はプロセス中断の模擬であり、ファイルシステム永続化や実 Docker の kill ではない。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR42_PostgreSQL18_r4.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR42_PostgreSQL18_r4.md new file mode 100644 index 0000000..a7c0848 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR42_PostgreSQL18_r4.md @@ -0,0 +1,94 @@ +# PR42 PostgreSQL 18 review r4 / PostgreSQL 18 レビュー r4 + +> **Summary:** Pass. R3-01 is closed: recovery filesystem errors return 15 through every relevant command entry point, and pending recovery remains recoverable. +> **概要:** 合格。R3-01 は解決。復旧中のファイルシステム障害は関連する全コマンド入口から終了 15 となり、保留操作は再復旧できる。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** the initial recovery needs the same error boundary as the migration itself; checking actual command entry points confirms the exit contract. / 初回復旧にも移行本体と同じ例外境界が必要であり、実コマンド入口の試験で終了値の契約を確認できる。 +- Applies to: RCOSDP/RDM-developer-guide PR #42, diff `7e61df3..d49945c`, head `d49945c78bd5d87efc5c7985142c0ecb5520a025`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r3](2026-11-10_RDM-developer-guide_PR42_PostgreSQL18_r3.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-02](../spec/02_installer_cli.md) · [ADR-12](../decisions/ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md). +- Used by: [Status board](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Pass; R3-01 closed.** No blocking regression found in the scoped diff. `run_upgrade` now catches OSError around the entire locked operation, including its initial recovery. The common filesystem-error message distinguishes a remaining journal from no pending operation; recover and rollback use it too. The fallback recovery message avoids reporting `None` after an operation has already retired its journal. + +The r3 reproduction now returns 15 from actual `cli.main`, retains the pending journal and current PostgreSQL 18 directory, then completes recovery after fault removal. Persistent fsync EIO was also injected through all five entry points: `db upgrade`, `db rollback`, `db recover`, `up --no-open`, and `reset`. Every entry returns 15 and retains the pending journal; later recovery succeeds. Unit tests separately inject the exact volumes-parent synchronization fault at those five entries. + +Every observed fsync on successful upgrade, rollback and pending-upgrade recovery was individually failed once with EIO: 10, 6 and 4 sites respectively. All return 15 through the CLI, mention the injected error, and permit later recovery with a readable current major, no journal and no tracked temporary server. Journal retention applies to unfinished recovery: a fault before initial journal publication or after journal unlink need not leave a journal. The patch accurately reports that distinction; these tests do not claim unconditional retention after completed retirement. + +The unchanged 162-point crash matrix passes (128 upgrade, 34 rollback). The r3 double-rename failures, lock-only refusal, non-ASCII version, recovery parent synchronization, rollback confirmation race and lifecycle interleavings also pass. The r3 extra probe was updated only to require exit 15 instead of expecting the former uncaught exception, and to import the new clone. + +### Validation and limits + +Clean clone: `/tmp/pr42-rev-r4/repo`; system Python: `/usr/bin/python3` 3.9.6. Logs and probe scripts: `/tmp/pr42-rev-r4/`. Results are review measurements, not canonical manifest data. + +```toon +checks[8]{check,exit,result}: + "installer units",0,"587 tests; 10 skipped" + "tools units",0,"93 tests" + "docs_check",0,"147 files; 8 exempt; 36 warnings" + "manifest_check",0,"0 findings; 668 scanned; 63 skipped" + "r3 probes",0,"162 crash boundaries and regression probes pass" + "r3 extra",0,"R3-01 closed; lifecycle interleavings pass" + "EIO probes",0,"20 fsync sites; 5 persistent-error entry points pass" + "diff whitespace",0,"no errors" +``` + +Commands run from the clone root: + +```sh +PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests +/usr/bin/python3 -m unittest discover -s tools/tests +/usr/bin/python3 tools/docs_check.py +/usr/bin/python3 tools/manifest_check.py +/usr/bin/python3 /tmp/pr42-rev-r4/probe.py +/usr/bin/python3 /tmp/pr42-rev-r4/extra.py +/usr/bin/python3 /tmp/pr42-rev-r4/eio.py +git diff --check 7e61df3..d49945c +``` + +This untracked report was checked directly using `docs_check.check_file`: 0 errors and 0 warnings. The only clone addition is this report; no commit, push, approval, merge or closure is performed. One Japanese PR comment reports the verdict. Existing runtime/.env and the grdm-dev Docker stack were not accessed or changed. Synthetic fixtures and fake Docker runners do not validate real PostgreSQL migration, Linux ownership, amd64, browser acceptance or physical power-loss durability. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**合格(pass)、R3-01 解決。** 対象差分に必須修正となる回帰は見つからなかった。`run_upgrade` は初回復旧を含むロック内の操作全体で OSError を捕捉する。共通の障害メッセージは journal が残る場合と保留操作がない場合を区別し、recover と rollback も利用する。操作記録を削除済みの復旧結果が `None` と表示されることも防ぐ。 + +r3 の再現は実際の `cli.main` から終了 15 となり、保留 journal と現行 PostgreSQL 18 を保持し、障害除去後の復旧に成功した。継続する fsync EIO を `db upgrade`、`db rollback`、`db recover`、`up --no-open`、`reset` の五つの入口へ注入し、すべて終了 15、保留 journal の保持、後続復旧の成功を確認した。提供単体試験は、この五入口で volumes 親ディレクトリ同期の元の障害も個別に検証する。 + +正常経路で観測した fsync の全箇所へ一度ずつ EIO を注入した。upgrade 10、rollback 6、保留 upgrade の recover 4 箇所で、すべて CLI から 15 を返し、注入した障害を表示した。その後の復旧では現行版が読め、journal と追跡する一時サーバーが残らない。journal 保持は未完了の復旧に対するもので、最初の記録公開前や記録 unlink 後の障害では記録が残るとは限らない。修正後の表示はこの違いを正しく伝える。完了済み操作の記録が常に残ると主張する試験ではない。 + +既存の 162 箇所の中断行列(upgrade 128、rollback 34)は同じ件数で合格した。r3 の二重 rename 失敗、記録なしロック拒否、非 ASCII 版番号、復旧時の親同期、rollback 確認中の競合、lifecycle との競合も合格した。r3 の追加プローブは新 clone の import と、旧未捕捉例外の期待を終了 15 の期待へ置き換えた箇所のみ更新した。 + +### 検証と限界 + +クリーン clone は `/tmp/pr42-rev-r4/repo`、システム Python は `/usr/bin/python3` 3.9.6。ログとプローブは `/tmp/pr42-rev-r4/`。結果は manifest 正本ではなくレビュー測定である。 + +```toon +checks[8]{check,exit,result}: + "installer units",0,"587 tests; 10 skipped" + "tools units",0,"93 tests" + "docs_check",0,"147 files; 8 exempt; 36 warnings" + "manifest_check",0,"0 findings; 668 scanned; 63 skipped" + "r3 probes",0,"162 crash boundaries and regression probes pass" + "r3 extra",0,"R3-01 closed; lifecycle interleavings pass" + "EIO probes",0,"20 fsync sites; 5 persistent-error entry points pass" + "diff whitespace",0,"no errors" +``` + +実行コマンドは英語節に記載した。未追跡の記録は `docs_check.check_file` で直接検査し、エラー 0・警告 0 を確認した。clone への追加は本記録のみで commit・push・approve・merge・close は行わず、日本語 PR コメント一件で判定を報告する。既存 runtime/.env と grdm-dev Docker 状態にはアクセスも変更もしていない。疑似 fixture と Docker runner の試験では、実 PostgreSQL 移行、Linux 所有権、amd64、ブラウザ受入、物理電源断の永続化は検証していない。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR43_Osf_Mongo_TLS_r1.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR43_Osf_Mongo_TLS_r1.md new file mode 100644 index 0000000..3fc3ce7 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR43_Osf_Mongo_TLS_r1.md @@ -0,0 +1,92 @@ +# REV PR43 Osf Mongo TLS r1 / Mongo TLS 接続レビュー r1 + +> **Summary:** Independent review of PR #43 at 2141aed; the installer matches the verified Mongo TLS client and introduces no additional configuration mismatch. +> **概要:** PR #43 の 2141aed を独立レビューし、検証付き Mongo TLS クライアントとの設定整合を確認した。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** a dependency pin must be compared with its actual settings readers, including security changes that remain unmerged. / 依存先の固定変更は、未マージのセキュリティ変更と区別して、実際に設定を読むコードと照合する必要がある。 +- Applies to: [PR #43](https://github.com/RCOSDP/RDM-developer-guide/pull/43), head `2141aedeeb4f1f809f00cb3461f43ecb8b9c597a`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-02](../spec/02_installer_cli.md) · [ADR-07](../decisions/ADR-07_Native_Builds_of_EOL_Middleware.md). +- Used by: PR #43 integration decision. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**PASS.** No blocking security, correctness, or documentation finding in the nine changed files. Reviewed a clean detached clone, the full PR diff, rendered configuration tests, and a separate clean clone of RDM-osf.io-dev2027 at `8fc45de461fde227dc60c30a47139a61d6209a26`. + +### Evidence + +1. `installer/grdm_dev/compose.py:881–883` writes `mongodb://mongo:27017/sharejs?ssl=true` and `/mongo-tls/mongodb.crt`. The URL contains no credentials or verification bypass. Its hostname matches `CN=mongo` and `subjectAltName=DNS:mongo` in `templates/mongo.json`; its database and TLS option match `render_sharejs_env()`. +2. The four added mounts are `mongo_tls:/mongo-tls:ro` in web, api, admin and worker. The only other consumers are the existing mongo writer and sharejs read-only client. The private PEM stays in `mongo_data`, which none of those four services mount; only the public certificate is copied, with mode 0644. +3. The new renderer test checks both environment entries, all four read-only mounts, absence of `mongo_data`, and the certificate export and SAN. Existing tests check the sharejs recipe and the resolved websocket secret equality. +4. The old pin `fe90e5c39e660f464bb8fcc9ae4028119b958d19` to new pin diff contains only PR #9: wiki defaults, TLS utility code, and TLS tests. The fetched osf.io `develop` equals the new pin. `addons/wiki/settings/defaults.py:26` reads `SHAREJS_DB_CA_FILE`; `share_db_client_options()` supplies `ssl_ca_certs`, and `share_db()` rejects weakening URL options. No Dockerfile or other settings migration is introduced by the pin. +5. osf.io PR #8 was **OPEN**, with no merge commit or merge date at review time. `ENABLE_PUBLIC_ACCESS` is absent from the pinned website/API/admin code, so that unmerged setting requires no installer change in PR #43. Reassess it when PR #8 is integrated. +6. `Y_WEBSOCKET_SECRET` is read by wiki defaults and used by the Flask wiki page/token routes. Existing `web.json:29` maps it to `${Y_WEBSOCKET_JWT_SECRET}`, matching y-websocket's `JWT_SECRET`. Other services retain the older alias but do not serve those token routes; this pin introduces no new consumer needing the mapping. +7. ADR-07 now describes certificate and hostname verification in both languages, consistently with the pinned client; the stale CERT_NONE description is removed. + +### Validation and limits + +Commands ran from the clean guide clone using system-installed `python3` (`/opt/homebrew/bin/python3`, Python 3.15.2), without a virtual environment: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +``` + +```toon +checks[4]{name,result,exit}: + installer,540 tests OK (10 skipped),0 + tools,93 tests OK,0 + docs_check,PASSED (25 existing warnings),0 + manifest_check,PASSED (0 findings),0 +``` + +An initial invocation omitted PYTHONPATH and failed import discovery (exit 1). A retry with Apple's `/usr/bin/python3` 3.9.6 also failed (exit 1) because the repository uses newer union type syntax; neither is reported as a passing run. The final commands use the available system `python3` and the documented import path. + +No live TLS handshake or fresh-stack acceptance was performed. Tests use temporary synthetic configuration; no deployed `runtime/.env` was accessed, and no Docker stack state was changed. Existing certificates are not regenerated by the template: installation acceptance must still verify the persisted certificate and first-start availability. No commit, push, approval, merge, or closure was performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**PASS(合格)。** 変更された 9 ファイルに、統合を妨げるセキュリティ・動作・文書の指摘はない。クリーンな detached clone で差分全体と描画テストを確認し、別のクリーンな clone で RDM-osf.io-dev2027 の固定版 `8fc45de461fde227dc60c30a47139a61d6209a26` を照合した。 + +### 根拠 + +1. `installer/grdm_dev/compose.py:881–883` の URL は `mongodb://mongo:27017/sharejs?ssl=true`、CA は `/mongo-tls/mongodb.crt`。資格情報も検証回避オプションもなく、ホスト名は mongo の証明書生成条件 `CN=mongo` / `subjectAltName=DNS:mongo` と一致する。DB 名と TLS オプションも sharejs の描画設定と一致する。 +2. 追加マウントは web・api・admin・worker の `mongo_tls:/mongo-tls:ro` のみ。他は既存の mongo 書き込み元と sharejs 読み取り専用クライアントだけ。秘密 PEM は `mongo_data` に残り、4 サービスには渡らない。公開証明書だけがモード 0644 でコピーされる。 +3. 新しい描画テストは環境変数 2 件、4 サービスの読み取り専用マウント、`mongo_data` 非共有、証明書の出力先と SAN を確認する。既存テストは sharejs 設定と websocket 秘密値の一致を確認する。 +4. 旧固定 `fe90e5c39e660f464bb8fcc9ae4028119b958d19` からの差分は PR #9 の wiki 設定・TLS 実装・TLS テストだけ。取得した osf.io develop は新固定と一致する。wiki defaults が CA 環境変数を読み、`share_db_client_options()` が `ssl_ca_certs` を渡し、`share_db()` が検証回避 URL を拒む。Dockerfile や他の設定移行は含まれない。 +5. osf.io PR #8 は確認時点で **OPEN**、マージコミット・日時とも未設定。固定版の website/API/admin に `ENABLE_PUBLIC_ACCESS` はないため、本 PR での追加設定は不要。PR #8 統合時には再確認が必要。 +6. `Y_WEBSOCKET_SECRET` を読むのは wiki defaults で、Flask の wiki ページ・トークン発行経路が使用する。既存 `web.json:29` は `${Y_WEBSOCKET_JWT_SECRET}` を渡し、y-websocket の `JWT_SECRET` と一致する。他サービスは旧名を保持するが、このトークン経路を提供せず、今回の固定変更で新たな利用箇所も増えていない。 +7. ADR-07 は英和とも証明書・ホスト名の検証を説明し、固定版の実装と一致する。古い CERT_NONE の説明は除去されている。 + +### 検証と限界 + +クリーンな guide clone で仮想環境を使わず、システムにある `python3`(`/opt/homebrew/bin/python3`、Python 3.15.2)で英語節の 4 コマンドを実行した。 + +```toon +checks[4]{name,result,exit}: + installer,540 件成功 (10 件 skip),0 + tools,93 件成功,0 + docs_check,成功 (既存警告 25 件),0 + manifest_check,成功 (指摘 0 件),0 +``` + +初回は PYTHONPATH を省いたため import に失敗し終了 1。その後 Apple の `/usr/bin/python3` 3.9.6 でも、新しい union 型構文に対応しないため終了 1 となった。これらを成功扱いにはしていない。最終確認は利用可能なシステム python3 と文書どおりの import パスで実行した。 + +実接続や新規スタックの受入は未実施。テストは一時領域の合成設定を使い、稼働環境の `runtime/.env` にはアクセスせず、Docker スタックの状態も変更していない。既存証明書はテンプレートで再生成されないため、配備時に永続化された証明書と初回起動時の可用性を確認する必要が残る。commit・push・approve・merge・close は行っていない。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r1.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r1.md new file mode 100644 index 0000000..6da698d --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r1.md @@ -0,0 +1,103 @@ +# PR44 Per-OS installers review r1 / OS 別インストーラーレビュー r1 + +> **Summary:** REV reviewed PR #44 at c2607e6. Changes are requested for path validation and the ZAP permission boundary. +> **概要:** REV は PR #44 の c2607e6 を確認した。パス検証と ZAP の権限境界について修正を求める。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** passing dry-run tests does not prove filesystem safety when mount names are escaped, paths are symlinks, or parent permissions differ from the assumed mode. / dry run の合格だけでは、mount 名のエスケープ、パスのシンボリックリンク、親の権限が想定と異なる場合の安全性は証明できない。 +- Applies to: [PR #44](https://github.com/RCOSDP/RDM-developer-guide/pull/44), `feat/per-os-installers-split`, head `c2607e60d3b9459d8a9132c662a72d838acb6f17`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra); 2026-11-10. +- Parent index / 親索引: [Reviews](README.md). +- Related: [SPEC-02](../spec/02_installer_cli.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-08](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md) · [DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md). +- Used by / 利用先: PR #44 revision and coordinator review / PR #44 の修正と統括レビュー。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Changes requested.** Reviewed the four prerequisite scripts, attributes, Python changes and their tests, ADR-08, SPEC-02/04, environment guidance and DEMO-21 evidence against `origin/develop`. Work used a clean scratch clone. No commit, push, approval, merge, stack operation or inspection of a real runtime credential file was performed. Tests used temporary fixtures; focused reproductions used dummy credentials and stub commands only. + +### Required changes + +**R1 — P2: Decode mount-table paths before testing credentials.** In `installer/install-ubuntu.sh:89–95`, `read -r` preserves the kernel's `\040` encoding, but the existence test treats it as literal filename characters. A shared home containing a space therefore bypasses exit 10. A fixture with a real dummy `.config/gh/hosts.yml` under `host home` and an escaped virtiofs mount entry continued into the stub apt actions and eventually exited 11, without the credential refusal. Decode the mount-field escapes safely and test spaces, backslashes and the supported filesystem types. Keep checking existence only. The check also covers only four names directly below a mount root; describe that limit rather than implying recursive detection of all credentials. + +**R2 — P2: Resolve WSL destinations before cloning or invoking the installer.** `installer/install-windows.ps1:234–246` checks the textual HOME and accepts an existing target directory; `installer/prereq-lib.sh:22` computes a logical path with `pwd`, which `install-ubuntu.sh:77–79` compares with `/mnt/*`. A home or target symlink to `/mnt/c/...` passes these textual checks. A scratch alias confirmed that PREREQ_ROOT retains the symlink spelling while `pwd -P` points elsewhere. The Windows bootstrap can consequently clone on the Windows disk before a downstream permission probe rejects it. Resolve the physical home and existing target, validate the physical parent for a new target, and apply the same physical-path guard in Ubuntu. Add symlink cases; the current test only asserts that the guard text exists. This is static analysis plus a local path reproduction, not a Windows execution claim. + +**R3 — P2: Enforce the parent permission boundary before making ZAP work directories world-writable.** `installer/grdm_dev/scan.py:905–917` uses `mkdir(exist_ok=True)` and `chmod(0777)` without checking that runtime is an owned, real 0700 directory. Normal `secrets init` establishes 0700, but `scan --dynamic` does not enforce it and an existing/copied runtime can be 0755. A direct stubbed run confirmed runtime remained 0755 while each work directory became 0777. Other local users can then write into a known work directory during the scan, substituting report contents or report symlinks. A genuine 0700 ancestor prevents this cross-user access; 0777 is acceptable only while that invariant actually holds. Validate ownership, physical directory identity and permissions before widening access; create work directories exclusively with unpredictable names and reject output symlinks. Add permissive-parent and pre-existing-symlink tests. The current `nosemgrep` rationale assumes rather than establishes the invariant. + +### Other review observations + +Consent precedes the planned sudo, administrator and package operations, with a separate root-equivalence warning for docker-group membership. `--yes` is explicit consent. Existing prerequisites are skipped, unsupported platforms fail, and downloads are not piped into a shell. Docker's apt key requires exactly one primary key and the pinned fingerprint; its source uses Signed-By. Scanner archives are checked against embedded SHA-256 values before extraction. macOS delegates verification to Homebrew and Windows uses Microsoft WSL distribution installation. Upstream artifact bytes and signatures were not independently downloaded during this review. + +The binfmt image is digest-pinned identically in the script and doctor hint. The one-shot commands use `--rm`, install only amd64 and uninstall only qemu-x86_64, with no host-directory or Docker-socket mount. They still grant full privileged-container access and change a host-global kernel registration; this is not capability-minimal isolation. The plan explains sudo, the purpose, replacement and reboot lifetime, but should explicitly name the privileged-container trust and effect on other users' workloads. ADR-08 remains Proposed for owner approval. Clarify the environment guide's blanket privileged prohibition as applying to application services, with the narrowly documented host-setup exception. + +The longer Linux arm64 timeout preserves explicit overrides and is limited to profiles with amd64 services. The libatomic1 addition and Linux Playwright dependency guidance match the documented failure. Tokens are only discussed as guidance; the shared-folder guard checks existence, not contents. The attributes explicitly protect Linux-executed files from CRLF conversion. + +DEMO-21's final results record 12 passed, zero failed/error/skipped and pytest exit 0. Its earlier failed runs remain visible. The 531-object, uid-2001 database migration and successful installation are author-recorded VM evidence, not independently rerun here. Ubuntu amd64 and real Windows remain unverified; deferred workflows and their helper are explicitly documented as pending owner credentials. They are not credited as CI evidence. Bilingual layout and Proposed status are present; documentation checks pass with warnings. + +### Validation + +Commands ran from the scratch clone root using system `/usr/bin/python3` 3.9.6. Results are review observations, not a mirror of a canonical dataset. + +```toon +checks[6]{command,result,exit}: + "PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests","632 tests; 10 skipped; OK",0 + "/usr/bin/python3 -m unittest discover -s tools/tests","93 tests; OK",0 + "/usr/bin/python3 tools/docs_check.py","151 files; 8 exempt; 38 warnings; passed before adding review",0 + "/usr/bin/python3 tools/manifest_check.py","passed; zero policy findings",0 + "bash -n installer/install-ubuntu.sh installer/install-macos.sh installer/prereq-lib.sh installer/install.sh","passed",0 + "command -v shellcheck","not installed; not run",1 +``` + +PowerShell was unavailable, so no live parser or WSL execution was claimed. Full logs are retained beside the clone in `/tmp/pr44-rev-DJJ5gv/`. Re-run focused tests and obtain owner-platform evidence after fixes; no runtime installation is required to reproduce R1–R3. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**Changes requested(修正要求)。** 四つの前提条件スクリプト、属性、Python の変更と試験、ADR-08、SPEC-02/04、環境手引き、DEMO-21 の証跡を `origin/develop` と比較した。作業は scratch のクリーンな clone で行った。commit・push・承認・merge・スタック操作・実際の runtime 資格情報ファイルの閲覧はしていない。試験は一時 fixture を使い、個別再現はダミーの資格情報とスタブだけを使った。 + +### 必要な修正 + +**R1 — P2: 資格情報を調べる前に mount 表のパスを復号する。** `installer/install-ubuntu.sh:89–95` の `read -r` はカーネルの `\040` を保持するが、存在検査はそれを文字どおりのファイル名として扱う。共有ホーム名に空白があると終了 10 を通過する。`host home` の下にダミーの `.config/gh/hosts.yml` を置き、virtiofs の mount 行をエスケープした fixture は、資格情報の拒否を出さずに apt のスタブへ進み、最終的に終了 11 になった。mount フィールドのエスケープを安全に復号し、空白・バックスラッシュ・対応するファイルシステムを試験すること。内容は読まず存在確認を維持すること。また検出対象は mount 直下の四つの名前だけなので、全資格情報を再帰的に検出するとの印象を避け、この制限を明記すること。 + +**R2 — P2: clone や実行の前に WSL の実際の配置先を解決する。** `installer/install-windows.ps1:234–246` は HOME の文字列を検査して既存の対象を受け入れる。`installer/prereq-lib.sh:22` は `pwd` で論理パスを作り、`install-ubuntu.sh:77–79` はそれを `/mnt/*` と比較する。ホームや対象が `/mnt/c/...` へのシンボリックリンクなら、この文字列検査を通る。scratch の別名で、PREREQ_ROOT はリンク名を維持し、`pwd -P` は別の実体を指すことを確認した。後段の権限検査が拒否する前に、Windows の起動処理が Windows ディスクへ clone できる。ホームと既存対象の実体を解決し、新規対象は親の実体を検査すること。Ubuntu 側も実体パスを検査し、リンクの試験を加えること。現在の試験は検査文字列の存在を assert するだけである。これは静的解析とローカルのパス再現であり、Windows 実機試験ではない。 + +**R3 — P2: ZAP 作業ディレクトリを全員書込み可にする前に親の権限境界を保証する。** `installer/grdm_dev/scan.py:905–917` は、runtime が実行者所有の実ディレクトリで 0700 かを確認せず、`mkdir(exist_ok=True)` と `chmod(0777)` を行う。通常の `secrets init` は 0700 にするが、`scan --dynamic` はそれを強制せず、既存・コピー済みの runtime は 0755 の場合がある。直接のスタブ実行で runtime が 0755 のまま各作業ディレクトリが 0777 になることを確認した。この場合、別のローカル利用者がスキャン中の既知の作業ディレクトリへ書込み、報告の内容や報告ファイルのリンクを差し替えられる。実際に 0700 の祖先があれば利用者間のアクセスを防げるので、0777 を許せるのはその条件が成立する間だけである。権限を広げる前に所有者・実体・モードを検証し、予測できない名前で排他的に作業ディレクトリを作り、出力リンクを拒否すること。親が公開モードの場合と既存リンクの試験を加えること。現在の `nosemgrep` の理由は条件を保証せず仮定している。 + +### その他の確認 + +予定された sudo・管理者・パッケージ操作の前に同意を求め、docker グループへの追加では管理者と同等になるとの警告を別に示す。`--yes` は明示的な同意である。既存の前提条件は飛ばし、未対応ホストは拒否し、ダウンロードをシェルへ流し込まない。Docker の apt 鍵は主鍵一つと固定指紋の一致を要求し、配布元は Signed-By を使う。スキャナーは展開前に固定 SHA-256 を検査する。macOS は Homebrew の検証を使い、Windows は Microsoft の WSL 配布機構を使う。今回は上流の配布物や署名を独立にダウンロードして照合していない。 + +binfmt のイメージはスクリプトと doctor の案内で同じダイジェストに固定されている。一時コマンドは `--rm` を使い、amd64 だけを登録し、qemu-x86_64 だけを解除する。ホストのディレクトリや Docker ソケットの mount はない。ただしコンテナには完全な privileged 権限を与え、ホスト全体のカーネル登録を変えるため、最小 capability による隔離ではない。計画は sudo・目的・置換・再起動までの寿命を説明するが、privileged コンテナを信頼することと他の利用者の処理への影響も明示すべきである。ADR-08 は所有者承認待ちの Proposed のままである。環境手引きの全面的な privileged 禁止はアプリケーションサービスへの規則と明確にし、ホスト準備の狭い例外を記録するとよい。 + +Linux arm64 の待ち時間延長は明示の上書きを維持し、amd64 サービスを持つプロファイルに限定される。libatomic1 と Linux 向け Playwright 依存関係の案内は記録された失敗に対応する。トークンは案内だけで扱い、共有フォルダの検査は内容を読まない。属性は Linux で実行するファイルを明示的に CRLF 変換から保護する。 + +DEMO-21 の最終結果は 12 件合格、失敗・エラー・skip がゼロ、pytest 終了 0 を記録している。以前の失敗も残されている。uid 2001・531 対象の DB 移行と導入成功は著者の VM 記録であり、今回再実行していない。Ubuntu amd64 と Windows 実機は未検証で、ワークフローと補助ファイルは所有者の資格情報待ちと明記されているため、CI の証拠には数えない。英和構成と Proposed 状態を確認し、文書検査は警告付きで合格した。 + +### 検証 + +clone のルートからシステムの `/usr/bin/python3` 3.9.6 で実行した。結果はレビュー時の観測であり、別の正本データの写しではない。 + +```toon +checks[6]{command,result,exit}: + "PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests","632 件・10 skip・合格",0 + "/usr/bin/python3 -m unittest discover -s tools/tests","93 件・合格",0 + "/usr/bin/python3 tools/docs_check.py","レビュー追加前 151 ファイル・8 免除・38 警告・合格",0 + "/usr/bin/python3 tools/manifest_check.py","合格・ポリシー検出ゼロ",0 + "bash -n installer/install-ubuntu.sh installer/install-macos.sh installer/prereq-lib.sh installer/install.sh","合格",0 + "command -v shellcheck","未導入・実行せず",1 +``` + +PowerShell も無く、パーサーや WSL の実行はしていない。ログは clone と同階層の `/tmp/pr44-rev-DJJ5gv/` に保存した。修正後は対象試験と所有者の実機検証を行うこと。R1〜R3 の再現に実環境の導入は不要である。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r2.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r2.md new file mode 100644 index 0000000..28eeb05 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r2.md @@ -0,0 +1,101 @@ +# PR44 Per-OS installers review r2 / OS 別インストーラーレビュー r2 + +> **Summary:** REV requests changes: trailing newlines still bypass the shared-credential check, and a FIFO report blocks ZAP report validation. +> **概要:** REV は修正を要求する。共有パス末尾の改行で資格情報検査を回避でき、FIFO の ZAP 報告では検証が停止する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** decoding an escaped path is insufficient if command substitution then strips its trailing newlines; validating a file after opening it is insufficient if opening can block. / 復号してもコマンド置換が末尾改行を消せばパスは保たれず、open 自体が停止する場合は open 後のファイル種別検証では足りない。 +- Applies to: [PR #44](https://github.com/RCOSDP/RDM-developer-guide/pull/44), diff `c2607e6..237387f`, head `237387f8767ddfc500e1ba71c1ab8fe50a4c42f2`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Parent index / 親索引: [Reviews](README.md). +- Related: [r1](2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r1.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-06](../spec/06_documentation_conventions.md). +- Used by / 利用先: PR #44 revision and coordinator review / PR #44 の修正と統括レビュー。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and required changes + +**Changes requested.** Reviewed the requested revision in a clean detached clone. R1 is only partially closed; R2's symlink fix passes the exercised cases; R3's permission and symlink protections pass, but its new regular-file reader has a blocking special-file case. + +**R2-01 — P2: Preserve trailing newlines in decoded mount paths.** At `installer/install-ubuntu.sh:105`, `mnt="$(decode_mount_field ...)"` removes all trailing newline bytes from the decoded result. A real fixture directory named `host` followed by a newline, containing a dummy `.netrc`, is represented in the mount table as `host\012`. The script checks `host/.netrc` instead. A non-dry invocation under stub commands bypassed exit 10, reached stub sudo, and eventually exited 11 for all six supported filesystem names. Space, tab, interior newline and a literal backslash followed by `012` were correctly detected; one and two trailing newlines were not. Assign the decoded value without lossy command substitution, or append/remove a non-newline sentinel. Add regression cases for trailing `\012` and repeated trailing `\012`; decoding must remain single-pass for `\134012`. + +**R2-02 — P2: Open special reports without blocking before checking their type.** At `installer/grdm_dev/scan.py:926`, `os.open(path, O_RDONLY | O_NOFOLLOW)` blocks indefinitely on a FIFO with no writer. The `fstat` regular-file check at lines 931–933 is never reached. An isolated child calling `_read_zap_report` on a temporary FIFO exceeded two seconds and was terminated by the test harness. A scanner-produced FIFO therefore stalls completion rather than reporting an incomplete scan, contrary to the updated SPEC-03 guarantee that nonregular reports are refused. Use a nonblocking, no-follow open followed by descriptor type validation, retaining refusal and cleanup; add a bounded FIFO test. This is a robustness defect, not a claim that another host user can cross the verified private parent. + +### Closure evidence and boundary variants + +R1 now correctly decodes spaces, tabs and backslashes and documents its four-name, mount-root-only scope. A synthetic shared-filesystem bind entry with a space in its mount point was refused with exit 10. The implementation reads `/proc/mounts`, not `/proc/self/mountinfo`; the fixtures used its actual four-field parsing contract. + +R2 resolves HOME and an existing target with `pwd -P`, validates before cloning, and uses the canonical target thereafter. Nested links with both absolute and relative destinations into the simulated Windows root exited 10. Replacing the original logical checkout alias after validation still executed the original safe canonical checkout. The repository tests also cover direct and symlinked Ubuntu entry points and an accepted Linux destination. `-Directory` is restricted to one folder name, so a new target's parent is the validated physical HOME. + +A physical-path prefix is not a filesystem-origin check: a Windows filesystem bind-mounted outside `/mnt` would retain that outside mount-point pathname under `pwd -P`. This is a static limitation, not an independently reproduced Linux bind-mount result or an additional proven regression. Actual bind mounts and WSL execution were unavailable on this Darwin host; no host mounts or Docker state were changed. + +R3 rejects a 0755 runtime before creating any 0777 work directory or running ZAP, uses exclusive unpredictable directories, and rejects report symlinks. Absolute, relative, nested and dangling report symlinks all returned a refusal. Replacing a regular report with a symlink immediately at `os.open` was also refused by `O_NOFOLLOW`. Existing tests verify scan exit 51, cleanup and that planted report findings are not accepted. + +A deliberate same-owner chmod from 0700 to 0755 between validation and use allowed creation of a 0777 work directory and a successful stubbed scan. Thus validation is a snapshot, not an invariant maintained against concurrent owner changes. No cross-user exploit is claimed: under the ordinary owner-controlled checkout and private runtime, an unrelated user cannot perform that chmod. Parent-path replacement by an actor able to rename checkout ancestors and bind aliases remain outside the demonstrated protection. Treat the owned checkout/ancestors as a precondition; do not claim general race-proof filesystem isolation. + +### Validation and reproduction + +System `/usr/bin/python3` 3.9.6 on Darwin was used. Results are observations, not a canonical dataset mirror. All scanner, installer and credential boundary probes used temporary fixtures and stub runners; no real credential file was inspected. No commit, push, approval, merge, close or grdm-dev stack mutation was performed. PowerShell was not installed, so its native parser and real WSL were not run. + +```toon +checks[7]{command,result,exit}: + "PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests","640 tests; 10 skipped; OK",0 + "/usr/bin/python3 -m unittest discover -s tools/tests","93 tests; OK",0 + "/usr/bin/python3 tools/docs_check.py","152 files; 8 exempt; 38 warnings; passed before review",0 + "/usr/bin/python3 tools/manifest_check.py","694 tracked text files scanned; 63 skipped; zero findings",0 + "bash -n installer/install-ubuntu.sh installer/install-macos.sh installer/prereq-lib.sh installer/install.sh","passed",0 + "/usr/bin/python3 /tmp/pr44-rev-r2-RXhzlP/variants.py","boundary observations including trailing-newline bypass and FIFO timeout",0 + "/usr/bin/python3 /tmp/pr44-rev-r2-RXhzlP/mount_variants.py","six filesystem bypasses; bind-table fixture refused",0 +``` + +Scripts and full logs are retained in `/tmp/pr44-rev-r2-RXhzlP/`; clone root is `/tmp/pr44-rev-r2-RXhzlP/repo`. From that root, run the last two commands to reproduce the boundary observations; their exit 0 means the observation harness completed, not that every product case passed. Fix R2-01/R2-02 and rerun the focused probes. Real platform and bind-mount coverage remains outstanding. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と修正要求 + +**Changes requested(修正要求)。** 指定差分をクリーンな detached clone で確認した。R1 は部分解決、R2 の symlink 修正は今回の試験で合格、R3 の権限・symlink 防御も合格したが、新しい通常ファイル読込み処理には特殊ファイルで停止する問題がある。 + +**R2-01 — P2: 復号した mount パスの末尾改行を保持すること。** `installer/install-ubuntu.sh:105` の `mnt="$(decode_mount_field ...)"` は復号結果の末尾改行をすべて取り除く。`host` の後ろに改行がある実ディレクトリにダミーの `.netrc` を置き、mount 表に `host\012` と記すと、検査先は `host/.netrc` になってしまう。スタブ環境で dry run を付けずに実行すると、対応する全六種類の filesystem で終了 10 を回避し、sudo スタブへ進んで最終的に終了 11 となった。空白・タブ・途中の改行・文字どおりのバックスラッシュと `012` は検出できたが、末尾の改行一つ・二つは検出できなかった。値を直接代入するか、改行以外の番兵を付けてから除去し、末尾改行を保持すること。末尾 `\012` と連続する末尾 `\012` を回帰試験に加え、`\134012` を二重に復号しない性質も維持すること。 + +**R2-02 — P2: 特殊な報告ファイルを、種別検証前に停止せず開くこと。** `installer/grdm_dev/scan.py:926` の `os.open(path, O_RDONLY | O_NOFOLLOW)` は書き手のない FIFO で無期限に待つ。931–933 行の `fstat` による通常ファイル検証に到達しない。一時 FIFO を `_read_zap_report` に渡した隔離子プロセスは二秒を超え、試験側が終了させた。スキャナーが FIFO を残すと、不完全なスキャンとして報告せず停止するため、SPEC-03 の「通常ファイルでない報告は拒否」という追加保証を満たさない。nonblocking と no-follow で開いてから descriptor の種別を検証し、拒否と後片付けを維持すること。時間制限付きの FIFO 試験を加えること。これは堅牢性の問題であり、別のホスト利用者が private な親を越えられるという指摘ではない。 + +### 解決の証拠と境界ケース + +R1 は空白・タブ・バックスラッシュを正しく復号し、mount 直下の四つの名前だけを調べる制限を明記した。mount 先に空白を含む共有 filesystem の bind 行を模した fixture は終了 10 で拒否された。実装は `/proc/self/mountinfo` ではなく `/proc/mounts` を読み、fixture も実際の四フィールド解析に合わせた。 + +R2 は HOME と既存の対象を `pwd -P` で解決し、clone 前に検査して以後は実体の対象を使う。疑似 Windows root に至る多段リンクは、絶対・相対の両方のリンク先で終了 10 となった。検査後に元の論理 checkout 別名を差し替えても、元の安全な実体 checkout が実行された。リポジトリの試験も Ubuntu の直接・リンク経由の起動と Linux 配置の許可を含む。`-Directory` は単一フォルダ名に制限されるため、新規対象の親は検証済みの実体 HOME となる。 + +ただし実体パスの接頭辞は filesystem の出自を示さない。Windows filesystem を `/mnt` 外に bind mount した場合、`pwd -P` は外側の mount 先を返す。これは静的な制限であり、独立に再現した Linux bind mount の結果や追加の確定した回帰ではない。Darwin ホストのため実 bind mount と WSL 実行はできず、ホスト mount や Docker の状態は変更していない。 + +R3 は 0755 の runtime を、0777 の作業ディレクトリ作成と ZAP 実行より前に拒否し、予測できない名前で排他的に作業場所を作り、報告 symlink を拒否する。絶対・相対・多段・リンク先のない報告 symlink はすべて拒否された。`os.open` の直前で通常ファイルを symlink に差し替えても `O_NOFOLLOW` が拒否した。既存試験は終了 51、後片付け、植えられた報告の検出結果を受け入れないことも確認している。 + +同一所有者が検査と使用の間で意図的に 0700 を 0755 に chmod する試験では、0777 の作業ディレクトリが作成され、スタブのスキャンは成功した。検証は一時点の確認であり、所有者の並行変更に対して条件を維持する仕組みではない。通常の所有者管理の checkout と private runtime では無関係な利用者が chmod できないため、利用者間の攻撃を実証したとは扱わない。checkout の祖先を rename できる主体による親パス差替えや bind 別名も、今回証明した保護の外にある。checkout と祖先を所有者が管理することを前提とし、一般的な競合に耐える filesystem 隔離とは主張しないこと。 + +### 検証と再現 + +Darwin 上のシステム `/usr/bin/python3` 3.9.6 を使った。以下は観測結果で、正本データの写しではない。境界検査は一時 fixture とスタブを使い、実際の資格情報ファイルは調べていない。commit・push・承認・merge・close・grdm-dev スタック変更はしていない。PowerShell は未導入で、ネイティブの構文解析と実 WSL は未実施である。 + +```toon +checks[7]{command,result,exit}: + "PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests","640 件・10 skip・合格",0 + "/usr/bin/python3 -m unittest discover -s tools/tests","93 件・合格",0 + "/usr/bin/python3 tools/docs_check.py","レビュー追加前 152 ファイル・8 免除・38 警告・合格",0 + "/usr/bin/python3 tools/manifest_check.py","追跡対象テキスト 694 件検査・63 skip・検出ゼロ",0 + "bash -n installer/install-ubuntu.sh installer/install-macos.sh installer/prereq-lib.sh installer/install.sh","合格",0 + "/usr/bin/python3 /tmp/pr44-rev-r2-RXhzlP/variants.py","末尾改行回避と FIFO timeout を含む境界観測",0 + "/usr/bin/python3 /tmp/pr44-rev-r2-RXhzlP/mount_variants.py","六種類で回避・bind 表 fixture は拒否",0 +``` + +再現スクリプトと全ログは `/tmp/pr44-rev-r2-RXhzlP/`、clone は `/tmp/pr44-rev-r2-RXhzlP/repo` にある。clone ルートから最後の二コマンドを実行すると観測を再現できる。終了 0 は観測用スクリプトが完了した意味であり、製品の全ケースが合格した意味ではない。R2-01/R2-02 の修正後に個別試験を再実行すること。実プラットフォームと bind mount の検証は残っている。 diff --git a/docs/reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r3.md b/docs/reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r3.md new file mode 100644 index 0000000..7f59909 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r3.md @@ -0,0 +1,87 @@ +# PR44 Per-OS installers review r3 / OS 別インストーラーレビュー r3 + +> **Summary:** REV passes the scoped revision: both r2 findings are closed, with no new regression found in the exercised cases. +> **概要:** REV は今回の差分を合格とする。r2 の二件は解決し、検証した範囲で新たな回帰は見つからなかった。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** retaining decoded paths in a variable preserves trailing newlines, and nonblocking opens allow file-type checks to reject FIFOs before reading or writing. / 復号したパスを変数に保持すれば末尾改行を保て、nonblocking で開けば読み書きの前に FIFO を種別検査で拒否できる。 +- Applies to: [PR #44](https://github.com/RCOSDP/RDM-developer-guide/pull/44), diff `237387f..f789be9`, head `f789be9abb17c2ea172987ca83d3bb1ba13b74ac`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Parent index / 親索引: [Reviews](README.md). +- Related: [r2](2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r2.md) · [SPEC-02](../spec/02_installer_cli.md) · [SPEC-03](../spec/03_security_gate.md) · [SPEC-06](../spec/06_documentation_conventions.md). +- Used by / 利用先: [PR #44 revision and coordinator review / 修正と統括レビュー](https://github.com/RCOSDP/RDM-developer-guide/pull/44). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and closure evidence + +**Pass.** A clean detached clone was reviewed; no required changes were found in the scoped revision. + +**R2-01 closed.** Direct assignment through `DECODED_MOUNT` avoids the command substitution that stripped trailing newlines. The original non-dry probe now exits 10 before stub sudo for all six filesystems: virtiofs, 9p, fuse.sshfs, vboxsf, fuse.vmhgfs-fuse and fuse.virtiofsd. The new repository test exercises one trailing newline, two trailing newlines and a literal backslash followed by `012` on each filesystem. The original space, tab, interior-newline, literal-backslash and repeated-trailing-newline probes also pass; the synthetic bind-table fixture still exits 10. + +**R2-02 closed.** `_SAFE_OPEN` combines `O_NOFOLLOW` and `O_NONBLOCK`; `_regular_fd` checks the opened descriptor before reading or truncating/writing. The original reader probe returns a regular-file refusal within its two-second limit. Additional bounded subprocess probes reject writing a FIFO both without a reader and with a reader; no bytes reach the reader. The repository integration test checks exit 51 when a FIFO occupies the masked ZAP report destination. Regular-file creation, shorter UTF-8 overwrite/truncation and symlink-write refusal preserve expected behavior. + +The original absolute, relative, nested, dangling and open-time replacement symlink probes still refuse reports. Nested WSL path aliases still exit 10, and replacing the logical alias after validation still reaches the original safe checkout. Runtime mode 0755 remains refused. The same-owner chmod gap still exists as recorded in r2; SPEC-03 now states the owner/ancestor stability precondition and does not claim race-proof isolation. This is not a new finding. + +### Validation and limits + +System `/usr/bin/python3` 3.9.6 on Darwin was used. Results are observed runs, not a canonical dataset mirror. Full logs and the added write probe are in `/tmp/pr44-rev-r3-r2SOON/`; the clean clone is `/tmp/pr44-rev-r3-r2SOON/repo`. The two original probe scripts remain in `/tmp/pr44-rev-r2-RXhzlP/` and were run from the new clone. Their exit 0 means the observation harness completed; their printed product results were inspected separately. + +```toon +checks[8]{command,result,exit}: + "PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests","643 tests; 10 skipped; OK",0 + "/usr/bin/python3 -m unittest discover -s tools/tests","93 tests; OK",0 + "/usr/bin/python3 tools/docs_check.py","153 files; 8 exempt; 38 warnings; passed before review",0 + "/usr/bin/python3 tools/manifest_check.py","695 tracked text files; 63 skipped; zero findings",0 + "bash -n installer/install-ubuntu.sh installer/install-macos.sh installer/prereq-lib.sh installer/install.sh","passed",0 + "/usr/bin/python3 /tmp/pr44-rev-r2-RXhzlP/variants.py","all targeted refusals observed; FIFO returned within 2 seconds",0 + "/usr/bin/python3 /tmp/pr44-rev-r2-RXhzlP/mount_variants.py","six filesystems exit 10 before sudo; bind-table fixture exit 10",0 + "/usr/bin/python3 /tmp/pr44-rev-r3-r2SOON/write_probes.py","FIFO refusal with/without reader; regular writes and symlink refusal passed",0 +``` + +The tracked-file documentation check also passed after writing the record; a direct `check_file` call validates this untracked review separately (zero errors, exit 0). + +No real platform install, native PowerShell/WSL execution or actual Linux bind mount was performed. Tests used temporary fixtures and stub runners; the grdm-dev stack and real runtime environment file were not touched. No commit, push, approval, merge or close was performed; the only GitHub write is one review comment. The review file is intentionally uncommitted and its index entry is left to the coordinator when incorporating the record. No further code changes are required for the two scoped findings; real-platform validation remains outside this review. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と解決の証拠 + +**Pass(合格)。** クリーンな detached clone で指定差分を確認し、修正必須の指摘はなかった。 + +**R2-01 解決。** `DECODED_MOUNT` への直接代入により、末尾改行を消すコマンド置換を回避している。元の非 dry-run プローブは、virtiofs・9p・fuse.sshfs・vboxsf・fuse.vmhgfs-fuse・fuse.virtiofsd の全六種類で sudo スタブに到達せず終了 10 となった。追加されたリポジトリ試験は、各 filesystem で末尾改行一つ・二つ・文字どおりのバックスラッシュと `012` を検証する。元の空白・タブ・途中の改行・バックスラッシュ・連続末尾改行のプローブも合格し、bind 行を模した fixture も引き続き終了 10 となる。 + +**R2-02 解決。** `_SAFE_OPEN` は `O_NOFOLLOW` と `O_NONBLOCK` を組み合わせ、`_regular_fd` は読込み・切詰め・書込みより前に開いた記述子を検査する。元の読込みプローブは二秒以内に通常ファイルでない旨を返す。追加の時間制限付き子プロセス試験では、読み手がいない FIFO と読み手がいる FIFO の両方への書込みを拒否し、読み手には一バイトも渡らなかった。リポジトリの統合試験は、マスク済み ZAP 報告の保存先が FIFO の場合の終了 51 を確認する。通常ファイルの新規作成、短い UTF-8 内容への上書きと切詰め、symlink への書込み拒否も正常だった。 + +元の絶対・相対・多段・リンク先なし・open 直前差替えの報告 symlink は引き続き拒否される。WSL の多段別名は終了 10、検証後の論理別名差替えも元の安全な checkout に到達する。runtime の 0755 は拒否される。同一所有者による chmod の競合は r2 の記録どおり残るが、SPEC-03 は所有者と祖先の安定性を前提として明記し、競合に耐える隔離とは主張していない。新たな指摘ではない。 + +### 検証と制限 + +Darwin のシステム `/usr/bin/python3` 3.9.6 を使った。結果は実行時の観測であり、正本データの写しではない。全ログと追加書込みプローブは `/tmp/pr44-rev-r3-r2SOON/`、clone は `/tmp/pr44-rev-r3-r2SOON/repo` にある。元の二つのスクリプトは `/tmp/pr44-rev-r2-RXhzlP/` にあり、新しい clone を作業ディレクトリとして実行した。終了 0 は観測用スクリプトの完了を表し、出力された製品側の結果も別途確認した。 + +```toon +checks[8]{command,result,exit}: + "PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests","643 tests; 10 skipped; OK",0 + "/usr/bin/python3 -m unittest discover -s tools/tests","93 tests; OK",0 + "/usr/bin/python3 tools/docs_check.py","153 files; 8 exempt; 38 warnings; passed before review",0 + "/usr/bin/python3 tools/manifest_check.py","695 tracked text files; 63 skipped; zero findings",0 + "bash -n installer/install-ubuntu.sh installer/install-macos.sh installer/prereq-lib.sh installer/install.sh","passed",0 + "/usr/bin/python3 /tmp/pr44-rev-r2-RXhzlP/variants.py","all targeted refusals observed; FIFO returned within 2 seconds",0 + "/usr/bin/python3 /tmp/pr44-rev-r2-RXhzlP/mount_variants.py","six filesystems exit 10 before sudo; bind-table fixture exit 10",0 + "/usr/bin/python3 /tmp/pr44-rev-r3-r2SOON/write_probes.py","FIFO refusal with/without reader; regular writes and symlink refusal passed",0 +``` + +文書作成後の追跡ファイル検査も合格し、未追跡のレビュー文書自体は `check_file` を直接呼んで別途検証した(エラーゼロ・終了 0)。 + +実プラットフォームのインストール、ネイティブ PowerShell・WSL、Linux の実 bind mount は未実施。一時 fixture とスタブを使い、grdm-dev スタックと実環境の runtime 環境ファイルには触れていない。commit・push・承認・merge・close は行わず、GitHub への書込みはレビューコメント一件だけである。レビュー文書は意図どおり未コミットで、索引への追加は記録を取り込む統括側に委ねる。対象二件について追加のコード修正は不要であり、実プラットフォームの検証は今回のレビュー範囲外として残る。 diff --git a/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR2_Security_Absorb_r1.md b/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR2_Security_Absorb_r1.md new file mode 100644 index 0000000..d904257 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR2_Security_Absorb_r1.md @@ -0,0 +1,74 @@ +# REV RDM-modular-file-renderer-dev2027 PR2 security absorption r1 / セキュリティ吸収レビュー r1 + +> **Summary:** Independent review of PR2 at `288d2390f8d48fed6574e543395725f6ea6ae19e`. Verdict: Non-blocking / 非阻害. +> **概要:** PR2の対象head `288d2390f8d48fed6574e543395725f6ea6ae19e` を独立レビューした。判定: Non-blocking / 非阻害。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** The existing XLS parser already rejects dimensions over 10000; the PR adds useful mocked boundary coverage without changing production code. / 既存XLSパーサーは10000を超える寸法を拒否し、PRは製品コードを変えず境界値のモック検査を追加する。 +- Applies to / 対象: RCOSDP/RDM-modular-file-renderer-dev2027 PR2, exact head recorded above; review only. +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) +- Used by / 利用先: [Documentation index / 文書索引](../README.md), coordinator's absorption decision / 調整担当の吸収判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and findings + +No blocking finding. The change is one test file only. tests/extensions/tabular/test_xlrd_size_limit.py:28–41 verifies .xls selects xlsx_xlrd, checks TableTooBigError with HTTP code 400 and exact dimensions for 10001 rows or columns, and accepts 10000 rows with 9999 data rows after the header. mfr/extensions/tabular/libs/xlrd_tools.py:20–23 already has the strict greater-than check, and settings.py:17 maps .xls to that function. + +[P3, coverage limitation] open_workbook is mocked and accepted rows have no cells. These tests establish parser dispatch and dimension rejection, not real BIFF decoding, populated-cell rendering or resistance to memory exhaustion during workbook loading. A 10001-row .xls fixture and an at-limit column case would strengthen coverage; the existing test-only change need not be blocked on them. A 10001-column case is synthetic, not a valid legacy XLS workbook. + +### Evidence and threat boundary + +Compared the exact head against dac70e2209f9b4104ee2d190d7462cf18eef3c9f. gh pr checks reports build-image and tests (mfr) passing. Local pytest could not collect: the legacy [pytest] configuration is unsupported by the installed pytest; bypassing that file exposed missing humanfriendly. Do not treat this as a product-test failure or a local pass. + +Four isolated boundary checks passed for (10001,2), (2,10001), (10000,2) and (2,10000). The harness used real xlrd and the actual parser, exception and header function bodies, but stubbed the unrelated RendererError base and bypassed package initialization. It is /private/tmp/rev-security-PreTii/check_mfr.py. This supplemental check is not the PR's full pytest run or a real XLS decoding test. + +The size check occurs after open_workbook and is per sheet, not an aggregate cell/workbook memory cap. Those are existing scope limits, not regressions introduced by this PR. The exception's .xlsx label for .xls is also pre-existing. + +### Remaining work + +Optional real-file and column-boundary coverage. No runtime code changes, deployment, approval, merge, push or commit were made. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +阻害する指摘はない。変更はテストファイル1個だけ。tests/extensions/tabular/test_xlrd_size_limit.py:28–41は.xlsがxlsx_xlrdを選ぶこと、10001行・列でHTTPコード400と正確な寸法を持つTableTooBigErrorになること、10000行では見出しを除く9999データ行を受け付けることを確認する。mfr/extensions/tabular/libs/xlrd_tools.py:20–23には既に厳密な「超える」検査があり、settings.py:17が.xlsを同関数へ割り当てる。 + +[P3・検査範囲] open_workbookはモックで、正常系の行にはセルがない。この試験が保証するのはパーサー選択と寸法の拒否であり、実BIFF読込み、値入りセルの表示、ブック読込み時のメモリ枯渇耐性ではない。10001行の実.xlsと列数の上限一致ケースがあると強くなるが、現行のテストのみの変更を阻害しない。10001列は合成ケースで、旧形式XLSとして有効なブックではない。 + +### 根拠と脅威の境界 + +対象headをdac70e2209f9b4104ee2d190d7462cf18eef3c9fと比較した。gh pr checksではbuild-imageとtests (mfr)が成功している。ローカルpytestは旧[pytest]設定をサポートせず収集できず、設定ファイルを迂回するとhumanfriendly不足になった。製品テスト失敗ともローカル成功とも扱わない。 + +(10001,2)、(2,10001)、(10000,2)、(2,10000)の隔離した境界値4件は成功した。実xlrdと実際のパーサー・例外・見出し関数の本体を使うが、無関係なRendererError基底を代替しパッケージ初期化を迂回した。検査コードは/private/tmp/rev-security-PreTii/check_mfr.py。この補助検査はPRのpytest全体でも実XLSの読込み試験でもない。 + +寸法検査はopen_workbookの後で、シート単位であり、全セル・ブック全体のメモリ上限ではない。PRによる回帰ではなく既存の範囲制限である。.xlsでも例外に.xlsxと付く点も既存動作。 + +### 残作業 + +実ファイルと列数上限一致の検査は任意改善。製品コード変更、デプロイ、承認、マージ、push、commitは行っていない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| PR / head | Proposed change / exact version reviewed. | 変更案/調べた正確な版。 | +| P1 / P2 / P3 | High / medium / low review priority. | 高/中/低の修正優先度。 | +| Secret / token | A private value used to prove identity or sign data. | 本人確認や署名に使う秘密の値。 | +| Regression | A change that breaks previously working behavior. | 以前動いた機能が変更で壊れること。 | +| CI / mock | Automated checks / a substitute used in a test. | 自動検査/試験用の代役。 | +| Secure cookie | A browser value restricted to secure transport. | 安全な通信経路に送信を限定するブラウザーの値。 | diff --git a/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR3_Redirect_Credentials_r1.md b/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR3_Redirect_Credentials_r1.md new file mode 100644 index 0000000..9b1233b --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR3_Redirect_Credentials_r1.md @@ -0,0 +1,61 @@ +# MFR PR3 Redirect credentials review r1 / MFR転送資格情報レビュー r1 + +> **Summary:** Pass: explicit origin pairs grant credentials only on the intended OSF-to-WaterButler hop. +> **概要:** 合格。明示したoriginの組により、意図したOSFからWaterButlerへの転送だけへ資格情報を付与する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** A provider-host allowlist and permission to receive credentials are separate controls. / 接続先ホストの許可と資格情報を受け取る許可は別の制御である。 +- Applies to: RDM-modular-file-renderer-dev2027 PR #3, head `f712fca39a5d2cab11c53e4f4dac355931281645`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md). +- Used by: the coordinator's source-absorption decision and follow-up verification. / 調整担当のソース吸収判断と後続検証。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and behavior + +**Pass.** Reviewed base-to-head changes and surrounding resolver, metadata, download and manual redirect code. No actionable regression was found in the requested scope. + +`mfr/providers/osf/provider.py:290–311` grants a target only when the current source is the original request origin, the source is configured, and the target is configured. Scheme, lowercased host and effective port form the comparison key; this is not suffix matching. HTTPS-to-HTTP never grants even when configured. Every actual URL still passes the provider netloc allowlist and malformed/userinfo/invalid-port checks before requesting it. The configured source and target sets describe their Cartesian product, not individually zipped pairs; deployment must trust all such combinations. + +The resolver grants the validated OSF redirect target so subsequent metadata/download requests can carry Authorization, cookies, `cookie` and `view_only`. Same-origin WaterButler redirects keep the grant. A hop onward to another origin drops these credentials, even another configured target cannot be granted by WaterButler, and the chain's false carry flag prevents reacquiring the grant after leaving. Returning to the **original** origin still restores its original credentials, matching existing behavior and the PR's explicit contract; this is not a new target grant. Both configured lists default to empty, preserving previous cross-origin stripping when deployment makes no opt-in. + +Lookalike suffix/prefix hosts, wrong ports, invalid ports, malformed URLs, HTTP downgrade, untrusted derived URLs, storage-to-WaterButler chains and WaterButler-to-storage-to-WaterButler chains are covered by the supplied focused tests. The underlying provider URL allowlist remains distinct from the credential-grant list. + +### Validation and limits + +Independently ran all **36 focused provider tests, exit 0**, through `/private/tmp/rev-8275-oBBpKc/mfr_harness.py`. It loads the actual reviewed provider, base provider, metrics and exception source unchanged, uses installed furl, and stubs configuration and legacy transport/WaterButler dependencies; the tests themselves mock requests. Modern pytest required `-c /dev/null` to bypass the legacy `[pytest]` setup.cfg format. This validates provider decisions with mocks, not compatibility of the pinned 2016 aiohttp stack or real HTTP transfers. `git diff --check` passed. The PR author's 183 full-suite passes and lint success were inspected as author evidence, not repeated independently. + +C5 still needs an image rebuild and explicit deployment values for `OSF_PROVIDER_CONFIG_CREDENTIAL_SOURCE_ORIGINS` and `OSF_PROVIDER_CONFIG_CREDENTIAL_TARGET_ORIGINS`; the PR documents internal `http://web:5000` to `http://wb:7777`. Actual preview success remains an acceptance prerequisite. No Docker command, stack or runtime credential-file access, source edit, commit, push, approval, merge or closure occurred. This uncommitted record and one Japanese comment are the deliverables. + +GitHub reports passing image-build and MFR-test checks. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と動作 + +**合格(pass)。** baseからheadの差分と周辺のresolver、metadata、download、手動redirect処理を確認し、依頼範囲で修正を要する退行は見つからなかった。 + +`mfr/providers/osf/provider.py:290–311` は、現在の転送元が最初の要求originであり、転送元と転送先の両方が設定済みのときだけ付与する。比較キーはscheme、小文字host、実効portで、suffix比較ではない。設定済みでもHTTPSからHTTPには付与しない。実際の各URLは要求前にproviderのnetloc許可と、不正URL/userinfo/不正portの拒否を通る。転送元集合と転送先集合は個別の組のzipではなく直積なので、配備時は全組合せを信頼する必要がある。 + +resolverは検証したOSFの転送先へ付与し、後続metadata/downloadがAuthorization、cookies、`cookie`、`view_only`を送れる。同じWaterButler origin内の転送は維持する。別originへの転送では落とし、別の設定済みtargetでもWaterButlerからは付与できず、連鎖のcarryフラグがfalseになると離脱後に再付与しない。**元の**originに戻ると元の資格情報が戻る点は、既存動作とPRに明記された契約を維持するもので、新たなtarget付与ではない。両設定の既定値は空なので、配備側が選ばなければ従来どおりcross-originでは落とす。 + +類似suffix/prefixホスト、別port、範囲外port、不正URL、HTTPへの格下げ、未許可の解決先、storage→WaterButler、WaterButler→storage→WaterButlerの連鎖は追加された対象試験で扱う。接続先URLの許可一覧と資格情報付与の許可一覧は別に保たれる。 + +### 検証と限界 + +`/private/tmp/rev-8275-oBBpKc/mfr_harness.py` で **対象provider試験36件を独立実行し、0終了**した。レビュー対象のprovider、base provider、metrics、exceptionのソースを変更せず読み込み、導入したfurlを使い、設定と旧transport/WaterButler依存をstubにした。試験自体も要求をmockにする。現行pytestでは古いsetup.cfgの `[pytest]` を避けるため `-c /dev/null` が必要だった。providerの判定をmockで確認した結果であり、固定された2016年のaiohttpや実HTTP転送の互換性を証明するものではない。`git diff --check` は成功。著者の全体183件合格とlint成功は報告として確認し、独立再実行はしていない。 + +C5にはイメージ再ビルドと `OSF_PROVIDER_CONFIG_CREDENTIAL_SOURCE_ORIGINS` / `OSF_PROVIDER_CONFIG_CREDENTIAL_TARGET_ORIGINS` の明示設定が残る。PRは内部 `http://web:5000` → `http://wb:7777` を記載する。実preview成功は受入前提条件として残る。Dockerコマンド、スタック/runtime資格情報ファイル参照、ソース修正、commit、push、approve、merge、closeは行っていない。未コミット記録と日本語コメント1件を成果物とする。 + +GitHubのimage-buildとMFR-testチェックは成功している。 diff --git a/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR4_Remove_GA_r1.md b/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR4_Remove_GA_r1.md new file mode 100644 index 0000000..790654d --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR4_Remove_GA_r1.md @@ -0,0 +1,95 @@ +# REV PR4 Remove GA review r1 / GA削除レビュー r1 + +> **Summary:** GA removal and PDF rendering pass, but an external Hypothesis request remains. The verdict is changes requested against the assigned no-other-external-request criterion. +> **概要:** GA削除とPDF描画は合格ですが、Hypothesisへの外部要求が残ります。指定された「他の外部要求も残さない」基準では changes requested です。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Removing GA eliminates the unconditional tracker but does not eliminate the optional Hypothesis network path. / GA削除で無条件の追跡通信は消えるが、Hypothesis起動時の通信経路は残ると分かった。 +- Applies to: RCOSDP/RDM-modular-file-renderer-dev2027 PR #4, head `2ff5e0282d1103f2bb1b94e56b6bbc8eea953f46`. +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) +- Used by: [Acceptance review records](README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and finding + +**Changes requested.** GA removal itself passes. P2 / R1-01: `mfr/server/static/js/mfr.child.hypothesis.js:58–62` still appends `https://hypothes.is/embed.js`. With the default `ENABLE_HYPOTHESIS=True`, the template includes this helper. Sending `startHypothesis` and then emitting a `pagerendered` event reaches this external request. This is an existing path, explicitly disclosed by the PR author, rather than a newly introduced regression; it nevertheless fails the assigned requirement to leave no other external request in the PDF viewer. + +Remove or serve the integration locally, or explicitly narrow the acceptance requirement to initial PDF display before accepting this PR. Add a browser regression check covering the Hypothesis activation path and rejecting external origins; the added HTML substring test alone cannot detect requests from linked JavaScript. + +### Evidence + +The following results were independently observed at the reviewed head; they are review data, not a canonical manifest. + +```toon +checks[5]{check,result}: + renderer_templates,16 scanned and no GA references + pdf_template_hypothesis_on,first page rendered with 14 total pages + pdf_template_hypothesis_off,first page rendered with 14 total pages + normal_external_requests,zero in both configurations + hypothesis_activation,https://hypothes.is/embed.js attempted and blocked +``` + +The scan covered every file under renderer `templates` directories and looked for GA domains, GoogleAnalyticsObject, GA_TRACKING identifiers and quoted ga calls. The changed renderer/settings/helper were also inspected. Both render configurations produced a 1019 × 1319 canvas with no page errors; the screenshot visibly contains the sample paper. All four reported GitHub checks (two build-image and two tests (mfr)) passed when read. + +The isolated harness rendered the actual Mako template and served the unchanged checked-out PDF.js assets and bundled sample PDF through Playwright request interception. All nonlocal requests were captured and aborted. After normal rendering, a start message and a synthetic pagerendered event exercised the remaining helper branch; two embed attempts were observed during that run. This proves the external path exists, not that every real user action triggers it. + +### Boundaries and reproduction + +The local harness does not run the full Python PdfRenderer dependency stack or the deployed C5 integration. The added pytest test was not independently run locally; the CI status is separate evidence. No Docker operations, runtime/.env reads, commits, pushes, merges, approvals or closure were performed. + +Review artifacts are in `/private/tmp/rev-pr4-4100a030/`: the detached clone in `repo`, harness `check.py`, `results.txt`, and viewer screenshots. To repeat with the already prepared environment, run from that scratch directory: + +```sh +./venv/bin/python check.py +``` + +Expected: 16 templates without GA, successful rendering in both modes, no normal external requests, and an intercepted Hypothesis embed request after activation. The remaining work is to resolve R1-01 or explicitly change the acceptance scope, then rerun the affected checks. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +**Changes requested(修正要求)。** GA削除自体は合格です。P2 / R1-01: `mfr/server/static/js/mfr.child.hypothesis.js:58–62` に `https://hypothes.is/embed.js` の追加処理が残ります。既定の `ENABLE_HYPOTHESIS=True` ではテンプレートがこの補助スクリプトを読み込みます。`startHypothesis` の送信後に `pagerendered` イベントを発生させると外部要求に到達します。PR作成者も明記した既存経路であり、今回新たに導入した不具合ではありません。ただし、指定された「PDFビューアに他の外部要求も残さない」条件を満たしません。 + +この連携を削除またはローカル配信するか、受入条件を初期PDF表示だけに限定すると明示してから受け入れてください。Hypothesis起動経路も実行し、外部オリジンへの要求を検出するブラウザー回帰試験が必要です。追加されたHTML文字列の試験だけでは、読み込んだJavaScriptからの要求を検出できません。 + +### 検証結果 + +次は対象headで独立に確認したレビュー結果であり、正本のマニフェストではありません。 + +```toon +checks[5]{check,result}: + レンダラーテンプレート,16個を走査しGA参照なし + Hypothesis有効のPDFテンプレート,全14ページ中の第1ページ描画成功 + Hypothesis無効のPDFテンプレート,全14ページ中の第1ページ描画成功 + 通常表示時の外部要求,両設定でゼロ + Hypothesis起動,https://hypothes.is/embed.jsへの要求を検出し遮断 +``` + +レンダラーの全templates配下のファイルを対象に、GAドメイン、GoogleAnalyticsObject、GA_TRACKING識別子、引用符付きga呼び出しを走査しました。変更されたrenderer、settings、補助スクリプトも確認しました。両設定で1019 × 1319のcanvasが生成され、ページエラーはありませんでした。スクリーンショットでサンプル論文の描画も確認しました。取得時点のGitHubチェック4件(build-image 2件、tests (mfr) 2件)はすべて成功でした。 + +独立ハーネスは実際のMakoテンプレートを展開し、チェックアウトした未変更のPDF.js資産と同梱PDFをPlaywrightの要求捕捉で配信しました。ローカル以外の要求は記録して遮断しました。通常描画後に起動メッセージと合成pagerenderedイベントを送信し、残る補助スクリプトの経路を実行したところ、embed要求を2回観測しました。これは外部経路の存在を示し、すべての利用者操作で発生すると主張するものではありません。 + +### 検証範囲と再現方法 + +ローカルハーネスではPython PdfRendererの依存一式や稼働中のC5統合試験は実行していません。追加されたpytest試験もローカルでは独立実行しておらず、CIの成功は別の証拠です。Docker操作、runtime/.envの参照、commit、push、merge、approve、closeは行っていません。 + +成果物は `/private/tmp/rev-pr4-4100a030/` にあり、`repo` がdetached状態のclone、`check.py` がハーネス、`results.txt` が結果で、ビューアーのスクリーンショットも保存しました。準備済みの環境で再実行する場合、このscratchディレクトリで次を実行します。 + +```sh +./venv/bin/python check.py +``` + +期待結果は、16テンプレートにGAがないこと、両設定での描画成功、通常表示時の外部要求ゼロ、起動後のHypothesis embed要求の捕捉です。残作業はR1-01の解消、または受入範囲変更の明示と、該当検証の再実行です。 diff --git a/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR4_Remove_GA_r2.md b/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR4_Remove_GA_r2.md new file mode 100644 index 0000000..f7d6bad --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR4_Remove_GA_r2.md @@ -0,0 +1,91 @@ +# REV PR4 Remove GA review r2 / GA削除レビュー r2 + +> **Summary:** Pass for the default-disabled acceptance scope; R1-01 is closed. Activation does not request external resources by default, and request parameters cannot enable the integration. +> **概要:** 既定で無効という受入範囲で合格、R1-01は解消です。既定では起動しても外部要求が発生せず、要求パラメーターで連携を有効にできません。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Omitting the Hypothesis helper blocks activation even when a caller sends the start event; explicit server configuration retains compatibility. / Hypothesis補助スクリプトを含めなければ呼出元が起動イベントを送っても起動せず、サーバーの明示設定で互換性は保てると分かった。 +- Applies to: RCOSDP/RDM-modular-file-renderer-dev2027 PR #4; delta from `2ff5e0282d1103f2bb1b94e56b6bbc8eea953f46` to `c20c0f9142d9fb1b26397dbeb266e9dc8b4f2c0e`. +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [r1](2026-11-10_RDM-modular-file-renderer-dev2027_PR4_Remove_GA_r1.md) +- Used by: [Acceptance review records](README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Pass. R1-01 closed for the assigned default-disabled scope.** The single new commit changes the default to False, documents explicit opt-in, and adds default-disabled and opt-in template tests. No new blocking finding was found. Hypothesis remains intentionally available for the RDM-ember-osf caller; deployments that explicitly enable it still request its external loader. This verdict does not assert zero external requests under explicit opt-in. + +### Evidence + +Independent review observations, not canonical manifest data: + +```toon +checks[5]{check,result}: + default_activation,zero external requests after startHypothesis and pagerendered + opt_in_control,two hypothes.is/embed.js attempts captured and aborted + PDF_render,both modes show first-page canvas 1019 x 1319 and 14 total pages + browser_errors,zero in both modes + GA_template_scan,16 templates scanned with no matches +``` + +The isolated Chromium harness renders the actual Mako template and serves checked-out assets and the bundled sample PDF through request interception. It derives False from the checked-out settings assignment, sends the start message and a synthetic page-rendered event in both modes, and aborts every external request. The viewer URL also contains `enable_hypothesis=true`, `ENABLE_HYPOTHESIS=1`, and `PDF_EXTENSION_CONFIG_ENABLE_HYPOTHESIS=1`; the default output still omits the activation helper. + +The server-side parameter conclusion comes from code inspection, not a live HTTP integration test: `mfr/settings.py` SettingsDict reads environment or configuration dictionaries; `mfr/extensions/pdf/settings.py:11` supplies False when absent. Both branches in `mfr/extensions/pdf/render.py:36,53` pass only `settings.ENABLE_HYPOTHESIS`. `RenderHandler.get` passes metadata and URLs to the renderer, with no request-to-setting override. The template gates the helper at line 425. Query parameters therefore cannot enable this flag. The opt-in control confirms that the browser harness detects the remaining external path. + +### Limits and reproduction + +No full Python renderer dependency stack, new pytest tests, or deployed C5 stack was run locally. GitHub showed two build-image checks in progress when read; CI completion is not claimed. No Docker operations, runtime/.env access, commits, pushes, approvals, merges, or closures were performed. Review scope is the new commit; r1 evidence remains its own record. + +Artifacts are under `/private/tmp/rev-pr4-r2-f660e758/`: detached clone `repo`, harness `check.py`, `results.txt`, and screenshots. Run from that directory using the existing r1 Python environment: + +```sh +/private/tmp/rev-pr4-4100a030/venv/bin/python check.py +``` + +Expected output is zero default external requests and a detected Hypothesis request in the opt-in control. No code revision remains requested by REV; CI completion and acceptance remain with the coordinator. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**Pass(合格)。指定された既定無効の範囲でR1-01を解消と判定します。** 新規1コミットは既定値をFalseに変更し、明示的な有効化を説明し、既定無効と有効化のテンプレート試験を追加しています。新たな阻害指摘はありません。RDM-ember-osfの呼出元向けにHypothesisは意図的に残り、配備で明示的に有効化すると外部ローダーを要求します。有効化した場合まで外部要求ゼロと判定したものではありません。 + +### 証拠 + +次は独立レビューの観測結果であり、正本のマニフェストではありません。 + +```toon +checks[5]{check,result}: + 既定での起動,startHypothesisとpagerendered後の外部要求ゼロ + 有効設定の対照,hypothes.is/embed.js要求2件を捕捉して遮断 + PDF描画,両設定で第1ページcanvas 1019 x 1319と全14ページを確認 + ブラウザーエラー,両設定でゼロ + GAテンプレート走査,16テンプレートで一致なし +``` + +独立Chromiumハーネスで実際のMakoテンプレートを展開し、clone内の資産と同梱PDFを要求捕捉で配信しました。設定の代入式からFalseを取得し、両設定で起動メッセージと合成ページ描画イベントを送信し、すべての外部要求を遮断しました。ビューアーURLには `enable_hypothesis=true`、`ENABLE_HYPOTHESIS=1`、`PDF_EXTENSION_CONFIG_ENABLE_HYPOTHESIS=1` も付けましたが、既定の出力には起動用補助スクリプトが含まれません。 + +サーバー側でパラメーターが設定を変えられないという結論は、稼働HTTP統合試験ではなくコード確認に基づきます。`mfr/settings.py` のSettingsDictは環境変数または設定辞書を参照し、`mfr/extensions/pdf/settings.py:11` は値がなければFalseを使います。`mfr/extensions/pdf/render.py:36,53` の両分岐は `settings.ENABLE_HYPOTHESIS` だけを渡します。`RenderHandler.get` はメタデータとURLを渡し、要求から設定への上書き経路はありません。テンプレート425行目で補助スクリプトの出力を制御します。従ってクエリーパラメーターではこのフラグを有効化できません。有効設定の対照試験により、残存する外部経路をハーネスが検出できることも確認しました。 + +### 範囲と再現 + +Pythonレンダラーの依存一式、新規pytest試験、稼働中のC5スタックはローカルでは実行していません。取得時点のGitHubではbuild-image 2件が進行中であり、CI完了とは主張しません。Docker操作、runtime/.env参照、commit、push、approve、merge、closeは行っていません。対象は新規コミットであり、r1の証拠は元の記録に残します。 + +成果物は `/private/tmp/rev-pr4-r2-f660e758/` 配下のdetached clone `repo`、ハーネス `check.py`、`results.txt`、スクリーンショットです。同ディレクトリから既存のr1 Python環境で実行します。 + +```sh +/private/tmp/rev-pr4-4100a030/venv/bin/python check.py +``` + +期待結果は既定設定で外部要求ゼロ、有効設定の対照でHypothesis要求の検出です。REVから要求するコード修正は残っていません。CI完了確認と受入はコーディネーターに残ります。 diff --git a/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR5_Convert_Service_r1.md b/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR5_Convert_Service_r1.md new file mode 100644 index 0000000..e3a7c77 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR5_Convert_Service_r1.md @@ -0,0 +1,101 @@ +# REV-PR5 Convert service review r1 / 変換サービスレビュー r1 + +> **Summary:** Changes requested for MFR PR #5 and its companion converter/sharejs recipes. A truncated response can be published as successful output, and service resource and trust boundaries need correction. +> **概要:** MFR PR #5 と関連する converter/sharejs レシピは changes requested。途中で切れた応答が正常な出力として確定され、サービスの資源制限と信頼境界にも修正が必要です。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Atomic renaming does not establish response completeness, and a conversion semaphore does not bound HTTP connections. / アトミックな名前変更だけでは応答の完全性は保証できず、変換のセマフォだけでは HTTP 接続数を制限できないと分かりました。 +- Applies to: RCOSDP/RDM-modular-file-renderer-dev2027 PR #5; guide companion recipes at d30a054. +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-03](../spec/03_security_gate.md) · [ADR-07](../decisions/ADR-07_Native_Builds_of_EOL_Middleware.md) +- Used by: PR #5 revision and companion recipe acceptance; no downstream document changed by this review. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Changes requested.** R1-01 is in the PR itself; R1-02 through R1-05 are in the companion guide recipes and must be resolved before deploying the pair. This is a review comment, not a GitHub approval or formal review submission. + +Reviewed MFR head `95def1b47e59c37a990c8ad2764e297159ecd49b` against base `4514b1adcb66f2242e1a6cf103601fbe362ab04f`, and guide commit `d30a054248f069336b7960aea64d8927b794a5fd`. Recipe paths are relative to the guide root; exporter paths are relative to MFR. The clone and probes are in `/private/tmp/pr5-rev-a1e15b31`. Upstream livedb-mongo 0.4.1 source was read through GitHub at tag commit `2fc2764f75ff38d83d43a74eab9799e1abe8ecfd`. + +### Required changes + +**R1-01 — P1: Reject incomplete successful HTTP responses.** `mfr/extensions/unoconv/export.py:59–61` copies bounded reads to EOF and renames without comparing bytes received to `Content-Length`. A local HTTP server declared 100 bytes, sent `%PDF-short` (10 bytes), and closed; the actual exporter returned successfully and published those 10 bytes. This contradicts the stated protection against truncated output and can cache corrupt previews after a converter crash. Count bytes, enforce a response-size limit, reject premature EOF and protocol errors, and rename only after verified completion. Add regression coverage for short fixed-length and broken chunked responses, checking error translation and `.part` removal. `HTTPException` subclasses are not covered by the current `URLError/OSError` handler. + +**R1-02 — P1: Bound connections and total request lifetime.** `installer/images/unoconv/convert_service.py:85–86,113–128,141–158,161–163` uses a thread per connection and an inactivity timeout. The two-job semaphore bounds conversions but is acquired only after headers, and holds a slot throughout upload and download. A peer sending bytes more often than the socket timeout can occupy both slots indefinitely; header-only peers can consume threads without taking any slot. The PID/memory limits eventually terminate or disable the service rather than providing admission control. Use a bounded connection/worker pool, a bounded queue, and monotonic deadlines covering headers, upload, conversion and response. Test slow senders/readers and overload recovery. MFR's `urlopen(timeout=60)` is also a socket timeout, not an overall deadline; add a bounded response and total deadline there. + +**R1-03 — P2: Release slots when job-directory creation fails.** `installer/images/unoconv/convert_service.py:141–144` acquires a slot before calling `mkdtemp` outside the `try/finally`. Exhausting `/tmp` bytes or inodes leaks that slot permanently. Injecting `OSError` into `mkdtemp` twice left no available slot with the default two jobs. Put allocation inside a cleanup scope that always releases the semaphore, with an initially absent directory; return a controlled service error. Add an allocation-failure test and verify the next valid job can run. Output/profile expansion has no per-job limit, so the shared 1 GiB tmpfs makes this a reachable resource failure. + +**R1-04 — P2: Authenticate MFR to the converter and narrow network access.** The POST request at `mfr/extensions/unoconv/export.py:55–58` sends no credential, and `installer/images/unoconv/convert_service.py:107–147` performs no authentication. The converter listens on all interfaces and joins the shared `grdm` network (`installer/grdm_dev/compose.py:593–595,670–671`). Any service on that network can consume the converter or submit exploit documents. An internal network is not caller authentication and does not block traffic to peer services. Authenticate before admitting/reading documents, preferably on a dedicated MFR–converter network with authenticated transport, and test missing/invalid credentials. Keep credentials out of URLs and error metadata. + +**R1-05 — P2: Restore Mongo server certificate verification.** `installer/images/sharejs/vendor/mongoskin/index.js:82–84` automatically sets `tlsAllowInvalidCertificates=true` whenever the URL contains `ssl=true` or `tls=true`. TLS then does not establish the server's identity; an active internal-network attacker can impersonate Mongo and observe or modify editor data. Inheriting the old driver's behavior does not satisfy a hardened recipe. Trust a supplied CA and verify hostname/certificate, or explicitly document and obtain acceptance for a narrowly scoped development exception. Test a trusted certificate succeeds and an unrelated certificate fails. No live Mongo or TLS test was run in this review. + +### Other requested checks + +**URL/SSRF:** `CONVERT_URL` comes from deployment configuration, not from a document or request parameter; no direct document-controlled SSRF through that setting was found. Extension/format values are query-encoded. However, arbitrary configured destinations, default urllib redirects and proxy handling are not constrained, and URL query strings are appended naively. Validate the intended HTTP(S) origin/path, reject credentials/query/fragment as appropriate, and disable redirects/proxies or explicitly constrain them. Treat this as configuration trust hardening, not a demonstrated unauthenticated arbitrary-URL exploit. + +**Filename and command injection:** The service discards incoming filenames, generates `input.<ext>`, checks the extension against an alphanumeric pattern, and allow-lists output format tokens. `Popen` receives an argument list without a shell, using an absolute generated source path. No traversal or soffice option-injection path was found. `EXT_RE` uses `$`, which permits a final newline in Python; use `fullmatch` for an exact token, although that newline does not enable traversal or argument splitting here. + +**Size and timeout:** Input is limited to 128 MiB, conversion to 45 seconds, and queue wait to 10 seconds by default. The process group is killed in `finally`. The 1 GiB tmpfs and Compose memory/PID/CPU limits bound container resources, but there is no per-output limit and no total transfer deadline. R1-02/R1-03 describe the remaining availability defects. + +**Cleanup and isolation:** Normal paths remove the job/profile directory; MFR removes `.part` in `finally`. The author discloses residual `/tmp/OSL_PIPE_*` sockets after timeout; these consume inodes even with zero-byte contents and need bounded cleanup or recycling. `remove_job_dir` silently gives up after retries. Separate directories do not isolate concurrent processes running under the same UID against a compromised document parser. No macro or parser exploit was executed. + +**Macros and container controls:** `registrymodifications.xcu:3–7` sets `DisableMacrosExecution=true`, macro security level 3, and external-link update restrictions, and each profile receives the seed. Static controls are present; malicious-macro fixtures were not independently run. The recipe selects UID 1000, read-only root, all capabilities dropped, no-new-privileges, bounded tmpfs and tini. Compose defaults put the converter only on the internal network, preventing ordinary Internet routing, but this is not denial of all network traffic: peer services remain reachable, and a configured egress override would change the result. Do not describe this as a complete sandbox or cross-job confidentiality boundary. + +**Sharejs shim correctness:** Compared every collection method used by livedb-mongo 0.4.1 with the shim. `writeSnapshot` supplies a replacement document, so `update → replaceOne` is appropriate for this caller; `writeOp` always sets `_id`, so replacement-upsert `save` fits that path. Projection versus sort handling, unique op indexes and cursor-returning query paths match the examined calls. This is not a general mongoskin replacement: modifier updates and `save` without `_id` are unsupported semantics. Connection failures retry forever without returning errors to waiting callbacks, and `close` waits for eventual connection; add bounded failure/shutdown behavior and outage tests. No evidence was found here to contradict the author's successful OT/persistence probes, but they were not repeated, and a real-driver compatibility test remains necessary. R1-05 is the concrete TLS blocker. + +**Legacy and errors:** An unset URL still dispatches to the original UNO command. HTTP errors and ordinary transport/OS errors become `SubprocessError` with HTTP 400; service JSON details are discarded. Unexpected service exceptions currently terminate the request without a controlled JSON error. The legacy `TimeoutExpired` handling remains unchanged and is not claimed as a new regression. + +### Validation and limits + +Two independent local probes executed the actual exporter/service code with minimal dependency stubs: premature response EOF was accepted, and failed directory allocation leaked all semaphore slots. No LibreOffice, Docker, Mongo, full MFR test suite, production network or actual macro execution was used. The PR author's four tests and multi-architecture results are evidence supplied by the author, not independent results of this review. No stack state, runtime configuration or `.env` was read or changed. No commits, pushes, merges, approvals or issue closures were performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と対象 + +**Changes requested(要修正)。** R1-01 は PR 本体、R1-02〜R1-05 は関連する guide レシピの指摘です。組み合わせて配備する前に解決が必要です。投稿はレビューコメントであり、GitHub の承認や正式な review submission ではありません。 + +MFR head `95def1b47e59c37a990c8ad2764e297159ecd49b` と base `4514b1adcb66f2242e1a6cf103601fbe362ab04f`、guide commit `d30a054248f069336b7960aea64d8927b794a5fd` を確認しました。レシピのパスは guide、exporter のパスは MFR のルートを基準にしています。clone と再現コードは `/private/tmp/pr5-rev-a1e15b31` にあります。livedb-mongo 0.4.1 は GitHub のタグ commit `2fc2764f75ff38d83d43a74eab9799e1abe8ecfd` のソースを参照しました。 + +### 必須の修正 + +**R1-01 — P1: 不完全な HTTP 成功応答を拒否する。** `mfr/extensions/unoconv/export.py:59–61` は EOF まで読み、受信量と `Content-Length` を比較せず名前を変更します。ローカル HTTP サーバーが 100 bytes を宣言して `%PDF-short` の 10 bytes だけ送り切断すると、実際の exporter は成功し、その 10 bytes を出力として確定しました。変換サービスの異常終了時に壊れたプレビューを保存する可能性があり、「途中の切断で不完全な出力を残さない」という説明と矛盾します。受信量と上限を検査し、早期 EOF とプロトコル異常を拒否してから確定してください。短い固定長応答と壊れた chunked 応答について、エラー変換と `.part` 削除を試験してください。現状の `URLError/OSError` 捕捉は `HTTPException` の派生例外を扱いません。 + +**R1-02 — P1: 接続数と要求全体の時間を制限する。** `installer/images/unoconv/convert_service.py:85–86,113–128,141–158,161–163` は接続ごとのスレッドと無通信時間の制限を使います。2 枠のセマフォはヘッダー受信後に取得し、アップロードとダウンロード中も保持します。タイムアウトより短い間隔で送信する相手は両枠を占有し続けられ、ヘッダーだけ送る接続は枠を取らずスレッドを増やせます。PID・メモリ上限は最終的にサービスを停止・機能不全にするだけです。接続・ワーカー・待ち行列の上限と、ヘッダーから応答送信までの総時間制限を設け、低速送受信と過負荷後の復旧を試験してください。MFR の `urlopen(timeout=60)` も総時間ではなくソケットのタイムアウトなので、応答サイズと総時間を制限してください。 + +**R1-03 — P2: 一時ディレクトリ作成失敗時にも枠を返す。** `installer/images/unoconv/convert_service.py:141–144` は枠を取得した後、`try/finally` の外で `mkdtemp` を呼びます。`/tmp` の容量・inode 枯渇で枠が永久に失われます。`mkdtemp` に `OSError` を2回注入すると既定の2枠がすべて失われました。ディレクトリ未作成でも必ず枠を解放する構造にし、制御されたサービスエラーを返してください。作成失敗後に正常な要求が実行できる試験が必要です。出力やプロファイルの膨張にジョブ単位の上限がないため、共有 1 GiB tmpfs の枯渇は起こり得ます。 + +**R1-04 — P2: MFR と変換サービス間を認証し、通信範囲を狭める。** `mfr/extensions/unoconv/export.py:55–58` は資格情報を送らず、`installer/images/unoconv/convert_service.py:107–147` も認証しません。全インターフェースで待受け、共有 `grdm` ネットワークに参加します(`installer/grdm_dev/compose.py:593–595,670–671`)。同じネットワークの別サービスから資源を占有したり、攻撃文書を投入したりできます。内部ネットワークは呼出元の認証ではなく、隣接サービスへの通信も禁止しません。文書の受付・読取り前に認証し、可能なら MFR–converter 専用ネットワークと認証付き通信を使ってください。資格情報なし・不正の場合の拒否を試験し、秘密を URL やエラーメタデータに含めないでください。 + +**R1-05 — P2: Mongo サーバーの証明書検証を有効にする。** `installer/images/sharejs/vendor/mongoskin/index.js:82–84` は URL に `ssl=true` または `tls=true` があると自動的に `tlsAllowInvalidCertificates=true` を設定します。接続先の身元を検証しないため、内部ネットワークの能動的な攻撃者に Mongo を偽装されると、編集データの読取り・改変を許します。旧ドライバーの動作を引き継ぐだけでは堅牢化になりません。信頼する CA を渡して証明書・ホスト名を検証するか、開発専用の限定的な例外として明示的に受容してください。信頼する証明書の成功と無関係な証明書の拒否を試験してください。このレビューでは実 Mongo/TLS 試験はしていません。 + +### その他の確認項目 + +**URL と SSRF:** `CONVERT_URL` は文書や要求パラメーターではなく配備設定です。この設定を通じて文書から任意 URL を直接指定できる経路は見つかりませんでした。形式・拡張子は query エンコードされます。ただし設定先の制限、urllib の既定リダイレクト・プロキシの制限がなく、query も単純に追加します。意図した HTTP(S) 接続先・パスを検証し、資格情報・query・fragment を必要に応じて拒否し、リダイレクト・プロキシを禁止または制限してください。これは設定の信頼境界の補強であり、未認証で任意 URL を指定できると実証したものではありません。 + +**ファイル名とコマンド注入:** 元のファイル名は使わず `input.<ext>` を生成し、英数字の拡張子と許可された出力形式に制限します。`Popen` はシェルを介さない引数リストと、生成した絶対パスを使います。パストラバーサルや soffice オプション注入の経路は見つかりませんでした。Python の `$` は末尾改行を許すので `EXT_RE` は `fullmatch` が適切ですが、この改行でパス逸脱や引数分割は起きません。 + +**サイズと時間:** 既定値は入力 128 MiB、変換45秒、待ち10秒です。プロセスグループを `finally` で kill します。1 GiB tmpfs と Compose のメモリ・PID・CPU 制限はコンテナ全体を制限しますが、出力単位の上限と通信全体の期限はありません。残る可用性の問題は R1-02/R1-03 に記載しました。 + +**後始末と分離:** 通常はジョブ・プロファイルを削除し、MFR も `finally` で `.part` を削除します。作者が記したタイムアウト後の `/tmp/OSL_PIPE_*` 残留は 0 bytes でも inode を使うため、上限付きの掃除や再起動管理が必要です。`remove_job_dir` は再試行後の残留を通知しません。同じ UID の同時実行プロセスにとって別ディレクトリは、文書パーサーが侵害された場合の隔離にはなりません。マクロ・パーサーの攻撃は実行していません。 + +**マクロとコンテナ制御:** `registrymodifications.xcu:3–7` は `DisableMacrosExecution=true`、マクロセキュリティレベル3、外部リンクの更新制限を設定し、各プロファイルにコピーします。静的な設定は存在しますが、悪意あるマクロの試験は独立に実行していません。UID 1000、read-only root、全 capability 削除、no-new-privileges、上限付き tmpfs、tini を指定しています。Compose の既定値では内部ネットワークだけに参加して通常のインターネット経路を防ぎますが、隣接サービスへの通信は残り、egress の明示設定でも結果は変わります。完全なサンドボックスやジョブ間の機密性境界とは説明できません。 + +**Sharejs shim の正しさ:** livedb-mongo 0.4.1 が使う collection メソッドを照合しました。`writeSnapshot` は置換文書を渡すため `update → replaceOne` はその用途に合い、`writeOp` は必ず `_id` を設定するため置換 upsert の `save` もその経路に合います。projection/sort の振分け、op の unique index、cursor を返す query 経路も確認した呼出しと整合します。一般的な mongoskin の代替ではなく、modifier update や `_id` なしの `save` は同じ意味になりません。接続失敗は無限再試行され、待機 callback にエラーを返さず、`close` も接続成功を待ちます。有限の失敗・停止処理と障害試験が必要です。作者の OT 収束・永続化試験を覆す証拠は得ていませんが、再実行はしておらず、実ドライバーでの互換性試験は必要です。具体的な TLS の必須修正は R1-05 です。 + +**旧経路とエラー:** URL 未設定時は元の UNO コマンドを呼びます。HTTP エラーと通常の通信・OS エラーは HTTP 400 の `SubprocessError` になり、サービスの JSON 詳細は破棄されます。想定外のサービス例外は制御された JSON エラーにならず要求を終了します。旧経路の `TimeoutExpired` 処理は従来のままであり、新しい不具合とは判定していません。 + +### 検証と限界 + +最小限の依存スタブで実際の exporter/service コードを動かし、短い応答の成功扱いと、ディレクトリ作成失敗による全枠喪失を独立に再現しました。LibreOffice、Docker、Mongo、MFR 全試験、本番ネットワーク、実マクロは実行していません。PR の4試験と複数アーキテクチャの結果は作者の提示した証拠であり、このレビューの独立した結果ではありません。スタックの状態、runtime 設定、`.env` は読取りも変更もしていません。commit、push、merge、approve、issue close は行っていません。 diff --git a/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR5_Convert_Service_r2.md b/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR5_Convert_Service_r2.md new file mode 100644 index 0000000..c83b407 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-modular-file-renderer-dev2027_PR5_Convert_Service_r2.md @@ -0,0 +1,81 @@ +# REV-PR5 Convert service review r2 / 変換サービスレビュー r2 + +> **Summary:** Pass for MFR PR #5 and the reviewed companion recipes: all five r1 findings are closed within this scope. Existing installations still require credential provisioning before rollout, and osf.io's separate Mongo client remains outside the fix. +> **概要:** MFR PR #5 と確認した関連レシピは pass。r1 の5件はこの範囲で解決しました。既存環境は配備前の鍵追加が必要で、osf.io の別の Mongo クライアントは修正対象外に残ります。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Closing a component's trust-boundary defect does not establish verification for every client of the same database. / コンポーネントの信頼境界を修正しても、同じデータベースを使う全クライアントの検証を保証するわけではありません。 +- Applies to: RCOSDP/RDM-modular-file-renderer-dev2027 PR #5 and guide companion recipes. +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [r1](2026-11-10_RDM-modular-file-renderer-dev2027_PR5_Convert_Service_r1.md) · [ADR-07](../decisions/ADR-07_Native_Builds_of_EOL_Middleware.md) +- Used by: PR #5 and companion recipe acceptance; no downstream document changed. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Pass.** All five required r1 changes are closed for MFR head `f78f49aa84c271f3370c6605d4c24b3d9d292788` and guide commit `0bc331fa0065fbc8541915f301263595acc8c813`. This is a reviewer comment, not a GitHub approval. MFR was cloned into `/private/tmp/pr5-rev-r2-NHqNhk/mfr`; the companion guide was read at the assigned local path. Recipe paths are relative to guide and exporter paths to MFR. + +### Finding disposition + +**R1-01 — Closed.** `mfr/extensions/unoconv/export.py` requires a numeric Content-Length, checks the response-size ceiling, counts received bytes, rejects premature EOF, catches HTTPException and removes `.part` in finally. Atomic replacement occurs only after completion checks. Short fixed-length, malformed chunked, missing-length and oversized responses pass the rejection tests. Chunked responses without a declared length are intentionally unsupported. + +**R1-02 — Closed for the reviewed service and transfer paths.** `installer/images/unoconv/convert_service.py` replaces per-connection threads with fixed workers and a bounded pending queue. Socket shutdown timers enforce header and authenticated-request deadlines despite trickling input or a blocked output write. The conversion wait and subprocess timeout use the remaining request budget. Upload/download do not hold conversion slots. Independent tests cover header-only connections, trickled headers, slow upload, slow reader, overload rejection and recovery. MFR's socket watchdog bounds upload/response transfer; its slow-response regression passes. Precision limit: MFR starts that watchdog after `connection.connect()`, so platform DNS resolution and sequential address connection attempts are not strictly covered by one wall-clock deadline. The fixed internal converter destination makes this a nonblocking configuration/resolver follow-up, not a remaining peer-driven transfer leak. Service queue time and header time are separate bounded budgets, not part of the authenticated-request 58 seconds. + +**R1-03 — Closed.** Job-directory allocation occurs before slot acquisition and inside the cleanup scope. Allocation failure returns 503 `storage_unavailable`; conversion slot acquisition has unconditional release in finally. Four injected allocation failures preserve the slots and a subsequent valid conversion succeeds. Unexpected conversion failure also releases its slot. The tests use a stub converter; physical tmpfs exhaustion reported by the author was not repeated. + +**R1-04 — Closed.** Authorization uses constant-time comparison before job allocation or body reading. An independent raw-socket probe sent only headers declaring a 100000-byte body; missing and invalid bearer credentials both received 401 without sending any body. MFR sends the secret in Authorization, never the URL, and refuses HTTP conversion when it is absent. `UNOCONV_CONVERT_SECRET` is generated through the installer secret inventory and mapped to both MFR and the converter. Compose tests verify only mfr and unoconv join internal `grdm-convert`; unoconv leaves the shared grdm network. This is bearer authentication over the dedicated local network, not encrypted transport or isolation between compromised same-UID conversion jobs. + +**R1-05 — Closed for sharejs.** `installer/images/sharejs/vendor/mongoskin/index.js` now requires `MONGO_TLS_CA_FILE` for the configured TLS URL, loads its public certificate as `sslCA`, and enables `sslValidate` and hostname checking. The automatic invalid-certificate allowance is removed. Mongo retains its private key in mongo_data, publishes only its certificate to mongo_tls, and sharejs mounts that volume read-only. Compose tests confirm the trust-file wiring. The PR author reports successful real-driver OT/persistence tests and rejection of unrelated certificates and wrong hostnames on both architectures; these live TLS results were reviewed as author evidence, not independently rerun. + +### Remaining work and blocking status + +**osf.io's pymongo `ssl_cert_reqs=CERT_NONE`: nonblocking for this PR/recipe review, but an unresolved security issue.** ADR-07 and the PR explicitly disclose this separate client in `addons/wiki/utils.py`. It was not introduced or fixed by this pair. Sharejs verification must not be represented as database-wide verification; correcting the osf.io client needs a separate change and validation. This review does not approve a production-wide TLS security claim. + +**Existing runtime/.env missing `UNOCONV_CONVERT_SECRET`: not a code-review blocker; a deployment prerequisite.** `compose.py` rejects rendering with missing required secrets rather than silently deploying unauthenticated conversion. Provision a matching secret for MFR/converter before rollout and follow the established integration/image switch order. The renderer's suggested `secrets init --force` or rotation can affect other secrets, so the operator must plan that migration deliberately; this review did not execute it. No runtime/.env was read or modified. + +### Independent validation and limits + +The command `PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=installer python3 -m unittest installer.tests.test_convert_service installer.tests.test_compose installer.tests.test_secrets -q`, run from the assigned guide checkout, passed 76 tests. The unchanged PR exporter test file passed 16 tests in a scratch virtual environment with minimal BaseExporter, settings and SubprocessError stubs; actual exporter/network code ran, but full MFR dependency integration was not tested. The separate raw-socket authentication probe passed. Harnesses are in `/private/tmp/pr5-rev-r2-NHqNhk`. + +No Docker commands, live LibreOffice/Mongo tests, stack changes, runtime configuration access, commits, pushes, merges, approvals or closures were performed. One Japanese PR comment records this verdict. The review record is uncommitted. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と対象 + +**Pass(合格)。** MFR head `f78f49aa84c271f3370c6605d4c24b3d9d292788` と guide commit `0bc331fa0065fbc8541915f301263595acc8c813` について、r1 の必須修正5件は解決しました。これはレビューコメントであり、GitHub の承認ではありません。MFR は `/private/tmp/pr5-rev-r2-NHqNhk/mfr` に clone し、関連 guide は指定されたローカルパスで読みました。レシピのパスは guide、exporter のパスは MFR を基準にしています。 + +### 各指摘の判定 + +**R1-01 — 解決。** `mfr/extensions/unoconv/export.py` は数値の Content-Length を必須にし、応答サイズ上限・受信量を検査して早期 EOF を拒否します。HTTPException を捕捉し、finally で `.part` を削除します。完全性検査後だけ出力を確定します。短い固定長、不正 chunked、長さなし、上限超過の拒否試験が通りました。長さを宣言しない chunked 応答は意図的に非対応です。 + +**R1-02 — 確認したサービスと通信経路では解決。** `installer/images/unoconv/convert_service.py` は固定ワーカーと有限待ち行列を使います。ソケットを shutdown するタイマーにより、細切れ入力や送信の停止でもヘッダー期限と認証後の要求期限を強制します。変換待ちと子プロセスの時間制限は要求の残り時間以内です。アップロード・ダウンロード中は変換枠を保持しません。ヘッダーだけの接続、細切れヘッダー、低速アップロード、低速読取り、過負荷拒否と復旧を独立に試験しました。MFR の watchdog は送受信を制限し、低速応答の回帰試験も通りました。ただし watchdog の開始は `connection.connect()` の後なので、OS の名前解決と複数アドレスへの順次接続を単一の総期限では制限していません。固定の内部接続先を使う範囲では非阻害の設定・resolver 側の追跡課題とし、通信相手による転送枠の無期限占有が残ったとは判定しません。サービスの待ち行列・ヘッダーには別の有限予算があり、認証後58秒には含まれません。 + +**R1-03 — 解決。** ジョブディレクトリは枠取得前かつ cleanup 範囲内で作成します。作成失敗は503 `storage_unavailable` になり、変換枠は finally で必ず返します。作成失敗を4回注入しても枠数は維持され、その後の正常変換が成功しました。想定外の変換失敗でも枠が返りました。試験の変換器はスタブであり、作者が報告した実 tmpfs 枯渇は再実行していません。 + +**R1-04 — 解決。** ディレクトリ作成・本文読取り前に定数時間比較で認証します。独立した生ソケット試験では100000 bytes の本文を宣言するヘッダーだけを送り、資格情報なし・不正の両方で本文送信前に401を受けました。MFR は秘密を URL ではなく Authorization に送り、秘密がなければ HTTP 変換を拒否します。installer の鍵一覧に `UNOCONV_CONVERT_SECRET` があり、MFR と変換側の双方へ対応付けます。Compose 試験で内部 `grdm-convert` の参加者が mfr と unoconv だけで、unoconv が共有 grdm から離れることを確認しました。専用ローカルネットワーク上の bearer 認証であり、暗号化通信や、侵害された同一 UID の変換ジョブ間の隔離を保証しません。 + +**R1-05 — sharejs について解決。** `installer/images/sharejs/vendor/mongoskin/index.js` は設定された TLS URL に `MONGO_TLS_CA_FILE` を必須とし、公開証明書を `sslCA` に読み、`sslValidate` とホスト名検証を有効にします。不正証明書の自動許可は削除されました。Mongo の秘密鍵は mongo_data に残り、公開証明書だけを mongo_tls に出し、sharejs は読み取り専用でマウントします。Compose 試験で配線を確認しました。作者は両アーキテクチャで実ドライバーの OT・永続化成功と、無関係な証明書・異なるホスト名の拒否を報告しています。この実 TLS 結果は作者の証拠として確認したもので、独立に再実行していません。 + +### 残作業と阻害の有無 + +**osf.io の pymongo `ssl_cert_reqs=CERT_NONE`: 今回の PR・レシピ審査は阻害しませんが、未解決のセキュリティ課題です。** ADR-07 と PR は `addons/wiki/utils.py` の別クライアントとして明記しています。今回導入した問題でも今回修正した問題でもありません。sharejs の検証をデータベース全利用者の検証として説明してはいけません。osf.io 側は別途修正と検証が必要で、本レビューは本番全体の TLS 安全性を承認しません。 + +**既存 runtime/.env の `UNOCONV_CONVERT_SECRET` 欠落: コードレビューの阻害ではなく、配備前の必須作業です。** `compose.py` は必須鍵がないと render を拒否し、未認証の変換へ暗黙に切り替えません。配備前に MFR・converter に一致する鍵を用意し、既定の integration・イメージ切替順序を守る必要があります。render が案内する `secrets init --force` や rotation は他の鍵に影響し得るため、運用者が移行を計画してください。本レビューでは実行せず、runtime/.env の読取りも変更もしていません。 + +### 独立した検証と限界 + +指定 guide checkout で `PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=installer python3 -m unittest installer.tests.test_convert_service installer.tests.test_compose installer.tests.test_secrets -q` を実行し、76件が成功しました。scratch の仮想環境で PR の exporter 試験ファイルを変更せず実行し、16件が成功しました。BaseExporter・settings・SubprocessError は最小スタブで、実際の exporter・通信コードを動かしましたが、MFR 全依存との統合試験ではありません。別途、生ソケットの認証試験も成功しました。検証コードは `/private/tmp/pr5-rev-r2-NHqNhk` にあります。 + +Docker コマンド、実 LibreOffice・Mongo 試験、スタック変更、runtime 設定へのアクセス、commit、push、merge、approve、close は行っていません。この判定を日本語の PR コメント1件で記録します。レビュー記録は未コミットです。 diff --git a/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR4_Wiki_Bundle_Path_r2.md b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR4_Wiki_Bundle_Path_r2.md new file mode 100644 index 0000000..7957a0e --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR4_Wiki_Bundle_Path_r2.md @@ -0,0 +1,88 @@ +# Review: Wiki bundle path r2 / Wiki バンドル参照先 r2 + +> **Summary:** Pass: R1-01 is addressed by an explicit non-overlay installation path; a clean deployment must still run it. +> **概要:** pass:非オーバーレイ環境の明示的な配置手段で R1-01 に対応。クリーン配備ではその実行が引き続き必須。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** A documented installer resolves artifact provisioning only when deployment executes it before serving the editor. / 配置手段を文書化しても、編集ページ公開前に配備処理が実行する必要がある。 +- Applies to: `RCOSDP/RDM-osf.io-dev2027` PR #4, head `aa1f137e846a9c747681a4f54feeeda09a107699`, r2. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Chain review 1 / 関連レビュー 1](2026-11-10_RDM-y-websocket-dev2027_PR2_JWT_Auth_r1.md) · [Chain review 2 / 関連レビュー 2](2026-11-10_RDM-wiki-frontend-dev2027_PR3_JWT_Client_r1.md). +- Used by / 利用先: [SPEC-04 acceptance / 受入](../spec/04_acceptance_tests.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and R1 disposition + +**Pass for PR #4 r2; no blocking new finding.** [Previous R1-01](2026-11-07_RDM-osf.io-dev2027_PR4_Wiki_Bundle_Path_r1.md#english) is resolved at the source/deployment-contract level by `addons/wiki/bundle.py:49–82`, `tasks/__init__.py:846–851` and `README-docker-compose.md:397–410`. Non-development deployments now have an explicit instruction to build the frontend overlay, extract the output and run `invoke wiki_bundle --source <output directory>`. The helper copies all output pieces and creates the stable alias. This is a manual prerequisite, not automatic integration into the ordinary osf.io Dockerfile. No claim is made that production already runs it or that browser acceptance passed. The chain still requires the frontend token-renewal fix. + +### Selection, path and XSS checks + +`editor_script_url` checks the configured `STATIC_FOLDER/public/js/wiki/wiki-edit-page.js` and returns one of two fixed literal URLs. No user input, filename or source argument is interpolated into the script attribute. The attribute is now quoted (`edit.mako:737`), and no new HTML/script injection path was found. The module-level Mako import compiles successfully. Both URLs assume the existing `/static` prefix; default settings match it. A remote static store must mirror the alias locally for this existence check or adapt the selection contract; external-only asset publication was not verified. + +The alias absent case logs once per process and selects the legacy path. That raw source still contains CommonJS imports and is not a working fallback on a clean checkout. The README explicitly describes this limitation and says the legacy path works only where deployment replaces it with built output. Thus installing the overlay remains necessary; the new conditional alone does not fix a clean non-dev build. + +`install_bundle` requires exactly one hexadecimal-hashed entry and copies chunks, subdirectories and other output before updating the alias. It writes below the configured static wiki directory; it does not interpret the source path as a browser URL. Input is a trusted operator-supplied build directory, not an HTTP parameter. It is not a sandbox against malicious symlinks or an untrusted build tree. Use a separate extracted build directory, not the destination or a parent containing the destination. + +### R2-01 [P3, advisory]: make live replacement atomic or document an offline install + +`addons/wiki/bundle.py:64–81` copies files in place, copies the alias with `shutil.copy2`, and immediately prunes older chunks. The comment that the directory is never empty is narrower than an uninterrupted deployment guarantee: a concurrent request may read the alias while it is being replaced, and an already-open page may request an old chunk after pruning. For live production updates, stage and atomically publish the alias/versioned directory and retain older assets for active clients; alternatively state that the helper runs before serving requests. This does not block the documented pre-serving installation use case. A live-concurrency test was not performed. + +### Tests, chain and limits + +Nine `addons.wiki.tests.test_bundle` unittest cases passed in a scratch virtual environment, including actual Mako compilation, fallback, alias/chunk copying, replacement/pruning and invalid source selection. No full app settings import or Invoke task execution was tested; the task is a thin registered wrapper around the tested installer. Read the pinned Invoke 0.15.0 requirement and task registration. No production frontend build, real generated-chunk HTTP fetch, browser C4 or CDN configuration was exercised. + +The unchanged issuer uses HS256, UUID document scope, string user subject and eight-hour expiry, and serializes the page token with `sjson`. Its extracted real mint function with PyJWT 1.5.3 produced a token accepted by server PR #2. This PR does not add renewal; frontend PR #3 must handle expiry/reconnect. The omitted frontend Docker auth wrapper is superseded by server PR #2, not by this template change. + +Only scratch clones, host-only tests, three review files and one comment per PR were used. No grdm-dev Docker state or runtime/.env was accessed or modified; no application commit, push, merge or approval was made. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と R1 の扱い + +**PR #4 r2 は pass。新たな必須修正なし。** [前回 R1-01](2026-11-07_RDM-osf.io-dev2027_PR4_Wiki_Bundle_Path_r1.md#japanese) は `addons/wiki/bundle.py:49–82`、`tasks/__init__.py:846–851`、`README-docker-compose.md:397–410` により、ソースと配備の前提の面では解決。非開発環境では frontend overlay を build し、出力を取り出して `invoke wiki_bundle --source <出力ディレクトリ>` を実行する指示が追加された。全出力のコピーと固定名の作成を行う。これは手動の前提手順であり、通常の osf.io Dockerfile への自動統合ではない。本番で実行済み、ブラウザ受入済みという意味ではない。経路全体には frontend のトークン更新修正が残る。 + +### 選択・パス・XSS の確認 + +`editor_script_url` は設定された `STATIC_FOLDER/public/js/wiki/wiki-edit-page.js` を確認し、2つの固定 URL の片方を返す。利用者入力、ファイル名、source 引数を script 属性に入れない。属性は引用符付きになり(`edit.mako:737`)、新たな HTML/script 注入経路は見つからなかった。Mako のモジュール import は実際に compile できた。両 URL は既存の `/static` 前提で、既定設定に一致する。外部の静的配信先だけへ配置する構成では、存在確認用の alias をローカルにも置くか選択の前提を変更する必要がある。外部配信のみの構成は未検証。 + +alias が無ければプロセスごとに一度警告し旧パスを選ぶ。その生ソースは引き続き CommonJS import を含み、クリーン checkout では動く代替にならない。README は制約を明記し、旧パスが動くのはその場所を build 済み出力に置換した配備だけと説明する。overlay の配置は依然必要で、条件分岐だけでクリーンな非開発 build が直るわけではない。 + +`install_bundle` は16進ハッシュ付き entry がちょうど1つであることを要求し、chunk・下位ディレクトリ・他の出力をコピーして alias を更新する。書込先は設定された静的 wiki ディレクトリ配下で、source をブラウザ URL として解釈しない。入力は運用担当者が渡す信頼済み build ディレクトリで、HTTP 引数ではない。悪意ある symlink や不正 build tree を隔離する機構ではない。出力先自身や出力先を含む親ではなく、別に取り出した build ディレクトリを使うこと。 + +### R2-01[P3、助言]:稼働中の置換を不可分にするか停止中の配置と明記する + +`addons/wiki/bundle.py:64–81` はその場でコピーし、`shutil.copy2` で alias を更新して旧 chunk をすぐ削除する。「ディレクトリが空にならない」というコメントは、無停止配備の保証ではない。同時リクエストが置換中の alias を読む可能性や、開いているページが削除済みの旧 chunk を要求する可能性がある。本番稼働中の更新には、別の場所で準備して alias/版ディレクトリを不可分に切り替え、稼働中の利用者向けに旧出力を保持するか、リクエスト公開前に実行する手順と明記すること。文書の公開前配置という用途を妨げる必須修正ではない。稼働中の並行試験は実施していない。 + +### 試験・関連経路・限界 + +scratch の仮想環境で `addons.wiki.tests.test_bundle` の unittest 9件に合格。実 Mako compile、fallback、alias/chunk コピー、置換/削除、不正 source 選択を含む。アプリ全体の settings import や Invoke task の実行は未検証。task は試験済み installer を呼ぶ薄い登録関数である。固定された Invoke 0.15.0 と task 登録を読んだ。本番用 frontend build、実生成 chunk の HTTP 取得、ブラウザ C4、CDN 設定は未検証。 + +変更されていない発行側は HS256、UUID 文書範囲、文字列の利用者、8時間の期限を使い、`sjson` でページに出力する。PyJWT 1.5.3 による実発行関数の抽出実行結果は server PR #2 に受理された。この PR は更新機能を追加しないため、frontend PR #3 が期限後の再接続を扱う必要がある。省略された frontend Docker 認証ラッパーの代替は server PR #2 であり、この template 差分ではない。 + +scratch clone、ホストのみの試験、レビュー記録3件、各 PR 1コメントのみを使用した。grdm-dev の Docker 状態や runtime/.env は参照・変更せず、アプリの commit・push・merge・approve はしていない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| JWT | A signed pass containing who may connect, to which document, and until when. | 誰がどの文書へいつまで接続できるかを署名した通行証。 | +| Bearer token | A pass usable by whoever holds its value. | 値を持つ人が使える通行証。 | +| Upgrade | Changing an HTTP connection into a WebSocket connection. | HTTP 接続を WebSocket 接続へ切り替える処理。 | +| Awareness | Shared presence and cursor information. | 参加者やカーソル位置の共有情報。 | +| Bundle / chunk | Browser-ready JavaScript and its separately loaded pieces. | ブラウザ用に組んだ JavaScript と分割された部品。 | +| Origin | The website address from which a browser opens a connection. | ブラウザが接続を開始したサイトのアドレス。 | +| P2 / P3 | Normal-priority required fix / nonblocking improvement. | 通常優先度の必須修正/承認を妨げない改善。 | diff --git a/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR5_Security_Absorb_r1.md b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR5_Security_Absorb_r1.md new file mode 100644 index 0000000..7656c12 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR5_Security_Absorb_r1.md @@ -0,0 +1,194 @@ +# REV PR5 Security absorption review r1 / セキュリティ修正取り込みレビュー r1 + +> **Summary:** Request changes for a reproducible TOTP counter rollback race. SSRF protections are structurally sound in the reviewed paths; the repository still has pre-existing signature-verification gaps. +> **概要:** TOTP カウンタの巻き戻り競合を再現したため修正を要求する。対象経路の SSRF 対策の構造は妥当だが、リポジトリには既存の署名検証の不足が残る。 + +**Jump:** [English](#english) · [日本語](#japanese) + +Version / 版: 0.1 — 2026-11-10. **Learned:** An atomic counter update does not preserve replay protection when a later ordinary save overwrites it. / カウンタを不可分に更新しても、後続の通常保存が上書きすれば再利用防止を維持できない。 + +**Applies to:** RCOSDP/RDM-osf.io-dev2027 PR #5, head `fca11aaf7a16c25317b0daae76daded8007f8b59`, base `389415a473361fdaa3c347e84d95639b9096a9e9`. + +**Related:** [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Shared glossary](../reference/REF-01_Glossary.md). + +**Used by:** PR #5 acceptance decision by the coordinator and owner. Reviewer: REV(担当レビュワ, Codex Astra). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Request changes for R1.** R2 and R3 are confirmed pre-existing gaps, not regressions introduced by this PR. They need explicit follow-up if the acceptance claim is repository-wide signature hardening. The owner's 2026-11-10 decision to absorb the source fixes is accepted; the closed-unmerged source PR status is not a finding. + +The review used a fresh scratch clone and read-only `gh` queries. No repository commits, pushes, approvals, merges, or closures were performed. No Docker commands or runtime environment files were used. Only this record and the requested single PR comment are deliverables. + +### R1 — [P2 / Medium] A confirmation save can roll back the replay counter + +Locations: `addons/twofactor/models.py:79–96`, `addons/twofactor/views.py:22–24`, `api/users/serializers.py:540–544`. + +The conditional database update correctly stops two stale instances from consuming the same step when `allow_same_step=False`. However, both confirmation callers subsequently call unrestricted `save()`. `BaseModel.save()` delegates to Django without limiting fields (`osf/models/base.py:133–141`). A delayed confirmation for step N can overwrite the newer counter written by another request for N+1. A subsequent strict verification of N+1 then succeeds again. + +Reproduction used the exact `verify_code` method extracted from the head, real oath 1.4.2 codes, and a minimal Django model with the same fields in an isolated SQLite memory database. This is a deterministic interleaving demonstration, not a production PostgreSQL concurrency test. At fixed time 1800000000, A accepts N, B accepts N+1, A sets `is_confirmed` and saves all fields, then C accepts the already-consumed N+1. The database counter changes from 60000001 to 60000000. The accepted drift window makes both codes valid at that fixed time. + +Persist only the confirmation field after verification, or make verification and confirmation one transaction with suitable locking. Ensure counter writes remain monotonic and add a test that includes the callers' save, not only two `verify_code` calls. Review concurrent secret reset/deletion as part of that transaction design; the update currently predicates only on primary key and counter, not the verified secret. The reset race was not independently reproduced. + +### R2 — [P2 / Medium, pre-existing] Three HMAC checks still use ordinary comparison + +Locations: `addons/github/utils.py:43`, `addons/gitlab/utils.py:42`, `website/conferences/message.py:54`. + +The GitHub and GitLab hook validators compare `digest != signature`; Mailgun's validator compares `signature != self.form['signature']`. These functions are used by their receiving views. All three files are identical to the base. Thus the new `framework/auth/signing.py` helper correctly fixes its two verification methods, but does not establish constant-time comparison everywhere. Replace these remaining comparisons with the shared normalized helper or same-type `hmac.compare_digest`, and test that the constant-time primitive is actually called. No practical network timing exploit was attempted or claimed. + +### R3 — [P2 / Medium, pre-existing] Nextcloud's constant-time comparison has mismatched types + +Location: `addons/nextcloudinstitutions/views.py:57–58`. + +`hexdigest()` returns text, while the supplied signature is encoded to bytes. `hmac.compare_digest(bytes, str)` raises `TypeError`, including for a correct signature. This file is identical to the base. Normalize both operands to the same type and test a valid notification and an invalid signature. A local expression reproduced the exception; the complete notification route was not executed. + +### Assessment of each absorbed fix + +**SSRF.** Dataset API validation is followed by worker-side validation of the page, each `contentUrl`, and every redirect. `safe_fetch.resolve_and_validate` validates every resolved address, rejects disagreements between URL parsers, and pins the chosen numeric address in `_new_conn`. This removes the second hostname resolution that enables DNS rebinding. HTTP redirects are followed manually; private redirect targets are rejected before connection. Environment proxies are disabled, while CA bundle selection is retained. Dataverse replaces the requests references in the three pinned client-library modules with the same transport protections. Cross-origin redirects strip ordinary authorization/cookie headers and explicit auth, and reject replay of non-GET bodies unless the redirect becomes GET. + +IPv6 loopback, unique-local, link-local, mapped IPv4, 6to4, and Teredo are considered by the address checks. Unspecified `0.0.0.0` and decimal loopback `2130706433` were rejected in direct local probes. Hex loopback and mapped loopback were also rejected. On this macOS resolver, `0177.0.0.1` resolves to public `177.0.0.1`; it is allowed and pinned to that public address, rather than subsequently reinterpreted as loopback. No SSRF bypass was established in the reviewed dataset/Dataverse paths. This does not cover GitLab host selection or WaterButler. + +**Dataverse compatibility.** The default `DATAVERSE_ALLOWED_HOSTS=[]` denies private hosts even for previously stored accounts. Register the institution's actual host before deployment. Exact names, a name with a port, and leading-dot domain entries are supported; a host-only match also allows that host on other ports. The exception permits private addresses, but does not permit loopback, link-local, unspecified, multicast, or reserved addresses. Redirect destinations need their own matching permission. `validate_host` returns early for an allowlisted host, but the transport still resolves and enforces those exclusions before connection. An allowlist entry alone therefore does not make a loopback Dataverse usable. Use narrow institution-controlled entries. + +**HMAC.** Both `Signer` verification methods use the new helper; it normalizes bytes/text and rejects non-string values. Cron signed URLs, IQBRIMS, Crossref, Dropbox Business, and throttling comparisons already call `compare_digest`. R2 and R3 qualify any claim that every signature verifier is correct. Existing valid/invalid signature tests alone would also pass an implementation using ordinary equality; they do not prove constant-time execution. + +**TOTP.** The stored nullable counter and conditional update provide useful cross-instance protection. Older steps are rejected. The current step remains reusable by default for per-request API/Basic authentication, intentionally; strict same-step rejection is limited to setup confirmation. This is not universal one-use login protection. `on_add` and `on_delete` reset the counter. R1 defeats monotonicity across the complete confirmation flow. Existing stale-instance tests stop before the subsequent unrestricted save. Rejected older codes continue to count toward lockout under the existing callers; their comments about unavailable rejection reasons are stale, as already disclosed in the PR. + +**CSRF: all five exemptions checked.** In `admin/rdm_addons/api_v1/views.py`, `OAuthView` has DELETE; `AccountsView` has GET/POST; `ManageView` and `OrganizationView` have GET/PUT/DELETE. The fifth is `admin/rdm_addons/oauth/views.py:AccountsView`, with DELETE. All retain permission mixins. The three body-writing methods require JSON, rejecting form-compatible media types. Plain browser forms cannot issue PUT/DELETE, and cross-origin JavaScript requires successful preflight for JSON/PUT/DELETE. No method-override path was found in the inspected dispatch/middleware paths. The code therefore blocks the ordinary form-post attack without adding a CSRF token. This relies on cross-origin requests remaining restricted and trusted origins remaining trustworthy; no browser or deployed CORS test was run. GET helpers may create a missing default option record, but the inspected GET handlers do not perform the targeted account/project association changes. The five exemptions alone are not an established remaining exploit. + +**SQL identifiers.** Provider table names and the branch column are composed with `psycopg2.sql.Identifier`; rendering uses the live cursor connection. Query relationships are preserved. The hostile-column test distinguishes a quoted undefined column (`42703`) from the old SQL parse failure, but does not prove a formerly exploitable user-input path. The provider mapping already restricts inputs. This is appropriate defense in depth. + +**Compose.** The RabbitMQ management port is now exactly `127.0.0.1:15672:15672`. Other published services remain exposed on all interfaces, explicitly documented as development-only. The change does not claim to harden the whole stack. No Docker state was inspected or changed. + +**Migration.** `addons_twofactor/0005_usersettings_totp_last_counter` depends on `0004_rename_deleted_field` and adds one nullable `BigIntegerField`, without a default or data migration. Model and migration agree. Existing rows start with no replay history. Apply it before code requiring the column, and avoid a mixed old/new writer deployment because old processes do not enforce the new replay rule. Rollback removes replay history and requires the old application version. A table lock is still needed for schema change. Production migration timing and PostgreSQL forward/reverse execution were not independently tested; the successful disposable-DB migration results in the PR are author-reported evidence. + +### Tests and evidence limits + +The independent harness loads the real leaf modules and test bodies while replacing only package/application bootstrap with module shells and test settings. It uses Python 3.15, requests 2.27.1, urllib3 1.26.20, and Django 4.2 for the isolated race model. This differs from the application's Python 3.6 / pinned urllib3 1.22 environment. No complete application/DB suite, browser flow, production migration, or live Dataverse connection was run. + +```toon +independent_checks[5]{check,result}: + safe_fetch_and_safe_requests,49 passed + signing,4 passed + compose_head,1 passed + compose_base,old unbound management port confirmed + strict_totp_after_interleaved_save,replay accepted and counter rollback reproduced +``` + +All nine tests added by the final commit were inspected. The expected differences against the base are source-traced except the compose comparison, which was directly executed. The author's reported eight baseline failures were not independently re-run as an application suite. + +| New test group | What its evidence establishes | +|---|---| +| Dataset literal addresses: 1 | Five internal URLs should return 400 without task scheduling; the old API had no validation. This does not test DNS rebinding by itself. | +| Flask setup replay: 1 | Two real submissions use the same code; the old strictness-free confirmation accepts the second. The test does not interleave later saves. | +| API setup replay: 1 | The mocked validator rejects and must receive `allow_same_step=False`. The base also returns 403 with this mock; its failure is the missing keyword assertion, not observed replay behavior. | +| Admin media-type rejection: 3 | Dispatch is used and form types must return 415. On the base, Accounts reaches the mocked handler; Manage/Organization with `{}` return 400 rather than 415. This is differential behavior, but not a browser preflight test. | +| Admin JSON positive path: 1 | A JSON body with charset reaches the handler; this is expected to pass before and after the fix. | +| SQL hostile identifier: 1 | Checks SQLSTATE 42703 and a surviving user row; the old unquoted input causes a different parse error. This is quotation coverage, not a demonstrated successful prior injection. | +| Compose binding: 1 | Direct file assertion fails against the base's `15672:15672` and passes at the head. | + +Scratch evidence remains at `/private/tmp/rev-pr5-20261110/`: `check.py`, `check.log`, `totp_race.py`, `totp_race.log`, and `residual.py`. Re-run from that directory with `venv/bin/python check.py` and `venv/bin/python totp_race.py`; expected outputs are 49 unit tests OK plus four signing/one compose checks, and replay acceptance after counter rollback respectively. These scripts do not contact the running stack. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**R1 の修正を要求する。** R2 と R3 は既存の不足であり、この PR が導入した退行ではない。リポジトリ全体の署名強化を受入条件とする場合は、追跡対応を明示する必要がある。2026-11-10 の所有者による取り込み判断を前提とし、出典 PR の未マージ閉鎖そのものは指摘にしない。 + +新規の scratch clone と読み取り用 `gh` を使った。コミット、push、承認、マージ、close は行っていない。Docker コマンドや runtime の環境ファイルは使っていない。成果物はこの記録と指定された PR コメント一件のみ。 + +### R1 — [P2 / 中] 設定確認の保存が再利用防止カウンタを巻き戻せる + +対象: `addons/twofactor/models.py:79–96`、`addons/twofactor/views.py:22–24`、`api/users/serializers.py:540–544`。 + +条件付き DB 更新は、古いインスタンス二つが `allow_same_step=False` で同一ステップを消費することを防ぐ。しかし設定確認の両呼び出し元は、その後にフィールド指定のない `save()` を行う。`BaseModel.save()` もフィールドを限定せず Django に委譲する(`osf/models/base.py:133–141`)。ステップ N の設定確認が遅れると、別の要求が記録した N+1 を古い N で上書きし、その後 N+1 を厳密モードでも再利用できる。 + +head の `verify_code` をそのまま抽出し、oath 1.4.2 の実コードと同じフィールドを持つ最小 Django モデルを独立 SQLite メモリ DB で実行した。本番 PostgreSQL の並行試験ではなく、処理順を固定した再現である。時刻 1800000000 で A が N、B が N+1 を受理した後、A が `is_confirmed` を設定して全フィールドを保存すると、C が使用済み N+1 を再度受理した。カウンタは 60000001 から 60000000 に戻った。許容時刻ずれにより、この固定時刻でも両コードは有効になる。 + +検証後は確認済みフィールドだけを保存するか、検証と確認を適切なロック付きの一つのトランザクションにすること。カウンタが後退しないようにし、二つの `verify_code` だけでなく呼び出し元の保存まで含む試験を追加すること。更新条件には主キーとカウンタしかなく検証した秘密値を含まないため、その設計では秘密値の再設定・削除との競合も検討すること。再設定競合そのものは独立再現していない。 + +### R2 — [P2 / 中、既存] HMAC の通常比較が三か所残る + +対象: `addons/github/utils.py:43`、`addons/gitlab/utils.py:42`、`website/conferences/message.py:54`。 + +GitHub・GitLab は `digest != signature`、Mailgun は `signature != self.form['signature']` を使い、受信 view から呼ばれる。三ファイルとも base と同一である。`framework/auth/signing.py` の二つの検証経路の修正は妥当だが、全署名検証を定数時間にするものではない。正規化した共通ヘルパーまたは同じ型の `hmac.compare_digest` に統一し、その関数が呼ばれる試験を追加すること。ネットワーク越しの実用的な時間差攻撃は試行も実証もしていない。 + +### R3 — [P2 / 中、既存] Nextcloud の定数時間比較は型が一致しない + +対象: `addons/nextcloudinstitutions/views.py:57–58`。 + +`hexdigest()` は文字列だが、入力署名は bytes に変換される。`hmac.compare_digest(bytes, str)` は正しい署名でも `TypeError` になる。このファイルも base と同一である。両辺を同じ型に統一し、正しい通知と不正署名の試験を追加すること。式単体の例外は再現したが、通知ルート全体は実行していない。 + +### 取り込まれた各修正の評価 + +**SSRF。** データセット API の検証に加え、worker がページ、各 `contentUrl`、各リダイレクトを再検証する。`safe_fetch.resolve_and_validate` は全解決先を検証し、URL 解釈の不一致を拒否し、選んだ数値 IP を `_new_conn` に固定する。DNS rebinding に必要な二度目のホスト名解決を排除する構造である。リダイレクトは手動処理され、私設の転送先は接続前に拒否される。環境プロキシは使わず、CA バンドル設定は維持する。Dataverse は固定されたクライアント依存の三モジュールの requests 参照をこの安全な転送処理に置換する。別 origin への転送では認証・Cookie ヘッダーと明示的認証を除き、GET に変換されない非 GET 本文の再送を拒否する。 + +IPv6 の loopback、unique-local、link-local、IPv4-mapped、6to4、Teredo を検査する。直接のローカル試験で `0.0.0.0` と十進数 loopback `2130706433` を拒否した。16進 loopback と mapped loopback も拒否した。この macOS の名前解決では `0177.0.0.1` は公開 IP `177.0.0.1` になり、その公開 IP に固定されるため、その後 loopback として再解釈されない。対象のデータセット・Dataverse 経路で迂回は確認しなかった。GitLab のホスト選択と WaterButler はこの結論の対象外。 + +**Dataverse の互換性。** 既定の `DATAVERSE_ALLOWED_HOSTS=[]` では既存アカウントも私設ホストへ接続できなくなる。配備前に機関の実ホストを登録すること。完全一致名、ポート付き名、先頭ドットのドメイン指定が使える。ホスト名のみの一致は別ポートも許容する。例外は私設 IP を許すが loopback、link-local、未指定、multicast、予約 IP は許さない。転送先も独自に許可条件を満たす必要がある。許可ホストに対して `validate_host` は早期 return するが、実転送時に名前解決と除外条件の検査が行われる。そのため許可リストだけで loopback 上の Dataverse を使えるようにはならない。機関が管理する範囲に絞ること。 + +**HMAC。** `Signer` の両検証は新ヘルパーを使い、bytes と文字列を正規化し、それ以外の型を拒否する。cron 署名 URL、IQBRIMS、Crossref、Dropbox Business、throttling は既に `compare_digest` を呼ぶ。全検証が正しいという主張には R2 と R3 が残る。正解・不正解を確認する既存試験だけでは通常の等値比較でも通るため、定数時間であることは検証できない。 + +**TOTP。** NULL 可の保存カウンタと条件付き更新はインスタンス間で有効であり、古いステップを拒否する。API・Basic 認証は毎要求で送信するため、既定では同一ステップを再利用できる設計であり、同一ステップの厳密拒否は設定確認に限定される。ログイン全般での一回限り保証ではない。追加・削除時にはカウンタをリセットする。ただし確認全体では R1 により単調性が破れる。既存の stale-instance 試験は後続保存前に終わる。古いコードの拒否も既存の呼び出し元でロックアウト失敗回数に数えられ、拒否理由が公開されないというコメントは古い。これは PR でも開示済み。 + +**CSRF: 残る五か所を確認。** `admin/rdm_addons/api_v1/views.py` の `OAuthView` は DELETE、`AccountsView` は GET/POST、`ManageView` と `OrganizationView` は GET/PUT/DELETE。五つ目の `admin/rdm_addons/oauth/views.py:AccountsView` は DELETE。いずれも権限 mixin を維持する。本文を書き込む三メソッドは JSON を必須にしてフォームの media type を拒否する。通常のブラウザフォームは PUT/DELETE を送れず、別 origin の JavaScript による JSON/PUT/DELETE は preflight の成功が必要である。調査した dispatch・middleware には method override 経路を見つけなかった。CSRF token の追加なしで通常のフォーム POST 攻撃を止めるが、別 origin の通信制限と信頼 origin の安全性に依存する。ブラウザや配備済み CORS の実験は未実施。GET の補助処理は未作成の既定設定レコードを作る場合があるが、調査した GET は対象のアカウント・プロジェクト関連付け変更を行わない。五つの例外が残る事実だけでは攻撃成立とは判定しない。 + +**SQL 識別子。** provider のテーブル名と branch 列名を `psycopg2.sql.Identifier` で構成し、実 cursor の接続で文字列化する。結合関係は維持する。悪意ある列名の試験は引用された未定義列 `42703` と旧実装の構文エラーを区別するが、旧実装の利用者入力からの攻撃成立を示すものではない。provider は既にマッピングで絞られており、多層防御として妥当。 + +**Compose。** RabbitMQ 管理ポートは正確に `127.0.0.1:15672:15672` になった。他の公開サービスは全インターフェースのままで、開発専用という注意書きを追加している。スタック全体の強化を意味しない。Docker 状態は参照も変更もしていない。 + +**マイグレーション。** `addons_twofactor/0005_usersettings_totp_last_counter` は `0004_rename_deleted_field` に依存し、NULL 可の `BigIntegerField` 一列だけを追加する。既定値とデータ移行はなくモデルと一致する。既存行は使用履歴なしから始まる。列を必要とするコードより先に適用し、旧プロセスは新しい再利用ルールを守らないため新旧 writer 混在を避けること。巻き戻すと履歴が失われ、旧アプリケーションが必要になる。スキーマ変更にはテーブルロックが必要。本番での時間と PostgreSQL 上の正逆適用は独立検証していない。PR 内の使い捨て DB での成功は作成者の報告として扱う。 + +### 試験と証拠の限界 + +独立ハーネスは実際の末端モジュールと試験本体をロードし、パッケージ・アプリ初期化だけを空モジュールと試験設定に置き換えた。Python 3.15、requests 2.27.1、urllib3 1.26.20 を使用し、競合モデルは Django 4.2 を使用した。アプリケーションの Python 3.6 / urllib3 1.22 とは異なる。完全なアプリ・DB 試験、ブラウザ、本番移行、実 Dataverse 接続は未実施。 + +```toon +independent_checks[5]{check,result}: + safe_fetch_and_safe_requests,49件成功 + signing,4件成功 + compose_head,1件成功 + compose_base,旧管理ポートの全インターフェース公開を確認 + strict_totp_after_interleaved_save,巻き戻り後の再利用成功を再現 +``` + +最終コミットの追加九件をすべて読んだ。base との差異は compose の実行比較を除きソースからの追跡であり、作成者が報告した八件の base 失敗をアプリ全体で独立再実行したわけではない。 + +| 追加試験群 | 確認できる内容 | +|---|---| +| データセット IP 直書き: 1件 | 五つの内部 URL を 400 としタスクを起動しない。旧 API は検証なし。DNS rebinding 単体の試験ではない。 | +| Flask 設定確認の再利用: 1件 | 実コードの二回送信。旧実装は二回目も受理する。後続保存の並行順序は試さない。 | +| API 設定確認の再利用: 1件 | mock が拒否し、`allow_same_step=False` 引数を要求する。base でもこの mock なら 403 になり、失敗箇所は引数の検査である。実再利用の観測ではない。 | +| admin media type 拒否: 3件 | dispatch を通しフォーム型の 415 を要求する。base の Accounts は mock ハンドラに到達し、Manage/Organization は `{}` で 415 ではなく 400 になる。ブラウザ preflight 試験ではない。 | +| admin JSON 正常系: 1件 | charset 付き JSON がハンドラに到達する。修正前後とも成功する想定。 | +| SQL 悪意ある識別子: 1件 | SQLSTATE 42703 と利用者行の残存を確認する。旧実装は別の構文エラーとなる。引用の試験であり、旧実装での注入成功実証ではない。 | +| compose bind: 1件 | base の `15672:15672` で失敗し head で成功する直接のファイル検査。 | + +証拠は `/private/tmp/rev-pr5-20261110/` の `check.py`、`check.log`、`totp_race.py`、`totp_race.log`、`residual.py` に残した。同ディレクトリから `venv/bin/python check.py` と `venv/bin/python totp_race.py` で再実行できる。期待結果は unit test 49 件と署名四件・compose 一件の成功、およびカウンタ巻き戻り後の再利用成功である。実行中のスタックには接続しない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| SSRF | Making a server fetch an address chosen by an attacker. | 攻撃者が選んだ接続先へサーバー自身をアクセスさせること。 | +| DNS rebinding | Changing the address behind a name between checking and connecting. | 検査時と接続時の間に名前の指す IP を変えること。 | +| HMAC | A secret-key calculation used to check that a message is authentic. | 秘密の鍵を使い、メッセージが本物かを確かめる計算。 | +| Constant-time comparison | Comparing secrets without stopping at the first differing character. | 最初に違う文字で打ち切らず秘密値を比較する方法。 | +| TOTP / replay | A time-based code / using an already accepted code again. | 時刻で変わるコード/受理済みのコードをもう一度使うこと。 | +| CSRF / preflight | Tricking a browser into an unwanted action / its permission check before certain cross-site requests. | ブラウザをだまして操作させる攻撃/特定の別サイト要求の前に行う許可確認。 | +| Migration | A controlled change to the database structure. | DB の構造を手順に沿って変えること。 | +| Race / monotonic counter | An outcome depending on overlapping operations / a count that never moves backward. | 重なる処理の順番で結果が変わること/後退しないカウンタ。 | +| P2 / Medium | A defect to fix, without claiming an immediate critical compromise. | 修正すべき欠陥。即時の致命的侵害を意味しない。 | diff --git a/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR5_Security_Absorb_r2.md b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR5_Security_Absorb_r2.md new file mode 100644 index 0000000..d6bbd12 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR5_Security_Absorb_r2.md @@ -0,0 +1,146 @@ +# REV PR5 Security absorption review r2 / セキュリティ修正取り込みレビュー r2 + +> **Summary:** Changes requested: the new TOTP save transaction does not follow the database router. The original default-database rollback race and R2/R3 comparison defects are fixed; a separate existing GitLab bytes-body defect remains. +> **概要:** 修正要求。新しい TOTP 保存トランザクションが DB ルーターの接続先に追従しない。既定 DB での元の巻き戻り競合と R2/R3 の比較不具合は修正済みだが、GitLab の bytes 本文の既存不具合が別途残る。 + +**Jump:** [English](#english) · [日本語](#japanese) + +Version / 版: 0.1 — 2026-11-10. **Learned:** A row lock protects a save only when its transaction uses the same database connection. / 行ロックで保存を保護するには、同じ DB 接続上でトランザクションを開始する必要がある。 + +**Applies to:** RCOSDP/RDM-osf.io-dev2027 PR #5, head `493ad999bc9e37f6a7b796c2a51ae0a39097144c`; incremental review from `fca11aaf7a16c25317b0daae76daded8007f8b59`. + +**Related:** [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Round 1](2026-11-10_RDM-osf.io-dev2027_PR5_Security_Absorb_r1.md). + +**Used by:** The coordinator's PR #5 acceptance decision, recorded through the [review index](README.md). Reviewer: REV(担当レビュワ, Codex Astra). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Changes requested for R1-DB (P2 / Medium).** The original R1 interleaving is repaired on the default database. R2's three ordinary HMAC comparisons and R3's Nextcloud operand mismatch are repaired. R1-DB is a new regression in the save override. R2-GL is a separate pre-existing integration defect and is not the reason for blocking this round. + +### R1-DB — The transaction and row lock can use different databases + +Location: `addons/twofactor/models.py:128–138`; context: `osf/db/router.py:64–82`, `api/base/settings/defaults.py:37`. + +`transaction.atomic()` opens a transaction on `default`. The unqualified `select_for_update()` query and the superclass save instead follow database routing. The configured `PostgreSQLFailoverRouter` can select a writable database alias other than `default`. In that configuration, saving an existing two-factor settings object outside an outer transaction on the selected alias raises `TransactionManagementError: select_for_update cannot be used outside of a transaction`. Flask add-on deletion/reactivation and other ordinary saves do not acquire that alias's transaction through this method. An explicit `save(using=...)` also needs a matching lock and transaction. + +Independent reproduction used the exact new `save()` method, two isolated SQLite connections, a router selecting `primary`, and Django's SQL compiler with `has_select_for_update=True` to exercise its transaction guard. Creation succeeds; the subsequent save raises the stated error. This is a transaction-routing reproduction, not a PostgreSQL concurrency run. Default-only deployment does not trigger it. + +Resolve the effective write alias once, respecting an explicit `using` argument and otherwise the router. Use that same alias for `atomic(using=...)`, the locking queryset's `.using(...)`, and the superclass save. Add a routed/non-default database regression test. The default-database stale-save tests cannot detect this defect. + +### R1 — Counter and caller review + +For an unchanged secret on the default connection, the row is fetched inside `atomic()` and the lock remains held through the superclass save. The saved maximum counter wins. The conditional `verify_code()` update both enforces counter ordering and predicates on the verified secret; PostgreSQL row updates serialize against the lock. This is sound by source inspection, but actual concurrent PostgreSQL sessions were not run. + +Both Flask and API setup callers now invoke `confirm_setup()` after strict verification. That method writes only `is_confirmed` and `modified`, with a secret predicate, and returns false after reset/deletion. It does not overwrite the counter or drift. The Basic/API authentication callers do not save afterward; verification itself persists the counter. The direct queryset writes found in this model are the guarded verification update and the narrow confirmation update. No other production writer of `totp_last_counter`, or bulk writer targeting this model, was found in the repository search. + +Independent fixed-order checks passed for stale full saves, partial saves including the counter, confirmation-only saves, `confirm_setup()`, strict duplicate rejection, permitted same-step Basic/API reuse, and stale verification/confirmation after secret reset. Deletion prevents stale confirmation. A structural check confirmed lock-query evaluation occurs inside the default transaction. The new secret is intentionally allowed to reset the counter. The override is not a universal stale-object guard: a stale full save with a different secret can still overwrite secret state; no new production caller demonstrating that pre-existing race was identified. Direct future `QuerySet.update()`/bulk writes must preserve the invariant themselves. + +### R2 and R3 — Signature checks and input types + +GitHub, GitLab and conference Mailgun now call `constant_time_equals`; both `Signer` verification paths already do. The helper normalizes text and bytes to bytes and rejects missing/non-string values. Independent probes verified valid and forged signatures and spied on `hmac.compare_digest`. Missing GitHub/GitLab signature headers become an empty string and are rejected when the body has the type expected by the verifier. Actual HTTP header values are text; passing a bytes header directly to these utilities still fails at their pre-existing text `.replace()` before the helper. Mailgun's absent signature form key raises a request-form key error (Werkzeug's bad-request behavior), rather than accepting a request; a present `None` value is rejected by the helper. + +Nextcloud now compares normalized operands. The exact webhook function, with request/model/task adapters, accepted a correct signature and scheduled work once; forged, non-ASCII, empty and missing signatures were rejected without scheduling. Bytes and text signatures were both covered. This independently verifies function behavior, not the complete Flask route. The author's two full-route tests were read but not independently executed. + +The repository-wide source search found the other in-repository verification sites still using `compare_digest`: cron signed URLs, Crossref Mailgun, IQBRIMS, Dropbox Business and throttling. No remaining ordinary signature equality was found in the searched Python production code. This does not certify third-party verifiers or graceful handling of every malformed input; unchanged direct text comparisons in some of those paths can still raise on non-ASCII input. + +### R2-GL — Existing GitLab bytes-body failure + +Location: `addons/gitlab/utils.py:39`; caller: `addons/gitlab/views.py:318–321`. + +The receiving view passes Flask `request.data` (bytes), but the verifier calls `data.encode('utf-8')`. A correctly signed bytes body raises `AttributeError` before comparison. Independent execution reproduced the same failure at both r1 and r2 heads, so it is not introduced by these commits. Existing utility tests supply text and receiving-view tests mock the verifier. Normalize the body without re-encoding bytes and add an unmocked webhook-route test in a follow-up; otherwise the GitLab constant-time tests do not establish working request integration. + +### Evidence and limits + +A fresh clone at `/private/tmp/rev-pr5-r2-20261110/repo` was checked out at the reviewed head. All fourteen changed files and eleven added tests were inspected. `git diff --check fca11aaf..493ad999bc` passed. The independent harness extracts unchanged function bodies from source and replaces application bootstrap/model surroundings; it uses Python 3.15.2, Django 4.2.30, oath 1.4.2 and SQLite, not the application's pinned environment. + +```toon +checks[5]{check,result}: + default_database_counter_and_confirmation,passed + signature_helper_and_four_changed_verifiers,passed within documented input contracts + routed_save_transaction_guard,new failure reproduced + gitlab_bytes_body,pre-existing failure reproduced at both heads + incremental_diff_whitespace,passed +``` + +Evidence scripts and logs are `check.py`, `check.log`, `routed_save.py`, `routed_save.log`, `gitlab_bytes.py` and `gitlab_bytes.log` in `/private/tmp/rev-pr5-r2-20261110/`. To reproduce, run from that directory: + +```sh +/private/tmp/rev-pr5-20261110/venv/bin/python check.py +/private/tmp/rev-pr5-20261110/venv/bin/python routed_save.py +/private/tmp/rev-pr5-20261110/venv/bin/python gitlab_bytes.py +``` + +Expected results are successful isolated checks, the routed-save transaction error, and the GitLab bytes-body error at both revisions. Full application tests, PostgreSQL concurrency, migrations, deployed routing and browser flows were not independently run. Author-reported suite results remain author evidence. The other absorbed fixes are unchanged from r1 and were not rerun. No Docker command, runtime environment file, commit, push, approval, merge or closure was used. Deliverables are this record and one requested PR comment. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**R1-DB(P2 / 中)の修正を要求する。** 元の R1 の処理順による巻き戻りは既定 DB では修正された。R2 の HMAC 通常比較三か所と R3 の Nextcloud の型不一致も修正された。R1-DB は新しい save 上書きが導入した退行である。R2-GL は別の既存統合不具合であり、今回の修正要求の理由ではない。 + +### R1-DB — トランザクションと行ロックの DB が一致しない場合がある + +対象: `addons/twofactor/models.py:128–138`。関連: `osf/db/router.py:64–82`、`api/base/settings/defaults.py:37`。 + +`transaction.atomic()` は `default` 上でトランザクションを開始する。一方、接続指定のない `select_for_update()` と親クラスの保存は DB ルーターに従う。設定されている `PostgreSQLFailoverRouter` は `default` 以外の書き込み可能な接続を選ぶ場合がある。その構成で選択先の外側トランザクションがなければ、既存の二要素認証設定の保存が `TransactionManagementError: select_for_update cannot be used outside of a transaction` になる。Flask のアドオン削除・再有効化や通常保存では、このメソッドで選択先のトランザクションを確保できない。明示的な `save(using=...)` も同じ接続のロックとトランザクションが必要である。 + +新しい `save()` 本体をそのまま使い、独立 SQLite 接続二つ、`primary` を選ぶルーター、`has_select_for_update=True` とした Django SQL コンパイラーのトランザクション検査で再現した。新規作成は成功し、その後の保存で該当例外になる。これは接続振り分けの再現であり PostgreSQL の並行実行試験ではない。既定接続のみの配備では発生しない。 + +明示的な `using` 引数を優先し、それ以外はルーターから実際の書き込み接続名を一度だけ決めること。同じ接続名を `atomic(using=...)`、ロック対象 queryset の `.using(...)`、親クラスの保存に渡すこと。既定以外へ振り分ける回帰試験を追加すること。既定 DB の古いインスタンス保存試験では、この不具合を検出できない。 + +### R1 — カウンタと呼び出し元 + +既定接続上で秘密値が変わらない場合、行の取得は `atomic()` 内にあり、親クラスの保存終了までロックを保持する。保存済みの大きいカウンタが優先される。`verify_code()` の条件付き更新はカウンタの順序と検証した秘密値を条件に持ち、PostgreSQL の行更新は行ロックと直列化される。ソース上は妥当だが PostgreSQL の実並行セッションでは試していない。 + +Flask・API の設定確認はどちらも厳密検証の後に `confirm_setup()` を呼ぶ。同メソッドは秘密値を条件に `is_confirmed` と `modified` だけを更新し、秘密値の再設定・削除後は false を返す。カウンタや drift を上書きしない。Basic/API 認証の呼び出し元は後続保存をせず、検証自体がカウンタを永続化する。このモデル内で見つかった queryset 直接更新は、条件付きの検証更新と確認用の限定更新である。リポジトリ検索では他の製品コードの `totp_last_counter` 書き込みや、このモデルを対象にした一括更新は見つからなかった。 + +順序を固定した独立試験では、古い全フィールド保存、カウンタを含む部分保存、確認フィールドのみの保存、`confirm_setup()`、厳密モードでの重複拒否、Basic/API 用の同一ステップ再利用許可、秘密値の再設定後の古い検証・確認拒否が成功した。削除後の古い確認も拒否した。構造検査ではロック用 query が既定トランザクション内で評価されることを確認した。新しい秘密値でカウンタをリセットするのは意図した動作である。この上書きは古いオブジェクトを全面的に防ぐものではなく、秘密値が異なる古い全フィールド保存は秘密値自体を上書きできる。この既存競合を示す新しい製品呼び出し元は確認していない。将来の `QuerySet.update()` や一括書き込みは自身で単調性を維持する必要がある。 + +### R2・R3 — 署名検証と入力の型 + +GitHub・GitLab・conference Mailgun は `constant_time_equals` を使うようになった。`Signer` の二経路も既に同じヘルパーを使う。ヘルパーは text と bytes を bytes に統一し、欠落値や文字列以外を拒否する。独立試験で正しい署名・偽造署名と `hmac.compare_digest` の呼び出しを確認した。GitHub/GitLab の署名ヘッダー欠落は空文字列になり、本文が検証関数の想定する型なら拒否される。実 HTTP ヘッダー値は text である。ユーティリティへ bytes のヘッダーを直接渡す場合は、既存の text 用 `.replace()` でヘルパー到達前に失敗する。Mailgun の署名フォームキー欠落は要求フォームのキーエラー(Werkzeug の bad-request 動作)となり、要求を受理しない。キーが存在して値が `None` ならヘルパーが拒否する。 + +Nextcloud は型をそろえて比較する。要求・モデル・タスクのアダプターを使って webhook 関数本体を実行し、正しい署名では一回だけ処理を予約し、偽造・非 ASCII・空・欠落署名では予約せず拒否した。bytes と text の署名を確認した。これは関数の独立検証であり Flask のルート全体の試験ではない。作成者が追加したルート試験二件は読んだが独立実行していない。 + +リポジトリ全体のソース検索では、他の検証箇所である cron 署名 URL、Crossref Mailgun、IQBRIMS、Dropbox Business、throttling は引き続き `compare_digest` を使う。検索した Python 製品コードに通常の署名等値比較は残っていなかった。外部ライブラリの検証や全不正入力の正常なエラー処理まで保証しない。変更されていない一部の直接 text 比較は非 ASCII 入力で例外になり得る。 + +### R2-GL — GitLab の bytes 本文の既存不具合 + +対象: `addons/gitlab/utils.py:39`。呼び出し元: `addons/gitlab/views.py:318–321`。 + +受信 view は Flask の `request.data`(bytes)を渡すが、検証関数は `data.encode('utf-8')` を呼ぶ。正しく署名した bytes 本文でも比較前に `AttributeError` となる。r1 と r2 の両 head で同じ失敗を独立再現したため、今回のコミットが導入した問題ではない。既存のユーティリティ試験は text を渡し、受信 view の試験は検証関数を mock にしている。bytes を再 encode しない本文正規化と、検証を mock にしない webhook ルート試験を追跡対応すること。現在の GitLab 定数時間比較試験だけでは実要求との統合動作を証明できない。 + +### 証拠と限界 + +新規 clone `/private/tmp/rev-pr5-r2-20261110/repo` を対象 head に checkout した。変更された十四ファイルと追加十一試験を読んだ。`git diff --check fca11aaf..493ad999bc` は成功した。独立ハーネスはソースの関数本体を変更せず抽出し、アプリ初期化・モデル周辺を置換する。Python 3.15.2、Django 4.2.30、oath 1.4.2、SQLite を使い、アプリの固定環境とは異なる。 + +```toon +checks[5]{check,result}: + 既定DBのカウンタと確認,成功 + 署名ヘルパーと変更した四検証,記載した入力契約の範囲で成功 + 接続振り分け保存のトランザクション検査,新規失敗を再現 + GitLabのbytes本文,両headで既存失敗を再現 + 追加差分の空白検査,成功 +``` + +証拠は `/private/tmp/rev-pr5-r2-20261110/` の `check.py`、`check.log`、`routed_save.py`、`routed_save.log`、`gitlab_bytes.py`、`gitlab_bytes.log`。同ディレクトリで次を実行する。 + +```sh +/private/tmp/rev-pr5-20261110/venv/bin/python check.py +/private/tmp/rev-pr5-20261110/venv/bin/python routed_save.py +/private/tmp/rev-pr5-20261110/venv/bin/python gitlab_bytes.py +``` + +期待結果は独立検査の成功、接続振り分け保存のトランザクション例外、両版の GitLab bytes 本文例外である。完全なアプリ試験、PostgreSQL 並行試験、マイグレーション、配備環境の振り分け、ブラウザ操作は独立実行していない。作成者が報告した試験結果は作成者の証拠として扱う。他の取り込み修正は r1 から変更がなく再実行していない。Docker コマンド、runtime 環境ファイル、commit、push、承認、merge、close は使っていない。成果物はこの記録と指定された PR コメント一件のみ。 diff --git a/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR5_Security_Absorb_r3.md b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR5_Security_Absorb_r3.md new file mode 100644 index 0000000..d9eff5b --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR5_Security_Absorb_r3.md @@ -0,0 +1,100 @@ +# REV PR5 Security absorption review r3 / セキュリティ修正取り込みレビュー r3 + +> **Summary:** Pass for the incremental review: routed TOTP saves now use one database alias, and GitLab accepts signed bytes bodies. The PostgreSQL concurrency and unmocked signature-route tests are valid targeted coverage by inspection; their full application execution was not independently repeated. +> **概要:** 追加差分の判定は pass。TOTP 保存は同じ DB alias を使い、GitLab は署名付き bytes 本文を受理する。PostgreSQL 並行試験と署名検証を mock しないルート試験は精読上妥当だが、全アプリでの実行は独立再実施していない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +Version / 版: 0.1 — 2026-11-10. **Learned:** A routed row lock must share its transaction and final write alias; request-body tests must preserve the actual bytes passed by Flask. / 振り分け先の行ロックは transaction・最終保存と同じ alias を使い、要求本文の試験は Flask が渡す実際の bytes を保つ必要がある。 + +**Applies to:** RCOSDP/RDM-osf.io-dev2027 PR #5, incremental diff `493ad999bc9e37f6a7b796c2a51ae0a39097144c..69c4c3327294e4e88547c2439260d13ac0a98a08`. + +**Related:** [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Round 2](2026-11-10_RDM-osf.io-dev2027_PR5_Security_Absorb_r2.md). + +**Used by:** The coordinator's PR #5 acceptance decision, recorded through the [review index](README.md). Reviewer: REV(担当レビュワ, Codex Astra). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Pass. No changes requested for this incremental diff.** R1-DB is resolved. R2-GL, the previously identified GitLab bytes-body integration defect, is also resolved. All five changed files were inspected; unrelated security areas retain the scope and limitations of the previous reviews. This is a review verdict, not a GitHub approval or merge authorization. + +### Routed TOTP save + +`addons/twofactor/models.py:133–145` resolves `using` once, preferring the explicit keyword and otherwise calling Django's shared router with the instance hint. It passes the resulting alias to `transaction.atomic`, the `select_for_update` queryset and the superclass save. The queryset is evaluated and the superclass returns inside the same atomic block, so the row lock spans the write. The unchanged-secret maximum-counter rule and changed-secret reset remain intact. Creation and partial saves excluding the counter still bypass the lock, as before. + +Independent checks extracted the actual head methods into a minimal Django model with separate default/primary SQLite databases. Both routed and explicit-primary saves preserved 100 when the stale object held 50; all lock-query evaluations occurred inside primary's transaction while default remained outside one, and the persisted row existed only on primary. A secret reset preserved a null counter. Django's SELECT FOR UPDATE transaction guard was enabled; only the unsupported SQLite SQL suffix was suppressed. This verifies alias propagation and transaction structure, not actual PostgreSQL locking. + +### PostgreSQL test validity + +`addons/twofactor/tests/test_concurrency.py` uses two additional aliases pointing to the test database. Their writes commit outside the default alias's surrounding test transaction, and Django's thread-local connections give the worker a separate session. Thus these are real overlapping database operations, not mock lock assertions. The fixture row is created through an explicit alias and is visible to both sessions. Cleanup deletes it before dropping aliases; worker exceptions propagate through `_finish`. + +The first scenario holds an uncommitted advance to 101 while a stale save waits; after commit, that save must retain 101 and persist confirmation. The reverse scenario holds a save's transaction while a conditional update waits, then requires one update and final counter 101. The routed cases patch `django.db.router.db_for_write`, the shared router object actually used by both the implementation and Django, rather than an unrelated substitute. They cover preservation and reset on a non-default alias. On the previous implementation, a non-default SELECT FOR UPDATE lacks the matching transaction and fails. + +Connection startup sets `lock_timeout=15000`; lock observation and join each have a 10-second bound. This prevents an indefinitely blocked PostgreSQL lock acquisition. The test requires PostgreSQL with `pg_stat_activity.wait_event_type` available. A minor test-strength limitation remains: wait detection counts any lock waiter in the current database rather than identifying the worker PID. Concurrent unrelated lock waiters could weaken proof of the intended overlap. On an isolated test database the scenarios are appropriate, and their final state assertions remain meaningful. This is not a production regression or a blocking finding. No claim is made that lock_timeout bounds every possible network or query delay. + +### GitLab bytes and route coverage + +`addons/gitlab/utils.py:39` preserves bytes unchanged and UTF-8 encodes text. HMAC therefore uses the actual Flask request body instead of raising `AttributeError`. The existing constant-time helper still receives the signature and digest. Independent execution of the exact verifier and helper passed 24 combinations of bytes/text/UTF-8/empty bodies with valid, forged, missing and non-ASCII signatures, checking that `hmac.compare_digest` was reached. + +The new tests in `addons/gitlab/tests/test_views.py:344–380` post encoded JSON to the actual webhook URL. Neither the verifier nor the constant-time helper is mocked. Only the downstream log writer is mocked: a correct body signature must produce HTTP 200 and one log call; a forged signature must raise `HookError` and produce no log call. The application test configuration propagates that error, so expecting the exception is appropriate; temporarily disabling preserved exception context avoids leaking the failed request context. The valid route test would fail at the previous bytes `.encode()` call, and the forged route test would raise the wrong exception there. The added utility test separately covers bytes compatibility. No new regression was found in these changes. + +### Evidence and limits + +The fresh scratch clone is `/private/tmp/rev-pr5-r3-20261110/repo`; it remains clean at the reviewed head. `git diff --check 493ad999bc..69c4c33272` passed. Independent harness and output are `/private/tmp/rev-pr5-r3-20261110/check.py` and `check.log`; the harness reuses the r2 extraction preamble and runs with Python 3.15 / Django 4.2, differing from the application's Python 3.6 / Django 1.11 pins. + +From `/private/tmp/rev-pr5-r3-20261110`, run: + +```sh +/private/tmp/rev-pr5-20261110/venv/bin/python check.py +``` + +Expected output is two PASS lines and the explicit SQLite/full-application limitation. The full PostgreSQL tests and Flask application routes were read, not independently executed. At the last GitHub read, the head matched the reviewed commit, both CodeQL checks had succeeded, and unit-test image builds were still in progress; no completed CI unit-suite result is claimed. No Docker command, runtime/.env access, commit, push, approval, merge or closure was performed. Deliverables are this uncommitted record and one requested PR comment. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**Pass。今回の追加差分に修正要求はない。** R1-DB は解決した。既存の GitLab bytes 本文の統合不具合 R2-GL も解決した。変更五ファイルをすべて精読した。他のセキュリティ領域には前回までの範囲・限界が引き続き適用される。これはレビュー判定であり、GitHub の approve や merge の許可ではない。 + +### TOTP 保存の DB 振り分け + +`addons/twofactor/models.py:133–145` は `using` を一度決める。明示キーワードを優先し、それ以外はインスタンスをヒントとして Django の共有 router を呼ぶ。同じ alias を `transaction.atomic`、`select_for_update` の queryset、親クラスの保存に渡す。queryset の評価と親クラスの保存完了は同じ atomic ブロック内にあり、書き込み中の行ロックを維持する。秘密値不変時の最大カウンタ維持と秘密値変更時のリセットは保たれる。新規作成とカウンタを含まない部分保存は従来どおりロックを省く。 + +独立検証では head の実メソッドを最小 Django モデルへ抽出し、default と primary の独立 SQLite DB を使用した。router 経由と明示 primary の双方で、古いオブジェクトの 50 が保存済み 100 を下げないことを確認した。ロック query はすべて primary の transaction 内で評価され、その間 default は transaction 外だった。保存行は primary だけに存在した。秘密値リセット後のカウンタは null を維持した。Django の SELECT FOR UPDATE transaction 検査を有効にし、SQLite 非対応の SQL 末尾だけを省いた。alias 伝播と transaction 構造の検証であり、実 PostgreSQL ロックの検証ではない。 + +### PostgreSQL 試験の妥当性 + +`addons/twofactor/tests/test_concurrency.py` は試験 DB を指す追加 alias 二つを使う。それらの書き込みは default の試験用 transaction の外で commit され、Django のスレッドごとの接続により worker は別セッションになる。mock によるロックの断言ではなく、実 DB 操作を重ねる設計である。試験行は明示 alias で作成され、両セッションから見える。後片付けは alias 削除前に行を消し、worker の例外は `_finish` から伝播する。 + +第一のシナリオは未 commit の 101 への更新を保持して古い保存を待たせる。commit 後の保存は 101 を維持し、確認済み状態も保存しなければならない。逆順のシナリオは保存の transaction を保持して条件付き更新を待たせ、更新件数 1 と最終値 101 を要求する。振り分け試験は `django.db.router.db_for_write` を patch する。実装と Django が使う共有 router そのものであり、無関係な代替物ではない。default 以外での維持とリセットを確認する。旧実装では別 alias の SELECT FOR UPDATE に対応する transaction がなく失敗する。 + +接続開始時に `lock_timeout=15000` を設定し、待機観測と join はそれぞれ 10 秒を上限とする。PostgreSQL のロック取得が無期限に待ち続けることを防ぐ。`pg_stat_activity.wait_event_type` を利用できる PostgreSQL が必要である。小さな試験上の限界として、待機検出は worker の PID ではなく、現在の DB の全ロック待機を数える。無関係な待機が同時発生すると、意図した重なりの証明が弱くなる。隔離した試験 DB では妥当なシナリオで、最終状態の検査も有効である。製品の退行でも阻害指摘でもない。lock_timeout がすべての通信・query 遅延を制限するとは主張しない。 + +### GitLab bytes とルート試験 + +`addons/gitlab/utils.py:39` は bytes をそのまま保ち、text を UTF-8 に encode する。HMAC は `AttributeError` を起こさず、Flask の実要求本文を使う。署名と digest は既存の定数時間ヘルパーへ渡される。実検証関数とヘルパーの独立実行では、bytes・text・UTF-8・空本文と、正しい署名・偽造・欠落・非 ASCII 署名の組み合わせ 24 件が成功した。`hmac.compare_digest` に到達することも確認した。 + +`addons/gitlab/tests/test_views.py:344–380` の新試験は encode 済み JSON を実 webhook URL に送る。署名検証関数と定数時間ヘルパーは mock していない。後続のログ書き込みだけを mock にし、正しい本文署名では HTTP 200 とログ一回、偽造署名では `HookError` とログ零回を要求する。試験アプリは例外を伝播するため例外を期待するのは妥当で、例外時の context 保持を一時的に無効にすることで失敗要求の context を残さない。旧実装では正しい署名のルート試験は bytes の `.encode()` で失敗し、偽造署名の試験は違う例外で失敗する。追加の単体試験も bytes の互換性を確認する。今回の変更に新しい退行は見つからなかった。 + +### 証拠と限界 + +新規 scratch clone は `/private/tmp/rev-pr5-r3-20261110/repo` で、対象 head のまま変更はない。`git diff --check 493ad999bc..69c4c33272` は成功した。独立ハーネスと出力は `/private/tmp/rev-pr5-r3-20261110/check.py` と `check.log`。r2 の抽出用前半部分を再利用し、Python 3.15 / Django 4.2 で実行した。アプリの固定環境 Python 3.6 / Django 1.11 とは異なる。 + +`/private/tmp/rev-pr5-r3-20261110` で実行する。 + +```sh +/private/tmp/rev-pr5-20261110/venv/bin/python check.py +``` + +期待出力は PASS 二行と SQLite・全アプリ未実行の限界の明記である。PostgreSQL 試験と Flask 全アプリのルート試験は精読のみで、独立実行していない。最後の GitHub 読み取りで head 一致と CodeQL 二件成功を確認した。単体試験の image build は進行中で、CI 単体試験完了とは主張しない。Docker コマンド、runtime/.env アクセス、commit、push、approve、merge、close は行っていない。成果物は未 commit のこの記録と指定 PR コメント一件である。 diff --git a/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR6_Wiki_Token_Refresh_r1.md b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR6_Wiki_Token_Refresh_r1.md new file mode 100644 index 0000000..d11dba5 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR6_Wiki_Token_Refresh_r1.md @@ -0,0 +1,62 @@ +# Review: Wiki token refresh / Wiki トークン更新 + +> **Summary:** Pass with nonblocking hardening advice for caching and request provenance. +> **概要:** pass:キャッシュと呼出元検証に非阻害の改善助言あり。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Recovery must preserve local state while each trust boundary is checked separately. / 復旧時はローカル状態を保持し、信頼境界ごとに検証する必要がある。 +- Applies to: `RCOSDP/RDM-osf.io-dev2027 PR #6`, head `5f571a2731ffb65e51d99963acb25c39a80b6ffe`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [RDM-wiki-frontend-dev2027](2026-11-10_RDM-wiki-frontend-dev2027_PR3_JWT_Client_r2.md) · [RDM-y-websocket-dev2027](2026-11-10_RDM-y-websocket-dev2027_PR3_Origin_Allowlist_r1.md). +- Used by / 利用先: [SPEC-04 acceptance / 受入](../spec/04_acceptance_tests.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and permission checks + +**Pass**, with R1-01 [P3] below. `views.py:265–299` checks login and current WRITE permission, with the existing publicly-editable Wiki exception for logged-in users. Anonymous callers receive 401; non-contributors, removed writers and read-only contributors receive 403 on ordinary wikis. Publicly editable wikis intentionally allow those logged-in users. Registration requests are rejected by `must_not_be_registration`; the shared predicate also rejects an archiving registration that the decorator permits through. Deleted nodes are rejected by `must_be_valid_project` through `get_or_http_error` (410, or 451 for suspended/deleted nodes); missing nodes return 404. The page guard is not identical, but normal conversion to private calls the wiki privacy hook, which clears and saves publicly-editable status. No reachable private-wiki bypass was demonstrated. + +Room lookup does not create a new room; absent room gives 404 and absent signing secret gives 503. The room identifier matches the original page and the renewal response. HS256 and the existing default lifetime of eight hours are unchanged (`utils.py:71–95`, `settings/defaults.py:12–14`). Expiry is checked on new connections only: an already-issued token can remain usable until expiry after permission removal, and established connections are not revoked by this endpoint. This is the existing contract, not immediate permission revocation. + +### R1-01 [P3]: make response storage and POST provenance explicit + +`views.py:299` returns the bearer credential without `Cache-Control: no-store`; the JSON renderer and inspected Flask handlers do not add it. Add explicit no-store and test the final response headers. POST without explicit freshness is not ordinarily reusable by HTTP caches, so this review does not claim a demonstrated shared-cache leak. + +The route accepts POST, does not inspect the body/content type, and has no explicit CSRF verification. `framework/csrf/handlers.py` supplies a cookie but does not validate the request token; merely calling `$osf.postJSON` is not server protection. A cross-site simple form can trigger issuance if session cookies are sent. However, this endpoint changes no application state, creates no room and returns JSON; same-origin policy prevents an unrelated site from reading the credential absent a separate cross-origin exposure. No credential theft or state-changing CSRF was demonstrated. Prefer explicit CSRF/origin verification for POST, or document a safe read-only GET design with no-store and compatible client changes. Test the chosen method, origin and session-cookie behavior. Do not describe this POST as CSRF-protected today. + +### Evidence and limits + +Read the complete diff, routing/renderer, auth, project/database guards and privacy hooks. An AST-extracted real view and predicate with stub models passed nine permission/result cases, including registration defense in depth; this is not a framework integration test. Existing new tests cover writer/anonymous/outsider/reader/removal/public editing/missing room/missing secret/method, but do not cover deleted/registration nodes or cache/CSRF behavior. The author's reported 13 pytest cases were not independently rerun: the required OSF database/runtime was not started. The frontend real-provider probe validated the response contract with a stub renewal callback. + +Only private scratch files, this review record and one requested PR comment are changed. No commit, push, merge, approval, Docker state change or runtime/.env access was performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と権限確認 + +**pass。** 下記R1-01[P3]の助言あり。`views.py:265–299` はログインと現在のWRITE権限を確認し、既存の公開編集Wikiではログイン済み利用者を例外として許す。通常のWikiでは匿名401、非貢献者・除名された編集者・読取専用貢献者403。公開編集Wikiではそれらのログイン済み利用者も意図どおり許可する。登録は`must_not_be_registration`で拒否し、同decoratorが通すアーカイブ中の登録も共通判定で拒否する。削除ノードは`must_be_valid_project`から`get_or_http_error`を経て410(停止かつ削除なら451)、存在しないノードは404になる。ページのguardと完全同一ではないが、通常の非公開化はWikiのprivacy hookで公開編集状態を解除・保存する。到達可能な非公開Wiki迂回は実証されなかった。 + +部屋参照は新規作成をせず、部屋なし404、署名秘密なし503。部屋IDは元ページと更新応答で一致する。HS256と既定8時間の期限は変更していない(`utils.py:71–95`、`settings/defaults.py:12–14`)。期限検査は新規接続時のみ。権限取消後も既発行トークンは期限まで利用可能で、接続済みの利用者をこのAPIは排除しない。既存の契約であり、即時の権限失効を提供するものではない。 + +### R1-01[P3]:応答保存とPOST呼出元を明示する + +`views.py:299` はbearer資格情報を`Cache-Control: no-store`なしで返し、JSON rendererと調査したFlask handlerも補っていない。明示的なno-storeと最終応答headerの試験を追加してほしい。明示的な鮮度指定のないPOSTは通常HTTPキャッシュで再利用されないため、共有キャッシュからの漏洩を実証した指摘ではない。 + +POSTはbodyやcontent typeを検査せず、明示的なCSRF検証もない。`framework/csrf/handlers.py`はcookieを配るが要求トークンを検証しない。`$osf.postJSON`を呼ぶだけではサーバ側の防御にならない。session cookieが送信される条件では他サイトの単純なformでも発行を誘発できる。ただし処理は状態を変更せず、部屋を作らずJSONを返すのみで、別のcross-origin露出がなければ同一生成元ポリシーが資格情報の読取りを防ぐ。資格情報窃取や状態変更CSRFは実証されていない。POSTならCSRF/Origin検証を明示するか、読取専用GETとno-storeの設計を説明してclientも整合させることを推奨する。選んだmethod・origin・session cookieの動作を試験し、現状のPOSTをCSRF保護済みとは記載しないこと。 + +### 根拠と限界 + +全差分、routing/renderer、認証、project/database guard、privacy hookを読んだ。実viewと判定をAST抽出しモデルをstubにした9条件の試験が合格。登録への追加防御も含むが、framework統合試験ではない。追加された試験は編集者・匿名・非貢献者・読取専用・除名・公開編集・部屋なし・秘密なし・methodを扱うが、削除/登録ノードとcache/CSRFは扱わない。OSFのDB/runtimeは起動せず、作者報告のpytest 13件は独立再実行していない。frontendの実provider試験では更新callbackをstubにして応答契約を確認した。 + +変更対象は独自scratch、本レビュー記録、依頼されたPRコメント1件のみ。commit・push・merge・approve・Docker状態変更・runtime/.envへのアクセスは行っていない。 diff --git a/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR7_Admin_Local_Assets_r1.md b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR7_Admin_Local_Assets_r1.md new file mode 100644 index 0000000..d70f557 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR7_Admin_Local_Assets_r1.md @@ -0,0 +1,75 @@ +# OSF PR7 Admin local assets review r1 / 管理画面アセットのローカル配信レビュー r1 + +> **Summary:** Pass for the base-template change; remaining CDN references and static-serving deployment prerequisites are explicit. +> **概要:** base templateの変更は合格。残るCDN参照と静的配信の配備前提条件を明示する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Local CSS must expose its relative font files, and installed packages alone do not configure HTTP serving. / ローカルCSSには相対参照するfontの公開が必要で、package導入だけではHTTP配信を設定できない。 +- Applies to: RDM-osf.io-dev2027 PR #7, head `e7ec951b8827d555566bcc41f2b017fe44523806`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md). +- Used by: the coordinator's source-absorption decision and follow-up verification. / 調整担当のソース吸収判断と後続検証。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and verification + +**Pass for the stated base-template scope.** `admin/templates/base.html:18–21` uses Django static URLs for ionicons and Font Awesome; the IE-before-9 conditional shims are removed. `admin/base/settings/defaults.py:275–283` adds prefixed CSS/font directories without replacing existing static directories. Relative `../fonts/` URLs resolve under the same local vendor prefix, while package metadata/source directories are not published. This follows the Dockerfile's existing admin yarn-install and collectstatic build steps. No source-level regression was found in that scope; IE8 shim removal is intentional. + +Ionicons is exactly `2.0.1`, with sha512 integrity in `admin/yarn.lock`. Independently downloaded the lockfile tarball into scratch and verified both its resolved SHA-1 and SHA-512 integrity against the bytes. Also verified the existing Font Awesome 4.7.0 tarball's resolved SHA-1. Font Awesome moves from the old CDN's 4.3.0 to the already locked 4.7.0, as disclosed in the PR; no newly floating dependency is introduced. + +Independently ran the **8 new asset tests, exit 0**, with `/private/tmp/rev-8275-oBBpKc/admin_harness.py`. The harness evaluates the actual static-directory assignments, installs only the two downloaded package contents in the private clone and runs real Django FileSystemFinder with minimal settings. It verifies both stylesheets, every referenced font, no external base-template assets, and exclusion of package metadata/source. It bypasses application/database initialization and uses modern Django, so this is an isolated static-finder check, not the full pinned application suite or browser rendering. `git diff --check` passed. + +### Remaining external references and deployment + +The rest of admin is **not CDN-free**, and the PR expressly excludes those templates. The scan confirms these unchanged references: + +- `rdm_addons/oauth_complete.html:24–26`: the same ionicons and Font Awesome CDNs. +- Preprint/registration/provider-asset/project-limit templates: Select2 on cdnjs. +- Preprint/registration/collection forms: TinyMCE cloud, Bootstrap content CSS, Font Awesome and the rawgit TinyMCE plugin. +- `entitlements/list.html:127–128`: jQuery on cdnjs and Google fallback. +- `metrics/osf_metrics.html:20–21`: d3/c3 on cdnjs. +- `rdm_statistics/statistics_report.html:9`: Bootstrap on maxcdn. + +These are recorded follow-up scope, not newly introduced regressions or a claim that all admin views now work offline. The changed base-template test does not inspect descendants or independent templates. + +The author reports base/head admin suites with the same 10 failures and 2 errors, and 1958 versus 1966 passes; this reviewer did not rerun those suites or establish the causes of the baseline failures. Actual C6 acceptance is still pending. With DEBUG false, the current runserver command does not serve static files; the installer needs its documented development-only `--insecure` adjustment or a proper static server, plus an image rebuild. This PR supplies assets but does not itself solve that deployment 404. No Docker command, stack change, runtime credential-file access, source edit, commit, push, approval, merge or closure occurred. This uncommitted record and one Japanese PR comment are delivered. + +GitHub reports both CodeQL analyses passing, but image-build checks are still pending (gh pr checks exit 8); source-review pass is not a declaration that CI has completed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と確認 + +**明記されたbase template範囲は合格(pass)。** `admin/templates/base.html:18–21` はioniconsとFont AwesomeをDjango static URLへ変更し、IE9未満の条件付きshimを削除する。`admin/base/settings/defaults.py:275–283` は既存の静的ディレクトリを保持して、prefix付きCSS/fontディレクトリを追加する。相対 `../fonts/` は同じローカルvendor prefix内で解決し、package metadata/sourceは公開しない。Dockerfile既存のadmin yarn installとcollectstatic手順に合致する。この範囲でソース上の退行は見つからず、IE8 shim除去は意図した変更である。 + +ioniconsは完全固定の `2.0.1` で、`admin/yarn.lock` にsha512 integrityがある。lockfileのtarballをscratchに独立取得し、実bytesに対してresolvedのSHA-1とSHA-512 integrity双方を検証した。既存Font Awesome4.7.0もresolvedのSHA-1を検証した。Font Awesomeは従来CDNの4.3.0から既存lockの4.7.0になることがPRで開示され、新たな変動依存は導入していない。 + +`/private/tmp/rev-8275-oBBpKc/admin_harness.py` で **追加asset試験8件を独立実行し、0終了**した。実際のstatic directory代入式を評価し、取得した2packageだけを専用cloneへ置き、最小設定の実Django FileSystemFinderで検査した。両CSS、全参照font、base templateに外部assetがないこと、metadata/source除外を確認する。アプリ/DB初期化を避け現行Djangoを使う隔離検査であり、固定依存のアプリ全体試験やbrowser表示試験ではない。`git diff --check` は成功した。 + +### 残る外部参照と配備 + +管理画面全体が **CDN非依存になったわけではない**。PRは残るtemplateを明示的に範囲外とし、走査でも既存参照を確認した。 + +- `rdm_addons/oauth_complete.html:24–26`: 同じioniconsとFont AwesomeのCDN。 +- preprint/registration/provider-asset/project-limitのtemplate: cdnjsのSelect2。 +- preprint/registration/collectionのform: TinyMCE cloud、Bootstrap content CSS、Font Awesome、rawgitのTinyMCE plugin。 +- `entitlements/list.html:127–128`: cdnjsのjQueryとGoogle fallback。 +- `metrics/osf_metrics.html:20–21`: cdnjsのd3/c3。 +- `rdm_statistics/statistics_report.html:9`: maxcdnのBootstrap。 + +これらは後続範囲として記録するもので、新規退行ではなく、全管理画面がoffline動作するという認定もしない。base template試験は子templateや独立templateを走査しない。 + +著者はbase/head両方で同じ10失敗・2error、成功1958件対1966件を報告しているが、レビュワは全体試験を再実行しておらず、baseline失敗原因も確定していない。実C6受入は未完了。DEBUG falseの現在のrunserverは静的ファイルを配信しないため、インストーラーで記載された開発専用 `--insecure` 調整または適切なstatic serverと、イメージ再ビルドが必要である。このPRはassetを供給するが、その配備404自体は直さない。Dockerコマンド、スタック変更、runtime資格情報ファイル参照、ソース修正、commit、push、approve、merge、closeは行わず、未コミット記録と日本語PRコメント1件を成果物とする。 + +GitHubではCodeQLの両解析は成功したがimage-buildは未完了(gh pr checks終了8)。ソースレビューの合格はCI完了の宣言ではない。 diff --git a/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR7_Admin_Local_Assets_r2.md b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR7_Admin_Local_Assets_r2.md new file mode 100644 index 0000000..5be29b4 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR7_Admin_Local_Assets_r2.md @@ -0,0 +1,53 @@ +# OSF PR7 Admin local assets review r2 / 管理画面アセットのローカル配信レビュー r2 + +> **Summary:** Changes requested: conditional skips remove the CI checks of actual assets and publication boundaries without a mandatory replacement. +> **概要:** 要修正。条件付きskipにより、実アセットと公開範囲のCI検査が必須の代替なしに失われる。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Checking directory declarations does not prove asset availability or exclude additional published directories. / ディレクトリ宣言の検査では実ファイルの存在も追加公開の禁止も証明できない。 +- Applies to: RCOSDP/RDM-osf.io-dev2027 PR #7, delta `e7ec951..02b2faccb8b75df1285b5e6cf6d9516a43daf237`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r1](2026-11-10_RDM-osf.io-dev2027_PR7_Admin_Local_Assets_r1.md) · [SPEC-06](../spec/06_documentation_conventions.md). +- Used by: [Acceptance specification](../spec/04_acceptance_tests.md) and the coordinator's integration decision. / 受入仕様と調整担当の統合判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Changes requested — R2-01 (P2), `admin_tests/base/test_static_assets.py:21–24,62,68,83`.** The new decorator skips all seven filesystem checks whenever either package directory is absent. That matches the current CI checkout mount, but it also treats an accidentally missing package in an asset-enabled environment as an acceptable skip. There is no mandatory job in the inspected workflow that runs these seven assertions with packages present. + +The six remaining cases provide real but partial coverage: no external base-template asset URLs, four required static-directory mappings, and the ionicons version/integrity declaration. The fix is therefore **not wholly uncovered**, but actual CSS/font availability and exclusion of package source/metadata are untested in the package-free job. In particular, adding `('vendor/ionicons', os.path.join(NODE_MODULES, 'ionicons'))` to `STATICFILES_DIRS` preserves all four membership assertions while publishing `package.json` and `src/ionicons.svg` when installed. The newly skipped exclusion checks would detect this; the six retained cases cannot. This is a source-derived counterexample, not a mutation test executed in this round. + +Require an asset-enabled CI execution of all seven cases that fails if either package is absent, or add an equivalent mandatory artifact check. Local/package-free skipping may remain when explicitly selected. If CI changes remain out of scope, use package-independent fixtures to exercise publication boundaries and retain a separate mandatory check of real package files. Show that a missing package/file and an added package-root mapping make the required check fail. + +### Evidence and limits + +Reviewed the one-file, 28-line addition via `gh api` compare and read the complete test at the exact head. Read `.github/workflows/unit-tests.yml`, `.github/scripts/ci/run-tests.sh`, the CI Compose override, `docker-compose.yml`, and Dockerfile as context. CI runs the tests through `web`, which mounts the checkout over `/code` and provides root node_modules but no admin node_modules volume; the admin service's volume does not apply to web. Dockerfile installs admin packages and runs collectstatic, but does not run these assertions or reject unintended additional published source/metadata. A successful image build is not equivalent coverage. + +The commit reports package-free results of six passes/seven skips and installed results of thirteen passes, plus a baseline negative control. Those are author-reported evidence, not independently rerun results. The initial exact-head status read showed image builds and CodeQL still in progress; no green-CI claim is made. R1's product-code conclusion remains historical; this round concerns only the test change. No application tests, Docker operations, runtime/.env reads, source edits, commits, pushes, approvals, merges or closures were performed. Deliverables are this uncommitted record and one Japanese PR comment. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**要修正(changes requested)— R2-01(P2)、`admin_tests/base/test_static_assets.py:21–24,62,68,83`。** 新しいdecoratorは、どちらか一方のpackageディレクトリがないだけで実ファイル検査7件をすべてskipする。現行CIのcheckout mountには合うが、実アセットを検査すべき環境でpackageが誤って欠落した場合も正常なskipとして扱う。確認したworkflowには、package導入済みでこの7件を必ず実行するjobがない。 + +残る6件には有効だが部分的な検出力がある。base templateの外部asset URL禁止、必須static directory対応付け4件、ioniconsのversion/integrity宣言を確認する。したがって修正が**完全に無検査になるわけではない**が、実CSS/fontの存在とpackage source/metadataの非公開はpackageなしのjobで未検査になる。具体的には `STATICFILES_DIRS` に `('vendor/ionicons', os.path.join(NODE_MODULES, 'ionicons'))` を追加しても4件の包含assertionは成功する一方、導入済み環境では `package.json` と `src/ionicons.svg` が公開される。skipされた非公開検査はこれを検出できるが、残る6件では検出できない。これはソースから導いた反例であり、この回でmutation testを実行した結果ではない。 + +CIで実アセット導入済みの7件を必須実行し、どちらかのpackage欠落を失敗にするか、同等の必須成果物検査を追加すること。明示的に選んだローカル/packageなし環境ではskipを残してよい。CI変更を範囲外とするなら、packageに依存しないfixtureで公開範囲を検査し、実packageファイルの必須検査も別途維持すること。package/fileの欠落とpackage rootの追加公開を負の対照にして、必須検査が失敗する証拠を示してほしい。 + +### 根拠と限界 + +`gh api` compareで1ファイル28行追加の差分と、対象headの試験全文を確認した。文脈として `.github/workflows/unit-tests.yml`、`.github/scripts/ci/run-tests.sh`、CI Compose override、`docker-compose.yml`、Dockerfileを読んだ。CIはweb経由で実行し、checkoutを `/code` にmountしてroot node_modulesだけをvolumeで補うため、admin node_modulesは提供されない。adminサービスのvolumeはwebには適用されない。Dockerfileはadmin package導入とcollectstaticを行うが、このassertion群は実行せず、追加公開されたsource/metadataも拒否しない。イメージbuild成功は同等の検査にはならない。 + +commitにはpackageなしで6成功・7skip、導入済みで13成功とbaselineの負の対照が記載されている。これらは著者報告であり、独立再実行結果ではない。対象headの最初のstatus確認ではimage buildとCodeQLは実行中で、CI成功とは判定していない。r1の製品コード判定は履歴として保持し、この回は試験変更のみを対象とする。アプリ試験、Docker操作、runtime/.env参照、ソース修正、commit、push、approve、merge、closeは行っていない。成果物は未コミットのこの記録と日本語PRコメント1件である。 diff --git a/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR7_Admin_Local_Assets_r3.md b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR7_Admin_Local_Assets_r3.md new file mode 100644 index 0000000..a81ce83 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR7_Admin_Local_Assets_r3.md @@ -0,0 +1,83 @@ +# OSF PR7 Admin local assets review r3 / 管理画面アセットのローカル配信レビュー r3 + +> **Summary:** Pass for R2-01: package-free tests check the exact publication set without skips, and the mandatory image build checks real collected assets. +> **概要:** R2-01 は pass。package 不在でも skip せず公開集合の完全一致を検査し、必須の image build が収集済み実アセットを検査する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Package-independent publication tests and a mandatory real-artifact check jointly cover the missing-asset and extra-publication regressions. / package 非依存の公開検査と必須の実成果物検査を組み合わせると、アセット欠落と追加公開の退行を検出できる。 +- Applies to: RCOSDP/RDM-osf.io-dev2027 PR #7, delta `02b2faccb8..b293b984ede0555f7c1df54eb52a5ebc71466ee8`, R2-01 only; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [r2](2026-11-10_RDM-osf.io-dev2027_PR7_Admin_Local_Assets_r2.md) · [SPEC-06](../spec/06_documentation_conventions.md). +- Used by: [Acceptance specification](../spec/04_acceptance_tests.md) and the coordinator's integration decision. / 受入仕様と調整担当の統合判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Pass — R2-01 resolved within this review's scope.** No new blocking finding in the three-file delta. The skip decorator is removed. The test relocates the real `STATICFILES_DIRS` entries onto package fixtures, uses Django's `FileSystemFinder`, and compares the whole published set with the allowlist. A package-root mapping therefore no longer escapes detection, including a mapping without a prefix. Negative cases cover missing CSS/font/package, extra files, package-root mappings, and invalid font references. + +CI includes `admin_tests` through `api1_and_js` → `test_travis_api1_and_js` → `test_api1` → `API_TESTS1 + ADMIN_TESTS`. This matters because the checkout mount lacks `admin/node_modules`: fixture-based checks no longer depend on that directory. The mandatory `build-image` job runs the Dockerfile, which installs the locked admin packages and invokes `python3 admin/base/icon_assets.py ./static_root` after collectstatic. Its nonzero result breaks the `&&` chain and fails the build. The checker rejects missing and unexpected files under the two vendor namespaces, and nonlocal or unresolved CSS font references. Whole-set fixture assertions additionally cover unprefixed publication outside those namespaces. + +### Independent evidence + +The following are reviewer-run results, not the author's reported tests. Counts and exit statuses are recorded as review data, with no separate machine-readable canonical file. + +```toon +verification[7]{case,result}: + package-free focused tests,12 passed / 0 skipped + missing ionicons.min.css mutation,1 failed / 11 deselected / exit 1 + added ionicons package-root mapping mutation,1 failed / 11 deselected / exit 1 + real locked package files,checker exit 0 + real fontawesome-webfont.woff2 deletion,checker exit 1 + extra vendor/ionicons/package.json,checker exit 1 + missing collected ionicons package,checker exit 1 +``` + +The independent clone at `/private/tmp/rev-pr7-r3.5wKu7U/repo` is detached at the full reviewed SHA and remains source-clean. No admin `node_modules` exists in it. A scratch harness runs an unchanged copy of the test module using Django 1.11.28 and pytest 5.0.0 on host Python 3.9.6, with compatibility aliases for old `collections` imports. It extracts and executes the real `STATICFILES_DIRS` assignment, supplies minimal Django settings, and bypasses application initialization and repository conftest files. Thus this is focused finder/checker execution, not a full application or CI run. The two mutation runs change only the scratch fixture copy or in-memory settings; the ordinary exact-set assertion fails in both. + +For real assets, downloaded Font Awesome 4.7.0 and Ionicons 2.0.1 archives matched the SHA-1 values in `admin/yarn.lock`. Their CSS/font directories were copied into a scratch collected-layout tree, and the unmodified command-line checker was run on that tree and its negative variants. This independently checks actual package filenames and CSS references, but does not execute Django collectstatic or Docker build. Harnesses remain at `/private/tmp/rev-pr7-r3.5wKu7U/run_review.py` and `/private/tmp/rev-pr7-r3.5wKu7U/check_packages.py`. + +### Limits and remaining work + +At the final status read, PR head still matched the reviewed SHA; both image-build checks were in progress and both CodeQL checks had succeeded. Passing this scoped review does not claim successful image builds or a green test matrix. The coordinator must assess the completed CI results before integration. No Docker operations, grdm-dev stack changes, runtime/.env access, application source changes, commits, pushes, approvals, merges or closures were performed. Deliverables are this uncommitted bilingual record and one concise Japanese PR comment. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**Pass — このレビューの範囲で R2-01 は解消。** 3 ファイルの差分に新しい阻害指摘はない。skip decorator は削除された。試験は実設定の `STATICFILES_DIRS` を package fixture に移し替え、Django の `FileSystemFinder` を使って公開集合全体と許可一覧を完全一致で比較する。そのため prefix のない場合も含め、package root の追加公開を検出できる。負の対照は CSS・font・package の欠落、余分なファイル、package root の対応付け、不正な font 参照を扱う。 + +CI は `api1_and_js` → `test_travis_api1_and_js` → `test_api1` → `API_TESTS1 + ADMIN_TESTS` を通じて `admin_tests` を実行する。checkout mount に `admin/node_modules` がなくても、fixture 検査はこのディレクトリに依存しない。必須の `build-image` job は Dockerfile を実行し、lock 済み admin package を導入して collectstatic の後に `python3 admin/base/icon_assets.py ./static_root` を呼ぶ。非ゼロ終了は `&&` の連鎖を止め、build を失敗させる。checker は二つの vendor namespace 配下の欠落・余分なファイルと、外部または解決できない CSS font 参照を拒否する。namespace 外への prefix なしの公開も、fixture の公開集合全体の比較が検出する。 + +### 独立検証の根拠 + +以下は著者の報告ではなく、レビュワ自身の実行結果である。件数と終了状態はレビュー記録であり、別の機械可読な正本ファイルは置かない。 + +```toon +verification[7]{case,result}: + package なしの対象試験,12 passed / 0 skipped + ionicons.min.css 欠落の変異,1 failed / 11 deselected / exit 1 + ionicons package root 追加の変異,1 failed / 11 deselected / exit 1 + lock 済み実 package のファイル,checker exit 0 + 実 fontawesome-webfont.woff2 の削除,checker exit 1 + vendor/ionicons/package.json の追加,checker exit 1 + 収集済み ionicons package の欠落,checker exit 1 +``` + +独立 clone は `/private/tmp/rev-pr7-r3.5wKu7U/repo` に置き、対象の完全な SHA で detached checkout した。ソースは変更せず、admin の `node_modules` も存在しない。一時 harness は未変更の試験ファイルのコピーを、host の Python 3.9.6、Django 1.11.28、pytest 5.0.0 で実行する。古い `collections` import には互換 alias を補う。実ファイルから `STATICFILES_DIRS` の代入式を抽出・実行し、最小限の Django 設定を与え、application 初期化と repository の conftest は通さない。したがって finder/checker の対象検証であり、application 全体や CI の実行ではない。変異試験は一時コピーの fixture またはメモリ上の設定だけを変更し、通常の完全一致 assertion がどちらでも失敗した。 + +実アセットは Font Awesome 4.7.0 と Ionicons 2.0.1 の archive を取得し、`admin/yarn.lock` の SHA-1 と一致することを確認した。CSS/font ディレクトリを一時的な収集後レイアウトへコピーし、未変更の command-line checker を通常状態と負の対照で実行した。実 package のファイル名と CSS 参照を独立に検証したが、Django collectstatic や Docker build は実行していない。harness は `/private/tmp/rev-pr7-r3.5wKu7U/run_review.py` と `/private/tmp/rev-pr7-r3.5wKu7U/check_packages.py` に残した。 + +### 限界と残作業 + +最後の status 確認でも PR head は対象 SHA と一致し、image build 2 件は実行中、CodeQL 2 件は成功だった。この限定レビューの pass は、image build や test matrix 全体の成功を意味しない。調整担当は統合前に完了した CI 結果を確認する必要がある。Docker 操作、grdm-dev stack の変更、runtime/.env 参照、application ソース変更、commit、push、approve、merge、close は行っていない。成果物は未コミットの二言語レビュー記録と簡潔な日本語 PR コメント 1 件である。 diff --git a/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r4.md b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r4.md new file mode 100644 index 0000000..7837d1a --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r4.md @@ -0,0 +1,159 @@ +# REV PR8 Mandatory authentication review r4 / 認証必須化レビュー r4 + +> **Summary:** The test adjustments mostly preserve the intended restrictions, but one count-only replacement does not prove that unrelated users are excluded. The develop merge matches a clean recomputation. +> **概要:** テスト修正の大半は意図した制限を維持するが、件数だけの置換 1 件は非共有利用者の除外を証明しない。develop マージは競合なしの再計算結果と一致する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only what publication requires: private-repository URLs become named plain-text references; local guide links become repository-relative links; unpublished scratch references become named plain text or quoted command-path placeholders; public review links absent from develop point to the reviewed public commit. / REV が公開に必要な変更のみを行った。非公開リポジトリの URL は名称付き平文参照、ローカルのガイドへのリンクはリポジトリ相対リンク、未公開 scratch の参照は名称付き平文またはコマンドの引用符付きパス代替表示とし、develop に未収録の公開レビューへのリンクは確認済みの公開コミットを指す。 +- Publication provenance / 公開版の来歴: REV(担当レビュワ)issued this publication version from the unchanged original `2026-11-10_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r4.md` (SHA-256: `ae2241c978c7b909b4672b8bf5860366d8a594dd4f3e0d1832507bd173fcca7f`); the original file and scratch evidence remain unchanged, and all text other than this version/provenance metadata and the explicitly stated publication references is verbatim. Quoted scratch command-path placeholders identify retained unpublished evidence and must be replaced with its local location before execution. / REV が上記原本から公開版を発行した。原本と scratch 証跡は未変更で、版・来歴の追記と明示した公開用参照以外の本文は原文どおり。コマンド内の引用符付き scratch パス代替表示は保持された未公開証跡を識別するもので、実行にはそのローカルの場所への置換が必要。 +- Version / 版: 0.1 — 2026-11-10. **Learned:** a reduced result count cannot establish who was excluded; inspect identities as well as counts. / 結果件数の減少だけでは誰を除外したかは証明できず、件数と ID の両方を確認する必要がある。 +- Applies to: RCOSDP/RDM-osf.io-dev2027 PR #8, `49e5521451ea8eccd5d44c0959764b0a0632cd93..d70afee7ddf384ffe8150a299546f111e7d2ff9a`. +- Reviewer / 担当: REV (Codex Astra). Inspection / 調査: 2026-11-11 JST; header date follows the requested review-series date / ヘッダ日は指定のシリーズ日付。 +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md). Used by: PR #8 review and acceptance decision / レビュー・受入判定。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Changes requested — R4-01 (P2, missing security regression assertion).** No new production leak is demonstrated. Fourteen existing test methods changed, plus one common helper, with three unchanged rebuild wrappers affected indirectly; sixteen TLS test methods arrived unchanged from develop. The seven-file delta contains 565 additions and 35 deletions. The author's comment 6765056698 correctly says that the search/invite/campaign follow-up changes tests only; the only production delta in this range is the develop Wiki TLS integration. + +The designated r3 file and its parent checkout were absent at inspection. The r3 verdict and limitations were read from PR comment 6759472716; no claim is made to have reread the unavailable local record. The requested r4 destination was recreated, with no replacement or reconstruction of r3. + +### Findings + +**R4-01 — `tests/nii/test_search_api2.py:196–197,210–224`.** `TestSearchPrivate.test_search_results` changes `users_found == 3` to `== 1`, then only checks the related URL strings. It never follows the users link or checks identities. A wrong singleton (an unrelated user instead of the caller), or a correctly filtered summary paired with a leaking users endpoint, still satisfies this method. The separate `TestSearchPrivateUsers` now creates a share, so it does not establish the no-share scenario of this changed test. The intended restriction is correct, but the task explicitly requires an assertion that restricted data is not returned for every restriction adjustment. Follow `users_link` using the same caller and assert returned IDs equal exactly `{user._id}` and exclude both `user_one._id` and `user_two._id`; retain the summary total and existing other-category assertions. An isolated execution of the actual method with simulated responses passed while its users link returned an unrelated user, confirming this assertion gap rather than a live endpoint exploit. + +**N1 — additional coverage recommendation, not a separate blocker.** `TestSearchJapanese.test_normalize_all` passes `user_pattern=True` only to the direct calls; the two `run_after_rebuild_search` calls at lines 764–767 and 780–783 use the default false. The extracted helper therefore does not query the outsider after rebuilding. Propagate the same flag. Also mirror the outsider zero assertion in the NFC-storage/NFD-query half of `test_normalize_user_ongoing_job_school` (1410–1421). Both methods already contain genuine exclusion assertions, so this is narrower coverage incompleteness, not deletion of a former rejection check. + +### Per-test assessment + +Paths and line numbers refer to the reviewed head. Grouped rows name every affected method explicitly. + +| Test / location | Assessment | +|---|---| +| `TestPrivateSearch.test_private_search_user1 / test_private_search_user2` — `tests/nii/test_search.py:1100,1148` | Justified: unrelated user removed; explicit opposite fullname exclusion; project/file/tag assertions retained. | +| `TestSearchExt.test_private_search_user1_ext` — `tests/nii/test_search.py:1951` | Justified: user count 2→1 and user2 fullname exclusion; wiki and other category checks retained. | +| `TestPrivateSearch.test_normalize_user1 / test_normalize_user2` — `tests/nii/test_search.py:1302,1321` | Justified: existing collaborators user5/user6 exercise the same Unicode queries; unrelated user1 must get zero results. | +| `TestPrivateSearch.test_normalize_user_ongoing_job_school` — `tests/nii/test_search.py:1374` | Justified: same six job/school field assertions in both normalization directions; outsider zero assertion added in NFD-storage/NFC-query branch. Reverse direction retains positive coverage only (N1). | +| `TestPrivateSearch.test_normalize_search_contributor1 / test_normalize_search_contributor2` — `tests/nii/test_search.py:1846,1856` | Justified: common helper asserts user1 gets zero, then checks matching collaborator; both Unicode directions retained. | +| `TestSearchSort.test_search_sort_user` — `tests/nii/test_search.py:2707` | Justified: explicit sharing makes all three expected users authorized; outsider result equals exactly its own name; ascending, descending and default checks retained. | +| `TestSearchJapanese.test_normalize_all` — `tests/nii/test_search.py:420` | Justified setup: invisible contributors avoid a second project-name match, not authorization. Outsider zero checks cover each user pattern before rebuild; rebuilt calls omit the flag (N1). Original 26 patterns and positive rebuilt checks remain. | +| `TestSearchPrivate.test_search_results` — `tests/nii/test_search_api2.py:175` | Restriction is justified, but insufficient evidence: only 3→1 count change; no returned user identity or outsider exclusion. Changes requested (R4-01). | +| `TestSearchPrivateUsers.test_search_user` — `tests/nii/test_search_api2.py:669` | Justified: READ sharing authorizes user_one; requester and user_one included, user_two excluded; anonymous 401 and name/job/school filters retained. | +| `TestInvite.test_claim_user_not_login_by_eppn` — `tests/nii/test_invite.py:45` | Justified: forged token remains 400 and must not disclose the login-mode message; valid token still reaches the existing LOGIN_BY_EPPN=False message. No production fix in this commit. | +| `TestRegistrationThroughCampaigns.test_confirm_email_get_with_campaign` — `tests/test_campaigns.py:228` | Justified: inactive session must first redirect to CAS with verification_key, not campaign; reload confirms active state; authenticated-owner callback retains original campaign assertion. CAS itself is simulated, as before. | + +`TestPrivateSearch.test_after_rebuild_search`, `TestSearchExt.test_after_rebuild_search_for_ext`, and `TestSearchSort.test_after_rebuild_search_for_sort` are unchanged wrappers. They still invoke the changed methods after reindexing, including their new negative assertions; no tests were skipped or deleted. These three plus the fourteen changed methods account for all seventeen failures in the old website log. The additional error was campaign teardown following its failure. + +### Imported TLS tests and merge + +Each of the following sixteen methods in `addons/wiki/tests/test_share_db_tls.py` is a justified additive test, byte-for-byte identical to develop `8fc45de461`; none replaces or removes an existing check. Tests intentionally demonstrating weak raw-driver behavior are paired with rejection tests, not with expectations that the application should permit it. Real driver checks use `connect=False`, so they do not prove a network handshake. + +```toon +imported_tests[16]{method,assessment}: + TestShareDbTls.test_share_db_never_disables_certificate_verification,"PASS: No CERT_NONE kwarg" + TestShareDbTls.test_share_db_passes_the_configured_ca_file,"PASS: Configured CA forwarded" + TestShareDbTls.test_tls_url_builds_a_context_that_requires_a_valid_certificate_and_host_name,"PASS: Real context requires certificate and hostname" + TestShareDbTls.test_ca_file_is_loaded_as_the_trust_anchor,"PASS: Real CA loading" + TestShareDbTls.test_missing_ca_file_fails_instead_of_connecting_unverified,"PASS: Missing CA fails" + TestShareDbTls.test_plain_url_without_ca_file_stays_plain,"PASS: Preserves explicit plaintext compatibility" + TestShareDbUrlCannotWeakenTls.test_weakening_option_is_refused_before_a_client_exists,"PASS: Reject weak options before client" + TestShareDbUrlCannotWeakenTls.test_refusal_is_a_pymongo_configuration_error,"PASS: Typed refusal" + TestShareDbUrlCannotWeakenTls.test_safe_urls_pass,"PASS: Safe controls" + TestShareDbUrlCannotWeakenTls.test_bypass_reproduced_by_review_is_closed,"PASS: Real weak driver compared with guard" + TestShareDbUrlEncodedOptions.test_encoded_query_weakens_the_driver_alone,"PASS: Proves adversarial inputs actually weaken driver" + TestShareDbUrlEncodedOptions.test_encoded_query_is_refused_before_a_client_exists,"PASS: Encoded/duplicate options rejected" + TestShareDbUrlEncodedOptions.test_share_db_builds_only_verifying_clients,"PASS: Accepted controls verify" + TestShareDbUrlDriverBoundaries.test_legitimate_encoded_value_is_accepted_and_verified,"PASS: Legitimate encoded values preserved" + TestShareDbUrlDriverBoundaries.test_driver_reads_the_encoded_value_as_one_appname,"PASS: Appname boundary and verification" + TestShareDbUrlDriverBoundaries.test_no_adversarial_url_yields_a_weak_client,"PASS: 702-case corpus: real weak inputs exist; accepted weak count zero" +``` + +Merge `58c8777133` has parents `49e5521451` and `8fc45de461`. `git merge-tree --write-tree` on these parents completed without conflicts and returned `817812c695dd6642a718d0a133e397c6bbda0901`, exactly the actual merge tree. Its first-parent delta consists only of `addons/wiki/settings/defaults.py`, `addons/wiki/utils.py`, and `addons/wiki/tests/test_share_db_tls.py`; all three equal develop. Thus there is no manual conflict-resolution delta, and the r3 WOPI, existing directory/claim/confirmation restrictions and cross-project Wiki defenses remain unchanged. + +### Evidence, limits and remaining work + +The source review included the full diff, AST method inventory, original fixtures, directory filtering before counts, claim-token decorator order, inactive-owner confirmation handling, all imported TLS assertions and the merge recomputation. `git diff --check` passed. Scratch checkout `REV scratch evidence (not published): rev-pr8-r4 checkout` remained clean. Independent assertion probes are saved in `REV scratch evidence (not published): probe.py` and `probe.txt`; they run extracted test methods with simulated responses, not the application or its databases. + +The old website run 42759230452 reports 17 failed, 2179 passed, 74 skipped and 1 error, matching the named methods. Both current website jobs passed: pull-request run 42799921437 and push run 42799913073, both reporting head `d70afee7dd`. The push run succeeded overall; the pull-request run has one api3_and_osf setup error (duplicate username unique constraint in `test_signed_waterbutler_cookie_over_real_http[fresh-200]`). This is outside the reviewed diff; it is not evidence that all checks are green. The author's local baseline comparison and mutation counts were not independently rerun. + +No Docker commands, service changes, runtime environment-file reads, commit, push, merge, approval or closure were performed. Full HTTP/database/ES suites were not rerun locally. R4-01 remains for the author; N1 is recommended. The existing private_security matrix gap (the matrix still lists only five shards) and actual ONLYOFFICE/other integration acceptance from r3 remain separate outstanding work. This review does not grant a merge or release approval. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**changes requested(変更要求)— R4-01(P2、セキュリティ回帰 assertion 不足)。** 製品の新たな漏えいを実証したものではない。既存テスト 14 メソッドと共通 helper 1 件が変更され、未変更の再索引 wrapper 3 件にも影響する。develop から TLS テスト 16 メソッドがそのまま入った。全差分は 7 ファイル、565 行追加・35 行削除。作者コメント 6765056698 の「search/invite/campaign 対応はテストだけ」は正しく、この範囲の製品変更は develop の Wiki TLS 統合のみ。 + +指定 r3 ファイルと親 checkout は調査時点で存在しなかった。r3 判定・制限は PR コメント 6759472716 で参照した。読めなかったローカル記録を再読したとは扱わない。指定の r4 保存先を再作成し、r3 の再作成・置換は行っていない。 + +### 指摘 + +**R4-01 — `tests/nii/test_search_api2.py:196–197,210–224`。** `TestSearchPrivate.test_search_results` は `users_found == 3` を `== 1` に変更し、その後は関連 URL の文字列だけを確認する。利用者リンクを辿らず ID も確認しないため、本人の代わりに無関係な 1 人を返す場合や、集計は正しいが利用者一覧が漏れる場合を検出できない。別の `TestSearchPrivateUsers` は共有を作る構成に変わっており、このテストの「共有なし」を証明しない。意図した制限は正しいが、今回の依頼は各制限変更で対象データが返らない assertion を必須としている。同じ呼出者で `users_link` を取得し、返る ID が厳密に `{user._id}` で、`user_one._id` と `user_two._id` が含まれないことを確認する。集計件数と他カテゴリ検査は残す。実テストメソッドを抽出して模擬応答で動かすと、リンク先が無関係な利用者を返す設定でも合格した。実 endpoint の漏えい再現ではなく検査不足の確認。 + +**N1 — 追加の検査推奨。独立した阻害事項ではない。** `TestSearchJapanese.test_normalize_all` は直接呼出しだけに `user_pattern=True` を渡し、764–767 行と 780–783 行の `run_after_rebuild_search` では既定 false になる。抽出 helper の実行でも再索引相当の呼出しは非共有側を検索しなかった。同じフラグを伝播させる。また `test_normalize_user_ongoing_job_school` の NFC 保存/NFD 検索側(1410–1421 行)にも非共有 0 件を対称に追加することを推奨する。両メソッドには実際の除外 assertion が既に存在するため、これは限定的な検査不足であり、元の拒否検査を削除したものではない。 + +### テストごとの評価 + +パス・行は対象 head。まとめた行でも全メソッド名を明記する。 + +| テスト・位置 | 評価 | +|---|---| +| `TestPrivateSearch.test_private_search_user1 / test_private_search_user2` — `tests/nii/test_search.py:1100,1148` | 妥当。無関係な相手の氏名を明示的に除外し、project/file/tag の検査は維持。 | +| `TestSearchExt.test_private_search_user1_ext` — `tests/nii/test_search.py:1951` | 妥当。user 件数を 2→1 とし user2 氏名を除外。Wiki と他カテゴリの検査は維持。 | +| `TestPrivateSearch.test_normalize_user1 / test_normalize_user2` — `tests/nii/test_search.py:1302,1321` | 妥当。既存共有相手 user5/user6 が同じ Unicode 検索を行い、非共有 user1 は 0 件と検査。 | +| `TestPrivateSearch.test_normalize_user_ongoing_job_school` — `tests/nii/test_search.py:1374` | 妥当。同じ職歴・学歴 6 項目を両正規化方向で維持。NFD 保存/NFC 検索側に非共有 0 件を追加。逆方向は成功側のみ(N1)。 | +| `TestPrivateSearch.test_normalize_search_contributor1 / test_normalize_search_contributor2` — `tests/nii/test_search.py:1846,1856` | 妥当。共通 helper で user1 が 0 件と確認後、共有相手の一致を確認。Unicode 両方向を維持。 | +| `TestSearchSort.test_search_sort_user` — `tests/nii/test_search.py:2707` | 妥当。共有を作り期待する 3 人の閲覧を許可。非共有側は本人名のみの配列と完全一致。昇順・降順・既定の検査を維持。 | +| `TestSearchJapanese.test_normalize_all` — `tests/nii/test_search.py:420` | 設定変更は妥当。非表示 contributor は project 文書の追加一致を防ぎ、認可を迂回しない。各 user パターンに再索引前の非共有 0 件を追加したが再索引呼出しはフラグ不足(N1)。元の 26 パターンと再索引後の成功検査は維持。 | +| `TestSearchPrivate.test_search_results` — `tests/nii/test_search_api2.py:175` | 制限自体は妥当だが検査不足。3→1 の件数変更だけで利用者 ID と非共有相手の除外を確認しない。要修正(R4-01)。 | +| `TestSearchPrivateUsers.test_search_user` — `tests/nii/test_search_api2.py:669` | 妥当。READ 共有で user_one を許可。本人と user_one を含み user_two を除外。匿名 401 と氏名・職歴・学歴フィルタの検査を維持。 | +| `TestInvite.test_claim_user_not_login_by_eppn` — `tests/nii/test_invite.py:45` | 妥当。偽 token は 400 のままログイン方式のメッセージを返さず、正しい token で既存 LOGIN_BY_EPPN=False メッセージを確認。このコミットの製品修正ではない。 | +| `TestRegistrationThroughCampaigns.test_confirm_email_get_with_campaign` — `tests/test_campaigns.py:228` | 妥当。無効 session はまず verification_key 付き CAS に遷移し campaign には遷移しない。reload で有効化を確認し、有効な所有者の戻りで元の campaign assertion を維持。CAS 自体は従来同様に模擬。 | + +`TestPrivateSearch.test_after_rebuild_search`、`TestSearchExt.test_after_rebuild_search_for_ext`、`TestSearchSort.test_after_rebuild_search_for_sort` は未変更の wrapper。再索引後に変更メソッドと追加の拒否 assertion を引き続き実行する。テストの削除・skip 追加はない。この 3 件と直接変更 14 件が旧 website ログの失敗 17 件に対応する。追加 error は campaign 失敗後の teardown。 + +### 統合された TLS テストとマージ + +次の `addons/wiki/tests/test_share_db_tls.py` の 16 メソッドはすべて妥当な追加テストで、develop `8fc45de461` とバイト単位で一致する。既存検査の置換・削除はない。生の driver が弱い設定を受ける再現テストはアプリ側の拒否テストと対であり、アプリが許可すべきという期待ではない。実 driver の検査も `connect=False` なので、ネットワークでの接続成功までは証明しない。 + +```toon +imported_tests[16]{method,assessment}: + TestShareDbTls.test_share_db_never_disables_certificate_verification,"PASS: CERT_NONE 引数なし" + TestShareDbTls.test_share_db_passes_the_configured_ca_file,"PASS: 設定 CA を渡す" + TestShareDbTls.test_tls_url_builds_a_context_that_requires_a_valid_certificate_and_host_name,"PASS: 実 context で証明書・ホスト名必須" + TestShareDbTls.test_ca_file_is_loaded_as_the_trust_anchor,"PASS: 実 CA 読込" + TestShareDbTls.test_missing_ca_file_fails_instead_of_connecting_unverified,"PASS: CA 欠落を拒否" + TestShareDbTls.test_plain_url_without_ca_file_stays_plain,"PASS: 明示的な平文互換を維持" + TestShareDbUrlCannotWeakenTls.test_weakening_option_is_refused_before_a_client_exists,"PASS: client 作成前に弱い設定を拒否" + TestShareDbUrlCannotWeakenTls.test_refusal_is_a_pymongo_configuration_error,"PASS: ConfigurationError を確認" + TestShareDbUrlCannotWeakenTls.test_safe_urls_pass,"PASS: 安全設定の成功側" + TestShareDbUrlCannotWeakenTls.test_bypass_reproduced_by_review_is_closed,"PASS: 実 driver の弱い動作と拒否を比較" + TestShareDbUrlEncodedOptions.test_encoded_query_weakens_the_driver_alone,"PASS: 入力が実 driver を弱めることを確認" + TestShareDbUrlEncodedOptions.test_encoded_query_is_refused_before_a_client_exists,"PASS: 符号化・重複設定を拒否" + TestShareDbUrlEncodedOptions.test_share_db_builds_only_verifying_clients,"PASS: 許可設定では検証あり" + TestShareDbUrlDriverBoundaries.test_legitimate_encoded_value_is_accepted_and_verified,"PASS: 正常な符号化値を許可" + TestShareDbUrlDriverBoundaries.test_driver_reads_the_encoded_value_as_one_appname,"PASS: appname 境界と検証" + TestShareDbUrlDriverBoundaries.test_no_adversarial_url_yields_a_weak_client,"PASS: 702 ケースで実際の弱い入力あり・許可された弱い設定 0" +``` + +マージ `58c8777133` の親は `49e5521451` と `8fc45de461`。両親からの `git merge-tree --write-tree` は競合なしで `817812c695dd6642a718d0a133e397c6bbda0901` を返し、実際のマージ tree と完全一致した。第一親との差分は `addons/wiki/settings/defaults.py`、`addons/wiki/utils.py`、`addons/wiki/tests/test_share_db_tls.py` のみで、3 ファイルは develop と同一。手動の競合解決差分はなく、r3 の WOPI、既存の directory/claim/confirmation 制限、Wiki のプロジェクト越境防止を維持している。 + +### 証拠・制限・残作業 + +全差分、AST によるメソッド一覧、元 fixture、件数計算前の directory フィルタ、claim token decorator の順序、無効所有者の確認処理、統合 TLS テストの全 assertion とマージ再計算を確認した。`git diff --check` は成功。scratch checkout `REV scratch evidence (not published): rev-pr8-r4 checkout` は clean。独立 assertion probe は `REV scratch evidence (not published): probe.py` と `probe.txt` に保存した。抽出したテストに模擬応答を渡すもので、アプリ・DB の試験ではない。 + +旧 website run 42759230452 は失敗 17・成功 2179・skip 74・error 1 で、対象メソッドと一致した。現 website は pull-request run 42799921437 と push run 42799913073 の両方が成功し、head は両方 `d70afee7dd`。push 全体は成功。pull-request 全体には api3_and_osf の setup error 1 件(`test_signed_waterbutler_cookie_over_real_http[fresh-200]` の username 一意制約重複)がある。対象差分外だが、全検査成功とは扱わない。作者のローカル基準比較・変更前失敗件数は独立再実行していない。 + +Docker コマンド、サービス変更、runtime 環境ファイル参照、commit、push、merge、approve、close は行っていない。ローカルの全 HTTP/DB/ES 試験は再実行していない。作者の残作業は R4-01、推奨は N1。既存の private_security matrix 未追加(現在も 5 shard のみ)と実 ONLYOFFICE を含む連携受入は r3 からの別の残作業。マージ・リリース承認ではない。 diff --git a/docs/reviews/2026-11-10_RDM-waterbutler-dev2027_PR2_Security_Absorb_r1.md b/docs/reviews/2026-11-10_RDM-waterbutler-dev2027_PR2_Security_Absorb_r1.md new file mode 100644 index 0000000..a469b63 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-waterbutler-dev2027_PR2_Security_Absorb_r1.md @@ -0,0 +1,78 @@ +# REV RDM-waterbutler-dev2027 PR2 security absorption r1 / セキュリティ吸収レビュー r1 + +> **Summary:** Independent review of PR2 at `9ab2baa98b09be09358b1e6bb35bb2d409d8e679`. Verdict: Non-blocking / 非阻害. +> **概要:** PR2の対象head `9ab2baa98b09be09358b1e6bb35bb2d409d8e679` を独立レビューした。判定: Non-blocking / 非阻害。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Both installer service templates supply all five required settings; fail-closed checks survive optimized Python. / 両サービスのテンプレートは必須設定5項目を供給し、最適化Pythonでも未設定時の拒否は有効。 +- Applies to / 対象: RCOSDP/RDM-waterbutler-dev2027 PR2, exact head recorded above; review only. +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) +- Used by / 利用先: [Documentation index / 文書索引](../README.md), coordinator's absorption decision / 調整担当の吸収判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and findings + +No blocking correctness or regression finding at the reviewed head. DEBUG and Tornado debug now default to false. RuntimeError replaces assertions, so Python -O cannot silently restore development secrets. Boolean parsing preserves old values and accepts trimmed, case-insensitive true/false. + +[P3, test improvement] tests/test_settings.py:40–70 checks absence of all secrets, but its positive case covers only OSF auth; it does not remove each secret individually or use -O. Add these cases to retained CI coverage. This is not a demonstrated product defect. + +### Installer compatibility + +installer/grdm_dev/templates/wb.json:12–16 and wb_worker.json:10–14 both supply SERVER_CONFIG_HMAC_SECRET, OSFSTORAGE_PROVIDER_CONFIG_HMAC_SECRET, OSF_AUTH_CONFIG_JWE_SALT, OSF_AUTH_CONFIG_JWE_SECRET and OSF_AUTH_CONFIG_JWT_SECRET. The two HMAC settings share WATERBUTLER_HMAC_SECRET. installer/grdm_dev/secrets.py:77–80 generates the four underlying values, and compose.py:616–619 maps the same values to OSF. compose.py:740–741 emits empty DEBUG and SERVER_CONFIG_DEBUG, which the parser treats as false. + +With nonempty synthetic values substituted for those template references, all three settings modules load with DEBUG off. This verifies the secret gate, not complete server/worker startup or network dependencies. No runtime secret was read. + +### Evidence and test validity + +Compared the exact head against e9b1ac266374d4f477083b327d9620badfc15ad9 in a fresh scratch clone. gh pr checks reports build-image and tests (wb) passing. Local full pytest collection stopped at missing aiohttpretty; it is not reported as a local pass. A separate subprocess harness loaded actual settings files with normal Python and -O, both template key sets, all values present, and each key absent: 24 checks passed. Package handler/provider initialization was bypassed with runpy; no server was started. The harness is /private/tmp/rev-security-PreTii/check_wb.py. + +### Remaining work + +Optionally retain the extra negative and optimized-mode cases in CI. Validate actual service startup during installer acceptance; no deployment, approval, merge, push or commit was performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +対象headに阻害する正当性・回帰の指摘はない。DEBUGとTornado debugの既定がfalseになる。assertをRuntimeErrorに置き換えたため、Python -Oでも開発用秘密値へ黙って戻らない。真偽値の解析は既存値を保ち、前後の空白と大文字小文字を許容したtrue/falseを受け付ける。 + +[P3・テスト改善] tests/test_settings.py:40–70は秘密値が全部ない場合を確認するが、正常系はOSF authだけで、各秘密値の単独欠落と-Oは検査しない。継続実行するCIへの追加を推奨する。製品不具合を示すものではない。 + +### インストーラーとの適合 + +installer/grdm_dev/templates/wb.json:12–16とwb_worker.json:10–14はともにSERVER_CONFIG_HMAC_SECRET、OSFSTORAGE_PROVIDER_CONFIG_HMAC_SECRET、OSF_AUTH_CONFIG_JWE_SALT、OSF_AUTH_CONFIG_JWE_SECRET、OSF_AUTH_CONFIG_JWT_SECRETを供給する。HMACの2設定はWATERBUTLER_HMAC_SECRETを共有する。installer/grdm_dev/secrets.py:77–80が元の4値を生成し、compose.py:616–619がOSFにも同じ値を渡す。compose.py:740–741の空のDEBUGとSERVER_CONFIG_DEBUGはfalseとして読まれる。 + +テンプレート参照を空でない合成値に置換すると、DEBUG offで3つの設定モジュールを読み込めた。これは秘密値検査の通過であり、サーバー・worker全体の起動や通信依存の確認ではない。実行時の秘密値は読んでいない。 + +### 根拠とテストの妥当性 + +新しいscratch cloneで対象headをe9b1ac266374d4f477083b327d9620badfc15ad9と比較した。gh pr checksではbuild-imageとtests (wb)が成功している。ローカルの通常pytestはaiohttpretty不足で収集が停止し、成功とは扱わない。別の子プロセス検査で実際の設定ファイルを通常Pythonと-O、両テンプレートのキー、全値あり・各値欠落で読み込み、24件が成功した。runpyでhandler/providerのパッケージ初期化を迂回し、サーバーは起動していない。検査コードは/private/tmp/rev-security-PreTii/check_wb.pyにある。 + +### 残作業 + +任意改善として単独欠落と最適化モードのケースをCIに残す。実サービスの起動はインストーラー受入で確認する。デプロイ、承認、マージ、push、commitは行っていない。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| PR / head | Proposed change / exact version reviewed. | 変更案/調べた正確な版。 | +| P1 / P2 / P3 | High / medium / low review priority. | 高/中/低の修正優先度。 | +| Secret / token | A private value used to prove identity or sign data. | 本人確認や署名に使う秘密の値。 | +| Regression | A change that breaks previously working behavior. | 以前動いた機能が変更で壊れること。 | +| CI / mock | Automated checks / a substitute used in a test. | 自動検査/試験用の代役。 | +| Secure cookie | A browser value restricted to secure transport. | 安全な通信経路に送信を限定するブラウザーの値。 | diff --git a/docs/reviews/2026-11-10_RDM-wiki-frontend-dev2027_PR3_JWT_Client_r1.md b/docs/reviews/2026-11-10_RDM-wiki-frontend-dev2027_PR3_JWT_Client_r1.md new file mode 100644 index 0000000..d9c71f2 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-wiki-frontend-dev2027_PR3_JWT_Client_r1.md @@ -0,0 +1,88 @@ +# Review: JWT client / JWT クライアント + +> **Summary:** Changes requested: an expired page token is reused indefinitely after a reconnect. +> **概要:** changes requested:再接続時に期限切れのページトークンを繰り返し使う。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** A valid initial token does not provide recovery for long-running editing sessions. / 初回のトークンが有効でも、長時間編集の復旧は保証されない。 +- Applies to: `RCOSDP/RDM-wiki-frontend-dev2027` PR #3, head `377be42e2873589a22b0214c3d2cebf3e73612ce`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Chain review 1 / 関連レビュー 1](2026-11-10_RDM-y-websocket-dev2027_PR2_JWT_Auth_r1.md) · [Chain review 3 / 関連レビュー 3](2026-11-10_RDM-osf.io-dev2027_PR4_Wiki_Bundle_Path_r2.md). +- Used by / 利用先: [SPEC-04 acceptance / 受入](../spec/04_acceptance_tests.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Changes requested: R1-01 [P2].** Initial authentication wiring is correct, but expiry prevents recovery during long editing sessions. No GitHub approve or request-changes review event was submitted; this verdict is conveyed by one comment. + +### R1-01 [P2]: refresh credentials and handle 4401 before retrying + +Location: `addons/wiki/static/wikiPageMilkdown.js:383–390` and status handlers at `451–464`. The token comes from page-render-time `window.contextVars` and is copied into provider params once. Neither an existing provider nor a newly constructed one on the same page obtains fresh credentials. The issuer's default TTL is eight hours, and the server validates every new upgrade. After that interval, a network interruption, laptop sleep or restarting collaboration leads to repeated 4401 responses with the same expired token. The editor cannot resume shared synchronization without reloading the page. Unsynchronized local edits need preservation during recovery. + +The client subscribes to `status` and `connection-error`, not `connection-close` with code 4401. Its locked y-websocket version is 2.0.4 (`yarn.lock:7786`), whose source was read through `gh api`: reconnect reuses `params`, and an HTTP 101/open resets its failed-connection counter before the server's 4401 close. Thus this server's intentional upgrade-then-close can also create rapid, roughly 100 ms retry loops rather than increasing backoff. A synthetic short-TTL run against PR #2 using its provider reproduced repeated 4401s and unchanged params; the corresponding 2.0.4 paths have the same behavior. The full frontend browser was not run. + +Add a permission-checked token renewal route or a safe equivalent recovery flow. On 4401, pause retrying, obtain a fresh token only after checking current edit permission, update provider params, and reconnect while keeping the document's local state. If renewal is denied, stop and display an actionable authentication/permission message. Test expiry plus network loss, successful renewed synchronization, denied renewal and bounded retries. Do not solve this by removing expiry or accepting expired credentials. + +### Other checks + +The client delta exactly matches the client portion of upstream `c3bd5c5b0058`; the only additional file is a four-case construction test. `disableBc: true` remains, so the browser broadcast channel is not an unauthenticated alternative for this editor. `params.token` matches PR #2's single query token contract and osf.io's `edit.mako:525` serialization. The issuer uses matching room ID/subject/HS256 and issues only when `can_edit`. A synthetic token from its extracted real function with PyJWT 1.5.3 was accepted by PR #2. + +The query-string token is a bearer credential in the upgrade URL; this patch does not log it directly. Proxy access logs need explicit redaction, as discussed in the server review; those logs were not inspected. Absence of an Origin check in the replacement server is a nonblocking defense-in-depth limitation, not a demonstrated cookie-based bypass. + +Omitting `docker/y-websocket-auth/` is correct only when PR #2's authenticated entry point is deployed. The omitted wrapper is not needed for 4401 behavior and has weaker algorithm/expiry/secret handling. Its optional Origin allow-list is not reproduced. Existing connections may outlive expiry by the issuer's explicit policy; the defect here is recovery on a new connection. + +### Evidence and limits + +Checked exact heads and the upstream cherry-pick using gh reads and private scratch clones. `node addons/wiki/tests/websocket-token.test.cjs` passed all four tests; it checks extracted constructor statements, not expiry, a real editor or browser recovery. PR #2's 21 auth cases and the independent expiry probe support the chain analysis. No full frontend build, browser C4, Docker mutation, runtime/.env access, commit, push, merge or approval was performed. The review records and one comment per PR are the only intended shared changes. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**changes requested:R1-01[P2]。** 初回認証の受渡しは正しいが、長時間編集中の期限切れで復旧できない。GitHub の approve / request-changes イベントは送らず、コメント1件で判定を伝える。 + +### R1-01[P2]:再試行前に資格情報を更新し 4401 を扱う + +対象:`addons/wiki/static/wikiPageMilkdown.js:383–390`、状態 handler `451–464`。トークンはページ描画時の `window.contextVars` から provider params に一度コピーするだけ。既存 provider の再利用でも、同じページでの再生成でも新しい資格情報を取得しない。発行側の既定期限は8時間で、サーバは接続ごとに検証する。その後の通信断、端末の sleep、共同編集の再開で同じ期限切れトークンを送り続け、4401 を繰り返す。ページ再読込なしに共有同期を再開できない。復旧時は未同期のローカル編集を保持する必要がある。 + +クライアントが購読するのは `status` と `connection-error` で、4401 を持つ `connection-close` ではない。固定された y-websocket は 2.0.4(`yarn.lock:7786`)で、`gh api` からソースを読んだ。再接続は `params` を再利用し、HTTP 101/open で失敗回数をリセットしてからサーバの 4401 close を受ける。そのため意図的な upgrade 後 close が、待機時間を増やさず約100 ms の再試行を生む。PR #2 の provider と短い有効期間を用いた追加試験で、params が変わらず 4401 が反復することを再現した。2.0.4 の該当経路も同じ動作。frontend 全体をブラウザでは動かしていない。 + +権限を再確認するトークン更新 API または同等の安全な復旧処理を追加すること。4401 では再試行を止め、編集権限を確認して新しいトークンを取得し、文書のローカル状態を保ったまま params を更新して再接続する。更新が拒否されたら停止し、認証・権限の状態と対処を表示する。期限切れと通信断、更新後の同期、更新拒否、再試行回数の制御を試験する。期限の削除や期限切れ資格情報の受理で回避しないこと。 + +### その他の確認 + +クライアント差分は上流 `c3bd5c5b0058` の client 部分と一致し、追加は構築試験4件のみ。`disableBc: true` が維持されるため、このエディタにブラウザ broadcast channel 経由の未認証経路はない。`params.token` は PR #2 の単一 query token と osf.io `edit.mako:525` の出力に一致する。発行側の部屋 ID・subject・HS256 が一致し、`can_edit` の場合のみ発行する。PyJWT 1.5.3 で実関数を抽出実行した架空のトークンは PR #2 に受理された。 + +query string の値は upgrade URL に入る bearer 資格情報。この差分に直接のログ出力はない。サーバレビューで記したとおり、プロキシのアクセスログは明示的に伏字化する必要があるが、実ログは未調査。代替サーバに Origin 検査がない点は追加防御の限界で、cookie を利用する迂回の実証ではない。 + +`docker/y-websocket-auth/` の省略は PR #2 の認証済み起動経路を配備する場合に妥当。旧ラッパーは 4401 に不要で、algorithm・expiry・秘密の扱いも弱い。ただし任意の Origin 許可リストは再現していない。既存接続が期限を超えることは発行側の明示的方針であり、今回の不具合は新しい接続での復旧にある。 + +### 根拠と限界 + +gh による読取りと独自 scratch clone で head と元 cherry-pick を確認した。`node addons/wiki/tests/websocket-token.test.cjs` は4件合格。これは抽出した constructor 文の試験で、期限、実エディタ、ブラウザ復旧を試験しない。PR #2 の認証21件と追加の期限試験を経路の根拠にした。frontend 全体の build、ブラウザ C4、Docker 変更、runtime/.env の参照、commit・push・merge・approve は行っていない。共有先の変更はレビュー記録と各 PR 1件のコメントのみ。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| JWT | A signed pass containing who may connect, to which document, and until when. | 誰がどの文書へいつまで接続できるかを署名した通行証。 | +| Bearer token | A pass usable by whoever holds its value. | 値を持つ人が使える通行証。 | +| Upgrade | Changing an HTTP connection into a WebSocket connection. | HTTP 接続を WebSocket 接続へ切り替える処理。 | +| Awareness | Shared presence and cursor information. | 参加者やカーソル位置の共有情報。 | +| Bundle / chunk | Browser-ready JavaScript and its separately loaded pieces. | ブラウザ用に組んだ JavaScript と分割された部品。 | +| Origin | The website address from which a browser opens a connection. | ブラウザが接続を開始したサイトのアドレス。 | +| P2 / P3 | Normal-priority required fix / nonblocking improvement. | 通常優先度の必須修正/承認を妨げない改善。 | diff --git a/docs/reviews/2026-11-10_RDM-wiki-frontend-dev2027_PR3_JWT_Client_r2.md b/docs/reviews/2026-11-10_RDM-wiki-frontend-dev2027_PR3_JWT_Client_r2.md new file mode 100644 index 0000000..e05bccf --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-wiki-frontend-dev2027_PR3_JWT_Client_r2.md @@ -0,0 +1,62 @@ +# Review: JWT client recovery / JWT クライアント復旧 + +> **Summary:** Pass: the r1 expiry/retry blocker is resolved. +> **概要:** pass:r1 の期限切れ・再試行の阻害事項は解消。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Recovery must preserve local state while each trust boundary is checked separately. / 復旧時はローカル状態を保持し、信頼境界ごとに検証する必要がある。 +- Applies to: `RCOSDP/RDM-wiki-frontend-dev2027 PR #3`, head `ec4af739e0c8bfd84a1f10107688700506b2eecf`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [RDM-osf.io-dev2027](2026-11-10_RDM-osf.io-dev2027_PR6_Wiki_Token_Refresh_r1.md) · [RDM-y-websocket-dev2027](2026-11-10_RDM-y-websocket-dev2027_PR3_Origin_Allowlist_r1.md). +- Used by / 利用先: [SPEC-04 acceptance / 受入](../spec/04_acceptance_tests.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Pass.** R1-01 is resolved at this head, when deployed with osf.io PR #6 and the authenticated y-websocket server. This is a comment verdict, not a GitHub approval event. + +### Recovery and editor state + +`wikiWebsocketAuth.js:20–108` disconnects on 4401 before renewing. Three attempts use 1/2/4-second delays; 401/403 and other permanent 4xx terminate immediately, while transient failures and repeated rejection of refreshed tokens exhaust the same budget. Only an authorized sync resets the budget, not a WebSocket open. A mismatched room or empty token terminates. Stop cancels a pending timer and ignores an outstanding renewal result. No token logging was found. + +`wikiPageMilkdown.js:141–151,398–418,790–818` uses the supplied same-origin renewal URL, updates both provider params and page metadata, and displays a persistent failed/denied status plus instructions to copy unsaved text before reload. It does not destroy the Y.Doc, clear IndexedDB, or make the editor read-only on refusal. Continued local editing is therefore possible; saving after permission revocation still depends on server authorization. Explicit Close/discard and reload are separate existing flows, not a durable backup guarantee. + +### Evidence and limits + +The five construction tests and twelve recovery tests pass. An independent scratch probe used the actual locked y-websocket 2.0.4 provider, real Y.Doc objects and PR #3 server: an expired token refreshed once; edits made while disconnected survived and reached a second provider after recovery; a 403 ended renewal after one call and retained local text. Synthetic credentials and a stub renewal callback were used, not the live OSF API. The full Milkdown UI, browser messages, frontend bundle build and live-stack C4 were not executed. The prior record remains unchanged. + +The chain remains subject to the API caching/CSRF improvements and optional Origin deployment configuration in the companion records. No newly demonstrated blocking defect was found. + +Only private scratch files, this review record and one requested PR comment are changed. No commit, push, merge, approval, Docker state change or runtime/.env access was performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**pass。** osf.io PR #6 と認証済み y-websocket サーバを併用する条件で、この head は R1-01 を解消する。GitHub の approve イベントではなくコメントによる判定。 + +### 復旧とエディタ状態 + +`wikiWebsocketAuth.js:20–108` は 4401 で切断してから更新する。試行は最大3回、待機は1・2・4秒。401/403など恒久的な4xxは直ちに終了し、一時障害と更新後の反復拒否は同じ試行枠を消費する。接続が開いただけでは回数を戻さず、認証後の同期でのみ戻す。部屋の不一致と空トークンも終了する。stopは待機を取り消し、処理中の更新結果も無視する。トークンのログ出力は見つからなかった。 + +`wikiPageMilkdown.js:141–151,398–418,790–818` は渡された同一サイトの更新URLを使い、provider paramsとページ情報を更新する。拒否・失敗状態を保持して表示し、再読込前に未保存テキストをコピーするよう案内する。拒否時にY.Docを破棄せず、IndexedDBを消さず、エディタを読取専用にもしないため、ローカル編集を続けられる。権限取消後の保存はサーバ側の認可に依存する。明示的なClose・破棄・再読込は別の既存経路で、永続バックアップを保証するものではない。 + +### 根拠と限界 + +構築試験5件と復旧試験12件が合格。独自scratch試験で固定版y-websocket 2.0.4、実Y.Doc、今回のサーバを使用し、期限切れから1回の更新、切断中編集の保持と第2providerへの同期、403で1回だけ更新して停止しローカルテキストを保持する動作を確認した。架空の資格情報と更新callbackを使用し、実OSF APIには接続していない。Milkdown画面全体、ブラウザの表示、frontend build、実スタックC4は未実施。前回記録は変更していない。 + +関連記録のAPIキャッシュ・CSRF改善と任意のOrigin設定は引き続き考慮する。新たな阻害不具合は確認しなかった。 + +変更対象は独自scratch、本レビュー記録、依頼されたPRコメント1件のみ。commit・push・merge・approve・Docker状態変更・runtime/.envへのアクセスは行っていない。 diff --git a/docs/reviews/2026-11-10_RDM-y-websocket-dev2027_PR2_JWT_Auth_r1.md b/docs/reviews/2026-11-10_RDM-y-websocket-dev2027_PR2_JWT_Auth_r1.md new file mode 100644 index 0000000..d83802d --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-y-websocket-dev2027_PR2_JWT_Auth_r1.md @@ -0,0 +1,92 @@ +# Review: JWT authentication / JWT 認証 + +> **Summary:** Pass for the server patch; the integrated editing chain still needs client token renewal. No unauthenticated document or awareness path was found. +> **概要:** サーバ差分は pass。編集経路全体にはクライアントのトークン更新が必要。未認証の文書・参加情報への経路は見つからなかった。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Closing after upgrade is safe for document confidentiality when rejected sockets never reach room setup. / upgrade 後の close でも、拒否ソケットを部屋の初期化へ渡さなければ文書の秘密性を保てる。 +- Applies to: `RCOSDP/RDM-y-websocket-dev2027` PR #2, head `35cc9de1fa87b5e58c565137011c8c2311fa4620`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Chain review 2 / 関連レビュー 2](2026-11-10_RDM-wiki-frontend-dev2027_PR3_JWT_Client_r1.md) · [Chain review 3 / 関連レビュー 3](2026-11-10_RDM-osf.io-dev2027_PR4_Wiki_Bundle_Path_r2.md). +- Used by / 利用先: [SPEC-04 acceptance / 受入](../spec/04_acceptance_tests.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and findings + +**Pass for PR #2.** No blocking defect in the reviewed server change. This is a written verdict, not a GitHub approval. The three-PR chain is **changes requested** because of frontend R1-01 (P2). + +**R1-01 [P3, advisory]: document the boundary for Origin and request logs.** `bin/auth.cjs:36–61` ignores `request.headers.origin`; a local probe accepted a valid token from `https://foreign.example`. The omitted wrapper offered optional `Y_WEBSOCKET_ALLOWED_ORIGINS`, which this replacement does not implement. Consider carrying over an explicit allow-list and documenting missing-Origin policy. This is defense in depth: an unrelated website cannot obtain the page's token merely by opening a socket, and cookies are not the credential here. No unauthenticated cross-site bypass was demonstrated. + +`?token=` necessarily places the bearer value in the upgrade request URL (`src/y-websocket.js:385–388`). `bin/server.cjs:37–42` logs a fixed rejection reason or document/user identifiers, not the URL or token. The test checks this application's captured stdout/stderr only. No reverse-proxy access-log configuration was supplied or verified; a proxy logging the full request target would retain the token. Document query redaction or disabled request-target logging at every proxy and use TLS for remote deployments. This is an unverified deployment requirement, not evidence of a currently leaking access log. Document/user IDs remain in application logs by design. + +### Security and compatibility checks + +`bin/auth.cjs:8,25,51–61` pins HS256, uses jsonwebtoken verification (including expiry), requires numeric `exp` and a nonempty string `sub`, and exactly matches `doc_id` against the raw path-derived room. Missing, empty or duplicate token parameters fail closed. The same validated room is passed to setup, avoiding a second interpretation. The issuer generates UUID room strings, so path encoding does not change the normal contract. Missing/empty `JWT_SECRET` exits before listening. + +`bin/server.cjs:31–43` authorizes before upgrade and only emits `connection` for success. Rejection completes the handshake for observable 4401, then closes without calling `setupWSConnection`. Even a frame buffered with the handshake cannot reach the room handler. Document creation, persistence binding, update/callback listeners and awareness are downstream of `bin/utils.cjs:306–352`; rejected sockets never enter them. The HTTP handler returns only `okay`, not document data. Exported utils remain an embedding API and do not authenticate arbitrary third-party servers; the shipped Dockerfile runs the protected `npm start` entry point. + +The real osf.io `generate_y_websocket_token` function was extracted with Python AST and executed with PyJWT 1.5.3 using synthetic values. PR #2 accepted the result. The issuer supplies HS256, string `sub`, UUID `doc_id`, and `exp`, with default TTL eight hours (`addons/wiki/settings/defaults.py:11–14`). Minting is restricted to `can_edit` in `addons/wiki/views.py:328–336`. Server `JWT_SECRET` must match issuer `Y_WEBSOCKET_SECRET`; the current, already modified guide workspace's `web.json:27` contains the alias, but that workspace observation is not proof of a committed or deployed configuration. + +Expiry is explicitly an admission-time rule in the issuer settings. A socket staying open past expiry is therefore not reported as a new bug. Reconnection after expiry does fail, requiring the client fix in the companion review. Revocation during an existing connection is not implemented. + +### Omitted wrapper + +Read upstream frontend commit `c3bd5c5b0058` through `gh api`. Omitting `docker/y-websocket-auth/` is appropriate when deploying this server head: that wrapper used custom HMAC comparison, optional expiry, fail-open behavior without its secret, and HTTP 401 instead of 4401. The library-based, mandatory-secret server supersedes those mechanisms. The optional Origin policy is the one relevant feature not carried over. Merely merging frontend PR #3 while still running an old unauthenticated server is insufficient. + +### Evidence and limits + +Cloned only into `/private/tmp/rev-task-7b6692ec/ws` and confirmed the exact head. `npm ci --ignore-scripts` followed by `npm test` passed lint/type checking, room release, and all 21 authentication cases on the host. Cases cover invalid algorithms/claims, valid bidirectional providers, rejected writes and captured application logs. A separate synthetic short-TTL probe confirmed continued open-session access, 4401 reconnects and foreign-Origin acceptance. Its assertions completed; its remaining Y.Doc timer required terminating that scratch probe process. No grdm-dev Docker state, runtime/.env, application commits, pushes, approval or merge state was touched. No browser C4, production logging or live deployment was verified. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +**PR #2 は pass。** サーバ差分に必須修正は見つからなかった。これは記録上の判定であり、GitHub の approve ではない。3 PR 全体は frontend R1-01(P2)のため **changes requested**。 + +**R1-01[P3、助言]:Origin とリクエストログの境界を文書化する。** `bin/auth.cjs:36–61` は `request.headers.origin` を見ない。ローカル試験で有効なトークンと `https://foreign.example` の組合せを受理した。省略されたラッパーには任意の `Y_WEBSOCKET_ALLOWED_ORIGINS` があったが、代替サーバには無い。許可リストと Origin 無しの場合の方針を検討すること。これは追加の防御であり、別サイトがソケットを開くだけでページのトークンを取得できるわけではない。認証には cookie を使っていない。未認証のクロスサイト迂回は実証していない。 + +`?token=` により bearer 値は upgrade URL に入る(`src/y-websocket.js:385–388`)。`bin/server.cjs:37–42` のログは固定の拒否理由または文書・利用者 ID で、URL やトークンではない。試験が検査するのはこのプロセスの stdout/stderr のみ。プロキシのアクセスログ設定は提供・確認されていない。完全なリクエスト先を記録するプロキシならトークンが残る。全プロキシでクエリの伏字化またはリクエスト先記録の無効化を文書化し、遠隔配備には TLS を用いること。これは未検証の配備条件で、現にアクセスログへ漏洩したという指摘ではない。文書・利用者 ID は設計どおりアプリケーションログに残る。 + +### セキュリティと互換性 + +`bin/auth.cjs:8,25,51–61` は HS256 に固定し、jsonwebtoken に署名と期限を検証させる。数値 `exp`、空でない文字列 `sub`、生のパスから得た部屋名と完全一致する `doc_id` を要求する。トークン無し・空・重複を拒否する。同じ検証済み部屋名を setup に渡すため再解釈の不一致はない。発行側は UUID を使うため、通常経路でパスの符号化による相違はない。秘密無し・空なら listen 前に終了する。 + +`bin/server.cjs:31–43` は upgrade 前に認証し、成功時のみ `connection` を発火する。拒否時は 4401 をブラウザに届けるため handshake を完了するが、`setupWSConnection` を呼ばず close する。handshake と一緒に届いたフレームも部屋の handler に到達しない。文書生成、永続化、更新/callback、awareness は `bin/utils.cjs:306–352` の先にあり、拒否ソケットは到達しない。HTTP handler は `okay` だけを返す。公開 utils は組込み用 API であり、他者が作るサーバまで自動認証するものではない。同梱 Dockerfile は保護された `npm start` を起動する。 + +osf.io の実 `generate_y_websocket_token` 関数を Python AST で抽出し、PyJWT 1.5.3 と架空の値で実行した。PR #2 はその結果を受理した。発行側は HS256、文字列 `sub`、UUID `doc_id`、`exp` を持ち、既定有効期間は8時間(`addons/wiki/settings/defaults.py:11–14`)。発行は `can_edit` に制限される(`addons/wiki/views.py:328–336`)。サーバの `JWT_SECRET` と発行側の `Y_WEBSOCKET_SECRET` を一致させる必要がある。既に変更中の guide 作業領域の `web.json:27` には別名設定があるが、コミット・配備済みの証拠ではない。 + +発行側設定は期限を接続時の条件と明記している。接続中の期限超過は新規不具合とは判定しない。期限後の再接続は拒否されるため、関連クライアントレビューの修正が必要。既存接続に対する途中の権限取消しは実装されていない。 + +### 省略されたラッパー + +上流 frontend コミット `c3bd5c5b0058` を `gh api` で読んだ。このサーバ head を配備するなら `docker/y-websocket-auth/` の省略は妥当。旧ラッパーは自作 HMAC 比較、任意の期限、秘密無しでの認証省略、4401 ではなく HTTP 401 を使用していた。必須の秘密とライブラリ検証を使う今回のサーバが代替する。任意の Origin 制限は引き継がれていない。旧未認証サーバを動かしたまま frontend PR #3 だけを統合しても不十分。 + +### 根拠と限界 + +独自 scratch `/private/tmp/rev-task-7b6692ec/ws` に clone して head を確認した。ホストで `npm ci --ignore-scripts` 後の `npm test` は lint・型検査、room release、認証21件に合格。異なるアルゴリズム・不正 claims、有効な双方向同期、拒否接続の書込み、アプリケーションログを検査した。短い期限の追加試験で、接続継続、4401 再接続、別 Origin の受理を確認した。assertion は完了したが Y.Doc の timer が残り scratch の試験プロセスを終了させた。grdm-dev の Docker、runtime/.env、アプリケーションの commit・push・approve・merge は変更していない。ブラウザ C4、本番ログ、実配備は未検証。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| JWT | A signed pass containing who may connect, to which document, and until when. | 誰がどの文書へいつまで接続できるかを署名した通行証。 | +| Bearer token | A pass usable by whoever holds its value. | 値を持つ人が使える通行証。 | +| Upgrade | Changing an HTTP connection into a WebSocket connection. | HTTP 接続を WebSocket 接続へ切り替える処理。 | +| Awareness | Shared presence and cursor information. | 参加者やカーソル位置の共有情報。 | +| Bundle / chunk | Browser-ready JavaScript and its separately loaded pieces. | ブラウザ用に組んだ JavaScript と分割された部品。 | +| Origin | The website address from which a browser opens a connection. | ブラウザが接続を開始したサイトのアドレス。 | +| P2 / P3 | Normal-priority required fix / nonblocking improvement. | 通常優先度の必須修正/承認を妨げない改善。 | diff --git a/docs/reviews/2026-11-10_RDM-y-websocket-dev2027_PR3_Origin_Allowlist_r1.md b/docs/reviews/2026-11-10_RDM-y-websocket-dev2027_PR3_Origin_Allowlist_r1.md new file mode 100644 index 0000000..0932780 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-y-websocket-dev2027_PR3_Origin_Allowlist_r1.md @@ -0,0 +1,58 @@ +# Review: Origin allow-list / Origin 許可リスト + +> **Summary:** Pass: exact matching works; installer configuration is required to enable it. +> **概要:** pass:完全一致は機能し、有効化にはinstaller設定が必要。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** Recovery must preserve local state while each trust boundary is checked separately. / 復旧時はローカル状態を保持し、信頼境界ごとに検証する必要がある。 +- Applies to: `RCOSDP/RDM-y-websocket-dev2027 PR #3`, head `61e5e35464e1c7a1bf8bb83afecf5016f37baee7`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [RDM-wiki-frontend-dev2027](2026-11-10_RDM-wiki-frontend-dev2027_PR3_JWT_Client_r2.md) · [RDM-osf.io-dev2027](2026-11-10_RDM-osf.io-dev2027_PR6_Wiki_Token_Refresh_r1.md). +- Used by / 利用先: [SPEC-04 acceptance / 受入](../spec/04_acceptance_tests.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and behavior + +**Pass.** `bin/auth.cjs:37–50` splits a comma-separated setting, trims whitespace and drops empty entries. Nonempty lists use exact string matching without wildcard or substring acceptance. The allowed Origin does not bypass JWT verification. Missing Origin, an unrelated Origin, literal null and a different textual origin are rejected when enabled, with 4401 and no document frames. An explicit default port is not normalized; configure the serialized browser Origin, including scheme and any nondefault port, without a trailing slash. A non-browser caller can forge Origin, so it supplements rather than replaces token authentication. + +Unset, empty, whitespace-only and comma-only settings produce an empty list and disable the check. This permissive default is documented and preserves the prior optional policy; it is not an enforced Origin boundary by default. Invalid nonempty entries simply fail to match. Rejecting syntactically nonempty-but-empty lists at startup would be a useful optional configuration safeguard. + +### Deployment dependency + +The requested `installer/grdm_dev/templates/y_websocket.json` contains HOST, PORT, JWT_SECRET and HOME, but no `Y_WEBSOCKET_ALLOWED_ORIGINS`. Therefore merging this PR alone does not activate Origin checks in that deployment. To enable them, the installer must supply the actual browser-facing OSF origin(s), not the websocket container address; account for HTTP/HTTPS and any external port. A configured list also rejects non-browser clients without Origin. This matches the PR's stated opt-in scope and is not a blocking regression. README also requests query-string suppression in proxy access logs; actual proxy redaction was not inspected. + +### Evidence and limits + +Private scratch npm ci with install scripts disabled completed. npm test passed lint/type checking, room-release and all 25 auth cases, including the four Origin additions. Independent parser probes checked empty/unset/comma-only inputs, trimming, multiple entries, missing Origin, hostile suffix, literal null and explicit-port mismatch. A real y-websocket 2.0.4 client recovered expired tokens against this server and retained offline edits; 403 renewal refusal stopped it. No live deployment, installer regeneration or browser C4 was performed. + +Only private scratch files, this review record and one requested PR comment are changed. No commit, push, merge, approval, Docker state change or runtime/.env access was performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と動作 + +**pass。** `bin/auth.cjs:37–50` はカンマ区切り設定を分割し、前後の空白と空項目を除く。非空リストは文字列の完全一致で、wildcardや部分一致はしない。Originが許可されてもJWT検証は省略しない。有効時はOriginなし・別Origin・文字列null・表記の異なるoriginを4401で拒否し、文書frameを返さない。明示的な既定portは正規化しないため、schemeと非既定portを含むブラウザのOrigin表記を末尾slashなしで設定する。ブラウザ以外はOriginを偽装できるため、トークン認証を補う機能である。 + +未設定・空・空白のみ・カンマのみは空リストになり検査を無効化する。この許容的な既定値は説明済みで既存の任意ポリシーを維持するが、既定でOrigin境界を強制するものではない。非空の不正値は一致せず拒否する。文字はあるが有効項目がゼロの設定を起動時に拒否する改善は任意の設定事故対策になる。 + +### 配備の依存関係 + +指定された`installer/grdm_dev/templates/y_websocket.json`にはHOST・PORT・JWT_SECRET・HOMEのみあり、`Y_WEBSOCKET_ALLOWED_ORIGINS`はない。その配備では本PRの統合だけでOrigin検査は有効にならない。有効化するにはinstallerがブラウザから見えるOSFのoriginを設定する必要があり、websocketコンテナのアドレスではない。HTTP/HTTPSと外部portを反映すること。設定後はOriginを送らない非ブラウザclientも拒否する。PRが説明する任意導入の範囲と一致し、阻害する回帰ではない。READMEはproxyアクセスログのquery string抑制も求めるが、実proxyの伏字化は未検査。 + +### 根拠と限界 + +独自scratchでinstall scriptを無効にしてnpm ciを実施。npm testはlint・型検査、room-release、Origin追加4件を含む認証25件すべて合格。独自parser試験で未設定・空・カンマのみ、空白除去、複数項目、Originなし、悪意あるsuffix、文字列null、明示port不一致を確認した。実y-websocket 2.0.4 clientは今回のサーバで期限切れから復旧し切断中編集を保持、更新403では停止した。実配備・installer再生成・ブラウザC4は実施していない。 + +変更対象は独自scratch、本レビュー記録、依頼されたPRコメント1件のみ。commit・push・merge・approve・Docker状態変更・runtime/.envへのアクセスは行っていない。 diff --git a/docs/reviews/2026-11-10_RDM-y-websocket-dev2027_PR4_Ws_Update_r1.md b/docs/reviews/2026-11-10_RDM-y-websocket-dev2027_PR4_Ws_Update_r1.md new file mode 100644 index 0000000..60ae495 --- /dev/null +++ b/docs/reviews/2026-11-10_RDM-y-websocket-dev2027_PR4_Ws_Update_r1.md @@ -0,0 +1,65 @@ +# REV PR4 ws update r1 / ws 更新レビュー r1 + +> **Summary:** Pass at 09eb0a9f4a: the compatible patch preserves authentication rejection and document isolation. +> **概要:** 09eb0a9f4a は合格。互換パッチで認証拒否と文書の隔離が維持される。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-10. **Learned:** a browser-visible authentication close requires a completed upgrade, while document access can remain denied. / ブラウザに認証拒否の close を伝えるには upgrade が必要だが、文書アクセスは拒否したままにできる。 +- Applies to: RDM-y-websocket-dev2027 PR #4, head `09eb0a9f4af623760a15e100790381560b9e8ce0`; REV(担当レビュワ, Codex Astra). +- Related: [Review index](README.md) · [SPEC-04](../spec/04_acceptance_tests.md) · [SPEC-06](../spec/06_documentation_conventions.md). +- Used by: [PR #37](https://github.com/RCOSDP/RDM-developer-guide/pull/37). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and reasoning + +**Pass. No blocking findings.** The only change is the ws lock entry, from 6.2.2 to 6.2.6, plus license metadata. It satisfies the existing `^6.2.1` range. The maintainer's [header advisory](https://github.com/websockets/ws/security/advisories/GHSA-3h5v-q93c-6h6q) and [fragment advisory](https://github.com/websockets/ws/security/advisories/GHSA-96hv-2xvq-fx4p) identify fixes in 6.2.3 and 6.2.4 respectively. The upstream 6.2.4..6.2.6 source comparison confirms stricter chunk/fragment defaults and corrected fragment accounting; [6.2.6](https://github.com/websockets/ws/releases/tag/6.2.6) resets the counter per message. No incompatible API change was found in the paths this server uses. Extreme fragmentation now has intentional limits; the tests do not establish compatibility for every possible fragmented workload. + +**The author's reason for retaining post-upgrade rejection holds.** The [WebSocket standard](https://websockets.spec.whatwg.org/#feedback-from-the-protocol) hides failed opening-handshake details from browser scripts, which cannot consume HTTP 401 as an application close code. SPEC-04 C4 requires 4401; S1 additionally requires zero document frames. Read-only inspection of `wikiWebsocketAuth.js` in RDM-wiki-frontend-dev2027 at `5985d18b75da4105a610ac041b838c45f295de7d` confirms token renewal is triggered only by close 4401. HTTP rejection would bypass that recovery. The server evaluates authorization before `handleUpgrade`, but completes the upgrade before closing rejected sockets; it never calls `setupWSConnection` for them. Zero frames means zero document/data messages, not zero wire frames: the close control frame is required. This preserves the contract, not immunity of the handshake parser to unauthenticated input; patching ws remains necessary. + +### Validation and limits + +Commands ran in the reviewer's scratch clone `/private/tmp/rev-task-ac1bae/yws`, detached at the reviewed head, with macOS Node v26.12.0. Observation record, not canonical manifest data: + +```toon +checks[4]{command,result,exit}: + "npm ci --ignore-scripts --no-audit --no-fund","286 packages installed",0 + "node test/auth.test.cjs","25 passed; rejection 4401 and zero document frames; valid bidirectional convergence; rejected write isolation; missing-secret startup refusal",0 + "node test/room-release.test.cjs","passed",0 + "npm ls ws","ws@6.2.6",0 +``` + +The clone remained clean. Node 24 and both image architectures are author-reported evidence, not independently rebuilt here. No Docker operations, vulnerability scan, live-stack changes, or `runtime/.env` access were performed. One Japanese PR comment is posted; no approval, merge, close, push or commit is performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と理由 + +**Pass(合格)。阻害指摘なし。** 変更は ws のロック6.2.2→6.2.6と license メタデータのみで、既存の `^6.2.1` に適合する。開発元の[ヘッダ勧告](https://github.com/websockets/ws/security/advisories/GHSA-3h5v-q93c-6h6q)は6.2.3、[断片勧告](https://github.com/websockets/ws/security/advisories/GHSA-96hv-2xvq-fx4p)は6.2.4を修正版とする。上流6.2.4..6.2.6のソース差分で chunk・fragment の既定上限引下げと断片計数の修正を確認した。[6.2.6](https://github.com/websockets/ws/releases/tag/6.2.6)ではメッセージごとにカウンタを戻す。使用経路の非互換 API 変更は見当たらない。極端な断片化には意図した上限があり、すべての断片化負荷への互換性を試験したわけではない。 + +**upgrade 後の拒否を残す作者の理由は妥当。** [WebSocket 標準](https://websockets.spec.whatwg.org/#feedback-from-the-protocol)は opening handshake 失敗の詳細をブラウザのスクリプトに渡さず、HTTP 401 をアプリ用 close code として受け取れない。SPEC-04 C4 は4401、S1は加えて文書フレーム0を要求する。RDM-wiki-frontend-dev2027 の `5985d18b75da4105a610ac041b838c45f295de7d` にある `wikiWebsocketAuth.js` を読取確認し、トークン更新が close 4401 のみで起動することを確認した。HTTP拒否にするとこの回復処理を通らない。サーバーは `handleUpgrade` 前に認可判定し、upgrade 後に拒否接続を閉じ、拒否時に `setupWSConnection` を呼ばない。フレーム0は文書・データメッセージ0を意味し、close制御フレームは必要である。これは契約維持の根拠であり、未認証入力がhandshake解析に届かないという意味ではなく、ws更新は必要である。 + +### 検証と限界 + +レビュー用の `/private/tmp/rev-task-ac1bae/yws` を対象headで detached checkoutし、macOS Node v26.12.0で実行した。正本manifestではなく観測記録である。 + +```toon +checks[4]{command,result,exit}: + "npm ci --ignore-scripts --no-audit --no-fund","286パッケージ導入",0 + "node test/auth.test.cjs","25件合格; 4401・文書フレーム0; 正常時双方向収束; 拒否接続の書込隔離; 秘密鍵なし起動拒否",0 + "node test/room-release.test.cjs","合格",0 + "npm ls ws","ws@6.2.6",0 +``` + +clone に変更は残らなかった。Node24と両イメージアーキテクチャは作者の報告を参照し、独立再ビルドはしていない。Docker操作、脆弱性走査、稼働スタック変更、`runtime/.env` 参照は行っていない。日本語PRコメントを1件投稿し、approve・merge・close・push・commitは行わない。 diff --git a/docs/reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r1.md b/docs/reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r1.md new file mode 100644 index 0000000..f6b7707 --- /dev/null +++ b/docs/reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r1.md @@ -0,0 +1,152 @@ +# REV-45-r1 Python 3.13 pin review / Python 3.13 固定版レビュー + +> **Summary:** Changes requested: the current exceptions cover only no-fix Debian findings, but their wildcard matching also suppresses future fixable findings. The pinned commits, acceptance result, and reported scan totals were verified. +> **概要:** 要修正。現在の例外は修正版の無い Debian の検出だけに対応するが、ワイルドカードの照合は将来の修正版ありの検出も隠す。固定コミット、受入結果、スキャン集計は確認できた。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-11. **Learned:** REV changed only link destinations for publication (scratch-path evidence links replaced by repository-relative links or by plain-text references). / REV が公開用にリンク参照先のみを変更した(scratch パスの証跡リンクをリポジトリ相対リンクまたは平文参照に変更)。 +- Publication provenance / 公開版の来歴: REV(担当レビュワ)issued this publication version from the unchanged original `/private/tmp/claude-501/-Users-komiyama-ai-development-GitHub-RDM-developer-guide/8baac84b-080f-4104-a2b5-7416702c57e1/scratchpad/reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r1.md` (SHA-256: `7fc95a749e802996d83147b4c6b66c1403eff0ea4571d41287a7ad571e5e2a13`); the original file and scratch evidence remain unchanged, and all text other than this version/provenance metadata and the explicitly stated publication references is verbatim. For r2, its existing repository-relative links already resolve and require no changes. / REV が上記原本から公開版を発行した。原本と scratch 証跡は未変更で、版・来歴の追記と明示した公開用参照以外の本文は原文どおり。r2 の既存のリポジトリ相対リンクは有効で変更不要。 +- Version / 版: 0.1 — 2026-11-11. **Learned:** a no-fix snapshot does not make an exception safe for future scans unless package identity and fix availability remain part of matching. / 現時点で修正版が無いことだけでは将来の検査も安全にならず、パッケージの同一性と修正版の有無を照合に残す必要がある。 +- Applies to: RCOSDP/RDM-developer-guide PR #45, head `3c5dd0c31944b9b3450ff34eb0808ad1e26f8728`, base `eb8c4e96977b06bd3bb0fd42b03f0872806be08a`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Posted review / 投稿: [PR comment](https://github.com/RCOSDP/RDM-developer-guide/pull/45#issuecomment-6797756385). +- Related: [review index](README.md), [SPEC-03](../spec/03_security_gate.md), [SPEC-06](../spec/06_documentation_conventions.md), [DEMO-20](../demo/20_core_install_mac_studio.md), [status board](../status/README.md). +- Used by: coordinator's PR #45 revision and re-review decision. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Changes requested.** R1-01 is a security-gate blocker. R1-02 corrects misleading milestone status; R1-03 records smaller evidence corrections. This is a review comment, not a GitHub approval or request-changes review submission. + +Reviewed a fresh scratch clone detached at the stated head. No source edits, commits, pushes, merges, approvals, or issue closures were made. No Docker command or live acceptance run was executed, and the live `runtime/.env` was not read. Existing dated JSON reports in the main checkout were read only. The owner authorization to remove freecad and accept remaining no-fix OS packages is accepted from the task; approval was not requested again. + +### R1-01 — High: wildcard exceptions also accept future fixable packages + +Locations: `manifest/allowlist.json:15` and all other entries; `installer/grdm_dev/scan.py:210–226,248–258`. + +All 58 entries use `component: "*"`. `image` correctly rejects `postgres:...`, a sibling name such as `grdm-dev/waterbutler-extra:...`, and the ordinary Python package path tested in the PR. However, after image and CVE match, the wildcard immediately accepts every component in that image, on every tag or digest. The package list in `reason` is never checked. `normalize_trivy` discards `FixedVersion`, `Status`, and OS/language package class, so the matcher cannot restrict the exception to no-fix Debian packages. + +Reproduced with the first real entry, `CVE-2025-69720` / `grdm-dev/waterbutler`: a synthetic Trivy finding at `grdm-dev/waterbutler:future (debian 13.2)` with `Status: fixed`, `FixedVersion: 2`, and either `libncursesw6@1` or `unrelated-package@1` is still allow-listed. A later security database update can therefore leave a fixable finding invisible until expiry, even without a rebuild. An `apt-get upgrade` in the Dockerfile does not repair the gate's decision for an already-built image. The same matcher is used at stricter milestones. + +Required: replace wildcard components with explicit package scope; compare exact package identity, not the existing raw prefix (which also matches sibling package names and ignores an `@version` suffix); preserve and enforce no-fix status and OS/image identity for these exceptions. Keep findings open when a fix appears or classification is unknown. Add regressions for an unrelated package, a package-name prefix collision, a fixed version on the same package and image, a sibling image, and a language-package result. A deliberately fixed historical artifact exception would need separate explicit semantics and approval; it is not the no-fix acceptance authorized here. + +### R1-02 — Medium: status board still marks a zero-entry ceiling as satisfied + +Locations: `docs/status/README.md:68,134`. + +The updated board still marks the M2 Trivy/allow-list row complete and cites “allow-list 0 entries (M1: 0).” That was true of runs 18/21, but this PR adds 58 active entries; the latest report confirms 58 and the unchanged baseline is 0. With M2's count-not-growing gate, that is not a completed condition. Preserve the historical measurements, append the current counts and scan reference, and mark the baseline/owner milestone decision outstanding. The M1 report-only pass must not be presented as M2 gate completion. Do not silently raise the baseline to make the row green. + +### R1-03 — Low: correct provenance and summary details + +- `docs/demo/20_core_install_mac_studio.md:489,1033` calls both osf.io and wiki-frontend `8fc45de4`. The wiki source pin is `5985d18b75da4105a610ac041b838c45f295de7d`; `8fc45de4` is its osf.io overlay base. The build report records the combined image tag `8fc45de461fd-5985d18b75da`. +- DEMO-20 version 0.17 says the scan totals are the same. The body correctly reports 10,983 → 10,984, with one additional ZAP MEDIUM; qualify the header as unchanged Trivy totals. +- `manifest/upstreams.json:327` and the allow-list reasons date the owner decision 2026-11-11, whereas the authorized decision supplied for this review is 2026-11-10. Separate the decision date from the legitimate 2026-11-11 entry-addition date. +- The PR description still describes MFR `f9da1db3`, 11/12, and unresolved C5/ZAP. Update it to the reviewed head and final evidence. + +### Verified evidence + +Every one of the 58 entries has a corresponding finding in the raw Trivy reports from `20261111T132241Z`: WaterButler 11 entries / 47 HIGH, MFR 47 entries / 3 CRITICAL + 127 HIGH. All 177 matched findings have empty `FixedVersion` and `Class: os-pkgs`, `Type: debian`. Statuses are 174 `affected`, one `will_not_fix`, and two `fix_deferred`; every package is named in its entry's reason. No current fixable match or unmatched entry was found. All entries have owner `AID`, valid dates, addition date 2026-11-11, and expiry 2026-12-31; validation returns no errors. SPEC-03's additional requirement that expiry be no later than the next milestone start cannot be established from a calendar date alone: M1 remains the configured gate and M2 is already described as in progress. Record the milestone boundary when closing it; the existing baseline was not changed. + +The audit JSON (`pr45-allowlist-audit.json`) records all matches, source SHA-256 hashes, and both fixable reproductions. The audit script (`pr45-audit.py`) can be rerun from the scratch clone with `PYTHONPATH=installer python3 ../reviews/pr45-audit.py`; it should currently report 58 entries, 177 matches, zero fixed matches in the stored reports, and two incorrect `allowlisted: true` reproductions. + +GitHub reads confirm WaterButler PR #3 merged at `3319c10679165b421c0425771779d068f19b9724` and MFR PR #7 at `9771b8cfb352f6c9907a6733a4205f9e62f4142d`. Both pinned Dockerfiles use base digest `sha256:e48f59cdba69a3cbd9ed2cf0f348d90d45a8d350d98134cf1070bc106ee9ed90`. MFR head `2c4a88a6` and merge `9771b8cf` have identical Git tree `e5c8c0a3d0f5e9263d72edc01fc5b9dfc0b349d8`. MFR defaults to `MFR_DEBIAN_TOOLS=pspp`; its build record is native `linux/arm64`, consistent with removing `build_platform`. This review did not independently rebuild either architecture or query registry contents. + +Committed `acc-20261111T132104Z-530071/results.json`, collector, TOON, JUnit, and pytest log agree: 12 passed, no failures/errors/skips, C5 success 200 and rejection 401, 24 healthy precheck services. The earlier committed run records 11/12 and C5 success 400. Manual inspection and separate `gitleaks dir ... --redact --no-banner` executions found no exposed credentials in either run directory; both scanner exit codes were 0. No trace archive is committed. + +The dated main-checkout `db_upgrade_20261111T111110Z.json` confirms 9.6 → 18, a 4,844,586-byte dump, 531 compared objects, and retention of `postgres_data.pg9.6-20261111T111040Z`. `build_20261111T132028Z.json` confirms the reviewed MFR/WB tags; `up_20261111T132103Z.json` records all 24 service checks successful. These are stored evidence, not a new live-stack validation. + +`scan_20261111T132607Z.json` agrees with DEMO-20: total 10,984, CRITICAL/HIGH/MEDIUM/LOW/INFO 726/3782/4148/2322/6, plus 177 allow-listed; Trivy 726/3769/4139/2310, Semgrep HIGH 12, gitleaks zero, ZAP HIGH/MEDIUM/LOW/INFO 1/9/12/6. All four scanners are `ok`, baseline pass, exit 0, M1 report-only. The intermediate report has one fewer ZAP MEDIUM; the first report exits 51, as documented. C5 covers the classic page only; the board explicitly keeps the API v2/ember preview issue open. + +### Independent checks + +Run from `scratchpad/pr45-rev` with the system PATH `python3` (`/opt/homebrew/bin/python3`, 3.15.2), without a virtual environment: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +``` + +| Check | Result | Exit | +|---|---|---:| +| Installer tests | 647 tests, OK, 10 skipped | 0 | +| Tools tests | 93 tests, OK | 0 | +| docs_check | 154 checked, 8 exempt, 38 warnings | 0 | +| manifest_check | Passed; no manifest/policy findings | 0 | +| Audit script | 58/58 current entries verified; future-fix over-match reproduced | 0 | +| gitleaks, each new run directory | No leaks found | 0 | + +An initial independent run with Apple's `/usr/bin/python3` 3.9.6 also passed all four requested checks (647/93 tests, 10 installer skips, same docs warnings). The installer tests emit an existing foreign-listener warning for Control Center on port 5000; Python 3.15 also emits a fork deprecation warning. Logs are adjacent as `pr45-*-python3.log` and `pr45-*-tests.log` / `pr45-*-check.log`. The clone remains clean. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**要修正(changes requested)。** R1-01 はセキュリティゲートの阻害事項。R1-02 は節目の状態の誤解を直すもの、R1-03 は証跡の小さな記述修正である。GitHub の承認・変更要求レビューではなく、レビューコメント1件として報告する。 + +指定先頭コミットに固定した新しい scratch クローンで調べた。ソース編集、コミット、push、マージ、承認、Issue の終了は行っていない。Docker コマンドや実スタックの受入は実行せず、実スタックの `runtime/.env` も読んでいない。本体チェックアウトの日付付き JSON 報告だけを読み取った。freecad 廃止と残る修正版無し OS パッケージの許容は、タスクで示された所有者の承認を前提とし、再承認は求めていない。 + +### R1-01 — 高: ワイルドカードが将来の修正版ありも許容する + +対象: `manifest/allowlist.json:15` と全項目、`installer/grdm_dev/scan.py:210–226,248–258`。 + +58項目すべてが `component: "*"` を使う。`image` は postgres、似た別イメージ名、通常の Python パッケージのパスを拒否する。しかしイメージ名と CVE が一致すると、すべてのタグ・ダイジェストのすべての部品を許容する。理由欄のパッケージ一覧は照合されない。正規化処理は `FixedVersion`、`Status`、OS/言語パッケージの分類を捨てるため、修正版の無い Debian パッケージだけに制限できない。 + +先頭の実項目 `CVE-2025-69720` / `grdm-dev/waterbutler` を使い、`grdm-dev/waterbutler:future (debian 13.2)` の `libncursesw6@1` または `unrelated-package@1` に `Status: fixed`、`FixedVersion: 2` を与えた。どちらも許容された。将来 DB が更新されても、修正版ありの検出が期限まで隠れうる。既存イメージの判定は Dockerfile の `apt-get upgrade` では直らない。この照合は厳しい節目でも使われる。 + +修正要求: ワイルドカードを明示的なパッケージ指定へ置き換え、名前を厳密に照合する。現行の前方一致は似た別パッケージも通し、`@version` も無視するので、そのままでは不十分。これらの例外には修正版の有無、OS 分類、イメージの同一性を保持して適用し、修正版あり・分類不明は未許容にする。別パッケージ、名前の前方一致、同一パッケージの修正版あり、別イメージ、言語パッケージを回帰試験する。修正版のある過去の成果物をあえて許容するなら別の明示的な意味と承認が必要で、今回承認された「修正版無し」の扱いとは異なる。 + +### R1-02 — 中: 進捗表が0件の上限を達成済みのままにする + +対象: `docs/status/README.md:68,134`。 + +更新した進捗表の M2 Trivy/許容リスト行は完了のまま「許容リスト0件(M1: 0)」を示す。第18・21回の履歴としては正しいが、この PR の現行項目数は58件で、最新報告も58、未変更の上限は0である。M2 の件数増加禁止では達成済みではない。履歴を残しつつ最新件数・報告への参照を追記し、節目終了時の上限判断を残件にする。M1 の報告のみ合格を M2 の門の達成と混同せず、見かけを合わせるため上限を無断変更しない。 + +### R1-03 — 低: 来歴と概要の細部を直す + +- DEMO-20 の489・1033行は osf.io と wiki-frontend をともに `8fc45de4` とする。wiki のソース固定版は `5985d18b75da4105a610ac041b838c45f295de7d` で、`8fc45de4` は osf.io の基底。ビルド報告の結合タグは `8fc45de461fd-5985d18b75da`。 +- 0.17 の版ヘッダは検査件数が同じとするが、本文のとおり 10,983 → 10,984、ZAP MEDIUM が1件増えている。「Trivy の件数は同じ」と限定する。 +- `manifest/upstreams.json:327` と許容理由の所有者判断日は2026-11-11だが、タスクで示された承認日は2026-11-10。正当な追加日2026-11-11と判断日を分ける。 +- PR 本文は MFR `f9da1db3`、11/12、C5/ZAP 未解決のまま。現行先頭と最終証跡に合わせる。 + +### 確認済み証跡 + +`20261111T132241Z` の Trivy 生報告で58項目すべてを照合した。WB は11項目で HIGH 47件、MFR は47項目で CRITICAL 3件・HIGH 127件。全177件の `FixedVersion` は空、分類は `os-pkgs` / `debian`。状態は `affected` 174件、`will_not_fix` 1件、`fix_deferred` 2件。全パッケージが理由欄に記載され、現時点の修正版ありの誤許容や対応する検出の無い項目は無かった。全件 owner は AID、追加日は2026-11-11、期限は2026-12-31で形式検証は正常。ただし SPEC-03 の「次の節目開始以前」は日付単独では証明できない。設定は M1、進捗表の M2 は既に進行中なので、節目を閉じる時点で境界を明記する。上限は未変更。 + +audit JSON (`pr45-allowlist-audit.json`) に全対応、入力の SHA-256、修正版ありの再現を記録した。スクリプト (`pr45-audit.py`) は scratch クローンで `PYTHONPATH=installer python3 ../reviews/pr45-audit.py` と実行する。現状では58項目・177件・保存報告内の修正版あり0件・誤った許容の再現2件を出す。 + +GitHub で WB PR #3 のマージ `3319c10679165b421c0425771779d068f19b9724` と MFR PR #7 のマージ `9771b8cfb352f6c9907a6733a4205f9e62f4142d` を確認した。両 Dockerfile の基底ダイジェストは manifest と同じ `sha256:e48f59cdba69a3cbd9ed2cf0f348d90d45a8d350d98134cf1070bc106ee9ed90`。MFR の先頭 `2c4a88a6` とマージ `9771b8cf` の Git tree は `e5c8c0a3d0f5e9263d72edc01fc5b9dfc0b349d8` で同一。既定 `MFR_DEBIAN_TOOLS=pspp`、ビルド報告は native `linux/arm64` で、`build_platform` 削除と整合する。両アーキテクチャの再ビルドやレジストリ照会はしていない。 + +コミット済み `acc-20261111T132104Z-530071` の results.json、collector、TOON、JUnit、pytest log は一致する。12合格、失敗・エラー・skip なし、C5 は200/401、事前健全性は24サービス。前のコミット済み実行は11/12、C5成功ケース400。両実行フォルダを目視し、各々 `gitleaks dir ... --redact --no-banner` を実行して秘密の検出なし、いずれも終了0。トレース書庫の追加はない。 + +本体の `db_upgrade_20261111T111110Z.json` は9.6→18、dump 4,844,586バイト、531オブジェクト比較、旧ディレクトリ保持を裏付ける。`build_20261111T132028Z.json` は対象 WB/MFR タグ、`up_20261111T132103Z.json` は24サービス正常を記録する。保存証跡の照合であり、新たな実機検証ではない。 + +`scan_20261111T132607Z.json` と DEMO-20 は一致する。合計10,984、CRITICAL/HIGH/MEDIUM/LOW/INFO は726/3782/4148/2322/6、別途177件許容。Trivy は726/3769/4139/2310、Semgrep HIGH 12、gitleaks 0、ZAP は1/9/12/6。全スキャナー ok、基本対策合格、終了0、M1報告のみ。中間報告は ZAP MEDIUM が1件少なく、最初の報告は記述どおり終了51。C5 は旧来の画面の範囲で、API v2/ember のプレビューは進捗表で未解決としている。 + +### 独立検査 + +scratch クローンで仮想環境を使わず PATH の `python3`(`/opt/homebrew/bin/python3`、3.15.2)を使い、英語版に示した4コマンドを実行した。 + +| 検査 | 結果 | 終了 | +|---|---|---:| +| installer 単体試験 | 647件、OK、skip 10件 | 0 | +| tools 単体試験 | 93件、OK | 0 | +| docs_check | 154件検査、8件免除、38警告 | 0 | +| manifest_check | 合格、manifest/policy 指摘なし | 0 | +| audit スクリプト | 58/58照合、将来の修正版の誤許容を再現 | 0 | +| gitleaks、各追加実行フォルダ | 検出なし | 0 | + +最初に Apple の `/usr/bin/python3` 3.9.6 でも同じ4検査を実行し、647/93件、skip 10、同じ文書警告で全て終了0だった。installer 試験は既存の Control Center の5000番ポート警告、Python 3.15 は fork 非推奨警告を出す。隣に `pr45-*-python3.log` と `pr45-*-tests.log` / `pr45-*-check.log` を保存した。クローンは変更なし。 diff --git a/docs/reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r2.md b/docs/reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r2.md new file mode 100644 index 0000000..409eaa2 --- /dev/null +++ b/docs/reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r2.md @@ -0,0 +1,154 @@ +# REV-45-r2 Python 3.13 pin re-review / Python 3.13 固定版再レビュー + +> **Summary:** Changes requested for the altered r1 review record. R1-01, R1-02 and R1-03 are resolved; exact package matching and the unchanged rescan totals were independently verified. +> **概要:** r1 レビュー記録の改変について要修正。R1-01・R1-02・R1-03 は解消し、厳密なパッケージ照合と再検査の件数が変わらないことを独立に確認した。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-11. **Learned:** REV changed only link destinations for publication (scratch-path evidence links replaced by repository-relative links or by plain-text references). / REV が公開用にリンク参照先のみを変更した(scratch パスの証跡リンクをリポジトリ相対リンクまたは平文参照に変更)。 +- Publication provenance / 公開版の来歴: REV(担当レビュワ)issued this publication version from the unchanged original `/private/tmp/claude-501/-Users-komiyama-ai-development-GitHub-RDM-developer-guide/8baac84b-080f-4104-a2b5-7416702c57e1/scratchpad/reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r2.md` (SHA-256: `a8bb94067af6b27028cbb7d111c5bd30fae9385dc9c1ca2d4681951fec11030f`); the original file and scratch evidence remain unchanged, and all text other than this version/provenance metadata and the explicitly stated publication references is verbatim. For r2, its existing repository-relative links already resolve and require no changes. / REV が上記原本から公開版を発行した。原本と scratch 証跡は未変更で、版・来歴の追記と明示した公開用参照以外の本文は原文どおり。r2 の既存のリポジトリ相対リンクは有効で変更不要。 +- Version / 版: 0.1 — 2026-11-11. **Learned:** passing a link checker does not establish that a review record is verbatim; publication corrections require the reviewer's explicit provenance, even when the verdict is unchanged. / リンク検査の合格はレビュー記録が原文どおりであることを証明しない。判定が同じでも、公開用の訂正にはレビュワによる明示的な来歴が必要である。 +- Applies to: RCOSDP/RDM-developer-guide [PR #45](https://github.com/RCOSDP/RDM-developer-guide/pull/45), head `339f4fa1e7415b82aaee61d090e3620c49047000`; delta after `3c5dd0c31944b9b3450ff34eb0808ad1e26f8728`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Posted review / 投稿: [PR comment](https://github.com/RCOSDP/RDM-developer-guide/pull/45#issuecomment-6798749424). +- Related: [review index](README.md), [r1 repository copy under review](2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r1.md), [SPEC-03](../spec/03_security_gate.md), [SPEC-06 §8](../spec/06_documentation_conventions.md#english), [DEMO-20](../demo/20_core_install_mac_studio.md). +- Used by: [status board](../status/README.md) and the coordinator's PR #45 correction decision. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Changes requested.** The code and the three r1 findings pass this round. R2-01 remains a documentation-integrity blocker. This verdict is delivered as one PR comment, not a GitHub approval or request-changes review submission. + +Reviewed the one new commit, `339f4fa`, in a fresh detached clone at `scratchpad/pr45-rev-r2`. Read the PR description through `gh` and the dated local scan reports. No source edits, commit, push, merge, approval, issue closure, live acceptance run or Docker state change was performed. The live `runtime/.env` was not accessed. The four requested checks used PATH system `python3`, `/opt/homebrew/bin/python3` 3.15.2, without a virtual environment. The clone remains clean. + +### R2-01 — Medium: the imported r1 is not the reviewer's verbatim record + +Location: `docs/reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r1.md:12,55,127`; rule: `docs/spec/06_documentation_conventions.md:100,189` (§8). + +Compared the committed copy directly with the original r1 in the coordinator's scratch review directory. There are three changed lines affecting nine link occurrences: five Related destinations were rebased, while four audit JSON/script links in the English and Japanese bodies were removed and changed to inline code. Thus “only nine link destinations” understates the change: four are no longer links. The findings and verdict are unchanged, but the Markdown record is not verbatim. It retains the same reviewer attribution and version 0.1 without a reviewer-authored publication correction. + +SPEC-06 says review records “are kept verbatim.” Its exception covers only glossary warnings; it explicitly continues to check links. A successful `docs_check` therefore neither authorizes an author to edit a review nor proves compliance with the verbatim rule. The author disclosed the change in the commit and PR text, which is useful provenance, but it does not substitute for the reviewer's correction. I do not ratify this altered r1 as my original record. + +**Required handling:** preserve the original r1 unchanged, with its original audit JSON and script available as evidence. Resolve the publication problem separately: ask REV to issue an explicitly versioned publication correction/addendum with repository-valid references and the original's identity/hash, and import that reviewer-issued text verbatim. A maintainer may add a separately attributed index or wrapper containing navigation and the relocation explanation; it must not masquerade as or overwrite r1. Do not delete evidence links, silently rewrite r1, or bypass the link check. If the original is placed under checked `docs/reviews/`, its original relative targets must genuinely resolve; otherwise retain it unchanged in an archival artifact and link the separate reviewer-issued publication record to that artifact. This report records the defect; it does not replace or amend r1. + +SHA-256 comparison (full original and copied files): + +```toon +r1_hashes: + original: 7fc95a749e802996d83147b4c6b66c1403eff0ea4571d41287a7ad571e5e2a13 + repository_copy: 97b608128c5eacbe91e583ea661c5a2dd7f4632a76a3372980f3b2e2b8060326 +``` + +### Closure of the r1 findings + +| Finding | Assessment | +|---|---| +| R1-01, exact no-fix package scope | Resolved. `normalize_trivy` preserves package name, installed version, fix, status and class. `_entry_matches` requires the same CVE, one exact listed `name@version`, the named image's OS class, an empty `FixedVersion` and an allowed no-fix status. A fix, unknown status/class, different name/version, sibling image or language package stays open. Validation rejects wildcard entries and image entries without exact packages. Internal metadata is stripped from public findings. | +| R1-02, status board | Resolved in both languages. The row is now unmet, preserves historical counts, states 58 entries versus unchanged baseline 0, distinguishes M1 report-only from M2, and leaves the owner ceiling decision open. The cited earlier scan has the same counts as the rescan. | +| R1-03, provenance | Resolved. DEMO-20 distinguishes wiki `5985d18b` from osf.io base `8fc45de4` and combined tag `8fc45de461fd-5985d18b75da`; version 0.17 now limits unchanged totals to Trivy and states the extra ZAP MEDIUM. Manifest notes and all allow-list reasons separate the 2026-11-10 owner decision from 2026-11-11 application/addition. The current PR body has MFR `9771b8cf`, 12/12 acceptance and the successful rescan. | + +Replayed all raw Trivy reports from both `20261111T132241Z` and `20261111T141449Z` through the committed normalizer and matcher. Each set yields 177 accepted findings using all 58 entries: WaterButler 47 HIGH, MFR 3 CRITICAL and 127 HIGH. Every match is an exact listed package and an `os-pkgs` / `debian` result with no fixed version. For every accepted finding, ten independent mutations (published fix, fixed/unknown status, language/missing class, sibling/unrelated package, changed version, sibling/other image) were rejected: 1,770 negative checks per report set, 3,540 total. The original r1 script was preserved; the r2 audit uses the normalizer because the new matcher deliberately rejects bare Trivy findings without metadata. + +### Rescan evidence and limits + +`scan_20261111T141804Z.json` matches the earlier `scan_20261111T132607Z.json` on totals, severity counts, allow-list counts, baseline and gate. Its findings array independently recounts to the summary. All scanners are `ok`; baseline and M1 report-only gate pass, exit 0. The report bundle contains the identical scan object and says `overall: complete`. + +```toon +rescan: + open_total: 10984 + critical: 726 + high: 3782 + medium: 4148 + low: 2322 + info: 6 + accepted_findings: 177 + allowlist_entries: 58 + baseline_entries: 0 + gate: M1 report-only pass + exit_code: 0 +``` + +This is stored evidence plus independent replay, not a new live scan. The rescan's `commit` field is `3c5dd0c`, reflecting execution before the fix commit; it cannot alone establish exact source provenance for `339f4fa`. The independent replay and unit tests establish the committed matcher's behavior. No claim is made that the report bundle's older plan is a fresh deployment inventory. The owner still needs to settle the ceiling and next-milestone expiry boundary; the API v2/ember preview remains an explicitly separate open item. + +### Independent checks and artifacts + +Commands run from `scratchpad/pr45-rev-r2`; all exited 0: + +```sh +PYTHONPATH=installer python3 -m unittest discover -s installer/tests +python3 -m unittest discover -s tools/tests +python3 tools/docs_check.py +python3 tools/manifest_check.py +PYTHONPATH=installer python3 ../reviews/pr45-r2-audit.py +``` + +| Check | Result | Exit | +|---|---|---:| +| Installer tests | 655 tests, OK, 10 skipped | 0 | +| Tools tests | 93 tests, OK | 0 | +| docs_check | 155 checked, 8 exempt, 38 warnings | 0 | +| manifest_check | Passed | 0 | +| Independent replay and mutations | 58/58 entries, 177 findings in each set; all 3,540 mutations rejected | 0 | + +The installer suite emits the existing Control Center port 5000 warning and Python 3.15 fork deprecation warning. Logs are saved beside this scratch report as `pr45-r2-installer.log`, `pr45-r2-tools.log`, `pr45-r2-docs.log`, `pr45-r2-manifest.log` and `pr45-r2-audit.log`. The audit script/JSON are `pr45-r2-audit.py` / `pr45-r2-audit.json`; the JSON includes input SHA-256 hashes and each match. `pr45-r2-r1-copy.diff` records the exact r1 differences. These scratch artifacts are not claimed to be committed. This r2's relative links are authored for its intended `docs/reviews/` destination and checked in that context; retain its text verbatim on publication. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**要修正(changes requested)。** コードと r1 の3指摘は今回合格。文書の完全性に関する R2-01 が残る。GitHub の承認・変更要求レビューではなく、PR コメント1件で判定を伝える。 + +新規の detached クローン `scratchpad/pr45-rev-r2` で、追加コミット `339f4fa` だけを確認した。`gh` で PR 本文、本体の保存済み日付付き報告を読み取った。ソース編集、コミット、push、マージ、承認、Issue 終了、実機受入、Docker 状態変更は行っていない。実スタックの `runtime/.env` は読んでいない。指定4検査は仮想環境を使わず PATH の system `python3`(`/opt/homebrew/bin/python3` 3.15.2)で実行し、クローンは変更なし。 + +### R2-01 — 中: 収録した r1 がレビュワの原文でない + +対象: `docs/reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r1.md:12,55,127`。規則: `docs/spec/06_documentation_conventions.md:100,189`(§8)。 + +調整役の scratch レビュー置き場にある元の r1 と直接比較した。変更は3行・リンク9か所で、Related の5リンクを付け替え、英和の監査 JSON/スクリプトへの4リンクを削除してインラインコードにしている。したがって「リンク先9か所だけ」より広く、4か所はリンク自体が無くなっている。指摘・判定は同じでも Markdown 原文は一致しない。レビュワ名・版0.1はそのままで、レビュワによる公開用訂正の記録もない。 + +SPEC-06 は「原文のまま残す」と定める。例外は用語注警告だけで、リンクは引き続き検査する。`docs_check` の合格は、作者によるレビューの編集を許可せず、原文保存の遵守も証明しない。作者がコミットと PR 本文で変更を明示したのは有用だが、レビュワ自身の訂正の代わりにはならない。この改変版を私の原本として追認しない。 + +**正しい扱い:** 元の r1 を変更せず保存し、元の監査 JSON とスクリプトも証跡として参照可能にする。公開用の問題は別に扱い、REV に、版・訂正理由・原本の識別情報/ハッシュ・リポジトリ内で有効な参照先を備えた公開用訂正版または追補を発行してもらい、その発行済み原文をそのまま取り込む。作者は別署名の索引・案内文に移設理由や導線を追加できるが、r1 本体と偽ったり上書きしたりしない。証跡リンクの削除、黙った書換え、リンク検査の回避はしない。原本を検査対象の `docs/reviews/` に置くなら原文の相対参照先も実在させる必要があり、それができなければ原本を変更しない保管成果物として残し、レビュワ発行の公開記録から参照する。今回の r2 は不備を記録するもので、r1 を訂正・置換してはいない。 + +原本 SHA-256 は `7fc95a749e802996d83147b4c6b66c1403eff0ea4571d41287a7ad571e5e2a13`、収録版は `97b608128c5eacbe91e583ea661c5a2dd7f4632a76a3372980f3b2e2b8060326` で異なる。 + +### r1 指摘の解消 + +| 指摘 | 判定 | +|---|---| +| R1-01、修正版なしの厳密な照合 | 解消。正規化で名前・導入版・修正版・状態・分類を保持し、同じ CVE、一覧中の正確な `name@version`、指定イメージの OS 分類、空の `FixedVersion`、許容された修正版なしの状態を求める。修正版あり、状態/分類不明、別名/別版、似た別イメージ、言語パッケージは未許容。ワイルドカードや正確な packages のない image 項目を不正とし、内部メタデータは公開報告から除く。 | +| R1-02、進捗表 | 英和とも解消。未達に直し、履歴を残して現行58項目と未変更の上限0を明示し、M1報告のみとM2を区別して、所有者の上限判断を残件にした。参照する前回報告の件数は再検査と同じ。 | +| R1-03、来歴 | 解消。DEMO-20 は wiki `5985d18b`、osf.io 基底 `8fc45de4`、結合タグを区別し、0.17 は Trivy の件数不変に限定して ZAP MEDIUM 1件増を明記。manifest の注記と許容理由全件は判断日2026-11-10と反映/追加日2026-11-11を区別。現在の PR 本文も MFR `9771b8cf`、受入12/12、再検査成功へ更新済み。 | + +旧 `20261111T132241Z`・新 `20261111T141449Z` の Trivy 生報告全件をコミット済みの正規化・照合処理へ通した。両方とも58項目すべてを使って177件を許容し、WB は HIGH 47、MFR は CRITICAL 3・HIGH 127。すべて一覧と名前・版が一致し、`os-pkgs` / `debian`、修正版なしだった。各177件について10種類の変更(修正版あり、fixed/不明状態、言語/欠落分類、似た/無関係なパッケージ、別版、似た/別イメージ)を個別に与え、各報告1,770件、合計3,540件すべてを拒否した。元の r1 スクリプトは変更していない。新しい照合はメタデータのない Trivy 検出を意図的に拒否するため、r2 の監査は正規化処理を使う。 + +### 再検査の証跡と限界 + +`scan_20261111T141804Z.json` は前の `scan_20261111T132607Z.json` と合計・重要度別件数・許容件数・上限・門が一致する。検出配列の再集計も概要と一致した。未許容10,984件、CRITICAL/HIGH/MEDIUM/LOW/INFO は726/3782/4148/2322/6、別途177件許容、58項目、上限0。全スキャナー ok、基本対策と M1 報告のみの門は合格、終了0。report の bundle 内の scan は同一で、全体は complete。 + +保存証跡と独立再計算による確認であり、新しい実機スキャンではない。再検査の `commit` は `3c5dd0c` で、修正コミットより前の実行を示すため、この欄だけでは `339f4fa` の厳密なソース来歴を証明できない。コミット済み処理の挙動は独立再計算と単体試験で確認した。report bundle に含まれる古い plan を最新の配備一覧とは扱わない。上限と次の節目までの有効期限の境界は引き続き所有者の判断事項で、API v2/ember のプレビューは明記された別の残件である。 + +### 独立検査と成果物 + +英語版の5コマンドを `scratchpad/pr45-rev-r2` で実行し、終了コードを確認した。 + +| 検査 | 結果 | 終了 | +|---|---|---:| +| installer 単体試験 | 655件、OK、skip 10件 | 0 | +| tools 単体試験 | 93件、OK | 0 | +| docs_check | 155件検査、8件免除、38警告 | 0 | +| manifest_check | 合格 | 0 | +| 独立再計算・変更試験 | 両報告で58/58項目・177件、3,540変更すべて拒否 | 0 | + +installer 試験は既存の Control Center 5000番ポート警告と Python 3.15 の fork 非推奨警告を出す。隣に `pr45-r2-installer.log`、`pr45-r2-tools.log`、`pr45-r2-docs.log`、`pr45-r2-manifest.log`、`pr45-r2-audit.log` を保存した。監査は `pr45-r2-audit.py`/`pr45-r2-audit.json` で、JSON に入力 SHA-256 と全照合を記録した。`pr45-r2-r1-copy.diff` は r1 の正確な差分。これらは scratch 成果物で、コミット済みとはしていない。r2 の相対リンクは予定の配置先 `docs/reviews/` 用にレビュワが作成し、その文脈で検査した。収録時はこの原文を維持する。 diff --git a/docs/reviews/2026-11-11_RDM-ember-osf-web-dev2027_PR2_Static_Build_r2.md b/docs/reviews/2026-11-11_RDM-ember-osf-web-dev2027_PR2_Static_Build_r2.md new file mode 100644 index 0000000..3d246a9 --- /dev/null +++ b/docs/reviews/2026-11-11_RDM-ember-osf-web-dev2027_PR2_Static_Build_r2.md @@ -0,0 +1,141 @@ +# REV-PR2-R2 Static build review / 静的ビルド再レビュー + +> **Summary:** Pass for the four follow-up commits of RDM-ember-osf-web-dev2027 PR #2 and the supplied installer patch. The previous required findings are resolved within the reviewed scope. +> **概要:** RDM-ember-osf-web-dev2027 PR #2 の追加四コミットと指定 installer patch は pass。確認した範囲では前回の必須指摘は解消しています。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only what publication requires: private-repository URLs become named plain-text references; local guide links become repository-relative links; unpublished scratch references become named plain text or quoted command-path placeholders; public review links absent from develop point to the reviewed public commit. / REV が公開に必要な変更のみを行った。非公開リポジトリの URL は名称付き平文参照、ローカルのガイドへのリンクはリポジトリ相対リンク、未公開 scratch の参照は名称付き平文またはコマンドの引用符付きパス代替表示とし、develop に未収録の公開レビューへのリンクは確認済みの公開コミットを指す。 +- Publication provenance / 公開版の来歴: REV(担当レビュワ)issued this publication version from the unchanged original `2026-11-11_RDM-ember-osf-web-dev2027_PR2_Static_Build_r2.md` (SHA-256: `790fb530ad02a2d9e8965091c1ace448aa2a94a4dc34481091de07e73ec1e919`); the original file and scratch evidence remain unchanged, and all text other than this version/provenance metadata and the explicitly stated publication references is verbatim. Quoted scratch command-path placeholders identify retained unpublished evidence and must be replaced with its local location before execution. / REV が上記原本から公開版を発行した。原本と scratch 証跡は未変更で、版・来歴の追記と明示した公開用参照以外の本文は原文どおり。コマンド内の引用符付き scratch パス代替表示は保持された未公開証跡を識別するもので、実行にはそのローカルの場所への置換が必要。 +- Version / 版: 0.1 — 2026-11-11. **Learned:** Safe rendering and safe shipped dependencies need separate checks; a clean runtime image alone proves neither. / 安全な描画と配信される依存コードは別々に確かめる必要があり、実行イメージの検査結果だけではどちらも証明できない。 +- **Applies to:** REV(担当レビュワ)r2; RDM-ember-osf-web-dev2027 PR #2, `898e753a5baf` → `0246b5a3b34ba8dbf6341d2193ea27ae9f47cf0e`; supplied installer patch based on RDM-developer-guide `eb8c4e9`. +- **Related:** [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-02](../spec/02_installer_cli.md) · Installer patch / インストーラーパッチ (REV scratch evidence (not published): `grdm-dev-ember-static.patch`) +- **Used by / 利用先:** PR #2 review decision and the coordinator's installer integration decision / PR #2 のレビュー判定と調整担当の installer 統合判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**PASS. No new required changes found.** R1-01 (HTML injection), R1-02 (shipped dependency assessment), and R1-03 (installer/specification mismatch) are resolved for the reviewed default static build. This is a review verdict, not GitHub approval or merge authorization. + +The four reviewed commits are `4602cd081` (renderer), `1cadf7e33` (Node wrapper), `fd3d57554` (security backports), and `0246b5a3b` (test target). The installer patch SHA-256 is `3b206cfa31988ca0a0bf37b17a695bee000ec496168031b426c20ae390983999`. + +### Renderer and regression checks + +`docker/static/render.sh` validates each complete environment value before rendering. The ASCII allow-lists reject control characters, Unicode separators, quotes, markup and percent escapes; field-specific patterns and lengths then constrain URLs and the cookie domain. All seven substituted values are URI-encoded (characters are represented safely inside the HTML attribute). `entrypoint.sh` stops when rendering fails, before starting nginx. + +An independent harness applied U+2028/U+2029, U+0085, nonbreaking space, fullwidth quote, encoded/double-encoded CR/LF, both quotes, `</script>`, JavaScript schemes, control characters and overlong values across the six URL variables, cookie domain and both CSP settings. All 199 invalid cases returned 1 and left a pre-existing output tree byte-for-byte unchanged. Three accepted URL cases round-tripped exactly, including length 2000 and ports 00001/65535. Existing renderer tests separately cover rejection before initial files are created. + +Seven independent postbuild fixtures checked valid input, raw/encoded placeholders outside the configuration, placeholders in another asset, missing placeholders, and duplicate configuration tags. All behaved as expected. The actual production output passed postbuild and then rendered successfully; its configuration contained the expected default backend URLs and no Google Analytics adapter. This also resolves the previous concern about rendering files nginx would never serve. + +### Shipped dependencies and upstream comparison + +The reviewer installed the frozen lockfile in a fresh scratch clone and built production output using Node 24.22.2. Only webpack's `optimization.namedModules` was enabled in the scratch copy to retain package names for inventory; the result is an instrumented production build, not a byte-identical release image. Thirty JavaScript files exposed 18 named packages. None of the package names in the supplied 2 CRITICAL / 51 HIGH lockfile report appeared directly in those named modules; vendor imports and nested prebuilt bundles were inspected separately. + +- **sanitize-html 1.20.0:** `ember-cli-sanitize-html` imports `dist/sanitize-html.js` into vendor.js, and collections passes provider descriptions through it. The backported loop is semantically identical to [upstream 2.7.1 at b4682c12](https://github.com/apostrophecms/sanitize-html/blob/b4682c12fd30e12e82fa2d9b766de91d7d2cd23c/index.js#L615). The emitted vendor file contains the new indexOf loop and no old comment regex. Direct execution of the browser bundle removes disguised JavaScript URLs; 50,000 unclosed comment openers (200,000 characters) took about 9.4 ms in this run. +- **d3-color inside keen-dataviz 2.0.10:** both numeric patterns match [upstream 3.1.0 at 7a1573ed](https://github.com/d3/d3-color/blob/7a1573ed260de4fd97d061975244841132adde92/src/color.js#L8). The analytics engine vendor output contains two fixed patterns and zero old patterns. The regression suite covers representative valid colors and long invalid input. +- **js-cookie 2.1.0 inside keen-tracking 2.0.10:** it remains shipped, so it is an accepted risk, not a fixed package. The emitted configuration has `Keen.environments: []`. Application code does not call the library's cookie or auto-tracking API; its cookie use is through Ember's cookie service. The stated acceptance boundary, Keen removal or the Ember 3.28 migration PR, is reasonable for this default artifact. Enabling Keen or introducing cookie/auto-tracking calls requires renewed assessment. +- **PostCSS inside sanitize-html:** it is browser code, not categorically build-only. Its bundled `fs` module is empty, and the source-map file-read branches guard `existsSync`; the reported filesystem-read advisories are therefore unreachable in this browser bundle. The other reported tooling packages were not found in the reviewed browser import paths. The lockfile findings remain; no claim of a clean dependency scan is made. + +The five patched dependency files were unchanged by a second run of the backport script. The browser fixes and renderer tests passed locally. Upstream sources were obtained with read-only GitHub API calls. + +### CI, test target and installer + +Both checks on the specified PR head report success. The independently fetched log for run `43017266950` shows Node 8.17.0 triggering the pinned 24.22.2 download, a successful SHA-256 verification, 393 node tests passing with 265 pending, and 978 Ember tests complete with four skip markers. The wrapper also passed a local Node 24 smoke check for the util shim and preservation of an argument containing spaces. Updating the workflow itself to Node 24 remains sensible follow-up work. + +The Docker test CMD removes all seven placeholder environment variables. Executing its `env -u` sequence against configuration loading restored the same test OSF configuration as a clean environment. The Docker test image itself was not rebuilt by this reviewer. + +The installer patch applied cleanly to an isolated clone at `eb8c4e9`. It preserves the static entrypoint, uses uid 101, `/tmp` tmpfs, no writable dist volume and a `/healthz` probe that requires HTTP 200. SPEC-01, SPEC-02 and the environment guide agree in both languages. Recalculation including initialization services gives core 8320 MiB (11.607 GiB at a 70% budget), full/fakecas 9344 MiB (13.036 GiB), and full/shibboleth 9664 MiB (13.482 GiB). These are computed floors, not measured build or runtime peaks. The temporary PR-head pin must move to the integration commit after merge, as the patch already states. + +Review observations: + +```toon +checks[10]{check,result}: + independent_invalid_inputs,199 rejected without writes + independent_valid_roundtrips,3 passed + independent_postbuild_fixtures,7 passed + renderer_and_security_tests,172 passed + instrumented_production_build,passed on Node 24.22.2 + actual_output_postbuild_and_render,passed + installer_tests,639 run with 10 skipped and no failures + tools_tests,93 passed + manifest_check,passed + docs_check,154 checked with 8 exempt and 38 warnings +``` + +### Evidence and limits + +Injection harness (REV scratch evidence (not published): `injection.py`) · Injection results (REV scratch evidence (not published): `injection-results.json`) · Focused tests (REV scratch evidence (not published): `focused-tests.log`) · Production build (REV scratch evidence (not published): `build.log`) · Inventory (REV scratch evidence (not published): `inventory.json`) · CI log (REV scratch evidence (not published): `ci.log`) · Installer tests (REV scratch evidence (not published): `installer-tests.log`) · Tools tests (REV scratch evidence (not published): `tools-tests.log`) + +The initial installer test invocation lacked `PYTHONPATH=installer` and failed imports; the corrected complete run produced the recorded 639-test result. An early focused Node test invocation preceded completion of dependency installation; the recorded 172-test run was performed after installation completed. + +No Docker command or grdm-dev stack change, runtime/.env access, push, commit, merge, approval or closure was performed. Image vulnerability counts, arm64 image startup/memory measurements and Docker browser smoke results remain author evidence. The reviewer independently checked source, upstream patches, an instrumented local production build, fixtures, installer tests and GitHub CI logs. The pre-existing collections engine's localhost URL remains outside this four-commit scope. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**PASS。新たな修正必須事項は見つかりませんでした。** R1-01(HTML 注入)、R1-02(配信依存の評価)、R1-03(installer と仕様の不一致)は、確認した既定の静的ビルドについて解消しています。この判定はレビュー結果であり、GitHub の approve やマージ許可ではありません。 + +対象は `4602cd081`(描画)、`1cadf7e33`(Node ラッパー)、`fd3d57554`(セキュリティ修正移植)、`0246b5a3b`(test ターゲット)の四コミットです。installer patch の SHA-256 は `3b206cfa31988ca0a0bf37b17a695bee000ec496168031b426c20ae390983999` です。 + +### 描画と回帰確認 + +`docker/static/render.sh` は描画前に各環境変数の値全体を検査します。ASCII 許可集合で制御文字、Unicode の区切り、引用符、markup、percent escape を拒否し、項目別の形式と長さで URL と cookie domain を制限します。置換する七つの値はすべて URI エンコード(HTML 属性内で安全に表せる文字列への変換)されます。描画に失敗すると `entrypoint.sh` は nginx を起動せず終了します。 + +独立した試験では、U+2028/U+2029、U+0085、改行しない空白、全角引用符、符号化・二重符号化した CR/LF、両引用符、`</script>`、JavaScript scheme、制御文字、長すぎる値を、六つの URL 変数、cookie domain、二つの CSP 設定に与えました。不正入力 199 件はすべて終了 1 で拒否され、既存出力の全バイトが維持されました。正常 URL 三件は、2000 文字境界と port 00001/65535 を含めて完全に復元できました。既存 renderer テストは初回出力が作られないことも確認しています。 + +postbuild の独立 fixture 七件では、正常入力、設定の外にある raw/encoded placeholder、別 asset 内の placeholder、placeholder 不足、重複設定タグを確認し、すべて期待どおりでした。実際の本番出力も postbuild と描画を通過し、既定 backend URL と Google Analytics adapter の不在を確認しました。nginx が配信しない別ファイルだけを描画するという前回の懸念も解消しています。 + +### 配信依存と上流比較 + +新しい scratch clone に frozen lockfile で依存を入れ、Node 24.22.2 で本番出力を作りました。棚卸し用の名前を残すため、scratch 内だけで webpack の `optimization.namedModules` を有効にしました。これは検査用の本番ビルドであり、リリースイメージとバイト単位で同一の成果物ではありません。JavaScript 30 ファイルから名前付きパッケージ 18 個を抽出しました。提供された lockfile 報告の CRITICAL 2 / HIGH 51 のパッケージ名は、その名前付きモジュールには直接現れませんでした。vendor import と事前に束ねられた内部依存は別途調べました。 + +- **sanitize-html 1.20.0:** `ember-cli-sanitize-html` が `dist/sanitize-html.js` を vendor.js に入れ、collections が provider description を渡します。移植ループは [上流 2.7.1 の b4682c12](https://github.com/apostrophecms/sanitize-html/blob/b4682c12fd30e12e82fa2d9b766de91d7d2cd23c/index.js#L615) と同じ処理です。配信 vendor には新しい indexOf ループがあり、旧コメント正規表現はありません。ブラウザ版を直接実行して偽装 JavaScript URL の除去を確認し、未終端コメント開始を五万回繰り返す二十万文字の入力は今回約 9.4 ms でした。 +- **keen-dataviz 2.0.10 内の d3-color:** 二つの数値パターンは [上流 3.1.0 の 7a1573ed](https://github.com/d3/d3-color/blob/7a1573ed260de4fd97d061975244841132adde92/src/color.js#L8) と一致します。analytics engine の vendor 出力では新パターン二件、旧パターン零件でした。回帰試験は正常な色と長い不正入力も確認しています。 +- **keen-tracking 2.0.10 内の js-cookie 2.1.0:** 配信物に残るので、修正済みではなくリスク受容です。出力設定の `Keen.environments` は空配列でした。アプリは同ライブラリの cookie / auto-tracking API を呼ばず、cookie 操作には Ember のサービスを使います。Keen 除去または Ember 3.28 移行 PR までという受容範囲は、この既定成果物について妥当です。Keen の有効化や cookie / auto-tracking 呼出の追加時には再評価が必要です。 +- **sanitize-html 内の PostCSS:** ブラウザコードであり、一律にビルド専用とは扱いません。同梱 `fs` は空で、source map のファイル読取分岐は `existsSync` を検査するため、報告されたファイル読取の脆弱性はこのブラウザ版では到達しません。その他のツール依存は確認したブラウザ import 経路に見つかりませんでした。lockfile の指摘は残り、依存スキャンが無指摘になったとは判定していません。 + +修正対象の依存五ファイルは移植スクリプトを再実行しても変わりませんでした。ブラウザ修正と描画のテストもローカルで成功しました。上流コードは GitHub API の読取で取得しました。 + +### CI・test ターゲット・installer + +指定 head の二つの CI check は成功です。独立取得した run `43017266950` のログで、Node 8.17.0 から固定版 24.22.2 の取得、SHA-256 検証成功、node-tests 393 件成功・265 件 pending、Ember 978 件完了・skip 記号四件を確認しました。Node 24 のローカル確認では util shim と空白を含む引数の保持も通りました。workflow 自体を Node 24 に変更することは後続作業として妥当です。 + +Docker test の CMD は七つの placeholder 環境変数をすべて外します。その `env -u` 列で設定読込を実行し、環境変数のない状態と同じ test 用 OSF 設定に戻ることを確認しました。レビュワ自身は Docker test image を再ビルドしていません。 + +installer patch は `eb8c4e9` の隔離 clone に正常適用できました。静的 entrypoint を維持し、uid 101、`/tmp` tmpfs、書込 dist volume なし、HTTP 200 を要求する `/healthz` 検査となります。SPEC-01、SPEC-02、環境ガイドは英和で整合しています。初期化サービス込みで再計算すると core 8320 MiB(70% 予算で 11.607 GiB)、full/fakecas 9344 MiB(13.036 GiB)、full/shibboleth 9664 MiB(13.482 GiB)でした。これは計算上の下限であり、ビルド・実行時のピーク実測値ではありません。マージ後に一時的な PR head の固定先を統合コミットへ移す必要は、パッチ自身に記載されています。 + +レビューでの確認結果: + +```toon +checks[10]{check,result}: + 独立不正入力,199件を出力変更なしで拒否 + 独立正常値往復,3件成功 + 独立postbuild_fixture,7件成功 + rendererと修正移植テスト,172件成功 + 検査用本番ビルド,Node24.22.2で成功 + 実成果物postbuildと描画,成功 + installerテスト,639件実行でskip10と失敗0 + toolsテスト,93件成功 + manifest_check,合格 + docs_check,154件検査と例外8件と警告38件 +``` + +### 証拠と限界 + +Injection harness (REV scratch evidence (not published): `injection.py`) · Injection results (REV scratch evidence (not published): `injection-results.json`) · Focused tests (REV scratch evidence (not published): `focused-tests.log`) · Production build (REV scratch evidence (not published): `build.log`) · Inventory (REV scratch evidence (not published): `inventory.json`) · CI log (REV scratch evidence (not published): `ci.log`) · Installer tests (REV scratch evidence (not published): `installer-tests.log`) · Tools tests (REV scratch evidence (not published): `tools-tests.log`) + +最初の installer テスト実行は `PYTHONPATH=installer` が無く import に失敗しました。修正した全件実行が記載の 639 件です。また、初回の対象 Node テストは依存導入の完了前に実行されました。記載の 172 件は導入完了後の再実行結果です。 + +Docker コマンド、grdm-dev stack の変更、runtime/.env の参照、push、commit、merge、approve、close は行っていません。イメージの脆弱性件数、arm64 イメージの起動・メモリ実測、Docker ブラウザ smoke の結果は作者の証拠として扱います。レビュワが独立確認したのは、ソース、上流修正、検査用ローカル本番ビルド、fixture、installer 試験、GitHub CI ログです。既存の collections engine の localhost 固定 URL は、この四コミットの対象外です。 diff --git a/docs/reviews/2026-11-11_RDM-modular-file-renderer-dev2027_PR7_Render_Redirect_r1.md b/docs/reviews/2026-11-11_RDM-modular-file-renderer-dev2027_PR7_Render_Redirect_r1.md new file mode 100644 index 0000000..2916e2c --- /dev/null +++ b/docs/reviews/2026-11-11_RDM-modular-file-renderer-dev2027_PR7_Render_Redirect_r1.md @@ -0,0 +1,116 @@ +# REV PR #7 render redirect review r1 / 描画転送レビュー r1 + +> **Summary:** Pass for the GakuNin RDM GUID rendering path at the reviewed head. Removing the COS URL rewrite preserves the existing credential boundary; the upstream change was a compatibility fix, not a security fix. +> **概要:** 対象headの学認RDMのGUID描画経路はpass。COSのURL書換えを削除しても既存の資格情報の境界は保たれ、上流変更はセキュリティ修正ではなく互換修正だった。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only what publication requires: private-repository URLs become named plain-text references; local guide links become repository-relative links; unpublished scratch references become named plain text or quoted command-path placeholders; public review links absent from develop point to the reviewed public commit. / REV が公開に必要な変更のみを行った。非公開リポジトリの URL は名称付き平文参照、ローカルのガイドへのリンクはリポジトリ相対リンク、未公開 scratch の参照は名称付き平文またはコマンドの引用符付きパス代替表示とし、develop に未収録の公開レビューへのリンクは確認済みの公開コミットを指す。 +- Publication provenance / 公開版の来歴: REV(担当レビュワ)issued this publication version from the unchanged original `2026-11-11_RDM-modular-file-renderer-dev2027_PR7_Render_Redirect_r1.md` (SHA-256: `d593dbd32128c30c2eeafbe0b2319a39c8bad3bbcee2ddf456dff0e4b89c3b32`); the original file and scratch evidence remain unchanged, and all text other than this version/provenance metadata and the explicitly stated publication references is verbatim. Quoted scratch command-path placeholders identify retained unpublished evidence and must be replaced with its local location before execution. / REV が上記原本から公開版を発行した。原本と scratch 証跡は未変更で、版・来歴の追記と明示した公開用参照以外の本文は原文どおり。コマンド内の引用符付き scratch パス代替表示は保持された未公開証跡を識別するもので、実行にはそのローカルの場所への置換が必要。 +- Version / 版: 0.1 — 2026-11-11. **Learned:** RDM selects its internal file-service address in the GUID view, so the COS download-route workaround changes network reachability without adding an authentication safeguard. / RDMはGUIDのビューで内部ファイルサービスのアドレスを選ぶため、COSのdownload経路への対処は認証保護の追加ではなく到達先を変えていた。 +- Applies to / 対象: RCOSDP/RDM-modular-file-renderer-dev2027 PR #7, head `2c4a88a663ca2c659e2b8fe46a2f26e84f206ba9`, base `f9da1db3c253c27c2dbc1a728390cbb0e373c94c`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [COS upstream commit / 上流コミット](https://github.com/CenterForOpenScience/modular-file-renderer/commit/f34a1b84d57e19468dc101ced6d6572e520a6d90). +- Used by / 利用先: coordinator's review gate for PR #7 and the separate C5 acceptance record in RDM-developer-guide PR #45 / 連携調整のPR #7レビュー判断およびRDM-developer-guide PR #45の別途C5受入記録。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Pass. No blocking findings.** The change restores the RDM route that chooses the internal WaterButler address. WaterButler is the service that reads and writes stored files; GUID is the short identifier in the file URL. This verdict applies to RDM's existing GUID download/render flow, not to compatibility with COS Angular OSF or successful deployment acceptance. + +The scratch clone is detached at the requested head. Only `mfr/providers/osf/provider.py` and `tests/providers/test_osf_provider.py` differ from the base. An AST comparison (a comparison of Python program structure) confirms that `_fetch_download_url` is the only changed provider method. Credential validation, forwarding and redirect handling are unchanged. The remote head was rechecked before reporting. + +### Credential destinations + +`provider.py:197–219` sends the original URL through `_make_request`, validates the returned Location through `_redirect_target`, then evaluates the existing credential grant. There is no direct request that bypasses validation. Automatic redirects remain disabled at `:238`; each later destination is checked before `send_request` at `:270`. + +`_validated_url_origin` (`:374–384`) requires exact membership in `ALLOWED_PROVIDER_NETLOCS`, not suffix or substring matching. `_url_origin` (`:353–368`) rejects invalid schemes, missing hosts, user information, backslashes, control characters and invalid ports. Credential grants use the normalized origin, meaning the scheme, hostname and effective port together. `_hop_keeps_credentials` (`:307–329`) grants a cross-origin hop only from the original configured source to a configured target and refuses HTTPS-to-HTTP downgrade. The two configuration lists are empty by default and are not edited by this PR. + +With the test configuration, only `http://web:5000` → `http://wb:7777` receives the four captured credentials: Authorization, session cookie, cookie query parameter and view-only token. Unlisted external hosts, lookalikes, other ports and omitted ports are rejected before contacting that destination. A destination separately added to the network allowlist still receives none of these credentials unless its exact origin is granted. This does not mean that every external address is universally forbidden: deployment configuration controls the existing allowlist, and the original allowed provider origin retains its existing credential privilege. The shared client uses `DummyCookieJar`, so response cookies are not implicitly remembered across users or redirect requests. + +### Upstream purpose and regression boundary + +I read the complete message and patch of COS `f34a1b84d57e19468dc101ced6d6572e520a6d90` (2026-04-28). It adds a five-character GUID path match, prepends `/download/`, updates the request/error URL, and records a metric. The message explains that COS GUID URLs stopped redirecting to a downloadable file. No permission check, credential restriction or destination validation is added. **The evidence identifies a compatibility fix, not a security fix.** PR #6 imported that workaround; reverting it does not remove an authentication safeguard. + +RDM-osf.io-dev2027 at `8fc45de4`, `addons/base/views.py:1034–1045`, explicitly passes `_internal=extras.get('mode') == 'render'` when producing the file URL. The same file's `persistent_file_download` (`:1081–1110`) instead passes query parameters to `generate_waterbutler_url` without deriving `_internal` from `mode`. `website/routes.py:1445–1450` binds `/download/<fid_or_guid>/` to that latter view. The GUID view retains `must_be_contributor_or_public`; changing the route does not itself bypass file authorization. + +The COS failure would recur if this fork were used against a COS server whose GUID URL no longer returns the required 302. That is a compatibility boundary, not a security regression, and is outside this RDM-specific correction. Already-supplied `/download/<guid>/` URLs are also unchanged: the API v2/Ember `links.render` issue identified in the PR remains separate. + +### Tests and evidence + +The new `TestRdmGuidUrl` has 18 parameterized cases: two success cases, twelve destination-rejection cases across metadata and download, and four allowed-but-ungranted destination cases. Exact original URL assertions include the query string and detect restoration of the old rewrite. Metadata checks HEAD to internal WaterButler; download checks its target and credentials. Rejection tests assert that only the initial OSF request occurred. The credential helper checks all four captured credential types. + +Existing tests additionally cover an arbitrary external destination, malformed URLs, HTTPS downgrade, onward storage redirects, and returning to WaterButler after leaving the credential-bearing chain. A small optional improvement is to apply the allowed-but-ungranted matrix to metadata as well as download and assert `error is None` in its successful download cases; the current shared request implementation and existing tests make this non-blocking. These are mocked transport tests, so they do not prove the real OSF response or Compose reachability. + +Observed evidence, not a substitute for the separate C5 run: + +```toon +checks[6]{check,result}: + provider_security_methods_AST_comparison,unchanged from base + git_diff_check,pass + GitHub_CI_unit_suite,268 passed / 12 skipped / 26 warnings + GitHub_CI_browser_suite,2 passed + GitHub_CI_lint,pass through invoke test calling flake8 first + local_unit_or_Compose_run,not run +``` + +I retrieved the successful GitHub Actions job `130528247456` from run `43019579995`. It tested merge commit `0dd21ae690309f73171d83a07642231f022af201` with Python 3.13.18. GitHub commit metadata confirms that this merge and the reviewed head share tree `e5c8c0a3d0f5e9263d72edc01fc5b9dfc0b349d8`, so the CI source is identical. The log is preserved at CI log (REV scratch evidence (not published): `pr7-ci.log`). The full suite was not rerun locally: the available Python is 3.15.2 and lacks the project's test dependencies. The author's claim of six mutation-test failures is not independently reproduced and is not counted as reviewer-run evidence. + +No runtime/.env was accessed and no Docker command was executed. No commit, push, approval, merge or close was performed. Remaining work is the separately owned real C5 acceptance and the separate API v2/Ember rendering issue. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**Pass。必須修正なし。** RDMが内部WaterButlerのアドレスを選ぶ経路を復元する変更として妥当。WaterButlerは保存ファイルを読み書きするサービス、GUIDはファイルURLに含む短い識別子を指す。この判定はRDMの既存GUIDダウンロード・描画経路に限り、COS Angular OSFとの互換性や配備後の受入成功までは示さない。 + +scratchのcloneを指定headに固定した。baseからの差分は `mfr/providers/osf/provider.py` と `tests/providers/test_osf_provider.py` のみ。AST比較(Pythonのプログラム構造の比較)で、変更されたproviderメソッドは `_fetch_download_url` だけと確認した。資格情報の検証・転送・リダイレクト処理は不変。報告前にリモートheadも再確認した。 + +### 資格情報の送信先 + +`provider.py:197–219` は元のURLを `_make_request` 経由で要求し、Locationを `_redirect_target` で検証してから既存の資格情報付与判定を行う。検証を迂回する直接要求はない。`:238` で自動転送を無効にし、後続の送信先も `:270` の `send_request` より前に検査する。 + +`_validated_url_origin`(`:374–384`)は `ALLOWED_PROVIDER_NETLOCS` との完全一致を求め、末尾一致・部分一致は使わない。`_url_origin`(`:353–368`)は不正なscheme、host欠落、ユーザー情報、バックスラッシュ、制御文字、不正なポートを拒否する。資格情報の付与には正規化したorigin、つまりscheme・hostname・実効ポートの組を使う。`_hop_keeps_credentials`(`:307–329`)は元の設定済み送信元から設定済み送信先への転送だけに別originへの資格情報を許し、HTTPSからHTTPへの降格を拒否する。設定リストは既定で空であり、このPRは変更していない。 + +試験の設定では `http://web:5000` → `http://wb:7777` だけに、Authorization・セッションcookie・cookieクエリ引数・view-onlyトークンの4種が届く。許可外の外部host、似た名前、別ポート、ポート省略は、その送信先への要求前に拒否される。ネットワークの許可リストだけに別途追加しても、厳密なoriginへの付与がなければ4種とも渡らない。ただし全外部アドレスを一律拒否する意味ではない。既存の許可リストは配備設定が決め、元の許可済みprovider originには従来どおり資格情報が届く。共有クライアントは `DummyCookieJar` を使い、応答cookieを利用者間や後続要求へ暗黙に記憶しない。 + +### 上流の目的と回帰の境界 + +COS `f34a1b84d57e19468dc101ced6d6572e520a6d90`(2026-04-28)のメッセージと全差分を読んだ。5文字のGUIDパス判定、`/download/` の前置、要求・エラーURLの変更、メトリクスの追加である。メッセージはCOSのGUID URLがダウンロード先へ転送されなくなったと説明している。権限検査・資格情報制限・送信先検証の追加はない。**確認できた根拠からはセキュリティ修正ではなく互換修正と判断する。** PR #6が取り込んだこの対処を戻しても認証保護は削除されない。 + +RDM-osf.io-dev2027の `8fc45de4`、`addons/base/views.py:1034–1045` はファイルURL生成時に `_internal=extras.get('mode') == 'render'` を明示する。一方、同ファイルの `persistent_file_download`(`:1081–1110`)はクエリ引数を `generate_waterbutler_url` に渡すだけで、modeから_internalを導かない。`website/routes.py:1445–1450` は `/download/<fid_or_guid>/` を後者へ結ぶ。GUIDのビューには `must_be_contributor_or_public` が残り、経路変更自体はファイルの権限確認を迂回しない。 + +GUID URLが必要な302を返さないCOSサーバーにこのforkを使えば、COSで対処した不具合は再発する。それは互換性の境界であり、セキュリティ回帰ではなく、RDM向けの今回の修正範囲外である。既に `/download/<guid>/` として渡されたURLも変わらないため、PRが挙げるAPI v2/Emberの `links.render` 問題は別件として残る。 + +### テストと証拠 + +追加された `TestRdmGuidUrl` は、パラメータ展開後18件。成功2件、metadataとdownload両方での送信先拒否12件、ネットワーク許可済み・資格情報未付与の送信先4件である。元URLの完全一致にはクエリ文字列も含み、旧書換えが戻れば検出する。metadataは内部WaterButlerへのHEADを確認し、downloadは送信先と資格情報を確認する。拒否例は最初のOSF要求だけが発生したと検証する。資格情報の補助関数は4種すべてを見る。 + +既存試験では任意の外部送信先、不正URL、HTTPS降格、保存先への後続転送、資格情報を保持する経路から離れた後のWaterButlerへの戻りも扱う。任意の改善として、ネットワーク許可済み・資格情報未付与の表をmetadataにも広げ、そのdownload成功例で `error is None` を確認するとさらに明確になる。現状の共有要求実装と既存試験を踏まえ、必須修正とはしない。要求送信を模した単体試験なので、実OSFの応答やCompose内の到達性までは証明しない。 + +確認した証拠は次のとおりで、別途のC5実行の代わりではない。 + +```toon +checks[6]{check,result}: + providerセキュリティメソッドのAST比較,baseと同一 + git_diff_check,成功 + GitHub_CI単体試験,268成功 / 12スキップ / 26警告 + GitHub_CIブラウザ試験,2成功 + GitHub_CI静的検査,invoke testが先にflake8を実行して成功 + ローカル単体試験またはCompose試験,未実施 +``` + +GitHub Actionsの成功job `130528247456`(run `43019579995`)を取得した。Python 3.13.18でmerge commit `0dd21ae690309f73171d83a07642231f022af201` を試験している。GitHubのcommit情報により、このmergeと対象headのtreeはともに `e5c8c0a3d0f5e9263d72edc01fc5b9dfc0b349d8` と確認でき、CIが検査したソースは同一。CIログ (REV scratch evidence (not published): `pr7-ci.log`)を保存した。ローカルのPythonは3.15.2でプロジェクトの試験依存がないため、全試験は再実行していない。作者の「旧実装へ戻すと6件失敗」という記載は独立再現しておらず、レビュワ実行の証拠には数えない。 + +runtime/.envにアクセスせず、Dockerコマンドも実行していない。commit・push・approve・merge・closeは行っていない。残る作業は別担当の実機C5受入と、別件のAPI v2/Ember描画問題である。 diff --git a/docs/reviews/2026-11-11_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r2.md b/docs/reviews/2026-11-11_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r2.md new file mode 100644 index 0000000..9081a8f --- /dev/null +++ b/docs/reviews/2026-11-11_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r2.md @@ -0,0 +1,127 @@ +# REV PR12 File editor Yjs review r2 / ファイル編集 Yjs レビュー r2 + +> **Summary:** Changes requested. The awareness XSS and Quick Files fixes are present, but expiry enforcement and superseded-room renewal remain incomplete. +> **概要:** 要修正。awareness の XSS と Quick Files の修正は確認できたが、期限失効と旧版の部屋の更新拒否は未完了。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only what publication requires: private-repository URLs become named plain-text references; local guide links become repository-relative links; unpublished scratch references become named plain text or quoted command-path placeholders; public review links absent from develop point to the reviewed public commit. / REV が公開に必要な変更のみを行った。非公開リポジトリの URL は名称付き平文参照、ローカルのガイドへのリンクはリポジトリ相対リンク、未公開 scratch の参照は名称付き平文またはコマンドの引用符付きパス代替表示とし、develop に未収録の公開レビューへのリンクは確認済みの公開コミットを指す。 +- Publication provenance / 公開版の来歴: REV(担当レビュワ)issued this publication version from the unchanged original `2026-11-11_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r2.md` (SHA-256: `17bb7d1968dbe6e6292dd8f0ac346dce9a205511fd79b52bfcb60008685ccf2c`); the original file and scratch evidence remain unchanged, and all text other than this version/provenance metadata and the explicitly stated publication references is verbatim. Quoted scratch command-path placeholders identify retained unpublished evidence and must be replaced with its local location before execution. / REV が上記原本から公開版を発行した。原本と scratch 証跡は未変更で、版・来歴の追記と明示した公開用参照以外の本文は原文どおり。コマンド内の引用符付き scratch パス代替表示は保持された未公開証跡を識別するもので、実行にはそのローカルの場所への置換が必要。 +- Version / 版: 0.1 — 2026-11-11. **Learned:** A short token needs server-side frame rejection, and deletion retries must not remain authorization records. / 短命トークンにはサーバー側のフレーム拒否が必要であり、削除の再試行記録を認可の記録に兼用してはいけない。 +- Applies to / 対象: RCOSDP/RDM-osf.io-dev2027 PR #12, head 2d1b571541d433dfe5416f61d10bc3e951003bfd +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra) +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Companion server review / 対応サーバーのレビュー](2026-11-11_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r1.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and r1 closure + +**Changes requested.** The prior local r1 record was absent; the r1 PR Conversation comment dated 2026-11-10 was read instead. This review compares `aa30a37d` to the requested head and inspects the paired server head `036ad406`. + +| r1 finding | Result | +|---|---| +| R1-01, awareness XSS | Closed. `activeUsers.js:8–23,54–67` validates IDs, constructs local profile links, restricts Gravatar URLs, bounds names, and renders text/attributes through Mithril. The view sanitizes again. | +| R1-02, indefinite established-session access | Partially fixed; remains open. The default is 600 seconds, and renewal rechecks WRITE, registration, provider, checkout, and file ownership. The paired server still accepts an update during expiry closing. | +| R1-03, Quick Files refresh 404 | Closed by source review. `addons/base/views.py:1195` enables `quickfiles_valid=True`; the added test covers owner 200, other user 403, anonymous 401, and component permissions. Full Python integration was not rerun. | + +### Required changes + +**R2-01 / P1 — complete the paired server expiry boundary.** In the paired PR #5, `bin/server.cjs:52–55` sends 4401 but keeps the message listener in `bin/utils.cjs:348`. An adversarial client can withhold its close reply and send a Yjs update after receiving 4401. A real loopback server and two clients independently reproduced the other client's text becoming `AFTER-EXPIRY`. The server must revoke document/awareness access immediately and reject frames during closing, with a regression test. R1-02 cannot be closed by a browser-only expiry/downgrade test. See the companion record, R1-01. + +**R2-02 / P2 — separate stale-room cleanup from permission to renew.** `addons/base/views.py:1159–1176,1219–1224` leaves the old mapping in place if DELETE fails, then accepts every retained mapping for renewal. After a timeout or HTTP 500 while viewing the new version, a still-authorized writer can keep receiving fresh tokens for the superseded room indefinitely if nobody revisits the new version. The deletion-retry test even preserves both mappings. An isolated probe executing the three actual function bodies with mocked external dependencies returned a fresh old-room token after deletion failure. Reject superseded versions independently of remote cleanup, and retain a separate retry record; test failure followed by renewal 404. Cleanup currently runs on a later editable page view, not on the file-version save itself, so the claimed save-time deletion also needs an explicit lifecycle decision. + +### Persistence decision and security boundary + +The proposed policy is file-prefix-only LevelDB persistence, 4 MiB per encoded room and 256 MiB overall, with overflow reverting to memory-only operation. This deliberately permits loss of an unsaved draft when its last client leaves after overflow. The proposed deletion policy closes peers with 4410 and uses in-memory tombstones. Those tombstones disappear on restart. These are design decisions, not verified deployment settings or proof of stakeholder acceptance. + +The server's bounds and deletion race fail independent probes (companion R1-02/R1-03). `Y_WEBSOCKET_INTERNAL_URL` defaults to empty; `addons/wiki/utils.py:101–104` then reports deletion success and forgets the mapping without deleting disk data. A deployment enabling persistence must set a reachable internal URL as well as a durable LevelDB directory and the `file-` prefix. No runtime configuration or Docker stack was inspected or changed. + +The delete credential is minted only in the server-side helper, carries `purpose: delete`, exact `doc_id`, and a 60-second expiry. Normal room credentials cannot call the deletion API. The HTTP endpoint itself is not restricted by source address; refer to the server record. + +### Independent evidence and limits + +```toon +checks[6]{check,result}: + awareness_node_tests,6 passed with Mithril 0.2.0 + token_recovery_node_tests,12 passed + yjs_binding_node_tests,6 passed with Yjs 13.6.18 + malicious_awareness_dom,local href and escaped text; no script execution + failed_delete_renewal_probe,fresh old-room token returned + python_and_full_browser_acceptance,not run +``` + +The DOM probe uses jsdom 26 and Mithril 0.2.0; it observed `/evil1/`, no injected image, literal malicious name text, and no `window.__xss`. jsdom does not implement page navigation. An initial test run without Mithril exercised a defective fallback test double and failed; the installed declared version passed all six tests. + +Reproduce from the scratch `rev-work` directory with its installed dependencies. Expected results are 24 passing Node cases, safe DOM output, and the stale-token failure evidence: + +```sh +node osf/website/static/js/tests/activeUsers.test.cjs +node osf/website/static/js/tests/yWebsocketAuth.test.cjs +node osf/website/static/js/tests/fileEditorYjs.test.cjs +node xss-probe.cjs +python3 renewal-probe.py +``` + +Evidence: DOM probe (REV scratch evidence (not published): `xss-probe.cjs`), renewal probe (REV scratch evidence (not published): `renewal-probe.py`), renewal result (REV scratch evidence (not published): `renewal-probe.log`). The renewal probe is not an HTTP/Django integration test. Source was cloned only into scratch; no commit, push, approval, merge, or issue closure was performed. Used by: the companion review and the coordinator's integration decision. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と r1 の解消状況 + +**changes requested(要修正)。** 指定された前回のローカル記録が存在しなかったため、2026-11-10 の r1 PR コメントを読んだ。`aa30a37d` と指定 head の差分、および対応サーバー `036ad406` を確認した。 + +| r1 指摘 | 結果 | +|---|---| +| R1-01、awareness の XSS | 解消。`activeUsers.js:8–23,54–67` は ID を検証し、ローカルのプロフィールパスを作り、Gravatar URL と名前の長さを制限し、Mithril のテキスト・属性として描画する。描画時にも再検証する。 | +| R1-02、接続中セッションの無期限アクセス | 部分修正、未解消。既定600秒となり、更新時に WRITE、登録、プロバイダ、チェックアウト、ファイルの所属を再確認する。ただし対応サーバーは期限切断の途中でも更新を受理する。 | +| R1-03、Quick Files の更新404 | ソース上解消。`addons/base/views.py:1195` が `quickfiles_valid=True` を指定。追加試験は所有者200、他人403、匿名401とコンポーネントの権限を扱う。Python統合試験は再実行していない。 | + +### 必要な修正 + +**R2-01 / P1 — 対応サーバーの期限切断を完成させる。** 対応PR #5 の `bin/server.cjs:52–55` は4401を送るが、`bin/utils.cjs:348` のメッセージ受信は残る。改造クライアントが切断応答を返さず、4401受信後にYjs更新を送ると、別クライアントの本文が `AFTER-EXPIRY` になることを実サーバーと2クライアントで独立再現した。文書・awarenessへのアクセスを即座に失効させ、切断中のフレームを拒否する回帰試験が必要。通常ブラウザの期限・降格試験だけではR1-02を解消できない。対応サーバー記録のR1-01を参照。 + +**R2-02 / P2 — 旧部屋の掃除とトークン更新の認可を分ける。** `addons/base/views.py:1159–1176,1219–1224` はDELETE失敗時に旧対応表を残し、その全項目を更新時に許可する。新版表示中のタイムアウトやHTTP 500の後、新版を誰も再表示しなければ、WRITEを持つ利用者は置換済みの部屋のトークンを繰り返し更新できる。削除再試行の試験も新旧両方の対応を残している。実際の3関数の本体を外部依存の代役で実行した独立試験でも、削除失敗後に旧部屋の新規トークンが返った。遠隔削除の成否と独立に旧版を拒否し、再試行記録を別管理し、失敗後の更新404を試験する必要がある。掃除の契機は版保存自体ではなく後続の編集可能なページ表示なので、保存時削除という説明についてもライフサイクルを明確にする必要がある。 + +### 永続化の判断と安全性の境界 + +提案は、ファイル接頭辞だけのLevelDB永続化、部屋の符号化状態4 MiB、全体256 MiB、超過時はメモリのみへ切り替える方針。超過後に最後の接続が離れると未保存下書きが失われることを許容する設計となる。削除は4410とメモリ上の削除済み記録を使い、この記録は再起動で消える。これらは設計方針であり、配備設定や関係者の受容を検証したものではない。 + +対応サーバーの上限と削除競合は独立試験で問題が出た(対応記録R1-02/R1-03)。`Y_WEBSOCKET_INTERNAL_URL` の既定は空で、`addons/wiki/utils.py:101–104` はその場合にディスク削除なしで成功扱いして対応表を忘れる。永続化を有効にする配備では、到達可能な内部URL、永続的なLevelDBの場所、`file-` 接頭辞を設定する必要がある。runtime設定とDockerスタックにはアクセスも変更もしていない。 + +削除用資格情報はサーバー側のヘルパーだけで発行し、`purpose: delete`、正確な `doc_id`、60秒の期限を持つ。通常の部屋用資格情報では削除できない。ただしHTTPエンドポイント自体には接続元アドレスの制限がない。詳細はサーバー記録を参照。 + +### 独立検証と限界 + +```toon +checks[6]{check,result}: + awareness_Node試験,Mithril 0.2.0で6件成功 + トークン回復_Node試験,12件成功 + Yjs結合_Node試験,Yjs 13.6.18で6件成功 + 悪意あるawareness_DOM,ローカルhrefとエスケープ済み文字列; スクリプト実行なし + 削除失敗後の更新試験,旧部屋の新規トークンを返した + Pythonと全体ブラウザ受入,未実行 +``` + +DOM試験はjsdom 26とMithril 0.2.0を使用し、`/evil1/`、注入画像なし、攻撃文字列の文字としての表示、`window.__xss` 未設定を確認した。jsdomはページ遷移を実装していない。最初のMithril未導入時は試験の代役実装に不備があり失敗したが、指定バージョン導入後は6件とも通った。 + +依存を導入したscratchの `rev-work` ディレクトリで再現する。期待結果はNode 24件成功、安全なDOM出力、旧トークン更新問題の出力。 + +```sh +node osf/website/static/js/tests/activeUsers.test.cjs +node osf/website/static/js/tests/yWebsocketAuth.test.cjs +node osf/website/static/js/tests/fileEditorYjs.test.cjs +node xss-probe.cjs +python3 renewal-probe.py +``` + +証跡: DOM試験 (REV scratch evidence (not published): `xss-probe.cjs`)、更新試験 (REV scratch evidence (not published): `renewal-probe.py`)、更新結果 (REV scratch evidence (not published): `renewal-probe.log`)。更新試験はHTTP/Django統合試験ではない。ソースはscratch内だけにcloneし、commit、push、approve、merge、Issue closeは行っていない。Used by: 対応サーバーのレビューおよび調整者の統合判断。 diff --git a/docs/reviews/2026-11-11_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r3.md b/docs/reviews/2026-11-11_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r3.md new file mode 100644 index 0000000..de6eb44 --- /dev/null +++ b/docs/reviews/2026-11-11_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r3.md @@ -0,0 +1,99 @@ +# REV PR12 File editor Yjs review r3 / ファイル編集 Yjs レビュー r3 + +> **Summary:** Changes requested. Stale-room authorization is fixed, but requests for pending old rooms skip deletion retries. +> **概要:** 要修正。旧部屋の認可は修正済みだが、削除待ちの旧部屋の要求では削除を再試行しない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only what publication requires: private-repository URLs become named plain-text references; local guide links become repository-relative links; unpublished scratch references become named plain text or quoted command-path placeholders; public review links absent from develop point to the reviewed public commit. / REV が公開に必要な変更のみを行った。非公開リポジトリの URL は名称付き平文参照、ローカルのガイドへのリンクはリポジトリ相対リンク、未公開 scratch の参照は名称付き平文またはコマンドの引用符付きパス代替表示とし、develop に未収録の公開レビューへのリンクは確認済みの公開コミットを指す。 +- Publication provenance / 公開版の来歴: REV(担当レビュワ)issued this publication version from the unchanged original `2026-11-11_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r3.md` (SHA-256: `511547693a08e145030ce28fdf39e0b190091beaf3ed735bc112495056b99645`); the original file and scratch evidence remain unchanged, and all text other than this version/provenance metadata and the explicitly stated publication references is verbatim. Quoted scratch command-path placeholders identify retained unpublished evidence and must be replaced with its local location before execution. / REV が上記原本から公開版を発行した。原本と scratch 証跡は未変更で、版・来歴の追記と明示した公開用参照以外の本文は原文どおり。コマンド内の引用符付き scratch パス代替表示は保持された未公開証跡を識別するもので、実行にはそのローカルの場所への置換が必要。 +- Version / 版: 0.1 — 2026-11-11. **Learned:** A fail-closed renewal path still needs to reach pending cleanup. / 更新を安全に拒否する経路にも、削除待ちを処理する機会が必要。 +- Applies to / 対象: RCOSDP/RDM-osf.io-dev2027 PR #12, head 10004e676099098944c66d0a54f51cdf34b97e50 +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra) +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Prior review / 前回レビュー](2026-11-11_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r2.md) · [Paired review / 対応レビュー](2026-11-11_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r2.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Changes requested.** Reviewed exact head `10004e676099098944c66d0a54f51cdf34b97e50` against `2d1b5715`. R2-01 (paired server expiry) is closed by the independent socket probe against server `67aae1d7`. R2-02's authorization defect is fixed: superseded mappings do not issue tokens even when remote deletion fails, and a newer stored version causes the old room's renewal to return 404 without opening the new page. Cleanup retry still has a gap. + +### R3-01 / P2 — retry a known pending deletion before rejecting its renewal + +`addons/base/views.py:1241–1242` rejects a room already moved into `superseded:` before reaching `supersede_file_editor_docs` at line 1249. After a new version is saved, the first old-room renewal attempts DELETE, stores the pending marker on failure, and returns 404. If deletion becomes available again, every later old-room renewal still returns 404 but never attempts DELETE. When no one opens the new page or renews its current room, the retired persisted draft remains indefinitely. This contradicts the helper's promise to retry on every renewal. + +An isolated probe executing seven actual function bodies observed one failed deletion, then **zero additional DELETE calls and one pending entry** after retrying the old room with deletion restored. Opening the new page did delete it; renewal of a current room also retries successfully. Keep the old-room 404, but route known pending rooms through cleanup after permission/file checks, or provide another reliable retry mechanism. Add a regression that restores deletion and repeats only the old-room request. + +### Verified behavior and limits + +`superseded:` entries are excluded from renewable IDs. The probe confirms no new token after a failed DELETE, a 404 on the first renewal after a new version exists without a page view, successful cleanup on a new page, and successful cleanup on current-room renewal. The save-related behavior is **renewal denial based on the stored latest version**. There is no save hook in this change: an established socket is closed by DELETE on the next applicable view/renewal, or by its token's expiry (default 600 seconds). The probe models the stored version using a dependency double; it is not a real WaterButler save. + +```toon +checks[5]{check,result}: + actual_function_probe,old-room renewal 404 on failed deletion and after new stored version + pending_old_room_retry,404 but zero additional DELETE calls; pending entry remains + new_page_and_current_renewal_retry,each retries and clears pending deletion + Node_tests,24 passed; awareness 6 and auth recovery 12 and Yjs binding 6 + full_Python_HTTP_and_browser_acceptance,not run +``` + +Run from scratch `rev-followup`: + +```sh +python3 renewal-probe.py +node osf/website/static/js/tests/activeUsers.test.cjs +node osf/website/static/js/tests/yWebsocketAuth.test.cjs +node osf/website/static/js/tests/fileEditorYjs.test.cjs +``` + +Expected: the probe prints successful authorization checks plus the zero-retry counterexample, and all 24 Node cases pass. The probe intentionally reports that counterexample without a failing exit code. Evidence: actual-function probe (REV scratch evidence (not published): `renewal-probe.py`), probe results (REV scratch evidence (not published): `renewal-probe.log`), Node test results (REV scratch evidence (not published): `osf-node-tests.log`). Python 3.15.2 was used only for extracted functions with mocked external dependencies; application decorators, database persistence, and HTTP integration were not executed. Source review confirms the added application tests, but the author's 31-test claim was not independently rerun. + +The paired server still fails aggregate quota enforcement under queued writes (its R2-01). Previous deployment qualifications remain: internal deletion URL, durable persistence and prefix must be configured; no runtime/.env or Docker state was inspected. Only scratch artifacts and one PR conversation comment were written; no commit, push, approval, merge, or close. Used by: the paired server review and the coordinator's integration decision. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**changes requested(要修正)。** 正確なhead `10004e676099098944c66d0a54f51cdf34b97e50` を `2d1b5715` と比較した。R2-01(対応サーバーの期限失効)はサーバー `67aae1d7` への独立ソケット試験で解消。R2-02の認可問題も修正済み。遠隔削除が失敗しても置換済みの対応表からトークンは出ず、新版保存後は新版ページを開かなくても旧部屋の更新が404になる。ただし削除再試行には抜けが残る。 + +### R3-01 / P2 — 既知の削除待ち部屋は更新を拒否する前に削除を再試行する + +`addons/base/views.py:1241–1242` は `superseded:` に移動済みの部屋を、1249行の `supersede_file_editor_docs` より前に拒否する。新版保存後の最初の旧部屋の更新ではDELETEを試み、失敗すると削除待ちを保存して404を返す。削除先が復旧しても、次からの旧部屋の更新は404だけでDELETEを試さない。誰も新版ページを開かず現行部屋も更新しなければ、退役した永続下書きが無期限に残る。これはヘルパーが説明する「更新要求ごとの再試行」と一致しない。 + +実際の7関数の本体を実行する分離試験で、1回の削除失敗後に削除先を復旧して旧部屋を再要求すると、**追加DELETE 0回、削除待ち1件** だった。新版ページを開くと削除でき、現行部屋の更新でも再試行は成功した。旧部屋の404は維持し、権限とファイルを検査した後で既知の削除待ち部屋を掃除へ通すか、別の確実な再試行手段を用意する必要がある。削除先復旧後に旧部屋だけを再要求する回帰試験を追加すること。 + +### 確認した挙動と限界 + +`superseded:` の項目は更新可能なIDから除外される。削除失敗後の新規トークン非発行、新版ページ未表示でも新しい保存済み版があれば最初の更新で404、新版表示時の掃除、現行部屋更新時の掃除を確認した。保存に関する挙動は **保存済みの最新版を基準にした更新拒否**。この変更には保存時の呼出し処理はなく、既存ソケットの切断は次の対象ページ表示・更新時のDELETE、またはトークン期限(既定600秒)で起きる。試験は保存済み版を代役で表しており、実際のWaterButler保存ではない。 + +```toon +checks[5]{check,result}: + 実関数の分離試験,削除失敗時も新版保存後も旧部屋の更新404 + 削除待ち旧部屋の再要求,404だが追加DELETEは0回; 削除待ちが残る + 新版表示と現行部屋更新の再試行,それぞれ削除を再試行し待ち記録を除去 + Node試験,24件成功; awareness 6件と認証回復12件とYjs結合6件 + 全体Python_HTTPとブラウザ受入,未実行 +``` + +scratchの `rev-followup` で実行する。 + +```sh +python3 renewal-probe.py +node osf/website/static/js/tests/activeUsers.test.cjs +node osf/website/static/js/tests/yWebsocketAuth.test.cjs +node osf/website/static/js/tests/fileEditorYjs.test.cjs +``` + +期待結果は、分離試験が認可検査の成功と再試行0回の反例を表示し、Node全24件が通ること。分離試験は反例を表示するだけで異常終了はしない。証跡: 実関数の試験 (REV scratch evidence (not published): `renewal-probe.py`)、結果 (REV scratch evidence (not published): `renewal-probe.log`)、Node結果 (REV scratch evidence (not published): `osf-node-tests.log`)。Python 3.15.2で外部依存を代役にした抽出関数のみを実行し、アプリケーションのデコレーター、DBへの保存、HTTP連携は実行していない。追加されたアプリ試験はソース確認済みだが、作者による31件成功の主張は独立再実行していない。 + +対応サーバーの全体容量制限は待機中書込みでなお失敗する(同レビューR2-01)。前回の配備条件も残り、削除用内部URL、永続保存先、接頭辞の設定が必要。runtime/.envとDockerの状態は未確認・未操作。書込みはscratch資料とPR会話コメント1件のみで、commit、push、approve、merge、closeはなし。Used by: 対応サーバーレビューと調整者の統合判断。 diff --git a/docs/reviews/2026-11-11_RDM-osf.io-dev2027_PR13_Django22_r2.md b/docs/reviews/2026-11-11_RDM-osf.io-dev2027_PR13_Django22_r2.md new file mode 100644 index 0000000..8d27a72 --- /dev/null +++ b/docs/reviews/2026-11-11_RDM-osf.io-dev2027_PR13_Django22_r2.md @@ -0,0 +1,128 @@ +# REV-PR13-r2 Django 2.2 authentication review / Django 2.2 認証レビュー + +> **Summary:** Pass for the three R1/R2 follow-up commits at f39e1516. All custom authentication classes were inventoried; migration integration with PR #8 remains a separate condition. +> **概要:** f39e1516 の R1/R2 対応3コミットを pass と判定する。独自認証クラスを全件確認した。PR #8 との migration 統合は別の条件として残る。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only what publication requires: private-repository URLs become named plain-text references; local guide links become repository-relative links; unpublished scratch references become named plain text or quoted command-path placeholders; public review links absent from develop point to the reviewed public commit. / REV が公開に必要な変更のみを行った。非公開リポジトリの URL は名称付き平文参照、ローカルのガイドへのリンクはリポジトリ相対リンク、未公開 scratch の参照は名称付き平文またはコマンドの引用符付きパス代替表示とし、develop に未収録の公開レビューへのリンクは確認済みの公開コミットを指す。 +- Publication provenance / 公開版の来歴: REV(担当レビュワ)issued this publication version from the unchanged original `2026-11-11_RDM-osf.io-dev2027_PR13_Django22_r2.md` (SHA-256: `e0ad55d61e62c523a799018640c46e84132de93c09cde98993a8721b648a7a1b`); the original file and scratch evidence remain unchanged, and all text other than this version/provenance metadata and the explicitly stated publication references is verbatim. Quoted scratch command-path placeholders identify retained unpublished evidence and must be replaced with its local location before execution. / REV が上記原本から公開版を発行した。原本と scratch 証跡は未変更で、版・来歴の追記と明示した公開用参照以外の本文は原文どおり。コマンド内の引用符付き scratch パス代替表示は保持された未公開証跡を識別するもので、実行にはそのローカルの場所への置換が必要。 +- Version / 版: 0.1 — 2026-11-11. **Learned:** Backend signatures and response-cookie generation need their own regression checks even when the wider suite is green. / 全体試験が成功していても、認証バックエンドの引数と応答Cookie生成には専用の回帰確認が必要だと分かった。 +- Applies to / 対象: RCOSDP/RDM-osf.io-dev2027 PR #13, head `f39e151689dc5469be664f05f5bf8b259a430d51`; commits `4e435a8d`, `7cc36cb2`, `f39e1516`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related / 関連: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · r1 PR conversation snapshot / r1コメント記録 (REV scratch evidence (not published): `pr13.json`). +- Used by / 利用先: PR #13 integration review, coordinator task `task_2b66986ccd82`. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and closure + +**Pass for this round's R1/R2 scope. No new blocking regression found.** This verdict is a review comment, not a GitHub approval or permission to merge. The requested r1 file was absent, so the r1 comment `6763600948` was read from the PR conversation. + +R1 is closed. ODMBackend (REV scratch evidence (not published): `api/base/authentication/backends.py`) now accepts `(request=None, username=None, password=None, **kwargs)` and rejects missing credentials before calling the existing identity lookup. LoginView (REV scratch evidence (not published): `admin/common_auth/views.py`) passes the actual request. The guardian adapter accepts the same signature and always returns `None`, retaining its parent's object-permission implementation. Existing ODM session backend identifiers remain unchanged. Guardian was not a successful login backend, so changing its configured dotted path does not invalidate a legitimate guardian-authenticated session. + +R2 is closed. Django defaults (REV scratch evidence (not published): `api/base/settings/defaults.py`) explicitly set session and CSRF SameSite to `Lax`; admin inherits them. Both settings loaders validate after their own local overrides. The Flask `osf` cookie policy is unchanged. Django 2.2.28's actual session middleware successfully creates, refreshes and deletes a Lax cookie in the isolated probe; the old string `'None'` raises `ValueError`. Python `None` omits the attribute. The guard deliberately permits only canonical `None`, `Lax`, and `Strict`, which is stricter than Django's handling of lowercase strings and empty values. + +### Complete authentication inventory + +Repository-wide searches for `AUTHENTICATION_BACKENDS` and `def authenticate(` found one production backend tuple, inherited by admin, and the following definitions. DRF (the API framework) calls its classes with a request alone; these classes do not use Django's credential dispatcher. + +```toon +authentication_definitions[7]{location,name,contract,result}: + api/base/authentication/backends.py:9,ODMBackend,Django request plus credentials,fixed + api/base/authentication/backends.py:33,ObjectPermissionBackend,Django request plus credentials,fixed + api/base/authentication/drf.py:118,OSFSessionAuthentication,DRF request,compatible unchanged + api/base/authentication/drf.py:161,OSFBasicAuthentication,DRF request,compatible unchanged + api/base/authentication/drf.py:273,OSFCASAuthentication,DRF request,compatible unchanged + api/institutions/authentication.py:80,InstitutionAuthentication,DRF request,compatible unchanged + framework/auth/__init__.py:28,authenticate,Flask helper rather than backend,unaffected +``` + +No other custom Django backend was found. The guardian adapter inherits `has_perm` and `get_all_permissions` without replacement. DRF Basic authentication still forwards its request to credential checking, and its two-factor and failure-limit paths are untouched by these commits. + +### Verification and limits + +The added test module (REV scratch evidence (not published): `admin_tests/common_auth/test_django22_auth_http.py`) defines 17 parameterized cases. Its HTTP tests use the real admin URL configuration, configured backends, database-backed OSF user factory, and SessionMiddleware without mocking `authenticate`. They cover successful `/account/login/` and `/admin/login/`, backend identity in the session, wrong passwords, unknown account-login users, account logout, Lax, and HttpOnly. Signature and settings tests cover both configured backends and the guard. `tasks.test_api1` includes all `admin_tests`, so these tests belong to `api1_and_js`. + +Read-only GitHub checks confirmed success for the exact head in push run `42791740785` and PR run `42791750416`: build and all five test shards passed; CodeQL run `42791750768` also passed. Retrieved api1 job logs stop at webpack startup and contain no per-test summary. Therefore neither a fresh local run of the repository's 17 cases nor their individual CI outcomes/counts is claimed. + +The separate boundary probe (REV scratch evidence (not published): `boundary_probe.py`), using Python 3.9.6, Django 2.2.28 and guardian 1.5.1, passed **7/7 tests** (output (REV scratch evidence (not published): `boundary-probe.log`)). It executes the repository backend class definitions with a fixture identity lookup, real Django dispatch, and real SessionMiddleware over signed-cookie sessions. Database lookup and last-login persistence are stubbed. Negative controls reproduce the old signature being skipped and the old SameSite string failing. This is framework-boundary evidence, not an OSF application or deployment test. The initial probe needed its fixture's last-login save stubbed because no database was configured; after that harness correction all seven passed. + +To repeat the probe, run from its scratch directory; expected output is `Ran 7 tests` and `OK`: + +```sh +cd "<REV scratch directory (not published): rev-pr13>" +probe-venv/bin/python boundary_probe.py +``` + +Nonblocking coverage improvements: Django `Client()` does not enforce CSRF by default, despite including the middleware; these tests do not prove CSRF rejection. The new repository tests do not explicitly assert logout's deletion-cookie attributes or Secure, and do not exercise Shibboleth's HTTP login path. These are not grounds to reopen R1/R2: the identified dispatch and shared cookie-generation failures are covered. No production Docker, real database, browser SameSite, or full application rerun was performed. No runtime or `.env` was read, and no repository code was changed. + +### PR #8 integration condition + +PR #8 was inspected at `d70afee7ddf384ffe8150a299546f111e7d2ff9a`, with common base `8fc45de461fde227dc60c30a47139a61d6209a26`. A read-only three-tree comparison completed with **zero conflict markers** (preview (REV scratch evidence (not published): `merge-preview.txt`)); no branch merge or commit was made. + +The overlapping auth changes compose: preserve #8's `AdminLoginRequiredMiddleware` after authentication/messages middleware and its public login/Shibboleth/logout decorators, while preserving #13's removal of `SessionAuthenticationMiddleware` and class-based password-change views. Preserve both #13's bytes-to-text cookie decoding and #8's expiry/inactive-user checks in `OSFUser.from_cookie`. #8's DRF session expiry check already receives a text ID from `ensure_str`. + +**R1-review R3 remains an integration condition:** the combined migration graph has two leaves, `0276_django22_builtin_view_permissions` and `0276_merge_20261102_1312`; a merge migration depending on both is required. Existing-user/group permission migration through Django auth 0011 and effective proxy permissions still need verification on an upgraded 1.11 database. Neither condition is resolved by the three follow-up commits. Run the combined admin login/logout and #8 inactive-session tests after integration; a clean text comparison does not prove combined runtime behavior. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘の解消 + +**今回の R1/R2 範囲は pass。新たな阻害的回帰は見つからなかった。** これはレビューコメントとしての判定で、GitHub の approve やマージ許可ではない。指定の r1 記録ファイルは存在しなかったため、PR会話の r1 コメント `6763600948` を読んだ。 + +R1 は解消。ODMBackend (REV scratch evidence (not published): `api/base/authentication/backends.py`) は `(request=None, username=None, password=None, **kwargs)` を受け取り、資格情報の欠落を既存の利用者検索より先に拒否する。LoginView (REV scratch evidence (not published): `admin/common_auth/views.py`) は実際の request を渡す。guardian のアダプターも同じ引数を受け、常に `None` を返し、親のオブジェクト権限実装を継承する。ODM の既存セッションに保存するバックエンド名は変わらない。guardian はログインを成立させるバックエンドではないため、その設定上の名前変更で正当な guardian ログインセッションを失効させることもない。 + +R2 は解消。Django の既定設定 (REV scratch evidence (not published): `api/base/settings/defaults.py`) はセッションとCSRFの SameSite を `Lax` と明示し、admin も継承する。両設定ローダーは、それぞれのローカル上書き後に値を検査する。Flask の `osf` Cookie方針は変わらない。独立確認では、Django 2.2.28 の実際の SessionMiddleware が Lax Cookie を作成・更新・削除でき、以前の文字列 `'None'` は `ValueError` になった。Python の `None` は属性を省略する。ガードは正規表記の `None`、`Lax`、`Strict` だけを認めるため、小文字や空値に対するDjango自身の扱いより厳しい。 + +### 認証定義の全件確認 + +リポジトリ全体で `AUTHENTICATION_BACKENDS` と `def authenticate(` を検索した。本番のバックエンド設定は1組で、admin も継承する。定義は次の7件だった。DRF(APIの枠組み)のクラスは request だけを受け取り、Djangoの資格情報ディスパッチを通らない。 + +```toon +authentication_definitions[7]{location,name,contract,result}: + api/base/authentication/backends.py:9,ODMBackend,Django requestと資格情報,修正済み + api/base/authentication/backends.py:33,ObjectPermissionBackend,Django requestと資格情報,修正済み + api/base/authentication/drf.py:118,OSFSessionAuthentication,DRF request,互換性あり変更なし + api/base/authentication/drf.py:161,OSFBasicAuthentication,DRF request,互換性あり変更なし + api/base/authentication/drf.py:273,OSFCASAuthentication,DRF request,互換性あり変更なし + api/institutions/authentication.py:80,InstitutionAuthentication,DRF request,互換性あり変更なし + framework/auth/__init__.py:28,authenticate,バックエンドではなくFlask補助関数,影響なし +``` + +ほかの独自Djangoバックエンドは見つからなかった。guardian アダプターの `has_perm` と `get_all_permissions` は親からそのまま継承される。DRF Basic認証は引き続きrequestを資格情報検証へ渡し、二要素認証と失敗回数制限の経路は今回の3コミットで変更されていない。 + +### 検証と限界 + +追加試験 (REV scratch evidence (not published): `admin_tests/common_auth/test_django22_auth_http.py`) はパラメーター展開後17ケースを定義する。HTTP試験は実際のadmin URL設定、設定されたバックエンド、DBを使うOSF利用者ファクトリー、SessionMiddlewareを通り、`authenticate` はモックしない。`/account/login/` と `/admin/login/` の成功、セッション内のバックエンド識別、誤パスワード、accountログインの未知利用者、accountログアウト、Lax、HttpOnlyを確認する。引数と設定の試験は両バックエンドとガードを対象にする。`tasks.test_api1` は `admin_tests` 全体を含むため、この試験も `api1_and_js` の対象になる。 + +GitHubを読み取り、指定headのpush実行 `42791740785` とPR実行 `42791750416` でビルドと5分割の試験がすべて成功し、CodeQL実行 `42791750768` も成功したことを確認した。取得したapi1ジョブログはwebpack開始で終わり、個別試験の集計がない。したがって、リポジトリの17ケースをローカルで再実行したとも、CIで個別の結果・件数を確認したとも記録しない。 + +別の境界確認スクリプト (REV scratch evidence (not published): `boundary_probe.py`)を Python 3.9.6、Django 2.2.28、guardian 1.5.1 で実行し、**7/7成功**した(出力 (REV scratch evidence (not published): `boundary-probe.log`))。リポジトリのバックエンドクラス定義を、利用者検索の固定データ、実際のDjangoディスパッチ、署名Cookieセッション上の実際のSessionMiddlewareと組み合わせて実行した。DB検索と最終ログイン保存は代替処理である。負の対照では旧署名のスキップと旧SameSite文字列の失敗を再現した。これは枠組みの境界確認で、OSFアプリや配備試験ではない。最初はDBを設定していないため固定利用者の最終ログイン保存でエラーになったが、確認用の保存処理を代替した後は7件とも成功した。 + +再現する場合は次をscratch内で実行する。期待結果は `Ran 7 tests` と `OK`。 + +```sh +cd "<REV scratch directory (not published): rev-pr13>" +probe-venv/bin/python boundary_probe.py +``` + +非阻害の試験改善点として、Djangoの `Client()` は既定ではCSRF検証を強制しないため、middlewareを含んでいてもCSRF拒否の証明にはならない。追加されたリポジトリ試験はログアウトの削除Cookie属性やSecureを明示検査せず、ShibbolethのHTTPログインも通さない。ただし、指摘済みのディスパッチと共通Cookie生成の不具合は覆っており、R1/R2を再開する理由にはしない。本番Docker、実DB、ブラウザーのSameSite動作、アプリ全体の再実行は未実施。runtimeと `.env` は読まず、リポジトリのコードも変更していない。 + +### PR #8 統合条件 + +PR #8 は `d70afee7ddf384ffe8150a299546f111e7d2ff9a`、共通基点は `8fc45de461fde227dc60c30a47139a61d6209a26` で確認した。読み取り専用の3ツリー比較は完了し、**競合マーカー0件**だった(比較出力 (REV scratch evidence (not published): `merge-preview.txt`))。ブランチのマージやコミットは行っていない。 + +重なる認証変更は両立する。#8の `AdminLoginRequiredMiddleware` を認証・messages middlewareの後に保ち、ログイン・Shibboleth・ログアウトの公開指定も残す。同時に、#13による `SessionAuthenticationMiddleware` の削除とパスワード変更のクラス型ビュー化を残す。`OSFUser.from_cookie` は、#13のbytesから文字列への変換と、#8の期限・無効利用者チェックの両方を残す。#8のDRFセッション期限検査は既存の `ensure_str` により文字列IDを受け取る。 + +**r1レビューのR3は統合条件として継続する。** 統合後のmigrationには `0276_django22_builtin_view_permissions` と `0276_merge_20261102_1312` の2葉ができるため、両方に依存するmerge migrationが必要である。既存の利用者・グループ権限を持つ1.11 DBからDjango auth 0011を通した移行とproxyの実効権限確認も必要である。この2点は今回の3コミットでは解消しない。統合後にadminログイン・ログアウトと#8の無効セッション試験を再実行すること。文字列上の競合がないことだけでは、統合後の実行時動作は証明できない。 diff --git a/docs/reviews/2026-11-11_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r5.md b/docs/reviews/2026-11-11_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r5.md new file mode 100644 index 0000000..007613a --- /dev/null +++ b/docs/reviews/2026-11-11_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r5.md @@ -0,0 +1,150 @@ +# REV-PR8-R5 Mandatory authentication review / 認証必須化レビュー + +> **Summary:** R4-01 and N1 are resolved, but the new fixture cleanup misses sessions created by renewal. The verdict is changes requested for test isolation, with no production-code regression found in the reviewed change. +> **概要:** R4-01 と N1 は解消しましたが、新しい fixture の後始末は更新時に作るセッションを削除しません。試験の独立性について変更要求とし、確認した差分に製品コードの回帰はありません。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only what publication requires: private-repository URLs become named plain-text references; local guide links become repository-relative links; unpublished scratch references become named plain text or quoted command-path placeholders; public review links absent from develop point to the reviewed public commit. / REV が公開に必要な変更のみを行った。非公開リポジトリの URL は名称付き平文参照、ローカルのガイドへのリンクはリポジトリ相対リンク、未公開 scratch の参照は名称付き平文またはコマンドの引用符付きパス代替表示とし、develop に未収録の公開レビューへのリンクは確認済みの公開コミットを指す。 +- Publication provenance / 公開版の来歴: REV(担当レビュワ)issued this publication version from the unchanged original `2026-11-11_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r5.md` (SHA-256: `ff6b6e804c876b1facbdd4ed326d631b427637c9881ed22566a1c7dbc90b4130`); the original file and scratch evidence remain unchanged, and all text other than this version/provenance metadata and the explicitly stated publication references is verbatim. Quoted scratch command-path placeholders identify retained unpublished evidence and must be replaced with its local location before execution. / REV が上記原本から公開版を発行した。原本と scratch 証跡は未変更で、版・来歴の追記と明示した公開用参照以外の本文は原文どおり。コマンド内の引用符付き scratch パス代替表示は保持された未公開証跡を識別するもので、実行にはそのローカルの場所への置換が必要。 +- Version / 版: 0.1 — 2026-11-11. **Learned:** Deleting the original session and its user does not remove replacement sessions whose user identity is stored only in JSON. / 初期セッションと利用者を削除しても、利用者識別子を JSON にだけ持つ更新後セッションは消えないことが分かりました。 +- Applies to / 対象: RCOSDP/RDM-osf.io-dev2027 PR #8, changes after `d70afee7ddf384ffe8150a299546f111e7d2ff9a` through `163aba5a0f0276f34139ee5d9a3257daf7e347da`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related / 関連: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · r4 review / r4 レビュー (RDM-osf.io-dev2027 PR #8, comment 6794545066). +- Used by / 利用先: PR #8 coordinator and follow-up fixture correction / PR #8 の連携調整担当と fixture の追加修正。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Changes requested.** R4-01 and the N1 recommendation are closed. R5-01 remains: the fixture (the setup and cleanup used by tests) removes the initial session but leaves a replacement session behind. This is an incomplete repair of pre-existing test-data leakage, not evidence of a new production authentication bypass. + +The reviewed range contains one commit and three test files, with 25 added and 3 removed lines. No production or workflow file changed. Review used a separate scratch clone, GitHub reads, source inspection, and execution of extracted functions with simulated dependencies. No application HTTP, database, or Elasticsearch integration test was rerun. No Docker operation, runtime directory or environment-file access, commit, push, approval, merge, or close was performed. + +### R5-01 — P2: delete renewal sessions during teardown + +**Location:** `api_tests/base/test_session_expiry_http.py:77–82`. + +The new loop deletes only the objects represented by `session`, `project`, and `owner`. Both HTTP test families call `owner.get_or_create_cookie()` in their `renewed` and `old_after_renewal` cases. At `osf/models/user.py:1972–1985`, that method finds the expired session and saves a **new** `Session`; it does not replace the fixture's `session` variable. + +`osf/models/session.py:5–6` stores the user identifier in `data`, a JSON field (structured text), rather than a foreign key (a database link that can arrange related deletion). Deleting `owner` through `models.Model.delete` therefore does not delete the newly created session. The reviewed code has no user-deletion signal that supplies this cleanup. The new loop can remove the initial session, project, and user while leaving an orphan session containing the old user's identifier and name. + +The probe executed the actual extracted `get_or_create_cookie` method and actual cleanup loop with an in-memory model stand-in. Fresh and already-deleted cases left no sessions; each renewal case left one. This is a source-backed reproduction of the cleanup logic, not a claim to have rerun the application's database stack. The author's statement that no new residual rows remain is not supported for these renewal rows. + +Persistent rows undermine isolation in the shared test database. For example, `osf_tests/test_session.py:24–31` asserts the total session count after adding two sessions, so running it against such residual rows can make the result depend on test order. This does not claim that the current green CI run failed or used that order. + +**Requested correction:** Before deleting the owner, delete every session whose `data__auth_user_id` equals the fixture owner's saved identifier. Retain deletion by the initial session's primary key as well: the `missing_user` case changes the identifier in its JSON. Keep the already-deleted-session tolerance and server shutdown before row deletion. Verify all 18 HTTP cases and assert after teardown that the original row, all renewal rows for that owner, the project, and the owner are absent. Include a following session-count check in the same database. + +### Closed findings and regression checks + +**R4-01:** `tests/nii/test_search_api2.py:216–226` follows the returned users link using the same caller's authentication and checks exact equality with `{user._id}`, plus explicit exclusion of both unrelated users. Parsing the link preserves its path and encoded query. Existing summary counts and other category/link assertions remain. + +The actual extracted old and new test methods were run with simulated responses. The summary still reported one user in every case. The old method accepted all responses because it never requested the user list. The new method accepted the caller alone and rejected one unrelated user, the caller plus both unrelated users, and an empty list. This independently confirms that the assertion catches the R4-01 failure shape. The author's separate production-code mutation is recorded in the response to r4 (RDM-osf.io-dev2027 PR #8, comment 6795434539); it was not rerun here. + +**N1:** Both `test_normalize_all` rebuild calls now pass `user_pattern=del_func is _del_user` at lines 764–767 and 780–783. The wrapper forwards keyword arguments in both its rebuild/retry and direct-execution paths. The outsider check therefore runs for the user patterns in both normalization directions, while the shared-user positive check remains. In `test_normalize_user_ongoing_job_school:1410–1426`, the reverse branch now checks the default outsider before checking shared user `user5`; it mirrors the existing forward branch and retains the six profile-field checks. These paths were inspected and their changed call structure checked with AST (Python's parsed source structure). + +**Fixture improvements retained:** The UUID username avoids the factory's repeated random-email problem. The cleanup shuts down and joins all servers before deleting rows, and tolerates the original session already being deleted. The defect is the missing replacement sessions, not the unique username or shutdown order. + +### Evidence and limits + +The following is an observation record, not a canonical configuration. + +```toon +review: + base: d70afee7ddf384ffe8150a299546f111e7d2ff9a + head: 163aba5a0f0276f34139ee5d9a3257daf7e347da + commits: 1 + changed_files: 3 + github_checks_success: 14 + github_checks_total: 14 + syntax_files_passed: 3 + diff_check: passed + old_summary_response_cases_accepted: 4 + new_summary_valid_case_accepted: 1 + new_summary_invalid_cases_rejected: 3 + renewal_cleanup_cases_with_one_residual_session: 2 + fresh_and_deleted_cleanup_cases_without_residual_sessions: 2 +``` + +GitHub confirms 14/14 successful checks on the reviewed head: two CodeQL checks, two image builds, and ten test jobs across the push and pull-request workflows. Saved CI evidence (REV scratch evidence (not published): `pr8-r5-ci.json`) records the per-job URLs. The workflow still does not include `private_security` in its matrix. The previously recorded real-service and browser acceptance requirements remain outside this narrow review; passing ordinary CI does not resolve them. + +Probe source (REV scratch evidence (not published): `pr8-r5-probe.py`) and probe output (REV scratch evidence (not published): `pr8-r5-probe.json`) preserve the independent checks. Run from the scratch `reviews/` directory: + +```sh +python3 pr8-r5-probe.py +``` + +Expected result: exit 0; the new summary test rejects the three invalid responses; each renewal cleanup case reports `remaining_sessions: 1`. The successful probe exit means the documented defect was reproduced, not that cleanup passed. The script reads the sibling `rev-pr8-r5` scratch clone and does not start services or change application code. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**Changes requested(変更要求)**。R4-01 と推奨 N1 は解消です。R5-01 として、fixture(試験の準備と後始末)が初期セッションだけを削除し、更新後のセッションを残す問題が残ります。既存の試験データ残留への修正不足であり、製品で新しい認証回避が生じたという指摘ではありません。 + +対象は 1 コミット、テスト 3 ファイル、追加 25 行・削除 3 行です。製品コードと workflow の変更はありません。専用の scratch clone で GitHub の読み取り、ソース確認、依存先を模擬した実関数の抽出実行を行いました。アプリ全体の HTTP・データベース・Elasticsearch 結合試験は再実行していません。Docker 操作、runtime ディレクトリや環境ファイルの参照、commit・push・approve・merge・close は行っていません。 + +### R5-01 — P2: 更新後のセッションも後始末で削除する + +**箇所:** `api_tests/base/test_session_expiry_http.py:77–82`。 + +新しいループが削除するのは、`session`・`project`・`owner` が指す行だけです。HTTP 試験の両系列にある `renewed` と `old_after_renewal` は `owner.get_or_create_cookie()` を呼びます。`osf/models/user.py:1972–1985` の実装は期限切れセッションを見つけると **新しい** `Session` を保存し、fixture の `session` 変数は更新しません。 + +`osf/models/session.py:5–6` の利用者識別子は JSON フィールド(構造を持つ文字データ)内にあり、外部キー(関連する行を一緒に削除できるデータベースの結び付け)ではありません。そのため `models.Model.delete` で `owner` を削除しても、新しいセッションは消えません。確認したコードには、その削除を補う利用者削除時の処理もありません。新しいループは初期セッション・プロジェクト・利用者を消しながら、削除した利用者の識別子と氏名を持つ孤立セッションを残します。 + +実際の `get_or_create_cookie` メソッドと後始末ループを抽出し、メモリ上のモデル代用品で実行しました。fresh と削除済みの場合は残留なし、更新の各ケースでは 1 行残りました。これはソースに基づく後始末ロジックの再現であり、アプリの実データベースで再実行したという意味ではありません。作者の「新しい残留行は増えていない」という説明は、この更新後の行について裏付けられません。 + +残留行は共有の試験データベースで試験の独立性を損ないます。例として `osf_tests/test_session.py:24–31` は 2 セッションを追加した後の総数を検査するため、残留のあるデータベースで実行すると順序に依存し得ます。今回の成功した CI が失敗した、またはその順序で実行したという主張ではありません。 + +**修正要求:** 利用者を削除する前に、保存しておいた利用者識別子と `data__auth_user_id` が一致するセッションをすべて削除してください。`missing_user` は JSON 内の識別子を変更するため、初期セッションの主キーによる削除も残してください。削除済みセッションへの対応と、行削除前のサーバー停止を維持してください。HTTP 全 18 ケースについて、終了後に初期行・当該利用者の全更新行・プロジェクト・利用者が残らないことを検査し、同じデータベースで続くセッション件数検査も確認してください。 + +### 解消した指摘と回帰確認 + +**R4-01:** `tests/nii/test_search_api2.py:216–226` は返された users リンクを同じ利用者の認証でたどり、`{user._id}` との完全一致と無関係な 2 人の除外を検査します。リンクの解析はパスとエンコード済みクエリを保持します。概要の件数、他の分類とリンクの既存検査も残っています。 + +実際の旧・新テストメソッドを抽出し、応答を模擬して実行しました。概要の利用者数は常に 1 のままにしました。旧テストは利用者一覧を要求しないため、全応答を受け入れました。新テストは本人だけなら成功し、他人 1 人、本人と他人 2 人、空一覧はすべて拒否しました。R4-01 で問題にした応答を新検査が捕捉することを独立に確認しました。作者による製品コードの一時改変試験は r4 への回答 (RDM-osf.io-dev2027 PR #8, comment 6795434539) に記録されていますが、こちらでは再実行していません。 + +**N1:** `test_normalize_all` の両方の再索引呼出し(764–767 行、780–783 行)が `user_pattern=del_func is _del_user` を渡します。wrapper は再索引・再試行の場合も直接実行の場合も引数を渡すため、利用者パターンでは正規化の両方向で非共有側を検査し、共有相手の正常系も維持します。`test_normalize_user_ongoing_job_school:1410–1426` の逆方向も、既定の非共有利用者を検査した後に共有相手 `user5` を検査します。既存の順方向と対応し、職歴・学歴の 6 項目の確認も維持しています。ソースを確認し、変更した呼出し構造は AST(Python が読み取ったソース構造)でも検査しました。 + +**fixture の有効な改善:** UUID を使うユーザー名は factory の乱数メールの重複を避けます。後始末は全サーバーの停止とスレッド終了を待ってから行を削除し、初期セッションがすでに削除されている場合にも対応します。問題は更新後セッションの取りこぼしであり、ユーザー名や停止順序ではありません。 + +### 証拠と限界 + +次は観測記録であり、設定の正本ではありません。 + +```toon +review: + base: d70afee7ddf384ffe8150a299546f111e7d2ff9a + head: 163aba5a0f0276f34139ee5d9a3257daf7e347da + commits: 1 + changed_files: 3 + github_checks_success: 14 + github_checks_total: 14 + syntax_files_passed: 3 + diff_check: passed + old_summary_response_cases_accepted: 4 + new_summary_valid_case_accepted: 1 + new_summary_invalid_cases_rejected: 3 + renewal_cleanup_cases_with_one_residual_session: 2 + fresh_and_deleted_cleanup_cases_without_residual_sessions: 2 +``` + +GitHub で対象 head の 14/14 成功を確認しました。内訳は CodeQL 2 件、イメージ作成 2 件、push と pull-request の試験ジョブ計 10 件です。保存した CI 証拠 (REV scratch evidence (not published): `pr8-r5-ci.json`) に個別ジョブの URL を保持しています。workflow の matrix に `private_security` は依然ありません。以前からの実サービス・ブラウザ受入も今回の狭いレビューの範囲外として残り、通常 CI の成功で解消とはしません。 + +probe ソース (REV scratch evidence (not published): `pr8-r5-probe.py`) と 実行結果 (REV scratch evidence (not published): `pr8-r5-probe.json`) に独立検査を保存しました。scratch の `reviews/` ディレクトリで実行します。 + +```sh +python3 pr8-r5-probe.py +``` + +期待値は終了コード 0、新しい概要テストによる不正応答 3 種の拒否、更新後の各ケースにおける `remaining_sessions: 1` です。probe の正常終了は指摘した欠陥を再現できたという意味であり、後始末の合格ではありません。隣の scratch clone `rev-pr8-r5` を読み取り、サービスの起動やアプリコードの変更は行いません。 diff --git a/docs/reviews/2026-11-11_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r1.md b/docs/reviews/2026-11-11_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r1.md new file mode 100644 index 0000000..5fe35b9 --- /dev/null +++ b/docs/reviews/2026-11-11_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r1.md @@ -0,0 +1,135 @@ +# REV PR5 Revocation and persistence review r1 / 失効・永続化レビュー r1 + +> **Summary:** Changes requested. Independent probes found writes after expiry, post-delete re-persistence, and ineffective storage bounds; npm test also fails type checking. +> **概要:** 要修正。期限後の書込み、削除後の再永続化、容量上限の不徹底を独立再現し、npm testの型検査も失敗した。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only what publication requires: private-repository URLs become named plain-text references; local guide links become repository-relative links; unpublished scratch references become named plain text or quoted command-path placeholders; public review links absent from develop point to the reviewed public commit. / REV が公開に必要な変更のみを行った。非公開リポジトリの URL は名称付き平文参照、ローカルのガイドへのリンクはリポジトリ相対リンク、未公開 scratch の参照は名称付き平文またはコマンドの引用符付きパス代替表示とし、develop に未収録の公開レビューへのリンクは確認済みの公開コミットを指す。 +- Publication provenance / 公開版の来歴: REV(担当レビュワ)issued this publication version from the unchanged original `2026-11-11_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r1.md` (SHA-256: `1ebc875af4482436a19608afa6b5ccca2d73200663333ed53e63bf6ef2e2f5c5`); the original file and scratch evidence remain unchanged, and all text other than this version/provenance metadata and the explicitly stated publication references is verbatim. Quoted scratch command-path placeholders identify retained unpublished evidence and must be replaced with its local location before execution. / REV が上記原本から公開版を発行した。原本と scratch 証跡は未変更で、版・来歴の追記と明示した公開用参照以外の本文は原文どおり。コマンド内の引用符付き scratch パス代替表示は保持された未公開証跡を識別するもので、実行にはそのローカルの場所への置換が必要。 +- Version / 版: 0.1 — 2026-11-11. **Learned:** Sending a close frame is not immediate revocation, and asynchronous persistence needs cancellation and write accounting. / 切断フレーム送信だけでは即時失効にならず、非同期永続化には取消しと書込み容量の管理が必要。 +- Applies to / 対象: RCOSDP/RDM-y-websocket-dev2027 PR #5, head 036ad4067fa1bffcf12c8c87a5496f1991786ad4 +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra) +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [OSF integration review / OSF連携レビュー](2026-11-11_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r2.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Changes requested.** Compared with base `d4d1cfaed2e4b10362237df1f3424b2a076a56fb`. Four findings require correction before the expiry, deletion and bounded-storage claims can pass. + +### Required changes + +**R1-01 / P1 — reject incoming frames immediately at expiry.** `bin/server.cjs:52–55` calls `ws.close(4401)` but `bin/utils.cjs:348` continues to dispatch messages while the transport is CLOSING. The installed ws 6 receiver still emits messages until its peer completes the close handshake. A client that suppresses the close reply received 4401, sent a valid Yjs update, and caused a second client's text to become `AFTER-EXPIRY`. This is a write after expiry, not merely an already-buffered server frame. Mark the session unauthorized and detach/guard its message handler and room membership at the expiry boundary, preserving the 4401 close reason. Test a non-cooperative peer as well as normal expiry. Ordinary invalid/expired upgrade tests pass with zero document frames; the newly observed defect concerns an established session. + +**R1-02 / P1 — cancel an in-flight bind before destroying/deleting a room.** `bin/utils.cjs:335–338` destroys the document before calling `clearDocument`. Its destroy listener at `bin/persistence.cjs:81` removes the state entry, so `clearDocument:121–122` cannot set that bind's `dropped` flag. A pending `getYDoc` resumes at lines 102–116 and writes the full document after the deletion. A deterministic delayed-read probe observed `clear(file-delete-race)` followed by `store(file-delete-race,25 bytes)`. It uses the real persistence adapter and document lifecycle with a recording storage double. Cancel/await outstanding binds before clearing, and test delayed hydration plus DELETE and disk contents after restart. The normal already-loaded-room DELETE test does pass. + +**R1-03 / P2 — account for pending writes to enforce storage limits.** `bin/persistence.cjs:57–62,96–100` reuses a directory size for 10 seconds, does not reserve projected writes, and checks before writing. A real LevelDB probe with a 65,536-byte total limit wrote 20 rooms below the per-room limit and left 986,600 bytes in the directory, about 15 times the limit. No further event forces removal when traffic stops. `clearDocument` deletes keys, not physical database files; compaction is another part of enforcing a disk budget. The per-room check at lines 86–94 also waits for another quarter-limit worth of updates, so it is not a strict bound. Use serialized accounting/reservations with an explicit compaction/headroom policy or enforce a true storage quota, and test bursts and quiescence, not only a directory already over a one-byte threshold. + +**R1-04 / P2 — repair type contracts so the required test command runs.** `npm test` fails before runtime tests with TS2322 at `bin/auth.cjs:76`, TS2339 at `bin/server.cjs:78`, and two TS2339 errors at `bin/utils.cjs:337–338`. The authorizeUpgrade return type omits `exp`; persistence type annotations omit `clearDocument`. Update the declared contracts and run `npm test` successfully. + +### Deletion authorization, network exposure, and paths + +`authorizeDelete` verifies HS256 using `JWT_SECRET`, numeric unexpired `exp`, exact `doc_id`, and `purpose: delete`. It rejects missing credentials, normal room tokens, wrong-room tokens, bad signatures, and expired tokens. Upgrade rejects any token carrying `purpose`. No `sub` identity or source IP is required for DELETE: any bearer of a correctly signed purpose-specific credential can call it wherever the HTTP listener is reachable. The same listener handles WebSocket upgrades; `Y_WEBSOCKET_ALLOWED_ORIGINS` is only consulted for upgrades. Default bind is localhost, but deployment may override HOST. The OSF helper sends the token to configured `Y_WEBSOCKET_INTERNAL_URL` with a 60-second lifetime; this code does not prove an internal-only network boundary. No authentication bypass was found in normal room tokens. + +The LevelDB directory is exactly `YPERSISTENCE`; relative paths resolve from process cwd (`/home/node/app` in the supplied Dockerfile). It is disabled when that environment variable is absent. No durable volume or deployment path is established by PR #5. The prefix defaults to empty, so all rooms persist unless the deployer explicitly sets `file-`. Room names are encoded database keys in one LevelDB database, not filesystem path components; inspection of `y-leveldb` found no room-name traversal into another directory. The OSF helper URL-quotes room names; DELETE also rejects literal slashes. Storage configuration is trusted operator input. + +Tombstones last 24 hours by default, live only in memory, and disappear on restart. Oversized rooms fall back to memory and lose unsaved edits on last departure. The paired OSF review records the renewal/cleanup limitation. These accepted-by-code behaviors still need explicit deployment/retention decisions; no runtime/.env or Docker state was accessed. + +### Independent tests and reproducibility + +```toon +checks[7]{check,result}: + auth.test.cjs,25 passed + room-release.test.cjs,passed + session-persistence.test.cjs,12 passed + npm_test,failed with four new TypeScript errors + expiry_adversarial_probe,4401 then peer text AFTER-EXPIRY + delete_load_race_probe,clear then store of 25 bytes + total_disk_limit_probe,65536 configured and 986600 observed +``` + +Tests ran on macOS arm64 with Node 26.12.0 in scratch only. The first persistence test attempt could not load the native leveldown module after an install with scripts disabled; `npm rebuild leveldown` resolved that local setup issue, and all 12 cases then passed. No Docker or full browser acceptance was run. + +From `REV scratch evidence (not published): rev-work websocket checkout`, with installed dependencies, the first command is expected to fail with the four type errors, while the direct runtime tests pass: + +```sh +npm test +node test/auth.test.cjs +node test/room-release.test.cjs +node test/session-persistence.test.cjs +``` + +From scratch `rev-work`, run the independent probes. Expected output includes the three counterexamples: + +```sh +node review-probes.cjs +``` + +Evidence: probe source (REV scratch evidence (not published): `review-probes.cjs`), probe results (REV scratch evidence (not published): `review-probes.log`), npm test output (REV scratch evidence (not published): `websocket-tests.log`). The delete-race probe is deterministic with a storage double; the expiry and disk-size probes use real sockets and real LevelDB respectively. No commit, push, approval, merge, or issue closure was performed. Used by: the paired OSF review and the coordinator's integration decision. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**changes requested(要修正)。** base `d4d1cfaed2e4b10362237df1f3424b2a076a56fb` と比較した。期限失効、削除、容量上限の主張を合格とするには、4件の修正が必要。 + +### 必要な修正 + +**R1-01 / P1 — 期限切れ時点で受信フレームを直ちに拒否する。** `bin/server.cjs:52–55` は `ws.close(4401)` を呼ぶが、`bin/utils.cjs:348` はCLOSING中も受信を処理する。導入したws 6の受信側は相手が切断手順を完了するまでメッセージを通知する。切断応答を止めたクライアントが4401を受け取った後、有効なYjs更新を送ると、別クライアントの本文が `AFTER-EXPIRY` になった。これは既に送信済みだったフレームではなく期限後の書込み。4401の理由を保ちつつ、失効時点で認可状態を解除し、受信ハンドラと部屋への参加を解除または拒否する必要がある。通常の期限試験に加えて、切断に協力しない相手を試験する。無効・期限切れトークンによるupgradeは文書フレーム0で通過しており、今回の問題は接続済みセッションにある。 + +**R1-02 / P1 — 部屋を破棄・削除する前に読み込み途中のbindを取り消す。** `bin/utils.cjs:335–338` は `clearDocument` より先に文書を破棄する。`bin/persistence.cjs:81` の破棄リスナーが状態の対応を消すため、`clearDocument:121–122` でそのbindの `dropped` を立てられない。待機中の `getYDoc` が102–116行で再開し、削除後に全文を書き戻す。読み込みを遅延させた決定的な試験で `clear(file-delete-race)` の後に `store(file-delete-race,25 bytes)` を確認した。実際の永続化アダプターと文書ライフサイクルに、操作を記録するストレージ代役を使っている。未完了bindを取り消し・待機してから消し、読み込み遅延とDELETE、再起動後のディスク内容を試験する必要がある。通常の読み込み済み部屋のDELETE試験は通る。 + +**R1-03 / P2 — 未完了の書込みも数えて容量制限を実施する。** `bin/persistence.cjs:57–62,96–100` はディレクトリ容量を10秒間使い回し、書込み予定量を予約せず、書く前にしか検査しない。実LevelDBで全体65,536 bytesを指定し、個別上限未満の20部屋を書いたところ、986,600 bytes、約15倍が残った。その後通信が止まると削除の契機もない。`clearDocument` はキーを消すだけで物理DBファイルを直接縮めず、ディスク上限には圧縮整理も関わる。86–94行の個別検査も上限の4分の1相当の更新を待つため厳密な上限ではない。直列化した容量計算・予約と圧縮整理・余裕容量の方針、または実際のストレージ割当上限を用意し、既に1 byteを超えた領域だけでなく、一斉書込みと停止後を試験する必要がある。 + +**R1-04 / P2 — 型宣言を直して標準試験を通す。** `npm test` は実行試験へ進む前に、`bin/auth.cjs:76` のTS2322、`bin/server.cjs:78` のTS2339、`bin/utils.cjs:337–338` のTS2339二つで失敗した。authorizeUpgradeの戻り値型に `exp`、永続化の型宣言に `clearDocument` がない。宣言を更新し、`npm test` を通す必要がある。 + +### 削除認証、到達範囲、パス + +`authorizeDelete` は `JWT_SECRET` によるHS256、数値で有効期限内の `exp`、一致する `doc_id`、`purpose: delete` を検証する。資格情報なし、通常の部屋用トークン、別の部屋、署名不正、期限切れを拒否する。upgradeは `purpose` を持つトークンを拒否する。DELETEには `sub` の身元や接続元IPの条件がなく、専用の正しく署名された資格情報を持つ者はHTTP待受へ到達できる場所から呼べる。WebSocketと同じ待受であり、`Y_WEBSOCKET_ALLOWED_ORIGINS` の参照はupgradeだけ。既定待受はlocalhostだがHOSTで変更できる。OSFのヘルパーは60秒のトークンを設定済み `Y_WEBSOCKET_INTERNAL_URL` へ送るが、このコードだけでは内部ネットワーク限定を保証しない。通常の部屋用トークンによる認証迂回は見つからなかった。 + +LevelDBの場所は `YPERSISTENCE` そのもの。相対パスはプロセスの作業ディレクトリ基準で、付属Dockerfileでは `/home/node/app`。変数がなければ永続化は無効。PR #5は永続ボリュームや実配備の場所を確定していない。接頭辞の既定は空なので、配備側で `file-` を明示しないと全部屋を保存する。部屋名は一つのLevelDB内の符号化されたキーであり、ファイルシステムのパス部品にはならない。`y-leveldb` の確認では、部屋名から別ディレクトリへのパス逸脱は見つからなかった。OSFヘルパーは部屋名をURL符号化し、DELETEは文字どおりのスラッシュも拒否する。保存先設定は運用者の信頼された入力となる。 + +削除済み記録の既定寿命は24時間で、メモリのみのため再起動で消える。超過した部屋はメモリだけとなり、最後の利用者が離れると未保存編集を失う。対応OSF記録には更新・掃除の制約を記載した。コードが許容するこれらの挙動についても、配備・保管方針の明示が必要。runtime/.envとDockerの状態にはアクセスしていない。 + +### 独立試験と再現方法 + +```toon +checks[7]{check,result}: + auth.test.cjs,25件成功 + room-release.test.cjs,成功 + session-persistence.test.cjs,12件成功 + npm_test,新しいTypeScriptエラー4件で失敗 + 改造クライアントの期限試験,4401後に相手の本文がAFTER-EXPIRY + 削除と読込み競合試験,clearの後に25 bytesのstore + ディスク全体上限試験,設定65536に対し実測986600 +``` + +scratch内だけでmacOS arm64、Node 26.12.0を使用した。スクリプト無効の依存導入後、初回の永続化試験はleveldownのネイティブモジュールを読めなかった。`npm rebuild leveldown` でローカル環境の問題を解消後、12件すべて通った。Dockerと全体ブラウザ受入は実行していない。 + +依存導入済み `REV scratch evidence (not published): rev-work websocket checkout` で実行する。最初のコマンドは型エラー4件で失敗し、直接の実行試験は成功する。 + +```sh +npm test +node test/auth.test.cjs +node test/room-release.test.cjs +node test/session-persistence.test.cjs +``` + +scratchの `rev-work` で独立試験を実行する。期待出力は3件の反例。 + +```sh +node review-probes.cjs +``` + +証跡: 独立試験ソース (REV scratch evidence (not published): `review-probes.cjs`)、試験結果 (REV scratch evidence (not published): `review-probes.log`)、npm test出力 (REV scratch evidence (not published): `websocket-tests.log`)。削除競合試験はストレージの代役を使った決定的な試験、期限試験と容量試験はそれぞれ実ソケットと実LevelDBを使う。commit、push、approve、merge、Issue closeは行っていない。Used by: 対応OSFレビューおよび調整者の統合判断。 diff --git a/docs/reviews/2026-11-11_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r2.md b/docs/reviews/2026-11-11_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r2.md new file mode 100644 index 0000000..0e2d25a --- /dev/null +++ b/docs/reviews/2026-11-11_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r2.md @@ -0,0 +1,107 @@ +# REV PR5 Revocation and persistence review r2 / 失効・永続化レビュー r2 + +> **Summary:** Changes requested. Expiry, deletion cancellation, and types are fixed; queued writes still defeat the total quota. +> **概要:** 要修正。期限失効・削除の取消し・型は修正済みだが、未完了書込みが全体容量制限を破る。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only what publication requires: private-repository URLs become named plain-text references; local guide links become repository-relative links; unpublished scratch references become named plain text or quoted command-path placeholders; public review links absent from develop point to the reviewed public commit. / REV が公開に必要な変更のみを行った。非公開リポジトリの URL は名称付き平文参照、ローカルのガイドへのリンクはリポジトリ相対リンク、未公開 scratch の参照は名称付き平文またはコマンドの引用符付きパス代替表示とし、develop に未収録の公開レビューへのリンクは確認済みの公開コミットを指す。 +- Publication provenance / 公開版の来歴: REV(担当レビュワ)issued this publication version from the unchanged original `2026-11-11_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r2.md` (SHA-256: `d1cd417c84391480d43592900be8e05af8903fc36f60215452f78454d411c7f3`); the original file and scratch evidence remain unchanged, and all text other than this version/provenance metadata and the explicitly stated publication references is verbatim. Quoted scratch command-path placeholders identify retained unpublished evidence and must be replaced with its local location before execution. / REV が上記原本から公開版を発行した。原本と scratch 証跡は未変更で、版・来歴の追記と明示した公開用参照以外の本文は原文どおり。コマンド内の引用符付き scratch パス代替表示は保持された未公開証跡を識別するもので、実行にはそのローカルの場所への置換が必要。 +- Version / 版: 0.1 — 2026-11-11. **Learned:** Disk measurements must retain reservations for writes not yet on disk. / ディスクの再計測時も、まだ書かれていない予約容量を保持する必要がある。 +- Applies to / 対象: RCOSDP/RDM-y-websocket-dev2027 PR #5, head 67aae1d7efaa4bb002b60f572b15fd631b65d980 +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra) +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Prior review / 前回レビュー](2026-11-11_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r1.md) · [Paired review / 対応レビュー](2026-11-11_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r3.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Changes requested.** Reviewed exact head `67aae1d7efaa4bb002b60f572b15fd631b65d980` against the prior `036ad406`. R1-01 (expiry), R1-02 (delete/load race), and R1-04 (type contracts) are closed. R1-03 remains open for queued writes; the per-room portion is fixed. + +### R2-01 / P2 — preserve pending reservations when measuring the directory + +`bin/persistence.cjs:104–107` replaces `used` with the current directory size whenever the next write does not fit. Previously reserved writes can still be waiting in the LevelDB queue and absent from that measurement. Their payload reservation is then forgotten, so more writes fit. Reserving each write synchronously does not make that reset safe. + +An independent real-LevelDB probe first binds 20 empty rooms, then inserts 49,152 bytes of random hexadecimal text into each room without awaiting between updates. Every room stays below the configured 100,000-byte room limit. With a 65,536-byte total limit, the queued accounting reported 51,443 bytes plus 3,060 bytes of deletion reserve, while the settled directory held **986,958 bytes and all 20 rooms**. The prior probe that awaits each room's bind passes at 52,728 bytes; it drains earlier work and misses this case. This is queued payload accounting loss, not merely temporary compaction headroom. + +Keep outstanding reservations separate from the measured disk baseline, or serialize measurement with completion of all reserved writes before rebasing. Add a regression with multiple already-bound rooms updated without yielding, then assert the bound after the queue settles and while idle. + +### Verified fixes and evidence + +The original non-cooperative socket probe receives 4401 and its subsequent update causes zero observer frames and no text change. Direct invocation of the actual revocation function with a controlled connection also removes room membership and awareness and releases the last-peer room. The expiry timer calls that function. The delayed-load DELETE probe records only `clear`, with no later `store`. The generation check survives document destruction. The room-limit regression clears a 1,080-byte state under a 1,000-byte limit. + +```toon +checks[7]{check,result}: + npm_test,passed lint and TypeScript; room-release; auth 25; session-persistence 13; storage-bounds 3 + original_expiry_probe,4401 then zero observer frames and empty text + revocation_membership_probe,revoked and removed from room and awareness + original_delete_load_probe,clear only; no post-delete store + original_sequential_quota_probe,52728 bytes under 65536 + already_bound_rooms_burst,986958 bytes over 65536; 20 rooms retained + deployment_and_browser_acceptance,not run +``` + +Run from scratch `rev-followup` (dependencies reused from the prior scratch installation; Node 26.12.0, macOS arm64): + +```sh +(cd websocket && npm test) +node review-probes.cjs +node revoke-membership.cjs +node quota-burst.cjs +``` + +The first three commands succeed; the final probe prints the quota counterexample. It is an observational probe, so its exit code is zero even when it shows a violated bound. Sources and logs: original probes (REV scratch evidence (not published): `review-probes.cjs`), original results (REV scratch evidence (not published): `review-probes.log`), membership probe (REV scratch evidence (not published): `revoke-membership.cjs`), membership results (REV scratch evidence (not published): `revoke-membership.log`), burst probe (REV scratch evidence (not published): `quota-burst.cjs`), burst results (REV scratch evidence (not published): `quota-burst.log`), npm test (REV scratch evidence (not published): `websocket-tests.log`). An initial membership fixture lacked awareness metadata; it was corrected before the successful run. + +The prior deployment limits still apply: persistence location/prefix and internal network reachability were not verified; tombstones remain in memory; overflow uses memory-only drafts. No Docker state or runtime/.env was accessed. Only scratch review artifacts and one PR conversation comment were written; no commit, push, approval, merge, or close. Used by: the paired OSF review and the coordinator's integration decision. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**changes requested(要修正)。** 正確な head `67aae1d7efaa4bb002b60f572b15fd631b65d980` を前回の `036ad406` と比較した。R1-01(期限失効)、R1-02(削除と読込みの競合)、R1-04(型宣言)は解消。R1-03 は待機中の書込みについて未解消で、部屋ごとの上限は修正済み。 + +### R2-01 / P2 — ディスク再計測で未完了の予約を忘れない + +`bin/persistence.cjs:104–107` は次の書込みが収まらないと `used` を現在のディレクトリ容量で置き換える。既に予約した書込みがLevelDBの待ち行列にあり、まだディスクに現れていない場合、その容量予約が消え、さらに書込みを許可する。各予約が同期処理であるだけでは、この置換は安全にならない。 + +実LevelDBの独立試験で空の20部屋を先にbindし、部屋間で待たずに各部屋へ49,152 bytesの乱数の16進文字列を挿入した。各部屋は指定100,000 bytes未満。全体65,536 bytesに対して、待機中の計算は51,443 bytesと削除予約3,060 bytesだったが、書込み終了後のディレクトリは **986,958 bytes、20部屋すべて保持** となった。部屋ごとにbindを待つ前回試験は52,728 bytesで通るが、その待機で先行書込みが進むため今回の条件を見逃す。これは一時的な圧縮整理の余裕容量ではなく、未完了の本文容量を忘れる問題。 + +未完了の予約を実ディスク量と別に保持するか、予約済み書込みを全て完了させてから基準を再計測する必要がある。既にbind済みの複数部屋を待たずに更新し、待ち行列が空になった後と停止中の容量を確認する回帰試験を追加すること。 + +### 解消の確認と証跡 + +前回の切断応答を返さないソケット試験では4401を受信し、その後の更新による観測側フレームは0、本文変更もなし。実際の失効関数を制御した接続で呼ぶ試験でも、部屋への所属とawareness(参加者状態)が消え、最後の接続の部屋が解放された。期限タイマーはこの関数を呼ぶ。読込み遅延中のDELETE試験は `clear` のみで、その後の `store` はない。世代の検査は文書破棄後にも効く。部屋上限の回帰試験では上限1,000 bytesに対する1,080 bytesの状態を消去した。 + +```toon +checks[7]{check,result}: + npm_test,lintとTypeScript成功; room-release成功; auth 25件; session-persistence 13件; storage-bounds 3件 + 前回の期限試験,4401後の観測フレーム0と空の本文 + 失効と所属の試験,失効済みで部屋とawarenessから除外 + 前回の削除読込み試験,clearのみ; 削除後のstoreなし + 前回の順次容量試験,上限65536に対し52728 bytes + bind済み部屋の一斉更新,上限65536に対し986958 bytes; 20部屋保持 + 配備とブラウザ受入,未実行 +``` + +scratchの `rev-followup` で実行する。依存は前回のscratch導入物を再利用し、Node 26.12.0、macOS arm64を使用。 + +```sh +(cd websocket && npm test) +node review-probes.cjs +node revoke-membership.cjs +node quota-burst.cjs +``` + +最初の3コマンドは成功し、最後は容量の反例を表示する。最後は観測用なので上限違反でも終了コード0。ソースと記録: 前回の試験 (REV scratch evidence (not published): `review-probes.cjs`)、その結果 (REV scratch evidence (not published): `review-probes.log`)、所属試験 (REV scratch evidence (not published): `revoke-membership.cjs`)、所属結果 (REV scratch evidence (not published): `revoke-membership.log`)、一斉更新試験 (REV scratch evidence (not published): `quota-burst.cjs`)、一斉更新結果 (REV scratch evidence (not published): `quota-burst.log`)、npm test (REV scratch evidence (not published): `websocket-tests.log`)。所属試験の初回の代役にはawarenessの付随情報が欠けていたため、補正してから成功を確認した。 + +前回の配備上の制約は残る。保存先・接頭辞・内部ネットワークの到達範囲は未確認で、削除済み記録はメモリのみ、容量超過時の下書きもメモリのみとなる。Dockerの状態とruntime/.envにはアクセスしていない。書込みはscratchのレビュー資料とPR会話コメント1件のみで、commit、push、approve、merge、closeはなし。Used by: 対応OSFレビューと調整者の統合判断。 diff --git a/docs/reviews/2026-11-12_RDM-developer-guide_PR45_Pin_Py313_r3.md b/docs/reviews/2026-11-12_RDM-developer-guide_PR45_Pin_Py313_r3.md new file mode 100644 index 0000000..05452e8 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-developer-guide_PR45_Pin_Py313_r3.md @@ -0,0 +1,103 @@ +# REV-45-r3 Publication provenance re-review / 公開版の来歴の再レビュー + +> **Summary:** Pass for the documentation-only change at a6f9eee. Both committed records exactly match the REV-issued publication versions; R2-01 is closed. CI remains incomplete. +> **概要:** a6f9eee の文書のみの変更は合格。収録された両記録はREV発行の公開版と完全一致し、R2-01 は解消した。CI は未完了。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only what publication requires: private-repository URLs become named plain-text references; local guide links become repository-relative links; unpublished scratch references become named plain text or quoted command-path placeholders; public review links absent from develop point to the reviewed public commit. / REV が公開に必要な変更のみを行った。非公開リポジトリの URL は名称付き平文参照、ローカルのガイドへのリンクはリポジトリ相対リンク、未公開 scratch の参照は名称付き平文またはコマンドの引用符付きパス代替表示とし、develop に未収録の公開レビューへのリンクは確認済みの公開コミットを指す。 +- Publication provenance / 公開版の来歴: REV(担当レビュワ)issued this publication version from the unchanged original `2026-11-12_RDM-developer-guide_PR45_Pin_Py313_r3.md` (SHA-256: `a827d940e92feb473da4cad277dd60675440047f891475c01f1f9fcf8fffa85b`); the original file and scratch evidence remain unchanged, and all text other than this version/provenance metadata and the explicitly stated publication references is verbatim. Quoted scratch command-path placeholders identify retained unpublished evidence and must be replaced with its local location before execution. / REV が上記原本から公開版を発行した。原本と scratch 証跡は未変更で、版・来歴の追記と明示した公開用参照以外の本文は原文どおり。コマンド内の引用符付き scratch パス代替表示は保持された未公開証跡を識別するもので、実行にはそのローカルの場所への置換が必要。 +- Version / 版: 0.1 — 2026-11-12. **Learned:** byte comparison and an explicit original-to-publication transformation establish reviewer provenance; passing documentation checks alone does not. / バイト比較と原本から公開版への明示的な変換確認によってレビュワの来歴を検証でき、文書検査の合格だけでは証明できないと分かった。 +- Applies to: RCOSDP/RDM-developer-guide [PR #45](https://github.com/RCOSDP/RDM-developer-guide/pull/45), head `a6f9eeef29052b593f2752566c018f5dc59291a9`, delta after `339f4fa1e7415b82aaee61d090e3620c49047000`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Posted review / 投稿: [r3 PR comment](https://github.com/RCOSDP/RDM-developer-guide/pull/45#issuecomment-6799636262). +- Related: [review index](README.md), [r1 publication](https://github.com/RCOSDP/RDM-developer-guide/blob/a6f9eeef29052b593f2752566c018f5dc59291a9/docs/reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r1.md), [r2 publication](https://github.com/RCOSDP/RDM-developer-guide/blob/a6f9eeef29052b593f2752566c018f5dc59291a9/docs/reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r2.md), [SPEC-06](../spec/06_documentation_conventions.md#english), [r2 PR comment](https://github.com/RCOSDP/RDM-developer-guide/pull/45#issuecomment-6798749424). +- Used by: [status board](../status/README.md) and the coordinator's PR #45 decision. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and findings + +**Pass. R2-01 (medium) is closed. No new R3 findings.** This verdict covers the assigned change and is delivered as a PR comment. It is not a GitHub approval, merge decision, or claim that every CI check passed. + +Location of closure evidence: `docs/reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r1.md:8–10,14,57,129` and `docs/reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r2.md:8–10`. Each committed file is byte-identical to its REV-issued version 0.2 in the prior scratch `pr45-records/` directory. Each provenance line names its original file and contains the SHA-256 hash (a fingerprint of the file's bytes) independently recomputed from that original. + +The original-to-publication comparison is precise: r1 changes five Related link destinations and converts four audit links into named plain-text references, plus two version/provenance lines. Thus “only link destinations” is shorthand, not a literal description of the Markdown changes; the publication header explicitly discloses the plain-text conversions. r2 only adds the two metadata lines. Removing those lines and applying exactly the declared reference changes to the originals reproduces the committed text. No verdict, finding, evidence claim, command, or other body text changes. The original files remain available and were not modified during this review. + +The root for the earlier originals and issued publications is `REV scratch evidence (not published): 8baac84b-080f-4104-a2b5-7416702c57e1 scratchpad`; originals are in `reviews/`, publications in `pr45-records/`. This closes the missing reviewer-issued correction identified in r2; it does not relabel the earlier version 0.1 alteration as the original. + +```toon +identity: + r1_original_sha256: 7fc95a749e802996d83147b4c6b66c1403eff0ea4571d41287a7ad571e5e2a13 + r1_issued_and_committed_sha256: 7447126f1eab673fb63f522d591228d8f76282948b63032c29784dc28015ed1b + r2_original_sha256: a8bb94067af6b27028cbb7d111c5bd30fae9385dc9c1ca2d4681951fec11030f + r2_issued_and_committed_sha256: 81214eaf19bc2381d1cccbfe981c093371ed0c19204236c886b1ff66831c8597 +``` + +### Regression checks and CI + +A fresh detached clone at `REV scratch evidence (not published): pr45-rev-r3` contains the exact assigned head. The complete delta from `339f4fa` is one commit touching only the two review files: r1 adds two lines, and r2 is a new 154-line file. All other tracked contents and modes are unchanged, including installer code, tests, manifests, workflows and prior scan evidence. The r2 closure of R1-01 through R1-03 therefore has no changed implementation to reassess. No new live scan, container build or acceptance run was performed. + +The documentation checker passed: 156 checked files, 8 exempt files, 38 warnings, matching the earlier warning count. Both changed records individually have zero errors and zero warnings. The whitespace check passed, and the clone remained clean. Local unit suites were not rerun for this documentation-only delta. + +CI (automatic checks run by GitHub) was inspected with `gh pr checks 45`; the recorded snapshot is 2026-11-12 00:14 JST. The PR head and the unit workflow's head both equal the full assigned SHA. Python 3.12 unit tests passed; the remaining eight checks were queued. No failure was reported, but the overall CI result is pending and requires coordinator follow-up before integration. The [unit workflow](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43043457912), [documentation workflow](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43043457756), [security workflow](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43043457778) and [image-build workflow](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43043458023) identify the checked runs. + +```toon +ci_checks[9]{name,state}: + Unit tests Python 3.12,SUCCESS + Unit tests Python 3.11,QUEUED + Check Links,QUEUED + Build MkDocs Site,QUEUED + Manifest validation and private-URL policy,QUEUED + Secret scan gitleaks,QUEUED + Semgrep static analysis,QUEUED + Trivy filesystem scan,QUEUED + Build image_build recipes amd64 and arm64,QUEUED +``` + +### Reproduction and boundaries + +Run from `REV scratch evidence (not published): pr45-rev-r3`; expected results are successful assertions, the documentation counts stated in [Regression checks and CI](#regression-checks-and-ci), an empty whitespace report, and an empty status report: + +```sh +python3 "<REV scratch evidence (not published): pr45-r3-verify.py>" +python3 tools/docs_check.py +git diff --check 339f4fa HEAD +git status --porcelain +``` + +Evidence is saved beside this scratch record: `pr45-r3-verify.py`, `pr45-r3-verification.json`, `pr45-r3-identity.json`, `pr45-r3-original-r1.diff`, `pr45-r3-original-r2.diff`, `pr45-r3-docs.log`, `pr45-r3-ci.json`, and `pr45-r3-head-ci.json`. Relative document links are authored and validated for the intended `docs/reviews/` publication location. The report and supporting evidence are not committed. Only the authorized PR comment is posted; no commit, push, merge, approval, issue closure, Docker state change, or access to `runtime/.env` was performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +**合格(pass)。R2-01(中)は解消。新規のR3指摘はない。** 判定は指定差分に対するもので、PRコメントとして投稿する。GitHubの承認、マージ判断、CI全件合格の宣言ではない。 + +解消根拠の位置は `docs/reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r1.md:8–10,14,57,129` と `docs/reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r2.md:8–10`。両収録ファイルは前回scratchの `pr45-records/` にあるREV発行版0.2とバイト単位で一致した。各来歴行は原本のパスを示し、原本から独立に再計算したSHA-256(ファイルのバイト列を識別する指紋)を正しく記載している。 + +原本との差分は、r1がRelatedの5リンク先変更、監査証跡の4リンクの名前付き平文参照化、版・来歴の2行追加のみ。したがって「リンク先のみ」は略記であり、Markdown差分の厳密な表現ではない。平文参照化は公開版のヘッダに明記されている。r2は版・来歴の2行追加のみ。追加2行を除き、原本に明示された参照変更だけを適用すると、収録本文を完全に再現できる。判定・指摘・証跡の主張・コマンド・その他本文の変更はない。原本は引き続き存在し、今回のレビューでは変更していない。 + +原本と発行版の起点は `REV scratch evidence (not published): 8baac84b-080f-4104-a2b5-7416702c57e1 scratchpad`。原本は `reviews/`、公開版は `pr45-records/` にある。[英語版の照合結果](#verdict-and-findings)に全ハッシュ値を掲載した。r2で求めたREV発行の訂正版の欠落は解消した。以前の版0.1の改変物を原本と追認したものではない。 + +### 回帰確認とCI + +新規の独立クローン `REV scratch evidence (not published): pr45-rev-r3` を指定の先頭版に固定した。`339f4fa` 以降の全差分は1コミット、レビュー2ファイルだけ。r1は2行追加、r2は154行の新規ファイルである。インストーラー・試験・manifest・ワークフロー・既存検査証跡を含め、その他の追跡内容とファイルモードは不変。r2で解消済みのR1-01〜03について再審査が必要な実装変更はない。新しい実機スキャン、コンテナビルド、受入試験は実行していない。 + +文書検査は156件検査・8件除外・38警告で合格し、警告数は前回と同じ。変更2記録の個別検査はエラー・警告とも0件。空白検査も合格し、クローンに変更は残っていない。文書のみの差分なので、ローカル単体試験一式は再実行していない。 + +CI(GitHubが自動実行する検査)は `gh pr checks 45` で確認した。保存時点は2026-11-12 00:14 JST。PRと単体試験ワークフローの先頭版は指定の完全SHAに一致した。Python 3.12単体試験は成功し、残り8件は待機中だった。失敗の報告はないが、CI全体は未完了であり、統合前の追跡確認は調整担当の残件。[英語版のCI一覧と実行リンク](#regression-checks-and-ci)に各状態を記録した。 + +### 再現と作業範囲 + +再現コマンド・実行ディレクトリ・期待結果は[英語版の再現手順](#reproduction-and-boundaries)と同一。検証スクリプト、比較JSON、原本との差分2件、文書検査ログ、CI JSONをこのscratch記録と同じフォルダに保存した。文書の相対リンクは将来の公開先 `docs/reviews/` を基準に作成・検証した。記録と証跡は未コミット。許可されたPRコメントだけを投稿し、コミット・push・マージ・承認・Issue閉鎖・Docker状態変更・`runtime/.env` の参照は行っていない。 diff --git a/docs/reviews/2026-11-12_RDM-developer-guide_PR46_Review_Records_r1.md b/docs/reviews/2026-11-12_RDM-developer-guide_PR46_Review_Records_r1.md new file mode 100644 index 0000000..6f7401a --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-developer-guide_PR46_Review_Records_r1.md @@ -0,0 +1,110 @@ +# REV PR46 Review records review r1 / レビュー記録公開レビュー r1 + +> **Summary:** The twelve committed review records match REV's issued publication versions byte for byte, and the change adds no other files. Two minor corrections are needed in the PR description; the CI result is recorded in the verification section. +> **概要:** 追加されたレビュー記録12件は REV 発行の公開版とバイト単位で一致し、ほかのファイル変更はない。PR 本文には軽微な訂正2点があり、CI の結果は検証節に記録する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-12. **Learned:** A publication copy can preserve the review exactly while its PR description still understates the checked files and the publication transformations. / 公開版がレビュー原文を正確に保持していても、PR 本文が検査対象件数や公開用変換の範囲を過小に説明することがある。 +- Applies to / 対象: [PR #46](https://github.com/RCOSDP/RDM-developer-guide/pull/46), head `ce24a453a4f6d797045a84d847f92db9bb4a26a6`, base `eb8c4e96977b06bd3bb0fd42b03f0872806be08a`. +- Reviewer / 担当: REV(担当レビュワ, Codex Astra). +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md). +- Used by / 利用先: PR #46 publication review / 公開レビュー. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Pass with two non-blocking documentation nits.** The publication artifacts have no blocking finding. The two P3 findings concern the PR description only. This is a review verdict, not GitHub approval or authorization to merge. + +A fresh isolated clone was inspected at the full head above. The diff against the merge base contains exactly twelve added Markdown files under `docs/reviews/`, with no modification, deletion, or other addition. Each committed blob was compared directly with the corresponding issued publication file; all twelve match byte for byte and match the SHA-256 values in `publication-validation.json`. Every file is publication version 0.2 dated 2026-11-12. Historical application tests were not rerun for this publication-only review. + +### Findings + +**R1-01 / P3 — Correct the documented check count.** The PR verification section says `154` files were checked. Running `python3 tools/docs_check.py` at this head checks **166** files, exempts 8, and reports 38 existing warnings, with no errors or warnings in the twelve added records. The checker enumerates tracked files with `git ls-files`; 154 does not demonstrate coverage of the twelve additions. Replace the count and state that the committed additions were included. + +**R1-02 / P3 — Describe all publication transformations.** The PR method section says that REV only replaced URLs and paths with names and numbers in plain text. The issued records also convert local guide references into repository-relative links and add version/provenance metadata; some command references use quoted placeholders. Describe these publication-only reference and metadata changes explicitly. The unchanged judgments, findings, and numerical results are supported by the publication validation and byte identity. + +### Verification + +The twelve files passed the documentation checker and the repository manifest/private-URL checker. Direct URL/path inspection found no private-repository URL, reviewer-machine path, or local-path link. The retained `/home/node/app` is a documented container working directory, not a reviewer-machine location. Gitleaks scanned all twelve files (212804 bytes) with zero findings; the whitespace check also passed. No secret was detected. + +At 2026-11-11 16:02 UTC, all eight checks on the reviewed head completed successfully: Check Links, Build MkDocs Site, Manifest validation and private-URL policy, Secret scan (gitleaks), Semgrep static analysis, Trivy filesystem scan (report only at M1), and Unit tests for Python 3.11 and 3.12. Runs: [Documentation Build and Check](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43050442902), [Security Checks](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43050443092), [Unit Tests](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43050442763). Trivy retains its report-only role; a green job is not a separate vulnerability acceptance decision. + +The inventory in the PR description is correct: osf.io #8 r4/r5, #10 r2, #11 r4, #12 r2/r3, #13 r2; y-websocket #5 r1/r2/r3; ember-osf-web #2 r2; modular-file-renderer #7 r1. The stated pass verdicts for osf.io #11/#13 and y-websocket #5 r3 agree with the retained records and keep their original scopes and remaining integration conditions. + +The missing-earlier-record list is exact: osf.io #8 r1–r3, #10 r1, #11 r1–r3, #12 r1, and #13 r1 (nine records). None is present in the supplied original-review directory; each corresponding REV comment remains on its PR. Loss during scratch cleanup is the supplied provenance account; this review verifies the present absence and retained comments, not the past deletion event. + +PR #45 head `7d0ba60a8a72f38595680ba0b49cc1d89405b023` added REV's r3 publication version `docs/reviews/2026-11-12_RDM-developer-guide_PR45_Pin_Py313_r3.md`, byte-identical to the issued copy (SHA-256 `762969614e37c65ad40b41cb69f52904d2fd45cea0bd8f0bf3c356bb335b51ca`); no comment was posted on PR #45. + +### Byte-identity evidence + +The following SHA-256 values identify the committed and issued copies equally; paths are relative to `docs/reviews/`. + +```toon +files[12]: + - file: 2026-11-10_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r4.md + sha256: baf5a5141f880065f82fca595a25b1b2c18357e1792b8bcf74df33341d58904e + - file: 2026-11-11_RDM-ember-osf-web-dev2027_PR2_Static_Build_r2.md + sha256: de75e15ae4f6acad3e6450f809d7395b0739fdafaeb3ae1e832b2b7c37e369f6 + - file: 2026-11-11_RDM-modular-file-renderer-dev2027_PR7_Render_Redirect_r1.md + sha256: c666eee3133049b265c774f2d43e79f0fc0007eae12d1b0ccf3b9c9be93503bf + - file: 2026-11-11_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r2.md + sha256: bbf9382ddaa7acd995a5940e7fb5bbaf1e7a9e026f8fd554d9d9fbbb161544ee + - file: 2026-11-11_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r3.md + sha256: 4a087cc84ef4ea65310d8baac2f321f3dc593d9f33b7d9bab24b8f1a882a8afe + - file: 2026-11-11_RDM-osf.io-dev2027_PR13_Django22_r2.md + sha256: d89602cc93f16e407a97492114d9c5c55247ad252d9eb98816a3a02b0f7b691c + - file: 2026-11-11_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r5.md + sha256: 4e269a34f069738b8e4df19e7cde343306faed11feb4026f1c94d38320969b59 + - file: 2026-11-11_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r1.md + sha256: 434f37786ca539d9b7eb44fe031f5fa091b575c04ff06ac8dbf49c34c5703099 + - file: 2026-11-11_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r2.md + sha256: 1a4a5a200ddbcafce4618aeb3c1ed4196318634dcacc95a6dd7849a12b254ea6 + - file: 2026-11-12_RDM-osf.io-dev2027_PR10_Admin_2FA_r2.md + sha256: 543034ee9ce5dca26c7079ed31af36bfc626329f56dccd8b1b0bb6ca2c961966 + - file: 2026-11-12_RDM-osf.io-dev2027_PR11_Search_ES8_r4.md + sha256: d26a1a45b71b640a63346b53d1be706edaf427e4fb3c604115c4f49742cad5d9 + - file: 2026-11-12_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r3.md + sha256: 8ecd0c27ea064a9cd4417d6376cdb75e53a319da516dfa6f5fed06c9d64acd37 +``` + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**pass(本文の軽微な訂正2件、非阻害)。** 公開版のファイルに阻害指摘はない。P3 の2件は PR 本文だけを対象とする。これはレビュー判定であり、GitHub の approve やマージ許可ではない。 + +新規の独立クローンで指定の完全な head を確認した。共通祖先との差分は `docs/reviews/` の Markdown 12件の追加だけで、変更・削除・別ファイルの追加はない。コミット内の各ファイルを対応する発行済み公開版と直接比較し、12件すべてがバイト単位で一致し、`publication-validation.json` の SHA-256 とも一致した。全件が2026-11-12発行の公開版0.2である。公開記録のみのレビューのため、過去のアプリケーション試験は再実行していない。 + +### 指摘 + +**R1-01 / P3 — 記載する検査件数を訂正する。** PR 本文の検証節は検査対象を `154` 件としている。この head で `python3 tools/docs_check.py` を実行すると、検査 **166** 件、除外8件、既存の警告38件、エラー0件で、新規レビュー12件の警告は0件となる。検査は `git ls-files` で追跡対象ファイルを列挙するため、154件では追加12件の検査を示せない。件数を訂正し、コミット済みの追加ファイルを検査対象に含めたことを明記する。 + +**R1-02 / P3 — 公開用変換の範囲を正確に説明する。** PR 本文の方法節は、REV の変更が URL とパスを名前・番号の平文に置き換えたことだけ、としている。実際の発行版にはローカルのガイド参照のリポジトリ相対リンク化、版・来歴メタデータの追記もあり、一部のコマンド参照には引用符付きの代替表示を使う。これらの公開用参照・メタデータの変更を明記する。判定・指摘・数値の保持は、公開版の検証結果とバイト一致により裏付けられている。 + +### 検証 + +12件は文書検査とリポジトリの manifest・非公開 URL 検査に合格した。URL・パスの直接確認でも、非公開リポジトリ URL、レビュワの端末のパス、ローカルパスへのリンクは見つからなかった。残る `/home/node/app` は説明対象のコンテナ内作業ディレクトリであり、レビュワの端末の場所ではない。Gitleaks は12件すべて(212804 bytes)を検査して検出0件、空白差分検査も合格した。秘密情報は検出されなかった。 + +2026-11-11 16:02 UTC 時点で、対象 head の8検査がすべて成功した。対象は Check Links、Build MkDocs Site、Manifest validation and private-URL policy、Secret scan (gitleaks)、Semgrep static analysis、Trivy filesystem scan (report only at M1)、Python 3.11・3.12 の Unit tests である。実行記録: [Documentation Build and Check](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43050442902), [Security Checks](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43050443092), [Unit Tests](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43050442763)。Trivy は報告のみの役割を保持し、ジョブ成功は別途の脆弱性受容判定ではない。 + +PR 本文の収録一覧は正確で、osf.io #8 r4/r5、#10 r2、#11 r4、#12 r2/r3、#13 r2、y-websocket #5 r1/r2/r3、ember-osf-web #2 r2、modular-file-renderer #7 r1 を含む。osf.io #11/#13 と y-websocket #5 r3 の pass 表示も保存された記録と一致し、元の判定範囲や残る統合条件を変更しない。 + +過去の欠落一覧も正確で、osf.io #8 r1〜r3、#10 r1、#11 r1〜r3、#12 r1、#13 r1 の9件である。指定の原本レビュー保管先にいずれもなく、各回に対応する REV コメントは各 PR に残っている。scratch 整理で失われたという説明は提供された来歴であり、今回は現時点の不在と残存コメントを確認したもので、過去の削除操作を検証したものではない。 + +PR #45 head `7d0ba60a8a72f38595680ba0b49cc1d89405b023` は REV の r3 公開版 `docs/reviews/2026-11-12_RDM-developer-guide_PR45_Pin_Py313_r3.md` を追加しており、発行済み版とバイト単位で一致した(SHA-256 `762969614e37c65ad40b41cb69f52904d2fd45cea0bd8f0bf3c356bb335b51ca`)。PR #45 にはコメントしていない。 + +### バイト一致の証跡 + +[英語節の SHA-256 一覧](#byte-identity-evidence)は、コミット内と発行済み版の双方に共通する値である。ファイル名は `docs/reviews/` からの相対名である。 diff --git a/docs/reviews/2026-11-12_RDM-developer-guide_PR47_Review_Records_r1.md b/docs/reviews/2026-11-12_RDM-developer-guide_PR47_Review_Records_r1.md new file mode 100644 index 0000000..95c3c71 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-developer-guide_PR47_Review_Records_r1.md @@ -0,0 +1,104 @@ +# REV PR47 Review records review r1 / レビュー記録公開レビュー r1 + +> **Summary:** All three added records match REV's originals byte for byte, and the change contains only those additions. The PR description agrees with the records; its preliminary documentation-check count correction is resolved. +> **概要:** 追加された3件は REV の原本とバイト単位で一致し、変更はその3件の追加だけである。PR 本文は記録と整合し、事前に指摘した文書検査件数の訂正も解消している。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-12. **Learned:** Publication-ready originals can be preserved without rewriting, but the PR's validation count must reflect the committed additions. / 初めから公開可能な原本は書き換えず保存できるが、PR の検証件数はコミットされた追加ファイルを含む値でなければならない。 +- Applies to / 対象: [PR #47](https://github.com/RCOSDP/RDM-developer-guide/pull/47), head `bbba31f93156a02b3e745286f7b3ca55cc6a47fb`, base `977872075537a7c1367c8df71ad313cad8c51ac6`, branch `docs/review-records-2026-11-12b`. +- PR title / PR 題名: docs(review): osf.io #12 r4・#14 r1 と ember-osf-web #3 r1 のレビュー記録(pass)を収める. +- Reviewer / 担当: REV(担当レビュワ, Codex Astra). +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md). +- Used by / 利用先: PR #47 publication decision and [integration status / 統合状況](../status/README.md). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**PASS at `bbba31f93156a02b3e745286f7b3ca55cc6a47fb`. All eight CI jobs succeeded. No unresolved finding.** This is a review verdict, not a GitHub approval or a merge action. + +A fresh isolated clone was inspected at the full head in the header. The coordinator expanded the original two-record scope to include the osf.io PR #14 r1 record. The two-commit diff against the merge base contains exactly three added Markdown files under `docs/reviews/`: osf.io PR #12 r4 (156 lines), ember-osf-web PR #3 r1 (138 lines), and osf.io PR #14 r1 (262 lines). There are no other additions, modifications, deletions, or renames. All three committed files were compared directly with the supplied originals, without text normalization, and all are byte-identical. They retain version 0.1 dated 2026-11-12. + +### Findings + +**No remaining content finding. Preliminary R1-01 / P3 is resolved.** The original description reported 170 checked files, while the initial two-record head checked 172. The coordinator corrected that count and updated it to 173 when adding the third record. At the final reviewed head, the documentation checker confirms **173** files checked, 8 exempt, 38 existing warnings, and zero errors. All three additions are included and have no warnings. The final PR description accurately records those counts and the correction history. + +### Publication and description checks + +None of the three added records contains a private-repository URL or reviewer-machine absolute path. The PR #14 record retains `http://web:5000` and `http://wb:7777`, which are the documented development-service addresses, not private-repository links or credentials. Relative source paths, environment-variable names, commit identifiers, and evidence basenames are retained as review evidence; no secret value was detected. The manifest/private-URL policy checker passed with zero findings. Gitleaks scanned the complete review directory with zero findings; a separate scan of the three additions and the PR description also found zero secrets. The whitespace check passed, and the clone's tracked files remain unchanged. + +The final PR description agrees with the records and the inspected history. The osf.io record says pass at `1ad2985080bf3ed4d85d85bacd4ce718f8cee919`, after incorporating Django 2.2 from develop, with 14 successful CI jobs; the ember-osf-web record says pass at `b1e2ad328c4dfed47b680c77500cb3deb638c935`, with successful push and pull-request runs. The added osf.io PR #14 record says pass at `35c6bcdde33bf85e8d9826e76693002b26e2977b`, incorporating Django 2.2 from develop, with 14 successful CI jobs. The pairing of osf.io PR #12 with y-websocket PR #5 and ember-osf-web PR #3 with osf.io PR #14 is preserved. The merged guide PR #46 contains the y-websocket PR #5 r3 pass record. ADR-04 requires a recorded REV pass for the M2 standing delegation, subject to its other conditions. The claim that these three originals needed no publication rewrite is confirmed by their byte identity and content inspection. + +This publication review does not rerun historical application tests, reopen the underlying code reviews, or establish deployed-service acceptance. Their original limitations and remaining deployment checks remain in force. No merge, approval, close, push, commit, or modification of the submitted files was performed. + +### Verification evidence + +These are measured review results, not a machine-consumed canonical dataset. The file names are relative to `docs/reviews/`; each SHA-256 value identifies both the committed copy and its supplied original. + +```toon +files[3]{file,bytes,lines,sha256,byte_identical}: + 2026-11-12_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r4.md,23950,156,c44009b09f547d8a8df2d184766de5e896687b655857af3186456c9b4130e2d5,true + 2026-11-12_RDM-ember-osf-web-dev2027_PR3_Render_Link_r1.md,18651,138,36674cdc255017b88ec702468a35eb71b08c2b025396fead2fb1f87cda424dbd,true + 2026-11-12_RDM-osf.io-dev2027_PR14_Render_URL_r1.md,35301,262,e7c0816d1ae6384920ef16e8cfa8dbb6dddf1b796f3855b6188ad3675086678c,true +local_checks[5]{check,result}: + documentation,pass; 173 checked; 8 exempt; 38 existing warnings; zero errors + manifest_and_private_URL_policy,pass; zero findings + gitleaks_review_directory,pass; zero findings + gitleaks_three_additions_and_PR_body,pass; zero findings + diff_whitespace,pass +``` + +At 2026-11-11 21:13 UTC (2026-11-12 06:13 JST), all eight jobs and all three workflow runs completed successfully. The run metadata identifies the reviewed head, and the final PR read confirms that its head, three-file scope and description are unchanged. CI means GitHub's automated checks. Runs: [Documentation Build and Check](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43099843981), [Security Checks](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43099844078), [Unit Tests](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43099843944). + +```toon +ci_jobs[8]{run,job_id,job,result}: + 43099843981,130787510731,"Build MkDocs Site",success + 43099843981,130787508223,"Check Links",success + 43099844078,130787504619,"Manifest validation and private-URL policy",success + 43099844078,130787507307,"Secret scan (gitleaks)",success + 43099844078,130787507978,"Semgrep static analysis",success + 43099844078,130787509178,"Trivy filesystem scan (report only at M1)",success + 43099843944,130787505073,"Unit tests (installer, tools) (3.11)",success + 43099843944,130787503461,"Unit tests (installer, tools) (3.12)",success +``` + +The former head `4a5d4867` had three artifact-upload failures with a 404 workflow-run-not-found response; their build/scan steps succeeded. The coordinator requested reruns and then superseded that head with the third-record addition. Those old-head results are not acceptance evidence for the final head. All final-head checks, including artifact uploads, succeeded. Trivy retains its report-only role; a successful job does not constitute a separate vulnerability acceptance decision. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**`bbba31f93156a02b3e745286f7b3ca55cc6a47fb` を PASS と判定。CI 全8ジョブ成功。未解消の指摘なし。** これはレビュー判定であり、GitHub の approve や merge ではない。 + +ヘッダに記載した完全な head を新規の独立クローンで確認した。調整者の指示で当初の2件に osf.io PR #14 r1 を追加して対象を拡張した。共通祖先との差分は2コミットで、`docs/reviews/` に osf.io PR #12 r4(156行)、ember-osf-web PR #3 r1(138行)、osf.io PR #14 r1(262行)の Markdown 3件を追加するだけである。ほかの追加・変更・削除・改名はない。コミット内の3件を指定された原本と文字列の正規化をせず直接比較し、すべてバイト単位で一致した。全記録が2026-11-12付の版0.1を保持している。 + +### 指摘 + +**未解消の内容指摘なし。事前指摘 R1-01 / P3 は解消。** 当初の本文は文書検査170件と記載していたが、2件収録時の head での実測は172件だった。調整者は件数を訂正し、3件目の追加に伴い173件へ更新した。最終対象 head の検査は **173** 件、除外8件、既存警告38件、エラー0件となる。追加された3件も検査対象に入り、全記録の警告は0件である。最終の PR 本文はこの件数と訂正の経緯を正確に記載している。 + +### 公開適性と本文の確認 + +追加された3件には非公開リポジトリ URL とレビュワ端末の絶対パスがない。PR #14 の記録に残る `http://web:5000` と `http://wb:7777` は文書化された開発環境のサービスアドレスであり、非公開リポジトリへのリンクや資格情報ではない。ソースの相対パス、環境変数名、コミット識別子、証跡のファイル名はレビューの根拠として残り、秘密の値は検出されなかった。manifest・非公開 URL 方針の検査は指摘0件で合格した。Gitleaks はレビュー保管ディレクトリ全体を検査して検出0件であり、追加3件と PR 本文を対象にした別の検査でも秘密情報の検出は0件だった。空白差分検査も合格し、クローンの追跡対象ファイルは未変更である。 + +最終の PR 本文は、記録と確認した履歴に一致する。osf.io の記録は develop の Django 2.2 取り込み後の `1ad2985080bf3ed4d85d85bacd4ce718f8cee919` を pass とし、CI 14ジョブの成功を記録している。ember-osf-web の記録は `b1e2ad328c4dfed47b680c77500cb3deb638c935` を pass とし、push と pull_request の両実行の成功を記録している。追加された osf.io PR #14 の記録は、develop の Django 2.2 を取り込んだ `35c6bcdde33bf85e8d9826e76693002b26e2977b` を pass とし、CI 14ジョブの成功を記録している。osf.io PR #12 と y-websocket PR #5、ember-osf-web PR #3 と osf.io PR #14 の組合せも維持される。マージ済みのガイド PR #46 は y-websocket PR #5 r3 の pass 記録を含む。ADR-04 は M2 常設委任の条件として REV の合格記録を求め、ほかの条件も維持する。今回の原本3件は公開用に書き換える必要がなかったという説明を、バイト一致と内容確認で裏付けた。 + +今回の公開レビューでは過去のアプリ試験を再実行せず、元のコードレビューをやり直さず、配備済みサービスの受入を確認していない。元の記録にある制約と残る配備確認は引き続き有効である。merge、approve、close、push、commit、提出ファイルの変更は行っていない。 + +### 検証の証跡 + +[英語節の検証一覧](#verification-evidence)は今回実測した結果であり、機械が読む正本データではない。ファイル名は `docs/reviews/` からの相対名で、SHA-256 はコミット内と指定原本の両方に共通する。文書検査は173件、除外8件、既存警告38件、エラー0件。manifest・非公開 URL 方針、Gitleaks の両検査、空白差分検査も合格した。 + +2026-11-12 06:13 JST(2026-11-11 21:13 UTC)時点で、全8ジョブと全3ワークフローが成功して完了した。実行情報はレビュー対象 head を示し、最終の PR 読取りでも head・追加3件の範囲・本文が変わっていないことを確認した。CI は GitHub の自動検査を指す。実行記録: [Documentation Build and Check](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43099843981), [Security Checks](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43099844078), [Unit Tests](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43099843944)。 + +[英語節のジョブ別一覧](#verification-evidence)に全8件の実行番号、ジョブ番号、成功結果を記録した。旧 head `4a5d4867` では、ビルド・スキャン本体は成功したが、成果物アップロード3件が workflow run not found の404で失敗した。調整者が再実行した後、3件目を追加する新 head に対象を切り替えた。旧 head の結果は最終対象の合格根拠に使っていない。最終 head は成果物アップロードも含めて全検査が成功した。Trivy は報告のみの役割を維持し、ジョブ成功を別途の脆弱性受容判断とは扱わない。 diff --git a/docs/reviews/2026-11-12_RDM-developer-guide_PR48_Missing_Records_r1.md b/docs/reviews/2026-11-12_RDM-developer-guide_PR48_Missing_Records_r1.md new file mode 100644 index 0000000..da30cee --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-developer-guide_PR48_Missing_Records_r1.md @@ -0,0 +1,109 @@ +# REV PR48 Missing review records r1 / 欠落レビュー記録のレビュー r1 + +> **Summary:** The nine references match the real review comments; the new seven-column data tables need the format required by SPEC-06 §4. +> **概要:** 9 件の参照は実際のレビューコメントと一致する。追加した 7 列のデータ表は SPEC-06 §4 の形式に修正が必要。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only link destinations for publication, replacing scratch-path links with repository-relative links; the original review text and verdict are preserved verbatim. / REV(担当レビュワ)は公開用にリンク先だけを scratch パスからリポジトリ相対パスへ変更し、元のレビュー本文と判定は逐語的に保持した。 +- Provenance / 出典: Original review file / 元のレビュー記録: `/private/tmp/claude-501/-Users-komiyama-ai-development-GitHub-RDM-developer-guide/8baac84b-080f-4104-a2b5-7416702c57e1/scratchpad/reviews/2026-11-12_RDM-developer-guide_PR48_Missing_Records_r1.md`. +- Version / 版: 0.1 — 2026-11-12. **Learned:** passing automated documentation checks does not prove compliance with the data-format rule, which requires manual review. / 文書の自動検査に合格しても、データ形式の規則への適合は証明されず、人による確認が必要と分かった。 +- Applies to: [RDM-developer-guide PR #48](https://github.com/RCOSDP/RDM-developer-guide/pull/48), head `01709926bcba997fb8eb1ccb502bfdcaf670f872`, base `f4199fb3c6cc49fd93816c4896d8a56380cf57d8`. +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md). +- Used by: [PR #48](https://github.com/RCOSDP/RDM-developer-guide/pull/48). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and finding + +**changes requested** for one documentation-format issue. Review date: 2026-11-12. Reviewer: REV (Codex Astra). The scope is the README change in PR #48, titled “docs(review): 保存されなかった 9 件のレビュー記録を注記し、代わりの PR コメントを示す”. + +**R1-01 / P2 — Use TOON for the record data.** `docs/reviews/README.md:56–66` and `114–124` add nine records with seven fields each. SPEC-06 §4 requires document data in a `toon` fenced block and reserves tables for comparisons with few columns. These are record inventories, not compact comparisons. Convert both inventories to TOON while retaining every value and the scope restrictions on the two pass verdicts. Translate those scope descriptions into English in the English half. No new machine-readable canonical file is necessary for this documentation-only inventory. The automated checker does not enforce this format rule. + +### Evidence and scope + +A fresh clone under `scratchpad/pr48-rev-r1` was clean before and after review. The PR changes only `docs/reviews/README.md` (38 insertions, one deletion). Removing the two new sections and reversing the version-header update reproduces the base file byte for byte; no other existing content changed. The new Version 0.2 header records a lesson and preserves Version 0.1. + +Read-only `gh api` requests retrieved the comments from each PR and by comment ID. Every ID belongs to the stated PR in RDM-osf.io-dev2027, every body starts with `REV(担当レビュワ`, and every round, verdict, reviewed head and UTC minute matches. PR #11 r3 uses capitalized “Pass” and names the head as the endpoint of its reviewed range. PR #8 r3 and #11 r3 are limited passes, not whole-PR approvals; the table preserves those limitations. Exact UTC posting times are recorded here: + +```toon +records[9]{pr,round,comment_id,created_at_utc,verdict,reviewed_head}: + 8,r1,6757009993,2026-11-10T02:12:35Z,changes requested,e7f23e13141f + 8,r2,6758141691,2026-11-10T03:28:56Z,changes requested,8bb07f17c2 + 8,r3,6759472716,2026-11-10T05:03:01Z,pass (R2 changes only),49e5521451 + 10,r1,6759171742,2026-11-10T04:41:17Z,changes requested,5355858363b6 + 11,r1,6759274738,2026-11-10T04:48:29Z,changes requested,75ceaf5cb492 + 11,r2,6760403905,2026-11-10T06:08:17Z,changes requested,58ba83af4b7c + 11,r3,6763524193,2026-11-10T09:13:37Z,pass (58ba83a..3eb4042 only),3eb4042 + 12,r1,6763575801,2026-11-10T09:16:17Z,changes requested,aa30a37d + 13,r1,6763600948,2026-11-10T09:17:37Z,changes requested,ef9e64261b +``` + +The English and Japanese inventories contain identical values, and the surrounding prose has the same meaning. The English verdict cells still use Japanese explanatory labels; translate them during R1-01. No private repository URL appears in the README. Anchors, Jump links, relative links and version structure pass inspection. The explanation that records were lost and the owner's 2026-11-12 decision are task-supplied history; the surviving comments cannot independently prove that history. + +### Validation + +Run from the clean clone root `scratchpad/pr48-rev-r1`: + +```sh +python3 tools/docs_check.py +python3 tools/manifest_check.py +git diff --check f4199fb3c6cc49fd93816c4896d8a56380cf57d8...HEAD +``` + +All three exit codes were 0. `docs_check` checked 174 files, exempted eight, and reported 38 nonfatal glossary warnings outside the modified file. `manifest_check` reported zero manifest findings and zero policy findings, scanning 726 text files and skipping 63 non-UTF-8 files. A row-verification probe initially compared “pass” case-sensitively and stopped on “Pass”; the corrected case-insensitive comparison completed all nine rows successfully. That was a probe issue, not a source-data discrepancy. + +No source files were edited. This record is uncommitted. No merge, approval, closure, push, commit, Docker state change, or runtime/.env access was performed. R1-01 remains for the author. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と指摘 + +文書形式の指摘 1 件により **changes requested(要修正)**。レビュー日は 2026-11-12、担当は REV(Codex Astra)。範囲は PR #48「docs(review): 保存されなかった 9 件のレビュー記録を注記し、代わりの PR コメントを示す」の README 差分。 + +**R1-01 / P2 — 記録データを TOON にする。** `docs/reviews/README.md:56–66` と `114–124` は、各 7 項目の記録 9 件を追加している。SPEC-06 §4 は文書中のデータを `toon` コードブロックで記載し、表を列の少ない比較に限定している。今回の一覧は記録データであり、少数列の比較ではない。英日両方を TOON に変え、全値と pass 2 件の対象範囲を保持すること。英語側の対象範囲の説明は英訳すること。文書だけの一覧なので、機械向け正本ファイルの新設は不要。自動検査はこの形式規則を検査しない。 + +### 証拠と範囲 + +`scratchpad/pr48-rev-r1` に新規 clone し、レビュー前後とも作業ツリーは clean だった。変更ファイルは `docs/reviews/README.md` のみで、38 行追加・1 行削除。新設した英日 2 節を除き、版ヘッダを元に戻すと基点のファイルとバイト単位で一致し、それ以外の既存内容は変わっていない。新しい Version 0.2 は学びを記録し、Version 0.1 を保持している。 + +読み取り専用の `gh api` で PR ごとのコメント一覧とコメント ID ごとの内容を取得した。全 ID は RDM-osf.io-dev2027 の指定 PR に属し、本文はすべて `REV(担当レビュワ` で始まる。回、判定、対象の先頭、UTC の分まで一致した。PR #11 r3 は大文字始まりの “Pass” で、対象の先頭はレビュー範囲の終点として記載されている。PR #8 r3 と #11 r3 は差分限定の合格で、PR 全体の承認ではない。表もこの限定を保持している。正確な UTC 投稿日時は次のとおり。 + +```toon +records[9]{pr,round,comment_id,created_at_utc,verdict,reviewed_head}: + 8,r1,6757009993,2026-11-10T02:12:35Z,changes requested,e7f23e13141f + 8,r2,6758141691,2026-11-10T03:28:56Z,changes requested,8bb07f17c2 + 8,r3,6759472716,2026-11-10T05:03:01Z,pass (R2 changes only),49e5521451 + 10,r1,6759171742,2026-11-10T04:41:17Z,changes requested,5355858363b6 + 11,r1,6759274738,2026-11-10T04:48:29Z,changes requested,75ceaf5cb492 + 11,r2,6760403905,2026-11-10T06:08:17Z,changes requested,58ba83af4b7c + 11,r3,6763524193,2026-11-10T09:13:37Z,pass (58ba83a..3eb4042 only),3eb4042 + 12,r1,6763575801,2026-11-10T09:16:17Z,changes requested,aa30a37d + 13,r1,6763600948,2026-11-10T09:17:37Z,changes requested,ef9e64261b +``` + +英日一覧の値は同一で、周囲の説明も同じ意味だった。英語側の判定欄には日本語の説明が残るため、R1-01 の修正時に英訳する。README に非公開リポジトリの URL はない。アンカー、Jump、相対リンク、版構成を確認した。記録喪失の経緯と所有者の 2026-11-12 の決定は依頼で与えられた履歴であり、現存するコメントだけでは独立に証明できない。 + +### 検査 + +実行場所は clean clone のルート `scratchpad/pr48-rev-r1`。 + +```sh +python3 tools/docs_check.py +python3 tools/manifest_check.py +git diff --check f4199fb3c6cc49fd93816c4896d8a56380cf57d8...HEAD +``` + +3 コマンドとも終了コードは 0。`docs_check` は 174 ファイルを検査し、8 件を免除、変更対象以外で失敗扱いではない用語注警告 38 件を報告した。`manifest_check` は manifest・公開方針とも指摘 0 件で、テキスト 726 ファイルを検査し、非 UTF-8 の 63 ファイルを除外した。行照合用の初回 probe は “pass” と “Pass” の大文字小文字の違いで停止したが、大小文字を正規化した照合では全 9 件が成功した。これは probe の問題で、元データの不一致ではない。 + +ソースファイルは未編集で、この記録は未コミット。merge・approve・close・push・commit、Docker の状態変更、runtime/.env の参照は行っていない。作者の残作業は R1-01 の修正。 diff --git a/docs/reviews/2026-11-12_RDM-developer-guide_PR48_Missing_Records_r2.md b/docs/reviews/2026-11-12_RDM-developer-guide_PR48_Missing_Records_r2.md new file mode 100644 index 0000000..f1302c4 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-developer-guide_PR48_Missing_Records_r2.md @@ -0,0 +1,71 @@ +# REV PR48 Missing review records r2 / 欠落レビュー記録のレビュー r2 + +> **Summary:** R1-01 is closed: both record inventories use TOON, the English labels are English, and all nine records match the live PR comments. Verdict: pass. +> **概要:** R1-01 は解消。英日両方の記録一覧は TOON になり、英語側の説明は英語で、全 9 件が現存する PR コメントと一致する。判定は pass。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only link destinations for publication, replacing scratch-path links with repository-relative links; the original review text and verdict are preserved verbatim. / REV(担当レビュワ)は公開用にリンク先だけを scratch パスからリポジトリ相対パスへ変更し、元のレビュー本文と判定は逐語的に保持した。 +- Provenance / 出典: Original review file / 元のレビュー記録: `/private/tmp/claude-501/-Users-komiyama-ai-development-GitHub-RDM-developer-guide/8baac84b-080f-4104-a2b5-7416702c57e1/scratchpad/reviews/2026-11-12_RDM-developer-guide_PR48_Missing_Records_r2.md`. +- Version / 版: 0.1 — 2026-11-12. **Learned:** changing the data format must preserve the scope of limited passes as well as identifiers and dates; parsing and source-comment checks confirm both. / データ形式の変更では ID や日時だけでなく、限定付き合格の対象範囲も保つ必要があり、構文の解析と元コメントの照合で両方を確認できると分かった。 +- Applies to: [RDM-developer-guide PR #48](https://github.com/RCOSDP/RDM-developer-guide/pull/48), head `730e4858d831eba823b96b663e1b85845159f868`, base `f4199fb3c6cc49fd93816c4896d8a56380cf57d8`. +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [r1](2026-11-12_RDM-developer-guide_PR48_Missing_Records_r1.md). +- Used by: [PR #48](https://github.com/RCOSDP/RDM-developer-guide/pull/48). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**pass. R1-01 is closed; no new findings.** Reviewer: REV (Codex Astra). Date: 2026-11-12. This short second round reviews PR #48, “docs(review): 保存されなかった 9 件のレビュー記録を注記し、代わりの PR コメントを示す”, specifically the correction since r1 head `01709926bcba997fb8eb1ccb502bfdcaf670f872` and the nine source references. + +In `docs/reviews/README.md:56–68,115–127`, both seven-field inventories are now fenced `toon` blocks as required by SPEC-06 §4. Both parse successfully with the repository's `parse_toon` function and each contains nine records. English field names and verdict descriptions are English. The Japanese descriptions translate those verdicts exactly; all other values match between languages. The r1-to-r2 diff changes only these two inventories. The version header and surrounding explanation remain intact. + +### Evidence and validation + +Fresh read-only `gh api` requests for all nine comment IDs confirmed the repository and PR, REV prefix, review round, verdict, reviewed head, and UTC posting minute. The two limited passes preserve their original scope: PR #8 r3 covers the R2 delta, and PR #11 r3 covers only `58ba83a..3eb4042`. The latter source spells “Pass” with a capital P and identifies the head as the range endpoint. Neither inventory expands these verdicts into whole-PR acceptance. No private repository URL is included in the README. + +A new clone at `scratchpad/pr48-rev-r2` was checked out at the reviewed head and remained clean before and after validation. From that clone root, these commands all exited 0: + +```sh +python3 tools/docs_check.py +python3 tools/manifest_check.py +git diff --check f4199fb3c6cc49fd93816c4896d8a56380cf57d8...HEAD +``` + +`docs_check` checked 174 files, exempted eight, and reported 38 nonfatal glossary warnings outside the changed file. `manifest_check` reported zero manifest findings and zero policy findings; it scanned 726 text files and skipped 63 non-UTF-8 files. The independent TOON/source-comment probe also exited 0. The automated documentation checker alone does not enforce all of §4; the format and translations were also inspected directly. + +The missing-file history and owner's 2026-11-12 decision remain task-supplied history, not independently established by the surviving comments. No source files were edited; this review record is uncommitted. No merge, approval, closure, push, commit, Docker state change, or runtime/.env access was performed. No correction remains within this review's scope. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**pass(合格)。R1-01 は解消し、新規指摘はない。** 担当は REV(Codex Astra)、レビュー日は 2026-11-12。短い第 2 回として、PR #48「docs(review): 保存されなかった 9 件のレビュー記録を注記し、代わりの PR コメントを示す」の r1 対象 `01709926bcba997fb8eb1ccb502bfdcaf670f872` からの修正と、参照先 9 件を確認した。 + +`docs/reviews/README.md:56–68,115–127` の 7 項目の一覧は両方とも SPEC-06 §4 に従う `toon` コードブロックになった。リポジトリの `parse_toon` 関数で両方の解析に成功し、それぞれ 9 件を含む。英語側の項目名・判定説明は英語であり、日本語側の判定説明も同じ意味になっている。他の値は英日で一致する。r1 からの差分はこの 2 一覧だけで、版ヘッダと周囲の説明は保持されている。 + +### 証拠と検査 + +9 件すべてのコメント ID を読み取り専用の `gh api` で再取得し、リポジトリ・所属 PR・REV 接頭辞・レビュー回・判定・対象の先頭・UTC 投稿日時の分まで一致した。限定付き pass 2 件の範囲も保持されている。PR #8 r3 は R2 の差分、PR #11 r3 は `58ba83a..3eb4042` のみが対象。後者の元コメントは大文字始まりの “Pass” で、対象の先頭を範囲の終点として示す。どちらの一覧も PR 全体の合格へ拡大していない。README に非公開リポジトリの URL はない。 + +`scratchpad/pr48-rev-r2` に新規 clone して対象の先頭を checkout し、検査前後とも作業ツリーは clean だった。その clone のルートから次を実行し、すべて終了コード 0 を確認した。 + +```sh +python3 tools/docs_check.py +python3 tools/manifest_check.py +git diff --check f4199fb3c6cc49fd93816c4896d8a56380cf57d8...HEAD +``` + +`docs_check` は 174 ファイルを検査し、8 件を免除した。変更ファイル以外の用語注警告 38 件は失敗扱いではない。`manifest_check` は manifest・公開方針とも指摘 0 件で、テキスト 726 ファイルを検査し、非 UTF-8 の 63 ファイルを除外した。独立した TOON と元コメントの照合も終了コード 0。文書の自動検査だけでは §4 全体を保証しないため、形式と翻訳は直接確認した。 + +記録喪失の経緯と所有者の 2026-11-12 の決定は依頼で与えられた履歴であり、現存するコメントだけでは独立に証明していない。ソースファイルは未編集で、この記録は未コミット。merge・approve・close・push・commit、Docker の状態変更、runtime/.env の参照は行っていない。このレビュー範囲に残る修正はない。 diff --git a/docs/reviews/2026-11-12_RDM-developer-guide_PR49_Review_Records_r1.md b/docs/reviews/2026-11-12_RDM-developer-guide_PR49_Review_Records_r1.md new file mode 100644 index 0000000..b31911d --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-developer-guide_PR49_Review_Records_r1.md @@ -0,0 +1,114 @@ +# REV PR49 Review records review r1 / レビュー記録公開レビュー r1 + +> **Summary:** All seven additions are byte-identical to the supplied originals, and all eight checks passed on the reviewed head. The PR description needs one minor correction: the r6 record closes R6-03 and R6-04 and leaves only R6-05 open. +> **概要:** 追加7件はすべて指定原本とバイト単位で一致し、レビュー対象 head の全8チェックが成功した。PR 本文には軽微な訂正が1件必要である。r6 記録は R6-03・R6-04 を解消済みとし、R6-05 だけを未解消としている。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-12. **Learned:** A verbatim review archive can be correct while its publication summary confuses resolved findings with the remaining correction. / レビュー原文を正しく保存しても、公開時の要約では解消済み指摘と残る修正を混同し得る。 +- Applies to / 対象: [PR #49](https://github.com/RCOSDP/RDM-developer-guide/pull/49), branch `docs/review-records-2026-11-12c`, head `cab89dd3eb56a2aacaf7ec903c1ed2e14de8ed71`, base `b81628f2e62b396db32abb8c6e509716c6f3782f`. +- Reviewer / 担当: REV(担当レビュワ, Codex Astra). +- Review comment / レビューコメント: [6814237112](https://github.com/RCOSDP/RDM-developer-guide/pull/49#issuecomment-6814237112); one comment posted and body verified / 1件投稿し本文を照合済み。 +- Related / 関連: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [PR #8 r6 record / PR #8 r6 記録](2026-11-12_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r6.md). +- Used by / 利用先: PR #49 publication decision / PR #49 の公開判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Changes requested for PR-description accuracy: R1-01 / P3. No P1/P2 finding.** The seven committed records pass the publication checks; the requested correction is only to the PR description. P3 denotes a minor documentation correction. This verdict is not a GitHub approval or merge action. + +A new isolated clone was inspected at the full head in the header. The merge-base diff contains exactly seven added files under `docs/reviews/`, totaling 1,571 added lines and zero deletions. There are no other added, modified, deleted or renamed files. Each committed blob was directly compared with its designated original as bytes, without text normalization; all seven match. The clone's tracked files remain unchanged. + +### R1-01 — P3: distinguish resolved r6 findings in the verdict table + +**Location:** PR description, verdict-table row `#8 r6`; supporting record `2026-11-12_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r6.md:24,223`. + +The row reads `要修正(R6-03〜R6-05)`. In the final r6 record, R6-03 is already closed by `efee5aa47e`, R6-04 is closed by `71e26d2751`, and only R6-05 / P2 remains open. CI is incomplete at that historical cutoff. Grouping all three identifiers under the outstanding correction misstates the final disposition and can make resolved P1 findings appear open. + +Replace that table entry with `要修正(R6-05 / P2、当時の最終 head の CI は未完了。R6-03・R6-04 は解消済み)` or equivalent wording. Preserve the seven original records verbatim. No source-file correction is requested. + +The remaining table entries agree with the records: #8 r7 requires R7-01, the missing private-security CI job; #10 r3 retains the global-admin-guard dependency on #8; #11 r5 and r6 pass; #15 r1 requires changes; #15 r2 passes. The #10 dependency also requires reintegration and verification after #8 merges; the short table entry does not replace that original condition. These are historical verdicts at their recorded heads, not new acceptance decisions for those application PRs. + +### Publication checks + +Inspection of both language sections and URL/path searches found no private-repository URL or reviewer-machine absolute path in the seven additions. The only external URLs in those records are public Django and Django REST framework source links pinned to commits. Repository-relative code paths and endpoint paths are ordinary review evidence. No secret value was detected. Gitleaks scanned all seven additions and the PR description together and reported zero leaks; the manifest/private-URL policy check also passed with zero findings. The PR body contains public tool/session links but no detected private-repository URL, local filesystem path or secret value. + +The documentation checker passed with **183 checked files, 8 exempt, 38 existing warnings and zero errors**, with no warning on the new records. The manifest checker and `git diff --check` passed. The PR body's reported count and successful checker results are therefore supported. Historical application tests were not rerun as part of this publication review, and their recorded limits remain in effect. + +### Verification evidence + +The following measured results are not a mirror of a canonical data file. File names are relative to `docs/reviews/`; each SHA-256 identifies both the committed file and its supplied original. + +```toon +files[7]{file,bytes,lines,sha256,byte_identical}: + 2026-11-12_RDM-osf.io-dev2027_PR10_Admin_2FA_r3.md,25028,181,c5339f66b2e199f44b9fe0a528356140afee03aefb2f6644807c591ded005112,true + 2026-11-12_RDM-osf.io-dev2027_PR11_Search_ES8_r5.md,25628,225,e23460b7d014634549bf3086509c86af9e69ed8c44861003ac52e93fff6d78de,true + 2026-11-12_RDM-osf.io-dev2027_PR11_Search_ES8_r6.md,22551,227,9e3fe28010ebc1a7a37742f68b7febcfaab979fbc6c791b0bca5c95d879b0ec8,true + 2026-11-12_RDM-osf.io-dev2027_PR15_Runserver_Threading_r1.md,23790,155,dcaff2e1139d11e9544b46de3dec9879b15bd63d623cd7ba4fcb0071ac43e32f,true + 2026-11-12_RDM-osf.io-dev2027_PR15_Runserver_Threading_r2.md,21359,153,e8b825341705e04175e62b62a6949694041aadbf974082c2e9fc0c1e732186d9,true + 2026-11-12_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r6.md,74978,411,df686bb24f3d67394fea44ea9903aed3078a6b1d6732f422b17efa2006c986bb,true + 2026-11-12_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r7.md,31866,219,93368bf0fb584cc076c57e2f5a85cd27196c6e5834dacc87daad87c0baaf0a6a,true +``` + +At 2026-11-12 04:08 UTC (13:08 JST), the final PR snapshot retained the same head, seven-file scope and description. All three workflow runs had completed successfully, and each run's metadata identified `cab89dd3eb56a2aacaf7ec903c1ed2e14de8ed71`. All eight CI jobs, meaning GitHub's automated checks, succeeded. CI was initially running and its completion was verified before this verdict. + +Runs: [Documentation Build and Check](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43152532509), [Security Checks](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43152532477), [Unit Tests](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43152532652). + +```toon +ci_jobs[8]{run,job_id,job,result}: + 43152532509,130964860707,"Build MkDocs Site",success + 43152532509,130964860961,"Check Links",success + 43152532477,130964861270,"Manifest validation and private-URL policy",success + 43152532477,130964860993,"Secret scan (gitleaks)",success + 43152532477,130964860979,"Semgrep static analysis",success + 43152532477,130964860737,"Trivy filesystem scan (report only at M1)",success + 43152532652,130964861094,"Unit tests (installer, tools) (3.11)",success + 43152532652,130964861252,"Unit tests (installer, tools) (3.12)",success +``` + +Trivy remains report-only; its successful job is not a separate vulnerability-acceptance decision. The only remaining requested action is correcting the r6 summary in the PR description. No merge, approval, closure, push, commit or CI rerun was performed. The authorized GitHub write is one review comment; the bilingual record remains uncommitted. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**PR 本文の正確性について要修正: R1-01 / P3。P1/P2 の指摘なし。** コミット内の7記録は公開検査に合格し、訂正対象は PR 本文だけである。P3 は軽微な文書訂正を表す。この判定は GitHub 上の approve や merge ではない。 + +新規の独立クローンで、ヘッダの完全な head を確認した。共通祖先との差分は `docs/reviews/` の7ファイル追加のみで、合計1,571行追加、削除0行である。ほかの追加・変更・削除・改名はない。コミット内の各ファイルと指定原本を、文字の正規化をせずバイト列で直接比較し、7件すべてが一致した。クローンの追跡対象ファイルは未変更である。 + +### R1-01 — P3: 判定表で r6 の解消済み指摘を区別する + +**場所:** PR 本文の判定表 `#8 r6` 行。根拠は `2026-11-12_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r6.md:24,223`。 + +表は `要修正(R6-03〜R6-05)` と記載している。確定した r6 記録では、R6-03 は `efee5aa47e`、R6-04 は `71e26d2751` で解消済みであり、未解消は R6-05 / P2 だけである。当時の確定時点では CI も未完了だった。3件をまとめて要修正の理由にすると、最終状態と食い違い、解消済みの P1 が未解消と読めてしまう。 + +表の記述を `要修正(R6-05 / P2、当時の最終 head の CI は未完了。R6-03・R6-04 は解消済み)` または同等の表現へ訂正する。7件の原本はそのまま保持する。ソースファイルの修正は求めない。 + +ほかの判定表は原本と一致する。#8 r7 は非公開セキュリティ CI ジョブ未追加の R7-01 が要修正、#10 r3 は #8 の管理画面全体ガードに依存、#11 r5・r6 は pass、#15 r1 は要修正、#15 r2 は pass である。#10 は #8 のマージ後にも再統合と検証が必要であり、表の短い説明は原本の条件を置き換えない。これらは各記録の head に対する過去の判定であり、対象アプリ PR の新たな受入判定ではない。 + +### 公開適性の確認 + +両言語節の内容と URL・パスの検索から、追加7件に非公開リポジトリ URL やレビュワ端末の絶対パスは見つからなかった。記録にある外部 URL は、コミットを固定した公開 Django・Django REST framework ソースへのリンクだけである。リポジトリ相対のコードパスとエンドポイントのパスは通常のレビュー根拠である。秘密の値は検出されなかった。Gitleaks で追加7件と PR 本文を一緒に検査し、検出0件だった。manifest・非公開 URL 方針の検査も指摘0件で合格した。PR 本文には公開のツール・セッションリンクがあるが、非公開リポジトリ URL、ローカルファイルシステムのパス、秘密の値は検出されなかった。 + +文書検査は **183件、除外8件、既存警告38件、エラー0件** で合格し、追加記録への警告もなかった。manifest 検査と `git diff --check` も合格した。したがって PR 本文の検査件数と成功結果は裏付けられる。今回の公開レビューでは過去のアプリ試験を再実行せず、元の記録にある制約を維持する。 + +### 検証の証跡 + +[英語節の検証一覧](#verification-evidence)は今回の実測であり、正本データファイルの複製ではない。ファイル名は `docs/reviews/` からの相対名で、各 SHA-256 はコミット内のファイルと指定原本の両方に共通する。全7件のバイト数・行数・SHA-256・一致結果、および全8ジョブの実行番号・ジョブ番号・成功結果を同一覧に記録した。 + +2026-11-12 13:08 JST(04:08 UTC)の最終 PR 確認でも、head・7ファイルの範囲・本文は変わっていなかった。全3ワークフローが成功で完了し、それぞれの実行情報が `cab89dd3eb56a2aacaf7ec903c1ed2e14de8ed71` を示した。GitHub の自動検査を指す CI は全8ジョブが成功した。最初は実行中だったため、完了を確認してから判定した。 + +実行記録: [Documentation Build and Check](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43152532509)、[Security Checks](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43152532477)、[Unit Tests](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43152532652)。 + +Trivy は報告のみの検査であり、ジョブ成功を別途の脆弱性受容判断とは扱わない。残る依頼事項は PR 本文の r6 要約の訂正だけである。merge、approve、close、push、commit、CI 再実行は行っていない。許可された GitHub への書込みはレビューコメント1件であり、二言語の記録は未コミットで保存する。 diff --git a/docs/reviews/2026-11-12_RDM-developer-guide_PR49_Review_Records_r2.md b/docs/reviews/2026-11-12_RDM-developer-guide_PR49_Review_Records_r2.md new file mode 100644 index 0000000..05fe3ae --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-developer-guide_PR49_Review_Records_r2.md @@ -0,0 +1,89 @@ +# REV PR49 Review records review r2 / レビュー記録公開レビュー r2 + +> **Summary:** The corrected PR description accurately distinguishes the resolved r6 findings from R6-05. R1-01 is closed; the seven records remain byte-identical to their originals and all eight CI checks are successful. +> **概要:** 訂正後の PR 本文は、r6 の解消済み指摘と R6-05 を正しく区別している。R1-01 は解消し、7件の記録は原本とバイト単位で一致したまま、CI 全8チェックも成功している。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-12. **Learned:** Correcting a publication summary can close a review finding without altering the archived reviewer's words or the reviewed commit. / 公開時の要約を訂正すれば、保存したレビュワの原文や対象コミットを変えずに指摘を解消できる。 +- Applies to / 対象: [PR #49](https://github.com/RCOSDP/RDM-developer-guide/pull/49), branch `docs/review-records-2026-11-12c`, head `cab89dd3eb56a2aacaf7ec903c1ed2e14de8ed71`, base `b81628f2e62b396db32abb8c6e509716c6f3782f`. +- Reviewer / 担当: REV(担当レビュワ, Codex Astra). +- Review comment / レビューコメント: [6814384330](https://github.com/RCOSDP/RDM-developer-guide/pull/49#issuecomment-6814384330); one r2 comment posted and body verified / r2 コメント1件投稿・本文照合済み。 +- Related / 関連: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [r1 review comment / r1 レビューコメント](https://github.com/RCOSDP/RDM-developer-guide/pull/49#issuecomment-6814237112) · [PR #8 r6 record / PR #8 r6 記録](2026-11-12_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r6.md). +- Used by / 利用先: PR #49 publication decision / PR #49 の公開判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and resolved finding + +**PASS. R1-01 / P3 is closed. No unresolved finding remains.** This is a publication-review verdict, not a GitHub approval or merge action. + +The PR description now says `要修正(R6-05 / P2 と、当時の CI 未完了。R6-03・R6-04 は解消済み)` for #8 r6. This agrees with the original record at lines 24 and 223: R6-03 was closed by `efee5aa47e`, R6-04 by `71e26d2751`, and R6-05 / P2 remained open while CI was incomplete at that historical cutoff. The previous grouping of resolved findings with outstanding corrections is removed. The only substantive body change since r1 is this row; the body also gained a final newline. + +The remaining verdict rows are accurate and unchanged: #8 r7 requires the missing private-security CI job (R7-01); #10 r3 retains the global-admin-guard dependency on #8; #11 r5 and r6 pass; #15 r1 requires changes; #15 r2 passes. The #10 record still requires reintegration and verification after #8 merges. Publishing the historical records does not change their application-review verdicts or limitations. + +### Scope, identity and publication checks + +The full head and the seven-file PR scope are unchanged from r1. The existing isolated clone was checked against that head, and all seven committed blobs were compared directly with the supplied original bytes again. All match. The diff remains exactly seven added records under `docs/reviews/`, with 1,571 added lines and zero deletions, and no other file changes. + +The seven records are osf.io PR #8 r6 and r7, #10 r3, #11 r5 and r6, and #15 r1 and r2. The r1 record, `2026-11-12_RDM-developer-guide_PR49_Review_Records_r1.md`, retains the per-file byte counts, line counts and SHA-256 evidence. Its evidence remains applicable to the unchanged commit. + +The corrected PR body introduces no URL, local filesystem path or secret value. The r1 inspection of the unchanged records found no private-repository URL or reviewer-machine absolute path. A fresh Gitleaks scan of all seven additions and the corrected body found zero leaks. The existing r1 local results remain valid for this unchanged head: documentation check passed with 183 checked files, 8 exempt, 38 existing warnings, zero errors and no warning on the additions; manifest/private-URL policy check and whitespace check passed. Those unchanged-head checks were not rerun in r2. The body's reported validation count remains accurate. + +### CI evidence and remaining work + +At 2026-11-12 04:17 UTC (13:17 JST), the PR still pointed to `cab89dd3eb56a2aacaf7ec903c1ed2e14de8ed71` and all eight CI checks were completed successfully. CI means GitHub's automated build, test and analysis checks. The same three successful runs were already verified in r1 to identify this exact head. + +Runs: [Documentation Build and Check](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43152532509), [Security Checks](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43152532477), [Unit Tests](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43152532652). + +The following are observed results, not a mirror of a canonical data file. + +```toon +ci_jobs[8]{job,result}: + "Build MkDocs Site",success + "Check Links",success + "Manifest validation and private-URL policy",success + "Secret scan (gitleaks)",success + "Semgrep static analysis",success + "Trivy filesystem scan (report only at M1)",success + "Unit tests (installer, tools) (3.11)",success + "Unit tests (installer, tools) (3.12)",success +``` + +Trivy retains its report-only role; success is not a separate vulnerability-acceptance decision. No correction or CI work remains for this publication review. No historical application tests were rerun. No merge, approval, closure, push, commit or CI rerun was performed. The authorized GitHub write is exactly one r2 review comment; this bilingual record is saved without committing. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と解消した指摘 + +**PASS。R1-01 / P3 は解消。未解消の指摘なし。** これは記録公開のレビュー判定であり、GitHub の approve や merge ではない。 + +PR 本文の #8 r6 行は `要修正(R6-05 / P2 と、当時の CI 未完了。R6-03・R6-04 は解消済み)` へ訂正されている。これは原本の24行目・223行目と一致する。R6-03 は `efee5aa47e`、R6-04 は `71e26d2751` で解消し、当時の確定時点では R6-05 / P2 と未完了の CI が残っていた。解消済み指摘を未解消の修正とまとめた表現は除かれた。r1 以降の本文の実質的な変更はこの行だけであり、末尾には改行も追加されている。 + +ほかの判定行は正確で変更がない。#8 r7 は非公開セキュリティ CI ジョブ未追加の R7-01 が要修正、#10 r3 は #8 の管理画面全体ガードに依存、#11 r5・r6 は pass、#15 r1 は要修正、#15 r2 は pass である。#10 の記録では #8 のマージ後の再統合・検証も引き続き必要となる。過去の記録を公開しても、各アプリレビューの判定や制約は変わらない。 + +### 範囲・原本一致・公開適性 + +完全な head と PR の7ファイルの範囲は r1 から変わっていない。既存の独立クローンがその head を指すことを確認し、コミット内の7ファイルを指定原本のバイト列と再度直接比較した。全件一致した。差分は `docs/reviews/` の7記録追加のみで、1,571行追加、削除0行、ほかのファイル変更なしという状態を維持している。 + +対象7件は osf.io PR #8 r6・r7、#10 r3、#11 r5・r6、#15 r1・r2 である。r1 記録 `2026-11-12_RDM-developer-guide_PR49_Review_Records_r1.md` は各ファイルのバイト数・行数・SHA-256 の根拠を保持しており、変更のないコミットに引き続き適用できる。 + +PR 本文の訂正は URL、ローカルファイルシステムのパス、秘密の値を追加していない。変更のない記録7件について、r1 の確認では非公開リポジトリ URL とレビュワ端末の絶対パスは見つからなかった。追加7件と訂正後の本文を Gitleaks で再検査し、検出0件だった。同じ head に対する r1 のローカル検査結果を引き継ぐ。文書検査は183件、除外8件、既存警告38件、エラー0件、新規記録への警告0件で合格し、manifest・非公開 URL 方針と空白差分の検査も合格している。対象 head が不変のため、これらは r2 で再実行していない。本文の検査件数も正しいままである。 + +### CI の証跡と残作業 + +2026-11-12 13:17 JST(04:17 UTC)の確認でも PR は `cab89dd3eb56a2aacaf7ec903c1ed2e14de8ed71` を指し、全8チェックが成功で完了していた。CI は GitHub の自動ビルド・試験・解析を指す。同じ3件の成功 run がこの完全な head を対象とすることは r1 で確認済みである。 + +実行記録: [Documentation Build and Check](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43152532509)、[Security Checks](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43152532477)、[Unit Tests](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43152532652)。[英語節の一覧](#ci-evidence-and-remaining-work)に全8ジョブと成功結果を記録した。これは観測結果であり、正本データファイルの複製ではない。 + +Trivy は報告のみの検査であり、成功を別途の脆弱性受容判断とは扱わない。今回の記録公開レビューに修正・CI の残作業はない。過去のアプリ試験は再実行していない。merge、approve、close、push、commit、CI 再実行は行っていない。許可された GitHub への書込みは r2 レビューコメント1件だけであり、二言語記録はコミットせず保存する。 diff --git a/docs/reviews/2026-11-12_RDM-developer-guide_PR50_Ubuntu_Amd64_r1.md b/docs/reviews/2026-11-12_RDM-developer-guide_PR50_Ubuntu_Amd64_r1.md new file mode 100644 index 0000000..a5a9e5e --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-developer-guide_PR50_Ubuntu_Amd64_r1.md @@ -0,0 +1,140 @@ +# REV-PR50-r1 Ubuntu amd64 installer review / Ubuntu amd64 インストーラーレビュー + +> **Summary:** Changes requested at head 7ac6e5c. All four required checks pass, but the completion claims, acceptance summary, TOON data and two installer edge cases need correction. +> **概要:** head 7ac6e5c の判定は changes requested。必須の4検査はすべて成功したが、完了の主張、受入集計、TOON データ、インストーラーの境界条件2件に修正が必要。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-12. **Learned:** Publication must redact provenance locations and body artifact paths as well as link destinations; only these location labels changed, with judgments, findings, test results and earlier version lines preserved. / 公開時はリンク先だけでなく出典の場所と本文の成果物パスも秘匿する。場所の表記のみを変更し、判定、指摘、試験結果、過去の版行を保持した。 +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only link destinations for publication: scratch-path links were replaced by repository-relative links or plain-text references. / REV は公開のためリンク先のみを変更し、作業用パスへのリンクをリポジトリ相対リンクまたは平文の参照に置き換えた。 +- Provenance / 出典: Original file / 原本: `2026-11-12_RDM-developer-guide_PR50_Ubuntu_Amd64_r1.md`. Publication 0.3 redacts only original-file locations, local artifact paths and the guest checkout location to basenames or neutral artifact names; prior publication link changes remain. Judgments, findings, test results and earlier version lines are unchanged. / 公開版 0.3 では原本の場所、ローカル成果物のパス、ゲスト配置先のみをファイル名または中立的な成果物名に置換し、前公開版のリンク修正を維持する。判定、指摘、試験結果、過去の版行は変更しない。 +- Version / 版: 0.1 — 2026-11-12. **Learned:** passing repository checks does not establish that a narrative matches its committed evidence; an omitted failed attempt and an unparsed TOON row count survived those checks. / リポジトリの検査が成功しても、説明がコミット済み証跡と一致する証明にはならない。失敗した実行の集計漏れと TOON の行数不一致は検査を通過した。 +- Applies to: RCOSDP/RDM-developer-guide PR #50, round 1; REV(担当レビュワ, Codex Astra). +- Related: [Review index](../reviews/README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-02](../spec/02_installer_cli.md) · [DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md). +- Used by: the coordinator's PR #50 correction and re-review decision. This report remains outside Git; relative links resolve into the independent review clone. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Changes requested.** Reviewed the clean, independent clone at `7ac6e5c6c162753ae1c02d7e1bcaac76863183cd` against `a005acfb5ec06064102170b038a58458d6a7d062`. The ordinary positive timeout forwarding and Ubuntu amd64/Linux arm64 status paths work. The seeded acceptance evidence supports 11/12 core passes and two C4 success failures at the wiki page's 30-second `goto`; it does not establish a successful uninterrupted install or completion of every post-build step. + +No source changes, commits, pushes, approval, merge, close, VM operations, Docker state changes, image/cache pruning, or access to the live `runtime/.env` were performed. Unit tests used their isolated temporary fixtures. Posted exactly one [Japanese PR conversation comment](https://github.com/RCOSDP/RDM-developer-guide/pull/50#issuecomment-6820295801) for this review. + +### Findings + +1. **R1 — P2: remove the claim that unexecuted stages ran.** [DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md), L118 and L274, explicitly lists `scan` and `report` among the stages run and calls the result proof of everything after build. The same record says they were not run at L139/L164 and L295/L320; acceptance remains 11/12. Replace this with the actual sequence (`up`, `health --network`, acceptance attempts), explicitly retain the unrun stages and the failed test, and limit the header's “nothing behind build is specific to amd64” claim at L8. Also exclude imported wiki-frontend from “all the other images ... built natively” at L89/L245. These contradictions otherwise read as completion of an untested security gate. + +2. **R2 — P2: distinguish measurements from extrapolation and untested causes.** DEMO-22 L114/L157/L159/L163 and L270/L313/L315/L319 assert native amd64 takes minutes, never needs a longer wait, and that transient DNS trouble is QEMU networking rather than an installer fault. No native amd64 comparison or DNS diagnosis is committed; the only added artifacts are acceptance outputs. The emulated build stopped after 5 h 12 min, so a full working-day failure and a roughly nine-hour completion time are estimates, not completed measurements. [SPEC-02](../spec/02_installer_cli.md) L8 and the [environment guide](../guides/environment/README.md) L8 repeat the categorical working-day statement; SPEC-02 also connects compile time to an option that only affects `up`. Keep the reported numpy 971/118 s, pandas 4298/411 s, unfinished scipy >6400 s and Rosetta image 64 min 11 s as author-recorded observations, label unsupported extrapolations/hypotheses, and say explicitly that `--timeout` cannot shorten or extend `build`. A new native run is not required merely to make this account honest. + +3. **R3 — P2: account for all four attempts and the actual skip reason.** DEMO-22 L144–153 and L300–309 says three attempts / one omission and lists only three rows, although its own fourth link points to [acc-20261112T092035Z-e4c24d](../demo/runs/acc-20261112T092035Z-e4c24d/results.toon). That unseeded C4 attempt records 0 passed, 1 failed, 1 error. Add the row and correct the headings in both languages; describe the two wiki `goto` failures specifically as the seeded runs. The 10 skips are recorded as `M3` in the seeded [pytest log](../demo/runs/acc-20261112T085656Z-c69ad2/pytest.log), L108–117, and the S1–S5 modules have unconditional `pytest.mark.skip(reason="M3")`; they were not dynamically skipped because the core profile lacked those services. Preserve that distinction in the table note. + +4. **R4 — P2: correct both invalid compile data blocks.** DEMO-22 L107 and L263 declares `osf_compile[3]` but provides four rows including the whole RUN step. The repository's `tools.manifest_check.parse_toon` rejects both blocks with `osf_compile[3] has more rows than declared`. Change the count to four or separate the total. `docs_check` currently checks only declared canonical SHA parity, so its success does not validate this syntax. + +5. **R5 — P2: forward an explicitly supplied zero timeout.** [install.py](../../installer/grdm_dev/install.py), L50, tests `if timeout` rather than `if timeout is not None`. Reproduction with the real parser and `plan_steps` gives `['up', '--no-open']` for `install --timeout 0`, exactly the same as omission. Direct `up --timeout 0` performs its initial health check without polling, while the install wrapper silently falls back to 1800/5400 seconds. Preserve zero and add a focused parser-to-plan regression test. The existing 7200-second test passes but misses this boundary. + +6. **R6 — P3: make the macOS report match the documented absence.** [host.py](../../installer/grdm_dev/host.py), L146/L394–396 and L490–496, leaves `amd64_emulation` in `asdict(info)` even when empty, so macOS arm64 emits an empty field; macOS amd64 takes the unconditional amd64 branch and emits “not needed”. SPEC-02 L128/L371 and DEMO-22 say the row is absent on macOS. Exclude macOS before setting the field and omit it during report serialization when not applicable, or explicitly revise the intended contract. The new test at [test_preflight.py](../../installer/tests/test_preflight.py), L292–295, only excludes two nonempty strings; assert key absence and cover both Mac architectures. + +### Evidence audit and limits + +All 20 files in the four `acc-20261112T*` directories are committed. All four referenced `results.toon` files exist at the reviewed head and exactly match the current encoder's output from their adjacent `results.json`; JUnit and collector status counts agree. The following is a review-local summary of those committed records, also captured in audit results (`pr50-r1-evidence-audit.json`). + +```toon +runs[4]{run_id,seeded,passed,failed,error,skipped,pytest_exit}: + acc-20261112T083417Z-f2b524,false,1,3,8,10,1 + acc-20261112T085656Z-c69ad2,true,11,1,0,10,1 + acc-20261112T092035Z-e4c24d,false,0,1,1,0,1 + acc-20261112T092701Z-876a61,true,1,1,0,0,1 +``` + +The seeded full run's 1,288,938 ms is the overall acceptance-command duration (about 21 min 29 s); its pytest execution is 830.04 s. Both seeded C4 logs fail at `_open_editor` → `page.goto(...wiki/home/?edit&view&menu, wait_until="domcontentloaded")`, with `Timeout 30000ms exceeded`; both rejection cases pass with WebSocket close code 4401. The cause remains unresolved. No browser/acceptance rerun was performed. + +Content inspection and targeted searches of all 20 UTF-8 files found no credential values, disposable test email/password values, or local scratch paths. Identity/password values shown in tracebacks are `***`; no GitHub token/private-key patterns or email addresses remain. The guest checkout path `guest-checkout` remains in some Playwright traceback callbacks; it is the documented guest path, not a scratch path. No trace archives or screenshots are included. This is a bounded content review, not a claim that the unexecuted stack `scan` passed. + +Prerequisites, compile timings, image transfer, `up` duration and `health --network` exit zero are described in the narrative but have no corresponding new raw logs/reports in these four acceptance folders. Acceptance prechecks corroborate a healthy 24-service stack, not the loopback binding audit or the complete earlier sequence. The Rosetta-built osf.io/wiki-frontend import and interrupted single-command run are disclosed; a completed uninterrupted emulated/native amd64 install is not evidenced. + +### Validation and documentation conventions + +Commands ran from the clean clone using PATH `python3` (`/opt/homebrew/bin/python3`, Python 3.15.2), without a virtual environment. These are measured review results, not acceptance reruns. + +```toon +checks[4]{command,exit,result}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests",0,"660 tests; 10 skipped; 62.939 s" + "python3 -m unittest discover -s tools/tests",0,"93 tests; 3.348 s" + "python3 tools/docs_check.py",0,"177 checked; 8 exempt; 45 warnings" + "python3 tools/manifest_check.py",0,"0 findings; policy scanned 749 files; 63 non-UTF-8 files skipped" +``` + +Logs: installer tests (`pr50-r1-installer-tests.log`), tools tests (`pr50-r1-tools-tests.log`), docs check (`pr50-r1-docs-check.log`), manifest check (`pr50-r1-manifest-check.log`). Ten skipped unit tests and the glossary warnings remain explicit limitations. Both existing documents preserve their previous version entries and add new versions; the three scoped documents retain English before Japanese, anchors and working relative links. TOON formatting is used, but R4 fails actual parsing. The general documentation checker reports seven glossary warnings in new DEMO-22 and does not prove semantic parity or the truth of completion claims. The clone's final Git status is clean. + +### Required next action + +Correct R1–R5 and reconcile R6's contract, preserving both language halves and previous version entries; rerun relevant checks and request round 2. Keep C4 success, stack scan/report and an uninterrupted amd64 installation explicitly open. No source fix or operational rerun is included in this review assignment. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**Changes requested(要修正)。** 独立したクリーンクローンで、head `7ac6e5c6c162753ae1c02d7e1bcaac76863183cd` と base `a005acfb5ec06064102170b038a58458d6a7d062` を比較した。通常の正の timeout 引き渡しと Ubuntu amd64/Linux arm64 の状態表示は動作する。seed ありの証跡はコア11/12合格と C4 success の wiki ページ `goto` の30秒タイムアウト2回を裏付けるが、中断しない導入成功やビルド後全工程の完了は証明しない。 + +ソース変更、commit、push、approve、merge、close、VM 操作、Docker 状態変更、イメージ/キャッシュの prune、稼働環境の `runtime/.env` へのアクセスはしていない。単体試験は隔離された一時 fixture を利用した。外部への書き込みは[日本語の PR 会話コメント1件](https://github.com/RCOSDP/RDM-developer-guide/pull/50#issuecomment-6820295801)を投稿しただけである。 + +### 指摘 + +1. **R1 — P2: 未実施の工程を実行済みとする記載を訂正する。** [DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md) L118/L274 は `scan`・`report` を実行済み工程に含め、「ビルドより後ろ全体の証明」とする。同じ記録の L139/L164、L295/L320 は未実施とし、受入も11/12である。実際の `up`、`health --network`、受入試行に限定し、未実施工程と不合格を明記する。L8 の「build より後ろに amd64 に固有のことは無かった」も検証済み範囲に絞る。L89/L245 の「ほかのイメージはすべて VM でネイティブに組めた」から、輸入した wiki-frontend を除く。現状は未検証のセキュリティゲートまで完了したように読める。 + +2. **R2 — P2: 実測・推計・未検証の原因を区別する。** DEMO-22 L114/L157/L159/L163、L270/L313/L315/L319 は、実機 amd64 は数分、長い待ちは不要、一過性 DNS 障害は QEMU のネットワークでインストーラーの不具合ではない、と断言する。実機比較や DNS 原因分析の証跡はなく、新規 artifact は受入出力だけである。ビルドは5時間12分で中止しており、1営業日では終わらないことや約9時間の完了時間は完走実測ではなく推計である。[SPEC-02](../spec/02_installer_cli.md) L8 と[環境手引き](../guides/environment/README.md) L8 も営業日の断言を繰り返し、SPEC-02 はコンパイル時間と `up` 専用の待ちオプションを関連付ける。numpy 971/118秒、pandas 4298/411秒、scipy 6400秒超未完、Rosetta イメージ64分11秒は執筆者の観察記録として保持し、未検証の推計・仮説を明示する。`--timeout` は `build` を短縮も延長もしないことを明確にする。正直な記録への修正だけのために実機再試験を要求するものではない。 + +3. **R3 — P2: 4実行すべてと実際の skip 理由を集計する。** DEMO-22 L144–153/L300–309 は「3回、誤り1回」と3行の集計を掲げるが、4番目のリンク先 [acc-20261112T092035Z-e4c24d](../demo/runs/acc-20261112T092035Z-e4c24d/results.toon) は seed なしの C4 実行で、0 passed・1 failed・1 error を記録している。この行を追加し、両言語の見出しを直す。wiki `goto` の2回の失敗は seed ありの実行に限定した説明とする。10件の skip は seed ありの [pytest.log](../demo/runs/acc-20261112T085656Z-c69ad2/pytest.log) L108–117 で `M3` と記録され、S1–S5 の各モジュールは無条件の `pytest.mark.skip(reason="M3")` である。core にサービスが無いことを動的に判定して skip したわけではないため、表の注記も直す。 + +4. **R4 — P2: コンパイルの TOON 2ブロックを修正する。** DEMO-22 L107/L263 は `osf_compile[3]` と宣言するが、RUN 全体を含む4行がある。リポジトリの `tools.manifest_check.parse_toon` は両方を `osf_compile[3] has more rows than declared` で拒む。行数を4にするか全体値を分離する。現在の `docs_check` の TOON 検査は宣言された正本との SHA 対応に限られ、その成功は構文の妥当性を保証しない。 + +5. **R5 — P2: 明示された timeout 0 を引き渡す。** [install.py](../../installer/grdm_dev/install.py) L50 の `if timeout` は、`None` と `0` を同一視する。実 parser と `plan_steps` による再現では `install --timeout 0` が `['up', '--no-open']` となり、省略時と同じになる。直接の `up --timeout 0` は最初の health 確認後にポーリングしないが、install 経由では1800/5400秒に戻る。`is not None` で明示値を保持し、parser から plan までを通すゼロ値の回帰試験を加える。既存の7200秒の試験は成功するが、この境界を検証していない。 + +6. **R6 — P3: macOS では出さないという仕様と報告を一致させる。** [host.py](../../installer/grdm_dev/host.py) L146/L394–396、L490–496 は `asdict(info)` に空文字の `amd64_emulation` を残すため macOS arm64 も空の行を出し、macOS amd64 は OS 制約のない分岐で `not needed` を出す。SPEC-02 L128/L371 と DEMO-22 の「macOS では出さない」に一致しない。macOS を先に除外し、対象外のフィールドを報告時に省くか、意図する契約を明確に改定する。追加した [test_preflight.py](../../installer/tests/test_preflight.py) L292–295 は非空の2文字列だけを除外している。キー自体の不在と両 Mac アーキテクチャを確かめる必要がある。 + +### 証跡監査と限界 + +4つの `acc-20261112T*` 配下の20ファイルはすべてコミット済みで、参照した4つの `results.toon` は対象 head に存在する。隣接する `results.json` を現行 encoder で変換した結果と完全一致し、JUnit・collector の状態件数も一致した。次はレビュー用の集計であり、監査結果 (`pr50-r1-evidence-audit.json`) にも保存した。 + +```toon +runs[4]{run_id,seeded,passed,failed,error,skipped,pytest_exit}: + acc-20261112T083417Z-f2b524,false,1,3,8,10,1 + acc-20261112T085656Z-c69ad2,true,11,1,0,10,1 + acc-20261112T092035Z-e4c24d,false,0,1,1,0,1 + acc-20261112T092701Z-876a61,true,1,1,0,0,1 +``` + +seed あり全体実行の1,288,938 msは受入コマンド全体の約21分29秒であり、pytest 部分は830.04秒である。seed ありの C4 ログは2回とも `_open_editor` → `page.goto(...wiki/home/?edit&view&menu, wait_until="domcontentloaded")` で `Timeout 30000ms exceeded` となり、拒否系は2回とも WebSocket close code 4401で合格した。原因は未解決である。今回ブラウザ/受入試験の再実行はしていない。 + +20個すべての UTF-8 ファイルの内容確認と対象検索では、秘密値、使い捨て試験メール/パスワード値、ローカル scratch パスを検出しなかった。traceback の利用者・パスワード値は `***`、GitHub token/秘密鍵形式やメールアドレスも残っていない。一部 Playwright callback にゲストの `guest-checkout` は残るが、記載されたゲスト配置先であり scratch パスではない。trace archive やスクリーンショットは含まれない。この限定的な内容監査は、未実施の stack `scan` の成功を意味しない。 + +前提条件、ビルド時間、イメージ移送、`up` 所要時間、`health --network` の終了0は本文の記録であり、この4受入フォルダに対応する生ログ/報告は追加されていない。受入の precheck は24サービスが healthy だったことを裏付けるが、loopback bind の検査や前段すべての手順は証明しない。Rosetta 製 osf.io/wiki-frontend の輸入と単一コマンドの中断は開示されている。エミュレーション/実機 amd64 で中断しない完走の証跡は無い。 + +### 検証と文書規約 + +クリーンクローンのルートから、仮想環境を使わず PATH の `python3`(`/opt/homebrew/bin/python3`、Python 3.15.2)で実行した。次は今回測定したレビュー検査であり、受入再実行ではない。 + +```toon +checks[4]{command,exit,result}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests",0,"660件、10件skip、62.939秒" + "python3 -m unittest discover -s tools/tests",0,"93件、3.348秒" + "python3 tools/docs_check.py",0,"177ファイル検査、8除外、45警告" + "python3 tools/manifest_check.py",0,"指摘0、policyは749ファイル検査、非UTF-8の63ファイル除外" +``` + +ログ: installer tests (`pr50-r1-installer-tests.log`)、tools tests (`pr50-r1-tools-tests.log`)、docs check (`pr50-r1-docs-check.log`)、manifest check (`pr50-r1-manifest-check.log`)。単体試験10件の skip と用語注警告は限界として明示する。既存2文書は過去の版行を保持して新版を追加し、対象3文書は英語→日本語、アンカー、解決する相対リンクを保持する。TOON を使っているが、R4 の構文不備がある。一般の文書チェッカーは新規 DEMO-22 に7つの用語注警告を出し、意味の対応や完了主張の真偽は検証しない。終了時のクローンの Git status は clean。 + +### 次の対応 + +R1–R5を修正し、R6の契約を整合させる。両言語と既存版行を保持し、関連検査を再実行して r2 を依頼する。C4 success、stack の scan/report、中断しない amd64 導入は未完として維持する。今回の割当にはソース修正や運用上の再実行は含まれない。 diff --git a/docs/reviews/2026-11-12_RDM-developer-guide_PR50_Ubuntu_Amd64_r2.md b/docs/reviews/2026-11-12_RDM-developer-guide_PR50_Ubuntu_Amd64_r2.md new file mode 100644 index 0000000..c20a987 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-developer-guide_PR50_Ubuntu_Amd64_r2.md @@ -0,0 +1,144 @@ +# REV-PR50-r2 Ubuntu amd64 installer review / Ubuntu amd64 インストーラーレビュー + +> **Summary:** Pass at a34083b: R1–R6 are closed in the requested scope. The additional C4 evidence establishes two passing cases on a locally patched copy, not a clean full-suite pass or a completed uninterrupted installation. +> **概要:** a34083b の判定は pass。指定範囲の R1–R6 は解消した。追加 C4 証跡はローカルでパッチを当てたコピーの2ケース合格を示し、変更なしの全試験合格や中断しない導入完了を示すものではない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-12. **Learned:** Publication must redact provenance locations and body artifact paths as well as link destinations; only these location labels changed, with judgments, findings, test results and earlier version lines preserved. / 公開時はリンク先だけでなく出典の場所と本文の成果物パスも秘匿する。場所の表記のみを変更し、判定、指摘、試験結果、過去の版行を保持した。 +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only link destinations for publication: scratch-path links were replaced by repository-relative links or plain-text references. / REV は公開のためリンク先のみを変更し、作業用パスへのリンクをリポジトリ相対リンクまたは平文の参照に置き換えた。 +- Provenance / 出典: Original file / 原本: `2026-11-12_RDM-developer-guide_PR50_Ubuntu_Amd64_r2.md`. Publication 0.3 redacts only original-file locations, local artifact paths and the guest checkout location to basenames or neutral artifact names; prior publication link changes remain. Judgments, findings, test results and earlier version lines are unchanged. / 公開版 0.3 では原本の場所、ローカル成果物のパス、ゲスト配置先のみをファイル名または中立的な成果物名に置換し、前公開版のリンク修正を維持する。判定、指摘、試験結果、過去の版行は変更しない。 +- Version / 版: 0.1 — 2026-11-12. **Learned:** a passing rerun is interpretable only with its changed conditions and scope; parsing the actual data blocks also catches issues that the general documentation checker does not cover. / 再試験の合格は、変えた条件と対象範囲を併記して初めて解釈できる。またデータブロックを実際に解析すると、一般の文書検査が扱わない問題も見つかる。 +- Applies to: RCOSDP/RDM-developer-guide PR #50, round 2; REV(担当レビュワ, Codex Astra). +- Related: [Review index](../reviews/README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [SPEC-02](../spec/02_installer_cli.md) · [DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md) · [Round 1](2026-11-12_RDM-developer-guide_PR50_Ubuntu_Amd64_r1.md). +- Used by: the coordinator's PR #50 review decision. Kept outside Git; relative source links resolve into the independent review clone. / コーディネーターの PR #50 判定に使用する。Git 外に保存し、ソースへの相対リンクは独立レビュー用クローンを指す。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and boundaries + +**Pass. No blocking findings remain in R1–R6 or the added C4 evidence.** Reviewed a clean independent clone at `a34083bc19117b36e3265e70fd458e97f788130d`, against base `a005acfb5ec06064102170b038a58458d6a7d062`, with correction comparison against round-1 head `7ac6e5c6c162753ae1c02d7e1bcaac76863183cd`. GitHub still reported the assigned head and an open PR before posting the review comment. This verdict is a review result, not a GitHub approval or an acceptance certification for native amd64. + +### Closure of round-1 findings + +| Finding | Result | Evidence | +|---|---|---| +| R1: executed stages | Closed | DEMO-22 L119/L279 limits the executed sequence to `up`, `health --network`, and `accept`; explicitly excludes `scan` and `report`; disclaims proof of the single command or unrun stages. L90/L250 and L168/L328 exclude imported osf.io and wiki-frontend from the nine VM-built images. The version header now names the actual stages. | +| R2: evidence labels | Closed | DEMO-22 L108–115/L268–275 separates observed compile times from the unfinished whole-step extrapolation, the working-day/nine-hour estimate, and unmeasured native expectations. L164/L324 labels the DNS explanation an undiagnosed hypothesis. L162/L322 and SPEC-02 L187/L430 say `--timeout` applies only to `up`, not `build`; the environment guide removes the categorical working-day claim. | +| R3: attempts and skips | Closed | DEMO-22 L145–160/L305–320 includes all five runs, including the second unseeded attempt, and the ten unconditional `M3` skips. The five result files, collector counts, and JUnit totals agree. S1–S5 source modules retain unconditional `pytest.mark.skip(reason="M3")`. | +| R4: TOON row counts | Closed | Both `osf_compile` arrays declare four rows. Every one of DEMO-22's 16 fenced TOON blocks parses with `tools.manifest_check.parse_toon`. This is a DEMO-22 scope result; see the separate pre-existing SPEC-02 limitation below. | +| R5: zero timeout | Closed | `installer/grdm_dev/install.py` L50 uses `timeout is not None`; L73 forwards the parsed value. `test_preflight.py` L224–233 exercises the actual CLI parser and plan, asserts `['up', '--no-open', '--timeout', '0']`, and distinguishes omitted `None`. Both focused and full tests pass. | +| R6: macOS key absence | Closed | `host.py` L394–395 excludes macOS before the amd64 branch, and L498–499 removes inapplicable empty keys from `as_report`. `test_preflight.py` L303–310 asserts key absence for both arm64 and x86_64; L312–315 also covers no amd64 services. | + +The English and Japanese corrections carry the same scope and limits. No new native execution was required to resolve the documentary findings. + +### Acceptance evidence and added C4 run + +The following is a review-local summary of the committed records, not a new acceptance execution. Detailed cross-checks are in the evidence audit (`pr50-r2-evidence-audit.json`). + +```toon +runs[5]{run_id,seeded,passed,failed,error,skipped,pytest_exit}: + acc-20261112T083417Z-f2b524,false,1,3,8,10,1 + acc-20261112T085656Z-c69ad2,true,11,1,0,10,1 + acc-20261112T092035Z-e4c24d,false,0,1,1,0,1 + acc-20261112T092701Z-876a61,true,1,1,0,0,1 + acc-20261112T095258Z-308ef1,true,2,0,0,0,0 +``` + +All 25 files in the five run folders are tracked at the reviewed head. Each `results.toon` exactly matches the current encoder applied to its adjacent `results.json`; the collector statuses and JUnit totals match the JSON summary. Encoder equality is distinct from parsing arbitrary report TOON with the manifest-specific parser. + +The [new run folder](../demo/runs/acc-20261112T095258Z-308ef1/results.toon) contains exactly `collector.json`, `junit.xml`, `pytest.log`, `results.json`, and `results.toon`. All five were read. It records only C4, seeded, two passes, exit 0: success 182550 ms (JUnit 182.551 s, reported as 182.6 s) with HTTP 200, and rejection 107832 ms with WebSocket close code 4401. Pytest took 290.86 s and printed two `record_property`/`xunit2` compatibility warnings; 745761 ms in the JSON is the whole acceptance-command duration, not C4 success time. The precheck reports 24 healthy services. There are no trace archives, screenshots, or evidence attachments. + +DEMO-22 L160/L320 explicitly discloses the uncommitted VM-only patch: page/click/selector waits to 600 s, collaboration bound to 300 s, login waits to 300 s, and per-test timeout to 1500 s. It calls the result one rerun of one scenario on that patched copy, expressly rejects a clean 12/12 claim, and does not infer native performance. The committed acceptance sources are unchanged from the PR base and retain `COLLAB_BOUND_MS = 30_000`, 30/60-second page/login-related waits, and `TEST_TIMEOUT_S = 120`. The local patch itself was not supplied as a reproducible artifact; its exact content is author-reported, while the two passing results are directly recorded. The result is consistent with slow execution but does not isolate the cause. + +Content review of the new five files and targeted searches across all 25 found no credential values, account identities, email addresses, personal home paths, or scratch paths. The new JUnit hostname is the documented generic VM name `lima-grdm-ubuntu2404-amd64`, not a personal/account identity. The four pattern hits in older files are redacted `token = ***` traceback lines. This is a bounded artifact-content audit, not a stack security scan. + +### Validation and remaining limits + +The four requested commands ran from the independent clone with the system PATH `python3` (Homebrew Python 3.15.2; resolved executable `/opt/homebrew/opt/python@3.15/bin/python3.15`), without a virtual environment. Actual subprocess return codes were retained in check results (`pr50-r2-checks.json`). + +```toon +checks[4]{command,exit,result}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests",0,"662 tests; 10 skipped; 61.683 s" + "python3 -m unittest discover -s tools/tests",0,"93 tests; 3.309 s" + "python3 tools/docs_check.py",0,"177 checked; 8 exempt; 43 warnings" + "python3 tools/manifest_check.py",0,"0 findings; 754 policy-scanned files; 63 non-UTF-8 files skipped" +``` + +Logs: installer tests (`pr50-r2-installer-tests.log`), tools tests (`pr50-r2-tools-tests.log`), docs check (`pr50-r2-docs-check.log`), manifest check (`pr50-r2-manifest-check.log`). The three focused regression tests also passed (0.076 s, exit 0). The installer log contains expected negative-path messages, a Python fork deprecation warning, and a foreign-listener warning; the final unittest status and process exit both indicate success. Skips and documentation warnings remain explicit limits. + +An expanded parsing audit found two untouched SPEC-02 directory-layout blocks (L239/L482) that `parse_toon` rejects at slash-containing keys such as `installer/install.sh`. Both blocks are byte-identical to the PR base. Six other SPEC-02 blocks parse; the environment guide has no TOON blocks. The initial broad assertion therefore failed, and a separate scoped DEMO-22 check passed 16/16 with exit 0. This existing incompatibility does not reopen R4's two corrected DEMO-22 compile arrays, but a repository-wide “all TOON parses” claim would be false. + +The earlier PR-body summary still contains superseded completion/native-time wording, followed by an explicit round-1 correction section. The review verdict applies to the committed corrections; aligning the earlier summary with that correction would improve clarity without changing the reviewed code. + +An uninterrupted amd64 installation, native amd64 measurements, `scan`/`report` on this stack, and a clean full acceptance run remain unproven and are kept open in DEMO-22. No acceptance rerun, Docker/VM state changes, pruning, live `runtime/.env` access, source edits, commits, pushes, approval, merge, or close were performed. The clone's final Git status is clean. The only GitHub write is the single [Japanese PR conversation comment for round 2](https://github.com/RCOSDP/RDM-developer-guide/pull/50#issuecomment-6820832191). + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**Pass(合格)。R1–R6 と追加 C4 証跡にブロッキング指摘は残らない。** 独立したクリーンクローンで head `a34083bc19117b36e3265e70fd458e97f788130d`、base `a005acfb5ec06064102170b038a58458d6a7d062` を確認し、修正は r1 の head `7ac6e5c6c162753ae1c02d7e1bcaac76863183cd` と比較した。コメント投稿前にも GitHub 上の head が割当どおりで、PR が open であることを確認した。この判定はレビュー結果であり、GitHub の approve 操作や実機 amd64 の受入認証ではない。 + +### r1 指摘の解消 + +| 指摘 | 結果 | 根拠 | +|---|---|---| +| R1: 実施工程 | 解消 | DEMO-22 L119/L279 は実施を `up`、`health --network`、`accept` に限定し、`scan`・`report` の未実施、単一コマンドや未実施工程の証明ではないことを明記。L90/L250・L168/L328 は VM で組んだ9イメージから輸入した osf.io・wiki-frontend を除外。版ヘッダも実際の工程を列挙。 | +| R2: 証拠の区別 | 解消 | DEMO-22 L108–115/L268–275 はコンパイルの観察、未完の手順全体・営業日・約9時間の外挿、実機の未測定の期待を区別。L164/L324 は DNS の原因説明を未診断の仮説とする。L162/L322、SPEC-02 L187/L430 は timeout が `up` のみで `build` には効かないことを明記。環境手引きも営業日の断言を除去。 | +| R3: 試行と skip | 解消 | DEMO-22 L145–160/L305–320 は seed なしの2回目を含む全5実行と、無条件の `M3` skip 10件を記載。5実行の JSON・collector・JUnit の件数は一致。S1–S5 のソースも無条件の `pytest.mark.skip(reason="M3")` を保持。 | +| R4: TOON 行数 | 解消 | 両方の `osf_compile` は4行宣言。DEMO-22 の全16 TOON ブロックが `tools.manifest_check.parse_toon` で解析成功。DEMO-22 の範囲の判定であり、既存 SPEC-02 の別件は後述。 | +| R5: timeout 0 | 解消 | `install.py` L50 は `timeout is not None`、L73 は parser の値を転送。`test_preflight.py` L224–233 は実 parser から plan へ通し、`['up', '--no-open', '--timeout', '0']` を確認、省略時の `None` と区別。個別・全体試験とも成功。 | +| R6: macOS のキー不在 | 解消 | `host.py` L394–395 は amd64 分岐前に macOS を除外、L498–499 は対象外の空キーを報告から除去。`test_preflight.py` L303–310 は arm64・x86_64 の両方でキー自体の不在を検査、L312–315 は amd64 サービス無しも検査。 | + +英語と日本語は同じ範囲・限界を記載する。文書の指摘解消のために新しい実機実行を要求する必要は無かった。 + +### 受入証跡と追加 C4 実行 + +次はコミット済み記録のレビュー用集計であり、新たな受入実行ではない。詳細は証跡監査 (`pr50-r2-evidence-audit.json`)に保存した。 + +```toon +runs[5]{run_id,seeded,passed,failed,error,skipped,pytest_exit}: + acc-20261112T083417Z-f2b524,false,1,3,8,10,1 + acc-20261112T085656Z-c69ad2,true,11,1,0,10,1 + acc-20261112T092035Z-e4c24d,false,0,1,1,0,1 + acc-20261112T092701Z-876a61,true,1,1,0,0,1 + acc-20261112T095258Z-308ef1,true,2,0,0,0,0 +``` + +5フォルダの25ファイルはすべて対象 head の追跡対象。各 `results.toon` は隣接する `results.json` を現行 encoder に渡した結果と完全一致し、collector・JUnit の件数も JSON 集計と一致した。encoder 一致と、manifest 用 parser による任意の報告 TOON の解析は別の検査である。 + +[追加実行のフォルダ](../demo/runs/acc-20261112T095258Z-308ef1/results.toon)は `collector.json`、`junit.xml`、`pytest.log`、`results.json`、`results.toon` の5ファイルだけで、全内容を確認した。対象は seed ありの C4 のみ、2合格、終了0。success は182550 ms(JUnit は182.551秒、記載は182.6秒)・HTTP 200、rejection は107832 ms・WebSocket close code 4401。pytest は290.86秒、`record_property` と `xunit2` の互換性警告が2件。JSON の745761 msは受入コマンド全体であり、C4 success の時間ではない。precheck は24サービス healthy を記録。trace archive・スクリーンショット・証跡添付は無い。 + +DEMO-22 L160/L320 は未コミット・VM 作業コピーだけの変更を明記する。ページ・クリック・selector は600秒、collaboration bound は300秒、ログインは300秒、試験全体は1500秒。パッチ適用コピーの1シナリオ1再実行であり、変更なしの12/12ではなく、実機の速度も示さないと明記している。コミット済み受入ソースは PR base から変更されず、`COLLAB_BOUND_MS = 30_000`、ページ・ログイン関連の30/60秒、`TEST_TIMEOUT_S = 120` を保持。実際のローカルパッチは再現可能な artifact として提供されていないため、その詳細は執筆者の報告であり、2件合格は記録から直接確認した。結果は処理の遅さと整合するが、原因の切り分けまでは示さない。 + +新規5ファイルの内容確認と25ファイル全体の対象検索では、資格情報値、アカウント識別情報、メールアドレス、個人のホームパス、scratch パスを検出しなかった。新規 JUnit の hostname は記載済みの一般的な VM 名 `lima-grdm-ubuntu2404-amd64` で、個人・アカウント識別子ではない。旧記録のパターン一致4箇所は伏字の `token = ***`。これは artifact 内容の限定監査であり、stack のセキュリティ scan ではない。 + +### 検証と残る限界 + +指定4コマンドは独立クローンから、仮想環境を使わずシステム PATH の `python3`(Homebrew Python 3.15.2、実体 `/opt/homebrew/opt/python@3.15/bin/python3.15`)で実行した。実際の subprocess 終了コードを検査結果 (`pr50-r2-checks.json`)に保存した。 + +```toon +checks[4]{command,exit,result}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests",0,"662件、10件skip、61.683秒" + "python3 -m unittest discover -s tools/tests",0,"93件、3.309秒" + "python3 tools/docs_check.py",0,"177ファイル検査、8除外、43警告" + "python3 tools/manifest_check.py",0,"指摘0、policyは754ファイル検査、非UTF-8の63ファイル除外" +``` + +ログ: installer tests (`pr50-r2-installer-tests.log`)、tools tests (`pr50-r2-tools-tests.log`)、docs check (`pr50-r2-docs-check.log`)、manifest check (`pr50-r2-manifest-check.log`)。個別の回帰試験3件も成功した(0.076秒、終了0)。installer ログには否定系の想定メッセージ、Python の fork 非推奨警告、foreign-listener 警告があるが、最終 unittest 結果とプロセス終了コードはともに成功。skip と文書警告は限界として残す。 + +追加の広い解析監査では、SPEC-02 の未変更のディレクトリ一覧2ブロック(L239/L482)が `installer/install.sh` のようなスラッシュ入りキーで `parse_toon` に拒否された。両ブロックとも PR base と完全一致する。他の SPEC-02 の6ブロックは解析でき、環境手引きには TOON ブロックが無い。そのため最初の広い assertion は失敗し、別途 DEMO-22 に絞った検査は16/16、終了0だった。この既存の非互換は R4 の修正済みコンパイル配列2件を再オープンするものではないが、「リポジトリ全体の TOON がすべて解析成功」とは言えない。 + +PR 本文の前半には古い完了・実機所要時間の表現が残り、後半に明示的な r1 修正説明が追記されている。判定対象はコミット済みの修正である。前半も修正説明に揃えると、コードに影響せず読み違いを減らせる。 + +中断しない amd64 導入、実機 amd64 の測定、この stack の `scan`・`report`、変更なしの受入全件合格は未証明のままで、DEMO-22 も残件として維持する。受入再実行、Docker・VM 状態変更、prune、稼働中の `runtime/.env` へのアクセス、ソース編集、commit、push、approve、merge、close はしていない。クローンの最終 Git status は clean。GitHub への書き込みは [r2 の日本語 PR 会話コメント1件](https://github.com/RCOSDP/RDM-developer-guide/pull/50#issuecomment-6820832191)だけである。 diff --git a/docs/reviews/2026-11-12_RDM-developer-guide_PR52_Amd64_Scan_r1.md b/docs/reviews/2026-11-12_RDM-developer-guide_PR52_Amd64_Scan_r1.md new file mode 100644 index 0000000..63180f2 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-developer-guide_PR52_Amd64_Scan_r1.md @@ -0,0 +1,106 @@ +# REV PR #52 Ubuntu amd64 scan review r1 / Ubuntu amd64 走査レビュー r1 + +> **Summary:** Changes requested for four documentation issues: baseline semantics, causal overstatement, coverage/count semantics, and attribution of VM-only observations; all four required checks passed. +> **概要:** baseline の意味、原因の断定、対象・集計の意味、VM 内だけにある観察の出典表示の 4 点で修正を要請。必須の 4 検査はすべて合格。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-12. **Learned:** Publication must redact provenance locations and body artifact paths as well as link destinations; only these location labels changed, with judgments, findings, test results and earlier version lines preserved. / 公開時はリンク先だけでなく出典の場所と本文の成果物パスも秘匿する。場所の表記のみを変更し、判定、指摘、試験結果、過去の版行を保持した。 +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only link destinations for publication: scratch-path links were replaced by repository-relative links or plain-text references. / REV は公開のためリンク先のみを変更し、作業用パスへのリンクをリポジトリ相対リンクまたは平文の参照に置き換えた。 +- Provenance / 出典: Original file / 原本: `2026-11-12_RDM-developer-guide_PR52_Amd64_Scan_r1.md`. Publication 0.3 redacts only original-file locations, local artifact paths and the guest checkout location to basenames or neutral artifact names; prior publication link changes remain. Judgments, findings, test results and earlier version lines are unchanged. / 公開版 0.3 では原本の場所、ローカル成果物のパス、ゲスト配置先のみをファイル名または中立的な成果物名に置換し、前公開版のリンク修正を維持する。判定、指摘、試験結果、過去の版行は変更しない。 +- Version / 版: 0.1 — 2026-11-12. **Learned:** a passing documentation check cannot distinguish an observed timeout from an exclusive causal claim, or a milestone entry-count baseline from matched findings. / 文書検査の合格だけでは、観察されたタイムアウトと排他的な原因の断定、節目の項目数基準と一致した指摘件数を区別できない。 +- Applies to: [PR #52](https://github.com/RCOSDP/RDM-developer-guide/pull/52), `docs/ubuntu-amd64-scan` → `develop`, head `989ff6e5f46993f75069cd2ec7bd858ec7787151`, base `32e2344292abc5391bb27452a7c8a0022d585bff`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Delivered comment: [PR #52 round 1](https://github.com/RCOSDP/RDM-developer-guide/pull/52#issuecomment-6826312305). +- Related: [SPEC-06](../spec/06_documentation_conventions.md) · [DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md) · [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) · [Review index](../reviews/README.md). +- Used by: PR #52 author and coordinator for round 1 corrections. This local review is not committed; relative source links resolve into the retained clean review clone. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Changes requested — four P2 findings.** P2 denotes a normal-priority correction needed before acceptance. This is the requested review verdict, delivered through one PR comment, not a GitHub approval or formal change-request review. No source files were edited. + +### Findings + +**R1-01 / P2 — Correct the meaning of `allowlist_baseline`.** DEMO-22 lines 202 and 401 say “none from the baseline allow-list” / “baseline の許容リスト由来は 0”. In `installer/grdm_dev/scan.py:1215–1221`, this field is the entry count recorded for the current or latest earlier milestone, read from `manifest/allowlist.baseline.json`; the committed value is `counts.M1 = 0`. It is not a count of findings matched by a second allow-list. Replace both sentences with “58 allow-list entries; 177 findings matched (author-reported); M1 entry-count baseline 0.” Also correct the PR description's equivalent wording. The numbers 58 and 177 are internally compatible: one entry can match several package findings, and `_entry_matches` / the loop at lines 1207–1214 do not limit each entry to one finding. All three inspected revisions (head, `7ac6e5c`, `32e2344`) contain 58 entries. + +**R1-02 / P2 — Keep the cause and proposed timeout change conditional.** DEMO-22 lines 200/399 assert “emulation-only limit, not an installer fault”; lines 209/408 prescribe a longer limit or a non-emulated host for both outstanding cases. The reported manual ember timeout reproduces a deadline on this host; a previous successful DEMO-21 scan does not establish an exclusive cause. The same paragraph correctly says the cas-overlay cause was not captured and is unconfirmed, and reports that its standalone run succeeded in 3.6 seconds without the proposed change. State the observed timeout and describe emulation/load as an explanation under investigation. Keep cas-overlay's failure cause unresolved in the remaining-work list. Lines 204/403 may retain a decision item to consider passing configurable `--timeout`, but say it may address deadline-limited runs and requires a rerun; it does not guarantee exit 0 or prove security. Preserve the correct distinction between exit 51 and an M1 report-only gate result. Apply the same restraint to the header and PR description where they summarize the cause. + +**R1-03 / P2 — Separate Trivy image timing, total targets, completed vulnerability scans, and failure findings.** Lines 181/380 label “22 of 23 targets” as Trivy images, while `scan.py:873–874` counts images plus integration source directories plus the repository itself. DEMO-21's “23 targets” does not prove 23 image targets. Identify which count the author observed; if 23 is the tool's target count, call it all Trivy targets and keep the image-only timing separate. Lines 200/399 also say the 22 targets “finished” although cas-overlay's SBOM failed. Distinguish successful vulnerability scans from complete SBOM-plus-scan coverage. Finally, `scan.py:850–858` adds HIGH `SBOM-FAILED` / `SCAN-FAILED` findings for failed calls, so the stated failures contribute three diagnostic findings (two ember, one cas-overlay) to the reported aggregate if the run behaved as described. The aggregate at lines 1247–1249 counts open findings after allow-list matching, not all raw vulnerabilities; 177 matched findings are separate. Clarify that ember vulnerability results are missing but its failure findings remain, and use “incomplete totals” instead of asserting a strictly smaller total than a hypothetical complete scan. The missing ember SBOM should remain explicit alongside its missing vulnerability scan. + +**R1-04 / P2 — Explicitly attribute the run-3 measurements to the author.** Lines 169–203 / 368–402 present precise runtime results, then say the reports/SBOMs were not committed and are not evidence the page needs. The PR commits only this Markdown page; no run-3 report, scanner output or timing log is available in the committed evidence. Retaining bulky artifacts in the VM is acceptable, but add a clear EN/JA statement adjacent to the run-3 data that these are author-recorded observations transcribed from VM-local output, not independently verified from committed raw evidence. Scope that statement to start time, elapsed times, exit codes, image size, versions actually installed, tool completion/targets, findings, 177 matches, baseline exceptions, ZAP write success and manual reruns. Replace the dismissal of evidence with the actual limitation. No upload of raw reports or secrets is requested. The first-person cas-overlay hypothesis and the note that reports remain in the VM help, but do not clearly attribute the whole table or acknowledge what a repository-only reviewer can verify. + +### Supported facts and limits + +The severity arithmetic is consistent: `298 + 1726 + 2560 + 1369 + 6 = 5959`; Trivy's listed severities sum to 5931, ZAP's to 28, and `5931 + 28 = 5959`. The critical/high open count is `298 + 1726 = 2024`. This establishes internal arithmetic, not that the VM produced those observations. There is no mathematical conflict between the 58 manifest entries and 177 matched findings. + +`scan.py` has identical Git blob `ef07e2576783310847a81a5da47b26db368293ab` at head, `7ac6e5c` and `32e2344`. Its Trivy calls supply no `--timeout`. Its code prioritizes scanner-incomplete exit 51 over gate pass; M1's report-only rule and Semgrep timeout warning behavior are supported by the committed implementation and SPEC-03/ADR-03. The document consistently qualifies its gate result as M1 report-only; it does not claim a strict security gate passed. The five-minute timeout and manual reproduction remain author observations for this review; no VM execution or external Trivy-version verification was performed. + +The only changed file is DEMO-22 (+82/−3 lines). EN precedes JA, the additions correspond, version 0.4 is present and prior 0.3/0.2/0.1 entries are retained. All 18 TOON blocks parse. Manual review of the changed file found no added secrets, personal or disposable-account identities, or scratch paths; numeric uids are relevant ownership-test details. No `runtime/` paths are tracked. The policy scan found zero issues across 763 text files, with 63 non-UTF-8 files skipped; this is not a claim to have audited all binary assets or VM-only artifacts. + +### Verification + +Run from a fresh scratch clone detached at the requested head, using host `python3` (`/opt/homebrew/bin/python3`, Python 3.15.2), without a virtual environment. Unit-test temporary fixtures are synthetic; no deployed `runtime/.env` was inspected. The suite's real Docker Compose invocation is read-only `config`; no Docker state change or prune was performed. + +```toon +checks[6]{check,exit,result}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests",0,"662 tests; 10 skipped; OK; 61.467 s" + "python3 -m unittest discover -s tools/tests",0,"93 tests; OK; 3.309 s" + "python3 tools/docs_check.py",0,"186 files checked; 8 exempt; 46 nonfatal warnings" + "python3 tools/manifest_check.py",0,"manifest 0 findings; policy 0 findings; 763 scanned; 63 non-UTF-8 skipped" + "tools.manifest_check.parse_toon on all DEMO-22 TOON blocks",0,"18 blocks parsed" + "git diff --check origin/develop...HEAD",0,"no whitespace errors" +``` + +Logs: installer tests (`PR52_r1_installer_tests.log`), tools tests (`PR52_r1_tools_tests.log`), documentation check (`PR52_r1_docs_check.log`), manifest/policy check (`PR52_r1_manifest_check.log`). Git status remained clean after verification. Passing checks validate the committed code and document structure, not the VM measurements. The author must correct R1-01 through R1-04 in both languages and align the PR description; no implementation change or fresh VM run is required merely to label the existing evidence honestly. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**Changes requested(修正要請)— P2 を 4 件。** P2 は受入前に直す通常優先度の指摘を指す。指定された PR コメント 1 件で伝えるレビュー判定であり、GitHub の approve や正式な request-changes review は行わない。ソースファイルは変更していない。 + +### 指摘 + +**R1-01 / P2 — `allowlist_baseline` の意味を修正する。** DEMO-22 の 202・401 行は「baseline の許容リスト由来は 0」と説明する。しかし `installer/grdm_dev/scan.py:1215–1221` では、`manifest/allowlist.baseline.json` から現在または直前の節目に記録した項目数を読み、コミット値は `counts.M1 = 0` である。別の許容リストに一致した指摘数ではない。英日とも「許容リスト 58 項目、177 指摘に一致(著者報告)、M1 の項目数基準は 0」とする。PR 本文の同じ表現も直す。58 と 177 自体は矛盾しない。1 項目で複数パッケージの指摘に一致でき、`_entry_matches` と 1207–1214 行の処理は 1 項目につき 1 指摘に制限しない。head・`7ac6e5c`・`32e2344` の全版で 58 項目を確認した。 + +**R1-02 / P2 — 原因と timeout 変更案を条件付きで記す。** 200・399 行は「インストーラーの不具合ではなく、エミュレーションだけの限界」と断定し、209・408 行は両残件に長い制限か非エミュレーションのホストが必要とする。著者報告の ember 手動再実行は、このホストの期限切れを再現したもの。以前の DEMO-21 の成功だけでは排他的な原因を証明できない。同じ段落は cas-overlay の原因未採取・仮説未確認を正しく明記し、変更案なしの単独再実行が 3.6 秒で成功したとも記す。タイムアウトの観察と、調査中のエミュレーション/負荷の説明を分ける。残件一覧でも cas-overlay の原因は未解明とする。204・403 行の判断項目は、設定可能な `--timeout` の受け渡しを検討する案として残してよいが、期限切れへの対策候補であり再実行が必要とする。終了 0 や安全性を保証しない。終了 51 と M1 report-only の gate pass の正しい区別は保つ。原因を要約する版ヘッダと PR 本文も同様に修正する。 + +**R1-03 / P2 — Trivy の image 時間、全対象数、完了した脆弱性走査、失敗診断を区別する。** 181・380 行は「23 対象のうち 22」を image と呼ぶが、`scan.py:873–874` の対象数は image・統合ソースのディレクトリ・このリポジトリの合計である。DEMO-21 の 23 対象も image 23 個の根拠にはならない。著者が観察した数の定義を明記し、tool の対象数なら Trivy の全対象と呼び、image だけの時間と分ける。200・399 行の「終わった 22 対象」も cas-overlay の SBOM 失敗と区別が必要であり、脆弱性走査の完了と SBOM を含む全体の完了を分ける。さらに `scan.py:850–858` は失敗した呼び出しごとに HIGH の `SBOM-FAILED` / `SCAN-FAILED` を加えるため、記載どおりの実行なら ember 2 件・cas-overlay 1 件の診断も集計される。1247–1249 行の合計は許容リスト照合後の未許容指摘であり、生の脆弱性全件ではない。177 件の一致は別枠である。ember の脆弱性結果は欠けても失敗診断は残ることを記し、完全走査より必ず小さいとの断定を「不完全な集計」に替える。ember の未完 SBOM も脆弱性走査と併記して残す。 + +**R1-04 / P2 — 第 3 回の測定値を著者報告と明示する。** 169–203・368–402 行は正確な実行結果を示した後、報告と SBOM は未コミットで「このページに要る証跡でもない」とする。この PR のコミットは Markdown 1 ファイルだけで、第 3 回の報告・スキャナー出力・時間ログは含まれない。大きな成果物を VM に残すことは許容できるが、第 3 回データの近くに「著者が VM 内の出力から転記した観察であり、コミット済みの生の証拠から独立検証したものではない」と英日で明示する。開始時刻、所要時間、終了コード、image サイズ、実際の導入版、tool の完了・対象、検出数、177 件の一致、基本対策の例外、ZAP の書込み成功、手動再実行をこの説明の対象とする。証跡不要との説明を、実際の検証限界に替える。生の報告や秘密のアップロードは要求しない。cas-overlay の一人称の仮説と VM 保管の記述は有用だが、表全体の出典やリポジトリだけのレビュワが確認できる範囲までは明確でない。 + +### 確認できた事実と限界 + +重大度の算術は一致する。`298 + 1726 + 2560 + 1369 + 6 = 5959`、Trivy の内訳は 5931、ZAP は 28、両者の合計は 5959。未許容の重大・高は `298 + 1726 = 2024`。これは内部の算術整合であり、VM が実際にこの観察を出したことの検証ではない。許容リスト 58 項目と一致した 177 指摘にも算術上の矛盾はない。 + +head・`7ac6e5c`・`32e2344` の `scan.py` は Git blob `ef07e2576783310847a81a5da47b26db368293ab` で同一。Trivy 呼び出しは `--timeout` を渡さない。実装は gate pass よりスキャナー未完の終了 51 を優先し、M1 の report-only と Semgrep timeout の警告扱いも、コミット済み実装と SPEC-03/ADR-03 に対応する。文書の gate pass は一貫して M1 report-only に限定され、厳格な安全性ゲートの合格とはしていない。5 分の制限と手動再現は本レビューでは著者の観察として扱い、VM 実行や外部の Trivy 版確認は行っていない。 + +変更ファイルは DEMO-22 だけ(追加 82 行・削除 3 行)。英語→日本語の順序と対応が保たれ、版 0.4 と過去の 0.3・0.2・0.1 を確認した。TOON 全 18 ブロックは解析できた。変更ファイルの目視では、秘密、個人・使い捨てアカウントの識別情報、scratch パスの追加は見つからない。数値 uid は所有者試験に必要な情報である。`runtime/` の追跡ファイルはない。policy 検査はテキスト 763 ファイルで検出 0、非 UTF-8 の 63 ファイルは除外。全バイナリや VM 内だけの成果物を監査したという意味ではない。 + +### 検証 + +指定 head に detach した新規 scratch clone で、仮想環境ではなくホストの `python3`(`/opt/homebrew/bin/python3`、Python 3.15.2)を使用。単体テストの一時 fixture は合成データで、配備環境の `runtime/.env` は読んでいない。suite が実際に呼ぶ Docker Compose は読取り専用の `config` で、Docker 状態変更や prune はしていない。 + +```toon +checks[6]{check,exit,result}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests",0,"662 件、10 skip、OK、61.467 秒" + "python3 -m unittest discover -s tools/tests",0,"93 件、OK、3.309 秒" + "python3 tools/docs_check.py",0,"186 ファイル検査、8 除外、非致命的警告 46" + "python3 tools/manifest_check.py",0,"manifest 0 件、policy 0 件、763 検査、非 UTF-8 の 63 除外" + "DEMO-22 全 TOON に tools.manifest_check.parse_toon",0,"18 ブロック解析成功" + "git diff --check origin/develop...HEAD",0,"空白エラーなし" +``` + +ログ: installer tests (`PR52_r1_installer_tests.log`)、tools tests (`PR52_r1_tools_tests.log`)、docs_check (`PR52_r1_docs_check.log`)、manifest_check (`PR52_r1_manifest_check.log`)。検証後も Git status は clean。合格はコミット済みコードと文書構造の検証であり、VM 測定値の検証ではない。著者には R1-01〜R1-04 の英日修正と PR 本文の整合を求める。既存証拠の位置づけを正しく記すためだけに、実装変更や VM 再実行は要求しない。 diff --git a/docs/reviews/2026-11-12_RDM-developer-guide_PR52_Amd64_Scan_r2.md b/docs/reviews/2026-11-12_RDM-developer-guide_PR52_Amd64_Scan_r2.md new file mode 100644 index 0000000..9efbcb7 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-developer-guide_PR52_Amd64_Scan_r2.md @@ -0,0 +1,106 @@ +# REV PR #52 Ubuntu amd64 scan review r2 / Ubuntu amd64 走査レビュー r2 + +> **Summary:** Pass: R1-01 through R1-04 are closed in DEMO-22 English/Japanese and the PR description; the checkout correction and preserved version history are consistent, and all required checks passed. +> **概要:** pass(合格)。DEMO-22 の英日と PR 本文で R1-01〜R1-04 の解消を確認。checkout の訂正と保持された版履歴に矛盾はなく、必須検査はすべて合格。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-12. **Learned:** Publication must redact provenance locations and body artifact paths as well as link destinations; only these location labels changed, with judgments, findings, test results and earlier version lines preserved. / 公開時はリンク先だけでなく出典の場所と本文の成果物パスも秘匿する。場所の表記のみを変更し、判定、指摘、試験結果、過去の版行を保持した。 +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only link destinations for publication: scratch-path links were replaced by repository-relative links or plain-text references. / REV は公開のためリンク先のみを変更し、作業用パスへのリンクをリポジトリ相対リンクまたは平文の参照に置き換えた。 +- Provenance / 出典: Original file / 原本: `2026-11-12_RDM-developer-guide_PR52_Amd64_Scan_r2.md`. Publication 0.3 redacts only original-file locations, local artifact paths and the guest checkout location to basenames or neutral artifact names; prior publication link changes remain. Judgments, findings, test results and earlier version lines are unchanged. / 公開版 0.3 では原本の場所、ローカル成果物のパス、ゲスト配置先のみをファイル名または中立的な成果物名に置換し、前公開版のリンク修正を維持する。判定、指摘、試験結果、過去の版行は変更しない。 +- Version / 版: 0.1 — 2026-11-12. **Learned:** incomplete scan totals become reviewable when target kinds, successful outputs, failure diagnostics and provenance are stated separately; code and arithmetic can be verified without claiming to verify VM-local measurements. / 不完全な走査の合計は、対象の種類、成功した出力、失敗診断、出所を分けるとレビューできる。コードと算術の検証は、VM 内の測定を検証したとの主張を必要としない。 +- Applies to: [PR #52](https://github.com/RCOSDP/RDM-developer-guide/pull/52), `docs/ubuntu-amd64-scan` → `develop`, head `0ea0bebfa76cd6819f51fbe96c112cad646a560b`, base `32e2344292abc5391bb27452a7c8a0022d585bff`. +- Reviewer: REV(担当レビュワ, Codex Astra). +- Delivered comment: [PR #52 round 2](https://github.com/RCOSDP/RDM-developer-guide/pull/52#issuecomment-6826813237). +- Related: [Round 1](2026-11-12_RDM-developer-guide_PR52_Amd64_Scan_r1.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md) · [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) · [Review index](../reviews/README.md). +- Used by: PR #52 author and coordinator for the round-2 decision. This local record is not committed; source links resolve into the retained clean review clone. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Pass. No remaining blocking findings in the assigned scope.** This is a documentation-review verdict, delivered as one PR comment, not a GitHub approval or a successful security-scan verdict. I inspected the requested head in a fresh scratch clone and compared the round-1 changes, DEMO-22 EN/JA, the current PR description, and the relevant implementation. The PR changes only DEMO-22 (+97/−3 against the base). Source files were not edited. + +### Closure of round-1 findings + +**R1-01 — Closed.** DEMO-22 lines 199/405 and 210/416 distinguish 58 allow-list entries, 177 matched findings (author-reported), and the M1 entry-count baseline of 0. The PR description states the same distinction. `scan.py:1201–1221` reads the baseline from milestone counts rather than deriving a match count; `manifest/allowlist.baseline.json` contains `counts.M1 = 0`. Both head and the corrected VM revision have 58 entries and the identical allow-list blob `bdd69e60b932ed8438aea4e4b69d67c47893c1b2`. One entry may match multiple findings. + +**R1-02 — Closed.** Lines 205–206/411–412 describe the ember SBOM's manual deadline reproduction as an observation, with emulation/load/image-size explanations not established, and retain the unresolved cas-overlay failure despite its successful standalone rerun. Lines 212/418 make configurable `--timeout` a candidate requiring a rerun, without promising exit 0 or security. The remaining-work lists at 217/423 retain both missing ember outputs and the unexplained cas-overlay SBOM. Version 0.5 and the PR description use the same causal restraint. The M1 report-only pass remains distinct from scanner-incomplete exit 51, consistent with `scan.py:1227–1235`. + +**R1-03 — Closed, including corrected counts.** Lines 184–195/390–401 separate image-only timing from the author-reported 22 total Trivy targets: 16 images + 5 integration checkouts + 1 repository. They now report 21 vulnerability-scan outputs and 20 SBOMs, hence 20/22 complete pairs, rather than treating the earlier 23-target DEMO-21 set as this run's denominator. Lines 207–208/413–414 explain that 5959 total findings (5931 Trivy + 28 ZAP) are incomplete, after allow-list matching, with 177 matches counted separately; the totals include three HIGH diagnostics for the failed ember scan/SBOM and cas-overlay SBOM. Ember vulnerabilities are absent while its diagnostics remain. The PR description agrees. Target construction and failure diagnostics match `scan.py:843–875`; aggregate semantics match lines 1247–1251. The complete-scan total is explicitly unknown. Arithmetic checks passed: severity sums give 5959, tool sums give 5931 + 28 = 5959, and critical + high gives 2024. These checks establish consistency, not the actual VM output. + +**R1-04 — Closed.** The adjacent provenance notes at 170/376 cover start time, durations, exits, image size, installed versions, completion/target counts, findings, 177 matches, baseline exceptions, ZAP writes and manual reruns. They explicitly call these the author's transcription from VM-local output and explain that committed raw evidence does not permit independent verification of the measurements. The PR results heading makes the same attribution and its later paragraph says the reports/SBOMs remain uncommitted in the VM. The former dismissal of raw evidence is gone. No raw-report upload is necessary for this documentation correction. + +### Checkout correction and history + +The current EN/JA run-3 paragraphs at 172/378 now name `b81628f`, consistent with the setup, pins and remaining-work sections at 23/48/220 and 229/254/426. There is no `7ac6e5c` occurrence in current DEMO-22 or the captured PR body, whose review-response section explicitly discloses the correction. The historical round-1 review remains unchanged. `b81628f` resolves to `b81628f2e62b396db32abb8c6e509716c6f3782f`; its `scan.py`, the base's and the reviewed head's share blob `ef07e2576783310847a81a5da47b26db368293ab`. I verified this code identity, not the VM report's uncommitted `commit` field. + +Version 0.5 is first. Automated comparison confirmed the text of entries 0.4, 0.3, 0.2 and 0.1 is preserved verbatim, with 0.4 moved to historical-entry formatting. The PR introduction describes the original 0.4 addition and its review-response section explicitly identifies the 0.5 correction. The old 0.4 lesson is retained history; 0.5 and the current body supply the corrected interpretation. + +### Verification and limits + +All four required commands ran in the clean detached clone with system/host `python3` (`/opt/homebrew/bin/python3`, Python 3.15.2), without a virtual environment. Exit codes were checked directly. The following TOON records observed review checks, not VM measurements. + +```toon +checks[6]{check,exit,result}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests",0,"662 tests; 10 skipped; OK; 63.596 s" + "python3 -m unittest discover -s tools/tests",0,"93 tests; OK; 3.346 s" + "python3 tools/docs_check.py",0,"186 files checked; 8 exempt; 46 nonfatal warnings" + "python3 tools/manifest_check.py",0,"manifest 0 findings; policy 0 findings; 763 scanned; 63 non-UTF-8 skipped" + "tools.manifest_check.parse_toon on every DEMO-22 TOON block",0,"18 blocks parsed" + "git diff --check 32e2344...HEAD",0,"no whitespace errors" +``` + +Logs: installer (`PR52_r2_installer_tests.log`), tools (`PR52_r2_tools_tests.log`), docs_check (`PR52_r2_docs_check.log`), manifest_check (`PR52_r2_manifest_check.log`); captured PR description: metadata (`PR52_r2_metadata.json`). Git status remained clean and the remote PR head was rechecked as the requested commit. Manual inspection of the change found no added secret, personal/disposable-account identity or scratch path; no `runtime/` files are tracked. The policy result excludes 63 non-UTF-8 files and does not audit VM-only artifacts. + +No deployed `runtime/.env` was inspected. Tests use synthetic temporary fixtures; the real Docker Compose test calls read-only `config`, with no Docker state change or prune. No VM rerun was performed. The remaining runtime gaps are accurately disclosed: ember SBOM/vulnerability results and cas-overlay SBOM are incomplete, cas-overlay's cause is unresolved, and an uninterrupted native-amd64 run remains future work. They do not block this correction of the documented evidence. No merge, approval, close, push or commit was performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**pass(合格)。担当範囲の阻害指摘は残っていない。** PR コメント 1 件で伝える文書レビュー判定であり、GitHub の approve やセキュリティ走査の成功を意味しない。新規 scratch clone の指定 head で、前回からの差分、DEMO-22 の英日、現在の PR 本文、関係する実装を照合した。PR の変更は DEMO-22 だけ(base 比で追加 97 行・削除 3 行)。ソースは編集していない。 + +### 前回指摘の解消 + +**R1-01 — 解消。** DEMO-22 の 199/405・210/416 行は、許容リスト 58 項目、177 指摘の一致(著者報告)、M1 の項目数基準 0 を区別する。PR 本文も同じ意味である。`scan.py:1201–1221` は一致数ではなく節目の記録から基準を読み、`manifest/allowlist.baseline.json` は `counts.M1 = 0` を持つ。head と訂正後の VM 版はどちらも 58 項目で、許容リストの blob は `bdd69e60b932ed8438aea4e4b69d67c47893c1b2` で同一。1 項目は複数の指摘に一致しうる。 + +**R1-02 — 解消。** 205–206/411–412 行は ember SBOM の手動実行での期限切れ再現を観察とし、エミュレーション・負荷・サイズによる説明を未確立とする。cas-overlay は単独再実行の成功と実行中の原因未解決を併記する。212/418 行の設定可能な `--timeout` は再実行を要する対策候補であり、終了 0 や安全性を約束しない。残件の 217/423 行には ember の欠けた両出力と原因不明の cas-overlay SBOM が残る。版 0.5 と PR 本文も原因を断定しない。M1 report-only の pass とスキャナー未完の終了 51 は区別され、`scan.py:1227–1235` と整合する。 + +**R1-03 — 件数訂正を含め解消。** 184–195/390–401 行は image 部分の時間と、著者報告の Trivy 全 22 対象(image 16+統合 checkout 5+リポジトリ 1)を分ける。脆弱性走査の出力は 21、SBOM は 20、両方揃うのは 20/22 とし、対象集合の異なる DEMO-21 の 23 を分母にしていない。207–208/413–414 行は、合計 5959(Trivy 5931+ZAP 28)が許容リスト照合後の不完全な集計で、177 件の一致は別枠だと説明する。ember の scan/SBOM と cas-overlay の SBOM の失敗に対応する HIGH 診断 3 件を含み、ember の脆弱性結果は欠けても診断は残る。PR 本文も一致する。対象構成と失敗診断は `scan.py:843–875`、集計の意味は 1247–1251 行と整合。完全走査の合計は不明と明記される。重大度別の和は 5959、ツール別は 5931+28=5959、critical+high は 2024 と算術も一致する。ただし実際の VM 出力の検証ではない。 + +**R1-04 — 解消。** 170/376 行の近接した出所注記は、開始時刻、時間、終了値、サイズ、導入版、完了・対象数、指摘数、177 件の一致、baseline 例外、ZAP 書込み、手動再実行を対象とする。VM 内の出力からの著者の転記であり、コミット済みの生の証跡から測定を独立検証できないと明記した。PR の結果見出しも同じ出典を示し、後段は報告・SBOM が VM 内にあり未コミットと説明する。生の証跡を不要とした説明は除かれた。この文書修正に raw report のアップロードは不要。 + +### checkout の訂正と履歴 + +現在の英日第 3 回の 172/378 行は `b81628f` とし、準備・pin・残件の 23/48/220・229/254/426 行と一致する。現在の DEMO-22 と保存した PR 本文に `7ac6e5c` は残らず、PR のレビュー対応節は訂正を明示している。過去の r1 レビュー記録は変更していない。`b81628f` は `b81628f2e62b396db32abb8c6e509716c6f3782f` に解決し、この版・base・今回 head の `scan.py` は blob `ef07e2576783310847a81a5da47b26db368293ab` で同一。検証したのはコードの同一性であり、VM 内の未コミット報告の `commit` 欄ではない。 + +版 0.5 は先頭にある。0.4・0.3・0.2・0.1 の文言がそのまま保持され、0.4 だけ過去の版行の形式へ移ったことを自動比較で確認した。PR 冒頭は当初の 0.4 追記を説明し、レビュー対応節では 0.5 の訂正を明示する。0.4 の教訓は履歴として保持され、0.5 と現本文が訂正後の解釈を示す。 + +### 検証と限界 + +必須 4 コマンドは clean な detached clone で、仮想環境を使わずシステム/ホストの `python3`(`/opt/homebrew/bin/python3`、Python 3.15.2)により実行し、終了コードを直接確認した。次の TOON はレビューで観察した検査結果であり、VM 測定値ではない。 + +```toon +checks[6]{check,exit,result}: + "PYTHONPATH=installer python3 -m unittest discover -s installer/tests",0,"662 件、10 skip、OK、63.596 秒" + "python3 -m unittest discover -s tools/tests",0,"93 件、OK、3.346 秒" + "python3 tools/docs_check.py",0,"186 ファイル検査、8 除外、非致命的警告 46" + "python3 tools/manifest_check.py",0,"manifest 0 件、policy 0 件、763 検査、非 UTF-8 の 63 除外" + "DEMO-22 の全 TOON に tools.manifest_check.parse_toon",0,"18 ブロック解析成功" + "git diff --check 32e2344...HEAD",0,"空白エラーなし" +``` + +ログ: installer (`PR52_r2_installer_tests.log`)、tools (`PR52_r2_tools_tests.log`)、docs_check (`PR52_r2_docs_check.log`)、manifest_check (`PR52_r2_manifest_check.log`)。保存した PR 本文は metadata (`PR52_r2_metadata.json`)。Git status は clean を保ち、リモート PR の head も指定 commit のままと再確認した。差分の目視で秘密・個人や使い捨てアカウントの識別情報・scratch パスの追加は見つからず、`runtime/` の追跡ファイルはない。policy 結果は非 UTF-8 の 63 ファイルを除外し、VM 内だけの成果物を監査したものではない。 + +配備環境の `runtime/.env` は読んでいない。単体テストは合成した一時 fixture を使い、実際の Docker Compose 呼出しは読取り専用の `config` で、Docker の状態変更や prune はしていない。VM の再実行もしていない。ember の SBOM・脆弱性結果、cas-overlay の SBOM と未解明の原因、中断しない native amd64 実行は引き続き残件として正しく開示されている。これらは今回の証拠の位置づけを直す文書修正を妨げない。merge・approve・close・push・commit は行っていない。 diff --git a/docs/reviews/2026-11-12_RDM-ember-osf-web-dev2027_PR3_Render_Link_r1.md b/docs/reviews/2026-11-12_RDM-ember-osf-web-dev2027_PR3_Render_Link_r1.md new file mode 100644 index 0000000..2c536f0 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-ember-osf-web-dev2027_PR3_Render_Link_r1.md @@ -0,0 +1,138 @@ +# REV-PR3 Render link review r1 / render リンクのレビュー r1 + +> **Summary:** Review of RDM-ember-osf-web-dev2027 PR #3 at b1e2ad32, covering URL construction, the renderer trust boundary, compatibility, regression tests, and CI. +> **概要:** RDM-ember-osf-web-dev2027 PR #3 の b1e2ad32 を対象に、URL の組み立て、表示サービスの信頼境界、互換性、回帰試験、CI を確認した記録。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-12. **Learned:** Preserving the API-selected renderer and encoding only added values keeps the internal download destination intact; renderer configuration remains a security trust boundary. / API が選ぶ表示サービスを保ち、追加する値だけを符号化すれば、内部の取得先を変えずに済む。表示サービスの設定は引き続きセキュリティの信頼境界となる。 +- Applies to / 対象: RDM-ember-osf-web-dev2027 PR #3, review r1. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related / 関連: SPEC-06 Documentation Conventions; RDM-osf.io-dev2027 PR #14; [English evidence](#evidence-english) / [日本語の証拠](#evidence-japanese). +- Used by / 利用先: PR #3 integration decision and the combined PR #14 deployment check / PR #3 の統合判断と PR #14 と合わせた配備確認。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Scope and decision + +**PASS.** No blocking code finding. Both required CI runs completed successfully for the unchanged reviewed head. CI means the automated checks run by GitHub. The pull-request run was awaited through completion; the final green result was verified on 2026-11-12 JST. + +The review covered all seven changed files and the PR description. Server code was read only to establish the contract consumed by this client; this record does not replace the separate review of RDM-osf.io-dev2027 PR #14. No merge, approval, close, push, or commit was performed. No running development-stack container was changed, and `runtime/.env` was not read. + +```toon +review: + repository: RDM-ember-osf-web-dev2027 + pull_request: 3 + branch: fix/file-renderer-render-link + head: b1e2ad328c4dfed47b680c77500cb3deb638c935 + base_implementation: d3caa8a + round: r1 + blocking_code_findings: 0 +``` + +### URL construction and trust + +`lib/osf-components/addon/components/file-renderer/component.ts`, lines 34–53 and 101–106, preserves the API-provided MFR address. MFR is the service that turns a file into a browser preview. The client does not check its host against an allow-list and does not reject a scheme in the helper. A deliberately supplied foreign `links.render` therefore remains foreign and receives `view_only`. This is an explicit trust boundary, not proof that an ordinary file owner can supply such a link. + +On the server, `api/files/serializers.py` constructs `links.render` using `get_mfr_url`; `addons/base/utils.py` selects the configured `MFR_SERVER_URL` or `Region.mfr_url`. The region field is a server URL setting, the region API exposes list/retrieve operations, and the region administration is in `addons/osfstorage/admin.py`. The reviewed construction does not use a file name, the caller's host, or a caller-supplied `url` to choose MFR. No ordinary-user path to replace that host was found. The classic server-rendered UI already trusts the same region setting, including loading its MFR script. An API or privileged renderer-configuration compromise is outside this client's protection. + +The ordinary Ember `src` binding is retained, with no HTML-safe string bypass. The installed Ember 3.16 runtime includes `IFRAME`/`src` in URL sanitization and prefixes `javascript:` and `vbscript:` with `unsafe:`. An independent browser test confirmed that the actual iframe `src` becomes `unsafe:javascript:window.__reviewProbe=1`. A second browser test confirmed that a crafted token remains one outer query value without changing the nested destination. This does not constitute a general host allow-list or validation of every URL scheme. + +The added token is encoded by jQuery `param`; the added version suffix is encoded before it joins the existing `url` value. A token containing ampersands, a second `url`, `javascript:`, a fragment marker, quotes, and angle brackets stayed one outer query value in the independent probes. It did not change either destination or create another `url` parameter. + +### View-only access and versions + +A view-only token is a secret that grants read access through a shared link. Sending it to a configured, trusted MFR is necessary for MFR to retrieve a private shared file. The old API download link already included the request's `view_only`, so the old nested download URL could disclose the token to the configured MFR as well. The new code puts it explicitly on MFR's outer query, preserves an existing outer token, and can send it to a region-specific MFR instead of the single client-configured MFR. The disclosure is acceptable under the existing trusted-renderer model; it is not byte-for-byte identical to the old behavior. Actual view-only rendering against the combined deployed services remains untested here. + +For the server's single-encoded download URL, `/\?|%3F/i` detects the query separator without decoding the entire value. It handles literal `?`, uppercase/lowercase `%3F`, no existing query, and a literal encoded question mark in a path (`%253F` in the outer value). An invalid percent sequence does not throw `URIError`. Existing outer parameters and the outer fragment remain unchanged. The version is added only inside `url`, and changing the selected version recomputes from the original render link rather than accumulating old versions. + +The helper is not a general URL normalizer. A pre-existing inner version is not replaced, and an inner fragment would put an appended version after that fragment. The file-detail API contract used by this caller supplies a fragment-free, unversioned render target, so neither case is a demonstrated regression in this PR. The implementation also preserves the old truthy-version behavior. + +### Compatibility and test quality + +When `links.render` is absent, the original `links.download` plus `?direct=&mode=render` construction remains intact. That includes the old limitation for a download URL that already contains a query; this PR does not repair it. A string or `{ href }` render link works, a render link alone creates the iframe, and neither link creates no iframe. Delaying `src` until the iframe load event remains unchanged. The Mirage serializer supplies render links for files and omits them for folders. + +The committed additions contain seven component tests and one acceptance test. The acceptance test exercises the actual page-to-component binding using Mirage's render link, while the component tests cover selecting the internal target, the link object, version changes, token encoding and preservation, fallback, and the absent-link state. With the added tests and Mirage serializer retained, reverting only the component and both templates to the parent implementation made exactly six of the added tests fail: five component tests and one acceptance test. Three failures showed the wrong download-based URL and three showed the missing render-only iframe. The fallback and absent-link compatibility tests still passed. + +Non-blocking follow-up: add the no-query, lowercase encoding, malformed-percent, and dangerous-scheme cases to the committed tests. The independent checks cover them for this review, but the new regex's malformed-percent motivation is not itself locked down by a committed test. + +<a id="evidence-english"></a> +### Evidence and remaining work + +The unmodified head passed all 26 focused tests in `tests/integration/components/file-renderer/component-test.ts` and `tests/acceptance/guid-file/file-detail-test.ts`. The old-implementation comparison completed 26 tests with six expected failures. Two additional scratch-only browser security tests passed. Twelve independent probes executed the actual TypeScript helper and URL utilities after transpilation, with the locked jQuery dependency; all passed. The scratch-only test file was removed and tracked source files were restored to the reviewed head. The push workflow log confirms that the final head, including the regex change, completed the full 986-test suite successfully, resolving the PR description's earlier full-suite caveat. The completed pull-request log also records 986 tests complete, with 393 Node-side tests passing. + +```toon +ci[2]{event,run,head,result,completed_utc}: + push,43054327572,b1e2ad328c4dfed47b680c77500cb3deb638c935,success,2026-11-11T16:17:32Z + pull_request,43054392861,b1e2ad328c4dfed47b680c77500cb3deb638c935,success,2026-11-11T16:41:24Z +``` + +The local checks ran in an independent scratch clone with Node 26.12.0, Yarn 1.22.22, and Chrome 157.0.8103.50; the remote workflow used Node 24.22.2 for build/test through the repository wrapper. No local result is presented as a live-stack test. After PR #14 and this client change are deployed together, verify a public file, a private view-only file, and a selected historical version in the real Ember UI. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 範囲と判定 + +**PASS。** 阻害するコード上の指摘はない。対象 head が変わっていないことを確認し、必要な CI の両実行が成功して完了した。CI は GitHub が自動で行う検査である。pull_request の実行は完了まで待ち、2026-11-12 JST に全緑を確認した。 + +変更された 7 ファイルと PR 本文を確認した。サーバーのコードは、このクライアントが受け取る契約を確認する範囲で読んだ。RDM-osf.io-dev2027 PR #14 の別のレビューを置き換える記録ではない。merge、approve、close、push、commit は実行していない。稼働中の開発スタックのコンテナを変更せず、`runtime/.env` も読んでいない。 + +```toon +review: + repository: RDM-ember-osf-web-dev2027 + pull_request: 3 + branch: fix/file-renderer-render-link + head: b1e2ad328c4dfed47b680c77500cb3deb638c935 + base_implementation: d3caa8a + round: r1 + blocking_code_findings: 0 +``` + +### URL の組み立てと信頼境界 + +`lib/osf-components/addon/components/file-renderer/component.ts` の 34–53 行と 101–106 行は、API が返した MFR のアドレスを保つ。MFR は、ファイルをブラウザで見られる形に変えるサービスである。クライアントにはホストの許可リストとの照合がなく、補助関数も URL のスキームを拒否しない。意図的に外部ホストの `links.render` を渡せば、そのホストが保たれ、`view_only` も送られる。これは明示的な信頼境界であり、通常のファイル所有者がそのリンクを指定できることを意味しない。 + +サーバーの `api/files/serializers.py` は `get_mfr_url` で `links.render` を組み立てる。`addons/base/utils.py` は、設定済みの `MFR_SERVER_URL` または `Region.mfr_url` を選ぶ。リージョンの値はサーバー側の URL 設定で、リージョン API は一覧・取得のみを公開し、その管理画面は `addons/osfstorage/admin.py` にある。確認した生成処理は、ファイル名、呼出元のホスト、呼出元が渡した `url` で MFR を選ばない。通常利用者がホストを置き換える経路は見つからなかった。従来のサーバー側画面も、同じリージョン設定を信頼し、その MFR スクリプトまで読み込んでいる。API または権限のある表示サービス設定が侵害された場合、このクライアントは防御境界にならない。 + +通常の Ember の `src` バインディングが維持され、HTML 安全文字列として検査を迂回する処理はない。導入される Ember 3.16 の実装は `IFRAME`/`src` を URL 検査の対象にし、`javascript:` と `vbscript:` に `unsafe:` を付ける。独立したブラウザ試験で、実際の iframe の `src` が `unsafe:javascript:window.__reviewProbe=1` になることを確認した。もう一つのブラウザ試験では、細工したトークンが外側の一つのクエリ値に収まり、内側の取得先を変えないことを確認した。 これは一般的なホスト許可リストや、あらゆるスキームの検証ではない。 + +追加するトークンは jQuery の `param` で符号化される。追加する版の接尾辞も、既存の `url` 値へつなぐ前に符号化される。独立検査では、アンパサンド、二つ目の `url`、`javascript:`、フラグメント記号、引用符、山括弧を含むトークンが、外側の一つのクエリ値に収まった。取得先を変えたり、二つ目の `url` パラメーターを作ったりすることはなかった。 + +### 閲覧専用アクセスと版 + +閲覧専用トークンは、共有リンクからの読み取りを許す秘密の値である。MFR が非公開の共有ファイルを取得するには、信頼する設定済み MFR に送る必要がある。旧 API の download リンクにもリクエストの `view_only` が入るため、旧実装でも入れ子の取得 URL を通して、設定済み MFR にトークンが渡り得た。新実装は MFR の外側のクエリに明示して置き、既存の外側のトークンを保ち、クライアントに設定した一つの MFR の代わりにリージョン別 MFR へ送る場合がある。既存の「信頼する表示サービス」という前提では妥当だが、旧動作と完全に同一ではない。組み合わせて配備した実サービスでの閲覧専用表示は、ここでは検証していない。 + +サーバーが一重に符号化する取得 URL について、`/\?|%3F/i` は値全体を復号せずクエリ区切りを検出する。生の `?`、大小文字の `%3F`、既存クエリのない場合、パスに含まれる符号化済み疑問符(外側の値では `%253F`)に対応する。不正なパーセント列でも `URIError` は発生しない。外側の既存パラメーターとフラグメントは変わらない。版は `url` の中だけに加わり、選択する版を変えると元の render リンクから再計算され、古い版が累積しない。 + +この補助関数は、汎用の URL 正規化処理ではない。内側の既存の版を置換せず、内側にフラグメントがあれば追加した版はその後ろに入る。この呼出元が使うファイル詳細 API の契約では、版もフラグメントもない取得先を渡すため、どちらもこの PR の回帰とは確認できない。版の真偽値で追加の有無を決める従来動作も維持される。 + +### 互換性と試験の質 + +`links.render` がなければ、旧来の `links.download` と `?direct=&mode=render` を組み合わせる処理を維持する。download URL に既にクエリがある場合の旧来の制約も残り、この PR はそこを修正しない。文字列と `{ href }` の render リンクに対応し、render リンクだけでも iframe を作り、両方のリンクがなければ iframe を作らない。iframe の load イベントまで `src` を遅延させる動作も変わらない。Mirage の serializer はファイルに render リンクを返し、フォルダーには返さない。 + +追加された試験は component 7 件と受入 1 件である。受入試験は Mirage の render リンクを使い、実際の画面から component への受け渡しを確認する。component 試験は、内部の取得先の選択、リンクオブジェクト、版の変更、トークンの符号化・維持、フォールバック、両リンクのない状態を確認する。追加試験と Mirage の serializer を残し、component と二つの template だけを親の実装に戻すと、追加試験のうちちょうど 6 件(component 5 件、受入 1 件)が失敗した。3 件は download 由来の誤った URL、3 件は render リンクだけの場合に iframe がないことを検出した。フォールバックと両リンクなしの互換性試験は成功した。 + +非阻害の改善案として、クエリなし、小文字の符号化、不正なパーセント列、危険なスキームのケースを、コミットされる試験に加えるとよい。今回の独立検査では確認したが、正規表現に変更した理由である不正なパーセント列は、追加された試験自体では固定されていない。 + +<a id="evidence-japanese"></a> +### 証拠と残る作業 + +未変更の対象 head で、`tests/integration/components/file-renderer/component-test.ts` と `tests/acceptance/guid-file/file-detail-test.ts` の対象試験 26 件がすべて成功した。旧実装との比較は 26 件を完了し、想定どおり 6 件が失敗した。scratch だけに追加したブラウザ安全性試験 2 件も成功した。独立検査 12 件では、実際の TypeScript の補助関数と URL ユーティリティを変換して実行し、固定された jQuery 依存を使い、すべて成功した。scratch 専用の試験ファイルを削除し、追跡対象のソースはレビュー対象 head に戻した。push workflow のログで、正規表現への変更を含む最終 head の全体試験 986 件が成功して完了したことを確認できたため、PR 本文にあった直前版だけの全体試験という留保は解消している。完了した pull_request のログでも、全体試験 986 件の完了と Node 側試験 393 件の成功を確認した。 + +```toon +ci[2]{event,run,head,result,completed_utc}: + push,43054327572,b1e2ad328c4dfed47b680c77500cb3deb638c935,success,2026-11-11T16:17:32Z + pull_request,43054392861,b1e2ad328c4dfed47b680c77500cb3deb638c935,success,2026-11-11T16:41:24Z +``` + +ローカル検査は独立した scratch clone で、Node 26.12.0、Yarn 1.22.22、Chrome 157.0.8103.50 を使った。リモートの workflow は、リポジトリのラッパー経由で build/test に Node 24.22.2 を使った。ローカル検査を実スタックの検証として扱っていない。PR #14 とこの変更を合わせて配備した後、公開ファイル、非公開ファイルの閲覧専用リンク、選択した過去版を実際の Ember 画面で確認する必要がある。 diff --git a/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR10_Admin_2FA_r2.md b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR10_Admin_2FA_r2.md new file mode 100644 index 0000000..0cb5e04 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR10_Admin_2FA_r2.md @@ -0,0 +1,176 @@ +# REV PR10 Admin two-factor authentication review r2 / 管理画面2要素認証レビュー r2 + +> **Summary:** Four r1 findings are addressed at the application level. One P1 integration condition remains: PR #10 still needs PR #8's global access guard in its actual branch and tests on the merged result. +> **概要:** r1の4指摘はアプリ側で対応済み。P1の統合条件が1件残る。PR #10の実ブランチへPR #8の全体アクセスガードを取り込み、統合後の試験が必要。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only what publication requires: private-repository URLs become named plain-text references; local guide links become repository-relative links; unpublished scratch references become named plain text or quoted command-path placeholders; public review links absent from develop point to the reviewed public commit. / REV が公開に必要な変更のみを行った。非公開リポジトリの URL は名称付き平文参照、ローカルのガイドへのリンクはリポジトリ相対リンク、未公開 scratch の参照は名称付き平文またはコマンドの引用符付きパス代替表示とし、develop に未収録の公開レビューへのリンクは確認済みの公開コミットを指す。 +- Publication provenance / 公開版の来歴: REV(担当レビュワ)issued this publication version from the unchanged original `2026-11-12_RDM-osf.io-dev2027_PR10_Admin_2FA_r2.md` (SHA-256: `cd1686957d800b8510052df4fe8bc048f7306013b4985520ef348c6f379b2098`); the original file and scratch evidence remain unchanged, and all text other than this version/provenance metadata and the explicitly stated publication references is verbatim. Quoted scratch command-path placeholders identify retained unpublished evidence and must be replaced with its local location before execution. / REV が上記原本から公開版を発行した。原本と scratch 証跡は未変更で、版・来歴の追記と明示した公開用参照以外の本文は原文どおり。コマンド内の引用符付き scratch パス代替表示は保持された未公開証跡を識別するもので、実行にはそのローカルの場所への置換が必要。 +- Version / 版: 0.1 — 2026-11-12. **Learned:** Ending authentication does not stop an unguarded view; the committed middleware chain, rather than a temporary integration tree, determines the access boundary. / 認証を終了してもガードのないビューは止まらない。一時的な統合ツリーではなく、実ブランチのミドルウェア構成がアクセス境界を決める。 +- Applies to: RCOSDP/RDM-osf.io-dev2027 PR #10; REV(担当レビュワ, Codex Astra); `53558583..834d1b62`. +- Related: [Review index](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · Evidence JSON (REV scratch evidence (not published): `pr10-r2-evidence.json`) · Probe source (REV scratch evidence (not published): `pr10-r2-probe.py`) · Probe output (REV scratch evidence (not published): `pr10-r2-probe.log`). +- Posted comment / 投稿コメント: PR #10 comment `6799757084` (one comment / 1件). +- Used by: coordinator integration decision for PR #10 and the follow-up review after PR #8 merges. + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Changes requested.** R2-01 is the sole open finding, carrying forward R1-02 at P1. R1-01, R1-03, R1-04 and R1-05 are addressed within the qualifications stated in the [finding verification](#en-verification). This is a review comment, not a GitHub approval or merge action. + +Reviewed head `834d1b62c044f8bb56d9cd9e1453ac1798983f11` contains `a065ca3ee3` (r1 fixes) and `834d1b62c0` (duplicate message removal). The r1 source was the PR comment beginning `REV(担当レビュワ, Codex Astra)レビュー r1:` (comment ID `6759171742`). PR #8 remained OPEN with `mergedAt = null`; the latest inspected head was `beb16c84ed8af69c9da59155336b38d79eaa32cd`. It advanced from `163aba5a0f` during this review; its relevant admin middleware/settings/URL/tests files were unchanged between those heads. The author's earlier temporary integration evidence used #8 head `49e5521451`, not this latest head. + +### R2-01 — P1 — Integrate the global guard before declaring the admin boundary complete + +**Location:** `admin/common_auth/middleware.py:20–25`, `admin/base/settings/defaults.py:223–245`, `admin/README.md:66–67`; affected view: `admin/institutions/views.py:235–241`. + +The 2FA middleware logs out an unverified, expired-grace or disabled session, then calls the next handler. At the reviewed head, `AdminLoginRequiredMiddleware` does not exist in `admin/base/middleware.py` and is absent from `MIDDLEWARE`. `CannotDeleteInstitution` has no own authentication check. Thus `/institutions/<id>/cannot_delete/` can still execute after the logout, and a verified user who loses staff rights is not rejected by this middleware. The README claims that the global guard already runs after 2FA, which is not true of this branch. The PR body's r1 response table similarly says develop was merged, although its later integration-status section correctly says #8 is still open and describes a temporary tree. + +**Reproduction:** an extracted real `TwoFactorSessionMiddleware` and `CannotDeleteInstitution`, running on Django 1.11.28, invoked the institution lookup and returned a status-200 TemplateResponse for anonymous, pending-only, unverified, expired-grace, disabled and nonstaff requests. The lookup was mocked and the template was not rendered; this proves view execution, not an end-to-end browser response. Composing the same chain with #8's real `process_view` rejected anonymous/pending/unverified/expired-grace/disabled requests before the lookup (302), allowed a verified active staff user (200), and rejected a verified nonstaff user (`PermissionDenied`, converted to 403 by Django). The URL reversal was stubbed. Both probes passed their assertions, including reproduction of the defect. + +This is the pre-existing global protection gap recorded as R1-02, not a claim that the r2 change introduced a new endpoint. The grace-marker validation itself is fixed; preventing the logged-out request from reaching every private view still depends on #8. Approval remains blocked until the dependency is present and tested in the actual #10 head. + +<a id="en-verification"></a> +### Finding verification + +| r1 item | Result and source evidence | Probe/test evidence | +|---|---|---| +| R1-01, P1: grace does not expire | Addressed at the marker layer. `two_factor.py:256–260,316–323` records the issued deadline and requires both that deadline and the current setting to remain valid. | Local checks: future accepted; issued deadline expired, setting removed/moved to past, missing deadline, wrong user rejected; extending the configured deadline does not extend an issued marker; normal TOTP marker accepted. Head CI executes the grace regression tests. Global denial after logout is still R2-01. | +| R1-02, P1: view executes after logout | **Open as R2-01.** `middleware.py:25` continues the request; the committed settings lack #8. | Direct view execution and composition probes described in R2-01. `TestAdminWideGate` described by the author is not present in this branch. | +| R1-03, P1: IdP context origin | Addressed in application code. `two_factor.py:277–306` reads a server-set WSGI variable, rejects HTTP-prefixed configured sources and rejects client context headers. Defaults at `admin/base/settings/defaults.py:364–371` remain TOTP. | Accepted a server-only AAL2 value; refused missing/unknown contexts, four HTTP header spellings with/without the server value (eight combinations), HTTP/lowercase HTTP/empty configured names. Head CI runs the corresponding Shibboleth tests. | +| R1-04, P2: lost pending attempt increments | Addressed. `addons/twofactor/models.py:310–322` uses one conditional increment; `two_factor.py:210–214` reserves before verification; `two_factor.py:252–255` requires winning the pending-row deletion before login. | Real Django ORM + SQLite probe: budget 2 allows exactly two sequential reservations, rejects third/wrong owner/expired/deleted row; stale completion does not call login. Captured SQL has `attempts = attempts + 1` and `attempts < 2` in one UPDATE. CI logs show both PostgreSQL concurrency tests passed. | +| R1-05, existing timing issue | Addressed for the missing-user vs wrong-password work difference. `api/base/authentication/backends.py:9–20` hashes on the missing-user path; `framework/auth/core.py:133–144` returns False after checking an existing user's wrong password. | Extracted backend with real PBKDF2: missing user calls `make_password` once; wrong password calls `check_password` once without extra dummy hashing; correct password returns user. CI executes login POST and equal-message tests. No claim of identical wall-clock latency across all hash formats. | + +For R1-03, production enablement of `idp` still requires a trusted server to derive the WSGI variable from the verified SAML assertion, overwrite identity/entitlement headers, and block direct backend access. Those deployment settings were not inspected or exercised. The new application interface refuses HTTP-only context forwarding; such deployments must retain default `totp` mode. This closes the original application trust-in-HTTP finding, not the deployment acceptance work. + +The template-only commit removes the local messages include from `two_factor.html` and `two_factor_setup.html`; `base.html` retains the shared message rendering. No independent browser run was performed for this visual change. + +### Required verification after #8 merges and develop is merged into #10 + +1. Merge the actual develop containing #8 into #10 and resolve `admin/common_auth/urls.py` using #8's `login_not_required` convention. Preserve public reachability of password login, Shibboleth login, logout, two-factor verify/setup, and the `/admin/login/` redirect while keeping recovery-code management private. Audit the full public set, including the password-reset and existing intentionally public routes, under both login-form settings. +2. Verify the real middleware order: AuthenticationMiddleware → TwoFactorSessionMiddleware → AdminLoginRequiredMiddleware before protected view execution. Keep #8's global guard enabled in tests, without a reduced substitute chain. +3. Commit the public-view allowlist update (`EXPECTED_PUBLIC`: add the two second-step views and `admin_site_login`, replacing the Django admin login callback where appropriate) and verified-session test fixture changes. A bare `force_login` must redirect; a verified nonstaff user must reach the global 403 check. Recheck the disabled-admin and logout tests without weakening their expectations. +4. On `/institutions/<id>/cannot_delete/`, assert no view execution or institution data for anonymous, pending-only, legacy/bare-login, wrong-user marker, expired/disabled grace, and disabled-user sessions. Verify successful active staff/superuser access and 403 after rights removal, including removal of both elevated flags. Exercise public authentication routes without redirect loops. +5. Re-run `admin_tests/base`, `admin_tests/common_auth`, the committed full-chain gate regressions, twofactor add-on tests including PostgreSQL concurrency, affected API authentication/OTP tests, and head CI. Compare broader failures against the same newly merged develop baseline. Re-run the password/Shibboleth + TOTP/setup/recovery browser flows on the actual resulting head. The earlier temporary merge and this review's small composition probe are not that evidence. +6. Correct README and PR-body status claims to match the merged tree and attach results for its exact commit. Keep `idp` disabled in deployments that cannot establish the server-side SAML-to-WSGI trust path. + +### Validation and limits + +The JSON file is the canonical snapshot for checks and identities. The following TOON block is a summary of observed results. + +```toon +validation: + head: 834d1b62 + local_extracted_probes: 6 passed + changed_python_syntax: 8 passed + git_diff_check: passed + github_checks: 14 success + pr_unit_run: 42767724457 success + push_unit_run: 42767716129 success + codeql_run: 42767724480 success + pr_admin_api1: 4419 passed, 47 skipped + pr_two_factor_file: 73 passed + pr_addons: 3460 passed, 10 skipped + postgres_pending_concurrency: 2 passed in both PR and push logs +``` + +The CI job is named `api1_and_js`, but its task currently comments out Karma; its success is not proof of browser or JavaScript test execution. The raw job log was fetched with `gh api` because `gh run view --log` ended at a webpack progress line for that job. The complete raw log shows 73 passing cases in `admin_tests/common_auth/test_two_factor.py` and the 4419-pass summary. CI excerpt (REV scratch evidence (not published): `pr10-r2-ci-admin-excerpt.txt`) and check list (REV scratch evidence (not published): `pr10-r2-checks.txt`) are retained. + +Local probes ran in an isolated Python 3.9.6 virtual environment with Django 1.11.28 and an in-memory SQLite database. Production functions/classes were AST-extracted without changing their bodies. The model was registered under a tiny stand-in app with a stub user model; the view's institution lookup and backend user retrieval were mocked. Session logout, RequestFactory, TemplateView, hashing and model UPDATE used real Django code. The small harness does not run the entire application's imports, middleware chain, templates, PostgreSQL or browser. Actual PostgreSQL concurrency evidence comes from the successful head CI, not from the local SQLite probe. No full suite was rerun locally. + +Reproduce the retained local evidence from any directory while the scratch clone remains available: + +```sh +"<REV scratch interpreter (not published): rev-pr10-r2 venv/bin/python>" "<REV scratch evidence (not published): probe.py>" +``` + +Expected: six tests succeed, including six `HEAD VIEW EXECUTED` cases and the conditional UPDATE SQL. The harness intentionally asserts the unresolved boundary defect. Its source and output are linked in the header; original full CI logs, PR snapshots and scratch clone are under `REV scratch evidence (not published): rev-pr10-r2`. + +No merge, approve, close, push or commit was performed. The grdm-dev Docker stack was untouched; no Docker command was run and `runtime/.env` was not read. Only the authorized single review comment is posted to PR #10. Review artifacts remain uncommitted. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**changes requested(要修正)。** 未解決はR2-01の1件で、R1-02のP1統合条件を継続する。R1-01・R1-03・R1-04・R1-05は、[指摘の検証](#ja-verification)に記した範囲で対応済み。GitHubの承認・マージ操作ではなくレビューコメントとして報告する。 + +確認したheadは `834d1b62c044f8bb56d9cd9e1453ac1798983f11`。対象差分はr1修正の `a065ca3ee3` と二重メッセージ除去の `834d1b62c0`。r1の基準は `REV(担当レビュワ, Codex Astra)レビュー r1:` で始まるPRコメント(ID `6759171742`)。PR #8はOPEN・`mergedAt = null`で、最新確認headは `beb16c84ed8af69c9da59155336b38d79eaa32cd`。レビュー中に `163aba5a0f` から進んだが、関連するadminミドルウェア・設定・URL・試験の差分はなかった。作者の一時統合試験はさらに前の #8 head `49e5521451` を用いている。 + +### R2-01 — P1 — 全体ガードを統合してから管理画面の境界を完了とする + +**箇所:** `admin/common_auth/middleware.py:20–25`、`admin/base/settings/defaults.py:223–245`、`admin/README.md:66–67`。対象ビューは `admin/institutions/views.py:235–241`。 + +2FAミドルウェアは、未検証・猶予期限切れ・無効化されたセッションをログアウトさせた後、次のハンドラーを呼ぶ。現headには `admin/base/middleware.py` の `AdminLoginRequiredMiddleware` が存在せず、`MIDDLEWARE`にも登録されていない。`CannotDeleteInstitution`にも独自の認証検査がない。そのため `/institutions/<id>/cannot_delete/` はログアウト後も実行され、検証済み利用者からstaff権限を外してもこのミドルウェアでは拒否しない。READMEの「2FAの後に全体ガードが動く」という記述は現ブランチと一致しない。PR本文のr1対応表もdevelop取込済みと書くが、後段の統合状況は #8 がOPENで一時統合ツリーを試験したと正しく記している。 + +**再現:** 実コードから抽出した `TwoFactorSessionMiddleware` と `CannotDeleteInstitution` をDjango 1.11.28で実行した。匿名、保留のみ、未検証、猶予失効、利用者無効化、非staffの6条件で機関情報の取得処理を呼び、status 200のTemplateResponseを返した。機関取得はmockで、テンプレートは描画していないため、実ブラウザの応答ではなくビュー実行の証拠である。同じ処理へ #8 の実 `process_view` を組み合わせると、匿名・保留・未検証・猶予失効・無効化は取得前に302となり、有効な検証済みstaffは200、検証済み非staffは `PermissionDenied`(Djangoで403になる)となった。URL逆引きはstub。欠陥の再現を含め、両プローブのassertionは成功した。 + +これはR1-02で記録した既存の全体保護不足であり、r2差分が新たな公開エンドポイントを導入したという指摘ではない。猶予印の検証自体は修正済みだが、ログアウト後にすべての非公開ビューへ進ませないことは #8 に依存する。実際の #10 headへ依存を取り込み、そのheadを試験するまで承認条件は満たさない。 + +<a id="ja-verification"></a> +### 指摘の検証 + +| r1項目 | 結果とコードの証拠 | プローブ・試験の証拠 | +|---|---|---| +| R1-01、P1: 猶予が失効しない | 通過印の層で対応済み。`two_factor.py:256–260,316–323`は発行時期限を記録し、発行時期限と現在設定の両方の有効性を要求する。 | 将来期限は許可、発行期限超過・設定解除/過去化・期限欠落・別利用者は拒否。設定期限を延ばしても発行済み印は延長しない。通常のTOTP印は許可。head CIでも猶予の回帰試験を実行。ログアウト後の全体拒否はR2-01。 | +| R1-02、P1: ログアウト後にビュー実行 | **R2-01として未解決。** `middleware.py:25`で処理を続け、実設定に #8 がない。 | R2-01のビュー実行・組合せプローブ。作者が述べる `TestAdminWideGate` は現ブランチに存在しない。 | +| R1-03、P1: IdPコンテキストの出所 | アプリコードで対応済み。`two_factor.py:277–306`はサーバー設定のWSGI変数を読み、HTTP名の設定とクライアントのcontextヘッダーを拒否する。`admin/base/settings/defaults.py:364–371`の既定はTOTP。 | サーバー変数のみのAAL2を許可。欠落・未知context、HTTPヘッダー4種×サーバー値有無の8条件、HTTP/小文字HTTP/空の設定名を拒否。head CIでも該当Shibboleth試験を実行。 | +| R1-04、P2: 保留試行回数の加算が失われる | 対応済み。`addons/twofactor/models.py:310–322`は条件付き単一加算、`two_factor.py:210–214`はコード検証前に回数を確保。`two_factor.py:252–255`は保留行の削除成功をログイン条件とする。 | 実Django ORM+SQLiteで上限2の2回のみ成功し、3回目・別利用者・期限切れ・削除済みを拒否。古い保留で完了してもloginを呼ばない。SQLは同一UPDATE内に加算と `attempts < 2` を持つ。CIでPostgreSQL並行試験2件の成功を確認。 | +| R1-05、既存の時間差 | 不存在と誤パスワードのハッシュ処理量の差へ対応済み。`api/base/authentication/backends.py:9–20`で不存在時にもハッシュ処理。`framework/auth/core.py:133–144`は既存利用者の誤パスワード検査後にFalseを返す。 | 抽出backendと実PBKDF2で、不存在はmake_passwordが1回、誤パスワードはcheck_passwordが1回で余分なdummyハッシュなし、正解は利用者を返す。CIで実ログインPOSTと同一メッセージ試験を実行。全ハッシュ形式で経過時間が完全一致するとの主張ではない。 | + +R1-03について、本番で `idp` を有効化するには、信頼できるサーバーが検証済みSAML assertionからWSGI変数を設定し、利用者識別・権限ヘッダーを上書きし、バックエンドへの直接アクセスを防ぐ必要がある。実配備の設定は閲覧・実行していない。新しいアプリの入力方式はHTTPヘッダーのみの転送を拒否するため、その配備では既定の `totp` を維持する。元の「HTTP値をアプリが信頼する」問題は解消したが、配備の受入作業は別途残る。 + +テンプレートだけのコミットは `two_factor.html` と `two_factor_setup.html` のローカルmessages includeを除去し、`base.html` の共通表示を残す。表示変更の独立したブラウザ再試験は行っていない。 + +### #8マージ後にdevelopを #10へ取り込んで再確認する事項 + +1. #8を含む実際のdevelopを #10へ取り込み、`admin/common_auth/urls.py` の競合を #8 の `login_not_required` 規約で解消する。パスワード・Shibbolethログイン、ログアウト、2FA検証/登録、`/admin/login/` の転送は匿名から到達可能とし、リカバリーコード管理は非公開を保つ。パスワードリセットと既存の意図的公開ルートも含め、ログインフォーム設定の両条件で全公開集合を監査する。 +2. 実順序がAuthenticationMiddleware → TwoFactorSessionMiddleware → AdminLoginRequiredMiddlewareで、保護ビュー実行前にガードされることを確認する。試験では縮小した代替構成を使わず #8 の全体ガードを有効にする。 +3. 公開ビュー許可集合 `EXPECTED_PUBLIC` に2FAの2画面と `admin_site_login` を反映し、必要に応じDjango admin loginのcallbackを置き換える。検証済みセッションを作るfixtureの変更をコミットする。単なる `force_login` はredirect、検証済み非staffは全体ガードの403となる必要がある。無効化管理者とlogoutの試験も期待値を弱めず再確認する。 +4. `/institutions/<id>/cannot_delete/` で、匿名・保留のみ・旧/裸のログイン・別利用者の印・猶予期限切れ/解除・無効利用者がビュー実行や機関情報の取得へ到達しないとassertする。有効な検証済みstaff/superuserは到達でき、両方の昇格権限を失うと403になることを確認する。公開認証ルートにredirect loopがないことも確かめる。 +5. `admin_tests/base`、`admin_tests/common_auth`、実チェーンのガード回帰試験、PostgreSQL並行試験を含むtwofactor add-on試験、影響するAPI認証/OTP試験、head CIを実行する。広い試験の失敗は同じ取込後developを基準に比較する。実際の結果headでパスワード/Shibboleth+TOTP/登録/リカバリーのブラウザフローを再試験する。作者の旧一時統合結果や今回の小さな組合せプローブはその代わりにならない。 +6. READMEとPR本文を実際の統合状況へ合わせ、厳密なコミットに対する試験結果を添える。SAMLからWSGIへの信頼経路を保証できない配備では `idp` を有効化しない。 + +### 検証と限界 + +チェックとhead識別の正本はJSON。次のTOONは観測結果の要約である。 + +```toon +validation: + head: 834d1b62 + local_extracted_probes: 6 passed + changed_python_syntax: 8 passed + git_diff_check: passed + github_checks: 14 success + pr_unit_run: 42767724457 success + push_unit_run: 42767716129 success + codeql_run: 42767724480 success + pr_admin_api1: 4419 passed, 47 skipped + pr_two_factor_file: 73 passed + pr_addons: 3460 passed, 10 skipped + postgres_pending_concurrency: PRとpushの両ログで2 passed +``` + +CIジョブ名は `api1_and_js` だが、現タスクのKarma呼出しはコメントアウトされているため、成功をブラウザ/JavaScript試験の証明とはしない。`gh run view --log` は当該ジョブでwebpackの進捗行までしか取得できなかったため、`gh api`で生ログを取得した。完全なログには `admin_tests/common_auth/test_two_factor.py` の73件成功と4419 passedの集計がある。CI抜粋 (REV scratch evidence (not published): `pr10-r2-ci-admin-excerpt.txt`)とチェック一覧 (REV scratch evidence (not published): `pr10-r2-checks.txt`)を保存した。 + +ローカルは隔離したPython 3.9.6仮想環境、Django 1.11.28、メモリー内SQLiteで実行した。製品の関数・クラスを本文変更なしでAST抽出した。モデルは小さな代替appとstub利用者モデルへ登録し、機関検索とbackend利用者検索はmockにした。セッションlogout、RequestFactory、TemplateView、ハッシュ、モデルUPDATEは実Djangoを使用。この小さなharnessはアプリ全体のimport・全ミドルウェア・テンプレート・PostgreSQL・ブラウザを実行しない。実PostgreSQL並行性の証拠は成功したhead CIであり、ローカルSQLiteではない。ローカルで全試験は再実行していない。 + +scratch cloneが残っている間、任意のディレクトリから次で再現できる。 + +```sh +"<REV scratch interpreter (not published): rev-pr10-r2 venv/bin/python>" "<REV scratch evidence (not published): probe.py>" +``` + +期待結果は6試験成功、6条件の `HEAD VIEW EXECUTED`、条件付きUPDATEのSQL。harnessは未解決の境界問題の再現も意図してassertする。ソースと出力はヘッダーから参照できる。全CIログ・PR snapshot・scratch cloneは `REV scratch evidence (not published): rev-pr10-r2` にある。 + +merge・approve・close・push・commitは実施していない。grdm-devのDockerスタックは変更せず、Dockerコマンドも実行していない。`runtime/.env`も読んでいない。PR #10への書込みは許可されたレビューコメント1件のみ。レビュー成果物は未コミットのまま残す。 diff --git a/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR10_Admin_2FA_r3.md b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR10_Admin_2FA_r3.md new file mode 100644 index 0000000..a5395a2 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR10_Admin_2FA_r3.md @@ -0,0 +1,181 @@ +# REV PR10 Admin two-factor sign-in review r3 / 管理画面二段階ログイン レビュー r3 + +> **Summary:** The Django 2.2 integration preserves password-or-Shibboleth followed by TOTP. R2-01 remains an open P1 because the global admin guard from PR #8 has not been integrated. +> **概要:** Django 2.2 統合後も、パスワードまたは Shibboleth の後に TOTP を要求する構成を維持している。PR #8 の管理画面全体ガードが未統合のため、R2-01 は P1 の未解決事項として継続する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-12. **Learned:** A framework upgrade can preserve the two-step flow while an independent access-boundary dependency remains unresolved; mixed-suite failures require a lifecycle diagnosis. / フレームワーク更新後も二段階処理を維持できる一方、アクセス境界の独立した依存は未解決のまま残る。混合試験の失敗は接続ライフサイクルを追って判断する必要がある。 +- Applies to / 対象: RCOSDP/RDM-osf.io-dev2027 PR #10, review r3; REV(担当レビュワ, Codex Astra). +- Review comment / レビューコメント: 6811670550 — 2026-11-12 01:28 UTC. +- Related / 関連: SPEC-06 Documentation Conventions; PR #10 review r2; PR #8; PR #13; AID comment 6810132408. [Verdict / 判定](#en-verdict) · [Connection diagnosis / 接続の診断](#en-connections) · [日本語の診断](#ja-connections). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +<a id="en-verdict"></a> +### Verdict and scope + +**Changes requested. R2-01 remains open at P1.** Passing this review requires every CI job to be green on the reviewed head and no open P1 or P2. Green CI alone cannot close the missing global admin guard. This is a review comment, not a GitHub approval or merge operation. + +The reviewed range is `834d1b62c044f8bb56d9cd9e1453ac1798983f11..e09c49111edbc24f9782550ae5bcbc55a174e660`. Merge `f024666860` brings in develop `73ff43b3c21f3258f6d34ca99b77ef66f1191e0e`; `e09c49111e` updates the authentication tests. Review focuses on PR #10's compatibility with Django 2.2 and its test adaptations. It does not repeat independent reviews of the imported Yjs and render-URL features. + +### R2-01 — P1 — Integrate the global admin guard before closing the access boundary + +**Locations:** `admin/common_auth/middleware.py:20–25`, `admin/base/settings/defaults.py:235–244`, `admin/institutions/views.py:235–241`, `admin/README.md:62–67`. + +`TwoFactorSessionMiddleware` logs out an unverified or deactivated session and then calls the next handler. `AdminLoginRequiredMiddleware` is still absent from this head and from its middleware configuration. `CannotDeleteInstitution` still has no independent authentication check. The README describes a global guard that this branch does not yet contain. + +A Django 2.2.28 probe executed the unchanged production middleware and view bodies for anonymous, pending-only, unverified, expired-grace, disabled-user, and verified-nonstaff states. All six reached the institution lookup and returned a status-200 TemplateResponse. Institution lookup was mocked and the template was not rendered: this demonstrates view execution, not a complete browser response. The probe intentionally asserts the existing defect. + +**R2-01 stays open until PR #8 merges and develop is merged into PR #10 again.** Then verify the actual order `AuthenticationMiddleware → TwoFactorSessionMiddleware → AdminLoginRequiredMiddleware`, the anonymous allow-list for password/Shibboleth login and TOTP verification/enrollment, and the private recovery-code routes. Recheck missing or wrong-user verification markers, expired/removed grace, deactivated users, and loss of both staff and superuser rights before any protected view executes. Retest the resulting head and update the README to match it. A temporary composition or a green pre-integration head cannot substitute for that work. + +### Django 2.2 compatibility and test review + +| Area | Finding and evidence | +|---|---| +| Password-change views | `admin/common_auth/urls.py:27–32` uses `PasswordChangeView.as_view(success_url=reverse_lazy('auth:password_change_done'))` and `PasswordChangeDoneView.as_view(template_name='password_change_done.html')`. Names and intended destination are preserved. An isolated probe executes these exact URL expressions with real Django 2.2 views: anonymous/unverified requests redirect, a verified user's password change reaches the done view, its session remains authenticated, and a subsequent external password change invalidates the session. | +| Middleware | `SessionAuthenticationMiddleware` is removed. The real setting places `TwoFactorSessionMiddleware` directly after `AuthenticationMiddleware`. Django's authentication layer checks the session authentication hash; the isolated probe confirms invalidation without the removed middleware. The separate missing global guard is R2-01. | +| Backend dispatch | `api/base/authentication/backends.py:10–25` accepts `request=None` and `**kwargs`. Both username and password absent returns `None` without lookup or hashing, including credentials for another backend. Partial/empty password credentials still take the dummy-hash path. | +| R1-05 hash work | Correct credentials return the user after one password check. An existing account with a wrong password returns `None` after one check and no extra dummy hash. A missing account performs one `make_password` call. The real Django dispatcher and PBKDF2 exercised all three paths in the local probe; this is a hash-work guarantee, not a claim of identical elapsed time for every stored password format. | +| New dispatcher regression tests | `TestDjangoAuthenticateUsesOdmBackend`, at `admin_tests/common_auth/test_django22_auth_http.py:87–124`, calls real `django.contrib.auth.authenticate(request, ...)` with the admin backend list. It checks the returned backend and hashing-call counts. Its password-check spy calls Django's real hasher. A separate reviewer negative control with the old signature confirms that Django skips the backend, which would violate these assertions. | +| Five develop HTTP scenarios | The correct-password case, wrong-password case, unknown-user case, and two direct-admin password cases retain meaningful expectations. Lines 144–165 require no authentication after the password POST, a redirect to TOTP, and authentication through ODMBackend only after a valid TOTP; SameSite=Lax, HttpOnly, and logout remain checked. Lines 186–197 require both correct and incorrect `/admin/login/` POSTs to redirect to the two-step route without authenticating. These expectations enforce PR #10's behavior rather than weakening it to match password-only login. | +| Other removed APIs | PR #10's code uses property-form `is_authenticated`, `django.urls`, and explicit `CASCADE` for both added foreign keys in models and migrations. Its middleware uses the new callable interface. No additional Django 2.2 incompatibility was identified in the reviewed code. | + +<a id="en-connections"></a> +### Mixed-process “connection already closed” diagnosis + +The author's four failures are reproducible: the unmodified head's `admin_tests/common_auth admin_tests/base addons/twofactor/tests` run produced **212 passed, 4 failed**. All four failures are the Flask twofactor view tests. They fail in the authenticated-user lookup before the twofactor view body. + +The trace identifies the lifecycle conflict. `tests/base.py:45–51` removes Flask's Django database callbacks so pytest's enclosing transaction remains usable. Loading the admin URL configuration imports `admin.rdm_addons.views`; its existing `init_app()` at lines 21–37 calls `attach_handlers()` again. The reattached `framework/django/handlers.py:9–21` calls `close_old_connections()` inside the test transaction. Django 2.2's `close_if_unusable_or_obsolete()` sees autocommit differ from the configured default and closes the connection. The next lookup fails with `InterfaceError`. The first closure is captured before the user lookup, with `in_atomic_block=True`, `autocommit=False`, and `closed_in_transaction=False`. + +A reviewer-only fixture removes precisely those callbacks around the four affected tests and restores their prior registry afterward. With production code and assertions unchanged, the combined run becomes **216 passed**. This is diagnostic evidence, not a submitted fix. On develop `73ff43b3` with a separate database, a minimal admin-URL import test followed by the same four view tests produces **1 passed, 4 failed**. Deselecting that import test produces **4 passed, 1 deselected**. The callback-registration code is unchanged in the r3 delta. + +The normal application registry does not undergo the test harness's callback removal; `framework/flask/__init__.py` adds a handler only when it is absent. This distinction explains why the demonstrated failure is tied to test initialization order. + +**Assessment:** This is an inherited test-isolation defect, not evidence that PR #10 newly breaks the production TOTP path. CI's split hides a real test-isolation problem; separate green jobs alone were not an adequate explanation. Keep this as a test-harness follow-up with an import-order regression test. Do not “fix” production by disabling connection cleanup. No additional product P1/P2 is established by this failure once the lifecycle control and baseline evidence are considered. + +### Validation and limits + +All **14 checks are successful** on `e09c49111e`: Unit Tests PR run `43123405175`, Unit Tests push run `43123399576`, and CodeQL run `43123405181` completed successfully. The raw push admin/API log records 4,439 passed and 47 skipped, including 20 cases in `test_django22_auth_http.py` and 73 in `test_two_factor.py`. The raw PR add-on log records 3,344 passed and one skipped, including all 58 twofactor cases: four PostgreSQL counter/routing cases and two pending-budget concurrency cases are among them. Final verification at 2026-11-12 01:28 UTC confirms PR #10 still has the reviewed head and PR #8 is OPEN with `merged_at = null` (head `d1258ec140`). The review therefore remains changes requested because R2-01 is open. Run metadata, job lists, check results, and PR snapshots are retained as JSON in the review scratch space. + +```toon +review: + head: e09c49111edbc24f9782550ae5bcbc55a174e660 + django: 2.2.28 + github_checks: 14 success + pr_unit_run: 43123405175 success + push_unit_run: 43123399576 success + codeql_run: 43123405181 success + extracted_code_probes: 5 passed + push_admin_api1: 4439 passed, 47 skipped + push_django22_auth_file: 20 passed + push_admin_two_factor_file: 73 passed + pr_addons: 3344 passed, 1 skipped + pr_twofactor_addon: 58 passed, including 4 counter/routing and 2 pending-budget cases + head_combined_unmodified: 212 passed, 4 failed + head_combined_isolation_control: 216 passed + python_syntax: 17 PR-specific files passed + diff_whitespace_check: passed +``` + +The five local probes use Python 3.9.6, real Django 2.2.28, in-memory SQLite, unchanged extracted production bodies, and stand-in User/Email models. Password-view templates are minimal substitutes. These probes do not run the complete application or demonstrate PostgreSQL concurrency. The application test runs use Python 3.6.9, Django 2.2.28, pytest 5.0.0, pytest-django 3.10.0, the existing `py313-osf-test:stage1` image (`7dd417d7a983`), and a disposable PostgreSQL 9.6 instance. Reviewer settings derive from the repository's test settings, select the disposable database, disable debug tooling, and supply empty webpack bundle metadata. No browser test was run. CI's `api1_and_js` name does not prove JavaScript/browser coverage: the Karma call is commented out. + +CI extracts are retained as `ci-pr-addons-excerpt.txt` and `ci-push-admin-excerpt.txt`; full job logs are also retained. Local evidence is retained as `review_import_test.py`, `review_settings.py`, `probe.py`, `probe.log`, `combined.log`, `combined-trace.log`, `close-trace.log`, `review_isolation.py`, `combined-isolation.log`, and `baseline-combined.log`, `baseline-alone.log` in the review scratch space. The original combined test command, from the isolated checkout with reviewer test settings, is: + +```sh +python3 -m pytest admin_tests/common_auth admin_tests/base addons/twofactor/tests --ds=review_settings --tb=long -q +``` + +The expected unmodified result is the four diagnosed failures, not an all-green combined run. The isolation control loads the reviewer-only pytest fixture before repeating the same tests. + +No merge, approve, close, push, or commit was performed. Only one authorized PR comment is posted. The disposable review containers and network were removed after validation; the grdm-dev stack was not changed, and `runtime/.env` was never read. The record and evidence remain uncommitted. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +<a id="ja-verdict"></a> +### 判定と範囲 + +**changes requested(要修正)。R2-01 は P1 として未解決。** 合格には、確認した head の全 CI ジョブ成功と、未解決 P1/P2 がないことの両方が必要である。CI が成功しても、全体ガードの未統合は解消しない。これはレビューコメントによる報告であり、GitHub の承認・マージ操作ではない。 + +対象差分は `834d1b62c044f8bb56d9cd9e1453ac1798983f11..e09c49111edbc24f9782550ae5bcbc55a174e660`。`f024666860` は develop `73ff43b3c21f3258f6d34ca99b77ef66f1191e0e` の取込み、`e09c49111e` は認証試験の更新である。PR #10 の Django 2.2 互換性と試験の調整を対象とし、取込みに含まれる Yjs・render URL の独立したレビューは繰り返していない。 + +### R2-01 — P1 — 全体ガードを統合してからアクセス境界を完了とする + +**箇所:** `admin/common_auth/middleware.py:20–25`、`admin/base/settings/defaults.py:235–244`、`admin/institutions/views.py:235–241`、`admin/README.md:62–67`。 + +`TwoFactorSessionMiddleware` は未検証・無効化セッションをログアウトさせた後、次のハンドラーを呼ぶ。現 head に `AdminLoginRequiredMiddleware` は存在せず、設定にもない。`CannotDeleteInstitution` にも独自の認証検査がない。README は現ブランチにない全体ガードを説明している。 + +Django 2.2.28 で、製品のミドルウェアとビューの本体を変更せずに抽出し、匿名・保留のみ・未検証・猶予期限切れ・利用者無効化・検証済み非staffの6条件を実行した。すべて機関取得へ到達し、status 200 の TemplateResponse を返した。機関取得は mock、テンプレートは未描画なので、完全なブラウザ応答ではなくビュー実行の証拠である。試験は既存欠陥の再現を意図して assert している。 + +**PR #8 がマージされ、その後 develop を再度 PR #10 に取り込むまで、R2-01 は未解決のままとする。** 取込み後に実際の順序 `AuthenticationMiddleware → TwoFactorSessionMiddleware → AdminLoginRequiredMiddleware`、パスワード/ShibbolethログインとTOTP検証/登録の匿名許可集合、リカバリーコード管理の非公開性を確認する。印の欠落・別利用者の印、猶予の期限切れ/解除、無効化利用者、staffとsuperuser両権限の喪失を、保護ビュー実行前に拒否する試験を行う。結果 head を再試験し、README を実装に合わせる。一時的な組合せ試験や取込み前 head の CI 成功は代わりにならない。 + +### Django 2.2 互換性と試験の確認 + +| 観点 | 結果と証拠 | +|---|---| +| パスワード変更ビュー | `admin/common_auth/urls.py:27–32` は `PasswordChangeView.as_view(success_url=reverse_lazy('auth:password_change_done'))` と `PasswordChangeDoneView.as_view(template_name='password_change_done.html')` を使用し、URL名と遷移先を保持する。実際の URL 式と Django 2.2 のビューを使う隔離試験で、匿名/未検証は転送、検証済み利用者の変更は完了画面へ到達しセッションを維持、その後の別経路のパスワード変更ではセッションを無効化することを確認した。 | +| ミドルウェア | `SessionAuthenticationMiddleware` を削除し、実設定では `AuthenticationMiddleware` の直後に `TwoFactorSessionMiddleware` を置く。セッション認証ハッシュの検査は Django の認証層が行い、隔離試験でも旧ミドルウェアなしで失効を確認した。全体ガードの不足は別途 R2-01。 | +| backend の呼出し | `api/base/authentication/backends.py:10–25` は `request=None` と `**kwargs` を受け取る。username/password がともに未指定なら、他backend向け資格情報でも検索・ハッシュなしで `None`。一部欠落・空のパスワード資格情報は dummy hash 経路を通る。 | +| R1-05 のハッシュ処理量 | 正解はパスワード検査1回で利用者を返す。既存アカウントの誤パスワードは検査1回・追加dummy hashなしで `None`。不存在は `make_password` 1回。レビュワの隔離試験では実 Django dispatcher と PBKDF2 で3経路を確認した。すべての保存形式で経過時間が完全一致するとの意味ではない。 | +| 追加 dispatcher 回帰試験 | `admin_tests/common_auth/test_django22_auth_http.py:87–124` の `TestDjangoAuthenticateUsesOdmBackend` は管理画面のbackend一覧で実 `django.contrib.auth.authenticate(request, ...)` を呼び、返るbackendとハッシュ呼出し回数を検査する。パスワード検査のspyは実 Django hasher を呼ぶ。レビュワの別の否定試験でも旧シグネチャではbackendが飛ばされ、これらの期待値を満たせないことを確認した。 | +| develop のHTTP試験5条件 | 正解・誤パスワード・不存在・直接adminへの正誤POSTの5条件は有効な検査を保つ。144–165行はパスワードPOST後の未認証とTOTPへの転送を要求し、有効なTOTP後にだけODMBackendで認証する。SameSite=Lax、HttpOnly、logoutも維持。186–197行は `/admin/login/` への正誤どちらのPOSTも、認証せず二段階画面へ転送することを要求する。パスワードだけでログインする期待値に弱めていない。 | +| その他の削除API | PR #10 のコードはプロパティ形式の `is_authenticated`、`django.urls`、追加した2つの外部キーのモデル/マイグレーション双方で明示的な `CASCADE` を使用する。ミドルウェアは新方式のcallable。本範囲で追加の Django 2.2 非互換は見つからなかった。 | + +<a id="ja-connections"></a> +### 同一プロセスの “connection already closed” の診断 + +作者の4失敗を再現した。未変更headの `admin_tests/common_auth admin_tests/base addons/twofactor/tests` は **212 passed、4 failed**。失敗は4つともFlask側のtwofactorビュー試験で、ビュー本体の前の認証利用者取得時に発生する。 + +接続を閉じる経路を追跡した。`tests/base.py:45–51` はpytestが外側に張るトランザクションを維持するため、FlaskのDjangoデータベースcallbackを外す。その後の管理画面URL設定のimportが `admin.rdm_addons.views` を読み、既存の21–37行の `init_app()` が `attach_handlers()` を再実行する。戻された `framework/django/handlers.py:9–21` が試験のトランザクション内で `close_old_connections()` を呼び、Django 2.2 の `close_if_unusable_or_obsolete()` はautocommitが既定設定と異なるため接続を閉じる。次の取得で `InterfaceError` になる。最初のcloseは利用者取得前で、`in_atomic_block=True`、`autocommit=False`、`closed_in_transaction=False` として記録した。 + +レビュワ専用fixtureで4試験の間だけ該当callbackを外し、終了時に元の登録内容を復元すると、製品コード・assertionを変えずに混合試験は **216 passed** となる。これは診断用の対照試験であり、提出した修正ではない。develop `73ff43b3` の独立したDBでも、管理画面URL設定をimportする1試験の後に同じ4ビュー試験を実行すると **1 passed、4 failed**。import試験を除外すると **4 passed、1 deselected** となった。原因のhandler登録コードはr3差分で変更されていない。 + +通常のアプリでは試験基盤によるcallbackの除去はなく、`framework/flask/__init__.py` は未登録のhandlerだけを追加する。この違いが、再現した失敗が試験初期化順序に依存する理由である。 + +**評価:** これは既存の試験分離の不具合であり、PR #10 が新たにTOTPの実行経路を壊した証拠ではない。 CI の分割は実在する試験分離の問題を隠すので、「別実行で成功する」だけでは説明不足だった。import順序の回帰試験を伴うテスト基盤の後続課題として扱う。本番の接続cleanupを無効にする修正はしない。接続ライフサイクルの対照試験とdevelop基準の証拠を踏まえ、この失敗から追加の製品P1/P2は認定しない。 + +### 検証と限界 + +`e09c49111e` の **全14チェックが成功**。Unit Tests のPR run `43123405175`、push run `43123399576`、CodeQL run `43123405181` はすべて成功で完了した。pushのadmin/API生ログは4,439 passed・47 skippedで、`test_django22_auth_http.py` の20件と `test_two_factor.py` の73件を含む。PRのadd-on生ログは3,344 passed・1 skippedで、twofactor全58件とPostgreSQLのcounter/routing試験4件とpending予算の並行試験2件を含む。2026-11-12 01:28 UTC の最終照会で、PR #10 はレビュー対象headのまま、PR #8 はOPEN・`merged_at = null`(head `d1258ec140`)と確認した。したがって、R2-01未解決のため判定は要修正のままである。runメタデータ、ジョブ一覧、チェック結果、PR snapshotはレビューscratch内のJSONに保存した。 + +```toon +review: + head: e09c49111edbc24f9782550ae5bcbc55a174e660 + django: 2.2.28 + github_checks: 14 success + pr_unit_run: 43123405175 success + push_unit_run: 43123399576 success + codeql_run: 43123405181 success + extracted_code_probes: 5 passed + push_admin_api1: 4439 passed, 47 skipped + push_django22_auth_file: 20 passed + push_admin_two_factor_file: 73 passed + pr_addons: 3344 passed, 1 skipped + pr_twofactor_addon: 58 passed, including 4 counter/routing and 2 pending-budget cases + head_combined_unmodified: 212 passed, 4 failed + head_combined_isolation_control: 216 passed + python_syntax: PR固有17ファイル passed + diff_whitespace_check: passed +``` + +5つの隔離試験はPython 3.9.6、実Django 2.2.28、メモリー内SQLite、本文を変えずに抽出した製品コード、代替User/Emailモデルを使用し、パスワード画面のテンプレートは最小の代替である。アプリ全体やPostgreSQLの並行性の証明ではない。アプリ試験はPython 3.6.9、Django 2.2.28、pytest 5.0.0、pytest-django 3.10.0、既存の試験用image `py313-osf-test:stage1`(`7dd417d7a983`)と使い捨てPostgreSQL 9.6を使用した。レビュワ設定はリポジトリの試験設定を継承し、使い捨てDB、debug機能の無効化、空のwebpack bundleメタデータを設定する。ブラウザ試験は実行していない。CIの `api1_and_js` という名前もJavaScript/ブラウザ試験の証明ではない。Karmaの呼出しはコメントアウトされている。 + +CI抜粋は `ci-pr-addons-excerpt.txt` と `ci-push-admin-excerpt.txt` に保存し、ジョブの全ログも保存した。ローカル証拠はレビューscratch内の `review_import_test.py`、`review_settings.py`、`probe.py`、`probe.log`、`combined.log`、`combined-trace.log`、`close-trace.log`、`review_isolation.py`、`combined-isolation.log`、`baseline-combined.log`, `baseline-alone.log` に保存した。レビュワ試験設定を置いた隔離checkoutからの元の混合試験は次のとおり。 + +```sh +python3 -m pytest admin_tests/common_auth admin_tests/base addons/twofactor/tests --ds=review_settings --tb=long -q +``` + +未変更の期待結果は診断した4失敗であり、混合試験の全成功ではない。分離対照試験はレビュワ専用pytest fixtureをロードして同じ試験を繰り返す。 + +merge・approve・close・push・commitは実施していない。許可されたPRコメント1件だけを投稿する。検証後に使い捨てレビューcontainerとnetworkを削除した。grdm-devスタックは変更せず、`runtime/.env`も一切読んでいない。記録・証拠は未コミットのまま残す。 diff --git a/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR11_Search_ES8_r4.md b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR11_Search_ES8_r4.md new file mode 100644 index 0000000..d73ac19 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR11_Search_ES8_r4.md @@ -0,0 +1,142 @@ +# PR11 Search ES8 review r4 / PR11 検索 ES8 レビュー r4 + +> **Summary:** Pass for 3eb4042a..71405fe1. CI executed all 47 ES8 tests successfully with no skips; the scoped fixes preserve authentication, TLS verification, and search permissions. +> **概要:** 3eb4042a..71405fe1 を Pass と判定。CI で ES8 試験 47 件がすべて成功し、スキップは 0 件。対象の修正は認証、TLS 検証、検索権限を維持している。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only what publication requires: private-repository URLs become named plain-text references; local guide links become repository-relative links; unpublished scratch references become named plain text or quoted command-path placeholders; public review links absent from develop point to the reviewed public commit. / REV が公開に必要な変更のみを行った。非公開リポジトリの URL は名称付き平文参照、ローカルのガイドへのリンクはリポジトリ相対リンク、未公開 scratch の参照は名称付き平文またはコマンドの引用符付きパス代替表示とし、develop に未収録の公開レビューへのリンクは確認済みの公開コミットを指す。 +- Publication provenance / 公開版の来歴: REV(担当レビュワ)issued this publication version from the unchanged original `2026-11-12_RDM-osf.io-dev2027_PR11_Search_ES8_r4.md` (SHA-256: `1934bc7d850e9699c3597f61b8720ee0cfce5291fe0a90fcb0b4b10930afdc78`); the original file and scratch evidence remain unchanged, and all text other than this version/provenance metadata and the explicitly stated publication references is verbatim. Quoted scratch command-path placeholders identify retained unpublished evidence and must be replaced with its local location before execution. / REV が上記原本から公開版を発行した。原本と scratch 証跡は未変更で、版・来歴の追記と明示した公開用参照以外の本文は原文どおり。コマンド内の引用符付き scratch パス代替表示は保持された未公開証跡を識別するもので、実行にはそのローカルの場所への置換が必要。 +- Version / 版: 0.1 — 2026-11-12. **Learned:** A green job is insufficient evidence until individual search tests and their execution settings are checked; the former TLS setup failure is now closed by executed endpoint tests. / ジョブの緑表示だけでなく個々の検索試験と実行設定の確認が必要であり、以前の TLS 初期化失敗は実行済みのエンドポイント試験によって解消を確認できた。 +- Applies to / 対象: RCOSDP/RDM-osf.io-dev2027 PR #11, head `71405fe148a8a11f6a5c10bf2d3239a528b3dbf5`, delta `3eb4042a819d675eea9f8371a8aeaff67b5397b2..71405fe148a8a11f6a5c10bf2d3239a528b3dbf5`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related / 関連: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · r3 PR comment / r3 コメント (RDM-osf.io-dev2027 PR #11, comment 6763524193) · Posted r4 comment / 投稿済み r4 コメント (RDM-osf.io-dev2027 PR #11, comment 6799694680). +- Used by / 利用先: coordinator's PR #11 acceptance decision / 連携調整者による PR #11 受入判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Pass. No new actionable findings; no R4-xx finding is assigned.** This is the assigned review verdict, not a GitHub approval or merge authorization. Reviewed all six changed files in commits `2578651d`, `3c241549`, and `71405fe1`. The previous r3 record was absent at the supplied path; its posted PR comment was read instead. + +### CI execution evidence + +Read the job logs of run 43028623713 (RDM-osf.io-dev2027 CI run 43028623713), whose head SHA exactly matches the reviewed head. The build and all five matrix jobs report success. The relevant website job 130576025894 (RDM-osf.io-dev2027 CI run 43028623713 (job 130576025894)) collected **2,277** tests and finished with **2,203 passed, 74 skipped, zero failures/errors**. Those 74 skips are not counted as successful tests. + +The following observed results are transcribed from pytest progress, not an illustrative example. Per-module collected totals are reconstructed from every progress outcome and cross-checked against the test functions in the reviewed source; the log prints an explicit collection total only for the whole job. No parametrized or inherited additional test cases exist in these four ES8 modules. + +```toon +es8_modules[4]{module,collected,passed,skipped,failed,errors}: + test_es8_index.py,8,8,0,0,0 + test_es8_permissions.py,12,12,0,0,0 + test_es8_review_r1.py,18,18,0,0,0 + test_es8_review_r2.py,9,9,0,0,0 +es8_total: + collected: 47 + passed: 47 + skipped: 0 + failed: 0 + errors: 0 +additional_dsl_unit_tests: + collected: 15 + passed: 15 + skipped: 0 +``` + +UTC log locations: index at `14:53:45.3393514` (8 dots); permissions at `14:54:03.0817467` (12); r1 at `14:54:17.0473258` (15) and `14:54:22.8443327` (3); r2 at `14:54:21.2908076` (9); DSL at `14:54:22.8835576` (15), all on 2026-11-11. The r1 final three tests are TLS-option unit tests and must be added to its earlier 15. The 47 total includes unit/mock cases and must not be described as 47 HTTP integration cases. The r2 nine tests now execute, including successful real-search controls, while deliberately invalid bodies assert rejection before calling Elasticsearch. + +The integration classes carry `enable_search`; `conftest.py:102–109` therefore does not replace their search engine with the default mock. Their source performs real index creation and HTTP requests, and the job log shows HTTPS Elasticsearch activity during these classes. This closes r3's missing endpoint-execution evidence. + +### TLS, authentication, and allocation + +At `.github/ci/docker-compose.env:8–14` and `.github/docker-compose.ci.override.yml:51–57,72–77`, CI now passes the HTTPS URI, username, and CA path through the environment, matching `run-tests.sh:55–59`. This correctly addresses `website/settings/__init__.py:36`, where environment values override `local.py`. The password still comes from the disposable CI file. Server HTTP/transport TLS and security remain enabled at `.github/docker-compose.ci.override.yml:15–23`; scripts remain disabled at line 26. + +`website/search/elastic_search.py:337–371` still rejects mixed HTTP/HTTPS endpoints, authenticated plaintext, and security-option overrides; HTTPS sets `verify_certs=True` and uses the configured CA. `website/settings/defaults.py:119` still defaults the insecure test escape hatch to False. Neither defaults nor these client functions changed in the scoped diff. There is no new verification bypass. + +The free-space thresholds at `.github/docker-compose.ci.override.yml:36–38` affect only CI: 1 GB low, 512 MB high, and 256 MB flood-stage. Allocation thresholds remain enabled in the run's diagnostics. `website/search/elastic_search.py:2175–2191` now suppresses only `resource_already_exists_exception`, propagates other creation refusals through the existing exception wrapper, and warns when primaries are unallocated. The four added index tests cover repeated creation, refusal propagation, the warning, and private-index cleanup. `tests/base.py:176` adds deletion of the private index. The website job ends with zero indices; this is not a claim that every matrix job has zero residual indices. + +### Setting pinning and permissions + +`tests/nii/test_search_api2.py:33–41` already leaves `ENABLE_PRIVATE_SEARCH=True` after its fixture; the file is unchanged from the prior reviewed head. `tests/test_search/test_es8_index.py:21–33` now patches False before superclass setup and stops the patch after teardown. Its assertions at lines 35–51 are explicitly for a public alias. Under private mode, `ensure_index` correctly prefixes the name through `es_index`, so the earlier unexpected `private__` result was consistent product behavior under a leaked test setting. The upstream fixture leak remains a pre-existing test-isolation debt, not a newly discovered product configuration fault or a blocking finding in this delta. + +The website log runs `test_search_api2.py` (9 passes at `14:50:15.6480348`) before `test_es8_index.py` (8 passes), exercising the formerly failing order. Private-mode coverage remains explicit and passing: `test_es8_permissions.py:54–84`, `test_es8_review_r1.py:113–136`, and `test_es8_review_r2.py:126–134` still pin True themselves. An independent, network-free probe executed the actual AST-extracted `ensure_index`/index-name function bodies with an in-memory ES double in both modes: alias naming, idempotence, absence of a double prefix, and restoration of the preceding True setting passed. Five additional TLS-option probes passed, for seven named local probes total; these are not live ES integration results. + +Permission evidence is unchanged code plus executed positive and negative controls: + +- Private projects/files/wikis: owner access, outsider exclusion, GET/POST, typed searches, API v2, anonymous 401, membership removal, and privacy transitions (`test_es8_permissions.py:102–175`). Server-owned access clauses remain in `website/search/util.py:309–440`. +- Private comments and stale private documents: removal on privatization, migration exclusion, direct comment-type rejection, hit/count/aggregation filtering (`test_es8_review_r1.py:69–105`). Guards remain at `elastic_search.py:1379–1404,1456–1475`; visibility policy remains at `270–294,625–687`. +- Emails and hidden fields: source/highlight exclusion, hidden-field query rejection, no catch-all email match, and a successful exact-email contributor lookup (`test_es8_review_r1.py:147–186`). Source cleanup remains at `elastic_search.py:226–250`, email mapping at `2057,2138`. +- Terms lookup into a private index is rejected with HTTP 400 (`test_es8_review_r1.py:221–226`); `query_policy.py:362–373` still requires a literal value list. Normal searches remain positive controls. + +### Evidence limits and remaining work + +The checkout is `REV scratch evidence (not published): rev-pr11-r4-78bd85 checkout`; captured logs, metadata, progress-count JSON, and the local probe are in its parent scratch directory. Integration results were independently read from CI, not rerun locally. `git diff --check` passed. No runtime `.env` was read, no Docker state was changed, and no commit, push, merge, approval, or closure was performed. No corrective work is required for this review scope; overall acceptance remains with the coordinator. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**Pass。新規の要修正指摘は 0 件で、R4-xx は採番しない。** 担当レビューの判定であり、GitHub の承認やマージ許可ではない。`2578651d`、`3c241549`、`71405fe1` の変更 6 ファイルをすべて確認した。指定された r3 記録は存在しなかったため、投稿済みの r3 PR コメントを確認した。 + +### CI の実行証拠 + +run 43028623713 (RDM-osf.io-dev2027 CI run 43028623713) のジョブログを読んだ。対象 head SHA はレビュー対象と完全に一致する。ビルドと 5 分割のジョブはすべて成功。website ジョブ 130576025894 (RDM-osf.io-dev2027 CI run 43028623713 (job 130576025894)) は **2,277 件収集、2,203 件成功、74 件スキップ、失敗・エラー 0 件**。74 件のスキップを成功には数えていない。 + +次の値は説明用の例ではなく pytest の進捗から得た観測値である。モジュール別の収集数はすべての結果記号を集計し、対象ソースの試験関数数とも照合した。ログに明示的な収集数があるのはジョブ全体だけである。この ES8 の 4 モジュールには、パラメーター展開や継承による追加試験はない。 + +```toon +es8_modules[4]{module,collected,passed,skipped,failed,errors}: + test_es8_index.py,8,8,0,0,0 + test_es8_permissions.py,12,12,0,0,0 + test_es8_review_r1.py,18,18,0,0,0 + test_es8_review_r2.py,9,9,0,0,0 +es8_total: + collected: 47 + passed: 47 + skipped: 0 + failed: 0 + errors: 0 +additional_dsl_unit_tests: + collected: 15 + passed: 15 + skipped: 0 +``` + +2026-11-11 の UTC ログ位置は、index が `14:53:45.3393514`(成功記号 8 個)、permissions が `14:54:03.0817467`(12)、r1 が `14:54:17.0473258`(15)と `14:54:22.8443327`(3)、r2 が `14:54:21.2908076`(9)、DSL が `14:54:22.8835576`(15)。r1 の最後の 3 件は TLS 設定の単体試験で、先の 15 件と合算する。47 件には単体・モック試験を含むため「HTTP 統合試験 47 件」とは表現しない。r2 の 9 件も実行され、実検索に成功する陽性対照と、不正な本体を Elasticsearch 呼び出し前に拒否する検査が通った。 + +統合試験のクラスには `enable_search` があり、`conftest.py:102–109` の既定モックによる置換対象から外れる。実際の索引作成と HTTP 要求を行うソースを確認し、実行中の HTTPS Elasticsearch 通信もログで確認した。これにより r3 のエンドポイント実行証拠の不足は解消した。 + +### TLS・認証・シャード割り当て + +`.github/ci/docker-compose.env:8–14` と `.github/docker-compose.ci.override.yml:51–57,72–77` は、`run-tests.sh:55–59` と同じ HTTPS URI・利用者名・CA パスを環境変数で渡す。`website/settings/__init__.py:36` で環境変数が `local.py` を上書きする問題に対応している。パスワードは引き続き使い捨ての CI ファイルから読む。サーバー側の HTTP/transport TLS と認証は `.github/docker-compose.ci.override.yml:15–23` で有効のまま、26 行目のスクリプト禁止も維持する。 + +`website/search/elastic_search.py:337–371` は、HTTP/HTTPS の混在、認証情報の平文送信、セキュリティ設定の上書きを引き続き拒否する。HTTPS では `verify_certs=True` と設定済み CA を使用する。`website/settings/defaults.py:119` の試験用例外は既定で False のままである。既定設定とこれらのクライアント関数は対象差分で変更されておらず、検証の迂回は追加されていない。 + +`.github/docker-compose.ci.override.yml:36–38` の空き容量しきい値(low 1 GB、high 512 MB、flood-stage 256 MB)は CI だけに適用される。実行ログでも割り当てしきい値が有効である。`website/search/elastic_search.py:2175–2191` は `resource_already_exists_exception` だけを無視し、他の作成拒否を既存の例外変換を通して伝え、主シャード未割り当てを警告する。追加 4 試験は二重作成・拒否の伝播・警告・非公開索引の後片付けを検査している。`tests/base.py:176` は非公開索引の削除を追加した。website ジョブ終了時の残存索引は 0 件だが、全分割ジョブで 0 件とは主張しない。 + +### 設定固定と権限 + +`tests/nii/test_search_api2.py:33–41` は従来から fixture 後に `ENABLE_PRIVATE_SEARCH=True` を残しており、前回レビュー対象から変更されていない。`tests/test_search/test_es8_index.py:21–33` は親クラスの準備より先に False を固定し、終了処理後に元の値へ戻す。35–51 行目の検査は公開検索用の別名を前提にしている。非公開モードの `ensure_index` は `es_index` によって正しく接頭辞を付けるため、以前の `private__` は漏れた試験設定に従う製品の正常な挙動だった。先行 fixture の設定漏れは既存の試験独立性の課題として残るが、この差分による製品設定の不具合や阻害指摘ではない。 + +website ログでは `test_search_api2.py`(`14:50:15.6480348`、9 件成功)が `test_es8_index.py`(8 件成功)より先に動き、以前失敗した順序を通過している。非公開モードの検査は `test_es8_permissions.py:54–84`、`test_es8_review_r1.py:113–136`、`test_es8_review_r2.py:126–134` が明示的に True を固定し、成功している。独立したネットワーク不要の検査でも、AST から抜き出した実際の `ensure_index` と索引名関数をメモリー内の ES 代替と組み合わせ、両モードの別名・冪等性・接頭辞の非重複・先行する True 設定の復元を確認した。TLS オプションの 5 検査も成功し、ローカルでは名前付き検査が計 7 件成功した。これらは実 ES 統合試験ではない。 + +権限の証拠は、維持された製品コードと実行済みの陽性・陰性対照である。 + +- 非公開プロジェクト・ファイル・wiki:所有者の検索、第三者の除外、GET/POST、型別検索、API v2、匿名 401、共同作業者の削除、非公開化(`test_es8_permissions.py:102–175`)。サーバー側の権限条件は `website/search/util.py:309–440` に維持されている。 +- 非公開コメントと残存非公開文書:非公開化時の削除、移行時の除外、コメント型の直接検索拒否、ヒット・件数・集計の除外(`test_es8_review_r1.py:69–105`)。防御は `elastic_search.py:1379–1404,1456–1475`、公開性の条件は `270–294,625–687` に残る。 +- メールと非公開フィールド:応答本体・強調表示からの除外、非公開フィールド検索の拒否、全文欄でのメール非一致、メール完全一致による共同作業者検索の成功(`test_es8_review_r1.py:147–186`)。応答の除去処理は `elastic_search.py:226–250`、メールのマッピングは `2057,2138` にある。 +- 非公開索引への terms lookup は HTTP 400(`test_es8_review_r1.py:221–226`)。`query_policy.py:362–373` は引き続き値のリストだけを許す。通常検索の陽性対照も成功している。 + +### 証拠の限界と残作業 + +作業用複製は `REV scratch evidence (not published): rev-pr11-r4-78bd85 checkout`。取得ログ・メタデータ・進捗集計 JSON・ローカル検査はその親の scratch ディレクトリにある。統合結果は CI から独立に読み取ったもので、ローカルでは再実行していない。`git diff --check` は成功。runtime `.env` の読み取り、Docker 状態変更、commit・push・merge・approve・close は行っていない。この範囲で必要な修正はなく、全体の受入判断は連携調整者に残る。 diff --git a/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR11_Search_ES8_r5.md b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR11_Search_ES8_r5.md new file mode 100644 index 0000000..b08d580 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR11_Search_ES8_r5.md @@ -0,0 +1,225 @@ +# PR11 Search ES8 review r5 / PR11 検索 ES8 レビュー r5 + +> **Summary:** The merge preserves both parents exactly, and the search changes introduce no identified Django 2.2 incompatibility. All 14 CI jobs succeeded, and each Unit Tests run executed all 47 ES8 tests with zero skips; verdict: Pass. +> **概要:** マージは両親の変更を完全に保持し、検索変更に Django 2.2 非互換は見つからなかった。CI の全 14 ジョブが成功し、両 Unit Tests run で ES8 47 件がすべて実行・成功、スキップ 0 件を確認したため Pass と判定する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-12. **Learned:** A conflict-free merge alone does not establish compatibility; the resulting tree and executed permission tests must be checked against the upgraded framework. / 衝突のないマージだけでは互換性を証明できず、生成されたツリーと実行済みの権限試験を更新後のフレームワークで確認する必要がある。 +- Applies to / 対象: RCOSDP/RDM-osf.io-dev2027 PR #11; `71405fe148a8a11f6a5c10bf2d3239a528b3dbf5..95eb39cf57c1e4c737dfde14867c6dbb3d979032`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- PR comment / PR コメント: `6807038747` (one comment posted; body verified / 1 件投稿し本文を照合済み). +- Related / 関連: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md); r4 record / r4 記録: `2026-11-12_RDM-osf.io-dev2027_PR11_Search_ES8_r4.md`. +- Used by / 利用先: coordinator's PR #11 acceptance decision / 連携調整者による PR #11 受入判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Pass. No new actionable findings; no R5-xx finding is assigned.** The scope is the integration after the r4-reviewed head, including Django 2.2 from develop and its interaction with PR #11's search code. This is not a fresh review of every inherited develop change, nor a GitHub approval. + +### Merge integrity + +The merge has the expected parents. A separate `git merge-tree --write-tree` calculation exited successfully without conflicts and produced exactly the committed tree. No branch merge or commit was performed by the reviewer. + +```toon +merge: + head: 95eb39cf57c1e4c737dfde14867c6dbb3d979032 + search_parent: 71405fe148a8a11f6a5c10bf2d3239a528b3dbf5 + develop_parent: 527eb93a714af2d5ad55d3b3055b4aab858ac100 + common_ancestor: fe90e5c39e660f464bb8fcc9ae4028119b958d19 + committed_and_recomputed_tree: c457d1d08e2699ab4eefcd544589e0b7346c3f39 + search_changed_paths: 24 + develop_changed_paths: 103 + shared_changed_path: requirements.txt + search_only_paths_preserved: 23 + develop_only_paths_preserved: 102 + dropped_paths: 0 + unexpected_changes: 0 + github_test_merge: 03a2397dac96c6971f552700f5abb04a49b5e665 + github_test_merge_tree: c457d1d08e2699ab4eefcd544589e0b7346c3f39 +``` + +The counts compare each parent against their common ancestor, including path modes and blob identities. The single overlapping file retains Elasticsearch 7.17.13, Django 2.2.28, DRF 3.9.4, django-guardian 1.5.1, and the replacement of django-include with `osf/external/include`. `urllib3==1.22`, Flask 0.12.4, and Werkzeug 1.0.0 remain pinned. All search code and its tests are byte-for-byte unchanged from r4. The inherited develop history also includes the sharejs MongoDB TLS fix from PR #9; it was not dropped. + +### Django 2.2 compatibility audit + +**Authentication.** None of the PR's 17 changed Python files calls or defines Django `authenticate`. The inherited `ODMBackend` and guardian adapter accept `request=None` and `**kwargs` (`api/base/authentication/backends.py:9,34`), matching Django 2.2's request-first dispatch. The API's separate DRF authenticators accept `authenticate(self, request)`; `OSFBasicAuthentication.authenticate_credentials` accepts `request=None` (`api/base/authentication/drf.py:118,161,176`). The inherited cookie decoding fixes remain in the Flask session and user cookie loaders, so signed bytes are converted to text before database lookup. [Django 2.2 authentication dispatch](https://github.com/django/django/blob/5c3300027b30c1b498d99010f7d618316f685045/django/contrib/auth/__init__.py#L62). + +**Middleware and authentication properties.** Search adds no middleware. API settings use `MIDDLEWARE`, and the custom middleware uses `MiddlewareMixin`; custom DRF authentication remains configured. The API intentionally does not rely on Django session/authentication middleware. There are no `is_authenticated()` or `is_anonymous()` calls in the changed Python files. `get_user_auth` reads `user.is_anonymous` as a property (`api/base/utils.py:72`), and DRF 3.9.4's search permission parent reads `request.user.is_authenticated` as a property. [Django user properties](https://github.com/django/django/blob/5c3300027b30c1b498d99010f7d618316f685045/django/contrib/auth/base_user.py#L90), [DRF permissions](https://github.com/encode/django-rest-framework/blob/b1c4d8b59b67084ed07a35ea9a35629805039aaa/rest_framework/permissions.py#L152). + +**URLs, requests, responses, and JSON.** No changed Python file uses `django.core.urlresolvers`, `render_to_response`, `MIDDLEWARE_CLASSES`, or the old external `include` import. API v1 imports Flask's `request` (`website/search/views.py:9`), so `get_json(silent=True)` and `request.args` are Flask APIs. Its JSON helper requires an object, catches excessive decoder recursion, and checks structure (`:146–158`); private search checks login before parsing (`:175–176`) and maps missing/wrong body paths to HTTP 400 (`:201–207`). Public bodies still pass the query policy (`:275`). API v2 uses DRF `query_params`, parser context, and `Response`; `SearchParser.parse(stream, media_type=None, parser_context=None)` matches DRF 3.9.4. The existing JSONAPI parser rejects non-object top-level data. Added query-policy failures become DRF `ValidationError`, which retains HTTP 400. [DRF JSON parser](https://github.com/encode/django-rest-framework/blob/b1c4d8b59b67084ed07a35ea9a35629805039aaa/rest_framework/parsers.py#L50), [request properties](https://github.com/encode/django-rest-framework/blob/b1c4d8b59b67084ed07a35ea9a35629805039aaa/rest_framework/request.py#L202), [ValidationError](https://github.com/encode/django-rest-framework/blob/b1c4d8b59b67084ed07a35ea9a35629805039aaa/rest_framework/exceptions.py#L142). + +**Database operations and dependencies.** The new comment cleanup and refresh paths use `values_list('guids___id', flat=True)` and `filter(...).iterator()` (`website/search/elastic_search.py:1460,1471,1474`); there are no new foreign-key declarations or new middleware contracts. The inherited vendored include/queryset and model compatibility changes remain intact. The dependency upgrade is present in the merged requirements, not merely asserted in the AID comment. Parsing all 17 changed Python files and `git diff --check` succeeded; this is static evidence, not a substitute for execution on the CI runtime. + +### Permission filtering + +The search files are identical to r4, and the paths were re-read against the new authentication layer. Private requests still require login and rebuild access clauses on the server (`website/search/views.py:175–251`, `api/search/views.py:77–108`, `website/search/util.py:309–457`). Contributor/public conditions remain part of the mandatory query. The DSL translator retains nested Boolean clauses and their semantics. + +Public hits, counts, tags, and aggregations still receive `PUBLIC_VISIBILITY_FILTER`; type restrictions and protected index selection remain in `website/search/elastic_search.py:613–625`, and policy application remains at `:507,534,551,679`. Hidden emails/contributor fields are excluded from the source and highlights (`:226–250`). Private comments are removed or excluded during indexing and migration, and membership/privacy updates refresh dependent records (`:1379–1404,1456–1475`). Client field/lookup restrictions in `query_policy.py` remain unchanged. + +The required execution evidence covers owner success, outsider exclusion, anonymous 401, GET/POST and API v2 searches, membership removal, privacy changes, stale private documents, hidden fields, and crafted queries. ES8 source inventory is 8 index tests, 12 permission tests, 18 r1 tests, and 9 r2 tests: 47 total. A further 15 tests cover the legacy DSL. Integration classes opt into `enable_search`, bypassing the default search mock in `conftest.py`; the total also includes unit/mock cases and must not be described as 47 live HTTP integration tests. + +### CI results and evidence limits + +**All 14 jobs succeeded.** Unit Tests run `43066759650` is the pull-request event; `43066751425` is the push event; `43066759831` is CodeQL. All three run metadata records identify the reviewed head exactly. The website checkout logs independently show `03a2397dac96c6971f552700f5abb04a49b5e665` for the PR event and `95eb39cf57c1e4c737dfde14867c6dbb3d979032` for push; their trees are identical, as verified in the merge audit. + +Both image-build logs explicitly record successful installation of Django 2.2.28, DRF 3.9.4, and elasticsearch7 7.17.13. The observed website runtime is Python 3.6.9. The following figures are observed results, not illustrative data. The 74 skipped tests in each website job are not counted as passes. + +```toon +ci_jobs[14]{run_id,job_id,job,result}: + 43066759650,130683670179,"build-image",success + 43066759650,130726666200,"tests (addons)",success + 43066759650,130726665998,"tests (website)",success + 43066759650,130726666065,"tests (api1_and_js)",success + 43066759650,130726665991,"tests (api2)",success + 43066759650,130726665972,"tests (api3_and_osf)",success + 43066751425,130683637878,"build-image",success + 43066751425,130727649358,"tests (addons)",success + 43066751425,130727648955,"tests (website)",success + 43066751425,130727648923,"tests (api1_and_js)",success + 43066751425,130727648947,"tests (api2)",success + 43066751425,130727649438,"tests (api3_and_osf)",success + 43066759831,130683670401,"Analyze (javascript-typescript)",success + 43066759831,130683670787,"Analyze (python)",success +website_totals[2]{run_id,collected,passed,skipped,failed,errors}: + 43066759650,2277,2203,74,0,0 + 43066751425,2277,2203,74,0,0 +es8_modules[8]{run_id,module,collected,passed,skipped}: + 43066759650,test_es8_index.py,8,8,0 + 43066759650,test_es8_permissions.py,12,12,0 + 43066759650,test_es8_review_r1.py,18,18,0 + 43066759650,test_es8_review_r2.py,9,9,0 + 43066751425,test_es8_index.py,8,8,0 + 43066751425,test_es8_permissions.py,12,12,0 + 43066751425,test_es8_review_r1.py,18,18,0 + 43066751425,test_es8_review_r2.py,9,9,0 +es8_totals[2]{run_id,collected,passed,skipped,failed,errors}: + 43066759650,47,47,0,0,0 + 43066751425,47,47,0,0,0 +additional_dsl[2]{run_id,collected,passed,skipped}: + 43066759650,15,15,0 + 43066751425,15,15,0 +``` + +Each ES8 module's collected count is reconstructed from all pytest progress outcomes and cross-checked against its source inventory; the log prints an explicit collected total only for the whole website job. There are no extra parametrized or inherited cases in these four modules. In each run, r1 appears twice: 15 integration-class outcomes plus 3 TLS-option unit outcomes, totaling 18. Thus the two runs execute the same 47 ES8 tests twice, not 94 distinct tests. + +For run `43066759650`, the ES8 progress lines are at 19:48:12.6794054 (index), 19:48:30.1471641 (permissions), 19:48:42.7379832 and 19:48:48.1761352 (r1), and 19:48:46.7244347 (r2). For `43066751425`, they are at 20:13:30.0436229, 20:13:47.4849683, 20:14:01.0496290 and 20:14:06.6616844, and 20:14:05.1788247 respectively. All timestamps are UTC on 2026-11-11. The live-index setup, `enable_search` markers, successful positive/negative controls, and HTTPS Elasticsearch activity in the logs support actual execution; the mixed unit/mock total is not represented as 47 HTTP integration tests. + +The assigned runs were watched with `gh run watch`. Temporary GitHub HTTP 502 errors interrupted the Unit Tests watchers and the push website log download. Individual job APIs and the PR check rollup were used to track the results; after finalization, fresh run/job metadata and the push website log were retrieved successfully. Both remaining jobs temporarily showed successful completed steps while the job itself was still `in_progress`; that state was not accepted as a pass. No evidence gap remains for the required job conclusions or ES8 counts. + +**No corrective work is required in this review scope.** Overall acceptance remains with the coordinator. + + +The reviewer used an isolated scratch clone and read GitHub metadata and logs. No local integration environment was started, no Docker state was changed, no runtime `.env` was read, and no commit, push, merge, approval, or closure was performed. The record is intended for the review folder; links to project documents are repository-relative. Private repository evidence is identified by repository name, commit, run, and job IDs rather than private URLs. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**Pass。新規の要修正指摘は 0 件で、R5-xx は採番しない。** 対象は r4 で確認した head 以降の統合差分と、develop の Django 2.2 更新が PR #11 の検索コードへ与える影響。develop から継承した全変更の再レビューや、GitHub 上の承認ではない。 + +### マージの完全性 + +親 commit は指定どおり。独立した `git merge-tree --write-tree` 計算は衝突なしで正常終了し、記録済みのツリーと完全一致した。レビュワによるブランチのマージや commit は行っていない。 + +```toon +merge: + head: 95eb39cf57c1e4c737dfde14867c6dbb3d979032 + search_parent: 71405fe148a8a11f6a5c10bf2d3239a528b3dbf5 + develop_parent: 527eb93a714af2d5ad55d3b3055b4aab858ac100 + common_ancestor: fe90e5c39e660f464bb8fcc9ae4028119b958d19 + committed_and_recomputed_tree: c457d1d08e2699ab4eefcd544589e0b7346c3f39 + search_changed_paths: 24 + develop_changed_paths: 103 + shared_changed_path: requirements.txt + search_only_paths_preserved: 23 + develop_only_paths_preserved: 102 + dropped_paths: 0 + unexpected_changes: 0 + github_test_merge: 03a2397dac96c6971f552700f5abb04a49b5e665 + github_test_merge_tree: c457d1d08e2699ab4eefcd544589e0b7346c3f39 +``` + +件数は共通祖先と両親を比較し、ファイルモードと内容の識別子も確認した。唯一の共通変更ファイルは Elasticsearch 7.17.13、Django 2.2.28、DRF 3.9.4、django-guardian 1.5.1、django-include の `osf/external/include` への置換を保持している。`urllib3==1.22`、Flask 0.12.4、Werkzeug 1.0.0 の固定も維持する。検索コードと検索試験はすべて r4 とバイト単位で一致する。develop 履歴に含まれる PR #9 の sharejs MongoDB TLS 修正も欠落していない。 + +### Django 2.2 互換性の監査 + +**認証。** PR が変更した Python 17 ファイルに Django `authenticate` の呼び出しや定義はない。継承した `ODMBackend` と guardian アダプターは `request=None` と `**kwargs` を受け取り(`api/base/authentication/backends.py:9,34`)、Django 2.2 の request を先頭に渡す処理と整合する。API の別経路である DRF 認証も `authenticate(self, request)` を受け取り、`OSFBasicAuthentication.authenticate_credentials` は `request=None` を受け取る(`api/base/authentication/drf.py:118,161,176`)。Flask session と user の Cookie 読み込みには develop の文字列化修正が残り、署名解除した bytes を文字列へ変換してから DB を検索する。[Django 2.2 の認証呼び出し](https://github.com/django/django/blob/5c3300027b30c1b498d99010f7d618316f685045/django/contrib/auth/__init__.py#L62)。 + +**ミドルウェアと認証プロパティ。** 検索はミドルウェアを追加していない。API 設定は `MIDDLEWARE` を使い、独自ミドルウェアは `MiddlewareMixin` を使う。独自 DRF 認証の設定も残っている。API は設計上、Django の session/authentication ミドルウェアに認証を依存させていない。変更した Python ファイルには `is_authenticated()` や `is_anonymous()` の呼び出しはない。`get_user_auth` は `user.is_anonymous` をプロパティとして読み(`api/base/utils.py:72`)、検索権限の親である DRF 3.9.4 も `request.user.is_authenticated` をプロパティとして読む。[Django の利用者プロパティ](https://github.com/django/django/blob/5c3300027b30c1b498d99010f7d618316f685045/django/contrib/auth/base_user.py#L90)、[DRF の権限処理](https://github.com/encode/django-rest-framework/blob/b1c4d8b59b67084ed07a35ea9a35629805039aaa/rest_framework/permissions.py#L152)。 + +**URL・要求・応答・JSON。** 変更した Python ファイルには `django.core.urlresolvers`、`render_to_response`、`MIDDLEWARE_CLASSES`、旧外部 `include` の import はない。API v1 は Flask の `request` を import するため(`website/search/views.py:9`)、`get_json(silent=True)` と `request.args` は Flask の API である。JSON ヘルパーはオブジェクト型を要求し、深すぎる JSON の再帰エラーを捕捉して構造を検査する(`:146–158`)。非公開検索は解析前にログインを検査し(`:175–176`)、本体の欠落・型誤りは HTTP 400 にする(`:201–207`)。公開検索の本体も検索ポリシーを通る(`:275`)。API v2 の `query_params`、parser context、`Response` と、`SearchParser.parse(stream, media_type=None, parser_context=None)` は DRF 3.9.4 と整合する。既存の JSONAPI parser は最上位がオブジェクト以外なら拒否する。追加された検索ポリシー違反は DRF `ValidationError` に変換され、HTTP 400 が維持される。[DRF JSON parser](https://github.com/encode/django-rest-framework/blob/b1c4d8b59b67084ed07a35ea9a35629805039aaa/rest_framework/parsers.py#L50)、[request プロパティ](https://github.com/encode/django-rest-framework/blob/b1c4d8b59b67084ed07a35ea9a35629805039aaa/rest_framework/request.py#L202)、[ValidationError](https://github.com/encode/django-rest-framework/blob/b1c4d8b59b67084ed07a35ea9a35629805039aaa/rest_framework/exceptions.py#L142)。 + +**DB 操作と依存パッケージ。** 追加されたコメント削除・更新処理は `values_list('guids___id', flat=True)` と `filter(...).iterator()` を使う(`website/search/elastic_search.py:1460,1471,1474`)。新規の外部キー宣言やミドルウェア契約はない。同梱 include/queryset とモデルの互換修正は継承されている。依存更新は AID コメントの記述だけでなく、マージ結果の requirements でも確認した。変更 Python 17 ファイルの構文解析と `git diff --check` は成功したが、これは静的証拠であり、CI の実行証拠とは分けて扱う。 + +### 権限フィルター + +検索ファイルは r4 と同一であり、新しい認証層と併せて経路を読み直した。非公開要求は引き続きログインを要求し、サーバー側でアクセス条件を再構成する(`website/search/views.py:175–251`、`api/search/views.py:77–108`、`website/search/util.py:309–457`)。共同作業者・公開性の条件は必須の検索条件に残る。DSL 変換も入れ子の論理条件と意味を保持する。 + +公開検索のヒット・件数・タグ・集計には `PUBLIC_VISIBILITY_FILTER` が付く。型制限と保護された索引選択は `website/search/elastic_search.py:613–625`、ポリシー適用は `:507,534,551,679` に残る。メールと非公開の共同作業者フィールドは本体と強調表示から除外する(`:226–250`)。非公開コメントは索引更新・移行時に削除または除外され、共同作業者・公開性の変更は関連文書へ反映する(`:1379–1404,1456–1475`)。`query_policy.py` のクライアント向けフィールド・lookup 制限も変わっていない。 + +必要な実行証拠は、所有者の成功、第三者の除外、匿名 401、GET/POST と API v2、共同作業者の削除、非公開化、残存非公開文書、非公開フィールド、不正な検索条件を含む。ソース上の ES8 試験は index 8 件・permissions 12 件・r1 18 件・r2 9 件で計 47 件。別に旧 DSL の試験が 15 件ある。統合試験クラスは `enable_search` により `conftest.py` の既定検索モックの対象外になる。合計には単体・モック試験も含むため「実 HTTP 統合試験 47 件」とは表現しない。 + +### CI 結果と証拠の限界 + +**全 14 ジョブが成功。** Unit Tests の `43066759650` は pull_request、`43066751425` は push、`43066759831` は CodeQL である。3 run のメタデータはいずれもレビュー対象 head と完全一致する。website の checkout ログでも、PR 側は `03a2397dac96c6971f552700f5abb04a49b5e665`、push 側は `95eb39cf57c1e4c737dfde14867c6dbb3d979032` と確認できた。両者のツリーはマージ監査で同一と確認した。 + +両イメージのビルドログは Django 2.2.28、DRF 3.9.4、elasticsearch7 7.17.13 のインストール成功を明記している。website の実行環境は Python 3.6.9。次の値は説明用の例ではなく実際の観測結果である。各 website ジョブのスキップ 74 件は成功に含めていない。 + +```toon +ci_jobs[14]{run_id,job_id,job,result}: + 43066759650,130683670179,"build-image",success + 43066759650,130726666200,"tests (addons)",success + 43066759650,130726665998,"tests (website)",success + 43066759650,130726666065,"tests (api1_and_js)",success + 43066759650,130726665991,"tests (api2)",success + 43066759650,130726665972,"tests (api3_and_osf)",success + 43066751425,130683637878,"build-image",success + 43066751425,130727649358,"tests (addons)",success + 43066751425,130727648955,"tests (website)",success + 43066751425,130727648923,"tests (api1_and_js)",success + 43066751425,130727648947,"tests (api2)",success + 43066751425,130727649438,"tests (api3_and_osf)",success + 43066759831,130683670401,"Analyze (javascript-typescript)",success + 43066759831,130683670787,"Analyze (python)",success +website_totals[2]{run_id,collected,passed,skipped,failed,errors}: + 43066759650,2277,2203,74,0,0 + 43066751425,2277,2203,74,0,0 +es8_modules[8]{run_id,module,collected,passed,skipped}: + 43066759650,test_es8_index.py,8,8,0 + 43066759650,test_es8_permissions.py,12,12,0 + 43066759650,test_es8_review_r1.py,18,18,0 + 43066759650,test_es8_review_r2.py,9,9,0 + 43066751425,test_es8_index.py,8,8,0 + 43066751425,test_es8_permissions.py,12,12,0 + 43066751425,test_es8_review_r1.py,18,18,0 + 43066751425,test_es8_review_r2.py,9,9,0 +es8_totals[2]{run_id,collected,passed,skipped,failed,errors}: + 43066759650,47,47,0,0,0 + 43066751425,47,47,0,0,0 +additional_dsl[2]{run_id,collected,passed,skipped}: + 43066759650,15,15,0 + 43066751425,15,15,0 +``` + +ES8 モジュール別の収集数は pytest の全結果記号から再構成し、ソースの試験一覧と照合した。ログに明示的な収集総数があるのは website ジョブ全体のみで、この 4 モジュールにパラメーター展開・継承による追加試験はない。両 run とも r1 は統合試験クラスの 15 件と TLS 設定の単体試験 3 件に分かれて現れ、合計 18 件になる。したがって、同じ ES8 試験 47 件を 2 run で実行したものであり、異なる試験 94 件ではない。 + +run `43066759650` の ES8 結果行は、index が 19:48:12.6794054、permissions が 19:48:30.1471641、r1 が 19:48:42.7379832 と 19:48:48.1761352、r2 が 19:48:46.7244347。`43066751425` は順に 20:13:30.0436229、20:13:47.4849683、20:14:01.0496290 と 20:14:06.6616844、20:14:05.1788247。すべて 2026-11-11 の UTC。実索引の準備、`enable_search`、成功した陽性・陰性対照、ログ中の HTTPS Elasticsearch 通信を併せて実行を確認した。単体・モックを含む合計を「HTTP 統合試験 47 件」とは表現しない。 + +指定 run は `gh run watch` で監視した。一時的な GitHub HTTP 502 により Unit Tests の監視と push 側 website ログ取得が中断したため、個別ジョブ API と PR のチェック一覧も使って追跡した。最終確定後に run/job メタデータと push 側 website ログを改めて取得できた。最後の 2 ジョブには、全ステップ成功でもジョブ全体が `in_progress` の期間があったが、その状態を Pass として扱っていない。必要なジョブ最終結果と ES8 件数に証拠の不足は残っていない。 + +**このレビュー範囲で必要な修正はない。** 全体の受入判断は連携調整者に残る。 + + +レビュワは独立した作業用 clone と GitHub のメタデータ・ログを用いた。ローカル統合環境の起動、Docker 状態変更、runtime `.env` の読み取り、commit・push・merge・approve・close は行っていない。記録はレビュー用フォルダーへの掲載を想定し、プロジェクト文書へのリンクはリポジトリ内の相対参照である。非公開リポジトリの証拠は URL を使わず、リポジトリ名・commit・run・job ID で特定する。 diff --git a/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR11_Search_ES8_r6.md b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR11_Search_ES8_r6.md new file mode 100644 index 0000000..f65ef65 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR11_Search_ES8_r6.md @@ -0,0 +1,227 @@ +# PR11 Search ES8 review r6 / PR11 検索 ES8 レビュー r6 + +> **Summary:** The merge preserves ES8 and develop's Yjs/render changes without an identified Django 2.2 regression. All 14 CI jobs succeeded, and both Unit Tests runs executed all 47 ES8 tests with zero skips; verdict: Pass. +> **概要:** マージは ES8 と develop の Yjs・render 変更を保持し、Django 2.2 の新規退行は見つからなかった。CI 全 14 ジョブが成功し、両 Unit Tests run で ES8 47 件がすべて実行・成功、スキップ 0 件だったため Pass と判定する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-12. **Learned:** A clean merge must preserve both service removal and search configuration, and passing test counts must be established on the resulting tree. / 衝突のないマージでもサービス撤去と検索設定の両立を確認し、生成された tree で試験の成功件数を確かめる必要がある。 +- Applies to / 対象: RCOSDP/RDM-osf.io-dev2027 PR #11; `95eb39cf57c1e4c737dfde14867c6dbb3d979032..b4bc1341885dcb6725c1e3f27333d9ca9d0ef873`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- PR comment / PR コメント: `6810062456` (one comment posted; body verified / 1 件投稿し本文を照合済み). +- Related / 関連: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md); r5 record / r5 記録: `2026-11-12_RDM-osf.io-dev2027_PR11_Search_ES8_r5.md`. +- Used by / 利用先: coordinator's PR #11 acceptance decision / 連携調整者による PR #11 受入判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +**Pass. No new actionable findings; no R6-xx finding is assigned.** This is a review verdict, not a GitHub approval. + +### Scope and merge integrity + +The review covers `95eb39cf57..b4bc134188`, the integration of develop PRs #12 (Yjs collaborative editing) and #14 (internal render URLs) into PR #11. A merge is the combination of two development histories. The audit checks that both histories survive together; it does not repeat the full independent reviews of #12 and #14. + +A separate `git merge-tree --write-tree` calculation completed without conflicts and exactly reproduced the committed tree. No branch merge or commit was made. Path counts compare each parent with their common ancestor; content identifiers and file modes were checked, including deleted paths. All 20 search-only paths and 36 develop-only paths are preserved. The four shared paths combine the intended changes, and paths outside both change sets remain unchanged. No dropped or unexpected change was found. + +The following values are observed evidence, not examples. TOON is a compact text form for recording structured data. + +```toon +merge: + head: b4bc1341885dcb6725c1e3f27333d9ca9d0ef873 + search_parent: 95eb39cf57c1e4c737dfde14867c6dbb3d979032 + develop_parent: 73ff43b3c21f3258f6d34ca99b77ef66f1191e0e + common_ancestor: 527eb93a714af2d5ad55d3b3055b4aab858ac100 + committed_and_recomputed_tree: 622954a66b42a2b0a6e6d88be581b426060b3f89 + search_changed_paths: 24 + develop_changed_paths: 40 + shared_changed_paths: 4 + search_only_paths_preserved: 20 + develop_only_paths_preserved: 36 + dropped_paths: 0 + unexpected_changes: 0 + github_test_merge: 3bb26b1eaf2c240591d71bcb08c3b8611aeda976 + github_test_merge_tree: 622954a66b42a2b0a6e6d88be581b426060b3f89 +``` + +### Shared files and integration + +`docker-compose.yml` retains Elasticsearch image `grdm-osf/elasticsearch8-ja:8.19.24` and its `Dockerfile.ci` build. The sharejs and mongo services, mongo volume, and sharejs environment-file references are removed as in develop. + +`.github/docker-compose.ci.override.yml` retains ES8 authentication and TLS (encrypted, certificate-checked connections), the certificate mount, and the 1gb / 512mb / 256mb disk watermarks. Both web and requirements retain the HTTPS Elasticsearch URI, username and CA certificate path. The removed sharejs environment-file reference stays removed. These two Compose files, `.github/scripts/ci/run-tests.sh`, and `.github/ci/docker-compose.env` contain no sharejs/mongo reference; the latter two files are unchanged from r5. + +`requirements.txt` retains `elasticsearch7==7.17.13`, the client used in compatibility mode to communicate with ES8, and does not restore `elasticsearch2`. It also retains develop's explanation that `pymongo==3.7.1` remains only for BSON object/session identifiers. The Django 2.2.28, Django REST framework 3.9.4, django-guardian 1.5.1, and urllib3 1.22 pins and the vendored include module remain intact. + +`tasks/__init__.py:238` retains `search_ensure_index`, including its decorator, application initialization, and `ensure_index(index=index)` call; its syntax tree is identical to r5. The sharejs task is absent. The old `tokumx` reference in the development startup helper at line 683 is inherited unchanged from develop; this merge neither introduces it nor uses that helper in CI. + +The search source and tests in `website/search`, `api/search`, and `tests/test_search` are byte-identical to r5. Of the 17 Python files changed by PR #11 relative to develop, 16 are byte-identical to r5; only `tasks/__init__.py` changes, solely to remove the inherited sharejs task. The server-enforced permission filters and private-field exclusions therefore remain intact. + +The inherited wiki changes remove obsolete MongoDB draft operations. `WikiVersion.save` and `WikiPage.save` still call `node.update_search` (`addons/wiki/models.py:148,281`), and the search serializer still reads saved wiki content through `get_version().raw_text(node)` (`website/search/elastic_search.py:1287`). No search path uses the removed draft helpers. The new Yjs room handling does not replace those saved-content hooks. The internal URL choices in `api/files/serializers.py:235,467,536` and `addons/base/views.py:1083` leave search serializers and routes unchanged. + +### Django 2.2 compatibility + +The r5-reviewed authentication backends, request-aware signatures, middleware configuration, authentication properties, and API search parser are unchanged. The merge introduces no new search authentication, URL resolver, middleware, request/response, or ORM (database query) contract. The inherited Yjs addition uses existing model saves and queryset `order_by(...).first()`; the render change uses the existing URL builder and Flask request object. No new incompatibility was identified at these integration points. + +All 17 search-side Python files and all 18 surviving Python files in the integration delta parsed successfully. `git diff --check 95eb39cf57 b4bc134188` passed. The local parser emitted warnings for existing regular-expression escapes in settings/wiki tests; these are not syntax failures and those lines are unchanged by this merge. Static parsing does not establish runtime compatibility; the CI results provide the execution evidence. + +### CI results and evidence limits + +CI means the automated checks run after a code change. All 14 jobs reached final success. Unit Tests run `43108225259` is the pull-request event and `43108008887` is the push event; `43108225373` is CodeQL (automated code analysis). All three run metadata records identify the reviewed head. The website logs independently identify checkout `3bb26b1eaf2c240591d71bcb08c3b8611aeda976` for the PR event and `b4bc1341885dcb6725c1e3f27333d9ca9d0ef873` for push. Their trees are identical, as verified in the merge audit. + +Both build logs explicitly record successful installation of Django 2.2.28, DRF 3.9.4, elasticsearch7 7.17.13, django-guardian 1.5.1, and urllib3 1.22. Both website jobs ran Python 3.6.9 and pytest 5.0.0. The following figures are observed results. The 74 website skips are not counted as passes. + +```toon +ci_jobs[14]{run_id,job_id,job,result}: + 43108225259,130817042639,"build-image",success + 43108225259,130841568227,"tests (website)",success + 43108225259,130841568251,"tests (addons)",success + 43108225259,130841568306,"tests (api3_and_osf)",success + 43108225259,130841568396,"tests (api2)",success + 43108225259,130841568640,"tests (api1_and_js)",success + 43108008887,130816310424,"build-image",success + 43108008887,130838441210,"tests (website)",success + 43108008887,130838441263,"tests (api1_and_js)",success + 43108008887,130838441266,"tests (api3_and_osf)",success + 43108008887,130838441283,"tests (api2)",success + 43108008887,130838441586,"tests (addons)",success + 43108225373,130817043508,"Analyze (javascript-typescript)",success + 43108225373,130817043992,"Analyze (python)",success +website_totals[2]{run_id,collected,passed,skipped,failed,errors}: + 43108225259,2309,2235,74,0,0 + 43108008887,2309,2235,74,0,0 +es8_modules[8]{run_id,module,collected,passed,skipped}: + 43108225259,test_es8_index.py,8,8,0 + 43108225259,test_es8_permissions.py,12,12,0 + 43108225259,test_es8_review_r1.py,18,18,0 + 43108225259,test_es8_review_r2.py,9,9,0 + 43108008887,test_es8_index.py,8,8,0 + 43108008887,test_es8_permissions.py,12,12,0 + 43108008887,test_es8_review_r1.py,18,18,0 + 43108008887,test_es8_review_r2.py,9,9,0 +es8_totals[2]{run_id,collected,passed,skipped,failed,errors}: + 43108225259,47,47,0,0,0 + 43108008887,47,47,0,0,0 +additional_dsl[2]{run_id,collected,passed,skipped}: + 43108225259,15,15,0 + 43108008887,15,15,0 +``` + +Each ES8 module's collected count is reconstructed from every pytest progress outcome and checked against its source inventory. The explicit collection total in the log is for the whole website job. The four ES8 modules have no extra parametrized or inherited cases. In each run, r1 is split into 15 integration-class outcomes and 3 TLS-option unit outcomes. Thus these are the same 47 distinct ES8 tests executed twice. + +The integration classes use `enable_search` to bypass the default search mock (a substitute used instead of the real service). Real index creation, owner/outsider/anonymous controls, public visibility, membership and privacy changes, hidden fields, and crafted queries remain covered. The total includes unit/mock tests and is not described as 47 live HTTP integration tests. The inherited Yjs addition contributes 32 passing website tests; website collection increased from r5's 2,277 to 2,309 while skips remain 74. + +For the PR run, ES8 progress lines occur at 23:30:41.1100299 (index), 23:30:59.5758497 (permissions), 23:31:13.3340143 and 23:31:19.0212848 (r1), and 23:31:17.5868238 (r2). For push they occur at 23:20:44.7719355, 23:21:01.6017482, 23:21:12.7667170 and 23:21:17.6023874, and 23:21:16.2951514 respectively. All timestamps are UTC on 2026-11-11. + +The runs were monitored with `gh run watch` and final run/job metadata was refreshed. No artifact/cache 404 job failure occurred, so the conditional coordinator escalation was not needed. The first build-log download was refused by gh's terminal-escape output safeguard; it was retrieved successfully into a file with `--allow-escape-sequences`. There is no remaining gap in job conclusions or ES8 counts. + +No corrective work is required within this review scope. Overall acceptance remains with the coordinator. The reviewer used an isolated scratch clone and GitHub reads, plus one PR comment. No runtime `.env` was read, no Docker state was changed, and no commit, push, merge, approval, or closure was performed. Project links target the intended publication folder using repository-relative paths; private repository evidence is identified by names and IDs, without private URLs or local-path links. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +**Pass。新規の要修正指摘は 0 件で、R6-xx は採番しない。** レビューの判定であり、GitHub 上の承認ではない。 + +### 範囲とマージの完全性 + +対象は `95eb39cf57..b4bc134188`。develop の PR #12(Yjs 共同編集)と #14(内部 render URL)を PR #11 へ取り込んだ差分を確認した。マージは二つの開発履歴をまとめる処理である。両方の変更が共存することを監査し、#12・#14 全体の独立レビューは繰り返さない。 + +独立した `git merge-tree --write-tree` 計算は衝突なしで成功し、commit 済みの tree と完全一致した。レビュワによるブランチの merge や commit は行っていない。パス数は共通祖先と両親の比較に基づき、削除を含め内容の識別子とファイルモードを確認した。検索側のみの 20 パスと develop 側のみの 36 パスをすべて保持する。共通の 4 パスは意図した変更を両立し、両側の変更集合に含まれないパスも不変だった。欠落・想定外の変更はない。 + +次の値は説明用の例ではなく観測結果である。TOON は構造を持つデータを短いテキストで記録する形式である。 + +```toon +merge: + head: b4bc1341885dcb6725c1e3f27333d9ca9d0ef873 + search_parent: 95eb39cf57c1e4c737dfde14867c6dbb3d979032 + develop_parent: 73ff43b3c21f3258f6d34ca99b77ef66f1191e0e + common_ancestor: 527eb93a714af2d5ad55d3b3055b4aab858ac100 + committed_and_recomputed_tree: 622954a66b42a2b0a6e6d88be581b426060b3f89 + search_changed_paths: 24 + develop_changed_paths: 40 + shared_changed_paths: 4 + search_only_paths_preserved: 20 + develop_only_paths_preserved: 36 + dropped_paths: 0 + unexpected_changes: 0 + github_test_merge: 3bb26b1eaf2c240591d71bcb08c3b8611aeda976 + github_test_merge_tree: 622954a66b42a2b0a6e6d88be581b426060b3f89 +``` + +### 共通ファイルと統合箇所 + +`docker-compose.yml` は Elasticsearch のイメージ `grdm-osf/elasticsearch8-ja:8.19.24` と `Dockerfile.ci` によるビルドを保持する。sharejs・mongo のサービス、mongo の volume、sharejs の環境ファイル参照は develop と同じく削除されている。 + +`.github/docker-compose.ci.override.yml` は ES8 の認証と TLS(通信を暗号化し証明書を検証する仕組み)、証明書のマウント、1gb / 512mb / 256mb のディスク watermark を保持する。web と requirements の両方で HTTPS の Elasticsearch URI、ユーザー名、CA 証明書パスを保持する。sharejs の環境ファイル参照は復活していない。この二つの Compose ファイル、`.github/scripts/ci/run-tests.sh`、`.github/ci/docker-compose.env` に sharejs/mongo の参照はなく、後二つのファイルは r5 と同一である。 + +`requirements.txt` は ES8 と互換モードで通信するクライアント `elasticsearch7==7.17.13` を保持し、`elasticsearch2` を復活させていない。develop の「`pymongo==3.7.1` は BSON のオブジェクト・セッション ID 用にのみ残す」という注記も保持する。Django 2.2.28、Django REST framework 3.9.4、django-guardian 1.5.1、urllib3 1.22 の固定と、include モジュールの同梱化も保持している。 + +`tasks/__init__.py:238` は `search_ensure_index` の decorator、アプリケーション初期化、`ensure_index(index=index)` 呼び出しを保持し、構文木は r5 と同一である。sharejs タスクは存在しない。683 行の開発用起動ヘルパーにある古い `tokumx` 参照は develop から変更なしで継承したもので、今回のマージで追加したものではなく、CI もそのヘルパーを使用しない。 + +`website/search`・`api/search`・`tests/test_search` の検索コードと試験は r5 とバイト単位で同一。develop に対する PR #11 の変更 Python 17 ファイル中、16 ファイルは r5 とバイト単位で同一である。変更したのは `tasks/__init__.py` のみで、継承した sharejs タスクの削除だけである。サーバー側で強制する権限フィルターと非公開フィールドの除外も保持されている。 + +継承した wiki 変更は旧 MongoDB の下書き操作を削除する。`WikiVersion.save` と `WikiPage.save` は引き続き `node.update_search` を呼び(`addons/wiki/models.py:148,281`)、検索用変換は `get_version().raw_text(node)` で保存済み wiki の内容を読む(`website/search/elastic_search.py:1287`)。削除した下書きヘルパーを検索経路は使っていない。新しい Yjs の部屋管理も保存済み内容の更新処理を置き換えない。`api/files/serializers.py:235,467,536` と `addons/base/views.py:1083` の内部 URL 選択は、検索用変換とルートを変更しない。 + +### Django 2.2 互換性 + +r5 で確認した認証バックエンド、request を受け取るシグネチャ、ミドルウェア設定、認証プロパティ、API 検索 parser は不変である。検索の認証・URL resolver・ミドルウェア・要求/応答・ORM(データベースへの問い合わせ)の契約は新規追加されていない。継承した Yjs 追加は既存のモデル保存と queryset の `order_by(...).first()` を使い、render 変更は既存の URL builder と Flask request を使う。これらの統合箇所で新規非互換は見つからなかった。 + +検索側の Python 17 ファイルと、統合差分で残存する Python 18 ファイルはすべて構文解析に成功した。`git diff --check 95eb39cf57 b4bc134188` も成功した。ローカル parser は settings/wiki 試験にある既存の正規表現 escape に警告したが、構文エラーではなく、今回のマージで変更した行でもない。静的解析だけで実行時の互換性を証明したとは扱わず、CI 結果を実行証拠とする。 + +### CI 結果と証拠の限界 + +CI はコード変更後に自動実行する検査を指す。全 14 ジョブの最終成功を確認した。Unit Tests の `43108225259` は pull_request、`43108008887` は push、`43108225373` は CodeQL(コードの自動解析)である。3 run のメタデータはいずれもレビュー対象 head を示す。website のログでも PR 側の checkout は `3bb26b1eaf2c240591d71bcb08c3b8611aeda976`、push 側は `b4bc1341885dcb6725c1e3f27333d9ca9d0ef873` と確認できた。マージ監査で両者の tree が同一であることを確かめた。 + +両ビルドのログは Django 2.2.28、DRF 3.9.4、elasticsearch7 7.17.13、django-guardian 1.5.1、urllib3 1.22 のインストール成功を明記する。両 website ジョブの実行環境は Python 3.6.9 と pytest 5.0.0。次の値は観測結果であり、website のスキップ 74 件を成功に含めない。 + +```toon +ci_jobs[14]{run_id,job_id,job,result}: + 43108225259,130817042639,"build-image",success + 43108225259,130841568227,"tests (website)",success + 43108225259,130841568251,"tests (addons)",success + 43108225259,130841568306,"tests (api3_and_osf)",success + 43108225259,130841568396,"tests (api2)",success + 43108225259,130841568640,"tests (api1_and_js)",success + 43108008887,130816310424,"build-image",success + 43108008887,130838441210,"tests (website)",success + 43108008887,130838441263,"tests (api1_and_js)",success + 43108008887,130838441266,"tests (api3_and_osf)",success + 43108008887,130838441283,"tests (api2)",success + 43108008887,130838441586,"tests (addons)",success + 43108225373,130817043508,"Analyze (javascript-typescript)",success + 43108225373,130817043992,"Analyze (python)",success +website_totals[2]{run_id,collected,passed,skipped,failed,errors}: + 43108225259,2309,2235,74,0,0 + 43108008887,2309,2235,74,0,0 +es8_modules[8]{run_id,module,collected,passed,skipped}: + 43108225259,test_es8_index.py,8,8,0 + 43108225259,test_es8_permissions.py,12,12,0 + 43108225259,test_es8_review_r1.py,18,18,0 + 43108225259,test_es8_review_r2.py,9,9,0 + 43108008887,test_es8_index.py,8,8,0 + 43108008887,test_es8_permissions.py,12,12,0 + 43108008887,test_es8_review_r1.py,18,18,0 + 43108008887,test_es8_review_r2.py,9,9,0 +es8_totals[2]{run_id,collected,passed,skipped,failed,errors}: + 43108225259,47,47,0,0,0 + 43108008887,47,47,0,0,0 +additional_dsl[2]{run_id,collected,passed,skipped}: + 43108225259,15,15,0 + 43108008887,15,15,0 +``` + +ES8 モジュール別の収集数は pytest の全結果記号から再構成し、ソースの試験一覧と照合した。ログの明示的な収集総数は website ジョブ全体のものである。この 4 モジュールにパラメーター展開・継承による追加試験はない。両 run とも r1 は統合試験クラスの 15 件と TLS 設定の単体試験 3 件に分かれて現れる。同じ ES8 試験 47 件を 2 回実行した結果である。 + +統合試験クラスは `enable_search` により既定の検索モック(実サービスの代わりに使う代用品)を回避する。実索引の作成、所有者・第三者・匿名の対照、公開可視性、共同作業者・公開性の変更、非公開フィールド、不正な検索条件を引き続き試験する。合計には単体・モック試験を含むため「実 HTTP 統合試験 47 件」とは表現しない。継承した Yjs 追加の website 試験 32 件も成功し、収集数は r5 の 2,277 件から 2,309 件へ増え、スキップは 74 件のままである。 + +PR run の ES8 結果行は index が 23:30:41.1100299、permissions が 23:30:59.5758497、r1 が 23:31:13.3340143 と 23:31:19.0212848、r2 が 23:31:17.5868238。push は順に 23:20:44.7719355、23:21:01.6017482、23:21:12.7667170 と 23:21:17.6023874、23:21:16.2951514。すべて 2026-11-11 の UTC である。 + +`gh run watch` で監視し、最終の run/job メタデータを再取得した。artifact/cache の 404 によるジョブ失敗はなく、条件付きの連携調整者への確認は不要だった。最初のビルドログ取得は gh の端末 escape 出力保護により拒否されたが、`--allow-escape-sequences` を付けてファイルへ取得できた。ジョブの最終結果と ES8 件数に証拠の不足は残っていない。 + +このレビュー範囲で必要な修正はない。全体の受入判断は連携調整者に残る。レビュワは独立した作業用 clone と GitHub の読み取りを用い、PR コメントを 1 件投稿した。runtime `.env` の読み取り、Docker 状態変更、commit・push・merge・approve・close は行っていない。プロジェクト文書のリンクは掲載先フォルダーを基準とするリポジトリ内の相対参照とし、非公開リポジトリの証拠は名称と ID で示す。非公開 URL やローカルパスのリンクは含めない。 diff --git a/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r4.md b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r4.md new file mode 100644 index 0000000..9e256d4 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r4.md @@ -0,0 +1,156 @@ +# REV PR12 File editor Yjs review r4 / ファイル編集 Yjs レビュー r4 + +> **Summary:** Pass at 1ad29850: no new R4 findings, R3-01 closed, and all 14 CI jobs successful. The MongoDB removal and both develop merges preserve the required security and compatibility behavior. +> **概要:** 1ad29850 を pass と判定。R4 の追加指摘なし、R3-01 は解消、CI 全14ジョブ成功。MongoDB 撤去と2回の develop 取り込みで必要な安全性・互換性は維持されている。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-12. **Learned:** Removing the MongoDB connection satisfies its TLS security goal, but an unchanged merge tree and passing local checks cannot replace the required exact-head CI results. / MongoDB 接続の撤去は TLS の安全目標を満たすが、マージ前後の同一ツリーとローカル試験成功だけでは対象 head の必須 CI を代替できない。 +- Applies to / 対象: RCOSDP/RDM-osf.io-dev2027 PR #12, `10004e676099098944c66d0a54f51cdf34b97e50..1ad2985080bf3ed4d85d85bacd4ce718f8cee919`; paired server RCOSDP/RDM-y-websocket-dev2027 PR #5, `5e7fe4a524c7cd970d44085b6f3eacd82e2fb425`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra) +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · Round 3 / 前回: `2026-11-11_RDM-osf.io-dev2027_PR12_File_Editor_Yjs_r3.md` · Server r3 / サーバー r3: `2026-11-12_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r3.md`. +- Used by / 利用先: the coordinator's integration decision for PR #12 and PR #5 / 調整者による PR #12・PR #5 の統合判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Pass at `1ad2985080bf3ed4d85d85bacd4ce718f8cee919`. No new R4 findings. R3-01 / P2 is closed.** The original scope contains the cleanup fix `089f58b987f62244328ba5b85d6a6dc95d8cf68d` and merge `013dbcfdad1ae5884778c577a2ae2b396db5bc68`. Both PR heads were verified through GitHub and checked out in fresh private scratch clones. The coordinator extended the review to merge `1ad2985080bf3ed4d85d85bacd4ce718f8cee919`, incorporating develop `527eb93a714af2d5ad55d3b3055b4aab858ac100` (Django 2.2, PR #13). All 14 CI jobs on `1ad29850` completed successfully, satisfying the final acceptance gate. The old-head Unit Tests runs were cancelled by the coordinator and were not used as acceptance evidence. The paired server head remains `5e7fe4a5`. This is a review verdict; no GitHub approval or merge was performed. Exactly one final PR comment was posted and read back: issuecomment-6806071017. + +### R3-01 closure + +At `addons/base/views.py:1255–1259`, a known pending room reaches `retry_superseded_file_editor_deletions` after authorization and file validation, then returns 404 without issuing a token. The helper at `addons/base/views.py:1175–1191` retries this file's pending entries, removes only confirmed deletions, and saves changed state. Page/current-room cleanup shares that helper. The new application regression is at `tests/test_file_editor_yjs.py:291`. + +An independent probe extracted nine actual function bodies and replaced external database/request dependencies. After a newer stored version, three requests for only the old room produced three deletion-helper calls with mocked results False, False, and True; every request returned 404, token count stayed zero, and the pending entry disappeared after the third request. Unknown rooms and callers without WRITE caused no deletion; another file's pending entry was untouched; the current room still renewed successfully. The same probe against `10004e67` failed its second deletion-helper-call assertion. This independently reproduces the former defect and confirms the change, without claiming a full Django HTTP/database test. + +### Original develop merge and MongoDB security audit + +The original merge `013dbcfd` parents are `089f58b987f62244328ba5b85d6a6dc95d8cf68d` and `8fc45de461fde227dc60c30a47139a61d6209a26`; their merge base is `fe90e5c39e660f464bb8fcc9ae4028119b958d19`. The second-parent-only history contains exactly `8fc45de` (PR #9). That commit changes only `addons/wiki/utils.py`, `addons/wiki/settings/defaults.py`, and `addons/wiki/tests/test_share_db_tls.py`. Its implementation and tests solely concern the removed ShareJS MongoDB connection. No unrelated develop change was lost. The merge and first parent have identical tree `c9d7f072cde6d0bb3e88e7a36b28255bc832e39d`; the original `10004e67..013dbcfd` content delta is only `addons/base/views.py` and `tests/test_file_editor_yjs.py`. + +A case-insensitive search of tracked content, including product code, settings, Docker/Compose, CI, tasks, and scripts, found no `MongoClient`, `SHAREJS_DB`, `share_db`, `from pymongo`, `import pymongo`, MongoDB URI, `mongoengine`, or `mongomock`. Searches also found no `get_sharejs_content`, `delete_share_doc`, `migrate_uuid`, `broadcast_to_sharejs`, or `update_active_sharejs`. The former `share_db()` caller and URL/CA settings are absent. Deleting `addons/wiki/tests/test_share_db_tls.py` therefore removes tests of a connection that no longer exists; it does not hide a remaining unverified connection. PR #9's stated goal—no unverified MongoDB TLS connection from OSF—is met by removing that connection. + +The audit does **not** claim every Mongo/ShareJS string is gone. `requirements.txt:44–46` retains `pymongo==3.7.1` for BSON ObjectId generation; direct BSON imports are in `osf/models/base.py:4`, `osf/models/node.py:13`, and `framework/sessions/__init__.py:8`. `website/settings/defaults.py:205–206` retains unused generic DB_HOST/DB_PORT defaults, including port 27017; no remaining product consumer creates a Mongo connection from them. The active database configuration at `api/base/settings/defaults.py:21–30` selects PostgreSQL. Legacy key escaping, UUID names, fixtures, comments, changelog entries, commented MATLAB MongoDB toolbox names, inactive legacy test imports of the removed framework.mongo module, and unused old wiki ShareJS JS remain. The old wiki editor entry is commented out at `webpack.common.config.js:37`, while `addons/wiki/templates/edit.mako:735–737` loads the separately built wiki editor. None of these is an OSF-to-MongoDB connection. Deployment configuration and runtime secrets are outside this source audit. + +### Django 2.2 integration + +The final head `1ad2985080bf3ed4d85d85bacd4ce718f8cee919` has parents `013dbcfdad1ae5884778c577a2ae2b396db5bc68` and `527eb93a714af2d5ad55d3b3055b4aab858ac100`, with tree `c6f880bd888af98369117423a09a467340809f51`. The integration adds the 100-file Django 2.2 change from PR #13. An independent `git merge-tree --write-tree` calculation identified only the requirements conflict. Comparing its automatic result with the submitted merge found zero differences outside `requirements.txt`; that file equals develop plus the PR's two BSON comment lines. Consequently no unrelated Django change was dropped, and no unreported compatibility fix was introduced. The merge retains `django-waffle==0.18.0`, Django 2.2.28, DRF 3.9.4, and `pymongo==3.7.1` for BSON. The removed ShareJS MongoDB connection and TLS test remain removed; the strict MongoDB identifier search was repeated on this head with zero matches. + +Compatibility review covered the Flask renewal route and its Django model usage, `framework/sessions/__init__.py` cookie-to-text conversion, `BaseModel.save`/`refresh_from_db` changes, file version lookup, and the Node storage-region query. The editor route, cleanup helpers, token/deletion helpers, regression tests, and relevant JS are byte-identical to `013dbcfd`; the surrounding Django compatibility changes match develop. The reviewed APIs use timezone-aware datetime values, a sliced/latest version queryset, ordinary model save, and JSON mapping updates. No additional compatibility defect was found. AID reported 46 local Django 2.2 application tests passed; that is author evidence, not an independent local rerun of the application suite. The reviewer reran the cleanup probe, 24 JS tests, and actual-server compatibility probe on `1ad29850`; the latter now uses real Django 2.2.28 timezone behavior. The new-head CI gate subsequently passed in full. + +### Compatibility and local validation + +The exact client pins (Yjs 13.6.18, y-websocket 2.0.4, y-protocols 1.0.6, lib0 0.2.94) were installed in scratch. A real loopback server ran the exact PR #5 head. The OSF functions `generate_y_websocket_token` and `delete_y_websocket_doc` were extracted unchanged from `addons/wiki/utils.py` and executed with PyJWT 1.5.3 and requests 2.32.5, satisfying the repository's dependency constraints under Python 3.9.6. The final bridge uses Django 2.2.28 timezone and minimal test settings; no OSF runtime configuration was loaded. + +The real provider synchronized stored text and subsequent edits in both directions. A three-second token expired with 4401; the actual OSF `yWebsocketAuth.js` recovery code obtained another OSF-minted token, reconnected, retained the draft, and resumed synchronization. A room token was rejected for DELETE with 401. The actual OSF DELETE helper was accepted with 204, existing sockets closed with 4410, and rejoining with the former room token returned 4410 with zero document frames. Room naming, HS256 claims `doc_id/sub/exp`, token query parameters, delete-purpose bearer tokens, 4401 recovery, and 4410 semantics therefore match at these heads. Browser UI, WaterButler save, and deployed networking were not rerun. Deployment still requires matching signing secrets, a reachable Y_WEBSOCKET_INTERNAL_URL, and durable YPERSISTENCE with YPERSISTENCE_DOC_PREFIX=file-; those runtime settings were not inspected. + +```toon +local_checks[6]{check,result}: + independent_cleanup_probe,pass; three old-room requests and three deletion-helper calls; all 404; zero tokens + negative_control_10004e67,expected failure; second deletion-helper call missing + OSF_JS_tests,24 passed; awareness 6; recovery 12; binding 6 + exact_head_loopback_compatibility,4 groups passed; sync; expiry/recovery; delete authorization; deletion/rejoin + server_npm_test,pass; standard and TypeScript; room-release; auth 25; persistence 13; bounds 4 + git_diff_check,pass; both source checkouts remain clean +``` + +Node was v26.12.0. The isolated renewal probe used Python 3.15.2; the exact-dependency bridge used Python 3.9.6. Scratch evidence filenames: `renewal-probe.py`, `renewal-django22-head.log`, `renewal-negative-control.log`, `compatibility-django22.cjs`, `token-bridge-django22.py`, `compatibility-django22.log`, `server-test.log`, `mongo-tracked.txt`, `all-mongo.txt`, and the CI JSON snapshots. These are local evidence names, not repository links. Application Python tests and full browser acceptance were not independently executed locally. Local tests cannot substitute for the CI gate. + +### CI gate, job by job + +Snapshot: 2026-11-12 05:05 JST (2026-11-11 20:05 UTC). Runs `43067653193` (push Unit Tests), `43067668317` (PR Unit Tests), and `43067668273` (CodeQL) all completed successfully on `1ad2985080bf3ed4d85d85bacd4ce718f8cee919`. A fresh PR status rollup confirmed all 14 jobs successful and both reviewed heads unchanged. The old-head Unit Tests runs `43046725604` and `43046740670` were cancelled by the coordinator after the target changed; old-head CodeQL `43046740662` succeeded. Those old results are not the new-head acceptance evidence. +```toon +ci_jobs[14]{run,job,status}: + 43067653193,build-image,success + 43067653193,tests (website),success + 43067653193,tests (api1_and_js),success + 43067653193,tests (api2),success + 43067653193,tests (addons),success + 43067653193,tests (api3_and_osf),success + 43067668317,build-image,success + 43067668317,tests (api3_and_osf),success + 43067668317,tests (api1_and_js),success + 43067668317,tests (website),success + 43067668317,tests (api2),success + 43067668317,tests (addons),success + 43067668273,Analyze (python),success + 43067668273,Analyze (javascript-typescript),success +``` + +Evidence: `.github/workflows/unit-tests.yml:13–52`, `.github/workflows/codeql.yml:15–27`, and GitHub Actions run/job API snapshots. All three workflows and all 14 jobs passed; there are no pending, skipped, cancelled, or failed jobs on the reviewed head. No Docker state changes, runtime/.env reads, source edits, commits, pushes, approvals, merges, or closes occurred. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**`1ad2985080bf3ed4d85d85bacd4ce718f8cee919` を pass と判定。R4 の追加指摘なし。R3-01 / P2 は解消。** 当初の対象は削除再試行の修正 `089f58b987f62244328ba5b85d6a6dc95d8cf68d` とマージ `013dbcfdad1ae5884778c577a2ae2b396db5bc68`。両 PR の head を GitHub で確認し、専用 scratch に新規 clone して固定した。調整者の指示で、develop `527eb93a714af2d5ad55d3b3055b4aab858ac100`(Django 2.2、PR #13)を取り込む `1ad2985080bf3ed4d85d85bacd4ce718f8cee919` も対象に追加した。`1ad29850` の CI 全14ジョブが成功し、最終合格の条件を満たした。旧 head の Unit Tests は調整者が取り消しており、合格の証跡には使っていない。対になるサーバーの head は `5e7fe4a5` のまま。これはレビュー判定であり、GitHub の approve や merge は行っていない。最終 PR コメントを1件だけ投稿し、読み戻して確認した(issuecomment-6806071017)。 + +### R3-01 の解消 + +`addons/base/views.py:1255–1259` は、認可とファイルの検査後に既知の削除待ち部屋を `retry_superseded_file_editor_deletions` へ通し、トークンを出さず 404 を返す。`addons/base/views.py:1175–1191` のヘルパーは対象ファイルの削除待ちを再試行し、削除成功分だけを除去して保存する。ページ表示と現行部屋の更新でも同じヘルパーを使う。追加されたアプリ回帰試験は `tests/test_file_editor_yjs.py:291`。 + +独立試験では実際の9関数を抽出し、外部 DB・要求依存を代役にした。新版保存後に旧部屋だけを3回要求し、削除ヘルパーの戻り値を False、False、True とすると、同ヘルパーは3回、応答はすべて404、トークン発行は0、3回目に削除待ちが消えた。未知の部屋と WRITE 権限なしの要求では削除せず、別ファイルの削除待ちは維持され、現行部屋の更新は成功した。同じ試験を `10004e67` に向けると削除ヘルパーの2回目の呼出し検査で失敗する。旧不具合の再現と修正を独立確認したが、Django の HTTP・実 DB 試験ではない。 + +### 当初の develop マージと MongoDB の安全性確認 + +当初のマージ `013dbcfd` の親は `089f58b987f62244328ba5b85d6a6dc95d8cf68d` と `8fc45de461fde227dc60c30a47139a61d6209a26`、分岐点は `fe90e5c39e660f464bb8fcc9ae4028119b958d19`。develop 側だけの履歴は `8fc45de`(PR #9)1件で、変更は `addons/wiki/utils.py`、`addons/wiki/settings/defaults.py`、`addons/wiki/tests/test_share_db_tls.py` の3ファイルのみ。実装も試験も撤去された ShareJS MongoDB 接続だけを扱っており、無関係な develop の変更は落ちていない。マージと第1親は同じ tree `c9d7f072cde6d0bb3e88e7a36b28255bc832e39d`。当初の `10004e67..013dbcfd` の内容差分は `addons/base/views.py` と `tests/test_file_editor_yjs.py` だけ。 + +追跡対象の製品コード、設定、Docker/Compose、CI、tasks、scripts を大文字小文字を区別せず検索した結果、`MongoClient`、`SHAREJS_DB`、`share_db`、`from pymongo`、`import pymongo`、MongoDB URI、`mongoengine`、`mongomock` はなかった。`get_sharejs_content`、`delete_share_doc`、`migrate_uuid`、`broadcast_to_sharejs`、`update_active_sharejs` もない。旧 `share_db()` 呼出し元と URL/CA 設定は撤去済み。従って `addons/wiki/tests/test_share_db_tls.py` の削除は、存在しない接続の試験を除いたものであり、残存する未検証接続を隠してはいない。#9 の目標「OSF から証明書を検証しない MongoDB TLS 接続を持たない」は接続撤去によって満たされる。 + +Mongo/ShareJS の文字列が全部消えたわけではない。`requirements.txt:44–46` の `pymongo==3.7.1` は BSON ObjectId 生成用に残り、BSON の直接 import は `osf/models/base.py:4`、`osf/models/node.py:13`、`framework/sessions/__init__.py:8` にある。`website/settings/defaults.py:205–206` には未使用の汎用 DB_HOST/DB_PORT 既定値と27017番ポートが残るが、これを使って Mongo 接続を作る製品コードはない。実際の DB 設定 `api/base/settings/defaults.py:21–30` は PostgreSQL。旧キーのエスケープ、UUID 名、fixture、コメント、変更履歴、コメントアウトされた MATLAB MongoDB toolbox 名、撤去済み framework.mongo を import する非実行の旧試験、未使用の旧 wiki ShareJS JS も残る。旧 wiki 編集 entry は `webpack.common.config.js:37` でコメントアウトされ、`addons/wiki/templates/edit.mako:735–737` は別ビルドの wiki editor を読む。これらは OSF から MongoDB への接続ではない。配備設定と実行時秘密情報は今回のソース監査の対象外。 + +### Django 2.2 の取り込み + +最終対象 head `1ad2985080bf3ed4d85d85bacd4ce718f8cee919` の親は `013dbcfdad1ae5884778c577a2ae2b396db5bc68` と `527eb93a714af2d5ad55d3b3055b4aab858ac100`、tree は `c6f880bd888af98369117423a09a467340809f51`。PR #13 の Django 2.2 変更100ファイルを取り込む。独立した `git merge-tree --write-tree` 計算では衝突は requirements のみ。自動マージ結果と提出されたマージを比較すると `requirements.txt` 以外の差は0で、そのファイルも develop に本 PR の BSON コメント2行を加えた内容と一致した。従って無関係な Django の変更は落ちておらず、未申告の互換性修正もない。`django-waffle==0.18.0`、Django 2.2.28、DRF 3.9.4 と BSON 用の `pymongo==3.7.1` は維持される。撤去した ShareJS MongoDB 接続と TLS 試験も復活していない。新 head でも厳密な MongoDB 識別子検索を再実行し、一致0件だった。 + +互換性レビューでは Flask の更新ビューと Django モデルの使用箇所、`framework/sessions/__init__.py` の Cookie の文字列化、`BaseModel.save`/`refresh_from_db`、ファイルの版検索、Node の保存先リージョン検索を確認した。エディターのビュー、掃除関数、トークン・削除関数、回帰試験、関連 JS は `013dbcfd` と同一で、周囲の Django 対応は develop と一致する。使う API は timezone 付き datetime、最新版を得る queryset、通常のモデル保存と JSON 対応表更新であり、追加の互換性不具合は見つからなかった。AID は Django 2.2 のアプリ試験46件成功と報告しているが、これは作者の証跡であり、レビュワによるアプリ全体のローカル再実行ではない。レビュワは `1ad29850` で掃除の分離試験、JS 24件、実サーバーとの互換性試験を再実行し、通信試験では実際の Django 2.2.28 の timezone を使用した。その後、新 head の必須 CI もすべて成功した。 + +### 互換性とローカル検証 + +クライアントの固定版 Yjs 13.6.18、y-websocket 2.0.4、y-protocols 1.0.6、lib0 0.2.94 を scratch に導入し、PR #5 の指定 head を実際の loopback サーバーとして起動した。OSF の `addons/wiki/utils.py` から `generate_y_websocket_token` と `delete_y_websocket_doc` を変更せず抽出し、リポジトリの依存条件を満たす PyJWT 1.5.3 と requests 2.32.5、Python 3.9.6 で実行した。最終の通信試験は Django 2.2.28 の timezone と最小限の試験設定を使い、OSF の実行時設定は読んでいない。 + +実 provider 間で保存本文と編集を双方向に同期できた。3秒のトークンが4401で期限切れになると、実際の OSF `yWebsocketAuth.js` が OSF 関数の新トークンを取得し、下書きを維持して再接続・同期した。部屋トークンでの DELETE は401。実際の OSF DELETE ヘルパーは204で成功し、既存接続は4410、旧部屋トークンで再接続すると文書フレーム0のまま4410となった。部屋名、HS256 の `doc_id/sub/exp`、query の token、削除目的の bearer token、4401回復、4410の意味は両 head で一致する。ブラウザ UI、WaterButler 保存、配備ネットワークは再実行していない。配備時には署名秘密値の一致、到達可能な Y_WEBSOCKET_INTERNAL_URL、永続的な YPERSISTENCE と YPERSISTENCE_DOC_PREFIX=file- が必要であり、これらの実行時設定は確認していない。 + +```toon +local_checks[6]{check,result}: + 独立削除試験,成功; 旧部屋3要求で削除ヘルパー3回; 全404; トークン0 + 10004e67の対照試験,想定どおり失敗; 削除ヘルパーの2回目の呼出しなし + OSF_JS試験,24件成功; awareness 6; recovery 12; binding 6 + 両headのloopback互換性,4群成功; 同期; 期限と回復; 削除認可; 削除と再入室 + server_npm_test,成功; standardとTypeScript; room-release; auth 25; persistence 13; bounds 4 + git_diff_check,成功; 両ソースcheckoutは差分なし +``` + +Node は v26.12.0。更新分離試験は Python 3.15.2、固定依存の通信試験は Python 3.9.6。scratch の証跡名は `renewal-probe.py`、`renewal-django22-head.log`、`renewal-negative-control.log`、`compatibility-django22.cjs`、`token-bridge-django22.py`、`compatibility-django22.log`、`server-test.log`、`mongo-tracked.txt`、`all-mongo.txt`、CI の JSON snapshot。これらはローカル証跡の名前であり、リポジトリへのリンクではない。アプリ全体の Python 試験とブラウザ受入はローカルで独立実行していない。ローカル試験は必須 CI の代わりにはならない。 + +### CI の必須条件とジョブ別状況 + +確認時刻は2026-11-12 05:05 JST(2026-11-11 20:05 UTC)。run `43067653193`(push Unit Tests)、`43067668317`(PR Unit Tests)、`43067668273`(CodeQL)は、すべて `1ad2985080bf3ed4d85d85bacd4ce718f8cee919` で成功した。PR の最新チェック一覧でも全14ジョブ成功を確認し、両方の対象 head が変わっていないことを照合した。旧 head の Unit Tests `43046725604`・`43046740670` は対象変更後に調整者が取り消し、旧 head の CodeQL `43046740662` は成功した。旧結果は新 head の合格証跡に使っていない。 +```toon +ci_jobs[14]{run,job,status}: + 43067653193,build-image,success + 43067653193,tests (website),success + 43067653193,tests (api1_and_js),success + 43067653193,tests (api2),success + 43067653193,tests (addons),success + 43067653193,tests (api3_and_osf),success + 43067668317,build-image,success + 43067668317,tests (api3_and_osf),success + 43067668317,tests (api1_and_js),success + 43067668317,tests (website),success + 43067668317,tests (api2),success + 43067668317,tests (addons),success + 43067668273,Analyze (python),success + 43067668273,Analyze (javascript-typescript),success +``` + +証跡は `.github/workflows/unit-tests.yml:13–52`、`.github/workflows/codeql.yml:15–27`、GitHub Actions run/job API の snapshot。対象 head の3ワークフロー・全14ジョブは成功し、未完了・skip・cancel・失敗のジョブはない。Docker 状態変更、runtime/.env 読取り、ソース編集、commit、push、approve、merge、close は行っていない。 diff --git a/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR14_Render_URL_r1.md b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR14_Render_URL_r1.md new file mode 100644 index 0000000..9efd3b6 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR14_Render_URL_r1.md @@ -0,0 +1,262 @@ +# REV PR #14 API v2 render URL review r1 / API v2 描画 URL レビュー r1 + +> **Summary:** Pass for the scoped server change; all 14 head CI jobs succeeded. Ember preview acceptance remains separate. +> **概要:** 対象範囲のサーバー側変更は pass。対象 head の CI 全14ジョブが成功した。 Ember プレビューの受入は別途必要。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-12. **Learned:** An internal fetch URL can be a valid browser-facing render link when MFR performs the fetch; the client still must preserve authorization and view-only context. / MFR が取得する内部 URL はブラウザ向け描画リンクの中でも有効だが、クライアントには認証と view-only の文脈の引継ぎが必要と分かった。 +- Applies to / 対象: RDM-osf.io-dev2027 PR #14, head `35c6bcdde33bf85e8d9826e76693002b26e2977b`, review r1. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related / 関連: Review index README; SPEC-06 Documentation Conventions; SPEC-04 acceptance C5; RDM-modular-file-renderer-dev2027 PR #7; RDM-osf.io-dev2027 PR #13. +- Used by / 利用先: Coordinator's PR #14 review gate; subsequent Ember preview and C5 acceptance work / 連携調整の PR #14 レビュー判断、後続 Ember プレビュー・C5 受入。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +**Final gate: Pass for the scoped server change; all 14 head CI jobs succeeded.** + +### Scope and decision + +The reviewed source is RDM-osf.io-dev2027 PR #14, branch `fix/api-v2-render-url`, head `35c6bcdde33bf85e8d9826e76693002b26e2977b`, against base `527eb93a714af2d5ad55d3b3055b4aab858ac100`. I read the PR body and all five changed files in my own detached scratch clone. There are no remaining blocking source findings; the preliminary R1 lint issue is closed. This is a correct server-side prerequisite for API v2 rendering, not an end-to-end Ember preview fix. The final review gate also requires every CI job for this head to succeed. + +### Django 2.2 integration and R1 closure + +The final head includes merge `b996198257ca5f73a46f4847d69aa38ab924b092`, whose two parents are the original PR head `6bbba6c6` and develop `527eb93a71` (PR #13). The merge's combined diff has no conflict-resolution changes. Against the new develop, only the original five PR files differ. Within those five files, the only differences from the original head are the inherited `django.urls` import and removal of one blank line. The render routing, query filtering and permission ordering are preserved. + +The imported base retains Django 2.2.28 / DRF 3.9.4, signed-cookie bytes-to-text conversion in `framework.sessions.before_request` and `OSFUser.from_cookie`, the explicit region `Subquery`, foreign-key/generic-relation cache compatibility, corrected authentication backend signatures and the separate Django/Flask cookie settings. No PR-specific Django 2.2 compatibility repair beyond retaining the new import was needed. This is an integration check of the accepted PR #13 base, not a repeat of its complete migration or admin review. + +**R1 is closed before the final review.** The original head had three blank lines before `TestFileRenderLink`; pinned pycodestyle 2.4.0 reported E303, and Flake8 initialization confirmed that the file and rule are included in the mandatory lint. I reported that blocker to the coordinator before the new head was pushed. Commit `35c6bcdd` removes exactly one blank line, and the same E303 check now passes. No test assertion or runtime code was altered by this fix. The full local Flake8 invocation was unsuitable on Python 3.15 because its old Pyflakes dependency references removed `ast.Str`; its failure is not attributed to this PR and is not counted as a completed lint run. Full configured lint remains part of CI's `tests (addons)` jobs. + +An additional 22 checks passed on the final head with real Django 2.2.28 and DRF 3.9.4, Python 3.9.6, pinned furl/Werkzeug/itsdangerous, and minimal in-memory SQLite models. These execute the reviewed serializer methods, region query and cookie restoration code. The old bytes-based session lookup is a negative control: it fails to find the session, while the retained decode finds it. + +```toon +django22_checks[9]{check,cases,result}: + actual serializer URL resolver import,1,pass + region Subquery selects region rather than settings primary key,1,pass + missing region retains existing fallback,1,pass + real QueryDict and DRF Request to file and version links,12,pass + region public download and global internal render,1,pass + OSFUser cookie restoration through real CharField lookup,1,pass + invalid or missing cookies rejected before session query,3,pass + Flask cookie decoding expression through real lookup,1,pass + old bytes lookup negative control,1,expected lookup miss confirmed +``` + +These are framework-boundary checks with replacement model classes and extracted functions; they are not a full OSF application, PostgreSQL upgrade, HTTP/browser session or C5 run. The 64 routing/security checks were also rerun against this head and passed. The cancelled old-head CI runs were intentionally superseded by the coordinator when develop changed; their unstarted test jobs are neither successes nor product-test failures, and do not satisfy the new-head gate. + +### Authorization and internal host disclosure + +`addons/base/views.py:1098–1102` calls `check_contributor_auth` and returns a login response before constructing the WaterButler redirect. WaterButler is the service that retrieves stored files. `mode=render` is a routing hint, not authentication and not proof that the requester is MFR. For a private node, an anonymous JSON request without an active view-only token is rejected with 401; an unauthorized signed-in user is rejected with 403. Neither response carries a WaterButler Location. An anonymous browser request follows the existing login path instead. File and version API views likewise check object permissions before returning serialized links (`api/files/views.py:42–61, 70–77, 148–169`). + +**An anonymous or non-contributor user can obtain an internal WaterButler URL for a public file, and can also do so for a private file when holding an active view-only link.** This is authorized read access, not a contributor bypass. Knowing a private file identifier or passing `mode=render`, `_internal`, or `base_url` alone does not grant access. The unchanged WaterButler authentication callback still checks file access; a redirect URL is not a signed grant or a new credential. + +The API deliberately discloses `INTERNAL_DOMAIN` inside the encoded `url` argument of `links.render`, including for publicly readable files. The outer origin remains the configured browser-facing MFR address. The browser requests that outer URL; MFR, the file preview service, fetches the internal OSF URL and follows its internal WaterButler redirect. A client should not directly dereference the inner `web:5000` address. This is meaningful in the intended network layout and matches the legacy page's existing exposure (`addons/base/views.py:1151–1167`). I consider that topology disclosure acceptable for this server-side change: these names are not secrets and access does not depend on hiding them. It is not a claim that internal hostnames remain confidential. + +The checked-in installer config pairs `http://web:5000` with `http://wb:7777` and includes both in MFR's permitted destinations. Browser-side PDF/image fetching still relies on the existing MFR local-development host conversion and reachable public WaterButler configuration; `PdfRenderer._render` uses `munge_url_for_localdev`. Real reachability and alternate port mappings were not tested. This PR does not make arbitrary internal URLs usable in browsers. + +### Redirect and server-side request boundaries + +`addons/base/views.py:1104–1114` removes `base_url` and overwrites `_internal` with the exact test `mode == 'render'`. A request can select the existing render route, but cannot choose its host. Other modes retain the existing public WaterButler selection, using the region's address for osfstorage. Duplicate query keys use the existing first-value behavior of `request.args.to_dict()`. `api/base/utils.py:207–218` obtains the host from settings and adds model-derived path segments; remaining request values become query data. No new open redirect (a redirect to an arbitrary attacker-selected host) was found. Before this change, `_internal=1` selected the internal host and `base_url` collided with the explicit builder argument; both behaviors are closed on this endpoint. + +The render URL builder uses structured URL encoding, a model identifier, and fixed render parameters (`api/files/serializers.py:536–576`). Crafted `view_only`, `url`, `_internal`, or `base_url` input does not replace the generated MFR fetch origin. Version render links retain `revision`; normal download and HTML links retain the public domain. + +I also read the merged MFR PR #7 source at `2c4a88a663ca2c659e2b8fe46a2f26e84f206ba9`. The OSF patch does not change MFR's allowlist or credential grant. MFR validates every requested or redirected destination, disables automatic redirects, and grants cross-origin credentials only for its configured exact source/target origins. The reviewed pairing allows MFR to attach its captured Authorization, cookies, cookie query data and view-only tokens from OSF to WaterButler; merely permitting another storage origin does not grant it those automatically forwarded credentials. No new SSRF (making a server fetch an unintended network destination) path was found in this patch. This assessment depends on the existing MFR validation and trusted deployment settings, not on hiding the inner URL. + +### View-only, legacy C5 and Ember follow-up + +Active view-only tokens continue to authorize the persistent download route and are preserved in its WaterButler query. Missing, revoked and malformed tokens do not grant private-file access. The new tests cover a crafted token's URL structure, but do not exercise an actual active/revoked view-only link through the full API → MFR → OSF → WaterButler chain. + +A pre-existing limitation matters for the Ember follow-up: `get_file_render_link` replaces the inner query and the API render link does not include `view_only` on the outer MFR query either. I reproduced the omission with the base and head helper implementations. MFR forwards a token supplied on its own outer query. Therefore, simply assigning the bare API link to an iframe is not enough for an anonymous view-only reader; the client must carry the token safely, or the link contract must be extended. Add active/revoked view-only integration coverage in that follow-up. This is not an authorization regression introduced by PR #14 and is not a source blocker for the scoped server prerequisite. + +The legacy C5 path builds its own internal URL and uses `addon_view_or_download_file`; both that function and `addon_view_file` are structurally identical to the base. The ordinary `/download/<id>/` path remains public-facing unless the caller explicitly requests render mode. Switching to the global internal WaterButler for render matches the legacy behavior; deployments with multiple independent region services still need their own routing validation. + +The Ember renderer at `d3caa8a` builds MFR input from `links.download` and does not consume `links.render`. Its first request therefore still targets the browser-facing OSF address. The persistent download route also avoids the Ember page-selection decorator, which can return HTML instead of the redirect MFR needs on the legacy GUID route. PR #14 is correct and sufficient for the intended two server changes, but it is insufficient to claim that Ember previews work. The remaining client change must preserve authentication, view-only access and versions. No real C5 execution was performed; source preservation and unit results do not replace browser acceptance. + +### Reviewer verification and limits + +The reviewer ran 64 focused checks against functions extracted from the reviewed source, using mocked model/request objects and the repository's pinned `furl 0.4.92` and `Werkzeug 1.0.0`. Python was 3.15.2. This checks routing and authorization branch ordering, not a running Flask/Django service, database, DNS, cookies in a browser, or actual network transport. + +```toon +reviewer_checks[9]{check,cases,result}: + public-private-user-view-only combinations,24,pass + configured host and request controls,20,pass + duplicate mode first-value behavior,2,pass + anonymous browser login before WaterButler,1,pass + file-GUID-version link construction,4,pass + view-only omission in base and head,2,confirmed pre-existing + exact MFR credential pair,1,pass + MFR malformed or unlisted destinations,7,pass + MFR credential delivery boundaries,3,pass +``` + +An AST comparison, which compares program structure, confirmed seven unchanged functions: the legacy page and download handlers, OSF WaterButler authentication and access functions, both contributor authorization helpers, and the WaterButler URL builder. `git diff --check` passed. The scratch checkout has no tracked modifications. The author's earlier 310 passing tests and ten mutation failures, and the newer ten focused Django 2.2 tests on merge b996198257, were read as author evidence, not relabeled as independent reviewer results. The author also reports local lint hooks passing after R1, with jshint omitted locally because its Node download returned 404; that omission does not waive the CI gate. Full service tests were left to the head's CI. The relevant new API tests belong to `tests (api3_and_osf)`; download tests belong to `tests (addons)`. + +No runtime/.env was read and no Docker command was executed. No source edits, commits, pushes, approvals, merges, or closes were performed. Exactly one PR review comment is the only requested remote write. Remaining work is governed by the final CI decision, the Ember follow-up, and separate live C5/download acceptance. + +### Head CI results + +Observed at `2026-11-11T21:01:29.930480+00:00`. CI means the automated checks run by GitHub. Each job is recorded separately; queued or running jobs do not count as a pass. + +```toon +ci_jobs[14]{run,event,job_id,job,status,result}: + 43067716893,pull_request,130687009199,Analyze (javascript-typescript),completed,success + 43067716893,pull_request,130687010111,Analyze (python),completed,success + 43067716763,pull_request,130687008771,build-image,completed,success + 43067716763,pull_request,130729393337,tests (api3_and_osf),completed,success + 43067716763,pull_request,130729393382,tests (api2),completed,success + 43067716763,pull_request,130729393531,tests (api1_and_js),completed,success + 43067716763,pull_request,130729393541,tests (website),completed,success + 43067716763,pull_request,130729393545,tests (addons),completed,success + 43067702672,push,130686958211,build-image,completed,success + 43067702672,push,130727467845,tests (api3_and_osf),completed,success + 43067702672,push,130727467934,tests (website),completed,success + 43067702672,push,130727468027,tests (api2),completed,success + 43067702672,push,130727468041,tests (addons),completed,success + 43067702672,push,130727468265,tests (api1_and_js),completed,success +``` + +The push workflow tests head `35c6bcdde33bf85e8d9826e76693002b26e2977b`. The PR test merge is `dc817bac8ee26d4d0cdff6189bc3f6f0f680396e`, whose parents are the reviewed base and head; GitHub commit metadata gives tree `27e1cf0b11db86c8aede732057dc198f6f067912`, identical to the reviewed head. The reviewer did not push commits, cancel runs, or request a CI rerun. + +The successful push build log records checkout of `35c6bcdde33bf85e8d9826e76693002b26e2977b` and the image tagged with that head. + +The successful PR build log confirms checkout of merge `dc817bac8ee26d4d0cdff6189bc3f6f0f680396e`; its source tree matches the reviewed head. + +The PR `tests (api3_and_osf)` log includes both changed API test modules and reports 2356 passed, 30 skipped and 599579 warnings in 1345.52 seconds. Warnings and skips are reported here as emitted, not counted as failures or as new focused test cases. + +The push `tests (api3_and_osf)` log reports 2356 passed, 30 skipped, 599556 warnings in 1046.99 seconds. + +The push `tests (addons)` log includes `addons/osfstorage/tests/test_views.py` and reports 3437 passed, 10 skipped and 598658 warnings in 1505.50 seconds. Its mandatory `pre-commit run --all-files --show-diff-on-failure` records Flake8 and jshint as Passed; thus R1 is closed under the configured CI lint, not only the isolated E303 check. + +The PR `tests (addons)` log reports 3437 passed, 10 skipped, 598658 warnings in 1285.33 seconds; Flake8 and jshint also pass on the PR merge. + +HTTP 502 errors on the run jobs-list and then an individual-job endpoint were handled by checking individual jobs, then using the PR check rollup with exact identity matching for all 14 jobs and rechecking the run set and PR head. These read failures are not classified as test failures; the final table uses successfully retrieved job conclusions. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +**最終判定: 対象範囲のサーバー側変更は pass。対象 head の CI 全14ジョブが成功した。** + +### 範囲と判断 + +対象は RDM-osf.io-dev2027 PR #14、ブランチ `fix/api-v2-render-url`、head `35c6bcdde33bf85e8d9826e76693002b26e2977b`、base `527eb93a714af2d5ad55d3b3055b4aab858ac100`。自分専用の scratch clone を対象 head に固定し、PR 本文と変更された全5ファイルを読んだ。未解消のソース上の必須修正はなく、事前に指摘した R1 の lint 問題も解消している。API v2 描画の前提となるサーバー側変更として妥当であり、Ember プレビュー全体の修復ではない。最終レビューの合格には、この head の CI 全ジョブ成功も必要である。 + +### Django 2.2 統合と R1 の解消 + +最終 head は merge `b996198257ca5f73a46f4847d69aa38ab924b092` を含む。その親は元の PR head `6bbba6c6` と develop `527eb93a71`(PR #13)の2つである。merge の combined diff に競合解消の変更はない。新しい develop との差分は元の PR の5ファイルだけで、その5ファイルについて元の head から変わったのは、取り込んだ `django.urls` の import と空行1行の削除だけである。描画の経路、クエリの選別、権限検査の順序は保持されている。 + +取り込んだ base は Django 2.2.28/DRF 3.9.4、`framework.sessions.before_request` と `OSFUser.from_cookie` の署名 Cookie の bytes→文字列変換、リージョンの明示的な `Subquery`、外部キー・汎用関連のキャッシュ互換処理、認証バックエンドの引数修正、Django と Flask の Cookie 設定の区別を保持する。本 PR 固有の Django 2.2 互換修正は、新しい import を残すこと以外には不要だった。受入済み PR #13 を基準とする統合確認であり、その migration や管理画面のレビュー全体をやり直したものではない。 + +**R1 は最終判定前に解消した。** 元の head は `TestFileRenderLink` の前に空行が3行あり、指定版 pycodestyle 2.4.0 が E303 を報告した。Flake8 の初期化でもファイルと規則が必須 lint の対象であると確認し、新 head の push 前に連携調整へ阻害事項を報告した。`35c6bcdd` は空行を正確に1行だけ削除し、同じ E303 検査が成功する。試験の assertion や実行時コードは変えていない。ローカルの Flake8 全体実行は、古い Pyflakes が削除済み `ast.Str` を参照するため Python 3.15 では実行環境が適合しなかった。この例外を PR の不具合とせず、lint 完了の証拠にも数えない。設定された lint 全体は CI の `tests (addons)` が担当する。 + +最終 head に対して追加の22件も成功した。実際の Django 2.2.28/DRF 3.9.4、Python 3.9.6、指定版 furl・Werkzeug・itsdangerous と、メモリー内 SQLite の最小モデルを使い、対象ソースの serializer メソッド・リージョン問い合わせ・Cookie 復元を実行した。旧来の bytes のままのセッション検索を負の対照とし、それではセッションが見つからず、保持された decode 後は見つかると確認した。 + +```toon +django22_checks[9]{check,cases,result}: + 対象serializerのURL resolver import,1,成功 + 設定の主キーでなくregionを選ぶSubquery,1,成功 + regionがない場合の既存fallback,1,成功 + 実QueryDictとDRF_Requestからファイルと版のリンクへ,12,成功 + regionの公開downloadと全体設定の内部render,1,成功 + 実CharField検索を使うOSFUserのCookie復元,1,成功 + 不正または欠落Cookieをセッション検索前に拒否,3,成功 + 実検索を使うFlaskのCookie変換式,1,成功 + 旧bytes検索の負の対照,1,期待した未検出を確認 +``` + +これはモデルの代替クラスと抽出した関数を用いる枠組みの境界確認であり、OSF アプリ全体、PostgreSQL の更新、HTTP・ブラウザセッション、C5 の実行ではない。経路・権限の64件もこの head で再実行して成功した。旧 head の CI は develop の変更に合わせて連携調整が取り消したもので、未開始の試験を成功とも製品試験の失敗とも数えず、新 head の合格根拠にも使わない。 + +### 権限と内部ホスト名の開示 + +`addons/base/views.py:1098–1102` は WaterButler の転送先を作る前に `check_contributor_auth` を呼び、ログイン応答があれば先に返す。WaterButler は保存ファイルを取得するサービス。`mode=render` は経路選択の指定であり、認証や「要求元が MFR である」ことの証明ではない。非公開ノードでは、有効な view-only トークンのない匿名 JSON 要求を 401、閲覧権限のないログイン利用者を 403 で拒否し、WaterButler の Location は付かない。匿名ブラウザは既存のログイン経路へ進む。ファイルと版の API もリンクを返す前に対象の閲覧権限を確認する(`api/files/views.py:42–61, 70–77, 148–169`)。 + +**匿名利用者や非共同作業者でも、公開ファイルの内部 WaterButler URL は取得できる。非公開ファイルも、有効な view-only リンクを持っていれば取得できる。** これは許可された閲覧であり、共同作業者の権限を迂回した結果ではない。非公開ファイルの識別子を知っているだけ、または `mode=render`・`_internal`・`base_url` を指定するだけでは閲覧できない。変更されていない WaterButler 認証コールバックもファイル権限を確認する。転送 URL 自体は署名付きの権限付与でも新しい資格情報でもない。 + +API は、公開ファイルを含め、`links.render` の符号化された `url` 引数の中に `INTERNAL_DOMAIN` を意図的に開示する。外側は引き続きブラウザ向けの MFR アドレスである。ブラウザは外側へ要求し、ファイルプレビューを作る MFR が内部 OSF URL とその先の内部 WaterButler を取得する。クライアントが内側の `web:5000` へ直接アクセスする使い方ではない。想定するネットワーク構成で意味があり、旧画面も同じ情報を既に公開している(`addons/base/views.py:1151–1167`)。このサーバー側変更における構成情報の開示は許容できると判断する。ホスト名は秘密情報として扱われておらず、閲覧制御もその秘匿に依存しない。ただし、内部ホスト名を隠せているという評価ではない。 + +リポジトリにある installer 設定は `http://web:5000` と `http://wb:7777` を資格情報の組として設定し、両方を MFR の許可先に含める。PDF・画像をブラウザが取得する部分では、既存の開発環境向けホスト変換と公開 WaterButler の到達性が引き続き必要となる。`PdfRenderer._render` は `munge_url_for_localdev` を使う。実際の到達性や別ポートへの割当ては試験していない。この PR が任意の内部 URL をブラウザで使えるようにするわけではない。 + +### 転送先とサーバー取得先の境界 + +`addons/base/views.py:1104–1114` は `base_url` を削除し、`_internal` を厳密な `mode == 'render'` の結果で上書きする。要求元は既存の描画経路を選べるが、ホストを指定できない。それ以外の mode は従来の公開 WaterButler の選択を保持し、osfstorage ではリージョンのアドレスを使う。同名クエリが重複した場合は、既存の `request.args.to_dict()` の先頭値採用に従う。`api/base/utils.py:207–218` は設定からホストを取り、モデルに由来するパスを加え、残りの要求値をクエリのデータとして扱う。新たな open redirect(攻撃者が指定した任意ホストへの転送)は見つからなかった。修正前の `_internal=1` による内部ホスト選択と、`base_url` の引数衝突は、このエンドポイントでは解消される。 + +描画 URL の生成には URL 専用の符号化、モデルの識別子、固定の描画引数を使う(`api/files/serializers.py:536–576`)。細工した `view_only`・`url`・`_internal`・`base_url` で MFR の取得元ホストは置き換わらない。版の描画リンクは `revision` を保持し、通常の download・HTML リンクは公開ドメインを保持する。 + +統合済み MFR PR #7 のソース `2c4a88a663ca2c659e2b8fe46a2f26e84f206ba9` も読んだ。今回の OSF 変更は MFR の許可先一覧や資格情報の付与を変えない。MFR は最初と転送後の取得先を検証し、自動転送を無効にし、設定された厳密な送信元・送信先の組だけに別 origin への資格情報を許す。対象の組では、MFR が捕捉した Authorization・cookie・cookie クエリ・view-only を OSF から WaterButler へ付与できる。別の保存先をネットワーク上で許可するだけでは、それらの自動転送される資格情報を付与する権限は得られない。この変更による新たな SSRF(サーバーに意図しないネットワーク先を取得させる攻撃)の経路は見つからなかった。この評価は内側の URL の秘匿ではなく、既存 MFR の検証と信頼された配備設定を前提とする。 + +### View-only、旧 C5、Ember の後続対応 + +有効な view-only トークンは引き続き永続ダウンロード経路を許可し、WaterButler のクエリにも保持される。トークンなし、失効済み、不正な値では非公開ファイルの権限を得られない。追加試験は細工したトークンの URL 構造を検査しているが、有効/失効した実際の view-only リンクを API → MFR → OSF → WaterButler 全体へ通す試験ではない。 + +Ember の後続対応では既存の制約に注意が必要である。`get_file_render_link` は内側のクエリを置き換え、API の描画リンクは外側の MFR クエリにも `view_only` を付けない。この欠落は base と head の補助関数の両方で再現した。MFR は自分の外側のクエリに渡されたトークンを転送する。そのため、匿名の view-only 閲覧者に対しては API リンクをそのまま iframe に設定するだけでは足りず、クライアントが安全にトークンを引き継ぐか、リンクの契約を拡張する必要がある。その後続対応で、有効/失効した view-only の結合試験を追加したい。PR #14 が導入した権限回帰ではなく、範囲を限定したサーバー側前提変更の必須修正とはしない。 + +旧 C5 経路は自分で内部 URL を作り、`addon_view_or_download_file` を使う。同関数と `addon_view_file` は base とプログラム構造が同一である。通常の `/download/<id>/` は、明示的な render mode 以外では公開側を保持する。描画時に全体設定の内部 WaterButler を選ぶ動作は旧経路と同じであり、独立した複数リージョンを持つ配備では別途経路確認が必要となる。 + +Ember `d3caa8a` の renderer は `links.download` から MFR の入力を作り、`links.render` は使わない。そのため最初の要求先は依然としてブラウザ向け OSF アドレスになる。永続ダウンロード経路には Ember の画面選択デコレータもなく、旧 GUID 経路で MFR が必要とする転送の代わりに HTML が返る問題を避けられる。PR #14 は意図されたサーバー側の2変更として妥当かつ十分だが、Ember プレビューの成功を主張するには不足する。残るクライアント変更では認証・view-only・版の指定も保持する必要がある。実機 C5 は実行しておらず、ソースの維持や単体試験をブラウザ受入の代わりにはしない。 + +### レビュワの検証と限界 + +対象ソースから抽出した関数と、モデル・要求を模したオブジェクトを使い、64件の確認を実行した。URL ライブラリはリポジトリ指定の `furl 0.4.92` と `Werkzeug 1.0.0`、Python は 3.15.2。経路選択と権限分岐の順序を検査するものであり、稼働する Flask/Django、データベース、DNS、ブラウザの cookie、実ネットワークを試験したものではない。 + +```toon +reviewer_checks[9]{check,cases,result}: + 公開非公開と利用者とview-onlyの組合せ,24,成功 + 設定ホストと要求からの制御,20,成功 + 重複modeの先頭値採用,2,成功 + 匿名ブラウザのWaterButler前ログイン,1,成功 + ファイルGUID版のリンク生成,4,成功 + baseとheadのview-only欠落,2,既存と確認 + MFRの厳密な資格情報の組,1,成功 + MFRの不正または許可外の取得先,7,成功 + MFRの資格情報送信境界,3,成功 +``` + +AST 比較(プログラム構造の比較)で、旧画面・ダウンロード処理、OSF の WaterButler 認証・権限処理、共同作業者の権限確認2関数、WaterButler URL 生成の計7関数が不変と確認した。`git diff --check` は成功し、scratch checkout の追跡対象に変更はない。作者の当初の310件成功・旧実装への差戻しで10件失敗という記載、および merge b996198257 上の Django 2.2 での対象10件成功は、作者の証拠として読み、レビュワの独立実行結果とはしていない。R1 修正後のローカル lint フック成功も報告されているが、Node の取得が404となる jshint はローカルでは省略されており、CI の合格条件を免除するものではない。サービス全体の試験は head の CI に委ねた。追加 API 試験は `tests (api3_and_osf)`、ダウンロード試験は `tests (addons)` に属する。 + +runtime/.env は読まず、Docker コマンドも実行していない。ソース修正・commit・push・approve・merge・close は行っていない。要求された唯一のリモート書込みは PR レビューコメント1件である。残る作業は最終 CI 判定に従う対応、Ember の後続変更、別途の実機 C5・ダウンロード受入である。 + +### 対象 head の CI 結果 + +確認時刻は `2026-11-11T21:01:29.930480+00:00`。CI は GitHub 上の自動検査を指す。各ジョブを個別に記録し、待機中・実行中は合格に数えない。 + +```toon +ci_jobs[14]{run,event,job_id,job,status,result}: + 43067716893,pull_request,130687009199,Analyze (javascript-typescript),completed,success + 43067716893,pull_request,130687010111,Analyze (python),completed,success + 43067716763,pull_request,130687008771,build-image,completed,success + 43067716763,pull_request,130729393337,tests (api3_and_osf),completed,success + 43067716763,pull_request,130729393382,tests (api2),completed,success + 43067716763,pull_request,130729393531,tests (api1_and_js),completed,success + 43067716763,pull_request,130729393541,tests (website),completed,success + 43067716763,pull_request,130729393545,tests (addons),completed,success + 43067702672,push,130686958211,build-image,completed,success + 43067702672,push,130727467845,tests (api3_and_osf),completed,success + 43067702672,push,130727467934,tests (website),completed,success + 43067702672,push,130727468027,tests (api2),completed,success + 43067702672,push,130727468041,tests (addons),completed,success + 43067702672,push,130727468265,tests (api1_and_js),completed,success +``` + +push の workflow は head `35c6bcdde33bf85e8d9826e76693002b26e2977b` を検査する。PR の試験用 merge は `dc817bac8ee26d4d0cdff6189bc3f6f0f680396e` で、親は対象の base と head。GitHub の commit 情報では tree が `27e1cf0b11db86c8aede732057dc198f6f067912` で対象 head と同一である。レビュワは commit の push、CI の取消し、再実行要求を行っていない。 + +成功した push build のログは `35c6bcdde33bf85e8d9826e76693002b26e2977b` の checkout と、その head をタグにしたイメージを記録している。 + +成功した PR build のログでも merge `dc817bac8ee26d4d0cdff6189bc3f6f0f680396e` の checkout を確認した。そのソース tree はレビュー対象 head と一致する。 + +PR の `tests (api3_and_osf)` ログには変更した API テストの両モジュールが含まれ、2356 passed、30 skipped、599579 warnings、1345.52 秒と記録されている。警告とスキップは出力どおり示し、失敗や今回追加した個別ケースの件数として数えていない。 + +push の `tests (api3_and_osf)` ログは 2356 passed, 30 skipped, 599556 warnings in 1046.99 seconds と記録している。 + +push の `tests (addons)` ログには `addons/osfstorage/tests/test_views.py` が含まれ、3437 passed、10 skipped、598658 warnings、1505.50 秒と記録されている。必須の `pre-commit run --all-files --show-diff-on-failure` では Flake8 と jshint の Passed を確認した。R1 は単独 E303 検査だけでなく、設定された CI lint でも解消している。 + +PR の `tests (addons)` ログは 3437 passed, 10 skipped, 598658 warnings in 1285.33 seconds と記録し、PR merge 上でも Flake8 と jshint が成功している。 + +run のジョブ一覧 API と、その後の個別ジョブ API で HTTP 502 が発生したため、個別確認を経て PR のチェック一覧を取得する方式へ切り替えた。全14ジョブの識別子を厳密に照合し、run 一覧と PR head も再確認した。これらの読み取りエラーをテスト失敗とは扱わず、最終表には正常取得した各ジョブの結論を使用する。 diff --git a/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR15_Runserver_Threading_r1.md b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR15_Runserver_Threading_r1.md new file mode 100644 index 0000000..e42d2de --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR15_Runserver_Threading_r1.md @@ -0,0 +1,155 @@ +# PR15 Runserver threading review r1 / PR15 開発サーバのスレッド化レビュー r1 + +> **Summary:** Removing the single-threaded flag addresses Django 2.2 keep-alive blocking, but concurrent development API requests expose a shared file audit-log variable. Changes are required before this review can pass. +> **概要:** 単一スレッド指定の削除は Django 2.2 の接続維持による待ちを解消しますが、開発 API の同時要求によりファイル監査ログの共有変数の問題が表面化します。合格には修正が必要です。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-12. **Learned:** Thread-local middleware does not guarantee that model methods keep every request's state separate. / ミドルウェアがスレッドごとに状態を分けていても、モデルのメソッドまで要求ごとの状態が分離されているとは限りません。 +- Applies to / 対象: RDM-osf.io-dev2027 PR #15, branch `fix/runserver-threading`, head `9999eeda324e00333ddc5a4eab9b130be5cd2033`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Publication / 公開: PR #15, comment 6811970809; 2026-11-12 01:47 UTC. +- Related / 関連: SPEC-06 Documentation Conventions; review index; [findings / 指摘](#findings-en); [verification / 検証](#verification-en). Repository and document names are plain text to preserve publication safety. / 公開可能な形式を保つため、リポジトリ名と文書名は平文で記載します。 +- Used by / 利用先: PR #15 correction and subsequent review / PR #15 の修正と後続レビュー。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +<a id="verdict-en"></a> +### Verdict + +**Not passed — changes required.** One open P2 finding and one failed required CI job prevent a pass. P2 means an ordinary-priority correctness problem that should be fixed before acceptance. P3 is optional test hardening. The acceptance rule also requires every specified CI job, meaning an automated build or test job, to be green on the reviewed head. + +<a id="findings-en"></a> +### Findings + +**R1-01 — P2: make the file audit-log variable request-local before enabling concurrent API requests.** The changed command at `tasks/__init__.py:157` enables concurrent execution of code that still declares `global filelog` in `osf/models/mixins.py:99`. `Loggable.add_log()` assigns a new `FileLog` at lines 119–122 and then reads the global again at lines 123–125; the move/copy/rename branch repeats the pattern at lines 135–141. A second request can replace that object between assignment and save. The first request can consequently save the other user's/project's file log, leaving its own file audit record absent; a supplied log date can also be applied to the wrong object. + +This is reachable from development API requests: `api/files/serializers.py:330–337` calls file tag mutation or `check_in_or_out()`, and `addons/osfstorage/models.py:228` and `:426` call `target.add_log()`. Although the global declaration predates the PR, the development API previously serialized these calls through `--nothreading`; enabling threads exposes the latent race in this execution path. Database transactions and the middleware's thread-local request pointer do not isolate a Python module global. + +A deterministic two-thread harness executed the actual `add_log()` method extracted from the reviewed source, with model persistence replaced by recording doubles. It paused request A at line 123 after assignment, allowed request B to finish, and resumed A. The saved records were `(B, user-B, /B, project-B)` and `(A, user-B, /B, project-B)`, where the first item names the executing request. A control that removed only the `global` declaration from the extracted method produced `(B, user-B, /B, project-B)` and `(A, user-A, /A, project-A)`. This establishes the reference-sharing defect; it is not a claim that a full database-backed HTTP test was run. + +**Requested correction:** remove `global filelog` so the existing assignments use a function-local variable, and add a coordinated two-request/thread regression test that verifies distinct users, projects, paths and log dates remain attached to their own records. Retain the development threading fix after that correction. + +**R1-02 — P3: avoid the extra one-second performance threshold in the functional regression test.** `tests/test_dev_server_tasks.py:84–86` requires the second response to arrive in less than one second, even though the client allows three seconds. A healthy threaded server can fail that assertion if its test process is descheduled for more than a second. Neither local verification nor the two successful CI website jobs exhibited a timing failure. Prefer asserting that the response completes while the first connection is still open, using a generous bounded timeout; this checks the intended behavior without treating runner speed as correctness. + +<a id="verification-en"></a> +### Scope and evidence + +The reviewed diff changes only the two invoke commands and adds one test file. Production WSGI entry points, gunicorn/uWSGI configuration and release dependencies are untouched. Development Compose services invoke these tasks and therefore receive the intended behavior change. Both autoreload modes retain the same command construction. The HTTPS branch also inherits removal of the flag, but was not exercised by the new tests because they force `SECURE_MODE=False`. + +The PR body and historical commit `7b81e6fca5a525325ba893e872be49c6a8200ac5` were read. Its message cites production parity and concurrent transaction errors. The reviewed requirements pin Django 2.2.28. Inspection of that installed version confirms HTTP/1.1 keep-alive, no unconditional close for the unthreaded case, and a `ThreadingMixIn` server when runserver threading is enabled. The two new socket cases reproduce the reported distinction. + +`api_globals`, Celery queues, postcommit queues and `CorsMiddleware._context` use `threading.local()`. API and admin middleware initialize and clear/reset the relevant request state. The PostgreSQL configuration uses `ATOMIC_REQUESTS=True`; Django 2.2.28 stores connections in thread-local storage, and the custom backend's cursor state is on each connection instance. Framework transaction state is attached to Flask's current request context. Framework sessions use a request-keyed weak dictionary and a context-local proxy, rather than one current-session variable; the Django WSGI initializers also disable Flask request-handler attachment. Admin uses Django's request session middleware; the API reads its authentication state from each request. These support concurrency, but do not cure R1-01. The optional profiling middleware keeps instance state but is disabled in the default middleware list. + +A tracked-source search, including hidden workflow/configuration files and excluding `runtime/.env`, found no other executable use of `--nothreading`. Remaining occurrences are the explanatory comment and new tests. Modular-odm/TokuMX references are historical comments, changelog entries, an obsolete filter description, an old wheel-cleanup command and an obsolete Compose helper, rather than a current modular-odm transaction backend. The failover router caches database names/configuration, not a shared transaction connection. + +The website CI matrix entry selects the `tests` directory through `WEBSITE_TESTS`, so the new file is included; the workflow requests one test process. The network tests bind loopback port zero, so the operating system assigns a free port without a separate free-port lookup. The first successful response establishes readiness. The first connection stays open until the second attempt finishes; cleanup closes it before shutting down the server, allowing the unthreaded server to leave its keep-alive wait. Socket waits are bounded at ten seconds for the first client and three for the second. The server thread is a daemon, and shutdown waits for its serving loop. The additional one-second elapsed-time condition is the remaining avoidable timing sensitivity described in R1-02. + +Local verification used Python 3.9.6, Django 2.2.28, invoke 0.15.0 and mock 2.0.0 in a separate scratch environment. All five new test cases passed by directly running the unchanged test functions with the two actual invoke task functions extracted from source and minimal settings; repository-wide fixtures, full application startup and database integration were not loaded. The controlled file-log race and local-variable control also completed as described in R1-01. Local flake8 3.6.0 could not complete because its bundled pyflakes does not understand Python 3.9 AST `Constant` nodes; this is a local tool/runtime mismatch, not a successful lint result. The successful addons job in push run 43125269105 independently reports `Flake8...Passed` from the all-files pre-commit check. Its website job reports `tests/test_dev_server_tasks.py .....`, confirming all five new cases ran successfully with the full repository fixtures; that group completed with 2178 passed and 74 skipped. + +<a id="ci-en"></a> +### CI evidence + +Final observation: 2026-11-12 01:46 UTC. All three runs completed on head `9999eeda324e00333ddc5a4eab9b130be5cd2033`; the PR head was rechecked and remained unchanged. These are observed review results, not a mirror of a canonical data file. + +```toon +runs[3]{id,workflow,event,result,successful_jobs,total_jobs}: + 43125317059,Unit Tests,pull_request,failure,5,6 + 43125269105,Unit Tests,push,success,6,6 + 43125317061,CodeQL,pull_request,success,2,2 +unit_test_jobs[6]{name,pull_request_result,push_result}: + build-image,success,success + tests (addons),success,success + tests (website),success,success + tests (api1_and_js),failure,success + tests (api2),success,success + tests (api3_and_osf),success,success +codeql_jobs[2]{name,result}: + Analyze (python),success + Analyze (javascript-typescript),success +``` + +Run 43125317059 failed in job 130893790880, `tests (api1_and_js)`. The only test error was setup of `api_tests/providers/registrations/views/test_registration_provider_detail.py::TestRegistrationProviderExists::test_registration_provider_with_brand`: `BrandFactory()` raised `django.db.utils.DataError: value too long for type character varying(30)`. The group reported 4360 passed, 47 skipped and one error. `osf_tests/factories.py:1172` uses `factory.Faker('company')` without a length bound, while `osf/models/brand.py:17` limits the name to 30 characters. The test, factory and model are unchanged by this PR. The evidence is consistent with an existing randomized fixture-length defect; it is separate from R1-01 and from the five new development-server tests. This was a database fixture error, not an artifact/cache 404 infrastructure failure. No CI rerun was requested or triggered. + +The push run succeeded in all six jobs, and both CodeQL analyses succeeded. Both website jobs passed. The all-green CI acceptance condition is nevertheless unmet because the pull-request API1/JS job is red. The reproduced R1-01 also remains open. + +<a id="remaining-en"></a> +### Remaining work + +Resolve R1-01, consider R1-02, address the BrandFactory fixture failure, run the regression tests and obtain green results for all required CI jobs on the corrected head, and request another review. Review work was read-only for repository sources. No commit, push, merge, approval, close operation or Docker state change was performed. `runtime/.env` was not read. The sole authorized remote write is the review comment. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +<a id="verdict-ja"></a> +### 判定 + +**不合格(要修正)。** 未解決の P2 指摘一件と、必須 CI ジョブ一件の失敗により、合格にはできません。P2 は受入前に直すべき通常優先度の正しさの問題です。P3 は任意のテスト改善です。受入条件では、確認対象の head に対して、指定された CI ジョブ(自動のビルドやテスト)がすべて成功することも必要です。 + +<a id="findings-ja"></a> +### 指摘 + +**R1-01 — P2: API の同時要求を有効にする前に、ファイル監査ログの変数を要求ごとに分離してください。** `tasks/__init__.py:157` の変更により、`osf/models/mixins.py:99` で `global filelog` を宣言したままの処理が同時に実行されます。`Loggable.add_log()` は 119〜122 行で新しい `FileLog` を代入し、123〜125 行でその共有変数を再び参照します。移動・コピー・名前変更の分岐の 135〜141 行も同じ構造です。代入から保存までの間に別の要求がオブジェクトを置き換えると、先の要求は別ユーザー・別プロジェクトのログを保存し、自分のファイル監査記録を失う可能性があります。日時が指定された場合、その日時も誤ったオブジェクトに適用され得ます。 + +開発 API から到達する経路があります。`api/files/serializers.py:330–337` はファイルタグ操作または `check_in_or_out()` を呼び、`addons/osfstorage/models.py:228` と `:426` は `target.add_log()` を呼びます。共有変数の宣言自体は既存ですが、開発 API では従来 `--nothreading` によってこの処理が直列化されていました。スレッド化により、この経路で潜在的な競合が表面化します。データベースのトランザクションやミドルウェアのスレッド別要求ポインターでは、Python モジュールの共有変数を分離できません。 + +確認対象のソースから実際の `add_log()` を抽出し、モデルの保存部分だけを記録用の代役に置き換えた、実行順序を固定する二スレッドの検証を行いました。代入後の 123 行で要求 A を止め、要求 B を完了させてから A を再開しました。記録は `(B, user-B, /B, project-B)` と `(A, user-B, /B, project-B)` になりました。先頭は実行中の要求です。抽出したメソッドから `global` 宣言だけを除いた対照実験では、`(B, user-B, /B, project-B)` と `(A, user-A, /A, project-A)` になりました。これは参照共有の欠陥を示しますが、実データベースを使う HTTP 統合テストを実施したという意味ではありません。 + +**修正依頼:** `global filelog` を削除し、既存の代入先を関数内のローカル変数にしてください。実行順序を制御する二要求・二スレッドの回帰テストを追加し、各記録のユーザー、プロジェクト、パス、日時が混ざらないことを確認してください。その修正後も開発サーバのスレッド化は維持してください。 + +**R1-02 — P3: 機能回帰テストの追加の一秒性能条件を避けてください。** `tests/test_dev_server_tasks.py:84–86` は、クライアント側が三秒待てる設定でも、一秒未満での応答を要求します。テストプロセスに一秒以上 CPU が割り当てられなければ、正常なスレッド方式でも失敗し得ます。ローカル検証と、成功した二つの CI website ジョブでは、タイミング失敗は観測されませんでした。余裕のある上限時間を使い、一つ目の接続が開いている間に二つ目が応答することを確認すれば、実行環境の速さを正しさの条件にせず目的を検証できます。 + +<a id="verification-ja"></a> +### 範囲と根拠 + +差分は二つの invoke コマンドと追加テスト一ファイルに限られます。本番 WSGI の起動点、gunicorn/uWSGI 設定、リリース依存関係は変更されていません。開発用 Compose サービスはこのタスクを呼ぶため、意図どおり対象になります。自動再読込の有無によるコマンド組立ても保たれます。HTTPS 分岐にも指定削除が及びますが、新テストは `SECURE_MODE=False` に固定するため、その分岐は実行していません。 + +PR 本文と履歴コミット `7b81e6fca5a525325ba893e872be49c6a8200ac5` を読みました。そのメッセージには本番との一致と同時要求でのトランザクションエラーが記されています。依存関係は Django 2.2.28 に固定されています。インストールした同版のソースでは、HTTP/1.1 の接続維持、非スレッド時の無条件な接続切断処理がないこと、スレッド有効時の `ThreadingMixIn` 利用を確認しました。二つの新しいソケットテストでも動作の差を再現しました。 + +`api_globals`、Celery キュー、postcommit キュー、`CorsMiddleware._context` は `threading.local()` を使います。API と管理画面のミドルウェアは対応する要求状態を初期化し、消去・再設定します。PostgreSQL 設定は `ATOMIC_REQUESTS=True` で、Django 2.2.28 の接続はスレッドごとに保持されます。独自バックエンドのカーソル状態も接続インスタンスごとです。フレームワークのトランザクション状態は Flask の現在の要求コンテキストに置かれます。フレームワークのセッションは要求オブジェクトをキーとする弱参照辞書とコンテキスト別プロキシを使い、単一の現在セッション変数ではありません。Django WSGI 初期化では Flask の要求ハンドラー登録も無効にしています。管理画面は Django の要求別セッションミドルウェアを使い、API は各要求から認証状態を読みます。これらは並行実行を支えますが、R1-01 は解消しません。任意のプロファイリング用ミドルウェアはインスタンス状態を持ちますが、既定のミドルウェア一覧では無効です。 + +隠しワークフロー・設定ファイルを含み、`runtime/.env` を除外した追跡ソース検索では、他に実行される `--nothreading` 指定はありませんでした。残るのは説明コメントと新テストです。modular-odm/TokuMX の記述は履歴コメント、変更履歴、古いフィルター説明、古い wheel 削除コマンド、旧 Compose 補助タスクであり、現用の modular-odm トランザクション処理ではありません。フェイルオーバールーターが保持するのはデータベース名と設定で、共有トランザクション接続ではありません。 + +CI の website ジョブは `WEBSITE_TESTS` を通して `tests` ディレクトリを選ぶため、新ファイルも対象です。ワークフローはテストを一プロセスで実行します。ネットワークテストはループバックのポート零に直接 bind し、OS が空きポートを割り当てるため、空きポート検索と利用の間の競合がありません。最初の応答成功が準備完了の確認になります。二つ目の試行終了まで一つ目の接続を開いておき、終了処理ではサーバ停止前に一つ目を閉じるため、非スレッドサーバも接続維持の待ちから抜けられます。ソケット待ちは一つ目が十秒、二つ目が三秒に制限されています。サーバのスレッドはデーモンで、shutdown は処理ループ終了を待ちます。追加の一秒条件は、R1-02 で説明した回避可能なタイミング依存です。 + +ローカル検証は独立した作業領域の Python 3.9.6、Django 2.2.28、invoke 0.15.0、mock 2.0.0 で行いました。実際の二つの invoke タスク関数をソースから抽出し、最小設定で変更していないテスト関数を直接実行したところ、新しい五ケースはすべて成功しました。リポジトリ全体の fixture、完全なアプリ起動、データベース統合は読み込んでいません。ファイルログ競合とローカル変数にした対照実験も R1-01 のとおり完了しました。ローカルの flake8 3.6.0 は、同梱 pyflakes が Python 3.9 の AST `Constant` に対応していないため完了できませんでした。これはローカルの道具と実行環境の不一致であり、lint 成功ではありません。push 実行 43125269105 の成功した addons ジョブでは、全ファイル対象の pre-commit 検査による `Flake8...Passed` を別途確認しました。website ジョブには `tests/test_dev_server_tasks.py .....` が記録され、新しい五ケースがリポジトリ全体の fixture を使って成功したことを確認しました。同グループ全体は 2178 passed、74 skipped でした。 + +<a id="ci-ja"></a> +### CI の根拠 + +最終確認: 2026-11-12 01:46 UTC。三つの実行はすべて head `9999eeda324e00333ddc5a4eab9b130be5cd2033` に対して完了し、PR の head も再確認して変更がないことを確かめました。次はレビューで観測した結果であり、正本データファイルの写しではありません。 + +```toon +runs[3]{id,workflow,event,result,successful_jobs,total_jobs}: + 43125317059,Unit Tests,pull_request,failure,5,6 + 43125269105,Unit Tests,push,success,6,6 + 43125317061,CodeQL,pull_request,success,2,2 +unit_test_jobs[6]{name,pull_request_result,push_result}: + build-image,success,success + tests (addons),success,success + tests (website),success,success + tests (api1_and_js),failure,success + tests (api2),success,success + tests (api3_and_osf),success,success +codeql_jobs[2]{name,result}: + Analyze (python),success + Analyze (javascript-typescript),success +``` + +実行 43125317059 のジョブ 130893790880、`tests (api1_and_js)` が失敗しました。唯一のテストエラーは `api_tests/providers/registrations/views/test_registration_provider_detail.py::TestRegistrationProviderExists::test_registration_provider_with_brand` のセットアップで、`BrandFactory()` が `django.db.utils.DataError: value too long for type character varying(30)` を起こしたものです。グループ全体は 4360 passed、47 skipped、一件の error でした。`osf_tests/factories.py:1172` は長さ制限のない `factory.Faker('company')` を使いますが、`osf/models/brand.py:17` は名前を 30 文字に制限します。このテスト、factory、モデルは PR で変更されていません。根拠は既存のランダムな fixture の長さの問題と整合し、R1-01 と開発サーバの新しい五ケースとは別件です。これはデータベースの fixture エラーであり、artifact/cache の 404 インフラエラーではありません。CI の再実行は依頼・実行していません。 + +push 実行の六ジョブと CodeQL の二解析はすべて成功しました。website ジョブも両方成功しています。ただし pull-request 側の API1/JS ジョブが失敗しているため、CI 全件成功という受入条件は満たしていません。再現した R1-01 も未解決です。 + +<a id="remaining-ja"></a> +### 残作業 + +R1-01 を解消し、R1-02 を検討し、BrandFactory の fixture エラーに対処し、修正後の head で回帰テストとすべての必須 CI ジョブを成功させて、再レビューを依頼してください。リポジトリのソースは読み取り専用でレビューしました。commit、push、merge、承認、close、Docker 状態変更は行っていません。`runtime/.env` は読んでいません。許可されたリモートへの書込みはレビューコメント一件だけです。 diff --git a/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR15_Runserver_Threading_r2.md b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR15_Runserver_Threading_r2.md new file mode 100644 index 0000000..3154243 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR15_Runserver_Threading_r2.md @@ -0,0 +1,153 @@ +# PR15 Runserver threading review r2 / PR15 開発サーバのスレッド化レビュー r2 + +> **Summary:** The follow-up fixes isolate file audit logs, remove an unnecessary timing threshold, and bound generated brand names. The two other shared-state observations can be handled separately because the reviewed development-server change does not introduce a new correctness failure in their checked execution paths. +> **概要:** 追加修正でファイル監査ログを分離し、不要な時間条件を削除し、生成するブランド名の長さを制限しました。ほかの共有状態二件は、確認した実行経路で今回の開発サーバ変更による新しい正しさの問題が生じないため、別件として扱えます。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-12. **Learned:** Shared mutable state must be assessed through the execution path and the values that concurrent calls can exchange; a shared name alone does not establish a regression from development-server threading. / 共有される可変状態は、実行経路と同時呼出しで混ざり得る値を確認して判断する必要があり、共有名があるだけでは開発サーバのスレッド化による回帰を示せません。 +- Applies to / 対象: RDM-osf.io-dev2027 PR #15, branch `fix/runserver-threading`, incremental scope `9999eeda32..e25c636ac0`, head `e25c636ac0a60fafa1d278fbac0192cc77e8c782`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Publication / 公開: PR #15, comment 6814132695; 2026-11-12T04:04:06Z. +- Related / 関連: SPEC-06 Documentation Conventions; review index; PR #15 review r1; AID comment 6812364686; [findings / 指摘](#findings-en); [verification / 検証](#verification-en). Repository and document names are plain text to preserve publication safety. / 公開可能な形式を保つため、リポジトリ名と文書名は平文で記載します。 +- Used by / 利用先: PR #15 acceptance decision and follow-up issue triage / PR #15 の受入判断と後続Issueの整理。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +<a id="verdict-en"></a> +### Verdict + +**Passed.** R1-01 (P2) and R1-02 (P3) are resolved, the BrandFactory fixture is corrected, and no open P1/P2 finding remains in the reviewed scope. All specified CI jobs (automated build, test and analysis jobs) are green on the reviewed head. The wiki and CORS observations are follow-up candidates, not required fixes for PR #15. This is a review conclusion, not a GitHub approval or a merge. + +<a id="findings-en"></a> +### Earlier findings and fixture correction + +**R1-01 — P2: resolved.** Commit `1f64673ce0` removes the `global filelog` declaration from `Loggable.add_log()`. Every read of `filelog` in both the ordinary file-action branch and the move/copy/rename branch follows an assignment in the same function call (`osf/models/mixins.py:120–142`). A search found no external consumer that depends on the removed module variable. Concurrent calls now retain their own FileLog objects, including the user, project, path and optional date. + +The two new tests in `osf_tests/test_loggable_filelog_concurrency.py` check the actual method's local-variable binding and force the previously failing order: A creates a FileLog, B creates and saves its FileLog, then A resumes. The date object's truth test provides synchronization after assignment, and the expected saved records distinguish both users, projects, paths and dates. The test deliberately substitutes recorders for persistence and logging; it proves object isolation, not a database-backed concurrent HTTP transaction. Local execution passed both tests on the corrected method and rejected the old method in both tests. The move/copy/rename branch is covered by inspection of the same local binding, not by the new two-thread test. + +**R1-02 — P3: resolved.** Commit `48405dda36` removes the elapsed-time measurement and one-second assertion. The threaded case requires the second client to receive `ok` within a 30-second socket timeout while the first connection remains open (`tests/test_dev_server_tasks.py:56–91`). The unthreaded control still waits three seconds without receiving a response. Cleanup closes the first connection before server shutdown. These checks preserve the functional distinction without a separate runner-speed requirement. + +**BrandFactory CI fixture error: corrected.** Commit `e25c636ac0` changes only the generated name to `factory.LazyFunction(lambda: fake.company()[:30])` (`osf_tests/factories.py:1173`). This matches `Brand.name`'s 30-character limit (`osf/models/brand.py:17`), leaves explicit factory overrides available, and does not change production model behavior. The existing module-level Faker instance is already used by other factories. Evaluating the exact generator with controlled long ASCII, long Unicode and short strings produced the expected at-most-30-character values. This local check did not instantiate a database-backed Brand; the CI results supply repository-level validation. + +<a id="followups-en"></a> +### Whether the additional shared state blocks PR #15 + +**Wiki `can_start_import`: separate follow-up; no new P1/P2 for this PR.** `addons/wiki/views.py:828–855` resets and returns a module-global boolean, and `:909–930` mutates it during validation. It is a real candidate for per-task state isolation if multiple validations run concurrently inside one process. The checked production-code caller of `project_wiki_validate_for_import_process()` is `addons/wiki/tasks.py:20–22`; the web view queues that task with `.delay()` at `addons/wiki/views.py:820`. The route is in the Flask wiki route table, and the PR changes Django API/admin runserver commands. The checked default Celery configuration does not enable eager execution or a thread pool, and the worker invocation does not select a thread pool. The explicit eager override is in tests. Removing `--nothreading` therefore does not move these validations into concurrent API/admin request threads. A follow-up should replace the global with state returned through the validation call chain and test concurrent validations. This conclusion covers tracked/default configuration; it does not assert safety for a custom eager/threaded Celery deployment. + +**CORS whitelist append: separate follow-up; no new P1/P2 for this PR.** `api/base/middleware.py:112` concatenates `api_settings.ORIGINS_WHITELIST` onto `settings.CORS_ORIGIN_WHITELIST` on every applicable origin check. Both are tuples in the checked configuration. The origins snapshot is loaded by `api/base/wsgi.py:61`, from `api/base/settings/__init__.py:48–56`; no request-path refresh or origin-specific append was found. Concurrent read/concatenate/assign operations can overwrite another append, but each appends the same snapshot and preserves the initial allowed origins. Thus the distinct allowed-origin set does not change with that interleaving; duplicate counts can change. Repeated tuple growth when the snapshot is nonempty is a pre-existing memory/copy-cost defect, also present with serial requests. It should be fixed separately by avoiding per-request mutation, with repeated and concurrent CORS tests. This finding is not a general endorsement of other CORS policy behavior. + +Neither follow-up issue was created during this review: the authorized remote write is exactly one PR comment. + +<a id="verification-en"></a> +### Verification and limits + +Reviewed all three incremental commits and their four changed files, the r1 record, the AID response, the surrounding file-log branches, the wiki task/route/configuration chain, CORS initialization and writes, and CI selection. `git diff --check 9999eeda32..e25c636ac0` passed. The website matrix selects `tests`; the API3/OSF matrix selects `osf_tests`, so both regression files are included in CI. + +Local verification used Python 3.9.6, Django 2.2.28, invoke 0.15.0 and mock 2.0.0. The unchanged new test functions were run against the actual `add_log` method extracted from source, with minimal module stubs; both passed, and both failed against the extracted pre-fix method. The three command cases and two real loopback-socket cases from `tests/test_dev_server_tasks.py` also passed, using the actual task functions extracted from source and minimal settings. These seven local checks did not load repository-wide fixtures, the full application or a database. The BrandFactory generator check was an additional isolated expression check. HTTPS/runsslserver was not exercised. Full application/database coverage is represented by CI, not claimed for these local checks. + +<a id="ci-en"></a> +### CI evidence + +Final observation: 2026-11-12 04:03 UTC. All three runs completed successfully on head `e25c636ac0a60fafa1d278fbac0192cc77e8c782`, and the PR head was rechecked and remained unchanged. All 14 jobs are green. These are observed review results, not a mirror of a canonical data file. + +```toon +runs[3]{id,workflow,event,result,successful_jobs,total_jobs}: + 43139841967,Unit Tests,pull_request,success,6,6 + 43139836889,Unit Tests,push,success,6,6 + 43139841912,CodeQL,pull_request,success,2,2 +unit_test_jobs[6]{name,pull_request_result,push_result}: + build-image,success,success + tests (addons),success,success + tests (website),success,success + tests (api1_and_js),success,success + tests (api2),success,success + tests (api3_and_osf),success,success +codeql_jobs[2]{name,result}: + Analyze (python),success + Analyze (javascript-typescript),success +``` + +The push website log (job 130940456608) reports `tests/test_dev_server_tasks.py .....` and 2178 passed, 74 skipped. The pull-request API3/OSF log (job 130939283182) reports `osf_tests/test_loggable_filelog_concurrency.py ..` and 2358 passed, 30 skipped. The pull-request addons log (job 130939283245) reports `Flake8...Passed` and 3318 passed, one skipped. The pull-request API1/JS job (130939283197), which contains the previously failing brand-backed registration-provider case, succeeded; its Python group reports 4361 passed, 47 skipped, with no test errors. The push API1/JS job also succeeded. No artifact/cache 404 failure occurred in the specified runs, and no CI rerun was requested or triggered. + +<a id="remaining-en"></a> +### Remaining work and review boundaries + +No blocking correction or CI work remains for this review. Track wiki validation state isolation and removal of per-request CORS tuple growth as separate follow-ups if desired. Neither requires expanding PR #15. + +Source review used a separate scratch clone and left it clean. No commit, push, merge, approval, close operation, CI rerun or Docker state change was performed. `runtime/.env` was not read. The only remote write was the single review comment. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +<a id="verdict-ja"></a> +### 判定 + +**合格。** R1-01(P2)と R1-02(P3)は解消し、BrandFactory の fixture も修正され、確認範囲に未解決の P1/P2 指摘はありません。確認対象の head で、指定された CI(自動のビルド・テスト・解析)の全ジョブが成功しています。Wiki と CORS は後続対応の候補であり、PR #15 の必須修正にはしません。これはレビュー判定であり、GitHub の承認操作やマージではありません。 + +<a id="findings-ja"></a> +### 前回指摘とfixture修正 + +**R1-01 — P2: 解消。** コミット `1f64673ce0` は `Loggable.add_log()` から `global filelog` 宣言を削除しました。通常のファイル操作分岐と移動・コピー・名前変更分岐のどちらでも、`filelog` の各読取りの前に、同じ関数呼出し内の代入があります(`osf/models/mixins.py:120–142`)。削除したモジュール変数に依存する外部の参照は検索で見つかりませんでした。同時呼出しでも、それぞれの FileLog と、そのユーザー・プロジェクト・パス・任意の日付が保持されます。 + +`osf_tests/test_loggable_filelog_concurrency.py` の新しい二テストは、実際のメソッドの局所変数への束縛と、以前失敗した実行順序を検査します。A が FileLog を作り、B が別の FileLog を作って保存し、その後 A が再開します。日付オブジェクトの真偽判定で、代入後の実行順序を制御し、保存結果の期待値で両方のユーザー・プロジェクト・パス・日付を区別しています。永続化とログ出力は記録用の代役に置き換えているため、示すのはオブジェクトの分離であり、実データベースを使う同時 HTTP トランザクションではありません。局所実行では修正後のメソッドで二件とも成功し、修正前では二件とも失敗しました。移動・コピー・名前変更分岐については、同じ局所束縛を使うことをコードで確認しており、新しい二スレッドテストでの実行確認ではありません。 + +**R1-02 — P3: 解消。** コミット `48405dda36` は経過時間の計測と一秒条件を削除しました。スレッド方式では、一つ目の接続を開いたまま、二つ目のクライアントが30秒のソケット上限時間内に `ok` を受信することを要求します(`tests/test_dev_server_tasks.py:56–91`)。非スレッド方式の対照は、三秒待っても応答がないことを引き続き確認します。終了処理はサーバ停止より先に一つ目の接続を閉じます。実行環境の速度を別条件にせず、目的の機能差を保った検査になっています。 + +**BrandFactory の CI fixture エラー: 修正済み。** コミット `e25c636ac0` は生成名だけを `factory.LazyFunction(lambda: fake.company()[:30])` に変更しました(`osf_tests/factories.py:1173`)。`Brand.name` の30文字制限(`osf/models/brand.py:17`)に合い、factory 呼出し時の明示的な上書きも維持され、本番モデルの動作は変わりません。既存のモジュールレベルの Faker は、ほかの factory でも使われています。実際の生成式に長い ASCII、長い Unicode、短い文字列を与えると、期待どおり最大30文字の値になりました。この局所検査は実データベースに Brand を作っていません。リポジトリ全体との検証は CI の結果で確認します。 + +<a id="followups-ja"></a> +### 追加の共有状態が PR #15 を妨げるか + +**Wiki の `can_start_import`: 別件対応でよく、今回の新たな P1/P2 にはしません。** `addons/wiki/views.py:828–855` はモジュール全体で共有する真偽値を初期化して返し、`:909–930` が検証中に変更します。同一プロセス内で複数の検証を同時実行する場合には、タスクごとに分離すべき実際の候補です。確認した本番コードで `project_wiki_validate_for_import_process()` を呼ぶのは `addons/wiki/tasks.py:20–22` で、Web view は `addons/wiki/views.py:820` の `.delay()` でタスクをキューに入れます。経路は Flask の Wiki ルート表にあり、この PR が変えるのは Django API/admin の runserver コマンドです。確認した既定の Celery 設定は eager 実行もスレッドプールも有効にせず、worker 起動もスレッドプールを選択しません。明示的な eager 設定はテストにあります。したがって `--nothreading` の削除で、この検証が API/admin の同時要求スレッドへ移るわけではありません。後続対応では、検証の呼出し間で結果として状態を返し、同時検証をテストするのが適切です。この判断は追跡された既定設定を対象とし、独自の eager/スレッド方式の Celery 配備の安全性を保証するものではありません。 + +**CORS 許可リストへの追記: 別件対応でよく、今回の新たな P1/P2 にはしません。** `api/base/middleware.py:112` は、対象の origin 判定ごとに `api_settings.ORIGINS_WHITELIST` を `settings.CORS_ORIGIN_WHITELIST` へ連結します。確認した設定では両方とも tuple です。追加元は `api/base/wsgi.py:61` が起動時に `api/base/settings/__init__.py:48–56` で読み込んだ値で、要求処理中の再読込や、要求元ごとに異なる追記は見つかりませんでした。読取り・連結・代入が同時に進むと別の追記を上書きし得ますが、どちらも同じ起動時の値を追加し、最初から許可された origin を保持します。この実行順序で異なるのは重複数であり、許可される origin の集合は変わりません。追加元が空でない場合に tuple が増え続けるメモリ消費・コピー費用の問題は、直列要求でも存在する既存不具合です。要求ごとの設定変更を避け、反復・同時 CORS テストを追加する別件として直すのが適切です。ほかの CORS 方針全般を承認する判断ではありません。 + +このレビューではどちらの Issue も作成していません。許可されたリモート書込みは PR コメント一件だけです。 + +<a id="verification-ja"></a> +### 検証と限界 + +追加三コミット・変更四ファイル、r1 記録、AID 回答、ファイルログの周辺分岐、Wiki のタスク・経路・設定、CORS の初期化と書込み、CI の選択範囲を確認しました。`git diff --check 9999eeda32..e25c636ac0` は成功しました。website ジョブは `tests`、API3/OSF ジョブは `osf_tests` を選択するため、両方の回帰テストファイルが CI に含まれます。 + +局所検証は Python 3.9.6、Django 2.2.28、invoke 0.15.0、mock 2.0.0 を使いました。実際の `add_log` をソースから抽出し、最小限のモジュールの代役を与えて、新しいテスト関数を変更せず実行しました。二件とも成功し、修正前のメソッドでは二件とも失敗しました。`tests/test_dev_server_tasks.py` のコマンド三ケースと実際のループバック通信二ケースも、ソースから抽出した実際のタスク関数と最小設定で成功しました。この七件の局所検査は、リポジトリ全体の fixture、完全なアプリ、データベースを読み込んでいません。BrandFactory の生成式は追加の独立した式の検査です。HTTPS/runsslserver は実行していません。完全なアプリ・データベースの検証は CI によるもので、局所検査の結果としては主張しません。 + +<a id="ci-ja"></a> +### CI の根拠 + +最終確認: 2026-11-12 04:03 UTC。三つの実行はすべて head `e25c636ac0a60fafa1d278fbac0192cc77e8c782` で成功しました。PR の head も再確認し、変更がないことを確かめました。全14ジョブが成功しています。次はレビューで観測した結果であり、正本データファイルの写しではありません。 + +```toon +runs[3]{id,workflow,event,result,successful_jobs,total_jobs}: + 43139841967,Unit Tests,pull_request,success,6,6 + 43139836889,Unit Tests,push,success,6,6 + 43139841912,CodeQL,pull_request,success,2,2 +unit_test_jobs[6]{name,pull_request_result,push_result}: + build-image,success,success + tests (addons),success,success + tests (website),success,success + tests (api1_and_js),success,success + tests (api2),success,success + tests (api3_and_osf),success,success +codeql_jobs[2]{name,result}: + Analyze (python),success + Analyze (javascript-typescript),success +``` + +push の website ログ(ジョブ 130940456608)には `tests/test_dev_server_tasks.py .....` と 2178 passed、74 skipped が記録されています。pull-request の API3/OSF ログ(ジョブ 130939283182)には `osf_tests/test_loggable_filelog_concurrency.py ..` と 2358 passed、30 skipped が記録されています。pull-request の addons ログ(ジョブ 130939283245)は `Flake8...Passed`、3318 passed、一件の skipped です。前回失敗したブランド付き registration-provider のケースを含む pull-request の API1/JS ジョブ(130939283197)も成功し、Python グループは 4361 passed、47 skipped、テストエラーなしでした。push の API1/JS ジョブも成功しました。指定実行に artifact/cache の404による失敗はなく、CI 再実行の依頼・実行もしていません。 + +<a id="remaining-ja"></a> +### 残作業とレビューの境界 + +このレビューの合格を妨げる修正・CI 作業は残っていません。Wiki 検証状態の分離と、要求ごとの CORS tuple 蓄積の除去は、必要に応じて別の後続課題として追跡してください。どちらも PR #15 の範囲を広げる必要はありません。 + +独立した作業用 clone でソースをレビューし、変更のない状態を保ちました。commit、push、merge、承認、close、CI 再実行、Docker 状態変更は行っていません。`runtime/.env` は読んでいません。リモート書込みはレビューコメント一件だけです。 diff --git a/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r6.md b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r6.md new file mode 100644 index 0000000..9019836 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r6.md @@ -0,0 +1,411 @@ +# REV-PR8-R6 Mandatory authentication review / 認証必須化レビュー + +> **Summary:** The session-cleanup and Django 2.2 regressions are resolved, and the Yjs/render merge preserves the reviewed boundaries. R6-03 and R6-04 are resolved. The expanded audit finds R6-05: permission-aware child counts still include inaccessible legacy-public children. Final-head CI is also pending. +> **概要:** セッション後始末と Django 2.2 の回帰は解消し、Yjs/render のマージは確認済みの境界を維持しています。R6-03・R6-04 は解消しました。拡大監査で、閲覧できない旧公開子を認可済み件数に含める R6-05 を確認しました。最終 head の CI も待機中です。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-12. **Learned:** Private-mode authorization must cover metadata and permission-aware counts as well as content; test cleanup must query fresh state. / 非公開モードの認可は内容だけでなくメタデータと認可済み件数も覆い、試験の後始末は最新状態を再照会する必要があると分かりました。 +- Applies to / 対象: RCOSDP/RDM-osf.io-dev2027 PR #8, `163aba5a0f0276f34139ee5d9a3257daf7e347da..71e26d2751f30fbd74650ffdd7db7feafefa01be`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Published comment / 投稿コメント: PR #8 comment 6810129361; body verified / 本文の一致を確認。 +- Related / 関連: SPEC-06 Documentation Conventions; review index; 2026-11-11_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r5.md; PR #8 AID response comments 6799606134, 6799737361, 6802467588, 6805966824, 6808390836, 6809154740, and 6809886943. +- Used by / 利用先: PR #8 coordinator and the next integration decision / PR #8 の連携調整担当と次の統合判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Changes requested (R6-05 / P2). CI is incomplete at the cutoff.** R5-01 is closed. The intermediate regressions R6-01 and R6-02 are closed in `f991bc2720` and `c9d293dd1a`. R6-03 is closed in `efee5aa47e`, and R6-04 is closed in `71e26d2751`. Their fixes remain intact. The expanded independent public-flag audit finds one open P2: authorization-aware child counts still accept inaccessible legacy-public children. Final-head CI remains required. + +The reviewed range is `163aba5a..71e26d2751`: 32 commits including inherited develop history, 157 changed files, 3,994 added and 1,286 removed lines. It covers renewal cleanup; develop PR #13 (Django 2.2.28) via `6068daad82` and compatibility fixes `ce27dbdfe8`/`c9d293dd1a`; PRs #12 (Yjs) and #14 (render URL) via `cf5079ffc1`, plus `9f2a1ac5aa` tests; wiki authorization `efee5aa47e`; and citation plus repository-wide public-flag repair `71e26d2751`. The session test bodies/parameters and workflow definitions remain unchanged. Cancelled older-head runs do not establish final-head success. This continuation reuses the predecessor's saved evidence and adds a separate reviewer clone and independent source probes. + +### R5-01 — P2, closed: remove replacement sessions + +**Location:** `api_tests/base/test_session_expiry_http.py:82–93`. + +The fixture (test setup and cleanup) saves the owner identifier and the primary keys before deleting rows. Lines 84–85 delete every Session whose JSON `auth_user_id` equals the owner identifier, then delete the initial Session by primary key. The second deletion covers `missing_user`, which rewrites that JSON value. Deleting an already absent session is harmless. The project and owner are deleted afterward. Server shutdown and thread joins still happen before any row deletion. + +Lines 90–93 use new QuerySets (database query objects) to check that the owner's sessions, initial session, project, and owner are absent. All 18 parameterized cases share this cleanup: 9 cookie cases, 3 other-credential cases, and 6 WaterButler cases. The JSON filter matches both SessionFactory and OSFUser.get_or_create_cookie; Session uses Django's normal QuerySet manager. An unrelated owner's session remains untouched in the independent probe. + +### R6-01 — P2, closed: do not reuse a populated QuerySet cache + +**Affected intermediate location:** `api_tests/base/test_session_expiry_http.py:84,90` at `beb16c84ed`. **Resolution:** lines 84–93 at `f991bc2720`, unchanged through reviewed head `71e26d2751`. + +The intermediate code calls `list(owner_sessions)` and later asserts `not owner_sessions.exists()`. The first call fills the QuerySet's result cache. Django 1.11.28, pinned at `requirements.txt:66` in that intermediate revision, returns the cache's truth value from `exists()` when it has been populated. Deleting individual model objects does not clear that QuerySet cache. The assertion therefore fails even when the database contains no matching rows. + +The author's extracted proof uses a fake QuerySet whose `exists()` always checks current rows, so it cannot detect this defect. The independent probe uses the actual Django 1.11.28 `__iter__`, `__len__`, `_fetch_all`, and `exists` method bodies, together with the unmodified fixture cleanup extracted from each revision. It reproduces 15 teardown assertion failures among 18 simulated cases on the intermediate revision; the two `deleted` cases and the single `missing_user` case have an empty owner-query cache. The repaired code checks fresh QuerySets and has zero such failures under both Django 1.11.28 and 2.2.28 method bodies. R6-01 is historical evidence, not an open request against the final head. + +### R6-02 — P2, closed in c9d293dd1a: update URL pattern inspection + +**Affected location:** `api_tests/waffle/views/test_private_javascript.py:157,190` at `ce27dbdfe8`; fixed at lines 158 and 191 in `c9d293dd1a`. + +Django 2.2 URLResolver and URLPattern objects hold their regex through `pattern.regex`; they no longer expose a direct `regex` attribute. At `ce27dbdfe8`, both checks use `pattern.regex.pattern`, so they raise AttributeError before checking the registered URL expressions. Changing the admin URL walker class names alone does not finish the compatibility update. + +PR Unit Tests run 43066876617, api2 job 130727124935, fails with 5 failed, 1,694 passed, and 4 skipped. The four private debug-path cases fail at line 157; the public registration case fails at line 190. The private cases already received 404 before the exception, so this is a test compatibility regression, not evidence that a debug endpoint was exposed. + +The independent `url-compat-probe.py` uses the actual Django 2.2.28 URLResolver/URLPattern constructor bodies and extracted assertion expressions. It reproduces the AttributeError for both branches. The proposed access `pattern.pattern.regex.pattern` passes valid private/public inputs and still rejects a leaked private debug route and a missing public debug route. Results are saved as `url-compat-probe.json`; the CI log is `ci-ce27-pr-api2.log`. + +**Resolution:** Commit `c9d293dd1a` updates both paths to `pattern.pattern.regex.pattern`. Parsed-source comparison confirms that those two attribute paths are the only behavioral changes: the four private HTTP checks, response-content exclusions, public silk/debug registrations, and namespace assertion remain. The final-source probe (`url-final-probe.py` and `url-final-probe.json`) passes valid private/public cases for both URLPattern and URLResolver and rejects both invalid cases for each class. No check is skipped and no exception is masked. The author reports 44 passing waffle tests under Django 2.2.28 with `ENABLE_PUBLIC_ACCESS=true`, matching ordinary api2 CI; an earlier run with the default false setting had 41 passing tests and three anonymous-access 401 failures. REV did not rerun the author’s disposable services. + +### R6-03 — P1, closed in efee5aa47e: legacy public wiki flags bypass private authorization + +**Affected locations at `9f2a1ac5aa`:** `addons/wiki/views.py:254–260,269–288`; `website/project/decorators.py:450–453`; `api/wikis/permissions.py:14,17,26`. + +With `ENABLE_PUBLIC_ACCESS=false`, an active logged-in outsider passes the authentication gate. A project created public before that setting was disabled may retain `is_public=true` and `is_publicly_editable=true`. Even when the node's canonical `can_view` and `can_edit` both refuse that outsider, `_can_edit_wiki` accepts the editable flag and the renewal endpoint mints a room token. The write decorator likewise invokes the edit body without checking WRITE. API v2's page and version permissions accept the public flag for reads even when public editing is disabled, and its page permission accepts the editable flag for writes. `WikiMixin.get_wiki` loads the page by ID and applies those object permissions; it adds no independent parent-read check. Anonymous authentication rejection alone therefore does not close the authenticated outsider's access. + +The exact extracted method bodies reproduce token-minting, entry into the decorated write body, and permission grants for page GET/POST and version GET with no READ/WRITE permission. Removing the stored public flags makes all those controls deny access. Evidence: `wiki-private-probe.py` and `wiki-private-probe.json`. This is an executable source-logic reproduction using in-memory collaborators, not a real HTTP/DB run or JWT cryptographic test. + +**Scope decision at discovery, adopted by the owner:** Fix this in PR #8. Although inherited and unchanged by the latest merge, it contradicts PR #8's stated promise that public flags confer no access in private mode, and the coordinator explicitly included this decision. It exposes wiki contents and permits editing or collaborative-session access to unrelated authenticated accounts. Restrict public/editable exceptions to `ENABLE_PUBLIC_ACCESS=true`; in private mode use the canonical node visibility/editing and WRITE checks. Add real-request regression cases for legacy-public data across anonymous, outsider, READ, and WRITE users, including wiki renewal/edit and API page/version content. Preserve the intended public-mode behavior. Do not defer this as a separate-PR limitation while reporting pass. + +**Resolution:** `efee5aa47e` adds the computed `NodeSettings.public_editing_in_effect` property at `addons/wiki/models.py:488–494`. It combines the existing instance setting with the stored editable flag without changing stored data. `_can_edit_wiki`, the page's `?edit` branch, the write decorator, and API write permission use this property. API page/version read permissions at `api/wikis/permissions.py:15,28` now gate the public exception on `ENABLE_PUBLIC_ACCESS`; canonical node visibility remains the fallback. + +The final-source `wiki-final-probe.py` passes 12 combinations of private/public mode, stored editable flag, and outsider/READ/WRITE roles, using the actual new property as well as the permission bodies. Private outsiders cannot read, edit, or renew; readers retain read access without editing or tokens; writers remain allowed. Public mode preserves the editable exception. The pre-fix run failed on the legacy-public outsider API read even with editing disabled. Results: `wiki-final-probe-before-fix.out` and `wiki-final-probe.json`. The Yjs/render probe also passes again on `efee5aa47e` (`new-integration-probe-final.json`), and the final static audit is `final-integration-static.json`. + +The added `tests/test_private_wiki_public_flags.py` has 27 WebTest request tests, included both in the ordinary website job and the private-security task. They cover token renewal, page tokens, legacy edit GET, web/API v1 edit POST, five API v2 read paths, version creation, rename, and page creation, with anonymous/outsider/READ/WRITE cases and public-mode controls. Settings, the signing secret, and search-index updates are patched; the authorization and application request paths are real. The author reports 27 passed, 11 failures when all three authorization files are reverted, and 4/4/3 failures for individual reverts. The author also reports 138 private-mode tests passed and 592 public-regression tests passed with one Elasticsearch connection failure reproduced on the previous head. REV did not rerun the disposable services; final CI remains required. + +### R6-04 — P1, closed in 71e26d2751: legacy-public citations bypass private authorization + +**Locations:** `api/nodes/views.py:878,900` (`NodeCitationDetail` and `NodeCitationStyleDetail`) at `efee5aa47e`. + +Both getters accept `node.is_public` without checking `ENABLE_PUBLIC_ACCESS`. In private mode, an authenticated outsider with no node access can therefore obtain CSL data or a formatted citation for a known legacy-public node. `NodeMixin.get_node` does call object permissions, but these views declare only `IsAuthenticatedOrReadOnly` and `TokenHasScope`; their object-permission methods both return true. The subsequent manual check skips `node.can_view(auth)` when the stored public flag is true. `node.csl` includes the title, contributor names, ID/URL and, where present, DOI/date. This contradicts PR #8's private-mode promise and exposes project metadata to unrelated accounts. + +The independent reproduction uses actual DRF 3.9.4 BasePermission, IsAuthenticatedOrReadOnly and APIView.check_object_permissions methods, plus the actual TokenHasScope, NodeMixin.get_node and both citation getters. Both return data to the outsider with `ENABLE_PUBLIC_ACCESS=false` and `node.can_view=false`; clearing `is_public` causes PermissionDenied. ORM and citation rendering are stand-ins, so no real HTTP/DB or CSL rendering is claimed. Evidence: `citation-private-probe.py`, `citation-private-probe.json`, `drf-3.9.4-permissions.py`, and `drf-3.9.4-views.py`. + +**Scope decision at discovery:** Fix within PR #8, as explicitly requested for review by the coordinator. The condition is inherited, but the public-flag bypass violates the access policy being introduced here. Use canonical node visibility or guard the public exception with the instance setting, then add real-request cases for both citation endpoints covering anonymous/outsider/READ/WRITE users on legacy-public data and public-mode compatibility. + +**Resolution of R6-04:** `71e26d2751` guards both public exceptions at `api/nodes/views.py:879,901` with `website_settings.ENABLE_PUBLIC_ACCESS`, preserving `node.can_view(auth)` and the authenticated 403 / anonymous 401 distinction. The final-source probe passes all 24 combinations of the two citation getters, private/public mode, stored public/private state, and outsider/READ/WRITE roles. It uses the real extracted DRF permission methods and application getters with simulated ORM/rendering; it is not an HTTP/PostgreSQL run. Evidence: `citation-final-probe.py` and `citation-final-probe.json`. The new real-request tests cover both endpoints for anonymous, outsider, reader and writer in private mode and an outsider in public mode. R6-04 is closed. + +### R6-05 — P2, open: permission-aware child counts still trust stored public flags + +**Location at `71e26d2751`:** `api/nodes/serializers.py:715` in `NodeSerializer.get_node_count`; the same SQL also retains an unconditional view-only-link branch at line 728. + +A logged-in user with READ on a parent but no access to its child can request `GET /v2/nodes/<parent>/?related_counts=children`. The child's legacy `is_public=true` alone includes it in `data.relationships.children.links.related.meta.count`, even with `ENABLE_PUBLIC_ACCESS=false`. Clearing only the child's stored flag removes it from the count. The ordinary children endpoint filters through `can_view` and does not include this child in private mode. This exposes the number of inaccessible formerly public children and makes the API's count disagree with its authorized list. The method expressly promises a count of children the user may view; existing public-mode tests also require count/list agreement. This is not merely displaying a flag on an already authorized object, so classification A in AID comment 6809886943 is incorrect for this occurrence. + +Evidence: `children-count-probe.py` executes the SQL extracted from the actual method against an in-memory SQLite database, adapting only placeholders and PostgreSQL's implicit EXISTS column names. With parent-only READ, it returns 1 for an inaccessible legacy-public child, 0 after clearing its public flag, and 1 after granting explicit child READ. A private-link-only child likewise counts as 1. The source contains no instance-setting check. `children-count-probe.json` records those results. This validates the query logic; no real HTTP or PostgreSQL reproduction is claimed. The API wiring is `api/nodes/serializers.py:372–375`, `api/base/serializers.py:670–687`; the authorized list is `api/base/views.py:491–503` and `osf/models/node.py:151–167`; existing count/list expectations are in `api_tests/nodes/views/test_node_detail.py:396–452`. + +**Required correction:** In private mode, count exactly the non-deleted direct children that the canonical visibility query allows, ignoring both legacy public flags and view-only links. Retain explicit READ, OSF/Mapcore group and inherited parent ADMIN access, with no duplicate counts. Add actual-request regressions comparing `related_counts=children` to the children list for a parent reader, an authorized child reader, parent administrators and groups, plus private/public mode controls. The new `tests/test_private_public_flag_boundaries.py` does not exercise this query. R6-05 prevents a pass independently of CI. + +### Independent public-flag audit + +The independent scan covered `api/`, `website/`, `addons/`, `osf/`, `framework/`, and `admin/` using `is_public`, `is_publicly_editable`, `__is_public`, `ever_public`, `comment_level`, public querysets, publication predicates and raw SQL. The focused Python scan returned 294 lines (including definitions, comments and two test-file matches); the wider public-word scan returned 744 lines. Those are scan-line counts, not distinct access decisions. Test and migration matches were separated from runtime logic, and management-command matches were considered non-request code. Evidence: `public-flags-all.txt`, `public-wide-scan.txt`, and `aid-audit-comment.json`. + +The 15 changes are valid private-mode restrictions. Public-only institution lists, meeting lists/submissions and popularity lists become empty; citation/comment reads, public commenting, linked-log titles and collection serialization retain their explicit authorization alternatives; search parents no longer gain a title/URL solely from a public flag. `public-mode-ast-check.py` substitutes the enabled setting, removes unreachable new guards, inlines the new local public alias, and normalizes the citation Boolean expression and BooleanField conversion. All 15 changed functions have equivalent parsed structure to `efee5aa47e` under public mode. This structural check does not replace request tests. Evidence: `public-mode-ast-check.json`. + +Both deferrals to the global gate are justified for current call paths. `NodeLogFileParamsSerializer.get_node_title` only uses the public shortcut for an anonymous request; authenticated callers require READ. The API global gate rejects anonymous private-mode requests before serialization. `Comment.get_content` is reached as the comments serializer's method source after the corrected comment permissions and the API gate. Its method alone is not a complete authorization boundary, and future standalone callers must not rely on it. No current request bypass was found in these two deferrals. + +AID's A–I grouping is substantially supported, with the child-count exception R6-05. Some category labels are approximate: `Registration.is_embargoed` calculates state, and `embargo_registration` can revoke publicity; neither is an independent read grant. Other display predicates serialize state after access has been established or do not select protected contents. The profile's public-project number is an aggregate on an already directory-visible user, alongside an unfiltered total, rather than an authorization-aware child-list count. Moderator queries require `view_submissions` or `view_actions`; `ModeratorIfNeverPublicWithdrawn` is ANDed with `ContributorOrPublic` and `PreprintPublishedOrWrite` in both current callers. Publication/state transitions remain subject to private-mode publication guards; they do not grant reads by themselves. External storage visibility checks run after the node visibility check in `website/util/rubeus.py:240–246`. OAuth scope visibility and cryptographic public keys are unrelated to project publicity. Indexing public flags does not grant private-mode search access: `website/search/util.py:455–492` replaces all public alternatives, including the metadata helper, with current database-authorized identifiers. SHARE and DOI outbound methods retain explicit setting guards. + +The AID table is not a complete occurrence inventory. The independent expansion also checked `osf/models/user.py:2082,2216` (`ever_public` restricts account deletion/deactivation), `osf/utils/machines.py:96,157,283` (state/history), the public predicates in `website/search/util.py` and `addons/metadata/search.py` (overridden in private mode), and admin occurrences (serialized state, publication revocation, or conference configuration behind admin and view-specific permissions). `framework/auth/oauth_scopes.py` uses the separate OAuth-scope meaning, and `admin/base/middleware.py` marks public login/bootstrap views rather than data visibility. These omitted occurrences do not supply another public-flag authorization bypass. No unrestricted access query was found beyond R6-05 in the expanded scan; this is a source audit, not proof that every application route is defect-free. + +### Behavior decisions and regression coverage + +- `admin/meetings/serializers.py:18` now reports zero valid public submissions in private mode because it shares `Conference.valid_submissions`. This is consistent with disabling the public meeting catalogue and does not remove stored submissions or change administrative permissions. An independent total-submission count would be a separate administration feature, not a reason to restore public visibility. +- `website/search/elastic_search.py:674` hides every parent title/URL in private-mode search, including when the caller might have access to the parent. That conservative result is acceptable for this security change. Showing authorized parents later requires passing user context and checking parent visibility; retaining a stored-public shortcut would be incorrect. +- `website/conferences/utils.py:42–43` still attempts public creation when `conference.public_projects` is true. `AbstractNode.set_privacy` rejects that in private mode, and `add_poster_by_email` wraps creation/provisioning in a transaction, before attachment upload and the success email. The ordinary anonymous `meeting_hook` is also outside the global guard's signed-service exceptions. This fails closed and was already imposed by PR #8's private-mode policy; `71e26d2751` does not introduce that incompatibility. A private-deployment email-submission workflow needs an explicit follow-up design (disable the public option or support private submissions with authenticated service handling), not an exception to publication authorization. It is not an additional P1/P2 against the reviewed audit patch. + +`tests/test_private_public_flag_boundaries.py` contains 32 inherited test methods. It builds legacy-public data while the setting is true, then switches modes before real WebTest requests; authorization methods are not stubbed. It covers citations, comments, log pointers, institutions, API/web meetings, collections, parent search through an actual Elasticsearch index, and popularity population with only the external Keen read replaced. Positive/public-mode twins exist for the changed paths; several inherited anonymous checks deliberately do nothing in public mode, so 32 is the collection count, not 32 independent boundary assertions. The file is registered in `PRIVATE_SECURITY_TESTS` and also runs through the ordinary website suite's `tests` path. The workflow still has five ordinary test shards and no private-security/admin shard. + +AID reports 32 passes in each ambient setting, nine failures when the whole fix is reverted and a failure for every one of 15 individual reversions, plus 891 passed / 10 skipped public regressions. AID's separate private-security run reports 340 passed / 1 failed due to the disposable ES2 image lacking `sort_file_name` mapping, reproduced on `efee5aa47e`. These are attributed author results, not REV reruns. The ordinary CI website shard covers the new tests, but ordinary CI does not itself prove that the complete private-security task passed. REV reran source probes, structural checks and syntax validation without starting application services. + +### Validation and limits + +The following is an observation record, not canonical configuration. Probe counts describe simulated storage, not executions of the complete application HTTP tests. + +```toon +source_review: + base: 163aba5a0f0276f34139ee5d9a3257daf7e347da + head: 71e26d2751f30fbd74650ffdd7db7feafefa01be + commits_including_develop: 32 + changed_files: 157 + lines_added: 3994 + lines_removed: 1286 + syntax_python_files: 133 + session_http_test_body_and_parameter_ast: unchanged + python_syntax: passed + git_diff_check: passed +probe: + cases: 18 + base_cases_with_renewal_session_residue: 4 + intermediate_assertion_failures: 15 + final_assertion_failures: 0 + final_cases_with_fixture_row_residue: 0 + unrelated_session_preserved_cases: 18 + deliberately_broken_deletions_detected: 4 + django_versions: [1.11.28, 2.2.28] +``` + +Negative controls deliberately preserve, in turn, owner sessions, the rewritten initial session, the owner, or the project. All four are rejected by final-head assertions. The independent artifacts are named `final-probe.py`, `final-probe.json`, `django-query-1.11.28.py`, `old.py`, and `intermediate.py`, plus `probe-django22.json`, `integration-probe.py`, and `integration-probe.json`; they remain in reviewer scratch storage, outside the public record. This probe models deletion and storage in memory. It verifies the cache-sensitive assertion logic, not PostgreSQL JSON lookup, cascade behavior, or real HTTP behavior. + +The author reports a separate disposable PostgreSQL 9.6 run: all 18 HTTP cases passed, old cleanup left 4 Session rows, final cleanup left zero sessions/users/projects, and a subsequent `osf_tests/test_session.py` run passed all 6 tests in the same database. That is attributed author evidence from comment 6799737361, not a database run repeated by REV. + +The ordinary CI matrix includes `api_tests/base` through `api3_and_osf`, so it includes the changed HTTP file. The `private_security` task still is not a matrix entry. Prior real-service and browser acceptance requirements remain outside this narrow follow-up review. + +### Django 2.2 integration + +Merge `6068daad82` has parents `f991bc2720` and develop `527eb93a71`. Git's remerge comparison shows only the newly added empty merge migration beyond the automatic merge. Static checks confirm the following integration properties. + +- The admin middleware still runs after session and authentication middleware. The removed Django `SessionAuthenticationMiddleware` is absent, while `AdminLoginRequiredMiddleware` and every explicit public-route wrapper are preserved. +- `before_request` and `OSFUser.from_cookie` retain exactly the prior function structure after removing the newly added UTF-8 decode from the comparison. The expiry and disabled-user rejection paths are therefore retained alongside the Django 2.2 string lookup fix. API cookie authentication is unchanged. +- The relevant visibility functions in collection, node, preprint, and user models remain unchanged. Shared-user search, wiki boundary code, and the R4 search regression test are byte-identical to `f991bc2720`. +- The admin test's parsed source is identical after renaming `RegexURLPattern`/`RegexURLResolver` to `URLPattern`/`URLResolver`. The pinned Django 2.2.28 source defines the latter classes. Public-view expectations and traversal logic are unchanged. +- Static traversal of 501 osf migration files finds one leaf, `0277_merge_20261112_1200`, depending on both `0276_merge_20261102_1312` and `0276_django22_builtin_view_permissions`. Its operations list is empty; the within-osf graph has no missing dependency or cycle. This is graph inspection, not a migration run. + +The author reports 59 passing tests under Django 2.2.28 in disposable containers with migrations through 0277: admin middleware, Django 2.2 login HTTP, cookie lifetime, and the real HTTP session suite. REV did not rerun those services. At that integration stage, the reviewer compiled all 122 changed Python files and checked the preserved behavior structurally; runtime integration is assessed through final-head CI. + +### Yjs and render integration + +Merge `cf5079ffc1` has parents `c9d293dd1a` and develop `73ff43b3c2`. Its remerge diff is empty: no manual change beyond the automatic merge. The follow-up `9f2a1ac5aa` adds nine private-mode tests only. The full audit is saved in `new-integration-static.py` and `new-integration-static.json`. + +The file Yjs helpers and render functions are structurally identical to develop. File renewal is absent from the global authentication exceptions and checks login, current WRITE, file ownership, provider, checkout, and known current room before minting a token. Superseded-room deletion occurs only after those checks. The delete helper is an internal outbound call, not an OSF route; its separate token carries `purpose=delete`, a room identifier, and a short expiry to a configured destination. The render download route is also absent from the exceptions; `check_contributor_auth` precedes URL generation, ignores public/view-only privileges in private mode, and rejects unauthorized users. `mode=render` only selects the configured internal host; incoming `base_url` is removed and `_internal` is overwritten. + +The independent extracted-source probe passes 24 global-gate cases, nine file-renewal cases, six render cases, and delete-token claim/destination assertions. Denied renewals do not mint or delete; denied downloads do not generate a WaterButler URL. Evidence: `new-integration-probe.py` and `new-integration-probe.json`. Collaborators and storage are simulated, decorators omitted; this is not a full request or cryptographic integration test. + +The original wiki same-node lookup, parent restriction, and all three boundary regression methods are preserved. Session cleanup, URL-regex repair, admin guards, visibility models, authentication handlers, migration graph, and workflows are unchanged from `c9d293dd1a`. ShareJS draft routes and broadcasts stay removed. R6-03 records the subsequent repair of the legacy wiki authorization exceptions; the merge audit alone did not establish their safety. + +The author reports 59 passing tests in private mode and 266 passing selected wiki/Yjs/render tests in public mode (111 deselected), using disposable Django 2.2.28/PostgreSQL services. An earlier private-mode run of public-data fixtures failed during setup; it is not final CI evidence. REV did not repeat those services. The nine new tests in `tests/test_private_service_callbacks.py` are included by the ordinary website job's `tests` directory; the separate `private_security` matrix entry remains absent. Source inspection and author evidence must not be called a successful private_security CI shard. + +### CI on the exact final head + +The retained old-head push run 43047429438 completed successfully in all six jobs (build-image, addons, website, api1_and_js, api2, api3_and_osf). Its api3_and_osf log records 18 passing session HTTP cases and 6 passing session-model tests; the job total is 2,420 passed and 30 skipped. The session-model tests occur before the HTTP fixture in that log, so this CI result is not represented as the requested post-fixture session-count check. The author’s separate same-database follow-up supplies that attributed evidence. + +CodeQL run 43092627328 attempt 1 failed in both language jobs at `Upload SARIF as artifact`. Both `Perform CodeQL Analysis` steps succeeded. The artifact service returned `Failed to CreateArtifact: Received non-retryable error: Failed request: (404) Not Found: workflow run not found`. This is recorded as a CI infrastructure failure, not an additional source finding; that attempt did not satisfy the all-green gate. Evidence: `ci-c9-codeql.json`, `ci-c9-codeql-failed.log`, and `ci-c9-codeql-run.json`. + +Previous-head (`c9d293dd1a`) PR Unit Tests run 43092627054, api2 job 130786027885, succeeds with 1,699 passed and 4 skipped. Its completed log records all 25 cases in `api_tests/waffle/views/test_private_javascript.py` passing (24 plus 1 in separate log lines), including the five formerly failing cases. Evidence: `ci-c9-pr-api2.log`. + +The coordinator reran the failed CodeQL jobs without changing the head. Attempt 2 of the same run completed successfully in both languages, including artifact upload. Evidence: `ci-c9-codeql-attempt2.json` and `ci-c9-codeql-attempt2-run.json`. + +Previous-head (`c9d293dd1a`) PR api3_and_osf job 130786028248 succeeds with 2,420 passed and 30 skipped. The completed log records all 18 session HTTP cases and all six session-model tests passing. The six model tests precede the HTTP cases here as well, so this confirms CI execution without replacing the author’s post-fixture same-database check. Evidence: `ci-c9-pr-api3.log`. + +At the review cutoff, 2026-11-12 08:53:30 JST (2026-11-11 23:53:30 UTC), both CodeQL language jobs succeeded. Both Unit Tests runs were still building the image; their five dependent test jobs had not yet been created. There is no final-head test-suite pass or failure to report yet, and the all-green condition is not satisfied. R6-05 independently requires changes. No artifact/cache 404 failure was present at this cutoff, so the conditional infrastructure-failure escalation was not triggered. + +The following observation includes every expected job; `not_created` is not a GitHub job identifier, and `not_started` is not a successful or skipped result. Evidence: `ci-43121482940.json`, `ci-43121495551.json`, and `ci-43121495509.json`. + +```toon +ci_snapshot: + observed_at_utc: 2026-11-11T23:53:30Z + head: 71e26d2751f30fbd74650ffdd7db7feafefa01be + jobs[14]{run,event,name,job_id,result}: + 43121482940,push,build-image,130862787383,in_progress + 43121482940,push,addons,not_created,not_started + 43121482940,push,website,not_created,not_started + 43121482940,push,api1_and_js,not_created,not_started + 43121482940,push,api2,not_created,not_started + 43121482940,push,api3_and_osf,not_created,not_started + 43121495551,pull_request,build-image,130862829160,in_progress + 43121495551,pull_request,addons,not_created,not_started + 43121495551,pull_request,website,not_created,not_started + 43121495551,pull_request,api1_and_js,not_created,not_started + 43121495551,pull_request,api2,not_created,not_started + 43121495551,pull_request,api3_and_osf,not_created,not_started + 43121495509,pull_request,python,130862828828,success + 43121495509,pull_request,javascript-typescript,130862829244,success +``` + +The final local check compiles all 133 added/modified Python files in memory; `git diff --check` succeeds. Historical SyntaxWarnings are recorded without treating them as syntax errors. There are 157 changed files in total, including four deletions. Previously reviewed session/waffle/wiki/global-gate/admin/Yjs regression files and workflow definitions are unchanged by `71e26d2751` except for the explicitly reviewed new audit code and task registration. Evidence: `final-source-check.json`; the reviewer clone is clean. Full private-security execution, remaining CI jobs and the R6-05 correction need subsequent verification. + +All review work used a separate scratch clone, GitHub reads, and local proof scripts. No application services or Docker state were changed; no runtime environment file was read. No commit, push, approval, merge, or close was performed. One Japanese PR review comment accompanies this record as the only GitHub write. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**Changes requested(R6-05 / P2)。確定時点の CI は未完了です**。R5-01 は解消です。中間回帰の R6-01・R6-02 は `f991bc2720`・`c9d293dd1a`、R6-03 は `efee5aa47e`、R6-04 は `71e26d2751` で解消し、修正は維持されています。公開フラグの独立した拡大監査で、閲覧できない旧公開子を認可済み件数に含める P2 が1件残りました。最終 head の CI も必要です。 + +範囲は `163aba5a..71e26d2751`、develop の履歴を含む32コミット、157変更ファイル、追加3,994行・削除1,286行です。更新セッションの後始末、develop PR #13(Django 2.2.28)の取込み `6068daad82` と互換修正 `ce27dbdfe8`/`c9d293dd1a`、PR #12(Yjs)・#14(render URL)の取込み `cf5079ffc1` と `9f2a1ac5aa` の試験、wiki 認可 `efee5aa47e`、citation と全体の公開フラグ修正 `71e26d2751` を覆います。セッション試験の本体/パラメータと workflow 定義は不変です。取消済み旧 head の実行は最終 head の成功証拠にしません。継続レビューは前担当の保存証拠を引き継ぎ、別のレビュワ clone と独立したソース probe を追加しました。 + +### R5-01 — P2、解消: 更新後のセッションも削除する + +**箇所:** `api_tests/base/test_session_expiry_http.py:82–93`。 + +fixture(試験の準備と後始末)は、行を削除する前に利用者識別子と各主キーを保存します。84–85 行は JSON 内の `auth_user_id` が対象利用者と一致する Session をすべて削除し、初期 Session も主キーで削除します。後者は JSON の値を書き換える `missing_user` を対象に含めるためです。削除済みのセッションにも対応します。その後にプロジェクトと利用者を削除します。行削除より前のサーバー停止とスレッド終了待ちは維持しています。 + +90–93 行は新しい QuerySet(データベースへの問合せを表すオブジェクト)で、利用者の全セッション・初期セッション・プロジェクト・利用者が存在しないことを確認します。Cookie 9 件、他の資格情報 3 件、WaterButler 6 件の全 18 ケースがこの後始末を共有します。JSON の絞り込みは SessionFactory と OSFUser.get_or_create_cookie の両方に対応し、Session は Django 標準の QuerySet manager を使っています。独立 probe では無関係な利用者のセッションを保持できました。 + +### R6-01 — P2、解消: 評価済み QuerySet のキャッシュを再利用しない + +**中間版の問題箇所:** `beb16c84ed` の `api_tests/base/test_session_expiry_http.py:84,90`。**解消箇所:** `f991bc2720` の 84–93 行で、対象 head `71e26d2751` まで同一です。 + +中間版は `list(owner_sessions)` の後に `not owner_sessions.exists()` を検査します。最初の呼出しは QuerySet の結果キャッシュを埋めます。その中間版の `requirements.txt:66` で固定する Django 1.11.28 の `exists()` は、評価済みならキャッシュの真偽値を返します。モデルを個別に削除しても、その QuerySet のキャッシュは消えません。そのため、データベースに一致する行がなくても検査が失敗します。 + +作者の抽出 proof の偽 QuerySet は `exists()` で毎回現在の行を確認するため、この不具合を検出できません。独立 probe は Django 1.11.28 の実際の `__iter__`・`__len__`・`_fetch_all`・`exists` のメソッド本体と、各版から変更せず抽出した後始末を使いました。中間版の模擬 18 ケース中 15 件で後始末の検査失敗を再現しました。`deleted` の 2 件と `missing_user` の 1 件は利用者検索キャッシュが空です。修正版は新しい QuerySet で確認し、Django 1.11.28・2.2.28 の両方の実メソッドでこの失敗は 0 件になりました。R6-01 は経緯の証拠であり、最終 head に対する未解決の変更要求ではありません。 + +### R6-02 — P2、c9d293dd1a で解消: URL パターン検査を更新する + +**問題箇所:** `ce27dbdfe8` の `api_tests/waffle/views/test_private_javascript.py:157,190`。`c9d293dd1a` の 158 行・191 行で解消しています。 + +Django 2.2 の URLResolver と URLPattern は `pattern.regex` を通して正規表現を保持し、直下に `regex` 属性を持ちません。`ce27dbdfe8` の両検査は古い `pattern.regex.pattern` を使うため、登録した URL の正規表現を調べる前に AttributeError になります。管理画面の URL 走査クラス名を変えるだけでは互換対応が完了しません。 + +pull-request の Unit Tests 実行 43066876617、api2 ジョブ 130727124935 は 5 failed・1,694 passed・4 skipped で失敗しました。非公開時の debug パス 4 件は 157 行、公開時の登録 1 件は 190 行で失敗します。非公開の各ケースは例外より前に 404 を受け取っており、debug 入口が公開された証拠ではなく試験の互換回帰です。 + +独立した `url-compat-probe.py` は Django 2.2.28 の実際の URLResolver/URLPattern コンストラクタ本体と、抽出した検査式を使い、両分岐の AttributeError を再現します。修正案の `pattern.pattern.regex.pattern` は正常な非公開・公開入力を通し、非公開側への debug 入口混入と公開側の入口欠落は引き続き拒否します。結果は `url-compat-probe.json`、CI ログは `ci-ce27-pr-api2.log` に保存しました。 + +**解消:** `c9d293dd1a` は両方を `pattern.pattern.regex.pattern` に更新しました。解析後のソース比較により、動作の差はその属性参照 2 箇所だけで、非公開側の HTTP 4 ケース・応答内容の除外、公開側の silk/debug 登録・namespace 検査は維持されていると確認しました。最終ソースの probe(`url-final-probe.py`・`url-final-probe.json`)では、URLPattern と URLResolver の両方で正常な非公開・公開ケースが通り、各クラスの異常ケース 2 種を拒否しました。検査のスキップや例外の隠蔽はありません。作者は Django 2.2.28 と通常 api2 CI に対応する `ENABLE_PUBLIC_ACCESS=true` で waffle 全 44 件成功を報告しています。それ以前の既定 false の実行では、41 件成功・匿名アクセスの 401 による失敗 3 件でした。REV は作者の使い捨てサービスを再実行していません。 + +### R6-03 — P1、efee5aa47e で解消: 旧公開 wiki のフラグが非公開モードの認可を迂回する + +**`9f2a1ac5aa` での問題箇所:** `addons/wiki/views.py:254–260,269–288`、`website/project/decorators.py:450–453`、`api/wikis/permissions.py:14,17,26`。 + +`ENABLE_PUBLIC_ACCESS=false` でも、有効なログイン済み非共同作業者は認証ゲートを通ります。切替前の公開プロジェクトには `is_public=true`・`is_publicly_editable=true` が残り得ます。node の正規の `can_view`・`can_edit` が両方拒否しても、`_can_edit_wiki` は編集可フラグだけで許し、更新 API は部屋のトークンを発行します。編集 decorator も WRITE を検査せず本体を呼びます。API v2 のページ・版の権限は、公開編集が無効でも読取りで公開フラグを許し、ページの書込みでは編集可フラグを許します。`WikiMixin.get_wiki` は ID でページを取得してこのオブジェクト権限を検査し、独立した親ノードの閲覧権限検査は足しません。匿名の拒否だけでは、ログイン済み非共同作業者のアクセスを防げません。 + +抽出した実メソッドの実行で、READ/WRITE がなくてもトークン発行、編集本体への到達、ページ GET/POST・版 GET の許可を再現しました。保存済み公開フラグを外す対照では、すべて拒否されます。証拠は `wiki-private-probe.py`・`wiki-private-probe.json` です。メモリ上の協力オブジェクトを使うソースロジックの再現で、実 HTTP/DB や JWT 暗号署名の試験ではありません。 + +**発見時の範囲判断(所有者が採用):** PR #8 内で修正が必要です。最新マージ以前からのコードですが、非公開モードでは公開フラグが権限を与えないという #8 の明記した方針と矛盾し、調整担当もこの判断を明示的に範囲へ含めました。無関係なログイン済みアカウントに wiki 内容を公開し、編集や共同編集への参加を許す影響があります。公開・公開編集の特例は `ENABLE_PUBLIC_ACCESS=true` に限定し、非公開モードは node の正規の閲覧・編集権限と WRITE を使う必要があります。旧公開データに対する匿名・非共同作業者・READ・WRITE の実リクエスト回帰を、wiki 更新トークン・編集と API ページ・版の内容に追加し、公開モードの意図した挙動も維持してください。別 PR の残件にして pass とすることはできません。 + +**解消:** `efee5aa47e` は `addons/wiki/models.py:488–494` に計算プロパティ `NodeSettings.public_editing_in_effect` を追加しました。既存のインスタンス設定と保存済み編集フラグを組み合わせ、保存データは変えません。`_can_edit_wiki`、画面の `?edit` 分岐、編集 decorator、API の書込み権限がこれを使います。API ページ・版の読取り(`api/wikis/permissions.py:15,28`)も公開例外に `ENABLE_PUBLIC_ACCESS` を必要とし、node の正規の閲覧判定を残します。 + +最終ソースの `wiki-final-probe.py` は、新プロパティと実際の権限メソッドを使い、private/public・保存済み編集フラグ・outsider/READ/WRITE の 12 組合せを通りました。非公開の非共同作業者は閲覧・編集・更新トークンを拒否され、READ はトークンや編集なしで閲覧でき、WRITE は許可されます。公開モードの編集特例も維持します。修正前の実行は、編集が無効でも旧公開ノードの非共同作業者 API 読取りで失敗しました。結果は `wiki-final-probe-before-fix.out`・`wiki-final-probe.json` です。Yjs/render の probe も `efee5aa47e` で再び成功し(`new-integration-probe-final.json`)、最終静的監査は `final-integration-static.json` にあります。 + +追加した `tests/test_private_wiki_public_flags.py` は WebTest のリクエスト試験 27 件で、通常 website ジョブと private-security タスクの両方に含まれます。トークン更新、画面内トークン、旧編集 GET、Web/API v1 編集 POST、API v2 読取り 5 経路、版作成、改名、ページ作成を、匿名・非共同作業者・READ・WRITE と公開モードの対照で検査します。設定・署名秘密・検索索引更新は patch しますが、認可とアプリのリクエスト経路は実処理です。作者は 27 件成功、認可 3 ファイルを戻すと 11 件失敗、個別に戻すと 4/4/3 件失敗を報告しています。別途、非公開モード 138 件成功、公開回帰は 592 件成功と旧 head でも再現する Elasticsearch 接続失敗 1 件を報告しています。REV は使い捨てサービスを再実行しておらず、最終 CI の確認は必要です。 + +### R6-04 — P1、71e26d2751 で解消: 旧公開 citation が非公開モードの認可を迂回する + +**箇所:** `efee5aa47e` の `api/nodes/views.py:878,900`(`NodeCitationDetail`・`NodeCitationStyleDetail`)。 + +両 getter は `ENABLE_PUBLIC_ACCESS` を見ずに `node.is_public` を許します。そのため非公開モードでも、対象ノードを知るログイン済み非共同作業者が CSL データまたは整形した citation を取得できます。`NodeMixin.get_node` はオブジェクト権限を呼びますが、両ビューの権限クラスは `IsAuthenticatedOrReadOnly` と `TokenHasScope` だけで、両方のオブジェクト権限は true を返します。その後の手動検査は保存済み公開フラグが true なら `node.can_view(auth)` を省略します。`node.csl` は題名・著者名・ID/URL、存在すれば DOI/日付を含みます。#8 の非公開モードの方針に反し、無関係なアカウントへプロジェクトの情報を漏らします。 + +独立再現は DRF 3.9.4 の実際の BasePermission・IsAuthenticatedOrReadOnly・APIView.check_object_permissions と、実際の TokenHasScope・NodeMixin.get_node・両 citation getter を使います。`ENABLE_PUBLIC_ACCESS=false`・`node.can_view=false` でも両方が非共同作業者へデータを返し、`is_public` を外す対照では PermissionDenied になります。ORM と citation renderer は模擬し、実 HTTP/DB・CSL 描画の実行とはしていません。証拠は `citation-private-probe.py`・`citation-private-probe.json`・`drf-3.9.4-permissions.py`・`drf-3.9.4-views.py` です。 + +**発見時の範囲判断:** 調整担当が明示的に追加レビューを求めた箇所として、PR #8 内で修正が必要です。既存の条件ですが、ここで導入する公開フラグ無効化のアクセス方針を迂回します。node の正規の可視性を使うか、公開例外をインスタンス設定で制限し、両 citation 経路で旧公開データの匿名・非共同作業者・READ・WRITE と公開モード互換の実リクエスト回帰を追加してください。 + +**R6-04 の解消:** `71e26d2751` は `api/nodes/views.py:879,901` の公開例外に `website_settings.ENABLE_PUBLIC_ACCESS` を追加し、`node.can_view(auth)` とログイン済み 403/匿名 401 の区別を維持しました。最終ソースの probe は、citation の2 getter・公開/非公開モード・保存済み公開/非公開・非共同作業者/READ/WRITE の全24組合せで成功しました。実際の DRF 権限メソッドと getter を抽出し、ORM と描画を模擬する検証であり、HTTP/PostgreSQL 実行ではありません。証拠は `citation-final-probe.py`・`citation-final-probe.json` です。追加した実リクエスト試験は、両入口で非公開モードの匿名・非共同作業者・READ・WRITE と、公開モードの非共同作業者を検査します。R6-04 は解消です。 + +### R6-05 — P2、未解決: 閲覧可能な子ノード件数が旧公開フラグを信頼する + +**`71e26d2751` の箇所:** `api/nodes/serializers.py:715` の `NodeSerializer.get_node_count`。同じ SQL の728行には、設定を見ない閲覧専用リンクの例外も残っています。 + +親だけに READ を持ち、子を閲覧できないログイン済み利用者が `GET /v2/nodes/<parent>/?related_counts=children` を要求すると、子の旧 `is_public=true` だけで `data.relationships.children.links.related.meta.count` に数えられます。`ENABLE_PUBLIC_ACCESS=false` でも同じです。子の保存済み公開フラグだけを false にすると件数から消えます。通常の子一覧は `can_view` で絞るため、非公開モードではこの子を返しません。閲覧できない旧公開子ノードの数が分かり、認可済み一覧と件数も食い違います。このメソッドは閲覧可能な子の数を返すと明記しており、既存の公開モード試験も件数と一覧の一致を要求します。認可済みオブジェクトのフラグを表示するだけではないため、AID コメント6809886943の分類 A はこの箇所について誤りです。 + +証拠の `children-count-probe.py` は実メソッドから SQL を抽出し、プレースホルダと PostgreSQL の EXISTS の暗黙列名だけを適応して、メモリ上の SQLite で実行します。親だけ READ の利用者について、権限のない旧公開子は1、公開フラグを消すと0、子の明示 READ を与えると1になります。閲覧専用リンクだけの子も1になり、ソースにはインスタンス設定の検査がありません。`children-count-probe.json` に結果を保存しました。SQL の論理の検証であり、実 HTTP/PostgreSQL の再現とはしていません。API の接続は `api/nodes/serializers.py:372–375`・`api/base/serializers.py:670–687`、認可済み一覧は `api/base/views.py:491–503`・`osf/models/node.py:151–167`、既存の件数/一覧の期待は `api_tests/nodes/views/test_node_detail.py:396–452` にあります。 + +**必要な修正:** 非公開モードでは正規の可視性クエリが許可する、削除されていない直下の子だけを数え、旧公開フラグと閲覧専用リンクを無視してください。明示 READ、OSF/Mapcore グループ、親 ADMIN の継承を保ち、重複を数えないようにしてください。親の READ 利用者、子の READ 利用者、親の管理者とグループについて、`related_counts=children` と子一覧を比較する実リクエスト回帰と、公開/非公開の対照が必要です。新しい `tests/test_private_public_flag_boundaries.py` はこのクエリを検査していません。CI の結果にかかわらず、R6-05 が pass を妨げます。 + +### 公開フラグの独立監査 + +`api/`・`website/`・`addons/`・`osf/`・`framework/`・`admin/` を、`is_public`・`is_publicly_editable`・`__is_public`・`ever_public`・`comment_level`・公開 queryset・公開判定・直接 SQL で独立検索しました。Python の限定検索は294行(定義・コメント・試験ファイルの2行を含む)、public の語を広く検索すると744行でした。検索の行数であり、権限判定の数ではありません。試験と migration は実行時の論理と分け、管理コマンドはリクエスト外として確認しました。証拠は `public-flags-all.txt`・`public-wide-scan.txt`・`aid-audit-comment.json` です。 + +15箇所の変更は非公開モードの妥当な制限です。公開専用の機関一覧・会議一覧/投稿・人気一覧は空になり、citation/コメント閲覧・公開コメント投稿・ログのリンク先題名・コレクション情報には明示認可の代替経路が残ります。検索の親題名/URL は公開フラグだけでは出ません。`public-mode-ast-check.py` は設定 true を代入し、到達しない新規ガードを除き、追加した公開判定変数を展開し、citation の論理式と BooleanField の変換を正規化します。15関数すべてで公開モードの解析構造が `efee5aa47e` と一致しました。これは構造の検証であり、リクエスト試験の代用ではありません。証拠は `public-mode-ast-check.json` です。 + +全体ゲートに委ねた2箇所は、現在の呼出し経路では妥当です。`NodeLogFileParamsSerializer.get_node_title` の公開特例は匿名時だけで、ログイン済みなら READ が必要です。非公開モードでは API の全体ゲートが serializer より先に匿名を拒否します。`Comment.get_content` は、修正後のコメント権限と API ゲートを通ったコメント serializer のメソッド参照として呼ばれます。メソッド単体は完全な認可境界ではないため、将来の独立した呼出し元はこれだけに依存できません。現在の2経路では迂回を確認していません。 + +AID の A〜I 分類は、子件数の R6-05 を除き概ね裏付けられます。一部の分類名は厳密ではなく、`Registration.is_embargoed` は状態計算、`embargo_registration` は公開取消を含む処理ですが、どちらも単独で閲覧を許可しません。他の表示判定は認可後の状態を表示するか、保護対象の内容を選び出しません。プロフィールの公開プロジェクト数は、ディレクトリで見える利用者について全件数と併記する集計で、認可済み子一覧の件数とは用途が異なります。モデレーター向けクエリは `view_submissions` または `view_actions` が必要で、`ModeratorIfNeverPublicWithdrawn` の現在の2呼出し元は `ContributorOrPublic`・`PreprintPublishedOrWrite` と AND です。公開化/状態変更は非公開モードの公開化ガードに従い、単独で閲覧を許可しません。外部ストレージの公開状態は `website/util/rubeus.py:240–246` の node 閲覧検査後に使います。OAuth スコープの公開属性と暗号の公開鍵はプロジェクト公開とは別です。索引の公開フラグだけでは非公開検索を許さず、`website/search/util.py:455–492` が metadata helper を含む全公開条件を現在の DB 権限による識別子に置換します。SHARE/DOI の送信にも明示した設定ガードが残っています。 + +AID の表は、出現箇所の完全な一覧ではありません。独立した追加確認では、`osf/models/user.py:2082,2216` の `ever_public`(アカウント削除/無効化の制限)、`osf/utils/machines.py:96,157,283`(状態/履歴)、`website/search/util.py`・`addons/metadata/search.py` の公開条件(非公開モードでは上書き)、admin の出現箇所(状態表示・公開取消・管理者および個別権限の下の会議設定)も調べました。`framework/auth/oauth_scopes.py` は別の OAuth スコープの意味、`admin/base/middleware.py` はデータの公開ではなくログイン等の公開入口を表します。これらの表から漏れた箇所に、別の公開フラグによる認可迂回はありませんでした。拡大した検索では R6-05 以外の無条件のアクセスを許すクエリを見つけていませんが、ソース監査であり全経路に不具合がないことの証明ではありません。 + +### 挙動の判断と回帰試験 + +- `admin/meetings/serializers.py:18` は `Conference.valid_submissions` を共用するため、非公開モードでは有効な公開投稿が0件になります。公開会議一覧の無効化と整合し、保存済み投稿や管理者権限は変えません。管理用の全投稿数が必要なら別の管理機能で扱い、公開例外を戻す理由にはなりません。 +- `website/search/elastic_search.py:674` は非公開検索で全ての親題名/URL を隠し、親に権限がある利用者についても同じです。今回のセキュリティ修正では保守的な結果として許容します。将来、認可済みの親を表示するなら利用者の情報を渡して親の可視性を検査し、保存済み公開フラグの例外を使わない設計が必要です。 +- `website/conferences/utils.py:42–43` は `conference.public_projects=true` なら引き続き公開化を試みます。非公開モードでは `AbstractNode.set_privacy` が拒否し、`add_poster_by_email` は作成/設定を transaction 内で処理して、添付アップロードと成功メールより前に失敗します。通常の匿名 `meeting_hook` も全体ゲートの署名済みサービス例外に含まれません。拒否側に倒れる挙動であり、PR #8 の非公開方針で既に生じる非互換で、`71e26d2751` の新規問題ではありません。非公開運用のメール投稿には、公開オプションを無効化するか、認証済みサービスによる非公開投稿を設計する別途の対応が必要で、公開化の認可を迂回させる対応は不適切です。今回の監査修正に対する追加 P1/P2 とはしません。 + +`tests/test_private_public_flag_boundaries.py` は継承分を含め32試験メソッドです。設定 true で旧公開データを作り、モードを切り替えてから WebTest の実リクエストを実行し、認可メソッドは模擬しません。citation・コメント・ログのリンク先・機関・API/Web 会議・コレクション・実 Elasticsearch 索引を使う親検索・人気一覧生成を覆い、最後の項目では外部 Keen の読取りだけを差し替えます。変更経路には許可側/公開モードの対照がありますが、公開モードで何もしない継承済み匿名検査もあるため、32は収集件数であり独立した境界検査32個ではありません。`PRIVATE_SECURITY_TESTS` に登録され、通常 website ジョブの `tests` にも含まれます。workflow は通常試験5分割のままで、private-security/admin の分割はありません。 + +AID は環境設定の false/true 両方で32件成功、全修正を戻すと9件失敗、15箇所を個別に戻すと毎回失敗、公開回帰は891 passed / 10 skipped と報告しています。別の private-security 全体は340 passed / 1 failed で、使い捨て ES2 に `sort_file_name` mapping がなく、`efee5aa47e` でも再現したとの報告です。これらは作者に帰属する結果で、REV の再実行ではありません。通常 CI の website は新規試験を覆いますが、通常 CI だけで private-security 全体の成功とは言えません。REV はサービスを起動せず、ソース probe・構造比較・構文検証を実行しました。 + +### 検証と限界 + +次は観測記録であり、設定の正本ではありません。probe の件数は模擬ストレージの結果で、アプリ全体の HTTP 試験の実行件数ではありません。 + +```toon +source_review: + base: 163aba5a0f0276f34139ee5d9a3257daf7e347da + head: 71e26d2751f30fbd74650ffdd7db7feafefa01be + commits_including_develop: 32 + changed_files: 157 + lines_added: 3994 + lines_removed: 1286 + syntax_python_files: 133 + session_http_test_body_and_parameter_ast: unchanged + python_syntax: passed + git_diff_check: passed +probe: + cases: 18 + base_cases_with_renewal_session_residue: 4 + intermediate_assertion_failures: 15 + final_assertion_failures: 0 + final_cases_with_fixture_row_residue: 0 + unrelated_session_preserved_cases: 18 + deliberately_broken_deletions_detected: 4 + django_versions: [1.11.28, 2.2.28] +``` + +負の対照では、利用者のセッション・識別子を書き換えた初期セッション・利用者・プロジェクトを順に故意に残し、最終 head の検査が 4 種すべてを拒否しました。独立検証の成果物名は `final-probe.py`・`final-probe.json`・`django-query-1.11.28.py`・`old.py`・`intermediate.py` に加え、`probe-django22.json`・`integration-probe.py`・`integration-probe.json` です。公開記録とは別にレビュワの scratch 領域へ保存しています。probe は削除と保存先をメモリ上で模擬します。キャッシュの影響を受ける検査ロジックを確認するものであり、PostgreSQL の JSON 検索・関連行削除・実 HTTP の検証ではありません。 + +作者は、使い捨ての PostgreSQL 9.6 で HTTP 全 18 ケースが成功し、旧版は Session 4 行が残り、最終版はセッション・利用者・プロジェクトの残留が 0 行、続けた同じ DB の `osf_tests/test_session.py` 全 6 件も成功したと報告しています。これはコメント 6799737361 による作者の証拠であり、REV が再実行した DB 試験ではありません。 + +通常 CI の `api3_and_osf` は `api_tests/base` を含むため、変更した HTTP 試験ファイルも対象です。`private_security` タスクは依然として matrix にありません。以前からの実サービス・ブラウザ受入は、この狭い追加レビューの範囲外として残ります。 + +### Django 2.2 の取込み + +マージ `6068daad82` の親は `f991bc2720` と develop `527eb93a71` です。Git の再マージ比較では、自動マージとの差は新しい空の merge migration だけでした。静的検査で次の統合状態を確認しました。 + +- 管理画面のガードはセッション・認証 middleware より後に残っています。廃止された Django の `SessionAuthenticationMiddleware` はなく、`AdminLoginRequiredMiddleware` と明示した公開入口の wrapper はすべて維持しています。 +- `before_request` と `OSFUser.from_cookie` は、比較時に追加の UTF-8 decode を除くと従来と同じ関数構造です。期限切れ・無効利用者の拒否を保ったまま、Django 2.2 向けの文字列検索修正を取り込んでいます。API の Cookie 認証は不変です。 +- collection・node・preprint・user の該当可視性関数は不変です。共有相手検索、wiki の境界コード、R4 の検索回帰試験も `f991bc2720` とバイト単位で同一です。 +- 管理画面の試験は、`RegexURLPattern`/`RegexURLResolver` を `URLPattern`/`URLResolver` に読み替えると解析後のソースが同一です。固定した Django 2.2.28 のソースは後者を定義しています。公開ビューの期待値と走査処理は不変です。 +- osf migration 501 ファイルの静的な接続確認では、終端は `0277_merge_20261112_1200` の 1 件で、`0276_merge_20261102_1312` と `0276_django22_builtin_view_permissions` の両方に依存します。操作一覧は空で、osf 内の依存欠落・循環はありません。これは接続の検査であり、migration の実行ではありません。 + +作者は、使い捨てコンテナの Django 2.2.28 と 0277 までの migration で、管理画面 middleware・Django 2.2 のログイン HTTP・Cookie 寿命・実 HTTP セッションの試験が計 59 件成功したと報告しています。REV はそのサービスを再実行していません。その統合段階では、変更した Python 122 ファイルの構文と動作を保つ構造を確認し、実行時の統合は最終 head の CI で判定します。 + +### Yjs と render の取込み + +マージ `cf5079ffc1` の親は `c9d293dd1a` と develop `73ff43b3c2` です。再マージ差分は空で、自動マージ以外の手動変更はありません。続く `9f2a1ac5aa` は非公開モードの試験 9 件だけを追加します。監査は `new-integration-static.py`・`new-integration-static.json` に保存しました。 + +ファイル Yjs の helper と render 関数は develop と同じ構造です。ファイルの更新 API は全体認証の例外に入っておらず、ログイン・現在の WRITE・ファイル所属・provider・checkout・既知の現在の部屋を調べてからトークンを発行します。置換済みの部屋の削除もその検査後です。削除 helper は OSF の経路ではなく内部からの送信で、別トークンの `purpose=delete`・部屋識別子・短い期限を使い、設定済みの宛先へ送ります。render のダウンロードも例外に含まれず、URL 生成より先に `check_contributor_auth` が動き、非公開モードでは公開・閲覧専用リンクの特権を無視して権限なし利用者を拒否します。`mode=render` は設定済み内部ホストを選ぶだけで、要求の `base_url` は削除し `_internal` は上書きします。 + +実ソースを抽出した独立 probe は、全体ゲート 24 ケース、ファイル更新 9 ケース、render 6 ケースと削除トークンの claim・宛先検査を通りました。拒否した更新は発行・削除せず、拒否したダウンロードは WaterButler URL を生成しません。証拠は `new-integration-probe.py`・`new-integration-probe.json` です。協力オブジェクトと保存先は模擬し decorator は除いており、リクエスト全体や暗号の結合試験ではありません。 + +wiki の同一ノード検索・親制限と越境回帰の 3 メソッドは維持されています。セッション後始末、URL-regex 修正、管理画面ガード、可視性モデル、認証 handler、migration 接続、workflow は `c9d293dd1a` から不変です。ShareJS の下書き経路・broadcast は削除したままです。既存 wiki の認可特例の後続修正は R6-03 に記録し、このマージ監査だけで安全と判断したものではありません。 + +作者は、使い捨て Django 2.2.28/PostgreSQL サービスで非公開モード 59 件成功、公開モードの wiki/Yjs/render 選択試験 266 件成功(111 deselected)を報告しています。先行した非公開モードでの公開データ fixture は準備で失敗しており、最終 CI の証拠にはしません。REV はそのサービスを再実行していません。`tests/test_private_service_callbacks.py` の新規 9 件は通常 website ジョブの `tests` ディレクトリに含まれますが、別の `private_security` matrix は依然ありません。ソース確認と作者証拠を、private_security CI シャードの成功とは呼びません。 + +### 最終 head の CI + +維持された旧 head の push 実行 43047429438 は、build-image・addons・website・api1_and_js・api2・api3_and_osf の全 6 ジョブが成功しました。api3_and_osf のログではセッション HTTP 18 ケースとセッションモデル 6 件の成功を確認し、ジョブ全体は 2,420 passed・30 skipped でした。このログではセッションモデルの試験が HTTP fixture より先なので、要求した「後始末後のセッション件数検査」の証拠とは扱いません。その確認は作者の別途の同一 DB 追試として帰属を明示します。 + +CodeQL 実行 43092627328 の attempt 1 は、両言語ジョブの `Upload SARIF as artifact` で失敗しました。`Perform CodeQL Analysis` は両方とも成功しています。artifact サービスの応答は `Failed to CreateArtifact: Received non-retryable error: Failed request: (404) Not Found: workflow run not found` です。追加のソース指摘ではなく CI 基盤の失敗として記録しますが、その attempt は全ジョブ成功の条件を満たしませんでした。証拠は `ci-c9-codeql.json`・`ci-c9-codeql-failed.log`・`ci-c9-codeql-run.json` です。 + +旧 head(`c9d293dd1a`)の PR Unit Tests 実行 43092627054、api2 ジョブ 130786027885 は 1,699 passed・4 skipped で成功しました。完了ログで `api_tests/waffle/views/test_private_javascript.py` 全 25 ケース(別行に 24 件と 1 件)の成功を確認し、以前失敗した 5 件も含まれます。証拠は `ci-c9-pr-api2.log` です。 + +調整担当が head を変えずに CodeQL の失敗ジョブを再実行しました。同じ実行の attempt 2 は、artifact 保存を含めて両言語とも成功しました。証拠は `ci-c9-codeql-attempt2.json`・`ci-c9-codeql-attempt2-run.json` です。 + +旧 head(`c9d293dd1a`)の PR api3_and_osf ジョブ 130786028248 は 2,420 passed・30 skipped で成功しました。完了ログでセッション HTTP 全 18 ケースとセッションモデル全 6 件の成功を確認しました。今回もモデル試験は HTTP より先なので、CI での実行確認として扱い、作者の後始末後の同一 DB 検査の代用にはしません。証拠は `ci-c9-pr-api3.log` です。 + +確定時点の2026-11-12 08:53:30 JST(2026-11-11 23:53:30 UTC)で、CodeQL の両言語ジョブは成功しています。Unit Tests の両実行は image build 中で、依存する5試験ジョブずつはまだ作成されていません。最終 head の試験全体の成功/失敗は未確定で、全ジョブ成功の条件を満たしません。R6-05 はそれとは独立して修正が必要です。この時点に artifact/cache 404 の失敗はなく、基盤障害の場合の質問条件は発生していません。 + +次の観測記録は予定される全ジョブを含みます。`not_created` は GitHub のジョブ識別子ではなく、`not_started` は成功やスキップを意味しません。証拠は `ci-43121482940.json`・`ci-43121495551.json`・`ci-43121495509.json` です。 + +```toon +ci_snapshot: + observed_at_utc: 2026-11-11T23:53:30Z + head: 71e26d2751f30fbd74650ffdd7db7feafefa01be + jobs[14]{run,event,name,job_id,result}: + 43121482940,push,build-image,130862787383,in_progress + 43121482940,push,addons,not_created,not_started + 43121482940,push,website,not_created,not_started + 43121482940,push,api1_and_js,not_created,not_started + 43121482940,push,api2,not_created,not_started + 43121482940,push,api3_and_osf,not_created,not_started + 43121495551,pull_request,build-image,130862829160,in_progress + 43121495551,pull_request,addons,not_created,not_started + 43121495551,pull_request,website,not_created,not_started + 43121495551,pull_request,api1_and_js,not_created,not_started + 43121495551,pull_request,api2,not_created,not_started + 43121495551,pull_request,api3_and_osf,not_created,not_started + 43121495509,pull_request,python,130862828828,success + 43121495509,pull_request,javascript-typescript,130862829244,success +``` + +最終ローカル検査では追加/変更した Python 133ファイルをメモリ上でコンパイルし、`git diff --check` も成功しました。従来の SyntaxWarning は記録し、構文エラーとは扱いません。変更は削除4件を含む157ファイルです。`71e26d2751` による変更は今回確認した監査コードとタスク登録に限られ、先に確認した session/waffle/wiki/全体ゲート/admin/Yjs の回帰ファイルと workflow 定義は維持されています。証拠は `final-source-check.json`、レビュワ clone は変更なしです。private-security 全体の実行、残りの CI、R6-05 の修正は後続確認が必要です。 + +レビューでは専用 scratch clone・GitHub の読み取り・ローカルの proof スクリプトを使用しました。アプリのサービスや Docker 状態を変更せず、runtime の環境ファイルも読んでいません。commit・push・approve・merge・close は行っていません。GitHub への書込みは、この記録に対応する日本語の PR コメント 1 件だけです。 diff --git a/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r7.md b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r7.md new file mode 100644 index 0000000..9ef03b6 --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r7.md @@ -0,0 +1,219 @@ +# REV-PR8-R7 Mandatory authentication review / 認証必須化レビュー + +> **Summary:** R6-05 is closed: private-mode child counts now use the children list's visibility rule, while public-mode SQL is unchanged. R7-01 remains P2: the private-security CI job and three core boundary test files are absent from the executed workflow, so merging before that job is added and passes is not acceptable. +> **概要:** R6-05 は解消しました。非公開モードの子件数は子一覧と同じ可視性判定を使い、公開モードの SQL は不変です。非公開セキュリティ CI ジョブと主要な境界試験 3 ファイルが実行されない R7-01 は P2 として残り、ジョブ追加と成功より前のマージは認めません。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-12. **Learned:** Matching counts to the authorized list closes metadata leaks, but passing configured CI jobs cannot validate security tests that no job collects. / 認可済み一覧に件数をそろえるとメタデータの漏えいを防げますが、設定済み CI の成功だけでは、どのジョブにも収集されないセキュリティ試験を検証できないと分かりました。 +- Applies to / 対象: RCOSDP/RDM-osf.io-dev2027 PR #8, `71e26d2751f30fbd74650ffdd7db7feafefa01be..d1258ec1402f62c354b7a095cb5bcfed1ef4eb9d`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Published comment / 投稿コメント: PR #8 comment 6812314399; body verified / 本文の一致を確認。 +- Related / 関連: SPEC-06 Documentation Conventions; review index; `2026-11-12_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r6.md`; AID response comment 6810624667; [review decision / 判定](#decision-en); [CI evidence / CI 証拠](#ci-en). +- Used by / 利用先: PR #8 coordinator and the next integration decision / PR #8 の連携調整担当と次の統合判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +<a id="decision-en"></a> +### Verdict and scope + +**Changes requested: R7-01 / P2. Do not merge before a private-security CI job is present and green.** R6-05's legacy-public/view-only child-count disclosure is closed. No new P1/P2 defect was found in the two-file code change itself. The separate CI coverage decision is a merge requirement, not an optional follow-up. The 14 configured jobs on `d1258ec140` are green; the absent private-security job remains an independent blocker. + +This review covers the single commit `d1258ec140`: `api/nodes/serializers.py` and `tests/test_private_public_flag_boundaries.py`, with 79 added and 3 removed lines. Earlier r6 findings retain their recorded dispositions. Session, wiki, global authentication, admin and other previously reviewed code is unchanged in this delta. This is not a fresh audit of the whole PR. + +### R6-05 — closed: child counts follow the private-mode list + +`NodeSerializer.get_node_count`, at `api/nodes/serializers.py:666–674`, selects `Node` or `Registration` from the parent type, starts with `default_node_list_queryset`, restricts membership to direct non-link children, applies `.can_view(auth.user, auth.private_link)`, then counts. The corresponding unfiltered children list uses the same model, default queryset, child-membership filter and visibility method at `api/base/views.py:491–503`. List ordering and request filters are presentation concerns; the relationship count is the total unfiltered authorized set, not the length of a filtered or paginated response. + +The default queryset excludes deleted records. In private mode, `AbstractNodeQuerySet.can_view` does not add stored-public children and does not honor the private-link shortcut. It retains explicit READ, OSF group access and inherited ordinary parent ADMIN through the existing visibility helper. Membership subqueries select nodes rather than permission rows or relation rows, avoiding duplicate counts from overlapping grants. The storage annotation traverses a one-to-one node-settings relation (`addons/base/models.py:360`) and a single region foreign key, so it does not multiply node rows. Inspection of the pinned django-guardian v1.5.1 source also confirms that the single-READ permission path filters by primary-key membership rather than joining permission rows into the returned nodes. The source probe also checks node and registration model selection, deleted children, links, grandchildren and duplicate relations. The Mapcore limitation is separated under [follow-up](#followup-en). + +Public mode bypasses the new branch and executes the old SQL with the same parameters. An independent AST comparison (comparison of parsed Python structure) removes only the new private branch and finds the entire remaining method identical to `71e26d2751`. This preserves the existing public-mode behavior, including the existing view-only-link count/list asymmetry; this review does not claim to fix that public-mode asymmetry. The new imports do not change the default-query helper itself. + +The regression file constructs legacy public records while public access is enabled, switches the setting, then sends real WebTest requests to both the parent detail with `related_counts=children` and `/children/`. It asserts expected IDs as well as count/list agreement for a parent reader with child READ, an OSF group member, parent ADMIN and a view-only link. Four inherited public-mode methods bring the addition to eight collected tests, but the public-mode view-only method returns without assertions: there are seven substantive new cases, not eight independent boundary checks. No new real-request registration or Mapcore case was added. The AID's audit correction from 15 to 17 fixed public-flag/link occurrences correctly reclassifies the two old SQL alternatives as authorization decisions rather than display values. + +### Query cost and independent validation + +The new serializer branch performs one canonical visibility calculation and one database count. It does not load every child into Python or make one authorization query per child. However, `.can_view()` is not one SQL query: `_visible_to_user` materializes the user's direct node IDs, loads admin roots, then queries descendants once per hierarchy level. It traverses the user's visible/administered graph, not only the requested parent's children. Repeated relationship counts across many parent objects repeat that work. + +This is the same visibility cost already used by one children-list evaluation, plus counting instead of fetching rows. It is a reasonable correctness fix for this scope, with no new query in public mode. There is no measured production-scale latency claim. Large hierarchies and bulk `related_counts=children` requests merit a later performance check; optimizing or caching must preserve current permission revocation and list/count agreement. + +REV ran extracted real count, list, default-query and visibility methods against a minimal Django 2.2.28/SQLite schema. Ten cases pass across nodes and registrations: reader, overlapping group grants, parent ADMIN, outsider and reader with a private link. The fixture additionally includes deleted children, a linked node, a grandchild and a duplicate relation. The expected counts are 1, 1, 4, 0 and 1 for each model type. The simplified probe observes five count-path queries for non-admin cases and eight for the fixture's admin hierarchy. Those are probe measurements, not production query budgets: guardian's permission-selection collaborator is simulated, and the application HTTP stack, full schema and PostgreSQL are not executed. + +Both modified Python files compile in memory, and `git diff --check` passes. The public-mode AST comparison passes. Evidence files are `source-probe.py`, `source-probe.json`, `mapcore-probe.py`, `mapcore-probe.json`, `coverage-inventory.json` and the inspected upstream `guardian-shortcuts-1.5.1.py`, retained in reviewer scratch storage without public filesystem links. No application tests were rerun locally by REV. + +AID comment 6810624667 reports 40 tests passed with either process-level setting, three expected failures when removing the fix, and 267 public-mode regression tests passed. It also reports 348 passed and 1 failed across the 19 private-security files; the live user-directory search failure is attributed to missing local Elasticsearch 2 mapping and reportedly also occurs before this fix. These are author-reported results, not REV reruns. A matching failure on the previous head identifies a pre-existing problem; it does not turn an incomplete private-mode test run into a pass. + +<a id="ci-gap-en"></a> +### R7-01 — P2, open: private-security tests are not scheduled by CI + +**Location:** `.github/workflows/unit-tests.yml:52`, with the test inventory at `tasks/__init__.py:417–437` and runner selection at `.github/scripts/ci/run-tests.sh:11–17`. + +The workflow matrix runs only `addons`, `website`, `api1_and_js`, `api2` and `api3_and_osf`; the runner starts all five with `ENABLE_PUBLIC_ACCESS=true`. Most private-boundary tests are still useful in these jobs because they switch the setting inside the tests. It would be inaccurate to say that no private-mode assertions run in ordinary CI. + +The static inventory independently confirms that 16 of the 19 `PRIVATE_SECURITY_TESTS` files fall under normal job paths, while the following three fall under none: + +```toon +uncollected_files[3]: + api_tests/test_global_public_boundary.py + api_tests/test_preprint_directory_visibility.py + api_tests/test_user_directory_boundary.py +``` + +These are core security regressions, not peripheral tests: anonymous API/Web rejection and signed-service identity, legacy public resources, current and revoked preprint sharing, direct profiles and embedded-directory bypasses. Additionally, the runner's built-image/default-unset private-mode checks at lines 80–97 are only reached by `private_security`; no current matrix entry executes them. Per-test monkeypatches do not substitute for running that startup path and the full designated suite. + +**Merge decision:** adding the private-security CI job and obtaining a successful run is required before merging #8. Deferring it would allow a green required workflow while core security regressions are never collected, and the only reported complete private-mode run is not fully green. Token scope is an operational blocker, not evidence that the missing checks passed. The coordinator confirmed this merge requirement. + +**Required correction:** an owner with workflow permission must publish the prepared matrix addition, verify that it invokes the existing `private_security` runner with `ENABLE_PUBLIC_ACCESS=false`, and obtain successful CI on the resulting review head. The existing task enforces one worker, rejects a non-false setting, and propagates pytest's exit status, including zero-test collection failure. Run all 19 files and the startup/default checks; preserve the five public-mode jobs. If live search fails in the CI environment, repair the test environment or the actual defect and rerun it, rather than silently skipping or accepting it solely because the author saw a failure locally. R7-01 closes only after that evidence exists. + +The AID reports an unpushed local workflow commit `3bb3d3f6be` awaiting the owner's token workflow scope. REV has not reviewed that unpublished commit, and its existence is not an executed check. No workflow change is included in `71e26d2751..d1258ec140`. + +<a id="followup-en"></a> +### Follow-up: existing Mapcore under-visibility + +The r6 request also mentioned preserving Mapcore access. The canonical children list already calls `.can_view(user, private_link)` with `include_mapcore_groups=False`, and `_visible_to_user` calls `get_nodes_for_user` with that default too. Separate Mapcore memberships are not ordinary OSF/Django group memberships. The new count inherits that existing list limitation. + +An isolated source probe gives a user ordinary READ on the parent plus ADMIN only through an active Mapcore membership. With one private direct child, the previous raw SQL count is 1, the new count is 0 and the unchanged list is empty. Thus count/list consistency is verified, but full Mapcore compatibility is not. This is an under-visibility/feature limitation, not the over-disclosure that R6-05 reported. The coordinator explicitly directed closing R6-05 for the disclosure fix and recording Mapcore as a follow-up outside #8's pre-merge corrections. + +A future change should align Mapcore-authorized child lists and counts, with active/revoked group, READ/ADMIN and descendant tests, without restoring public-flag or view-only-link bypasses. The earlier broad Mapcore-preservation expectation must not be presented as a passed test in r7. + +<a id="ci-en"></a> +### Final-head CI evidence + +At the final observation, `2026-11-12T02:09:31Z`, both Unit Tests runs and CodeQL completed successfully on the exact reviewed head. All 14 configured jobs are green: two image builds, ten public-startup test jobs, and both CodeQL languages. CodeQL artifact upload also succeeded. No artifact/cache 404 failure required escalation in these runs. + +The following is an observed result, not workflow configuration. The missing `private_security` job is not counted as successful or skipped. These green jobs do not close R7-01. Evidence: `ci-43126974419.json`, `ci-43126988565.json`, `ci-43126988601.json` and `ci-summary.json`. + +```toon +ci_snapshot: + observed_at_utc: 2026-11-12T02:09:31Z + head: d1258ec1402f62c354b7a095cb5bcfed1ef4eb9d + jobs[14]{run,event,name,job_id,result}: + 43126974419,push,build-image,130881431085,success + 43126974419,push,tests (api1_and_js),130898792939,success + 43126974419,push,tests (addons),130898792981,success + 43126974419,push,tests (api2),130898792982,success + 43126974419,push,tests (api3_and_osf),130898792986,success + 43126974419,push,tests (website),130898792996,success + 43126988565,pull_request,build-image,130881479137,success + 43126988565,pull_request,tests (api1_and_js),130897865542,success + 43126988565,pull_request,tests (api2),130897865549,success + 43126988565,pull_request,tests (api3_and_osf),130897865636,success + 43126988565,pull_request,tests (addons),130897865649,success + 43126988565,pull_request,tests (website),130897865677,success + 43126988601,pull_request,Analyze (python),130881478783,success + 43126988601,pull_request,Analyze (javascript-typescript),130881479361,success +``` + +The PR website job 130897865677 ran `tests/test_private_public_flag_boundaries.py` with 40 passing markers, including the new children-count methods. The whole job passed 2,304 tests with 74 skipped. PR api2 job 130897865549 passed 1,699 with 4 skipped; its log includes the ordinary node detail, children-list and node-list regressions. PR api3_and_osf job 130897865636 passed 2,426 with 30 skipped, including all three parameterized live user-directory search cases. Thus the author-reported local search failure was not observed in this public-startup CI run; this still does not establish a successful full private-startup suite. Evidence excerpts: `ci-pr-website-evidence.txt`, `ci-pr-api2-evidence.txt` and `ci-pr-api3-evidence.txt`; the full downloaded logs are retained separately. + +### Review boundaries + +The review used a dedicated scratch clone, GitHub reads and isolated local probes. No grdm-dev Docker state was changed, and `runtime/.env` was not read. No commit, push, approval, merge or issue closure was performed. The only GitHub write was one PR comment with the required r7 prefix. The bilingual review record is uncommitted and names private repositories and evidence by identifier, without private-repository URLs or local-path links. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +<a id="decision-ja"></a> +### 判定と範囲 + +**Changes requested: R7-01 / P2。非公開セキュリティ CI ジョブを追加し、成功するまでマージしないでください。** R6-05 の旧公開フラグ・閲覧専用リンクによる子件数の漏えいは解消しました。2 ファイルのコード差分自体に新しい P1/P2 は見つかりませんでした。別途判断した CI の実行範囲はマージ条件であり、任意の後続対応ではありません。`d1258ec140` の設定済み 14 ジョブは成功しましたが、存在しない非公開セキュリティジョブが独立した阻害要因として残ります。 + +対象は `d1258ec140` の 1 コミットです。`api/nodes/serializers.py` と `tests/test_private_public_flag_boundaries.py` の 2 ファイル、追加 79 行・削除 3 行です。r6 の他の指摘は既存の判定を維持します。セッション・wiki・全体認証・管理画面を含む確認済みコードはこの差分で変わりません。PR 全体を初めから再監査したものではありません。 + +### R6-05 — 解消: 子件数が非公開モードの一覧に従う + +`api/nodes/serializers.py:666–674` の `NodeSerializer.get_node_count` は、親の型から `Node` または `Registration` を選び、`default_node_list_queryset` を起点として直下のリンクでない子に絞り、`.can_view(auth.user, auth.private_link)` の後で数えます。`api/base/views.py:491–503` の絞込み前の子一覧も、同じモデル・既定のクエリ・子の所属条件・可視性メソッドを使います。一覧の並び順と要求時のフィルターは表示側の条件です。関連の件数は認可済み集合全体の件数で、フィルターやページ分割後のレスポンスの長さではありません。 + +既定のクエリは削除済み記録を除きます。非公開モードの `AbstractNodeQuerySet.can_view` は保存済み公開フラグを加えず、閲覧専用リンクの特例も使いません。明示 READ・OSF グループ・通常の親 ADMIN から継承するアクセスは既存の可視性 helper で保持します。所属を調べるサブクエリは権限行や親子関係行ではなくノードを選ぶため、重複する権限で件数を増やしません。ストレージの注釈はノード設定への一対一関連(`addons/base/models.py:360`)と単一の region 外部キーをたどるため、ノード行を増やしません。固定した django-guardian v1.5.1 のソースでも、単一 READ の経路は返すノードに権限行を結合せず、主キーの所属で絞ることを確認しました。ソース probe でも Node/Registration の選択・削除済み子・リンク・孫・重複関係を検査しました。Mapcore の制限は[後続課題](#followup-ja)に分けて記録します。 + +公開モードは新しい分岐を通らず、従来の SQL と同じ引数を使います。独立した AST 比較(Python を解析した構造の比較)では、新しい非公開分岐だけを除くとメソッド全体が `71e26d2751` と一致しました。公開モードの閲覧専用リンクで既存の count/list が非対称になる挙動も維持し、その非対称性を直したとはしていません。追加した import は既定クエリの helper 自体を変更しません。 + +回帰試験は公開モードで旧公開データを作り、設定を切り替えてから、`related_counts=children` を付けた親の詳細と `/children/` に実際の WebTest リクエストを送ります。親 READ と子 READ・OSF グループ・親 ADMIN・閲覧専用リンクについて、期待する ID 集合と件数の一致を検査します。継承した公開モードの 4 メソッドを合わせて追加は収集上 8 件ですが、公開モードの閲覧専用リンクのメソッドは assertion なしで戻ります。実質的な追加検査は 7 件であり、独立した境界検査 8 件ではありません。新しい実リクエストの Registration/Mapcore ケースはありません。AID の監査表を修正済み 15 箇所から 17 箇所に訂正した判断は、旧 SQL の 2 条件を表示値ではなく認可判定として扱っており妥当です。 + +### クエリ負荷と独立検証 + +新しい serializer の分岐は正規の可視性計算を 1 回行い、DB で件数を数えます。子を全件 Python に読み込んだり、子ごとに個別認可クエリを発行したりはしません。ただし `.can_view()` は単一 SQL ではありません。`_visible_to_user` は利用者が直接アクセスできるノード ID を読み、管理対象の起点を取得し、階層ごとに子孫を照会します。調べるのは要求した親の子だけでなく、利用者が閲覧・管理できるグラフです。複数の親について関連件数を求めると、この処理も繰り返します。 + +可視性の計算負荷は既存の子一覧 1 回と同じで、行を取得する代わりに件数を返します。今回の正確性の修正として妥当であり、公開モードにクエリは増えません。本番規模の応答時間を測定したとはしていません。大きな階層と複数親の `related_counts=children` は後続の性能確認が有用です。最適化やキャッシュでも権限取消の即時反映と count/list の一致を保つ必要があります。 + +REV は実際の count・一覧・既定クエリ・可視性メソッドを抽出し、最小構成の Django 2.2.28/SQLite スキーマで検証しました。Node と Registration について、READ・重複したグループ権限・親 ADMIN・非共同作業者・閲覧専用リンク付き READ の計 10 ケースが成功しました。fixture には削除済み子・リンク・孫・重複した親子関係も含めます。期待する件数は各モデルで順に 1・1・4・0・1 です。簡略化した probe の件数経路では、管理者以外は 5 クエリ、fixture の管理階層では 8 クエリでした。これは本番のクエリ予算ではありません。guardian の権限選択処理は模擬し、アプリの HTTP 経路・全スキーマ・PostgreSQL は実行していません。 + +変更した Python 2 ファイルのメモリ上のコンパイル、`git diff --check`、公開モードの AST 比較は成功しました。証拠の `source-probe.py`・`source-probe.json`・`mapcore-probe.py`・`mapcore-probe.json`・`coverage-inventory.json` と、確認した上流の `guardian-shortcuts-1.5.1.py` はレビュワの scratch に保存し、公開文書にローカルパスのリンクは載せません。REV はローカルでアプリ全体の試験を再実行していません。 + +AID コメント 6810624667 は、プロセス全体の設定が false/true のどちらでも 40 件成功、修正を外す変異で意図した 3 件失敗、公開モードの回帰 267 件成功と報告しています。非公開セキュリティ 19 ファイルは 348 passed / 1 failed で、利用者ディレクトリの live search の失敗はローカル Elasticsearch 2 の mapping 不足であり、修正前も同じと報告しています。作者の実行結果であって REV の再実行ではありません。旧 head での再現は以前からの問題である証拠にはなりますが、未完了の非公開試験を成功にはしません。 + +<a id="ci-gap-ja"></a> +### R7-01 — P2、未解決: 非公開セキュリティ試験を CI が起動しない + +**箇所:** `.github/workflows/unit-tests.yml:52`。試験一覧は `tasks/__init__.py:417–437`、runner の選択は `.github/scripts/ci/run-tests.sh:11–17` です。 + +workflow の matrix は `addons`・`website`・`api1_and_js`・`api2`・`api3_and_osf` のみで、runner は 5 件とも `ENABLE_PUBLIC_ACCESS=true` で起動します。非公開境界試験の多くはテスト内で設定を切り替えるため、これらのジョブでも有効に働きます。「通常 CI では非公開モードの検査が一切走らない」とする説明は不正確です。 + +独立した静的な実行対象の照合では、`PRIVATE_SECURITY_TESTS` 19 ファイルのうち 16 ファイルが通常ジョブの対象配下にあり、次の 3 ファイルはいずれにも含まれません。 + +```toon +uncollected_files[3]: + api_tests/test_global_public_boundary.py + api_tests/test_preprint_directory_visibility.py + api_tests/test_user_directory_boundary.py +``` + +これらは匿名 API/Web の拒否と署名付きサービスの利用者確認、旧公開リソース、preprint の現在・取消後の共有関係、直接プロフィールと埋込みによるディレクトリ迂回を調べる主要なセキュリティ回帰です。さらに runner の 80–97 行にある、ビルドしたイメージと環境変数未設定時の非公開モード検査は `private_security` のときだけ通り、現行 matrix は一度も実行しません。テスト内の設定差替えは、この起動経路と指定した全試験の実行の代わりにはなりません。 + +**マージ判断:** 非公開セキュリティ CI ジョブを追加し、成功してから #8 をマージしてください。後回しにすると、主要なセキュリティ回帰が収集されないまま必須 workflow が成功になります。報告された唯一の非公開モード全体試験も全件成功ではありません。トークンの権限不足は運用上の障害であり、欠落した検査が成功した証拠ではありません。調整担当もこのマージ条件を確認しました。 + +**必要な修正:** workflow を更新できる所有者が用意済みの matrix 追加を公開し、既存の `private_security` runner を `ENABLE_PUBLIC_ACCESS=false` で呼ぶことを確認し、そのレビュー対象 head の CI を成功させてください。既存タスクは worker 数を 1 に限定し、false でない設定を拒否し、試験 0 件の失敗を含む pytest の終了コードを返します。19 ファイル全体と起動・既定値の検査を実行し、公開モード 5 ジョブも維持してください。CI 環境で live search が失敗する場合は、試験環境または実際の不具合を修正して再実行し、ローカルで以前から失敗したことだけを理由に黙って除外・容認しないでください。その証拠を得てから R7-01 を閉じます。 + +AID は、workflow スコープを持つ所有者のトークンを待つ未 push のローカルコミット `3bb3d3f6be` があると報告しています。REV はこの未公開コミットをレビューしておらず、存在するだけでは実行済みの検査になりません。`71e26d2751..d1258ec140` に workflow の変更はありません。 + +<a id="followup-ja"></a> +### 後続課題: 既存の Mapcore 可視性不足 + +r6 の必要修正には Mapcore アクセスの保持も記載しました。しかし正規の子一覧は従来から `.can_view(user, private_link)` を `include_mapcore_groups=False` で呼び、`_visible_to_user` の `get_nodes_for_user` もその既定値を使います。独立した Mapcore 所属は通常の OSF/Django グループ所属とは異なります。新しい件数も、この既存の一覧の制限に従います。 + +隔離したソース probe では、親への通常 READ と、有効な Mapcore 所属だけによる ADMIN を利用者に与えました。非公開の直下の子 1 件について旧 SQL の count は 1、新しい count は 0、変更していない一覧は空です。count/list の一致は確認できましたが、Mapcore の完全な互換性を確認したとは言えません。見せすぎる R6-05 の漏えいとは異なり、見せる対象が不足する機能上の制限です。調整担当は、漏えい修正をもって R6-05 を閉じ、Mapcore は #8 のマージ前修正には含めず後続課題として記録するよう明示しました。 + +後続修正では、Mapcore の有効・取消後の所属、READ/ADMIN、子孫の試験を加え、認可済みの子一覧と件数をそろえる必要があります。公開フラグや閲覧専用リンクによる迂回は戻しません。r6 の広い Mapcore 保持の期待を、r7 で検査成功した項目として扱ってはいけません。 + +<a id="ci-ja"></a> +### 最終 head の CI 証拠 + +最終確認時刻 `2026-11-12T02:09:31Z` で、対象 head の Unit Tests 2 実行と CodeQL はすべて完了・成功しました。設定済み 14 ジョブ(イメージビルド 2 件、公開設定で起動する試験 10 件、CodeQL 2 言語)はすべて成功です。CodeQL の artifact 保存も成功しました。この 3 実行に artifact/cache 404 による質問が必要な失敗はありませんでした。 + +次は workflow の設定ではなく観測結果です。存在しない `private_security` ジョブを成功やスキップとして数えません。設定済みジョブが成功しても R7-01 は閉じません。証拠は `ci-43126974419.json`・`ci-43126988565.json`・`ci-43126988601.json`・`ci-summary.json` です。 + +```toon +ci_snapshot: + observed_at_utc: 2026-11-12T02:09:31Z + head: d1258ec1402f62c354b7a095cb5bcfed1ef4eb9d + jobs[14]{run,event,name,job_id,result}: + 43126974419,push,build-image,130881431085,success + 43126974419,push,tests (api1_and_js),130898792939,success + 43126974419,push,tests (addons),130898792981,success + 43126974419,push,tests (api2),130898792982,success + 43126974419,push,tests (api3_and_osf),130898792986,success + 43126974419,push,tests (website),130898792996,success + 43126988565,pull_request,build-image,130881479137,success + 43126988565,pull_request,tests (api1_and_js),130897865542,success + 43126988565,pull_request,tests (api2),130897865549,success + 43126988565,pull_request,tests (api3_and_osf),130897865636,success + 43126988565,pull_request,tests (addons),130897865649,success + 43126988565,pull_request,tests (website),130897865677,success + 43126988601,pull_request,Analyze (python),130881478783,success + 43126988601,pull_request,Analyze (javascript-typescript),130881479361,success +``` + +PR の website ジョブ 130897865677 では、新しい子件数メソッドを含む `tests/test_private_public_flag_boundaries.py` の成功マーカー 40 個を確認しました。ジョブ全体は 2,304 passed / 74 skipped です。PR の api2 ジョブ 130897865549 は 1,699 passed / 4 skipped で、通常のノード詳細・子一覧・ノード一覧の回帰試験をログで確認しました。PR の api3_and_osf ジョブ 130897865636 は 2,426 passed / 30 skipped で、live user-directory search のパラメーター化した 3 ケースもすべて成功しています。作者が報告したローカルの検索失敗は、この公開設定で起動した CI では起きていません。ただし非公開設定で起動する全試験の成功を示すものではありません。証拠抜粋は `ci-pr-website-evidence.txt`・`ci-pr-api2-evidence.txt`・`ci-pr-api3-evidence.txt`、取得した全ログは別途保存しています。 + +### レビューの制約 + +専用の scratch clone、GitHub の読取り、隔離したローカル probe を使用しました。grdm-dev の Docker 状態は変更せず、`runtime/.env` も読んでいません。commit・push・approve・merge・Issue の close は行っていません。GitHub への書込みは指定した r7 接頭辞の PR コメント 1 件だけです。英和のレビュー記録は未 commit で、非公開リポジトリと証拠は識別子で示し、非公開リポジトリ URL やローカルパスのリンクを含めません。 diff --git a/docs/reviews/2026-11-12_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r3.md b/docs/reviews/2026-11-12_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r3.md new file mode 100644 index 0000000..980492c --- /dev/null +++ b/docs/reviews/2026-11-12_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r3.md @@ -0,0 +1,115 @@ +# REV PR5 Revocation and persistence review r3 / 失効・永続化レビュー r3 + +> **Summary:** Pass at the exact reviewed head. The unfinished-write reservation defect is fixed, all local tests pass, and no new findings were identified in the round-three diff. +> **概要:** 指定 head の判定は pass。未完了書込みの予約を失う問題は解消し、ローカル試験は全て成功、r3 差分の追加指摘はない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-12. **Learned:** REV changed only what publication requires: private-repository URLs become named plain-text references; local guide links become repository-relative links; unpublished scratch references become named plain text or quoted command-path placeholders; public review links absent from develop point to the reviewed public commit. / REV が公開に必要な変更のみを行った。非公開リポジトリの URL は名称付き平文参照、ローカルのガイドへのリンクはリポジトリ相対リンク、未公開 scratch の参照は名称付き平文またはコマンドの引用符付きパス代替表示とし、develop に未収録の公開レビューへのリンクは確認済みの公開コミットを指す。 +- Publication provenance / 公開版の来歴: REV(担当レビュワ)issued this publication version from the unchanged original `2026-11-12_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r3.md` (SHA-256: `be5a6c0adff01b2f789a87fa6414c00037efe71b40e265da2b27079cbccf3d34`); the original file and scratch evidence remain unchanged, and all text other than this version/provenance metadata and the explicitly stated publication references is verbatim. Quoted scratch command-path placeholders identify retained unpublished evidence and must be replaced with its local location before execution. / REV が上記原本から公開版を発行した。原本と scratch 証跡は未変更で、版・来歴の追記と明示した公開用参照以外の本文は原文どおり。コマンド内の引用符付き scratch パス代替表示は保持された未公開証跡を識別するもので、実行にはそのローカルの場所への置換が必要。 +- Version / 版: 0.1 — 2026-11-12. **Learned:** A fresh disk measurement must retain both unfinished payload writes and unfinished deletion markers until their operations settle. / ディスクを再計測しても、未完了の本文書込みと削除マーカーの予約は処理完了まで保持する必要がある。 +- Applies to / 対象: RCOSDP/RDM-y-websocket-dev2027 PR #5; `67aae1d7efaa4bb002b60f572b15fd631b65d980..5e7fe4a524c7cd970d44085b6f3eacd82e2fb425`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra) +- Related: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Round 2 / 前回レビュー](2026-11-11_RDM-y-websocket-dev2027_PR5_Revocation_Persistence_r2.md) · Machine-readable evidence / 機械可読の証跡 (REV scratch evidence (not published): `results.json`). +- PR comment / PRコメント: r3 verdict / r3 判定 (RDM-y-websocket-dev2027 PR #5, comment 6799671897) — exactly one comment posted / 投稿は1件のみ。 +- Used by / 利用先: the coordinator's PR #5 integration decision / 調整者による PR #5 の統合判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**pass. No new R3 findings. R2-01 / P2 is closed**, also closing the remaining queued-write portion of R1-03. Reviewed the one-commit diff in `bin/persistence.cjs` and `test/storage-bounds.test.cjs`. The PR head was verified as `5e7fe4a524c7cd970d44085b6f3eacd82e2fb425`. This verdict applies to that head and scope. + +At `bin/persistence.cjs:104–113`, `track` adds a reservation synchronously and removes it only when the operation settles. At line 126, remeasurement adds `inFlight` to the disk baseline. Both payload writes (line 139) and deletion markers (lines 175 and 244) pass through tracking. Therefore a new capacity check no longer forgets work still waiting in LevelDB (the on-disk store's queue). The new regression at `test/storage-bounds.test.cjs:75–101` binds 20 rooms before updating them without yielding, checks the settled quota and zero unfinished bytes, and checks retained room contents. + +### Local test evidence + +Fresh scratch clone: `REV scratch evidence (not published): rev-pr5-r3.qDbNJC websocket checkout`, detached at the exact head. Node `v26.12.0`, npm `11.20.0`, Darwin arm64. Dependencies were installed from the committed lockfile with `npm ci`. The three independent scripts were copied byte-for-byte from the prior `REV scratch evidence (not published): 8baac84b-080f-4104-a2b5-7416702c57e1 rev-followup` directory. Exact local commands and working directories: + +```sh +cd "<REV scratch directory (not published): rev-pr5-r3.qDbNJC websocket checkout>" +npm ci > ../npm-ci.log 2>&1 +npm test > ../npm-test.log 2>&1 +cd "<REV scratch directory (not published): rev-pr5-r3.qDbNJC>" +node review-probes.cjs > review-probes.log 2>&1 +node quota-burst.cjs > quota-burst.log 2>&1 +node revoke-membership.cjs > revoke-membership.log 2>&1 +``` + +Every command exited 0. The observational quota scripts do not themselves fail on overflow, so the emitted byte values were inspected rather than relying on exit codes alone. Test-result data (TOON is a compact text representation of tabular data): + +```toon +checks[7]{check,result}: + npm_ci,exit 0; 286 packages installed + npm_test,exit 0; standard and TypeScript; room-release; auth 25; session-persistence 13; storage-bounds 4 + sequential_quota,52728 bytes <= 65536 + already_bound_rooms_burst,53202 bytes <= 65536; 1 room retained; settled inFlightBytes 0 + expiry_handshake,4401; subsequent observer frames 0; observer text empty + delete_during_load,clear only; no subsequent store + membership_revocation,revoked; room and awareness membership removed; last-peer room released +``` + +The burst used 20 already-bound rooms, each receiving 49,152 bytes of random hexadecimal text with no await between updates, and a 100,000-byte per-room limit. Queued accounting was `reservedBytes=52896`, `inFlightBytes=50736`, `tombstoneReserve=152`; measured disk at that point was 2,160 bytes. After the queue drained and 400 ms idle, disk held 53,202 bytes, versus the r2 counterexample's 986,958 bytes. The suite also verified retained content is complete and the 1,000-byte per-room limit drops a 1,080-byte state. + +Evidence: installation log (REV scratch evidence (not published): `npm-ci.log`), npm test log (REV scratch evidence (not published): `npm-test.log`), original probes (REV scratch evidence (not published): `review-probes.cjs`) / output (REV scratch evidence (not published): `review-probes.log`), burst probe (REV scratch evidence (not published): `quota-burst.cjs`) / output (REV scratch evidence (not published): `quota-burst.log`), membership probe (REV scratch evidence (not published): `revoke-membership.cjs`) / output (REV scratch evidence (not published): `revoke-membership.log`). `git diff --check 67aae1d7..5e7fe4a5` exited 0; the checkout remained clean after testing. + +### CI status and limits + +No usable CI result exists for this head: `gh pr view 5 --repo RCOSDP/RDM-y-websocket-dev2027 --json statusCheckRollup` returned an empty list; the GitHub check-runs and commit-status endpoints each reported `total_count=0`. A legacy `.github/workflows/ci.yml` exists in Git, but the Actions workflows endpoint returned no registered workflows. The CI-less merge rule therefore has a **REV pass plus recorded successful local tests** for this head; no approval or merge was performed. + +Installation reported 14 dependency audit vulnerabilities (4 low, 2 moderate, 8 high); dependencies did not change in this diff and no audit remediation was attempted. Node emitted an experimental localStorage warning without failing tests. Deployment, browser acceptance, persistent volume location/prefix, and internal network reachability were not verified. Prior limitations remain: deletion tombstones are in memory, overflow drafts stay in memory, and LevelDB compaction needs transient disk headroom. No Docker state changes or `runtime/.env` reads occurred. Only scratch artifacts and exactly one PR conversation comment were written; no source edit, commit, push, approval, merge, or close was performed. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**pass。追加の R3 指摘なし。R2-01 / P2 は解消**し、R1-03 に残っていた待機中書込みの問題も解消した。対象は `bin/persistence.cjs` と `test/storage-bounds.test.cjs` の1コミット差分。PR head は `5e7fe4a524c7cd970d44085b6f3eacd82e2fb425` と一致した。判定はこの head と範囲に対するもの。 + +`bin/persistence.cjs:104–113` の `track` は同期的に予約を加え、処理完了時に減らす。126行の再計測では実ディスク量に `inFlight` を加える。本文書込み(139行)と削除マーカー(175・244行)の両方が追跡対象で、LevelDB(ディスク上の保存機構)の待ち行列にある予約を容量再検査で忘れなくなった。`test/storage-bounds.test.cjs:75–101` の追加回帰試験は、先に20部屋を bind し、待機せず更新して、処理終了後の容量上限・未完了量0・保持された部屋の本文一致を検査する。 + +### ローカル試験の証跡 + +専用の新規 clone は `REV scratch evidence (not published): rev-pr5-r3.qDbNJC websocket checkout` で、指定 head の detached 状態。環境は Node `v26.12.0`、npm `11.20.0`、Darwin arm64。依存はコミット済み lockfile から `npm ci` で導入した。独立試験3本は前回の `REV scratch evidence (not published): 8baac84b-080f-4104-a2b5-7416702c57e1 rev-followup` から内容を変えずにコピーした。実行した正確なコマンドと作業ディレクトリ: + +```sh +cd "<REV scratch directory (not published): rev-pr5-r3.qDbNJC websocket checkout>" +npm ci > ../npm-ci.log 2>&1 +npm test > ../npm-test.log 2>&1 +cd "<REV scratch directory (not published): rev-pr5-r3.qDbNJC>" +node review-probes.cjs > review-probes.log 2>&1 +node quota-burst.cjs > quota-burst.log 2>&1 +node revoke-membership.cjs > revoke-membership.log 2>&1 +``` + +全コマンドの終了コードは0。観測用の容量試験は容量超過でも失敗終了しないため、終了コードだけでなく出力値を確認した。結果を TOON(表形式のデータを短い文字で表す形式)で示す。 + +```toon +checks[7]{check,result}: + npm_ci,終了0; 286パッケージ導入 + npm_test,終了0; standardとTypeScript; room-release; auth 25件; session-persistence 13件; storage-bounds 4件 + 順次容量試験,52728 bytes <= 65536 + bind済み部屋の一斉更新,53202 bytes <= 65536; 1部屋保持; 完了後inFlightBytes 0 + 期限と切断応答,4401; 期限後の観測フレーム0; 観測本文は空 + 読込み中の削除,clearのみ; その後のstoreなし + 失効と所属,失効済み; 部屋とawarenessから除外; 最後の接続の部屋を解放 +``` + +一斉更新は20部屋を先に bind し、各部屋へ49,152 bytesの乱数16進文字列を、部屋間で await せず挿入した。部屋ごとの上限は100,000 bytes。待機中の値は `reservedBytes=52896`、`inFlightBytes=50736`、`tombstoneReserve=152`、その時点の実ディスク量は2,160 bytesだった。待ち行列を処理し400 ms静止後は53,202 bytesで、r2の反例986,958 bytesから改善した。標準試験では保持された本文の完全一致と、1,000 bytesの部屋上限に対して1,080 bytesの状態が削除されることも確認した。 + +証跡: 導入ログ (REV scratch evidence (not published): `npm-ci.log`)、npm testログ (REV scratch evidence (not published): `npm-test.log`)、前回のプローブ (REV scratch evidence (not published): `review-probes.cjs`) / 出力 (REV scratch evidence (not published): `review-probes.log`)、一斉更新プローブ (REV scratch evidence (not published): `quota-burst.cjs`) / 出力 (REV scratch evidence (not published): `quota-burst.log`)、所属プローブ (REV scratch evidence (not published): `revoke-membership.cjs`) / 出力 (REV scratch evidence (not published): `revoke-membership.log`)。`git diff --check 67aae1d7..5e7fe4a5` は終了0。試験後も checkout に差分はない。 + +### CI の状態と限界 + +対象 head に利用できる CI 結果はない。`gh pr view 5 --repo RCOSDP/RDM-y-websocket-dev2027 --json statusCheckRollup` は空の一覧で、GitHub の check-runs と commit-status もそれぞれ `total_count=0`。Git 内には旧 `.github/workflows/ci.yml` があるが、Actions workflows API に登録済み workflow はなかった。従って CI なしの場合の条件である **REV pass と成功したローカル試験記録** はこの head について揃った。approve や merge は行っていない。 + +導入時の監査には依存の脆弱性14件(low 4・moderate 2・high 8)が表示された。今回の差分で依存は変更されておらず、監査の修正作業は行っていない。Node の実験的 localStorage 警告は出たが試験は成功した。配備・ブラウザ受入・永続ボリュームの場所と接頭辞・内部ネットワーク到達範囲は未確認。削除済み記録はメモリのみ、容量超過時の下書きもメモリのみ、LevelDB の圧縮整理には一時的なディスク余裕が必要という既知の制約は残る。Docker 状態の変更と `runtime/.env` の読取りはない。出力は scratch 資料と PR 会話コメント1件のみで、ソース変更・commit・push・approve・merge・close は行っていない。 diff --git a/docs/reviews/2026-11-13_RDM-developer-guide_PR53_Review_Records_r1.md b/docs/reviews/2026-11-13_RDM-developer-guide_PR53_Review_Records_r1.md new file mode 100644 index 0000000..5d7a58f --- /dev/null +++ b/docs/reviews/2026-11-13_RDM-developer-guide_PR53_Review_Records_r1.md @@ -0,0 +1,121 @@ +# REV-PR53-R1 Review record publication / レビュー記録の収録レビュー + +> **Summary:** PR #53 adds exactly one review record, byte-identical to the supplied original, and accurately summarizes its conditional Pass verdict. All eight checks on the reviewed head succeeded; no blocking finding was identified. +> **概要:** PR #53 は指定原本とバイト単位で一致するレビュー記録 1 件だけを追加し、条件を伴う Pass 判定を正確に要約しています。対象 head の検査 8 件はすべて成功し、阻害する指摘はありません。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-13. **Learned:** Faithful publication preserves both the original bytes and the distinction between a scoped Pass, an unfinished deferred issue, and future integration checks. / 正確な収録には、原文のバイト列だけでなく、範囲を限定した Pass、未完の繰延べ課題、今後の統合検査の区別も保持する必要があります。 +- Applies to / 対象: RCOSDP/RDM-developer-guide [PR #53](https://github.com/RCOSDP/RDM-developer-guide/pull/53), review r1, branch `docs/review-records-2026-11-13`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Published comment / 投稿コメント: [r1 review / r1 レビュー](https://github.com/RCOSDP/RDM-developer-guide/pull/53#issuecomment-6830217208); body verified / 本文一致確認済み。 +- Related / 関連: [Review index / レビュー索引](README.md) · [SPEC-06 Documentation Conventions / 文書規約](../spec/06_documentation_conventions.md) · [Published r8 record / 収録対象 r8](2026-11-13_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r8.md). +- Used by / 利用先: [PR #53 publication decision / PR #53 の収録判断](https://github.com/RCOSDP/RDM-developer-guide/pull/53). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Pass. No blocking finding or requested correction.** This review checks publication fidelity, the complete PR diff, the verdict row, disclosure risks, and completed CI (automated repository checks). It does not repeat the authentication implementation review or certify the later integration of RDM-osf.io-dev2027 PR #8. + +The reviewed head is `0f98d3930362b0e4d4364589e8585d0d6b25e993`; the base is develop `c0e76821d965ac38766410823a492eda80eb5664`. The final metadata read at `2026-11-12T16:57:33Z` (2026-11-13 JST) confirmed the same head and all eight checks successful. + +### Original bytes and change scope + +An independent scratch clone and GitHub's changed-file metadata agree: the full PR diff adds only `docs/reviews/2026-11-13_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r8.md`, with 215 added lines and no deleted lines. No existing file changes, renames, or other additions are present. Direct binary comparison with the designated reviewer original succeeds. Both copies have the following length and SHA-256 digest (a fingerprint of the bytes): + +```toon +record_identity: + bytes: 23216 + sha256: 649558b7d1f0188d117cd6e6f107342e07175a06fdf7f6aaeaad058759129d79 + byte_identical: true + added_files: 1 + added_lines: 215 + deleted_lines: 0 +``` + +`git diff --check` succeeds. The supplied original was not modified. + +### PR body and disclosure checks + +The verdict row accurately preserves all material parts of r8: Pass for head `d1258ec140`, 14/14 configured CI jobs successful, no new P1/P2 finding, and R7-01 deferred by the owner's 2026-11-13 decision as unfinished and awaiting permission in issue #16. It also retains the requirement to integrate develop and obtain green CI on the new head before the final merge. The row does not claim that R7-01 is fixed or that the future combined tree already passed CI. These are fidelity checks against the supplied record, not fresh verification of the private repository's current state. + +Full-text inspection and targeted pattern checks of the added record and PR body found no private-repository URL, machine-local absolute path, or apparent secret credential. Private repository references use names only; source-relative file names and commit identifiers are evidence, not machine-local paths. The repository policy scan also reports zero findings, and the head's gitleaks job succeeds. + +### Validation and CI + +The documentation checker exits 0: 187 files checked, 8 exempt, 46 non-failing glossary warnings elsewhere, and no error or warning for the added record. The manifest/policy checker exits 0 with zero findings; its tracked-file policy scan checks 764 files and skips 63 non-UTF-8 files. This publication adds a UTF-8 Markdown file. + +The initially pending jobs were allowed to finish. The PR checks command exits 0. Independent workflow-run metadata ties all three successful runs to the exact reviewed head; the eight check runs are completed and successful, with none pending, failed, cancelled, or skipped. + +```toon +ci_runs[3]{run,workflow,jobs,conclusion}: + 43264020064,Documentation Build and Check,2,success + 43264020174,Unit Tests,2,success + 43264020460,Security Checks,4,success +``` + +The eight jobs are Check Links, Build MkDocs Site, unit tests on Python 3.11 and 3.12, Manifest validation and private-URL policy, Secret scan (gitleaks), Semgrep static analysis, and Trivy filesystem scan. Trivy is explicitly report-only at M1; its green result is not a claim of zero vulnerabilities. Evidence: [documentation run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43264020064), [unit-test run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43264020174), and [security run](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43264020460). + +### Boundaries and remaining work + +The review used a separate clone, read-only GitHub queries, byte comparison, text inspection, and local documentation/manifest checks. The only GitHub write was one PR #53 comment with the r1 reviewer prefix; its published body was verified. No commit, push, approval, merge, or issue closure is part of this review. This record is delivered uncommitted for later publication. No corrective work remains for PR #53 within this scope; PR #8's deferred issue and future integration requirements remain as recorded in r8. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**Pass。阻害する指摘や修正依頼はありません。** 収録の忠実性、PR 差分全体、判定行、公開時の情報漏えい、完了した CI(リポジトリの自動検査)を確認しました。認証実装の再レビューや、RDM-osf.io-dev2027 PR #8 の後続統合の認定ではありません。 + +対象 head は `0f98d3930362b0e4d4364589e8585d0d6b25e993`、ベースは develop `c0e76821d965ac38766410823a492eda80eb5664` です。最終メタデータ確認時刻 `2026-11-12T16:57:33Z`(JST では 2026-11-13)に、同じ head と検査 8 件すべての成功を確認しました。 + +### 原本との一致と変更範囲 + +独立した scratch clone と GitHub の変更ファイル情報は一致します。PR 差分全体は `docs/reviews/2026-11-13_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r8.md` だけを追加し、追加 215 行、削除 0 行です。既存ファイルの変更、名前変更、他の追加はありません。指定されたレビュワ原本との直接のバイナリ比較も成功しました。両方の長さと SHA-256(バイト列の指紋)は次のとおりです。 + +```toon +record_identity: + bytes: 23216 + sha256: 649558b7d1f0188d117cd6e6f107342e07175a06fdf7f6aaeaad058759129d79 + byte_identical: true + added_files: 1 + added_lines: 215 + deleted_lines: 0 +``` + +`git diff --check` は成功しました。指定原本は変更していません。 + +### PR 本文と公開内容の検査 + +判定行は r8 の重要な条件をすべて保持しています。head `d1258ec140` の Pass、設定済み CI 14/14 成功、新規 P1/P2 なし、2026-11-13 の所有者判断による R7-01 の繰延べと Issue #16 での未完・権限待ちです。最終マージ前に develop を取り込み、新 head の CI を成功させる条件も保持しています。R7-01 を修正済みとはせず、今後の統合ツリーが既に CI に成功したとも述べていません。指定記録との一致を確認したもので、非公開リポジトリの現在の状態を新たに検証したものではありません。 + +追加記録と PR 本文の全文確認および対象パターン検査で、非公開リポジトリ URL、端末固有の絶対パス、秘密の認証情報と見られる値は見つかりませんでした。非公開リポジトリは名前のみで参照し、ソース内の相対ファイル名やコミット識別子は証拠であって端末固有のパスではありません。リポジトリの方針検査も検出 0 件で、対象 head の gitleaks ジョブも成功しています。 + +### 検証と CI + +文書検査は終了コード 0、検査 187 ファイル、除外 8 ファイルでした。他の文書に非失敗扱いの用語注警告 46 件があり、追加記録へのエラー・警告はありません。manifest・方針検査は終了コード 0、検出 0 件でした。追跡ファイルの方針検査は 764 ファイルを検査し、UTF-8 ではない 63 ファイルを除外しています。今回追加するのは UTF-8 の Markdown ファイルです。 + +当初待機中だったジョブの完了を待ちました。PR 検査コマンドは終了コード 0 です。各 workflow 実行のメタデータでも、成功した 3 実行が対象 head そのものに属すると確認しました。検査 8 件はすべて完了・成功で、待機・失敗・取消・スキップはありません。 + +```toon +ci_runs[3]{run,workflow,jobs,conclusion}: + 43264020064,Documentation Build and Check,2,success + 43264020174,Unit Tests,2,success + 43264020460,Security Checks,4,success +``` + +8 ジョブは、Check Links、Build MkDocs Site、Python 3.11 と 3.12 の単体試験、Manifest validation and private-URL policy、Secret scan (gitleaks)、Semgrep static analysis、Trivy filesystem scan です。Trivy は M1 では報告のみと明記されており、成功を脆弱性 0 件の主張とは扱いません。証拠は [文書検査の実行](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43264020064)、[単体試験の実行](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43264020174)、[セキュリティ検査の実行](https://github.com/RCOSDP/RDM-developer-guide/actions/runs/43264020460)です。 + +### 制約と残件 + +独立 clone、GitHub の読取り、バイト比較、全文確認、ローカルの文書・manifest 検査を使用しました。GitHub 書込みは r1 のレビュワ接頭辞を持つ PR #53 コメント 1 件だけで、投稿本文の一致も確認しました。commit・push・approve・merge・Issue close は今回の作業に含めません。この記録は後日の収録用として未 commit で引き渡します。今回の範囲で PR #53 に修正残件はありません。PR #8 の繰延べ課題と今後の統合条件は r8 の記録どおり残ります。 diff --git a/docs/reviews/2026-11-13_RDM-developer-guide_PR54_Review_Records_r1.md b/docs/reviews/2026-11-13_RDM-developer-guide_PR54_Review_Records_r1.md new file mode 100644 index 0000000..5732d03 --- /dev/null +++ b/docs/reviews/2026-11-13_RDM-developer-guide_PR54_Review_Records_r1.md @@ -0,0 +1,87 @@ +# PR54 Review records publication review r1 / レビュー記録公開レビュー r1 + +> **Summary:** The sole added review record is byte-identical to the original, and the pull-request verdict row accurately summarizes it. All eight checks passed on the reviewed head; no findings remain. +> **概要:** 追加されたレビュー記録1件は原本とバイト一致し、PR本文の判定行も原記録を正確に要約している。対象 head の全8チェックが成功し、指摘はない。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-13. **Learned:** Publication fidelity requires both byte comparison and checking the verdict summary against the original record. / 記録公開の忠実性は、バイト比較と原記録に対する判定要約の照合の両方で確認する必要がある。 +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Applies to / 対象: [RDM-developer-guide PR #54](https://github.com/RCOSDP/RDM-developer-guide/pull/54), head `e4e776a327abfc48a9e42c7362cd2c7b9c4ad927`. +- Related / 関連: [Review index / レビュー索引](README.md); [SPEC-06](../spec/06_documentation_conventions.md); [Published r4 record / 公開対象 r4 記録](2026-11-13_RDM-osf.io-dev2027_PR10_Admin_2FA_r4.md). +- Used by / 利用先: [PR #54 integration decision / PR #54 統合判断](https://github.com/RCOSDP/RDM-developer-guide/pull/54). +- Publication / 公開: [Review comment / レビューコメント](https://github.com/RCOSDP/RDM-developer-guide/pull/54#issuecomment-6835039015). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and evidence + +**PASS.** No findings. The branch `docs/review-records-2026-11-13b` adds only `docs/reviews/2026-11-13_RDM-osf.io-dev2027_PR10_Admin_2FA_r4.md`: 195 added lines and no deletions. Both the GitHub file list and the isolated clone's comparison against the fetched develop merge base confirm this scope. + +A direct `cmp` comparison with the supplied reviewer original succeeds. The file is 20,925 bytes and its SHA-256 is `c35c8a0fced98f85e0d4fa91942750ef92f5f8965b7501b4e0f6f7575ed1aa19`. The original was not rewritten. + +The body verdict row matches the original: RDM-osf.io-dev2027 PR #10 r4 passed at `2743776da7`, all 14 checks succeeded, no P1/P2 remained open, and integration of #8's global admin login guard closed R2-01. These are historical statements from the original review, not the check count for PR #54. + +Manual inspection and targeted scanning found no private-repository URLs, machine-local paths or exposed secrets in the addition. Source-relative paths and application routes in the record are technical references, not workstation paths. The PR body likewise contains no such disclosure; its external attribution/session links are not private-repository URLs or credentials. + +### Validation and limits + +The final head query confirmed the same reviewed commit and eight completed successful checks. Documentation build/link checks, both Python unit-test jobs, gitleaks, Semgrep, Trivy and manifest policy validation all passed. Trivy is explicitly report-only and its green result is not a claim of zero vulnerabilities. + +```toon +validation: + head: e4e776a327abfc48a9e42c7362cd2c7b9c4ad927 + checks: 8 success + documentation_run: 43300026617 + unit_run: 43300026795 + security_run: 43300026721 + latest_check_completed_utc: 2026-11-12T20:25:28Z + byte_comparison: identical + diff_whitespace_check: pass + docs_check: 189 checked, 8 exempt, 46 warnings, pass + manifest_check: 0 findings, pass +``` + +Local documentation warnings concern existing files; none names the added record. The clone remained clean. This is a publication review, not a fresh authentication-code review or rerun of PR #10's tests. Exactly one authorized comment was posted to PR #54. No merge, approve, close, push or commit was performed; the review record remains uncommitted. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と証拠 + +**合格。** 指摘なし。ブランチ `docs/review-records-2026-11-13b` の変更は `docs/reviews/2026-11-13_RDM-osf.io-dev2027_PR10_Admin_2FA_r4.md` の追加だけであり、195行追加、削除なし。GitHubの変更ファイル一覧と、隔離cloneで取得したdevelopとの共通祖先からの差分の両方で確認した。 + +指定されたレビュワ原本との `cmp` 比較は成功した。ファイルは20,925バイトで、SHA-256は `c35c8a0fced98f85e0d4fa91942750ef92f5f8965b7501b4e0f6f7575ed1aa19`。原本は書き換えていない。 + +本文の判定行は原記録と一致する。RDM-osf.io-dev2027 PR #10 r4は `2743776da7` で合格、全14チェック成功、未解決P1/P2なし、#8の管理画面全体のログインガード統合によりR2-01解消である。これらは原レビューの過去の結果であり、PR #54のチェック数ではない。 + +目視確認と対象を絞った検索では、追加記録に非公開リポジトリURL、端末固有のローカルパス、秘密情報の露出を認めなかった。記録内のソース相対パスやアプリ経路は技術的参照であり、端末のパスではない。PR本文にも同様の漏えいはなく、外部の生成元・セッションリンクは非公開リポジトリURLや認証情報ではない。 + +### 検証と限界 + +最終照会で対象コミットが変わっていないことと、全8チェックの完了・成功を確認した。文書ビルドとリンク検査、Python両版の単体試験、gitleaks、Semgrep、Trivy、manifest方針検査が成功した。Trivyは明示的に報告専用であり、成功を脆弱性ゼロの証明とは扱わない。 + +```toon +validation: + head: e4e776a327abfc48a9e42c7362cd2c7b9c4ad927 + checks: 8 success + documentation_run: 43300026617 + unit_run: 43300026795 + security_run: 43300026721 + latest_check_completed_utc: 2026-11-12T20:25:28Z + byte_comparison: identical + diff_whitespace_check: pass + docs_check: 189 checked, 8 exempt, 46 warnings, pass + manifest_check: 0 findings, pass +``` + +ローカル文書検査の警告は既存ファイルに関するもので、追加記録への警告はない。cloneはcleanのまま。今回は公開内容のレビューであり、認証コードの新規レビューやPR #10の試験再実行ではない。許可されたコメントをPR #54に正確に1件投稿した。merge・approve・close・push・commitは実行せず、レビュー記録は未コミットのまま残す。 diff --git a/docs/reviews/2026-11-13_RDM-developer-guide_PR55_Review_Records_r1.md b/docs/reviews/2026-11-13_RDM-developer-guide_PR55_Review_Records_r1.md new file mode 100644 index 0000000..11332ba --- /dev/null +++ b/docs/reviews/2026-11-13_RDM-developer-guide_PR55_Review_Records_r1.md @@ -0,0 +1,81 @@ +# PR55 Review records r1 / PR55 レビュー記録収録レビュー r1 + +> **Summary:** Pass. The sole added record is byte-identical to the original, the PR verdict row is accurate, and all eight checks on the reviewed head succeeded. +> **概要:** Pass。追加された唯一の記録は原本とバイト単位で一致し、PR の判定行は正確で、対象 head の全 8 チェックが成功した。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-13. **Learned:** Publication fidelity requires checking the exact original bytes and distinguishing the archived review's CI evidence from the publication PR's own checks. / 記録の忠実な公開には原本とのバイト比較と、収録元レビューの CI 証拠と公開 PR 自体の検査の区別が必要である。 +- Applies to / 対象: RCOSDP/RDM-developer-guide PR #55, head `fa36edc27b8fa48998c1d5a942c2acbd1a191d8e`, base `ae7eb75a979a16dc2dfc49b8cfa54de4d2dcf389`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Related / 関連: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [Reviewed record / 対象記録](2026-11-13_RDM-osf.io-dev2027_PR11_Search_ES8_r7.md). +- Used by / 利用先: [PR #55 acceptance decision / PR #55 受入判断](https://github.com/RCOSDP/RDM-developer-guide/pull/55). +- Review comment / レビューコメント: [6837337493](https://github.com/RCOSDP/RDM-developer-guide/pull/55#issuecomment-6837337493). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +**Pass. No actionable finding.** This is a review verdict, not a GitHub approval. + +### Scope and fidelity + +An isolated scratch clone was checked against the PR head. The complete base-to-head change adds only `docs/reviews/2026-11-13_RDM-osf.io-dev2027_PR11_Search_ES8_r7.md`, with 238 added lines and no deletions. No other file changed. A direct `cmp` comparison against the coordinator-designated original succeeded. The SHA-256 fingerprint of the added record is `bf1c19041b61823af1b5d3519ffe6389afba8165fd06d22963824f4e460bc5ef`. + +The PR body's verdict row accurately summarizes the original: pass for RDM-osf.io-dev2027 PR #11 at head `3141302178`, 14 successful CI jobs, all 48 ES8-labelled tests passing without skips in each website run, preservation of PR #8 authorization on the ES8 path, and no overlap between PR #10's changes and the search changes. The 48-test claim does not imply the entire website suite had no skips. This publication review does not repeat the underlying application review. + +The complete added record and PR body were read and scanned for private-repository URLs, local absolute paths, and common credential patterns. None were found. Private repositories are named without URLs; source-relative code paths are not local-machine paths. No secret was identified. Pattern scanning and manual inspection are bounded checks, not proof that every possible secret format is detectable. + +### Validation and CI + +Local `python3 tools/docs_check.py` passed with 191 files checked, 8 exempt files, and 46 existing glossary warnings; none concern the new record. Local `python3 tools/manifest_check.py` passed with zero findings, and `git diff --check` passed. The clone remained clean. + +CI means the automated checks attached to the change. The reviewer waited for completion and confirmed that all eight PR checks passed. All three workflow runs identify the reviewed head and completed successfully. The following TOON block records observed results, not a canonical manifest. + +```toon +ci[3]{run_id,workflow,checks,result}: + 43317371254,Unit Tests,2,success + 43317371308,Documentation Build and Check,2,success + 43317371363,Security Checks,4,success +``` + +The checks cover Python 3.11 and 3.12 unit tests, the documentation build, links, manifest/private-URL policy, gitleaks, Semgrep, and Trivy. Trivy retains its report-only policy; a successful job does not establish an enforced vulnerability gate. Head identity was refreshed immediately before posting the review comment. + +Exactly one PR comment was posted with the required reviewer prefix. No commit, push, merge, approval, or closure was performed. No correction is required within this scope; the coordinator retains the acceptance decision. Links are relative to the intended `docs/reviews/` publication location. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +**Pass。要修正指摘なし。** レビューの判定であり、GitHub 上の承認ではない。 + +### 範囲と原本一致 + +独立した作業用 clone を PR head と照合した。base から head までの全変更は `docs/reviews/2026-11-13_RDM-osf.io-dev2027_PR11_Search_ES8_r7.md` の追加のみで、238 行追加・削除なし。他のファイルに変更はない。連携調整者が指定した原本との直接の `cmp` 比較は成功した。追加記録の SHA-256 指紋は `bf1c19041b61823af1b5d3519ffe6389afba8165fd06d22963824f4e460bc5ef` である。 + +PR 本文の判定行は原本を正確に要約している。RDM-osf.io-dev2027 PR #11 の head `3141302178` に対する pass、CI 14 ジョブ成功、各 website run で ES8 名の 48 件が skip なしで全件成功、ES8 経路における PR #8 の認可保持、PR #10 と検索変更の非重複が一致する。48 件の記述は website 全体に skip がなかったという意味ではない。この公開レビューは元のアプリケーションレビューを繰り返すものではない。 + +追加記録全体と PR 本文を読み、非公開リポジトリ URL、ローカル絶対パス、一般的な資格情報のパターンを検査した。該当はなかった。非公開リポジトリは URL なしの名前で示され、ソース内の相対的なコードパスは端末固有のローカルパスではない。秘密情報は見つからなかった。パターン検査と目視確認には範囲の限界があり、あらゆる秘密情報の形式を検出できる証明ではない。 + +### 検証と CI + +ローカルの `python3 tools/docs_check.py` は 191 ファイル検査、8 ファイル免除、既存の用語注警告 46 件で成功した。新規記録への警告はない。`python3 tools/manifest_check.py` は指摘 0 件で成功し、`git diff --check` も成功した。clone は clean のままである。 + +CI は変更に対する自動検査を指す。完了まで待ち、PR の全 8 チェック成功を確認した。3 workflow run はすべて対象 head を示し、成功で完了した。次の TOON ブロックは観測結果であり、正本 manifest ではない。 + +```toon +ci[3]{run_id,workflow,checks,result}: + 43317371254,Unit Tests,2,success + 43317371308,Documentation Build and Check,2,success + 43317371363,Security Checks,4,success +``` + +検査は Python 3.11・3.12 の単体試験、文書ビルド、リンク、manifest・非公開 URL 方針、gitleaks、Semgrep、Trivy を含む。Trivy は既存の report-only 方針であり、ジョブ成功を脆弱性ゲートの強制と解釈しない。レビューコメント投稿の直前に head の一致を再確認した。 + +指定されたレビュワの接頭辞で PR コメントをちょうど 1 件投稿した。commit・push・merge・approve・close は行っていない。この範囲で必要な修正はなく、受入判断は連携調整者に残る。相対リンクは掲載予定の `docs/reviews/` を基準としている。 diff --git a/docs/reviews/2026-11-13_RDM-developer-guide_PR56_Installer_Final_Pins_r1.md b/docs/reviews/2026-11-13_RDM-developer-guide_PR56_Installer_Final_Pins_r1.md new file mode 100644 index 0000000..78f3f0c --- /dev/null +++ b/docs/reviews/2026-11-13_RDM-developer-guide_PR56_Installer_Final_Pins_r1.md @@ -0,0 +1,124 @@ +# REV PR56 Installer final pins review r1 / インストーラー最終固定版レビュー r1 + +> **Summary:** Changes requested: the ZAP sign-in exception accepts unrelated connection failures, and ADR-14 prescribes the wrong upgrade sequence. The four requested check suites passed. +> **概要:** 要修正。ZAP のサインイン除外が無関係な接続失敗も成功扱いにし、ADR-14 の更新手順も誤っている。指定された四種類の検査は通過した。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-13. **Learned:** Publication must redact provenance locations and body artifact paths as well as link destinations; only these location labels changed, with judgments, findings, test results and earlier version lines preserved. / 公開時はリンク先だけでなく出典の場所と本文の成果物パスも秘匿する。場所の表記のみを変更し、判定、指摘、試験結果、過去の版行を保持した。 +- Version / 版: 0.2 — 2026-11-13. **Learned:** REV changed only link destinations for publication: scratch-path links were replaced by repository-relative links or plain-text references. / REV は公開のためリンク先のみを変更し、作業用パスへのリンクをリポジトリ相対リンクまたは平文の参照に置き換えた。 +- Provenance / 出典: Original file / 原本: `2026-11-13_RDM-developer-guide_PR56_Installer_Final_Pins_r1.md`. Publication 0.3 redacts only original-file locations, local artifact paths and the guest checkout location to basenames or neutral artifact names; prior publication link changes remain. Judgments, findings, test results and earlier version lines are unchanged. / 公開版 0.3 では原本の場所、ローカル成果物のパス、ゲスト配置先のみをファイル名または中立的な成果物名に置換し、前公開版のリンク修正を維持する。判定、指摘、試験結果、過去の版行は変更しない。 +- Version / 版: 0.1 — 2026-11-13. **Learned:** successful unit tests do not establish that a scanner exemption identifies the authentication boundary; an unrelated redirect must remain a failed scan. / 単体試験の成功だけでは検査除外が認証の境界を識別しているとは言えず、無関係な転送先への失敗は検査失敗として残す必要がある。 +- Applies to: RCOSDP/RDM-developer-guide PR #56, head `eae88bdd9b61550920d975146d3275ba6aca43bc`, base `develop`; REV round 1. +- Related: [PR #56](https://github.com/RCOSDP/RDM-developer-guide/pull/56) · [review index](../reviews/README.md) · [SPEC-06](../spec/06_documentation_conventions.md). +- Reviewer: REV(担当レビュワ, Codex Astra). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict + +**Changes requested.** R1-01 and R1-02 should be corrected before integration. Review used a clean, detached clone at the specified head. No live Docker commands, live runtime secrets, repository edits, commits, pushes, approvals or merges were used. Test fixtures created only their own temporary files. One PR comment accompanies this report. + +### R1-01 — P2: restrict the ZAP exception to a verified sign-in redirect + +Location: `installer/grdm_dev/scan.py:1058–1065,1108–1113`; related test `installer/tests/test_scan.py:796–807`. + +`zap_behind_sign_in()` accepts any unreachable host different from the target's netloc. It does not check the redirect chain, configured identity-provider endpoint, service, or public-access setting. `run_zap()` then discards a missing report and nonzero scanner exit, and reports the tool as `ok`. An application redirect to a broken unrelated host, or a scanner connection message using a different address representation, can therefore silently bypass dynamic scanning. The note additionally asserts mandatory sign-in without proving it. + +Reproduced without Docker using the existing scanner test harness: `write_compose()`, a healthy web row, `zap_rc=3`, no JSON report, and this output: + +```text +Job spider failed to access URL http://web:5000 : Connect to http://unexpected.invalid:9443 failed: Connection refused +``` + +Observed result: + +```toon +reproduction: + exit: 0 + tool: zap + result: ok + targets: 1 + problems: 0 + note: "ZAP skipped web ... unexpected.invalid:9443 ... mandatory sign-in, ENABLE_PUBLIC_ACCESS=false" +``` + +Require positive evidence of the expected authentication redirect, restricted to the intended service and configured authentication destination. Unknown destinations, public-access mode, and missing reports without that evidence must retain scanner-unavailable exit 51. Record an authenticated-wall exclusion explicitly as skipped coverage, rather than counting it as a scanned target. Add behavioral regression tests for unknown hosts, a different representation of an unreachable target, public access, and the legitimate configured sign-in redirect. Existing tests exercise only the happy exception and exactly matching target host, so they pass despite this defect. + +### R1-02 — P2: replace ADR-14's rotate-before-render upgrade instructions + +Location: `docs/decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md:50,92`. + +Both language halves tell an existing installation to run `secrets rotate` before `compose render`. This contradicts the environment guide §8, the PR procedure, and SPEC-02's existing warning that rendering must precede rotation when keys are retired. Rotation changes all current secrets, drops `SHAREJS_SECRET`, and recreates containers using the still-old Compose definition, which can still reference that removed key and the retired services. It is an unnecessary credential-changing upgrade path and can fail or roll back before the new configuration is rendered. + +Use the implemented `secrets init --missing` followed by render/build/render/up and the once-only `invoke migrate_search` step, or link to that canonical guide sequence. Preserve the old version header and add the correction in English and Japanese. The unrelated ADR statement that the first new-image scan is still pending should also be reconciled with DEMO-20's completed final-pin scan. + +### Checks and evidence + +Commands ran from the clean review clone using `/usr/bin/python3`; each process exit was checked: + +```toon +checks[4]{command,exit,result}: + "PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests",0,"672 tests; 10 skipped; 85.924 seconds" + "/usr/bin/python3 -m unittest discover -s tools/tests",0,"93 tests" + "/usr/bin/python3 tools/docs_check.py",0,"193 files; 8 exempt; 59 warnings" + "/usr/bin/python3 tools/manifest_check.py",0,"0 manifest findings; 0 policy findings; 780 scanned; 63 non-UTF-8 skipped" +``` + +The three requested pins match. Rendering keeps secrets as variable references, separates the ES bootstrap credential from the application credential, gives clients only the public CA mount, publishes no ES8 host port, and retains loopback publication and non-root settings. ES8 HTTP TLS and authentication are enabled, scripts disabled, and setup completion gates initialization and application startup. The setup script verifies its CA and exits on failed API requests. Ember's pinned upstream Dockerfile was read through `gh`: it builds the production bundle from source and serves it with nginx as UID 101; the installer no longer overrides its entrypoint or uses the prebuilt fallback. ES2, mongo and sharejs are absent from the active manifest; lifecycle `up --remove-orphans` removes their obsolete containers without deleting their data. + +`init --missing` has behavioral tests preserving existing values and custom ports, adding the new keys, dropping the retired key, keeping mode 0600, redacting output, and producing identical bytes on the second run. C6 performs the real second-factor step and checks institution isolation; C7 checks bidirectional editor convergence, anonymous socket rejection and non-contributor token rejection. ES setup/TLS tests are chiefly rendered-configuration assertions, not executed ES integration tests. No live rotation, TLS handshake, cold installation or migration was repeated in this review. A possible rotation concern was investigated against Elasticsearch 8.19.24's entrypoint and ReservedRealm source: an explicit bootstrap password remains the fallback until an elastic-user password is persisted, so merely adding these keys is not evidence of a rotation defect; no such finding is asserted. + +The pinned osf.io task definitions confirm that `search_ensure_index` ensures the mapped index before initial writes and that `migrate_search` invokes the database-backed migration. This supports the intended sequence, not proof of a populated ES2 migration. Migrations 0006 and 0007 exist at the pinned source. + +The five committed files in `acc-20261112T223428Z-fda84a` were inspected and scanned for credential-shaped values, identities, private keys, tokens and host scratch paths. No such disclosure was found. JSON, collector, TOON, JUnit and pytest output agree on 14 passes, no failures/errors/skips; external-request block count is 138. Evidence paths are repository-relative; tracing is off. These are committed results, not freshly rerun browser tests. + +DEMO-20 v0.20 and status v0.17 preserve historical versions and distinguish the final-pin warm upgrade from the earlier cold run. They explicitly exclude an empty-runtime cold install, real ES2-data reindexing, `images.yml`/per-OS workflow updates, Shibboleth idp admin login and public-access mode; R7-01 remains deferred. The 6,264 open findings and report-only gate are disclosed, not represented as a clean security bill. The complete scan's raw report is not in the committed acceptance folder, so that count remains the documented operator result rather than independently rederived evidence. The wording that all ZAP targets are `ok` must be read with R1-01's skipped-coverage limitation. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定 + +**Changes requested(要修正)。** 統合前に R1-01 と R1-02 を修正する。指定 head の隔離クローンで実施した。稼働中の Docker 操作、実環境の秘密の参照、リポジトリ編集、commit、push、approve、merge は行っていない。試験は自身の一時ファイルだけを作成した。PR コメントは一件のみ投稿する。 + +### R1-01 — P2: ZAP の除外を確認済みのサインイン転送に限定する + +対象: `installer/grdm_dev/scan.py:1058–1065,1108–1113`、関連試験 `installer/tests/test_scan.py:796–807`。 + +`zap_behind_sign_in()` は対象の netloc と違う接続失敗先ならすべて受け入れる。転送経路、設定された認証先、サービス、公開アクセス設定を確認しない。`run_zap()` はレポート欠落と非ゼロ終了を捨て、検査を `ok` とする。このため無関係な壊れた転送先や、対象ホストの別表記でも動的検査をすり抜けうる。注記の「必須サインイン」も確認されていない。 + +既存の模擬試験で、正常な web、ZAP 終了 3、JSON レポートなし、転送先 `unexpected.invalid:9443` の接続拒否を与えると、終了 0、`result: ok`、対象 1、問題 0 を再現した。入力全文と結果は英語部に示した。 + +予定したサービスと設定済み認証先への転送であることを肯定的に確認すること。不明な宛先、公開アクセス、根拠のないレポート欠落は終了 51 のままにする。正当な認証壁による除外も、検査済み対象に数えず対象外として記録する。不明ホスト、対象の別表記、公開アクセス、正当な認証転送の挙動試験を追加する。現行試験は許可例と対象ホストの完全一致しか確認せず、この欠陥を検出しない。 + +### R1-02 — P2: ADR-14 の render 前 rotate を修正する + +対象: `docs/decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md:50,92`。 + +英和とも既存環境に `compose render` より先に `secrets rotate` を要求している。環境ガイド §8、PR 手順、廃止キーがある更新では render が先という SPEC-02 と矛盾する。rotate は全秘密を変更し `SHAREJS_SECRET` を削除したうえで、古い Compose によりコンテナを再作成する。その定義には廃止キーやサービスが残りうる。不要な資格情報変更を伴い、新設定の生成前に失敗・ロールバックする可能性がある。 + +実装済みの `secrets init --missing`、render/build/render/up、初回だけの `invoke migrate_search` に統一するか、正本であるガイドの手順へリンクする。過去の版を保持し、英和を同時に訂正する。初回検査が未実施という ADR の残存記述も、DEMO-20 の最終固定版の検査完了と整合させる。 + +### 検査と証拠 + +隔離クローンでシステムの `/usr/bin/python3` を使用し、終了コードを確認した。installer は 672 件・10 skip・85.924 秒、tools は 93 件、docs_check は 193 ファイル・8 例外・59 警告、manifest_check は manifest/policy とも指摘 0(780 検査、非 UTF-8 の 63 を除外)。四コマンドとも終了 0。正確なコマンドは英語部の一覧に記録した。 + +指定した三つの固定 SHA は一致する。Compose の秘密は変数参照で、ES の管理者資格情報とアプリ用資格情報は分離され、クライアントは公開 CA のみをマウントする。ES8 のホストポートは公開されず、ほかの公開はループバックと非 root の方針を保持する。HTTP TLS・認証は有効、スクリプトは無効、setup 成功が初期化とアプリ起動の条件になっている。setup は CA を検証し API 失敗で停止する。固定先 Ember Dockerfile を gh で読み、ソースからの本番ビルド、nginx の UID 101 配信を確認した。installer は entrypoint を上書きせず事前ビルド代替も使わない。ES2・mongo・sharejs は有効な manifest に存在せず、up の `--remove-orphans` は旧コンテナを除去するがデータを削除しない。 + +`init --missing` の試験は既存値と独自ポートの保持、新キー追加、廃止キー除去、0600、出力秘匿、二回目のバイト一致を実行している。C6 は実際の第二要素入力と所属機関の分離、C7 は双方向の文字伝播、匿名ソケット拒否、非共同研究者のトークン拒否を検証する。ES setup/TLS の試験は主に生成設定の確認で、実 ES の統合試験ではない。今回、実際の rotate・TLS 接続・コールド導入・移行は再実行していない。rotate の懸念は ES 8.19.24 の entrypoint と ReservedRealm ソースで確認した。明示した bootstrap password は elastic 利用者のパスワードが永続化されるまで既定の認証として使われるため、新キー追加だけを根拠とする rotate 不具合は指摘しない。 + +固定先 osf.io のタスクは初回書き込み前の `search_ensure_index` と、DB に基づく `migrate_search` を備える。予定する順序の裏付けであり、実データを持つ ES2 移行の実証ではない。0006・0007 の migration ファイルも固定先に存在する。 + +`acc-20261112T223428Z-fda84a` の五ファイルを読み、秘密らしい値、識別情報、秘密鍵、トークン、ホストの作業パスを検査した。該当する漏えいは見つからなかった。JSON・collector・TOON・JUnit・pytest は 14 成功、失敗・error・skip 0 で一致し、外部要求の遮断数は 138。証拠パスはリポジトリ相対、trace は無効である。これはコミット済み証拠の確認で、ブラウザ試験の再実行ではない。 + +DEMO-20 v0.20 と状況ボード v0.17 は旧版を保持し、最終固定版の既存環境更新と過去のコールド実行を区別する。空 runtime からの最終版導入、実 ES2 データの索引再構築、images.yml/per-OS ワークフロー変更、Shibboleth idp 管理者ログイン、公開アクセスは未実証と明示し、R7-01 も保留である。未解決 6,264 件と report-only は開示され、安全性が完全と主張していない。ただし完全な scan の生レポートは受入フォルダに含まれず、件数は今回独立再集計した値ではなく作業者の記録である。ZAP 全対象が ok という表現には R1-01 の除外範囲の限界がある。 diff --git a/docs/reviews/2026-11-13_RDM-developer-guide_PR56_Installer_Final_Pins_r2.md b/docs/reviews/2026-11-13_RDM-developer-guide_PR56_Installer_Final_Pins_r2.md new file mode 100644 index 0000000..9a3758b --- /dev/null +++ b/docs/reviews/2026-11-13_RDM-developer-guide_PR56_Installer_Final_Pins_r2.md @@ -0,0 +1,84 @@ +# REV PR56 Installer final pins review r2 / インストーラー最終固定版レビュー r2 + +> **Summary:** Changes requested: the original false-success reproduction is fixed, but a malformed redirect Location escapes as an exception instead of scanner-unavailable exit 51. R1-02 is closed; all four requested check suites pass. +> **概要:** 要修正。元の誤成功の再現は解消したが、不正な Location が未処理例外となり、スキャナー未完の終了 51 にならない。R1-02 は解消し、指定の四検査は通過した。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-13. **Learned:** Publication must redact provenance locations and body artifact paths as well as link destinations; only these location labels changed, with judgments, findings, test results and earlier version lines preserved. / 公開時はリンク先だけでなく出典の場所と本文の成果物パスも秘匿する。場所の表記のみを変更し、判定、指摘、試験結果、過去の版行を保持した。 +- Version / 版: 0.2 — 2026-11-13. **Learned:** REV changed only link destinations for publication: scratch-path links were replaced by repository-relative links or plain-text references. / REV は公開のためリンク先のみを変更し、作業用パスへのリンクをリポジトリ相対リンクまたは平文の参照に置き換えた。 +- Provenance / 出典: Original file / 原本: `2026-11-13_RDM-developer-guide_PR56_Installer_Final_Pins_r2.md`. Publication 0.3 redacts only original-file locations, local artifact paths and the guest checkout location to basenames or neutral artifact names; prior publication link changes remain. Judgments, findings, test results and earlier version lines are unchanged. / 公開版 0.3 では原本の場所、ローカル成果物のパス、ゲスト配置先のみをファイル名または中立的な成果物名に置換し、前公開版のリンク修正を維持する。判定、指摘、試験結果、過去の版行は変更しない。 +- Version / 版: 0.1 — 2026-11-13. **Learned:** a non-following HTTP probe can successfully return an invalid Location; validating its output must itself fail closed without interrupting the scanner report. / 転送を追わない HTTP の探りは不正な Location も正常に返しうるため、その出力の検証自体も報告の生成を中断せず安全に失敗する必要がある。 +- Applies to: RCOSDP/RDM-developer-guide PR #56, `eae88bdd9b61550920d975146d3275ba6aca43bc..cb93d48a855dbb894575c1efa815b65668dbaecc`; REV round 2. +- Related: [PR #56](https://github.com/RCOSDP/RDM-developer-guide/pull/56) · [review index](../reviews/README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [r1](2026-11-13_RDM-developer-guide_PR56_Installer_Final_Pins_r1.md). +- Reviewer: REV(担当レビュワ, Codex Astra). + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and remaining finding + +**Changes requested.** R1-01's original arbitrary-host bypass is fixed, but its requirement that other failures remain exit 51 is not fully met. R1-02 is closed. No other blocking finding was identified in the seven-file delta. + +**R2-01 — P2: reject malformed redirect URLs without escaping the scan.** Location: `installer/grdm_dev/scan.py:1103` (also URL parsing at 1076 and 1097). After the expected ZAP message and mandatory-sign-in configuration pass, the probe can return exit 0 and `302 http://[broken`. `urlsplit()` raises `ValueError: Invalid IPv6 URL`. Neither `run_zap`, `scan.run`, nor the CLI catches that error, so the process exits 1 with a traceback before writing the normal scan report, instead of recording an incomplete ZAP result and returning 51. This remains a nonzero failure, not a false successful scan; the defect is the promised failure classification and loss of the report. + +Reproduced using `ScannerRobustnessTests`: `setUp()`, `write_osf_env()`, then `zap_web(probe=(0, '302 http://[broken\n'))`, with cleanup in `finally`. The standalone reproduction process exited 1. This is not just an impossible mocked stdout: a temporary loopback HTTP server returned that Location, and the exact `ZAP_REDIRECT_PROBE` source executed with `/usr/bin/python3 -c` returned exit 0 and that line. An ordinary sign-in Location returned exit 0 and produced the expected skipped result. Two invocations generated exactly two server requests, confirming that redirects were not followed. A closed-port probe exited 1; existing tests confirm a nonzero probe result becomes scan exit 51. + +Catch URL-validation errors at the exception boundary and treat them as no verified sign-in evidence, allowing the existing missing-report path to return 51. Add a behavioral regression asserting exit 51, an incomplete result, and no `skipped_targets` for malformed Location; cover malformed addresses in the ZAP message and configured destination as well. The new configuration reads should also degrade to no exemption when their evidence cannot be read or decoded, rather than interrupting report generation. + +### What is verified + +The exception is restricted to `web`. It requires rendered `ENABLE_PUBLIC_ACCESS=false`, no conflicting `GRDM_ENABLE_PUBLIC_ACCESS`, the matching seed, the configured CAS host and explicit port (case-normalized, with no default-port or localhost guessing), and a separate probe showing an accepted redirect status and that same destination. Unknown hosts, changed ports, different seeds, public access, absent configuration, wrong services, missing/failed probes, relative Locations and ordinary wrong destinations retain 51 in the passing tests. The exact r1 `unexpected.invalid:9443` reproduction now returns 51. A fixture with the Shibboleth SP destination `127.0.0.1:8082` (its template default), distinct from CAS, also returns 51. This verifies the destination rejection, not a live Shibboleth login. + +Verified exclusions appear in `skipped_targets`, are removed from `targets`, and produce `ok (0 scanned, 1 skipped behind sign-in: http://web:5000)` plus the explicit `ZAP NOT RUN` note. The probe argv invokes `python3 -c` inside the ZAP image on the scan network; it uses `HTTPConnection`, a 20-second socket timeout, one GET to `/`, and no redirect follower. Current seeds are fixed HTTP root URLs, so the hardcoded path and HTTP connection match them. Docker execution, image availability, and the probe inside that image were not tested; Docker/Python execution failure is represented by a nonzero runner return and is rejected. The malformed-Location parsing failure is the remaining exception to this handling. + +ADR-14 0.2 now prescribes `secrets init --missing`, render/build/render/up and a once-only `invoke migrate_search`, linked to the canonical guide, in both languages. Its obsolete first-scan-pending statement is corrected without implying that the allow-list has been reviewed. SPEC-02 0.32, SPEC-03 0.17, environment guide 1.10 and DEMO-20 0.21 have corresponding English/Japanese updates. A script confirmed that all previous Learned/version entries remain. DEMO-20 explicitly corrects the earlier “ZAP (3) all ok” wording: the raw final scan is uncommitted, coverage/counts are operator records or inference, web was not proven scanned, and the stricter code has not run on the Mac Studio stack. That limitation is honest. + +### Checks and boundaries + +Clean detached clone: `rev-pr56-r2-clone`; GitHub head was checked with `gh pr view`. Commands ran from that clone; process exits were checked individually: + +```toon +checks[4]{command,exit,result}: + "PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests",0,"677 tests; 10 skipped; 88.044 seconds" + "/usr/bin/python3 -m unittest discover -s tools/tests",0,"93 tests; 5.595 seconds" + "/usr/bin/python3 tools/docs_check.py",0,"193 files; 8 exempt; 58 warnings" + "/usr/bin/python3 tools/manifest_check.py",0,"0 manifest findings; 0 policy findings; 780 scanned; 63 non-UTF-8 skipped" +``` + +The targeted probe script and version-preservation checks exited 0; the deliberately uncaught malformed-Location reproduction exited 1. Logs/scripts are `rev-pr56-r2-{installer,tools,docs,manifest,probe}.log`, `rev-pr56-r2-probe.py`, `rev-pr56-r2-malformed.py`, and `rev-pr56-r2-versions.py`. The clone has no tracked changes. No live Docker command, live `runtime/.env` access, commit, push, approval, merge, close or prune was performed. Temporary fixtures contain synthetic values only. One concise Japanese PR comment accompanies this report. Remaining work: fix R2-01 and rerun its regression; a real Docker probe/stack scan remains explicitly unverified. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と残件 + +**Changes requested(要修正)。** R1-01 の任意ホストによる誤成功は解消したが、それ以外の失敗を終了 51 にする要件が残る。R1-02 は解消した。七ファイルの差分に、ほかの統合を止める指摘はない。 + +**R2-01 — P2: 不正な転送 URL を検査全体の例外にせず拒否する。** 対象は `installer/grdm_dev/scan.py:1103`(1076、1097 の URL 解析も関連する)。想定した ZAP メッセージと必須サインイン設定が成立しても、探りが終了 0 と `302 http://[broken` を返すと `urlsplit()` が `ValueError: Invalid IPv6 URL` を送出する。`run_zap`、`scan.run`、CLI のいずれも捕捉しないため、未完の ZAP 結果と終了 51 を出す代わりに、通常の報告を書かず traceback と終了 1 で終わる。誤成功ではなく非ゼロの失敗ではあるが、約束した失敗分類と報告の生成が失われる。 + +既存の `ScannerRobustnessTests` で `setUp()`、`write_osf_env()`、`zap_web(probe=(0, '302 http://[broken\n'))` を実行し、`finally` で片付ける単独スクリプトが終了 1 になった。模擬出力だけの話ではない。一時的なループバック HTTP サーバーからその Location を返し、実装そのままの `ZAP_REDIRECT_PROBE` を `/usr/bin/python3 -c` で動かすと、終了 0 と該当行が返る。正常なサインイン Location では正しく対象外になる。二回の実行でサーバーへの要求は二回だけで、転送を追わないことを確認した。閉じたポートへの探りは終了 1。探りの非ゼロが検査の終了 51 になることは既存試験が確認している。 + +URL 検証の例外を除外判定の境界で捕捉し、認証転送の証拠なしとして既存の報告欠落経路から終了 51 にすること。不正な Location に対して終了 51、未完の結果、`skipped_targets` なしを確認する回帰試験を追加する。ZAP メッセージと設定先の不正なアドレスも対象にする。新しい設定読取りについても、読取り・文字デコードができない証拠は除外を認めず、報告の生成を中断しない形にする。 + +### 確認できた点 + +除外は `web` に限定され、生成済みの `ENABLE_PUBLIC_ACCESS=false`、矛盾する `GRDM_ENABLE_PUBLIC_ACCESS` がないこと、対象の種 URL、設定済み CAS のホストと明示ポート、そして独立した探りの対応する転送先を要求する。大文字小文字は正規化するが、既定ポートや localhost の同一視はしない。未知ホスト、別ポート、別の種、公開アクセス、設定欠落、別サービス、探りの欠落・失敗、相対 Location、通常の別転送先は、通過した試験で終了 51 を保つ。r1 の `unexpected.invalid:9443` は実際に 51 になった。CAS と異なる Shibboleth SP の宛先 `127.0.0.1:8082`(テンプレートの既定値)の模擬例も 51 になった。これは宛先拒否の確認であり、実 Shibboleth ログインの検証ではない。 + +正当な対象外は `skipped_targets` に載り、`targets` から外れ、`ok (0 scanned, 1 skipped behind sign-in: http://web:5000)` と明示的な `ZAP NOT RUN` 注を出す。探りの引数は検査ネットワーク上の ZAP イメージ内で `python3 -c` を実行する形である。`HTTPConnection`、20 秒のソケット timeout、`/` への GET 一回で、転送を追わない。現在の種 URL は HTTP のルートに固定されるため、パスと接続方式は一致する。Docker 実行、イメージの有無、そのイメージ内の探りは試していない。Docker/Python の実行失敗は runner の非ゼロで拒否されるが、不正な Location の解析だけは残件のとおり例外になる。 + +ADR-14 0.2 は英和とも `secrets init --missing`、render/build/render/up、一度だけの `invoke migrate_search` に訂正され、正本のガイドへリンクする。最初の検査が未了という記述も、許容リストの見直し済みと誤解させず訂正された。SPEC-02 0.32、SPEC-03 0.17、環境ガイド 1.10、DEMO-20 0.21 も英和対応で更新され、過去の Learned/版の行すべてが残ることをスクリプトで確認した。DEMO-20 は以前の「ZAP(3)はすべて ok」を明示的に訂正する。最終検査の生データは未コミットで、網羅と件数は作業者の記録または推定であり、web の検査は証明されず、厳格化した処理は Mac Studio で未実行と開示する。限界の記述は正直である。 + +### 検査と範囲 + +`rev-pr56-r2-clone` の隔離した detached clone を使い、`gh pr view` で GitHub の head を確認した。正確なコマンドは英語部の一覧に記録した。installer は 677 件・10 skip・88.044 秒、tools は 93 件・5.595 秒、docs_check は 193 ファイル・8 例外・58 警告、manifest_check は manifest/policy とも指摘 0(780 検査、非 UTF-8 の 63 を除外)。四コマンドは終了コードを個別に確認し、すべて 0 だった。 + +追加の探り・版保持の確認スクリプトは終了 0、意図して例外を捕捉しない不正 Location 再現は終了 1。ログとスクリプトのパスは英語部に記録した。clone に追跡ファイルの変更はない。実 Docker 操作、実環境の `runtime/.env` 参照、commit、push、approve、merge、close、prune は行っていない。一時試験の値は合成データだけである。日本語の PR コメントは一件のみとする。残件は R2-01 の修正と回帰試験。実 Docker の探りとスタック検査は引き続き未検証である。 diff --git a/docs/reviews/2026-11-13_RDM-developer-guide_PR56_Installer_Final_Pins_r3.md b/docs/reviews/2026-11-13_RDM-developer-guide_PR56_Installer_Final_Pins_r3.md new file mode 100644 index 0000000..5363767 --- /dev/null +++ b/docs/reviews/2026-11-13_RDM-developer-guide_PR56_Installer_Final_Pins_r3.md @@ -0,0 +1,91 @@ +# REV PR56 Installer final pins review r3 / インストーラー最終固定版レビュー r3 + +> **Summary:** Pass. R2-01 is closed: invalid sign-in evidence yields exit 51 and a written incomplete report, without skipped coverage. Earlier R1-01 and R1-02 fixes remain intact. +> **概要:** 合格。不正なサインイン証拠は終了 51 と保存済みの未完報告になり、対象外にはならないため R2-01 は解消した。R1-01 と R1-02 の修正も維持されている。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-13. **Learned:** Publication must redact provenance locations and body artifact paths as well as link destinations; only these location labels changed, with judgments, findings, test results and earlier version lines preserved. / 公開時はリンク先だけでなく出典の場所と本文の成果物パスも秘匿する。場所の表記のみを変更し、判定、指摘、試験結果、過去の版行を保持した。 +- Version / 版: 0.2 — 2026-11-13. **Learned:** REV changed only link destinations for publication: scratch-path links were replaced by repository-relative links or plain-text references. / REV は公開のためリンク先のみを変更し、作業用パスへのリンクをリポジトリ相対リンクまたは平文の参照に置き換えた。 +- Provenance / 出典: Original file / 原本: `2026-11-13_RDM-developer-guide_PR56_Installer_Final_Pins_r3.md`. Publication 0.3 redacts only original-file locations, local artifact paths and the guest checkout location to basenames or neutral artifact names; prior publication link changes remain. Judgments, findings, test results and earlier version lines are unchanged. / 公開版 0.3 では原本の場所、ローカル成果物のパス、ゲスト配置先のみをファイル名または中立的な成果物名に置換し、前公開版のリンク修正を維持する。判定、指摘、試験結果、過去の版行は変更しない。 +- Version / 版: 0.1 — 2026-11-13. **Learned:** a narrowly placed evidence-validation exception handler preserves failure reporting without granting an exemption; reverting only that handler proves the regression test detects the original defect. / 証拠の検証だけを囲む例外処理は除外を認めず失敗報告を維持でき、その処理だけを戻すことで回帰試験が元の欠陥を検出すると確かめられる。 +- Applies to: RCOSDP/RDM-developer-guide PR #56, `cb93d48a855dbb894575c1efa815b65668dbaecc..5fca0b56f5207c1f59d87aa81e9781b6a54edb58`; REV round 3. +- Related: [PR #56](https://github.com/RCOSDP/RDM-developer-guide/pull/56) · [review index](../reviews/README.md) · [SPEC-06](../spec/06_documentation_conventions.md) · [r1](2026-11-13_RDM-developer-guide_PR56_Installer_Final_Pins_r1.md) · [r2](2026-11-13_RDM-developer-guide_PR56_Installer_Final_Pins_r2.md). +- Reviewer: REV(担当レビュワ, Codex Astra). Used by: PR #56 integration decision / 統合判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### Verdict and scope + +**Pass; no remaining blocking finding.** R2-01 is closed. Review used the clean detached clone `rev-pr56-r3-clone`; `gh pr view` confirmed the requested head both before and after verification. Exactly one commit follows r2, changing only `installer/grdm_dev/scan.py` and `installer/tests/test_scan.py`. + +The new `zap_behind_sign_in` wrapper at line 1089 catches `ValueError` (including `UnicodeDecodeError`) and `OSError` only around the sign-in evidence helper. It returns `None`, which makes `run_zap` retain its ordinary missing-report problem. It cannot create a verified destination or increment skipped coverage on that failure. Actual scanning, report reading, findings, and report saving remain outside the wrapper. The helper body, including all positive evidence requirements and the accepted-redirect success path, is otherwise unchanged. + +### R2-01 evidence + +The added regression passes for malformed Location (`http://[broken` and `http://[::1`), malformed ZAP-message host, malformed configured CAS address, and undecodable `osf.env`. An independent temporary script also exercised the four categories separately and opened each generated `runtime/reports/scan_latest.json`: exit 51, incomplete ZAP result, no `skipped_targets`, and saved tool rows matching the emitted report. All files belonged to synthetic temporary fixtures. + +The script additionally injected a configuration `PermissionError`, and probe-runner `ValueError` and `OSError`; each stayed incomplete with exit 51. A `RuntimeError` inside the helper propagated, as did a `ValueError` from `_read_zap_report` outside the wrapper. Thus the catch does not swallow unrelated failures elsewhere or convert missing evidence into success. Existing tests also retain scanner error handling when an actual report exists. The verified redirect test still returns 0 with zero scanned targets, one explicit skipped target, a `ZAP NOT RUN` note, and exactly one probe. + +After the full suites finished, only `scan.py` was temporarily replaced with its `cb93d48` content while retaining the new test. That test exited 1 with `ValueError: Invalid IPv6 URL` at the old line 1103. Restoring `scan.py` from HEAD and rerunning all 25 `ScannerRobustnessTests` exited 0. The clone ends with no tracked changes; no commit was made. + +### Earlier verified points + +R1-01 remains closed: tests reject an arbitrary host, changed host spelling or port, changed seed, public access or conflicting settings, missing configuration, another service, missing/failed probes, relative Location, and a wrong destination. Skipped coverage is explicit and excluded from scanned target counts. R1-02 remains closed: ADR-14 in both languages uses `secrets init --missing`, render/build/render/up, then once-only `invoke migrate_search`, with a canonical guide link; rotate is not the upgrade step. + +Comparison with the r1 head confirms that all files outside the previously reviewed seven-file correction are unchanged. Therefore earlier source-based checks of pins, rendered isolation and ES8 security, secret preservation, upstream build/migration definitions, and committed 14/14 acceptance evidence remain applicable, with their original limitations. These were not fresh live integration tests. The five changed documents preserve every earlier Learned entry, checked by script. DEMO-20 still discloses that the raw full-scan report is uncommitted, per-target coverage and 6,264 findings are operator records or inference, and the stricter scanner has not been run on the Mac Studio stack. + +### Checks and boundaries + +Commands ran from `rev-pr56-r3-clone`; each process exit was checked. The following is this review's observed result record, not a mirror of repository JSON. + +```toon +checks[7]{command,exit,result}: + "PYTHONPATH=installer /usr/bin/python3 -m unittest discover -s installer/tests",0,"678 tests; 10 skipped; 82.221 seconds" + "/usr/bin/python3 -m unittest discover -s tools/tests",0,"93 tests; 5.233 seconds" + "/usr/bin/python3 tools/docs_check.py",0,"193 files; 8 exempt; 58 warnings" + "/usr/bin/python3 tools/manifest_check.py",0,"0 manifest findings; 0 policy findings; 780 scanned; 63 non-UTF-8 skipped" + "PYTHONPATH=installer:installer/tests /usr/bin/python3 rev-pr56-r3-extra.py",0,"written reports and exception boundaries verified" + "PYTHONPATH=installer:installer/tests /usr/bin/python3 -m unittest test_scan.ScannerRobustnessTests.test_zap_malformed_evidence_is_no_evidence_and_the_scan_still_reports_incomplete (scan.py temporarily reverted)",1,"expected ERROR: Invalid IPv6 URL" + "PYTHONPATH=installer:installer/tests /usr/bin/python3 -m unittest test_scan.ScannerRobustnessTests (HEAD restored)",0,"25 tests; 0.430 seconds" +``` + +Logs: `rev-pr56-r3-{installer,tools,docs,manifest,extra,reverted,restored}.log`. The independent script is `rev-pr56-r3-extra.py`. Historical-version preservation and final `git diff --check` also exited 0. Git status was clean. No live Docker operations, live `runtime/.env` access, merge, approval, close, push, commit or prune occurred. Exactly one concise Japanese PR comment accompanies this review. Nothing remains to fix in this review's scope; actual Docker-image probe execution and a new live stack scan remain unverified, as in r2. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 判定と範囲 + +**Pass(合格)。統合を止める残件なし。** R2-01 は解消した。隔離した `rev-pr56-r3-clone` の detached clone を使い、検証の前後に `gh pr view` で指定 head を確認した。r2 後は一コミットだけで、変更は `installer/grdm_dev/scan.py` と `installer/tests/test_scan.py` に限られる。 + +1089 行の `zap_behind_sign_in` は、サインインの証拠を判定する処理だけで `ValueError`(`UnicodeDecodeError` を含む)と `OSError` を捕捉する。返すのは `None` なので、`run_zap` は通常の報告欠落の問題を保つ。失敗から確認済みの宛先を作ったり、対象外の数を増やしたりしない。検査本体、報告の読込み、検出結果、保存はこの捕捉の外にある。肯定的な証拠の全条件と、正当な転送を認める経路は変更されていない。 + +### R2-01 の確認 + +追加試験は、不正な Location(`http://[broken` と `http://[::1`)、ZAP メッセージ中の不正ホスト、設定された CAS の不正アドレス、文字として読めない `osf.env` で通過した。独立した一時スクリプトでも四分類を個別に実行し、生成した `runtime/reports/scan_latest.json` を開いた。終了 51、ZAP 未完、`skipped_targets` なし、保存した tool の行と出力した報告の一致を確認した。すべて合成値を持つ一時試験のファイルである。 + +さらに設定読込みの `PermissionError`、探りを実行する runner の `ValueError` と `OSError` を与え、すべて未完・終了 51 を確認した。判定内の `RuntimeError` は伝播し、捕捉の外にある `_read_zap_report` の `ValueError` も伝播した。したがって別の場所の無関係な失敗を握りつぶしたり、証拠欠落を成功に変えたりしない。実報告がある場合の検査エラーも既存試験で維持される。正当な転送の試験は引き続き終了 0、検査済み 0、明示した対象外 1、`ZAP NOT RUN` 注、探り一回となる。 + +全体試験が終了してから、新しい試験を残したまま `scan.py` だけを一時的に `cb93d48` の内容に戻した。新試験は旧 1103 行の `ValueError: Invalid IPv6 URL` により終了 1 になった。HEAD の内容を復元し `ScannerRobustnessTests` の全 25 件を実行すると終了 0。clone の追跡ファイルに変更は残っておらず、commit はしていない。 + +### 以前の確認点 + +R1-01 は解消を維持する。任意ホスト、ホスト表記やポートの変更、種 URL の変更、公開アクセスや矛盾する設定、設定欠落、別サービス、探りの欠落・失敗、相対 Location、別宛先を試験が拒否する。対象外は明示し、検査済みの数から除く。R1-02 も維持する。ADR-14 は英和とも `secrets init --missing`、render/build/render/up、一度だけの `invoke migrate_search` と正本ガイドへのリンクを示し、rotate を更新手順にしていない。 + +r1 head との比較で、既にレビューした七ファイルの訂正以外は変更がない。固定版、生成した構成の分離と ES8 の安全設定、既存秘密の保持、上流のビルド・移行定義、コミット済み 14/14 受入証拠について、以前のソースに基づく確認と限界は引き続き適用できる。実環境の統合試験を新たに行ったわけではない。変更された五文書の過去の Learned 行は、スクリプトで全保持を確認した。DEMO-20 は引き続き、全検査の生報告が未コミット、対象ごとの網羅と 6,264 件は作業者の記録または推定であり、厳格化した検査は Mac Studio 上で未実行と開示している。 + +### 検査と境界 + +コマンドと個別の終了値は英語部の TOON に記録した。システム `/usr/bin/python3` を使い、installer は 678 件・10 skip・82.221 秒、tools は 93 件・5.233 秒、docs_check は 193 ファイル・8 例外・58 警告、manifest_check は manifest/policy とも指摘 0(780 検査、非 UTF-8 の 63 を除外)。四検査とも終了 0。追加スクリプトも終了 0、意図した修正前再現は終了 1、復元後は 25 件・0.430 秒で終了 0。 + +ログとスクリプトは英語部のパスに保存した。過去の版の保持確認と最後の `git diff --check` も終了 0、Git status は clean。実 Docker 操作、実環境の `runtime/.env` 参照、merge、approve、close、push、commit、prune は行っていない。簡潔な日本語 PR コメントを一件だけ付ける。今回の範囲に修正残件はない。Docker イメージ内での探りの実行と、新しい実スタック検査は r2 同様に未検証である。 diff --git a/docs/reviews/2026-11-13_RDM-osf.io-dev2027_PR10_Admin_2FA_r4.md b/docs/reviews/2026-11-13_RDM-osf.io-dev2027_PR10_Admin_2FA_r4.md new file mode 100644 index 0000000..eecec28 --- /dev/null +++ b/docs/reviews/2026-11-13_RDM-osf.io-dev2027_PR10_Admin_2FA_r4.md @@ -0,0 +1,195 @@ +# PR10 Admin two-factor authentication review r4 / 管理画面二要素認証レビュー r4 + +> **Summary:** The merged global admin guard closes R2-01; the two-factor middleware and public login routes preserve the authentication boundary. Final CI evidence and verdict are recorded in the validation section. +> **概要:** 統合された管理画面全体のガードにより R2-01 は解決し、二要素認証ミドルウェアと公開ログイン経路は認証境界を保つ。最終 CI 証拠と判定は検証節に記録する。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-13. **Learned:** Ending an unverified session closes the admin boundary only when the global login guard runs afterward; a verified non-staff session must still be denied. / 未検証セッションの終了だけでなく、その後に全体ログインガードが動くことで管理画面の境界が閉じ、検証済みでも管理権限がなければ拒否される。 +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Applies to / 対象: `RCOSDP/RDM-osf.io-dev2027` PR #10, head `2743776da706b46c49b017d9fe864fbe33160219`. +- Related / 関連: [r3 review / r3 レビュー](2026-11-12_RDM-osf.io-dev2027_PR10_Admin_2FA_r3.md); SPEC-06 documentation conventions; QAE comment `issuecomment-6832501733`. +- Publication / 公開: PR #10 comment `issuecomment-6834987811`. +- Used by / 利用先: PR #10 integration decision / PR #10 統合判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +<a id="en-verdict"></a> +### Verdict and scope + +**PASS.** All 14 checks are green on the reviewed head, and no P1/P2 remains open. Final head/check verification: 2026-11-12 20:22 UTC. + +R2-01 (P1) is **closed**. No new P1/P2 was found in the requested authentication integration. This is a code-review comment, not a GitHub approval or merge operation. + +The reviewed range is `e09c49111e..2743776da7`. PR #8 is merged into develop at `66ce3a573cb0d6b63972137a86d730acb3c2c285`; that commit is an ancestor of this head. Merge `b33286265d` integrates #8's head `b0d4bb8d37`, and `2743776da7` has the same tree as `b33286265d`. The broader private-access changes imported from #8 are not a fresh independent review of #8. The r4 focus is their interaction with #10's admin authentication. The r3 finding and its inherited mixed-process database-test isolation follow-up remain traceable in the linked r3 record; the follow-up is not a reopened product P1/P2. + +<a id="en-boundary"></a> +### R2-01 closure and access boundary + +`admin/base/settings/defaults.py:232–245` installs SessionMiddleware, AuthenticationMiddleware, TwoFactorSessionMiddleware, MessageMiddleware, then AdminLoginRequiredMiddleware. The two-factor check runs in the request chain before the global guard's `process_view`. The intervening message middleware does not execute the protected view. + +`admin/common_auth/middleware.py:20–25` logs out inactive users and sessions whose marker does not verify for the current user. `admin/base/middleware.py:32–43` then redirects anonymous users, logs out inactive users defensively, rejects authenticated users without staff/superuser rights with 403, and permits active staff/superusers. This now protects views without their own check, including `CannotDeleteInstitution`. + +The reviewer used real Django 2.2.28 request handling and unchanged extracted production middleware, verification functions and ODMBackend with a stand-in Django User model, SQLite sessions, and an instrumented protected view. The following are observed probe results, not whole-application test counts. + +```toon +boundary[10]{state,status,protected_view_called}: + anonymous,302,false + pending_only,302,false + unverified_session,302,false + other_user_marker,302,false + expired_grace,302,false + grace_configuration_removed,302,false + inactive_user,302,false + verified_nonstaff,403,false + verified_staff,200,true + verified_superuser,200,true +``` + +Every 302 in this matrix targets the login route and leaves no authenticated user ID in the session. The non-staff row also models loss of both admin roles after verification: the marker does not override current permissions. A negative control removes only the global guard and observes anonymous execution of the same protected view, showing that the probe detects the original gap. Six probe tests pass, including the matrix, middleware order, exact auth-route decorators, protected recovery-route gating, and GET/POST behavior of the extracted `admin_site_login`. + +### Public routes and second-step integrity + +`admin/common_auth/urls.py:13–19` marks exactly five authentication views public: LoginView, ShibLoginView, TwoFactorVerifyView, TwoFactorSetupView, and logout_user. Replacing `_before_login` with `login_not_required` preserves the callback attribute `login_required = False`. Public status belongs to the resolved callback, not an `/account/login` path prefix, so the exception does not expose other admin views. RecoveryCodesView is unmarked and retains LoginRequiredMixin plus an active-admin check (`views.py:303–313`); regeneration also requires a current TOTP. + +These five authentication views are not the entire site's public set. The existing signed GatherView and external_acc_update callbacks, password-reset views, and the admin login redirect/disabled callback remain explicit exceptions. The resolver-enumeration test compares exact sets, including third-party callbacks, rather than accepting an arbitrary subset. The third-party AdminSite.login callback appears in resolver enumeration but the earlier exact `/admin/login/` route shadows it. + +Both second-step views validate a pending sign-in before handling GET/POST. `two_factor.get_pending` checks the stage, expiration, active admin rights, password hash and open database record. Verify requires confirmed TOTP settings; setup rejects an already confirmed account and binds confirmation to the secret shown for that pending sign-in. Completion closes the pending record before login. Missing/expired/wrong-stage pending state does not authenticate. Setup's explicit grace option remains disabled by default and is deadline-bound when configured; it is not an accidental bypass introduced by the public decorator. Existing HTTP tests exercise missing first step, wrong user, expiration, replay, grace expiry/removal, and recovery access with the production middleware chain. + +### Tests, Shibboleth and direct admin login + +The only differences from #8's `admin_tests/base/test_middleware.py` are imports, three exact public-set additions, and setting a user-bound verification marker in the non-staff HTTP test. The latter is necessary to reach the authorization check: without it, the preceding two-factor middleware logs the session out and the expected response is 302. The assertion remains 403, and direct middleware staff/superuser, anonymous, inactive-account and signed-callback assertions remain intact. Existing #10 tests independently require unverified sessions and mismatched markers to be logged out. These adjustments do not weaken #8's guarantees. + +`ShibLoginView` and the two-factor core are unchanged from r3. Shibboleth in default `totp` mode starts a pending sign-in; only the second step authenticates. Explicit `idp` mode requires an allowed server-environment MFA context, rejects client context headers and an HTTP-header source configuration, and sets the user-bound verified marker only after that check. Existing Shibboleth HTTP tests cover both modes and spoofing. Trust in the deployment's authenticated Shibboleth identity attributes remains a deployment prerequisite; r4 does not claim a live identity-provider test. + +`admin/base/urls.py:19–25` keeps `admin_site_login` public and routes both GET and POST to the ordinary two-step login without authenticating from posted passwords. It carries `next` as a parameter of that local login URL; the login flow subsequently filters it through `safe_next`. The password-disabled configuration returns 404 through the earlier disabled callback. These functions and their route precedence are unchanged by the merge. + +<a id="en-validation"></a> +### Validation and limits + +Unit Tests pull-request run `43281291572` and push run `43281279658` each completed with all six jobs successful (image build plus five test shards). CodeQL pull-request run `43281291433` completed with both Python and JavaScript/TypeScript jobs successful. No CodeQL push run is expected for this feature branch: its push trigger is restricted to `main` and `develop`. These are results for the exact reviewed head, not earlier runs. + +```toon +validation: + head: 2743776da706b46c49b017d9fe864fbe33160219 + checks: 14 success + unit_pull_request: 43281291572, 6 jobs success + unit_push: 43281279658, 6 jobs success + codeql_pull_request: 43281291433, 2 jobs success + local_probes: 6 passed, including 10 session states and a negative control + open_p1_p2: 0 +``` + +The raw pull-request admin/API log confirms the full middleware file and the existing two-factor and Django authentication HTTP tests pass together after integration. The push add-on log confirms all 58 two-factor cases, including the four counter/routing concurrency cases and two pending-budget concurrency cases. The excerpts are retained as `ci-pr-admin-excerpt.txt` and `ci-push-addons-excerpt.txt`, alongside their full logs. + +```toon +ci_test_evidence: + pr_admin_api1: 4465 passed, 47 skipped + pr_admin_global_guard: 15 passed + pr_admin_two_factor: 73 passed + pr_django22_auth_http: 20 passed + push_addons: 3358 passed, 1 skipped + push_addon_twofactor: 58 passed + push_addon_counter_routing_concurrency: 4 passed + push_addon_pending_budget_concurrency: 2 passed +``` + +The local probe used Python 3.9.6 and Django 2.2.28; it did not load the whole OSF application or exercise PostgreSQL concurrency. Production source was not modified. The reviewer did not repeat the r3 container suite or run a browser/IdP flow. The QAE's 15 middleware tests in each public-access mode are author evidence, not reviewer-run results. GitHub CI runs admin tests in the public-access shard. Its five-entry matrix does not select the separately defined private-security task, whose file list also does not include the admin middleware tests; it therefore does not establish private-mode admin coverage. `git diff --check` passes for the review range, and the isolated checkout remains clean. + +Evidence is retained in reviewer scratch as `probe.py`, `probe.log`, PR/run/job snapshots and selected CI logs. No merge, approve, close, push or commit was performed. Exactly one authorized PR comment is published. No Docker state was changed, and `runtime/.env` was never read. The record remains uncommitted. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +<a id="ja-verdict"></a> +### 判定と範囲 + +**合格。** 対象 head の全14チェックが成功し、未解決 P1/P2 はない。最終 head/チェック照会: 2026-11-12 20:22 UTC。 + +R2-01(P1)は**解決**。今回の認証統合範囲に新しい P1/P2 は認めない。これはコードレビューコメントであり、GitHub の承認・マージ操作ではない。 + +対象差分は `e09c49111e..2743776da7`。PR #8 は develop の `66ce3a573cb0d6b63972137a86d730acb3c2c285` にマージ済みであり、このコミットは対象 head の祖先である。`b33286265d` は #8 の head `b0d4bb8d37` を統合し、`2743776da7` のツリーは `b33286265d` と同一。#8 から取り込まれた非公開アクセス制御全般の独立レビューは繰り返さず、#10 の管理認証との相互作用を対象にした。r3 の指摘と既存の同一プロセス DB 試験分離問題はリンク先 r3 に記録されており、後者を製品 P1/P2 として再開しない。 + +<a id="ja-boundary"></a> +### R2-01 の解決とアクセス境界 + +`admin/base/settings/defaults.py:232–245` の順序は SessionMiddleware、AuthenticationMiddleware、TwoFactorSessionMiddleware、MessageMiddleware、AdminLoginRequiredMiddleware。二要素認証の確認は全体ガードの `process_view` より先に実行される。間にあるメッセージ用ミドルウェアは保護ビューを実行しない。 + +`admin/common_auth/middleware.py:20–25` は無効化ユーザーと本人の検証印を持たないセッションをログアウトさせる。その後 `admin/base/middleware.py:32–43` が匿名をログインへ転送し、無効化ユーザーを防御的にログアウトし、staff/superuser 権限がない認証ユーザーを 403 で拒否し、有効な管理者だけを許可する。独自の検査を持たない `CannotDeleteInstitution` も保護される。 + +レビュワは実 Django 2.2.28 のリクエスト処理、本文を変えずに抽出した製品ミドルウェア・検証関数・ODMBackend、代替 Django User モデル、SQLite セッション、呼出しを記録する保護ビューで検証した。次は隔離試験の観測値であり、アプリ全体の試験件数ではない。 + +```toon +boundary[10]{state,status,protected_view_called}: + anonymous,302,false + pending_only,302,false + unverified_session,302,false + other_user_marker,302,false + expired_grace,302,false + grace_configuration_removed,302,false + inactive_user,302,false + verified_nonstaff,403,false + verified_staff,200,true + verified_superuser,200,true +``` + +表の全 302 はログイン経路を指し、セッションに認証済みユーザー ID を残さない。非staff の行は検証後に両管理権限を失った場合も表し、検証印で現在の権限検査を回避できない。全体ガードだけを外す否定対照では匿名が同じ保護ビューを実行するため、元の不足を試験が検出できる。6 試験が成功し、状態表、ミドルウェア順序、認証経路の正確な公開指定集合、回復コード経路の保護、抽出した `admin_site_login` の GET/POST 動作を含む。 + +### 公開経路と第二段階の完全性 + +`admin/common_auth/urls.py:13–19` で公開指定される認証ビューは LoginView、ShibLoginView、TwoFactorVerifyView、TwoFactorSetupView、logout_user の正確に5つ。`_before_login` を `login_not_required` に置き換えても callback の `login_required = False` は維持される。公開性は解決された callback に属し、`/account/login` というパス接頭辞には属さないため、他の管理ビューは公開されない。RecoveryCodesView は無指定であり LoginRequiredMixin と有効な管理者の検査も維持する(`views.py:303–313`)。再発行には現在の TOTP も必要。 + +この5つはサイト全体の公開集合ではない。既存の署名付き GatherView と external_acc_update、パスワード再設定ビュー、管理ログインの転送/無効化 callback も明示的な例外として残る。resolver 列挙試験は第三者 callback を含め正確な集合を比較し、任意の部分集合を許容しない。第三者の AdminSite.login callback は列挙されるが、先に定義された完全一致の `/admin/login/` が実際のアクセスを受ける。 + +両第二段階ビューは GET/POST を処理する前に保留ログインを検証する。`two_factor.get_pending` は段階、期限、有効な管理権限、パスワードハッシュ、未終了 DB レコードを確認する。verify は確認済み TOTP 設定を要求し、setup は設定済みアカウントを拒否し、その保留ログインに表示した秘密鍵に確認を結び付ける。完了時は保留レコードを閉じてからログインする。保留の欠落・期限切れ・段階違いでは認証されない。明示的な猶予設定は既定で無効で、設定時も期限付きであり、公開 decorator により新たに生じた迂回ではない。既存 HTTP 試験は製品ミドルウェア列で第一段階の欠落、別ユーザー、期限切れ、再利用、猶予期限/解除、回復コードへのアクセスを検査する。 + +### 試験、Shibboleth、直接の管理ログイン + +#8 の `admin_tests/base/test_middleware.py` との差は import、正確な公開集合への3項目追加、非staff HTTP 試験への本人の検証印設定だけ。最後の調整は権限検査に到達するために必要であり、印がなければ先行する二要素認証ミドルウェアがログアウトさせ 302 になる。期待値は 403 のままであり、直接ミドルウェアを呼ぶ staff/superuser、匿名、無効化アカウント、署名 callback の検査も維持される。既存 #10 試験は未検証セッションと別人の印をログアウトさせることを独立して要求する。この調整は #8 の保証を弱めない。 + +`ShibLoginView` と二要素認証コアは r3 から変更されていない。既定の `totp` モードでは Shibboleth は保留ログインを開始するだけで、第二段階で認証する。明示的な `idp` モードは許可されたサーバー環境の MFA context を要求し、クライアントの context header と HTTP header を取得元にした設定を拒否し、検査後だけ本人の検証印を付ける。既存 Shibboleth HTTP 試験は両モードとなりすましを扱う。認証済み Shibboleth 属性を配備環境が保証することは引き続き前提であり、r4 は実 IdP の試験を主張しない。 + +`admin/base/urls.py:19–25` は `admin_site_login` を公開のまま保ち、GET/POST の双方を通常の二段階ログインへ転送し、投稿パスワードでは認証しない。`next` はローカルログイン URL の引数として運び、その後のログイン処理で `safe_next` が制限する。パスワード無効設定では先行する無効化 callback が 404 を返す。これらの関数と経路の優先順位は統合で変わっていない。 + +<a id="ja-validation"></a> +### 検証と限界 + +Unit Tests の pull-request run `43281291572` と push run `43281279658` は、それぞれ image build と5試験 shard の全6ジョブが成功した。CodeQL の pull-request run `43281291433` は Python と JavaScript/TypeScript の両ジョブが成功した。この機能ブランチでは CodeQL の push run は想定されない。push の起動対象は `main` と `develop` に限定される。以前の run ではなく、正確な対象 head の結果である。 + +```toon +validation: + head: 2743776da706b46c49b017d9fe864fbe33160219 + checks: 14 success + unit_pull_request: 43281291572, 6 jobs success + unit_push: 43281279658, 6 jobs success + codeql_pull_request: 43281291433, 2 jobs success + local_probes: 6 passed, including 10 session states and a negative control + open_p1_p2: 0 +``` + +pull-request の admin/API 生ログで、統合後のミドルウェアファイル全体と既存の二要素認証・Django 認証 HTTP 試験が同じ実行で成功したことを確認した。push の add-on 生ログでは twofactor 全58件が成功し、counter/routing 並行試験4件と保留試行予算の並行試験2件を含む。抜粋は `ci-pr-admin-excerpt.txt` と `ci-push-addons-excerpt.txt` に保存し、全ログも保持する。 + +```toon +ci_test_evidence: + pr_admin_api1: 4465 passed, 47 skipped + pr_admin_global_guard: 15 passed + pr_admin_two_factor: 73 passed + pr_django22_auth_http: 20 passed + push_addons: 3358 passed, 1 skipped + push_addon_twofactor: 58 passed + push_addon_counter_routing_concurrency: 4 passed + push_addon_pending_budget_concurrency: 2 passed +``` + +ローカル試験は Python 3.9.6 と Django 2.2.28 を使用し、OSF アプリ全体や PostgreSQL 並行性は検査していない。製品コードは変更していない。r3 のコンテナ試験やブラウザ/IdP フローは再実行していない。QAE が報告した公開・非公開モード各15件のミドルウェア試験は作者の証拠であり、レビュワの実行結果ではない。GitHub CI の管理試験は公開モードの shard で動く。5項目の matrix は別定義の private-security task を選ばず、そのファイル一覧にも管理ミドルウェア試験はないため、非公開モードの管理試験を実証しない。対象差分の `git diff --check` は成功し、隔離 checkout は clean のまま。 + +証拠はレビュワ scratch の `probe.py`、`probe.log`、PR/run/job snapshot、選択した CI ログに保持する。merge・approve・close・push・commit は実行していない。許可された PR コメントを正確に1件公開する。Docker の状態は変更せず、`runtime/.env` は一切読んでいない。記録は未コミットのまま残す。 diff --git a/docs/reviews/2026-11-13_RDM-osf.io-dev2027_PR11_Search_ES8_r7.md b/docs/reviews/2026-11-13_RDM-osf.io-dev2027_PR11_Search_ES8_r7.md new file mode 100644 index 0000000..99b1be3 --- /dev/null +++ b/docs/reviews/2026-11-13_RDM-osf.io-dev2027_PR11_Search_ES8_r7.md @@ -0,0 +1,238 @@ +# PR11 Search ES8 review r7 / PR11 検索 ES8 レビュー r7 + +> **Summary:** The integration preserves PR #8's private-site authorization on the ES8 path, with no new actionable findings. All 14 CI jobs succeeded; both website runs executed all 48 ES8 tests without skips. +> **概要:** 統合は ES8 経路で PR #8 の非公開サイト認可を保持し、新たな要修正指摘はなかった。CI 全 14 ジョブが成功し、両 website run で ES8 48 件がスキップなしですべて実行・成功した。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-13. **Learned:** A security merge must preserve current database authorization while adapting physical search identifiers; green CI must also prove the intended tests ran. / セキュリティの統合では検索の物理識別子を移植しつつ現在の DB 認可を保持し、CI 成功だけでなく目的の試験が実行されたことも確かめる必要がある。 +- Applies to / 対象: RCOSDP/RDM-osf.io-dev2027 PR #11; `b4bc1341885dcb6725c1e3f27333d9ca9d0ef873..31413021787fa53bcc4a1d189d5ea31991b47e44`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- PR comment / PR コメント: `6837285208` (exactly one comment posted; body verified / ちょうど 1 件投稿し、本文を照合済み). +- Related / 関連: [Review index / レビュー索引](README.md) · [SPEC-06](../spec/06_documentation_conventions.md); r6 record / r6 記録: `2026-11-12_RDM-osf.io-dev2027_PR11_Search_ES8_r6.md`. +- Evidence / 証拠: integration commit `8a0589168a`; QAE comment `6832502314`; CI run and job IDs in the two language sections. +- Used by / 利用先: coordinator's PR #11 acceptance decision / 連携調整者による PR #11 受入判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +**Pass. No new actionable finding and no open P1/P2 in this review scope; no R7-xx finding is assigned.** This is a review verdict, not a GitHub approval. + +### Scope and merge integrity + +The security review covers `b4bc134188..33327d537e`, incorporating PR #8's private-site access rules into PR #11's Elasticsearch 8 path. Elasticsearch is the service that indexes and searches stored records. The review compares each of the four conflict resolutions against both parents, and audits the other shared files and integration-specific test edits. It does not repeat the entire independent review of PR #8. + +Merge `8a0589168a` has parents `b4bc134188` and `b0d4bb8d37`; their common ancestor is `73ff43b3c21f3258f6d34ca99b77ef66f1191e0e`. The second private-access merge `33327d537e` adds develop `66ce3a573c` without changing the tree (the complete file contents and modes). Both merge trees are `adaa3fa3ab675465e23f47bae33f04b287a0356e`. + +The parent audit finds nine shared changed paths, 15 ES8-only paths and 109 private-access-only paths. Fourteen ES8-only paths are byte-identical to that parent; the remaining path is the deliberately revised hidden-field test. Of the private-access-only paths, 105 are byte-identical and four are the reviewed test adaptations. No path outside the union of the parents' changes is altered. This is a comparison of committed trees, not a branch merge performed by the reviewer. + +The nine shared paths are the four conflict files plus `website/search/util.py`, `website/search_migration/migrate.py`, `website/settings/defaults.py`, `tasks/__init__.py`, and `osf_tests/test_elastic_search.py`. The last four retain both the ES8 changes and #8's private-site indexing/defaults/test setup. The directory and resource-permission implementations in `osf/models/user.py`, `node.py`, `preprint.py`, and `collection.py` are byte-identical to #8. The ES8 query translator, client-query policy, and API parser are byte-identical to r6. + +### Authorization and conflict resolutions + +`website/search/views.py:177,271` preserves login requirements in both private-search branches. With `ENABLE_PRIVATE_SEARCH=true`, the server reconstructs the query using `build_private_search_query`; it accepts only validated client text, paging, sort and highlight options. With private search disabled on a private site, GET and POST still require a user, and the default path validates the client body before adding an AND with the trusted scope. Clients cannot replace that scope. An omitted query in a public POST remains `match_all`; malformed private requests are rejected. + +`api/search/views.py:75` retains the ES8 paging ceiling and query-text validation, plus #8's login and private scope for both GET and parser-built POST. The private-site scope is ANDed with the submitted query regardless of `ENABLE_PRIVATE_SEARCH`; the user-directory restriction is applied before search execution. The existing private-search POST restriction to collection submissions remains unchanged. + +`website/search/util.py:330` obtains current database read rights, including group access and primary descendants of administrators. On private sites, public flags and stale indexed contributor fields cannot grant access. Nodes and preprints are limited by their current identifiers; files use readable node/preprint identifiers; wikis and metadata use readable node identifiers; comments use current, non-deleted comments on readable nodes. Collections require both readable collection membership and a readable collected resource. The integration correctly prefixes the collection-submission allow-list with `doc_id('collectionSubmission', identifier)` to match ES8's physical identifiers, while returned identifiers retain their original API form. + +`website/search/util.py:310` and `elastic_search.py:2254` retain the shared-user directory boundary, including self and current project/preprint collaborators, and exclude unregistered, disabled or merged accounts. The exact-email alternative stays inside the ANDed identifier allow-list; uppercase exact-email lookup remains a positive control for a shared user and returns nothing for an unshared user. Counts, tags and aggregations receive the same authorization query before execution. Multilingual normalization only rewrites text queries and leaves identifier restrictions intact. + +`website/search/elastic_search.py:1002` suppresses parent title and URL on private sites even if the parent retains a historical public flag. The parent-title regression retains both the private negative and public positive controls. ES8 hidden-source and highlight stripping, public visibility filtering, document-type restrictions and typed comment/file writes and deletes survive the merge. `node_is_ignored`, node/file updates and SQL migration allow private-site shared records to be indexed when `ENABLE_PRIVATE_SEARCH=false`; public sites keep their prior private-indexing behavior. The additional node-based check on comment indexing preserves r6's protection and does not reinstate public-flag authorization on private sites. + +Public behavior is assessed against the combined intended parents: #8 deliberately narrows user discovery, including on public sites. The merge does not undo that policy to restore r6's unrestricted user-search assumption. Public node visibility, public parent information, and the public omitted-query default remain supported; the ES8 input restrictions remain those already reviewed in r6. + +`.github/scripts/ci/run-tests.sh` retains authenticated, certificate-verified ES8 startup, readiness checks, diagnostics and cleanup. It retains `private_security`, its false public-access setting, the built-image/unset-default checks, and the explicit true setting for ordinary test groups. `tasks.PRIVATE_SECURITY_TESTS` retains all 19 files. The GitHub Actions matrix still has five ordinary groups; it does not gain a dedicated private_security job in this merge. The private-security command is retained for direct execution and the Travis entry. CI claims below distinguish the actual jobs from AID's reported local private-security execution. + +### Test integrity and local checks + +The two #8 live-search modules now use the configured ES8 client, require an 8.x server, and replace old index/delete/analyze calls with their ES8 equivalents. All existing expected identifier sets, counts, revocation checks, collection permissions and preprint assertions are preserved. The new endpoint test adds two parametrized cases, with private search false and true; each verifies v1 POST and API v2 GET, a shared positive control, a hidden historically public node, and immediate removal after sharing is revoked. + +The hidden-field suite changes its positive requester to a shared reader so that a missing result cannot make a privacy assertion pass vacuously. It retains rejection of querying private fields, absence of emails in returned/highlighted text, and the title-based positive control for hidden-contributor queries. A separate unshared negative test checks both name and exact email. The three other r6 ES8 modules are byte-identical. Other integration test adaptations only remove an ES2 client override or allow keyword arguments in mocks; they do not remove assertions. + +Local `git diff --check b4bc134188 HEAD` and `bash -n .github/scripts/ci/run-tests.sh` passed. All 123 surviving Python files changed relative to either parent parsed successfully. Existing invalid-escape warnings in settings and tests are not parsing failures. The reviewer did not execute the application locally; runtime results are identified separately as CI evidence. AID's commit/comment reports 63 ES8 tests passed, 351 private-security tests passed and 209 public-search tests passed with 3 skips; those are author-reported results, not independent local executions by this reviewer. + +### Subsequent PR #10 integration + +The coordinator extended r7 to head `31413021787fa53bcc4a1d189d5ea31991b47e44` after PR #10 (admin two-factor authentication) entered develop. The final verdict and the main CI table apply to this new head. The preceding security analysis still applies because the search integration is byte-identical. + +The new merge has parents `33327d537e` and `24108e0fe3`, with common ancestor `66ce3a573c`. The complete `33327d537e..3141302178` patch is identical to `66ce3a573c..24108e0fe3`: it brings only #10's 26 changed files. Those paths do not overlap the 28 search-side paths. Every path, content identifier and mode from each parent is preserved, with no unexpected path changes. Independent `git merge-tree --write-tree` completed without conflicts and reproduced tree `0353855e6c0a54e8250c2d7dcc050eea55a46763` exactly. The final PR test merge `2201e970017e6c27f5ec38f6c7aa28c7eb340e03` has the same tree. + +The delta consists of the twofactor add-on, admin settings/routes/forms/middleware/views/templates/translations/tests and `api/base/authentication/backends.py`. The backend change preserves the request-aware signature and valid-password authentication, while adding dummy password hashing for absent/empty credentials to reduce account-enumeration timing differences. It does not alter search scoping or resource permissions. This is an integration/non-overlap check, not a replacement for #10's independent review. All 18 Python files in this additional delta parsed successfully, and `git diff --check 33327d537e 3141302178` passed. + +The original head's Unit Tests runs `43281367769` and `43281354388`, plus CodeQL `43281368186`, also completed with all 14 jobs successful. Each original-head website run collected 2,446 tests, passed 2,372 and skipped 74; each api3_and_osf run collected 2,460, passed 2,430 and skipped 30. Each ran all 48 ES8-labelled tests, 15 DSL tests, 6 current-permission live tests, 3 user-directory live tests and 4 query-normalization tests, all passing with zero skips. These original-head results are supplemental; they do not substitute for final-head CI. + +### CI execution evidence and limits + +CI means automated checks run for a code change. All 14 jobs succeeded on the reviewed head. Unit Tests runs `43302046757` (pull_request) and `43302034462` (push) each contain one build and five test jobs; CodeQL run `43302046763` contains two successful language-analysis jobs. CodeQL is configured for pull requests and pushes to main/develop, so no separate CodeQL push run is expected for this feature branch. This is not a missing check. + +Run metadata identifies head `31413021787fa53bcc4a1d189d5ea31991b47e44`. The PR logs independently show checkout `2201e970017e6c27f5ec38f6c7aa28c7eb340e03`; its tree equals the reviewed head. Push logs show checkout of the head itself. Both build logs confirm Django 2.2.28, DRF 3.9.4, django-guardian 1.5.1, elasticsearch7 7.17.13 and urllib3 1.22. Both website and api3_and_osf jobs ran Python 3.6.9 with pytest 5.0.0. + +The following values are observed evidence. TOON is a compact text format for structured data. The additional-module figures apply separately to each of the two Unit Tests runs; they are not combined totals. Skips are not counted as passes. + +```toon +ci_jobs[14]{run_id,event,job_id,job,result}: + 43302046757,pull_request,131475476226,"build-image",success + 43302046757,pull_request,131490910054,"tests (website)",success + 43302046757,pull_request,131490910185,"tests (api2)",success + 43302046757,pull_request,131490910224,"tests (addons)",success + 43302046757,pull_request,131490910253,"tests (api1_and_js)",success + 43302046757,pull_request,131490910282,"tests (api3_and_osf)",success + 43302034462,push,131475433361,"build-image",success + 43302034462,push,131500083746,"tests (addons)",success + 43302034462,push,131500083748,"tests (api2)",success + 43302034462,push,131500083771,"tests (api3_and_osf)",success + 43302034462,push,131500083798,"tests (api1_and_js)",success + 43302034462,push,131500083889,"tests (website)",success + 43302046763,pull_request,131475476160,"Analyze (python)",success + 43302046763,pull_request,131475476411,"Analyze (javascript-typescript)",success +job_totals[4]{run_id,group,collected,passed,skipped,failed,errors}: + 43302046757,website,2446,2372,74,0,0 + 43302034462,website,2446,2372,74,0,0 + 43302046757,api3_and_osf,2460,2430,30,0,0 + 43302034462,api3_and_osf,2460,2430,30,0,0 +es8_modules[8]{run_id,module,collected,passed,skipped}: + 43302046757,test_es8_index.py,8,8,0 + 43302046757,test_es8_permissions.py,12,12,0 + 43302046757,test_es8_review_r1.py,19,19,0 + 43302046757,test_es8_review_r2.py,9,9,0 + 43302034462,test_es8_index.py,8,8,0 + 43302034462,test_es8_permissions.py,12,12,0 + 43302034462,test_es8_review_r1.py,19,19,0 + 43302034462,test_es8_review_r2.py,9,9,0 +es8_totals[2]{run_id,collected,passed,skipped,failed,errors}: + 43302046757,48,48,0,0,0 + 43302034462,48,48,0,0,0 +additional_modules_per_run[5]{module,collected,passed,skipped}: + test_legacy_dsl.py,15,15,0 + test_private_search_current_permissions.py,6,6,0 + test_user_directory_search_live.py,3,3,0 + test_directory_search_query.py,4,4,0 + test_private_public_flag_boundaries.py,40,40,0 +``` + +The ES8 module counts are reconstructed from every pytest progress outcome and checked against the source inventory; explicit collection totals in the logs are for whole jobs. The r1 module emits 16 integration outcomes and 3 TLS-option unit outcomes. Thus the four ES8-labelled modules contain 48 tests, up from r6's 47; together with the 15 DSL unit tests, the corresponding five-file total is 63. This total includes unit/mock tests and is not described as 63 live HTTP tests. The migrated current-permission and user-directory modules assert an 8.x server and execute real indexing/searching; all nine cases passed in each run, including the two new endpoint parameterizations. + +The parent-information test is retained within the 40 passing private/public-flag boundary tests, with both private suppression and public disclosure controls. The website suite's 74 skips and api3_and_osf's 30 skips are outside the identified all-passing modules. The dedicated 19-file private_security command was inspected but not separately executed by this reviewer or added to the GitHub matrix; AID's 351-test result remains separately attributed. + +Completed final-head logs independently establish execution of the identified tests rather than relying on green checks or results from the earlier head. + +The reviewer waited for completion and refreshed final run/job metadata. A transient GitHub API connection failure interrupted monitoring; a successful read confirmed the runs were still active and monitoring resumed. Completed job logs were downloaded through the GitHub API with escape sequences allowed only into local files. No CI job failed with artifact/cache 404 errors, so the conditional coordinator question was not needed. + +No corrective work is required within this scope. Overall acceptance remains with the coordinator. The reviewer used an isolated scratch clone and GitHub reads, plus exactly one PR comment. No runtime `.env` was read, no Docker state was changed, and no commit, push, merge, approval or closure was performed. The clone remained clean. Related links are relative to the intended `docs/reviews` publication location; private repositories are named without URLs, and no local-path links are used. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +**Pass。このレビュー範囲に新たな要修正指摘・未解決 P1/P2 はなく、R7-xx は採番しない。** レビューの判定であり、GitHub 上の承認ではない。 + +### 範囲とマージの完全性 + +セキュリティレビューの対象は `b4bc134188..33327d537e`。PR #8 の非公開サイトのアクセス規則を PR #11 の Elasticsearch 8 経路へ統合した差分を確認した。Elasticsearch は保存した資料を索引化して検索するサービスである。衝突した 4 ファイルをそれぞれ両親と比較し、その他の共通変更ファイルと統合固有の試験変更も監査した。PR #8 全体の独立レビューを繰り返すものではない。 + +マージ `8a0589168a` の両親は `b4bc134188` と `b0d4bb8d37`、共通祖先は `73ff43b3c21f3258f6d34ca99b77ef66f1191e0e`。非公開アクセス統合の後段マージ `33327d537e` は develop の `66ce3a573c` を取り込み、tree(全ファイルの内容とモード)は変更していない。両マージの tree は `adaa3fa3ab675465e23f47bae33f04b287a0356e` で一致する。 + +親との監査では、共通変更は 9 パス、ES8 側だけの変更は 15 パス、非公開アクセス側だけの変更は 109 パス。ES8 側だけのうち 14 パスは親とバイト単位で同一で、残りは意図的に変更した非公開フィールドの試験である。非公開アクセス側だけのうち 105 パスは同一で、残り 4 パスは確認済みの試験移植である。両親の変更集合外に変更はない。これは記録済み tree の比較であり、レビュワがブランチをマージしたものではない。 + +共通の 9 パスは衝突した 4 ファイルと `website/search/util.py`、`website/search_migration/migrate.py`、`website/settings/defaults.py`、`tasks/__init__.py`、`osf_tests/test_elastic_search.py`。後ろの 4 ファイルは ES8 の変更と #8 の非公開サイト用索引・既定値・試験設定を両立する。`osf/models/user.py`・`node.py`・`preprint.py`・`collection.py` の利用者一覧・資料権限の実装は #8 とバイト単位で同一。ES8 の検索条件変換・クライアント入力ポリシー・API parser は r6 と同一である。 + +### 認可と衝突解消 + +`website/search/views.py:177,271` は両方の非公開検索経路でログインを必須とする。`ENABLE_PRIVATE_SEARCH=true` では `build_private_search_query` によってサーバーが検索条件を再構築し、クライアントからは検証済みの検索文字列・ページ指定・並び順・強調表示設定だけを受け取る。非公開サイトで private search が無効でも GET・POST は利用者を必要とし、既定経路は入力本体を検証してから信頼された認可条件を AND で追加する。クライアントはこの条件を置き換えられない。公開 POST の query 省略は引き続き `match_all` となり、不正な非公開要求は拒否する。 + +`api/search/views.py:75` は ES8 のページ上限・検索文字列検証と、#8 の GET・parser 構築 POST のログイン・非公開スコープを保持する。非公開サイトのスコープは `ENABLE_PRIVATE_SEARCH` に関係なく入力条件と AND で結合し、利用者一覧の制限も検索実行前に加える。private search の POST を collection submission に限定する既存の制約も不変である。 + +`website/search/util.py:330` はデータベースの現在の閲覧権限を取得し、グループ権限と管理者の主系列子孫への権限を含める。非公開サイトでは公開フラグや索引中の古い共同作業者情報から閲覧権限を得られない。ノードと preprint は現在閲覧可能な識別子、ファイルは閲覧可能なノード・preprint の識別子、wiki と metadata は閲覧可能なノードの識別子、コメントは閲覧可能なノードにある未削除コメントで制限する。collection 投稿には collection と収集対象の両方の閲覧権限が必要である。統合では許可リストへ `doc_id('collectionSubmission', identifier)` の接頭辞を付けて ES8 の物理識別子に正しく合わせ、応答の識別子は従来の API 形式に戻す。 + +`website/search/util.py:310` と `elastic_search.py:2254` は、本人と現在のプロジェクト・preprint 共同作業者に限る利用者一覧境界を保持し、未登録・無効化・統合済みアカウントを除く。完全一致メールの代替条件も識別子許可リストとの AND の内側にある。大文字メールで共有利用者を発見する陽性対照を維持し、未共有利用者は返さない。件数・タグ・集計にも同じ認可条件を実行前に適用する。多言語処理は文字列検索だけを書き換え、識別子の制限を保持する。 + +`website/search/elastic_search.py:1002` は、親に過去の公開フラグが残っていても非公開サイトでは親のタイトル・URL を抑制する。親タイトルの回帰試験は非公開時の陰性対照と公開時の陽性対照を保持する。ES8 の非公開 source・強調表示フィールド除去、公開可視性フィルター、文書型制限、型付き ID によるコメント・ファイルの登録/削除も残る。`node_is_ignored`、ノード・ファイル更新、SQL 移行処理は `ENABLE_PRIVATE_SEARCH=false` でも非公開サイトの共有資料を索引化でき、公開サイトでは従来の非公開索引の動作を維持する。コメント索引の追加ノード検査は r6 の保護を保持し、非公開サイトに公開フラグだけの認可を復活させない。 + +公開時の動作は両親を統合した意図に対して評価した。#8 は公開サイトも含めて利用者の発見範囲を意図的に狭めている。マージは r6 の全利用者検索という前提へ戻すためにこの方針を緩めていない。公開ノードの可視性、公開時の親情報、公開 POST の query 省略は引き続き対応し、ES8 の入力制限は r6 で確認済みのものである。 + +`.github/scripts/ci/run-tests.sh` は認証・証明書検証付きの ES8 起動、準備完了確認、診断、後片付けを保持する。`private_security`、その公開アクセス false 設定、ビルド画像と環境変数未設定時の既定値確認、通常試験グループへの明示的な true 設定も保持する。`tasks.PRIVATE_SECURITY_TESTS` の 19 ファイルも残る。GitHub Actions の matrix は従来どおり通常の 5 グループで、今回 private_security 専用ジョブは追加されていない。専用コマンドは直接実行と Travis の項目向けに保持する。CI の証拠では実際のジョブと AID のローカル非公開試験の報告を区別する。 + +### 試験の完全性とローカル確認 + +#8 の実検索 2 モジュールは設定済み ES8 クライアントを使い、8.x サーバーを必須とし、旧 index/delete/analyze 呼び出しを ES8 対応へ置き換える。既存の識別子集合・件数・権限取消・collection 権限・preprint の期待値はすべて保持する。新しい endpoint 試験は private search が false と true の 2 ケースを追加し、それぞれ v1 POST と API v2 GET、共有の陽性対照、過去の公開フラグを持つ非共有ノードの非表示、共有解除の即時反映を確認する。 + +非公開フィールド試験の陽性対照は共有 reader に変更した。結果が空だから情報漏えいの検査を通過する事態を避けるためである。非公開フィールドの検索拒否、応答・強調表示中にメールがないこと、非表示共同作業者の検索に対するタイトル検索の陽性対照は残る。別の未共有陰性試験で名前と完全一致メールの双方を確認する。r6 の他の ES8 3 モジュールはバイト単位で同一である。その他の統合試験の変更は ES2 クライアント上書きの除去か mock のキーワード引数対応だけで、assertion を削除していない。 + +ローカルの `git diff --check b4bc134188 HEAD` と `bash -n .github/scripts/ci/run-tests.sh` は成功した。いずれかの親との差分に含まれる残存 Python 123 ファイルの構文解析も成功した。settings と試験の既存 invalid-escape 警告は構文エラーではない。レビュワはアプリケーションをローカル実行しておらず、実行結果は CI の証拠として別記する。AID の commit/comment は ES8 63 件成功、private-security 351 件成功、公開検索 209 件成功・3 件 skip を報告しているが、これは作成者の報告であり、レビュワが独立してローカル実行した結果ではない。 + +### その後の PR #10 統合 + +PR #10(管理画面の 2 段階認証)が develop に入ったため、連携調整者は r7 の対象を head `31413021787fa53bcc4a1d189d5ea31991b47e44` まで拡張した。最終判定と主要な CI 表はこの新 head に対するものである。検索統合の内容はバイト単位で同一なので、先のセキュリティ分析もそのまま成立する。 + +新マージの両親は `33327d537e` と `24108e0fe3`、共通祖先は `66ce3a573c`。`33327d537e..3141302178` の差分全体は `66ce3a573c..24108e0fe3` と完全一致し、#10 の変更 26 ファイルだけを取り込む。検索側の変更 28 パスとの重複はない。各親のパス・内容識別子・モードをすべて保持し、想定外の変更もない。独立した `git merge-tree --write-tree` は衝突なしで完了し、tree `0353855e6c0a54e8250c2d7dcc050eea55a46763` を完全に再現した。最終 PR 用マージ `2201e970017e6c27f5ec38f6c7aa28c7eb340e03` も同じ tree である。 + +差分は twofactor add-on、admin の設定・route・form・middleware・view・template・翻訳・試験、および `api/base/authentication/backends.py` である。backend の変更は request を受けるシグネチャと正しいパスワードによる認証を保持し、存在しない/空の資格情報にダミーのパスワード hash 計算を加えて、応答時間によるアカウントの有無の推測を抑える。検索スコープや資料権限は変えない。これは統合・非重複の確認であり、#10 の独立レビューを置き換えるものではない。追加差分の Python 18 ファイルの構文解析と `git diff --check 33327d537e 3141302178` は成功した。 + +当初 head の Unit Tests `43281367769`・`43281354388` と CodeQL `43281368186` も全 14 ジョブ成功で完了した。当初 head の各 website run は 2,446 件収集・2,372 件成功・74 件 skip、各 api3_and_osf は 2,460・2,430・30。各 run で ES8 名の 48 件、DSL 15 件、現在権限の実検索 6 件、利用者一覧の実検索 3 件、検索文字列変換 4 件がすべて成功し、skip は 0 件だった。これらは補助証拠であり、最終 head の CI の代わりにはしていない。 + +### CI の実行証拠と限界 + +CI はコード変更に対して自動実行する検査を指す。対象 head の全 14 ジョブが成功した。Unit Tests の `43302046757`(pull_request)と `43302034462`(push)は各 1 ビルド・5 試験ジョブ、CodeQL の `43302046763` は 2 言語の解析ジョブで、すべて成功した。CodeQL の push 対象は main/develop、ほかに pull_request を対象としているため、この機能ブランチに独立した CodeQL push run は予定されない。検査漏れではない。 + +run のメタデータは head `31413021787fa53bcc4a1d189d5ea31991b47e44` を示す。PR ログでも checkout は `2201e970017e6c27f5ec38f6c7aa28c7eb340e03` と確認し、その tree は対象 head と一致した。push ログは head 自体の checkout を示す。両ビルドは Django 2.2.28、DRF 3.9.4、django-guardian 1.5.1、elasticsearch7 7.17.13、urllib3 1.22 の導入を確認できる。両系列の website・api3_and_osf は Python 3.6.9、pytest 5.0.0 で実行された。 + +次は観測した証拠である。TOON は構造を持つデータの簡潔なテキスト表記である。追加モジュールの数値は Unit Tests の各 run でそれぞれ成立し、2 run の合算ではない。skip を成功件数には含めない。 + +```toon +ci_jobs[14]{run_id,event,job_id,job,result}: + 43302046757,pull_request,131475476226,"build-image",success + 43302046757,pull_request,131490910054,"tests (website)",success + 43302046757,pull_request,131490910185,"tests (api2)",success + 43302046757,pull_request,131490910224,"tests (addons)",success + 43302046757,pull_request,131490910253,"tests (api1_and_js)",success + 43302046757,pull_request,131490910282,"tests (api3_and_osf)",success + 43302034462,push,131475433361,"build-image",success + 43302034462,push,131500083746,"tests (addons)",success + 43302034462,push,131500083748,"tests (api2)",success + 43302034462,push,131500083771,"tests (api3_and_osf)",success + 43302034462,push,131500083798,"tests (api1_and_js)",success + 43302034462,push,131500083889,"tests (website)",success + 43302046763,pull_request,131475476160,"Analyze (python)",success + 43302046763,pull_request,131475476411,"Analyze (javascript-typescript)",success +job_totals[4]{run_id,group,collected,passed,skipped,failed,errors}: + 43302046757,website,2446,2372,74,0,0 + 43302034462,website,2446,2372,74,0,0 + 43302046757,api3_and_osf,2460,2430,30,0,0 + 43302034462,api3_and_osf,2460,2430,30,0,0 +es8_modules[8]{run_id,module,collected,passed,skipped}: + 43302046757,test_es8_index.py,8,8,0 + 43302046757,test_es8_permissions.py,12,12,0 + 43302046757,test_es8_review_r1.py,19,19,0 + 43302046757,test_es8_review_r2.py,9,9,0 + 43302034462,test_es8_index.py,8,8,0 + 43302034462,test_es8_permissions.py,12,12,0 + 43302034462,test_es8_review_r1.py,19,19,0 + 43302034462,test_es8_review_r2.py,9,9,0 +es8_totals[2]{run_id,collected,passed,skipped,failed,errors}: + 43302046757,48,48,0,0,0 + 43302034462,48,48,0,0,0 +additional_modules_per_run[5]{module,collected,passed,skipped}: + test_legacy_dsl.py,15,15,0 + test_private_search_current_permissions.py,6,6,0 + test_user_directory_search_live.py,3,3,0 + test_directory_search_query.py,4,4,0 + test_private_public_flag_boundaries.py,40,40,0 +``` + +ES8 のモジュール別件数は pytest の全結果記号から再構成し、ソースの試験一覧と照合した。ログ中の明示的な収集総数はジョブ全体の値である。r1 モジュールは統合試験 16 件と TLS 設定の単体試験 3 件に分かれて出力される。したがって ES8 名の 4 モジュールは r6 の 47 件から 48 件になり、DSL 単体試験 15 件を加えた 5 ファイルの合計が 63 件となる。単体・mock 試験を含むため「実 HTTP 試験 63 件」とは表現しない。移植した現在権限・利用者一覧のモジュールは 8.x サーバーを明示的に要求し、実際に索引化・検索する。新規 endpoint の 2 設定を含む計 9 件は、両 run で全件成功した。 + +親情報の試験は private/public-flag 境界モジュールの成功 40 件に含まれ、非公開時の抑制と公開時の表示の両対照を保持する。website 全体の skip 74 件と api3_and_osf 全体の skip 30 件は、全件成功を確認した対象モジュールの外にある。19 ファイルの private_security 専用コマンドは実装を確認したが、レビュワによる別途実行や GitHub matrix への追加はしていない。AID の 351 件成功は別途出典を明記した報告として扱う。 + +最終 head の完了済みログによって対象試験の実行を独立に確認した。緑色のチェックや以前の head の結果だけに依存していない。 + +完了まで待ち、最終の run/job メタデータを再取得した。一時的な GitHub API 接続失敗で監視が中断したが、再取得で実行継続を確認して監視を再開した。完了済みジョブのログは GitHub API から取得し、escape sequence の許可はローカルファイルへの出力に限定した。artifact/cache の 404 による CI ジョブ失敗はなく、条件付きの連携調整者への確認は不要だった。 + +この範囲で必要な修正はない。全体の受入判断は連携調整者に残る。レビュワは独立した作業用 clone と GitHub の読み取りを用い、PR コメントをちょうど 1 件投稿した。runtime `.env` は読まず、Docker の状態変更、commit・push・merge・approve・close は行っていない。clone は clean のままである。関連リンクは掲載予定の `docs/reviews` を基準とする相対参照とし、非公開リポジトリは URL なしの名称だけで示し、ローカルパスへのリンクは使っていない。 diff --git a/docs/reviews/2026-11-13_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r8.md b/docs/reviews/2026-11-13_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r8.md new file mode 100644 index 0000000..54701a8 --- /dev/null +++ b/docs/reviews/2026-11-13_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r8.md @@ -0,0 +1,215 @@ +# REV-PR8-R8 Mandatory authentication review / 認証必須化レビュー + +> **Summary:** The unchanged head passes this scoped code review with all 14 configured CI jobs green and no new P1/P2 finding. R7-01 remains open as an owner-deferred item in issue #16; integrating the advanced develop branch and obtaining fresh CI results is required before the final merge. +> **概要:** 変更のない head は、設定済み CI 14 ジョブがすべて成功し、新規 P1/P2 がなく、今回のコードレビュー範囲では Pass です。R7-01 は所有者判断により Issue #16 の未完事項として繰り延べます。最終マージ前には、進んだ develop の取込みと新しい CI の成功が必要です。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-13. **Learned:** An explicit owner decision can defer a tracked CI gap without making it complete; green checks on an unchanged head do not establish the result of combining it with a newer base. / 所有者の明示判断により CI の不足を未完のまま追跡して繰り延べられますが、変更のない head の成功だけでは、新しいベースとの組合せを検証したことにはなりません。 +- Applies to / 対象: RCOSDP/RDM-osf.io-dev2027 PR #8, head `d1258ec1402f62c354b7a095cb5bcfed1ef4eb9d`, and its prospective integration with develop `89f666cccbcdcef2e6eb51120ca672ae1eaf54b1`. +- Reviewer / レビュワ: REV(担当レビュワ, Codex Astra). +- Published comment / 投稿コメント: PR #8 comment 6829970894; body verified / 本文の一致を確認。 +- Related / 関連: SPEC-06 Documentation Conventions; review index; `2026-11-12_RDM-osf.io-dev2027_PR8_Mandatory_Auth_r7.md`; issue #16; [decision / 判定](#decision-en); [integration / 統合](#integration-en); [CI evidence / CI 証拠](#ci-en). +- Used by / 利用先: PR #8 coordinator and final integration decision / PR #8 の連携調整担当と最終統合判断。 + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +<a id="decision-en"></a> +### Verdict and scope + +**Pass for the reviewed head and this review scope.** All 14 configured CI jobs are successful. There is no new P1/P2 finding, and no open P1/P2 in this scope other than the owner-deferred R7-01. Its disposition is **deferred / 未完・権限待ち (#16)**, not fixed, closed, or verified by CI. The owner's decision of 2026-11-13, relayed in the assignment and recorded in both the PR and issue, supersedes r7's requirement to resolve R7-01 inside #8. It does not change r7's factual coverage findings. + +The PR head is exactly the r7 head. This review verifies the deferral, QAE evidence consistency, configured CI results, and semantic interaction with PR #15 on develop. It does not repeat the whole authentication audit. Earlier code findings retain their r7 dispositions, including the separate Mapcore under-visibility follow-up. The remaining real-environment/browser acceptance listed in the PR is not certified or waived by this code-review verdict. + +**Integration decision: merge develop into the PR branch and obtain fresh green CI before the final merge of #8.** This is validation of the new combination, not a newly discovered code defect and not a reversal of the R7-01 deferral. The current head passes; the prospective merged tree has not run application CI. No merge or CI rerun was performed by REV. + +### R7-01 — deferred / 未完・権限待ち (#16) + +Issue #16 is OPEN. Its title and body explicitly mark the work incomplete and waiting for permission. The PR's “未完・権限待ち: R7-01” section identifies #16, the absent `private_security` matrix entry, the need for workflow permission, and the owner's decision to move the change into a separate PR. Both describe the same three uncollected files. The issue requires publishing that PR, a successful CI `private_security` job, REV review and merge before issue closure; the PR likewise says local evidence does not close R7-01. + +A fresh static inventory of the reviewed head confirms 19 `PRIVATE_SECURITY_TESTS` files, 16 included by the ordinary test directories and these three excluded: + +```toon +uncollected_files[3]: + api_tests/test_global_public_boundary.py + api_tests/test_preprint_directory_visibility.py + api_tests/test_user_directory_boundary.py +``` + +`.github/workflows/unit-tests.yml:52` still lists only the five public-startup groups. The runner at `.github/scripts/ci/run-tests.sh:11–17` selects false only for `private_security`; its image/default-unset checks at lines 80–97 are also exclusive to that group. The dedicated task still enforces false and one worker and returns pytest's actual exit status. Neither the deferral nor the develop merge supplies the missing job. + +**Non-blocking wording correction:** the issue's opening claim that no CI job runs private-mode boundary tests is too broad. Sixteen files are included in ordinary groups and several switch the setting within tests. The precise gap is no process-level private-security job plus three uncollected files. The issue's detailed explanation and the new PR section correctly identify that gap. This wording does not invalidate the tracked deferral or create a P1/P2 defect. + +### Local evidence and its limits + +REV read both supplied QAE logs and compared the first log's executed file names to the source inventory. All 19 files appear, including the three missing from ordinary CI. The full run collected 349 tests and ended with 348 passed, 1 failed, exit 1. The only failure is `TestLiveUserDirectorySearch.test_results_counts_exact_email_and_revocation[False-True]`, with `No mapping found for [sort_file_name] in order to sort on`. The second log collects all three cases in the same file and reports 3 passed. + +The source parameterization identifies `[False-True]` as multilingual false and Japanese true. Japanese index settings use kuromoji and ICU, and the intended mapping includes `sort_file_name`; index creation/mapping calls tolerate certain HTTP errors. This supports the reported missing-analyzer/mapping explanation, together with the successful rerun. The failure log itself does not name a missing plugin, so the exact environmental cause remains QAE's attribution, not an independently reproduced diagnosis. + +The logs directly establish Python 3.6.9, the file inventory, failure, and counts. They do **not** print the git head, process-level `ENABLE_PUBLIC_ACCESS`, Django/PostgreSQL/Elasticsearch versions, or plugin inventory. Attribution to head `d1258ec140`, false startup, Django 2.2.28, PostgreSQL 9.6, Elasticsearch 2.4.6, and the rerun's kuromoji+ICU installation comes from QAE's report as recorded in the PR and assignment. No contradictory evidence was found. REV did not rerun this application suite. + +The accurate result is **348 passed / 1 failed, followed by a 3-pass file rerun with corrected ES configuration**, not a single 349-pass full-suite run. This evidence supports the owner's deferral; it is not CI evidence and does not close #16. + +```toon +local_evidence[2]{name,collected,passed,failed,seconds}: + osf8-pst-run1.txt,349,348,1,398.89 + osf8-live-ja.txt,3,3,0,8.05 +``` + +<a id="integration-en"></a> +### Prospective develop integration + +The repository's develop ref is `89f666cccbcdcef2e6eb51120ca672ae1eaf54b1`, as specified in the assignment. The PR metadata reports `73ff43b3c21f3258f6d34ca99b77ef66f1191e0e` as its base SHA; that is also the actual merge base, not a newer develop revision. The delta from this merge base to current develop is PR #15's five files. + +`git merge-tree --write-tree` exits successfully without conflict and produces this tree: + +```toon +integration: + head: d1258ec1402f62c354b7a095cb5bcfed1ef4eb9d + merge_base: 73ff43b3c21f3258f6d34ca99b77ef66f1191e0e + develop: 89f666cccbcdcef2e6eb51120ca672ae1eaf54b1 + tree: dd6414b1f8603deb4304c912e891fad38f92859f + conflicts: 0 + changed_files_from_head: 5 +``` + +`tasks/__init__.py` is the only file changed by both sides since their common base. An AST comparison verifies that the merged `apiserver` and `adminserver` functions equal develop, while every other top-level function/class equals the PR head, including `test_travis_private_security`. The 19-file inventory is preserved. The other four incoming files equal develop byte for byte. All remaining files equal the reviewed head. + +| Area | Interaction and assessment | +|---|---| +| `osf/models/mixins.py` | Removing `global filelog` isolates the `FileLog` object per `Loggable.add_log` invocation. Both file-action branches assign it before use. The method still uses the supplied request/auth user, node and path; it changes no authentication, membership or visibility rule. #8 does not modify this file. | +| Development server tasks | Removing `--nothreading` changes simultaneous request execution for API/admin development servers, including the new admin authentication gate. The gate uses `request.user` without storing per-user state on the middleware instance; API request state, CORS context and task queues use thread-local storage. No new cross-user authentication state was found in the inspected interaction. Production server commands are unaffected. | +| `osf_tests/factories.py` | `BrandFactory.name` becomes a generated company name truncated to the model's 30-character limit. It does not change user, project, contributor or permission factories. No weakening of #8's security fixtures was found. | +| Added regression files | `osf_tests/test_loggable_filelog_concurrency.py` and `tests/test_dev_server_tasks.py` fall under the existing `api3_and_osf` and `website` groups. They will be collected by fresh combined-tree CI. | + +REV compiled all five incoming Python files in memory and passed `git diff --check`. An isolated probe executed the actual merged `add_log` method with recording collaborators and PR #15's forced request interleaving: both calls retained their own user/project/path/date and the local-variable assertion passed. Reintroducing `global filelog` made the same interleaving assertion fail. This validates the targeted interaction; it is not an application, database or server test. + +No semantic incompatibility was found. Nevertheless, the changed request execution and shared logging path justify obtaining CI on the combined source. Existing green runs predate PR #15 and cannot be presented as validation of tree `dd6414b1f8`. After develop integration, rerun the configured workflow and confirm all jobs green at the new head; keep R7-01 deferred under #16. This review does not require adding `private_security` to #8 as a condition of that rerun. + +<a id="ci-en"></a> +### CI confirmation + +Observed at `2026-11-12T16:46:40Z` (2026-11-13 JST): the PR head is unchanged; all 14 check runs are completed and successful. Independent run metadata confirms that all three workflow runs belong to that exact head, and each job succeeds. There are no failed, pending, cancelled or skipped jobs in this set. The absent `private_security` job is not counted as passing. + +```toon +ci_runs[3]{run,event,workflow,jobs,result}: + 43126974419,push,Unit Tests,6,success + 43126988565,pull_request,Unit Tests,6,success + 43126988601,pull_request,CodeQL,2,success +ci_totals: + build_jobs: 2 + public_startup_test_jobs: 10 + codeql_language_jobs: 2 + successful_jobs: 14 + private_security_jobs: 0 +``` + +### Review boundaries + +The review used an independent scratch clone, GitHub reads, source comparisons and the isolated concurrency probe. No grdm-dev Docker state was changed; `runtime/.env` was not read. No commit, push, approval, merge or issue closure was performed. The only GitHub write is one PR comment with the r8 prefix. The record remains uncommitted and contains no private-repository URLs or local-path links. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +<a id="decision-ja"></a> +### 判定と範囲 + +**対象 head と今回のレビュー範囲は Pass です。** 設定済み CI 14 ジョブはすべて成功しました。新規 P1/P2 はなく、この範囲で未解決の P1/P2 は所有者が繰り延べた R7-01 だけです。状態は **deferred / 未完・権限待ち (#16)** であり、修正済み・解決済み・CI 検証済みではありません。依頼で伝達され、PR と Issue の両方に記録された 2026-11-13 の所有者判断により、r7 の「#8 内で R7-01 を解決する」という条件を更新します。r7 の実行範囲に関する事実認定は変わりません。 + +PR の head は r7 と同一です。今回の対象は、繰延べの追跡、QAE の証拠との整合、設定済み CI、および develop の PR #15 との意味上の相互作用です。認証全体を初めから再監査してはいません。既存のコード指摘は、別途の Mapcore 可視性不足の後続課題も含め、r7 の扱いを維持します。PR に残る実環境・ブラウザ受入を、このコードレビューで成功扱いや免除にはしません。 + +**統合判断: #8 の最終マージ前に、PR ブランチへ develop を取り込み、新しい CI をすべて成功させてください。** 新しい組合せを検証するための手順であり、新たなコード不具合の指摘でも、R7-01 の繰延べの撤回でもありません。現 head は Pass ですが、統合予定ツリーのアプリケーション CI は未実行です。REV は merge や CI の再実行を行っていません。 + +### R7-01 — deferred / 未完・権限待ち (#16) + +Issue #16 は OPEN です。題名と本文で未完・権限待ちを明記しています。PR の「未完・権限待ち: R7-01」節も、#16、`private_security` の matrix 不足、workflow 権限が必要なこと、所有者が別 PR に分ける判断をしたことを記載しています。両者の未収集ファイル 3 件は一致します。Issue の完了条件は別 PR の公開、CI `private_security` ジョブの成功、REV 確認とマージ、その後の Issue close です。PR もローカル証拠では R7-01 を閉じないと明記しています。 + +対象 head の静的照合を再実施し、`PRIVATE_SECURITY_TESTS` は 19 ファイル、通常の試験ディレクトリに含まれるものは 16 ファイル、含まれないものは次の 3 ファイルと確認しました。 + +```toon +uncollected_files[3]: + api_tests/test_global_public_boundary.py + api_tests/test_preprint_directory_visibility.py + api_tests/test_user_directory_boundary.py +``` + +`.github/workflows/unit-tests.yml:52` は引き続き公開設定で起動する 5 グループだけです。`.github/scripts/ci/run-tests.sh:11–17` は `private_security` の場合だけ false を選び、80–97 行のイメージ・環境変数未設定時の検査も同グループだけが通ります。専用タスクは false と worker 数 1 を必須にし、pytest の実際の終了コードを返します。繰延べや develop の取込みによって不足ジョブが追加されるわけではありません。 + +**非阻害の文言補足:** Issue 冒頭の「非公開モードの境界試験を、CI のどのジョブも走らせていない」は広すぎます。16 ファイルは通常グループに含まれ、テスト内で設定を切り替えるものもあります。正確な不足は、非公開設定でプロセスを起動する専用ジョブがないことと、3 ファイルが未収集であることです。Issue の詳細説明と新しい PR 節はこの不足を正しく記載しています。この文言は追跡した繰延べを無効にせず、P1/P2 の不具合にも当たりません。 + +### ローカル証拠とその限界 + +REV は指定の QAE ログ 2 件を読み、最初のログで実行されたファイル名をソースの一覧と比較しました。通常 CI が収集しない 3 件を含む全 19 ファイルが現れます。全体実行は 349 件を収集し、348 passed・1 failed・exit 1 で終わっています。失敗は `TestLiveUserDirectorySearch.test_results_counts_exact_email_and_revocation[False-True]` だけで、`No mapping found for [sort_file_name] in order to sort on` と一致します。2 本目のログは同ファイルの全 3 ケースを収集し、3 passed です。 + +ソースのパラメーター順から `[False-True]` は多言語 false・日本語 true です。日本語の索引設定は kuromoji と ICU を使い、本来の mapping に `sort_file_name` があり、索引作成・mapping 設定は一部の HTTP エラーを許容します。再実行の成功と合わせ、解析器・mapping 不足という説明と整合します。ただし失敗ログ自体には不足プラグイン名がなく、環境に関する原因の断定は QAE の報告であり、REV が独立再現した診断ではありません。 + +ログから直接確認できるのは Python 3.6.9、ファイル一覧、失敗、件数です。git head、プロセス起動時の `ENABLE_PUBLIC_ACCESS`、Django/PostgreSQL/Elasticsearch の版、プラグイン一覧は出力されていません。head `d1258ec140`、false 起動、Django 2.2.28、PostgreSQL 9.6、Elasticsearch 2.4.6、再実行先の kuromoji+ICU は、PR と依頼に記録された QAE 報告に基づきます。反する証拠は見つかりませんでした。REV はアプリケーション試験群を再実行していません。 + +正確な結果は **348 passed / 1 failed の後、ES 設定を直して当該ファイルを再実行し 3 passed** であり、全体を 1 回で 349 passed にした実行ではありません。所有者の繰延べを支える証拠ですが、CI の証拠ではなく、#16 を閉じません。 + +```toon +local_evidence[2]{name,collected,passed,failed,seconds}: + osf8-pst-run1.txt,349,348,1,398.89 + osf8-live-ja.txt,3,3,0,8.05 +``` + +<a id="integration-ja"></a> +### develop 統合予定ツリー + +リポジトリの develop は依頼どおり `89f666cccbcdcef2e6eb51120ca672ae1eaf54b1` です。PR メタデータが示すベース SHA `73ff43b3c21f3258f6d34ca99b77ef66f1191e0e` は実際の共通祖先でもあり、それより新しい develop ではありません。この共通祖先から現在の develop への差分は PR #15 の 5 ファイルです。 + +`git merge-tree --write-tree` は衝突なく成功し、次のツリーを生成しました。 + +```toon +integration: + head: d1258ec1402f62c354b7a095cb5bcfed1ef4eb9d + merge_base: 73ff43b3c21f3258f6d34ca99b77ef66f1191e0e + develop: 89f666cccbcdcef2e6eb51120ca672ae1eaf54b1 + tree: dd6414b1f8603deb4304c912e891fad38f92859f + conflicts: 0 + changed_files_from_head: 5 +``` + +共通祖先から両側で変更したファイルは `tasks/__init__.py` だけです。AST 比較で、統合後の `apiserver` と `adminserver` は develop と一致し、それ以外の全トップレベル関数・クラスは `test_travis_private_security` を含め PR head と一致しました。19 ファイルの一覧も保持します。他の取込み 4 ファイルは develop とバイト単位で一致し、それ以外の全ファイルはレビュー対象 head と同一です。 + +| 箇所 | 相互作用と判断 | +|---|---| +| `osf/models/mixins.py` | `global filelog` の除去により `Loggable.add_log` の呼出しごとに `FileLog` を分離します。ファイル操作の両分岐とも使用前に代入します。渡された request/auth の user、node、path を引き続き使い、認証・所属・可視性の判定を変えません。#8 はこのファイルを変更していません。 | +| 開発サーバのタスク | `--nothreading` の除去で API/admin 開発サーバの同時要求処理が変わり、新しい管理画面の認証ゲートにも関係します。ゲートは `request.user` を使い、middleware インスタンスに利用者別状態を置きません。API の request、CORS の context、タスクキューは thread-local です。調べた相互作用に新たな利用者間の認証状態の混線は見つかりませんでした。本番サーバのコマンドは変わりません。 | +| `osf_tests/factories.py` | `BrandFactory.name` を生成した会社名の先頭 30 文字に制限し、モデルの上限に合わせます。user・project・contributor・permission の factory は変えず、#8 のセキュリティ試験のデータを弱める変更は見つかりませんでした。 | +| 追加の回帰試験 | `osf_tests/test_loggable_filelog_concurrency.py` と `tests/test_dev_server_tasks.py` は既存の `api3_and_osf` と `website` に含まれ、統合後の新しい CI で収集されます。 | + +REV は取込み対象 Python 5 ファイルをメモリ上でコンパイルし、`git diff --check` も成功しました。隔離した probe では、統合後の実際の `add_log` メソッドに記録用の代替オブジェクトを渡し、PR #15 の強制した並行実行順を再現しました。両呼出しはそれぞれの user/project/path/date を保持し、局所変数の検査も成功しました。`global filelog` を戻すと同じ並行実行の assertion が失敗しました。対象の相互作用を検証したもので、アプリ全体・DB・サーバの試験ではありません。 + +意味上の非互換は見つかりませんでした。ただし要求の実行方式と共通のログ経路が変わるため、組み合わせたソースの CI が必要です。現在の成功実行は PR #15 より前で、ツリー `dd6414b1f8` の検証結果とは扱えません。develop 取込み後、設定済み workflow を実行し、新 head の全ジョブ成功を確認してください。R7-01 は #16 で繰延べを維持し、その再実行の条件として #8 への `private_security` 追加は求めません。 + +<a id="ci-ja"></a> +### CI 確認 + +確認時刻 `2026-11-12T16:46:40Z`(JST では 2026-11-13)で、PR head は不変、check run 14 件はすべて完了・成功です。各 workflow のメタデータも別途取得し、3 実行とも対象 head に属し、各ジョブが成功と確認しました。この集合に失敗・待機・取消・スキップはありません。存在しない `private_security` を成功数には含めません。 + +```toon +ci_runs[3]{run,event,workflow,jobs,result}: + 43126974419,push,Unit Tests,6,success + 43126988565,pull_request,Unit Tests,6,success + 43126988601,pull_request,CodeQL,2,success +ci_totals: + build_jobs: 2 + public_startup_test_jobs: 10 + codeql_language_jobs: 2 + successful_jobs: 14 + private_security_jobs: 0 +``` + +### レビューの制約 + +独立した scratch clone、GitHub の読取り、ソース比較、隔離した並行実行 probe を使用しました。grdm-dev の Docker 状態を変更せず、`runtime/.env` を読んでいません。commit・push・approve・merge・Issue close は行っていません。GitHub への書込みは r8 接頭辞の PR コメント 1 件だけです。記録は未 commit で、非公開リポジトリ URL とローカルパスのリンクを含めません。 diff --git a/docs/reviews/README.md b/docs/reviews/README.md new file mode 100644 index 0000000..9ea480c --- /dev/null +++ b/docs/reviews/README.md @@ -0,0 +1,139 @@ +# Review Records / レビュー記録 + +> **Summary:** Independent assessment of pull requests: each record is a dated file named YYYY-MM-DD_<Title>_rN.md, written by REV (Codex Astra). Reviews are linked from the PR and stored here for auditability. +> **概要:** プルリクエストの独立した評価:各記録は日付付きファイル、YYYY-MM-DD_<Title>_rN.md の形式。REV(Codex Astra)が書く。レビューは PR からリンクされ、監査のためにここに保管される。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.2 — 2026-11-12. **Learned:** a review record that was never saved cannot be recreated truthfully, so the gap is stated and the posted pull-request comment is the reference. / 保存されなかったレビュー記録は、後から正確に作り直せない。欠落を明記し、投稿済みの PR コメントを参照先とする。 + 0.1 — 2026-11-05. **Learned:** every PR gets an independent review, and the review must be kept as its own record so that what was checked, and why, can be read later. / すべての PR は独立したレビューを受け、何をなぜ確かめたかを後から読めるよう、レビューは独自の記録として残す必要があると分かった。 +- Normative for: [SPEC-04 Acceptance Tests](../spec/04_acceptance_tests.md) review section, [ADR-04 AI Autonomy and Roles](../decisions/ADR-04_AI_Autonomy_and_Roles.md) review section. +- Related: [../README.md](../README.md) · [handoff/](../handoff/README.md) · [status/](../status/README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. What belongs here + +A *review record* documents REV's (Codex Astra) independent assessment of a pull request. This folder contains: + +| Type | Naming convention | Description | +|---|---|---| +| Review | `YYYY-MM-DD_<Title>_rN.md` | Review of PR #<N>; includes findings, approval/rejection, and suggestions. | + +### 2. Review format + +A review record includes: + +- Date of review +- PR title and number +- Scope of review (files changed, lines affected) +- Findings: security issues, bugs, style issues +- Approval status: approved / rejected / needs revision +- Suggested changes (if rejection or revision needed) + +### 3. Open items (no entries yet / まだありません) + +| Date | Title | PR | Status | +|---|---|---|---| +| — | — | — | — | + +### 4. Creating a new review record + +1. Name the file `YYYY-MM-DD_<Title>_rN.md`. +2. Link to the PR number in the header. +3. Describe scope, findings, and approval decision. +4. Link from the PR as "reviewed by REV (Codex Astra)". + +### 5. Missing records and the pull-request comments that stand in for them + +Nine review records written on 2026-11-10 were never saved in this folder: they lived only in a scratch directory of a session that ended. They are **not recreated**, because a record rebuilt from memory would not say what REV actually checked. Each one was posted as a comment on its pull request by REV (Codex Astra), and that comment is the reference. The repositories are private; they are named here by name and number only. The comment ID is the number at the end of the comment's address on the pull request page. + +```toon +missing_records[9]{repository,pr,round,comment_id,posted_utc,verdict,head}: + RDM-osf.io-dev2027,#8,r1,6757009993,"2026-11-10 02:12","changes requested",e7f23e13141f + RDM-osf.io-dev2027,#8,r2,6758141691,"2026-11-10 03:28","changes requested",8bb07f17c2 + RDM-osf.io-dev2027,#8,r3,6759472716,"2026-11-10 05:03","pass (R2 delta)",49e5521451 + RDM-osf.io-dev2027,#10,r1,6759171742,"2026-11-10 04:41","changes requested",5355858363b6 + RDM-osf.io-dev2027,#11,r1,6759274738,"2026-11-10 04:48","changes requested",75ceaf5cb492 + RDM-osf.io-dev2027,#11,r2,6760403905,"2026-11-10 06:08","changes requested",58ba83af4b7c + RDM-osf.io-dev2027,#11,r3,6763524193,"2026-11-10 09:13","pass (delta 58ba83a..3eb4042)",3eb4042 + RDM-osf.io-dev2027,#12,r1,6763575801,"2026-11-10 09:16","changes requested",aa30a37d + RDM-osf.io-dev2027,#13,r1,6763600948,"2026-11-10 09:17","changes requested",ef9e64261b +``` + +The owner decided on 2026-11-12 to note the gap and refer to these comments. From now on a review record is placed in this folder as soon as REV finishes it. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. ここに属するもの + +「レビュー記録」は REV(Codex Astra)がプルリクエストに対して行った独立した評価を文書化します。このフォルダには次が含まれます: + +| 種別 | 命名規則 | 説明 | +|---|---|---| +| レビュー | `YYYY-MM-DD_<Title>_rN.md` | PR #<N> のレビュー。調査結果、承認/拒否、提案を含む。 | + +### 2. レビューの形式 + +レビュー記録には次が含まれます: + +- レビュー日 +- PR の題名と番号 +- レビュー範囲(変更ファイル、影響行) +- 調査結果:セキュリティ問題、バグ、スタイル問題 +- 承認ステータス:承認/拒否/修正必要 +- 提案される変更(拒否または修正が必要な場合) + +### 3. 未解決項目(まだありません / no entries yet) + +| 日付 | タイトル | PR | ステータス | +|---|---|---|---| +| — | — | — | — | + +### 4. 新しいレビュー記録をつくるには + +1. ファイル名を `YYYY-MM-DD_<Title>_rN.md` にする。 +2. ヘッダに PR 番号へリンクする。 +3. 範囲、調査結果、承認決定を記述する。 +4. PR から「REV(Codex Astra)レビュー済み」としてリンクする。 + +### 5. 欠落した記録と、代わりの PR コメント + +2026-11-10 に書かれたレビュー記録 9 件は、この場所に保存されませんでした。終了したセッションの作業用ディレクトリにだけあったためです。記憶から作り直した記録は REV が実際に何を調べたかを語れないので、**作り直しません**。各記録は、REV(Codex Astra)が PR へのコメントとして投稿しており、そのコメントを参照先とします。リポジトリは非公開なので、ここでは名前と番号だけを書きます。コメント ID は、PR のページにあるコメントのアドレスの末尾の数字です。 + +```toon +missing_records[9]{repository,pr,round,comment_id,posted_utc,verdict,head}: + RDM-osf.io-dev2027,#8,r1,6757009993,"2026-11-10 02:12","changes requested(要修正)",e7f23e13141f + RDM-osf.io-dev2027,#8,r2,6758141691,"2026-11-10 03:28","changes requested(要修正)",8bb07f17c2 + RDM-osf.io-dev2027,#8,r3,6759472716,"2026-11-10 05:03","pass(R2 の差分)",49e5521451 + RDM-osf.io-dev2027,#10,r1,6759171742,"2026-11-10 04:41","changes requested(要修正)",5355858363b6 + RDM-osf.io-dev2027,#11,r1,6759274738,"2026-11-10 04:48","changes requested(要修正)",75ceaf5cb492 + RDM-osf.io-dev2027,#11,r2,6760403905,"2026-11-10 06:08","changes requested(要修正)",58ba83af4b7c + RDM-osf.io-dev2027,#11,r3,6763524193,"2026-11-10 09:13","pass(差分 58ba83a..3eb4042)",3eb4042 + RDM-osf.io-dev2027,#12,r1,6763575801,"2026-11-10 09:16","changes requested(要修正)",aa30a37d + RDM-osf.io-dev2027,#13,r1,6763600948,"2026-11-10 09:17","changes requested(要修正)",ef9e64261b +``` + +所有者は 2026-11-12 に、欠落を明記してこれらのコメントを参照することに決めました。以後、REV のレビュー記録は完了したらすぐにこの場所へ収めます。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Review record | A document of REV's independent assessment of a PR. | PR の REV の独立した評価を文書化したもの。 | +| Reviewer (REV) | Codex Astra, the independent PR reviewer. | 独立した PR レビュー担当者(Codex Astra)。 | +| Approval status | Whether the PR is approved, rejected, or needs revision. | PR が承認、拒否、または修正必要かどうか。 | +| Findings | Security issues, bugs, or style issues discovered during review. | レビュー中に発見したセキュリティ問題、バグ、スタイル問題。 | +| Auditability | The ability to verify that a process was done correctly. | プロセスが正しく行われたか検証できる能力。 | diff --git a/docs/spec/00_overview.md b/docs/spec/00_overview.md new file mode 100644 index 0000000..fb622f7 --- /dev/null +++ b/docs/spec/00_overview.md @@ -0,0 +1,349 @@ +# SPEC-00 Overview and Architecture / 全体像と構成 + +> **Summary:** What the GakuNin RDM developer environment 2027 is, which parts it is made of, how upstream code is combined, how the network is shaped, which milestones it passes, who does what, and where the other specifications are. +> **概要:** GakuNin RDM 開発環境 2027 版とは何か。どの部品でできているか、上流のコードをどう重ねるか、ネットワークはどんな形か、どの節目を通るか、誰が何をするか、他の仕様はどこにあるか。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.6 — 2026-11-12. **Learned:** an inventory that is also a diagram has two places to go stale: the retired components were removed from the table, the diagram and the sentence about them together, and the component count (20 to 18) is now the one `manifest check` compares with the TOON excerpt. / 図でもある部品の一覧は、古くなる場所が二つある。退役した部品は表・図・それについての文から同時に外し、部品数(20 から 18)は `manifest check` が TOON の抜粋と照らし合わせる数になった。 + 0.5 — 2026-11-10. **Learned:** per-volume init containers multiplied hardening exceptions and still missed redis and the other uid-1000 volumes, so one generic owner step, derived from each volume's writers, replaces them (cross-OS audit, 2026-11-10). / ボリュームごとの init コンテナは堅牢化の例外を増やすだけで redis や他の uid 1000 のボリュームを取りこぼしていた。各ボリュームの書き手から導く一つの汎用の所有者設定の段に置き換えると分かった(OS 横断の監査、2026-11-10)。 +- Version / 版: 0.4 — 2026-11-06. **Learned:** a component can be a repository whose image is only a build tool: wiki-frontend is an overlay built from the osf.io tree plus its files, and its single service `wiki_assets` runs once to copy the wiki editor bundle into a volume, so the inventory shows that service, not a `wiki` server ([SPEC-01 §3](01_manifest.md#english) `overlay_of`, [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md)); and, independently, a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 部品のイメージがビルド道具にすぎないこともあると分かった。wiki-frontend は osf.io の木に自分のファイルを重ねて組むオーバーレイで、唯一のサービス `wiki_assets` は Wiki エディタの束をボリュームへ写すために一度だけ動く。一覧には `wiki` サーバでなくそのサービスを載せる([SPEC-01 §3](01_manifest.md#japanese) の `overlay_of`、[ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md))。また別に、用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.3 — 2026-11-06. **Learned:** a component can be a repository whose image is only a build tool: wiki-frontend is an overlay built from the osf.io tree plus its files, and its single service `wiki_assets` runs once to copy the wiki editor bundle into a volume, so the inventory shows that service, not a `wiki` server ([SPEC-01 §3](01_manifest.md#english) `overlay_of`, [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md)). / 部品のイメージがビルド道具にすぎないこともあると分かった。wiki-frontend は osf.io の木に自分のファイルを重ねて組むオーバーレイで、唯一のサービス `wiki_assets` は Wiki エディタの束をボリュームへ写すために一度だけ動く。一覧には `wiki` サーバでなくそのサービスを載せる([SPEC-01 §3](01_manifest.md#japanese) の `overlay_of`、[ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md))。 +- Version / 版: 0.3 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 + 0.2 — 2026-11-05. **Learned:** the profile of one component (y-websocket) is decided by the milestone that tests it (Wiki co-editing, M2), not by its role, so the overview must mirror SPEC-02 and the manifest. / 部品のプロファイルは役割でなく、それを試験する節目(Wiki 共同編集は M2)が決めるため、概要図と抄録は SPEC-02 と manifest に合わせ続けなければならないと分かった。 +- Version / 版: 0.1 — 2026-11-05. **Learned:** eleven upstream repositories and three tracking branches per component cannot be held in anyone's head, so the map, the manifest, and the roles had to be written down before the first integration repository was created. / 上流 11 本と部品ごとの追跡ブランチ 3 本は頭の中では管理できないので、最初の統合リポジトリを作る前に、地図・マニフェスト・役割分担を文書にする必要があると分かった。 +- Normative for: the shape of the whole environment. Every other specification (`01`–`06`) refines one part of this page. +- Related: [POL-01 Position](../policy/POL-01_Developer_Environment_2027_Position.md) · [ADR-01 Integration repository placement](../decisions/ADR-01_Integration_Repository_Placement.md) · [ADR-02 Network model](../decisions/ADR-02_Network_Model.md) · [ADR-03 Staged security gate](../decisions/ADR-03_Staged_Security_Gate.md) · [ADR-04 AI autonomy and roles](../decisions/ADR-04_AI_Autonomy_and_Roles.md) · [SPEC-01 Manifest](01_manifest.md) · [SPEC-05 Upstream tracking](05_upstream_tracking.md) · [SPEC-06 Documentation conventions](06_documentation_conventions.md) · [docs/README.md](../README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Purpose + +The *developer environment 2027* is a set of instructions and tools that lets one person start a complete GakuNin RDM (GRDM, the research data management service run by NII; GakuNin is Japan's academic network for logging in with a university account; see [REF-01](../reference/REF-01_Glossary.md)) on one computer with one command. It runs on macOS arm64, Ubuntu 24.04 (amd64 and arm64), and Windows 11 WSL2 (a way to run Linux inside Windows; see [REF-01](../reference/REF-01_Glossary.md)). It has three jobs: + +1. Combine the public core repositories, their `-private` security-verified versions, and the private subsystems into one consistent build. +2. Move every base image (a *base image* is the ready-made operating-system layer a program is built on top of) from end-of-life versions to current ones, step by step. +3. Keep removing security vulnerabilities (a *vulnerability* is a weak spot an attacker could use) with AI agents, so GRDM can continue even if the Center for Open Science (COS) stops developing OSF (the software GRDM is based on; see [REF-01](../reference/REF-01_Glossary.md)). + +This repository, `RDM-developer-guide`, is **public**. It holds documents, the manifest (the list of exactly which upstream versions we build; see [SPEC-01](01_manifest.md)), and the installer. It never holds code copied from `-private` repositories, secrets, or links to private repositories. + +### 2. Component map + +A *component* is one program that runs as its own container (a box that holds one program and everything it needs, so it runs the same on any computer). *Core* components are the GRDM application itself. *Infrastructure* components are shared services such as databases. *Subsystems* are optional extras that plug into the core. + +```mermaid +flowchart LR + subgraph browser["Browser on the developer's computer (127.0.0.1 only)"] + B[Web browser] + end + subgraph core["Core (6 repositories)"] + EMB[ember-osf-web] + OSFW[osf.io web] + OSFA[osf.io api] + OSFM[osf.io admin] + OSFK[osf.io worker] + WB[waterbutler] + MFR[modular-file-renderer] + CAS["cas-overlay (+ fakecas for dev)"] + WIKI[wiki-frontend] + end + subgraph infra["Infrastructure"] + PG[(postgres)] + ES[(elasticsearch8)] + ES6[(elasticsearch6)] + MQ[rabbitmq] + RD[(redis)] + UNO[unoconv] + end + subgraph subs["Subsystems (y-websocket in profile core, the others in full)"] + YWS[y-websocket] + OAS[OASys] + SHIB["Shibboleth-SP + test IdP"] + MCP[rdmcp] + AIPF[aipf_mcp_data_grdm] + end + B --> EMB & OSFW & OSFA & OSFM & CAS & WIKI + OSFW & OSFA & OSFM & OSFK --> PG & ES & MQ & RD + OSFW & OSFA --> ES6 + WB --> OSFA + MFR --> WB & UNO + WIKI --> YWS + SHIB --> OSFW + MCP & AIPF --> OSFA + OAS --> OSFA +``` + +The inventory in TOON (a compact text form of JSON; see [SPEC-06 §4](06_documentation_conventions.md#4-diagrams-and-data)). The canonical, machine-read list is `manifest/upstreams.json` ([SPEC-01](01_manifest.md)); this excerpt shows only `id`, `role`, `services`, `integration_repo`, and `profile` (the smallest installer profile that includes the component, [SPEC-02 §4](02_installer_cli.md#2-en-ports)). Service names are the Compose service names. + +<!-- canonical: manifest/upstreams.json --> +```toon +components[18]{id,role,services,integration_repo,profile}: + osf.io,core,"web,api,admin,worker",RDM-osf.io-dev2027,minimum + waterbutler,core,"wb,wb_worker",RDM-waterbutler-dev2027,core + modular-file-renderer,core,mfr,RDM-modular-file-renderer-dev2027,core + ember-osf-web,core,ember_osf_web,RDM-ember-osf-web-dev2027,core + cas-overlay,core,cas,RDM-cas-overlay-dev2027,core + wiki-frontend,core,wiki_assets,RDM-wiki-frontend-dev2027,core + postgres,infra,postgres,null,minimum + elasticsearch8,infra,"elasticsearch8,elasticsearch8_setup",null,minimum + elasticsearch6,infra,elasticsearch6,null,core + rabbitmq,infra,rabbitmq,null,minimum + redis,infra,redis,null,core + unoconv,infra,unoconv,null,core + fakecas,infra,fakecas,null,minimum + y-websocket,subsystem,y_websocket,RDM-y-websocket-dev2027,core + OASys,subsystem,oasys,RDM-OASys-dev2027,full + Shibboleth-SP,subsystem,"shibboleth_sp,test_idp",RDM-Shibboleth-SP-dev2027,full + rdmcp,subsystem,rdmcp,RDM-rdmcp-dev2027,full + aipf_mcp_data_grdm,subsystem,aipf_mcp_data_grdm,RDM-aipf_mcp_data_grdm-dev2027,full +``` + +`mongo`, `sharejs` and `elasticsearch2` are gone: Elasticsearch 8 replaced Elasticsearch 2 ([ADR-14](../decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md)) and the editors moved to y-websocket ([ADR-13 §6](../decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md#english)); `elasticsearch6` stays for the metrics client. + +`fakecas` and the Shibboleth (the software that lets you log in once with your university account; see [REF-01](../reference/REF-01_Glossary.md)) test IdP (an *IdP*, identity provider, is the server that checks who you are when you log in) are both login helpers for development. They are mutually exclusive: the installer starts one or the other, never both. + +### 3. Integration model + +Each core component and each subsystem gets one private *integration repository* in the RCOSDP organization, named `RDM-<name>-dev2027`. Its `develop` branch is what the installer builds. Beside it sit *tracking branches* (read-only copies of someone else's branch), one per upstream listed in the manifest, named `upstream/<kind>-<branch>` where `<branch>` is the upstream branch name with `/` replaced by `-` ([SPEC-01 §4](01_manifest.md#4-rules) rule 7): + +- `upstream/public-<branch>` — the public RCOSDP repository's default branch. Examples: `upstream/public-develop` (osf.io, waterbutler, mfr, cas-overlay, wiki-frontend), `upstream/public-master` (ember-osf-web, y-websocket). +- `upstream/private-<branch>` — the `-private` security-verified repository's default branch. Examples: `upstream/private-develop`, `upstream/private-master` (ember-osf-web, y-websocket), `upstream/private-main` (OASys, Shibboleth-SP, rdmcp, aipf_mcp_data_grdm, which have no public upstream and therefore only this one branch). +- `upstream/cos-develop` — the original COS repository, kept for reference only (the six cores except wiki-frontend). +- A second upstream of the same kind gets a tag: `upstream/private-sec-test-fix-sec-test` mirrors `RDM-osf.io-private` (branch `fix/sec-test`) as a candidate that is not merged. + +```mermaid +flowchart LR + PUB["RDM-<name> (public)<br/>default branch"] -->|mirror| UP1["upstream/public-<branch>"] + PRV["RDM-<name>-*-private<br/>default branch"] -->|mirror| UP2["upstream/private-<branch>"] + COS["CenterForOpenScience/<name><br/>develop"] -->|mirror| UP3["upstream/cos-develop (reference)"] + UP1 -->|1. merge| DEV["RDM-<name>-dev2027<br/>develop"] + UP2 -->|2. merge| DEV + PRS["adopted PRs<br/>(listed in manifest)"] -->|3. apply| DEV + UP3 -.->|compare only| DEV + DEV -->|installer builds| IMG["Local images"] +``` + +Order matters: public first, then private, then adopted pull requests. The manifest ([SPEC-01](01_manifest.md)) records the exact commit (by *SHA*, the 40-character fingerprint of a commit) for each step. The daily and weekly jobs that keep this up to date are in [SPEC-05](05_upstream_tracking.md). Why the repositories are placed this way is in [ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md). + +### 4. Network model + +- The loopback alias `192.168.168.167` used by the old guide is **gone**. It needed `sudo` (administrator rights) and exposed services to the local network. +- Containers talk to each other on the Compose internal network (a private network that only the containers of one project can see) by service name, for example `http://api:8000`. +- Only ports bound to `127.0.0.1` (the address that means "this computer only") are published to the host. Nothing listens on other interfaces. +- No step of installation requires `sudo`. The reasoning is in [ADR-02](../decisions/ADR-02_Network_Model.md). + +### 5. Milestone ladder + +A *milestone* is a checkpoint with a pass/fail test. The *security gate* is the test that decides whether a build may be installed; it gets stricter at each milestone ([ADR-03](../decisions/ADR-03_Staged_Security_Gate.md)). + +```toon +milestones[5]{id,goal,security_gate}: + M1,"docs skeleton, manifest, dev2027 repositories exist; reviewed PRs merged to develop","report + allow-list" + M2,"core 6 install with one command on Mac Studio; Playwright acceptance passes; amd64 builds","report + allow-list (fewer entries than M1)" + M3,"5 subsystems start; one success + one rejection case each","report + allow-list (fewer entries than M2)" + M4,"waterbutler, mfr, osf.io on Python 3.13","stop on HIGH or above; first AI red-team run" + M5,"ES2 and mongo removed; ES8 + postgres 15 or later; distributable abroad","zero CRITICAL/HIGH; zero open AI red-team paths" +``` + +### 6. Roles + +Role codes follow the shared table in `AGENTS.md`. An *AI agent* is a program that reads instructions, writes code or documents, and reports back. + +| Code | Who | Does | +|---|---|---| +| AID (AI Developer) | Orca Open Code 2 workers on a local LLM | Implements what the specifications say; writes documents and code in PRs | +| QAE (QA Engineer) | Claude Code Fable | Writes specifications, checks implementations, runs and judges regression and acceptance tests | +| REV (Reviewer) | Codex Astra | Independent review of every PR; records results in `docs/reviews/` and PR comments | +| Owner | Human | Decides policy, accepts, merges, publishes | + +Detection, fix PR, review, and automated tests run without a human. Merging and publishing are always done by the owner ([ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md)). + +### 7. Index of specifications + +| ID | File | One line | +|---|---|---| +| SPEC-01 | [01_manifest.md](01_manifest.md) | The manifest: which upstream commits and PRs the installer builds | +| SPEC-02 | [02_installer_cli.md](02_installer_cli.md) | The `grdm-dev` CLI and `install.sh`: host checks, secrets, compose, build, health, reports | +| SPEC-03 | [03_security_gate.md](03_security_gate.md) | SBOM, CVE scan, static analysis, ZAP, AI red team, and the per-milestone thresholds | +| SPEC-04 | [04_acceptance_tests.md](04_acceptance_tests.md) | Playwright Python acceptance: success and rejection cases per feature | +| SPEC-05 | [05_upstream_tracking.md](05_upstream_tracking.md) | Daily mirror and diff report, weekly AI integration PR, COS reference tracking | +| SPEC-06 | [06_documentation_conventions.md](06_documentation_conventions.md) | How every document is written | + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 目的 + +「開発環境 2027 版」は、GakuNin RDM(GRDM。NII が運用する研究データ管理サービス。GakuNin=学認は大学のアカウントでログインするための日本の学術ネットワーク。[REF-01](../reference/REF-01_Glossary.md))の一式を、一台のコンピュータ上で一つのコマンドで立ち上げるための手引きと道具の集まりです。macOS arm64、Ubuntu 24.04(amd64 と arm64)、Windows 11 WSL2(Windows の中で Linux を動かす仕組み。[REF-01](../reference/REF-01_Glossary.md))で動きます。役目は三つです。 + +1. 公開コアのリポジトリ、その `-private`(セキュリティ検証版)、非公開サブシステムを、矛盾なく一つのビルドに重ねる。 +2. すべてのベースイメージ(プログラムを載せる土台になる、できあいの OS の層)を、サポート切れの版から現行の版へ段階的に移す。 +3. AI エージェントで脆弱性(攻撃者につけ込まれる弱い所)を取り除き続け、GRDM の元になっている OSF([REF-01](../reference/REF-01_Glossary.md))の開発を Center for Open Science(COS)がやめても、GRDM を提供し続けられるようにする。 + +このリポジトリ `RDM-developer-guide` は **公開** です。文書、マニフェスト(どの上流の版を組むかを決める一覧。[SPEC-01](01_manifest.md))、インストーラーを置きます。`-private` 由来のコード、秘密、非公開リポジトリへのリンクは絶対に置きません。 + +### 2. 部品の地図 + +「部品(コンポーネント)」は、それぞれ自分のコンテナ(一つのプログラムと必要なものを一箱に入れ、どのコンピュータでも同じように動かすための箱)で動く一つのプログラムです。「コア」は GRDM 本体、「基盤」はデータベースのような共用サービス、「サブシステム」はコアに差し込む追加機能です。 + +```mermaid +flowchart LR + subgraph browser["開発者のブラウザ(127.0.0.1 のみ)"] + B[Web ブラウザ] + end + subgraph core["コア(6 リポジトリ)"] + EMB[ember-osf-web] + OSFW[osf.io web] + OSFA[osf.io api] + OSFM[osf.io admin] + OSFK[osf.io worker] + WB[waterbutler] + MFR[modular-file-renderer] + CAS["cas-overlay(開発用 fakecas 付き)"] + WIKI[wiki-frontend] + end + subgraph infra["基盤"] + PG[(postgres)] + ES[(elasticsearch8)] + ES6[(elasticsearch6)] + MQ[rabbitmq] + RD[(redis)] + UNO[unoconv] + end + subgraph subs["サブシステム(y-websocket は core、ほかは full)"] + YWS[y-websocket] + OAS[OASys] + SHIB["Shibboleth-SP + テスト IdP"] + MCP[rdmcp] + AIPF[aipf_mcp_data_grdm] + end + B --> EMB & OSFW & OSFA & OSFM & CAS & WIKI + OSFW & OSFA & OSFM & OSFK --> PG & ES & MQ & RD + OSFW & OSFA --> ES6 + WB --> OSFA + MFR --> WB & UNO + WIKI --> YWS + SHIB --> OSFW + MCP & AIPF --> OSFA + OAS --> OSFA +``` + +一覧を TOON(JSON を短く字下げで書いた形。[SPEC-06 §4](06_documentation_conventions.md#4-図とデータ))で示します。機械が読む正本は `manifest/upstreams.json`([SPEC-01](01_manifest.md))で、この抄録は `id`・`role`・`services`・`integration_repo`・`profile`(その部品を含む最小のインストーラープロファイル。[SPEC-02 §4](02_installer_cli.md#2-ja-ports))だけを載せています。サービス名は Compose のサービス名です。 + +<!-- canonical: manifest/upstreams.json --> +```toon +components[18]{id,role,services,integration_repo,profile}: + osf.io,core,"web,api,admin,worker",RDM-osf.io-dev2027,minimum + waterbutler,core,"wb,wb_worker",RDM-waterbutler-dev2027,core + modular-file-renderer,core,mfr,RDM-modular-file-renderer-dev2027,core + ember-osf-web,core,ember_osf_web,RDM-ember-osf-web-dev2027,core + cas-overlay,core,cas,RDM-cas-overlay-dev2027,core + wiki-frontend,core,wiki_assets,RDM-wiki-frontend-dev2027,core + postgres,infra,postgres,null,minimum + elasticsearch8,infra,"elasticsearch8,elasticsearch8_setup",null,minimum + elasticsearch6,infra,elasticsearch6,null,core + rabbitmq,infra,rabbitmq,null,minimum + redis,infra,redis,null,core + unoconv,infra,unoconv,null,core + fakecas,infra,fakecas,null,minimum + y-websocket,subsystem,y_websocket,RDM-y-websocket-dev2027,core + OASys,subsystem,oasys,RDM-OASys-dev2027,full + Shibboleth-SP,subsystem,"shibboleth_sp,test_idp",RDM-Shibboleth-SP-dev2027,full + rdmcp,subsystem,rdmcp,RDM-rdmcp-dev2027,full + aipf_mcp_data_grdm,subsystem,aipf_mcp_data_grdm,RDM-aipf_mcp_data_grdm-dev2027,full +``` + +`mongo`・`sharejs`・`elasticsearch2` は無くなりました。Elasticsearch 8 が Elasticsearch 2 に替わり([ADR-14](../decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md))、編集は y-websocket へ移りました([ADR-13 §6](../decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md#japanese))。`elasticsearch6` はメトリクスのクライアントのために残ります。 + +`fakecas` と Shibboleth(大学のアカウントで一度ログインすれば済むようにするソフト。[REF-01](../reference/REF-01_Glossary.md))のテスト IdP(IdP=アイデンティティプロバイダ。ログインのときに「あなたは誰か」を確かめるサーバ)は、どちらも開発用のログインの助け役です。二つは排他で、インストーラーはどちらか一方だけを起動します。 + +### 3. 統合の仕組み + +コアの各部品とサブシステムには、RCOSDP 組織内に非公開の「統合リポジトリ」を一つずつ作ります。名前は `RDM-<name>-dev2027` です。その `develop` ブランチをインストーラーが組みます。横に「追跡ブランチ」(他の場所のブランチを読み取り専用で写したもの)を、マニフェストに載せた上流ごとに一本置きます。名前は `upstream/<kind>-<branch>` で、`<branch>` は上流のブランチ名の `/` を `-` に置き換えたものです([SPEC-01 §4](01_manifest.md#4-規則) の規則 7)。 + +- `upstream/public-<branch>` — 公開 RCOSDP リポジトリの既定ブランチ。例: `upstream/public-develop`(osf.io、waterbutler、mfr、cas-overlay、wiki-frontend)、`upstream/public-master`(ember-osf-web、y-websocket)。 +- `upstream/private-<branch>` — `-private` セキュリティ検証版の既定ブランチ。例: `upstream/private-develop`、`upstream/private-master`(ember-osf-web、y-websocket)、`upstream/private-main`(OASys、Shibboleth-SP、rdmcp、aipf_mcp_data_grdm。公開の上流がないので、この一本だけ)。 +- `upstream/cos-develop` — COS 本家。参照専用(wiki-frontend を除くコア 5 本)。 +- 同じ kind の上流が二つあるときはタグを挟みます。`upstream/private-sec-test-fix-sec-test` は `RDM-osf.io-private`(ブランチ `fix/sec-test`)を、マージしない候補として写したものです。 + +```mermaid +flowchart LR + PUB["RDM-<name>(公開)<br/>既定ブランチ"] -->|ミラー| UP1["upstream/public-<branch>"] + PRV["RDM-<name>-*-private<br/>既定ブランチ"] -->|ミラー| UP2["upstream/private-<branch>"] + COS["CenterForOpenScience/<name><br/>develop"] -->|ミラー| UP3["upstream/cos-develop(参照)"] + UP1 -->|1. マージ| DEV["RDM-<name>-dev2027<br/>develop"] + UP2 -->|2. マージ| DEV + PRS["採用 PR<br/>(マニフェストに列挙)"] -->|3. 適用| DEV + UP3 -.->|比較のみ| DEV + DEV -->|インストーラーが組む| IMG["ローカルのイメージ"] +``` + +順番が大事です。公開版、次に private 版、最後に採用 PR。マニフェスト([SPEC-01](01_manifest.md))が各段のコミットを SHA(コミットの 40 文字の指紋)で記録します。これを毎日・毎週保つ仕事は [SPEC-05](05_upstream_tracking.md) に、なぜこの置き方にしたかは [ADR-01](../decisions/ADR-01_Integration_Repository_Placement.md) にあります。 + +### 4. ネットワークの形 + +- 旧手引きのループバック別名 `192.168.168.167` は **廃止** しました。`sudo`(管理者権限)が要り、サービスが LAN に見えてしまうからです。 +- コンテナ同士は Compose の内部ネットワーク(一つのプロジェクトのコンテナだけが見える私設の網)でサービス名を使って話します。例: `http://api:8000`。 +- ホストに公開するポートは `127.0.0.1`(「このコンピュータだけ」を意味する番地)に結び付けたものだけです。他のインターフェースでは何も待ち受けません。 +- 導入のどの手順にも `sudo` は要りません。理由は [ADR-02](../decisions/ADR-02_Network_Model.md) にあります。 + +### 5. 節目のはしご + +「節目(マイルストーン)」は合否の試験がある関門です。「セキュリティ門」はそのビルドを導入してよいかを決める試験で、節目ごとに厳しくなります([ADR-03](../decisions/ADR-03_Staged_Security_Gate.md))。 + +```toon +milestones[5]{id,goal,security_gate}: + M1,"docs の骨格・manifest・dev2027 リポジトリ群がある。レビュー済み PR が develop にマージ済み","報告+許容リスト" + M2,"コア 6 本が Mac Studio で一発導入。Playwright 受入合格。amd64 ビルド確認","報告+許容リスト(M1 より件数を減らす)" + M3,"サブシステム 5 本が起動。各 1 本の正常系+拒否ケース","報告+許容リスト(M2 より件数を減らす)" + M4,"waterbutler・mfr・osf.io を Python 3.13 へ","HIGH 以上で停止。AI レッドチーム初回" + M5,"ES2・mongo 廃止。ES8+postgres 15 以降。海外配布可","CRITICAL/HIGH ゼロ。AI レッドチームの未解決経路ゼロ" +``` + +### 6. 役割 + +役割の略称は `AGENTS.md` の対応表に従います。「AI エージェント」は、指示を読み、コードや文書を書き、結果を報告するプログラムです。 + +| 略称 | 誰 | 何をする | +|---|---|---| +| AID(AI開発担当者) | Orca の Open Code 2 ワーカー(ローカル LLM) | 仕様どおりに実装する。文書とコードを PR で出す | +| QAE(QA担当) | Claude Code Fable | 仕様を書く。実装を検査する。回帰・受入試験を実行し判定する | +| REV(担当レビュワ) | Codex Astra | 全 PR の独立レビュー。結果を `docs/reviews/` と PR コメントに残す | +| 所有者 | 人 | 方針を決める。受け入れる。マージし公開する | + +検出、修正 PR、レビュー、自動試験までは人が介在しません。マージと公開は必ず所有者が行います([ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md))。 + +### 7. 仕様の索引 + +| ID | ファイル | 一行説明 | +|---|---|---| +| SPEC-01 | [01_manifest.md](01_manifest.md) | マニフェスト。インストーラーが組む上流のコミットと PR | +| SPEC-02 | [02_installer_cli.md](02_installer_cli.md) | `grdm-dev` CLI と `install.sh`。ホスト判定・秘密・compose・ビルド・健康確認・報告 | +| SPEC-03 | [03_security_gate.md](03_security_gate.md) | SBOM、CVE スキャン、静的解析、ZAP、AI レッドチームと節目ごとの基準 | +| SPEC-04 | [04_acceptance_tests.md](04_acceptance_tests.md) | Playwright Python の受入。機能ごとの正常系と拒否ケース | +| SPEC-05 | [05_upstream_tracking.md](05_upstream_tracking.md) | 日次ミラーと差分報告、週次の AI 統合 PR、COS の参照追跡 | +| SPEC-06 | [06_documentation_conventions.md](06_documentation_conventions.md) | すべての文書の書き方 | + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Container | A box that holds one program and everything it needs, so it runs the same anywhere. | 一つのプログラムと必要なものを一箱に入れ、どこでも同じように動かす箱。 | +| Base image | The ready-made operating-system layer a program is built on. | プログラムを載せる土台になる、できあいの OS の層。 | +| Upstream | The original repository we copy code from. | コードを写してくる元のリポジトリ。 | +| Tracking branch | A read-only copy of a branch that lives somewhere else. | 他の場所にあるブランチの読み取り専用の写し。 | +| SHA | The 40-character fingerprint that names one commit. | 一つのコミットを指す 40 文字の指紋。 | +| Loopback / 127.0.0.1 | The network address that means "this computer only". | 「このコンピュータだけ」を意味する番地。 | +| Security gate | The test that decides whether a build may be installed. | ビルドを導入してよいかを決める試験。 | +| Milestone | A checkpoint with a pass/fail test. | 合否の試験がある関門。 | diff --git a/docs/spec/01_manifest.md b/docs/spec/01_manifest.md new file mode 100644 index 0000000..81be3fb --- /dev/null +++ b/docs/spec/01_manifest.md @@ -0,0 +1,314 @@ +# SPEC-01 Upstream Manifest / 上流マニフェスト + +> **Summary:** The manifest is the single source of truth for what the installer builds: every component, its upstream repositories pinned to exact commits, the pull requests we adopt, the base and target images, and the profiles and platforms. This page defines its schema, its rules, and the checks that `grdm-dev manifest check` runs. +> **概要:** マニフェストは「インストーラーが何を組むか」の唯一の正本です。全部品、固定したコミットの上流、採用する PR、現行と目標のイメージ、プロファイルと対応アーキテクチャを持ちます。この文書はその形、規則、`grdm-dev manifest check` の検査項目を定めます。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.14 — 2026-11-12. **Learned:** a component list is only as current as its last removal: Elasticsearch 2, MongoDB and ShareJS left the manifest (20 components to 18) and `elasticsearch8` entered it with the same `image_build` mechanism, so the manifest check's rule that TOON and JSON agree is what caught the stale excerpt, and a note that must not contain an address also rejected the word it was written with ("HTTP"), which is why notes say "REST port". The osf.io pin is, until PR #8, #10 and #11 are merged in the integration repository, a local candidate that the PR text must replace. / 部品の一覧は、最後に外した時点までしか新しくない。Elasticsearch 2・MongoDB・ShareJS は manifest から外れ(20 部品から 18)、`elasticsearch8` が同じ `image_build` の仕組みで入った。TOON と JSON が一致するという manifest 検査の規則が古い抜粋を見つけ、アドレスを含めてはならない注は、書くのに使った語(「HTTP」)まで拒んだので、注は「REST のポート」と書く。osf.io の固定は、PR #8・#10・#11 が統合リポジトリでマージされるまで、PR の本文が置き換えるべきローカルの候補である。 + 0.13 — 2026-11-11. **Learned:** the last prebuilt fallback ended the same way as the first: once the ember-osf-web Dockerfile built from source (a Node stage on the build host's platform and a static nginx image), the component needed only its pinned commit, so `prebuilt_image` and `build_platform` went and no component uses the fallback now; until the integration PR is merged, the pin is that PR's head commit and the `note` says it must move to the merge commit (RDM-ember-osf-web-dev2027 PR #2 review r1 R1-03). / 最後の事前ビルド済みの代替も最初のものと同じ終わり方をした。ember-osf-web の Dockerfile がソースから組めるようになると(ビルドホストのプラットフォームで動く Node の段と静的な nginx のイメージ)、部品に要るのは固定コミットだけになり、`prebuilt_image` と `build_platform` は外れ、いまこの代替を使う部品は無い。統合の PR がマージされるまでは固定先がその PR の先頭コミットで、マージコミットへ移す必要があることを `note` に書く(RDM-ember-osf-web-dev2027 PR #2 レビュー r1 R1-03)。 + 0.12 — 2026-11-11. **Learned:** a platform pin made for an EOL base ends with that base, not at its milestone: the Python 3.13 MFR image has arm64 wheels for every dependency, so its `build_platform` was dropped and only ember-osf-web is still emulated among the built components. / EOL ベースのためのプラットフォームの固定は、節目ではなくそのベースとともに終わる。Python 3.13 の MFR イメージは全依存の arm64 wheel を持つので `build_platform` を外し、組む部品のうちエミュレーションで動くのは ember-osf-web だけになった。 + 0.11 — 2026-11-10. **Learned:** a bypass written for one broken Dockerfile should end when that Dockerfile is fixed rather than at its planned milestone, and the native build needed only the pinned commit and no recipe of ours, so `cas-overlay` dropped `prebuilt_image` and `build_platform` before M4 (ADR-07 §7). / 壊れた Dockerfile のために書いた迂回は、予定の節目でなくその Dockerfile が直った時点で終えるべきである。ネイティブのビルドに要るのは固定コミットだけで本リポジトリのレシピは要らなかったので、`cas-overlay` は M4 を待たず `prebuilt_image` と `build_platform` を外した(ADR-07 §7)。 + 0.10 — 2026-11-10. **Learned:** per-volume init containers multiplied hardening exceptions and still missed redis and the other uid-1000 volumes, so one generic owner step, derived from each volume's writers, replaces them (cross-OS audit, 2026-11-10). Also, a built component's image can need a change that its integration commit does not carry (npm in the running y-websocket image), so this repository may supply the recipe over the same pinned checkout (`build_dockerfile`, MC-16). / ボリュームごとの init コンテナは堅牢化の例外を増やすだけで redis や他の uid 1000 のボリュームを取りこぼしていた。各ボリュームの書き手から導く一つの汎用の所有者設定の段に置き換えると分かった(OS 横断の監査、2026-11-10)。また、組む部品のイメージには、統合コミットに無い変更が要ることがある(動作中の y-websocket イメージの npm)。そこで同じ固定 checkout に対し本リポジトリがレシピを与えられるようにした(`build_dockerfile`、MC-16)。 + 0.9 — 2026-11-06. **Learned:** an infra component may need an image this repository builds itself when the official one is amd64-only and unusable under emulation (`image_build`, MC-15, ADR-07; real install run 19). / 公式イメージが amd64 のみでエミュレーションでは使えないとき、infra の部品には本リポジトリ自身が組むイメージが要る(`image_build`、MC-15、ADR-07。実機第 19 回)。 + 0.8 — 2026-11-06. **Learned:** a third-party infra image can be single-architecture too; `build_platform` is therefore allowed on `infra` with a note, so `compose render` pins the platform and `up` does not fail on Apple Silicon (real install run 6). / 第三者の基盤イメージも単一アーキテクチャのことがある。`infra` にも `note` 付きで `build_platform` を認め、`compose render` がプラットフォームを固定して Apple Silicon の `up` が失敗しないようにした(実機第 6 回)。 + 0.7 — 2026-11-06. **Learned:** a repository with a Dockerfile is not necessarily a component that can be built from its own checkout (wiki-frontend's Dockerfile is osf.io's and its image holds only a webpack bundle), so the manifest needs `overlay_of`, the overlay image is tagged with both commits (`<base_sha12>-<overlay_sha12>`), and its services are one-shot copiers into a named volume (MC-14, [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md)); and, independently, a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / Dockerfile があるリポジトリが必ず自分の checkout から組める部品とは限らない(wiki-frontend の Dockerfile は osf.io のもので、そのイメージは webpack の束しか持たない)ため、manifest には `overlay_of` が要り、オーバーレイのイメージは両コミット(`<ベース sha12>-<オーバーレイ sha12>`)をタグに持ち、そのサービスは名前付きボリュームへ写す一回限りのものになる(MC-14、[ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md))。また別に、用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.6 — 2026-11-06. **Learned:** the fourth real install on Apple Silicon showed that a repository with a Dockerfile is not necessarily a component that can be built from its own checkout: the wiki-frontend Dockerfile is osf.io's with the Python steps removed and COPYs paths only the osf.io tree has, and the image it produces holds a webpack bundle, not a runtime. So the manifest needs `overlay_of` ("built from the base's checkout plus my files"), the overlay image is tagged with both commits (`<base_sha12>-<overlay_sha12>`), and its services are one-shot copiers of the bundle into a named volume (MC-14, [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md)). / Apple Silicon での第 4 回実導入で、Dockerfile があるリポジトリが必ず自分の checkout から組める部品とは限らないと分かった。wiki-frontend の Dockerfile は osf.io のものから Python 手順を除いた写しで、osf.io の木にしか無いパスを COPY し、できるイメージは実行環境でなく webpack の束を持つだけである。だから manifest には「ベースの checkout に自分のファイルを重ねて組む」を表す `overlay_of` が要り、オーバーレイのイメージは両コミット(`<ベース sha12>-<オーバーレイ sha12>`)をタグに持ち、そのサービスは束を名前付きボリュームへ写す一回限りのものになる(MC-14、[ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md))。 +- Version / 版: 0.6 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 + 0.5 — 2026-11-05. **Learned:** the second real install on Apple Silicon showed that a Dockerfile whose base image is a schema-1 manifest cannot be built by current Docker at all, so a digest-pinned `prebuilt_image` fallback is needed per component, with a note and an M4 removal date, because it bypasses the build-from-pinned-source guarantee. / Apple Silicon での二度目の実導入で、ベースイメージが schema 1 のマニフェストである Dockerfile は現行 Docker ではまったく組めないと分かった。だから「固定した元から組む」保証を外す代わりに、理由と M4 での撤去を書いた `note` を伴うダイジェスト固定の `prebuilt_image` が部品ごとに要る。 + 0.4 — 2026-11-05. **Learned:** the first real build on Apple Silicon showed that an EOL Python 3.5 base cannot install pandas 0.25.1 for arm64, so a per-component `build_platform` is needed until M4 modernizes those images. / Apple Silicon での最初の実ビルドで、EOL の Python 3.5 ベースは arm64 向け pandas 0.25.1 を入れられないと分かった。M4 で近代化するまで部品ごとの `build_platform` が要る。 + 0.3 — 2026-11-05. **Learned:** building from "the tip of develop" is not reproducible unless the manifest pins that tip, so each component needs an `integration_sha` (nullable until the first strict merge). / 「develop の先端」から組むのでは再現できないため、各部品に `integration_sha`(最初の厳密マージまでは null 可)が要ると分かった。 + 0.2 — 2026-11-05. **Learned:** a TOON block that is only an example must say so, or readers and the checker treat it as data that has to stay in step with the JSON. / 例にすぎない TOON ブロックはそう明記しないと、読者も検査も JSON と一致させるべきデータとして扱ってしまうと分かった。 +- Version / 版: 0.1 — 2026-11-05. **Learned:** the public osf.io `develop` (2026-11-05) is already newer than its `-private` twin (2026-11-02), so "the latest" is not one answer; only a file that pins each upstream to a SHA can say what "consistent" means. / 公開 osf.io の `develop`(2026-11-05)は `-private`(2026-11-02)より既に新しく、「最新」は一つに決まらない。各上流を SHA で固定したファイルがあってこそ「矛盾なく」を定義できると分かった。 +- Normative for: `manifest/upstreams.json` (canonical), `manifest/upstreams.toon` (excerpt), `manifest/README.md`, the `manifest` subcommand of `grdm-dev` ([SPEC-02](02_installer_cli.md)), and every document that quotes the manifest. +- Related: [SPEC-00 Overview](00_overview.md) · [SPEC-05 Upstream tracking](05_upstream_tracking.md) · [SPEC-06 Documentation conventions](06_documentation_conventions.md) · [POL-01 Position](../policy/POL-01_Developer_Environment_2027_Position.md) · [ADR-01 Integration repository placement](../decisions/ADR-01_Integration_Repository_Placement.md) · [ADR-03 Staged security gate](../decisions/ADR-03_Staged_Security_Gate.md) · [docs/README.md](../README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. What the manifest is + +A *manifest* is a packing list: it says exactly what goes into the box. Ours says, for every component of the environment ([SPEC-00 §2](00_overview.md#2-component-map)), which *upstream* repositories (the original places we copy code from) are combined, at which *SHA* (the 40-character fingerprint of one commit), and which pull requests (*PRs*, proposed changes waiting to be merged; see [REF-01](../reference/REF-01_Glossary.md)) we add on top. + +The installer reads the manifest and nothing else to decide what to build. If a fact is not in the manifest, the installer does not know it. + +### 2. Files + +| File | Role | +|---|---| +| `manifest/upstreams.json` | **Canonical.** The only file machines trust. JSON, UTF-8, two-space indent, keys sorted. | +| `manifest/upstreams.toon` | **Excerpt** in TOON (a compact text form of JSON that people read easily; [SPEC-06 §4](06_documentation_conventions.md#4-diagrams-and-data)). Generated from the JSON by `grdm-dev manifest toon`. Must always equal the JSON. | +| `manifest/README.md` | Explains the two files for readers, bilingual. | + +The excerpt contains the top-level fields and, for every component, `id`, `role`, `integration_repo`, `profile`, every field of `upstreams[]`, and `adopted_prs[]` reduced to `repo`, `number`, `status`. It omits `candidate_prs`, images, services, and platforms. Other files under `manifest/` (`allowlist.json`, `allowlist.baseline.json`, `milestone.json`, `hardening.json`, `redteam-targets.json`) are defined by [SPEC-03](03_security_gate.md); their file list is in [SPEC-02 §9](02_installer_cli.md#english). + +> **Warning:** This repository is public. The manifest contains **repository names and SHAs only**. It never contains URLs to private repositories, access tokens, or code fragments from `-private` repositories. The CI (continuous integration: automatic checks on every change; see [REF-01](../reference/REF-01_Glossary.md)) secret scan fails the PR (pull request: a proposed change waiting for review; see [REF-01](../reference/REF-01_Glossary.md)) if it finds any. + +### 3. Schema + +The top level has `schema_version` (integer, currently `1`), `generated_at` (ISO date), an optional `note` (free text), and `components[]`. Infrastructure images (databases, queues, `fakecas`) are components with `role: infra`. Each component has: + +| Field | Type | Meaning | +|---|---|---| +| `id` | string | Short name, same as in [SPEC-00 §2](00_overview.md#2-component-map). Unique. | +| `role` | `core` \| `infra` \| `subsystem` | What kind of component. COS repositories are not components; they appear as `upstreams[]` entries with `kind: cos`. | +| `services[]` | list | The Compose service names the component provides, as used in [SPEC-02 §4](02_installer_cli.md#english) (for example `web`, `api`, `admin`, `worker` for `osf.io`; `wiki_assets` for the overlay `wiki-frontend`). Never empty. | +| `integration_repo` | string or `null` | Name of the private integration repository, `RDM-<name>-dev2027`. Name only, never a URL. `null` for `infra`. | +| `integration_branch` | string or `null` | Always `develop`; `null` for `infra`. | +| `integration_sha` | string (40 hex) or null | The commit at the tip of the integration branch `develop` that this manifest pins. `grdm-dev build` and `compose render` use it for image tags. May be `null` until the strict reconstruction PRs are merged; required for M2 acceptance. | +| `build_platform` | string or absent | Platform used to build and run this component's image, for example `linux/amd64`. Absent means the host platform. `grdm-dev build --platform` overrides it. Components whose EOL base has no arm64 wheels (no component now: modular-file-renderer did until its Python 3.13 image of 2026-11-11, and ember-osf-web until it was built from source) set `linux/amd64`; Compose then runs them under emulation. An `infra` component may set it too, together with a `note`, when its pinned image has no manifest for the other host platform (sharejs and unoconv were linux/amd64 only, real install run 6; elasticsearch6, elasticsearch8 and fakecas use `image_build` and unoconv is rebuilt natively; sharejs is retired, ADR-13 §6); `compose render` then writes `platform:` for that service so Compose pulls and runs the amd64 image under emulation instead of failing at `up`. | +| `prebuilt_image` | string or absent | A registry image reference pinned by digest (`name@sha256:<64 hex>`, for example `niicloudoperation/rdm-ember-osf-web@sha256:…`) that is run **instead of** building from the integration repository. Allowed only together with a `note` that says why the build is impossible and until which milestone the fallback stays; never a URL or a private-repository reference; not allowed for `infra`. `grdm-dev build` records the component as `prebuilt`, pulls the reference and does not clone or build; `compose render` writes it as `image:` (with `platform:` from `build_platform`); `scan` treats it like any other compose image. **A prebuilt image bypasses the "build from pinned source" guarantee of this specification: nobody can show which commits are inside it.** It is a temporary measure for M2 and must be removed by M4. Current use: none. `ember-osf-web` used it while its Dockerfile base `quay.io/centerforopenscience/ember-base` was a Docker image manifest v2 schema 1 image that current Docker refuses to pull; it is built from its pinned commit again since its Dockerfile builds a static nginx image (RDM-ember-osf-web-dev2027 PR #2), as `cas-overlay` is since ADR-07 §7. | +| `overlay_of` | string or absent | Names the *base* component whose checkout is the build context. The overlay cannot be built from its own checkout (its Dockerfile COPYs the base's paths). After both checkouts are synced at their pinned commits, the overlay's files are copied over a copy of the base checkout (`.git` of both left out; the overlay's version wins where both have a file) in `runtime/src/_overlay/<overlay id>/`, and the **overlay's** image is built from that directory with the **overlay's** Dockerfile, tagged with both commits: `grdm-dev/<overlay id>:<base_sha12>-<overlay_sha12>` (with `--push`, `ghcr.io/rcosdp/<overlay id>:<same tag>`). The base component is built normally with its own Dockerfile and tag. The overlay image is a *bundle builder*, not a runtime, so its `services[]` are **one-shot** (template `one_shot: true`, Compose `restart: "no"`): they copy the build output into a named volume and exit; the base's services mount that volume read-only and depend on them with `condition: service_completed_successfully`; `health` accepts them as `exited` with code 0. The base must exist, must not be `infra`, must not be an overlay itself and must not have `prebuilt_image`; the overlay must not be `infra` and must not have `prebuilt_image`; one overlay per base (MC-14; the one-shot template flag is checked by the installer). `plan` and `compose render` show the overlay's services with origin `overlay`. Current use: `wiki-frontend` is an overlay of `osf.io` ([ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md)): its Dockerfile is osf.io's with `node:21-alpine`, webpack 5 and no Python steps, its tree holds only the wiki editor sources, and `wiki_assets` copies `/code/website/static/public/js/` (the webpack `output.path`: `wiki-edit-page.<chunkhash>.js`, `vendor.<hash>.js`, `webpack-assets.json`) into the volume `wiki_static`, mounted at `/code/website/static/public/js/wiki/` in `web`, `api`, `admin` and `worker`. | +| `image_build` | object or absent | `{"context": "<repo-relative directory>", "tag": "<recipe version>"}` on an `infra` component whose image this repository builds itself from the upstream's official release artefact on a digest-pinned base ([ADR-07](../decisions/ADR-07_Native_Builds_of_EOL_Middleware.md)): the directory holds the Dockerfile, the tag names the recipe, `base_image`/`base_image_digest` name the base. Exclusive with `prebuilt_image` and `build_platform`; requires a `note`. `grdm-dev build` tags the result `grdm-dev/<id>:<tag>` for the host platform. First use: `elasticsearch2` (`installer/images/elasticsearch2`, tag `2.4.6-1`). | +| `build_dockerfile` | string or absent | Repo-relative path of a Dockerfile in this repository, used with `-f` instead of the integration repository's own Dockerfile; the build context stays the checkout at the pinned commit and the tag stays its `sha12`. Requires `integration_repo` and a `note`; exclusive with `prebuilt_image` and `overlay_of` (MC-16). `base_image`/`base_image_digest` name the recipe's base and the digest is recorded as an image label. Current use: `y-websocket` (`installer/images/y-websocket/Dockerfile`), whose running image has no npm or yarn. | +| `upstreams[]` | list | Each: `repo` (name), `branch`, `kind` (`public` \| `private` \| `cos`), `tracking_branch` (named by rule 7), `status` (`merged` \| `reference` \| `candidate`), `sha` (40 lowercase hex), `fetched_at` (ISO date). Empty for `infra`. | +| `adopted_prs[]` | list | Each: `repo`, `number`, `title`, `reason`, `status` (`adopted`). PRs applied on top of the merged upstreams. | +| `candidate_prs[]` | list | Same shape; `status` is `candidate` or `rejected`. Not built. | +| `base_image` | string | The image the component builds from today (for example `python:3.6-slim`). For `infra`, the image that is run. | +| `base_image_digest` | string or `null` | The `sha256:` digest of `base_image` once pinned ([SPEC-03 §3.4](03_security_gate.md#english)); `null` until then. | +| `target_image` | object | Keys `M4` and `M5`, each the image planned at that milestone (a *milestone* is a checkpoint; [SPEC-00 §5](00_overview.md#5-milestone-ladder)), or `null` when nothing changes at that milestone. | +| `profile` | `minimum` \| `core` \| `full` | The smallest installer profile that includes the component ([SPEC-02 §4](02_installer_cli.md#english)). | +| `platforms[]` | list | Subset of `linux/arm64`, `linux/amd64`. | +| `note` | string or `null` | Optional free text (for example "mutually exclusive with fakecas"). | + +Example for one component, in TOON: + +```toon +schema_version: 1 +generated_at: 2026-11-05 +note: "Names and SHAs only." +components[1]: + - id: waterbutler + role: core + services[2]: wb,wb_worker + integration_repo: RDM-waterbutler-dev2027 + integration_branch: develop + upstreams[3]{repo,branch,kind,tracking_branch,status,sha,fetched_at}: + RDM-waterbutler,develop,public,upstream/public-develop,merged,0000000000000000000000000000000000000000,2026-11-05 + RDM-waterbutler-develop-private,develop,private,upstream/private-develop,merged,0000000000000000000000000000000000000000,2026-11-05 + CenterForOpenScience/waterbutler,develop,cos,upstream/cos-develop,reference,0000000000000000000000000000000000000000,2026-11-05 + adopted_prs[1]{repo,number,title,reason,status}: + RDM-waterbutler,101,"Python 3.13, dependency update, multi-stage image (WIP)","vulnerability remediation (M4)",adopted + candidate_prs[1]{repo,number,title,reason,status}: + RDM-waterbutler,93,"S3 SigV4",feature,candidate + base_image: python:3.6-slim-buster + base_image_digest: null + target_image: + M4: "python:3.13-slim multi-stage, non-root" + M5: null + profile: core + platforms[2]: linux/arm64,linux/amd64 + note: null +``` + +The all-zero SHAs above are placeholders for the example only; a real manifest never contains them. The block is an illustrative example, not a mirror of `manifest/upstreams.json`, so it carries no `<!-- canonical: ... -->` declaration ([SPEC-06 §4](06_documentation_conventions.md#4-diagrams-and-data)); blocks that do mirror the manifest (for example in [SPEC-00 §2](00_overview.md#english)) declare it. + +### 4. Rules + +1. **SHAs are pinned.** Every `upstreams[].sha` is a real 40-character commit that exists on the named branch at `fetched_at`. Branch (a separate line of work in a repository; see [REF-01](../reference/REF-01_Glossary.md)) names alone are never enough. +2. **A change to the manifest is a PR.** Nobody edits `upstreams.json` on `develop` directly. The weekly integration PR ([SPEC-05 §3](05_upstream_tracking.md#3-weekly-integration-pr)) is the normal way SHAs move. Adopting or rejecting a PR is also a manifest PR, with the `reason` filled in. +3. **Integration order is fixed:** merge the `public` upstream with `status: merged`, then the `private` one, then apply `adopted_prs` in list order. A component that has no `public` upstream (the private subsystems) starts from its `private` upstream. The `cos` upstream (`status: reference`) is never merged; it is compared. +4. **"Consistent" (矛盾なく) means all of the following:** + - No two components reference two different SHAs of the same upstream repository and branch. + - Every `adopted_prs[]` entry applies cleanly (no conflict) on the integration branch built from the pinned upstreams. + - `upstreams.toon` is byte-for-byte what `grdm-dev manifest toon` produces from `upstreams.json`. + - Every `integration_repo` named exists and has the branch `develop` plus one tracking branch per `upstreams[]` entry, named exactly as its `tracking_branch`. +5. **Names only.** `repo` and `integration_repo` are bare names (`RDM-osf.io-dev2027`). A value starting with `http`, `git@`, or containing `github.com` is invalid. +6. **Undecided upstreams are listed with `status: candidate`.** They are mirrored to their tracking branch but not merged. Example: `RDM-osf.io-private` (branch `fix/sec-test`, tracking branch `upstream/private-sec-test-fix-sec-test`) is a candidate until the owner decides (plan §7). +7. **Tracking branches are named by one rule:** `upstream/<kind>-<branch>`, where `<branch>` is the upstream branch name with every `/` replaced by `-`. When one component lists two upstreams of the same `kind`, the second inserts a short tag after the kind: `upstream/<kind>-<tag>-<branch>`. Examples: `RDM-ember-osf-web` (`master`) → `upstream/public-master`; `RDM-ember-osf-web-master-private` → `upstream/private-master`; `RDM-OASys-main-private` → `upstream/private-main`; `CenterForOpenScience/osf.io` → `upstream/cos-develop`; `RDM-osf.io-private` (`fix/sec-test`) → `upstream/private-sec-test-fix-sec-test`. The same rule is stated in [SPEC-05 §1](05_upstream_tracking.md#english) and [ADR-01 §3](../decisions/ADR-01_Integration_Repository_Placement.md#english). + +### 5. Validation: `grdm-dev manifest check` + +Run from the repository root. Exit code `0` means pass; any failure prints one line per finding and exits `20` (manifest invalid, [SPEC-02 §6](02_installer_cli.md#english)). + +```sh +grdm-dev manifest check +``` + +Checks, in order: + +```toon +checks[16]{id,rule,severity}: + MC-01,"upstreams.json parses as JSON and matches schema_version 1",error + MC-02,"every component id is unique and matches ^[A-Za-z0-9_.-]+$",error + MC-03,"role is one of core|infra|subsystem; services is a non-empty list",error + MC-04,"integration_repo matches ^RDM-[A-Za-z0-9_.-]+-dev2027$ or is null for infra",error + MC-05,"integration_branch is develop, or null for infra",error + MC-06,"every sha matches ^[0-9a-f]{40}$; base_image_digest is null or sha256:<64 hex>; fetched_at is an ISO date not in the future; prebuilt_image, when present, is name@sha256:<64 hex>, has a non-empty note, is not a URL or private-repository reference, and is not on infra",error + MC-07,"no value anywhere contains http, git@, github.com, or a token-like string",error + MC-08,"the same (repo, branch) pair has one sha across all components",error + MC-09,"adopted_prs status is adopted; candidate_prs status is candidate|rejected; upstreams status is merged|reference|candidate and cos upstreams are reference; number is a positive integer",error + MC-10,"profile and platforms use only the allowed values; core components list both platforms",error + MC-11,"upstreams.toon equals the output of grdm-dev manifest toon",error + MC-12,"with --remote: each integration_repo has develop plus every tracking_branch listed, and each sha is reachable from its tracking_branch",error + MC-13,"every tracking_branch follows rule 7 (upstream/<kind>[-<tag>]-<branch with / replaced by ->)",error + MC-14,"overlay_of, when present, names an existing component that is not infra, not an overlay and not prebuilt; the overlay is not infra and not prebuilt; one overlay per base (its services must be one-shot: checked by the installer against the service template)",error + MC-15,"image_build {context, tag} only on infra; context is a repo-relative directory holding a Dockerfile; tag is a valid image tag; note required; exclusive with prebuilt_image and build_platform (ADR-07)",error + MC-16,"build_dockerfile only with integration_repo; a plain repo-relative file in this repository; note required; exclusive with prebuilt_image and overlay_of",error +``` + +`--remote` needs network and credentials and is run in the private `-dev2027` CI, not in this public repository's CI. The documentation check in [SPEC-06 §8](06_documentation_conventions.md#8-checks) reuses MC-11 for TOON blocks quoted in documents. + +### 6. Who changes it + +| Change | Opened by | Reviewed by | Merged by | +|---|---|---|---| +| Weekly SHA advance | AID agent (weekly job, [SPEC-05](05_upstream_tracking.md)) | REV (Codex Astra), check by QAE (Claude Code Fable) | Owner | +| Adopt / reject a PR | AID or QAE, with `reason` | REV | Owner | +| Change `target_image` | QAE, referencing the milestone plan | REV | Owner | + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. マニフェストとは + +「マニフェスト」は荷物の明細書です。箱に何が入るかを正確に書きます。私たちのマニフェストは、環境の全部品([SPEC-00 §2](00_overview.md#2-部品の地図))について、どの上流(コードを写してくる元のリポジトリ)を、どの SHA(一つのコミットを指す 40 文字の指紋)で重ね、どの PR(プルリクエスト。マージを待っている変更の提案。[REF-01](../reference/REF-01_Glossary.md))をその上に足すかを書きます。 + +インストーラーは何を組むかをマニフェストだけから決めます。マニフェストに無いことは、インストーラーは知りません。 + +### 2. ファイル + +| ファイル | 役割 | +|---|---| +| `manifest/upstreams.json` | **正本。** 機械が信じる唯一のファイル。JSON、UTF-8、字下げ 2 つ、キーは並べ替え済み。 | +| `manifest/upstreams.toon` | TOON(JSON を人が読みやすい短い文字形式にしたもの。[SPEC-06 §4](06_documentation_conventions.md#4-図とデータ))の **抄録**。`grdm-dev manifest toon` が JSON から生成する。常に JSON と一致していなければならない。 | +| `manifest/README.md` | 二つのファイルを読者向けに二言語で説明する。 | + +抄録には、最上位の項目と、各部品の `id`・`role`・`integration_repo`・`profile`、`upstreams[]` の全項目、そして `repo`・`number`・`status` に絞った `adopted_prs[]` を載せます。`candidate_prs`、イメージ、サービス、platform は載せません。`manifest/` の下のほかのファイル(`allowlist.json`、`allowlist.baseline.json`、`milestone.json`、`hardening.json`、`redteam-targets.json`)は [SPEC-03](03_security_gate.md) が定め、一覧は [SPEC-02 §9](02_installer_cli.md#japanese) にあります。 + +> **Warning:** このリポジトリは公開です。マニフェストには **リポジトリ名と SHA だけ** を書きます。非公開リポジトリの URL、アクセストークン、`-private` 由来のコード断片は決して書きません。CI(continuous integration。変更ごとに自動で走る検査。[REF-01](../reference/REF-01_Glossary.md))の秘密スキャンが見つけたら PR(プルリクエスト。レビュー待ちの変更の提案。[REF-01](../reference/REF-01_Glossary.md))は不合格です。 + +### 3. 形(スキーマ) + +最上位は `schema_version`(整数。今は `1`)、`generated_at`(ISO 日付)、任意の `note`(自由記述)、`components[]` です。基盤のイメージ(データベース、キュー、`fakecas`)も `role: infra` の部品として載せます。各部品は次を持ちます。 + +| 項目 | 型 | 意味 | +|---|---|---| +| `id` | 文字列 | 短い名前。[SPEC-00 §2](00_overview.md#2-部品の地図) と同じ。重複しない。 | +| `role` | `core` \| `infra` \| `subsystem` | 部品の種類。COS のリポジトリは部品ではなく、`kind: cos` の `upstreams[]` 要素として現れる。 | +| `services[]` | 配列 | その部品が提供する Compose のサービス名。[SPEC-02 §4](02_installer_cli.md#japanese) と同じ名前(例: `osf.io` は `web`、`api`、`admin`、`worker`。オーバーレイ `wiki-frontend` は `wiki_assets`)。空にしない。 | +| `integration_repo` | 文字列または `null` | 非公開の統合リポジトリの名前 `RDM-<name>-dev2027`。名前だけで URL は書かない。`infra` は `null`。 | +| `integration_branch` | 文字列または `null` | 常に `develop`。`infra` は `null`。 | +| `integration_sha` | 文字列(40 桁の 16 進)または `null` | このマニフェストが固定する統合ブランチ `develop` の先端のコミット。`grdm-dev build` と `compose render` はこの値をイメージのタグに使う。厳密再構築 PR のマージ前は `null` でよいが、M2 の受入では必須。 | +| `build_platform` | 文字列または省略 | この部品のイメージを組んで動かすプラットフォーム。例: `linux/amd64`。省略時はホストと同じ。`grdm-dev build --platform` が優先する。EOL ベースで arm64 の wheel がない部品(現在はなし。modular-file-renderer は 2026-11-11 の Python 3.13 イメージまで、ember-osf-web はソースからのビルドになるまで)は `linux/amd64` を指定し、Compose はエミュレーションで動かす。`infra` の部品も、固定したイメージにもう一方のホスト向けのマニフェストがないときは `note` と一緒に指定できる(sharejs・unoconv は linux/amd64 のみだった。実機第 6 回。elasticsearch6・elasticsearch8・fakecas は `image_build` を使い、unoconv はネイティブに組み直し、sharejs は退役した。ADR-13 §6)。`compose render` はそのサービスに `platform:` を書き、Compose は `up` で失敗せず amd64 のイメージをエミュレーションで取得・実行する。 | +| `prebuilt_image` | 文字列または省略 | 統合リポジトリから組む **代わりに** 動かす、ダイジェストで固定したレジストリのイメージ参照(`name@sha256:<16 進 64 文字>`。例: `niicloudoperation/rdm-ember-osf-web@sha256:…`)。なぜ組めないか、どの節目までこの代替を続けるかを書いた `note` と一緒にしか書けない。URL や非公開リポジトリの参照は不可。`infra` には使えない。`grdm-dev build` はその部品を `prebuilt` として記録し、参照を pull するだけで clone も build もしない。`compose render` はそれを `image:` に書き(`platform:` は `build_platform` から)、`scan` はほかの Compose イメージと同じに扱う。**事前ビルド済みイメージは、この仕様の「固定した元から組む」保証を外す。中にどのコミットが入っているかを誰も示せない。** M2 のための一時措置であり、M4 までに必ず外す。現在の使用: なし。`ember-osf-web` は、その Dockerfile のベース `quay.io/centerforopenscience/ember-base` が現行の Docker の pull を拒否する Docker image manifest v2 schema 1 のイメージだった間これを使った。Dockerfile が静的な nginx のイメージを組むようになったので(RDM-ember-osf-web-dev2027 PR #2)、ADR-07 §7 以後の `cas-overlay` と同じく固定コミットから組み直す。 | +| `overlay_of` | 文字列または省略 | ビルドの文脈(context)となる checkout を持つ「ベース」部品の名前。オーバーレイは自分の checkout だけでは組めない(その Dockerfile がベースのパスを COPY する)。両 checkout を固定コミットで同期した後、`runtime/src/_overlay/<オーバーレイ id>/` にベース checkout の写し(両方の `.git` は除く)を作り、その上にオーバーレイのファイルを重ね(両方にあるファイルはオーバーレイ側が勝つ)、その場所から **オーバーレイ側の** Dockerfile で **オーバーレイの** イメージを組む。タグは両コミット: `grdm-dev/<オーバーレイ id>:<ベース sha12>-<オーバーレイ sha12>`(`--push` では `ghcr.io/rcosdp/<オーバーレイ id>:<同じタグ>`)。ベース部品は自分の Dockerfile とタグで通常どおり組む。オーバーレイのイメージは実行環境でなく「束を組む道具」なので、その `services[]` は **一回限り**(テンプレートの `one_shot: true`、Compose の `restart: "no"`): ビルド成果を名前付きボリュームへ写して終了する。ベースのサービスはそのボリュームを読み取り専用で mount し、`condition: service_completed_successfully` で待つ。`health` は終了コード 0 の `exited` を健康とみなす。ベースは存在し、`infra` でなく、オーバーレイでなく、`prebuilt_image` を持たない。オーバーレイは `infra` でなく、`prebuilt_image` を持たない。ベース一つにオーバーレイは一つ(MC-14。一回限りのテンプレート印はインストーラーが検査)。`plan` と `compose render` はオーバーレイのサービスを origin `overlay` で示す。現在の使用: `wiki-frontend` は `osf.io` のオーバーレイ([ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md))。その Dockerfile は osf.io のものに `node:21-alpine` と webpack 5 を入れ Python 手順を除いた写しで、木には Wiki エディタのソースしか無い。`wiki_assets` は `/code/website/static/public/js/`(webpack の `output.path`: `wiki-edit-page.<chunkhash>.js`、`vendor.<hash>.js`、`webpack-assets.json`)をボリューム `wiki_static` に写し、`web`・`api`・`admin`・`worker` はそれを `/code/website/static/public/js/wiki/` に mount する。 | +| `image_build` | オブジェクトまたは省略 | `{"context": "<リポジトリ相対のディレクトリ>", "tag": "<レシピの版>"}`。上流の公式リリース成果物からダイジェスト固定のベース上に本リポジトリ自身がイメージを組む `infra` 部品に書く([ADR-07](../decisions/ADR-07_Native_Builds_of_EOL_Middleware.md))。ディレクトリに Dockerfile があり、tag はレシピの版、`base_image`/`base_image_digest` がベースを指す。`prebuilt_image`・`build_platform` と併用不可。`note` 必須。`grdm-dev build` は結果に `grdm-dev/<id>:<tag>` を付けてホスト向けに組む。初出: `elasticsearch2`(`installer/images/elasticsearch2`、tag `2.4.6-1`)。 | +| `build_dockerfile` | 文字列または省略 | 本リポジトリ内の Dockerfile のリポジトリ相対パス。統合リポジトリ自身の Dockerfile の代わりに `-f` で使う。ビルドの文脈は固定コミットの checkout のままで、tag もその `sha12` のまま。`integration_repo` と `note` が必須で、`prebuilt_image`・`overlay_of` と併用不可(MC-16)。`base_image`/`base_image_digest` はレシピのベースを指し、ダイジェストはイメージのラベルに記録する。現在の使用: `y-websocket`(`installer/images/y-websocket/Dockerfile`)。動作中のイメージに npm も yarn も無い。 | +| `upstreams[]` | 配列 | 各要素: `repo`(名前)、`branch`、`kind`(`public` \| `private` \| `cos`)、`tracking_branch`(規則 7 で命名)、`status`(`merged` \| `reference` \| `candidate`)、`sha`(小文字 16 進 40 文字)、`fetched_at`(ISO 日付)。`infra` は空。 | +| `adopted_prs[]` | 配列 | 各要素: `repo`、`number`、`title`、`reason`、`status`(`adopted`)。上流をマージした上に適用する PR。 | +| `candidate_prs[]` | 配列 | 同じ形。`status` は `candidate` か `rejected`。組まない。 | +| `base_image` | 文字列 | その部品が今日組む元のイメージ(例 `python:3.6-slim`)。`infra` では実行するイメージ。 | +| `base_image_digest` | 文字列または `null` | `base_image` を固定したときの `sha256:` ダイジェスト([SPEC-03 §3.4](03_security_gate.md#japanese))。固定するまでは `null`。 | +| `target_image` | オブジェクト | キー `M4` と `M5`。各節目(合否の試験がある関門。[SPEC-00 §5](00_overview.md#5-節目のはしご))で予定するイメージ。その節目で変えないなら `null`。 | +| `profile` | `minimum` \| `core` \| `full` | その部品を含む最小のインストーラープロファイル([SPEC-02 §4](02_installer_cli.md#japanese))。 | +| `platforms[]` | 配列 | `linux/arm64`、`linux/amd64` の部分集合。 | +| `note` | 文字列または `null` | 任意の自由記述(例:「fakecas と排他」)。 | + +一部品の例を TOON で示します。 + +```toon +schema_version: 1 +generated_at: 2026-11-05 +note: "Names and SHAs only." +components[1]: + - id: waterbutler + role: core + services[2]: wb,wb_worker + integration_repo: RDM-waterbutler-dev2027 + integration_branch: develop + upstreams[3]{repo,branch,kind,tracking_branch,status,sha,fetched_at}: + RDM-waterbutler,develop,public,upstream/public-develop,merged,0000000000000000000000000000000000000000,2026-11-05 + RDM-waterbutler-develop-private,develop,private,upstream/private-develop,merged,0000000000000000000000000000000000000000,2026-11-05 + CenterForOpenScience/waterbutler,develop,cos,upstream/cos-develop,reference,0000000000000000000000000000000000000000,2026-11-05 + adopted_prs[1]{repo,number,title,reason,status}: + RDM-waterbutler,101,"Python 3.13, dependency update, multi-stage image (WIP)","vulnerability remediation (M4)",adopted + candidate_prs[1]{repo,number,title,reason,status}: + RDM-waterbutler,93,"S3 SigV4",feature,candidate + base_image: python:3.6-slim-buster + base_image_digest: null + target_image: + M4: "python:3.13-slim multi-stage, non-root" + M5: null + profile: core + platforms[2]: linux/arm64,linux/amd64 + note: null +``` + +上の全部ゼロの SHA は例のための仮の値です。本物のマニフェストには現れません。このブロックは説明のための例であって `manifest/upstreams.json` の写しではないので、`<!-- canonical: ... -->` の宣言は付けません([SPEC-06 §4](06_documentation_conventions.md#4-図とデータ))。マニフェストを写すブロック(たとえば [SPEC-00 §2](00_overview.md#japanese))には宣言を付けます。 + +### 4. 規則 + +1. **SHA を固定する。** すべての `upstreams[].sha` は、`fetched_at` の時点でそのブランチに実在する 40 文字のコミットです。ブランチ(リポジトリの中の別の作業の道。[REF-01](../reference/REF-01_Glossary.md))名だけでは足りません。 +2. **マニフェストの変更は PR で行う。** `develop` 上の `upstreams.json` を直接編集する人はいません。SHA が進む通常の経路は週次の統合 PR([SPEC-05 §3](05_upstream_tracking.md#3-週次の統合-pr))です。PR の採用・却下もマニフェストの PR で、`reason` を書きます。 +3. **統合の順番は固定:** `status: merged` の `public` の上流をマージ、次に `private` の上流をマージ、最後に `adopted_prs` を並び順に適用。`public` の上流がない部品(非公開サブシステム)は `private` の上流から始めます。`cos` の上流(`status: reference`)はマージせず、比較だけに使います。 +4. **「矛盾なく」とは次のすべてを満たすこと:** + - 同じ上流リポジトリの同じブランチについて、二つの部品が異なる SHA を参照していない。 + - すべての `adopted_prs[]` が、固定した上流から組んだ統合ブランチにきれいに(衝突なく)当たる。 + - `upstreams.toon` が、`grdm-dev manifest toon` が `upstreams.json` から出す結果と 1 バイトも違わない。 + - 名前を書いた `integration_repo` がすべて存在し、`develop` と、`upstreams[]` の各要素につき一本の追跡ブランチ(名前はその `tracking_branch` と完全に同じ)を持つ。 +5. **名前だけを書く。** `repo` と `integration_repo` は裸の名前(`RDM-osf.io-dev2027`)です。`http` や `git@` で始まる値、`github.com` を含む値は不正です。 +6. **決まっていない上流は `status: candidate` で載せる。** 追跡ブランチにはミラーするが、マージはしない。例: `RDM-osf.io-private`(ブランチ `fix/sec-test`、追跡ブランチ `upstream/private-sec-test-fix-sec-test`)は所有者が決めるまで候補です(計画書 §7)。 +7. **追跡ブランチの名前は一つの規則で決める:** `upstream/<kind>-<branch>`。`<branch>` は上流のブランチ名の `/` をすべて `-` に置き換えたもの。一つの部品に同じ `kind` の上流が二つあるときは、二つ目は kind の後ろに短いタグを挟む: `upstream/<kind>-<tag>-<branch>`。例: `RDM-ember-osf-web`(`master`)→ `upstream/public-master`、`RDM-ember-osf-web-master-private` → `upstream/private-master`、`RDM-OASys-main-private` → `upstream/private-main`、`CenterForOpenScience/osf.io` → `upstream/cos-develop`、`RDM-osf.io-private`(`fix/sec-test`)→ `upstream/private-sec-test-fix-sec-test`。同じ規則を [SPEC-05 §1](05_upstream_tracking.md#japanese) と [ADR-01 §3](../decisions/ADR-01_Integration_Repository_Placement.md#japanese) にも書いています。 + +### 5. 検査: `grdm-dev manifest check` + +リポジトリのルートで実行します。終了コード `0` が合格。不合格なら指摘ごとに一行出して `20`(manifest が不正。[SPEC-02 §6](02_installer_cli.md#japanese))で終わります。 + +```sh +grdm-dev manifest check +``` + +検査は次の順で行います。 + +```toon +checks[16]{id,rule,severity}: + MC-01,"upstreams.json が JSON として読め、schema_version 1 の形に合う",error + MC-02,"部品の id が重複せず ^[A-Za-z0-9_.-]+$ に合う",error + MC-03,"role が core|infra|subsystem のいずれか。services が空でない配列",error + MC-04,"integration_repo が ^RDM-[A-Za-z0-9_.-]+-dev2027$ に合う。infra は null",error + MC-05,"integration_branch が develop。infra は null",error + MC-06,"sha が ^[0-9a-f]{40}$ に合う。base_image_digest は null か sha256:<16 進 64 文字>。fetched_at が未来でない ISO 日付。prebuilt_image があるときは name@sha256:<16 進 64 文字> で、空でない note を伴い、URL や非公開リポジトリの参照でなく、infra に無い",error + MC-07,"どの値にも http、git@、github.com、トークンらしい文字列が含まれない",error + MC-08,"同じ (repo, branch) の組は全部品で一つの sha",error + MC-09,"adopted_prs の status は adopted。candidate_prs は candidate|rejected。upstreams の status は merged|reference|candidate で cos は reference。number は正の整数",error + MC-10,"profile と platforms が許された値だけ。core の部品は両 platform を持つ",error + MC-11,"upstreams.toon が grdm-dev manifest toon の出力と一致",error + MC-12,"--remote 付き: 各 integration_repo が develop と列挙した全 tracking_branch を持ち、各 sha がその tracking_branch から到達できる",error + MC-13,"すべての tracking_branch が規則 7(upstream/<kind>[-<tag>]-<branch の / を - に置換>)に合う",error + MC-14,"overlay_of があるときは、存在して infra でもオーバーレイでも prebuilt でもない部品を指す。オーバーレイ自身は infra でなく prebuilt_image を持たない。ベース一つにオーバーレイは一つ(サービスが一回限りであることはインストーラーがテンプレートで検査)",error + MC-15,"image_build {context, tag} は infra だけ。context は Dockerfile を含むリポジトリ相対のディレクトリ、tag は有効なイメージタグ、note 必須、prebuilt_image・build_platform と併用不可(ADR-07)",error + MC-16,"build_dockerfile は integration_repo があるときだけ。本リポジトリ内のファイルを指すリポジトリ相対パス、note 必須、prebuilt_image・overlay_of と併用不可",error +``` + +`--remote` はネットワークと認証情報が要るので、公開であるこのリポジトリの CI ではなく、非公開の `-dev2027` 側の CI で実行します。[SPEC-06 §8](06_documentation_conventions.md#8-検査) の文書検査は、文書内に引用した TOON ブロックに MC-11 を使い回します。 + +### 6. 誰が変えるか + +| 変更 | 起票 | レビュー | マージ | +|---|---|---|---| +| 週次の SHA 前進 | AID エージェント(週次ジョブ。[SPEC-05](05_upstream_tracking.md)) | REV(Codex Astra)。検査は QAE(Claude Code Fable) | 所有者 | +| PR の採用・却下 | AID または QAE。`reason` 付き | REV | 所有者 | +| `target_image` の変更 | QAE。節目の計画を参照 | REV | 所有者 | + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Manifest | A packing list that says exactly what goes into the build. | ビルドに何が入るかを正確に書いた明細書。 | +| Upstream | The original repository we copy code from. | コードを写してくる元のリポジトリ。 | +| SHA | The 40-character fingerprint that names one commit. | 一つのコミットを指す 40 文字の指紋。 | +| Pull request (PR) | A proposed change waiting to be reviewed and merged. | レビューとマージを待つ変更の提案。 | +| Schema | The agreed shape of a data file: which fields, which types. | データファイルの決まった形。どの項目がどの型か。 | +| Profile | A named set of components the installer starts together. | インストーラーがまとめて起動する部品の組に付けた名前。 | +| Token | A secret string that proves who you are to a computer. | コンピュータに「自分は誰か」を示す秘密の文字列。 | diff --git a/docs/spec/02_installer_cli.md b/docs/spec/02_installer_cli.md new file mode 100644 index 0000000..5ff80fa --- /dev/null +++ b/docs/spec/02_installer_cli.md @@ -0,0 +1,543 @@ +# SPEC-02 Installer CLI / インストーラー CLI + +> **Summary:** The contract of the optional per-OS prerequisite scripts and of the two entry points that install the GakuNin RDM developer environment: the thin bootstrap `installer/install.sh` and the Python command `grdm-dev` with its subcommands, profiles, flags, exit codes, and directory layout. +> **概要:** 任意の OS ごとの前提条件スクリプトと、GakuNin RDM 開発環境を導入する二つの入口、薄い起動スクリプト `installer/install.sh` と Python コマンド `grdm-dev` の契約。サブコマンド、プロファイル、フラグ、終了コード、ディレクトリ構成を定める。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.34 — 2026-11-14. **Learned:** a health check is a time budget the template fixes, and a slow host can spend all of it on a healthy start: Elasticsearch 8 took 8 min 10 s to start under full-system amd64 emulation while the check allowed 2.5 minutes, so `up` stopped with exit 40 although nothing was wrong, and `up --timeout` could not help because it bounds the wait, not the container's own check; the window is now 17 to 26 minutes, ending inside the default 1800 s health wait of `up` (DEMO-22 0.7). / ヘルスチェックはテンプレートが固定した時間の予算で、遅い機械は健全な起動でそれを使い切りうる。機械全体を amd64 でエミュレーションする環境で Elasticsearch 8 の起動に 8 分 10 秒かかったのに、チェックの許容は 2.5 分で、何も壊れていないのに `up` が終了 40 で止まった。`up --timeout` は待ちの上限であってコンテナ自身のチェックではないので助けにならない。窓は 17〜26 分になり、`up` の既定の健康の待ち 1800 秒の内に終わる(DEMO-22 0.7)。 + 0.33 — 2026-11-13. **Learned:** a Docker named volume remembers the directory it was bound to on the day it was created, and Compose reuses it without comparing, so a second checkout of the same project opened the first one's data with its own new secrets and `osf_init` failed on a password after 8 minutes of `up`; `up` now compares the rendered bindings with the existing volumes before starting anything (DEMO-21 0.5, run 4). / Docker の名前付きボリュームは、作られた日に結び付けたディレクトリを覚えていて、Compose は比べずに再利用する。そのため同じプロジェクトの二つ目のチェックアウトは、一つ目のデータを自分の新しい秘密で開き、`osf_init` は `up` の 8 分後にパスワードで失敗した。`up` は何かを起動する前に、render した結び付けと既存のボリュームを比べるようになった(DEMO-21 0.5、第 4 回)。 + 0.32 — 2026-11-13. **Learned:** a command that exists in the code has to be in the contract, or the documents recommend the wrong one: `secrets init --missing` (add only the absent keys, change nothing live) was implemented for upgrades but the table named only `rotate`, so ADR-14 told installations to rotate before rendering, which changes every credential and recreates containers from a stale Compose file (PR #56 review r1 R1-02). / コードにあるコマンドは契約にも書かなければ、文書が間違ったコマンドを勧める。`secrets init --missing`(足りないキーだけを足し、稼働中のものは何も変えない)は更新のために実装されたが、表には `rotate` しかなく、ADR-14 は render の前に rotate を求めてしまった。rotate はすべての資格情報を替え、古い Compose ファイルのままコンテナを再作成する(PR #56 レビュー r1 R1-02)。 + 0.31 — 2026-11-12. **Learned:** replacing a component also replaces the contracts around it: Elasticsearch 8 brings a CA, two passwords and a one-shot, retiring sharejs and mongo removes a port, two volumes, a secret and a hardening exception, and osf.io's mandatory sign-in (`ENABLE_PUBLIC_ACCESS`) becomes a setting of `compose render` that every osf.io process must share, so the floors, the ports table and the profiles table were all recomputed from the templates instead of edited by hand (ADR-13 §6, ADR-14). / 部品を入れ替えると、その周りの約束も替わる。Elasticsearch 8 は CA、二つのパスワード、一回きりの手順を持ち込み、sharejs と mongo の退役はポート一つ、ボリューム二つ、秘密一つ、堅牢化の例外一つを消し、osf.io の必須サインイン(`ENABLE_PUBLIC_ACCESS`)は osf.io のすべてのプロセスが共有しなければならない `compose render` の設定になった。そのため下限、ポートの表、プロファイルの表は手で直さず、テンプレートから計算し直した(ADR-13 §6、ADR-14)。 + 0.30 — 2026-11-11. **Learned:** a memory requirement inherits the reason it was set for: the 24 GiB for `core` came from the prebuilt ember-osf-web image rebuilding its bundle at every start under emulation with an 8 GiB floor, so once ember became a static nginx image built from source (128 MiB floor) the figure had to be recomputed from the floors (8320 MiB, about 11.6 GiB) and stated as a computed lower bound, not a measured peak (RDM-ember-osf-web-dev2027 PR #2 review r1 R1-03). / メモリの要件は、それを決めた理由を引き継ぐ。`core` の 24 GiB は、事前ビルド済みの ember-osf-web のイメージが起動のたびにエミュレーション下で下限 8 GiB のもと束を組み直したことから来ていた。ember がソースから組む静的な nginx のイメージ(下限 128 MiB)になったので、数字を下限の合計(8320 MiB、約 11.6 GiB)から計算し直し、実測の最大値ではなく計算上の下限として書く必要があった(RDM-ember-osf-web-dev2027 PR #2 レビュー r1 R1-03)。 + 0.29 — 2026-11-12. **Learned:** a review of PR #50 showed that a number is only as good as its label: the compile-time ratio is an observation, "a working day" is an extrapolation, and `--timeout` belongs to `up` alone, so it neither shortens nor extends `build`; and a report key that "is absent" on macOS must be absent from the report, not empty ([PR #50 review r1](../reviews/README.md) R2, R6). / PR #50 のレビューで、数字は札の付け方次第だと分かった。コンパイル時間の比は観察、「1 営業日」は外挿であり、`--timeout` は `up` だけのもので `build` を短くも長くもしない。また macOS で「無い」報告のキーは、空ではなく報告から無くなっていなければならない([PR #50 レビュー r1](../reviews/README.md) R2・R6)。 + 0.28 — 2026-11-12. **Learned:** a fully emulated amd64 machine compiled osf.io's scientific Python about ten times slower than Rosetta did (one RUN step: 55 minutes there, not finished after 5 h 12 min here), so a slow host can need a way to wait longer in `up`, and a report that says nothing about emulation on amd64 cannot be told from one that did not check: `install --timeout` goes to `up`, and `doctor` prints `amd64_emulation` ([DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md)). / amd64 を全体エミュレーションする機械は、osf.io の科学計算の Python のコンパイルが Rosetta の約 10 倍遅かった(一つの RUN 手順が Rosetta では 55 分、ここでは 5 時間 12 分後も未完)。そこで遅い機械には `up` の待ちを延ばす手段が要りうる。また、amd64 でエミュレーションに何も触れない報告は、確かめていない報告と区別できない。`install --timeout` が `up` に渡り、`doctor` が `amd64_emulation` を出す([DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md))。 + 0.27 — 2026-11-10. **Learned:** decoding is not enough if the result passes through `$(...)`, which drops trailing newlines: a mount named `host\012` was checked as `host`, so the decoded name is kept in a variable ([PR #44 review r2](../reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r2.md) R2-01). / 復号しても結果が `$(...)` を通ると末尾の改行が落ちる。`host\012` という mount が `host` として調べられたので、復号した名前は変数に保つ([PR #44 レビュー r2](../reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r2.md) R2-01)。 + 0.26 — 2026-11-10. **Learned:** a path check must read the path the way the system means it: the kernel escapes spaces in mount points (`\040`) and a symlink can carry a checkout onto the Windows disk, so the shared-folder check decodes mount fields and the WSL checks compare physical paths (`pwd -P`) ([PR #44 review r1](../reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r1.md) R1, R2). / パスの検査は、システムが意味するとおりにパスを読まなければならない。カーネルは mount 先の空白を `\040` とエスケープし、シンボリックリンクはチェックアウトを Windows のディスクへ運びうる。そこで共有フォルダの検査は mount の欄を復号し、WSL の検査は実体のパス(`pwd -P`)で比べる([PR #44 レビュー r1](../reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r1.md) R1・R2)。 + 0.25 — 2026-11-10. **Learned:** a change can be blocked by the permission needed to publish one part of it: the token that pushes this repository may not change `.github/workflows/`, so the two workflows of §10 wait on branch `feat/per-os-installers` while the scripts, fixes and records land now. / 変更の一部を公開する権限が無いために全体が止まることがある。このリポジトリに push するトークンは `.github/workflows/` を変えられないので、§10 の二つのワークフローはブランチ `feat/per-os-installers` で待ち、スクリプト・修正・記録は先に入れる。 + 0.24 — 2026-11-10. **Learned:** a real Linux run disproves what a dry run cannot: Ubuntu 24.04's own `qemu-user-static` crashes inside an amd64 build after 48 minutes, QEMU builds ember about twice as slowly as Rosetta so the 1800 s wait stops a healthy install, and the cloud image lacks a library Playwright's driver needs; so emulation comes from a digest-pinned image, `doctor` refuses the measured-bad emulator, `up` waits longer on Linux arm64, and the accept hint names the Linux packages ([DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md)). / 実際の Linux での実行は dry run には分からないことを覆す。Ubuntu 24.04 自身の `qemu-user-static` は 48 分後に amd64 のビルドの中で落ち、QEMU は ember の組み立てに Rosetta のおよそ 2 倍かかるので 1800 秒の待ちは健全な導入を止め、クラウドイメージには Playwright のドライバーが要るライブラリが無い。そこでエミュレーションはダイジェストで固定したイメージから入れ、`doctor` は落ちると実測したエミュレーターを拒み、`up` は Linux arm64 では長く待ち、accept の案内は Linux のパッケージを示す([DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md))。 + 0.23 — 2026-11-10. **Learned:** a prerequisite is whatever the whole install sequence needs, not only its first step: Trivy and gitleaks are missing on a fresh host and stop an otherwise good install with exit 51 at `scan`, so the per-OS scripts of §2.3 provide them ([ADR-08](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md)). / 前提条件とは最初の段ではなく一連の導入全体に要るものである。新しいホストには Trivy と gitleaks が無く、ほかが良くても `scan` で終了 51 になるため、§2.3 の OS ごとのスクリプトがそれらを用意する([ADR-08](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md))。 + 0.22 — 2026-11-10. **Learned:** a lock that only the `db` commands take does not stop `up` from starting the server between their checks and their renames, so `up` and `reset` take it too (PR #42 review r2). / `db` のコマンドだけが取るロックでは、その確認と改名の間に `up` がサーバーを起動するのを止められないので、`up` と `reset` も同じロックを取る(PR #42 レビュー r2)。 + 0.21 — 2026-11-10. **Learned:** a command that renames data directories needs a journal, a lock and a recovery path that every later command runs, not only checks before it starts (PR #42 review r1). / データディレクトリを改名するコマンドには、始める前の確認だけでなく、操作記録・ロック・後続のすべてのコマンドが通る復旧の道が要る(PR #42 レビュー r1)。 + 0.20 — 2026-11-10. **Learned:** a new database major needs a command, not a note: a server refuses a data directory of another major, so `up` now says so with exit 15 and `db upgrade` moves the data by a verified dump and restore that never writes the old directory (ADR-12). / データベースの新しい版には注記でなくコマンドが要る。サーバーは別の版のデータディレクトリを拒むので、`up` はそれを終了 15 で告げ、`db upgrade` は旧ディレクトリに一度も書かない、照合つきのダンプと復元でデータを移す(ADR-12)。 + 0.19 — 2026-11-10. **Learned:** a fixed client is only as good as the address and trust anchor it is given: osf.io's mongo URL was never rendered and fell back to PostgreSQL's host and port, so `osf.env` now names the TLS URL and the CA file. / 直したクライアントも、渡される接続先と信頼の起点しだいである。osf.io の mongo の URL は一度も描画されず、PostgreSQL のホストとポートに落ちていたので、`osf.env` に TLS の URL と CA ファイルを書くことにした。 + 0.18 — 2026-11-10. **Learned:** a build record says what was built, not what should run: after the pin of osf.io moved, `compose render` ran before `build` and the stack silently ran the old image, so render now trusts the record only when it equals the manifest pin and otherwise renders the pin and warns with the fix. / ビルドの記録は何を組んだかを示すだけで、何を動かすべきかは示さない。osf.io の固定が動いた後、`build` より前に `compose render` を実行したため、スタックは古いイメージを黙って動かした。そこで render は記録が manifest の固定と一致するときだけそれを信じ、違うときは固定を書いて対処を添えて警告することにした。 + 0.17 — 2026-11-10. **Learned:** a flag that changes what a server will serve belongs in the operating contract, not only in a template and a PR body, so the admin app's `--insecure` is now stated as a development-only, loopback-only exception (PR #40 review r1 R1-02). / サーバーが配信するものを変えるフラグは、テンプレートや PR 本文だけでなく運用の契約に書く。そのため管理画面の `--insecure` を、開発専用でループバック限定の例外として明記した(PR #40 レビュー r1 R1-02)。 + 0.16 — 2026-11-10. **Learned:** the browser opens the wiki and file-editor sockets itself, so y_websocket and sharejs need loopback ports like any other page the browser loads. / wiki とファイル編集のソケットはブラウザが自分で開くため、y_websocket と sharejs にも、ブラウザが読む他のページと同じくループバックのポートが要る。 + 0.15 — 2026-11-10. **Learned:** a byte count does not make a key usable by its consumer: a manually written key may be 43 `!` or 32 quoted spaces, so every CAS key must also be in the base64url alphabet, must not be a published default, and the TGC encryption key must decode canonically to 32 bytes (PR #39 review r1 R1-01). / バイト数だけでは、鍵が使う側で使えるとは言えない。手で書いた鍵は感嘆符 43 個や引用符で囲んだ空白 32 個でありうる。そこで CAS の鍵はすべて base64url の文字に限り、公開された既定値を拒み、TGC の暗号鍵は 32 バイトへ正準に復号できなければならない(PR #39 レビュー r1 R1-01)。 + 0.14 — 2026-11-10. **Learned:** a key name that nothing reads looks exactly like a working secret, and a service that fails closed turns a wrong length into a stopped stack, so the keys now carry the names the image reads and `compose render` refuses a wrong length before anything starts (ADR-07 §7). / 誰も読まないキーの名前は、効いている秘密とまったく同じに見える。また閉じて失敗するサービスでは長さの誤りがスタックの停止になる。そこでキーにはイメージが読む名前を使い、`compose render` が起動前に誤った長さを拒むようにした(ADR-07 §7)。 +- Version / 版: 0.13 — 2026-11-10. **Learned:** a writable root says nothing about what lies beneath it, and a probe must never reuse a name that may already exist: the access check walks existing data as the real uid and creates its file exclusively (PR #36 review r3). / ルートに書けても下のものについては何も分からず、確認用のファイルは既にあるかもしれない名前を使ってはならない。そこでアクセス確認は実際の uid で既存のデータを辿り、ファイルは排他的に作ると分かった(PR #36 レビュー r3)。 +- Version / 版: 0.12 — 2026-11-10. **Learned:** a path check expires when the path changes and sees only what it looks at, and a command that exits 0 has not proved its effect: so `reset` revalidates at each step using the mount table, ownership is read back, and only a write as the real uid shows that a volume is usable (PR #36 review r2). / パスの検証はパスが変われば古くなり、見たものしか分からない。また終了 0 のコマンドは効果を証明しない。そこで `reset` は段ごとに mount 表で再検証し、所有者は読み返し、ボリュームが使えることは実際の uid での書き込みだけが示すと分かった(PR #36 レビュー r2)。 +- Version / 版: 0.11 — 2026-11-10. **Learned:** a root process without capabilities still obeys file permissions, a container path does not confine the host path behind its bind mount, and a repair that trusts its top directory cannot finish a partial one; so volume paths are validated on the host, `unoconv` holds `DAC_OVERRIDE` for the shared directory, ownership is re-walked every time, and availability questions are asked of the filesystem or the engine rather than guessed from a path (PR #36 review r1). / capability を除いた root もファイル権限に従い、コンテナ内のパスは bind 元のホストパスを限定せず、一番上のディレクトリを信用する修復は途中で止まった修復を完了できない。そこでボリュームのパスはホスト側で検証し、`unoconv` は共有ディレクトリのために `DAC_OVERRIDE` を持ち、所有者は毎回全体を辿り、可否はパスから推測せずファイルシステムやエンジンに問うと分かった(PR #36 レビュー r1)。 +- Version / 版: 0.10 — 2026-11-10. **Learned:** a check that fails after a 30-minute build teaches nothing, so `doctor` must prove every prerequisite up front: private repositories, scanners, memory floors, emulation and a checkout path Docker can see; and a fresh bind directory belongs to the host user, so ownership is one generic step derived from the writers instead of one init container per volume, while `reset` needs a container to delete what containers own (cross-OS audit, 2026-11-10; on Colima a bind mount from `/private/tmp` was measured to be silently empty). / 30 分のビルドの後で失敗する検査は何も教えない。だから `doctor` が非公開リポジトリ、スキャナー、メモリの下限、エミュレーション、Docker から見える配置先をすべて先に証明しなければならない。また新しい bind ディレクトリはホストの利用者の所有なので、所有者の設定はボリュームごとの init コンテナではなく書き手から導く一つの汎用の段にまとめ、`reset` はコンテナが所有するものをコンテナで消さねばならないと分かった(OS 横断の監査、2026-11-10。Colima では `/private/tmp` からの bind mount が黙って空になることを実測)。 + 0.9 — 2026-11-10. **Learned:** a retired credential key stays in `runtime/.env` forever unless it is dropped explicitly, and a Compose file rendered before the key was retired still refers to it, so `compose render` must run before `secrets rotate` or a recreate after an upgrade (PR #35 review r1). / 廃止した資格情報のキーは明示的に消さなければ `runtime/.env` に残り続け、廃止前に生成した Compose ファイルはそのキーを参照し続ける。更新後は `secrets rotate` や再作成の前に `compose render` が必要と分かった(PR #35 レビュー r1)。 + 0.8 — 2026-11-06. **Learned:** a stack that builds is not a stack that starts: a fresh database needs a one-shot initialisation (`osf_init`), Compose's short `tmpfs` is root-only, the memory budget must respect the Docker VM, and a prebuilt SPA must be built once into a volume rather than at every start under emulation (real install runs 9–13). / 組めるスタックは起動するスタックではない。新しいデータベースには一回限りの初期化(`osf_init`)が要り、Compose の短い `tmpfs` は root 専用で、メモリ予算は Docker VM を尊重しなければならず、prebuilt の SPA はエミュレーション下で毎回組むのではなくボリュームへ一度組む(実機第 9〜13 回)。 + 0.7 — 2026-11-06. **Learned:** a service row in the profile table must correspond to a process that exists, so the overlay repository wiki-frontend is represented by a one-shot `wiki_assets` that fills a named volume and its readers wait with `condition: service_completed_successfully` ([ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md)), while a template `command` must have `$` escaped as `$$` for Compose (PR #30 review r1); and, independently, a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / プロファイル表のサービス行は実在するプロセスに対応していなければならないため、オーバーレイである wiki-frontend は名前付きボリュームを満たす一回限りの `wiki_assets` で表し、それを読むサービスは `condition: service_completed_successfully` で待つ([ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md))。またテンプレートの `command` は Compose 向けに `$` を `$$` にエスケープする(PR #30 レビュー r1)。また別に、用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.6 — 2026-11-06. **Learned:** a `command` in a template is written for the container shell, but Compose interpolates `$VAR` in every string of the file first, so the renderer must escape `$` as `$$` and a test must run the rendered file through Compose's own parser; and a fresh bind volume belongs to the host user, so a non-root writer needs an owner step (PR #30 review r1). / テンプレートの `command` はコンテナのシェル向けに書くが、Compose はファイル中の全文字列の `$VAR` を先に展開する。だから出力側で `$` を `$$` にエスケープし、試験は出力ファイルを Compose 自身の解析器に通さねばならない。また新しい bind ボリュームはホストの利用者の所有なので、非 root の書き手には所有者を決める段が要る(PR #30 レビュー r1)。 + 0.5 — 2026-11-06. **Learned:** a service row in the profile table must correspond to a process that exists: `wiki` had none, because the wiki-frontend repository is an overlay whose image only builds a webpack bundle (real install run 4, [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md)); the honest row is a one-shot `wiki_assets` that fills a named volume, and the services that read the volume must wait for it with `condition: service_completed_successfully`. / プロファイル表のサービス行は実在するプロセスに対応していなければならないと分かった。`wiki` には無かった。wiki-frontend リポジトリは webpack の束を組むだけのイメージを持つオーバーレイだからである(実機第 4 回、[ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md))。正直な行は名前付きボリュームを満たす一回限りの `wiki_assets` で、ボリュームを読むサービスは `condition: service_completed_successfully` でそれを待たねばならない。 +- Version / 版: 0.5 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 + 0.4 — 2026-11-06. **Learned:** an operational failure that only a module docstring describes is invisible to the shell wrapper and to the Japanese message table, so every new failure cause of a subcommand needs its own row in `messages.tsv` and in this table before the code may return it (PR #23 review r1, U4: `upstream` returned 1 with no canonical entry). / モジュールの docstring にしか書かれていない運用上の失敗は、シェルの包み紙にも日本語の文言表にも見えない。サブコマンドの新しい失敗原因は、コードがその番号を返す前に `messages.tsv` とこの表に行を持たなければならないと分かった(PR #23 レビュー r1、U4: `upstream` が正本に無い 1 を返していた)。 + 0.3 — 2026-11-05. **Learned:** `secrets rotate` had to become a coordinated database-password change plus container recreation, because `restart` keeps the old environment and leaves the captured credential valid (PR #21 review r1). / `restart` は旧い環境を保つため、捕られた資格情報が有効なまま残る。`secrets rotate` は DB パスワードの変更とコンテナ再作成を束ねた手順にする必要があると分かった(PR #21 レビュー r1)。 + 0.2 — 2026-11-05. **Learned:** a profile table and the acceptance criteria that depend on it must change together, and a TOON row whose text contains a comma or a colon must be quoted or the parser sees extra columns. / プロファイル表と、それに依存する受入基準は同時に変えなければならず、カンマやコロンを含む TOON の行は引用符で囲まないと列が増えて解析に失敗すると分かった。 +- Version / 版: 0.1 — 2026-11-05. **Learned:** keeping the shell part to a bootstrap and putting every decision in one Python command is the only way to make the OS differences, the manifest check, and the reports testable with `unittest`. / シェルは起動だけに留め、判断をすべて一つの Python コマンドに集めないと、OS の違い・manifest の整合・報告書を `unittest` で試験できないと分かった。 +- Normative for: `installer/install.sh`, `installer/install-ubuntu.sh`, `installer/install-macos.sh`, `installer/install-windows.ps1`, `installer/prereq-lib.sh`, `.github/workflows/installer-prereq-lint.yml` and `.github/workflows/installer-full.yml` (pending on branch `feat/per-os-installers`), `installer/grdm_dev/`, `installer/tests/`, `runtime/`. +- Related: [SPEC-00 Overview](00_overview.md) · [SPEC-01 Manifest](01_manifest.md) · [SPEC-03 Security Gate](03_security_gate.md) · [SPEC-04 Acceptance Tests](04_acceptance_tests.md) · [SPEC-05 Upstream Tracking](05_upstream_tracking.md) · [SPEC-06 Documentation Conventions](06_documentation_conventions.md) · [ADR-02 Network Model](../decisions/ADR-02_Network_Model.md) · [ADR-03 Staged Security Gate](../decisions/ADR-03_Staged_Security_Gate.md) · [ADR-08 Per-OS Installer Entry Points](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md) · [POL-01 Position](../policy/POL-01_Developer_Environment_2027_Position.md) · [docs/README.md](../README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Scope and goal + +The installer turns a fresh checkout of this repository into a running GakuNin RDM (GakuNin is Japan's academic network for logging in with a university account; see [REF-01](../reference/REF-01_Glossary.md)) developer environment with one command, on the hosts listed in [§8](#2-en-hosts). `install.sh` and `grdm-dev` never need `sudo` (a way to run a command as the computer's administrator), never change network settings on the host, and can be run again at any time without harm. Everything they create lives under `runtime/`, which is ignored by Git. The optional prerequisite scripts of [§2.3](#2-en-prereq) prepare the host beforehand and may use `sudo`, but only after showing the change and receiving consent ([ADR-08](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md)). + +**Glossary notes.** An *installer* is a program that prepares other programs so they can run. A *CLI* (command line interface) is a program you drive by typing commands. A *container* is a box that holds one program and everything it needs, so it runs the same on any computer. *Docker* (the tool that builds images and runs containers; see [REF-01](../reference/REF-01_Glossary.md)) and its companion *Docker Compose* (see [REF-01](../reference/REF-01_Glossary.md)) run them; Compose is the tool that starts many containers together from one description file. A *manifest* is the list that says exactly which version of each source repository we use ([SPEC-01](01_manifest.md)). + +### 2. Entry points + +There are two entry points that install the environment (§2.1, §2.2), and optional scripts that prepare a host for them ([§2.3](#2-en-prereq)). + +#### 2.1 `installer/install.sh` — thin bootstrap + +`install.sh` does four things and nothing else: + +1. Runs with the `bash` that ships with macOS (version 3.2), so it uses no feature newer than that: no associative arrays, no `mapfile`, no `${var,,}`. +2. Finds `python3` and checks that it is 3.11 or newer. If not, it prints how to install one for the detected OS and exits with code 10. +3. Creates a *virtual environment* (a private folder of Python and its libraries, separate from the system) at `.venv/` and installs the `installer/` package into it with `pip install -e installer[scan]` (the `scan` extra brings Semgrep, which `grdm-dev scan` runs locally — SPEC-03 §4.2, real install run 17; `GRDM_WITHOUT_SCAN=1` leaves it out, `GRDM_WITH_ACCEPT=1` adds Playwright). +4. Hands every argument to `.venv/bin/grdm-dev install "$@"` and exits with that command's exit code. + +OS differences are not written in `install.sh`. They live in `installer/grdm_dev/host.py`. User-facing messages come from `installer/grdm_dev/messages.tsv` (one line per code, English and Japanese columns) so that the script and the Python command say the same thing. + +```mermaid +flowchart TD + A[./installer/install.sh --yes] --> B{python3 >= 3.11?} + B -- no --> X10[exit 10: how to install Python] + B -- yes --> C[create .venv/ and pip install -e installer[scan]] + C --> D[grdm-dev doctor] + D -- unsupported host --> X10b[exit 10] + D -- Docker missing --> X11[exit 11] + D -- prerequisite missing --> X13[exit 13] + D -- scanner missing --> X51[exit 51] + D --> E[grdm-dev plan] + E -- manifest invalid --> X20[exit 20] + E --> F[grdm-dev secrets init] + F --> G[grdm-dev compose render] + G --> H[grdm-dev build] + H -- failed --> X30[exit 30] + H --> I[grdm-dev up] + I --> J[grdm-dev health --network] + J -- failed --> X40[exit 40] + J --> K[grdm-dev scan] + K -- gate failed --> X50[exit 50] + K --> L[grdm-dev report] + L --> Z[exit 0 and print URL http://127.0.0.1:5000] +``` + +#### 2.2 `grdm-dev` — the Python command + +`grdm-dev` is the package `installer/grdm_dev/`, exposed as a console script. Rules: + +- **Standard library first.** The command itself has no third-party dependency. The manifest is JSON (read with `json`), the host is read with `platform`, `shutil`, `socket`, and `subprocess`, and the generated Compose file is written as JSON, which Docker Compose accepts because JSON is valid YAML (a plain-text data format that uses indentation; see [REF-01](../reference/REF-01_Glossary.md)). PyYAML is therefore *not* required. +- **Optional extra `accept`.** `pip install -e "installer[accept]"` adds `pytest`, `pytest-playwright`, and `playwright`. Only `grdm-dev accept` imports them ([SPEC-04](04_acceptance_tests.md)). +- **External tools** are called as subprocesses and checked by `doctor`: `docker` (27 or newer) with the Compose plugin (v2 or newer) and buildx (Docker's helper that builds one image for several kinds of computer; see [REF-01](../reference/REF-01_Glossary.md)), `trivy`, `gitleaks`, and `semgrep` for `scan`, the OWASP ZAP (a tool that pokes at a running website the way an attacker would; see [REF-01](../reference/REF-01_Glossary.md)) container image for `scan --dynamic`, and `mkdocs` for `docs`. A missing scanner makes `scan` exit 51 ([SPEC-03 §8](03_security_gate.md#english)). +- Every subcommand supports `--json`, which prints the same report as machine-readable JSON instead of TOON (a compact text form of JSON, see [SPEC-06 §4](06_documentation_conventions.md#english)). + +<a id="2-en-prereq"></a> +#### 2.3 Per-OS prerequisite scripts + +These scripts prepare a host and then run `install.sh`. The reason for them is in [ADR-08](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md). They hold no installation logic, so `install.sh` and `grdm-dev` still make every decision. + +| Script | Host | What it can provide | +|---|---|---| +| `installer/install-ubuntu.sh` | Ubuntu 24.04 amd64 or arm64; Ubuntu 24.04 inside WSL2 | apt packages (git, Python, `python3-venv`, curl, gnupg), Docker Engine with the Compose and buildx plugins from Docker's signed apt repository, `docker` group membership, amd64 emulation on arm64 (QEMU registered from the digest-pinned `tonistiigi/binfmt` image, replacing Ubuntu's `qemu-user-static` 8.2.2, which crashed in a real build: [DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md)), Trivy and gitleaks in `~/.local/bin`, and `libatomic1` when `GRDM_WITH_ACCEPT=1`. Inside WSL2 it skips Docker Engine and requires Docker Desktop. | +| `installer/install-macos.sh` | macOS on Apple Silicon | Homebrew formulae (`python@3.12`, git, Trivy, gitleaks); starts an installed Docker Desktop. It detects Docker Desktop, OrbStack and Colima, and installs neither a Docker runtime nor Homebrew. | +| `installer/install-windows.ps1` | Windows 11 amd64 | WSL2 and the `Ubuntu-24.04` distribution; checks Docker Desktop and its WSL integration; clones this repository under the WSL home directory, never `/mnt/c`; then runs `install-ubuntu.sh` inside WSL. | + +Rules that every script keeps: + +- It shows what it will change, and asks before any `sudo` or administrator action. Joining the `docker` group is asked separately. +- `--yes` (`-Yes` in PowerShell, which also accepts `--yes`) gives consent. Without a terminal and without `--yes` it stops with exit 2, as in [§7](#english). +- `--dry-run` (`-DryRun`) detects and prints the plan and changes nothing. +- It can be run again: a prerequisite that is already present is skipped. +- It stops with a clear message on failure and uses only the exit codes 2, 10 and 11 of [§6](#english). +- A download is accepted only through a signed source or a pinned checksum, and nothing is piped into a shell. +- It never asks for, reads or stores a token. It only says how to give git access to the private integration repositories. +- Its last action is `installer/install.sh`, with every other argument passed unchanged. + +### 3. Subcommands + +| Subcommand | Contract | Touches Docker | +|---|---|---| +| `doctor` | Detects OS (macOS, Ubuntu, WSL2), CPU (`arm64`, `amd64`), memory, free disk, Docker ≥ 27, Compose plugin (v2 or newer), buildx, and proves what `install` needs so a problem appears before the long build: `git`; read access to the profile's private integration repositories, with `git ls-remote` that can never prompt (its output is never printed, a URL can hold a token); `trivy`, `gitleaks` and `semgrep`; the profile's memory floors against the smaller of the host and the Docker VM (`--memory-gib` turns this into a warning, a knowing overcommit); amd64 emulation (binfmt) on Linux arm64 only, printing the command that enables it, and the report line `amd64_emulation` (`not needed (host is amd64)` on amd64, `ready (...)` on Linux arm64 with a working handler, absent on macOS), and refusing an emulator build measured to crash (Ubuntu 24.04's `qemu-user-static` 8.2.2, read from the registered interpreter's `--version`), printing the command that replaces it; a checkout Docker can use: on WSL2 a filesystem that keeps a `chmod 0600` read back from a test file (a Windows drive cannot hold `runtime/.env` at `0600`); on macOS one the engine can see, asked by bind-mounting it read-only into the `postgres` image that `up` needs (the only image this subcommand may pull; a mount the engine refuses or that comes up empty is exit 13, a probe that could not run is a warning) because a bind mount from a path the Docker VM does not share is silently empty, with `GRDM_DOCKER_SHARED=1` to skip the question when it cannot be run. Prints a TOON report. Exit 10 if the host is unsupported or the memory floors do not fit, 11 if Docker is missing or not running, 13 if a prerequisite is missing, 51 if a scanner is missing. | read-only | +| `plan` | Resolves manifest + profile and prints which images would be built and which services started, with the published ports ([§4](#2-en-ports)). Changes nothing. Exit 20 if the manifest fails [SPEC-01](01_manifest.md) checks. | no | +| `secrets init` / `secrets rotate` | `init` writes random secrets (database passwords, Django secret key, CAS keys) into `runtime/.env` with file mode `0600`. Never writes a default or example password. Refuses to overwrite an existing file unless `--force`. `init --missing` is the upgrade for a `runtime/.env` that predates a new key (`ELASTIC8_PASSWORD`, `ELASTIC8_OSF_PASSWORD`, [ADR-14](../decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md#english)): it keeps every existing value (passwords that live data depends on stay valid), adds only the absent keys, drops retired keys, changes no live password and needs no running stack; it cannot be combined with `--force`. `rotate` is not an upgrade step. It regenerates every secret, changes the live PostgreSQL and RabbitMQ passwords, recreates the containers so they receive the new environment, and verifies that the old credentials are rejected; any failure restores the previous `runtime/.env` and exits 40. `init --force` and `rotate` drop retired credential keys. After an upgrade, run `compose render` before `rotate` or any recreate, because a previously rendered Compose file still refers to retired keys. Four keys have lengths the CAS image needs: `TGC_ENCRYPTION_KEY` is 43 characters, `TGC_SIGNING_KEY` is 86 characters, `OSF_API_INSTITUTIONS_AUTH_JWESECRET` is exactly 32 bytes and `OSF_API_INSTITUTIONS_AUTH_JWTSECRET` is at least 32 bytes; the last two are also osf.io's `JWE_SECRET` and `JWT_SECRET` ([ADR-07 §7](../decisions/ADR-07_Native_Builds_of_EOL_Middleware.md#english)). All four use only the base64url characters `A`–`Z`, `a`–`z`, `0`–`9`, `-` and `_` (no whitespace, quotes or padding), must not be a published default, and `TGC_ENCRYPTION_KEY` must decode canonically to 32 bytes. Used after a red-team capture ([SPEC-03 §6](03_security_gate.md#english)). | no / yes | +| `compose render` | Exits 2, naming the keys only, when `runtime/.env` lacks a generated key or holds a CAS key that CAS cannot use: wrong length, characters outside base64url, or a published default (a missing key: `secrets init --missing`; an unusable CAS key: `secrets rotate`). Writes `runtime/docker-compose.yml` from manifest + profile: the internal network `grdm` plus the publishing-only `grdm-edge` (`--egress <services>` attaches more, recorded in `runtime/.env`; [SPEC-03 §3.2](03_security_gate.md#english)), per-component `platform:` from the manifest's `build_platform`, ports published only on `127.0.0.1` ([§4](#2-en-ports)), non-root `user:` for every service, `read_only`, `cap_drop`, and resource limits (`mem_limit`, `cpus`, `pids_limit`) scaled from the smaller of the host memory `doctor` detected and the Docker engine's VM memory (`docker info`; on Docker Desktop the VM is a fraction of the host, real install run 10), where a template's `mem_min_mb` floor takes its share first and the others divide the rest, and from the CPU count the engine reports (`docker info`; the host's only when that is unknown), with per-service exceptions from `manifest/hardening.json` ([SPEC-03 §3.3](03_security_gate.md#english)), `platform:` chosen from `doctor`, named volumes mapped under `runtime/volumes/`, every `tmpfs` entry mounted with `mode=1777` (Compose's short form gives root-only `0755`, real install run 11), and the placeholders `{{HOST_PORT:<service>}}`, `{{CONTAINER_PORT:<service>}}` and `{{AUTH_URL}}` (fakecas's published URL, or web's when `--auth shibboleth` replaces fakecas) resolved in template values. The `image:` of a built component carries the tag of the last build (`runtime/reports/build_latest.json`) only when it equals the tag the manifest pins; a recorded build that differs from the pin is stale (the pin moved after the last `build`), so the pinned tag is rendered instead, the report lists the component under `stale_build_tags` (`component`, `pinned`, `recorded`, `image`), and stderr prints a warning block whose fix is `grdm-dev build`, then `grdm-dev up`. Render still exits 0 because `install` renders before it builds; an image that was never built makes `up` fail instead of running the old one. A component the manifest does not pin keeps the recorded tag. `osf.env` names osf.io's connection to Elasticsearch 8 (`ELASTIC_URI=https://elasticsearch8:9200`, `ELASTIC_CA_CERTS=/es-ca/ca.crt`; the user `grdm_osf` and its password come from the service environment), its internal URL for y-websocket (`Y_WEBSOCKET_INTERNAL_URL`) and `ENABLE_PUBLIC_ACCESS`; web, api, admin, worker and osf_init mount `elasticsearch8_ca` (only the public certificate) read-only. `--public-access true|false` (default: `GRDM_ENABLE_PUBLIC_ACCESS` in `runtime/.env`, else `false`) sets `ENABLE_PUBLIC_ACCESS` for every osf.io process (RDM-osf.io-dev2027 PR #8): `false` requires authentication for every data route (anonymous requests get a redirect to the login or 401; signed WaterButler and MFR callbacks, webhooks and the like keep working), `true` allows anonymous viewing of public projects; the choice is recorded in `runtime/.env` and kept on later renders, like `--egress`. Follows [ADR-02](../decisions/ADR-02_Network_Model.md). | no | +| `build` | Builds images with `docker buildx`. The platform is, in order of precedence, `--platform`, the component's `build_platform` in the manifest (for example `linux/amd64` for components whose EOL base cannot be built for arm64, run under emulation), otherwise the host platform; the image is loaded locally. A component with `prebuilt_image` ([SPEC-01](01_manifest.md)) is not built: the digest-pinned image is pulled once per requested platform and reported as `prebuilt` (`pull-failed` → exit 30). With `--push` a prebuilt image is never re-published to `ghcr.io/rcosdp` (it is a third party's artefact); the row is reported as `prebuilt-not-pushed` with `pushed: false`. `--push` pushes the multi-arch manifest to `ghcr.io/rcosdp/<name>` (private). Exit 30 on failure. | yes | +| `up` / `down` / `reset` | `up` first finishes or rolls back an interrupted `db` operation, then stops with exit 15 when `runtime/volumes/postgres_data` was written by another PostgreSQL major than the rendered image or its major cannot be read (ADR-12), otherwise starts the profile and waits for health. Before the database check, `up` stops with exit 13 when a volume `grdm-dev_<name>` of the rendered file already exists in Docker and is bound to another directory than this checkout's `runtime/volumes/<name>` (a new clone or a moved directory of the same project: Docker keeps the options of the day the volume was created and Compose reuses it without comparing, so this checkout would open the other one's data with its own new secrets); nothing is started or deleted, and the message names the volumes and the commands that release them (`grdm-dev down` in the other checkout, then `docker volume rm <names>`, which leaves the files on disk). `down` stops containers and keeps volumes; `reset` stops and deletes `runtime/volumes/` after a confirmation (skipped by `--yes`), emptying it through a root container with only `DAC_OVERRIDE` and `FOWNER`, because on Linux the files belong to the containers' uids and the host user cannot remove them. Before anything is stopped or deleted the paths are validated on the host: a symlinked `runtime/` or volumes root, a root that resolves outside the checkout, a symlinked volume, or any mount at `runtime/`, at the volumes root or at any depth inside it (read from the host mount table, so same-filesystem bind mounts count; an unreadable table also refuses) stops with exit 14. `reset` repeats this after `down` and after the wipe, and stops if the volumes root has become a different directory. `compose render` and `up` apply the same validation with exit 13, because the owner step also runs as root against these paths. These are snapshots: Docker resolves the bind later and no check can close that window, so the checkout is assumed not to be changed concurrently by another user or process. | yes | +| `db status` / `db upgrade` / `db rollback` / `db recover` | `status` prints the PostgreSQL major of `runtime/volumes/postgres_data` and of the rendered `postgres` image and changes nothing. `upgrade` (all services stopped, after a confirmation that `--yes` skips) moves the data to the rendered major by dump and restore: the old major runs on the old directory with no network, the new major's `pg_dumpall` writes `runtime/backups/postgres-<old>-to-<new>-<timestamp>/`, a new directory is initialised and restored with `ON_ERROR_STOP`, every table's row count and sequence value is compared, and only then is the old directory renamed `postgres_data.pg<old>-<timestamp>` beside the new one. `rollback` puts that directory back. Both hold an exclusive lock, which `up` and `reset` also take for their checks and their start or deletion, and write a durable journal (`runtime/db-operation.json`) before they create or rename anything; `recover`, and first every later `db` command, `reset` and `up`, finish or roll back an operation that a crash or an interrupt left behind, and a free-disk estimate is checked before the old server starts. Exit 15 on failure, with the old or the new cluster usable, or with the journal kept when a compensating rename also failed. See [ADR-12](../decisions/ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md#english). | yes | +| `health` | Checks every service's health endpoint: an HTTP GET on the published loopback port (`/` for most services; `/login/` for `web`, because osf.io's `/` proxies to ember and answered 500 while the former prebuilt ember was still building — real install run 14; `/healthz` for `ember_osf_web`, where only HTTP 200 counts); a one-shot counts as healthy once it has exited 0. With `--network`, also lists listening sockets on the host and fails (exit 40) if any container port is bound to a non-loopback address, or if a wildcard listener on a project port has no visible owner (fail closed). A *named* host program that is not Docker on a project port (macOS AirPlay Receiver on `*:5000`, real install run 16) is reported as a `foreign-listener` warning, not a failure: it is not our leak, and `GRDM_PORT_<SERVICE>` in `runtime/.env` moves our port. | read-only | +| `scan` | Runs the whole security gate of [SPEC-03](03_security_gate.md): baseline controls, Trivy SBOM (software bill of materials: the list of all parts inside an image) and CVE list, gitleaks, Semgrep, and OWASP ZAP; writes `runtime/reports/scan_<date>.json` plus TOON, and diffs findings against `manifest/allowlist.json` and `manifest/allowlist.baseline.json` for the milestone in `manifest/milestone.json`. Gate per [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md): M1–M3 report only, M4 exit 50 on HIGH, M5 exit 50 on CRITICAL or HIGH. Flags `--baseline`, `--secrets`, `--dynamic` run one part only. Exit 51 if a scanner cannot run, 52 if `--dynamic` was asked for while services are unhealthy. | read-only | +| `redteam preflight` | Verifies, before an AI red-team run, that the attacker container of the red-team Compose project is isolated (proved with a reachable canary, see [SPEC-03 §6](03_security_gate.md#english)), that only the containers named in `manifest/redteam-targets.json` are attached, and that the approval record is present and current. Exit 53 if either check fails. See [SPEC-03 §6](03_security_gate.md#english). | yes (starts and removes a canary container and network for the probe) | +| `accept` | Runs the Playwright Python acceptance suite in the same `.venv/`. `--only <scenario>` runs one scenario; `--seed` creates the disposable test users. Exit 60 on any failing test. See [SPEC-04](04_acceptance_tests.md). | read-only | +| `upstream mirror` / `upstream integrate` | Runs the daily mirror or the weekly integration of [SPEC-05](05_upstream_tracking.md) by hand. Needs Git credentials for the private `-dev2027` repositories; never run in this repository's CI. Exit 70 when a fetch was refused or failed, a push failed, or a merge conflicted; the report is written in every case. | no (Git only) | +| `manifest check` / `manifest toon` | `check` validates `manifest/upstreams.json` ([SPEC-01 §5](01_manifest.md#english)) and verifies that every TOON excerpt in `docs/` and `manifest/upstreams.toon` agree with it. Exit 20 on mismatch. `toon` prints the excerpt that `upstreams.toon` must equal. | no | +| `docs build` / `docs check` | `build` runs MkDocs into `site/`. `check` enforces [SPEC-06 §8](06_documentation_conventions.md#english): anchors, Jump line, relative links, TOON consistency, Version line. | no | +| `report` | Bundles the latest reports of `doctor`, `plan`, `health`, `scan`, and `accept` into `runtime/reports/<timestamp>.toon` and `.json`. | no | +| `install` | The sequence shown in the flowchart. Stops at the first non-zero step. | yes | + +<a id="2-en-ports"></a> +### 4. Profiles and published ports + +```toon +profiles[3]{name,services,note}: + minimum,"osf_init volume_owner_init volume_access_check_1000 web api postgres elasticsearch8 elasticsearch8_setup rabbitmq fakecas",smallest set that shows a login and a project page + core,"minimum + admin worker wb wb_worker mfr unoconv ember_osf_web cas wiki_assets elasticsearch6 redis y_websocket volume_access_check_999","the six core repositories with their infrastructure, plus y_websocket for Wiki collaborative editing; wiki_assets is a one-shot that copies the wiki editor bundle into the volume wiki_static (ADR-06)" + full,"core + rdmcp aipf_mcp_data_grdm oasys shibboleth_sp test_idp",everything; shibboleth_sp replaces fakecas +``` + +Service names follow the upstream `docker-compose.yml` of RDM-osf.io so that existing guides keep working, and they are the `services[]` values of the manifest ([SPEC-01 §3](01_manifest.md#english)). The `wiki-frontend` component is an overlay of `osf.io` (`overlay_of`, [ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md)): its service is a *one-shot* (a container that runs once and exits, `restart: "no"`) on the bundle-builder image `grdm-dev/wiki-frontend:<osf_sha12>-<wiki_sha12>`: after `volume_owner_init` has handed the fresh volume `wiki_static` to uid 1000, `wiki_assets` copies the webpack output `/code/website/static/public/js/` into it and exits; `web`, `api`, `admin` and `worker` mount that volume read-only at `/code/website/static/public/js/wiki/` and depend on it with `condition: service_completed_successfully`, so `up` starts them only after the bundle is in place. `health` counts a one-shot as healthy once it has exited with code 0. The `shibboleth` Compose profile and the `fakecas` service are mutually exclusive: `compose render --profile full --auth shibboleth` removes `fakecas` and adds `shibboleth_sp` and `test_idp`; the default for `full` is `fakecas`. `y_websocket` belongs to `core`, not `full`, because Wiki collaborative editing is an M2 acceptance scenario (C4 in [SPEC-04 §4](04_acceptance_tests.md#english)); the manifest's `profile` for the `y-websocket` component is `core` accordingly ([SPEC-01 §3](01_manifest.md#english)). + +`elasticsearch8` runs the image `grdm-dev/elasticsearch8:<tag>` that `build` makes from `installer/images/elasticsearch8` (manifest `image_build`: the official Elasticsearch 8.19.24 pinned by digest plus the two Japanese-analysis plugins) as uid 1000 on a read-only root with TLS, authentication and scripts off, and publishes no port (its health check allows 30 s plus 100 tries, 10 s apart and up to 5 s each, so 17 to 26 minutes, because a start took 8 min 10 s under full-system amd64 emulation, where the earlier 12 tries marked a healthy start unhealthy and `up` stopped with exit 40, DEMO-22 0.7; a start that is up passes at once, and the window stays inside the default `up` wait of 1800 s); `elasticsearch8_setup` is a one-shot that creates the role and user `grdm_osf`, limited to the `website*` indices, that osf.io searches with ([ADR-14](../decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md)); the former `elasticsearch` (Elasticsearch 2, ADR-07) is retired together with `mongo` and `sharejs` ([ADR-13 §6](../decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md#english)), and `y_websocket` keeps the drafts of file-page rooms in the volume `y_websocket_data` (`YPERSISTENCE`, prefix `file-`). The one-shot `volume_owner_init` (the `postgres` image, for its GNU tools, as explicit root with `CAP_CHOWN` only, one exception in `manifest/hardening.json`) hands every writable bind volume to the `user:` of the services that mount it writable, because a fresh directory belongs to the host user and a PR #33 tree to uid 101: on a Linux or WSL2 host whose uid differs, a non-root writer (`redis` is uid 999, the others 1000) could otherwise not use it. Services that keep root never decide an owner: `postgres` and `rabbitmq` set their own, while `unoconv` shares `wb_tmp` with its uid-1000 writers and holds `DAC_OVERRIDE` (a bounded exception, because root without it obeys file permissions and LibreOffice could not write there). All writers wait with `condition: service_completed_successfully`. **Migration and retry contract.** Requires GNU `find` and `chown`. Every `up` walks each volume with no marker and no shortcut, so a stopped run is finished by the next one and a correct top directory cannot hide wrong descendants. With only `CAP_CHOWN` the step reaches another uid's private directory by taking ownership of it first, hands files to the target uid, verifies that none was missed, and hands directories over last. It does not follow symlinks or leave the volume. A failure, such as a directory with mode `000`, stops the step, naming the path, and writers do not start; run `up` again or `reset`. A `chown` that has no effect stops the step (results are read back, directories included), except on the VM shares that present every path as `root:root` (`virtiofs` measured on Colima; `fakeowner`, `fuse.grpcfuse`, `fuse.sshfs`, `9p`). There and everywhere else, the one-shots `volume_access_check_1000` and `volume_access_check_999` run as the writer's own uid: each creates a uniquely named file exclusively (`mktemp`, which never follows a symlink or touches existing data) and removes only that file, then walks the existing tree and refuses any directory the uid cannot enter, list or write and any file it cannot read, changing nothing. Writers do not start unless that works. `osf_init` (component `osf.io`, profile `minimum`) is another one-shot: on the osf.io image, as uid 1000, it runs the steps the upstream README lists for a new database — `manage.py migrate`, `scripts.populate_institutions -e test -a` and `scripts.register_oauth_scopes` — retrying `migrate` every 10 s for up to 5 minutes until postgres accepts connections, running `invoke search_ensure_index` (creates the Elasticsearch (the search engine inside GRDM; see [REF-01](../reference/REF-01_Glossary.md)) index `website_v1` and its alias with the full mapping) before the institution import, and exits 0; it also applies the migrations of the admin two-step sign-in (`addons_twofactor` 0006 and 0007), because the admin project runs none itself; `web`, `api`, `admin` and `worker` wait for it with `condition: service_completed_successfully`. All three steps are idempotent, so the service runs at every `up` (real install run 12: without it a fresh database made `web` answer 500 with `relation "osf_institution" does not exist`, and each such error leaked one postgres connection of the development server). `ember_osf_web` runs the static image that `build` makes from `RDM-ember-osf-web-dev2027`: its Dockerfile runs the ember-cli production build in a Node stage on the build host's own platform (the output is platform-independent, so neither amd64 (the CPU type of ordinary PCs and servers; see [REF-01](../reference/REF-01_Glossary.md)) nor arm64 emulates it) and serves the result with nginx-unprivileged as uid 101 on port 4200, on a read-only root with only `/tmp` (tmpfs) writable, with no volume and no `depends_on`. The image reads only `OSF_URL`, `OSF_API_URL`, `OSF_RENDER_URL`, `OSF_FILE_URL`, `OSF_HELP_URL`, `CAS_URL = {{AUTH_URL}}`, `OSF_COOKIE_DOMAIN`, `CSP_MODE` (`enforce`) and the optional `CSP_EXTRA_SOURCES`. At start its entrypoint writes the URLs into `index.html` under `/tmp`, exits 1 on a value that is not a plain `http(s)` URL (a host name for the cookie domain), refuses to serve if the Google Analytics adapter is in the page, sets the Content-Security-Policy from those origins and starts nginx, so a start takes seconds; there is no `ember serve` and no live reload. Its Compose health check is a `wget` of `/healthz` (the image has no `curl`). + +**Published ports.** This table is the only place where default host ports are defined; [ADR-02](../decisions/ADR-02_Network_Model.md), [SPEC-03](03_security_gate.md), and [REF-01](../reference/REF-01_Glossary.md) point here. Every port is published on `127.0.0.1` only. + +```toon +ports[8]{service,host_port,profile,url}: + web,5000,minimum,http://127.0.0.1:5000 + api,8000,minimum,http://127.0.0.1:8000 + admin,8001,core,http://127.0.0.1:8001 + wb,7777,core,http://127.0.0.1:7777 + mfr,7778,core,http://127.0.0.1:7778 + fakecas,8080,minimum,http://127.0.0.1:8080 + ember_osf_web,4200,core,http://127.0.0.1:4200 + y_websocket,1234,core,http://127.0.0.1:1234 +``` + +All other services (`cas`, `volume_owner_init`, `wiki_assets`, the subsystems, `test_idp`, databases and queues) are reached only inside the Compose network; when one of them needs a browser-facing port, `compose render` assigns it and `plan` prints it. `compose render` writes every chosen host port to `runtime/.env` as `GRDM_PORT_<SERVICE>` (upper case), which the acceptance tests read ([SPEC-04 §1](04_acceptance_tests.md#english)). If a default port is already in use (macOS AirPlay on `5000` is the known case), `compose render` takes the next free port and records the change in the install report; exit 12 is returned only when no free port is found. + +The `admin` service runs Django's development server as `manage.py runserver 0.0.0.0:8001 --insecure`, and `api` runs `manage.py runserver 0.0.0.0:8000`, both threaded: `--nothreading` (which `invoke apiserver` and `invoke adminserver` add) stalls under Django 2.2 (RDM-osf.io-dev2027 PR #13), because the 2.2 development server keeps a connection open for the next request and a single-threaded server then waits on a browser's idle second connection for 30 s while every other client times out; `DEBUG_MODE` stays `True` for both, so `api/base/wsgi.py` does not monkey-patch gevent and each thread opens its own database connection. With `DEBUG = False` (the generated `admin_local.py`, which keeps `debug_toolbar` out), `runserver` serves no static files, so the admin pages would load without their style sheets, scripts and icon fonts; `--insecure` makes `runserver` serve them from the app's static directories. This is a **development-only exception**: the port is published only on `127.0.0.1` like every other port in this table (ADR-02), the server is not a production web server, and a deployment must serve the admin app's static files through its own web server (for example after `collectstatic`) instead of this flag. A unit test keeps every published port on the loopback address. + +### 5. Flags + +| Flag | Meaning | +|---|---| +| `--yes` | Answer every question with its default. Required when no terminal is attached. | +| `--profile minimum\|core\|full` | Default `core`. Saved in `runtime/.env` as `GRDM_PROFILE` and reused on later runs. | +| `--platform linux/arm64,linux/amd64` | Override the platforms for `build`. Default: host platform only. | +| `--memory-gib <GiB>` | `doctor`, `compose render` and `install`: scale the limits from this size instead of the detected one, a knowing overcommit when the profile's floors do not fit. | +| `--public-access true\|false` | `compose render` and `install`: `ENABLE_PUBLIC_ACCESS` of every osf.io process. Default `false` (authentication required); saved in `runtime/.env` as `GRDM_ENABLE_PUBLIC_ACCESS`. | +| `--timeout <seconds>` | `up` and `install` (passed to `up` only; it does not change `build`, which has no time limit): how long to wait for health. An explicit `0` is passed on. Default 1800, or 5400 on Linux arm64 when the profile has amd64 services; raise it on a slow, fully emulated host. | +| `--no-open` | Do not open the browser after `up`. | +| `--json` | Print reports as JSON instead of TOON. | + +### 6. Exit codes + +```toon +exit_codes[17]{code,meaning}: + 0,success + 2,"usage error: unknown flag or bad value" + 10,"host unsupported: OS, CPU, memory, or Python too old" + 11,"Docker missing, not running, or Compose / buildx plugin absent" + 12,a required port on 127.0.0.1 is in use and no free alternative was found + 13,"install prerequisite missing: git, repository access, amd64 emulation, or a checkout path Docker cannot use" + 14,reset could not delete runtime/volumes/ + 15,"PostgreSQL data directory needs `grdm-dev db upgrade`, or the upgrade or rollback failed (the old directory is kept)" + 20,manifest invalid or TOON excerpt disagrees with JSON + 30,image build failed + 40,"health check failed, or a port listens on a non-loopback address" + 50,security scan gate failed for the current milestone + 51,"scanner could not run: tool missing or vulnerability database download failed" + 52,"services not healthy, so scan --dynamic could not run" + 53,"red-team preflight failed: egress reachable or a target outside redteam-targets.json" + 60,acceptance test failed + 70,"upstream mirror or integrate failed: fetch refused, push failed, or merge conflict" +``` + +Numbers are never reused for a new meaning; a new cause gets a new number. The canonical table is `installer/grdm_dev/messages.tsv`, and this TOON block must agree with it (`manifest check` verifies). Codes 50–53 are described in detail in [SPEC-03 §8](03_security_gate.md#english); code 70 in [SPEC-05 §2–§4](05_upstream_tracking.md#english). + +### 7. Behavior rules + +- **Non-interactive.** When `stdin` is not a terminal and `--yes` is absent, every question is answered "no" and the command exits 2 with a hint to add `--yes`. +- **Idempotent.** Running any subcommand twice gives the same result. `secrets init` keeps existing secrets, `compose render` overwrites only the generated file, `build` uses the buildx cache, `up` is a no-op for healthy services. +- **No secrets in Git.** `runtime/` is in `.gitignore`. `docs check` and the CI secret scan fail if a file under `runtime/` or a value that looks like a secret is committed. +- **No host network changes.** The loopback alias `192.168.168.167` from the old guide is not created; `compose render` rewrites the upstream `local.py` and `.docker-compose.*.env` settings to use service names inside the Compose network and `127.0.0.1` for the browser ([ADR-02](../decisions/ADR-02_Network_Model.md)). +- **First start is slow, later starts are not.** `up` waits up to 1800 s (`--timeout`) for health. The first `up` runs `osf_init`, which leaves its result in named volumes, so a second `up` is healthy within a minute or two. The default was set when the first `up` also built ember-osf-web (the newer web pages of GRDM; see [REF-01](../reference/REF-01_Glossary.md)) under emulation on Apple Silicon (the chips Apple puts in its Macs since 2020; see [REF-01](../reference/REF-01_Glossary.md)), which took 13–25 minutes (real install runs 10–18). ember-osf-web is now built by `build` into a static image and starts in seconds; the default stays until a cold start without that build is measured. On Linux arm64 the emulation is QEMU, where the former first ember build took 44 minutes on one core, so there the default is 5400 s when the profile has amd64 services (still `mfr`) ([DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md)); `--timeout` still overrides it, and `install --timeout` passes it to `up`, which a fully emulated amd64 machine can need: there the first ember build (under emulation, before ember became a static image) took 1 h 46 min and `up` 2 h 19 min ([DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md)). +- **No `-private` code here.** The installer clones the integration repositories by name and SHA (the fingerprint of one commit; see [REF-01](../reference/REF-01_Glossary.md)) from the manifest at run time; this public repository holds no code from them ([POL-01](../policy/POL-01_Developer_Environment_2027_Position.md)). + +<a id="2-en-hosts"></a> +### 8. Supported hosts + +**Memory.** `compose render` budgets 70 % of the smaller of the host memory and the Docker engine's VM memory and refuses (exit 10) a profile whose per-service floors do not fit, naming the required size; `--memory-gib` overrides the detection and is a knowing overcommit (PR #33 review r1 R1-04). `doctor` applies the same arithmetic first and names the remedy for the host: Docker Desktop's **Resources** page or `colima start --memory` on macOS, `.wslconfig` on WSL2 (the Resources page has no memory control under the WSL 2 backend). The floors (`mem_min_mb` of the service templates, including the one-shots) of the `core` profile add up to 8512 MiB, so `core` needs at least 8512 / 0.7 / 1024 ≈ 11.9 GiB of detected memory, that is a Docker VM of 12 GiB (`full`: 9536 MiB, about 13.3 GiB, with fakecas; 9856 MiB, about 13.7 GiB, with `--auth shibboleth`). This is a lower bound computed from the floors, not a measured peak: it does not cover `build`, whose Node stage for ember-osf-web needs several GiB of engine memory while it runs. The former figure of about 24 GiB came from the prebuilt ember-osf-web image, which rebuilt its bundle at every start under emulation with an 8 GiB floor; the static image has a 128 MiB floor. `minimum` fits in 8 GiB. + +| Host | CPU | Support | +|---|---|---| +| macOS 14 or newer with Docker Desktop | arm64 | official (M2 acceptance runs here) | +| Ubuntu 24.04 with Docker Engine | amd64, arm64 | official | +| Windows 11 with WSL2 (Ubuntu 24.04) and Docker Desktop | amd64 | required to work; CI parses and dry-runs `install-windows.ps1` only, and a real run needs owner hardware ([ADR-08 §5](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md#en-limits)) | +| Other Linux, macOS on Intel | any | best-effort; `doctor` warns and continues | + +### 9. Directory layout + +```toon +layout: + installer/install.sh: bash 3.2 bootstrap + installer/install-ubuntu.sh: Ubuntu 24.04 and WSL2 prerequisites (§2.3) + installer/install-macos.sh: macOS prerequisites (§2.3) + installer/install-windows.ps1: Windows 11 prerequisites and WSL2 hand-over (§2.3) + installer/prereq-lib.sh: helpers shared by the two bash prerequisite scripts + installer/pyproject.toml: package metadata, console script grdm-dev, extra accept + installer/grdm_dev/: + cli.py: argument parsing, subcommand dispatch, exit codes + host.py: OS, CPU, memory, disk, Docker detection + manifest.py: load and validate manifest/upstreams.json, TOON comparison + secrets.py: random secret generation, runtime/.env with mode 0600 + compose.py: render runtime/docker-compose.yml from manifest and profile + database.py: PostgreSQL data directory status, upgrade by dump and restore, rollback (ADR-12) + build.py: buildx wrapper, platform list, optional push + health.py: service health and loopback-only check + scan.py: baseline controls, Trivy SBOM and CVE, gitleaks, Semgrep, ZAP, allow-list diff, staged gate (SPEC-03) + redteam.py: red-team preflight (SPEC-03 §6) + upstream.py: mirror and integrate (SPEC-05) + accept.py: run pytest-playwright in the same venv + docs.py: MkDocs build and SPEC-06 checks + report.py: bundle TOON and JSON reports + messages.tsv: exit code, English message, Japanese message + installer/tests/: unittest, files named test_*.py + installer/acceptance/: Playwright Python, see SPEC-04 + manifest/: + upstreams.json: canonical manifest (SPEC-01) + upstreams.toon: excerpt generated by grdm-dev manifest toon (SPEC-01) + allowlist.json: accepted findings (SPEC-03 §5.1) + allowlist.baseline.json: allow-list count at the last milestone exit, owner-maintained (SPEC-03 §5.1) + milestone.json: current milestone, owner-maintained (SPEC-03 §5.2) + hardening.json: per-service exceptions to read-only root and cap_drop, with reasons (SPEC-03 §3.3) + redteam-targets.json: container names the AI red team may touch (SPEC-03 §6) + runtime/: generated, git-ignored (.env, docker-compose.yml, volumes/, reports/, backups/, db-operation.json and .lock) +``` + +### 10. Tests + +`python3 -m unittest discover -s installer/tests` must pass on every PR (pull request: a proposed change waiting for review; see [REF-01](../reference/REF-01_Glossary.md)). Each module has a `test_<module>.py` that covers at least one success case and one rejection case, and every rejection case asserts the exit code from [§6](#english). Docker is never required by unit tests: `host.py` and `build.py` take an injectable runner so tests pass fake `docker` output. Integration and acceptance tiers are defined in [SPEC-04](04_acceptance_tests.md). + +The prerequisite scripts of [§2.3](#2-en-prereq) are checked on every PR by `installer-prereq-lint.yml`: `bash -n`, shellcheck, the PowerShell parser on `windows-latest`, and a dry run on each OS. Unit tests run them only with `--dry-run` or `--help`, under a `PATH` of stubs. `installer-full.yml`, started by hand, does a full `minimum` install on `ubuntu-24.04` and `ubuntu-24.04-arm` and needs the repository secret `GRDM_INTEGRATION_READ_TOKEN`. What these runners cannot prove is listed in [ADR-08 §5](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md#en-limits). + +> **Note:** Both workflows, and their helper `.github/scripts/Test-PowerShellSyntax.ps1`, are **pending**: they wait on branch `feat/per-os-installers` until someone with a token that has the `workflow` scope pushes them. Until then the checks of this paragraph are run by hand, and the real Linux run is [DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md). + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 範囲と目的 + +インストーラーは、このリポジトリを取り出した直後の状態から、[§8](#2-ja-hosts) に挙げたホストで、コマンド一つで GakuNin RDM(GakuNin=学認。大学のアカウントでログインするための日本の学術ネットワーク。[REF-01](../reference/REF-01_Glossary.md))の開発環境を動かすものです。`install.sh` と `grdm-dev` は `sudo`(コンピュータの管理者としてコマンドを動かす仕組み)を使わず、ホストのネットワーク設定を変えず、何度やり直しても壊れません。作られるものはすべて `runtime/` の下にあり、Git は無視します。任意の前提条件スクリプト([§2.3](#2-ja-prereq))は事前にホストを準備し、`sudo` を使うことがありますが、変更を示して同意を得た後に限ります([ADR-08](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md))。 + +**用語注。** 「インストーラー」は、ほかのプログラムが動くように準備するプログラムです。「CLI」(コマンドラインインターフェース)は、文字でコマンドを打って使うプログラムです。「コンテナ」は、一つのプログラムと必要なものを一箱に入れ、どのコンピュータでも同じように動かすための箱です。「Docker」(イメージを作りコンテナを動かす道具。[REF-01](../reference/REF-01_Glossary.md))とその相棒の「Docker Compose」([REF-01](../reference/REF-01_Glossary.md))がコンテナを動かします。Compose は一枚の設定ファイルから多くのコンテナをまとめて起動する道具です。「manifest」は、どのソースリポジトリのどの版を使うかを正確に書いた一覧です([SPEC-01](01_manifest.md))。 + +### 2. 入口 + +環境を導入する入口は二つです(§2.1、§2.2)。そのためにホストを準備する任意のスクリプトがあります([§2.3](#2-ja-prereq))。 + +#### 2.1 `installer/install.sh` — 薄い起動スクリプト + +`install.sh` がすることは次の四つだけです。 + +1. macOS 標準の `bash`(版 3.2)で動く。そのため連想配列、`mapfile`、`${var,,}` のような新しい機能は使わない。 +2. `python3` を探し、3.11 以上かを確かめる。足りなければ、判定した OS に合わせた導入方法を表示して終了コード 10 で終わる。 +3. 「仮想環境」(システムとは別の、Python とライブラリだけの私用フォルダ)を `.venv/` に作り、`pip install -e installer[scan]` で `installer/` パッケージを入れる(追加 `scan` は `grdm-dev scan` がローカルで動かす Semgrep を含む。SPEC-03 §4.2、実機第 17 回。`GRDM_WITHOUT_SCAN=1` で外し、`GRDM_WITH_ACCEPT=1` で Playwright を加える)。 +4. 引数をすべて `.venv/bin/grdm-dev install "$@"` に渡し、その終了コードで終わる。 + +OS の違いは `install.sh` には書きません。`installer/grdm_dev/host.py` に閉じ込めます。利用者向けの文言は `installer/grdm_dev/messages.tsv`(コードごとに一行、英語と日本語の列)から出し、スクリプトと Python コマンドが同じ言葉を話すようにします。 + +```mermaid +flowchart TD + A[./installer/install.sh --yes] --> B{python3 は 3.11 以上?} + B -- いいえ --> X10[終了 10: Python の導入方法を表示] + B -- はい --> C[.venv/ を作り pip install -e installer] + C --> D[grdm-dev doctor] + D -- 対象外のホスト --> X10b[終了 10] + D -- Docker が無い --> X11[終了 11] + D -- 前提が不足 --> X13[終了 13] + D -- スキャナーが無い --> X51[終了 51] + D --> E[grdm-dev plan] + E -- manifest 不正 --> X20[終了 20] + E --> F[grdm-dev secrets init] + F --> G[grdm-dev compose render] + G --> H[grdm-dev build] + H -- 失敗 --> X30[終了 30] + H --> I[grdm-dev up] + I --> J[grdm-dev health --network] + J -- 失敗 --> X40[終了 40] + J --> K[grdm-dev scan] + K -- 門で不合格 --> X50[終了 50] + K --> L[grdm-dev report] + L --> Z[終了 0。URL http://127.0.0.1:5000 を表示] +``` + +#### 2.2 `grdm-dev` — Python コマンド + +`grdm-dev` はパッケージ `installer/grdm_dev/` を、コンソールスクリプトとして公開したものです。規則は次のとおりです。 + +- **標準ライブラリ優先。** コマンド本体は外部ライブラリに依存しません。manifest は JSON(`json` で読む)、ホストは `platform`・`shutil`・`socket`・`subprocess` で読み、生成する Compose ファイルは JSON で書き出します。JSON は YAML(字下げでデータを書く文字の形。[REF-01](../reference/REF-01_Glossary.md))として正しいので Docker Compose がそのまま読めます。したがって PyYAML は要りません。 +- **任意の追加 `accept`。** `pip install -e "installer[accept]"` で `pytest`・`pytest-playwright`・`playwright` が入ります。これらを読み込むのは `grdm-dev accept` だけです([SPEC-04](04_acceptance_tests.md))。 +- **外部の道具** はサブプロセスとして呼び、`doctor` が有無を確かめます。`docker`(27 以上)と Compose プラグイン(v2 以上)・buildx(一つのイメージを何種類かの計算機向けに作る Docker の助手。[REF-01](../reference/REF-01_Glossary.md))、`scan` 用の `trivy`・`gitleaks`・`semgrep`、`scan --dynamic` 用の OWASP ZAP(動いている Web サイトを攻撃者のやり方でつつく道具。[REF-01](../reference/REF-01_Glossary.md))のコンテナイメージ、`docs` 用の `mkdocs` です。スキャナーが無いと `scan` は終了 51 で終わります([SPEC-03 §8](03_security_gate.md#japanese))。 +- すべてのサブコマンドは `--json` を受け付け、TOON(JSON を短く書いた文字形式。[SPEC-06 §4](06_documentation_conventions.md#japanese))の代わりに機械が読む JSON で同じ報告を出します。 + +<a id="2-ja-prereq"></a> +#### 2.3 OS ごとの前提条件スクリプト + +これらのスクリプトはホストを準備してから `install.sh` を実行します。理由は [ADR-08](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md) にあります。導入の判断は持たず、すべての判断は引き続き `install.sh` と `grdm-dev` が行います。 + +| スクリプト | ホスト | 用意できるもの | +|---|---|---| +| `installer/install-ubuntu.sh` | Ubuntu 24.04 の amd64・arm64、WSL2 の中の Ubuntu 24.04 | apt パッケージ(git、Python、`python3-venv`、curl、gnupg)、Docker の署名付き apt リポジトリからの Docker Engine と Compose・buildx プラグイン、`docker` グループへの追加、arm64 での amd64 エミュレーション(ダイジェストで固定した `tonistiigi/binfmt` イメージから QEMU を登録する。実際のビルドで落ちた Ubuntu の `qemu-user-static` 8.2.2 は置き換える。[DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md))、`~/.local/bin` の Trivy と gitleaks、`GRDM_WITH_ACCEPT=1` のときの `libatomic1`。WSL2 の中では Docker Engine を飛ばし、Docker Desktop を求める。 | +| `installer/install-macos.sh` | Apple Silicon の macOS | Homebrew の formula(`python@3.12`、git、Trivy、gitleaks)。入っている Docker Desktop を起動する。Docker Desktop・OrbStack・Colima を検出し、Docker の実行基盤も Homebrew も入れない。 | +| `installer/install-windows.ps1` | Windows 11 の amd64 | WSL2 と `Ubuntu-24.04` のディストリビューション。Docker Desktop と WSL 連携を確認する。このリポジトリを WSL のホームの下に clone し(`/mnt/c` には決して置かない)、WSL の中で `install-ubuntu.sh` を実行する。 | + +どのスクリプトも次を守ります。 + +- 何を変えるかを示し、`sudo` や管理者の操作の前に尋ねる。`docker` グループへの追加は別に尋ねる。 +- `--yes`(PowerShell では `-Yes`。`--yes` も受け付ける)で同意する。端末が無く `--yes` も無ければ、[§7](#japanese) のとおり終了 2 で止まる。 +- `--dry-run`(`-DryRun`)は判定して予定を表示し、何も変えない。 +- 再実行できる。既にある前提条件は飛ばす。 +- 失敗したら分かりやすい文言で止まり、[§6](#japanese) の終了コード 2・10・11 だけを使う。 +- ダウンロードは署名された配布元か固定したチェックサムでだけ受け入れ、シェルへ流し込まない。 +- トークンを尋ねず、読まず、保存しない。非公開の統合リポジトリへの権限を git に与える方法を案内するだけである。 +- 最後に `installer/install.sh` を実行し、ほかの引数はそのまま渡す。 + +### 3. サブコマンド + +| サブコマンド | 契約 | Docker に触れるか | +|---|---|---| +| `doctor` | OS(macOS・Ubuntu・WSL2)、CPU(`arm64`・`amd64`)、メモリ、空き容量、Docker 27 以上、Compose プラグイン(v2 以上)、buildx を判定し、長いビルドの前に問題が分かるよう `install` に要るものを確かめる。`git`、プロファイルの非公開統合リポジトリの読み取り権限(端末で問い合わせない `git ls-remote` で確かめ、URL にトークンが含まれ得るので出力は表示しない)、`trivy`・`gitleaks`・`semgrep`、Docker VM とホストの小さい方に対するプロファイルのメモリ下限(`--memory-gib` で警告に変わる。承知の上の過剰割当)、amd64 エミュレーション(binfmt は Linux arm64 に限る。報告に `amd64_emulation` の行も出す。amd64 では `not needed (host is amd64)`、動く handler のある Linux arm64 では `ready (...)`、macOS では出さない)(有効にするコマンドを表示し、落ちると実測したエミュレーター(Ubuntu 24.04 の `qemu-user-static` 8.2.2。登録済みインタープリターの `--version` で判定)は拒んで置き換えるコマンドを表示)、Docker が使える配置先(WSL2 では試験ファイルの `chmod 0600` を読み返して確かめ、モードを保持するファイルシステムであること。Windows のドライブは `runtime/.env` を `0600` に保てない。macOS ではエンジンから見えること。`up` が使う `postgres` イメージにリポジトリを読み取り専用で bind して問い合わせる。このサブコマンドが取得してよいイメージはこれだけ。エンジンが mount を拒むか中身が空なら終了 13、問い合わせ自体ができなければ警告。Docker VM が共有していない場所からの bind mount は黙って空になるため。問い合わせができないときは `GRDM_DOCKER_SHARED=1` で省ける)。TOON で報告する。対象外のホストかメモリ下限が収まらないときは終了 10、Docker が無い・動いていないときは 11、前提が不足なら 13、スキャナーが無ければ 51。 | 読むだけ | +| `plan` | manifest とプロファイルを解決し、どのイメージを作りどのサービスを起こすか、公開ポート([§4](#2-ja-ports))とともに表示する。何も変えない。manifest が [SPEC-01](01_manifest.md) の検査に落ちれば終了 20。 | 触れない | +| `secrets init` / `secrets rotate` | `init` は乱数の秘密(DB パスワード、Django の秘密鍵、CAS の鍵)を `runtime/.env` にモード `0600` で書く。既定値や例のパスワードは決して書かない。既存ファイルは `--force` がなければ上書きしない。`init --missing` は、新しいキー(`ELASTIC8_PASSWORD`、`ELASTIC8_OSF_PASSWORD`。[ADR-14](../decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md#japanese))より前に作られた `runtime/.env` のための更新で、既存の値をすべて保ち(実データが依存するパスワードは有効なまま)、足りないキーだけを足し、廃止したキーを消し、稼働中のパスワードは変えず、稼働中のスタックも要らない。`--force` とは併用できない。`rotate` は更新の手順ではない。すべての秘密を作り直し、稼働中の PostgreSQL と RabbitMQ のパスワードを変更し、新しい環境を受け取るようコンテナを再作成し、旧い資格情報が拒否されることを確かめる。どこかで失敗したら以前の `runtime/.env` に戻して 40 で終わる。`init --force` と `rotate` は廃止した資格情報のキーを消す。更新後は、`rotate` や再作成の前に `compose render` を実行する。以前に生成した Compose ファイルは廃止したキーを参照し続けるからである。四つのキーには CAS のイメージが要する長さがある。`TGC_ENCRYPTION_KEY` は 43 文字、`TGC_SIGNING_KEY` は 86 文字、`OSF_API_INSTITUTIONS_AUTH_JWESECRET` はちょうど 32 バイト、`OSF_API_INSTITUTIONS_AUTH_JWTSECRET` は 32 バイト以上で、後の二つは osf.io の `JWE_SECRET` と `JWT_SECRET` でもある([ADR-07 §7](../decisions/ADR-07_Native_Builds_of_EOL_Middleware.md#japanese))。四つとも base64url の文字(`A`–`Z`、`a`–`z`、`0`–`9`、`-`、`_`。空白・引用符・パディングは不可)だけを使い、公開された既定値であってはならず、`TGC_ENCRYPTION_KEY` は 32 バイトへ正準に復号できなければならない。レッドチームに秘密を取られた後に使う([SPEC-03 §6](03_security_gate.md#japanese))。 | 触れない / 触れる | +| `compose render` | `runtime/.env` に生成すべきキーが無いとき、または CAS のキーが使えないとき(長さの誤り、base64url 以外の文字、公開された既定値)は、キーの名前だけを示して終了 2 で止まる(キーが無いときは `secrets init --missing`、CAS のキーが使えないときは `secrets rotate` で直す)。manifest とプロファイルから `runtime/docker-compose.yml` を書く。内部ネットワーク `grdm` と公開専用の `grdm-edge`(`--egress <services>` で追加接続し `runtime/.env` に記録。[SPEC-03 §3.2](03_security_gate.md#japanese))、部品ごとの `platform:` は manifest の `build_platform` から、ポートは `127.0.0.1` にだけ公開([§4](#2-ja-ports))、全サービスに非 root の `user:`、`read_only`・`cap_drop`・資源制限(`mem_limit`・`cpus`・`pids_limit`。`doctor` が検出したホストのメモリと Docker エンジンの VM メモリ(`docker info`。Docker Desktop では VM はホストの一部。実機第 10 回)の小さい方に応じて決め、テンプレートの下限 `mem_min_mb` が先に取り分を確保し、残りを他が分け合う。CPU はエンジンが報告する数(`docker info`。不明なときだけホストの数)から決める)、サービスごとの例外は `manifest/hardening.json` から([SPEC-03 §3.3](03_security_gate.md#japanese))、`platform:` は `doctor` の結果から選ぶ、名前付きボリュームは `runtime/volumes/` の下、`tmpfs` の各項目は `mode=1777` で mount(Compose の短い記法は root 専用の `0755` になる。実機第 11 回)、テンプレート値のプレースホルダ `{{HOST_PORT:<service>}}`・`{{CONTAINER_PORT:<service>}}`・`{{AUTH_URL}}`(fakecas の公開 URL。`--auth shibboleth` で fakecas が外れるときは web の URL)を解決する。組み立てる部品の `image:` に最後のビルド(`runtime/reports/build_latest.json`)のタグを使うのは、manifest が固定するタグと同じときだけである。記録されたビルドが固定と違うときは古い(最後の `build` の後で固定が動いた)とみなし、代わりに固定のタグを書き、報告の `stale_build_tags`(`component`・`pinned`・`recorded`・`image`)に載せ、標準エラーに警告の囲みを出して対処(`grdm-dev build` を実行してから `grdm-dev up`)を示す。`install` は組む前に render するので、終了コードは 0 のままである。一度も組んでいないイメージは古いものを動かす代わりに `up` を失敗させる。manifest が固定しない部品は記録されたタグを使う。`osf.env` には osf.io から Elasticsearch 8 への接続(`ELASTIC_URI=https://elasticsearch8:9200`、`ELASTIC_CA_CERTS=/es-ca/ca.crt`。利用者 `grdm_osf` とそのパスワードはサービスの環境から来る)、y-websocket への内部 URL(`Y_WEBSOCKET_INTERNAL_URL`)、`ENABLE_PUBLIC_ACCESS` を書き、web・api・admin・worker・osf_init は `elasticsearch8_ca`(公開の証明書だけ)を読み取り専用でマウントする。`--public-access true|false`(既定は `runtime/.env` の `GRDM_ENABLE_PUBLIC_ACCESS`、なければ `false`)は osf.io のすべてのプロセスの `ENABLE_PUBLIC_ACCESS` を決める(RDM-osf.io-dev2027 PR #8)。`false` はすべてのデータ経路で認証を要求し(匿名の要求はログインへの転送か 401。署名つきの WaterButler・MFR の呼び戻しや Webhook などは動き続ける)、`true` は公開プロジェクトの匿名閲覧を許す。選択は `runtime/.env` に記録し、`--egress` と同じく次回以降の render でも保つ。[ADR-02](../decisions/ADR-02_Network_Model.md) に従う。 | 触れない | +| `build` | `docker buildx` でイメージを作る。プラットフォームは優先順に `--platform`、manifest の部品の `build_platform`(例: EOL ベースで arm64 に組めない部品は `linux/amd64` にしてエミュレーションで動かす)、それもなければホストと同じ。イメージはローカルに読み込む。`prebuilt_image`([SPEC-01](01_manifest.md))を持つ部品は組まず、ダイジェスト固定のイメージを要求された platform ごとに取得して `prebuilt` と報告する(`pull-failed` は終了 30)。`--push` でも prebuilt のイメージは `ghcr.io/rcosdp` に再公開しない(第三者の成果物であるため)。行は `prebuilt-not-pushed`、`pushed: false` と報告する。`--push` で multi-arch の manifest を `ghcr.io/rcosdp/<name>`(非公開)へ送る。失敗は終了 30。 | 触れる | +| `up` / `down` / `reset` | `up` は中断された `db` の操作をまず完了か巻き戻しし、`runtime/volumes/postgres_data` が生成済みのイメージと別の PostgreSQL の版で書かれているか版を読めなければ終了 15 で止まり(ADR-12)、そうでなければプロファイルを起動し健康になるまで待つ。データベースの確認の前に、render したファイルのボリューム `grdm-dev_<名前>` が Docker に既にあり、このチェックアウトの `runtime/volumes/<名前>` と別のディレクトリに結び付いていれば、`up` は終了 13 で止まる(同じプロジェクトの新しい clone や移したディレクトリ。Docker はボリュームを作った日のオプションを覚え、Compose は比べずに再利用するので、このチェックアウトは別のチェックアウトのデータを自分の新しい秘密で開いてしまう)。何も起動も削除もせず、メッセージはそのボリュームと、解放するコマンド(もう一方のチェックアウトで `grdm-dev down`、続けて `docker volume rm <名前>`。ファイルはディスクに残る)を示す。`down` はコンテナを止めボリュームを残す。`reset` は止めたうえで確認の後に `runtime/volumes/` を消す(`--yes` で確認を省く)。Linux ではファイルがコンテナの uid の所有でホストの利用者には消せないので、`DAC_OVERRIDE` と `FOWNER` だけを持つ root のコンテナで中身を空にする。何かを止めたり消したりする前にホスト側でパスを検証し、シンボリックリンクの `runtime/` やボリュームのルート、リポジトリの外へ解決されるルート、シンボリックリンクのボリューム、`runtime/` やボリュームのルートやその下の任意の深さの mount(ホストの mount 表から読むので同じファイルシステムの bind mount も含む。表が読めないときも拒む)は終了 14 で止まる。`reset` は `down` の後と消去の後にも繰り返し、ボリュームのルートが別のディレクトリに変わっていれば止まる。`compose render` と `up` も、所有者設定の段が同じパスに root で働くので、同じ検証を終了 13 で行う。これらは時点の確認であり、Docker は後で bind を解決するのでこの隙間はどの検査でも塞げない。リポジトリを他の利用者やプロセスが同時に変更しないことを前提とする。 | 触れる | +| `db status` / `db upgrade` / `db rollback` / `db recover` | `status` は `runtime/volumes/postgres_data` と生成済みの `postgres` イメージの PostgreSQL の版を表示し、何も変えない。`upgrade`(全サービス停止中、`--yes` で省ける確認の後)はダンプと復元でデータを生成済みの版へ移す。旧版をネットワークなしで旧ディレクトリの上に動かし、新版の `pg_dumpall` が `runtime/backups/postgres-<旧>-to-<新>-<時刻>/` に書き、新しいディレクトリを初期化して `ON_ERROR_STOP` で復元し、全表の行数とシーケンスの値を突き合わせ、その後で初めて旧ディレクトリを新しいものの隣の `postgres_data.pg<旧>-<時刻>` に改名する。`rollback` はそのディレクトリを戻す。どちらも何かを作るか改名する前に排他ロック(`up` と `reset` も確認と起動・削除の間に取る)を取り、永続的な操作記録(`runtime/db-operation.json`)を書く。`recover`、そして後続のすべての `db` コマンド・`reset`・`up` は、クラッシュや中断が残した操作を最初に完了か巻き戻しする。旧サーバーの起動前に空き容量の見積りを確かめる。失敗すれば旧か新のクラスタが使える状態で終了 15。補償の改名まで失敗したときは操作記録を残して終了 15。[ADR-12](../decisions/ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md#japanese) を参照。 | 触れる | +| `health` | 各サービスの健康確認用の URL を調べる。公開したループバックのポートへの HTTP GET(多くは `/`。`web` は `/login/`。osf.io の `/` は ember へ転送し、以前の事前ビルド済みの ember がビルド中は 500 を返した。実機第 14 回。`ember_osf_web` は `/healthz` で、HTTP 200 だけを健康と数える)で、一回限りのサービスは 0 で終了していれば健康と数える。`--network` を付けると、ホストで待ち受けているソケットも一覧し、コンテナのポートがループバック以外の番地に結び付いているか、プロジェクトのポート上のワイルドカードの待ち受けの所有者が見えなければ終了 40(安全側に失敗)。Docker でない*名前の分かる*ホストのプログラムがプロジェクトのポートにいる場合(macOS の AirPlay レシーバーの `*:5000`。実機第 16 回)は `foreign-listener` の警告として報告し、失敗にはしない。我々の漏れではなく、`runtime/.env` の `GRDM_PORT_<SERVICE>` で我々のポートを移せる。 | 読むだけ | +| `scan` | [SPEC-03](03_security_gate.md) のセキュリティ門を全部動かす。基本対策、Trivy の SBOM(ソフトウェア部品表。イメージに入っている部品の一覧)と CVE の一覧、gitleaks、Semgrep、OWASP ZAP。`runtime/reports/scan_<日付>.json` と TOON を書き、`manifest/milestone.json` の節目に合わせて `manifest/allowlist.json` と `manifest/allowlist.baseline.json` と差分を取る。門は [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) どおり、M1〜M3 は報告のみ、M4 は HIGH で終了 50、M5 は CRITICAL か HIGH で終了 50。フラグ `--baseline`・`--secrets`・`--dynamic` は一部だけを動かす。スキャナーが動かなければ終了 51、サービスが健全でないのに `--dynamic` を求めたら終了 52。 | 読むだけ | +| `redteam preflight` | AI レッドチームの実行前に、レッドチーム用 Compose プロジェクトの攻撃側コンテナが隔離されていること(届くはずのカナリアで証明する。[SPEC-03 §6](03_security_gate.md#japanese))、`manifest/redteam-targets.json` に名前のあるコンテナだけが接続していること、承認記録があり新しいことを確かめる。どちらかが外れれば終了 53。詳細は [SPEC-03 §6](03_security_gate.md#japanese)。 | 触れる(検査用のカナリアのコンテナとネットワークを作って消す) | +| `accept` | Playwright Python の受入試験を同じ `.venv/` で実行する。`--only <シナリオ>` で一つだけ、`--seed` で使い捨ての試験利用者を作る。一件でも失敗すれば終了 60。詳細は [SPEC-04](04_acceptance_tests.md)。 | 読むだけ | +| `upstream mirror` / `upstream integrate` | [SPEC-05](05_upstream_tracking.md) の日次ミラーと週次統合を手で動かす。非公開の `-dev2027` への Git 認証情報が要り、このリポジトリの CI では決して動かさない。fetch が拒まれた・失敗した、push が失敗した、マージが衝突したときは終了 70。報告はどの場合も書く。 | 触れない(Git のみ) | +| `manifest check` / `manifest toon` | `check` は `manifest/upstreams.json` を検証し([SPEC-01 §5](01_manifest.md#japanese))、`docs/` 内の TOON の抄録と `manifest/upstreams.toon` がそれと一致するか確かめる。不一致は終了 20。`toon` は `upstreams.toon` が一致すべき抄録を出力する。 | 触れない | +| `docs build` / `docs check` | `build` は MkDocs で `site/` を作る。`check` は [SPEC-06 §8](06_documentation_conventions.md#japanese) のアンカー、Jump 行、相対リンク、TOON の一致、Version 行を検査する。 | 触れない | +| `report` | `doctor`・`plan`・`health`・`scan`・`accept` の最新の報告を `runtime/reports/<時刻>.toon` と `.json` にまとめる。 | 触れない | +| `install` | 流れ図の順に実行する。最初に 0 以外で終わった段で止まる。 | 触れる | + +<a id="2-ja-ports"></a> +### 4. プロファイルと公開ポート + +```toon +profiles[3]{name,services,note}: + minimum,"osf_init volume_owner_init volume_access_check_1000 web api postgres elasticsearch8 elasticsearch8_setup rabbitmq fakecas",ログインとプロジェクト画面が見える最小の組 + core,"minimum + admin worker wb wb_worker mfr unoconv ember_osf_web cas wiki_assets elasticsearch6 redis y_websocket volume_access_check_999",コア 6 リポジトリと基盤。Wiki 共同編集の y_websocket を含む。wiki_assets はボリューム wiki_static に Wiki エディタの束を写す一回限りのサービス(ADR-06) + full,"core + rdmcp aipf_mcp_data_grdm oasys shibboleth_sp test_idp",全部。shibboleth_sp は fakecas と入れ替わる +``` + +サービス名は RDM-osf.io 上流の `docker-compose.yml` に合わせ、既存の手引きがそのまま使えるようにします。これは manifest の `services[]` の値でもあります([SPEC-01 §3](01_manifest.md#japanese))。`wiki-frontend` 部品は `osf.io` のオーバーレイ(`overlay_of`、[ADR-06](../decisions/ADR-06_Wiki_Frontend_Overlay.md))です。そのサービスは「一回限り」(一度動いて終了するコンテナ。`restart: "no"`)で、束を組むイメージ `grdm-dev/wiki-frontend:<osf の sha12>-<wiki の sha12>` を動かします。`volume_owner_init` が新しいボリューム `wiki_static` を uid 1000 に渡した後で、`wiki_assets` が webpack の出力 `/code/website/static/public/js/` をそこへ写して終了します。`web`・`api`・`admin`・`worker` はそのボリュームを `/code/website/static/public/js/wiki/` に読み取り専用で mount し、`condition: service_completed_successfully` で待つので、`up` は束が置かれてからそれらを起動します。`health` は終了コード 0 で終わった一回限りのサービスを健康と数えます。Compose プロファイル `shibboleth` とサービス `fakecas` は排他です。`compose render --profile full --auth shibboleth` は `fakecas` を外して `shibboleth_sp` と `test_idp` を足します。`full` の既定は `fakecas` です。`y_websocket` は `full` でなく `core` に属します。Wiki 共同編集が M2 の受入シナリオ([SPEC-04 §4](04_acceptance_tests.md#japanese) の C4)だからです。manifest の `y-websocket` 部品の `profile` もそれに合わせて `core` です([SPEC-01 §3](01_manifest.md#japanese))。 + +`elasticsearch8` は `build` が `installer/images/elasticsearch8` から組むイメージ `grdm-dev/elasticsearch8:<tag>`(manifest の `image_build`。ダイジェストで固定した公式の Elasticsearch 8.19.24 に日本語解析の二つのプラグインを足したもの)を uid 1000・読み取り専用ルートで、TLS と認証あり、スクリプトなしで動かし、ポートは公開しません(ヘルスチェックは 30 秒に加えて 100 回(間隔 10 秒、1 回は最長 5 秒)、17〜26 分まで待ちます。機械全体を amd64 でエミュレーションする環境で起動に 8 分 10 秒かかり、以前の 12 回では健全な起動を不健全と判定して `up` が終了 40 で止まったためです(DEMO-22 0.7)。起動できていればすぐ通り、窓は `up` の既定の待ち 1800 秒の内に収まります)。`elasticsearch8_setup` は一回きりの手順で、osf.io が検索に使う、`website*` の索引に限った role と利用者 `grdm_osf` を作ります([ADR-14](../decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md))。以前の `elasticsearch`(Elasticsearch 2、ADR-07)は `mongo`・`sharejs` とともに退役しました([ADR-13 §6](../decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md#japanese))。`y_websocket` はファイルページの部屋の下書きをボリューム `y_websocket_data` に残します(`YPERSISTENCE`、接頭辞 `file-`)。一回限りの `volume_owner_init`(GNU の道具を持つ `postgres` イメージを明示の root で、`CAP_CHOWN` のみ。`manifest/hardening.json` の例外は一件)は、書き込みで使うすべての bind ボリュームを、それを書き込みで mount するサービスの `user:` に渡します。新しいディレクトリはホストの利用者の、PR #33 の木は uid 101 の所有で、uid の違う Linux や WSL2 のホストでは非 root の書き手(`redis` は uid 999、他は 1000)が使えないからです。root のままのサービスは所有者を決めません。`postgres`・`rabbitmq` は自分で整え、`unoconv` は uid 1000 の書き手と `wb_tmp` を共有し `DAC_OVERRIDE` を持ちます(限定した例外。これが無い root はファイル権限に従い、LibreOffice がそこに書けません)。書き手はすべて `condition: service_completed_successfully` で待ちます。**移行と再試行の約束。** GNU の `find` と `chown` を前提にします。どの `up` でも、印も近道も使わず各ボリュームを全部辿るので、途中で止まった実行は次の実行が完了させ、一番上のディレクトリが正しくても下の誤りは隠れません。`CAP_CHOWN` だけなので、他の uid の私用ディレクトリには先に所有者になってから入り、ファイルを目的の uid に渡して漏れが無いことを確かめ、ディレクトリを最後に渡します。シンボリックリンクは辿らず、ボリュームの外へも出ません。モード `000` のディレクトリなどの失敗ではパスを示して止まり、書き手は起動しません。`up` をやり直すか `reset` してください。効果の無い `chown` は段を止めます(結果はディレクトリも含めて読み返します)。例外はすべてのパスを `root:root` と見せる VM 共有だけです(`virtiofs` は Colima で実測。`fakeowner`・`fuse.grpcfuse`・`fuse.sshfs`・`9p`)。そこでも他でも、一回限りの `volume_access_check_1000` と `volume_access_check_999` が書き手自身の uid で動き、一意の名前のファイルを排他的に作って(`mktemp`。シンボリックリンクを辿らず既存のデータに触れない)そのファイルだけを消し、続いて既存の木を辿って、その uid が入れない・一覧できない・書けないディレクトリと読めないファイルを、何も変えずに拒みます。それが成功しなければ書き手は起動しません。`osf_init`(部品 `osf.io`、プロファイル `minimum`)ももう一つの一回限りのサービスです。osf.io のイメージで uid 1000 として、上流 README が新しいデータベース向けに挙げる手順 `manage.py migrate`・`scripts.populate_institutions -e test -a`・`scripts.register_oauth_scopes` を実行し、postgres が接続を受け付けるまで `migrate` を 10 秒ごとに最長 5 分やり直し、機関の投入の前に `invoke search_ensure_index`(Elasticsearch の索引 `website_v1` とその別名を完全なマッピングで作る)を実行して 0 で終了します。管理画面の 2 段階サインインの migration(`addons_twofactor` の 0006 と 0007)も、admin プロジェクトが自分では migration を実行しないので、ここで適用されます。`web`・`api`・`admin`・`worker` は `condition: service_completed_successfully` でこれを待ちます。三つの手順はどれも何度実行しても同じ結果になるので、サービスは `up` のたびに動きます(実機第 12 回: これが無いと新しいデータベースで `web` が `relation "osf_institution" does not exist` の 500 を返し、そのエラーごとに開発サーバーが postgres の接続を 1 本漏らした)。`ember_osf_web` は、`build` が `RDM-ember-osf-web-dev2027` から組む静的なイメージで動きます。その Dockerfile は ember-cli の本番ビルドをビルドホスト自身のプラットフォームで Node の段として実行し(成果はプラットフォームに依らないので、amd64 も arm64 もエミュレーションしません)、結果を nginx-unprivileged で uid 101・ポート 4200 から配信します。ルートは読み取り専用で、書き込めるのは `/tmp`(tmpfs)だけ、ボリュームも `depends_on` もありません。イメージが読むのは `OSF_URL`・`OSF_API_URL`・`OSF_RENDER_URL`・`OSF_FILE_URL`・`OSF_HELP_URL`・`CAS_URL = {{AUTH_URL}}`・`OSF_COOKIE_DOMAIN`・`CSP_MODE`(`enforce`)と、任意の `CSP_EXTRA_SOURCES` だけです。起動時にエントリポイントが URL を `/tmp` の下の `index.html` に書き込み、ただの `http(s)` の URL でない値(cookie のドメインはホスト名)では終了 1 で止まり、ページに Google Analytics のアダプターがあれば配信を拒み、それらのオリジンから Content-Security-Policy を設定して nginx を起動するので、起動は数秒です。`ember serve` もライブリロードもありません。Compose の健康確認は `/healthz` への `wget` です(イメージに `curl` はありません)。 + +**公開ポート。** 既定のホスト側ポートを定めるのはこの表だけです。[ADR-02](../decisions/ADR-02_Network_Model.md)、[SPEC-03](03_security_gate.md)、[REF-01](../reference/REF-01_Glossary.md) はここを指します。すべて `127.0.0.1` にだけ公開します。 + +```toon +ports[8]{service,host_port,profile,url}: + web,5000,minimum,http://127.0.0.1:5000 + api,8000,minimum,http://127.0.0.1:8000 + admin,8001,core,http://127.0.0.1:8001 + wb,7777,core,http://127.0.0.1:7777 + mfr,7778,core,http://127.0.0.1:7778 + fakecas,8080,minimum,http://127.0.0.1:8080 + ember_osf_web,4200,core,http://127.0.0.1:4200 + y_websocket,1234,core,http://127.0.0.1:1234 +``` + +ほかのサービス(`cas`、`volume_owner_init`、`wiki_assets`、サブシステム、`test_idp`、データベースとキュー)には Compose ネットワークの中からだけ届きます。ブラウザ向けのポートが要るときは `compose render` が割り当て、`plan` が表示します。`compose render` は選んだホスト側ポートをすべて `runtime/.env` に `GRDM_PORT_<SERVICE>`(大文字)として書き、受入試験はそれを読みます([SPEC-04 §1](04_acceptance_tests.md#japanese))。既定のポートが使用中なら(macOS の AirPlay と `5000` が既知の例)、`compose render` は次の空きポートを取り、導入報告書に記録します。終了 12 は空きポートが見つからないときだけです。 + +`admin` サービスは Django の開発用サーバーを `manage.py runserver 0.0.0.0:8001 --insecure` で、`api` は `manage.py runserver 0.0.0.0:8000` で、どちらもスレッドありで動かします。`--nothreading`(`invoke apiserver` と `invoke adminserver` が足す)は Django 2.2(RDM-osf.io-dev2027 PR #13)で止まるからです。2.2 の開発用サーバーは次の要求のために接続を開いたままにし、単一スレッドのサーバーはブラウザの使われない二本目の接続を 30 秒待ち、その間ほかのクライアントはすべてタイムアウトします。どちらも `DEBUG_MODE` は `True` のままなので、`api/base/wsgi.py` は gevent をモンキーパッチせず、各スレッドが自分のデータベース接続を開きます。`DEBUG = False`(`debug_toolbar` を読み込ませないために生成する `admin_local.py` の設定)では `runserver` が静的ファイルを配信しないため、管理画面はスタイルシート・スクリプト・アイコンフォントなしで表示されます。`--insecure` は、アプリの静的ディレクトリから `runserver` にそれらを配信させます。これは**開発専用の例外**です。ポートはこの表のほかのポートと同じく `127.0.0.1` にだけ公開し(ADR-02)、このサーバーは本番用の Web サーバーではありません。本番の配備では、このフラグを使わず、自前の Web サーバーで管理画面の静的ファイルを配信してください(たとえば `collectstatic` の後)。公開ポートがすべてループバックアドレスにあることは単体試験で確かめています。 + +### 5. フラグ + +| フラグ | 意味 | +|---|---| +| `--yes` | すべての質問に既定で答える。端末がないときは必須。 | +| `--profile minimum\|core\|full` | 既定は `core`。`runtime/.env` に `GRDM_PROFILE` として保存し、次回以降も使う。 | +| `--platform linux/arm64,linux/amd64` | `build` の platform を上書きする。既定はホストの platform だけ。 | +| `--memory-gib <GiB>` | `doctor`・`compose render`・`install` で、検出値の代わりにこの大きさで制限を決める。プロファイルの下限が収まらないときの承知の上の過剰割当。 | +| `--public-access true\|false` | `compose render` と `install`: osf.io のすべてのプロセスの `ENABLE_PUBLIC_ACCESS`。既定は `false`(認証必須)。`runtime/.env` に `GRDM_ENABLE_PUBLIC_ACCESS` として保存する。 | +| `--timeout <秒>` | `up` と `install`(`up` だけに渡す。時間制限の無い `build` には効かない): health を待つ長さ。明示した `0` もそのまま渡す。既定は 1800 秒、amd64 のサービスがある Linux arm64 では 5400 秒。遅い、全体をエミュレーションする機械では延ばす。 | +| `--no-open` | `up` の後にブラウザを開かない。 | +| `--json` | 報告を TOON でなく JSON で出す。 | + +### 6. 終了コード + +```toon +exit_codes[17]{code,meaning}: + 0,成功 + 2,指定の誤り。不明なフラグや値の形の誤り + 10,対象外のホスト。OS・CPU・メモリ、または Python が古い + 11,Docker が無い・動いていない、または Compose / buildx プラグインが無い + 12,必要なポートが 127.0.0.1 で使用中で、空きの代わりも見つからない + 13,導入の前提が不足。git、リポジトリの読み取り権限、amd64 エミュレーション、または Docker が使えない配置先 + 14,reset が runtime/volumes/ を削除できない + 15,PostgreSQL のデータディレクトリに `grdm-dev db upgrade` が要る、または更新か巻き戻しに失敗(旧ディレクトリは残る) + 20,manifest が不正、または TOON の抄録が JSON と一致しない + 30,イメージのビルドに失敗 + 40,健康確認に失敗、またはループバック以外の番地で待ち受けている + 50,今の節目のセキュリティスキャンの門で不合格 + 51,スキャナーが動かない。道具が無い、または脆弱性データベースの取得に失敗 + 52,サービスが健全でなく scan --dynamic を実行できない + 53,レッドチームの事前確認に失敗。外向き通信が可能、または redteam-targets.json 外の対象 + 60,受入試験に失敗 + 70,上流のミラーか統合に失敗。fetch が拒まれた、push が失敗した、またはマージが衝突した +``` + +番号を別の意味に使い回しません。新しい原因には新しい番号を振ります。正本は `installer/grdm_dev/messages.tsv` で、この TOON ブロックはそれと一致していなければなりません(`manifest check` が確かめます)。50〜53 の詳細は [SPEC-03 §8](03_security_gate.md#japanese)、70 は [SPEC-05 §2〜§4](05_upstream_tracking.md#japanese) にあります。 + +### 7. 振る舞いの規則 + +- **対話なしで動く。** `stdin` が端末でなく `--yes` もないとき、すべての質問は「いいえ」と扱い、`--yes` を付けるよう促して終了 2 で終わる。 +- **何度でも同じ結果。** どのサブコマンドも二度実行して同じ結果になる。`secrets init` は既存の秘密を残し、`compose render` は生成ファイルだけを上書きし、`build` は buildx のキャッシュを使い、`up` は健康なサービスには何もしない。 +- **秘密を Git に入れない。** `runtime/` は `.gitignore` に入れる。`runtime/` の下のファイルや秘密に見える値がコミットされると、`docs check` と CI の秘密スキャンが不合格にする。 +- **ホストのネットワークを変えない。** 旧手引きのループバック別名 `192.168.168.167` は作らない。`compose render` が上流の `local.py` と `.docker-compose.*.env` の設定を、Compose ネットワーク内ではサービス名、ブラウザ向けには `127.0.0.1` を使うよう書き換える([ADR-02](../decisions/ADR-02_Network_Model.md))。 +- **初回の起動は遅く、二度目からは速い。** `up` は health を最長 1800 秒(`--timeout`)待つ。初回の `up` は `osf_init` を実行し、その結果を名前付きボリュームに残すので、二度目の `up` は 1〜2 分で健康になる。既定の値は、初回の `up` が Apple Silicon で ember-osf-web もエミュレーション下で組んでいた時に決めた(13〜25 分。実機第 10〜18 回)。いまの ember-osf-web は `build` が静的なイメージに組み、数秒で起動する。そのビルドの無いコールドスタートを実測するまで既定は変えない。Linux arm64 ではエミュレーションが QEMU で、以前の ember の初回ビルドは 1 コアで 44 分かかったため、プロファイルに amd64 のサービス(いまも `mfr`)があるときの既定は 5400 秒とする([DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md))。`--timeout` で上書きでき、`install --timeout` は `up` に渡す。amd64 を全体エミュレーションする機械ではこれが要りうる。そこでは(ember が静的なイメージになる前の)ember の初回ビルドが 1 時間 46 分、`up` が 2 時間 19 分かかった([DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md))。 +- **`-private` のコードを置かない。** インストーラーは実行時に manifest の名前と SHA(コミット一つの指紋。[REF-01](../reference/REF-01_Glossary.md))で統合リポジトリを取得する。この公開リポジトリにはそれらのコードを置かない([POL-01](../policy/POL-01_Developer_Environment_2027_Position.md))。 + +<a id="2-ja-hosts"></a> +### 8. 対応ホスト + +**メモリ。** `compose render` はホストのメモリと Docker エンジンの VM メモリの小さい方の 70 % を予算とし、サービスごとの下限が収まらないプロファイルは必要量を示して拒む(終了 10)。`--memory-gib` は検出を上書きし、承知の上の過剰割当になる(PR #33 レビュー r1 R1-04)。`doctor` は同じ計算を先に行い、ホストに応じた対処を示す。macOS では Docker Desktop の **Resources** または `colima start --memory`、WSL2 では `.wslconfig`(WSL 2 バックエンドの Resources にはメモリの設定がない)。`core` プロファイルの下限(一回限りのサービスを含む、サービスのテンプレートの `mem_min_mb`)の合計は 8512 MiB なので、`core` には検出されるメモリが少なくとも 8512 / 0.7 / 1024 ≈ 11.9 GiB、つまり 12 GiB の Docker VM が要る(`full` は fakecas で 9536 MiB、約 13.3 GiB、`--auth shibboleth` で 9856 MiB、約 13.7 GiB)。これは下限から計算した値で、実測の最大値ではない。`build` は含まず、ember-osf-web の Node の段は動いている間エンジンのメモリを数 GiB 使う。以前の約 24 GiB は、起動のたびにエミュレーション下で下限 8 GiB のもと束を組み直す事前ビルド済みの ember-osf-web のイメージから来ていた。静的なイメージの下限は 128 MiB である。`minimum` は 8 GiB に収まる。 + +| ホスト | CPU | 対応 | +|---|---|---| +| macOS 14 以上 と Docker Desktop | arm64 | 正式(M2 の受入はここで実行) | +| Ubuntu 24.04 と Docker Engine | amd64・arm64 | 正式 | +| Windows 11 の WSL2(Ubuntu 24.04)と Docker Desktop | amd64 | 動くことを必須とする。CI は `install-windows.ps1` の解析と dry run のみで、実際の実行には所有者の実機が要る([ADR-08 §5](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md#ja-limits)) | +| その他の Linux、Intel の macOS | 任意 | できる範囲で対応。`doctor` が警告して続行 | + +### 9. ディレクトリ構成 + +```toon +layout: + installer/install.sh: bash 3.2 の起動スクリプト + installer/install-ubuntu.sh: Ubuntu 24.04 と WSL2 の前提条件(§2.3) + installer/install-macos.sh: macOS の前提条件(§2.3) + installer/install-windows.ps1: Windows 11 の前提条件と WSL2 への受け渡し(§2.3) + installer/prereq-lib.sh: bash の前提条件スクリプト二つが共有する部品 + installer/pyproject.toml: パッケージ情報、コンソールスクリプト grdm-dev、追加 accept + installer/grdm_dev/: + cli.py: 引数の解釈、サブコマンドの振り分け、終了コード + host.py: OS・CPU・メモリ・ディスク・Docker の判定 + manifest.py: manifest/upstreams.json の読み込みと検証、TOON との比較 + secrets.py: 乱数の秘密の生成、モード 0600 の runtime/.env + compose.py: manifest とプロファイルから runtime/docker-compose.yml を生成 + database.py: PostgreSQL のデータディレクトリの状態、ダンプと復元による更新、巻き戻し(ADR-12) + build.py: buildx の呼び出し、platform の一覧、任意の push + health.py: サービスの健康確認とループバック限定の確認 + scan.py: 基本対策、Trivy の SBOM と CVE、gitleaks、Semgrep、ZAP、許容リストとの差分、段階的な門(SPEC-03) + redteam.py: レッドチームの事前確認(SPEC-03 §6) + upstream.py: ミラーと統合(SPEC-05) + accept.py: 同じ venv で pytest-playwright を実行 + docs.py: MkDocs のビルドと SPEC-06 の検査 + report.py: TOON と JSON の報告をまとめる + messages.tsv: 終了コード、英語の文言、日本語の文言 + installer/tests/: unittest。ファイル名は test_*.py + installer/acceptance/: Playwright Python。SPEC-04 を参照 + manifest/: + upstreams.json: manifest の正本(SPEC-01) + upstreams.toon: grdm-dev manifest toon が生成する抄録(SPEC-01) + allowlist.json: 許容する検出(SPEC-03 §5.1) + allowlist.baseline.json: 前の節目の終了時の許容リスト件数。所有者が保守(SPEC-03 §5.1) + milestone.json: 現在の節目。所有者が保守(SPEC-03 §5.2) + hardening.json: 読み取り専用ルートと cap_drop のサービスごとの例外と理由(SPEC-03 §3.3) + redteam-targets.json: AI レッドチームが触れてよいコンテナ名(SPEC-03 §6) + runtime/: 生成物。Git は無視(.env、docker-compose.yml、volumes/、reports/、backups/、db-operation.json と .lock) +``` + +### 10. 試験 + +`python3 -m unittest discover -s installer/tests` はすべての PR(プルリクエスト。レビュー待ちの変更の提案。[REF-01](../reference/REF-01_Glossary.md))で合格していなければなりません。各モジュールに `test_<モジュール>.py` を置き、成功ケースと拒否ケースを少なくとも一つずつ含め、拒否ケースでは [§6](#japanese) の終了コードを assert します。単体試験は Docker を要求しません。`host.py` と `build.py` は実行器を差し替えられる作りにし、試験では偽の `docker` の出力を渡します。統合と受入の段は [SPEC-04](04_acceptance_tests.md) で定めます。 + +[§2.3](#2-ja-prereq) の前提条件スクリプトは、すべての PR で `installer-prereq-lint.yml` が確かめます。`bash -n`、shellcheck、`windows-latest` の PowerShell パーサー、各 OS での dry run です。単体試験はスタブだけの `PATH` の下で `--dry-run` か `--help` でだけ実行します。手で起動する `installer-full.yml` は `ubuntu-24.04` と `ubuntu-24.04-arm` で `minimum` の完全な導入を行い、リポジトリのシークレット `GRDM_INTEGRATION_READ_TOKEN` を必要とします。これらのランナーで証明できないことは [ADR-08 §5](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md#ja-limits) に挙げています。 + +> **Note:** 二つのワークフローとその補助 `.github/scripts/Test-PowerShellSyntax.ps1` は**保留中**です。`workflow` スコープを持つトークンで誰かが push するまで、ブランチ `feat/per-os-installers` で待ちます。それまでこの段落の確認は手で行い、実際の Linux での実行は [DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md) が示します。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Virtual environment (venv) | A private folder of Python and its libraries, separate from the system's. | システムとは別の、Python とライブラリだけの私用フォルダ。 | +| buildx | The part of Docker that builds images for more than one kind of CPU at once. | 複数の種類の CPU 向けのイメージを一度に作る Docker の機能。 | +| Loopback / 127.0.0.1 | The address that means "this same computer"; nothing outside can reach it. | 「この同じコンピュータ」を指す番地。外からは届かない。 | +| SBOM | A list of every software part inside an image, like an ingredients label. | イメージに入っている部品の一覧。食品の原材料表示のようなもの。 | +| CVE | A public record number for one known security weakness. | 一つの既知の弱点に付いた公開の番号。 | +| Exit code | The number a program returns when it stops; 0 means success. | プログラムが終わるときに返す数。0 が成功。 | diff --git a/docs/spec/03_security_gate.md b/docs/spec/03_security_gate.md new file mode 100644 index 0000000..7f25ef9 --- /dev/null +++ b/docs/spec/03_security_gate.md @@ -0,0 +1,513 @@ +# SPEC-03 Security Gate / セキュリティの門 + +> **Summary:** What the development environment protects, which controls every install must have from the first milestone, how `grdm-dev scan` finds vulnerabilities, how the allow-list works, and how the gate tightens from "report" (M1) to "zero CRITICAL/HIGH plus a passing AI red team" (M5). +> **概要:** 開発環境が何を守るか、最初の節目から全導入に必須の対策、`grdm-dev scan` が脆弱性を見つける手順、許容リストの決まり、そして門が「報告のみ」(M1)から「CRITICAL/HIGH ゼロ+AI レッドチーム合格」(M5)へ段階的に厳しくなる様子を定める。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.18 — 2026-11-13. **Learned:** Trivy's own 5 minute per-call limit is a property of the scanner, not of the product, and it made `scan` exit 51 on a 7 GB image under emulation with no way to say "wait longer"; `scan --trivy-timeout` now passes a bounded duration to every Trivy call, and it changes only how long Trivy may run, never what the gate accepts (DEMO-22). / Trivy 自身の 1 回 5 分の制限はスキャナーの性質であって製品のものではなく、エミュレーション下の 7 GB のイメージで `scan` を終了 51 にしたが、「もっと待つ」と言う手段が無かった。`scan --trivy-timeout` は有限の長さを Trivy の呼び出しすべてに渡す。変わるのは Trivy が動ける時間だけで、ゲートが何を受け入れるかは変わらない(DEMO-22)。 + 0.17 — 2026-11-13. **Learned:** an exemption has to be proven by the thing it exempts, not by an error message: the first rule ("the unreachable address is not the target's own") also accepted a redirect to any broken host, so a scan could end `ok` without having checked anything; the exemption now needs the rendered configuration (sign-in required, the configured sign-in address), the same address in ZAP's message and in the scan's own probe of `web`, and is reported as a skipped target, never as a scanned one (PR #56 review r1 R1-01). / 除外は、エラーメッセージでなく、除外される当のものによって証明されなければならない。最初の規則(「届かないアドレスが対象自身のものでない」)は、壊れた任意のホストへの転送も受け入れ、何も調べずに検査が `ok` で終わりえた。除外は、生成済みの設定(サインイン必須、設定済みのサインインのアドレス)と、ZAP のメッセージおよびスキャン自身による `web` の探りが同じアドレスを示すことを要し、検査済みでなく対象外として報告する(PR #56 レビュー r1 R1-01)。 + 0.16 — 2026-11-12. **Learned:** turning on mandatory sign-in changes what a dynamic scanner can see: ZAP's spider could not open web's only anonymous answer (a redirect to a sign-in page it cannot reach), which made the whole `scan` exit 51 although nothing was broken; a wall in front of a service has to be told apart from a service that is down, and reported as a gap in coverage instead of as a failure or as silence. / 必須サインインを入れると、動的スキャナーに見えるものが変わる。ZAP のクモは web の唯一の匿名の応答(届かないサインインのページへの転送)を開けず、何も壊れていないのに `scan` 全体が終了 51 になった。サービスの前の壁は、止まっているサービスと区別し、失敗でも沈黙でもなく、網羅の穴として報告しなければならない。 + 0.15 — 2026-11-11. **Learned:** naming the image was not enough: with a wildcard component the entry accepted every package of that image for the CVE, and since fix status was not kept, a finding whose fix appears later stayed hidden. So an entry now names exact packages, and it matches only while Trivy reports no fixed version ([PR #45 review r1](../reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r1.md) R1-01). / イメージを名指すだけでは足りなかった。部品がワイルドカードだと、その CVE についてイメージ内のすべてのパッケージを許容した。修正状態も保持していなかったので、後から修正版が出た検出も隠れたままになった。そこで項目は正確なパッケージを名指しし、Trivy が修正版なしと報告する間だけ当てはまるようにした([PR #45 レビュー r1](../reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r1.md) R1-01)。 + 0.14 — 2026-11-11. **Learned:** an entry that names only a CVE and a package would also hide that CVE in every other image that carries the package, including older Debian images where a fixed version exists, so an entry for packages without a fix in one image now names that image (`image`), as the Python 3.13 WaterButler and MFR images first needed. / CVE とパッケージだけを書いた項目は、そのパッケージを持つ他のすべてのイメージ(修正版がある古い Debian のイメージを含む)でも同じ CVE を隠してしまう。そのため、あるイメージで修正版の無いパッケージの項目はそのイメージを名指し(`image`)するようにした。Python 3.13 の WaterButler と MFR のイメージで初めて必要になった。 + 0.13 — 2026-11-10. **Learned:** a type check that runs after a blocking open never runs: a FIFO in place of a report hung the scan, so report files are opened with `O_NONBLOCK` and `O_NOFOLLOW` and their descriptor type is checked before any read or write; and the private-parent check is a snapshot, so the user's own checkout and its ancestors are a precondition, not something the scan defends ([PR #44 review r2](../reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r2.md)). / 止まる open の後の型検査は実行されない。報告の代わりの FIFO でスキャンが止まったので、報告ファイルは `O_NONBLOCK` と `O_NOFOLLOW` で開き、読み書きの前に記述子の型を確かめる。また非公開の親の確認は一時点のもので、利用者自身のチェックアウトと祖先は前提条件であり、スキャンが守るものではない([PR #44 レビュー r2](../reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r2.md))。 + 0.12 — 2026-11-10. **Learned:** a world-writable directory is safe only while its private parent really is private, so the ZAP work directories are created only after `runtime/` is verified as a 0700 real directory owned by the user, under unpredictable names, and a report that is a symlink is refused ([PR #44 review r1](../reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r1.md) R3). / 誰でも書けるディレクトリが安全なのは、非公開の親が実際に非公開である間だけである。そこで ZAP の作業ディレクトリは、`runtime/` が利用者の所有の実ディレクトリで 0700 だと確かめてから、予測できない名前で作り、シンボリックリンクの報告は拒む([PR #44 レビュー r1](../reviews/2026-11-10_RDM-developer-guide_PR44_Per_OS_Installers_r1.md) R3)。 + 0.11 — 2026-11-10. **Learned:** a hardening exception that blames an image's start command expires with that image, so building CAS from source removed it entirely, while the secure-cookie default had to be switched off explicitly and in one place because the stack is plain HTTP on loopback (ADR-07 §7). / イメージの起動コマンドを理由にした堅牢化の例外はそのイメージとともに期限が切れる。CAS をソースから組むとこの例外はまるごと消えた。一方、スタックはループバック上の平文 HTTP なので、Secure Cookie の既定は一か所で明示して切る必要があった(ADR-07 §7)。 + 0.10 — 2026-11-10. **Learned:** a converter behind HTTP needs no shared volume and no capability, so the exception for its old image could be removed once the client was changed. / HTTP の背後の変換サービスは共有ボリュームも capability も要らないので、クライアントを変えた時点で旧イメージの例外を除けた。 + 0.9 — 2026-11-10. **Learned:** a native rebuild removed the elasticsearch6 hardening entry as well as its Log4Shell findings, while a scan count alone would have approved a unoconv image that MFR's client cannot use, so an image change is accepted only with its client's real path proven (ADR-07 §5). / ネイティブの組み直しで elasticsearch6 の堅牢化の項目も Log4Shell の検出も消えた。一方、検出数だけなら MFR のクライアントが使えない unoconv イメージを通していたので、イメージの変更はクライアントの実経路を証明して初めて受け入れる(ADR-07 §5)。 + 0.8 — 2026-11-10. **Learned:** per-volume init containers multiplied hardening exceptions and still missed redis and the other uid-1000 volumes, so one generic owner step, derived from each volume's writers, replaces them (cross-OS audit, 2026-11-10). / ボリュームごとの init コンテナは堅牢化の例外を増やすだけで redis や他の uid 1000 のボリュームを取りこぼしていた。各ボリュームの書き手から導く一つの汎用の所有者設定の段に置き換えると分かった(OS 横断の監査、2026-11-10)。 +- Version / 版: 0.7 — 2026-11-06. **Learned:** a scanner that did not finish a rule has proved nothing about that file; at the reporting milestones that is a recorded coverage gap, at the strict milestones it keeps the run incomplete (PR #33 review r2 R2-02). / ルールを終えなかったスキャナーはそのファイルについて何も証明していない。報告の節目では記録された網羅性の穴、厳格な節目では実行を不完全のままにする(PR #33 レビュー r2 R2-02)。 + 0.6 — 2026-11-06. **Learned:** "every service is non-root" was true of the generated default but not of the recorded exceptions, so the specification now states the bounded exception policy itself (controls, reason, review date, milestone, reporting) and keeps it apart from the CVE allow-list (PR #33 review r1 R1-03). / 「全サービスが非 root」は生成の既定には当てはまるが記録した例外には当てはまらなかった。仕様自体に限定された例外の方針(統制・理由・見直し日・節目・報告)を書き、CVE の許容リストと区別した(PR #33 レビュー r1 R1-03)。 + 0.5 — 2026-11-06. **Learned:** a source scan must not phone remote package registries (Maven Central rate-limits and blocks), and the scan targets must follow the build decisions (no stale checkout of a prebuilt component, no assembled overlay copy) — real install run 17. / ソースの検査は遠隔のパッケージ登録所に問い合わせてはならない(Maven Central は速度制限し遮断する)。検査対象はビルドの決定に従う(prebuilt 部品の古い checkout や組み立てたオーバーレイの写しは対象外)。実機第 17 回。 + 0.4 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.3 — 2026-11-05. **Learned:** the first rendered configuration showed that a single internal network cannot publish ports, so the baseline needs two networks (`grdm` internal, `grdm-edge` for publishing) and an explicit, recorded egress choice; the red-team preflight must prove isolation with a reachable canary rather than infer it from a failed lookup (review r1 of PR #21). / 最初に描画した構成で、内部ネットワーク一つではポートを公開できないと分かった。基本対策は二つのネットワーク(内部の `grdm` と公開用の `grdm-edge`)と、記録された明示的な egress の選択を要する。レッドチームの事前確認は、失敗した名前解決から推測せず、到達できるカナリアで隔離を証明する(PR #21 レビュー r1)。 + 0.2 — 2026-11-05. **Learned:** a scanner that runs inside a container must address its targets by Compose service name, because loopback inside that container is the scanner itself; and a promised scanner must say what it scans at each milestone. / コンテナの中で動くスキャナーは相手を Compose のサービス名で指さなければならない。そのコンテナの中のループバックはスキャナー自身だからだ。また約束したスキャナーは節目ごとに何を検査するかを明記する必要があると分かった。 +- Version / 版: 0.1 — 2026-11-05. **Learned:** the gate must be written as a schedule, not a single threshold, because every current base image is end-of-life and a zero gate on day one would stop the first install before anything could be measured. / 現行のベースイメージがすべてサポート終了のため、門を一つの基準値でなく「節目ごとの予定表」として書かないと、初日の導入が何も測れないまま止まると分かった。 +- Normative for: `installer/grdm_dev/` (`scan`, `redteam preflight`, `health --network`, `secrets`), `manifest/allowlist.json`, `manifest/allowlist.baseline.json`, `manifest/milestone.json`, `manifest/hardening.json`, `manifest/redteam-targets.json`, `.github/workflows/security.yml`, every `docker-compose` file generated by `grdm-dev`, and every AI red-team run. +- Related: [SPEC-00 Overview](00_overview.md) · [SPEC-02 Installer CLI](02_installer_cli.md) · [SPEC-04 Acceptance Tests](04_acceptance_tests.md) · [SPEC-05 Upstream Tracking](05_upstream_tracking.md) · [SPEC-06 Documentation Conventions](06_documentation_conventions.md) · [POL-01 Position](../policy/POL-01_Developer_Environment_2027_Position.md) · [ADR-02 Network Model](../decisions/ADR-02_Network_Model.md) · [ADR-03 Staged Security Gate](../decisions/ADR-03_Staged_Security_Gate.md) · [ADR-04 AI Autonomy and Roles](../decisions/ADR-04_AI_Autonomy_and_Roles.md) · [docs/README.md](../README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Scope + +This specification defines the *security gate* (a checkpoint that an install must pass before it is called good) of the GRDM developer environment 2027. It covers what we protect, the baseline controls that apply from milestone M1, the scanners, the allow-list (the short list of known problems we have looked at and accept for now; see [REF-01](../reference/REF-01_Glossary.md)), the staged thresholds up to M5, the AI red team, the evidence format, and the exit codes. The decision to stage the gate instead of enforcing zero from the start is recorded in [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md). Who may fix, review, and merge is recorded in [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md). + +**Glossary notes.** A *vulnerability* is a known weak spot in a program that someone could use to break in. A *CVE* (Common Vulnerabilities and Exposures) is the public ID number given to one vulnerability, like `CVE-2026-12345`. *Severity* is how bad it is: CRITICAL, HIGH, MEDIUM, LOW. A *milestone* (M1 to M5) is one of the five planned stages of this project, defined in [POL-01](../policy/POL-01_Developer_Environment_2027_Position.md). + +### 2. Threat model + +A *threat model* is a short list of what we are protecting and who we imagine is trying to harm it. It keeps the controls honest: every control in §3 must answer at least one line of this table. + +What we protect: + +| Asset | Why it matters | +|---|---| +| The developer's machine | It holds the developer's own files, browser sessions, and SSH keys. A container that escapes could reach them. | +| Credentials | Database passwords, session keys, OAuth client secrets, and the GitHub token that mirrors upstream repositories. | +| `-private` code | The security-hardened variants of the six core repositories are private to RCOSDP. They must never leave the private `-dev2027` repositories or appear in this public repository. | +| The integrity of the gate itself | If an attacker can edit a scan report or the allow-list, every other control is meaningless. | + +Attackers we consider: + +| Attacker | What they can do | Main controls | +|---|---|---| +| Anyone on the same LAN (office Wi-Fi, home router) | Open a port that the developer left published; guess a default password. | §3.2 publish only on `127.0.0.1`; §3.1 random secrets. | +| A malicious dependency (a library that `pip` or `npm` downloads) | Run code at build or start time; read environment variables; call home. | §3.4 pinned digests; §4 SBOM + CVE scan; §4.4 dependency bots; §3.2 internal network. | +| A compromised container (one service already broken into) | Reach other services; write to the host; use host resources. | §3.3 non-root, read-only root, no privileged, resource limits; §3.2 internal network. | +| An adversarial top-tier AI agent probing the running system | Chain small weaknesses fast; try every public exploit for every CVE in the SBOM; brute-force weak defaults. | §5 staged gate to zero CRITICAL/HIGH; §6 AI red team that uses the same capability on our side first. | + +Out of scope: attacks on the developer's operating system itself, phishing of the developer, and the production GRDM service. Those belong to the operating institution, not to the developer environment. + +### 3. Baseline controls (apply from M1, every install) + +These controls are not negotiable and have no allow-list. `grdm-dev health --network` and `grdm-dev scan --baseline` verify them; failure of any one is exit code 50 even at M1. + +#### 3.1 Secrets + +- Every secret (a password or key that only the system should know) is generated at install time by `grdm-dev secrets init` from the operating system's random source. +- Secrets are written to `runtime/.env` ([SPEC-02 §3](02_installer_cli.md#english)) with file mode `0600` (only the owner can read and write). `runtime/` is listed in `.gitignore`; the secret scanner in §3.5 confirms the file never enters a commit. +- No default passwords. Upstream (the original repositories our copies come from; see [REF-01](../reference/REF-01_Glossary.md)) `docker-compose.yml` files ship with values such as `postgres`/`postgres` and `changeme`; the installer replaces every one of them and fails if one is still present. +- Reports and logs never print a secret. `grdm-dev report` masks any value that matches a key in `runtime/.env` before writing. + +#### 3.2 Network + +- Services talk to each other only on the Compose network `grdm`, which is declared `internal: true` (a private virtual network inside Docker with no route to the host's interfaces, the LAN, or the Internet), so a compromised container (a box that holds one program and everything it needs, so it runs the same anywhere; see [REF-01](../reference/REF-01_Glossary.md)) cannot call home from it. See [ADR-02](../decisions/ADR-02_Network_Model.md). +- Docker cannot publish a port from an internal network, so the services a browser must reach (`web`, `api`, `admin`, `wb`, `mfr`, `fakecas`, `ember_osf_web`) are additionally attached to a second, ordinary bridge network `grdm-edge`. Ports are published from it on `127.0.0.1` only; no other service joins it by default. +- Egress (outbound traffic to the Internet) is therefore not available to the remaining services. A developer who needs it, for example to reach an external storage provider while developing an add-on, attaches named services with `grdm-dev compose render --egress <service>[,<service>...]`. The choice is recorded in `runtime/.env` as `GRDM_EGRESS_SERVICES`, shown in the compose and install reports, and read by `grdm-dev scan --baseline`; `--egress none` clears it. Egress granted this way is a recorded developer choice, not a baseline violation; an undeclared service on `grdm-edge` is a violation (`BASE-NETWORK`), and a grant that names a service which is not actually attached is also a finding (`BASE-EGRESS-STALE`): the record and the running configuration must agree. +- `grdm-dev health --network` enumerates the project's own bindings (`docker compose ps`, `docker inspect`) and the host's listening sockets and fails if any address is not `127.0.0.1`, including a listener on a project port whose owning process is not visible. +- Ports that a browser needs are published only on `127.0.0.1`; the list of default ports (`5000` web, `8000` api, `8001` admin, `7777` wb, `7778` mfr, `8080` fakecas, `4200` ember) is the ports table in [SPEC-02 §4](02_installer_cli.md#2-en-ports). Nothing is published on `0.0.0.0` or on a LAN address. The old loopback alias `192.168.168.167` is gone. +- `grdm-dev health --network` lists every listening socket of the Compose project and fails if any address is not `127.0.0.1`. + +#### 3.3 Container hardening + +- Every service runs as a non-root user. Where an upstream image (the recipe and ingredients a container is made from; see [REF-01](../reference/REF-01_Glossary.md)) runs as root, the generated Compose sets `user:` to a fixed UID/GID and the installer creates writable volumes for the few paths that need it. +- **Bounded hardening exceptions.** A service may deviate from the non-root, read-only or `cap_drop: ALL` baseline only through an entry in `manifest/hardening.json` that names the relaxed controls (`user`, `read_only`, `cap_add` with the exact capabilities), the reason tied to the upstream image, a review date and the modernization milestone that removes it. `compose render` applies nothing that is not recorded there; `scan --baseline` reports every applied entry under `baseline_exceptions` and fails on a root user, a writable root or an added capability that has no entry, on an entry past its review date, and on `privileged` or a disabled `no-new-privileges` in any case. These entries are distinct from the CVE allow-list (§5): they describe how an EOL image must be started, not a vulnerability that is tolerated. Their count is reported at every milestone exit and may not grow after M3; M4 removes those tied to Python 3.5/3.6 and JDK 8 images, M5 the rest (PR #33 review r1 R1-03). Current entries: postgres, mongo, rabbitmq, shibboleth_sp, test_idp and the one generic one-shot owner step volume_owner_init (the elasticsearch, elasticsearch6 and cas services lost their entries when they became native images, ADR-07). +- Root filesystem is read-only (`read_only: true`) where the service tolerates it; writable paths are explicit `tmpfs` or named volumes. Exceptions are listed per service in `manifest/hardening.json` with a reason. +- `privileged: true` is forbidden. `cap_drop: [ALL]` is the default; a service that needs a capability adds it back by name with a reason. +- Every service has `mem_limit`, `cpus`, and `pids_limit`. `grdm-dev compose render` ([SPEC-02 §3](02_installer_cli.md#english)) writes them, scaled from the memory that `doctor` detected. + +#### 3.4 Supply chain + +- Images are pulled by *digest* (the exact fingerprint of one image version, `sha256:...`), never by a floating tag such as `latest`. The digest of each base image is the `base_image_digest` field of `manifest/upstreams.json`, next to the Git SHAs ([SPEC-01 §3](01_manifest.md#english)); it is `null` until the image is pinned, at the latest at M2. +- Locally built images record the base-image digest in a label so that `grdm-dev scan` can tell which base they came from. + +#### 3.5 Secret scanning in CI + +Because this repository is public, every pull request and every push to `develop` runs a secret scanner in CI (continuous integration: automatic checks on every change; see [REF-01](../reference/REF-01_Glossary.md)) (`gitleaks` or an equivalent that detects private keys, tokens, and passwords in the diff and in history). One finding fails the workflow. The same scanner runs locally in `grdm-dev scan --secrets`. False positives are suppressed by a rule in `.gitleaks.toml` with a reason, never by deleting the finding from the report. + +### 4. Scanning + +`grdm-dev scan` runs four kinds of scanners and writes one combined report. A scanner runs either inside the Compose project, where it reaches services by their Compose service names (ZAP, §4.3), or on the host, where it looks at the `127.0.0.1` ports (the network baseline check, §3.2); none sends data to an outside service except to download its vulnerability database. + +#### 4.1 SBOM and CVE: Trivy (required), Grype (optional second opinion) + +- An *SBOM* (software bill of materials: the complete list of every library inside an image or project) is generated by Trivy for every image in the Compose project and for every lockfile (`requirements*.txt`, `poetry.lock`, `package-lock.json`, `yarn.lock`, `build.gradle`) in the integration repositories. Source scans run with `--offline-scan` (no remote Maven lookups: Maven Central answered 429 and blocked the host in real install run 17); the assembled overlay context under `runtime/src/_overlay/` and the stale checkout of a component that now uses `prebuilt_image` are skipped with a note, and the repository scan excludes `runtime/`, `.venv/` and `site/`. +- Trivy then matches the SBOM against its CVE database. Output is JSON (canonical) plus a TOON (a compact text form of JSON; see [REF-01](../reference/REF-01_Glossary.md)) excerpt in the report. +- Grype may run on the same SBOM as a second opinion. Grype findings are informational and never change the gate result unless the owner promotes one to the allow-list process. +- **M1 scope.** At M1 no image exists yet (`grdm-dev build` arrives with M2), so the Trivy job in `security.yml` scans the repository file system only, in report-only mode: it writes its findings to the job log and never fails the PR (pull request: a proposed change waiting for someone to review and accept it; see [REF-01](../reference/REF-01_Glossary.md)). Image and lockfile scanning of the integration repositories starts with the first build. +- **Per-call limit.** Trivy stops any one call after 5 minutes by default; a very large image under emulation can exceed that, which leaves the SBOM or the scan unfinished and `scan` at exit 51. `grdm-dev scan --trivy-timeout 30m` (a whole number plus `s`, `m` or `h`, at most `24h`) passes that duration as Trivy's `--timeout` to every SBOM and scan call. A longer limit does not change what counts as a finding, an allowlist entry or a pass; a run that still cannot finish stays incomplete (exit 51). + +#### 4.2 Static analysis: Semgrep and CodeQL + +*Static analysis* reads source code without running it and flags dangerous patterns (for example, building an SQL query from user text). Semgrep (a tool that reads source code looking for dangerous patterns; see [REF-01](../reference/REF-01_Glossary.md)) runs locally and in CI on every PR with the `p/default`, `p/python`, `p/javascript`, and `p/docker-compose` rule packs. CodeQL runs in the private `-dev2027` repositories on `develop` nightly. Findings of severity ERROR count as HIGH in the gate; WARNING counts as MEDIUM. Semgrep runs with a 30-second per-rule-per-file timeout (three timeouts drop a file). A rule timeout is a *coverage gap*: at M1–M3 (report-only, count-not-growing) `scan` records it as a warning on the tool row and still judges the findings it has; at M4 and M5 (fail-high, zero) a rule that never finished cannot establish a clean result, so the run is incomplete (exit 51) until the scan is repeated on an idle host or with a longer `--timeout` (real install run 20, PR #33 review r2). + +#### 4.3 Dynamic scan: OWASP ZAP baseline + +A *dynamic scan* pokes the running web application like a browser would. `grdm-dev scan --dynamic` starts OWASP ZAP (a tool that pokes at a running website the way an attacker would; see [REF-01](../reference/REF-01_Glossary.md)) in a container attached to the Compose internal network ([ADR-02 §3](../decisions/ADR-02_Network_Model.md#english)) and runs the baseline scan against the Compose service names and container ports: `http://web:5000` (web), `http://admin:8001` (admin), and `http://ember_osf_web:4200` (ember). It never targets `127.0.0.1`: inside the ZAP container, loopback is ZAP itself, not a service and not the host. The container ports are the ports the services listen on inside the network; their numbers equal the default host ports in the ports table of [SPEC-02 §4](02_installer_cli.md#2-en-ports), but that table defines *host* ports, which browsers, acceptance tests, and `grdm-dev health --network` use. When `compose render` remaps a host port on collision and records it as `GRDM_PORT_<SERVICE>` in `runtime/.env` ([SPEC-02 §4](02_installer_cli.md#2-en-ports)), host-side checks read the new number from there and the ZAP targets do not change. ZAP risk High maps to HIGH, Medium to MEDIUM. **A verified sign-in wall is recorded as skipped coverage, not as a scan and not as a failure.** With mandatory sign-in (`ENABLE_PUBLIC_ACCESS=false`, the default; [SPEC-02 §3](02_installer_cli.md#english)) `web` answers every anonymous request with a 302 to the sign-in page at the browser-facing loopback URL of fakecas; the ZAP container cannot open that address, so `zap-baseline.py` ends with "Job spider failed to access URL … Connect to <address> failed" and writes no report (measured on the integration candidate). A connection failure alone is not evidence: it is also what a broken redirect to an unrelated host, a stopped service or a different spelling of an address looks like. `scan` therefore makes the exception only when all of these hold: the target is `web`; `runtime/config/osf.env` says `ENABLE_PUBLIC_ACCESS=false` and `runtime/.env` does not set `GRDM_ENABLE_PUBLIC_ACCESS` otherwise; ZAP's message names this very seed and exactly the host and port of `CAS_SERVER_URL` in `osf.env`; and the scan's own request to the seed, made from the scan network inside the ZAP image with redirects not followed, is answered with a 3xx whose `Location` has exactly that address. Then the tool row lists the target in `skipped_targets`, does not count it in `targets`, reads `ok (N scanned, M skipped behind sign-in: …)`, and `notes` says "ZAP NOT RUN on web … no page behind sign-in was scanned". In every other case (another host or spelling, another service, public access, no rendered `osf.env`, no or a different redirect, a probe that cannot run) the scan stays incomplete (exit 51); the Shibboleth profile, whose sign-in address is not `CAS_SERVER_URL`, is therefore not excused and has to be judged by the operator. The skipped service is covered by the acceptance rejection cases, Trivy and Semgrep, not by ZAP, and the note says so; a result with `ok` and a skipped target must not be read as "ZAP scanned every target". The scan runs only after `grdm-dev health` reports all services healthy: a full `grdm-dev scan` skips the dynamic part and notes it in the report, while an explicit `scan --dynamic` exits 52. ZAP runs as its own uid, so each target gets a work directory writable by every uid, created exclusively under an unpredictable name below `runtime/reports/` and removed after the report is copied. This is allowed only while `runtime/` is a real directory owned by the user with mode 0700 and `reports/` is a real directory owned by the user; otherwise ZAP is not run and the dynamic part is incomplete (exit 51). A report that is not a regular file, such as a symlink or a FIFO, is refused: report files are opened with `O_NOFOLLOW` and `O_NONBLOCK`, and the descriptor's type is checked before anything is read or written. The checks are taken once before the run; they assume that the user's checkout and its ancestors are not changed by someone else meanwhile, and they do not make the scan race-proof against the owner. + +#### 4.4 Dependency update bots + +The private `-dev2027` repositories enable Dependabot (or Renovate) for Python, npm, Gradle, and Docker base images, grouped weekly. The bot opens a PR; the PR enters the normal flow of [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md): AID (AI開発担当者) adapts the code if needed, REV (担当レビュワ) reviews, QAE (QA担当) runs regression, the owner merges. + +#### 4.5 Flow of `grdm-dev scan` + +```mermaid +flowchart TD + A[grdm-dev scan] --> B{baseline controls<br/>secrets 0600, 127.0.0.1 only,<br/>non-root, no privileged} + B -- any failure --> X[exit 50: gate failed] + B -- pass --> C[Trivy: SBOM for images + lockfiles] + C --> D[Trivy: CVE match] + C --> E[Grype second opinion<br/>optional, informational] + D --> F[Semgrep static analysis] + F --> G{services healthy?} + G -- yes --> H["OWASP ZAP baseline<br/>web, admin, ember_osf_web by service name"] + G -- no --> I[skip dynamic, note in report] + H --> J[merge findings] + I --> J + E --> J + J --> K[apply allowlist.json<br/>drop expired entries] + K --> L{compare with threshold<br/>of current milestone §5} + L -- within threshold --> M[write report TOON + JSON<br/>exit 0] + L -- over threshold --> N[write report<br/>exit 50] +``` + +### 5. Allow-list and staged gate + +#### 5.1 Allow-list + +The *allow-list* is the written list of findings we know about, have judged, and accept for a limited time. Canonical file: `manifest/allowlist.json`. The TOON excerpt in `docs/status/` is regenerated by `grdm-dev scan` and checked by `grdm-dev manifest check` (see [SPEC-06 §4](06_documentation_conventions.md)). + +Rules: + +1. Every entry has all six fields: `cve`, `component`, `reason`, `owner`, `expires`, `added_at`. An entry with a missing field is invalid and the scan fails with exit 50. `component` names an exact package, `name` or `name@version`; a wildcard (`*`) or an empty value is invalid. Optional fields: `severity`; `image`, an image name without tag (for example `grdm-dev/waterbutler`); and `packages`, a list of exact `name@version` strings, required with `image` (then `component` is the first of them). An empty `image` or `packages` is invalid like a missing field. An entry matches a finding only when all of these hold: + - the same id (CVE); + - for a Trivy vulnerability, Trivy reports no fixed version: `FixedVersion` is empty and `Status` is `affected`, `will_not_fix`, `fix_deferred` or `end_of_life`. A finding whose fix appears later, or whose status is unknown, counts again without any edit to the entry; + - with `image`: the finding is an OS package (Trivy class `os-pkgs`) of exactly that image (target `<image>:<tag> (<os>)` or `<image>@<digest>`), never a language package and never a sibling image name, so a package without a fixed version in one image does not hide the same CVE in another image; + - the package name equals one the entry names (`packages`, else `component`) as a whole, never as a prefix, and a version in the entry equals the installed version. +2. `reason` says why the finding is not exploitable here or why it cannot be fixed yet (for example "code path not reachable in dev profile", "fix requires Python 3.13 port scheduled for M4"). +3. `owner` is a person or a role from the [role table](../decisions/ADR-04_AI_Autonomy_and_Roles.md), never "team". +4. `expires` is a date no later than the start of the next milestone. On expiry the entry is ignored and the finding counts again. +5. **The number of entries must never increase from one milestone to the next.** `grdm-dev scan` compares the count with `manifest/allowlist.baseline.json`, which the owner updates at each milestone exit, and fails if the count went up. +6. Only the owner approves additions. AID may propose an entry in a PR; REV and QAE check it; the owner merges. + +```toon +allowlist: + milestone: M2 + baseline_count: 3 + entries[3]{cve,component,severity,reason,owner,expires,added_at}: + CVE-2021-3177,python:3.6-base,HIGH,"EOL interpreter; removed by Python 3.13 port in M4",AID,2027-03-31,2026-11-20 + CVE-2022-24785,moment@2.24,HIGH,"ember dev build only; not served to browser in dev profile",AID,2027-01-31,2026-11-20 + CVE-2020-8265,node:12-base,CRITICAL,"EOL runtime; replaced by node 20 image in M4",AID,2027-03-31,2026-11-20 +``` + +> **Note:** the TOON block above is an example of the shape. The real content lives in `manifest/allowlist.json` and is regenerated into `docs/status/` by `grdm-dev scan`. + +#### 5.2 Staged gate + +| Milestone | Gate rule | What happens when a finding is over the rule | +|---|---|---| +| M1 | Baseline controls (§3) must pass. CVE findings are **reported**; allow-list is created. | Install continues. Report shows the count. | +| M2 | Baseline must pass. Allow-list count ≤ M1 count. | Install continues. Scan exits 50 only if the count grew or a baseline control failed. | +| M3 | Baseline must pass. Allow-list count ≤ M2 count. | Same as M2. | +| M4 | **Fail on any HIGH or CRITICAL** not in the allow-list. First AI red team run (§6) must be completed and every found path fixed or allow-listed. | `grdm-dev install` stops before starting services; exit 50. | +| M5 | **Fail on any CRITICAL or HIGH, allow-list for CRITICAL/HIGH must be empty.** AI red team must report **zero unresolved intrusion paths.** | Exit 50; the environment is not distributable until fixed. | +| Steady state | Same as M5. Daily scan; a new HIGH opens a fix PR automatically (ADR-04). | Exit 50 in CI; owner is notified. | + +The current milestone is read from `manifest/milestone.json`; only the owner changes it. + +### 6. AI red team + +An *AI red team* is a group of AI agents that is told to attack our own test system, in a sealed box, so that we find our weaknesses before a real attacker does. It is defensive, authorized testing of our own isolated environment only. + +Rules, all mandatory: + +1. **Isolation.** The red team runs inside a dedicated Compose project on a Docker network with `internal: true` and no egress (no route to the internet or the LAN). `manifest/redteam-targets.json` names the project, the network, the attacker container (`attacker`) and the targets. `grdm-dev redteam preflight` proves isolation instead of inferring it: it starts a canary container on a separate ordinary network, checks that the canary is reachable from its own network (otherwise the probe is inconclusive and the preflight fails), then, inside the attacker container, first self-tests the probe tool against a listener it starts itself (an open port must connect and a closed port must be refused, otherwise the tool is unreliable and the result is inconclusive) and only then checks that neither the canary nor an external address is reachable; a connection error counts as blocked, any other tool error counts as inconclusive, and inconclusive fails the preflight. The attacker must be attached to exactly one network. The approval record (`docs/demo/<date>_redteam_<run>.md`) must carry a header with `approved_by`, `approved_on` (an ISO date, not in the future and at most 30 days old), `scope` (the target container names) and `run_id`; a missing or stale record, or a target outside the scope, fails the preflight. `grdm-dev redteam preflight` verifies that no external address is reachable from the attacker container before any test starts. +2. **Target list.** The targets are exactly our own containers in that isolated project, listed by name in `manifest/redteam-targets.json`. Nothing else is ever a target: not the developer's machine, not other containers, not any address outside the project. +3. **Approval record.** Before each run, a record is written to `docs/demo/` as `nn_redteam_<date>.md` with: who approved (owner), when, scope (target list and commit SHAs), the model and runner used, and the stop conditions. No record, no run. +4. **Findings to fixes.** Every intrusion path found becomes an issue, then a fix PR through the normal flow (AID fix → REV review → QAE regression → owner merge), then a retest with the same scenario. A path is "resolved" only when the retest fails to reproduce it. +5. **Never outside.** Techniques learned here are for finding our own weaknesses. Running them against any system outside the isolated project, including production GRDM or upstream services, is forbidden. +6. **No secrets in findings.** Findings quote the weakness, not the harvested secret. If a secret was captured, the finding says "credential obtained" and the secret is rotated by `grdm-dev secrets rotate`. + +```mermaid +sequenceDiagram + participant O as Owner + participant Q as QAE (Claude Code Fable) + participant R as Red team agents + participant T as Isolated targets + O->>Q: approval record in docs/demo/ + Q->>R: preflight: no egress, target list only + R->>T: probe, exploit attempts + R-->>Q: findings (no secrets) + Q->>Q: open issues, request fix PRs (ADR-04) + Q->>R: retest after merge + R-->>O: zero unresolved paths → M5 gate passes +``` + +### 7. Evidence format + +Every scan writes `runtime/reports/scan_<date>.json` (canonical, [SPEC-02 §3](02_installer_cli.md#english)) and the TOON excerpt below into `docs/status/security_<milestone>.md`. The report **must not contain any secret** (§3.1). Fields: + +```toon +scan: + date: 2026-11-20T09:12:00Z + milestone: M2 + commit: 1a2b3c4d + host: macos-arm64 + baseline: pass + tools[4]{name,version,result}: + trivy,0.68.0,ok + grype,0.98.0,ok + semgrep,1.140.0,ok + zap,2.17.0,ok + findings_total: 212 + findings_by_severity{critical,high,medium,low}: 9,48,120,35 + allowlisted: 3 + allowlist_baseline: 3 + over_threshold: 0 + gate: pass + exit_code: 0 +``` + +### 8. Exit codes + +Exit codes are defined in [SPEC-02 §6](02_installer_cli.md#english); this table explains the ones `scan` and `redteam preflight` return: + +| Code | Meaning | +|---|---| +| 0 | Gate passed (or, at M1–M3, report written and count did not grow). | +| 50 | **Gate failed**: baseline control violated, allow-list invalid or grew, finding over the milestone threshold, or red team unresolved at M5. | +| 51 | Scanner could not run (tool missing, database download failed). Not a pass. | +| 52 | `scan --dynamic` was requested while services were not healthy. The static part of the report is still written. A full `scan` does not return 52; it skips the dynamic part and notes it. | +| 53 | `redteam preflight` failed: an external address was reachable from the attacker container, or a target outside `manifest/redteam-targets.json` was reachable. No red-team run starts. | + +### 9. Checks + +- `python3 -m unittest discover -s installer/tests` covers: secret file mode, default-password detection, listening-address check, allow-list field validation, count comparison, severity mapping, and secret masking in reports. +- CI workflow `security.yml` runs gitleaks, Semgrep, and Trivy on every PR; at M1 Trivy is report-only over the repository file system because no image exists yet (§4.1). The arm64 (one of the two kinds of computer chip we support, the one in recent Macs; see [REF-01](../reference/REF-01_Glossary.md)) self-hosted runner runs the full `grdm-dev scan` nightly on `develop` once the installer exists (M2). + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 範囲 + +この仕様は、GRDM 開発環境 2027 版の「セキュリティの門」(導入が合格と呼ばれる前に必ず通る検問所)を定めます。守るもの、節目 M1 から適用する基本対策、スキャナー、許容リスト(見た上で今は受け入れる、既知の問題の短い一覧。[REF-01](../reference/REF-01_Glossary.md))、M5 までの段階的な基準、AI レッドチーム、証跡の形式、終了コードを扱います。最初からゼロを求めず段階化する決定は [ADR-03](../decisions/ADR-03_Staged_Security_Gate.md) に、誰が修正・レビュー・マージするかは [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) にあります。 + +**用語注。** 「脆弱性」は、プログラムの中の、誰かが侵入に使えると分かっている弱い所です。「CVE」(Common Vulnerabilities and Exposures)は、一つの脆弱性に付く公開の番号で、`CVE-2026-12345` のように書きます。「深刻度」はどれほど危ないかで、CRITICAL・HIGH・MEDIUM・LOW の四段階です。「節目」(M1〜M5)は計画の五つの段階で、[POL-01](../policy/POL-01_Developer_Environment_2027_Position.md) に定義があります。 + +### 2. 脅威モデル + +「脅威モデル」は、何を守るか、誰が壊そうとすると想定するかを短く書いた一覧です。§3 の各対策は、この表のどれか一行に必ず答えます。 + +守るもの: + +| 資産 | 大事な理由 | +|---|---| +| 開発者のパソコン | 開発者自身のファイル、ブラウザのログイン、SSH の鍵がある。コンテナから抜け出されると届く。 | +| 資格情報 | データベースのパスワード、セッション鍵、OAuth のクライアント秘密、上流リポジトリをミラーする GitHub トークン。 | +| `-private` のコード | コア 6 本のセキュリティ検証版は RCOSDP 内限定。非公開の `-dev2027` から出さず、この公開リポジトリにも置かない。 | +| 門そのものの正しさ | 攻撃者がスキャン報告や許容リストを書き換えられるなら、ほかの対策は意味を失う。 | + +想定する攻撃者: + +| 攻撃者 | できること | 主な対策 | +|---|---|---| +| 同じ LAN(職場の Wi-Fi、家のルーター)にいる誰か | 開発者が公開したままのポートを開く。既定のパスワードを当てる。 | §3.2 `127.0.0.1` のみ公開、§3.1 乱数の秘密 | +| 悪意ある依存ライブラリ(`pip` や `npm` が取ってくる部品) | ビルド時や起動時にコードを動かす。環境変数を読む。外へ通信する。 | §3.4 ダイジェスト固定、§4 SBOM+CVE、§4.4 更新ボット、§3.2 内部ネットワーク | +| 乗っ取られたコンテナ(すでに侵入された一つのサービス) | ほかのサービスへ届く。ホストに書く。ホストの資源を使う。 | §3.3 非 root・読み取り専用・privileged 禁止・資源制限、§3.2 内部ネットワーク | +| 稼働中のシステムを探る、最上位の敵対的 AI エージェント | 小さな弱点を素早くつなげる。SBOM の全 CVE に公開の攻撃コードを試す。弱い既定値を総当たりする。 | §5 段階的な門で CRITICAL/HIGH ゼロへ、§6 同じ能力を先に味方として使う AI レッドチーム | + +範囲外: 開発者の OS 自体への攻撃、開発者をだます手口、本番 GRDM サービス。これらは運用機関の責任で、開発環境の責任ではありません。 + +### 3. 基本対策(M1 から全導入に適用) + +次の対策は交渉の余地がなく、許容リストもありません。`grdm-dev health --network` と `grdm-dev scan --baseline` が確認し、一つでも外れると M1 でも終了コード 50 です。 + +#### 3.1 秘密 + +- すべての秘密(システムだけが知っていてよいパスワードや鍵)は、導入時に `grdm-dev secrets init` が OS の乱数源から生成する。 +- 秘密は `runtime/.env`([SPEC-02 §3](02_installer_cli.md#japanese))に、ファイルモード `0600`(所有者だけが読み書きできる)で書く。`runtime/` は `.gitignore` に載せ、§3.5 の秘密スキャンがこのファイルがコミットに入らないことを確かめる。 +- 既定のパスワードを使わない。上流(写しの元のリポジトリ。[REF-01](../reference/REF-01_Glossary.md))の `docker-compose.yml` には `postgres`/`postgres` や `changeme` のような値が残っているが、インストーラーがすべて置き換え、残っていれば失敗する。 +- 報告とログに秘密を書かない。`grdm-dev report` は書き出す前に `runtime/.env` の値と一致する文字列を伏せ字にする。 + +#### 3.2 ネットワーク + +- サービス同士は Compose ネットワーク `grdm` だけで通信する。`grdm` は `internal: true` で宣言し(Docker の中だけにある私設の仮想ネットワークで、ホストのインターフェース・LAN・インターネットへの経路を持たない)、侵入されたコンテナ(一つのプログラムと必要なものを一箱に入れ、どこでも同じように動かす箱。[REF-01](../reference/REF-01_Glossary.md))もここからは外へ通信できない。詳しくは [ADR-02](../decisions/ADR-02_Network_Model.md)。 +- Docker は内部ネットワークからポートを公開できないため、ブラウザが届く必要のあるサービス(`web`、`api`、`admin`、`wb`、`mfr`、`fakecas`、`ember_osf_web`)は、もう一つの通常の bridge ネットワーク `grdm-edge` にも接続する。公開はそこから `127.0.0.1` のみに行い、既定ではほかのサービスは接続しない。 +- したがって、それ以外のサービスには外向き通信(egress。インターネットへ出る通信)がない。必要な開発者(例: アドオン開発で外部ストレージへ接続する)は `grdm-dev compose render --egress <service>[,<service>...]` で名指ししたサービスを `grdm-edge` に接続する。選択は `runtime/.env` の `GRDM_EGRESS_SERVICES` に記録され、compose と install の報告に表示され、`grdm-dev scan --baseline` が読む。`--egress none` で解除する。この方法で与えた egress は記録された開発者の選択であり基本対策違反ではない。宣言なしに `grdm-edge` にいるサービスは違反(`BASE-NETWORK`)であり、許可に名前があるのに実際には接続していないサービスも所見(`BASE-EGRESS-STALE`)とする。記録と動いている構成は一致していなければならない。 +- `grdm-dev health --network` はプロジェクト自身の公開(`docker compose ps`、`docker inspect`)とホストの待ち受けソケットを列挙し、`127.0.0.1` 以外のアドレスが一つでもあれば失敗する。所有プロセスが見えないプロジェクトポート上の待ち受けも失敗とする。 +- ブラウザが必要とするポートは `127.0.0.1` だけに公開する。既定のポートの一覧(`5000` web、`8000` api、`8001` admin、`7777` wb、`7778` mfr、`8080` fakecas、`4200` ember)は [SPEC-02 §4](02_installer_cli.md#2-ja-ports) のポート表にある。`0.0.0.0` や LAN のアドレスには公開しない。旧来のループバック別名 `192.168.168.167` は廃止。 +- `grdm-dev health --network` は Compose プロジェクトの待ち受けソケットを列挙し、`127.0.0.1` 以外があれば失敗にする。 + +#### 3.3 コンテナの堅牢化 + +- 全サービスを非 root ユーザーで動かす。上流イメージ(コンテナの元になるレシピと材料。[REF-01](../reference/REF-01_Glossary.md))が root で動く場合、生成する Compose に固定の UID/GID を `user:` で指定し、書き込みが必要な少数のパスにはインストーラーがボリュームを用意する。 +- **限定された堅牢化の例外。** サービスが非 root・読み取り専用・`cap_drop: ALL` の基準から外れてよいのは、`manifest/hardening.json` の項目を通じてだけである。項目には緩める統制(`user`・`read_only`・正確な capability を挙げた `cap_add`)、上流イメージに結び付いた理由、見直し日、例外を除く近代化の節目を書く。`compose render` はそこに記録の無いものを一切適用しない。`scan --baseline` は適用した全項目を `baseline_exceptions` として報告し、項目の無い root 実行・書込可能なルート・追加 capability、見直し日を過ぎた項目、そしてどの場合でも `privileged` や `no-new-privileges` の無効化があれば不合格にする。これらの項目は CVE の許容リスト(§5)とは別物で、EOL イメージをどう起動しなければならないかを記すものであり、許容する脆弱性ではない。件数は各節目の出口で報告し、M3 以降は増やしてはならない。M4 で Python 3.5/3.6 と JDK 8 のイメージに結び付くものを、M5 で残りを取り除く(PR #33 レビュー r1 R1-03)。現在の項目: postgres・mongo・rabbitmq・shibboleth_sp・test_idp と、一回限りの汎用の所有者設定 volume_owner_init(elasticsearch・elasticsearch6・cas のサービスはネイティブイメージになり項目が消えた。ADR-07)。 +- ルートファイルシステムは、サービスが耐えられる限り読み取り専用(`read_only: true`)にし、書き込み先は明示的な `tmpfs` か名前付きボリュームにする。例外はサービスごとに `manifest/hardening.json` へ理由付きで記す。 +- `privileged: true` は禁止。`cap_drop: [ALL]` を既定にし、必要な権限だけを名前と理由を書いて戻す。 +- 全サービスに `mem_limit`、`cpus`、`pids_limit` を付ける。`grdm-dev compose render`([SPEC-02 §3](02_installer_cli.md#japanese))が、`doctor` が検出したメモリに応じて値を決めて書く。 + +#### 3.4 サプライチェーン + +- イメージは「ダイジェスト」(一つのイメージ版の正確な指紋。`sha256:...`)で取得し、`latest` のような動くタグは使わない。各ベースイメージのダイジェストは `manifest/upstreams.json` の `base_image_digest` 項目で、Git の SHA と並べて置く([SPEC-01 §3](01_manifest.md#japanese))。イメージを固定するまで(遅くとも M2)は `null`。 +- ローカルでビルドしたイメージにはベースイメージのダイジェストをラベルに記録し、`grdm-dev scan` がどのベースから作られたか分かるようにする。 + +#### 3.5 CI での秘密スキャン + +このリポジトリは公開のため、すべての PR(プルリクエスト。誰かが見て受け入れるのを待っている変更の提案。[REF-01](../reference/REF-01_Glossary.md))と `develop` への push で、CI(continuous integration。変更ごとに自動で走る検査。[REF-01](../reference/REF-01_Glossary.md))の中で秘密スキャナー(`gitleaks` か同等品。差分と履歴の中の秘密鍵・トークン・パスワードを検出する)を動かす。一件の検出でワークフローは失敗する。同じスキャナーをローカルでは `grdm-dev scan --secrets` が動かす。誤検出は `.gitleaks.toml` のルールに理由を書いて抑え、報告から消して対処しない。 + +### 4. スキャン + +`grdm-dev scan` は四種類のスキャナーを動かし、一つの報告にまとめます。スキャナーは、Compose プロジェクトの中で Compose のサービス名で相手に届くか(ZAP。§4.3)、ホスト上で `127.0.0.1` のポートを調べるか(ネットワークの基本対策の確認。§3.2)のどちらかで動き、脆弱性データベースの取得以外で外部のサービスへデータを送りません。 + +#### 4.1 SBOM と CVE: Trivy(必須)、Grype(任意の第二意見) + +- 「SBOM」(ソフトウェア部品表。イメージやプロジェクトの中にあるライブラリの完全な一覧)を、Compose プロジェクトの全イメージと、統合リポジトリの全ロックファイル(`requirements*.txt`、`poetry.lock`、`package-lock.json`、`yarn.lock`、`build.gradle`)について Trivy が作る。 ソースの検査は `--offline-scan` で行う(遠隔の Maven への問い合わせをしない。実機第 17 回で Maven Central が 429 を返しホストを遮断した)。`runtime/src/_overlay/` に組み立てたオーバーレイの文脈と、いまは `prebuilt_image` を使う部品の古い checkout は注記つきで飛ばし、リポジトリの検査は `runtime/`・`.venv/`・`site/` を除く。 +- Trivy は SBOM を CVE データベースと照合する。出力は JSON(正本)と、報告内の TOON(JSON を短く書いた文字の形。[REF-01](../reference/REF-01_Glossary.md))抄録。 +- Grype は同じ SBOM に対し第二意見として動かしてよい。Grype の検出は参考情報で、所有者が許容リストの手続きに乗せるまで門の結果を変えない。 +- **M1 の範囲。** M1 ではイメージがまだ存在しない(`grdm-dev build` は M2 から)ので、`security.yml` の Trivy ジョブはリポジトリのファイルシステムだけを報告のみの方式で検査する。検出はジョブのログに書き、PR を不合格にはしない。統合リポジトリのイメージとロックファイルの検査は最初のビルドから始める。 +- **1 回の制限。** Trivy は既定で 1 回の呼び出しを 5 分で止める。エミュレーション下の非常に大きなイメージはこれを超え得て、SBOM か走査が終わらず `scan` は終了 51 になる。`grdm-dev scan --trivy-timeout 30m`(整数に `s`・`m`・`h` のどれか、最大 `24h`)は、その長さを Trivy の `--timeout` として SBOM と走査のすべての呼び出しに渡す。長い制限は、何が検出で、何が許可リストの項目で、何が合格かを変えない。それでも終わらない実行は未完のまま(終了 51)である。 + +#### 4.2 静的解析: Semgrep と CodeQL + +「静的解析」はソースコードを動かさずに読み、危ない書き方(たとえば利用者の入力文字から SQL を組み立てる)を見つけます。Semgrep(ソースコードを読んで危ない書き方を探す道具。[REF-01](../reference/REF-01_Glossary.md))はローカルと CI で全 PR に対し `p/default`、`p/python`、`p/javascript`、`p/docker-compose` のルール集で動かします。CodeQL は非公開の `-dev2027` リポジトリの `develop` で毎晩動かします。深刻度 ERROR は門では HIGH、WARNING は MEDIUM として数えます。 Semgrep はルール・ファイルごとに 30 秒のタイムアウトで動く(3 回超えたファイルは落とす)。ルールのタイムアウトは*網羅性の穴*である。M1〜M3(報告のみ・件数非増加)では `scan` が道具の行の警告として記録し、得られた検出で判定する。M4・M5(fail-high・zero)では終わらなかったルールは「きれい」を立証できないので、空いたホストで、または長い `--timeout` で検査をやり直すまで不完全(終了 51)とする(実機第 20 回、PR #33 レビュー r2)。 + +#### 4.3 動的スキャン: OWASP ZAP ベースライン + +「動的スキャン」は、動いている Web アプリをブラウザのように突いて調べます。`grdm-dev scan --dynamic` は Compose の内部ネットワークにつないだコンテナで OWASP ZAP(動いている Web サイトを攻撃者のやり方でつつく道具。[REF-01](../reference/REF-01_Glossary.md))を起動し([ADR-02 §3](../decisions/ADR-02_Network_Model.md#japanese))、Compose のサービス名とコンテナ側ポート、すなわち `http://web:5000`(web)、`http://admin:8001`(admin)、`http://ember_osf_web:4200`(ember)に対してベースラインスキャンを行います。`127.0.0.1` を対象にすることはありません。ZAP のコンテナの中では、ループバックはサービスでもホストでもなく ZAP 自身だからです。コンテナ側ポートはサービスがネットワークの中で待ち受けるポートで、番号は [SPEC-02 §4](02_installer_cli.md#2-ja-ports) のポート表の既定のホスト側ポートと同じですが、その表が定めるのは「ホスト側」のポートで、ブラウザ・受入試験・`grdm-dev health --network` が使います。`compose render` が衝突でホスト側ポートを付け替えて `runtime/.env` に `GRDM_PORT_<SERVICE>` として記録したとき([SPEC-02 §4](02_installer_cli.md#2-ja-ports))、ホスト側の確認はそこから新しい番号を読み、ZAP の対象は変わりません。ZAP のリスク High は HIGH、Medium は MEDIUM に対応させます。**確認できたサインインの壁は、検査でも失敗でもなく、対象外の網羅として記録します。** 必須サインイン(`ENABLE_PUBLIC_ACCESS=false`、既定。[SPEC-02 §3](02_installer_cli.md#japanese))では、`web` は匿名の要求すべてに、fakecas の、ブラウザ向けのループバック URL にあるサインインのページへの 302 を返す。ZAP のコンテナはそのアドレスを開けないので、`zap-baseline.py` は「Job spider failed to access URL … Connect to <アドレス> failed」で終わり、報告を書かない(統合候補で実測)。接続の失敗だけでは証拠にならない。無関係なホストへの壊れた転送、止まったサービス、アドレスの別表記も同じに見えるからである。そこで `scan` は、次のすべてが成り立つときだけ除外する。対象が `web` であること、`runtime/config/osf.env` が `ENABLE_PUBLIC_ACCESS=false` を示し `runtime/.env` の `GRDM_ENABLE_PUBLIC_ACCESS` がそれと食い違わないこと、ZAP のメッセージがこの種 URL と `osf.env` の `CAS_SERVER_URL` のホストとポートそのものを示すこと、そしてスキャン自身が検査用ネットワークから ZAP のイメージの中で、転送を追わずにその種 URL へ出した要求が、`Location` がそのアドレスそのものである 3xx で返ること。このとき tool の行は対象を `skipped_targets` に載せ、`targets` には数えず、`ok (N scanned, M skipped behind sign-in: …)` と書き、`notes` に「ZAP NOT RUN on web … no page behind sign-in was scanned」と記す。それ以外(別のホストや別表記、別のサービス、公開アクセス、生成済みの `osf.env` が無い、転送が無いか別の場所、動かせない探り)は未完のまま(終了 51)。サインインのアドレスが `CAS_SERVER_URL` でない Shibboleth のプロファイルは免除されず、運用者が判断する。飛ばしたサービスは ZAP でなく、受入の拒否のケース、Trivy、Semgrep が受け持ち、注はそう書く。`ok` で対象外が付いた結果を「ZAP が全対象を検査した」と読んではならない。`grdm-dev health` が全サービス健全と報告した後にだけ動かします。`grdm-dev scan` 全体では動的部分を省略して報告に記し、`scan --dynamic` を明示したときは終了 52 で終わります。ZAP は自分の uid で動くので、対象ごとに誰でも書ける作業ディレクトリを、`runtime/reports/` の下に予測できない名前で排他的に作り、報告を写した後に消します。これを許すのは、`runtime/` が利用者の所有の実ディレクトリでモード 0700、`reports/` が利用者の所有の実ディレクトリである間だけです。そうでなければ ZAP を動かさず、動的部分は不完全(終了 51)とします。通常のファイルでない報告(シンボリックリンクや FIFO など)は拒みます。報告ファイルは `O_NOFOLLOW` と `O_NONBLOCK` で開き、読み書きの前に記述子の型を確かめます。確認は実行前の一度だけで、その間に利用者のチェックアウトと祖先を他人が変えないことを前提とし、所有者自身の変更に対して競合に強いとは主張しません。 + +#### 4.4 依存更新ボット + +非公開の `-dev2027` リポジトリでは Dependabot(または Renovate)を Python・npm・Gradle・Docker ベースイメージに対して有効にし、週ごとにまとめます。ボットが PR を開き、その PR は [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md) の通常の流れに入ります。必要なら AID(AI開発担当者)がコードを合わせ、REV(担当レビュワ)がレビューし、QAE(QA担当)が回帰を実行し、所有者がマージします。 + +#### 4.5 `grdm-dev scan` の流れ + +```mermaid +flowchart TD + A[grdm-dev scan] --> B{基本対策<br/>秘密 0600・127.0.0.1 のみ<br/>非 root・privileged なし} + B -- 一つでも不合格 --> X[終了 50: 門で停止] + B -- 合格 --> C[Trivy: イメージとロックファイルの SBOM] + C --> D[Trivy: CVE 照合] + C --> E[Grype 第二意見<br/>任意・参考] + D --> F[Semgrep 静的解析] + F --> G{サービスは健全?} + G -- はい --> H["OWASP ZAP ベースライン<br/>web・admin・ember_osf_web へサービス名で"] + G -- いいえ --> I[動的を省略し報告に記す] + H --> J[検出を統合] + I --> J + E --> J + J --> K[allowlist.json を適用<br/>期限切れは除外] + K --> L{現在の節目の基準と比較 §5} + L -- 基準内 --> M[報告 TOON+JSON を書く<br/>終了 0] + L -- 基準超え --> N[報告を書く<br/>終了 50] +``` + +### 5. 許容リストと段階的な門 + +#### 5.1 許容リスト + +「許容リスト」は、知っていて、判断済みで、期限付きで受け入れる検出を書いた一覧です。正本は `manifest/allowlist.json`。`docs/status/` の TOON 抄録は `grdm-dev scan` が再生成し、`grdm-dev manifest check` が一致を確かめます([SPEC-06 §4](06_documentation_conventions.md))。 + +決まり: + +1. 各項目は六つの欄をすべて持つ: `cve`、`component`、`reason`、`owner`、`expires`、`added_at`。欄が欠けた項目は無効で、スキャンは終了コード 50 で失敗する。`component` は正確なパッケージ(`name` または `name@version`)を名指す。ワイルドカード(`*`)や空の値は無効。任意の欄は三つある: `severity`、タグを除いたイメージ名の `image`(例: `grdm-dev/waterbutler`)、正確な `name@version` の一覧の `packages`。`image` を持つ項目には `packages` が必須で、`component` はその先頭とする。空の `image` や `packages` は欄の欠けと同じく無効。項目が検出に当てはまるのは、次のすべてを満たすときだけ: + - 同じ ID(CVE)であること。 + - Trivy の脆弱性の場合、Trivy が修正版なしと報告していること。つまり `FixedVersion` が空で、`Status` が `affected`・`will_not_fix`・`fix_deferred`・`end_of_life` のいずれか。後から修正版が出た検出や状態が不明な検出は、項目を書き換えなくても再び数えられる。 + - `image` がある場合、検出がちょうどそのイメージの OS パッケージ(Trivy の分類 `os-pkgs`、対象 `<image>:<tag> (<os>)` または `<image>@<digest>`)であること。言語のパッケージや、名前が似た別のイメージには当てはまらない。あるイメージで修正版の無いパッケージが、別のイメージの同じ CVE を隠さないためである。 + - パッケージ名が、項目の名指す名前(`packages`、無ければ `component`)と前方一致でなく全体で等しいこと。項目に版があれば、導入済みの版と等しいこと。 +2. `reason` には、ここでは悪用できない理由か、まだ直せない理由を書く(例:「開発プロファイルでは到達しないコード経路」「修正には M4 予定の Python 3.13 移植が必要」)。 +3. `owner` は人か、[役割表](../decisions/ADR-04_AI_Autonomy_and_Roles.md) の役割。「チーム」とは書かない。 +4. `expires` は次の節目の開始日以前の日付。期限が切れた項目は無視され、その検出は再び数えられる。 +5. **項目数は節目をまたいで増えてはならない。** `grdm-dev scan` は `manifest/allowlist.baseline.json`(各節目の終了時に所有者が更新する)と件数を比べ、増えていれば失敗にする。 +6. 追加を承認できるのは所有者だけ。AID は PR で項目を提案でき、REV と QAE が確認し、所有者がマージする。 + +```toon +allowlist: + milestone: M2 + baseline_count: 3 + entries[3]{cve,component,severity,reason,owner,expires,added_at}: + CVE-2021-3177,python:3.6-base,HIGH,"サポート終了の処理系。M4 の Python 3.13 移植で除去",AID,2027-03-31,2026-11-20 + CVE-2022-24785,moment@2.24,HIGH,"ember の開発ビルドのみ。開発プロファイルではブラウザへ配信しない",AID,2027-01-31,2026-11-20 + CVE-2020-8265,node:12-base,CRITICAL,"サポート終了の実行環境。M4 で node 20 イメージへ置換",AID,2027-03-31,2026-11-20 +``` + +> **Note:** 上の TOON は形の例です。実際の内容は `manifest/allowlist.json` にあり、`grdm-dev scan` が `docs/status/` へ再生成します。 + +#### 5.2 段階的な門 + +| 節目 | 門の決まり | 基準を超えたときの動き | +|---|---|---| +| M1 | 基本対策(§3)は合格必須。CVE の検出は**報告のみ**。許容リストを作る。 | 導入は続く。報告に件数を示す。 | +| M2 | 基本対策は合格必須。許容リスト件数 ≤ M1 の件数。 | 導入は続く。件数が増えたか基本対策が外れたときだけ終了 50。 | +| M3 | 基本対策は合格必須。許容リスト件数 ≤ M2 の件数。 | M2 と同じ。 | +| M4 | **許容リストにない HIGH・CRITICAL が一件でもあれば不合格。** 初回の AI レッドチーム(§6)を完了し、見つかった経路はすべて修正か許容リスト登録。 | `grdm-dev install` はサービス起動前に止まる。終了 50。 | +| M5 | **CRITICAL・HIGH が一件でもあれば不合格。CRITICAL/HIGH の許容リストは空でなければならない。** AI レッドチームが**未解決の侵入経路ゼロ**を報告すること。 | 終了 50。直すまで配布可能な状態にならない。 | +| 恒常 | M5 と同じ。日次スキャン。新しい HIGH は自動で修正 PR を開く(ADR-04)。 | CI で終了 50。所有者に通知。 | + +現在の節目は `manifest/milestone.json` から読み、変更できるのは所有者だけです。 + +### 6. AI レッドチーム + +「AI レッドチーム」は、密閉した箱の中で自分たちの試験システムを攻撃するよう指示された AI エージェントの集まりで、本物の攻撃者より先に自分たちの弱点を見つけるためのものです。守るための、承認された、自分たちの隔離環境だけに対する試験です。 + +決まり(すべて必須): + +1. **隔離。** レッドチームは専用の Compose プロジェクトの中、`internal: true` で外向き通信のない(インターネットにも LAN にも経路がない)Docker ネットワークで動かす。`manifest/redteam-targets.json` にプロジェクト、ネットワーク、攻撃側コンテナ(`attacker`)、対象を記す。`grdm-dev redteam preflight` は隔離を推測ではなく証明する。別の通常ネットワークにカナリア(見張り役)のコンテナを起動し、まずカナリアが自分のネットワークから届くことを確かめ(届かなければ検査自体が不確かなので不合格)、次に攻撃側コンテナの中で、まず自分で起こした聴取口に対して探査の道具を自己試験し(開いた口には接続でき、閉じた口は拒否されること。どちらかが外れれば道具は信用できず結果は「不確か」)、そのうえでカナリアにも外部アドレスにも届かないことを確かめる。接続の失敗は「遮断」、それ以外の道具の異常は「不確か」と数え、不確かなら事前確認は不合格。攻撃側はちょうど一つのネットワークにだけ接続していなければならない。承認記録(`docs/demo/<日付>_redteam_<実行>.md`)には `approved_by`、`approved_on`(ISO 日付。未来でなく 30 日以内)、`scope`(対象コンテナ名)、`run_id` のヘッダが必須で、記録がない・古い・scope 外の対象がある場合は不合格。試験の前に `grdm-dev redteam preflight` が、攻撃側コンテナから外部アドレスへ届かないことを確かめる。 +2. **対象一覧。** 対象は、その隔離プロジェクト内の自分たちのコンテナだけで、`manifest/redteam-targets.json` に名前で列挙する。開発者のパソコン、ほかのコンテナ、プロジェクト外のアドレスは決して対象にしない。 +3. **承認記録。** 各回の前に `docs/demo/` へ `nn_redteam_<日付>.md` を書く。内容は、誰が承認したか(所有者)、いつ、範囲(対象一覧とコミット SHA)、使うモデルと実行基盤、停止条件。記録がなければ実施しない。 +4. **検出から修正へ。** 見つかった侵入経路はすべて issue にし、通常の流れ(AID 修正 → REV レビュー → QAE 回帰 → 所有者マージ)で修正 PR にし、同じシナリオで再試験する。再試験で再現しなくなったときだけ「解決」とする。 +5. **外へは決して向けない。** ここで得た手法は自分たちの弱点を見つけるためのもの。本番 GRDM や上流サービスを含め、隔離プロジェクト外のどのシステムにも使ってはならない。 +6. **検出に秘密を書かない。** 検出は弱点を書き、取得した秘密そのものは書かない。秘密を取得できた場合は「資格情報を取得」と記し、`grdm-dev secrets rotate` で秘密を更新する。 + +```mermaid +sequenceDiagram + participant O as 所有者 + participant Q as QAE(Claude Code Fable) + participant R as レッドチームのエージェント + participant T as 隔離された対象 + O->>Q: docs/demo/ に承認記録 + Q->>R: 事前確認: 外向き通信なし、対象一覧のみ + R->>T: 探索・侵入の試み + R-->>Q: 検出(秘密を含まない) + Q->>Q: issue 起票、修正 PR を依頼(ADR-04) + Q->>R: マージ後に再試験 + R-->>O: 未解決の経路ゼロ → M5 の門を通過 +``` + +### 7. 証跡の形式 + +各スキャンは `runtime/reports/scan_<日付>.json`(正本。[SPEC-02 §3](02_installer_cli.md#japanese))と、次の TOON 抄録を `docs/status/security_<節目>.md` に書きます。報告には**秘密を一切含めません**(§3.1)。欄: + +```toon +scan: + date: 2026-11-20T09:12:00Z + milestone: M2 + commit: 1a2b3c4d + host: macos-arm64 + baseline: pass + tools[4]{name,version,result}: + trivy,0.68.0,ok + grype,0.98.0,ok + semgrep,1.140.0,ok + zap,2.17.0,ok + findings_total: 212 + findings_by_severity{critical,high,medium,low}: 9,48,120,35 + allowlisted: 3 + allowlist_baseline: 3 + over_threshold: 0 + gate: pass + exit_code: 0 +``` + +### 8. 終了コード + +終了コードは [SPEC-02 §6](02_installer_cli.md#japanese) で定めます。この表は `scan` と `redteam preflight` が返すものを説明します。 + +| コード | 意味 | +|---|---| +| 0 | 門を通過(M1〜M3 では、報告を書き、件数が増えていない)。 | +| 50 | **門で停止**: 基本対策の違反、許容リストの不備または増加、節目の基準を超える検出、M5 でレッドチーム未解決。 | +| 51 | スキャナーが動かなかった(道具がない、データベース取得失敗)。合格ではない。 | +| 52 | サービスが健全でないのに `scan --dynamic` を求めた。静的部分の報告は書く。`scan` 全体では 52 を返さず、動的部分を省略して報告に記す。 | +| 53 | `redteam preflight` に失敗。攻撃側コンテナから外部アドレスへ届く、または `manifest/redteam-targets.json` 外の対象へ届く。レッドチームは開始しない。 | + +### 9. 検査 + +- `python3 -m unittest discover -s installer/tests` が、秘密ファイルのモード、既定パスワードの検出、待ち受けアドレスの確認、許容リストの欄の検証、件数比較、深刻度の対応、報告での秘密の伏せ字を検査する。 +- CI の `security.yml` は全 PR で gitleaks・Semgrep・Trivy を動かす。M1 ではイメージがまだないため、Trivy はリポジトリのファイルシステムに対する報告のみ(§4.1)。arm64(対応する二種類のチップのうち、最近の Mac に使われている方。[REF-01](../reference/REF-01_Glossary.md))のセルフホストランナーは、インストーラーができてから(M2)`develop` で毎晩 `grdm-dev scan` の全体を動かす。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Security gate | A checkpoint an install must pass before it is called good. | 導入が合格と呼ばれる前に必ず通る検問所。 | +| Vulnerability | A known weak spot that someone could use to break in. | 侵入に使えると分かっている弱い所。 | +| CVE | The public ID number of one vulnerability. | 一つの脆弱性に付く公開の番号。 | +| SBOM | The complete list of every library inside an image or project. | イメージやプロジェクトに入っている部品の完全な一覧。 | +| Allow-list | Findings we know, judged, and accept for a limited time. | 知っていて、判断済みで、期限付きで受け入れる検出の一覧。 | +| Digest | The exact fingerprint of one image version. | 一つのイメージ版の正確な指紋。 | +| Internal network | A private network inside Docker that the outside cannot reach. | Docker の中だけにあり、外から届かないネットワーク。 | +| Static analysis | Reading code without running it to find dangerous patterns. | コードを動かさずに読み、危ない書き方を見つけること。 | +| Dynamic scan | Poking the running application like a browser would. | 動いているアプリをブラウザのように突いて調べること。 | +| AI red team | AI agents told to attack our own sealed test system so we find weaknesses first. | 密閉した自分たちの試験システムを攻撃させ、弱点を先に見つける AI エージェント。 | +| Egress | Traffic leaving a network toward the outside. | ネットワークから外へ出ていく通信。 | diff --git a/docs/spec/04_acceptance_tests.md b/docs/spec/04_acceptance_tests.md new file mode 100644 index 0000000..fc20c2d --- /dev/null +++ b/docs/spec/04_acceptance_tests.md @@ -0,0 +1,288 @@ +# SPEC-04 Acceptance Tests / 受入試験 + +> **Summary:** How we prove that an installed GakuNin RDM developer environment really works: the three test tiers, the browser scenarios for the core and each subsystem, test data, evidence, and the pass criteria for each milestone. +> **概要:** 導入した GakuNin RDM 開発環境が本当に動くことを示す方法。三つの試験の段、コアと各サブシステムのブラウザシナリオ、試験データ、証跡、節目ごとの合格基準を定める。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.12 — 2026-11-14. **Learned:** masking secrets was not enough to make evidence publishable: every committed junit.xml carried the machine's name in its `hostname` attribute, and failures and skips carried the absolute checkout path, which on a personal machine names its owner; `accept` now replaces both before anything is kept, and the run folders already committed were scrubbed the same way (PR #62 review r1 R1-03). / 秘密を伏せるだけでは、証跡を公開できる状態にはならなかった。コミットした junit.xml はどれも `hostname` 属性に機械の名前を持ち、失敗やスキップはチェックアウトの絶対パスを持っていた。個人の機械では、それが持ち主の名前になる。`accept` は何かを残す前に両方を置き換えるようになり、既にコミットした実行のフォルダーも同じ方法で消した(PR #62 レビュー r1 R1-03)。 + 0.11 — 2026-11-13. **Learned:** a fixed wait is a hidden assumption about the host: on an emulated amd64 VM the C4 wiki page needed more than the suite's 30 s page wait, and the only way to show that was an uncommitted patch of the VM's copy. The waits now stretch with one knob, `accept --wait-scale N`, and the 5 s convergence budget, which is a product requirement and not a host allowance, never does (DEMO-22). / 固定の待ちは、機械についての隠れた前提である。エミュレーションの amd64 VM では C4 の wiki ページがスイートの 30 秒のページ待ちより長くかかり、それを示せたのは VM 内のコピーにあてた未コミットのパッチだけだった。待ちは一つのつまみ `accept --wait-scale N` で伸び、機械の許容ではなく製品の要件である 5 秒の収束の予算は決して伸びない(DEMO-22)。 + 0.10 — 2026-11-12. **Learned:** a second sign-in step is an acceptance matter, not only a unit-test matter: the admin screen cannot be reached by a seeded administrator with a password alone any more, so the seed must enrol the second factor with a secret the test owns, and the scenarios that edited through ShareJS had to move to the room that replaced it (C7). / 2 段階目のサインインは、単体試験だけでなく受入の問題である。種データの管理者はパスワードだけでは管理画面に届かなくなったので、種データが試験の持つ秘密で 2 段階目を登録しなければならず、ShareJS で編集していたシナリオは、それに替わった部屋へ移す必要があった(C7)。 + 0.9 — 2026-11-10. **Learned:** an install command that works on a desktop can fail on a server image: on the Ubuntu 24.04 cloud image Playwright's own driver would not start without `libatomic1`, and Chromium needs system libraries, so on Linux the printed command installs both ([DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md)). / デスクトップで動く導入コマンドがサーバーのイメージでは失敗しうる。Ubuntu 24.04 のクラウドイメージでは Playwright 自身のドライバーが `libatomic1` 無しに起動せず、Chromium にはシステムのライブラリが要る。そこで Linux では表示するコマンドが両方を入れる([DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md))。 +- Version / 版: 0.8 — 2026-11-10. **Learned:** a known-asset exception written as a path prefix also accepts lookalike and unlisted paths, so a false pass was possible; each entry now names a whole path, an exact endpoint or a version plus file name (PR #35 review r1, R1-02). / パスの先頭で書いた既知資産の例外は、似たパスや一覧にないパスも受け入れ、偽の合格を生み得ると分かった。各項目はパス全体(正確な endpoint、または版とファイル名)で定める(PR #35 レビュー r1、R1-02)。 +- Version / 版: 0.7 — 2026-11-09. **Learned:** the GRDM pages of today load a few third-party assets (first real login, acceptance run 9), so "abort and fail" alone would keep every browser scenario red; rule 4 now keeps blocking them and counts only a fixed list that must be empty at M5. / 現在の GRDM の画面は少数の外部資産を読み込む(初の実ログイン、受入第 9 回)ため、「中断して失敗」だけではすべてのブラウザシナリオが不合格のままになる。規則 4 は遮断を続け、M5 までに空にする固定の一覧だけを件数の記録にとどめる。 +- Version / 版: 0.6 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.5 — 2026-11-06. **Learned:** a subsystem scenario written as one sentence per case cannot be implemented without guessing; naming the user, the port variable, the path and the exact status in the table turned the five M3 stubs into tests whose only unknowns are selectors, and showed that three subsystems have no browser-facing port yet. / 一ケース一文で書いたサブシステムのシナリオは推測なしに実装できない。表に利用者・ポート変数・パス・正確なステータスを書くことで、五つの M3 の骨格はセレクタだけが未知の試験になり、三つのサブシステムにまだブラウザ向けポートがないことも分かった。 + 0.4 — 2026-11-05. **Learned:** a browser trace is raw evidence that can carry cookies and response bodies, so it cannot live under the public evidence folder; it is off by default and quarantined under `runtime/` when requested (PR #21 review r2, R2-01). / ブラウザのトレースは cookie や応答本文を含み得る生の証跡なので、公開される証跡フォルダには置けない。既定では記録せず、求められたときだけ `runtime/` 配下に隔離する(PR #21 レビュー r2、R2-01)。 + 0.3 — 2026-11-05. **Learned:** downloading a browser inside a test run would make the run depend on the network, so installation is a separate, explicit step and `accept` only checks for it. / 試験の実行中にブラウザをダウンロードすると実行がネットワークに依存するため、導入は別の明示的な手順にし、`accept` は有無を確かめるだけにする。 + 0.2 — 2026-11-05. **Learned:** a case that may skip in the profile a milestone is judged on cannot be a pass criterion, and a diagram that renders in one language half must parse in the other too. / 節目を判定するプロファイルでスキップし得るケースは合格基準になれず、片方の言語で描ける図はもう片方でも解析できなければならないと分かった。 +- Version / 版: 0.1 — 2026-11-05. **Learned:** a scenario without a rejection case proves only that the happy path renders; permission and authentication bugs are found by the case that must fail. / 拒否ケースのないシナリオは画面が出ることしか示さず、権限と認証の不具合は「失敗しなければならないケース」で初めて見つかると分かった。 +- Normative for: `installer/acceptance/`, `grdm-dev accept`, `docs/demo/` result files, CI workflow `acceptance-arm64`. +- Related: [SPEC-00 Overview](00_overview.md) · [SPEC-01 Manifest](01_manifest.md) · [SPEC-02 Installer CLI](02_installer_cli.md) · [SPEC-03 Security Gate](03_security_gate.md) · [SPEC-05 Upstream Tracking](05_upstream_tracking.md) · [SPEC-06 Documentation Conventions](06_documentation_conventions.md) · [ADR-02 Network Model](../decisions/ADR-02_Network_Model.md) · [ADR-03 Staged Security Gate](../decisions/ADR-03_Staged_Security_Gate.md) · [ADR-05 Test IdP for Shibboleth](../decisions/ADR-05_Test_IdP_for_Shibboleth.md) · [POL-01 Position](../policy/POL-01_Developer_Environment_2027_Position.md) · [docs/README.md](../README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Scope and tooling + +Acceptance tests drive a real browser against the environment that [SPEC-02](02_installer_cli.md) installed, the way a researcher would use it. They are written in Python with **Playwright** (a library that opens a browser and clicks, types, and reads pages for you) through **pytest-playwright** (a plugin that lets the *pytest* test runner hand each test a ready browser page). + +- Location: `installer/acceptance/`, one file per scenario, named `test_<scenario>.py`. +- Runner: `grdm-dev accept [--profile ...] [--only <scenario>] [--json]`. It runs `pytest` inside the same `.venv/` that `install.sh` created ([SPEC-02 §2.2](02_installer_cli.md#english)) and exits 60 if any test fails. +- Browsers: `grdm-dev accept` checks that Chromium is present under `PLAYWRIGHT_BROWSERS_PATH=.venv/.playwright/` and, if not, exits 2 and prints the exact install command (`pip install -e "installer[accept]"` then `playwright install chromium` with that variable; on Linux it is preceded by `sudo apt-get install -y libatomic1` and followed by `playwright install-deps chromium`, which asks for `sudo` to add Chromium's system libraries). The download is a one-time setup step, never part of a test run. Nothing is installed outside the venv (a private box of Python tools for one project; see [REF-01](../reference/REF-01_Glossary.md)). +- Target URL: always `http://127.0.0.1:<port>` as published by `compose render` ([ADR-02](../decisions/ADR-02_Network_Model.md); defaults in the ports table of [SPEC-02 §4](02_installer_cli.md#2-en-ports)). Tests read the ports from `runtime/.env` (`GRDM_PORT_<SERVICE>`); they never hard-code them. + +### 2. Test tiers + +| Tier | Where | Tool | Needs Docker | What it proves | +|---|---|---|---|---| +| Unit | `installer/tests/` | `unittest` | no | Each `grdm_dev` module and every exit code in [SPEC-02 §6](02_installer_cli.md#english) | +| Integration | `installer/acceptance/integration/` | `pytest` + `urllib` | yes | `compose up` reaches health, API answers over HTTP, loopback-only binding | +| Acceptance | `installer/acceptance/` | `pytest-playwright` | yes | A person can do the core tasks in a browser, and forbidden actions are refused | + +`grdm-dev accept` runs integration first and stops before acceptance if integration fails, because a browser test against a half-started stack produces noise, not evidence. + +### 3. Scenario rules + +1. **Every scenario has a success case and a rejection case.** The rejection case is one of: an unauthenticated request, or a logged-in user doing something outside their permission. It asserts the HTTP status (`401`, `403`, or `404` as the product defines) *or* a visible error message, never "the page looked wrong". +2. **Deterministic.** No `sleep` for luck; wait for a selector, a network response, or a health state. A test that passes only on retry is a failed test. +3. **Time-boxed.** Each test has `timeout=120s`; the whole suite has 30 minutes. Exceeding either is a failure. +4. **No external network.** Tests set `PLAYWRIGHT_OFFLINE=1` semantics by routing: any request whose host is not `127.0.0.1` is aborted and the test fails. This also catches containers that try to call the internet. One fixed list, `KNOWN_EXTERNAL_ASSETS` in `installer/acceptance/netguard.py`, names the assets the GRDM pages load today: the es6-shim and MathJax scripts on cdnjs, the Google Fonts style sheet, and gravatar avatar images. These requests are aborted as well, so nothing leaves the machine, but they are counted (`known_external_blocked` in `results.json`) instead of failing the test. A match needs the host, the whole path and the resource type: the path is an exact endpoint (`/css` and `/css2`), a three-part version with one file name (es6-shim, MathJax), or a 32-digit hash or the comment pane's `placeholder` image (gravatar). A lookalike or any other path on those hosts, a navigation, an API call, a WebSocket or any other host still fails. The list may only shrink, and it must be empty at M5. +5. **Disposable data only.** Every run creates a fresh user, project, and files under a run id (`acc-<timestamp>-<6 hex>`), and deletes them in teardown. No real names, emails, or files of real people, ever ([POL-01](../policy/POL-01_Developer_Environment_2027_Position.md)). +6. **One assertion target per test.** A test checks one scenario and one case; helpers live in `installer/acceptance/conftest.py`. + +### 4. Core scenarios (M2) + +```toon +core_scenarios[7]{id,scenario,success_case,rejection_case,services}: + C1,Login via fakecas,test user signs in and sees dashboard,"GET /dashboard without session -> 302 to login; API GET /v2/users/me/ -> 401","web api fakecas" + C2,Create project,new project appears with title and user as admin,"second user (contributor read-only) PATCH /v2/nodes/<id>/ -> 403","web api" + C3,Upload and download file,upload via waterbutler then download bytes equal,"anonymous GET of private file -> 401/403; non-contributor PUT -> 403","wb wb_worker osfstorage" + C4,Wiki collaborative edit,two browser contexts type and both see merged text,"logged-out context connecting to wiki websocket -> closed with 4401","web y_websocket" + C5,File preview,uploaded PDF renders in mfr iframe,"preview URL of private file without session -> 401/403","mfr unoconv" + C6,Institution admin screen,institution admin lists institution users,"ordinary user opens admin URL -> 403 or redirect; API -> 403","admin api" + C7,File page collaborative edit,"two users edit one text file in the Edit panel; each sees the other's text within 5 s","socket without a token -> closed with 4401; non-contributor token request -> 403","web y_websocket" +``` + +Scenario C4 uses two independent Playwright *browser contexts* (two separate browsers in one test, with their own cookies) so that the second user's cursor and text appear in the first user's page through the `y-websocket` service. `y_websocket` is part of the `core` profile ([SPEC-02 §4](02_installer_cli.md#2-en-ports)) because collaborative editing is an M2 scenario, so C4 runs and must pass in both `core` and `full`; it never skips. + +Scenario C6 logs in to the admin app in two steps: the password, then a one-time code (RDM-osf.io-dev2027 PR #10). `accept --seed` enrols and confirms the seeded administrator before the run with a random secret that only the test receives (`GRDM_ACCEPT_ADMIN_TOTP_SECRET`, masked in every report); the test computes the RFC 6238 code itself and never uses the grace setting that would let an administrator in without it, so the password alone must stop at the second step. A code is accepted once per 30 s step, so the helper waits for the next step instead of repeating one. Scenario C7 repeats C4 on the Edit panel of a file page, which moved from ShareJS to y-websocket in RDM-osf.io-dev2027 PR #12 ([ADR-13 §6](../decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md#english)): it is the acceptance proof that the stack needs neither `sharejs` nor `mongo`. With `ENABLE_PUBLIC_ACCESS=false` (the default of `compose render`, [SPEC-02 §3](02_installer_cli.md#english)) every scenario already runs signed in, so nothing here depends on anonymous access, and the rejection cases double as checks of the mandatory sign-in. + +### 5. Subsystem scenarios (M3) + +```toon +subsystem_scenarios[5]{id,subsystem,success_case,rejection_case,services,prerequisite}: + S1,y-websocket,"user_a and user_b (write contributor) open the Wiki of the run's project in two contexts; a sentence typed by A is in B's editor within 5 s; the page's WebSocket is ws://127.0.0.1:<port>","the captured WebSocket URL reopened from a logged-out context without its token -> close code 4401 and zero document frames before the close","web wiki y_websocket","none (core profile)" + S2,rdmcp (MCP endpoint),"user_a's personal access token: initialize, tools/list returns tools, resources/read of grdm://nodes/<run project> returns its title","no Authorization header -> 401; user_b's token reading user_a's private project -> 403 (404 not acceptable)",rdmcp,"GRDM_PORT_RDMCP in runtime/.env (host_port in the template); otherwise the test skips with that reason" + S3,aipf_mcp_data_grdm,"user_a's token calls the project-metadata tool for the run's project; id and title equal the OSF API's","user_b's token for user_a's project -> 403, or an empty answer with an explicit denial code; a silent empty list fails",aipf_mcp_data_grdm,"GRDM_PORT_AIPF_MCP_DATA_GRDM in runtime/.env; otherwise skip with reason" + S4,OASys,"user_a signed in to GRDM opens http://127.0.0.1:<GRDM_PORT_OASYS>/ -> 200; the projects page lists the run's project with a link to its GRDM page (same origin as web)","anonymous GET of a session-protected OASys API path -> 401 (not a login page, not 404)",oasys,"GRDM_PORT_OASYS in runtime/.env; otherwise skip with reason" + S5,Shibboleth-SP via test IdP,"mock-user-01 (eduPersonAffiliation member) : web /login?campaign=institution -> SP -> test IdP form -> SAML POST -> GRDM dashboard served by web; osf cookie set; /v2/users/me/institutions/ includes MOCK Institution","mock-user-noaff (eduPersonAffiliation affiliate only) -> the SP RequestMap answers 403 with its error page; no osf cookie; API /v2/users/me/ -> 401","web shibboleth_sp test_idp","--auth shibboleth render (GRDM_AUTH=shibboleth in runtime/.env; fakecas absent); mock users from installer/acceptance/fixtures/idp/mock_users.json; ADR-05" +``` + +The table is the contract of `installer/acceptance/test_s1_y_websocket.py` … `test_s5_shibboleth.py`. Until M3 the five files carry `skip(reason="M3")` and `TODO(M3)` marks on every locator and path that has not been seen on the real subsystem; the success and rejection logic is written in full so that M3 only verifies selectors. Services without a host port today (`rdmcp`, `aipf_mcp_data_grdm`, `oasys`) get one in their template at M3; a test whose port is missing from `runtime/.env` skips with that exact reason instead of failing on a wrong URL. The test IdP (identity provider: the server that checks who you are when you log in; see [REF-01](../reference/REF-01_Glossary.md)) and its mock-attribute rule are decided in [ADR-05](../decisions/ADR-05_Test_IdP_for_Shibboleth.md). + +**MCP** (Model Context Protocol) is a standard way for an AI assistant to ask a service for tools and data; `rdmcp` and `aipf_mcp_data_grdm` expose GRDM through it. Their tests use an HTTP client in the same `pytest` session, not a browser. + +#### 5.1 Shibboleth scenario + +With `compose render --profile full --auth shibboleth` ([SPEC-02 §4](02_installer_cli.md#2-en-ports)) `fakecas` is removed and a bundled test *IdP* (identity provider: the server that checks who you are, like a university login page) answers for the *SP* (service provider: the part of GRDM that trusts the IdP) through Shibboleth (the software that lets you log in once with your university account; see [REF-01](../reference/REF-01_Glossary.md)). Mock attributes used by the test IdP (names like `Test User 01`, `test01@idp.test`) live only in `installer/acceptance/fixtures/idp/` and are clearly labeled `MOCK`; they never resemble real institution attributes, as [POL-01](../policy/POL-01_Developer_Environment_2027_Position.md) requires for separating mock and real data. + +```mermaid +sequenceDiagram + participant T as pytest-playwright + participant W as web (GRDM) + participant SP as shibboleth_sp + participant IdP as test_idp + T->>W: GET http://127.0.0.1:5000/login?campaign=institution + W-->>T: 302 to SP /Shibboleth.sso/Login + T->>SP: GET /Shibboleth.sso/Login + SP-->>T: 302 to IdP SSO URL (SAML AuthnRequest) + T->>IdP: POST username and password (mock user) + IdP-->>T: HTML form with SAML Response + T->>SP: POST /Shibboleth.sso/SAML2/POST + SP->>W: forward with attributes (eppn, mail, institution) + W-->>T: 302 to /dashboard, session cookie set + T->>T: assert dashboard visible, assert institution name shown + Note over T,IdP: Rejection: the mock user lacking entitlement stops at the SP error page and no GRDM cookie is set +``` + +### 6. Fixtures and test data + +- `conftest.py` provides: `run_id`, `base_urls` (from `runtime/.env`), `admin_user`, `user_a`, `user_b` (created through the API with random passwords, deleted in teardown), `tmp_pdf` and `tmp_txt` (generated bytes, 1 KiB and 1 MiB). +- Users are created with the `--yes` helper `grdm-dev accept --seed`, which calls the Django management command inside the `web` container. The admin user is created only for C6 and removed after. +- Waits: the page, click, selector and login waits and the per-test and suite limits are the SPEC-04 §3.3 defaults (30 s, 60 s, 120 s, 30 min). On a slow or emulated host, `grdm-dev accept --wait-scale N` (1 to 20) multiplies them, and Playwright's own 30 s default for `goto` with them, by setting `GRDM_ACCEPT_WAIT_SCALE` for the run. The 5 s convergence budget (`CONVERGE_*`, §5 S1) is never multiplied, so a slow host can still not hide a collaboration that converges late. `results.json` records the scale used (`wait_scale`, 1 when none was asked for). Setting `GRDM_ACCEPT_WAIT_SCALE` yourself is ignored — only the flag decides — and the parent pytest process's own limit (1900 s) is stretched by the same factor. +- Machine identity: before a run folder is kept, `accept` replaces the `hostname` attribute of `junit.xml` and every occurrence of the machine name with `redacted-host`, the checkout's absolute path with a repository-relative one, and the home directory with `~`, in every text file of the folder (in XML only attribute values and text nodes, each decoded first and encoded again, plus comments and CDATA, whose content is replaced as it stands; in JSON only string literals, decoded and encoded again; so element names, numbers and structure never change; a host name is replaced only as a whole token and only when it has 8 characters or more, a letter, and a `-`, `.` or digit, and only the exact localhost names are exempt; the `hostname` attribute is always replaced). +- Fixtures never read the host's home directory or environment beyond `runtime/.env`. + +### 7. Evidence + +Each run writes, under `docs/demo/runs/<run_id>/`: + +```toon +evidence: + results.toon: one line per test with id, case, status, duration_ms, http_status + results.json: same data, canonical, consumed by grdm-dev report + junit.xml: for CI and the GitHub checks tab + screenshots/: <test>_<case>.png, taken only on failure + trace: "off by default. With --trace, Playwright trace zips are retained only on failure and moved to runtime/reports/quarantine/<run_id>/ (0700, git-ignored, raw: may hold cookies and bodies). Any zip left under docs/demo/runs/ is sanitized member by member" +``` + +`grdm-dev report` ([SPEC-02 §3](02_installer_cli.md#english)) copies `results.toon` into the bundle. The demo document for the milestone (`docs/demo/20_core_install_mac_studio.md` and similar) links to the run folder; the TOON (a compact text form of JSON; see [REF-01](../reference/REF-01_Glossary.md)) in the document must agree with `results.json` (`docs check`). + +### 8. Pass criteria per milestone + +| Milestone | Required green | Host | Note | +|---|---|---|---| +| M2 | C1–C7, every success and rejection case | Mac Studio arm64 (self-hosted runner) | amd64: `grdm-dev build --platform linux/amd64` succeeds on a GitHub runner; no acceptance | +| M3 | M2 plus S1–S5 | Mac Studio arm64 | Shibboleth profile run separately from fakecas profile | +| M4 | M3, unchanged after Python 3.13 migration | Mac Studio arm64 | Acceptance is the regression gate for the port | +| M5 | M4 plus [SPEC-03](03_security_gate.md) final gate | Mac Studio arm64 and Ubuntu 24.04 amd64 | Full acceptance on both architectures | + +A milestone is not passed by the author of the change. The QAE (the role that checks that the work is correct; see [REF-01](../reference/REF-01_Glossary.md)) role runs `grdm-dev accept` and records the run id in `docs/status/`; the owner approves ([SPEC-00](00_overview.md)). + +The Mac Studio self-hosted runner is registered only with the private `-dev2027` repositories, never with this public repository ([REF-01](../reference/REF-01_Glossary.md)). The `acceptance-arm64` workflow therefore runs there, and the QAE brings the run folder into `docs/demo/runs/` here through a PR (pull request: a proposed change waiting for someone to review and accept it; see [REF-01](../reference/REF-01_Glossary.md)). + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 範囲と道具 + +受入試験は、[SPEC-02](02_installer_cli.md) で導入した環境に対して本物のブラウザを動かし、研究者が使うのと同じ操作で確かめます。Python で書き、**Playwright**(ブラウザを開いてクリック・入力・読み取りを代わりにしてくれるライブラリ)を **pytest-playwright**(試験の実行器 *pytest* が各試験に準備済みのブラウザ画面を渡せるようにする追加部品)経由で使います。 + +- 置き場: `installer/acceptance/`。シナリオごとに一ファイル、名前は `test_<シナリオ>.py`。 +- 実行器: `grdm-dev accept [--profile ...] [--only <シナリオ>] [--json]`。`install.sh` が作った同じ `.venv/` の中で `pytest` を動かし([SPEC-02 §2.2](02_installer_cli.md#japanese))、一件でも失敗すれば終了 60。 +- ブラウザ: `grdm-dev accept` は `PLAYWRIGHT_BROWSERS_PATH=.venv/.playwright/` に Chromium があるかを確かめ、なければ終了コード 2 で導入コマンド(`pip install -e "installer[accept]"` のあと同じ変数を付けて `playwright install chromium`。Linux では前に `sudo apt-get install -y libatomic1`、後に Chromium のシステムライブラリを `sudo` で入れる `playwright install-deps chromium` が付く)をそのまま表示する。ダウンロードは一度だけの準備であり、試験の実行には含めない。venv(プロジェクトごとの Python 道具箱。[REF-01](../reference/REF-01_Glossary.md))の外には何も入れない。 +- 対象 URL: 常に `compose render` が公開した `http://127.0.0.1:<ポート>`([ADR-02](../decisions/ADR-02_Network_Model.md)。既定値は [SPEC-02 §4](02_installer_cli.md#2-ja-ports) のポート表)。ポートは `runtime/.env`(`GRDM_PORT_<SERVICE>`)から読み、決め打ちしない。 + +### 2. 試験の段 + +| 段 | 場所 | 道具 | Docker が要るか | 示すこと | +|---|---|---|---|---| +| 単体 | `installer/tests/` | `unittest` | 不要 | `grdm_dev` の各モジュールと [SPEC-02 §6](02_installer_cli.md#japanese) の全終了コード | +| 統合 | `installer/acceptance/integration/` | `pytest` + `urllib` | 要る | `compose up` が健康に達し、API が HTTP で応え、ループバックにだけ結び付いている | +| 受入 | `installer/acceptance/` | `pytest-playwright` | 要る | 人がブラウザでコアの作業をでき、禁止された操作が拒まれる | + +`grdm-dev accept` は統合を先に動かし、統合が落ちたら受入の前で止まります。半分しか起動していない環境へのブラウザ試験は、証跡ではなく雑音になるからです。 + +### 3. シナリオの規則 + +1. **すべてのシナリオに成功ケースと拒否ケースを置く。** 拒否ケースは、未認証の要求か、ログイン済みの利用者が権限の外の操作をするもの。HTTP ステータス(製品の定義どおり `401`・`403`・`404`)**か**、画面に見えるエラー文言を assert する。「画面が変だった」では確かめない。 +2. **決定的に動く。** 運に頼る `sleep` を使わず、セレクタ、ネットワーク応答、健康状態を待つ。再試行で通る試験は失敗した試験と見なす。 +3. **時間を区切る。** 各試験は `timeout=120s`、全体は 30 分。超えたら失敗。 +4. **外部ネットワークに出ない。** 経路の制御で、ホストが `127.0.0.1` でない要求はすべて中断し、その試験を失敗にする。これでインターネットへ出ようとするコンテナも見つかる。例外は `installer/acceptance/netguard.py` の固定の一覧 `KNOWN_EXTERNAL_ASSETS` だけで、現在の GRDM の画面が読み込む資産(cdnjs の es6-shim と MathJax のスクリプト、Google Fonts のスタイルシート、gravatar のアバター画像)を挙げる。これらの要求も中断するので外部には出ないが、試験を失敗にせず件数を記録する(`results.json` の `known_external_blocked`)。一致にはホスト、パス全体、資産の種類のすべてが必要である。パスは正確な endpoint(`/css` と `/css2`)、三桁の版と一つのファイル名(es6-shim、MathJax)、32 桁のハッシュまたはコメント欄の `placeholder` 画像(gravatar)に限る。これらのホスト上の似たパスや他のパス、画面遷移、API 呼び出し、WebSocket、ほかのホストは従来どおり失敗にする。一覧は減らすだけで、M5 で空にする。 +5. **使い捨てのデータだけ。** 毎回、実行 ID(`acc-<時刻>-<6 桁の16進>`)の下に新しい利用者・プロジェクト・ファイルを作り、後片付けで消す。実在の人の名前・メール・ファイルは決して使わない([POL-01](../policy/POL-01_Developer_Environment_2027_Position.md))。 +6. **一試験一対象。** 一つの試験は一つのシナリオの一つのケースだけを確かめる。共通処理は `installer/acceptance/conftest.py` に置く。 + +### 4. コアのシナリオ(M2) + +```toon +core_scenarios[7]{id,scenario,success_case,rejection_case,services}: + C1,fakecas でログイン,試験利用者がログインしダッシュボードを見る,"セッションなしで GET /dashboard -> ログインへ 302。API GET /v2/users/me/ -> 401","web api fakecas" + C2,プロジェクト作成,題名付きの新プロジェクトができ利用者が管理者になる,"二人目(読取のみの共同研究者)が PATCH /v2/nodes/<id>/ -> 403","web api" + C3,ファイルの上下載,waterbutler で上げたファイルを下ろしバイト列が一致,"匿名で非公開ファイルを GET -> 401/403。共同研究者でない人が PUT -> 403","wb wb_worker osfstorage" + C4,Wiki 共同編集,二つのブラウザ文脈で入力し双方に統合された文が見える,"ログアウトした文脈が wiki の websocket に接続 -> 4401 で切断","web y_websocket sharejs" + C5,ファイルプレビュー,上げた PDF が mfr の iframe に描かれる,"セッションなしで非公開ファイルのプレビュー URL -> 401/403","mfr unoconv" + C6,機関管理画面,機関管理者が機関の利用者一覧を見る,"一般利用者が管理 URL を開く -> 403 か転送。API -> 403","admin api" + C7,ファイルページの共同編集,"二人が編集パネルで一つのテキストファイルを編集し、互いの文が 5 秒以内に見える","トークンなしのソケットが 4401 で閉じる。非共同作業者のトークン要求が 403","web y_websocket" +``` + +シナリオ C4 は独立した二つの Playwright の「ブラウザ文脈」(一つの試験の中にある、cookie を別々に持つ二つのブラウザ)を使い、二人目の文字が `y-websocket` サービスを通して一人目の画面に現れることを確かめます。共同編集は M2 のシナリオなので `y_websocket` は `core` プロファイルに含まれ([SPEC-02 §4](02_installer_cli.md#2-ja-ports))、C4 は `core` でも `full` でも実行して合格が必須です。スキップはしません。 + +シナリオ C6 は管理アプリに 2 段階でログインする。パスワードのあと、ワンタイムコードを入れる(RDM-osf.io-dev2027 PR #10)。`accept --seed` は実行の前に、種データの管理者を、試験だけが受け取るランダムな秘密(`GRDM_ACCEPT_ADMIN_TOTP_SECRET`。どの報告でも伏せ字)で登録・確認済みにし、試験は RFC 6238 のコードを自分で計算する。猶予の設定(これがあると管理者がコード無しで入れる)は決して使わないので、パスワードだけでは 2 段階目で止まらなければならない。コードは 30 秒の区間ごとに一度しか通らないので、補助関数は同じ区間のコードを繰り返さず、次の区間まで待つ。シナリオ C7 は C4 を、RDM-osf.io-dev2027 PR #12 で ShareJS から y-websocket に移ったファイルページの編集パネルで繰り返す([ADR-13 §6](../decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md#japanese))。スタックに `sharejs` も `mongo` も要らないことの受入の証明である。`ENABLE_PUBLIC_ACCESS=false`(`compose render` の既定、[SPEC-02 §3](02_installer_cli.md#japanese))では、どのシナリオもすでにログインして動くので、匿名のアクセスに頼るものはなく、拒否のケースは必須サインインの確認も兼ねる。 + +### 5. サブシステムのシナリオ(M3) + +```toon +subsystem_scenarios[5]{id,subsystem,success_case,rejection_case,services,prerequisite}: + S1,y-websocket,"user_a と user_b(書込の共同研究者)が二つの文脈で実行中プロジェクトの Wiki を開き、A が打った一文が 5 秒以内に B のエディタに現れる。ページの WebSocket は ws://127.0.0.1:<port>","捕らえた WebSocket の URL をトークンなしでログアウト文脈から開き直す -> 終了コード 4401。閉じる前の文書フレームは 0","web wiki y_websocket","なし(core プロファイル)" + S2,rdmcp(MCP の口),"user_a の個人アクセストークンで initialize、tools/list がツールを返し、grdm://nodes/<実行中プロジェクト> の resources/read が題名を返す","Authorization ヘッダなし -> 401。user_b のトークンで user_a の非公開プロジェクトを読む -> 403(404 は不可)",rdmcp,"runtime/.env に GRDM_PORT_RDMCP(テンプレートの host_port)。なければその理由でスキップ" + S3,aipf_mcp_data_grdm,"user_a のトークンで実行中プロジェクトのメタデータ取得ツールを呼び、id と題名が OSF API と一致する","user_b のトークンで user_a のプロジェクト -> 403、または明示の拒否コード付きの空。黙った空の一覧は失敗",aipf_mcp_data_grdm,"runtime/.env に GRDM_PORT_AIPF_MCP_DATA_GRDM。なければ理由付きでスキップ" + S4,OASys,"GRDM にログイン済みの user_a が http://127.0.0.1:<GRDM_PORT_OASYS>/ を開く -> 200。プロジェクト一覧に実行中プロジェクトがあり、GRDM の画面(web と同じ起点)へリンクする","セッションが要る OASys API のパスを匿名で GET -> 401(ログイン画面も 404 も不可)",oasys,"runtime/.env に GRDM_PORT_OASYS。なければ理由付きでスキップ" + S5,テスト IdP 経由の Shibboleth-SP,"mock-user-01(eduPersonAffiliation に member): web /login?campaign=institution -> SP -> テスト IdP のフォーム -> SAML POST -> web が出す GRDM ダッシュボード。osf cookie あり。/v2/users/me/institutions/ に MOCK Institution","mock-user-noaff(eduPersonAffiliation は affiliate のみ)-> SP の RequestMap がエラー画面で 403。osf cookie なし。API /v2/users/me/ -> 401","web shibboleth_sp test_idp","--auth shibboleth での描画(runtime/.env に GRDM_AUTH=shibboleth。fakecas なし)。模擬利用者は installer/acceptance/fixtures/idp/mock_users.json。ADR-05" +``` + +この表が `installer/acceptance/test_s1_y_websocket.py` 〜 `test_s5_shibboleth.py` の契約です。M3 までは五つのファイルが `skip(reason="M3")` を持ち、実機のサブシステムで未確認のロケータとパスに `TODO(M3)` を付けます。成功と拒否の論理は全部書いてあり、M3 ではセレクタの確認だけをします。今日ホスト側ポートを持たないサービス(`rdmcp`、`aipf_mcp_data_grdm`、`oasys`)は M3 でテンプレートにポートを得ます。`runtime/.env` にポートがない試験は、誤った URL で失敗するのでなく、その理由を書いてスキップします。テスト IdP(アイデンティティプロバイダ。ログインのときに「あなたが誰か」を確かめるサーバ。[REF-01](../reference/REF-01_Glossary.md))と模擬属性の規則は [ADR-05](../decisions/ADR-05_Test_IdP_for_Shibboleth.md) で決めます。 + +**MCP**(Model Context Protocol)は、AI アシスタントがサービスに道具とデータを尋ねるための共通の決まりです。`rdmcp` と `aipf_mcp_data_grdm` は GRDM をこの決まりで公開します。これらの試験はブラウザでなく、同じ `pytest` セッション内の HTTP クライアントで行います。 + +#### 5.1 Shibboleth のシナリオ + +`compose render --profile full --auth shibboleth`([SPEC-02 §4](02_installer_cli.md#2-ja-ports))では `fakecas` を外し、同梱したテスト用 *IdP*(アイデンティティプロバイダ。大学のログイン画面のように「あなたが誰か」を確かめるサーバ)が *SP*(サービスプロバイダ。IdP を信頼する GRDM 側の部品)に Shibboleth(大学のアカウントで一度ログインすれば済むようにするソフト。[REF-01](../reference/REF-01_Glossary.md))経由で応えます。テスト IdP の模擬属性(`Test User 01`、`test01@idp.test` のような名前)は `installer/acceptance/fixtures/idp/` にだけ置き、`MOCK` と明記します。実在の機関の属性に似せてはならず、模擬と実データの分離は [POL-01](../policy/POL-01_Developer_Environment_2027_Position.md) の要求どおりです。 + +```mermaid +sequenceDiagram + participant T as pytest-playwright + participant W as web(GRDM) + participant SP as shibboleth_sp + participant IdP as test_idp + T->>W: GET http://127.0.0.1:5000/login?campaign=institution + W-->>T: SP の /Shibboleth.sso/Login へ 302 + T->>SP: GET /Shibboleth.sso/Login + SP-->>T: IdP の SSO URL へ 302(SAML AuthnRequest) + T->>IdP: 利用者名とパスワードを POST(模擬利用者) + IdP-->>T: SAML Response 入りの HTML フォーム + T->>SP: POST /Shibboleth.sso/SAML2/POST + SP->>W: 属性(eppn・mail・機関)を付けて転送 + W-->>T: /dashboard へ 302。セッション cookie を設定 + T->>T: ダッシュボードが見えること、機関名が表示されることを assert + Note over T,IdP: 拒否: entitlement のない模擬利用者は SP のエラー画面で止まり、GRDM の cookie は作られない +``` + +### 6. フィクスチャと試験データ + +- `conftest.py` が提供するもの: `run_id`、`base_urls`(`runtime/.env` から)、`admin_user`・`user_a`・`user_b`(API で乱数パスワード付きに作り、後片付けで消す)、`tmp_pdf`・`tmp_txt`(生成したバイト列。1 KiB と 1 MiB)。 +- 利用者は `--yes` 付きの補助 `grdm-dev accept --seed` で作り、これは `web` コンテナ内の Django 管理コマンドを呼ぶ。管理者利用者は C6 のためだけに作り、終わったら消す。 +- 待ち: ページ・クリック・セレクター・ログインの待ちと 1 件・全体の制限は SPEC-04 §3.3 の既定(30 秒、60 秒、120 秒、30 分)である。遅い機械やエミュレーションの機械では、`grdm-dev accept --wait-scale N`(1〜20)が、実行の間 `GRDM_ACCEPT_WAIT_SCALE` を設定して、これらと Playwright 自身の `goto` の 30 秒の既定を N 倍にする。5 秒の収束の予算(`CONVERGE_*`、§5 S1)は決して倍にならないので、遅い機械でも、収束が遅れる共同編集を隠せない。`results.json` は使った倍率を `wait_scale` に記録する(指定がなければ 1)。環境変数 `GRDM_ACCEPT_WAIT_SCALE` を自分で設定しても無視され、倍率はフラグだけが決める。親の pytest プロセスの制限(1900 秒)も同じ倍率で伸びる。 +- 機械の識別: 実行のフォルダーを残す前に、`accept` はフォルダー内のすべてのテキストのファイルで、`junit.xml` の `hostname` 属性と機械の名前を `redacted-host` に、チェックアウトの絶対パスをリポジトリからの相対パスに、ホームディレクトリを `~` に置き換える(XML では属性の値とテキストの節を、いったん復号してから置き換えて符号化し直し、コメントと CDATA は中身をそのまま置き換える。JSON では文字列だけを、復号してから置き換えて符号化し直す。要素名・数値・構造は変わらない。ホスト名は、8 文字以上で英字を含み、`-`・`.`・数字のどれかを含むときだけ、語全体として置き換える。除外するのは localhost の名前そのものだけである。`hostname` 属性はいつも置き換える)。 +- フィクスチャは `runtime/.env` 以外に、ホストのホームディレクトリや環境変数を読まない。 + +### 7. 証跡 + +毎回の実行は `docs/demo/runs/<run_id>/` の下に次を書きます。 + +```toon +evidence: + results.toon: 試験ごとに一行。id・case・status・duration_ms・http_status + results.json: 同じデータの正本。grdm-dev report が読む + junit.xml: CI と GitHub の checks タブ向け + screenshots/: <試験>_<ケース>.png。失敗時だけ撮る + trace: "既定では記録しない。--trace のときだけ失敗時に Playwright のトレース zip を残し、runtime/reports/quarantine/<run_id>/(0700、git 管理外、生データで cookie や本文を含み得る)へ隔離する。docs/demo/runs/ に残った zip はメンバー単位で無害化する" +``` + +`grdm-dev report`([SPEC-02 §3](02_installer_cli.md#japanese))が `results.toon` を束に写します。節目の実証文書(`docs/demo/20_core_install_mac_studio.md` およびその類)は実行フォルダへリンクし、文書内の TOON(JSON を短く書いた文字の形。[REF-01](../reference/REF-01_Glossary.md))は `results.json` と一致していなければなりません(`docs check`)。 + +### 8. 節目ごとの合格基準 + +| 節目 | 全件合格が必要なもの | ホスト | 備考 | +|---|---|---|---| +| M2 | C1〜C7 の成功・拒否ケースすべて | Mac Studio arm64(セルフホストランナー) | amd64 は GitHub ランナーで `grdm-dev build --platform linux/amd64` が成功すること。受入は行わない | +| M3 | M2 に加え S1〜S5 | Mac Studio arm64 | Shibboleth プロファイルは fakecas プロファイルと別に実行 | +| M4 | M3 が Python 3.13 移植後も変わらず合格 | Mac Studio arm64 | 受入が移植の回帰判定の門になる | +| M5 | M4 に加え [SPEC-03](03_security_gate.md) の最終の門 | Mac Studio arm64 と Ubuntu 24.04 amd64 | 両アーキテクチャで全受入 | + +節目の合格は変更の作者が判定しません。QAE(QA担当。成果が正しいか検査する役割。[REF-01](../reference/REF-01_Glossary.md))の役割が `grdm-dev accept` を実行し、実行 ID を `docs/status/` に記録し、所有者が承認します([SPEC-00](00_overview.md))。 + +Mac Studio のセルフホストランナーは非公開の `-dev2027` リポジトリにだけ登録し、公開のこのリポジトリには登録しません([REF-01](../reference/REF-01_Glossary.md))。そのため `acceptance-arm64` ワークフローはそちらで動き、QAE が実行フォルダを PR(プルリクエスト。誰かが見て受け入れるのを待っている変更の提案。[REF-01](../reference/REF-01_Glossary.md))でこのリポジトリの `docs/demo/runs/` へ持ち込みます。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Playwright | A library that opens a browser and clicks, types, and reads pages for you. | ブラウザを開き、クリック・入力・読み取りを代わりにしてくれるライブラリ。 | +| pytest | A Python tool that finds and runs test functions and reports which passed. | Python の試験関数を見つけて動かし、合否を報告する道具。 | +| Browser context | A separate browser session with its own cookies, inside one test. | 一つの試験の中にある、cookie を別々に持つ独立したブラウザのセッション。 | +| Fixture | Ready-made test data or setup that a test receives before it starts. | 試験が始まる前に受け取る、用意済みのデータや準備。 | +| IdP / SP | The server that checks who you are / the service that trusts that answer. | 「あなたが誰か」を確かめるサーバ/その答えを信頼するサービス。 | +| SAML | The message format an IdP and an SP use to pass a login result. | IdP と SP がログイン結果を渡し合うための文書の形式。 | +| MCP | A standard way for an AI assistant to ask a service for tools and data. | AI アシスタントがサービスに道具とデータを尋ねるための共通の決まり。 | +| JUnit XML | A common file format that CI systems read to show test results. | CI が試験結果を表示するために読む、よく使われるファイル形式。 | diff --git a/docs/spec/05_upstream_tracking.md b/docs/spec/05_upstream_tracking.md new file mode 100644 index 0000000..2a28cf5 --- /dev/null +++ b/docs/spec/05_upstream_tracking.md @@ -0,0 +1,322 @@ +# SPEC-05 Upstream Tracking / 上流追従 + +> **Summary:** How the integration repositories stay current with their upstreams: a daily job mirrors the `upstream/*` branches and writes a diff report, a weekly job lets an AI agent open one integration PR per repository, conflicts are solved on the PR, review and checks are automatic, and only merge and publish are human. Also how the COS original is tracked for reference and what happens if COS archives OSF. +> **概要:** 統合リポジトリを上流に追従させる仕組み。日次ジョブが `upstream/*` をミラーして差分報告を書き、週次ジョブで AI エージェントがリポジトリごとに統合 PR を一本開く。衝突は PR 上で解く。レビューと検査は自動、マージと公開だけが人。COS 本家を参照用に追う方法と、COS が OSF を凍結したときの扱いも定める。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.4 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.3 — 2026-11-06. **Learned:** PR #23 review r1 showed three ways a "safe" automation silently stops being safe: a publish decision taken from "did my local ref move" skips publication after a dry-run or a failed push, so it must be taken from the remote state; `checkout -B` turns a rerun into a reset of hand-made conflict resolutions, so branch creation must refuse an existing local branch and a dry-run must leave no branch; and a report generated before the status branch is checked out blocks the checkout and a failed run never publishes its report, so the status checkout comes first and publication runs `always()`. The job's failure also needs a canonical exit code (70) rather than a bare 1. / PR #23 レビュー r1 で、「安全な」自動化が黙って安全でなくなる三つの経路が分かった。「ローカルの参照が動いたか」で公開を決めると dry-run や push 失敗の後に公開されないので、公開はリモートの状態から決める。`checkout -B` は再実行を手作業の衝突解決のリセットに変えるので、ブランチ作成はローカルの既存ブランチを拒み、dry-run はブランチを残さない。status ブランチの checkout より前に報告を生成すると checkout を妨げ、失敗した実行は報告を公開しないので、status の checkout を先に用意し公開は `always()` で行う。ジョブの失敗にも素の 1 でなく正本の終了コード(70)が要る。 + 0.2 — 2026-11-06. **Learned:** writing the mirror showed that a non-forced `git fetch src:dst` refspec is itself the force-push detector, that the tracking branches of the integration repository (not a local clone) are the only trustworthy "previous SHA", and that the strict reconstruction of ADR-01 §5 needs an explicit second case — once `develop` already contains the public tip, the weekly branch must start at `develop`, or every earlier integration would be discarded. / ミラーを実装して分かったこと: `+` を付けない `git fetch src:dst` の refspec がそのまま force push の検出器になる。「昨日の SHA」として信じられるのは統合リポジトリ側の追跡ブランチだけで、ローカルの写しではない。ADR-01 §5 の厳密再構築には第二の場合を明示する必要がある — `develop` が既に公開先端を含むなら週次ブランチは `develop` から始めなければ、それまでの統合を全部捨ててしまう。 +- Version / 版: 0.1 — 2026-11-05. **Learned:** the 2026-11-05 survey found eleven upstreams that moved on five different days in one week; without a daily mirror and a weekly merge the integration branch would drift into large, unreviewable conflicts. / 2026-11-05 の調査で、上流 11 本が一週間に 5 つの異なる日に動いていた。日次ミラーと週次マージが無ければ、統合ブランチは大きくレビュー不能な衝突にはまると分かった。 +- Normative for: the `upstream-mirror` and `upstream-integrate` workflows in every `RDM-<name>-dev2027` repository, the `grdm-dev upstream` subcommand ([SPEC-02](02_installer_cli.md)), and `docs/status/upstream/`. +- Related: [SPEC-00 Overview](00_overview.md) · [SPEC-01 Manifest](01_manifest.md) · [SPEC-06 Documentation conventions](06_documentation_conventions.md) · [POL-01 Position](../policy/POL-01_Developer_Environment_2027_Position.md) · [ADR-01 Integration repository placement](../decisions/ADR-01_Integration_Repository_Placement.md) · [ADR-04 AI autonomy and roles](../decisions/ADR-04_AI_Autonomy_and_Roles.md) · [docs/README.md](../README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Branches that are tracked + +Every integration repository `RDM-<name>-dev2027` ([SPEC-00 §3](00_overview.md#3-integration-model)) has one *tracking branch* (a read-only copy of a branch that lives in another repository) per `upstreams[]` entry of the manifest ([SPEC-01 §3](01_manifest.md#english)). The name is `upstream/<kind>-<branch>`, where `<branch>` is the upstream branch name with every `/` replaced by `-`; a second upstream of the same kind inserts a tag, `upstream/<kind>-<tag>-<branch>` ([SPEC-01 §4](01_manifest.md#4-rules) rule 7). + +```toon +tracking[4]{branch,source,kind,merged_into_develop,examples}: + upstream/public-<branch>,"RDM-<name> default branch",public,yes,"upstream/public-develop (osf.io, waterbutler, mfr, cas-overlay, wiki-frontend); upstream/public-master (ember-osf-web, y-websocket)" + upstream/private-<branch>,"RDM-<name>-*-private default branch",private,yes,"upstream/private-develop; upstream/private-master (ember-osf-web, y-websocket); upstream/private-main (OASys, Shibboleth-SP, rdmcp, aipf_mcp_data_grdm)" + upstream/cos-develop,"CenterForOpenScience/<name> develop",cos,no (compare only),"five cores; wiki-frontend has no COS original" + upstream/<kind>-<tag>-<branch>,"a second upstream of the same kind",private,no (candidate),"upstream/private-sec-test-fix-sec-test = RDM-osf.io-private fix/sec-test" +``` + +A component has only the branches its manifest entry lists: the five private subsystems have `upstream/private-main` alone; the cores have `public`, `private`, and (except wiki-frontend) `cos`. + +Rules that never bend: + +- `upstream/*` branches are **written only by the mirror job**. No human and no agent commits to them. +- `upstream/*` branches are **never rewritten**. The mirror job fast-forwards; if the source itself was force-pushed, the job keeps the old branch, reports `non-fast-forward` / `halt`, and exits 70 ([SPEC-02 §6](02_installer_cli.md#english)) so the workflow fails visibly; the AID (the role that writes code and documents to the specification; see [REF-01](../reference/REF-01_Glossary.md)) agent opens an issue from that failure. +- Nobody **force-pushes** anywhere in a `-dev2027` repository. Branch protection on `develop` enforces this (Branch protection is a GitHub rule that rejects force-pushes and deletions on one branch; see [REF-01](../reference/REF-01_Glossary.md)). + +### 2. Daily job: mirror and diff report + +The `upstream-mirror` workflow runs once a day (03:00 JST) in each `-dev2027` repository, and can be run by hand with `grdm-dev upstream mirror [--component <id>] [--workdir runtime/upstream] [--report-dir docs/status/upstream] [--dry-run]` ([SPEC-02](02_installer_cli.md)). The workflow template that a `-dev2027` repository adopts is `installer/grdm_dev/templates/workflows/upstream-mirror.yml`; it is not a workflow of this repository, because this repository's CI (continuous integration: the automatic checks on every change; see [REF-01](../reference/REF-01_Glossary.md)) never holds credentials for the private repositories. + +For every component with an `integration_repo` (private subsystems included; infra components have none): + +1. Clone the integration repository under `--workdir` (or fetch it when already present). The clone and fetch addresses are composed at run time from the bare names in the manifest; a `repo` that carries its owner (`CenterForOpenScience/osf.io`) is used as is, a bare name belongs to RCOSDP. +2. For each `upstreams[]` entry — merged, reference and candidate alike ([SPEC-01 §4](01_manifest.md#4-rules) rule 6) — set the local `tracking_branch` to the value the integration repository has (the *previous SHA*) — or delete the local ref when the integration repository does not have the branch yet, so that a ref left behind by an earlier `--dry-run` or by a failed push never stands in for the published state — then `git fetch <source> refs/heads/<branch>:refs/heads/<tracking_branch>`. The refspec carries no `+`, so Git refuses a non-fast-forward: that refusal is the force-push detection of §1. The old branch is kept, the row is `non-fast-forward`, the repository's `action` is `halt`, and the job exits 70. Nothing is ever forced. +3. Push every tracking branch whose fetched SHA differs from what the integration repository publishes (the branch is missing there, or its SHA is older), with one explicit refspec each, `git push origin refs/heads/upstream/X:refs/heads/upstream/X`, never `--force`. The decision is taken from the remote state, never from "did the local ref move": a `--dry-run` or a failed push followed by a real run therefore still publishes. The report lists the branches selected (`to_publish`) and those actually pushed (`pushed`). `--dry-run` fetches and reports but pushes nothing. +4. Compare each tracking branch with `develop` (`ahead_of_develop`, `behind_develop`, `develop_contains`) and with the SHA pinned in the manifest ([SPEC-01](01_manifest.md), `manifest_sha_matches`). +5. Write the diff report. The workflow then commits it to the bot branch `status/upstream` of this public repository, from which a daily PR (pull request: a proposed change waiting for someone to review and accept it; see [REF-01](../reference/REF-01_Glossary.md)) brings it into `develop`; the CLI itself only writes the files. + +Exit code: 0 whether or not anything moved; 70 (`UPSTREAM_FAILED`, [SPEC-02 §6](02_installer_cli.md#english), canonical message in `messages.tsv`) when a fetch was refused (`non-fast-forward`) or failed, or a push failed. The report is written in every case, so a failure is visible in it; the workflow template publishes the report with `if: always()`, so a failed run's report reaches the status branch too, while the job itself still fails. + +**Where the report lives.** Chosen: `docs/status/upstream/latest.json` (canonical) and `latest.toon` (the same content in TOON, a compact text form of JSON; [SPEC-06 §4](06_documentation_conventions.md#4-diagrams-and-data)) are overwritten every run, and the same content is archived as `docs/status/upstream/archive/YYYY-MM-DD.json` and `.toon`. Archives older than 90 days are deleted by the job. The `--report-dir` flag relocates all of these. + +> **Warning:** The report is public. It contains repository names, branch names, SHAs, and commit counts only. It never contains an address (`https://`, `git@`, `github.com`), a commit message, an author name, a file path, or diff text from `private` upstreams. The tests assert this on the written files. + +Example report (one of the eleven repositories; the repeated digits are placeholders): + +```toon +report: + generated_at: "2026-11-06T03:00:12+09:00" + dry_run: false + repositories[1]: + - component: osf.io + integration_repo: RDM-osf.io-dev2027 + develop_sha: 1111111111111111111111111111111111111111 + upstreams[3]{branch,kind,source_repo,source_branch,previous_sha,sha,ahead_of_develop,behind_develop,develop_contains,manifest_sha_matches,moved_since_yesterday,status}: + upstream/public-develop,public,RDM-osf.io,develop,2222222222222222222222222222222222222222,3333333333333333333333333333333333333333,14,0,false,false,true,updated + upstream/private-develop,private,RDM-osf.io-develop-private,develop,4444444444444444444444444444444444444444,4444444444444444444444444444444444444444,0,0,true,true,false,unchanged + upstream/cos-develop,cos,CenterForOpenScience/osf.io,develop,5555555555555555555555555555555555555555,6666666666666666666666666666666666666666,310,0,false,false,true,updated + to_publish[2]: + - upstream/public-develop + - upstream/cos-develop + pushed[2]: + - upstream/public-develop + - upstream/cos-develop + action: integrate + errors[0]: + summary: + repositories: 1 + repositories_needing_integration: 1 + force_push_detected: 0 + branches_moved: 2 + branches_pushed: 2 + errors: 0 +``` + +Per row, `status` is `created` (the integration repository had no such branch yet), `updated`, `unchanged`, `non-fast-forward`, or `fetch-failed`. Per repository, `action` is `integrate` when a merged `public` or `private` upstream is ahead of `develop`, `halt` when a force push was detected, `error` when a fetch or push failed and nothing is ahead, and `none` otherwise. + +### 3. Weekly integration PR + +The `upstream-integrate` workflow runs once a week (Monday 04:00 JST), or by hand with `grdm-dev upstream integrate`, and is executed by an AI agent in the AID role (an *AI agent* is a program that reads instructions, edits code, and reports back). For each `-dev2027` repository whose latest report says `integrate`: + +```mermaid +sequenceDiagram + autonumber + participant Mir as Daily mirror + participant AID as AID agent (Open Code 2) + participant Repo as RDM-name-dev2027 + participant CI as CI (build, scan, acceptance) + participant REV as REV (Codex Astra) + participant QAE as QAE (Claude Code Fable) + participant Own as Owner + + Mir->>Repo: fast-forward upstream/* branches + Mir->>AID: latest.toon says integrate + AID->>Repo: branch integrate/strict-YYYYMMDD at upstream/public-<branch> (or at develop once it contains that tip) + AID->>Repo: merge upstream/private-<branch> --no-ff + AID->>Repo: merge each adopted PR head --no-ff, in manifest order + AID->>Repo: open PR with manifest SHA bump + Repo->>CI: build arm64/amd64, Trivy, Semgrep, acceptance + CI-->>AID: results on PR + AID->>Repo: fix conflicts and failures on the same branch + REV->>Repo: review, record in docs/reviews/ + QAE->>Repo: check regression and acceptance verdict + Own->>Repo: merge to develop + Own->>Repo: publish images (optional) +``` + +Steps in words, as `grdm-dev upstream integrate [--component <id>] [--date YYYYMMDD] [--dry-run]` performs them for every component **in scope** — a component with a `public` upstream of `status: merged` ([ADR-01 §5](../decisions/ADR-01_Integration_Repository_Placement.md)). A private-only component (the five subsystems) has nothing to reconstruct: its `develop` is seeded from `upstream/private-<branch>`, so it is reported `skipped` with a note and no branch is made. + +1. Create branch `integrate/strict-<YYYYMMDD>` (the ADR-01 §5 name). **Starting point rule:** when `develop` does *not* yet contain the tip of `upstream/public-<branch>`, the branch starts at that tip (`mode: strict`, ADR-01 §5 step 1). When `develop` already contains it — the strict order was established by an earlier integration — the branch starts at `develop` (`mode: on-develop`), because starting again from the public tip would discard every earlier integration. In both modes the merge (accepting a change into the shared branch; see [REF-01](../reference/REF-01_Glossary.md)) order below is the same. The branch is created with `git switch -c` (create only), never with `checkout -B`: a branch of that name that already exists in the integration repository **or in the local clone** is never rewritten — the run stops with an error, because the local branch may hold a conflict resolution committed by hand (§4). With `--dry-run` no branch is created at all: the merges run on a detached HEAD at the same starting point, so a dry-run leaves no local branch that a later run could reset or refuse. +2. Merge the `private` tracking branch with `status: merged` (`upstream/private-develop`, `upstream/private-master`) with `git merge --no-ff --no-edit`. Candidate upstreams such as `upstream/private-sec-test-fix-sec-test` and the `cos` reference are never merged. Then, for each `adopted_prs[]` entry in list order, fetch `refs/pull/<n>/head` from the PR's repository and merge it `--no-ff` as its own merge commit (ADR-01 §5 step 3). A source already contained in the branch is `already-contained` and creates no commit. +3. When the branch tip equals `develop` after all merges (identical tips), the result is `no-op`: nothing is pushed and no PR is opened. Otherwise push the branch (plain `git push`, never forced) and open one PR per repository to `develop` with `gh pr create`, titled `統合: upstream YYYY-MM-DD(<name>)`. The body (Japanese) states the starting point, the `develop` SHA, and the merge order with each source's SHA and status; it names repositories, never addresses. With `--dry-run` the merges are performed locally on a detached HEAD (so conflicts are still detected) but no branch is created, nothing is pushed and no PR is opened. In this public repository, a matching PR bumps `manifest/upstreams.json` and `upstreams.toon` to the new SHAs ([SPEC-01 §4](01_manifest.md#4-rules) rule 2); that bump is not automated yet. +4. CI runs the build, the security gate ([SPEC-03](03_security_gate.md)), and the acceptance tests ([SPEC-04](04_acceptance_tests.md)). + +Exit code: 0 when every component opened a PR, was `no-op`, or was `skipped`; 70 (`UPSTREAM_FAILED`, [SPEC-02 §6](02_installer_cli.md#english)) when a merge conflicted, a fetch or push failed, the branch already existed, or `gh pr create` failed (the branch is then already pushed and the detail says so). + +### 4. Conflict handling + +A *merge conflict* happens when two sides changed the same lines and Git cannot choose. On the integration PR: + +- `grdm-dev upstream integrate` does not resolve conflicts: it lists the conflicted files in the report, runs `git merge --abort`, marks the component `conflict`, and exits 70 without pushing. The AID agent then resolves conflicts **on the PR branch** with ordinary commits — by running the same merges by hand on `integrate/strict-<date>` — and explains each resolution in the commit body in Japanese. +- Resolution preference: keep the `private` change when the conflict is a security fix; keep the `public` change when it is a feature; when unclear, keep both behind a comment and label the PR `needs-owner-decision`. +- The agent **never** force-pushes the PR branch, never rebases it after review began, never touches `upstream/*`, and never edits `develop` directly. +- If an adopted PR no longer applies, the agent does not drop it silently: it marks that entry `candidate` with `reason: "no longer applies after <sha>"` in the manifest PR and labels the PR `adopted-pr-broken`. +- If CI fails for reasons the agent cannot fix within its budget, it leaves the PR open with a summary comment and the daily report keeps saying `integrate`. + +### 5. Review, check, merge + +- **REV (Codex Astra)** reviews every integration PR and writes `docs/reviews/YYYY-MM-DD_Upstream_Integration_<name>_rN.md` plus PR comments. +- **QAE (Claude Code Fable)** checks the regression and acceptance results and records the verdict on the PR. +- **Owner** merges. Squash is forbidden on integration PRs (it would hide upstream history); use a merge commit. +- No agent merges. The autonomy boundary is **detection → fix PR → review → regression and acceptance** automatic; **merge and publish** human ([ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md)). + +### 6. COS reference tracking + +`CenterForOpenScience/*` repositories (COS, the Center for Open Science, is the US group that makes OSF; see [REF-01](../reference/REF-01_Glossary.md)) are mirrored to `upstream/cos-develop` only. They are never merged, because RCOSDP's code has diverged for years. They are used to: + +- Compare how COS solved the same modernization (for example the Python 3.12 port of osf.io) when we do ours at M4. +- Spot security fixes COS made that RCOSDP has not yet made; the weekly PR body is to list commits on `upstream/cos-develop` whose message mentions `CVE`, `security`, or `vuln`. (`grdm-dev upstream integrate` does not write this list yet; the mirror report carries the `cos` row's SHAs and counts.) + +**If COS archives OSF** (an *archived* repository is frozen read-only by its owner): + +1. The mirror job detects the archived flag and stops fetching that source. +2. The manifest keeps the last `cos` SHA with `fetched_at` frozen and `kind: cos`, plus a note `archived: YYYY-MM-DD`. +3. `upstream/cos-develop` stays in the repository as history. Nothing else changes: the daily mirror, the weekly PR, the security gate, and the AI vulnerability work continue on `public` and `private` upstreams and on our own `develop`. This is the point of POL-01: GRDM keeps building whether COS does or not. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 追跡するブランチ + +すべての統合リポジトリ `RDM-<name>-dev2027`([SPEC-00 §3](00_overview.md#3-統合の仕組み))には、マニフェストの `upstreams[]` の要素ごとに一本の「追跡ブランチ」(他のリポジトリにあるブランチの読み取り専用の写し)があります([SPEC-01 §3](01_manifest.md#japanese))。名前は `upstream/<kind>-<branch>` で、`<branch>` は上流のブランチ名の `/` をすべて `-` に置き換えたものです。同じ kind の上流が二つあるときは `upstream/<kind>-<tag>-<branch>` とタグを挟みます([SPEC-01 §4](01_manifest.md#4-規則) の規則 7)。 + +```toon +tracking[4]{branch,source,kind,merged_into_develop,examples}: + upstream/public-<branch>,"RDM-<name> の既定ブランチ",public,yes,"upstream/public-develop(osf.io、waterbutler、mfr、cas-overlay、wiki-frontend)、upstream/public-master(ember-osf-web、y-websocket)" + upstream/private-<branch>,"RDM-<name>-*-private の既定ブランチ",private,yes,"upstream/private-develop、upstream/private-master(ember-osf-web、y-websocket)、upstream/private-main(OASys、Shibboleth-SP、rdmcp、aipf_mcp_data_grdm)" + upstream/cos-develop,"CenterForOpenScience/<name> の develop",cos,no(比較のみ),"コア 5 本。wiki-frontend には COS 本家がない" + upstream/<kind>-<tag>-<branch>,"同じ kind の二つ目の上流",private,no(候補),"upstream/private-sec-test-fix-sec-test = RDM-osf.io-private の fix/sec-test" +``` + +部品が持つのはマニフェストの要素に対応するブランチだけです。非公開サブシステム 5 本は `upstream/private-main` のみ、コアは `public`・`private` と(wiki-frontend 以外は)`cos` を持ちます。 + +決して曲げない規則: + +- `upstream/*` に書くのは **ミラージョブだけ** です。人もエージェントもコミットしません。 +- `upstream/*` は **書き換えません**。ミラージョブは fast-forward(まっすぐ前に進める)だけを行い、元のリポジトリ側が force push されていたら古いブランチを残し、`non-fast-forward` / `halt` と報告して終了 70([SPEC-02 §6](02_installer_cli.md#japanese))で止まります(ワークフローが見える形で失敗する)。その失敗から Issue を開くのは AID(AI開発担当者。仕様どおりにコードと文書を書く役割。[REF-01](../reference/REF-01_Glossary.md))エージェントです。 +- `-dev2027` のどこにも **force push しません**。`develop` のブランチ保護(一つのブランチへの force push や削除を GitHub が拒む設定。[REF-01](../reference/REF-01_Glossary.md))がこれを強制します。 + +### 2. 日次ジョブ: ミラーと差分報告 + +`upstream-mirror` ワークフローは、各 `-dev2027` リポジトリで毎日一回(JST 03:00)動きます。手で動かすなら `grdm-dev upstream mirror [--component <id>] [--workdir runtime/upstream] [--report-dir docs/status/upstream] [--dry-run]` です([SPEC-02](02_installer_cli.md))。`-dev2027` リポジトリが取り込むワークフローの雛形は `installer/grdm_dev/templates/workflows/upstream-mirror.yml` です。このリポジトリ自身のワークフローではありません。このリポジトリの CI(continuous integration。変更ごとに自動で走る検査。[REF-01](../reference/REF-01_Glossary.md))は非公開リポジトリの認証情報を決して持たないからです。 + +`integration_repo` を持つ部品ごとに(非公開サブシステムも含む。基盤部品には無い): + +1. 統合リポジトリを `--workdir` の下に clone する(既にあれば fetch)。clone と fetch の宛先はマニフェストの素の名前から実行時に組み立てる。持ち主を含む `repo`(`CenterForOpenScience/osf.io`)はそのまま、素の名前は RCOSDP のものとして扱う。 +2. `upstreams[]` の各要素について — merged・reference・candidate の区別なく([SPEC-01 §4](01_manifest.md#4-規則) の規則 6)— ローカルの `tracking_branch` を統合リポジトリが持つ値(「昨日の SHA」)に合わせる — 統合リポジトリにまだそのブランチが無ければローカルの参照を削除し、以前の `--dry-run` や失敗した push が残した参照を公開済みの状態の代わりに使わない — そして `git fetch <元> refs/heads/<branch>:refs/heads/<tracking_branch>` を行う。refspec に `+` を付けないので、fast-forward でなければ Git が拒む。この拒否が §1 の force push 検出である。古いブランチは残し、行は `non-fast-forward`、そのリポジトリの `action` は `halt`、ジョブは終了 70。何も強制しない。 +3. 取得した SHA が統合リポジトリの公開している値と違う追跡ブランチ(そこにブランチが無い、または SHA が古い)を、一本ずつ明示の refspec `git push origin refs/heads/upstream/X:refs/heads/upstream/X` で push する。`--force` は使わない。公開するかどうかは「ローカルの参照が動いたか」でなくリモートの状態から決める。だから `--dry-run` や失敗した push の後の本実行でも公開される。報告には選ばれたブランチ(`to_publish`)と実際に push したブランチ(`pushed`)を書く。`--dry-run` は fetch と報告だけ行い、何も push しない。 +4. 各追跡ブランチを `develop` と比べ(`ahead_of_develop`・`behind_develop`・`develop_contains`)、マニフェスト([SPEC-01](01_manifest.md))に固定した SHA とも比べる(`manifest_sha_matches`)。 +5. 差分報告を書く。ワークフローがそれをこの公開リポジトリのボット用ブランチ `status/upstream` にコミットし、日次の PR(プルリクエスト。誰かが見て受け入れるのを待っている変更の提案。[REF-01](../reference/REF-01_Glossary.md))が `develop` に取り込む。CLI 自体はファイルを書くだけである。 + +終了コード: 何かが動いたかどうかに関わらず 0。fetch が拒まれた(`non-fast-forward`)か失敗したとき、または push が失敗したときは 70(`UPSTREAM_FAILED`。[SPEC-02 §6](02_installer_cli.md#japanese)。正本の文言は `messages.tsv`)。報告はどの場合も書くので、失敗は報告の中に見える。ワークフローの雛形は報告の公開を `if: always()` で行うので、失敗した実行の報告も status ブランチに届く。ジョブ自体はそれでも失敗する。 + +**報告の置き場。** 採用: `docs/status/upstream/latest.json`(正本)と `latest.toon`(同じ内容の TOON。JSON を短く字下げで書いた形。[SPEC-06 §4](06_documentation_conventions.md#4-図とデータ))を毎回上書きし、同じ内容を `docs/status/upstream/archive/YYYY-MM-DD.json` と `.toon` として保管します。90 日より古い保管分はジョブが削除します。`--report-dir` でこれら全部の置き場を変えられます。 + +> **Warning:** 報告は公開です。中身はリポジトリ名、ブランチ名、SHA、コミット数だけです。アドレス(`https://`・`git@`・`github.com`)、コミットメッセージ、作者名、ファイルパス、`private` の上流の差分本文は決して含めません。テストが書き出したファイルに対してこれを確認します。 + +報告の例(11 本のうち 1 本。同じ数字の並びは仮の値): + +```toon +report: + generated_at: "2026-11-06T03:00:12+09:00" + dry_run: false + repositories[1]: + - component: osf.io + integration_repo: RDM-osf.io-dev2027 + develop_sha: 1111111111111111111111111111111111111111 + upstreams[3]{branch,kind,source_repo,source_branch,previous_sha,sha,ahead_of_develop,behind_develop,develop_contains,manifest_sha_matches,moved_since_yesterday,status}: + upstream/public-develop,public,RDM-osf.io,develop,2222222222222222222222222222222222222222,3333333333333333333333333333333333333333,14,0,false,false,true,updated + upstream/private-develop,private,RDM-osf.io-develop-private,develop,4444444444444444444444444444444444444444,4444444444444444444444444444444444444444,0,0,true,true,false,unchanged + upstream/cos-develop,cos,CenterForOpenScience/osf.io,develop,5555555555555555555555555555555555555555,6666666666666666666666666666666666666666,310,0,false,false,true,updated + to_publish[2]: + - upstream/public-develop + - upstream/cos-develop + pushed[2]: + - upstream/public-develop + - upstream/cos-develop + action: integrate + errors[0]: + summary: + repositories: 1 + repositories_needing_integration: 1 + force_push_detected: 0 + branches_moved: 2 + branches_pushed: 2 + errors: 0 +``` + +行ごとの `status` は `created`(統合リポジトリにまだそのブランチが無かった)、`updated`、`unchanged`、`non-fast-forward`、`fetch-failed` のいずれかです。リポジトリごとの `action` は、`merged` の `public` か `private` の上流が `develop` より進んでいれば `integrate`、force push を検出したら `halt`、fetch か push が失敗しかつ何も進んでいなければ `error`、そうでなければ `none` です。 + +### 3. 週次の統合 PR + +`upstream-integrate` ワークフローは週一回(月曜 JST 04:00)に動きます。手で動かすなら `grdm-dev upstream integrate` です。実行するのは AID 役の AI エージェント(指示を読み、コードを直し、結果を報告するプログラム)です。最新の報告が `integrate` と言う `-dev2027` リポジトリごとに次を行います。 + +```mermaid +sequenceDiagram + autonumber + participant Mir as 日次ミラー + participant AID as AID エージェント(Open Code 2) + participant Repo as RDM-name-dev2027 + participant CI as CI(ビルド・スキャン・受入) + participant REV as REV(Codex Astra) + participant QAE as QAE(Claude Code Fable) + participant Own as 所有者 + + Mir->>Repo: upstream/* を fast-forward + Mir->>AID: latest.toon が integrate + AID->>Repo: upstream/public-<branch> の先端に integrate/strict-YYYYMMDD を作る(develop が既にその先端を含めば develop から) + AID->>Repo: upstream/private-<branch> を --no-ff でマージ + AID->>Repo: 採用 PR の先端をマニフェストの順に --no-ff でマージ + AID->>Repo: マニフェストの SHA 更新を添えて PR を開く + Repo->>CI: arm64/amd64 ビルド、Trivy、Semgrep、受入 + CI-->>AID: 結果を PR に + AID->>Repo: 同じブランチで衝突と失敗を直す + REV->>Repo: レビューし docs/reviews/ に記録 + QAE->>Repo: 回帰・受入の判定を記録 + Own->>Repo: develop へマージ + Own->>Repo: イメージを公開(任意) +``` + +言葉で書くと、`grdm-dev upstream integrate [--component <id>] [--date YYYYMMDD] [--dry-run]` が **対象の** 部品 — `status: merged` の `public` 上流を持つ部品([ADR-01 §5](../decisions/ADR-01_Integration_Repository_Placement.md))— ごとに次を行います。非公開のみの部品(サブシステム 5 本)には再構築するものがありません。その `develop` は `upstream/private-<branch>` から始まっているので、注を付けて `skipped` と報告し、ブランチは作りません。 + +1. `integrate/strict-<YYYYMMDD>` ブランチ(ADR-01 §5 の名前)を作る。**開始点の規則:** `develop` が `upstream/public-<branch>` の先端を *まだ* 含まないなら、その先端から始める(`mode: strict`。ADR-01 §5 の手順 1)。`develop` が既に含むなら — 以前の統合で厳密な順が確立している — `develop` から始める(`mode: on-develop`)。公開先端から再び始めると、それまでの統合を全部捨ててしまうからである。どちらの mode でも以下のマージ(変更を共有のブランチへ受け入れること。[REF-01](../reference/REF-01_Glossary.md))順は同じ。ブランチは `git switch -c`(作成のみ)で作り、`checkout -B` は使わない。同名のブランチが統合リポジトリ **またはローカルの clone** に既にあれば決して書き換えず、エラーで止まる。ローカルのブランチには手で解いた衝突のコミット(§4)があり得るからである。`--dry-run` ではブランチを一切作らない。同じ開始点の detached HEAD 上でマージを行うので、dry-run は後の実行がリセットしたり拒んだりするブランチを残さない。 +2. `status: merged` の `private` 追跡ブランチ(`upstream/private-develop`、`upstream/private-master`)を `git merge --no-ff --no-edit` でマージする。`upstream/private-sec-test-fix-sec-test` のような候補の上流と `cos` の参照は決してマージしない。次に `adopted_prs[]` を並び順に、PR のリポジトリから `refs/pull/<n>/head` を fetch して、それぞれ独立したマージコミットとして `--no-ff` でマージする(ADR-01 §5 の手順 3)。既にブランチに含まれる元は `already-contained` となり、コミットを作らない。 +3. 全部のマージの後でブランチの先端が `develop` と同じなら(先端が一致)、結果は `no-op`。何も push せず PR も開かない。そうでなければブランチを push し(素の `git push`。決して強制しない)、`gh pr create` で `develop` への PR をリポジトリごとに一本、`統合: upstream YYYY-MM-DD(<name>)` の題で開く。本文(日本語)には開始点、`develop` の SHA、マージ順と各元の SHA・状態を書く。リポジトリは名前で書き、アドレスは書かない。`--dry-run` ではマージをローカルの detached HEAD 上で行う(だから衝突は検出される)が、ブランチは作らず、push も PR も行わない。この公開リポジトリ側では、対になる PR が `manifest/upstreams.json` と `upstreams.toon` を新しい SHA に進める([SPEC-01 §4](01_manifest.md#4-規則) の規則 2)。この更新はまだ自動化していない。 +4. CI がビルド、セキュリティ門([SPEC-03](03_security_gate.md))、受入試験([SPEC-04](04_acceptance_tests.md))を実行する。 + +終了コード: すべての部品が PR を開いた・`no-op`・`skipped` のいずれかなら 0。マージが衝突した、fetch か push が失敗した、ブランチが既にあった、`gh pr create` が失敗した(ブランチは既に push 済みで、詳細にそう書く)なら 70(`UPSTREAM_FAILED`。[SPEC-02 §6](02_installer_cli.md#japanese))。 + +### 4. 衝突の扱い + +「マージの衝突」は、両側が同じ行を変えていて Git が選べないときに起きます。統合 PR では: + +- `grdm-dev upstream integrate` は衝突を解きません。衝突したファイルを報告に列挙し、`git merge --abort` を行い、部品を `conflict` として push せずに終了 70 で止まります。その後 AID エージェントが衝突を **PR のブランチ上で** 通常のコミットとして解きます — `integrate/strict-<date>` 上で同じマージを手で行います — 。解き方の理由をコミット本文に日本語で書きます。 +- 優先順: セキュリティ修正の衝突なら `private` 側を残す。機能の衝突なら `public` 側を残す。判断できないときは両方をコメント付きで残し、PR にラベル `needs-owner-decision` を付ける。 +- エージェントは PR ブランチを **決して** force push せず、レビュー開始後に rebase せず、`upstream/*` に触れず、`develop` を直接編集しません。 +- 採用 PR が当たらなくなったら、黙って落とさず、マニフェストの PR でその項目を `candidate` にして `reason: "no longer applies after <sha>"` を書き、PR にラベル `adopted-pr-broken` を付けます。 +- 予算内で直せない理由で CI が落ちたら、要約コメントを残して PR を開いたままにします。日次報告は `integrate` を出し続けます。 + +### 5. レビュー・検査・マージ + +- **REV(Codex Astra)** が全統合 PR をレビューし、`docs/reviews/YYYY-MM-DD_Upstream_Integration_<name>_rN.md` と PR コメントに書きます。 +- **QAE(Claude Code Fable)** が回帰・受入の結果を検査し、判定を PR に記録します。 +- **所有者** がマージします。統合 PR では squash(複数コミットを一つに潰す)を禁止します。上流の履歴が消えるからです。マージコミットを使います。 +- エージェントはマージしません。自律の境界は、**検出 → 修正 PR → レビュー → 回帰・受入** までが自動、**マージと公開** が人です([ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md))。 + +### 6. COS 本家の参照追跡 + +`CenterForOpenScience/*`(COS。OSF を作る米国の団体 Center for Open Science。[REF-01](../reference/REF-01_Glossary.md))は `upstream/cos-develop` にミラーするだけです。RCOSDP のコードは何年も前に分かれているので、マージはしません。使い方は次の二つです。 + +- 同じ近代化(例: osf.io の Python 3.12 移植)を COS がどう解いたかを、M4 で私たちが移植するときに比べる。 +- COS が行い RCOSDP がまだ行っていないセキュリティ修正を見つける。週次 PR の本文に、`upstream/cos-develop` のコミットのうちメッセージに `CVE`・`security`・`vuln` を含むものを列挙する予定である(`grdm-dev upstream integrate` はまだこの一覧を書かない。ミラー報告が `cos` 行の SHA とコミット数を持つ)。 + +**COS が OSF をアーカイブしたら**(「アーカイブ」は持ち主がリポジトリを読み取り専用に凍結すること): + +1. ミラージョブがアーカイブの印を検出し、その元の取得を止める。 +2. マニフェストは最後の `cos` の SHA を `fetched_at` を凍結して `kind: cos` のまま保ち、`archived: YYYY-MM-DD` の注を足す。 +3. `upstream/cos-develop` は履歴としてリポジトリに残す。ほかは何も変わらない。日次ミラー、週次 PR、セキュリティ門、AI による脆弱性対応は、`public` と `private` の上流と私たち自身の `develop` の上で続く。これが POL-01 の要点で、COS が続けても止めても GRDM は組み続けられる。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Mirror | A copy that is kept identical to the original. | 元と同じ中身に保たれる写し。 | +| Fast-forward | Moving a branch straight ahead to a newer commit without creating a merge. | マージを作らずにブランチを新しいコミットへまっすぐ進めること。 | +| Force push | Overwriting a branch's history on the server. Forbidden here. | サーバ上のブランチの履歴を上書きすること。ここでは禁止。 | +| Merge conflict | Two sides changed the same lines and Git cannot choose. | 両側が同じ行を変えて Git が選べない状態。 | +| Cherry-pick | Copying one commit from one branch onto another. | あるブランチの一つのコミットを別のブランチに写すこと。 | +| Squash | Combining several commits into one, losing the individual history. | 複数のコミットを一つに潰し、個々の履歴を失うこと。 | +| Archived repository | A repository its owner froze read-only. | 持ち主が読み取り専用に凍結したリポジトリ。 | +| CVE | A public identification number for one known vulnerability. | 一つの既知の脆弱性に付く公開の識別番号。 | diff --git a/docs/spec/06_documentation_conventions.md b/docs/spec/06_documentation_conventions.md new file mode 100644 index 0000000..2296420 --- /dev/null +++ b/docs/spec/06_documentation_conventions.md @@ -0,0 +1,203 @@ +# SPEC-06 Documentation Conventions / 文書規約 + +> **Summary:** How every document in this repository is written: bilingual layout, glossary notes, diagrams, data, versions, and links. +> **概要:** このリポジトリの全文書の書き方。英和二部構成、用語注、図、データ、版、リンクの規則。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.4 — 2026-11-06. **Learned:** review records are the reviewer's record and must not be rewritten for a convention, so the glossary-note warning now skips `docs/reviews/` and §8 names that exception; first-use notes were added to the other documents instead (SPEC-06 §3). / レビュー記録はレビュワの記録であり規約のために書き換えてはならないと分かったため、用語注の警告は `docs/reviews/` を対象外とし、§8 にその例外を明記した。他の文書には初出の用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.3 — 2026-11-05. **Learned:** the written description of a check drifts from the tool as soon as the tool improves, so §8 must be re-read against `tools/docs_check.py` on every change to either (review r2, R2-03). / 検査の説明は道具が良くなった瞬間に古くなるため、どちらかを変えるたびに §8 と `tools/docs_check.py` を突き合わせる必要があると分かった(レビュー r2、R2-03)。 + 0.2 — 2026-11-05. **Learned:** a convention is only as strong as the check that enforces it, so the convention must name what the checker does today, what it leaves out, and which legacy files are exempt. / 規約の強さは、それを守らせる検査の強さまでしかない。だから規約は、検査が今日何を見て何を見ないか、どの旧資料を例外にするかを名指しで書く必要があると分かった。 +- Version / 版: 0.1 — 2026-11-05. **Learned:** a shared convention must exist before any other document, or the English/Japanese halves and glossary notes drift from the first page onward. / 他の文書より先に共通規約を置かないと、初めの一枚から英和の対応と用語注がずれると分かった。 +- Normative for: every `*.md` under this repository, including `README.md` at every directory level. +- Related: [SPEC-00 Overview](00_overview.md) · [POL-01 Position](../policy/POL-01_Developer_Environment_2027_Position.md) · [docs/README.md](../README.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Scope + +This specification governs the form of documents, not their content. It applies to all Markdown files in the repository: policies (`POL-nn`), specifications (`00`–`nn`), decisions (`ADR-nn`), references (`REF-nn`), demos, hand-offs, reviews, status boards, guides, and every `README.md`. + +**Glossary notes.** A *specification* is a rule book that implementers must follow. A *policy* is the position we take. A *decision record* (ADR) is a note that explains why we chose one way and not another. + +### 2. Page layout (mandatory order) + +1. `# <ID> <Title in English> / <日本語題>` — one H1 only. +2. A blockquote with **Summary** (English, one or two sentences) and **概要** (Japanese). +3. A **Jump** line with two links: `[English](#english)` and `[日本語](#japanese)`. +4. A **Version / 版** line (see §6), **Normative for** or **Applies to**, and **Related** links. +5. `---` +6. `<a id="english"></a>` then `## English`, first line `[→ 日本語版へ](#japanese)`, then the English body. +7. `---` +8. `<a id="japanese"></a>` then `## 日本語`, first line `[→ To English](#english)`, then the Japanese body. +9. Optional `## Glossary / 用語` table at the end, bilingual. + +The two halves say the same thing. The English half is the one translated into other languages later; the Japanese half is the one the GRDM team reviews. When they disagree, fix both in the same commit. + +**Why HTML anchors?** GitHub and MkDocs generate heading anchors differently, and Japanese headings produce unstable ids. An explicit `<a id="...">` works in both. Anchor ids are lowercase ASCII with hyphens. + +### 3. Writing style + +- Target reader: a new employee on their first week. Assume they can use a terminal but have never seen GRDM. +- One idea per sentence. Prefer verbs. Avoid "etc." — list the items or say "and similar". +- **Every technical term gets a glossary note the first time it appears in a document**, in parentheses or as a bold-lead sentence, in words a primary-school child would understand. Example: "a *container* (a box that holds one program and everything it needs, so it runs the same on any computer)". Terms already explained in the shared glossary (`docs/reference/REF-01_Glossary.md`) still get a short note on first use, plus a link. +- Procedures are complete: every command the reader must type is in a fenced code block, with the directory it runs in and the expected result or how to check it. +- Follow the GitHub Docs style: sentence-case headings, bold for UI labels, `code` for file names, commands, and identifiers, admonitions as blockquotes starting with **Note:**, **Warning:**, or **Tip:**. Use emoji sparingly and only as section markers in README files (for example 🚀 Quick start, 🧭 Map, 📚 Documents, 🛡️ Security). +- Do not write "this document", "the above", "below"; link to the section instead. + +### 4. Diagrams and data + +- Diagrams are written in Markdown with **Mermaid** fenced blocks (```` ```mermaid ````). No binary images for architecture, flows, or sequences. Screenshots are allowed for UI guides and live under `images/` next to the document. +- Data shown in documents (lists of repositories, versions, test results, allow-lists) is written in **TOON** (Token-Oriented Object Notation: a compact, indentation-based text form of JSON that both people and AI read easily) in a ```` ```toon ```` fenced block. When a machine also needs the data, the canonical file is JSON or YAML next to it and the document says so; `grdm-dev manifest check` verifies that the TOON excerpt and the JSON agree. +- A ```` ```toon ```` block that mirrors a JSON file declares it with an HTML comment on the line before the block, for example `<!-- canonical: manifest/upstreams.json -->` (the path is relative to the repository root). A block that is only an illustrative example carries no declaration and the surrounding text says that it is an example, not canonical data. +- Tables are for comparisons with few columns. Long tabular data goes in TOON. + +### 5. Links + +- Links are relative paths within the repository. Never link to `master`; link to files on `develop` or to tagged versions. +- Each document links to: its parent index (`README.md` of its folder), the specification it implements or the decision it records, and the documents that depend on it ("Used by"). +- Every folder has a `README.md` that lists its documents with one-line descriptions, in both languages. The root `README.md` is the table of contents of the whole repository and links to the HTML site at `site/index.html` (built by MkDocs, see [SPEC-02](02_installer_cli.md) for the `grdm-dev docs` command). +- Upstream GitHub links are allowed when they name a specific commit or PR; link to the private `-dev2027` repositories only by name, never by URL, in public-facing text. + +### 6. Version header + +- Versions live in the header, not in the file name (POL-02 §4). Format: `Version / 版: X.Y — YYYY-MM-DD. **Learned:** <what was discovered>. / <日本語>`. +- The newest version is first; older versions stay as one line each below it. +- The version line records **what was learned**, not what changed. Changing a document and bumping its version happen in the same commit. + +### 7. File naming + +| Kind | Name | Example | +|---|---|---| +| Specification | `nn_<topic>.md` (two digits) | `02_installer_cli.md` | +| Policy / Decision / Reference | `POL-nn_<Title>.md` / `ADR-nn_<Title>.md` / `REF-nn_<Title>.md` | `ADR-01_Integration_Repository_Placement.md` | +| Demo | `nn_<feature>.md`, sub-step `nn_m_<step>.md` | `20_core_install_mac_studio.md` | +| Hand-off / Review | `YYYY-MM-DD_<Title>.md`, reviews end with `_rN` | `2026-11-06_M1_Skeleton_Review_r1.md` | +| Guide | `docs/guides/<topic>/README.md` | `docs/guides/environment/README.md` | + +### 8. Checks + +`grdm-dev docs check` (and the `docs` GitHub Actions workflow) fails when a Markdown file: + +- lacks the `english`/`japanese` anchors or the Jump line; +- has a relative link that does not resolve; +- has a ```` ```toon ```` block whose sibling JSON disagrees; +- has a glossary term from `REF-01` used without a note on first occurrence (warning, not failure, until M2); +- lacks a Version line in the header. + +**What `tools/docs_check.py` checks today.** Until `grdm-dev docs check` exists ([SPEC-02 §3](02_installer_cli.md#english)), the helper `tools/docs_check.py`, run by the `docs` workflow, is the implementation. It checks exactly these points: + +- the `english` and `japanese` anchors; +- the Jump line; +- the Version line; +- relative links: the file part before any `#fragment` must exist, and the fragment must resolve to an `<a id>` / `<a name>` anchor or a heading in the target file (same-file `#fragment` links are checked the same way); +- TOON SHA parity: when the line before a ```` ```toon ```` block carries `<!-- canonical: <path> -->`, every 40-character SHA in the block must appear in that JSON file (§4); +- the glossary-note warning: a `REF-01` term used without a note on first occurrence is reported as a warning, not a failure. Files under `docs/reviews/` are exempt from this warning only: review records are the reviewer's record and are kept verbatim, so nobody inserts notes into them after the fact. Their anchors, Jump line, Version line and links are still checked. + +**Legacy-format exception.** Files kept in their historical form are not checked and are not rewritten to SPEC-06: `*.legacy.md`; sample code and sub-documents under `docs/guides/<topic>/` other than that guide's `README.md`; and the pointer files left at old paths (`Environment.md`, `SetupOsfOnEC2.md` and similar at the repository root), which only redirect to the new location. They are history, not current procedure. Every other Markdown file in the repository, including `manifest/README.md` and the installer README, is checked. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 範囲 + +この規約は文書の「形」を定めるもので、内容は定めません。リポジトリ内のすべての Markdown に適用します。方針(`POL-nn`)、仕様(`00`〜`nn`)、決定の記録(`ADR-nn`)、参考(`REF-nn`)、実証、引継ぎ、レビュー、進捗、手引き、そして各フォルダの `README.md` です。 + +**用語注。** 「仕様」は、実装する人が必ず守るルールブックです。「方針」は、私たちの立場を書いたものです。「決定の記録」(ADR)は、なぜその道を選び、ほかを選ばなかったかを残すメモです。 + +### 2. ページの構成(この順番で必須) + +1. `# <ID> <英語題> / <日本語題>` — H1 は一つだけ。 +2. 引用ブロックに **Summary**(英語 1〜2 文)と **概要**(日本語)。 +3. **Jump** 行に `[English](#english)` と `[日本語](#japanese)` の二つのリンク。 +4. **Version / 版** 行(§6)、**Normative for** または **Applies to**、**Related** リンク。 +5. `---` +6. `<a id="english"></a>` の次に `## English`、最初の行は `[→ 日本語版へ](#japanese)`、続いて英語本文。 +7. `---` +8. `<a id="japanese"></a>` の次に `## 日本語`、最初の行は `[→ To English](#english)`、続いて日本語本文。 +9. 末尾に任意で `## Glossary / 用語` の二言語の表。 + +英語と日本語は同じ内容を書きます。英語は後で他言語へ訳す元になり、日本語は GRDM チームがレビューする元になります。食い違ったら同じコミットで両方を直します。 + +**なぜ HTML のアンカーか。** GitHub と MkDocs は見出しの ID の作り方が違い、日本語見出しは不安定な ID になります。明示的な `<a id="...">` は両方で動きます。ID は小文字の ASCII とハイフンだけにします。 + +### 3. 文体 + +- 想定読者は入社一週目の新入社員。端末は使えるが GRDM は初めて、と考えます。 +- 一文一義。動詞で書く。「など」は避け、項目を列挙するか「およびその類」と書く。 +- **専門用語は、文書内で初めて出た箇所に必ず用語注を付ける。** 括弧または太字で始まる一文で、小学生にも分かる言葉で説明する。例:「コンテナ(一つのプログラムと必要なものを一箱に入れ、どのコンピュータでも同じように動かすための箱)」。共通用語集(`docs/reference/REF-01_Glossary.md`)にある語でも、初出では短い注とリンクを付ける。 +- 手順は完結させる。読者が打つコマンドはすべてコードブロックに入れ、実行するディレクトリと、期待する結果か確認方法を添える。 +- GitHub Docs のスタイルに従う。見出しは文頭のみ大文字(英語)、UI のラベルは太字、ファイル名・コマンド・識別子は `code`、注意書きは **Note:** / **Warning:** / **Tip:** で始まる引用ブロック。絵文字は README の節の目印に限って控えめに使う(例: 🚀 クイックスタート、🧭 地図、📚 文書、🛡️ セキュリティ)。 +- 「本文書」「上記」「下記」は使わず、該当の節へリンクする。 + +### 4. 図とデータ + +- 図は Markdown 内の **Mermaid** コードブロック(```` ```mermaid ````)で書く。構成図・流れ図・シーケンス図に画像ファイルを使わない。UI の手引きに限りスクリーンショットを許し、文書と同じ場所の `images/` に置く。 +- 文書に載せるデータ(リポジトリ一覧、バージョン、試験結果、許容リスト)は **TOON**(Token-Oriented Object Notation。JSON を字下げで表した短い文字形式で、人も AI も読みやすい)で ```` ```toon ```` のブロックに書く。機械も読むデータは、隣に JSON か YAML の正本を置き、文書にそう記す。`grdm-dev manifest check` が TOON の抄録と JSON の一致を確かめる。 +- JSON ファイルを写す ```` ```toon ```` ブロックは、その直前の行に HTML コメントで正本を宣言する。例: `<!-- canonical: manifest/upstreams.json -->`(パスはリポジトリのルートからの相対)。説明のための例にすぎないブロックには宣言を付けず、周りの文で「例であり正本ではない」と書く。 +- 表は列の少ない比較に使う。長い表形式のデータは TOON にする。 + +### 5. リンク + +- リンクはリポジトリ内の相対パス。`master` へはリンクせず、`develop` 上のファイルかタグ付きの版へリンクする。 +- 各文書は次へリンクする: 親の索引(そのフォルダの `README.md`)、実装する仕様または記録する決定、そしてこの文書に依存する文書(「Used by」)。 +- 各フォルダに `README.md` を置き、文書を一行説明付きで二言語で列挙する。ルートの `README.md` はリポジトリ全体の目次で、MkDocs が生成する HTML(`site/index.html`。コマンドは [SPEC-02](02_installer_cli.md) の `grdm-dev docs`)へリンクする。 +- 上流 GitHub へのリンクは、特定のコミットか PR を指すときだけ許す。非公開の `-dev2027` リポジトリは、外向けの文章では名前だけを書き URL は書かない。 + +### 6. 版のヘッダ + +- 版はファイル名でなくヘッダに持つ(POL-02 §4)。形式: `Version / 版: X.Y — YYYY-MM-DD. **Learned:** <分かったこと>. / <日本語>`。 +- 最新の版を先頭に置き、過去の版は一行ずつ下に残す。 +- 版の行には「何を変えたか」でなく **「何が分かったか」** を書く。文書の変更と版の更新は同じコミットで行う。 + +### 7. ファイル名 + +| 種別 | 命名 | 例 | +|---|---|---| +| 仕様 | `nn_<題>.md`(2 桁) | `02_installer_cli.md` | +| 方針・決定・参考 | `POL-nn_<題>.md` / `ADR-nn_<題>.md` / `REF-nn_<題>.md` | `ADR-01_Integration_Repository_Placement.md` | +| 実証 | `nn_<機能>.md`、枝番 `nn_m_<手順>.md` | `20_core_install_mac_studio.md` | +| 引継ぎ・レビュー | `YYYY-MM-DD_<題>.md`、レビューは末尾 `_rN` | `2026-11-06_M1_Skeleton_Review_r1.md` | +| 手引き | `docs/guides/<題>/README.md` | `docs/guides/environment/README.md` | + +### 8. 検査 + +`grdm-dev docs check`(と GitHub Actions の `docs` ワークフロー)は、次の Markdown を不合格にする。 + +- `english` / `japanese` のアンカーか Jump 行がない。 +- 解決できない相対リンクがある。 +- ```` ```toon ```` ブロックと隣の JSON が一致しない。 +- `REF-01` の用語が初出で注なしに使われている(M2 までは警告、以後は不合格)。 +- ヘッダに Version 行がない。 + +**`tools/docs_check.py` が今日検査すること。** `grdm-dev docs check` ができるまで([SPEC-02 §3](02_installer_cli.md#japanese))、`docs` ワークフローが動かす補助ツール `tools/docs_check.py` が実装です。検査するのは次の点に限ります。 + +- `english` と `japanese` のアンカー。 +- Jump 行。 +- Version 行。 +- 相対リンク。`#フラグメント` より前のファイル部分が存在し、フラグメントが相手のファイルの `<a id>` / `<a name>` アンカーか見出しに解決しなければならない(同じファイル内の `#フラグメント` も同様に確かめる)。 +- TOON の SHA 一致。```` ```toon ```` ブロックの直前の行に `<!-- canonical: <パス> -->` の宣言があるとき、ブロック内の 40 文字の SHA がすべてその JSON に現れること(§4)。 +- 用語注の警告。`REF-01` の用語が初出で注なしに使われていれば警告として報告する(不合格ではない)。`docs/reviews/` の下のファイルだけはこの警告の対象外とする。レビュー記録はレビュワの記録であり、原文のまま残すので、あとから用語注を差し込まない。アンカー、Jump 行、Version 行、リンクは引き続き検査する。 + +**旧形式の例外。** 歴史的な形のまま残すファイルは検査せず、SPEC-06 の形にも書き直さない。`*.legacy.md`、`docs/guides/<題>/` の下にあるその手引きの `README.md` 以外のサンプルコードと下位文書、そして旧パスに残した誘導ファイル(リポジトリのルートの `Environment.md`、`SetupOsfOnEC2.md` およびその類。新しい置き場へ案内するだけのもの)です。これらは歴史であり、現行の手順ではありません。それ以外のリポジトリ内の Markdown は、`manifest/README.md` と installer の README を含めてすべて検査します。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Markdown | A plain-text way of writing documents where `#` makes a heading and `-` makes a list. | `#` で見出し、`-` で箇条書きになる、文字だけで書く文書の書き方。 | +| Anchor | A bookmark inside a page that a link can jump to. | ページの中の「しおり」。リンクで飛べる。 | +| Mermaid | A way to draw diagrams by typing text instead of drawing with a mouse. | マウスで描く代わりに文字で図を描く仕組み。 | +| TOON | A compact text form of JSON data, easy for people and AI to read. | JSON のデータを短く字下げで書いた形。人にも AI にも読みやすい。 | +| MkDocs | A tool that turns Markdown files into a website. | Markdown のファイルを Web サイトに変える道具。 | diff --git a/docs/spec/README.md b/docs/spec/README.md new file mode 100644 index 0000000..46ebb5d --- /dev/null +++ b/docs/spec/README.md @@ -0,0 +1,101 @@ +# Specifications / 仕様 + +> **Summary:** Rules to implement: how the installer works, security gate thresholds, acceptance test scenarios, upstream tracking, documentation conventions. These documents tell implementers what to build. +> **概要:** 実装するルール:インストーラーの仕組み、セキュリティ門の基準、受入試験のシナリオ、上流追従、文書規約。これらの文書は実装者に何を構築すべきかを伝えます。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-10. **Learned:** the installer specification also governs the scripts that run before the installer, so an index line must name them ([ADR-08](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md)). / インストーラーの仕様は、インストーラーの前に動くスクリプトも定めるので、索引の行にも名指しする([ADR-08](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md))。 +- Version / 版: 0.2 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.1 — 2026-11-05. **Learned:** the installer, the security gate and the acceptance tests had to be written down as rules before any code, otherwise each implementer would fill the gaps differently. / インストーラー、セキュリティの門、受入試験は、コードより先に規則として書いておかないと、実装する人ごとに隙間の埋め方が変わると分かった。 +- Normative for: [SPEC-00 Overview](./00_overview.md) through [SPEC-06 Documentation Conventions](./06_documentation_conventions.md). +- Related: [../README.md](../README.md) · [policy/](../policy/README.md) · [decisions/](../decisions/README.md) · [reference/REF-01_Glossary.md](./../reference/REF-01_Glossary.md) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. What belongs here + +A *specification* is a rule book that implementers must follow. This folder contains: + +| ID | File | Purpose | +|---|---|---| +| SPEC-00 | [00_overview.md](./00_overview.md) | Component map, milestones, roles, the big picture. | +| SPEC-01 | [01_manifest.md](./01_manifest.md) | The manifest: which upstream commits and PRs the installer builds. | +| SPEC-02 | [02_installer_cli.md](./02_installer_cli.md) | The `grdm-dev` CLI, `install.sh` and the per-OS prerequisite scripts: host checks, secrets, compose, build, health, reports. | +| SPEC-03 | [03_security_gate.md](./03_security_gate.md) | SBOM, CVE scan, static analysis, ZAP, AI red team, per-milestone thresholds. | +| SPEC-04 | [04_acceptance_tests.md](./04_acceptance_tests.md) | Playwright Python acceptance: success and rejection cases per feature. | +| SPEC-05 | [05_upstream_tracking.md](./05_upstream_tracking.md) | Daily mirror and diff report, weekly AI integration PR, COS reference tracking. | +| SPEC-06 | [06_documentation_conventions.md](./06_documentation_conventions.md) | How every document is written. | + +### 2. Creating a new specification + +1. Name the file `NN_<Topic>.md` (two-digit number, next available). +2. Follow [SPEC-06 documentation conventions](./06_documentation_conventions.md). +3. Link to related policies (POL-NN) and decisions (ADR-NN). +4. Create a decision record if the specification records a choice. +5. The owner approves; QAE (the role that checks that the work is correct; see [REF-01](../reference/REF-01_Glossary.md)) writes specifications for new features. + +### 3. How specifications relate to other documents + +```mermaid +flowchart TD + P[Policy: position] --> S[Spec: rules to implement] + A[Decision record: why we chose this] --> S + S --> C[Code: implement the rule] +``` + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. ここに属するもの + +「仕様」は実装する人が守るルールブックです。このフォルダには次が含まれます: + +| ID | ファイル | 目的 | +|---|---|---| +| SPEC-00 | [00_overview.md](./00_overview.md) | 部品の地図、節目、役割、全体像。 | +| SPEC-01 | [01_manifest.md](./01_manifest.md) | マニフェスト:どの上流のコミットと PR を組むか。 | +| SPEC-02 | [02_installer_cli.md](./02_installer_cli.md) | `grdm-dev` CLI、`install.sh`、OS ごとの前提条件スクリプト:ホスト判定、秘密、compose、ビルド、健康確認、報告。 | +| SPEC-03 | [03_security_gate.md](./03_security_gate.md) | SBOM、CVE スキャン、静的解析、ZAP、AI レッドチーム、節目ごとの基準。 | +| SPEC-04 | [04_acceptance_tests.md](./04_acceptance_tests.md) | Playwright Python 受入:機能ごとの成功・拒否ケース。 | +| SPEC-05 | [05_upstream_tracking.md](./05_upstream_tracking.md) | 日次ミラーと差分報告、週次の AI 統合 PR、COS 参照追跡。 | +| SPEC-06 | [06_documentation_conventions.md](./06_documentation_conventions.md) | すべての文書の書き方。 | + +### 2. 新しい仕様をつくるには + +1. ファイル名を `NN_<題>.md`(2 桁の番号、次に空いているもの)にする。 +2. [SPEC-06 文書規約](./06_documentation_conventions.md)に従う。 +3. 関連する方針(POL-NN)と決定(ADR-NN)へリンクする。 +4. 仕様が選択を記録する場合は決定の記録を作成する。 +5. 所有者が承認;QAE(QA担当。成果が正しいか検査する役割。[REF-01](../reference/REF-01_Glossary.md))が新機能の仕様を書く。 + +### 3. 仕様が他の文書とどう関係するか + +```mermaid +flowchart TD + P[方針:立場] --> S[仕様:実装するルール] + A[決定の記録:なぜこの道を選んだか] --> S + S --> C[コード:ルールを実装] +``` + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Specification | A rule book that implementers must follow. | 実装する人が守るルールブック。 | +| Policy | A statement of our position on what we will and will not do. | 我々が何をし、何をしないかの立場。 | +| Decision record (ADR) | A note explaining why we chose one way and not another. | なぜその道を選び、ほかを選ばなかったかのメモ。 | +| Implementation | Writing code that follows the spec. | 仕様に従ってコードを書くこと。 | +| Milestone | A checkpoint with a pass/fail test. | 合否の試験がある関門。 | +| Acceptance test | A check that the whole thing does what the user asked for. | 全体が利用者の望みどおりに動くかの確認。 | diff --git a/docs/status/README.md b/docs/status/README.md new file mode 100644 index 0000000..a731c7b --- /dev/null +++ b/docs/status/README.md @@ -0,0 +1,216 @@ +# Status Board / 進捗ボード + +> **Summary:** The single source of truth for milestone progress: M1–M5 status, open items, upstream tracking reports. The rules that define this board as the authoritative progress record. +> **概要:** 節目進捗の唯一の正本:M1〜M5 の進捗、未解決項目、上流追従報告。このボードが権威ある進行状況記録であることを定める規則。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.19 — 2026-11-14. **Learned:** an emulated VM can pass every stage of the final pins (14 of 14 with C4, a complete scan) and still not show the one thing the row asks for, an uninterrupted one-command install, so the row says both instead of turning green (DEMO-22 0.7). / エミュレーションの VM は最終の固定版のすべての段を通せても(C4 を含む 14 件中 14 件、完走した検査)、行が求める一つのこと、途切れない一つのコマンドでの導入は示せない。だから行は緑にせず、両方を書く(DEMO-22 0.7)。 + 0.18 — 2026-11-13. **Learned:** a milestone can be closed by an owner decision without meeting every written criterion, and then the board has to list what was not met instead of turning the row green: M2 closed on 2026-11-13 (「一括で承認、M2 完了」) with 58 allow-list entries against a criterion of fewer than M1's 0, amd64 acceptance shown only on an emulated VM, and the `workflow`-scope CI still unpushed; the owner accepted 58 as the M2 exit count, so the M3 ceiling is 58, and the carried items moved to their own M3 table (§2d). / 節目は、書かれた条件をすべて満たさなくても所有者の判断で閉じられる。そのときボードは行を緑にするのでなく、満たさなかったことを列挙しなければならない。M2 は 2026-11-13 に閉じた(「一括で承認、M2 完了」)。許容リストは M1 の 0 より少なくという条件に対して 58 項目、amd64 の受入はエミュレーションの VM でしか示しておらず、`workflow` 権限の CI はまだ push していない。所有者は 58 を M2 の終了時の件数として受け入れたので M3 の上限は 58 になり、持ち越した項目は M3 専用の表(§2d)に移した。 + 0.17 — 2026-11-13. **Learned:** a board row is only finished when it names the merge commit it was proven on: the osf.io pin moved from a local candidate to the merged develop tip `90b10661c8dc` (#8, #10, #11 merged), and the Mac stack was rebuilt on it with 14 of 14 acceptance and a complete scan; the rows that wait on the `workflow` token scope (R7-01, `images.yml`, per-OS workflows) say so instead of reading as done. / ボードの行は、確かめたマージコミットを名指して初めて完了になる。osf.io の固定版はローカルの候補からマージ後の develop 先端 `90b10661c8dc`(#8・#10・#11 マージ済み)に移り、Mac のスタックをそれで組み直して受入 14 件中 14 件と完走した検査を得た。`workflow` 権限を待つ行(R7-01、`images.yml`、per-OS のワークフロー)は、完了に見えないようそう書く。 + 0.16 — **Learned:** an owner decision becomes a row of installer work only when each consumer of the old component is named: Elasticsearch 2 left when osf.io's client moved (PR #11), sharejs and mongo when its editor moved (PR #12), and what is not done (Elasticsearch 6, the admin Shibboleth `idp` mode, the pin to a real merge) is a row of its own, not a footnote. / 所有者の判断は、古い部品を使う側を一つずつ名指ししたとき初めて、インストーラーの作業の行になる。Elasticsearch 2 は osf.io のクライアントが移ったとき(PR #11)、sharejs と mongo は編集が移ったとき(PR #12)に消え、まだ済んでいないこと(Elasticsearch 6、管理者の Shibboleth の `idp` モード、実際のマージへの固定)は脚注でなく独立した行にする。 + 0.15 — 2026-11-11. **Learned:** a row measured under the M1 report-only gate must not stay green once the condition it names changes: 58 allow-list entries against a baseline of 0 is an open M2 item until the owner decides the ceiling, whatever the scan exit code says ([PR #45 review r1](../reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r1.md) R1-02). / M1 の報告のみの門の下で測った行は、行が名指す条件が変われば緑のままにしてはならない。上限 0 に対して許容リスト 58 項目は、検査の終了コードが何であれ、所有者が上限を決めるまで M2 の残件である([PR #45 レビュー r1](../reviews/2026-11-11_RDM-developer-guide_PR45_Pin_Py313_r1.md) R1-02)。 + 0.14 — 2026-11-11. **Learned:** passing C5 proves only the preview path of the classic page; the new ember UI builds its preview URL through API v2, a different osf.io route, so it gets its own open row until a scenario covers it. / C5 の合格が示すのは旧来のページのプレビュー経路だけである。新しい ember の画面は API v2 という osf.io の別の経路でプレビューの URL を作るので、それを試すシナリオができるまで専用の残件行を置く。 + 0.13 — 2026-11-10. **Learned:** an owner decision changes a waiting row into a working row the same day, so the M5 rows now name the chosen paths, and a merged-looking row keeps its review state (PR #42 review r1). / 所有者の判断は待ちの行をその日のうちに作業中の行に変えるので、M5 の行は選ばれた道を書き、マージ済みに見える行もレビューの状態を保つ(PR #42 レビュー r1)。 + 0.12 — 2026-11-10. **Learned:** M5 work started before M2 closed, so M5 gets its own open-items table now (rule 3): one part is done and measured (PostgreSQL 18), the other two wait for owner decisions (ADR-13). / M5 の作業は M2 が閉じる前に始まったので、M5 にも今から専用の残件表を置く(規則 3)。一つは完了して測定済み(PostgreSQL 18)、残る二つは所有者の判断待ち(ADR-13)。 + 0.11 — 2026-11-10. **Learned:** an open row that a later all-green row depends on must be closed in the same change, or the board contradicts itself (PR #40 review r1 R1-03). / 後の全件合格の行が前提にしている未完了の行は、同じ変更で閉じなければボードが自己矛盾する(PR #40 レビュー r1 R1-03)。 + 0.10 — 2026-11-10. **Learned:** a scenario that passes only on a stack built from the pinned commits is evidence; a pass on a stack still running older images is not, because Compose kept the tags recorded by the previous build. / 固定した版から組んだスタックで通った試験だけが証拠になる。古いイメージのままのスタックでの合格は証拠にならない。Compose は前回のビルドが記録したタグを使い続けたからである。 + 0.9 — 2026-11-10. **Learned:** acceptance counts per scenario belong on the board, because a single pass count hides which link is broken. / 受入の件数はシナリオごとにボードへ書く。合格数だけでは、どの連携が壊れているか分からない。 + 0.8 — 2026-11-06. **Learned:** a warm success and a cold-start success are two different rows: the cold start needed one more architecture decision (ADR-07) before it passed. / 温まった状態の成功とコールドスタートの成功は別の行である。コールドスタートは通るまでにもう一つ設計判断(ADR-07)を要した。 + 0.7 — 2026-11-06. **Learned:** the M2 open-items table needs the build row and the start-up row kept separate, because build finished at run 6 while start-up took seven more runs. / M2 の残件表はビルドの行と起動の行を分けておく必要がある。ビルドは第 6 回で終わり、起動にはさらに 7 回かかった。 + 0.6 — 2026-11-06. **Learned:** the M2 row still said "awaiting owner merge" nine PRs later; a board row must be updated in the same PR that changes what it describes, and a milestone in progress needs its own open-items table (§2b). / M2 の行は 9 本の PR を経ても「所有者マージ待ち」のままだった。ボードの行は、その記述の対象を変える PR と同じ PR で更新しなければならず、進行中の節目には専用の残件表(§2b)が要る。 + 0.5 — 2026-11-06. **Learned:** an installer change that depends on a matching change in an integration repository must leave an open item here, or the dependency is only visible in an ADR (PR #30 review r1 R1-03: the wiki editor page must load the new bundle path). / 統合リポジトリ側の対応する変更に依存するインストーラーの変更は、ここに残件を残さなければ ADR の中にしか見えないと分かった(PR #30 レビュー r1 R1-03: Wiki エディタのページが新しい束のパスを読む必要がある)。 + 0.4 — 2026-11-06. **Learned:** a board row must state what happened to a closed pull request (closed without merge, superseded) rather than "no PR", or the history reads wrong (review r1 of PR #22). / 閉じた PR は「PR なし」ではなく「マージせず閉鎖」「置き換え」と書かないと履歴が誤って読まれる(PR #22 レビュー r1)。 + 0.3 — 2026-11-05. **Learned:** a milestone is marked done only when its PR is merged, so M1 flipped to done at the merge of PR #19 and not when the documents were written. / 節目は PR がマージされたときにだけ完了にする。M1 は文書を書いた時点ではなく PR #19 のマージで完了になった。 + 0.2 — 2026-11-05. **Learned:** the board must say what a CI check covers at the current milestone (Trivy: file system, report-only), or a green run is read as full coverage. / ボードは CI の検査が今の節目で何を対象にしているか(Trivy はファイルシステムに対する報告のみ)を書かなければ、緑の結果が全範囲の合格と読まれてしまうと分かった。 +- Version / 版: 0.1 — 2026-11-05. **Learned:** without a single source of truth, it was unclear whether M1 completion meant "docs written" or "PR merged"; the board's explicit rules resolve ambiguity. / 単一の正本がなければ、M1 完了が「文書を書いた」か「PR をマージした」か分からず、ボードの明示的な規則で曖昧さを解消すると分かった。 +- Normative for: [status/upstream/](upstream/README.md) and all milestone progress tracking. +- Related: [../README.md](../README.md) · [demo/](../demo/README.md) · [spec/00_overview.md#5-milestone-ladder](./../spec/00_overview.md#english) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Milestones + +| Milestone | Goal | Security gate | Status | +|---|---|---|---| +| M1 | Docs skeleton, manifest, dev2027 repos exist; reviewed PRs merged to develop | Report + allow-list | ✅ **Done** (PR #19 merged 2026-11-05) | +| M2 | Core 6 install with one command on Mac Studio; Playwright acceptance passes; amd64 builds | Report + allow-list (fewer entries than M1) | ✅ **Done by owner decision of 2026-11-13** (「一括で承認、M2 完了」), with known limits, **not** by meeting every written criterion. Shown: on the Mac Studio, the one-command install succeeded in earlier real install runs on earlier pins; on the final merged pins the existing Mac environment was updated with separate commands, then acceptance passed 14 of 14 (run `acc-20261112T223428Z-fda84a`) and the scan completed (operator-recorded) ([DEMO-20](../demo/20_core_install_mac_studio.md#english)). On Ubuntu arm64 the final pins were installed with the one command into a new checkout (fifth attempt; the VM was not new) and acceptance passed 14 of 14 (run `acc-20261113T021549Z-92641d`, [DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md#english)). **Not met or not shown:** (1) the allow-list holds 58 entries against the written criterion "fewer than M1" (M1: 0); the owner's decision accepts 58 as the M2 exit count in `manifest/allowlist.baseline.json`, it does not make the criterion met; (2) amd64: acceptance 11 of 12 recorded only on an emulated VM ([DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md#english); C4 success failed at the suite's 30 s wait), `scan` exited 51 there (Trivy did not finish the ember-osf-web image), and osf.io and wiki-frontend were not built on amd64; `accept --wait-scale` and `scan --trivy-timeout` exist since PR #60 and a re-run on that VM is in progress, not yet recorded; (3) the CI that needs a token with the `workflow` scope (per-OS workflows, the `images.yml` smoke test, osf.io R7-01) is not pushed; the owner decided to grant that scope; (4) no authenticated ZAP scan: under mandatory sign-in `web` is skipped. Carried items: §2d | +| M3 | 5 subsystems start; one success + one rejection case each | Report + allow-list (fewer entries than M2) | **Current** since 2026-11-13: `manifest/milestone.json` says M3 (gate `count-not-growing`) and the allow-list ceiling is the M2 count, 58 (`manifest/allowlist.baseline.json`); the S1–S5 acceptance modules still carry an unconditional `skip(reason=M3)` ([DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md#english)). Open items: §2d | +| M4 | Waterbutler, mfr, osf.io on Python 3.13 | Stop on HIGH or above; first AI red-team run | Planned | +| M5 | ES2 and mongo removed; ES8 + postgres 15 or later; distributable abroad | Zero CRITICAL/HIGH; zero open AI red-team paths | **Groundwork** (§2c): PostgreSQL 18 with `db upgrade` ([ADR-12](../decisions/ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md#english)); Elasticsearch 2, MongoDB and sharejs are gone from the installer and Elasticsearch 8 replaces ES 2 on the merged osf.io `develop` `90b10661c8dc`, 14 of 14 acceptance ([ADR-13 §6](../decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md#english), [ADR-14](../decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md#english)); the integration branch awaits its pull request | + +### 2. Open items for M1 + +| Item | Status | +|---|---| +| docs skeleton (READMEs for all folders) | ✅ Written | +| manifest/upstreams.json | ✅ Created | +| dev2027 integration repos (11) | ✅ Created | +| dev2027 strict reconstruction PRs (7 merged 2026-11-06; RDM-wiki-frontend-dev2027 #1 was closed without merge because both tips were identical) | ✅ Merged; `integration_sha` pinned in the manifest | +| MkDocs site build (`site/`, strict build passes) | ✅ Built | +| Guides migration to `docs/guides/` (pointers kept at old paths) | ✅ Done | +| Codex Astra review of RDM-osf.io-dev2027 PR #1 (historical) | ✅ Superseded: #1 closed 2026-11-05 after the owner rejected the bootstrap interpretation; #2 (strict reconstruction) merged 2026-11-06 | +| M1 skeleton PR to `develop` (this repository, PR #19) | 🔄 Open; review r1 of 2026-11-05 asked for changes (R1–R8); corrections in progress, then owner merge | +| GitHub Actions (docs, security) | ✅ Running on PR #19 (docs, gitleaks, manifest pass) | +| Trivy in CI (`security.yml`) | ⏳ At M1 report-only over the repository file system, because no image exists yet ([SPEC-03 §4.1](../spec/03_security_gate.md#english)); image scanning starts with the first build (M2) | +| Semgrep findings in legacy guide sample code (6: raw HTML in templates ×4, exec ×1, path join ×1) | ⏳ Deferred to the guide rewrite (M2/M3); paths listed in `.semgrepignore` with reasons | + +### 2b. Open items for M2 + +| Item | Status | +|---|---| +| Installer CLI and templates (SPEC-02), overlay support (ADR-06) | ✅ Merged (PR #21–#30) | +| Real install on Mac Studio reaches `build` for all six components | ✅ Run 6 (2026-11-06): three built locally, two prebuilt, one overlay | +| `up` → `health --network` → `scan` → `report` on Mac Studio | ✅ Run 18 (2026-11-06, PR #33): exit 0, ready at the loopback URL; runs 6–17 fixed one start-up fact each (DEMO-20) | +| Cold start (empty volumes, new `runtime/`) on Mac Studio | ✅ Run 21 (2026-11-06, PR #34, ADR-07): exit 0 in 31 minutes; run 19 had shown the emulated Elasticsearch 2 needing 38 minutes to start, replaced by a native image | +| edit.mako wiring in the integration repository — `RDM-osf.io-dev2027` `addons/wiki/templates/edit.mako` must load `/static/public/js/wiki/wiki-edit-page.js` (the bundle that `wiki_assets` copies into the volume `wiki_static`, [ADR-06 §4](../decisions/ADR-06_Wiki_Frontend_Overlay.md#english)) instead of `/static/js/pages/wiki-edit-page.js`; browser check of the editor and C4 once a real install reaches `up` | ✅ Done: `RDM-osf.io-dev2027` PR #4 merged on 2026-11-09 (`7acc9abf9e`); C4 passes 2 of 2 in run `acc-20261110T015520Z-ab4cc7` (PR #40 review r1 R1-03) | +| Playwright acceptance C1–C7 | ✅ **14 of 14 pass** again on the merged final pins on 2026-11-12 (run `acc-20261112T223428Z-fda84a`, UTC; osf.io `90b10661c8dc` after #8, #10, #11 merged; scan exit 0, 6,264 open findings, [DEMO-20](../demo/20_core_install_mac_studio.md#english)). Before that, **14 of 14 pass** on 2026-11-12 (run `acc-20261111T230217Z-d8363c`, UTC) on the local osf.io candidate (develop `73ff43b3c2` + PR #8, #10, #11) with Elasticsearch 8, y-websocket only, mandatory sign-in and the admin second factor; C7 (file-page co-editing) is new ([DEMO-20](../demo/20_core_install_mac_studio.md#english)). Before that: **12 of 12 pass** on 2026-11-10 (run `acc-20261110T015520Z-ab4cc7`) with every merged security fix: HMAC unification, wiki WebSocket JWT (anonymous socket closed with 4401), MFR redirect credentials, admin assets served locally, Google Analytics removed ([DEMO-20](../demo/20_core_install_mac_studio.md#english)). Merges under the [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md#english) delegation with review records in `docs/reviews/`. After the Python 3.13 pins (PR #45), C5 broke and was fixed in MFR PR #7 (`9771b8cf`); 12 of 12 again in run `acc-20261111T132104Z-530071` | +| Trivy image scan and allow-list count (fewer than M1) | ⚠️ **Not met; M2 closed by the owner's decision of 2026-11-13** (「一括で承認、M2 完了」). Image scanning works, but the count condition is **not met**. History: run 18 (Trivy alone) measured 1835 CRITICAL / 8290 HIGH / 9763 MEDIUM / 3886 LOW over 22 targets. Run 21, with the native Elasticsearch 2, measured 1769 / 8030 / 9550 / 3676, and the allow-list then had 0 entries (M1: 0). Now: PR #45 adds **58 entries** for Debian 13 packages without a fixed version in the Python 3.13 WaterButler and MFR images. Since PR #45 review r1 (R1-01), each entry names its exact packages and stops matching once a fix exists. They cover 177 findings in `scan_20261111T132607Z` (open Trivy CRITICAL/HIGH 726 / 3,769), while `manifest/allowlist.baseline.json` said 0 and the scan passed only because `manifest/milestone.json` was M1 (report-only); under M2's count-not-growing rule 58 > 0 fails. At milestone exit (SPEC-03 §5.1 rule 5) the owner declared M2 complete without the criterion being met, and that decision is recorded as the M2 exit count: `counts` is `{M1: 0, M2: 58}` and `manifest/milestone.json` is M3, so the ceiling is 58 and a 59th entry exits 50 (unit test `test_m3_ceiling_is_the_m2_exit_count`). The review of the 58 entries (expiry 2026-12-31) is carried to §2d | +| Preview from the new ember UI (API v2) cannot reach the internal WaterButler — separate from C5, which uses the classic file page | ⏳ **Carried to M3** (§2d). History: the cause found by code reading (not reproduced in a browser) was that `api/files/serializers.py` built `links.render` as MFR `/render?url=<DOMAIN>/download/<guid>/?direct&mode=render`, a browser-facing URL the MFR container cannot reach, whose route also ignored `mode=render`. RDM-osf.io-dev2027 PR #14 (server side) and RDM-ember-osf-web-dev2027 PR #3 are both merged. Open: a check on the real ember screen after deployment; no acceptance scenario covers the ember preview yet, so success there is not shown. MFR's credential pair (`http://web:5000` → `http://wb:7777`, MFR PR #7) stays as it is | +| Default branch switched to `develop` (owner) | ⏳ **Carried to M3** (§2d): M2 is closed by owner decision, the switch itself is the owner's. Owner decision of 2026-11-13: PR #51 (`develop` → `master`) is merged after the amd64 VM re-verification now running is recorded | +| Ubuntu arm64, one command on the final pins | ✅ 2026-11-13: 14 of 14 including C7 (run `acc-20261113T021549Z-92641d`); `scan` and `report` exit 0 (operator-recorded, [DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md#english)) | +| Ubuntu amd64 ("amd64 builds") | ⚠️ **Closed for M2 with known limits** by the owner's decision of 2026-11-13 (「既知の限界として記録」), on an emulated VM only ([DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md#english)): prerequisites, `doctor`, nine images built natively, `up` and `health --network` healthy, core acceptance 11 of 12 (C4 success failed at the 30 s wait; it passed once with longer waits in an uncommitted patched copy), `scan` exit 51 (Trivy incomplete on the ember-osf-web image; the cas-overlay SBOM failure unexplained), `report` exit 0. osf.io and wiki-frontend were not built on amd64. (These are the results of 2026-11-12.) **Re-run of 2026-11-13/14 on the final pins** (DEMO-22 0.7, PR #62): with a new checkout on the same VM (not new: images, build cache and prerequisites from the day before), the one command did not reach exit 0 in one go (four attempts: a missing mirror rewrite, the volume guard after a 10 h 45 min build, an Elasticsearch 8 health window too short under emulation — fixed in PR #62 — and a ZAP rc 3 on admin that did not recur). After that, `health --network` 0, `accept --seed --wait-scale 10` **14 of 14** including C4 and C7 (run `acc-20261113T192132Z-1cf20d`, committed), `scan --trivy-timeout 45m` 0 and `report` 0 (operator-recorded). osf.io and wiki-frontend were built on amd64 this time. An uninterrupted one-command install is still not shown. Real hardware: §2d | +| CI that needs a token with the `workflow` scope (per-OS workflows of ADR-08 §9, the `images.yml` smoke test) | ⏳ **Carried to M3** (§2d): not pushed; the owner decided to grant the scope | +| Authenticated ZAP scan | ⏳ **Not done in M2** (known limit): under mandatory sign-in ZAP records `web` as skipped and scans `admin` and `ember_osf_web` ([DEMO-20](../demo/20_core_install_mac_studio.md#english) 0.22). Carried to §2d | + + +### 2c. Open items for M5 + +| Item | Status | +|---|---| +| PostgreSQL 9.6 → 18.6, `grdm-dev db status/upgrade/rollback`, `up` refuses a mismatched major (exit 15) | 🔄 PR #42 (review r1 changes addressed) ([ADR-12](../decisions/ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md#english)): osf.io DB tests equal on 9.6 and 18 (781 passed, same 13 failed or erred); a 9.6 cluster upgraded in 37 s with 531 objects equal; CAS and fakecas log in; rollback measured; after review r1 a journal and a lock make a crash at any step recoverable (SIGKILL and SIGTERM measured, ADR-12 §4.1). PR #42. Not run on amd64 or on a Linux host | +| SCRAM for PostgreSQL | ⏳ Owner: CAS needs a JDBC driver ≥ 42.2 in RDM-cas-overlay-dev2027 (42.1.4 fails with `authentication type 10`) | +| Elasticsearch 2 retirement | 🔄 Installer side done on branch `feat/installer-osf-integration` ([ADR-14](../decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md#english)): `elasticsearch8` (TLS, authentication, `grdm_osf` limited to `website*`, no published port, read-only root) replaces `elasticsearch`; checked with search, the permission filter and `invoke migrate_search` on RDM-osf.io-dev2027 `develop` `90b10661c8dc` (#8, #10, #11 merged, pinned in the manifest); the branch awaits its pull request | +| MongoDB and sharejs retirement | ✅ RDM-osf.io-dev2027 PR #12 merged (file-page editor on y-websocket); sharejs, mongo, their volumes, port 7007 and `SHAREJS_SECRET` are removed from the installer, y-websocket keeps file-room drafts in `y_websocket_data`, and scenario C7 proves the editor without them ([ADR-13 §6](../decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md#english)). The installer change is on a local branch and is not pushed until the osf.io pin is a merge commit | +| Elasticsearch 6 → 8 (metrics) | ⏳ Not started; `elasticsearch6` stays for django-elasticsearch-metrics (ADR-14) | +| Mandatory sign-in and admin two-step sign-in (RDM-osf.io-dev2027 PR #8, #10) | 🔄 Installer side done (`compose render --public-access`, default `false`; migrations 0006/0007 by `osf_init`; the seeded administrator is TOTP-enrolled for C6) and proven on the merged `develop` `90b10661c8dc` (#8 without its R7-01 CI job, tracked as RDM-osf.io-dev2027 issue #16 and waiting for the `workflow` token scope): C1–C7 pass signed in, an unenrolled administrator lands on the enrolment page, anonymous search answers 401. Admin Shibboleth `idp` mode is not enabled (it needs the web server to set an environment variable, which the proxy chain cannot do) | + +### 2d. Open items for M3 + +M3 started on 2026-11-13, when the owner closed M2 (「一括で承認、M2 完了」). The items carried from M2 are recorded here with the owner's decision of the same day (「既知の限界として記録」). + +| Item | Status | +|---|---| +| Real amd64 hardware: one uninterrupted one-command install, acceptance with the committed suite, a complete `scan` | ⏳ Open (owner decision 2026-11-13: recorded as a known limit, M3 or later). So far only an emulated VM ([DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md#english)); on that VM the final pins later passed 14 of 14 with `--wait-scale 10` and a complete `scan`, but not in one uninterrupted command (DEMO-22 0.7). Still open: an uninterrupted one-command install, ideally on real hardware | +| WSL2 (Windows 11) | ⏳ Open (same decision). Not run; it needs a Windows 11 machine ([DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md#english), [ADR-08 §5](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md#english)) | +| Reporting the search information-leak vulnerabilities upstream | ⏳ **Undecided** (owner decision 2026-11-13). A draft report will be prepared and the owner asked again before anything is sent. Nothing has been sent, and no draft is in this repository | +| CI that needs a token with the `workflow` scope: `installer-prereq-lint.yml`, `installer-full.yml` and their helper on branch `feat/per-os-installers` ([ADR-08 §9](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md#english)), and the `images.yml` smoke test | ⏳ The owner decided to grant the scope; not pushed yet | +| osf.io R7-01: the private-search security CI job (RDM-osf.io-dev2027 issue #16) | ⏳ Open: PR #8 was merged with R7-01 deferred by the owner to issue #16 (review r8 in [docs/reviews/](../reviews/README.md)); it waits for the same `workflow` scope | +| Review of the 58 allow-list entries (expiry 2026-12-31) | ⏳ Due by 2026-12-31: an expired entry is ignored and its findings count again (SPEC-03 §5.1 rule 4). At M3 the ceiling is 58, so a new entry (for example for the Elasticsearch 8 image's Ubuntu packages, [ADR-14](../decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md#english)) needs a removal | +| Authenticated ZAP scan of `web` | ⏳ Not done; no owner decision on when | +| Preview from the new ember UI (API v2) | ⏳ Carried from §2b: the server-side change RDM-osf.io-dev2027 PR #14 is in osf.io `develop` ([DEMO-20](../demo/20_core_install_mac_studio.md#english)) and RDM-ember-osf-web-dev2027 PR #3 is merged; open: a check on the real ember screen after deployment — no acceptance scenario covers the ember preview yet, so success is not shown | +| Publication: PR #51 (`develop` → `master`) and the default-branch switch | ⏳ Owner decision of 2026-11-13: PR #51 is merged after the amd64 VM re-verification now running is recorded; the default-branch switch is the owner's | +| S1–S5 subsystem scenarios (the M3 goal) | ⏳ The modules still carry an unconditional `skip(reason=M3)` ([DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md#english)) | + +### 3. Rules + +This board is the **single source of truth** for milestone progress: + +1. Every document that mentions a milestone must link to this board. +2. The "Status" column above is authoritative; status updates require a PR with evidence (demo run or acceptance pass). +3. "Open items" has one table per milestone that has started (§2 for M1, §2b for M2, §2c for M5, §2d for M3); later milestones get their own tables when they start. + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 節目 + +| 節目 | ゴール | セキュリティ門 | ステータス | +|---|---|---|---| +| M1 | docs の骨格・manifest・dev2027 リポジトリ群がある。レビュー済み PR が develop にマージ | 報告+許容リスト | ✅ **完了**(PR #19 を 2026-11-05 にマージ) | +| M2 | コア 6 本が Mac Studio で一発導入。Playwright 受入合格。amd64 ビルド | 報告+許容リスト(M1 より件数を減らす) | ✅ **2026-11-13 の所有者の判断で完了**(「一括で承認、M2 完了」)。書かれた条件をすべて満たしたのでは**なく**、既知の限界つきである。示したこと: Mac Studio では、以前の固定版で一発導入が以前の実機の回で成功した。マージ後の最終の固定版では、既存の Mac の環境を個別のコマンドで更新し、そのあと受入が 14 件中 14 件合格し(実行 `acc-20261112T223428Z-fda84a`)、検査が完走した(運用者の記録)([DEMO-20](../demo/20_core_install_mac_studio.md#japanese))。Ubuntu arm64 では、最終の固定版を新しいチェックアウトへ一つのコマンドで導入し(5 回目の試行。VM は新品ではない)、受入が 14 件中 14 件合格した(実行 `acc-20261113T021549Z-92641d`、[DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md#japanese))。**満たさなかったこと・示していないこと:** (1) 許容リストは 58 項目で、書かれた条件「M1 より少なく」(M1: 0)を満たさない。所有者の判断は 58 を `manifest/allowlist.baseline.json` の M2 の終了時の件数として受け入れたもので、条件を満たしたことにはしない。(2) amd64: 受入 12 件中 11 件はエミュレーションの VM でしか記録していない([DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md#japanese)。C4 の成功ケースは試験の 30 秒の待ちで失敗)。そこで `scan` は終了 51(Trivy が ember-osf-web のイメージを終えられなかった)。osf.io と wiki-frontend は amd64 で組んでいない。PR #60 から `accept --wait-scale` と `scan --trivy-timeout` があり、その VM での再実行は進行中で、まだ記録していない。(3) `workflow` スコープのトークンが要る CI(per-OS のワークフロー、`images.yml` のスモーク試験、osf.io の R7-01)は push していない。所有者はその権限を与えると判断した。(4) 認証した ZAP の検査はしていない。必須サインインの下で `web` は飛ばされる。持ち越し: §2d | +| M3 | サブシステム 5 本が起動。各 1 本の正常系+拒否ケース | 報告+許容リスト(M2 より件数を減らす) | 2026-11-13 から**現在の節目**: `manifest/milestone.json` は M3(門は `count-not-growing`)、許容リストの上限は M2 の件数 58(`manifest/allowlist.baseline.json`)。S1〜S5 の受入モジュールは無条件の `skip(reason=M3)` をまだ持つ([DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md#japanese))。残件: §2d | +| M4 | waterbutler・mfr・osf.io を Python 3.13 へ | HIGH 以上で停止。AI レッドチーム初回 | 計画中 | +| M5 | ES2・mongo 廃止。ES8+postgres 15 以降。海外配布可 | CRITICAL/HIGH ゼロ。AI レッドチームの未解決経路ゼロ | **下準備**(§2c): `db upgrade` 付きの PostgreSQL 18([ADR-12](../decisions/ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md#japanese))。Elasticsearch 2・MongoDB・sharejs はインストーラーから消え、マージ後の osf.io `develop` `90b10661c8dc` で Elasticsearch 8 が ES 2 に替わり、受入 14 件中 14 件([ADR-13 §6](../decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md#japanese)、[ADR-14](../decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md#japanese))。統合ブランチは PR を待つ | + +### 2. M1 の残件 + +| 項目 | ステータス | +|---|---| +| docs の骨格(全フォルダの README) | ✅ 作成済み | +| manifest/upstreams.json | ✅ 作成 | +| dev2027 統合リポジトリ(11) | ✅ 作成 | +| dev2027 の厳密再構築 PR(7 本を 2026-11-06 にマージ。RDM-wiki-frontend-dev2027 #1 は両先端が同一のためマージせず閉鎖) | ✅ マージ済み。manifest に `integration_sha` を固定 | +| MkDocs サイトのビルド(`site/`、strict ビルド合格) | ✅ 生成済み | +| ガイドの `docs/guides/` への移植(旧パスに誘導を残す) | ✅ 完了 | +| Codex Astra による RDM-osf.io-dev2027 PR #1 のレビュー(履歴) | ✅ 置き換え済み: 所有者が初回構築の解釈を退け #1 は 2026-11-05 に閉鎖、#2(厳密再構築)を 2026-11-06 にマージ | +| M1 骨格 PR(本リポジトリ、develop 向け、PR #19) | 🔄 作成済み。2026-11-05 のレビュー r1 が修正要求(R1〜R8)。修正中、その後に所有者マージ | +| GitHub Actions(docs, security) | ✅ PR #19 で稼働(docs・gitleaks・manifest 合格) | +| CI の Trivy(`security.yml`) | ⏳ M1 ではイメージがまだないため、リポジトリのファイルシステムに対する報告のみ([SPEC-03 §4.1](../spec/03_security_gate.md#japanese))。イメージの検査は最初のビルド(M2)から | +| 旧ガイドのサンプルコードに対する Semgrep 指摘(6 件: テンプレートの生 HTML ×4、exec ×1、path join ×1) | ⏳ ガイド書き直し(M2/M3)で対応。対象パスと理由は `.semgrepignore` に記載 | + +### 2b. M2 の残件 + +| 項目 | ステータス | +|---|---| +| インストーラー CLI とテンプレート(SPEC-02)、オーバーレイ対応(ADR-06) | ✅ マージ済み(PR #21〜#30) | +| Mac Studio の実機導入で 6 部品すべてが `build` を通過 | ✅ 第 6 回(2026-11-06): 3 本はローカルビルド、2 本は prebuilt、1 本はオーバーレイ | +| Mac Studio で `up` → `health --network` → `scan` → `report` | ✅ 第 18 回(2026-11-06、PR #33): 終了コード 0、ループバックの URL で準備完了。第 6〜17 回は起動の事実を毎回 1 件ずつ修正(DEMO-20) | +| Mac Studio でのコールドスタート(空のボリューム、新しい `runtime/`) | ✅ 第 21 回(2026-11-06、PR #34、ADR-07): 31 分で終了コード 0。第 19 回でエミュレーションの Elasticsearch 2 が起動に 38 分かかることが分かり、ネイティブイメージに置き換えた | +| 統合リポジトリ側の edit.mako 配線(M2 第 5 回で確認) — `RDM-osf.io-dev2027` の `addons/wiki/templates/edit.mako` が `/static/js/pages/wiki-edit-page.js` でなく `/static/public/js/wiki/wiki-edit-page.js`(`wiki_assets` がボリューム `wiki_static` へ写す束。[ADR-06 §4](../decisions/ADR-06_Wiki_Frontend_Overlay.md#japanese))を読み込むこと。実機導入が `up` に達したらエディタと C4 をブラウザ確認 | ✅ 完了: `RDM-osf.io-dev2027` PR #4 を 2026-11-09 にマージ(`7acc9abf9e`)。実行 `acc-20261110T015520Z-ab4cc7` で C4 は 2 件中 2 件合格(PR #40 レビュー r1 R1-03) | +| Playwright 受入 C1〜C7 | ✅ 2026-11-12 に、マージ後の最終の固定版で再び **14 件中 14 件合格**(実行 `acc-20261112T223428Z-fda84a`、UTC。osf.io `90b10661c8dc`=#8・#10・#11 のマージ後。検査は終了 0、未解決 6,264 件。[DEMO-20](../demo/20_core_install_mac_studio.md#japanese))。それ以前に 2026-11-12 に **14 件中 14 件合格**(実行 `acc-20261111T230217Z-d8363c`、UTC)。ローカルの osf.io 候補(develop `73ff43b3c2` + PR #8・#10・#11)で、Elasticsearch 8、y-websocket のみ、必須サインイン、管理者の第二要素を使った。C7(ファイルページの共同編集)は新規([DEMO-20](../demo/20_core_install_mac_studio.md#japanese))。それ以前: 2026-11-10 に **12 件中 12 件合格**(実行 `acc-20261110T015520Z-ab4cc7`)。マージ済みのセキュリティ修正をすべて含む: HMAC の統一、wiki の WebSocket の JWT(匿名ソケットは 4401 で切断)、MFR の転送時の資格情報、管理画面の資産のローカル配信、Google Analytics の削除([DEMO-20](../demo/20_core_install_mac_studio.md#japanese))。マージは [ADR-04](../decisions/ADR-04_AI_Autonomy_and_Roles.md#japanese) の委任により、レビュー記録は `docs/reviews/`。Python 3.13 の固定版(PR #45)の後に C5 が壊れ、MFR PR #7(`9771b8cf`)で直した。実行 `acc-20261111T132104Z-530071` で再び 12 件中 12 件 | +| Trivy のイメージ検査と許容リスト件数(M1 より少なく) | ⚠️ **未達。M2 は 2026-11-13 の所有者の判断で閉じた**(「一括で承認、M2 完了」)。イメージの検査は動くが、件数の条件は**満たしていない**。履歴: 第 18 回(Trivy 単独)は 22 対象で CRITICAL 1835 / HIGH 8290 / MEDIUM 9763 / LOW 3886。ネイティブ Elasticsearch 2 の第 21 回は 1769 / 8030 / 9550 / 3676 で、許容リストはその時点で 0 件(M1: 0)だった。現在: PR #45 は、Python 3.13 の WaterButler と MFR のイメージで修正版の無い Debian 13 のパッケージについて **58 項目**を加える。PR #45 レビュー r1(R1-01)以降、各項目は正確なパッケージを名指しし、修正版が出れば当てはまらなくなる。これらは `scan_20261111T132607Z` で 177 件を許容する(未許容の Trivy の CRITICAL/HIGH は 726 / 3,769)。一方 `manifest/allowlist.baseline.json` は 0 で、検査が合格したのは `manifest/milestone.json` が M1(報告のみ)だったからにすぎない。M2 の「件数を増やさない」規則では 58 > 0 で失敗する。節目の終了時(SPEC-03 §5.1 規則 5)に、所有者は条件を満たさないまま M2 の完了を宣言し、その判断を M2 の終了時の件数として記録した。`counts` は `{M1: 0, M2: 58}`、`manifest/milestone.json` は M3 なので、上限は 58 で、59 項目目は終了 50 になる(単体試験 `test_m3_ceiling_is_the_m2_exit_count`)。58 項目(期限 2026-12-31)の見直しは §2d へ持ち越す | +| 新しい ember の画面(API v2)からのプレビューが内部の WaterButler に届かない(旧来のファイルのページを使う C5 とは別) | ⏳ **M3 へ持ち越し**(§2d)。経緯: コードを読んで分かった(ブラウザでは再現していない)原因は、`api/files/serializers.py` が `links.render` を MFR の `/render?url=<DOMAIN>/download/<guid>/?direct&mode=render` として作り、それが MFR のコンテナから届かないブラウザ向けの URL で、その経路も `mode=render` を見なかったことである。RDM-osf.io-dev2027 PR #14(サーバー側)と RDM-ember-osf-web-dev2027 PR #3 はどちらもマージ済み。残り: 配備後の ember の実画面での確認。ember のプレビューを試す受入シナリオはまだ無く、そこでの成功は示していない。MFR の資格情報の組(`http://web:5000` → `http://wb:7777`、MFR PR #7)は変えない | +| 既定ブランチを `develop` へ切替(所有者) | ⏳ **M3 へ持ち越し**(§2d)。M2 は所有者の判断で閉じたが、切替そのものは所有者が行う。2026-11-13 の所有者の判断: PR #51(`develop` → `master`)は、進行中の amd64 の VM での再検証を記録した後にマージする | +| Ubuntu arm64、最終の固定版で一つのコマンド | ✅ 2026-11-13: C7 を含め 14 件中 14 件(実行 `acc-20261113T021549Z-92641d`)。`scan` と `report` は終了 0(操作者の記録、[DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md#japanese)) | +| Ubuntu amd64(「amd64 ビルド」) | ⚠️ 2026-11-13 の所有者の判断(「既知の限界として記録」)で、**既知の限界つきで M2 としては閉じた**。エミュレーションの VM だけでの結果([DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md#japanese)): 前提条件、`doctor`、ネイティブで組んだ 9 イメージ、`up` と `health --network` は健康、コアの受入 12 件中 11 件(C4 の成功ケースは 30 秒の待ちで失敗。コミットしていない手直しの複製で待ちを長くすると一度合格)、`scan` は終了 51(Trivy が ember-osf-web のイメージで未完。cas-overlay の SBOM の失敗は原因不明)、`report` は終了 0。osf.io と wiki-frontend は amd64 で組んでいない。(ここまでは 2026-11-12 の結果。) **最終の固定版での 2026-11-13〜14 の再実行**(DEMO-22 0.7、PR #62): 同じ VM(新品ではない。前日のイメージ、ビルドキャッシュ、前提条件が残っていた)の新しいチェックアウトで、一つのコマンドは一度では終了 0 にならなかった(4 回。ミラーの転送の不足、10 時間 45 分のビルドのあとのボリュームの検査、エミュレーション下で短すぎた Elasticsearch 8 のヘルスチェックの窓 — PR #62 で修正 — 、再現しなかった ZAP の admin の rc 3)。そのあと `health --network` は 0、`accept --seed --wait-scale 10` は C4 と C7 を含め **14 件中 14 件**合格(実行 `acc-20261113T192132Z-1cf20d`、コミット済み)、`scan --trivy-timeout 45m` は 0、`report` は 0(運用者の記録)。今回は osf.io と wiki-frontend も amd64 で組んだ。途切れない一つのコマンドでの導入はまだ示していない。実機: §2d | +| `workflow` スコープのトークンが要る CI(ADR-08 §9 の per-OS のワークフロー、`images.yml` のスモーク試験) | ⏳ **M3 へ持ち越し**(§2d)。push していない。所有者はその権限を与えると判断した | +| 認証した ZAP の検査 | ⏳ **M2 では未実施**(既知の限界)。必須サインインの下で ZAP は `web` を飛ばしたと記録し、`admin` と `ember_osf_web` を検査する([DEMO-20](../demo/20_core_install_mac_studio.md#japanese) 0.22)。§2d へ持ち越す | + + +### 2c. M5 の残件 + +| 項目 | ステータス | +|---|---| +| PostgreSQL 9.6 → 18.6、`grdm-dev db status/upgrade/rollback`、`up` は版の不一致を拒む(終了 15) | 🔄 PR #42(レビュー r1 の指摘に対応)([ADR-12](../decisions/ADR-12_PostgreSQL_18_and_Data_Directory_Upgrade.md#japanese)): osf.io の DB 試験は 9.6 と 18 で同じ(781 合格、同じ 13 件が失敗かエラー)。9.6 のクラスタを 37 秒で更新し 531 件が一致。CAS と fakecas はログインできた。巻き戻しも測定。レビュー r1 の後、操作記録とロックでどの段階のクラッシュも復旧できる(SIGKILL と SIGTERM を測定、ADR-12 §4.1)。amd64 と Linux のホストでは未実行 | +| PostgreSQL の SCRAM | ⏳ 所有者: RDM-cas-overlay-dev2027 で CAS に 42.2 以降の JDBC ドライバーが要る(42.1.4 は `authentication type 10` で失敗) | +| Elasticsearch 2 の退役 | 🔄 インストーラー側はブランチ `feat/installer-osf-integration` で完了([ADR-14](../decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md#japanese))。`elasticsearch8`(TLS、認証、`website*` に限った `grdm_osf`、ポート非公開、読み取り専用ルート)が `elasticsearch` に替わった。検索、権限の絞り込み、`invoke migrate_search` を、RDM-osf.io-dev2027 の `develop` `90b10661c8dc`(#8・#10・#11 マージ済み。manifest に固定)で確認した。ブランチは PR を待つ。根拠は [ADR-13 §4](../decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md#japanese)(2026-11-10 の所有者の判断) | +| MongoDB と sharejs の退役 | ✅ RDM-osf.io-dev2027 PR #12 がマージされた(ファイルページのエディタは y-websocket)。sharejs、mongo、そのボリューム、ポート 7007、`SHAREJS_SECRET` はインストーラーから消え、y-websocket はファイルの部屋の下書きを `y_websocket_data` に残し、シナリオ C7 がそれらなしのエディタを証明する([ADR-13 §6](../decisions/ADR-13_Retiring_Elasticsearch_2_and_MongoDB.md#japanese))。ブランチを push するまで、統合ブランチの固定には入らない | +| Elasticsearch 6 → 8(メトリクス) | ⏳ 未着手。`elasticsearch6` は django-elasticsearch-metrics のために残る(ADR-14) | +| 必須サインインと管理者の 2 段階サインイン(RDM-osf.io-dev2027 PR #8・#10) | 🔄 インストーラー側は完了(`compose render --public-access`、既定 `false`。`osf_init` による migration 0006・0007。C6 のため種データの管理者は TOTP 登録済み)、マージ後の `develop` `90b10661c8dc` で確認した(#8 は R7-01 の CI ジョブを除いてマージ。RDM-osf.io-dev2027 の issue #16 で追跡し、`workflow` 権限を待つ)。C1〜C7 はサインインして合格し、未登録の管理者は登録画面へ送られ、匿名の検索は 401。管理者の Shibboleth の `idp` モードは有効にしない(Web サーバーが環境変数を設定する必要があり、プロキシの連鎖ではできない) | + +### 2d. M3 の残件 + +M3 は、所有者が M2 を閉じた 2026-11-13 に始まった(「一括で承認、M2 完了」)。M2 から持ち越した項目を、同じ日の所有者の判断(「既知の限界として記録」)とともにここに記録する。 + +| 項目 | ステータス | +|---|---| +| amd64 の実機: 途切れない一つのコマンドでの導入、コミットした試験での受入、完走した `scan` | ⏳ 未了(2026-11-13 の所有者の判断: 既知の限界として記録し、M3 以降)。これまではエミュレーションの VM だけ([DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md#japanese))。その VM で最終の固定版は、のちに `--wait-scale 10` で 14 件中 14 件合格し `scan` も完走したが、途切れない一つのコマンドではなかった(DEMO-22 0.7)。残り: 途切れない一つのコマンドでの導入(できれば実機で) | +| WSL2(Windows 11) | ⏳ 未了(同じ判断)。未実行で、Windows 11 の機械が要る([DEMO-21](../demo/21_core_install_ubuntu_arm64_lima.md#japanese)、[ADR-08 §5](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md#japanese)) | +| 検索の情報漏えいの脆弱性を上流へ報告すること | ⏳ **未決**(2026-11-13 の所有者の判断)。報告の下書きを用意し、何かを送る前に所有者に改めて尋ねる。何も送っておらず、このリポジトリに下書きは無い | +| `workflow` スコープのトークンが要る CI: ブランチ `feat/per-os-installers` の `installer-prereq-lint.yml`・`installer-full.yml` とその補助([ADR-08 §9](../decisions/ADR-08_Per_OS_Installer_Entry_Points.md#japanese))、`images.yml` のスモーク試験 | ⏳ 所有者はその権限を与えると判断した。まだ push していない | +| osf.io の R7-01: 非公開検索のセキュリティ CI ジョブ(RDM-osf.io-dev2027 の issue #16) | ⏳ 未了。PR #8 は、所有者が R7-01 を issue #16 へ繰り延べたうえでマージされた([docs/reviews/](../reviews/README.md) のレビュー r8)。同じ `workflow` 権限を待つ | +| 許容リスト 58 項目の見直し(期限 2026-12-31) | ⏳ 2026-12-31 までに行う。期限切れの項目は無視され、その検出はまた数えられる(SPEC-03 §5.1 規則 4)。M3 の上限は 58 なので、新しい項目(たとえば Elasticsearch 8 のイメージの Ubuntu パッケージ、[ADR-14](../decisions/ADR-14_Elasticsearch_8_with_TLS_and_Authentication.md#japanese))には別の項目の削除が要る | +| `web` の認証した ZAP の検査 | ⏳ 未実施。時期についての所有者の判断は無い | +| 新しい ember の画面(API v2)からのプレビュー | ⏳ §2b から持ち越し。サーバー側の変更 RDM-osf.io-dev2027 PR #14 は osf.io の `develop` にあり([DEMO-20](../demo/20_core_install_mac_studio.md#japanese))、RDM-ember-osf-web-dev2027 PR #3 はマージ済み。残り: 配備後の ember の実画面での確認。ember のプレビューを試す受入シナリオはまだ無く、成功は示していない | +| 公開: PR #51(`develop` → `master`)と既定ブランチの切替 | ⏳ 2026-11-13 の所有者の判断: PR #51 は、進行中の amd64 の VM での再検証を記録した後にマージする。既定ブランチの切替は所有者が行う | +| S1〜S5 のサブシステムのシナリオ(M3 のゴール) | ⏳ モジュールは無条件の `skip(reason=M3)` をまだ持つ([DEMO-22](../demo/22_core_install_ubuntu_amd64_lima.md#japanese)) | + +### 3. 規則 + +このボードは節目進行状況の**唯一の正本**です: + +1. 節目を言及するすべての文書はこのボードへリンクしなければならない。 +2. 上記の「ステータス」列が権威あるものである。ステータス更新には PR と証跡(実行結果または受入合格)が必要。 +3. 「残件」は着手した節目ごとに表を持つ(M1 は §2、M2 は §2b、M5 は §2c、M3 は §2d)。後の節目は着手時に専用の表を追加する。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Milestone | A checkpoint with a pass/fail test. | 合否の試験がある関門。 | +| Security gate | A checkpoint the build must pass before it is called good. | ビルドを導入してよいかを決める試験。 | +| Open item | A task or PR that has not been completed. | 完了していないタスクまたは PR。 | +| Status board | The single source of truth for milestone progress. | 節目進行状況の唯一の正本。 | +| Evidence | Proof that a test or check passed. | 試験または検査が合格した証拠。 | diff --git a/docs/status/upstream/README.md b/docs/status/upstream/README.md new file mode 100644 index 0000000..02b93c8 --- /dev/null +++ b/docs/status/upstream/README.md @@ -0,0 +1,177 @@ +# Upstream Tracking Status / 上流追従状況 + +> **Summary:** Daily mirror and diff reports: `latest.toon`/`latest.json` are overwritten every day, and archives older than 90 days are deleted. These records show which upstreams changed and whether integration is needed. +> **概要:** 日次ミラーと差分報告:`latest.toon`/`latest.json` は毎日上書きされ、90 日より古い保管分は削除されます。これらの記録はどの上流が変更されたか、統合が必要かどうかを示します。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-06. **Learned:** once `grdm-dev upstream mirror` existed, the report needed more than the SHA per branch: the previous SHA, the source name, whether `develop` already contains the tip, and a per-row status, or a refused (non-fast-forward) fetch would be indistinguishable from an unchanged branch. / `grdm-dev upstream mirror` ができると、報告にはブランチごとの SHA だけでは足りないと分かった。前回の SHA、元の名前、`develop` が先端を既に含むか、行ごとの状態が無いと、拒まれた(non-fast-forward の)fetch と変化なしのブランチが見分けられない。 +- Version / 版: 0.2 — 2026-11-05. **Learned:** an example data block must itself parse: a declared row count with an ellipsis in place of rows is a syntax error, not an example. / 例として置くデータブロックもそれ自体が解析できなければならない。行数を宣言して省略記号を置いたものは例ではなく構文エラーだと分かった。 +- Version / 版: 0.1 — 2026-11-05. **Learned:** the daily job's outputs need a fixed place and a fixed name before the job exists, or SPEC-05 and the status board would point at nothing. The files named here do not exist yet; the daily job (SPEC-05) will create them. / 日次ジョブの出力には、ジョブが存在する前から置き場と名前を決めておく必要があると分かった。さもないと SPEC-05 と進捗ボードの参照先が無くなる。ここに書いたファイルはまだ存在せず、日次ジョブ(SPEC-05)が作る。 +- Normative for: [SPEC-05 Upstream Tracking](../../spec/05_upstream_tracking.md). +- Related: [../README.md](../README.md) · [status/README.md](../README.md) · [spec/05_upstream_tracking.md#2-daily-job-mirror-and-diff-report](../../spec/05_upstream_tracking.md#english) + +--- + +<a id="english"></a> +## English + +[→ 日本語版へ](#japanese) + +### 1. Files written by the daily job + +The `upstream-mirror` workflow (or `grdm-dev upstream mirror`, default `--report-dir docs/status/upstream`) writes: + +| File | Behavior | +|---|---| +| `latest.json` | Overwritten every run; canonical JSON of the daily report. | +| `latest.toon` | Overwritten every run; the same report in TOON. | +| `archive/YYYY-MM-DD.json`, `archive/YYYY-MM-DD.toon` | One copy per run date; same content as `latest.*`. | + +> **Note:** Archives older than 90 days are deleted by the daily job; the run report lists them under `archives_pruned`. Files in `archive/` whose name is not a date are left alone. + +> **Warning:** The files are public. They contain repository names, branch names, SHAs, and commit counts only — never an address, a commit message, an author, or a file path. The tests of `grdm-dev upstream` assert this. + +### 2. Report structure + +The report format is defined in [SPEC-05 §2](../../spec/05_upstream_tracking.md#english); one repository is shown (a real report lists all eleven, `repositories[11]`), and the repeated digits stand for real SHAs: + +```toon +report: + generated_at: "2026-11-06T03:00:12+09:00" + dry_run: false + repositories[1]: + - component: osf.io + integration_repo: RDM-osf.io-dev2027 + develop_sha: 1111111111111111111111111111111111111111 + upstreams[3]{branch,kind,source_repo,source_branch,previous_sha,sha,ahead_of_develop,behind_develop,develop_contains,manifest_sha_matches,moved_since_yesterday,status}: + upstream/public-develop,public,RDM-osf.io,develop,2222222222222222222222222222222222222222,3333333333333333333333333333333333333333,14,0,false,false,true,updated + upstream/private-develop,private,RDM-osf.io-develop-private,develop,4444444444444444444444444444444444444444,4444444444444444444444444444444444444444,0,0,true,true,false,unchanged + upstream/cos-develop,cos,CenterForOpenScience/osf.io,develop,5555555555555555555555555555555555555555,6666666666666666666666666666666666666666,310,0,false,false,true,updated + pushed[2]: + - upstream/public-develop + - upstream/cos-develop + action: integrate + errors[0]: + summary: + repositories: 1 + repositories_needing_integration: 1 + force_push_detected: 0 + branches_moved: 2 + branches_pushed: 2 + errors: 0 +``` + +Per upstream row, `status` is: + +| Value | Meaning | +|---|---| +| `created` | The integration repository had no such tracking branch yet; it was created from the source. | +| `updated` | Fast-forwarded to a newer source commit. | +| `unchanged` | The source tip equals the mirrored one. | +| `non-fast-forward` | The source is not a descendant of the mirrored branch (force push upstream); the old branch is kept. | +| `fetch-failed` | The source could not be fetched. | + +Per repository, `action` is: + +| Value | Meaning | +|---|---| +| `integrate` | A merged `public` or `private` upstream is ahead of `develop`; open an integration PR. | +| `none` | Nothing ahead of `develop`; no action needed. | +| `halt` | A `non-fast-forward` row exists; stop and investigate before anything is merged. | +| `error` | A fetch or push failed and nothing is ahead of `develop`. | + +### 3. Open items (no entries yet / まだありません) + +| Date | Repository | Action | +|---|---|---| +| — | — | — | + +--- + +<a id="japanese"></a> +## 日本語 + +[→ To English](#english) + +### 1. 日次ジョブが書くファイル + +`upstream-mirror` ワークフロー(または `grdm-dev upstream mirror`。既定は `--report-dir docs/status/upstream`)が次を書きます: + +| ファイル | 振る舞い | +|---|---| +| `latest.json` | 毎回上書きされる。日次報告の正本 JSON。 | +| `latest.toon` | 毎回上書きされる。同じ報告の TOON。 | +| `archive/YYYY-MM-DD.json`、`archive/YYYY-MM-DD.toon` | 実行日ごとに一組。`latest.*` と同じ内容。 | + +> **Note:** 90 日より古い保管分は日次ジョブが削除し、実行時の報告の `archives_pruned` に列挙します。`archive/` の中で名前が日付でないファイルには触れません。 + +> **Warning:** ファイルは公開です。中身はリポジトリ名、ブランチ名、SHA、コミット数だけで、アドレス、コミットメッセージ、作者、ファイルパスは決して含めません。`grdm-dev upstream` のテストがこれを確認します。 + +### 2. 報告の構造 + +報告形式は [SPEC-05 §2](../../spec/05_upstream_tracking.md#japanese) に定められています。例はリポジトリ 1 本だけ(本物の報告は 11 本すべて、`repositories[11]`)で、同じ数字の並びは本物の SHA の代わりです: + +```toon +report: + generated_at: "2026-11-06T03:00:12+09:00" + dry_run: false + repositories[1]: + - component: osf.io + integration_repo: RDM-osf.io-dev2027 + develop_sha: 1111111111111111111111111111111111111111 + upstreams[3]{branch,kind,source_repo,source_branch,previous_sha,sha,ahead_of_develop,behind_develop,develop_contains,manifest_sha_matches,moved_since_yesterday,status}: + upstream/public-develop,public,RDM-osf.io,develop,2222222222222222222222222222222222222222,3333333333333333333333333333333333333333,14,0,false,false,true,updated + upstream/private-develop,private,RDM-osf.io-develop-private,develop,4444444444444444444444444444444444444444,4444444444444444444444444444444444444444,0,0,true,true,false,unchanged + upstream/cos-develop,cos,CenterForOpenScience/osf.io,develop,5555555555555555555555555555555555555555,6666666666666666666666666666666666666666,310,0,false,false,true,updated + pushed[2]: + - upstream/public-develop + - upstream/cos-develop + action: integrate + errors[0]: + summary: + repositories: 1 + repositories_needing_integration: 1 + force_push_detected: 0 + branches_moved: 2 + branches_pushed: 2 + errors: 0 +``` + +上流の行ごとの `status`: + +| 値 | 意味 | +|---|---| +| `created` | 統合リポジトリにまだその追跡ブランチが無く、元から作った。 | +| `updated` | 元の新しいコミットへ fast-forward した。 | +| `unchanged` | 元の先端がミラー済みのものと同じ。 | +| `non-fast-forward` | 元がミラー済みブランチの子孫でない(上流で force push)。古いブランチを残す。 | +| `fetch-failed` | 元を取得できなかった。 | + +リポジトリごとの `action`: + +| 値 | 意味 | +|---|---| +| `integrate` | `merged` の `public` か `private` の上流が `develop` より進んでいる。統合 PR を開く。 | +| `none` | `develop` より進んだものがない。何もする必要なし。 | +| `halt` | `non-fast-forward` の行がある。何かをマージする前に停止して調査する。 | +| `error` | fetch か push が失敗し、`develop` より進んだものはない。 | + +### 3. 未解決項目(まだありません / no entries yet) + +| 日付 | リポジトリ | アクション | +|---|---|---| +| — | — | — | + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Mirror | A copy that is kept identical to the original. | 元と同じ中身に保たれる写し。 | +| Diff report | A record of changes between branches. | ブランチ間の変更記録。 | +| Fast-forward | Moving a branch straight ahead to a newer commit without creating a merge. | マージを作らずにブランチを新しいコミットへまっすぐ進めること。 | +| Force-push | Overwriting a branch's history on the server. Forbidden here. | サーバ上のブランチの履歴を上書きすること。ここでは禁止。 | +| Archive | Old reports kept for reference, deleted after 90 days. | 参照のために保管する古い報告。90 日後に削除される。 | +| Action | The decision on whether to open an integration PR. | 統合 PR を開くかどうかの判断。 | diff --git a/index.html b/index.html new file mode 100644 index 0000000..c6ec3e7 --- /dev/null +++ b/index.html @@ -0,0 +1,78 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <title>GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + +
    +

    GakuNin RDM Developer Environment 2027 / 開発環境 2027 版

    + +
    +

    📖 Document Site / 文書サイト

    +

    Open the MkDocs-built documentation site — MkDocsが生成した文書サイトを開く

    +

    このサイトは grdm-dev docs build コマンドで生成されます。

    +
    + +

    About this repository / このリポジトリについて

    +

    This is the public repository for the GakuNin RDM (Research Data Management) developer environment 2027 version. It contains documentation, specifications, and tools for setting up and managing the development environment.

    +

    これはGakuNin RDM(研究データマネジメント)開発環境2027版の公開リポジトリです。ドキュメント、仕様、開発環境構築・管理のためのツールを含みます。

    + +

    Quick links / Quick Links

    + + +
    +

    🔧 Building the site / サイトのビルド

    +

    To build the documentation site, run:

    +
    grdm-dev docs build
    +

    文書サイトをビルドするには、次のように実行します:

    +
    grdm-dev docs build
    +
    + +

    Resources / リソース

    +
      +
    • Specifications / 仕様: Detailed technical rules for the installer, security gate, manifest format, and more
    • +
    • 仕様: インストーラー、セキュリティの門、マニフェスト形式などの詳細な技術規則
    • +
    • Decisions / 決定: Record of architecture and design decisions
    • +
    • 決定: アーキテクチャと設計の決定記錄
    • +
    • Policies / 方針: Position and rules for development
    • +
    • 方針: 開発の立場と規則
    • +
    + + +
    + + diff --git a/installer/README.md b/installer/README.md new file mode 100644 index 0000000..17e901d --- /dev/null +++ b/installer/README.md @@ -0,0 +1,60 @@ +# grdm-dev Installer / インストーラー + +> **Summary:** The Python package behind `./installer/install.sh`. One subcommand per module; standard library only. Normative text is [SPEC-02](../docs/spec/02_installer_cli.md). +> **概要:** `./installer/install.sh` の裏側にある Python パッケージ。モジュールごとに 1 サブコマンド、標準ライブラリのみ。規範は [SPEC-02](../docs/spec/02_installer_cli.md)。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.3 — 2026-11-10. **Learned:** a host that lacks the prerequisites needs a script before `install.sh`, and that script must still end at `install.sh` so that the package stays the only decision path ([ADR-08](../docs/decisions/ADR-08_Per_OS_Installer_Entry_Points.md)). / 前提条件の無いホストには `install.sh` の前にスクリプトが要るが、パッケージを唯一の判断の道筋に保つため、そのスクリプトは必ず `install.sh` で終わる([ADR-08](../docs/decisions/ADR-08_Per_OS_Installer_Entry_Points.md))。 +- Version / 版: 0.2 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.1 — 2026-11-05. **Learned:** the module contract (`register`/`run`, injectable runner) had to be fixed before several people could implement subcommands in parallel without stepping on each other. / 複数人が同時にサブコマンドを実装してもぶつからないよう、モジュールの契約(`register`/`run`、差し替え可能な runner)を先に固定する必要があると分かった。 +- Related: [docs/README.md](../docs/README.md) · [SPEC-02](../docs/spec/02_installer_cli.md) · [SPEC-04](../docs/spec/04_acceptance_tests.md) + +--- + + +## English + +[→ 日本語版へ](#japanese) + +### Layout + +See [SPEC-02 §9](../docs/spec/02_installer_cli.md). Shared parts: `cli.py` (parsing, dispatch), `context.py` (root, runtime/, `--yes`, confirm), `exit_codes.py` + `messages.tsv` (one table for bash and Python), `toon.py` (report encoder), `report.py` (`emit`, `error`). + +### Module contract + +```python +def register(subparsers): ... # add a sub-parser; call set_defaults(_module=sys.modules[__name__]) +def run(ctx, args) -> int: ... # return a code from grdm_dev.exit_codes +``` + +Modules that call external tools take an injectable `runner` so unit tests never need Docker (the tool that builds images and runs containers; see [REF-01](../docs/reference/REF-01_Glossary.md)). Run tests with `python3 -m unittest discover -s installer/tests` from the repository root (set `PYTHONPATH=installer` or `pip install -e installer`). + +--- + + +## 日本語 + +[→ To English](#english) + +### 構成 + +[SPEC-02 §9](../docs/spec/02_installer_cli.md) を参照。共通部品: `cli.py`(解析と振り分け)、`context.py`(ルート、runtime/、`--yes`、確認)、`exit_codes.py` と `messages.tsv`(bash と Python が同じ表を使う)、`toon.py`(報告の符号化)、`report.py`(`emit`、`error`)。 + +### モジュールの契約 + +```python +def register(subparsers): ... # サブパーサを追加し set_defaults(_module=sys.modules[__name__]) を呼ぶ +def run(ctx, args) -> int: ... # grdm_dev.exit_codes の値を返す +``` + +外部の道具を呼ぶモジュールは差し替え可能な `runner` を受け取り、単体テストで Docker(イメージを作りコンテナを動かす道具。[REF-01](../docs/reference/REF-01_Glossary.md))を要らなくする。テストはリポジトリのルートで `python3 -m unittest discover -s installer/tests`(`PYTHONPATH=installer` か `pip install -e installer`)。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Subcommand | A word after the command that picks what to do, like `doctor` in `grdm-dev doctor`. | コマンドの後ろに付けて何をするか選ぶ言葉。`grdm-dev doctor` の `doctor`。 | +| Runner | A small function that runs another program; tests swap it for a fake. | 別のプログラムを実行する小さな関数。テストでは偽物に差し替える。 | diff --git a/installer/acceptance/README.md b/installer/acceptance/README.md new file mode 100644 index 0000000..a0a6da1 --- /dev/null +++ b/installer/acceptance/README.md @@ -0,0 +1,123 @@ +# Acceptance Suite / 受入試験スイート + +> **Summary:** The Playwright Python tests that `grdm-dev accept` runs against an installed environment: how to run them, which scenario lives in which file, and how the evidence folder is laid out. Normative text is [SPEC-04](../../docs/spec/04_acceptance_tests.md). +> **概要:** `grdm-dev accept` が導入済み環境に対して動かす Playwright Python の試験。実行方法、どのシナリオがどのファイルにあるか、証跡フォルダの中身を説明する。規範は [SPEC-04](../../docs/spec/04_acceptance_tests.md)。 + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.4 — 2026-11-12. **Learned:** a helper that mints a one-time code must remember the step it used, or two logins in the same 30 seconds fail the second for a reason that looks like a wrong code. / ワンタイムコードを作る補助は、使った区間を覚えていなければならない。同じ 30 秒の間の二度目のログインが、コードの誤りに見える理由で失敗するからである。 + 0.3 — 2026-11-06. **Learned:** a glossary term is only explained for the reader when its note and REF-01 link sit at the first prose use, counting lower-case and plural forms, so first-use notes with links were added in both halves (SPEC-06 §3). / 用語注と REF-01 へのリンクは、小文字や複数形も含めた本文の初出に置かなければ読者に届かないと分かったため、英和両方の初出にリンク付きの用語注を補った(SPEC-06 §3)。 +- Version / 版: 0.2 — 2026-11-05. **Learned:** a browser route guards only what the browser fetches; API request contexts, redirects, WebSockets and service workers each need their own guard, and a string-prefix check on `http://127.0.0.1` accepts lookalike hosts, so every origin is parsed exactly in `netguard.py`. / ブラウザの経路はブラウザが取りに行くものしか守れない。API のリクエスト文脈、転送、WebSocket、サービスワーカーにはそれぞれ監視が要り、`http://127.0.0.1` の前方一致は似た名前のホストを通してしまうため、`netguard.py` で起点を厳密に解析する。 + 0.1 — 2026-11-05. **Learned:** a file named `selectors.py` shadows the standard-library module of the same name unless the suite is a package and imports it by package path; the locator table therefore lives behind `from acceptance import selectors`. / `selectors.py` という名前は標準ライブラリの同名モジュールを隠してしまうため、スイートをパッケージにして `from acceptance import selectors` で読む必要があると分かった。 +- Normative source: [SPEC-04 Acceptance Tests](../../docs/spec/04_acceptance_tests.md) · [SPEC-02 §3](../../docs/spec/02_installer_cli.md) +- Related: [installer/README.md](../README.md) · [docs/demo/runs/README.md](../../docs/demo/runs/README.md) · [ADR-02 Network Model](../../docs/decisions/ADR-02_Network_Model.md) + +--- + + +## English + +[→ 日本語版へ](#japanese) + +### How to run + +```sh +pip install -e "installer[accept]" +PLAYWRIGHT_BROWSERS_PATH=.venv/.playwright playwright install chromium +grdm-dev accept --seed # all scenarios, disposable users created and removed +grdm-dev accept --only C1 # one scenario (C1..C7, S1..S5, or a name fragment like login) +grdm-dev accept --only core --json # every M2 scenario, report as JSON +``` + +`grdm-dev accept` is the only supported entry point: it checks that *Playwright* (a library that drives a browser for you) and *pytest* (the Python test runner) are importable, refuses any `--base-url` whose host is not `127.0.0.1`, and sets the environment the fixtures read. Running `pytest` by hand works for debugging only (`GRDM_BASE_URL=http://127.0.0.1:5000 pytest installer/acceptance -k c1`). + +### Layout + +```toon +files[7]{path,purpose}: + conftest.py,"fixtures (base_url, ports, users, login, new_context, context_b, two_contexts, api_context, project, tmp_pdf/tmp_txt), time boxes, loopback guard, result collector" + netguard.py,"is_loopback_origin / same_origin: exact (scheme, host, port) parsing; pure functions, unit-tested in installer/tests/test_accept.py" + totp.py,"RFC 6238 one-time codes for the seeded administrator of C6 (PR #10 accepts a code once per 30 s step, so next_code waits for a fresh step); pure functions, unit-tested" + selectors.py,"every locator and URL path in one table; TODO(M2) marks entries not yet verified on the real app" + test_c1_login.py … test_c7_file_editor.py,"core scenarios C1–C7; each has test_*_success and test_*_rejection; marker core" + test_s1_y_websocket.py … test_s5_shibboleth.py,"subsystem stubs S1–S5; marker subsystem; skipped with reason M3" + pytest.ini,"markers and default options" +``` + +Every test carries `scenario(id, name)` and `case("success" | "rejection")` markers; the collector hook copies them into `results.json`, together with `http_status` when a test calls `record_property("http_status", n)`. + +### Rules the fixtures enforce + +- **Loopback (the network path back to your own computer; see [REF-01](../../docs/reference/REF-01_Glossary.md)) only.** Every browser context (and every page in it) is routed so that a request whose origin is not exactly `http://127.0.0.1:` is aborted; WebSockets are routed the same way (`ws://127.0.0.1:` only), service workers are blocked (`service_workers="block"`), and API calls go through `api(context)` / `api_context()`, which check the URL before sending, do not follow redirects unless the test passes `max_redirects`, and check the answered URL. Any offending URL fails the test ([SPEC-04 §3.4](../../docs/spec/04_acceptance_tests.md), [ADR-02](../../docs/decisions/ADR-02_Network_Model.md)). Tests never call `playwright.request.new_context()`, `browser.new_context()` or `.request` directly; a unit test enforces this. +- **Time boxes.** 120 s per test (`SIGALRM`), 30 minutes per suite. +- **Disposable data.** Users come from `grdm-dev accept --seed` as `user-a-@acceptance.test` and similar; with *fakecas* (the fake login server of the development stack) the password is the e-mail address. Projects created by the `project` fixture are deleted in teardown. Test files are generated bytes. +- **No host state.** Only `runtime/.env` (`GRDM_PORT_`) and the `GRDM_*` variables set by `grdm-dev accept` are read. + +### Evidence + +`grdm-dev accept` first runs the integration precheck (`grdm_dev.health.check_services`: every service running and every HTTP probe answering; exit 40 otherwise, before any browser starts), then writes `docs/demo/runs//` with `results.json` (canonical), `results.toon`, `junit.xml`, `pytest.log`, `collector.json` (raw per-test records), and `artifacts//` holding screenshots only for failed tests. Browser traces are off by default; with `--trace` they are kept only on failure and moved to `runtime/reports/quarantine//` (private, git-ignored) because a trace can contain cookies and response bodies. Every value of `runtime/.env` (except ports and profile) and every token-like string is masked as `***` in all text files and in anything printed; the run directory is `0700` and its files `0600`. A run with no result rows, or in which a selected scenario lacks a success or a rejection row, exits 60 even if pytest was green. Each row of `results.json` has `id`, `name`, `case`, `test`, `status`, `duration_ms`, `http_status`, `evidence`. See [docs/demo/runs/README.md](../../docs/demo/runs/README.md). + +### Not yet verified (M2) + +Selectors and URL paths marked `TODO(M2)` in `selectors.py`, the seed management command in `grdm_dev/accept.py`, the CSRF header for session-cookie writes to the API, the waterbutler (the file-transfer service; see [REF-01](../../docs/reference/REF-01_Glossary.md)) cookie forwarding, the websocket URL exposed by the wiki page, and the institution id used by C6. + +--- + + +## 日本語 + +[→ To English](#english) + +### 実行方法 + +```sh +pip install -e "installer[accept]" +PLAYWRIGHT_BROWSERS_PATH=.venv/.playwright playwright install chromium +grdm-dev accept --seed # 全シナリオ。使い捨て利用者を作って消す +grdm-dev accept --only C1 # 一つだけ(C1〜C7、S1〜S5、または login のような名前の一部) +grdm-dev accept --only core --json # M2 の全シナリオ。報告を JSON で +``` + +正式な入口は `grdm-dev accept` だけです。*Playwright*(ブラウザを代わりに操作してくれるライブラリ)と *pytest*(Python の試験を動かす道具)が読み込めることを確かめ、ホストが `127.0.0.1` でない `--base-url` を拒み、フィクスチャが読む環境変数を設定します。`pytest` を直接動かすのはデバッグ用です(`GRDM_BASE_URL=http://127.0.0.1:5000 pytest installer/acceptance -k c1`)。 + +### 構成 + +```toon +files[7]{path,purpose}: + conftest.py,"フィクスチャ(base_url・ports・利用者・login・new_context・context_b・two_contexts・api_context・project・tmp_pdf/tmp_txt)、時間制限、ループバック監視、結果収集" + netguard.py,"is_loopback_origin / same_origin。(scheme, host, port) を厳密に解析する純関数。installer/tests/test_accept.py で単体試験" + totp.py,"C6 の種データの管理者のための RFC 6238 のワンタイムコード(PR #10 は 30 秒の区間ごとに一度しかコードを通さないので、next_code は新しい区間まで待つ)。純粋な関数で、単体試験あり" + selectors.py,"ロケータと URL パスを一つの表に。実機で未確認のものは TODO(M2)" + test_c1_login.py … test_c7_file_editor.py,"コアシナリオ C1〜C7。test_*_success と test_*_rejection。マーカー core" + test_s1_y_websocket.py … test_s5_shibboleth.py,"サブシステムの骨格 S1〜S5。マーカー subsystem。理由 M3 でスキップ" + pytest.ini,"マーカーと既定オプション" +``` + +各試験は `scenario(id, name)` と `case("success" | "rejection")` のマーカーを持ち、収集フックがそれを `results.json` に写します。試験が `record_property("http_status", n)` を呼ぶと `http_status` も記録されます。 + +### フィクスチャが守らせる規則 + +- **ループバック(自分の計算機へ戻るネットワークの道。[REF-01](../../docs/reference/REF-01_Glossary.md))だけ。** すべてのブラウザ文脈(とその中の全ページ)に経路を仕込み、起点が厳密に `http://127.0.0.1:` でない要求は中断します。WebSocket も同様に経路を通し(`ws://127.0.0.1:` だけ)、サービスワーカーは遮断し(`service_workers="block"`)、API 呼び出しは `api(context)` / `api_context()` を通します。これらは送る前に URL を確かめ、試験が `max_redirects` を渡さない限り転送に従わず、応答の URL も確かめます。違反する URL が一つでもあれば試験は失敗です([SPEC-04 §3.4](../../docs/spec/04_acceptance_tests.md)、[ADR-02](../../docs/decisions/ADR-02_Network_Model.md))。試験は `playwright.request.new_context()`・`browser.new_context()`・`.request` を直接呼びません。単体試験がこれを検査します。 +- **時間制限。** 試験ごとに 120 秒(`SIGALRM`)、スイート全体で 30 分。 +- **使い捨てデータ。** 利用者は `grdm-dev accept --seed` が `user-a-@acceptance.test` のように作ります。*fakecas*(開発環境の偽のログインサーバ)ではパスワードはメールアドレスです。`project` フィクスチャが作ったプロジェクトは後片付けで消します。試験ファイルは生成したバイト列です。 +- **ホストの状態を読まない。** 読むのは `runtime/.env`(`GRDM_PORT_`)と `grdm-dev accept` が設定する `GRDM_*` 変数だけです。 + +### 証跡 + +`grdm-dev accept` はまず統合の事前確認(`grdm_dev.health.check_services`。全サービスが稼働し、全 HTTP 探査が応えること。満たさなければブラウザを起動する前に終了 40)を行い、次に `docs/demo/runs//` に `junit.xml`、`results.json`/`results.toon`、`pytest.log`、`collector.json`(試験ごとの生の記録)を書き、失敗した試験についてだけ `artifacts/<試験>/` にスクリーンショットを置く。ブラウザのトレースは既定では記録しない。`--trace` のときだけ失敗時に残し、cookie や応答本文を含み得るため `runtime/reports/quarantine//`(非公開、git 管理外)へ移す。`runtime/.env` の値(ポートとプロファイルを除く)とトークンらしい文字列は、すべてのテキストファイルと表示で `***` に置き換えます。実行フォルダは `0700`、ファイルは `0600` です。結果の行が一つもない実行や、選んだシナリオに成功・拒否のどちらかの行が欠ける実行は、pytest が緑でも終了 60 です。`results.json` の各行は `id`・`name`・`case`・`test`・`status`・`duration_ms`・`http_status`・`evidence` を持ちます。[docs/demo/runs/README.md](../../docs/demo/runs/README.md) を参照。 + +### 未確認事項(M2) + +`selectors.py` の `TODO(M2)` 付きのロケータと URL パス、`grdm_dev/accept.py` の seed 管理コマンド、セッション cookie で API に書き込むときの CSRF ヘッダ、waterbutler(ファイルを出し入れする部品。[REF-01](../../docs/reference/REF-01_Glossary.md))への cookie 転送、Wiki 画面が公開する websocket の URL、C6 で使う機関 ID。 + +--- + +## Glossary / 用語 + +| Term | English note | 日本語注 | +|---|---|---| +| Fixture | Ready-made data or setup a test receives before it starts. | 試験が始まる前に受け取る、用意済みのデータや準備。 | +| Browser context | A separate browser session with its own cookies, inside one test. | 一つの試験の中にある、cookie を別々に持つ独立したブラウザのセッション。 | +| Marker | A label on a test that lets the runner select or describe it. | 試験に付ける札。実行する試験の選択や説明に使う。 | +| Loopback | The network path back to your own computer; `127.0.0.1`. | 自分のコンピュータに戻る通信路。`127.0.0.1`。 | +| Seed | Creating the throw-away users a test run needs. | 試験の実行に必要な使い捨ての利用者を作ること。 | diff --git a/installer/acceptance/__init__.py b/installer/acceptance/__init__.py new file mode 100644 index 0000000..b83d86c --- /dev/null +++ b/installer/acceptance/__init__.py @@ -0,0 +1 @@ +"""Acceptance suite package (SPEC-04). Tests import shared locators as `from acceptance import selectors`.""" diff --git a/installer/acceptance/conftest.py b/installer/acceptance/conftest.py new file mode 100644 index 0000000..dbdc320 --- /dev/null +++ b/installer/acceptance/conftest.py @@ -0,0 +1,509 @@ +"""Shared fixtures and hooks of the acceptance suite (SPEC-04 §3, §6, §7). + +Everything the tests need to know about the environment arrives through environment variables that +`grdm-dev accept` sets (GRDM_BASE_URL, GRDM_RUN_ID, GRDM_ENV_FILE, GRDM_ACCEPT_RESULTS, +GRDM_ACCEPT_USER_A/B, GRDM_ACCEPT_ADMIN) or through pytest's own --base-url option. Nothing else on +the host is read (SPEC-04 §6). Hooks here enforce the per-test and per-suite time boxes, block every +request that would leave 127.0.0.1 (browser requests, WebSockets, service workers and API request +contexts alike), and write collector.json for results.json. + +Network rule (SPEC-04 §3.4): a test never touches `playwright.request.new_context()`, +`browser.new_context()` or `.request` directly. It asks for the `api_context`, +`new_context` fixtures or wraps a context with `api(context)`, so every URL is checked with +`netguard.is_loopback_origin` before it is sent and after it is answered. +""" +from __future__ import annotations + +import datetime as _dt +import json +import os +import re +import signal +import time +from pathlib import Path +from typing import Any, Callable + +import pytest + +from acceptance import selectors as sel +from acceptance.netguard import ( + HTTP_SCHEMES, + MAX_REDIRECT_HOPS, + WEBSOCKET_ROUTE_REQUIREMENT, + WS_SCHEMES, + forced_redirect_kwargs, + is_loopback_origin, + known_external_asset_host, + redirect_follow_up, + redirect_target, +) + +def _wait_scale() -> float: + """GRDM_ACCEPT_WAIT_SCALE (set by `grdm-dev accept --wait-scale`): 1 to 20, anything else counts as 1.""" + try: + v = float(os.environ.get("GRDM_ACCEPT_WAIT_SCALE", "1")) + except ValueError: + return 1.0 + return v if 1.0 <= v <= 20.0 else 1.0 + + +WAIT_SCALE = _wait_scale() + + +def scaled(ms: int) -> int: + """A page, click, selector or login wait in milliseconds, stretched for a slow or emulated host. + The SPEC-04 §5 convergence budget (5 s) is a product requirement and is never passed through here.""" + return int(ms * WAIT_SCALE) + + +TEST_TIMEOUT_S = int(120 * WAIT_SCALE) # SPEC-04 §3.3, stretched with the waits so a stretched wait can still finish +SUITE_TIMEOUT_S = int(30 * 60 * WAIT_SCALE) +DEFAULT_PORTS = {"WEB": 5000, "API": 8000, "ADMIN": 8001, "WB": 7777, "MFR": 7778, "FAKECAS": 8080, "EMBER_OSF_WEB": 4200} + +_SESSION_START = time.monotonic() +_RESULTS: dict[str, dict[str, Any]] = {} +# Every non-loopback URL any guard saw during the session; the autouse guard fails the test on it. +_OFFENDERS: list[str] = [] +# Hosts of the KNOWN_EXTERNAL_ASSETS requests that were aborted (SPEC-04 §3 rule 4): counted, not failing. +_KNOWN_EXTERNAL: list[str] = [] + + +# --- environment --------------------------------------------------------------------------------- + +def _read_env_file(path: str | None) -> dict[str, str]: + env: dict[str, str] = {} + if not path or not Path(path).exists(): + return env + for line in Path(path).read_text(encoding="utf-8").splitlines(): + line = line.strip() + if line and not line.startswith("#") and "=" in line: + k, _, v = line.partition("=") + env[k.strip()] = v.strip().strip('"').strip("'") + return env + + +def _assert_loopback(url: str) -> str: + if not is_loopback_origin(url, HTTP_SCHEMES): + pytest.fail(f"refusing non-loopback URL {url!r}: acceptance tests never leave this machine (ADR-02)") + return url.rstrip("/") + + +@pytest.fixture(scope="session") +def run_id() -> str: + return os.environ.get("GRDM_RUN_ID") or f"acc-{_dt.datetime.now(_dt.timezone.utc):%Y%m%dT%H%M%SZ}-local" + + +@pytest.fixture(scope="session") +def ports() -> dict[str, int]: + """Host ports from runtime/.env (GRDM_PORT_), falling back to the SPEC-02 §4 defaults.""" + env = _read_env_file(os.environ.get("GRDM_ENV_FILE")) + out = dict(DEFAULT_PORTS) + for k, v in env.items(): + if k.startswith("GRDM_PORT_") and v.isdigit(): + out[k[len("GRDM_PORT_"):]] = int(v) + return out + + +@pytest.fixture(scope="session") +def base_url(request, ports) -> str: + """Overrides pytest-base-url's fixture: env GRDM_BASE_URL, then --base-url, then the web port.""" + url = os.environ.get("GRDM_BASE_URL") or request.config.getoption("base_url", default=None) or f"http://127.0.0.1:{ports['WEB']}" + return _assert_loopback(url) + + +@pytest.fixture(scope="session") +def service_url(ports) -> Callable[[str], str]: + def _url(service: str) -> str: + return f"http://127.0.0.1:{ports[service.upper()]}" + return _url + + +@pytest.fixture(scope="session") +def api_url(service_url) -> str: + return service_url("api") + + +# --- disposable users (SPEC-04 §6; created by `grdm-dev accept --seed`) -------------------------- + +def _user(env_key: str, fallback: str, run_id: str) -> dict[str, str]: + email = os.environ.get(env_key) or f"{fallback}-{run_id}@acceptance.test" + # fakecas accepts any username; the password is the user's e-mail (upstream README-docker-compose). + return {"email": email, "password": email} + + +@pytest.fixture(scope="session") +def user_a(run_id) -> dict[str, str]: + return _user("GRDM_ACCEPT_USER_A", "user-a", run_id) + + +@pytest.fixture(scope="session") +def user_b(run_id) -> dict[str, str]: + return _user("GRDM_ACCEPT_USER_B", "user-b", run_id) + + +@pytest.fixture(scope="session") +def institution_member(run_id) -> dict[str, str]: + """Affiliated with admin_user's institution; only listed by C6, never signs in.""" + return _user("GRDM_ACCEPT_INSTITUTION_MEMBER", "institution-member", run_id) + + +@pytest.fixture(scope="session") +def other_institution_member(run_id) -> dict[str, str]: + """Affiliated only with another institution than admin_user's; C6 must not list it. Never signs in.""" + return _user("GRDM_ACCEPT_OTHER_INSTITUTION_MEMBER", "other-institution-member", run_id) + + +@pytest.fixture(scope="session") +def admin_user(run_id) -> dict[str, str]: + """The admin app has its own password form, checked against the OSF account, not fakecas's e-mail rule.""" + user = _user("GRDM_ACCEPT_ADMIN", "admin-user", run_id) + # The admin app asks a second factor after the password (RDM-osf.io-dev2027 PR #10): `accept --seed` enrols the + # seeded administrator with this secret (hexadecimal). Without it the second step cannot be answered. + return {**user, "password": os.environ.get("GRDM_ACCEPT_ADMIN_OSF_PASSWORD", user["password"]), + "totp_secret": os.environ.get("GRDM_ACCEPT_ADMIN_TOTP_SECRET", "")} + + +# --- generated test files (never real files of real people) -------------------------------------- + +@pytest.fixture(scope="session") +def tmp_txt(run_id) -> bytes: + line = f"grdm acceptance {run_id} mock data\n".encode() + return (line * (1024 * 1024 // len(line) + 1))[: 1024 * 1024] + + +@pytest.fixture(scope="session") +def tmp_pdf(run_id) -> bytes: + """A minimal single-page PDF padded to 1 KiB.""" + body = ( + b"%PDF-1.4\n1 0 obj<>endobj\n" + b"2 0 obj<>endobj\n" + b"3 0 obj<>endobj\n" + b"4 0 obj<>stream\nBT /F1 12 Tf 10 50 Td (MOCK " + run_id.encode()[:12] + b") Tj ET\nendstream\nendobj\n" + b"trailer<>\n%%EOF\n" + ) + return body + b"%" * max(0, 1024 - len(body) - 1) + b"\n" + + +# --- network guard (SPEC-04 §3.4) ---------------------------------------------------------------- + +class GuardedRequest: + """Wraps a Playwright APIRequestContext: every URL is checked before sending, Playwright never + follows a redirect itself (`max_redirects` is forced to 0; a caller passing another value gets a + ValueError), and the answered URL is checked as well. A 3xx answer is followed by the wrapper, at + most MAX_REDIRECT_HOPS times, only while each resolved Location is a loopback origin; any hop that + would leave the machine fails the test before it is sent. + + Attribute access other than the HTTP verbs is delegated (dispose, storage_state, ...). + """ + + VERBS = ("get", "post", "put", "patch", "delete", "head", "fetch") + + def __init__(self, request_context, offenders: list[str] | None = None): + self._rc = request_context + self._offenders = offenders if offenders is not None else _OFFENDERS + + def _refuse(self, url: str, why: str) -> None: + self._offenders.append(url) + pytest.fail(f"{why}: {url!r} is not http://127.0.0.1: (SPEC-04 §3.4, ADR-02)") + + def _call(self, verb: str, url: str, **kwargs): + # follow_redirects=False returns the first answer (a rejection test wants to see the 302 itself); + # its Location is still checked to be a loopback origin before the response is handed back. + follow = bool(kwargs.pop("follow_redirects", True)) + kwargs = forced_redirect_kwargs(kwargs) # ValueError on a non-zero max_redirects + hop_verb, hop_url, hop_kwargs = verb, url, kwargs + for hop in range(MAX_REDIRECT_HOPS + 1): + if not isinstance(hop_url, str) or not is_loopback_origin(hop_url, HTTP_SCHEMES): + self._refuse(str(hop_url), f"refusing API {hop_verb.upper()}" + (f" (redirect hop {hop} of {url!r})" if hop else "")) + resp = getattr(self._rc, hop_verb)(hop_url, **hop_kwargs) + if not is_loopback_origin(resp.url, HTTP_SCHEMES): + self._refuse(resp.url, f"API {hop_verb.upper()} {hop_url!r} was answered from another origin") + target = redirect_target(resp.url, resp.status, getattr(resp, "headers", None)) + if target is None: + return resp + if not is_loopback_origin(target, HTTP_SCHEMES): + self._refuse(target, f"API {hop_verb.upper()} {hop_url!r} redirects ({resp.status}) off the machine") + if not follow: + return resp + hop_verb, hop_kwargs = redirect_follow_up(hop_verb, resp.status, hop_kwargs) + hop_url = target + pytest.fail(f"API {verb.upper()} {url!r}: more than {MAX_REDIRECT_HOPS} redirect hops (SPEC-04 §3.4)") + + def __getattr__(self, name: str): + if name in self.VERBS: + return lambda url, **kw: self._call(name, url, **kw) + return getattr(self._rc, name) + + +def api(context) -> GuardedRequest: + """api(browser_context) -> guarded view of `context.request` (session cookies included).""" + if isinstance(context, GuardedRequest): + return context + return GuardedRequest(context.request) + + +def guard_context(context, offenders: list[str] | None = None) -> None: + """Abort any browser request, WebSocket or service worker that would leave loopback and remember + it (SPEC-04 §3.4). Installed on the context *and* on every page it opens. + + Fails closed: without `BrowserContext.route_web_socket` (Playwright < 1.48) WebSockets could not be + intercepted, so the guard refuses to run at all instead of guarding silently less.""" + if not callable(getattr(context, "route_web_socket", None)): + raise RuntimeError(WEBSOCKET_ROUTE_REQUIREMENT) + seen = offenders if offenders is not None else _OFFENDERS + + def _route(route): + if is_loopback_origin(route.request.url, HTTP_SCHEMES): + route.continue_() + else: + host = known_external_asset_host(route.request.url, route.request.resource_type) + if host: + _KNOWN_EXTERNAL.append(host) + else: + seen.append(route.request.url) + route.abort("blockedbyclient") + + def _ws_route(ws): + if is_loopback_origin(ws.url, WS_SCHEMES): + ws.connect_to_server() # frames are forwarded unchanged when no handlers are installed + else: + seen.append(ws.url) + ws.close(code=1008, reason="blocked: non-loopback websocket") + + def _network_url(url: str) -> bool: + return url.split(":", 1)[0].lower() in ("http", "https", "ws", "wss") # blob:/data: workers are local + + def _watch_page(page): + page.route("**/*", _route) + page.on("websocket", lambda ws: None if is_loopback_origin(ws.url, WS_SCHEMES) else seen.append(ws.url)) + page.on("worker", lambda w: seen.append(w.url) if _network_url(w.url) and not is_loopback_origin(w.url, HTTP_SCHEMES) else None) + + context.route("**/*", _route) + context.route_web_socket("**/*", _ws_route) + context.on("serviceworker", lambda w: seen.append(w.url)) # blocked by browser_context_args too + context.on("page", _watch_page) + for page in context.pages: + _watch_page(page) + + +@pytest.fixture(scope="session") +def browser_context_args(browser_context_args): + """pytest-playwright's context arguments plus: service workers never run (they could bypass routes).""" + return {**browser_context_args, "service_workers": "block"} + + +@pytest.fixture(autouse=True) +def external_guard(request): + """Collect the loopback-guard offenders of one test and fail it if any guard (browser, websocket, + API) saw a URL that would have left the machine. Every browser context is created by our + `new_context` below (pytest-playwright's default `context` fixture calls it too), which attaches + the guard itself; requesting `context` from here created a fixture cycle + (external_guard -> context -> new_context -> external_guard, first real acceptance run).""" + offenders: list[str] = [] + before = len(_OFFENDERS) + known_before = len(_KNOWN_EXTERNAL) + yield offenders + offenders.extend(_OFFENDERS[before:]) + request.node.user_properties.append(("known_external_blocked", len(_KNOWN_EXTERNAL) - known_before)) + if offenders: + pytest.fail(f"request(s) would have left the machine: {offenders[:5]}") + + +@pytest.fixture +def new_context(browser, browser_context_args, external_guard): + """new_context() -> a fresh, guarded browser context (own cookies); all are closed in teardown.""" + created = [] + + def _new(**overrides): + ctx = browser.new_context(**{**browser_context_args, **overrides, "service_workers": "block"}) + guard_context(ctx, external_guard) + if WAIT_SCALE > 1: # Playwright's own 30 s default (page.goto and the like) stretches with the explicit waits + ctx.set_default_timeout(scaled(30_000)) + ctx.set_default_navigation_timeout(scaled(30_000)) + created.append(ctx) + return ctx + + yield _new + for ctx in created: + ctx.close() + + +@pytest.fixture +def api_context(playwright, external_guard): + """api_context() -> a guarded, cookie-less APIRequestContext (the anonymous caller); disposed in teardown.""" + created = [] + + def _new(**kwargs) -> GuardedRequest: + rc = playwright.request.new_context(**kwargs) + created.append(rc) + return GuardedRequest(rc, external_guard) + + yield _new + for rc in created: + rc.dispose() + + +# --- browser helpers ----------------------------------------------------------------------------- + +@pytest.fixture +def login(base_url, service_url): + """login(page, user): fakecas flow — web /login -> fakecas form -> back to the dashboard.""" + def _login(page, user: dict[str, str]) -> None: + page.goto(base_url + sel.PATHS["login"], wait_until="domcontentloaded") + # web answers 302 to fakecas (/login?service=...), whose page is the form itself (confirmed on the + # real stack, acceptance run 5). fakecas identifies the user by e-mail alone: its password field sits + # inside a `
    + + + + + + + + + + + + + + + + + + + + + + +
    FileOriginLicenseNote
    mermaid.min.jsmermaid 11.4.1, https://unpkg.com/mermaid@11.4.1/dist/mermaid.min.jsMITDraws diagrams written as text (Mermaid). Do not edit. Update by replacing the file and this row.
    mermaid-init.jswritten hereMIT (this repository)Starts Mermaid on page load.
    +
    +

    +

    日本語

    +

    → To English

    + + + + + + + + + + + + + + + + + + + + + + + +
    ファイル出所ライセンス備考
    mermaid.min.jsmermaid 11.4.1、https://unpkg.com/mermaid@11.4.1/dist/mermaid.min.jsMIT文字で書いた図(Mermaid)を描く。編集しない。更新はファイルとこの行を差し替える。
    mermaid-init.js本リポジトリで作成MIT(本リポジトリ)ページ読み込み時に Mermaid を起動する。
    + + + + + + + + + + + + + + +
    + + + + + + + + + + +
    +
    +
    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/assets/javascripts/bundle.d6f25eb3.min.js b/site/assets/javascripts/bundle.d6f25eb3.min.js new file mode 100644 index 0000000..c5db0e0 --- /dev/null +++ b/site/assets/javascripts/bundle.d6f25eb3.min.js @@ -0,0 +1,16 @@ +"use strict";(()=>{var Fi=Object.create;var gr=Object.defineProperty;var Wi=Object.getOwnPropertyDescriptor;var Ui=Object.getOwnPropertyNames,Vt=Object.getOwnPropertySymbols,Di=Object.getPrototypeOf,yr=Object.prototype.hasOwnProperty,io=Object.prototype.propertyIsEnumerable;var no=(e,t,r)=>t in e?gr(e,t,{enumerable:!0,configurable:!0,writable:!0,value:r}):e[t]=r,$=(e,t)=>{for(var r in t||(t={}))yr.call(t,r)&&no(e,r,t[r]);if(Vt)for(var r of Vt(t))io.call(t,r)&&no(e,r,t[r]);return e};var ao=(e,t)=>{var r={};for(var o in e)yr.call(e,o)&&t.indexOf(o)<0&&(r[o]=e[o]);if(e!=null&&Vt)for(var o of Vt(e))t.indexOf(o)<0&&io.call(e,o)&&(r[o]=e[o]);return r};var xr=(e,t)=>()=>(t||e((t={exports:{}}).exports,t),t.exports);var Vi=(e,t,r,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let n of Ui(t))!yr.call(e,n)&&n!==r&&gr(e,n,{get:()=>t[n],enumerable:!(o=Wi(t,n))||o.enumerable});return e};var Lt=(e,t,r)=>(r=e!=null?Fi(Di(e)):{},Vi(t||!e||!e.__esModule?gr(r,"default",{value:e,enumerable:!0}):r,e));var so=(e,t,r)=>new Promise((o,n)=>{var i=p=>{try{s(r.next(p))}catch(c){n(c)}},a=p=>{try{s(r.throw(p))}catch(c){n(c)}},s=p=>p.done?o(p.value):Promise.resolve(p.value).then(i,a);s((r=r.apply(e,t)).next())});var po=xr((Er,co)=>{(function(e,t){typeof Er=="object"&&typeof co!="undefined"?t():typeof define=="function"&&define.amd?define(t):t()})(Er,function(){"use strict";function e(r){var o=!0,n=!1,i=null,a={text:!0,search:!0,url:!0,tel:!0,email:!0,password:!0,number:!0,date:!0,month:!0,week:!0,time:!0,datetime:!0,"datetime-local":!0};function s(k){return!!(k&&k!==document&&k.nodeName!=="HTML"&&k.nodeName!=="BODY"&&"classList"in k&&"contains"in k.classList)}function p(k){var ft=k.type,qe=k.tagName;return!!(qe==="INPUT"&&a[ft]&&!k.readOnly||qe==="TEXTAREA"&&!k.readOnly||k.isContentEditable)}function c(k){k.classList.contains("focus-visible")||(k.classList.add("focus-visible"),k.setAttribute("data-focus-visible-added",""))}function l(k){k.hasAttribute("data-focus-visible-added")&&(k.classList.remove("focus-visible"),k.removeAttribute("data-focus-visible-added"))}function f(k){k.metaKey||k.altKey||k.ctrlKey||(s(r.activeElement)&&c(r.activeElement),o=!0)}function u(k){o=!1}function d(k){s(k.target)&&(o||p(k.target))&&c(k.target)}function y(k){s(k.target)&&(k.target.classList.contains("focus-visible")||k.target.hasAttribute("data-focus-visible-added"))&&(n=!0,window.clearTimeout(i),i=window.setTimeout(function(){n=!1},100),l(k.target))}function M(k){document.visibilityState==="hidden"&&(n&&(o=!0),X())}function X(){document.addEventListener("mousemove",J),document.addEventListener("mousedown",J),document.addEventListener("mouseup",J),document.addEventListener("pointermove",J),document.addEventListener("pointerdown",J),document.addEventListener("pointerup",J),document.addEventListener("touchmove",J),document.addEventListener("touchstart",J),document.addEventListener("touchend",J)}function te(){document.removeEventListener("mousemove",J),document.removeEventListener("mousedown",J),document.removeEventListener("mouseup",J),document.removeEventListener("pointermove",J),document.removeEventListener("pointerdown",J),document.removeEventListener("pointerup",J),document.removeEventListener("touchmove",J),document.removeEventListener("touchstart",J),document.removeEventListener("touchend",J)}function J(k){k.target.nodeName&&k.target.nodeName.toLowerCase()==="html"||(o=!1,te())}document.addEventListener("keydown",f,!0),document.addEventListener("mousedown",u,!0),document.addEventListener("pointerdown",u,!0),document.addEventListener("touchstart",u,!0),document.addEventListener("visibilitychange",M,!0),X(),r.addEventListener("focus",d,!0),r.addEventListener("blur",y,!0),r.nodeType===Node.DOCUMENT_FRAGMENT_NODE&&r.host?r.host.setAttribute("data-js-focus-visible",""):r.nodeType===Node.DOCUMENT_NODE&&(document.documentElement.classList.add("js-focus-visible"),document.documentElement.setAttribute("data-js-focus-visible",""))}if(typeof window!="undefined"&&typeof document!="undefined"){window.applyFocusVisiblePolyfill=e;var t;try{t=new CustomEvent("focus-visible-polyfill-ready")}catch(r){t=document.createEvent("CustomEvent"),t.initCustomEvent("focus-visible-polyfill-ready",!1,!1,{})}window.dispatchEvent(t)}typeof document!="undefined"&&e(document)})});var qr=xr((ly,Sn)=>{"use strict";/*! + * escape-html + * Copyright(c) 2012-2013 TJ Holowaychuk + * Copyright(c) 2015 Andreas Lubbe + * Copyright(c) 2015 Tiancheng "Timothy" Gu + * MIT Licensed + */var ka=/["'&<>]/;Sn.exports=Ha;function Ha(e){var t=""+e,r=ka.exec(t);if(!r)return t;var o,n="",i=0,a=0;for(i=r.index;i{/*! + * clipboard.js v2.0.11 + * https://clipboardjs.com/ + * + * Licensed MIT © Zeno Rocha + */(function(t,r){typeof It=="object"&&typeof Yr=="object"?Yr.exports=r():typeof define=="function"&&define.amd?define([],r):typeof It=="object"?It.ClipboardJS=r():t.ClipboardJS=r()})(It,function(){return function(){var e={686:function(o,n,i){"use strict";i.d(n,{default:function(){return ji}});var a=i(279),s=i.n(a),p=i(370),c=i.n(p),l=i(817),f=i.n(l);function u(V){try{return document.execCommand(V)}catch(A){return!1}}var d=function(A){var L=f()(A);return u("cut"),L},y=d;function M(V){var A=document.documentElement.getAttribute("dir")==="rtl",L=document.createElement("textarea");L.style.fontSize="12pt",L.style.border="0",L.style.padding="0",L.style.margin="0",L.style.position="absolute",L.style[A?"right":"left"]="-9999px";var F=window.pageYOffset||document.documentElement.scrollTop;return L.style.top="".concat(F,"px"),L.setAttribute("readonly",""),L.value=V,L}var X=function(A,L){var F=M(A);L.container.appendChild(F);var D=f()(F);return u("copy"),F.remove(),D},te=function(A){var L=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{container:document.body},F="";return typeof A=="string"?F=X(A,L):A instanceof HTMLInputElement&&!["text","search","url","tel","password"].includes(A==null?void 0:A.type)?F=X(A.value,L):(F=f()(A),u("copy")),F},J=te;function k(V){"@babel/helpers - typeof";return typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?k=function(L){return typeof L}:k=function(L){return L&&typeof Symbol=="function"&&L.constructor===Symbol&&L!==Symbol.prototype?"symbol":typeof L},k(V)}var ft=function(){var A=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{},L=A.action,F=L===void 0?"copy":L,D=A.container,Y=A.target,$e=A.text;if(F!=="copy"&&F!=="cut")throw new Error('Invalid "action" value, use either "copy" or "cut"');if(Y!==void 0)if(Y&&k(Y)==="object"&&Y.nodeType===1){if(F==="copy"&&Y.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if(F==="cut"&&(Y.hasAttribute("readonly")||Y.hasAttribute("disabled")))throw new Error(`Invalid "target" attribute. You can't cut text from elements with "readonly" or "disabled" attributes`)}else throw new Error('Invalid "target" value, use a valid Element');if($e)return J($e,{container:D});if(Y)return F==="cut"?y(Y):J(Y,{container:D})},qe=ft;function Fe(V){"@babel/helpers - typeof";return typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?Fe=function(L){return typeof L}:Fe=function(L){return L&&typeof Symbol=="function"&&L.constructor===Symbol&&L!==Symbol.prototype?"symbol":typeof L},Fe(V)}function Ai(V,A){if(!(V instanceof A))throw new TypeError("Cannot call a class as a function")}function oo(V,A){for(var L=0;L0&&arguments[0]!==void 0?arguments[0]:{};this.action=typeof D.action=="function"?D.action:this.defaultAction,this.target=typeof D.target=="function"?D.target:this.defaultTarget,this.text=typeof D.text=="function"?D.text:this.defaultText,this.container=Fe(D.container)==="object"?D.container:document.body}},{key:"listenClick",value:function(D){var Y=this;this.listener=c()(D,"click",function($e){return Y.onClick($e)})}},{key:"onClick",value:function(D){var Y=D.delegateTarget||D.currentTarget,$e=this.action(Y)||"copy",Dt=qe({action:$e,container:this.container,target:this.target(Y),text:this.text(Y)});this.emit(Dt?"success":"error",{action:$e,text:Dt,trigger:Y,clearSelection:function(){Y&&Y.focus(),window.getSelection().removeAllRanges()}})}},{key:"defaultAction",value:function(D){return vr("action",D)}},{key:"defaultTarget",value:function(D){var Y=vr("target",D);if(Y)return document.querySelector(Y)}},{key:"defaultText",value:function(D){return vr("text",D)}},{key:"destroy",value:function(){this.listener.destroy()}}],[{key:"copy",value:function(D){var Y=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{container:document.body};return J(D,Y)}},{key:"cut",value:function(D){return y(D)}},{key:"isSupported",value:function(){var D=arguments.length>0&&arguments[0]!==void 0?arguments[0]:["copy","cut"],Y=typeof D=="string"?[D]:D,$e=!!document.queryCommandSupported;return Y.forEach(function(Dt){$e=$e&&!!document.queryCommandSupported(Dt)}),$e}}]),L}(s()),ji=Ii},828:function(o){var n=9;if(typeof Element!="undefined"&&!Element.prototype.matches){var i=Element.prototype;i.matches=i.matchesSelector||i.mozMatchesSelector||i.msMatchesSelector||i.oMatchesSelector||i.webkitMatchesSelector}function a(s,p){for(;s&&s.nodeType!==n;){if(typeof s.matches=="function"&&s.matches(p))return s;s=s.parentNode}}o.exports=a},438:function(o,n,i){var a=i(828);function s(l,f,u,d,y){var M=c.apply(this,arguments);return l.addEventListener(u,M,y),{destroy:function(){l.removeEventListener(u,M,y)}}}function p(l,f,u,d,y){return typeof l.addEventListener=="function"?s.apply(null,arguments):typeof u=="function"?s.bind(null,document).apply(null,arguments):(typeof l=="string"&&(l=document.querySelectorAll(l)),Array.prototype.map.call(l,function(M){return s(M,f,u,d,y)}))}function c(l,f,u,d){return function(y){y.delegateTarget=a(y.target,f),y.delegateTarget&&d.call(l,y)}}o.exports=p},879:function(o,n){n.node=function(i){return i!==void 0&&i instanceof HTMLElement&&i.nodeType===1},n.nodeList=function(i){var a=Object.prototype.toString.call(i);return i!==void 0&&(a==="[object NodeList]"||a==="[object HTMLCollection]")&&"length"in i&&(i.length===0||n.node(i[0]))},n.string=function(i){return typeof i=="string"||i instanceof String},n.fn=function(i){var a=Object.prototype.toString.call(i);return a==="[object Function]"}},370:function(o,n,i){var a=i(879),s=i(438);function p(u,d,y){if(!u&&!d&&!y)throw new Error("Missing required arguments");if(!a.string(d))throw new TypeError("Second argument must be a String");if(!a.fn(y))throw new TypeError("Third argument must be a Function");if(a.node(u))return c(u,d,y);if(a.nodeList(u))return l(u,d,y);if(a.string(u))return f(u,d,y);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList")}function c(u,d,y){return u.addEventListener(d,y),{destroy:function(){u.removeEventListener(d,y)}}}function l(u,d,y){return Array.prototype.forEach.call(u,function(M){M.addEventListener(d,y)}),{destroy:function(){Array.prototype.forEach.call(u,function(M){M.removeEventListener(d,y)})}}}function f(u,d,y){return s(document.body,u,d,y)}o.exports=p},817:function(o){function n(i){var a;if(i.nodeName==="SELECT")i.focus(),a=i.value;else if(i.nodeName==="INPUT"||i.nodeName==="TEXTAREA"){var s=i.hasAttribute("readonly");s||i.setAttribute("readonly",""),i.select(),i.setSelectionRange(0,i.value.length),s||i.removeAttribute("readonly"),a=i.value}else{i.hasAttribute("contenteditable")&&i.focus();var p=window.getSelection(),c=document.createRange();c.selectNodeContents(i),p.removeAllRanges(),p.addRange(c),a=p.toString()}return a}o.exports=n},279:function(o){function n(){}n.prototype={on:function(i,a,s){var p=this.e||(this.e={});return(p[i]||(p[i]=[])).push({fn:a,ctx:s}),this},once:function(i,a,s){var p=this;function c(){p.off(i,c),a.apply(s,arguments)}return c._=a,this.on(i,c,s)},emit:function(i){var a=[].slice.call(arguments,1),s=((this.e||(this.e={}))[i]||[]).slice(),p=0,c=s.length;for(p;p0&&i[i.length-1])&&(c[0]===6||c[0]===2)){r=0;continue}if(c[0]===3&&(!i||c[1]>i[0]&&c[1]=e.length&&(e=void 0),{value:e&&e[o++],done:!e}}};throw new TypeError(t?"Object is not iterable.":"Symbol.iterator is not defined.")}function N(e,t){var r=typeof Symbol=="function"&&e[Symbol.iterator];if(!r)return e;var o=r.call(e),n,i=[],a;try{for(;(t===void 0||t-- >0)&&!(n=o.next()).done;)i.push(n.value)}catch(s){a={error:s}}finally{try{n&&!n.done&&(r=o.return)&&r.call(o)}finally{if(a)throw a.error}}return i}function q(e,t,r){if(r||arguments.length===2)for(var o=0,n=t.length,i;o1||p(d,M)})},y&&(n[d]=y(n[d])))}function p(d,y){try{c(o[d](y))}catch(M){u(i[0][3],M)}}function c(d){d.value instanceof nt?Promise.resolve(d.value.v).then(l,f):u(i[0][2],d)}function l(d){p("next",d)}function f(d){p("throw",d)}function u(d,y){d(y),i.shift(),i.length&&p(i[0][0],i[0][1])}}function fo(e){if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var t=e[Symbol.asyncIterator],r;return t?t.call(e):(e=typeof he=="function"?he(e):e[Symbol.iterator](),r={},o("next"),o("throw"),o("return"),r[Symbol.asyncIterator]=function(){return this},r);function o(i){r[i]=e[i]&&function(a){return new Promise(function(s,p){a=e[i](a),n(s,p,a.done,a.value)})}}function n(i,a,s,p){Promise.resolve(p).then(function(c){i({value:c,done:s})},a)}}function H(e){return typeof e=="function"}function ut(e){var t=function(o){Error.call(o),o.stack=new Error().stack},r=e(t);return r.prototype=Object.create(Error.prototype),r.prototype.constructor=r,r}var zt=ut(function(e){return function(r){e(this),this.message=r?r.length+` errors occurred during unsubscription: +`+r.map(function(o,n){return n+1+") "+o.toString()}).join(` + `):"",this.name="UnsubscriptionError",this.errors=r}});function Qe(e,t){if(e){var r=e.indexOf(t);0<=r&&e.splice(r,1)}}var We=function(){function e(t){this.initialTeardown=t,this.closed=!1,this._parentage=null,this._finalizers=null}return e.prototype.unsubscribe=function(){var t,r,o,n,i;if(!this.closed){this.closed=!0;var a=this._parentage;if(a)if(this._parentage=null,Array.isArray(a))try{for(var s=he(a),p=s.next();!p.done;p=s.next()){var c=p.value;c.remove(this)}}catch(M){t={error:M}}finally{try{p&&!p.done&&(r=s.return)&&r.call(s)}finally{if(t)throw t.error}}else a.remove(this);var l=this.initialTeardown;if(H(l))try{l()}catch(M){i=M instanceof zt?M.errors:[M]}var f=this._finalizers;if(f){this._finalizers=null;try{for(var u=he(f),d=u.next();!d.done;d=u.next()){var y=d.value;try{uo(y)}catch(M){i=i!=null?i:[],M instanceof zt?i=q(q([],N(i)),N(M.errors)):i.push(M)}}}catch(M){o={error:M}}finally{try{d&&!d.done&&(n=u.return)&&n.call(u)}finally{if(o)throw o.error}}}if(i)throw new zt(i)}},e.prototype.add=function(t){var r;if(t&&t!==this)if(this.closed)uo(t);else{if(t instanceof e){if(t.closed||t._hasParent(this))return;t._addParent(this)}(this._finalizers=(r=this._finalizers)!==null&&r!==void 0?r:[]).push(t)}},e.prototype._hasParent=function(t){var r=this._parentage;return r===t||Array.isArray(r)&&r.includes(t)},e.prototype._addParent=function(t){var r=this._parentage;this._parentage=Array.isArray(r)?(r.push(t),r):r?[r,t]:t},e.prototype._removeParent=function(t){var r=this._parentage;r===t?this._parentage=null:Array.isArray(r)&&Qe(r,t)},e.prototype.remove=function(t){var r=this._finalizers;r&&Qe(r,t),t instanceof e&&t._removeParent(this)},e.EMPTY=function(){var t=new e;return t.closed=!0,t}(),e}();var Tr=We.EMPTY;function qt(e){return e instanceof We||e&&"closed"in e&&H(e.remove)&&H(e.add)&&H(e.unsubscribe)}function uo(e){H(e)?e():e.unsubscribe()}var Pe={onUnhandledError:null,onStoppedNotification:null,Promise:void 0,useDeprecatedSynchronousErrorHandling:!1,useDeprecatedNextContext:!1};var dt={setTimeout:function(e,t){for(var r=[],o=2;o0},enumerable:!1,configurable:!0}),t.prototype._trySubscribe=function(r){return this._throwIfClosed(),e.prototype._trySubscribe.call(this,r)},t.prototype._subscribe=function(r){return this._throwIfClosed(),this._checkFinalizedStatuses(r),this._innerSubscribe(r)},t.prototype._innerSubscribe=function(r){var o=this,n=this,i=n.hasError,a=n.isStopped,s=n.observers;return i||a?Tr:(this.currentObservers=null,s.push(r),new We(function(){o.currentObservers=null,Qe(s,r)}))},t.prototype._checkFinalizedStatuses=function(r){var o=this,n=o.hasError,i=o.thrownError,a=o.isStopped;n?r.error(i):a&&r.complete()},t.prototype.asObservable=function(){var r=new j;return r.source=this,r},t.create=function(r,o){return new wo(r,o)},t}(j);var wo=function(e){oe(t,e);function t(r,o){var n=e.call(this)||this;return n.destination=r,n.source=o,n}return t.prototype.next=function(r){var o,n;(n=(o=this.destination)===null||o===void 0?void 0:o.next)===null||n===void 0||n.call(o,r)},t.prototype.error=function(r){var o,n;(n=(o=this.destination)===null||o===void 0?void 0:o.error)===null||n===void 0||n.call(o,r)},t.prototype.complete=function(){var r,o;(o=(r=this.destination)===null||r===void 0?void 0:r.complete)===null||o===void 0||o.call(r)},t.prototype._subscribe=function(r){var o,n;return(n=(o=this.source)===null||o===void 0?void 0:o.subscribe(r))!==null&&n!==void 0?n:Tr},t}(g);var _r=function(e){oe(t,e);function t(r){var o=e.call(this)||this;return o._value=r,o}return Object.defineProperty(t.prototype,"value",{get:function(){return this.getValue()},enumerable:!1,configurable:!0}),t.prototype._subscribe=function(r){var o=e.prototype._subscribe.call(this,r);return!o.closed&&r.next(this._value),o},t.prototype.getValue=function(){var r=this,o=r.hasError,n=r.thrownError,i=r._value;if(o)throw n;return this._throwIfClosed(),i},t.prototype.next=function(r){e.prototype.next.call(this,this._value=r)},t}(g);var At={now:function(){return(At.delegate||Date).now()},delegate:void 0};var Ct=function(e){oe(t,e);function t(r,o,n){r===void 0&&(r=1/0),o===void 0&&(o=1/0),n===void 0&&(n=At);var i=e.call(this)||this;return i._bufferSize=r,i._windowTime=o,i._timestampProvider=n,i._buffer=[],i._infiniteTimeWindow=!0,i._infiniteTimeWindow=o===1/0,i._bufferSize=Math.max(1,r),i._windowTime=Math.max(1,o),i}return t.prototype.next=function(r){var o=this,n=o.isStopped,i=o._buffer,a=o._infiniteTimeWindow,s=o._timestampProvider,p=o._windowTime;n||(i.push(r),!a&&i.push(s.now()+p)),this._trimBuffer(),e.prototype.next.call(this,r)},t.prototype._subscribe=function(r){this._throwIfClosed(),this._trimBuffer();for(var o=this._innerSubscribe(r),n=this,i=n._infiniteTimeWindow,a=n._buffer,s=a.slice(),p=0;p0?e.prototype.schedule.call(this,r,o):(this.delay=o,this.state=r,this.scheduler.flush(this),this)},t.prototype.execute=function(r,o){return o>0||this.closed?e.prototype.execute.call(this,r,o):this._execute(r,o)},t.prototype.requestAsyncId=function(r,o,n){return n===void 0&&(n=0),n!=null&&n>0||n==null&&this.delay>0?e.prototype.requestAsyncId.call(this,r,o,n):(r.flush(this),0)},t}(gt);var Oo=function(e){oe(t,e);function t(){return e!==null&&e.apply(this,arguments)||this}return t}(yt);var kr=new Oo(So);var Mo=function(e){oe(t,e);function t(r,o){var n=e.call(this,r,o)||this;return n.scheduler=r,n.work=o,n}return t.prototype.requestAsyncId=function(r,o,n){return n===void 0&&(n=0),n!==null&&n>0?e.prototype.requestAsyncId.call(this,r,o,n):(r.actions.push(this),r._scheduled||(r._scheduled=vt.requestAnimationFrame(function(){return r.flush(void 0)})))},t.prototype.recycleAsyncId=function(r,o,n){var i;if(n===void 0&&(n=0),n!=null?n>0:this.delay>0)return e.prototype.recycleAsyncId.call(this,r,o,n);var a=r.actions;o!=null&&((i=a[a.length-1])===null||i===void 0?void 0:i.id)!==o&&(vt.cancelAnimationFrame(o),r._scheduled=void 0)},t}(gt);var Lo=function(e){oe(t,e);function t(){return e!==null&&e.apply(this,arguments)||this}return t.prototype.flush=function(r){this._active=!0;var o=this._scheduled;this._scheduled=void 0;var n=this.actions,i;r=r||n.shift();do if(i=r.execute(r.state,r.delay))break;while((r=n[0])&&r.id===o&&n.shift());if(this._active=!1,i){for(;(r=n[0])&&r.id===o&&n.shift();)r.unsubscribe();throw i}},t}(yt);var me=new Lo(Mo);var S=new j(function(e){return e.complete()});function Yt(e){return e&&H(e.schedule)}function Hr(e){return e[e.length-1]}function Xe(e){return H(Hr(e))?e.pop():void 0}function ke(e){return Yt(Hr(e))?e.pop():void 0}function Bt(e,t){return typeof Hr(e)=="number"?e.pop():t}var xt=function(e){return e&&typeof e.length=="number"&&typeof e!="function"};function Gt(e){return H(e==null?void 0:e.then)}function Jt(e){return H(e[bt])}function Xt(e){return Symbol.asyncIterator&&H(e==null?void 0:e[Symbol.asyncIterator])}function Zt(e){return new TypeError("You provided "+(e!==null&&typeof e=="object"?"an invalid object":"'"+e+"'")+" where a stream was expected. You can provide an Observable, Promise, ReadableStream, Array, AsyncIterable, or Iterable.")}function Ji(){return typeof Symbol!="function"||!Symbol.iterator?"@@iterator":Symbol.iterator}var er=Ji();function tr(e){return H(e==null?void 0:e[er])}function rr(e){return mo(this,arguments,function(){var r,o,n,i;return Nt(this,function(a){switch(a.label){case 0:r=e.getReader(),a.label=1;case 1:a.trys.push([1,,9,10]),a.label=2;case 2:return[4,nt(r.read())];case 3:return o=a.sent(),n=o.value,i=o.done,i?[4,nt(void 0)]:[3,5];case 4:return[2,a.sent()];case 5:return[4,nt(n)];case 6:return[4,a.sent()];case 7:return a.sent(),[3,2];case 8:return[3,10];case 9:return r.releaseLock(),[7];case 10:return[2]}})})}function or(e){return H(e==null?void 0:e.getReader)}function W(e){if(e instanceof j)return e;if(e!=null){if(Jt(e))return Xi(e);if(xt(e))return Zi(e);if(Gt(e))return ea(e);if(Xt(e))return _o(e);if(tr(e))return ta(e);if(or(e))return ra(e)}throw Zt(e)}function Xi(e){return new j(function(t){var r=e[bt]();if(H(r.subscribe))return r.subscribe(t);throw new TypeError("Provided object does not correctly implement Symbol.observable")})}function Zi(e){return new j(function(t){for(var r=0;r=2;return function(o){return o.pipe(e?b(function(n,i){return e(n,i,o)}):le,Te(1),r?De(t):qo(function(){return new ir}))}}function jr(e){return e<=0?function(){return S}:E(function(t,r){var o=[];t.subscribe(T(r,function(n){o.push(n),e=2,!0))}function pe(e){e===void 0&&(e={});var t=e.connector,r=t===void 0?function(){return new g}:t,o=e.resetOnError,n=o===void 0?!0:o,i=e.resetOnComplete,a=i===void 0?!0:i,s=e.resetOnRefCountZero,p=s===void 0?!0:s;return function(c){var l,f,u,d=0,y=!1,M=!1,X=function(){f==null||f.unsubscribe(),f=void 0},te=function(){X(),l=u=void 0,y=M=!1},J=function(){var k=l;te(),k==null||k.unsubscribe()};return E(function(k,ft){d++,!M&&!y&&X();var qe=u=u!=null?u:r();ft.add(function(){d--,d===0&&!M&&!y&&(f=Wr(J,p))}),qe.subscribe(ft),!l&&d>0&&(l=new at({next:function(Fe){return qe.next(Fe)},error:function(Fe){M=!0,X(),f=Wr(te,n,Fe),qe.error(Fe)},complete:function(){y=!0,X(),f=Wr(te,a),qe.complete()}}),W(k).subscribe(l))})(c)}}function Wr(e,t){for(var r=[],o=2;oe.next(document)),e}function P(e,t=document){return Array.from(t.querySelectorAll(e))}function R(e,t=document){let r=fe(e,t);if(typeof r=="undefined")throw new ReferenceError(`Missing element: expected "${e}" to be present`);return r}function fe(e,t=document){return t.querySelector(e)||void 0}function Ie(){var e,t,r,o;return(o=(r=(t=(e=document.activeElement)==null?void 0:e.shadowRoot)==null?void 0:t.activeElement)!=null?r:document.activeElement)!=null?o:void 0}var xa=O(h(document.body,"focusin"),h(document.body,"focusout")).pipe(_e(1),Q(void 0),m(()=>Ie()||document.body),G(1));function et(e){return xa.pipe(m(t=>e.contains(t)),K())}function $t(e,t){return C(()=>O(h(e,"mouseenter").pipe(m(()=>!0)),h(e,"mouseleave").pipe(m(()=>!1))).pipe(t?Ht(r=>Me(+!r*t)):le,Q(e.matches(":hover"))))}function Go(e,t){if(typeof t=="string"||typeof t=="number")e.innerHTML+=t.toString();else if(t instanceof Node)e.appendChild(t);else if(Array.isArray(t))for(let r of t)Go(e,r)}function x(e,t,...r){let o=document.createElement(e);if(t)for(let n of Object.keys(t))typeof t[n]!="undefined"&&(typeof t[n]!="boolean"?o.setAttribute(n,t[n]):o.setAttribute(n,""));for(let n of r)Go(o,n);return o}function sr(e){if(e>999){let t=+((e-950)%1e3>99);return`${((e+1e-6)/1e3).toFixed(t)}k`}else return e.toString()}function Tt(e){let t=x("script",{src:e});return C(()=>(document.head.appendChild(t),O(h(t,"load"),h(t,"error").pipe(v(()=>$r(()=>new ReferenceError(`Invalid script: ${e}`))))).pipe(m(()=>{}),_(()=>document.head.removeChild(t)),Te(1))))}var Jo=new g,Ea=C(()=>typeof ResizeObserver=="undefined"?Tt("https://unpkg.com/resize-observer-polyfill"):I(void 0)).pipe(m(()=>new ResizeObserver(e=>e.forEach(t=>Jo.next(t)))),v(e=>O(Ye,I(e)).pipe(_(()=>e.disconnect()))),G(1));function ce(e){return{width:e.offsetWidth,height:e.offsetHeight}}function ge(e){let t=e;for(;t.clientWidth===0&&t.parentElement;)t=t.parentElement;return Ea.pipe(w(r=>r.observe(t)),v(r=>Jo.pipe(b(o=>o.target===t),_(()=>r.unobserve(t)))),m(()=>ce(e)),Q(ce(e)))}function St(e){return{width:e.scrollWidth,height:e.scrollHeight}}function cr(e){let t=e.parentElement;for(;t&&(e.scrollWidth<=t.scrollWidth&&e.scrollHeight<=t.scrollHeight);)t=(e=t).parentElement;return t?e:void 0}function Xo(e){let t=[],r=e.parentElement;for(;r;)(e.clientWidth>r.clientWidth||e.clientHeight>r.clientHeight)&&t.push(r),r=(e=r).parentElement;return t.length===0&&t.push(document.documentElement),t}function Ve(e){return{x:e.offsetLeft,y:e.offsetTop}}function Zo(e){let t=e.getBoundingClientRect();return{x:t.x+window.scrollX,y:t.y+window.scrollY}}function en(e){return O(h(window,"load"),h(window,"resize")).pipe(Le(0,me),m(()=>Ve(e)),Q(Ve(e)))}function pr(e){return{x:e.scrollLeft,y:e.scrollTop}}function Ne(e){return O(h(e,"scroll"),h(window,"scroll"),h(window,"resize")).pipe(Le(0,me),m(()=>pr(e)),Q(pr(e)))}var tn=new g,wa=C(()=>I(new IntersectionObserver(e=>{for(let t of e)tn.next(t)},{threshold:0}))).pipe(v(e=>O(Ye,I(e)).pipe(_(()=>e.disconnect()))),G(1));function tt(e){return wa.pipe(w(t=>t.observe(e)),v(t=>tn.pipe(b(({target:r})=>r===e),_(()=>t.unobserve(e)),m(({isIntersecting:r})=>r))))}function rn(e,t=16){return Ne(e).pipe(m(({y:r})=>{let o=ce(e),n=St(e);return r>=n.height-o.height-t}),K())}var lr={drawer:R("[data-md-toggle=drawer]"),search:R("[data-md-toggle=search]")};function on(e){return lr[e].checked}function Je(e,t){lr[e].checked!==t&&lr[e].click()}function ze(e){let t=lr[e];return h(t,"change").pipe(m(()=>t.checked),Q(t.checked))}function Ta(e,t){switch(e.constructor){case HTMLInputElement:return e.type==="radio"?/^Arrow/.test(t):!0;case HTMLSelectElement:case HTMLTextAreaElement:return!0;default:return e.isContentEditable}}function Sa(){return O(h(window,"compositionstart").pipe(m(()=>!0)),h(window,"compositionend").pipe(m(()=>!1))).pipe(Q(!1))}function nn(){let e=h(window,"keydown").pipe(b(t=>!(t.metaKey||t.ctrlKey)),m(t=>({mode:on("search")?"search":"global",type:t.key,claim(){t.preventDefault(),t.stopPropagation()}})),b(({mode:t,type:r})=>{if(t==="global"){let o=Ie();if(typeof o!="undefined")return!Ta(o,r)}return!0}),pe());return Sa().pipe(v(t=>t?S:e))}function ye(){return new URL(location.href)}function lt(e,t=!1){if(B("navigation.instant")&&!t){let r=x("a",{href:e.href});document.body.appendChild(r),r.click(),r.remove()}else location.href=e.href}function an(){return new g}function sn(){return location.hash.slice(1)}function cn(e){let t=x("a",{href:e});t.addEventListener("click",r=>r.stopPropagation()),t.click()}function Oa(e){return O(h(window,"hashchange"),e).pipe(m(sn),Q(sn()),b(t=>t.length>0),G(1))}function pn(e){return Oa(e).pipe(m(t=>fe(`[id="${t}"]`)),b(t=>typeof t!="undefined"))}function Pt(e){let t=matchMedia(e);return ar(r=>t.addListener(()=>r(t.matches))).pipe(Q(t.matches))}function ln(){let e=matchMedia("print");return O(h(window,"beforeprint").pipe(m(()=>!0)),h(window,"afterprint").pipe(m(()=>!1))).pipe(Q(e.matches))}function Nr(e,t){return e.pipe(v(r=>r?t():S))}function zr(e,t){return new j(r=>{let o=new XMLHttpRequest;return o.open("GET",`${e}`),o.responseType="blob",o.addEventListener("load",()=>{o.status>=200&&o.status<300?(r.next(o.response),r.complete()):r.error(new Error(o.statusText))}),o.addEventListener("error",()=>{r.error(new Error("Network error"))}),o.addEventListener("abort",()=>{r.complete()}),typeof(t==null?void 0:t.progress$)!="undefined"&&(o.addEventListener("progress",n=>{var i;if(n.lengthComputable)t.progress$.next(n.loaded/n.total*100);else{let a=(i=o.getResponseHeader("Content-Length"))!=null?i:0;t.progress$.next(n.loaded/+a*100)}}),t.progress$.next(5)),o.send(),()=>o.abort()})}function je(e,t){return zr(e,t).pipe(v(r=>r.text()),m(r=>JSON.parse(r)),G(1))}function mn(e,t){let r=new DOMParser;return zr(e,t).pipe(v(o=>o.text()),m(o=>r.parseFromString(o,"text/html")),G(1))}function fn(e,t){let r=new DOMParser;return zr(e,t).pipe(v(o=>o.text()),m(o=>r.parseFromString(o,"text/xml")),G(1))}function un(){return{x:Math.max(0,scrollX),y:Math.max(0,scrollY)}}function dn(){return O(h(window,"scroll",{passive:!0}),h(window,"resize",{passive:!0})).pipe(m(un),Q(un()))}function hn(){return{width:innerWidth,height:innerHeight}}function bn(){return h(window,"resize",{passive:!0}).pipe(m(hn),Q(hn()))}function vn(){return z([dn(),bn()]).pipe(m(([e,t])=>({offset:e,size:t})),G(1))}function mr(e,{viewport$:t,header$:r}){let o=t.pipe(ee("size")),n=z([o,r]).pipe(m(()=>Ve(e)));return z([r,t,n]).pipe(m(([{height:i},{offset:a,size:s},{x:p,y:c}])=>({offset:{x:a.x-p,y:a.y-c+i},size:s})))}function Ma(e){return h(e,"message",t=>t.data)}function La(e){let t=new g;return t.subscribe(r=>e.postMessage(r)),t}function gn(e,t=new Worker(e)){let r=Ma(t),o=La(t),n=new g;n.subscribe(o);let i=o.pipe(Z(),ie(!0));return n.pipe(Z(),Re(r.pipe(U(i))),pe())}var _a=R("#__config"),Ot=JSON.parse(_a.textContent);Ot.base=`${new URL(Ot.base,ye())}`;function xe(){return Ot}function B(e){return Ot.features.includes(e)}function Ee(e,t){return typeof t!="undefined"?Ot.translations[e].replace("#",t.toString()):Ot.translations[e]}function Se(e,t=document){return R(`[data-md-component=${e}]`,t)}function ae(e,t=document){return P(`[data-md-component=${e}]`,t)}function Aa(e){let t=R(".md-typeset > :first-child",e);return h(t,"click",{once:!0}).pipe(m(()=>R(".md-typeset",e)),m(r=>({hash:__md_hash(r.innerHTML)})))}function yn(e){if(!B("announce.dismiss")||!e.childElementCount)return S;if(!e.hidden){let t=R(".md-typeset",e);__md_hash(t.innerHTML)===__md_get("__announce")&&(e.hidden=!0)}return C(()=>{let t=new g;return t.subscribe(({hash:r})=>{e.hidden=!0,__md_set("__announce",r)}),Aa(e).pipe(w(r=>t.next(r)),_(()=>t.complete()),m(r=>$({ref:e},r)))})}function Ca(e,{target$:t}){return t.pipe(m(r=>({hidden:r!==e})))}function xn(e,t){let r=new g;return r.subscribe(({hidden:o})=>{e.hidden=o}),Ca(e,t).pipe(w(o=>r.next(o)),_(()=>r.complete()),m(o=>$({ref:e},o)))}function Rt(e,t){return t==="inline"?x("div",{class:"md-tooltip md-tooltip--inline",id:e,role:"tooltip"},x("div",{class:"md-tooltip__inner md-typeset"})):x("div",{class:"md-tooltip",id:e,role:"tooltip"},x("div",{class:"md-tooltip__inner md-typeset"}))}function En(...e){return x("div",{class:"md-tooltip2",role:"tooltip"},x("div",{class:"md-tooltip2__inner md-typeset"},e))}function wn(e,t){if(t=t?`${t}_annotation_${e}`:void 0,t){let r=t?`#${t}`:void 0;return x("aside",{class:"md-annotation",tabIndex:0},Rt(t),x("a",{href:r,class:"md-annotation__index",tabIndex:-1},x("span",{"data-md-annotation-id":e})))}else return x("aside",{class:"md-annotation",tabIndex:0},Rt(t),x("span",{class:"md-annotation__index",tabIndex:-1},x("span",{"data-md-annotation-id":e})))}function Tn(e){return x("button",{class:"md-clipboard md-icon",title:Ee("clipboard.copy"),"data-clipboard-target":`#${e} > code`})}var On=Lt(qr());function Qr(e,t){let r=t&2,o=t&1,n=Object.keys(e.terms).filter(p=>!e.terms[p]).reduce((p,c)=>[...p,x("del",null,(0,On.default)(c))," "],[]).slice(0,-1),i=xe(),a=new URL(e.location,i.base);B("search.highlight")&&a.searchParams.set("h",Object.entries(e.terms).filter(([,p])=>p).reduce((p,[c])=>`${p} ${c}`.trim(),""));let{tags:s}=xe();return x("a",{href:`${a}`,class:"md-search-result__link",tabIndex:-1},x("article",{class:"md-search-result__article md-typeset","data-md-score":e.score.toFixed(2)},r>0&&x("div",{class:"md-search-result__icon md-icon"}),r>0&&x("h1",null,e.title),r<=0&&x("h2",null,e.title),o>0&&e.text.length>0&&e.text,e.tags&&x("nav",{class:"md-tags"},e.tags.map(p=>{let c=s?p in s?`md-tag-icon md-tag--${s[p]}`:"md-tag-icon":"";return x("span",{class:`md-tag ${c}`},p)})),o>0&&n.length>0&&x("p",{class:"md-search-result__terms"},Ee("search.result.term.missing"),": ",...n)))}function Mn(e){let t=e[0].score,r=[...e],o=xe(),n=r.findIndex(l=>!`${new URL(l.location,o.base)}`.includes("#")),[i]=r.splice(n,1),a=r.findIndex(l=>l.scoreQr(l,1)),...p.length?[x("details",{class:"md-search-result__more"},x("summary",{tabIndex:-1},x("div",null,p.length>0&&p.length===1?Ee("search.result.more.one"):Ee("search.result.more.other",p.length))),...p.map(l=>Qr(l,1)))]:[]];return x("li",{class:"md-search-result__item"},c)}function Ln(e){return x("ul",{class:"md-source__facts"},Object.entries(e).map(([t,r])=>x("li",{class:`md-source__fact md-source__fact--${t}`},typeof r=="number"?sr(r):r)))}function Kr(e){let t=`tabbed-control tabbed-control--${e}`;return x("div",{class:t,hidden:!0},x("button",{class:"tabbed-button",tabIndex:-1,"aria-hidden":"true"}))}function _n(e){return x("div",{class:"md-typeset__scrollwrap"},x("div",{class:"md-typeset__table"},e))}function $a(e){var o;let t=xe(),r=new URL(`../${e.version}/`,t.base);return x("li",{class:"md-version__item"},x("a",{href:`${r}`,class:"md-version__link"},e.title,((o=t.version)==null?void 0:o.alias)&&e.aliases.length>0&&x("span",{class:"md-version__alias"},e.aliases[0])))}function An(e,t){var o;let r=xe();return e=e.filter(n=>{var i;return!((i=n.properties)!=null&&i.hidden)}),x("div",{class:"md-version"},x("button",{class:"md-version__current","aria-label":Ee("select.version")},t.title,((o=r.version)==null?void 0:o.alias)&&t.aliases.length>0&&x("span",{class:"md-version__alias"},t.aliases[0])),x("ul",{class:"md-version__list"},e.map($a)))}var Pa=0;function Ra(e){let t=z([et(e),$t(e)]).pipe(m(([o,n])=>o||n),K()),r=C(()=>Xo(e)).pipe(ne(Ne),pt(1),He(t),m(()=>Zo(e)));return t.pipe(Ae(o=>o),v(()=>z([t,r])),m(([o,n])=>({active:o,offset:n})),pe())}function Ia(e,t){let{content$:r,viewport$:o}=t,n=`__tooltip2_${Pa++}`;return C(()=>{let i=new g,a=new _r(!1);i.pipe(Z(),ie(!1)).subscribe(a);let s=a.pipe(Ht(c=>Me(+!c*250,kr)),K(),v(c=>c?r:S),w(c=>c.id=n),pe());z([i.pipe(m(({active:c})=>c)),s.pipe(v(c=>$t(c,250)),Q(!1))]).pipe(m(c=>c.some(l=>l))).subscribe(a);let p=a.pipe(b(c=>c),re(s,o),m(([c,l,{size:f}])=>{let u=e.getBoundingClientRect(),d=u.width/2;if(l.role==="tooltip")return{x:d,y:8+u.height};if(u.y>=f.height/2){let{height:y}=ce(l);return{x:d,y:-16-y}}else return{x:d,y:16+u.height}}));return z([s,i,p]).subscribe(([c,{offset:l},f])=>{c.style.setProperty("--md-tooltip-host-x",`${l.x}px`),c.style.setProperty("--md-tooltip-host-y",`${l.y}px`),c.style.setProperty("--md-tooltip-x",`${f.x}px`),c.style.setProperty("--md-tooltip-y",`${f.y}px`),c.classList.toggle("md-tooltip2--top",f.y<0),c.classList.toggle("md-tooltip2--bottom",f.y>=0)}),a.pipe(b(c=>c),re(s,(c,l)=>l),b(c=>c.role==="tooltip")).subscribe(c=>{let l=ce(R(":scope > *",c));c.style.setProperty("--md-tooltip-width",`${l.width}px`),c.style.setProperty("--md-tooltip-tail","0px")}),a.pipe(K(),ve(me),re(s)).subscribe(([c,l])=>{l.classList.toggle("md-tooltip2--active",c)}),z([a.pipe(b(c=>c)),s]).subscribe(([c,l])=>{l.role==="dialog"?(e.setAttribute("aria-controls",n),e.setAttribute("aria-haspopup","dialog")):e.setAttribute("aria-describedby",n)}),a.pipe(b(c=>!c)).subscribe(()=>{e.removeAttribute("aria-controls"),e.removeAttribute("aria-describedby"),e.removeAttribute("aria-haspopup")}),Ra(e).pipe(w(c=>i.next(c)),_(()=>i.complete()),m(c=>$({ref:e},c)))})}function mt(e,{viewport$:t},r=document.body){return Ia(e,{content$:new j(o=>{let n=e.title,i=En(n);return o.next(i),e.removeAttribute("title"),r.append(i),()=>{i.remove(),e.setAttribute("title",n)}}),viewport$:t})}function ja(e,t){let r=C(()=>z([en(e),Ne(t)])).pipe(m(([{x:o,y:n},i])=>{let{width:a,height:s}=ce(e);return{x:o-i.x+a/2,y:n-i.y+s/2}}));return et(e).pipe(v(o=>r.pipe(m(n=>({active:o,offset:n})),Te(+!o||1/0))))}function Cn(e,t,{target$:r}){let[o,n]=Array.from(e.children);return C(()=>{let i=new g,a=i.pipe(Z(),ie(!0));return i.subscribe({next({offset:s}){e.style.setProperty("--md-tooltip-x",`${s.x}px`),e.style.setProperty("--md-tooltip-y",`${s.y}px`)},complete(){e.style.removeProperty("--md-tooltip-x"),e.style.removeProperty("--md-tooltip-y")}}),tt(e).pipe(U(a)).subscribe(s=>{e.toggleAttribute("data-md-visible",s)}),O(i.pipe(b(({active:s})=>s)),i.pipe(_e(250),b(({active:s})=>!s))).subscribe({next({active:s}){s?e.prepend(o):o.remove()},complete(){e.prepend(o)}}),i.pipe(Le(16,me)).subscribe(({active:s})=>{o.classList.toggle("md-tooltip--active",s)}),i.pipe(pt(125,me),b(()=>!!e.offsetParent),m(()=>e.offsetParent.getBoundingClientRect()),m(({x:s})=>s)).subscribe({next(s){s?e.style.setProperty("--md-tooltip-0",`${-s}px`):e.style.removeProperty("--md-tooltip-0")},complete(){e.style.removeProperty("--md-tooltip-0")}}),h(n,"click").pipe(U(a),b(s=>!(s.metaKey||s.ctrlKey))).subscribe(s=>{s.stopPropagation(),s.preventDefault()}),h(n,"mousedown").pipe(U(a),re(i)).subscribe(([s,{active:p}])=>{var c;if(s.button!==0||s.metaKey||s.ctrlKey)s.preventDefault();else if(p){s.preventDefault();let l=e.parentElement.closest(".md-annotation");l instanceof HTMLElement?l.focus():(c=Ie())==null||c.blur()}}),r.pipe(U(a),b(s=>s===o),Ge(125)).subscribe(()=>e.focus()),ja(e,t).pipe(w(s=>i.next(s)),_(()=>i.complete()),m(s=>$({ref:e},s)))})}function Fa(e){return e.tagName==="CODE"?P(".c, .c1, .cm",e):[e]}function Wa(e){let t=[];for(let r of Fa(e)){let o=[],n=document.createNodeIterator(r,NodeFilter.SHOW_TEXT);for(let i=n.nextNode();i;i=n.nextNode())o.push(i);for(let i of o){let a;for(;a=/(\(\d+\))(!)?/.exec(i.textContent);){let[,s,p]=a;if(typeof p=="undefined"){let c=i.splitText(a.index);i=c.splitText(s.length),t.push(c)}else{i.textContent=s,t.push(i);break}}}}return t}function kn(e,t){t.append(...Array.from(e.childNodes))}function fr(e,t,{target$:r,print$:o}){let n=t.closest("[id]"),i=n==null?void 0:n.id,a=new Map;for(let s of Wa(t)){let[,p]=s.textContent.match(/\((\d+)\)/);fe(`:scope > li:nth-child(${p})`,e)&&(a.set(p,wn(p,i)),s.replaceWith(a.get(p)))}return a.size===0?S:C(()=>{let s=new g,p=s.pipe(Z(),ie(!0)),c=[];for(let[l,f]of a)c.push([R(".md-typeset",f),R(`:scope > li:nth-child(${l})`,e)]);return o.pipe(U(p)).subscribe(l=>{e.hidden=!l,e.classList.toggle("md-annotation-list",l);for(let[f,u]of c)l?kn(f,u):kn(u,f)}),O(...[...a].map(([,l])=>Cn(l,t,{target$:r}))).pipe(_(()=>s.complete()),pe())})}function Hn(e){if(e.nextElementSibling){let t=e.nextElementSibling;if(t.tagName==="OL")return t;if(t.tagName==="P"&&!t.children.length)return Hn(t)}}function $n(e,t){return C(()=>{let r=Hn(e);return typeof r!="undefined"?fr(r,e,t):S})}var Pn=Lt(Br());var Ua=0;function Rn(e){if(e.nextElementSibling){let t=e.nextElementSibling;if(t.tagName==="OL")return t;if(t.tagName==="P"&&!t.children.length)return Rn(t)}}function Da(e){return ge(e).pipe(m(({width:t})=>({scrollable:St(e).width>t})),ee("scrollable"))}function In(e,t){let{matches:r}=matchMedia("(hover)"),o=C(()=>{let n=new g,i=n.pipe(jr(1));n.subscribe(({scrollable:c})=>{c&&r?e.setAttribute("tabindex","0"):e.removeAttribute("tabindex")});let a=[];if(Pn.default.isSupported()&&(e.closest(".copy")||B("content.code.copy")&&!e.closest(".no-copy"))){let c=e.closest("pre");c.id=`__code_${Ua++}`;let l=Tn(c.id);c.insertBefore(l,e),B("content.tooltips")&&a.push(mt(l,{viewport$}))}let s=e.closest(".highlight");if(s instanceof HTMLElement){let c=Rn(s);if(typeof c!="undefined"&&(s.classList.contains("annotate")||B("content.code.annotate"))){let l=fr(c,e,t);a.push(ge(s).pipe(U(i),m(({width:f,height:u})=>f&&u),K(),v(f=>f?l:S)))}}return P(":scope > span[id]",e).length&&e.classList.add("md-code__content"),Da(e).pipe(w(c=>n.next(c)),_(()=>n.complete()),m(c=>$({ref:e},c)),Re(...a))});return B("content.lazy")?tt(e).pipe(b(n=>n),Te(1),v(()=>o)):o}function Va(e,{target$:t,print$:r}){let o=!0;return O(t.pipe(m(n=>n.closest("details:not([open])")),b(n=>e===n),m(()=>({action:"open",reveal:!0}))),r.pipe(b(n=>n||!o),w(()=>o=e.open),m(n=>({action:n?"open":"close"}))))}function jn(e,t){return C(()=>{let r=new g;return r.subscribe(({action:o,reveal:n})=>{e.toggleAttribute("open",o==="open"),n&&e.scrollIntoView()}),Va(e,t).pipe(w(o=>r.next(o)),_(()=>r.complete()),m(o=>$({ref:e},o)))})}var Fn=".node circle,.node ellipse,.node path,.node polygon,.node rect{fill:var(--md-mermaid-node-bg-color);stroke:var(--md-mermaid-node-fg-color)}marker{fill:var(--md-mermaid-edge-color)!important}.edgeLabel .label rect{fill:#0000}.label{color:var(--md-mermaid-label-fg-color);font-family:var(--md-mermaid-font-family)}.label foreignObject{line-height:normal;overflow:visible}.label div .edgeLabel{color:var(--md-mermaid-label-fg-color)}.edgeLabel,.edgeLabel p,.label div .edgeLabel{background-color:var(--md-mermaid-label-bg-color)}.edgeLabel,.edgeLabel p{fill:var(--md-mermaid-label-bg-color);color:var(--md-mermaid-edge-color)}.edgePath .path,.flowchart-link{stroke:var(--md-mermaid-edge-color);stroke-width:.05rem}.edgePath .arrowheadPath{fill:var(--md-mermaid-edge-color);stroke:none}.cluster rect{fill:var(--md-default-fg-color--lightest);stroke:var(--md-default-fg-color--lighter)}.cluster span{color:var(--md-mermaid-label-fg-color);font-family:var(--md-mermaid-font-family)}g #flowchart-circleEnd,g #flowchart-circleStart,g #flowchart-crossEnd,g #flowchart-crossStart,g #flowchart-pointEnd,g #flowchart-pointStart{stroke:none}g.classGroup line,g.classGroup rect{fill:var(--md-mermaid-node-bg-color);stroke:var(--md-mermaid-node-fg-color)}g.classGroup text{fill:var(--md-mermaid-label-fg-color);font-family:var(--md-mermaid-font-family)}.classLabel .box{fill:var(--md-mermaid-label-bg-color);background-color:var(--md-mermaid-label-bg-color);opacity:1}.classLabel .label{fill:var(--md-mermaid-label-fg-color);font-family:var(--md-mermaid-font-family)}.node .divider{stroke:var(--md-mermaid-node-fg-color)}.relation{stroke:var(--md-mermaid-edge-color)}.cardinality{fill:var(--md-mermaid-label-fg-color);font-family:var(--md-mermaid-font-family)}.cardinality text{fill:inherit!important}defs #classDiagram-compositionEnd,defs #classDiagram-compositionStart,defs #classDiagram-dependencyEnd,defs #classDiagram-dependencyStart,defs #classDiagram-extensionEnd,defs #classDiagram-extensionStart{fill:var(--md-mermaid-edge-color)!important;stroke:var(--md-mermaid-edge-color)!important}defs #classDiagram-aggregationEnd,defs #classDiagram-aggregationStart{fill:var(--md-mermaid-label-bg-color)!important;stroke:var(--md-mermaid-edge-color)!important}g.stateGroup rect{fill:var(--md-mermaid-node-bg-color);stroke:var(--md-mermaid-node-fg-color)}g.stateGroup .state-title{fill:var(--md-mermaid-label-fg-color)!important;font-family:var(--md-mermaid-font-family)}g.stateGroup .composit{fill:var(--md-mermaid-label-bg-color)}.nodeLabel,.nodeLabel p{color:var(--md-mermaid-label-fg-color);font-family:var(--md-mermaid-font-family)}a .nodeLabel{text-decoration:underline}.node circle.state-end,.node circle.state-start,.start-state{fill:var(--md-mermaid-edge-color);stroke:none}.end-state-inner,.end-state-outer{fill:var(--md-mermaid-edge-color)}.end-state-inner,.node circle.state-end{stroke:var(--md-mermaid-label-bg-color)}.transition{stroke:var(--md-mermaid-edge-color)}[id^=state-fork] rect,[id^=state-join] rect{fill:var(--md-mermaid-edge-color)!important;stroke:none!important}.statediagram-cluster.statediagram-cluster .inner{fill:var(--md-default-bg-color)}.statediagram-cluster rect{fill:var(--md-mermaid-node-bg-color);stroke:var(--md-mermaid-node-fg-color)}.statediagram-state rect.divider{fill:var(--md-default-fg-color--lightest);stroke:var(--md-default-fg-color--lighter)}defs #statediagram-barbEnd{stroke:var(--md-mermaid-edge-color)}.attributeBoxEven,.attributeBoxOdd{fill:var(--md-mermaid-node-bg-color);stroke:var(--md-mermaid-node-fg-color)}.entityBox{fill:var(--md-mermaid-label-bg-color);stroke:var(--md-mermaid-node-fg-color)}.entityLabel{fill:var(--md-mermaid-label-fg-color);font-family:var(--md-mermaid-font-family)}.relationshipLabelBox{fill:var(--md-mermaid-label-bg-color);fill-opacity:1;background-color:var(--md-mermaid-label-bg-color);opacity:1}.relationshipLabel{fill:var(--md-mermaid-label-fg-color)}.relationshipLine{stroke:var(--md-mermaid-edge-color)}defs #ONE_OR_MORE_END *,defs #ONE_OR_MORE_START *,defs #ONLY_ONE_END *,defs #ONLY_ONE_START *,defs #ZERO_OR_MORE_END *,defs #ZERO_OR_MORE_START *,defs #ZERO_OR_ONE_END *,defs #ZERO_OR_ONE_START *{stroke:var(--md-mermaid-edge-color)!important}defs #ZERO_OR_MORE_END circle,defs #ZERO_OR_MORE_START circle{fill:var(--md-mermaid-label-bg-color)}.actor{fill:var(--md-mermaid-sequence-actor-bg-color);stroke:var(--md-mermaid-sequence-actor-border-color)}text.actor>tspan{fill:var(--md-mermaid-sequence-actor-fg-color);font-family:var(--md-mermaid-font-family)}line{stroke:var(--md-mermaid-sequence-actor-line-color)}.actor-man circle,.actor-man line{fill:var(--md-mermaid-sequence-actorman-bg-color);stroke:var(--md-mermaid-sequence-actorman-line-color)}.messageLine0,.messageLine1{stroke:var(--md-mermaid-sequence-message-line-color)}.note{fill:var(--md-mermaid-sequence-note-bg-color);stroke:var(--md-mermaid-sequence-note-border-color)}.loopText,.loopText>tspan,.messageText,.noteText>tspan{stroke:none;font-family:var(--md-mermaid-font-family)!important}.messageText{fill:var(--md-mermaid-sequence-message-fg-color)}.loopText,.loopText>tspan{fill:var(--md-mermaid-sequence-loop-fg-color)}.noteText>tspan{fill:var(--md-mermaid-sequence-note-fg-color)}#arrowhead path{fill:var(--md-mermaid-sequence-message-line-color);stroke:none}.loopLine{fill:var(--md-mermaid-sequence-loop-bg-color);stroke:var(--md-mermaid-sequence-loop-border-color)}.labelBox{fill:var(--md-mermaid-sequence-label-bg-color);stroke:none}.labelText,.labelText>span{fill:var(--md-mermaid-sequence-label-fg-color);font-family:var(--md-mermaid-font-family)}.sequenceNumber{fill:var(--md-mermaid-sequence-number-fg-color)}rect.rect{fill:var(--md-mermaid-sequence-box-bg-color);stroke:none}rect.rect+text.text{fill:var(--md-mermaid-sequence-box-fg-color)}defs #sequencenumber{fill:var(--md-mermaid-sequence-number-bg-color)!important}";var Gr,za=0;function qa(){return typeof mermaid=="undefined"||mermaid instanceof Element?Tt("https://unpkg.com/mermaid@11/dist/mermaid.min.js"):I(void 0)}function Wn(e){return e.classList.remove("mermaid"),Gr||(Gr=qa().pipe(w(()=>mermaid.initialize({startOnLoad:!1,themeCSS:Fn,sequence:{actorFontSize:"16px",messageFontSize:"16px",noteFontSize:"16px"}})),m(()=>{}),G(1))),Gr.subscribe(()=>so(this,null,function*(){e.classList.add("mermaid");let t=`__mermaid_${za++}`,r=x("div",{class:"mermaid"}),o=e.textContent,{svg:n,fn:i}=yield mermaid.render(t,o),a=r.attachShadow({mode:"closed"});a.innerHTML=n,e.replaceWith(r),i==null||i(a)})),Gr.pipe(m(()=>({ref:e})))}var Un=x("table");function Dn(e){return e.replaceWith(Un),Un.replaceWith(_n(e)),I({ref:e})}function Qa(e){let t=e.find(r=>r.checked)||e[0];return O(...e.map(r=>h(r,"change").pipe(m(()=>R(`label[for="${r.id}"]`))))).pipe(Q(R(`label[for="${t.id}"]`)),m(r=>({active:r})))}function Vn(e,{viewport$:t,target$:r}){let o=R(".tabbed-labels",e),n=P(":scope > input",e),i=Kr("prev");e.append(i);let a=Kr("next");return e.append(a),C(()=>{let s=new g,p=s.pipe(Z(),ie(!0));z([s,ge(e),tt(e)]).pipe(U(p),Le(1,me)).subscribe({next([{active:c},l]){let f=Ve(c),{width:u}=ce(c);e.style.setProperty("--md-indicator-x",`${f.x}px`),e.style.setProperty("--md-indicator-width",`${u}px`);let d=pr(o);(f.xd.x+l.width)&&o.scrollTo({left:Math.max(0,f.x-16),behavior:"smooth"})},complete(){e.style.removeProperty("--md-indicator-x"),e.style.removeProperty("--md-indicator-width")}}),z([Ne(o),ge(o)]).pipe(U(p)).subscribe(([c,l])=>{let f=St(o);i.hidden=c.x<16,a.hidden=c.x>f.width-l.width-16}),O(h(i,"click").pipe(m(()=>-1)),h(a,"click").pipe(m(()=>1))).pipe(U(p)).subscribe(c=>{let{width:l}=ce(o);o.scrollBy({left:l*c,behavior:"smooth"})}),r.pipe(U(p),b(c=>n.includes(c))).subscribe(c=>c.click()),o.classList.add("tabbed-labels--linked");for(let c of n){let l=R(`label[for="${c.id}"]`);l.replaceChildren(x("a",{href:`#${l.htmlFor}`,tabIndex:-1},...Array.from(l.childNodes))),h(l.firstElementChild,"click").pipe(U(p),b(f=>!(f.metaKey||f.ctrlKey)),w(f=>{f.preventDefault(),f.stopPropagation()})).subscribe(()=>{history.replaceState({},"",`#${l.htmlFor}`),l.click()})}return B("content.tabs.link")&&s.pipe(Ce(1),re(t)).subscribe(([{active:c},{offset:l}])=>{let f=c.innerText.trim();if(c.hasAttribute("data-md-switching"))c.removeAttribute("data-md-switching");else{let u=e.offsetTop-l.y;for(let y of P("[data-tabs]"))for(let M of P(":scope > input",y)){let X=R(`label[for="${M.id}"]`);if(X!==c&&X.innerText.trim()===f){X.setAttribute("data-md-switching",""),M.click();break}}window.scrollTo({top:e.offsetTop-u});let d=__md_get("__tabs")||[];__md_set("__tabs",[...new Set([f,...d])])}}),s.pipe(U(p)).subscribe(()=>{for(let c of P("audio, video",e))c.pause()}),Qa(n).pipe(w(c=>s.next(c)),_(()=>s.complete()),m(c=>$({ref:e},c)))}).pipe(Ke(se))}function Nn(e,{viewport$:t,target$:r,print$:o}){return O(...P(".annotate:not(.highlight)",e).map(n=>$n(n,{target$:r,print$:o})),...P("pre:not(.mermaid) > code",e).map(n=>In(n,{target$:r,print$:o})),...P("pre.mermaid",e).map(n=>Wn(n)),...P("table:not([class])",e).map(n=>Dn(n)),...P("details",e).map(n=>jn(n,{target$:r,print$:o})),...P("[data-tabs]",e).map(n=>Vn(n,{viewport$:t,target$:r})),...P("[title]",e).filter(()=>B("content.tooltips")).map(n=>mt(n,{viewport$:t})))}function Ka(e,{alert$:t}){return t.pipe(v(r=>O(I(!0),I(!1).pipe(Ge(2e3))).pipe(m(o=>({message:r,active:o})))))}function zn(e,t){let r=R(".md-typeset",e);return C(()=>{let o=new g;return o.subscribe(({message:n,active:i})=>{e.classList.toggle("md-dialog--active",i),r.textContent=n}),Ka(e,t).pipe(w(n=>o.next(n)),_(()=>o.complete()),m(n=>$({ref:e},n)))})}var Ya=0;function Ba(e,t){document.body.append(e);let{width:r}=ce(e);e.style.setProperty("--md-tooltip-width",`${r}px`),e.remove();let o=cr(t),n=typeof o!="undefined"?Ne(o):I({x:0,y:0}),i=O(et(t),$t(t)).pipe(K());return z([i,n]).pipe(m(([a,s])=>{let{x:p,y:c}=Ve(t),l=ce(t),f=t.closest("table");return f&&t.parentElement&&(p+=f.offsetLeft+t.parentElement.offsetLeft,c+=f.offsetTop+t.parentElement.offsetTop),{active:a,offset:{x:p-s.x+l.width/2-r/2,y:c-s.y+l.height+8}}}))}function qn(e){let t=e.title;if(!t.length)return S;let r=`__tooltip_${Ya++}`,o=Rt(r,"inline"),n=R(".md-typeset",o);return n.innerHTML=t,C(()=>{let i=new g;return i.subscribe({next({offset:a}){o.style.setProperty("--md-tooltip-x",`${a.x}px`),o.style.setProperty("--md-tooltip-y",`${a.y}px`)},complete(){o.style.removeProperty("--md-tooltip-x"),o.style.removeProperty("--md-tooltip-y")}}),O(i.pipe(b(({active:a})=>a)),i.pipe(_e(250),b(({active:a})=>!a))).subscribe({next({active:a}){a?(e.insertAdjacentElement("afterend",o),e.setAttribute("aria-describedby",r),e.removeAttribute("title")):(o.remove(),e.removeAttribute("aria-describedby"),e.setAttribute("title",t))},complete(){o.remove(),e.removeAttribute("aria-describedby"),e.setAttribute("title",t)}}),i.pipe(Le(16,me)).subscribe(({active:a})=>{o.classList.toggle("md-tooltip--active",a)}),i.pipe(pt(125,me),b(()=>!!e.offsetParent),m(()=>e.offsetParent.getBoundingClientRect()),m(({x:a})=>a)).subscribe({next(a){a?o.style.setProperty("--md-tooltip-0",`${-a}px`):o.style.removeProperty("--md-tooltip-0")},complete(){o.style.removeProperty("--md-tooltip-0")}}),Ba(o,e).pipe(w(a=>i.next(a)),_(()=>i.complete()),m(a=>$({ref:e},a)))}).pipe(Ke(se))}function Ga({viewport$:e}){if(!B("header.autohide"))return I(!1);let t=e.pipe(m(({offset:{y:n}})=>n),Be(2,1),m(([n,i])=>[nMath.abs(i-n.y)>100),m(([,[n]])=>n),K()),o=ze("search");return z([e,o]).pipe(m(([{offset:n},i])=>n.y>400&&!i),K(),v(n=>n?r:I(!1)),Q(!1))}function Qn(e,t){return C(()=>z([ge(e),Ga(t)])).pipe(m(([{height:r},o])=>({height:r,hidden:o})),K((r,o)=>r.height===o.height&&r.hidden===o.hidden),G(1))}function Kn(e,{header$:t,main$:r}){return C(()=>{let o=new g,n=o.pipe(Z(),ie(!0));o.pipe(ee("active"),He(t)).subscribe(([{active:a},{hidden:s}])=>{e.classList.toggle("md-header--shadow",a&&!s),e.hidden=s});let i=ue(P("[title]",e)).pipe(b(()=>B("content.tooltips")),ne(a=>qn(a)));return r.subscribe(o),t.pipe(U(n),m(a=>$({ref:e},a)),Re(i.pipe(U(n))))})}function Ja(e,{viewport$:t,header$:r}){return mr(e,{viewport$:t,header$:r}).pipe(m(({offset:{y:o}})=>{let{height:n}=ce(e);return{active:o>=n}}),ee("active"))}function Yn(e,t){return C(()=>{let r=new g;r.subscribe({next({active:n}){e.classList.toggle("md-header__title--active",n)},complete(){e.classList.remove("md-header__title--active")}});let o=fe(".md-content h1");return typeof o=="undefined"?S:Ja(o,t).pipe(w(n=>r.next(n)),_(()=>r.complete()),m(n=>$({ref:e},n)))})}function Bn(e,{viewport$:t,header$:r}){let o=r.pipe(m(({height:i})=>i),K()),n=o.pipe(v(()=>ge(e).pipe(m(({height:i})=>({top:e.offsetTop,bottom:e.offsetTop+i})),ee("bottom"))));return z([o,n,t]).pipe(m(([i,{top:a,bottom:s},{offset:{y:p},size:{height:c}}])=>(c=Math.max(0,c-Math.max(0,a-p,i)-Math.max(0,c+p-s)),{offset:a-i,height:c,active:a-i<=p})),K((i,a)=>i.offset===a.offset&&i.height===a.height&&i.active===a.active))}function Xa(e){let t=__md_get("__palette")||{index:e.findIndex(o=>matchMedia(o.getAttribute("data-md-color-media")).matches)},r=Math.max(0,Math.min(t.index,e.length-1));return I(...e).pipe(ne(o=>h(o,"change").pipe(m(()=>o))),Q(e[r]),m(o=>({index:e.indexOf(o),color:{media:o.getAttribute("data-md-color-media"),scheme:o.getAttribute("data-md-color-scheme"),primary:o.getAttribute("data-md-color-primary"),accent:o.getAttribute("data-md-color-accent")}})),G(1))}function Gn(e){let t=P("input",e),r=x("meta",{name:"theme-color"});document.head.appendChild(r);let o=x("meta",{name:"color-scheme"});document.head.appendChild(o);let n=Pt("(prefers-color-scheme: light)");return C(()=>{let i=new g;return i.subscribe(a=>{if(document.body.setAttribute("data-md-color-switching",""),a.color.media==="(prefers-color-scheme)"){let s=matchMedia("(prefers-color-scheme: light)"),p=document.querySelector(s.matches?"[data-md-color-media='(prefers-color-scheme: light)']":"[data-md-color-media='(prefers-color-scheme: dark)']");a.color.scheme=p.getAttribute("data-md-color-scheme"),a.color.primary=p.getAttribute("data-md-color-primary"),a.color.accent=p.getAttribute("data-md-color-accent")}for(let[s,p]of Object.entries(a.color))document.body.setAttribute(`data-md-color-${s}`,p);for(let s=0;sa.key==="Enter"),re(i,(a,s)=>s)).subscribe(({index:a})=>{a=(a+1)%t.length,t[a].click(),t[a].focus()}),i.pipe(m(()=>{let a=Se("header"),s=window.getComputedStyle(a);return o.content=s.colorScheme,s.backgroundColor.match(/\d+/g).map(p=>(+p).toString(16).padStart(2,"0")).join("")})).subscribe(a=>r.content=`#${a}`),i.pipe(ve(se)).subscribe(()=>{document.body.removeAttribute("data-md-color-switching")}),Xa(t).pipe(U(n.pipe(Ce(1))),ct(),w(a=>i.next(a)),_(()=>i.complete()),m(a=>$({ref:e},a)))})}function Jn(e,{progress$:t}){return C(()=>{let r=new g;return r.subscribe(({value:o})=>{e.style.setProperty("--md-progress-value",`${o}`)}),t.pipe(w(o=>r.next({value:o})),_(()=>r.complete()),m(o=>({ref:e,value:o})))})}var Jr=Lt(Br());function Za(e){e.setAttribute("data-md-copying","");let t=e.closest("[data-copy]"),r=t?t.getAttribute("data-copy"):e.innerText;return e.removeAttribute("data-md-copying"),r.trimEnd()}function Xn({alert$:e}){Jr.default.isSupported()&&new j(t=>{new Jr.default("[data-clipboard-target], [data-clipboard-text]",{text:r=>r.getAttribute("data-clipboard-text")||Za(R(r.getAttribute("data-clipboard-target")))}).on("success",r=>t.next(r))}).pipe(w(t=>{t.trigger.focus()}),m(()=>Ee("clipboard.copied"))).subscribe(e)}function Zn(e,t){return e.protocol=t.protocol,e.hostname=t.hostname,e}function es(e,t){let r=new Map;for(let o of P("url",e)){let n=R("loc",o),i=[Zn(new URL(n.textContent),t)];r.set(`${i[0]}`,i);for(let a of P("[rel=alternate]",o)){let s=a.getAttribute("href");s!=null&&i.push(Zn(new URL(s),t))}}return r}function ur(e){return fn(new URL("sitemap.xml",e)).pipe(m(t=>es(t,new URL(e))),de(()=>I(new Map)))}function ts(e,t){if(!(e.target instanceof Element))return S;let r=e.target.closest("a");if(r===null)return S;if(r.target||e.metaKey||e.ctrlKey)return S;let o=new URL(r.href);return o.search=o.hash="",t.has(`${o}`)?(e.preventDefault(),I(new URL(r.href))):S}function ei(e){let t=new Map;for(let r of P(":scope > *",e.head))t.set(r.outerHTML,r);return t}function ti(e){for(let t of P("[href], [src]",e))for(let r of["href","src"]){let o=t.getAttribute(r);if(o&&!/^(?:[a-z]+:)?\/\//i.test(o)){t[r]=t[r];break}}return I(e)}function rs(e){for(let o of["[data-md-component=announce]","[data-md-component=container]","[data-md-component=header-topic]","[data-md-component=outdated]","[data-md-component=logo]","[data-md-component=skip]",...B("navigation.tabs.sticky")?["[data-md-component=tabs]"]:[]]){let n=fe(o),i=fe(o,e);typeof n!="undefined"&&typeof i!="undefined"&&n.replaceWith(i)}let t=ei(document);for(let[o,n]of ei(e))t.has(o)?t.delete(o):document.head.appendChild(n);for(let o of t.values()){let n=o.getAttribute("name");n!=="theme-color"&&n!=="color-scheme"&&o.remove()}let r=Se("container");return Ue(P("script",r)).pipe(v(o=>{let n=e.createElement("script");if(o.src){for(let i of o.getAttributeNames())n.setAttribute(i,o.getAttribute(i));return o.replaceWith(n),new j(i=>{n.onload=()=>i.complete()})}else return n.textContent=o.textContent,o.replaceWith(n),S}),Z(),ie(document))}function ri({location$:e,viewport$:t,progress$:r}){let o=xe();if(location.protocol==="file:")return S;let n=ur(o.base);I(document).subscribe(ti);let i=h(document.body,"click").pipe(He(n),v(([p,c])=>ts(p,c)),pe()),a=h(window,"popstate").pipe(m(ye),pe());i.pipe(re(t)).subscribe(([p,{offset:c}])=>{history.replaceState(c,""),history.pushState(null,"",p)}),O(i,a).subscribe(e);let s=e.pipe(ee("pathname"),v(p=>mn(p,{progress$:r}).pipe(de(()=>(lt(p,!0),S)))),v(ti),v(rs),pe());return O(s.pipe(re(e,(p,c)=>c)),s.pipe(v(()=>e),ee("pathname"),v(()=>e),ee("hash")),e.pipe(K((p,c)=>p.pathname===c.pathname&&p.hash===c.hash),v(()=>i),w(()=>history.back()))).subscribe(p=>{var c,l;history.state!==null||!p.hash?window.scrollTo(0,(l=(c=history.state)==null?void 0:c.y)!=null?l:0):(history.scrollRestoration="auto",cn(p.hash),history.scrollRestoration="manual")}),e.subscribe(()=>{history.scrollRestoration="manual"}),h(window,"beforeunload").subscribe(()=>{history.scrollRestoration="auto"}),t.pipe(ee("offset"),_e(100)).subscribe(({offset:p})=>{history.replaceState(p,"")}),s}var oi=Lt(qr());function ni(e){let t=e.separator.split("|").map(n=>n.replace(/(\(\?[!=<][^)]+\))/g,"").length===0?"\uFFFD":n).join("|"),r=new RegExp(t,"img"),o=(n,i,a)=>`${i}${a}`;return n=>{n=n.replace(/[\s*+\-:~^]+/g," ").trim();let i=new RegExp(`(^|${e.separator}|)(${n.replace(/[|\\{}()[\]^$+*?.-]/g,"\\$&").replace(r,"|")})`,"img");return a=>(0,oi.default)(a).replace(i,o).replace(/<\/mark>(\s+)]*>/img,"$1")}}function jt(e){return e.type===1}function dr(e){return e.type===3}function ii(e,t){let r=gn(e);return O(I(location.protocol!=="file:"),ze("search")).pipe(Ae(o=>o),v(()=>t)).subscribe(({config:o,docs:n})=>r.next({type:0,data:{config:o,docs:n,options:{suggest:B("search.suggest")}}})),r}function ai({document$:e}){let t=xe(),r=je(new URL("../versions.json",t.base)).pipe(de(()=>S)),o=r.pipe(m(n=>{let[,i]=t.base.match(/([^/]+)\/?$/);return n.find(({version:a,aliases:s})=>a===i||s.includes(i))||n[0]}));r.pipe(m(n=>new Map(n.map(i=>[`${new URL(`../${i.version}/`,t.base)}`,i]))),v(n=>h(document.body,"click").pipe(b(i=>!i.metaKey&&!i.ctrlKey),re(o),v(([i,a])=>{if(i.target instanceof Element){let s=i.target.closest("a");if(s&&!s.target&&n.has(s.href)){let p=s.href;return!i.target.closest(".md-version")&&n.get(p)===a?S:(i.preventDefault(),I(p))}}return S}),v(i=>ur(new URL(i)).pipe(m(a=>{let p=ye().href.replace(t.base,i);return a.has(p.split("#")[0])?new URL(p):new URL(i)})))))).subscribe(n=>lt(n,!0)),z([r,o]).subscribe(([n,i])=>{R(".md-header__topic").appendChild(An(n,i))}),e.pipe(v(()=>o)).subscribe(n=>{var a;let i=__md_get("__outdated",sessionStorage);if(i===null){i=!0;let s=((a=t.version)==null?void 0:a.default)||"latest";Array.isArray(s)||(s=[s]);e:for(let p of s)for(let c of n.aliases.concat(n.version))if(new RegExp(p,"i").test(c)){i=!1;break e}__md_set("__outdated",i,sessionStorage)}if(i)for(let s of ae("outdated"))s.hidden=!1})}function is(e,{worker$:t}){let{searchParams:r}=ye();r.has("q")&&(Je("search",!0),e.value=r.get("q"),e.focus(),ze("search").pipe(Ae(i=>!i)).subscribe(()=>{let i=ye();i.searchParams.delete("q"),history.replaceState({},"",`${i}`)}));let o=et(e),n=O(t.pipe(Ae(jt)),h(e,"keyup"),o).pipe(m(()=>e.value),K());return z([n,o]).pipe(m(([i,a])=>({value:i,focus:a})),G(1))}function si(e,{worker$:t}){let r=new g,o=r.pipe(Z(),ie(!0));z([t.pipe(Ae(jt)),r],(i,a)=>a).pipe(ee("value")).subscribe(({value:i})=>t.next({type:2,data:i})),r.pipe(ee("focus")).subscribe(({focus:i})=>{i&&Je("search",i)}),h(e.form,"reset").pipe(U(o)).subscribe(()=>e.focus());let n=R("header [for=__search]");return h(n,"click").subscribe(()=>e.focus()),is(e,{worker$:t}).pipe(w(i=>r.next(i)),_(()=>r.complete()),m(i=>$({ref:e},i)),G(1))}function ci(e,{worker$:t,query$:r}){let o=new g,n=rn(e.parentElement).pipe(b(Boolean)),i=e.parentElement,a=R(":scope > :first-child",e),s=R(":scope > :last-child",e);ze("search").subscribe(l=>s.setAttribute("role",l?"list":"presentation")),o.pipe(re(r),Ur(t.pipe(Ae(jt)))).subscribe(([{items:l},{value:f}])=>{switch(l.length){case 0:a.textContent=f.length?Ee("search.result.none"):Ee("search.result.placeholder");break;case 1:a.textContent=Ee("search.result.one");break;default:let u=sr(l.length);a.textContent=Ee("search.result.other",u)}});let p=o.pipe(w(()=>s.innerHTML=""),v(({items:l})=>O(I(...l.slice(0,10)),I(...l.slice(10)).pipe(Be(4),Vr(n),v(([f])=>f)))),m(Mn),pe());return p.subscribe(l=>s.appendChild(l)),p.pipe(ne(l=>{let f=fe("details",l);return typeof f=="undefined"?S:h(f,"toggle").pipe(U(o),m(()=>f))})).subscribe(l=>{l.open===!1&&l.offsetTop<=i.scrollTop&&i.scrollTo({top:l.offsetTop})}),t.pipe(b(dr),m(({data:l})=>l)).pipe(w(l=>o.next(l)),_(()=>o.complete()),m(l=>$({ref:e},l)))}function as(e,{query$:t}){return t.pipe(m(({value:r})=>{let o=ye();return o.hash="",r=r.replace(/\s+/g,"+").replace(/&/g,"%26").replace(/=/g,"%3D"),o.search=`q=${r}`,{url:o}}))}function pi(e,t){let r=new g,o=r.pipe(Z(),ie(!0));return r.subscribe(({url:n})=>{e.setAttribute("data-clipboard-text",e.href),e.href=`${n}`}),h(e,"click").pipe(U(o)).subscribe(n=>n.preventDefault()),as(e,t).pipe(w(n=>r.next(n)),_(()=>r.complete()),m(n=>$({ref:e},n)))}function li(e,{worker$:t,keyboard$:r}){let o=new g,n=Se("search-query"),i=O(h(n,"keydown"),h(n,"focus")).pipe(ve(se),m(()=>n.value),K());return o.pipe(He(i),m(([{suggest:s},p])=>{let c=p.split(/([\s-]+)/);if(s!=null&&s.length&&c[c.length-1]){let l=s[s.length-1];l.startsWith(c[c.length-1])&&(c[c.length-1]=l)}else c.length=0;return c})).subscribe(s=>e.innerHTML=s.join("").replace(/\s/g," ")),r.pipe(b(({mode:s})=>s==="search")).subscribe(s=>{switch(s.type){case"ArrowRight":e.innerText.length&&n.selectionStart===n.value.length&&(n.value=e.innerText);break}}),t.pipe(b(dr),m(({data:s})=>s)).pipe(w(s=>o.next(s)),_(()=>o.complete()),m(()=>({ref:e})))}function mi(e,{index$:t,keyboard$:r}){let o=xe();try{let n=ii(o.search,t),i=Se("search-query",e),a=Se("search-result",e);h(e,"click").pipe(b(({target:p})=>p instanceof Element&&!!p.closest("a"))).subscribe(()=>Je("search",!1)),r.pipe(b(({mode:p})=>p==="search")).subscribe(p=>{let c=Ie();switch(p.type){case"Enter":if(c===i){let l=new Map;for(let f of P(":first-child [href]",a)){let u=f.firstElementChild;l.set(f,parseFloat(u.getAttribute("data-md-score")))}if(l.size){let[[f]]=[...l].sort(([,u],[,d])=>d-u);f.click()}p.claim()}break;case"Escape":case"Tab":Je("search",!1),i.blur();break;case"ArrowUp":case"ArrowDown":if(typeof c=="undefined")i.focus();else{let l=[i,...P(":not(details) > [href], summary, details[open] [href]",a)],f=Math.max(0,(Math.max(0,l.indexOf(c))+l.length+(p.type==="ArrowUp"?-1:1))%l.length);l[f].focus()}p.claim();break;default:i!==Ie()&&i.focus()}}),r.pipe(b(({mode:p})=>p==="global")).subscribe(p=>{switch(p.type){case"f":case"s":case"/":i.focus(),i.select(),p.claim();break}});let s=si(i,{worker$:n});return O(s,ci(a,{worker$:n,query$:s})).pipe(Re(...ae("search-share",e).map(p=>pi(p,{query$:s})),...ae("search-suggest",e).map(p=>li(p,{worker$:n,keyboard$:r}))))}catch(n){return e.hidden=!0,Ye}}function fi(e,{index$:t,location$:r}){return z([t,r.pipe(Q(ye()),b(o=>!!o.searchParams.get("h")))]).pipe(m(([o,n])=>ni(o.config)(n.searchParams.get("h"))),m(o=>{var a;let n=new Map,i=document.createNodeIterator(e,NodeFilter.SHOW_TEXT);for(let s=i.nextNode();s;s=i.nextNode())if((a=s.parentElement)!=null&&a.offsetHeight){let p=s.textContent,c=o(p);c.length>p.length&&n.set(s,c)}for(let[s,p]of n){let{childNodes:c}=x("span",null,p);s.replaceWith(...Array.from(c))}return{ref:e,nodes:n}}))}function ss(e,{viewport$:t,main$:r}){let o=e.closest(".md-grid"),n=o.offsetTop-o.parentElement.offsetTop;return z([r,t]).pipe(m(([{offset:i,height:a},{offset:{y:s}}])=>(a=a+Math.min(n,Math.max(0,s-i))-n,{height:a,locked:s>=i+n})),K((i,a)=>i.height===a.height&&i.locked===a.locked))}function Xr(e,o){var n=o,{header$:t}=n,r=ao(n,["header$"]);let i=R(".md-sidebar__scrollwrap",e),{y:a}=Ve(i);return C(()=>{let s=new g,p=s.pipe(Z(),ie(!0)),c=s.pipe(Le(0,me));return c.pipe(re(t)).subscribe({next([{height:l},{height:f}]){i.style.height=`${l-2*a}px`,e.style.top=`${f}px`},complete(){i.style.height="",e.style.top=""}}),c.pipe(Ae()).subscribe(()=>{for(let l of P(".md-nav__link--active[href]",e)){if(!l.clientHeight)continue;let f=l.closest(".md-sidebar__scrollwrap");if(typeof f!="undefined"){let u=l.offsetTop-f.offsetTop,{height:d}=ce(f);f.scrollTo({top:u-d/2})}}}),ue(P("label[tabindex]",e)).pipe(ne(l=>h(l,"click").pipe(ve(se),m(()=>l),U(p)))).subscribe(l=>{let f=R(`[id="${l.htmlFor}"]`);R(`[aria-labelledby="${l.id}"]`).setAttribute("aria-expanded",`${f.checked}`)}),ss(e,r).pipe(w(l=>s.next(l)),_(()=>s.complete()),m(l=>$({ref:e},l)))})}function ui(e,t){if(typeof t!="undefined"){let r=`https://api.github.com/repos/${e}/${t}`;return st(je(`${r}/releases/latest`).pipe(de(()=>S),m(o=>({version:o.tag_name})),De({})),je(r).pipe(de(()=>S),m(o=>({stars:o.stargazers_count,forks:o.forks_count})),De({}))).pipe(m(([o,n])=>$($({},o),n)))}else{let r=`https://api.github.com/users/${e}`;return je(r).pipe(m(o=>({repositories:o.public_repos})),De({}))}}function di(e,t){let r=`https://${e}/api/v4/projects/${encodeURIComponent(t)}`;return st(je(`${r}/releases/permalink/latest`).pipe(de(()=>S),m(({tag_name:o})=>({version:o})),De({})),je(r).pipe(de(()=>S),m(({star_count:o,forks_count:n})=>({stars:o,forks:n})),De({}))).pipe(m(([o,n])=>$($({},o),n)))}function hi(e){let t=e.match(/^.+github\.com\/([^/]+)\/?([^/]+)?/i);if(t){let[,r,o]=t;return ui(r,o)}if(t=e.match(/^.+?([^/]*gitlab[^/]+)\/(.+?)\/?$/i),t){let[,r,o]=t;return di(r,o)}return S}var cs;function ps(e){return cs||(cs=C(()=>{let t=__md_get("__source",sessionStorage);if(t)return I(t);if(ae("consent").length){let o=__md_get("__consent");if(!(o&&o.github))return S}return hi(e.href).pipe(w(o=>__md_set("__source",o,sessionStorage)))}).pipe(de(()=>S),b(t=>Object.keys(t).length>0),m(t=>({facts:t})),G(1)))}function bi(e){let t=R(":scope > :last-child",e);return C(()=>{let r=new g;return r.subscribe(({facts:o})=>{t.appendChild(Ln(o)),t.classList.add("md-source__repository--active")}),ps(e).pipe(w(o=>r.next(o)),_(()=>r.complete()),m(o=>$({ref:e},o)))})}function ls(e,{viewport$:t,header$:r}){return ge(document.body).pipe(v(()=>mr(e,{header$:r,viewport$:t})),m(({offset:{y:o}})=>({hidden:o>=10})),ee("hidden"))}function vi(e,t){return C(()=>{let r=new g;return r.subscribe({next({hidden:o}){e.hidden=o},complete(){e.hidden=!1}}),(B("navigation.tabs.sticky")?I({hidden:!1}):ls(e,t)).pipe(w(o=>r.next(o)),_(()=>r.complete()),m(o=>$({ref:e},o)))})}function ms(e,{viewport$:t,header$:r}){let o=new Map,n=P(".md-nav__link",e);for(let s of n){let p=decodeURIComponent(s.hash.substring(1)),c=fe(`[id="${p}"]`);typeof c!="undefined"&&o.set(s,c)}let i=r.pipe(ee("height"),m(({height:s})=>{let p=Se("main"),c=R(":scope > :first-child",p);return s+.8*(c.offsetTop-p.offsetTop)}),pe());return ge(document.body).pipe(ee("height"),v(s=>C(()=>{let p=[];return I([...o].reduce((c,[l,f])=>{for(;p.length&&o.get(p[p.length-1]).tagName>=f.tagName;)p.pop();let u=f.offsetTop;for(;!u&&f.parentElement;)f=f.parentElement,u=f.offsetTop;let d=f.offsetParent;for(;d;d=d.offsetParent)u+=d.offsetTop;return c.set([...p=[...p,l]].reverse(),u)},new Map))}).pipe(m(p=>new Map([...p].sort(([,c],[,l])=>c-l))),He(i),v(([p,c])=>t.pipe(Fr(([l,f],{offset:{y:u},size:d})=>{let y=u+d.height>=Math.floor(s.height);for(;f.length;){let[,M]=f[0];if(M-c=u&&!y)f=[l.pop(),...f];else break}return[l,f]},[[],[...p]]),K((l,f)=>l[0]===f[0]&&l[1]===f[1])))))).pipe(m(([s,p])=>({prev:s.map(([c])=>c),next:p.map(([c])=>c)})),Q({prev:[],next:[]}),Be(2,1),m(([s,p])=>s.prev.length{let i=new g,a=i.pipe(Z(),ie(!0));if(i.subscribe(({prev:s,next:p})=>{for(let[c]of p)c.classList.remove("md-nav__link--passed"),c.classList.remove("md-nav__link--active");for(let[c,[l]]of s.entries())l.classList.add("md-nav__link--passed"),l.classList.toggle("md-nav__link--active",c===s.length-1)}),B("toc.follow")){let s=O(t.pipe(_e(1),m(()=>{})),t.pipe(_e(250),m(()=>"smooth")));i.pipe(b(({prev:p})=>p.length>0),He(o.pipe(ve(se))),re(s)).subscribe(([[{prev:p}],c])=>{let[l]=p[p.length-1];if(l.offsetHeight){let f=cr(l);if(typeof f!="undefined"){let u=l.offsetTop-f.offsetTop,{height:d}=ce(f);f.scrollTo({top:u-d/2,behavior:c})}}})}return B("navigation.tracking")&&t.pipe(U(a),ee("offset"),_e(250),Ce(1),U(n.pipe(Ce(1))),ct({delay:250}),re(i)).subscribe(([,{prev:s}])=>{let p=ye(),c=s[s.length-1];if(c&&c.length){let[l]=c,{hash:f}=new URL(l.href);p.hash!==f&&(p.hash=f,history.replaceState({},"",`${p}`))}else p.hash="",history.replaceState({},"",`${p}`)}),ms(e,{viewport$:t,header$:r}).pipe(w(s=>i.next(s)),_(()=>i.complete()),m(s=>$({ref:e},s)))})}function fs(e,{viewport$:t,main$:r,target$:o}){let n=t.pipe(m(({offset:{y:a}})=>a),Be(2,1),m(([a,s])=>a>s&&s>0),K()),i=r.pipe(m(({active:a})=>a));return z([i,n]).pipe(m(([a,s])=>!(a&&s)),K(),U(o.pipe(Ce(1))),ie(!0),ct({delay:250}),m(a=>({hidden:a})))}function yi(e,{viewport$:t,header$:r,main$:o,target$:n}){let i=new g,a=i.pipe(Z(),ie(!0));return i.subscribe({next({hidden:s}){e.hidden=s,s?(e.setAttribute("tabindex","-1"),e.blur()):e.removeAttribute("tabindex")},complete(){e.style.top="",e.hidden=!0,e.removeAttribute("tabindex")}}),r.pipe(U(a),ee("height")).subscribe(({height:s})=>{e.style.top=`${s+16}px`}),h(e,"click").subscribe(s=>{s.preventDefault(),window.scrollTo({top:0})}),fs(e,{viewport$:t,main$:o,target$:n}).pipe(w(s=>i.next(s)),_(()=>i.complete()),m(s=>$({ref:e},s)))}function xi({document$:e,viewport$:t}){e.pipe(v(()=>P(".md-ellipsis")),ne(r=>tt(r).pipe(U(e.pipe(Ce(1))),b(o=>o),m(()=>r),Te(1))),b(r=>r.offsetWidth{let o=r.innerText,n=r.closest("a")||r;return n.title=o,B("content.tooltips")?mt(n,{viewport$:t}).pipe(U(e.pipe(Ce(1))),_(()=>n.removeAttribute("title"))):S})).subscribe(),B("content.tooltips")&&e.pipe(v(()=>P(".md-status")),ne(r=>mt(r,{viewport$:t}))).subscribe()}function Ei({document$:e,tablet$:t}){e.pipe(v(()=>P(".md-toggle--indeterminate")),w(r=>{r.indeterminate=!0,r.checked=!1}),ne(r=>h(r,"change").pipe(Dr(()=>r.classList.contains("md-toggle--indeterminate")),m(()=>r))),re(t)).subscribe(([r,o])=>{r.classList.remove("md-toggle--indeterminate"),o&&(r.checked=!1)})}function us(){return/(iPad|iPhone|iPod)/.test(navigator.userAgent)}function wi({document$:e}){e.pipe(v(()=>P("[data-md-scrollfix]")),w(t=>t.removeAttribute("data-md-scrollfix")),b(us),ne(t=>h(t,"touchstart").pipe(m(()=>t)))).subscribe(t=>{let r=t.scrollTop;r===0?t.scrollTop=1:r+t.offsetHeight===t.scrollHeight&&(t.scrollTop=r-1)})}function Ti({viewport$:e,tablet$:t}){z([ze("search"),t]).pipe(m(([r,o])=>r&&!o),v(r=>I(r).pipe(Ge(r?400:100))),re(e)).subscribe(([r,{offset:{y:o}}])=>{if(r)document.body.setAttribute("data-md-scrolllock",""),document.body.style.top=`-${o}px`;else{let n=-1*parseInt(document.body.style.top,10);document.body.removeAttribute("data-md-scrolllock"),document.body.style.top="",n&&window.scrollTo(0,n)}})}Object.entries||(Object.entries=function(e){let t=[];for(let r of Object.keys(e))t.push([r,e[r]]);return t});Object.values||(Object.values=function(e){let t=[];for(let r of Object.keys(e))t.push(e[r]);return t});typeof Element!="undefined"&&(Element.prototype.scrollTo||(Element.prototype.scrollTo=function(e,t){typeof e=="object"?(this.scrollLeft=e.left,this.scrollTop=e.top):(this.scrollLeft=e,this.scrollTop=t)}),Element.prototype.replaceWith||(Element.prototype.replaceWith=function(...e){let t=this.parentNode;if(t){e.length===0&&t.removeChild(this);for(let r=e.length-1;r>=0;r--){let o=e[r];typeof o=="string"?o=document.createTextNode(o):o.parentNode&&o.parentNode.removeChild(o),r?t.insertBefore(this.previousSibling,o):t.replaceChild(o,this)}}}));function ds(){return location.protocol==="file:"?Tt(`${new URL("search/search_index.js",Zr.base)}`).pipe(m(()=>__index),G(1)):je(new URL("search/search_index.json",Zr.base))}document.documentElement.classList.remove("no-js");document.documentElement.classList.add("js");var ot=Bo(),Wt=an(),Mt=pn(Wt),eo=nn(),Oe=vn(),hr=Pt("(min-width: 960px)"),Oi=Pt("(min-width: 1220px)"),Mi=ln(),Zr=xe(),Li=document.forms.namedItem("search")?ds():Ye,to=new g;Xn({alert$:to});var ro=new g;B("navigation.instant")&&ri({location$:Wt,viewport$:Oe,progress$:ro}).subscribe(ot);var Si;((Si=Zr.version)==null?void 0:Si.provider)==="mike"&&ai({document$:ot});O(Wt,Mt).pipe(Ge(125)).subscribe(()=>{Je("drawer",!1),Je("search",!1)});eo.pipe(b(({mode:e})=>e==="global")).subscribe(e=>{switch(e.type){case"p":case",":let t=fe("link[rel=prev]");typeof t!="undefined"&<(t);break;case"n":case".":let r=fe("link[rel=next]");typeof r!="undefined"&<(r);break;case"Enter":let o=Ie();o instanceof HTMLLabelElement&&o.click()}});xi({viewport$:Oe,document$:ot});Ei({document$:ot,tablet$:hr});wi({document$:ot});Ti({viewport$:Oe,tablet$:hr});var rt=Qn(Se("header"),{viewport$:Oe}),Ft=ot.pipe(m(()=>Se("main")),v(e=>Bn(e,{viewport$:Oe,header$:rt})),G(1)),hs=O(...ae("consent").map(e=>xn(e,{target$:Mt})),...ae("dialog").map(e=>zn(e,{alert$:to})),...ae("header").map(e=>Kn(e,{viewport$:Oe,header$:rt,main$:Ft})),...ae("palette").map(e=>Gn(e)),...ae("progress").map(e=>Jn(e,{progress$:ro})),...ae("search").map(e=>mi(e,{index$:Li,keyboard$:eo})),...ae("source").map(e=>bi(e))),bs=C(()=>O(...ae("announce").map(e=>yn(e)),...ae("content").map(e=>Nn(e,{viewport$:Oe,target$:Mt,print$:Mi})),...ae("content").map(e=>B("search.highlight")?fi(e,{index$:Li,location$:Wt}):S),...ae("header-title").map(e=>Yn(e,{viewport$:Oe,header$:rt})),...ae("sidebar").map(e=>e.getAttribute("data-md-type")==="navigation"?Nr(Oi,()=>Xr(e,{viewport$:Oe,header$:rt,main$:Ft})):Nr(hr,()=>Xr(e,{viewport$:Oe,header$:rt,main$:Ft}))),...ae("tabs").map(e=>vi(e,{viewport$:Oe,header$:rt})),...ae("toc").map(e=>gi(e,{viewport$:Oe,header$:rt,main$:Ft,target$:Mt})),...ae("top").map(e=>yi(e,{viewport$:Oe,header$:rt,main$:Ft,target$:Mt})))),_i=ot.pipe(v(()=>bs),Re(hs),G(1));_i.subscribe();window.document$=ot;window.location$=Wt;window.target$=Mt;window.keyboard$=eo;window.viewport$=Oe;window.tablet$=hr;window.screen$=Oi;window.print$=Mi;window.alert$=to;window.progress$=ro;window.component$=_i;})(); +//# sourceMappingURL=bundle.d6f25eb3.min.js.map + diff --git a/site/assets/javascripts/bundle.d6f25eb3.min.js.map b/site/assets/javascripts/bundle.d6f25eb3.min.js.map new file mode 100644 index 0000000..e3806a5 --- /dev/null +++ b/site/assets/javascripts/bundle.d6f25eb3.min.js.map @@ -0,0 +1,7 @@ +{ + "version": 3, + "sources": ["node_modules/focus-visible/dist/focus-visible.js", "node_modules/escape-html/index.js", "node_modules/clipboard/dist/clipboard.js", "src/templates/assets/javascripts/bundle.ts", "node_modules/tslib/tslib.es6.mjs", "node_modules/rxjs/src/internal/util/isFunction.ts", "node_modules/rxjs/src/internal/util/createErrorClass.ts", "node_modules/rxjs/src/internal/util/UnsubscriptionError.ts", "node_modules/rxjs/src/internal/util/arrRemove.ts", "node_modules/rxjs/src/internal/Subscription.ts", "node_modules/rxjs/src/internal/config.ts", "node_modules/rxjs/src/internal/scheduler/timeoutProvider.ts", "node_modules/rxjs/src/internal/util/reportUnhandledError.ts", "node_modules/rxjs/src/internal/util/noop.ts", "node_modules/rxjs/src/internal/NotificationFactories.ts", "node_modules/rxjs/src/internal/util/errorContext.ts", "node_modules/rxjs/src/internal/Subscriber.ts", "node_modules/rxjs/src/internal/symbol/observable.ts", "node_modules/rxjs/src/internal/util/identity.ts", "node_modules/rxjs/src/internal/util/pipe.ts", "node_modules/rxjs/src/internal/Observable.ts", "node_modules/rxjs/src/internal/util/lift.ts", "node_modules/rxjs/src/internal/operators/OperatorSubscriber.ts", "node_modules/rxjs/src/internal/scheduler/animationFrameProvider.ts", "node_modules/rxjs/src/internal/util/ObjectUnsubscribedError.ts", "node_modules/rxjs/src/internal/Subject.ts", "node_modules/rxjs/src/internal/BehaviorSubject.ts", "node_modules/rxjs/src/internal/scheduler/dateTimestampProvider.ts", "node_modules/rxjs/src/internal/ReplaySubject.ts", "node_modules/rxjs/src/internal/scheduler/Action.ts", "node_modules/rxjs/src/internal/scheduler/intervalProvider.ts", "node_modules/rxjs/src/internal/scheduler/AsyncAction.ts", "node_modules/rxjs/src/internal/Scheduler.ts", "node_modules/rxjs/src/internal/scheduler/AsyncScheduler.ts", "node_modules/rxjs/src/internal/scheduler/async.ts", "node_modules/rxjs/src/internal/scheduler/QueueAction.ts", "node_modules/rxjs/src/internal/scheduler/QueueScheduler.ts", "node_modules/rxjs/src/internal/scheduler/queue.ts", "node_modules/rxjs/src/internal/scheduler/AnimationFrameAction.ts", "node_modules/rxjs/src/internal/scheduler/AnimationFrameScheduler.ts", "node_modules/rxjs/src/internal/scheduler/animationFrame.ts", "node_modules/rxjs/src/internal/observable/empty.ts", "node_modules/rxjs/src/internal/util/isScheduler.ts", "node_modules/rxjs/src/internal/util/args.ts", "node_modules/rxjs/src/internal/util/isArrayLike.ts", "node_modules/rxjs/src/internal/util/isPromise.ts", "node_modules/rxjs/src/internal/util/isInteropObservable.ts", "node_modules/rxjs/src/internal/util/isAsyncIterable.ts", "node_modules/rxjs/src/internal/util/throwUnobservableError.ts", "node_modules/rxjs/src/internal/symbol/iterator.ts", "node_modules/rxjs/src/internal/util/isIterable.ts", "node_modules/rxjs/src/internal/util/isReadableStreamLike.ts", "node_modules/rxjs/src/internal/observable/innerFrom.ts", "node_modules/rxjs/src/internal/util/executeSchedule.ts", "node_modules/rxjs/src/internal/operators/observeOn.ts", "node_modules/rxjs/src/internal/operators/subscribeOn.ts", "node_modules/rxjs/src/internal/scheduled/scheduleObservable.ts", "node_modules/rxjs/src/internal/scheduled/schedulePromise.ts", "node_modules/rxjs/src/internal/scheduled/scheduleArray.ts", "node_modules/rxjs/src/internal/scheduled/scheduleIterable.ts", "node_modules/rxjs/src/internal/scheduled/scheduleAsyncIterable.ts", "node_modules/rxjs/src/internal/scheduled/scheduleReadableStreamLike.ts", "node_modules/rxjs/src/internal/scheduled/scheduled.ts", "node_modules/rxjs/src/internal/observable/from.ts", "node_modules/rxjs/src/internal/observable/of.ts", "node_modules/rxjs/src/internal/observable/throwError.ts", "node_modules/rxjs/src/internal/util/EmptyError.ts", "node_modules/rxjs/src/internal/util/isDate.ts", "node_modules/rxjs/src/internal/operators/map.ts", "node_modules/rxjs/src/internal/util/mapOneOrManyArgs.ts", "node_modules/rxjs/src/internal/util/argsArgArrayOrObject.ts", "node_modules/rxjs/src/internal/util/createObject.ts", "node_modules/rxjs/src/internal/observable/combineLatest.ts", "node_modules/rxjs/src/internal/operators/mergeInternals.ts", "node_modules/rxjs/src/internal/operators/mergeMap.ts", "node_modules/rxjs/src/internal/operators/mergeAll.ts", "node_modules/rxjs/src/internal/operators/concatAll.ts", "node_modules/rxjs/src/internal/observable/concat.ts", "node_modules/rxjs/src/internal/observable/defer.ts", "node_modules/rxjs/src/internal/observable/fromEvent.ts", "node_modules/rxjs/src/internal/observable/fromEventPattern.ts", "node_modules/rxjs/src/internal/observable/timer.ts", "node_modules/rxjs/src/internal/observable/merge.ts", "node_modules/rxjs/src/internal/observable/never.ts", "node_modules/rxjs/src/internal/util/argsOrArgArray.ts", "node_modules/rxjs/src/internal/operators/filter.ts", "node_modules/rxjs/src/internal/observable/zip.ts", "node_modules/rxjs/src/internal/operators/audit.ts", "node_modules/rxjs/src/internal/operators/auditTime.ts", "node_modules/rxjs/src/internal/operators/bufferCount.ts", "node_modules/rxjs/src/internal/operators/catchError.ts", "node_modules/rxjs/src/internal/operators/scanInternals.ts", "node_modules/rxjs/src/internal/operators/combineLatest.ts", "node_modules/rxjs/src/internal/operators/combineLatestWith.ts", "node_modules/rxjs/src/internal/operators/debounce.ts", "node_modules/rxjs/src/internal/operators/debounceTime.ts", "node_modules/rxjs/src/internal/operators/defaultIfEmpty.ts", "node_modules/rxjs/src/internal/operators/take.ts", "node_modules/rxjs/src/internal/operators/ignoreElements.ts", "node_modules/rxjs/src/internal/operators/mapTo.ts", "node_modules/rxjs/src/internal/operators/delayWhen.ts", "node_modules/rxjs/src/internal/operators/delay.ts", "node_modules/rxjs/src/internal/operators/distinctUntilChanged.ts", "node_modules/rxjs/src/internal/operators/distinctUntilKeyChanged.ts", "node_modules/rxjs/src/internal/operators/throwIfEmpty.ts", "node_modules/rxjs/src/internal/operators/endWith.ts", "node_modules/rxjs/src/internal/operators/finalize.ts", "node_modules/rxjs/src/internal/operators/first.ts", "node_modules/rxjs/src/internal/operators/takeLast.ts", "node_modules/rxjs/src/internal/operators/merge.ts", "node_modules/rxjs/src/internal/operators/mergeWith.ts", "node_modules/rxjs/src/internal/operators/repeat.ts", "node_modules/rxjs/src/internal/operators/scan.ts", "node_modules/rxjs/src/internal/operators/share.ts", "node_modules/rxjs/src/internal/operators/shareReplay.ts", "node_modules/rxjs/src/internal/operators/skip.ts", "node_modules/rxjs/src/internal/operators/skipUntil.ts", "node_modules/rxjs/src/internal/operators/startWith.ts", "node_modules/rxjs/src/internal/operators/switchMap.ts", "node_modules/rxjs/src/internal/operators/takeUntil.ts", "node_modules/rxjs/src/internal/operators/takeWhile.ts", "node_modules/rxjs/src/internal/operators/tap.ts", "node_modules/rxjs/src/internal/operators/throttle.ts", "node_modules/rxjs/src/internal/operators/throttleTime.ts", "node_modules/rxjs/src/internal/operators/withLatestFrom.ts", "node_modules/rxjs/src/internal/operators/zip.ts", "node_modules/rxjs/src/internal/operators/zipWith.ts", "src/templates/assets/javascripts/browser/document/index.ts", "src/templates/assets/javascripts/browser/element/_/index.ts", "src/templates/assets/javascripts/browser/element/focus/index.ts", "src/templates/assets/javascripts/browser/element/hover/index.ts", "src/templates/assets/javascripts/utilities/h/index.ts", "src/templates/assets/javascripts/utilities/round/index.ts", "src/templates/assets/javascripts/browser/script/index.ts", "src/templates/assets/javascripts/browser/element/size/_/index.ts", "src/templates/assets/javascripts/browser/element/size/content/index.ts", "src/templates/assets/javascripts/browser/element/offset/_/index.ts", "src/templates/assets/javascripts/browser/element/offset/content/index.ts", "src/templates/assets/javascripts/browser/element/visibility/index.ts", "src/templates/assets/javascripts/browser/toggle/index.ts", "src/templates/assets/javascripts/browser/keyboard/index.ts", "src/templates/assets/javascripts/browser/location/_/index.ts", "src/templates/assets/javascripts/browser/location/hash/index.ts", "src/templates/assets/javascripts/browser/media/index.ts", "src/templates/assets/javascripts/browser/request/index.ts", "src/templates/assets/javascripts/browser/viewport/offset/index.ts", "src/templates/assets/javascripts/browser/viewport/size/index.ts", "src/templates/assets/javascripts/browser/viewport/_/index.ts", "src/templates/assets/javascripts/browser/viewport/at/index.ts", "src/templates/assets/javascripts/browser/worker/index.ts", "src/templates/assets/javascripts/_/index.ts", "src/templates/assets/javascripts/components/_/index.ts", "src/templates/assets/javascripts/components/announce/index.ts", "src/templates/assets/javascripts/components/consent/index.ts", "src/templates/assets/javascripts/templates/tooltip/index.tsx", "src/templates/assets/javascripts/templates/annotation/index.tsx", "src/templates/assets/javascripts/templates/clipboard/index.tsx", "src/templates/assets/javascripts/templates/search/index.tsx", "src/templates/assets/javascripts/templates/source/index.tsx", "src/templates/assets/javascripts/templates/tabbed/index.tsx", "src/templates/assets/javascripts/templates/table/index.tsx", "src/templates/assets/javascripts/templates/version/index.tsx", "src/templates/assets/javascripts/components/tooltip2/index.ts", "src/templates/assets/javascripts/components/content/annotation/_/index.ts", "src/templates/assets/javascripts/components/content/annotation/list/index.ts", "src/templates/assets/javascripts/components/content/annotation/block/index.ts", "src/templates/assets/javascripts/components/content/code/_/index.ts", "src/templates/assets/javascripts/components/content/details/index.ts", "src/templates/assets/javascripts/components/content/mermaid/index.css", "src/templates/assets/javascripts/components/content/mermaid/index.ts", "src/templates/assets/javascripts/components/content/table/index.ts", "src/templates/assets/javascripts/components/content/tabs/index.ts", "src/templates/assets/javascripts/components/content/_/index.ts", "src/templates/assets/javascripts/components/dialog/index.ts", "src/templates/assets/javascripts/components/tooltip/index.ts", "src/templates/assets/javascripts/components/header/_/index.ts", "src/templates/assets/javascripts/components/header/title/index.ts", "src/templates/assets/javascripts/components/main/index.ts", "src/templates/assets/javascripts/components/palette/index.ts", "src/templates/assets/javascripts/components/progress/index.ts", "src/templates/assets/javascripts/integrations/clipboard/index.ts", "src/templates/assets/javascripts/integrations/sitemap/index.ts", "src/templates/assets/javascripts/integrations/instant/index.ts", "src/templates/assets/javascripts/integrations/search/highlighter/index.ts", "src/templates/assets/javascripts/integrations/search/worker/message/index.ts", "src/templates/assets/javascripts/integrations/search/worker/_/index.ts", "src/templates/assets/javascripts/integrations/version/index.ts", "src/templates/assets/javascripts/components/search/query/index.ts", "src/templates/assets/javascripts/components/search/result/index.ts", "src/templates/assets/javascripts/components/search/share/index.ts", "src/templates/assets/javascripts/components/search/suggest/index.ts", "src/templates/assets/javascripts/components/search/_/index.ts", "src/templates/assets/javascripts/components/search/highlight/index.ts", "src/templates/assets/javascripts/components/sidebar/index.ts", "src/templates/assets/javascripts/components/source/facts/github/index.ts", "src/templates/assets/javascripts/components/source/facts/gitlab/index.ts", "src/templates/assets/javascripts/components/source/facts/_/index.ts", "src/templates/assets/javascripts/components/source/_/index.ts", "src/templates/assets/javascripts/components/tabs/index.ts", "src/templates/assets/javascripts/components/toc/index.ts", "src/templates/assets/javascripts/components/top/index.ts", "src/templates/assets/javascripts/patches/ellipsis/index.ts", "src/templates/assets/javascripts/patches/indeterminate/index.ts", "src/templates/assets/javascripts/patches/scrollfix/index.ts", "src/templates/assets/javascripts/patches/scrolllock/index.ts", "src/templates/assets/javascripts/polyfills/index.ts"], + "sourcesContent": ["(function (global, factory) {\n typeof exports === 'object' && typeof module !== 'undefined' ? factory() :\n typeof define === 'function' && define.amd ? define(factory) :\n (factory());\n}(this, (function () { 'use strict';\n\n /**\n * Applies the :focus-visible polyfill at the given scope.\n * A scope in this case is either the top-level Document or a Shadow Root.\n *\n * @param {(Document|ShadowRoot)} scope\n * @see https://github.com/WICG/focus-visible\n */\n function applyFocusVisiblePolyfill(scope) {\n var hadKeyboardEvent = true;\n var hadFocusVisibleRecently = false;\n var hadFocusVisibleRecentlyTimeout = null;\n\n var inputTypesAllowlist = {\n text: true,\n search: true,\n url: true,\n tel: true,\n email: true,\n password: true,\n number: true,\n date: true,\n month: true,\n week: true,\n time: true,\n datetime: true,\n 'datetime-local': true\n };\n\n /**\n * Helper function for legacy browsers and iframes which sometimes focus\n * elements like document, body, and non-interactive SVG.\n * @param {Element} el\n */\n function isValidFocusTarget(el) {\n if (\n el &&\n el !== document &&\n el.nodeName !== 'HTML' &&\n el.nodeName !== 'BODY' &&\n 'classList' in el &&\n 'contains' in el.classList\n ) {\n return true;\n }\n return false;\n }\n\n /**\n * Computes whether the given element should automatically trigger the\n * `focus-visible` class being added, i.e. whether it should always match\n * `:focus-visible` when focused.\n * @param {Element} el\n * @return {boolean}\n */\n function focusTriggersKeyboardModality(el) {\n var type = el.type;\n var tagName = el.tagName;\n\n if (tagName === 'INPUT' && inputTypesAllowlist[type] && !el.readOnly) {\n return true;\n }\n\n if (tagName === 'TEXTAREA' && !el.readOnly) {\n return true;\n }\n\n if (el.isContentEditable) {\n return true;\n }\n\n return false;\n }\n\n /**\n * Add the `focus-visible` class to the given element if it was not added by\n * the author.\n * @param {Element} el\n */\n function addFocusVisibleClass(el) {\n if (el.classList.contains('focus-visible')) {\n return;\n }\n el.classList.add('focus-visible');\n el.setAttribute('data-focus-visible-added', '');\n }\n\n /**\n * Remove the `focus-visible` class from the given element if it was not\n * originally added by the author.\n * @param {Element} el\n */\n function removeFocusVisibleClass(el) {\n if (!el.hasAttribute('data-focus-visible-added')) {\n return;\n }\n el.classList.remove('focus-visible');\n el.removeAttribute('data-focus-visible-added');\n }\n\n /**\n * If the most recent user interaction was via the keyboard;\n * and the key press did not include a meta, alt/option, or control key;\n * then the modality is keyboard. Otherwise, the modality is not keyboard.\n * Apply `focus-visible` to any current active element and keep track\n * of our keyboard modality state with `hadKeyboardEvent`.\n * @param {KeyboardEvent} e\n */\n function onKeyDown(e) {\n if (e.metaKey || e.altKey || e.ctrlKey) {\n return;\n }\n\n if (isValidFocusTarget(scope.activeElement)) {\n addFocusVisibleClass(scope.activeElement);\n }\n\n hadKeyboardEvent = true;\n }\n\n /**\n * If at any point a user clicks with a pointing device, ensure that we change\n * the modality away from keyboard.\n * This avoids the situation where a user presses a key on an already focused\n * element, and then clicks on a different element, focusing it with a\n * pointing device, while we still think we're in keyboard modality.\n * @param {Event} e\n */\n function onPointerDown(e) {\n hadKeyboardEvent = false;\n }\n\n /**\n * On `focus`, add the `focus-visible` class to the target if:\n * - the target received focus as a result of keyboard navigation, or\n * - the event target is an element that will likely require interaction\n * via the keyboard (e.g. a text box)\n * @param {Event} e\n */\n function onFocus(e) {\n // Prevent IE from focusing the document or HTML element.\n if (!isValidFocusTarget(e.target)) {\n return;\n }\n\n if (hadKeyboardEvent || focusTriggersKeyboardModality(e.target)) {\n addFocusVisibleClass(e.target);\n }\n }\n\n /**\n * On `blur`, remove the `focus-visible` class from the target.\n * @param {Event} e\n */\n function onBlur(e) {\n if (!isValidFocusTarget(e.target)) {\n return;\n }\n\n if (\n e.target.classList.contains('focus-visible') ||\n e.target.hasAttribute('data-focus-visible-added')\n ) {\n // To detect a tab/window switch, we look for a blur event followed\n // rapidly by a visibility change.\n // If we don't see a visibility change within 100ms, it's probably a\n // regular focus change.\n hadFocusVisibleRecently = true;\n window.clearTimeout(hadFocusVisibleRecentlyTimeout);\n hadFocusVisibleRecentlyTimeout = window.setTimeout(function() {\n hadFocusVisibleRecently = false;\n }, 100);\n removeFocusVisibleClass(e.target);\n }\n }\n\n /**\n * If the user changes tabs, keep track of whether or not the previously\n * focused element had .focus-visible.\n * @param {Event} e\n */\n function onVisibilityChange(e) {\n if (document.visibilityState === 'hidden') {\n // If the tab becomes active again, the browser will handle calling focus\n // on the element (Safari actually calls it twice).\n // If this tab change caused a blur on an element with focus-visible,\n // re-apply the class when the user switches back to the tab.\n if (hadFocusVisibleRecently) {\n hadKeyboardEvent = true;\n }\n addInitialPointerMoveListeners();\n }\n }\n\n /**\n * Add a group of listeners to detect usage of any pointing devices.\n * These listeners will be added when the polyfill first loads, and anytime\n * the window is blurred, so that they are active when the window regains\n * focus.\n */\n function addInitialPointerMoveListeners() {\n document.addEventListener('mousemove', onInitialPointerMove);\n document.addEventListener('mousedown', onInitialPointerMove);\n document.addEventListener('mouseup', onInitialPointerMove);\n document.addEventListener('pointermove', onInitialPointerMove);\n document.addEventListener('pointerdown', onInitialPointerMove);\n document.addEventListener('pointerup', onInitialPointerMove);\n document.addEventListener('touchmove', onInitialPointerMove);\n document.addEventListener('touchstart', onInitialPointerMove);\n document.addEventListener('touchend', onInitialPointerMove);\n }\n\n function removeInitialPointerMoveListeners() {\n document.removeEventListener('mousemove', onInitialPointerMove);\n document.removeEventListener('mousedown', onInitialPointerMove);\n document.removeEventListener('mouseup', onInitialPointerMove);\n document.removeEventListener('pointermove', onInitialPointerMove);\n document.removeEventListener('pointerdown', onInitialPointerMove);\n document.removeEventListener('pointerup', onInitialPointerMove);\n document.removeEventListener('touchmove', onInitialPointerMove);\n document.removeEventListener('touchstart', onInitialPointerMove);\n document.removeEventListener('touchend', onInitialPointerMove);\n }\n\n /**\n * When the polfyill first loads, assume the user is in keyboard modality.\n * If any event is received from a pointing device (e.g. mouse, pointer,\n * touch), turn off keyboard modality.\n * This accounts for situations where focus enters the page from the URL bar.\n * @param {Event} e\n */\n function onInitialPointerMove(e) {\n // Work around a Safari quirk that fires a mousemove on whenever the\n // window blurs, even if you're tabbing out of the page. \u00AF\\_(\u30C4)_/\u00AF\n if (e.target.nodeName && e.target.nodeName.toLowerCase() === 'html') {\n return;\n }\n\n hadKeyboardEvent = false;\n removeInitialPointerMoveListeners();\n }\n\n // For some kinds of state, we are interested in changes at the global scope\n // only. For example, global pointer input, global key presses and global\n // visibility change should affect the state at every scope:\n document.addEventListener('keydown', onKeyDown, true);\n document.addEventListener('mousedown', onPointerDown, true);\n document.addEventListener('pointerdown', onPointerDown, true);\n document.addEventListener('touchstart', onPointerDown, true);\n document.addEventListener('visibilitychange', onVisibilityChange, true);\n\n addInitialPointerMoveListeners();\n\n // For focus and blur, we specifically care about state changes in the local\n // scope. This is because focus / blur events that originate from within a\n // shadow root are not re-dispatched from the host element if it was already\n // the active element in its own scope:\n scope.addEventListener('focus', onFocus, true);\n scope.addEventListener('blur', onBlur, true);\n\n // We detect that a node is a ShadowRoot by ensuring that it is a\n // DocumentFragment and also has a host property. This check covers native\n // implementation and polyfill implementation transparently. If we only cared\n // about the native implementation, we could just check if the scope was\n // an instance of a ShadowRoot.\n if (scope.nodeType === Node.DOCUMENT_FRAGMENT_NODE && scope.host) {\n // Since a ShadowRoot is a special kind of DocumentFragment, it does not\n // have a root element to add a class to. So, we add this attribute to the\n // host element instead:\n scope.host.setAttribute('data-js-focus-visible', '');\n } else if (scope.nodeType === Node.DOCUMENT_NODE) {\n document.documentElement.classList.add('js-focus-visible');\n document.documentElement.setAttribute('data-js-focus-visible', '');\n }\n }\n\n // It is important to wrap all references to global window and document in\n // these checks to support server-side rendering use cases\n // @see https://github.com/WICG/focus-visible/issues/199\n if (typeof window !== 'undefined' && typeof document !== 'undefined') {\n // Make the polyfill helper globally available. This can be used as a signal\n // to interested libraries that wish to coordinate with the polyfill for e.g.,\n // applying the polyfill to a shadow root:\n window.applyFocusVisiblePolyfill = applyFocusVisiblePolyfill;\n\n // Notify interested libraries of the polyfill's presence, in case the\n // polyfill was loaded lazily:\n var event;\n\n try {\n event = new CustomEvent('focus-visible-polyfill-ready');\n } catch (error) {\n // IE11 does not support using CustomEvent as a constructor directly:\n event = document.createEvent('CustomEvent');\n event.initCustomEvent('focus-visible-polyfill-ready', false, false, {});\n }\n\n window.dispatchEvent(event);\n }\n\n if (typeof document !== 'undefined') {\n // Apply the polyfill to the global document, so that no JavaScript\n // coordination is required to use the polyfill in the top-level document:\n applyFocusVisiblePolyfill(document);\n }\n\n})));\n", "/*!\n * escape-html\n * Copyright(c) 2012-2013 TJ Holowaychuk\n * Copyright(c) 2015 Andreas Lubbe\n * Copyright(c) 2015 Tiancheng \"Timothy\" Gu\n * MIT Licensed\n */\n\n'use strict';\n\n/**\n * Module variables.\n * @private\n */\n\nvar matchHtmlRegExp = /[\"'&<>]/;\n\n/**\n * Module exports.\n * @public\n */\n\nmodule.exports = escapeHtml;\n\n/**\n * Escape special characters in the given string of html.\n *\n * @param {string} string The string to escape for inserting into HTML\n * @return {string}\n * @public\n */\n\nfunction escapeHtml(string) {\n var str = '' + string;\n var match = matchHtmlRegExp.exec(str);\n\n if (!match) {\n return str;\n }\n\n var escape;\n var html = '';\n var index = 0;\n var lastIndex = 0;\n\n for (index = match.index; index < str.length; index++) {\n switch (str.charCodeAt(index)) {\n case 34: // \"\n escape = '"';\n break;\n case 38: // &\n escape = '&';\n break;\n case 39: // '\n escape = ''';\n break;\n case 60: // <\n escape = '<';\n break;\n case 62: // >\n escape = '>';\n break;\n default:\n continue;\n }\n\n if (lastIndex !== index) {\n html += str.substring(lastIndex, index);\n }\n\n lastIndex = index + 1;\n html += escape;\n }\n\n return lastIndex !== index\n ? html + str.substring(lastIndex, index)\n : html;\n}\n", "/*!\n * clipboard.js v2.0.11\n * https://clipboardjs.com/\n *\n * Licensed MIT \u00A9 Zeno Rocha\n */\n(function webpackUniversalModuleDefinition(root, factory) {\n\tif(typeof exports === 'object' && typeof module === 'object')\n\t\tmodule.exports = factory();\n\telse if(typeof define === 'function' && define.amd)\n\t\tdefine([], factory);\n\telse if(typeof exports === 'object')\n\t\texports[\"ClipboardJS\"] = factory();\n\telse\n\t\troot[\"ClipboardJS\"] = factory();\n})(this, function() {\nreturn /******/ (function() { // webpackBootstrap\n/******/ \tvar __webpack_modules__ = ({\n\n/***/ 686:\n/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {\n\n\"use strict\";\n\n// EXPORTS\n__webpack_require__.d(__webpack_exports__, {\n \"default\": function() { return /* binding */ clipboard; }\n});\n\n// EXTERNAL MODULE: ./node_modules/tiny-emitter/index.js\nvar tiny_emitter = __webpack_require__(279);\nvar tiny_emitter_default = /*#__PURE__*/__webpack_require__.n(tiny_emitter);\n// EXTERNAL MODULE: ./node_modules/good-listener/src/listen.js\nvar listen = __webpack_require__(370);\nvar listen_default = /*#__PURE__*/__webpack_require__.n(listen);\n// EXTERNAL MODULE: ./node_modules/select/src/select.js\nvar src_select = __webpack_require__(817);\nvar select_default = /*#__PURE__*/__webpack_require__.n(src_select);\n;// CONCATENATED MODULE: ./src/common/command.js\n/**\n * Executes a given operation type.\n * @param {String} type\n * @return {Boolean}\n */\nfunction command(type) {\n try {\n return document.execCommand(type);\n } catch (err) {\n return false;\n }\n}\n;// CONCATENATED MODULE: ./src/actions/cut.js\n\n\n/**\n * Cut action wrapper.\n * @param {String|HTMLElement} target\n * @return {String}\n */\n\nvar ClipboardActionCut = function ClipboardActionCut(target) {\n var selectedText = select_default()(target);\n command('cut');\n return selectedText;\n};\n\n/* harmony default export */ var actions_cut = (ClipboardActionCut);\n;// CONCATENATED MODULE: ./src/common/create-fake-element.js\n/**\n * Creates a fake textarea element with a value.\n * @param {String} value\n * @return {HTMLElement}\n */\nfunction createFakeElement(value) {\n var isRTL = document.documentElement.getAttribute('dir') === 'rtl';\n var fakeElement = document.createElement('textarea'); // Prevent zooming on iOS\n\n fakeElement.style.fontSize = '12pt'; // Reset box model\n\n fakeElement.style.border = '0';\n fakeElement.style.padding = '0';\n fakeElement.style.margin = '0'; // Move element out of screen horizontally\n\n fakeElement.style.position = 'absolute';\n fakeElement.style[isRTL ? 'right' : 'left'] = '-9999px'; // Move element to the same position vertically\n\n var yPosition = window.pageYOffset || document.documentElement.scrollTop;\n fakeElement.style.top = \"\".concat(yPosition, \"px\");\n fakeElement.setAttribute('readonly', '');\n fakeElement.value = value;\n return fakeElement;\n}\n;// CONCATENATED MODULE: ./src/actions/copy.js\n\n\n\n/**\n * Create fake copy action wrapper using a fake element.\n * @param {String} target\n * @param {Object} options\n * @return {String}\n */\n\nvar fakeCopyAction = function fakeCopyAction(value, options) {\n var fakeElement = createFakeElement(value);\n options.container.appendChild(fakeElement);\n var selectedText = select_default()(fakeElement);\n command('copy');\n fakeElement.remove();\n return selectedText;\n};\n/**\n * Copy action wrapper.\n * @param {String|HTMLElement} target\n * @param {Object} options\n * @return {String}\n */\n\n\nvar ClipboardActionCopy = function ClipboardActionCopy(target) {\n var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {\n container: document.body\n };\n var selectedText = '';\n\n if (typeof target === 'string') {\n selectedText = fakeCopyAction(target, options);\n } else if (target instanceof HTMLInputElement && !['text', 'search', 'url', 'tel', 'password'].includes(target === null || target === void 0 ? void 0 : target.type)) {\n // If input type doesn't support `setSelectionRange`. Simulate it. https://developer.mozilla.org/en-US/docs/Web/API/HTMLInputElement/setSelectionRange\n selectedText = fakeCopyAction(target.value, options);\n } else {\n selectedText = select_default()(target);\n command('copy');\n }\n\n return selectedText;\n};\n\n/* harmony default export */ var actions_copy = (ClipboardActionCopy);\n;// CONCATENATED MODULE: ./src/actions/default.js\nfunction _typeof(obj) { \"@babel/helpers - typeof\"; if (typeof Symbol === \"function\" && typeof Symbol.iterator === \"symbol\") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === \"function\" && obj.constructor === Symbol && obj !== Symbol.prototype ? \"symbol\" : typeof obj; }; } return _typeof(obj); }\n\n\n\n/**\n * Inner function which performs selection from either `text` or `target`\n * properties and then executes copy or cut operations.\n * @param {Object} options\n */\n\nvar ClipboardActionDefault = function ClipboardActionDefault() {\n var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};\n // Defines base properties passed from constructor.\n var _options$action = options.action,\n action = _options$action === void 0 ? 'copy' : _options$action,\n container = options.container,\n target = options.target,\n text = options.text; // Sets the `action` to be performed which can be either 'copy' or 'cut'.\n\n if (action !== 'copy' && action !== 'cut') {\n throw new Error('Invalid \"action\" value, use either \"copy\" or \"cut\"');\n } // Sets the `target` property using an element that will be have its content copied.\n\n\n if (target !== undefined) {\n if (target && _typeof(target) === 'object' && target.nodeType === 1) {\n if (action === 'copy' && target.hasAttribute('disabled')) {\n throw new Error('Invalid \"target\" attribute. Please use \"readonly\" instead of \"disabled\" attribute');\n }\n\n if (action === 'cut' && (target.hasAttribute('readonly') || target.hasAttribute('disabled'))) {\n throw new Error('Invalid \"target\" attribute. You can\\'t cut text from elements with \"readonly\" or \"disabled\" attributes');\n }\n } else {\n throw new Error('Invalid \"target\" value, use a valid Element');\n }\n } // Define selection strategy based on `text` property.\n\n\n if (text) {\n return actions_copy(text, {\n container: container\n });\n } // Defines which selection strategy based on `target` property.\n\n\n if (target) {\n return action === 'cut' ? actions_cut(target) : actions_copy(target, {\n container: container\n });\n }\n};\n\n/* harmony default export */ var actions_default = (ClipboardActionDefault);\n;// CONCATENATED MODULE: ./src/clipboard.js\nfunction clipboard_typeof(obj) { \"@babel/helpers - typeof\"; if (typeof Symbol === \"function\" && typeof Symbol.iterator === \"symbol\") { clipboard_typeof = function _typeof(obj) { return typeof obj; }; } else { clipboard_typeof = function _typeof(obj) { return obj && typeof Symbol === \"function\" && obj.constructor === Symbol && obj !== Symbol.prototype ? \"symbol\" : typeof obj; }; } return clipboard_typeof(obj); }\n\nfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\nfunction _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }\n\nfunction _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }\n\nfunction _inherits(subClass, superClass) { if (typeof superClass !== \"function\" && superClass !== null) { throw new TypeError(\"Super expression must either be null or a function\"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }\n\nfunction _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }\n\nfunction _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }\n\nfunction _possibleConstructorReturn(self, call) { if (call && (clipboard_typeof(call) === \"object\" || typeof call === \"function\")) { return call; } return _assertThisInitialized(self); }\n\nfunction _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError(\"this hasn't been initialised - super() hasn't been called\"); } return self; }\n\nfunction _isNativeReflectConstruct() { if (typeof Reflect === \"undefined\" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === \"function\") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }\n\nfunction _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }\n\n\n\n\n\n\n/**\n * Helper function to retrieve attribute value.\n * @param {String} suffix\n * @param {Element} element\n */\n\nfunction getAttributeValue(suffix, element) {\n var attribute = \"data-clipboard-\".concat(suffix);\n\n if (!element.hasAttribute(attribute)) {\n return;\n }\n\n return element.getAttribute(attribute);\n}\n/**\n * Base class which takes one or more elements, adds event listeners to them,\n * and instantiates a new `ClipboardAction` on each click.\n */\n\n\nvar Clipboard = /*#__PURE__*/function (_Emitter) {\n _inherits(Clipboard, _Emitter);\n\n var _super = _createSuper(Clipboard);\n\n /**\n * @param {String|HTMLElement|HTMLCollection|NodeList} trigger\n * @param {Object} options\n */\n function Clipboard(trigger, options) {\n var _this;\n\n _classCallCheck(this, Clipboard);\n\n _this = _super.call(this);\n\n _this.resolveOptions(options);\n\n _this.listenClick(trigger);\n\n return _this;\n }\n /**\n * Defines if attributes would be resolved using internal setter functions\n * or custom functions that were passed in the constructor.\n * @param {Object} options\n */\n\n\n _createClass(Clipboard, [{\n key: \"resolveOptions\",\n value: function resolveOptions() {\n var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};\n this.action = typeof options.action === 'function' ? options.action : this.defaultAction;\n this.target = typeof options.target === 'function' ? options.target : this.defaultTarget;\n this.text = typeof options.text === 'function' ? options.text : this.defaultText;\n this.container = clipboard_typeof(options.container) === 'object' ? options.container : document.body;\n }\n /**\n * Adds a click event listener to the passed trigger.\n * @param {String|HTMLElement|HTMLCollection|NodeList} trigger\n */\n\n }, {\n key: \"listenClick\",\n value: function listenClick(trigger) {\n var _this2 = this;\n\n this.listener = listen_default()(trigger, 'click', function (e) {\n return _this2.onClick(e);\n });\n }\n /**\n * Defines a new `ClipboardAction` on each click event.\n * @param {Event} e\n */\n\n }, {\n key: \"onClick\",\n value: function onClick(e) {\n var trigger = e.delegateTarget || e.currentTarget;\n var action = this.action(trigger) || 'copy';\n var text = actions_default({\n action: action,\n container: this.container,\n target: this.target(trigger),\n text: this.text(trigger)\n }); // Fires an event based on the copy operation result.\n\n this.emit(text ? 'success' : 'error', {\n action: action,\n text: text,\n trigger: trigger,\n clearSelection: function clearSelection() {\n if (trigger) {\n trigger.focus();\n }\n\n window.getSelection().removeAllRanges();\n }\n });\n }\n /**\n * Default `action` lookup function.\n * @param {Element} trigger\n */\n\n }, {\n key: \"defaultAction\",\n value: function defaultAction(trigger) {\n return getAttributeValue('action', trigger);\n }\n /**\n * Default `target` lookup function.\n * @param {Element} trigger\n */\n\n }, {\n key: \"defaultTarget\",\n value: function defaultTarget(trigger) {\n var selector = getAttributeValue('target', trigger);\n\n if (selector) {\n return document.querySelector(selector);\n }\n }\n /**\n * Allow fire programmatically a copy action\n * @param {String|HTMLElement} target\n * @param {Object} options\n * @returns Text copied.\n */\n\n }, {\n key: \"defaultText\",\n\n /**\n * Default `text` lookup function.\n * @param {Element} trigger\n */\n value: function defaultText(trigger) {\n return getAttributeValue('text', trigger);\n }\n /**\n * Destroy lifecycle.\n */\n\n }, {\n key: \"destroy\",\n value: function destroy() {\n this.listener.destroy();\n }\n }], [{\n key: \"copy\",\n value: function copy(target) {\n var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {\n container: document.body\n };\n return actions_copy(target, options);\n }\n /**\n * Allow fire programmatically a cut action\n * @param {String|HTMLElement} target\n * @returns Text cutted.\n */\n\n }, {\n key: \"cut\",\n value: function cut(target) {\n return actions_cut(target);\n }\n /**\n * Returns the support of the given action, or all actions if no action is\n * given.\n * @param {String} [action]\n */\n\n }, {\n key: \"isSupported\",\n value: function isSupported() {\n var action = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ['copy', 'cut'];\n var actions = typeof action === 'string' ? [action] : action;\n var support = !!document.queryCommandSupported;\n actions.forEach(function (action) {\n support = support && !!document.queryCommandSupported(action);\n });\n return support;\n }\n }]);\n\n return Clipboard;\n}((tiny_emitter_default()));\n\n/* harmony default export */ var clipboard = (Clipboard);\n\n/***/ }),\n\n/***/ 828:\n/***/ (function(module) {\n\nvar DOCUMENT_NODE_TYPE = 9;\n\n/**\n * A polyfill for Element.matches()\n */\nif (typeof Element !== 'undefined' && !Element.prototype.matches) {\n var proto = Element.prototype;\n\n proto.matches = proto.matchesSelector ||\n proto.mozMatchesSelector ||\n proto.msMatchesSelector ||\n proto.oMatchesSelector ||\n proto.webkitMatchesSelector;\n}\n\n/**\n * Finds the closest parent that matches a selector.\n *\n * @param {Element} element\n * @param {String} selector\n * @return {Function}\n */\nfunction closest (element, selector) {\n while (element && element.nodeType !== DOCUMENT_NODE_TYPE) {\n if (typeof element.matches === 'function' &&\n element.matches(selector)) {\n return element;\n }\n element = element.parentNode;\n }\n}\n\nmodule.exports = closest;\n\n\n/***/ }),\n\n/***/ 438:\n/***/ (function(module, __unused_webpack_exports, __webpack_require__) {\n\nvar closest = __webpack_require__(828);\n\n/**\n * Delegates event to a selector.\n *\n * @param {Element} element\n * @param {String} selector\n * @param {String} type\n * @param {Function} callback\n * @param {Boolean} useCapture\n * @return {Object}\n */\nfunction _delegate(element, selector, type, callback, useCapture) {\n var listenerFn = listener.apply(this, arguments);\n\n element.addEventListener(type, listenerFn, useCapture);\n\n return {\n destroy: function() {\n element.removeEventListener(type, listenerFn, useCapture);\n }\n }\n}\n\n/**\n * Delegates event to a selector.\n *\n * @param {Element|String|Array} [elements]\n * @param {String} selector\n * @param {String} type\n * @param {Function} callback\n * @param {Boolean} useCapture\n * @return {Object}\n */\nfunction delegate(elements, selector, type, callback, useCapture) {\n // Handle the regular Element usage\n if (typeof elements.addEventListener === 'function') {\n return _delegate.apply(null, arguments);\n }\n\n // Handle Element-less usage, it defaults to global delegation\n if (typeof type === 'function') {\n // Use `document` as the first parameter, then apply arguments\n // This is a short way to .unshift `arguments` without running into deoptimizations\n return _delegate.bind(null, document).apply(null, arguments);\n }\n\n // Handle Selector-based usage\n if (typeof elements === 'string') {\n elements = document.querySelectorAll(elements);\n }\n\n // Handle Array-like based usage\n return Array.prototype.map.call(elements, function (element) {\n return _delegate(element, selector, type, callback, useCapture);\n });\n}\n\n/**\n * Finds closest match and invokes callback.\n *\n * @param {Element} element\n * @param {String} selector\n * @param {String} type\n * @param {Function} callback\n * @return {Function}\n */\nfunction listener(element, selector, type, callback) {\n return function(e) {\n e.delegateTarget = closest(e.target, selector);\n\n if (e.delegateTarget) {\n callback.call(element, e);\n }\n }\n}\n\nmodule.exports = delegate;\n\n\n/***/ }),\n\n/***/ 879:\n/***/ (function(__unused_webpack_module, exports) {\n\n/**\n * Check if argument is a HTML element.\n *\n * @param {Object} value\n * @return {Boolean}\n */\nexports.node = function(value) {\n return value !== undefined\n && value instanceof HTMLElement\n && value.nodeType === 1;\n};\n\n/**\n * Check if argument is a list of HTML elements.\n *\n * @param {Object} value\n * @return {Boolean}\n */\nexports.nodeList = function(value) {\n var type = Object.prototype.toString.call(value);\n\n return value !== undefined\n && (type === '[object NodeList]' || type === '[object HTMLCollection]')\n && ('length' in value)\n && (value.length === 0 || exports.node(value[0]));\n};\n\n/**\n * Check if argument is a string.\n *\n * @param {Object} value\n * @return {Boolean}\n */\nexports.string = function(value) {\n return typeof value === 'string'\n || value instanceof String;\n};\n\n/**\n * Check if argument is a function.\n *\n * @param {Object} value\n * @return {Boolean}\n */\nexports.fn = function(value) {\n var type = Object.prototype.toString.call(value);\n\n return type === '[object Function]';\n};\n\n\n/***/ }),\n\n/***/ 370:\n/***/ (function(module, __unused_webpack_exports, __webpack_require__) {\n\nvar is = __webpack_require__(879);\nvar delegate = __webpack_require__(438);\n\n/**\n * Validates all params and calls the right\n * listener function based on its target type.\n *\n * @param {String|HTMLElement|HTMLCollection|NodeList} target\n * @param {String} type\n * @param {Function} callback\n * @return {Object}\n */\nfunction listen(target, type, callback) {\n if (!target && !type && !callback) {\n throw new Error('Missing required arguments');\n }\n\n if (!is.string(type)) {\n throw new TypeError('Second argument must be a String');\n }\n\n if (!is.fn(callback)) {\n throw new TypeError('Third argument must be a Function');\n }\n\n if (is.node(target)) {\n return listenNode(target, type, callback);\n }\n else if (is.nodeList(target)) {\n return listenNodeList(target, type, callback);\n }\n else if (is.string(target)) {\n return listenSelector(target, type, callback);\n }\n else {\n throw new TypeError('First argument must be a String, HTMLElement, HTMLCollection, or NodeList');\n }\n}\n\n/**\n * Adds an event listener to a HTML element\n * and returns a remove listener function.\n *\n * @param {HTMLElement} node\n * @param {String} type\n * @param {Function} callback\n * @return {Object}\n */\nfunction listenNode(node, type, callback) {\n node.addEventListener(type, callback);\n\n return {\n destroy: function() {\n node.removeEventListener(type, callback);\n }\n }\n}\n\n/**\n * Add an event listener to a list of HTML elements\n * and returns a remove listener function.\n *\n * @param {NodeList|HTMLCollection} nodeList\n * @param {String} type\n * @param {Function} callback\n * @return {Object}\n */\nfunction listenNodeList(nodeList, type, callback) {\n Array.prototype.forEach.call(nodeList, function(node) {\n node.addEventListener(type, callback);\n });\n\n return {\n destroy: function() {\n Array.prototype.forEach.call(nodeList, function(node) {\n node.removeEventListener(type, callback);\n });\n }\n }\n}\n\n/**\n * Add an event listener to a selector\n * and returns a remove listener function.\n *\n * @param {String} selector\n * @param {String} type\n * @param {Function} callback\n * @return {Object}\n */\nfunction listenSelector(selector, type, callback) {\n return delegate(document.body, selector, type, callback);\n}\n\nmodule.exports = listen;\n\n\n/***/ }),\n\n/***/ 817:\n/***/ (function(module) {\n\nfunction select(element) {\n var selectedText;\n\n if (element.nodeName === 'SELECT') {\n element.focus();\n\n selectedText = element.value;\n }\n else if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {\n var isReadOnly = element.hasAttribute('readonly');\n\n if (!isReadOnly) {\n element.setAttribute('readonly', '');\n }\n\n element.select();\n element.setSelectionRange(0, element.value.length);\n\n if (!isReadOnly) {\n element.removeAttribute('readonly');\n }\n\n selectedText = element.value;\n }\n else {\n if (element.hasAttribute('contenteditable')) {\n element.focus();\n }\n\n var selection = window.getSelection();\n var range = document.createRange();\n\n range.selectNodeContents(element);\n selection.removeAllRanges();\n selection.addRange(range);\n\n selectedText = selection.toString();\n }\n\n return selectedText;\n}\n\nmodule.exports = select;\n\n\n/***/ }),\n\n/***/ 279:\n/***/ (function(module) {\n\nfunction E () {\n // Keep this empty so it's easier to inherit from\n // (via https://github.com/lipsmack from https://github.com/scottcorgan/tiny-emitter/issues/3)\n}\n\nE.prototype = {\n on: function (name, callback, ctx) {\n var e = this.e || (this.e = {});\n\n (e[name] || (e[name] = [])).push({\n fn: callback,\n ctx: ctx\n });\n\n return this;\n },\n\n once: function (name, callback, ctx) {\n var self = this;\n function listener () {\n self.off(name, listener);\n callback.apply(ctx, arguments);\n };\n\n listener._ = callback\n return this.on(name, listener, ctx);\n },\n\n emit: function (name) {\n var data = [].slice.call(arguments, 1);\n var evtArr = ((this.e || (this.e = {}))[name] || []).slice();\n var i = 0;\n var len = evtArr.length;\n\n for (i; i < len; i++) {\n evtArr[i].fn.apply(evtArr[i].ctx, data);\n }\n\n return this;\n },\n\n off: function (name, callback) {\n var e = this.e || (this.e = {});\n var evts = e[name];\n var liveEvents = [];\n\n if (evts && callback) {\n for (var i = 0, len = evts.length; i < len; i++) {\n if (evts[i].fn !== callback && evts[i].fn._ !== callback)\n liveEvents.push(evts[i]);\n }\n }\n\n // Remove event from queue to prevent memory leak\n // Suggested by https://github.com/lazd\n // Ref: https://github.com/scottcorgan/tiny-emitter/commit/c6ebfaa9bc973b33d110a84a307742b7cf94c953#commitcomment-5024910\n\n (liveEvents.length)\n ? e[name] = liveEvents\n : delete e[name];\n\n return this;\n }\n};\n\nmodule.exports = E;\nmodule.exports.TinyEmitter = E;\n\n\n/***/ })\n\n/******/ \t});\n/************************************************************************/\n/******/ \t// The module cache\n/******/ \tvar __webpack_module_cache__ = {};\n/******/ \t\n/******/ \t// The require function\n/******/ \tfunction __webpack_require__(moduleId) {\n/******/ \t\t// Check if module is in cache\n/******/ \t\tif(__webpack_module_cache__[moduleId]) {\n/******/ \t\t\treturn __webpack_module_cache__[moduleId].exports;\n/******/ \t\t}\n/******/ \t\t// Create a new module (and put it into the cache)\n/******/ \t\tvar module = __webpack_module_cache__[moduleId] = {\n/******/ \t\t\t// no module.id needed\n/******/ \t\t\t// no module.loaded needed\n/******/ \t\t\texports: {}\n/******/ \t\t};\n/******/ \t\n/******/ \t\t// Execute the module function\n/******/ \t\t__webpack_modules__[moduleId](module, module.exports, __webpack_require__);\n/******/ \t\n/******/ \t\t// Return the exports of the module\n/******/ \t\treturn module.exports;\n/******/ \t}\n/******/ \t\n/************************************************************************/\n/******/ \t/* webpack/runtime/compat get default export */\n/******/ \t!function() {\n/******/ \t\t// getDefaultExport function for compatibility with non-harmony modules\n/******/ \t\t__webpack_require__.n = function(module) {\n/******/ \t\t\tvar getter = module && module.__esModule ?\n/******/ \t\t\t\tfunction() { return module['default']; } :\n/******/ \t\t\t\tfunction() { return module; };\n/******/ \t\t\t__webpack_require__.d(getter, { a: getter });\n/******/ \t\t\treturn getter;\n/******/ \t\t};\n/******/ \t}();\n/******/ \t\n/******/ \t/* webpack/runtime/define property getters */\n/******/ \t!function() {\n/******/ \t\t// define getter functions for harmony exports\n/******/ \t\t__webpack_require__.d = function(exports, definition) {\n/******/ \t\t\tfor(var key in definition) {\n/******/ \t\t\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n/******/ \t\t\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n/******/ \t\t\t\t}\n/******/ \t\t\t}\n/******/ \t\t};\n/******/ \t}();\n/******/ \t\n/******/ \t/* webpack/runtime/hasOwnProperty shorthand */\n/******/ \t!function() {\n/******/ \t\t__webpack_require__.o = function(obj, prop) { return Object.prototype.hasOwnProperty.call(obj, prop); }\n/******/ \t}();\n/******/ \t\n/************************************************************************/\n/******/ \t// module exports must be returned from runtime so entry inlining is disabled\n/******/ \t// startup\n/******/ \t// Load entry module and return exports\n/******/ \treturn __webpack_require__(686);\n/******/ })()\n.default;\n});", "/*\n * Copyright (c) 2016-2024 Martin Donath \n *\n * Permission is hereby granted, free of charge, to any person obtaining a copy\n * of this software and associated documentation files (the \"Software\"), to\n * deal in the Software without restriction, including without limitation the\n * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or\n * sell copies of the Software, and to permit persons to whom the Software is\n * furnished to do so, subject to the following conditions:\n *\n * The above copyright notice and this permission notice shall be included in\n * all copies or substantial portions of the Software.\n *\n * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE\n * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS\n * IN THE SOFTWARE.\n */\n\nimport \"focus-visible\"\n\nimport {\n EMPTY,\n NEVER,\n Observable,\n Subject,\n defer,\n delay,\n filter,\n map,\n merge,\n mergeWith,\n shareReplay,\n switchMap\n} from \"rxjs\"\n\nimport { configuration, feature } from \"./_\"\nimport {\n at,\n getActiveElement,\n getOptionalElement,\n requestJSON,\n setLocation,\n setToggle,\n watchDocument,\n watchKeyboard,\n watchLocation,\n watchLocationTarget,\n watchMedia,\n watchPrint,\n watchScript,\n watchViewport\n} from \"./browser\"\nimport {\n getComponentElement,\n getComponentElements,\n mountAnnounce,\n mountBackToTop,\n mountConsent,\n mountContent,\n mountDialog,\n mountHeader,\n mountHeaderTitle,\n mountPalette,\n mountProgress,\n mountSearch,\n mountSearchHiglight,\n mountSidebar,\n mountSource,\n mountTableOfContents,\n mountTabs,\n watchHeader,\n watchMain\n} from \"./components\"\nimport {\n SearchIndex,\n setupClipboardJS,\n setupInstantNavigation,\n setupVersionSelector\n} from \"./integrations\"\nimport {\n patchEllipsis,\n patchIndeterminate,\n patchScrollfix,\n patchScrolllock\n} from \"./patches\"\nimport \"./polyfills\"\n\n/* ----------------------------------------------------------------------------\n * Functions - @todo refactor\n * ------------------------------------------------------------------------- */\n\n/**\n * Fetch search index\n *\n * @returns Search index observable\n */\nfunction fetchSearchIndex(): Observable {\n if (location.protocol === \"file:\") {\n return watchScript(\n `${new URL(\"search/search_index.js\", config.base)}`\n )\n .pipe(\n // @ts-ignore - @todo fix typings\n map(() => __index),\n shareReplay(1)\n )\n } else {\n return requestJSON(\n new URL(\"search/search_index.json\", config.base)\n )\n }\n}\n\n/* ----------------------------------------------------------------------------\n * Application\n * ------------------------------------------------------------------------- */\n\n/* Yay, JavaScript is available */\ndocument.documentElement.classList.remove(\"no-js\")\ndocument.documentElement.classList.add(\"js\")\n\n/* Set up navigation observables and subjects */\nconst document$ = watchDocument()\nconst location$ = watchLocation()\nconst target$ = watchLocationTarget(location$)\nconst keyboard$ = watchKeyboard()\n\n/* Set up media observables */\nconst viewport$ = watchViewport()\nconst tablet$ = watchMedia(\"(min-width: 960px)\")\nconst screen$ = watchMedia(\"(min-width: 1220px)\")\nconst print$ = watchPrint()\n\n/* Retrieve search index, if search is enabled */\nconst config = configuration()\nconst index$ = document.forms.namedItem(\"search\")\n ? fetchSearchIndex()\n : NEVER\n\n/* Set up Clipboard.js integration */\nconst alert$ = new Subject()\nsetupClipboardJS({ alert$ })\n\n/* Set up progress indicator */\nconst progress$ = new Subject()\n\n/* Set up instant navigation, if enabled */\nif (feature(\"navigation.instant\"))\n setupInstantNavigation({ location$, viewport$, progress$ })\n .subscribe(document$)\n\n/* Set up version selector */\nif (config.version?.provider === \"mike\")\n setupVersionSelector({ document$ })\n\n/* Always close drawer and search on navigation */\nmerge(location$, target$)\n .pipe(\n delay(125)\n )\n .subscribe(() => {\n setToggle(\"drawer\", false)\n setToggle(\"search\", false)\n })\n\n/* Set up global keyboard handlers */\nkeyboard$\n .pipe(\n filter(({ mode }) => mode === \"global\")\n )\n .subscribe(key => {\n switch (key.type) {\n\n /* Go to previous page */\n case \"p\":\n case \",\":\n const prev = getOptionalElement(\"link[rel=prev]\")\n if (typeof prev !== \"undefined\")\n setLocation(prev)\n break\n\n /* Go to next page */\n case \"n\":\n case \".\":\n const next = getOptionalElement(\"link[rel=next]\")\n if (typeof next !== \"undefined\")\n setLocation(next)\n break\n\n /* Expand navigation, see https://bit.ly/3ZjG5io */\n case \"Enter\":\n const active = getActiveElement()\n if (active instanceof HTMLLabelElement)\n active.click()\n }\n })\n\n/* Set up patches */\npatchEllipsis({ viewport$, document$ })\npatchIndeterminate({ document$, tablet$ })\npatchScrollfix({ document$ })\npatchScrolllock({ viewport$, tablet$ })\n\n/* Set up header and main area observable */\nconst header$ = watchHeader(getComponentElement(\"header\"), { viewport$ })\nconst main$ = document$\n .pipe(\n map(() => getComponentElement(\"main\")),\n switchMap(el => watchMain(el, { viewport$, header$ })),\n shareReplay(1)\n )\n\n/* Set up control component observables */\nconst control$ = merge(\n\n /* Consent */\n ...getComponentElements(\"consent\")\n .map(el => mountConsent(el, { target$ })),\n\n /* Dialog */\n ...getComponentElements(\"dialog\")\n .map(el => mountDialog(el, { alert$ })),\n\n /* Header */\n ...getComponentElements(\"header\")\n .map(el => mountHeader(el, { viewport$, header$, main$ })),\n\n /* Color palette */\n ...getComponentElements(\"palette\")\n .map(el => mountPalette(el)),\n\n /* Progress bar */\n ...getComponentElements(\"progress\")\n .map(el => mountProgress(el, { progress$ })),\n\n /* Search */\n ...getComponentElements(\"search\")\n .map(el => mountSearch(el, { index$, keyboard$ })),\n\n /* Repository information */\n ...getComponentElements(\"source\")\n .map(el => mountSource(el))\n)\n\n/* Set up content component observables */\nconst content$ = defer(() => merge(\n\n /* Announcement bar */\n ...getComponentElements(\"announce\")\n .map(el => mountAnnounce(el)),\n\n /* Content */\n ...getComponentElements(\"content\")\n .map(el => mountContent(el, { viewport$, target$, print$ })),\n\n /* Search highlighting */\n ...getComponentElements(\"content\")\n .map(el => feature(\"search.highlight\")\n ? mountSearchHiglight(el, { index$, location$ })\n : EMPTY\n ),\n\n /* Header title */\n ...getComponentElements(\"header-title\")\n .map(el => mountHeaderTitle(el, { viewport$, header$ })),\n\n /* Sidebar */\n ...getComponentElements(\"sidebar\")\n .map(el => el.getAttribute(\"data-md-type\") === \"navigation\"\n ? at(screen$, () => mountSidebar(el, { viewport$, header$, main$ }))\n : at(tablet$, () => mountSidebar(el, { viewport$, header$, main$ }))\n ),\n\n /* Navigation tabs */\n ...getComponentElements(\"tabs\")\n .map(el => mountTabs(el, { viewport$, header$ })),\n\n /* Table of contents */\n ...getComponentElements(\"toc\")\n .map(el => mountTableOfContents(el, {\n viewport$, header$, main$, target$\n })),\n\n /* Back-to-top button */\n ...getComponentElements(\"top\")\n .map(el => mountBackToTop(el, { viewport$, header$, main$, target$ }))\n))\n\n/* Set up component observables */\nconst component$ = document$\n .pipe(\n switchMap(() => content$),\n mergeWith(control$),\n shareReplay(1)\n )\n\n/* Subscribe to all components */\ncomponent$.subscribe()\n\n/* ----------------------------------------------------------------------------\n * Exports\n * ------------------------------------------------------------------------- */\n\nwindow.document$ = document$ /* Document observable */\nwindow.location$ = location$ /* Location subject */\nwindow.target$ = target$ /* Location target observable */\nwindow.keyboard$ = keyboard$ /* Keyboard observable */\nwindow.viewport$ = viewport$ /* Viewport observable */\nwindow.tablet$ = tablet$ /* Media tablet observable */\nwindow.screen$ = screen$ /* Media screen observable */\nwindow.print$ = print$ /* Media print observable */\nwindow.alert$ = alert$ /* Alert subject */\nwindow.progress$ = progress$ /* Progress indicator subject */\nwindow.component$ = component$ /* Component observable */\n", "/******************************************************************************\nCopyright (c) Microsoft Corporation.\n\nPermission to use, copy, modify, and/or distribute this software for any\npurpose with or without fee is hereby granted.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\nREGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\nAND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\nINDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\nLOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\nOTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\nPERFORMANCE OF THIS SOFTWARE.\n***************************************************************************** */\n/* global Reflect, Promise, SuppressedError, Symbol, Iterator */\n\nvar extendStatics = function(d, b) {\n extendStatics = Object.setPrototypeOf ||\n ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||\n function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };\n return extendStatics(d, b);\n};\n\nexport function __extends(d, b) {\n if (typeof b !== \"function\" && b !== null)\n throw new TypeError(\"Class extends value \" + String(b) + \" is not a constructor or null\");\n extendStatics(d, b);\n function __() { this.constructor = d; }\n d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\n}\n\nexport var __assign = function() {\n __assign = Object.assign || function __assign(t) {\n for (var s, i = 1, n = arguments.length; i < n; i++) {\n s = arguments[i];\n for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];\n }\n return t;\n }\n return __assign.apply(this, arguments);\n}\n\nexport function __rest(s, e) {\n var t = {};\n for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n t[p] = s[p];\n if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {\n if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))\n t[p[i]] = s[p[i]];\n }\n return t;\n}\n\nexport function __decorate(decorators, target, key, desc) {\n var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\n else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\n return c > 3 && r && Object.defineProperty(target, key, r), r;\n}\n\nexport function __param(paramIndex, decorator) {\n return function (target, key) { decorator(target, key, paramIndex); }\n}\n\nexport function __esDecorate(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {\n function accept(f) { if (f !== void 0 && typeof f !== \"function\") throw new TypeError(\"Function expected\"); return f; }\n var kind = contextIn.kind, key = kind === \"getter\" ? \"get\" : kind === \"setter\" ? \"set\" : \"value\";\n var target = !descriptorIn && ctor ? contextIn[\"static\"] ? ctor : ctor.prototype : null;\n var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});\n var _, done = false;\n for (var i = decorators.length - 1; i >= 0; i--) {\n var context = {};\n for (var p in contextIn) context[p] = p === \"access\" ? {} : contextIn[p];\n for (var p in contextIn.access) context.access[p] = contextIn.access[p];\n context.addInitializer = function (f) { if (done) throw new TypeError(\"Cannot add initializers after decoration has completed\"); extraInitializers.push(accept(f || null)); };\n var result = (0, decorators[i])(kind === \"accessor\" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);\n if (kind === \"accessor\") {\n if (result === void 0) continue;\n if (result === null || typeof result !== \"object\") throw new TypeError(\"Object expected\");\n if (_ = accept(result.get)) descriptor.get = _;\n if (_ = accept(result.set)) descriptor.set = _;\n if (_ = accept(result.init)) initializers.unshift(_);\n }\n else if (_ = accept(result)) {\n if (kind === \"field\") initializers.unshift(_);\n else descriptor[key] = _;\n }\n }\n if (target) Object.defineProperty(target, contextIn.name, descriptor);\n done = true;\n};\n\nexport function __runInitializers(thisArg, initializers, value) {\n var useValue = arguments.length > 2;\n for (var i = 0; i < initializers.length; i++) {\n value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);\n }\n return useValue ? value : void 0;\n};\n\nexport function __propKey(x) {\n return typeof x === \"symbol\" ? x : \"\".concat(x);\n};\n\nexport function __setFunctionName(f, name, prefix) {\n if (typeof name === \"symbol\") name = name.description ? \"[\".concat(name.description, \"]\") : \"\";\n return Object.defineProperty(f, \"name\", { configurable: true, value: prefix ? \"\".concat(prefix, \" \", name) : name });\n};\n\nexport function __metadata(metadataKey, metadataValue) {\n if (typeof Reflect === \"object\" && typeof Reflect.metadata === \"function\") return Reflect.metadata(metadataKey, metadataValue);\n}\n\nexport function __awaiter(thisArg, _arguments, P, generator) {\n function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n return new (P || (P = Promise))(function (resolve, reject) {\n function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n step((generator = generator.apply(thisArg, _arguments || [])).next());\n });\n}\n\nexport function __generator(thisArg, body) {\n var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === \"function\" ? Iterator : Object).prototype);\n return g.next = verb(0), g[\"throw\"] = verb(1), g[\"return\"] = verb(2), typeof Symbol === \"function\" && (g[Symbol.iterator] = function() { return this; }), g;\n function verb(n) { return function (v) { return step([n, v]); }; }\n function step(op) {\n if (f) throw new TypeError(\"Generator is already executing.\");\n while (g && (g = 0, op[0] && (_ = 0)), _) try {\n if (f = 1, y && (t = op[0] & 2 ? y[\"return\"] : op[0] ? y[\"throw\"] || ((t = y[\"return\"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;\n if (y = 0, t) op = [op[0] & 2, t.value];\n switch (op[0]) {\n case 0: case 1: t = op; break;\n case 4: _.label++; return { value: op[1], done: false };\n case 5: _.label++; y = op[1]; op = [0]; continue;\n case 7: op = _.ops.pop(); _.trys.pop(); continue;\n default:\n if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }\n if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }\n if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }\n if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }\n if (t[2]) _.ops.pop();\n _.trys.pop(); continue;\n }\n op = body.call(thisArg, _);\n } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }\n if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };\n }\n}\n\nexport var __createBinding = Object.create ? (function(o, m, k, k2) {\n if (k2 === undefined) k2 = k;\n var desc = Object.getOwnPropertyDescriptor(m, k);\n if (!desc || (\"get\" in desc ? !m.__esModule : desc.writable || desc.configurable)) {\n desc = { enumerable: true, get: function() { return m[k]; } };\n }\n Object.defineProperty(o, k2, desc);\n}) : (function(o, m, k, k2) {\n if (k2 === undefined) k2 = k;\n o[k2] = m[k];\n});\n\nexport function __exportStar(m, o) {\n for (var p in m) if (p !== \"default\" && !Object.prototype.hasOwnProperty.call(o, p)) __createBinding(o, m, p);\n}\n\nexport function __values(o) {\n var s = typeof Symbol === \"function\" && Symbol.iterator, m = s && o[s], i = 0;\n if (m) return m.call(o);\n if (o && typeof o.length === \"number\") return {\n next: function () {\n if (o && i >= o.length) o = void 0;\n return { value: o && o[i++], done: !o };\n }\n };\n throw new TypeError(s ? \"Object is not iterable.\" : \"Symbol.iterator is not defined.\");\n}\n\nexport function __read(o, n) {\n var m = typeof Symbol === \"function\" && o[Symbol.iterator];\n if (!m) return o;\n var i = m.call(o), r, ar = [], e;\n try {\n while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);\n }\n catch (error) { e = { error: error }; }\n finally {\n try {\n if (r && !r.done && (m = i[\"return\"])) m.call(i);\n }\n finally { if (e) throw e.error; }\n }\n return ar;\n}\n\n/** @deprecated */\nexport function __spread() {\n for (var ar = [], i = 0; i < arguments.length; i++)\n ar = ar.concat(__read(arguments[i]));\n return ar;\n}\n\n/** @deprecated */\nexport function __spreadArrays() {\n for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;\n for (var r = Array(s), k = 0, i = 0; i < il; i++)\n for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)\n r[k] = a[j];\n return r;\n}\n\nexport function __spreadArray(to, from, pack) {\n if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {\n if (ar || !(i in from)) {\n if (!ar) ar = Array.prototype.slice.call(from, 0, i);\n ar[i] = from[i];\n }\n }\n return to.concat(ar || Array.prototype.slice.call(from));\n}\n\nexport function __await(v) {\n return this instanceof __await ? (this.v = v, this) : new __await(v);\n}\n\nexport function __asyncGenerator(thisArg, _arguments, generator) {\n if (!Symbol.asyncIterator) throw new TypeError(\"Symbol.asyncIterator is not defined.\");\n var g = generator.apply(thisArg, _arguments || []), i, q = [];\n return i = Object.create((typeof AsyncIterator === \"function\" ? AsyncIterator : Object).prototype), verb(\"next\"), verb(\"throw\"), verb(\"return\", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;\n function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }\n function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }\n function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }\n function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }\n function fulfill(value) { resume(\"next\", value); }\n function reject(value) { resume(\"throw\", value); }\n function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }\n}\n\nexport function __asyncDelegator(o) {\n var i, p;\n return i = {}, verb(\"next\"), verb(\"throw\", function (e) { throw e; }), verb(\"return\"), i[Symbol.iterator] = function () { return this; }, i;\n function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: false } : f ? f(v) : v; } : f; }\n}\n\nexport function __asyncValues(o) {\n if (!Symbol.asyncIterator) throw new TypeError(\"Symbol.asyncIterator is not defined.\");\n var m = o[Symbol.asyncIterator], i;\n return m ? m.call(o) : (o = typeof __values === \"function\" ? __values(o) : o[Symbol.iterator](), i = {}, verb(\"next\"), verb(\"throw\"), verb(\"return\"), i[Symbol.asyncIterator] = function () { return this; }, i);\n function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }\n function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }\n}\n\nexport function __makeTemplateObject(cooked, raw) {\n if (Object.defineProperty) { Object.defineProperty(cooked, \"raw\", { value: raw }); } else { cooked.raw = raw; }\n return cooked;\n};\n\nvar __setModuleDefault = Object.create ? (function(o, v) {\n Object.defineProperty(o, \"default\", { enumerable: true, value: v });\n}) : function(o, v) {\n o[\"default\"] = v;\n};\n\nexport function __importStar(mod) {\n if (mod && mod.__esModule) return mod;\n var result = {};\n if (mod != null) for (var k in mod) if (k !== \"default\" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);\n __setModuleDefault(result, mod);\n return result;\n}\n\nexport function __importDefault(mod) {\n return (mod && mod.__esModule) ? mod : { default: mod };\n}\n\nexport function __classPrivateFieldGet(receiver, state, kind, f) {\n if (kind === \"a\" && !f) throw new TypeError(\"Private accessor was defined without a getter\");\n if (typeof state === \"function\" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError(\"Cannot read private member from an object whose class did not declare it\");\n return kind === \"m\" ? f : kind === \"a\" ? f.call(receiver) : f ? f.value : state.get(receiver);\n}\n\nexport function __classPrivateFieldSet(receiver, state, value, kind, f) {\n if (kind === \"m\") throw new TypeError(\"Private method is not writable\");\n if (kind === \"a\" && !f) throw new TypeError(\"Private accessor was defined without a setter\");\n if (typeof state === \"function\" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError(\"Cannot write private member to an object whose class did not declare it\");\n return (kind === \"a\" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;\n}\n\nexport function __classPrivateFieldIn(state, receiver) {\n if (receiver === null || (typeof receiver !== \"object\" && typeof receiver !== \"function\")) throw new TypeError(\"Cannot use 'in' operator on non-object\");\n return typeof state === \"function\" ? receiver === state : state.has(receiver);\n}\n\nexport function __addDisposableResource(env, value, async) {\n if (value !== null && value !== void 0) {\n if (typeof value !== \"object\" && typeof value !== \"function\") throw new TypeError(\"Object expected.\");\n var dispose, inner;\n if (async) {\n if (!Symbol.asyncDispose) throw new TypeError(\"Symbol.asyncDispose is not defined.\");\n dispose = value[Symbol.asyncDispose];\n }\n if (dispose === void 0) {\n if (!Symbol.dispose) throw new TypeError(\"Symbol.dispose is not defined.\");\n dispose = value[Symbol.dispose];\n if (async) inner = dispose;\n }\n if (typeof dispose !== \"function\") throw new TypeError(\"Object not disposable.\");\n if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };\n env.stack.push({ value: value, dispose: dispose, async: async });\n }\n else if (async) {\n env.stack.push({ async: true });\n }\n return value;\n}\n\nvar _SuppressedError = typeof SuppressedError === \"function\" ? SuppressedError : function (error, suppressed, message) {\n var e = new Error(message);\n return e.name = \"SuppressedError\", e.error = error, e.suppressed = suppressed, e;\n};\n\nexport function __disposeResources(env) {\n function fail(e) {\n env.error = env.hasError ? new _SuppressedError(e, env.error, \"An error was suppressed during disposal.\") : e;\n env.hasError = true;\n }\n var r, s = 0;\n function next() {\n while (r = env.stack.pop()) {\n try {\n if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);\n if (r.dispose) {\n var result = r.dispose.call(r.value);\n if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });\n }\n else s |= 1;\n }\n catch (e) {\n fail(e);\n }\n }\n if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();\n if (env.hasError) throw env.error;\n }\n return next();\n}\n\nexport default {\n __extends,\n __assign,\n __rest,\n __decorate,\n __param,\n __metadata,\n __awaiter,\n __generator,\n __createBinding,\n __exportStar,\n __values,\n __read,\n __spread,\n __spreadArrays,\n __spreadArray,\n __await,\n __asyncGenerator,\n __asyncDelegator,\n __asyncValues,\n __makeTemplateObject,\n __importStar,\n __importDefault,\n __classPrivateFieldGet,\n __classPrivateFieldSet,\n __classPrivateFieldIn,\n __addDisposableResource,\n __disposeResources,\n};\n", "/**\n * Returns true if the object is a function.\n * @param value The value to check\n */\nexport function isFunction(value: any): value is (...args: any[]) => any {\n return typeof value === 'function';\n}\n", "/**\n * Used to create Error subclasses until the community moves away from ES5.\n *\n * This is because compiling from TypeScript down to ES5 has issues with subclassing Errors\n * as well as other built-in types: https://github.com/Microsoft/TypeScript/issues/12123\n *\n * @param createImpl A factory function to create the actual constructor implementation. The returned\n * function should be a named function that calls `_super` internally.\n */\nexport function createErrorClass(createImpl: (_super: any) => any): T {\n const _super = (instance: any) => {\n Error.call(instance);\n instance.stack = new Error().stack;\n };\n\n const ctorFunc = createImpl(_super);\n ctorFunc.prototype = Object.create(Error.prototype);\n ctorFunc.prototype.constructor = ctorFunc;\n return ctorFunc;\n}\n", "import { createErrorClass } from './createErrorClass';\n\nexport interface UnsubscriptionError extends Error {\n readonly errors: any[];\n}\n\nexport interface UnsubscriptionErrorCtor {\n /**\n * @deprecated Internal implementation detail. Do not construct error instances.\n * Cannot be tagged as internal: https://github.com/ReactiveX/rxjs/issues/6269\n */\n new (errors: any[]): UnsubscriptionError;\n}\n\n/**\n * An error thrown when one or more errors have occurred during the\n * `unsubscribe` of a {@link Subscription}.\n */\nexport const UnsubscriptionError: UnsubscriptionErrorCtor = createErrorClass(\n (_super) =>\n function UnsubscriptionErrorImpl(this: any, errors: (Error | string)[]) {\n _super(this);\n this.message = errors\n ? `${errors.length} errors occurred during unsubscription:\n${errors.map((err, i) => `${i + 1}) ${err.toString()}`).join('\\n ')}`\n : '';\n this.name = 'UnsubscriptionError';\n this.errors = errors;\n }\n);\n", "/**\n * Removes an item from an array, mutating it.\n * @param arr The array to remove the item from\n * @param item The item to remove\n */\nexport function arrRemove(arr: T[] | undefined | null, item: T) {\n if (arr) {\n const index = arr.indexOf(item);\n 0 <= index && arr.splice(index, 1);\n }\n}\n", "import { isFunction } from './util/isFunction';\nimport { UnsubscriptionError } from './util/UnsubscriptionError';\nimport { SubscriptionLike, TeardownLogic, Unsubscribable } from './types';\nimport { arrRemove } from './util/arrRemove';\n\n/**\n * Represents a disposable resource, such as the execution of an Observable. A\n * Subscription has one important method, `unsubscribe`, that takes no argument\n * and just disposes the resource held by the subscription.\n *\n * Additionally, subscriptions may be grouped together through the `add()`\n * method, which will attach a child Subscription to the current Subscription.\n * When a Subscription is unsubscribed, all its children (and its grandchildren)\n * will be unsubscribed as well.\n *\n * @class Subscription\n */\nexport class Subscription implements SubscriptionLike {\n /** @nocollapse */\n public static EMPTY = (() => {\n const empty = new Subscription();\n empty.closed = true;\n return empty;\n })();\n\n /**\n * A flag to indicate whether this Subscription has already been unsubscribed.\n */\n public closed = false;\n\n private _parentage: Subscription[] | Subscription | null = null;\n\n /**\n * The list of registered finalizers to execute upon unsubscription. Adding and removing from this\n * list occurs in the {@link #add} and {@link #remove} methods.\n */\n private _finalizers: Exclude[] | null = null;\n\n /**\n * @param initialTeardown A function executed first as part of the finalization\n * process that is kicked off when {@link #unsubscribe} is called.\n */\n constructor(private initialTeardown?: () => void) {}\n\n /**\n * Disposes the resources held by the subscription. May, for instance, cancel\n * an ongoing Observable execution or cancel any other type of work that\n * started when the Subscription was created.\n * @return {void}\n */\n unsubscribe(): void {\n let errors: any[] | undefined;\n\n if (!this.closed) {\n this.closed = true;\n\n // Remove this from it's parents.\n const { _parentage } = this;\n if (_parentage) {\n this._parentage = null;\n if (Array.isArray(_parentage)) {\n for (const parent of _parentage) {\n parent.remove(this);\n }\n } else {\n _parentage.remove(this);\n }\n }\n\n const { initialTeardown: initialFinalizer } = this;\n if (isFunction(initialFinalizer)) {\n try {\n initialFinalizer();\n } catch (e) {\n errors = e instanceof UnsubscriptionError ? e.errors : [e];\n }\n }\n\n const { _finalizers } = this;\n if (_finalizers) {\n this._finalizers = null;\n for (const finalizer of _finalizers) {\n try {\n execFinalizer(finalizer);\n } catch (err) {\n errors = errors ?? [];\n if (err instanceof UnsubscriptionError) {\n errors = [...errors, ...err.errors];\n } else {\n errors.push(err);\n }\n }\n }\n }\n\n if (errors) {\n throw new UnsubscriptionError(errors);\n }\n }\n }\n\n /**\n * Adds a finalizer to this subscription, so that finalization will be unsubscribed/called\n * when this subscription is unsubscribed. If this subscription is already {@link #closed},\n * because it has already been unsubscribed, then whatever finalizer is passed to it\n * will automatically be executed (unless the finalizer itself is also a closed subscription).\n *\n * Closed Subscriptions cannot be added as finalizers to any subscription. Adding a closed\n * subscription to a any subscription will result in no operation. (A noop).\n *\n * Adding a subscription to itself, or adding `null` or `undefined` will not perform any\n * operation at all. (A noop).\n *\n * `Subscription` instances that are added to this instance will automatically remove themselves\n * if they are unsubscribed. Functions and {@link Unsubscribable} objects that you wish to remove\n * will need to be removed manually with {@link #remove}\n *\n * @param teardown The finalization logic to add to this subscription.\n */\n add(teardown: TeardownLogic): void {\n // Only add the finalizer if it's not undefined\n // and don't add a subscription to itself.\n if (teardown && teardown !== this) {\n if (this.closed) {\n // If this subscription is already closed,\n // execute whatever finalizer is handed to it automatically.\n execFinalizer(teardown);\n } else {\n if (teardown instanceof Subscription) {\n // We don't add closed subscriptions, and we don't add the same subscription\n // twice. Subscription unsubscribe is idempotent.\n if (teardown.closed || teardown._hasParent(this)) {\n return;\n }\n teardown._addParent(this);\n }\n (this._finalizers = this._finalizers ?? []).push(teardown);\n }\n }\n }\n\n /**\n * Checks to see if a this subscription already has a particular parent.\n * This will signal that this subscription has already been added to the parent in question.\n * @param parent the parent to check for\n */\n private _hasParent(parent: Subscription) {\n const { _parentage } = this;\n return _parentage === parent || (Array.isArray(_parentage) && _parentage.includes(parent));\n }\n\n /**\n * Adds a parent to this subscription so it can be removed from the parent if it\n * unsubscribes on it's own.\n *\n * NOTE: THIS ASSUMES THAT {@link _hasParent} HAS ALREADY BEEN CHECKED.\n * @param parent The parent subscription to add\n */\n private _addParent(parent: Subscription) {\n const { _parentage } = this;\n this._parentage = Array.isArray(_parentage) ? (_parentage.push(parent), _parentage) : _parentage ? [_parentage, parent] : parent;\n }\n\n /**\n * Called on a child when it is removed via {@link #remove}.\n * @param parent The parent to remove\n */\n private _removeParent(parent: Subscription) {\n const { _parentage } = this;\n if (_parentage === parent) {\n this._parentage = null;\n } else if (Array.isArray(_parentage)) {\n arrRemove(_parentage, parent);\n }\n }\n\n /**\n * Removes a finalizer from this subscription that was previously added with the {@link #add} method.\n *\n * Note that `Subscription` instances, when unsubscribed, will automatically remove themselves\n * from every other `Subscription` they have been added to. This means that using the `remove` method\n * is not a common thing and should be used thoughtfully.\n *\n * If you add the same finalizer instance of a function or an unsubscribable object to a `Subscription` instance\n * more than once, you will need to call `remove` the same number of times to remove all instances.\n *\n * All finalizer instances are removed to free up memory upon unsubscription.\n *\n * @param teardown The finalizer to remove from this subscription\n */\n remove(teardown: Exclude): void {\n const { _finalizers } = this;\n _finalizers && arrRemove(_finalizers, teardown);\n\n if (teardown instanceof Subscription) {\n teardown._removeParent(this);\n }\n }\n}\n\nexport const EMPTY_SUBSCRIPTION = Subscription.EMPTY;\n\nexport function isSubscription(value: any): value is Subscription {\n return (\n value instanceof Subscription ||\n (value && 'closed' in value && isFunction(value.remove) && isFunction(value.add) && isFunction(value.unsubscribe))\n );\n}\n\nfunction execFinalizer(finalizer: Unsubscribable | (() => void)) {\n if (isFunction(finalizer)) {\n finalizer();\n } else {\n finalizer.unsubscribe();\n }\n}\n", "import { Subscriber } from './Subscriber';\nimport { ObservableNotification } from './types';\n\n/**\n * The {@link GlobalConfig} object for RxJS. It is used to configure things\n * like how to react on unhandled errors.\n */\nexport const config: GlobalConfig = {\n onUnhandledError: null,\n onStoppedNotification: null,\n Promise: undefined,\n useDeprecatedSynchronousErrorHandling: false,\n useDeprecatedNextContext: false,\n};\n\n/**\n * The global configuration object for RxJS, used to configure things\n * like how to react on unhandled errors. Accessible via {@link config}\n * object.\n */\nexport interface GlobalConfig {\n /**\n * A registration point for unhandled errors from RxJS. These are errors that\n * cannot were not handled by consuming code in the usual subscription path. For\n * example, if you have this configured, and you subscribe to an observable without\n * providing an error handler, errors from that subscription will end up here. This\n * will _always_ be called asynchronously on another job in the runtime. This is because\n * we do not want errors thrown in this user-configured handler to interfere with the\n * behavior of the library.\n */\n onUnhandledError: ((err: any) => void) | null;\n\n /**\n * A registration point for notifications that cannot be sent to subscribers because they\n * have completed, errored or have been explicitly unsubscribed. By default, next, complete\n * and error notifications sent to stopped subscribers are noops. However, sometimes callers\n * might want a different behavior. For example, with sources that attempt to report errors\n * to stopped subscribers, a caller can configure RxJS to throw an unhandled error instead.\n * This will _always_ be called asynchronously on another job in the runtime. This is because\n * we do not want errors thrown in this user-configured handler to interfere with the\n * behavior of the library.\n */\n onStoppedNotification: ((notification: ObservableNotification, subscriber: Subscriber) => void) | null;\n\n /**\n * The promise constructor used by default for {@link Observable#toPromise toPromise} and {@link Observable#forEach forEach}\n * methods.\n *\n * @deprecated As of version 8, RxJS will no longer support this sort of injection of a\n * Promise constructor. If you need a Promise implementation other than native promises,\n * please polyfill/patch Promise as you see appropriate. Will be removed in v8.\n */\n Promise?: PromiseConstructorLike;\n\n /**\n * If true, turns on synchronous error rethrowing, which is a deprecated behavior\n * in v6 and higher. This behavior enables bad patterns like wrapping a subscribe\n * call in a try/catch block. It also enables producer interference, a nasty bug\n * where a multicast can be broken for all observers by a downstream consumer with\n * an unhandled error. DO NOT USE THIS FLAG UNLESS IT'S NEEDED TO BUY TIME\n * FOR MIGRATION REASONS.\n *\n * @deprecated As of version 8, RxJS will no longer support synchronous throwing\n * of unhandled errors. All errors will be thrown on a separate call stack to prevent bad\n * behaviors described above. Will be removed in v8.\n */\n useDeprecatedSynchronousErrorHandling: boolean;\n\n /**\n * If true, enables an as-of-yet undocumented feature from v5: The ability to access\n * `unsubscribe()` via `this` context in `next` functions created in observers passed\n * to `subscribe`.\n *\n * This is being removed because the performance was severely problematic, and it could also cause\n * issues when types other than POJOs are passed to subscribe as subscribers, as they will likely have\n * their `this` context overwritten.\n *\n * @deprecated As of version 8, RxJS will no longer support altering the\n * context of next functions provided as part of an observer to Subscribe. Instead,\n * you will have access to a subscription or a signal or token that will allow you to do things like\n * unsubscribe and test closed status. Will be removed in v8.\n */\n useDeprecatedNextContext: boolean;\n}\n", "import type { TimerHandle } from './timerHandle';\ntype SetTimeoutFunction = (handler: () => void, timeout?: number, ...args: any[]) => TimerHandle;\ntype ClearTimeoutFunction = (handle: TimerHandle) => void;\n\ninterface TimeoutProvider {\n setTimeout: SetTimeoutFunction;\n clearTimeout: ClearTimeoutFunction;\n delegate:\n | {\n setTimeout: SetTimeoutFunction;\n clearTimeout: ClearTimeoutFunction;\n }\n | undefined;\n}\n\nexport const timeoutProvider: TimeoutProvider = {\n // When accessing the delegate, use the variable rather than `this` so that\n // the functions can be called without being bound to the provider.\n setTimeout(handler: () => void, timeout?: number, ...args) {\n const { delegate } = timeoutProvider;\n if (delegate?.setTimeout) {\n return delegate.setTimeout(handler, timeout, ...args);\n }\n return setTimeout(handler, timeout, ...args);\n },\n clearTimeout(handle) {\n const { delegate } = timeoutProvider;\n return (delegate?.clearTimeout || clearTimeout)(handle as any);\n },\n delegate: undefined,\n};\n", "import { config } from '../config';\nimport { timeoutProvider } from '../scheduler/timeoutProvider';\n\n/**\n * Handles an error on another job either with the user-configured {@link onUnhandledError},\n * or by throwing it on that new job so it can be picked up by `window.onerror`, `process.on('error')`, etc.\n *\n * This should be called whenever there is an error that is out-of-band with the subscription\n * or when an error hits a terminal boundary of the subscription and no error handler was provided.\n *\n * @param err the error to report\n */\nexport function reportUnhandledError(err: any) {\n timeoutProvider.setTimeout(() => {\n const { onUnhandledError } = config;\n if (onUnhandledError) {\n // Execute the user-configured error handler.\n onUnhandledError(err);\n } else {\n // Throw so it is picked up by the runtime's uncaught error mechanism.\n throw err;\n }\n });\n}\n", "/* tslint:disable:no-empty */\nexport function noop() { }\n", "import { CompleteNotification, NextNotification, ErrorNotification } from './types';\n\n/**\n * A completion object optimized for memory use and created to be the\n * same \"shape\" as other notifications in v8.\n * @internal\n */\nexport const COMPLETE_NOTIFICATION = (() => createNotification('C', undefined, undefined) as CompleteNotification)();\n\n/**\n * Internal use only. Creates an optimized error notification that is the same \"shape\"\n * as other notifications.\n * @internal\n */\nexport function errorNotification(error: any): ErrorNotification {\n return createNotification('E', undefined, error) as any;\n}\n\n/**\n * Internal use only. Creates an optimized next notification that is the same \"shape\"\n * as other notifications.\n * @internal\n */\nexport function nextNotification(value: T) {\n return createNotification('N', value, undefined) as NextNotification;\n}\n\n/**\n * Ensures that all notifications created internally have the same \"shape\" in v8.\n *\n * TODO: This is only exported to support a crazy legacy test in `groupBy`.\n * @internal\n */\nexport function createNotification(kind: 'N' | 'E' | 'C', value: any, error: any) {\n return {\n kind,\n value,\n error,\n };\n}\n", "import { config } from '../config';\n\nlet context: { errorThrown: boolean; error: any } | null = null;\n\n/**\n * Handles dealing with errors for super-gross mode. Creates a context, in which\n * any synchronously thrown errors will be passed to {@link captureError}. Which\n * will record the error such that it will be rethrown after the call back is complete.\n * TODO: Remove in v8\n * @param cb An immediately executed function.\n */\nexport function errorContext(cb: () => void) {\n if (config.useDeprecatedSynchronousErrorHandling) {\n const isRoot = !context;\n if (isRoot) {\n context = { errorThrown: false, error: null };\n }\n cb();\n if (isRoot) {\n const { errorThrown, error } = context!;\n context = null;\n if (errorThrown) {\n throw error;\n }\n }\n } else {\n // This is the general non-deprecated path for everyone that\n // isn't crazy enough to use super-gross mode (useDeprecatedSynchronousErrorHandling)\n cb();\n }\n}\n\n/**\n * Captures errors only in super-gross mode.\n * @param err the error to capture\n */\nexport function captureError(err: any) {\n if (config.useDeprecatedSynchronousErrorHandling && context) {\n context.errorThrown = true;\n context.error = err;\n }\n}\n", "import { isFunction } from './util/isFunction';\nimport { Observer, ObservableNotification } from './types';\nimport { isSubscription, Subscription } from './Subscription';\nimport { config } from './config';\nimport { reportUnhandledError } from './util/reportUnhandledError';\nimport { noop } from './util/noop';\nimport { nextNotification, errorNotification, COMPLETE_NOTIFICATION } from './NotificationFactories';\nimport { timeoutProvider } from './scheduler/timeoutProvider';\nimport { captureError } from './util/errorContext';\n\n/**\n * Implements the {@link Observer} interface and extends the\n * {@link Subscription} class. While the {@link Observer} is the public API for\n * consuming the values of an {@link Observable}, all Observers get converted to\n * a Subscriber, in order to provide Subscription-like capabilities such as\n * `unsubscribe`. Subscriber is a common type in RxJS, and crucial for\n * implementing operators, but it is rarely used as a public API.\n *\n * @class Subscriber\n */\nexport class Subscriber extends Subscription implements Observer {\n /**\n * A static factory for a Subscriber, given a (potentially partial) definition\n * of an Observer.\n * @param next The `next` callback of an Observer.\n * @param error The `error` callback of an\n * Observer.\n * @param complete The `complete` callback of an\n * Observer.\n * @return A Subscriber wrapping the (partially defined)\n * Observer represented by the given arguments.\n * @nocollapse\n * @deprecated Do not use. Will be removed in v8. There is no replacement for this\n * method, and there is no reason to be creating instances of `Subscriber` directly.\n * If you have a specific use case, please file an issue.\n */\n static create(next?: (x?: T) => void, error?: (e?: any) => void, complete?: () => void): Subscriber {\n return new SafeSubscriber(next, error, complete);\n }\n\n /** @deprecated Internal implementation detail, do not use directly. Will be made internal in v8. */\n protected isStopped: boolean = false;\n /** @deprecated Internal implementation detail, do not use directly. Will be made internal in v8. */\n protected destination: Subscriber | Observer; // this `any` is the escape hatch to erase extra type param (e.g. R)\n\n /**\n * @deprecated Internal implementation detail, do not use directly. Will be made internal in v8.\n * There is no reason to directly create an instance of Subscriber. This type is exported for typings reasons.\n */\n constructor(destination?: Subscriber | Observer) {\n super();\n if (destination) {\n this.destination = destination;\n // Automatically chain subscriptions together here.\n // if destination is a Subscription, then it is a Subscriber.\n if (isSubscription(destination)) {\n destination.add(this);\n }\n } else {\n this.destination = EMPTY_OBSERVER;\n }\n }\n\n /**\n * The {@link Observer} callback to receive notifications of type `next` from\n * the Observable, with a value. The Observable may call this method 0 or more\n * times.\n * @param {T} [value] The `next` value.\n * @return {void}\n */\n next(value?: T): void {\n if (this.isStopped) {\n handleStoppedNotification(nextNotification(value), this);\n } else {\n this._next(value!);\n }\n }\n\n /**\n * The {@link Observer} callback to receive notifications of type `error` from\n * the Observable, with an attached `Error`. Notifies the Observer that\n * the Observable has experienced an error condition.\n * @param {any} [err] The `error` exception.\n * @return {void}\n */\n error(err?: any): void {\n if (this.isStopped) {\n handleStoppedNotification(errorNotification(err), this);\n } else {\n this.isStopped = true;\n this._error(err);\n }\n }\n\n /**\n * The {@link Observer} callback to receive a valueless notification of type\n * `complete` from the Observable. Notifies the Observer that the Observable\n * has finished sending push-based notifications.\n * @return {void}\n */\n complete(): void {\n if (this.isStopped) {\n handleStoppedNotification(COMPLETE_NOTIFICATION, this);\n } else {\n this.isStopped = true;\n this._complete();\n }\n }\n\n unsubscribe(): void {\n if (!this.closed) {\n this.isStopped = true;\n super.unsubscribe();\n this.destination = null!;\n }\n }\n\n protected _next(value: T): void {\n this.destination.next(value);\n }\n\n protected _error(err: any): void {\n try {\n this.destination.error(err);\n } finally {\n this.unsubscribe();\n }\n }\n\n protected _complete(): void {\n try {\n this.destination.complete();\n } finally {\n this.unsubscribe();\n }\n }\n}\n\n/**\n * This bind is captured here because we want to be able to have\n * compatibility with monoid libraries that tend to use a method named\n * `bind`. In particular, a library called Monio requires this.\n */\nconst _bind = Function.prototype.bind;\n\nfunction bind any>(fn: Fn, thisArg: any): Fn {\n return _bind.call(fn, thisArg);\n}\n\n/**\n * Internal optimization only, DO NOT EXPOSE.\n * @internal\n */\nclass ConsumerObserver implements Observer {\n constructor(private partialObserver: Partial>) {}\n\n next(value: T): void {\n const { partialObserver } = this;\n if (partialObserver.next) {\n try {\n partialObserver.next(value);\n } catch (error) {\n handleUnhandledError(error);\n }\n }\n }\n\n error(err: any): void {\n const { partialObserver } = this;\n if (partialObserver.error) {\n try {\n partialObserver.error(err);\n } catch (error) {\n handleUnhandledError(error);\n }\n } else {\n handleUnhandledError(err);\n }\n }\n\n complete(): void {\n const { partialObserver } = this;\n if (partialObserver.complete) {\n try {\n partialObserver.complete();\n } catch (error) {\n handleUnhandledError(error);\n }\n }\n }\n}\n\nexport class SafeSubscriber extends Subscriber {\n constructor(\n observerOrNext?: Partial> | ((value: T) => void) | null,\n error?: ((e?: any) => void) | null,\n complete?: (() => void) | null\n ) {\n super();\n\n let partialObserver: Partial>;\n if (isFunction(observerOrNext) || !observerOrNext) {\n // The first argument is a function, not an observer. The next\n // two arguments *could* be observers, or they could be empty.\n partialObserver = {\n next: (observerOrNext ?? undefined) as (((value: T) => void) | undefined),\n error: error ?? undefined,\n complete: complete ?? undefined,\n };\n } else {\n // The first argument is a partial observer.\n let context: any;\n if (this && config.useDeprecatedNextContext) {\n // This is a deprecated path that made `this.unsubscribe()` available in\n // next handler functions passed to subscribe. This only exists behind a flag\n // now, as it is *very* slow.\n context = Object.create(observerOrNext);\n context.unsubscribe = () => this.unsubscribe();\n partialObserver = {\n next: observerOrNext.next && bind(observerOrNext.next, context),\n error: observerOrNext.error && bind(observerOrNext.error, context),\n complete: observerOrNext.complete && bind(observerOrNext.complete, context),\n };\n } else {\n // The \"normal\" path. Just use the partial observer directly.\n partialObserver = observerOrNext;\n }\n }\n\n // Wrap the partial observer to ensure it's a full observer, and\n // make sure proper error handling is accounted for.\n this.destination = new ConsumerObserver(partialObserver);\n }\n}\n\nfunction handleUnhandledError(error: any) {\n if (config.useDeprecatedSynchronousErrorHandling) {\n captureError(error);\n } else {\n // Ideal path, we report this as an unhandled error,\n // which is thrown on a new call stack.\n reportUnhandledError(error);\n }\n}\n\n/**\n * An error handler used when no error handler was supplied\n * to the SafeSubscriber -- meaning no error handler was supplied\n * do the `subscribe` call on our observable.\n * @param err The error to handle\n */\nfunction defaultErrorHandler(err: any) {\n throw err;\n}\n\n/**\n * A handler for notifications that cannot be sent to a stopped subscriber.\n * @param notification The notification being sent\n * @param subscriber The stopped subscriber\n */\nfunction handleStoppedNotification(notification: ObservableNotification, subscriber: Subscriber) {\n const { onStoppedNotification } = config;\n onStoppedNotification && timeoutProvider.setTimeout(() => onStoppedNotification(notification, subscriber));\n}\n\n/**\n * The observer used as a stub for subscriptions where the user did not\n * pass any arguments to `subscribe`. Comes with the default error handling\n * behavior.\n */\nexport const EMPTY_OBSERVER: Readonly> & { closed: true } = {\n closed: true,\n next: noop,\n error: defaultErrorHandler,\n complete: noop,\n};\n", "/**\n * Symbol.observable or a string \"@@observable\". Used for interop\n *\n * @deprecated We will no longer be exporting this symbol in upcoming versions of RxJS.\n * Instead polyfill and use Symbol.observable directly *or* use https://www.npmjs.com/package/symbol-observable\n */\nexport const observable: string | symbol = (() => (typeof Symbol === 'function' && Symbol.observable) || '@@observable')();\n", "/**\n * This function takes one parameter and just returns it. Simply put,\n * this is like `(x: T): T => x`.\n *\n * ## Examples\n *\n * This is useful in some cases when using things like `mergeMap`\n *\n * ```ts\n * import { interval, take, map, range, mergeMap, identity } from 'rxjs';\n *\n * const source$ = interval(1000).pipe(take(5));\n *\n * const result$ = source$.pipe(\n * map(i => range(i)),\n * mergeMap(identity) // same as mergeMap(x => x)\n * );\n *\n * result$.subscribe({\n * next: console.log\n * });\n * ```\n *\n * Or when you want to selectively apply an operator\n *\n * ```ts\n * import { interval, take, identity } from 'rxjs';\n *\n * const shouldLimit = () => Math.random() < 0.5;\n *\n * const source$ = interval(1000);\n *\n * const result$ = source$.pipe(shouldLimit() ? take(5) : identity);\n *\n * result$.subscribe({\n * next: console.log\n * });\n * ```\n *\n * @param x Any value that is returned by this function\n * @returns The value passed as the first parameter to this function\n */\nexport function identity(x: T): T {\n return x;\n}\n", "import { identity } from './identity';\nimport { UnaryFunction } from '../types';\n\nexport function pipe(): typeof identity;\nexport function pipe(fn1: UnaryFunction): UnaryFunction;\nexport function pipe(fn1: UnaryFunction, fn2: UnaryFunction): UnaryFunction;\nexport function pipe(fn1: UnaryFunction, fn2: UnaryFunction, fn3: UnaryFunction): UnaryFunction;\nexport function pipe(\n fn1: UnaryFunction,\n fn2: UnaryFunction,\n fn3: UnaryFunction,\n fn4: UnaryFunction\n): UnaryFunction;\nexport function pipe(\n fn1: UnaryFunction,\n fn2: UnaryFunction,\n fn3: UnaryFunction,\n fn4: UnaryFunction,\n fn5: UnaryFunction\n): UnaryFunction;\nexport function pipe(\n fn1: UnaryFunction,\n fn2: UnaryFunction,\n fn3: UnaryFunction,\n fn4: UnaryFunction,\n fn5: UnaryFunction,\n fn6: UnaryFunction\n): UnaryFunction;\nexport function pipe(\n fn1: UnaryFunction,\n fn2: UnaryFunction,\n fn3: UnaryFunction,\n fn4: UnaryFunction,\n fn5: UnaryFunction,\n fn6: UnaryFunction,\n fn7: UnaryFunction\n): UnaryFunction;\nexport function pipe(\n fn1: UnaryFunction,\n fn2: UnaryFunction,\n fn3: UnaryFunction,\n fn4: UnaryFunction,\n fn5: UnaryFunction,\n fn6: UnaryFunction,\n fn7: UnaryFunction,\n fn8: UnaryFunction\n): UnaryFunction;\nexport function pipe(\n fn1: UnaryFunction,\n fn2: UnaryFunction,\n fn3: UnaryFunction,\n fn4: UnaryFunction,\n fn5: UnaryFunction,\n fn6: UnaryFunction,\n fn7: UnaryFunction,\n fn8: UnaryFunction,\n fn9: UnaryFunction\n): UnaryFunction;\nexport function pipe(\n fn1: UnaryFunction,\n fn2: UnaryFunction,\n fn3: UnaryFunction,\n fn4: UnaryFunction,\n fn5: UnaryFunction,\n fn6: UnaryFunction,\n fn7: UnaryFunction,\n fn8: UnaryFunction,\n fn9: UnaryFunction,\n ...fns: UnaryFunction[]\n): UnaryFunction;\n\n/**\n * pipe() can be called on one or more functions, each of which can take one argument (\"UnaryFunction\")\n * and uses it to return a value.\n * It returns a function that takes one argument, passes it to the first UnaryFunction, and then\n * passes the result to the next one, passes that result to the next one, and so on. \n */\nexport function pipe(...fns: Array>): UnaryFunction {\n return pipeFromArray(fns);\n}\n\n/** @internal */\nexport function pipeFromArray(fns: Array>): UnaryFunction {\n if (fns.length === 0) {\n return identity as UnaryFunction;\n }\n\n if (fns.length === 1) {\n return fns[0];\n }\n\n return function piped(input: T): R {\n return fns.reduce((prev: any, fn: UnaryFunction) => fn(prev), input as any);\n };\n}\n", "import { Operator } from './Operator';\nimport { SafeSubscriber, Subscriber } from './Subscriber';\nimport { isSubscription, Subscription } from './Subscription';\nimport { TeardownLogic, OperatorFunction, Subscribable, Observer } from './types';\nimport { observable as Symbol_observable } from './symbol/observable';\nimport { pipeFromArray } from './util/pipe';\nimport { config } from './config';\nimport { isFunction } from './util/isFunction';\nimport { errorContext } from './util/errorContext';\n\n/**\n * A representation of any set of values over any amount of time. This is the most basic building block\n * of RxJS.\n *\n * @class Observable\n */\nexport class Observable implements Subscribable {\n /**\n * @deprecated Internal implementation detail, do not use directly. Will be made internal in v8.\n */\n source: Observable | undefined;\n\n /**\n * @deprecated Internal implementation detail, do not use directly. Will be made internal in v8.\n */\n operator: Operator | undefined;\n\n /**\n * @constructor\n * @param {Function} subscribe the function that is called when the Observable is\n * initially subscribed to. This function is given a Subscriber, to which new values\n * can be `next`ed, or an `error` method can be called to raise an error, or\n * `complete` can be called to notify of a successful completion.\n */\n constructor(subscribe?: (this: Observable, subscriber: Subscriber) => TeardownLogic) {\n if (subscribe) {\n this._subscribe = subscribe;\n }\n }\n\n // HACK: Since TypeScript inherits static properties too, we have to\n // fight against TypeScript here so Subject can have a different static create signature\n /**\n * Creates a new Observable by calling the Observable constructor\n * @owner Observable\n * @method create\n * @param {Function} subscribe? the subscriber function to be passed to the Observable constructor\n * @return {Observable} a new observable\n * @nocollapse\n * @deprecated Use `new Observable()` instead. Will be removed in v8.\n */\n static create: (...args: any[]) => any = (subscribe?: (subscriber: Subscriber) => TeardownLogic) => {\n return new Observable(subscribe);\n };\n\n /**\n * Creates a new Observable, with this Observable instance as the source, and the passed\n * operator defined as the new observable's operator.\n * @method lift\n * @param operator the operator defining the operation to take on the observable\n * @return a new observable with the Operator applied\n * @deprecated Internal implementation detail, do not use directly. Will be made internal in v8.\n * If you have implemented an operator using `lift`, it is recommended that you create an\n * operator by simply returning `new Observable()` directly. See \"Creating new operators from\n * scratch\" section here: https://rxjs.dev/guide/operators\n */\n lift(operator?: Operator): Observable {\n const observable = new Observable();\n observable.source = this;\n observable.operator = operator;\n return observable;\n }\n\n subscribe(observerOrNext?: Partial> | ((value: T) => void)): Subscription;\n /** @deprecated Instead of passing separate callback arguments, use an observer argument. Signatures taking separate callback arguments will be removed in v8. Details: https://rxjs.dev/deprecations/subscribe-arguments */\n subscribe(next?: ((value: T) => void) | null, error?: ((error: any) => void) | null, complete?: (() => void) | null): Subscription;\n /**\n * Invokes an execution of an Observable and registers Observer handlers for notifications it will emit.\n *\n * Use it when you have all these Observables, but still nothing is happening.\n *\n * `subscribe` is not a regular operator, but a method that calls Observable's internal `subscribe` function. It\n * might be for example a function that you passed to Observable's constructor, but most of the time it is\n * a library implementation, which defines what will be emitted by an Observable, and when it be will emitted. This means\n * that calling `subscribe` is actually the moment when Observable starts its work, not when it is created, as it is often\n * the thought.\n *\n * Apart from starting the execution of an Observable, this method allows you to listen for values\n * that an Observable emits, as well as for when it completes or errors. You can achieve this in two\n * of the following ways.\n *\n * The first way is creating an object that implements {@link Observer} interface. It should have methods\n * defined by that interface, but note that it should be just a regular JavaScript object, which you can create\n * yourself in any way you want (ES6 class, classic function constructor, object literal etc.). In particular, do\n * not attempt to use any RxJS implementation details to create Observers - you don't need them. Remember also\n * that your object does not have to implement all methods. If you find yourself creating a method that doesn't\n * do anything, you can simply omit it. Note however, if the `error` method is not provided and an error happens,\n * it will be thrown asynchronously. Errors thrown asynchronously cannot be caught using `try`/`catch`. Instead,\n * use the {@link onUnhandledError} configuration option or use a runtime handler (like `window.onerror` or\n * `process.on('error)`) to be notified of unhandled errors. Because of this, it's recommended that you provide\n * an `error` method to avoid missing thrown errors.\n *\n * The second way is to give up on Observer object altogether and simply provide callback functions in place of its methods.\n * This means you can provide three functions as arguments to `subscribe`, where the first function is equivalent\n * of a `next` method, the second of an `error` method and the third of a `complete` method. Just as in case of an Observer,\n * if you do not need to listen for something, you can omit a function by passing `undefined` or `null`,\n * since `subscribe` recognizes these functions by where they were placed in function call. When it comes\n * to the `error` function, as with an Observer, if not provided, errors emitted by an Observable will be thrown asynchronously.\n *\n * You can, however, subscribe with no parameters at all. This may be the case where you're not interested in terminal events\n * and you also handled emissions internally by using operators (e.g. using `tap`).\n *\n * Whichever style of calling `subscribe` you use, in both cases it returns a Subscription object.\n * This object allows you to call `unsubscribe` on it, which in turn will stop the work that an Observable does and will clean\n * up all resources that an Observable used. Note that cancelling a subscription will not call `complete` callback\n * provided to `subscribe` function, which is reserved for a regular completion signal that comes from an Observable.\n *\n * Remember that callbacks provided to `subscribe` are not guaranteed to be called asynchronously.\n * It is an Observable itself that decides when these functions will be called. For example {@link of}\n * by default emits all its values synchronously. Always check documentation for how given Observable\n * will behave when subscribed and if its default behavior can be modified with a `scheduler`.\n *\n * #### Examples\n *\n * Subscribe with an {@link guide/observer Observer}\n *\n * ```ts\n * import { of } from 'rxjs';\n *\n * const sumObserver = {\n * sum: 0,\n * next(value) {\n * console.log('Adding: ' + value);\n * this.sum = this.sum + value;\n * },\n * error() {\n * // We actually could just remove this method,\n * // since we do not really care about errors right now.\n * },\n * complete() {\n * console.log('Sum equals: ' + this.sum);\n * }\n * };\n *\n * of(1, 2, 3) // Synchronously emits 1, 2, 3 and then completes.\n * .subscribe(sumObserver);\n *\n * // Logs:\n * // 'Adding: 1'\n * // 'Adding: 2'\n * // 'Adding: 3'\n * // 'Sum equals: 6'\n * ```\n *\n * Subscribe with functions ({@link deprecations/subscribe-arguments deprecated})\n *\n * ```ts\n * import { of } from 'rxjs'\n *\n * let sum = 0;\n *\n * of(1, 2, 3).subscribe(\n * value => {\n * console.log('Adding: ' + value);\n * sum = sum + value;\n * },\n * undefined,\n * () => console.log('Sum equals: ' + sum)\n * );\n *\n * // Logs:\n * // 'Adding: 1'\n * // 'Adding: 2'\n * // 'Adding: 3'\n * // 'Sum equals: 6'\n * ```\n *\n * Cancel a subscription\n *\n * ```ts\n * import { interval } from 'rxjs';\n *\n * const subscription = interval(1000).subscribe({\n * next(num) {\n * console.log(num)\n * },\n * complete() {\n * // Will not be called, even when cancelling subscription.\n * console.log('completed!');\n * }\n * });\n *\n * setTimeout(() => {\n * subscription.unsubscribe();\n * console.log('unsubscribed!');\n * }, 2500);\n *\n * // Logs:\n * // 0 after 1s\n * // 1 after 2s\n * // 'unsubscribed!' after 2.5s\n * ```\n *\n * @param {Observer|Function} observerOrNext (optional) Either an observer with methods to be called,\n * or the first of three possible handlers, which is the handler for each value emitted from the subscribed\n * Observable.\n * @param {Function} error (optional) A handler for a terminal event resulting from an error. If no error handler is provided,\n * the error will be thrown asynchronously as unhandled.\n * @param {Function} complete (optional) A handler for a terminal event resulting from successful completion.\n * @return {Subscription} a subscription reference to the registered handlers\n * @method subscribe\n */\n subscribe(\n observerOrNext?: Partial> | ((value: T) => void) | null,\n error?: ((error: any) => void) | null,\n complete?: (() => void) | null\n ): Subscription {\n const subscriber = isSubscriber(observerOrNext) ? observerOrNext : new SafeSubscriber(observerOrNext, error, complete);\n\n errorContext(() => {\n const { operator, source } = this;\n subscriber.add(\n operator\n ? // We're dealing with a subscription in the\n // operator chain to one of our lifted operators.\n operator.call(subscriber, source)\n : source\n ? // If `source` has a value, but `operator` does not, something that\n // had intimate knowledge of our API, like our `Subject`, must have\n // set it. We're going to just call `_subscribe` directly.\n this._subscribe(subscriber)\n : // In all other cases, we're likely wrapping a user-provided initializer\n // function, so we need to catch errors and handle them appropriately.\n this._trySubscribe(subscriber)\n );\n });\n\n return subscriber;\n }\n\n /** @internal */\n protected _trySubscribe(sink: Subscriber): TeardownLogic {\n try {\n return this._subscribe(sink);\n } catch (err) {\n // We don't need to return anything in this case,\n // because it's just going to try to `add()` to a subscription\n // above.\n sink.error(err);\n }\n }\n\n /**\n * Used as a NON-CANCELLABLE means of subscribing to an observable, for use with\n * APIs that expect promises, like `async/await`. You cannot unsubscribe from this.\n *\n * **WARNING**: Only use this with observables you *know* will complete. If the source\n * observable does not complete, you will end up with a promise that is hung up, and\n * potentially all of the state of an async function hanging out in memory. To avoid\n * this situation, look into adding something like {@link timeout}, {@link take},\n * {@link takeWhile}, or {@link takeUntil} amongst others.\n *\n * #### Example\n *\n * ```ts\n * import { interval, take } from 'rxjs';\n *\n * const source$ = interval(1000).pipe(take(4));\n *\n * async function getTotal() {\n * let total = 0;\n *\n * await source$.forEach(value => {\n * total += value;\n * console.log('observable -> ' + value);\n * });\n *\n * return total;\n * }\n *\n * getTotal().then(\n * total => console.log('Total: ' + total)\n * );\n *\n * // Expected:\n * // 'observable -> 0'\n * // 'observable -> 1'\n * // 'observable -> 2'\n * // 'observable -> 3'\n * // 'Total: 6'\n * ```\n *\n * @param next a handler for each value emitted by the observable\n * @return a promise that either resolves on observable completion or\n * rejects with the handled error\n */\n forEach(next: (value: T) => void): Promise;\n\n /**\n * @param next a handler for each value emitted by the observable\n * @param promiseCtor a constructor function used to instantiate the Promise\n * @return a promise that either resolves on observable completion or\n * rejects with the handled error\n * @deprecated Passing a Promise constructor will no longer be available\n * in upcoming versions of RxJS. This is because it adds weight to the library, for very\n * little benefit. If you need this functionality, it is recommended that you either\n * polyfill Promise, or you create an adapter to convert the returned native promise\n * to whatever promise implementation you wanted. Will be removed in v8.\n */\n forEach(next: (value: T) => void, promiseCtor: PromiseConstructorLike): Promise;\n\n forEach(next: (value: T) => void, promiseCtor?: PromiseConstructorLike): Promise {\n promiseCtor = getPromiseCtor(promiseCtor);\n\n return new promiseCtor((resolve, reject) => {\n const subscriber = new SafeSubscriber({\n next: (value) => {\n try {\n next(value);\n } catch (err) {\n reject(err);\n subscriber.unsubscribe();\n }\n },\n error: reject,\n complete: resolve,\n });\n this.subscribe(subscriber);\n }) as Promise;\n }\n\n /** @internal */\n protected _subscribe(subscriber: Subscriber): TeardownLogic {\n return this.source?.subscribe(subscriber);\n }\n\n /**\n * An interop point defined by the es7-observable spec https://github.com/zenparsing/es-observable\n * @method Symbol.observable\n * @return {Observable} this instance of the observable\n */\n [Symbol_observable]() {\n return this;\n }\n\n /* tslint:disable:max-line-length */\n pipe(): Observable;\n pipe(op1: OperatorFunction): Observable;\n pipe(op1: OperatorFunction, op2: OperatorFunction): Observable;\n pipe(op1: OperatorFunction, op2: OperatorFunction, op3: OperatorFunction): Observable;\n pipe(\n op1: OperatorFunction,\n op2: OperatorFunction,\n op3: OperatorFunction,\n op4: OperatorFunction\n ): Observable;\n pipe(\n op1: OperatorFunction,\n op2: OperatorFunction,\n op3: OperatorFunction,\n op4: OperatorFunction,\n op5: OperatorFunction\n ): Observable;\n pipe(\n op1: OperatorFunction,\n op2: OperatorFunction,\n op3: OperatorFunction,\n op4: OperatorFunction,\n op5: OperatorFunction,\n op6: OperatorFunction\n ): Observable;\n pipe(\n op1: OperatorFunction,\n op2: OperatorFunction,\n op3: OperatorFunction,\n op4: OperatorFunction,\n op5: OperatorFunction,\n op6: OperatorFunction,\n op7: OperatorFunction\n ): Observable;\n pipe(\n op1: OperatorFunction,\n op2: OperatorFunction,\n op3: OperatorFunction,\n op4: OperatorFunction,\n op5: OperatorFunction,\n op6: OperatorFunction,\n op7: OperatorFunction,\n op8: OperatorFunction\n ): Observable;\n pipe(\n op1: OperatorFunction,\n op2: OperatorFunction,\n op3: OperatorFunction,\n op4: OperatorFunction,\n op5: OperatorFunction,\n op6: OperatorFunction,\n op7: OperatorFunction,\n op8: OperatorFunction,\n op9: OperatorFunction\n ): Observable;\n pipe(\n op1: OperatorFunction,\n op2: OperatorFunction,\n op3: OperatorFunction,\n op4: OperatorFunction,\n op5: OperatorFunction,\n op6: OperatorFunction,\n op7: OperatorFunction,\n op8: OperatorFunction,\n op9: OperatorFunction,\n ...operations: OperatorFunction[]\n ): Observable;\n /* tslint:enable:max-line-length */\n\n /**\n * Used to stitch together functional operators into a chain.\n * @method pipe\n * @return {Observable} the Observable result of all of the operators having\n * been called in the order they were passed in.\n *\n * ## Example\n *\n * ```ts\n * import { interval, filter, map, scan } from 'rxjs';\n *\n * interval(1000)\n * .pipe(\n * filter(x => x % 2 === 0),\n * map(x => x + x),\n * scan((acc, x) => acc + x)\n * )\n * .subscribe(x => console.log(x));\n * ```\n */\n pipe(...operations: OperatorFunction[]): Observable {\n return pipeFromArray(operations)(this);\n }\n\n /* tslint:disable:max-line-length */\n /** @deprecated Replaced with {@link firstValueFrom} and {@link lastValueFrom}. Will be removed in v8. Details: https://rxjs.dev/deprecations/to-promise */\n toPromise(): Promise;\n /** @deprecated Replaced with {@link firstValueFrom} and {@link lastValueFrom}. Will be removed in v8. Details: https://rxjs.dev/deprecations/to-promise */\n toPromise(PromiseCtor: typeof Promise): Promise;\n /** @deprecated Replaced with {@link firstValueFrom} and {@link lastValueFrom}. Will be removed in v8. Details: https://rxjs.dev/deprecations/to-promise */\n toPromise(PromiseCtor: PromiseConstructorLike): Promise;\n /* tslint:enable:max-line-length */\n\n /**\n * Subscribe to this Observable and get a Promise resolving on\n * `complete` with the last emission (if any).\n *\n * **WARNING**: Only use this with observables you *know* will complete. If the source\n * observable does not complete, you will end up with a promise that is hung up, and\n * potentially all of the state of an async function hanging out in memory. To avoid\n * this situation, look into adding something like {@link timeout}, {@link take},\n * {@link takeWhile}, or {@link takeUntil} amongst others.\n *\n * @method toPromise\n * @param [promiseCtor] a constructor function used to instantiate\n * the Promise\n * @return A Promise that resolves with the last value emit, or\n * rejects on an error. If there were no emissions, Promise\n * resolves with undefined.\n * @deprecated Replaced with {@link firstValueFrom} and {@link lastValueFrom}. Will be removed in v8. Details: https://rxjs.dev/deprecations/to-promise\n */\n toPromise(promiseCtor?: PromiseConstructorLike): Promise {\n promiseCtor = getPromiseCtor(promiseCtor);\n\n return new promiseCtor((resolve, reject) => {\n let value: T | undefined;\n this.subscribe(\n (x: T) => (value = x),\n (err: any) => reject(err),\n () => resolve(value)\n );\n }) as Promise;\n }\n}\n\n/**\n * Decides between a passed promise constructor from consuming code,\n * A default configured promise constructor, and the native promise\n * constructor and returns it. If nothing can be found, it will throw\n * an error.\n * @param promiseCtor The optional promise constructor to passed by consuming code\n */\nfunction getPromiseCtor(promiseCtor: PromiseConstructorLike | undefined) {\n return promiseCtor ?? config.Promise ?? Promise;\n}\n\nfunction isObserver(value: any): value is Observer {\n return value && isFunction(value.next) && isFunction(value.error) && isFunction(value.complete);\n}\n\nfunction isSubscriber(value: any): value is Subscriber {\n return (value && value instanceof Subscriber) || (isObserver(value) && isSubscription(value));\n}\n", "import { Observable } from '../Observable';\nimport { Subscriber } from '../Subscriber';\nimport { OperatorFunction } from '../types';\nimport { isFunction } from './isFunction';\n\n/**\n * Used to determine if an object is an Observable with a lift function.\n */\nexport function hasLift(source: any): source is { lift: InstanceType['lift'] } {\n return isFunction(source?.lift);\n}\n\n/**\n * Creates an `OperatorFunction`. Used to define operators throughout the library in a concise way.\n * @param init The logic to connect the liftedSource to the subscriber at the moment of subscription.\n */\nexport function operate(\n init: (liftedSource: Observable, subscriber: Subscriber) => (() => void) | void\n): OperatorFunction {\n return (source: Observable) => {\n if (hasLift(source)) {\n return source.lift(function (this: Subscriber, liftedSource: Observable) {\n try {\n return init(liftedSource, this);\n } catch (err) {\n this.error(err);\n }\n });\n }\n throw new TypeError('Unable to lift unknown Observable type');\n };\n}\n", "import { Subscriber } from '../Subscriber';\n\n/**\n * Creates an instance of an `OperatorSubscriber`.\n * @param destination The downstream subscriber.\n * @param onNext Handles next values, only called if this subscriber is not stopped or closed. Any\n * error that occurs in this function is caught and sent to the `error` method of this subscriber.\n * @param onError Handles errors from the subscription, any errors that occur in this handler are caught\n * and send to the `destination` error handler.\n * @param onComplete Handles completion notification from the subscription. Any errors that occur in\n * this handler are sent to the `destination` error handler.\n * @param onFinalize Additional teardown logic here. This will only be called on teardown if the\n * subscriber itself is not already closed. This is called after all other teardown logic is executed.\n */\nexport function createOperatorSubscriber(\n destination: Subscriber,\n onNext?: (value: T) => void,\n onComplete?: () => void,\n onError?: (err: any) => void,\n onFinalize?: () => void\n): Subscriber {\n return new OperatorSubscriber(destination, onNext, onComplete, onError, onFinalize);\n}\n\n/**\n * A generic helper for allowing operators to be created with a Subscriber and\n * use closures to capture necessary state from the operator function itself.\n */\nexport class OperatorSubscriber extends Subscriber {\n /**\n * Creates an instance of an `OperatorSubscriber`.\n * @param destination The downstream subscriber.\n * @param onNext Handles next values, only called if this subscriber is not stopped or closed. Any\n * error that occurs in this function is caught and sent to the `error` method of this subscriber.\n * @param onError Handles errors from the subscription, any errors that occur in this handler are caught\n * and send to the `destination` error handler.\n * @param onComplete Handles completion notification from the subscription. Any errors that occur in\n * this handler are sent to the `destination` error handler.\n * @param onFinalize Additional finalization logic here. This will only be called on finalization if the\n * subscriber itself is not already closed. This is called after all other finalization logic is executed.\n * @param shouldUnsubscribe An optional check to see if an unsubscribe call should truly unsubscribe.\n * NOTE: This currently **ONLY** exists to support the strange behavior of {@link groupBy}, where unsubscription\n * to the resulting observable does not actually disconnect from the source if there are active subscriptions\n * to any grouped observable. (DO NOT EXPOSE OR USE EXTERNALLY!!!)\n */\n constructor(\n destination: Subscriber,\n onNext?: (value: T) => void,\n onComplete?: () => void,\n onError?: (err: any) => void,\n private onFinalize?: () => void,\n private shouldUnsubscribe?: () => boolean\n ) {\n // It's important - for performance reasons - that all of this class's\n // members are initialized and that they are always initialized in the same\n // order. This will ensure that all OperatorSubscriber instances have the\n // same hidden class in V8. This, in turn, will help keep the number of\n // hidden classes involved in property accesses within the base class as\n // low as possible. If the number of hidden classes involved exceeds four,\n // the property accesses will become megamorphic and performance penalties\n // will be incurred - i.e. inline caches won't be used.\n //\n // The reasons for ensuring all instances have the same hidden class are\n // further discussed in this blog post from Benedikt Meurer:\n // https://benediktmeurer.de/2018/03/23/impact-of-polymorphism-on-component-based-frameworks-like-react/\n super(destination);\n this._next = onNext\n ? function (this: OperatorSubscriber, value: T) {\n try {\n onNext(value);\n } catch (err) {\n destination.error(err);\n }\n }\n : super._next;\n this._error = onError\n ? function (this: OperatorSubscriber, err: any) {\n try {\n onError(err);\n } catch (err) {\n // Send any errors that occur down stream.\n destination.error(err);\n } finally {\n // Ensure finalization.\n this.unsubscribe();\n }\n }\n : super._error;\n this._complete = onComplete\n ? function (this: OperatorSubscriber) {\n try {\n onComplete();\n } catch (err) {\n // Send any errors that occur down stream.\n destination.error(err);\n } finally {\n // Ensure finalization.\n this.unsubscribe();\n }\n }\n : super._complete;\n }\n\n unsubscribe() {\n if (!this.shouldUnsubscribe || this.shouldUnsubscribe()) {\n const { closed } = this;\n super.unsubscribe();\n // Execute additional teardown if we have any and we didn't already do so.\n !closed && this.onFinalize?.();\n }\n }\n}\n", "import { Subscription } from '../Subscription';\n\ninterface AnimationFrameProvider {\n schedule(callback: FrameRequestCallback): Subscription;\n requestAnimationFrame: typeof requestAnimationFrame;\n cancelAnimationFrame: typeof cancelAnimationFrame;\n delegate:\n | {\n requestAnimationFrame: typeof requestAnimationFrame;\n cancelAnimationFrame: typeof cancelAnimationFrame;\n }\n | undefined;\n}\n\nexport const animationFrameProvider: AnimationFrameProvider = {\n // When accessing the delegate, use the variable rather than `this` so that\n // the functions can be called without being bound to the provider.\n schedule(callback) {\n let request = requestAnimationFrame;\n let cancel: typeof cancelAnimationFrame | undefined = cancelAnimationFrame;\n const { delegate } = animationFrameProvider;\n if (delegate) {\n request = delegate.requestAnimationFrame;\n cancel = delegate.cancelAnimationFrame;\n }\n const handle = request((timestamp) => {\n // Clear the cancel function. The request has been fulfilled, so\n // attempting to cancel the request upon unsubscription would be\n // pointless.\n cancel = undefined;\n callback(timestamp);\n });\n return new Subscription(() => cancel?.(handle));\n },\n requestAnimationFrame(...args) {\n const { delegate } = animationFrameProvider;\n return (delegate?.requestAnimationFrame || requestAnimationFrame)(...args);\n },\n cancelAnimationFrame(...args) {\n const { delegate } = animationFrameProvider;\n return (delegate?.cancelAnimationFrame || cancelAnimationFrame)(...args);\n },\n delegate: undefined,\n};\n", "import { createErrorClass } from './createErrorClass';\n\nexport interface ObjectUnsubscribedError extends Error {}\n\nexport interface ObjectUnsubscribedErrorCtor {\n /**\n * @deprecated Internal implementation detail. Do not construct error instances.\n * Cannot be tagged as internal: https://github.com/ReactiveX/rxjs/issues/6269\n */\n new (): ObjectUnsubscribedError;\n}\n\n/**\n * An error thrown when an action is invalid because the object has been\n * unsubscribed.\n *\n * @see {@link Subject}\n * @see {@link BehaviorSubject}\n *\n * @class ObjectUnsubscribedError\n */\nexport const ObjectUnsubscribedError: ObjectUnsubscribedErrorCtor = createErrorClass(\n (_super) =>\n function ObjectUnsubscribedErrorImpl(this: any) {\n _super(this);\n this.name = 'ObjectUnsubscribedError';\n this.message = 'object unsubscribed';\n }\n);\n", "import { Operator } from './Operator';\nimport { Observable } from './Observable';\nimport { Subscriber } from './Subscriber';\nimport { Subscription, EMPTY_SUBSCRIPTION } from './Subscription';\nimport { Observer, SubscriptionLike, TeardownLogic } from './types';\nimport { ObjectUnsubscribedError } from './util/ObjectUnsubscribedError';\nimport { arrRemove } from './util/arrRemove';\nimport { errorContext } from './util/errorContext';\n\n/**\n * A Subject is a special type of Observable that allows values to be\n * multicasted to many Observers. Subjects are like EventEmitters.\n *\n * Every Subject is an Observable and an Observer. You can subscribe to a\n * Subject, and you can call next to feed values as well as error and complete.\n */\nexport class Subject extends Observable implements SubscriptionLike {\n closed = false;\n\n private currentObservers: Observer[] | null = null;\n\n /** @deprecated Internal implementation detail, do not use directly. Will be made internal in v8. */\n observers: Observer[] = [];\n /** @deprecated Internal implementation detail, do not use directly. Will be made internal in v8. */\n isStopped = false;\n /** @deprecated Internal implementation detail, do not use directly. Will be made internal in v8. */\n hasError = false;\n /** @deprecated Internal implementation detail, do not use directly. Will be made internal in v8. */\n thrownError: any = null;\n\n /**\n * Creates a \"subject\" by basically gluing an observer to an observable.\n *\n * @nocollapse\n * @deprecated Recommended you do not use. Will be removed at some point in the future. Plans for replacement still under discussion.\n */\n static create: (...args: any[]) => any = (destination: Observer, source: Observable): AnonymousSubject => {\n return new AnonymousSubject(destination, source);\n };\n\n constructor() {\n // NOTE: This must be here to obscure Observable's constructor.\n super();\n }\n\n /** @deprecated Internal implementation detail, do not use directly. Will be made internal in v8. */\n lift(operator: Operator): Observable {\n const subject = new AnonymousSubject(this, this);\n subject.operator = operator as any;\n return subject as any;\n }\n\n /** @internal */\n protected _throwIfClosed() {\n if (this.closed) {\n throw new ObjectUnsubscribedError();\n }\n }\n\n next(value: T) {\n errorContext(() => {\n this._throwIfClosed();\n if (!this.isStopped) {\n if (!this.currentObservers) {\n this.currentObservers = Array.from(this.observers);\n }\n for (const observer of this.currentObservers) {\n observer.next(value);\n }\n }\n });\n }\n\n error(err: any) {\n errorContext(() => {\n this._throwIfClosed();\n if (!this.isStopped) {\n this.hasError = this.isStopped = true;\n this.thrownError = err;\n const { observers } = this;\n while (observers.length) {\n observers.shift()!.error(err);\n }\n }\n });\n }\n\n complete() {\n errorContext(() => {\n this._throwIfClosed();\n if (!this.isStopped) {\n this.isStopped = true;\n const { observers } = this;\n while (observers.length) {\n observers.shift()!.complete();\n }\n }\n });\n }\n\n unsubscribe() {\n this.isStopped = this.closed = true;\n this.observers = this.currentObservers = null!;\n }\n\n get observed() {\n return this.observers?.length > 0;\n }\n\n /** @internal */\n protected _trySubscribe(subscriber: Subscriber): TeardownLogic {\n this._throwIfClosed();\n return super._trySubscribe(subscriber);\n }\n\n /** @internal */\n protected _subscribe(subscriber: Subscriber): Subscription {\n this._throwIfClosed();\n this._checkFinalizedStatuses(subscriber);\n return this._innerSubscribe(subscriber);\n }\n\n /** @internal */\n protected _innerSubscribe(subscriber: Subscriber) {\n const { hasError, isStopped, observers } = this;\n if (hasError || isStopped) {\n return EMPTY_SUBSCRIPTION;\n }\n this.currentObservers = null;\n observers.push(subscriber);\n return new Subscription(() => {\n this.currentObservers = null;\n arrRemove(observers, subscriber);\n });\n }\n\n /** @internal */\n protected _checkFinalizedStatuses(subscriber: Subscriber) {\n const { hasError, thrownError, isStopped } = this;\n if (hasError) {\n subscriber.error(thrownError);\n } else if (isStopped) {\n subscriber.complete();\n }\n }\n\n /**\n * Creates a new Observable with this Subject as the source. You can do this\n * to create custom Observer-side logic of the Subject and conceal it from\n * code that uses the Observable.\n * @return {Observable} Observable that the Subject casts to\n */\n asObservable(): Observable {\n const observable: any = new Observable();\n observable.source = this;\n return observable;\n }\n}\n\n/**\n * @class AnonymousSubject\n */\nexport class AnonymousSubject extends Subject {\n constructor(\n /** @deprecated Internal implementation detail, do not use directly. Will be made internal in v8. */\n public destination?: Observer,\n source?: Observable\n ) {\n super();\n this.source = source;\n }\n\n next(value: T) {\n this.destination?.next?.(value);\n }\n\n error(err: any) {\n this.destination?.error?.(err);\n }\n\n complete() {\n this.destination?.complete?.();\n }\n\n /** @internal */\n protected _subscribe(subscriber: Subscriber): Subscription {\n return this.source?.subscribe(subscriber) ?? EMPTY_SUBSCRIPTION;\n }\n}\n", "import { Subject } from './Subject';\nimport { Subscriber } from './Subscriber';\nimport { Subscription } from './Subscription';\n\n/**\n * A variant of Subject that requires an initial value and emits its current\n * value whenever it is subscribed to.\n *\n * @class BehaviorSubject\n */\nexport class BehaviorSubject extends Subject {\n constructor(private _value: T) {\n super();\n }\n\n get value(): T {\n return this.getValue();\n }\n\n /** @internal */\n protected _subscribe(subscriber: Subscriber): Subscription {\n const subscription = super._subscribe(subscriber);\n !subscription.closed && subscriber.next(this._value);\n return subscription;\n }\n\n getValue(): T {\n const { hasError, thrownError, _value } = this;\n if (hasError) {\n throw thrownError;\n }\n this._throwIfClosed();\n return _value;\n }\n\n next(value: T): void {\n super.next((this._value = value));\n }\n}\n", "import { TimestampProvider } from '../types';\n\ninterface DateTimestampProvider extends TimestampProvider {\n delegate: TimestampProvider | undefined;\n}\n\nexport const dateTimestampProvider: DateTimestampProvider = {\n now() {\n // Use the variable rather than `this` so that the function can be called\n // without being bound to the provider.\n return (dateTimestampProvider.delegate || Date).now();\n },\n delegate: undefined,\n};\n", "import { Subject } from './Subject';\nimport { TimestampProvider } from './types';\nimport { Subscriber } from './Subscriber';\nimport { Subscription } from './Subscription';\nimport { dateTimestampProvider } from './scheduler/dateTimestampProvider';\n\n/**\n * A variant of {@link Subject} that \"replays\" old values to new subscribers by emitting them when they first subscribe.\n *\n * `ReplaySubject` has an internal buffer that will store a specified number of values that it has observed. Like `Subject`,\n * `ReplaySubject` \"observes\" values by having them passed to its `next` method. When it observes a value, it will store that\n * value for a time determined by the configuration of the `ReplaySubject`, as passed to its constructor.\n *\n * When a new subscriber subscribes to the `ReplaySubject` instance, it will synchronously emit all values in its buffer in\n * a First-In-First-Out (FIFO) manner. The `ReplaySubject` will also complete, if it has observed completion; and it will\n * error if it has observed an error.\n *\n * There are two main configuration items to be concerned with:\n *\n * 1. `bufferSize` - This will determine how many items are stored in the buffer, defaults to infinite.\n * 2. `windowTime` - The amount of time to hold a value in the buffer before removing it from the buffer.\n *\n * Both configurations may exist simultaneously. So if you would like to buffer a maximum of 3 values, as long as the values\n * are less than 2 seconds old, you could do so with a `new ReplaySubject(3, 2000)`.\n *\n * ### Differences with BehaviorSubject\n *\n * `BehaviorSubject` is similar to `new ReplaySubject(1)`, with a couple of exceptions:\n *\n * 1. `BehaviorSubject` comes \"primed\" with a single value upon construction.\n * 2. `ReplaySubject` will replay values, even after observing an error, where `BehaviorSubject` will not.\n *\n * @see {@link Subject}\n * @see {@link BehaviorSubject}\n * @see {@link shareReplay}\n */\nexport class ReplaySubject extends Subject {\n private _buffer: (T | number)[] = [];\n private _infiniteTimeWindow = true;\n\n /**\n * @param bufferSize The size of the buffer to replay on subscription\n * @param windowTime The amount of time the buffered items will stay buffered\n * @param timestampProvider An object with a `now()` method that provides the current timestamp. This is used to\n * calculate the amount of time something has been buffered.\n */\n constructor(\n private _bufferSize = Infinity,\n private _windowTime = Infinity,\n private _timestampProvider: TimestampProvider = dateTimestampProvider\n ) {\n super();\n this._infiniteTimeWindow = _windowTime === Infinity;\n this._bufferSize = Math.max(1, _bufferSize);\n this._windowTime = Math.max(1, _windowTime);\n }\n\n next(value: T): void {\n const { isStopped, _buffer, _infiniteTimeWindow, _timestampProvider, _windowTime } = this;\n if (!isStopped) {\n _buffer.push(value);\n !_infiniteTimeWindow && _buffer.push(_timestampProvider.now() + _windowTime);\n }\n this._trimBuffer();\n super.next(value);\n }\n\n /** @internal */\n protected _subscribe(subscriber: Subscriber): Subscription {\n this._throwIfClosed();\n this._trimBuffer();\n\n const subscription = this._innerSubscribe(subscriber);\n\n const { _infiniteTimeWindow, _buffer } = this;\n // We use a copy here, so reentrant code does not mutate our array while we're\n // emitting it to a new subscriber.\n const copy = _buffer.slice();\n for (let i = 0; i < copy.length && !subscriber.closed; i += _infiniteTimeWindow ? 1 : 2) {\n subscriber.next(copy[i] as T);\n }\n\n this._checkFinalizedStatuses(subscriber);\n\n return subscription;\n }\n\n private _trimBuffer() {\n const { _bufferSize, _timestampProvider, _buffer, _infiniteTimeWindow } = this;\n // If we don't have an infinite buffer size, and we're over the length,\n // use splice to truncate the old buffer values off. Note that we have to\n // double the size for instances where we're not using an infinite time window\n // because we're storing the values and the timestamps in the same array.\n const adjustedBufferSize = (_infiniteTimeWindow ? 1 : 2) * _bufferSize;\n _bufferSize < Infinity && adjustedBufferSize < _buffer.length && _buffer.splice(0, _buffer.length - adjustedBufferSize);\n\n // Now, if we're not in an infinite time window, remove all values where the time is\n // older than what is allowed.\n if (!_infiniteTimeWindow) {\n const now = _timestampProvider.now();\n let last = 0;\n // Search the array for the first timestamp that isn't expired and\n // truncate the buffer up to that point.\n for (let i = 1; i < _buffer.length && (_buffer[i] as number) <= now; i += 2) {\n last = i;\n }\n last && _buffer.splice(0, last + 1);\n }\n }\n}\n", "import { Scheduler } from '../Scheduler';\nimport { Subscription } from '../Subscription';\nimport { SchedulerAction } from '../types';\n\n/**\n * A unit of work to be executed in a `scheduler`. An action is typically\n * created from within a {@link SchedulerLike} and an RxJS user does not need to concern\n * themselves about creating and manipulating an Action.\n *\n * ```ts\n * class Action extends Subscription {\n * new (scheduler: Scheduler, work: (state?: T) => void);\n * schedule(state?: T, delay: number = 0): Subscription;\n * }\n * ```\n *\n * @class Action\n */\nexport class Action extends Subscription {\n constructor(scheduler: Scheduler, work: (this: SchedulerAction, state?: T) => void) {\n super();\n }\n /**\n * Schedules this action on its parent {@link SchedulerLike} for execution. May be passed\n * some context object, `state`. May happen at some point in the future,\n * according to the `delay` parameter, if specified.\n * @param {T} [state] Some contextual data that the `work` function uses when\n * called by the Scheduler.\n * @param {number} [delay] Time to wait before executing the work, where the\n * time unit is implicit and defined by the Scheduler.\n * @return {void}\n */\n public schedule(state?: T, delay: number = 0): Subscription {\n return this;\n }\n}\n", "import type { TimerHandle } from './timerHandle';\ntype SetIntervalFunction = (handler: () => void, timeout?: number, ...args: any[]) => TimerHandle;\ntype ClearIntervalFunction = (handle: TimerHandle) => void;\n\ninterface IntervalProvider {\n setInterval: SetIntervalFunction;\n clearInterval: ClearIntervalFunction;\n delegate:\n | {\n setInterval: SetIntervalFunction;\n clearInterval: ClearIntervalFunction;\n }\n | undefined;\n}\n\nexport const intervalProvider: IntervalProvider = {\n // When accessing the delegate, use the variable rather than `this` so that\n // the functions can be called without being bound to the provider.\n setInterval(handler: () => void, timeout?: number, ...args) {\n const { delegate } = intervalProvider;\n if (delegate?.setInterval) {\n return delegate.setInterval(handler, timeout, ...args);\n }\n return setInterval(handler, timeout, ...args);\n },\n clearInterval(handle) {\n const { delegate } = intervalProvider;\n return (delegate?.clearInterval || clearInterval)(handle as any);\n },\n delegate: undefined,\n};\n", "import { Action } from './Action';\nimport { SchedulerAction } from '../types';\nimport { Subscription } from '../Subscription';\nimport { AsyncScheduler } from './AsyncScheduler';\nimport { intervalProvider } from './intervalProvider';\nimport { arrRemove } from '../util/arrRemove';\nimport { TimerHandle } from './timerHandle';\n\nexport class AsyncAction extends Action {\n public id: TimerHandle | undefined;\n public state?: T;\n // @ts-ignore: Property has no initializer and is not definitely assigned\n public delay: number;\n protected pending: boolean = false;\n\n constructor(protected scheduler: AsyncScheduler, protected work: (this: SchedulerAction, state?: T) => void) {\n super(scheduler, work);\n }\n\n public schedule(state?: T, delay: number = 0): Subscription {\n if (this.closed) {\n return this;\n }\n\n // Always replace the current state with the new state.\n this.state = state;\n\n const id = this.id;\n const scheduler = this.scheduler;\n\n //\n // Important implementation note:\n //\n // Actions only execute once by default, unless rescheduled from within the\n // scheduled callback. This allows us to implement single and repeat\n // actions via the same code path, without adding API surface area, as well\n // as mimic traditional recursion but across asynchronous boundaries.\n //\n // However, JS runtimes and timers distinguish between intervals achieved by\n // serial `setTimeout` calls vs. a single `setInterval` call. An interval of\n // serial `setTimeout` calls can be individually delayed, which delays\n // scheduling the next `setTimeout`, and so on. `setInterval` attempts to\n // guarantee the interval callback will be invoked more precisely to the\n // interval period, regardless of load.\n //\n // Therefore, we use `setInterval` to schedule single and repeat actions.\n // If the action reschedules itself with the same delay, the interval is not\n // canceled. If the action doesn't reschedule, or reschedules with a\n // different delay, the interval will be canceled after scheduled callback\n // execution.\n //\n if (id != null) {\n this.id = this.recycleAsyncId(scheduler, id, delay);\n }\n\n // Set the pending flag indicating that this action has been scheduled, or\n // has recursively rescheduled itself.\n this.pending = true;\n\n this.delay = delay;\n // If this action has already an async Id, don't request a new one.\n this.id = this.id ?? this.requestAsyncId(scheduler, this.id, delay);\n\n return this;\n }\n\n protected requestAsyncId(scheduler: AsyncScheduler, _id?: TimerHandle, delay: number = 0): TimerHandle {\n return intervalProvider.setInterval(scheduler.flush.bind(scheduler, this), delay);\n }\n\n protected recycleAsyncId(_scheduler: AsyncScheduler, id?: TimerHandle, delay: number | null = 0): TimerHandle | undefined {\n // If this action is rescheduled with the same delay time, don't clear the interval id.\n if (delay != null && this.delay === delay && this.pending === false) {\n return id;\n }\n // Otherwise, if the action's delay time is different from the current delay,\n // or the action has been rescheduled before it's executed, clear the interval id\n if (id != null) {\n intervalProvider.clearInterval(id);\n }\n\n return undefined;\n }\n\n /**\n * Immediately executes this action and the `work` it contains.\n * @return {any}\n */\n public execute(state: T, delay: number): any {\n if (this.closed) {\n return new Error('executing a cancelled action');\n }\n\n this.pending = false;\n const error = this._execute(state, delay);\n if (error) {\n return error;\n } else if (this.pending === false && this.id != null) {\n // Dequeue if the action didn't reschedule itself. Don't call\n // unsubscribe(), because the action could reschedule later.\n // For example:\n // ```\n // scheduler.schedule(function doWork(counter) {\n // /* ... I'm a busy worker bee ... */\n // var originalAction = this;\n // /* wait 100ms before rescheduling the action */\n // setTimeout(function () {\n // originalAction.schedule(counter + 1);\n // }, 100);\n // }, 1000);\n // ```\n this.id = this.recycleAsyncId(this.scheduler, this.id, null);\n }\n }\n\n protected _execute(state: T, _delay: number): any {\n let errored: boolean = false;\n let errorValue: any;\n try {\n this.work(state);\n } catch (e) {\n errored = true;\n // HACK: Since code elsewhere is relying on the \"truthiness\" of the\n // return here, we can't have it return \"\" or 0 or false.\n // TODO: Clean this up when we refactor schedulers mid-version-8 or so.\n errorValue = e ? e : new Error('Scheduled action threw falsy error');\n }\n if (errored) {\n this.unsubscribe();\n return errorValue;\n }\n }\n\n unsubscribe() {\n if (!this.closed) {\n const { id, scheduler } = this;\n const { actions } = scheduler;\n\n this.work = this.state = this.scheduler = null!;\n this.pending = false;\n\n arrRemove(actions, this);\n if (id != null) {\n this.id = this.recycleAsyncId(scheduler, id, null);\n }\n\n this.delay = null!;\n super.unsubscribe();\n }\n }\n}\n", "import { Action } from './scheduler/Action';\nimport { Subscription } from './Subscription';\nimport { SchedulerLike, SchedulerAction } from './types';\nimport { dateTimestampProvider } from './scheduler/dateTimestampProvider';\n\n/**\n * An execution context and a data structure to order tasks and schedule their\n * execution. Provides a notion of (potentially virtual) time, through the\n * `now()` getter method.\n *\n * Each unit of work in a Scheduler is called an `Action`.\n *\n * ```ts\n * class Scheduler {\n * now(): number;\n * schedule(work, delay?, state?): Subscription;\n * }\n * ```\n *\n * @class Scheduler\n * @deprecated Scheduler is an internal implementation detail of RxJS, and\n * should not be used directly. Rather, create your own class and implement\n * {@link SchedulerLike}. Will be made internal in v8.\n */\nexport class Scheduler implements SchedulerLike {\n public static now: () => number = dateTimestampProvider.now;\n\n constructor(private schedulerActionCtor: typeof Action, now: () => number = Scheduler.now) {\n this.now = now;\n }\n\n /**\n * A getter method that returns a number representing the current time\n * (at the time this function was called) according to the scheduler's own\n * internal clock.\n * @return {number} A number that represents the current time. May or may not\n * have a relation to wall-clock time. May or may not refer to a time unit\n * (e.g. milliseconds).\n */\n public now: () => number;\n\n /**\n * Schedules a function, `work`, for execution. May happen at some point in\n * the future, according to the `delay` parameter, if specified. May be passed\n * some context object, `state`, which will be passed to the `work` function.\n *\n * The given arguments will be processed an stored as an Action object in a\n * queue of actions.\n *\n * @param {function(state: ?T): ?Subscription} work A function representing a\n * task, or some unit of work to be executed by the Scheduler.\n * @param {number} [delay] Time to wait before executing the work, where the\n * time unit is implicit and defined by the Scheduler itself.\n * @param {T} [state] Some contextual data that the `work` function uses when\n * called by the Scheduler.\n * @return {Subscription} A subscription in order to be able to unsubscribe\n * the scheduled work.\n */\n public schedule(work: (this: SchedulerAction, state?: T) => void, delay: number = 0, state?: T): Subscription {\n return new this.schedulerActionCtor(this, work).schedule(state, delay);\n }\n}\n", "import { Scheduler } from '../Scheduler';\nimport { Action } from './Action';\nimport { AsyncAction } from './AsyncAction';\nimport { TimerHandle } from './timerHandle';\n\nexport class AsyncScheduler extends Scheduler {\n public actions: Array> = [];\n /**\n * A flag to indicate whether the Scheduler is currently executing a batch of\n * queued actions.\n * @type {boolean}\n * @internal\n */\n public _active: boolean = false;\n /**\n * An internal ID used to track the latest asynchronous task such as those\n * coming from `setTimeout`, `setInterval`, `requestAnimationFrame`, and\n * others.\n * @type {any}\n * @internal\n */\n public _scheduled: TimerHandle | undefined;\n\n constructor(SchedulerAction: typeof Action, now: () => number = Scheduler.now) {\n super(SchedulerAction, now);\n }\n\n public flush(action: AsyncAction): void {\n const { actions } = this;\n\n if (this._active) {\n actions.push(action);\n return;\n }\n\n let error: any;\n this._active = true;\n\n do {\n if ((error = action.execute(action.state, action.delay))) {\n break;\n }\n } while ((action = actions.shift()!)); // exhaust the scheduler queue\n\n this._active = false;\n\n if (error) {\n while ((action = actions.shift()!)) {\n action.unsubscribe();\n }\n throw error;\n }\n }\n}\n", "import { AsyncAction } from './AsyncAction';\nimport { AsyncScheduler } from './AsyncScheduler';\n\n/**\n *\n * Async Scheduler\n *\n * Schedule task as if you used setTimeout(task, duration)\n *\n * `async` scheduler schedules tasks asynchronously, by putting them on the JavaScript\n * event loop queue. It is best used to delay tasks in time or to schedule tasks repeating\n * in intervals.\n *\n * If you just want to \"defer\" task, that is to perform it right after currently\n * executing synchronous code ends (commonly achieved by `setTimeout(deferredTask, 0)`),\n * better choice will be the {@link asapScheduler} scheduler.\n *\n * ## Examples\n * Use async scheduler to delay task\n * ```ts\n * import { asyncScheduler } from 'rxjs';\n *\n * const task = () => console.log('it works!');\n *\n * asyncScheduler.schedule(task, 2000);\n *\n * // After 2 seconds logs:\n * // \"it works!\"\n * ```\n *\n * Use async scheduler to repeat task in intervals\n * ```ts\n * import { asyncScheduler } from 'rxjs';\n *\n * function task(state) {\n * console.log(state);\n * this.schedule(state + 1, 1000); // `this` references currently executing Action,\n * // which we reschedule with new state and delay\n * }\n *\n * asyncScheduler.schedule(task, 3000, 0);\n *\n * // Logs:\n * // 0 after 3s\n * // 1 after 4s\n * // 2 after 5s\n * // 3 after 6s\n * ```\n */\n\nexport const asyncScheduler = new AsyncScheduler(AsyncAction);\n\n/**\n * @deprecated Renamed to {@link asyncScheduler}. Will be removed in v8.\n */\nexport const async = asyncScheduler;\n", "import { AsyncAction } from './AsyncAction';\nimport { Subscription } from '../Subscription';\nimport { QueueScheduler } from './QueueScheduler';\nimport { SchedulerAction } from '../types';\nimport { TimerHandle } from './timerHandle';\n\nexport class QueueAction extends AsyncAction {\n constructor(protected scheduler: QueueScheduler, protected work: (this: SchedulerAction, state?: T) => void) {\n super(scheduler, work);\n }\n\n public schedule(state?: T, delay: number = 0): Subscription {\n if (delay > 0) {\n return super.schedule(state, delay);\n }\n this.delay = delay;\n this.state = state;\n this.scheduler.flush(this);\n return this;\n }\n\n public execute(state: T, delay: number): any {\n return delay > 0 || this.closed ? super.execute(state, delay) : this._execute(state, delay);\n }\n\n protected requestAsyncId(scheduler: QueueScheduler, id?: TimerHandle, delay: number = 0): TimerHandle {\n // If delay exists and is greater than 0, or if the delay is null (the\n // action wasn't rescheduled) but was originally scheduled as an async\n // action, then recycle as an async action.\n\n if ((delay != null && delay > 0) || (delay == null && this.delay > 0)) {\n return super.requestAsyncId(scheduler, id, delay);\n }\n\n // Otherwise flush the scheduler starting with this action.\n scheduler.flush(this);\n\n // HACK: In the past, this was returning `void`. However, `void` isn't a valid\n // `TimerHandle`, and generally the return value here isn't really used. So the\n // compromise is to return `0` which is both \"falsy\" and a valid `TimerHandle`,\n // as opposed to refactoring every other instanceo of `requestAsyncId`.\n return 0;\n }\n}\n", "import { AsyncScheduler } from './AsyncScheduler';\n\nexport class QueueScheduler extends AsyncScheduler {\n}\n", "import { QueueAction } from './QueueAction';\nimport { QueueScheduler } from './QueueScheduler';\n\n/**\n *\n * Queue Scheduler\n *\n * Put every next task on a queue, instead of executing it immediately\n *\n * `queue` scheduler, when used with delay, behaves the same as {@link asyncScheduler} scheduler.\n *\n * When used without delay, it schedules given task synchronously - executes it right when\n * it is scheduled. However when called recursively, that is when inside the scheduled task,\n * another task is scheduled with queue scheduler, instead of executing immediately as well,\n * that task will be put on a queue and wait for current one to finish.\n *\n * This means that when you execute task with `queue` scheduler, you are sure it will end\n * before any other task scheduled with that scheduler will start.\n *\n * ## Examples\n * Schedule recursively first, then do something\n * ```ts\n * import { queueScheduler } from 'rxjs';\n *\n * queueScheduler.schedule(() => {\n * queueScheduler.schedule(() => console.log('second')); // will not happen now, but will be put on a queue\n *\n * console.log('first');\n * });\n *\n * // Logs:\n * // \"first\"\n * // \"second\"\n * ```\n *\n * Reschedule itself recursively\n * ```ts\n * import { queueScheduler } from 'rxjs';\n *\n * queueScheduler.schedule(function(state) {\n * if (state !== 0) {\n * console.log('before', state);\n * this.schedule(state - 1); // `this` references currently executing Action,\n * // which we reschedule with new state\n * console.log('after', state);\n * }\n * }, 0, 3);\n *\n * // In scheduler that runs recursively, you would expect:\n * // \"before\", 3\n * // \"before\", 2\n * // \"before\", 1\n * // \"after\", 1\n * // \"after\", 2\n * // \"after\", 3\n *\n * // But with queue it logs:\n * // \"before\", 3\n * // \"after\", 3\n * // \"before\", 2\n * // \"after\", 2\n * // \"before\", 1\n * // \"after\", 1\n * ```\n */\n\nexport const queueScheduler = new QueueScheduler(QueueAction);\n\n/**\n * @deprecated Renamed to {@link queueScheduler}. Will be removed in v8.\n */\nexport const queue = queueScheduler;\n", "import { AsyncAction } from './AsyncAction';\nimport { AnimationFrameScheduler } from './AnimationFrameScheduler';\nimport { SchedulerAction } from '../types';\nimport { animationFrameProvider } from './animationFrameProvider';\nimport { TimerHandle } from './timerHandle';\n\nexport class AnimationFrameAction extends AsyncAction {\n constructor(protected scheduler: AnimationFrameScheduler, protected work: (this: SchedulerAction, state?: T) => void) {\n super(scheduler, work);\n }\n\n protected requestAsyncId(scheduler: AnimationFrameScheduler, id?: TimerHandle, delay: number = 0): TimerHandle {\n // If delay is greater than 0, request as an async action.\n if (delay !== null && delay > 0) {\n return super.requestAsyncId(scheduler, id, delay);\n }\n // Push the action to the end of the scheduler queue.\n scheduler.actions.push(this);\n // If an animation frame has already been requested, don't request another\n // one. If an animation frame hasn't been requested yet, request one. Return\n // the current animation frame request id.\n return scheduler._scheduled || (scheduler._scheduled = animationFrameProvider.requestAnimationFrame(() => scheduler.flush(undefined)));\n }\n\n protected recycleAsyncId(scheduler: AnimationFrameScheduler, id?: TimerHandle, delay: number = 0): TimerHandle | undefined {\n // If delay exists and is greater than 0, or if the delay is null (the\n // action wasn't rescheduled) but was originally scheduled as an async\n // action, then recycle as an async action.\n if (delay != null ? delay > 0 : this.delay > 0) {\n return super.recycleAsyncId(scheduler, id, delay);\n }\n // If the scheduler queue has no remaining actions with the same async id,\n // cancel the requested animation frame and set the scheduled flag to\n // undefined so the next AnimationFrameAction will request its own.\n const { actions } = scheduler;\n if (id != null && actions[actions.length - 1]?.id !== id) {\n animationFrameProvider.cancelAnimationFrame(id as number);\n scheduler._scheduled = undefined;\n }\n // Return undefined so the action knows to request a new async id if it's rescheduled.\n return undefined;\n }\n}\n", "import { AsyncAction } from './AsyncAction';\nimport { AsyncScheduler } from './AsyncScheduler';\n\nexport class AnimationFrameScheduler extends AsyncScheduler {\n public flush(action?: AsyncAction): void {\n this._active = true;\n // The async id that effects a call to flush is stored in _scheduled.\n // Before executing an action, it's necessary to check the action's async\n // id to determine whether it's supposed to be executed in the current\n // flush.\n // Previous implementations of this method used a count to determine this,\n // but that was unsound, as actions that are unsubscribed - i.e. cancelled -\n // are removed from the actions array and that can shift actions that are\n // scheduled to be executed in a subsequent flush into positions at which\n // they are executed within the current flush.\n const flushId = this._scheduled;\n this._scheduled = undefined;\n\n const { actions } = this;\n let error: any;\n action = action || actions.shift()!;\n\n do {\n if ((error = action.execute(action.state, action.delay))) {\n break;\n }\n } while ((action = actions[0]) && action.id === flushId && actions.shift());\n\n this._active = false;\n\n if (error) {\n while ((action = actions[0]) && action.id === flushId && actions.shift()) {\n action.unsubscribe();\n }\n throw error;\n }\n }\n}\n", "import { AnimationFrameAction } from './AnimationFrameAction';\nimport { AnimationFrameScheduler } from './AnimationFrameScheduler';\n\n/**\n *\n * Animation Frame Scheduler\n *\n * Perform task when `window.requestAnimationFrame` would fire\n *\n * When `animationFrame` scheduler is used with delay, it will fall back to {@link asyncScheduler} scheduler\n * behaviour.\n *\n * Without delay, `animationFrame` scheduler can be used to create smooth browser animations.\n * It makes sure scheduled task will happen just before next browser content repaint,\n * thus performing animations as efficiently as possible.\n *\n * ## Example\n * Schedule div height animation\n * ```ts\n * // html:
    \n * import { animationFrameScheduler } from 'rxjs';\n *\n * const div = document.querySelector('div');\n *\n * animationFrameScheduler.schedule(function(height) {\n * div.style.height = height + \"px\";\n *\n * this.schedule(height + 1); // `this` references currently executing Action,\n * // which we reschedule with new state\n * }, 0, 0);\n *\n * // You will see a div element growing in height\n * ```\n */\n\nexport const animationFrameScheduler = new AnimationFrameScheduler(AnimationFrameAction);\n\n/**\n * @deprecated Renamed to {@link animationFrameScheduler}. Will be removed in v8.\n */\nexport const animationFrame = animationFrameScheduler;\n", "import { Observable } from '../Observable';\nimport { SchedulerLike } from '../types';\n\n/**\n * A simple Observable that emits no items to the Observer and immediately\n * emits a complete notification.\n *\n * Just emits 'complete', and nothing else.\n *\n * ![](empty.png)\n *\n * A simple Observable that only emits the complete notification. It can be used\n * for composing with other Observables, such as in a {@link mergeMap}.\n *\n * ## Examples\n *\n * Log complete notification\n *\n * ```ts\n * import { EMPTY } from 'rxjs';\n *\n * EMPTY.subscribe({\n * next: () => console.log('Next'),\n * complete: () => console.log('Complete!')\n * });\n *\n * // Outputs\n * // Complete!\n * ```\n *\n * Emit the number 7, then complete\n *\n * ```ts\n * import { EMPTY, startWith } from 'rxjs';\n *\n * const result = EMPTY.pipe(startWith(7));\n * result.subscribe(x => console.log(x));\n *\n * // Outputs\n * // 7\n * ```\n *\n * Map and flatten only odd numbers to the sequence `'a'`, `'b'`, `'c'`\n *\n * ```ts\n * import { interval, mergeMap, of, EMPTY } from 'rxjs';\n *\n * const interval$ = interval(1000);\n * const result = interval$.pipe(\n * mergeMap(x => x % 2 === 1 ? of('a', 'b', 'c') : EMPTY),\n * );\n * result.subscribe(x => console.log(x));\n *\n * // Results in the following to the console:\n * // x is equal to the count on the interval, e.g. (0, 1, 2, 3, ...)\n * // x will occur every 1000ms\n * // if x % 2 is equal to 1, print a, b, c (each on its own)\n * // if x % 2 is not equal to 1, nothing will be output\n * ```\n *\n * @see {@link Observable}\n * @see {@link NEVER}\n * @see {@link of}\n * @see {@link throwError}\n */\nexport const EMPTY = new Observable((subscriber) => subscriber.complete());\n\n/**\n * @param scheduler A {@link SchedulerLike} to use for scheduling\n * the emission of the complete notification.\n * @deprecated Replaced with the {@link EMPTY} constant or {@link scheduled} (e.g. `scheduled([], scheduler)`). Will be removed in v8.\n */\nexport function empty(scheduler?: SchedulerLike) {\n return scheduler ? emptyScheduled(scheduler) : EMPTY;\n}\n\nfunction emptyScheduled(scheduler: SchedulerLike) {\n return new Observable((subscriber) => scheduler.schedule(() => subscriber.complete()));\n}\n", "import { SchedulerLike } from '../types';\nimport { isFunction } from './isFunction';\n\nexport function isScheduler(value: any): value is SchedulerLike {\n return value && isFunction(value.schedule);\n}\n", "import { SchedulerLike } from '../types';\nimport { isFunction } from './isFunction';\nimport { isScheduler } from './isScheduler';\n\nfunction last(arr: T[]): T | undefined {\n return arr[arr.length - 1];\n}\n\nexport function popResultSelector(args: any[]): ((...args: unknown[]) => unknown) | undefined {\n return isFunction(last(args)) ? args.pop() : undefined;\n}\n\nexport function popScheduler(args: any[]): SchedulerLike | undefined {\n return isScheduler(last(args)) ? args.pop() : undefined;\n}\n\nexport function popNumber(args: any[], defaultValue: number): number {\n return typeof last(args) === 'number' ? args.pop()! : defaultValue;\n}\n", "export const isArrayLike = ((x: any): x is ArrayLike => x && typeof x.length === 'number' && typeof x !== 'function');", "import { isFunction } from \"./isFunction\";\n\n/**\n * Tests to see if the object is \"thennable\".\n * @param value the object to test\n */\nexport function isPromise(value: any): value is PromiseLike {\n return isFunction(value?.then);\n}\n", "import { InteropObservable } from '../types';\nimport { observable as Symbol_observable } from '../symbol/observable';\nimport { isFunction } from './isFunction';\n\n/** Identifies an input as being Observable (but not necessary an Rx Observable) */\nexport function isInteropObservable(input: any): input is InteropObservable {\n return isFunction(input[Symbol_observable]);\n}\n", "import { isFunction } from './isFunction';\n\nexport function isAsyncIterable(obj: any): obj is AsyncIterable {\n return Symbol.asyncIterator && isFunction(obj?.[Symbol.asyncIterator]);\n}\n", "/**\n * Creates the TypeError to throw if an invalid object is passed to `from` or `scheduled`.\n * @param input The object that was passed.\n */\nexport function createInvalidObservableTypeError(input: any) {\n // TODO: We should create error codes that can be looked up, so this can be less verbose.\n return new TypeError(\n `You provided ${\n input !== null && typeof input === 'object' ? 'an invalid object' : `'${input}'`\n } where a stream was expected. You can provide an Observable, Promise, ReadableStream, Array, AsyncIterable, or Iterable.`\n );\n}\n", "export function getSymbolIterator(): symbol {\n if (typeof Symbol !== 'function' || !Symbol.iterator) {\n return '@@iterator' as any;\n }\n\n return Symbol.iterator;\n}\n\nexport const iterator = getSymbolIterator();\n", "import { iterator as Symbol_iterator } from '../symbol/iterator';\nimport { isFunction } from './isFunction';\n\n/** Identifies an input as being an Iterable */\nexport function isIterable(input: any): input is Iterable {\n return isFunction(input?.[Symbol_iterator]);\n}\n", "import { ReadableStreamLike } from '../types';\nimport { isFunction } from './isFunction';\n\nexport async function* readableStreamLikeToAsyncGenerator(readableStream: ReadableStreamLike): AsyncGenerator {\n const reader = readableStream.getReader();\n try {\n while (true) {\n const { value, done } = await reader.read();\n if (done) {\n return;\n }\n yield value!;\n }\n } finally {\n reader.releaseLock();\n }\n}\n\nexport function isReadableStreamLike(obj: any): obj is ReadableStreamLike {\n // We don't want to use instanceof checks because they would return\n // false for instances from another Realm, like an `},"putIntoIFrame"),K2e=o((t,e,r,n,i)=>{let a=t.append("div");a.attr("id",r),n&&a.attr("style",n);let s=a.append("svg").attr("id",e).attr("width","100%").attr("xmlns",Qit);return i&&s.attr("xmlns:xlink",i),s.append("g"),t},"appendDivSvgG");function Q2e(t,e){return t.append("iframe").attr("id",e).attr("style","width: 100%; height: 100%;").attr("sandbox","")}o(Q2e,"sandboxedIframe");var dat=o((t,e,r,n)=>{t.getElementById(e)?.remove(),t.getElementById(r)?.remove(),t.getElementById(n)?.remove()},"removeExistingElements"),pat=o(async function(t,e,r){C1();let n=Z2e(e);e=n.code;let i=Sr();Y.debug(i),e.length>(i?.maxTextSize??qit)&&(e=Xit);let a="#"+t,s="i"+t,l="#"+s,u="d"+t,h="#"+u,f=o(()=>{let R=ze(p?l:h).node();R&&"remove"in R&&R.remove()},"removeTempElements"),d=ze("body"),p=i.securityLevel===jit,m=i.securityLevel===Kit,g=i.fontFamily;if(r!==void 0){if(r&&(r.innerHTML=""),p){let k=Q2e(ze(r),s);d=ze(k.nodes()[0].contentDocument.body),d.node().style.margin=0}else d=ze(r);K2e(d,t,u,`font-family: ${g}`,Zit)}else{if(dat(document,t,u,s),p){let k=Q2e(ze("body"),s);d=ze(k.nodes()[0].contentDocument.body),d.node().style.margin=0}else d=ze("body");K2e(d,t,u)}let y,v;try{y=await N1.fromText(e,{title:n.title})}catch(k){if(i.suppressErrorRendering)throw f(),k;y=await N1.fromText("error"),v=k}let x=d.select(h).node(),b=y.type,w=x.firstChild,_=w.firstChild,T=y.renderer.getClasses?.(e,y),E=uat(i,b,T,a),L=document.createElement("style");L.innerHTML=E,w.insertBefore(L,_);try{await y.renderer.draw(e,t,dx,y)}catch(k){throw i.suppressErrorRendering?f():X0e.draw(e,t,dx),k}let C=d.select(`${h} svg`),A=y.db.getAccTitle?.(),I=y.db.getAccDescription?.();gat(b,C,A,I),d.select(`[id="${t}"]`).selectAll("foreignobject > *").attr("xmlns",Jit);let D=d.select(h).node().innerHTML;if(Y.debug("config.arrowMarkerAbsolute",i.arrowMarkerAbsolute),D=hat(D,p,xr(i.arrowMarkerAbsolute)),p){let k=d.select(h+" svg").node();D=fat(D,k)}else m||(D=ah.sanitize(D,{ADD_TAGS:sat,ADD_ATTR:oat,HTML_INTEGRATION_POINTS:{foreignobject:!0}}));if(W2e(),v)throw v;return f(),{diagramType:b,svg:D,bindFunctions:y.db.bindFunctions}},"render");function mat(t={}){let e=Gn({},t);e?.fontFamily&&!e.themeVariables?.fontFamily&&(e.themeVariables||(e.themeVariables={}),e.themeVariables.fontFamily=e.fontFamily),$z(e),e?.theme&&e.theme in ko?e.themeVariables=ko[e.theme].getThemeVariables(e.themeVariables):e&&(e.themeVariables=ko.default.getThemeVariables(e.themeVariables));let r=typeof e=="object"?QS(e):ZS();M1(r.logLevel),C1()}o(mat,"initialize");var J2e=o((t,e={})=>{let{code:r}=vF(t);return N1.fromText(r,e)},"getDiagramFromText");function gat(t,e,r,n){V2e(e,t),U2e(e,r,n,e.attr("id"))}o(gat,"addA11yInfo");var Of=Object.freeze({render:pat,parse:lat,getDiagramFromText:J2e,initialize:mat,getConfig:Sr,setConfig:Yb,getSiteConfig:ZS,updateSiteConfig:Vz,reset:o(()=>{V1()},"reset"),globalReset:o(()=>{V1(ih)},"globalReset"),defaultConfig:ih});M1(Sr().logLevel);V1(Sr());Fv();hr();var yat=o((t,e,r)=>{Y.warn(t),i9(t)?(r&&r(t.str,t.hash),e.push({...t,message:t.str,error:t})):(r&&r(t),t instanceof Error&&e.push({str:t.message,message:t.message,hash:t.name,error:t}))},"handleError"),exe=o(async function(t={querySelector:".mermaid"}){try{await vat(t)}catch(e){if(i9(e)&&Y.error(e.str),eh.parseError&&eh.parseError(e),!t.suppressErrors)throw Y.error("Use the suppressErrors option to suppress these errors"),e}},"run"),vat=o(async function({postRenderCallback:t,querySelector:e,nodes:r}={querySelector:".mermaid"}){let n=Of.getConfig();Y.debug(`${t?"":"No "}Callback function found`);let i;if(r)i=r;else if(e)i=document.querySelectorAll(e);else throw new Error("Nodes and querySelector are both undefined");Y.debug(`Found ${i.length} diagrams`),n?.startOnLoad!==void 0&&(Y.debug("Start On Load: "+n?.startOnLoad),Of.updateSiteConfig({startOnLoad:n?.startOnLoad}));let a=new Ut.InitIDGenerator(n.deterministicIds,n.deterministicIDSeed),s,l=[];for(let u of Array.from(i)){Y.info("Rendering diagram: "+u.id);if(u.getAttribute("data-processed"))continue;u.setAttribute("data-processed","true");let h=`mermaid-${a.next()}`;s=u.innerHTML,s=Ib(Ut.entityDecode(s)).trim().replace(//gi,"
    ");let f=Ut.detectInit(s);f&&Y.debug("Detected early reinit: ",f);try{let{svg:d,bindFunctions:p}=await ixe(h,s,u);u.innerHTML=d,t&&await t(h),p&&p(u)}catch(d){yat(d,l,eh.parseError)}}if(l.length>0)throw l[0]},"runThrowsErrors"),txe=o(function(t){Of.initialize(t)},"initialize"),xat=o(async function(t,e,r){Y.warn("mermaid.init is deprecated. Please use run instead."),t&&txe(t);let n={postRenderCallback:r,querySelector:".mermaid"};typeof e=="string"?n.querySelector=e:e&&(e instanceof HTMLElement?n.nodes=[e]:n.nodes=e),await exe(n)},"init"),bat=o(async(t,{lazyLoad:e=!0}={})=>{C1(),Bb(...t),e===!1&&await k2e()},"registerExternalDiagrams"),rxe=o(function(){if(eh.startOnLoad){let{startOnLoad:t}=Of.getConfig();t&&eh.run().catch(e=>Y.error("Mermaid failed to initialize",e))}},"contentLoaded");if(typeof document<"u"){window.addEventListener("load",rxe,!1)}var wat=o(function(t){eh.parseError=t},"setParseErrorHandler"),mS=[],xF=!1,nxe=o(async()=>{if(!xF){for(xF=!0;mS.length>0;){let t=mS.shift();if(t)try{await t()}catch(e){Y.error("Error executing queue",e)}}xF=!1}},"executeQueue"),Tat=o(async(t,e)=>new Promise((r,n)=>{let i=o(()=>new Promise((a,s)=>{Of.parse(t,e).then(l=>{a(l),r(l)},l=>{Y.error("Error parsing",l),eh.parseError?.(l),s(l),n(l)})}),"performCall");mS.push(i),nxe().catch(n)}),"parse"),ixe=o((t,e,r)=>new Promise((n,i)=>{let a=o(()=>new Promise((s,l)=>{Of.render(t,e,r).then(u=>{s(u),n(u)},u=>{Y.error("Error parsing",u),eh.parseError?.(u),l(u),i(u)})}),"performCall");mS.push(a),nxe().catch(i)}),"render"),eh={startOnLoad:!0,mermaidAPI:Of,parse:Tat,render:ixe,init:xat,run:exe,registerExternalDiagrams:bat,registerLayoutLoaders:CD,initialize:txe,parseError:void 0,contentLoaded:rxe,setParseErrorHandler:wat,detectType:np,registerIconPacks:Mb},kat=eh;return pxe(Eat);})(); +/*! Check if previously processed */ +/*! + * Wait for document loaded before starting the execution + */ +/*! Bundled license information: + +dompurify/dist/purify.es.mjs: + (*! @license DOMPurify 3.2.1 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.2.1/LICENSE *) + +js-yaml/dist/js-yaml.mjs: + (*! js-yaml 4.1.0 https://github.com/nodeca/js-yaml @license MIT *) + +lodash-es/lodash.js: + (** + * @license + * Lodash (Custom Build) + * Build: `lodash modularize exports="es" -o ./` + * Copyright OpenJS Foundation and other contributors + * Released under MIT license + * Based on Underscore.js 1.8.3 + * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors + *) + +cytoscape/dist/cytoscape.esm.mjs: + (*! + Embeddable Minimum Strictly-Compliant Promises/A+ 1.1.1 Thenable + Copyright (c) 2013-2014 Ralf S. Engelschall (http://engelschall.com) + Licensed under The MIT License (http://opensource.org/licenses/MIT) + *) + (*! + Event object based on jQuery events, MIT license + + https://jquery.org/license/ + https://tldrlegal.com/license/mit-license + https://github.com/jquery/jquery/blob/master/src/event.js + *) + (*! Bezier curve function generator. Copyright Gaetan Renaudeau. MIT License: http://en.wikipedia.org/wiki/MIT_License *) + (*! Runge-Kutta spring physics function generator. Adapted from Framer.js, copyright Koen Bok. MIT License: http://en.wikipedia.org/wiki/MIT_License *) +*/ +globalThis.mermaid = globalThis.__esbuild_esm_mermaid.default; diff --git a/site/assets/stylesheets/main.8c3ca2c6.min.css b/site/assets/stylesheets/main.8c3ca2c6.min.css new file mode 100644 index 0000000..57a79c1 --- /dev/null +++ b/site/assets/stylesheets/main.8c3ca2c6.min.css @@ -0,0 +1 @@ +@charset "UTF-8";html{-webkit-text-size-adjust:none;-moz-text-size-adjust:none;text-size-adjust:none;box-sizing:border-box}*,:after,:before{box-sizing:inherit}@media (prefers-reduced-motion){*,:after,:before{transition:none!important}}body{margin:0}a,button,input,label{-webkit-tap-highlight-color:transparent}a{color:inherit;text-decoration:none}hr{border:0;box-sizing:initial;display:block;height:.05rem;overflow:visible;padding:0}small{font-size:80%}sub,sup{line-height:1em}img{border-style:none}table{border-collapse:initial;border-spacing:0}td,th{font-weight:400;vertical-align:top}button{background:#0000;border:0;font-family:inherit;font-size:inherit;margin:0;padding:0}input{border:0;outline:none}:root{--md-primary-fg-color:#4051b5;--md-primary-fg-color--light:#5d6cc0;--md-primary-fg-color--dark:#303fa1;--md-primary-bg-color:#fff;--md-primary-bg-color--light:#ffffffb3;--md-accent-fg-color:#526cfe;--md-accent-fg-color--transparent:#526cfe1a;--md-accent-bg-color:#fff;--md-accent-bg-color--light:#ffffffb3}[data-md-color-scheme=default]{color-scheme:light}[data-md-color-scheme=default] img[src$="#gh-dark-mode-only"],[data-md-color-scheme=default] img[src$="#only-dark"]{display:none}:root,[data-md-color-scheme=default]{--md-hue:225deg;--md-default-fg-color:#000000de;--md-default-fg-color--light:#0000008a;--md-default-fg-color--lighter:#00000052;--md-default-fg-color--lightest:#00000012;--md-default-bg-color:#fff;--md-default-bg-color--light:#ffffffb3;--md-default-bg-color--lighter:#ffffff4d;--md-default-bg-color--lightest:#ffffff1f;--md-code-fg-color:#36464e;--md-code-bg-color:#f5f5f5;--md-code-hl-color:#4287ff;--md-code-hl-color--light:#4287ff1a;--md-code-hl-number-color:#d52a2a;--md-code-hl-special-color:#db1457;--md-code-hl-function-color:#a846b9;--md-code-hl-constant-color:#6e59d9;--md-code-hl-keyword-color:#3f6ec6;--md-code-hl-string-color:#1c7d4d;--md-code-hl-name-color:var(--md-code-fg-color);--md-code-hl-operator-color:var(--md-default-fg-color--light);--md-code-hl-punctuation-color:var(--md-default-fg-color--light);--md-code-hl-comment-color:var(--md-default-fg-color--light);--md-code-hl-generic-color:var(--md-default-fg-color--light);--md-code-hl-variable-color:var(--md-default-fg-color--light);--md-typeset-color:var(--md-default-fg-color);--md-typeset-a-color:var(--md-primary-fg-color);--md-typeset-del-color:#f5503d26;--md-typeset-ins-color:#0bd57026;--md-typeset-kbd-color:#fafafa;--md-typeset-kbd-accent-color:#fff;--md-typeset-kbd-border-color:#b8b8b8;--md-typeset-mark-color:#ffff0080;--md-typeset-table-color:#0000001f;--md-typeset-table-color--light:rgba(0,0,0,.035);--md-admonition-fg-color:var(--md-default-fg-color);--md-admonition-bg-color:var(--md-default-bg-color);--md-warning-fg-color:#000000de;--md-warning-bg-color:#ff9;--md-footer-fg-color:#fff;--md-footer-fg-color--light:#ffffffb3;--md-footer-fg-color--lighter:#ffffff73;--md-footer-bg-color:#000000de;--md-footer-bg-color--dark:#00000052;--md-shadow-z1:0 0.2rem 0.5rem #0000000d,0 0 0.05rem #0000001a;--md-shadow-z2:0 0.2rem 0.5rem #0000001a,0 0 0.05rem #00000040;--md-shadow-z3:0 0.2rem 0.5rem #0003,0 0 0.05rem #00000059}.md-icon svg{fill:currentcolor;display:block;height:1.2rem;width:1.2rem}body{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;--md-text-font-family:var(--md-text-font,_),-apple-system,BlinkMacSystemFont,Helvetica,Arial,sans-serif;--md-code-font-family:var(--md-code-font,_),SFMono-Regular,Consolas,Menlo,monospace}aside,body,input{font-feature-settings:"kern","liga";color:var(--md-typeset-color);font-family:var(--md-text-font-family)}code,kbd,pre{font-feature-settings:"kern";font-family:var(--md-code-font-family)}:root{--md-typeset-table-sort-icon:url('data:image/svg+xml;charset=utf-8,');--md-typeset-table-sort-icon--asc:url('data:image/svg+xml;charset=utf-8,');--md-typeset-table-sort-icon--desc:url('data:image/svg+xml;charset=utf-8,')}.md-typeset{-webkit-print-color-adjust:exact;color-adjust:exact;font-size:.8rem;line-height:1.6}@media print{.md-typeset{font-size:.68rem}}.md-typeset blockquote,.md-typeset dl,.md-typeset figure,.md-typeset ol,.md-typeset pre,.md-typeset ul{margin-bottom:1em;margin-top:1em}.md-typeset h1{color:var(--md-default-fg-color--light);font-size:2em;line-height:1.3;margin:0 0 1.25em}.md-typeset h1,.md-typeset h2{font-weight:300;letter-spacing:-.01em}.md-typeset h2{font-size:1.5625em;line-height:1.4;margin:1.6em 0 .64em}.md-typeset h3{font-size:1.25em;font-weight:400;letter-spacing:-.01em;line-height:1.5;margin:1.6em 0 .8em}.md-typeset h2+h3{margin-top:.8em}.md-typeset h4{font-weight:700;letter-spacing:-.01em;margin:1em 0}.md-typeset h5,.md-typeset h6{color:var(--md-default-fg-color--light);font-size:.8em;font-weight:700;letter-spacing:-.01em;margin:1.25em 0}.md-typeset h5{text-transform:uppercase}.md-typeset hr{border-bottom:.05rem solid var(--md-default-fg-color--lightest);display:flow-root;margin:1.5em 0}.md-typeset a{color:var(--md-typeset-a-color);word-break:break-word}.md-typeset a,.md-typeset a:before{transition:color 125ms}.md-typeset a:focus,.md-typeset a:hover{color:var(--md-accent-fg-color)}.md-typeset a:focus code,.md-typeset a:hover code{background-color:var(--md-accent-fg-color--transparent)}.md-typeset a code{color:currentcolor;transition:background-color 125ms}.md-typeset a.focus-visible{outline-color:var(--md-accent-fg-color);outline-offset:.2rem}.md-typeset code,.md-typeset kbd,.md-typeset pre{color:var(--md-code-fg-color);direction:ltr;font-variant-ligatures:none}@media print{.md-typeset code,.md-typeset kbd,.md-typeset pre{white-space:pre-wrap}}.md-typeset code{background-color:var(--md-code-bg-color);border-radius:.1rem;-webkit-box-decoration-break:clone;box-decoration-break:clone;font-size:.85em;padding:0 .2941176471em;word-break:break-word}.md-typeset code:not(.focus-visible){-webkit-tap-highlight-color:transparent;outline:none}.md-typeset pre{display:flow-root;line-height:1.4;position:relative}.md-typeset pre>code{-webkit-box-decoration-break:slice;box-decoration-break:slice;box-shadow:none;display:block;margin:0;outline-color:var(--md-accent-fg-color);overflow:auto;padding:.7720588235em 1.1764705882em;scrollbar-color:var(--md-default-fg-color--lighter) #0000;scrollbar-width:thin;touch-action:auto;word-break:normal}.md-typeset pre>code:hover{scrollbar-color:var(--md-accent-fg-color) #0000}.md-typeset pre>code::-webkit-scrollbar{height:.2rem;width:.2rem}.md-typeset pre>code::-webkit-scrollbar-thumb{background-color:var(--md-default-fg-color--lighter)}.md-typeset pre>code::-webkit-scrollbar-thumb:hover{background-color:var(--md-accent-fg-color)}.md-typeset kbd{background-color:var(--md-typeset-kbd-color);border-radius:.1rem;box-shadow:0 .1rem 0 .05rem var(--md-typeset-kbd-border-color),0 .1rem 0 var(--md-typeset-kbd-border-color),0 -.1rem .2rem var(--md-typeset-kbd-accent-color) inset;color:var(--md-default-fg-color);display:inline-block;font-size:.75em;padding:0 .6666666667em;vertical-align:text-top;word-break:break-word}.md-typeset mark{background-color:var(--md-typeset-mark-color);-webkit-box-decoration-break:clone;box-decoration-break:clone;color:inherit;word-break:break-word}.md-typeset abbr{border-bottom:.05rem dotted var(--md-default-fg-color--light);cursor:help;text-decoration:none}.md-typeset small{opacity:.75}[dir=ltr] .md-typeset sub,[dir=ltr] .md-typeset sup{margin-left:.078125em}[dir=rtl] .md-typeset sub,[dir=rtl] .md-typeset sup{margin-right:.078125em}[dir=ltr] .md-typeset blockquote{padding-left:.6rem}[dir=rtl] .md-typeset blockquote{padding-right:.6rem}[dir=ltr] .md-typeset blockquote{border-left:.2rem solid var(--md-default-fg-color--lighter)}[dir=rtl] .md-typeset blockquote{border-right:.2rem solid var(--md-default-fg-color--lighter)}.md-typeset blockquote{color:var(--md-default-fg-color--light);margin-left:0;margin-right:0}.md-typeset ul{list-style-type:disc}.md-typeset ul[type]{list-style-type:revert-layer}[dir=ltr] .md-typeset ol,[dir=ltr] .md-typeset ul{margin-left:.625em}[dir=rtl] .md-typeset ol,[dir=rtl] .md-typeset ul{margin-right:.625em}.md-typeset ol,.md-typeset ul{padding:0}.md-typeset ol:not([hidden]),.md-typeset ul:not([hidden]){display:flow-root}.md-typeset ol ol,.md-typeset ul ol{list-style-type:lower-alpha}.md-typeset ol ol ol,.md-typeset ul ol ol{list-style-type:lower-roman}.md-typeset ol ol ol ol,.md-typeset ul ol ol ol{list-style-type:upper-alpha}.md-typeset ol ol ol ol ol,.md-typeset ul ol ol ol ol{list-style-type:upper-roman}.md-typeset ol[type],.md-typeset ul[type]{list-style-type:revert-layer}[dir=ltr] .md-typeset ol li,[dir=ltr] .md-typeset ul li{margin-left:1.25em}[dir=rtl] .md-typeset ol li,[dir=rtl] .md-typeset ul li{margin-right:1.25em}.md-typeset ol li,.md-typeset ul li{margin-bottom:.5em}.md-typeset ol li blockquote,.md-typeset ol li p,.md-typeset ul li blockquote,.md-typeset ul li p{margin:.5em 0}.md-typeset ol li:last-child,.md-typeset ul li:last-child{margin-bottom:0}[dir=ltr] .md-typeset ol li ol,[dir=ltr] .md-typeset ol li ul,[dir=ltr] .md-typeset ul li ol,[dir=ltr] .md-typeset ul li ul{margin-left:.625em}[dir=rtl] .md-typeset ol li ol,[dir=rtl] .md-typeset ol li ul,[dir=rtl] .md-typeset ul li ol,[dir=rtl] .md-typeset ul li ul{margin-right:.625em}.md-typeset ol li ol,.md-typeset ol li ul,.md-typeset ul li ol,.md-typeset ul li ul{margin-bottom:.5em;margin-top:.5em}[dir=ltr] .md-typeset dd{margin-left:1.875em}[dir=rtl] .md-typeset dd{margin-right:1.875em}.md-typeset dd{margin-bottom:1.5em;margin-top:1em}.md-typeset img,.md-typeset svg,.md-typeset video{height:auto;max-width:100%}.md-typeset img[align=left]{margin:1em 1em 1em 0}.md-typeset img[align=right]{margin:1em 0 1em 1em}.md-typeset img[align]:only-child{margin-top:0}.md-typeset figure{display:flow-root;margin:1em auto;max-width:100%;text-align:center;width:-moz-fit-content;width:fit-content}.md-typeset figure img{display:block;margin:0 auto}.md-typeset figcaption{font-style:italic;margin:1em auto;max-width:24rem}.md-typeset iframe{max-width:100%}.md-typeset table:not([class]){background-color:var(--md-default-bg-color);border:.05rem solid var(--md-typeset-table-color);border-radius:.1rem;display:inline-block;font-size:.64rem;max-width:100%;overflow:auto;touch-action:auto}@media print{.md-typeset table:not([class]){display:table}}.md-typeset table:not([class])+*{margin-top:1.5em}.md-typeset table:not([class]) td>:first-child,.md-typeset table:not([class]) th>:first-child{margin-top:0}.md-typeset table:not([class]) td>:last-child,.md-typeset table:not([class]) th>:last-child{margin-bottom:0}.md-typeset table:not([class]) td:not([align]),.md-typeset table:not([class]) th:not([align]){text-align:left}[dir=rtl] .md-typeset table:not([class]) td:not([align]),[dir=rtl] .md-typeset table:not([class]) th:not([align]){text-align:right}.md-typeset table:not([class]) th{font-weight:700;min-width:5rem;padding:.9375em 1.25em;vertical-align:top}.md-typeset table:not([class]) td{border-top:.05rem solid var(--md-typeset-table-color);padding:.9375em 1.25em;vertical-align:top}.md-typeset table:not([class]) tbody tr{transition:background-color 125ms}.md-typeset table:not([class]) tbody tr:hover{background-color:var(--md-typeset-table-color--light);box-shadow:0 .05rem 0 var(--md-default-bg-color) inset}.md-typeset table:not([class]) a{word-break:normal}.md-typeset table th[role=columnheader]{cursor:pointer}[dir=ltr] .md-typeset table th[role=columnheader]:after{margin-left:.5em}[dir=rtl] .md-typeset table th[role=columnheader]:after{margin-right:.5em}.md-typeset table th[role=columnheader]:after{content:"";display:inline-block;height:1.2em;-webkit-mask-image:var(--md-typeset-table-sort-icon);mask-image:var(--md-typeset-table-sort-icon);-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;transition:background-color 125ms;vertical-align:text-bottom;width:1.2em}.md-typeset table th[role=columnheader]:hover:after{background-color:var(--md-default-fg-color--lighter)}.md-typeset table th[role=columnheader][aria-sort=ascending]:after{background-color:var(--md-default-fg-color--light);-webkit-mask-image:var(--md-typeset-table-sort-icon--asc);mask-image:var(--md-typeset-table-sort-icon--asc)}.md-typeset table th[role=columnheader][aria-sort=descending]:after{background-color:var(--md-default-fg-color--light);-webkit-mask-image:var(--md-typeset-table-sort-icon--desc);mask-image:var(--md-typeset-table-sort-icon--desc)}.md-typeset__scrollwrap{margin:1em -.8rem;overflow-x:auto;touch-action:auto}.md-typeset__table{display:inline-block;margin-bottom:.5em;padding:0 .8rem}@media print{.md-typeset__table{display:block}}html .md-typeset__table table{display:table;margin:0;overflow:hidden;width:100%}@media screen and (max-width:44.984375em){.md-content__inner>pre{margin:1em -.8rem}.md-content__inner>pre code{border-radius:0}}.md-typeset .md-author{border-radius:100%;display:block;flex-shrink:0;height:1.6rem;overflow:hidden;position:relative;transition:color 125ms,transform 125ms;width:1.6rem}.md-typeset .md-author img{display:block}.md-typeset .md-author--more{background:var(--md-default-fg-color--lightest);color:var(--md-default-fg-color--lighter);font-size:.6rem;font-weight:700;line-height:1.6rem;text-align:center}.md-typeset .md-author--long{height:2.4rem;width:2.4rem}.md-typeset a.md-author{transform:scale(1)}.md-typeset a.md-author img{border-radius:100%;filter:grayscale(100%) opacity(75%);transition:filter 125ms}.md-typeset a.md-author:focus,.md-typeset a.md-author:hover{transform:scale(1.1);z-index:1}.md-typeset a.md-author:focus img,.md-typeset a.md-author:hover img{filter:grayscale(0)}.md-banner{background-color:var(--md-footer-bg-color);color:var(--md-footer-fg-color);overflow:auto}@media print{.md-banner{display:none}}.md-banner--warning{background-color:var(--md-warning-bg-color);color:var(--md-warning-fg-color)}.md-banner__inner{font-size:.7rem;margin:.6rem auto;padding:0 .8rem}[dir=ltr] .md-banner__button{float:right}[dir=rtl] .md-banner__button{float:left}.md-banner__button{color:inherit;cursor:pointer;transition:opacity .25s}.no-js .md-banner__button{display:none}.md-banner__button:hover{opacity:.7}html{font-size:125%;height:100%;overflow-x:hidden}@media screen and (min-width:100em){html{font-size:137.5%}}@media screen and (min-width:125em){html{font-size:150%}}body{background-color:var(--md-default-bg-color);display:flex;flex-direction:column;font-size:.5rem;min-height:100%;position:relative;width:100%}@media print{body{display:block}}@media screen and (max-width:59.984375em){body[data-md-scrolllock]{position:fixed}}.md-grid{margin-left:auto;margin-right:auto;max-width:61rem}.md-container{display:flex;flex-direction:column;flex-grow:1}@media print{.md-container{display:block}}.md-main{flex-grow:1}.md-main__inner{display:flex;height:100%;margin-top:1.5rem}.md-ellipsis{overflow:hidden;text-overflow:ellipsis}.md-toggle{display:none}.md-option{height:0;opacity:0;position:absolute;width:0}.md-option:checked+label:not([hidden]){display:block}.md-option.focus-visible+label{outline-color:var(--md-accent-fg-color);outline-style:auto}.md-skip{background-color:var(--md-default-fg-color);border-radius:.1rem;color:var(--md-default-bg-color);font-size:.64rem;margin:.5rem;opacity:0;outline-color:var(--md-accent-fg-color);padding:.3rem .5rem;position:fixed;transform:translateY(.4rem);z-index:-1}.md-skip:focus{opacity:1;transform:translateY(0);transition:transform .25s cubic-bezier(.4,0,.2,1),opacity 175ms 75ms;z-index:10}@page{margin:25mm}:root{--md-clipboard-icon:url('data:image/svg+xml;charset=utf-8,')}.md-clipboard{border-radius:.1rem;color:var(--md-default-fg-color--lightest);cursor:pointer;height:1.5em;outline-color:var(--md-accent-fg-color);outline-offset:.1rem;position:absolute;right:.5em;top:.5em;transition:color .25s;width:1.5em;z-index:1}@media print{.md-clipboard{display:none}}.md-clipboard:not(.focus-visible){-webkit-tap-highlight-color:transparent;outline:none}:hover>.md-clipboard{color:var(--md-default-fg-color--light)}.md-clipboard:focus,.md-clipboard:hover{color:var(--md-accent-fg-color)}.md-clipboard:after{background-color:currentcolor;content:"";display:block;height:1.125em;margin:0 auto;-webkit-mask-image:var(--md-clipboard-icon);mask-image:var(--md-clipboard-icon);-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;width:1.125em}.md-clipboard--inline{cursor:pointer}.md-clipboard--inline code{transition:color .25s,background-color .25s}.md-clipboard--inline:focus code,.md-clipboard--inline:hover code{background-color:var(--md-accent-fg-color--transparent);color:var(--md-accent-fg-color)}.md-typeset .md-code__content{display:grid}@keyframes consent{0%{opacity:0;transform:translateY(100%)}to{opacity:1;transform:translateY(0)}}@keyframes overlay{0%{opacity:0}to{opacity:1}}.md-consent__overlay{animation:overlay .25s both;-webkit-backdrop-filter:blur(.1rem);backdrop-filter:blur(.1rem);background-color:#0000008a;height:100%;opacity:1;position:fixed;top:0;width:100%;z-index:5}.md-consent__inner{animation:consent .5s cubic-bezier(.1,.7,.1,1) both;background-color:var(--md-default-bg-color);border:0;border-radius:.1rem;bottom:0;box-shadow:0 0 .2rem #0000001a,0 .2rem .4rem #0003;max-height:100%;overflow:auto;padding:0;position:fixed;width:100%;z-index:5}.md-consent__form{padding:.8rem}.md-consent__settings{display:none;margin:1em 0}input:checked+.md-consent__settings{display:block}.md-consent__controls{margin-bottom:.8rem}.md-typeset .md-consent__controls .md-button{display:inline}@media screen and (max-width:44.984375em){.md-typeset .md-consent__controls .md-button{display:block;margin-top:.4rem;text-align:center;width:100%}}.md-consent label{cursor:pointer}.md-content{flex-grow:1;min-width:0}.md-content__inner{margin:0 .8rem 1.2rem;padding-top:.6rem}@media screen and (min-width:76.25em){[dir=ltr] .md-sidebar--primary:not([hidden])~.md-content>.md-content__inner{margin-left:1.2rem}[dir=ltr] .md-sidebar--secondary:not([hidden])~.md-content>.md-content__inner,[dir=rtl] .md-sidebar--primary:not([hidden])~.md-content>.md-content__inner{margin-right:1.2rem}[dir=rtl] .md-sidebar--secondary:not([hidden])~.md-content>.md-content__inner{margin-left:1.2rem}}.md-content__inner:before{content:"";display:block;height:.4rem}.md-content__inner>:last-child{margin-bottom:0}[dir=ltr] .md-content__button{float:right}[dir=rtl] .md-content__button{float:left}[dir=ltr] .md-content__button{margin-left:.4rem}[dir=rtl] .md-content__button{margin-right:.4rem}.md-content__button{margin:.4rem 0;padding:0}@media print{.md-content__button{display:none}}.md-typeset .md-content__button{color:var(--md-default-fg-color--lighter)}.md-content__button svg{display:inline;vertical-align:top}[dir=rtl] .md-content__button svg{transform:scaleX(-1)}[dir=ltr] .md-dialog{right:.8rem}[dir=rtl] .md-dialog{left:.8rem}.md-dialog{background-color:var(--md-default-fg-color);border-radius:.1rem;bottom:.8rem;box-shadow:var(--md-shadow-z3);min-width:11.1rem;opacity:0;padding:.4rem .6rem;pointer-events:none;position:fixed;transform:translateY(100%);transition:transform 0ms .4s,opacity .4s;z-index:4}@media print{.md-dialog{display:none}}.md-dialog--active{opacity:1;pointer-events:auto;transform:translateY(0);transition:transform .4s cubic-bezier(.075,.85,.175,1),opacity .4s}.md-dialog__inner{color:var(--md-default-bg-color);font-size:.7rem}.md-feedback{margin:2em 0 1em;text-align:center}.md-feedback fieldset{border:none;margin:0;padding:0}.md-feedback__title{font-weight:700;margin:1em auto}.md-feedback__inner{position:relative}.md-feedback__list{display:flex;flex-wrap:wrap;place-content:baseline center;position:relative}.md-feedback__list:hover .md-icon:not(:disabled){color:var(--md-default-fg-color--lighter)}:disabled .md-feedback__list{min-height:1.8rem}.md-feedback__icon{color:var(--md-default-fg-color--light);cursor:pointer;flex-shrink:0;margin:0 .1rem;transition:color 125ms}.md-feedback__icon:not(:disabled).md-icon:hover{color:var(--md-accent-fg-color)}.md-feedback__icon:disabled{color:var(--md-default-fg-color--lightest);pointer-events:none}.md-feedback__note{opacity:0;position:relative;transform:translateY(.4rem);transition:transform .4s cubic-bezier(.1,.7,.1,1),opacity .15s}.md-feedback__note>*{margin:0 auto;max-width:16rem}:disabled .md-feedback__note{opacity:1;transform:translateY(0)}.md-footer{background-color:var(--md-footer-bg-color);color:var(--md-footer-fg-color)}@media print{.md-footer{display:none}}.md-footer__inner{justify-content:space-between;overflow:auto;padding:.2rem}.md-footer__inner:not([hidden]){display:flex}.md-footer__link{align-items:end;display:flex;flex-grow:0.01;margin-bottom:.4rem;margin-top:1rem;max-width:100%;outline-color:var(--md-accent-fg-color);overflow:hidden;transition:opacity .25s}.md-footer__link:focus,.md-footer__link:hover{opacity:.7}[dir=rtl] .md-footer__link svg{transform:scaleX(-1)}@media screen and (max-width:44.984375em){.md-footer__link--prev{flex-shrink:0}.md-footer__link--prev .md-footer__title{display:none}}[dir=ltr] .md-footer__link--next{margin-left:auto}[dir=rtl] .md-footer__link--next{margin-right:auto}.md-footer__link--next{text-align:right}[dir=rtl] .md-footer__link--next{text-align:left}.md-footer__title{flex-grow:1;font-size:.9rem;margin-bottom:.7rem;max-width:calc(100% - 2.4rem);padding:0 1rem;white-space:nowrap}.md-footer__button{margin:.2rem;padding:.4rem}.md-footer__direction{font-size:.64rem;opacity:.7}.md-footer-meta{background-color:var(--md-footer-bg-color--dark)}.md-footer-meta__inner{display:flex;flex-wrap:wrap;justify-content:space-between;padding:.2rem}html .md-footer-meta.md-typeset a{color:var(--md-footer-fg-color--light)}html .md-footer-meta.md-typeset a:focus,html .md-footer-meta.md-typeset a:hover{color:var(--md-footer-fg-color)}.md-copyright{color:var(--md-footer-fg-color--lighter);font-size:.64rem;margin:auto .6rem;padding:.4rem 0;width:100%}@media screen and (min-width:45em){.md-copyright{width:auto}}.md-copyright__highlight{color:var(--md-footer-fg-color--light)}.md-social{display:inline-flex;gap:.2rem;margin:0 .4rem;padding:.2rem 0 .6rem}@media screen and (min-width:45em){.md-social{padding:.6rem 0}}.md-social__link{display:inline-block;height:1.6rem;text-align:center;width:1.6rem}.md-social__link:before{line-height:1.9}.md-social__link svg{fill:currentcolor;max-height:.8rem;vertical-align:-25%}.md-typeset .md-button{border:.1rem solid;border-radius:.1rem;color:var(--md-primary-fg-color);cursor:pointer;display:inline-block;font-weight:700;padding:.625em 2em;transition:color 125ms,background-color 125ms,border-color 125ms}.md-typeset .md-button--primary{background-color:var(--md-primary-fg-color);border-color:var(--md-primary-fg-color);color:var(--md-primary-bg-color)}.md-typeset .md-button:focus,.md-typeset .md-button:hover{background-color:var(--md-accent-fg-color);border-color:var(--md-accent-fg-color);color:var(--md-accent-bg-color)}[dir=ltr] .md-typeset .md-input{border-top-left-radius:.1rem}[dir=ltr] .md-typeset .md-input,[dir=rtl] .md-typeset .md-input{border-top-right-radius:.1rem}[dir=rtl] .md-typeset .md-input{border-top-left-radius:.1rem}.md-typeset .md-input{border-bottom:.1rem solid var(--md-default-fg-color--lighter);box-shadow:var(--md-shadow-z1);font-size:.8rem;height:1.8rem;padding:0 .6rem;transition:border .25s,box-shadow .25s}.md-typeset .md-input:focus,.md-typeset .md-input:hover{border-bottom-color:var(--md-accent-fg-color);box-shadow:var(--md-shadow-z2)}.md-typeset .md-input--stretch{width:100%}.md-header{background-color:var(--md-primary-fg-color);box-shadow:0 0 .2rem #0000,0 .2rem .4rem #0000;color:var(--md-primary-bg-color);display:block;left:0;position:sticky;right:0;top:0;z-index:4}@media print{.md-header{display:none}}.md-header[hidden]{transform:translateY(-100%);transition:transform .25s cubic-bezier(.8,0,.6,1),box-shadow .25s}.md-header--shadow{box-shadow:0 0 .2rem #0000001a,0 .2rem .4rem #0003;transition:transform .25s cubic-bezier(.1,.7,.1,1),box-shadow .25s}.md-header__inner{align-items:center;display:flex;padding:0 .2rem}.md-header__button{color:currentcolor;cursor:pointer;margin:.2rem;outline-color:var(--md-accent-fg-color);padding:.4rem;position:relative;transition:opacity .25s;vertical-align:middle;z-index:1}.md-header__button:hover{opacity:.7}.md-header__button:not([hidden]){display:inline-block}.md-header__button:not(.focus-visible){-webkit-tap-highlight-color:transparent;outline:none}.md-header__button.md-logo{margin:.2rem;padding:.4rem}@media screen and (max-width:76.234375em){.md-header__button.md-logo{display:none}}.md-header__button.md-logo img,.md-header__button.md-logo svg{fill:currentcolor;display:block;height:1.2rem;width:auto}@media screen and (min-width:60em){.md-header__button[for=__search]{display:none}}.no-js .md-header__button[for=__search]{display:none}[dir=rtl] .md-header__button[for=__search] svg{transform:scaleX(-1)}@media screen and (min-width:76.25em){.md-header__button[for=__drawer]{display:none}}.md-header__topic{display:flex;max-width:100%;position:absolute;transition:transform .4s cubic-bezier(.1,.7,.1,1),opacity .15s;white-space:nowrap}.md-header__topic+.md-header__topic{opacity:0;pointer-events:none;transform:translateX(1.25rem);transition:transform .4s cubic-bezier(1,.7,.1,.1),opacity .15s;z-index:-1}[dir=rtl] .md-header__topic+.md-header__topic{transform:translateX(-1.25rem)}.md-header__topic:first-child{font-weight:700}[dir=ltr] .md-header__title{margin-left:1rem;margin-right:.4rem}[dir=rtl] .md-header__title{margin-left:.4rem;margin-right:1rem}.md-header__title{flex-grow:1;font-size:.9rem;height:2.4rem;line-height:2.4rem}.md-header__title--active .md-header__topic{opacity:0;pointer-events:none;transform:translateX(-1.25rem);transition:transform .4s cubic-bezier(1,.7,.1,.1),opacity .15s;z-index:-1}[dir=rtl] .md-header__title--active .md-header__topic{transform:translateX(1.25rem)}.md-header__title--active .md-header__topic+.md-header__topic{opacity:1;pointer-events:auto;transform:translateX(0);transition:transform .4s cubic-bezier(.1,.7,.1,1),opacity .15s;z-index:0}.md-header__title>.md-header__ellipsis{height:100%;position:relative;width:100%}.md-header__option{display:flex;flex-shrink:0;max-width:100%;transition:max-width 0ms .25s,opacity .25s .25s;white-space:nowrap}[data-md-toggle=search]:checked~.md-header .md-header__option{max-width:0;opacity:0;transition:max-width 0ms,opacity 0ms}.md-header__option>input{bottom:0}.md-header__source{display:none}@media screen and (min-width:60em){[dir=ltr] .md-header__source{margin-left:1rem}[dir=rtl] .md-header__source{margin-right:1rem}.md-header__source{display:block;max-width:11.7rem;width:11.7rem}}@media screen and (min-width:76.25em){[dir=ltr] .md-header__source{margin-left:1.4rem}[dir=rtl] .md-header__source{margin-right:1.4rem}}.md-meta{color:var(--md-default-fg-color--light);font-size:.7rem;line-height:1.3}.md-meta__list{display:inline-flex;flex-wrap:wrap;list-style:none;margin:0;padding:0}.md-meta__item:not(:last-child):after{content:"·";margin-left:.2rem;margin-right:.2rem}.md-meta__link{color:var(--md-typeset-a-color)}.md-meta__link:focus,.md-meta__link:hover{color:var(--md-accent-fg-color)}.md-draft{background-color:#ff1744;border-radius:.125em;color:#fff;display:inline-block;font-weight:700;padding-left:.5714285714em;padding-right:.5714285714em}:root{--md-nav-icon--prev:url('data:image/svg+xml;charset=utf-8,');--md-nav-icon--next:url('data:image/svg+xml;charset=utf-8,');--md-toc-icon:url('data:image/svg+xml;charset=utf-8,')}.md-nav{font-size:.7rem;line-height:1.3}.md-nav__title{color:var(--md-default-fg-color--light);display:block;font-weight:700;overflow:hidden;padding:0 .6rem;text-overflow:ellipsis}.md-nav__title .md-nav__button{display:none}.md-nav__title .md-nav__button img{height:100%;width:auto}.md-nav__title .md-nav__button.md-logo img,.md-nav__title .md-nav__button.md-logo svg{fill:currentcolor;display:block;height:2.4rem;max-width:100%;object-fit:contain;width:auto}.md-nav__list{list-style:none;margin:0;padding:0}.md-nav__link{align-items:flex-start;display:flex;gap:.4rem;margin-top:.625em;scroll-snap-align:start;transition:color 125ms}.md-nav__link--passed{color:var(--md-default-fg-color--light)}.md-nav__item .md-nav__link--active,.md-nav__item .md-nav__link--active code{color:var(--md-typeset-a-color)}.md-nav__link .md-ellipsis{position:relative}[dir=ltr] .md-nav__link .md-icon:last-child{margin-left:auto}[dir=rtl] .md-nav__link .md-icon:last-child{margin-right:auto}.md-nav__link svg{fill:currentcolor;flex-shrink:0;height:1.3em;position:relative}.md-nav__link[for]:focus,.md-nav__link[for]:hover,.md-nav__link[href]:focus,.md-nav__link[href]:hover{color:var(--md-accent-fg-color);cursor:pointer}.md-nav__link.focus-visible{outline-color:var(--md-accent-fg-color);outline-offset:.2rem}.md-nav--primary .md-nav__link[for=__toc]{display:none}.md-nav--primary .md-nav__link[for=__toc] .md-icon:after{background-color:currentcolor;display:block;height:100%;-webkit-mask-image:var(--md-toc-icon);mask-image:var(--md-toc-icon);width:100%}.md-nav--primary .md-nav__link[for=__toc]~.md-nav{display:none}.md-nav__container>.md-nav__link{margin-top:0}.md-nav__container>.md-nav__link:first-child{flex-grow:1;min-width:0}.md-nav__icon{flex-shrink:0}.md-nav__source{display:none}@media screen and (max-width:76.234375em){.md-nav--primary,.md-nav--primary .md-nav{background-color:var(--md-default-bg-color);display:flex;flex-direction:column;height:100%;left:0;position:absolute;right:0;top:0;z-index:1}.md-nav--primary .md-nav__item,.md-nav--primary .md-nav__title{font-size:.8rem;line-height:1.5}.md-nav--primary .md-nav__title{background-color:var(--md-default-fg-color--lightest);color:var(--md-default-fg-color--light);cursor:pointer;height:5.6rem;line-height:2.4rem;padding:3rem .8rem .2rem;position:relative;white-space:nowrap}[dir=ltr] .md-nav--primary .md-nav__title .md-nav__icon{left:.4rem}[dir=rtl] .md-nav--primary .md-nav__title .md-nav__icon{right:.4rem}.md-nav--primary .md-nav__title .md-nav__icon{display:block;height:1.2rem;margin:.2rem;position:absolute;top:.4rem;width:1.2rem}.md-nav--primary .md-nav__title .md-nav__icon:after{background-color:currentcolor;content:"";display:block;height:100%;-webkit-mask-image:var(--md-nav-icon--prev);mask-image:var(--md-nav-icon--prev);-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;width:100%}.md-nav--primary .md-nav__title~.md-nav__list{background-color:var(--md-default-bg-color);box-shadow:0 .05rem 0 var(--md-default-fg-color--lightest) inset;overflow-y:auto;scroll-snap-type:y mandatory;touch-action:pan-y}.md-nav--primary .md-nav__title~.md-nav__list>:first-child{border-top:0}.md-nav--primary .md-nav__title[for=__drawer]{background-color:var(--md-primary-fg-color);color:var(--md-primary-bg-color);font-weight:700}.md-nav--primary .md-nav__title .md-logo{display:block;left:.2rem;margin:.2rem;padding:.4rem;position:absolute;right:.2rem;top:.2rem}.md-nav--primary .md-nav__list{flex:1}.md-nav--primary .md-nav__item{border-top:.05rem solid var(--md-default-fg-color--lightest)}.md-nav--primary .md-nav__item--active>.md-nav__link{color:var(--md-typeset-a-color)}.md-nav--primary .md-nav__item--active>.md-nav__link:focus,.md-nav--primary .md-nav__item--active>.md-nav__link:hover{color:var(--md-accent-fg-color)}.md-nav--primary .md-nav__link{margin-top:0;padding:.6rem .8rem}.md-nav--primary .md-nav__link svg{margin-top:.1em}.md-nav--primary .md-nav__link>.md-nav__link{padding:0}[dir=ltr] .md-nav--primary .md-nav__link .md-nav__icon{margin-right:-.2rem}[dir=rtl] .md-nav--primary .md-nav__link .md-nav__icon{margin-left:-.2rem}.md-nav--primary .md-nav__link .md-nav__icon{font-size:1.2rem;height:1.2rem;width:1.2rem}.md-nav--primary .md-nav__link .md-nav__icon:after{background-color:currentcolor;content:"";display:block;height:100%;-webkit-mask-image:var(--md-nav-icon--next);mask-image:var(--md-nav-icon--next);-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;width:100%}[dir=rtl] .md-nav--primary .md-nav__icon:after{transform:scale(-1)}.md-nav--primary .md-nav--secondary .md-nav{background-color:initial;position:static}[dir=ltr] .md-nav--primary .md-nav--secondary .md-nav .md-nav__link{padding-left:1.4rem}[dir=rtl] .md-nav--primary .md-nav--secondary .md-nav .md-nav__link{padding-right:1.4rem}[dir=ltr] .md-nav--primary .md-nav--secondary .md-nav .md-nav .md-nav__link{padding-left:2rem}[dir=rtl] .md-nav--primary .md-nav--secondary .md-nav .md-nav .md-nav__link{padding-right:2rem}[dir=ltr] .md-nav--primary .md-nav--secondary .md-nav .md-nav .md-nav .md-nav__link{padding-left:2.6rem}[dir=rtl] .md-nav--primary .md-nav--secondary .md-nav .md-nav .md-nav .md-nav__link{padding-right:2.6rem}[dir=ltr] .md-nav--primary .md-nav--secondary .md-nav .md-nav .md-nav .md-nav .md-nav__link{padding-left:3.2rem}[dir=rtl] .md-nav--primary .md-nav--secondary .md-nav .md-nav .md-nav .md-nav .md-nav__link{padding-right:3.2rem}.md-nav--secondary{background-color:initial}.md-nav__toggle~.md-nav{display:flex;opacity:0;transform:translateX(100%);transition:transform .25s cubic-bezier(.8,0,.6,1),opacity 125ms 50ms}[dir=rtl] .md-nav__toggle~.md-nav{transform:translateX(-100%)}.md-nav__toggle:checked~.md-nav{opacity:1;transform:translateX(0);transition:transform .25s cubic-bezier(.4,0,.2,1),opacity 125ms 125ms}.md-nav__toggle:checked~.md-nav>.md-nav__list{-webkit-backface-visibility:hidden;backface-visibility:hidden}}@media screen and (max-width:59.984375em){.md-nav--primary .md-nav__link[for=__toc]{display:flex}.md-nav--primary .md-nav__link[for=__toc] .md-icon:after{content:""}.md-nav--primary .md-nav__link[for=__toc]+.md-nav__link{display:none}.md-nav--primary .md-nav__link[for=__toc]~.md-nav{display:flex}.md-nav__source{background-color:var(--md-primary-fg-color--dark);color:var(--md-primary-bg-color);display:block;padding:0 .2rem}}@media screen and (min-width:60em) and (max-width:76.234375em){.md-nav--integrated .md-nav__link[for=__toc]{display:flex}.md-nav--integrated .md-nav__link[for=__toc] .md-icon:after{content:""}.md-nav--integrated .md-nav__link[for=__toc]+.md-nav__link{display:none}.md-nav--integrated .md-nav__link[for=__toc]~.md-nav{display:flex}}@media screen and (min-width:60em){.md-nav{margin-bottom:-.4rem}.md-nav--secondary .md-nav__title{background:var(--md-default-bg-color);box-shadow:0 0 .4rem .4rem var(--md-default-bg-color);position:sticky;top:0;z-index:1}.md-nav--secondary .md-nav__title[for=__toc]{scroll-snap-align:start}.md-nav--secondary .md-nav__title .md-nav__icon{display:none}[dir=ltr] .md-nav--secondary .md-nav__list{padding-left:.6rem}[dir=rtl] .md-nav--secondary .md-nav__list{padding-right:.6rem}.md-nav--secondary .md-nav__list{padding-bottom:.4rem}[dir=ltr] .md-nav--secondary .md-nav__item>.md-nav__link{margin-right:.4rem}[dir=rtl] .md-nav--secondary .md-nav__item>.md-nav__link{margin-left:.4rem}}@media screen and (min-width:76.25em){.md-nav{margin-bottom:-.4rem;transition:max-height .25s cubic-bezier(.86,0,.07,1)}.md-nav--primary .md-nav__title{background:var(--md-default-bg-color);box-shadow:0 0 .4rem .4rem var(--md-default-bg-color);position:sticky;top:0;z-index:1}.md-nav--primary .md-nav__title[for=__drawer]{scroll-snap-align:start}.md-nav--primary .md-nav__title .md-nav__icon{display:none}[dir=ltr] .md-nav--primary .md-nav__list{padding-left:.6rem}[dir=rtl] .md-nav--primary .md-nav__list{padding-right:.6rem}.md-nav--primary .md-nav__list{padding-bottom:.4rem}[dir=ltr] .md-nav--primary .md-nav__item>.md-nav__link{margin-right:.4rem}[dir=rtl] .md-nav--primary .md-nav__item>.md-nav__link{margin-left:.4rem}.md-nav__toggle~.md-nav{display:grid;grid-template-rows:0fr;opacity:0;transition:grid-template-rows .25s cubic-bezier(.86,0,.07,1),opacity .25s,visibility 0ms .25s;visibility:collapse}.md-nav__toggle~.md-nav>.md-nav__list{overflow:hidden}.md-nav__toggle.md-toggle--indeterminate~.md-nav,.md-nav__toggle:checked~.md-nav{grid-template-rows:1fr;opacity:1;transition:grid-template-rows .25s cubic-bezier(.86,0,.07,1),opacity .15s .1s,visibility 0ms;visibility:visible}.md-nav__toggle.md-toggle--indeterminate~.md-nav{transition:none}.md-nav__item--nested>.md-nav>.md-nav__title{display:none}.md-nav__item--section{display:block;margin:1.25em 0}.md-nav__item--section:last-child{margin-bottom:0}.md-nav__item--section>.md-nav__link{font-weight:700}.md-nav__item--section>.md-nav__link[for]{color:var(--md-default-fg-color--light)}.md-nav__item--section>.md-nav__link:not(.md-nav__container){pointer-events:none}.md-nav__item--section>.md-nav__link .md-icon,.md-nav__item--section>.md-nav__link>[for]{display:none}[dir=ltr] .md-nav__item--section>.md-nav{margin-left:-.6rem}[dir=rtl] .md-nav__item--section>.md-nav{margin-right:-.6rem}.md-nav__item--section>.md-nav{display:block;opacity:1;visibility:visible}.md-nav__item--section>.md-nav>.md-nav__list>.md-nav__item{padding:0}.md-nav__icon{border-radius:100%;height:.9rem;transition:background-color .25s;width:.9rem}.md-nav__icon:hover{background-color:var(--md-accent-fg-color--transparent)}.md-nav__icon:after{background-color:currentcolor;border-radius:100%;content:"";display:inline-block;height:100%;-webkit-mask-image:var(--md-nav-icon--next);mask-image:var(--md-nav-icon--next);-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;transition:transform .25s;vertical-align:-.1rem;width:100%}[dir=rtl] .md-nav__icon:after{transform:rotate(180deg)}.md-nav__item--nested .md-nav__toggle:checked~.md-nav__link .md-nav__icon:after,.md-nav__item--nested .md-toggle--indeterminate~.md-nav__link .md-nav__icon:after{transform:rotate(90deg)}.md-nav--lifted>.md-nav__list>.md-nav__item,.md-nav--lifted>.md-nav__title{display:none}.md-nav--lifted>.md-nav__list>.md-nav__item--active{display:block}.md-nav--lifted>.md-nav__list>.md-nav__item--active>.md-nav__link{background:var(--md-default-bg-color);box-shadow:0 0 .4rem .4rem var(--md-default-bg-color);margin-top:0;position:sticky;top:0;z-index:1}.md-nav--lifted>.md-nav__list>.md-nav__item--active>.md-nav__link:not(.md-nav__container){pointer-events:none}.md-nav--lifted>.md-nav__list>.md-nav__item--active.md-nav__item--section{margin:0}[dir=ltr] .md-nav--lifted>.md-nav__list>.md-nav__item>.md-nav:not(.md-nav--secondary){margin-left:-.6rem}[dir=rtl] .md-nav--lifted>.md-nav__list>.md-nav__item>.md-nav:not(.md-nav--secondary){margin-right:-.6rem}.md-nav--lifted>.md-nav__list>.md-nav__item>[for]{color:var(--md-default-fg-color--light)}.md-nav--lifted .md-nav[data-md-level="1"]{grid-template-rows:1fr;opacity:1;visibility:visible}[dir=ltr] .md-nav--integrated>.md-nav__list>.md-nav__item--active .md-nav--secondary{border-left:.05rem solid var(--md-primary-fg-color)}[dir=rtl] .md-nav--integrated>.md-nav__list>.md-nav__item--active .md-nav--secondary{border-right:.05rem solid var(--md-primary-fg-color)}.md-nav--integrated>.md-nav__list>.md-nav__item--active .md-nav--secondary{display:block;margin-bottom:1.25em;opacity:1;visibility:visible}.md-nav--integrated>.md-nav__list>.md-nav__item--active .md-nav--secondary>.md-nav__list{overflow:visible;padding-bottom:0}.md-nav--integrated>.md-nav__list>.md-nav__item--active .md-nav--secondary>.md-nav__title{display:none}}.md-pagination{font-size:.8rem;font-weight:700;gap:.4rem}.md-pagination,.md-pagination>*{align-items:center;display:flex;justify-content:center}.md-pagination>*{border-radius:.2rem;height:1.8rem;min-width:1.8rem;text-align:center}.md-pagination__current{background-color:var(--md-default-fg-color--lightest);color:var(--md-default-fg-color--light)}.md-pagination__link{transition:color 125ms,background-color 125ms}.md-pagination__link:focus,.md-pagination__link:hover{background-color:var(--md-accent-fg-color--transparent);color:var(--md-accent-fg-color)}.md-pagination__link:focus svg,.md-pagination__link:hover svg{color:var(--md-accent-fg-color)}.md-pagination__link.focus-visible{outline-color:var(--md-accent-fg-color);outline-offset:.2rem}.md-pagination__link svg{fill:currentcolor;color:var(--md-default-fg-color--lighter);display:block;max-height:100%;width:1.2rem}.md-post__back{border-bottom:.05rem solid var(--md-default-fg-color--lightest);margin-bottom:1.2rem;padding-bottom:1.2rem}@media screen and (max-width:76.234375em){.md-post__back{display:none}}[dir=rtl] .md-post__back svg{transform:scaleX(-1)}.md-post__authors{display:flex;flex-direction:column;gap:.6rem;margin:0 .6rem 1.2rem}.md-post .md-post__meta a{transition:color 125ms}.md-post .md-post__meta a:focus,.md-post .md-post__meta a:hover{color:var(--md-accent-fg-color)}.md-post__title{color:var(--md-default-fg-color--light);font-weight:700}.md-post--excerpt{margin-bottom:3.2rem}.md-post--excerpt .md-post__header{align-items:center;display:flex;gap:.6rem;min-height:1.6rem}.md-post--excerpt .md-post__authors{align-items:center;display:inline-flex;flex-direction:row;gap:.2rem;margin:0;min-height:2.4rem}[dir=ltr] .md-post--excerpt .md-post__meta .md-meta__list{margin-right:.4rem}[dir=rtl] .md-post--excerpt .md-post__meta .md-meta__list{margin-left:.4rem}.md-post--excerpt .md-post__content>:first-child{--md-scroll-margin:6rem;margin-top:0}.md-post>.md-nav--secondary{margin:1em 0}.md-profile{align-items:center;display:flex;font-size:.7rem;gap:.6rem;line-height:1.4;width:100%}.md-profile__description{flex-grow:1}.md-content--post{display:flex}@media screen and (max-width:76.234375em){.md-content--post{flex-flow:column-reverse}}.md-content--post>.md-content__inner{min-width:0}@media screen and (min-width:76.25em){[dir=ltr] .md-content--post>.md-content__inner{margin-left:1.2rem}[dir=rtl] .md-content--post>.md-content__inner{margin-right:1.2rem}}@media screen and (max-width:76.234375em){.md-sidebar.md-sidebar--post{padding:0;position:static;width:100%}.md-sidebar.md-sidebar--post .md-sidebar__scrollwrap{overflow:visible}.md-sidebar.md-sidebar--post .md-sidebar__inner{padding:0}.md-sidebar.md-sidebar--post .md-post__meta{margin-left:.6rem;margin-right:.6rem}.md-sidebar.md-sidebar--post .md-nav__item{border:none;display:inline}.md-sidebar.md-sidebar--post .md-nav__list{display:inline-flex;flex-wrap:wrap;gap:.6rem;padding-bottom:.6rem;padding-top:.6rem}.md-sidebar.md-sidebar--post .md-nav__link{padding:0}.md-sidebar.md-sidebar--post .md-nav{height:auto;margin-bottom:0;position:static}}:root{--md-progress-value:0;--md-progress-delay:400ms}.md-progress{background:var(--md-primary-bg-color);height:.075rem;opacity:min(clamp(0,var(--md-progress-value),1),clamp(0,100 - var(--md-progress-value),1));position:fixed;top:0;transform:scaleX(calc(var(--md-progress-value)*1%));transform-origin:left;transition:transform .5s cubic-bezier(.19,1,.22,1),opacity .25s var(--md-progress-delay);width:100%;z-index:4}:root{--md-search-result-icon:url('data:image/svg+xml;charset=utf-8,')}.md-search{position:relative}@media screen and (min-width:60em){.md-search{padding:.2rem 0}}.no-js .md-search{display:none}.md-search__overlay{opacity:0;z-index:1}@media screen and (max-width:59.984375em){[dir=ltr] .md-search__overlay{left:-2.2rem}[dir=rtl] .md-search__overlay{right:-2.2rem}.md-search__overlay{background-color:var(--md-default-bg-color);border-radius:1rem;height:2rem;overflow:hidden;pointer-events:none;position:absolute;top:-1rem;transform-origin:center;transition:transform .3s .1s,opacity .2s .2s;width:2rem}[data-md-toggle=search]:checked~.md-header .md-search__overlay{opacity:1;transition:transform .4s,opacity .1s}}@media screen and (min-width:60em){[dir=ltr] .md-search__overlay{left:0}[dir=rtl] .md-search__overlay{right:0}.md-search__overlay{background-color:#0000008a;cursor:pointer;height:0;position:fixed;top:0;transition:width 0ms .25s,height 0ms .25s,opacity .25s;width:0}[data-md-toggle=search]:checked~.md-header .md-search__overlay{height:200vh;opacity:1;transition:width 0ms,height 0ms,opacity .25s;width:100%}}@media screen and (max-width:29.984375em){[data-md-toggle=search]:checked~.md-header .md-search__overlay{transform:scale(45)}}@media screen and (min-width:30em) and (max-width:44.984375em){[data-md-toggle=search]:checked~.md-header .md-search__overlay{transform:scale(60)}}@media screen and (min-width:45em) and (max-width:59.984375em){[data-md-toggle=search]:checked~.md-header .md-search__overlay{transform:scale(75)}}.md-search__inner{-webkit-backface-visibility:hidden;backface-visibility:hidden}@media screen and (max-width:59.984375em){[dir=ltr] .md-search__inner{left:0}[dir=rtl] .md-search__inner{right:0}.md-search__inner{height:0;opacity:0;overflow:hidden;position:fixed;top:0;transform:translateX(5%);transition:width 0ms .3s,height 0ms .3s,transform .15s cubic-bezier(.4,0,.2,1) .15s,opacity .15s .15s;width:0;z-index:2}[dir=rtl] .md-search__inner{transform:translateX(-5%)}[data-md-toggle=search]:checked~.md-header .md-search__inner{height:100%;opacity:1;transform:translateX(0);transition:width 0ms 0ms,height 0ms 0ms,transform .15s cubic-bezier(.1,.7,.1,1) .15s,opacity .15s .15s;width:100%}}@media screen and (min-width:60em){[dir=ltr] .md-search__inner{float:right}[dir=rtl] .md-search__inner{float:left}.md-search__inner{padding:.1rem 0;position:relative;transition:width .25s cubic-bezier(.1,.7,.1,1);width:11.7rem}}@media screen and (min-width:60em) and (max-width:76.234375em){[data-md-toggle=search]:checked~.md-header .md-search__inner{width:23.4rem}}@media screen and (min-width:76.25em){[data-md-toggle=search]:checked~.md-header .md-search__inner{width:34.4rem}}.md-search__form{background-color:var(--md-default-bg-color);box-shadow:0 0 .6rem #0000;height:2.4rem;position:relative;transition:color .25s,background-color .25s;z-index:2}@media screen and (min-width:60em){.md-search__form{background-color:#00000042;border-radius:.1rem;height:1.8rem}.md-search__form:hover{background-color:#ffffff1f}}[data-md-toggle=search]:checked~.md-header .md-search__form{background-color:var(--md-default-bg-color);border-radius:.1rem .1rem 0 0;box-shadow:0 0 .6rem #00000012;color:var(--md-default-fg-color)}[dir=ltr] .md-search__input{padding-left:3.6rem;padding-right:2.2rem}[dir=rtl] .md-search__input{padding-left:2.2rem;padding-right:3.6rem}.md-search__input{background:#0000;font-size:.9rem;height:100%;position:relative;text-overflow:ellipsis;width:100%;z-index:2}.md-search__input::placeholder{transition:color .25s}.md-search__input::placeholder,.md-search__input~.md-search__icon{color:var(--md-default-fg-color--light)}.md-search__input::-ms-clear{display:none}@media screen and (max-width:59.984375em){.md-search__input{font-size:.9rem;height:2.4rem;width:100%}}@media screen and (min-width:60em){[dir=ltr] .md-search__input{padding-left:2.2rem}[dir=rtl] .md-search__input{padding-right:2.2rem}.md-search__input{color:inherit;font-size:.8rem}.md-search__input::placeholder{color:var(--md-primary-bg-color--light)}.md-search__input+.md-search__icon{color:var(--md-primary-bg-color)}[data-md-toggle=search]:checked~.md-header .md-search__input{text-overflow:clip}[data-md-toggle=search]:checked~.md-header .md-search__input+.md-search__icon{color:var(--md-default-fg-color--light)}[data-md-toggle=search]:checked~.md-header .md-search__input::placeholder{color:#0000}}.md-search__icon{cursor:pointer;display:inline-block;height:1.2rem;transition:color .25s,opacity .25s;width:1.2rem}.md-search__icon:hover{opacity:.7}[dir=ltr] .md-search__icon[for=__search]{left:.5rem}[dir=rtl] .md-search__icon[for=__search]{right:.5rem}.md-search__icon[for=__search]{position:absolute;top:.3rem;z-index:2}[dir=rtl] .md-search__icon[for=__search] svg{transform:scaleX(-1)}@media screen and (max-width:59.984375em){[dir=ltr] .md-search__icon[for=__search]{left:.8rem}[dir=rtl] .md-search__icon[for=__search]{right:.8rem}.md-search__icon[for=__search]{top:.6rem}.md-search__icon[for=__search] svg:first-child{display:none}}@media screen and (min-width:60em){.md-search__icon[for=__search]{pointer-events:none}.md-search__icon[for=__search] svg:last-child{display:none}}[dir=ltr] .md-search__options{right:.5rem}[dir=rtl] .md-search__options{left:.5rem}.md-search__options{pointer-events:none;position:absolute;top:.3rem;z-index:2}@media screen and (max-width:59.984375em){[dir=ltr] .md-search__options{right:.8rem}[dir=rtl] .md-search__options{left:.8rem}.md-search__options{top:.6rem}}[dir=ltr] .md-search__options>.md-icon{margin-left:.2rem}[dir=rtl] .md-search__options>.md-icon{margin-right:.2rem}.md-search__options>.md-icon{color:var(--md-default-fg-color--light);opacity:0;transform:scale(.75);transition:transform .15s cubic-bezier(.1,.7,.1,1),opacity .15s}.md-search__options>.md-icon:not(.focus-visible){-webkit-tap-highlight-color:transparent;outline:none}[data-md-toggle=search]:checked~.md-header .md-search__input:valid~.md-search__options>.md-icon{opacity:1;pointer-events:auto;transform:scale(1)}[data-md-toggle=search]:checked~.md-header .md-search__input:valid~.md-search__options>.md-icon:hover{opacity:.7}[dir=ltr] .md-search__suggest{padding-left:3.6rem;padding-right:2.2rem}[dir=rtl] .md-search__suggest{padding-left:2.2rem;padding-right:3.6rem}.md-search__suggest{align-items:center;color:var(--md-default-fg-color--lighter);display:flex;font-size:.9rem;height:100%;opacity:0;position:absolute;top:0;transition:opacity 50ms;white-space:nowrap;width:100%}@media screen and (min-width:60em){[dir=ltr] .md-search__suggest{padding-left:2.2rem}[dir=rtl] .md-search__suggest{padding-right:2.2rem}.md-search__suggest{font-size:.8rem}}[data-md-toggle=search]:checked~.md-header .md-search__suggest{opacity:1;transition:opacity .3s .1s}[dir=ltr] .md-search__output{border-bottom-left-radius:.1rem}[dir=ltr] .md-search__output,[dir=rtl] .md-search__output{border-bottom-right-radius:.1rem}[dir=rtl] .md-search__output{border-bottom-left-radius:.1rem}.md-search__output{overflow:hidden;position:absolute;width:100%;z-index:1}@media screen and (max-width:59.984375em){.md-search__output{bottom:0;top:2.4rem}}@media screen and (min-width:60em){.md-search__output{opacity:0;top:1.9rem;transition:opacity .4s}[data-md-toggle=search]:checked~.md-header .md-search__output{box-shadow:var(--md-shadow-z3);opacity:1}}.md-search__scrollwrap{-webkit-backface-visibility:hidden;backface-visibility:hidden;background-color:var(--md-default-bg-color);height:100%;overflow-y:auto;touch-action:pan-y}@media (-webkit-max-device-pixel-ratio:1),(max-resolution:1dppx){.md-search__scrollwrap{transform:translateZ(0)}}@media screen and (min-width:60em) and (max-width:76.234375em){.md-search__scrollwrap{width:23.4rem}}@media screen and (min-width:76.25em){.md-search__scrollwrap{width:34.4rem}}@media screen and (min-width:60em){.md-search__scrollwrap{max-height:0;scrollbar-color:var(--md-default-fg-color--lighter) #0000;scrollbar-width:thin}[data-md-toggle=search]:checked~.md-header .md-search__scrollwrap{max-height:75vh}.md-search__scrollwrap:hover{scrollbar-color:var(--md-accent-fg-color) #0000}.md-search__scrollwrap::-webkit-scrollbar{height:.2rem;width:.2rem}.md-search__scrollwrap::-webkit-scrollbar-thumb{background-color:var(--md-default-fg-color--lighter)}.md-search__scrollwrap::-webkit-scrollbar-thumb:hover{background-color:var(--md-accent-fg-color)}}.md-search-result{color:var(--md-default-fg-color);word-break:break-word}.md-search-result__meta{background-color:var(--md-default-fg-color--lightest);color:var(--md-default-fg-color--light);font-size:.64rem;line-height:1.8rem;padding:0 .8rem;scroll-snap-align:start}@media screen and (min-width:60em){[dir=ltr] .md-search-result__meta{padding-left:2.2rem}[dir=rtl] .md-search-result__meta{padding-right:2.2rem}}.md-search-result__list{list-style:none;margin:0;padding:0;-webkit-user-select:none;user-select:none}.md-search-result__item{box-shadow:0 -.05rem var(--md-default-fg-color--lightest)}.md-search-result__item:first-child{box-shadow:none}.md-search-result__link{display:block;outline:none;scroll-snap-align:start;transition:background-color .25s}.md-search-result__link:focus,.md-search-result__link:hover{background-color:var(--md-accent-fg-color--transparent)}.md-search-result__link:last-child p:last-child{margin-bottom:.6rem}.md-search-result__more>summary{cursor:pointer;display:block;outline:none;position:sticky;scroll-snap-align:start;top:0;z-index:1}.md-search-result__more>summary::marker{display:none}.md-search-result__more>summary::-webkit-details-marker{display:none}.md-search-result__more>summary>div{color:var(--md-typeset-a-color);font-size:.64rem;padding:.75em .8rem;transition:color .25s,background-color .25s}@media screen and (min-width:60em){[dir=ltr] .md-search-result__more>summary>div{padding-left:2.2rem}[dir=rtl] .md-search-result__more>summary>div{padding-right:2.2rem}}.md-search-result__more>summary:focus>div,.md-search-result__more>summary:hover>div{background-color:var(--md-accent-fg-color--transparent);color:var(--md-accent-fg-color)}.md-search-result__more[open]>summary{background-color:var(--md-default-bg-color)}.md-search-result__article{overflow:hidden;padding:0 .8rem;position:relative}@media screen and (min-width:60em){[dir=ltr] .md-search-result__article{padding-left:2.2rem}[dir=rtl] .md-search-result__article{padding-right:2.2rem}}[dir=ltr] .md-search-result__icon{left:0}[dir=rtl] .md-search-result__icon{right:0}.md-search-result__icon{color:var(--md-default-fg-color--light);height:1.2rem;margin:.5rem;position:absolute;width:1.2rem}@media screen and (max-width:59.984375em){.md-search-result__icon{display:none}}.md-search-result__icon:after{background-color:currentcolor;content:"";display:inline-block;height:100%;-webkit-mask-image:var(--md-search-result-icon);mask-image:var(--md-search-result-icon);-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;width:100%}[dir=rtl] .md-search-result__icon:after{transform:scaleX(-1)}.md-search-result .md-typeset{color:var(--md-default-fg-color--light);font-size:.64rem;line-height:1.6}.md-search-result .md-typeset h1{color:var(--md-default-fg-color);font-size:.8rem;font-weight:400;line-height:1.4;margin:.55rem 0}.md-search-result .md-typeset h1 mark{text-decoration:none}.md-search-result .md-typeset h2{color:var(--md-default-fg-color);font-size:.64rem;font-weight:700;line-height:1.6;margin:.5em 0}.md-search-result .md-typeset h2 mark{text-decoration:none}.md-search-result__terms{color:var(--md-default-fg-color);display:block;font-size:.64rem;font-style:italic;margin:.5em 0}.md-search-result mark{background-color:initial;color:var(--md-accent-fg-color);text-decoration:underline}.md-select{position:relative;z-index:1}.md-select__inner{background-color:var(--md-default-bg-color);border-radius:.1rem;box-shadow:var(--md-shadow-z2);color:var(--md-default-fg-color);left:50%;margin-top:.2rem;max-height:0;opacity:0;position:absolute;top:calc(100% - .2rem);transform:translate3d(-50%,.3rem,0);transition:transform .25s 375ms,opacity .25s .25s,max-height 0ms .5s}.md-select:focus-within .md-select__inner,.md-select:hover .md-select__inner{max-height:10rem;opacity:1;transform:translate3d(-50%,0,0);transition:transform .25s cubic-bezier(.1,.7,.1,1),opacity .25s,max-height 0ms}.md-select__inner:after{border-bottom:.2rem solid #0000;border-bottom-color:var(--md-default-bg-color);border-left:.2rem solid #0000;border-right:.2rem solid #0000;border-top:0;content:"";height:0;left:50%;margin-left:-.2rem;margin-top:-.2rem;position:absolute;top:0;width:0}.md-select__list{border-radius:.1rem;font-size:.8rem;list-style-type:none;margin:0;max-height:inherit;overflow:auto;padding:0}.md-select__item{line-height:1.8rem}[dir=ltr] .md-select__link{padding-left:.6rem;padding-right:1.2rem}[dir=rtl] .md-select__link{padding-left:1.2rem;padding-right:.6rem}.md-select__link{cursor:pointer;display:block;outline:none;scroll-snap-align:start;transition:background-color .25s,color .25s;width:100%}.md-select__link:focus,.md-select__link:hover{color:var(--md-accent-fg-color)}.md-select__link:focus{background-color:var(--md-default-fg-color--lightest)}.md-sidebar{align-self:flex-start;flex-shrink:0;padding:1.2rem 0;position:sticky;top:2.4rem;width:12.1rem}@media print{.md-sidebar{display:none}}@media screen and (max-width:76.234375em){[dir=ltr] .md-sidebar--primary{left:-12.1rem}[dir=rtl] .md-sidebar--primary{right:-12.1rem}.md-sidebar--primary{background-color:var(--md-default-bg-color);display:block;height:100%;position:fixed;top:0;transform:translateX(0);transition:transform .25s cubic-bezier(.4,0,.2,1),box-shadow .25s;width:12.1rem;z-index:5}[data-md-toggle=drawer]:checked~.md-container .md-sidebar--primary{box-shadow:var(--md-shadow-z3);transform:translateX(12.1rem)}[dir=rtl] [data-md-toggle=drawer]:checked~.md-container .md-sidebar--primary{transform:translateX(-12.1rem)}.md-sidebar--primary .md-sidebar__scrollwrap{bottom:0;left:0;margin:0;overflow:hidden;position:absolute;right:0;scroll-snap-type:none;top:0}}@media screen and (min-width:76.25em){.md-sidebar{height:0}.no-js .md-sidebar{height:auto}.md-header--lifted~.md-container .md-sidebar{top:4.8rem}}.md-sidebar--secondary{display:none;order:2}@media screen and (min-width:60em){.md-sidebar--secondary{height:0}.no-js .md-sidebar--secondary{height:auto}.md-sidebar--secondary:not([hidden]){display:block}.md-sidebar--secondary .md-sidebar__scrollwrap{touch-action:pan-y}}.md-sidebar__scrollwrap{scrollbar-gutter:stable;-webkit-backface-visibility:hidden;backface-visibility:hidden;margin:0 .2rem;overflow-y:auto;scrollbar-color:var(--md-default-fg-color--lighter) #0000;scrollbar-width:thin}.md-sidebar__scrollwrap::-webkit-scrollbar{height:.2rem;width:.2rem}.md-sidebar__scrollwrap:focus-within,.md-sidebar__scrollwrap:hover{scrollbar-color:var(--md-accent-fg-color) #0000}.md-sidebar__scrollwrap:focus-within::-webkit-scrollbar-thumb,.md-sidebar__scrollwrap:hover::-webkit-scrollbar-thumb{background-color:var(--md-default-fg-color--lighter)}.md-sidebar__scrollwrap:focus-within::-webkit-scrollbar-thumb:hover,.md-sidebar__scrollwrap:hover::-webkit-scrollbar-thumb:hover{background-color:var(--md-accent-fg-color)}@supports selector(::-webkit-scrollbar){.md-sidebar__scrollwrap{scrollbar-gutter:auto}[dir=ltr] .md-sidebar__inner{padding-right:calc(100% - 11.5rem)}[dir=rtl] .md-sidebar__inner{padding-left:calc(100% - 11.5rem)}}@media screen and (max-width:76.234375em){.md-overlay{background-color:#0000008a;height:0;opacity:0;position:fixed;top:0;transition:width 0ms .25s,height 0ms .25s,opacity .25s;width:0;z-index:5}[data-md-toggle=drawer]:checked~.md-overlay{height:100%;opacity:1;transition:width 0ms,height 0ms,opacity .25s;width:100%}}@keyframes facts{0%{height:0}to{height:.65rem}}@keyframes fact{0%{opacity:0;transform:translateY(100%)}50%{opacity:0}to{opacity:1;transform:translateY(0)}}:root{--md-source-forks-icon:url('data:image/svg+xml;charset=utf-8,');--md-source-repositories-icon:url('data:image/svg+xml;charset=utf-8,');--md-source-stars-icon:url('data:image/svg+xml;charset=utf-8,');--md-source-version-icon:url('data:image/svg+xml;charset=utf-8,')}.md-source{-webkit-backface-visibility:hidden;backface-visibility:hidden;display:block;font-size:.65rem;line-height:1.2;outline-color:var(--md-accent-fg-color);transition:opacity .25s;white-space:nowrap}.md-source:hover{opacity:.7}.md-source__icon{display:inline-block;height:2.4rem;vertical-align:middle;width:2rem}[dir=ltr] .md-source__icon svg{margin-left:.6rem}[dir=rtl] .md-source__icon svg{margin-right:.6rem}.md-source__icon svg{margin-top:.6rem}[dir=ltr] .md-source__icon+.md-source__repository{padding-left:2rem}[dir=rtl] .md-source__icon+.md-source__repository{padding-right:2rem}[dir=ltr] .md-source__icon+.md-source__repository{margin-left:-2rem}[dir=rtl] .md-source__icon+.md-source__repository{margin-right:-2rem}[dir=ltr] .md-source__repository{margin-left:.6rem}[dir=rtl] .md-source__repository{margin-right:.6rem}.md-source__repository{display:inline-block;max-width:calc(100% - 1.2rem);overflow:hidden;text-overflow:ellipsis;vertical-align:middle}.md-source__facts{display:flex;font-size:.55rem;gap:.4rem;list-style-type:none;margin:.1rem 0 0;opacity:.75;overflow:hidden;padding:0;width:100%}.md-source__repository--active .md-source__facts{animation:facts .25s ease-in}.md-source__fact{overflow:hidden;text-overflow:ellipsis}.md-source__repository--active .md-source__fact{animation:fact .4s ease-out}[dir=ltr] .md-source__fact:before{margin-right:.1rem}[dir=rtl] .md-source__fact:before{margin-left:.1rem}.md-source__fact:before{background-color:currentcolor;content:"";display:inline-block;height:.6rem;-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;vertical-align:text-top;width:.6rem}.md-source__fact:nth-child(1n+2){flex-shrink:0}.md-source__fact--version:before{-webkit-mask-image:var(--md-source-version-icon);mask-image:var(--md-source-version-icon)}.md-source__fact--stars:before{-webkit-mask-image:var(--md-source-stars-icon);mask-image:var(--md-source-stars-icon)}.md-source__fact--forks:before{-webkit-mask-image:var(--md-source-forks-icon);mask-image:var(--md-source-forks-icon)}.md-source__fact--repositories:before{-webkit-mask-image:var(--md-source-repositories-icon);mask-image:var(--md-source-repositories-icon)}.md-source-file{margin:1em 0}[dir=ltr] .md-source-file__fact{margin-right:.6rem}[dir=rtl] .md-source-file__fact{margin-left:.6rem}.md-source-file__fact{align-items:center;color:var(--md-default-fg-color--light);display:inline-flex;font-size:.68rem;gap:.3rem}.md-source-file__fact .md-icon{flex-shrink:0;margin-bottom:.05rem}[dir=ltr] .md-source-file__fact .md-author{float:left}[dir=rtl] .md-source-file__fact .md-author{float:right}.md-source-file__fact .md-author{margin-right:.2rem}.md-source-file__fact svg{width:.9rem}:root{--md-status:url('data:image/svg+xml;charset=utf-8,');--md-status--new:url('data:image/svg+xml;charset=utf-8,');--md-status--deprecated:url('data:image/svg+xml;charset=utf-8,');--md-status--encrypted:url('data:image/svg+xml;charset=utf-8,')}.md-status:after{background-color:var(--md-default-fg-color--light);content:"";display:inline-block;height:1.125em;-webkit-mask-image:var(--md-status);mask-image:var(--md-status);-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;vertical-align:text-bottom;width:1.125em}.md-status:hover:after{background-color:currentcolor}.md-status--new:after{-webkit-mask-image:var(--md-status--new);mask-image:var(--md-status--new)}.md-status--deprecated:after{-webkit-mask-image:var(--md-status--deprecated);mask-image:var(--md-status--deprecated)}.md-status--encrypted:after{-webkit-mask-image:var(--md-status--encrypted);mask-image:var(--md-status--encrypted)}.md-tabs{background-color:var(--md-primary-fg-color);color:var(--md-primary-bg-color);display:block;line-height:1.3;overflow:auto;width:100%;z-index:3}@media print{.md-tabs{display:none}}@media screen and (max-width:76.234375em){.md-tabs{display:none}}.md-tabs[hidden]{pointer-events:none}[dir=ltr] .md-tabs__list{margin-left:.2rem}[dir=rtl] .md-tabs__list{margin-right:.2rem}.md-tabs__list{contain:content;display:flex;list-style:none;margin:0;overflow:auto;padding:0;scrollbar-width:none;white-space:nowrap}.md-tabs__list::-webkit-scrollbar{display:none}.md-tabs__item{height:2.4rem;padding-left:.6rem;padding-right:.6rem}.md-tabs__item--active .md-tabs__link{color:inherit;opacity:1}.md-tabs__link{-webkit-backface-visibility:hidden;backface-visibility:hidden;display:flex;font-size:.7rem;margin-top:.8rem;opacity:.7;outline-color:var(--md-accent-fg-color);outline-offset:.2rem;transition:transform .4s cubic-bezier(.1,.7,.1,1),opacity .25s}.md-tabs__link:focus,.md-tabs__link:hover{color:inherit;opacity:1}[dir=ltr] .md-tabs__link svg{margin-right:.4rem}[dir=rtl] .md-tabs__link svg{margin-left:.4rem}.md-tabs__link svg{fill:currentcolor;height:1.3em}.md-tabs__item:nth-child(2) .md-tabs__link{transition-delay:20ms}.md-tabs__item:nth-child(3) .md-tabs__link{transition-delay:40ms}.md-tabs__item:nth-child(4) .md-tabs__link{transition-delay:60ms}.md-tabs__item:nth-child(5) .md-tabs__link{transition-delay:80ms}.md-tabs__item:nth-child(6) .md-tabs__link{transition-delay:.1s}.md-tabs__item:nth-child(7) .md-tabs__link{transition-delay:.12s}.md-tabs__item:nth-child(8) .md-tabs__link{transition-delay:.14s}.md-tabs__item:nth-child(9) .md-tabs__link{transition-delay:.16s}.md-tabs__item:nth-child(10) .md-tabs__link{transition-delay:.18s}.md-tabs__item:nth-child(11) .md-tabs__link{transition-delay:.2s}.md-tabs__item:nth-child(12) .md-tabs__link{transition-delay:.22s}.md-tabs__item:nth-child(13) .md-tabs__link{transition-delay:.24s}.md-tabs__item:nth-child(14) .md-tabs__link{transition-delay:.26s}.md-tabs__item:nth-child(15) .md-tabs__link{transition-delay:.28s}.md-tabs__item:nth-child(16) .md-tabs__link{transition-delay:.3s}.md-tabs[hidden] .md-tabs__link{opacity:0;transform:translateY(50%);transition:transform 0ms .1s,opacity .1s}:root{--md-tag-icon:url('data:image/svg+xml;charset=utf-8,')}.md-typeset .md-tags:not([hidden]){display:inline-flex;flex-wrap:wrap;gap:.5em;margin-bottom:.75em;margin-top:-.125em}.md-typeset .md-tag{align-items:center;background:var(--md-default-fg-color--lightest);border-radius:2.4rem;display:inline-flex;font-size:.64rem;font-size:min(.8em,.64rem);font-weight:700;gap:.5em;letter-spacing:normal;line-height:1.6;padding:.3125em .78125em}.md-typeset .md-tag[href]{-webkit-tap-highlight-color:transparent;color:inherit;outline:none;transition:color 125ms,background-color 125ms}.md-typeset .md-tag[href]:focus,.md-typeset .md-tag[href]:hover{background-color:var(--md-accent-fg-color);color:var(--md-accent-bg-color)}[id]>.md-typeset .md-tag{vertical-align:text-top}.md-typeset .md-tag-icon:before{background-color:var(--md-default-fg-color--lighter);content:"";display:inline-block;height:1.2em;-webkit-mask-image:var(--md-tag-icon);mask-image:var(--md-tag-icon);-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;transition:background-color 125ms;vertical-align:text-bottom;width:1.2em}.md-typeset .md-tag-icon[href]:focus:before,.md-typeset .md-tag-icon[href]:hover:before{background-color:var(--md-accent-bg-color)}@keyframes pulse{0%{transform:scale(.95)}75%{transform:scale(1)}to{transform:scale(.95)}}:root{--md-annotation-bg-icon:url('data:image/svg+xml;charset=utf-8,');--md-annotation-icon:url('data:image/svg+xml;charset=utf-8,')}.md-tooltip{-webkit-backface-visibility:hidden;backface-visibility:hidden;background-color:var(--md-default-bg-color);border-radius:.1rem;box-shadow:var(--md-shadow-z2);color:var(--md-default-fg-color);font-family:var(--md-text-font-family);left:clamp(var(--md-tooltip-0,0rem) + .8rem,var(--md-tooltip-x),100vw + var(--md-tooltip-0,0rem) + .8rem - var(--md-tooltip-width) - 2 * .8rem);max-width:calc(100vw - 1.6rem);opacity:0;position:absolute;top:var(--md-tooltip-y);transform:translateY(-.4rem);transition:transform 0ms .25s,opacity .25s,z-index .25s;width:var(--md-tooltip-width);z-index:0}.md-tooltip--active{opacity:1;transform:translateY(0);transition:transform .25s cubic-bezier(.1,.7,.1,1),opacity .25s,z-index 0ms;z-index:2}.md-tooltip--inline{font-weight:700;-webkit-user-select:none;user-select:none;width:auto}.md-tooltip--inline:not(.md-tooltip--active){transform:translateY(.2rem) scale(.9)}.md-tooltip--inline .md-tooltip__inner{font-size:.5rem;padding:.2rem .4rem}[hidden]+.md-tooltip--inline{display:none}.focus-visible>.md-tooltip,.md-tooltip:target{outline:var(--md-accent-fg-color) auto}.md-tooltip__inner{font-size:.64rem;padding:.8rem}.md-tooltip__inner.md-typeset>:first-child{margin-top:0}.md-tooltip__inner.md-typeset>:last-child{margin-bottom:0}.md-annotation{font-style:normal;font-weight:400;outline:none;text-align:initial;vertical-align:text-bottom;white-space:normal}[dir=rtl] .md-annotation{direction:rtl}code .md-annotation{font-family:var(--md-code-font-family);font-size:inherit}.md-annotation:not([hidden]){display:inline-block;line-height:1.25}.md-annotation__index{border-radius:.01px;cursor:pointer;display:inline-block;margin-left:.4ch;margin-right:.4ch;outline:none;overflow:hidden;position:relative;-webkit-user-select:none;user-select:none;vertical-align:text-top;z-index:0}.md-annotation .md-annotation__index{transition:z-index .25s}@media screen{.md-annotation__index{width:2.2ch}[data-md-visible]>.md-annotation__index{animation:pulse 2s infinite}.md-annotation__index:before{background:var(--md-default-bg-color);-webkit-mask-image:var(--md-annotation-bg-icon);mask-image:var(--md-annotation-bg-icon)}.md-annotation__index:after,.md-annotation__index:before{content:"";height:2.2ch;-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;position:absolute;top:-.1ch;width:2.2ch;z-index:-1}.md-annotation__index:after{background-color:var(--md-default-fg-color--lighter);-webkit-mask-image:var(--md-annotation-icon);mask-image:var(--md-annotation-icon);transform:scale(1.0001);transition:background-color .25s,transform .25s}.md-tooltip--active+.md-annotation__index:after{transform:rotate(45deg)}.md-tooltip--active+.md-annotation__index:after,:hover>.md-annotation__index:after{background-color:var(--md-accent-fg-color)}}.md-tooltip--active+.md-annotation__index{animation-play-state:paused;transition-duration:0ms;z-index:2}.md-annotation__index [data-md-annotation-id]{display:inline-block}@media print{.md-annotation__index [data-md-annotation-id]{background:var(--md-default-fg-color--lighter);border-radius:2ch;color:var(--md-default-bg-color);font-weight:700;padding:0 .6ch;white-space:nowrap}.md-annotation__index [data-md-annotation-id]:after{content:attr(data-md-annotation-id)}}.md-typeset .md-annotation-list{counter-reset:xxx;list-style:none}.md-typeset .md-annotation-list li{position:relative}[dir=ltr] .md-typeset .md-annotation-list li:before{left:-2.125em}[dir=rtl] .md-typeset .md-annotation-list li:before{right:-2.125em}.md-typeset .md-annotation-list li:before{background:var(--md-default-fg-color--lighter);border-radius:2ch;color:var(--md-default-bg-color);content:counter(xxx);counter-increment:xxx;font-size:.8875em;font-weight:700;height:2ch;line-height:1.25;min-width:2ch;padding:0 .6ch;position:absolute;text-align:center;top:.25em}:root{--md-tooltip-width:20rem;--md-tooltip-tail:0.3rem}.md-tooltip2{-webkit-backface-visibility:hidden;backface-visibility:hidden;color:var(--md-default-fg-color);font-family:var(--md-text-font-family);opacity:0;pointer-events:none;position:absolute;top:calc(var(--md-tooltip-host-y) + var(--md-tooltip-y));transform:translateY(-.4rem);transform-origin:calc(var(--md-tooltip-host-x) + var(--md-tooltip-x)) 0;transition:transform 0ms .25s,opacity .25s,z-index .25s;width:100%;z-index:0}.md-tooltip2:before{border-left:var(--md-tooltip-tail) solid #0000;border-right:var(--md-tooltip-tail) solid #0000;content:"";display:block;left:clamp(1.5 * .8rem,var(--md-tooltip-host-x) + var(--md-tooltip-x) - var(--md-tooltip-tail),100vw - 2 * var(--md-tooltip-tail) - 1.5 * .8rem);position:absolute;z-index:1}.md-tooltip2--top:before{border-top:var(--md-tooltip-tail) solid var(--md-default-bg-color);bottom:calc(var(--md-tooltip-tail)*-1 + .025rem);filter:drop-shadow(0 1px 0 hsla(0,0%,0%,.05))}.md-tooltip2--bottom:before{border-bottom:var(--md-tooltip-tail) solid var(--md-default-bg-color);filter:drop-shadow(0 -1px 0 hsla(0,0%,0%,.05));top:calc(var(--md-tooltip-tail)*-1 + .025rem)}.md-tooltip2--active{opacity:1;transform:translateY(0);transition:transform .4s cubic-bezier(0,1,.5,1),opacity .25s,z-index 0ms;z-index:2}.md-tooltip2__inner{scrollbar-gutter:stable;background-color:var(--md-default-bg-color);border-radius:.1rem;box-shadow:var(--md-shadow-z2);left:clamp(.8rem,var(--md-tooltip-host-x) - .8rem,100vw - var(--md-tooltip-width) - .8rem);max-height:40vh;max-width:calc(100vw - 1.6rem);position:relative;scrollbar-width:thin}.md-tooltip2__inner::-webkit-scrollbar{height:.2rem;width:.2rem}.md-tooltip2__inner::-webkit-scrollbar-thumb{background-color:var(--md-default-fg-color--lighter)}.md-tooltip2__inner::-webkit-scrollbar-thumb:hover{background-color:var(--md-accent-fg-color)}[role=tooltip]>.md-tooltip2__inner{font-size:.5rem;font-weight:700;left:clamp(.8rem,var(--md-tooltip-host-x) + var(--md-tooltip-x) - var(--md-tooltip-width)/2,100vw - var(--md-tooltip-width) - .8rem);max-width:min(100vw - 2 * .8rem,400px);padding:.2rem .4rem;-webkit-user-select:none;user-select:none;width:-moz-fit-content;width:fit-content}.md-tooltip2__inner.md-typeset>:first-child{margin-top:0}.md-tooltip2__inner.md-typeset>:last-child{margin-bottom:0}[dir=ltr] .md-top{margin-left:50%}[dir=rtl] .md-top{margin-right:50%}.md-top{background-color:var(--md-default-bg-color);border-radius:1.6rem;box-shadow:var(--md-shadow-z2);color:var(--md-default-fg-color--light);cursor:pointer;display:block;font-size:.7rem;outline:none;padding:.4rem .8rem;position:fixed;top:3.2rem;transform:translate(-50%);transition:color 125ms,background-color 125ms,transform 125ms cubic-bezier(.4,0,.2,1),opacity 125ms;z-index:2}@media print{.md-top{display:none}}[dir=rtl] .md-top{transform:translate(50%)}.md-top[hidden]{opacity:0;pointer-events:none;transform:translate(-50%,.2rem);transition-duration:0ms}[dir=rtl] .md-top[hidden]{transform:translate(50%,.2rem)}.md-top:focus,.md-top:hover{background-color:var(--md-accent-fg-color);color:var(--md-accent-bg-color)}.md-top svg{display:inline-block;vertical-align:-.5em}@keyframes hoverfix{0%{pointer-events:none}}:root{--md-version-icon:url('data:image/svg+xml;charset=utf-8,')}.md-version{flex-shrink:0;font-size:.8rem;height:2.4rem}[dir=ltr] .md-version__current{margin-left:1.4rem;margin-right:.4rem}[dir=rtl] .md-version__current{margin-left:.4rem;margin-right:1.4rem}.md-version__current{color:inherit;cursor:pointer;outline:none;position:relative;top:.05rem}[dir=ltr] .md-version__current:after{margin-left:.4rem}[dir=rtl] .md-version__current:after{margin-right:.4rem}.md-version__current:after{background-color:currentcolor;content:"";display:inline-block;height:.6rem;-webkit-mask-image:var(--md-version-icon);mask-image:var(--md-version-icon);-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;width:.4rem}.md-version__alias{margin-left:.3rem;opacity:.7}.md-version__list{background-color:var(--md-default-bg-color);border-radius:.1rem;box-shadow:var(--md-shadow-z2);color:var(--md-default-fg-color);list-style-type:none;margin:.2rem .8rem;max-height:0;opacity:0;overflow:auto;padding:0;position:absolute;scroll-snap-type:y mandatory;top:.15rem;transition:max-height 0ms .5s,opacity .25s .25s;z-index:3}.md-version:focus-within .md-version__list,.md-version:hover .md-version__list{max-height:10rem;opacity:1;transition:max-height 0ms,opacity .25s}@media (hover:none),(pointer:coarse){.md-version:hover .md-version__list{animation:hoverfix .25s forwards}.md-version:focus-within .md-version__list{animation:none}}.md-version__item{line-height:1.8rem}[dir=ltr] .md-version__link{padding-left:.6rem;padding-right:1.2rem}[dir=rtl] .md-version__link{padding-left:1.2rem;padding-right:.6rem}.md-version__link{cursor:pointer;display:block;outline:none;scroll-snap-align:start;transition:color .25s,background-color .25s;white-space:nowrap;width:100%}.md-version__link:focus,.md-version__link:hover{color:var(--md-accent-fg-color)}.md-version__link:focus{background-color:var(--md-default-fg-color--lightest)}:root{--md-admonition-icon--note:url('data:image/svg+xml;charset=utf-8,');--md-admonition-icon--abstract:url('data:image/svg+xml;charset=utf-8,');--md-admonition-icon--info:url('data:image/svg+xml;charset=utf-8,');--md-admonition-icon--tip:url('data:image/svg+xml;charset=utf-8,');--md-admonition-icon--success:url('data:image/svg+xml;charset=utf-8,');--md-admonition-icon--question:url('data:image/svg+xml;charset=utf-8,');--md-admonition-icon--warning:url('data:image/svg+xml;charset=utf-8,');--md-admonition-icon--failure:url('data:image/svg+xml;charset=utf-8,');--md-admonition-icon--danger:url('data:image/svg+xml;charset=utf-8,');--md-admonition-icon--bug:url('data:image/svg+xml;charset=utf-8,');--md-admonition-icon--example:url('data:image/svg+xml;charset=utf-8,');--md-admonition-icon--quote:url('data:image/svg+xml;charset=utf-8,')}.md-typeset .admonition,.md-typeset details{background-color:var(--md-admonition-bg-color);border:.075rem solid #448aff;border-radius:.2rem;box-shadow:var(--md-shadow-z1);color:var(--md-admonition-fg-color);display:flow-root;font-size:.64rem;margin:1.5625em 0;padding:0 .6rem;page-break-inside:avoid;transition:box-shadow 125ms}@media print{.md-typeset .admonition,.md-typeset details{box-shadow:none}}.md-typeset .admonition:focus-within,.md-typeset details:focus-within{box-shadow:0 0 0 .2rem #448aff1a}.md-typeset .admonition>*,.md-typeset details>*{box-sizing:border-box}.md-typeset .admonition .admonition,.md-typeset .admonition details,.md-typeset details .admonition,.md-typeset details details{margin-bottom:1em;margin-top:1em}.md-typeset .admonition .md-typeset__scrollwrap,.md-typeset details .md-typeset__scrollwrap{margin:1em -.6rem}.md-typeset .admonition .md-typeset__table,.md-typeset details .md-typeset__table{padding:0 .6rem}.md-typeset .admonition>.tabbed-set:only-child,.md-typeset details>.tabbed-set:only-child{margin-top:0}html .md-typeset .admonition>:last-child,html .md-typeset details>:last-child{margin-bottom:.6rem}[dir=ltr] .md-typeset .admonition-title,[dir=ltr] .md-typeset summary{padding-left:2rem;padding-right:.6rem}[dir=rtl] .md-typeset .admonition-title,[dir=rtl] .md-typeset summary{padding-left:.6rem;padding-right:2rem}[dir=ltr] .md-typeset .admonition-title,[dir=ltr] .md-typeset summary{border-left-width:.2rem}[dir=rtl] .md-typeset .admonition-title,[dir=rtl] .md-typeset summary{border-right-width:.2rem}[dir=ltr] .md-typeset .admonition-title,[dir=ltr] .md-typeset summary{border-top-left-radius:.1rem}[dir=ltr] .md-typeset .admonition-title,[dir=ltr] .md-typeset summary,[dir=rtl] .md-typeset .admonition-title,[dir=rtl] .md-typeset summary{border-top-right-radius:.1rem}[dir=rtl] .md-typeset .admonition-title,[dir=rtl] .md-typeset summary{border-top-left-radius:.1rem}.md-typeset .admonition-title,.md-typeset summary{background-color:#448aff1a;border:none;font-weight:700;margin:0 -.6rem;padding-bottom:.4rem;padding-top:.4rem;position:relative}html .md-typeset .admonition-title:last-child,html .md-typeset summary:last-child{margin-bottom:0}[dir=ltr] .md-typeset .admonition-title:before,[dir=ltr] .md-typeset summary:before{left:.6rem}[dir=rtl] .md-typeset .admonition-title:before,[dir=rtl] .md-typeset summary:before{right:.6rem}.md-typeset .admonition-title:before,.md-typeset summary:before{background-color:#448aff;content:"";height:1rem;-webkit-mask-image:var(--md-admonition-icon--note);mask-image:var(--md-admonition-icon--note);-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;position:absolute;top:.625em;width:1rem}.md-typeset .admonition-title code,.md-typeset summary code{box-shadow:0 0 0 .05rem var(--md-default-fg-color--lightest)}.md-typeset .admonition.note,.md-typeset details.note{border-color:#448aff}.md-typeset .admonition.note:focus-within,.md-typeset details.note:focus-within{box-shadow:0 0 0 .2rem #448aff1a}.md-typeset .note>.admonition-title,.md-typeset .note>summary{background-color:#448aff1a}.md-typeset .note>.admonition-title:before,.md-typeset .note>summary:before{background-color:#448aff;-webkit-mask-image:var(--md-admonition-icon--note);mask-image:var(--md-admonition-icon--note)}.md-typeset .note>.admonition-title:after,.md-typeset .note>summary:after{color:#448aff}.md-typeset .admonition.abstract,.md-typeset details.abstract{border-color:#00b0ff}.md-typeset .admonition.abstract:focus-within,.md-typeset details.abstract:focus-within{box-shadow:0 0 0 .2rem #00b0ff1a}.md-typeset .abstract>.admonition-title,.md-typeset .abstract>summary{background-color:#00b0ff1a}.md-typeset .abstract>.admonition-title:before,.md-typeset .abstract>summary:before{background-color:#00b0ff;-webkit-mask-image:var(--md-admonition-icon--abstract);mask-image:var(--md-admonition-icon--abstract)}.md-typeset .abstract>.admonition-title:after,.md-typeset .abstract>summary:after{color:#00b0ff}.md-typeset .admonition.info,.md-typeset details.info{border-color:#00b8d4}.md-typeset .admonition.info:focus-within,.md-typeset details.info:focus-within{box-shadow:0 0 0 .2rem #00b8d41a}.md-typeset .info>.admonition-title,.md-typeset .info>summary{background-color:#00b8d41a}.md-typeset .info>.admonition-title:before,.md-typeset .info>summary:before{background-color:#00b8d4;-webkit-mask-image:var(--md-admonition-icon--info);mask-image:var(--md-admonition-icon--info)}.md-typeset .info>.admonition-title:after,.md-typeset .info>summary:after{color:#00b8d4}.md-typeset .admonition.tip,.md-typeset details.tip{border-color:#00bfa5}.md-typeset .admonition.tip:focus-within,.md-typeset details.tip:focus-within{box-shadow:0 0 0 .2rem #00bfa51a}.md-typeset .tip>.admonition-title,.md-typeset .tip>summary{background-color:#00bfa51a}.md-typeset .tip>.admonition-title:before,.md-typeset .tip>summary:before{background-color:#00bfa5;-webkit-mask-image:var(--md-admonition-icon--tip);mask-image:var(--md-admonition-icon--tip)}.md-typeset .tip>.admonition-title:after,.md-typeset .tip>summary:after{color:#00bfa5}.md-typeset .admonition.success,.md-typeset details.success{border-color:#00c853}.md-typeset .admonition.success:focus-within,.md-typeset details.success:focus-within{box-shadow:0 0 0 .2rem #00c8531a}.md-typeset .success>.admonition-title,.md-typeset .success>summary{background-color:#00c8531a}.md-typeset .success>.admonition-title:before,.md-typeset .success>summary:before{background-color:#00c853;-webkit-mask-image:var(--md-admonition-icon--success);mask-image:var(--md-admonition-icon--success)}.md-typeset .success>.admonition-title:after,.md-typeset .success>summary:after{color:#00c853}.md-typeset .admonition.question,.md-typeset details.question{border-color:#64dd17}.md-typeset .admonition.question:focus-within,.md-typeset details.question:focus-within{box-shadow:0 0 0 .2rem #64dd171a}.md-typeset .question>.admonition-title,.md-typeset .question>summary{background-color:#64dd171a}.md-typeset .question>.admonition-title:before,.md-typeset .question>summary:before{background-color:#64dd17;-webkit-mask-image:var(--md-admonition-icon--question);mask-image:var(--md-admonition-icon--question)}.md-typeset .question>.admonition-title:after,.md-typeset .question>summary:after{color:#64dd17}.md-typeset .admonition.warning,.md-typeset details.warning{border-color:#ff9100}.md-typeset .admonition.warning:focus-within,.md-typeset details.warning:focus-within{box-shadow:0 0 0 .2rem #ff91001a}.md-typeset .warning>.admonition-title,.md-typeset .warning>summary{background-color:#ff91001a}.md-typeset .warning>.admonition-title:before,.md-typeset .warning>summary:before{background-color:#ff9100;-webkit-mask-image:var(--md-admonition-icon--warning);mask-image:var(--md-admonition-icon--warning)}.md-typeset .warning>.admonition-title:after,.md-typeset .warning>summary:after{color:#ff9100}.md-typeset .admonition.failure,.md-typeset details.failure{border-color:#ff5252}.md-typeset .admonition.failure:focus-within,.md-typeset details.failure:focus-within{box-shadow:0 0 0 .2rem #ff52521a}.md-typeset .failure>.admonition-title,.md-typeset .failure>summary{background-color:#ff52521a}.md-typeset .failure>.admonition-title:before,.md-typeset .failure>summary:before{background-color:#ff5252;-webkit-mask-image:var(--md-admonition-icon--failure);mask-image:var(--md-admonition-icon--failure)}.md-typeset .failure>.admonition-title:after,.md-typeset .failure>summary:after{color:#ff5252}.md-typeset .admonition.danger,.md-typeset details.danger{border-color:#ff1744}.md-typeset .admonition.danger:focus-within,.md-typeset details.danger:focus-within{box-shadow:0 0 0 .2rem #ff17441a}.md-typeset .danger>.admonition-title,.md-typeset .danger>summary{background-color:#ff17441a}.md-typeset .danger>.admonition-title:before,.md-typeset .danger>summary:before{background-color:#ff1744;-webkit-mask-image:var(--md-admonition-icon--danger);mask-image:var(--md-admonition-icon--danger)}.md-typeset .danger>.admonition-title:after,.md-typeset .danger>summary:after{color:#ff1744}.md-typeset .admonition.bug,.md-typeset details.bug{border-color:#f50057}.md-typeset .admonition.bug:focus-within,.md-typeset details.bug:focus-within{box-shadow:0 0 0 .2rem #f500571a}.md-typeset .bug>.admonition-title,.md-typeset .bug>summary{background-color:#f500571a}.md-typeset .bug>.admonition-title:before,.md-typeset .bug>summary:before{background-color:#f50057;-webkit-mask-image:var(--md-admonition-icon--bug);mask-image:var(--md-admonition-icon--bug)}.md-typeset .bug>.admonition-title:after,.md-typeset .bug>summary:after{color:#f50057}.md-typeset .admonition.example,.md-typeset details.example{border-color:#7c4dff}.md-typeset .admonition.example:focus-within,.md-typeset details.example:focus-within{box-shadow:0 0 0 .2rem #7c4dff1a}.md-typeset .example>.admonition-title,.md-typeset .example>summary{background-color:#7c4dff1a}.md-typeset .example>.admonition-title:before,.md-typeset .example>summary:before{background-color:#7c4dff;-webkit-mask-image:var(--md-admonition-icon--example);mask-image:var(--md-admonition-icon--example)}.md-typeset .example>.admonition-title:after,.md-typeset .example>summary:after{color:#7c4dff}.md-typeset .admonition.quote,.md-typeset details.quote{border-color:#9e9e9e}.md-typeset .admonition.quote:focus-within,.md-typeset details.quote:focus-within{box-shadow:0 0 0 .2rem #9e9e9e1a}.md-typeset .quote>.admonition-title,.md-typeset .quote>summary{background-color:#9e9e9e1a}.md-typeset .quote>.admonition-title:before,.md-typeset .quote>summary:before{background-color:#9e9e9e;-webkit-mask-image:var(--md-admonition-icon--quote);mask-image:var(--md-admonition-icon--quote)}.md-typeset .quote>.admonition-title:after,.md-typeset .quote>summary:after{color:#9e9e9e}:root{--md-footnotes-icon:url('data:image/svg+xml;charset=utf-8,')}.md-typeset .footnote{color:var(--md-default-fg-color--light);font-size:.64rem}[dir=ltr] .md-typeset .footnote>ol{margin-left:0}[dir=rtl] .md-typeset .footnote>ol{margin-right:0}.md-typeset .footnote>ol>li{transition:color 125ms}.md-typeset .footnote>ol>li:target{color:var(--md-default-fg-color)}.md-typeset .footnote>ol>li:focus-within .footnote-backref{opacity:1;transform:translateX(0);transition:none}.md-typeset .footnote>ol>li:hover .footnote-backref,.md-typeset .footnote>ol>li:target .footnote-backref{opacity:1;transform:translateX(0)}.md-typeset .footnote>ol>li>:first-child{margin-top:0}.md-typeset .footnote-ref{font-size:.75em;font-weight:700}html .md-typeset .footnote-ref{outline-offset:.1rem}.md-typeset [id^="fnref:"]:target>.footnote-ref{outline:auto}.md-typeset .footnote-backref{color:var(--md-typeset-a-color);display:inline-block;font-size:0;opacity:0;transform:translateX(.25rem);transition:color .25s,transform .25s .25s,opacity 125ms .25s;vertical-align:text-bottom}@media print{.md-typeset .footnote-backref{color:var(--md-typeset-a-color);opacity:1;transform:translateX(0)}}[dir=rtl] .md-typeset .footnote-backref{transform:translateX(-.25rem)}.md-typeset .footnote-backref:hover{color:var(--md-accent-fg-color)}.md-typeset .footnote-backref:before{background-color:currentcolor;content:"";display:inline-block;height:.8rem;-webkit-mask-image:var(--md-footnotes-icon);mask-image:var(--md-footnotes-icon);-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;width:.8rem}[dir=rtl] .md-typeset .footnote-backref:before svg{transform:scaleX(-1)}[dir=ltr] .md-typeset .headerlink{margin-left:.5rem}[dir=rtl] .md-typeset .headerlink{margin-right:.5rem}.md-typeset .headerlink{color:var(--md-default-fg-color--lighter);display:inline-block;opacity:0;transition:color .25s,opacity 125ms}@media print{.md-typeset .headerlink{display:none}}.md-typeset .headerlink:focus,.md-typeset :hover>.headerlink,.md-typeset :target>.headerlink{opacity:1;transition:color .25s,opacity 125ms}.md-typeset .headerlink:focus,.md-typeset .headerlink:hover,.md-typeset :target>.headerlink{color:var(--md-accent-fg-color)}.md-typeset :target{--md-scroll-margin:3.6rem;--md-scroll-offset:0rem;scroll-margin-top:calc(var(--md-scroll-margin) - var(--md-scroll-offset))}@media screen and (min-width:76.25em){.md-header--lifted~.md-container .md-typeset :target{--md-scroll-margin:6rem}}.md-typeset h1:target,.md-typeset h2:target,.md-typeset h3:target{--md-scroll-offset:0.2rem}.md-typeset h4:target{--md-scroll-offset:0.15rem}.md-typeset div.arithmatex{overflow:auto}@media screen and (max-width:44.984375em){.md-typeset div.arithmatex{margin:0 -.8rem}.md-typeset div.arithmatex>*{width:min-content}}.md-typeset div.arithmatex>*{margin-left:auto!important;margin-right:auto!important;padding:0 .8rem;touch-action:auto}.md-typeset div.arithmatex>* mjx-container{margin:0!important}.md-typeset div.arithmatex mjx-assistive-mml{height:0}.md-typeset del.critic{background-color:var(--md-typeset-del-color)}.md-typeset del.critic,.md-typeset ins.critic{-webkit-box-decoration-break:clone;box-decoration-break:clone}.md-typeset ins.critic{background-color:var(--md-typeset-ins-color)}.md-typeset .critic.comment{-webkit-box-decoration-break:clone;box-decoration-break:clone;color:var(--md-code-hl-comment-color)}.md-typeset .critic.comment:before{content:"/* "}.md-typeset .critic.comment:after{content:" */"}.md-typeset .critic.block{box-shadow:none;display:block;margin:1em 0;overflow:auto;padding-left:.8rem;padding-right:.8rem}.md-typeset .critic.block>:first-child{margin-top:.5em}.md-typeset .critic.block>:last-child{margin-bottom:.5em}:root{--md-details-icon:url('data:image/svg+xml;charset=utf-8,')}.md-typeset details{display:flow-root;overflow:visible;padding-top:0}.md-typeset details[open]>summary:after{transform:rotate(90deg)}.md-typeset details:not([open]){box-shadow:none;padding-bottom:0}.md-typeset details:not([open])>summary{border-radius:.1rem}[dir=ltr] .md-typeset summary{padding-right:1.8rem}[dir=rtl] .md-typeset summary{padding-left:1.8rem}[dir=ltr] .md-typeset summary{border-top-left-radius:.1rem}[dir=ltr] .md-typeset summary,[dir=rtl] .md-typeset summary{border-top-right-radius:.1rem}[dir=rtl] .md-typeset summary{border-top-left-radius:.1rem}.md-typeset summary{cursor:pointer;display:block;min-height:1rem;overflow:hidden}.md-typeset summary.focus-visible{outline-color:var(--md-accent-fg-color);outline-offset:.2rem}.md-typeset summary:not(.focus-visible){-webkit-tap-highlight-color:transparent;outline:none}[dir=ltr] .md-typeset summary:after{right:.4rem}[dir=rtl] .md-typeset summary:after{left:.4rem}.md-typeset summary:after{background-color:currentcolor;content:"";height:1rem;-webkit-mask-image:var(--md-details-icon);mask-image:var(--md-details-icon);-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;position:absolute;top:.625em;transform:rotate(0deg);transition:transform .25s;width:1rem}[dir=rtl] .md-typeset summary:after{transform:rotate(180deg)}.md-typeset summary::marker{display:none}.md-typeset summary::-webkit-details-marker{display:none}.md-typeset .emojione,.md-typeset .gemoji,.md-typeset .twemoji{--md-icon-size:1.125em;display:inline-flex;height:var(--md-icon-size);vertical-align:text-top}.md-typeset .emojione svg,.md-typeset .gemoji svg,.md-typeset .twemoji svg{fill:currentcolor;max-height:100%;width:var(--md-icon-size)}.md-typeset .lg,.md-typeset .xl,.md-typeset .xxl,.md-typeset .xxxl{vertical-align:text-bottom}.md-typeset .middle{vertical-align:middle}.md-typeset .lg{--md-icon-size:1.5em}.md-typeset .xl{--md-icon-size:2.25em}.md-typeset .xxl{--md-icon-size:3em}.md-typeset .xxxl{--md-icon-size:4em}.highlight .o,.highlight .ow{color:var(--md-code-hl-operator-color)}.highlight .p{color:var(--md-code-hl-punctuation-color)}.highlight .cpf,.highlight .l,.highlight .s,.highlight .s1,.highlight .s2,.highlight .sb,.highlight .sc,.highlight .si,.highlight .ss{color:var(--md-code-hl-string-color)}.highlight .cp,.highlight .se,.highlight .sh,.highlight .sr,.highlight .sx{color:var(--md-code-hl-special-color)}.highlight .il,.highlight .m,.highlight .mb,.highlight .mf,.highlight .mh,.highlight .mi,.highlight .mo{color:var(--md-code-hl-number-color)}.highlight .k,.highlight .kd,.highlight .kn,.highlight .kp,.highlight .kr,.highlight .kt{color:var(--md-code-hl-keyword-color)}.highlight .kc,.highlight .n{color:var(--md-code-hl-name-color)}.highlight .bp,.highlight .nb,.highlight .no{color:var(--md-code-hl-constant-color)}.highlight .nc,.highlight .ne,.highlight .nf,.highlight .nn{color:var(--md-code-hl-function-color)}.highlight .nd,.highlight .ni,.highlight .nl,.highlight .nt{color:var(--md-code-hl-keyword-color)}.highlight .c,.highlight .c1,.highlight .ch,.highlight .cm,.highlight .cs,.highlight .sd{color:var(--md-code-hl-comment-color)}.highlight .na,.highlight .nv,.highlight .vc,.highlight .vg,.highlight .vi{color:var(--md-code-hl-variable-color)}.highlight .ge,.highlight .gh,.highlight .go,.highlight .gp,.highlight .gr,.highlight .gs,.highlight .gt,.highlight .gu{color:var(--md-code-hl-generic-color)}.highlight .gd,.highlight .gi{border-radius:.1rem;margin:0 -.125em;padding:0 .125em}.highlight .gd{background-color:var(--md-typeset-del-color)}.highlight .gi{background-color:var(--md-typeset-ins-color)}.highlight .hll{background-color:var(--md-code-hl-color--light);box-shadow:2px 0 0 0 var(--md-code-hl-color) inset;display:block;margin:0 -1.1764705882em;padding:0 1.1764705882em}.highlight span.filename{background-color:var(--md-code-bg-color);border-bottom:.05rem solid var(--md-default-fg-color--lightest);border-top-left-radius:.1rem;border-top-right-radius:.1rem;display:flow-root;font-size:.85em;font-weight:700;margin-top:1em;padding:.6617647059em 1.1764705882em;position:relative}.highlight span.filename+pre{margin-top:0}.highlight span.filename+pre>code{border-top-left-radius:0;border-top-right-radius:0}.highlight [data-linenos]:before{background-color:var(--md-code-bg-color);box-shadow:-.05rem 0 var(--md-default-fg-color--lightest) inset;color:var(--md-default-fg-color--light);content:attr(data-linenos);float:left;left:-1.1764705882em;margin-left:-1.1764705882em;margin-right:1.1764705882em;padding-left:1.1764705882em;position:sticky;-webkit-user-select:none;user-select:none;z-index:3}.highlight code a[id]{position:absolute;visibility:hidden}.highlight code[data-md-copying]{display:initial}.highlight code[data-md-copying] .hll{display:contents}.highlight code[data-md-copying] .md-annotation{display:none}.highlighttable{display:flow-root}.highlighttable tbody,.highlighttable td{display:block;padding:0}.highlighttable tr{display:flex}.highlighttable pre{margin:0}.highlighttable th.filename{flex-grow:1;padding:0;text-align:left}.highlighttable th.filename span.filename{margin-top:0}.highlighttable .linenos{background-color:var(--md-code-bg-color);border-bottom-left-radius:.1rem;border-top-left-radius:.1rem;font-size:.85em;padding:.7720588235em 0 .7720588235em 1.1764705882em;-webkit-user-select:none;user-select:none}.highlighttable .linenodiv{box-shadow:-.05rem 0 var(--md-default-fg-color--lightest) inset;padding-right:.5882352941em}.highlighttable .linenodiv pre{color:var(--md-default-fg-color--light);text-align:right}.highlighttable .code{flex:1;min-width:0}.linenodiv a{color:inherit}.md-typeset .highlighttable{direction:ltr;margin:1em 0}.md-typeset .highlighttable>tbody>tr>.code>div>pre>code{border-bottom-left-radius:0;border-top-left-radius:0}.md-typeset .highlight+.result{border:.05rem solid var(--md-code-bg-color);border-bottom-left-radius:.1rem;border-bottom-right-radius:.1rem;border-top-width:.1rem;margin-top:-1.125em;overflow:visible;padding:0 1em}.md-typeset .highlight+.result:after{clear:both;content:"";display:block}@media screen and (max-width:44.984375em){.md-content__inner>.highlight{margin:1em -.8rem}.md-content__inner>.highlight>.filename,.md-content__inner>.highlight>.highlighttable>tbody>tr>.code>div>pre>code,.md-content__inner>.highlight>.highlighttable>tbody>tr>.filename span.filename,.md-content__inner>.highlight>.highlighttable>tbody>tr>.linenos,.md-content__inner>.highlight>pre>code{border-radius:0}.md-content__inner>.highlight+.result{border-left-width:0;border-radius:0;border-right-width:0;margin-left:-.8rem;margin-right:-.8rem}}.md-typeset .keys kbd:after,.md-typeset .keys kbd:before{-moz-osx-font-smoothing:initial;-webkit-font-smoothing:initial;color:inherit;margin:0;position:relative}.md-typeset .keys span{color:var(--md-default-fg-color--light);padding:0 .2em}.md-typeset .keys .key-alt:before,.md-typeset .keys .key-left-alt:before,.md-typeset .keys .key-right-alt:before{content:"⎇";padding-right:.4em}.md-typeset .keys .key-command:before,.md-typeset .keys .key-left-command:before,.md-typeset .keys .key-right-command:before{content:"⌘";padding-right:.4em}.md-typeset .keys .key-control:before,.md-typeset .keys .key-left-control:before,.md-typeset .keys .key-right-control:before{content:"⌃";padding-right:.4em}.md-typeset .keys .key-left-meta:before,.md-typeset .keys .key-meta:before,.md-typeset .keys .key-right-meta:before{content:"◆";padding-right:.4em}.md-typeset .keys .key-left-option:before,.md-typeset .keys .key-option:before,.md-typeset .keys .key-right-option:before{content:"⌥";padding-right:.4em}.md-typeset .keys .key-left-shift:before,.md-typeset .keys .key-right-shift:before,.md-typeset .keys .key-shift:before{content:"⇧";padding-right:.4em}.md-typeset .keys .key-left-super:before,.md-typeset .keys .key-right-super:before,.md-typeset .keys .key-super:before{content:"❖";padding-right:.4em}.md-typeset .keys .key-left-windows:before,.md-typeset .keys .key-right-windows:before,.md-typeset .keys .key-windows:before{content:"⊞";padding-right:.4em}.md-typeset .keys .key-arrow-down:before{content:"↓";padding-right:.4em}.md-typeset .keys .key-arrow-left:before{content:"←";padding-right:.4em}.md-typeset .keys .key-arrow-right:before{content:"→";padding-right:.4em}.md-typeset .keys .key-arrow-up:before{content:"↑";padding-right:.4em}.md-typeset .keys .key-backspace:before{content:"⌫";padding-right:.4em}.md-typeset .keys .key-backtab:before{content:"⇤";padding-right:.4em}.md-typeset .keys .key-caps-lock:before{content:"⇪";padding-right:.4em}.md-typeset .keys .key-clear:before{content:"⌧";padding-right:.4em}.md-typeset .keys .key-context-menu:before{content:"☰";padding-right:.4em}.md-typeset .keys .key-delete:before{content:"⌦";padding-right:.4em}.md-typeset .keys .key-eject:before{content:"⏏";padding-right:.4em}.md-typeset .keys .key-end:before{content:"⤓";padding-right:.4em}.md-typeset .keys .key-escape:before{content:"⎋";padding-right:.4em}.md-typeset .keys .key-home:before{content:"⤒";padding-right:.4em}.md-typeset .keys .key-insert:before{content:"⎀";padding-right:.4em}.md-typeset .keys .key-page-down:before{content:"⇟";padding-right:.4em}.md-typeset .keys .key-page-up:before{content:"⇞";padding-right:.4em}.md-typeset .keys .key-print-screen:before{content:"⎙";padding-right:.4em}.md-typeset .keys .key-tab:after{content:"⇥";padding-left:.4em}.md-typeset .keys .key-num-enter:after{content:"⌤";padding-left:.4em}.md-typeset .keys .key-enter:after{content:"⏎";padding-left:.4em}:root{--md-tabbed-icon--prev:url('data:image/svg+xml;charset=utf-8,');--md-tabbed-icon--next:url('data:image/svg+xml;charset=utf-8,')}.md-typeset .tabbed-set{border-radius:.1rem;display:flex;flex-flow:column wrap;margin:1em 0;position:relative}.md-typeset .tabbed-set>input{height:0;opacity:0;position:absolute;width:0}.md-typeset .tabbed-set>input:target{--md-scroll-offset:0.625em}.md-typeset .tabbed-set>input.focus-visible~.tabbed-labels:before{background-color:var(--md-accent-fg-color)}.md-typeset .tabbed-labels{-ms-overflow-style:none;box-shadow:0 -.05rem var(--md-default-fg-color--lightest) inset;display:flex;max-width:100%;overflow:auto;scrollbar-width:none}@media print{.md-typeset .tabbed-labels{display:contents}}@media screen{.js .md-typeset .tabbed-labels{position:relative}.js .md-typeset .tabbed-labels:before{background:var(--md-default-fg-color);bottom:0;content:"";display:block;height:2px;left:0;position:absolute;transform:translateX(var(--md-indicator-x));transition:width 225ms,background-color .25s,transform .25s;transition-timing-function:cubic-bezier(.4,0,.2,1);width:var(--md-indicator-width)}}.md-typeset .tabbed-labels::-webkit-scrollbar{display:none}.md-typeset .tabbed-labels>label{border-bottom:.1rem solid #0000;border-radius:.1rem .1rem 0 0;color:var(--md-default-fg-color--light);cursor:pointer;flex-shrink:0;font-size:.64rem;font-weight:700;padding:.78125em 1.25em .625em;scroll-margin-inline-start:1rem;transition:background-color .25s,color .25s;white-space:nowrap;width:auto}@media print{.md-typeset .tabbed-labels>label:first-child{order:1}.md-typeset .tabbed-labels>label:nth-child(2){order:2}.md-typeset .tabbed-labels>label:nth-child(3){order:3}.md-typeset .tabbed-labels>label:nth-child(4){order:4}.md-typeset .tabbed-labels>label:nth-child(5){order:5}.md-typeset .tabbed-labels>label:nth-child(6){order:6}.md-typeset .tabbed-labels>label:nth-child(7){order:7}.md-typeset .tabbed-labels>label:nth-child(8){order:8}.md-typeset .tabbed-labels>label:nth-child(9){order:9}.md-typeset .tabbed-labels>label:nth-child(10){order:10}.md-typeset .tabbed-labels>label:nth-child(11){order:11}.md-typeset .tabbed-labels>label:nth-child(12){order:12}.md-typeset .tabbed-labels>label:nth-child(13){order:13}.md-typeset .tabbed-labels>label:nth-child(14){order:14}.md-typeset .tabbed-labels>label:nth-child(15){order:15}.md-typeset .tabbed-labels>label:nth-child(16){order:16}.md-typeset .tabbed-labels>label:nth-child(17){order:17}.md-typeset .tabbed-labels>label:nth-child(18){order:18}.md-typeset .tabbed-labels>label:nth-child(19){order:19}.md-typeset .tabbed-labels>label:nth-child(20){order:20}}.md-typeset .tabbed-labels>label:hover{color:var(--md-default-fg-color)}.md-typeset .tabbed-labels>label>[href]:first-child{color:inherit}.md-typeset .tabbed-labels--linked>label{padding:0}.md-typeset .tabbed-labels--linked>label>a{display:block;padding:.78125em 1.25em .625em}.md-typeset .tabbed-content{width:100%}@media print{.md-typeset .tabbed-content{display:contents}}.md-typeset .tabbed-block{display:none}@media print{.md-typeset .tabbed-block{display:block}.md-typeset .tabbed-block:first-child{order:1}.md-typeset .tabbed-block:nth-child(2){order:2}.md-typeset .tabbed-block:nth-child(3){order:3}.md-typeset .tabbed-block:nth-child(4){order:4}.md-typeset .tabbed-block:nth-child(5){order:5}.md-typeset .tabbed-block:nth-child(6){order:6}.md-typeset .tabbed-block:nth-child(7){order:7}.md-typeset .tabbed-block:nth-child(8){order:8}.md-typeset .tabbed-block:nth-child(9){order:9}.md-typeset .tabbed-block:nth-child(10){order:10}.md-typeset .tabbed-block:nth-child(11){order:11}.md-typeset .tabbed-block:nth-child(12){order:12}.md-typeset .tabbed-block:nth-child(13){order:13}.md-typeset .tabbed-block:nth-child(14){order:14}.md-typeset .tabbed-block:nth-child(15){order:15}.md-typeset .tabbed-block:nth-child(16){order:16}.md-typeset .tabbed-block:nth-child(17){order:17}.md-typeset .tabbed-block:nth-child(18){order:18}.md-typeset .tabbed-block:nth-child(19){order:19}.md-typeset .tabbed-block:nth-child(20){order:20}}.md-typeset .tabbed-block>.highlight:first-child>pre,.md-typeset .tabbed-block>pre:first-child{margin:0}.md-typeset .tabbed-block>.highlight:first-child>pre>code,.md-typeset .tabbed-block>pre:first-child>code{border-top-left-radius:0;border-top-right-radius:0}.md-typeset .tabbed-block>.highlight:first-child>.filename{border-top-left-radius:0;border-top-right-radius:0;margin:0}.md-typeset .tabbed-block>.highlight:first-child>.highlighttable{margin:0}.md-typeset .tabbed-block>.highlight:first-child>.highlighttable>tbody>tr>.filename span.filename,.md-typeset .tabbed-block>.highlight:first-child>.highlighttable>tbody>tr>.linenos{border-top-left-radius:0;border-top-right-radius:0;margin:0}.md-typeset .tabbed-block>.highlight:first-child>.highlighttable>tbody>tr>.code>div>pre>code{border-top-left-radius:0;border-top-right-radius:0}.md-typeset .tabbed-block>.highlight:first-child+.result{margin-top:-.125em}.md-typeset .tabbed-block>.tabbed-set{margin:0}.md-typeset .tabbed-button{align-self:center;border-radius:100%;color:var(--md-default-fg-color--light);cursor:pointer;display:block;height:.9rem;margin-top:.1rem;pointer-events:auto;transition:background-color .25s;width:.9rem}.md-typeset .tabbed-button:hover{background-color:var(--md-accent-fg-color--transparent);color:var(--md-accent-fg-color)}.md-typeset .tabbed-button:after{background-color:currentcolor;content:"";display:block;height:100%;-webkit-mask-image:var(--md-tabbed-icon--prev);mask-image:var(--md-tabbed-icon--prev);-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;transition:background-color .25s,transform .25s;width:100%}.md-typeset .tabbed-control{background:linear-gradient(to right,var(--md-default-bg-color) 60%,#0000);display:flex;height:1.9rem;justify-content:start;pointer-events:none;position:absolute;transition:opacity 125ms;width:1.2rem}[dir=rtl] .md-typeset .tabbed-control{transform:rotate(180deg)}.md-typeset .tabbed-control[hidden]{opacity:0}.md-typeset .tabbed-control--next{background:linear-gradient(to left,var(--md-default-bg-color) 60%,#0000);justify-content:end;right:0}.md-typeset .tabbed-control--next .tabbed-button:after{-webkit-mask-image:var(--md-tabbed-icon--next);mask-image:var(--md-tabbed-icon--next)}@media screen and (max-width:44.984375em){[dir=ltr] .md-content__inner>.tabbed-set .tabbed-labels{padding-left:.8rem}[dir=rtl] .md-content__inner>.tabbed-set .tabbed-labels{padding-right:.8rem}.md-content__inner>.tabbed-set .tabbed-labels{margin:0 -.8rem;max-width:100vw;scroll-padding-inline-start:.8rem}[dir=ltr] .md-content__inner>.tabbed-set .tabbed-labels:after{padding-right:.8rem}[dir=rtl] .md-content__inner>.tabbed-set .tabbed-labels:after{padding-left:.8rem}.md-content__inner>.tabbed-set .tabbed-labels:after{content:""}[dir=ltr] .md-content__inner>.tabbed-set .tabbed-labels~.tabbed-control--prev{padding-left:.8rem}[dir=rtl] .md-content__inner>.tabbed-set .tabbed-labels~.tabbed-control--prev{padding-right:.8rem}[dir=ltr] .md-content__inner>.tabbed-set .tabbed-labels~.tabbed-control--prev{margin-left:-.8rem}[dir=rtl] .md-content__inner>.tabbed-set .tabbed-labels~.tabbed-control--prev{margin-right:-.8rem}.md-content__inner>.tabbed-set .tabbed-labels~.tabbed-control--prev{width:2rem}[dir=ltr] .md-content__inner>.tabbed-set .tabbed-labels~.tabbed-control--next{padding-right:.8rem}[dir=rtl] .md-content__inner>.tabbed-set .tabbed-labels~.tabbed-control--next{padding-left:.8rem}[dir=ltr] .md-content__inner>.tabbed-set .tabbed-labels~.tabbed-control--next{margin-right:-.8rem}[dir=rtl] .md-content__inner>.tabbed-set .tabbed-labels~.tabbed-control--next{margin-left:-.8rem}.md-content__inner>.tabbed-set .tabbed-labels~.tabbed-control--next{width:2rem}}@media screen{.md-typeset .tabbed-set>input:first-child:checked~.tabbed-labels>:first-child,.md-typeset .tabbed-set>input:nth-child(10):checked~.tabbed-labels>:nth-child(10),.md-typeset .tabbed-set>input:nth-child(11):checked~.tabbed-labels>:nth-child(11),.md-typeset .tabbed-set>input:nth-child(12):checked~.tabbed-labels>:nth-child(12),.md-typeset .tabbed-set>input:nth-child(13):checked~.tabbed-labels>:nth-child(13),.md-typeset .tabbed-set>input:nth-child(14):checked~.tabbed-labels>:nth-child(14),.md-typeset .tabbed-set>input:nth-child(15):checked~.tabbed-labels>:nth-child(15),.md-typeset .tabbed-set>input:nth-child(16):checked~.tabbed-labels>:nth-child(16),.md-typeset .tabbed-set>input:nth-child(17):checked~.tabbed-labels>:nth-child(17),.md-typeset .tabbed-set>input:nth-child(18):checked~.tabbed-labels>:nth-child(18),.md-typeset .tabbed-set>input:nth-child(19):checked~.tabbed-labels>:nth-child(19),.md-typeset .tabbed-set>input:nth-child(2):checked~.tabbed-labels>:nth-child(2),.md-typeset .tabbed-set>input:nth-child(20):checked~.tabbed-labels>:nth-child(20),.md-typeset .tabbed-set>input:nth-child(3):checked~.tabbed-labels>:nth-child(3),.md-typeset .tabbed-set>input:nth-child(4):checked~.tabbed-labels>:nth-child(4),.md-typeset .tabbed-set>input:nth-child(5):checked~.tabbed-labels>:nth-child(5),.md-typeset .tabbed-set>input:nth-child(6):checked~.tabbed-labels>:nth-child(6),.md-typeset .tabbed-set>input:nth-child(7):checked~.tabbed-labels>:nth-child(7),.md-typeset .tabbed-set>input:nth-child(8):checked~.tabbed-labels>:nth-child(8),.md-typeset .tabbed-set>input:nth-child(9):checked~.tabbed-labels>:nth-child(9){color:var(--md-default-fg-color)}.md-typeset .no-js .tabbed-set>input:first-child:checked~.tabbed-labels>:first-child,.md-typeset .no-js .tabbed-set>input:nth-child(10):checked~.tabbed-labels>:nth-child(10),.md-typeset .no-js .tabbed-set>input:nth-child(11):checked~.tabbed-labels>:nth-child(11),.md-typeset .no-js .tabbed-set>input:nth-child(12):checked~.tabbed-labels>:nth-child(12),.md-typeset .no-js .tabbed-set>input:nth-child(13):checked~.tabbed-labels>:nth-child(13),.md-typeset .no-js .tabbed-set>input:nth-child(14):checked~.tabbed-labels>:nth-child(14),.md-typeset .no-js .tabbed-set>input:nth-child(15):checked~.tabbed-labels>:nth-child(15),.md-typeset .no-js .tabbed-set>input:nth-child(16):checked~.tabbed-labels>:nth-child(16),.md-typeset .no-js .tabbed-set>input:nth-child(17):checked~.tabbed-labels>:nth-child(17),.md-typeset .no-js .tabbed-set>input:nth-child(18):checked~.tabbed-labels>:nth-child(18),.md-typeset .no-js .tabbed-set>input:nth-child(19):checked~.tabbed-labels>:nth-child(19),.md-typeset .no-js .tabbed-set>input:nth-child(2):checked~.tabbed-labels>:nth-child(2),.md-typeset .no-js .tabbed-set>input:nth-child(20):checked~.tabbed-labels>:nth-child(20),.md-typeset .no-js .tabbed-set>input:nth-child(3):checked~.tabbed-labels>:nth-child(3),.md-typeset .no-js .tabbed-set>input:nth-child(4):checked~.tabbed-labels>:nth-child(4),.md-typeset .no-js .tabbed-set>input:nth-child(5):checked~.tabbed-labels>:nth-child(5),.md-typeset .no-js .tabbed-set>input:nth-child(6):checked~.tabbed-labels>:nth-child(6),.md-typeset .no-js .tabbed-set>input:nth-child(7):checked~.tabbed-labels>:nth-child(7),.md-typeset .no-js .tabbed-set>input:nth-child(8):checked~.tabbed-labels>:nth-child(8),.md-typeset .no-js .tabbed-set>input:nth-child(9):checked~.tabbed-labels>:nth-child(9),.no-js .md-typeset .tabbed-set>input:first-child:checked~.tabbed-labels>:first-child,.no-js .md-typeset .tabbed-set>input:nth-child(10):checked~.tabbed-labels>:nth-child(10),.no-js .md-typeset .tabbed-set>input:nth-child(11):checked~.tabbed-labels>:nth-child(11),.no-js .md-typeset .tabbed-set>input:nth-child(12):checked~.tabbed-labels>:nth-child(12),.no-js .md-typeset .tabbed-set>input:nth-child(13):checked~.tabbed-labels>:nth-child(13),.no-js .md-typeset .tabbed-set>input:nth-child(14):checked~.tabbed-labels>:nth-child(14),.no-js .md-typeset .tabbed-set>input:nth-child(15):checked~.tabbed-labels>:nth-child(15),.no-js .md-typeset .tabbed-set>input:nth-child(16):checked~.tabbed-labels>:nth-child(16),.no-js .md-typeset .tabbed-set>input:nth-child(17):checked~.tabbed-labels>:nth-child(17),.no-js .md-typeset .tabbed-set>input:nth-child(18):checked~.tabbed-labels>:nth-child(18),.no-js .md-typeset .tabbed-set>input:nth-child(19):checked~.tabbed-labels>:nth-child(19),.no-js .md-typeset .tabbed-set>input:nth-child(2):checked~.tabbed-labels>:nth-child(2),.no-js .md-typeset .tabbed-set>input:nth-child(20):checked~.tabbed-labels>:nth-child(20),.no-js .md-typeset .tabbed-set>input:nth-child(3):checked~.tabbed-labels>:nth-child(3),.no-js .md-typeset .tabbed-set>input:nth-child(4):checked~.tabbed-labels>:nth-child(4),.no-js .md-typeset .tabbed-set>input:nth-child(5):checked~.tabbed-labels>:nth-child(5),.no-js .md-typeset .tabbed-set>input:nth-child(6):checked~.tabbed-labels>:nth-child(6),.no-js .md-typeset .tabbed-set>input:nth-child(7):checked~.tabbed-labels>:nth-child(7),.no-js .md-typeset .tabbed-set>input:nth-child(8):checked~.tabbed-labels>:nth-child(8),.no-js .md-typeset .tabbed-set>input:nth-child(9):checked~.tabbed-labels>:nth-child(9){border-color:var(--md-default-fg-color)}}.md-typeset .tabbed-set>input:first-child.focus-visible~.tabbed-labels>:first-child,.md-typeset .tabbed-set>input:nth-child(10).focus-visible~.tabbed-labels>:nth-child(10),.md-typeset .tabbed-set>input:nth-child(11).focus-visible~.tabbed-labels>:nth-child(11),.md-typeset .tabbed-set>input:nth-child(12).focus-visible~.tabbed-labels>:nth-child(12),.md-typeset .tabbed-set>input:nth-child(13).focus-visible~.tabbed-labels>:nth-child(13),.md-typeset .tabbed-set>input:nth-child(14).focus-visible~.tabbed-labels>:nth-child(14),.md-typeset .tabbed-set>input:nth-child(15).focus-visible~.tabbed-labels>:nth-child(15),.md-typeset .tabbed-set>input:nth-child(16).focus-visible~.tabbed-labels>:nth-child(16),.md-typeset .tabbed-set>input:nth-child(17).focus-visible~.tabbed-labels>:nth-child(17),.md-typeset .tabbed-set>input:nth-child(18).focus-visible~.tabbed-labels>:nth-child(18),.md-typeset .tabbed-set>input:nth-child(19).focus-visible~.tabbed-labels>:nth-child(19),.md-typeset .tabbed-set>input:nth-child(2).focus-visible~.tabbed-labels>:nth-child(2),.md-typeset .tabbed-set>input:nth-child(20).focus-visible~.tabbed-labels>:nth-child(20),.md-typeset .tabbed-set>input:nth-child(3).focus-visible~.tabbed-labels>:nth-child(3),.md-typeset .tabbed-set>input:nth-child(4).focus-visible~.tabbed-labels>:nth-child(4),.md-typeset .tabbed-set>input:nth-child(5).focus-visible~.tabbed-labels>:nth-child(5),.md-typeset .tabbed-set>input:nth-child(6).focus-visible~.tabbed-labels>:nth-child(6),.md-typeset .tabbed-set>input:nth-child(7).focus-visible~.tabbed-labels>:nth-child(7),.md-typeset .tabbed-set>input:nth-child(8).focus-visible~.tabbed-labels>:nth-child(8),.md-typeset .tabbed-set>input:nth-child(9).focus-visible~.tabbed-labels>:nth-child(9){color:var(--md-accent-fg-color)}.md-typeset .tabbed-set>input:first-child:checked~.tabbed-content>:first-child,.md-typeset .tabbed-set>input:nth-child(10):checked~.tabbed-content>:nth-child(10),.md-typeset .tabbed-set>input:nth-child(11):checked~.tabbed-content>:nth-child(11),.md-typeset .tabbed-set>input:nth-child(12):checked~.tabbed-content>:nth-child(12),.md-typeset .tabbed-set>input:nth-child(13):checked~.tabbed-content>:nth-child(13),.md-typeset .tabbed-set>input:nth-child(14):checked~.tabbed-content>:nth-child(14),.md-typeset .tabbed-set>input:nth-child(15):checked~.tabbed-content>:nth-child(15),.md-typeset .tabbed-set>input:nth-child(16):checked~.tabbed-content>:nth-child(16),.md-typeset .tabbed-set>input:nth-child(17):checked~.tabbed-content>:nth-child(17),.md-typeset .tabbed-set>input:nth-child(18):checked~.tabbed-content>:nth-child(18),.md-typeset .tabbed-set>input:nth-child(19):checked~.tabbed-content>:nth-child(19),.md-typeset .tabbed-set>input:nth-child(2):checked~.tabbed-content>:nth-child(2),.md-typeset .tabbed-set>input:nth-child(20):checked~.tabbed-content>:nth-child(20),.md-typeset .tabbed-set>input:nth-child(3):checked~.tabbed-content>:nth-child(3),.md-typeset .tabbed-set>input:nth-child(4):checked~.tabbed-content>:nth-child(4),.md-typeset .tabbed-set>input:nth-child(5):checked~.tabbed-content>:nth-child(5),.md-typeset .tabbed-set>input:nth-child(6):checked~.tabbed-content>:nth-child(6),.md-typeset .tabbed-set>input:nth-child(7):checked~.tabbed-content>:nth-child(7),.md-typeset .tabbed-set>input:nth-child(8):checked~.tabbed-content>:nth-child(8),.md-typeset .tabbed-set>input:nth-child(9):checked~.tabbed-content>:nth-child(9){display:block}:root{--md-tasklist-icon:url('data:image/svg+xml;charset=utf-8,');--md-tasklist-icon--checked:url('data:image/svg+xml;charset=utf-8,')}.md-typeset .task-list-item{list-style-type:none;position:relative}[dir=ltr] .md-typeset .task-list-item [type=checkbox]{left:-2em}[dir=rtl] .md-typeset .task-list-item [type=checkbox]{right:-2em}.md-typeset .task-list-item [type=checkbox]{position:absolute;top:.45em}.md-typeset .task-list-control [type=checkbox]{opacity:0;z-index:-1}[dir=ltr] .md-typeset .task-list-indicator:before{left:-1.5em}[dir=rtl] .md-typeset .task-list-indicator:before{right:-1.5em}.md-typeset .task-list-indicator:before{background-color:var(--md-default-fg-color--lightest);content:"";height:1.25em;-webkit-mask-image:var(--md-tasklist-icon);mask-image:var(--md-tasklist-icon);-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;position:absolute;top:.15em;width:1.25em}.md-typeset [type=checkbox]:checked+.task-list-indicator:before{background-color:#00e676;-webkit-mask-image:var(--md-tasklist-icon--checked);mask-image:var(--md-tasklist-icon--checked)}:root>*{--md-mermaid-font-family:var(--md-text-font-family),sans-serif;--md-mermaid-edge-color:var(--md-code-fg-color);--md-mermaid-node-bg-color:var(--md-accent-fg-color--transparent);--md-mermaid-node-fg-color:var(--md-accent-fg-color);--md-mermaid-label-bg-color:var(--md-default-bg-color);--md-mermaid-label-fg-color:var(--md-code-fg-color);--md-mermaid-sequence-actor-bg-color:var(--md-mermaid-label-bg-color);--md-mermaid-sequence-actor-fg-color:var(--md-mermaid-label-fg-color);--md-mermaid-sequence-actor-border-color:var(--md-mermaid-node-fg-color);--md-mermaid-sequence-actor-line-color:var(--md-default-fg-color--lighter);--md-mermaid-sequence-actorman-bg-color:var(--md-mermaid-label-bg-color);--md-mermaid-sequence-actorman-line-color:var(--md-mermaid-node-fg-color);--md-mermaid-sequence-box-bg-color:var(--md-mermaid-node-bg-color);--md-mermaid-sequence-box-fg-color:var(--md-mermaid-edge-color);--md-mermaid-sequence-label-bg-color:var(--md-mermaid-node-bg-color);--md-mermaid-sequence-label-fg-color:var(--md-mermaid-node-fg-color);--md-mermaid-sequence-loop-bg-color:var(--md-mermaid-node-bg-color);--md-mermaid-sequence-loop-fg-color:var(--md-mermaid-edge-color);--md-mermaid-sequence-loop-border-color:var(--md-mermaid-node-fg-color);--md-mermaid-sequence-message-fg-color:var(--md-mermaid-edge-color);--md-mermaid-sequence-message-line-color:var(--md-mermaid-edge-color);--md-mermaid-sequence-note-bg-color:var(--md-mermaid-label-bg-color);--md-mermaid-sequence-note-fg-color:var(--md-mermaid-edge-color);--md-mermaid-sequence-note-border-color:var(--md-mermaid-label-fg-color);--md-mermaid-sequence-number-bg-color:var(--md-mermaid-node-fg-color);--md-mermaid-sequence-number-fg-color:var(--md-accent-bg-color)}.mermaid{line-height:normal;margin:1em 0}.md-typeset .grid{grid-gap:.4rem;display:grid;grid-template-columns:repeat(auto-fit,minmax(min(100%,16rem),1fr));margin:1em 0}.md-typeset .grid.cards>ol,.md-typeset .grid.cards>ul{display:contents}.md-typeset .grid.cards>ol>li,.md-typeset .grid.cards>ul>li,.md-typeset .grid>.card{border:.05rem solid var(--md-default-fg-color--lightest);border-radius:.1rem;display:block;margin:0;padding:.8rem;transition:border .25s,box-shadow .25s}.md-typeset .grid.cards>ol>li:focus-within,.md-typeset .grid.cards>ol>li:hover,.md-typeset .grid.cards>ul>li:focus-within,.md-typeset .grid.cards>ul>li:hover,.md-typeset .grid>.card:focus-within,.md-typeset .grid>.card:hover{border-color:#0000;box-shadow:var(--md-shadow-z2)}.md-typeset .grid.cards>ol>li>hr,.md-typeset .grid.cards>ul>li>hr,.md-typeset .grid>.card>hr{margin-bottom:1em;margin-top:1em}.md-typeset .grid.cards>ol>li>:first-child,.md-typeset .grid.cards>ul>li>:first-child,.md-typeset .grid>.card>:first-child{margin-top:0}.md-typeset .grid.cards>ol>li>:last-child,.md-typeset .grid.cards>ul>li>:last-child,.md-typeset .grid>.card>:last-child{margin-bottom:0}.md-typeset .grid>*,.md-typeset .grid>.admonition,.md-typeset .grid>.highlight>*,.md-typeset .grid>.highlighttable,.md-typeset .grid>.md-typeset details,.md-typeset .grid>details,.md-typeset .grid>pre{margin-bottom:0;margin-top:0}.md-typeset .grid>.highlight>pre:only-child,.md-typeset .grid>.highlight>pre>code,.md-typeset .grid>.highlighttable,.md-typeset .grid>.highlighttable>tbody,.md-typeset .grid>.highlighttable>tbody>tr,.md-typeset .grid>.highlighttable>tbody>tr>.code,.md-typeset .grid>.highlighttable>tbody>tr>.code>.highlight,.md-typeset .grid>.highlighttable>tbody>tr>.code>.highlight>pre,.md-typeset .grid>.highlighttable>tbody>tr>.code>.highlight>pre>code{height:100%}.md-typeset .grid>.tabbed-set{margin-bottom:0;margin-top:0}@media screen and (min-width:45em){[dir=ltr] .md-typeset .inline{float:left}[dir=rtl] .md-typeset .inline{float:right}[dir=ltr] .md-typeset .inline{margin-right:.8rem}[dir=rtl] .md-typeset .inline{margin-left:.8rem}.md-typeset .inline{margin-bottom:.8rem;margin-top:0;width:11.7rem}[dir=ltr] .md-typeset .inline.end{float:right}[dir=rtl] .md-typeset .inline.end{float:left}[dir=ltr] .md-typeset .inline.end{margin-left:.8rem;margin-right:0}[dir=rtl] .md-typeset .inline.end{margin-left:0;margin-right:.8rem}} \ No newline at end of file diff --git a/site/assets/stylesheets/main.8c3ca2c6.min.css.map b/site/assets/stylesheets/main.8c3ca2c6.min.css.map new file mode 100644 index 0000000..bc43a98 --- /dev/null +++ b/site/assets/stylesheets/main.8c3ca2c6.min.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["src/templates/assets/stylesheets/main/components/_meta.scss","../../../../src/templates/assets/stylesheets/main.scss","src/templates/assets/stylesheets/main/_resets.scss","src/templates/assets/stylesheets/main/_colors.scss","src/templates/assets/stylesheets/main/_icons.scss","src/templates/assets/stylesheets/main/_typeset.scss","src/templates/assets/stylesheets/utilities/_break.scss","src/templates/assets/stylesheets/main/components/_author.scss","src/templates/assets/stylesheets/main/components/_banner.scss","src/templates/assets/stylesheets/main/components/_base.scss","src/templates/assets/stylesheets/main/components/_clipboard.scss","src/templates/assets/stylesheets/main/components/_code.scss","src/templates/assets/stylesheets/main/components/_consent.scss","src/templates/assets/stylesheets/main/components/_content.scss","src/templates/assets/stylesheets/main/components/_dialog.scss","src/templates/assets/stylesheets/main/components/_feedback.scss","src/templates/assets/stylesheets/main/components/_footer.scss","src/templates/assets/stylesheets/main/components/_form.scss","src/templates/assets/stylesheets/main/components/_header.scss","node_modules/material-design-color/material-color.scss","src/templates/assets/stylesheets/main/components/_nav.scss","src/templates/assets/stylesheets/main/components/_pagination.scss","src/templates/assets/stylesheets/main/components/_post.scss","src/templates/assets/stylesheets/main/components/_progress.scss","src/templates/assets/stylesheets/main/components/_search.scss","src/templates/assets/stylesheets/main/components/_select.scss","src/templates/assets/stylesheets/main/components/_sidebar.scss","src/templates/assets/stylesheets/main/components/_source.scss","src/templates/assets/stylesheets/main/components/_status.scss","src/templates/assets/stylesheets/main/components/_tabs.scss","src/templates/assets/stylesheets/main/components/_tag.scss","src/templates/assets/stylesheets/main/components/_tooltip.scss","src/templates/assets/stylesheets/main/components/_tooltip2.scss","src/templates/assets/stylesheets/main/components/_top.scss","src/templates/assets/stylesheets/main/components/_version.scss","src/templates/assets/stylesheets/main/extensions/markdown/_admonition.scss","src/templates/assets/stylesheets/main/extensions/markdown/_footnotes.scss","src/templates/assets/stylesheets/main/extensions/markdown/_toc.scss","src/templates/assets/stylesheets/main/extensions/pymdownx/_arithmatex.scss","src/templates/assets/stylesheets/main/extensions/pymdownx/_critic.scss","src/templates/assets/stylesheets/main/extensions/pymdownx/_details.scss","src/templates/assets/stylesheets/main/extensions/pymdownx/_emoji.scss","src/templates/assets/stylesheets/main/extensions/pymdownx/_highlight.scss","src/templates/assets/stylesheets/main/extensions/pymdownx/_keys.scss","src/templates/assets/stylesheets/main/extensions/pymdownx/_tabbed.scss","src/templates/assets/stylesheets/main/extensions/pymdownx/_tasklist.scss","src/templates/assets/stylesheets/main/integrations/_mermaid.scss","src/templates/assets/stylesheets/main/modifiers/_grid.scss","src/templates/assets/stylesheets/main/modifiers/_inline.scss"],"names":[],"mappings":"AA0CE,gBCoyCF,CClzCA,KAEE,6BAAA,CAAA,0BAAA,CAAA,qBAAA,CADA,qBDzBF,CC8BA,iBAGE,kBD3BF,CC8BE,gCANF,iBAOI,yBDzBF,CACF,CC6BA,KACE,QD1BF,CC8BA,qBAIE,uCD3BF,CC+BA,EACE,aAAA,CACA,oBD5BF,CCgCA,GAME,QAAA,CALA,kBAAA,CACA,aAAA,CACA,aAAA,CAEA,gBAAA,CADA,SD3BF,CCiCA,MACE,aD9BF,CCkCA,QAEE,eD/BF,CCmCA,IACE,iBDhCF,CCoCA,MAEE,uBAAA,CADA,gBDhCF,CCqCA,MAEE,eAAA,CACA,kBDlCF,CCsCA,OAKE,gBAAA,CACA,QAAA,CAHA,mBAAA,CACA,iBAAA,CAFA,QAAA,CADA,SD9BF,CCuCA,MACE,QAAA,CACA,YDpCF,CErDA,MAIE,6BAAA,CACA,oCAAA,CACA,mCAAA,CACA,0BAAA,CACA,sCAAA,CAGA,4BAAA,CACA,2CAAA,CACA,yBAAA,CACA,qCFmDF,CE7CA,+BAIE,kBF6CF,CE1CE,oHAEE,YF4CJ,CEnCA,qCAIE,eAAA,CAGA,+BAAA,CACA,sCAAA,CACA,wCAAA,CACA,yCAAA,CACA,0BAAA,CACA,sCAAA,CACA,wCAAA,CACA,yCAAA,CAGA,0BAAA,CACA,0BAAA,CAGA,0BAAA,CACA,mCAAA,CAGA,iCAAA,CACA,kCAAA,CACA,mCAAA,CACA,mCAAA,CACA,kCAAA,CACA,iCAAA,CACA,+CAAA,CACA,6DAAA,CACA,gEAAA,CACA,4DAAA,CACA,4DAAA,CACA,6DAAA,CAGA,6CAAA,CAGA,+CAAA,CAGA,gCAAA,CACA,gCAAA,CAGA,8BAAA,CACA,kCAAA,CACA,qCAAA,CAGA,iCAAA,CAGA,kCAAA,CACA,gDAAA,CAGA,mDAAA,CACA,mDAAA,CAGA,+BAAA,CACA,0BAAA,CAGA,yBAAA,CACA,qCAAA,CACA,uCAAA,CACA,8BAAA,CACA,oCAAA,CAGA,8DAAA,CAKA,8DAAA,CAKA,0DFKF,CG9HE,aAIE,iBAAA,CAHA,aAAA,CAEA,aAAA,CADA,YHmIJ,CIxIA,KACE,kCAAA,CACA,iCAAA,CAGA,uGAAA,CAKA,mFJyIF,CInIA,iBAIE,mCAAA,CACA,6BAAA,CAFA,sCJwIF,CIlIA,aAIE,4BAAA,CADA,sCJsIF,CI7HA,MACE,wNAAA,CACA,gNAAA,CACA,iNJgIF,CIzHA,YAGE,gCAAA,CAAA,kBAAA,CAFA,eAAA,CACA,eJ6HF,CIxHE,aAPF,YAQI,gBJ2HF,CACF,CIxHE,uGAME,iBAAA,CAAA,cJ0HJ,CItHE,eAKE,uCAAA,CAHA,aAAA,CAEA,eAAA,CAHA,iBJ6HJ,CIpHE,8BAPE,eAAA,CAGA,qBJ+HJ,CI3HE,eAEE,kBAAA,CAEA,eAAA,CAHA,oBJ0HJ,CIlHE,eAEE,gBAAA,CACA,eAAA,CAEA,qBAAA,CADA,eAAA,CAHA,mBJwHJ,CIhHE,kBACE,eJkHJ,CI9GE,eAEE,eAAA,CACA,qBAAA,CAFA,YJkHJ,CI5GE,8BAKE,uCAAA,CAFA,cAAA,CACA,eAAA,CAEA,qBAAA,CAJA,eJkHJ,CI1GE,eACE,wBJ4GJ,CIxGE,eAGE,+DAAA,CAFA,iBAAA,CACA,cJ2GJ,CItGE,cACE,+BAAA,CACA,qBJwGJ,CIrGI,mCAEE,sBJsGN,CIlGI,wCACE,+BJoGN,CIjGM,kDACE,uDJmGR,CI9FI,mBACE,kBAAA,CACA,iCJgGN,CI5FI,4BACE,uCAAA,CACA,oBJ8FN,CIzFE,iDAIE,6BAAA,CACA,aAAA,CAFA,2BJ6FJ,CIxFI,aARF,iDASI,oBJ6FJ,CACF,CIzFE,iBAIE,wCAAA,CACA,mBAAA,CACA,kCAAA,CAAA,0BAAA,CAJA,eAAA,CADA,uBAAA,CAEA,qBJ8FJ,CIxFI,qCAEE,uCAAA,CADA,YJ2FN,CIrFE,gBAEE,iBAAA,CACA,eAAA,CAFA,iBJyFJ,CIpFI,qBAWE,kCAAA,CAAA,0BAAA,CADA,eAAA,CATA,aAAA,CAEA,QAAA,CAMA,uCAAA,CALA,aAAA,CAFA,oCAAA,CAKA,yDAAA,CACA,oBAAA,CAFA,iBAAA,CADA,iBJ4FN,CInFM,2BACE,+CJqFR,CIjFM,wCAEE,YAAA,CADA,WJoFR,CI/EM,8CACE,oDJiFR,CI9EQ,oDACE,0CJgFV,CIzEE,gBAOE,4CAAA,CACA,mBAAA,CACA,mKACE,CANF,gCAAA,CAHA,oBAAA,CAEA,eAAA,CADA,uBAAA,CAIA,uBAAA,CADA,qBJ+EJ,CIpEE,iBAGE,6CAAA,CACA,kCAAA,CAAA,0BAAA,CAHA,aAAA,CACA,qBJwEJ,CIlEE,iBAGE,6DAAA,CADA,WAAA,CADA,oBJsEJ,CIhEE,kBACE,WJkEJ,CI9DE,oDAEE,qBJgEJ,CIlEE,oDAEE,sBJgEJ,CI5DE,iCACE,kBJiEJ,CIlEE,iCACE,mBJiEJ,CIlEE,iCAIE,2DJ8DJ,CIlEE,iCAIE,4DJ8DJ,CIlEE,uBAGE,uCAAA,CADA,aAAA,CAAA,cJgEJ,CI1DE,eACE,oBJ4DJ,CIxDI,qBACE,4BJ0DN,CIrDE,kDAGE,kBJuDJ,CI1DE,kDAGE,mBJuDJ,CI1DE,8BAEE,SJwDJ,CIpDI,0DACE,iBJuDN,CInDI,oCACE,2BJsDN,CInDM,0CACE,2BJsDR,CInDQ,gDACE,2BJsDV,CInDU,sDACE,2BJsDZ,CI9CI,0CACE,4BJiDN,CI7CI,wDACE,kBJiDN,CIlDI,wDACE,mBJiDN,CIlDI,oCAEE,kBJgDN,CI7CM,kGAEE,aJiDR,CI7CM,0DACE,eJgDR,CI5CM,4HAEE,kBJ+CR,CIjDM,4HAEE,mBJ+CR,CIjDM,oFACE,kBAAA,CAAA,eJgDR,CIzCE,yBAEE,mBJ2CJ,CI7CE,yBAEE,oBJ2CJ,CI7CE,eACE,mBAAA,CAAA,cJ4CJ,CIvCE,kDAIE,WAAA,CADA,cJ0CJ,CIlCI,4BAEE,oBJoCN,CIhCI,6BAEE,oBJkCN,CI9BI,kCACE,YJgCN,CI3BE,mBACE,iBAAA,CAGA,eAAA,CADA,cAAA,CAEA,iBAAA,CAHA,sBAAA,CAAA,iBJgCJ,CI1BI,uBACE,aAAA,CACA,aJ4BN,CIvBE,uBAGE,iBAAA,CADA,eAAA,CADA,eJ2BJ,CIrBE,mBACE,cJuBJ,CInBE,+BAME,2CAAA,CACA,iDAAA,CACA,mBAAA,CAPA,oBAAA,CAGA,gBAAA,CAFA,cAAA,CACA,aAAA,CAEA,iBJwBJ,CIlBI,aAXF,+BAYI,aJqBJ,CACF,CIhBI,iCACE,gBJkBN,CIXM,8FACE,YJaR,CITM,4FACE,eJWR,CINI,8FACE,eJQN,CILM,kHACE,gBJOR,CIFI,kCAGE,eAAA,CAFA,cAAA,CACA,sBAAA,CAEA,kBJIN,CIAI,kCAGE,qDAAA,CAFA,sBAAA,CACA,kBJGN,CIEI,wCACE,iCJAN,CIGM,8CACE,qDAAA,CACA,sDJDR,CIMI,iCACE,iBJJN,CISE,wCACE,cJPJ,CIUI,wDAIE,gBJFN,CIFI,wDAIE,iBJFN,CIFI,8CAME,UAAA,CALA,oBAAA,CAEA,YAAA,CAIA,oDAAA,CAAA,4CAAA,CACA,6BAAA,CAAA,qBAAA,CACA,yBAAA,CAAA,iBAAA,CACA,iCAAA,CALA,0BAAA,CAHA,WJAN,CIYI,oDACE,oDJVN,CIcI,mEACE,kDAAA,CACA,yDAAA,CAAA,iDJZN,CIgBI,oEACE,kDAAA,CACA,0DAAA,CAAA,kDJdN,CImBE,wBACE,iBAAA,CACA,eAAA,CACA,iBJjBJ,CIqBE,mBACE,oBAAA,CAEA,kBAAA,CADA,eJlBJ,CIsBI,aANF,mBAOI,aJnBJ,CACF,CIsBI,8BACE,aAAA,CAEA,QAAA,CACA,eAAA,CAFA,UJlBN,CKlWI,0CDmYF,uBACE,iBJ7BF,CIgCE,4BACE,eJ9BJ,CACF,CMjiBE,uBAOE,kBAAA,CALA,aAAA,CACA,aAAA,CAEA,aAAA,CACA,eAAA,CALA,iBAAA,CAOA,sCACE,CALF,YNuiBJ,CM9hBI,2BACE,aNgiBN,CM5hBI,6BAME,+CAAA,CAFA,yCAAA,CAHA,eAAA,CACA,eAAA,CACA,kBAAA,CAEA,iBN+hBN,CM1hBI,6BAEE,aAAA,CADA,YN6hBN,CMvhBE,wBACE,kBNyhBJ,CMthBI,4BAIE,kBAAA,CAHA,mCAAA,CAIA,uBNshBN,CMlhBI,4DAEE,oBAAA,CADA,SNqhBN,CMjhBM,oEACE,mBNmhBR,CO5kBA,WAGE,0CAAA,CADA,+BAAA,CADA,aPilBF,CO5kBE,aANF,WAOI,YP+kBF,CACF,CO5kBE,oBAEE,2CAAA,CADA,gCP+kBJ,CO1kBE,kBAGE,eAAA,CADA,iBAAA,CADA,eP8kBJ,COxkBE,6BACE,WP6kBJ,CO9kBE,6BACE,UP6kBJ,CO9kBE,mBAEE,aAAA,CACA,cAAA,CACA,uBP0kBJ,COvkBI,0BACE,YPykBN,COrkBI,yBACE,UPukBN,CQ5mBA,KASE,cAAA,CARA,WAAA,CACA,iBRgnBF,CK5cI,oCGtKJ,KAaI,gBRymBF,CACF,CKjdI,oCGtKJ,KAkBI,cRymBF,CACF,CQpmBA,KASE,2CAAA,CAPA,YAAA,CACA,qBAAA,CAKA,eAAA,CAHA,eAAA,CAJA,iBAAA,CAGA,UR0mBF,CQlmBE,aAZF,KAaI,aRqmBF,CACF,CKldI,0CGhJF,yBAII,cRkmBJ,CACF,CQzlBA,SAEE,gBAAA,CAAA,iBAAA,CADA,eR6lBF,CQxlBA,cACE,YAAA,CAEA,qBAAA,CADA,WR4lBF,CQxlBE,aANF,cAOI,aR2lBF,CACF,CQvlBA,SACE,WR0lBF,CQvlBE,gBACE,YAAA,CACA,WAAA,CACA,iBRylBJ,CQplBA,aACE,eAAA,CACA,sBRulBF,CQ9kBA,WACE,YRilBF,CQ5kBA,WAGE,QAAA,CACA,SAAA,CAHA,iBAAA,CACA,ORilBF,CQ5kBE,uCACE,aR8kBJ,CQ1kBE,+BAEE,uCAAA,CADA,kBR6kBJ,CQvkBA,SASE,2CAAA,CACA,mBAAA,CAFA,gCAAA,CADA,gBAAA,CADA,YAAA,CAMA,SAAA,CADA,uCAAA,CANA,mBAAA,CAJA,cAAA,CAYA,2BAAA,CATA,URilBF,CQrkBE,eAEE,SAAA,CAIA,uBAAA,CAHA,oEACE,CAHF,UR0kBJ,CQ5jBA,MACE,WR+jBF,CSxtBA,MACE,6PT0tBF,CSptBA,cASE,mBAAA,CAFA,0CAAA,CACA,cAAA,CAFA,YAAA,CAIA,uCAAA,CACA,oBAAA,CAVA,iBAAA,CAEA,UAAA,CADA,QAAA,CAUA,qBAAA,CAPA,WAAA,CADA,ST+tBF,CSptBE,aAfF,cAgBI,YTutBF,CACF,CSptBE,kCAEE,uCAAA,CADA,YTutBJ,CSltBE,qBACE,uCTotBJ,CShtBE,wCACE,+BTktBJ,CS7sBE,oBAME,6BAAA,CADA,UAAA,CAJA,aAAA,CAEA,cAAA,CACA,aAAA,CAGA,2CAAA,CAAA,mCAAA,CAEA,4BAAA,CAAA,oBAAA,CADA,6BAAA,CAAA,qBAAA,CAEA,yBAAA,CAAA,iBAAA,CARA,aTutBJ,CS3sBE,sBACE,cT6sBJ,CS1sBI,2BACE,2CT4sBN,CStsBI,kEAEE,uDAAA,CADA,+BTysBN,CU3wBE,8BACE,YV8wBJ,CWnxBA,mBACE,GACE,SAAA,CACA,0BXsxBF,CWnxBA,GACE,SAAA,CACA,uBXqxBF,CACF,CWjxBA,mBACE,GACE,SXmxBF,CWhxBA,GACE,SXkxBF,CACF,CWvwBE,qBASE,2BAAA,CAFA,mCAAA,CAAA,2BAAA,CADA,0BAAA,CADA,WAAA,CAGA,SAAA,CAPA,cAAA,CACA,KAAA,CAEA,UAAA,CADA,SX+wBJ,CWrwBE,mBAcE,mDAAA,CANA,2CAAA,CACA,QAAA,CACA,mBAAA,CARA,QAAA,CASA,kDACE,CAPF,eAAA,CAEA,aAAA,CADA,SAAA,CALA,cAAA,CAGA,UAAA,CADA,SXgxBJ,CWjwBE,kBACE,aXmwBJ,CW/vBE,sBACE,YAAA,CACA,YXiwBJ,CW9vBI,oCACE,aXgwBN,CW3vBE,sBACE,mBX6vBJ,CW1vBI,6CACE,cX4vBN,CKtpBI,0CMvGA,6CAKI,aAAA,CAEA,gBAAA,CACA,iBAAA,CAFA,UX8vBN,CACF,CWvvBE,kBACE,cXyvBJ,CY11BA,YACE,WAAA,CAIA,WZ01BF,CYv1BE,mBAEE,qBAAA,CADA,iBZ01BJ,CK7rBI,sCOtJE,4EACE,kBZs1BN,CYl1BI,0JACE,mBZo1BN,CYr1BI,8EACE,kBZo1BN,CACF,CY/0BI,0BAGE,UAAA,CAFA,aAAA,CACA,YZk1BN,CY70BI,+BACE,eZ+0BN,CYz0BE,8BACE,WZ80BJ,CY/0BE,8BACE,UZ80BJ,CY/0BE,8BAIE,iBZ20BJ,CY/0BE,8BAIE,kBZ20BJ,CY/0BE,oBAGE,cAAA,CADA,SZ60BJ,CYx0BI,aAPF,oBAQI,YZ20BJ,CACF,CYx0BI,gCACE,yCZ00BN,CYt0BI,wBACE,cAAA,CACA,kBZw0BN,CYr0BM,kCACE,oBZu0BR,Cax4BA,qBAEE,Wbs5BF,Cax5BA,qBAEE,Ubs5BF,Cax5BA,WAQE,2CAAA,CACA,mBAAA,CANA,YAAA,CAOA,8BAAA,CALA,iBAAA,CAMA,SAAA,CALA,mBAAA,CACA,mBAAA,CANA,cAAA,CAcA,0BAAA,CAHA,wCACE,CATF,Sbo5BF,Cat4BE,aAlBF,WAmBI,Yby4BF,CACF,Cat4BE,mBAEE,SAAA,CADA,mBAAA,CAKA,uBAAA,CAHA,kEby4BJ,Cal4BE,kBAEE,gCAAA,CADA,ebq4BJ,Ccv6BA,aACE,gBAAA,CACA,iBd06BF,Ccv6BE,sBAGE,WAAA,CADA,QAAA,CADA,Sd26BJ,Ccr6BE,oBAEE,eAAA,CADA,edw6BJ,Ccn6BE,oBACE,iBdq6BJ,Ccj6BE,mBAEE,YAAA,CACA,cAAA,CACA,6BAAA,CAHA,iBds6BJ,Cch6BI,iDACE,yCdk6BN,Cc95BI,6BACE,iBdg6BN,Cc35BE,mBAGE,uCAAA,CACA,cAAA,CAHA,aAAA,CACA,cAAA,CAGA,sBd65BJ,Cc15BI,gDACE,+Bd45BN,Ccx5BI,4BACE,0CAAA,CACA,mBd05BN,Ccr5BE,mBAEE,SAAA,CADA,iBAAA,CAKA,2BAAA,CAHA,8Ddw5BJ,Ccl5BI,qBAEE,aAAA,CADA,edq5BN,Cch5BI,6BACE,SAAA,CACA,uBdk5BN,Ceh+BA,WAEE,0CAAA,CADA,+Bfo+BF,Ceh+BE,aALF,WAMI,Yfm+BF,CACF,Ceh+BE,kBACE,6BAAA,CAEA,aAAA,CADA,afm+BJ,Ce/9BI,gCACE,Yfi+BN,Ce59BE,iBAOE,eAAA,CANA,YAAA,CAKA,cAAA,CAGA,mBAAA,CAAA,eAAA,CADA,cAAA,CAGA,uCAAA,CADA,eAAA,CAEA,uBf09BJ,Cev9BI,8CACE,Ufy9BN,Cer9BI,+BACE,oBfu9BN,CKz0BI,0CUvIE,uBACE,afm9BN,Ceh9BM,yCACE,Yfk9BR,CACF,Ce78BI,iCACE,gBfg9BN,Cej9BI,iCACE,iBfg9BN,Cej9BI,uBAEE,gBf+8BN,Ce58BM,iCACE,ef88BR,Cex8BE,kBACE,WAAA,CAIA,eAAA,CADA,mBAAA,CAFA,6BAAA,CACA,cAAA,CAGA,kBf08BJ,Cet8BE,mBAEE,YAAA,CADA,afy8BJ,Cep8BE,sBACE,gBAAA,CACA,Ufs8BJ,Cej8BA,gBACE,gDfo8BF,Cej8BE,uBACE,YAAA,CACA,cAAA,CACA,6BAAA,CACA,afm8BJ,Ce/7BE,kCACE,sCfi8BJ,Ce97BI,gFACE,+Bfg8BN,Cex7BA,cAKE,wCAAA,CADA,gBAAA,CADA,iBAAA,CADA,eAAA,CADA,Uf+7BF,CKn5BI,mCU7CJ,cASI,Uf27BF,CACF,Cev7BE,yBACE,sCfy7BJ,Cel7BA,WACE,mBAAA,CACA,SAAA,CAEA,cAAA,CADA,qBfs7BF,CKl6BI,mCUvBJ,WAQI,efq7BF,CACF,Cel7BE,iBACE,oBAAA,CAEA,aAAA,CACA,iBAAA,CAFA,Yfs7BJ,Cej7BI,wBACE,efm7BN,Ce/6BI,qBAGE,iBAAA,CAFA,gBAAA,CACA,mBfk7BN,CgBxlCE,uBAME,kBAAA,CACA,mBAAA,CAHA,gCAAA,CACA,cAAA,CAJA,oBAAA,CAEA,eAAA,CADA,kBAAA,CAMA,gEhB2lCJ,CgBrlCI,gCAEE,2CAAA,CACA,uCAAA,CAFA,gChBylCN,CgBnlCI,0DAEE,0CAAA,CACA,sCAAA,CAFA,+BhBulCN,CgBhlCE,gCAKE,4BhBqlCJ,CgB1lCE,gEAME,6BhBolCJ,CgB1lCE,gCAME,4BhBolCJ,CgB1lCE,sBAIE,6DAAA,CAGA,8BAAA,CAJA,eAAA,CAFA,aAAA,CACA,eAAA,CAMA,sChBklCJ,CgB7kCI,wDACE,6CAAA,CACA,8BhB+kCN,CgB3kCI,+BACE,UhB6kCN,CiBhoCA,WAOE,2CAAA,CAGA,8CACE,CALF,gCAAA,CADA,aAAA,CAHA,MAAA,CADA,eAAA,CACA,OAAA,CACA,KAAA,CACA,SjBuoCF,CiB5nCE,aAfF,WAgBI,YjB+nCF,CACF,CiB5nCE,mBAIE,2BAAA,CAHA,iEjB+nCJ,CiBxnCE,mBACE,kDACE,CAEF,kEjBwnCJ,CiBlnCE,kBAEE,kBAAA,CADA,YAAA,CAEA,ejBonCJ,CiBhnCE,mBAKE,kBAAA,CAEA,cAAA,CAHA,YAAA,CAIA,uCAAA,CALA,aAAA,CAFA,iBAAA,CAQA,uBAAA,CAHA,qBAAA,CAJA,SjBynCJ,CiB/mCI,yBACE,UjBinCN,CiB7mCI,iCACE,oBjB+mCN,CiB3mCI,uCAEE,uCAAA,CADA,YjB8mCN,CiBzmCI,2BAEE,YAAA,CADA,ajB4mCN,CK9/BI,0CY/GA,2BAMI,YjB2mCN,CACF,CiBxmCM,8DAIE,iBAAA,CAHA,aAAA,CAEA,aAAA,CADA,UjB4mCR,CK5hCI,mCYzEA,iCAII,YjBqmCN,CACF,CiBlmCM,wCACE,YjBomCR,CiBhmCM,+CACE,oBjBkmCR,CKviCI,sCYtDA,iCAII,YjB6lCN,CACF,CiBxlCE,kBAEE,YAAA,CACA,cAAA,CAFA,iBAAA,CAIA,8DACE,CAFF,kBjB2lCJ,CiBrlCI,oCAGE,SAAA,CADA,mBAAA,CAKA,6BAAA,CAHA,8DACE,CAJF,UjB2lCN,CiBllCM,8CACE,8BjBolCR,CiB/kCI,8BACE,ejBilCN,CiB5kCE,4BAGE,gBAAA,CAAA,kBjBglCJ,CiBnlCE,4BAGE,iBAAA,CAAA,iBjBglCJ,CiBnlCE,kBACE,WAAA,CAGA,eAAA,CAFA,aAAA,CAGA,kBjB8kCJ,CiB3kCI,4CAGE,SAAA,CADA,mBAAA,CAKA,8BAAA,CAHA,8DACE,CAJF,UjBilCN,CiBxkCM,sDACE,6BjB0kCR,CiBtkCM,8DAGE,SAAA,CADA,mBAAA,CAKA,uBAAA,CAHA,8DACE,CAJF,SjB4kCR,CiBjkCI,uCAGE,WAAA,CAFA,iBAAA,CACA,UjBokCN,CiB9jCE,mBACE,YAAA,CACA,aAAA,CACA,cAAA,CAEA,+CACE,CAFF,kBjBikCJ,CiB3jCI,8DACE,WAAA,CACA,SAAA,CACA,oCjB6jCN,CiBpjCI,yBACE,QjBsjCN,CiBjjCE,mBACE,YjBmjCJ,CK/mCI,mCY2DF,6BAQI,gBjBmjCJ,CiB3jCA,6BAQI,iBjBmjCJ,CiB3jCA,mBAKI,aAAA,CAEA,iBAAA,CADA,ajBqjCJ,CACF,CKvnCI,sCY2DF,6BAaI,kBjBmjCJ,CiBhkCA,6BAaI,mBjBmjCJ,CACF,CDlyCA,SAGE,uCAAA,CAFA,eAAA,CACA,eCsyCF,CDlyCE,eACE,mBAAA,CACA,cAAA,CAGA,eAAA,CADA,QAAA,CADA,SCsyCJ,CDhyCE,sCAEE,WAAA,CADA,iBAAA,CAAA,kBCmyCJ,CD9xCE,eACE,+BCgyCJ,CD7xCI,0CACE,+BC+xCN,CDzxCA,UAKE,wBmBaa,CnBZb,oBAAA,CAFA,UAAA,CAHA,oBAAA,CAEA,eAAA,CADA,0BAAA,CAAA,2BCgyCF,CmBl0CA,MACE,uMAAA,CACA,sLAAA,CACA,iNnBq0CF,CmB/zCA,QACE,eAAA,CACA,enBk0CF,CmB/zCE,eAKE,uCAAA,CAJA,aAAA,CAGA,eAAA,CADA,eAAA,CADA,eAAA,CAIA,sBnBi0CJ,CmB9zCI,+BACE,YnBg0CN,CmB7zCM,mCAEE,WAAA,CADA,UnBg0CR,CmBxzCQ,sFAME,iBAAA,CALA,aAAA,CAGA,aAAA,CADA,cAAA,CAEA,kBAAA,CAHA,UnB8zCV,CmBnzCE,cAGE,eAAA,CADA,QAAA,CADA,SnBuzCJ,CmBjzCE,cAGE,sBAAA,CAFA,YAAA,CACA,SAAA,CAEA,iBAAA,CACA,uBAAA,CACA,sBnBmzCJ,CmBhzCI,sBACE,uCnBkzCN,CmB3yCM,6EAEE,+BnB6yCR,CmBxyCI,2BAIE,iBnBuyCN,CmBnyCI,4CACE,gBnBqyCN,CmBtyCI,4CACE,iBnBqyCN,CmBjyCI,kBAME,iBAAA,CAFA,aAAA,CACA,YAAA,CAFA,iBnBoyCN,CmB7xCI,sGACE,+BAAA,CACA,cnB+xCN,CmB3xCI,4BACE,uCAAA,CACA,oBnB6xCN,CmBzxCI,0CACE,YnB2xCN,CmBxxCM,yDAIE,6BAAA,CAHA,aAAA,CAEA,WAAA,CAEA,qCAAA,CAAA,6BAAA,CAHA,UnB6xCR,CmBtxCM,kDACE,YnBwxCR,CmBlxCE,iCACE,YnBoxCJ,CmBjxCI,6CACE,WAAA,CAGA,WnBixCN,CmB5wCE,cACE,anB8wCJ,CmB1wCE,gBACE,YnB4wCJ,CK7uCI,0CcxBA,0CASE,2CAAA,CAHA,YAAA,CACA,qBAAA,CACA,WAAA,CALA,MAAA,CADA,iBAAA,CACA,OAAA,CACA,KAAA,CACA,SnB2wCJ,CmBhwCI,+DACE,eAAA,CACA,enBkwCN,CmB9vCI,gCAQE,qDAAA,CAHA,uCAAA,CAEA,cAAA,CALA,aAAA,CAEA,kBAAA,CADA,wBAAA,CAFA,iBAAA,CAKA,kBnBkwCN,CmB7vCM,wDAEE,UnBowCR,CmBtwCM,wDAEE,WnBowCR,CmBtwCM,8CAIE,aAAA,CAEA,aAAA,CACA,YAAA,CANA,iBAAA,CAEA,SAAA,CAEA,YnBiwCR,CmB5vCQ,oDAKE,6BAAA,CADA,UAAA,CAHA,aAAA,CAEA,WAAA,CAGA,2CAAA,CAAA,mCAAA,CAEA,4BAAA,CAAA,oBAAA,CADA,6BAAA,CAAA,qBAAA,CAEA,yBAAA,CAAA,iBAAA,CAPA,UnBqwCV,CmBzvCM,8CAIE,2CAAA,CACA,gEACE,CALF,eAAA,CAEA,4BAAA,CADA,kBnB8vCR,CmBvvCQ,2DACE,YnByvCV,CmBpvCM,8CAGE,2CAAA,CADA,gCAAA,CADA,enBwvCR,CmBlvCM,yCAIE,aAAA,CAFA,UAAA,CAIA,YAAA,CADA,aAAA,CAJA,iBAAA,CACA,WAAA,CACA,SnBuvCR,CmB/uCI,+BACE,MnBivCN,CmB7uCI,+BACE,4DnB+uCN,CmB5uCM,qDACE,+BnB8uCR,CmB3uCQ,sHACE,+BnB6uCV,CmBvuCI,+BAEE,YAAA,CADA,mBnB0uCN,CmBtuCM,mCACE,enBwuCR,CmBpuCM,6CACE,SnBsuCR,CmBluCM,uDAGE,mBnBquCR,CmBxuCM,uDAGE,kBnBquCR,CmBxuCM,6CAIE,gBAAA,CAFA,aAAA,CADA,YnBuuCR,CmBjuCQ,mDAKE,6BAAA,CADA,UAAA,CAHA,aAAA,CAEA,WAAA,CAGA,2CAAA,CAAA,mCAAA,CAEA,4BAAA,CAAA,oBAAA,CADA,6BAAA,CAAA,qBAAA,CAEA,yBAAA,CAAA,iBAAA,CAPA,UnB0uCV,CmB1tCM,+CACE,mBnB4tCR,CmBptCM,4CAEE,wBAAA,CADA,enButCR,CmBntCQ,oEACE,mBnBqtCV,CmBttCQ,oEACE,oBnBqtCV,CmBjtCQ,4EACE,iBnBmtCV,CmBptCQ,4EACE,kBnBmtCV,CmB/sCQ,oFACE,mBnBitCV,CmBltCQ,oFACE,oBnBitCV,CmB7sCQ,4FACE,mBnB+sCV,CmBhtCQ,4FACE,oBnB+sCV,CmBxsCE,mBACE,wBnB0sCJ,CmBtsCE,wBACE,YAAA,CACA,SAAA,CAIA,0BAAA,CAHA,oEnBysCJ,CmBnsCI,kCACE,2BnBqsCN,CmBhsCE,gCACE,SAAA,CAIA,uBAAA,CAHA,qEnBmsCJ,CmB7rCI,8CAEE,kCAAA,CAAA,0BnB8rCN,CACF,CKh4CI,0Cc0MA,0CACE,YnByrCJ,CmBtrCI,yDACE,UnBwrCN,CmBprCI,wDACE,YnBsrCN,CmBlrCI,kDACE,YnBorCN,CmB/qCE,gBAIE,iDAAA,CADA,gCAAA,CAFA,aAAA,CACA,enBmrCJ,CACF,CK77CM,+DcmRF,6CACE,YnB6qCJ,CmB1qCI,4DACE,UnB4qCN,CmBxqCI,2DACE,YnB0qCN,CmBtqCI,qDACE,YnBwqCN,CACF,CKr7CI,mCc7JJ,QAgbI,oBnBsqCF,CmBhqCI,kCAME,qCAAA,CACA,qDAAA,CANA,eAAA,CACA,KAAA,CAGA,SnBkqCN,CmB7pCM,6CACE,uBnB+pCR,CmB3pCM,gDACE,YnB6pCR,CmBxpCI,2CACE,kBnB2pCN,CmB5pCI,2CACE,mBnB2pCN,CmB5pCI,iCAEE,oBnB0pCN,CmBnpCI,yDACE,kBnBqpCN,CmBtpCI,yDACE,iBnBqpCN,CACF,CK98CI,sCc7JJ,QA4dI,oBAAA,CACA,oDnBmpCF,CmB7oCI,gCAME,qCAAA,CACA,qDAAA,CANA,eAAA,CACA,KAAA,CAGA,SnB+oCN,CmB1oCM,8CACE,uBnB4oCR,CmBxoCM,8CACE,YnB0oCR,CmBroCI,yCACE,kBnBwoCN,CmBzoCI,yCACE,mBnBwoCN,CmBzoCI,+BAEE,oBnBuoCN,CmBhoCI,uDACE,kBnBkoCN,CmBnoCI,uDACE,iBnBkoCN,CmB7nCE,wBACE,YAAA,CACA,sBAAA,CAEA,SAAA,CACA,6FACE,CAHF,mBnBioCJ,CmBznCI,sCACE,enB2nCN,CmBtnCE,iFACE,sBAAA,CAEA,SAAA,CACA,4FACE,CAHF,kBnB0nCJ,CmBjnCE,iDACE,enBmnCJ,CmB/mCE,6CACE,YnBinCJ,CmB7mCE,uBACE,aAAA,CACA,enB+mCJ,CmB5mCI,kCACE,enB8mCN,CmB1mCI,qCACE,enB4mCN,CmBzmCM,0CACE,uCnB2mCR,CmBvmCM,6DACE,mBnBymCR,CmBrmCM,yFAEE,YnBumCR,CmBlmCI,yCAEE,kBnBsmCN,CmBxmCI,yCAEE,mBnBsmCN,CmBxmCI,+BACE,aAAA,CAGA,SAAA,CADA,kBnBqmCN,CmBjmCM,2DACE,SnBmmCR,CmB7lCE,cAGE,kBAAA,CADA,YAAA,CAEA,gCAAA,CAHA,WnBkmCJ,CmB5lCI,oBACE,uDnB8lCN,CmB1lCI,oBAME,6BAAA,CACA,kBAAA,CAFA,UAAA,CAJA,oBAAA,CAEA,WAAA,CAKA,2CAAA,CAAA,mCAAA,CAEA,4BAAA,CAAA,oBAAA,CADA,6BAAA,CAAA,qBAAA,CAEA,yBAAA,CAAA,iBAAA,CACA,yBAAA,CARA,qBAAA,CAFA,UnBsmCN,CmBzlCM,8BACE,wBnB2lCR,CmBvlCM,kKAEE,uBnBwlCR,CmB1kCI,2EACE,YnB+kCN,CmB5kCM,oDACE,anB8kCR,CmB3kCQ,kEAKE,qCAAA,CACA,qDAAA,CAFA,YAAA,CAHA,eAAA,CACA,KAAA,CACA,SnBglCV,CmB1kCU,0FACE,mBnB4kCZ,CmBvkCQ,0EACE,QnBykCV,CmBpkCM,sFACE,kBnBskCR,CmBvkCM,sFACE,mBnBskCR,CmBlkCM,kDACE,uCnBokCR,CmB9jCI,2CACE,sBAAA,CAEA,SAAA,CADA,kBnBikCN,CmBxjCI,qFAIE,mDnB2jCN,CmB/jCI,qFAIE,oDnB2jCN,CmB/jCI,2EACE,aAAA,CACA,oBAAA,CAGA,SAAA,CAFA,kBnB4jCN,CmBvjCM,yFAEE,gBAAA,CADA,gBnB0jCR,CmBrjCM,0FACE,YnBujCR,CACF,CoB9wDA,eAKE,eAAA,CACA,eAAA,CAJA,SpBqxDF,CoB9wDE,gCANA,kBAAA,CAFA,YAAA,CAGA,sBpB4xDF,CoBvxDE,iBAOE,mBAAA,CAFA,aAAA,CADA,gBAAA,CAEA,iBpBixDJ,CoB5wDE,wBAEE,qDAAA,CADA,uCpB+wDJ,CoB1wDE,qBACE,6CpB4wDJ,CoBvwDI,sDAEE,uDAAA,CADA,+BpB0wDN,CoBtwDM,8DACE,+BpBwwDR,CoBnwDI,mCACE,uCAAA,CACA,oBpBqwDN,CoBjwDI,yBAKE,iBAAA,CADA,yCAAA,CAHA,aAAA,CAEA,eAAA,CADA,YpBswDN,CqBtzDE,eAGE,+DAAA,CADA,oBAAA,CADA,qBrB2zDJ,CKtoDI,0CgBtLF,eAOI,YrByzDJ,CACF,CqBnzDM,6BACE,oBrBqzDR,CqB/yDE,kBACE,YAAA,CACA,qBAAA,CACA,SAAA,CACA,qBrBizDJ,CqB1yDI,0BACE,sBrB4yDN,CqBzyDM,gEACE,+BrB2yDR,CqBryDE,gBAEE,uCAAA,CADA,erBwyDJ,CqBnyDE,kBACE,oBrBqyDJ,CqBlyDI,mCAGE,kBAAA,CAFA,YAAA,CACA,SAAA,CAEA,iBrBoyDN,CqBhyDI,oCAIE,kBAAA,CAHA,mBAAA,CACA,kBAAA,CACA,SAAA,CAGA,QAAA,CADA,iBrBmyDN,CqB9xDI,0DACE,kBrBgyDN,CqBjyDI,0DACE,iBrBgyDN,CqB5xDI,iDACE,uBAAA,CAEA,YrB6xDN,CqBxxDE,4BACE,YrB0xDJ,CqBnxDA,YAGE,kBAAA,CAFA,YAAA,CAIA,eAAA,CAHA,SAAA,CAIA,eAAA,CAFA,UrBwxDF,CqBnxDE,yBACE,WrBqxDJ,CqB9wDA,kBACE,YrBixDF,CKzsDI,0CgBzEJ,kBAKI,wBrBixDF,CACF,CqB9wDE,qCACE,WrBgxDJ,CKpuDI,sCgB7CF,+CAKI,kBrBgxDJ,CqBrxDA,+CAKI,mBrBgxDJ,CACF,CKttDI,0CgBrDJ,6BAMI,SAAA,CAFA,eAAA,CACA,UrB6wDF,CqB1wDE,qDACE,gBrB4wDJ,CqBzwDE,gDACE,SrB2wDJ,CqBxwDE,4CACE,iBAAA,CAAA,kBrB0wDJ,CqBvwDE,2CAEE,WAAA,CADA,crB0wDJ,CqBtwDE,2CACE,mBAAA,CACA,cAAA,CACA,SAAA,CACA,oBAAA,CAAA,iBrBwwDJ,CqBrwDE,2CACE,SrBuwDJ,CqBpwDE,qCAEE,WAAA,CACA,eAAA,CAFA,erBwwDJ,CACF,CsBl7DA,MACE,qBAAA,CACA,yBtBq7DF,CsB/6DA,aAME,qCAAA,CADA,cAAA,CAEA,0FACE,CAPF,cAAA,CACA,KAAA,CAaA,mDAAA,CACA,qBAAA,CAJA,wFACE,CATF,UAAA,CADA,StBy7DF,CuBp8DA,MACE,mfvBu8DF,CuBj8DA,WACE,iBvBo8DF,CKtyDI,mCkB/JJ,WAKI,evBo8DF,CACF,CuBj8DE,kBACE,YvBm8DJ,CuB/7DE,oBAEE,SAAA,CADA,SvBk8DJ,CK/xDI,0CkBpKF,8BAOI,YvB08DJ,CuBj9DA,8BAOI,avB08DJ,CuBj9DA,oBAaI,2CAAA,CACA,kBAAA,CAJA,WAAA,CACA,eAAA,CACA,mBAAA,CANA,iBAAA,CAEA,SAAA,CAUA,uBAAA,CAHA,4CACE,CAPF,UvBw8DJ,CuB57DI,+DACE,SAAA,CACA,oCvB87DN,CACF,CKr0DI,mCkBjJF,8BAgCI,MvBi8DJ,CuBj+DA,8BAgCI,OvBi8DJ,CuBj+DA,oBAqCI,0BAAA,CADA,cAAA,CADA,QAAA,CAJA,cAAA,CAEA,KAAA,CAKA,sDACE,CALF,OvB+7DJ,CuBr7DI,+DAME,YAAA,CACA,SAAA,CACA,4CACE,CARF,UvB07DN,CACF,CKp0DI,0CkBxGA,+DAII,mBvB46DN,CACF,CKl3DM,+DkB/DF,+DASI,mBvB46DN,CACF,CKv3DM,+DkB/DF,+DAcI,mBvB46DN,CACF,CuBv6DE,kBAEE,kCAAA,CAAA,0BvBw6DJ,CKt1DI,0CkBpFF,4BAOI,MvBg7DJ,CuBv7DA,4BAOI,OvBg7DJ,CuBv7DA,kBAWI,QAAA,CAEA,SAAA,CADA,eAAA,CANA,cAAA,CAEA,KAAA,CAWA,wBAAA,CALA,qGACE,CALF,OAAA,CADA,SvB86DJ,CuBj6DI,4BACE,yBvBm6DN,CuB/5DI,6DAEE,WAAA,CACA,SAAA,CAMA,uBAAA,CALA,sGACE,CAJF,UvBq6DN,CACF,CKj4DI,mCkBjEF,4BA2CI,WvB+5DJ,CuB18DA,4BA2CI,UvB+5DJ,CuB18DA,kBA6CI,eAAA,CAHA,iBAAA,CAIA,8CAAA,CAFA,avB85DJ,CACF,CKh6DM,+DkBOF,6DAII,avBy5DN,CACF,CK/4DI,sCkBfA,6DASI,avBy5DN,CACF,CuBp5DE,iBAIE,2CAAA,CACA,0BAAA,CAFA,aAAA,CAFA,iBAAA,CAKA,2CACE,CALF,SvB05DJ,CK55DI,mCkBAF,iBAaI,0BAAA,CACA,mBAAA,CAFA,avBs5DJ,CuBj5DI,uBACE,0BvBm5DN,CACF,CuB/4DI,4DAEE,2CAAA,CACA,6BAAA,CACA,8BAAA,CAHA,gCvBo5DN,CuB54DE,4BAKE,mBAAA,CAAA,oBvBi5DJ,CuBt5DE,4BAKE,mBAAA,CAAA,oBvBi5DJ,CuBt5DE,kBAQE,gBAAA,CAFA,eAAA,CAFA,WAAA,CAHA,iBAAA,CAMA,sBAAA,CAJA,UAAA,CADA,SvBo5DJ,CuB34DI,+BACE,qBvB64DN,CuBz4DI,kEAEE,uCvB04DN,CuBt4DI,6BACE,YvBw4DN,CK56DI,0CkBaF,kBA8BI,eAAA,CADA,aAAA,CADA,UvBy4DJ,CACF,CKt8DI,mCkBgCF,4BAmCI,mBvBy4DJ,CuB56DA,4BAmCI,oBvBy4DJ,CuB56DA,kBAqCI,aAAA,CADA,evBw4DJ,CuBp4DI,+BACE,uCvBs4DN,CuBl4DI,mCACE,gCvBo4DN,CuBh4DI,6DACE,kBvBk4DN,CuB/3DM,8EACE,uCvBi4DR,CuB73DM,0EACE,WvB+3DR,CACF,CuBz3DE,iBAIE,cAAA,CAHA,oBAAA,CAEA,aAAA,CAEA,kCACE,CAJF,YvB83DJ,CuBt3DI,uBACE,UvBw3DN,CuBp3DI,yCAEE,UvBw3DN,CuB13DI,yCAEE,WvBw3DN,CuB13DI,+BACE,iBAAA,CAEA,SAAA,CACA,SvBs3DN,CuBn3DM,6CACE,oBvBq3DR,CK59DI,0CkB+FA,yCAaI,UvBq3DN,CuBl4DE,yCAaI,WvBq3DN,CuBl4DE,+BAcI,SvBo3DN,CuBj3DM,+CACE,YvBm3DR,CACF,CKx/DI,mCkBkHA,+BAwBI,mBvBk3DN,CuB/2DM,8CACE,YvBi3DR,CACF,CuB32DE,8BAEE,WvBg3DJ,CuBl3DE,8BAEE,UvBg3DJ,CuBl3DE,oBAKE,mBAAA,CAJA,iBAAA,CAEA,SAAA,CACA,SvB82DJ,CKp/DI,0CkBkIF,8BASI,WvB82DJ,CuBv3DA,8BASI,UvB82DJ,CuBv3DA,oBAUI,SvB62DJ,CACF,CuB12DI,uCACE,iBvBg3DN,CuBj3DI,uCACE,kBvBg3DN,CuBj3DI,6BAEE,uCAAA,CACA,SAAA,CAIA,oBAAA,CAHA,+DvB62DN,CuBv2DM,iDAEE,uCAAA,CADA,YvB02DR,CuBr2DM,gGAGE,SAAA,CADA,mBAAA,CAEA,kBvBs2DR,CuBn2DQ,sGACE,UvBq2DV,CuB91DE,8BAOE,mBAAA,CAAA,oBvBq2DJ,CuB52DE,8BAOE,mBAAA,CAAA,oBvBq2DJ,CuB52DE,oBAIE,kBAAA,CAKA,yCAAA,CANA,YAAA,CAKA,eAAA,CAFA,WAAA,CAKA,SAAA,CAVA,iBAAA,CACA,KAAA,CAUA,uBAAA,CAFA,kBAAA,CALA,UvBu2DJ,CK9iEI,mCkBkMF,8BAgBI,mBvBi2DJ,CuBj3DA,8BAgBI,oBvBi2DJ,CuBj3DA,oBAiBI,evBg2DJ,CACF,CuB71DI,+DACE,SAAA,CACA,0BvB+1DN,CuB11DE,6BAKE,+BvB61DJ,CuBl2DE,0DAME,gCvB41DJ,CuBl2DE,6BAME,+BvB41DJ,CuBl2DE,mBAIE,eAAA,CAHA,iBAAA,CAEA,UAAA,CADA,SvBg2DJ,CK7iEI,0CkB2MF,mBAWI,QAAA,CADA,UvB61DJ,CACF,CKtkEI,mCkB8NF,mBAiBI,SAAA,CADA,UAAA,CAEA,sBvB41DJ,CuBz1DI,8DACE,8BAAA,CACA,SvB21DN,CACF,CuBt1DE,uBASE,kCAAA,CAAA,0BAAA,CAFA,2CAAA,CANA,WAAA,CACA,eAAA,CAIA,kBvBu1DJ,CuBj1DI,iEAZF,uBAaI,uBvBo1DJ,CACF,CKnnEM,+DkBiRJ,uBAkBI,avBo1DJ,CACF,CKlmEI,sCkB2PF,uBAuBI,avBo1DJ,CACF,CKvmEI,mCkB2PF,uBA4BI,YAAA,CACA,yDAAA,CACA,oBvBo1DJ,CuBj1DI,kEACE,evBm1DN,CuB/0DI,6BACE,+CvBi1DN,CuB70DI,0CAEE,YAAA,CADA,WvBg1DN,CuB30DI,gDACE,oDvB60DN,CuB10DM,sDACE,0CvB40DR,CACF,CuBr0DA,kBACE,gCAAA,CACA,qBvBw0DF,CuBr0DE,wBAME,qDAAA,CAFA,uCAAA,CAFA,gBAAA,CACA,kBAAA,CAFA,eAAA,CAIA,uBvBw0DJ,CK3oEI,mCkB8TF,kCAUI,mBvBu0DJ,CuBj1DA,kCAUI,oBvBu0DJ,CACF,CuBn0DE,wBAGE,eAAA,CADA,QAAA,CADA,SAAA,CAIA,wBAAA,CAAA,gBvBo0DJ,CuBh0DE,wBACE,yDvBk0DJ,CuB/zDI,oCACE,evBi0DN,CuB5zDE,wBACE,aAAA,CAEA,YAAA,CADA,uBAAA,CAEA,gCvB8zDJ,CuB3zDI,4DACE,uDvB6zDN,CuBzzDI,gDACE,mBvB2zDN,CuBtzDE,gCAKE,cAAA,CADA,aAAA,CAGA,YAAA,CANA,eAAA,CAKA,uBAAA,CAJA,KAAA,CACA,SvB4zDJ,CuBrzDI,wCACE,YvBuzDN,CuBlzDI,wDACE,YvBozDN,CuBhzDI,oCAGE,+BAAA,CADA,gBAAA,CADA,mBAAA,CAGA,2CvBkzDN,CK7rEI,mCkBuYA,8CAUI,mBvBgzDN,CuB1zDE,8CAUI,oBvBgzDN,CACF,CuB5yDI,oFAEE,uDAAA,CADA,+BvB+yDN,CuBzyDE,sCACE,2CvB2yDJ,CuBtyDE,2BAGE,eAAA,CADA,eAAA,CADA,iBvB0yDJ,CK9sEI,mCkBmaF,qCAOI,mBvBwyDJ,CuB/yDA,qCAOI,oBvBwyDJ,CACF,CuBpyDE,kCAEE,MvB0yDJ,CuB5yDE,kCAEE,OvB0yDJ,CuB5yDE,wBAME,uCAAA,CAFA,aAAA,CACA,YAAA,CAJA,iBAAA,CAEA,YvByyDJ,CKxsEI,0CkB4ZF,wBAUI,YvBsyDJ,CACF,CuBnyDI,8BAKE,6BAAA,CADA,UAAA,CAHA,oBAAA,CAEA,WAAA,CAGA,+CAAA,CAAA,uCAAA,CAEA,4BAAA,CAAA,oBAAA,CADA,6BAAA,CAAA,qBAAA,CAEA,yBAAA,CAAA,iBAAA,CAPA,UvB4yDN,CuBlyDM,wCACE,oBvBoyDR,CuB9xDE,8BAGE,uCAAA,CAFA,gBAAA,CACA,evBiyDJ,CuB7xDI,iCAKE,gCAAA,CAHA,eAAA,CACA,eAAA,CACA,eAAA,CAHA,evBmyDN,CuB5xDM,sCACE,oBvB8xDR,CuBzxDI,iCAKE,gCAAA,CAHA,gBAAA,CACA,eAAA,CACA,eAAA,CAHA,avB+xDN,CuBxxDM,sCACE,oBvB0xDR,CuBpxDE,yBAKE,gCAAA,CAJA,aAAA,CAEA,gBAAA,CACA,iBAAA,CAFA,avByxDJ,CuBlxDE,uBAGE,wBAAA,CAFA,+BAAA,CACA,yBvBqxDJ,CwBz7EA,WACE,iBAAA,CACA,SxB47EF,CwBz7EE,kBAOE,2CAAA,CACA,mBAAA,CACA,8BAAA,CAHA,gCAAA,CAHA,QAAA,CAEA,gBAAA,CADA,YAAA,CAMA,SAAA,CATA,iBAAA,CACA,sBAAA,CAaA,mCAAA,CAJA,oExB47EJ,CwBr7EI,6EACE,gBAAA,CACA,SAAA,CAKA,+BAAA,CAJA,8ExBw7EN,CwBh7EI,wBAWE,+BAAA,CAAA,8CAAA,CAFA,6BAAA,CAAA,8BAAA,CACA,YAAA,CAFA,UAAA,CAHA,QAAA,CAFA,QAAA,CAIA,kBAAA,CADA,iBAAA,CALA,iBAAA,CACA,KAAA,CAEA,OxBy7EN,CwB76EE,iBAOE,mBAAA,CAFA,eAAA,CACA,oBAAA,CAHA,QAAA,CAFA,kBAAA,CAGA,aAAA,CAFA,SxBo7EJ,CwB36EE,iBACE,kBxB66EJ,CwBz6EE,2BAGE,kBAAA,CAAA,oBxB+6EJ,CwBl7EE,2BAGE,mBAAA,CAAA,mBxB+6EJ,CwBl7EE,iBAIE,cAAA,CAHA,aAAA,CAKA,YAAA,CADA,uBAAA,CAEA,2CACE,CANF,UxBg7EJ,CwBt6EI,8CACE,+BxBw6EN,CwBp6EI,uBACE,qDxBs6EN,CyB1/EA,YAIE,qBAAA,CADA,aAAA,CAGA,gBAAA,CALA,eAAA,CACA,UAAA,CAGA,azB8/EF,CyB1/EE,aATF,YAUI,YzB6/EF,CACF,CK/0EI,0CoB3KF,+BAKI,azBkgFJ,CyBvgFA,+BAKI,czBkgFJ,CyBvgFA,qBAWI,2CAAA,CAHA,aAAA,CAEA,WAAA,CANA,cAAA,CAEA,KAAA,CASA,uBAAA,CAHA,iEACE,CAJF,aAAA,CAFA,SzBggFJ,CyBr/EI,mEACE,8BAAA,CACA,6BzBu/EN,CyBp/EM,6EACE,8BzBs/ER,CyBj/EI,6CAEE,QAAA,CAAA,MAAA,CACA,QAAA,CACA,eAAA,CAHA,iBAAA,CACA,OAAA,CAGA,qBAAA,CAHA,KzBs/EN,CACF,CK93EI,sCoBtKJ,YAuDI,QzBi/EF,CyB9+EE,mBACE,WzBg/EJ,CyB5+EE,6CACE,UzB8+EJ,CACF,CyB1+EE,uBACE,YAAA,CACA,OzB4+EJ,CK74EI,mCoBjGF,uBAMI,QzB4+EJ,CyBz+EI,8BACE,WzB2+EN,CyBv+EI,qCACE,azBy+EN,CyBr+EI,+CACE,kBzBu+EN,CACF,CyBl+EE,wBAIE,uBAAA,CAOA,kCAAA,CAAA,0BAAA,CAVA,cAAA,CACA,eAAA,CACA,yDAAA,CAMA,oBzBi+EJ,CyB59EI,2CAEE,YAAA,CADA,WzB+9EN,CyB19EI,mEACE,+CzB49EN,CyBz9EM,qHACE,oDzB29ER,CyBx9EQ,iIACE,0CzB09EV,CyB38EE,wCAGE,wBACE,qBzB28EJ,CyBv8EE,6BACE,kCzBy8EJ,CyB18EE,6BACE,iCzBy8EJ,CACF,CKr6EI,0CoB5BF,YAME,0BAAA,CADA,QAAA,CAEA,SAAA,CANA,cAAA,CACA,KAAA,CAMA,sDACE,CALF,OAAA,CADA,SzB08EF,CyB/7EE,4CAEE,WAAA,CACA,SAAA,CACA,4CACE,CAJF,UzBo8EJ,CACF,C0BjnFA,iBACE,GACE,Q1BmnFF,C0BhnFA,GACE,a1BknFF,CACF,C0B9mFA,gBACE,GACE,SAAA,CACA,0B1BgnFF,C0B7mFA,IACE,S1B+mFF,C0B5mFA,GACE,SAAA,CACA,uB1B8mFF,CACF,C0BtmFA,MACE,2eAAA,CACA,+fAAA,CACA,0lBAAA,CACA,kf1BwmFF,C0BlmFA,WAOE,kCAAA,CAAA,0BAAA,CANA,aAAA,CACA,gBAAA,CACA,eAAA,CAEA,uCAAA,CAGA,uBAAA,CAJA,kB1BwmFF,C0BjmFE,iBACE,U1BmmFJ,C0B/lFE,iBACE,oBAAA,CAEA,aAAA,CACA,qBAAA,CAFA,U1BmmFJ,C0B9lFI,+BACE,iB1BimFN,C0BlmFI,+BACE,kB1BimFN,C0BlmFI,qBAEE,gB1BgmFN,C0B5lFI,kDACE,iB1B+lFN,C0BhmFI,kDACE,kB1B+lFN,C0BhmFI,kDAEE,iB1B8lFN,C0BhmFI,kDAEE,kB1B8lFN,C0BzlFE,iCAGE,iB1B8lFJ,C0BjmFE,iCAGE,kB1B8lFJ,C0BjmFE,uBACE,oBAAA,CACA,6BAAA,CAEA,eAAA,CACA,sBAAA,CACA,qB1B2lFJ,C0BvlFE,kBACE,YAAA,CAMA,gBAAA,CALA,SAAA,CAMA,oBAAA,CAHA,gBAAA,CAIA,WAAA,CAHA,eAAA,CAFA,SAAA,CADA,U1B+lFJ,C0BtlFI,iDACE,4B1BwlFN,C0BnlFE,iBACE,eAAA,CACA,sB1BqlFJ,C0BllFI,gDACE,2B1BolFN,C0BhlFI,kCAIE,kB1BwlFN,C0B5lFI,kCAIE,iB1BwlFN,C0B5lFI,wBAOE,6BAAA,CADA,UAAA,CALA,oBAAA,CAEA,YAAA,CAMA,4BAAA,CAAA,oBAAA,CADA,6BAAA,CAAA,qBAAA,CAEA,yBAAA,CAAA,iBAAA,CALA,uBAAA,CAHA,W1B0lFN,C0B9kFI,iCACE,a1BglFN,C0B5kFI,iCACE,gDAAA,CAAA,wC1B8kFN,C0B1kFI,+BACE,8CAAA,CAAA,sC1B4kFN,C0BxkFI,+BACE,8CAAA,CAAA,sC1B0kFN,C0BtkFI,sCACE,qDAAA,CAAA,6C1BwkFN,C0BlkFA,gBACE,Y1BqkFF,C0BlkFE,gCAIE,kB1BskFJ,C0B1kFE,gCAIE,iB1BskFJ,C0B1kFE,sBAGE,kBAAA,CAGA,uCAAA,CALA,mBAAA,CAIA,gBAAA,CAHA,S1BwkFJ,C0BjkFI,+BACE,aAAA,CACA,oB1BmkFN,C0B/jFI,2CACE,U1BkkFN,C0BnkFI,2CACE,W1BkkFN,C0BnkFI,iCAEE,kB1BikFN,C0B7jFI,0BACE,W1B+jFN,C2BtvFA,MACE,iSAAA,CACA,4UAAA,CACA,+NAAA,CACA,gZ3ByvFF,C2BhvFE,iBAME,kDAAA,CADA,UAAA,CAJA,oBAAA,CAEA,cAAA,CAIA,mCAAA,CAAA,2BAAA,CAEA,4BAAA,CAAA,oBAAA,CADA,6BAAA,CAAA,qBAAA,CAEA,yBAAA,CAAA,iBAAA,CANA,0BAAA,CAFA,a3B2vFJ,C2B/uFE,uBACE,6B3BivFJ,C2B7uFE,sBACE,wCAAA,CAAA,gC3B+uFJ,C2B3uFE,6BACE,+CAAA,CAAA,uC3B6uFJ,C2BzuFE,4BACE,8CAAA,CAAA,sC3B2uFJ,C4BtxFA,SASE,2CAAA,CADA,gCAAA,CAJA,aAAA,CAGA,eAAA,CADA,aAAA,CADA,UAAA,CAFA,S5B6xFF,C4BpxFE,aAZF,SAaI,Y5BuxFF,CACF,CK5mFI,0CuBzLJ,SAkBI,Y5BuxFF,CACF,C4BpxFE,iBACE,mB5BsxFJ,C4BlxFE,yBAIE,iB5ByxFJ,C4B7xFE,yBAIE,kB5ByxFJ,C4B7xFE,eAQE,eAAA,CAPA,YAAA,CAMA,eAAA,CAJA,QAAA,CAEA,aAAA,CAHA,SAAA,CAWA,oBAAA,CAPA,kB5BuxFJ,C4B7wFI,kCACE,Y5B+wFN,C4B1wFE,eACE,aAAA,CACA,kBAAA,CAAA,mB5B4wFJ,C4BzwFI,sCACE,aAAA,CACA,S5B2wFN,C4BrwFE,eAOE,kCAAA,CAAA,0BAAA,CANA,YAAA,CAEA,eAAA,CADA,gBAAA,CAMA,UAAA,CAJA,uCAAA,CACA,oBAAA,CAIA,8D5BswFJ,C4BjwFI,0CACE,aAAA,CACA,S5BmwFN,C4B/vFI,6BAEE,kB5BkwFN,C4BpwFI,6BAEE,iB5BkwFN,C4BpwFI,mBAGE,iBAAA,CAFA,Y5BmwFN,C4B5vFM,2CACE,qB5B8vFR,C4B/vFM,2CACE,qB5BiwFR,C4BlwFM,2CACE,qB5BowFR,C4BrwFM,2CACE,qB5BuwFR,C4BxwFM,2CACE,oB5B0wFR,C4B3wFM,2CACE,qB5B6wFR,C4B9wFM,2CACE,qB5BgxFR,C4BjxFM,2CACE,qB5BmxFR,C4BpxFM,4CACE,qB5BsxFR,C4BvxFM,4CACE,oB5ByxFR,C4B1xFM,4CACE,qB5B4xFR,C4B7xFM,4CACE,qB5B+xFR,C4BhyFM,4CACE,qB5BkyFR,C4BnyFM,4CACE,qB5BqyFR,C4BtyFM,4CACE,oB5BwyFR,C4BlyFI,gCACE,SAAA,CAIA,yBAAA,CAHA,wC5BqyFN,C6Bx4FA,MACE,mS7B24FF,C6Bl4FE,mCACE,mBAAA,CACA,cAAA,CACA,QAAA,CAEA,mBAAA,CADA,kB7Bs4FJ,C6Bj4FE,oBAGE,kBAAA,CAOA,+CAAA,CACA,oBAAA,CAVA,mBAAA,CAIA,gBAAA,CACA,0BAAA,CACA,eAAA,CALA,QAAA,CAOA,qBAAA,CADA,eAAA,CAJA,wB7B04FJ,C6Bh4FI,0BAGE,uCAAA,CAFA,aAAA,CACA,YAAA,CAEA,6C7Bk4FN,C6B73FM,gEAEE,0CAAA,CADA,+B7Bg4FR,C6B13FI,yBACE,uB7B43FN,C6Bp3FI,gCAME,oDAAA,CADA,UAAA,CAJA,oBAAA,CAEA,YAAA,CAIA,qCAAA,CAAA,6BAAA,CAEA,4BAAA,CAAA,oBAAA,CADA,6BAAA,CAAA,qBAAA,CAEA,yBAAA,CAAA,iBAAA,CACA,iCAAA,CAPA,0BAAA,CAFA,W7B+3FN,C6Bl3FI,wFACE,0C7Bo3FN,C8B97FA,iBACE,GACE,oB9Bi8FF,C8B97FA,IACE,kB9Bg8FF,C8B77FA,GACE,oB9B+7FF,CACF,C8Bv7FA,MACE,yNAAA,CACA,sP9B07FF,C8Bn7FA,YA6BE,kCAAA,CAAA,0BAAA,CAVA,2CAAA,CACA,mBAAA,CACA,8BAAA,CAHA,gCAAA,CADA,sCAAA,CAdA,+IACE,CAYF,8BAAA,CAMA,SAAA,CArBA,iBAAA,CACA,uBAAA,CAyBA,4BAAA,CAJA,uDACE,CATF,6BAAA,CADA,S9Bu7FF,C8Br6FE,oBAEE,SAAA,CAKA,uBAAA,CAJA,2EACE,CAHF,S9B06FJ,C8Bh6FE,oBAEE,eAAA,CACA,wBAAA,CAAA,gBAAA,CAFA,U9Bo6FJ,C8B/5FI,6CACE,qC9Bi6FN,C8B75FI,uCAEE,eAAA,CADA,mB9Bg6FN,C8B15FI,6BACE,Y9B45FN,C8Bv5FE,8CACE,sC9By5FJ,C8Br5FE,mBAEE,gBAAA,CADA,a9Bw5FJ,C8Bp5FI,2CACE,Y9Bs5FN,C8Bl5FI,0CACE,e9Bo5FN,C8B54FA,eACE,iBAAA,CACA,eAAA,CAIA,YAAA,CAHA,kBAAA,CAEA,0BAAA,CADA,kB9Bi5FF,C8B54FE,yBACE,a9B84FJ,C8B14FE,oBACE,sCAAA,CACA,iB9B44FJ,C8Bx4FE,6BACE,oBAAA,CAGA,gB9Bw4FJ,C8Bp4FE,sBAYE,mBAAA,CANA,cAAA,CAHA,oBAAA,CACA,gBAAA,CAAA,iBAAA,CAIA,YAAA,CAGA,eAAA,CAVA,iBAAA,CAMA,wBAAA,CAAA,gBAAA,CAFA,uBAAA,CAHA,S9B84FJ,C8Bh4FI,qCACE,uB9Bk4FN,C8B93FI,cArBF,sBAsBI,W9Bi4FJ,C8B93FI,wCACE,2B9Bg4FN,C8B53FI,6BAOE,qCAAA,CACA,+CAAA,CAAA,uC9Bi4FN,C8Bv3FI,yDAZE,UAAA,CADA,YAAA,CAKA,4BAAA,CAAA,oBAAA,CADA,6BAAA,CAAA,qBAAA,CAEA,yBAAA,CAAA,iBAAA,CAVA,iBAAA,CACA,SAAA,CAEA,WAAA,CADA,U9Bq5FN,C8Bt4FI,4BAOE,oDAAA,CACA,4CAAA,CAAA,oCAAA,CAQA,uBAAA,CAJA,+C9B03FN,C8Bn3FM,gDACE,uB9Bq3FR,C8Bj3FM,mFACE,0C9Bm3FR,CACF,C8B92FI,0CAGE,2BAAA,CADA,uBAAA,CADA,S9Bk3FN,C8B52FI,8CACE,oB9B82FN,C8B32FM,aAJF,8CASI,8CAAA,CACA,iBAAA,CAHA,gCAAA,CADA,eAAA,CADA,cAAA,CAGA,kB9Bg3FN,C8B32FM,oDACE,mC9B62FR,CACF,C8Bj2FE,gCAEE,iBAAA,CADA,e9Bq2FJ,C8Bj2FI,mCACE,iB9Bm2FN,C8Bh2FM,oDAEE,a9B+2FR,C8Bj3FM,oDAEE,c9B+2FR,C8Bj3FM,0CAcE,8CAAA,CACA,iBAAA,CALA,gCAAA,CAEA,oBAAA,CACA,qBAAA,CANA,iBAAA,CACA,eAAA,CAHA,UAAA,CAIA,gBAAA,CALA,aAAA,CAEA,cAAA,CALA,iBAAA,CAUA,iBAAA,CARA,S9B82FR,C+B9nGA,MACE,wBAAA,CACA,wB/BioGF,C+B3nGA,aA+BE,kCAAA,CAAA,0BAAA,CAjBA,gCAAA,CADA,sCAAA,CAGA,SAAA,CADA,mBAAA,CAdA,iBAAA,CAGA,wDACE,CAgBF,4BAAA,CAGA,uEACE,CARF,uDACE,CANF,UAAA,CADA,S/B+nGF,C+BxmGE,oBAuBE,8CAAA,CAAA,+CAAA,CADA,UAAA,CADA,aAAA,CAfA,gJACE,CANF,iBAAA,CAmBA,S/B4lGJ,C+BrlGE,yBAGE,kEAAA,CAFA,gDAAA,CACA,6C/BwlGJ,C+BnlGE,4BAGE,qEAAA,CADA,8CAAA,CADA,6C/BulGJ,C+BjlGE,qBAEE,SAAA,CAKA,uBAAA,CAJA,wEACE,CAHF,S/BslGJ,C+B5kGE,oBAqBE,uBAAA,CAEA,2CAAA,CACA,mBAAA,CACA,8BAAA,CAnBA,0FACE,CAaF,eAAA,CADA,8BAAA,CAlBA,iBAAA,CAqBA,oB/BikGJ,C+B3jGI,uCAEE,YAAA,CADA,W/B8jGN,C+BzjGI,6CACE,oD/B2jGN,C+BxjGM,mDACE,0C/B0jGR,C+BljGI,mCAwBE,eAAA,CACA,eAAA,CAxBA,oIACE,CAgBF,sCACE,CAIF,mBAAA,CAKA,wBAAA,CAAA,gBAAA,CAbA,sBAAA,CAAA,iB/B4iGN,C+B3hGI,4CACE,Y/B6hGN,C+BzhGI,2CACE,e/B2hGN,CgC9sGA,kBAME,ehC0tGF,CgChuGA,kBAME,gBhC0tGF,CgChuGA,QAUE,2CAAA,CACA,oBAAA,CAEA,8BAAA,CALA,uCAAA,CACA,cAAA,CALA,aAAA,CAGA,eAAA,CAKA,YAAA,CAPA,mBAAA,CAJA,cAAA,CACA,UAAA,CAiBA,yBAAA,CALA,mGACE,CAZF,ShC6tGF,CgC1sGE,aAtBF,QAuBI,YhC6sGF,CACF,CgC1sGE,kBACE,wBhC4sGJ,CgCxsGE,gBAEE,SAAA,CADA,mBAAA,CAGA,+BAAA,CADA,uBhC2sGJ,CgCvsGI,0BACE,8BhCysGN,CgCpsGE,4BAEE,0CAAA,CADA,+BhCusGJ,CgClsGE,YACE,oBAAA,CACA,oBhCosGJ,CiCzvGA,oBACE,GACE,mBjC4vGF,CACF,CiCpvGA,MACE,wfjCsvGF,CiChvGA,YACE,aAAA,CAEA,eAAA,CADA,ajCovGF,CiChvGE,+BAOE,kBAAA,CAAA,kBjCivGJ,CiCxvGE,+BAOE,iBAAA,CAAA,mBjCivGJ,CiCxvGE,qBAQE,aAAA,CACA,cAAA,CACA,YAAA,CATA,iBAAA,CAKA,UjCkvGJ,CiC3uGI,qCAIE,iBjCmvGN,CiCvvGI,qCAIE,kBjCmvGN,CiCvvGI,2BAME,6BAAA,CADA,UAAA,CAJA,oBAAA,CAEA,YAAA,CAIA,yCAAA,CAAA,iCAAA,CAEA,4BAAA,CAAA,oBAAA,CADA,6BAAA,CAAA,qBAAA,CAEA,yBAAA,CAAA,iBAAA,CARA,WjCqvGN,CiCxuGE,mBACE,iBAAA,CACA,UjC0uGJ,CiCtuGE,kBAWE,2CAAA,CACA,mBAAA,CACA,8BAAA,CALA,gCAAA,CACA,oBAAA,CAHA,kBAAA,CAFA,YAAA,CAUA,SAAA,CAPA,aAAA,CAFA,SAAA,CAJA,iBAAA,CASA,4BAAA,CARA,UAAA,CAaA,+CACE,CAbF,SjCovGJ,CiCnuGI,+EACE,gBAAA,CACA,SAAA,CACA,sCjCquGN,CiC/tGI,qCAEE,oCACE,gCjCguGN,CiC5tGI,2CACE,cjC8tGN,CACF,CiCztGE,kBACE,kBjC2tGJ,CiCvtGE,4BAGE,kBAAA,CAAA,oBjC8tGJ,CiCjuGE,4BAGE,mBAAA,CAAA,mBjC8tGJ,CiCjuGE,kBAKE,cAAA,CAJA,aAAA,CAMA,YAAA,CADA,uBAAA,CAEA,2CACE,CALF,kBAAA,CAFA,UjC+tGJ,CiCptGI,gDACE,+BjCstGN,CiCltGI,wBACE,qDjCotGN,CkC1zGA,MAEI,6VAAA,CAAA,uWAAA,CAAA,qPAAA,CAAA,2xBAAA,CAAA,qMAAA,CAAA,+aAAA,CAAA,2LAAA,CAAA,yPAAA,CAAA,2TAAA,CAAA,oaAAA,CAAA,2SAAA,CAAA,2LlCm1GJ,CkCv0GE,4CAME,8CAAA,CACA,4BAAA,CACA,mBAAA,CACA,8BAAA,CAJA,mCAAA,CAJA,iBAAA,CAGA,gBAAA,CADA,iBAAA,CADA,eAAA,CASA,uBAAA,CADA,2BlC20GJ,CkCv0GI,aAdF,4CAeI,elC00GJ,CACF,CkCv0GI,sEACE,gClCy0GN,CkCp0GI,gDACE,qBlCs0GN,CkCl0GI,gIAEE,iBAAA,CADA,clCq0GN,CkCh0GI,4FACE,iBlCk0GN,CkC9zGI,kFACE,elCg0GN,CkC5zGI,0FACE,YlC8zGN,CkC1zGI,8EACE,mBlC4zGN,CkCvzGE,sEAGE,iBAAA,CAAA,mBlCi0GJ,CkCp0GE,sEAGE,kBAAA,CAAA,kBlCi0GJ,CkCp0GE,sEASE,uBlC2zGJ,CkCp0GE,sEASE,wBlC2zGJ,CkCp0GE,sEAUE,4BlC0zGJ,CkCp0GE,4IAWE,6BlCyzGJ,CkCp0GE,sEAWE,4BlCyzGJ,CkCp0GE,kDAOE,0BAAA,CACA,WAAA,CAFA,eAAA,CADA,eAAA,CAHA,oBAAA,CAAA,iBAAA,CADA,iBlCm0GJ,CkCtzGI,kFACE,elCwzGN,CkCpzGI,oFAEE,UlC+zGN,CkCj0GI,oFAEE,WlC+zGN,CkCj0GI,gEAOE,wBhBiIU,CgBlIV,UAAA,CADA,WAAA,CAGA,kDAAA,CAAA,0CAAA,CAEA,4BAAA,CAAA,oBAAA,CADA,6BAAA,CAAA,qBAAA,CAEA,yBAAA,CAAA,iBAAA,CAVA,iBAAA,CAEA,UAAA,CACA,UlC6zGN,CkClzGI,4DACE,4DlCozGN,CkCtyGE,sDACE,oBlCyyGJ,CkCtyGI,gFACE,gClCwyGN,CkCnyGE,8DACE,0BlCsyGJ,CkCnyGI,4EACE,wBAlBG,CAmBH,kDAAA,CAAA,0ClCqyGN,CkCjyGI,0EACE,alCmyGN,CkCxzGE,8DACE,oBlC2zGJ,CkCxzGI,wFACE,gClC0zGN,CkCrzGE,sEACE,0BlCwzGJ,CkCrzGI,oFACE,wBAlBG,CAmBH,sDAAA,CAAA,8ClCuzGN,CkCnzGI,kFACE,alCqzGN,CkC10GE,sDACE,oBlC60GJ,CkC10GI,gFACE,gClC40GN,CkCv0GE,8DACE,0BlC00GJ,CkCv0GI,4EACE,wBAlBG,CAmBH,kDAAA,CAAA,0ClCy0GN,CkCr0GI,0EACE,alCu0GN,CkC51GE,oDACE,oBlC+1GJ,CkC51GI,8EACE,gClC81GN,CkCz1GE,4DACE,0BlC41GJ,CkCz1GI,0EACE,wBAlBG,CAmBH,iDAAA,CAAA,yClC21GN,CkCv1GI,wEACE,alCy1GN,CkC92GE,4DACE,oBlCi3GJ,CkC92GI,sFACE,gClCg3GN,CkC32GE,oEACE,0BlC82GJ,CkC32GI,kFACE,wBAlBG,CAmBH,qDAAA,CAAA,6ClC62GN,CkCz2GI,gFACE,alC22GN,CkCh4GE,8DACE,oBlCm4GJ,CkCh4GI,wFACE,gClCk4GN,CkC73GE,sEACE,0BlCg4GJ,CkC73GI,oFACE,wBAlBG,CAmBH,sDAAA,CAAA,8ClC+3GN,CkC33GI,kFACE,alC63GN,CkCl5GE,4DACE,oBlCq5GJ,CkCl5GI,sFACE,gClCo5GN,CkC/4GE,oEACE,0BlCk5GJ,CkC/4GI,kFACE,wBAlBG,CAmBH,qDAAA,CAAA,6ClCi5GN,CkC74GI,gFACE,alC+4GN,CkCp6GE,4DACE,oBlCu6GJ,CkCp6GI,sFACE,gClCs6GN,CkCj6GE,oEACE,0BlCo6GJ,CkCj6GI,kFACE,wBAlBG,CAmBH,qDAAA,CAAA,6ClCm6GN,CkC/5GI,gFACE,alCi6GN,CkCt7GE,0DACE,oBlCy7GJ,CkCt7GI,oFACE,gClCw7GN,CkCn7GE,kEACE,0BlCs7GJ,CkCn7GI,gFACE,wBAlBG,CAmBH,oDAAA,CAAA,4ClCq7GN,CkCj7GI,8EACE,alCm7GN,CkCx8GE,oDACE,oBlC28GJ,CkCx8GI,8EACE,gClC08GN,CkCr8GE,4DACE,0BlCw8GJ,CkCr8GI,0EACE,wBAlBG,CAmBH,iDAAA,CAAA,yClCu8GN,CkCn8GI,wEACE,alCq8GN,CkC19GE,4DACE,oBlC69GJ,CkC19GI,sFACE,gClC49GN,CkCv9GE,oEACE,0BlC09GJ,CkCv9GI,kFACE,wBAlBG,CAmBH,qDAAA,CAAA,6ClCy9GN,CkCr9GI,gFACE,alCu9GN,CkC5+GE,wDACE,oBlC++GJ,CkC5+GI,kFACE,gClC8+GN,CkCz+GE,gEACE,0BlC4+GJ,CkCz+GI,8EACE,wBAlBG,CAmBH,mDAAA,CAAA,2ClC2+GN,CkCv+GI,4EACE,alCy+GN,CmC7oHA,MACE,qMnCgpHF,CmCvoHE,sBAEE,uCAAA,CADA,gBnC2oHJ,CmCvoHI,mCACE,anCyoHN,CmC1oHI,mCACE,cnCyoHN,CmCroHM,4BACE,sBnCuoHR,CmCpoHQ,mCACE,gCnCsoHV,CmCloHQ,2DACE,SAAA,CAEA,uBAAA,CADA,enCqoHV,CmChoHQ,yGACE,SAAA,CACA,uBnCkoHV,CmC9nHQ,yCACE,YnCgoHV,CmCznHE,0BACE,eAAA,CACA,enC2nHJ,CmCxnHI,+BACE,oBnC0nHN,CmCrnHE,gDACE,YnCunHJ,CmCnnHE,8BAIE,+BAAA,CAHA,oBAAA,CAEA,WAAA,CAGA,SAAA,CAKA,4BAAA,CAJA,4DACE,CAHF,0BnCunHJ,CmC9mHI,aAdF,8BAeI,+BAAA,CACA,SAAA,CACA,uBnCinHJ,CACF,CmC9mHI,wCACE,6BnCgnHN,CmC5mHI,oCACE,+BnC8mHN,CmC1mHI,qCAKE,6BAAA,CADA,UAAA,CAHA,oBAAA,CAEA,YAAA,CAGA,2CAAA,CAAA,mCAAA,CAEA,4BAAA,CAAA,oBAAA,CADA,6BAAA,CAAA,qBAAA,CAEA,yBAAA,CAAA,iBAAA,CAPA,WnCmnHN,CmCtmHQ,mDACE,oBnCwmHV,CoCttHE,kCAEE,iBpC4tHJ,CoC9tHE,kCAEE,kBpC4tHJ,CoC9tHE,wBAGE,yCAAA,CAFA,oBAAA,CAGA,SAAA,CACA,mCpCytHJ,CoCptHI,aAVF,wBAWI,YpCutHJ,CACF,CoCntHE,6FAEE,SAAA,CACA,mCpCqtHJ,CoC/sHE,4FAEE,+BpCitHJ,CoC7sHE,oBACE,yBAAA,CACA,uBAAA,CAGA,yEpC6sHJ,CK9kHI,sC+BrHE,qDACE,uBpCssHN,CACF,CoCjsHE,kEACE,yBpCmsHJ,CoC/rHE,sBACE,0BpCisHJ,CqC5vHE,2BACE,arC+vHJ,CK1kHI,0CgCtLF,2BAKI,erC+vHJ,CqC5vHI,6BACE,iBrC8vHN,CACF,CqC1vHI,6BAEE,0BAAA,CAAA,2BAAA,CADA,eAAA,CAEA,iBrC4vHN,CqCzvHM,2CACE,kBrC2vHR,CqCrvHI,6CACE,QrCuvHN,CsCnxHE,uBACE,4CtCuxHJ,CsClxHE,8CAJE,kCAAA,CAAA,0BtC0xHJ,CsCtxHE,uBACE,4CtCqxHJ,CsChxHE,4BAEE,kCAAA,CAAA,0BAAA,CADA,qCtCmxHJ,CsC/wHI,mCACE,atCixHN,CsC7wHI,kCACE,atC+wHN,CsC1wHE,0BAKE,eAAA,CAJA,aAAA,CAEA,YAAA,CACA,aAAA,CAFA,kBAAA,CAAA,mBtC+wHJ,CsCzwHI,uCACE,etC2wHN,CsCvwHI,sCACE,kBtCywHN,CuCtzHA,MACE,oLvCyzHF,CuChzHE,oBAGE,iBAAA,CAEA,gBAAA,CADA,avCkzHJ,CuC9yHI,wCACE,uBvCgzHN,CuC5yHI,gCAEE,eAAA,CADA,gBvC+yHN,CuCxyHM,wCACE,mBvC0yHR,CuCpyHE,8BAKE,oBvCwyHJ,CuC7yHE,8BAKE,mBvCwyHJ,CuC7yHE,8BAUE,4BvCmyHJ,CuC7yHE,4DAWE,6BvCkyHJ,CuC7yHE,8BAWE,4BvCkyHJ,CuC7yHE,oBASE,cAAA,CANA,aAAA,CACA,eAAA,CAIA,evCqyHJ,CuC/xHI,kCACE,uCAAA,CACA,oBvCiyHN,CuC7xHI,wCAEE,uCAAA,CADA,YvCgyHN,CuC3xHI,oCAEE,WvCwyHN,CuC1yHI,oCAEE,UvCwyHN,CuC1yHI,0BAOE,6BAAA,CADA,UAAA,CADA,WAAA,CAGA,yCAAA,CAAA,iCAAA,CAEA,4BAAA,CAAA,oBAAA,CADA,6BAAA,CAAA,qBAAA,CAEA,yBAAA,CAAA,iBAAA,CAVA,iBAAA,CAEA,UAAA,CAUA,sBAAA,CADA,yBAAA,CARA,UvCsyHN,CuC1xHM,oCACE,wBvC4xHR,CuCvxHI,4BACE,YvCyxHN,CuCpxHI,4CACE,YvCsxHN,CwCh3HE,+DACE,sBAAA,CAEA,mBAAA,CACA,0BAAA,CACA,uBxCk3HJ,CwC/2HI,2EAGE,iBAAA,CADA,eAAA,CADA,yBxCm3HN,CwC52HE,mEACE,0BxC82HJ,CwC12HE,oBACE,qBxC42HJ,CwCx2HE,gBACE,oBxC02HJ,CwCt2HE,gBACE,qBxCw2HJ,CwCp2HE,iBACE,kBxCs2HJ,CwCl2HE,kBACE,kBxCo2HJ,CyC74HE,6BACE,sCzCg5HJ,CyC74HE,cACE,yCzC+4HJ,CyCn4HE,sIACE,oCzCq4HJ,CyC73HE,2EACE,qCzC+3HJ,CyCr3HE,wGACE,oCzCu3HJ,CyC92HE,yFACE,qCzCg3HJ,CyC32HE,6BACE,kCzC62HJ,CyCv2HE,6CACE,sCzCy2HJ,CyCl2HE,4DACE,sCzCo2HJ,CyC71HE,4DACE,qCzC+1HJ,CyCt1HE,yFACE,qCzCw1HJ,CyCh1HE,2EACE,sCzCk1HJ,CyCv0HE,wHACE,qCzCy0HJ,CyCp0HE,8BAGE,mBAAA,CADA,gBAAA,CADA,gBzCw0HJ,CyCn0HE,eACE,4CzCq0HJ,CyCl0HE,eACE,4CzCo0HJ,CyCh0HE,gBAIE,+CAAA,CACA,kDAAA,CAJA,aAAA,CAEA,wBAAA,CADA,wBzCq0HJ,CyC9zHE,yBAOE,wCAAA,CACA,+DAAA,CACA,4BAAA,CACA,6BAAA,CARA,iBAAA,CAGA,eAAA,CACA,eAAA,CAFA,cAAA,CADA,oCAAA,CAFA,iBzCy0HJ,CyC7zHI,6BACE,YzC+zHN,CyC5zHM,kCACE,wBAAA,CACA,yBzC8zHR,CyCxzHE,iCAaE,wCAAA,CACA,+DAAA,CAJA,uCAAA,CACA,0BAAA,CALA,UAAA,CAJA,oBAAA,CAOA,2BAAA,CADA,2BAAA,CADA,2BAAA,CANA,eAAA,CAWA,wBAAA,CAAA,gBAAA,CAPA,SzCi0HJ,CyC/yHE,sBACE,iBAAA,CACA,iBzCizHJ,CyC5yHE,iCAKE,ezC0yHJ,CyCvyHI,sCACE,gBzCyyHN,CyCryHI,gDACE,YzCuyHN,CyC7xHA,gBACE,iBzCgyHF,CyC5xHE,yCACE,aAAA,CACA,SzC8xHJ,CyCzxHE,mBACE,YzC2xHJ,CyCtxHE,oBACE,QzCwxHJ,CyCpxHE,4BACE,WAAA,CACA,SAAA,CACA,ezCsxHJ,CyCnxHI,0CACE,YzCqxHN,CyC/wHE,yBAKE,wCAAA,CAEA,+BAAA,CADA,4BAAA,CAHA,eAAA,CADA,oDAAA,CAEA,wBAAA,CAAA,gBzCoxHJ,CyC7wHE,2BAEE,+DAAA,CADA,2BzCgxHJ,CyC5wHI,+BACE,uCAAA,CACA,gBzC8wHN,CyCzwHE,sBACE,MAAA,CACA,WzC2wHJ,CyCtwHA,aACE,azCywHF,CyC/vHE,4BAEE,aAAA,CADA,YzCmwHJ,CyC/vHI,wDAEE,2BAAA,CADA,wBzCkwHN,CyC5vHE,+BAKE,2CAAA,CAEA,+BAAA,CADA,gCAAA,CADA,sBAAA,CAHA,mBAAA,CACA,gBAAA,CAFA,azCowHJ,CyC3vHI,qCAEE,UAAA,CACA,UAAA,CAFA,azC+vHN,CKt4HI,0CoCsJF,8BACE,iBzCovHF,CyC1uHE,wSAGE,ezCgvHJ,CyC5uHE,sCAEE,mBAAA,CACA,eAAA,CADA,oBAAA,CADA,kBAAA,CAAA,mBzCgvHJ,CACF,C0C7kII,yDAIE,+BAAA,CACA,8BAAA,CAFA,aAAA,CADA,QAAA,CADA,iB1CmlIN,C0C3kII,uBAEE,uCAAA,CADA,c1C8kIN,C0CzhIM,iHAEE,WAlDkB,CAiDlB,kB1CoiIR,C0CriIM,6HAEE,WAlDkB,CAiDlB,kB1CgjIR,C0CjjIM,6HAEE,WAlDkB,CAiDlB,kB1C4jIR,C0C7jIM,oHAEE,WAlDkB,CAiDlB,kB1CwkIR,C0CzkIM,0HAEE,WAlDkB,CAiDlB,kB1ColIR,C0CrlIM,uHAEE,WAlDkB,CAiDlB,kB1CgmIR,C0CjmIM,uHAEE,WAlDkB,CAiDlB,kB1C4mIR,C0C7mIM,6HAEE,WAlDkB,CAiDlB,kB1CwnIR,C0CznIM,yCAEE,WAlDkB,CAiDlB,kB1C4nIR,C0C7nIM,yCAEE,WAlDkB,CAiDlB,kB1CgoIR,C0CjoIM,0CAEE,WAlDkB,CAiDlB,kB1CooIR,C0CroIM,uCAEE,WAlDkB,CAiDlB,kB1CwoIR,C0CzoIM,wCAEE,WAlDkB,CAiDlB,kB1C4oIR,C0C7oIM,sCAEE,WAlDkB,CAiDlB,kB1CgpIR,C0CjpIM,wCAEE,WAlDkB,CAiDlB,kB1CopIR,C0CrpIM,oCAEE,WAlDkB,CAiDlB,kB1CwpIR,C0CzpIM,2CAEE,WAlDkB,CAiDlB,kB1C4pIR,C0C7pIM,qCAEE,WAlDkB,CAiDlB,kB1CgqIR,C0CjqIM,oCAEE,WAlDkB,CAiDlB,kB1CoqIR,C0CrqIM,kCAEE,WAlDkB,CAiDlB,kB1CwqIR,C0CzqIM,qCAEE,WAlDkB,CAiDlB,kB1C4qIR,C0C7qIM,mCAEE,WAlDkB,CAiDlB,kB1CgrIR,C0CjrIM,qCAEE,WAlDkB,CAiDlB,kB1CorIR,C0CrrIM,wCAEE,WAlDkB,CAiDlB,kB1CwrIR,C0CzrIM,sCAEE,WAlDkB,CAiDlB,kB1C4rIR,C0C7rIM,2CAEE,WAlDkB,CAiDlB,kB1CgsIR,C0CrrIM,iCAEE,WAPkB,CAMlB,iB1CwrIR,C0CzrIM,uCAEE,WAPkB,CAMlB,iB1C4rIR,C0C7rIM,mCAEE,WAPkB,CAMlB,iB1CgsIR,C2ClxIA,MACE,2LAAA,CACA,yL3CqxIF,C2C5wIE,wBAKE,mBAAA,CAHA,YAAA,CACA,qBAAA,CACA,YAAA,CAHA,iB3CmxIJ,C2CzwII,8BAGE,QAAA,CACA,SAAA,CAHA,iBAAA,CACA,O3C6wIN,C2CxwIM,qCACE,0B3C0wIR,C2C7uIM,kEACE,0C3C+uIR,C2CzuIE,2BAME,uBAAA,CADA,+DAAA,CAJA,YAAA,CACA,cAAA,CACA,aAAA,CACA,oB3C6uIJ,C2CxuII,aATF,2BAUI,gB3C2uIJ,CACF,C2CxuII,cAGE,+BACE,iB3CwuIN,C2CruIM,sCAQE,qCAAA,CANA,QAAA,CAKA,UAAA,CAHA,aAAA,CAEA,UAAA,CAHA,MAAA,CAFA,iBAAA,CAaA,2CAAA,CALA,2DACE,CAGF,kDAAA,CARA,+B3C6uIR,CACF,C2C/tII,8CACE,Y3CiuIN,C2C7tII,iCAUE,+BAAA,CACA,6BAAA,CALA,uCAAA,CAEA,cAAA,CAPA,aAAA,CAGA,gBAAA,CACA,eAAA,CAFA,8BAAA,CAMA,+BAAA,CAGA,2CACE,CANF,kBAAA,CALA,U3CyuIN,C2C1tIM,aAII,6CACE,O3CytIV,C2C1tIQ,8CACE,O3C4tIV,C2C7tIQ,8CACE,O3C+tIV,C2ChuIQ,8CACE,O3CkuIV,C2CnuIQ,8CACE,O3CquIV,C2CtuIQ,8CACE,O3CwuIV,C2CzuIQ,8CACE,O3C2uIV,C2C5uIQ,8CACE,O3C8uIV,C2C/uIQ,8CACE,O3CivIV,C2ClvIQ,+CACE,Q3CovIV,C2CrvIQ,+CACE,Q3CuvIV,C2CxvIQ,+CACE,Q3C0vIV,C2C3vIQ,+CACE,Q3C6vIV,C2C9vIQ,+CACE,Q3CgwIV,C2CjwIQ,+CACE,Q3CmwIV,C2CpwIQ,+CACE,Q3CswIV,C2CvwIQ,+CACE,Q3CywIV,C2C1wIQ,+CACE,Q3C4wIV,C2C7wIQ,+CACE,Q3C+wIV,C2ChxIQ,+CACE,Q3CkxIV,CACF,C2C7wIM,uCACE,gC3C+wIR,C2C3wIM,oDACE,a3C6wIR,C2CxwII,yCACE,S3C0wIN,C2CtwIM,2CACE,aAAA,CACA,8B3CwwIR,C2ClwIE,4BACE,U3CowIJ,C2CjwII,aAJF,4BAKI,gB3CowIJ,CACF,C2ChwIE,0BACE,Y3CkwIJ,C2C/vII,aAJF,0BAKI,a3CkwIJ,C2C9vIM,sCACE,O3CgwIR,C2CjwIM,uCACE,O3CmwIR,C2CpwIM,uCACE,O3CswIR,C2CvwIM,uCACE,O3CywIR,C2C1wIM,uCACE,O3C4wIR,C2C7wIM,uCACE,O3C+wIR,C2ChxIM,uCACE,O3CkxIR,C2CnxIM,uCACE,O3CqxIR,C2CtxIM,uCACE,O3CwxIR,C2CzxIM,wCACE,Q3C2xIR,C2C5xIM,wCACE,Q3C8xIR,C2C/xIM,wCACE,Q3CiyIR,C2ClyIM,wCACE,Q3CoyIR,C2CryIM,wCACE,Q3CuyIR,C2CxyIM,wCACE,Q3C0yIR,C2C3yIM,wCACE,Q3C6yIR,C2C9yIM,wCACE,Q3CgzIR,C2CjzIM,wCACE,Q3CmzIR,C2CpzIM,wCACE,Q3CszIR,C2CvzIM,wCACE,Q3CyzIR,CACF,C2CnzII,+FAEE,Q3CqzIN,C2ClzIM,yGACE,wBAAA,CACA,yB3CqzIR,C2C5yIM,2DAEE,wBAAA,CACA,yBAAA,CAFA,Q3CgzIR,C2CzyIM,iEACE,Q3C2yIR,C2CxyIQ,qLAGE,wBAAA,CACA,yBAAA,CAFA,Q3C4yIV,C2CtyIQ,6FACE,wBAAA,CACA,yB3CwyIV,C2CnyIM,yDACE,kB3CqyIR,C2ChyII,sCACE,Q3CkyIN,C2C7xIE,2BAEE,iBAAA,CAOA,kBAAA,CAHA,uCAAA,CAEA,cAAA,CAPA,aAAA,CAGA,YAAA,CACA,gBAAA,CAEA,mBAAA,CAGA,gCAAA,CAPA,W3CsyIJ,C2C5xII,iCAEE,uDAAA,CADA,+B3C+xIN,C2C1xII,iCAKE,6BAAA,CADA,UAAA,CAHA,aAAA,CAEA,WAAA,CAGA,8CAAA,CAAA,sCAAA,CAEA,4BAAA,CAAA,oBAAA,CADA,6BAAA,CAAA,qBAAA,CAEA,yBAAA,CAAA,iBAAA,CACA,+CACE,CATF,U3CoyIN,C2CrxIE,4BAOE,yEACE,CANF,YAAA,CAGA,aAAA,CAFA,qBAAA,CAGA,mBAAA,CALA,iBAAA,CAYA,wBAAA,CATA,Y3C2xIJ,C2C/wII,sCACE,wB3CixIN,C2C7wII,oCACE,S3C+wIN,C2C3wII,kCAGE,wEACE,CAFF,mBAAA,CADA,O3C+wIN,C2CrwIM,uDACE,8CAAA,CAAA,sC3CuwIR,CK94II,0CsCqJF,wDAEE,kB3C+vIF,C2CjwIA,wDAEE,mB3C+vIF,C2CjwIA,8CAGE,eAAA,CAFA,eAAA,CAGA,iC3C6vIF,C2CzvIE,8DACE,mB3C4vIJ,C2C7vIE,8DACE,kB3C4vIJ,C2C7vIE,oDAEE,U3C2vIJ,C2CvvIE,8EAEE,kB3C0vIJ,C2C5vIE,8EAEE,mB3C0vIJ,C2C5vIE,8EAGE,kB3CyvIJ,C2C5vIE,8EAGE,mB3CyvIJ,C2C5vIE,oEACE,U3C2vIJ,C2CrvIE,8EAEE,mB3CwvIJ,C2C1vIE,8EAEE,kB3CwvIJ,C2C1vIE,8EAGE,mB3CuvIJ,C2C1vIE,8EAGE,kB3CuvIJ,C2C1vIE,oEACE,U3CyvIJ,CACF,C2C3uIE,cAHF,olDAII,gC3C8uIF,C2C3uIE,g8GACE,uC3C6uIJ,CACF,C2CxuIA,4sDACE,+B3C2uIF,C2CvuIA,wmDACE,a3C0uIF,C4C9mJA,MACE,qWAAA,CACA,8W5CinJF,C4CxmJE,4BAEE,oBAAA,CADA,iB5C4mJJ,C4CvmJI,sDAEE,S5C0mJN,C4C5mJI,sDAEE,U5C0mJN,C4C5mJI,4CACE,iBAAA,CAEA,S5CymJN,C4CpmJE,+CAEE,SAAA,CADA,U5CumJJ,C4ClmJE,kDAEE,W5C6mJJ,C4C/mJE,kDAEE,Y5C6mJJ,C4C/mJE,wCAOE,qDAAA,CADA,UAAA,CADA,aAAA,CAGA,0CAAA,CAAA,kCAAA,CAEA,4BAAA,CAAA,oBAAA,CADA,6BAAA,CAAA,qBAAA,CAEA,yBAAA,CAAA,iBAAA,CAVA,iBAAA,CAEA,SAAA,CACA,Y5C2mJJ,C4ChmJE,gEACE,wB1B2Wa,C0B1Wb,mDAAA,CAAA,2C5CkmJJ,C6ClpJA,QACE,8DAAA,CAGA,+CAAA,CACA,iEAAA,CACA,oDAAA,CACA,sDAAA,CACA,mDAAA,CAGA,qEAAA,CACA,qEAAA,CACA,wEAAA,CACA,0EAAA,CACA,wEAAA,CACA,yEAAA,CACA,kEAAA,CACA,+DAAA,CACA,oEAAA,CACA,oEAAA,CACA,mEAAA,CACA,gEAAA,CACA,uEAAA,CACA,mEAAA,CACA,qEAAA,CACA,oEAAA,CACA,gEAAA,CACA,wEAAA,CACA,qEAAA,CACA,+D7CipJF,C6C3oJA,SAEE,kBAAA,CADA,Y7C+oJF,C8CjrJE,kBAUE,cAAA,CATA,YAAA,CACA,kEACE,CAQF,Y9C6qJJ,C8CzqJI,sDACE,gB9C2qJN,C8CrqJI,oFAKE,wDAAA,CACA,mBAAA,CAJA,aAAA,CAEA,QAAA,CADA,aAAA,CAIA,sC9CuqJN,C8ClqJM,iOACE,kBAAA,CACA,8B9CqqJR,C8CjqJM,6FACE,iBAAA,CAAA,c9CoqJR,C8ChqJM,2HACE,Y9CmqJR,C8C/pJM,wHACE,e9CkqJR,C8CnpJI,yMAGE,eAAA,CAAA,Y9C2pJN,C8C7oJI,ybAOE,W9CmpJN,C8C/oJI,8BACE,eAAA,CAAA,Y9CipJN,CK7kJI,mC0ChKA,8BACE,U/CqvJJ,C+CtvJE,8BACE,W/CqvJJ,C+CtvJE,8BAGE,kB/CmvJJ,C+CtvJE,8BAGE,iB/CmvJJ,C+CtvJE,oBAKE,mBAAA,CADA,YAAA,CAFA,a/CovJJ,C+C9uJI,kCACE,W/CivJN,C+ClvJI,kCACE,U/CivJN,C+ClvJI,kCAEE,iBAAA,CAAA,c/CgvJN,C+ClvJI,kCAEE,aAAA,CAAA,kB/CgvJN,CACF","file":"main.css"} \ No newline at end of file diff --git a/site/assets/stylesheets/palette.06af60db.min.css b/site/assets/stylesheets/palette.06af60db.min.css new file mode 100644 index 0000000..a640d38 --- /dev/null +++ b/site/assets/stylesheets/palette.06af60db.min.css @@ -0,0 +1 @@ +@media screen{[data-md-color-scheme=slate]{--md-default-fg-color:hsla(var(--md-hue),15%,90%,0.82);--md-default-fg-color--light:hsla(var(--md-hue),15%,90%,0.56);--md-default-fg-color--lighter:hsla(var(--md-hue),15%,90%,0.32);--md-default-fg-color--lightest:hsla(var(--md-hue),15%,90%,0.12);--md-default-bg-color:hsla(var(--md-hue),15%,14%,1);--md-default-bg-color--light:hsla(var(--md-hue),15%,14%,0.54);--md-default-bg-color--lighter:hsla(var(--md-hue),15%,14%,0.26);--md-default-bg-color--lightest:hsla(var(--md-hue),15%,14%,0.07);--md-code-fg-color:hsla(var(--md-hue),18%,86%,0.82);--md-code-bg-color:hsla(var(--md-hue),15%,18%,1);--md-code-hl-color:#2977ff;--md-code-hl-color--light:#2977ff1a;--md-code-hl-number-color:#e6695b;--md-code-hl-special-color:#f06090;--md-code-hl-function-color:#c973d9;--md-code-hl-constant-color:#9383e2;--md-code-hl-keyword-color:#6791e0;--md-code-hl-string-color:#2fb170;--md-code-hl-name-color:var(--md-code-fg-color);--md-code-hl-operator-color:var(--md-default-fg-color--light);--md-code-hl-punctuation-color:var(--md-default-fg-color--light);--md-code-hl-comment-color:var(--md-default-fg-color--light);--md-code-hl-generic-color:var(--md-default-fg-color--light);--md-code-hl-variable-color:var(--md-default-fg-color--light);--md-typeset-color:var(--md-default-fg-color);--md-typeset-a-color:var(--md-primary-fg-color);--md-typeset-kbd-color:hsla(var(--md-hue),15%,90%,0.12);--md-typeset-kbd-accent-color:hsla(var(--md-hue),15%,90%,0.2);--md-typeset-kbd-border-color:hsla(var(--md-hue),15%,14%,1);--md-typeset-mark-color:#4287ff4d;--md-typeset-table-color:hsla(var(--md-hue),15%,95%,0.12);--md-typeset-table-color--light:hsla(var(--md-hue),15%,95%,0.035);--md-admonition-fg-color:var(--md-default-fg-color);--md-admonition-bg-color:var(--md-default-bg-color);--md-footer-bg-color:hsla(var(--md-hue),15%,10%,0.87);--md-footer-bg-color--dark:hsla(var(--md-hue),15%,8%,1);--md-shadow-z1:0 0.2rem 0.5rem #0000000d,0 0 0.05rem #0000001a;--md-shadow-z2:0 0.2rem 0.5rem #00000040,0 0 0.05rem #00000040;--md-shadow-z3:0 0.2rem 0.5rem #0006,0 0 0.05rem #00000059;color-scheme:dark}[data-md-color-scheme=slate] img[src$="#gh-light-mode-only"],[data-md-color-scheme=slate] img[src$="#only-light"]{display:none}[data-md-color-scheme=slate][data-md-color-primary=pink]{--md-typeset-a-color:#ed5487}[data-md-color-scheme=slate][data-md-color-primary=purple]{--md-typeset-a-color:#c46fd3}[data-md-color-scheme=slate][data-md-color-primary=deep-purple]{--md-typeset-a-color:#a47bea}[data-md-color-scheme=slate][data-md-color-primary=indigo]{--md-typeset-a-color:#5488e8}[data-md-color-scheme=slate][data-md-color-primary=teal]{--md-typeset-a-color:#00ccb8}[data-md-color-scheme=slate][data-md-color-primary=green]{--md-typeset-a-color:#71c174}[data-md-color-scheme=slate][data-md-color-primary=deep-orange]{--md-typeset-a-color:#ff764d}[data-md-color-scheme=slate][data-md-color-primary=brown]{--md-typeset-a-color:#c1775c}[data-md-color-scheme=slate][data-md-color-primary=black],[data-md-color-scheme=slate][data-md-color-primary=blue-grey],[data-md-color-scheme=slate][data-md-color-primary=grey],[data-md-color-scheme=slate][data-md-color-primary=white]{--md-typeset-a-color:#5e8bde}[data-md-color-switching] *,[data-md-color-switching] :after,[data-md-color-switching] :before{transition-duration:0ms!important}}[data-md-color-accent=red]{--md-accent-fg-color:#ff1947;--md-accent-fg-color--transparent:#ff19471a;--md-accent-bg-color:#fff;--md-accent-bg-color--light:#ffffffb3}[data-md-color-accent=pink]{--md-accent-fg-color:#f50056;--md-accent-fg-color--transparent:#f500561a;--md-accent-bg-color:#fff;--md-accent-bg-color--light:#ffffffb3}[data-md-color-accent=purple]{--md-accent-fg-color:#df41fb;--md-accent-fg-color--transparent:#df41fb1a;--md-accent-bg-color:#fff;--md-accent-bg-color--light:#ffffffb3}[data-md-color-accent=deep-purple]{--md-accent-fg-color:#7c4dff;--md-accent-fg-color--transparent:#7c4dff1a;--md-accent-bg-color:#fff;--md-accent-bg-color--light:#ffffffb3}[data-md-color-accent=indigo]{--md-accent-fg-color:#526cfe;--md-accent-fg-color--transparent:#526cfe1a;--md-accent-bg-color:#fff;--md-accent-bg-color--light:#ffffffb3}[data-md-color-accent=blue]{--md-accent-fg-color:#4287ff;--md-accent-fg-color--transparent:#4287ff1a;--md-accent-bg-color:#fff;--md-accent-bg-color--light:#ffffffb3}[data-md-color-accent=light-blue]{--md-accent-fg-color:#0091eb;--md-accent-fg-color--transparent:#0091eb1a;--md-accent-bg-color:#fff;--md-accent-bg-color--light:#ffffffb3}[data-md-color-accent=cyan]{--md-accent-fg-color:#00bad6;--md-accent-fg-color--transparent:#00bad61a;--md-accent-bg-color:#fff;--md-accent-bg-color--light:#ffffffb3}[data-md-color-accent=teal]{--md-accent-fg-color:#00bda4;--md-accent-fg-color--transparent:#00bda41a;--md-accent-bg-color:#fff;--md-accent-bg-color--light:#ffffffb3}[data-md-color-accent=green]{--md-accent-fg-color:#00c753;--md-accent-fg-color--transparent:#00c7531a;--md-accent-bg-color:#fff;--md-accent-bg-color--light:#ffffffb3}[data-md-color-accent=light-green]{--md-accent-fg-color:#63de17;--md-accent-fg-color--transparent:#63de171a;--md-accent-bg-color:#fff;--md-accent-bg-color--light:#ffffffb3}[data-md-color-accent=lime]{--md-accent-fg-color:#b0eb00;--md-accent-fg-color--transparent:#b0eb001a;--md-accent-bg-color:#000000de;--md-accent-bg-color--light:#0000008a}[data-md-color-accent=yellow]{--md-accent-fg-color:#ffd500;--md-accent-fg-color--transparent:#ffd5001a;--md-accent-bg-color:#000000de;--md-accent-bg-color--light:#0000008a}[data-md-color-accent=amber]{--md-accent-fg-color:#fa0;--md-accent-fg-color--transparent:#ffaa001a;--md-accent-bg-color:#000000de;--md-accent-bg-color--light:#0000008a}[data-md-color-accent=orange]{--md-accent-fg-color:#ff9100;--md-accent-fg-color--transparent:#ff91001a;--md-accent-bg-color:#000000de;--md-accent-bg-color--light:#0000008a}[data-md-color-accent=deep-orange]{--md-accent-fg-color:#ff6e42;--md-accent-fg-color--transparent:#ff6e421a;--md-accent-bg-color:#fff;--md-accent-bg-color--light:#ffffffb3}[data-md-color-primary=red]{--md-primary-fg-color:#ef5552;--md-primary-fg-color--light:#e57171;--md-primary-fg-color--dark:#e53734;--md-primary-bg-color:#fff;--md-primary-bg-color--light:#ffffffb3}[data-md-color-primary=pink]{--md-primary-fg-color:#e92063;--md-primary-fg-color--light:#ec417a;--md-primary-fg-color--dark:#c3185d;--md-primary-bg-color:#fff;--md-primary-bg-color--light:#ffffffb3}[data-md-color-primary=purple]{--md-primary-fg-color:#ab47bd;--md-primary-fg-color--light:#bb69c9;--md-primary-fg-color--dark:#8c24a8;--md-primary-bg-color:#fff;--md-primary-bg-color--light:#ffffffb3}[data-md-color-primary=deep-purple]{--md-primary-fg-color:#7e56c2;--md-primary-fg-color--light:#9574cd;--md-primary-fg-color--dark:#673ab6;--md-primary-bg-color:#fff;--md-primary-bg-color--light:#ffffffb3}[data-md-color-primary=indigo]{--md-primary-fg-color:#4051b5;--md-primary-fg-color--light:#5d6cc0;--md-primary-fg-color--dark:#303fa1;--md-primary-bg-color:#fff;--md-primary-bg-color--light:#ffffffb3}[data-md-color-primary=blue]{--md-primary-fg-color:#2094f3;--md-primary-fg-color--light:#42a5f5;--md-primary-fg-color--dark:#1975d2;--md-primary-bg-color:#fff;--md-primary-bg-color--light:#ffffffb3}[data-md-color-primary=light-blue]{--md-primary-fg-color:#02a6f2;--md-primary-fg-color--light:#28b5f6;--md-primary-fg-color--dark:#0287cf;--md-primary-bg-color:#fff;--md-primary-bg-color--light:#ffffffb3}[data-md-color-primary=cyan]{--md-primary-fg-color:#00bdd6;--md-primary-fg-color--light:#25c5da;--md-primary-fg-color--dark:#0097a8;--md-primary-bg-color:#fff;--md-primary-bg-color--light:#ffffffb3}[data-md-color-primary=teal]{--md-primary-fg-color:#009485;--md-primary-fg-color--light:#26a699;--md-primary-fg-color--dark:#007a6c;--md-primary-bg-color:#fff;--md-primary-bg-color--light:#ffffffb3}[data-md-color-primary=green]{--md-primary-fg-color:#4cae4f;--md-primary-fg-color--light:#68bb6c;--md-primary-fg-color--dark:#398e3d;--md-primary-bg-color:#fff;--md-primary-bg-color--light:#ffffffb3}[data-md-color-primary=light-green]{--md-primary-fg-color:#8bc34b;--md-primary-fg-color--light:#9ccc66;--md-primary-fg-color--dark:#689f38;--md-primary-bg-color:#fff;--md-primary-bg-color--light:#ffffffb3}[data-md-color-primary=lime]{--md-primary-fg-color:#cbdc38;--md-primary-fg-color--light:#d3e156;--md-primary-fg-color--dark:#b0b52c;--md-primary-bg-color:#000000de;--md-primary-bg-color--light:#0000008a}[data-md-color-primary=yellow]{--md-primary-fg-color:#ffec3d;--md-primary-fg-color--light:#ffee57;--md-primary-fg-color--dark:#fbc02d;--md-primary-bg-color:#000000de;--md-primary-bg-color--light:#0000008a}[data-md-color-primary=amber]{--md-primary-fg-color:#ffc105;--md-primary-fg-color--light:#ffc929;--md-primary-fg-color--dark:#ffa200;--md-primary-bg-color:#000000de;--md-primary-bg-color--light:#0000008a}[data-md-color-primary=orange]{--md-primary-fg-color:#ffa724;--md-primary-fg-color--light:#ffa724;--md-primary-fg-color--dark:#fa8900;--md-primary-bg-color:#000000de;--md-primary-bg-color--light:#0000008a}[data-md-color-primary=deep-orange]{--md-primary-fg-color:#ff6e42;--md-primary-fg-color--light:#ff8a66;--md-primary-fg-color--dark:#f4511f;--md-primary-bg-color:#fff;--md-primary-bg-color--light:#ffffffb3}[data-md-color-primary=brown]{--md-primary-fg-color:#795649;--md-primary-fg-color--light:#8d6e62;--md-primary-fg-color--dark:#5d4037;--md-primary-bg-color:#fff;--md-primary-bg-color--light:#ffffffb3}[data-md-color-primary=grey]{--md-primary-fg-color:#757575;--md-primary-fg-color--light:#9e9e9e;--md-primary-fg-color--dark:#616161;--md-primary-bg-color:#fff;--md-primary-bg-color--light:#ffffffb3;--md-typeset-a-color:#4051b5}[data-md-color-primary=blue-grey]{--md-primary-fg-color:#546d78;--md-primary-fg-color--light:#607c8a;--md-primary-fg-color--dark:#455a63;--md-primary-bg-color:#fff;--md-primary-bg-color--light:#ffffffb3;--md-typeset-a-color:#4051b5}[data-md-color-primary=light-green]:not([data-md-color-scheme=slate]){--md-typeset-a-color:#72ad2e}[data-md-color-primary=lime]:not([data-md-color-scheme=slate]){--md-typeset-a-color:#8b990a}[data-md-color-primary=yellow]:not([data-md-color-scheme=slate]){--md-typeset-a-color:#b8a500}[data-md-color-primary=amber]:not([data-md-color-scheme=slate]){--md-typeset-a-color:#d19d00}[data-md-color-primary=orange]:not([data-md-color-scheme=slate]){--md-typeset-a-color:#e68a00}[data-md-color-primary=white]{--md-primary-fg-color:hsla(var(--md-hue),0%,100%,1);--md-primary-fg-color--light:hsla(var(--md-hue),0%,100%,0.7);--md-primary-fg-color--dark:hsla(var(--md-hue),0%,0%,0.07);--md-primary-bg-color:hsla(var(--md-hue),0%,0%,0.87);--md-primary-bg-color--light:hsla(var(--md-hue),0%,0%,0.54);--md-typeset-a-color:#4051b5}[data-md-color-primary=white] .md-button{color:var(--md-typeset-a-color)}[data-md-color-primary=white] .md-button--primary{background-color:var(--md-typeset-a-color);border-color:var(--md-typeset-a-color);color:hsla(var(--md-hue),0%,100%,1)}@media screen and (min-width:60em){[data-md-color-primary=white] .md-search__form{background-color:hsla(var(--md-hue),0%,0%,.07)}[data-md-color-primary=white] .md-search__form:hover{background-color:hsla(var(--md-hue),0%,0%,.32)}[data-md-color-primary=white] .md-search__input+.md-search__icon{color:hsla(var(--md-hue),0%,0%,.87)}}@media screen and (min-width:76.25em){[data-md-color-primary=white] .md-tabs{border-bottom:.05rem solid #00000012}}[data-md-color-primary=black]{--md-primary-fg-color:hsla(var(--md-hue),15%,9%,1);--md-primary-fg-color--light:hsla(var(--md-hue),15%,9%,0.54);--md-primary-fg-color--dark:hsla(var(--md-hue),15%,9%,1);--md-primary-bg-color:hsla(var(--md-hue),15%,100%,1);--md-primary-bg-color--light:hsla(var(--md-hue),15%,100%,0.7);--md-typeset-a-color:#4051b5}[data-md-color-primary=black] .md-button{color:var(--md-typeset-a-color)}[data-md-color-primary=black] .md-button--primary{background-color:var(--md-typeset-a-color);border-color:var(--md-typeset-a-color);color:hsla(var(--md-hue),0%,100%,1)}[data-md-color-primary=black] .md-header{background-color:hsla(var(--md-hue),15%,9%,1)}@media screen and (max-width:59.984375em){[data-md-color-primary=black] .md-nav__source{background-color:hsla(var(--md-hue),15%,11%,.87)}}@media screen and (max-width:76.234375em){html [data-md-color-primary=black] .md-nav--primary .md-nav__title[for=__drawer]{background-color:hsla(var(--md-hue),15%,9%,1)}}@media screen and (min-width:76.25em){[data-md-color-primary=black] .md-tabs{background-color:hsla(var(--md-hue),15%,9%,1)}} \ No newline at end of file diff --git a/site/assets/stylesheets/palette.06af60db.min.css.map b/site/assets/stylesheets/palette.06af60db.min.css.map new file mode 100644 index 0000000..efb568c --- /dev/null +++ b/site/assets/stylesheets/palette.06af60db.min.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["src/templates/assets/stylesheets/palette/_scheme.scss","../../../../src/templates/assets/stylesheets/palette.scss","src/templates/assets/stylesheets/palette/_accent.scss","src/templates/assets/stylesheets/palette/_primary.scss","src/templates/assets/stylesheets/utilities/_break.scss"],"names":[],"mappings":"AA2BA,cAGE,6BAME,sDAAA,CACA,6DAAA,CACA,+DAAA,CACA,gEAAA,CACA,mDAAA,CACA,6DAAA,CACA,+DAAA,CACA,gEAAA,CAGA,mDAAA,CACA,gDAAA,CAGA,0BAAA,CACA,mCAAA,CAGA,iCAAA,CACA,kCAAA,CACA,mCAAA,CACA,mCAAA,CACA,kCAAA,CACA,iCAAA,CACA,+CAAA,CACA,6DAAA,CACA,gEAAA,CACA,4DAAA,CACA,4DAAA,CACA,6DAAA,CAGA,6CAAA,CAGA,+CAAA,CAGA,uDAAA,CACA,6DAAA,CACA,2DAAA,CAGA,iCAAA,CAGA,yDAAA,CACA,iEAAA,CAGA,mDAAA,CACA,mDAAA,CAGA,qDAAA,CACA,uDAAA,CAGA,8DAAA,CAKA,8DAAA,CAKA,0DAAA,CAvEA,iBCeF,CD6DE,kHAEE,YC3DJ,CDkFE,yDACE,4BChFJ,CD+EE,2DACE,4BC7EJ,CD4EE,gEACE,4BC1EJ,CDyEE,2DACE,4BCvEJ,CDsEE,yDACE,4BCpEJ,CDmEE,0DACE,4BCjEJ,CDgEE,gEACE,4BC9DJ,CD6DE,0DACE,4BC3DJ,CD0DE,2OACE,4BC/CJ,CDsDA,+FAGE,iCCpDF,CACF,CC/CE,2BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCD2CN,CCrDE,4BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDkDN,CC5DE,8BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDyDN,CCnEE,mCACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDgEN,CC1EE,8BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDuEN,CCjFE,4BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCD8EN,CCxFE,kCACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDqFN,CC/FE,4BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCD4FN,CCtGE,4BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDmGN,CC7GE,6BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCD0GN,CCpHE,mCACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDiHN,CC3HE,4BACE,4BAAA,CACA,2CAAA,CAIE,8BAAA,CACA,qCD2HN,CClIE,8BACE,4BAAA,CACA,2CAAA,CAIE,8BAAA,CACA,qCDkIN,CCzIE,6BACE,yBAAA,CACA,2CAAA,CAIE,8BAAA,CACA,qCDyIN,CChJE,8BACE,4BAAA,CACA,2CAAA,CAIE,8BAAA,CACA,qCDgJN,CCvJE,mCACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDoJN,CEzJE,4BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsJN,CEjKE,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8JN,CEzKE,+BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsKN,CEjLE,oCACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8KN,CEzLE,+BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsLN,CEjME,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8LN,CEzME,mCACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsMN,CEjNE,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8MN,CEzNE,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsNN,CEjOE,8BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8NN,CEzOE,oCACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsON,CEjPE,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAIE,+BAAA,CACA,sCFiPN,CEzPE,+BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAIE,+BAAA,CACA,sCFyPN,CEjQE,8BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAIE,+BAAA,CACA,sCFiQN,CEzQE,+BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAIE,+BAAA,CACA,sCFyQN,CEjRE,oCACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8QN,CEzRE,8BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsRN,CEjSE,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCAAA,CAKA,4BF0RN,CE1SE,kCACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCAAA,CAKA,4BFmSN,CEpRE,sEACE,4BFuRJ,CExRE,+DACE,4BF2RJ,CE5RE,iEACE,4BF+RJ,CEhSE,gEACE,4BFmSJ,CEpSE,iEACE,4BFuSJ,CE9RA,8BACE,mDAAA,CACA,4DAAA,CACA,0DAAA,CACA,oDAAA,CACA,2DAAA,CAGA,4BF+RF,CE5RE,yCACE,+BF8RJ,CE3RI,kDAEE,0CAAA,CACA,sCAAA,CAFA,mCF+RN,CG3MI,mCD1EA,+CACE,8CFwRJ,CErRI,qDACE,8CFuRN,CElRE,iEACE,mCFoRJ,CACF,CGtNI,sCDvDA,uCACE,oCFgRJ,CACF,CEvQA,8BACE,kDAAA,CACA,4DAAA,CACA,wDAAA,CACA,oDAAA,CACA,6DAAA,CAGA,4BFwQF,CErQE,yCACE,+BFuQJ,CEpQI,kDAEE,0CAAA,CACA,sCAAA,CAFA,mCFwQN,CEjQE,yCACE,6CFmQJ,CG5NI,0CDhCA,8CACE,gDF+PJ,CACF,CGjOI,0CDvBA,iFACE,6CF2PJ,CACF,CGzPI,sCDKA,uCACE,6CFuPJ,CACF","file":"palette.css"} \ No newline at end of file diff --git a/site/decisions/ADR-01_Integration_Repository_Placement/index.html b/site/decisions/ADR-01_Integration_Repository_Placement/index.html new file mode 100644 index 0000000..47b5b81 --- /dev/null +++ b/site/decisions/ADR-01_Integration_Repository_Placement/index.html @@ -0,0 +1,3004 @@ + + + + + + + + + + + + + + + + + + + + + + + ADR-01 Integration Repository Placement / 統合リポジトリの置き場 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + +
    + + + + +
    + + +
    + +
    + + + + + + + + + +
    +
    + + + +
    +
    +
    + + + + + + + +
    +
    +
    + + + + + + + +
    +
    + + + + + + + +

    ADR-01 Integration Repository Placement / 統合リポジトリの置き場

    +
    +

    Summary: Where the code that combines the public cores, the -private security versions and the subsystems is kept: new private repositories RDM-<name>-dev2027 inside RCOSDP, with a develop integration branch and upstream/* tracking branches, never in this public repository. +概要: 公開コア・-private セキュリティ版・サブシステムを重ねたコードをどこに置くか。RCOSDP 内に新設する非公開リポジトリ RDM-<name>-dev2027 に置き、develop を統合ブランチ、upstream/* を追跡ブランチとする。公開のこのリポジトリには置かない。

    +
    +

    Jump: English · 日本語

    +
      +
    • Version / 版: 0.3 — 2026-11-05. Learned: the owner prefers a literal, reproducible integration order over a convenient bootstrap, so the first construction is redone public-first on a new branch and proposed as a superseding pull request. / 所有者は便利な初回構築より、文字どおり再現できる統合順を選ぶと分かった。初回構築は新しいブランチで「公開が先」にやり直し、置き換えの PR として提案する。 + 0.2 — 2026-11-05. Learned: the first construction of a -dev2027 repository cannot literally replay "public → private → adopted PRs", so the rule needs a stated bootstrap interpretation; it is proposed in §5 and awaits the owner. / -dev2027 の初回構築では「公開 → private → 採用 PR」を文字どおり再現できないため、初回構築の解釈を明文化する必要があると分かった。§5 に提案し所有者の承認を待つ。 + 0.1 — 2026-11-05. Learned: GitHub refuses a fork inside the same organization, so "fork and integrate" had to become "new repository with history pushed", and that in turn made the no-force-push and no-delete rules the only way to keep the pushed history trustworthy. / GitHub は同じ組織内へのフォークを許さないため「フォークして統合」は「履歴を push した新規リポジトリ」になり、その結果 force push 禁止と削除禁止が、push した履歴を信じられるものに保つ唯一の手段だと分かった。
    • +
    • Status: Accepted by the owner, 2026-11-05 (plan-interview).
    • +
    • Records a decision for: POL-01 §2 item 5 · SPEC-01 Manifest · SPEC-05 Upstream Tracking
    • +
    • Related: docs/README.md · SPEC-00 Overview · ADR-02 Network Model · ADR-04 AI Autonomy and Roles · REF-01 Glossary
    • +
    +
    +

    +

    English

    +

    → 日本語版へ

    +

    1. Context

    +

    A decision record (ADR) explains why we chose one way and not another. This one is about where the integration code lives.

    +

    We must combine, without contradiction, three groups of code kept in GitHub repositories (folders that remember every change):

    +
      +
    • six public cores: RDM-osf.io, RDM-waterbutler, RDM-modular-file-renderer, RDM-ember-osf-web, RDM-cas-overlay, RDM-wiki-frontend;
    • +
    • six -private security-verified versions, each of which already contains the history of its public core (so it is a superset, not a rival);
    • +
    • five private subsystems: y-websocket, OASys, Shibboleth-SP, rdmcp, aipf_mcp_data_grdm.
    • +
    +

    Three constraints shaped the choice:

    +
      +
    1. Same-organization forks are impossible. On GitHub a fork (your own copy of someone's repository that remembers where it came from) cannot be created inside the same organization that owns the original. All these repositories are in RCOSDP, so a plain fork is unavailable.
    2. +
    3. Write boundary. The agents on this plan may write only to this repository (RDM-developer-guide) and to repositories they create. Existing repositories, including the -private ones, are read-only to us. Deleting a repository or branch and force-pushing (overwriting shared history) are forbidden.
    4. +
    5. This repository is public. Members abroad read it. Anything derived from -private code — files, patches, even URLs of private repositories — must not appear here.
    6. +
    +

    2. Options considered

    +
    options[4]{id,option,keeps_private_code_private,within_write_boundary,upstream_follow_cost,verdict}:
    +  A,"New private repositories RDM-<name>-dev2027 in RCOSDP, history pushed, develop = integration, upstream/* tracking",yes,yes,low,chosen
    +  B,"Fork to a personal GitHub account",no,yes,low,rejected
    +  C,"Keep patches inside this public repository and apply at install time",no,yes,high,rejected
    +  D,"Use the -private repositories directly as the canon and integrate there",yes,no,low,rejected
    +
      +
    • B puts code derived from private sources under a personal account, outside the organization's access control. Rejected.
    • +
    • C keeps a pile of patches (small text files describing changes) that must be re-fitted every time an upstream repository moves; with eleven moving upstreams the conflicts arrive faster than they are solved, and any patch touching -private code would leak it into a public repository. Rejected.
    • +
    • D would be the simplest, but we are not allowed to write to the -private repositories, and integrating in them would mix verification work with security verification history. Rejected.
    • +
    +

    3. Decision

    +
      +
    1. For each of the eleven upstream repositories, create a private repository in RCOSDP named RDM-<name>-dev2027 (for example RDM-osf.io-dev2027). Push the full history of the public core so that git log remains truthful and SHAs (fingerprints of commits) match upstream.
    2. +
    3. Branches in each -dev2027 repository:
    4. +
    5. develop — the integration branch; the only branch the installer builds from (its SHA is recorded in the manifest, see SPEC-01);
    6. +
    7. one tracking branch per upstream listed in the manifest, named upstream/<kind>-<branch> where <kind> is public, private, or cos and <branch> is the upstream branch name with / replaced by - (SPEC-01 §4 rule 7);
    8. +
    9. upstream/public-<branch> — an exact mirror (identical copy, refreshed automatically) of the public core's default branch: upstream/public-develop for osf.io, waterbutler, mfr, cas-overlay, wiki-frontend; upstream/public-master for ember-osf-web and y-websocket;
    10. +
    11. upstream/private-<branch> — a mirror of the -private default branch: upstream/private-develop, upstream/private-master (ember-osf-web, y-websocket), or upstream/private-main (OASys, Shibboleth-SP, rdmcp, aipf_mcp_data_grdm, which have no public upstream and only this branch);
    12. +
    13. upstream/cos-develop — a mirror of the CenterForOpenScience original, for reference only (not for wiki-frontend, which has no COS original);
    14. +
    15. a second upstream of the same kind gets a tag: upstream/private-sec-test-fix-sec-test mirrors RDM-osf.io-private (branch fix/sec-test) as a candidate. + Mirrors are refreshed daily (SPEC-05).
    16. +
    17. Integration order on develop: public develop → -private → adopted pull requests (proposed changes waiting for review). Merged upstream changes are taken in full; unmerged PRs are adopted one by one, security and authentication first, and listed as candidates in the manifest.
    18. +
    19. No force-push, no deletion. Conflicts are solved by new commits in a PR, never by rewriting history. Branches are archived with a tag rather than deleted.
    20. +
    21. Nothing from a -dev2027 repository is copied into this public repository except names, branch names, SHAs, dates and PR numbers. Image builds from -private code go only to local Docker or to a private registry, never to a public one.
    22. +
    +
    flowchart TD
    +  PUB["public core<br/>default branch"] -->|daily mirror| UP1["upstream/public-<branch>"]
    +  PRV["-private<br/>default branch"] -->|daily mirror| UP2["upstream/private-<branch>"]
    +  COS["CenterForOpenScience<br/>develop"] -->|daily mirror| UP3["upstream/cos-develop"]
    +  UP1 -->|1. merge| DEV["develop (integration)"]
    +  UP2 -->|2. merge| DEV
    +  PRS["adopted PRs<br/>(security, auth first)"] -->|3. PR, Codex review| DEV
    +  UP3 -.->|reference only| DEV
    +  DEV -->|"name + SHA"| MAN["manifest/upstreams.json<br/>(public repository)"]
    +

    4. Consequences

    +
      +
    • Good: one place per component where "public + private + adopted PRs" is resolved; the installer needs only a name and a SHA; daily mirrors keep diffs small; history is complete and auditable.
    • +
    • Good: the write boundary is respected without asking for new permissions on existing repositories.
    • +
    • Cost: eleven more repositories to watch. Mitigated by automation in SPEC-05 and the status board.
    • +
    • Cost: -dev2027 repositories are private, so GitHub Actions minutes and self-hosted runner usage count against the Team plan. Accepted.
    • +
    • Risk — leakage into this public repository. A single careless copy of a file, a stack trace or a URL from a -dev2027 or -private repository would publish private security work. Controls: secret scanning in CI is mandatory; reviewers check every PR to this repository for private paths and URLs; the manifest schema allows only names, branches, SHAs, dates and PR numbers; documents name private repositories but never link to them (SPEC-06 §5).
    • +
    • Risk — drift between public and private cores. On 2026-11-05 the public RDM-osf.io develop was newer than its -private counterpart. The integration order (public first, then private) and daily mirrors make such drift visible as a merge, not as a silent overwrite.
    • +
    • Open: how to treat RDM-osf.io-private (branch fix/sec-test), which is distinct from RDM-osf.io-develop-private. It is mirrored as upstream/private-sec-test-fix-sec-test and listed in the manifest with status: candidate (SPEC-01 §4 rule 6); the owner decides whether it is merged.
    • +
    +
    +

    5. Bootstrap of the integration order (decided 2026-11-05: strict reconstruction)

    +

    Status: the owner rejected the proposed interpretation "seed from the -private tip and merge the newer public tip" (review r1/r2 of RDM-osf.io-dev2027 PR #1, finding R2). The integration order of SPEC-01 §4 applies literally, also to the first construction.

    +

    Procedure for every -dev2027 repository:

    +
      +
    1. Start a branch integrate/strict-<YYYYMMDD> at the tip of upstream/public-<branch>.
    2. +
    3. Merge upstream/private-<branch> into it with a normal two-parent merge (--no-ff), resolving conflicts on the branch.
    4. +
    5. Re-apply adopted PRs from the manifest, each as its own merge.
    6. +
    7. Open a pull request from that branch to develop. The develop branch is never force-pushed or deleted; the pull request supersedes any earlier integration pull request, which is closed with a comment pointing to the new one.
    8. +
    9. Review by REV, check by QAE, merge by the owner (ADR-04).
    10. +
    +

    Consequence: the first develop of each repository (seeded from the -private tip during bootstrap) stays in history. The strictly reconstructed branch is merged on top of it, so from the first strict merge onward every develop carries the public-first order.

    +
    +

    +

    日本語

    +

    → To English

    +

    1. 背景

    +

    「決定の記録」(ADR)は、なぜその道を選び、ほかを選ばなかったかを残すメモです。この記録は、統合コードをどこに置くかについてのものです。

    +

    GitHub の「リポジトリ」(変更を全部覚えているフォルダ)に置かれた三つの群のコードを、矛盾なく重ねる必要があります。

    +
      +
    • 公開コア 6 本: RDM-osf.io、RDM-waterbutler、RDM-modular-file-renderer、RDM-ember-osf-web、RDM-cas-overlay、RDM-wiki-frontend。
    • +
    • -private のセキュリティ検証版 6 本。いずれも対応する公開コアの履歴を含んでいる(つまり対立ではなく上位互換)。
    • +
    • 非公開サブシステム 5 本: y-websocket、OASys、Shibboleth-SP、rdmcp、aipf_mcp_data_grdm。
    • +
    +

    選択を決めた制約は三つです。

    +
      +
    1. 同じ組織内へのフォークはできない。 GitHub の「フォーク」(他人のリポジトリの自分用の写しで、出どころを覚えているもの)は、元のリポジトリを持つ組織の中には作れません。対象は全部 RCOSDP にあるので、普通のフォークは使えません。
    2. +
    3. 書込の境界。 この計画のエージェントが書き込めるのは、このリポジトリ(RDM-developer-guide)と自分で新設したリポジトリだけです。-private を含む既存リポジトリは読み取り専用です。リポジトリやブランチの削除と「force push」(共有の履歴の上書き)は禁止です。
    4. +
    5. このリポジトリは公開。 海外のメンバーが読みます。-private 由来のもの — ファイル、パッチ、非公開リポジトリの URL まで — をここに出してはいけません。
    6. +
    +

    2. 検討した選択肢

    +
    options[4]{id,option,keeps_private_code_private,within_write_boundary,upstream_follow_cost,verdict}:
    +  A,"RCOSDP 内に非公開の RDM-<name>-dev2027 を新設、履歴を push、develop = 統合、upstream/* で追跡",yes,yes,low,採用
    +  B,"個人の GitHub アカウントへフォーク",no,yes,low,不採用
    +  C,"公開のこのリポジトリにパッチを同梱し導入時に当てる",no,yes,high,不採用
    +  D,"-private リポジトリを直接正本にしてそこで統合",yes,no,low,不採用
    +
      +
    • B は非公開由来のコードを、組織のアクセス管理の外にある個人アカウントの下に出します。不採用。
    • +
    • C は「パッチ」(変更内容を書いた小さな文字ファイル)の山を持ち、上流が動くたびに当て直す必要があります。11 本の上流が動くと、衝突は解く速さより早く届きます。しかも -private に触るパッチは公開リポジトリへの漏えいになります。不採用。
    • +
    • D は最も単純ですが、-private リポジトリへの書込は許されておらず、そこで統合するとセキュリティ検証の履歴と統合作業が混ざります。不採用。
    • +
    +

    3. 決定

    +
      +
    1. 上流 11 本それぞれに、RCOSDP 内に 非公開 のリポジトリ RDM-<name>-dev2027(例: RDM-osf.io-dev2027)を新設します。公開コアの全履歴を push し、git log が本当のことを示し、「SHA」(コミットの指紋)が上流と一致するようにします。
    2. +
    3. 各 -dev2027 のブランチ:
    4. +
    5. develop — 統合ブランチ。インストーラーが組み立てる唯一のブランチ(その SHA を manifest に記録。SPEC-01)。
    6. +
    7. manifest に載せた上流ごとに一本の追跡ブランチ。名前は upstream/<kind>-<branch> で、<kind> は public・private・cos、<branch> は上流のブランチ名の / を - に置き換えたもの(SPEC-01 §4 の規則 7)。
    8. +
    9. upstream/public-<branch> — 公開コアの既定ブランチの正確な「ミラー」(自動で更新される同一の写し)。osf.io・waterbutler・mfr・cas-overlay・wiki-frontend は upstream/public-develop、ember-osf-web と y-websocket は upstream/public-master。
    10. +
    11. upstream/private-<branch> — -private の既定ブランチのミラー。upstream/private-develop、upstream/private-master(ember-osf-web、y-websocket)、または upstream/private-main(OASys、Shibboleth-SP、rdmcp、aipf_mcp_data_grdm。公開の上流がないのでこの一本だけ)。
    12. +
    13. upstream/cos-develop — CenterForOpenScience 本家のミラー。参照のみ(COS 本家のない wiki-frontend にはない)。
    14. +
    15. 同じ kind の二つ目の上流にはタグを挟む。upstream/private-sec-test-fix-sec-test は RDM-osf.io-private(ブランチ fix/sec-test)を候補として写したもの。 + ミラーは日次で更新します(SPEC-05)。
    16. +
    17. develop への統合順: 公開 develop → -private → 採用した「プルリクエスト」(レビュー待ちの変更の提案)。上流でマージ済みの変更は全件取り込み、未マージ PR はセキュリティ・認証系を先に一件ずつ採否を決め、候補は manifest に載せます。
    18. +
    19. force push なし、削除なし。 衝突は PR 上の新しいコミットで解き、履歴は書き換えません。ブランチは削除せずタグで保管します。
    20. +
    21. -dev2027 から公開のこのリポジトリへ写すのは、名前、ブランチ名、SHA、日付、PR 番号だけ。 -private 由来のコードから作るイメージは、ローカルの Docker か非公開レジストリにだけ置き、公開レジストリには出しません。
    22. +
    +
    flowchart TD
    +  PUB["公開コア<br/>既定ブランチ"] -->|日次ミラー| UP1["upstream/public-<branch>"]
    +  PRV["-private<br/>既定ブランチ"] -->|日次ミラー| UP2["upstream/private-<branch>"]
    +  COS["CenterForOpenScience<br/>develop"] -->|日次ミラー| UP3["upstream/cos-develop"]
    +  UP1 -->|1. マージ| DEV["develop(統合)"]
    +  UP2 -->|2. マージ| DEV
    +  PRS["採用 PR<br/>(セキュリティ・認証を先に)"] -->|3. PR と Codex レビュー| DEV
    +  UP3 -.->|参照のみ| DEV
    +  DEV -->|"名前と SHA"| MAN["manifest/upstreams.json<br/>(公開リポジトリ)"]
    +

    4. 結果

    +
      +
    • 良い点: 「公開+非公開+採用 PR」を解く場所が部品ごとに一つになる。インストーラーは名前と SHA だけで足りる。日次ミラーで差分が小さく保たれる。履歴が完全で監査できる。
    • +
    • 良い点: 既存リポジトリへの新しい権限を求めずに、書込の境界を守れる。
    • +
    • コスト: 見守るリポジトリが 11 本増える。SPEC-05 の自動化と進捗ボードで和らげる。
    • +
    • コスト: -dev2027 は非公開のため、GitHub Actions の実行時間とセルフホストランナーの利用が Team プランの枠を使う。受け入れる。
    • +
    • リスク — 公開のこのリポジトリへの漏えい。 -dev2027 や -private からファイル、スタックトレース、URL を一つ不注意に写すだけで、非公開のセキュリティ作業が公開されます。対策: CI の秘密スキャンを必須にする。レビュワはこのリポジトリへの全 PR で非公開のパスと URL を確かめる。manifest のスキーマは名前・ブランチ・SHA・日付・PR 番号しか許さない。文書は非公開リポジトリを名前で呼び、リンクしない(SPEC-06 §5)。
    • +
    • リスク — 公開と非公開のずれ。 2026-11-05 時点で公開 RDM-osf.io の develop は -private より新しかった。統合順(公開を先、次に非公開)と日次ミラーにより、こうしたずれは黙った上書きではなくマージとして見えます。
    • +
    • 未決: RDM-osf.io-develop-private とは別物の RDM-osf.io-private(ブランチ fix/sec-test)の扱い。upstream/private-sec-test-fix-sec-test としてミラーし、manifest には status: candidate で載せています(SPEC-01 §4 の規則 6)。マージするかは所有者が決めます。
    • +
    +
    +

    5. 統合順の初回構築(2026-11-05 決定: 厳密に再構築する)

    +

    状態: 所有者は「-private の先端を起点にして、より新しい公開の先端をマージする」という解釈の提案を 退けた(RDM-osf.io-dev2027 PR #1 のレビュー r1/r2、指摘 R2)。SPEC-01 §4 の統合順は、初回構築にも文字どおり適用する。

    +

    各 -dev2027 リポジトリの手順:

    +
      +
    1. upstream/public-<branch> の先端からブランチ integrate/strict-<YYYYMMDD> を切る。
    2. +
    3. そこへ upstream/private-<branch> を通常の 2 親マージ(--no-ff)で取り込み、衝突はそのブランチ上で解消する。
    4. +
    5. manifest の採用 PR を、それぞれ独立したマージとして再適用する。
    6. +
    7. そのブランチから develop へ PR を出す。develop は force push も削除もしない。この PR は以前の統合 PR を置き換え、以前の PR は新しい PR を示すコメントを付けて閉じる。
    8. +
    9. REV のレビュー、QAE の検査、所有者のマージ(ADR-04)。
    10. +
    +

    結果: 各リポジトリの最初の develop(初回構築で -private の先端から作ったもの)は履歴に残る。厳密に再構築したブランチはその上にマージされるので、最初の厳密マージ以降、どの develop も「公開が先」の順序を持つ。

    +
    +

    Glossary / 用語

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    TermEnglish note日本語注
    ForkYour own copy of someone's repository that remembers where it came from.他人のリポジトリの自分用の写し。出どころを覚えている。
    MirrorAn identical copy that is refreshed automatically.自動で更新される、そっくり同じ写し。
    Pull request (PR)A proposed change waiting for someone to review and accept it.誰かが見て受け入れるのを待っている、変更の提案。
    PatchA small text file that describes a change to code.コードの変更内容を書いた小さな文字ファイル。
    Force pushOverwriting shared history; forbidden here.共有の履歴の上書き。ここでは禁止。
    +

    Full shared glossary: REF-01 Glossary.

    + + + + + + + + + + + + + +
    +
    + + + +
    + +
    + + + +
    +
    +
    +
    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/decisions/ADR-02_Network_Model/index.html b/site/decisions/ADR-02_Network_Model/index.html new file mode 100644 index 0000000..6ca457e --- /dev/null +++ b/site/decisions/ADR-02_Network_Model/index.html @@ -0,0 +1,2964 @@ + + + + + + + + + + + + + + + + + + + + + + + ADR-02 Network Model / ネットワーク方式 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + + + + +
    + + +
    + +
    + + + + + + + + + +
    +
    + + + +
    +
    +
    + + + + + + + +
    +
    +
    + + + +
    +
    +
    + + + +
    +
    +
    + + + +
    +
    + + + + + + + +

    ADR-02 Network Model / ネットワーク方式

    +
    +

    Summary: We drop the upstream loopback alias 192.168.168.167 (which needed sudo and exposed services to the local network) and use the Docker Compose internal network for service-to-service traffic plus 127.0.0.1-only publishing for the browser. +概要: 上流のループバック別名 192.168.168.167(sudo が要り、サービスを LAN に露出した)をやめ、サービス間は Docker Compose の内部ネットワーク、ブラウザ向けは 127.0.0.1 だけへの公開にする。

    +
    +

    Jump: English · 日本語

    +
      +
    • Version / 版: 0.2 — 2026-11-05. Learned: Docker cannot publish ports from an internal network, so "one internal network" became two networks with an explicit egress switch (PR #21 review r1, finding 8). / Docker は内部ネットワークからポートを公開できないため、「内部ネットワーク一つ」は二つのネットワークと明示的な egress の切替になった(PR #21 レビュー r1、指摘 8)。 + 0.1 — 2026-11-05. Learned: the alias existed only so that one address worked both inside containers and in the browser; once services talk by Compose service name and the browser talks to 127.0.0.1, no shared address is needed and the sudo step disappears with it. / 別名は「一つのアドレスがコンテナの中でもブラウザでも通る」ためだけに存在していた。サービス間が Compose のサービス名で、ブラウザが 127.0.0.1 で話せば共通アドレスは不要になり、sudo の手順も一緒に消えると分かった。
    • +
    • Status: Accepted by the owner, 2026-11-05 (plan-interview).
    • +
    • Records a decision for: POL-01 §5 · SPEC-02 Installer CLI · SPEC-03 Security Gate
    • +
    • Related: docs/README.md · SPEC-00 Overview · SPEC-04 Acceptance Tests · ADR-01 · ADR-03 · REF-01 Glossary · legacy guide docs/guides/environment/README.md (moved from Environment.md)
    • +
    +
    +

    +

    English

    +

    → 日本語版へ

    +

    1. Context

    +

    The upstream docker-compose.yml of RDM-osf.io and its README-docker-compose.md ask the developer to add 192.168.168.167 as an alias (an extra name or address for the same thing) on the loopback interface (the network path that leads back to your own computer; 127.0.0.1 and localhost are its usual names). The alias is configured with administrator rights:

    +
      +
    • macOS: sudo ifconfig lo0 alias 192.168.168.167/24
    • +
    • Linux: an interface configuration or ip addr add with sudo
    • +
    • Windows: netsh interface ip add address "Loopback" 192.168.168.167 255.255.255.0 as administrator
    • +
    +

    The reason is a single address that works in two places. Containers (boxes that hold one program and everything it needs) talk to each other — the web service calls wb (waterbutler), mfr and fakecas; the browser on the host also needs those addresses in redirects and in JavaScript. Giving the host a fixed alias and publishing every port (a numbered door on an address through which one program listens) on 0.0.0.0 made both paths use one address.

    +

    This conflicts with three rules of the 2027 environment (POL-01):

    +
      +
    1. localhost only — nothing listens on an address reachable from the local network;
    2. +
    3. no LAN exposure — 0.0.0.0 publishing is not allowed, because a development instance with EOL components must never be reachable by a neighbour on the same Wi-Fi;
    4. +
    5. no sudo — the installer runs as an ordinary user, so it is safe to run on a laptop managed by someone else and simple to run in CI.
    6. +
    +

    The alias also fails in practice: it disappears after reboot on macOS, Windows setups were never confirmed, and port 5000 collides with macOS AirPlay Receiver on macOS 15 and later (the legacy guide already recommends remapping it).

    +

    2. Options considered

    +
    options[3]{id,option,needs_sudo,lan_exposure,matches_upstream_docs,test_matrix,verdict}:
    +  A,"Keep the 192.168.168.167 loopback alias as upstream does",yes,yes,yes,1,rejected
    +  B,"Drop the alias: Compose internal network for services, 127.0.0.1 publishing for the browser",no,no,no,1,chosen
    +  C,"Support both, selected by --legacy-network",partly,partly,partly,2,rejected
    +
      +
    • A keeps upstream documents literally true but violates all three rules above. Rejected.
    • +
    • C doubles the test matrix (every acceptance test twice) and keeps sudo code paths alive in the installer. Rejected; a developer who really needs the alias can still follow the upstream README by hand, outside the installer.
    • +
    +

    3. Decision

    +
      +
    1. Service-to-service traffic uses the internal Compose network grdm (internal: true). Every service addresses another by its Compose service name (web, api, wb, mfr, fakecas, cas, postgres, elasticsearch, rabbitmq, redis, mongo); Docker's built-in DNS resolves them, no fixed IP addresses. An internal network has no egress. Browser-facing services are additionally attached to the plain bridge grdm-edge, from which their ports are published on 127.0.0.1 (decision 2). A service that needs the Internet is attached to grdm-edge explicitly with compose render --egress, recorded in runtime/.env (GRDM_EGRESS_SERVICES); the default grants none.
    2. +
    3. Browser-facing traffic is published on 127.0.0.1 only. The generated Compose file writes 127.0.0.1:<host-port>:<container-port>, never 0.0.0.0 or a bare port. The default host ports are defined once, in the ports table of SPEC-02 §4 (5000 web, 8000 api, 8001 admin, 7777 wb, 7778 mfr, 8080 fakecas, 4200 ember). The installer checks each port is free and remaps on collision (macOS AirPlay on 5000 is the known case), recording the mapping in runtime/.env and the install report.
    4. +
    5. Settings that differ from upstream documents are rewritten by the installer, not by hand:
    6. +
    7. website/settings/local.py and api/base/settings/local.py: DOMAIN, API_DOMAIN, WATERBUTLER_URL, MFR_SERVER_URL, CAS_SERVER_URL and similar — the internal URLs use service names, the external (browser) URLs use http://127.0.0.1:<port>/;
    8. +
    9. .docker-compose.env, .docker-compose.wb.env, .docker-compose.mfr.env, .docker-compose.sharejs.env: hostnames and ports as above; secrets are random values generated at install time (SPEC-03);
    10. +
    11. runtime/docker-compose.yml is generated from the manifest and the host profile (SPEC-02 §3); the upstream docker-compose.yml files in the integration repositories are left untouched so upstream diffs stay clean.
    12. +
    13. grdm-dev health --network fails if any container port is listening on an address other than 127.0.0.1 on the host (SPEC-04).
    14. +
    15. Browser behaviour: acceptance tests and users open http://127.0.0.1:5000/. localhost is accepted as an equivalent in docs, but the installer writes 127.0.0.1 to avoid IPv6 ::1 surprises in Node-based services.
    16. +
    +
    flowchart LR
    +  subgraph OLD["Old: loopback alias (upstream)"]
    +    H1["Host: sudo ifconfig lo0 alias<br/>192.168.168.167"]
    +    B1["Browser → 192.168.168.167:5000"]
    +    W1["web"] -->|"192.168.168.167:7777"| WB1["wb"]
    +    W1 -->|"192.168.168.167:8080"| FC1["fakecas"]
    +    B1 --> W1
    +    H1 -. "0.0.0.0 publishing<br/>reachable from LAN" .-> W1
    +  end
    +  subgraph NEW["New: internal network + 127.0.0.1 (chosen)"]
    +    B2["Browser → 127.0.0.1:5000"]
    +    subgraph NET["compose network (private DNS)"]
    +      W2["web"] -->|"http://wb:7777"| WB2["wb"]
    +      W2 -->|"http://fakecas:8080"| FC2["fakecas"]
    +    end
    +    B2 -->|"127.0.0.1:5000 → web"| W2
    +    B2 -->|"127.0.0.1:7777 → wb"| WB2
    +  end
    +

    4. Consequences

    +
      +
    • +

      Exposure to be aware of. The seven browser-facing services (web, api, admin, wb, mfr, fakecas, ember_osf_web) sit on the ordinary bridge grdm-edge so that their ports can be published; on that network they also have outbound access to the Internet. All other services have no egress by default. Add-on development against external providers from a non-publishing service requires compose render --egress <service>; every grant, implicit or explicit, is visible to the security gate.

      +
    • +
    • +

      Good: no sudo, nothing survives a reboot that must be redone, nothing is reachable from the LAN, the same Compose file works on macOS, Ubuntu and WSL2, and CI can run it unmodified.

      +
    • +
    • Good: fewer moving parts for the security gate — the "listening address" check in SPEC-03 becomes a one-line rule.
    • +
    • Cost — divergence from upstream documents. README-docker-compose.md in the public cores still describes the alias. Every place where our settings differ is explained in the environment guide at docs/guides/environment/README.md, with a table "upstream says / we do / why". Developers who copy commands from upstream must read that table first.
    • +
    • Cost — redirects and absolute URLs. OSF builds absolute URLs from DOMAIN and API_DOMAIN; if a service receives an internal name and echoes it to the browser, the browser cannot resolve it. The installer therefore separates internal and external URL settings, and the acceptance tests include a redirect-chain check (login via fakecas, file download via wb, preview via mfr).
    • +
    • Cost — Chrome cookie sharing. The legacy guide noted that Chrome did not share cookies between fakecas and the web UI under the alias. With everything on 127.0.0.1 and distinct ports, cookies are per host, so the same caution applies; the login scenario of the acceptance tests (Chromium, SPEC-04 §1) catches it.
    • +
    • Not provided: access from another machine on the LAN (for example, testing from a phone). If needed later, it is a separate, explicit decision, not a flag.
    • +
    +
    +

    +

    日本語

    +

    → To English

    +

    1. 背景

    +

    RDM-osf.io の上流 docker-compose.yml と README-docker-compose.md は、開発者に 192.168.168.167 を「ループバック」(自分の計算機へ戻ってくるネットワークの道。普段は 127.0.0.1 や localhost と呼ぶ)の「別名」(同じものに付ける追加の名前やアドレス)として足すよう求めます。この設定には管理者権限が要ります。

    +
      +
    • macOS: sudo ifconfig lo0 alias 192.168.168.167/24
    • +
    • Linux: インタフェース設定ファイル、または sudo 付きの ip addr add
    • +
    • Windows: 管理者で netsh interface ip add address "Loopback" 192.168.168.167 255.255.255.0
    • +
    +

    理由は、一つのアドレスを二つの場所で通すためです。「コンテナ」(一つのプログラムと必要なものを入れた箱)同士が話す — web が wb(waterbutler)、mfr、fakecas を呼ぶ — 一方で、ホストのブラウザも転送先や JavaScript の中でそのアドレスを必要とします。ホストに固定の別名を付け、全「ポート」(一つのアドレスに付いた番号付きの扉。プログラムはここで待つ)を 0.0.0.0 で公開すれば、両方の道が一つのアドレスで済んだのです。

    +

    これは 2027 版の三つの規則(POL-01)と衝突します。

    +
      +
    1. localhost のみ — LAN から届くアドレスで待つものを置かない。
    2. +
    3. LAN への露出なし — 0.0.0.0 での公開は認めない。EOL 部品を含む開発インスタンスが、同じ Wi-Fi の隣人から届いてはならない。
    4. +
    5. sudo 不要 — インストーラーは一般ユーザーで動く。他人が管理するノート PC でも安全に、CI でも簡単に動かせる。
    6. +
    +

    別名は実務でもつまずきます。macOS では再起動で消え、Windows は動作未確認で、ポート 5000 は macOS 15 以降の AirPlay レシーバーと衝突します(旧手引きが既に付け替えを勧めています)。

    +

    2. 検討した選択肢

    +
    options[3]{id,option,needs_sudo,lan_exposure,matches_upstream_docs,test_matrix,verdict}:
    +  A,"上流どおり 192.168.168.167 のループバック別名を維持",yes,yes,yes,1,不採用
    +  B,"別名を廃止。サービス間は Compose 内部ネットワーク、ブラウザ向けは 127.0.0.1 で公開",no,no,no,1,採用
    +  C,"両対応。--legacy-network で切替",partly,partly,partly,2,不採用
    +
      +
    • A は上流文書を文字どおり正しいままにしますが、上の三つの規則をすべて破ります。不採用。
    • +
    • C は試験の組み合わせを倍にし(全受入試験を二度)、インストーラーに sudo の経路を残します。不採用。本当に別名が要る開発者は、インストーラーの外で上流 README を手で追えます。
    • +
    +

    3. 決定

    +
      +
    1. サービス間通信は内部 Compose ネットワーク grdm(internal: true)を使う。 各サービスは相手を Compose のサービス名(web、api、wb、mfr、fakecas、cas、postgres、elasticsearch、rabbitmq、redis、mongo)で呼び、Docker 内蔵の DNS(名前をアドレスに変える電話帳)が解決する。固定 IP は使わない。内部ネットワークには外向き通信がない。ブラウザ向けサービスは通常の bridge grdm-edge にも接続し、そこから 127.0.0.1 にポートを公開する(決定 2)。インターネットが必要なサービスは compose render --egress で明示的に grdm-edge へ接続し、runtime/.env(GRDM_EGRESS_SERVICES)に記録する。既定では何も与えない。
    2. +
    3. ブラウザ向けの公開は 127.0.0.1 だけ。 生成する Compose ファイルには 127.0.0.1:<ホスト側ポート>:<コンテナ側ポート> と書き、0.0.0.0 やポート番号だけの書き方はしません。既定のホスト側ポートは SPEC-02 §4 のポート表で一度だけ定めます(5000 web、8000 api、8001 admin、7777 wb、7778 mfr、8080 fakecas、4200 ember)。インストーラーは各ポートの空きを確かめ、衝突時(macOS の AirPlay と 5000 が既知)は付け替えて runtime/.env と導入報告書に記録します。
    4. +
    5. 上流文書と異なる設定は、手ではなくインストーラーが書き換える。
    6. +
    7. website/settings/local.py と api/base/settings/local.py: DOMAIN、API_DOMAIN、WATERBUTLER_URL、MFR_SERVER_URL、CAS_SERVER_URL およびその類。「内部」の URL はサービス名、「外部」(ブラウザ)の URL は http://127.0.0.1:<ポート>/。
    8. +
    9. .docker-compose.env、.docker-compose.wb.env、.docker-compose.mfr.env、.docker-compose.sharejs.env: ホスト名とポートは上記のとおり。秘密は導入時に乱数で生成(SPEC-03)。
    10. +
    11. runtime/docker-compose.yml は manifest とホストのプロファイルから生成(SPEC-02 §3)。統合リポジトリ内の上流の docker-compose.yml には触れず、上流との差分を汚しません。
    12. +
    13. grdm-dev health --network は、ホスト上で 127.0.0.1 以外のアドレスで待つコンテナのポートがあれば不合格にします(SPEC-04)。
    14. +
    15. ブラウザの挙動: 受入試験と利用者は http://127.0.0.1:5000/ を開きます。文書では localhost も同義として認めますが、Node 系サービスで IPv6 の ::1 に化ける事故を避けるため、インストーラーは 127.0.0.1 を書きます。
    16. +
    +
    flowchart LR
    +  subgraph OLD["旧: ループバック別名(上流)"]
    +    H1["ホスト: sudo ifconfig lo0 alias<br/>192.168.168.167"]
    +    B1["ブラウザ → 192.168.168.167:5000"]
    +    W1["web"] -->|"192.168.168.167:7777"| WB1["wb"]
    +    W1 -->|"192.168.168.167:8080"| FC1["fakecas"]
    +    B1 --> W1
    +    H1 -. "0.0.0.0 公開<br/>LAN から届く" .-> W1
    +  end
    +  subgraph NEW["新: 内部ネットワーク+127.0.0.1(採用)"]
    +    B2["ブラウザ → 127.0.0.1:5000"]
    +    subgraph NET["compose ネットワーク(内部 DNS)"]
    +      W2["web"] -->|"http://wb:7777"| WB2["wb"]
    +      W2 -->|"http://fakecas:8080"| FC2["fakecas"]
    +    end
    +    B2 -->|"127.0.0.1:5000 → web"| W2
    +    B2 -->|"127.0.0.1:7777 → wb"| WB2
    +  end
    +

    4. 結果

    +
      +
    • +

      知っておくべき露出。 ブラウザ向けの 7 サービス(web、api、admin、wb、mfr、fakecas、ember_osf_web)はポートを公開するために通常の bridge grdm-edge にいて、その網ではインターネットへの外向き通信もできる。それ以外のサービスには既定で外向き通信がない。公開しないサービスから外部プロバイダへ向かうアドオン開発には compose render --egress <service> が要り、暗黙・明示を問わずすべての付与はセキュリティの門から見える。

      +
    • +
    • +

      良い点: sudo が不要。再起動後にやり直す手順がない。LAN から届くものがない。同じ Compose ファイルが macOS・Ubuntu・WSL2 で動き、CI でもそのまま動く。

      +
    • +
    • 良い点: セキュリティ門の部品が減る。SPEC-03 の「待ち受けアドレス」の検査が一行の規則になる。
    • +
    • コスト — 上流文書との差。 公開コアの README-docker-compose.md は今も別名を説明しています。私たちの設定が異なる箇所はすべて docs/guides/environment/README.md の環境手引きで、「上流はこう/私たちはこう/理由」の表にして説明します。上流からコマンドを写す開発者は、まずその表を読みます。
    • +
    • コスト — 転送と絶対 URL。 OSF は DOMAIN と API_DOMAIN から絶対 URL を作ります。サービスが内部名を受け取ってブラウザへそのまま返すと、ブラウザは解決できません。そのためインストーラーは内部用と外部用の URL 設定を分け、受入試験に転送連鎖の確認(fakecas でのログイン、wb でのダウンロード、mfr でのプレビュー)を含めます。
    • +
    • コスト — Chrome の Cookie 共有。 旧手引きは、別名の下では Chrome が fakecas と Web UI の間で Cookie を共有しないと注意していました。すべて 127.0.0.1 で別ポートでも Cookie はホスト単位なので、同じ注意が残ります。受入試験のログインのシナリオ(Chromium。SPEC-04 §1)がこれを検出します。
    • +
    • 提供しないもの: LAN 上の別の計算機からのアクセス(例: スマートフォンからの確認)。後で必要になれば、フラグではなく別の明示的な決定にします。
    • +
    +
    +

    Glossary / 用語

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    TermEnglish note日本語注
    Loopback / localhostThe network path that leads back to your own computer; 127.0.0.1.自分の計算機へ戻ってくるネットワークの道。127.0.0.1。
    AliasAn extra name or address for the same thing.同じものに付ける追加の名前やアドレス。
    PortA numbered door on an address through which one program listens.アドレスに付いた番号付きの扉。プログラムはここで待つ。
    DNSThe phone book that turns a name into an address.名前をアドレスに変える電話帳。
    Docker ComposeA tool that starts many containers together from one file.一つのファイルから多くのコンテナをまとめて起こす道具。
    sudoRunning a command with administrator rights.管理者の権限でコマンドを動かすこと。
    +

    Full shared glossary: REF-01 Glossary.

    + + + + + + + + + + + + + +
    +
    + + + +
    + +
    + + + +
    +
    +
    +
    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/decisions/ADR-03_Staged_Security_Gate/index.html b/site/decisions/ADR-03_Staged_Security_Gate/index.html new file mode 100644 index 0000000..ec4e0f5 --- /dev/null +++ b/site/decisions/ADR-03_Staged_Security_Gate/index.html @@ -0,0 +1,3004 @@ + + + + + + + + + + + + + + + + + + + + + + + ADR-03 Staged Security Gate / セキュリティの門の段階化 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + + + + +
    + + +
    + +
    + + + + + + + + + +
    +
    + + + +
    +
    +
    + + + + + + + +
    +
    +
    + + + +
    +
    +
    + + + +
    +
    +
    + + + +
    +
    + + + + + + + +

    ADR-03 Staged Security Gate / セキュリティの門の段階化

    +
    +

    Summary: We want zero vulnerabilities that would resist a top-tier AI attacker, but every current base image is end-of-life. We decided on a gate that starts as "report plus a shrinking allow-list" at M1 and becomes "zero CRITICAL/HIGH plus a passing AI red team" at M5, instead of enforcing zero from the first day or warning forever. +概要: 最上位の AI 攻撃者にも耐える脆弱性ゼロを目指すが、現行のベースイメージはすべてサポート終了である。初日からゼロを強制する案も、ずっと警告だけの案も採らず、M1 では「報告+減っていく許容リスト」、M5 では「CRITICAL/HIGH ゼロ+AI レッドチーム合格」へ厳しくなる門を採った。

    +
    +

    Jump: English · 日本語

    + +
    +

    +

    English

    +

    → 日本語版へ

    +

    1. Context

    +

    The owner's final goal for the developer environment 2027 (POL-01) is to remove vulnerabilities (known weak spots that an attacker could use) until the system resists even a top-tier AI attacker, and to keep removing them with AI agents even if COS discontinues OSF. A security gate (a checkpoint an install must pass) is the tool that makes this measurable: see SPEC-03.

    +

    The starting point is far from zero. The base images (the ready-made operating system and language layers our containers are built on) used by the six core repositories are all end-of-life (EOL: the maker no longer publishes security fixes):

    +
    base_images_2026_11[9]{service,base,eol_status}:
    +  osf.io,"node:12 + Python 3.6",EOL
    +  waterbutler,"Python 3.6",EOL
    +  mfr,"Python 3.5",EOL
    +  ember-osf-web,"node:8",EOL
    +  cas-overlay,"JDK 8",EOL
    +  postgres,"9.6",EOL
    +  mongo,"3.4",EOL
    +  elasticsearch,"2.x",EOL
    +  elasticsearch,"6.3.1",EOL
    +

    A first Trivy scan of such a stack reports hundreds of CVEs, dozens of them HIGH or CRITICAL, and most of them cannot be fixed without the Python 3.13 port planned for M4 and the middleware consolidation planned for M5. If the gate demanded zero at M1, no install would ever complete, and we would have no running baseline to measure the acceptance tests of SPEC-04 against. On the other hand, a gate that only warns gives nobody a reason to fix anything, and the final goal would never be reached.

    +

    2. Options considered

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    OptionDescriptionWhy rejected / chosen
    A. Enforce zero from M1grdm-dev install stops on any HIGH or CRITICAL from the first day.Rejected. Every install would fail. There would be no running environment to port against, no regression baseline, and no evidence of what the fixes change.
    B. Warn only, foreverScan, print the counts, never stop.Rejected. Contradicts the owner's goal. The counts would stay high because nothing forces them down. Overseas distribution (M5) would ship known weaknesses.
    C. Staged gate with a shrinking allow-list (chosen)M1–M3: baseline controls are mandatory; CVEs are reported and listed in an allow-list whose entry count must never grow between milestones. M4: fail on HIGH/CRITICAL not allow-listed; first AI red team. M5: fail on any CRITICAL/HIGH; AI red team reports zero unresolved intrusion paths.Chosen. Installs run from day one, the direction of travel is enforced by the never-increasing count, and the final state equals the owner's goal.
    +

    A variant of C that counted only CRITICAL at M4 was considered and dropped: the Python 3.13 port removes most HIGH findings at the same time, so splitting the threshold would buy nothing.

    +

    3. Decision

    +
      +
    1. The gate follows the schedule in SPEC-03 §5.2. The current milestone is stored in manifest/milestone.json and only the owner changes it.
    2. +
    3. The baseline controls of SPEC-03 §3 (random secrets with mode 0600, publish only on 127.0.0.1, internal network, non-root, no privileged, resource limits, pinned digests, secret scanning in CI) have no stage and no allow-list. They fail the gate at every milestone, including M1.
    4. +
    5. The allow-list (manifest/allowlist.json) is the only way to pass a known finding. Every entry carries a CVE id, component, reason, owner, and expiry date. The entry count is compared with the previous milestone's baseline and must never increase. Only the owner approves additions.
    6. +
    7. From M4, any HIGH or CRITICAL finding not in the allow-list stops grdm-dev install with exit code 50 (SPEC-02).
    8. +
    9. At M5 and in steady state, CRITICAL and HIGH must be zero, the allow-list may contain no CRITICAL or HIGH entry, and the AI red team (SPEC-03 §6) must report zero unresolved intrusion paths.
    10. +
    11. The environment is documented as development-only and never exposed outside 127.0.0.1 while any allow-list entry exists (ADR-02).
    12. +
    +
    flowchart LR
    +    M1[M1<br/>report + allow-list created] --> M2[M2<br/>count ≤ M1]
    +    M2 --> M3[M3<br/>count ≤ M2]
    +    M3 --> M4[M4<br/>fail on HIGH/CRITICAL<br/>first AI red team]
    +    M4 --> M5[M5<br/>zero CRITICAL/HIGH<br/>red team: zero paths]
    +    M5 --> S[steady state<br/>daily scan, auto fix PR]
    +

    4. Consequences

    +

    Positive:

    +
      +
    • Installs work from M1, so acceptance tests and the Python 3.13 port have a running baseline.
    • +
    • Every milestone has a number the owner can check: the allow-list count, which may only go down.
    • +
    • The final state (M5) is exactly the owner's goal, written in a form that grdm-dev scan can verify.
    • +
    • The non-staged baseline controls mean that even an M1 install is not exposed to the LAN and has no default passwords.
    • +
    +

    Negative and how we handle them:

    +
      +
    • Between M1 and M3 the environment knowingly runs EOL software. We state this in every report header and in docs/README.md, and we keep the environment on 127.0.0.1 only.
    • +
    • The allow-list needs maintenance: expiry dates force re-evaluation at each milestone. AID (AI開発担当者) proposes, REV (担当レビュワ) and QAE (QA担当) check, the owner approves (ADR-04).
    • +
    • The jump from M3 to M4 is large. The M4 switch is therefore done only after the Python 3.13 port lands, and this decision is reviewed at the start of M4 (see §5).
    • +
    +

    5. Review

    +

    This decision is reviewed at the start of M4. Questions to answer then: whether the allow-list count has in fact decreased at M2 and M3; whether the M4 threshold should include MEDIUM for network-facing services; and which model and runner the AI red team uses (open item in POL-01).

    +
    +

    +

    日本語

    +

    → To English

    +

    1. 背景

    +

    開発環境 2027 版の所有者の最終ゴール(POL-01)は、「脆弱性」(攻撃者が侵入に使えると分かっている弱い所)を最上位の AI 攻撃者にも耐えるまで除去し、COS が OSF を廃止しても AI エージェントで除去を続けることです。「セキュリティの門」(導入が必ず通る検問所)は、これを測れるようにする道具です(SPEC-03)。

    +

    出発点はゼロから遠い所にあります。コア 6 本が使う「ベースイメージ」(コンテナの土台になる、出来合いの OS と言語の層)は、すべて「サポート終了」(EOL。作り手が安全上の修正を出さなくなった状態)です。

    +
    base_images_2026_11[9]{service,base,eol_status}:
    +  osf.io,"node:12 + Python 3.6",EOL
    +  waterbutler,"Python 3.6",EOL
    +  mfr,"Python 3.5",EOL
    +  ember-osf-web,"node:8",EOL
    +  cas-overlay,"JDK 8",EOL
    +  postgres,"9.6",EOL
    +  mongo,"3.4",EOL
    +  elasticsearch,"2.x",EOL
    +  elasticsearch,"6.3.1",EOL
    +

    この構成を Trivy で初めてスキャンすると数百件の CVE が出て、そのうち数十件が HIGH か CRITICAL で、大半は M4 予定の Python 3.13 移植と M5 予定のミドルウェア集約なしには直せません。門が M1 でゼロを求めれば、導入は一度も完了せず、SPEC-04 の受入試験を測る動く基準環境も得られません。逆に、警告だけの門では誰にも直す理由がなく、最終ゴールには永遠に届きません。

    +

    2. 検討した選択肢

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    選択肢内容退けた・採った理由
    A. M1 からゼロを強制初日から HIGH か CRITICAL が一件でもあれば grdm-dev install を止める。退けた。すべての導入が失敗する。移植の土台となる動く環境も、回帰の基準も、修正が何を変えたかの証拠も得られない。
    B. ずっと警告のみスキャンして件数を出すだけで、止めない。退けた。所有者のゴールと矛盾する。減らす力が働かず件数は高いまま。海外配布(M5)で既知の弱点を出荷することになる。
    C. 減っていく許容リスト付きの段階的な門(採用)M1〜M3: 基本対策は必須。CVE は報告し、節目をまたいで件数が増えない許容リストに載せる。M4: 許容リスト外の HIGH/CRITICAL で停止。初回の AI レッドチーム。M5: CRITICAL/HIGH が一件でもあれば停止。AI レッドチームが未解決の侵入経路ゼロを報告。採用。初日から導入が動き、「増えない件数」が進む方向を強制し、最終状態が所有者のゴールと一致する。
    +

    C の変種として、M4 では CRITICAL だけを数える案も検討して落としました。Python 3.13 移植が HIGH の大半も同時に取り除くため、基準を分けても得るものがないからです。

    +

    3. 決定

    +
      +
    1. 門は SPEC-03 §5.2 の予定表に従う。現在の節目は manifest/milestone.json に置き、変更できるのは所有者だけ。
    2. +
    3. SPEC-03 §3 の「基本対策」(乱数の秘密をモード 0600 で、127.0.0.1 のみ公開、内部ネットワーク、非 root、privileged なし、資源制限、ダイジェスト固定、CI での秘密スキャン)には段階も許容リストもない。M1 を含むすべての節目で門を落とす。
    4. +
    5. 既知の検出を通す唯一の方法は「許容リスト」(manifest/allowlist.json)。各項目は CVE 番号、部品、理由、担当、期限を持つ。件数は前の節目の基準と比べ、決して増えてはならない。追加の承認は所有者だけ。
    6. +
    7. M4 から、許容リストにない HIGH・CRITICAL の検出は grdm-dev install を終了コード 50 で止める(SPEC-02)。
    8. +
    9. M5 と恒常運用では、CRITICAL と HIGH はゼロ、許容リストに CRITICAL・HIGH の項目があってはならず、AI レッドチーム(SPEC-03 §6)が未解決の侵入経路ゼロを報告しなければならない。
    10. +
    11. 許容リストに項目がある間は、環境を開発専用と明記し、127.0.0.1 の外へ出さない(ADR-02)。
    12. +
    +
    flowchart LR
    +    M1[M1<br/>報告+許容リスト作成] --> M2[M2<br/>件数 ≤ M1]
    +    M2 --> M3[M3<br/>件数 ≤ M2]
    +    M3 --> M4[M4<br/>HIGH/CRITICAL で停止<br/>初回 AI レッドチーム]
    +    M4 --> M5[M5<br/>CRITICAL/HIGH ゼロ<br/>レッドチーム: 経路ゼロ]
    +    M5 --> S[恒常運用<br/>日次スキャン・自動修正 PR]
    +

    4. 結果

    +

    良い点:

    +
      +
    • M1 から導入が動くので、受入試験と Python 3.13 移植に動く基準環境がある。
    • +
    • 各節目に所有者が確かめられる数字がある。許容リストの件数で、減る方向にしか動かない。
    • +
    • 最終状態(M5)は所有者のゴールそのもので、grdm-dev scan が検証できる形で書かれている。
    • +
    • 段階のない基本対策により、M1 の導入でも LAN に露出せず、既定のパスワードもない。
    • +
    +

    悪い点とその扱い:

    +
      +
    • M1〜M3 の間、環境は承知の上でサポート終了のソフトを動かす。これを全報告のヘッダと docs/README.md に明記し、環境を 127.0.0.1 だけに留める。
    • +
    • 許容リストには手入れが要る。期限が各節目で再評価を強制する。AID(AI開発担当者)が提案し、REV(担当レビュワ)と QAE(QA担当)が確認し、所有者が承認する(ADR-04)。
    • +
    • M3 から M4 への段差が大きい。そのため M4 への切替は Python 3.13 移植が入った後にだけ行い、この決定を M4 の開始時に見直す(§5)。
    • +
    +

    5. 見直し

    +

    この決定は M4 の開始時に見直します。そのとき答える問い: M2・M3 で許容リストの件数が実際に減ったか。ネットワークに面するサービスについて M4 の基準に MEDIUM を含めるべきか。AI レッドチームに使うモデルと実行基盤をどうするか(POL-01 の未決事項)。

    +
    +

    Glossary / 用語

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    TermEnglish note日本語注
    End-of-life (EOL)The maker no longer publishes security fixes for that version.作り手がその版の安全上の修正を出さなくなった状態。
    Base imageThe ready-made OS and language layer a container is built on.コンテナの土台になる、出来合いの OS と言語の層。
    Allow-listKnown findings we accept for a limited time, with a reason and an owner.理由と担当を付けて期限付きで受け入れる既知の検出の一覧。
    ThresholdThe line that decides pass or fail.合格と不合格を分ける線。
    Exit codeThe number a program returns when it finishes; 0 means success.プログラムが終わるときに返す番号。0 は成功。
    + + + + + + + + + + + + + +
    +
    + + + +
    + +
    + + + +
    +
    +
    +
    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/decisions/ADR-04_AI_Autonomy_and_Roles/index.html b/site/decisions/ADR-04_AI_Autonomy_and_Roles/index.html new file mode 100644 index 0000000..03b27f5 --- /dev/null +++ b/site/decisions/ADR-04_AI_Autonomy_and_Roles/index.html @@ -0,0 +1,3293 @@ + + + + + + + + + + + + + + + + + + + + + + + ADR-04 AI Autonomy and Roles / AI の自律度と役割 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + + + + +
    + + +
    + +
    + + + + + + + + + +
    +
    + + + +
    +
    +
    + + + + + + + +
    +
    +
    + + + + + + + +
    +
    + + + + + + + +

    ADR-04 AI Autonomy and Roles / AI の自律度と役割

    +
    +

    Summary: AI agents detect vulnerabilities, write fix pull requests, review them, and run regression and acceptance tests on their own. Humans keep two actions: merge and publish. This record names who plays which role (AID, QAE, REV, owner), what the agents may never do, and the one question left open. +概要: AI エージェントは脆弱性の検出、修正 PR の作成、レビュー、回帰・受入試験の実行までを自律的に行う。人に残すのはマージと公開の二つ。誰がどの役割(AID・QAE・REV・所有者)を担うか、エージェントが決してしてはならないこと、残した一つの未決事項を記す。

    +
    +

    Jump: English · 日本語

    + +
    +

    +

    English

    +

    → 日本語版へ

    +

    1. Context

    +

    The owner's goal (POL-01) is that GRDM keeps being provided even if COS discontinues OSF, through continuous vulnerability remediation (finding and fixing weak spots again and again, every day, not once) done by AI agents (programs that read, write, and test code on their own when given a task). The security gate of SPEC-03 produces a daily list of findings; someone must turn each finding into a fix.

    +

    At the same time, the development policy POL-05 of the GRDM core repository, which this repository inherits, draws two lines that must not move:

    +
      +
    • An author never accepts their own work. The one who wrote a change does not judge whether it passes.
    • +
    • Merge and publish are human actions. No agent commits to the main branch or publishes an image or a release.
    • +
    +

    The question is how much of the path between "finding" and "merge" AI agents may walk alone.

    +

    2. Options considered

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    OptionDescriptionWhy rejected / chosen
    1. Detect onlyAgents scan and open issues; humans do everything else.Rejected. Does not scale to daily findings across eleven repositories. The owner would be the bottleneck, and the goal of continued provision without COS would not be met.
    2. Detect → fix PR → review → automatic regression and acceptance; humans merge and publish (chosen)Agents do all the work that produces evidence. Humans do the two actions that change what others receive.Chosen. Keeps both POL-05 lines intact. Author (AID), reviewer (REV), and judge (QAE) are three different agents, so no one accepts their own work. The owner sees a PR with review and test evidence attached and only decides.
    3. Auto-merge after reviewSame as 2, but the PR merges itself when review and tests pass.Rejected for now. Conflicts with POL-05 "merge by humans". A narrow exception for vulnerability-only fixes is kept as an open question (§5).
    +

    3. Decision

    +

    3.1 Roles

    +

    Role abbreviations follow the table in AGENTS.md. In records, write the abbreviation with the Japanese role name, for example AID(AI開発担当者).

    +
    roles[4]{abbr,ja_name,who,runs_on,does}:
    +  AID,AI開発担当者,"Orca Open Code 2 workers","local LLM Qwen 3 Coder Next (model id lmstudio/qwen3-coder-next-mlx)","implement to spec, write fix PRs, propose allow-list entries"
    +  QAE,QA担当,"Claude Code Fable","Claude Code session on Mac Studio","check implementations, run regression and acceptance (SPEC-04), judge pass/fail, write correction requests"
    +  REV,担当レビュワ,"Codex Astra (model id gpt-6-astra)","Orca worker","independent review of every PR; record in docs/reviews/ and as a PR comment"
    +  owner,所有者,"Yusuke Komiyama","human","merge, publish, exceptions, milestone changes, red-team approval"
    +

    The three agent roles are played by three different models on purpose, so that an error habit of one model is not shared by its reviewer or its judge.

    +

    3.2 Flow

    +
    flowchart LR
    +    S[grdm-dev scan<br/>daily finding] --> A[AID<br/>fix PR on a branch]
    +    A --> R[REV<br/>review → docs/reviews/ + PR comment]
    +    R -- changes requested --> A
    +    R -- approved --> Q[QAE<br/>regression + acceptance<br/>SPEC-04]
    +    Q -- fail → correction request --> A
    +    Q -- pass --> O[Owner<br/>merge]
    +    O --> P[Owner<br/>publish image / release]
    +
      +
    • Every step up to and including QAE's judgment is automatic and may run without a human present.
    • +
    • The owner merges with gh pr merge (Japanese subject) or declines. The owner publishes images to ghcr.io/rcosdp and tags releases.
    • +
    • Subagents (helper agents an agent starts to split its work) are unlimited in number. The role that started them is responsible for their output.
    • +
    +

    3.3 Evidence trail

    +

    Every PR carries, before the owner sees it:

    +
      +
    1. The finding it fixes (CVE id or scan report path from SPEC-03 §7).
    2. +
    3. REV's review record in docs/reviews/YYYY-MM-DD_<Title>_rN.md and the same text as a PR comment.
    4. +
    5. QAE's test record: the grdm-dev accept and grdm-dev scan TOON excerpts, pass or fail, and the commit SHA tested.
    6. +
    7. A Japanese commit subject with a scoped prefix (fix(security):).
    8. +
    +

    A PR without all four is not ready for the owner; QAE returns it to AID.

    +

    3.4 Forbidden for every agent

    +
      +
    • git push --force to any branch, ever.
    • +
    • Deleting branches, tags, repositories, images, or data of any kind.
    • +
    • Writing (push, PR creation, issue creation, comments) to any upstream repository: RCOSDP public cores, RCOSDP -private variants, or CenterForOpenScience. Agents write only to this repository and to the -dev2027 repositories.
    • +
    • Merging to develop or any protected branch; enabling auto-merge; changing branch protection.
    • +
    • Publishing images, releases, or documentation sites.
    • +
    • Copying -private code, secrets, or private repository URLs into this public repository (ADR-01).
    • +
    • Running red-team techniques against anything outside the isolated environment (SPEC-03 §6).
    • +
    +

    4. Consequences

    +
      +
    • Remediation keeps pace with daily scans without waiting for human working hours; the owner's work shrinks to reading evidence and clicking merge.
    • +
    • Three different models in three roles raise the cost of a shared blind spot and satisfy "no self-acceptance" structurally.
    • +
    • Local LLM workers (AID) have variable quality. The spec-first rule (specifications in docs/spec/ are written before work is handed to AID) and the QAE check are the compensation. A PR that fails QAE twice is closed and restarted from the spec.
    • +
    • Running three agent systems costs Mac Studio resources. Concurrency of Open Code 2 workers is an open item of POL-01.
    • +
    • Review time from the owner is the only remaining latency. If it becomes the bottleneck for vulnerability fixes, §5 is revisited.
    • +
    +

    5. Open question

    +

    Should vulnerability-only fixes be allowed to auto-merge after REV approval and QAE pass? Arguments for: faster closure of HIGH findings in steady state. Arguments against: POL-05 keeps merge human; a wrong automatic merge in a security path is the most expensive kind of error. Decision deferred until steady-state operation has run for about one month and the owner has seen the real volume and quality of fix PRs. Until then, option 2 stands as written.

    +
    +

    Recorded exceptions

    + + + + + + + + + + + + + + + + + + + +
    DateExceptionScopeGranted byEvidence
    2026-11-05QAE (Claude Code Fable) merges PR #19 of RDM-developer-guide itself, using the repository administrator path of the branch protection because the author cannot approve its own pull requestThis one pull request only. Merge, not approve; no other repositoryOwner, in the session dialogueREV r3 record docs/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3.md (approve recommended), CI 6/6 green on the merged head
    +

    The rule "merge and publish are human" is unchanged; every further merge needs its own recorded exception or the owner's hand.

    +
    +

    +

    日本語

    +

    → To English

    +

    1. 背景

    +

    所有者のゴール(POL-01)は、COS が OSF を廃止しても、「AI エージェント」(課題を与えると自分でコードを読み・書き・試すプログラム)による「継続的な脆弱性対応」(弱い所を一度でなく毎日くり返し見つけて直すこと)で GRDM の提供を続けることです。SPEC-03 の門は毎日検出の一覧を出します。誰かがその一件一件を修正に変えなければなりません。

    +

    一方で、このリポジトリが継承する GRDM コアの開発方針 POL-05 は、動かしてはならない二本の線を引いています。

    +
      +
    • 作者は自分の成果を受け入れない。 変更を書いた者が合否を判定しない。
    • +
    • マージと公開は人の操作。 どのエージェントも主ブランチにコミットせず、イメージやリリースを公開しない。
    • +
    +

    問いは、「検出」から「マージ」までの道のどこまでを AI エージェントが一人で歩いてよいかです。

    +

    2. 検討した選択肢

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    選択肢内容退けた・採った理由
    1. 検出のみエージェントはスキャンして issue を開き、残りは人が行う。退けた。11 本のリポジトリで毎日出る検出に追いつかない。所有者がボトルネックになり、COS なしで提供を続けるゴールに届かない。
    2. 検出 → 修正 PR → レビュー → 回帰・受入の自動実行。マージと公開は人(採用)証拠を作る仕事はすべてエージェントが行う。他者が受け取るものを変える二つの操作だけを人が行う。採用。POL-05 の二本の線をそのまま守れる。作者(AID)、レビュワ(REV)、判定者(QAE)が別々のエージェントなので、誰も自分の成果を受け入れない。所有者はレビューと試験の証拠が付いた PR を見て、決めるだけでよい。
    3. レビュー後に自動マージ2 と同じだが、レビューと試験に合格すると PR が自分でマージされる。今は退けた。POL-05 の「マージは人」と衝突する。脆弱性修正だけの狭い例外は未決事項として残す(§5)。
    +

    3. 決定

    +

    3.1 役割

    +

    役割の略称は AGENTS.md の対応表に従います。記録では AID(AI開発担当者) のように略称と日本語の役割名を併記します。

    +
    roles[4]{abbr,ja_name,who,runs_on,does}:
    +  AID,AI開発担当者,"Orca の Open Code 2 ワーカー","ローカル LLM Qwen 3 Coder Next(モデル ID lmstudio/qwen3-coder-next-mlx)","仕様どおりの実装、修正 PR の作成、許容リスト項目の提案"
    +  QAE,QA担当,"Claude Code Fable","Mac Studio 上の Claude Code セッション","実装の検査、回帰・受入の実行(SPEC-04)、合否の判定、修正指示の作成"
    +  REV,担当レビュワ,"Codex Astra(モデル ID gpt-6-astra)","Orca ワーカー","全 PR の独立レビュー。docs/reviews/ と PR コメントに記録"
    +  owner,所有者,"込山悠介","人","マージ、公開、例外、節目の変更、レッドチームの承認"
    +

    三つのエージェントの役割を三つの異なるモデルに割り当てるのは意図的です。一つのモデルの間違いの癖を、そのレビュワや判定者が共有しないようにするためです。

    +

    3.2 流れ

    +
    flowchart LR
    +    S[grdm-dev scan<br/>日次の検出] --> A[AID<br/>ブランチに修正 PR]
    +    A --> R[REV<br/>レビュー → docs/reviews/+PR コメント]
    +    R -- 修正要求 --> A
    +    R -- 承認 --> Q[QAE<br/>回帰+受入<br/>SPEC-04]
    +    Q -- 不合格 → 修正指示 --> A
    +    Q -- 合格 --> O[所有者<br/>マージ]
    +    O --> P[所有者<br/>イメージ・リリースの公開]
    +
      +
    • QAE の判定までのすべての段階は自動で、人がいなくても動いてよい。
    • +
    • 所有者は gh pr merge(日本語の件名)でマージするか、却下する。所有者が ghcr.io/rcosdp にイメージを公開し、リリースにタグを付ける。
    • +
    • 「サブエージェント」(エージェントが仕事を分けるために起こす補助のエージェント)の数に制限はない。起こした役割がその成果に責任を持つ。
    • +
    +

    3.3 証跡

    +

    所有者が見る前に、すべての PR は次を持ちます。

    +
      +
    1. 直す検出(CVE 番号か、SPEC-03 §7 のスキャン報告のパス)。
    2. +
    3. REV のレビュー記録 docs/reviews/YYYY-MM-DD_<題>_rN.md と、同じ文の PR コメント。
    4. +
    5. QAE の試験記録: grdm-dev accept と grdm-dev scan の TOON 抄録、合否、試験したコミット SHA。
    6. +
    7. 接頭辞付きの日本語のコミット件名(fix(security):)。
    8. +
    +

    四つがそろわない PR は所有者に出す状態ではなく、QAE が AID へ戻します。

    +

    3.4 すべてのエージェントに禁止すること

    +
      +
    • どのブランチへも、いつでも、git push --force をしない。
    • +
    • ブランチ、タグ、リポジトリ、イメージ、あらゆるデータを削除しない。
    • +
    • 上流リポジトリ(RCOSDP の公開コア、RCOSDP の -private 版、CenterForOpenScience)へ書き込まない(push、PR 作成、issue 作成、コメント)。エージェントが書くのはこのリポジトリと -dev2027 群だけ。
    • +
    • develop や保護されたブランチへマージしない。自動マージを有効にしない。ブランチ保護を変えない。
    • +
    • イメージ、リリース、文書サイトを公開しない。
    • +
    • -private のコード、秘密、非公開リポジトリの URL をこの公開リポジトリに写さない(ADR-01)。
    • +
    • 隔離環境の外のどこにもレッドチームの手法を使わない(SPEC-03 §6)。
    • +
    +

    4. 結果

    +
      +
    • 修正が人の勤務時間を待たずに日次スキャンと同じ速さで進む。所有者の仕事は証拠を読んでマージを押すことに縮む。
    • +
    • 三つの役割に三つの異なるモデルを置くことで、共通の盲点が生まれにくくなり、「自己受入の禁止」が構造として満たされる。
    • +
    • ローカル LLM のワーカー(AID)は品質がばらつく。仕様先行の決まり(docs/spec/ の仕様を書いてから AID に渡す)と QAE の検査がその補いになる。QAE に二度落ちた PR は閉じ、仕様からやり直す。
    • +
    • 三つのエージェント体系を動かすと Mac Studio の資源を使う。Open Code 2 ワーカーの同時実行数は POL-01 の未決事項。
    • +
    • 残る待ち時間は所有者のレビュー時間だけ。それが脆弱性修正のボトルネックになったら §5 を見直す。
    • +
    +

    5. 未決事項

    +

    脆弱性修正だけの PR に、REV 承認と QAE 合格の後の自動マージを認めるか。 賛成の理由: 恒常運用で HIGH の検出をより早く閉じられる。反対の理由: POL-05 はマージを人に残している。セキュリティの経路での誤った自動マージは最も高くつく種類の誤りである。恒常運用を約一か月回し、所有者が修正 PR の実際の量と質を見てから決める。それまでは選択肢 2 を書いたとおりに適用する。

    +
    +

    記録した例外

    + + + + + + + + + + + + + + + + + + + +
    日付例外範囲許可者証跡
    2026-11-05QAE(Claude Code Fable)が RDM-developer-guide 自身の PR #19 をマージする。作者は自分の PR を承認できないため、ブランチ保護の管理者経路を使うこの PR 1 件のみ。承認ではなくマージ。他リポジトリには及ばない所有者(セッション内の対話)REV r3 記録 docs/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3.md(approve 推奨)、マージ対象 head で CI 6/6 合格
    +

    「マージと公開は人が行う」という規則は変わらない。以後のマージはそれぞれ例外の記録か所有者の手を要する。

    +
    +

    Glossary / 用語

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    TermEnglish note日本語注
    AI agentA program that reads, writes, and tests code on its own when given a task.課題を与えると自分でコードを読み・書き・試すプログラム。
    SubagentA helper agent that an agent starts to split its work.エージェントが仕事を分けるために起こす補助のエージェント。
    Pull request (PR)A proposed change that others can review before it joins the main code.主なコードに入る前に、他の人が確かめられる変更の提案。
    MergeJoining a reviewed change into the main branch.レビュー済みの変更を主ブランチに入れること。
    PublishMaking an image, release, or site available to others.イメージ、リリース、サイトを他の人が使える状態にすること。
    Force pushOverwriting shared history on a branch; it can erase other people's work.共有された履歴を上書きすること。他の人の作業を消すことがある。
    Self-acceptanceAn author judging that their own work passes.作者が自分の成果を合格と判定すること。
    + + + + + + + + + + + + + +
    +
    + + + +
    + +
    + + + +
    +
    +
    +
    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/decisions/index.html b/site/decisions/index.html new file mode 100644 index 0000000..7e4339a --- /dev/null +++ b/site/decisions/index.html @@ -0,0 +1,2924 @@ + + + + + + + + + + + + + + + + + + + + + + + Decision Records / 決定の記録 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + + + + +
    + + +
    + +
    + + + + + + + + + +
    +
    + + + +
    +
    +
    + + + + + + + +
    +
    +
    + + + + + + + +
    +
    + + + + + + + +

    Decision Records / 決定の記録

    +
    +

    Summary: Documents explaining why we chose one way and not another: integration repository placement, network model, staged security gate, AI autonomy and roles. Each record captures the context, options considered, and final decision. +概要: なぜその道を選び、ほかを選ばなかったかを説明する文書:統合リポジトリの置き場、ネットワーク方式、セキュリティ門の段階化、AI の自律度と役割。各記録は文脈、検討した選択肢、最終決定を捉えます。

    +
    +

    Jump: English · 日本語

    + +
    +

    +

    English

    +

    → 日本語版へ

    +

    1. What belongs here

    +

    A decision record (ADR) explains why we chose one way and not another. This folder contains:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    IDFilePurpose
    ADR-01ADR-01_Integration_Repository_Placement.mdWhere integration code lives: new private repos, not in this public repo.
    ADR-02ADR-02_Network_Model.mdDrop loopback alias 192.168.168.167; use Compose internal network and 127.0.0.1 only.
    ADR-03ADR-03_Staged_Security_Gate.mdGate starts as report-only at M1, becomes zero CRITICAL/HIGH plus red team pass at M5.
    ADR-04ADR-04_AI_Autonomy_and_Roles.mdAI detects, fixes, reviews, tests; humans merge and publish.
    +

    Future decision records may cover:

    + + + + + + + + + + + + + + + + + + + + + +
    TopicDescription
    ADR-05Repository branching strategy
    ADR-06Tool version policy (Docker, Python, Node.js)
    ADR-07Open source license compatibility
    +

    2. Creating a new decision record

    +
      +
    1. Name the file ADR-NN_<Title>.md (two-digit number, next available).
    2. +
    3. Follow SPEC-06 documentation conventions.
    4. +
    5. Include: context, options considered (use TOON if multiple), decision, rationale.
    6. +
    7. Link to related policies and specifications.
    8. +
    9. The owner approves.
    10. +
    +

    3. How decision records relate to other documents

    +
    flowchart TD
    +    P[Policy: position] --> A[Decision record: why we chose this]
    +    S[Spec: rules to implement] --> A
    +    A --> C[Code: implement the rule]
    +
    +

    +

    日本語

    +

    → To English

    +

    1. ここに属するもの

    +

    「決定の記録」(ADR)は、なぜその道を選び、ほかを選ばなかったかを説明する文書です。このフォルダには次が含まれます:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    IDファイル目的
    ADR-01ADR-01_Integration_Repository_Placement.md統合コードの置き場:新設非公開リポジトリ、この公開リポジトリには置かない。
    ADR-02ADR-02_Network_Model.mdループバック別名 192.168.168.167 を廃止;Compose 内部ネットワークと 127.0.0.1 のみを使う。
    ADR-03ADR-03_Staged_Security_Gate.md門は M1 では報告のみ、M5 で CRITICAL/HIGH ゼロ+レッドチーム合格へ。
    ADR-04ADR-04_AI_Autonomy_and_Roles.mdAI は検出・修正・レビュー・試験;人はマージと公開。
    +

    今後の決定記録として以下が考えられます:

    + + + + + + + + + + + + + + + + + + + + + +
    トピック説明
    ADR-05リポジトリのブランチ戦略
    ADR-06道具版方針(Docker、Python、Node.js)
    ADR-07オープンソースライセンスの互換性
    +

    2. 新しい決定記録をつくるには

    +
      +
    1. ファイル名を ADR-NN_<題>.md(2 桁の番号、次に空いているもの)にする。
    2. +
    3. SPEC-06 文書規約に従う。
    4. +
    5. 文脈、検討した選択肢(複数ある場合は TOON 使用)、決定、理由を含む。
    6. +
    7. 関連する方針と仕様へリンクする。
    8. +
    9. 所有者が承認。
    10. +
    +

    3. 決定記録が他の文書とどう関係するか

    +
    flowchart TD
    +    P[方針:立場] --> A[決定の記録:なぜこの道を選んだか]
    +    S[仕様:実装するルール] --> A
    +    A --> C[コード:ルールを実装]
    +
    +

    Glossary / 用語

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    TermEnglish note日本語注
    Decision record (ADR)A note explaining why we chose one way and not another.なぜその道を選び、ほかを選ばなかったかのメモ。
    ContextThe problem or situation that requires a decision.決定を必要とする問題や状況。
    Options consideredThe alternatives evaluated before choosing one.選択する前に評価した代替案。
    RationaleThe reasoning behind the final decision.最終決定の背後にある推論。
    PolicyA statement of our position on what we will and will not do.我々が何をし、何をしないかの立場。
    + + + + + + + + + + + + + +
    +
    + + + +
    + +
    + + + +
    +
    +
    +
    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/demo/20_core_install_mac_studio/index.html b/site/demo/20_core_install_mac_studio/index.html new file mode 100644 index 0000000..b4a3dff --- /dev/null +++ b/site/demo/20_core_install_mac_studio/index.html @@ -0,0 +1,2833 @@ + + + + + + + + + + + + + + + + + + + + + + + DEMO-20 Core Install on Mac Studio / Mac Studio でのコア導入記録 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + + + + +
    + + +
    + +
    + + + + + + + + + +
    +
    + + + +
    +
    +
    + + + + + + + +
    +
    +
    + + + + + + + +
    +
    + + + + + + + +

    DEMO-20 Core Install on Mac Studio / Mac Studio でのコア導入記録

    +
    +

    Summary: What actually happened when ./installer/install.sh --yes --no-open --profile core was run on the Mac Studio (Apple Silicon). One entry per run; nothing is edited after the fact. +概要: Mac Studio(Apple Silicon)で ./installer/install.sh --yes --no-open --profile core を実行したときに実際に起きたこと。実行ごとに 1 節。後から書き換えない。

    +
    +

    Jump: English · 日本語

    +
      +
    • Version / 版: 0.2 — 2026-11-05. Learned: emulation solves missing arm64 wheels but not a base image that current Docker refuses outright; that needs a prebuilt fallback until the Dockerfile is modernized. / エミュレーションは arm64 の wheel 不足を解くが、現行 Docker が取得そのものを拒むベースイメージには効かない。Dockerfile を近代化するまでは配布済みイメージの代替が要る。 + 0.1 — 2026-11-05. Learned: the first real run proved the stop-at-first-failure design and exposed that an EOL Python 3.5 image cannot be built for arm64, which the specifications had only predicted. / 最初の実行で「最初の失敗で止まる」設計が働くことと、EOL の Python 3.5 イメージは arm64 で組めないこと(仕様では予測だった)が実証された。
    • +
    • Normative source: SPEC-02 Installer CLI · SPEC-04 Acceptance Tests
    • +
    • Related: docs/demo/README.md · docs/status/README.md · ADR-03 Staged Security Gate
    • +
    +
    +

    +

    English

    +

    → 日本語版へ

    +

    Run 1 — 2026-11-05, branch feat/m2-installer (PR #21, before review fixes)

    +

    Host (from grdm-dev doctor): macOS 27.2, arm64, 128 GiB memory, Docker 29.5.2, Compose 5.6.0, buildx present. Supported, Docker OK.

    +
    run1:
    +  command: ./installer/install.sh --yes --no-open --profile core
    +  env: GRDM_WITH_ACCEPT=1
    +  result: exit 30 (image build failed)
    +  steps[5]{step,code,status}:
    +    doctor,0,ok
    +    plan,0,ok
    +    "secrets init",0,ok
    +    "compose render",0,ok
    +    build,30,failed
    +  images[3]{component,platform,status,note}:
    +    osf.io,linux/arm64,built,"2.92 GB; Debian buster archive packages (EOL base)"
    +    waterbutler,linux/arm64,built,1.28 GB
    +    modular-file-renderer,linux/arm64,build-failed,"pip: no matching distribution for pandas==0.25.1 on Python 3.5 / arm64"
    +

    What this proves:

    +
      +
    • The bootstrap (install.sh → .venv/ → grdm-dev install) works end to end on a clean macOS shell.
    • +
    • The sequence stops at the first failing step and returns that step's exit code (30), as SPEC-02 §2.1 requires; nothing was started.
    • +
    • The EOL base images (see ADR-03) are not only a security problem but a build problem on Apple Silicon.
    • +
    +

    Decision taken: components whose base cannot be built for arm64 (modular-file-renderer, ember-osf-web, cas-overlay) get build_platform: linux/amd64 in the manifest (SPEC-01) and run under emulation until M4 modernizes them. Run 2 will be recorded below after the review fixes land.

    +

    Run 2 — 2026-11-05, branch feat/m2-installer (after review fixes r1, commit 3149c76 + 1c2a925)

    +

    Same host. Changes since run 1: build_platform: linux/amd64 for modular-file-renderer, ember-osf-web and cas-overlay; two networks (grdm internal, grdm-edge publishing); PostgreSQL 9.6 auth-host=md5.

    +
    run2:
    +  command: ./installer/install.sh --yes --no-open --profile core
    +  result: exit 30 (image build failed)
    +  steps[5]{step,code,status}:
    +    "secrets init",0,"skipped (runtime/.env exists)"
    +    doctor,0,ok
    +    plan,0,ok
    +    "compose render",0,ok
    +    build,30,failed
    +  images[4]{component,platform,status,note}:
    +    osf.io,linux/arm64,built,cached from run 1
    +    waterbutler,linux/arm64,built,cached from run 1
    +    modular-file-renderer,linux/amd64,built,"emulated build succeeded (pandas 0.25.1 has an amd64 wheel)"
    +    ember-osf-web,linux/amd64,build-failed,"base image quay.io/centerforopenscience/ember-base is a Docker manifest v2 schema 1 image; current Docker refuses to pull it"
    +

    What this proves:

    +
      +
    • build_platform works: the component that could not be built for arm64 in run 1 now builds under emulation.
    • +
    • secrets init is idempotent (kept the existing runtime/.env), and re-rendering did not move ports.
    • +
    • The ember-osf-web Dockerfile cannot be built at all with current Docker, independent of CPU. This is a defect of the EOL base, to be fixed in the integration repository at M4.
    • +
    +

    Decision taken: add a documented, digest-pinned prebuilt_image fallback to the manifest (SPEC-01) for ember-osf-web until M4, using the distribution image the legacy guide relied on. Run 3 will be recorded below.

    +

    Evidence (run 1): full log kept in the session scratchpad only (contains package download noise, no secrets). The runtime/ directory on the Mac Studio holds .env (0600), the rendered Compose file and two built images; it is git-ignored.

    +
    +

    +

    日本語

    +

    → To English

    +

    第 1 回 — 2026-11-05、ブランチ feat/m2-installer(PR #21、レビュー修正前)

    +

    ホスト(grdm-dev doctor より): macOS 27.2、arm64、メモリ 128 GiB、Docker 29.5.2、Compose 5.6.0、buildx あり。対応ホスト、Docker 正常。

    +
    run1:
    +  command: ./installer/install.sh --yes --no-open --profile core
    +  env: GRDM_WITH_ACCEPT=1
    +  result: "終了コード 30(イメージのビルド失敗)"
    +  steps[5]{step,code,status}:
    +    doctor,0,ok
    +    plan,0,ok
    +    "secrets init",0,ok
    +    "compose render",0,ok
    +    build,30,failed
    +  images[3]{component,platform,status,note}:
    +    osf.io,linux/arm64,built,"2.92 GB。Debian buster のアーカイブからパッケージ取得(EOL ベース)"
    +    waterbutler,linux/arm64,built,1.28 GB
    +    modular-file-renderer,linux/arm64,build-failed,"pip: Python 3.5 / arm64 向けの pandas==0.25.1 が存在しない"
    +

    これで分かったこと:

    +
      +
    • ブートストラップ(install.sh → .venv/ → grdm-dev install)は、素の macOS のシェルで端から端まで動く。
    • +
    • 手順は最初に失敗した段階で止まり、その段階の終了コード(30)を返す。SPEC-02 §2.1 のとおりで、サービスは何も起動していない。
    • +
    • EOL のベースイメージ(ADR-03)は安全性の問題だけでなく、Apple Silicon ではビルドの問題でもある。
    • +
    +

    決めたこと: arm64 で組めない部品(modular-file-renderer、ember-osf-web、cas-overlay)は manifest に build_platform: linux/amd64 を持たせ(SPEC-01)、M4 で近代化するまでエミュレーションで動かす。第 2 回はレビュー修正の反映後に下へ追記する。

    +

    第 2 回 — 2026-11-05、ブランチ feat/m2-installer(レビュー r1 対応後、コミット 3149c76 + 1c2a925)

    +

    同じホスト。第 1 回からの変更: modular-file-renderer・ember-osf-web・cas-overlay に build_platform: linux/amd64、ネットワークを二つ(内部の grdm と公開用の grdm-edge)、PostgreSQL 9.6 の auth-host=md5。

    +
    run2:
    +  command: ./installer/install.sh --yes --no-open --profile core
    +  result: "終了コード 30(イメージのビルド失敗)"
    +  steps[5]{step,code,status}:
    +    "secrets init",0,"skipped(runtime/.env があるため)"
    +    doctor,0,ok
    +    plan,0,ok
    +    "compose render",0,ok
    +    build,30,failed
    +  images[4]{component,platform,status,note}:
    +    osf.io,linux/arm64,built,第 1 回のキャッシュ
    +    waterbutler,linux/arm64,built,第 1 回のキャッシュ
    +    modular-file-renderer,linux/amd64,built,"エミュレーションでのビルドに成功(pandas 0.25.1 に amd64 の wheel がある)"
    +    ember-osf-web,linux/amd64,build-failed,"ベースイメージ quay.io/centerforopenscience/ember-base が Docker の manifest v2 schema 1 形式で、現行 Docker は取得を拒否する"
    +

    これで分かったこと:

    +
      +
    • build_platform は働く。第 1 回で arm64 向けに組めなかった部品が、エミュレーションで組めた。
    • +
    • secrets init は冪等(既存の runtime/.env を保持)で、再描画でポートは動かなかった。
    • +
    • ember-osf-web の Dockerfile は CPU に関係なく現行 Docker ではまったく組めない。EOL ベースの欠陥であり、M4 で統合リポジトリ側を直す。
    • +
    +

    決めたこと: M4 まで、ember-osf-web には manifest の記録付き・ダイジェスト固定の prebuilt_image(旧ガイドが頼っていた配布イメージ)を使う(SPEC-01)。第 3 回は下へ追記する。

    +

    証跡(第 1 回): 全ログはセッションの作業領域にのみ保管(パッケージ取得の出力が大半で、秘密は含まない)。Mac Studio の runtime/ には .env(0600)、生成した Compose ファイル、ビルド済みイメージ 2 つがあり、git では無視される。

    +
    +

    Glossary / 用語

    + + + + + + + + + + + + + + + + + + + + +
    TermEnglish note日本語注
    EmulationRunning a program built for one kind of CPU on another kind, slower but working.ある種類の CPU 向けに作ったプログラムを別の CPU で動かすこと。遅いが動く。
    WheelA ready-made package of Python code for one CPU type; if none exists, pip must compile it.ある CPU 向けにできあがった Python の部品の箱。無いと pip が自分で組み立てる。
    + + + + + + + + + + + + + +
    +
    + + + +
    + +
    + + + +
    +
    +
    +
    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/demo/index.html b/site/demo/index.html new file mode 100644 index 0000000..d67b340 --- /dev/null +++ b/site/demo/index.html @@ -0,0 +1,2876 @@ + + + + + + + + + + + + + + + + + + + + + + + Demonstration Records / 実証記録 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + + + + +
    + + +
    + +
    + + + + + + + + + +
    +
    + + + +
    +
    +
    + + + + + + + +
    +
    +
    + + + + + + + +
    +
    + + + + + + + +

    Demonstration Records / 実証記録

    +
    +

    Summary: Records of what was actually done: acceptance runs, integration test results. Each record lives under demo/runs/ and includes results.toon, screenshots, and traces. +概要: 実際にやったことの記録:受入試験、統合試験結果。各記録は demo/runs/ の下にあり、results.toon、スクリーンショット、トレースを含みます。

    +
    +

    Jump: English · 日本語

    +
      +
    • Version / 版: 0.1 — 2026-11-05. Learned: a milestone can only be called passed if the acceptance run that passed it is recorded with its evidence; this folder is where that evidence lives. / 節目を「合格」と呼べるのは、合格した受入実行が証跡とともに記録されているときだけであり、その置き場がこのフォルダだと分かった。
    • +
    • Normative for: SPEC-04 Acceptance Tests, SPEC-03 Security Gate.
    • +
    • Related: ../README.md · status/ · demo/runs/
    • +
    +
    +

    +

    English

    +

    → 日本語版へ

    +

    1. What belongs here

    +

    A demo record documents what was actually done, including acceptance and integration tests. This folder contains:

    + + + + + + + + + + + + + +
    SubfolderPurpose
    runs/Individual run results: acc-<timestamp>-<6 hex>/ with evidence.
    +

    The record format is defined in SPEC-04 §7:

    +
    evidence:
    +  results.toon: one line per test with id, case, status, duration_ms, http_status
    +  results.json: same data, canonical
    +  junit.xml: for CI and GitHub checks tab
    +  screenshots/: <test>_<case>.png, taken only on failure
    +  trace/: Playwright trace zip, only on failure, kept 14 days in CI
    +

    2. Open items (no entries yet / まだありません)

    + + + + + + + + + + + + + + + +
    DateTitleStatus
    ———
    +

    3. Creating a new demo record

    +
      +
    1. Run grdm-dev accept (acceptance) or grdm-dev health --network (integration).
    2. +
    3. The record is written to docs/demo/runs/<run_id>/.
    4. +
    5. Link the run folder from status reports or milestone documents.
    6. +
    +
    +

    +

    日本語

    +

    → To English

    +

    1. ここに属するもの

    +

    「実証」記録は、実際にやったこと(受入試験、統合試験)を文書化します。このフォルダには次が含まれます:

    + + + + + + + + + + + + + +
    サブフォルダ目的
    runs/個別の実行結果:acc-<時刻>-<6 桁の16進>/ に証跡が置かれる。
    +

    記録形式は SPEC-04 §7 に定められています:

    +
    証跡:
    +  results.toon: 試験ごとに一行。id・case・status・duration_ms・http_status
    +  results.json: 同じデータの正本
    +  junit.xml: CI と GitHub の checks タブ向け
    +  screenshots/: <試験>_<ケース>.png。失敗時だけ撮る
    +  trace/: Playwright のトレース zip。失敗時だけ。CI では 14 日保持
    +

    2. 未解決項目(まだありません / no entries yet)

    + + + + + + + + + + + + + + + +
    日付タイトルステータス
    ———
    +

    3. 新しい実証記録をつくるには

    +
      +
    1. grdm-dev accept(受入)または grdm-dev health --network(統合)を実行する。
    2. +
    3. 記録は docs/demo/runs/<実行ID>/ に書かれる。
    4. +
    5. 状況報告や節目文書へ実行フォルダにリンクする。
    6. +
    +
    +

    Glossary / 用語

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    TermEnglish note日本語注
    Demo recordA document of what was actually done, including acceptance and integration tests.実際にやったこと(受入試験、統合試験)を文書化したもの。
    EvidenceFiles that prove a test run: results, screenshots, traces.試験実行を証明するファイル:結果、スクリーンショット、トレース。
    Acceptance testA check that the whole thing does what the user asked for.全体が利用者の望みどおりに動くかの確認。
    Integration testA check that several pieces work together.いくつかの部品が一緒に動くかの確認。
    + + + + + + + + + + + + + +
    +
    + + + +
    + +
    + + + +
    +
    +
    +
    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/demo/runs/index.html b/site/demo/runs/index.html new file mode 100644 index 0000000..face0a0 --- /dev/null +++ b/site/demo/runs/index.html @@ -0,0 +1,2803 @@ + + + + + + + + + + + + + + + + + + + + + + + Acceptance Run Records / 受入実行の記録 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + + + + +
    + + +
    + +
    + + + + + + + + + +
    +
    + + + +
    +
    +
    + + + + + + + +
    +
    +
    + + + +
    +
    +
    + + + +
    +
    +
    + + + +
    +
    + + + + + + + +

    Acceptance Run Records / 受入実行の記録

    +
    +

    Summary: Each run of grdm-dev accept writes its evidence into a folder here, named by run id. Nothing is here yet; the first records arrive at milestone M2. +概要: grdm-dev accept を実行するたびに、その証跡が実行 ID 名のフォルダとしてここに書かれます。まだ記録はなく、最初の記録は節目 M2 で作られます。

    +
    +

    Jump: English · 日本語

    +
      +
    • Version / 版: 0.2 — 2026-11-05. Learned: traces are raw and may hold secrets, so the public evidence folder keeps only screenshots and masked text (PR #21 review r2). / トレースは生で秘密を含み得るため、公開の証跡フォルダにはスクリーンショットとマスク済みの文字だけを置く(PR #21 レビュー r2)。 + 0.1 — 2026-11-05. Learned: the evidence folder must exist with a stated layout before the first run, so that SPEC-04 and the demo index can link to it. / 最初の実行の前に、証跡フォルダと決まった中身をここに書いておく必要があると分かった。SPEC-04 と実証の索引がリンクできるようにするためである。
    • +
    • Normative source: SPEC-04 Acceptance Tests
    • +
    • Related: docs/demo/README.md · docs/status/README.md
    • +
    +
    +

    +

    English

    +

    → 日本語版へ

    +

    What is stored here

    +

    Every run of the acceptance tests (automated browser tests that check the environment works, see SPEC-04) creates one folder runs/<run_id>/ with:

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    FileMeaning
    results.toonHuman- and AI-readable summary (TOON: a compact text form of JSON)
    results.jsonThe same data for machines (canonical)
    junit.xmlTest results in the format CI tools read
    screenshots/Only when a test failed: what the browser saw. Browser traces are not kept here; with --trace they go to runtime/reports/quarantine/<run_id>/, which is private and git-ignored
    +

    Records are written by grdm-dev accept; do not edit them by hand. No secrets are ever written here.

    +

    Current state

    +

    No runs yet. The first records are expected at milestone M2 (core services on Mac Studio).

    +
    +

    +

    日本語

    +

    → To English

    +

    ここに置くもの

    +

    受入試験(環境が動くことを確かめる自動のブラウザ試験。SPEC-04 参照)を実行するたびに、runs/<run_id>/ というフォルダが一つ作られ、次が入ります。

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    ファイル意味
    results.toon人と AI が読む要約(TOON: JSON を短い文字で表した形)
    results.json機械が読む同じデータ(正本)
    junit.xmlCI の道具が読む形式の試験結果
    screenshots/試験が失敗したときだけ: ブラウザが見ていた画面。ブラウザのトレースはここには置かない。--trace のときは runtime/reports/quarantine/<run_id>/(非公開、git 管理外)へ
    +

    記録は grdm-dev accept が書きます。手で編集しないでください。秘密情報はここに書かれません。

    +

    いまの状態

    +

    まだ実行はありません。最初の記録は節目 M2(Mac Studio でコアを起動)で作られる見込みです。

    +
    +

    Glossary / 用語

    + + + + + + + + + + + + + + + + + + + + +
    TermEnglish note日本語注
    Run idA short unique name for one test run, like a receipt number.一回の試験実行につける短い名前。レシート番号のようなもの。
    JUnit XMLA standard file format that test tools use to report pass/fail.試験の道具が合否を報告するときの標準の形式。
    + + + + + + + + + + + + + +
    +
    + + + +
    + +
    + + + +
    +
    +
    +
    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/guides/admin-addon/README.legacy/index.html b/site/guides/admin-addon/README.legacy/index.html new file mode 100644 index 0000000..6a5aaf3 --- /dev/null +++ b/site/guides/admin-addon/README.legacy/index.html @@ -0,0 +1,2842 @@ + + + + + + + + + + + + + + + + + + + + + + + アドオンの機関管理機能の利用 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + + + + +
    + + +
    + +
    + + + + + + + + + +
    +
    + + + +
    +
    +
    + + + + + + + +
    +
    +
    + + + +
    +
    +
    + + + +
    +
    +
    + + + +
    +
    + + + + + + + +

    アドオンの機関管理機能の利用

    +

    ユーザの所属機関が管理できる「機関管理機能」において、アドオンに関する機能(RDM Addon)について説明します。

    +

    具体的には、以下の方法を説明します。

    + +

    すべてのアドオンに共通する機関管理機能は、現在(2021年2月執筆時点)、アドオンの無効化機能のみです。機関ごとに、指定したアドオンを無効にすることができます。無効なアドオンは、ユーザーやプロジェクトのアドオン設定画面に表示されなくなり、利用もできなくなります。

    +

    前提条件

    +

    開発環境の準備 のガイドに従い、開発環境にてRDMを起動しているものとします。

    +
    +

    本ガイドでは機関管理機能を利用するため、admin と admin_assets サービスも起動してください。

    +
    +

    動作確認のためのユーザは、 開発環境の準備#ユーザを機関に所属させる および 開発環境の準備#adminアクセス可能なユーザへと変更する のガイドに従い、何かしらの機関に所属し、その機関の機関管理者であるとします。

    +

    アドオンの機関管理機能の設計

    +

    ファイルの構成

    +

    機関管理機能もアドオンと同様にDjangoアプリケーションの形式で記述されます。ただし、OSF.io本体やアドオンとは若干中身が異なります。

    +

    アドオンの機関管理機能(RDM Addon)の基本的なファイル配置は以下のようになります(Force to useに関するファイルは記載していません)。

    +
    /admin/
    +├── rdm_addons ... アドオンの機関管理機能のモジュール
    +│   ├── api_v1 ... APIモジュール
    +│   │   ├── __init__.py ... モジュールの定義
    +│   │   ├── urls.py ... APIのViewのルーティング定義
    +│   │   └── views.py ... APIのViewの定義
    +│   ├── __init__.py ... モジュールの定義
    +│   ├── decorators.py ... デコレーターの定義
    +│   ├── urls.py ... Viewのルーティング定義
    +│   ├── utils.py ... ユーティリティ関数の定義
    +│   └── views.py ... Viewの定義
    +├── static ... Webブラウザから読み込むことを想定した静的ファイル
    +│   ├── css/rdm_addons.css ... アドオンの機関管理機能設定のCSSファイル
    +│   └── rdm_addons ... アドオンの機関管理機能設定のJavaScriptディレクトリ
    +│       ├── アドオン名 ...アドオンごとのJavaScriptディレクトリ
    +│       │   ├── アドオン名RdmConfig.js ... アドオンごとの機関管理機能設定の定義
    +│       │   └── rdm-cfg.js ... アドオンごとの機関管理機能設定のエントリとなるJavaScriptファイル
    +│       ├── rdm-addons-page.js ... アドオンの機関管理機能設定のエントリとなるJavaScriptファイル
    +│       └── rdmAddonSettings.js ... アドオンの機関管理機能設定の定義
    +├── templates ... テンプレートディレクトリ
    +│   └── rdm_addons ... アドオンの機関管理機能設定のテンプレートディレクトリ
    +│       ├── addons ... アドオンごとのテンプレートディレクトリ
    +│       │   └── アドオン名_institution_settings.html ... アドオンの機関管理機能設定のテンプレートファイル
    +│       ├── addon_list.html ... アドオン一覧画面のテンプレートファイル
    +│       └── institution_list.html ... 機関一覧画面のテンプレートファイル
    +└── translations ... 国際化ディレクトリ
    +    ├── en/LC_MESSAGES ... 英語の国際化ディレクトリ
    +    │   └── django.po ... 機関管理画面のテンプレートの国際化設定ファイル
    +    ├── ja/LC_MESSAGES ... 日本語の国際化ディレクトリ
    +    │   └── django.po ... 機関管理画面のテンプレートの国際化設定ファイル
    +    └── django.pot ... 機関管理画面のテンプレートの国際化設定ファイル
    +
    +

    機関管理機能のモデル定義は /osf/models/ 以下に置きます。

    +
    /osf/models/
    +└── rdm_addons.py ... アドオンの機関管理機能設定のモデル定義
    +
    +

    JavaScriptで使う国際化設定は /website/translations/ 以下のファイルに記述します。

    +
    /website/translations/
    +├── en/LC_MESSAGES ... 英語の国際化ディレクトリ
    +│   └── js_messages.po ... 機関管理機能のJavaScriptで使う国際化設定ファイル
    +├── ja/LC_MESSAGES ... 日本語の国際化ディレクトリ
    +│   └── js_messages.po ... 機関管理機能のJavaScriptで使う国際化設定ファイル
    +└── js_messages.pot ... 機関管理機能のJavaScriptで使う国際化設定ファイル
    +
    +

    テストファイルは /admin_tests/ 以下に置きます。

    +
    /admin_tests/
    +└── rdm_addons ... アドオンの機関管理機能設定のテスト
    +    ├── api_v1
    +    │   ├── __init__.py
    +    │   └── test_views.py
    +    ├── __init__.py
    +    ├── factories.py
    +    └── test_views.py
    +
    +

    アドオンの機関管理機能のモジュール構成

    +

    アドオンと同様、Djangoの作法に従い、Model-Viewアーキテクチャにより実装します。

    +

    Modelの構成

    +

    機関ごとのアドオンの設定を保持する RdmAddonOption モデルおよび RdmAddonNoInstitutionOption モデルが osf/models/rdm_addons.py に定義されています。設定項目を追加する場合は、これらモデルを変更します。

    +

    Viewの構成

    +

    Viewの定義方法はアドオンと異なっているように見えますが、基本的な考え方は同じです。

    +

    ルーティング(アドオンにおけるroutes.py)は admin/rdm_addons/urls.py に定義し、各View処理は admin/rdm_addons/views.py に定義します。

    +

    APIに関するView定義は、 admin/rdm_addons/api_v1/urls.py と admin/rdm_addons/api_v1/views.py に定義します。

    +

    フレームワークによって提供されるView

    +

    HTMLテンプレートとJavaScriptの定義方法や、利用できるライブラリは、アドオンと似ています。

    +

    HTMLテンプレートファイルは admin/templates/rdm_addons/ 以下に配置します。拡張子が.htmlですが、アドオンと同様に、テンプレート言語 mako で記述します。
    +各アドオンに関する設定画面のテンプレートファイルは、デフォルトで admin/templates/rdm_addons/addons/institution_settings_default.html が使用されます。個別にテンプレートファイルを指定する方法は #UI の追加 で説明します。

    +

    各画面で読み込むJavaScriptファイルは admin/static/js/rdm_addons/ 以下に配置します。テンプレートを動的に操作するためのJavaScriptのライブラリには Knockout.js を利用することができます。
    +アドオンと違い、追加したエントリーファイルは admin/webpack.admin.config.js の entry プロパティに追加する必要があることに注意してください。設定方法は #UI の追加 で説明します。

    +

    各画面に関するスタイル定義は admin/static/css/rdm_addons.css にまとめて記述します。

    +
    +

    機関管理者画面では、ember-osf-webで利用できるようなUI Componentは提供されていませんが、 Bootstrap3 のCSSやコンポーネントを利用することができます。

    +
    +

    テストコード

    +

    テストコードは admin_tests/rdm_addons 以下に作成します。

    +

    Migrations定義

    +

    Migrationsファイルは osf/migrations 以下に作成されます。Migrationsファイルの構造はアドオンと同様です。

    +

    国際化

    +

    HTMLテンプレートで使う国際化設定は admin/translations/ 以下の django.pot および django.po に定義します。

    +

    JavaScriptで使う国際化設定は website/translations/ 以下の js_messages.pot および js_messages.po に定義します。

    +

    定義方法や使い方は、 ScreenExpansion#国際化 で説明しています。HTMLファイル内で文字列を国際化する方法は、makoと同様です。

    +
    +

    JavaScriptだけ、website/translations/ 以下のファイルに定義することに気をつけてください。

    +
    +

    スケルトン アドオンの機関管理機能の対応

    +

    myskelton という識別名のアドオンを、機関管理機能で管理するための実装を例に説明します。

    +

    スケルトンの作成#スケルトン アドオンの実装 に従い、スケルトン アドオンの実装が完了していることを前提とします。

    +

    addons.myskelton モジュールの変更

    +
    +

    ストレージアドオンの場合、この変更は不要です。

    +
    +

    機関管理機能で管理するアドオンは、AppConfig.config に accounts が含まれている必要があります。
    +AppConfig.config に accounts が含まれているアドオンは、ユーザのアドオンアカウント構成画面に表示され、デフォルトではOAuthの認証設定UIを含むテンプレートが参照されます。スケルトン アドオンは認証設定が不要なので、アドオン名を表示するだけのテンプレートを定義して、それを参照するようにします。

    +

    まずは user_settings.mako を addons/myskelton/templates/user_settings.mako に、user-cfg.js を addons/myskelton/static/user-cfg.js にコピーします。

    +

    次に、addons/myskelton/apps.py を以下のように変更します。
    +変更例はサンプル apps.py を参照してください。

    +
    class AddonAppConfig(BaseAddonAppConfig):
    +
    +-    configs = ['node']
    ++    configs = ['node', 'accounts']
    +
    +     node_settings_template = os.path.join(TEMPLATE_PATH, 'node_settings.mako')
    ++    user_settings_template = os.path.join(TEMPLATE_PATH, 'user_settings.mako')
    +
    +     # 他変更なし
    +
    +

    RDMコードの変更

    +

    admin/base/settings/defaults.py への追加

    +

    admin/base/settings/defaults.py の INSTALLED_APPS にアドオン名を、MIGRATION_MODULES にキーがアドオン名のプロパティを追加します。

    +
    +

    INSTALLED_APPS に追加する値は addons.アドオン名 ですが、MIGRATION_MODULES に追加するキー名は addons_アドオン名 です。. と _ の違いに注意してください。

    +
    +

    デフォルトでは、Force to useという、機関に属するプロジェクトでアドオンを強制的に有効にする機能が利用できます。しかし、この機能を利用するためには、認証情報を保存するための仕組みをアドオンに実装しておく必要があります。スケルトン アドオンは認証情報を持たないため、UNSUPPORTED_FORCE_TO_USE_ADDONS にアドオン名を追加し、この機能を無効にします。

    +

    実装例はサンプル defaults.py を参照してください。

    +

    スケルトン アドオンの機関管理機能の動作確認

    +

    スケルトン アドオンを機関管理機能で管理してみましょう。

    +

    変更したファイルに関連するサービスを再起動します。

    +
    $ docker compose restart web api assets admin
    +
    +

    これでサービスへの反映は完了です。機関管理機能でスケルトン アドオンの設定を変更できることを確認するには、以下のような操作を実施します。

    +
      +
    1. RDM Web UIにアクセスする http://localhost:5000
    2. +
    3. 「アドオンアカウント構成」ページを開く。
    4. +
    5. My Skeltonアドオンが表示されていることを確認する。 + Configure Addon Account
    6. +
    7. 機関管理機能のWeb UIにアクセスする http://localhost:8001
    8. +
    9. RDM Addonsページを開く。
    10. +
    11. 自分の所属機関のページを開く。
    12. +
    13. My Skeltonアドオンの左のチェックボックスを外し、アドオンを無効化する。 + Disable Addon
    14. +
    15. 再度、RDM Web UIで「アドオンアカウント構成」ページを開く。
    16. +
    17. My Skeltonアドオンが表示されていないことを確認する。
    18. +
    +

    以上でスケルトン アドオンの機関管理機能の動作確認は完了です!

    +

    Admin Notesの実装

    +

    ここでは、機関管理者が、スケルトン アドオンに関するユーザへの注意書きを設定できる Admin Notes という機能の実装を例に説明します。

    +

    スケルトン アドオンの機関管理機能の対応 が完了していることを前提とします。

    +

    RDMコードの変更

    +

    RdmAddonOption モデルの変更

    +

    osf/models/rdm_addons.py の RdmAddonOption モデルおよび RdmAddonNoInstitutionOption モデルに、Admin Notesの内容を保存する admin_notes カラムを追加します。
    +変更例はサンプル rdm_addons.py を参照してください。

    +

    APIの追加

    +

    Admin Notesを取得・設定するためのAPIを追加します。

    +

    admin/rdm_addons/api_v1/views.py に AdminNotesView クラスを追加します。
    +変更例はサンプル views.py を参照してください。

    +

    admin/rdm_addons/api_v1/urls.py に AdminNotesView へのルーティング設定を追加します。
    +変更例はサンプル urls.py を参照してください。

    +

    UIの追加

    +

    Admin Notesを設定するためのUIを追加します。 +今回は、スケルトン アドオンに対してのみAdmin Notesを設定できるように、スケルトン アドオン用の設定UIを作成します。

    +

    以下に従って、テンプレートファイルとJavaScriptファイルをコピーします。

    + +

    作成したテンプレートファイルを読み込むように、 admin/rdm_addons/utils.py の get_institusion_settings_template() 関数の一部を変更します。
    +変更例はサンプル utils.py を参照してください。

    +

    作成したJavaScriptファイルを読み込むように、 admin/webpack.admin.config.js の entry に rdm-myskelton-cfg プロパティを追加します。
    +変更例はサンプル webpack.admin.config.js を参照してください。

    +

    アドオンの機関管理機能UIで読み込まれるCSSファイル admin/static/css/rdm_addons.css に、Admin Notesに関するCSSを追加します。
    +変更例はサンプル rdm_addons.css を参照してください。

    +

    addons.myskelton モジュールの変更

    +

    Admin Notesの内容をプロジェクトの「アドオンを構成」ページに表示するための変更を加えます。

    +

    APIの追加

    +

    Admin Notesを取得するためのAPIを追加します。

    +

    addons/myskelton/views.py に myskelton_get_admin_notes 関数を追加します。
    +変更例はサンプル views.py を参照してください。

    +

    addons/myskelton/routes.py に myskelton_get_admin_notes へのルーティング設定を追加します。
    +変更例はサンプル routes.py を参照してください。

    +

    UIの追加

    +

    Admin Notesを表示するためのUIを追加します。

    +

    addons/myskelton/templates/node_settings.mako にAdmin Notesを表示するテンプレートを追加します。
    +変更例はサンプル node_settings.mako を参照してください。

    +

    addons/myskelton/static/node-cfg.js にAdmin Notesを読み込む関数とAdmin Notesの内容を保持する変数を追加します。
    +変更例はサンプル node-cfg.js を参照してください。

    +

    国際化

    +

    website/translations/ 以下のファイル js_messages.* の末尾に、Admin Notesに関する国際化設定を追加します。
    +変更例はサンプル website/translations/ を参照してください。

    +

    admin/translations/ 以下の各ファイルの末尾に、Admin Notesに関する国際化設定を追加します。
    +変更例はサンプル admin/translations/ を参照してください。

    +

    テストファイルの変更

    +

    admin_tests/rdm_addons/api_v1/test_views.py の変更

    +

    機関管理機能に追加したAPIのテストを追加します。

    +

    admin_tests/rdm_addons/api_v1/test_views.py に、Admin Notes取得・設定APIをテストする TestAdminNotesView クラスを追加します。
    +変更例はサンプル test_views.py を参照してください。

    +

    addons/myskelton/tests/test_view.py の変更

    +

    スケルトン アドオンのAdmin Notesの取得APIのテストを追加します。

    +

    addons/myskelton/tests/test_view.py に、Admin Notes取得APIをテストする TestAdminNotesViews クラスを追加します。
    +変更例はサンプル test_views.py を参照してください。

    +

    Migrationsファイルの作成

    +

    makemigrations コマンドを実行して、Migrationsファイルを作成します。

    +
    $ docker compose run --rm web python3 manage.py makemigrations
    +
    +

    上記の出力中に以下のような出力が現れれば成功です。

    +
    +

    osf/migrations 配下に作成されるファイル名は、作成日時やRDMのバージョンによって異なります。

    +
    +
    Migrations for 'osf':
    +  osf/migrations/0214_auto_20210214_1431.py
    +    - Add field admin_notes to rdmaddonnoinstitutionoption
    +    - Add field admin_notes to rdmaddonoption
    +
    +

    テスト

    +

    アドオンの機関管理機能におけるAdmin Notesに関するユニットテストは、以下のコマンドで実行できます。

    +
    $ docker compose run --rm web invoke test_module -m admin_tests/rdm_addons/api_v1/test_views.py::TestAdminNotesView
    +
    +

    スケルトン アドオンにおけるAdmin Notesに関するユニットテストは、以下のコマンドで実行できます。

    +
    $ docker compose run --rm web invoke test_module -m addons/myskelton/tests/test_view.py::TestAdminNotesViews
    +
    +

    Admin Notesの動作確認

    +

    Admin Notesの動作を確認してみましょう。

    +

    DBマイグレーション

    +

    マイグレーションを実行し、Migrations定義をPostgreSQLサービスに反映します。

    +
    $ docker compose run --rm web python3 manage.py migrate
    +
    +

    国際化のコンパイル

    +

    テンプレートファイルの国際化設定を適用するために、国際化ファイルをコンパイルします。

    +
    $ docker compose run --rm web pybabel compile -D django -d ./admin/translations
    +
    +

    サービスの再起動

    +

    変更したファイルに関するサービスを再起動します。

    +
    $ docker compose restart web api assets admin admin_assets
    +
    +

    これでサービスへの反映は完了です。

    +

    Admin Notesを試す

    +

    Admin Notesの設定および表示の確認をするには、以下のような操作を実施します。

    +
      +
    1. 機関管理機能のWeb UIにアクセスする。 http://localhost:8001
    2. +
    3. アドオン利用制御(RDM Addons)ページを開く。
    4. +
    5. 自分の所属機関のページを開く。
    6. +
    7. My Skeltonアドオンの中の管理者ノート(Admin Notes)の下にあるテキストボックスに任意のテキストを入力し、保存する。 + Edit Admin Notes
    8. +
    9. RDM Web UIにアクセスする。 http://localhost:5000
    10. +
    11. 適当なプロジェクトを作成する。
    12. +
    13. 「アドオン」ページを開く。
    14. +
    15. My Skeltonアドオンを有効化する。
    16. +
    17. 「アドオンを構成」のMy Skeltonの欄に、設定したAdmin Notesが表示されていることを確認する。 + View Admin Notes
    18. +
    +

    以上でAdmin Notesの動作確認は完了です!

    + + + + + + + + + + + + + +
    +
    + + + +
    + +
    + + + +
    +
    +
    +
    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/guides/admin-addon/addon/apps.py b/site/guides/admin-addon/addon/apps.py new file mode 100644 index 0000000..9011fb1 --- /dev/null +++ b/site/guides/admin-addon/addon/apps.py @@ -0,0 +1,52 @@ +# -*- coding: utf-8 -*- +""" +本アドオンの各種プロパティを定義する +""" + +import os +from addons.base.apps import BaseAddonAppConfig +from . import SHORT_NAME + + +HERE = os.path.dirname(os.path.abspath(__file__)) +TEMPLATE_PATH = os.path.join( + HERE, + 'templates' +) + + +# `__init__.py` の `default_app_config` により本ファイル内の`AddonAppConfig`が参照される +class AddonAppConfig(BaseAddonAppConfig): + + short_name = SHORT_NAME + name = 'addons.{}'.format(SHORT_NAME) + label = 'addons_{}'.format(SHORT_NAME) + + full_name = 'My Skelton' + + owners = ['node'] + + views = [] + + # admin対応: accountsを追加 + configs = ['node', 'accounts'] + + categories = ['other'] + + include_js = {} + + include_css = {} + + node_settings_template = os.path.join(TEMPLATE_PATH, 'node_settings.mako') + + # admin対応: プロパティを追加 + user_settings_template = os.path.join(TEMPLATE_PATH, 'user_settings.mako') + + @property + def routes(self): + from . import routes + return [routes.api_routes] + + @property + def node_settings(self): + return self.get_model('NodeSettings') diff --git a/site/guides/admin-addon/addon/routes.py b/site/guides/admin-addon/addon/routes.py new file mode 100644 index 0000000..da052c4 --- /dev/null +++ b/site/guides/admin-addon/addon/routes.py @@ -0,0 +1,26 @@ +""" +Routes associated with the jupyterhub addon +""" + +from framework.routing import Rule, json_renderer +from . import SHORT_NAME +from . import views + +api_routes = { + 'rules': [ + Rule([ + '/project//{}/settings'.format(SHORT_NAME), + '/project//node//{}/settings'.format(SHORT_NAME), + ], 'get', views.myskelton_get_config, json_renderer), + Rule([ + '/project//{}/settings'.format(SHORT_NAME), + '/project//node//{}/settings'.format(SHORT_NAME), + ], 'put', views.myskelton_set_config, json_renderer), + # admin notes取得viewのルーティング設定 + Rule([ + '/project//{}/adminnotes'.format(SHORT_NAME), + '/project//node//{}/adminnotes'.format(SHORT_NAME), + ], 'get', views.myskelton_get_admin_notes, json_renderer), + ], + 'prefix': '/api/v1', +} diff --git a/site/guides/admin-addon/addon/static/node-cfg.js b/site/guides/admin-addon/addon/static/node-cfg.js new file mode 100644 index 0000000..78b7558 --- /dev/null +++ b/site/guides/admin-addon/addon/static/node-cfg.js @@ -0,0 +1,115 @@ +'use strict'; + +var $ = require('jquery'); +var m = require('mithril'); +var ko = require('knockout'); +var Raven = require('raven-js'); +var osfHelpers = require('js/osfHelpers'); +var ChangeMessageMixin = require('js/changeMessage'); +var SaveManager = require('js/saveManager'); +var _ = require('js/rdmGettext')._; +var sprintf = require('agh.sprintf').sprintf; + +var SHORT_NAME = 'myskelton'; +var logPrefix = '[' + SHORT_NAME + '] '; + + +function NodeSettings() { + var self = this; + self.baseUrl = window.contextVars.node.urls.api + SHORT_NAME + '/'; + + self.param_1 = ko.observable(''); + self.loaded_param_1 = ko.observable(''); + self.dirty = ko.computed(function() { + return self.param_1() != self.loaded_param_1(); + }) + + // admin notesを保持するための変数 + self.admin_notes_list = ko.observable([]); + + ChangeMessageMixin.call(self); + + self.saveManager = new SaveManager( + self.baseUrl + 'settings', + null, + { + dirty: function() { + return self.param_1() != self.loaded_param_1() + } + } + ); + + self.submit = function() { + console.log(logPrefix, 'submit', self.param_1()); + self.saveManager.save({'param_1': self.param_1()}) + .then(function (data) { + console.log(logPrefix, 'updated: ', data); + self.loaded_param_1(self.param_1()) + }, + function(reason) { + Raven.captureMessage('Error while updating addon info', { + extra: { + reason: reason + } + }); + }) + }; + + self.loadConfig = function() { + var url = self.baseUrl + 'settings'; + console.log(logPrefix, 'loading: ', url); + + return $.ajax({ + url: url, + type: 'GET', + dataType: 'json' + }).done(function (data) { + console.log(logPrefix, 'loaded: ', data); + self.loaded_param_1(data.param_1); + self.param_1(data.param_1); + }).fail(function(xhr, status, error) { + Raven.captureMessage('Error while retrieving addon info', { + extra: { + url: url, + status: status, + error: error + } + }); + }); + }; + + // admin notesを読み込む関数 + self.loadAdminNotes = function() { + var url = self.baseUrl + 'adminnotes'; + console.log(logPrefix, 'loading: ', url); + + return $.ajax({ + url: url, + type: 'GET', + dataType: 'json' + }).done(function (data) { + console.log(logPrefix, 'loaded: ', data); + for (var i = 0; i < data.length; i++) { + data[i].institutionLabel = sprintf(_('Admin Notes by %1$s'), data[i].institution.name); + } + self.admin_notes_list(data); + }).fail(function(xhr, status, error) { + Raven.captureMessage('Error while retrieving addon info', { + extra: { + url: url, + status: status, + error: error + } + }); + }); + }; +} + +$.extend(NodeSettings.prototype, ChangeMessageMixin.prototype); + +var settings = new NodeSettings(); +osfHelpers.applyBindings(settings, '#' + SHORT_NAME + 'Scope'); +settings.loadConfig(); + +// admin notesを読み込む +settings.loadAdminNotes(); diff --git a/site/guides/admin-addon/addon/static/user-cfg.js b/site/guides/admin-addon/addon/static/user-cfg.js new file mode 100644 index 0000000..d85f0c3 --- /dev/null +++ b/site/guides/admin-addon/addon/static/user-cfg.js @@ -0,0 +1,15 @@ +'use strict'; + +require('js/osfToggleHeight'); +var osfHelpers = require('js/osfHelpers'); + +var SHORT_NAME = 'myskelton'; +var FULL_NAME = 'My Skelton'; + +function UserSettings() { + var self = this; + self.properName = FULL_NAME; +} + +var settings = new UserSettings(); +osfHelpers.applyBindings(settings, '#' + SHORT_NAME + 'AddonScope'); diff --git a/site/guides/admin-addon/addon/templates/node_settings.mako b/site/guides/admin-addon/addon/templates/node_settings.mako new file mode 100644 index 0000000..738bfd9 --- /dev/null +++ b/site/guides/admin-addon/addon/templates/node_settings.mako @@ -0,0 +1,37 @@ +
    +

    + + ${addon_full_name} +

    + +
    +
    +
    + +
    + +
    +
    + +
    +
    + +
    + + + +
    +
    + +

    +

    + +
    + +
    + + +
    +
    diff --git a/site/guides/admin-addon/addon/templates/user_settings.mako b/site/guides/admin-addon/addon/templates/user_settings.mako new file mode 100644 index 0000000..bdb8bff --- /dev/null +++ b/site/guides/admin-addon/addon/templates/user_settings.mako @@ -0,0 +1,10 @@ + +
    + +

    + + +

    +
    diff --git a/site/guides/admin-addon/addon/tests/test_view.py b/site/guides/admin-addon/addon/tests/test_view.py new file mode 100644 index 0000000..bba9fe7 --- /dev/null +++ b/site/guides/admin-addon/addon/tests/test_view.py @@ -0,0 +1,86 @@ +# -*- coding: utf-8 -*- +from rest_framework import status as http_status + +import mock +from nose.tools import * # noqa + +from framework.auth import Auth +from tests.base import OsfTestCase, get_default_metaschema + +# TestAdminNotesViews のために ExternalAccountFactory のimportを追加 +from osf_tests.factories import ProjectFactory, ExternalAccountFactory + +from .. import SHORT_NAME +from .. import settings +from .utils import BaseAddonTestCase +from website.util import api_url_for + +# TestAdminNotesViews のためのimport追加 +from admin_tests.rdm_addons import factories as rdm_addon_factories + + +class TestViews(BaseAddonTestCase, OsfTestCase): + + def test_empty_param_1(self): + self.node_settings.set_param_1('') + self.node_settings.save() + url = self.project.api_url_for('{}_get_config'.format(SHORT_NAME)) + res = self.app.get(url, auth=self.user.auth) + assert_equals(res.json['param_1'], settings.DEFAULT_PARAM_1) + + def test_param_1(self): + self.node_settings.set_param_1('PARAM_1') + self.node_settings.save() + url = self.project.api_url_for('{}_get_config'.format(SHORT_NAME)) + res = self.app.get(url, auth=self.user.auth) + assert_equals(res.json['param_1'], 'PARAM_1') + + +# API の追加 +class TestAdminNotesViews(BaseAddonTestCase, OsfTestCase): + + def setUp(self): + super(TestAdminNotesViews, self).setUp() + self.external_account = ExternalAccountFactory(provider=SHORT_NAME) + + self.rdm_addon_option = rdm_addon_factories.RdmAddonOptionFactory() + self.rdm_addon_option.provider = self.external_account.provider + self.rdm_addon_option.external_accounts.add(self.external_account) + self.rdm_addon_option.save() + + self.project.affiliated_institutions.add(self.rdm_addon_option.institution) + self.project.save() + + def tearDown(self): + super(TestAdminNotesViews, self).tearDown() + institution = self.rdm_addon_option.institution + self.project.affiliated_institutions.remove(institution) + if self.rdm_addon_option.external_accounts.filter(pk=self.external_account.id).exists(): + self.rdm_addon_option.external_accounts.remove(self.external_account) + self.rdm_addon_option.delete() + institution.delete() + self.external_account.delete() + + def test_get(self, *args, **kwargs): + self.rdm_addon_option.admin_notes = 'fake admin notes' + self.rdm_addon_option.save() + url = self.project.api_url_for('{}_get_admin_notes'.format(SHORT_NAME)) + res = self.app.get(url, auth=self.user.auth) + assert_equals(len(res.json), 1) + assert_in('institution', res.json[0]) + assert_in('id', res.json[0]['institution']) + assert_equals(res.json[0]['institution']['id'], self.rdm_addon_option.institution.id) + assert_in('value', res.json[0]) + assert_equals(res.json[0]['value'], 'fake admin notes') + + def test_get_with_empty_notes(self, *args, **kwargs): + self.rdm_addon_option.admin_notes = None + self.rdm_addon_option.save() + url = self.project.api_url_for('{}_get_admin_notes'.format(SHORT_NAME)) + res = self.app.get(url, auth=self.user.auth) + assert_equals(len(res.json), 1) + assert_in('institution', res.json[0]) + assert_in('id', res.json[0]['institution']) + assert_equals(res.json[0]['institution']['id'], self.rdm_addon_option.institution.id) + assert_in('value', res.json[0]) + assert_equals(res.json[0]['value'], None) diff --git a/site/guides/admin-addon/addon/views.py b/site/guides/admin-addon/addon/views.py new file mode 100644 index 0000000..485af8b --- /dev/null +++ b/site/guides/admin-addon/addon/views.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- +from django.db.models import Subquery +from rest_framework import status as http_status +from flask import request +import logging + +# admin notes取得viewのためのimport +from osf.models import RdmAddonOption + +from . import SHORT_NAME +from . import settings +from framework.exceptions import HTTPError +from website.project.decorators import ( + must_be_contributor_or_public, + must_have_addon, + must_be_valid_project, + must_have_permission, +) + +logger = logging.getLogger(__name__) + + +@must_be_valid_project +@must_have_permission('admin') +@must_have_addon(SHORT_NAME, 'node') +def myskelton_get_config(**kwargs): + node = kwargs['node'] or kwargs['project'] + addon = node.get_addon(SHORT_NAME) + return {'param_1': addon.get_param_1()} + +@must_be_valid_project +@must_have_permission('admin') +@must_have_addon(SHORT_NAME, 'node') +def myskelton_set_config(**kwargs): + node = kwargs['node'] or kwargs['project'] + addon = node.get_addon(SHORT_NAME) + try: + param_1 = request.json['param_1'] + except KeyError: + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + logger.info('param_1: {}'.format(param_1)) + addon.set_param_1(param_1) + return {} + +# admin notes取得view +@must_be_valid_project +@must_have_addon(SHORT_NAME, 'node') +def myskelton_get_admin_notes(**kwargs): + node = kwargs['node'] or kwargs['project'] + res = [] + for ins in node.affiliated_institutions.all(): + opt = RdmAddonOption.objects.filter( + provider=SHORT_NAME, + institution_id=ins.id, + is_allowed=True + ).first() + if opt is not None: + res.append({ + 'institution': { + 'id': ins.id, + 'name': ins.name, + }, + 'value': opt.admin_notes + }) + return res diff --git a/site/guides/admin-addon/admin/rdm_addons/api_v1/urls.py b/site/guides/admin-addon/admin/rdm_addons/api_v1/urls.py new file mode 100644 index 0000000..2931550 --- /dev/null +++ b/site/guides/admin-addon/admin/rdm_addons/api_v1/urls.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- + +from django.conf.urls import url +from . import views + + +urlpatterns = [ + url(r'^oauth/accounts/(?P\w+)/(?P-?[0-9]+)/$', views.OAuthView.as_view(), name='oauth'), + url(r'^settings/(?P\w+)/(?P-?[0-9]+)/$', views.SettingsView.as_view(), name='settings'), + url(r'^settings/(?P\w+)/(?P-?[0-9]+)/accounts/$', views.AccountsView.as_view(), name='accounts'), + url(r'^settings/(?P\w+)/(?P-?[0-9]+)/manage/$', views.ManageView.as_view(), name='manage'), + url(r'^settings/(?P\w+)/(?P-?[0-9]+)/organization/$', views.OrganizationView.as_view(), name='organization'), + # ルーティング追加 + url(r'^settings/(?P\w+)/(?P-?[0-9]+)/adminnotes/$', views.AdminNotesView.as_view(), name='adminnotes'), +] diff --git a/site/guides/admin-addon/admin/rdm_addons/api_v1/views.py b/site/guides/admin-addon/admin/rdm_addons/api_v1/views.py new file mode 100644 index 0000000..16e4254 --- /dev/null +++ b/site/guides/admin-addon/admin/rdm_addons/api_v1/views.py @@ -0,0 +1,359 @@ +# -*- coding: utf-8 -*- + +import json +from rest_framework import status as http_status + +from django.views.generic import View +from django.views.decorators.csrf import csrf_exempt +from django.contrib.auth.mixins import UserPassesTestMixin +from django.core.urlresolvers import reverse +from django.http import HttpResponse, Http404 +from django.http.response import JsonResponse +from django.utils.decorators import method_decorator +import flask + +from osf.models import ExternalAccount, Guid, AbstractNode +from osf.utils import permissions +from admin.rdm.utils import RdmPermissionMixin +from admin.rdm_addons.utils import get_rdm_addon_option +from framework.auth import Auth + +from admin.rdm_addons import utils + + +class OAuthView(RdmPermissionMixin, UserPassesTestMixin, View): + """View for revoking add-on authentication information""" + raise_exception = True + + def test_func(self): + """check user permissions""" + institution_id = int(self.kwargs.get('institution_id')) + return self.has_auth(institution_id) + + @method_decorator(csrf_exempt) + def dispatch(self, request, *args, **kwargs): + """disable CSRF""" + return super(OAuthView, self).dispatch(request, *args, **kwargs) + + def delete(self, request, *args, **kwargs): + """disconnect OAuth""" + external_account_id = kwargs['external_account_id'] + institution_id = int(kwargs['institution_id']) + user = self.request.user + return disconnect(external_account_id, institution_id, user) + +def disconnect(external_account_id, institution_id, user): + """disconnect OAuth""" + account = ExternalAccount.load(external_account_id) + + if not account: + raise Http404 + + rdm_addon_option = get_rdm_addon_option(institution_id, account.provider) + if not rdm_addon_option.external_accounts.filter(id=account.id).exists(): + raise Http404 + + app = flask.Flask(__name__) + with app.test_client() as c: + # Create dummy Flask communication. + # revoke_oauth_access method goes through flask + # in order to confirm the user is logged in. + c.get('/') + # iterate AddonUserSettings for addons + for user_settings in user.get_oauth_addons(): + if user_settings.oauth_provider.short_name == account.provider: + user_settings.revoke_oauth_access(account, Auth(user)) + user_settings.save() + + # # only after all addons have been dealt with can we remove it from the user + rdm_addon_option.external_accounts.remove(account) + rdm_addon_option.save() + user.external_accounts.remove(account) + user.save() + return HttpResponse('') + + +class SettingsView(RdmPermissionMixin, UserPassesTestMixin, View): + """View for getting add-on configuration information""" + raise_exception = True + + def test_func(self): + """check user permissions""" + institution_id = int(self.kwargs.get('institution_id')) + return self.has_auth(institution_id) + + def get(self, request, *args, **kwargs): + addon_name = kwargs['addon_name'] + institution_id = int(kwargs['institution_id']) + # Separate by add-on the processing to acquire settings. + settings = get_settings(addon_name, institution_id) + return JsonResponse(settings) + +def get_settings(addon_name, institution_id): + """get add-on configuration information.""" + if addon_name == 'dataverse': + from addons.dataverse.settings import DEFAULT_HOSTS + return { + 'result': { + 'userHasAuth': False, + 'urls': { + 'create': reverse('addons:api_v1:accounts', args=[addon_name, institution_id]), + 'accounts': reverse('addons:api_v1:accounts', args=[addon_name, institution_id]) + }, + 'hosts': DEFAULT_HOSTS + } + } + return {} + +class AccountsView(RdmPermissionMixin, UserPassesTestMixin, View): + """get add-on account information.""" + raise_exception = True + + def test_func(self): + """check user permissions""" + institution_id = int(self.kwargs.get('institution_id')) + return self.has_auth(institution_id) + + @method_decorator(csrf_exempt) + def dispatch(self, request, *args, **kwargs): + """disable CSRF""" + return super(AccountsView, self).dispatch(request, *args, **kwargs) + + def get(self, request, *args, **kwargs): + addon_name = kwargs['addon_name'] + institution_id = int(kwargs['institution_id']) + + rdm_addon_option = get_rdm_addon_option(institution_id, addon_name) + # check existence of OAuth authentication settings + if not rdm_addon_option.external_accounts.exists(): + res = add_extra_info({'accounts': []}, addon_name) + return JsonResponse(res) + accounts = [] + for external_account in rdm_addon_option.external_accounts.all(): + if external_account.provider == addon_name: + account = { + 'id': external_account._id, + 'provider_id': external_account.provider_id, + 'provider_name': external_account.provider_name, + 'provider_short_name': external_account.provider, + 'display_name': external_account.display_name, + 'profile_url': external_account.profile_url, + } + # add each add-on's account information + account = add_addon_extra_info(account, external_account, addon_name) + accounts.append(account) + res = add_extra_info({'accounts': accounts}, addon_name) + return JsonResponse(res) + + def post(self, request, *args, **kwargs): + addon_name = kwargs['addon_name'] + institution_id = int(kwargs['institution_id']) + json_request = json.loads(request.body) + # registration of authentication / authorization information + response, status = add_account(json_request, institution_id, addon_name) + return JsonResponse(response, status=status) + +class ManageView(RdmPermissionMixin, UserPassesTestMixin, View): + """View for management project of add-on""" + raise_exception = True + + def test_func(self): + """check user permissions""" + institution_id = int(self.kwargs.get('institution_id')) + return self.has_auth(institution_id) + + @method_decorator(csrf_exempt) + def dispatch(self, request, *args, **kwargs): + """disable CSRF""" + return super(ManageView, self).dispatch(request, *args, **kwargs) + + def get(self, request, *args, **kwargs): + addon_name = kwargs['addon_name'] + + institution_id = int(kwargs['institution_id']) + rdm_addon_option = utils.get_rdm_addon_option(institution_id, addon_name) + if rdm_addon_option.management_node is None: + return JsonResponse({'guid': None}) + else: + return JsonResponse({'guid': rdm_addon_option.management_node._id}) + + def put(self, request, *args, **kwargs): + addon_name = kwargs['addon_name'] + institution_id = int(kwargs['institution_id']) + json_request = json.loads(request.body) + if 'guid' not in json_request: + return JsonResponse({ + 'message': 'Require "guid" parameter.' + }, status=http_status.HTTP_400_BAD_REQUEST) + guid = json_request['guid'] + + guid_obj = Guid.objects.get(_id=guid) + node = guid_obj.referent + if not isinstance(node, AbstractNode): + return JsonResponse({ + 'message': 'Invalid GUID of management project.' + }, status=http_status.HTTP_400_BAD_REQUEST) + + if not node.has_permission(request.user, permissions.WRITE): + return JsonResponse({'message': 'Forbidden'}, status=http_status.HTTP_403_FORBIDDEN) + + rdm_addon_option = utils.get_rdm_addon_option(institution_id, addon_name) + if rdm_addon_option.management_node is not None and \ + not rdm_addon_option.management_node.has_permission(request.user, permissions.WRITE): + return JsonResponse({'message': 'Forbidden'}, status=http_status.HTTP_403_FORBIDDEN) + + rdm_addon_option.management_node = node + rdm_addon_option.save() + + return JsonResponse({}, status=http_status.HTTP_200_OK) + + def delete(self, request, *args, **kwargs): + addon_name = kwargs['addon_name'] + institution_id = int(kwargs['institution_id']) + + rdm_addon_option = utils.get_rdm_addon_option(institution_id, addon_name) + if rdm_addon_option.management_node is not None: + if not rdm_addon_option.management_node.has_permission(request.user, permissions.WRITE): + return JsonResponse({'message': 'Forbidden'}, status=http_status.HTTP_403_FORBIDDEN) + + rdm_addon_option.management_node = None + rdm_addon_option.save() + + return JsonResponse({}, status=http_status.HTTP_200_OK) + +class OrganizationView(RdmPermissionMixin, UserPassesTestMixin, View): + """View for organizational project of add-on""" + raise_exception = True + + def test_func(self): + """check user permissions""" + institution_id = int(self.kwargs.get('institution_id')) + return self.has_auth(institution_id) + + @method_decorator(csrf_exempt) + def dispatch(self, request, *args, **kwargs): + """disable CSRF""" + return super(OrganizationView, self).dispatch(request, *args, **kwargs) + + def get(self, request, *args, **kwargs): + addon_name = kwargs['addon_name'] + + institution_id = int(kwargs['institution_id']) + rdm_addon_option = utils.get_rdm_addon_option(institution_id, addon_name) + if rdm_addon_option.organizational_node is None: + return JsonResponse({'guid': None}) + else: + return JsonResponse({'guid': rdm_addon_option.organizational_node._id}) + + def put(self, request, *args, **kwargs): + addon_name = kwargs['addon_name'] + institution_id = int(kwargs['institution_id']) + json_request = json.loads(request.body) + if 'guid' not in json_request: + return JsonResponse({ + 'message': 'Require "guid" parameter.' + }, status=http_status.HTTP_400_BAD_REQUEST) + guid = json_request['guid'] + + guid_obj = Guid.objects.get(_id=guid) + node = guid_obj.referent + if not isinstance(node, AbstractNode): + return JsonResponse({ + 'message': 'Invalid GUID of organizational project.' + }, status=http_status.HTTP_400_BAD_REQUEST) + + if not node.has_permission(request.user, permissions.WRITE): + return JsonResponse({'message': 'Forbidden'}, status=http_status.HTTP_403_FORBIDDEN) + + rdm_addon_option = utils.get_rdm_addon_option(institution_id, addon_name) + if rdm_addon_option.organizational_node is not None and \ + not rdm_addon_option.organizational_node.has_permission(request.user, permissions.WRITE): + return JsonResponse({'message': 'Forbidden'}, status=http_status.HTTP_403_FORBIDDEN) + + rdm_addon_option.organizational_node = node + rdm_addon_option.save() + + return JsonResponse({}, status=http_status.HTTP_200_OK) + + def delete(self, request, *args, **kwargs): + addon_name = kwargs['addon_name'] + institution_id = int(kwargs['institution_id']) + + rdm_addon_option = utils.get_rdm_addon_option(institution_id, addon_name) + if rdm_addon_option.organizational_node is not None: + if not rdm_addon_option.organizational_node.has_permission(request.user, permissions.WRITE): + return JsonResponse({'message': 'Forbidden'}, status=http_status.HTTP_403_FORBIDDEN) + + rdm_addon_option.organizational_node = None + rdm_addon_option.save() + + return JsonResponse({}, status=http_status.HTTP_200_OK) + +def add_addon_extra_info(ret, external_account, addon_name): + """add each add-on's account information""" + if addon_name == 'dataverse': + ret.update({ + 'host': external_account.oauth_key, + 'host_url': 'https://{0}'.format(external_account.oauth_key), + }) + return ret + +def add_extra_info(ret, addon_name): + """add each add-on's non-account-related individual information""" + if addon_name == 'owncloud': + from addons.owncloud.settings import DEFAULT_HOSTS + ret.update({ + 'hosts': DEFAULT_HOSTS + }) + return ret + +def add_account(json_request, institution_id, addon_name): + if addon_name == 'dataverse': + from admin.rdm_addons.api_v1.add.dataverse import add_account + return add_account(json_request, institution_id, addon_name) + elif addon_name == 's3': + from admin.rdm_addons.api_v1.add.s3 import add_account + return add_account(json_request, institution_id, addon_name) + elif addon_name == 'owncloud': + from admin.rdm_addons.api_v1.add.owncloud import add_account + return add_account(json_request, institution_id, addon_name) + return {'message': 'unknown addon "{}"'.format(addon_name)}, http_status.HTTP_400_BAD_REQUEST + + return JsonResponse(response, status=status) + +# API 追加 +class AdminNotesView(RdmPermissionMixin, UserPassesTestMixin, View): + """View for admin notes of add-on""" + raise_exception = True + + def test_func(self): + """check user permissions""" + institution_id = int(self.kwargs.get('institution_id')) + return self.has_auth(institution_id) + + @method_decorator(csrf_exempt) + def dispatch(self, request, *args, **kwargs): + """disable CSRF""" + return super(AdminNotesView, self).dispatch(request, *args, **kwargs) + + def get(self, request, *args, **kwargs): + addon_name = kwargs['addon_name'] + institution_id = int(kwargs['institution_id']) + rdm_addon_option = utils.get_rdm_addon_option(institution_id, addon_name) + return JsonResponse({'admin_notes': rdm_addon_option.admin_notes}) + + def put(self, request, *args, **kwargs): + addon_name = kwargs['addon_name'] + institution_id = int(kwargs['institution_id']) + json_request = json.loads(request.body) + if 'admin_notes' not in json_request: + return JsonResponse({ + 'message': 'Require "admin_notes" parameter.' + }, status=http_status.HTTP_400_BAD_REQUEST) + admin_notes = json_request['admin_notes'] + + rdm_addon_option = utils.get_rdm_addon_option(institution_id, addon_name) + rdm_addon_option.admin_notes = admin_notes + rdm_addon_option.save() + + return JsonResponse({}, status=http_status.HTTP_200_OK) diff --git a/site/guides/admin-addon/admin/rdm_addons/utils.py b/site/guides/admin-addon/admin/rdm_addons/utils.py new file mode 100644 index 0000000..faaf605 --- /dev/null +++ b/site/guides/admin-addon/admin/rdm_addons/utils.py @@ -0,0 +1,117 @@ +# -*- coding: utf-8 -*- + +import os + +from django.urls import reverse + +from framework.exceptions import PermissionsError + +from osf.models import RdmAddonOption, RdmAddonNoInstitutionOption +from website import settings +from admin.base.settings import BASE_DIR +from admin.rdm.utils import get_institution_id +from admin.base.settings import UNSUPPORTED_FORCE_TO_USE_ADDONS + +def get_institusion_settings_template(config): + """get template file settings""" + short_name = config.short_name + base_path = os.path.join('rdm_addons', 'addons') + + # in の後ろの配列に 'myskelton' を加えます + if short_name in ['dataverse', 'owncloud', 's3', 'iqbrims', + 'dropboxbusiness', 'myskelton']: + return os.path.join(base_path, '{}_institution_settings.html'.format(short_name)) + return os.path.join(base_path, 'institution_settings_default.html') + +def get_addon_template_config(config, user): + """get addons template config""" + user_addon = user.get_addon(config.short_name) + ret = { + 'addon_short_name': config.short_name, + 'addon_full_name': config.full_name, + 'institution_settings_template': get_institusion_settings_template(config), + 'is_enabled': user_addon is not None, + 'addon_icon_url': reverse('addons:icon', args=[config.short_name, config.icon]), + 'is_supported_force_to_use': config.short_name not in UNSUPPORTED_FORCE_TO_USE_ADDONS, + } + ret.update(user_addon.to_json(user) if user_addon else {}) + return ret + +def get_addons_by_config_type(config_type, user): + """get a list of Addon objects from the Config Type of Addon.""" + addons = [addon for addon in settings.ADDONS_AVAILABLE if config_type in addon.configs and not addon.for_institutions] + return [get_addon_template_config(addon_config, user) for addon_config in sorted(addons, key=lambda cfg: cfg.full_name.lower())] + +def get_addon_config(config_type, addon_short_name): + """get Addon object from Short Name and Config Type of Addon.""" + for addon in settings.ADDONS_AVAILABLE: + if config_type in addon.configs and addon.short_name == addon_short_name: + return addon + return None + +def collect_addon_js(addons): + """Get a list of addon's JavaScript files.""" + js_url_list = [] + for addon in addons: + filename = 'rdm-{}-cfg.js'.format(addon.short_name) + public_js_file = os.path.join(BASE_DIR, 'static', 'public', 'js', filename) + if os.path.exists(public_js_file): + js_url = '/static/public/js/{}'.format(filename) + js_url_list.append(js_url) + return js_url_list + +def _get_rdm_addon_option_get_only(institution_id, addon_name): + try: + if institution_id: + rdm_addon_option = RdmAddonOption.objects.get( + institution_id=institution_id, + provider=addon_name) + else: + rdm_addon_option = RdmAddonNoInstitutionOption.objects.get( + provider=addon_name) + return rdm_addon_option + except Exception: + return None + +def get_rdm_addon_option(institution_id, addon_name, create=True): + """get model objects of RdmAddonOption or RdmAddonNoInstitutionOption""" + if not create: + return _get_rdm_addon_option_get_only(institution_id, addon_name) + if institution_id: + rdm_addon_option, created = RdmAddonOption.objects.get_or_create( + institution_id=institution_id, provider=addon_name) + else: + rdm_addon_option, created = RdmAddonNoInstitutionOption.objects.get_or_create(provider=addon_name) + if not created: + return rdm_addon_option + + app = settings.ADDONS_AVAILABLE_DICT.get(addon_name) + if app: + # is_allowed_default is False when for_institutions is True + for_institutions = getattr(app, 'for_institutions', False) + if for_institutions: + is_allowed_default = False + else: + is_allowed_default = getattr(app, 'is_allowed_default', True) + if is_allowed_default is False: + rdm_addon_option.is_allowed = False + rdm_addon_option.save() + return rdm_addon_option + +def update_with_rdm_addon_settings(addon_setting, user): + """add configuration information specific to RDM to the GakuNin RDM Addon settings""" + institutoin_id = get_institution_id(user) + for addon in addon_setting: + addon_name = addon['addon_short_name'] + rdm_addon_option = get_rdm_addon_option(institutoin_id, addon_name) + addon['is_allowed'] = rdm_addon_option.is_allowed + addon['is_forced'] = rdm_addon_option.is_forced + addon['has_external_accounts'] = rdm_addon_option.external_accounts.exists() + addon['has_user_external_accounts'] = user.external_accounts.filter(provider=addon_name).exists() + +def validate_rdm_addons_allowed(auth, addon_name): + institution_id = get_institution_id(auth.user) + rdm_addon_option = get_rdm_addon_option(institution_id, addon_name) + if not rdm_addon_option.is_allowed: + raise PermissionsError('Unable to access account.\n' + 'You are prohibited from using this add-on.') diff --git a/site/guides/admin-addon/admin/static/css/rdm_addons.css b/site/guides/admin-addon/admin/static/css/rdm_addons.css new file mode 100644 index 0000000..38586bf --- /dev/null +++ b/site/guides/admin-addon/admin/static/css/rdm_addons.css @@ -0,0 +1,47 @@ +#addonSettings .is_allowed { + /*vertical-align: middle;*/ + width: 30px; +} +#addonSettings .is_forced { + /*vertical-align: middle;*/ + text-align: right; + width: 120px; +} +#addonSettings .table tr td { + border-top: 1px solid #eee; +} +#addonSettings .table tr:first-child td { + border-top: none; +} +#addonSettings .panel-body { + padding-top: 5px; + padding-bottom: 5px; +} +#addonSettings .user-settings-addon-auth { + font-size: 13.5px; + border-bottom: 2px solid #ddd; +} +#addonSettings a { + cursor: pointer; +} + +#addonSettings .management-project-form .management-project-input { + margin-bottom: 4px; +} + +#addonSettings .management-project-form .management-project-save { + margin-bottom: 2px; +} + +#addonSettings .organizational-project-form .organizational-project-input { + margin-bottom: 4px; +} + +#addonSettings .organizational-project-form .organizational-project-save { + margin-bottom: 2px; +} + +/* admin notes */ +#addonSettings .admin-notes-form .admin-notes-input { + margin-bottom: 4px; +} diff --git a/site/guides/admin-addon/admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js b/site/guides/admin-addon/admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js new file mode 100644 index 0000000..0fa3898 --- /dev/null +++ b/site/guides/admin-addon/admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js @@ -0,0 +1,86 @@ +'use strict'; + +var ko = require('knockout'); +var $ = require('jquery'); +var Raven = require('raven-js'); +var OAuthAddonSettingsViewModel = require('../rdmAddonSettings.js').OAuthAddonSettingsViewModel; +var oop = require('js/oop'); + +var _ = require('js/rdmGettext')._; + +var ViewModel = oop.extend(OAuthAddonSettingsViewModel, { + constructor: function(url, institutionId) { + this.super.constructor.call(this, 'myskelton', 'My Skelton', institutionId); + + this.adminNotes = ko.observable(''); + this.isSavingAdminNotes = ko.observable(false); + }, + + saveAdminNotes: function() { + var self = this; + self.isSavingAdminNotes(true); + var adminNotes = self.adminNotes().trim(); + + var url = '/addons/api/v1/settings/' + this.name + '/' + this.institutionId + '/adminnotes/'; + return $.ajax({ + url: url, + type: 'PUT', + data: JSON.stringify({admin_notes: adminNotes}), + contentType: 'application/json', + dataType: 'json' + }).then(function() { + return self.fetchAdminNotes(); + }).done(function() { + self.setMessage(_('Saving admin notes was successful'), 'text-success'); + }).fail(function(xhr, status, error) { + Raven.captureMessage(_('Error while saving admin notes'), { + extra: { + url: url, + status: status, + error: error + } + }); + if (error === 'Unauthorized' || error === 'Forbidden') { + self.setMessage(_('Permission error while saving admin notes'), 'text-danger'); + } else { + self.setMessage(_('Error while saving admin notes'), 'text-danger'); + } + }).always(function() { + self.isSavingAdminNotes(false); + }); + }, + + fetchAdminNotes: function(){ + var self = this; + var url = '/addons/api/v1/settings/' + self.name + '/' + self.institutionId + '/adminnotes/'; + return $.ajax({ + url: url, + type: 'GET', + dataType: 'json' + }).done(function(data) { + self.adminNotes(data.admin_notes); + }).fail(function(xhr, status, error) { + Raven.captureMessage(_('Error while fetching admin notes'), { + extra: { + url: url, + status: status, + error: error + } + }); + }); + }, +}); + +function MySkeltonUserConfig(selector, url, institutionId) { + var viewModel = new ViewModel(url, institutionId); + ko.applyBindings(viewModel, $(selector)[0]); + viewModel.fetchAdminNotes() + .fail(function() { + viewModel.setMessage(_('Error while fetching admin notes'), 'text-danger'); + }); +} + +module.exports = { + MySkeltonViewModel: ViewModel, + MySkeltonUserConfig: MySkeltonUserConfig +}; diff --git a/site/guides/admin-addon/admin/static/js/rdm_addons/myskelton/rdm-cfg.js b/site/guides/admin-addon/admin/static/js/rdm_addons/myskelton/rdm-cfg.js new file mode 100644 index 0000000..48f3ae7 --- /dev/null +++ b/site/guides/admin-addon/admin/static/js/rdm_addons/myskelton/rdm-cfg.js @@ -0,0 +1,7 @@ +'use strict'; +var $ = require('jquery'); +var MySkeltonUserConfig = require('./myskeltonRdmConfig.js').MySkeltonUserConfig; + +var institutionId = $('#myskeltonAddonScope').data('institution-id'); +var url = '/addons/api/v1/settings/myskelton/' + institutionId + '/accounts/'; +var myskeltonUserConfig = new MySkeltonUserConfig('#myskeltonAddonScope', url, institutionId); \ No newline at end of file diff --git a/site/guides/admin-addon/admin/templates/rdm_addons/addons/myskelton_institution_settings.html b/site/guides/admin-addon/admin/templates/rdm_addons/addons/myskelton_institution_settings.html new file mode 100644 index 0000000..3f30aae --- /dev/null +++ b/site/guides/admin-addon/admin/templates/rdm_addons/addons/myskelton_institution_settings.html @@ -0,0 +1,27 @@ +{% load i18n %} + +
    +

    + + {# addon.addon_full_name #} +

    +
    +
    {% trans "Admin Notes" %}
    +
    + + +
    + +
    +

    +
    +
    +
    diff --git a/site/guides/admin-addon/admin/translations/django.pot b/site/guides/admin-addon/admin/translations/django.pot new file mode 100644 index 0000000..8f4ea21 --- /dev/null +++ b/site/guides/admin-addon/admin/translations/django.pot @@ -0,0 +1,3088 @@ +# Translations template for PROJECT. +# Copyright (C) 2020 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR , 2020. +# 1.{% trans "XXX" %} is extracted by the command 'django-admin makemessages --keep-pot -l ja' +# 2.edit the header to babel extracting form. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: 0.6.0\n" +"Report-Msgid-Bugs-To: rocs-office@nii.ac.jp\n" +"POT-Creation-Date: 2020-09-02 11:10+0900\n" +"PO-Revision-Date: 2020-09-02 11:10+0900\n" +"Last-Translator: Shunta Nishikawa\n" +"Language-Team: RCOS \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.7.0\n" + +#: .\admin\templates\banners\confirm_delete.html:4 +msgid "GakuNin RDM Admin | Delete banner" +msgstr "" + +#: .\admin\templates\banners\confirm_delete.html:10 +msgid "Confirm Delete Banner" +msgstr "" + +#: .\admin\templates\banners\confirm_delete.html:13 +#, python-format +msgid "" +"Are you sure you want to delete %(objectName)s? It is scheduled for " +"%(startDate)s -\n" +" %(endDate)s" +msgstr "" + +#: .\admin\templates\banners\confirm_delete.html:16 +#: .\admin\templates\institutions\confirm_delete.html:20 +#: .\admin\templates\maintenance\delete_maintenance.html:12 +#: .\admin\templates\nodes\confirm_ham.html:9 +#: .\admin\templates\nodes\confirm_spam.html:9 +#: .\admin\templates\nodes\node.html:395 +#: .\admin\templates\nodes\node_list.html:108 +#: .\admin\templates\nodes\reindex_node_elastic.html:9 +#: .\admin\templates\nodes\reindex_node_share.html:9 +#: .\admin\templates\nodes\remove_contributor.html:15 +#: .\admin\templates\nodes\remove_node.html:12 +#: .\admin\templates\rdm_timestampadd\node_list.html:122 +#: .\admin\templates\users\GDPR_delete_user.html:12 +#: .\admin\templates\users\add_system_tag.html:12 +#: .\admin\templates\users\reindex_user_elastic.html:9 +#: .\admin\templates\users\remove_2_factor.html:12 +#: .\admin\templates\users\remove_spam_user.html:12 +#: .\admin\templates\users\remove_user.html:12 +#: .\admin\templates\users\restore_ham_user.html:12 +#: .\admin\templates\users\user_list.html:71 +msgid "Confirm" +msgstr "" + +#: .\admin\templates\banners\create.html:5 +msgid "GakuNin RDM Admin | Schedule banner" +msgstr "" + +#: .\admin\templates\banners\create.html:11 +msgid "Schedule a banner" +msgstr "" + +#: .\admin\templates\banners\create.html:29 +#: .\admin\templates\institutions\create.html:24 +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:57 +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:24 +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:38 +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:64 +#: .\admin\templates\rdm_addons\addons\s3_credentials_modal.html:31 +#: .\admin\templates\rdm_announcement\settings.html:94 +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:63 +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:59 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:85 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:55 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:59 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:90 +#: .\admin\templates\rdm_custom_storage_location\providers\osfstorage_modal.html:22 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:55 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:38 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:42 +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:59 +msgid "Save" +msgstr "" + +#: .\admin\templates\banners\detail.html:11 +msgid "Banner" +msgstr "" + +#: .\admin\templates\banners\detail.html:42 +msgid "Modify banner" +msgstr "" + +#: .\admin\templates\banners\list.html:11 +#: .\admin\templates\banners\list.html:14 +msgid "List of Banners" +msgstr "" + +#: .\admin\templates\banners\list.html:20 +#: .\admin\templates\collection_providers\list.html:15 +#: .\admin\templates\desk\customer.html:16 +#: .\admin\templates\institutions\institution_list.html:21 +#: .\admin\templates\institutions\list.html:21 +#: .\admin\templates\meetings\list.html:21 .\admin\templates\messages.html:16 +#: .\admin\templates\nodes\node.html:200 +#: .\admin\templates\osf\providerassetfile_list.html:28 +#: .\admin\templates\rdm_addons\institution_list.html:29 +#: .\admin\templates\rdm_keymanagement\institutions.html:21 +#: .\admin\templates\rdm_statistics\institution_list.html:29 +#: .\admin\templates\rdm_timestampadd\list.html:21 +#: .\admin\templates\rdm_timestampsettings\list.html:21 +#: .\admin\templates\users\user.html:171 .\admin\templates\users\user.html:291 +#: .\admin\templates\users\user_details.html:35 +msgid "Name" +msgstr "" + +#: .\admin\templates\banners\list.html:21 +msgid "Dates" +msgstr "" + +#: .\admin\templates\banners\list.html:22 +msgid "Color" +msgstr "" + +#: .\admin\templates\banners\list.html:23 +#: .\admin\templates\osf\subject_form.html:8 +msgid "Text" +msgstr "" + +#: .\admin\templates\banners\list.html:44 +msgid "Delete banner" +msgstr "" + +#: .\admin\templates\base.html:10 .\admin\templates\base.html:157 +#: .\admin\templates\base.html:233 .\admin\templates\base.html:236 +#: .\admin\templates\base.html:239 .\admin\templates\base.html:242 +#: .\admin\templates\base.html:246 .\admin\templates\base.html:279 +msgid "RDM" +msgstr "" + +#: .\admin\templates\base.html:10 +msgid "Admin | Dashboard" +msgstr "" + +#: .\admin\templates\base.html:56 .\admin\templates\login.html:20 +msgid "Admin" +msgstr "" + +#: .\admin\templates\base.html:69 +#, python-format +msgid "Logged in as %(userfullname)s" +msgstr "" + +#: .\admin\templates\base.html:77 +msgid "Admin-User Registration" +msgstr "" + +#: .\admin\templates\base.html:83 +msgid "Desk information" +msgstr "" + +#: .\admin\templates\base.html:89 +msgid "Sign out" +msgstr "" + +#: .\admin\templates\base.html:105 +msgid "Menu" +msgstr "" + +#: .\admin\templates\base.html:108 .\admin\templates\base.html:113 +msgid "RDM Nodes" +msgstr "" + +#: .\admin\templates\base.html:114 .\admin\templates\base.html:131 +#: .\admin\templates\base.html:146 +msgid "Flagged Spam" +msgstr "" + +#: .\admin\templates\base.html:115 .\admin\templates\base.html:132 +#: .\admin\templates\base.html:147 +msgid "Known Spam" +msgstr "" + +#: .\admin\templates\base.html:116 .\admin\templates\base.html:133 +#: .\admin\templates\base.html:148 +msgid "Known Ham" +msgstr "" + +#: .\admin\templates\base.html:124 .\admin\templates\base.html:130 +#: .\admin\templates\metrics\osf_metrics.html:36 +msgid "Preprints" +msgstr "" + +#: .\admin\templates\base.html:134 +msgid "Withdrawal Requests" +msgstr "" + +#: .\admin\templates\base.html:141 .\admin\templates\base.html:145 +msgid "RDM Users" +msgstr "" + +#: .\admin\templates\base.html:153 +msgid "RDM Spam" +msgstr "" + +#: .\admin\templates\base.html:157 +msgid "Registrations" +msgstr "" + +#: .\admin\templates\base.html:161 +msgid "All Registrations" +msgstr "" + +#: .\admin\templates\base.html:162 +msgid "Stuck Registrations" +msgstr "" + +#: .\admin\templates\base.html:168 +msgid "RDM Institutions" +msgstr "" + +#: .\admin\templates\base.html:172 .\admin\templates\base.html:185 +#: .\admin\templates\base.html:199 .\admin\templates\base.html:212 +#: .\admin\templates\base.html:225 .\admin\templates\base.html:251 +#: .\admin\templates\base.html:261 +msgid "List" +msgstr "" + +#: .\admin\templates\base.html:174 .\admin\templates\base.html:188 +#: .\admin\templates\base.html:201 .\admin\templates\base.html:214 +#: .\admin\templates\base.html:227 .\admin\templates\base.html:263 +msgid "Create" +msgstr "" + +#: .\admin\templates\base.html:181 +msgid "Preprint Providers" +msgstr "" + +#: .\admin\templates\base.html:186 +msgid "Whitelist" +msgstr "" + +#: .\admin\templates\base.html:195 +msgid "Provider Assets" +msgstr "" + +#: .\admin\templates\base.html:208 +msgid "Collection Providers" +msgstr "" + +#: .\admin\templates\base.html:221 +msgid "Registration Providers" +msgstr "" + +#: .\admin\templates\base.html:233 +msgid "Meetings" +msgstr "" + +#: .\admin\templates\base.html:236 +msgid "Prereg" +msgstr "" + +#: .\admin\templates\base.html:239 +msgid "Metrics" +msgstr "" + +#: .\admin\templates\base.html:242 +msgid "Subjects" +msgstr "" + +#: .\admin\templates\base.html:246 +msgid "Groups" +msgstr "" + +#: .\admin\templates\base.html:250 +msgid "Search" +msgstr "" + +#: .\admin\templates\base.html:257 +msgid "Banners" +msgstr "" + +#: .\admin\templates\base.html:270 +msgid "Maintenance Alerts" +msgstr "" + +#: .\admin\templates\base.html:273 +#: .\admin\templates\rdm_addons\addon_list.html:6 +#: .\admin\templates\rdm_addons\addon_list.html:17 +#: .\admin\templates\rdm_addons\addon_list.html:19 +#: .\admin\templates\rdm_addons\institution_list.html:13 +#: .\admin\templates\rdm_addons\institution_list.html:17 +msgid "RDM Addons" +msgstr "" + +#: .\admin\templates\base.html:274 +#: .\admin\templates\rdm_statistics\crawl.html:6 +#: .\admin\templates\rdm_statistics\crawl.html:9 +#: .\admin\templates\rdm_statistics\index.html:6 +#: .\admin\templates\rdm_statistics\index.html:9 +#: .\admin\templates\rdm_statistics\institution_list.html:13 +#: .\admin\templates\rdm_statistics\institution_list.html:17 +#: .\admin\templates\rdm_statistics\mail.html:11 +#: .\admin\templates\rdm_statistics\mail.html:14 +#: .\admin\templates\rdm_statistics\statistics.html:32 +#: .\admin\templates\rdm_statistics\statistics.html:35 +msgid "RDM Statistics" +msgstr "" + +#: .\admin\templates\base.html:275 +#: .\admin\templates\rdm_announcement\index.html:6 +#: .\admin\templates\rdm_announcement\index.html:11 +#: .\admin\templates\rdm_announcement\index.html:13 +#: .\admin\templates\rdm_announcement\send.html:7 +#: .\admin\templates\rdm_announcement\send.html:12 +#: .\admin\templates\rdm_announcement\send.html:14 +#: .\admin\templates\rdm_announcement\settings.html:7 +#: .\admin\templates\rdm_announcement\settings.html:12 +#: .\admin\templates\rdm_announcement\settings.html:14 +msgid "RDM Announcement" +msgstr "" + +#: .\admin\templates\base.html:276 +msgid "Timestamp Control" +msgstr "" + +#: .\admin\templates\base.html:278 +msgid "User Keys Management" +msgstr "" + +#: .\admin\templates\base.html:279 +msgid "Timestamp Environment" +msgstr "" + +#: .\admin\templates\base.html:284 +msgid "Quota for NII Storage" +msgstr "" + +#: .\admin\templates\base.html:287 +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:16 +#: .\admin\templates\users\user_details.html:17 +msgid "Institutional Storage" +msgstr "" + +#: .\admin\templates\base.html:288 +msgid "Quota for Institutional Storage" +msgstr "" + +#: .\admin\templates\base.html:303 .\admin\templates\home.html:10 +msgid "Welcome to the GakuNin RDM Admin Home Page" +msgstr "" + +#: .\admin\templates\base.html:313 +msgid "National Institute of Informatics" +msgstr "" + +#: .\admin\templates\collection_providers\cannot_delete.html:7 +msgid "Collection Provider Delete" +msgstr "" + +#: .\admin\templates\collection_providers\cannot_delete.html:13 +#, python-format +msgid "Cannot Delete %(providerName)s" +msgstr "" + +#: .\admin\templates\collection_providers\cannot_delete.html:14 +#, python-format +msgid "" +"%(providerName)s has %(collectionsubmissionSetCount)s submissions associated " +"with it, and therefore cannot be safely deleted." +msgstr "" + +#: .\admin\templates\collection_providers\confirm_delete.html:5 +msgid "Delete Collection Provider" +msgstr "" + +#: .\admin\templates\collection_providers\confirm_delete.html:12 +#: .\admin\templates\institutions\confirm_delete.html:19 +#, python-format +msgid "Are you sure you want to delete \"%(objectName)s\"?" +msgstr "" + +#: .\admin\templates\collection_providers\create.html:9 +msgid "Create Collection Provider" +msgstr "" + +#: .\admin\templates\collection_providers\create.html:12 +msgid "Create A Collection Provider" +msgstr "" + +#: .\admin\templates\collection_providers\detail.html:16 +msgid "Export collection provider metadata" +msgstr "" + +#: .\admin\templates\collection_providers\detail.html:17 +msgid "Delete collection provider" +msgstr "" + +#: .\admin\templates\collection_providers\detail.html:28 +msgid "Modify Collection Provider" +msgstr "" + +#: .\admin\templates\collection_providers\list.html:6 +#: .\admin\templates\collection_providers\list.html:9 +msgid "List of Collection Providers" +msgstr "" + +#: .\admin\templates\collection_providers\list.html:16 +#: .\admin\templates\institutions\institution_list.html:22 +#: .\admin\templates\institutions\list.html:22 +#: .\admin\templates\messages.html:17 +#: .\admin\templates\rdm_keymanagement\institutions.html:22 +#: .\admin\templates\rdm_timestampadd\list.html:22 +msgid "Description" +msgstr "" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:62 +msgid "Collected type choices:" +msgstr "" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:68 +msgid "Status choices:" +msgstr "" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:74 +msgid "Volume choices:" +msgstr "" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:80 +msgid "Issue choices:" +msgstr "" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:86 +msgid "Program Area choices:" +msgstr "" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:96 +#: .\admin\templates\institutions\create.html:29 +#: .\admin\templates\institutions\detail.html:80 +msgid "Import from JSON" +msgstr "" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:97 +msgid "" +"Choose a JSON file that has been previously exported from another Collection " +"Provider detail page. This will pre-populate the Collection Provider change " +"form with those details." +msgstr "" + +#: .\admin\templates\desk\cases.html:6 +#, python-format +msgid "GakuNin RDM user \"%(user_id)s\" up to 50 most recent desk.com cases:" +msgstr "" + +#: .\admin\templates\desk\cases.html:10 .\admin\templates\desk\customer.html:40 +msgid "Type" +msgstr "" + +#: .\admin\templates\desk\cases.html:11 +msgid "Status" +msgstr "" + +#: .\admin\templates\desk\cases.html:12 +msgid "Subject" +msgstr "" + +#: .\admin\templates\desk\cases.html:13 +msgid "Links to Desk" +msgstr "" + +#: .\admin\templates\desk\cases.html:23 .\admin\templates\messages.html:35 +msgid "Link" +msgstr "" + +#: .\admin\templates\desk\cases.html:28 +msgid "No cases" +msgstr "" + +#: .\admin\templates\desk\cases.html:35 .\admin\templates\desk\customer.html:58 +#: .\admin\templates\desk\desk_error.html:14 +#: .\admin\templates\desk\user_not_found.html:13 +#: .\admin\templates\rdm_addons\oauth_complete.html:57 +#: .\admin\templates\spam\email.html:31 +msgid "Close" +msgstr "" + +#: .\admin\templates\desk\customer.html:10 +#: .\admin\templates\nodes\node.html:139 .\admin\templates\nodes\node.html:328 +#: .\admin\templates\users\user.html:165 +#: .\admin\templates\users\user_details.html:23 +msgid "Field" +msgstr "" + +#: .\admin\templates\desk\customer.html:11 +#: .\admin\templates\nodes\node.html:140 .\admin\templates\nodes\node.html:329 +#: .\admin\templates\users\user.html:166 +#: .\admin\templates\users\user_details.html:24 +msgid "Value" +msgstr "" + +#: .\admin\templates\desk\customer.html:20 +msgid "Company" +msgstr "" + +#: .\admin\templates\desk\customer.html:24 +msgid "Background" +msgstr "" + +#: .\admin\templates\desk\customer.html:27 +msgid "Desk id" +msgstr "" + +#: .\admin\templates\desk\customer.html:31 +#: .\admin\templates\desk\user_not_found.html:11 +msgid "Go to Desk" +msgstr "" + +#: .\admin\templates\desk\customer.html:35 +#: .\admin\templates\desk\customer.html:41 .\admin\templates\messages.html:8 +#: .\admin\templates\spam\detail.html:24 .\admin\templates\users\user.html:193 +msgid "Email" +msgstr "" + +#: .\admin\templates\desk\desk_error.html:12 +msgid "Desk Settings" +msgstr "" + +#: .\admin\templates\desk\settings.html:5 +msgid "Desk user settings" +msgstr "" + +#: .\admin\templates\desk\user_not_found.html:7 +msgid "" +"To add a new desk customer, you can go to Desk in order to complete this." +msgstr "" + +#: .\admin\templates\emails\password_change_done.html:3 +msgid "Documentation" +msgstr "" + +#: .\admin\templates\emails\password_change_done.html:3 +msgid "Change password" +msgstr "" + +#: .\admin\templates\emails\password_change_done.html:3 +msgid "'Log out'" +msgstr "" + +#: .\admin\templates\emails\password_change_done.html:6 +msgid "Home" +msgstr "" + +#: .\admin\templates\emails\password_change_done.html:7 +msgid "Password change" +msgstr "" + +#: .\admin\templates\emails\password_change_done.html:14 +msgid "Your password has been changed." +msgstr "" + +#: .\admin\templates\emails\password_change_done.html:16 +msgid "Return to home" +msgstr "" + +#: .\admin\templates\emails\password_reset_email.html:2 +msgid "" +"You're receiving this email because you requested a password reset for your " +"GakuNin RDM Admin user account." +msgstr "" + +#: .\admin\templates\emails\password_reset_email.html:4 +msgid "Please go to this link to reset your password:" +msgstr "" + +#: .\admin\templates\emails\password_reset_email.html:9 +msgid "Your account email is:" +msgstr "" + +#: .\admin\templates\emails\password_reset_email.html:11 +msgid "Thank you." +msgstr "" + +#: .\admin\templates\emails\password_reset_email.html:13 +msgid "-GakuNin RDM Admin" +msgstr "" + +#: .\admin\templates\home.html:5 +#, python-format +msgid "Hello %(userfullname)s, " +msgstr "" + +#: .\admin\templates\home.html:8 +msgid "Welcome to the GakuNin RDM General Admin Home Page" +msgstr "" + +#: .\admin\templates\home.html:12 +msgid " Use the menu on the left to access admin pages. " +msgstr "" + +#: .\admin\templates\institutions\cannot_delete.html:7 +#: .\admin\templates\institutions\confirm_delete.html:11 +msgid "Institution Delete" +msgstr "" + +#: .\admin\templates\institutions\cannot_delete.html:13 +#, python-format +msgid "Cannot Delete %(institutionName)s" +msgstr "" + +#: .\admin\templates\institutions\cannot_delete.html:14 +#, python-format +msgid "" +"%(institutionName)s has %(institutionNodeCount)s nodes associated with it, " +"and therefore cannot be safely deleted." +msgstr "" + +#: .\admin\templates\institutions\cannot_delete.html:15 +msgid "View associated nodes here" +msgstr "" + +#: .\admin\templates\institutions\cannot_delete.html:16 +msgid "Back to institution detail" +msgstr "" + +#: .\admin\templates\institutions\confirm_delete.html:17 +msgid "Confirm Institution Delete" +msgstr "" + +#: .\admin\templates\institutions\create.html:10 +msgid "Create Institution" +msgstr "" + +#: .\admin\templates\institutions\create.html:16 +msgid "Create An Institution" +msgstr "" + +#: .\admin\templates\institutions\create.html:30 +#: .\admin\templates\institutions\detail.html:81 +msgid "" +"Choose a JSON file that has been previously exported from another " +"Institution detail page. This will pre-populate the Institution change form " +"with those details." +msgstr "" + +#: .\admin\templates\institutions\create.html:34 +msgid "Import" +msgstr "" + +#: .\admin\templates\institutions\detail.html:16 +msgid "Export institution metadata" +msgstr "" + +#: .\admin\templates\institutions\detail.html:18 +msgid "Delete institution" +msgstr "" + +#: .\admin\templates\institutions\detail.html:30 +#, python-format +msgid "View %(node_count)s affiliated nodes" +msgstr "" + +#: .\admin\templates\institutions\detail.html:35 +msgid "Logo:" +msgstr "" + +#: .\admin\templates\institutions\detail.html:41 +msgid "Banner:" +msgstr "" + +#: .\admin\templates\institutions\detail.html:52 +#: .\admin\templates\institutions\detail.html:103 +msgid "Modify Institution" +msgstr "" + +#: .\admin\templates\institutions\detail.html:103 +msgid "Hide Form" +msgstr "" + +#: .\admin\templates\institutions\institution_list.html:11 +#: .\admin\templates\institutions\institution_list.html:14 +#: .\admin\templates\institutions\list.html:11 +#: .\admin\templates\institutions\list.html:14 +#: .\admin\templates\rdm_keymanagement\institutions.html:11 +#: .\admin\templates\rdm_keymanagement\institutions.html:14 +#: .\admin\templates\rdm_timestampadd\list.html:11 +#: .\admin\templates\rdm_timestampadd\list.html:14 +#: .\admin\templates\rdm_timestampsettings\list.html:11 +#: .\admin\templates\rdm_timestampsettings\list.html:14 +msgid "List of Institutions" +msgstr "" + +#: .\admin\templates\institutions\institution_list.html:20 +#: .\admin\templates\institutions\list.html:20 +#: .\admin\templates\rdm_addons\institution_list.html:29 +#: .\admin\templates\rdm_keymanagement\institutions.html:20 +#: .\admin\templates\rdm_statistics\institution_list.html:29 +#: .\admin\templates\rdm_timestampadd\list.html:20 +#: .\admin\templates\rdm_timestampsettings\list.html:20 +#: .\admin\templates\rdm_timestampsettings\list.html:50 +msgid "Logo" +msgstr "" + +#: .\admin\templates\institutions\list_institute.html:10 +#, python-format +msgid "%(institution_name)s User List - Statistical Status of NII Storage" +msgstr "" + +#: .\admin\templates\institutions\list_institute.html:16 +#: .\admin\templates\institutions\statistical_status_default_storage.html:16 +#: .\admin\templates\rdm_keymanagement\delete_user_list.html:10 +#: .\admin\templates\users\list.html:11 +msgid "No results found" +msgstr "" + +#: .\admin\templates\institutions\node_list.html:11 +#: .\admin\templates\metrics\osf_metrics.html:227 +#: .\admin\templates\metrics\osf_metrics.html:281 +#: .\admin\templates\rdm_timestampadd\node_list.html:12 +#: .\admin\templates\rdm_timestampsettings\node_list.html:11 +msgid "Affiliated Nodes" +msgstr "" + +#: .\admin\templates\institutions\node_list.html:14 +#: .\admin\templates\rdm_timestampadd\node_list.html:15 +#: .\admin\templates\rdm_timestampsettings\node_list.html:14 +#, python-format +msgid "List of Nodes for %(institutionName)s" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage.html:10 +#, python-format +msgid "" +"%(institution_name)s User List - Statistical Status of Institutional Storage" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:2 +#: .\admin\templates\users\user_details.html:11 +#: .\admin\templates\users\user_details.html:16 +msgid "Statistical Status of Institutional Storage" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:3 +#, python-format +msgid "Institutional Storage > %(institution_name)s" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:11 +#: .\admin\templates\institutions\user_list_by_institute.html:11 +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:42 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:35 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:36 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:32 +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:34 +#: .\admin\templates\rdm_keymanagement\user_list.html:10 +#: .\admin\templates\users\user.html:181 +#: .\admin\templates\users\user_list.html:23 +msgid "Username" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:16 +#: .\admin\templates\institutions\user_list_by_institute.html:16 +#: .\admin\templates\rdm_keymanagement\user_list.html:11 +#: .\admin\templates\users\user_list.html:24 +msgid "Fullname" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:21 +#: .\admin\templates\institutions\user_list_by_institute.html:21 +msgid "Ratio" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:26 +#: .\admin\templates\institutions\user_list_by_institute.html:26 +msgid "Usage" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:31 +#: .\admin\templates\institutions\user_list_by_institute.html:31 +msgid "Remaining" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:36 +#: .\admin\templates\institutions\user_list_by_institute.html:36 +msgid "Quota" +msgstr "" + +#: .\admin\templates\institutions\user_list_by_institute.html:2 +msgid "Statistical Status of NII Storage" +msgstr "" + +#: .\admin\templates\institutions\user_list_by_institute.html:3 +#, python-format +msgid "NII Storage > %(institution_name)s" +msgstr "" + +#: .\admin\templates\login.html:6 +msgid "GakuNin RDM Admin | Log in" +msgstr "" + +#: .\admin\templates\login.html:20 +msgid "GakuNin RDM" +msgstr "" + +#: .\admin\templates\login.html:23 +msgid "Sign in to start your session" +msgstr "" + +#: .\admin\templates\login.html:35 +msgid "Email:" +msgstr "" + +#: .\admin\templates\login.html:40 +msgid "Password:" +msgstr "" + +#: .\admin\templates\login.html:47 +msgid "Sign In" +msgstr "" + +#: .\admin\templates\maintenance\delete_maintenance.html:5 +msgid "Are you sure you want to take down this maintenance alert?" +msgstr "" + +#: .\admin\templates\maintenance\delete_maintenance.html:8 +msgid "It will be removed from all GakuNin RDM pages." +msgstr "" + +#: .\admin\templates\maintenance\display.html:8 +#: .\admin\templates\maintenance\display.html:11 +msgid "Maintenance State" +msgstr "" + +#: .\admin\templates\maintenance\display.html:16 +msgid "Time" +msgstr "" + +#: .\admin\templates\maintenance\display.html:17 +msgid "Message" +msgstr "" + +#: .\admin\templates\maintenance\display.html:18 +#: .\admin\templates\messages.html:30 +#: .\admin\templates\osf\subject_list.html:18 +msgid "Level" +msgstr "" + +#: .\admin\templates\maintenance\display.html:24 +msgid "Current alert:" +msgstr "" + +#: .\admin\templates\maintenance\display.html:31 +msgid "" +"The site will undergo maintenance between <localized start time>-<" +"localized end time>. Thank you for your patience." +msgstr "" + +#: .\admin\templates\maintenance\display.html:37 +msgid "Remove alert" +msgstr "" + +#: .\admin\templates\maintenance\display.html:54 +msgid "Put up an alert:" +msgstr "" + +#: .\admin\templates\maintenance\display.html:59 +msgid "Start" +msgstr "" + +#: .\admin\templates\maintenance\display.html:59 +#: .\admin\templates\maintenance\display.html:60 +msgid "Eastern Date/Time" +msgstr "" + +#: .\admin\templates\maintenance\display.html:60 +msgid "End" +msgstr "" + +#: .\admin\templates\maintenance\display.html:63 +msgid "Message:" +msgstr "" + +#: .\admin\templates\maintenance\display.html:64 +msgid "Reminder:" +msgstr "" + +#: .\admin\templates\maintenance\display.html:64 +msgid "" +"This alert will go up as soon as it is created and will have to be manually " +"removed. (Creating a new alert automatically removes an existing one.)" +msgstr "" + +#: .\admin\templates\maintenance\display.html:65 +msgid "Submit@send" +msgstr "" + +#: .\admin\templates\meetings\create.html:7 +msgid "GakuNIn RDM Admin | Meetings" +msgstr "" + +#: .\admin\templates\meetings\detail.html:7 +#: .\admin\templates\meetings\list.html:7 +msgid "GakuNin RDM Admin | Meetings" +msgstr "" + +#: .\admin\templates\meetings\list.html:12 +msgid "Add meeting" +msgstr "" + +#: .\admin\templates\meetings\list.html:15 +msgid "List of Meetings" +msgstr "" + +#: .\admin\templates\meetings\list.html:20 +msgid "Endpoint" +msgstr "" + +#: .\admin\templates\meetings\list.html:22 +msgid "Active" +msgstr "" + +#: .\admin\templates\meetings\list.html:23 +#: .\admin\templates\metrics\osf_metrics.html:681 +msgid "Public Projects" +msgstr "" + +#: .\admin\templates\meetings\list.html:24 +msgid "Submissions" +msgstr "" + +#: .\admin\templates\messages.html:3 +msgid "API Key" +msgstr "" + +#: .\admin\templates\messages.html:4 +msgid "API Secret" +msgstr "" + +#: .\admin\templates\messages.html:5 +msgid "Access Token" +msgstr "" + +#: .\admin\templates\messages.html:6 +msgid "Access Token Secret" +msgstr "" + +#: .\admin\templates\messages.html:7 +msgid "API URL" +msgstr "" + +#: .\admin\templates\messages.html:9 +msgid "None" +msgstr "" + +#: .\admin\templates\messages.html:10 +msgid "title" +msgstr "" + +#: .\admin\templates\messages.html:11 +msgid "text" +msgstr "" + +#: .\admin\templates\messages.html:12 +msgid "Type@announcement" +msgstr "" + +#: .\admin\templates\messages.html:13 +msgid "name" +msgstr "" + +#: .\admin\templates\messages.html:14 +msgid "email" +msgstr "" + +#: .\admin\templates\messages.html:15 +msgid "Last logged" +msgstr "" + +#: .\admin\templates\messages.html:18 +msgid "Banner name" +msgstr "" + +#: .\admin\templates\messages.html:19 +msgid "Logo name" +msgstr "" + +#: .\admin\templates\messages.html:20 +msgid "Delegation protocol" +msgstr "" + +#: .\admin\templates\messages.html:21 +msgid "Login url" +msgstr "" + +#: .\admin\templates\messages.html:22 +msgid "Logout url" +msgstr "" + +#: .\admin\templates\messages.html:23 +msgid "Domains" +msgstr "" + +#: .\admin\templates\messages.html:24 +msgid "Email domains" +msgstr "" + +#: .\admin\templates\messages.html:25 +msgid "File" +msgstr "" + +#: .\admin\templates\messages.html:26 +msgid "CAS by pac4j" +msgstr "" + +#: .\admin\templates\messages.html:27 +msgid "OAuth by pac4j" +msgstr "" + +#: .\admin\templates\messages.html:28 +msgid "SAML by Shibboleth" +msgstr "" + +#: .\admin\templates\messages.html:29 +msgid "No Delegation Protocol" +msgstr "" + +#: .\admin\templates\messages.html:31 +msgid "Alt text for accessibility" +msgstr "" + +#: .\admin\templates\messages.html:32 +msgid "Start date" +msgstr "" + +#: .\admin\templates\messages.html:33 +msgid "End date" +msgstr "" + +#: .\admin\templates\messages.html:34 +msgid "License" +msgstr "" + +#: .\admin\templates\messages.html:36 +msgid "Default photo" +msgstr "" + +#: .\admin\templates\messages.html:37 +msgid "Mobile photo" +msgstr "" + +#: .\admin\templates\messages.html:38 +msgid "Default photo alt text" +msgstr "" + +#: .\admin\templates\messages.html:39 +msgid "Mobile photo alt text" +msgstr "" + +#: .\admin\templates\messages.html:40 +msgid "Select a file" +msgstr "" + +#: .\admin\templates\messages.html:41 +msgid "node" +msgstr "" + +#: .\admin\templates\messages.html:42 +msgid "project" +msgstr "" + +#: .\admin\templates\messages.html:43 +msgid "addon" +msgstr "" + +#: .\admin\templates\messages.html:44 +msgid "comment" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:7 +#: .\admin\templates\metrics\osf_metrics.html:26 +#: .\admin\templates\metrics\osf_statistics.html:6 +msgid "GakuNin RDM Metrics" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:30 +#: .\admin\templates\metrics\osf_metrics.html:45 +msgid "User Data" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:31 +#: .\admin\templates\metrics\osf_metrics.html:216 +msgid "Institution Metrics" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:32 +msgid "Active User Metrics" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:33 +#: .\admin\templates\metrics\osf_metrics.html:573 +msgid "Healthy User Metrics" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:34 +#: .\admin\templates\metrics\osf_metrics.html:636 +msgid "Raw Numbers" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:35 +#: .\admin\templates\metrics\osf_metrics.html:926 +msgid "Addons" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:37 +#: .\admin\templates\metrics\osf_metrics.html:645 +#: .\admin\templates\metrics\osf_metrics.html:977 +#: .\admin\templates\metrics\osf_metrics.html:1011 +msgid "Downloads" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:54 +msgid "User Growth" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:55 +msgid "User gain per day" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:56 +msgid "Registrations by Email Domain" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:57 +msgid "Node Logs by User" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:70 +msgid "User Growth - Previous 800 days" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:76 +msgid "The growth of GakuNin RDM Confirmed Users over the past 800 days." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:83 +msgid "Total Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:89 +msgid "This is the total number of GakuNin RDM Users with confirmed accounts." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:99 +msgid "Monthly User Increase" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:105 +#: .\admin\templates\metrics\osf_metrics.html:146 +msgid "The number of users gained in the past month." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:112 +msgid "Daily User Increase" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:118 +msgid "The number of users gained from two days ago until yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:125 +msgid "Average Daily User Gain" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:131 +msgid "The average daily user gain over the past 7 days." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:140 +msgid "User Gain per Day" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:155 +msgid "Unverified New Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:161 +msgid "Users created within the last 7 days that have not been confirmed." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:168 +msgid "User Growth over the Last Seven Days" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:174 +msgid "" +"The last 7 days of users, organized by status. Click a category in the " +"legend to resize the axes." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:183 +msgid "Previous 7 days of user registrations by email domain" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:189 +msgid "The last 7 days of users, organized by status." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:198 +msgid "Yesterday's Node logs by user" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:205 +msgid "The last day of node logs by user, if a user had over 100 node logs." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:225 +msgid "Total Institutional Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:226 +msgid "Institutional Users Growth" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:228 +#: .\admin\templates\metrics\osf_metrics.html:343 +msgid "Affiliated Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:238 +msgid "Total institutional Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:244 +msgid "" +"Total number of users who have accounts associated with their institutions." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:252 +msgid "Institutional Users / Total GakuNin RDM Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:258 +msgid "" +"The percentage of users who created an account through their institution." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:267 +msgid "Institutional Users over the past 100 Days" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:273 +msgid "" +"The growth of users who have accounts associated with their institutions. " +"Click on an institution name in the key to remove its line and resize the " +"chart axes." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:282 +msgid "" +"Nodes (at all levels, projects and components) created by each institution " +"as of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:289 +msgid "Affiliated Public Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:295 +msgid "" +"Total number of public nodes (at all levels, projects and components) " +"created by each institution as of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:302 +msgid "Affiliated Private Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:308 +msgid "" +"Total number of private nodes (at all levels, projects and components) " +"created by each institution as of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:317 +msgid "Affiliated Public Registrations" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:323 +msgid "" +"Total number of public registered nodes (at all levels, projects and " +"components) created by each institution as of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:330 +msgid "Affiliated Embargoed Registrations" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:336 +msgid "" +"Total number of private registered nodes (at all levels, projects and " +"components) created by each institution as of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:344 +msgid "Top level projects created by each institution as of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:351 +msgid "Affiliated Public Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:357 +msgid "" +"Total number of public top level projects created by each institution as of " +"yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:364 +msgid "Affiliated Private Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:370 +msgid "" +"Total number of private top level projects created by each institution as of " +"yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:379 +msgid "Affiliated Public Project Registrations" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:385 +msgid "" +"Total number of public registeredtop level projects created by each " +"institution as of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:392 +msgid "Affiliated Embargoed Project Registrations" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:398 +msgid "" +"Total number of private registered top level projects created by each " +"institution as of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:408 +msgid "Active User Metrics!" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:417 +msgid "Daily Active Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:418 +msgid "Monthly and Yearly Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:419 +#: .\admin\templates\metrics\osf_metrics.html:540 +msgid "Project to User Ratios" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:430 +msgid "Recent Daily Unique Sessions" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:436 +msgid "The previous 14 days of unique visitor sessions." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:445 +msgid "Daily Active Logged In Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:451 +msgid "" +"This is the number of logged in users with user ids who had at least one " +"pageview on the GakuNin RDM yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:458 +msgid "Daily Active Users / Total Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:464 +#: .\admin\templates\metrics\osf_metrics.html:717 +msgid "Notes about this chart" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:473 +msgid "Monthly Active Users (MAU)" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:479 +msgid "Users who visited at least one page on the GakuNin RDM from last month." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:486 +msgid "Last Month's Active Users / Total Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:492 +msgid "Last month's active users / total confirmed users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:499 +#, python-format +msgid "Monthly Growth of MAU%%" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:505 +msgid "" +"The percent increase from two months ago to one month ago of what percentage " +"of users with an account were active on the GakuNin RDM." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:514 +msgid "Yearly Active Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:520 +msgid "Users who were active on the GakuNin RDM over the past year." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:527 +msgid "Yearly Active Users / Total Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:533 +msgid "" +"The percentage of our yearly active users compared to our total users with " +"confirmed accounts." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:547 +msgid "Projects / Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:553 +msgid "" +"The number of projects divided by the number of users with active accounts." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:560 +msgid "Projects / Monthly Active Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:566 +msgid "" +"The number of projects divided by the number of people who had accounts and " +"were active last month." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:579 +msgid "Stickiness Ratio" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:593 +msgid "Stickiness Ratio 1 week ago" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:599 +msgid "Stickiness Ratio for the same day of the week 1 week ago." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:606 +msgid "Stickiness Ratio 4 weeks ago" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:612 +msgid "Stickiness Ratio for the same day of the week 4 weeks ago." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:619 +msgid "Stickiness Ratio 52 weeks ago" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:625 +msgid "Stickiness Ratio for the same day of the week 52 weeks ago." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:646 +msgid "Projects - Top Level" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:647 +msgid "Nodes - Projects & Components" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:648 +#: .\admin\templates\metrics\osf_metrics.html:791 +msgid "Registered Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:649 +#: .\admin\templates\metrics\osf_metrics.html:858 +msgid "Registered Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:657 +#: .\admin\templates\metrics\osf_statistics.html:24 +#: .\admin\templates\users\user_details.html:29 +msgid "Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:664 +msgid "Total Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:670 +msgid "The total number of all top level projects on the GakuNin RDM" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:687 +msgid "The total number of public top level projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:696 +msgid "Private Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:702 +msgid "The total number of private top level projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:711 +msgid "Public vs Private Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:724 +#: .\admin\templates\users\user.html:285 +msgid "Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:731 +msgid "Total Nodes - Projects and Components" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:737 +msgid "The total number of all projects and components on the GakuNin RDM." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:748 +msgid "Public Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:754 +msgid "The total number of public nodes - including projects and components" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:763 +msgid "Private Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:769 +msgid "The total number of private nodes - including projects and components" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:778 +msgid "Public vs Private Nodes - Components & Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:784 +msgid "" +"The percentages of public vs private combined projects and components on the " +"GakuNin RDM." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:798 +msgid "Total Registered Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:804 +msgid "" +"The total number of all registered top level projects on the GakuNin RDM." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:815 +msgid "Public Registered Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:821 +msgid "The total number of public registered top level projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:830 +msgid "Embargoed Registered Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:836 +msgid "The number of private registered top level projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:845 +msgid "Public vs Embargoed Registered Top-Level Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:851 +#: .\admin\templates\metrics\osf_metrics.html:918 +msgid "" +"The percentages of public vs embargoed top-level project registrations on " +"the GakuNin RDM." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:865 +msgid "Total Registered Nodes - Projects & Components" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:871 +#: .\admin\templates\metrics\osf_metrics.html:938 +msgid "" +"The total number of all registered nodes - projects & components on the " +"GakuNin RDM." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:882 +msgid "Public Registered Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:888 +msgid "The total number of public registered nodes - projects & components" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:897 +msgid "Embargoed Registered Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:903 +msgid "The number of embargoed registered projects and components" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:912 +msgid "Public vs Embargoed Registered Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:932 +msgid "Previous 7 days of addon by name" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:951 +msgid "Previous 30 days of preprints by provider" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:958 +msgid "The total number of preprints grouped by preprint provider." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:961 +#: .\admin\templates\metrics\osf_metrics.html:993 +msgid "Start date range:" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:965 +#: .\admin\templates\metrics\osf_metrics.html:997 +msgid "End date range:" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:969 +#: .\admin\templates\metrics\osf_metrics.html:1001 +msgid "Enter new date range" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:983 +msgid "Daily download counts" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:990 +msgid "The total number of downloads by non-contribs" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:1017 +msgid "The total number of files downloaded from the GakuNIn RDM" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:1024 +msgid "Unique Downloads" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:1030 +msgid "The number of unique downloads of files on the GakuNin RDM." +msgstr "" + +#: .\admin\templates\metrics\osf_statistics.html:22 +#: .\admin\templates\nodes\node_logs.html:13 +#: .\admin\templates\spam\spam_list.html:44 .\admin\templates\spam\user.html:46 +#: .\admin\templates\users\spam.html:40 +msgid "Date" +msgstr "" + +#: .\admin\templates\metrics\osf_statistics.html:23 +msgid "Users" +msgstr "" + +#: .\admin\templates\metrics\osf_statistics.html:25 +msgid "Public projects" +msgstr "" + +#: .\admin\templates\metrics\osf_statistics.html:26 +msgid "Registered projects" +msgstr "" + +#: .\admin\templates\nodes\confirm_ham.html:5 +#, python-format +msgid "Are you sure this %(resource_type)s is " +msgstr "" + +#: .\admin\templates\nodes\confirm_ham.html:5 +msgid "not" +msgstr "" + +#: .\admin\templates\nodes\confirm_ham.html:5 +#, python-format +msgid " spam? %(guid)s" +msgstr "" + +#: .\admin\templates\nodes\confirm_ham.html:11 +#: .\admin\templates\nodes\confirm_spam.html:11 +#: .\admin\templates\nodes\node.html:397 +#: .\admin\templates\nodes\node_list.html:110 +#: .\admin\templates\nodes\reindex_node_elastic.html:11 +#: .\admin\templates\nodes\reindex_node_share.html:11 +#: .\admin\templates\nodes\remove_contributor.html:18 +#: .\admin\templates\nodes\remove_node.html:15 +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:55 +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:62 +#: .\admin\templates\rdm_addons\addons\s3_credentials_modal.html:29 +#: .\admin\templates\rdm_announcement\send.html:35 +#: .\admin\templates\rdm_announcement\settings.html:95 +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:62 +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:57 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:83 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:53 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:57 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:88 +#: .\admin\templates\rdm_custom_storage_location\providers\osfstorage_modal.html:21 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:53 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:36 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:40 +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:57 +#: .\admin\templates\rdm_timestampadd\node_list.html:124 +#: .\admin\templates\rdm_timestampadd\timestampadd.html:57 +#: .\admin\templates\users\GDPR_delete_user.html:15 +#: .\admin\templates\users\add_system_tag.html:15 +#: .\admin\templates\users\get_link.html:21 +#: .\admin\templates\users\merge_accounts_modal.html:14 +#: .\admin\templates\users\notes.html:18 +#: .\admin\templates\users\reindex_user_elastic.html:11 +#: .\admin\templates\users\remove_2_factor.html:15 +#: .\admin\templates\users\remove_spam_user.html:15 +#: .\admin\templates\users\remove_user.html:15 +#: .\admin\templates\users\reset.html:16 +#: .\admin\templates\users\restore_ham_user.html:15 +#: .\admin\templates\users\user_list.html:73 +msgid "Cancel" +msgstr "" + +#: .\admin\templates\nodes\confirm_spam.html:5 +#, python-format +msgid "Are you sure this %(resource_type)s is spam? %(guid)s" +msgstr "" + +#: .\admin\templates\nodes\flagged_spam_list.html:5 +msgid "Flagged Spam Nodes" +msgstr "" + +#: .\admin\templates\nodes\known_spam_list.html:5 +msgid "Known Spam Nodes" +msgstr "" + +#: .\admin\templates\nodes\node.html:11 .\admin\templates\nodes\node.html:299 +#: .\admin\templates\nodes\node.html:305 .\admin\templates\users\user.html:293 +msgid "Registration" +msgstr "" + +#: .\admin\templates\nodes\node.html:13 +msgid "Node" +msgstr "" + +#: .\admin\templates\nodes\node.html:27 +msgid "View Logs" +msgstr "" + +#: .\admin\templates\nodes\node.html:34 .\admin\templates\users\user.html:327 +msgid "Delete Node" +msgstr "" + +#: .\admin\templates\nodes\node.html:47 .\admin\templates\nodes\node.html:273 +#: .\admin\templates\users\user.html:321 +msgid "Restore Node" +msgstr "" + +#: .\admin\templates\nodes\node.html:55 +msgid "Restart Registration" +msgstr "" + +#: .\admin\templates\nodes\node.html:60 +msgid "Remove Registration" +msgstr "" + +#: .\admin\templates\nodes\node.html:70 +#: .\admin\templates\nodes\node_list.html:98 +#: .\admin\templates\rdm_timestampadd\node_list.html:112 +#: .\admin\templates\users\user_list.html:61 +msgid "Confirm Spam" +msgstr "" + +#: .\admin\templates\nodes\node.html:81 +msgid "Confirm Not Spam" +msgstr "" + +#: .\admin\templates\nodes\node.html:93 +msgid "SHARE Reindex" +msgstr "" + +#: .\admin\templates\nodes\node.html:116 .\admin\templates\users\user.html:81 +msgid "Elastic Reindex" +msgstr "" + +#: .\admin\templates\nodes\node.html:129 +msgid "Registration Details" +msgstr "" + +#: .\admin\templates\nodes\node.html:131 +msgid "Node Details" +msgstr "" + +#: .\admin\templates\nodes\node.html:145 +#: .\admin\templates\rdm_keymanagement\user_list.html:9 +#: .\admin\templates\rdm_timestampadd\node_list.html:39 +#: .\admin\templates\rdm_timestampsettings\node_list.html:35 +#: .\admin\templates\users\user.html:290 +#: .\admin\templates\users\user_details.html:34 +#: .\admin\templates\users\user_list.html:22 +msgid "GUID" +msgstr "" + +#: .\admin\templates\nodes\node.html:149 .\admin\templates\nodes\node.html:247 +#: .\admin\templates\nodes\node_list.html:26 +#: .\admin\templates\rdm_timestampadd\node_list.html:41 +#: .\admin\templates\rdm_timestampsettings\node_list.html:38 +msgid "Title" +msgstr "" + +#: .\admin\templates\nodes\node.html:153 .\admin\templates\nodes\node.html:248 +#: .\admin\templates\nodes\node_list.html:32 +#: .\admin\templates\rdm_timestampadd\node_list.html:46 +#: .\admin\templates\users\user.html:292 +msgid "Public" +msgstr "" + +#: .\admin\templates\nodes\node.html:157 +#: .\admin\templates\nodes\node_list.html:29 +#: .\admin\templates\rdm_timestampadd\node_list.html:43 +#: .\admin\templates\rdm_timestampsettings\node_list.html:41 +msgid "Parent" +msgstr "" + +#: .\admin\templates\nodes\node.html:170 +msgid "Creator" +msgstr "" + +#: .\admin\templates\nodes\node.html:181 +msgid "OSF Groups" +msgstr "" + +#: .\admin\templates\nodes\node.html:194 +#: .\admin\templates\nodes\node_list.html:35 +#: .\admin\templates\rdm_timestampadd\node_list.html:49 +msgid "Contributors" +msgstr "" + +#: .\admin\templates\nodes\node.html:199 +msgid "User id" +msgstr "" + +#: .\admin\templates\nodes\node.html:201 +msgid "Permissions" +msgstr "" + +#: .\admin\templates\nodes\node.html:202 .\admin\templates\nodes\node.html:250 +#: .\admin\templates\users\user.html:296 +msgid "Actions" +msgstr "" + +#: .\admin\templates\nodes\node.html:222 +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:14 +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:28 +msgid "Remove" +msgstr "" + +#: .\admin\templates\nodes\node.html:246 +msgid "Node id" +msgstr "" + +#: .\admin\templates\nodes\node.html:249 +msgid "# of Contributors" +msgstr "" + +#: .\admin\templates\nodes\node.html:306 .\admin\templates\nodes\node.html:334 +msgid "Date Created" +msgstr "" + +#: .\admin\templates\nodes\node.html:307 .\admin\templates\nodes\node.html:342 +msgid "Pending" +msgstr "" + +#: .\admin\templates\nodes\node.html:308 .\admin\templates\nodes\node.html:346 +#: .\admin\templates\nodes\node_list.html:33 +#: .\admin\templates\rdm_timestampadd\node_list.html:47 +msgid "Withdrawn" +msgstr "" + +#: .\admin\templates\nodes\node.html:309 .\admin\templates\nodes\node.html:350 +#: .\admin\templates\nodes\node_list.html:34 +#: .\admin\templates\rdm_timestampadd\node_list.html:48 +msgid "Embargo" +msgstr "" + +#: .\admin\templates\nodes\node.html:338 +msgid "Datetime Registered" +msgstr "" + +#: .\admin\templates\nodes\node.html:378 +msgid "Registered From" +msgstr "" + +#: .\admin\templates\nodes\node.html:389 +msgid "Are you sure you want to update this embargo?" +msgstr "" + +#: .\admin\templates\nodes\node.html:392 +msgid "Make sure you have confirmed this change with all the project admins." +msgstr "" + +#: .\admin\templates\nodes\node.html:406 +msgid "SPAM Pro Tip" +msgstr "" + +#: .\admin\templates\nodes\node.html:411 .\admin\templates\users\user.html:277 +#: .\admin\templates\users\user.html:295 +msgid "SPAM Status" +msgstr "" + +#: .\admin\templates\nodes\node.html:415 +msgid "SPAM Data" +msgstr "" + +#: .\admin\templates\nodes\node_list.html:30 +#: .\admin\templates\rdm_timestampadd\node_list.html:44 +#: .\admin\templates\rdm_timestampsettings\node_list.html:42 +msgid "Root" +msgstr "" + +#: .\admin\templates\nodes\node_list.html:31 +#: .\admin\templates\rdm_timestampadd\node_list.html:45 +msgid "Date created" +msgstr "" + +#: .\admin\templates\nodes\node_list.html:105 +#: .\admin\templates\rdm_timestampadd\node_list.html:119 +msgid "Are you sure the selected node(s) are spam?" +msgstr "" + +#: .\admin\templates\nodes\node_logs.html:6 +msgid "Node Logs" +msgstr "" + +#: .\admin\templates\nodes\node_logs.html:16 +msgid "Action" +msgstr "" + +#: .\admin\templates\nodes\node_logs.html:19 +#: .\admin\templates\rdm_timestampadd\timestampadd.html:39 +#: .\admin\templates\users\user.html:11 +msgid "User" +msgstr "" + +#: .\admin\templates\nodes\node_logs.html:22 +msgid "Parameters" +msgstr "" + +#: .\admin\templates\nodes\reindex_node_elastic.html:5 +#, python-format +msgid "Are you sure you want to reindex this %(resource_type)s (Elastic)?" +msgstr "" + +#: .\admin\templates\nodes\reindex_node_share.html:5 +#, python-format +msgid "Are you sure you want to reindex this %(resource_type)s (SHARE)?" +msgstr "" + +#: .\admin\templates\nodes\remove_contributor.html:6 +#, python-format +msgid "Removing contributor: %(userName)s" +msgstr "" + +#: .\admin\templates\nodes\remove_contributor.html:9 +#, python-format +msgid "" +"User will be removed. Currently only\n" +" an admin on the %(resource_type)s will be able to\n" +" add them back." +msgstr "" + +#: .\admin\templates\nodes\remove_node.html:5 +#, python-format +msgid "Are you sure you want to delete this %(resource_type)s? %(guid)s" +msgstr "" + +#: .\admin\templates\nodes\remove_node.html:8 +#: .\admin\templates\users\remove_user.html:8 +msgid "This action will be reversible after the fact." +msgstr "" + +#: .\admin\templates\nodes\search.html:6 +msgid "Node Search" +msgstr "" + +#: .\admin\templates\nodes\search.html:17 +msgid "Node GUID:" +msgstr "" + +#: .\admin\templates\nodes\search.html:20 +#: .\admin\templates\users\search.html:21 +msgid "Submit@search" +msgstr "" + +#: .\admin\templates\nodes\spam_status.html:3 +#: .\admin\templates\rdm_timestampadd\timestampadd.html:206 +#: .\admin\templates\spam\detail.html:86 +msgid "Unknown" +msgstr "" + +#: .\admin\templates\nodes\spam_status.html:5 +#: .\admin\templates\spam\detail.html:88 +#: .\admin\templates\spam\spam_list.html:15 +#: .\admin\templates\spam\spam_list.html:18 .\admin\templates\spam\user.html:19 +#: .\admin\templates\spam\user.html:22 .\admin\templates\users\spam.html:13 +#: .\admin\templates\users\spam.html:16 +msgid "Flagged" +msgstr "" + +#: .\admin\templates\nodes\spam_status.html:7 +#: .\admin\templates\spam\detail.html:90 +#: .\admin\templates\spam\spam_list.html:22 +#: .\admin\templates\spam\spam_list.html:25 .\admin\templates\spam\user.html:25 +#: .\admin\templates\spam\user.html:28 .\admin\templates\users\spam.html:19 +#: .\admin\templates\users\spam.html:22 +msgid "Spam" +msgstr "" + +#: .\admin\templates\nodes\spam_status.html:9 +#: .\admin\templates\spam\detail.html:92 +#: .\admin\templates\spam\spam_list.html:29 +#: .\admin\templates\spam\spam_list.html:32 .\admin\templates\spam\user.html:31 +#: .\admin\templates\spam\user.html:34 .\admin\templates\users\spam.html:25 +#: .\admin\templates\users\spam.html:28 +msgid "Ham" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_confirm_delete.html:4 +msgid "GakuNin RDM Admin | Delete Asset" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_confirm_delete.html:10 +msgid "Confirm Delete Asset" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_confirm_delete.html:13 +msgid "Are you sure you want to delete " +msgstr "" + +#: .\admin\templates\osf\providerassetfile_confirm_delete.html:13 +msgid "?" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_create.html:6 +#: .\admin\templates\osf\providerassetfile_form.html:6 +msgid "Provider Asset File" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_form.html:12 +msgid "Delete asset" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_form.html:22 +msgid "Uploading a new file will overwrite this asset." +msgstr "" + +#: .\admin\templates\osf\providerassetfile_list.html:11 +#: .\admin\templates\osf\providerassetfile_list.html:15 +msgid "List of Provider Asset Files" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_list.html:29 +msgid "File Link" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_list.html:30 +msgid "Providers" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_list.html:37 +#: .\admin\templates\rdm_announcement\index.html:49 +msgid "Preview" +msgstr "" + +#: .\admin\templates\osf\subject_form.html:5 +msgid "Subject:" +msgstr "" + +#: .\admin\templates\osf\subject_form.html:9 +#: .\admin\templates\osf\subject_list.html:17 +#: .\admin\templates\rdm_timestampadd\timestampadd.html:128 +msgid "Provider" +msgstr "" + +#: .\admin\templates\osf\subject_form.html:10 +#: .\admin\templates\osf\subject_list.html:19 +msgid "Highlighted" +msgstr "" + +#: .\admin\templates\osf\subject_form.html:11 +msgid "Hierarchy" +msgstr "" + +#: .\admin\templates\osf\subject_list.html:16 +msgid "Text " +msgstr "" + +#: .\admin\templates\osf\subject_list.html:20 +#: .\admin\templates\osf\subject_list.html:29 +#: .\admin\templates\rdm_announcement\index.html:75 +msgid "Edit" +msgstr "" + +#: .\admin\templates\rdm_addons\addon_list.html:25 +msgid "Configure Add-on Accounts" +msgstr "" + +#: .\admin\templates\rdm_addons\addon_list.html:51 +#: .\admin\templates\rdm_timestampsettings\list.html:51 +msgid "Force to use" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:6 +msgid "Connect a Dataverse Account" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:14 +msgid "Dataverse Repository" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:30 +msgid "Only Dataverse repositories v4.0 or higher are supported." +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:38 +msgid "API Token" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:42 +msgid "(Get from Dataverse )" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dataverse_institution_settings.html:15 +#: .\admin\templates\rdm_addons\addons\institution_settings_default.html:12 +#: .\admin\templates\rdm_addons\addons\owncloud_institution_settings.html:15 +#: .\admin\templates\rdm_addons\addons\s3_institution_settings.html:15 +msgid "Connect or Reauthorize Account" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dataverse_institution_settings.html:23 +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:23 +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:64 +#: .\admin\templates\rdm_addons\addons\institution_settings_default.html:19 +#: .\admin\templates\rdm_addons\addons\owncloud_institution_settings.html:23 +#: .\admin\templates\rdm_addons\addons\s3_institution_settings.html:23 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:37 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:66 +msgid "Disconnect Account" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dataverse_institution_settings.html:28 +msgid "Authorized on " +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:5 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:24 +msgid "Team member file access" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:12 +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:54 +msgid "Connect Account" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:15 +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:57 +msgid "Reauthorize Account" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:29 +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:70 +msgid "Authorized by" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:47 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:53 +msgid "Team member management" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\institution_settings_default.html:25 +#: .\admin\templates\rdm_addons\addons\owncloud_institution_settings.html:28 +#: .\admin\templates\rdm_addons\addons\s3_institution_settings.html:29 +msgid "Authorized by " +msgstr "" + +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:12 +msgid "Management project" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:18 +msgid "Management project URL" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:26 +msgid "Organizational project" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:32 +msgid "Organizational project URL" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:6 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:7 +msgid "Connect an ownCloud Account" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:14 +msgid "ownCloud Instance" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:26 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:15 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:15 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:13 +msgid "Host URL" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:32 +msgid "" +"Only ownCloud instances supporting WebDAV and \n" +" OCS v1.7 are supported." +msgstr "" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:46 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:39 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:40 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:36 +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:42 +msgid "Password" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:51 +msgid "" +" These credentials will be encrypted. However, we strongly " +"encourage using a " +"Device (or App) Password." +msgstr "" + +#: .\admin\templates\rdm_addons\addons\s3_credentials_modal.html:6 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:9 +msgid "Connect an Amazon S3 Account" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\s3_credentials_modal.html:14 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:17 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:21 +msgid "Access Key" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\s3_credentials_modal.html:18 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:21 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:25 +msgid "Secret Key" +msgstr "" + +#: .\admin\templates\rdm_addons\institution_list.html:27 +#: .\admin\templates\rdm_statistics\institution_list.html:27 +msgid "Institution List" +msgstr "" + +#: .\admin\templates\rdm_addons\oauth_complete.html:17 +msgid "OAuth Complete" +msgstr "" + +#: .\admin\templates\rdm_addons\oauth_complete.html:53 +#, python-format +msgid "Successfully connected to %(addon_name|title)s Account." +msgstr "" + +#: .\admin\templates\rdm_addons\oauth_complete.html:55 +msgid "Please close this tab." +msgstr "" + +#: .\admin\templates\rdm_announcement\index.html:19 +msgid "Announcement" +msgstr "" + +#: .\admin\templates\rdm_announcement\index.html:64 +#: .\admin\templates\rdm_announcement\settings.html:7 +#: .\admin\templates\rdm_announcement\settings.html:12 +#: .\admin\templates\rdm_announcement\settings.html:14 +#: .\admin\templates\rdm_statistics\settings.html:6 +#: .\admin\templates\rdm_statistics\settings.html:9 +msgid "Options" +msgstr "" + +#: .\admin\templates\rdm_announcement\send.html:19 +msgid " Preview" +msgstr "" + +#: .\admin\templates\rdm_announcement\send.html:34 +msgid "Send" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:20 +msgid "Institutional Storage " +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:27 +msgid "Name:" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:35 +msgid "Configure Institutional Storage Accounts" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:8 +msgid "Connect a Box Account" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:14 +msgid "Please click \"Get OAuth Permission\" button to connect Box." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:16 +msgid "Then you will be redirected to Box authentication page." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:28 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:31 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:60 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:27 +msgid "Get OAuth permission" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:32 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:43 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:72 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:31 +msgid "Authorized by:" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:40 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:37 +msgid "Current token:" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:46 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:42 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:28 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:31 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:26 +msgid "Folder" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:48 +msgid "Folder ID (Ex: 0 for root)" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:58 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:84 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:54 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:58 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:89 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:54 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:37 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:41 +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:58 +msgid "Connect" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:8 +msgid "Connect a Dropbox Business Account" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:14 +msgid "Please click \"Get OAuth Permission\" button to connect Dropbox." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:16 +msgid "Then you will be redirected to Dropbox authentication page." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:8 +msgid "Connect a Google Drive Account" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:14 +msgid "Please click \"Get OAuth Permission\" button to connectGoogle Drive." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:16 +msgid "Then you will be redirected to Google authentication page." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:44 +msgid "Folder ID (Ex: root)" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:8 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:8 +msgid "Connect a Nextcloud Account" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:21 +#, python-format +msgid "" +"\n" +" Only Nextcloud instances supporting " +"WebDAV and OCS v1.7 are supported.\n" +" " +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:36 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:33 +msgid "username" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:44 +#, python-format +msgid "" +"\n" +" These credentials will be encrypted. " +"However, we strongly encourage using a Device (or App) Password.\n" +" " +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:21 +msgid "" +"Only Nextcloud instances supporting WebDAV and " +"\n" +" OCS v1.7 are supported." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:45 +msgid "" +" These credentials will be encrypted. However, we strongly\n" +" encourage using a Device (or App) " +"Password." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:55 +msgid "Download User Mapping file" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:56 +#: .\admin\templates\rdm_timestampadd\timestampadd.html:228 +msgid "Download" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:60 +msgid "Upload User Mapping file" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:61 +msgid "Check existence of external users" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:61 +msgid "Only Nextcloud Admin can check" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:64 +msgid "Browse" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:70 +msgid "Example of User Mapping file" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\osfstorage_modal.html:8 +msgid "Connect NII Storage" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\osfstorage_modal.html:14 +msgid "NII Storage is selected as Institutional Storage." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:19 +#, python-format +msgid "" +"\n" +" Only ownCloud instances supporting WebDAV and OCS v1.7 are supported.\n" +" " +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:40 +#, python-format +msgid "" +"\n" +" These credentials will be encrypted. " +"However, we strongly encourage using a Device (or App) Password.\n" +" " +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:25 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:29 +msgid "Bucket" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:9 +msgid "Connect a S3 Compatible Storage Account" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:17 +msgid "Endpoint URL" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:8 +msgid "Connect an OpenStack Swift Account" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:15 +msgid "Authentication(Keystone) Version" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:22 +msgid "Authentication URL" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:26 +msgid "Tenant name" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:30 +msgid "Project Domain name" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:38 +msgid "User Domain name" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:46 +msgid "Container" +msgstr "" + +#: .\admin\templates\rdm_keymanagement\delete_user_list.html:5 +#: .\admin\templates\users\list.html:5 +msgid "User Search Results" +msgstr "" + +#: .\admin\templates\rdm_keymanagement\user_list.html:12 +#: .\admin\templates\users\user_list.html:25 +msgid "Date confirmed" +msgstr "" + +#: .\admin\templates\rdm_keymanagement\user_list.html:13 +#: .\admin\templates\users\user_list.html:26 +msgid "Date disabled" +msgstr "" + +#: .\admin\templates\rdm_statistics\crawl.html:14 +#: .\admin\templates\rdm_statistics\index.html:14 +msgid "statistics" +msgstr "" + +#: .\admin\templates\rdm_statistics\crawl.html:18 +#: .\admin\templates\rdm_statistics\index.html:18 +msgid "statistics info" +msgstr "" + +#: .\admin\templates\rdm_statistics\index.html:16 +msgid "institution " +msgstr "" + +#: .\admin\templates\rdm_statistics\mail.html:19 +msgid "Send statistic information mail" +msgstr "" + +#: .\admin\templates\rdm_statistics\mail.html:21 +msgid "sending result " +msgstr "" + +#: .\admin\templates\rdm_statistics\settings.html:6 +#: .\admin\templates\rdm_statistics\settings.html:9 +msgid "RDM Announcements" +msgstr "" + +#: .\admin\templates\rdm_statistics\statistics.html:40 +msgid "Institution" +msgstr "" + +#: .\admin\templates\rdm_statistics\statistics.html:68 +msgid "date" +msgstr "" + +#: .\admin\templates\rdm_statistics\statistics.html:100 +msgid "download PDF" +msgstr "" + +#: .\admin\templates\rdm_statistics\statistics.html:101 +msgid "download CSV" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:15 +msgid "TimeStampAddList" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:19 +#, python-format +msgid "TimeStamp Add (%(project_title)s)" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:27 +msgid "Start Date" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:33 +msgid "End Date" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:46 +#: .\admin\templates\users\user.html:353 +msgid "Apply" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:55 +msgid "Verify" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:56 +msgid "Request Trusted Timestamp" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:67 +msgid "Processing, please wait..." +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:92 +msgid "per page:" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:108 +msgid "Page of " +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:137 +msgid "File Path" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:146 +msgid "Timestamp by" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:155 +msgid "Updated at" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:164 +msgid "Timestamp Verification" +msgstr "" + +#: .\admin\templates\rdm_timestampsettings\list.html:22 +#: .\admin\templates\rdm_timestampsettings\node_list.html:43 +msgid "Select Timestamp Function" +msgstr "" + +#: .\admin\templates\spam\detail.html:7 +msgid "Comment" +msgstr "" + +#: .\admin\templates\spam\detail.html:14 +msgid "Back to general list" +msgstr "" + +#: .\admin\templates\spam\detail.html:18 +msgid "Back to user's list" +msgstr "" + +#: .\admin\templates\spam\detail.html:65 +msgid "Author:" +msgstr "" + +#: .\admin\templates\spam\detail.html:68 +msgid "User's RDM profile" +msgstr "" + +#: .\admin\templates\spam\detail.html:70 +msgid "User's profile" +msgstr "" + +#: .\admin\templates\spam\detail.html:76 +msgid "Comment ID:" +msgstr "" + +#: .\admin\templates\spam\detail.html:84 +msgid "Status: " +msgstr "" + +#: .\admin\templates\spam\detail.html:103 +msgid "Comment content" +msgstr "" + +#: .\admin\templates\spam\detail.html:104 +msgid "created on:" +msgstr "" + +#: .\admin\templates\spam\detail.html:120 +msgid "Type:" +msgstr "" + +#: .\admin\templates\spam\detail.html:128 +msgid "Reporter:" +msgstr "" + +#: .\admin\templates\spam\detail.html:136 +msgid "Reason:" +msgstr "" + +#: .\admin\templates\spam\detail.html:144 +msgid "No reports!" +msgstr "" + +#: .\admin\templates\spam\email.html:4 +msgid "Suggested Email message for spammer" +msgstr "" + +#: .\admin\templates\spam\email.html:7 +#, python-format +msgid "Dear %(spamAuthorFullname)s," +msgstr "" + +#: .\admin\templates\spam\email.html:8 +msgid "A comment you made on a GakuNin RDM (GRDM) project" +msgstr "" + +#: .\admin\templates\spam\email.html:10 +msgid "has been reported as" +msgstr "" + +#: .\admin\templates\spam\email.html:12 +msgid "hate speech" +msgstr "" + +#: .\admin\templates\spam\email.html:14 +msgid "violent or harmful behavior" +msgstr "" + +#: .\admin\templates\spam\email.html:16 +msgid "spam" +msgstr "" + +#: .\admin\templates\spam\email.html:27 +msgid "Best," +msgstr "" + +#: .\admin\templates\spam\email.html:28 +msgid "The GakuNin RDM Team" +msgstr "" + +#: .\admin\templates\spam\spam_list.html:8 +#: .\admin\templates\spam\spam_list.html:11 .\admin\templates\users\spam.html:7 +#: .\admin\templates\users\spam.html:10 +msgid "List of Spam" +msgstr "" + +#: .\admin\templates\spam\spam_list.html:42 .\admin\templates\spam\user.html:44 +#: .\admin\templates\users\spam.html:38 +msgid "Author" +msgstr "" + +#: .\admin\templates\spam\spam_list.html:43 .\admin\templates\spam\user.html:45 +#: .\admin\templates\users\spam.html:39 +msgid "Reporter" +msgstr "" + +#: .\admin\templates\spam\spam_list.html:45 .\admin\templates\spam\user.html:47 +#: .\admin\templates\users\spam.html:41 +msgid "Content" +msgstr "" + +#: .\admin\templates\spam\spam_list.html:72 .\admin\templates\spam\user.html:74 +#: .\admin\templates\users\spam.html:68 +msgid "Detail" +msgstr "" + +#: .\admin\templates\spam\spam_list.html:78 .\admin\templates\spam\user.html:80 +#: .\admin\templates\users\spam.html:74 +msgid "No more Spam!" +msgstr "" + +#: .\admin\templates\spam\user.html:9 +msgid "User Spam" +msgstr "" + +#: .\admin\templates\spam\user.html:12 +msgid "User's List of Spam" +msgstr "" + +#: .\admin\templates\spam\user.html:15 .\admin\templates\users\user.html:157 +msgid "User details" +msgstr "" + +#: .\admin\templates\users\GDPR_delete_user.html:5 +#, python-format +msgid "Are you sure you want to GDPR delete this user? %(guid)s" +msgstr "" + +#: .\admin\templates\users\GDPR_delete_user.html:8 +msgid "This is not reversible!" +msgstr "" + +#: .\admin\templates\users\add_system_tag.html:5 +msgid "Add a system tag to this user" +msgstr "" + +#: .\admin\templates\users\flagged_spam_list.html:5 +msgid "Flagged Spam Users" +msgstr "" + +#: .\admin\templates\users\get_link.html:4 +#, python-format +msgid "%(title)s for user %(username)s" +msgstr "" + +#: .\admin\templates\users\known_spam_list.html:5 +msgid "Known Spam Users" +msgstr "" + +#: .\admin\templates\users\merge_accounts_modal.html:4 +msgid "Merge Accounts" +msgstr "" + +#: .\admin\templates\users\merge_accounts_modal.html:7 +#, python-format +msgid "Merge this user: %(user)s (%(guid)s) with:" +msgstr "" + +#: .\admin\templates\users\notes.html:5 +msgid "Notes for GakuNin RDM User" +msgstr "" + +#: .\admin\templates\users\notes.html:8 +#, python-format +msgid "User: %(osf_id)s" +msgstr "" + +#: .\admin\templates\users\notes.html:11 +msgid "Notes for GakuNIn user:" +msgstr "" + +#: .\admin\templates\users\reindex_user_elastic.html:5 +#, python-format +msgid "Are you sure you want to reindex this user (Elastic)? %(guid)s" +msgstr "" + +#: .\admin\templates\users\remove_2_factor.html:5 +msgid "This will remove two factor auth." +msgstr "" + +#: .\admin\templates\users\remove_2_factor.html:8 +msgid "" +"Removing this will let the user log in with only one form of authentication." +"The only way to reverse this action is for the user to re-enable the addon " +"after logging in." +msgstr "" + +#: .\admin\templates\users\remove_spam_user.html:5 +#, python-format +msgid "" +"Are you sure you want to delete this user and mark all their nodes as " +"private? %(guid)s" +msgstr "" + +#: .\admin\templates\users\remove_spam_user.html:8 +#: .\admin\templates\users\restore_ham_user.html:8 +msgid "" +"You will be able to re-activate the user, but the admin console does not " +"currently have the ability to mark nodes as public." +msgstr "" + +#: .\admin\templates\users\remove_user.html:5 +#, python-format +msgid "Are you sure you want to delete this user? %(guid)s" +msgstr "" + +#: .\admin\templates\users\reset.html:5 +msgid "Choose email to send reset link" +msgstr "" + +#: .\admin\templates\users\reset.html:8 +#, python-format +msgid "User: %(guid)s" +msgstr "" + +#: .\admin\templates\users\restore_ham_user.html:5 +#, python-format +msgid "Are you sure you want to re-enable this user? %(guid)s" +msgstr "" + +#: .\admin\templates\users\search.html:9 .\admin\templates\users\search.html:14 +#: .\admin\templates\users\workshop.html:6 +msgid "User Search" +msgstr "" + +#: .\admin\templates\users\search.html:27 +msgid "User Workshop Follow-up" +msgstr "" + +#: .\admin\templates\users\search.html:33 +msgid "Go" +msgstr "" + +#: .\admin\templates\users\user.html:29 +msgid "Related spam" +msgstr "" + +#: .\admin\templates\users\user.html:33 +msgid "Send reset password email" +msgstr "" + +#: .\admin\templates\users\user.html:35 +msgid "Get password reset link" +msgstr "" + +#: .\admin\templates\users\user.html:37 .\admin\templates\users\user.html:42 +msgid "Get confirmation link" +msgstr "" + +#: .\admin\templates\users\user.html:40 +msgid "Get claim links" +msgstr "" + +#: .\admin\templates\users\user.html:47 +msgid "Desk profile" +msgstr "" + +#: .\admin\templates\users\user.html:48 +msgid "Desk cases" +msgstr "" + +#: .\admin\templates\users\user.html:50 +msgid "Merge Account" +msgstr "" + +#: .\admin\templates\users\user.html:58 +msgid "GDPR Delete Account" +msgstr "" + +#: .\admin\templates\users\user.html:62 .\admin\templates\users\user.html:64 +msgid "Requested account deactivation" +msgstr "" + +#: .\admin\templates\users\user.html:66 +msgid "Force disable account" +msgstr "" + +#: .\admin\templates\users\user.html:74 +msgid "Disable Spam account" +msgstr "" + +#: .\admin\templates\users\user.html:76 +msgid "Re-enable Ham account" +msgstr "" + +#: .\admin\templates\users\user.html:79 +msgid "Send reset" +msgstr "" + +#: .\admin\templates\users\user.html:175 +msgid "GakuNin RDM account" +msgstr "" + +#: .\admin\templates\users\user.html:185 +msgid "Emails" +msgstr "" + +#: .\admin\templates\users\user.html:190 +msgid "Primary: " +msgstr "" + +#: .\admin\templates\users\user.html:202 +msgid "Registered" +msgstr "" + +#: .\admin\templates\users\user.html:206 +msgid "Confirmed" +msgstr "" + +#: .\admin\templates\users\user.html:210 +msgid "Last login" +msgstr "" + +#: .\admin\templates\users\user.html:214 +msgid "Disabled" +msgstr "" + +#: .\admin\templates\users\user.html:218 +msgid "Two factor" +msgstr "" + +#: .\admin\templates\users\user.html:226 +msgid "Deactivate" +msgstr "" + +#: .\admin\templates\users\user.html:237 +msgid "System tags" +msgstr "" + +#: .\admin\templates\users\user.html:246 +msgid "add system tag" +msgstr "" + +#: .\admin\templates\users\user.html:258 +msgid "GakuNin RDM Groups" +msgstr "" + +#: .\admin\templates\users\user.html:271 +msgid "User is spammy" +msgstr "" + +#: .\admin\templates\users\user.html:281 +msgid "Profile content checked for spam" +msgstr "" + +#: .\admin\templates\users\user.html:346 +msgid "Quota for NII Storage (GB)" +msgstr "" + +#: .\admin\templates\users\user_details.html:60 +msgid "Quota for Institutional Storage (GB)" +msgstr "" + +#: .\admin\templates\users\user_list.html:68 +msgid "Are you sure the selected user(s) are spam?" +msgstr "" + +#: .\admin\templates\users\workshop.html:15 +msgid "Upload" +msgstr "" + +#: .\admin\templates\util\pagination.html:25 +#, python-format +msgid "Page %(itemsNumber)s of %(paginatorNumPage)s" +msgstr "" + +#: admin/templates/rdm_addons/myskelton_institution_settings.html:12 +msgid "Admin Notes" +msgstr "" + +#: admin/templates/rdm_addons/myskelton_institution_settings.html:15 +msgid "Some notes for users by organization administrator..." +msgstr "" diff --git a/site/guides/admin-addon/admin/translations/en/LC_MESSAGES/django.po b/site/guides/admin-addon/admin/translations/en/LC_MESSAGES/django.po new file mode 100644 index 0000000..5a88577 --- /dev/null +++ b/site/guides/admin-addon/admin/translations/en/LC_MESSAGES/django.po @@ -0,0 +1,3101 @@ +# English translations for . +# Copyright (C) 2020 ORGANIZATION +# This file is distributed under the same license as the project. +# FIRST AUTHOR , 2020. +# 1.{% trans "XXX" %} is extracted by the command 'django-admin makemessages +# --keep-pot -l ja' +# 2.edit the header to babel extracting form. +# +msgid "" +msgstr "" +"Project-Id-Version: 0.6.0\n" +"Report-Msgid-Bugs-To: rocs-office@nii.ac.jp\n" +"POT-Creation-Date: 2020-09-02 11:10+0900\n" +"PO-Revision-Date: 2020-09-03 12:08+0900\n" +"Last-Translator: Shunta Nishikawa\n" +"Language: en\n" +"Language-Team: RCOS \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.7.0\n" + +#: .\admin\templates\banners\confirm_delete.html:4 +msgid "GakuNin RDM Admin | Delete banner" +msgstr "" + +#: .\admin\templates\banners\confirm_delete.html:10 +msgid "Confirm Delete Banner" +msgstr "" + +#: .\admin\templates\banners\confirm_delete.html:13 +#, python-format +msgid "" +"Are you sure you want to delete %(objectName)s? It is scheduled " +"for %(startDate)s -\n" +" %(endDate)s" +msgstr "" + +#: .\admin\templates\banners\confirm_delete.html:16 +#: .\admin\templates\institutions\confirm_delete.html:20 +#: .\admin\templates\maintenance\delete_maintenance.html:12 +#: .\admin\templates\nodes\confirm_ham.html:9 +#: .\admin\templates\nodes\confirm_spam.html:9 +#: .\admin\templates\nodes\node.html:395 +#: .\admin\templates\nodes\node_list.html:108 +#: .\admin\templates\nodes\reindex_node_elastic.html:9 +#: .\admin\templates\nodes\reindex_node_share.html:9 +#: .\admin\templates\nodes\remove_contributor.html:15 +#: .\admin\templates\nodes\remove_node.html:12 +#: .\admin\templates\rdm_timestampadd\node_list.html:122 +#: .\admin\templates\users\GDPR_delete_user.html:12 +#: .\admin\templates\users\add_system_tag.html:12 +#: .\admin\templates\users\reindex_user_elastic.html:9 +#: .\admin\templates\users\remove_2_factor.html:12 +#: .\admin\templates\users\remove_spam_user.html:12 +#: .\admin\templates\users\remove_user.html:12 +#: .\admin\templates\users\restore_ham_user.html:12 +#: .\admin\templates\users\user_list.html:71 +msgid "Confirm" +msgstr "確認" + +#: .\admin\templates\banners\create.html:5 +msgid "GakuNin RDM Admin | Schedule banner" +msgstr "" + +#: .\admin\templates\banners\create.html:11 +msgid "Schedule a banner" +msgstr "" + +#: .\admin\templates\banners\create.html:29 +#: .\admin\templates\institutions\create.html:24 +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:57 +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:24 +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:38 +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:64 +#: .\admin\templates\rdm_addons\addons\s3_credentials_modal.html:31 +#: .\admin\templates\rdm_announcement\settings.html:94 +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:63 +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:59 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:85 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:55 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:59 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:90 +#: .\admin\templates\rdm_custom_storage_location\providers\osfstorage_modal.html:22 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:55 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:38 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:42 +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:59 +msgid "Save" +msgstr "" + +#: .\admin\templates\banners\detail.html:11 +msgid "Banner" +msgstr "" + +#: .\admin\templates\banners\detail.html:42 +msgid "Modify banner" +msgstr "" + +#: .\admin\templates\banners\list.html:11 +#: .\admin\templates\banners\list.html:14 +msgid "List of Banners" +msgstr "" + +#: .\admin\templates\banners\list.html:20 +#: .\admin\templates\collection_providers\list.html:15 +#: .\admin\templates\desk\customer.html:16 +#: .\admin\templates\institutions\institution_list.html:21 +#: .\admin\templates\institutions\list.html:21 +#: .\admin\templates\meetings\list.html:21 .\admin\templates\messages.html:16 +#: .\admin\templates\nodes\node.html:200 +#: .\admin\templates\osf\providerassetfile_list.html:28 +#: .\admin\templates\rdm_addons\institution_list.html:29 +#: .\admin\templates\rdm_keymanagement\institutions.html:21 +#: .\admin\templates\rdm_statistics\institution_list.html:29 +#: .\admin\templates\rdm_timestampadd\list.html:21 +#: .\admin\templates\rdm_timestampsettings\list.html:21 +#: .\admin\templates\users\user.html:171 .\admin\templates\users\user.html:291 +#: .\admin\templates\users\user_details.html:35 +msgid "Name" +msgstr "" + +#: .\admin\templates\banners\list.html:21 +msgid "Dates" +msgstr "" + +#: .\admin\templates\banners\list.html:22 +msgid "Color" +msgstr "" + +#: .\admin\templates\banners\list.html:23 +#: .\admin\templates\osf\subject_form.html:8 +msgid "Text" +msgstr "" + +#: .\admin\templates\banners\list.html:44 +msgid "Delete banner" +msgstr "" + +#: .\admin\templates\base.html:10 .\admin\templates\base.html:157 +#: .\admin\templates\base.html:233 .\admin\templates\base.html:236 +#: .\admin\templates\base.html:239 .\admin\templates\base.html:242 +#: .\admin\templates\base.html:246 .\admin\templates\base.html:279 +msgid "RDM" +msgstr "" + +#: .\admin\templates\base.html:10 +msgid "Admin | Dashboard" +msgstr "" + +#: .\admin\templates\base.html:56 .\admin\templates\login.html:20 +msgid "Admin" +msgstr "" + +#: .\admin\templates\base.html:69 +#, python-format +msgid "Logged in as %(userfullname)s" +msgstr "" + +#: .\admin\templates\base.html:77 +msgid "Admin-User Registration" +msgstr "" + +#: .\admin\templates\base.html:83 +msgid "Desk information" +msgstr "" + +#: .\admin\templates\base.html:89 +msgid "Sign out" +msgstr "" + +#: .\admin\templates\base.html:105 +msgid "Menu" +msgstr "" + +#: .\admin\templates\base.html:108 .\admin\templates\base.html:113 +msgid "RDM Nodes" +msgstr "" + +#: .\admin\templates\base.html:114 .\admin\templates\base.html:131 +#: .\admin\templates\base.html:146 +msgid "Flagged Spam" +msgstr "" + +#: .\admin\templates\base.html:115 .\admin\templates\base.html:132 +#: .\admin\templates\base.html:147 +msgid "Known Spam" +msgstr "" + +#: .\admin\templates\base.html:116 .\admin\templates\base.html:133 +#: .\admin\templates\base.html:148 +msgid "Known Ham" +msgstr "" + +#: .\admin\templates\base.html:124 .\admin\templates\base.html:130 +#: .\admin\templates\metrics\osf_metrics.html:36 +msgid "Preprints" +msgstr "" + +#: .\admin\templates\base.html:134 +msgid "Withdrawal Requests" +msgstr "" + +#: .\admin\templates\base.html:141 .\admin\templates\base.html:145 +msgid "RDM Users" +msgstr "" + +#: .\admin\templates\base.html:153 +msgid "RDM Spam" +msgstr "" + +#: .\admin\templates\base.html:157 +msgid "Registrations" +msgstr "" + +#: .\admin\templates\base.html:161 +msgid "All Registrations" +msgstr "" + +#: .\admin\templates\base.html:162 +msgid "Stuck Registrations" +msgstr "" + +#: .\admin\templates\base.html:168 +msgid "RDM Institutions" +msgstr "" + +#: .\admin\templates\base.html:172 .\admin\templates\base.html:185 +#: .\admin\templates\base.html:199 .\admin\templates\base.html:212 +#: .\admin\templates\base.html:225 .\admin\templates\base.html:251 +#: .\admin\templates\base.html:261 +msgid "List" +msgstr "" + +#: .\admin\templates\base.html:174 .\admin\templates\base.html:188 +#: .\admin\templates\base.html:201 .\admin\templates\base.html:214 +#: .\admin\templates\base.html:227 .\admin\templates\base.html:263 +msgid "Create" +msgstr "" + +#: .\admin\templates\base.html:181 +msgid "Preprint Providers" +msgstr "" + +#: .\admin\templates\base.html:186 +msgid "Whitelist" +msgstr "" + +#: .\admin\templates\base.html:195 +msgid "Provider Assets" +msgstr "" + +#: .\admin\templates\base.html:208 +msgid "Collection Providers" +msgstr "" + +#: .\admin\templates\base.html:221 +msgid "Registration Providers" +msgstr "" + +#: .\admin\templates\base.html:233 +msgid "Meetings" +msgstr "" + +#: .\admin\templates\base.html:236 +msgid "Prereg" +msgstr "" + +#: .\admin\templates\base.html:239 +msgid "Metrics" +msgstr "" + +#: .\admin\templates\base.html:242 +msgid "Subjects" +msgstr "" + +#: .\admin\templates\base.html:246 +msgid "Groups" +msgstr "" + +#: .\admin\templates\base.html:250 +msgid "Search" +msgstr "" + +#: .\admin\templates\base.html:257 +msgid "Banners" +msgstr "" + +#: .\admin\templates\base.html:270 +msgid "Maintenance Alerts" +msgstr "" + +#: .\admin\templates\base.html:273 +#: .\admin\templates\rdm_addons\addon_list.html:6 +#: .\admin\templates\rdm_addons\addon_list.html:17 +#: .\admin\templates\rdm_addons\addon_list.html:19 +#: .\admin\templates\rdm_addons\institution_list.html:13 +#: .\admin\templates\rdm_addons\institution_list.html:17 +msgid "RDM Addons" +msgstr "" + +#: .\admin\templates\base.html:274 +#: .\admin\templates\rdm_statistics\crawl.html:6 +#: .\admin\templates\rdm_statistics\crawl.html:9 +#: .\admin\templates\rdm_statistics\index.html:6 +#: .\admin\templates\rdm_statistics\index.html:9 +#: .\admin\templates\rdm_statistics\institution_list.html:13 +#: .\admin\templates\rdm_statistics\institution_list.html:17 +#: .\admin\templates\rdm_statistics\mail.html:11 +#: .\admin\templates\rdm_statistics\mail.html:14 +#: .\admin\templates\rdm_statistics\statistics.html:32 +#: .\admin\templates\rdm_statistics\statistics.html:35 +msgid "RDM Statistics" +msgstr "" + +#: .\admin\templates\base.html:275 +#: .\admin\templates\rdm_announcement\index.html:6 +#: .\admin\templates\rdm_announcement\index.html:11 +#: .\admin\templates\rdm_announcement\index.html:13 +#: .\admin\templates\rdm_announcement\send.html:7 +#: .\admin\templates\rdm_announcement\send.html:12 +#: .\admin\templates\rdm_announcement\send.html:14 +#: .\admin\templates\rdm_announcement\settings.html:7 +#: .\admin\templates\rdm_announcement\settings.html:12 +#: .\admin\templates\rdm_announcement\settings.html:14 +msgid "RDM Announcement" +msgstr "" + +#: .\admin\templates\base.html:276 +msgid "Timestamp Control" +msgstr "" + +#: .\admin\templates\base.html:278 +msgid "User Keys Management" +msgstr "" + +#: .\admin\templates\base.html:279 +msgid "Timestamp Environment" +msgstr "" + +#: .\admin\templates\base.html:284 +msgid "Quota for NII Storage" +msgstr "" + +#: .\admin\templates\base.html:287 +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:16 +#: .\admin\templates\users\user_details.html:17 +msgid "Institutional Storage" +msgstr "" + +#: .\admin\templates\base.html:288 +msgid "Quota for Institutional Storage" +msgstr "" + +#: .\admin\templates\base.html:303 .\admin\templates\home.html:10 +msgid "Welcome to the GakuNin RDM Admin Home Page" +msgstr "" + +#: .\admin\templates\base.html:313 +msgid "National Institute of Informatics" +msgstr "" + +#: .\admin\templates\collection_providers\cannot_delete.html:7 +msgid "Collection Provider Delete" +msgstr "" + +#: .\admin\templates\collection_providers\cannot_delete.html:13 +#, python-format +msgid "Cannot Delete %(providerName)s" +msgstr "" + +#: .\admin\templates\collection_providers\cannot_delete.html:14 +#, python-format +msgid "" +"%(providerName)s has %(collectionsubmissionSetCount)s submissions " +"associated with it, and therefore cannot be safely deleted." +msgstr "" + +#: .\admin\templates\collection_providers\confirm_delete.html:5 +msgid "Delete Collection Provider" +msgstr "" + +#: .\admin\templates\collection_providers\confirm_delete.html:12 +#: .\admin\templates\institutions\confirm_delete.html:19 +#, python-format +msgid "Are you sure you want to delete \"%(objectName)s\"?" +msgstr "" + +#: .\admin\templates\collection_providers\create.html:9 +msgid "Create Collection Provider" +msgstr "" + +#: .\admin\templates\collection_providers\create.html:12 +msgid "Create A Collection Provider" +msgstr "" + +#: .\admin\templates\collection_providers\detail.html:16 +msgid "Export collection provider metadata" +msgstr "" + +#: .\admin\templates\collection_providers\detail.html:17 +msgid "Delete collection provider" +msgstr "" + +#: .\admin\templates\collection_providers\detail.html:28 +msgid "Modify Collection Provider" +msgstr "" + +#: .\admin\templates\collection_providers\list.html:6 +#: .\admin\templates\collection_providers\list.html:9 +msgid "List of Collection Providers" +msgstr "" + +#: .\admin\templates\collection_providers\list.html:16 +#: .\admin\templates\institutions\institution_list.html:22 +#: .\admin\templates\institutions\list.html:22 +#: .\admin\templates\messages.html:17 +#: .\admin\templates\rdm_keymanagement\institutions.html:22 +#: .\admin\templates\rdm_timestampadd\list.html:22 +msgid "Description" +msgstr "" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:62 +msgid "Collected type choices:" +msgstr "" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:68 +msgid "Status choices:" +msgstr "" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:74 +msgid "Volume choices:" +msgstr "" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:80 +msgid "Issue choices:" +msgstr "" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:86 +msgid "Program Area choices:" +msgstr "" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:96 +#: .\admin\templates\institutions\create.html:29 +#: .\admin\templates\institutions\detail.html:80 +msgid "Import from JSON" +msgstr "" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:97 +msgid "" +"Choose a JSON file that has been previously exported from another " +"Collection Provider detail page. This will pre-populate the Collection " +"Provider change form with those details." +msgstr "" + +#: .\admin\templates\desk\cases.html:6 +#, python-format +msgid "GakuNin RDM user \"%(user_id)s\" up to 50 most recent desk.com cases:" +msgstr "" + +#: .\admin\templates\desk\cases.html:10 .\admin\templates\desk\customer.html:40 +msgid "Type" +msgstr "" + +#: .\admin\templates\desk\cases.html:11 +msgid "Status" +msgstr "" + +#: .\admin\templates\desk\cases.html:12 +msgid "Subject" +msgstr "" + +#: .\admin\templates\desk\cases.html:13 +msgid "Links to Desk" +msgstr "" + +#: .\admin\templates\desk\cases.html:23 .\admin\templates\messages.html:35 +msgid "Link" +msgstr "" + +#: .\admin\templates\desk\cases.html:28 +msgid "No cases" +msgstr "" + +#: .\admin\templates\desk\cases.html:35 .\admin\templates\desk\customer.html:58 +#: .\admin\templates\desk\desk_error.html:14 +#: .\admin\templates\desk\user_not_found.html:13 +#: .\admin\templates\rdm_addons\oauth_complete.html:57 +#: .\admin\templates\spam\email.html:31 +msgid "Close" +msgstr "" + +#: .\admin\templates\desk\customer.html:10 +#: .\admin\templates\nodes\node.html:139 .\admin\templates\nodes\node.html:328 +#: .\admin\templates\users\user.html:165 +#: .\admin\templates\users\user_details.html:23 +msgid "Field" +msgstr "" + +#: .\admin\templates\desk\customer.html:11 +#: .\admin\templates\nodes\node.html:140 .\admin\templates\nodes\node.html:329 +#: .\admin\templates\users\user.html:166 +#: .\admin\templates\users\user_details.html:24 +msgid "Value" +msgstr "" + +#: .\admin\templates\desk\customer.html:20 +msgid "Company" +msgstr "" + +#: .\admin\templates\desk\customer.html:24 +msgid "Background" +msgstr "" + +#: .\admin\templates\desk\customer.html:27 +msgid "Desk id" +msgstr "" + +#: .\admin\templates\desk\customer.html:31 +#: .\admin\templates\desk\user_not_found.html:11 +msgid "Go to Desk" +msgstr "" + +#: .\admin\templates\desk\customer.html:35 +#: .\admin\templates\desk\customer.html:41 .\admin\templates\messages.html:8 +#: .\admin\templates\spam\detail.html:24 .\admin\templates\users\user.html:193 +msgid "Email" +msgstr "" + +#: .\admin\templates\desk\desk_error.html:12 +msgid "Desk Settings" +msgstr "" + +#: .\admin\templates\desk\settings.html:5 +msgid "Desk user settings" +msgstr "" + +#: .\admin\templates\desk\user_not_found.html:7 +msgid "To add a new desk customer, you can go to Desk in order to complete this." +msgstr "" + +#: .\admin\templates\emails\password_change_done.html:3 +msgid "Documentation" +msgstr "" + +#: .\admin\templates\emails\password_change_done.html:3 +msgid "Change password" +msgstr "" + +#: .\admin\templates\emails\password_change_done.html:3 +msgid "'Log out'" +msgstr "" + +#: .\admin\templates\emails\password_change_done.html:6 +msgid "Home" +msgstr "" + +#: .\admin\templates\emails\password_change_done.html:7 +msgid "Password change" +msgstr "" + +#: .\admin\templates\emails\password_change_done.html:14 +msgid "Your password has been changed." +msgstr "" + +#: .\admin\templates\emails\password_change_done.html:16 +msgid "Return to home" +msgstr "" + +#: .\admin\templates\emails\password_reset_email.html:2 +msgid "" +"You're receiving this email because you requested a password reset for " +"your GakuNin RDM Admin user account." +msgstr "" + +#: .\admin\templates\emails\password_reset_email.html:4 +msgid "Please go to this link to reset your password:" +msgstr "" + +#: .\admin\templates\emails\password_reset_email.html:9 +msgid "Your account email is:" +msgstr "" + +#: .\admin\templates\emails\password_reset_email.html:11 +msgid "Thank you." +msgstr "" + +#: .\admin\templates\emails\password_reset_email.html:13 +msgid "-GakuNin RDM Admin" +msgstr "" + +#: .\admin\templates\home.html:5 +#, python-format +msgid "Hello %(userfullname)s, " +msgstr "" + +#: .\admin\templates\home.html:8 +msgid "Welcome to the GakuNin RDM General Admin Home Page" +msgstr "" + +#: .\admin\templates\home.html:12 +msgid " Use the menu on the left to access admin pages. " +msgstr "" + +#: .\admin\templates\institutions\cannot_delete.html:7 +#: .\admin\templates\institutions\confirm_delete.html:11 +msgid "Institution Delete" +msgstr "" + +#: .\admin\templates\institutions\cannot_delete.html:13 +#, python-format +msgid "Cannot Delete %(institutionName)s" +msgstr "" + +#: .\admin\templates\institutions\cannot_delete.html:14 +#, python-format +msgid "" +"%(institutionName)s has %(institutionNodeCount)s nodes associated with " +"it, and therefore cannot be safely deleted." +msgstr "" + +#: .\admin\templates\institutions\cannot_delete.html:15 +msgid "View associated nodes here" +msgstr "" + +#: .\admin\templates\institutions\cannot_delete.html:16 +msgid "Back to institution detail" +msgstr "" + +#: .\admin\templates\institutions\confirm_delete.html:17 +msgid "Confirm Institution Delete" +msgstr "" + +#: .\admin\templates\institutions\create.html:10 +msgid "Create Institution" +msgstr "" + +#: .\admin\templates\institutions\create.html:16 +msgid "Create An Institution" +msgstr "" + +#: .\admin\templates\institutions\create.html:30 +#: .\admin\templates\institutions\detail.html:81 +msgid "" +"Choose a JSON file that has been previously exported from another " +"Institution detail page. This will pre-populate the Institution change " +"form with those details." +msgstr "" + +#: .\admin\templates\institutions\create.html:34 +msgid "Import" +msgstr "" + +#: .\admin\templates\institutions\detail.html:16 +msgid "Export institution metadata" +msgstr "" + +#: .\admin\templates\institutions\detail.html:18 +msgid "Delete institution" +msgstr "" + +#: .\admin\templates\institutions\detail.html:30 +#, python-format +msgid "View %(node_count)s affiliated nodes" +msgstr "" + +#: .\admin\templates\institutions\detail.html:35 +msgid "Logo:" +msgstr "" + +#: .\admin\templates\institutions\detail.html:41 +msgid "Banner:" +msgstr "" + +#: .\admin\templates\institutions\detail.html:52 +#: .\admin\templates\institutions\detail.html:103 +msgid "Modify Institution" +msgstr "" + +#: .\admin\templates\institutions\detail.html:103 +msgid "Hide Form" +msgstr "" + +#: .\admin\templates\institutions\institution_list.html:11 +#: .\admin\templates\institutions\institution_list.html:14 +#: .\admin\templates\institutions\list.html:11 +#: .\admin\templates\institutions\list.html:14 +#: .\admin\templates\rdm_keymanagement\institutions.html:11 +#: .\admin\templates\rdm_keymanagement\institutions.html:14 +#: .\admin\templates\rdm_timestampadd\list.html:11 +#: .\admin\templates\rdm_timestampadd\list.html:14 +#: .\admin\templates\rdm_timestampsettings\list.html:11 +#: .\admin\templates\rdm_timestampsettings\list.html:14 +msgid "List of Institutions" +msgstr "" + +#: .\admin\templates\institutions\institution_list.html:20 +#: .\admin\templates\institutions\list.html:20 +#: .\admin\templates\rdm_addons\institution_list.html:29 +#: .\admin\templates\rdm_keymanagement\institutions.html:20 +#: .\admin\templates\rdm_statistics\institution_list.html:29 +#: .\admin\templates\rdm_timestampadd\list.html:20 +#: .\admin\templates\rdm_timestampsettings\list.html:20 +#: .\admin\templates\rdm_timestampsettings\list.html:50 +msgid "Logo" +msgstr "" + +#: .\admin\templates\institutions\list_institute.html:10 +#, python-format +msgid "%(institution_name)s User List - Statistical Status of NII Storage" +msgstr "" + +#: .\admin\templates\institutions\list_institute.html:16 +#: .\admin\templates\institutions\statistical_status_default_storage.html:16 +#: .\admin\templates\rdm_keymanagement\delete_user_list.html:10 +#: .\admin\templates\users\list.html:11 +msgid "No results found" +msgstr "" + +#: .\admin\templates\institutions\node_list.html:11 +#: .\admin\templates\metrics\osf_metrics.html:227 +#: .\admin\templates\metrics\osf_metrics.html:281 +#: .\admin\templates\rdm_timestampadd\node_list.html:12 +#: .\admin\templates\rdm_timestampsettings\node_list.html:11 +msgid "Affiliated Nodes" +msgstr "" + +#: .\admin\templates\institutions\node_list.html:14 +#: .\admin\templates\rdm_timestampadd\node_list.html:15 +#: .\admin\templates\rdm_timestampsettings\node_list.html:14 +#, python-format +msgid "List of Nodes for %(institutionName)s" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage.html:10 +#, python-format +msgid "" +"%(institution_name)s User List - Statistical Status of Institutional " +"Storage" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:2 +#: .\admin\templates\users\user_details.html:11 +#: .\admin\templates\users\user_details.html:16 +msgid "Statistical Status of Institutional Storage" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:3 +#, python-format +msgid "Institutional Storage > %(institution_name)s" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:11 +#: .\admin\templates\institutions\user_list_by_institute.html:11 +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:42 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:35 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:36 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:32 +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:34 +#: .\admin\templates\rdm_keymanagement\user_list.html:10 +#: .\admin\templates\users\user.html:181 +#: .\admin\templates\users\user_list.html:23 +msgid "Username" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:16 +#: .\admin\templates\institutions\user_list_by_institute.html:16 +#: .\admin\templates\rdm_keymanagement\user_list.html:11 +#: .\admin\templates\users\user_list.html:24 +msgid "Fullname" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:21 +#: .\admin\templates\institutions\user_list_by_institute.html:21 +msgid "Ratio" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:26 +#: .\admin\templates\institutions\user_list_by_institute.html:26 +msgid "Usage" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:31 +#: .\admin\templates\institutions\user_list_by_institute.html:31 +msgid "Remaining" +msgstr "" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:36 +#: .\admin\templates\institutions\user_list_by_institute.html:36 +msgid "Quota" +msgstr "" + +#: .\admin\templates\institutions\user_list_by_institute.html:2 +msgid "Statistical Status of NII Storage" +msgstr "" + +#: .\admin\templates\institutions\user_list_by_institute.html:3 +#, python-format +msgid "NII Storage > %(institution_name)s" +msgstr "" + +#: .\admin\templates\login.html:6 +msgid "GakuNin RDM Admin | Log in" +msgstr "" + +#: .\admin\templates\login.html:20 +msgid "GakuNin RDM" +msgstr "" + +#: .\admin\templates\login.html:23 +msgid "Sign in to start your session" +msgstr "" + +#: .\admin\templates\login.html:35 +msgid "Email:" +msgstr "" + +#: .\admin\templates\login.html:40 +msgid "Password:" +msgstr "" + +#: .\admin\templates\login.html:47 +msgid "Sign In" +msgstr "" + +#: .\admin\templates\maintenance\delete_maintenance.html:5 +msgid "Are you sure you want to take down this maintenance alert?" +msgstr "" + +#: .\admin\templates\maintenance\delete_maintenance.html:8 +msgid "It will be removed from all GakuNin RDM pages." +msgstr "" + +#: .\admin\templates\maintenance\display.html:8 +#: .\admin\templates\maintenance\display.html:11 +msgid "Maintenance State" +msgstr "" + +#: .\admin\templates\maintenance\display.html:16 +msgid "Time" +msgstr "" + +#: .\admin\templates\maintenance\display.html:17 +msgid "Message" +msgstr "" + +#: .\admin\templates\maintenance\display.html:18 +#: .\admin\templates\messages.html:30 +#: .\admin\templates\osf\subject_list.html:18 +msgid "Level" +msgstr "" + +#: .\admin\templates\maintenance\display.html:24 +msgid "Current alert:" +msgstr "" + +#: .\admin\templates\maintenance\display.html:31 +msgid "" +"The site will undergo maintenance between <localized start " +"time>-<localized end time>. Thank you for your patience." +msgstr "" + +#: .\admin\templates\maintenance\display.html:37 +msgid "Remove alert" +msgstr "" + +#: .\admin\templates\maintenance\display.html:54 +msgid "Put up an alert:" +msgstr "" + +#: .\admin\templates\maintenance\display.html:59 +msgid "Start" +msgstr "" + +#: .\admin\templates\maintenance\display.html:59 +#: .\admin\templates\maintenance\display.html:60 +msgid "Eastern Date/Time" +msgstr "" + +#: .\admin\templates\maintenance\display.html:60 +msgid "End" +msgstr "" + +#: .\admin\templates\maintenance\display.html:63 +msgid "Message:" +msgstr "" + +#: .\admin\templates\maintenance\display.html:64 +msgid "Reminder:" +msgstr "" + +#: .\admin\templates\maintenance\display.html:64 +msgid "" +"This alert will go up as soon as it is created and will have to be " +"manually removed. (Creating a new alert automatically removes an existing" +" one.)" +msgstr "" + +#: .\admin\templates\maintenance\display.html:65 +msgid "Submit@send" +msgstr "Submit" + +#: .\admin\templates\meetings\create.html:7 +msgid "GakuNIn RDM Admin | Meetings" +msgstr "" + +#: .\admin\templates\meetings\detail.html:7 +#: .\admin\templates\meetings\list.html:7 +msgid "GakuNin RDM Admin | Meetings" +msgstr "" + +#: .\admin\templates\meetings\list.html:12 +msgid "Add meeting" +msgstr "" + +#: .\admin\templates\meetings\list.html:15 +msgid "List of Meetings" +msgstr "" + +#: .\admin\templates\meetings\list.html:20 +msgid "Endpoint" +msgstr "" + +#: .\admin\templates\meetings\list.html:22 +msgid "Active" +msgstr "" + +#: .\admin\templates\meetings\list.html:23 +#: .\admin\templates\metrics\osf_metrics.html:681 +msgid "Public Projects" +msgstr "" + +#: .\admin\templates\meetings\list.html:24 +msgid "Submissions" +msgstr "" + +#: .\admin\templates\messages.html:3 +msgid "API Key" +msgstr "" + +#: .\admin\templates\messages.html:4 +msgid "API Secret" +msgstr "" + +#: .\admin\templates\messages.html:5 +msgid "Access Token" +msgstr "" + +#: .\admin\templates\messages.html:6 +msgid "Access Token Secret" +msgstr "" + +#: .\admin\templates\messages.html:7 +msgid "API URL" +msgstr "" + +#: .\admin\templates\messages.html:9 +msgid "None" +msgstr "" + +#: .\admin\templates\messages.html:10 +msgid "title" +msgstr "" + +#: .\admin\templates\messages.html:11 +msgid "text" +msgstr "" + +#: .\admin\templates\messages.html:12 +msgid "Type@announcement" +msgstr "Type" + +#: .\admin\templates\messages.html:13 +msgid "name" +msgstr "" + +#: .\admin\templates\messages.html:14 +msgid "email" +msgstr "" + +#: .\admin\templates\messages.html:15 +msgid "Last logged" +msgstr "" + +#: .\admin\templates\messages.html:18 +msgid "Banner name" +msgstr "" + +#: .\admin\templates\messages.html:19 +msgid "Logo name" +msgstr "" + +#: .\admin\templates\messages.html:20 +msgid "Delegation protocol" +msgstr "" + +#: .\admin\templates\messages.html:21 +msgid "Login url" +msgstr "" + +#: .\admin\templates\messages.html:22 +msgid "Logout url" +msgstr "" + +#: .\admin\templates\messages.html:23 +msgid "Domains" +msgstr "" + +#: .\admin\templates\messages.html:24 +msgid "Email domains" +msgstr "" + +#: .\admin\templates\messages.html:25 +msgid "File" +msgstr "" + +#: .\admin\templates\messages.html:26 +msgid "CAS by pac4j" +msgstr "" + +#: .\admin\templates\messages.html:27 +msgid "OAuth by pac4j" +msgstr "" + +#: .\admin\templates\messages.html:28 +msgid "SAML by Shibboleth" +msgstr "" + +#: .\admin\templates\messages.html:29 +msgid "No Delegation Protocol" +msgstr "" + +#: .\admin\templates\messages.html:31 +msgid "Alt text for accessibility" +msgstr "" + +#: .\admin\templates\messages.html:32 +msgid "Start date" +msgstr "" + +#: .\admin\templates\messages.html:33 +msgid "End date" +msgstr "" + +#: .\admin\templates\messages.html:34 +msgid "License" +msgstr "" + +#: .\admin\templates\messages.html:36 +msgid "Default photo" +msgstr "" + +#: .\admin\templates\messages.html:37 +msgid "Mobile photo" +msgstr "" + +#: .\admin\templates\messages.html:38 +msgid "Default photo alt text" +msgstr "" + +#: .\admin\templates\messages.html:39 +msgid "Mobile photo alt text" +msgstr "" + +#: .\admin\templates\messages.html:40 +msgid "Select a file" +msgstr "" + +#: .\admin\templates\messages.html:41 +msgid "node" +msgstr "" + +#: .\admin\templates\messages.html:42 +msgid "project" +msgstr "" + +#: .\admin\templates\messages.html:43 +msgid "addon" +msgstr "" + +#: .\admin\templates\messages.html:44 +msgid "comment" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:7 +#: .\admin\templates\metrics\osf_metrics.html:26 +#: .\admin\templates\metrics\osf_statistics.html:6 +msgid "GakuNin RDM Metrics" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:30 +#: .\admin\templates\metrics\osf_metrics.html:45 +msgid "User Data" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:31 +#: .\admin\templates\metrics\osf_metrics.html:216 +msgid "Institution Metrics" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:32 +msgid "Active User Metrics" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:33 +#: .\admin\templates\metrics\osf_metrics.html:573 +msgid "Healthy User Metrics" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:34 +#: .\admin\templates\metrics\osf_metrics.html:636 +msgid "Raw Numbers" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:35 +#: .\admin\templates\metrics\osf_metrics.html:926 +msgid "Addons" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:37 +#: .\admin\templates\metrics\osf_metrics.html:645 +#: .\admin\templates\metrics\osf_metrics.html:977 +#: .\admin\templates\metrics\osf_metrics.html:1011 +msgid "Downloads" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:54 +msgid "User Growth" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:55 +msgid "User gain per day" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:56 +msgid "Registrations by Email Domain" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:57 +msgid "Node Logs by User" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:70 +msgid "User Growth - Previous 800 days" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:76 +msgid "The growth of GakuNin RDM Confirmed Users over the past 800 days." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:83 +msgid "Total Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:89 +msgid "This is the total number of GakuNin RDM Users with confirmed accounts." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:99 +msgid "Monthly User Increase" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:105 +#: .\admin\templates\metrics\osf_metrics.html:146 +msgid "The number of users gained in the past month." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:112 +msgid "Daily User Increase" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:118 +msgid "The number of users gained from two days ago until yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:125 +msgid "Average Daily User Gain" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:131 +msgid "The average daily user gain over the past 7 days." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:140 +msgid "User Gain per Day" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:155 +msgid "Unverified New Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:161 +msgid "Users created within the last 7 days that have not been confirmed." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:168 +msgid "User Growth over the Last Seven Days" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:174 +msgid "" +"The last 7 days of users, organized by status. Click a category in the " +"legend to resize the axes." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:183 +msgid "Previous 7 days of user registrations by email domain" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:189 +msgid "The last 7 days of users, organized by status." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:198 +msgid "Yesterday's Node logs by user" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:205 +msgid "The last day of node logs by user, if a user had over 100 node logs." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:225 +msgid "Total Institutional Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:226 +msgid "Institutional Users Growth" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:228 +#: .\admin\templates\metrics\osf_metrics.html:343 +msgid "Affiliated Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:238 +msgid "Total institutional Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:244 +msgid "" +"Total number of users who have accounts associated with their " +"institutions." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:252 +msgid "Institutional Users / Total GakuNin RDM Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:258 +msgid "The percentage of users who created an account through their institution." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:267 +msgid "Institutional Users over the past 100 Days" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:273 +msgid "" +"The growth of users who have accounts associated with their institutions." +" Click on an institution name in the key to remove its line and resize " +"the chart axes." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:282 +msgid "" +"Nodes (at all levels, projects and components) created by each " +"institution as of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:289 +msgid "Affiliated Public Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:295 +msgid "" +"Total number of public nodes (at all levels, projects and components) " +"created by each institution as of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:302 +msgid "Affiliated Private Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:308 +msgid "" +"Total number of private nodes (at all levels, projects and components) " +"created by each institution as of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:317 +msgid "Affiliated Public Registrations" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:323 +msgid "" +"Total number of public registered nodes (at all levels, projects and " +"components) created by each institution as of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:330 +msgid "Affiliated Embargoed Registrations" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:336 +msgid "" +"Total number of private registered nodes (at all levels, projects and " +"components) created by each institution as of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:344 +msgid "Top level projects created by each institution as of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:351 +msgid "Affiliated Public Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:357 +msgid "" +"Total number of public top level projects created by each institution as " +"of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:364 +msgid "Affiliated Private Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:370 +msgid "" +"Total number of private top level projects created by each institution as" +" of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:379 +msgid "Affiliated Public Project Registrations" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:385 +msgid "" +"Total number of public registeredtop level projects created by each " +"institution as of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:392 +msgid "Affiliated Embargoed Project Registrations" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:398 +msgid "" +"Total number of private registered top level projects created by each " +"institution as of yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:408 +msgid "Active User Metrics!" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:417 +msgid "Daily Active Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:418 +msgid "Monthly and Yearly Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:419 +#: .\admin\templates\metrics\osf_metrics.html:540 +msgid "Project to User Ratios" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:430 +msgid "Recent Daily Unique Sessions" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:436 +msgid "The previous 14 days of unique visitor sessions." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:445 +msgid "Daily Active Logged In Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:451 +msgid "" +"This is the number of logged in users with user ids who had at least one " +"pageview on the GakuNin RDM yesterday." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:458 +msgid "Daily Active Users / Total Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:464 +#: .\admin\templates\metrics\osf_metrics.html:717 +msgid "Notes about this chart" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:473 +msgid "Monthly Active Users (MAU)" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:479 +msgid "Users who visited at least one page on the GakuNin RDM from last month." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:486 +msgid "Last Month's Active Users / Total Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:492 +msgid "Last month's active users / total confirmed users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:499 +#, python-format +msgid "Monthly Growth of MAU%%" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:505 +msgid "" +"The percent increase from two months ago to one month ago of what " +"percentage of users with an account were active on the GakuNin RDM." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:514 +msgid "Yearly Active Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:520 +msgid "Users who were active on the GakuNin RDM over the past year." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:527 +msgid "Yearly Active Users / Total Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:533 +msgid "" +"The percentage of our yearly active users compared to our total users " +"with confirmed accounts." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:547 +msgid "Projects / Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:553 +msgid "" +"The number of projects divided by the number of users with active " +"accounts." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:560 +msgid "Projects / Monthly Active Users" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:566 +msgid "" +"The number of projects divided by the number of people who had accounts " +"and were active last month." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:579 +msgid "Stickiness Ratio" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:593 +msgid "Stickiness Ratio 1 week ago" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:599 +msgid "Stickiness Ratio for the same day of the week 1 week ago." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:606 +msgid "Stickiness Ratio 4 weeks ago" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:612 +msgid "Stickiness Ratio for the same day of the week 4 weeks ago." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:619 +msgid "Stickiness Ratio 52 weeks ago" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:625 +msgid "Stickiness Ratio for the same day of the week 52 weeks ago." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:646 +msgid "Projects - Top Level" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:647 +msgid "Nodes - Projects & Components" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:648 +#: .\admin\templates\metrics\osf_metrics.html:791 +msgid "Registered Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:649 +#: .\admin\templates\metrics\osf_metrics.html:858 +msgid "Registered Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:657 +#: .\admin\templates\metrics\osf_statistics.html:24 +#: .\admin\templates\users\user_details.html:29 +msgid "Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:664 +msgid "Total Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:670 +msgid "The total number of all top level projects on the GakuNin RDM" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:687 +msgid "The total number of public top level projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:696 +msgid "Private Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:702 +msgid "The total number of private top level projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:711 +msgid "Public vs Private Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:724 +#: .\admin\templates\users\user.html:285 +msgid "Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:731 +msgid "Total Nodes - Projects and Components" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:737 +msgid "The total number of all projects and components on the GakuNin RDM." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:748 +msgid "Public Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:754 +msgid "The total number of public nodes - including projects and components" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:763 +msgid "Private Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:769 +msgid "The total number of private nodes - including projects and components" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:778 +msgid "Public vs Private Nodes - Components & Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:784 +msgid "" +"The percentages of public vs private combined projects and components on " +"the GakuNin RDM." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:798 +msgid "Total Registered Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:804 +msgid "The total number of all registered top level projects on the GakuNin RDM." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:815 +msgid "Public Registered Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:821 +msgid "The total number of public registered top level projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:830 +msgid "Embargoed Registered Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:836 +msgid "The number of private registered top level projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:845 +msgid "Public vs Embargoed Registered Top-Level Projects" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:851 +#: .\admin\templates\metrics\osf_metrics.html:918 +msgid "" +"The percentages of public vs embargoed top-level project registrations on" +" the GakuNin RDM." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:865 +msgid "Total Registered Nodes - Projects & Components" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:871 +#: .\admin\templates\metrics\osf_metrics.html:938 +msgid "" +"The total number of all registered nodes - projects & components on the " +"GakuNin RDM." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:882 +msgid "Public Registered Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:888 +msgid "The total number of public registered nodes - projects & components" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:897 +msgid "Embargoed Registered Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:903 +msgid "The number of embargoed registered projects and components" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:912 +msgid "Public vs Embargoed Registered Nodes" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:932 +msgid "Previous 7 days of addon by name" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:951 +msgid "Previous 30 days of preprints by provider" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:958 +msgid "The total number of preprints grouped by preprint provider." +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:961 +#: .\admin\templates\metrics\osf_metrics.html:993 +msgid "Start date range:" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:965 +#: .\admin\templates\metrics\osf_metrics.html:997 +msgid "End date range:" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:969 +#: .\admin\templates\metrics\osf_metrics.html:1001 +msgid "Enter new date range" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:983 +msgid "Daily download counts" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:990 +msgid "The total number of downloads by non-contribs" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:1017 +msgid "The total number of files downloaded from the GakuNIn RDM" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:1024 +msgid "Unique Downloads" +msgstr "" + +#: .\admin\templates\metrics\osf_metrics.html:1030 +msgid "The number of unique downloads of files on the GakuNin RDM." +msgstr "" + +#: .\admin\templates\metrics\osf_statistics.html:22 +#: .\admin\templates\nodes\node_logs.html:13 +#: .\admin\templates\spam\spam_list.html:44 .\admin\templates\spam\user.html:46 +#: .\admin\templates\users\spam.html:40 +msgid "Date" +msgstr "" + +#: .\admin\templates\metrics\osf_statistics.html:23 +msgid "Users" +msgstr "" + +#: .\admin\templates\metrics\osf_statistics.html:25 +msgid "Public projects" +msgstr "" + +#: .\admin\templates\metrics\osf_statistics.html:26 +msgid "Registered projects" +msgstr "" + +#: .\admin\templates\nodes\confirm_ham.html:5 +#, python-format +msgid "Are you sure this %(resource_type)s is " +msgstr "" + +#: .\admin\templates\nodes\confirm_ham.html:5 +msgid "not" +msgstr "" + +#: .\admin\templates\nodes\confirm_ham.html:5 +#, python-format +msgid " spam? %(guid)s" +msgstr "" + +#: .\admin\templates\nodes\confirm_ham.html:11 +#: .\admin\templates\nodes\confirm_spam.html:11 +#: .\admin\templates\nodes\node.html:397 +#: .\admin\templates\nodes\node_list.html:110 +#: .\admin\templates\nodes\reindex_node_elastic.html:11 +#: .\admin\templates\nodes\reindex_node_share.html:11 +#: .\admin\templates\nodes\remove_contributor.html:18 +#: .\admin\templates\nodes\remove_node.html:15 +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:55 +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:62 +#: .\admin\templates\rdm_addons\addons\s3_credentials_modal.html:29 +#: .\admin\templates\rdm_announcement\send.html:35 +#: .\admin\templates\rdm_announcement\settings.html:95 +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:62 +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:57 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:83 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:53 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:57 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:88 +#: .\admin\templates\rdm_custom_storage_location\providers\osfstorage_modal.html:21 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:53 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:36 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:40 +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:57 +#: .\admin\templates\rdm_timestampadd\node_list.html:124 +#: .\admin\templates\rdm_timestampadd\timestampadd.html:57 +#: .\admin\templates\users\GDPR_delete_user.html:15 +#: .\admin\templates\users\add_system_tag.html:15 +#: .\admin\templates\users\get_link.html:21 +#: .\admin\templates\users\merge_accounts_modal.html:14 +#: .\admin\templates\users\notes.html:18 +#: .\admin\templates\users\reindex_user_elastic.html:11 +#: .\admin\templates\users\remove_2_factor.html:15 +#: .\admin\templates\users\remove_spam_user.html:15 +#: .\admin\templates\users\remove_user.html:15 +#: .\admin\templates\users\reset.html:16 +#: .\admin\templates\users\restore_ham_user.html:15 +#: .\admin\templates\users\user_list.html:73 +msgid "Cancel" +msgstr "" + +#: .\admin\templates\nodes\confirm_spam.html:5 +#, python-format +msgid "Are you sure this %(resource_type)s is spam? %(guid)s" +msgstr "" + +#: .\admin\templates\nodes\flagged_spam_list.html:5 +msgid "Flagged Spam Nodes" +msgstr "" + +#: .\admin\templates\nodes\known_spam_list.html:5 +msgid "Known Spam Nodes" +msgstr "" + +#: .\admin\templates\nodes\node.html:11 .\admin\templates\nodes\node.html:299 +#: .\admin\templates\nodes\node.html:305 .\admin\templates\users\user.html:293 +msgid "Registration" +msgstr "" + +#: .\admin\templates\nodes\node.html:13 +msgid "Node" +msgstr "" + +#: .\admin\templates\nodes\node.html:27 +msgid "View Logs" +msgstr "" + +#: .\admin\templates\nodes\node.html:34 .\admin\templates\users\user.html:327 +msgid "Delete Node" +msgstr "" + +#: .\admin\templates\nodes\node.html:47 .\admin\templates\nodes\node.html:273 +#: .\admin\templates\users\user.html:321 +msgid "Restore Node" +msgstr "" + +#: .\admin\templates\nodes\node.html:55 +msgid "Restart Registration" +msgstr "" + +#: .\admin\templates\nodes\node.html:60 +msgid "Remove Registration" +msgstr "" + +#: .\admin\templates\nodes\node.html:70 +#: .\admin\templates\nodes\node_list.html:98 +#: .\admin\templates\rdm_timestampadd\node_list.html:112 +#: .\admin\templates\users\user_list.html:61 +msgid "Confirm Spam" +msgstr "" + +#: .\admin\templates\nodes\node.html:81 +msgid "Confirm Not Spam" +msgstr "" + +#: .\admin\templates\nodes\node.html:93 +msgid "SHARE Reindex" +msgstr "" + +#: .\admin\templates\nodes\node.html:116 .\admin\templates\users\user.html:81 +msgid "Elastic Reindex" +msgstr "" + +#: .\admin\templates\nodes\node.html:129 +msgid "Registration Details" +msgstr "" + +#: .\admin\templates\nodes\node.html:131 +msgid "Node Details" +msgstr "" + +#: .\admin\templates\nodes\node.html:145 +#: .\admin\templates\rdm_keymanagement\user_list.html:9 +#: .\admin\templates\rdm_timestampadd\node_list.html:39 +#: .\admin\templates\rdm_timestampsettings\node_list.html:35 +#: .\admin\templates\users\user.html:290 +#: .\admin\templates\users\user_details.html:34 +#: .\admin\templates\users\user_list.html:22 +msgid "GUID" +msgstr "" + +#: .\admin\templates\nodes\node.html:149 .\admin\templates\nodes\node.html:247 +#: .\admin\templates\nodes\node_list.html:26 +#: .\admin\templates\rdm_timestampadd\node_list.html:41 +#: .\admin\templates\rdm_timestampsettings\node_list.html:38 +msgid "Title" +msgstr "" + +#: .\admin\templates\nodes\node.html:153 .\admin\templates\nodes\node.html:248 +#: .\admin\templates\nodes\node_list.html:32 +#: .\admin\templates\rdm_timestampadd\node_list.html:46 +#: .\admin\templates\users\user.html:292 +msgid "Public" +msgstr "" + +#: .\admin\templates\nodes\node.html:157 +#: .\admin\templates\nodes\node_list.html:29 +#: .\admin\templates\rdm_timestampadd\node_list.html:43 +#: .\admin\templates\rdm_timestampsettings\node_list.html:41 +msgid "Parent" +msgstr "" + +#: .\admin\templates\nodes\node.html:170 +msgid "Creator" +msgstr "" + +#: .\admin\templates\nodes\node.html:181 +msgid "OSF Groups" +msgstr "" + +#: .\admin\templates\nodes\node.html:194 +#: .\admin\templates\nodes\node_list.html:35 +#: .\admin\templates\rdm_timestampadd\node_list.html:49 +msgid "Contributors" +msgstr "" + +#: .\admin\templates\nodes\node.html:199 +msgid "User id" +msgstr "" + +#: .\admin\templates\nodes\node.html:201 +msgid "Permissions" +msgstr "" + +#: .\admin\templates\nodes\node.html:202 .\admin\templates\nodes\node.html:250 +#: .\admin\templates\users\user.html:296 +msgid "Actions" +msgstr "" + +#: .\admin\templates\nodes\node.html:222 +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:14 +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:28 +msgid "Remove" +msgstr "" + +#: .\admin\templates\nodes\node.html:246 +msgid "Node id" +msgstr "" + +#: .\admin\templates\nodes\node.html:249 +msgid "# of Contributors" +msgstr "" + +#: .\admin\templates\nodes\node.html:306 .\admin\templates\nodes\node.html:334 +msgid "Date Created" +msgstr "" + +#: .\admin\templates\nodes\node.html:307 .\admin\templates\nodes\node.html:342 +msgid "Pending" +msgstr "" + +#: .\admin\templates\nodes\node.html:308 .\admin\templates\nodes\node.html:346 +#: .\admin\templates\nodes\node_list.html:33 +#: .\admin\templates\rdm_timestampadd\node_list.html:47 +msgid "Withdrawn" +msgstr "" + +#: .\admin\templates\nodes\node.html:309 .\admin\templates\nodes\node.html:350 +#: .\admin\templates\nodes\node_list.html:34 +#: .\admin\templates\rdm_timestampadd\node_list.html:48 +msgid "Embargo" +msgstr "" + +#: .\admin\templates\nodes\node.html:338 +msgid "Datetime Registered" +msgstr "" + +#: .\admin\templates\nodes\node.html:378 +msgid "Registered From" +msgstr "" + +#: .\admin\templates\nodes\node.html:389 +msgid "Are you sure you want to update this embargo?" +msgstr "" + +#: .\admin\templates\nodes\node.html:392 +msgid "Make sure you have confirmed this change with all the project admins." +msgstr "" + +#: .\admin\templates\nodes\node.html:406 +msgid "SPAM Pro Tip" +msgstr "" + +#: .\admin\templates\nodes\node.html:411 .\admin\templates\users\user.html:277 +#: .\admin\templates\users\user.html:295 +msgid "SPAM Status" +msgstr "" + +#: .\admin\templates\nodes\node.html:415 +msgid "SPAM Data" +msgstr "" + +#: .\admin\templates\nodes\node_list.html:30 +#: .\admin\templates\rdm_timestampadd\node_list.html:44 +#: .\admin\templates\rdm_timestampsettings\node_list.html:42 +msgid "Root" +msgstr "" + +#: .\admin\templates\nodes\node_list.html:31 +#: .\admin\templates\rdm_timestampadd\node_list.html:45 +msgid "Date created" +msgstr "" + +#: .\admin\templates\nodes\node_list.html:105 +#: .\admin\templates\rdm_timestampadd\node_list.html:119 +msgid "Are you sure the selected node(s) are spam?" +msgstr "" + +#: .\admin\templates\nodes\node_logs.html:6 +msgid "Node Logs" +msgstr "" + +#: .\admin\templates\nodes\node_logs.html:16 +msgid "Action" +msgstr "" + +#: .\admin\templates\nodes\node_logs.html:19 +#: .\admin\templates\rdm_timestampadd\timestampadd.html:39 +#: .\admin\templates\users\user.html:11 +msgid "User" +msgstr "" + +#: .\admin\templates\nodes\node_logs.html:22 +msgid "Parameters" +msgstr "" + +#: .\admin\templates\nodes\reindex_node_elastic.html:5 +#, python-format +msgid "Are you sure you want to reindex this %(resource_type)s (Elastic)?" +msgstr "" + +#: .\admin\templates\nodes\reindex_node_share.html:5 +#, python-format +msgid "Are you sure you want to reindex this %(resource_type)s (SHARE)?" +msgstr "" + +#: .\admin\templates\nodes\remove_contributor.html:6 +#, python-format +msgid "Removing contributor: %(userName)s" +msgstr "" + +#: .\admin\templates\nodes\remove_contributor.html:9 +#, python-format +msgid "" +"User will be removed. Currently only\n" +" an admin on the %(resource_type)s will be able to\n" +" add them back." +msgstr "" + +#: .\admin\templates\nodes\remove_node.html:5 +#, python-format +msgid "Are you sure you want to delete this %(resource_type)s? %(guid)s" +msgstr "" + +#: .\admin\templates\nodes\remove_node.html:8 +#: .\admin\templates\users\remove_user.html:8 +msgid "This action will be reversible after the fact." +msgstr "" + +#: .\admin\templates\nodes\search.html:6 +msgid "Node Search" +msgstr "" + +#: .\admin\templates\nodes\search.html:17 +msgid "Node GUID:" +msgstr "" + +#: .\admin\templates\nodes\search.html:20 +#: .\admin\templates\users\search.html:21 +msgid "Submit@search" +msgstr "Submit" + +#: .\admin\templates\nodes\spam_status.html:3 +#: .\admin\templates\rdm_timestampadd\timestampadd.html:206 +#: .\admin\templates\spam\detail.html:86 +msgid "Unknown" +msgstr "" + +#: .\admin\templates\nodes\spam_status.html:5 +#: .\admin\templates\spam\detail.html:88 +#: .\admin\templates\spam\spam_list.html:15 +#: .\admin\templates\spam\spam_list.html:18 .\admin\templates\spam\user.html:19 +#: .\admin\templates\spam\user.html:22 .\admin\templates\users\spam.html:13 +#: .\admin\templates\users\spam.html:16 +msgid "Flagged" +msgstr "" + +#: .\admin\templates\nodes\spam_status.html:7 +#: .\admin\templates\spam\detail.html:90 +#: .\admin\templates\spam\spam_list.html:22 +#: .\admin\templates\spam\spam_list.html:25 .\admin\templates\spam\user.html:25 +#: .\admin\templates\spam\user.html:28 .\admin\templates\users\spam.html:19 +#: .\admin\templates\users\spam.html:22 +msgid "Spam" +msgstr "" + +#: .\admin\templates\nodes\spam_status.html:9 +#: .\admin\templates\spam\detail.html:92 +#: .\admin\templates\spam\spam_list.html:29 +#: .\admin\templates\spam\spam_list.html:32 .\admin\templates\spam\user.html:31 +#: .\admin\templates\spam\user.html:34 .\admin\templates\users\spam.html:25 +#: .\admin\templates\users\spam.html:28 +msgid "Ham" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_confirm_delete.html:4 +msgid "GakuNin RDM Admin | Delete Asset" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_confirm_delete.html:10 +msgid "Confirm Delete Asset" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_confirm_delete.html:13 +msgid "Are you sure you want to delete " +msgstr "" + +#: .\admin\templates\osf\providerassetfile_confirm_delete.html:13 +msgid "?" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_create.html:6 +#: .\admin\templates\osf\providerassetfile_form.html:6 +msgid "Provider Asset File" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_form.html:12 +msgid "Delete asset" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_form.html:22 +msgid "Uploading a new file will overwrite this asset." +msgstr "" + +#: .\admin\templates\osf\providerassetfile_list.html:11 +#: .\admin\templates\osf\providerassetfile_list.html:15 +msgid "List of Provider Asset Files" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_list.html:29 +msgid "File Link" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_list.html:30 +msgid "Providers" +msgstr "" + +#: .\admin\templates\osf\providerassetfile_list.html:37 +#: .\admin\templates\rdm_announcement\index.html:49 +msgid "Preview" +msgstr "" + +#: .\admin\templates\osf\subject_form.html:5 +msgid "Subject:" +msgstr "" + +#: .\admin\templates\osf\subject_form.html:9 +#: .\admin\templates\osf\subject_list.html:17 +#: .\admin\templates\rdm_timestampadd\timestampadd.html:128 +msgid "Provider" +msgstr "" + +#: .\admin\templates\osf\subject_form.html:10 +#: .\admin\templates\osf\subject_list.html:19 +msgid "Highlighted" +msgstr "" + +#: .\admin\templates\osf\subject_form.html:11 +msgid "Hierarchy" +msgstr "" + +#: .\admin\templates\osf\subject_list.html:16 +msgid "Text " +msgstr "" + +#: .\admin\templates\osf\subject_list.html:20 +#: .\admin\templates\osf\subject_list.html:29 +#: .\admin\templates\rdm_announcement\index.html:75 +msgid "Edit" +msgstr "" + +#: .\admin\templates\rdm_addons\addon_list.html:25 +msgid "Configure Add-on Accounts" +msgstr "" + +#: .\admin\templates\rdm_addons\addon_list.html:51 +#: .\admin\templates\rdm_timestampsettings\list.html:51 +msgid "Force to use" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:6 +msgid "Connect a Dataverse Account" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:14 +msgid "Dataverse Repository" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:30 +msgid "Only Dataverse repositories v4.0 or higher are supported." +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:38 +msgid "API Token" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:42 +msgid "(Get from Dataverse )" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dataverse_institution_settings.html:15 +#: .\admin\templates\rdm_addons\addons\institution_settings_default.html:12 +#: .\admin\templates\rdm_addons\addons\owncloud_institution_settings.html:15 +#: .\admin\templates\rdm_addons\addons\s3_institution_settings.html:15 +msgid "Connect or Reauthorize Account" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dataverse_institution_settings.html:23 +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:23 +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:64 +#: .\admin\templates\rdm_addons\addons\institution_settings_default.html:19 +#: .\admin\templates\rdm_addons\addons\owncloud_institution_settings.html:23 +#: .\admin\templates\rdm_addons\addons\s3_institution_settings.html:23 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:37 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:66 +msgid "Disconnect Account" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dataverse_institution_settings.html:28 +msgid "Authorized on " +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:5 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:24 +msgid "Team member file access" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:12 +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:54 +msgid "Connect Account" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:15 +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:57 +msgid "Reauthorize Account" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:29 +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:70 +msgid "Authorized by" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:47 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:53 +msgid "Team member management" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\institution_settings_default.html:25 +#: .\admin\templates\rdm_addons\addons\owncloud_institution_settings.html:28 +#: .\admin\templates\rdm_addons\addons\s3_institution_settings.html:29 +msgid "Authorized by " +msgstr "" + +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:12 +msgid "Management project" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:18 +msgid "Management project URL" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:26 +msgid "Organizational project" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:32 +msgid "Organizational project URL" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:6 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:7 +msgid "Connect an ownCloud Account" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:14 +msgid "ownCloud Instance" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:26 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:15 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:15 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:13 +msgid "Host URL" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:32 +msgid "" +"Only ownCloud instances supporting WebDAV and \n" +" OCS v1.7 are supported." +msgstr "" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:46 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:39 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:40 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:36 +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:42 +msgid "Password" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:51 +msgid "" +" These credentials will be encrypted. However, we strongly " +"encourage using a Device (or App) Password." +msgstr "" + +#: .\admin\templates\rdm_addons\addons\s3_credentials_modal.html:6 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:9 +msgid "Connect an Amazon S3 Account" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\s3_credentials_modal.html:14 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:17 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:21 +msgid "Access Key" +msgstr "" + +#: .\admin\templates\rdm_addons\addons\s3_credentials_modal.html:18 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:21 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:25 +msgid "Secret Key" +msgstr "" + +#: .\admin\templates\rdm_addons\institution_list.html:27 +#: .\admin\templates\rdm_statistics\institution_list.html:27 +msgid "Institution List" +msgstr "" + +#: .\admin\templates\rdm_addons\oauth_complete.html:17 +msgid "OAuth Complete" +msgstr "" + +#: .\admin\templates\rdm_addons\oauth_complete.html:53 +msgid "Successfully connected to %(addon_name|title)s Account." +msgstr "" + +#: .\admin\templates\rdm_addons\oauth_complete.html:55 +msgid "Please close this tab." +msgstr "" + +#: .\admin\templates\rdm_announcement\index.html:19 +msgid "Announcement" +msgstr "" + +#: .\admin\templates\rdm_announcement\index.html:64 +#: .\admin\templates\rdm_announcement\settings.html:7 +#: .\admin\templates\rdm_announcement\settings.html:12 +#: .\admin\templates\rdm_announcement\settings.html:14 +#: .\admin\templates\rdm_statistics\settings.html:6 +#: .\admin\templates\rdm_statistics\settings.html:9 +msgid "Options" +msgstr "" + +#: .\admin\templates\rdm_announcement\send.html:19 +msgid " Preview" +msgstr "" + +#: .\admin\templates\rdm_announcement\send.html:34 +msgid "Send" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:20 +msgid "Institutional Storage " +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:27 +msgid "Name:" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:35 +msgid "Configure Institutional Storage Accounts" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:8 +msgid "Connect a Box Account" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:14 +msgid "Please click \"Get OAuth Permission\" button to connect Box." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:16 +msgid "Then you will be redirected to Box authentication page." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:28 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:31 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:60 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:27 +msgid "Get OAuth permission" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:32 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:43 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:72 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:31 +msgid "Authorized by:" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:40 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:37 +msgid "Current token:" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:46 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:42 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:28 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:31 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:26 +msgid "Folder" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:48 +msgid "Folder ID (Ex: 0 for root)" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:58 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:84 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:54 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:58 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:89 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:54 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:37 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:41 +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:58 +msgid "Connect" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:8 +msgid "Connect a Dropbox Business Account" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:14 +msgid "Please click \"Get OAuth Permission\" button to connect Dropbox." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:16 +msgid "Then you will be redirected to Dropbox authentication page." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:8 +msgid "Connect a Google Drive Account" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:14 +msgid "Please click \"Get OAuth Permission\" button to connectGoogle Drive." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:16 +msgid "Then you will be redirected to Google authentication page." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:44 +msgid "Folder ID (Ex: root)" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:8 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:8 +msgid "Connect a Nextcloud Account" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:21 +#, python-format +msgid "" +"\n" +" Only Nextcloud instances " +"supporting WebDAV and OCS v1.7 are" +" supported.\n" +" " +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:36 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:33 +msgid "username" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:44 +#, python-format +msgid "" +"\n" +" These credentials will be encrypted. " +"However, we strongly encourage using a Device (or App) Password.\n" +" " +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:21 +msgid "" +"Only Nextcloud instances supporting WebDAV " +"and \n" +" OCS v1.7 are supported." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:45 +msgid "" +" These credentials will be encrypted. However, we strongly\n" +" encourage using a Device (or " +"App) Password." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:55 +msgid "Download User Mapping file" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:56 +#: .\admin\templates\rdm_timestampadd\timestampadd.html:228 +msgid "Download" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:60 +msgid "Upload User Mapping file" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:61 +msgid "Check existence of external users" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:61 +msgid "Only Nextcloud Admin can check" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:64 +msgid "Browse" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:70 +msgid "Example of User Mapping file" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\osfstorage_modal.html:8 +msgid "Connect NII Storage" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\osfstorage_modal.html:14 +msgid "NII Storage is selected as Institutional Storage." +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:19 +#, python-format +msgid "" +"\n" +" Only ownCloud instances supporting WebDAV and OCS v1.7 are supported.\n" +" " +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:40 +#, python-format +msgid "" +"\n" +" These credentials will be encrypted. " +"However, we strongly encourage using a Device (or App) Password.\n" +" " +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:25 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:29 +msgid "Bucket" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:9 +msgid "Connect a S3 Compatible Storage Account" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:17 +msgid "Endpoint URL" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:8 +msgid "Connect an OpenStack Swift Account" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:15 +msgid "Authentication(Keystone) Version" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:22 +msgid "Authentication URL" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:26 +msgid "Tenant name" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:30 +msgid "Project Domain name" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:38 +msgid "User Domain name" +msgstr "" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:46 +msgid "Container" +msgstr "" + +#: .\admin\templates\rdm_keymanagement\delete_user_list.html:5 +#: .\admin\templates\users\list.html:5 +msgid "User Search Results" +msgstr "" + +#: .\admin\templates\rdm_keymanagement\user_list.html:12 +#: .\admin\templates\users\user_list.html:25 +msgid "Date confirmed" +msgstr "" + +#: .\admin\templates\rdm_keymanagement\user_list.html:13 +#: .\admin\templates\users\user_list.html:26 +msgid "Date disabled" +msgstr "" + +#: .\admin\templates\rdm_statistics\crawl.html:14 +#: .\admin\templates\rdm_statistics\index.html:14 +msgid "statistics" +msgstr "" + +#: .\admin\templates\rdm_statistics\crawl.html:18 +#: .\admin\templates\rdm_statistics\index.html:18 +msgid "statistics info" +msgstr "" + +#: .\admin\templates\rdm_statistics\index.html:16 +msgid "institution " +msgstr "" + +#: .\admin\templates\rdm_statistics\mail.html:19 +msgid "Send statistic information mail" +msgstr "" + +#: .\admin\templates\rdm_statistics\mail.html:21 +msgid "sending result " +msgstr "" + +#: .\admin\templates\rdm_statistics\settings.html:6 +#: .\admin\templates\rdm_statistics\settings.html:9 +msgid "RDM Announcements" +msgstr "" + +#: .\admin\templates\rdm_statistics\statistics.html:40 +msgid "Institution" +msgstr "" + +#: .\admin\templates\rdm_statistics\statistics.html:68 +msgid "date" +msgstr "" + +#: .\admin\templates\rdm_statistics\statistics.html:100 +msgid "download PDF" +msgstr "" + +#: .\admin\templates\rdm_statistics\statistics.html:101 +msgid "download CSV" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:15 +msgid "TimeStampAddList" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:19 +#, python-format +msgid "TimeStamp Add (%(project_title)s)" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:27 +msgid "Start Date" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:33 +msgid "End Date" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:46 +#: .\admin\templates\users\user.html:353 +msgid "Apply" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:55 +msgid "Verify" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:56 +msgid "Request Trusted Timestamp" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:67 +msgid "Processing, please wait..." +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:92 +msgid "per page:" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:108 +msgid "Page of " +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:137 +msgid "File Path" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:146 +msgid "Timestamp by" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:155 +msgid "Updated at" +msgstr "" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:164 +msgid "Timestamp Verification" +msgstr "" + +#: .\admin\templates\rdm_timestampsettings\list.html:22 +#: .\admin\templates\rdm_timestampsettings\node_list.html:43 +msgid "Select Timestamp Function" +msgstr "" + +#: .\admin\templates\spam\detail.html:7 +msgid "Comment" +msgstr "" + +#: .\admin\templates\spam\detail.html:14 +msgid "Back to general list" +msgstr "" + +#: .\admin\templates\spam\detail.html:18 +msgid "Back to user's list" +msgstr "" + +#: .\admin\templates\spam\detail.html:65 +msgid "Author:" +msgstr "" + +#: .\admin\templates\spam\detail.html:68 +msgid "User's RDM profile" +msgstr "" + +#: .\admin\templates\spam\detail.html:70 +msgid "User's profile" +msgstr "" + +#: .\admin\templates\spam\detail.html:76 +msgid "Comment ID:" +msgstr "" + +#: .\admin\templates\spam\detail.html:84 +msgid "Status: " +msgstr "" + +#: .\admin\templates\spam\detail.html:103 +msgid "Comment content" +msgstr "" + +#: .\admin\templates\spam\detail.html:104 +msgid "created on:" +msgstr "" + +#: .\admin\templates\spam\detail.html:120 +msgid "Type:" +msgstr "" + +#: .\admin\templates\spam\detail.html:128 +msgid "Reporter:" +msgstr "" + +#: .\admin\templates\spam\detail.html:136 +msgid "Reason:" +msgstr "" + +#: .\admin\templates\spam\detail.html:144 +msgid "No reports!" +msgstr "" + +#: .\admin\templates\spam\email.html:4 +msgid "Suggested Email message for spammer" +msgstr "" + +#: .\admin\templates\spam\email.html:7 +#, python-format +msgid "Dear %(spamAuthorFullname)s," +msgstr "" + +#: .\admin\templates\spam\email.html:8 +msgid "A comment you made on a GakuNin RDM (GRDM) project" +msgstr "" + +#: .\admin\templates\spam\email.html:10 +msgid "has been reported as" +msgstr "" + +#: .\admin\templates\spam\email.html:12 +msgid "hate speech" +msgstr "" + +#: .\admin\templates\spam\email.html:14 +msgid "violent or harmful behavior" +msgstr "" + +#: .\admin\templates\spam\email.html:16 +msgid "spam" +msgstr "" + +#: .\admin\templates\spam\email.html:27 +msgid "Best," +msgstr "" + +#: .\admin\templates\spam\email.html:28 +msgid "The GakuNin RDM Team" +msgstr "" + +#: .\admin\templates\spam\spam_list.html:8 +#: .\admin\templates\spam\spam_list.html:11 .\admin\templates\users\spam.html:7 +#: .\admin\templates\users\spam.html:10 +msgid "List of Spam" +msgstr "" + +#: .\admin\templates\spam\spam_list.html:42 .\admin\templates\spam\user.html:44 +#: .\admin\templates\users\spam.html:38 +msgid "Author" +msgstr "" + +#: .\admin\templates\spam\spam_list.html:43 .\admin\templates\spam\user.html:45 +#: .\admin\templates\users\spam.html:39 +msgid "Reporter" +msgstr "" + +#: .\admin\templates\spam\spam_list.html:45 .\admin\templates\spam\user.html:47 +#: .\admin\templates\users\spam.html:41 +msgid "Content" +msgstr "" + +#: .\admin\templates\spam\spam_list.html:72 .\admin\templates\spam\user.html:74 +#: .\admin\templates\users\spam.html:68 +msgid "Detail" +msgstr "" + +#: .\admin\templates\spam\spam_list.html:78 .\admin\templates\spam\user.html:80 +#: .\admin\templates\users\spam.html:74 +msgid "No more Spam!" +msgstr "" + +#: .\admin\templates\spam\user.html:9 +msgid "User Spam" +msgstr "" + +#: .\admin\templates\spam\user.html:12 +msgid "User's List of Spam" +msgstr "" + +#: .\admin\templates\spam\user.html:15 .\admin\templates\users\user.html:157 +msgid "User details" +msgstr "" + +#: .\admin\templates\users\GDPR_delete_user.html:5 +#, python-format +msgid "Are you sure you want to GDPR delete this user? %(guid)s" +msgstr "" + +#: .\admin\templates\users\GDPR_delete_user.html:8 +msgid "This is not reversible!" +msgstr "" + +#: .\admin\templates\users\add_system_tag.html:5 +msgid "Add a system tag to this user" +msgstr "" + +#: .\admin\templates\users\flagged_spam_list.html:5 +msgid "Flagged Spam Users" +msgstr "" + +#: .\admin\templates\users\get_link.html:4 +#, python-format +msgid "%(title)s for user %(username)s" +msgstr "" + +#: .\admin\templates\users\known_spam_list.html:5 +msgid "Known Spam Users" +msgstr "" + +#: .\admin\templates\users\merge_accounts_modal.html:4 +msgid "Merge Accounts" +msgstr "" + +#: .\admin\templates\users\merge_accounts_modal.html:7 +#, python-format +msgid "Merge this user: %(user)s (%(guid)s) with:" +msgstr "" + +#: .\admin\templates\users\notes.html:5 +msgid "Notes for GakuNin RDM User" +msgstr "" + +#: .\admin\templates\users\notes.html:8 +#, python-format +msgid "User: %(osf_id)s" +msgstr "" + +#: .\admin\templates\users\notes.html:11 +msgid "Notes for GakuNIn user:" +msgstr "" + +#: .\admin\templates\users\reindex_user_elastic.html:5 +#, python-format +msgid "Are you sure you want to reindex this user (Elastic)? %(guid)s" +msgstr "" + +#: .\admin\templates\users\remove_2_factor.html:5 +msgid "This will remove two factor auth." +msgstr "" + +#: .\admin\templates\users\remove_2_factor.html:8 +msgid "" +"Removing this will let the user log in with only one form of " +"authentication.The only way to reverse this action is for the user to re-" +"enable the addon after logging in." +msgstr "" + +#: .\admin\templates\users\remove_spam_user.html:5 +#, python-format +msgid "" +"Are you sure you want to delete this user and mark all their nodes as " +"private? %(guid)s" +msgstr "" + +#: .\admin\templates\users\remove_spam_user.html:8 +#: .\admin\templates\users\restore_ham_user.html:8 +msgid "" +"You will be able to re-activate the user, but the admin console does not " +"currently have the ability to mark nodes as public." +msgstr "" + +#: .\admin\templates\users\remove_user.html:5 +#, python-format +msgid "Are you sure you want to delete this user? %(guid)s" +msgstr "" + +#: .\admin\templates\users\reset.html:5 +msgid "Choose email to send reset link" +msgstr "" + +#: .\admin\templates\users\reset.html:8 +#, python-format +msgid "User: %(guid)s" +msgstr "" + +#: .\admin\templates\users\restore_ham_user.html:5 +#, python-format +msgid "Are you sure you want to re-enable this user? %(guid)s" +msgstr "" + +#: .\admin\templates\users\search.html:9 .\admin\templates\users\search.html:14 +#: .\admin\templates\users\workshop.html:6 +msgid "User Search" +msgstr "" + +#: .\admin\templates\users\search.html:27 +msgid "User Workshop Follow-up" +msgstr "" + +#: .\admin\templates\users\search.html:33 +msgid "Go" +msgstr "" + +#: .\admin\templates\users\user.html:29 +msgid "Related spam" +msgstr "" + +#: .\admin\templates\users\user.html:33 +msgid "Send reset password email" +msgstr "" + +#: .\admin\templates\users\user.html:35 +msgid "Get password reset link" +msgstr "" + +#: .\admin\templates\users\user.html:37 .\admin\templates\users\user.html:42 +msgid "Get confirmation link" +msgstr "" + +#: .\admin\templates\users\user.html:40 +msgid "Get claim links" +msgstr "" + +#: .\admin\templates\users\user.html:47 +msgid "Desk profile" +msgstr "" + +#: .\admin\templates\users\user.html:48 +msgid "Desk cases" +msgstr "" + +#: .\admin\templates\users\user.html:50 +msgid "Merge Account" +msgstr "" + +#: .\admin\templates\users\user.html:58 +msgid "GDPR Delete Account" +msgstr "" + +#: .\admin\templates\users\user.html:62 .\admin\templates\users\user.html:64 +msgid "Requested account deactivation" +msgstr "" + +#: .\admin\templates\users\user.html:66 +msgid "Force disable account" +msgstr "" + +#: .\admin\templates\users\user.html:74 +msgid "Disable Spam account" +msgstr "" + +#: .\admin\templates\users\user.html:76 +msgid "Re-enable Ham account" +msgstr "" + +#: .\admin\templates\users\user.html:79 +msgid "Send reset" +msgstr "" + +#: .\admin\templates\users\user.html:175 +msgid "GakuNin RDM account" +msgstr "" + +#: .\admin\templates\users\user.html:185 +msgid "Emails" +msgstr "" + +#: .\admin\templates\users\user.html:190 +msgid "Primary: " +msgstr "" + +#: .\admin\templates\users\user.html:202 +msgid "Registered" +msgstr "" + +#: .\admin\templates\users\user.html:206 +msgid "Confirmed" +msgstr "" + +#: .\admin\templates\users\user.html:210 +msgid "Last login" +msgstr "" + +#: .\admin\templates\users\user.html:214 +msgid "Disabled" +msgstr "" + +#: .\admin\templates\users\user.html:218 +msgid "Two factor" +msgstr "" + +#: .\admin\templates\users\user.html:226 +msgid "Deactivate" +msgstr "" + +#: .\admin\templates\users\user.html:237 +msgid "System tags" +msgstr "" + +#: .\admin\templates\users\user.html:246 +msgid "add system tag" +msgstr "" + +#: .\admin\templates\users\user.html:258 +msgid "GakuNin RDM Groups" +msgstr "" + +#: .\admin\templates\users\user.html:271 +msgid "User is spammy" +msgstr "" + +#: .\admin\templates\users\user.html:281 +msgid "Profile content checked for spam" +msgstr "" + +#: .\admin\templates\users\user.html:346 +msgid "Quota for NII Storage (GB)" +msgstr "" + +#: .\admin\templates\users\user_details.html:60 +msgid "Quota for Institutional Storage (GB)" +msgstr "" + +#: .\admin\templates\users\user_list.html:68 +msgid "Are you sure the selected user(s) are spam?" +msgstr "" + +#: .\admin\templates\users\workshop.html:15 +msgid "Upload" +msgstr "" + +#: .\admin\templates\util\pagination.html:25 +#, python-format +msgid "Page %(itemsNumber)s of %(paginatorNumPage)s" +msgstr "" + +#~ msgid "Submit" +#~ msgstr "" + +#~ msgid "Institutions" +#~ msgstr "" + +#: admin/templates/rdm_addons/myskelton_institution_settings.html:12 +msgid "Admin Notes" +msgstr "管理者ノート" + +#: admin/templates/rdm_addons/myskelton_institution_settings.html:15 +msgid "Some notes for users by organization administrator..." +msgstr "" diff --git a/site/guides/admin-addon/admin/translations/ja/LC_MESSAGES/django.po b/site/guides/admin-addon/admin/translations/ja/LC_MESSAGES/django.po new file mode 100644 index 0000000..61cf8ed --- /dev/null +++ b/site/guides/admin-addon/admin/translations/ja/LC_MESSAGES/django.po @@ -0,0 +1,3133 @@ +# Japanese translations for . +# Copyright (C) 2020 ORGANIZATION +# This file is distributed under the same license as the project. +# FIRST AUTHOR , 2020. +# 1.{% trans "XXX" %} is extracted by the command 'django-admin makemessages +# --keep-pot -l ja' +# 2.edit the header to babel extracting form. +# +msgid "" +msgstr "" +"Project-Id-Version: 0.6.0\n" +"Report-Msgid-Bugs-To: rocs-office@nii.ac.jp\n" +"POT-Creation-Date: 2020-09-02 11:10+0900\n" +"PO-Revision-Date: 2020-09-02 11:10+0900\n" +"Last-Translator: Shunta Nishikawa\n" +"Language: ja\n" +"Language-Team: RCOS \n" +"Plural-Forms: nplurals=1; plural=0\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.7.0\n" + +#: .\admin\templates\banners\confirm_delete.html:4 +msgid "GakuNin RDM Admin | Delete banner" +msgstr "GakuNin RDM 管理者 | バナーを削除" + +#: .\admin\templates\banners\confirm_delete.html:10 +msgid "Confirm Delete Banner" +msgstr "削除バナーを確認" + +#: .\admin\templates\banners\confirm_delete.html:13 +#, python-format +msgid "" +"Are you sure you want to delete %(objectName)s? It is scheduled " +"for %(startDate)s -\n" +" %(endDate)s" +msgstr "" +"%(objectName)sを削除してもよろしいですか?%(startDate)s-\n" +"%(endDate)sにスケジュールされています" + +#: .\admin\templates\banners\confirm_delete.html:16 +#: .\admin\templates\institutions\confirm_delete.html:20 +#: .\admin\templates\maintenance\delete_maintenance.html:12 +#: .\admin\templates\nodes\confirm_ham.html:9 +#: .\admin\templates\nodes\confirm_spam.html:9 +#: .\admin\templates\nodes\node.html:395 +#: .\admin\templates\nodes\node_list.html:108 +#: .\admin\templates\nodes\reindex_node_elastic.html:9 +#: .\admin\templates\nodes\reindex_node_share.html:9 +#: .\admin\templates\nodes\remove_contributor.html:15 +#: .\admin\templates\nodes\remove_node.html:12 +#: .\admin\templates\rdm_timestampadd\node_list.html:122 +#: .\admin\templates\users\GDPR_delete_user.html:12 +#: .\admin\templates\users\add_system_tag.html:12 +#: .\admin\templates\users\reindex_user_elastic.html:9 +#: .\admin\templates\users\remove_2_factor.html:12 +#: .\admin\templates\users\remove_spam_user.html:12 +#: .\admin\templates\users\remove_user.html:12 +#: .\admin\templates\users\restore_ham_user.html:12 +#: .\admin\templates\users\user_list.html:71 +msgid "Confirm" +msgstr "確認" + +#: .\admin\templates\banners\create.html:5 +msgid "GakuNin RDM Admin | Schedule banner" +msgstr "GakuNin RDM 管理者 | バナーをスケジュール" + +#: .\admin\templates\banners\create.html:11 +msgid "Schedule a banner" +msgstr "バナーをスケジュールする" + +#: .\admin\templates\banners\create.html:29 +#: .\admin\templates\institutions\create.html:24 +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:57 +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:24 +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:38 +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:64 +#: .\admin\templates\rdm_addons\addons\s3_credentials_modal.html:31 +#: .\admin\templates\rdm_announcement\settings.html:94 +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:63 +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:59 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:85 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:55 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:59 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:90 +#: .\admin\templates\rdm_custom_storage_location\providers\osfstorage_modal.html:22 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:55 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:38 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:42 +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:59 +msgid "Save" +msgstr "保存" + +#: .\admin\templates\banners\detail.html:11 +msgid "Banner" +msgstr "バナー" + +#: .\admin\templates\banners\detail.html:42 +msgid "Modify banner" +msgstr "バナーを変更" + +#: .\admin\templates\banners\list.html:11 +#: .\admin\templates\banners\list.html:14 +msgid "List of Banners" +msgstr "バナーのリスト" + +#: .\admin\templates\banners\list.html:20 +#: .\admin\templates\collection_providers\list.html:15 +#: .\admin\templates\desk\customer.html:16 +#: .\admin\templates\institutions\institution_list.html:21 +#: .\admin\templates\institutions\list.html:21 +#: .\admin\templates\meetings\list.html:21 .\admin\templates\messages.html:16 +#: .\admin\templates\nodes\node.html:200 +#: .\admin\templates\osf\providerassetfile_list.html:28 +#: .\admin\templates\rdm_addons\institution_list.html:29 +#: .\admin\templates\rdm_keymanagement\institutions.html:21 +#: .\admin\templates\rdm_statistics\institution_list.html:29 +#: .\admin\templates\rdm_timestampadd\list.html:21 +#: .\admin\templates\rdm_timestampsettings\list.html:21 +#: .\admin\templates\users\user.html:171 .\admin\templates\users\user.html:291 +#: .\admin\templates\users\user_details.html:35 +msgid "Name" +msgstr "名前" + +#: .\admin\templates\banners\list.html:21 +msgid "Dates" +msgstr "日付" + +#: .\admin\templates\banners\list.html:22 +msgid "Color" +msgstr "色" + +#: .\admin\templates\banners\list.html:23 +#: .\admin\templates\osf\subject_form.html:8 +msgid "Text" +msgstr "テキスト" + +#: .\admin\templates\banners\list.html:44 +msgid "Delete banner" +msgstr "バナーを削除" + +#: .\admin\templates\base.html:10 .\admin\templates\base.html:157 +#: .\admin\templates\base.html:233 .\admin\templates\base.html:236 +#: .\admin\templates\base.html:239 .\admin\templates\base.html:242 +#: .\admin\templates\base.html:246 .\admin\templates\base.html:279 +msgid "RDM" +msgstr "RDM" + +#: .\admin\templates\base.html:10 +msgid "Admin | Dashboard" +msgstr "管理者 | ダッシュボード" + +#: .\admin\templates\base.html:56 .\admin\templates\login.html:20 +msgid "Admin" +msgstr "管理者" + +#: .\admin\templates\base.html:69 +#, python-format +msgid "Logged in as %(userfullname)s" +msgstr "%(userfullname)sとしてログイン中" + +#: .\admin\templates\base.html:77 +msgid "Admin-User Registration" +msgstr "管理ユーザ登録" + +#: .\admin\templates\base.html:83 +msgid "Desk information" +msgstr "デスク情報" + +#: .\admin\templates\base.html:89 +msgid "Sign out" +msgstr "ログアウト" + +#: .\admin\templates\base.html:105 +msgid "Menu" +msgstr "メニュー" + +#: .\admin\templates\base.html:108 .\admin\templates\base.html:113 +msgid "RDM Nodes" +msgstr "ノード管理" + +#: .\admin\templates\base.html:114 .\admin\templates\base.html:131 +#: .\admin\templates\base.html:146 +msgid "Flagged Spam" +msgstr "フラグ付きスパム" + +#: .\admin\templates\base.html:115 .\admin\templates\base.html:132 +#: .\admin\templates\base.html:147 +msgid "Known Spam" +msgstr "既知のスパム" + +#: .\admin\templates\base.html:116 .\admin\templates\base.html:133 +#: .\admin\templates\base.html:148 +msgid "Known Ham" +msgstr "既知のハム" + +#: .\admin\templates\base.html:124 .\admin\templates\base.html:130 +#: .\admin\templates\metrics\osf_metrics.html:36 +msgid "Preprints" +msgstr "プレプリント" + +#: .\admin\templates\base.html:134 +msgid "Withdrawal Requests" +msgstr "削除のリクエスト" + +#: .\admin\templates\base.html:141 .\admin\templates\base.html:145 +msgid "RDM Users" +msgstr "ユーザ管理" + +#: .\admin\templates\base.html:153 +msgid "RDM Spam" +msgstr "スパム管理" + +#: .\admin\templates\base.html:157 +msgid "Registrations" +msgstr "登録" + +#: .\admin\templates\base.html:161 +msgid "All Registrations" +msgstr "全ての登録" + +#: .\admin\templates\base.html:162 +msgid "Stuck Registrations" +msgstr "スタックされた登録" + +#: .\admin\templates\base.html:168 +msgid "RDM Institutions" +msgstr "機関設定" + +#: .\admin\templates\base.html:172 .\admin\templates\base.html:185 +#: .\admin\templates\base.html:199 .\admin\templates\base.html:212 +#: .\admin\templates\base.html:225 .\admin\templates\base.html:251 +#: .\admin\templates\base.html:261 +msgid "List" +msgstr "リスト" + +#: .\admin\templates\base.html:174 .\admin\templates\base.html:188 +#: .\admin\templates\base.html:201 .\admin\templates\base.html:214 +#: .\admin\templates\base.html:227 .\admin\templates\base.html:263 +msgid "Create" +msgstr "作成" + +#: .\admin\templates\base.html:181 +msgid "Preprint Providers" +msgstr "プレプリントプロバイダー" + +#: .\admin\templates\base.html:186 +msgid "Whitelist" +msgstr "ホワイトリスト" + +#: .\admin\templates\base.html:195 +msgid "Provider Assets" +msgstr "プロバイダーアセット" + +#: .\admin\templates\base.html:208 +msgid "Collection Providers" +msgstr "コレクションプロバイダー" + +#: .\admin\templates\base.html:221 +msgid "Registration Providers" +msgstr "登録プロバイダー" + +#: .\admin\templates\base.html:233 +msgid "Meetings" +msgstr "ミーティング" + +#: .\admin\templates\base.html:236 +msgid "Prereg" +msgstr "プレレグ" + +#: .\admin\templates\base.html:239 +msgid "Metrics" +msgstr "メトリックス" + +#: .\admin\templates\base.html:242 +msgid "Subjects" +msgstr "サブジェクト" + +#: .\admin\templates\base.html:246 +msgid "Groups" +msgstr "グループ" + +#: .\admin\templates\base.html:250 +msgid "Search" +msgstr "検索" + +#: .\admin\templates\base.html:257 +msgid "Banners" +msgstr "バナー" + +#: .\admin\templates\base.html:270 +msgid "Maintenance Alerts" +msgstr "メンテナスアラート" + +#: .\admin\templates\base.html:273 +#: .\admin\templates\rdm_addons\addon_list.html:6 +#: .\admin\templates\rdm_addons\addon_list.html:17 +#: .\admin\templates\rdm_addons\addon_list.html:19 +#: .\admin\templates\rdm_addons\institution_list.html:13 +#: .\admin\templates\rdm_addons\institution_list.html:17 +msgid "RDM Addons" +msgstr "アドオン利用制御" + +#: .\admin\templates\base.html:274 +#: .\admin\templates\rdm_statistics\crawl.html:6 +#: .\admin\templates\rdm_statistics\crawl.html:9 +#: .\admin\templates\rdm_statistics\index.html:6 +#: .\admin\templates\rdm_statistics\index.html:9 +#: .\admin\templates\rdm_statistics\institution_list.html:13 +#: .\admin\templates\rdm_statistics\institution_list.html:17 +#: .\admin\templates\rdm_statistics\mail.html:11 +#: .\admin\templates\rdm_statistics\mail.html:14 +#: .\admin\templates\rdm_statistics\statistics.html:32 +#: .\admin\templates\rdm_statistics\statistics.html:35 +msgid "RDM Statistics" +msgstr "利用統計" + +#: .\admin\templates\base.html:275 +#: .\admin\templates\rdm_announcement\index.html:6 +#: .\admin\templates\rdm_announcement\index.html:11 +#: .\admin\templates\rdm_announcement\index.html:13 +#: .\admin\templates\rdm_announcement\send.html:7 +#: .\admin\templates\rdm_announcement\send.html:12 +#: .\admin\templates\rdm_announcement\send.html:14 +#: .\admin\templates\rdm_announcement\settings.html:7 +#: .\admin\templates\rdm_announcement\settings.html:12 +#: .\admin\templates\rdm_announcement\settings.html:14 +msgid "RDM Announcement" +msgstr "アナウンス" + +#: .\admin\templates\base.html:276 +msgid "Timestamp Control" +msgstr "証跡管理" + +#: .\admin\templates\base.html:278 +msgid "User Keys Management" +msgstr "ユーザーキー管理" + +#: .\admin\templates\base.html:279 +msgid "Timestamp Environment" +msgstr "タイムスタンプ環境" + +#: .\admin\templates\base.html:284 +msgid "Quota for NII Storage" +msgstr "クォータ管理" + +#: .\admin\templates\base.html:287 +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:16 +#: .\admin\templates\users\user_details.html:17 +msgid "Institutional Storage" +msgstr "機関ストレージ" + +#: .\admin\templates\base.html:288 +msgid "Quota for Institutional Storage" +msgstr "クォータ管理" + +#: .\admin\templates\base.html:303 .\admin\templates\home.html:10 +msgid "Welcome to the GakuNin RDM Admin Home Page" +msgstr "GakuNin RDM機関管理者ページへようこそ" + +#: .\admin\templates\base.html:313 +msgid "National Institute of Informatics" +msgstr "国立情報学研究所" + +#: .\admin\templates\collection_providers\cannot_delete.html:7 +msgid "Collection Provider Delete" +msgstr "コレクションプロバイダーの削除" + +#: .\admin\templates\collection_providers\cannot_delete.html:13 +#, python-format +msgid "Cannot Delete %(providerName)s" +msgstr "%(providerName)sを削除できません" + +#: .\admin\templates\collection_providers\cannot_delete.html:14 +#, python-format +msgid "" +"%(providerName)s has %(collectionsubmissionSetCount)s submissions " +"associated with it, and therefore cannot be safely deleted." +msgstr "%(providerName)sには%(collectionsubmissionSetCount)sつの送信が関連付けられているため、安全に削除できません。" + +#: .\admin\templates\collection_providers\confirm_delete.html:5 +msgid "Delete Collection Provider" +msgstr "コレクションプロバイダの削除" + +#: .\admin\templates\collection_providers\confirm_delete.html:12 +#: .\admin\templates\institutions\confirm_delete.html:19 +#, python-format +msgid "Are you sure you want to delete \"%(objectName)s\"?" +msgstr "\"%(objectName)s\"を削除してもよろしいですか?" + +#: .\admin\templates\collection_providers\create.html:9 +msgid "Create Collection Provider" +msgstr "コレクションプロバイダを作成" + +#: .\admin\templates\collection_providers\create.html:12 +msgid "Create A Collection Provider" +msgstr "コレクションプロバイダを作成" + +#: .\admin\templates\collection_providers\detail.html:16 +msgid "Export collection provider metadata" +msgstr "コレクションプロバイダーメタデータのエクスポート" + +#: .\admin\templates\collection_providers\detail.html:17 +msgid "Delete collection provider" +msgstr "コレクションプロバイダを削除" + +#: .\admin\templates\collection_providers\detail.html:28 +msgid "Modify Collection Provider" +msgstr "コレクションプロバイダを変更" + +#: .\admin\templates\collection_providers\list.html:6 +#: .\admin\templates\collection_providers\list.html:9 +msgid "List of Collection Providers" +msgstr "コレクションプロバイダのリスト" + +#: .\admin\templates\collection_providers\list.html:16 +#: .\admin\templates\institutions\institution_list.html:22 +#: .\admin\templates\institutions\list.html:22 +#: .\admin\templates\messages.html:17 +#: .\admin\templates\rdm_keymanagement\institutions.html:22 +#: .\admin\templates\rdm_timestampadd\list.html:22 +msgid "Description" +msgstr "説明" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:62 +msgid "Collected type choices:" +msgstr "収集されたタイプの選択" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:68 +msgid "Status choices:" +msgstr "ステータスの選択" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:74 +msgid "Volume choices:" +msgstr "ボリュームの選択" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:80 +msgid "Issue choices:" +msgstr "イシューの選択" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:86 +msgid "Program Area choices:" +msgstr "プログラムエリアの選択" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:96 +#: .\admin\templates\institutions\create.html:29 +#: .\admin\templates\institutions\detail.html:80 +msgid "Import from JSON" +msgstr "JSONからインポート" + +#: .\admin\templates\collection_providers\update_collection_provider_form.html:97 +msgid "" +"Choose a JSON file that has been previously exported from another " +"Collection Provider detail page. This will pre-populate the Collection " +"Provider change form with those details." +msgstr "" +"別のコレクションプロバイダーの詳細ページから以前にエクスポートされたJSONファイルを選択します。 " +"これにより、コレクションプロバイダーの変更フォームにそれらの詳細が事前に入力されます。" + +#: .\admin\templates\desk\cases.html:6 +#, python-format +msgid "GakuNin RDM user \"%(user_id)s\" up to 50 most recent desk.com cases:" +msgstr "GakuNin RDMユーザー\"%(user_id)s\"は最新のdesk.comケースを最大50件まで:" + +#: .\admin\templates\desk\cases.html:10 .\admin\templates\desk\customer.html:40 +msgid "Type" +msgstr "タイプ" + +#: .\admin\templates\desk\cases.html:11 +msgid "Status" +msgstr "ステータス" + +#: .\admin\templates\desk\cases.html:12 +msgid "Subject" +msgstr "分野" + +#: .\admin\templates\desk\cases.html:13 +msgid "Links to Desk" +msgstr "デスクへのリンク" + +#: .\admin\templates\desk\cases.html:23 .\admin\templates\messages.html:35 +msgid "Link" +msgstr "リンク" + +#: .\admin\templates\desk\cases.html:28 +msgid "No cases" +msgstr "ケースなし" + +#: .\admin\templates\desk\cases.html:35 .\admin\templates\desk\customer.html:58 +#: .\admin\templates\desk\desk_error.html:14 +#: .\admin\templates\desk\user_not_found.html:13 +#: .\admin\templates\rdm_addons\oauth_complete.html:57 +#: .\admin\templates\spam\email.html:31 +msgid "Close" +msgstr "閉じる" + +#: .\admin\templates\desk\customer.html:10 +#: .\admin\templates\nodes\node.html:139 .\admin\templates\nodes\node.html:328 +#: .\admin\templates\users\user.html:165 +#: .\admin\templates\users\user_details.html:23 +msgid "Field" +msgstr "フィールド" + +#: .\admin\templates\desk\customer.html:11 +#: .\admin\templates\nodes\node.html:140 .\admin\templates\nodes\node.html:329 +#: .\admin\templates\users\user.html:166 +#: .\admin\templates\users\user_details.html:24 +msgid "Value" +msgstr "値" + +#: .\admin\templates\desk\customer.html:20 +msgid "Company" +msgstr "会社" + +#: .\admin\templates\desk\customer.html:24 +msgid "Background" +msgstr "拝啓" + +#: .\admin\templates\desk\customer.html:27 +msgid "Desk id" +msgstr "デスクID" + +#: .\admin\templates\desk\customer.html:31 +#: .\admin\templates\desk\user_not_found.html:11 +msgid "Go to Desk" +msgstr "デスクへ行く" + +#: .\admin\templates\desk\customer.html:35 +#: .\admin\templates\desk\customer.html:41 .\admin\templates\messages.html:8 +#: .\admin\templates\spam\detail.html:24 .\admin\templates\users\user.html:193 +msgid "Email" +msgstr "eメール" + +#: .\admin\templates\desk\desk_error.html:12 +msgid "Desk Settings" +msgstr "デスクの設定" + +#: .\admin\templates\desk\settings.html:5 +msgid "Desk user settings" +msgstr "デスクのユーザ設定" + +#: .\admin\templates\desk\user_not_found.html:7 +msgid "To add a new desk customer, you can go to Desk in order to complete this." +msgstr "新しいデスクの顧客を追加するには、これを完了するためにデスクに移動できます。" + +#: .\admin\templates\emails\password_change_done.html:3 +msgid "Documentation" +msgstr "書類" + +#: .\admin\templates\emails\password_change_done.html:3 +msgid "Change password" +msgstr "パスワードの変更" + +#: .\admin\templates\emails\password_change_done.html:3 +msgid "'Log out'" +msgstr "ログアウト" + +#: .\admin\templates\emails\password_change_done.html:6 +msgid "Home" +msgstr "ホーム" + +#: .\admin\templates\emails\password_change_done.html:7 +msgid "Password change" +msgstr "パスワード変更" + +#: .\admin\templates\emails\password_change_done.html:14 +msgid "Your password has been changed." +msgstr "パスワードが変更されました。" + +#: .\admin\templates\emails\password_change_done.html:16 +msgid "Return to home" +msgstr "ホームへ戻る" + +#: .\admin\templates\emails\password_reset_email.html:2 +msgid "" +"You're receiving this email because you requested a password reset for " +"your GakuNin RDM Admin user account." +msgstr "GakuNin RDM Adminユーザーアカウントのパスワードのリセットをリクエストしたため、このメールを受信しています。" + +#: .\admin\templates\emails\password_reset_email.html:4 +msgid "Please go to this link to reset your password:" +msgstr "パスワードをリセットするには、次のリンクにアクセスしてください。" + +#: .\admin\templates\emails\password_reset_email.html:9 +msgid "Your account email is:" +msgstr "アカウントのメールは次のとおりです:" + +#: .\admin\templates\emails\password_reset_email.html:11 +msgid "Thank you." +msgstr "ありがとうございます。" + +#: .\admin\templates\emails\password_reset_email.html:13 +msgid "-GakuNin RDM Admin" +msgstr "-GakuNin RDM 管理者" + +#: .\admin\templates\home.html:5 +#, python-format +msgid "Hello %(userfullname)s, " +msgstr "こんにちは %(userfullname)sさん" + +#: .\admin\templates\home.html:8 +msgid "Welcome to the GakuNin RDM General Admin Home Page" +msgstr "GakuNin RDM総合管理者(NII)ページへようこそ" + +#: .\admin\templates\home.html:12 +msgid " Use the menu on the left to access admin pages. " +msgstr " 左側のメニューから、それぞれの管理ページにアクセスします。 " + +#: .\admin\templates\institutions\cannot_delete.html:7 +#: .\admin\templates\institutions\confirm_delete.html:11 +msgid "Institution Delete" +msgstr "機関を削除" + +#: .\admin\templates\institutions\cannot_delete.html:13 +#, python-format +msgid "Cannot Delete %(institutionName)s" +msgstr "%(institutionName)sを削除できません" + +#: .\admin\templates\institutions\cannot_delete.html:14 +#, python-format +msgid "" +"%(institutionName)s has %(institutionNodeCount)s nodes associated with " +"it, and therefore cannot be safely deleted." +msgstr "%(institutionName)sには%(institutionNodeCount)sつのノードが関連付けられているため、安全に削除できません。" + +#: .\admin\templates\institutions\cannot_delete.html:15 +msgid "View associated nodes here" +msgstr "関連するノードをここで表示" + +#: .\admin\templates\institutions\cannot_delete.html:16 +msgid "Back to institution detail" +msgstr "機関の詳細に戻る" + +#: .\admin\templates\institutions\confirm_delete.html:17 +msgid "Confirm Institution Delete" +msgstr "機関の削除を確認" + +#: .\admin\templates\institutions\create.html:10 +msgid "Create Institution" +msgstr "機関を作成" + +#: .\admin\templates\institutions\create.html:16 +msgid "Create An Institution" +msgstr "機関を作成する" + +#: .\admin\templates\institutions\create.html:30 +#: .\admin\templates\institutions\detail.html:81 +msgid "" +"Choose a JSON file that has been previously exported from another " +"Institution detail page. This will pre-populate the Institution change " +"form with those details." +msgstr "別の教育機関の詳細ページから以前にエクスポートされたJSONファイルを選択します。これにより、機関の変更フォームにそれらの詳細が事前に入力されます。" + +#: .\admin\templates\institutions\create.html:34 +msgid "Import" +msgstr "インポート" + +#: .\admin\templates\institutions\detail.html:16 +msgid "Export institution metadata" +msgstr "機関のメタデータをエクスポートする" + +#: .\admin\templates\institutions\detail.html:18 +msgid "Delete institution" +msgstr "機関を削除" + +#: .\admin\templates\institutions\detail.html:30 +#, python-format +msgid "View %(node_count)s affiliated nodes" +msgstr "%(node_count)sの関連ノードを表示" + +#: .\admin\templates\institutions\detail.html:35 +msgid "Logo:" +msgstr "ロゴ:" + +#: .\admin\templates\institutions\detail.html:41 +msgid "Banner:" +msgstr "バナー:" + +#: .\admin\templates\institutions\detail.html:52 +#: .\admin\templates\institutions\detail.html:103 +msgid "Modify Institution" +msgstr "機関を変更" + +#: .\admin\templates\institutions\detail.html:103 +msgid "Hide Form" +msgstr "フォームを隠す" + +#: .\admin\templates\institutions\institution_list.html:11 +#: .\admin\templates\institutions\institution_list.html:14 +#: .\admin\templates\institutions\list.html:11 +#: .\admin\templates\institutions\list.html:14 +#: .\admin\templates\rdm_keymanagement\institutions.html:11 +#: .\admin\templates\rdm_keymanagement\institutions.html:14 +#: .\admin\templates\rdm_timestampadd\list.html:11 +#: .\admin\templates\rdm_timestampadd\list.html:14 +#: .\admin\templates\rdm_timestampsettings\list.html:11 +#: .\admin\templates\rdm_timestampsettings\list.html:14 +msgid "List of Institutions" +msgstr "機関のリスト" + +#: .\admin\templates\institutions\institution_list.html:20 +#: .\admin\templates\institutions\list.html:20 +#: .\admin\templates\rdm_addons\institution_list.html:29 +#: .\admin\templates\rdm_keymanagement\institutions.html:20 +#: .\admin\templates\rdm_statistics\institution_list.html:29 +#: .\admin\templates\rdm_timestampadd\list.html:20 +#: .\admin\templates\rdm_timestampsettings\list.html:20 +#: .\admin\templates\rdm_timestampsettings\list.html:50 +msgid "Logo" +msgstr "ロゴ" + +#: .\admin\templates\institutions\list_institute.html:10 +#, python-format +msgid "%(institution_name)s User List - Statistical Status of NII Storage" +msgstr "%(institution_name)sユーザリスト - NIIストレージの統計ステータス" + +#: .\admin\templates\institutions\list_institute.html:16 +#: .\admin\templates\institutions\statistical_status_default_storage.html:16 +#: .\admin\templates\rdm_keymanagement\delete_user_list.html:10 +#: .\admin\templates\users\list.html:11 +msgid "No results found" +msgstr "結果が見つかりません" + +#: .\admin\templates\institutions\node_list.html:11 +#: .\admin\templates\metrics\osf_metrics.html:227 +#: .\admin\templates\metrics\osf_metrics.html:281 +#: .\admin\templates\rdm_timestampadd\node_list.html:12 +#: .\admin\templates\rdm_timestampsettings\node_list.html:11 +msgid "Affiliated Nodes" +msgstr "関連ノード" + +#: .\admin\templates\institutions\node_list.html:14 +#: .\admin\templates\rdm_timestampadd\node_list.html:15 +#: .\admin\templates\rdm_timestampsettings\node_list.html:14 +#, python-format +msgid "List of Nodes for %(institutionName)s" +msgstr "%(institutionName)sのノードリスト" + +#: .\admin\templates\institutions\statistical_status_default_storage.html:10 +#, python-format +msgid "" +"%(institution_name)s User List - Statistical Status of Institutional " +"Storage" +msgstr "%(institution_name)sユーザーリスト - 施設内ストレージの統計ステータス" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:2 +#: .\admin\templates\users\user_details.html:11 +#: .\admin\templates\users\user_details.html:16 +msgid "Statistical Status of Institutional Storage" +msgstr "ストレージクォータ設定" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:3 +#, python-format +msgid "Institutional Storage > %(institution_name)s" +msgstr "機関ストレージ > %(institution_name)s" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:11 +#: .\admin\templates\institutions\user_list_by_institute.html:11 +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:42 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:35 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:36 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:32 +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:34 +#: .\admin\templates\rdm_keymanagement\user_list.html:10 +#: .\admin\templates\users\user.html:181 +#: .\admin\templates\users\user_list.html:23 +msgid "Username" +msgstr "ユーザ名" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:16 +#: .\admin\templates\institutions\user_list_by_institute.html:16 +#: .\admin\templates\rdm_keymanagement\user_list.html:11 +#: .\admin\templates\users\user_list.html:24 +msgid "Fullname" +msgstr "氏名" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:21 +#: .\admin\templates\institutions\user_list_by_institute.html:21 +msgid "Ratio" +msgstr "比" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:26 +#: .\admin\templates\institutions\user_list_by_institute.html:26 +msgid "Usage" +msgstr "使用率" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:31 +#: .\admin\templates\institutions\user_list_by_institute.html:31 +msgid "Remaining" +msgstr "残り" + +#: .\admin\templates\institutions\statistical_status_default_storage_user.html:36 +#: .\admin\templates\institutions\user_list_by_institute.html:36 +msgid "Quota" +msgstr "割当て" + +#: .\admin\templates\institutions\user_list_by_institute.html:2 +msgid "Statistical Status of NII Storage" +msgstr "NIIストレージの統計ステータス" + +#: .\admin\templates\institutions\user_list_by_institute.html:3 +#, python-format +msgid "NII Storage > %(institution_name)s" +msgstr "NIIストレージ > %(institution_name)s" + +#: .\admin\templates\login.html:6 +msgid "GakuNin RDM Admin | Log in" +msgstr "GakuNin RDM管理者 | ログイン" + +#: .\admin\templates\login.html:20 +msgid "GakuNin RDM" +msgstr "GakuNin RDM" + +#: .\admin\templates\login.html:23 +msgid "Sign in to start your session" +msgstr "サインインしてセッションを始めてください。" + +#: .\admin\templates\login.html:35 +msgid "Email:" +msgstr "Eメール:" + +#: .\admin\templates\login.html:40 +msgid "Password:" +msgstr "パスワード:" + +#: .\admin\templates\login.html:47 +msgid "Sign In" +msgstr "サインイン" + +#: .\admin\templates\maintenance\delete_maintenance.html:5 +msgid "Are you sure you want to take down this maintenance alert?" +msgstr "このメンテナンスアラートを削除してもよろしいですか?" + +#: .\admin\templates\maintenance\delete_maintenance.html:8 +msgid "It will be removed from all GakuNin RDM pages." +msgstr "すべてのGakuNin RDMページから削除されます。" + +#: .\admin\templates\maintenance\display.html:8 +#: .\admin\templates\maintenance\display.html:11 +msgid "Maintenance State" +msgstr "メンテナンス状態" + +#: .\admin\templates\maintenance\display.html:16 +msgid "Time" +msgstr "時間" + +#: .\admin\templates\maintenance\display.html:17 +msgid "Message" +msgstr "メッセージ" + +#: .\admin\templates\maintenance\display.html:18 +#: .\admin\templates\messages.html:30 +#: .\admin\templates\osf\subject_list.html:18 +msgid "Level" +msgstr "レベル" + +#: .\admin\templates\maintenance\display.html:24 +msgid "Current alert:" +msgstr "現在のアラート:" + +#: .\admin\templates\maintenance\display.html:31 +msgid "" +"The site will undergo maintenance between <localized start " +"time>-<localized end time>. Thank you for your patience." +msgstr "サイトは、<ローカライズされた開始時間>-<ローカライズされた終了時間>の間でメンテナンスされます。 お待ちいただいてありがとうございます。" + +#: .\admin\templates\maintenance\display.html:37 +msgid "Remove alert" +msgstr "アラートを削除" + +#: .\admin\templates\maintenance\display.html:54 +msgid "Put up an alert:" +msgstr "警告を出す:" + +#: .\admin\templates\maintenance\display.html:59 +msgid "Start" +msgstr "開始" + +#: .\admin\templates\maintenance\display.html:59 +#: .\admin\templates\maintenance\display.html:60 +msgid "Eastern Date/Time" +msgstr "東部日時" + +#: .\admin\templates\maintenance\display.html:60 +msgid "End" +msgstr "終了" + +#: .\admin\templates\maintenance\display.html:63 +msgid "Message:" +msgstr "メッセージ:" + +#: .\admin\templates\maintenance\display.html:64 +msgid "Reminder:" +msgstr "リマインダ:" + +#: .\admin\templates\maintenance\display.html:64 +msgid "" +"This alert will go up as soon as it is created and will have to be " +"manually removed. (Creating a new alert automatically removes an existing" +" one.)" +msgstr "このアラートは、作成されるとすぐに表示され、手動で削除する必要があります。(新しいアラートを作成すると、既存のアラートは自動的に削除されます)" + +#: .\admin\templates\maintenance\display.html:65 +msgid "Submit@send" +msgstr "送信" + +#: .\admin\templates\meetings\create.html:7 +msgid "GakuNIn RDM Admin | Meetings" +msgstr "GakuNIn RDM管理者 | ミーティング" + +#: .\admin\templates\meetings\detail.html:7 +#: .\admin\templates\meetings\list.html:7 +msgid "GakuNin RDM Admin | Meetings" +msgstr "GakuNin RDM管理者 | ミーティング" + +#: .\admin\templates\meetings\list.html:12 +msgid "Add meeting" +msgstr "ミーティングを追加" + +#: .\admin\templates\meetings\list.html:15 +msgid "List of Meetings" +msgstr "ミーティングリスト" + +#: .\admin\templates\meetings\list.html:20 +msgid "Endpoint" +msgstr "エンドポイント" + +#: .\admin\templates\meetings\list.html:22 +msgid "Active" +msgstr "アクティブ" + +#: .\admin\templates\meetings\list.html:23 +#: .\admin\templates\metrics\osf_metrics.html:681 +msgid "Public Projects" +msgstr "公開プロジェクト" + +#: .\admin\templates\meetings\list.html:24 +msgid "Submissions" +msgstr "提出" + +#: .\admin\templates\messages.html:3 +msgid "API Key" +msgstr "APIキー" + +#: .\admin\templates\messages.html:4 +msgid "API Secret" +msgstr "APIシークレット" + +#: .\admin\templates\messages.html:5 +msgid "Access Token" +msgstr "アクセストークン" + +#: .\admin\templates\messages.html:6 +msgid "Access Token Secret" +msgstr "アクセストークンシークレット" + +#: .\admin\templates\messages.html:7 +msgid "API URL" +msgstr "API URL" + +#: .\admin\templates\messages.html:9 +msgid "None" +msgstr "無し" + +#: .\admin\templates\messages.html:10 +msgid "title" +msgstr "件名" + +#: .\admin\templates\messages.html:11 +msgid "text" +msgstr "本文" + +#: .\admin\templates\messages.html:12 +msgid "Type@announcement" +msgstr "配信方法" + +#: .\admin\templates\messages.html:13 +msgid "name" +msgstr "氏名" + +#: .\admin\templates\messages.html:14 +msgid "email" +msgstr "eメール" + +#: .\admin\templates\messages.html:15 +msgid "Last logged" +msgstr "最終ログイン" + +#: .\admin\templates\messages.html:18 +msgid "Banner name" +msgstr "バナー名" + +#: .\admin\templates\messages.html:19 +msgid "Logo name" +msgstr "ロゴ名" + +#: .\admin\templates\messages.html:20 +msgid "Delegation protocol" +msgstr "委任プロトコル" + +#: .\admin\templates\messages.html:21 +msgid "Login url" +msgstr "ログインURL" + +#: .\admin\templates\messages.html:22 +msgid "Logout url" +msgstr "ログアウトURL" + +#: .\admin\templates\messages.html:23 +msgid "Domains" +msgstr "ドメイン" + +#: .\admin\templates\messages.html:24 +msgid "Email domains" +msgstr "メールドメイン" + +#: .\admin\templates\messages.html:25 +msgid "File" +msgstr "ファイル" + +#: .\admin\templates\messages.html:26 +msgid "CAS by pac4j" +msgstr "pac4jによるCAS" + +#: .\admin\templates\messages.html:27 +msgid "OAuth by pac4j" +msgstr "pac4jによるOAuth" + +#: .\admin\templates\messages.html:28 +msgid "SAML by Shibboleth" +msgstr "ShibbolethによるSAML" + +#: .\admin\templates\messages.html:29 +msgid "No Delegation Protocol" +msgstr "委任プロトコルなし" + +#: .\admin\templates\messages.html:31 +msgid "Alt text for accessibility" +msgstr "アクセシビリティのための代替テキスト" + +#: .\admin\templates\messages.html:32 +msgid "Start date" +msgstr "開始日" + +#: .\admin\templates\messages.html:33 +msgid "End date" +msgstr "終了日" + +#: .\admin\templates\messages.html:34 +msgid "License" +msgstr "ライセンス" + +#: .\admin\templates\messages.html:36 +msgid "Default photo" +msgstr "デフォルトの写真" + +#: .\admin\templates\messages.html:37 +msgid "Mobile photo" +msgstr "モバイル写真" + +#: .\admin\templates\messages.html:38 +msgid "Default photo alt text" +msgstr "デフォルトの写真の代替テキスト" + +#: .\admin\templates\messages.html:39 +msgid "Mobile photo alt text" +msgstr "モバイル写真の代替テキスト" + +#: .\admin\templates\messages.html:40 +msgid "Select a file" +msgstr "ファイルを選択" + +#: .\admin\templates\messages.html:41 +msgid "node" +msgstr "ノード" + +#: .\admin\templates\messages.html:42 +msgid "project" +msgstr "プロジェクト" + +#: .\admin\templates\messages.html:43 +msgid "addon" +msgstr "アドオン" + +#: .\admin\templates\messages.html:44 +msgid "comment" +msgstr "コメント" + +#: .\admin\templates\metrics\osf_metrics.html:7 +#: .\admin\templates\metrics\osf_metrics.html:26 +#: .\admin\templates\metrics\osf_statistics.html:6 +msgid "GakuNin RDM Metrics" +msgstr "GakuNin RDM メトリクス" + +#: .\admin\templates\metrics\osf_metrics.html:30 +#: .\admin\templates\metrics\osf_metrics.html:45 +msgid "User Data" +msgstr "ユーザーデータ" + +#: .\admin\templates\metrics\osf_metrics.html:31 +#: .\admin\templates\metrics\osf_metrics.html:216 +msgid "Institution Metrics" +msgstr "機関メトリクス" + +#: .\admin\templates\metrics\osf_metrics.html:32 +msgid "Active User Metrics" +msgstr "アクティブユーザーメトリクス" + +#: .\admin\templates\metrics\osf_metrics.html:33 +#: .\admin\templates\metrics\osf_metrics.html:573 +msgid "Healthy User Metrics" +msgstr "健全なユーザメトリクス" + +#: .\admin\templates\metrics\osf_metrics.html:34 +#: .\admin\templates\metrics\osf_metrics.html:636 +msgid "Raw Numbers" +msgstr "生の数値" + +#: .\admin\templates\metrics\osf_metrics.html:35 +#: .\admin\templates\metrics\osf_metrics.html:926 +msgid "Addons" +msgstr "アドオン" + +#: .\admin\templates\metrics\osf_metrics.html:37 +#: .\admin\templates\metrics\osf_metrics.html:645 +#: .\admin\templates\metrics\osf_metrics.html:977 +#: .\admin\templates\metrics\osf_metrics.html:1011 +msgid "Downloads" +msgstr "ダウンロード" + +#: .\admin\templates\metrics\osf_metrics.html:54 +msgid "User Growth" +msgstr "ユーザーの成長" + +#: .\admin\templates\metrics\osf_metrics.html:55 +msgid "User gain per day" +msgstr "1日あたりのユーザーゲイン" + +#: .\admin\templates\metrics\osf_metrics.html:56 +msgid "Registrations by Email Domain" +msgstr "Eメールドメインによる登録" + +#: .\admin\templates\metrics\osf_metrics.html:57 +msgid "Node Logs by User" +msgstr "ユーザー別のノードログ" + +#: .\admin\templates\metrics\osf_metrics.html:70 +msgid "User Growth - Previous 800 days" +msgstr "ユーザーの増加 - 過去800日間" + +#: .\admin\templates\metrics\osf_metrics.html:76 +msgid "The growth of GakuNin RDM Confirmed Users over the past 800 days." +msgstr "過去800日間におけるGakuNin RDM確認済みユーザーの増加。" + +#: .\admin\templates\metrics\osf_metrics.html:83 +msgid "Total Users" +msgstr "総ユーザ数" + +#: .\admin\templates\metrics\osf_metrics.html:89 +msgid "This is the total number of GakuNin RDM Users with confirmed accounts." +msgstr "これは、確認済みのアカウントを持つGakuNin RDMユーザーの総数です。" + +#: .\admin\templates\metrics\osf_metrics.html:99 +msgid "Monthly User Increase" +msgstr "毎月のユーザー増加" + +#: .\admin\templates\metrics\osf_metrics.html:105 +#: .\admin\templates\metrics\osf_metrics.html:146 +msgid "The number of users gained in the past month." +msgstr "過去1か月に獲得したユーザーの数。" + +#: .\admin\templates\metrics\osf_metrics.html:112 +msgid "Daily User Increase" +msgstr "毎日のユーザー増加" + +#: .\admin\templates\metrics\osf_metrics.html:118 +msgid "The number of users gained from two days ago until yesterday." +msgstr "2日前から昨日までに獲得したユーザーの数。" + +#: .\admin\templates\metrics\osf_metrics.html:125 +msgid "Average Daily User Gain" +msgstr "1日の平均ユーザーゲイン" + +#: .\admin\templates\metrics\osf_metrics.html:131 +msgid "The average daily user gain over the past 7 days." +msgstr "過去7日間の1日あたりの平均ユーザーゲイン。" + +#: .\admin\templates\metrics\osf_metrics.html:140 +msgid "User Gain per Day" +msgstr "1日あたりのユーザーゲイン" + +#: .\admin\templates\metrics\osf_metrics.html:155 +msgid "Unverified New Users" +msgstr "未確認の新規ユーザー" + +#: .\admin\templates\metrics\osf_metrics.html:161 +msgid "Users created within the last 7 days that have not been confirmed." +msgstr "確認されていない過去7日間に作成されたユーザー。" + +#: .\admin\templates\metrics\osf_metrics.html:168 +msgid "User Growth over the Last Seven Days" +msgstr "過去7日間のユーザーの増加" + +#: .\admin\templates\metrics\osf_metrics.html:174 +msgid "" +"The last 7 days of users, organized by status. Click a category in the " +"legend to resize the axes." +msgstr "ステータス別に編成された過去7日間のユーザー。 凡例のカテゴリをクリックして、軸のサイズを変更します。" + +#: .\admin\templates\metrics\osf_metrics.html:183 +msgid "Previous 7 days of user registrations by email domain" +msgstr "メールドメインごとの過去7日間のユーザー登録" + +#: .\admin\templates\metrics\osf_metrics.html:189 +msgid "The last 7 days of users, organized by status." +msgstr "ステータス別に編成された過去7日間のユーザー。" + +#: .\admin\templates\metrics\osf_metrics.html:198 +msgid "Yesterday's Node logs by user" +msgstr "ユーザーによる昨日のノードログ" + +#: .\admin\templates\metrics\osf_metrics.html:205 +msgid "The last day of node logs by user, if a user had over 100 node logs." +msgstr "ユーザーが100を超えるノードログを保持していた場合、ユーザーごとのノードログの最終日。" + +#: .\admin\templates\metrics\osf_metrics.html:225 +msgid "Total Institutional Users" +msgstr "機関全体のユーザー" + +#: .\admin\templates\metrics\osf_metrics.html:226 +msgid "Institutional Users Growth" +msgstr "機関ユーザーの成長" + +#: .\admin\templates\metrics\osf_metrics.html:228 +#: .\admin\templates\metrics\osf_metrics.html:343 +msgid "Affiliated Projects" +msgstr "関連プロジェクト" + +#: .\admin\templates\metrics\osf_metrics.html:238 +msgid "Total institutional Users" +msgstr "機関全体のユーザー" + +#: .\admin\templates\metrics\osf_metrics.html:244 +msgid "" +"Total number of users who have accounts associated with their " +"institutions." +msgstr "機関に関連付けられたアカウントを持っているユーザーの総数。" + +#: .\admin\templates\metrics\osf_metrics.html:252 +msgid "Institutional Users / Total GakuNin RDM Users" +msgstr "機関ユーザー/ GakuNIn RDMの合計ユーザー" + +#: .\admin\templates\metrics\osf_metrics.html:258 +msgid "The percentage of users who created an account through their institution." +msgstr "機関を通じてアカウントを作成したユーザーの割合。" + +#: .\admin\templates\metrics\osf_metrics.html:267 +msgid "Institutional Users over the past 100 Days" +msgstr "過去100日間の機関ユーザー" + +#: .\admin\templates\metrics\osf_metrics.html:273 +msgid "" +"The growth of users who have accounts associated with their institutions." +" Click on an institution name in the key to remove its line and resize " +"the chart axes." +msgstr "機関に関連付けられたアカウントを持つユーザーの成長。 キーの機関名をクリックしてその行を削除し、チャート軸のサイズを変更します。" + +#: .\admin\templates\metrics\osf_metrics.html:282 +msgid "" +"Nodes (at all levels, projects and components) created by each " +"institution as of yesterday." +msgstr "昨日の時点で各機関によって作成されたノード(すべてのレベル、プロジェクト、およびコンポーネント)。" + +#: .\admin\templates\metrics\osf_metrics.html:289 +msgid "Affiliated Public Nodes" +msgstr "関連するパブリックノード" + +#: .\admin\templates\metrics\osf_metrics.html:295 +msgid "" +"Total number of public nodes (at all levels, projects and components) " +"created by each institution as of yesterday." +msgstr "昨日の時点で各機関によって作成されたパブリックノード(すべてのレベル、プロジェクト、およびコンポーネント)の総数。" + +#: .\admin\templates\metrics\osf_metrics.html:302 +msgid "Affiliated Private Nodes" +msgstr "提携プライベートノード" + +#: .\admin\templates\metrics\osf_metrics.html:308 +msgid "" +"Total number of private nodes (at all levels, projects and components) " +"created by each institution as of yesterday." +msgstr "昨日の時点で各機関によって作成されたプライベートノード(すべてのレベル、プロジェクト、およびコンポーネント)の総数。" + +#: .\admin\templates\metrics\osf_metrics.html:317 +msgid "Affiliated Public Registrations" +msgstr "提携登録登録" + +#: .\admin\templates\metrics\osf_metrics.html:323 +msgid "" +"Total number of public registered nodes (at all levels, projects and " +"components) created by each institution as of yesterday." +msgstr "昨日の時点で各機関によって作成された(すべてのレベル、プロジェクト、およびコンポーネントで)パブリックに登録されたノードの総数。" + +#: .\admin\templates\metrics\osf_metrics.html:330 +msgid "Affiliated Embargoed Registrations" +msgstr "加盟禁止登録" + +#: .\admin\templates\metrics\osf_metrics.html:336 +msgid "" +"Total number of private registered nodes (at all levels, projects and " +"components) created by each institution as of yesterday." +msgstr "昨日現在、各機関によって作成されたプライベート登録ノード(すべてのレベル、プロジェクト、およびコンポーネント)の総数。" + +#: .\admin\templates\metrics\osf_metrics.html:344 +msgid "Top level projects created by each institution as of yesterday." +msgstr "昨日現在、各機関によって作成されたトップレベルのプロジェクト。" + +#: .\admin\templates\metrics\osf_metrics.html:351 +msgid "Affiliated Public Projects" +msgstr "提携公共プロジェクト" + +#: .\admin\templates\metrics\osf_metrics.html:357 +msgid "" +"Total number of public top level projects created by each institution as " +"of yesterday." +msgstr "昨日の時点で各機関によって作成されたトップレベルの公共プロジェクトの総数。" + +#: .\admin\templates\metrics\osf_metrics.html:364 +msgid "Affiliated Private Projects" +msgstr "提携民間プロジェクト" + +#: .\admin\templates\metrics\osf_metrics.html:370 +msgid "" +"Total number of private top level projects created by each institution as" +" of yesterday." +msgstr "昨日現在、各機関によって作成されたプライベートトップレベルプロジェクトの総数。" + +#: .\admin\templates\metrics\osf_metrics.html:379 +msgid "Affiliated Public Project Registrations" +msgstr "提携公開プロジェクト登録" + +#: .\admin\templates\metrics\osf_metrics.html:385 +msgid "" +"Total number of public registeredtop level projects created by each " +"institution as of yesterday." +msgstr "昨日現在、各機関によって作成された公開登録トップレベルプロジェクトの総数。" + +#: .\admin\templates\metrics\osf_metrics.html:392 +msgid "Affiliated Embargoed Project Registrations" +msgstr "関連する禁輸プロジェクトの登録" + +#: .\admin\templates\metrics\osf_metrics.html:398 +msgid "" +"Total number of private registered top level projects created by each " +"institution as of yesterday." +msgstr "昨日の時点で各機関によって作成されたプライベート登録トップレベルプロジェクトの総数。" + +#: .\admin\templates\metrics\osf_metrics.html:408 +msgid "Active User Metrics!" +msgstr "アクティブユーザーメトリックス!" + +#: .\admin\templates\metrics\osf_metrics.html:417 +msgid "Daily Active Users" +msgstr "毎日のアクティブユーザー" + +#: .\admin\templates\metrics\osf_metrics.html:418 +msgid "Monthly and Yearly Users" +msgstr "毎月および毎年のユーザー" + +#: .\admin\templates\metrics\osf_metrics.html:419 +#: .\admin\templates\metrics\osf_metrics.html:540 +msgid "Project to User Ratios" +msgstr "プロジェクトとユーザーの比率" + +#: .\admin\templates\metrics\osf_metrics.html:430 +msgid "Recent Daily Unique Sessions" +msgstr "最近の毎日のユニークなセッション" + +#: .\admin\templates\metrics\osf_metrics.html:436 +msgid "The previous 14 days of unique visitor sessions." +msgstr "過去14日間のユニークユーザーセッション。" + +#: .\admin\templates\metrics\osf_metrics.html:445 +msgid "Daily Active Logged In Users" +msgstr "毎日アクティブなログインユーザー" + +#: .\admin\templates\metrics\osf_metrics.html:451 +msgid "" +"This is the number of logged in users with user ids who had at least one " +"pageview on the GakuNin RDM yesterday." +msgstr "これは、昨日GakuNin RDMで少なくとも1つのページビューを持っていたユーザーIDを持つログインユーザーの数です。" + +#: .\admin\templates\metrics\osf_metrics.html:458 +msgid "Daily Active Users / Total Users" +msgstr "毎日のアクティブユーザー/合計ユーザー" + +#: .\admin\templates\metrics\osf_metrics.html:464 +#: .\admin\templates\metrics\osf_metrics.html:717 +msgid "Notes about this chart" +msgstr "このチャートに関する注意事項" + +#: .\admin\templates\metrics\osf_metrics.html:473 +msgid "Monthly Active Users (MAU)" +msgstr "月間アクティブユーザー(MAU)" + +#: .\admin\templates\metrics\osf_metrics.html:479 +msgid "Users who visited at least one page on the GakuNin RDM from last month." +msgstr "先月からGakuNin RDMの少なくとも1つのページにアクセスしたユーザー。" + +#: .\admin\templates\metrics\osf_metrics.html:486 +msgid "Last Month's Active Users / Total Users" +msgstr "先月のアクティブユーザー/総ユーザー" + +#: .\admin\templates\metrics\osf_metrics.html:492 +msgid "Last month's active users / total confirmed users" +msgstr "先月のアクティブユーザー数/確認済みユーザー総数" + +#: .\admin\templates\metrics\osf_metrics.html:499 +#, python-format +msgid "Monthly Growth of MAU%%" +msgstr "MAU%%の月次成長" + +#: .\admin\templates\metrics\osf_metrics.html:505 +msgid "" +"The percent increase from two months ago to one month ago of what " +"percentage of users with an account were active on the GakuNin RDM." +msgstr "GakuNin RDMでアクティブだったアカウントを持つユーザーの割合の2か月前から1か月前までの割合の増加。" + +#: .\admin\templates\metrics\osf_metrics.html:514 +msgid "Yearly Active Users" +msgstr "年間アクティブユーザー" + +#: .\admin\templates\metrics\osf_metrics.html:520 +msgid "Users who were active on the GakuNin RDM over the past year." +msgstr "過去1年間にGakuNin RDMでアクティブだったユーザー。" + +#: .\admin\templates\metrics\osf_metrics.html:527 +msgid "Yearly Active Users / Total Users" +msgstr "年間アクティブユーザー数/総ユーザー数" + +#: .\admin\templates\metrics\osf_metrics.html:533 +msgid "" +"The percentage of our yearly active users compared to our total users " +"with confirmed accounts." +msgstr "アカウントが確認済みの合計ユーザーと比較した、年間アクティブユーザーの割合。" + +#: .\admin\templates\metrics\osf_metrics.html:547 +msgid "Projects / Users" +msgstr "プロジェクト/ユーザー" + +#: .\admin\templates\metrics\osf_metrics.html:553 +msgid "" +"The number of projects divided by the number of users with active " +"accounts." +msgstr "アクティブなアカウントを持つユーザーの数で割ったプロジェクトの数。" + +#: .\admin\templates\metrics\osf_metrics.html:560 +msgid "Projects / Monthly Active Users" +msgstr "プロジェクト/月間アクティブユーザー" + +#: .\admin\templates\metrics\osf_metrics.html:566 +msgid "" +"The number of projects divided by the number of people who had accounts " +"and were active last month." +msgstr "プロジェクトの数を、アカウントを持ち先月アクティブだった人の数で割ったもの。" + +#: .\admin\templates\metrics\osf_metrics.html:579 +msgid "Stickiness Ratio" +msgstr "スティックネス比" + +#: .\admin\templates\metrics\osf_metrics.html:593 +msgid "Stickiness Ratio 1 week ago" +msgstr "スティックネス比1週間前" + +#: .\admin\templates\metrics\osf_metrics.html:599 +msgid "Stickiness Ratio for the same day of the week 1 week ago." +msgstr "1週間前の同じ曜日のスティッキネス比。" + +#: .\admin\templates\metrics\osf_metrics.html:606 +msgid "Stickiness Ratio 4 weeks ago" +msgstr "スティッキネス比4週間前" + +#: .\admin\templates\metrics\osf_metrics.html:612 +msgid "Stickiness Ratio for the same day of the week 4 weeks ago." +msgstr "4週間前の同じ曜日のスティッキネス比。" + +#: .\admin\templates\metrics\osf_metrics.html:619 +msgid "Stickiness Ratio 52 weeks ago" +msgstr "スティッキネス比52週間前" + +#: .\admin\templates\metrics\osf_metrics.html:625 +msgid "Stickiness Ratio for the same day of the week 52 weeks ago." +msgstr "52週間前の同じ曜日のスティッキネス比。" + +#: .\admin\templates\metrics\osf_metrics.html:646 +msgid "Projects - Top Level" +msgstr "プロジェクト-トップレベル" + +#: .\admin\templates\metrics\osf_metrics.html:647 +msgid "Nodes - Projects & Components" +msgstr "ノード-プロジェクトとコンポーネント" + +#: .\admin\templates\metrics\osf_metrics.html:648 +#: .\admin\templates\metrics\osf_metrics.html:791 +msgid "Registered Projects" +msgstr "登録済みプロジェクト" + +#: .\admin\templates\metrics\osf_metrics.html:649 +#: .\admin\templates\metrics\osf_metrics.html:858 +msgid "Registered Nodes" +msgstr "登録済みノード" + +#: .\admin\templates\metrics\osf_metrics.html:657 +#: .\admin\templates\metrics\osf_statistics.html:24 +#: .\admin\templates\users\user_details.html:29 +msgid "Projects" +msgstr "プロジェクト" + +#: .\admin\templates\metrics\osf_metrics.html:664 +msgid "Total Projects" +msgstr "総プロジェクト" + +#: .\admin\templates\metrics\osf_metrics.html:670 +msgid "The total number of all top level projects on the GakuNin RDM" +msgstr "GakuNin RDMのすべてのトップレベルプロジェクトの総数" + +#: .\admin\templates\metrics\osf_metrics.html:687 +msgid "The total number of public top level projects" +msgstr "パブリックトップレベルプロジェクトの総数" + +#: .\admin\templates\metrics\osf_metrics.html:696 +msgid "Private Projects" +msgstr "プライベートプロジェクト" + +#: .\admin\templates\metrics\osf_metrics.html:702 +msgid "The total number of private top level projects" +msgstr "プライベートトップレベルプロジェクトの総数" + +#: .\admin\templates\metrics\osf_metrics.html:711 +msgid "Public vs Private Projects" +msgstr "パブリックプロジェクトとプライベートプロジェクト" + +#: .\admin\templates\metrics\osf_metrics.html:724 +#: .\admin\templates\users\user.html:285 +msgid "Nodes" +msgstr "ノード" + +#: .\admin\templates\metrics\osf_metrics.html:731 +msgid "Total Nodes - Projects and Components" +msgstr "合計ノード-プロジェクトとコンポーネント" + +#: .\admin\templates\metrics\osf_metrics.html:737 +msgid "The total number of all projects and components on the GakuNin RDM." +msgstr "GakuNin RDMのすべてのプロジェクトとコンポーネントの総数。" + +#: .\admin\templates\metrics\osf_metrics.html:748 +msgid "Public Nodes" +msgstr "パブリックノード" + +#: .\admin\templates\metrics\osf_metrics.html:754 +msgid "The total number of public nodes - including projects and components" +msgstr "パブリックノードの総数-プロジェクトとコンポーネントを含む" + +#: .\admin\templates\metrics\osf_metrics.html:763 +msgid "Private Nodes" +msgstr "プライベートノード" + +#: .\admin\templates\metrics\osf_metrics.html:769 +msgid "The total number of private nodes - including projects and components" +msgstr "プロジェクトとコンポーネントを含むプライベートノードの総数" + +#: .\admin\templates\metrics\osf_metrics.html:778 +msgid "Public vs Private Nodes - Components & Projects" +msgstr "パブリックノードとプライベートノード-コンポーネントとプロジェクト" + +#: .\admin\templates\metrics\osf_metrics.html:784 +msgid "" +"The percentages of public vs private combined projects and components on " +"the GakuNin RDM." +msgstr "GakuNin RDMのパブリックプロジェクトとプライベートプロジェクトを組み合わせた割合。" + +#: .\admin\templates\metrics\osf_metrics.html:798 +msgid "Total Registered Projects" +msgstr "登録プロジェクト総数" + +#: .\admin\templates\metrics\osf_metrics.html:804 +msgid "The total number of all registered top level projects on the GakuNin RDM." +msgstr "GakuNin RDMに登録されているすべてのトップレベルプロジェクトの総数。" + +#: .\admin\templates\metrics\osf_metrics.html:815 +msgid "Public Registered Projects" +msgstr "公開登録プロジェクト" + +#: .\admin\templates\metrics\osf_metrics.html:821 +msgid "The total number of public registered top level projects" +msgstr "公的な登録トップレベルプロジェクトの総数" + +#: .\admin\templates\metrics\osf_metrics.html:830 +msgid "Embargoed Registered Projects" +msgstr "禁止登録プロジェクト" + +#: .\admin\templates\metrics\osf_metrics.html:836 +msgid "The number of private registered top level projects" +msgstr "プライベート登録されたトップレベルプロジェクトの数" + +#: .\admin\templates\metrics\osf_metrics.html:845 +msgid "Public vs Embargoed Registered Top-Level Projects" +msgstr "パブリックvs禁輸登録トップレベルプロジェクト" + +#: .\admin\templates\metrics\osf_metrics.html:851 +#: .\admin\templates\metrics\osf_metrics.html:918 +msgid "" +"The percentages of public vs embargoed top-level project registrations on" +" the GakuNin RDM." +msgstr "GakuNin RDMでのトップレベルのプロジェクト登録に対する一般公開と禁輸の割合。" + +#: .\admin\templates\metrics\osf_metrics.html:865 +msgid "Total Registered Nodes - Projects & Components" +msgstr "登録済みノードの総数-プロジェクトとコンポーネント" + +#: .\admin\templates\metrics\osf_metrics.html:871 +#: .\admin\templates\metrics\osf_metrics.html:938 +msgid "" +"The total number of all registered nodes - projects & components on the " +"GakuNin RDM." +msgstr "登録済みのすべてのノードの総数-GakuNin RDMのプロジェクトとコンポーネント。" + +#: .\admin\templates\metrics\osf_metrics.html:882 +msgid "Public Registered Nodes" +msgstr "パブリック登録ノード" + +#: .\admin\templates\metrics\osf_metrics.html:888 +msgid "The total number of public registered nodes - projects & components" +msgstr "パブリック登録済みノードの総数-プロジェクトとコンポーネント" + +#: .\admin\templates\metrics\osf_metrics.html:897 +msgid "Embargoed Registered Nodes" +msgstr "禁止登録ノード" + +#: .\admin\templates\metrics\osf_metrics.html:903 +msgid "The number of embargoed registered projects and components" +msgstr "禁止登録されたプロジェクトとコンポーネントの数" + +#: .\admin\templates\metrics\osf_metrics.html:912 +msgid "Public vs Embargoed Registered Nodes" +msgstr "パブリック登録ノードと禁輸登録ノード" + +#: .\admin\templates\metrics\osf_metrics.html:932 +msgid "Previous 7 days of addon by name" +msgstr "アドオンの過去7日間の名前" + +#: .\admin\templates\metrics\osf_metrics.html:951 +msgid "Previous 30 days of preprints by provider" +msgstr "プロバイダーによる過去30日間のプレプリント" + +#: .\admin\templates\metrics\osf_metrics.html:958 +msgid "The total number of preprints grouped by preprint provider." +msgstr "プレプリントプロバイダーごとにグループ化された事前印刷の総数。" + +#: .\admin\templates\metrics\osf_metrics.html:961 +#: .\admin\templates\metrics\osf_metrics.html:993 +msgid "Start date range:" +msgstr "開始日範囲:" + +#: .\admin\templates\metrics\osf_metrics.html:965 +#: .\admin\templates\metrics\osf_metrics.html:997 +msgid "End date range:" +msgstr "終了日範囲:" + +#: .\admin\templates\metrics\osf_metrics.html:969 +#: .\admin\templates\metrics\osf_metrics.html:1001 +msgid "Enter new date range" +msgstr "新しい期間を入力してください" + +#: .\admin\templates\metrics\osf_metrics.html:983 +msgid "Daily download counts" +msgstr "毎日のダウンロード数" + +#: .\admin\templates\metrics\osf_metrics.html:990 +msgid "The total number of downloads by non-contribs" +msgstr "非競合によるダウンロードの総数" + +#: .\admin\templates\metrics\osf_metrics.html:1017 +msgid "The total number of files downloaded from the GakuNIn RDM" +msgstr "GakuNIn RDMからダウンロードされたファイルの総数" + +#: .\admin\templates\metrics\osf_metrics.html:1024 +msgid "Unique Downloads" +msgstr "ユニークなダウンロード" + +#: .\admin\templates\metrics\osf_metrics.html:1030 +msgid "The number of unique downloads of files on the GakuNin RDM." +msgstr "GakuNin RDM上のファイルの一意のダウンロードの数。" + +#: .\admin\templates\metrics\osf_statistics.html:22 +#: .\admin\templates\nodes\node_logs.html:13 +#: .\admin\templates\spam\spam_list.html:44 .\admin\templates\spam\user.html:46 +#: .\admin\templates\users\spam.html:40 +msgid "Date" +msgstr "日付" + +#: .\admin\templates\metrics\osf_statistics.html:23 +msgid "Users" +msgstr "ユーザ" + +#: .\admin\templates\metrics\osf_statistics.html:25 +msgid "Public projects" +msgstr "公開プロジェクト" + +#: .\admin\templates\metrics\osf_statistics.html:26 +msgid "Registered projects" +msgstr "登録されたプロジェクト" + +#: .\admin\templates\nodes\confirm_ham.html:5 +#, python-format +msgid "Are you sure this %(resource_type)s is " +msgstr "この%(resource_type)sは" + +#: .\admin\templates\nodes\confirm_ham.html:5 +msgid "not" +msgstr "スパムでは" + +#: .\admin\templates\nodes\confirm_ham.html:5 +#, python-format +msgid " spam? %(guid)s" +msgstr "ありませんか?:%(guid)s" + +#: .\admin\templates\nodes\confirm_ham.html:11 +#: .\admin\templates\nodes\confirm_spam.html:11 +#: .\admin\templates\nodes\node.html:397 +#: .\admin\templates\nodes\node_list.html:110 +#: .\admin\templates\nodes\reindex_node_elastic.html:11 +#: .\admin\templates\nodes\reindex_node_share.html:11 +#: .\admin\templates\nodes\remove_contributor.html:18 +#: .\admin\templates\nodes\remove_node.html:15 +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:55 +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:62 +#: .\admin\templates\rdm_addons\addons\s3_credentials_modal.html:29 +#: .\admin\templates\rdm_announcement\send.html:35 +#: .\admin\templates\rdm_announcement\settings.html:95 +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:62 +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:57 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:83 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:53 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:57 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:88 +#: .\admin\templates\rdm_custom_storage_location\providers\osfstorage_modal.html:21 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:53 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:36 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:40 +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:57 +#: .\admin\templates\rdm_timestampadd\node_list.html:124 +#: .\admin\templates\rdm_timestampadd\timestampadd.html:57 +#: .\admin\templates\users\GDPR_delete_user.html:15 +#: .\admin\templates\users\add_system_tag.html:15 +#: .\admin\templates\users\get_link.html:21 +#: .\admin\templates\users\merge_accounts_modal.html:14 +#: .\admin\templates\users\notes.html:18 +#: .\admin\templates\users\reindex_user_elastic.html:11 +#: .\admin\templates\users\remove_2_factor.html:15 +#: .\admin\templates\users\remove_spam_user.html:15 +#: .\admin\templates\users\remove_user.html:15 +#: .\admin\templates\users\reset.html:16 +#: .\admin\templates\users\restore_ham_user.html:15 +#: .\admin\templates\users\user_list.html:73 +msgid "Cancel" +msgstr "キャンセル" + +#: .\admin\templates\nodes\confirm_spam.html:5 +#, python-format +msgid "Are you sure this %(resource_type)s is spam? %(guid)s" +msgstr "この%(resource_type)sはスパムですか?" + +#: .\admin\templates\nodes\flagged_spam_list.html:5 +msgid "Flagged Spam Nodes" +msgstr "フラグ付きスパムノード" + +#: .\admin\templates\nodes\known_spam_list.html:5 +msgid "Known Spam Nodes" +msgstr "既知のスパムノード" + +#: .\admin\templates\nodes\node.html:11 .\admin\templates\nodes\node.html:299 +#: .\admin\templates\nodes\node.html:305 .\admin\templates\users\user.html:293 +msgid "Registration" +msgstr "登録" + +#: .\admin\templates\nodes\node.html:13 +msgid "Node" +msgstr "ノード" + +#: .\admin\templates\nodes\node.html:27 +msgid "View Logs" +msgstr "ログを表示" + +#: .\admin\templates\nodes\node.html:34 .\admin\templates\users\user.html:327 +msgid "Delete Node" +msgstr "ノードを削除" + +#: .\admin\templates\nodes\node.html:47 .\admin\templates\nodes\node.html:273 +#: .\admin\templates\users\user.html:321 +msgid "Restore Node" +msgstr "ノードを復元" + +#: .\admin\templates\nodes\node.html:55 +msgid "Restart Registration" +msgstr "登録を再開" + +#: .\admin\templates\nodes\node.html:60 +msgid "Remove Registration" +msgstr "登録を削除" + +#: .\admin\templates\nodes\node.html:70 +#: .\admin\templates\nodes\node_list.html:98 +#: .\admin\templates\rdm_timestampadd\node_list.html:112 +#: .\admin\templates\users\user_list.html:61 +msgid "Confirm Spam" +msgstr "スパムを確認" + +#: .\admin\templates\nodes\node.html:81 +msgid "Confirm Not Spam" +msgstr "スパムではないことを確認" + +#: .\admin\templates\nodes\node.html:93 +msgid "SHARE Reindex" +msgstr "Reindexを共有" + +#: .\admin\templates\nodes\node.html:116 .\admin\templates\users\user.html:81 +msgid "Elastic Reindex" +msgstr "Elastic Reindex" + +#: .\admin\templates\nodes\node.html:129 +msgid "Registration Details" +msgstr "登録の詳細" + +#: .\admin\templates\nodes\node.html:131 +msgid "Node Details" +msgstr "ノードの詳細" + +#: .\admin\templates\nodes\node.html:145 +#: .\admin\templates\rdm_keymanagement\user_list.html:9 +#: .\admin\templates\rdm_timestampadd\node_list.html:39 +#: .\admin\templates\rdm_timestampsettings\node_list.html:35 +#: .\admin\templates\users\user.html:290 +#: .\admin\templates\users\user_details.html:34 +#: .\admin\templates\users\user_list.html:22 +msgid "GUID" +msgstr "GUID" + +#: .\admin\templates\nodes\node.html:149 .\admin\templates\nodes\node.html:247 +#: .\admin\templates\nodes\node_list.html:26 +#: .\admin\templates\rdm_timestampadd\node_list.html:41 +#: .\admin\templates\rdm_timestampsettings\node_list.html:38 +msgid "Title" +msgstr "タイトル" + +#: .\admin\templates\nodes\node.html:153 .\admin\templates\nodes\node.html:248 +#: .\admin\templates\nodes\node_list.html:32 +#: .\admin\templates\rdm_timestampadd\node_list.html:46 +#: .\admin\templates\users\user.html:292 +msgid "Public" +msgstr "公開" + +#: .\admin\templates\nodes\node.html:157 +#: .\admin\templates\nodes\node_list.html:29 +#: .\admin\templates\rdm_timestampadd\node_list.html:43 +#: .\admin\templates\rdm_timestampsettings\node_list.html:41 +msgid "Parent" +msgstr "親" + +#: .\admin\templates\nodes\node.html:170 +msgid "Creator" +msgstr "作成者" + +#: .\admin\templates\nodes\node.html:181 +msgid "OSF Groups" +msgstr "OSFグループ" + +#: .\admin\templates\nodes\node.html:194 +#: .\admin\templates\nodes\node_list.html:35 +#: .\admin\templates\rdm_timestampadd\node_list.html:49 +msgid "Contributors" +msgstr "メンバー" + +#: .\admin\templates\nodes\node.html:199 +msgid "User id" +msgstr "ユーザID" + +#: .\admin\templates\nodes\node.html:201 +msgid "Permissions" +msgstr "権限" + +#: .\admin\templates\nodes\node.html:202 .\admin\templates\nodes\node.html:250 +#: .\admin\templates\users\user.html:296 +msgid "Actions" +msgstr "アクション" + +#: .\admin\templates\nodes\node.html:222 +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:14 +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:28 +msgid "Remove" +msgstr "削除" + +#: .\admin\templates\nodes\node.html:246 +msgid "Node id" +msgstr "ノードID" + +#: .\admin\templates\nodes\node.html:249 +msgid "# of Contributors" +msgstr "メンバー数" + +#: .\admin\templates\nodes\node.html:306 .\admin\templates\nodes\node.html:334 +msgid "Date Created" +msgstr "作成日" + +#: .\admin\templates\nodes\node.html:307 .\admin\templates\nodes\node.html:342 +msgid "Pending" +msgstr "保留" + +#: .\admin\templates\nodes\node.html:308 .\admin\templates\nodes\node.html:346 +#: .\admin\templates\nodes\node_list.html:33 +#: .\admin\templates\rdm_timestampadd\node_list.html:47 +msgid "Withdrawn" +msgstr "削除" + +#: .\admin\templates\nodes\node.html:309 .\admin\templates\nodes\node.html:350 +#: .\admin\templates\nodes\node_list.html:34 +#: .\admin\templates\rdm_timestampadd\node_list.html:48 +msgid "Embargo" +msgstr "禁止" + +#: .\admin\templates\nodes\node.html:338 +msgid "Datetime Registered" +msgstr "登録日時" + +#: .\admin\templates\nodes\node.html:378 +msgid "Registered From" +msgstr "登録者" + +#: .\admin\templates\nodes\node.html:389 +msgid "Are you sure you want to update this embargo?" +msgstr "この禁止を更新してもよろしいですか?" + +#: .\admin\templates\nodes\node.html:392 +msgid "Make sure you have confirmed this change with all the project admins." +msgstr "この変更をすべてのプロジェクト管理者に確認したことを確認してください。" + +#: .\admin\templates\nodes\node.html:406 +msgid "SPAM Pro Tip" +msgstr "スパムプロによるヒント" + +#: .\admin\templates\nodes\node.html:411 .\admin\templates\users\user.html:277 +#: .\admin\templates\users\user.html:295 +msgid "SPAM Status" +msgstr "スパムステータス" + +#: .\admin\templates\nodes\node.html:415 +msgid "SPAM Data" +msgstr "スパムデータ" + +#: .\admin\templates\nodes\node_list.html:30 +#: .\admin\templates\rdm_timestampadd\node_list.html:44 +#: .\admin\templates\rdm_timestampsettings\node_list.html:42 +msgid "Root" +msgstr "ルート" + +#: .\admin\templates\nodes\node_list.html:31 +#: .\admin\templates\rdm_timestampadd\node_list.html:45 +msgid "Date created" +msgstr "作成日" + +#: .\admin\templates\nodes\node_list.html:105 +#: .\admin\templates\rdm_timestampadd\node_list.html:119 +msgid "Are you sure the selected node(s) are spam?" +msgstr "選択したノードはスパムですか?" + +#: .\admin\templates\nodes\node_logs.html:6 +msgid "Node Logs" +msgstr "ノードログ" + +#: .\admin\templates\nodes\node_logs.html:16 +msgid "Action" +msgstr "アクション" + +#: .\admin\templates\nodes\node_logs.html:19 +#: .\admin\templates\rdm_timestampadd\timestampadd.html:39 +#: .\admin\templates\users\user.html:11 +msgid "User" +msgstr "ユーザ" + +#: .\admin\templates\nodes\node_logs.html:22 +msgid "Parameters" +msgstr "パラメータ" + +#: .\admin\templates\nodes\reindex_node_elastic.html:5 +#, python-format +msgid "Are you sure you want to reindex this %(resource_type)s (Elastic)?" +msgstr "この%(resource_type)s(Elastic)のインデックスを再作成しますか?" + +#: .\admin\templates\nodes\reindex_node_share.html:5 +#, python-format +msgid "Are you sure you want to reindex this %(resource_type)s (SHARE)?" +msgstr "この%(resource_type)s(SHARE)のインデックスを再作成しますか?" + +#: .\admin\templates\nodes\remove_contributor.html:6 +#, python-format +msgid "Removing contributor: %(userName)s" +msgstr "メンバーを削除する:%(userName)s" + +#: .\admin\templates\nodes\remove_contributor.html:9 +#, python-format +msgid "" +"User will be removed. Currently only\n" +" an admin on the %(resource_type)s will be able to\n" +" add them back." +msgstr "ユーザーは削除されます。 現在、%(resource_type)sの管理者のみがそれらを追加して戻すことができます。" + +#: .\admin\templates\nodes\remove_node.html:5 +#, python-format +msgid "Are you sure you want to delete this %(resource_type)s? %(guid)s" +msgstr "この%(resource_type)sを削除してもよろしいですか?;%(guid)s" + +#: .\admin\templates\nodes\remove_node.html:8 +#: .\admin\templates\users\remove_user.html:8 +msgid "This action will be reversible after the fact." +msgstr "このアクションは、事後にリバーシブルになります。" + +#: .\admin\templates\nodes\search.html:6 +msgid "Node Search" +msgstr "ノード検索" + +#: .\admin\templates\nodes\search.html:17 +msgid "Node GUID:" +msgstr "ノード GUID:" + +#: .\admin\templates\nodes\search.html:20 +#: .\admin\templates\users\search.html:21 +msgid "Submit@search" +msgstr "検索" + +#: .\admin\templates\nodes\spam_status.html:3 +#: .\admin\templates\rdm_timestampadd\timestampadd.html:206 +#: .\admin\templates\spam\detail.html:86 +msgid "Unknown" +msgstr "不明" + +#: .\admin\templates\nodes\spam_status.html:5 +#: .\admin\templates\spam\detail.html:88 +#: .\admin\templates\spam\spam_list.html:15 +#: .\admin\templates\spam\spam_list.html:18 .\admin\templates\spam\user.html:19 +#: .\admin\templates\spam\user.html:22 .\admin\templates\users\spam.html:13 +#: .\admin\templates\users\spam.html:16 +msgid "Flagged" +msgstr "フラグ付き" + +#: .\admin\templates\nodes\spam_status.html:7 +#: .\admin\templates\spam\detail.html:90 +#: .\admin\templates\spam\spam_list.html:22 +#: .\admin\templates\spam\spam_list.html:25 .\admin\templates\spam\user.html:25 +#: .\admin\templates\spam\user.html:28 .\admin\templates\users\spam.html:19 +#: .\admin\templates\users\spam.html:22 +msgid "Spam" +msgstr "スパム" + +#: .\admin\templates\nodes\spam_status.html:9 +#: .\admin\templates\spam\detail.html:92 +#: .\admin\templates\spam\spam_list.html:29 +#: .\admin\templates\spam\spam_list.html:32 .\admin\templates\spam\user.html:31 +#: .\admin\templates\spam\user.html:34 .\admin\templates\users\spam.html:25 +#: .\admin\templates\users\spam.html:28 +msgid "Ham" +msgstr "ハム" + +#: .\admin\templates\osf\providerassetfile_confirm_delete.html:4 +msgid "GakuNin RDM Admin | Delete Asset" +msgstr "GakuNin RDM管理者| アセットを削除" + +#: .\admin\templates\osf\providerassetfile_confirm_delete.html:10 +msgid "Confirm Delete Asset" +msgstr "アセットの削除を確認" + +#: .\admin\templates\osf\providerassetfile_confirm_delete.html:13 +msgid "Are you sure you want to delete " +msgstr "削除してもよろしいですか?*:" + +#: .\admin\templates\osf\providerassetfile_confirm_delete.html:13 +msgid "?" +msgstr " " + +#: .\admin\templates\osf\providerassetfile_create.html:6 +#: .\admin\templates\osf\providerassetfile_form.html:6 +msgid "Provider Asset File" +msgstr "プロバイダーアセットファイル" + +#: .\admin\templates\osf\providerassetfile_form.html:12 +msgid "Delete asset" +msgstr "アセットを削除" + +#: .\admin\templates\osf\providerassetfile_form.html:22 +msgid "Uploading a new file will overwrite this asset." +msgstr "新しいファイルをアップロードすると、このアセットが上書きされます。" + +#: .\admin\templates\osf\providerassetfile_list.html:11 +#: .\admin\templates\osf\providerassetfile_list.html:15 +msgid "List of Provider Asset Files" +msgstr "プロバイダーアセットファイルのリスト" + +#: .\admin\templates\osf\providerassetfile_list.html:29 +msgid "File Link" +msgstr "ファイルリンク" + +#: .\admin\templates\osf\providerassetfile_list.html:30 +msgid "Providers" +msgstr "プロバイダ" + +#: .\admin\templates\osf\providerassetfile_list.html:37 +#: .\admin\templates\rdm_announcement\index.html:49 +msgid "Preview" +msgstr "プレビュー" + +#: .\admin\templates\osf\subject_form.html:5 +msgid "Subject:" +msgstr "分野:" + +#: .\admin\templates\osf\subject_form.html:9 +#: .\admin\templates\osf\subject_list.html:17 +#: .\admin\templates\rdm_timestampadd\timestampadd.html:128 +msgid "Provider" +msgstr "プロバイダ" + +#: .\admin\templates\osf\subject_form.html:10 +#: .\admin\templates\osf\subject_list.html:19 +msgid "Highlighted" +msgstr "ハイライト" + +#: .\admin\templates\osf\subject_form.html:11 +msgid "Hierarchy" +msgstr "階層" + +#: .\admin\templates\osf\subject_list.html:16 +msgid "Text " +msgstr "テキスト" + +#: .\admin\templates\osf\subject_list.html:20 +#: .\admin\templates\osf\subject_list.html:29 +#: .\admin\templates\rdm_announcement\index.html:75 +msgid "Edit" +msgstr "編集" + +#: .\admin\templates\rdm_addons\addon_list.html:25 +msgid "Configure Add-on Accounts" +msgstr "ユーザが利用可能なアドオンを設定する" + +#: .\admin\templates\rdm_addons\addon_list.html:51 +#: .\admin\templates\rdm_timestampsettings\list.html:51 +msgid "Force to use" +msgstr "強制的に使用する" + +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:6 +msgid "Connect a Dataverse Account" +msgstr "Dataverseアカウントに接続" + +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:14 +msgid "Dataverse Repository" +msgstr "Dataverseレポジトリ" + +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:30 +msgid "Only Dataverse repositories v4.0 or higher are supported." +msgstr "Dataverseリポジトリv4.0以降のみがサポートされています。" + +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:38 +msgid "API Token" +msgstr "APIトークン" + +#: .\admin\templates\rdm_addons\addons\dataverse_credentials_modal.html:42 +msgid "(Get from Dataverse )" +msgstr "Dataverse )から取得" + +#: .\admin\templates\rdm_addons\addons\dataverse_institution_settings.html:15 +#: .\admin\templates\rdm_addons\addons\institution_settings_default.html:12 +#: .\admin\templates\rdm_addons\addons\owncloud_institution_settings.html:15 +#: .\admin\templates\rdm_addons\addons\s3_institution_settings.html:15 +msgid "Connect or Reauthorize Account" +msgstr "アカウントの接続または再認証" + +#: .\admin\templates\rdm_addons\addons\dataverse_institution_settings.html:23 +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:23 +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:64 +#: .\admin\templates\rdm_addons\addons\institution_settings_default.html:19 +#: .\admin\templates\rdm_addons\addons\owncloud_institution_settings.html:23 +#: .\admin\templates\rdm_addons\addons\s3_institution_settings.html:23 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:37 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:66 +msgid "Disconnect Account" +msgstr "アカウントを切断" + +#: .\admin\templates\rdm_addons\addons\dataverse_institution_settings.html:28 +msgid "Authorized on " +msgstr "認証済み:" + +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:5 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:24 +msgid "Team member file access" +msgstr "チームメンバーファイルアクセス" + +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:12 +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:54 +msgid "Connect Account" +msgstr "アカウントに接続する" + +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:15 +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:57 +msgid "Reauthorize Account" +msgstr "アカウント再認証" + +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:29 +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:70 +msgid "Authorized by" +msgstr "承認者: " + +#: .\admin\templates\rdm_addons\addons\dropboxbusiness_institution_settings.html:47 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:53 +msgid "Team member management" +msgstr "チームメンバー管理" + +#: .\admin\templates\rdm_addons\addons\institution_settings_default.html:25 +#: .\admin\templates\rdm_addons\addons\owncloud_institution_settings.html:28 +#: .\admin\templates\rdm_addons\addons\s3_institution_settings.html:29 +msgid "Authorized by " +msgstr "承認者: " + +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:12 +msgid "Management project" +msgstr "管理用プロジェクト" + +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:18 +msgid "Management project URL" +msgstr "管理用プロジェクトURL" + +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:26 +msgid "Organizational project" +msgstr "組織用プロジェクト" + +#: .\admin\templates\rdm_addons\addons\iqbrims_institution_settings.html:32 +msgid "Organizational project URL" +msgstr "組織用プロジェクトURL" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:6 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:7 +msgid "Connect an ownCloud Account" +msgstr "ownCloudに接続" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:14 +msgid "ownCloud Instance" +msgstr "ownCloudインスタンス" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:26 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:15 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:15 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:13 +msgid "Host URL" +msgstr "ホストURL" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:32 +msgid "" +"Only ownCloud instances supporting WebDAV and \n" +" OCS v1.7 are supported." +msgstr "" +"WebDAVおよび and \n" +"OCS v1.7をサポートするownCloudインスタンスのみがサポートされます。" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:46 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:39 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:40 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:36 +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:42 +msgid "Password" +msgstr "パスワード" + +#: .\admin\templates\rdm_addons\addons\owncloud_credentials_modal.html:51 +msgid "" +" These credentials will be encrypted. However, we strongly " +"encourage using a Device (or App) Password." +msgstr "" +"これらの資格情報は暗号化されます。 ただし、デバイス(またはアプリ)パスワードの使用を強くお勧めします。" + +#: .\admin\templates\rdm_addons\addons\s3_credentials_modal.html:6 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:9 +msgid "Connect an Amazon S3 Account" +msgstr "Amazon S3アカウントに接続" + +#: .\admin\templates\rdm_addons\addons\s3_credentials_modal.html:14 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:17 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:21 +msgid "Access Key" +msgstr "アクセスキー" + +#: .\admin\templates\rdm_addons\addons\s3_credentials_modal.html:18 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:21 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:25 +msgid "Secret Key" +msgstr "シークレットキー" + +#: .\admin\templates\rdm_addons\institution_list.html:27 +#: .\admin\templates\rdm_statistics\institution_list.html:27 +msgid "Institution List" +msgstr "機関リスト" + +#: .\admin\templates\rdm_addons\oauth_complete.html:17 +msgid "OAuth Complete" +msgstr "OAuthの完了" + +#: .\admin\templates\rdm_addons\oauth_complete.html:53 +msgid "Successfully connected to %(addon_name|title)s Account." +msgstr "%(addon_name|title)sアカウントに正常に接続しました。" + +#: .\admin\templates\rdm_addons\oauth_complete.html:55 +msgid "Please close this tab." +msgstr "このタブを閉じてください" + +#: .\admin\templates\rdm_announcement\index.html:19 +msgid "Announcement" +msgstr "アナウンス" + +#: .\admin\templates\rdm_announcement\index.html:64 +#: .\admin\templates\rdm_announcement\settings.html:7 +#: .\admin\templates\rdm_announcement\settings.html:12 +#: .\admin\templates\rdm_announcement\settings.html:14 +#: .\admin\templates\rdm_statistics\settings.html:6 +#: .\admin\templates\rdm_statistics\settings.html:9 +msgid "Options" +msgstr "オプション" + +#: .\admin\templates\rdm_announcement\send.html:19 +msgid " Preview" +msgstr "プレビュー" + +#: .\admin\templates\rdm_announcement\send.html:34 +msgid "Send" +msgstr "送信" + +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:20 +msgid "Institutional Storage " +msgstr "機関ストレージ" + +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:27 +msgid "Name:" +msgstr "名前:" + +#: .\admin\templates\rdm_custom_storage_location\institutional_storage.html:35 +msgid "Configure Institutional Storage Accounts" +msgstr "組織の機関ストレージを設定する" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:8 +msgid "Connect a Box Account" +msgstr "Boxアカウントに接続" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:14 +msgid "Please click \"Get OAuth Permission\" button to connect Box." +msgstr "[OAuthのアクセス許可を取得]ボタンをクリックして、Boxに接続してください。" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:16 +msgid "Then you will be redirected to Box authentication page." +msgstr "その後、Box認証ページにリダイレクトされます。" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:28 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:31 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:60 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:27 +msgid "Get OAuth permission" +msgstr "OAuthアクセス許可を取得する" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:32 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:43 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:72 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:31 +msgid "Authorized by:" +msgstr "承認者:" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:40 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:37 +msgid "Current token:" +msgstr "現在のトークン:" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:46 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:42 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:28 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:31 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:26 +msgid "Folder" +msgstr "フォルダ" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:48 +msgid "Folder ID (Ex: 0 for root)" +msgstr "フォルダID(例:ルートの場合は0)" + +#: .\admin\templates\rdm_custom_storage_location\providers\box_modal.html:58 +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:84 +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:54 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:58 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:89 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:54 +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:37 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:41 +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:58 +msgid "Connect" +msgstr "接続" + +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:8 +msgid "Connect a Dropbox Business Account" +msgstr "Dropbox Businessアカウントに接続" + +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:14 +msgid "Please click \"Get OAuth Permission\" button to connect Dropbox." +msgstr "[OAuthのアクセス許可を取得]ボタンをクリックして、Dropboxに接続してください。" + +#: .\admin\templates\rdm_custom_storage_location\providers\dropboxbusiness_modal.html:16 +msgid "Then you will be redirected to Dropbox authentication page." +msgstr "その後、Dropbox認証ページにリダイレクトされます。" + +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:8 +msgid "Connect a Google Drive Account" +msgstr "Google Driveアカウントに接続" + +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:14 +msgid "Please click \"Get OAuth Permission\" button to connectGoogle Drive." +msgstr "[OAuthのアクセス許可を取得]ボタンをクリックして、Googleドライブに接続してください。" + +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:16 +msgid "Then you will be redirected to Google authentication page." +msgstr "その後、Google認証ページにリダイレクトされます。" + +#: .\admin\templates\rdm_custom_storage_location\providers\googledrive_modal.html:44 +msgid "Folder ID (Ex: root)" +msgstr "フォルダID(例:root)" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:8 +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:8 +msgid "Connect a Nextcloud Account" +msgstr "Nextcloudアカウントに接続" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:21 +#, python-format +msgid "" +"\n" +" Only Nextcloud instances " +"supporting WebDAV and OCS v1.7 are" +" supported.\n" +" " +msgstr "" +"WebDAVおよびOCS " +"v1.7をサポートするNextcloudインスタンスのみがサポートされます。" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:36 +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:33 +msgid "username" +msgstr "ユーザ名" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloud_modal.html:44 +#, python-format +msgid "" +"\n" +" These credentials will be encrypted. " +"However, we strongly encourage using a Device (or App) Password.\n" +" " +msgstr "" +"これらの資格情報は暗号化されます。ただし、デバイス(またはアプリ)パスワードの使用を強くお勧めします。" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:21 +msgid "" +"Only Nextcloud instances supporting WebDAV " +"and \n" +" OCS v1.7 are supported." +msgstr "" +"WebDAVおよびOCS " +"v1.7をサポートするNextcloudインスタンスのみがサポートされます。" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:45 +msgid "" +" These credentials will be encrypted. However, we strongly\n" +" encourage using a Device (or " +"App) Password." +msgstr "" +"これらの資格情報は暗号化されます。 ただし、 Device (or App) " +"Passwordの使用を強く推奨します。" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:55 +msgid "Download User Mapping file" +msgstr "ユーザ対応表ファイルをダウンロード" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:56 +#: .\admin\templates\rdm_timestampadd\timestampadd.html:228 +msgid "Download" +msgstr "ダウンロード" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:60 +msgid "Upload User Mapping file" +msgstr "ユーザ対応表ファイルをアップロード" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:61 +msgid "Check existence of external users" +msgstr "外部ユーザの存在を確認する" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:61 +msgid "Only Nextcloud Admin can check" +msgstr "Nextcloud管理者だけが確認可能です。" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:64 +msgid "Browse" +msgstr "ファイルを選択" + +#: .\admin\templates\rdm_custom_storage_location\providers\nextcloudinstitutions_modal.html:70 +msgid "Example of User Mapping file" +msgstr "ユーザ対応表ファイルの例" + +#: .\admin\templates\rdm_custom_storage_location\providers\osfstorage_modal.html:8 +msgid "Connect NII Storage" +msgstr "NIIストレージに接続" + +#: .\admin\templates\rdm_custom_storage_location\providers\osfstorage_modal.html:14 +msgid "NII Storage is selected as Institutional Storage." +msgstr "NII ストレージが機関ストレージとして選択されています。" + +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:19 +#, python-format +msgid "" +"\n" +" Only ownCloud instances supporting WebDAV and OCS v1.7 are supported.\n" +" " +msgstr "" +"WebDAVおよびOCS " +"v1.7をサポートするownCloudインスタンスのみがサポートされます。" + +#: .\admin\templates\rdm_custom_storage_location\providers\owncloud_modal.html:40 +#, python-format +msgid "" +"\n" +" These credentials will be encrypted. " +"However, we strongly encourage using a Device (or App) Password.\n" +" " +msgstr "" +"これらの資格情報は暗号化されます。ただし、デバイス(またはアプリ)パスワードの使用を強くお勧めします。" + +#: .\admin\templates\rdm_custom_storage_location\providers\s3_modal.html:25 +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:29 +msgid "Bucket" +msgstr "バケット" + +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:9 +msgid "Connect a S3 Compatible Storage Account" +msgstr "S3互換ストレージアカウントに接続" + +#: .\admin\templates\rdm_custom_storage_location\providers\s3compat_modal.html:17 +msgid "Endpoint URL" +msgstr "エンドポイントURL" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:8 +msgid "Connect an OpenStack Swift Account" +msgstr "OpenStack Swiftアカウントを接続する" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:15 +msgid "Authentication(Keystone) Version" +msgstr "認証(Keystone)バージョン" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:22 +msgid "Authentication URL" +msgstr "認証URL" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:26 +msgid "Tenant name" +msgstr "テナント名" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:30 +msgid "Project Domain name" +msgstr "プロジェクトドメイン名" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:38 +msgid "User Domain name" +msgstr "ユーザドメイン名" + +#: .\admin\templates\rdm_custom_storage_location\providers\swift_modal.html:46 +msgid "Container" +msgstr "コンテナ" + +#: .\admin\templates\rdm_keymanagement\delete_user_list.html:5 +#: .\admin\templates\users\list.html:5 +msgid "User Search Results" +msgstr "ユーザ検索結果" + +#: .\admin\templates\rdm_keymanagement\user_list.html:12 +#: .\admin\templates\users\user_list.html:25 +msgid "Date confirmed" +msgstr "確認日" + +#: .\admin\templates\rdm_keymanagement\user_list.html:13 +#: .\admin\templates\users\user_list.html:26 +msgid "Date disabled" +msgstr "無効な日付" + +#: .\admin\templates\rdm_statistics\crawl.html:14 +#: .\admin\templates\rdm_statistics\index.html:14 +msgid "statistics" +msgstr "統計" + +#: .\admin\templates\rdm_statistics\crawl.html:18 +#: .\admin\templates\rdm_statistics\index.html:18 +msgid "statistics info" +msgstr "統計情報" + +#: .\admin\templates\rdm_statistics\index.html:16 +msgid "institution " +msgstr "機関" + +#: .\admin\templates\rdm_statistics\mail.html:19 +msgid "Send statistic information mail" +msgstr "統計情報メールを送信する" + +#: .\admin\templates\rdm_statistics\mail.html:21 +msgid "sending result " +msgstr "送信結果" + +#: .\admin\templates\rdm_statistics\settings.html:6 +#: .\admin\templates\rdm_statistics\settings.html:9 +msgid "RDM Announcements" +msgstr "アナウンス" + +#: .\admin\templates\rdm_statistics\statistics.html:40 +msgid "Institution" +msgstr "機関" + +#: .\admin\templates\rdm_statistics\statistics.html:68 +msgid "date" +msgstr "日付" + +#: .\admin\templates\rdm_statistics\statistics.html:100 +msgid "download PDF" +msgstr "PDFダウンロード" + +#: .\admin\templates\rdm_statistics\statistics.html:101 +msgid "download CSV" +msgstr "CSVダウンロード" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:15 +msgid "TimeStampAddList" +msgstr "タイムスタンプ追加リスト" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:19 +#, python-format +msgid "TimeStamp Add (%(project_title)s)" +msgstr "証跡管理(%(project_title)s)" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:27 +msgid "Start Date" +msgstr "開始日" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:33 +msgid "End Date" +msgstr "終了日" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:46 +#: .\admin\templates\users\user.html:353 +msgid "Apply" +msgstr "適用" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:55 +msgid "Verify" +msgstr "タイムスタンプを確認する" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:56 +msgid "Request Trusted Timestamp" +msgstr "タイムスタンプを打つ" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:67 +msgid "Processing, please wait..." +msgstr "処理しています。お待ちください..." + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:92 +msgid "per page:" +msgstr "1ページあたり:" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:108 +msgid "Page of " +msgstr "ページあたり" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:137 +msgid "File Path" +msgstr "ファイルパス" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:146 +msgid "Timestamp by" +msgstr "タイムスタンプ押印者" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:155 +msgid "Updated at" +msgstr "更新日時" + +#: .\admin\templates\rdm_timestampadd\timestampadd.html:164 +msgid "Timestamp Verification" +msgstr "タイムスタンプの検証" + +#: .\admin\templates\rdm_timestampsettings\list.html:22 +#: .\admin\templates\rdm_timestampsettings\node_list.html:43 +msgid "Select Timestamp Function" +msgstr "タイムスタンプ機能を選択" + +#: .\admin\templates\spam\detail.html:7 +msgid "Comment" +msgstr "コメント" + +#: .\admin\templates\spam\detail.html:14 +msgid "Back to general list" +msgstr "一般リストに戻る" + +#: .\admin\templates\spam\detail.html:18 +msgid "Back to user's list" +msgstr "ユーザーのリストに戻る" + +#: .\admin\templates\spam\detail.html:65 +msgid "Author:" +msgstr "著者:" + +#: .\admin\templates\spam\detail.html:68 +msgid "User's RDM profile" +msgstr "ユーザーのRDMプロフィール" + +#: .\admin\templates\spam\detail.html:70 +msgid "User's profile" +msgstr "ユーザーのプロフィール" + +#: .\admin\templates\spam\detail.html:76 +msgid "Comment ID:" +msgstr "コメントID:" + +#: .\admin\templates\spam\detail.html:84 +msgid "Status: " +msgstr "ステータス:" + +#: .\admin\templates\spam\detail.html:103 +msgid "Comment content" +msgstr "コメント内容" + +#: .\admin\templates\spam\detail.html:104 +msgid "created on:" +msgstr "作成日:" + +#: .\admin\templates\spam\detail.html:120 +msgid "Type:" +msgstr "タイプ:" + +#: .\admin\templates\spam\detail.html:128 +msgid "Reporter:" +msgstr "レポーター:" + +#: .\admin\templates\spam\detail.html:136 +msgid "Reason:" +msgstr "理由:" + +#: .\admin\templates\spam\detail.html:144 +msgid "No reports!" +msgstr "レポートがありません!" + +#: .\admin\templates\spam\email.html:4 +msgid "Suggested Email message for spammer" +msgstr "スパマー向けの推奨メール" + +#: .\admin\templates\spam\email.html:7 +#, python-format +msgid "Dear %(spamAuthorFullname)s," +msgstr "%(spamAuthorFullname)s様," + +#: .\admin\templates\spam\email.html:8 +msgid "A comment you made on a GakuNin RDM (GRDM) project" +msgstr "GakuNin RDM(GRDM)プロジェクトについてのコメント" + +#: .\admin\templates\spam\email.html:10 +msgid "has been reported as" +msgstr "が次のようにレポートされました:" + +#: .\admin\templates\spam\email.html:12 +msgid "hate speech" +msgstr "ヘイトスピーチとして" + +#: .\admin\templates\spam\email.html:14 +msgid "violent or harmful behavior" +msgstr "暴力的または有害な行動" + +#: .\admin\templates\spam\email.html:16 +msgid "spam" +msgstr "スパム" + +#: .\admin\templates\spam\email.html:27 +msgid "Best," +msgstr "よろしくお願いします。" + +#: .\admin\templates\spam\email.html:28 +msgid "The GakuNin RDM Team" +msgstr "GakuNin RDMチーム" + +#: .\admin\templates\spam\spam_list.html:8 +#: .\admin\templates\spam\spam_list.html:11 .\admin\templates\users\spam.html:7 +#: .\admin\templates\users\spam.html:10 +msgid "List of Spam" +msgstr "スパムリスト" + +#: .\admin\templates\spam\spam_list.html:42 .\admin\templates\spam\user.html:44 +#: .\admin\templates\users\spam.html:38 +msgid "Author" +msgstr "著者" + +#: .\admin\templates\spam\spam_list.html:43 .\admin\templates\spam\user.html:45 +#: .\admin\templates\users\spam.html:39 +msgid "Reporter" +msgstr "レポーター" + +#: .\admin\templates\spam\spam_list.html:45 .\admin\templates\spam\user.html:47 +#: .\admin\templates\users\spam.html:41 +msgid "Content" +msgstr "内容" + +#: .\admin\templates\spam\spam_list.html:72 .\admin\templates\spam\user.html:74 +#: .\admin\templates\users\spam.html:68 +msgid "Detail" +msgstr "詳細" + +#: .\admin\templates\spam\spam_list.html:78 .\admin\templates\spam\user.html:80 +#: .\admin\templates\users\spam.html:74 +msgid "No more Spam!" +msgstr "スパムはもうありません!" + +#: .\admin\templates\spam\user.html:9 +msgid "User Spam" +msgstr "ユーザースパム" + +#: .\admin\templates\spam\user.html:12 +msgid "User's List of Spam" +msgstr "スパムのユーザーのリスト" + +#: .\admin\templates\spam\user.html:15 .\admin\templates\users\user.html:157 +msgid "User details" +msgstr "ユーザ詳細" + +#: .\admin\templates\users\GDPR_delete_user.html:5 +#, python-format +msgid "Are you sure you want to GDPR delete this user? %(guid)s" +msgstr "このユーザーをGDPR削除してもよろしいですか?%(guid)s" + +#: .\admin\templates\users\GDPR_delete_user.html:8 +msgid "This is not reversible!" +msgstr "これは元に戻せません!" + +#: .\admin\templates\users\add_system_tag.html:5 +msgid "Add a system tag to this user" +msgstr "このユーザーにシステムタグを追加する" + +#: .\admin\templates\users\flagged_spam_list.html:5 +msgid "Flagged Spam Users" +msgstr "フラグ設定されたスパムユーザー" + +#: .\admin\templates\users\get_link.html:4 +#, python-format +msgid "%(title)s for user %(username)s" +msgstr "ユーザー%(username)sの%(title)s" + +#: .\admin\templates\users\known_spam_list.html:5 +msgid "Known Spam Users" +msgstr "既知のスパムユーザー" + +#: .\admin\templates\users\merge_accounts_modal.html:4 +msgid "Merge Accounts" +msgstr "アカウントをマージする" + +#: .\admin\templates\users\merge_accounts_modal.html:7 +#, python-format +msgid "Merge this user: %(user)s (%(guid)s) with:" +msgstr "このユーザーをマージ:%(user)s (%(guid)s):" + +#: .\admin\templates\users\notes.html:5 +msgid "Notes for GakuNin RDM User" +msgstr "GakuNin RDMユーザー向けの注意事項" + +#: .\admin\templates\users\notes.html:8 +#, python-format +msgid "User: %(osf_id)s" +msgstr "ユーザ:%(osf_id)s" + +#: .\admin\templates\users\notes.html:11 +msgid "Notes for GakuNIn user:" +msgstr "GakuNInユーザーの注意事項:" + +#: .\admin\templates\users\reindex_user_elastic.html:5 +#, python-format +msgid "Are you sure you want to reindex this user (Elastic)? %(guid)s" +msgstr "このユーザー(Elastic)のインデックスを再作成してもよろしいですか?%(guid)s" + +#: .\admin\templates\users\remove_2_factor.html:5 +msgid "This will remove two factor auth." +msgstr "これにより、2要素認証が削除されます。" + +#: .\admin\templates\users\remove_2_factor.html:8 +msgid "" +"Removing this will let the user log in with only one form of " +"authentication.The only way to reverse this action is for the user to re-" +"enable the addon after logging in." +msgstr "これを削除すると、ユーザーは1つの認証形式のみでログインできるようになります。このアクションを元に戻す唯一の方法は、ユーザーがログイン後にアドオンを再度有効にすることです。" + +#: .\admin\templates\users\remove_spam_user.html:5 +#, python-format +msgid "" +"Are you sure you want to delete this user and mark all their nodes as " +"private? %(guid)s" +msgstr "このユーザーを削除して、すべてのノードをプライベートとしてマークしてもよろしいですか?%(guid)s" + +#: .\admin\templates\users\remove_spam_user.html:8 +#: .\admin\templates\users\restore_ham_user.html:8 +msgid "" +"You will be able to re-activate the user, but the admin console does not " +"currently have the ability to mark nodes as public." +msgstr "ユーザーを再度アクティブ化できますが、管理コンソールには現在、ノードをパブリックとしてマークする機能がありません。" + +#: .\admin\templates\users\remove_user.html:5 +#, python-format +msgid "Are you sure you want to delete this user? %(guid)s" +msgstr "このユーザーを削除してもよろしいですか?%(guid)s" + +#: .\admin\templates\users\reset.html:5 +msgid "Choose email to send reset link" +msgstr "リセットリンクを送信するメールを選択してください" + +#: .\admin\templates\users\reset.html:8 +#, python-format +msgid "User: %(guid)s" +msgstr "ユーザ:%(guid)s" + +#: .\admin\templates\users\restore_ham_user.html:5 +#, python-format +msgid "Are you sure you want to re-enable this user? %(guid)s" +msgstr "このユーザーを再度有効にしますか?%(guid)s" + +#: .\admin\templates\users\search.html:9 .\admin\templates\users\search.html:14 +#: .\admin\templates\users\workshop.html:6 +msgid "User Search" +msgstr "ユーザ検索" + +#: .\admin\templates\users\search.html:27 +msgid "User Workshop Follow-up" +msgstr "ユーザーワークショップのフォローアップ" + +#: .\admin\templates\users\search.html:33 +msgid "Go" +msgstr "移動" + +#: .\admin\templates\users\user.html:29 +msgid "Related spam" +msgstr "関連するスパム" + +#: .\admin\templates\users\user.html:33 +msgid "Send reset password email" +msgstr "パスワードリセットメールを送信" + +#: .\admin\templates\users\user.html:35 +msgid "Get password reset link" +msgstr "パスワードリセットリンクを取得" + +#: .\admin\templates\users\user.html:37 .\admin\templates\users\user.html:42 +msgid "Get confirmation link" +msgstr "確認リンクを取得" + +#: .\admin\templates\users\user.html:40 +msgid "Get claim links" +msgstr "申し立てリンクを取得" + +#: .\admin\templates\users\user.html:47 +msgid "Desk profile" +msgstr "デスクプロファイル" + +#: .\admin\templates\users\user.html:48 +msgid "Desk cases" +msgstr "デスクケース" + +#: .\admin\templates\users\user.html:50 +msgid "Merge Account" +msgstr "アカウントをマージ" + +#: .\admin\templates\users\user.html:58 +msgid "GDPR Delete Account" +msgstr "GDPRアカウントの削除" + +#: .\admin\templates\users\user.html:62 .\admin\templates\users\user.html:64 +msgid "Requested account deactivation" +msgstr "要求されたアカウントの無効化" + +#: .\admin\templates\users\user.html:66 +msgid "Force disable account" +msgstr "アカウントを強制的に無効にする" + +#: .\admin\templates\users\user.html:74 +msgid "Disable Spam account" +msgstr "スパムアカウントを無効にする" + +#: .\admin\templates\users\user.html:76 +msgid "Re-enable Ham account" +msgstr "Hamアカウントを再度有効にする" + +#: .\admin\templates\users\user.html:79 +msgid "Send reset" +msgstr "リセットを送信" + +#: .\admin\templates\users\user.html:175 +msgid "GakuNin RDM account" +msgstr "GakuNin RDMアカウント" + +#: .\admin\templates\users\user.html:185 +msgid "Emails" +msgstr "Eメール" + +#: .\admin\templates\users\user.html:190 +msgid "Primary: " +msgstr "プライマリ:" + +#: .\admin\templates\users\user.html:202 +msgid "Registered" +msgstr "登録済" + +#: .\admin\templates\users\user.html:206 +msgid "Confirmed" +msgstr "確認済み" + +#: .\admin\templates\users\user.html:210 +msgid "Last login" +msgstr "最終ログイン" + +#: .\admin\templates\users\user.html:214 +msgid "Disabled" +msgstr "無効" + +#: .\admin\templates\users\user.html:218 +msgid "Two factor" +msgstr "2要素" + +#: .\admin\templates\users\user.html:226 +msgid "Deactivate" +msgstr "非アクティブ" + +#: .\admin\templates\users\user.html:237 +msgid "System tags" +msgstr "システムタグ" + +#: .\admin\templates\users\user.html:246 +msgid "add system tag" +msgstr "システムタグを追加" + +#: .\admin\templates\users\user.html:258 +msgid "GakuNin RDM Groups" +msgstr "GakuNin RDMグループ" + +#: .\admin\templates\users\user.html:271 +msgid "User is spammy" +msgstr "ユーザーはスパムです" + +#: .\admin\templates\users\user.html:281 +msgid "Profile content checked for spam" +msgstr "スパムをチェックしたプロファイルコンテンツ" + +#: .\admin\templates\users\user.html:346 +msgid "Quota for NII Storage (GB)" +msgstr "NIIストレージの割当て(GB)" + +#: .\admin\templates\users\user_details.html:60 +msgid "Quota for Institutional Storage (GB)" +msgstr "機関ストレージの割当て(GB)" + +#: .\admin\templates\users\user_list.html:68 +msgid "Are you sure the selected user(s) are spam?" +msgstr "選択したユーザーはスパムですか?" + +#: .\admin\templates\users\workshop.html:15 +msgid "Upload" +msgstr "アップロード" + +#: .\admin\templates\util\pagination.html:25 +#, python-format +msgid "Page %(itemsNumber)s of %(paginatorNumPage)s" +msgstr "ページ%(itemsNumber)s / %(paginatorNumPage)s" + +#~ msgid "Submit" +#~ msgstr "検索" + +#~ msgid "Institutions" +#~ msgstr "機関" + +#: admin/templates/rdm_addons/myskelton_institution_settings.html:12 +msgid "Admin Notes" +msgstr "管理者ノート" + +#: admin/templates/rdm_addons/myskelton_institution_settings.html:15 +msgid "Some notes for users by organization administrator..." +msgstr "機関管理者からユーザーへのノート" diff --git a/site/guides/admin-addon/admin_tests/rdm_addons/api_v1/test_views.py b/site/guides/admin-addon/admin_tests/rdm_addons/api_v1/test_views.py new file mode 100644 index 0000000..ec7c337 --- /dev/null +++ b/site/guides/admin-addon/admin_tests/rdm_addons/api_v1/test_views.py @@ -0,0 +1,376 @@ +# -*- coding: utf-8 -*- + +import json +from nose import tools as nt +from django.test import RequestFactory +from django.http import Http404 + +from tests.base import AdminTestCase +from osf_tests.factories import ( + AuthUserFactory, + InstitutionFactory, + ExternalAccountFactory, +) + + +from admin_tests.utilities import setup_user_view +from admin.rdm_addons.api_v1 import views + +from admin_tests.rdm_addons import factories as rdm_addon_factories + + +class TestOAuthView(AdminTestCase): + def setUp(self): + super(TestOAuthView, self).setUp() + self.user = AuthUserFactory() + self.external_account = ExternalAccountFactory() + + self.rdm_addon_option = rdm_addon_factories.RdmAddonOptionFactory() + self.rdm_addon_option.provider = self.external_account.provider + self.rdm_addon_option.external_accounts.add(self.external_account) + self.rdm_addon_option.save() + + self.user.affiliated_institutions.add(self.rdm_addon_option.institution) + self.user.external_accounts.add(self.external_account) + self.user.save() + + self.request = RequestFactory().get('/fake_path') + self.view = views.OAuthView() + self.view = setup_user_view(self.view, self.request, user=self.user) + self.view.kwargs = { + 'external_account_id': self.external_account._id, + 'institution_id': self.rdm_addon_option.institution.id, + } + + def tearDown(self): + super(TestOAuthView, self).tearDown() + institution = self.rdm_addon_option.institution + self.user.affiliated_institutions.remove(institution) + if self.user.external_accounts.filter(pk=self.external_account.id).exists(): + self.user.external_accounts.remove(self.external_account) + self.user.delete() + if self.rdm_addon_option.external_accounts.filter(pk=self.external_account.id).exists(): + self.rdm_addon_option.external_accounts.remove(self.external_account) + self.rdm_addon_option.delete() + institution.delete() + self.external_account.delete() + + def test_super_admin_login(self): + """test superuser login""" + self.request.user.is_superuser = True + nt.assert_true(self.view.test_func()) + + def test_admin_login(self): + """test institution administrator login """ + self.request.user.is_superuser = False + self.request.user.is_staff = True + nt.assert_true(self.view.test_func()) + + def test_non_admin_login(self): + """test user not superuser or institution administrator login""" + self.request.user.is_superuser = False + self.request.user.is_staff = False + nt.assert_equal(self.view.test_func(), False) + + def test_non_active_user_login(self): + """test invalid user login""" + self.request.user.is_active = False + nt.assert_equal(self.view.test_func(), False) + + def test_non_registered_user_login(self): + """test unregistered user login""" + self.request.user.is_registered = False + nt.assert_equal(self.view.test_func(), False) + + def test_non_affiliated_institution_user_login(self): + """test unaffiliated institution user login""" + self.request.user.is_superuser = False + self.request.user.is_staff = True + self.view.kwargs['institution_id'] = self.rdm_addon_option.institution.id + 1 + nt.assert_equal(self.view.test_func(), False) + self.view.kwargs['institution_id'] = self.rdm_addon_option.institution.id + + def test_delete(self, *args, **kwargs): + self.request.user.is_superuser = False + self.request.user.is_staff = True + nt.assert_equal(self.user.external_accounts.count(), 1) + nt.assert_equal(self.rdm_addon_option.external_accounts.count(), 1) + self.view.delete(self.request, *args, **self.view.kwargs) + nt.assert_equal(self.user.external_accounts.count(), 0) + nt.assert_equal(self.rdm_addon_option.external_accounts.count(), 0) + + def test_delete_dummy(self, *args, **kwargs): + self.view.kwargs['external_account_id'] = self.external_account._id + 'dummy' + with self.assertRaises(Http404): + self.view.delete(self.request, *args, **self.view.kwargs) + self.view.kwargs['external_account_id'] = self.external_account._id + + def test_delete_empty(self, *args, **kwargs): + self.rdm_addon_option.external_accounts.remove(self.external_account) + with self.assertRaises(Http404): + self.view.delete(self.request, *args, **self.view.kwargs) + + +class TestSettingsView(AdminTestCase): + def setUp(self): + super(TestSettingsView, self).setUp() + self.user = AuthUserFactory() + self.institution = InstitutionFactory() + self.user.affiliated_institutions.add(self.institution) + + self.request = RequestFactory().get('/fake_path') + self.view = views.SettingsView() + self.view = setup_user_view(self.view, self.request, user=self.user) + self.view.kwargs = { + 'addon_name': 'dataverse', + 'institution_id': self.institution.id, + } + + def tearDown(self): + super(TestSettingsView, self).tearDown() + self.user.affiliated_institutions.remove() + self.user.delete() + self.institution.delete() + + def test_super_admin_login(self): + """test superuser login""" + self.request.user.is_superuser = True + nt.assert_true(self.view.test_func()) + + def test_admin_login(self): + """test institution administrator login""" + self.request.user.is_superuser = False + self.request.user.is_staff = True + nt.assert_true(self.view.test_func()) + + def test_non_admin_login(self): + """test user not superuser or institution administrator login""" + self.request.user.is_superuser = False + self.request.user.is_staff = False + nt.assert_equal(self.view.test_func(), False) + + def test_non_active_user_login(self): + """test invalid user login""" + self.request.user.is_active = False + nt.assert_equal(self.view.test_func(), False) + + def test_non_registered_user_login(self): + """test unregistered user login""" + self.request.user.is_registered = False + nt.assert_equal(self.view.test_func(), False) + + def test_non_affiliated_institution_user_login(self): + """test user unaffiliated institution login""" + self.request.user.is_superuser = False + self.request.user.is_staff = True + self.view.kwargs = {'institution_id': self.institution.id + 1} + nt.assert_equal(self.view.test_func(), False) + + def test_get_dataverse(self, *args, **kwargs): + self.request.user.is_superuser = False + self.request.user.is_staff = True + res = self.view.get(self.request, *args, **self.view.kwargs) + nt.assert_equal(res.status_code, 200) + content = json.loads(res.content) + nt.assert_in('result', content) + + def test_get_dummy_addon(self, *args, **kwargs): + self.request.user.is_superuser = False + self.request.user.is_staff = True + self.view.kwargs['addon_name'] = 'dummy' + res = self.view.get(self.request, *args, **self.view.kwargs) + nt.assert_equal(res.status_code, 200) + self.assertJSONEqual(res.content, {}) + + +class TestAccountsView(AdminTestCase): + def setUp(self): + super(TestAccountsView, self).setUp() + self.user = AuthUserFactory() + self.external_account = ExternalAccountFactory() + + self.rdm_addon_option = rdm_addon_factories.RdmAddonOptionFactory() + self.rdm_addon_option.provider = self.external_account.provider + self.rdm_addon_option.external_accounts.add(self.external_account) + self.rdm_addon_option.save() + + self.user.affiliated_institutions.add(self.rdm_addon_option.institution) + self.user.external_accounts.add(self.external_account) + self.user.save() + + self.request = RequestFactory().get('/fake_path') + self.view = views.AccountsView() + self.view = setup_user_view(self.view, self.request, user=self.user) + self.view.kwargs = { + 'addon_name': self.external_account.provider, + 'institution_id': self.rdm_addon_option.institution.id, + } + + def tearDown(self): + super(TestAccountsView, self).tearDown() + institution = self.rdm_addon_option.institution + self.user.affiliated_institutions.remove(institution) + if self.user.external_accounts.filter(pk=self.external_account.id).exists(): + self.user.external_accounts.remove(self.external_account) + self.user.delete() + if self.rdm_addon_option.external_accounts.filter(pk=self.external_account.id).exists(): + self.rdm_addon_option.external_accounts.remove(self.external_account) + self.rdm_addon_option.delete() + institution.delete() + self.external_account.delete() + + def test_super_admin_login(self): + """test superuser login""" + self.request.user.is_superuser = True + nt.assert_true(self.view.test_func()) + + def test_admin_login(self): + """test institution administrator login""" + self.request.user.is_superuser = False + self.request.user.is_staff = True + nt.assert_true(self.view.test_func()) + + def test_non_admin_login(self): + """test user not superuser or institution administrator login""" + self.request.user.is_superuser = False + self.request.user.is_staff = False + nt.assert_equal(self.view.test_func(), False) + + def test_non_active_user_login(self): + """test invalid user login""" + self.request.user.is_active = False + nt.assert_equal(self.view.test_func(), False) + + def test_non_registered_user_login(self): + """test unregistered user login""" + self.request.user.is_registered = False + nt.assert_equal(self.view.test_func(), False) + + def test_non_affiliated_institution_user_login(self): + """test user unaffiliated institution login""" + self.request.user.is_superuser = False + self.request.user.is_staff = True + self.view.kwargs = {'institution_id': self.rdm_addon_option.institution.id + 1} + nt.assert_equal(self.view.test_func(), False) + + def test_get(self, *args, **kwargs): + res = self.view.get(self.request, *args, **self.view.kwargs) + nt.assert_equal(res.status_code, 200) + content = json.loads(res.content) + nt.assert_equal(len(content['accounts']), 1) + + def test_post_empty(self, *args, **kwargs): + self.request = RequestFactory().post( + '/fake', + data=json.dumps({}), + content_type='application/json' + ) + self.view.kwargs['addon_name'] = 'dummy' + res = self.view.post(self.request, *args, **self.view.kwargs) + nt.assert_equal(res.status_code, 400) + + def test_post_fake_s3_account(self, *args, **kwargs): + self.request = RequestFactory().post( + '/fake', + data=json.dumps({'access_key': 'aaa', 'secret_key': 'bbb'}), + content_type='application/json' + ) + self.view.kwargs['addon_name'] = 's3' + res = self.view.post(self.request, *args, **self.view.kwargs) + nt.assert_equal(res.status_code, 400) + + +# Admin Notes API のテスト +class TestAdminNotesView(AdminTestCase): + def setUp(self): + super(TestAdminNotesView, self).setUp() + self.user = AuthUserFactory() + self.external_account = ExternalAccountFactory() + + self.rdm_addon_option = rdm_addon_factories.RdmAddonOptionFactory() + self.rdm_addon_option.provider = self.external_account.provider + self.rdm_addon_option.external_accounts.add(self.external_account) + self.rdm_addon_option.save() + + self.user.affiliated_institutions.add(self.rdm_addon_option.institution) + self.user.external_accounts.add(self.external_account) + self.user.save() + + self.request = RequestFactory().get('/fake_path') + self.view = views.AdminNotesView() + self.view = setup_user_view(self.view, self.request, user=self.user) + self.view.kwargs = { + 'addon_name': self.external_account.provider, + 'institution_id': self.rdm_addon_option.institution.id, + } + + def tearDown(self): + super(TestAdminNotesView, self).tearDown() + institution = self.rdm_addon_option.institution + self.user.affiliated_institutions.remove(institution) + if self.user.external_accounts.filter(pk=self.external_account.id).exists(): + self.user.external_accounts.remove(self.external_account) + self.user.delete() + if self.rdm_addon_option.external_accounts.filter(pk=self.external_account.id).exists(): + self.rdm_addon_option.external_accounts.remove(self.external_account) + self.rdm_addon_option.delete() + institution.delete() + self.external_account.delete() + + def test_super_admin_login(self): + """test superuser login""" + self.request.user.is_superuser = True + nt.assert_true(self.view.test_func()) + + def test_admin_login(self): + """test institution administrator login""" + self.request.user.is_superuser = False + self.request.user.is_staff = True + nt.assert_true(self.view.test_func()) + + def test_non_admin_login(self): + """test user not superuser or institution administrator login""" + self.request.user.is_superuser = False + self.request.user.is_staff = False + nt.assert_equal(self.view.test_func(), False) + + def test_non_active_user_login(self): + """test invalid user login""" + self.request.user.is_active = False + nt.assert_equal(self.view.test_func(), False) + + def test_non_registered_user_login(self): + """test unregistered user login""" + self.request.user.is_registered = False + nt.assert_equal(self.view.test_func(), False) + + def test_non_affiliated_institution_user_login(self): + """test user unaffiliated institution login""" + self.request.user.is_superuser = False + self.request.user.is_staff = True + self.view.kwargs = {'institution_id': self.rdm_addon_option.institution.id + 1} + nt.assert_equal(self.view.test_func(), False) + + def test_get(self, *args, **kwargs): + res = self.view.get(self.request, *args, **self.view.kwargs) + nt.assert_equal(res.status_code, 200) + content = json.loads(res.content) + nt.assert_in('admin_notes', content) + + def test_put(self, *args, **kwargs): + self.request = RequestFactory().put( + '/fake', + data=json.dumps({'admin_notes': 'fake admin notes'}), + content_type='application/json' + ) + res = self.view.put(self.request, *args, **self.view.kwargs) + nt.assert_equal(res.status_code, 200) + + def test_put_empty(self, *args, **kwargs): + self.request = RequestFactory().put( + '/fake', + data=json.dumps({}), + content_type='application/json' + ) + res = self.view.put(self.request, *args, **self.view.kwargs) + nt.assert_equal(res.status_code, 400) diff --git a/site/guides/admin-addon/config/admin/base/settings/defaults.py b/site/guides/admin-addon/config/admin/base/settings/defaults.py new file mode 100644 index 0000000..38c8f3c --- /dev/null +++ b/site/guides/admin-addon/config/admin/base/settings/defaults.py @@ -0,0 +1,340 @@ +""" +Django settings for the admin project. +""" + +from django.contrib import messages +from api.base.settings import * # noqa +# TODO ALL SETTINGS FROM API WILL BE IMPORTED AND WILL NEED TO BE OVERRRIDEN +# TODO THIS IS A STEP TOWARD INTEGRATING ADMIN & API INTO ONE PROJECT + +# import local # Build own local.py (used with postgres) + +# TODO - remove duplicated items, as this is now using settings from the API + +BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/ + +# from the GakuNin RDM settings +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = osf_settings.SECRET_KEY + + +# Don't allow migrations +DATABASE_ROUTERS = ['admin.base.db.router.NoMigrationRouter'] + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = osf_settings.DEBUG_MODE +DEBUG_PROPAGATE_EXCEPTIONS = True + + +# session: +SESSION_COOKIE_NAME = 'admin' +SESSION_COOKIE_SECURE = osf_settings.SECURE_MODE +SESSION_COOKIE_HTTPONLY = osf_settings.SESSION_COOKIE_HTTPONLY + +# csrf: +CSRF_COOKIE_NAME = 'admin-csrf' +CSRF_COOKIE_SECURE = osf_settings.SECURE_MODE +# set to False for admin draft registration uses a SPA and ajax and grab the token to use it in the requests +CSRF_COOKIE_HTTPONLY = False + +ALLOWED_HOSTS = [ + 'osf.io' +] + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + 'OPTIONS': { + 'min_length': 5, + } + }, +] + +USE_L10N = False + +# Email settings. Account created for testing. Password shouldn't be hardcoded +# [DEVOPS] this should be set to 'django.core.mail.backends.smtp.EmailBackend' in the > dev local.py. +EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' + +# Sendgrid Email Settings - Using OSF credentials. +# Add settings references to local.py + +EMAIL_HOST = osf_settings.MAIL_SERVER +EMAIL_HOST_USER = osf_settings.MAIL_USERNAME +EMAIL_HOST_PASSWORD = osf_settings.MAIL_PASSWORD +EMAIL_PORT = 587 +EMAIL_USE_TLS = True + +# Application definition + +INSTALLED_APPS = ( + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.messages', + 'django.contrib.sessions', + 'django.contrib.staticfiles', + + # 3rd party + 'django_celery_results', + 'raven.contrib.django.raven_compat', + 'webpack_loader', + 'django_nose', + 'password_reset', + 'guardian', + 'waffle', + 'elasticsearch_metrics', + + # OSF + 'osf', + + # Addons + 'addons.osfstorage', + 'addons.wiki', + 'addons.twofactor', + + # Internal apps + 'admin.common_auth', + 'admin.base', + 'admin.spam', + 'admin.metrics', + 'admin.nodes', + 'admin.users', + 'admin.desk', + 'admin.meetings', + 'admin.institutions', + 'admin.preprint_providers', + + # Additional addons + 'addons.bitbucket', + 'addons.box', + 'addons.dataverse', + 'addons.dropbox', + 'addons.figshare', + 'addons.forward', + 'addons.github', + 'addons.googledrive', + 'addons.mendeley', + 'addons.owncloud', + 'addons.s3', + 'addons.zotero', + 'addons.swift', + 'addons.azureblobstorage', + 'addons.weko', + 'addons.s3compat', + 'addons.nextcloud', + 'addons.gitlab', + 'addons.onedrive', + 'addons.iqbrims', + 'addons.dropboxbusiness', + 'addons.nextcloudinstitutions', + 'addons.myskelton', +) + +MIGRATION_MODULES = { + 'osf': None, + 'reviews': None, + 'addons_osfstorage': None, + 'addons_wiki': None, + 'addons_twofactor': None, + 'addons_bitbucket': None, + 'addons_box': None, + 'addons_dataverse': None, + 'addons_dropbox': None, + 'addons_figshare': None, + 'addons_forward': None, + 'addons_github': None, + 'addons_googledrive': None, + 'addons_mendeley': None, + 'addons_owncloud': None, + 'addons_s3': None, + 'addons_zotero': None, + 'addons_swift': None, + 'addons_azureblobstorage': None, + 'addons_weko': None, + 'addons_s3compat': None, + 'addons_nextcloud': None, + 'addons_gitlab': None, + 'addons_onedrive': None, + 'addons_iqbrims': None, + 'addons_dropboxbusiness': None, + 'addons_nextcloudinstitutions': None, + 'addons_myskelton': None, +} + +UNSUPPORTED_FORCE_TO_USE_ADDONS = [ + 'azureblobstorage', + 'swift', + 'weko', + 's3compat', + 'nextcloud', + 'gitlab', + 'onedrive', + 'iqbrims', + 'myskelton', +] + +USE_TZ = True +TIME_ZONE = 'UTC' + +# local development using https +if osf_settings.SECURE_MODE and osf_settings.DEBUG_MODE: + INSTALLED_APPS += ('sslserver',) + +# Custom user model (extends AbstractBaseUser) +AUTH_USER_MODEL = 'osf.OSFUser' + +# TODO: Are there more granular ways to configure reporting specifically related to the API? +RAVEN_CONFIG = { + 'tags': {'App': 'admin'}, + 'dsn': osf_settings.SENTRY_DSN, + 'release': osf_settings.VERSION, +} + +# Settings related to CORS Headers addon: allow API to receive authenticated requests from OSF +# CORS plugin only matches based on "netloc" part of URL, so as workaround we add that to the list +CORS_ORIGIN_ALLOW_ALL = False +CORS_ORIGIN_WHITELIST = (urlparse(osf_settings.DOMAIN).netloc, + osf_settings.DOMAIN, + ) +CORS_ALLOW_CREDENTIALS = True + +MIDDLEWARE = ( + # TokuMX transaction support + # Needs to go before CommonMiddleware, so that transactions are always started, + # even in the event of a redirect. CommonMiddleware may cause other middlewares' + # process_request to be skipped, e.g. when a trailing slash is omitted + 'api.base.middleware.DjangoGlobalMiddleware', + 'api.base.middleware.CeleryTaskMiddleware', + 'api.base.middleware.PostcommitTaskMiddleware', + + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.locale.LocaleMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'django.middleware.security.SecurityMiddleware', + 'waffle.middleware.WaffleMiddleware', +) + +MESSAGE_TAGS = { + messages.SUCCESS: 'text-success', + messages.ERROR: 'text-danger', + messages.WARNING: 'text-warning', +} + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [os.path.join(BASE_DIR, 'templates')], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + } + }] + +ROOT_URLCONF = 'admin.base.urls' +WSGI_APPLICATION = 'admin.base.wsgi.application' +ADMIN_BASE = '' +STATIC_URL = '/static/' +LOGIN_URL = 'account/login/' +LOGIN_REDIRECT_URL = ADMIN_BASE + +STATIC_ROOT = os.path.join(os.path.dirname(BASE_DIR), 'static_root') + +STATICFILES_DIRS = ( + os.path.join(BASE_DIR, 'static'), + os.path.join(BASE_DIR, '../website/static'), +) + +LANGUAGE_CODE = 'en-us' + +WEBPACK_LOADER = { + 'DEFAULT': { + 'BUNDLE_DIR_NAME': 'public/js/', + 'STATS_FILE': os.path.join(BASE_DIR, 'webpack-stats.json'), + } +} + +TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' +NOSE_ARGS = ['--verbosity=2'] + +# Keen.io settings in local.py +KEEN_PROJECT_ID = osf_settings.KEEN['private']['project_id'] +KEEN_READ_KEY = osf_settings.KEEN['private']['read_key'] +KEEN_WRITE_KEY = osf_settings.KEEN['private']['write_key'] + +KEEN_CREDENTIALS = { + 'keen_ready': False +} + +if KEEN_CREDENTIALS['keen_ready']: + KEEN_CREDENTIALS.update({ + 'keen_project_id': KEEN_PROJECT_ID, + 'keen_read_key': KEEN_READ_KEY, + 'keen_write_key': KEEN_WRITE_KEY + }) + + +# Set in local.py +DESK_KEY = '' +DESK_KEY_SECRET = '' + +TINYMCE_APIKEY = '' + +SHARE_URL = osf_settings.SHARE_URL +API_DOMAIN = osf_settings.API_DOMAIN + +if DEBUG: + INSTALLED_APPS += ('debug_toolbar', 'nplusone.ext.django',) + MIDDLEWARE += ('debug_toolbar.middleware.DebugToolbarMiddleware', 'nplusone.ext.django.NPlusOneMiddleware',) + DEBUG_TOOLBAR_CONFIG = { + 'SHOW_TOOLBAR_CALLBACK': lambda _: True, + 'DISABLE_PANELS': { + 'debug_toolbar.panels.templates.TemplatesPanel', + 'debug_toolbar.panels.redirects.RedirectsPanel' + } + } + +# If set to True, automated tests with extra queries will fail. +NPLUSONE_RAISE = False +FCM_SETTINGS = { + 'FCM_SERVER_KEY': '' +} +# separator to devide domain from eppn +SHIB_EPPN_SCOPING_SEPARATOR = '@' + +# hide embededDS, login user form in Adoministrator login page +ENABLE_LOGIN_FORM = True +ENABLE_SHB_LOGIN = False +EMBEDDED_DS_URL = osf_settings.EMBEDDED_DS_URL + +# mail address uses mail from rdm_announcement +ANNOUNCEMENT_EMAIL_FROM = 'noreply@rdm.rcos.nii.ac.jp' + +# Addon Controls +ENABLE_FORCE_CHECK = False + +def parent_dir(path): + '''Return the parent of a directory.''' + return os.path.abspath(os.path.join(path, os.pardir)) + +HERE = os.path.dirname(os.path.abspath(__file__)) +BASE_PATH = parent_dir(parent_dir(HERE)) # admin/ directory + +LOCALE_PATHS = ( + os.path.join(BASE_PATH, 'translations'), +) diff --git a/site/guides/admin-addon/config/admin/webpack.admin.config.js b/site/guides/admin-addon/config/admin/webpack.admin.config.js new file mode 100644 index 0000000..a363a72 --- /dev/null +++ b/site/guides/admin-addon/config/admin/webpack.admin.config.js @@ -0,0 +1,66 @@ +var webpack = require('webpack'); +var path = require('path'); +var common = require('../webpack.common.config.js'); +var BundleTracker = require('webpack-bundle-tracker'); + +var websiteRoot = path.resolve(__dirname, '..', 'website', 'static'); + +var adminRoot = path.resolve(__dirname, 'static'); + +var staticAdminPath = function(dir) { + return path.resolve(adminRoot, dir); +}; + +var staticPath = function(dir) { + return path.join(websiteRoot, dir); +}; + +// Adding bundle tracker to plugins +var plugins = common.plugins.concat([ + // for using webpack with Django + new BundleTracker({filename: './webpack-stats.json'}), + new webpack.LoaderOptionsPlugin({ + debug: true, + minimize: true + }) +]); + +common.output = { + path: path.resolve(__dirname, 'static', 'public', 'js'), + // publicPath: '/static/', // used to generate urls to e.g. images + filename: '[name].js', + sourcePrefix: '' +}; + +var config = Object.assign({}, common, { + entry: { + 'admin-base-page': staticAdminPath('js/pages/base-page.js'), + 'admin-registration-edit-page': staticAdminPath('js/pages/admin-registration-edit-page.js'), + 'dashboard': staticAdminPath('js/sales_analytics/dashboard.js'), + 'metrics-page': staticAdminPath('js/pages/metrics-page.js'), + 'banners': staticAdminPath('js/banners/banners.js'), + 'brands': staticAdminPath('js/brands/brands.js'), + 'maintenance': staticAdminPath('js/maintenance/maintenance.js'), + 'whitelist-page': staticAdminPath('js/pages/whitelist-page.js'), + 'collection-provider-page': staticAdminPath('js/pages/collection-provider-page.js'), + 'registration-provider-page': staticAdminPath('js/pages/registration-provider-page.js'), + 'rdm-addons-page': staticAdminPath('js/rdm_addons/rdm-addons-page.js'), + 'rdm-dataverse-cfg': staticAdminPath('js/rdm_addons/dataverse/rdm-cfg.js'), + 'rdm-s3-cfg': staticAdminPath('js/rdm_addons/s3/rdm-cfg.js'), + 'rdm-owncloud-cfg': staticAdminPath('js/rdm_addons/owncloud/rdm-cfg.js'), + 'rdm-figshare-cfg': staticAdminPath('js/rdm_addons/figshare/rdm-cfg.js'), + 'rdm-iqbrims-cfg': staticAdminPath('js/rdm_addons/iqbrims/rdm-cfg.js'), + + // myskelton addon + 'rdm-myskelton-cfg': staticAdminPath('js/rdm_addons/myskelton/rdm-cfg.js'), + + 'rdm-timestampsettings-page': staticAdminPath('js/rdm_timestampsettings/rdm-timestampsettings-page.js'), + 'rdm-timestampadd-page': staticAdminPath('js/rdm_timestampadd/rdm-timestampadd-page.js'), + 'rdm-keymanagement-page': staticAdminPath('js/rdm_keymanagement/rdm-keymanagement-page.js'), + 'rdm-institutional-storage-page': staticAdminPath('js/rdm_custom_storage_location/rdm-institutional-storage-page.js'), + }, + plugins: plugins, + devtool: 'source-map', +}); +config.resolve.modules.push(websiteRoot, adminRoot); +module.exports = config; diff --git a/site/guides/admin-addon/images/admin_disable_addon1.png b/site/guides/admin-addon/images/admin_disable_addon1.png new file mode 100644 index 0000000..2dfd751 Binary files /dev/null and b/site/guides/admin-addon/images/admin_disable_addon1.png differ diff --git a/site/guides/admin-addon/images/configure_addon_account.png b/site/guides/admin-addon/images/configure_addon_account.png new file mode 100644 index 0000000..c162251 Binary files /dev/null and b/site/guides/admin-addon/images/configure_addon_account.png differ diff --git a/site/guides/admin-addon/images/edit_admin_notes.png b/site/guides/admin-addon/images/edit_admin_notes.png new file mode 100644 index 0000000..26f1320 Binary files /dev/null and b/site/guides/admin-addon/images/edit_admin_notes.png differ diff --git a/site/guides/admin-addon/images/view_admin_notes.png b/site/guides/admin-addon/images/view_admin_notes.png new file mode 100644 index 0000000..0f455ba Binary files /dev/null and b/site/guides/admin-addon/images/view_admin_notes.png differ diff --git a/site/guides/admin-addon/index.html b/site/guides/admin-addon/index.html new file mode 100644 index 0000000..0d72dda --- /dev/null +++ b/site/guides/admin-addon/index.html @@ -0,0 +1,2886 @@ + + + + + + + + + + + + + + + + + + + + + + + Admin Addon Guide / 管理者アドオンガイド - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + + + + +
    + + +
    + +
    + + + + + + + + + +
    +
    + + + +
    +
    +
    + + + + + + + +
    +
    +
    + + + +
    +
    +
    + + + +
    +
    +
    + + + +
    +
    + + + + + + + +

    Admin Addon Guide / 管理者アドオンガイド

    +
    +

    Summary: Guide to creating administrator-level RDM addons with institutional management features +概要: 機関管理機能を持つ管理者レベルの RDM アドオンを作成する手引き

    +
    +

    Jump: English · 日本語

    + +
    +

    +

    English

    +

    → 日本語版へ

    +

    Overview

    +

    This guide shows how to create administrator-level RDM addons that include:

    +
      +
    • Institutional management: Control addon availability per institution
    • +
    • Admin Notes: Display special messages to users from administrators
    • +
    +

    The administrator interface runs on a separate port (default 8001) and allows institutional administrators to manage addon settings.

    +

    Prerequisites

    + +

    Quick start

    +
      +
    1. Create your addon using the skeleton as a base
    2. +
    3. Add institutional management features to your addon
    4. +
    5. Create admin templates and JavaScript configurations
    6. +
    7. Deploy with admin services (admin, admin_assets)
    8. +
    9. Configure institutional administrators' access
    10. +
    +

    Legacy content

    +

    The legacy admin addon instructions are kept verbatim in README.legacy.md for reference and will be rewritten per milestone.

    +
    +

    +

    日本語

    +

    → To English

    +

    概要

    +

    このガイドは、以下の機能を持つ管理者レベルの RDM アドオンを作成する方法を示します:

    +
      +
    • 機関管理: 機関ごとにアドオンの利用可否を制御
    • +
    • 管理者ノート: 管理者からユーザーに特別なメッセージを表示
    • +
    +

    管理者画面は別のポート(デフォルト 8001)で実行され、機関管理者がアドオン設定を管理できます。

    +

    前提条件

    + +

    クイックスタート

    +
      +
    1. スケルトンをベースにアドオンを作成する
    2. +
    3. アドオンに機関管理機能を追加する
    4. +
    5. 管理者テンプレートと JavaScript 設定を作成する
    6. +
    7. admin サービス(admin, admin_assets)でデプロイする
    8. +
    9. 機関管理者のアクセスを設定する
    10. +
    +

    過去のコンテンツ

    +

    過去の管理者アドオンの手順は、参考のために README.legacy.md にそのまま残しており、マイルストーンごとに書き直す予定です。

    +
    +

    Glossary / 用語

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    TermEnglish note日本語注
    Institutional managementControlling which addons are available to each institution.各機関に対してどのアドオンを利用可能にするかを制御すること。
    Admin interfaceA separate page where institutional administrators manage settings.機関管理者が設定を管理するための別のページ。
    Admin NotesSpecial messages that administrators can display to users.管理者がユーザーに表示できる特別なメッセージ。
    InstitutionAn organization (like a university or company) that uses RDM.RDM を使用する組織(大学や会社など)。
    + + + + + + + + + + + + + +
    +
    + + + +
    + +
    + + + +
    +
    +
    +
    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/guides/admin-addon/osf/models/rdm_addons.py b/site/guides/admin-addon/osf/models/rdm_addons.py new file mode 100644 index 0000000..01e5a1c --- /dev/null +++ b/site/guides/admin-addon/osf/models/rdm_addons.py @@ -0,0 +1,52 @@ +# -*- coding: utf-8 -*- + +from django.db import models + +from osf.models.base import BaseModel +from osf.models import Institution, AbstractNode +from osf.models.external import ExternalAccount +from osf.utils.datetime_aware_jsonfield import DateTimeAwareJSONField + +# see admin.rdm_addons.utils.get_rdm_addon_option + +class CommonMixin(object): + def get_one_external_account(self): + if not self.external_accounts.exists(): + return None + return self.external_accounts.first() + + +class RdmAddonOption(BaseModel, CommonMixin): + provider = models.CharField(max_length=50, blank=False, null=False, db_index=True) + is_forced = models.BooleanField(default=False) + is_allowed = models.BooleanField(default=True) + management_node = models.ForeignKey(AbstractNode, blank=True, null=True, default=None, on_delete=models.CASCADE, + related_name='management_rdm_addon_option_set') + organizational_node = models.ForeignKey(AbstractNode, blank=True, null=True, default=None, on_delete=models.CASCADE, + related_name='organizational_rdm_addon_option_set') + + # カラム追加 + admin_notes = models.CharField(max_length=500, blank=True, null=True) + + institution = models.ForeignKey(Institution, blank=False, null=False) + external_accounts = models.ManyToManyField(ExternalAccount, blank=True) + + extended = DateTimeAwareJSONField(default=dict, blank=True) + + class Meta: + unique_together = (('provider', 'institution'),) + + +class RdmAddonNoInstitutionOption(BaseModel, CommonMixin): + provider = models.CharField(max_length=50, blank=False, null=False, unique=True, db_index=True) + is_forced = models.BooleanField(default=False) + is_allowed = models.BooleanField(default=True) + management_node = models.ForeignKey(AbstractNode, blank=True, null=True, default=None, on_delete=models.CASCADE, + related_name='management_rdm_addon_no_institution_option_set') + organizational_node = models.ForeignKey(AbstractNode, blank=True, null=True, default=None, on_delete=models.CASCADE, + related_name='organizational_rdm_addon_no_institution_option_set') + + # カラム追加 + admin_notes = models.CharField(max_length=500, blank=True, null=True) + + external_accounts = models.ManyToManyField(ExternalAccount, blank=True) diff --git a/site/guides/admin-addon/website/translations/en/LC_MESSAGES/js_messages.po b/site/guides/admin-addon/website/translations/en/LC_MESSAGES/js_messages.po new file mode 100644 index 0000000..5bd3e3e --- /dev/null +++ b/site/guides/admin-addon/website/translations/en/LC_MESSAGES/js_messages.po @@ -0,0 +1,6691 @@ +# English translations for . +# Copyright (C) 2020 ORGANIZATION +# This file is distributed under the same license as the project. +# FIRST AUTHOR , 2020. +# +msgid "" +msgstr "" +"Project-Id-Version: 0.6.0\n" +"Report-Msgid-Bugs-To: rocs-office@nii.ac.jp\n" +"POT-Creation-Date: 2020-09-03 12:45+0900\n" +"PO-Revision-Date: 2020-09-03 12:45+0900\n" +"Last-Translator: Takuya Ishibashi\n" +"Language: en\n" +"Language-Team: RCOS \n" +"Plural-Forms: nplurals=1; plural=0\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.7.0\n" + +#: addons/twofactor/static/twoFactorUserConfig.js:148 +#: addons/twofactor/static/twoFactorUserConfig.js:190 +#: admin/static/js/rdm_addons/rdm-addons-page.js:71 +#: website/static/js/accountSettings.js:286 +#: website/static/js/accountSettings.js:351 +#: website/static/js/accountSettings.js:477 +#: website/static/js/accountSettings.js:549 +#: website/static/js/addProjectPlugin.js:347 +#: website/static/js/addonPermissions.js:55 +#: website/static/js/addonSettings.js:71 website/static/js/addonSettings.js:134 +#: website/static/js/apiApplication.js:249 +#: website/static/js/apiApplication.js:420 +#: website/static/js/apiApplication.js:487 +#: website/static/js/apiPersonalToken.js:228 +#: website/static/js/apiPersonalToken.js:399 +#: website/static/js/apiPersonalToken.js:426 +#: website/static/js/citationsNodeConfig.js:169 +#: website/static/js/citationsNodeConfig.js:187 +#: website/static/js/contribManager.js:433 website/static/js/fangorn.js:537 +#: website/static/js/fangorn.js:542 website/static/js/fangorn.js:1212 +#: website/static/js/fangorn.js:1235 website/static/js/fangorn.js:1288 +#: website/static/js/fangorn.js:1307 website/static/js/fangorn.js:2006 +#: website/static/js/filepage/index.js:213 +#: website/static/js/folderPickerNodeConfig.js:510 +#: website/static/js/folderPickerNodeConfig.js:566 +#: website/static/js/institutionProjectSettings.js:102 +#: website/static/js/licensePicker.js:243 website/static/js/myProjects.js:1560 +#: website/static/js/myProjects.js:1608 website/static/js/myProjects.js:1632 +#: website/static/js/nodeControl.js:227 +#: website/static/js/oauthAddonNodeConfig.js:156 +#: website/static/js/oauthAddonNodeConfig.js:174 +#: website/static/js/osfHelpers.js:796 website/static/js/osfHelpers.js:897 +#: website/static/js/pages/profile-settings-addons-page.js:35 +#: website/static/js/pages/profile-settings-addons-page.js:101 +#: website/static/js/pages/project-addons-page.js:41 +#: website/static/js/pages/project-addons-page.js:66 +#: website/static/js/privateLinkTable.js:119 website/static/js/profile.js:373 +#: website/static/js/profile.js:743 website/static/js/profile.js:975 +#: website/static/js/project.js:39 website/static/js/project.js:143 +#: website/static/js/project.js:253 +#: website/static/js/wikiSettingsTreebeard.js:31 +msgid "Cancel" +msgstr "" + +#: addons/twofactor/static/twoFactorUserConfig.js:178 +msgid "Enable Two-factor Authentication" +msgstr "" + +#: addons/twofactor/static/twoFactorUserConfig.js:179 +msgid "" +"Enabling two-factor authentication will not immediately activate this " +"feature for your account. You will need to follow the steps that appear " +"below to complete the activation of two-factor authentication for your " +"account." +msgstr "" + +#: addons/twofactor/static/twoFactorUserConfig.js:187 +msgid "Enable" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:86 +msgid "Live editing mode" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:88 +msgid "Attempting to connect" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:90 +msgid "Unsupported browser" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:92 +msgid "Unavailable: Live editing" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:153 +msgid "The wiki content could not be loaded." +msgstr "" + +#: addons/wiki/static/WikiEditor.js:155 +msgid "Could not GET wiki contents." +msgstr "" + +#: addons/wiki/static/WikiEditor.js:176 +msgid "There are unsaved changes to your wiki. If you exit " +msgstr "" + +#: addons/wiki/static/WikiEditor.js:177 +msgid "the page now, those changes may be lost." +msgstr "" + +#: addons/wiki/static/wikiPage.js:94 +#: website/static/js/pages/project-dashboard-page.js:733 +msgid "" +"*Add important information, links, or images here to describe your " +"project.*" +msgstr "" + +#: addons/wiki/static/wikiPage.js:96 +#: website/static/js/pages/project-dashboard-page.js:735 +msgid "*No wiki content.*" +msgstr "" + +#: addons/wiki/static/wikiPage.js:220 +msgid "Live preview" +msgstr "" + +#: addons/wiki/static/wikiPage.js:222 +msgid "Current version" +msgstr "" + +#: addons/wiki/static/wikiPage.js:224 +msgid "Previous version" +msgstr "" + +#: addons/wiki/static/wikiPage.js:226 +msgid "Version " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:48 +msgid "Strong " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:51 +msgid "Emphasis " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:54 +msgid "Spellcheck: Toggle spellcheck on and off" +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:56 +msgid "Hyperlink " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:60 +msgid "Blockquote
    " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:63 +msgid "Code Sample
    "
    +msgstr ""
    +
    +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:66
    +msgid "Image "
    +msgstr ""
    +
    +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:70
    +msgid "Numbered List 
      " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:71 +msgid "Bulleted List
        " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:72 +msgid "List item" +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:74 +msgid "Heading

        /

        " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:77 +msgid "Horizontal Rule
        " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:79 +msgid "Undo -" +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:80 +msgid "Redo -" +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:82 +msgid "Wiki Syntax Help" +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:1939 +msgid "Autocomplete" +msgstr "" + +#: addons/jupyterhub/static/files.js:92 +msgid "Launch" +msgstr "" + +#: admin/static/js/collection_providers/collectionProviders.js:9 +msgid "Hide Form" +msgstr "" + +#: admin/static/js/collection_providers/collectionProviders.js:9 +msgid "Modify Collection Provider" +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:64 +#, python-format +msgid "Disallow %s?" +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:65 +msgid "Are you sure you want to disallow the %1$s?
        " +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:66 +msgid "" +"This will revoke access to %1$s for all projects using the " +"accounts.

        " +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:67 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:395 +msgid "Type the following to continue: %1$s

        " +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:74 +msgid "Disallow" +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:85 +msgid "Strings did not match" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:26 +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:19 +msgid "Other (Please Specify)" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:85 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:100 +#: website/static/js/addonSettings.js:171 +msgid "Error while updating addon account" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:100 +msgid "Please select a Dataverse repository." +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:105 +msgid "Please enter an API token." +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:110 +msgid "Please enter a Dataverse host and an API token." +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:131 +msgid "Could not authenticate with Dataverse" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:144 +msgid "Disconnect Dataverse Account?" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:146 +msgid "" +"Are you sure you want to disconnect the Dataverse account on " +"%1$s? This will revoke access to Dataverse for all " +"projects associated with this account." +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:155 +#: admin/static/js/rdm_addons/figshare/rdm-cfg.js:34 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:124 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:411 +#: website/static/js/addonSettings.js:130 +#: website/static/js/folderPickerNodeConfig.js:562 +msgid "Disconnect" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:173 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:142 +#: website/static/js/addonSettings.js:150 +msgid "Error while removing addon authorization for %1$s" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:212 +msgid "Could not GET Dataverse settings" +msgstr "" + +#: admin/static/js/rdm_addons/figshare/rdm-cfg.js:17 +msgid "Disconnect figshare Account?" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:46 +msgid "Invalid management URL: " +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:61 +msgid "Saving management project was successful" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:63 +msgid "Error while saving addon management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:71 +msgid "Permission error while saving management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:73 +msgid "Error while saving management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:91 +msgid "Removing management project was successful" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:93 +msgid "Error while removing addon management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:101 +msgid "Permission error while removing management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:103 +msgid "Error while removing management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:118 +msgid "Error while fetching addon management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:149 +msgid "Saving organizational project was successful" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:151 +msgid "Error while saving addon organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:159 +msgid "Permission error while saving organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:161 +msgid "Error while saving organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:179 +msgid "Removing organizational project was successful" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:181 +msgid "Error while removing addon organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:189 +msgid "Permission error while removing organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:191 +msgid "Error while removing organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:206 +msgid "Error while fetching addon organization project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:222 +msgid "Error while fetching management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:226 +msgid "Error while fetching organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:58 +msgid "Could not GET OwnCloud settings" +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:75 +msgid "Please enter an ownCloud server." +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:77 +msgid "Please select an ownCloud server." +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:82 +msgid "Please enter a username and password." +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:86 +msgid "Please enter an ownCloud host and credentials." +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:104 +msgid "Could not authenticate with ownCloud" +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:48 +msgid "Please enter both an API access key and secret key." +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:53 +msgid "Please enter an API access key." +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:58 +msgid "Please enter an API secret key." +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:75 +msgid "Could not authenticate with S3" +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:113 +msgid "Disconnect Amazon S3 Account?" +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:115 +msgid "" +"Are you sure you want to disconnect the S3 account %1$s?" +" This will revoke access to S3 for all projects associated with this " +"account." +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:80 +msgid "Are you sure you want to change institutional storage?" +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:81 +msgid "" +"

        The previous storage will no longer be available to all contributors " +"on the project.

        " +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:85 +#: website/static/js/folderPickerNodeConfig.js:100 +#: website/static/js/folderPickerNodeConfig.js:102 +#: website/static/js/folderPickerNodeConfig.js:594 +msgid "Change" +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:264 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:491 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:626 +msgid "Some errors occurred" +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:311 +msgid "Institutional Storage set successfully" +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:391 +#: website/static/js/addonSettings.js:118 +msgid "Disconnect Account?" +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:393 +msgid "" +"Are you sure you want to disconnect the %1$s account " +"%2$s?
        " +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:394 +msgid "" +"This will revoke access to %1$s for all projects using this " +"account.

        " +msgstr "" + +#: scripts/translations/messages_addonsJson.js:3 +msgid "" +"\n" +"\n" +"

        Box Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking a GakuNin RDM project public or private is " +"independent of Box privacy. The GakuNin RDM does not alter the " +"permissions of linked Box folders.
        View / download file versionsBox files and their versions can be viewed/downloaded" +" via GakuNin RDM.
        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Box.
        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Box.
        LogsThe GakuNin RDM keeps track of changes you make to " +"your Box content through the GakuNin RDM, but not for changes made using " +"Box directly.
        ForkingForking a project or component does not copy Box " +"authorization unless the user forking the project is the same user who " +"authorized the Box add-on in the source project being forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:5 +msgid "" +"\n" +"\n" +"

        Dataverse Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Dataverse study public or private. The GakuNin " +"RDM allows you to release the latest draft version of a Dataverse " +"dataset.
        View / download file versionsFiles from the latest release of the selected " +"Dataverse study can be viewed/downloaded. GakuNin RDM users with write " +"permissions can view/download draft files as well.
        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Dataverse.
        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Dataverse.
        LogsThe GakuNin RDM keeps track of changes you make to " +"your Dataverse studies through the GakuNin RDM, but not for changes made " +"using Dataverse directly.
        ForkingForking a project or component does not copy " +"Dataverse authorization unless the user forking the project is the same " +"user who authorized the Dataverse add-on in the source project being " +"forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:7 +msgid "" +"\n" +"\n" +"

        Dropbox Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking a GakuNin RDM project public or private is " +"independent of Dropbox privacy. The GakuNin RDM does not alter the " +"permissions of linked Dropbox folders.
        View / download file versionsDropbox files and their versions can be " +"viewed/downloaded via GakuNin RDM.
        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Dropbox.
        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Dropbox.
        LogsGakuNin RDM keeps track of changes you make to your " +"Dropbox content through GakuNin RDM, but not for changes made using " +"Dropbox directly.
        ForkingForking a project or component does not copy Dropbox " +"authorization unless the user forking the project is the same user who " +"authorized the Dropbox add-on in the source project being forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:9 +msgid "" +"\n" +"\n" +"

        figshare Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        Permissions Making a GakuNin RDM project public or private is " +"independent of making figshare content public or private. The GakuNin RDM" +" does not alter the permissions of linked figshare content.
        View / download file versionsfigshare files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported.
        Add / update filesFiles can be added but not updated.
        Delete filesPrivate files and filesets can be deleted via GakuNin" +" RDM.
        LogsGakuNin RDM keeps track of changes you make to your " +"figshare content through GakuNin RDM, but not for changes made using " +"figshare directly.
        ForkingForking a project or component does not copy figshare" +" authorization unless the user forking the project is the same user who " +"authorized the figshare add-on in the source project being forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:11 +msgid "" +"\n" +"\n" +"

        GitHub Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a GitHub repo public or private. The GakuNin RDM " +"does not alter the permissions of linked GitHub repos.
        View / download file versionsGitHub files and their versions can be " +"viewed/downloaded via GakuNin RDM.
        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in GitHub.
        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"GitHub.
        LogsGitHub dynamically updates GakuNin RDM logs when " +"files are modified outside the GakuNin RDM. Changes to GitHub repos made " +"before the repo is linked to the GakuNin RDM will not be reflected in " +"GakuNin RDM logs.
        ForkingForking a project or component does not copy Github " +"authorization unless the user forking the project is the same user who " +"authorized the Github add-on in the source project being forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:13 +msgid "" +"\n" +"\n" +"

        GitLab Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a GitLab repo public or private. The GakuNin RDM " +"does not alter the permissions of linked GitLab repos.
        View / download file versionsGitLab files and their versions can be " +"viewed/downloaded via GakuNin RDM.
        Add / update filesAdding/updating files in the project via GakuNin RDM " +"is not implemented yet.
        Delete filesDeleting files via GakuNin RDM is not implemented " +"yet.
        LogsGakuNin RDM does not keep track of changes made using" +" Gitlab directly.
        ForkingForking a project or component does not copy GitLab " +"authorization unless the user forking the project is the same user who " +"authorized the GitLab add-on in the source project being forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:15 +msgid "" +"\n" +"\n" +"

        Mendeley Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Mendeley folder public or private. The GakuNin " +"RDM does not alter the permissions of a linked Mendeley folder.
        ForkingForking a project or component does not copy Mendeley" +" authorization unless the user forking the project is the same user who " +"authorized the Mendeley add-on in the source project being forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:17 +msgid "" +"\n" +"\n" +"

        Zotero Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Zotero folder public or private. The GakuNin RDM " +"does not alter the permissions of a linked Zotero folder.
        ForkingForking a project or component does not copy Zotero " +"authorization unless the user forking the project is the same user who " +"authorized the Zotero add-on in the source project being forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:19 +msgid "" +"\n" +"\n" +"

        ownCloud Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking a GakuNin RDM project public or private is " +"independent of ownCloud privacy. The GakuNin RDM does not alter the " +"permissions of linked ownCloud folders.
        View / download file versionsownCloud files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported by the ownCloud WebDAV " +"API.
        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in ownCloud.
        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"ownCloud.
        LogsGakuNin RDM keeps track of changes you make to your " +"ownCloud content through GakuNin RDM, but not for changes made using " +"ownCloud directly.
        ForkingForking a project or component does not copy ownCloud" +" authorization unless the user forking the project is the same user who " +"authorized the ownCloud add-on in the source project being forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:21 +msgid "" +"\n" +"\n" +"

        OneDrive Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking a GakuNin RDM project public or private is " +"independent of OneDrive privacy. The GakuNin RDM does not alter the " +"permissions of linked OneDrive folders.
        View / download file versionsOneDrive files and their versions can be " +"viewed/downloaded via GakuNin RDM. OneNote files are unexportable and " +"cannot be downloaded or viewed.
        Add / update filesThe OneDrive add-on is read-only.
        Delete filesThe OneDrive add-on is read-only.
        LogsGakuNin RDM keeps track of changes you make to your " +"OneDrive add-on configuration. It does not track changes to OneDrive " +"content.
        ForkingForking a project or component does not copy OneDrive" +" authorization unless the user forking the project is the same user who " +"authorized the OneDrive add-on in the source project being forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:23 +msgid "" +"\n" +"\n" +"

        Amazon S3 Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an S3 bucket public or private. The GakuNin RDM " +"does not alter the permissions of linked S3 buckets.
        View / download file versionsThe S3 add-on supports file versions if versioning is" +" enabled for your S3 buckets.
        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Amazon S3.
        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Amazon S3.
        LogsThe GakuNin RDM keeps track of changes you make to " +"your S3 buckets through the GakuNin RDM, but not for changes made using " +"S3 directly.
        ForkingForking a project or component does not copy S3 " +"authorization unless the user forking the project is the same user who " +"authorized the S3 add-on in the source project being forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:25 +msgid "" +"\n" +"\n" +"

        Google Drive Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking a GakuNin RDM project public or private is " +"independent of Google Drive privacy. The GakuNin RDM does not alter the " +"permissions of linked Google Drive folders.
        View / download file versionsGoogle Drive files and their versions can be " +"viewed/downloaded via GakuNin RDM.
        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Google Drive.
        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Google Drive.
        LogsThe GakuNin RDM keeps track of changes you make to " +"your Google Drive content through the GakuNin RDM, but not for changes " +"made using Google Drive directly.
        ForkingForking a project or component does not copy Google " +"Drive authorization unless the user forking the project is the same user " +"who authorized the Google Drive add-on in the source project being " +"forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:27 +msgid "" +"\n" +"\n" +"

        Bitbucket Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Bitbucket repo public or private. The GakuNin RDM" +" does not alter the permissions of linked Bitbucket repos.
        View / download file versionsBitbucket files and their versions can be " +"viewed/downloaded via GakuNin RDM.
        Add / update filesBitbucket does not support adding or updating files " +"via their API.
        Delete filesBitbucket does not support deleting files via their " +"API.
        LogsGakuNin RDM keeps track of changes you make to your " +"Bitbucket content through GakuNin RDM, but not for changes made using " +"Bitbucket directly.
        ForkingForking a project or component does not copy " +"Bitbucket authorization unless the user forking the project is the same " +"user who authorized the Bitbucket add-on in the source project being " +"forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:29 +msgid "" +"\n" +"\n" +"

        Azure Blob Storage Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an Azure Blob Storage container public or " +"private.
        View / download file versionsThe Azure Blob Storage add-on supports only Block " +"Blobs, and does not support file versions.
        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Azure Blob Storage.
        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Azure Blob Storage.
        LogsThe GakuNin RDM keeps track of changes you make to " +"your Azure Blob Storage containers through the GakuNin RDM, but not for " +"changes made using Azure Blob Storage directly.
        ForkingForking a project or component does not copy Azure " +"Blob Storage authorization unless the user forking the project is the " +"same user who authorized the Azure Blob Storage add-on in the source " +"project being forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:31 +msgid "" +"\n" +"\n" +"

        Nextcloud Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking a GakuNin RDM project public or private is " +"independent of Nextcloud privacy. The GakuNin RDM does not alter the " +"permissions of linked Nextcloud folders.
        View / download file versionsNextcloud files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported by the Nextcloud WebDAV " +"API.
        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Nextcloud.
        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Nextcloud.
        LogsGakuNin RDM keeps track of changes you make to your " +"Nextcloud content through GakuNin RDM, but not for changes made using " +"Nextcloud directly.
        ForkingForking a project or component does not copy " +"Nextcloud authorization unless the user forking the project is the same " +"user who authorized the Nextcloud add-on in the source project being " +"forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:33 +msgid "" +"\n" +"\n" +"

        OpenStack Swift Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an Swift container public or private.
        View / download file versionsThe Swift add-on does not support file versions.
        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Swift.
        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Swift.
        LogsThe GakuNin RDM keeps track of changes you make to " +"your Swift containers through the GakuNin RDM, but not for changes made " +"using Swift directly.
        ForkingForking a project or component does not copy Swift " +"authorization unless the user forking the project is the same user who " +"authorized the Swift add-on in the source project being forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:35 +msgid "" +"\n" +"\n" +"

        S3 Compatible Storage Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an S3 Compatible Storage bucket public or private. " +"The GakuNin RDM does not alter the permissions of linked S3 Compatible " +"Storage buckets.
        View / download file versionsThe S3 add-on supports file versions if versioning is" +" enabled for your S3 Compatible Storage buckets.
        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in S3 Compatible Storage.
        Delete filesFiles deleted via GakuNin RDM will be deleted in S3 " +"Compatible Storage.
        LogsThe GakuNin RDM keeps track of changes you make to " +"your S3 Compatible Storage buckets through the GakuNin RDM, but not for " +"changes made using S3 Compatible Storage directly.
        ForkingForking a project or component does not copy S3 " +"Compatible Storage authorization unless the user forking the project is " +"the same user who authorized the S3 Compatible Storage add-on in the " +"source project being forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:37 +msgid "" +"\n" +"\n" +"

        WEKO Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        Add / update filesAdding/updating indices/items in the project via " +"GakuNin RDM will be reflected in WEKO.
        Delete filesItems deleted via GakuNin RDM will be deleted in " +"WEKO.
        LogsThe GakuNin RDM keeps track of changes you make to " +"your WEKO index through the GakuNin RDM, but not for changes made using " +"WEKO directly.
        ForkingForking a project or component does not copy WEKO " +"authorization unless the user forking the project is the same user who " +"authorized the WEKO add-on in the source project being forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:39 +msgid "" +"\n" +"\n" +"

        JupyterHub Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsThe GakuNin RDM does not affect the permissions of " +"JupyterHub.
        View / download file versionsThe JupyterHub add-on does not provide Storage " +"Features.
        Add / update filesThe JupyterHub add-on does not provide Storage " +"Features.
        Delete filesThe JupyterHub add-on does not provide Storage " +"Features.
        LogsThe JupyterHub add-on does not provide Storage " +"Features.
        ForkingForking a project or component copies information " +"about linked JupyterHub but the GakuNin RDM does not affect " +"authentication of JupyterHub.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:41 +msgid "" +"\n" +"\n" +"

        IQB-RIMS Add-on Terms

        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
        FunctionStatus
        PermissionsMaking an GakuNin RDM project public or private is " +"independent of Google Drive privacy. The GakuNin RDM does not alter the " +"permissions of linked Google Drive folders.
        View / download file versionsIQB-RIMS files and their versions can be " +"viewed/downloaded via GakuNin RDM.
        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Google Drive.
        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Google Drive.
        LogsThe GakuNin RDM keeps track of changes you make to " +"your Google Drive content through the GakuNin RDM, but not for changes " +"made using Google Drive directly.
        ForkingForking a project or component does not copy Google " +"Drive authorization unless the user forking the project is the same user " +"who authorized the IQB-RIMS add-on in the source project being " +"forked.
        \n" +"\n" +"
          \n" +"
        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
        • \n" +"
        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
        • \n" +"
        \n" +msgstr "" + +#: website/static/js/accessRequestManager.js:85 +msgid "There was a problem trying to %1$s the request from the user. %2$s" +msgstr "" + +#: website/static/js/accessRequestManager.js:86 +#: website/static/js/accessRequestManager.js:87 +msgid "Could not %1$s access request" +msgstr "" + +#: website/static/js/accessRequestManager.js:115 +#: website/static/js/contribAdder.js:71 website/static/js/contribManager.js:211 +msgid "Read" +msgstr "" + +#: website/static/js/accessRequestManager.js:116 +#: website/static/js/contribAdder.js:72 website/static/js/contribManager.js:212 +msgid "Read + Write" +msgstr "" + +#: website/static/js/accessRequestManager.js:117 +#: website/static/js/contribAdder.js:73 website/static/js/contribManager.js:213 +msgid "Administrator" +msgstr "" + +#: website/static/js/accountClaimer.js:34 +msgid "Email will arrive shortly" +msgstr "" + +#: website/static/js/accountClaimer.js:34 +msgid "Please check " +msgstr "" + +#: website/static/js/accountClaimer.js:41 +msgid "Claim as %1$s?" +msgstr "" + +#: website/static/js/accountClaimer.js:42 +msgid "If you claim this account, a contributor of this project " +msgstr "" + +#: website/static/js/accountClaimer.js:43 +msgid "will be emailed to confirm your identity." +msgstr "" + +#: website/static/js/accountClaimer.js:61 +msgid "Claim" +msgstr "" + +#: website/static/js/accountClaimer.js:73 +msgid "Is this you? Click to claim" +msgstr "" + +#: website/static/js/accountClaimer.js:99 +msgid "Claim Account" +msgstr "" + +#: website/static/js/accountClaimer.js:101 +msgid "Enter email..." +msgstr "" + +#: website/static/js/accountClaimer.js:105 +msgid "Not a valid email." +msgstr "" + +#: website/static/js/accountSettings.js:83 +msgid "Could not fetch user profile." +msgstr "" + +#: website/static/js/accountSettings.js:84 +#: website/static/js/accountSettings.js:115 +#: website/static/js/licensePicker.js:197 +msgid "Error fetching user profile" +msgstr "" + +#: website/static/js/accountSettings.js:112 +msgid "" +"User profile not updated. Please refresh the page and try again or " +"contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/accountSettings.js:199 +msgid "Duplicate Email" +msgstr "" + +#: website/static/js/accountSettings.js:220 +msgid "Confirmation email sent" +msgstr "" + +#: website/static/js/accountSettings.js:221 +msgid "%1$s was added to your account." +msgstr "" + +#: website/static/js/accountSettings.js:222 +msgid " You will receive a confirmation email at %1$s." +msgstr "" + +#: website/static/js/accountSettings.js:223 +msgid "" +" Please click the link in your email to confirm this action. You will be " +"required to enter your password." +msgstr "" + +#: website/static/js/accountSettings.js:226 website/static/js/fangorn.js:2258 +#: website/static/js/folderPickerNodeConfig.js:591 +#: website/static/js/pages/profile-settings-addons-page.js:72 +#: website/static/js/pages/project-settings-page.js:118 +msgid "Close" +msgstr "" + +#: website/static/js/accountSettings.js:236 +msgid "Email cannot be empty." +msgstr "" + +#: website/static/js/accountSettings.js:244 +msgid "Resend Email Confirmation?" +msgstr "" + +#: website/static/js/accountSettings.js:245 +msgid "Are you sure that you want to resend email confirmation to %1$s?" +msgstr "" + +#: website/static/js/accountSettings.js:250 +msgid "Email confirmation resent to %1$s" +msgstr "" + +#: website/static/js/accountSettings.js:251 +msgid "You will receive a new confirmation email at %1$s." +msgstr "" + +#: website/static/js/accountSettings.js:252 +msgid "" +" Please log out of this account and check your email to confirm this " +"action." +msgstr "" + +#: website/static/js/accountSettings.js:259 +msgid "Resend" +msgstr "" + +#: website/static/js/accountSettings.js:270 +msgid "Remove Email?" +msgstr "" + +#: website/static/js/accountSettings.js:271 +msgid "Are you sure that you want to remove %1$s from your email list?" +msgstr "" + +#: website/static/js/accountSettings.js:282 +#: website/static/js/accountSettings.js:347 +#: website/static/js/addonPermissions.js:51 +#: website/static/js/addonSettings.js:67 +#: website/static/js/pages/profile-settings-addons-page.js:97 +#: website/static/js/privateLinkTable.js:115 website/static/js/profile.js:739 +#: website/static/js/profile.js:971 website/static/js/project.js:249 +msgid "Remove" +msgstr "" + +#: website/static/js/accountSettings.js:291 +#: website/static/js/accountSettings.js:304 +msgid "Please refresh the page and try again." +msgstr "" + +#: website/static/js/accountSettings.js:317 +msgid "You have revoked this connected identity." +msgstr "" + +#: website/static/js/accountSettings.js:322 +msgid "Revocation request failed. Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/accountSettings.js:325 +msgid "Error revoking connected identity" +msgstr "" + +#: website/static/js/accountSettings.js:338 +msgid "Remove authorization?" +msgstr "" + +#: website/static/js/accountSettings.js:339 +msgid "Are you sure you want to remove this authorization?" +msgstr "" + +#: website/static/js/accountSettings.js:383 +msgid "" +"You have successfully changed your default storage location to " +"%1$s." +msgstr "" + +#: website/static/js/accountSettings.js:387 +msgid "" +"Your attempt to change your default storage location has failed. Please " +"contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/accountSettings.js:390 +msgid "Error updating default storage location " +msgstr "" + +#: website/static/js/accountSettings.js:413 +msgid "" +"An GakuNin RDM administrator will contact you shortly to confirm your " +"deactivation request." +msgstr "" + +#: website/static/js/accountSettings.js:421 +msgid "Deactivation request failed. Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/accountSettings.js:425 +#: website/static/js/accountSettings.js:450 +msgid "Error requesting account deactivation" +msgstr "" + +#: website/static/js/accountSettings.js:438 +msgid "An GakuNin RDM account is no longer up for review." +msgstr "" + +#: website/static/js/accountSettings.js:446 +msgid "" +"Deactivation request failed. Please contact
        rdm_support@nii.ac.jp if the problem " +"persists." +msgstr "" + +#: website/static/js/accountSettings.js:463 +msgid "Request account deactivation?" +msgstr "" + +#: website/static/js/accountSettings.js:464 +msgid "" +"Are you sure you want to request account deactivation? A GakuNinRDM " +"administrator will review your request. If accepted, you " +msgstr "" + +#: website/static/js/accountSettings.js:465 +msgid "will NOT be able to reactivate your account." +msgstr "" + +#: website/static/js/accountSettings.js:473 +#: website/static/js/accountSettings.js:546 +msgid "Request" +msgstr "" + +#: website/static/js/accountSettings.js:485 +msgid "Cancel deactivation request?" +msgstr "" + +#: website/static/js/accountSettings.js:486 +msgid "" +"Are you sure you want to rescind your account deactivation request? This " +"will preserve your account status." +msgstr "" + +#: website/static/js/accountSettings.js:494 +msgid "Cancel Deactivation Request" +msgstr "" + +#: website/static/js/accountSettings.js:512 +msgid "" +"An GakuNin RDM administrator will contact you shortly to confirm your " +"export request." +msgstr "" + +#: website/static/js/accountSettings.js:520 +msgid "Export request failed. Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/accountSettings.js:524 +msgid "Error requesting account export" +msgstr "" + +#: website/static/js/accountSettings.js:537 +msgid "Request account export?" +msgstr "" + +#: website/static/js/accountSettings.js:538 +msgid "Are you sure you want to request account export?" +msgstr "" + +#: website/static/js/addProjectPlugin.js:21 +#: website/static/js/addProjectPlugin.js:24 +#: website/static/js/myProjects.js:1118 +msgid "Create new project" +msgstr "" + +#: website/static/js/addProjectPlugin.js:57 +msgid "There was an unknown error. Please try again later." +msgstr "" + +#: website/static/js/addProjectPlugin.js:184 website/static/js/conference.js:19 +msgid "Title" +msgstr "" + +#: website/static/js/addProjectPlugin.js:198 +msgid "Enter %1$s title" +msgstr "" + +#: website/static/js/addProjectPlugin.js:203 +msgid "Affiliation" +msgstr "" + +#: website/static/js/addProjectPlugin.js:210 +msgid "Remove all" +msgstr "" + +#: website/static/js/addProjectPlugin.js:217 +msgid "Select all" +msgstr "" + +#: website/static/js/addProjectPlugin.js:233 +msgid "Storage location" +msgstr "" + +#: website/static/js/addProjectPlugin.js:251 +msgid " Add contributors from " +msgstr "" + +#: website/static/js/addProjectPlugin.js:253 +msgid " Admins of " +msgstr "" + +#: website/static/js/addProjectPlugin.js:253 +msgid " will have read access to this component." +msgstr "" + +#: website/static/js/addProjectPlugin.js:264 +msgid " Add tags from " +msgstr "" + +#: website/static/js/addProjectPlugin.js:268 +msgid "License" +msgstr "" + +#: website/static/js/addProjectPlugin.js:270 +msgid " This component will inherit the same license as " +msgstr "" + +#: website/static/js/addProjectPlugin.js:273 +msgid "Learn more." +msgstr "" + +#: website/static/js/addProjectPlugin.js:282 +msgid " More" +msgstr "" + +#: website/static/js/addProjectPlugin.js:286 +msgid "Description" +msgstr "" + +#: website/static/js/addProjectPlugin.js:295 +msgid "Enter %1$s description" +msgstr "" + +#: website/static/js/addProjectPlugin.js:299 website/static/js/conference.js:31 +msgid "Category" +msgstr "" + +#: website/static/js/addProjectPlugin.js:300 +msgid " (for descriptive purposes)" +msgstr "" + +#: website/static/js/addProjectPlugin.js:307 +msgid "Uncategorized" +msgstr "" + +#: website/static/js/addProjectPlugin.js:320 +msgid "(Empty category)" +msgstr "" + +#: website/static/js/addProjectPlugin.js:330 +msgid "Template (optional)" +msgstr "" + +#: website/static/js/addProjectPlugin.js:331 +msgid "" +"Start typing to search your projects. Selecting project as template will " +"duplicate its " +msgstr "" + +#: website/static/js/addProjectPlugin.js:332 +msgid "" +"structure in the new project without importing the content of that " +"project." +msgstr "" + +#: website/static/js/addProjectPlugin.js:351 +#: website/static/js/nodeControl.js:224 +#: website/static/js/privateLinkManager.js:31 website/static/js/project.js:140 +msgid "Create" +msgstr "" + +#: website/static/js/addProjectPlugin.js:362 +#, python-format +msgid "Saving your %s..." +msgstr "" + +#: website/static/js/addProjectPlugin.js:376 +msgid "New %1$s created successfully!" +msgstr "" + +#: website/static/js/addProjectPlugin.js:386 +#: website/static/js/addProjectPlugin.js:434 website/static/js/project.js:62 +msgid "Keep working here" +msgstr "" + +#: website/static/js/addProjectPlugin.js:392 +#: website/static/js/addProjectPlugin.js:437 +msgid "Go to new %1$s" +msgstr "" + +#: website/static/js/addProjectPlugin.js:405 +msgid "Couldn't create your %1$s" +msgstr "" + +#: website/static/js/addProjectPlugin.js:424 +msgid "Could not add institution affiliation to your new %1$s" +msgstr "" + +#: website/static/js/addProjectPlugin.js:471 +msgid "Select a project to use as a template" +msgstr "" + +#: website/static/js/addonHelper.js:37 +#: website/static/js/nodeSelectTreebeard.js:59 +#: website/static/js/notificationsTreebeard.js:59 +#: website/static/js/profile.js:311 +#: website/static/js/wikiSettingsTreebeard.js:54 +msgid "Settings updated" +msgstr "" + +#: website/static/js/addonHelper.js:46 +msgid "Settings not updated." +msgstr "" + +#: website/static/js/addonNodeConfig.js:39 +#: website/static/js/oauthAddonNodeConfig.js:47 +msgid "Successfully linked \"%1$s\"" +msgstr "" + +#: website/static/js/addonNodeConfig.js:40 +#: website/static/js/oauthAddonNodeConfig.js:48 +msgid " Go to the Files page to view your content." +msgstr "" + +#: website/static/js/addonPermissions.js:21 +#: website/static/js/addonSettings.js:58 +msgid "Remove addon?" +msgstr "" + +#: website/static/js/addonPermissions.js:22 +msgid "Are you sure you want to disconnnect the %1$s account from this project?" +msgstr "" + +#: website/static/js/addonPermissions.js:43 +msgid "An error occurred, the account is still connected to the project. " +msgstr "" + +#: website/static/js/addonPermissions.js:44 +msgid "If the issue persists, please report it to %1$s." +msgstr "" + +#: website/static/js/addonSettings.js:46 +msgid "Error deauthorizing node: " +msgstr "" + +#: website/static/js/addonSettings.js:59 +msgid "Are you sure you want to remove the %1$s authorization from this project?" +msgstr "" + +#: website/static/js/addonSettings.js:100 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of dropbox.com before attempting to connect to a second Dropbox " +"account on the GakuNin RDM. This will clear the credentials stored in " +"your browser." +msgstr "" + +#: website/static/js/addonSettings.js:102 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of bitbucket.org before attempting to connect to a second " +"Bitbucket account on the GakuNin RDM. This will clear the credentials " +"stored in your browser." +msgstr "" + +#: website/static/js/addonSettings.js:104 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of onedrive.live.com before attempting to connect to a second " +"OneDrive account on the GakuNin RDM. This will clear the credentials " +"stored in your browser." +msgstr "" + +#: website/static/js/addonSettings.js:106 +msgid "" +"Add-on successfully authorized. To link this add-on to an GakuNin RDM " +"project, go to the settings page of the project, enable %1$s, and choose " +"content to connect." +msgstr "" + +#: website/static/js/addonSettings.js:109 +msgid "" +"Error while authorizing add-on. Please log in to your %1$s account and " +"grant access to the GakuNin RDM to enable this add-on." +msgstr "" + +#: website/static/js/addonSettings.js:120 +msgid "" +"Are you sure you want to disconnect the %1$s account " +"%2$s? This will revoke access to %1$s for all projects " +"you have authorized." +msgstr "" + +#: website/static/js/alertsManager.js:42 +msgid "Could not dismiss alert. Please refresh page and try again." +msgstr "" + +#: website/static/js/alertsManager.js:43 website/static/js/alertsManager.js:77 +msgid "Error fetching user alerts" +msgstr "" + +#: website/static/js/alertsManager.js:76 +msgid "Could not fetch alerts for this page. Please refresh page and try again." +msgstr "" + +#: website/static/js/apiApplication.js:215 +msgid "Error fetching list of registered applications" +msgstr "" + +#: website/static/js/apiApplication.js:226 +#: website/static/js/apiApplication.js:396 +msgid "Deactivate application?" +msgstr "" + +#: website/static/js/apiApplication.js:234 +#: website/static/js/apiPersonalToken.js:213 +msgid " has been deactivated" +msgstr "" + +#: website/static/js/apiApplication.js:245 +#: website/static/js/apiApplication.js:416 +#: website/static/js/apiPersonalToken.js:224 +#: website/static/js/apiPersonalToken.js:395 +msgid "Deactivate" +msgstr "" + +#: website/static/js/apiApplication.js:295 +#: website/static/js/apiPersonalToken.js:274 +msgid "There are unsaved changes on this page." +msgstr "" + +#: website/static/js/apiApplication.js:309 +msgid "Error fetching application data" +msgstr "" + +#: website/static/js/apiApplication.js:344 +#: website/static/js/apiPersonalToken.js:323 +msgid "Error updating instance" +msgstr "" + +#: website/static/js/apiApplication.js:370 +msgid "Error registering new OAuth2 application" +msgstr "" + +#: website/static/js/apiApplication.js:429 +msgid "Reset client secret?" +msgstr "" + +#: website/static/js/apiApplication.js:447 +msgid "Error resetting instance secret" +msgstr "" + +#: website/static/js/apiApplication.js:459 +msgid "Reset Secret" +msgstr "" + +#: website/static/js/apiApplication.js:473 +#: website/static/js/apiPersonalToken.js:412 website/static/js/profile.js:357 +msgid "Discard changes?" +msgstr "" + +#: website/static/js/apiApplication.js:483 +#: website/static/js/apiPersonalToken.js:422 website/static/js/profile.js:369 +msgid "Discard" +msgstr "" + +#: website/static/js/apiPersonalToken.js:194 +msgid "Error fetching list of registered personal access tokens" +msgstr "" + +#: website/static/js/apiPersonalToken.js:205 +msgid "Deactivate personal access token?" +msgstr "" + +#: website/static/js/apiPersonalToken.js:288 +msgid "Error fetching token data" +msgstr "" + +#: website/static/js/apiPersonalToken.js:349 +msgid "Error registering new OAuth2 personal access token" +msgstr "" + +#: website/static/js/apiPersonalToken.js:375 +msgid "Deactivate token?" +msgstr "" + +#: website/static/js/citationGrid.js:180 +msgid "Copy citation" +msgstr "" + +#: website/static/js/citationGrid.js:190 +msgid "View original document" +msgstr "" + +#: website/static/js/citationGrid.js:202 website/static/js/fangorn.js:2041 +msgid "View on %1$s" +msgstr "" + +#: website/static/js/citationGrid.js:213 +msgid "Download citations" +msgstr "" + +#: website/static/js/citationGrid.js:242 +msgid "Citation" +msgstr "" + +#: website/static/js/citationGrid.js:246 +msgid "Actions" +msgstr "" + +#: website/static/js/citationGrid.js:294 +msgid "Only 200 citations may be displayed" +msgstr "" + +#: website/static/js/citationGrid.js:311 website/static/js/citationWidget.js:44 +msgid "Enter citation style (e.g. \"APA\")" +msgstr "" + +#: website/static/js/citationGrid.js:333 +msgid "Error while selecting citation style: " +msgstr "" + +#: website/static/js/citationGrid.js:412 +msgid "" +"Could not render entry. Please check the contents of your citations " +"for correctness." +msgstr "" + +#: website/static/js/citationList.js:113 +msgid "Your custom citation not updated. Please refresh the page and try " +msgstr "" + +#: website/static/js/citationList.js:114 +msgid "again or contact %1$s" +msgstr "" + +#: website/static/js/citationList.js:114 +#: website/static/js/components/publicNodes.js:192 +#: website/static/js/components/quickFiles.js:123 +#: website/static/js/osfHelpers.js:311 +msgid " if the problem persists." +msgstr "" + +#: website/static/js/citationWidget.js:46 +#: website/static/js/pages/project-dashboard-page.js:170 +#, python-format +msgid "Please enter %s or more characters" +msgstr "" + +#: website/static/js/citationWidget.js:47 website/static/js/pointers.js:30 +msgid "Searching..." +msgstr "" + +#: website/static/js/citationWidget.js:48 +msgid "No matches found." +msgstr "" + +#: website/static/js/citationWidget.js:77 +msgid "Citation render failed" +msgstr "" + +#: website/static/js/citationWidget.js:78 +msgid "The requested citation format generated an error." +msgstr "" + +#: website/static/js/citationWidget.js:81 +msgid "Unexpected error when fetching citation" +msgstr "" + +#: website/static/js/citationsNodeConfig.js:38 +#: website/static/js/citationsNodeConfig.js:42 +msgid "Successfully linked \"%1$s\"." +msgstr "" + +#: website/static/js/citationsNodeConfig.js:38 +msgid " Go to the Overview page to view your citations." +msgstr "" + +#: website/static/js/citationsNodeConfig.js:42 +msgid " Next, choose which folder to link above." +msgstr "" + +#: website/static/js/citationsNodeConfig.js:81 +#: website/static/js/oauthAddonNodeConfig.js:209 +msgid "Could not GET %1$s accounts for user" +msgstr "" + +#: website/static/js/citationsNodeConfig.js:147 +msgid "Choose %1$s Access Token to Import" +msgstr "" + +#: website/static/js/citationsNodeConfig.js:166 +#: website/static/js/citationsNodeConfig.js:184 +#: website/static/js/folderPickerNodeConfig.js:507 +#: website/static/js/oauthAddonNodeConfig.js:153 +#: website/static/js/oauthAddonNodeConfig.js:171 +msgid "Import" +msgstr "" + +#: website/static/js/citationsNodeConfig.js:175 +msgid "Import %1$s access token" +msgstr "" + +#: website/static/js/clipboard.js:27 +msgid "Copied!" +msgstr "" + +#: website/static/js/clipboard.js:32 +msgid "Copy failed!" +msgstr "" + +#: website/static/js/comment.js:55 +msgid "Error getting contributors and group members" +msgstr "" + +#: website/static/js/comment.js:73 +msgid "Spam or advertising" +msgstr "" + +#: website/static/js/comment.js:74 +msgid "Hate speech" +msgstr "" + +#: website/static/js/comment.js:75 +msgid "Violence or harmful behavior" +msgstr "" + +#: website/static/js/comment.js:212 +msgid "Commenting" +msgstr "" + +#: website/static/js/comment.js:212 +msgid "Comment" +msgstr "" + +#: website/static/js/comment.js:232 +msgid "Exceeds character limit. Please reduce to %1$s characters or less." +msgstr "" + +#: website/static/js/comment.js:347 website/static/js/comment.js:555 +msgid "Please enter a comment" +msgstr "" + +#: website/static/js/comment.js:393 website/static/js/comment.js:588 +msgid "Could not submit comment" +msgstr "" + +#: website/static/js/comment.js:394 +msgid "Error creating comment" +msgstr "" + +#: website/static/js/comment.js:589 +msgid "Error editing comment" +msgstr "" + +#: website/static/js/comment.js:634 +msgid "Could not report abuse." +msgstr "" + +#: website/static/js/comment.js:635 +msgid "Error reporting abuse" +msgstr "" + +#: website/static/js/comment.js:664 +msgid "Error deleting comment" +msgstr "" + +#: website/static/js/comment.js:702 +msgid "Error undeleting comment" +msgstr "" + +#: website/static/js/comment.js:727 +msgid "Error unreporting comment" +msgstr "" + +#: website/static/js/comment.js:807 +msgid "Your comments have unsaved changes. Are you sure " +msgstr "" + +#: website/static/js/comment.js:808 +msgid "you want to leave this page?" +msgstr "" + +#: website/static/js/comment.js:826 +msgid "Could not update comment timestamp" +msgstr "" + +#: website/static/js/commentpane.js:31 +msgid "Option `toggleWidth` must be greater than or equal to " +msgstr "" + +#: website/static/js/commentpane.js:32 +msgid "option `maxWidthProp`." +msgstr "" + +#: website/static/js/conference.js:25 +msgid "Author" +msgstr "" + +#: website/static/js/conference.js:37 +msgid "Date Created" +msgstr "" + +#: website/static/js/conference.js:43 website/static/js/fangorn.js:1683 +msgid "Downloads" +msgstr "" + +#: website/static/js/contribAdder.js:26 +msgid " project in common" +msgstr "" + +#: website/static/js/contribAdder.js:28 +msgid "Yourself" +msgstr "" + +#: website/static/js/contribAdder.js:30 +msgid " projects in common" +msgstr "" + +#: website/static/js/contribAdder.js:82 +msgid "Add Contributors" +msgstr "" + +#: website/static/js/contribAdder.js:83 +msgid "Select Components" +msgstr "" + +#: website/static/js/contribAdder.js:85 +msgid "Invite new contributor by e-mail" +msgstr "" + +#: website/static/js/contribAdder.js:86 +msgid "Add Unregistered Contributor" +msgstr "" + +#: website/static/js/contribAdder.js:331 +msgid "Full Name is required." +msgstr "" + +#: website/static/js/contribAdder.js:334 +msgid "Not a valid email address." +msgstr "" + +#: website/static/js/contribAdder.js:341 +msgid "%1$s is already in queue." +msgstr "" + +#: website/static/js/contribAdder.js:460 +msgid "There was a problem trying to add contributors%1$s." +msgstr "" + +#: website/static/js/contribAdder.js:461 +msgid "Could not add contributors" +msgstr "" + +#: website/static/js/contribAdder.js:462 +#: website/static/js/contribManager.js:139 +msgid "Error adding contributors" +msgstr "" + +#: website/static/js/contribAdder.js:532 +#: website/static/js/institutionProjectSettings.js:254 +#: website/static/js/nodesDelete.js:194 website/static/js/nodesPrivacy.js:207 +msgid "Unable to retrieve project settings" +msgstr "" + +#: website/static/js/contribAdder.js:533 +#: website/static/js/institutionProjectSettings.js:255 +#: website/static/js/nodesDelete.js:195 website/static/js/nodesPrivacy.js:208 +msgid "Could not GET project settings." +msgstr "" + +#: website/static/js/contribManager.js:137 +msgid "There was a problem trying to add the contributor. " +msgstr "" + +#: website/static/js/contribManager.js:138 +msgid "Could not add contributor" +msgstr "" + +#: website/static/js/contribManager.js:300 +msgid "Must have at least one registered admin contributor" +msgstr "" + +#: website/static/js/contribManager.js:308 +msgid "Must have at least one bibliographic contributor" +msgstr "" + +#: website/static/js/contribManager.js:364 +msgid "Your contributor list has unsaved changes. Please " +msgstr "" + +#: website/static/js/contribManager.js:365 +msgid "save or cancel your changes before adding " +msgstr "" + +#: website/static/js/contribManager.js:366 +msgid "contributors." +msgstr "" + +#: website/static/js/contribManager.js:375 +msgid "There are unsaved changes to your contributor settings" +msgstr "" + +#: website/static/js/contribManager.js:404 +msgid "Save changes?" +msgstr "" + +#: website/static/js/contribManager.js:405 +msgid "Are you sure you want to save these changes?" +msgstr "" + +#: website/static/js/contribManager.js:421 +msgid "Submission failed: " +msgstr "" + +#: website/static/js/contribManager.js:429 +#: website/static/js/filepage/editor.js:180 +msgid "Save" +msgstr "" + +#: website/static/js/contribRemover.js:56 +#: website/static/js/contribRemover.js:57 +#: website/static/js/contribRemover.js:58 +msgid "Remove Contributor" +msgstr "" + +#: website/static/js/contribRemover.js:208 +#: website/static/js/contribRemover.js:209 +msgid "Unable to retrieve projects and components" +msgstr "" + +#: website/static/js/contribRemover.js:232 +msgid "Unable to delete Contributor" +msgstr "" + +#: website/static/js/contribRemover.js:233 +msgid "Could not DELETE Contributor." +msgstr "" + +#: website/static/js/fangorn.js:38 +msgid "Upload pending..." +msgstr "" + +#: website/static/js/fangorn.js:41 +msgid "Copying " +msgstr "" + +#: website/static/js/fangorn.js:44 +msgid "Deleting " +msgstr "" + +#: website/static/js/fangorn.js:47 +msgid "Moving " +msgstr "" + +#: website/static/js/fangorn.js:50 +msgid "Renaming " +msgstr "" + +#: website/static/js/fangorn.js:448 +msgid "Not allowed: Private folder" +msgstr "" + +#: website/static/js/fangorn.js:492 website/static/js/fangorn.js:522 +msgid "You cannot replace the Wiki images folder" +msgstr "" + +#: website/static/js/fangorn.js:497 website/static/js/fangorn.js:530 +msgid "An item named \"%1$s\" already exists in this location." +msgstr "" + +#: website/static/js/fangorn.js:499 website/static/js/fangorn.js:508 +#: website/static/js/fangorn.js:532 +msgid "Keep Both" +msgstr "" + +#: website/static/js/fangorn.js:499 website/static/js/fangorn.js:532 +msgid " will retain both files (and their version histories) in this location." +msgstr "" + +#: website/static/js/fangorn.js:501 website/static/js/fangorn.js:509 +#: website/static/js/fangorn.js:534 +msgid "Replace" +msgstr "" + +#: website/static/js/fangorn.js:501 website/static/js/fangorn.js:534 +msgid " will overwrite the existing file in this location. " +msgstr "" + +#: website/static/js/fangorn.js:502 website/static/js/fangorn.js:535 +msgid "You will lose previous versions of the overwritten file. " +msgstr "" + +#: website/static/js/fangorn.js:503 website/static/js/fangorn.js:536 +msgid "You will keep previous versions of the moved file." +msgstr "" + +#: website/static/js/fangorn.js:504 +msgid "\"Skip\" will skip the current file." +msgstr "" + +#: website/static/js/fangorn.js:505 +msgid "\"Stop\" will only move files with no conflicts." +msgstr "" + +#: website/static/js/fangorn.js:510 +msgid "Skip" +msgstr "" + +#: website/static/js/fangorn.js:511 +msgid "Stop" +msgstr "" + +#: website/static/js/fangorn.js:513 +#, python-format +msgid "Replace \"%s\"?" +msgstr "" + +#: website/static/js/fangorn.js:537 +msgid " will cancel the move." +msgstr "" + +#: website/static/js/fangorn.js:546 +msgid "Replace \"%1$s\"?" +msgstr "" + +#: website/static/js/fangorn.js:576 +msgid "%1$s conflicts left to resolve." +msgid_plural "%1$s conflict left to resolve." +msgstr[0] "" + +#: website/static/js/fangorn.js:655 +msgid "%1$s \"%2$s\" to \"%3$s\" is taking a bit longer than expected." +msgstr "" + +#: website/static/js/fangorn.js:656 +msgid "We'll send you an email when it has finished." +msgstr "" + +#: website/static/js/fangorn.js:657 +msgid "" +"In the mean time you can leave this page; your %1$s will still be " +"completed." +msgstr "" + +#: website/static/js/fangorn.js:662 +msgid "Operation Information" +msgstr "" + +#: website/static/js/fangorn.js:668 +msgid "Successfully %1$s." +msgstr "" + +#: website/static/js/fangorn.js:715 +msgid "Please refresh the page or contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/fangorn.js:720 +msgid "Failed to move or copy file" +msgstr "" + +#: website/static/js/fangorn.js:998 +msgid "Could not upload file. The file may be invalid " +msgstr "" + +#: website/static/js/fangorn.js:999 +msgid "or the file folder has been deleted." +msgstr "" + +#: website/static/js/fangorn.js:1007 website/static/js/fangorn.js:1012 +msgid "Cannot upload folders." +msgstr "" + +#: website/static/js/fangorn.js:1014 +msgid "Cannot upload file due to insufficient storage." +msgstr "" + +#: website/static/js/fangorn.js:1019 +msgid "Could not upload file. Possible reasons:
        " +msgstr "" + +#: website/static/js/fangorn.js:1020 +msgid "1. Cannot upload folders.
        2. " +msgstr "" + +#: website/static/js/fangorn.js:1022 +msgid "Unable to reach the provider, please try again later. " +msgstr "" + +#: website/static/js/fangorn.js:1023 +msgid "If the problem persists, please contact %1$s." +msgstr "" + +#: website/static/js/fangorn.js:1111 +msgid "Please enter a folder name." +msgstr "" + +#: website/static/js/fangorn.js:1115 +msgid "Folder name contains illegal characters." +msgstr "" + +#: website/static/js/fangorn.js:1138 +msgid "New folder created!" +msgstr "" + +#: website/static/js/fangorn.js:1147 +msgid "Folder creation failed." +msgstr "" + +#: website/static/js/fangorn.js:1165 +msgid " Deleting..." +msgstr "" + +#: website/static/js/fangorn.js:1187 +msgid "Delete failed." +msgstr "" + +#: website/static/js/fangorn.js:1202 +msgid "" +"This folder and all of its contents will be deleted. This folder is " +"linked to " +msgstr "" + +#: website/static/js/fangorn.js:1203 +msgid "your wiki(s). Deleting it will remove images embedded in your wiki(s). " +msgstr "" + +#: website/static/js/fangorn.js:1204 website/static/js/fangorn.js:1232 +#: website/static/js/fangorn.js:1255 website/static/js/pages/base-page.js:132 +msgid "This action is irreversible." +msgstr "" + +#: website/static/js/fangorn.js:1207 +msgid "" +"This folder and ALL its contents will be deleted. This action is " +"irreversible." +msgstr "" + +#: website/static/js/fangorn.js:1213 website/static/js/fangorn.js:1236 +#: website/static/js/fangorn.js:1996 website/static/js/fangorn.js:2032 +#: website/static/js/filepage/index.js:209 +#: website/static/js/filepage/index.js:522 website/static/js/myProjects.js:1637 +msgid "Delete" +msgstr "" + +#: website/static/js/fangorn.js:1215 website/static/js/fangorn.js:1240 +msgid "Delete \"%1$s\"?" +msgstr "" + +#: website/static/js/fangorn.js:1217 +msgid "You don't have permission to delete this file." +msgstr "" + +#: website/static/js/fangorn.js:1225 +msgid "This file may be linked to your wiki(s). Deleting it will remove the" +msgstr "" + +#: website/static/js/fangorn.js:1226 +msgid " image embedded in your wiki(s). " +msgstr "" + +#: website/static/js/fangorn.js:1266 +msgid "" +"Some of the selected items are folders. This will delete the folder(s) " +"and ALL of their content." +msgstr "" + +#: website/static/js/fangorn.js:1280 +msgid " may be linked to" +msgstr "" + +#: website/static/js/fangorn.js:1281 +msgid " your wiki(s). Deleting them will remove images embedded in your wiki(s). " +msgstr "" + +#: website/static/js/fangorn.js:1289 +msgid "Delete All" +msgstr "" + +#: website/static/js/fangorn.js:1293 +msgid "" +"Some of these files can't be deleted but you can delete the ones " +"highlighted with green. This action is irreversible." +msgstr "" + +#: website/static/js/fangorn.js:1308 +msgid "Delete Some" +msgstr "" + +#: website/static/js/fangorn.js:1311 +msgid "Delete multiple files?" +msgstr "" + +#: website/static/js/fangorn.js:1337 +msgid "" +"Unable to check out file. This is most likely due to the file being " +"already checked-out" +msgstr "" + +#: website/static/js/fangorn.js:1338 +msgid " by another user." +msgstr "" + +#: website/static/js/fangorn.js:1670 website/static/js/fileViewTreebeard.js:63 +#: website/static/js/filesWidget.js:34 website/static/js/meetings.js:18 +#: website/static/js/pages/project-dashboard-page.js:549 +#: website/static/js/project-organizer.js:192 +#: website/static/js/project-organizer.js:208 website/static/js/wikiMenu.js:58 +msgid "Name" +msgstr "" + +#: website/static/js/fangorn.js:1675 +msgid "Size" +msgstr "" + +#: website/static/js/fangorn.js:1679 +msgid "Version" +msgstr "" + +#: website/static/js/fangorn.js:1687 +#: website/static/js/pages/project-dashboard-page.js:555 +#: website/static/js/project-organizer.js:201 +msgid "Modified" +msgstr "" + +#: website/static/js/fangorn.js:1761 +msgid "Unable to retrieve components." +msgstr "" + +#: website/static/js/fangorn.js:1763 +msgid "Unable to retrieve components for node %1$s" +msgstr "" + +#: website/static/js/fangorn.js:1845 +msgid "You cannot rename your Wiki images folder." +msgstr "" + +#: website/static/js/fangorn.js:1953 +msgid "Upload" +msgstr "" + +#: website/static/js/fangorn.js:1960 +msgid "Create Folder" +msgstr "" + +#: website/static/js/fangorn.js:1967 +msgid "Delete Folder" +msgstr "" + +#: website/static/js/fangorn.js:1976 website/static/js/filepage/index.js:525 +#: website/static/js/filepage/revisions.js:111 +msgid "Download" +msgstr "" + +#: website/static/js/fangorn.js:1986 website/static/js/filepage/index.js:547 +msgid "View" +msgstr "" + +#: website/static/js/fangorn.js:2002 website/static/js/filepage/index.js:221 +msgid "This would mean " +msgstr "" + +#: website/static/js/fangorn.js:2003 website/static/js/filepage/index.js:222 +msgid "" +"other contributors cannot edit, delete or upload new versions of this " +"file " +msgstr "" + +#: website/static/js/fangorn.js:2004 +msgid "as long as it is checked-out. You can check it back in at anytime." +msgstr "" + +#: website/static/js/fangorn.js:2009 website/static/js/fangorn.js:2014 +#: website/static/js/filepage/index.js:248 +msgid "Check out file" +msgstr "" + +#: website/static/js/fangorn.js:2010 +msgid "Confirm file check-out?" +msgstr "" + +#: website/static/js/fangorn.js:2023 +msgid "Check in file" +msgstr "" + +#: website/static/js/fangorn.js:2051 +msgid "Download as zip" +msgstr "" + +#: website/static/js/fangorn.js:2062 website/static/js/myProjects.js:1613 +msgid "Rename" +msgstr "" + +#: website/static/js/fangorn.js:2144 +msgid "New folder name" +msgstr "" + +#: website/static/js/fangorn.js:2172 +msgid "Enter name" +msgstr "" + +#: website/static/js/fangorn.js:2209 +msgid "Cancel Pending Uploads" +msgstr "" + +#: website/static/js/fangorn.js:2233 +msgid "Delete Multiple" +msgstr "" + +#: website/static/js/fangorn.js:2244 website/static/js/fangorn.js:2955 +msgid "Filter" +msgstr "" + +#: website/static/js/fangorn.js:2249 +msgid "Select rows:" +msgstr "" + +#: website/static/js/fangorn.js:2249 +msgid "" +" Click on a row (outside the add-on, file, or folder name) to show " +"further actions in the toolbar. Use Command or Shift keys to select " +"multiple files." +msgstr "" + +#: website/static/js/fangorn.js:2250 +msgid "Open files:" +msgstr "" + +#: website/static/js/fangorn.js:2250 +msgid " Click a file name to go to view the file in the GakuNin RDM." +msgstr "" + +#: website/static/js/fangorn.js:2251 +msgid "Open files in new tab:" +msgstr "" + +#: website/static/js/fangorn.js:2251 +msgid "" +" Press Command (Ctrl in Windows) and click a file name to open it in a " +"new tab." +msgstr "" + +#: website/static/js/fangorn.js:2252 +msgid "Download as zip:" +msgstr "" + +#: website/static/js/fangorn.js:2252 +msgid "" +" Click on the row of an add-on or folder and click the Download as Zip " +"button in the toolbar." +msgstr "" + +#: website/static/js/fangorn.js:2252 +msgid " Not available for all storage add-ons." +msgstr "" + +#: website/static/js/fangorn.js:2253 +msgid "Copy files:" +msgstr "" + +#: website/static/js/fangorn.js:2253 +msgid "" +" Press Option (Alt in Windows) while dragging a file to a new folder or " +"component." +msgstr "" + +#: website/static/js/fangorn.js:2253 +msgid " Only for contributors with write access." +msgstr "" + +#: website/static/js/fangorn.js:2259 +msgid "How to Use the File Browser" +msgstr "" + +#: website/static/js/fangorn.js:2323 +msgid "Please wait for current action to complete" +msgstr "" + +#: website/static/js/fangorn.js:2504 +msgid "Upload Status" +msgstr "" + +#: website/static/js/fangorn.js:2504 +msgid " files succeeded." +msgstr "" + +#: website/static/js/fangorn.js:2605 +msgid "Done" +msgstr "" + +#: website/static/js/fangorn.js:2607 +msgid "Move Status" +msgstr "" + +#: website/static/js/fangorn.js:2609 +msgid " files successfully moved." +msgstr "" + +#: website/static/js/fangorn.js:2610 +msgid " Skipped %1$s/%2$s files." +msgstr "" + +#: website/static/js/fangorn.js:2880 +msgid "You have pending uploads, if you leave this page they may not complete." +msgstr "" + +#: website/static/js/fangorn.js:2883 +msgid "" +"You have pending file operations, if you leave this page they may not " +"complete." +msgstr "" + +#: website/static/js/fangorn.js:2917 +msgid "This file is too large (%1$s). Max file size is %2$s." +msgstr "" + +#: website/static/js/fangorn.js:2933 +msgid "Not enough quota to upload the file." +msgstr "" + +#: website/static/js/fangorn.js:2940 +msgid "Quota usage alert" +msgstr "" + +#: website/static/js/fangorn.js:2941 +#, python-format +msgid "You have used more than %1$s% of your quota." +msgstr "" + +#: website/static/js/fileViewTreebeard.js:120 +msgid "Uploading %1$s..." +msgstr "" + +#: website/static/js/filesWidget.js:77 +msgid "Could not GET files" +msgstr "" + +#: website/static/js/filesWidget.js:92 +msgid "Sorry, we could not load files right now. " +msgstr "" + +#: website/static/js/firebase-messaging-sw.js:11 +msgid "RDM Announcements" +msgstr "" + +#: website/static/js/firebase-messaging-sw.js:13 +msgid "Background Message body." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:108 +msgid "" +"Could not retrieve %1$s settings at this time. The credentials associated" +" with this %1$s account may no longer be valid." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:109 +msgid "" +" Try disconnecting and reconnecting the %1$s account on your account settings page." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:112 +msgid "" +"Could not retrieve %1$s settings at this time. The %1$s addon credentials" +" may no longer be valid." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:113 +msgid " Contact %1$s to verify." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:116 +msgid "" +"Could not retrieve %1$s settings at this time. Please refresh the page. " +"If the problem persists, email %2$s." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:119 +msgid "" +"Could not retrieve %1$s account list at this time. Please refresh the " +"page. If the problem persists, email %2$s." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:122 +msgid "Disconnected %1$s." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:125 +msgid "" +"Could not disconnect %1$s account because of an error. Please try again " +"later." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:128 +msgid "Successfully connected a %1$s account" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:131 +msgid "" +"Error while authorizing addon. Please log in to your %1$s account and " +"grant access to the GakuNin RDM to enable this addon." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:139 +msgid "Could not change %1$s settings. Please try again later." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:142 +msgid "Are you sure you want to remove this %1$s account?" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:145 +msgid "Are you sure you want to link your %1$s account with this project?" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:148 +msgid "Successfully imported %1$s account from profile." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:151 +msgid "Error occurred while importing %1$s account." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:154 +msgid "Error occurred while importing %1$s group libraries." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:157 +msgid "Could not connect to %1$s at this time. Please try again later." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:321 +msgid "Could not GET %1$s settings" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:349 +#: website/static/js/folderPickerNodeConfig.js:382 +msgid "Failed to update %1$s settings." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:431 +msgid "Failed to import %1$s access token." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:443 +msgid "Failed to import %1$s group libraries." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:497 +#: website/static/js/oauthAddonNodeConfig.js:162 +msgid "Import %1$s Account?" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:536 +msgid "Could not deauthorize %1$s account from node" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:552 +msgid "Disconnect %1$s Account?" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:645 +#: website/static/js/folderPickerNodeConfig.js:656 +msgid "Could not GET get %1$s contents." +msgstr "" + +#: website/static/js/folderpicker.js:101 +msgid "Folders" +msgstr "" + +#: website/static/js/folderpicker.js:105 +msgid "Select" +msgstr "" + +#: website/static/js/institutionNodes.js:26 +msgid "Failed to load Institution's nodes" +msgstr "" + +#: website/static/js/institutionProjectSettings.js:47 +#: website/static/js/institutionProjectSettings.js:127 +msgid "Add institution" +msgstr "" + +#: website/static/js/institutionProjectSettings.js:47 +#: website/static/js/institutionProjectSettings.js:127 +msgid "Remove institution" +msgstr "" + +#: website/static/js/institutionProjectSettings.js:59 +msgid "" +"Add %1$s to %2$s or to %3$s and every component in " +"it?

        " +msgstr "" + +#: website/static/js/institutionProjectSettings.js:60 +msgid "Add to %1$s." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:61 +msgid "Add to %1$s and every component for which you have permission." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:64 +msgid "" +"Remove %1$s from %2$s or from %3$s and every " +"component in it?

        " +msgstr "" + +#: website/static/js/institutionProjectSettings.js:65 +msgid "Remove from %1$s." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:66 +msgid "Remove from %1$s and every component for which you have permission." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:69 +#: website/static/js/institutionProjectSettings.js:86 +msgid "Warning, you are not affiliated with %1$s." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:70 +#: website/static/js/institutionProjectSettings.js:87 +msgid " If you remove it from your project, you cannot add it back.
        " +msgstr "" + +#: website/static/js/institutionProjectSettings.js:85 +msgid "Remove %1$s from %2$s." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:157 +msgid "Updating affiliation... this may take a minute." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:202 +msgid "" +"Unable to modify the institution on this node. Please try again. If the " +"problem persists, email %1$s" +msgstr "" + +#: website/static/js/institutionProjectSettings.js:203 +msgid "Unable to modify this institution!" +msgstr "" + +#: website/static/js/js_messages.js:3 +msgid "Bookmarks" +msgstr "" + +#: website/static/js/js_messages.js:5 +msgid "Edit" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Analysis" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Communication" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Data" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Hypothesis" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Instrumentation" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Methods and Measures" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Procedure" +msgstr "" + +#: website/static/js/js_messages.js:7 +#: website/static/js/projectSettingsTreebeardBase.js:90 +msgid "Project" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Software" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Other" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "analysis" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "communication" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "data" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "hypothesis" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "instrumentation" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "methods and measures" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "procedure" +msgstr "" + +#: website/static/js/js_messages.js:9 website/static/js/nodeControl.js:114 +#: website/static/js/nodeSelectTreebeard.js:87 +#: website/static/js/nodesDeleteTreebeard.js:62 +#: website/static/js/nodesPrivacySettingsTreebeard.js:62 +msgid "project" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "software" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "other" +msgstr "" + +#: website/static/js/js_messages.js:11 website/static/js/js_messages.js:13 +msgid "Comments added" +msgstr "" + +#: website/static/js/js_messages.js:11 website/static/js/js_messages.js:13 +msgid "Files updated" +msgstr "" + +#: website/static/js/js_messages.js:13 +msgid "Replies to your comments" +msgstr "" + +#: website/static/js/js_messages.js:13 +msgid "Mentions added" +msgstr "" + +#: website/static/js/js_messages.js:13 +msgid "Preprint submissions updated" +msgstr "" + +#: website/static/js/js_messages.js:15 +msgid "No license" +msgstr "" + +#: website/static/js/js_messages.js:17 website/static/js/passwordForms.js:178 +#: website/static/js/passwordForms.js:241 +msgid "This field is required." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a value greater than or equal to {0}." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a value less than or equal to {0}." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter at least {0} characters." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter no more than {0} characters." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please check this value." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "The value must increment by {0}." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a proper email address." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a proper date." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a number." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a digit." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please specify a valid phone number." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Values must equal." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please choose another value." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please make sure the value is unique." +msgstr "" + +#: website/static/js/js_messages.js:19 +msgid "Project Wiki Pages" +msgstr "" + +#: website/static/js/js_messages.js:19 +msgid "Component Wiki Pages" +msgstr "" + +#: website/static/js/js_messages.js:19 +msgid "Home" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Projects" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Components" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Registrations" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Users" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "All Results" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Files" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Institutions" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Preprints" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Groups" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Wiki" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Comments" +msgstr "" + +#: website/static/js/js_messages.js:23 +msgid "Default Notification Settings" +msgstr "" + +#: website/static/js/js_messages.js:23 +msgid "" +"These are default settings for new projects you create or are added to. " +"Modifying these settings will not modify settings on existing projects." +msgstr "" + +#: website/static/js/js_messages.js:23 +msgid "Project Notifications" +msgstr "" + +#: website/static/js/js_messages.js:23 +msgid "" +"These are settings for each of your projects. Modifying these settings " +"will only modify the settings for the selected project." +msgstr "" + +#: website/static/js/js_messages.js:25 +msgid "moved" +msgstr "" + +#: website/static/js/js_messages.js:25 +msgid "renamed" +msgstr "" + +#: website/static/js/js_messages.js:27 +msgid "Skipped" +msgstr "" + +#: website/static/js/js_messages.js:27 +msgid "Moved or replaced old version" +msgstr "" + +#: website/static/js/js_messages.js:27 +msgid "Kept both versions" +msgstr "" + +#: website/static/js/js_messages.js:29 +msgid "admin" +msgstr "" + +#: website/static/js/js_messages.js:29 +msgid "write" +msgstr "" + +#: website/static/js/js_messages.js:29 +msgid "read" +msgstr "" + +#: website/static/js/js_messages.js:31 +msgid "home" +msgstr "" + +#: website/static/js/js_messages.js:33 +msgid "No tokens." +msgstr "" + +#: website/static/js/js_messages.js:33 +msgid "Invalid tokens." +msgstr "" + +#: website/static/js/js_messages.js:35 +msgid "Invalid folder." +msgstr "" + +#: website/static/js/js_messages.js:35 +msgid "Credentials are valid" +msgstr "" + +#: website/static/js/keen.js:114 +msgid "Error sending Keen data to %1$s:<%2$s>" +msgstr "" + +#: website/static/js/keen.js:132 +msgid "Error sending Keen data for multiple events: <%1$s>" +msgstr "" + +#: website/static/js/keen.js:141 +msgid "Error sending Keen data to %1$s." +msgstr "" + +#: website/static/js/keen.js:153 +msgid "Cannot instantiate another KeenTracker instance." +msgstr "" + +#: website/static/js/koHelpers.js:129 +msgid "End date must be greater than or equal to the start date." +msgstr "" + +#: website/static/js/koHelpers.js:147 +msgid "Date must be greater than or equal to 1900." +msgstr "" + +#: website/static/js/koHelpers.js:169 +msgid "Please enter a date prior to the current date." +msgstr "" + +#: website/static/js/koHelpers.js:175 +msgid "Please enter a valid year." +msgstr "" + +#: website/static/js/koHelpers.js:190 +msgid "Please enter a valid URL." +msgstr "" + +#: website/static/js/koHelpers.js:197 +msgid "The field does not match the required input." +msgstr "" + +#: website/static/js/licensePicker.js:20 website/static/js/profile.js:128 +#: website/static/js/profile.js:132 +msgid "Year" +msgstr "" + +#: website/static/js/licensePicker.js:21 +msgid "Copyright Holders" +msgstr "" + +#: website/static/js/licensePicker.js:26 +msgid "License:" +msgstr "" + +#: website/static/js/licensePicker.js:27 +msgid "Choose a license:" +msgstr "" + +#: website/static/js/licensePicker.js:28 +msgid ">Save<" +msgstr "" + +#: website/static/js/licensePicker.js:68 +msgid "Add a license" +msgstr "" + +#: website/static/js/licensePicker.js:104 +msgid "Please specify a valid year." +msgstr "" + +#: website/static/js/licensePicker.js:108 +msgid "Future years are not allowed." +msgstr "" + +#: website/static/js/licensePicker.js:190 +msgid "License updated successfully." +msgstr "" + +#: website/static/js/licensePicker.js:195 +msgid "There was a problem updating your license. Please try again." +msgstr "" + +#: website/static/js/licensePicker.js:239 +msgid "Your Own License" +msgstr "" + +#: website/static/js/licensePicker.js:240 +msgid "" +"You have opted to use your own license. Please upload a license file " +"named \"license.txt\" into the GakuNin RDM Storage of this project." +msgstr "" + +#: website/static/js/licensePicker.js:247 +msgid "Add license" +msgstr "" + +#: website/static/js/licenses.js:27 +msgid "Content:" +msgstr "" + +#: website/static/js/licenses.js:31 +msgid "Code - Permissive:" +msgstr "" + +#: website/static/js/licenses.js:35 +msgid "Code - Copyleft:" +msgstr "" + +#: website/static/js/licenses.js:39 +msgid "Code - Other:" +msgstr "" + +#: website/static/js/logActionsList_extract.js:3 +#: website/static/js/logActionsList_extract.js:70 +msgid "${user} created ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:4 +msgid "${user} registered ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:5 +msgid "${node} registered" +msgstr "" + +#: website/static/js/logActionsList_extract.js:6 +msgid "" +"${user} submitted for review to the Preregistration Challenge a " +"registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:7 +msgid "${user} deleted ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:8 +msgid "${user} created ${node} based on ${template}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:9 +msgid "${user} created a link to ${pointer_category} ${pointer}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:10 +msgid "${user} forked a link to ${pointer_category} ${pointer}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:11 +msgid "${user} removed a link to ${pointer_category} ${pointer}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:12 +msgid "${user} added ${group} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:13 +msgid "${user} removed ${group} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:14 +msgid "${user} changed ${group} permissions to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:15 +msgid "${user} made ${node} public" +msgstr "" + +#: website/static/js/logActionsList_extract.js:16 +msgid "${node} made public" +msgstr "" + +#: website/static/js/logActionsList_extract.js:17 +msgid "${user} made ${node} private" +msgstr "" + +#: website/static/js/logActionsList_extract.js:18 +msgid "${user} added tag ${tag} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:19 +msgid "${user} removed tag ${tag} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:20 +msgid "${user} changed the title from ${title_original} to ${title_new}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:21 +msgid "${user} edited description of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:22 +msgid "${user} changed the ${updated_fields} for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:23 +msgid "${user} created external identifier(s) ${identifiers} on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:24 +msgid "${user} created a custom citation for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:25 +msgid "${user} edited a custom citation for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:26 +msgid "${user} removed a custom citation for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:27 +msgid "${user} added ${contributors} as contributor(s) to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:28 +msgid "${user} removed ${contributors} as contributor(s) from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:29 +msgid "${user} reordered contributors for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:30 +msgid "${user} changed permissions for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:31 +msgid "" +"${user} made non-bibliographic contributor ${contributors} a " +"bibliographic contributor on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:32 +msgid "" +"${user} made bibliographic contributor ${contributors} a non-" +"bibliographic contributor on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:33 +msgid "${user} updated wiki page ${page} to version ${version} of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:34 +msgid "${user} deleted wiki page ${page} of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:35 +msgid "${user} renamed wiki page ${old_page} to ${page} of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:36 +msgid "${user} made the wiki of ${node} publicly editable" +msgstr "" + +#: website/static/js/logActionsList_extract.js:37 +msgid "${user} made the wiki of ${node} privately editable" +msgstr "" + +#: website/static/js/logActionsList_extract.js:38 +msgid "${user} added addon ${addon} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:39 +msgid "${user} removed addon ${addon} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:40 +msgid "${user} moved ${source} to ${destination} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:41 +msgid "${user} copied ${source} to ${destination} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:42 +msgid "${user} renamed ${source} to ${destination} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:43 +msgid "${user} created a folder in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:44 +msgid "${user} added file ${path} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:45 +msgid "${user} updated file in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:46 +msgid "${user} removed ${path_type} ${path} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:47 +msgid "${user} restored file ${path} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:48 +msgid "${user} updated the file metadata for ${path}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:49 +msgid "${user} checked out ${kind} ${path} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:50 +msgid "${user} checked in ${kind} ${path} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:51 +msgid "${user} added a comment ${comment_location} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:52 +msgid "${user} deleted a comment ${comment_location} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:53 +msgid "${user} restored a comment ${comment_location} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:54 +msgid "${user} updated a comment ${comment_location} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:55 +msgid "${user} initiated an embargoed registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:56 +msgid "${user} approved embargoed registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:57 +msgid "Embargo of registration of ${node} approved" +msgstr "" + +#: website/static/js/logActionsList_extract.js:58 +msgid "${user} cancelled embargoed registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:59 +msgid "${user} completed embargo of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:60 +msgid "Embargo for ${node} completed" +msgstr "" + +#: website/static/js/logActionsList_extract.js:61 +msgid "Embargo for ${node} ended" +msgstr "" + +#: website/static/js/logActionsList_extract.js:62 +msgid "${user} initiated withdrawal of registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:63 +msgid "A withdrawal of registration of ${node} is proposed" +msgstr "" + +#: website/static/js/logActionsList_extract.js:64 +msgid "${user} approved withdrawal of registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:65 +msgid "${user} cancelled withdrawal of registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:66 +msgid "${user} initiated registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:67 +msgid "${user} approved registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:68 +msgid "Registration of ${node} approved" +msgstr "" + +#: website/static/js/logActionsList_extract.js:69 +msgid "${user} cancelled registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:71 +msgid "${user} created fork from ${forked_from}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:72 +msgid "${user} removed ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:73 +msgid "${user} enabled access requests for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:74 +msgid "${user} disabled access requests for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:75 +msgid "${user} updated the license of ${node} ${license}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:76 +msgid "${user} added tag ${tag} to ${path} in ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:77 +msgid "${user} removed tag ${tag} from ${path} in ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:78 +msgid "${user} added file ${path} to ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:79 +msgid "${user} created folder ${path} in ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:80 +msgid "${user} updated file ${path} in ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:81 +msgid "${user} removed ${path_type} ${path} from ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:82 +msgid "${user} added ${institution} affiliation to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:83 +msgid "${user} removed ${institution} affiliation from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:84 +msgid "${user} made ${node} a ${preprint} on ${preprint_provider} Preprints" +msgstr "" + +#: website/static/js/logActionsList_extract.js:85 +msgid "" +"${user} updated the primary file of this ${preprint} on " +"${preprint_provider} Preprints" +msgstr "" + +#: website/static/js/logActionsList_extract.js:86 +msgid "" +"${user} updated the license of this ${preprint} on ${preprint_provider} " +"Preprints ${license}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:87 +msgid "${user} updated the subjects on ${node} to ${subjects}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:88 +msgid "${user} created ${anonymous_link} view-only link to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:89 +msgid "${user} removed ${anonymous_link} view-only link to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:90 +msgid "${user} verified timestamp" +msgstr "" + +#: website/static/js/logActionsList_extract.js:91 +msgid "${user} requested trusted timestamp" +msgstr "" + +#: website/static/js/logActionsList_extract.js:92 +msgid "${user} requested trusted timestamp file ${path}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:93 +msgid "" +"${user} downloaded a file of timestamp errors as a " +"${timestamp_errors_file_format}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:94 +msgid "" +"[MAPCORE_SYNC:ERROR] ${user} cannot create a new mAP group for GRDM " +"project <${node}> (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:95 +msgid "" +"[MAPCORE_SYNC:ERROR] mAP group for GRDM project <${node}> cannot be " +"updated (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:96 +msgid "" +"[MAPCORE_SYNC:ERROR] GRDM project <${node}> cannot be updated with mAP " +"group (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:97 +msgid "" +"[MAPCORE_SYNC:NOTICE] Unknown (unregistered in GRDM) users belong to mAP " +"group <${node}> (ignored) (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:98 +msgid "${user} linked the Azure Blob Storage container ${bucket} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:99 +msgid "${user} unselected the Azure Blob Storage container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:100 +msgid "" +"${user} added file ${path} to Azure Blob Storage container ${bucket} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:101 +msgid "" +"${user} removed ${path} in Azure Blob Storage container ${bucket} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:102 +msgid "" +"${user} updated file ${path} in Azure Blob Storage container ${bucket} in" +" ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:103 +msgid "" +"${user} created folder ${path} in Azure Blob Storage container ${bucket} " +"in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:104 +msgid "${user} authorized the Azure Blob Storage addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:105 +msgid "${user} deauthorized the Azure Blob Storage addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:106 +msgid "Azure Blob Storage addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:107 +msgid "${user} added file ${path} to Bitbucket repo ${bitbucket_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:108 +msgid "" +"${user} removed ${path_type} ${path} in Bitbucket repo ${bitbucket_repo} " +"in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:109 +msgid "" +"${user} updated file ${path} in Bitbucket repo ${bitbucket_repo} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:110 +msgid "" +"${user} created folder ${path} in Bitbucket repo ${bitbucket_repo} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:111 +msgid "${user} authorized the Bitbucket addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:112 +msgid "${user} deauthorized the Bitbucket addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:113 +msgid "Bitbucket addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:114 +msgid "${user} linked Bitbucket repo ${bitbucket_repo} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:115 +msgid "${user} added file ${path} to Box in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:116 +msgid "${user} removed ${path_type} ${path} from Box in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:117 +msgid "${user} updated file ${path} in Box in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:118 +msgid "${user} created folder ${path} in Box in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:119 +msgid "${user} linked Box folder ${box_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:120 +msgid "${user} authorized the Box addon in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:121 +msgid "${user} deauthorized the Box addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:122 +msgid "Box addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:123 +msgid "${user} added a citation ${citation} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:124 +msgid "${user} updated a citation ${citation} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:125 +msgid "${user} removed a citation ${citation} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:126 +msgid "${user} added file ${filename} to Dataverse dataset ${dataset} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:127 +msgid "" +"${user} removed file ${filename} from Dataverse dataset ${dataset} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:128 +msgid "${user} linked Dataverse dataset ${dataset} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:129 +msgid "${user} linked Dataverse dataset ${study} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:130 +msgid "${user} published a new version of Dataverse dataset ${dataset} on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:131 +msgid "${user} published a new version of Dataverse dataset ${study} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:132 +msgid "${user} authorized the Dataverse addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:133 +msgid "${user} deauthorized the Dataverse addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:134 +msgid "Dataverse addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:135 +msgid "${user} added file ${path} to Dropbox in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:136 +msgid "${user} removed ${path_type} ${path} from Dropbox in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:137 +msgid "${user} updated file ${path} in Dropbox in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:138 +msgid "${user} created folder ${path} in Dropbox in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:139 +msgid "${user} linked Dropbox folder ${dropbox_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:140 +msgid "${user} authorized the Dropbox addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:141 +msgid "${user} deauthorized the Dropbox addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:142 +msgid "Dropbox addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:143 +msgid "${user} added file ${path} to Dropbox Business in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:144 +msgid "${user} removed ${path_type} ${path} from Dropbox Business in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:145 +msgid "${user} updated file ${path} in Dropbox Business in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:146 +msgid "${user} created folder ${path} in Dropbox Business in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:147 +msgid "" +"${user} linked Dropbox Business folder ${dropboxbusiness_folder} to " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:148 +msgid "${user} authorized the Dropbox Business addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:149 +msgid "${user} deauthorized the Dropbox Business addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:150 +msgid "Dropbox Business addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:151 +msgid "${user} linked figshare ${folder} ${folder_name} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:152 +msgid "${user} unlinked content from figshare in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:153 +msgid "${user} added file ${path} to figshare in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:154 +msgid "${user} removed ${path_type} ${path} from figshare in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:155 +msgid "${user} created folder ${path} in figshare in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:156 +msgid "${user} authorized the figshare addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:157 +msgid "${user} deauthorized the figshare addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:158 +msgid "figshare addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:159 +msgid "${user} changed external link to ${forward_url} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:160 +msgid "${user} added file ${path} to GitHub repo ${repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:161 +msgid "${user} removed ${path_type} ${path} in GitHub repo ${repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:162 +msgid "${user} updated file ${path} in GitHub repo ${repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:163 +msgid "${user} created folder ${path} in GitHub repo ${repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:164 +msgid "${user} authorized the GitHub addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:165 +msgid "${user} deauthorized the GitHub addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:166 +msgid "GitHub addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:167 +msgid "${user} linked GitHub repo ${repo} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:168 +msgid "${user} added file ${path} to GitLab repo ${gitlab_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:169 +msgid "${user} removed file ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:170 +msgid "${user} updated file ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:171 +msgid "${user} created folder ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:172 +msgid "${user} authorized the GitLab addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:173 +msgid "${user} deauthorized the GitLab addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:174 +msgid "GitLab addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:175 +msgid "${user} linked GitLab repo ${gitlab_repo} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:176 +msgid "${user} added file ${googledrive_path} to Google Drive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:177 +msgid "" +"${user} removed ${path_type} ${googledrive_path} from Google Drive in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:178 +msgid "${user} updated file ${googledrive_path} in Google Drive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:179 +msgid "${user} created folder ${googledrive_path} in Google Drive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:180 +msgid "${user} linked Google Drive folder ${googledrive_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:181 +msgid "${user} authorized the Google Drive addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:182 +msgid "${user} deauthorized the Google Drive addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:183 +msgid "Google Drive addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:184 +msgid "${user} added file ${iqbrims_path} to IQB-RIMS in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:185 +msgid "${user} removed ${path_type} ${iqbrims_path} from IQB-RIMS in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:186 +msgid "${user} updated file ${iqbrims_path} in IQB-RIMS in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:187 +msgid "${user} created folder ${iqbrims_path} in IQB-RIMS in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:188 +msgid "${user} linked IQB-RIMS folder ${iqbrims_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:189 +msgid "${user} authorized the IQB-RIMS addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:190 +msgid "${user} deauthorized the IQB-RIMS addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:191 +msgid "IQB-RIMS addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:192 +#: website/static/js/logActionsList_extract.js:194 +msgid "${user} started IQB-RIMS workflow for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:193 +#: website/static/js/logActionsList_extract.js:195 +msgid "Finished workflow of ${user} for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:196 +msgid "${user} linked Mendeley folder ${folder_name} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:197 +msgid "${user} authorized the Mendeley addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:198 +msgid "${user} deauthorized the Mendeley addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:199 +msgid "${user} added file ${path} to Nextcloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:200 +msgid "${user} removed ${path_type} ${path} from Nextcloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:201 +msgid "${user} updated file ${path} in Nextcloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:202 +msgid "${user} created folder ${path} in Nextcloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:203 +msgid "${user} linked Nextcloud folder ${folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:204 +msgid "${user} authorized the Nextcloud addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:205 +msgid "${user} deauthorized the Nextcloud addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:206 +msgid "Nextcloud addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:207 +msgid "${user} added file ${path} to Microsoft OneDrive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:208 +msgid "${user} removed ${path_type} ${path} from Microsoft OneDrive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:209 +msgid "${user} updated file ${path} in Microsoft OneDrive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:210 +msgid "${user} created folder ${path} in Microsoft OneDrive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:211 +msgid "${user} linked Microsoft OneDrive folder ${onedrive_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:212 +msgid "${user} authorized the Microsoft OneDrive addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:213 +msgid "${user} deauthorized the Microsoft OneDrive addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:214 +msgid "Microsoft OneDrive addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:215 +msgid "${user} added file ${path} to ownCloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:216 +msgid "${user} removed ${path_type} ${path} from ownCloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:217 +msgid "${user} updated file ${path} in ownCloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:218 +msgid "${user} created folder ${path} in ownCloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:219 +msgid "${user} linked ownCloud folder ${folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:220 +msgid "${user} authorized the ownCloud addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:221 +msgid "${user} deauthorized the ownCloud addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:222 +msgid "ownCloud addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:223 +msgid "${user} linked the Amazon S3 bucket ${bucket} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:224 +msgid "${user} unselected the Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:225 +msgid "${user} added file ${path} to Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:226 +msgid "${user} removed ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:227 +msgid "${user} updated file ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:228 +msgid "${user} created folder ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:229 +msgid "${user} authorized the Amazon S3 addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:230 +msgid "${user} deauthorized the Amazon S3 addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:231 +msgid "Amazon S3 addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:232 +msgid "${user} linked the S3 Compatible Storage bucket ${bucket} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:233 +msgid "${user} unselected the S3 Compatible Storage bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:234 +msgid "" +"${user} added file ${path} to S3 Compatible Storage bucket ${bucket} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:235 +msgid "" +"${user} removed ${path} in S3 Compatible Storage bucket ${bucket} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:236 +msgid "" +"${user} updated file ${path} in S3 Compatible Storage bucket ${bucket} in" +" ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:237 +msgid "" +"${user} created folder ${path} in S3 Compatible Storage bucket ${bucket} " +"in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:238 +msgid "${user} authorized the S3 Compatible Storage addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:239 +msgid "${user} deauthorized the S3 Compatible Storage addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:240 +msgid "S3 Compatible Storage addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:241 +msgid "${user} linked the Swift container ${bucket} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:242 +msgid "${user} unselected the Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:243 +msgid "${user} added file ${path} to Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:244 +msgid "${user} removed ${path} in Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:245 +msgid "${user} updated file ${path} in Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:246 +msgid "${user} created folder ${path} in Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:247 +msgid "${user} authorized the Swift addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:248 +msgid "${user} deauthorized the Swift addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:249 +msgid "Swift addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:250 +msgid "${user} added file ${filename} to WEKO index ${dataset} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:251 +msgid "${user} removed file ${filename} from WEKO index ${dataset} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:252 +msgid "${user} linked WEKO index ${dataset} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:253 +msgid "${user} created an index ${filename} on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:254 +msgid "${user} created an item ${filename} on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:255 +msgid "${user} created folder ${filename} in WEKO index ${dataset} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:256 +msgid "${user} authorized the WEKO addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:257 +msgid "${user} deauthorized the WEKO addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:258 +msgid "WEKO addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:259 +msgid "${user} linked Zotero folder ${folder_name} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:260 +msgid "${user} linked Zotero library ${library_name} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:261 +msgid "${user} authorized the Zotero addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:262 +msgid "${user} deauthorized the Zotero addon for ${node}" +msgstr "" + +#: website/static/js/logTextParser.js:824 +msgid "unknown format" +msgstr "" + +#: website/static/js/meetings.js:24 +msgid "Submissions" +msgstr "" + +#: website/static/js/meetings.js:30 +msgid "Location" +msgstr "" + +#: website/static/js/filepage/revisions.js:109 website/static/js/meetings.js:36 +msgid "Date" +msgstr "" + +#: website/static/js/myProjects.js:308 +msgid "We're having some trouble contacting our servers. Try reloading the page." +msgstr "" + +#: website/static/js/myProjects.js:308 +msgid "Something went wrong!" +msgstr "" + +#: website/static/js/myProjects.js:433 +msgid "All my projects" +msgstr "" + +#: website/static/js/myProjects.js:461 +msgid "Error loading project category names." +msgstr "" + +#: website/static/js/myProjects.js:665 +msgid "Some projects" +msgstr "" + +#: website/static/js/myProjects.js:669 +msgid " could not be removed from the collection" +msgstr "" + +#: website/static/js/myProjects.js:671 +msgid "Please try again." +msgstr "" + +#: website/static/js/myProjects.js:764 +msgid "You have not created any projects yet." +msgstr "" + +#: website/static/js/myProjects.js:768 +msgid "" +"There have been no completed registrations for this institution, but you " +"can view the " +msgstr "" + +#: website/static/js/myProjects.js:769 +msgid "newest public registrations" +msgstr "" + +#: website/static/js/myProjects.js:770 website/static/js/myProjects.js:778 +msgid " or " +msgstr "" + +#: website/static/js/myProjects.js:771 +msgid "popular public registrations." +msgstr "" + +#: website/static/js/myProjects.js:774 +msgid "You have not made any registrations yet. Go to " +msgstr "" + +#: website/static/js/myProjects.js:775 +msgid "Guides" +msgstr "" + +#: website/static/js/myProjects.js:775 +msgid " to learn how registrations work." +msgstr "" + +#: website/static/js/myProjects.js:778 +msgid "You have not made any preprints yet. Learn more about preprints in the " +msgstr "" + +#: website/static/js/myProjects.js:778 +msgid "OSF Guides" +msgstr "" + +#: website/static/js/myProjects.js:778 +msgid "make one now." +msgstr "" + +#: website/static/js/myProjects.js:780 +msgid "" +"You have no bookmarks. You can add projects or registrations by dragging " +"them into your bookmarks or by clicking the Add to Bookmark button on the" +" project or registration." +msgstr "" + +#: website/static/js/myProjects.js:782 +msgid "This collection is empty." +msgstr "" + +#: website/static/js/myProjects.js:784 +msgid "" +" You can add projects, registrations, or preprints by dragging them into " +"the collection." +msgstr "" + +#: website/static/js/myProjects.js:795 +msgid "" +"No components to display. Either there are no components, or there are " +"private components in which you are not a contributor." +msgstr "" + +#: website/static/js/myProjects.js:966 +msgid "Collections could not be loaded." +msgstr "" + +#: website/static/js/myProjects.js:967 +msgid "Please reload the page." +msgstr "" + +#: website/static/js/myProjects.js:1109 +msgid "My Projects " +msgstr "" + +#: website/static/js/myProjects.js:1110 +msgid "Browse and organize all your projects" +msgstr "" + +#: website/static/js/myProjects.js:1115 +msgid "Create Project" +msgstr "" + +#: website/static/js/myProjects.js:1172 +msgid "Fetching more projects" +msgstr "" + +#: website/static/js/myProjects.js:1278 +msgid "\" collection could not be created." +msgstr "" + +#: website/static/js/myProjects.js:1279 website/static/js/myProjects.js:1311 +#: website/static/js/myProjects.js:1336 +msgid "Please try again" +msgstr "" + +#: website/static/js/myProjects.js:1310 +msgid "\" could not be deleted." +msgstr "" + +#: website/static/js/myProjects.js:1335 +msgid "\" could not be renamed." +msgstr "" + +#: website/static/js/myProjects.js:1383 +msgid "\" is already in \"%1$s\"" +msgstr "" + +#: website/static/js/myProjects.js:1469 +msgid "Collections " +msgstr "" + +#: website/static/js/myProjects.js:1472 +msgid "" +"Collections are groups of projects. You can create custom collections. " +"Drag and drop your projects or bookmarked projects to add them." +msgstr "" + +#: website/static/js/myProjects.js:1501 +msgid " Rename" +msgstr "" + +#: website/static/js/myProjects.js:1510 +msgid " Delete" +msgstr "" + +#: website/static/js/myProjects.js:1528 +msgid "Add new collection" +msgstr "" + +#: website/static/js/myProjects.js:1531 +msgid "" +"Collections are groups of projects that help you organize your work. " +"After you create your collection, you can add projects by dragging them " +"into the collection." +msgstr "" + +#: website/static/js/myProjects.js:1533 +msgid "Collection name" +msgstr "" + +#: website/static/js/myProjects.js:1548 +msgid "e.g. My Replications" +msgstr "" + +#: website/static/js/myProjects.js:1565 +msgid "Add" +msgstr "" + +#: website/static/js/myProjects.js:1576 +msgid "Rename collection" +msgstr "" + +#: website/static/js/myProjects.js:1581 +msgid "Rename to: " +msgstr "" + +#: website/static/js/myProjects.js:1624 +msgid "Delete collection \"%1$s\"?" +msgstr "" + +#: website/static/js/myProjects.js:1627 +msgid "This will delete your collection, but your projects will not be deleted." +msgstr "" + +#: website/static/js/myProjects.js:1737 +msgid "Parent projects" +msgstr "" + +#: website/static/js/myProjects.js:1786 +msgid "Create component" +msgstr "" + +#: website/static/js/myProjects.js:1875 +msgid "" +"No contributors to display in this collection. Project administrators can" +" add contributors." +msgstr "" + +#: website/static/js/myProjects.js:1898 +msgid "" +"No tags to display in this collection. Project administrators and write " +"contributors can add tags." +msgstr "" + +#: website/static/js/myProjects.js:1924 +msgid "Contributors " +msgstr "" + +#: website/static/js/myProjects.js:1927 +msgid "Click a contributor's name to see projects that you have in common." +msgstr "" + +#: website/static/js/myProjects.js:1938 website/static/js/myProjects.js:2019 +msgid "Tags" +msgstr "" + +#: website/static/js/myProjects.js:1963 +msgid "Select a row to view project details." +msgstr "" + +#: website/static/js/myProjects.js:1994 +msgid "Information" +msgstr "" + +#: website/static/js/myProjects.js:1998 +msgid "Activity" +msgstr "" + +#: website/static/js/myProjects.js:2005 +msgid "Visibility: " +msgstr "" + +#: website/static/js/myProjects.js:2005 +msgid "Public" +msgstr "" + +#: website/static/js/myProjects.js:2005 +msgid "Private" +msgstr "" + +#: website/static/js/myProjects.js:2007 +msgid "Category: " +msgstr "" + +#: website/static/js/myProjects.js:2011 +msgid "Permission: " +msgstr "" + +#: website/static/js/myProjects.js:2012 +msgid "Last Modified on: " +msgstr "" + +#: website/static/js/myProjects.js:2040 +msgid "Remove selected from collection" +msgstr "" + +#: website/static/js/nodeControl.js:61 +msgid "A request to make this registration public is pending" +msgstr "" + +#: website/static/js/nodeControl.js:102 +msgid "Edit Title" +msgstr "" + +#: website/static/js/nodeControl.js:106 +msgid "Title cannot be blank." +msgstr "" + +#: website/static/js/nodeControl.js:109 +msgid "Title cannot exceed 512 characters." +msgstr "" + +#: website/static/js/nodeControl.js:114 +msgid "component" +msgstr "" + +#: website/static/js/nodeControl.js:117 +msgid "Edit Description" +msgstr "" + +#: website/static/js/nodeControl.js:118 +msgid "Add a brief description to your %1$s" +msgstr "" + +#: website/static/js/nodeControl.js:135 +msgid "Select a category" +msgstr "" + +#: website/static/js/nodeControl.js:175 +msgid "The project could not be removed" +msgstr "" + +#: website/static/js/nodeControl.js:212 +msgid "Create DOI" +msgstr "" + +#: website/static/js/nodeControl.js:214 +msgid "Are you sure you want to create a DOI for this %1$s" +msgstr "" + +#: website/static/js/nodeControl.js:215 +msgid "? A DOI" +msgstr "" + +#: website/static/js/nodeControl.js:216 +msgid " is persistent and will always resolve to this page." +msgstr "" + +#: website/static/js/nodeControl.js:245 +msgid "We could not create the identifier at this time. " +msgstr "" + +#: website/static/js/nodeControl.js:246 +msgid "The DOI acquisition service may be down right now. " +msgstr "" + +#: website/static/js/nodeControl.js:247 +msgid "Please try again soon and/or contact %1$s" +msgstr "" + +#: website/static/js/nodeControl.js:249 +msgid "Could not create doi" +msgstr "" + +#: website/static/js/nodeSelectTreebeard.js:62 +#: website/static/js/notificationsTreebeard.js:62 +#: website/static/js/profile.js:320 +#: website/static/js/wikiSettingsTreebeard.js:57 +msgid "Could not update settings" +msgstr "" + +#: website/static/js/nodeSelectTreebeard.js:81 +#: website/static/js/nodesDeleteTreebeard.js:56 +#: website/static/js/nodesPrivacySettingsTreebeard.js:56 +msgid "checkBox" +msgstr "" + +#: website/static/js/nodesDelete.js:38 +msgid "" +"This %1$s also contains supplemental materials for a " +"preprint. It will" +msgstr "" + +#: website/static/js/nodesDelete.js:39 +msgid " no longer be available to contributors or connected to the preprint." +msgstr "" + +#: website/static/js/nodesDelete.js:43 +msgid "It will no longer be available to other contributors on the project." +msgstr "" + +#: website/static/js/nodesDelete.js:49 +msgid "Are you sure you want to delete this %1$s?" +msgstr "" + +#: website/static/js/nodesDelete.js:80 website/static/js/nodesDelete.js:340 +msgid "Unable to delete %1$s" +msgstr "" + +#: website/static/js/nodesDelete.js:84 website/static/js/nodesDelete.js:344 +msgid "Problem deleting %1$s" +msgstr "" + +#: website/static/js/nodesDelete.js:85 +msgid "Could not delete %$1s" +msgstr "" + +#: website/static/js/nodesDelete.js:116 +msgid "" +"

        This %1$s also contains supplemental materials for a " +"preprint, and one or more of its %2$s contains " +"supplemental materials for a preprint." +msgstr "" + +#: website/static/js/nodesDelete.js:119 +msgid "" +"

        This %1$s also contains supplemental materials for a " +"preprint." +msgstr "" + +#: website/static/js/nodesDelete.js:122 +msgid "" +"

        This %1$s also has one or more %2$s that contain supplemental " +"materials for a preprint." +msgstr "" + +#: website/static/js/nodesDelete.js:150 +msgid "Delete %1$s" +msgstr "" + +#: website/static/js/nodesDelete.js:151 +msgid "Delete %1$s and %2$s" +msgstr "" + +#: website/static/js/nodesDelete.js:156 +msgid "This %1$s contains %2$s." +msgstr "" + +#: website/static/js/nodesDelete.js:156 +msgid " To delete this %1$s, you must also delete all %2$s." +msgstr "" + +#: website/static/js/nodesDelete.js:158 +msgid " The following %1$s and %2$s will be deleted." +msgstr "" + +#: website/static/js/nodesDelete.js:161 +msgid " This action is irreversible." +msgstr "" + +#: website/static/js/nodesDelete.js:167 +msgid "" +"Please note that deleting your %1$s will erase all your %2$s data and " +"this process is IRREVERSIBLE. Deleted %3$s and %4$s will no longer be " +"available to other contributors on the %5$s" +msgstr "" + +#: website/static/js/nodesDelete.js:168 +msgid " and will be disconnected from your preprints." +msgstr "" + +#: website/static/js/nodesDelete.js:168 +msgid "." +msgstr "" + +#: website/static/js/nodesDelete.js:331 +msgid "Your %1$s has been successfully deleted." +msgstr "" + +#: website/static/js/nodesDelete.js:345 +msgid "Could not batch delete project and its components." +msgstr "" + +#: website/static/js/nodesDeleteTreebeard.js:84 +msgid "You must have admin permissions on this component to be able to delete it." +msgstr "" + +#: website/static/js/nodesPrivacy.js:19 +msgid "" +"Please review your projects, components, and add-ons for sensitive or " +"restricted information before making them public." +msgstr "" + +#: website/static/js/nodesPrivacy.js:20 +msgid "" +"

        Once they are made public, you should assume they will always be " +"public. You can " +msgstr "" + +#: website/static/js/nodesPrivacy.js:21 +msgid "" +"return them to private later, but search engines (including Google’s " +"cache) or others may access files, wiki pages, or analytics before you " +"do." +msgstr "" + +#: website/static/js/nodesPrivacy.js:23 +msgid "" +"
        • Public forks and registrations of this project will remain " +"public.
        • " +msgstr "" + +#: website/static/js/nodesPrivacy.js:24 website/static/js/nodesPrivacy.js:27 +msgid "" +"
        • Search engines (including Google's cache) or others may have accessed" +" files, wiki pages, or analytics while this project was public.
        " +msgstr "" + +#: website/static/js/nodesPrivacy.js:26 +msgid "" +"
        • Preprints will remain public.
        • Public forks and " +"registrations of this project will remain public.
        • " +msgstr "" + +#: website/static/js/nodesPrivacy.js:28 +msgid "" +"By clicking confirm, an email will be sent to project administrator(s) to" +" approve ending the embargo. If approved, this registration, including " +"any components, will be made public immediately. This action is " +"irreversible." +msgstr "" + +#: website/static/js/nodesPrivacy.js:29 +msgid "End embargo early" +msgstr "" + +#: website/static/js/nodesPrivacy.js:30 +msgid "Adjust your privacy settings by checking the boxes below. " +msgstr "" + +#: website/static/js/nodesPrivacy.js:31 +msgid "" +"

          Checked projects and components will be public. " +"
          Unchecked components will be private." +msgstr "" + +#: website/static/js/nodesPrivacy.js:33 +msgid "The following projects and components will be made public." +msgstr "" + +#: website/static/js/nodesPrivacy.js:34 +msgid "The following projects and components will be made private." +msgstr "" + +#: website/static/js/nodesPrivacy.js:35 +msgid "No privacy settings were changed. Go back to make a change." +msgstr "" + +#: website/static/js/nodesPrivacy.js:36 +msgid "" +"You can only change the privacy of 100 projects and components at a time." +" Please go back and limit your selection." +msgstr "" + +#: website/static/js/nodesPrivacy.js:38 +msgid "This project/component contains supplemental materials for a preprint." +msgstr "" + +#: website/static/js/nodesPrivacy.js:39 +msgid "" +"

          Making this project/component private will prevent others from" +" accessing it.

          " +msgstr "" + +#: website/static/js/nodesPrivacy.js:155 +msgid "Make %1$s private" +msgstr "" + +#: website/static/js/nodesPrivacy.js:156 +msgid "Warning" +msgstr "" + +#: website/static/js/nodesPrivacy.js:157 +msgid "Change privacy settings" +msgstr "" + +#: website/static/js/nodesPrivacy.js:158 +msgid "Projects and components affected" +msgstr "" + +#: website/static/js/nodesPrivacy.js:247 +msgid "Updating Privacy" +msgstr "" + +#: website/static/js/nodesPrivacy.js:257 +msgid "Unable to update project privacy" +msgstr "" + +#: website/static/js/nodesPrivacy.js:261 +msgid "Problem changing privacy" +msgstr "" + +#: website/static/js/nodesPrivacy.js:262 +msgid "Could not PATCH project settings." +msgstr "" + +#: website/static/js/nodesPrivacy.js:318 +msgid "Submitting request to end embargo early ..." +msgstr "" + +#: website/static/js/nodesPrivacy.js:324 +msgid "Email sent" +msgstr "" + +#: website/static/js/nodesPrivacy.js:325 +msgid "" +"The administrator(s) can approve or cancel the action within 48 hours. If" +" 48 hours pass without any action taken, then the registration will " +"become public." +msgstr "" + +#: website/static/js/notificationsConfig.js:31 +msgid "Could not retrieve settings information." +msgstr "" + +#: website/static/js/notificationsConfig.js:63 +msgid "Could not update email preferences at this time. If this issue persists, " +msgstr "" + +#: website/static/js/notificationsConfig.js:64 +#: website/static/js/osfHelpers.js:316 +msgid "please report it to %1$s." +msgstr "" + +#: website/static/js/notificationsTreebeard.js:68 +#: website/static/js/notificationsTreebeard.js:182 +#: website/static/js/notificationsTreebeard.js:187 +#: website/static/js/notificationsTreebeard.js:230 +msgid "Instantly" +msgstr "" + +#: website/static/js/notificationsTreebeard.js:69 +#: website/static/js/notificationsTreebeard.js:188 +#: website/static/js/notificationsTreebeard.js:231 +msgid "Daily" +msgstr "" + +#: website/static/js/notificationsTreebeard.js:70 +msgid "Adopt setting from parent project" +msgstr "" + +#: website/static/js/notificationsTreebeard.js:71 +#: website/static/js/notificationsTreebeard.js:186 +#: website/static/js/notificationsTreebeard.js:229 +msgid "Never" +msgstr "" + +#: website/static/js/notificationsTreebeard.js:118 +msgid " No configured projects." +msgstr "" + +#: website/static/js/notificationsTreebeard.js:228 +msgid "Adopt setting from parent project %1$s" +msgstr "" + +#: website/static/js/oauthAddonNodeConfig.js:143 +msgid "Choose %1$s Account to Import" +msgstr "" + +#: website/static/js/osfHelpers.js:311 +msgid "Please refresh the page and try again or contact %1$s" +msgstr "" + +#: website/static/js/osfHelpers.js:315 +msgid "GakuNin RDM was unable to resolve your request. If this issue persists, " +msgstr "" + +#: website/static/js/osfHelpers.js:339 +msgid "Unexpected error occurred in JSON request" +msgstr "" + +#: website/static/js/osfHelpers.js:344 +msgid "Unexpected error occurred in an editable input" +msgstr "" + +#: website/static/js/osfHelpers.js:361 +#: website/static/js/privateLinkManager.js:105 +msgid "Please wait" +msgstr "" + +#: website/static/js/osfHelpers.js:800 +#: website/static/js/pages/profile-settings-addons-page.js:32 +#: website/static/js/pages/project-addons-page.js:63 +msgid "Confirm" +msgstr "" + +#: website/static/js/osfHelpers.js:811 +msgid "

          Type the following to continue: " +msgstr "" + +#: website/static/js/passwordForms.js:23 +msgid "Please enter a more complex password." +msgstr "" + +#: website/static/js/passwordForms.js:117 +#: website/static/js/passwordForms.js:192 +#: website/static/js/passwordForms.js:258 +msgid "Your password cannot be the same as your email address." +msgstr "" + +#: website/static/js/passwordForms.js:132 +msgid "Your new password cannot be the same as your old password." +msgstr "" + +#: website/static/js/passwordForms.js:143 +#: website/static/js/passwordForms.js:203 +msgid "Passwords must match." +msgstr "" + +#: website/static/js/passwordForms.js:230 +msgid "Email addresses must match." +msgstr "" + +#: website/static/js/passwordForms.js:301 +msgid "You have already submitted. You cannot sign up more than once." +msgstr "" + +#: website/static/js/passwordForms.js:322 +msgid "Please complete reCAPTCHA" +msgstr "" + +#: website/static/js/pointers.js:28 +msgid "Search all projects" +msgstr "" + +#: website/static/js/pointers.js:29 +msgid "Search my projects" +msgstr "" + +#: website/static/js/pointers.js:133 +msgid "No results found." +msgstr "" + +#: website/static/js/pointers.js:183 +msgid "Error retrieving nodes" +msgstr "" + +#: website/static/js/pointers.js:328 +msgid "Registered: " +msgstr "" + +#: website/static/js/pointers.js:330 +msgid "Created: " +msgstr "" + +#: website/static/js/pointers.js:330 +msgid "" +"\n" +"Modified: " +msgstr "" + +#: website/static/js/pointers.js:362 +msgid "Could not get links" +msgstr "" + +#: website/static/js/privateLinkManager.js:63 +msgid "Could not retrieve projects." +msgstr "" + +#: website/static/js/privateLinkManager.js:63 +#: website/static/js/privateLinkTable.js:72 +msgid "Please refresh the page or " +msgstr "" + +#: website/static/js/privateLinkManager.js:64 +#: website/static/js/privateLinkTable.js:73 +msgid "contact %1$s" +msgstr "" + +#: website/static/js/privateLinkManager.js:64 +#: website/static/js/privateLinkTable.js:73 +msgid " if the " +msgstr "" + +#: website/static/js/privateLinkManager.js:65 +#: website/static/js/privateLinkTable.js:74 +msgid "problem persists." +msgstr "" + +#: website/static/js/privateLinkTable.js:37 +msgid "Yes" +msgstr "" + +#: website/static/js/privateLinkTable.js:37 +msgid "No" +msgstr "" + +#: website/static/js/privateLinkTable.js:72 +msgid "Could not retrieve view-only links." +msgstr "" + +#: website/static/js/privateLinkTable.js:96 +msgid "Remove view-only link?" +msgstr "" + +#: website/static/js/privateLinkTable.js:97 +msgid "Are you sure you want to remove this view-only link?" +msgstr "" + +#: website/static/js/privateLinkTable.js:109 +msgid "Failed to delete the private link." +msgstr "" + +#: website/static/js/privateLinkTable.js:138 +msgid "Edit Link Name" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "January" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "February" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "March" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "April" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "May" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "June" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "July" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "August" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "September" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "October" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "November" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "December" +msgstr "" + +#: website/static/js/profile.js:112 +msgid "ongoing" +msgstr "" + +#: website/static/js/profile.js:152 +msgid "Please enter a year for the start date." +msgstr "" + +#: website/static/js/profile.js:165 +msgid "Please enter an end date or mark as ongoing." +msgstr "" + +#: website/static/js/profile.js:168 +msgid "Please enter a year for the end date." +msgstr "" + +#: website/static/js/profile.js:265 website/static/js/profile.js:274 +msgid "There are unsaved changes to your settings." +msgstr "" + +#: website/static/js/profile.js:275 +msgid "Please save or discard your changes before switching " +msgstr "" + +#: website/static/js/profile.js:276 +msgid "tabs." +msgstr "" + +#: website/static/js/profile.js:341 +msgid "Could not fetch data" +msgstr "" + +#: website/static/js/profile.js:358 +msgid "Are you sure you want to discard your unsaved changes?" +msgstr "" + +#: website/static/js/profile.js:720 +msgid "Remove website?" +msgstr "" + +#: website/static/js/profile.js:721 +msgid "Are you sure you want to remove this website from your profile?" +msgstr "" + +#: website/static/js/profile.js:728 +msgid "Website removed" +msgstr "" + +#: website/static/js/profile.js:815 +msgid "Please update your website" +msgstr "" + +#: website/static/js/profile.js:953 +msgid "Remove Institution?" +msgstr "" + +#: website/static/js/profile.js:954 +msgid "Are you sure you want to remove this institution?" +msgstr "" + +#: website/static/js/profile.js:963 +msgid "Institution Removed" +msgstr "" + +#: website/static/js/profile.js:1078 +msgid "Institution/Employer required" +msgstr "" + +#: website/static/js/profile.js:1132 +msgid "Institution required" +msgstr "" + +#: website/static/js/components/publicNodes.js:103 +#: website/static/js/project-organizer.js:100 +msgid "A contributor" +msgstr "" + +#: website/static/js/project-organizer.js:197 +msgid "Contributors" +msgstr "" + +#: website/static/js/project-organizer.js:416 +msgid "" +"input.form-control[placeholder=\"Filter displayed " +"projects\"][type=\"text\"]" +msgstr "" + +#: website/static/js/project.js:28 +msgid "

          Are you sure you want to fork this project?

          " +msgstr "" + +#: website/static/js/project.js:36 website/static/js/project.js:115 +msgid "Fork" +msgstr "" + +#: website/static/js/project.js:50 +msgid "Fork created successfully!" +msgstr "" + +#: website/static/js/project.js:58 +msgid "Go to new fork" +msgstr "" + +#: website/static/js/project.js:87 +msgid "Your fork is being created. You'll receive an email when it is complete." +msgstr "" + +#: website/static/js/project.js:93 +msgid "Fork this project?" +msgstr "" + +#: website/static/js/project.js:94 +msgid "Are you sure you want to fork this project?" +msgstr "" + +#: website/static/js/project.js:109 +msgid "Could not fork link." +msgstr "" + +#: website/static/js/project.js:126 +msgid "" +"

          Are you sure you want to create a new project using this project as a" +" template?

          " +msgstr "" + +#: website/static/js/project.js:127 +msgid "" +"

          Any add-ons configured for this project will not be authenticated in " +"the new project.

          " +msgstr "" + +#: website/static/js/project.js:129 +msgid "" +"

          Are you sure you want to create a new project using this registration" +" as a template?

          " +msgstr "" + +#: website/static/js/project.js:205 +msgid "
          Read
          " +msgstr "" + +#: website/static/js/project.js:206 +msgid "
          • View project content and comment
          " +msgstr "" + +#: website/static/js/project.js:207 +msgid "
          Read + Write
          " +msgstr "" + +#: website/static/js/project.js:208 +msgid "
          • Read privileges
          • " +msgstr "" + +#: website/static/js/project.js:209 +msgid "
          • Add and configure components
          • " +msgstr "" + +#: website/static/js/project.js:210 +msgid "
          • Add and edit content
          " +msgstr "" + +#: website/static/js/project.js:211 +msgid "
          Administrator
            " +msgstr "" + +#: website/static/js/project.js:212 +msgid "
          • Read and write privileges
          • " +msgstr "" + +#: website/static/js/project.js:213 +msgid "
          • Manage contributor
          • " +msgstr "" + +#: website/static/js/project.js:214 +msgid "" +"
          • Delete and register project
          • Public-private " +"settings
          " +msgstr "" + +#: website/static/js/project.js:223 +msgid "" +"Only bibliographic contributors will be displayed in the Contributors " +"list and in project citations. Non-bibliographic contributors can read " +"and modify the project as normal." +msgstr "" + +#: website/static/js/project.js:238 +msgid "Remove this link?" +msgstr "" + +#: website/static/js/project.js:239 +msgid "" +"Are you sure you want to remove this link? This will not remove the " +"project this link refers to." +msgstr "" + +#: website/static/js/projectSettingsTreebeardBase.js:96 +msgid "Editing Toggle" +msgstr "" + +#: website/static/js/requestAccess.js:17 +msgid "Request access" +msgstr "" + +#: website/static/js/requestAccess.js:27 website/static/js/requestAccess.js:62 +msgid "Access requested" +msgstr "" + +#: website/static/js/requestAccess.js:30 +msgid "Request declined" +msgstr "" + +#: website/static/js/requestAccess.js:67 +msgid "Access request failed. Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/requestAccess.js:70 +msgid "Error requesting project access" +msgstr "" + +#: website/static/js/requestAccess.js:83 +msgid "If this should not have occurred, please contact %1$s." +msgstr "" + +#: website/static/js/saveManager.js:24 +msgid "You have unsaved changes." +msgstr "" + +#: website/static/js/search-grdm.js:150 +msgid "Date Modified (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:151 +msgid "Date Modified (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:152 +msgid "Date Created (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:153 +msgid "Date Created (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:154 +msgid "Project name (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:155 +msgid "Project name (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:156 +msgid "File name (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:157 +msgid "File name (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:158 +msgid "User name (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:159 +msgid "User name (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:160 +msgid "Institution name (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:161 +msgid "Institution name (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:162 +msgid "Wiki title (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:163 +msgid "Wiki title (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:313 website/static/js/search.js:190 +msgid "Page %1$s of %2$s" +msgstr "" + +#: website/static/js/search-grdm.js:393 website/static/js/search.js:270 +msgid "Search help" +msgstr "" + +#: website/static/js/search-grdm.js:394 website/static/js/search.js:271 +msgid "

          Queries

          " +msgstr "" + +#: website/static/js/search-grdm.js:395 website/static/js/search.js:272 +msgid "" +"

          Search uses the Lucene" +" search syntax. " +msgstr "" + +#: website/static/js/search-grdm.js:396 website/static/js/search.js:273 +msgid "This gives you many options, but can be very simple as well. " +msgstr "" + +#: website/static/js/search-grdm.js:397 website/static/js/search.js:274 +msgid "Examples of valid searches include:" +msgstr "" + +#: website/static/js/search-grdm.js:769 website/static/js/search-grdm.js:1067 +#: website/static/js/search.js:578 website/static/js/search.js:605 +msgid "GakuNin RDM | Search" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:26 +msgid "Make publicly editable" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:27 +msgid "" +"Are you sure you want to make the wiki of %1$s publicly editable? " +"This will allow any logged in user to edit the content of this wiki. " +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:28 +msgid "" +"Note: Users without write access will not be able to add, delete, " +"or rename pages." +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:36 +msgid "Apply" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:114 +msgid "Only admins may change permissions of this wiki." +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:116 +msgid "Select who can edit" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:116 +msgid "This feature is disabled for wikis of private %1$ss" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:133 +msgid "Contributors (with write access)" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:134 +msgid "All GakuNin RDM users" +msgstr "" + +#: website/static/js/components/autocomplete.js:84 +msgid "Could not GET autocomplete data" +msgstr "" + +#: website/static/js/components/autocomplete.js:150 +msgid "Initiated by: " +msgstr "" + +#: website/static/js/components/autocomplete.js:156 +msgid "Initiated: " +msgstr "" + +#: website/static/js/components/autocomplete.js:162 +msgid "Last updated: " +msgstr "" + +#: website/static/js/components/publicNodes.js:68 +msgid "Error retrieving projects" +msgstr "" + +#: website/static/js/components/publicNodes.js:120 +msgid " more" +msgstr "" + +#: website/static/js/components/publicNodes.js:152 +msgid "-- private project -- / " +msgstr "" + +#: website/static/js/components/publicNodes.js:190 +msgid "Unable to retrieve public %1$s" +msgstr "" + +#: website/static/js/components/publicNodes.js:190 +msgid " at this time. Please refresh the page or contact " +msgstr "" + +#: website/static/js/components/publicNodes.js:204 +msgid "You have no public %1$s." +msgstr "" + +#: website/static/js/components/publicNodes.js:206 +msgid "Find out how to make your %1$s" +msgstr "" + +#: website/static/js/components/publicNodes.js:207 +msgid "public" +msgstr "" + +#: website/static/js/components/publicNodes.js:211 +msgid "This user has no public %1$s." +msgstr "" + +#: website/static/js/components/quickFiles.js:54 +msgid "Error retrieving quickfiles" +msgstr "" + +#: website/static/js/components/quickFiles.js:121 +msgid "" +"Unable to retrieve quickfiles at this time. Please refresh the page or " +"contact " +msgstr "" + +#: website/static/js/components/quickFiles.js:134 +msgid "You have no public quickfiles" +msgstr "" + +#: website/static/js/components/quickFiles.js:135 +msgid "This user has no public quickfiles." +msgstr "" + +#: website/static/js/components/utils.js:15 +msgid "Missing required option: " +msgstr "" + +#: website/static/js/filepage/editor.js:82 +msgid "The file content could not be loaded." +msgstr "" + +#: website/static/js/filepage/editor.js:83 +msgid "Could not GET file contents." +msgstr "" + +#: website/static/js/filepage/editor.js:113 +msgid "Could not update file. Insufficient storage space in your Dropbox." +msgstr "" + +#: website/static/js/filepage/editor.js:115 +msgid "The file could not be updated." +msgstr "" + +#: website/static/js/filepage/editor.js:122 +msgid "Could not PUT file content." +msgstr "" + +#: website/static/js/filepage/editor.js:178 +msgid "Revert" +msgstr "" + +#: website/static/js/filepage/index.js:89 +msgid "Direct iframe with fixed height and width" +msgstr "" + +#: website/static/js/filepage/index.js:131 +#: website/static/js/filepage/index.js:136 +msgid "File is checked out." +msgstr "" + +#: website/static/js/filepage/index.js:132 +msgid "" +" This file has been checked out by a COS Preregistration Challenge " +"Reviewer and will become available when review is complete." +msgstr "" + +#: website/static/js/filepage/index.js:137 +msgid " This file has been checked out by a " +msgstr "" + +#: website/static/js/filepage/index.js:138 +msgid "collaborator" +msgstr "" + +#: website/static/js/filepage/index.js:139 +msgid ". It needs to be checked in before any changes can be made." +msgstr "" + +#: website/static/js/filepage/index.js:184 +msgid "Delete file?" +msgstr "" + +#: website/static/js/filepage/index.js:186 +msgid "Are you sure you want to delete %1$s?" +msgstr "" + +#: website/static/js/filepage/index.js:204 +msgid "Could not delete file." +msgstr "" + +#: website/static/js/filepage/index.js:220 +msgid "Confirm file check out?" +msgstr "" + +#: website/static/js/filepage/index.js:223 +msgid "as long as it is checked out. You can check it back in at anytime." +msgstr "" + +#: website/static/js/filepage/index.js:243 +msgid "Unable to check out file" +msgstr "" + +#: website/static/js/filepage/index.js:270 +msgid "Unable to check in file" +msgstr "" + +#: website/static/js/filepage/index.js:275 +msgid "Force check in file?" +msgstr "" + +#: website/static/js/filepage/index.js:276 +msgid "" +"This will check in the file for all users, allowing it to be edited. Are " +"you sure?" +msgstr "" + +#: website/static/js/filepage/index.js:279 +#: website/static/js/filepage/index.js:502 +msgid "Force check in" +msgstr "" + +#: website/static/js/filepage/index.js:302 +msgid "Unable to force check in file. Make sure you have admin privileges." +msgstr "" + +#: website/static/js/filepage/index.js:343 +msgid "Live editing mode " +msgstr "" + +#: website/static/js/filepage/index.js:344 +msgid "Attempting to connect " +msgstr "" + +#: website/static/js/filepage/index.js:345 +msgid "Unsupported browser " +msgstr "" + +#: website/static/js/filepage/index.js:346 +msgid "Saving... " +msgstr "" + +#: website/static/js/filepage/index.js:347 +msgid "Unavailable: Live editing " +msgstr "" + +#: website/static/js/filepage/index.js:470 +msgid "View this file on " +msgstr "" + +#: website/static/js/filepage/index.js:505 +msgid "Check out" +msgstr "" + +#: website/static/js/filepage/index.js:508 +msgid "Check in" +msgstr "" + +#: website/static/js/filepage/index.js:514 +msgid "Request Trusted Timestamp" +msgstr "" + +#: website/static/js/filepage/index.js:531 +msgid "Toggle view: " +msgstr "" + +#: website/static/js/filepage/index.js:570 +#: website/static/js/filepage/revisions.js:173 +msgid "Revisions" +msgstr "" + +#: website/static/js/filepage/revisions.js:72 +#: website/static/js/filepage/revisions.js:73 +msgid "Unable to fetch versions" +msgstr "" + +#: website/static/js/filepage/revisions.js:108 +msgid "Version ID" +msgstr "" + +#: website/static/js/filepage/revisions.js:110 +msgid "User" +msgstr "" + +#: website/static/js/filepage/revisions.js:113 +msgid "" +".fa.fa-question-circle[data-content=\"MD5 is an algorithm used to verify " +"data integrity.\"][rel=\"popover\"]" +msgstr "" + +#: website/static/js/filepage/revisions.js:116 +msgid "" +".fa.fa-question-circle[data-content=\"SHA-2 is a cryptographic hash " +"function designed by the NSA used to verify data " +"integrity.\"][rel=\"popover\"]" +msgstr "" + +#: website/static/js/filepage/revisions.js:133 +msgid "Anonymous Contributor" +msgstr "" + +#: website/static/js/filepage/util.js:36 +msgid " Loading... " +msgstr "" + +#: website/static/js/home-page/scheduledBannerPlugin.js:25 +msgid "Error in request to %1$s" +msgstr "" + +#: website/static/js/pages/base-page.js:130 +msgid "Merge account" +msgstr "" + +#: website/static/js/pages/base-page.js:131 +msgid "Would you like to merge %1$s into your account? " +msgstr "" + +#: website/static/js/pages/base-page.js:133 +msgid "%1$s has been merged into your account." +msgstr "" + +#: website/static/js/pages/base-page.js:134 +msgid "You have chosen to not merge %1$s into your account. " +msgstr "" + +#: website/static/js/pages/base-page.js:135 +#: website/static/js/pages/base-page.js:142 +msgid "" +"If you change your mind, visit the user " +"settings page." +msgstr "" + +#: website/static/js/pages/base-page.js:138 +#: website/static/js/pages/base-page.js:188 +msgid "Add email" +msgstr "" + +#: website/static/js/pages/base-page.js:139 +msgid "Would you like to add %1$s to your account?" +msgstr "" + +#: website/static/js/pages/base-page.js:140 +msgid "%1$s has been added into your account." +msgstr "" + +#: website/static/js/pages/base-page.js:141 +msgid "You have chosen not to add %1$s to your account. " +msgstr "" + +#: website/static/js/pages/base-page.js:145 +msgid "There was a problem adding " +msgstr "" + +#: website/static/js/pages/base-page.js:146 +#: website/static/js/pages/base-page.js:149 +msgid ". Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/pages/base-page.js:148 +msgid "There was a problem removing " +msgstr "" + +#: website/static/js/pages/base-page.js:160 +msgid "Do not add email" +msgstr "" + +#: website/static/js/pages/base-page.js:173 +msgid "Could not remove email" +msgstr "" + +#: website/static/js/pages/base-page.js:198 +msgid "Could not add email" +msgstr "" + +#: website/static/js/pages/base-page.js:291 +msgid " and " +msgstr "" + +#: website/static/js/pages/dashboard-page.js:35 +msgid "Could not set user timezone or locale" +msgstr "" + +#: website/static/js/pages/dashboard-page.js:53 +msgid "" +"This is taking longer than normal.
          Try reloading the page. If the " +"problem persist, please contact us at %1$s" +msgstr "" + +#: website/static/js/pages/file-page.js:21 +msgid "Add a file tag to enhance discoverability" +msgstr "" + +#: website/static/js/pages/file-page.js:23 +#: website/static/js/pages/file-page.js:58 +#: website/static/js/pages/file-page.js:60 +#: website/static/js/pages/project-dashboard-page.js:632 +#: website/static/js/pages/project-dashboard-page.js:716 +#: website/static/js/pages/project-dashboard-page.js:749 +msgid "Removing tag" +msgstr "" + +#: website/static/js/pages/file-page.js:24 +#: website/static/js/pages/project-dashboard-page.js:633 +msgid "Add a tag" +msgstr "" + +#: website/static/js/pages/file-page.js:28 +msgid "Could not add tag." +msgstr "" + +#: website/static/js/pages/file-page.js:29 +#: website/static/js/pages/project-dashboard-page.js:656 +msgid "Failed to add tag" +msgstr "" + +#: website/static/js/pages/file-page.js:43 +msgid "Could not remove tag." +msgstr "" + +#: website/static/js/pages/file-page.js:44 +#: website/static/js/pages/project-dashboard-page.js:692 +msgid "Failed to remove tag" +msgstr "" + +#: website/static/js/pages/file-page.js:90 +msgid "The file title cannot be empty." +msgstr "" + +#: website/static/js/pages/file-page.js:92 +msgid "The file title cannot be more than 100 characters." +msgstr "" + +#: website/static/js/pages/file-page.js:103 +msgid "" +"Your file was successfully renamed. To view the new filename in the file " +"tree below, refresh the page." +msgstr "" + +#: website/static/js/pages/institution-page.js:30 +msgid "All Projects" +msgstr "" + +#: website/static/js/pages/institution-page.js:43 +msgid "" +"This is taking longer than normal.
          Try reloading the page. If the " +"problem persist, please contact us at %1$s." +msgstr "" + +#: website/static/js/pages/notifications-config-page.js:21 +#: website/static/js/pages/project-settings-page.js:33 +msgid "Could not retrieve notification settings." +msgstr "" + +#: website/static/js/pages/profile-settings-addons-page.js:66 +#: website/static/js/pages/project-addons-page.js:15 +msgid "" +"Sorry, we had trouble saving your settings. If this persists please " +"contact " +msgstr "" + +#: website/static/js/pages/profile-settings-addons-page.js:68 +msgid "Request failed" +msgstr "" + +#: website/static/js/pages/profile-settings-addons-page.js:86 +msgid "Are you sure you want to remove the add-ons you have deselected? " +msgstr "" + +#: website/static/js/pages/profile-settings-addons-page.js:129 +msgid "The changes on addon setting are not submitted!" +msgstr "" + +#: website/static/js/pages/project-addons-page.js:10 +msgid "Your add-on settings have been successfully changed." +msgstr "" + +#: website/static/js/pages/project-addons-page.js:26 +msgid "Disable Add-on?" +msgstr "" + +#: website/static/js/pages/project-addons-page.js:27 +msgid "Are you sure you want to disable this add-on?" +msgstr "" + +#: website/static/js/pages/project-addons-page.js:37 +msgid "Disable" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:117 +msgid "Filter by users" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:118 +msgid "Select from current contributors" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:119 +msgid "Select including past contributors" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:120 +msgid "Include past project contributors in your search" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:121 +msgid "Use dropdown menu" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:417 +msgid "Add Component" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:419 +msgid "Create new component" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:613 +msgid "Error retrieving filebrowser" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:630 +msgid "Add a project tag to enhance discoverability" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:691 +msgid "Could not remove tag" +msgstr "" + +#: website/static/js/pages/project-settings-page.js:34 +msgid "Could not GET notification settings." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:54 +msgid "Could not retrieve wiki settings." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:55 +msgid "Could not GET wiki settings." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:104 +msgid "Successfully updated settings." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:115 +msgid "Could not set commenting configuration. Please try again." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:151 +msgid "Unable to update settings" +msgstr "" + +#: website/static/js/pages/project-settings-page.js:152 +msgid "Could not update settings." +msgstr "" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:31 +msgid "Import Account from Admin" +msgstr "" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:52 +#: website/static/js/pages/rdm-profile-settings-addons-page.js:54 +msgid "Successfully imported the account." +msgstr "" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:59 +#: website/static/js/pages/rdm-profile-settings-addons-page.js:61 +msgid "Failed to import the account." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:172 +msgid "A verify request is being processed!" +msgstr "" + +#: website/static/js/pages/timestamp-common.js:175 +msgid "Something went wrong with the Verify request." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:191 +msgid "Using the checkbox, please select the files to request timestamp." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:214 +msgid "Timestamp is being added to the selected files!" +msgstr "" + +#: website/static/js/pages/timestamp-common.js:217 +msgid "Something went wrong with the Request Trusted Timestamp request." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:222 +msgid "The task has been cancelled." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:231 +msgid "The task already finished." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:234 +msgid "Something went wrong in the cancel request." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:288 +msgid "Using the checkbox, please select the files to download." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:323 +msgid "Failed to log \"downloaded errors\" into Recent Activity" +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:64 +msgid "The wiki page name cannot be empty." +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:66 +msgid "The wiki page name cannot be more than 100 characters." +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:81 +msgid "Error in renaming wiki" +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:88 +msgid "An unexpected error occurred. Please try again." +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:108 +msgid "

          Could not retrieve wiki pages. If this issue persists, " +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:109 +msgid "please report it to %1$s" +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:110 +msgid "Could not GET wiki menu pages" +msgstr "" + +#~ msgid "${user}updated file ${path} in Dropbox in ${node}" +#~ msgstr "" + +#~ msgid "${user}updated file ${path} in Dropbox Business in ${node}" +#~ msgstr "" + +#: addons/myskelton/static/node-cfg.js:90 +msgid "Admin Notes by %1$s" +msgstr "" + +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:34 +msgid "Saving admin notes was successful" +msgstr "" + +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:36 +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:46 +msgid "Error while saving admin notes" +msgstr "" + +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:44 +msgid "Permission error while saving admin notes" +msgstr "" + +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:63 +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:79 +msgid "Error while fetching admin notes" +msgstr "" diff --git a/site/guides/admin-addon/website/translations/ja/LC_MESSAGES/js_messages.po b/site/guides/admin-addon/website/translations/ja/LC_MESSAGES/js_messages.po new file mode 100644 index 0000000..18b70cc --- /dev/null +++ b/site/guides/admin-addon/website/translations/ja/LC_MESSAGES/js_messages.po @@ -0,0 +1,7818 @@ +# Japanese translations for . +# Copyright (C) 2020 ORGANIZATION +# This file is distributed under the same license as the project. +# FIRST AUTHOR , 2020. +# +msgid "" +msgstr "" +"Project-Id-Version: 0.6.0\n" +"Report-Msgid-Bugs-To: rocs-office@nii.ac.jp\n" +"POT-Creation-Date: 2020-09-03 12:45+0900\n" +"PO-Revision-Date: 2020-09-03 12:45+0900\n" +"Last-Translator: Shunta Nishikawa\n" +"Language: ja\n" +"Language-Team: RCOS \n" +"Plural-Forms: nplurals=1; plural=0\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.7.0\n" + +#: addons/twofactor/static/twoFactorUserConfig.js:148 +#: addons/twofactor/static/twoFactorUserConfig.js:190 +#: admin/static/js/rdm_addons/rdm-addons-page.js:71 +#: website/static/js/accountSettings.js:286 +#: website/static/js/accountSettings.js:351 +#: website/static/js/accountSettings.js:477 +#: website/static/js/accountSettings.js:549 +#: website/static/js/addProjectPlugin.js:347 +#: website/static/js/addonPermissions.js:55 +#: website/static/js/addonSettings.js:71 website/static/js/addonSettings.js:134 +#: website/static/js/apiApplication.js:249 +#: website/static/js/apiApplication.js:420 +#: website/static/js/apiApplication.js:487 +#: website/static/js/apiPersonalToken.js:228 +#: website/static/js/apiPersonalToken.js:399 +#: website/static/js/apiPersonalToken.js:426 +#: website/static/js/citationsNodeConfig.js:169 +#: website/static/js/citationsNodeConfig.js:187 +#: website/static/js/contribManager.js:433 website/static/js/fangorn.js:537 +#: website/static/js/fangorn.js:542 website/static/js/fangorn.js:1212 +#: website/static/js/fangorn.js:1235 website/static/js/fangorn.js:1288 +#: website/static/js/fangorn.js:1307 website/static/js/fangorn.js:2006 +#: website/static/js/filepage/index.js:213 +#: website/static/js/folderPickerNodeConfig.js:510 +#: website/static/js/folderPickerNodeConfig.js:566 +#: website/static/js/institutionProjectSettings.js:102 +#: website/static/js/licensePicker.js:243 website/static/js/myProjects.js:1560 +#: website/static/js/myProjects.js:1608 website/static/js/myProjects.js:1632 +#: website/static/js/nodeControl.js:227 +#: website/static/js/oauthAddonNodeConfig.js:156 +#: website/static/js/oauthAddonNodeConfig.js:174 +#: website/static/js/osfHelpers.js:796 website/static/js/osfHelpers.js:897 +#: website/static/js/pages/profile-settings-addons-page.js:35 +#: website/static/js/pages/profile-settings-addons-page.js:101 +#: website/static/js/pages/project-addons-page.js:41 +#: website/static/js/pages/project-addons-page.js:66 +#: website/static/js/privateLinkTable.js:119 website/static/js/profile.js:373 +#: website/static/js/profile.js:743 website/static/js/profile.js:975 +#: website/static/js/project.js:39 website/static/js/project.js:143 +#: website/static/js/project.js:253 +#: website/static/js/wikiSettingsTreebeard.js:31 +msgid "Cancel" +msgstr "キャンセル" + +#: addons/twofactor/static/twoFactorUserConfig.js:178 +msgid "Enable Two-factor Authentication" +msgstr "2要素認証を有効にする" + +#: addons/twofactor/static/twoFactorUserConfig.js:179 +msgid "" +"Enabling two-factor authentication will not immediately activate this " +"feature for your account. You will need to follow the steps that appear " +"below to complete the activation of two-factor authentication for your " +"account." +msgstr "" +"2要素認証を有効にしても、アカウントのこの機能はすぐには有効になりません。 " +"アカウントの2要素認証のアクティベーションを完了するには、以下に表示される手順に従う必要があります。" + +#: addons/twofactor/static/twoFactorUserConfig.js:187 +msgid "Enable" +msgstr "有効にする" + +#: addons/wiki/static/WikiEditor.js:86 +msgid "Live editing mode" +msgstr "ライブ編集モード" + +#: addons/wiki/static/WikiEditor.js:88 +msgid "Attempting to connect" +msgstr "接続試行中" + +#: addons/wiki/static/WikiEditor.js:90 +msgid "Unsupported browser" +msgstr "サポートされていないブラウザ" + +#: addons/wiki/static/WikiEditor.js:92 +msgid "Unavailable: Live editing" +msgstr "利用不可:ライブ編集" + +#: addons/wiki/static/WikiEditor.js:153 +msgid "The wiki content could not be loaded." +msgstr "Wikiコンテンツをロードできませんでした。" + +#: addons/wiki/static/WikiEditor.js:155 +msgid "Could not GET wiki contents." +msgstr "Wikiコンテンツを取得できませんでした。" + +#: addons/wiki/static/WikiEditor.js:176 +msgid "There are unsaved changes to your wiki. If you exit " +msgstr "wikiに未保存の変更があります。" + +#: addons/wiki/static/WikiEditor.js:177 +msgid "the page now, those changes may be lost." +msgstr "ここでページを終了すると、これらの変更が失われる可能性があります。" + +#: addons/wiki/static/wikiPage.js:94 +#: website/static/js/pages/project-dashboard-page.js:733 +msgid "" +"*Add important information, links, or images here to describe your " +"project.*" +msgstr "*重要な情報、リンク、または画像をここに追加して、プロジェクトを説明してください。*" + +#: addons/wiki/static/wikiPage.js:96 +#: website/static/js/pages/project-dashboard-page.js:735 +msgid "*No wiki content.*" +msgstr "* Wikiコンテンツはありません。*" + +#: addons/wiki/static/wikiPage.js:220 +msgid "Live preview" +msgstr "ライブプレビュー" + +#: addons/wiki/static/wikiPage.js:222 +msgid "Current version" +msgstr "現在のバージョン" + +#: addons/wiki/static/wikiPage.js:224 +msgid "Previous version" +msgstr "前のバージョン" + +#: addons/wiki/static/wikiPage.js:226 +msgid "Version " +msgstr "バージョン" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:48 +msgid "Strong " +msgstr "強調構文 " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:51 +msgid "Emphasis " +msgstr "強調構文 " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:54 +msgid "Spellcheck: Toggle spellcheck on and off" +msgstr "スペルチェック:スペルチェックのオンとオフを切り替えます" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:56 +msgid "Hyperlink " +msgstr "ハイパーリンク " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:60 +msgid "Blockquote

          " +msgstr "引用構文
          " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:63 +msgid "Code Sample
          "
          +msgstr "コードサンプル 
          "
          +
          +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:66
          +msgid "Image "
          +msgstr "画像 "
          +
          +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:70
          +msgid "Numbered List 
            " +msgstr "段落番号
              " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:71 +msgid "Bulleted List
                " +msgstr "箇条書き
                  " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:72 +msgid "List item" +msgstr "リストアイテム" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:74 +msgid "Heading

                  /

                  " +msgstr "見出し

                  /

                  " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:77 +msgid "Horizontal Rule
                  " +msgstr "水平の罫線
                  " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:79 +msgid "Undo -" +msgstr "元に戻す -" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:80 +msgid "Redo -" +msgstr "やり直す -" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:82 +msgid "Wiki Syntax Help" +msgstr "Wiki構文のヘルプ" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:1939 +msgid "Autocomplete" +msgstr "自動更新" + +#: addons/jupyterhub/static/files.js:92 +msgid "Launch" +msgstr "起動" + +#: admin/static/js/collection_providers/collectionProviders.js:9 +msgid "Hide Form" +msgstr "フォームを隠す" + +#: admin/static/js/collection_providers/collectionProviders.js:9 +msgid "Modify Collection Provider" +msgstr "コレクションプロバイダを変更" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:64 +#, python-format +msgid "Disallow %s?" +msgstr "%sを禁止しますか?" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:65 +msgid "Are you sure you want to disallow the %1$s?
                  " +msgstr "%1$sを禁止してもよろしいですか?
                  " + +#: admin/static/js/rdm_addons/rdm-addons-page.js:66 +msgid "" +"This will revoke access to %1$s for all projects using the " +"accounts.

                  " +msgstr "これにより、アカウントを使用するすべてのプロジェクトの%1$sへのアクセスが取り消されます。

                  " + +#: admin/static/js/rdm_addons/rdm-addons-page.js:67 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:395 +msgid "Type the following to continue: %1$s

                  " +msgstr "次を入力して続行します。%1$s

                  " + +#: admin/static/js/rdm_addons/rdm-addons-page.js:74 +msgid "Disallow" +msgstr "禁止" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:85 +msgid "Strings did not match" +msgstr "文字列が一致しませんでした" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:26 +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:19 +msgid "Other (Please Specify)" +msgstr "その他(具体的にご記入ください)" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:85 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:100 +#: website/static/js/addonSettings.js:171 +msgid "Error while updating addon account" +msgstr "アドオンアカウントの更新中にエラーが発生しました" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:100 +msgid "Please select a Dataverse repository." +msgstr "Dataverseリポジトリを選択してください。" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:105 +msgid "Please enter an API token." +msgstr "APIトークンを入力してください。" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:110 +msgid "Please enter a Dataverse host and an API token." +msgstr "DataverseホストとAPIトークンを入力してください。" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:131 +msgid "Could not authenticate with Dataverse" +msgstr "Dataverseで認証できませんでした" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:144 +msgid "Disconnect Dataverse Account?" +msgstr "Dataverseアカウントを切断しますか?" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:146 +msgid "" +"Are you sure you want to disconnect the Dataverse account on " +"%1$s? This will revoke access to Dataverse for all " +"projects associated with this account." +msgstr "" +"%1$sのDataverseアカウントを切断してもよろしいですか? " +"これにより、このアカウントに関連付けられているすべてのプロジェクトのDataverseへのアクセスが取り消されます。" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:155 +#: admin/static/js/rdm_addons/figshare/rdm-cfg.js:34 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:124 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:411 +#: website/static/js/addonSettings.js:130 +#: website/static/js/folderPickerNodeConfig.js:562 +msgid "Disconnect" +msgstr "切断" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:173 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:142 +#: website/static/js/addonSettings.js:150 +msgid "Error while removing addon authorization for %1$s" +msgstr "%1$sのアドオン認証を削除中にエラーが発生しました" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:212 +msgid "Could not GET Dataverse settings" +msgstr "Dataverse設定を取得できませんでした" + +#: admin/static/js/rdm_addons/figshare/rdm-cfg.js:17 +msgid "Disconnect figshare Account?" +msgstr "figshareアカウントを切断しますか?" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:46 +msgid "Invalid management URL: " +msgstr "無効な管理URL:" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:61 +msgid "Saving management project was successful" +msgstr "管理プロジェクトの保存に成功しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:63 +msgid "Error while saving addon management project" +msgstr "アドオン管理プロジェクトの保存中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:71 +msgid "Permission error while saving management project" +msgstr "管理プロジェクトの保存中のアクセス許可エラー" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:73 +msgid "Error while saving management project" +msgstr "管理プロジェクトの保存中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:91 +msgid "Removing management project was successful" +msgstr "管理プロジェクトの削除に成功しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:93 +msgid "Error while removing addon management project" +msgstr "アドオン管理プロジェクトの削除中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:101 +msgid "Permission error while removing management project" +msgstr "管理プロジェクトの削除中に権限エラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:103 +msgid "Error while removing management project" +msgstr "管理プロジェクトの削除中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:118 +msgid "Error while fetching addon management project" +msgstr "アドオン管理プロジェクトの取得中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:149 +msgid "Saving organizational project was successful" +msgstr "組織プロジェクトの保存に成功しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:151 +msgid "Error while saving addon organizational project" +msgstr "アドオン組織プロジェクトの保存中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:159 +msgid "Permission error while saving organizational project" +msgstr "組織プロジェクトの保存中に権限エラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:161 +msgid "Error while saving organizational project" +msgstr "組織プロジェクトの保存中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:179 +msgid "Removing organizational project was successful" +msgstr "組織プロジェクトの削除に成功しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:181 +msgid "Error while removing addon organizational project" +msgstr "アドオン組織プロジェクトの削除中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:189 +msgid "Permission error while removing organizational project" +msgstr "組織プロジェクトの削除中に許可エラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:191 +msgid "Error while removing organizational project" +msgstr "組織プロジェクトの削除中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:206 +msgid "Error while fetching addon organization project" +msgstr "アドオン組織プロジェクトの取得中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:222 +msgid "Error while fetching management project" +msgstr "管理プロジェクトの取得中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:226 +msgid "Error while fetching organizational project" +msgstr "組織プロジェクトの取得中にエラーが発生しました" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:58 +msgid "Could not GET OwnCloud settings" +msgstr "OwnCloud設定を取得できませんでした" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:75 +msgid "Please enter an ownCloud server." +msgstr "ownCloudサーバーを入力してください。" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:77 +msgid "Please select an ownCloud server." +msgstr "ownCloudサーバーを選択してください。" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:82 +msgid "Please enter a username and password." +msgstr "ユーザー名とパスワードを入力してください。" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:86 +msgid "Please enter an ownCloud host and credentials." +msgstr "ownCloudホストと資格情報を入力してください。" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:104 +msgid "Could not authenticate with ownCloud" +msgstr "ownCloudで認証できませんでした" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:48 +msgid "Please enter both an API access key and secret key." +msgstr "APIアクセスキーとシークレットキーの両方を入力してください。" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:53 +msgid "Please enter an API access key." +msgstr "APIアクセスキーを入力してください。" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:58 +msgid "Please enter an API secret key." +msgstr "APIシークレットキーを入力してください。" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:75 +msgid "Could not authenticate with S3" +msgstr "S3で認証できませんでした" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:113 +msgid "Disconnect Amazon S3 Account?" +msgstr "Amazon S3アカウントを切断しますか?" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:115 +msgid "" +"Are you sure you want to disconnect the S3 account %1$s?" +" This will revoke access to S3 for all projects associated with this " +"account." +msgstr "" +"S3アカウント%1$sを切断してもよろしいですか?これにより、このアカウントに関連付けられているすべてのプロジェクトのS3へのアクセスが取り消されます。" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:80 +msgid "Are you sure you want to change institutional storage?" +msgstr "機関のストレージを変更してもよろしいですか?" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:81 +msgid "" +"

                  The previous storage will no longer be available to all contributors " +"on the project.

                  " +msgstr "

                  以前のストレージは、プロジェクトのすべてのメンバーが利用できなくなります。

                  " + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:85 +#: website/static/js/folderPickerNodeConfig.js:100 +#: website/static/js/folderPickerNodeConfig.js:102 +#: website/static/js/folderPickerNodeConfig.js:594 +msgid "Change" +msgstr "変更" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:264 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:491 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:626 +msgid "Some errors occurred" +msgstr "いくつかのエラーが発生しました" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:311 +msgid "Institutional Storage set successfully" +msgstr "機関ストレージが正常に設定されました" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:391 +#: website/static/js/addonSettings.js:118 +msgid "Disconnect Account?" +msgstr "アカウントを切断しますか?" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:393 +msgid "" +"Are you sure you want to disconnect the %1$s account " +"%2$s?
                  " +msgstr "1$sアカウント%2$sを切断してもよろしいですか?" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:394 +msgid "" +"This will revoke access to %1$s for all projects using this " +"account.

                  " +msgstr "これにより、このアカウントを使用するすべてのプロジェクトの%1$sへのアクセスが取り消されます。" + +#: scripts/translations/messages_addonsJson.js:3 +msgid "" +"\n" +"\n" +"

                  Box Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking a GakuNin RDM project public or private is " +"independent of Box privacy. The GakuNin RDM does not alter the " +"permissions of linked Box folders.
                  View / download file versionsBox files and their versions can be viewed/downloaded" +" via GakuNin RDM.
                  Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Box.
                  Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Box.
                  LogsThe GakuNin RDM keeps track of changes you make to " +"your Box content through the GakuNin RDM, but not for changes made using " +"Box directly.
                  ForkingForking a project or component does not copy Box " +"authorization unless the user forking the project is the same user who " +"authorized the Box add-on in the source project being forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  Box アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Boxのプライバシー設定とは独立しています。GakuNin " +"RDMはリンクされたBoxフォルダの権限を変更することはありません。
                  ファイルバージョンの閲覧/ダウンロードBoxファイルとそのバージョンはGakuNin RDM経由で閲覧/ダウンロードできます。
                  ファイルの追加/更新GakuNin RDM経由でプロジェクトのファイルを追加/更新すると、Boxにも反映されます。
                  ファイルの削除GakuNin RDM経由で削除したファイルは、Boxでも削除されます。
                  ログGakuNin RDM経由で行われたBoxコンテンツへの変更の履歴はGakuNin " +"RDMに記録されますが、直接Boxを使って行われた変更は記録されません。
                  フォークプロジェクトやコンポーネントのフォーク時、Boxの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでBoxアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:5 +msgid "" +"\n" +"\n" +"

                  Dataverse Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Dataverse study public or private. The GakuNin " +"RDM allows you to release the latest draft version of a Dataverse " +"dataset.
                  View / download file versionsFiles from the latest release of the selected " +"Dataverse study can be viewed/downloaded. GakuNin RDM users with write " +"permissions can view/download draft files as well.
                  Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Dataverse.
                  Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Dataverse.
                  LogsThe GakuNin RDM keeps track of changes you make to " +"your Dataverse studies through the GakuNin RDM, but not for changes made " +"using Dataverse directly.
                  ForkingForking a project or component does not copy " +"Dataverse authorization unless the user forking the project is the same " +"user who authorized the Dataverse add-on in the source project being " +"forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  Dataverse アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Dataverse研究をパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMでは最新のドラフトバージョンのDataverseデータセットのリリースが行えます。
                  ファイルバージョンの閲覧/ダウンロード選択したDataverse研究の最新リリースのファイルを閲覧/ダウンロードできます。書き込み許可を持つGakuNin " +"RDMユーザーは、ドラフトファイルも閲覧/ダウンロードできます。
                  ファイルの追加/更新GakuNin " +"RDM経由でプロジェクトのファイルを追加/更新すると、Dataverseにも反映されます。
                  ファイルの削除GakuNin RDM経由で削除したファイルは、Dataverseでも削除されます。
                  ログGakuNin RDM経由で行われたDataverse研究への変更の履歴はGakuNin " +"RDMに記録されますが、直接Dataverseを使って行われた変更は記録されません。
                  フォークプロジェクトやコンポーネントのフォーク時、Dataverseの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでDataverseアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:7 +msgid "" +"\n" +"\n" +"

                  Dropbox Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking a GakuNin RDM project public or private is " +"independent of Dropbox privacy. The GakuNin RDM does not alter the " +"permissions of linked Dropbox folders.
                  View / download file versionsDropbox files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                  Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Dropbox.
                  Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Dropbox.
                  LogsGakuNin RDM keeps track of changes you make to your " +"Dropbox content through GakuNin RDM, but not for changes made using " +"Dropbox directly.
                  ForkingForking a project or component does not copy Dropbox " +"authorization unless the user forking the project is the same user who " +"authorized the Dropbox add-on in the source project being forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  Dropbox アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Dropboxのプライバシー設定とは独立しています。GakuNin " +"RDMはリンクされたDropboxフォルダの権限を変更することはありません。
                  ファイルバージョンの閲覧/ダウンロードDropboxファイルとそのバージョンはGakuNin RDM経由で閲覧/ダウンロードできます。
                  ファイルの追加/更新GakuNin " +"RDM経由でプロジェクトのファイルを追加/更新すると、Dropboxにも反映されます。
                  ファイルの削除GakuNin RDM経由で削除したファイルは、Dropboxでも削除されます。
                  ログGakuNin RDM経由で行われたDropboxコンテンツへの変更の履歴はGakuNin " +"RDMに記録されますが、直接Dropboxを使って行われた変更は記録されません。
                  フォークプロジェクトやコンポーネントのフォーク時、Dropboxの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでDropboxアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:9 +msgid "" +"\n" +"\n" +"

                  figshare Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  Permissions Making a GakuNin RDM project public or private is " +"independent of making figshare content public or private. The GakuNin RDM" +" does not alter the permissions of linked figshare content.
                  View / download file versionsfigshare files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported.
                  Add / update filesFiles can be added but not updated.
                  Delete filesPrivate files and filesets can be deleted via GakuNin" +" RDM.
                  LogsGakuNin RDM keeps track of changes you make to your " +"figshare content through GakuNin RDM, but not for changes made using " +"figshare directly.
                  ForkingForking a project or component does not copy figshare" +" authorization unless the user forking the project is the same user who " +"authorized the figshare add-on in the source project being forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  figshare アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、figshareコンテンツをパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMはリンクされたfigshareコンテンツの権限を変更することはありません。
                  ファイルバージョンの閲覧/ダウンロードfigshareファイルはGakuNin " +"RDM経由で閲覧/ダウンロードできますが、バージョン履歴はサポートされていません。
                  ファイルの追加/更新ファイルの追加はできますが更新はできません。
                  ファイルの削除プライベートファイルとファイルセットはGakuNin RDM経由で削除できます。
                  ログGakuNin RDM経由で行われたfigshareコンテンツへの変更の履歴はGakuNin " +"RDMに記録されますが、直接figshareを使って行われた変更は記録されません。
                  フォークプロジェクトやコンポーネントのフォーク時、figshareの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでfigshareアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:11 +msgid "" +"\n" +"\n" +"

                  GitHub Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a GitHub repo public or private. The GakuNin RDM " +"does not alter the permissions of linked GitHub repos.
                  View / download file versionsGitHub files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                  Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in GitHub.
                  Delete filesFiles deleted via GakuNin RDM will be deleted in " +"GitHub.
                  LogsGitHub dynamically updates GakuNin RDM logs when " +"files are modified outside the GakuNin RDM. Changes to GitHub repos made " +"before the repo is linked to the GakuNin RDM will not be reflected in " +"GakuNin RDM logs.
                  ForkingForking a project or component does not copy Github " +"authorization unless the user forking the project is the same user who " +"authorized the Github add-on in the source project being forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  GitHub アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、GitHubリポジトリをパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMはリンクされたGitHubリポジトリの権限を変更することはありません。
                  ファイルバージョンの閲覧/ダウンロードGitHubファイルとそのバージョンはGakuNin RDM経由で閲覧/ダウンロードできます。
                  ファイルの追加/更新GakuNin " +"RDM経由でプロジェクトのファイルを追加/更新すると、GitHubにも反映されます。
                  ファイルの削除GakuNin RDM経由で削除したファイルは、GitHubでも削除されます。
                  ログGakuNin RDM外でファイルが変更された場合、GitHubは同時にGakuNin " +"RDMログを更新します。GakuNin RDMへリンクする以前にGitHubリポジトリに加えられた変更は、GakuNin " +"RDMログには反映されません。
                  フォークプロジェクトやコンポーネントのフォーク時、Githubの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでGithubアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:13 +msgid "" +"\n" +"\n" +"

                  GitLab Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a GitLab repo public or private. The GakuNin RDM " +"does not alter the permissions of linked GitLab repos.
                  View / download file versionsGitLab files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                  Add / update filesAdding/updating files in the project via GakuNin RDM " +"is not implemented yet.
                  Delete filesDeleting files via GakuNin RDM is not implemented " +"yet.
                  LogsGakuNin RDM does not keep track of changes made using" +" Gitlab directly.
                  ForkingForking a project or component does not copy GitLab " +"authorization unless the user forking the project is the same user who " +"authorized the GitLab add-on in the source project being forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  GitLab アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                  規約ステータス
                  権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、GitLabリポジトリをパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMはリンクされたGitLabリポジトリの権限を変更することはありません。
                  ファイルバージョンの閲覧/ダウンロードGitLabファイルとそのバージョンはGakuNin RDM経由で閲覧/ダウンロードできます。
                  ファイルの追加/更新GakuNin RDM経由でプロジェクトのファイルを追加/更新する機能はまだ実装されていません。
                  ファイルの削除GakuNin RDM経由でファイルを削除する機能はまだ実装されていません。
                  ログ直接Gitlabを使って行われた変更の履歴はGakuNin RDMに記録されません。
                  フォークプロジェクトやコンポーネントのフォーク時、GitLabの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでGitLabアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:15 +msgid "" +"\n" +"\n" +"

                  Mendeley Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Mendeley folder public or private. The GakuNin " +"RDM does not alter the permissions of a linked Mendeley folder.
                  ForkingForking a project or component does not copy Mendeley" +" authorization unless the user forking the project is the same user who " +"authorized the Mendeley add-on in the source project being forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  Mendeley アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Mendeleyフォルダをパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMはリンクされたMendeleyフォルダの権限を変更することはありません。
                  フォークプロジェクトやコンポーネントのフォーク時、Mendeleyの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでMendeleyアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:17 +msgid "" +"\n" +"\n" +"

                  Zotero Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Zotero folder public or private. The GakuNin RDM " +"does not alter the permissions of a linked Zotero folder.
                  ForkingForking a project or component does not copy Zotero " +"authorization unless the user forking the project is the same user who " +"authorized the Zotero add-on in the source project being forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  Zotero アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Zoteroフォルダをパブリックまたはプライベートにする設定とは独立しています。GakuNin " +"RDMはリンクされたZoteroフォルダの権限を変更することはありません。
                  フォークプロジェクトやコンポーネントのフォーク時、Zoteroの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでZoteroアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:19 +msgid "" +"\n" +"\n" +"

                  ownCloud Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking a GakuNin RDM project public or private is " +"independent of ownCloud privacy. The GakuNin RDM does not alter the " +"permissions of linked ownCloud folders.
                  View / download file versionsownCloud files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported by the ownCloud WebDAV " +"API.
                  Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in ownCloud.
                  Delete filesFiles deleted via GakuNin RDM will be deleted in " +"ownCloud.
                  LogsGakuNin RDM keeps track of changes you make to your " +"ownCloud content through GakuNin RDM, but not for changes made using " +"ownCloud directly.
                  ForkingForking a project or component does not copy ownCloud" +" authorization unless the user forking the project is the same user who " +"authorized the ownCloud add-on in the source project being forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  ownCloud アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、ownCloudのプライバシー設定とは独立しています。GakuNin " +"RDMはリンクされたownCloudフォルダの権限を変更することはありません。
                  ファイルバージョンの閲覧/ダウンロードownCloudのファイルは、GakuNin RDMから閲覧 / " +"ダウンロードをすることができますが、バージョン履歴はownCloud WebDAV APIではサポートされていません。
                  ファイルの追加/更新GakuNin RDMからプロジェクトのファイルを追加 / " +"更新すると、ownCloudに反映されます。
                  ファイルの削除GakuNin RDMから削除されたファイルは、ownCloudで削除されます。
                  ログGakuNin RDMは、Gaku Nin " +"RDMからownCloudのコンテンツに行った変更を追跡しますが、ownCloudを使って直接行った変更については追跡しません。
                  フォークプロジェクトやコンポーネントのフォーク時、ownCloudの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでownCloudアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:21 +msgid "" +"\n" +"\n" +"

                  OneDrive Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking a GakuNin RDM project public or private is " +"independent of OneDrive privacy. The GakuNin RDM does not alter the " +"permissions of linked OneDrive folders.
                  View / download file versionsOneDrive files and their versions can be " +"viewed/downloaded via GakuNin RDM. OneNote files are unexportable and " +"cannot be downloaded or viewed.
                  Add / update filesThe OneDrive add-on is read-only.
                  Delete filesThe OneDrive add-on is read-only.
                  LogsGakuNin RDM keeps track of changes you make to your " +"OneDrive add-on configuration. It does not track changes to OneDrive " +"content.
                  ForkingForking a project or component does not copy OneDrive" +" authorization unless the user forking the project is the same user who " +"authorized the OneDrive add-on in the source project being forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  OneDrive アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、OneDriveのプライバシー設定とは独立しています。GakuNin " +"RDMはリンクされたOneDriveフォルダの権限を変更することはありません。
                  ファイルバージョンの閲覧/ダウンロードOneDriveファイルとそのバージョンはGakuNin " +"RDM経由で閲覧/ダウンロードできます。OneNoteファイルはエクスポート不可で、ダウンロードも閲覧もできません。
                  ファイルの追加/更新OneDriveアドオンは読み取り専用です。
                  ファイルの削除OneDriveアドオンは読み取り専用です。
                  ログOneDriveアドオン設定に加えられた変更の履歴はGakuNin " +"RDMに記録されますが、OneDriveコンテンツへの変更の履歴は記録されません。
                  フォークプロジェクトやコンポーネントのフォーク時、OneDriveの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでOneDriveアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:23 +msgid "" +"\n" +"\n" +"

                  Amazon S3 Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an S3 bucket public or private. The GakuNin RDM " +"does not alter the permissions of linked S3 buckets.
                  View / download file versionsThe S3 add-on supports file versions if versioning is" +" enabled for your S3 buckets.
                  Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Amazon S3.
                  Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Amazon S3.
                  LogsThe GakuNin RDM keeps track of changes you make to " +"your S3 buckets through the GakuNin RDM, but not for changes made using " +"S3 directly.
                  ForkingForking a project or component does not copy S3 " +"authorization unless the user forking the project is the same user who " +"authorized the S3 add-on in the source project being forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  Amazon S3 アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、S3バケットをパブリックまたはプライベートにする設定とは独立しています。GakuNin " +"RDMはリンクされたS3バケットの権限を変更することはありません。
                  ファイルバージョンの閲覧/ダウンロードご利用のS3でバージョニングが有効になっている場合は、S3アドオンでファイルバージョンがサポートされます。
                  ファイルの追加/更新GakuNin RDM経由でプロジェクトのファイルを追加/更新すると、Amazon " +"S3にも反映されます。
                  ファイルの削除GakuNin RDM経由で削除したファイルは、Amazon S3でも削除されます。
                  ログGakuNin RDM経由で行われたS3バケットへの変更の履歴はGakuNin " +"RDMに記録されますが、直接S3を使って行われた変更は記録されません。
                  フォークプロジェクトやコンポーネントのフォーク時、S3の認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでS3アドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:25 +msgid "" +"\n" +"\n" +"

                  Google Drive Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking a GakuNin RDM project public or private is " +"independent of Google Drive privacy. The GakuNin RDM does not alter the " +"permissions of linked Google Drive folders.
                  View / download file versionsGoogle Drive files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                  Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Google Drive.
                  Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Google Drive.
                  LogsThe GakuNin RDM keeps track of changes you make to " +"your Google Drive content through the GakuNin RDM, but not for changes " +"made using Google Drive directly.
                  ForkingForking a project or component does not copy Google " +"Drive authorization unless the user forking the project is the same user " +"who authorized the Google Drive add-on in the source project being " +"forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  Google Drive アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin RDMプロジェクトを公開または非公開にする設定は、Google " +"Driveのプライバシー設定とは独立しています。GakuNin RDMはリンクされたGoogle " +"Driveフォルダの権限を変更することはありません。
                  ファイルバージョンの閲覧/ダウンロードGoogle DriveファイルとそのバージョンはGakuNin " +"RDM経由で閲覧/ダウンロードできます。
                  ファイルの追加/更新GakuNin RDM経由でプロジェクトのファイルを追加/更新すると、Google " +"Driveにも反映されます。
                  ファイルの削除GakuNin RDM経由で削除したファイルは、Google Driveでも削除されます。
                  ログGakuNin RDM経由で行われたGoogle Driveコンテンツへの変更の履歴はGakuNin " +"RDMに記録されますが、直接Google Driveを使って行われた変更は記録されません。
                  フォークプロジェクトやコンポーネントのフォーク時、Google " +"Driveの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでGoogle " +"Driveアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:27 +msgid "" +"\n" +"\n" +"

                  Bitbucket Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Bitbucket repo public or private. The GakuNin RDM" +" does not alter the permissions of linked Bitbucket repos.
                  View / download file versionsBitbucket files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                  Add / update filesBitbucket does not support adding or updating files " +"via their API.
                  Delete filesBitbucket does not support deleting files via their " +"API.
                  LogsGakuNin RDM keeps track of changes you make to your " +"Bitbucket content through GakuNin RDM, but not for changes made using " +"Bitbucket directly.
                  ForkingForking a project or component does not copy " +"Bitbucket authorization unless the user forking the project is the same " +"user who authorized the Bitbucket add-on in the source project being " +"forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  Bitbucket アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                  規約ステータス
                  権限GakuNin GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Bitbucketリポジトリをパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMはリンクされたBitbucketリポジトリの権限を変更することはありません。
                  ファイルバージョンの閲覧/ダウンロードBitbucketのファイルおよびそのバージョンは、GakuNin RDMから閲覧 / " +"ダウンロードすることができます。
                  ファイルの追加/更新Bitbucketは、APIからのファイルの追加または更新をサポートしていません。
                  ファイルの削除Bitbucketは、APIからのファイルの削除をサポートしていません。
                  ログGakuNin RDMは、Gaku Nin " +"RDMからBitbucketのコンテンツに行った変更を追跡しますが、Bitbucketを使って直接行った変更については追跡しません。
                  フォークプロジェクトやコンポーネントのフォーク時、Bitbucketの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでBitbucketアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:29 +msgid "" +"\n" +"\n" +"

                  Azure Blob Storage Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an Azure Blob Storage container public or " +"private.
                  View / download file versionsThe Azure Blob Storage add-on supports only Block " +"Blobs, and does not support file versions.
                  Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Azure Blob Storage.
                  Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Azure Blob Storage.
                  LogsThe GakuNin RDM keeps track of changes you make to " +"your Azure Blob Storage containers through the GakuNin RDM, but not for " +"changes made using Azure Blob Storage directly.
                  ForkingForking a project or component does not copy Azure " +"Blob Storage authorization unless the user forking the project is the " +"same user who authorized the Azure Blob Storage add-on in the source " +"project being forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  Azure Blob Storage アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin RDMプロジェクトを公開または非公開にする設定は、Azure Blob " +"Storageコンテナをパブリックまたはプライベートにする設定とは独立しています。
                  ファイルバージョンの閲覧/ダウンロードAzure Blob StorageのアドオンはBlock " +"Blobsのみをサポートしており、ファイルバージョンはサポートされていません。
                  ファイルの追加/更新GakuNin RDMからプロジェクトのファイルを追加 / 更新すると、Azure Blob " +"Storageに反映されます。
                  ファイルの削除GakuNin RDMから削除されたファイルは、Azure Blob " +"Storageで削除されます。
                  ログGakuNin RDMは、Gaku Nin RDMからAzure Blob " +"Storageのコンテナに行った変更を追跡しますが、Azure Blob Storageを使って直接行った変更については追跡しません。
                  フォークプロジェクトやコンポーネントのフォーク時、Azure Blob " +"Storageの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでAzure Blob " +"Storageアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:31 +msgid "" +"\n" +"\n" +"

                  Nextcloud Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking a GakuNin RDM project public or private is " +"independent of Nextcloud privacy. The GakuNin RDM does not alter the " +"permissions of linked Nextcloud folders.
                  View / download file versionsNextcloud files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported by the Nextcloud WebDAV " +"API.
                  Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Nextcloud.
                  Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Nextcloud.
                  LogsGakuNin RDM keeps track of changes you make to your " +"Nextcloud content through GakuNin RDM, but not for changes made using " +"Nextcloud directly.
                  ForkingForking a project or component does not copy " +"Nextcloud authorization unless the user forking the project is the same " +"user who authorized the Nextcloud add-on in the source project being " +"forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  Nextcloud アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Nextcloudのプライバシー設定とは独立しています。GakuNin " +"RDMはリンクされたNextcloudフォルダの権限を変更することはありません。
                  ファイルバージョンの閲覧/ダウンロードNextcloudのファイルは、GakuNin RDMから閲覧 / " +"ダウンロードをすることができますが、バージョン履歴はNextcloud WebDAV APIではサポートされていません。
                  ファイルの追加/更新GakuNin RDMからプロジェクトのファイルを追加 / " +"更新すると、Nextcloudに反映されます。
                  ファイルの削除GakuNin RDMから削除されたファイルは、Nextcloudで削除されます。
                  ログGakuNin RDMは、Gaku Nin " +"RDMからNextcloudのコンテンツに行った変更を追跡しますが、Nextcloudを使って直接行った変更については追跡しません。
                  フォークプロジェクトやコンポーネントのフォーク時、Nextcloudの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでNextcloudアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:33 +msgid "" +"\n" +"\n" +"

                  OpenStack Swift Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an Swift container public or private.
                  View / download file versionsThe Swift add-on does not support file versions.
                  Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Swift.
                  Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Swift.
                  LogsThe GakuNin RDM keeps track of changes you make to " +"your Swift containers through the GakuNin RDM, but not for changes made " +"using Swift directly.
                  ForkingForking a project or component does not copy Swift " +"authorization unless the user forking the project is the same user who " +"authorized the Swift add-on in the source project being forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  OpenStack Swift アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Swiftコンテナをパブリックまたはプライベートにする設定とは独立しています。
                  ファイルバージョンの閲覧/ダウンロードSwiftアドオンは、ファイルバージョンをサポートしていません。
                  ファイルの追加/更新GakuNin RDMからプロジェクトのファイルを追加 / " +"更新すると、Swiftに反映されます。
                  ファイルの削除GakuNin RDMから削除されたファイルは、Swiftで削除されます。
                  ログGakuNin RDMは、Gaku Nin " +"RDMからSwiftのコンテナに行った変更を追跡しますが、Swiftを使って直接行った変更については追跡しません。
                  フォークプロジェクトやコンポーネントのフォーク時、Swiftの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでSwiftアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:35 +msgid "" +"\n" +"\n" +"

                  S3 Compatible Storage Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an S3 Compatible Storage bucket public or private. " +"The GakuNin RDM does not alter the permissions of linked S3 Compatible " +"Storage buckets.
                  View / download file versionsThe S3 add-on supports file versions if versioning is" +" enabled for your S3 Compatible Storage buckets.
                  Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in S3 Compatible Storage.
                  Delete filesFiles deleted via GakuNin RDM will be deleted in S3 " +"Compatible Storage.
                  LogsThe GakuNin RDM keeps track of changes you make to " +"your S3 Compatible Storage buckets through the GakuNin RDM, but not for " +"changes made using S3 Compatible Storage directly.
                  ForkingForking a project or component does not copy S3 " +"Compatible Storage authorization unless the user forking the project is " +"the same user who authorized the S3 Compatible Storage add-on in the " +"source project being forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  S3 Compatible Storage アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin RDMプロジェクトを公開または非公開にする設定は、S3 Compatible " +"Storageバケットをパブリックまたはプライベートにする設定とは独立しています。GakuNin RDMはリンクされたS3 Compatible " +"Storageバケットの権限を変更することはありません。
                  ファイルバージョンの閲覧/ダウンロードS3 Compatible " +"Storageバケットのバージョニングが有効になっていれば、S3アドオンはファイルバージョンをサポートします。
                  ファイルの追加/更新GakuNin RDMからプロジェクトのファイルを追加 / 更新すると、S3 Compatible " +"Storageに反映されます。
                  ファイルの削除GakuNin RDMから削除されたファイルは、S3 Compatible " +"Storageで削除されます。
                  ログGakuNin RDMは、Gaku Nin RDMからS3 Compatible " +"Storageのバケットに行った変更を追跡しますが、S3 Compatible " +"Storageを使って直接行った変更については追跡しません。
                  フォークプロジェクトやコンポーネントのフォーク時、S3 Compatible " +"Storageの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでS3 Compatible " +"Storageアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:37 +msgid "" +"\n" +"\n" +"

                  WEKO Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  Add / update filesAdding/updating indices/items in the project via " +"GakuNin RDM will be reflected in WEKO.
                  Delete filesItems deleted via GakuNin RDM will be deleted in " +"WEKO.
                  LogsThe GakuNin RDM keeps track of changes you make to " +"your WEKO index through the GakuNin RDM, but not for changes made using " +"WEKO directly.
                  ForkingForking a project or component does not copy WEKO " +"authorization unless the user forking the project is the same user who " +"authorized the WEKO add-on in the source project being forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  WEKO アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  ファイルの追加/更新GakuNin RDMからプロジェクトのインデックス / アイテムを追加 / " +"更新すると、WEKOに反映されます。
                  ファイルの削除GakuNin RDMから削除されたアイテムは、WEKOで削除されます。
                  ログGakuNin RDMは、Gaku Nin " +"RDMからWEKOのインデックスに行った変更を追跡しますが、WEKOを使って直接行った変更については追跡しません。
                  フォークプロジェクトやコンポーネントのフォーク時、WEKOの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでWEKOアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:39 +msgid "" +"\n" +"\n" +"

                  JupyterHub Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsThe GakuNin RDM does not affect the permissions of " +"JupyterHub.
                  View / download file versionsThe JupyterHub add-on does not provide Storage " +"Features.
                  Add / update filesThe JupyterHub add-on does not provide Storage " +"Features.
                  Delete filesThe JupyterHub add-on does not provide Storage " +"Features.
                  LogsThe JupyterHub add-on does not provide Storage " +"Features.
                  ForkingForking a project or component copies information " +"about linked JupyterHub but the GakuNin RDM does not affect " +"authentication of JupyterHub.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  JupyterHub アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin RDMは、JupyterHubの権限に影響を及ぼしません。
                  ファイルバージョンの閲覧/ダウンロードJupyterHubアドオンはストレージ機能を提供しません。
                  ファイルの追加/更新JupyterHubアドオンはストレージ機能を提供しません。
                  ファイルの削除JupyterHubアドオンはストレージ機能を提供しません。
                  ログJupyterHubアドオンはストレージ機能を提供しません。
                  フォークプロジェクトまたはコンポーネントのフォークを行うと、リンクされたJupyterHubに関する情報がコピーされますが、GakuNin " +"RDMはJupyterHubの認証に影響を及ぼしません。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: scripts/translations/messages_addonsJson.js:41 +msgid "" +"\n" +"\n" +"

                  IQB-RIMS Add-on Terms

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  FunctionStatus
                  PermissionsMaking an GakuNin RDM project public or private is " +"independent of Google Drive privacy. The GakuNin RDM does not alter the " +"permissions of linked Google Drive folders.
                  View / download file versionsIQB-RIMS files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                  Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Google Drive.
                  Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Google Drive.
                  LogsThe GakuNin RDM keeps track of changes you make to " +"your Google Drive content through the GakuNin RDM, but not for changes " +"made using Google Drive directly.
                  ForkingForking a project or component does not copy Google " +"Drive authorization unless the user forking the project is the same user " +"who authorized the IQB-RIMS add-on in the source project being " +"forked.
                  \n" +"\n" +"
                    \n" +"
                  • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                  • \n" +"
                  • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                  • \n" +"
                  \n" +msgstr "" +"\n" +"\n" +"

                  IQB-RIMS アドオン規約

                  \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                  機能ステータス
                  権限GakuNin RDMプロジェクトを公開または非公開にする設定は、Google " +"Driveのプライバシー設定とは独立しています。GakuNin RDMはリンクされたGoogle " +"Driveフォルダの権限を変更することはありません。
                  ファイルバージョンの閲覧/ダウンロードIQB-RIMSのファイルとそのバージョンは、GakuNin RDMから閲覧 / " +"ダウンロードをすることができます。
                  ファイルの追加/更新GakuNin RDM経由でプロジェクトのファイルを追加/更新すると、Google " +"Driveにも反映されます。
                  ファイルの削除GakuNin RDM経由で削除したファイルは、Google Driveでも削除されます。
                  ログGakuNin RDMは、Gaku Nin RDMからGoogle " +"Driveのコンテンツに行った変更を追跡しますが、Google Driveを使って直接行った変更については追跡しません。
                  フォークプロジェクトやコンポーネントのフォーク時、Google Drive" +"の認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでIQB-" +"RIMSアドオンを承認したユーザーと同一である場合はコピーされます。
                  \n" +"\n" +"
                    \n" +"
                  • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                  • \n" +" " +"
                  • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                  • \n" +"
                  \n" + +#: website/static/js/accessRequestManager.js:85 +msgid "There was a problem trying to %1$s the request from the user. %2$s" +msgstr "ユーザーからのリクエストを%1$sしようとして問題が発生しました。%2$s" + +#: website/static/js/accessRequestManager.js:86 +#: website/static/js/accessRequestManager.js:87 +msgid "Could not %1$s access request" +msgstr "アクセスリクエストを%1$sできませんでした" + +#: website/static/js/accessRequestManager.js:115 +#: website/static/js/contribAdder.js:71 website/static/js/contribManager.js:211 +msgid "Read" +msgstr "読込み" + +#: website/static/js/accessRequestManager.js:116 +#: website/static/js/contribAdder.js:72 website/static/js/contribManager.js:212 +msgid "Read + Write" +msgstr "読込み / 書込み" + +#: website/static/js/accessRequestManager.js:117 +#: website/static/js/contribAdder.js:73 website/static/js/contribManager.js:213 +msgid "Administrator" +msgstr "管理者" + +#: website/static/js/accountClaimer.js:34 +msgid "Email will arrive shortly" +msgstr "メールはまもなく届きます" + +#: website/static/js/accountClaimer.js:34 +msgid "Please check " +msgstr "こちらのメールアドレスをチェックしてください。" + +#: website/static/js/accountClaimer.js:41 +msgid "Claim as %1$s?" +msgstr "%1$sとして申し立てますか?" + +#: website/static/js/accountClaimer.js:42 +msgid "If you claim this account, a contributor of this project " +msgstr "このアカウントを申請すると、このプロジェクトのメンバー" + +#: website/static/js/accountClaimer.js:43 +msgid "will be emailed to confirm your identity." +msgstr "にメールで本人確認が行われます。" + +#: website/static/js/accountClaimer.js:61 +msgid "Claim" +msgstr "請求" + +#: website/static/js/accountClaimer.js:73 +msgid "Is this you? Click to claim" +msgstr "あなたですか? クリックして申し立てる" + +#: website/static/js/accountClaimer.js:99 +msgid "Claim Account" +msgstr "アカウントを請求" + +#: website/static/js/accountClaimer.js:101 +msgid "Enter email..." +msgstr "メールアドレスを入力…" + +#: website/static/js/accountClaimer.js:105 +msgid "Not a valid email." +msgstr "有効なメールではありません。" + +#: website/static/js/accountSettings.js:83 +msgid "Could not fetch user profile." +msgstr "ユーザープロフィールを取得できませんでした。" + +#: website/static/js/accountSettings.js:84 +#: website/static/js/accountSettings.js:115 +#: website/static/js/licensePicker.js:197 +msgid "Error fetching user profile" +msgstr "ユーザープロフィールの取得エラー" + +#: website/static/js/accountSettings.js:112 +msgid "" +"User profile not updated. Please refresh the page and try again or " +"contact %1$s if the problem persists." +msgstr "ユーザープロファイルは更新されません。 ページを更新して再試行するか、問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/accountSettings.js:199 +msgid "Duplicate Email" +msgstr "メールアドレスが重複" + +#: website/static/js/accountSettings.js:220 +msgid "Confirmation email sent" +msgstr "確認メールを送信しました" + +#: website/static/js/accountSettings.js:221 +msgid "%1$s was added to your account." +msgstr "%1$sがアカウントに追加されました。" + +#: website/static/js/accountSettings.js:222 +msgid " You will receive a confirmation email at %1$s." +msgstr "%1$sに確認メールが届きます。" + +#: website/static/js/accountSettings.js:223 +msgid "" +" Please click the link in your email to confirm this action. You will be " +"required to enter your password." +msgstr "このアクションを確認するには、メールのリンクをクリックしてください。 パスワードを入力する必要があります。" + +#: website/static/js/accountSettings.js:226 website/static/js/fangorn.js:2258 +#: website/static/js/folderPickerNodeConfig.js:591 +#: website/static/js/pages/profile-settings-addons-page.js:72 +#: website/static/js/pages/project-settings-page.js:118 +msgid "Close" +msgstr "閉じる" + +#: website/static/js/accountSettings.js:236 +msgid "Email cannot be empty." +msgstr "メールを空にすることはできません。" + +#: website/static/js/accountSettings.js:244 +msgid "Resend Email Confirmation?" +msgstr "メールの確認を再送信しますか?" + +#: website/static/js/accountSettings.js:245 +msgid "Are you sure that you want to resend email confirmation to %1$s?" +msgstr "確認メールを%1$sに再送信してもよろしいですか?" + +#: website/static/js/accountSettings.js:250 +msgid "Email confirmation resent to %1$s" +msgstr "確認メールを%1$sに再送信してもよろしいですか?" + +#: website/static/js/accountSettings.js:251 +msgid "You will receive a new confirmation email at %1$s." +msgstr "%1$sに新しい確認メールが届きます。" + +#: website/static/js/accountSettings.js:252 +msgid "" +" Please log out of this account and check your email to confirm this " +"action." +msgstr "このアカウントからログアウトし、メールを確認してこのアクションを確認してください。" + +#: website/static/js/accountSettings.js:259 +msgid "Resend" +msgstr "再送" + +#: website/static/js/accountSettings.js:270 +msgid "Remove Email?" +msgstr "メールを削除しますか?" + +#: website/static/js/accountSettings.js:271 +msgid "Are you sure that you want to remove %1$s from your email list?" +msgstr "メーリングリストから%1$sを削除してもよろしいですか?" + +#: website/static/js/accountSettings.js:282 +#: website/static/js/accountSettings.js:347 +#: website/static/js/addonPermissions.js:51 +#: website/static/js/addonSettings.js:67 +#: website/static/js/pages/profile-settings-addons-page.js:97 +#: website/static/js/privateLinkTable.js:115 website/static/js/profile.js:739 +#: website/static/js/profile.js:971 website/static/js/project.js:249 +msgid "Remove" +msgstr "削除" + +#: website/static/js/accountSettings.js:291 +#: website/static/js/accountSettings.js:304 +msgid "Please refresh the page and try again." +msgstr "ページを更新してもう一度お試しください。" + +#: website/static/js/accountSettings.js:317 +msgid "You have revoked this connected identity." +msgstr "この接続されたIDを取り消しました。" + +#: website/static/js/accountSettings.js:322 +msgid "Revocation request failed. Please contact %1$s if the problem persists." +msgstr "取り消し要求が失敗しました。 問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/accountSettings.js:325 +msgid "Error revoking connected identity" +msgstr "接続されたIDの取り消しエラー" + +#: website/static/js/accountSettings.js:338 +msgid "Remove authorization?" +msgstr "認証を削除しますか?" + +#: website/static/js/accountSettings.js:339 +msgid "Are you sure you want to remove this authorization?" +msgstr "この認証を削除してもよろしいですか?" + +#: website/static/js/accountSettings.js:383 +msgid "" +"You have successfully changed your default storage location to " +"%1$s." +msgstr "デフォルトの保存場所を%1$sに正常に変更しました。" + +#: website/static/js/accountSettings.js:387 +msgid "" +"Your attempt to change your default storage location has failed. Please " +"contact %1$s if the problem persists." +msgstr "デフォルトの保存場所を変更しようとして失敗しました。 問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/accountSettings.js:390 +msgid "Error updating default storage location " +msgstr "デフォルトの保管場所の更新エラー" + +#: website/static/js/accountSettings.js:413 +msgid "" +"An GakuNin RDM administrator will contact you shortly to confirm your " +"deactivation request." +msgstr "GakuNin RDM管理者がすぐに連絡して、非アクティブ化リクエストを確認します。" + +#: website/static/js/accountSettings.js:421 +msgid "Deactivation request failed. Please contact %1$s if the problem persists." +msgstr "非アクティブ化要求が失敗しました。 問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/accountSettings.js:425 +#: website/static/js/accountSettings.js:450 +msgid "Error requesting account deactivation" +msgstr "アカウントの無効化のリクエストエラー" + +#: website/static/js/accountSettings.js:438 +msgid "An GakuNin RDM account is no longer up for review." +msgstr "GakuNin RDMアカウントのレビューは終了しました。" + +#: website/static/js/accountSettings.js:446 +msgid "" +"Deactivation request failed. Please contact rdm_support@nii.ac.jp if the problem " +"persists." +msgstr "" +"非アクティブ化要求が失敗しました。 問題が解決しない場合は、
                  rdm_support@nii.ac.jpまでご連絡ください。" + +#: website/static/js/accountSettings.js:463 +msgid "Request account deactivation?" +msgstr "アカウントの無効化をリクエストしますか?" + +#: website/static/js/accountSettings.js:464 +msgid "" +"Are you sure you want to request account deactivation? A GakuNinRDM " +"administrator will review your request. If accepted, you " +msgstr "アカウントの無効化をリクエストしてもよろしいですか? GakuNinRDM管理者がリクエストを確認します。 認証された場合、" + +#: website/static/js/accountSettings.js:465 +msgid "will NOT be able to reactivate your account." +msgstr "アカウントを再開することはできません。" + +#: website/static/js/accountSettings.js:473 +#: website/static/js/accountSettings.js:546 +msgid "Request" +msgstr "リクエスト" + +#: website/static/js/accountSettings.js:485 +msgid "Cancel deactivation request?" +msgstr "無効化リクエストをキャンセルしますか?" + +#: website/static/js/accountSettings.js:486 +msgid "" +"Are you sure you want to rescind your account deactivation request? This " +"will preserve your account status." +msgstr "アカウントの無効化リクエストを取り消してもよろしいですか? これにより、アカウントの状態が保持されます。" + +#: website/static/js/accountSettings.js:494 +msgid "Cancel Deactivation Request" +msgstr "無効化リクエストをキャンセルする" + +#: website/static/js/accountSettings.js:512 +msgid "" +"An GakuNin RDM administrator will contact you shortly to confirm your " +"export request." +msgstr "GakuNin RDM管理者がすぐに連絡して、非アクティブ化リクエストを確認します。" + +#: website/static/js/accountSettings.js:520 +msgid "Export request failed. Please contact %1$s if the problem persists." +msgstr "エクスポート要求が失敗しました。 問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/accountSettings.js:524 +msgid "Error requesting account export" +msgstr "アカウントのエクスポートをリクエスト中にエラーが発生しました" + +#: website/static/js/accountSettings.js:537 +msgid "Request account export?" +msgstr "アカウントのエクスポートをリクエストしますか?" + +#: website/static/js/accountSettings.js:538 +msgid "Are you sure you want to request account export?" +msgstr "アカウントのエクスポートをリクエストしてもよろしいですか?" + +#: website/static/js/addProjectPlugin.js:21 +#: website/static/js/addProjectPlugin.js:24 +#: website/static/js/myProjects.js:1118 +msgid "Create new project" +msgstr "新規プロジェクト作成" + +#: website/static/js/addProjectPlugin.js:57 +msgid "There was an unknown error. Please try again later." +msgstr "不明なエラーがありました。 後でもう一度やり直してください。" + +#: website/static/js/addProjectPlugin.js:184 website/static/js/conference.js:19 +msgid "Title" +msgstr "タイトル" + +#: website/static/js/addProjectPlugin.js:198 +msgid "Enter %1$s title" +msgstr "%1$sのタイトルを入力してください" + +#: website/static/js/addProjectPlugin.js:203 +msgid "Affiliation" +msgstr "所属" + +#: website/static/js/addProjectPlugin.js:210 +msgid "Remove all" +msgstr "全て削除" + +#: website/static/js/addProjectPlugin.js:217 +msgid "Select all" +msgstr "全て選択" + +#: website/static/js/addProjectPlugin.js:233 +msgid "Storage location" +msgstr "ストレージロケーション" + +#: website/static/js/addProjectPlugin.js:251 +msgid " Add contributors from " +msgstr "次からメンバーを追加する:" + +#: website/static/js/addProjectPlugin.js:253 +msgid " Admins of " +msgstr " " + +#: website/static/js/addProjectPlugin.js:253 +msgid " will have read access to this component." +msgstr "の管理者は、このコンポーネントへの読み取りアクセス権を持ちます。" + +#: website/static/js/addProjectPlugin.js:264 +msgid " Add tags from " +msgstr "次からタグを追加する:" + +#: website/static/js/addProjectPlugin.js:268 +msgid "License" +msgstr "ライセンス" + +#: website/static/js/addProjectPlugin.js:270 +msgid " This component will inherit the same license as " +msgstr "このコンポーネントは、次と同じライセンスを継承します:" + +#: website/static/js/addProjectPlugin.js:273 +msgid "Learn more." +msgstr "もっと詳しく見る" + +#: website/static/js/addProjectPlugin.js:282 +msgid " More" +msgstr "詳細" + +#: website/static/js/addProjectPlugin.js:286 +msgid "Description" +msgstr "説明" + +#: website/static/js/addProjectPlugin.js:295 +msgid "Enter %1$s description" +msgstr "%1$sの説明を入力する" + +#: website/static/js/addProjectPlugin.js:299 website/static/js/conference.js:31 +msgid "Category" +msgstr "カテゴリ" + +#: website/static/js/addProjectPlugin.js:300 +msgid " (for descriptive purposes)" +msgstr "(説明のため)" + +#: website/static/js/addProjectPlugin.js:307 +msgid "Uncategorized" +msgstr "未分類" + +#: website/static/js/addProjectPlugin.js:320 +msgid "(Empty category)" +msgstr "(空のカテゴリ)" + +#: website/static/js/addProjectPlugin.js:330 +msgid "Template (optional)" +msgstr "テンプレート(オプション)" + +#: website/static/js/addProjectPlugin.js:331 +msgid "" +"Start typing to search your projects. Selecting project as template will " +"duplicate its " +msgstr "入力を開始してプロジェクトを検索します。 プロジェクトをテンプレートとして選択すると、" + +#: website/static/js/addProjectPlugin.js:332 +msgid "" +"structure in the new project without importing the content of that " +"project." +msgstr "そのプロジェクトのコンテンツをインポートすることなく、新しいプロジェクトでその構造が複製されます。" + +#: website/static/js/addProjectPlugin.js:351 +#: website/static/js/nodeControl.js:224 +#: website/static/js/privateLinkManager.js:31 website/static/js/project.js:140 +msgid "Create" +msgstr "作成" + +#: website/static/js/addProjectPlugin.js:362 +#, python-format +msgid "Saving your %s..." +msgstr "%sを保存中..." + +#: website/static/js/addProjectPlugin.js:376 +msgid "New %1$s created successfully!" +msgstr "新しい%1$sが作成されました!" + +#: website/static/js/addProjectPlugin.js:386 +#: website/static/js/addProjectPlugin.js:434 website/static/js/project.js:62 +msgid "Keep working here" +msgstr "このページに留まる" + +#: website/static/js/addProjectPlugin.js:392 +#: website/static/js/addProjectPlugin.js:437 +msgid "Go to new %1$s" +msgstr "新しい%1$sへ移動する" + +#: website/static/js/addProjectPlugin.js:405 +msgid "Couldn't create your %1$s" +msgstr "%1$sが作成できませんでした。" + +#: website/static/js/addProjectPlugin.js:424 +msgid "Could not add institution affiliation to your new %1$s" +msgstr "新しい%1$sに所属機関を追加できませんでした" + +#: website/static/js/addProjectPlugin.js:471 +msgid "Select a project to use as a template" +msgstr "テンプレートとして使用するプロジェクトを選択します" + +#: website/static/js/addonHelper.js:37 +#: website/static/js/nodeSelectTreebeard.js:59 +#: website/static/js/notificationsTreebeard.js:59 +#: website/static/js/profile.js:311 +#: website/static/js/wikiSettingsTreebeard.js:54 +msgid "Settings updated" +msgstr "設定が更新されました" + +#: website/static/js/addonHelper.js:46 +msgid "Settings not updated." +msgstr "設定が更新されませんでした。" + +#: website/static/js/addonNodeConfig.js:39 +#: website/static/js/oauthAddonNodeConfig.js:47 +msgid "Successfully linked \"%1$s\"" +msgstr "\"%1$s\"が正常にリンクされました" + +#: website/static/js/addonNodeConfig.js:40 +#: website/static/js/oauthAddonNodeConfig.js:48 +msgid " Go to the Files page to view your content." +msgstr "ファイルページに移動して、コンテンツを表示します。" + +#: website/static/js/addonPermissions.js:21 +#: website/static/js/addonSettings.js:58 +msgid "Remove addon?" +msgstr "アドオンを削除しますか?" + +#: website/static/js/addonPermissions.js:22 +msgid "Are you sure you want to disconnnect the %1$s account from this project?" +msgstr "このプロジェクトから%1$sアカウントを切断してもよろしいですか?" + +#: website/static/js/addonPermissions.js:43 +msgid "An error occurred, the account is still connected to the project. " +msgstr "エラーが発生し、アカウントはまだプロジェクトに接続されています。" + +#: website/static/js/addonPermissions.js:44 +msgid "If the issue persists, please report it to %1$s." +msgstr "問題が解決しない場合は、%1$sに報告してください。" + +#: website/static/js/addonSettings.js:46 +msgid "Error deauthorizing node: " +msgstr "ノードの認証解除エラー:" + +#: website/static/js/addonSettings.js:59 +msgid "Are you sure you want to remove the %1$s authorization from this project?" +msgstr "このプロジェクトから%1$s認証を削除してもよろしいですか?" + +#: website/static/js/addonSettings.js:100 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of dropbox.com before attempting to connect to a second Dropbox " +"account on the GakuNin RDM. This will clear the credentials stored in " +"your browser." +msgstr "" +"アドオンが正常に認証されました。 別のアカウントをリンクする場合は、GakuNin " +"RDMの2番目のDropboxアカウントに接続する前に、dropbox.comからログアウトしてください。 " +"これにより、ブラウザに保存されている資格情報がクリアされます。" + +#: website/static/js/addonSettings.js:102 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of bitbucket.org before attempting to connect to a second " +"Bitbucket account on the GakuNin RDM. This will clear the credentials " +"stored in your browser." +msgstr "" +"アドオンが正常に認証されました。 別のアカウントをリンクする場合は、GakuNin " +"RDMの2つ目のBitbucketアカウントに接続する前に、bitbucket.orgからログアウトしてください。 " +"これにより、ブラウザに保存されている資格情報がクリアされます" + +#: website/static/js/addonSettings.js:104 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of onedrive.live.com before attempting to connect to a second " +"OneDrive account on the GakuNin RDM. This will clear the credentials " +"stored in your browser." +msgstr "" +"アドオンが正常に認証されました。 別のアカウントをリンクする場合は、GakuNin " +"RDMの2つ目のOneDriveアカウントに接続する前にonedrive.live.comからログアウトします。 " +"これにより、ブラウザに保存されている資格情報がクリアされます。" + +#: website/static/js/addonSettings.js:106 +msgid "" +"Add-on successfully authorized. To link this add-on to an GakuNin RDM " +"project, go to the settings page of the project, enable %1$s, and choose " +"content to connect." +msgstr "" +"アドオンが正常に認証されました。 このアドオンをGakuNin " +"RDMプロジェクトにリンクするには、プロジェクトの設定ページに移動し、%1$sを有効にして、接続するコンテンツを選択します。" + +#: website/static/js/addonSettings.js:109 +msgid "" +"Error while authorizing add-on. Please log in to your %1$s account and " +"grant access to the GakuNin RDM to enable this add-on." +msgstr "" +"アドオンの認証中にエラーが発生しました。 このアドオンを有効にするには、%1$sアカウントにログインし、GakuNin " +"RDMへのアクセスを許可してください。" + +#: website/static/js/addonSettings.js:120 +msgid "" +"Are you sure you want to disconnect the %1$s account " +"%2$s? This will revoke access to %1$s for all projects " +"you have authorized." +msgstr "" +"%1$sアカウント%2$sを切断してもよろしいですか? " +"これにより、認証したすべてのプロジェクトの%1$sへのアクセスが取り消されます。" + +#: website/static/js/alertsManager.js:42 +msgid "Could not dismiss alert. Please refresh page and try again." +msgstr "アラートを却下できませんでした。 ページを更新してもう一度お試しください。" + +#: website/static/js/alertsManager.js:43 website/static/js/alertsManager.js:77 +msgid "Error fetching user alerts" +msgstr "ユーザーアラートの取得エラー" + +#: website/static/js/alertsManager.js:76 +msgid "Could not fetch alerts for this page. Please refresh page and try again." +msgstr "このページのアラートを取得できませんでした。 ページを更新してもう一度お試しください。" + +#: website/static/js/apiApplication.js:215 +msgid "Error fetching list of registered applications" +msgstr "登録済みアプリケーションのリストの取得エラー" + +#: website/static/js/apiApplication.js:226 +#: website/static/js/apiApplication.js:396 +msgid "Deactivate application?" +msgstr "アプリケーションを無効にしますか?" + +#: website/static/js/apiApplication.js:234 +#: website/static/js/apiPersonalToken.js:213 +msgid " has been deactivated" +msgstr "は無効化されました" + +#: website/static/js/apiApplication.js:245 +#: website/static/js/apiApplication.js:416 +#: website/static/js/apiPersonalToken.js:224 +#: website/static/js/apiPersonalToken.js:395 +msgid "Deactivate" +msgstr "無効にする" + +#: website/static/js/apiApplication.js:295 +#: website/static/js/apiPersonalToken.js:274 +msgid "There are unsaved changes on this page." +msgstr "このページには未保存の変更があります。" + +#: website/static/js/apiApplication.js:309 +msgid "Error fetching application data" +msgstr "アプリケーションデータの取得エラー" + +#: website/static/js/apiApplication.js:344 +#: website/static/js/apiPersonalToken.js:323 +msgid "Error updating instance" +msgstr "インスタンスの更新エラー" + +#: website/static/js/apiApplication.js:370 +msgid "Error registering new OAuth2 application" +msgstr "新しいOAuth2アプリケーションの登録エラー" + +#: website/static/js/apiApplication.js:429 +msgid "Reset client secret?" +msgstr "クライアントシークレットをリセットしますか?" + +#: website/static/js/apiApplication.js:447 +msgid "Error resetting instance secret" +msgstr "インスタンスシークレットのリセットエラー" + +#: website/static/js/apiApplication.js:459 +msgid "Reset Secret" +msgstr "シークレットをリセット" + +#: website/static/js/apiApplication.js:473 +#: website/static/js/apiPersonalToken.js:412 website/static/js/profile.js:357 +msgid "Discard changes?" +msgstr "変更を破棄しますか?" + +#: website/static/js/apiApplication.js:483 +#: website/static/js/apiPersonalToken.js:422 website/static/js/profile.js:369 +msgid "Discard" +msgstr "破棄" + +#: website/static/js/apiPersonalToken.js:194 +msgid "Error fetching list of registered personal access tokens" +msgstr "登録済みの個人アクセストークンのリストの取得エラー" + +#: website/static/js/apiPersonalToken.js:205 +msgid "Deactivate personal access token?" +msgstr "パーソナルアクセストークンを無効にしますか?" + +#: website/static/js/apiPersonalToken.js:288 +msgid "Error fetching token data" +msgstr "トークンデータの取得エラー" + +#: website/static/js/apiPersonalToken.js:349 +msgid "Error registering new OAuth2 personal access token" +msgstr "新しいOAuth2個人用アクセストークンの登録エラー" + +#: website/static/js/apiPersonalToken.js:375 +msgid "Deactivate token?" +msgstr "トークンを無効にしますか?" + +#: website/static/js/citationGrid.js:180 +msgid "Copy citation" +msgstr "サイテーションをコピー" + +#: website/static/js/citationGrid.js:190 +msgid "View original document" +msgstr "元のドキュメントを表示" + +#: website/static/js/citationGrid.js:202 website/static/js/fangorn.js:2041 +msgid "View on %1$s" +msgstr "%1$sで表示" + +#: website/static/js/citationGrid.js:213 +msgid "Download citations" +msgstr "サイテーションをダウンロード" + +#: website/static/js/citationGrid.js:242 +msgid "Citation" +msgstr "引用" + +#: website/static/js/citationGrid.js:246 +msgid "Actions" +msgstr "アクション" + +#: website/static/js/citationGrid.js:294 +msgid "Only 200 citations may be displayed" +msgstr "200件のサイテーションのみが表示されます" + +#: website/static/js/citationGrid.js:311 website/static/js/citationWidget.js:44 +msgid "Enter citation style (e.g. \"APA\")" +msgstr "引用スタイルを入力します(例:\"APA\")" + +#: website/static/js/citationGrid.js:333 +msgid "Error while selecting citation style: " +msgstr "引用スタイルの選択中にエラーが発生しました:" + +#: website/static/js/citationGrid.js:412 +msgid "" +"Could not render entry. Please check the contents of your citations " +"for correctness." +msgstr "エントリをレンダリングできませんでした。 引用の内容が正しいかどうかを確認してください。" + +#: website/static/js/citationList.js:113 +msgid "Your custom citation not updated. Please refresh the page and try " +msgstr "カスタム引用は更新されません。 ページを更新して再試行するか、" + +#: website/static/js/citationList.js:114 +msgid "again or contact %1$s" +msgstr "問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/citationList.js:114 +#: website/static/js/components/publicNodes.js:192 +#: website/static/js/components/quickFiles.js:123 +#: website/static/js/osfHelpers.js:311 +msgid " if the problem persists." +msgstr " " + +#: website/static/js/citationWidget.js:46 +#: website/static/js/pages/project-dashboard-page.js:170 +#, python-format +msgid "Please enter %s or more characters" +msgstr "後%s文字入力してください" + +#: website/static/js/citationWidget.js:47 website/static/js/pointers.js:30 +msgid "Searching..." +msgstr "検索中..." + +#: website/static/js/citationWidget.js:48 +msgid "No matches found." +msgstr "該当なし" + +#: website/static/js/citationWidget.js:77 +msgid "Citation render failed" +msgstr "引用のレンダリングに失敗しました" + +#: website/static/js/citationWidget.js:78 +msgid "The requested citation format generated an error." +msgstr "要求された引用形式はエラーを生成しました。" + +#: website/static/js/citationWidget.js:81 +msgid "Unexpected error when fetching citation" +msgstr "引用を取得する際の予期しないエラー" + +#: website/static/js/citationsNodeConfig.js:38 +#: website/static/js/citationsNodeConfig.js:42 +msgid "Successfully linked \"%1$s\"." +msgstr "\"%1$s\"が正常にリンクされました。" + +#: website/static/js/citationsNodeConfig.js:38 +msgid " Go to the Overview page to view your citations." +msgstr "概要ページに移動して、引用を表示します。" + +#: website/static/js/citationsNodeConfig.js:42 +msgid " Next, choose which folder to link above." +msgstr "次に、上記のリンクするフォルダーを選択します。" + +#: website/static/js/citationsNodeConfig.js:81 +#: website/static/js/oauthAddonNodeConfig.js:209 +msgid "Could not GET %1$s accounts for user" +msgstr "ユーザーの%1$sアカウントを取得できませんでした" + +#: website/static/js/citationsNodeConfig.js:147 +msgid "Choose %1$s Access Token to Import" +msgstr "インポートする%1$s アクセストークンを選択してください" + +#: website/static/js/citationsNodeConfig.js:166 +#: website/static/js/citationsNodeConfig.js:184 +#: website/static/js/folderPickerNodeConfig.js:507 +#: website/static/js/oauthAddonNodeConfig.js:153 +#: website/static/js/oauthAddonNodeConfig.js:171 +msgid "Import" +msgstr "接続" + +#: website/static/js/citationsNodeConfig.js:175 +msgid "Import %1$s access token" +msgstr "%1$sアクセストークンをインポート" + +#: website/static/js/clipboard.js:27 +msgid "Copied!" +msgstr "コピーされました!" + +#: website/static/js/clipboard.js:32 +msgid "Copy failed!" +msgstr "コピーが失敗しました!" + +#: website/static/js/comment.js:55 +msgid "Error getting contributors and group members" +msgstr "メンバーとグループメンバーの取得エラー" + +#: website/static/js/comment.js:73 +msgid "Spam or advertising" +msgstr "スパムまたは広告" + +#: website/static/js/comment.js:74 +msgid "Hate speech" +msgstr "ヘイトスピーチ" + +#: website/static/js/comment.js:75 +msgid "Violence or harmful behavior" +msgstr "暴力や有害な行動" + +#: website/static/js/comment.js:212 +msgid "Commenting" +msgstr "コメント中" + +#: website/static/js/comment.js:212 +msgid "Comment" +msgstr "コメント" + +#: website/static/js/comment.js:232 +msgid "Exceeds character limit. Please reduce to %1$s characters or less." +msgstr "文字数の制限を超えています。%1$s文字以下に減らしてください。" + +#: website/static/js/comment.js:347 website/static/js/comment.js:555 +msgid "Please enter a comment" +msgstr "コメントを入れて下さい" + +#: website/static/js/comment.js:393 website/static/js/comment.js:588 +msgid "Could not submit comment" +msgstr "コメントを送信できませんでした" + +#: website/static/js/comment.js:394 +msgid "Error creating comment" +msgstr "コメント作成エラー" + +#: website/static/js/comment.js:589 +msgid "Error editing comment" +msgstr "コメント編集エラー" + +#: website/static/js/comment.js:634 +msgid "Could not report abuse." +msgstr "不正行為を報告できませんでした。" + +#: website/static/js/comment.js:635 +msgid "Error reporting abuse" +msgstr "不正行為の報告エラー" + +#: website/static/js/comment.js:664 +msgid "Error deleting comment" +msgstr "コメントの削除エラー" + +#: website/static/js/comment.js:702 +msgid "Error undeleting comment" +msgstr "コメントの削除解除エラー" + +#: website/static/js/comment.js:727 +msgid "Error unreporting comment" +msgstr "コメントの報告エラー" + +#: website/static/js/comment.js:807 +msgid "Your comments have unsaved changes. Are you sure " +msgstr "コメントには未保存の変更があります。" + +#: website/static/js/comment.js:808 +msgid "you want to leave this page?" +msgstr "このページから移動してもよろしいですか?" + +#: website/static/js/comment.js:826 +msgid "Could not update comment timestamp" +msgstr "コメントのタイムスタンプを更新できませんでした" + +#: website/static/js/commentpane.js:31 +msgid "Option `toggleWidth` must be greater than or equal to " +msgstr "オプション「toggleWidth」は、オプション「maxWidthProp」以上でなければなりません。" + +#: website/static/js/commentpane.js:32 +msgid "option `maxWidthProp`." +msgstr " " + +#: website/static/js/conference.js:25 +msgid "Author" +msgstr "著者" + +#: website/static/js/conference.js:37 +msgid "Date Created" +msgstr "作成日時" + +#: website/static/js/conference.js:43 website/static/js/fangorn.js:1683 +msgid "Downloads" +msgstr "ダウンロード" + +#: website/static/js/contribAdder.js:26 +msgid " project in common" +msgstr "共通プロジェクト" + +#: website/static/js/contribAdder.js:28 +msgid "Yourself" +msgstr "あなた自身" + +#: website/static/js/contribAdder.js:30 +msgid " projects in common" +msgstr "共通プロジェクト" + +#: website/static/js/contribAdder.js:82 +msgid "Add Contributors" +msgstr "メンバーを追加" + +#: website/static/js/contribAdder.js:83 +msgid "Select Components" +msgstr "コンポーネントを選択" + +#: website/static/js/contribAdder.js:85 +msgid "Invite new contributor by e-mail" +msgstr "電子メールで新しいメンバーを招待する" + +#: website/static/js/contribAdder.js:86 +msgid "Add Unregistered Contributor" +msgstr "未登録のメンバーを追加" + +#: website/static/js/contribAdder.js:331 +msgid "Full Name is required." +msgstr "氏名が必要です。" + +#: website/static/js/contribAdder.js:334 +msgid "Not a valid email address." +msgstr "有効な電子メールアドレスではありません。" + +#: website/static/js/contribAdder.js:341 +msgid "%1$s is already in queue." +msgstr "%1$sはすでにキューにあります。" + +#: website/static/js/contribAdder.js:460 +msgid "There was a problem trying to add contributors%1$s." +msgstr "メンバー%1$sを追加しようとして問題が発生しました。" + +#: website/static/js/contribAdder.js:461 +msgid "Could not add contributors" +msgstr "メンバーを追加できませんでした" + +#: website/static/js/contribAdder.js:462 +#: website/static/js/contribManager.js:139 +msgid "Error adding contributors" +msgstr "メンバーの追加エラー" + +#: website/static/js/contribAdder.js:532 +#: website/static/js/institutionProjectSettings.js:254 +#: website/static/js/nodesDelete.js:194 website/static/js/nodesPrivacy.js:207 +msgid "Unable to retrieve project settings" +msgstr "プロジェクト設定を取得できません" + +#: website/static/js/contribAdder.js:533 +#: website/static/js/institutionProjectSettings.js:255 +#: website/static/js/nodesDelete.js:195 website/static/js/nodesPrivacy.js:208 +msgid "Could not GET project settings." +msgstr "プロジェクト設定を取得できませんでした。" + +#: website/static/js/contribManager.js:137 +msgid "There was a problem trying to add the contributor. " +msgstr "メンバーを追加しようとして問題が発生しました。" + +#: website/static/js/contribManager.js:138 +msgid "Could not add contributor" +msgstr "メンバーを追加できませんでした" + +#: website/static/js/contribManager.js:300 +msgid "Must have at least one registered admin contributor" +msgstr "登録された管理メンバーーが少なくとも1人必要です" + +#: website/static/js/contribManager.js:308 +msgid "Must have at least one bibliographic contributor" +msgstr "少なくとも1人の書誌メンバーが必要です。" + +#: website/static/js/contribManager.js:364 +msgid "Your contributor list has unsaved changes. Please " +msgstr "メンバーリストには未保存の変更があります。 " + +#: website/static/js/contribManager.js:365 +msgid "save or cancel your changes before adding " +msgstr "メンバーを追加する前に、変更を保存または" + +#: website/static/js/contribManager.js:366 +msgid "contributors." +msgstr "キャンセルしてください。" + +#: website/static/js/contribManager.js:375 +msgid "There are unsaved changes to your contributor settings" +msgstr "メンバーの設定に保存されていない変更があります" + +#: website/static/js/contribManager.js:404 +msgid "Save changes?" +msgstr "変更を保存しますか?" + +#: website/static/js/contribManager.js:405 +msgid "Are you sure you want to save these changes?" +msgstr "これらの変更を保存してもよろしいですか?" + +#: website/static/js/contribManager.js:421 +msgid "Submission failed: " +msgstr "送信に失敗しました:" + +#: website/static/js/contribManager.js:429 +#: website/static/js/filepage/editor.js:180 +msgid "Save" +msgstr "保存" + +#: website/static/js/contribRemover.js:56 +#: website/static/js/contribRemover.js:57 +#: website/static/js/contribRemover.js:58 +msgid "Remove Contributor" +msgstr "メンバーを削除" + +#: website/static/js/contribRemover.js:208 +#: website/static/js/contribRemover.js:209 +msgid "Unable to retrieve projects and components" +msgstr "プロジェクトとコンポーネントを取得できません" + +#: website/static/js/contribRemover.js:232 +msgid "Unable to delete Contributor" +msgstr "メンバーを削除できません" + +#: website/static/js/contribRemover.js:233 +msgid "Could not DELETE Contributor." +msgstr "メンバーを削除できませんでした" + +#: website/static/js/fangorn.js:38 +msgid "Upload pending..." +msgstr "アップロード保留中" + +#: website/static/js/fangorn.js:41 +msgid "Copying " +msgstr "コピー中" + +#: website/static/js/fangorn.js:44 +msgid "Deleting " +msgstr "削除中" + +#: website/static/js/fangorn.js:47 +msgid "Moving " +msgstr "移動中" + +#: website/static/js/fangorn.js:50 +msgid "Renaming " +msgstr "名前を変更中" + +#: website/static/js/fangorn.js:448 +msgid "Not allowed: Private folder" +msgstr "許可されない:非公開フォルダ" + +#: website/static/js/fangorn.js:492 website/static/js/fangorn.js:522 +msgid "You cannot replace the Wiki images folder" +msgstr "Wiki画像フォルダーを置き換えることはできません" + +#: website/static/js/fangorn.js:497 website/static/js/fangorn.js:530 +msgid "An item named \"%1$s\" already exists in this location." +msgstr "\"%1$s\"という名前のアイテムはこの場所に既に存在します" + +#: website/static/js/fangorn.js:499 website/static/js/fangorn.js:508 +#: website/static/js/fangorn.js:532 +msgid "Keep Both" +msgstr "両方を保持" + +#: website/static/js/fangorn.js:499 website/static/js/fangorn.js:532 +msgid " will retain both files (and their version histories) in this location." +msgstr "はこの場所に両方のファイル(およびそれらのバージョン履歴)が保持されます。" + +#: website/static/js/fangorn.js:501 website/static/js/fangorn.js:509 +#: website/static/js/fangorn.js:534 +msgid "Replace" +msgstr "置換" + +#: website/static/js/fangorn.js:501 website/static/js/fangorn.js:534 +msgid " will overwrite the existing file in this location. " +msgstr "はこの場所にある既存のファイルを上書きします。" + +#: website/static/js/fangorn.js:502 website/static/js/fangorn.js:535 +msgid "You will lose previous versions of the overwritten file. " +msgstr "上書きされたファイルの以前のバージョンは失われます。" + +#: website/static/js/fangorn.js:503 website/static/js/fangorn.js:536 +msgid "You will keep previous versions of the moved file." +msgstr "移動したファイルの以前のバージョンを保持します。" + +#: website/static/js/fangorn.js:504 +msgid "\"Skip\" will skip the current file." +msgstr "\"スキップ\"は現在のファイルをスキップします。" + +#: website/static/js/fangorn.js:505 +msgid "\"Stop\" will only move files with no conflicts." +msgstr "\"停止\"は、競合のないファイルのみを移動します。" + +#: website/static/js/fangorn.js:510 +msgid "Skip" +msgstr "スキップ" + +#: website/static/js/fangorn.js:511 +msgid "Stop" +msgstr "停止" + +#: website/static/js/fangorn.js:513 +#, python-format +msgid "Replace \"%s\"?" +msgstr "\"%s\"を置換しますか?" + +#: website/static/js/fangorn.js:537 +msgid " will cancel the move." +msgstr "は移動をキャンセルします。" + +#: website/static/js/fangorn.js:546 +msgid "Replace \"%1$s\"?" +msgstr "\"%1$s\"を置換しますか?" + +#: website/static/js/fangorn.js:576 +msgid "%1$s conflicts left to resolve." +msgid_plural "%1$s conflict left to resolve." +msgstr[0] "%1$sの競合が残っています。" + +#: website/static/js/fangorn.js:655 +msgid "%1$s \"%2$s\" to \"%3$s\" is taking a bit longer than expected." +msgstr "%1$s \"%2$s\" 〜 \"%3$s\" は予想より少し時間がかかっています。" + +#: website/static/js/fangorn.js:656 +msgid "We'll send you an email when it has finished." +msgstr "終了したらメールをお送りします。" + +#: website/static/js/fangorn.js:657 +msgid "" +"In the mean time you can leave this page; your %1$s will still be " +"completed." +msgstr "それまでの間、このページを離れることができます。 あなたの%1$sはまだ完了しています。" + +#: website/static/js/fangorn.js:662 +msgid "Operation Information" +msgstr "運営情報" + +#: website/static/js/fangorn.js:668 +msgid "Successfully %1$s." +msgstr "%1$sに成功しました。" + +#: website/static/js/fangorn.js:715 +msgid "Please refresh the page or contact %1$s if the problem persists." +msgstr "問題が解決しない場合は、ページを更新するか%1$sに連絡してください。" + +#: website/static/js/fangorn.js:720 +msgid "Failed to move or copy file" +msgstr "ファイルの移動またはコピーに失敗しました" + +#: website/static/js/fangorn.js:998 +msgid "Could not upload file. The file may be invalid " +msgstr "ファイルをアップロードできませんでした。 ファイルが無効である" + +#: website/static/js/fangorn.js:999 +msgid "or the file folder has been deleted." +msgstr "か、ファイルフォルダーが削除されている可能性があります。" + +#: website/static/js/fangorn.js:1007 website/static/js/fangorn.js:1012 +msgid "Cannot upload folders." +msgstr "フォルダーをアップロードできません。" + +#: website/static/js/fangorn.js:1014 +msgid "Cannot upload file due to insufficient storage." +msgstr "ストレージが不十分なため、ファイルをアップロードできません。" + +#: website/static/js/fangorn.js:1019 +msgid "Could not upload file. Possible reasons:
                  " +msgstr "ファイルをアップロードできませんでした。 考えられる理由:
                  " + +#: website/static/js/fangorn.js:1020 +msgid "1. Cannot upload folders.
                  2. " +msgstr "1.フォルダーをアップロードできません。
                  2." + +#: website/static/js/fangorn.js:1022 +msgid "Unable to reach the provider, please try again later. " +msgstr "プロバイダーに到達できません。しばらくしてからもう一度お試しください。" + +#: website/static/js/fangorn.js:1023 +msgid "If the problem persists, please contact %1$s." +msgstr "問題が解決しない場合は、%1$sにお問い合わせください" + +#: website/static/js/fangorn.js:1111 +msgid "Please enter a folder name." +msgstr "フォルダー名を入力してください。" + +#: website/static/js/fangorn.js:1115 +msgid "Folder name contains illegal characters." +msgstr "フォルダー名に無効な文字が含まれています。" + +#: website/static/js/fangorn.js:1138 +msgid "New folder created!" +msgstr "新しいフォルダが作成されました。" + +#: website/static/js/fangorn.js:1147 +msgid "Folder creation failed." +msgstr "フォルダ作成に失敗しました。" + +#: website/static/js/fangorn.js:1165 +msgid " Deleting..." +msgstr " 削除中..." + +#: website/static/js/fangorn.js:1187 +msgid "Delete failed." +msgstr "削除に失敗しました。" + +#: website/static/js/fangorn.js:1202 +msgid "" +"This folder and all of its contents will be deleted. This folder is " +"linked to " +msgstr "このフォルダーとその内容はすべて削除されます。 このフォルダーは、" + +#: website/static/js/fangorn.js:1203 +msgid "your wiki(s). Deleting it will remove images embedded in your wiki(s). " +msgstr "Wikiにリンクされています。 削除すると、Wikiに埋め込まれた画像が削除されます。" + +#: website/static/js/fangorn.js:1204 website/static/js/fangorn.js:1232 +#: website/static/js/fangorn.js:1255 website/static/js/pages/base-page.js:132 +msgid "This action is irreversible." +msgstr "このアクションは元に戻せません。" + +#: website/static/js/fangorn.js:1207 +msgid "" +"This folder and ALL its contents will be deleted. This action is " +"irreversible." +msgstr "このフォルダーとその内容はすべて削除されます。 このアクションは元に戻せません。" + +#: website/static/js/fangorn.js:1213 website/static/js/fangorn.js:1236 +#: website/static/js/fangorn.js:1996 website/static/js/fangorn.js:2032 +#: website/static/js/filepage/index.js:209 +#: website/static/js/filepage/index.js:522 website/static/js/myProjects.js:1637 +msgid "Delete" +msgstr "削除" + +#: website/static/js/fangorn.js:1215 website/static/js/fangorn.js:1240 +msgid "Delete \"%1$s\"?" +msgstr "\"%1$s\"を削除しますか?" + +#: website/static/js/fangorn.js:1217 +msgid "You don't have permission to delete this file." +msgstr "このファイルを削除する権限がありません。" + +#: website/static/js/fangorn.js:1225 +msgid "This file may be linked to your wiki(s). Deleting it will remove the" +msgstr "このファイルはWikiにリンクされている場合があります。 削除すると、" + +#: website/static/js/fangorn.js:1226 +msgid " image embedded in your wiki(s). " +msgstr "Wikiに埋め込まれた画像が削除されます" + +#: website/static/js/fangorn.js:1266 +msgid "" +"Some of the selected items are folders. This will delete the folder(s) " +"and ALL of their content." +msgstr "選択したアイテムの一部はフォルダーです。 これにより、フォルダーとそのすべてのコンテンツが削除されます。" + +#: website/static/js/fangorn.js:1280 +msgid " may be linked to" +msgstr "ウィキにリンクされている可能性があります。" + +#: website/static/js/fangorn.js:1281 +msgid " your wiki(s). Deleting them will remove images embedded in your wiki(s). " +msgstr "れらを削除すると、ウィキに埋め込まれた画像が削除されます。" + +#: website/static/js/fangorn.js:1289 +msgid "Delete All" +msgstr "全て削除" + +#: website/static/js/fangorn.js:1293 +msgid "" +"Some of these files can't be deleted but you can delete the ones " +"highlighted with green. This action is irreversible." +msgstr "これらのファイルの一部は削除できませんが、削除できます" + +#: website/static/js/fangorn.js:1308 +msgid "Delete Some" +msgstr "一部を削除" + +#: website/static/js/fangorn.js:1311 +msgid "Delete multiple files?" +msgstr "複数のファイルを削除しますか?" + +#: website/static/js/fangorn.js:1337 +msgid "" +"Unable to check out file. This is most likely due to the file being " +"already checked-out" +msgstr "ファイルをチェックアウトできません。 これは、ファイルが別のユーザーによって既にチェックアウトされていることが原因" + +#: website/static/js/fangorn.js:1338 +msgid " by another user." +msgstr "である可能性があります。" + +#: website/static/js/fangorn.js:1670 website/static/js/fileViewTreebeard.js:63 +#: website/static/js/filesWidget.js:34 website/static/js/meetings.js:18 +#: website/static/js/pages/project-dashboard-page.js:549 +#: website/static/js/project-organizer.js:192 +#: website/static/js/project-organizer.js:208 website/static/js/wikiMenu.js:58 +msgid "Name" +msgstr "名前" + +#: website/static/js/fangorn.js:1675 +msgid "Size" +msgstr "サイズ" + +#: website/static/js/fangorn.js:1679 +msgid "Version" +msgstr "バージョン" + +#: website/static/js/fangorn.js:1687 +#: website/static/js/pages/project-dashboard-page.js:555 +#: website/static/js/project-organizer.js:201 +msgid "Modified" +msgstr "最終更新日時" + +#: website/static/js/fangorn.js:1761 +msgid "Unable to retrieve components." +msgstr "コンポーネントを取得できません。" + +#: website/static/js/fangorn.js:1763 +msgid "Unable to retrieve components for node %1$s" +msgstr "ノード%1$sのコンポーネントを取得できません" + +#: website/static/js/fangorn.js:1845 +msgid "You cannot rename your Wiki images folder." +msgstr "Wiki画像フォルダの名前を変更することはできません。" + +#: website/static/js/fangorn.js:1953 +msgid "Upload" +msgstr "アップロード" + +#: website/static/js/fangorn.js:1960 +msgid "Create Folder" +msgstr "新規フォルダ作成" + +#: website/static/js/fangorn.js:1967 +msgid "Delete Folder" +msgstr "フォルダを削除" + +#: website/static/js/fangorn.js:1976 website/static/js/filepage/index.js:525 +#: website/static/js/filepage/revisions.js:111 +msgid "Download" +msgstr "ダウンロード" + +#: website/static/js/fangorn.js:1986 website/static/js/filepage/index.js:547 +msgid "View" +msgstr "プレビュー" + +#: website/static/js/fangorn.js:2002 website/static/js/filepage/index.js:221 +msgid "This would mean " +msgstr "これは、" + +#: website/static/js/fangorn.js:2003 website/static/js/filepage/index.js:222 +msgid "" +"other contributors cannot edit, delete or upload new versions of this " +"file " +msgstr "チェックアウトされている限り他のメンバーがこのファイルの新しいバージョンを編集、削除、またはアップロードできないことを意味します。" + +#: website/static/js/fangorn.js:2004 +msgid "as long as it is checked-out. You can check it back in at anytime." +msgstr "いつでもチェックインできます。" + +#: website/static/js/fangorn.js:2009 website/static/js/fangorn.js:2014 +#: website/static/js/filepage/index.js:248 +msgid "Check out file" +msgstr "ファイルをチェックアウト" + +#: website/static/js/fangorn.js:2010 +msgid "Confirm file check-out?" +msgstr "ファイルのチェックアウトを確認しますか?" + +#: website/static/js/fangorn.js:2023 +msgid "Check in file" +msgstr "ファイルをチェックイン" + +#: website/static/js/fangorn.js:2051 +msgid "Download as zip" +msgstr "ZIPでダウンロード" + +#: website/static/js/fangorn.js:2062 website/static/js/myProjects.js:1613 +msgid "Rename" +msgstr "名前を変更" + +#: website/static/js/fangorn.js:2144 +msgid "New folder name" +msgstr "新しいフォルダ名" + +#: website/static/js/fangorn.js:2172 +msgid "Enter name" +msgstr "名前を入力" + +#: website/static/js/fangorn.js:2209 +msgid "Cancel Pending Uploads" +msgstr "保留中のアップロードをキャンセル" + +#: website/static/js/fangorn.js:2233 +msgid "Delete Multiple" +msgstr "複数削除" + +#: website/static/js/fangorn.js:2244 website/static/js/fangorn.js:2955 +msgid "Filter" +msgstr "フィルタ" + +#: website/static/js/fangorn.js:2249 +msgid "Select rows:" +msgstr "行を選択:" + +#: website/static/js/fangorn.js:2249 +msgid "" +" Click on a row (outside the add-on, file, or folder name) to show " +"further actions in the toolbar. Use Command or Shift keys to select " +"multiple files." +msgstr "" +"行(アドオン、ファイル、またはフォルダー名の外側)をクリックして、ツールバーにさらにアクションを表示します。 " +"複数のファイルを選択するには、コマンドまたはShiftキーを使用します。" + +#: website/static/js/fangorn.js:2250 +msgid "Open files:" +msgstr "ファイルを開く:" + +#: website/static/js/fangorn.js:2250 +msgid " Click a file name to go to view the file in the GakuNin RDM." +msgstr "ファイル名をクリックして、GakuNin RDMでファイルを表示します。" + +#: website/static/js/fangorn.js:2251 +msgid "Open files in new tab:" +msgstr "新しいタブでファイルを開く:" + +#: website/static/js/fangorn.js:2251 +msgid "" +" Press Command (Ctrl in Windows) and click a file name to open it in a " +"new tab." +msgstr "コマンド(WindowsではCtrl)を押し、ファイル名をクリックして新しいタブで開きます。" + +#: website/static/js/fangorn.js:2252 +msgid "Download as zip:" +msgstr "ZIPでダウンロード:" + +#: website/static/js/fangorn.js:2252 +msgid "" +" Click on the row of an add-on or folder and click the Download as Zip " +"button in the toolbar." +msgstr "アドオンまたはフォルダーの行をクリックし、ツールバーの [ZIPでダウンロード] ボタンをクリックします。" + +#: website/static/js/fangorn.js:2252 +msgid " Not available for all storage add-ons." +msgstr "すべてのストレージアドオンで利用できるわけではありません。" + +#: website/static/js/fangorn.js:2253 +msgid "Copy files:" +msgstr "ファイルをコピー:" + +#: website/static/js/fangorn.js:2253 +msgid "" +" Press Option (Alt in Windows) while dragging a file to a new folder or " +"component." +msgstr "オプション(WindowsではAlt)を押しながら、ファイルを新しいフォルダーまたはコンポーネントにドラッグします。" + +#: website/static/js/fangorn.js:2253 +msgid " Only for contributors with write access." +msgstr "書き込みアクセス権を持つメンバーのみ。" + +#: website/static/js/fangorn.js:2259 +msgid "How to Use the File Browser" +msgstr "ファイルブラウザの使用方法" + +#: website/static/js/fangorn.js:2323 +msgid "Please wait for current action to complete" +msgstr "現在のアクションが完了するまでお待ちください" + +#: website/static/js/fangorn.js:2504 +msgid "Upload Status" +msgstr "ステータスをアップロード" + +#: website/static/js/fangorn.js:2504 +msgid " files succeeded." +msgstr "ファイルが成功しました。" + +#: website/static/js/fangorn.js:2605 +msgid "Done" +msgstr "完了" + +#: website/static/js/fangorn.js:2607 +msgid "Move Status" +msgstr "移動ステータス" + +#: website/static/js/fangorn.js:2609 +msgid " files successfully moved." +msgstr "ファイルが移動成功しました。" + +#: website/static/js/fangorn.js:2610 +msgid " Skipped %1$s/%2$s files." +msgstr "%1$s/%2$sファイルをスキップしました。" + +#: website/static/js/fangorn.js:2880 +msgid "You have pending uploads, if you leave this page they may not complete." +msgstr "保留中のアップロードがあります。このページを離れると、アップロードが完了しない場合があります。" + +#: website/static/js/fangorn.js:2883 +msgid "" +"You have pending file operations, if you leave this page they may not " +"complete." +msgstr "保留中のファイル操作があります。このページを離れると、完了しない場合があります。" + +#: website/static/js/fangorn.js:2917 +msgid "This file is too large (%1$s). Max file size is %2$s." +msgstr "このファイルは大きすぎます(%1$s)。 最大ファイルサイズは%2$sです。" + +#: website/static/js/fangorn.js:2933 +msgid "Not enough quota to upload the file." +msgstr "ファイルをアップロードするのに十分なクォータがありません。" + +#: website/static/js/fangorn.js:2940 +msgid "Quota usage alert" +msgstr "クォータ使用量アラート" + +#: website/static/js/fangorn.js:2941 +#, python-format +msgid "You have used more than %1$s% of your quota." +msgstr "割り当ての%1$s%%以上を使用しました。" + +#: website/static/js/fileViewTreebeard.js:120 +msgid "Uploading %1$s..." +msgstr "%1$sをアップロードしています..." + +#: website/static/js/filesWidget.js:77 +msgid "Could not GET files" +msgstr "ファイルを取得できませんでした" + +#: website/static/js/filesWidget.js:92 +msgid "Sorry, we could not load files right now. " +msgstr "申し訳ありませんが、現在ファイルを読み込めませんでした。" + +#: website/static/js/firebase-messaging-sw.js:11 +msgid "RDM Announcements" +msgstr "RDMのお知らせ" + +#: website/static/js/firebase-messaging-sw.js:13 +msgid "Background Message body." +msgstr "背景メッセージ本文。" + +#: website/static/js/folderPickerNodeConfig.js:108 +msgid "" +"Could not retrieve %1$s settings at this time. The credentials associated" +" with this %1$s account may no longer be valid." +msgstr "現在、%1$sの設定を取得できませんでした。 この%1$sアカウントに関連付けられている資格情報は無効になっている可能性があります。" + +#: website/static/js/folderPickerNodeConfig.js:109 +msgid "" +" Try disconnecting and reconnecting the %1$s account on your account settings page." +msgstr "アカウント設定ページで%1$sアカウントを切断して再接続してみてください" + +#: website/static/js/folderPickerNodeConfig.js:112 +msgid "" +"Could not retrieve %1$s settings at this time. The %1$s addon credentials" +" may no longer be valid." +msgstr "現在、%1$sの設定を取得できませんでした。%1$sアドオンの資格情報は無効になっている可能性があります。" + +#: website/static/js/folderPickerNodeConfig.js:113 +msgid " Contact %1$s to verify." +msgstr "確認するには%1$sにお問い合わせください。" + +#: website/static/js/folderPickerNodeConfig.js:116 +msgid "" +"Could not retrieve %1$s settings at this time. Please refresh the page. " +"If the problem persists, email %2$s." +msgstr "現在、%1$sの設定を取得できませんでした。 ページを更新してください。 問題が解決しない場合は、%2$sにメールしてください。" + +#: website/static/js/folderPickerNodeConfig.js:119 +msgid "" +"Could not retrieve %1$s account list at this time. Please refresh the " +"page. If the problem persists, email %2$s." +msgstr "現在、%1$sアカウントリストを取得できませんでした。 ページを更新してください。 問題が解決しない場合は、%2$sにメールしてください。" + +#: website/static/js/folderPickerNodeConfig.js:122 +msgid "Disconnected %1$s." +msgstr "%1$sを切断しました。" + +#: website/static/js/folderPickerNodeConfig.js:125 +msgid "" +"Could not disconnect %1$s account because of an error. Please try again " +"later." +msgstr "エラーのため、%1$sアカウントを切断できませんでした。 後でもう一度やり直してください。" + +#: website/static/js/folderPickerNodeConfig.js:128 +msgid "Successfully connected a %1$s account" +msgstr "%1$sアカウントを正常に接続しました" + +#: website/static/js/folderPickerNodeConfig.js:131 +msgid "" +"Error while authorizing addon. Please log in to your %1$s account and " +"grant access to the GakuNin RDM to enable this addon." +msgstr "" +"アドオンの認証中にエラーが発生しました。 このアドオンを有効にするには、%1$sアカウントにログインし、GakuNin " +"RDMへのアクセスを許可してください。" + +#: website/static/js/folderPickerNodeConfig.js:139 +msgid "Could not change %1$s settings. Please try again later." +msgstr "%1$sの設定を変更できませんでした。 後でもう一度やり直してください。" + +#: website/static/js/folderPickerNodeConfig.js:142 +msgid "Are you sure you want to remove this %1$s account?" +msgstr "この%1$sアカウントを切断してもよろしいですか?" + +#: website/static/js/folderPickerNodeConfig.js:145 +msgid "Are you sure you want to link your %1$s account with this project?" +msgstr "%1$sアカウントをこのプロジェクトに接続してもよろしいですか?" + +#: website/static/js/folderPickerNodeConfig.js:148 +msgid "Successfully imported %1$s account from profile." +msgstr "プロファイルから%1$sアカウントを正常にインポートしました。" + +#: website/static/js/folderPickerNodeConfig.js:151 +msgid "Error occurred while importing %1$s account." +msgstr "%1$sアカウントのインポート中にエラーが発生しました。" + +#: website/static/js/folderPickerNodeConfig.js:154 +msgid "Error occurred while importing %1$s group libraries." +msgstr "%1$sアカウントのインポート中にエラーが発生しました。" + +#: website/static/js/folderPickerNodeConfig.js:157 +msgid "Could not connect to %1$s at this time. Please try again later." +msgstr "現在、%1$sに接続できませんでした。 後でもう一度やり直してください。" + +#: website/static/js/folderPickerNodeConfig.js:321 +msgid "Could not GET %1$s settings" +msgstr "%1$sの設定を取得できませんでした" + +#: website/static/js/folderPickerNodeConfig.js:349 +#: website/static/js/folderPickerNodeConfig.js:382 +msgid "Failed to update %1$s settings." +msgstr "%1$sの設定を更新できませんでした。" + +#: website/static/js/folderPickerNodeConfig.js:431 +msgid "Failed to import %1$s access token." +msgstr "%1$sアクセストークンのインポートに失敗しました。" + +#: website/static/js/folderPickerNodeConfig.js:443 +msgid "Failed to import %1$s group libraries." +msgstr "%1$sグループライブラリのインポートに失敗しました。" + +#: website/static/js/folderPickerNodeConfig.js:497 +#: website/static/js/oauthAddonNodeConfig.js:162 +msgid "Import %1$s Account?" +msgstr "%1$sアカウントに接続しますか?" + +#: website/static/js/folderPickerNodeConfig.js:536 +msgid "Could not deauthorize %1$s account from node" +msgstr "ノードから%1$sアカウントを認証解除できませんでした" + +#: website/static/js/folderPickerNodeConfig.js:552 +msgid "Disconnect %1$s Account?" +msgstr "%1$sアカウントを切断しますか?" + +#: website/static/js/folderPickerNodeConfig.js:645 +#: website/static/js/folderPickerNodeConfig.js:656 +msgid "Could not GET get %1$s contents." +msgstr "%1$sアカウントを切断しますか?" + +#: website/static/js/folderpicker.js:101 +msgid "Folders" +msgstr "フォルダ" + +#: website/static/js/folderpicker.js:105 +msgid "Select" +msgstr "選択" + +#: website/static/js/institutionNodes.js:26 +msgid "Failed to load Institution's nodes" +msgstr "機関のノードを読み込めませんでした" + +#: website/static/js/institutionProjectSettings.js:47 +#: website/static/js/institutionProjectSettings.js:127 +msgid "Add institution" +msgstr "機関を追加" + +#: website/static/js/institutionProjectSettings.js:47 +#: website/static/js/institutionProjectSettings.js:127 +msgid "Remove institution" +msgstr "機関を削除" + +#: website/static/js/institutionProjectSettings.js:59 +msgid "" +"Add %1$s to %2$s or to %3$s and every component in " +"it?

                  " +msgstr "%1$sを%2$sまたは%3$sとその中のすべてのコンポーネントに追加しますか?" + +#: website/static/js/institutionProjectSettings.js:60 +msgid "Add to %1$s." +msgstr "%1$sに追加" + +#: website/static/js/institutionProjectSettings.js:61 +msgid "Add to %1$s and every component for which you have permission." +msgstr "%1$sと、許可があるすべてのコンポーネントに追加します。" + +#: website/static/js/institutionProjectSettings.js:64 +msgid "" +"Remove %1$s from %2$s or from %3$s and every " +"component in it?

                  " +msgstr "%2$sまたは%3$sおよびその中のすべてのコンポーネントから%1$sを削除しますか?" + +#: website/static/js/institutionProjectSettings.js:65 +msgid "Remove from %1$s." +msgstr "%1$sから削除します。" + +#: website/static/js/institutionProjectSettings.js:66 +msgid "Remove from %1$s and every component for which you have permission." +msgstr "%1$sおよび許可されているすべてのコンポーネントから削除します。" + +#: website/static/js/institutionProjectSettings.js:69 +#: website/static/js/institutionProjectSettings.js:86 +msgid "Warning, you are not affiliated with %1$s." +msgstr "警告、%1$sと提携していません" + +#: website/static/js/institutionProjectSettings.js:70 +#: website/static/js/institutionProjectSettings.js:87 +msgid " If you remove it from your project, you cannot add it back.
                  " +msgstr "プロジェクトから削除した場合、追加し直すことはできません。
                  " + +#: website/static/js/institutionProjectSettings.js:85 +msgid "Remove %1$s from %2$s." +msgstr "%2$sから%1$sを削除します。" + +#: website/static/js/institutionProjectSettings.js:157 +msgid "Updating affiliation... this may take a minute." +msgstr "所属を更新しています...これには数分かかる場合があります。" + +#: website/static/js/institutionProjectSettings.js:202 +msgid "" +"Unable to modify the institution on this node. Please try again. If the " +"problem persists, email %1$s" +msgstr "このノードの機関を変更できません。もう一度試してください。問題が解決しない場合は、%1$sにメールを送信してください" + +#: website/static/js/institutionProjectSettings.js:203 +msgid "Unable to modify this institution!" +msgstr "この機関を変更できません!" + +#: website/static/js/js_messages.js:3 +msgid "Bookmarks" +msgstr "ブックマーク" + +#: website/static/js/js_messages.js:5 +msgid "Edit" +msgstr "編集" + +#: website/static/js/js_messages.js:7 +msgid "Analysis" +msgstr "分析" + +#: website/static/js/js_messages.js:7 +msgid "Communication" +msgstr "コミュニケーション" + +#: website/static/js/js_messages.js:7 +msgid "Data" +msgstr "データ" + +#: website/static/js/js_messages.js:7 +msgid "Hypothesis" +msgstr "仮説" + +#: website/static/js/js_messages.js:7 +msgid "Instrumentation" +msgstr "器具" + +#: website/static/js/js_messages.js:7 +msgid "Methods and Measures" +msgstr "方法と対策" + +#: website/static/js/js_messages.js:7 +msgid "Procedure" +msgstr "手順" + +#: website/static/js/js_messages.js:7 +#: website/static/js/projectSettingsTreebeardBase.js:90 +msgid "Project" +msgstr "プロジェクト" + +#: website/static/js/js_messages.js:7 +msgid "Software" +msgstr "ソフトウェア" + +#: website/static/js/js_messages.js:7 +msgid "Other" +msgstr "その他" + +#: website/static/js/js_messages.js:9 +msgid "analysis" +msgstr "分析" + +#: website/static/js/js_messages.js:9 +msgid "communication" +msgstr "コミュニケーション" + +#: website/static/js/js_messages.js:9 +msgid "data" +msgstr "データ" + +#: website/static/js/js_messages.js:9 +msgid "hypothesis" +msgstr "仮説" + +#: website/static/js/js_messages.js:9 +msgid "instrumentation" +msgstr "器具" + +#: website/static/js/js_messages.js:9 +msgid "methods and measures" +msgstr "方法と対策" + +#: website/static/js/js_messages.js:9 +msgid "procedure" +msgstr "手順" + +#: website/static/js/js_messages.js:9 website/static/js/nodeControl.js:114 +#: website/static/js/nodeSelectTreebeard.js:87 +#: website/static/js/nodesDeleteTreebeard.js:62 +#: website/static/js/nodesPrivacySettingsTreebeard.js:62 +msgid "project" +msgstr "プロジェクト" + +#: website/static/js/js_messages.js:9 +msgid "software" +msgstr "ソフトウェア" + +#: website/static/js/js_messages.js:9 +msgid "other" +msgstr "その他" + +#: website/static/js/js_messages.js:11 website/static/js/js_messages.js:13 +msgid "Comments added" +msgstr "コメント追加時" + +#: website/static/js/js_messages.js:11 website/static/js/js_messages.js:13 +msgid "Files updated" +msgstr "ファイルアップロード時" + +#: website/static/js/js_messages.js:13 +msgid "Replies to your comments" +msgstr "コメントへの返信時" + +#: website/static/js/js_messages.js:13 +msgid "Mentions added" +msgstr "メンション追加時" + +#: website/static/js/js_messages.js:13 +msgid "Preprint submissions updated" +msgstr "プレプリント提出の更新時" + +#: website/static/js/js_messages.js:15 +msgid "No license" +msgstr "ライセンスなし" + +#: website/static/js/js_messages.js:17 website/static/js/passwordForms.js:178 +#: website/static/js/passwordForms.js:241 +msgid "This field is required." +msgstr "この項目は必須です。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a value greater than or equal to {0}." +msgstr "{0}以上の値を入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a value less than or equal to {0}." +msgstr "{0}以下の値を入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter at least {0} characters." +msgstr "{0}文字以上入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter no more than {0} characters." +msgstr "{0}文字以下で入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please check this value." +msgstr "値を確認してください。" + +#: website/static/js/js_messages.js:17 +msgid "The value must increment by {0}." +msgstr "値は{0}ずつ増加する必要があります。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a proper email address." +msgstr "正しいメールアドレスを入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a proper date." +msgstr "適切な日付を入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a number." +msgstr "数字を入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a digit." +msgstr "数字を入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please specify a valid phone number." +msgstr "有効な電話番号を指定してください。" + +#: website/static/js/js_messages.js:17 +msgid "Values must equal." +msgstr "値は等しくなければなりません。" + +#: website/static/js/js_messages.js:17 +msgid "Please choose another value." +msgstr "別の値を選択してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please make sure the value is unique." +msgstr "値が一意であることを確認してください。" + +#: website/static/js/js_messages.js:19 +msgid "Project Wiki Pages" +msgstr "プロジェクトのWiki" + +#: website/static/js/js_messages.js:19 +msgid "Component Wiki Pages" +msgstr "コンポーネントのWiki" + +#: website/static/js/js_messages.js:19 +msgid "Home" +msgstr "ホーム" + +#: website/static/js/js_messages.js:21 +msgid "Projects" +msgstr "プロジェクト" + +#: website/static/js/js_messages.js:21 +msgid "Components" +msgstr "コンポーネント" + +#: website/static/js/js_messages.js:21 +msgid "Registrations" +msgstr "登録" + +#: website/static/js/js_messages.js:21 +msgid "Users" +msgstr "ユーザー" + +#: website/static/js/js_messages.js:21 +msgid "All Results" +msgstr "全検索結果" + +#: website/static/js/js_messages.js:21 +msgid "Files" +msgstr "ファイル" + +#: website/static/js/js_messages.js:21 +msgid "Institutions" +msgstr "機関" + +#: website/static/js/js_messages.js:21 +msgid "Preprints" +msgstr "プレプリント" + +#: website/static/js/js_messages.js:21 +msgid "Groups" +msgstr "グループ" + +#: website/static/js/js_messages.js:21 +msgid "Wiki" +msgstr "Wiki" + +#: website/static/js/js_messages.js:21 +msgid "Comments" +msgstr "コメント" + +#: website/static/js/js_messages.js:23 +msgid "Default Notification Settings" +msgstr "デフォルトの通知設定" + +#: website/static/js/js_messages.js:23 +msgid "" +"These are default settings for new projects you create or are added to. " +"Modifying these settings will not modify settings on existing projects." +msgstr "これらは、作成または追加される新しいプロジェクトのデフォルト設定です。 これらの設定を変更しても、既存のプロジェクトの設定は変更されません。" + +#: website/static/js/js_messages.js:23 +msgid "Project Notifications" +msgstr "プロジェクト通知" + +#: website/static/js/js_messages.js:23 +msgid "" +"These are settings for each of your projects. Modifying these settings " +"will only modify the settings for the selected project." +msgstr "これらは、プロジェクトごとの設定です。 これらの設定を変更すると、選択したプロジェクトの設定のみが変更されます。" + +#: website/static/js/js_messages.js:25 +msgid "moved" +msgstr "移動" + +#: website/static/js/js_messages.js:25 +msgid "renamed" +msgstr "名前の変更" + +#: website/static/js/js_messages.js:27 +msgid "Skipped" +msgstr "スキップ済" + +#: website/static/js/js_messages.js:27 +msgid "Moved or replaced old version" +msgstr "古いバージョンを移動または置換" + +#: website/static/js/js_messages.js:27 +msgid "Kept both versions" +msgstr "両方のバージョンを保持" + +#: website/static/js/js_messages.js:29 +msgid "admin" +msgstr "管理者" + +#: website/static/js/js_messages.js:29 +msgid "write" +msgstr "書込み" + +#: website/static/js/js_messages.js:29 +msgid "read" +msgstr "読込み" + +#: website/static/js/js_messages.js:31 +msgid "home" +msgstr "ホーム" + +#: website/static/js/js_messages.js:33 +msgid "No tokens." +msgstr "トークンがありません。" + +#: website/static/js/js_messages.js:33 +msgid "Invalid tokens." +msgstr "無効なトークンです。" + +#: website/static/js/js_messages.js:35 +msgid "Invalid folder." +msgstr "無効なフォルダです。" + +#: website/static/js/js_messages.js:35 +msgid "Credentials are valid" +msgstr "資格情報は有効です。" + +#: website/static/js/keen.js:114 +msgid "Error sending Keen data to %1$s:<%2$s>" +msgstr "Keenデータの%1$sへの送信エラー:<%2$s>" + +#: website/static/js/keen.js:132 +msgid "Error sending Keen data for multiple events: <%1$s>" +msgstr "複数のイベントのKeenデータの送信エラー:<%1$s>" + +#: website/static/js/keen.js:141 +msgid "Error sending Keen data to %1$s." +msgstr "Keenデータを%1$sに送信中にエラーが発生しました。" + +#: website/static/js/keen.js:153 +msgid "Cannot instantiate another KeenTracker instance." +msgstr "別のKeenTrackerインスタンスをインスタンス化できません。" + +#: website/static/js/koHelpers.js:129 +msgid "End date must be greater than or equal to the start date." +msgstr "終了日は開始日以上でなければなりません。" + +#: website/static/js/koHelpers.js:147 +msgid "Date must be greater than or equal to 1900." +msgstr "日付は1900以上でなければなりません。" + +#: website/static/js/koHelpers.js:169 +msgid "Please enter a date prior to the current date." +msgstr "現在の日付より前の日付を入力してください。" + +#: website/static/js/koHelpers.js:175 +msgid "Please enter a valid year." +msgstr "有効な年を入力してください。" + +#: website/static/js/koHelpers.js:190 +msgid "Please enter a valid URL." +msgstr "有効なURLを入力してください。" + +#: website/static/js/koHelpers.js:197 +msgid "The field does not match the required input." +msgstr "フィールドが必要な入力と一致しません。" + +#: website/static/js/licensePicker.js:20 website/static/js/profile.js:128 +#: website/static/js/profile.js:132 +msgid "Year" +msgstr "年" + +#: website/static/js/licensePicker.js:21 +msgid "Copyright Holders" +msgstr "著作権者" + +#: website/static/js/licensePicker.js:26 +msgid "License:" +msgstr "ライセンス:" + +#: website/static/js/licensePicker.js:27 +msgid "Choose a license:" +msgstr "ライセンスを選択:" + +#: website/static/js/licensePicker.js:28 +msgid ">Save<" +msgstr ">保存<" + +#: website/static/js/licensePicker.js:68 +msgid "Add a license" +msgstr "ライセンスを追加" + +#: website/static/js/licensePicker.js:104 +msgid "Please specify a valid year." +msgstr "有効な年を指定してください。" + +#: website/static/js/licensePicker.js:108 +msgid "Future years are not allowed." +msgstr "将来の年は許可されていません。" + +#: website/static/js/licensePicker.js:190 +msgid "License updated successfully." +msgstr "ライセンスが正常に更新されました。" + +#: website/static/js/licensePicker.js:195 +msgid "There was a problem updating your license. Please try again." +msgstr "ライセンスの更新中に問題が発生しました。 もう一度やり直してください。" + +#: website/static/js/licensePicker.js:239 +msgid "Your Own License" +msgstr "自分のライセンス" + +#: website/static/js/licensePicker.js:240 +msgid "" +"You have opted to use your own license. Please upload a license file " +"named \"license.txt\" into the GakuNin RDM Storage of this project." +msgstr "" +"独自のライセンスを使用することを選択しました。「license.txt」という名前のライセンスファイルをこのプロジェクトのGakuNin " +"RDMストレージにアップロードしてください。" + +#: website/static/js/licensePicker.js:247 +msgid "Add license" +msgstr "ライセンスを追加" + +#: website/static/js/licenses.js:27 +msgid "Content:" +msgstr "コンテンツ用" + +#: website/static/js/licenses.js:31 +msgid "Code - Permissive:" +msgstr "コード用 - 非コピーレフト" + +#: website/static/js/licenses.js:35 +msgid "Code - Copyleft:" +msgstr "コード用 - コピーレフト" + +#: website/static/js/licenses.js:39 +msgid "Code - Other:" +msgstr "コード用 - その他" + +#: website/static/js/logActionsList_extract.js:3 +#: website/static/js/logActionsList_extract.js:70 +msgid "${user} created ${node}" +msgstr "${user}が${node}を作成しました" + +#: website/static/js/logActionsList_extract.js:4 +msgid "${user} registered ${node}" +msgstr "${user}が${node}を登録しました" + +#: website/static/js/logActionsList_extract.js:5 +msgid "${node} registered" +msgstr "${node}が登録されました" + +#: website/static/js/logActionsList_extract.js:6 +msgid "" +"${user} submitted for review to the Preregistration Challenge a " +"registration of ${node}" +msgstr "${user}が${node}の登録を事前登録チャレンジにレビューのために提出しました" + +#: website/static/js/logActionsList_extract.js:7 +msgid "${user} deleted ${node}" +msgstr "${user}が${node}を削除しました" + +#: website/static/js/logActionsList_extract.js:8 +msgid "${user} created ${node} based on ${template}" +msgstr "${user}が${template}に基づいて${node}を作成しました" + +#: website/static/js/logActionsList_extract.js:9 +msgid "${user} created a link to ${pointer_category} ${pointer}" +msgstr "${user}が${pointer_category} ${pointer}へのリンクを作成しました" + +#: website/static/js/logActionsList_extract.js:10 +msgid "${user} forked a link to ${pointer_category} ${pointer}" +msgstr "${user}が${pointer_category} ${pointer}へのリンクをforkしました" + +#: website/static/js/logActionsList_extract.js:11 +msgid "${user} removed a link to ${pointer_category} ${pointer}" +msgstr "${user}が${pointer_category} ${pointer}へのリンクを削除しました" + +#: website/static/js/logActionsList_extract.js:12 +msgid "${user} added ${group} to ${node}" +msgstr "${user}が${group}を${node}に追加しました" + +#: website/static/js/logActionsList_extract.js:13 +msgid "${user} removed ${group} from ${node}" +msgstr "${user}が${node}から${group}を削除しました" + +#: website/static/js/logActionsList_extract.js:14 +msgid "${user} changed ${group} permissions to ${node}" +msgstr "${user}が${group}の権限を${node}に変更しました" + +#: website/static/js/logActionsList_extract.js:15 +msgid "${user} made ${node} public" +msgstr "${user}が${node}を公開しました" + +#: website/static/js/logActionsList_extract.js:16 +msgid "${node} made public" +msgstr "${node}が公開されました" + +#: website/static/js/logActionsList_extract.js:17 +msgid "${user} made ${node} private" +msgstr "${user}が${node}を非公開にしました" + +#: website/static/js/logActionsList_extract.js:18 +msgid "${user} added tag ${tag} to ${node}" +msgstr "${user}さんがタグ${tag}を${node}に追加しました" + +#: website/static/js/logActionsList_extract.js:19 +msgid "${user} removed tag ${tag} from ${node}" +msgstr "${user}が${node}からタグ${tag}を削除しました" + +#: website/static/js/logActionsList_extract.js:20 +msgid "${user} changed the title from ${title_original} to ${title_new}" +msgstr "${user}がタイトルを${title_original}から${title_new}に変更しました" + +#: website/static/js/logActionsList_extract.js:21 +msgid "${user} edited description of ${node}" +msgstr "${user}が${node}の説明を編集しました" + +#: website/static/js/logActionsList_extract.js:22 +msgid "${user} changed the ${updated_fields} for ${node}" +msgstr "${user}が${node}の${updated_fields}を変更しました" + +#: website/static/js/logActionsList_extract.js:23 +msgid "${user} created external identifier(s) ${identifiers} on ${node}" +msgstr "${user}が${node}に外部識別子${identifiers}を作成しました" + +#: website/static/js/logActionsList_extract.js:24 +msgid "${user} created a custom citation for ${node}" +msgstr "${user}が${node}のカスタム引用を作成しました" + +#: website/static/js/logActionsList_extract.js:25 +msgid "${user} edited a custom citation for ${node}" +msgstr "${user}が${node}のカスタム引用を編集しました" + +#: website/static/js/logActionsList_extract.js:26 +msgid "${user} removed a custom citation for ${node}" +msgstr "${user}が${node}のカスタム引用を削除しました" + +#: website/static/js/logActionsList_extract.js:27 +msgid "${user} added ${contributors} as contributor(s) to ${node}" +msgstr "${user}が${contributors}をコントリビューターとして${node}に追加しました" + +#: website/static/js/logActionsList_extract.js:28 +msgid "${user} removed ${contributors} as contributor(s) from ${node}" +msgstr "${user}が${node}からコントリビューターとして${contributors}を削除しました" + +#: website/static/js/logActionsList_extract.js:29 +msgid "${user} reordered contributors for ${node}" +msgstr "${user}が${node}の投稿者を並べ替えました" + +#: website/static/js/logActionsList_extract.js:30 +msgid "${user} changed permissions for ${node}" +msgstr "${user}が${node}の権限を変更しました" + +#: website/static/js/logActionsList_extract.js:31 +msgid "" +"${user} made non-bibliographic contributor ${contributors} a " +"bibliographic contributor on ${node}" +msgstr "${user}が目録非表示メンバー(${contributors})を${node}の目録表示メンバーにしました" + +#: website/static/js/logActionsList_extract.js:32 +msgid "" +"${user} made bibliographic contributor ${contributors} a non-" +"bibliographic contributor on ${node}" +msgstr "${user}が目録表示メンバー(${contributors})を${node}の目録非表示メンバーにしました" + +#: website/static/js/logActionsList_extract.js:33 +msgid "${user} updated wiki page ${page} to version ${version} of ${node}" +msgstr "${user}が${node}のWiki(${page})をバージョン${version}に更新" + +#: website/static/js/logActionsList_extract.js:34 +msgid "${user} deleted wiki page ${page} of ${node}" +msgstr "${user}が${node}のWikiページ${page}を削除しました" + +#: website/static/js/logActionsList_extract.js:35 +msgid "${user} renamed wiki page ${old_page} to ${page} of ${node}" +msgstr "${user}がWikiページ${old_page}の名前を${node}の${page}に変更しました" + +#: website/static/js/logActionsList_extract.js:36 +msgid "${user} made the wiki of ${node} publicly editable" +msgstr "${user}が${node}のwikiをパブリックに編集可能にしました" + +#: website/static/js/logActionsList_extract.js:37 +msgid "${user} made the wiki of ${node} privately editable" +msgstr "${user}が${node}のwikiをプライベートに編集可能にしました" + +#: website/static/js/logActionsList_extract.js:38 +msgid "${user} added addon ${addon} to ${node}" +msgstr "${user}が${node}にアドオン${addon}を追加しました" + +#: website/static/js/logActionsList_extract.js:39 +msgid "${user} removed addon ${addon} from ${node}" +msgstr "${user}が${node}からアドオン${addon}を削除しました" + +#: website/static/js/logActionsList_extract.js:40 +msgid "${user} moved ${source} to ${destination} in ${node}" +msgstr "${user}が${source}を${node}の${destination}に移動しました" + +#: website/static/js/logActionsList_extract.js:41 +msgid "${user} copied ${source} to ${destination} in ${node}" +msgstr "${user}が${source}を${node}の${destination}にコピーしました" + +#: website/static/js/logActionsList_extract.js:42 +msgid "${user} renamed ${source} to ${destination} in ${node}" +msgstr "${user}は${node}で${source}を${destination}に名前変更しました" + +#: website/static/js/logActionsList_extract.js:43 +msgid "${user} created a folder in ${node}" +msgstr "${user}が${node}にフォルダを作成しました" + +#: website/static/js/logActionsList_extract.js:44 +msgid "${user} added file ${path} to ${node}" +msgstr "${user}がファイル${path}を${node}に追加しました" + +#: website/static/js/logActionsList_extract.js:45 +msgid "${user} updated file in ${node}" +msgstr "${user}が${node}のファイルを更新しました" + +#: website/static/js/logActionsList_extract.js:46 +msgid "${user} removed ${path_type} ${path} from ${node}" +msgstr "${user}が${node}から${path_type} ${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:47 +msgid "${user} restored file ${path} from ${node}" +msgstr "${user}が${node}からファイル${path}を復元しました" + +#: website/static/js/logActionsList_extract.js:48 +msgid "${user} updated the file metadata for ${path}" +msgstr "${user}が${path}のファイルメタデータを更新しました" + +#: website/static/js/logActionsList_extract.js:49 +msgid "${user} checked out ${kind} ${path} from ${node}" +msgstr "${user}が${node}から${kind} ${path}をチェックアウトしました" + +#: website/static/js/logActionsList_extract.js:50 +msgid "${user} checked in ${kind} ${path} to ${node}" +msgstr "${user}が${kind} ${path}を${node}にチェックインしました" + +#: website/static/js/logActionsList_extract.js:51 +msgid "${user} added a comment ${comment_location} in ${node}" +msgstr "${user}さんが${node}にコメント${comment_location}を追加しました" + +#: website/static/js/logActionsList_extract.js:52 +msgid "${user} deleted a comment ${comment_location} in ${node}" +msgstr "${user}さんが${node}のコメント${comment_location}を削除しました" + +#: website/static/js/logActionsList_extract.js:53 +msgid "${user} restored a comment ${comment_location} in ${node}" +msgstr "${user}が${node}のコメント${comment_location}を復元しました" + +#: website/static/js/logActionsList_extract.js:54 +msgid "${user} updated a comment ${comment_location} in ${node}" +msgstr "${user}が${node}のコメント${comment_location}を更新しました" + +#: website/static/js/logActionsList_extract.js:55 +msgid "${user} initiated an embargoed registration of ${node}" +msgstr "${user}が${node}の禁止登録を開始しました" + +#: website/static/js/logActionsList_extract.js:56 +msgid "${user} approved embargoed registration of ${node}" +msgstr "${user}が${node}の禁止登録を承認しました" + +#: website/static/js/logActionsList_extract.js:57 +msgid "Embargo of registration of ${node} approved" +msgstr "${node}の登録の禁止が承認されました" + +#: website/static/js/logActionsList_extract.js:58 +msgid "${user} cancelled embargoed registration of ${node}" +msgstr "${user}が${node}の禁止登録をキャンセルしました" + +#: website/static/js/logActionsList_extract.js:59 +msgid "${user} completed embargo of ${node}" +msgstr "${user}が${node}の禁止を完了しました" + +#: website/static/js/logActionsList_extract.js:60 +msgid "Embargo for ${node} completed" +msgstr "${node}の禁止が完了しました" + +#: website/static/js/logActionsList_extract.js:61 +msgid "Embargo for ${node} ended" +msgstr "${node}の禁止が終了しました" + +#: website/static/js/logActionsList_extract.js:62 +msgid "${user} initiated withdrawal of registration of ${node}" +msgstr "${user}が${node}の登録の取り消しを開始しました" + +#: website/static/js/logActionsList_extract.js:63 +msgid "A withdrawal of registration of ${node} is proposed" +msgstr "${node}の登録の削除が提案されています" + +#: website/static/js/logActionsList_extract.js:64 +msgid "${user} approved withdrawal of registration of ${node}" +msgstr "${user}は${node}の登録の取り消しを承認しました" + +#: website/static/js/logActionsList_extract.js:65 +msgid "${user} cancelled withdrawal of registration of ${node}" +msgstr "${user}が${node}の登録の取り消しをキャンセルしました" + +#: website/static/js/logActionsList_extract.js:66 +msgid "${user} initiated registration of ${node}" +msgstr "${user}が${node}の登録を開始しました" + +#: website/static/js/logActionsList_extract.js:67 +msgid "${user} approved registration of ${node}" +msgstr "${user}が${node}の登録を承認しました" + +#: website/static/js/logActionsList_extract.js:68 +msgid "Registration of ${node} approved" +msgstr "${node}の登録が承認されました" + +#: website/static/js/logActionsList_extract.js:69 +msgid "${user} cancelled registration of ${node}" +msgstr "${user}が${node}の登録をキャンセルしました" + +#: website/static/js/logActionsList_extract.js:71 +msgid "${user} created fork from ${forked_from}" +msgstr "${user}が${forked_from}からフォークを作成しました" + +#: website/static/js/logActionsList_extract.js:72 +msgid "${user} removed ${node}" +msgstr "${user}が${node}を削除しました" + +#: website/static/js/logActionsList_extract.js:73 +msgid "${user} enabled access requests for ${node}" +msgstr "${user}が${node}のアクセス要求を有効にしました" + +#: website/static/js/logActionsList_extract.js:74 +msgid "${user} disabled access requests for ${node}" +msgstr "${user}が${node}のアクセス要求を無効にしました" + +#: website/static/js/logActionsList_extract.js:75 +msgid "${user} updated the license of ${node} ${license}" +msgstr "${user}が${node} ${license}のライセンスを更新しました" + +#: website/static/js/logActionsList_extract.js:76 +msgid "${user} added tag ${tag} to ${path} in ${storage_name} in ${node}" +msgstr "${user}が${node}の${storage_name}の${path}にタグ${tag}を追加しました" + +#: website/static/js/logActionsList_extract.js:77 +msgid "${user} removed tag ${tag} from ${path} in ${storage_name} in ${node}" +msgstr "${user}が${node}の${storage_name}の${path}からタグ${tag}を削除しました" + +#: website/static/js/logActionsList_extract.js:78 +msgid "${user} added file ${path} to ${storage_name} in ${node}" +msgstr "${user}が${node}の${storage_name}にファイル${path}を追加しました" + +#: website/static/js/logActionsList_extract.js:79 +msgid "${user} created folder ${path} in ${storage_name} in ${node}" +msgstr "${user}が${node}の${storage_name}にフォルダ${path}を作成しました" + +#: website/static/js/logActionsList_extract.js:80 +msgid "${user} updated file ${path} in ${storage_name} in ${node}" +msgstr "${user}が${node}の${storage_name}のファイル${path}を更新しました" + +#: website/static/js/logActionsList_extract.js:81 +msgid "${user} removed ${path_type} ${path} from ${storage_name} in ${node}" +msgstr "${user}は${node}の${storage_name}から${path_type} ${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:82 +msgid "${user} added ${institution} affiliation to ${node}" +msgstr "${user}が${institution}の所属を${node}に追加しました" + +#: website/static/js/logActionsList_extract.js:83 +msgid "${user} removed ${institution} affiliation from ${node}" +msgstr "${user}が${institution}の所属を${node}から削除しました" + +#: website/static/js/logActionsList_extract.js:84 +msgid "${user} made ${node} a ${preprint} on ${preprint_provider} Preprints" +msgstr "${user}が${preprint_provider}プレプリントで${node}を${preprint}にしました" + +#: website/static/js/logActionsList_extract.js:85 +msgid "" +"${user} updated the primary file of this ${preprint} on " +"${preprint_provider} Preprints" +msgstr "$ß{user}が${preprint_provider}プレプリントでこの${preprint}のプライマリファイルを更新しました" + +#: website/static/js/logActionsList_extract.js:86 +msgid "" +"${user} updated the license of this ${preprint} on ${preprint_provider} " +"Preprints ${license}" +msgstr "${user}が${preprint_provider}プレプリント${license}でこの${preprint}のライセンスを更新しました" + +#: website/static/js/logActionsList_extract.js:87 +msgid "${user} updated the subjects on ${node} to ${subjects}" +msgstr "${user}が${node}の件名を${subjects}に更新しました" + +#: website/static/js/logActionsList_extract.js:88 +msgid "${user} created ${anonymous_link} view-only link to ${node}" +msgstr "${user}が${node}への${anonymous_link}参照専用リンクを作成しました" + +#: website/static/js/logActionsList_extract.js:89 +msgid "${user} removed ${anonymous_link} view-only link to ${node}" +msgstr "${user}が${node}への${anonymous_link}参照専用リンクを削除しました" + +#: website/static/js/logActionsList_extract.js:90 +msgid "${user} verified timestamp" +msgstr "${user}がタイムスタンプ確認" + +#: website/static/js/logActionsList_extract.js:91 +msgid "${user} requested trusted timestamp" +msgstr "${user}がタイムスタンプを打つ" + +#: website/static/js/logActionsList_extract.js:92 +msgid "${user} requested trusted timestamp file ${path}" +msgstr "${user}がファイル${path}にタイムスタンプを打つ" + +#: website/static/js/logActionsList_extract.js:93 +msgid "" +"${user} downloaded a file of timestamp errors as a " +"${timestamp_errors_file_format}" +msgstr "${user}がタイムスタンプエラーのファイルを${timestamp_errors_file_format}でダウンロード" + +#: website/static/js/logActionsList_extract.js:94 +msgid "" +"[MAPCORE_SYNC:ERROR] ${user} cannot create a new mAP group for GRDM " +"project <${node}> (See logs for details)" +msgstr "" +"[MAPCORE_SYNC:ERROR] " +"${user}はGRDMプロジェクト<${node}>の新しいmAPグループを作成できません(詳細はログを参照してください)" + +#: website/static/js/logActionsList_extract.js:95 +msgid "" +"[MAPCORE_SYNC:ERROR] mAP group for GRDM project <${node}> cannot be " +"updated (See logs for details)" +msgstr "[MAPCORE_SYNC:ERROR] GRDMプロジェクト<${node}>のmAPグループを更新できません(詳細はログを参照してください)" + +#: website/static/js/logActionsList_extract.js:96 +msgid "" +"[MAPCORE_SYNC:ERROR] GRDM project <${node}> cannot be updated with mAP " +"group (See logs for details)" +msgstr "[MAPCORE_SYNC:ERROR] GRDMプロジェクト<${node}>はmAPグループで更新できません(詳細はログを参照してください)" + +#: website/static/js/logActionsList_extract.js:97 +msgid "" +"[MAPCORE_SYNC:NOTICE] Unknown (unregistered in GRDM) users belong to mAP " +"group <${node}> (ignored) (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:98 +msgid "${user} linked the Azure Blob Storage container ${bucket} to ${node}" +msgstr "${user}がAzure Blob Storageコンテナ${bucket}を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:99 +msgid "${user} unselected the Azure Blob Storage container ${bucket} in ${node}" +msgstr "${user}が${node}のAzure Blob Storageコンテナ${bucket}の選択を解除しました" + +#: website/static/js/logActionsList_extract.js:100 +msgid "" +"${user} added file ${path} to Azure Blob Storage container ${bucket} in " +"${node}" +msgstr "${user}がファイル${path}を${node}のAzure Blob Storageコンテナ${bucket}に追加しました" + +#: website/static/js/logActionsList_extract.js:101 +msgid "" +"${user} removed ${path} in Azure Blob Storage container ${bucket} in " +"${node}" +msgstr "${user}が${node}のAzure Blob Storageコンテナ${bucket}の${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:102 +msgid "" +"${user} updated file ${path} in Azure Blob Storage container ${bucket} in" +" ${node}" +msgstr "${user}が${node}のAzure Blob Storageコンテナ${bucket}のファイル${path}を更新しました" + +#: website/static/js/logActionsList_extract.js:103 +msgid "" +"${user} created folder ${path} in Azure Blob Storage container ${bucket} " +"in ${node}" +msgstr "${user}が${node}のAzure Blob Storageコンテナ${bucket}にフォルダ${path}を作成しました" + +#: website/static/js/logActionsList_extract.js:104 +msgid "${user} authorized the Azure Blob Storage addon for ${node}" +msgstr "${user}が${node}のAzure Blob Storageアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:105 +msgid "${user} deauthorized the Azure Blob Storage addon for ${node}" +msgstr "${user}が${node}のAzure Blob Storageアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:106 +msgid "Azure Blob Storage addon for ${node} deauthorized" +msgstr "許可されていない${node}のAzure Blob Storageアドオン" + +#: website/static/js/logActionsList_extract.js:107 +msgid "${user} added file ${path} to Bitbucket repo ${bitbucket_repo} in ${node}" +msgstr "${user}がファイル${path}を${node}のBitbucketリポジトリ(${bitbucket_repo})に追加しました" + +#: website/static/js/logActionsList_extract.js:108 +msgid "" +"${user} removed ${path_type} ${path} in Bitbucket repo ${bitbucket_repo} " +"in ${node}" +msgstr "${user}が${node}のBitbucketリポジトリ(${bitbucket_repo})で${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:109 +msgid "" +"${user} updated file ${path} in Bitbucket repo ${bitbucket_repo} in " +"${node}" +msgstr "${user}が${node}のBitbucketレポジトリ(${bitbucket_repo})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:110 +msgid "" +"${user} created folder ${path} in Bitbucket repo ${bitbucket_repo} in " +"${node}" +msgstr "${user}が${node}のBitbucketリポジトリ(${bitbucket_repo})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:111 +msgid "${user} authorized the Bitbucket addon for ${node}" +msgstr "${user}が${node}のBitbucketアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:112 +msgid "${user} deauthorized the Bitbucket addon for ${node}" +msgstr "${user}が${node}のBitbucketアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:113 +msgid "Bitbucket addon for ${node} deauthorized" +msgstr "許可されていない${node}のBitbucketアドオン" + +#: website/static/js/logActionsList_extract.js:114 +msgid "${user} linked Bitbucket repo ${bitbucket_repo} to ${node}" +msgstr "${user}がBitbucketリポジトリ(${bitbucket_repo})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:115 +msgid "${user} added file ${path} to Box in ${node}" +msgstr "${user}がファイル${path}を${node}のBoxに追加しました" + +#: website/static/js/logActionsList_extract.js:116 +msgid "${user} removed ${path_type} ${path} from Box in ${node}" +msgstr "${user}が${node}のBoxから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:117 +msgid "${user} updated file ${path} in Box in ${node}" +msgstr "${user}が${node}のBoxのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:118 +msgid "${user} created folder ${path} in Box in ${node}" +msgstr "${user}が${node}のBoxにフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:119 +msgid "${user} linked Box folder ${box_folder} to ${node}" +msgstr "${user}がBoxフォルダ(${box_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:120 +msgid "${user} authorized the Box addon in ${node}" +msgstr "${user}が${node}のBoxアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:121 +msgid "${user} deauthorized the Box addon for ${node}" +msgstr "${user}が${node}のBoxアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:122 +msgid "Box addon for ${node} deauthorized" +msgstr "許可されていない${node}のボックスアドオン" + +#: website/static/js/logActionsList_extract.js:123 +msgid "${user} added a citation ${citation} to ${node}" +msgstr "${user}が${node}に引用(${citation})を追加しました" + +#: website/static/js/logActionsList_extract.js:124 +msgid "${user} updated a citation ${citation} in ${node}" +msgstr "${user}が${node}の引用(${citation})を更新しました" + +#: website/static/js/logActionsList_extract.js:125 +msgid "${user} removed a citation ${citation} in ${node}" +msgstr "${user}が${node}の引用(${citation})を削除しました" + +#: website/static/js/logActionsList_extract.js:126 +msgid "${user} added file ${filename} to Dataverse dataset ${dataset} in ${node}" +msgstr "${user}がファイル(${filename})を${node}のDataverseデータセット(${dataset})に追加しました" + +#: website/static/js/logActionsList_extract.js:127 +msgid "" +"${user} removed file ${filename} from Dataverse dataset ${dataset} in " +"${node}" +msgstr "${user}が${node}のDataverseデータセット(${dataset})からファイル(${filename})を削除しました" + +#: website/static/js/logActionsList_extract.js:128 +msgid "${user} linked Dataverse dataset ${dataset} to ${node}" +msgstr "${user}がDataverseデータセット(${dataset})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:129 +msgid "${user} linked Dataverse dataset ${study} to ${node}" +msgstr "${user}がDataverseデータセット(${study})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:130 +msgid "${user} published a new version of Dataverse dataset ${dataset} on ${node}" +msgstr "${user}がDataverseデータセット(${dataset})の新しいバージョンを${node}に公開しました" + +#: website/static/js/logActionsList_extract.js:131 +msgid "${user} published a new version of Dataverse dataset ${study} to ${node}" +msgstr "${user}がDataverseデータセット(${study})の新しいバージョンを${node}に公開しました" + +#: website/static/js/logActionsList_extract.js:132 +msgid "${user} authorized the Dataverse addon for ${node}" +msgstr "${user}が${node}のDataverseアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:133 +msgid "${user} deauthorized the Dataverse addon for ${node}" +msgstr "${user}が${node}のDataverseアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:134 +msgid "Dataverse addon for ${node} deauthorized" +msgstr "許可されていない${node}のDataverseアドオン" + +#: website/static/js/logActionsList_extract.js:135 +msgid "${user} added file ${path} to Dropbox in ${node}" +msgstr "${user}がファイル${path}を${node}のDropboxに追加しました" + +#: website/static/js/logActionsList_extract.js:136 +msgid "${user} removed ${path_type} ${path} from Dropbox in ${node}" +msgstr "${user}が${node}のDropboxから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:137 +msgid "${user} updated file ${path} in Dropbox in ${node}" +msgstr "${user}が${node}のDropboxのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:138 +msgid "${user} created folder ${path} in Dropbox in ${node}" +msgstr "${user}が${node}のDropboxにフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:139 +msgid "${user} linked Dropbox folder ${dropbox_folder} to ${node}" +msgstr "${user}がDropboxフォルダ(${dropbox_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:140 +msgid "${user} authorized the Dropbox addon for ${node}" +msgstr "${user}が${node}のDropboxアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:141 +msgid "${user} deauthorized the Dropbox addon for ${node}" +msgstr "${user}が${node}のDropboxアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:142 +msgid "Dropbox addon for ${node} deauthorized" +msgstr "許可されていない${node}のDropboxアドオン" + +#: website/static/js/logActionsList_extract.js:143 +msgid "${user} added file ${path} to Dropbox Business in ${node}" +msgstr "${user}がファイル(${path})を${node}のDropbox Businessに追加しました" + +#: website/static/js/logActionsList_extract.js:144 +msgid "${user} removed ${path_type} ${path} from Dropbox Business in ${node}" +msgstr "${user}が${node}のDropbox Businessから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:145 +msgid "${user} updated file ${path} in Dropbox Business in ${node}" +msgstr "${user}が${node}のDropbox Businessのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:146 +msgid "${user} created folder ${path} in Dropbox Business in ${node}" +msgstr "${user}が${node}のDropbox Businessにフォルダ${path}を作成しました" + +#: website/static/js/logActionsList_extract.js:147 +msgid "" +"${user} linked Dropbox Business folder ${dropboxbusiness_folder} to " +"${node}" +msgstr "${user}がDropbox Businessフォルダ(${dropboxbusiness_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:148 +msgid "${user} authorized the Dropbox Business addon for ${node}" +msgstr "${user}が${node}のDropbox Businessアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:149 +msgid "${user} deauthorized the Dropbox Business addon for ${node}" +msgstr "${user}が${node}のDropbox Businessアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:150 +msgid "Dropbox Business addon for ${node} deauthorized" +msgstr "許可されていない${node}のDropbox Businessアドオン" + +#: website/static/js/logActionsList_extract.js:151 +msgid "${user} linked figshare ${folder} ${folder_name} to ${node}" +msgstr "${user}がfigshare ${folder}(${folder_name})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:152 +msgid "${user} unlinked content from figshare in ${node}" +msgstr "${user}が${node}のfigshareからリンク解除されたコンテンツ" + +#: website/static/js/logActionsList_extract.js:153 +msgid "${user} added file ${path} to figshare in ${node}" +msgstr "${user}がファイル${path}を${node}のfigshareに追加しました" + +#: website/static/js/logActionsList_extract.js:154 +msgid "${user} removed ${path_type} ${path} from figshare in ${node}" +msgstr "${user}が${node}のfigshareから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:155 +msgid "${user} created folder ${path} in figshare in ${node}" +msgstr "${user}が${node}のfigshareにフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:156 +msgid "${user} authorized the figshare addon for ${node}" +msgstr "${user}が${node}のfigshareアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:157 +msgid "${user} deauthorized the figshare addon for ${node}" +msgstr "${user}が${node}のfigshareアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:158 +msgid "figshare addon for ${node} deauthorized" +msgstr "許可されていない${node}のfigshareアドオン" + +#: website/static/js/logActionsList_extract.js:159 +msgid "${user} changed external link to ${forward_url} in ${node}" +msgstr "${user}が${node}の外部リンクを${forward_url}に変更しました" + +#: website/static/js/logActionsList_extract.js:160 +msgid "${user} added file ${path} to GitHub repo ${repo} in ${node}" +msgstr "${user}がファイル${path}を${node}のGitHubリポジトリ(${repo})に追加しました" + +#: website/static/js/logActionsList_extract.js:161 +msgid "${user} removed ${path_type} ${path} in GitHub repo ${repo} in ${node}" +msgstr "${user}が${node}のGitHubリポジトリ(${repo})で${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:162 +msgid "${user} updated file ${path} in GitHub repo ${repo} in ${node}" +msgstr "${user}が${node}のGitHubリポジトリ(${repo})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:163 +msgid "${user} created folder ${path} in GitHub repo ${repo} in ${node}" +msgstr "${user}が${node}のGitHubリポジトリ(${repo})にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:164 +msgid "${user} authorized the GitHub addon for ${node}" +msgstr "${user}が${node}のGitHubアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:165 +msgid "${user} deauthorized the GitHub addon for ${node}" +msgstr "${user}が${node}のGitHubアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:166 +msgid "GitHub addon for ${node} deauthorized" +msgstr "許可されていない${node}のGitHubアドオン" + +#: website/static/js/logActionsList_extract.js:167 +msgid "${user} linked GitHub repo ${repo} to ${node}" +msgstr "${user}がGitHubリポジトリ${repo}を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:168 +msgid "${user} added file ${path} to GitLab repo ${gitlab_repo} in ${node}" +msgstr "${user}がファイル(${path})を${node}のGitLabリポジトリ(${gitlab_repo})に追加しました" + +#: website/static/js/logActionsList_extract.js:169 +msgid "${user} removed file ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "${user}が${node}のGitLabリポジトリ(${gitlab_repo})のファイル(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:170 +msgid "${user} updated file ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "${user}が${node}のGitLabリポジトリ(${gitlab_repo})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:171 +msgid "${user} created folder ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "${user}が${node}のGitLabリポジトリ(${gitlab_repo})にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:172 +msgid "${user} authorized the GitLab addon for ${node}" +msgstr "${user}が${node}のGitLabアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:173 +msgid "${user} deauthorized the GitLab addon for ${node}" +msgstr "${user}が${node}のGitLabアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:174 +msgid "GitLab addon for ${node} deauthorized" +msgstr "許可されていない${node}のGitLabアドオン" + +#: website/static/js/logActionsList_extract.js:175 +msgid "${user} linked GitLab repo ${gitlab_repo} to ${node}" +msgstr "${user}がGitLabリポジトリ(${gitlab_repo})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:176 +msgid "${user} added file ${googledrive_path} to Google Drive in ${node}" +msgstr "${user}がファイル(${googledrive_path})を${node}のGoogle Driveに追加しました" + +#: website/static/js/logActionsList_extract.js:177 +msgid "" +"${user} removed ${path_type} ${googledrive_path} from Google Drive in " +"${node}" +msgstr "${user}が${node}のGoogle Driveから${path_type}(${googledrive_path})を削除しました" + +#: website/static/js/logActionsList_extract.js:178 +msgid "${user} updated file ${googledrive_path} in Google Drive in ${node}" +msgstr "${user}が${node}のGoogle Driveのファイル(${googledrive_path})を更新しました" + +#: website/static/js/logActionsList_extract.js:179 +msgid "${user} created folder ${googledrive_path} in Google Drive in ${node}" +msgstr "${user}が${node}のGoogle Driveにフォルダ(${googledrive_path})を作成しました" + +#: website/static/js/logActionsList_extract.js:180 +msgid "${user} linked Google Drive folder ${googledrive_folder} to ${node}" +msgstr "${user}がGoogle Driveフォルダ(${googledrive_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:181 +msgid "${user} authorized the Google Drive addon for ${node}" +msgstr "${user}が${node}のGoogle Driveアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:182 +msgid "${user} deauthorized the Google Drive addon for ${node}" +msgstr "${user}が${node}のGoogle Driveアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:183 +msgid "Google Drive addon for ${node} deauthorized" +msgstr "許可されていない${node}のGoogle Driveアドオン" + +#: website/static/js/logActionsList_extract.js:184 +msgid "${user} added file ${iqbrims_path} to IQB-RIMS in ${node}" +msgstr "${user}が${node}のIQB-RIMSにファイル$({iqbrims_path})を追加しました" + +#: website/static/js/logActionsList_extract.js:185 +msgid "${user} removed ${path_type} ${iqbrims_path} from IQB-RIMS in ${node}" +msgstr "${user}が${node}のIQB-RIMSから${path_type}(${iqbrims_path})を削除しました" + +#: website/static/js/logActionsList_extract.js:186 +msgid "${user} updated file ${iqbrims_path} in IQB-RIMS in ${node}" +msgstr "${user}が${node}のIQB-RIMSのファイル(${iqbrims_path})を更新しました" + +#: website/static/js/logActionsList_extract.js:187 +msgid "${user} created folder ${iqbrims_path} in IQB-RIMS in ${node}" +msgstr "${user}が${node}のIQB-RIMSにフォルダ(${iqbrims_path})を作成しました" + +#: website/static/js/logActionsList_extract.js:188 +msgid "${user} linked IQB-RIMS folder ${iqbrims_folder} to ${node}" +msgstr "${user}がIQB-RIMSフォルダ(${iqbrims_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:189 +msgid "${user} authorized the IQB-RIMS addon for ${node}" +msgstr "${user}が${node}のIQB-RIMSアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:190 +msgid "${user} deauthorized the IQB-RIMS addon for ${node}" +msgstr "${user}が${node}のIQB-RIMSアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:191 +msgid "IQB-RIMS addon for ${node} deauthorized" +msgstr "許可されていない${node}のIQB-RIMSアドオン" + +#: website/static/js/logActionsList_extract.js:192 +#: website/static/js/logActionsList_extract.js:194 +msgid "${user} started IQB-RIMS workflow for ${node}" +msgstr "${user}が${node}のIQB-RIMSワークフローを開始しました" + +#: website/static/js/logActionsList_extract.js:193 +#: website/static/js/logActionsList_extract.js:195 +msgid "Finished workflow of ${user} for ${node}" +msgstr "${node}の${user}のワークフローが終了しました" + +#: website/static/js/logActionsList_extract.js:196 +msgid "${user} linked Mendeley folder ${folder_name} to ${node}" +msgstr "${user}がMendeleyフォルダ(${folder_name})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:197 +msgid "${user} authorized the Mendeley addon for ${node}" +msgstr "${user}が${node}のMendeleyアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:198 +msgid "${user} deauthorized the Mendeley addon for ${node}" +msgstr "${user}が${node}のMendeleyアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:199 +msgid "${user} added file ${path} to Nextcloud in ${node}" +msgstr "${user}が${node}のNextcloudにファイル(${path})を追加しました" + +#: website/static/js/logActionsList_extract.js:200 +msgid "${user} removed ${path_type} ${path} from Nextcloud in ${node}" +msgstr "${user}が${node}のNextcloudから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:201 +msgid "${user} updated file ${path} in Nextcloud in ${node}" +msgstr "${user}が${node}のNextcloudのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:202 +msgid "${user} created folder ${path} in Nextcloud in ${node}" +msgstr "${user}が${node}のNextcloudにフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:203 +msgid "${user} linked Nextcloud folder ${folder} to ${node}" +msgstr "${user}がNextcloudフォルダ(${folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:204 +msgid "${user} authorized the Nextcloud addon for ${node}" +msgstr "${user}が${node}のNextcloudアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:205 +msgid "${user} deauthorized the Nextcloud addon for ${node}" +msgstr "${user}が${node}のNextcloudアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:206 +msgid "Nextcloud addon for ${node} deauthorized" +msgstr "許可されていない${node}のNextcloudアドオン" + +#: website/static/js/logActionsList_extract.js:207 +msgid "${user} added file ${path} to Microsoft OneDrive in ${node}" +msgstr "${user}が${node}のMicrosoft OneDriveにファイル(${path})を追加しました" + +#: website/static/js/logActionsList_extract.js:208 +msgid "${user} removed ${path_type} ${path} from Microsoft OneDrive in ${node}" +msgstr "${user}が${node}のMicrosoft OneDriveから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:209 +msgid "${user} updated file ${path} in Microsoft OneDrive in ${node}" +msgstr "${user}が${node}のMicrosoft OneDriveのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:210 +msgid "${user} created folder ${path} in Microsoft OneDrive in ${node}" +msgstr "${user}がMicrosoft OneDriveの${node}にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:211 +msgid "${user} linked Microsoft OneDrive folder ${onedrive_folder} to ${node}" +msgstr "${user}がMicrosoft OneDriveフォルダ(${onedrive_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:212 +msgid "${user} authorized the Microsoft OneDrive addon for ${node}" +msgstr "${user}が${node}のMicrosoft OneDriveアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:213 +msgid "${user} deauthorized the Microsoft OneDrive addon for ${node}" +msgstr "${user}が${node}のMicrosoft OneDriveアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:214 +msgid "Microsoft OneDrive addon for ${node} deauthorized" +msgstr "許可されていない${node}のMicrosoft OneDriveアドオン" + +#: website/static/js/logActionsList_extract.js:215 +msgid "${user} added file ${path} to ownCloud in ${node}" +msgstr "${user}がファイル${path}を${node}のownCloudに追加しました" + +#: website/static/js/logActionsList_extract.js:216 +msgid "${user} removed ${path_type} ${path} from ownCloud in ${node}" +msgstr "${user}が${node}のownCloudから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:217 +msgid "${user} updated file ${path} in ownCloud in ${node}" +msgstr "${user}が${node}のownCloudのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:218 +msgid "${user} created folder ${path} in ownCloud in ${node}" +msgstr "${user}が${node}のownCloudにフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:219 +msgid "${user} linked ownCloud folder ${folder} to ${node}" +msgstr "${user}がownCloudフォルダ(${folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:220 +msgid "${user} authorized the ownCloud addon for ${node}" +msgstr "${user}が${node}のownCloudアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:221 +msgid "${user} deauthorized the ownCloud addon for ${node}" +msgstr "${user}が${node}のownCloudアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:222 +msgid "ownCloud addon for ${node} deauthorized" +msgstr "許可されていない${node}のownCloudアドオン" + +#: website/static/js/logActionsList_extract.js:223 +msgid "${user} linked the Amazon S3 bucket ${bucket} to ${node}" +msgstr "${user}がAmazon S3バケット(${bucket})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:224 +msgid "${user} unselected the Amazon S3 bucket ${bucket} in ${node}" +msgstr "${user}が${node}のAmazon S3バケット(${bucket})を選択解除しました" + +#: website/static/js/logActionsList_extract.js:225 +msgid "${user} added file ${path} to Amazon S3 bucket ${bucket} in ${node}" +msgstr "${user}がファイル(${path})を${node}のAmazon S3バケット(${bucket})に追加しました" + +#: website/static/js/logActionsList_extract.js:226 +msgid "${user} removed ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "${user}が${node}のAmazon S3バケット(${bucket})で${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:227 +msgid "${user} updated file ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "${user}が${node}のAmazon S3バケット(${bucket}の)ファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:228 +msgid "${user} created folder ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "${user}が${node}のAmazon S3バケット$({bucket})にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:229 +msgid "${user} authorized the Amazon S3 addon for ${node}" +msgstr "${user}が${node}のAmazon S3アドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:230 +msgid "${user} deauthorized the Amazon S3 addon for ${node}" +msgstr "${user}が${node}のAmazon S3アドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:231 +msgid "Amazon S3 addon for ${node} deauthorized" +msgstr "許可されていない${node}のAmazon S3アドオン" + +#: website/static/js/logActionsList_extract.js:232 +msgid "${user} linked the S3 Compatible Storage bucket ${bucket} to ${node}" +msgstr "${user}がS3互換ストレージバケット(${bucket})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:233 +msgid "${user} unselected the S3 Compatible Storage bucket ${bucket} in ${node}" +msgstr "${user}が${node}のS3互換ストレージバケット(${bucket})の選択を解除しました" + +#: website/static/js/logActionsList_extract.js:234 +msgid "" +"${user} added file ${path} to S3 Compatible Storage bucket ${bucket} in " +"${node}" +msgstr "${user}がファイル(${path})を${node}のS3互換ストレージバケット(${bucket})に追加しました" + +#: website/static/js/logActionsList_extract.js:235 +msgid "" +"${user} removed ${path} in S3 Compatible Storage bucket ${bucket} in " +"${node}" +msgstr "${user}が${node}のS3互換ストレージバケット(${bucket})で${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:236 +msgid "" +"${user} updated file ${path} in S3 Compatible Storage bucket ${bucket} in" +" ${node}" +msgstr "${user}が${node}のS3互換ストレージバケット(${bucket})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:237 +msgid "" +"${user} created folder ${path} in S3 Compatible Storage bucket ${bucket} " +"in ${node}" +msgstr "${user}が${node}のS3互換ストレージバケット(${bucket})にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:238 +msgid "${user} authorized the S3 Compatible Storage addon for ${node}" +msgstr "${user}が${node}のS3互換ストレージアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:239 +msgid "${user} deauthorized the S3 Compatible Storage addon for ${node}" +msgstr "${user}が${node}のS3互換ストレージアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:240 +msgid "S3 Compatible Storage addon for ${node} deauthorized" +msgstr "許可されていない${node}のS3互換ストレージアドオン" + +#: website/static/js/logActionsList_extract.js:241 +msgid "${user} linked the Swift container ${bucket} to ${node}" +msgstr "${user}がSwiftコンテナ(${bucket})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:242 +msgid "${user} unselected the Swift container ${bucket} in ${node}" +msgstr "${user}が${node}のSwiftコンテナ(${bucket})の選択を解除しました" + +#: website/static/js/logActionsList_extract.js:243 +msgid "${user} added file ${path} to Swift container ${bucket} in ${node}" +msgstr "${user}がファイル(${path})を${node}のSwiftコンテナ(${bucket})に追加しました" + +#: website/static/js/logActionsList_extract.js:244 +msgid "${user} removed ${path} in Swift container ${bucket} in ${node}" +msgstr "${user}が${node}のSwiftコンテナ(${bucket})で${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:245 +msgid "${user} updated file ${path} in Swift container ${bucket} in ${node}" +msgstr "${user}が${node}のSwiftコンテナ(${bucket})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:246 +msgid "${user} created folder ${path} in Swift container ${bucket} in ${node}" +msgstr "${user}が${node}のSwiftコンテナ(${bucket})にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:247 +msgid "${user} authorized the Swift addon for ${node}" +msgstr "${user}が${node}のSwiftアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:248 +msgid "${user} deauthorized the Swift addon for ${node}" +msgstr "${user}が${node}のSwiftアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:249 +msgid "Swift addon for ${node} deauthorized" +msgstr "許可されていない${node}のSwiftアドオン" + +#: website/static/js/logActionsList_extract.js:250 +msgid "${user} added file ${filename} to WEKO index ${dataset} in ${node}" +msgstr "${user}が${node}のWEKOインデックス(${dataset})にファイル(${filename})を追加しました" + +#: website/static/js/logActionsList_extract.js:251 +msgid "${user} removed file ${filename} from WEKO index ${dataset} in ${node}" +msgstr "${user}が${node}のWEKOインデックス(${dataset})からファイル(${filename})を削除しました" + +#: website/static/js/logActionsList_extract.js:252 +msgid "${user} linked WEKO index ${dataset} to ${node}" +msgstr "${user}がWEKOインデックス(${dataset})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:253 +msgid "${user} created an index ${filename} on ${node}" +msgstr "${user}が${node}にインデックス(${filename})を作成しました" + +#: website/static/js/logActionsList_extract.js:254 +msgid "${user} created an item ${filename} on ${node}" +msgstr "${user}が${node}にアイテム(${filename})を作成しました" + +#: website/static/js/logActionsList_extract.js:255 +msgid "${user} created folder ${filename} in WEKO index ${dataset} in ${node}" +msgstr "${user}が${node}のWEKOインデックス(${dataset})にフォルダ(${filename})を作成しました" + +#: website/static/js/logActionsList_extract.js:256 +msgid "${user} authorized the WEKO addon for ${node}" +msgstr "${user}が${node}のWEKOアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:257 +msgid "${user} deauthorized the WEKO addon for ${node}" +msgstr "${user}が${node}のWEKOアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:258 +msgid "WEKO addon for ${node} deauthorized" +msgstr "許可されていない${node}のWEKOアドオン" + +#: website/static/js/logActionsList_extract.js:259 +msgid "${user} linked Zotero folder ${folder_name} to ${node}" +msgstr "${user}がZoteroフォルダ(${folder_name})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:260 +msgid "${user} linked Zotero library ${library_name} to ${node}" +msgstr "${user}がZoteroライブラリ(${library_name})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:261 +msgid "${user} authorized the Zotero addon for ${node}" +msgstr "${user}が${node}のZoteroアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:262 +msgid "${user} deauthorized the Zotero addon for ${node}" +msgstr "${user}が${node}のZoteroアドオンの認証を解除しました" + +#: website/static/js/logTextParser.js:824 +msgid "unknown format" +msgstr "不明な形式" + +#: website/static/js/meetings.js:24 +msgid "Submissions" +msgstr "提出" + +#: website/static/js/meetings.js:30 +msgid "Location" +msgstr "ロケーション" + +#: website/static/js/filepage/revisions.js:109 website/static/js/meetings.js:36 +msgid "Date" +msgstr "更新日時" + +#: website/static/js/myProjects.js:308 +msgid "We're having some trouble contacting our servers. Try reloading the page." +msgstr "サーバーへの接続に問題があります。 ページを再読み込みしてください。" + +#: website/static/js/myProjects.js:308 +msgid "Something went wrong!" +msgstr "何かがうまくいきませんでした!" + +#: website/static/js/myProjects.js:433 +msgid "All my projects" +msgstr "全てのプロジェクト" + +#: website/static/js/myProjects.js:461 +msgid "Error loading project category names." +msgstr "プロジェクトカテゴリ名の読み込みエラー。" + +#: website/static/js/myProjects.js:665 +msgid "Some projects" +msgstr "いくつかのプロジェクト" + +#: website/static/js/myProjects.js:669 +msgid " could not be removed from the collection" +msgstr "がコレクションから削除できませんでした" + +#: website/static/js/myProjects.js:671 +msgid "Please try again." +msgstr "もう一度やり直して下さい" + +#: website/static/js/myProjects.js:764 +msgid "You have not created any projects yet." +msgstr "プロジェクトはまだ作成されていません。" + +#: website/static/js/myProjects.js:768 +msgid "" +"There have been no completed registrations for this institution, but you " +"can view the " +msgstr "この機関の登録は完了していませんが、次を表示できます:" + +#: website/static/js/myProjects.js:769 +msgid "newest public registrations" +msgstr "最新の公開登録" + +#: website/static/js/myProjects.js:770 website/static/js/myProjects.js:778 +msgid " or " +msgstr "または" + +#: website/static/js/myProjects.js:771 +msgid "popular public registrations." +msgstr "人気のある公開登録。" + +#: website/static/js/myProjects.js:774 +msgid "You have not made any registrations yet. Go to " +msgstr "まだ登録していません。登録の" + +#: website/static/js/myProjects.js:775 +msgid "Guides" +msgstr "仕組みを学習するためにガイドに" + +#: website/static/js/myProjects.js:775 +msgid " to learn how registrations work." +msgstr "行って下さい。" + +#: website/static/js/myProjects.js:778 +msgid "You have not made any preprints yet. Learn more about preprints in the " +msgstr "まだプレプリントを作成していません。 プレプリントの詳細については、" + +#: website/static/js/myProjects.js:778 +msgid "OSF Guides" +msgstr "OSFガイド" + +#: website/static/js/myProjects.js:778 +msgid "make one now." +msgstr "を読むか、今すぐ作りましょう。" + +#: website/static/js/myProjects.js:780 +msgid "" +"You have no bookmarks. You can add projects or registrations by dragging " +"them into your bookmarks or by clicking the Add to Bookmark button on the" +" project or registration." +msgstr "" +"ブックマークがありません。 " +"プロジェクトまたは登録を追加するには、それらをブックマークにドラッグするか、プロジェクトまたは登録の[ブックマークに追加]ボタンをクリックします。" + +#: website/static/js/myProjects.js:782 +msgid "This collection is empty." +msgstr "このコレクションは空です。" + +#: website/static/js/myProjects.js:784 +msgid "" +" You can add projects, registrations, or preprints by dragging them into " +"the collection." +msgstr "プロジェクト、登録、またはプレプリントをコレクションにドラッグして追加できます。" + +#: website/static/js/myProjects.js:795 +msgid "" +"No components to display. Either there are no components, or there are " +"private components in which you are not a contributor." +msgstr "表示するコンポーネントはありません。 コンポーネントがないか、メンバーではないプライベートコンポーネントがあります。" + +#: website/static/js/myProjects.js:966 +msgid "Collections could not be loaded." +msgstr "コレクションを読み込めませんでした。" + +#: website/static/js/myProjects.js:967 +msgid "Please reload the page." +msgstr "ページをリロードしてください。" + +#: website/static/js/myProjects.js:1109 +msgid "My Projects " +msgstr "マイプロジェクト " + +#: website/static/js/myProjects.js:1110 +msgid "Browse and organize all your projects" +msgstr "すべてのプロジェクトを管理する" + +#: website/static/js/myProjects.js:1115 +msgid "Create Project" +msgstr "新規プロジェクト作成" + +#: website/static/js/myProjects.js:1172 +msgid "Fetching more projects" +msgstr "より多くのプロジェクトを取得する" + +#: website/static/js/myProjects.js:1278 +msgid "\" collection could not be created." +msgstr "\"コレクションを作成できませんでした。" + +#: website/static/js/myProjects.js:1279 website/static/js/myProjects.js:1311 +#: website/static/js/myProjects.js:1336 +msgid "Please try again" +msgstr "もう一度やり直して下さい。" + +#: website/static/js/myProjects.js:1310 +msgid "\" could not be deleted." +msgstr "\"は削除できませんでした。" + +#: website/static/js/myProjects.js:1335 +msgid "\" could not be renamed." +msgstr "\"は名前を変更できませんでした。" + +#: website/static/js/myProjects.js:1383 +msgid "\" is already in \"%1$s\"" +msgstr "はすでに「%1$s」にあります。" + +#: website/static/js/myProjects.js:1469 +msgid "Collections " +msgstr "コレクション" + +#: website/static/js/myProjects.js:1472 +msgid "" +"Collections are groups of projects. You can create custom collections. " +"Drag and drop your projects or bookmarked projects to add them." +msgstr "" +"コレクションはプロジェクトのグループです。 " +"カスタムコレクションを作成できます。プロジェクトまたはブックマークしたプロジェクトをドラッグアンドドロップして追加します。" + +#: website/static/js/myProjects.js:1501 +msgid " Rename" +msgstr "リネーム" + +#: website/static/js/myProjects.js:1510 +msgid " Delete" +msgstr "削除" + +#: website/static/js/myProjects.js:1528 +msgid "Add new collection" +msgstr "新しいコレクションを追加" + +#: website/static/js/myProjects.js:1531 +msgid "" +"Collections are groups of projects that help you organize your work. " +"After you create your collection, you can add projects by dragging them " +"into the collection." +msgstr "コレクションは、作業の整理に役立つプロジェクトのグループです。コレクションを作成したら、プロジェクトをコレクションにドラッグしてプロジェクトを追加できます。" + +#: website/static/js/myProjects.js:1533 +msgid "Collection name" +msgstr "コレクション名" + +#: website/static/js/myProjects.js:1548 +msgid "e.g. My Replications" +msgstr "例:マイコレクション" + +#: website/static/js/myProjects.js:1565 +msgid "Add" +msgstr "追加" + +#: website/static/js/myProjects.js:1576 +msgid "Rename collection" +msgstr "コレクションの名前を変更" + +#: website/static/js/myProjects.js:1581 +msgid "Rename to: " +msgstr "名前を変更:" + +#: website/static/js/myProjects.js:1624 +msgid "Delete collection \"%1$s\"?" +msgstr "コレクション(%1$s)を削除しますか?" + +#: website/static/js/myProjects.js:1627 +msgid "This will delete your collection, but your projects will not be deleted." +msgstr "これによりコレクションが削除されますが、プロジェクトは削除されません。" + +#: website/static/js/myProjects.js:1737 +msgid "Parent projects" +msgstr "親プロジェクト" + +#: website/static/js/myProjects.js:1786 +msgid "Create component" +msgstr "コンポーネントを作成" + +#: website/static/js/myProjects.js:1875 +msgid "" +"No contributors to display in this collection. Project administrators can" +" add contributors." +msgstr "このコレクションに表示するメンバーはいません。 プロジェクト管理者はメンバーを追加できます。" + +#: website/static/js/myProjects.js:1898 +msgid "" +"No tags to display in this collection. Project administrators and write " +"contributors can add tags." +msgstr "このコレクションに表示するタグはありません。 プロジェクト管理者とメンバーはタグを追加できます。" + +#: website/static/js/myProjects.js:1924 +msgid "Contributors " +msgstr "メンバー" + +#: website/static/js/myProjects.js:1927 +msgid "Click a contributor's name to see projects that you have in common." +msgstr "メンバーの名前をクリックすると、共通のプロジェクトが表示されます。" + +#: website/static/js/myProjects.js:1938 website/static/js/myProjects.js:2019 +msgid "Tags" +msgstr "タグ" + +#: website/static/js/myProjects.js:1963 +msgid "Select a row to view project details." +msgstr "行を選択して、プロジェクトの詳細を表示します。" + +#: website/static/js/myProjects.js:1994 +msgid "Information" +msgstr "プロジェクト情報" + +#: website/static/js/myProjects.js:1998 +msgid "Activity" +msgstr "最近の活動" + +#: website/static/js/myProjects.js:2005 +msgid "Visibility: " +msgstr "可視性:" + +#: website/static/js/myProjects.js:2005 +msgid "Public" +msgstr "公開" + +#: website/static/js/myProjects.js:2005 +msgid "Private" +msgstr "非公開" + +#: website/static/js/myProjects.js:2007 +msgid "Category: " +msgstr "カテゴリ:" + +#: website/static/js/myProjects.js:2011 +msgid "Permission: " +msgstr "権限:" + +#: website/static/js/myProjects.js:2012 +msgid "Last Modified on: " +msgstr "最終更新日時:" + +#: website/static/js/myProjects.js:2040 +msgid "Remove selected from collection" +msgstr "コレクションから選択を削除" + +#: website/static/js/nodeControl.js:61 +msgid "A request to make this registration public is pending" +msgstr "この登録を公開するリクエストは保留中です" + +#: website/static/js/nodeControl.js:102 +msgid "Edit Title" +msgstr "タイトルを編集" + +#: website/static/js/nodeControl.js:106 +msgid "Title cannot be blank." +msgstr "タイトルを空白にすることはできません。" + +#: website/static/js/nodeControl.js:109 +msgid "Title cannot exceed 512 characters." +msgstr "タイトルは512文字を超えることはできません。" + +#: website/static/js/nodeControl.js:114 +msgid "component" +msgstr "コンポーネント" + +#: website/static/js/nodeControl.js:117 +msgid "Edit Description" +msgstr "説明を編集" + +#: website/static/js/nodeControl.js:118 +msgid "Add a brief description to your %1$s" +msgstr "%1$sに簡単な説明を追加してください" + +#: website/static/js/nodeControl.js:135 +msgid "Select a category" +msgstr "カテゴリを編集" + +#: website/static/js/nodeControl.js:175 +msgid "The project could not be removed" +msgstr "プロジェクトを削除できませんでした" + +#: website/static/js/nodeControl.js:212 +msgid "Create DOI" +msgstr "DOIを作成" + +#: website/static/js/nodeControl.js:214 +msgid "Are you sure you want to create a DOI for this %1$s" +msgstr "%1$sのためのDOIを作成してもよろしいですか?" + +#: website/static/js/nodeControl.js:215 +msgid "? A DOI" +msgstr "DOIは" + +#: website/static/js/nodeControl.js:216 +msgid " is persistent and will always resolve to this page." +msgstr "永続的であり、常にこのページに解決されます。" + +#: website/static/js/nodeControl.js:245 +msgid "We could not create the identifier at this time. " +msgstr "現時点では識別子を作成できませんでした。" + +#: website/static/js/nodeControl.js:246 +msgid "The DOI acquisition service may be down right now. " +msgstr "DOI取得サービスは現在停止している可能性があります。" + +#: website/static/js/nodeControl.js:247 +msgid "Please try again soon and/or contact %1$s" +msgstr "すぐに再試行するか、%1$sにお問い合わせ下さい" + +#: website/static/js/nodeControl.js:249 +msgid "Could not create doi" +msgstr "DOIを作成できませんでした。" + +#: website/static/js/nodeSelectTreebeard.js:62 +#: website/static/js/notificationsTreebeard.js:62 +#: website/static/js/profile.js:320 +#: website/static/js/wikiSettingsTreebeard.js:57 +msgid "Could not update settings" +msgstr "設定を更新できませんでした" + +#: website/static/js/nodeSelectTreebeard.js:81 +#: website/static/js/nodesDeleteTreebeard.js:56 +#: website/static/js/nodesPrivacySettingsTreebeard.js:56 +msgid "checkBox" +msgstr "チェックボックス" + +#: website/static/js/nodesDelete.js:38 +msgid "" +"This %1$s also contains supplemental materials for a " +"preprint. It will" +msgstr "この%1$sには、プレプリントの補足資料も含まれています。" + +#: website/static/js/nodesDelete.js:39 +msgid " no longer be available to contributors or connected to the preprint." +msgstr "メンバーは利用できなくなり、プレプリントに接続できなくなります。" + +#: website/static/js/nodesDelete.js:43 +msgid "It will no longer be available to other contributors on the project." +msgstr "プロジェクトの他のメンバーは利用できなくなります。" + +#: website/static/js/nodesDelete.js:49 +msgid "Are you sure you want to delete this %1$s?" +msgstr "この%1$sを削除してもよろしいですか?" + +#: website/static/js/nodesDelete.js:80 website/static/js/nodesDelete.js:340 +msgid "Unable to delete %1$s" +msgstr "%1$sを削除できません" + +#: website/static/js/nodesDelete.js:84 website/static/js/nodesDelete.js:344 +msgid "Problem deleting %1$s" +msgstr "%1$sの削除中に問題が発生しました" + +#: website/static/js/nodesDelete.js:85 +msgid "Could not delete %$1s" +msgstr "%$1sを削除できませんでした" + +#: website/static/js/nodesDelete.js:116 +msgid "" +"

                  This %1$s also contains supplemental materials for a " +"preprint, and one or more of its %2$s contains " +"supplemental materials for a preprint." +msgstr "

                  この%1$sにはプレプリントの補足資料も含まれており、1つ以上の%2$sにはプレプリントの補足資料が含まれています。" + +#: website/static/js/nodesDelete.js:119 +msgid "" +"

                  This %1$s also contains supplemental materials for a " +"preprint." +msgstr "

                  この%1$sには、プレプリントの補足資料も含まれています。" + +#: website/static/js/nodesDelete.js:122 +msgid "" +"

                  This %1$s also has one or more %2$s that contain supplemental " +"materials for a preprint." +msgstr "

                  この%1$sには、プレプリントの補足資料を含む1つ以上の%2$sもあります。" + +#: website/static/js/nodesDelete.js:150 +msgid "Delete %1$s" +msgstr "%1$sを削除" + +#: website/static/js/nodesDelete.js:151 +msgid "Delete %1$s and %2$s" +msgstr "%1$sと%2$sを削除" + +#: website/static/js/nodesDelete.js:156 +msgid "This %1$s contains %2$s." +msgstr "この%1$sには%2$sが含まれています。" + +#: website/static/js/nodesDelete.js:156 +msgid " To delete this %1$s, you must also delete all %2$s." +msgstr "この%1$sを削除するには、すべての%2$sも削除する必要があります。" + +#: website/static/js/nodesDelete.js:158 +msgid " The following %1$s and %2$s will be deleted." +msgstr "次の%1$sと%2$sは削除されます。" + +#: website/static/js/nodesDelete.js:161 +msgid " This action is irreversible." +msgstr "このアクションは元に戻せません。" + +#: website/static/js/nodesDelete.js:167 +msgid "" +"Please note that deleting your %1$s will erase all your %2$s data and " +"this process is IRREVERSIBLE. Deleted %3$s and %4$s will no longer be " +"available to other contributors on the %5$s" +msgstr "" +"%1$sを削除すると、すべての%2$sデータが消去され、このプロセスは不可逆であることに注意してください。 " +"削除された%3$sと%4$sは、%5$sの他のメンバーが利用できなくなります" + +#: website/static/js/nodesDelete.js:168 +msgid " and will be disconnected from your preprints." +msgstr "そして、プレプリントから切断されます。" + +#: website/static/js/nodesDelete.js:168 +msgid "." +msgstr "。" + +#: website/static/js/nodesDelete.js:331 +msgid "Your %1$s has been successfully deleted." +msgstr "%1$sは正常に削除されました。" + +#: website/static/js/nodesDelete.js:345 +msgid "Could not batch delete project and its components." +msgstr "プロジェクトとそのコンポーネントをバッチ削除できませんでした。" + +#: website/static/js/nodesDeleteTreebeard.js:84 +msgid "You must have admin permissions on this component to be able to delete it." +msgstr "このコンポーネントを削除するには、このコンポーネントの管理者権限が必要です。" + +#: website/static/js/nodesPrivacy.js:19 +msgid "" +"Please review your projects, components, and add-ons for sensitive or " +"restricted information before making them public." +msgstr "このコンポーネントを削除するには、このコンポーネントの管理者権限が必要です。" + +#: website/static/js/nodesPrivacy.js:20 +msgid "" +"

                  Once they are made public, you should assume they will always be " +"public. You can " +msgstr "

                  それらが公開されると、それらは常に公開されると想定する必要があります。" + +#: website/static/js/nodesPrivacy.js:21 +msgid "" +"return them to private later, but search engines (including Google’s " +"cache) or others may access files, wiki pages, or analytics before you " +"do." +msgstr "後でプライベートに戻すことができますが、検索エンジン(Googleのキャッシュを含む)または他のユーザーは、ファイル、Wikiページ、または分析にアクセスする前にアクセスする場合があります。" + +#: website/static/js/nodesPrivacy.js:23 +msgid "" +"
                  • Public forks and registrations of this project will remain " +"public.
                  • " +msgstr "
                    • このプロジェクトのパブリックフォークと登録はパブリックのままです。
                    • " + +#: website/static/js/nodesPrivacy.js:24 website/static/js/nodesPrivacy.js:27 +msgid "" +"
                    • Search engines (including Google's cache) or others may have accessed" +" files, wiki pages, or analytics while this project was public.
                    " +msgstr "
                  • このプロジェクトが公開されている間に、検索エンジン(Googleのキャッシュを含む)または他のユーザーがファイル、Wikiページ、または分析にアクセスした可能性があります。
                  " + +#: website/static/js/nodesPrivacy.js:26 +msgid "" +"
                  • Preprints will remain public.
                  • Public forks and " +"registrations of this project will remain public.
                  • " +msgstr "
                    • プレプリントは公開されます。
                    • このプロジェクトの公開フォークと登録は公開されます。
                    • " + +#: website/static/js/nodesPrivacy.js:28 +msgid "" +"By clicking confirm, an email will be sent to project administrator(s) to" +" approve ending the embargo. If approved, this registration, including " +"any components, will be made public immediately. This action is " +"irreversible." +msgstr "" +"[確認]をクリックすると、禁止措置の終了を承認するためのメールがプロジェクト管理者に送信されます。 " +"承認されると、コンポーネントを含むこの登録はすぐに公開されます。 このアクションは元に戻せません。" + +#: website/static/js/nodesPrivacy.js:29 +msgid "End embargo early" +msgstr "禁止措置を早期に終了する" + +#: website/static/js/nodesPrivacy.js:30 +msgid "Adjust your privacy settings by checking the boxes below. " +msgstr "下のチェックボックスをオンにして、プライバシー設定を調整します。" + +#: website/static/js/nodesPrivacy.js:31 +msgid "" +"

                      Checked projects and components will be public. " +"
                      Unchecked components will be private." +msgstr "

                      チェックされたプロジェクトとコンポーネントは公開になり、
                      チェックされていないコンポーネントは非公開になります" + +#: website/static/js/nodesPrivacy.js:33 +msgid "The following projects and components will be made public." +msgstr "次のプロジェクトとコンポーネントが公開されます。" + +#: website/static/js/nodesPrivacy.js:34 +msgid "The following projects and components will be made private." +msgstr "次のプロジェクトとコンポーネントは非公開になります。" + +#: website/static/js/nodesPrivacy.js:35 +msgid "No privacy settings were changed. Go back to make a change." +msgstr "プライバシー設定は変更されていません。 戻って変更を加えます。" + +#: website/static/js/nodesPrivacy.js:36 +msgid "" +"You can only change the privacy of 100 projects and components at a time." +" Please go back and limit your selection." +msgstr "一度に変更できるのは、100個のプロジェクトとコンポーネントのプライバシーのみです。 戻って選択を制限してください。" + +#: website/static/js/nodesPrivacy.js:38 +msgid "This project/component contains supplemental materials for a preprint." +msgstr "このプロジェクト/コンポーネントには、プレプリントの補足資料が含まれています。" + +#: website/static/js/nodesPrivacy.js:39 +msgid "" +"

                      Making this project/component private will prevent others from" +" accessing it.

                      " +msgstr "

                      このプロジェクト/コンポーネントを非公開にすると、他の人がアクセスできなくなります。

                      " + +#: website/static/js/nodesPrivacy.js:155 +msgid "Make %1$s private" +msgstr "%1$sを非公開にします" + +#: website/static/js/nodesPrivacy.js:156 +msgid "Warning" +msgstr "警告" + +#: website/static/js/nodesPrivacy.js:157 +msgid "Change privacy settings" +msgstr "プライバシー設定を変更する" + +#: website/static/js/nodesPrivacy.js:158 +msgid "Projects and components affected" +msgstr "影響を受けるプロジェクトとコンポーネント" + +#: website/static/js/nodesPrivacy.js:247 +msgid "Updating Privacy" +msgstr "プライバシーの更新" + +#: website/static/js/nodesPrivacy.js:257 +msgid "Unable to update project privacy" +msgstr "プロジェクトのプライバシーを更新できません" + +#: website/static/js/nodesPrivacy.js:261 +msgid "Problem changing privacy" +msgstr "プライバシーを変更する問題" + +#: website/static/js/nodesPrivacy.js:262 +msgid "Could not PATCH project settings." +msgstr "プロジェクト設定をパッチできませんでした。" + +#: website/static/js/nodesPrivacy.js:318 +msgid "Submitting request to end embargo early ..." +msgstr "禁止措置を早期に終了する要求を送信しています..." + +#: website/static/js/nodesPrivacy.js:324 +msgid "Email sent" +msgstr "メールを送信しました" + +#: website/static/js/nodesPrivacy.js:325 +msgid "" +"The administrator(s) can approve or cancel the action within 48 hours. If" +" 48 hours pass without any action taken, then the registration will " +"become public." +msgstr "管理者は、48時間以内にアクションを承認またはキャンセルできます。 48時間経過してもアクションが実行されない場合、登録は公開されます。" + +#: website/static/js/notificationsConfig.js:31 +msgid "Could not retrieve settings information." +msgstr "設定情報を取得できませんでした。" + +#: website/static/js/notificationsConfig.js:63 +msgid "Could not update email preferences at this time. If this issue persists, " +msgstr "現在、メール設定を更新できませんでした。 この問題が続く場合、" + +#: website/static/js/notificationsConfig.js:64 +#: website/static/js/osfHelpers.js:316 +msgid "please report it to %1$s." +msgstr "%1$sに報告してください。" + +#: website/static/js/notificationsTreebeard.js:68 +#: website/static/js/notificationsTreebeard.js:182 +#: website/static/js/notificationsTreebeard.js:187 +#: website/static/js/notificationsTreebeard.js:230 +msgid "Instantly" +msgstr "すぐに" + +#: website/static/js/notificationsTreebeard.js:69 +#: website/static/js/notificationsTreebeard.js:188 +#: website/static/js/notificationsTreebeard.js:231 +msgid "Daily" +msgstr "毎日" + +#: website/static/js/notificationsTreebeard.js:70 +msgid "Adopt setting from parent project" +msgstr "親プロジェクトから設定を採用する" + +#: website/static/js/notificationsTreebeard.js:71 +#: website/static/js/notificationsTreebeard.js:186 +#: website/static/js/notificationsTreebeard.js:229 +msgid "Never" +msgstr "無し" + +#: website/static/js/notificationsTreebeard.js:118 +msgid " No configured projects." +msgstr "設定済みのプロジェクトはありません。" + +#: website/static/js/notificationsTreebeard.js:228 +msgid "Adopt setting from parent project %1$s" +msgstr "親プロジェクト%1$sから設定を採用" + +#: website/static/js/oauthAddonNodeConfig.js:143 +msgid "Choose %1$s Account to Import" +msgstr "インポートする%1$sアカウントを選択" + +#: website/static/js/osfHelpers.js:311 +msgid "Please refresh the page and try again or contact %1$s" +msgstr "ページを更新して再試行するか、%1$sに連絡してください" + +#: website/static/js/osfHelpers.js:315 +msgid "GakuNin RDM was unable to resolve your request. If this issue persists, " +msgstr "GakuNin RDMはリクエストを解決できませんでした。 この問題が解決しない場合、" + +#: website/static/js/osfHelpers.js:339 +msgid "Unexpected error occurred in JSON request" +msgstr "JSONリクエストで予期しないエラーが発生しました" + +#: website/static/js/osfHelpers.js:344 +msgid "Unexpected error occurred in an editable input" +msgstr "編集可能な入力で予期しないエラーが発生しました" + +#: website/static/js/osfHelpers.js:361 +#: website/static/js/privateLinkManager.js:105 +msgid "Please wait" +msgstr "お待ち下さい" + +#: website/static/js/osfHelpers.js:800 +#: website/static/js/pages/profile-settings-addons-page.js:32 +#: website/static/js/pages/project-addons-page.js:63 +msgid "Confirm" +msgstr "確認" + +#: website/static/js/osfHelpers.js:811 +msgid "

                      Type the following to continue: " +msgstr "

                      次を入力して続行します: " + +#: website/static/js/passwordForms.js:23 +msgid "Please enter a more complex password." +msgstr "より複雑なパスワードを入力してください。" + +#: website/static/js/passwordForms.js:117 +#: website/static/js/passwordForms.js:192 +#: website/static/js/passwordForms.js:258 +msgid "Your password cannot be the same as your email address." +msgstr "パスワードをメールアドレスと同じにすることはできません。" + +#: website/static/js/passwordForms.js:132 +msgid "Your new password cannot be the same as your old password." +msgstr "新しいパスワードを古いパスワードと同じにすることはできません。" + +#: website/static/js/passwordForms.js:143 +#: website/static/js/passwordForms.js:203 +msgid "Passwords must match." +msgstr "パスワードが一致する必要があります。" + +#: website/static/js/passwordForms.js:230 +msgid "Email addresses must match." +msgstr "メールアドレスは一致する必要があります。" + +#: website/static/js/passwordForms.js:301 +msgid "You have already submitted. You cannot sign up more than once." +msgstr "あなたはすでに提出しました。 複数回サインアップすることはできません。" + +#: website/static/js/passwordForms.js:322 +msgid "Please complete reCAPTCHA" +msgstr "reCAPTCHAを完了してください" + +#: website/static/js/pointers.js:28 +msgid "Search all projects" +msgstr "すべてのプロジェクトの検索" + +#: website/static/js/pointers.js:29 +msgid "Search my projects" +msgstr "マイプロジェクトの検索" + +#: website/static/js/pointers.js:133 +msgid "No results found." +msgstr "結果が見つかりません。" + +#: website/static/js/pointers.js:183 +msgid "Error retrieving nodes" +msgstr "ノードの取得エラー" + +#: website/static/js/pointers.js:328 +msgid "Registered: " +msgstr "登録日:" + +#: website/static/js/pointers.js:330 +msgid "Created: " +msgstr "作成日時:" + +#: website/static/js/pointers.js:330 +msgid "" +"\n" +"Modified: " +msgstr "" +"\n" +"最終更新日時:" + +#: website/static/js/pointers.js:362 +msgid "Could not get links" +msgstr "リンクを取得できませんでした" + +#: website/static/js/privateLinkManager.js:63 +msgid "Could not retrieve projects." +msgstr "プロジェクトを取得できませんでした。" + +#: website/static/js/privateLinkManager.js:63 +#: website/static/js/privateLinkTable.js:72 +msgid "Please refresh the page or " +msgstr "ページを更新するか、" + +#: website/static/js/privateLinkManager.js:64 +#: website/static/js/privateLinkTable.js:73 +msgid "contact %1$s" +msgstr "問題が解決しない場合は、%1$sに" + +#: website/static/js/privateLinkManager.js:64 +#: website/static/js/privateLinkTable.js:73 +msgid " if the " +msgstr "お問い合わせ" + +#: website/static/js/privateLinkManager.js:65 +#: website/static/js/privateLinkTable.js:74 +msgid "problem persists." +msgstr "下さい。" + +#: website/static/js/privateLinkTable.js:37 +msgid "Yes" +msgstr "はい" + +#: website/static/js/privateLinkTable.js:37 +msgid "No" +msgstr "いいえ" + +#: website/static/js/privateLinkTable.js:72 +msgid "Could not retrieve view-only links." +msgstr "参照専用リンクを取得できませんでした。" + +#: website/static/js/privateLinkTable.js:96 +msgid "Remove view-only link?" +msgstr "参照専用リンクを削除しますか?" + +#: website/static/js/privateLinkTable.js:97 +msgid "Are you sure you want to remove this view-only link?" +msgstr "この参照専用リンクを削除してもよろしいですか?" + +#: website/static/js/privateLinkTable.js:109 +msgid "Failed to delete the private link." +msgstr "プライベートリンクを削除できませんでした。" + +#: website/static/js/privateLinkTable.js:138 +msgid "Edit Link Name" +msgstr "リンク名を編集" + +#: website/static/js/profile.js:106 +msgid "January" +msgstr "1月" + +#: website/static/js/profile.js:106 +msgid "February" +msgstr "2月" + +#: website/static/js/profile.js:106 +msgid "March" +msgstr "3月" + +#: website/static/js/profile.js:106 +msgid "April" +msgstr "4月" + +#: website/static/js/profile.js:106 +msgid "May" +msgstr "5月" + +#: website/static/js/profile.js:106 +msgid "June" +msgstr "6月" + +#: website/static/js/profile.js:107 +msgid "July" +msgstr "7月" + +#: website/static/js/profile.js:107 +msgid "August" +msgstr "8月" + +#: website/static/js/profile.js:107 +msgid "September" +msgstr "9月" + +#: website/static/js/profile.js:107 +msgid "October" +msgstr "10月" + +#: website/static/js/profile.js:107 +msgid "November" +msgstr "11月" + +#: website/static/js/profile.js:107 +msgid "December" +msgstr "12月" + +#: website/static/js/profile.js:112 +msgid "ongoing" +msgstr "在籍" + +#: website/static/js/profile.js:152 +msgid "Please enter a year for the start date." +msgstr "開始日の年を入力してください。" + +#: website/static/js/profile.js:165 +msgid "Please enter an end date or mark as ongoing." +msgstr "終了日を入力するか、在籍としてマークしてください。" + +#: website/static/js/profile.js:168 +msgid "Please enter a year for the end date." +msgstr "終了日の年を入力してください。" + +#: website/static/js/profile.js:265 website/static/js/profile.js:274 +msgid "There are unsaved changes to your settings." +msgstr "設定に保存されていない変更があります。" + +#: website/static/js/profile.js:275 +msgid "Please save or discard your changes before switching " +msgstr "タブを切り替える前に変更を保存または破棄して" + +#: website/static/js/profile.js:276 +msgid "tabs." +msgstr "ください。" + +#: website/static/js/profile.js:341 +msgid "Could not fetch data" +msgstr "データを取得できませんでした" + +#: website/static/js/profile.js:358 +msgid "Are you sure you want to discard your unsaved changes?" +msgstr "保存していない変更を破棄してもよろしいですか?" + +#: website/static/js/profile.js:720 +msgid "Remove website?" +msgstr "ウェブサイトを削除しますか?" + +#: website/static/js/profile.js:721 +msgid "Are you sure you want to remove this website from your profile?" +msgstr "このウェブサイトをプロフィールから削除してもよろしいですか?" + +#: website/static/js/profile.js:728 +msgid "Website removed" +msgstr "ウェブサイトを削除しました" + +#: website/static/js/profile.js:815 +msgid "Please update your website" +msgstr "ウェブサイトを更新してください" + +#: website/static/js/profile.js:953 +msgid "Remove Institution?" +msgstr "機関を削除しますか?" + +#: website/static/js/profile.js:954 +msgid "Are you sure you want to remove this institution?" +msgstr "この機関を削除してもよろしいですか?" + +#: website/static/js/profile.js:963 +msgid "Institution Removed" +msgstr "機関が削除されました" + +#: website/static/js/profile.js:1078 +msgid "Institution/Employer required" +msgstr "機関/雇用者が必要です" + +#: website/static/js/profile.js:1132 +msgid "Institution required" +msgstr "機関が必要です" + +#: website/static/js/components/publicNodes.js:103 +#: website/static/js/project-organizer.js:100 +msgid "A contributor" +msgstr "一人のメンバー" + +#: website/static/js/project-organizer.js:197 +msgid "Contributors" +msgstr "メンバー" + +#: website/static/js/project-organizer.js:416 +msgid "" +"input.form-control[placeholder=\"Filter displayed " +"projects\"][type=\"text\"]" +msgstr "input.form-control[placeholder=\"表示されたプロジェクトをフィルターする\"][type=\"text\"]" + +#: website/static/js/project.js:28 +msgid "

                      Are you sure you want to fork this project?

                      " +msgstr "

                      このプロジェクトをフォークしてもよろしいですか?

                      " + +#: website/static/js/project.js:36 website/static/js/project.js:115 +msgid "Fork" +msgstr "フォーク" + +#: website/static/js/project.js:50 +msgid "Fork created successfully!" +msgstr "フォークが正常に作成されました!" + +#: website/static/js/project.js:58 +msgid "Go to new fork" +msgstr "新しいフォークに行く" + +#: website/static/js/project.js:87 +msgid "Your fork is being created. You'll receive an email when it is complete." +msgstr "フォークを作成しています。 完了するとメールが届きます。" + +#: website/static/js/project.js:93 +msgid "Fork this project?" +msgstr "このプロジェクトをフォークしますか?" + +#: website/static/js/project.js:94 +msgid "Are you sure you want to fork this project?" +msgstr "このプロジェクトをフォークしてもよろしいですか?" + +#: website/static/js/project.js:109 +msgid "Could not fork link." +msgstr "リンクを分岐できませんでした。" + +#: website/static/js/project.js:126 +msgid "" +"

                      Are you sure you want to create a new project using this project as a" +" template?

                      " +msgstr "

                      このプロジェクトをテンプレートとして使用して新しいプロジェクトを作成してもよろしいですか?

                      " + +#: website/static/js/project.js:127 +msgid "" +"

                      Any add-ons configured for this project will not be authenticated in " +"the new project.

                      " +msgstr "

                      このプロジェクト用に設定されたアドオンは、新しいプロジェクトでは認証されません。

                      " + +#: website/static/js/project.js:129 +msgid "" +"

                      Are you sure you want to create a new project using this registration" +" as a template?

                      " +msgstr "

                      この登録をテンプレートとして使用して新しいプロジェクトを作成してもよろしいですか?

                      " + +#: website/static/js/project.js:205 +msgid "
                      Read
                      " +msgstr "
                      読込み
                      " + +#: website/static/js/project.js:206 +msgid "
                      • View project content and comment
                      " +msgstr "
                      • プロジェクトのコンテンツとコメントを表示
                      " + +#: website/static/js/project.js:207 +msgid "
                      Read + Write
                      " +msgstr "
                      読込み/書込み
                      " + +#: website/static/js/project.js:208 +msgid "
                      • Read privileges
                      • " +msgstr "
                        • 読込み権限
                        • " + +#: website/static/js/project.js:209 +msgid "
                        • Add and configure components
                        • " +msgstr "
                        • コンポーネントを追加および構成する
                        • " + +#: website/static/js/project.js:210 +msgid "
                        • Add and edit content
                        " +msgstr "
                      • コンテンツの追加と編集
                      " + +#: website/static/js/project.js:211 +msgid "
                      Administrator
                        " +msgstr "
                        管理者
                          " + +#: website/static/js/project.js:212 +msgid "
                        • Read and write privileges
                        • " +msgstr "
                        • 読込み/書込み権限
                        • " + +#: website/static/js/project.js:213 +msgid "
                        • Manage contributor
                        • " +msgstr "
                        • メンバーの管理
                        • " + +#: website/static/js/project.js:214 +msgid "" +"
                        • Delete and register project
                        • Public-private " +"settings
                        " +msgstr "
                      • プロジェクトの削除と登録
                      • 公開/非公開設定
                      " + +#: website/static/js/project.js:223 +msgid "" +"Only bibliographic contributors will be displayed in the Contributors " +"list and in project citations. Non-bibliographic contributors can read " +"and modify the project as normal." +msgstr "メンバーリストおよびプロジェクトの引用には、書誌のメンバーのみが表示されます。 書誌以外のメンバーは、通常どおりプロジェクトを読んで修正できます。" + +#: website/static/js/project.js:238 +msgid "Remove this link?" +msgstr "このリンクを削除しますか?" + +#: website/static/js/project.js:239 +msgid "" +"Are you sure you want to remove this link? This will not remove the " +"project this link refers to." +msgstr "このリンクを削除してもよろしいですか?このリンクが参照するプロジェクトは削除されません。" + +#: website/static/js/projectSettingsTreebeardBase.js:96 +msgid "Editing Toggle" +msgstr "トグルを編集中" + +#: website/static/js/requestAccess.js:17 +msgid "Request access" +msgstr "アクセス権をリクエスト" + +#: website/static/js/requestAccess.js:27 website/static/js/requestAccess.js:62 +msgid "Access requested" +msgstr "アクセス権がリクエストされました" + +#: website/static/js/requestAccess.js:30 +msgid "Request declined" +msgstr "リクエストは拒否されました" + +#: website/static/js/requestAccess.js:67 +msgid "Access request failed. Please contact %1$s if the problem persists." +msgstr "アクセス要求が失敗しました。 問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/requestAccess.js:70 +msgid "Error requesting project access" +msgstr "プロジェクトアクセス権のリクエストエラー" + +#: website/static/js/requestAccess.js:83 +msgid "If this should not have occurred, please contact %1$s." +msgstr "これが発生してはならない場合は、%1$sにお問い合わせください。" + +#: website/static/js/saveManager.js:24 +msgid "You have unsaved changes." +msgstr "未保存の変更があります。" + +#: website/static/js/search-grdm.js:150 +msgid "Date Modified (Desc)" +msgstr "更新日時の新しい順" + +#: website/static/js/search-grdm.js:151 +msgid "Date Modified (Asc)" +msgstr "更新日時の古い順" + +#: website/static/js/search-grdm.js:152 +msgid "Date Created (Desc)" +msgstr "作成日時の新しい順" + +#: website/static/js/search-grdm.js:153 +msgid "Date Created (Asc)" +msgstr "作成日時の古い順" + +#: website/static/js/search-grdm.js:154 +msgid "Project name (Asc)" +msgstr "プロジェクト名の正順" + +#: website/static/js/search-grdm.js:155 +msgid "Project name (Desc)" +msgstr "プロジェクト名の逆順" + +#: website/static/js/search-grdm.js:156 +msgid "File name (Asc)" +msgstr "ファイル名の正順" + +#: website/static/js/search-grdm.js:157 +msgid "File name (Desc)" +msgstr "ファイル名の逆順" + +#: website/static/js/search-grdm.js:158 +msgid "User name (Asc)" +msgstr "ユーザー名の正順" + +#: website/static/js/search-grdm.js:159 +msgid "User name (Desc)" +msgstr "ユーザー名の逆順" + +#: website/static/js/search-grdm.js:160 +msgid "Institution name (Asc)" +msgstr "機関名の正順" + +#: website/static/js/search-grdm.js:161 +msgid "Institution name (Desc)" +msgstr "機関名の逆順" + +#: website/static/js/search-grdm.js:162 +msgid "Wiki title (Asc)" +msgstr "Wikiタイトルの正順" + +#: website/static/js/search-grdm.js:163 +msgid "Wiki title (Desc)" +msgstr "Wikiタイトルの逆順" + +#: website/static/js/search-grdm.js:313 website/static/js/search.js:190 +msgid "Page %1$s of %2$s" +msgstr "ページ %1$s / %2$s" + +#: website/static/js/search-grdm.js:393 website/static/js/search.js:270 +msgid "Search help" +msgstr "検索ヘルプ" + +#: website/static/js/search-grdm.js:394 website/static/js/search.js:271 +msgid "

                      Queries

                      " +msgstr "

                      クエリ

                      " + +#: website/static/js/search-grdm.js:395 website/static/js/search.js:272 +msgid "" +"

                      Search uses the Lucene" +" search syntax. " +msgstr "" +"

                      検索ではLucene検索構文を使用します。" +" " + +#: website/static/js/search-grdm.js:396 website/static/js/search.js:273 +msgid "This gives you many options, but can be very simple as well. " +msgstr "これにより多くのオプションが提供されますが、非常に簡単な場合もあります。" + +#: website/static/js/search-grdm.js:397 website/static/js/search.js:274 +msgid "Examples of valid searches include:" +msgstr "有効な検索の例は次のとおりです。" + +#: website/static/js/search-grdm.js:769 website/static/js/search-grdm.js:1067 +#: website/static/js/search.js:578 website/static/js/search.js:605 +msgid "GakuNin RDM | Search" +msgstr "GakuNin RDM | 検索" + +#: website/static/js/wikiSettingsTreebeard.js:26 +msgid "Make publicly editable" +msgstr "公開で編集可能にする" + +#: website/static/js/wikiSettingsTreebeard.js:27 +msgid "" +"Are you sure you want to make the wiki of %1$s publicly editable? " +"This will allow any logged in user to edit the content of this wiki. " +msgstr "" +"%1$sのwikiを一般に編集可能にしますか? " +"これにより、ログインしているユーザーがこのwikiのコンテンツを編集できるようになります。" + +#: website/static/js/wikiSettingsTreebeard.js:28 +msgid "" +"Note: Users without write access will not be able to add, delete, " +"or rename pages." +msgstr "注意:書き込みアクセス権のないユーザーは、ページを追加、削除、または名前変更できません。" + +#: website/static/js/wikiSettingsTreebeard.js:36 +msgid "Apply" +msgstr "適用" + +#: website/static/js/wikiSettingsTreebeard.js:114 +msgid "Only admins may change permissions of this wiki." +msgstr "このwikiの権限を変更できるのは管理者のみです。" + +#: website/static/js/wikiSettingsTreebeard.js:116 +msgid "Select who can edit" +msgstr "編集できるユーザーを選択" + +#: website/static/js/wikiSettingsTreebeard.js:116 +msgid "This feature is disabled for wikis of private %1$ss" +msgstr "この機能はプライベート%1$sのWikiでは無効になっています" + +#: website/static/js/wikiSettingsTreebeard.js:133 +msgid "Contributors (with write access)" +msgstr "メンバー(書き込みアクセス権付き)" + +#: website/static/js/wikiSettingsTreebeard.js:134 +msgid "All GakuNin RDM users" +msgstr "全てのGakuNin RDMユーザ" + +#: website/static/js/components/autocomplete.js:84 +msgid "Could not GET autocomplete data" +msgstr "オートコンプリートデータを取得できませんでした" + +#: website/static/js/components/autocomplete.js:150 +msgid "Initiated by: " +msgstr "発起人:" + +#: website/static/js/components/autocomplete.js:156 +msgid "Initiated: " +msgstr "開始日" + +#: website/static/js/components/autocomplete.js:162 +msgid "Last updated: " +msgstr "最終更新日" + +#: website/static/js/components/publicNodes.js:68 +msgid "Error retrieving projects" +msgstr "プロジェクトの取得エラー" + +#: website/static/js/components/publicNodes.js:120 +msgid " more" +msgstr "もっと" + +#: website/static/js/components/publicNodes.js:152 +msgid "-- private project -- / " +msgstr "-- 非公開プロジェクト -- / " + +#: website/static/js/components/publicNodes.js:190 +msgid "Unable to retrieve public %1$s" +msgstr "現在、パブリック%1$sを取得できません。" + +#: website/static/js/components/publicNodes.js:190 +msgid " at this time. Please refresh the page or contact " +msgstr "ページを更新するか、こちらに問い合わせて下さい" + +#: website/static/js/components/publicNodes.js:204 +msgid "You have no public %1$s." +msgstr "パブリック%1$sはありません。" + +#: website/static/js/components/publicNodes.js:206 +msgid "Find out how to make your %1$s" +msgstr "%1$sを公開にする方法を" + +#: website/static/js/components/publicNodes.js:207 +msgid "public" +msgstr "ご覧ください" + +#: website/static/js/components/publicNodes.js:211 +msgid "This user has no public %1$s." +msgstr "このユーザーにはパブリック%1$sがありません。" + +#: website/static/js/components/quickFiles.js:54 +msgid "Error retrieving quickfiles" +msgstr "クイックファイルの取得エラー" + +#: website/static/js/components/quickFiles.js:121 +msgid "" +"Unable to retrieve quickfiles at this time. Please refresh the page or " +"contact " +msgstr "現時点ではクイックファイルを取得できません。 ページを更新するか、こちらにお問い合わせ下さい。" + +#: website/static/js/components/quickFiles.js:134 +msgid "You have no public quickfiles" +msgstr "パブリッククイックファイルがありません" + +#: website/static/js/components/quickFiles.js:135 +msgid "This user has no public quickfiles." +msgstr "このユーザーには公開クイックファイルがありません。" + +#: website/static/js/components/utils.js:15 +msgid "Missing required option: " +msgstr "必須オプションがありません:" + +#: website/static/js/filepage/editor.js:82 +msgid "The file content could not be loaded." +msgstr "ファイルの内容をロードできませんでした。" + +#: website/static/js/filepage/editor.js:83 +msgid "Could not GET file contents." +msgstr "ファイルの内容を取得できませんでした。" + +#: website/static/js/filepage/editor.js:113 +msgid "Could not update file. Insufficient storage space in your Dropbox." +msgstr "ファイルを更新できませんでした。 Dropboxのストレージスペースが不足しています。" + +#: website/static/js/filepage/editor.js:115 +msgid "The file could not be updated." +msgstr "ファイルを更新できませんでした。" + +#: website/static/js/filepage/editor.js:122 +msgid "Could not PUT file content." +msgstr "ファイルコンテンツをPUTできませんでした。" + +#: website/static/js/filepage/editor.js:178 +msgid "Revert" +msgstr "元に戻す" + +#: website/static/js/filepage/index.js:89 +msgid "Direct iframe with fixed height and width" +msgstr "高さと幅を固定したiframeを管理する" + +#: website/static/js/filepage/index.js:131 +#: website/static/js/filepage/index.js:136 +msgid "File is checked out." +msgstr "ファイルはチェックアウトされています。" + +#: website/static/js/filepage/index.js:132 +msgid "" +" This file has been checked out by a COS Preregistration Challenge " +"Reviewer and will become available when review is complete." +msgstr "" +"このファイルはCOS Preregistration Challenge " +"Reviewerによってチェックアウトされており、レビューが完了すると利用可能になります。" + +#: website/static/js/filepage/index.js:137 +msgid " This file has been checked out by a " +msgstr "このファイルは" + +#: website/static/js/filepage/index.js:138 +msgid "collaborator" +msgstr "コラボレータ" + +#: website/static/js/filepage/index.js:139 +msgid ". It needs to be checked in before any changes can be made." +msgstr "によってチェックアウトされました。変更を行う前にチェックインする必要があります。" + +#: website/static/js/filepage/index.js:184 +msgid "Delete file?" +msgstr "ファイルを削除しますか?" + +#: website/static/js/filepage/index.js:186 +msgid "Are you sure you want to delete %1$s?" +msgstr "%1$sを削除してもよろしいですか?" + +#: website/static/js/filepage/index.js:204 +msgid "Could not delete file." +msgstr "ファイルを削除できませんでした。" + +#: website/static/js/filepage/index.js:220 +msgid "Confirm file check out?" +msgstr "ファイルのチェックアウトを確認しますか?" + +#: website/static/js/filepage/index.js:223 +msgid "as long as it is checked out. You can check it back in at anytime." +msgstr "いつでもチェックインできます。" + +#: website/static/js/filepage/index.js:243 +msgid "Unable to check out file" +msgstr "ファイルをチェックアウトできません" + +#: website/static/js/filepage/index.js:270 +msgid "Unable to check in file" +msgstr "ファイルをチェックインできません" + +#: website/static/js/filepage/index.js:275 +msgid "Force check in file?" +msgstr "ファイルを強制的にチェックインしますか?" + +#: website/static/js/filepage/index.js:276 +msgid "" +"This will check in the file for all users, allowing it to be edited. Are " +"you sure?" +msgstr "これにより、すべてのユーザーのファイルがチェックインされ、編集できるようになります。 よろしいですか?" + +#: website/static/js/filepage/index.js:279 +#: website/static/js/filepage/index.js:502 +msgid "Force check in" +msgstr "強制チェックイン" + +#: website/static/js/filepage/index.js:302 +msgid "Unable to force check in file. Make sure you have admin privileges." +msgstr "ファイルを強制的にチェックインできません。 管理者権限を持っていることを確認してください。" + +#: website/static/js/filepage/index.js:343 +msgid "Live editing mode " +msgstr "ライブ編集モード" + +#: website/static/js/filepage/index.js:344 +msgid "Attempting to connect " +msgstr "接続試行中" + +#: website/static/js/filepage/index.js:345 +msgid "Unsupported browser " +msgstr "サポートされていないブラウザ" + +#: website/static/js/filepage/index.js:346 +msgid "Saving... " +msgstr "保存中..." + +#: website/static/js/filepage/index.js:347 +msgid "Unavailable: Live editing " +msgstr "利用不可:ライブ編集" + +#: website/static/js/filepage/index.js:470 +msgid "View this file on " +msgstr "このファイルを次のアドオンで表示:" + +#: website/static/js/filepage/index.js:505 +msgid "Check out" +msgstr "チェックアウト" + +#: website/static/js/filepage/index.js:508 +msgid "Check in" +msgstr "チェックイン" + +#: website/static/js/filepage/index.js:514 +msgid "Request Trusted Timestamp" +msgstr "タイムスタンプを打つ" + +#: website/static/js/filepage/index.js:531 +msgid "Toggle view: " +msgstr "トグルビュー:" + +#: website/static/js/filepage/index.js:570 +#: website/static/js/filepage/revisions.js:173 +msgid "Revisions" +msgstr "バージョン管理" + +#: website/static/js/filepage/revisions.js:72 +#: website/static/js/filepage/revisions.js:73 +msgid "Unable to fetch versions" +msgstr "バージョンを取得できません" + +#: website/static/js/filepage/revisions.js:108 +msgid "Version ID" +msgstr "バージョンID" + +#: website/static/js/filepage/revisions.js:110 +msgid "User" +msgstr "ユーザ名" + +#: website/static/js/filepage/revisions.js:113 +msgid "" +".fa.fa-question-circle[data-content=\"MD5 is an algorithm used to verify " +"data integrity.\"][rel=\"popover\"]" +msgstr "" +".fa.fa-question-circle[data-" +"content=\"MD5は、データの整合性を検証するために使用されるアルゴリズムです。\"][rel=\"popover\"]" + +#: website/static/js/filepage/revisions.js:116 +msgid "" +".fa.fa-question-circle[data-content=\"SHA-2 is a cryptographic hash " +"function designed by the NSA used to verify data " +"integrity.\"][rel=\"popover\"]" +msgstr "" +".fa.fa-question-circle[data-" +"content=\"SHA-2は、データの整合性を検証するために使用されるNSAによって設計された暗号ハッシュ関数です。\"][rel=\"popover\"]" + +#: website/static/js/filepage/revisions.js:133 +msgid "Anonymous Contributor" +msgstr "匿名のメンバー" + +#: website/static/js/filepage/util.js:36 +msgid " Loading... " +msgstr "ロード中..." + +#: website/static/js/home-page/scheduledBannerPlugin.js:25 +msgid "Error in request to %1$s" +msgstr "%1$sへのリクエストでエラーが発生しました" + +#: website/static/js/pages/base-page.js:130 +msgid "Merge account" +msgstr "アカウントをマージ" + +#: website/static/js/pages/base-page.js:131 +msgid "Would you like to merge %1$s into your account? " +msgstr "%1$sをアカウントに統合しますか?" + +#: website/static/js/pages/base-page.js:133 +msgid "%1$s has been merged into your account." +msgstr "%1$sはアカウントに統合されました。" + +#: website/static/js/pages/base-page.js:134 +msgid "You have chosen to not merge %1$s into your account. " +msgstr "アカウントに%1$sをマージしないことを選択しました。" + +#: website/static/js/pages/base-page.js:135 +#: website/static/js/pages/base-page.js:142 +msgid "" +"If you change your mind, visit the user " +"settings page." +msgstr "意見が変わったら、ユーザー設定ページにアクセスしてください。" + +#: website/static/js/pages/base-page.js:138 +#: website/static/js/pages/base-page.js:188 +msgid "Add email" +msgstr "メールを追加" + +#: website/static/js/pages/base-page.js:139 +msgid "Would you like to add %1$s to your account?" +msgstr "アカウントに%1$sを追加しますか?" + +#: website/static/js/pages/base-page.js:140 +msgid "%1$s has been added into your account." +msgstr "%1$sがアカウントに追加されました。" + +#: website/static/js/pages/base-page.js:141 +msgid "You have chosen not to add %1$s to your account. " +msgstr "アカウントに%1$sを追加しないことを選択しました。" + +#: website/static/js/pages/base-page.js:145 +msgid "There was a problem adding " +msgstr "次のメールアドレスを追加中に問題が発生しました:" + +#: website/static/js/pages/base-page.js:146 +#: website/static/js/pages/base-page.js:149 +msgid ". Please contact %1$s if the problem persists." +msgstr "。問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/pages/base-page.js:148 +msgid "There was a problem removing " +msgstr "次のメールアドレスを削除中に問題が発生しました:" + +#: website/static/js/pages/base-page.js:160 +msgid "Do not add email" +msgstr "メールを追加しないで下さい" + +#: website/static/js/pages/base-page.js:173 +msgid "Could not remove email" +msgstr "メールを削除できませんでした" + +#: website/static/js/pages/base-page.js:198 +msgid "Could not add email" +msgstr "メールを追加できませんでした" + +#: website/static/js/pages/base-page.js:291 +msgid " and " +msgstr "と" + +#: website/static/js/pages/dashboard-page.js:35 +msgid "Could not set user timezone or locale" +msgstr "ユーザーのタイムゾーンまたはロケールを設定できませんでした" + +#: website/static/js/pages/dashboard-page.js:53 +msgid "" +"This is taking longer than normal.
                      Try reloading the page. If the " +"problem persist, please contact us at %1$s" +msgstr "これには通常より時間がかかります。
                      ページを再読み込みしてください。 問題が解決しない場合は、%1$sまでご連絡ください" + +#: website/static/js/pages/file-page.js:21 +msgid "Add a file tag to enhance discoverability" +msgstr "タグを追加してファイルを発見しやすくする" + +#: website/static/js/pages/file-page.js:23 +#: website/static/js/pages/file-page.js:58 +#: website/static/js/pages/file-page.js:60 +#: website/static/js/pages/project-dashboard-page.js:632 +#: website/static/js/pages/project-dashboard-page.js:716 +#: website/static/js/pages/project-dashboard-page.js:749 +msgid "Removing tag" +msgstr "タグを削除" + +#: website/static/js/pages/file-page.js:24 +#: website/static/js/pages/project-dashboard-page.js:633 +msgid "Add a tag" +msgstr "タグを追加" + +#: website/static/js/pages/file-page.js:28 +msgid "Could not add tag." +msgstr "タグを追加できませんでした" + +#: website/static/js/pages/file-page.js:29 +#: website/static/js/pages/project-dashboard-page.js:656 +msgid "Failed to add tag" +msgstr "タグの追加に失敗しました" + +#: website/static/js/pages/file-page.js:43 +msgid "Could not remove tag." +msgstr "タグを削除できませんでした。" + +#: website/static/js/pages/file-page.js:44 +#: website/static/js/pages/project-dashboard-page.js:692 +msgid "Failed to remove tag" +msgstr "タグの削除に失敗しました。" + +#: website/static/js/pages/file-page.js:90 +msgid "The file title cannot be empty." +msgstr "ファイルのタイトルを空にすることはできません。" + +#: website/static/js/pages/file-page.js:92 +msgid "The file title cannot be more than 100 characters." +msgstr "ファイルのタイトルは100文字を超えることはできません。" + +#: website/static/js/pages/file-page.js:103 +msgid "" +"Your file was successfully renamed. To view the new filename in the file " +"tree below, refresh the page." +msgstr "ファイルの名前が正常に変更されました。 下のファイルツリーで新しいファイル名を表示するには、ページを更新します。" + +#: website/static/js/pages/institution-page.js:30 +msgid "All Projects" +msgstr "全てのプロジェクト" + +#: website/static/js/pages/institution-page.js:43 +msgid "" +"This is taking longer than normal.
                      Try reloading the page. If the " +"problem persist, please contact us at %1$s." +msgstr "これには通常より時間がかかります。
                      ページを再読み込みしてください。 問題が解決しない場合は、%1$sまでご連絡ください。" + +#: website/static/js/pages/notifications-config-page.js:21 +#: website/static/js/pages/project-settings-page.js:33 +msgid "Could not retrieve notification settings." +msgstr "通知設定を取得できませんでした。" + +#: website/static/js/pages/profile-settings-addons-page.js:66 +#: website/static/js/pages/project-addons-page.js:15 +msgid "" +"Sorry, we had trouble saving your settings. If this persists please " +"contact " +msgstr "申し訳ありませんが、設定を保存できませんでした。 それでも解決しない場合は、こちらにお問い合わせ下さい:" + +#: website/static/js/pages/profile-settings-addons-page.js:68 +msgid "Request failed" +msgstr "要求が失敗しました" + +#: website/static/js/pages/profile-settings-addons-page.js:86 +msgid "Are you sure you want to remove the add-ons you have deselected? " +msgstr "選択解除したアドオンを削除してもよろしいですか?" + +#: website/static/js/pages/profile-settings-addons-page.js:129 +msgid "The changes on addon setting are not submitted!" +msgstr "アドオン設定の変更は送信されません!" + +#: website/static/js/pages/project-addons-page.js:10 +msgid "Your add-on settings have been successfully changed." +msgstr "アドオンの設定が正常に変更されました。" + +#: website/static/js/pages/project-addons-page.js:26 +msgid "Disable Add-on?" +msgstr "アドオンを無効にしますか?" + +#: website/static/js/pages/project-addons-page.js:27 +msgid "Are you sure you want to disable this add-on?" +msgstr "このアドオンを無効にしますか?" + +#: website/static/js/pages/project-addons-page.js:37 +msgid "Disable" +msgstr "無効にする" + +#: website/static/js/pages/project-dashboard-page.js:117 +msgid "Filter by users" +msgstr "ユーザでフィルタ" + +#: website/static/js/pages/project-dashboard-page.js:118 +msgid "Select from current contributors" +msgstr "現在のメンバーから選択" + +#: website/static/js/pages/project-dashboard-page.js:119 +msgid "Select including past contributors" +msgstr "過去のメンバーも含めて選択" + +#: website/static/js/pages/project-dashboard-page.js:120 +msgid "Include past project contributors in your search" +msgstr "過去のプロジェクトメンバーも含めて検索する" + +#: website/static/js/pages/project-dashboard-page.js:121 +msgid "Use dropdown menu" +msgstr "ドロップダウンメニュー使用" + +#: website/static/js/pages/project-dashboard-page.js:417 +msgid "Add Component" +msgstr "コンポーネントを追加" + +#: website/static/js/pages/project-dashboard-page.js:419 +msgid "Create new component" +msgstr "新しいコンポーネントを作成する" + +#: website/static/js/pages/project-dashboard-page.js:613 +msgid "Error retrieving filebrowser" +msgstr "ファイルブラウザの取得エラー" + +#: website/static/js/pages/project-dashboard-page.js:630 +msgid "Add a project tag to enhance discoverability" +msgstr "タグを追加してプロジェクトを発見しやすくする" + +#: website/static/js/pages/project-dashboard-page.js:691 +msgid "Could not remove tag" +msgstr "タグを削除できませんでした" + +#: website/static/js/pages/project-settings-page.js:34 +msgid "Could not GET notification settings." +msgstr "通知設定を取得できませんでした。" + +#: website/static/js/pages/project-settings-page.js:54 +msgid "Could not retrieve wiki settings." +msgstr "ウィキ設定を取得できませんでした。" + +#: website/static/js/pages/project-settings-page.js:55 +msgid "Could not GET wiki settings." +msgstr "ウィキ設定を取得できませんでした。" + +#: website/static/js/pages/project-settings-page.js:104 +msgid "Successfully updated settings." +msgstr "設定を更新しました。" + +#: website/static/js/pages/project-settings-page.js:115 +msgid "Could not set commenting configuration. Please try again." +msgstr "コメント設定を設定できませんでした。 もう一度やり直してください。" + +#: website/static/js/pages/project-settings-page.js:151 +msgid "Unable to update settings" +msgstr "設定を更新できません" + +#: website/static/js/pages/project-settings-page.js:152 +msgid "Could not update settings." +msgstr "設定を更新できませんでした。" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:31 +msgid "Import Account from Admin" +msgstr "管理者からアカウントをインポート" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:52 +#: website/static/js/pages/rdm-profile-settings-addons-page.js:54 +msgid "Successfully imported the account." +msgstr "アカウントを正常にインポートしました。" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:59 +#: website/static/js/pages/rdm-profile-settings-addons-page.js:61 +msgid "Failed to import the account." +msgstr "アカウントのインポートに失敗しました。" + +#: website/static/js/pages/timestamp-common.js:172 +msgid "A verify request is being processed!" +msgstr "確認リクエストが処理されています!" + +#: website/static/js/pages/timestamp-common.js:175 +msgid "Something went wrong with the Verify request." +msgstr "確認リクエストで問題が発生しました。" + +#: website/static/js/pages/timestamp-common.js:191 +msgid "Using the checkbox, please select the files to request timestamp." +msgstr "チェックボックスを使用して、タイムスタンプを要求するファイルを選択してください。" + +#: website/static/js/pages/timestamp-common.js:214 +msgid "Timestamp is being added to the selected files!" +msgstr "選択したファイルにタイムスタンプが追加されています!" + +#: website/static/js/pages/timestamp-common.js:217 +msgid "Something went wrong with the Request Trusted Timestamp request." +msgstr "Request Trusted Timestampリクエストで問題が発生しました。" + +#: website/static/js/pages/timestamp-common.js:222 +msgid "The task has been cancelled." +msgstr "タスクはキャンセルされました。" + +#: website/static/js/pages/timestamp-common.js:231 +msgid "The task already finished." +msgstr "タスクはすでに終了しています。" + +#: website/static/js/pages/timestamp-common.js:234 +msgid "Something went wrong in the cancel request." +msgstr "キャンセルリクエストで問題が発生しました。" + +#: website/static/js/pages/timestamp-common.js:288 +msgid "Using the checkbox, please select the files to download." +msgstr "チェックボックスを使用して、ダウンロードするファイルを選択してください。" + +#: website/static/js/pages/timestamp-common.js:323 +msgid "Failed to log \"downloaded errors\" into Recent Activity" +msgstr "エラーリストがダウンロードされたことを最近の活動に記録できませんでした。" + +#: website/static/js/pages/wiki-edit-page.js:64 +msgid "The wiki page name cannot be empty." +msgstr "Wikiページ名を空にすることはできません。" + +#: website/static/js/pages/wiki-edit-page.js:66 +msgid "The wiki page name cannot be more than 100 characters." +msgstr "Wikiページ名は100文字を超えることはできません。" + +#: website/static/js/pages/wiki-edit-page.js:81 +msgid "Error in renaming wiki" +msgstr "Wikiの名前変更中のエラー" + +#: website/static/js/pages/wiki-edit-page.js:88 +msgid "An unexpected error occurred. Please try again." +msgstr "予期しないエラーが発生しました。 もう一度やり直してください。" + +#: website/static/js/pages/wiki-edit-page.js:108 +msgid "

                      Could not retrieve wiki pages. If this issue persists, " +msgstr "

                      wikiページを取得できませんでした。 この問題が解決しない場合、" + +#: website/static/js/pages/wiki-edit-page.js:109 +msgid "please report it to %1$s" +msgstr "%1$sに報告してください" + +#: website/static/js/pages/wiki-edit-page.js:110 +msgid "Could not GET wiki menu pages" +msgstr "Wikiメニューページを取得できませんでした" + +#: addons/myskelton/static/node-cfg.js:90 +msgid "Admin Notes by %1$s" +msgstr "%1$sの管理者ノート" + +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:34 +msgid "Saving admin notes was successful" +msgstr "管理者ノートの保存に成功しました" + +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:36 +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:46 +msgid "Error while saving admin notes" +msgstr "管理者ノートの保存中にエラーが発生しました" + +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:44 +msgid "Permission error while saving admin notes" +msgstr "管理者ノートの保存中のアクセス許可エラー" + +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:63 +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:79 +msgid "Error while fetching admin notes" +msgstr "管理者ノートの取得中にエラーが発生しました" diff --git a/site/guides/admin-addon/website/translations/js_messages.pot b/site/guides/admin-addon/website/translations/js_messages.pot new file mode 100644 index 0000000..446a399 --- /dev/null +++ b/site/guides/admin-addon/website/translations/js_messages.pot @@ -0,0 +1,6685 @@ +# Translations template for PROJECT. +# Copyright (C) 2020 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR , 2020. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: 0.6.0\n" +"Report-Msgid-Bugs-To: rocs-office@nii.ac.jp\n" +"POT-Creation-Date: 2020-09-03 12:45+0900\n" +"PO-Revision-Date: 2020-09-03 12:45+0900\n" +"Last-Translator: Shunta Nishikawa\n" +"Language-Team: RCOS \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.7.0\n" + +#: addons/twofactor/static/twoFactorUserConfig.js:148 +#: addons/twofactor/static/twoFactorUserConfig.js:190 +#: admin/static/js/rdm_addons/rdm-addons-page.js:71 +#: website/static/js/accountSettings.js:286 +#: website/static/js/accountSettings.js:351 +#: website/static/js/accountSettings.js:477 +#: website/static/js/accountSettings.js:549 +#: website/static/js/addProjectPlugin.js:347 +#: website/static/js/addonPermissions.js:55 +#: website/static/js/addonSettings.js:71 website/static/js/addonSettings.js:134 +#: website/static/js/apiApplication.js:249 +#: website/static/js/apiApplication.js:420 +#: website/static/js/apiApplication.js:487 +#: website/static/js/apiPersonalToken.js:228 +#: website/static/js/apiPersonalToken.js:399 +#: website/static/js/apiPersonalToken.js:426 +#: website/static/js/citationsNodeConfig.js:169 +#: website/static/js/citationsNodeConfig.js:187 +#: website/static/js/contribManager.js:433 website/static/js/fangorn.js:537 +#: website/static/js/fangorn.js:542 website/static/js/fangorn.js:1212 +#: website/static/js/fangorn.js:1235 website/static/js/fangorn.js:1288 +#: website/static/js/fangorn.js:1307 website/static/js/fangorn.js:2006 +#: website/static/js/filepage/index.js:213 +#: website/static/js/folderPickerNodeConfig.js:510 +#: website/static/js/folderPickerNodeConfig.js:566 +#: website/static/js/institutionProjectSettings.js:102 +#: website/static/js/licensePicker.js:243 website/static/js/myProjects.js:1560 +#: website/static/js/myProjects.js:1608 website/static/js/myProjects.js:1632 +#: website/static/js/nodeControl.js:227 +#: website/static/js/oauthAddonNodeConfig.js:156 +#: website/static/js/oauthAddonNodeConfig.js:174 +#: website/static/js/osfHelpers.js:796 website/static/js/osfHelpers.js:897 +#: website/static/js/pages/profile-settings-addons-page.js:35 +#: website/static/js/pages/profile-settings-addons-page.js:101 +#: website/static/js/pages/project-addons-page.js:41 +#: website/static/js/pages/project-addons-page.js:66 +#: website/static/js/privateLinkTable.js:119 website/static/js/profile.js:373 +#: website/static/js/profile.js:743 website/static/js/profile.js:975 +#: website/static/js/project.js:39 website/static/js/project.js:143 +#: website/static/js/project.js:253 +#: website/static/js/wikiSettingsTreebeard.js:31 +msgid "Cancel" +msgstr "" + +#: addons/twofactor/static/twoFactorUserConfig.js:178 +msgid "Enable Two-factor Authentication" +msgstr "" + +#: addons/twofactor/static/twoFactorUserConfig.js:179 +msgid "" +"Enabling two-factor authentication will not immediately activate this " +"feature for your account. You will need to follow the steps that appear " +"below to complete the activation of two-factor authentication for your " +"account." +msgstr "" + +#: addons/twofactor/static/twoFactorUserConfig.js:187 +msgid "Enable" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:86 +msgid "Live editing mode" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:88 +msgid "Attempting to connect" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:90 +msgid "Unsupported browser" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:92 +msgid "Unavailable: Live editing" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:153 +msgid "The wiki content could not be loaded." +msgstr "" + +#: addons/wiki/static/WikiEditor.js:155 +msgid "Could not GET wiki contents." +msgstr "" + +#: addons/wiki/static/WikiEditor.js:176 +msgid "There are unsaved changes to your wiki. If you exit " +msgstr "" + +#: addons/wiki/static/WikiEditor.js:177 +msgid "the page now, those changes may be lost." +msgstr "" + +#: addons/wiki/static/wikiPage.js:94 +#: website/static/js/pages/project-dashboard-page.js:733 +msgid "" +"*Add important information, links, or images here to describe your " +"project.*" +msgstr "" + +#: addons/wiki/static/wikiPage.js:96 +#: website/static/js/pages/project-dashboard-page.js:735 +msgid "*No wiki content.*" +msgstr "" + +#: addons/wiki/static/wikiPage.js:220 +msgid "Live preview" +msgstr "" + +#: addons/wiki/static/wikiPage.js:222 +msgid "Current version" +msgstr "" + +#: addons/wiki/static/wikiPage.js:224 +msgid "Previous version" +msgstr "" + +#: addons/wiki/static/wikiPage.js:226 +msgid "Version " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:48 +msgid "Strong " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:51 +msgid "Emphasis " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:54 +msgid "Spellcheck: Toggle spellcheck on and off" +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:56 +msgid "Hyperlink " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:60 +msgid "Blockquote

                      " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:63 +msgid "Code Sample
                      "
                      +msgstr ""
                      +
                      +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:66
                      +msgid "Image "
                      +msgstr ""
                      +
                      +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:70
                      +msgid "Numbered List 
                        " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:71 +msgid "Bulleted List
                          " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:72 +msgid "List item" +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:74 +msgid "Heading

                          /

                          " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:77 +msgid "Horizontal Rule
                          " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:79 +msgid "Undo -" +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:80 +msgid "Redo -" +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:82 +msgid "Wiki Syntax Help" +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:1939 +msgid "Autocomplete" +msgstr "" + +#: addons/jupyterhub/static/files.js:92 +msgid "Launch" +msgstr "" + +#: admin/static/js/collection_providers/collectionProviders.js:9 +msgid "Hide Form" +msgstr "" + +#: admin/static/js/collection_providers/collectionProviders.js:9 +msgid "Modify Collection Provider" +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:64 +#, python-format +msgid "Disallow %s?" +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:65 +msgid "Are you sure you want to disallow the %1$s?
                          " +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:66 +msgid "" +"This will revoke access to %1$s for all projects using the " +"accounts.

                          " +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:67 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:395 +msgid "Type the following to continue: %1$s

                          " +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:74 +msgid "Disallow" +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:85 +msgid "Strings did not match" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:26 +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:19 +msgid "Other (Please Specify)" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:85 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:100 +#: website/static/js/addonSettings.js:171 +msgid "Error while updating addon account" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:100 +msgid "Please select a Dataverse repository." +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:105 +msgid "Please enter an API token." +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:110 +msgid "Please enter a Dataverse host and an API token." +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:131 +msgid "Could not authenticate with Dataverse" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:144 +msgid "Disconnect Dataverse Account?" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:146 +msgid "" +"Are you sure you want to disconnect the Dataverse account on " +"%1$s? This will revoke access to Dataverse for all " +"projects associated with this account." +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:155 +#: admin/static/js/rdm_addons/figshare/rdm-cfg.js:34 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:124 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:411 +#: website/static/js/addonSettings.js:130 +#: website/static/js/folderPickerNodeConfig.js:562 +msgid "Disconnect" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:173 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:142 +#: website/static/js/addonSettings.js:150 +msgid "Error while removing addon authorization for %1$s" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:212 +msgid "Could not GET Dataverse settings" +msgstr "" + +#: admin/static/js/rdm_addons/figshare/rdm-cfg.js:17 +msgid "Disconnect figshare Account?" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:46 +msgid "Invalid management URL: " +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:61 +msgid "Saving management project was successful" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:63 +msgid "Error while saving addon management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:71 +msgid "Permission error while saving management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:73 +msgid "Error while saving management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:91 +msgid "Removing management project was successful" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:93 +msgid "Error while removing addon management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:101 +msgid "Permission error while removing management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:103 +msgid "Error while removing management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:118 +msgid "Error while fetching addon management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:149 +msgid "Saving organizational project was successful" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:151 +msgid "Error while saving addon organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:159 +msgid "Permission error while saving organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:161 +msgid "Error while saving organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:179 +msgid "Removing organizational project was successful" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:181 +msgid "Error while removing addon organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:189 +msgid "Permission error while removing organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:191 +msgid "Error while removing organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:206 +msgid "Error while fetching addon organization project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:222 +msgid "Error while fetching management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:226 +msgid "Error while fetching organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:58 +msgid "Could not GET OwnCloud settings" +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:75 +msgid "Please enter an ownCloud server." +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:77 +msgid "Please select an ownCloud server." +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:82 +msgid "Please enter a username and password." +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:86 +msgid "Please enter an ownCloud host and credentials." +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:104 +msgid "Could not authenticate with ownCloud" +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:48 +msgid "Please enter both an API access key and secret key." +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:53 +msgid "Please enter an API access key." +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:58 +msgid "Please enter an API secret key." +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:75 +msgid "Could not authenticate with S3" +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:113 +msgid "Disconnect Amazon S3 Account?" +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:115 +msgid "" +"Are you sure you want to disconnect the S3 account %1$s?" +" This will revoke access to S3 for all projects associated with this " +"account." +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:80 +msgid "Are you sure you want to change institutional storage?" +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:81 +msgid "" +"

                          The previous storage will no longer be available to all contributors " +"on the project.

                          " +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:85 +#: website/static/js/folderPickerNodeConfig.js:100 +#: website/static/js/folderPickerNodeConfig.js:102 +#: website/static/js/folderPickerNodeConfig.js:594 +msgid "Change" +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:264 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:491 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:626 +msgid "Some errors occurred" +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:311 +msgid "Institutional Storage set successfully" +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:391 +#: website/static/js/addonSettings.js:118 +msgid "Disconnect Account?" +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:393 +msgid "" +"Are you sure you want to disconnect the %1$s account " +"%2$s?
                          " +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:394 +msgid "" +"This will revoke access to %1$s for all projects using this " +"account.

                          " +msgstr "" + +#: scripts/translations/messages_addonsJson.js:3 +msgid "" +"\n" +"\n" +"

                          Box Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking a GakuNin RDM project public or private is " +"independent of Box privacy. The GakuNin RDM does not alter the " +"permissions of linked Box folders.
                          View / download file versionsBox files and their versions can be viewed/downloaded" +" via GakuNin RDM.
                          Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Box.
                          Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Box.
                          LogsThe GakuNin RDM keeps track of changes you make to " +"your Box content through the GakuNin RDM, but not for changes made using " +"Box directly.
                          ForkingForking a project or component does not copy Box " +"authorization unless the user forking the project is the same user who " +"authorized the Box add-on in the source project being forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:5 +msgid "" +"\n" +"\n" +"

                          Dataverse Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Dataverse study public or private. The GakuNin " +"RDM allows you to release the latest draft version of a Dataverse " +"dataset.
                          View / download file versionsFiles from the latest release of the selected " +"Dataverse study can be viewed/downloaded. GakuNin RDM users with write " +"permissions can view/download draft files as well.
                          Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Dataverse.
                          Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Dataverse.
                          LogsThe GakuNin RDM keeps track of changes you make to " +"your Dataverse studies through the GakuNin RDM, but not for changes made " +"using Dataverse directly.
                          ForkingForking a project or component does not copy " +"Dataverse authorization unless the user forking the project is the same " +"user who authorized the Dataverse add-on in the source project being " +"forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:7 +msgid "" +"\n" +"\n" +"

                          Dropbox Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking a GakuNin RDM project public or private is " +"independent of Dropbox privacy. The GakuNin RDM does not alter the " +"permissions of linked Dropbox folders.
                          View / download file versionsDropbox files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                          Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Dropbox.
                          Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Dropbox.
                          LogsGakuNin RDM keeps track of changes you make to your " +"Dropbox content through GakuNin RDM, but not for changes made using " +"Dropbox directly.
                          ForkingForking a project or component does not copy Dropbox " +"authorization unless the user forking the project is the same user who " +"authorized the Dropbox add-on in the source project being forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:9 +msgid "" +"\n" +"\n" +"

                          figshare Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          Permissions Making a GakuNin RDM project public or private is " +"independent of making figshare content public or private. The GakuNin RDM" +" does not alter the permissions of linked figshare content.
                          View / download file versionsfigshare files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported.
                          Add / update filesFiles can be added but not updated.
                          Delete filesPrivate files and filesets can be deleted via GakuNin" +" RDM.
                          LogsGakuNin RDM keeps track of changes you make to your " +"figshare content through GakuNin RDM, but not for changes made using " +"figshare directly.
                          ForkingForking a project or component does not copy figshare" +" authorization unless the user forking the project is the same user who " +"authorized the figshare add-on in the source project being forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:11 +msgid "" +"\n" +"\n" +"

                          GitHub Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a GitHub repo public or private. The GakuNin RDM " +"does not alter the permissions of linked GitHub repos.
                          View / download file versionsGitHub files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                          Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in GitHub.
                          Delete filesFiles deleted via GakuNin RDM will be deleted in " +"GitHub.
                          LogsGitHub dynamically updates GakuNin RDM logs when " +"files are modified outside the GakuNin RDM. Changes to GitHub repos made " +"before the repo is linked to the GakuNin RDM will not be reflected in " +"GakuNin RDM logs.
                          ForkingForking a project or component does not copy Github " +"authorization unless the user forking the project is the same user who " +"authorized the Github add-on in the source project being forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:13 +msgid "" +"\n" +"\n" +"

                          GitLab Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a GitLab repo public or private. The GakuNin RDM " +"does not alter the permissions of linked GitLab repos.
                          View / download file versionsGitLab files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                          Add / update filesAdding/updating files in the project via GakuNin RDM " +"is not implemented yet.
                          Delete filesDeleting files via GakuNin RDM is not implemented " +"yet.
                          LogsGakuNin RDM does not keep track of changes made using" +" Gitlab directly.
                          ForkingForking a project or component does not copy GitLab " +"authorization unless the user forking the project is the same user who " +"authorized the GitLab add-on in the source project being forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:15 +msgid "" +"\n" +"\n" +"

                          Mendeley Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Mendeley folder public or private. The GakuNin " +"RDM does not alter the permissions of a linked Mendeley folder.
                          ForkingForking a project or component does not copy Mendeley" +" authorization unless the user forking the project is the same user who " +"authorized the Mendeley add-on in the source project being forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:17 +msgid "" +"\n" +"\n" +"

                          Zotero Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Zotero folder public or private. The GakuNin RDM " +"does not alter the permissions of a linked Zotero folder.
                          ForkingForking a project or component does not copy Zotero " +"authorization unless the user forking the project is the same user who " +"authorized the Zotero add-on in the source project being forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:19 +msgid "" +"\n" +"\n" +"

                          ownCloud Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking a GakuNin RDM project public or private is " +"independent of ownCloud privacy. The GakuNin RDM does not alter the " +"permissions of linked ownCloud folders.
                          View / download file versionsownCloud files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported by the ownCloud WebDAV " +"API.
                          Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in ownCloud.
                          Delete filesFiles deleted via GakuNin RDM will be deleted in " +"ownCloud.
                          LogsGakuNin RDM keeps track of changes you make to your " +"ownCloud content through GakuNin RDM, but not for changes made using " +"ownCloud directly.
                          ForkingForking a project or component does not copy ownCloud" +" authorization unless the user forking the project is the same user who " +"authorized the ownCloud add-on in the source project being forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:21 +msgid "" +"\n" +"\n" +"

                          OneDrive Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking a GakuNin RDM project public or private is " +"independent of OneDrive privacy. The GakuNin RDM does not alter the " +"permissions of linked OneDrive folders.
                          View / download file versionsOneDrive files and their versions can be " +"viewed/downloaded via GakuNin RDM. OneNote files are unexportable and " +"cannot be downloaded or viewed.
                          Add / update filesThe OneDrive add-on is read-only.
                          Delete filesThe OneDrive add-on is read-only.
                          LogsGakuNin RDM keeps track of changes you make to your " +"OneDrive add-on configuration. It does not track changes to OneDrive " +"content.
                          ForkingForking a project or component does not copy OneDrive" +" authorization unless the user forking the project is the same user who " +"authorized the OneDrive add-on in the source project being forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:23 +msgid "" +"\n" +"\n" +"

                          Amazon S3 Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an S3 bucket public or private. The GakuNin RDM " +"does not alter the permissions of linked S3 buckets.
                          View / download file versionsThe S3 add-on supports file versions if versioning is" +" enabled for your S3 buckets.
                          Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Amazon S3.
                          Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Amazon S3.
                          LogsThe GakuNin RDM keeps track of changes you make to " +"your S3 buckets through the GakuNin RDM, but not for changes made using " +"S3 directly.
                          ForkingForking a project or component does not copy S3 " +"authorization unless the user forking the project is the same user who " +"authorized the S3 add-on in the source project being forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:25 +msgid "" +"\n" +"\n" +"

                          Google Drive Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking a GakuNin RDM project public or private is " +"independent of Google Drive privacy. The GakuNin RDM does not alter the " +"permissions of linked Google Drive folders.
                          View / download file versionsGoogle Drive files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                          Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Google Drive.
                          Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Google Drive.
                          LogsThe GakuNin RDM keeps track of changes you make to " +"your Google Drive content through the GakuNin RDM, but not for changes " +"made using Google Drive directly.
                          ForkingForking a project or component does not copy Google " +"Drive authorization unless the user forking the project is the same user " +"who authorized the Google Drive add-on in the source project being " +"forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:27 +msgid "" +"\n" +"\n" +"

                          Bitbucket Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Bitbucket repo public or private. The GakuNin RDM" +" does not alter the permissions of linked Bitbucket repos.
                          View / download file versionsBitbucket files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                          Add / update filesBitbucket does not support adding or updating files " +"via their API.
                          Delete filesBitbucket does not support deleting files via their " +"API.
                          LogsGakuNin RDM keeps track of changes you make to your " +"Bitbucket content through GakuNin RDM, but not for changes made using " +"Bitbucket directly.
                          ForkingForking a project or component does not copy " +"Bitbucket authorization unless the user forking the project is the same " +"user who authorized the Bitbucket add-on in the source project being " +"forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:29 +msgid "" +"\n" +"\n" +"

                          Azure Blob Storage Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an Azure Blob Storage container public or " +"private.
                          View / download file versionsThe Azure Blob Storage add-on supports only Block " +"Blobs, and does not support file versions.
                          Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Azure Blob Storage.
                          Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Azure Blob Storage.
                          LogsThe GakuNin RDM keeps track of changes you make to " +"your Azure Blob Storage containers through the GakuNin RDM, but not for " +"changes made using Azure Blob Storage directly.
                          ForkingForking a project or component does not copy Azure " +"Blob Storage authorization unless the user forking the project is the " +"same user who authorized the Azure Blob Storage add-on in the source " +"project being forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:31 +msgid "" +"\n" +"\n" +"

                          Nextcloud Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking a GakuNin RDM project public or private is " +"independent of Nextcloud privacy. The GakuNin RDM does not alter the " +"permissions of linked Nextcloud folders.
                          View / download file versionsNextcloud files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported by the Nextcloud WebDAV " +"API.
                          Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Nextcloud.
                          Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Nextcloud.
                          LogsGakuNin RDM keeps track of changes you make to your " +"Nextcloud content through GakuNin RDM, but not for changes made using " +"Nextcloud directly.
                          ForkingForking a project or component does not copy " +"Nextcloud authorization unless the user forking the project is the same " +"user who authorized the Nextcloud add-on in the source project being " +"forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:33 +msgid "" +"\n" +"\n" +"

                          OpenStack Swift Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an Swift container public or private.
                          View / download file versionsThe Swift add-on does not support file versions.
                          Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Swift.
                          Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Swift.
                          LogsThe GakuNin RDM keeps track of changes you make to " +"your Swift containers through the GakuNin RDM, but not for changes made " +"using Swift directly.
                          ForkingForking a project or component does not copy Swift " +"authorization unless the user forking the project is the same user who " +"authorized the Swift add-on in the source project being forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:35 +msgid "" +"\n" +"\n" +"

                          S3 Compatible Storage Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an S3 Compatible Storage bucket public or private. " +"The GakuNin RDM does not alter the permissions of linked S3 Compatible " +"Storage buckets.
                          View / download file versionsThe S3 add-on supports file versions if versioning is" +" enabled for your S3 Compatible Storage buckets.
                          Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in S3 Compatible Storage.
                          Delete filesFiles deleted via GakuNin RDM will be deleted in S3 " +"Compatible Storage.
                          LogsThe GakuNin RDM keeps track of changes you make to " +"your S3 Compatible Storage buckets through the GakuNin RDM, but not for " +"changes made using S3 Compatible Storage directly.
                          ForkingForking a project or component does not copy S3 " +"Compatible Storage authorization unless the user forking the project is " +"the same user who authorized the S3 Compatible Storage add-on in the " +"source project being forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:37 +msgid "" +"\n" +"\n" +"

                          WEKO Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          Add / update filesAdding/updating indices/items in the project via " +"GakuNin RDM will be reflected in WEKO.
                          Delete filesItems deleted via GakuNin RDM will be deleted in " +"WEKO.
                          LogsThe GakuNin RDM keeps track of changes you make to " +"your WEKO index through the GakuNin RDM, but not for changes made using " +"WEKO directly.
                          ForkingForking a project or component does not copy WEKO " +"authorization unless the user forking the project is the same user who " +"authorized the WEKO add-on in the source project being forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:39 +msgid "" +"\n" +"\n" +"

                          JupyterHub Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsThe GakuNin RDM does not affect the permissions of " +"JupyterHub.
                          View / download file versionsThe JupyterHub add-on does not provide Storage " +"Features.
                          Add / update filesThe JupyterHub add-on does not provide Storage " +"Features.
                          Delete filesThe JupyterHub add-on does not provide Storage " +"Features.
                          LogsThe JupyterHub add-on does not provide Storage " +"Features.
                          ForkingForking a project or component copies information " +"about linked JupyterHub but the GakuNin RDM does not affect " +"authentication of JupyterHub.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:41 +msgid "" +"\n" +"\n" +"

                          IQB-RIMS Add-on Terms

                          \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                          FunctionStatus
                          PermissionsMaking an GakuNin RDM project public or private is " +"independent of Google Drive privacy. The GakuNin RDM does not alter the " +"permissions of linked Google Drive folders.
                          View / download file versionsIQB-RIMS files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                          Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Google Drive.
                          Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Google Drive.
                          LogsThe GakuNin RDM keeps track of changes you make to " +"your Google Drive content through the GakuNin RDM, but not for changes " +"made using Google Drive directly.
                          ForkingForking a project or component does not copy Google " +"Drive authorization unless the user forking the project is the same user " +"who authorized the IQB-RIMS add-on in the source project being " +"forked.
                          \n" +"\n" +"
                            \n" +"
                          • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                          • \n" +"
                          • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                          • \n" +"
                          \n" +msgstr "" + +#: website/static/js/accessRequestManager.js:85 +msgid "There was a problem trying to %1$s the request from the user. %2$s" +msgstr "" + +#: website/static/js/accessRequestManager.js:86 +#: website/static/js/accessRequestManager.js:87 +msgid "Could not %1$s access request" +msgstr "" + +#: website/static/js/accessRequestManager.js:115 +#: website/static/js/contribAdder.js:71 website/static/js/contribManager.js:211 +msgid "Read" +msgstr "" + +#: website/static/js/accessRequestManager.js:116 +#: website/static/js/contribAdder.js:72 website/static/js/contribManager.js:212 +msgid "Read + Write" +msgstr "" + +#: website/static/js/accessRequestManager.js:117 +#: website/static/js/contribAdder.js:73 website/static/js/contribManager.js:213 +msgid "Administrator" +msgstr "" + +#: website/static/js/accountClaimer.js:34 +msgid "Email will arrive shortly" +msgstr "" + +#: website/static/js/accountClaimer.js:34 +msgid "Please check " +msgstr "" + +#: website/static/js/accountClaimer.js:41 +msgid "Claim as %1$s?" +msgstr "" + +#: website/static/js/accountClaimer.js:42 +msgid "If you claim this account, a contributor of this project " +msgstr "" + +#: website/static/js/accountClaimer.js:43 +msgid "will be emailed to confirm your identity." +msgstr "" + +#: website/static/js/accountClaimer.js:61 +msgid "Claim" +msgstr "" + +#: website/static/js/accountClaimer.js:73 +msgid "Is this you? Click to claim" +msgstr "" + +#: website/static/js/accountClaimer.js:99 +msgid "Claim Account" +msgstr "" + +#: website/static/js/accountClaimer.js:101 +msgid "Enter email..." +msgstr "" + +#: website/static/js/accountClaimer.js:105 +msgid "Not a valid email." +msgstr "" + +#: website/static/js/accountSettings.js:83 +msgid "Could not fetch user profile." +msgstr "" + +#: website/static/js/accountSettings.js:84 +#: website/static/js/accountSettings.js:115 +#: website/static/js/licensePicker.js:197 +msgid "Error fetching user profile" +msgstr "" + +#: website/static/js/accountSettings.js:112 +msgid "" +"User profile not updated. Please refresh the page and try again or " +"contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/accountSettings.js:199 +msgid "Duplicate Email" +msgstr "" + +#: website/static/js/accountSettings.js:220 +msgid "Confirmation email sent" +msgstr "" + +#: website/static/js/accountSettings.js:221 +msgid "%1$s was added to your account." +msgstr "" + +#: website/static/js/accountSettings.js:222 +msgid " You will receive a confirmation email at %1$s." +msgstr "" + +#: website/static/js/accountSettings.js:223 +msgid "" +" Please click the link in your email to confirm this action. You will be " +"required to enter your password." +msgstr "" + +#: website/static/js/accountSettings.js:226 website/static/js/fangorn.js:2258 +#: website/static/js/folderPickerNodeConfig.js:591 +#: website/static/js/pages/profile-settings-addons-page.js:72 +#: website/static/js/pages/project-settings-page.js:118 +msgid "Close" +msgstr "" + +#: website/static/js/accountSettings.js:236 +msgid "Email cannot be empty." +msgstr "" + +#: website/static/js/accountSettings.js:244 +msgid "Resend Email Confirmation?" +msgstr "" + +#: website/static/js/accountSettings.js:245 +msgid "Are you sure that you want to resend email confirmation to %1$s?" +msgstr "" + +#: website/static/js/accountSettings.js:250 +msgid "Email confirmation resent to %1$s" +msgstr "" + +#: website/static/js/accountSettings.js:251 +msgid "You will receive a new confirmation email at %1$s." +msgstr "" + +#: website/static/js/accountSettings.js:252 +msgid "" +" Please log out of this account and check your email to confirm this " +"action." +msgstr "" + +#: website/static/js/accountSettings.js:259 +msgid "Resend" +msgstr "" + +#: website/static/js/accountSettings.js:270 +msgid "Remove Email?" +msgstr "" + +#: website/static/js/accountSettings.js:271 +msgid "Are you sure that you want to remove %1$s from your email list?" +msgstr "" + +#: website/static/js/accountSettings.js:282 +#: website/static/js/accountSettings.js:347 +#: website/static/js/addonPermissions.js:51 +#: website/static/js/addonSettings.js:67 +#: website/static/js/pages/profile-settings-addons-page.js:97 +#: website/static/js/privateLinkTable.js:115 website/static/js/profile.js:739 +#: website/static/js/profile.js:971 website/static/js/project.js:249 +msgid "Remove" +msgstr "" + +#: website/static/js/accountSettings.js:291 +#: website/static/js/accountSettings.js:304 +msgid "Please refresh the page and try again." +msgstr "" + +#: website/static/js/accountSettings.js:317 +msgid "You have revoked this connected identity." +msgstr "" + +#: website/static/js/accountSettings.js:322 +msgid "Revocation request failed. Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/accountSettings.js:325 +msgid "Error revoking connected identity" +msgstr "" + +#: website/static/js/accountSettings.js:338 +msgid "Remove authorization?" +msgstr "" + +#: website/static/js/accountSettings.js:339 +msgid "Are you sure you want to remove this authorization?" +msgstr "" + +#: website/static/js/accountSettings.js:383 +msgid "" +"You have successfully changed your default storage location to " +"%1$s." +msgstr "" + +#: website/static/js/accountSettings.js:387 +msgid "" +"Your attempt to change your default storage location has failed. Please " +"contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/accountSettings.js:390 +msgid "Error updating default storage location " +msgstr "" + +#: website/static/js/accountSettings.js:413 +msgid "" +"An GakuNin RDM administrator will contact you shortly to confirm your " +"deactivation request." +msgstr "" + +#: website/static/js/accountSettings.js:421 +msgid "Deactivation request failed. Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/accountSettings.js:425 +#: website/static/js/accountSettings.js:450 +msgid "Error requesting account deactivation" +msgstr "" + +#: website/static/js/accountSettings.js:438 +msgid "An GakuNin RDM account is no longer up for review." +msgstr "" + +#: website/static/js/accountSettings.js:446 +msgid "" +"Deactivation request failed. Please contact
                          rdm_support@nii.ac.jp if the problem " +"persists." +msgstr "" + +#: website/static/js/accountSettings.js:463 +msgid "Request account deactivation?" +msgstr "" + +#: website/static/js/accountSettings.js:464 +msgid "" +"Are you sure you want to request account deactivation? A GakuNinRDM " +"administrator will review your request. If accepted, you " +msgstr "" + +#: website/static/js/accountSettings.js:465 +msgid "will NOT be able to reactivate your account." +msgstr "" + +#: website/static/js/accountSettings.js:473 +#: website/static/js/accountSettings.js:546 +msgid "Request" +msgstr "" + +#: website/static/js/accountSettings.js:485 +msgid "Cancel deactivation request?" +msgstr "" + +#: website/static/js/accountSettings.js:486 +msgid "" +"Are you sure you want to rescind your account deactivation request? This " +"will preserve your account status." +msgstr "" + +#: website/static/js/accountSettings.js:494 +msgid "Cancel Deactivation Request" +msgstr "" + +#: website/static/js/accountSettings.js:512 +msgid "" +"An GakuNin RDM administrator will contact you shortly to confirm your " +"export request." +msgstr "" + +#: website/static/js/accountSettings.js:520 +msgid "Export request failed. Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/accountSettings.js:524 +msgid "Error requesting account export" +msgstr "" + +#: website/static/js/accountSettings.js:537 +msgid "Request account export?" +msgstr "" + +#: website/static/js/accountSettings.js:538 +msgid "Are you sure you want to request account export?" +msgstr "" + +#: website/static/js/addProjectPlugin.js:21 +#: website/static/js/addProjectPlugin.js:24 +#: website/static/js/myProjects.js:1118 +msgid "Create new project" +msgstr "" + +#: website/static/js/addProjectPlugin.js:57 +msgid "There was an unknown error. Please try again later." +msgstr "" + +#: website/static/js/addProjectPlugin.js:184 website/static/js/conference.js:19 +msgid "Title" +msgstr "" + +#: website/static/js/addProjectPlugin.js:198 +msgid "Enter %1$s title" +msgstr "" + +#: website/static/js/addProjectPlugin.js:203 +msgid "Affiliation" +msgstr "" + +#: website/static/js/addProjectPlugin.js:210 +msgid "Remove all" +msgstr "" + +#: website/static/js/addProjectPlugin.js:217 +msgid "Select all" +msgstr "" + +#: website/static/js/addProjectPlugin.js:233 +msgid "Storage location" +msgstr "" + +#: website/static/js/addProjectPlugin.js:251 +msgid " Add contributors from " +msgstr "" + +#: website/static/js/addProjectPlugin.js:253 +msgid " Admins of " +msgstr "" + +#: website/static/js/addProjectPlugin.js:253 +msgid " will have read access to this component." +msgstr "" + +#: website/static/js/addProjectPlugin.js:264 +msgid " Add tags from " +msgstr "" + +#: website/static/js/addProjectPlugin.js:268 +msgid "License" +msgstr "" + +#: website/static/js/addProjectPlugin.js:270 +msgid " This component will inherit the same license as " +msgstr "" + +#: website/static/js/addProjectPlugin.js:273 +msgid "Learn more." +msgstr "" + +#: website/static/js/addProjectPlugin.js:282 +msgid " More" +msgstr "" + +#: website/static/js/addProjectPlugin.js:286 +msgid "Description" +msgstr "" + +#: website/static/js/addProjectPlugin.js:295 +msgid "Enter %1$s description" +msgstr "" + +#: website/static/js/addProjectPlugin.js:299 website/static/js/conference.js:31 +msgid "Category" +msgstr "" + +#: website/static/js/addProjectPlugin.js:300 +msgid " (for descriptive purposes)" +msgstr "" + +#: website/static/js/addProjectPlugin.js:307 +msgid "Uncategorized" +msgstr "" + +#: website/static/js/addProjectPlugin.js:320 +msgid "(Empty category)" +msgstr "" + +#: website/static/js/addProjectPlugin.js:330 +msgid "Template (optional)" +msgstr "" + +#: website/static/js/addProjectPlugin.js:331 +msgid "" +"Start typing to search your projects. Selecting project as template will " +"duplicate its " +msgstr "" + +#: website/static/js/addProjectPlugin.js:332 +msgid "" +"structure in the new project without importing the content of that " +"project." +msgstr "" + +#: website/static/js/addProjectPlugin.js:351 +#: website/static/js/nodeControl.js:224 +#: website/static/js/privateLinkManager.js:31 website/static/js/project.js:140 +msgid "Create" +msgstr "" + +#: website/static/js/addProjectPlugin.js:362 +#, python-format +msgid "Saving your %s..." +msgstr "" + +#: website/static/js/addProjectPlugin.js:376 +msgid "New %1$s created successfully!" +msgstr "" + +#: website/static/js/addProjectPlugin.js:386 +#: website/static/js/addProjectPlugin.js:434 website/static/js/project.js:62 +msgid "Keep working here" +msgstr "" + +#: website/static/js/addProjectPlugin.js:392 +#: website/static/js/addProjectPlugin.js:437 +msgid "Go to new %1$s" +msgstr "" + +#: website/static/js/addProjectPlugin.js:405 +msgid "Couldn't create your %1$s" +msgstr "" + +#: website/static/js/addProjectPlugin.js:424 +msgid "Could not add institution affiliation to your new %1$s" +msgstr "" + +#: website/static/js/addProjectPlugin.js:471 +msgid "Select a project to use as a template" +msgstr "" + +#: website/static/js/addonHelper.js:37 +#: website/static/js/nodeSelectTreebeard.js:59 +#: website/static/js/notificationsTreebeard.js:59 +#: website/static/js/profile.js:311 +#: website/static/js/wikiSettingsTreebeard.js:54 +msgid "Settings updated" +msgstr "" + +#: website/static/js/addonHelper.js:46 +msgid "Settings not updated." +msgstr "" + +#: website/static/js/addonNodeConfig.js:39 +#: website/static/js/oauthAddonNodeConfig.js:47 +msgid "Successfully linked \"%1$s\"" +msgstr "" + +#: website/static/js/addonNodeConfig.js:40 +#: website/static/js/oauthAddonNodeConfig.js:48 +msgid " Go to the Files page to view your content." +msgstr "" + +#: website/static/js/addonPermissions.js:21 +#: website/static/js/addonSettings.js:58 +msgid "Remove addon?" +msgstr "" + +#: website/static/js/addonPermissions.js:22 +msgid "Are you sure you want to disconnnect the %1$s account from this project?" +msgstr "" + +#: website/static/js/addonPermissions.js:43 +msgid "An error occurred, the account is still connected to the project. " +msgstr "" + +#: website/static/js/addonPermissions.js:44 +msgid "If the issue persists, please report it to %1$s." +msgstr "" + +#: website/static/js/addonSettings.js:46 +msgid "Error deauthorizing node: " +msgstr "" + +#: website/static/js/addonSettings.js:59 +msgid "Are you sure you want to remove the %1$s authorization from this project?" +msgstr "" + +#: website/static/js/addonSettings.js:100 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of dropbox.com before attempting to connect to a second Dropbox " +"account on the GakuNin RDM. This will clear the credentials stored in " +"your browser." +msgstr "" + +#: website/static/js/addonSettings.js:102 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of bitbucket.org before attempting to connect to a second " +"Bitbucket account on the GakuNin RDM. This will clear the credentials " +"stored in your browser." +msgstr "" + +#: website/static/js/addonSettings.js:104 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of onedrive.live.com before attempting to connect to a second " +"OneDrive account on the GakuNin RDM. This will clear the credentials " +"stored in your browser." +msgstr "" + +#: website/static/js/addonSettings.js:106 +msgid "" +"Add-on successfully authorized. To link this add-on to an GakuNin RDM " +"project, go to the settings page of the project, enable %1$s, and choose " +"content to connect." +msgstr "" + +#: website/static/js/addonSettings.js:109 +msgid "" +"Error while authorizing add-on. Please log in to your %1$s account and " +"grant access to the GakuNin RDM to enable this add-on." +msgstr "" + +#: website/static/js/addonSettings.js:120 +msgid "" +"Are you sure you want to disconnect the %1$s account " +"%2$s? This will revoke access to %1$s for all projects " +"you have authorized." +msgstr "" + +#: website/static/js/alertsManager.js:42 +msgid "Could not dismiss alert. Please refresh page and try again." +msgstr "" + +#: website/static/js/alertsManager.js:43 website/static/js/alertsManager.js:77 +msgid "Error fetching user alerts" +msgstr "" + +#: website/static/js/alertsManager.js:76 +msgid "Could not fetch alerts for this page. Please refresh page and try again." +msgstr "" + +#: website/static/js/apiApplication.js:215 +msgid "Error fetching list of registered applications" +msgstr "" + +#: website/static/js/apiApplication.js:226 +#: website/static/js/apiApplication.js:396 +msgid "Deactivate application?" +msgstr "" + +#: website/static/js/apiApplication.js:234 +#: website/static/js/apiPersonalToken.js:213 +msgid " has been deactivated" +msgstr "" + +#: website/static/js/apiApplication.js:245 +#: website/static/js/apiApplication.js:416 +#: website/static/js/apiPersonalToken.js:224 +#: website/static/js/apiPersonalToken.js:395 +msgid "Deactivate" +msgstr "" + +#: website/static/js/apiApplication.js:295 +#: website/static/js/apiPersonalToken.js:274 +msgid "There are unsaved changes on this page." +msgstr "" + +#: website/static/js/apiApplication.js:309 +msgid "Error fetching application data" +msgstr "" + +#: website/static/js/apiApplication.js:344 +#: website/static/js/apiPersonalToken.js:323 +msgid "Error updating instance" +msgstr "" + +#: website/static/js/apiApplication.js:370 +msgid "Error registering new OAuth2 application" +msgstr "" + +#: website/static/js/apiApplication.js:429 +msgid "Reset client secret?" +msgstr "" + +#: website/static/js/apiApplication.js:447 +msgid "Error resetting instance secret" +msgstr "" + +#: website/static/js/apiApplication.js:459 +msgid "Reset Secret" +msgstr "" + +#: website/static/js/apiApplication.js:473 +#: website/static/js/apiPersonalToken.js:412 website/static/js/profile.js:357 +msgid "Discard changes?" +msgstr "" + +#: website/static/js/apiApplication.js:483 +#: website/static/js/apiPersonalToken.js:422 website/static/js/profile.js:369 +msgid "Discard" +msgstr "" + +#: website/static/js/apiPersonalToken.js:194 +msgid "Error fetching list of registered personal access tokens" +msgstr "" + +#: website/static/js/apiPersonalToken.js:205 +msgid "Deactivate personal access token?" +msgstr "" + +#: website/static/js/apiPersonalToken.js:288 +msgid "Error fetching token data" +msgstr "" + +#: website/static/js/apiPersonalToken.js:349 +msgid "Error registering new OAuth2 personal access token" +msgstr "" + +#: website/static/js/apiPersonalToken.js:375 +msgid "Deactivate token?" +msgstr "" + +#: website/static/js/citationGrid.js:180 +msgid "Copy citation" +msgstr "" + +#: website/static/js/citationGrid.js:190 +msgid "View original document" +msgstr "" + +#: website/static/js/citationGrid.js:202 website/static/js/fangorn.js:2041 +msgid "View on %1$s" +msgstr "" + +#: website/static/js/citationGrid.js:213 +msgid "Download citations" +msgstr "" + +#: website/static/js/citationGrid.js:242 +msgid "Citation" +msgstr "" + +#: website/static/js/citationGrid.js:246 +msgid "Actions" +msgstr "" + +#: website/static/js/citationGrid.js:294 +msgid "Only 200 citations may be displayed" +msgstr "" + +#: website/static/js/citationGrid.js:311 website/static/js/citationWidget.js:44 +msgid "Enter citation style (e.g. \"APA\")" +msgstr "" + +#: website/static/js/citationGrid.js:333 +msgid "Error while selecting citation style: " +msgstr "" + +#: website/static/js/citationGrid.js:412 +msgid "" +"Could not render entry. Please check the contents of your citations " +"for correctness." +msgstr "" + +#: website/static/js/citationList.js:113 +msgid "Your custom citation not updated. Please refresh the page and try " +msgstr "" + +#: website/static/js/citationList.js:114 +msgid "again or contact %1$s" +msgstr "" + +#: website/static/js/citationList.js:114 +#: website/static/js/components/publicNodes.js:192 +#: website/static/js/components/quickFiles.js:123 +#: website/static/js/osfHelpers.js:311 +msgid " if the problem persists." +msgstr "" + +#: website/static/js/citationWidget.js:46 +#: website/static/js/pages/project-dashboard-page.js:170 +#, python-format +msgid "Please enter %s or more characters" +msgstr "" + +#: website/static/js/citationWidget.js:47 website/static/js/pointers.js:30 +msgid "Searching..." +msgstr "" + +#: website/static/js/citationWidget.js:48 +msgid "No matches found." +msgstr "" + +#: website/static/js/citationWidget.js:77 +msgid "Citation render failed" +msgstr "" + +#: website/static/js/citationWidget.js:78 +msgid "The requested citation format generated an error." +msgstr "" + +#: website/static/js/citationWidget.js:81 +msgid "Unexpected error when fetching citation" +msgstr "" + +#: website/static/js/citationsNodeConfig.js:38 +#: website/static/js/citationsNodeConfig.js:42 +msgid "Successfully linked \"%1$s\"." +msgstr "" + +#: website/static/js/citationsNodeConfig.js:38 +msgid " Go to the Overview page to view your citations." +msgstr "" + +#: website/static/js/citationsNodeConfig.js:42 +msgid " Next, choose which folder to link above." +msgstr "" + +#: website/static/js/citationsNodeConfig.js:81 +#: website/static/js/oauthAddonNodeConfig.js:209 +msgid "Could not GET %1$s accounts for user" +msgstr "" + +#: website/static/js/citationsNodeConfig.js:147 +msgid "Choose %1$s Access Token to Import" +msgstr "" + +#: website/static/js/citationsNodeConfig.js:166 +#: website/static/js/citationsNodeConfig.js:184 +#: website/static/js/folderPickerNodeConfig.js:507 +#: website/static/js/oauthAddonNodeConfig.js:153 +#: website/static/js/oauthAddonNodeConfig.js:171 +msgid "Import" +msgstr "" + +#: website/static/js/citationsNodeConfig.js:175 +msgid "Import %1$s access token" +msgstr "" + +#: website/static/js/clipboard.js:27 +msgid "Copied!" +msgstr "" + +#: website/static/js/clipboard.js:32 +msgid "Copy failed!" +msgstr "" + +#: website/static/js/comment.js:55 +msgid "Error getting contributors and group members" +msgstr "" + +#: website/static/js/comment.js:73 +msgid "Spam or advertising" +msgstr "" + +#: website/static/js/comment.js:74 +msgid "Hate speech" +msgstr "" + +#: website/static/js/comment.js:75 +msgid "Violence or harmful behavior" +msgstr "" + +#: website/static/js/comment.js:212 +msgid "Commenting" +msgstr "" + +#: website/static/js/comment.js:212 +msgid "Comment" +msgstr "" + +#: website/static/js/comment.js:232 +msgid "Exceeds character limit. Please reduce to %1$s characters or less." +msgstr "" + +#: website/static/js/comment.js:347 website/static/js/comment.js:555 +msgid "Please enter a comment" +msgstr "" + +#: website/static/js/comment.js:393 website/static/js/comment.js:588 +msgid "Could not submit comment" +msgstr "" + +#: website/static/js/comment.js:394 +msgid "Error creating comment" +msgstr "" + +#: website/static/js/comment.js:589 +msgid "Error editing comment" +msgstr "" + +#: website/static/js/comment.js:634 +msgid "Could not report abuse." +msgstr "" + +#: website/static/js/comment.js:635 +msgid "Error reporting abuse" +msgstr "" + +#: website/static/js/comment.js:664 +msgid "Error deleting comment" +msgstr "" + +#: website/static/js/comment.js:702 +msgid "Error undeleting comment" +msgstr "" + +#: website/static/js/comment.js:727 +msgid "Error unreporting comment" +msgstr "" + +#: website/static/js/comment.js:807 +msgid "Your comments have unsaved changes. Are you sure " +msgstr "" + +#: website/static/js/comment.js:808 +msgid "you want to leave this page?" +msgstr "" + +#: website/static/js/comment.js:826 +msgid "Could not update comment timestamp" +msgstr "" + +#: website/static/js/commentpane.js:31 +msgid "Option `toggleWidth` must be greater than or equal to " +msgstr "" + +#: website/static/js/commentpane.js:32 +msgid "option `maxWidthProp`." +msgstr "" + +#: website/static/js/conference.js:25 +msgid "Author" +msgstr "" + +#: website/static/js/conference.js:37 +msgid "Date Created" +msgstr "" + +#: website/static/js/conference.js:43 website/static/js/fangorn.js:1683 +msgid "Downloads" +msgstr "" + +#: website/static/js/contribAdder.js:26 +msgid " project in common" +msgstr "" + +#: website/static/js/contribAdder.js:28 +msgid "Yourself" +msgstr "" + +#: website/static/js/contribAdder.js:30 +msgid " projects in common" +msgstr "" + +#: website/static/js/contribAdder.js:82 +msgid "Add Contributors" +msgstr "" + +#: website/static/js/contribAdder.js:83 +msgid "Select Components" +msgstr "" + +#: website/static/js/contribAdder.js:85 +msgid "Invite new contributor by e-mail" +msgstr "" + +#: website/static/js/contribAdder.js:86 +msgid "Add Unregistered Contributor" +msgstr "" + +#: website/static/js/contribAdder.js:331 +msgid "Full Name is required." +msgstr "" + +#: website/static/js/contribAdder.js:334 +msgid "Not a valid email address." +msgstr "" + +#: website/static/js/contribAdder.js:341 +msgid "%1$s is already in queue." +msgstr "" + +#: website/static/js/contribAdder.js:460 +msgid "There was a problem trying to add contributors%1$s." +msgstr "" + +#: website/static/js/contribAdder.js:461 +msgid "Could not add contributors" +msgstr "" + +#: website/static/js/contribAdder.js:462 +#: website/static/js/contribManager.js:139 +msgid "Error adding contributors" +msgstr "" + +#: website/static/js/contribAdder.js:532 +#: website/static/js/institutionProjectSettings.js:254 +#: website/static/js/nodesDelete.js:194 website/static/js/nodesPrivacy.js:207 +msgid "Unable to retrieve project settings" +msgstr "" + +#: website/static/js/contribAdder.js:533 +#: website/static/js/institutionProjectSettings.js:255 +#: website/static/js/nodesDelete.js:195 website/static/js/nodesPrivacy.js:208 +msgid "Could not GET project settings." +msgstr "" + +#: website/static/js/contribManager.js:137 +msgid "There was a problem trying to add the contributor. " +msgstr "" + +#: website/static/js/contribManager.js:138 +msgid "Could not add contributor" +msgstr "" + +#: website/static/js/contribManager.js:300 +msgid "Must have at least one registered admin contributor" +msgstr "" + +#: website/static/js/contribManager.js:308 +msgid "Must have at least one bibliographic contributor" +msgstr "" + +#: website/static/js/contribManager.js:364 +msgid "Your contributor list has unsaved changes. Please " +msgstr "" + +#: website/static/js/contribManager.js:365 +msgid "save or cancel your changes before adding " +msgstr "" + +#: website/static/js/contribManager.js:366 +msgid "contributors." +msgstr "" + +#: website/static/js/contribManager.js:375 +msgid "There are unsaved changes to your contributor settings" +msgstr "" + +#: website/static/js/contribManager.js:404 +msgid "Save changes?" +msgstr "" + +#: website/static/js/contribManager.js:405 +msgid "Are you sure you want to save these changes?" +msgstr "" + +#: website/static/js/contribManager.js:421 +msgid "Submission failed: " +msgstr "" + +#: website/static/js/contribManager.js:429 +#: website/static/js/filepage/editor.js:180 +msgid "Save" +msgstr "" + +#: website/static/js/contribRemover.js:56 +#: website/static/js/contribRemover.js:57 +#: website/static/js/contribRemover.js:58 +msgid "Remove Contributor" +msgstr "" + +#: website/static/js/contribRemover.js:208 +#: website/static/js/contribRemover.js:209 +msgid "Unable to retrieve projects and components" +msgstr "" + +#: website/static/js/contribRemover.js:232 +msgid "Unable to delete Contributor" +msgstr "" + +#: website/static/js/contribRemover.js:233 +msgid "Could not DELETE Contributor." +msgstr "" + +#: website/static/js/fangorn.js:38 +msgid "Upload pending..." +msgstr "" + +#: website/static/js/fangorn.js:41 +msgid "Copying " +msgstr "" + +#: website/static/js/fangorn.js:44 +msgid "Deleting " +msgstr "" + +#: website/static/js/fangorn.js:47 +msgid "Moving " +msgstr "" + +#: website/static/js/fangorn.js:50 +msgid "Renaming " +msgstr "" + +#: website/static/js/fangorn.js:448 +msgid "Not allowed: Private folder" +msgstr "" + +#: website/static/js/fangorn.js:492 website/static/js/fangorn.js:522 +msgid "You cannot replace the Wiki images folder" +msgstr "" + +#: website/static/js/fangorn.js:497 website/static/js/fangorn.js:530 +msgid "An item named \"%1$s\" already exists in this location." +msgstr "" + +#: website/static/js/fangorn.js:499 website/static/js/fangorn.js:508 +#: website/static/js/fangorn.js:532 +msgid "Keep Both" +msgstr "" + +#: website/static/js/fangorn.js:499 website/static/js/fangorn.js:532 +msgid " will retain both files (and their version histories) in this location." +msgstr "" + +#: website/static/js/fangorn.js:501 website/static/js/fangorn.js:509 +#: website/static/js/fangorn.js:534 +msgid "Replace" +msgstr "" + +#: website/static/js/fangorn.js:501 website/static/js/fangorn.js:534 +msgid " will overwrite the existing file in this location. " +msgstr "" + +#: website/static/js/fangorn.js:502 website/static/js/fangorn.js:535 +msgid "You will lose previous versions of the overwritten file. " +msgstr "" + +#: website/static/js/fangorn.js:503 website/static/js/fangorn.js:536 +msgid "You will keep previous versions of the moved file." +msgstr "" + +#: website/static/js/fangorn.js:504 +msgid "\"Skip\" will skip the current file." +msgstr "" + +#: website/static/js/fangorn.js:505 +msgid "\"Stop\" will only move files with no conflicts." +msgstr "" + +#: website/static/js/fangorn.js:510 +msgid "Skip" +msgstr "" + +#: website/static/js/fangorn.js:511 +msgid "Stop" +msgstr "" + +#: website/static/js/fangorn.js:513 +#, python-format +msgid "Replace \"%s\"?" +msgstr "" + +#: website/static/js/fangorn.js:537 +msgid " will cancel the move." +msgstr "" + +#: website/static/js/fangorn.js:546 +msgid "Replace \"%1$s\"?" +msgstr "" + +#: website/static/js/fangorn.js:576 +msgid "%1$s conflicts left to resolve." +msgid_plural "%1$s conflict left to resolve." +msgstr[0] "" +msgstr[1] "" + +#: website/static/js/fangorn.js:655 +msgid "%1$s \"%2$s\" to \"%3$s\" is taking a bit longer than expected." +msgstr "" + +#: website/static/js/fangorn.js:656 +msgid "We'll send you an email when it has finished." +msgstr "" + +#: website/static/js/fangorn.js:657 +msgid "" +"In the mean time you can leave this page; your %1$s will still be " +"completed." +msgstr "" + +#: website/static/js/fangorn.js:662 +msgid "Operation Information" +msgstr "" + +#: website/static/js/fangorn.js:668 +msgid "Successfully %1$s." +msgstr "" + +#: website/static/js/fangorn.js:715 +msgid "Please refresh the page or contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/fangorn.js:720 +msgid "Failed to move or copy file" +msgstr "" + +#: website/static/js/fangorn.js:998 +msgid "Could not upload file. The file may be invalid " +msgstr "" + +#: website/static/js/fangorn.js:999 +msgid "or the file folder has been deleted." +msgstr "" + +#: website/static/js/fangorn.js:1007 website/static/js/fangorn.js:1012 +msgid "Cannot upload folders." +msgstr "" + +#: website/static/js/fangorn.js:1014 +msgid "Cannot upload file due to insufficient storage." +msgstr "" + +#: website/static/js/fangorn.js:1019 +msgid "Could not upload file. Possible reasons:
                          " +msgstr "" + +#: website/static/js/fangorn.js:1020 +msgid "1. Cannot upload folders.
                          2. " +msgstr "" + +#: website/static/js/fangorn.js:1022 +msgid "Unable to reach the provider, please try again later. " +msgstr "" + +#: website/static/js/fangorn.js:1023 +msgid "If the problem persists, please contact %1$s." +msgstr "" + +#: website/static/js/fangorn.js:1111 +msgid "Please enter a folder name." +msgstr "" + +#: website/static/js/fangorn.js:1115 +msgid "Folder name contains illegal characters." +msgstr "" + +#: website/static/js/fangorn.js:1138 +msgid "New folder created!" +msgstr "" + +#: website/static/js/fangorn.js:1147 +msgid "Folder creation failed." +msgstr "" + +#: website/static/js/fangorn.js:1165 +msgid " Deleting..." +msgstr "" + +#: website/static/js/fangorn.js:1187 +msgid "Delete failed." +msgstr "" + +#: website/static/js/fangorn.js:1202 +msgid "" +"This folder and all of its contents will be deleted. This folder is " +"linked to " +msgstr "" + +#: website/static/js/fangorn.js:1203 +msgid "your wiki(s). Deleting it will remove images embedded in your wiki(s). " +msgstr "" + +#: website/static/js/fangorn.js:1204 website/static/js/fangorn.js:1232 +#: website/static/js/fangorn.js:1255 website/static/js/pages/base-page.js:132 +msgid "This action is irreversible." +msgstr "" + +#: website/static/js/fangorn.js:1207 +msgid "" +"This folder and ALL its contents will be deleted. This action is " +"irreversible." +msgstr "" + +#: website/static/js/fangorn.js:1213 website/static/js/fangorn.js:1236 +#: website/static/js/fangorn.js:1996 website/static/js/fangorn.js:2032 +#: website/static/js/filepage/index.js:209 +#: website/static/js/filepage/index.js:522 website/static/js/myProjects.js:1637 +msgid "Delete" +msgstr "" + +#: website/static/js/fangorn.js:1215 website/static/js/fangorn.js:1240 +msgid "Delete \"%1$s\"?" +msgstr "" + +#: website/static/js/fangorn.js:1217 +msgid "You don't have permission to delete this file." +msgstr "" + +#: website/static/js/fangorn.js:1225 +msgid "This file may be linked to your wiki(s). Deleting it will remove the" +msgstr "" + +#: website/static/js/fangorn.js:1226 +msgid " image embedded in your wiki(s). " +msgstr "" + +#: website/static/js/fangorn.js:1266 +msgid "" +"Some of the selected items are folders. This will delete the folder(s) " +"and ALL of their content." +msgstr "" + +#: website/static/js/fangorn.js:1280 +msgid " may be linked to" +msgstr "" + +#: website/static/js/fangorn.js:1281 +msgid " your wiki(s). Deleting them will remove images embedded in your wiki(s). " +msgstr "" + +#: website/static/js/fangorn.js:1289 +msgid "Delete All" +msgstr "" + +#: website/static/js/fangorn.js:1293 +msgid "" +"Some of these files can't be deleted but you can delete the ones " +"highlighted with green. This action is irreversible." +msgstr "" + +#: website/static/js/fangorn.js:1308 +msgid "Delete Some" +msgstr "" + +#: website/static/js/fangorn.js:1311 +msgid "Delete multiple files?" +msgstr "" + +#: website/static/js/fangorn.js:1337 +msgid "" +"Unable to check out file. This is most likely due to the file being " +"already checked-out" +msgstr "" + +#: website/static/js/fangorn.js:1338 +msgid " by another user." +msgstr "" + +#: website/static/js/fangorn.js:1670 website/static/js/fileViewTreebeard.js:63 +#: website/static/js/filesWidget.js:34 website/static/js/meetings.js:18 +#: website/static/js/pages/project-dashboard-page.js:549 +#: website/static/js/project-organizer.js:192 +#: website/static/js/project-organizer.js:208 website/static/js/wikiMenu.js:58 +msgid "Name" +msgstr "" + +#: website/static/js/fangorn.js:1675 +msgid "Size" +msgstr "" + +#: website/static/js/fangorn.js:1679 +msgid "Version" +msgstr "" + +#: website/static/js/fangorn.js:1687 +#: website/static/js/pages/project-dashboard-page.js:555 +#: website/static/js/project-organizer.js:201 +msgid "Modified" +msgstr "" + +#: website/static/js/fangorn.js:1761 +msgid "Unable to retrieve components." +msgstr "" + +#: website/static/js/fangorn.js:1763 +msgid "Unable to retrieve components for node %1$s" +msgstr "" + +#: website/static/js/fangorn.js:1845 +msgid "You cannot rename your Wiki images folder." +msgstr "" + +#: website/static/js/fangorn.js:1953 +msgid "Upload" +msgstr "" + +#: website/static/js/fangorn.js:1960 +msgid "Create Folder" +msgstr "" + +#: website/static/js/fangorn.js:1967 +msgid "Delete Folder" +msgstr "" + +#: website/static/js/fangorn.js:1976 website/static/js/filepage/index.js:525 +#: website/static/js/filepage/revisions.js:111 +msgid "Download" +msgstr "" + +#: website/static/js/fangorn.js:1986 website/static/js/filepage/index.js:547 +msgid "View" +msgstr "" + +#: website/static/js/fangorn.js:2002 website/static/js/filepage/index.js:221 +msgid "This would mean " +msgstr "" + +#: website/static/js/fangorn.js:2003 website/static/js/filepage/index.js:222 +msgid "" +"other contributors cannot edit, delete or upload new versions of this " +"file " +msgstr "" + +#: website/static/js/fangorn.js:2004 +msgid "as long as it is checked-out. You can check it back in at anytime." +msgstr "" + +#: website/static/js/fangorn.js:2009 website/static/js/fangorn.js:2014 +#: website/static/js/filepage/index.js:248 +msgid "Check out file" +msgstr "" + +#: website/static/js/fangorn.js:2010 +msgid "Confirm file check-out?" +msgstr "" + +#: website/static/js/fangorn.js:2023 +msgid "Check in file" +msgstr "" + +#: website/static/js/fangorn.js:2051 +msgid "Download as zip" +msgstr "" + +#: website/static/js/fangorn.js:2062 website/static/js/myProjects.js:1613 +msgid "Rename" +msgstr "" + +#: website/static/js/fangorn.js:2144 +msgid "New folder name" +msgstr "" + +#: website/static/js/fangorn.js:2172 +msgid "Enter name" +msgstr "" + +#: website/static/js/fangorn.js:2209 +msgid "Cancel Pending Uploads" +msgstr "" + +#: website/static/js/fangorn.js:2233 +msgid "Delete Multiple" +msgstr "" + +#: website/static/js/fangorn.js:2244 website/static/js/fangorn.js:2955 +msgid "Filter" +msgstr "" + +#: website/static/js/fangorn.js:2249 +msgid "Select rows:" +msgstr "" + +#: website/static/js/fangorn.js:2249 +msgid "" +" Click on a row (outside the add-on, file, or folder name) to show " +"further actions in the toolbar. Use Command or Shift keys to select " +"multiple files." +msgstr "" + +#: website/static/js/fangorn.js:2250 +msgid "Open files:" +msgstr "" + +#: website/static/js/fangorn.js:2250 +msgid " Click a file name to go to view the file in the GakuNin RDM." +msgstr "" + +#: website/static/js/fangorn.js:2251 +msgid "Open files in new tab:" +msgstr "" + +#: website/static/js/fangorn.js:2251 +msgid "" +" Press Command (Ctrl in Windows) and click a file name to open it in a " +"new tab." +msgstr "" + +#: website/static/js/fangorn.js:2252 +msgid "Download as zip:" +msgstr "" + +#: website/static/js/fangorn.js:2252 +msgid "" +" Click on the row of an add-on or folder and click the Download as Zip " +"button in the toolbar." +msgstr "" + +#: website/static/js/fangorn.js:2252 +msgid " Not available for all storage add-ons." +msgstr "" + +#: website/static/js/fangorn.js:2253 +msgid "Copy files:" +msgstr "" + +#: website/static/js/fangorn.js:2253 +msgid "" +" Press Option (Alt in Windows) while dragging a file to a new folder or " +"component." +msgstr "" + +#: website/static/js/fangorn.js:2253 +msgid " Only for contributors with write access." +msgstr "" + +#: website/static/js/fangorn.js:2259 +msgid "How to Use the File Browser" +msgstr "" + +#: website/static/js/fangorn.js:2323 +msgid "Please wait for current action to complete" +msgstr "" + +#: website/static/js/fangorn.js:2504 +msgid "Upload Status" +msgstr "" + +#: website/static/js/fangorn.js:2504 +msgid " files succeeded." +msgstr "" + +#: website/static/js/fangorn.js:2605 +msgid "Done" +msgstr "" + +#: website/static/js/fangorn.js:2607 +msgid "Move Status" +msgstr "" + +#: website/static/js/fangorn.js:2609 +msgid " files successfully moved." +msgstr "" + +#: website/static/js/fangorn.js:2610 +msgid " Skipped %1$s/%2$s files." +msgstr "" + +#: website/static/js/fangorn.js:2880 +msgid "You have pending uploads, if you leave this page they may not complete." +msgstr "" + +#: website/static/js/fangorn.js:2883 +msgid "" +"You have pending file operations, if you leave this page they may not " +"complete." +msgstr "" + +#: website/static/js/fangorn.js:2917 +msgid "This file is too large (%1$s). Max file size is %2$s." +msgstr "" + +#: website/static/js/fangorn.js:2933 +msgid "Not enough quota to upload the file." +msgstr "" + +#: website/static/js/fangorn.js:2940 +msgid "Quota usage alert" +msgstr "" + +#: website/static/js/fangorn.js:2941 +#, python-format +msgid "You have used more than %1$s% of your quota." +msgstr "" + +#: website/static/js/fileViewTreebeard.js:120 +msgid "Uploading %1$s..." +msgstr "" + +#: website/static/js/filesWidget.js:77 +msgid "Could not GET files" +msgstr "" + +#: website/static/js/filesWidget.js:92 +msgid "Sorry, we could not load files right now. " +msgstr "" + +#: website/static/js/firebase-messaging-sw.js:11 +msgid "RDM Announcements" +msgstr "" + +#: website/static/js/firebase-messaging-sw.js:13 +msgid "Background Message body." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:108 +msgid "" +"Could not retrieve %1$s settings at this time. The credentials associated" +" with this %1$s account may no longer be valid." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:109 +msgid "" +" Try disconnecting and reconnecting the %1$s account on your account settings page." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:112 +msgid "" +"Could not retrieve %1$s settings at this time. The %1$s addon credentials" +" may no longer be valid." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:113 +msgid " Contact %1$s to verify." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:116 +msgid "" +"Could not retrieve %1$s settings at this time. Please refresh the page. " +"If the problem persists, email %2$s." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:119 +msgid "" +"Could not retrieve %1$s account list at this time. Please refresh the " +"page. If the problem persists, email %2$s." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:122 +msgid "Disconnected %1$s." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:125 +msgid "" +"Could not disconnect %1$s account because of an error. Please try again " +"later." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:128 +msgid "Successfully connected a %1$s account" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:131 +msgid "" +"Error while authorizing addon. Please log in to your %1$s account and " +"grant access to the GakuNin RDM to enable this addon." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:139 +msgid "Could not change %1$s settings. Please try again later." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:142 +msgid "Are you sure you want to remove this %1$s account?" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:145 +msgid "Are you sure you want to link your %1$s account with this project?" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:148 +msgid "Successfully imported %1$s account from profile." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:151 +msgid "Error occurred while importing %1$s account." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:154 +msgid "Error occurred while importing %1$s group libraries." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:157 +msgid "Could not connect to %1$s at this time. Please try again later." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:321 +msgid "Could not GET %1$s settings" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:349 +#: website/static/js/folderPickerNodeConfig.js:382 +msgid "Failed to update %1$s settings." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:431 +msgid "Failed to import %1$s access token." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:443 +msgid "Failed to import %1$s group libraries." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:497 +#: website/static/js/oauthAddonNodeConfig.js:162 +msgid "Import %1$s Account?" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:536 +msgid "Could not deauthorize %1$s account from node" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:552 +msgid "Disconnect %1$s Account?" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:645 +#: website/static/js/folderPickerNodeConfig.js:656 +msgid "Could not GET get %1$s contents." +msgstr "" + +#: website/static/js/folderpicker.js:101 +msgid "Folders" +msgstr "" + +#: website/static/js/folderpicker.js:105 +msgid "Select" +msgstr "" + +#: website/static/js/institutionNodes.js:26 +msgid "Failed to load Institution's nodes" +msgstr "" + +#: website/static/js/institutionProjectSettings.js:47 +#: website/static/js/institutionProjectSettings.js:127 +msgid "Add institution" +msgstr "" + +#: website/static/js/institutionProjectSettings.js:47 +#: website/static/js/institutionProjectSettings.js:127 +msgid "Remove institution" +msgstr "" + +#: website/static/js/institutionProjectSettings.js:59 +msgid "" +"Add %1$s to %2$s or to %3$s and every component in " +"it?

                          " +msgstr "" + +#: website/static/js/institutionProjectSettings.js:60 +msgid "Add to %1$s." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:61 +msgid "Add to %1$s and every component for which you have permission." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:64 +msgid "" +"Remove %1$s from %2$s or from %3$s and every " +"component in it?

                          " +msgstr "" + +#: website/static/js/institutionProjectSettings.js:65 +msgid "Remove from %1$s." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:66 +msgid "Remove from %1$s and every component for which you have permission." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:69 +#: website/static/js/institutionProjectSettings.js:86 +msgid "Warning, you are not affiliated with %1$s." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:70 +#: website/static/js/institutionProjectSettings.js:87 +msgid " If you remove it from your project, you cannot add it back.
                          " +msgstr "" + +#: website/static/js/institutionProjectSettings.js:85 +msgid "Remove %1$s from %2$s." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:157 +msgid "Updating affiliation... this may take a minute." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:202 +msgid "" +"Unable to modify the institution on this node. Please try again. If the " +"problem persists, email %1$s" +msgstr "" + +#: website/static/js/institutionProjectSettings.js:203 +msgid "Unable to modify this institution!" +msgstr "" + +#: website/static/js/js_messages.js:3 +msgid "Bookmarks" +msgstr "" + +#: website/static/js/js_messages.js:5 +msgid "Edit" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Analysis" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Communication" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Data" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Hypothesis" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Instrumentation" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Methods and Measures" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Procedure" +msgstr "" + +#: website/static/js/js_messages.js:7 +#: website/static/js/projectSettingsTreebeardBase.js:90 +msgid "Project" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Software" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Other" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "analysis" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "communication" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "data" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "hypothesis" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "instrumentation" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "methods and measures" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "procedure" +msgstr "" + +#: website/static/js/js_messages.js:9 website/static/js/nodeControl.js:114 +#: website/static/js/nodeSelectTreebeard.js:87 +#: website/static/js/nodesDeleteTreebeard.js:62 +#: website/static/js/nodesPrivacySettingsTreebeard.js:62 +msgid "project" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "software" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "other" +msgstr "" + +#: website/static/js/js_messages.js:11 website/static/js/js_messages.js:13 +msgid "Comments added" +msgstr "" + +#: website/static/js/js_messages.js:11 website/static/js/js_messages.js:13 +msgid "Files updated" +msgstr "" + +#: website/static/js/js_messages.js:13 +msgid "Replies to your comments" +msgstr "" + +#: website/static/js/js_messages.js:13 +msgid "Mentions added" +msgstr "" + +#: website/static/js/js_messages.js:13 +msgid "Preprint submissions updated" +msgstr "" + +#: website/static/js/js_messages.js:15 +msgid "No license" +msgstr "" + +#: website/static/js/js_messages.js:17 website/static/js/passwordForms.js:178 +#: website/static/js/passwordForms.js:241 +msgid "This field is required." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a value greater than or equal to {0}." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a value less than or equal to {0}." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter at least {0} characters." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter no more than {0} characters." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please check this value." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "The value must increment by {0}." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a proper email address." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a proper date." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a number." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a digit." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please specify a valid phone number." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Values must equal." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please choose another value." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please make sure the value is unique." +msgstr "" + +#: website/static/js/js_messages.js:19 +msgid "Project Wiki Pages" +msgstr "" + +#: website/static/js/js_messages.js:19 +msgid "Component Wiki Pages" +msgstr "" + +#: website/static/js/js_messages.js:19 +msgid "Home" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Projects" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Components" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Registrations" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Users" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "All Results" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Files" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Institutions" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Preprints" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Groups" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Wiki" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Comments" +msgstr "" + +#: website/static/js/js_messages.js:23 +msgid "Default Notification Settings" +msgstr "" + +#: website/static/js/js_messages.js:23 +msgid "" +"These are default settings for new projects you create or are added to. " +"Modifying these settings will not modify settings on existing projects." +msgstr "" + +#: website/static/js/js_messages.js:23 +msgid "Project Notifications" +msgstr "" + +#: website/static/js/js_messages.js:23 +msgid "" +"These are settings for each of your projects. Modifying these settings " +"will only modify the settings for the selected project." +msgstr "" + +#: website/static/js/js_messages.js:25 +msgid "moved" +msgstr "" + +#: website/static/js/js_messages.js:25 +msgid "renamed" +msgstr "" + +#: website/static/js/js_messages.js:27 +msgid "Skipped" +msgstr "" + +#: website/static/js/js_messages.js:27 +msgid "Moved or replaced old version" +msgstr "" + +#: website/static/js/js_messages.js:27 +msgid "Kept both versions" +msgstr "" + +#: website/static/js/js_messages.js:29 +msgid "admin" +msgstr "" + +#: website/static/js/js_messages.js:29 +msgid "write" +msgstr "" + +#: website/static/js/js_messages.js:29 +msgid "read" +msgstr "" + +#: website/static/js/js_messages.js:31 +msgid "home" +msgstr "" + +#: website/static/js/js_messages.js:33 +msgid "No tokens." +msgstr "" + +#: website/static/js/js_messages.js:33 +msgid "Invalid tokens." +msgstr "" + +#: website/static/js/js_messages.js:35 +msgid "Invalid folder." +msgstr "" + +#: website/static/js/js_messages.js:35 +msgid "Credentials are valid" +msgstr "" + +#: website/static/js/keen.js:114 +msgid "Error sending Keen data to %1$s:<%2$s>" +msgstr "" + +#: website/static/js/keen.js:132 +msgid "Error sending Keen data for multiple events: <%1$s>" +msgstr "" + +#: website/static/js/keen.js:141 +msgid "Error sending Keen data to %1$s." +msgstr "" + +#: website/static/js/keen.js:153 +msgid "Cannot instantiate another KeenTracker instance." +msgstr "" + +#: website/static/js/koHelpers.js:129 +msgid "End date must be greater than or equal to the start date." +msgstr "" + +#: website/static/js/koHelpers.js:147 +msgid "Date must be greater than or equal to 1900." +msgstr "" + +#: website/static/js/koHelpers.js:169 +msgid "Please enter a date prior to the current date." +msgstr "" + +#: website/static/js/koHelpers.js:175 +msgid "Please enter a valid year." +msgstr "" + +#: website/static/js/koHelpers.js:190 +msgid "Please enter a valid URL." +msgstr "" + +#: website/static/js/koHelpers.js:197 +msgid "The field does not match the required input." +msgstr "" + +#: website/static/js/licensePicker.js:20 website/static/js/profile.js:128 +#: website/static/js/profile.js:132 +msgid "Year" +msgstr "" + +#: website/static/js/licensePicker.js:21 +msgid "Copyright Holders" +msgstr "" + +#: website/static/js/licensePicker.js:26 +msgid "License:" +msgstr "" + +#: website/static/js/licensePicker.js:27 +msgid "Choose a license:" +msgstr "" + +#: website/static/js/licensePicker.js:28 +msgid ">Save<" +msgstr "" + +#: website/static/js/licensePicker.js:68 +msgid "Add a license" +msgstr "" + +#: website/static/js/licensePicker.js:104 +msgid "Please specify a valid year." +msgstr "" + +#: website/static/js/licensePicker.js:108 +msgid "Future years are not allowed." +msgstr "" + +#: website/static/js/licensePicker.js:190 +msgid "License updated successfully." +msgstr "" + +#: website/static/js/licensePicker.js:195 +msgid "There was a problem updating your license. Please try again." +msgstr "" + +#: website/static/js/licensePicker.js:239 +msgid "Your Own License" +msgstr "" + +#: website/static/js/licensePicker.js:240 +msgid "" +"You have opted to use your own license. Please upload a license file " +"named \"license.txt\" into the GakuNin RDM Storage of this project." +msgstr "" + +#: website/static/js/licensePicker.js:247 +msgid "Add license" +msgstr "" + +#: website/static/js/licenses.js:27 +msgid "Content:" +msgstr "" + +#: website/static/js/licenses.js:31 +msgid "Code - Permissive:" +msgstr "" + +#: website/static/js/licenses.js:35 +msgid "Code - Copyleft:" +msgstr "" + +#: website/static/js/licenses.js:39 +msgid "Code - Other:" +msgstr "" + +#: website/static/js/logActionsList_extract.js:3 +#: website/static/js/logActionsList_extract.js:70 +msgid "${user} created ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:4 +msgid "${user} registered ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:5 +msgid "${node} registered" +msgstr "" + +#: website/static/js/logActionsList_extract.js:6 +msgid "" +"${user} submitted for review to the Preregistration Challenge a " +"registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:7 +msgid "${user} deleted ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:8 +msgid "${user} created ${node} based on ${template}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:9 +msgid "${user} created a link to ${pointer_category} ${pointer}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:10 +msgid "${user} forked a link to ${pointer_category} ${pointer}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:11 +msgid "${user} removed a link to ${pointer_category} ${pointer}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:12 +msgid "${user} added ${group} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:13 +msgid "${user} removed ${group} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:14 +msgid "${user} changed ${group} permissions to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:15 +msgid "${user} made ${node} public" +msgstr "" + +#: website/static/js/logActionsList_extract.js:16 +msgid "${node} made public" +msgstr "" + +#: website/static/js/logActionsList_extract.js:17 +msgid "${user} made ${node} private" +msgstr "" + +#: website/static/js/logActionsList_extract.js:18 +msgid "${user} added tag ${tag} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:19 +msgid "${user} removed tag ${tag} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:20 +msgid "${user} changed the title from ${title_original} to ${title_new}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:21 +msgid "${user} edited description of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:22 +msgid "${user} changed the ${updated_fields} for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:23 +msgid "${user} created external identifier(s) ${identifiers} on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:24 +msgid "${user} created a custom citation for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:25 +msgid "${user} edited a custom citation for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:26 +msgid "${user} removed a custom citation for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:27 +msgid "${user} added ${contributors} as contributor(s) to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:28 +msgid "${user} removed ${contributors} as contributor(s) from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:29 +msgid "${user} reordered contributors for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:30 +msgid "${user} changed permissions for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:31 +msgid "" +"${user} made non-bibliographic contributor ${contributors} a " +"bibliographic contributor on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:32 +msgid "" +"${user} made bibliographic contributor ${contributors} a non-" +"bibliographic contributor on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:33 +msgid "${user} updated wiki page ${page} to version ${version} of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:34 +msgid "${user} deleted wiki page ${page} of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:35 +msgid "${user} renamed wiki page ${old_page} to ${page} of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:36 +msgid "${user} made the wiki of ${node} publicly editable" +msgstr "" + +#: website/static/js/logActionsList_extract.js:37 +msgid "${user} made the wiki of ${node} privately editable" +msgstr "" + +#: website/static/js/logActionsList_extract.js:38 +msgid "${user} added addon ${addon} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:39 +msgid "${user} removed addon ${addon} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:40 +msgid "${user} moved ${source} to ${destination} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:41 +msgid "${user} copied ${source} to ${destination} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:42 +msgid "${user} renamed ${source} to ${destination} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:43 +msgid "${user} created a folder in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:44 +msgid "${user} added file ${path} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:45 +msgid "${user} updated file in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:46 +msgid "${user} removed ${path_type} ${path} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:47 +msgid "${user} restored file ${path} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:48 +msgid "${user} updated the file metadata for ${path}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:49 +msgid "${user} checked out ${kind} ${path} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:50 +msgid "${user} checked in ${kind} ${path} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:51 +msgid "${user} added a comment ${comment_location} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:52 +msgid "${user} deleted a comment ${comment_location} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:53 +msgid "${user} restored a comment ${comment_location} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:54 +msgid "${user} updated a comment ${comment_location} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:55 +msgid "${user} initiated an embargoed registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:56 +msgid "${user} approved embargoed registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:57 +msgid "Embargo of registration of ${node} approved" +msgstr "" + +#: website/static/js/logActionsList_extract.js:58 +msgid "${user} cancelled embargoed registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:59 +msgid "${user} completed embargo of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:60 +msgid "Embargo for ${node} completed" +msgstr "" + +#: website/static/js/logActionsList_extract.js:61 +msgid "Embargo for ${node} ended" +msgstr "" + +#: website/static/js/logActionsList_extract.js:62 +msgid "${user} initiated withdrawal of registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:63 +msgid "A withdrawal of registration of ${node} is proposed" +msgstr "" + +#: website/static/js/logActionsList_extract.js:64 +msgid "${user} approved withdrawal of registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:65 +msgid "${user} cancelled withdrawal of registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:66 +msgid "${user} initiated registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:67 +msgid "${user} approved registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:68 +msgid "Registration of ${node} approved" +msgstr "" + +#: website/static/js/logActionsList_extract.js:69 +msgid "${user} cancelled registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:71 +msgid "${user} created fork from ${forked_from}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:72 +msgid "${user} removed ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:73 +msgid "${user} enabled access requests for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:74 +msgid "${user} disabled access requests for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:75 +msgid "${user} updated the license of ${node} ${license}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:76 +msgid "${user} added tag ${tag} to ${path} in ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:77 +msgid "${user} removed tag ${tag} from ${path} in ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:78 +msgid "${user} added file ${path} to ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:79 +msgid "${user} created folder ${path} in ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:80 +msgid "${user} updated file ${path} in ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:81 +msgid "${user} removed ${path_type} ${path} from ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:82 +msgid "${user} added ${institution} affiliation to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:83 +msgid "${user} removed ${institution} affiliation from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:84 +msgid "${user} made ${node} a ${preprint} on ${preprint_provider} Preprints" +msgstr "" + +#: website/static/js/logActionsList_extract.js:85 +msgid "" +"${user} updated the primary file of this ${preprint} on " +"${preprint_provider} Preprints" +msgstr "" + +#: website/static/js/logActionsList_extract.js:86 +msgid "" +"${user} updated the license of this ${preprint} on ${preprint_provider} " +"Preprints ${license}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:87 +msgid "${user} updated the subjects on ${node} to ${subjects}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:88 +msgid "${user} created ${anonymous_link} view-only link to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:89 +msgid "${user} removed ${anonymous_link} view-only link to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:90 +msgid "${user} verified timestamp" +msgstr "" + +#: website/static/js/logActionsList_extract.js:91 +msgid "${user} requested trusted timestamp" +msgstr "" + +#: website/static/js/logActionsList_extract.js:92 +msgid "${user} requested trusted timestamp file ${path}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:93 +msgid "" +"${user} downloaded a file of timestamp errors as a " +"${timestamp_errors_file_format}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:94 +msgid "" +"[MAPCORE_SYNC:ERROR] ${user} cannot create a new mAP group for GRDM " +"project <${node}> (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:95 +msgid "" +"[MAPCORE_SYNC:ERROR] mAP group for GRDM project <${node}> cannot be " +"updated (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:96 +msgid "" +"[MAPCORE_SYNC:ERROR] GRDM project <${node}> cannot be updated with mAP " +"group (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:97 +msgid "" +"[MAPCORE_SYNC:NOTICE] Unknown (unregistered in GRDM) users belong to mAP " +"group <${node}> (ignored) (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:98 +msgid "${user} linked the Azure Blob Storage container ${bucket} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:99 +msgid "${user} unselected the Azure Blob Storage container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:100 +msgid "" +"${user} added file ${path} to Azure Blob Storage container ${bucket} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:101 +msgid "" +"${user} removed ${path} in Azure Blob Storage container ${bucket} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:102 +msgid "" +"${user} updated file ${path} in Azure Blob Storage container ${bucket} in" +" ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:103 +msgid "" +"${user} created folder ${path} in Azure Blob Storage container ${bucket} " +"in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:104 +msgid "${user} authorized the Azure Blob Storage addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:105 +msgid "${user} deauthorized the Azure Blob Storage addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:106 +msgid "Azure Blob Storage addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:107 +msgid "${user} added file ${path} to Bitbucket repo ${bitbucket_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:108 +msgid "" +"${user} removed ${path_type} ${path} in Bitbucket repo ${bitbucket_repo} " +"in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:109 +msgid "" +"${user} updated file ${path} in Bitbucket repo ${bitbucket_repo} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:110 +msgid "" +"${user} created folder ${path} in Bitbucket repo ${bitbucket_repo} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:111 +msgid "${user} authorized the Bitbucket addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:112 +msgid "${user} deauthorized the Bitbucket addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:113 +msgid "Bitbucket addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:114 +msgid "${user} linked Bitbucket repo ${bitbucket_repo} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:115 +msgid "${user} added file ${path} to Box in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:116 +msgid "${user} removed ${path_type} ${path} from Box in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:117 +msgid "${user} updated file ${path} in Box in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:118 +msgid "${user} created folder ${path} in Box in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:119 +msgid "${user} linked Box folder ${box_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:120 +msgid "${user} authorized the Box addon in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:121 +msgid "${user} deauthorized the Box addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:122 +msgid "Box addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:123 +msgid "${user} added a citation ${citation} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:124 +msgid "${user} updated a citation ${citation} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:125 +msgid "${user} removed a citation ${citation} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:126 +msgid "${user} added file ${filename} to Dataverse dataset ${dataset} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:127 +msgid "" +"${user} removed file ${filename} from Dataverse dataset ${dataset} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:128 +msgid "${user} linked Dataverse dataset ${dataset} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:129 +msgid "${user} linked Dataverse dataset ${study} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:130 +msgid "${user} published a new version of Dataverse dataset ${dataset} on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:131 +msgid "${user} published a new version of Dataverse dataset ${study} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:132 +msgid "${user} authorized the Dataverse addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:133 +msgid "${user} deauthorized the Dataverse addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:134 +msgid "Dataverse addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:135 +msgid "${user} added file ${path} to Dropbox in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:136 +msgid "${user} removed ${path_type} ${path} from Dropbox in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:137 +msgid "${user} updated file ${path} in Dropbox in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:138 +msgid "${user} created folder ${path} in Dropbox in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:139 +msgid "${user} linked Dropbox folder ${dropbox_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:140 +msgid "${user} authorized the Dropbox addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:141 +msgid "${user} deauthorized the Dropbox addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:142 +msgid "Dropbox addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:143 +msgid "${user} added file ${path} to Dropbox Business in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:144 +msgid "${user} removed ${path_type} ${path} from Dropbox Business in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:145 +msgid "${user} updated file ${path} in Dropbox Business in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:146 +msgid "${user} created folder ${path} in Dropbox Business in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:147 +msgid "" +"${user} linked Dropbox Business folder ${dropboxbusiness_folder} to " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:148 +msgid "${user} authorized the Dropbox Business addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:149 +msgid "${user} deauthorized the Dropbox Business addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:150 +msgid "Dropbox Business addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:151 +msgid "${user} linked figshare ${folder} ${folder_name} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:152 +msgid "${user} unlinked content from figshare in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:153 +msgid "${user} added file ${path} to figshare in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:154 +msgid "${user} removed ${path_type} ${path} from figshare in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:155 +msgid "${user} created folder ${path} in figshare in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:156 +msgid "${user} authorized the figshare addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:157 +msgid "${user} deauthorized the figshare addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:158 +msgid "figshare addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:159 +msgid "${user} changed external link to ${forward_url} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:160 +msgid "${user} added file ${path} to GitHub repo ${repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:161 +msgid "${user} removed ${path_type} ${path} in GitHub repo ${repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:162 +msgid "${user} updated file ${path} in GitHub repo ${repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:163 +msgid "${user} created folder ${path} in GitHub repo ${repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:164 +msgid "${user} authorized the GitHub addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:165 +msgid "${user} deauthorized the GitHub addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:166 +msgid "GitHub addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:167 +msgid "${user} linked GitHub repo ${repo} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:168 +msgid "${user} added file ${path} to GitLab repo ${gitlab_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:169 +msgid "${user} removed file ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:170 +msgid "${user} updated file ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:171 +msgid "${user} created folder ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:172 +msgid "${user} authorized the GitLab addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:173 +msgid "${user} deauthorized the GitLab addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:174 +msgid "GitLab addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:175 +msgid "${user} linked GitLab repo ${gitlab_repo} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:176 +msgid "${user} added file ${googledrive_path} to Google Drive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:177 +msgid "" +"${user} removed ${path_type} ${googledrive_path} from Google Drive in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:178 +msgid "${user} updated file ${googledrive_path} in Google Drive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:179 +msgid "${user} created folder ${googledrive_path} in Google Drive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:180 +msgid "${user} linked Google Drive folder ${googledrive_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:181 +msgid "${user} authorized the Google Drive addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:182 +msgid "${user} deauthorized the Google Drive addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:183 +msgid "Google Drive addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:184 +msgid "${user} added file ${iqbrims_path} to IQB-RIMS in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:185 +msgid "${user} removed ${path_type} ${iqbrims_path} from IQB-RIMS in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:186 +msgid "${user} updated file ${iqbrims_path} in IQB-RIMS in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:187 +msgid "${user} created folder ${iqbrims_path} in IQB-RIMS in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:188 +msgid "${user} linked IQB-RIMS folder ${iqbrims_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:189 +msgid "${user} authorized the IQB-RIMS addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:190 +msgid "${user} deauthorized the IQB-RIMS addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:191 +msgid "IQB-RIMS addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:192 +#: website/static/js/logActionsList_extract.js:194 +msgid "${user} started IQB-RIMS workflow for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:193 +#: website/static/js/logActionsList_extract.js:195 +msgid "Finished workflow of ${user} for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:196 +msgid "${user} linked Mendeley folder ${folder_name} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:197 +msgid "${user} authorized the Mendeley addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:198 +msgid "${user} deauthorized the Mendeley addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:199 +msgid "${user} added file ${path} to Nextcloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:200 +msgid "${user} removed ${path_type} ${path} from Nextcloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:201 +msgid "${user} updated file ${path} in Nextcloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:202 +msgid "${user} created folder ${path} in Nextcloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:203 +msgid "${user} linked Nextcloud folder ${folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:204 +msgid "${user} authorized the Nextcloud addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:205 +msgid "${user} deauthorized the Nextcloud addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:206 +msgid "Nextcloud addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:207 +msgid "${user} added file ${path} to Microsoft OneDrive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:208 +msgid "${user} removed ${path_type} ${path} from Microsoft OneDrive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:209 +msgid "${user} updated file ${path} in Microsoft OneDrive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:210 +msgid "${user} created folder ${path} in Microsoft OneDrive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:211 +msgid "${user} linked Microsoft OneDrive folder ${onedrive_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:212 +msgid "${user} authorized the Microsoft OneDrive addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:213 +msgid "${user} deauthorized the Microsoft OneDrive addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:214 +msgid "Microsoft OneDrive addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:215 +msgid "${user} added file ${path} to ownCloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:216 +msgid "${user} removed ${path_type} ${path} from ownCloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:217 +msgid "${user} updated file ${path} in ownCloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:218 +msgid "${user} created folder ${path} in ownCloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:219 +msgid "${user} linked ownCloud folder ${folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:220 +msgid "${user} authorized the ownCloud addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:221 +msgid "${user} deauthorized the ownCloud addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:222 +msgid "ownCloud addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:223 +msgid "${user} linked the Amazon S3 bucket ${bucket} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:224 +msgid "${user} unselected the Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:225 +msgid "${user} added file ${path} to Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:226 +msgid "${user} removed ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:227 +msgid "${user} updated file ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:228 +msgid "${user} created folder ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:229 +msgid "${user} authorized the Amazon S3 addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:230 +msgid "${user} deauthorized the Amazon S3 addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:231 +msgid "Amazon S3 addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:232 +msgid "${user} linked the S3 Compatible Storage bucket ${bucket} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:233 +msgid "${user} unselected the S3 Compatible Storage bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:234 +msgid "" +"${user} added file ${path} to S3 Compatible Storage bucket ${bucket} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:235 +msgid "" +"${user} removed ${path} in S3 Compatible Storage bucket ${bucket} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:236 +msgid "" +"${user} updated file ${path} in S3 Compatible Storage bucket ${bucket} in" +" ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:237 +msgid "" +"${user} created folder ${path} in S3 Compatible Storage bucket ${bucket} " +"in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:238 +msgid "${user} authorized the S3 Compatible Storage addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:239 +msgid "${user} deauthorized the S3 Compatible Storage addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:240 +msgid "S3 Compatible Storage addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:241 +msgid "${user} linked the Swift container ${bucket} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:242 +msgid "${user} unselected the Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:243 +msgid "${user} added file ${path} to Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:244 +msgid "${user} removed ${path} in Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:245 +msgid "${user} updated file ${path} in Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:246 +msgid "${user} created folder ${path} in Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:247 +msgid "${user} authorized the Swift addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:248 +msgid "${user} deauthorized the Swift addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:249 +msgid "Swift addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:250 +msgid "${user} added file ${filename} to WEKO index ${dataset} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:251 +msgid "${user} removed file ${filename} from WEKO index ${dataset} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:252 +msgid "${user} linked WEKO index ${dataset} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:253 +msgid "${user} created an index ${filename} on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:254 +msgid "${user} created an item ${filename} on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:255 +msgid "${user} created folder ${filename} in WEKO index ${dataset} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:256 +msgid "${user} authorized the WEKO addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:257 +msgid "${user} deauthorized the WEKO addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:258 +msgid "WEKO addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:259 +msgid "${user} linked Zotero folder ${folder_name} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:260 +msgid "${user} linked Zotero library ${library_name} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:261 +msgid "${user} authorized the Zotero addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:262 +msgid "${user} deauthorized the Zotero addon for ${node}" +msgstr "" + +#: website/static/js/logTextParser.js:824 +msgid "unknown format" +msgstr "" + +#: website/static/js/meetings.js:24 +msgid "Submissions" +msgstr "" + +#: website/static/js/meetings.js:30 +msgid "Location" +msgstr "" + +#: website/static/js/filepage/revisions.js:109 website/static/js/meetings.js:36 +msgid "Date" +msgstr "" + +#: website/static/js/myProjects.js:308 +msgid "We're having some trouble contacting our servers. Try reloading the page." +msgstr "" + +#: website/static/js/myProjects.js:308 +msgid "Something went wrong!" +msgstr "" + +#: website/static/js/myProjects.js:433 +msgid "All my projects" +msgstr "" + +#: website/static/js/myProjects.js:461 +msgid "Error loading project category names." +msgstr "" + +#: website/static/js/myProjects.js:665 +msgid "Some projects" +msgstr "" + +#: website/static/js/myProjects.js:669 +msgid " could not be removed from the collection" +msgstr "" + +#: website/static/js/myProjects.js:671 +msgid "Please try again." +msgstr "" + +#: website/static/js/myProjects.js:764 +msgid "You have not created any projects yet." +msgstr "" + +#: website/static/js/myProjects.js:768 +msgid "" +"There have been no completed registrations for this institution, but you " +"can view the " +msgstr "" + +#: website/static/js/myProjects.js:769 +msgid "newest public registrations" +msgstr "" + +#: website/static/js/myProjects.js:770 website/static/js/myProjects.js:778 +msgid " or " +msgstr "" + +#: website/static/js/myProjects.js:771 +msgid "popular public registrations." +msgstr "" + +#: website/static/js/myProjects.js:774 +msgid "You have not made any registrations yet. Go to " +msgstr "" + +#: website/static/js/myProjects.js:775 +msgid "Guides" +msgstr "" + +#: website/static/js/myProjects.js:775 +msgid " to learn how registrations work." +msgstr "" + +#: website/static/js/myProjects.js:778 +msgid "You have not made any preprints yet. Learn more about preprints in the " +msgstr "" + +#: website/static/js/myProjects.js:778 +msgid "OSF Guides" +msgstr "" + +#: website/static/js/myProjects.js:778 +msgid "make one now." +msgstr "" + +#: website/static/js/myProjects.js:780 +msgid "" +"You have no bookmarks. You can add projects or registrations by dragging " +"them into your bookmarks or by clicking the Add to Bookmark button on the" +" project or registration." +msgstr "" + +#: website/static/js/myProjects.js:782 +msgid "This collection is empty." +msgstr "" + +#: website/static/js/myProjects.js:784 +msgid "" +" You can add projects, registrations, or preprints by dragging them into " +"the collection." +msgstr "" + +#: website/static/js/myProjects.js:795 +msgid "" +"No components to display. Either there are no components, or there are " +"private components in which you are not a contributor." +msgstr "" + +#: website/static/js/myProjects.js:966 +msgid "Collections could not be loaded." +msgstr "" + +#: website/static/js/myProjects.js:967 +msgid "Please reload the page." +msgstr "" + +#: website/static/js/myProjects.js:1109 +msgid "My Projects " +msgstr "" + +#: website/static/js/myProjects.js:1110 +msgid "Browse and organize all your projects" +msgstr "" + +#: website/static/js/myProjects.js:1115 +msgid "Create Project" +msgstr "" + +#: website/static/js/myProjects.js:1172 +msgid "Fetching more projects" +msgstr "" + +#: website/static/js/myProjects.js:1278 +msgid "\" collection could not be created." +msgstr "" + +#: website/static/js/myProjects.js:1279 website/static/js/myProjects.js:1311 +#: website/static/js/myProjects.js:1336 +msgid "Please try again" +msgstr "" + +#: website/static/js/myProjects.js:1310 +msgid "\" could not be deleted." +msgstr "" + +#: website/static/js/myProjects.js:1335 +msgid "\" could not be renamed." +msgstr "" + +#: website/static/js/myProjects.js:1383 +msgid "\" is already in \"%1$s\"" +msgstr "" + +#: website/static/js/myProjects.js:1469 +msgid "Collections " +msgstr "" + +#: website/static/js/myProjects.js:1472 +msgid "" +"Collections are groups of projects. You can create custom collections. " +"Drag and drop your projects or bookmarked projects to add them." +msgstr "" + +#: website/static/js/myProjects.js:1501 +msgid " Rename" +msgstr "" + +#: website/static/js/myProjects.js:1510 +msgid " Delete" +msgstr "" + +#: website/static/js/myProjects.js:1528 +msgid "Add new collection" +msgstr "" + +#: website/static/js/myProjects.js:1531 +msgid "" +"Collections are groups of projects that help you organize your work. " +"After you create your collection, you can add projects by dragging them " +"into the collection." +msgstr "" + +#: website/static/js/myProjects.js:1533 +msgid "Collection name" +msgstr "" + +#: website/static/js/myProjects.js:1548 +msgid "e.g. My Replications" +msgstr "" + +#: website/static/js/myProjects.js:1565 +msgid "Add" +msgstr "" + +#: website/static/js/myProjects.js:1576 +msgid "Rename collection" +msgstr "" + +#: website/static/js/myProjects.js:1581 +msgid "Rename to: " +msgstr "" + +#: website/static/js/myProjects.js:1624 +msgid "Delete collection \"%1$s\"?" +msgstr "" + +#: website/static/js/myProjects.js:1627 +msgid "This will delete your collection, but your projects will not be deleted." +msgstr "" + +#: website/static/js/myProjects.js:1737 +msgid "Parent projects" +msgstr "" + +#: website/static/js/myProjects.js:1786 +msgid "Create component" +msgstr "" + +#: website/static/js/myProjects.js:1875 +msgid "" +"No contributors to display in this collection. Project administrators can" +" add contributors." +msgstr "" + +#: website/static/js/myProjects.js:1898 +msgid "" +"No tags to display in this collection. Project administrators and write " +"contributors can add tags." +msgstr "" + +#: website/static/js/myProjects.js:1924 +msgid "Contributors " +msgstr "" + +#: website/static/js/myProjects.js:1927 +msgid "Click a contributor's name to see projects that you have in common." +msgstr "" + +#: website/static/js/myProjects.js:1938 website/static/js/myProjects.js:2019 +msgid "Tags" +msgstr "" + +#: website/static/js/myProjects.js:1963 +msgid "Select a row to view project details." +msgstr "" + +#: website/static/js/myProjects.js:1994 +msgid "Information" +msgstr "" + +#: website/static/js/myProjects.js:1998 +msgid "Activity" +msgstr "" + +#: website/static/js/myProjects.js:2005 +msgid "Visibility: " +msgstr "" + +#: website/static/js/myProjects.js:2005 +msgid "Public" +msgstr "" + +#: website/static/js/myProjects.js:2005 +msgid "Private" +msgstr "" + +#: website/static/js/myProjects.js:2007 +msgid "Category: " +msgstr "" + +#: website/static/js/myProjects.js:2011 +msgid "Permission: " +msgstr "" + +#: website/static/js/myProjects.js:2012 +msgid "Last Modified on: " +msgstr "" + +#: website/static/js/myProjects.js:2040 +msgid "Remove selected from collection" +msgstr "" + +#: website/static/js/nodeControl.js:61 +msgid "A request to make this registration public is pending" +msgstr "" + +#: website/static/js/nodeControl.js:102 +msgid "Edit Title" +msgstr "" + +#: website/static/js/nodeControl.js:106 +msgid "Title cannot be blank." +msgstr "" + +#: website/static/js/nodeControl.js:109 +msgid "Title cannot exceed 512 characters." +msgstr "" + +#: website/static/js/nodeControl.js:114 +msgid "component" +msgstr "" + +#: website/static/js/nodeControl.js:117 +msgid "Edit Description" +msgstr "" + +#: website/static/js/nodeControl.js:118 +msgid "Add a brief description to your %1$s" +msgstr "" + +#: website/static/js/nodeControl.js:135 +msgid "Select a category" +msgstr "" + +#: website/static/js/nodeControl.js:175 +msgid "The project could not be removed" +msgstr "" + +#: website/static/js/nodeControl.js:212 +msgid "Create DOI" +msgstr "" + +#: website/static/js/nodeControl.js:214 +msgid "Are you sure you want to create a DOI for this %1$s" +msgstr "" + +#: website/static/js/nodeControl.js:215 +msgid "? A DOI" +msgstr "" + +#: website/static/js/nodeControl.js:216 +msgid " is persistent and will always resolve to this page." +msgstr "" + +#: website/static/js/nodeControl.js:245 +msgid "We could not create the identifier at this time. " +msgstr "" + +#: website/static/js/nodeControl.js:246 +msgid "The DOI acquisition service may be down right now. " +msgstr "" + +#: website/static/js/nodeControl.js:247 +msgid "Please try again soon and/or contact %1$s" +msgstr "" + +#: website/static/js/nodeControl.js:249 +msgid "Could not create doi" +msgstr "" + +#: website/static/js/nodeSelectTreebeard.js:62 +#: website/static/js/notificationsTreebeard.js:62 +#: website/static/js/profile.js:320 +#: website/static/js/wikiSettingsTreebeard.js:57 +msgid "Could not update settings" +msgstr "" + +#: website/static/js/nodeSelectTreebeard.js:81 +#: website/static/js/nodesDeleteTreebeard.js:56 +#: website/static/js/nodesPrivacySettingsTreebeard.js:56 +msgid "checkBox" +msgstr "" + +#: website/static/js/nodesDelete.js:38 +msgid "" +"This %1$s also contains supplemental materials for a " +"preprint. It will" +msgstr "" + +#: website/static/js/nodesDelete.js:39 +msgid " no longer be available to contributors or connected to the preprint." +msgstr "" + +#: website/static/js/nodesDelete.js:43 +msgid "It will no longer be available to other contributors on the project." +msgstr "" + +#: website/static/js/nodesDelete.js:49 +msgid "Are you sure you want to delete this %1$s?" +msgstr "" + +#: website/static/js/nodesDelete.js:80 website/static/js/nodesDelete.js:340 +msgid "Unable to delete %1$s" +msgstr "" + +#: website/static/js/nodesDelete.js:84 website/static/js/nodesDelete.js:344 +msgid "Problem deleting %1$s" +msgstr "" + +#: website/static/js/nodesDelete.js:85 +msgid "Could not delete %$1s" +msgstr "" + +#: website/static/js/nodesDelete.js:116 +msgid "" +"

                          This %1$s also contains supplemental materials for a " +"preprint, and one or more of its %2$s contains " +"supplemental materials for a preprint." +msgstr "" + +#: website/static/js/nodesDelete.js:119 +msgid "" +"

                          This %1$s also contains supplemental materials for a " +"preprint." +msgstr "" + +#: website/static/js/nodesDelete.js:122 +msgid "" +"

                          This %1$s also has one or more %2$s that contain supplemental " +"materials for a preprint." +msgstr "" + +#: website/static/js/nodesDelete.js:150 +msgid "Delete %1$s" +msgstr "" + +#: website/static/js/nodesDelete.js:151 +msgid "Delete %1$s and %2$s" +msgstr "" + +#: website/static/js/nodesDelete.js:156 +msgid "This %1$s contains %2$s." +msgstr "" + +#: website/static/js/nodesDelete.js:156 +msgid " To delete this %1$s, you must also delete all %2$s." +msgstr "" + +#: website/static/js/nodesDelete.js:158 +msgid " The following %1$s and %2$s will be deleted." +msgstr "" + +#: website/static/js/nodesDelete.js:161 +msgid " This action is irreversible." +msgstr "" + +#: website/static/js/nodesDelete.js:167 +msgid "" +"Please note that deleting your %1$s will erase all your %2$s data and " +"this process is IRREVERSIBLE. Deleted %3$s and %4$s will no longer be " +"available to other contributors on the %5$s" +msgstr "" + +#: website/static/js/nodesDelete.js:168 +msgid " and will be disconnected from your preprints." +msgstr "" + +#: website/static/js/nodesDelete.js:168 +msgid "." +msgstr "" + +#: website/static/js/nodesDelete.js:331 +msgid "Your %1$s has been successfully deleted." +msgstr "" + +#: website/static/js/nodesDelete.js:345 +msgid "Could not batch delete project and its components." +msgstr "" + +#: website/static/js/nodesDeleteTreebeard.js:84 +msgid "You must have admin permissions on this component to be able to delete it." +msgstr "" + +#: website/static/js/nodesPrivacy.js:19 +msgid "" +"Please review your projects, components, and add-ons for sensitive or " +"restricted information before making them public." +msgstr "" + +#: website/static/js/nodesPrivacy.js:20 +msgid "" +"

                          Once they are made public, you should assume they will always be " +"public. You can " +msgstr "" + +#: website/static/js/nodesPrivacy.js:21 +msgid "" +"return them to private later, but search engines (including Google’s " +"cache) or others may access files, wiki pages, or analytics before you " +"do." +msgstr "" + +#: website/static/js/nodesPrivacy.js:23 +msgid "" +"
                          • Public forks and registrations of this project will remain " +"public.
                          • " +msgstr "" + +#: website/static/js/nodesPrivacy.js:24 website/static/js/nodesPrivacy.js:27 +msgid "" +"
                          • Search engines (including Google's cache) or others may have accessed" +" files, wiki pages, or analytics while this project was public.
                          " +msgstr "" + +#: website/static/js/nodesPrivacy.js:26 +msgid "" +"
                          • Preprints will remain public.
                          • Public forks and " +"registrations of this project will remain public.
                          • " +msgstr "" + +#: website/static/js/nodesPrivacy.js:28 +msgid "" +"By clicking confirm, an email will be sent to project administrator(s) to" +" approve ending the embargo. If approved, this registration, including " +"any components, will be made public immediately. This action is " +"irreversible." +msgstr "" + +#: website/static/js/nodesPrivacy.js:29 +msgid "End embargo early" +msgstr "" + +#: website/static/js/nodesPrivacy.js:30 +msgid "Adjust your privacy settings by checking the boxes below. " +msgstr "" + +#: website/static/js/nodesPrivacy.js:31 +msgid "" +"

                            Checked projects and components will be public. " +"
                            Unchecked components will be private." +msgstr "" + +#: website/static/js/nodesPrivacy.js:33 +msgid "The following projects and components will be made public." +msgstr "" + +#: website/static/js/nodesPrivacy.js:34 +msgid "The following projects and components will be made private." +msgstr "" + +#: website/static/js/nodesPrivacy.js:35 +msgid "No privacy settings were changed. Go back to make a change." +msgstr "" + +#: website/static/js/nodesPrivacy.js:36 +msgid "" +"You can only change the privacy of 100 projects and components at a time." +" Please go back and limit your selection." +msgstr "" + +#: website/static/js/nodesPrivacy.js:38 +msgid "This project/component contains supplemental materials for a preprint." +msgstr "" + +#: website/static/js/nodesPrivacy.js:39 +msgid "" +"

                            Making this project/component private will prevent others from" +" accessing it.

                            " +msgstr "" + +#: website/static/js/nodesPrivacy.js:155 +msgid "Make %1$s private" +msgstr "" + +#: website/static/js/nodesPrivacy.js:156 +msgid "Warning" +msgstr "" + +#: website/static/js/nodesPrivacy.js:157 +msgid "Change privacy settings" +msgstr "" + +#: website/static/js/nodesPrivacy.js:158 +msgid "Projects and components affected" +msgstr "" + +#: website/static/js/nodesPrivacy.js:247 +msgid "Updating Privacy" +msgstr "" + +#: website/static/js/nodesPrivacy.js:257 +msgid "Unable to update project privacy" +msgstr "" + +#: website/static/js/nodesPrivacy.js:261 +msgid "Problem changing privacy" +msgstr "" + +#: website/static/js/nodesPrivacy.js:262 +msgid "Could not PATCH project settings." +msgstr "" + +#: website/static/js/nodesPrivacy.js:318 +msgid "Submitting request to end embargo early ..." +msgstr "" + +#: website/static/js/nodesPrivacy.js:324 +msgid "Email sent" +msgstr "" + +#: website/static/js/nodesPrivacy.js:325 +msgid "" +"The administrator(s) can approve or cancel the action within 48 hours. If" +" 48 hours pass without any action taken, then the registration will " +"become public." +msgstr "" + +#: website/static/js/notificationsConfig.js:31 +msgid "Could not retrieve settings information." +msgstr "" + +#: website/static/js/notificationsConfig.js:63 +msgid "Could not update email preferences at this time. If this issue persists, " +msgstr "" + +#: website/static/js/notificationsConfig.js:64 +#: website/static/js/osfHelpers.js:316 +msgid "please report it to %1$s." +msgstr "" + +#: website/static/js/notificationsTreebeard.js:68 +#: website/static/js/notificationsTreebeard.js:182 +#: website/static/js/notificationsTreebeard.js:187 +#: website/static/js/notificationsTreebeard.js:230 +msgid "Instantly" +msgstr "" + +#: website/static/js/notificationsTreebeard.js:69 +#: website/static/js/notificationsTreebeard.js:188 +#: website/static/js/notificationsTreebeard.js:231 +msgid "Daily" +msgstr "" + +#: website/static/js/notificationsTreebeard.js:70 +msgid "Adopt setting from parent project" +msgstr "" + +#: website/static/js/notificationsTreebeard.js:71 +#: website/static/js/notificationsTreebeard.js:186 +#: website/static/js/notificationsTreebeard.js:229 +msgid "Never" +msgstr "" + +#: website/static/js/notificationsTreebeard.js:118 +msgid " No configured projects." +msgstr "" + +#: website/static/js/notificationsTreebeard.js:228 +msgid "Adopt setting from parent project %1$s" +msgstr "" + +#: website/static/js/oauthAddonNodeConfig.js:143 +msgid "Choose %1$s Account to Import" +msgstr "" + +#: website/static/js/osfHelpers.js:311 +msgid "Please refresh the page and try again or contact %1$s" +msgstr "" + +#: website/static/js/osfHelpers.js:315 +msgid "GakuNin RDM was unable to resolve your request. If this issue persists, " +msgstr "" + +#: website/static/js/osfHelpers.js:339 +msgid "Unexpected error occurred in JSON request" +msgstr "" + +#: website/static/js/osfHelpers.js:344 +msgid "Unexpected error occurred in an editable input" +msgstr "" + +#: website/static/js/osfHelpers.js:361 +#: website/static/js/privateLinkManager.js:105 +msgid "Please wait" +msgstr "" + +#: website/static/js/osfHelpers.js:800 +#: website/static/js/pages/profile-settings-addons-page.js:32 +#: website/static/js/pages/project-addons-page.js:63 +msgid "Confirm" +msgstr "" + +#: website/static/js/osfHelpers.js:811 +msgid "

                            Type the following to continue: " +msgstr "" + +#: website/static/js/passwordForms.js:23 +msgid "Please enter a more complex password." +msgstr "" + +#: website/static/js/passwordForms.js:117 +#: website/static/js/passwordForms.js:192 +#: website/static/js/passwordForms.js:258 +msgid "Your password cannot be the same as your email address." +msgstr "" + +#: website/static/js/passwordForms.js:132 +msgid "Your new password cannot be the same as your old password." +msgstr "" + +#: website/static/js/passwordForms.js:143 +#: website/static/js/passwordForms.js:203 +msgid "Passwords must match." +msgstr "" + +#: website/static/js/passwordForms.js:230 +msgid "Email addresses must match." +msgstr "" + +#: website/static/js/passwordForms.js:301 +msgid "You have already submitted. You cannot sign up more than once." +msgstr "" + +#: website/static/js/passwordForms.js:322 +msgid "Please complete reCAPTCHA" +msgstr "" + +#: website/static/js/pointers.js:28 +msgid "Search all projects" +msgstr "" + +#: website/static/js/pointers.js:29 +msgid "Search my projects" +msgstr "" + +#: website/static/js/pointers.js:133 +msgid "No results found." +msgstr "" + +#: website/static/js/pointers.js:183 +msgid "Error retrieving nodes" +msgstr "" + +#: website/static/js/pointers.js:328 +msgid "Registered: " +msgstr "" + +#: website/static/js/pointers.js:330 +msgid "Created: " +msgstr "" + +#: website/static/js/pointers.js:330 +msgid "" +"\n" +"Modified: " +msgstr "" + +#: website/static/js/pointers.js:362 +msgid "Could not get links" +msgstr "" + +#: website/static/js/privateLinkManager.js:63 +msgid "Could not retrieve projects." +msgstr "" + +#: website/static/js/privateLinkManager.js:63 +#: website/static/js/privateLinkTable.js:72 +msgid "Please refresh the page or " +msgstr "" + +#: website/static/js/privateLinkManager.js:64 +#: website/static/js/privateLinkTable.js:73 +msgid "contact %1$s" +msgstr "" + +#: website/static/js/privateLinkManager.js:64 +#: website/static/js/privateLinkTable.js:73 +msgid " if the " +msgstr "" + +#: website/static/js/privateLinkManager.js:65 +#: website/static/js/privateLinkTable.js:74 +msgid "problem persists." +msgstr "" + +#: website/static/js/privateLinkTable.js:37 +msgid "Yes" +msgstr "" + +#: website/static/js/privateLinkTable.js:37 +msgid "No" +msgstr "" + +#: website/static/js/privateLinkTable.js:72 +msgid "Could not retrieve view-only links." +msgstr "" + +#: website/static/js/privateLinkTable.js:96 +msgid "Remove view-only link?" +msgstr "" + +#: website/static/js/privateLinkTable.js:97 +msgid "Are you sure you want to remove this view-only link?" +msgstr "" + +#: website/static/js/privateLinkTable.js:109 +msgid "Failed to delete the private link." +msgstr "" + +#: website/static/js/privateLinkTable.js:138 +msgid "Edit Link Name" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "January" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "February" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "March" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "April" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "May" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "June" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "July" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "August" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "September" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "October" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "November" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "December" +msgstr "" + +#: website/static/js/profile.js:112 +msgid "ongoing" +msgstr "" + +#: website/static/js/profile.js:152 +msgid "Please enter a year for the start date." +msgstr "" + +#: website/static/js/profile.js:165 +msgid "Please enter an end date or mark as ongoing." +msgstr "" + +#: website/static/js/profile.js:168 +msgid "Please enter a year for the end date." +msgstr "" + +#: website/static/js/profile.js:265 website/static/js/profile.js:274 +msgid "There are unsaved changes to your settings." +msgstr "" + +#: website/static/js/profile.js:275 +msgid "Please save or discard your changes before switching " +msgstr "" + +#: website/static/js/profile.js:276 +msgid "tabs." +msgstr "" + +#: website/static/js/profile.js:341 +msgid "Could not fetch data" +msgstr "" + +#: website/static/js/profile.js:358 +msgid "Are you sure you want to discard your unsaved changes?" +msgstr "" + +#: website/static/js/profile.js:720 +msgid "Remove website?" +msgstr "" + +#: website/static/js/profile.js:721 +msgid "Are you sure you want to remove this website from your profile?" +msgstr "" + +#: website/static/js/profile.js:728 +msgid "Website removed" +msgstr "" + +#: website/static/js/profile.js:815 +msgid "Please update your website" +msgstr "" + +#: website/static/js/profile.js:953 +msgid "Remove Institution?" +msgstr "" + +#: website/static/js/profile.js:954 +msgid "Are you sure you want to remove this institution?" +msgstr "" + +#: website/static/js/profile.js:963 +msgid "Institution Removed" +msgstr "" + +#: website/static/js/profile.js:1078 +msgid "Institution/Employer required" +msgstr "" + +#: website/static/js/profile.js:1132 +msgid "Institution required" +msgstr "" + +#: website/static/js/components/publicNodes.js:103 +#: website/static/js/project-organizer.js:100 +msgid "A contributor" +msgstr "" + +#: website/static/js/project-organizer.js:197 +msgid "Contributors" +msgstr "" + +#: website/static/js/project-organizer.js:416 +msgid "" +"input.form-control[placeholder=\"Filter displayed " +"projects\"][type=\"text\"]" +msgstr "" + +#: website/static/js/project.js:28 +msgid "

                            Are you sure you want to fork this project?

                            " +msgstr "" + +#: website/static/js/project.js:36 website/static/js/project.js:115 +msgid "Fork" +msgstr "" + +#: website/static/js/project.js:50 +msgid "Fork created successfully!" +msgstr "" + +#: website/static/js/project.js:58 +msgid "Go to new fork" +msgstr "" + +#: website/static/js/project.js:87 +msgid "Your fork is being created. You'll receive an email when it is complete." +msgstr "" + +#: website/static/js/project.js:93 +msgid "Fork this project?" +msgstr "" + +#: website/static/js/project.js:94 +msgid "Are you sure you want to fork this project?" +msgstr "" + +#: website/static/js/project.js:109 +msgid "Could not fork link." +msgstr "" + +#: website/static/js/project.js:126 +msgid "" +"

                            Are you sure you want to create a new project using this project as a" +" template?

                            " +msgstr "" + +#: website/static/js/project.js:127 +msgid "" +"

                            Any add-ons configured for this project will not be authenticated in " +"the new project.

                            " +msgstr "" + +#: website/static/js/project.js:129 +msgid "" +"

                            Are you sure you want to create a new project using this registration" +" as a template?

                            " +msgstr "" + +#: website/static/js/project.js:205 +msgid "
                            Read
                            " +msgstr "" + +#: website/static/js/project.js:206 +msgid "
                            • View project content and comment
                            " +msgstr "" + +#: website/static/js/project.js:207 +msgid "
                            Read + Write
                            " +msgstr "" + +#: website/static/js/project.js:208 +msgid "
                            • Read privileges
                            • " +msgstr "" + +#: website/static/js/project.js:209 +msgid "
                            • Add and configure components
                            • " +msgstr "" + +#: website/static/js/project.js:210 +msgid "
                            • Add and edit content
                            " +msgstr "" + +#: website/static/js/project.js:211 +msgid "
                            Administrator
                              " +msgstr "" + +#: website/static/js/project.js:212 +msgid "
                            • Read and write privileges
                            • " +msgstr "" + +#: website/static/js/project.js:213 +msgid "
                            • Manage contributor
                            • " +msgstr "" + +#: website/static/js/project.js:214 +msgid "" +"
                            • Delete and register project
                            • Public-private " +"settings
                            " +msgstr "" + +#: website/static/js/project.js:223 +msgid "" +"Only bibliographic contributors will be displayed in the Contributors " +"list and in project citations. Non-bibliographic contributors can read " +"and modify the project as normal." +msgstr "" + +#: website/static/js/project.js:238 +msgid "Remove this link?" +msgstr "" + +#: website/static/js/project.js:239 +msgid "" +"Are you sure you want to remove this link? This will not remove the " +"project this link refers to." +msgstr "" + +#: website/static/js/projectSettingsTreebeardBase.js:96 +msgid "Editing Toggle" +msgstr "" + +#: website/static/js/requestAccess.js:17 +msgid "Request access" +msgstr "" + +#: website/static/js/requestAccess.js:27 website/static/js/requestAccess.js:62 +msgid "Access requested" +msgstr "" + +#: website/static/js/requestAccess.js:30 +msgid "Request declined" +msgstr "" + +#: website/static/js/requestAccess.js:67 +msgid "Access request failed. Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/requestAccess.js:70 +msgid "Error requesting project access" +msgstr "" + +#: website/static/js/requestAccess.js:83 +msgid "If this should not have occurred, please contact %1$s." +msgstr "" + +#: website/static/js/saveManager.js:24 +msgid "You have unsaved changes." +msgstr "" + +#: website/static/js/search-grdm.js:150 +msgid "Date Modified (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:151 +msgid "Date Modified (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:152 +msgid "Date Created (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:153 +msgid "Date Created (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:154 +msgid "Project name (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:155 +msgid "Project name (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:156 +msgid "File name (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:157 +msgid "File name (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:158 +msgid "User name (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:159 +msgid "User name (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:160 +msgid "Institution name (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:161 +msgid "Institution name (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:162 +msgid "Wiki title (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:163 +msgid "Wiki title (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:313 website/static/js/search.js:190 +msgid "Page %1$s of %2$s" +msgstr "" + +#: website/static/js/search-grdm.js:393 website/static/js/search.js:270 +msgid "Search help" +msgstr "" + +#: website/static/js/search-grdm.js:394 website/static/js/search.js:271 +msgid "

                            Queries

                            " +msgstr "" + +#: website/static/js/search-grdm.js:395 website/static/js/search.js:272 +msgid "" +"

                            Search uses the Lucene" +" search syntax. " +msgstr "" + +#: website/static/js/search-grdm.js:396 website/static/js/search.js:273 +msgid "This gives you many options, but can be very simple as well. " +msgstr "" + +#: website/static/js/search-grdm.js:397 website/static/js/search.js:274 +msgid "Examples of valid searches include:" +msgstr "" + +#: website/static/js/search-grdm.js:769 website/static/js/search-grdm.js:1067 +#: website/static/js/search.js:578 website/static/js/search.js:605 +msgid "GakuNin RDM | Search" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:26 +msgid "Make publicly editable" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:27 +msgid "" +"Are you sure you want to make the wiki of %1$s publicly editable? " +"This will allow any logged in user to edit the content of this wiki. " +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:28 +msgid "" +"Note: Users without write access will not be able to add, delete, " +"or rename pages." +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:36 +msgid "Apply" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:114 +msgid "Only admins may change permissions of this wiki." +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:116 +msgid "Select who can edit" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:116 +msgid "This feature is disabled for wikis of private %1$ss" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:133 +msgid "Contributors (with write access)" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:134 +msgid "All GakuNin RDM users" +msgstr "" + +#: website/static/js/components/autocomplete.js:84 +msgid "Could not GET autocomplete data" +msgstr "" + +#: website/static/js/components/autocomplete.js:150 +msgid "Initiated by: " +msgstr "" + +#: website/static/js/components/autocomplete.js:156 +msgid "Initiated: " +msgstr "" + +#: website/static/js/components/autocomplete.js:162 +msgid "Last updated: " +msgstr "" + +#: website/static/js/components/publicNodes.js:68 +msgid "Error retrieving projects" +msgstr "" + +#: website/static/js/components/publicNodes.js:120 +msgid " more" +msgstr "" + +#: website/static/js/components/publicNodes.js:152 +msgid "-- private project -- / " +msgstr "" + +#: website/static/js/components/publicNodes.js:190 +msgid "Unable to retrieve public %1$s" +msgstr "" + +#: website/static/js/components/publicNodes.js:190 +msgid " at this time. Please refresh the page or contact " +msgstr "" + +#: website/static/js/components/publicNodes.js:204 +msgid "You have no public %1$s." +msgstr "" + +#: website/static/js/components/publicNodes.js:206 +msgid "Find out how to make your %1$s" +msgstr "" + +#: website/static/js/components/publicNodes.js:207 +msgid "public" +msgstr "" + +#: website/static/js/components/publicNodes.js:211 +msgid "This user has no public %1$s." +msgstr "" + +#: website/static/js/components/quickFiles.js:54 +msgid "Error retrieving quickfiles" +msgstr "" + +#: website/static/js/components/quickFiles.js:121 +msgid "" +"Unable to retrieve quickfiles at this time. Please refresh the page or " +"contact " +msgstr "" + +#: website/static/js/components/quickFiles.js:134 +msgid "You have no public quickfiles" +msgstr "" + +#: website/static/js/components/quickFiles.js:135 +msgid "This user has no public quickfiles." +msgstr "" + +#: website/static/js/components/utils.js:15 +msgid "Missing required option: " +msgstr "" + +#: website/static/js/filepage/editor.js:82 +msgid "The file content could not be loaded." +msgstr "" + +#: website/static/js/filepage/editor.js:83 +msgid "Could not GET file contents." +msgstr "" + +#: website/static/js/filepage/editor.js:113 +msgid "Could not update file. Insufficient storage space in your Dropbox." +msgstr "" + +#: website/static/js/filepage/editor.js:115 +msgid "The file could not be updated." +msgstr "" + +#: website/static/js/filepage/editor.js:122 +msgid "Could not PUT file content." +msgstr "" + +#: website/static/js/filepage/editor.js:178 +msgid "Revert" +msgstr "" + +#: website/static/js/filepage/index.js:89 +msgid "Direct iframe with fixed height and width" +msgstr "" + +#: website/static/js/filepage/index.js:131 +#: website/static/js/filepage/index.js:136 +msgid "File is checked out." +msgstr "" + +#: website/static/js/filepage/index.js:132 +msgid "" +" This file has been checked out by a COS Preregistration Challenge " +"Reviewer and will become available when review is complete." +msgstr "" + +#: website/static/js/filepage/index.js:137 +msgid " This file has been checked out by a " +msgstr "" + +#: website/static/js/filepage/index.js:138 +msgid "collaborator" +msgstr "" + +#: website/static/js/filepage/index.js:139 +msgid ". It needs to be checked in before any changes can be made." +msgstr "" + +#: website/static/js/filepage/index.js:184 +msgid "Delete file?" +msgstr "" + +#: website/static/js/filepage/index.js:186 +msgid "Are you sure you want to delete %1$s?" +msgstr "" + +#: website/static/js/filepage/index.js:204 +msgid "Could not delete file." +msgstr "" + +#: website/static/js/filepage/index.js:220 +msgid "Confirm file check out?" +msgstr "" + +#: website/static/js/filepage/index.js:223 +msgid "as long as it is checked out. You can check it back in at anytime." +msgstr "" + +#: website/static/js/filepage/index.js:243 +msgid "Unable to check out file" +msgstr "" + +#: website/static/js/filepage/index.js:270 +msgid "Unable to check in file" +msgstr "" + +#: website/static/js/filepage/index.js:275 +msgid "Force check in file?" +msgstr "" + +#: website/static/js/filepage/index.js:276 +msgid "" +"This will check in the file for all users, allowing it to be edited. Are " +"you sure?" +msgstr "" + +#: website/static/js/filepage/index.js:279 +#: website/static/js/filepage/index.js:502 +msgid "Force check in" +msgstr "" + +#: website/static/js/filepage/index.js:302 +msgid "Unable to force check in file. Make sure you have admin privileges." +msgstr "" + +#: website/static/js/filepage/index.js:343 +msgid "Live editing mode " +msgstr "" + +#: website/static/js/filepage/index.js:344 +msgid "Attempting to connect " +msgstr "" + +#: website/static/js/filepage/index.js:345 +msgid "Unsupported browser " +msgstr "" + +#: website/static/js/filepage/index.js:346 +msgid "Saving... " +msgstr "" + +#: website/static/js/filepage/index.js:347 +msgid "Unavailable: Live editing " +msgstr "" + +#: website/static/js/filepage/index.js:470 +msgid "View this file on " +msgstr "" + +#: website/static/js/filepage/index.js:505 +msgid "Check out" +msgstr "" + +#: website/static/js/filepage/index.js:508 +msgid "Check in" +msgstr "" + +#: website/static/js/filepage/index.js:514 +msgid "Request Trusted Timestamp" +msgstr "" + +#: website/static/js/filepage/index.js:531 +msgid "Toggle view: " +msgstr "" + +#: website/static/js/filepage/index.js:570 +#: website/static/js/filepage/revisions.js:173 +msgid "Revisions" +msgstr "" + +#: website/static/js/filepage/revisions.js:72 +#: website/static/js/filepage/revisions.js:73 +msgid "Unable to fetch versions" +msgstr "" + +#: website/static/js/filepage/revisions.js:108 +msgid "Version ID" +msgstr "" + +#: website/static/js/filepage/revisions.js:110 +msgid "User" +msgstr "" + +#: website/static/js/filepage/revisions.js:113 +msgid "" +".fa.fa-question-circle[data-content=\"MD5 is an algorithm used to verify " +"data integrity.\"][rel=\"popover\"]" +msgstr "" + +#: website/static/js/filepage/revisions.js:116 +msgid "" +".fa.fa-question-circle[data-content=\"SHA-2 is a cryptographic hash " +"function designed by the NSA used to verify data " +"integrity.\"][rel=\"popover\"]" +msgstr "" + +#: website/static/js/filepage/revisions.js:133 +msgid "Anonymous Contributor" +msgstr "" + +#: website/static/js/filepage/util.js:36 +msgid " Loading... " +msgstr "" + +#: website/static/js/home-page/scheduledBannerPlugin.js:25 +msgid "Error in request to %1$s" +msgstr "" + +#: website/static/js/pages/base-page.js:130 +msgid "Merge account" +msgstr "" + +#: website/static/js/pages/base-page.js:131 +msgid "Would you like to merge %1$s into your account? " +msgstr "" + +#: website/static/js/pages/base-page.js:133 +msgid "%1$s has been merged into your account." +msgstr "" + +#: website/static/js/pages/base-page.js:134 +msgid "You have chosen to not merge %1$s into your account. " +msgstr "" + +#: website/static/js/pages/base-page.js:135 +#: website/static/js/pages/base-page.js:142 +msgid "" +"If you change your mind, visit the user " +"settings page." +msgstr "" + +#: website/static/js/pages/base-page.js:138 +#: website/static/js/pages/base-page.js:188 +msgid "Add email" +msgstr "" + +#: website/static/js/pages/base-page.js:139 +msgid "Would you like to add %1$s to your account?" +msgstr "" + +#: website/static/js/pages/base-page.js:140 +msgid "%1$s has been added into your account." +msgstr "" + +#: website/static/js/pages/base-page.js:141 +msgid "You have chosen not to add %1$s to your account. " +msgstr "" + +#: website/static/js/pages/base-page.js:145 +msgid "There was a problem adding " +msgstr "" + +#: website/static/js/pages/base-page.js:146 +#: website/static/js/pages/base-page.js:149 +msgid ". Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/pages/base-page.js:148 +msgid "There was a problem removing " +msgstr "" + +#: website/static/js/pages/base-page.js:160 +msgid "Do not add email" +msgstr "" + +#: website/static/js/pages/base-page.js:173 +msgid "Could not remove email" +msgstr "" + +#: website/static/js/pages/base-page.js:198 +msgid "Could not add email" +msgstr "" + +#: website/static/js/pages/base-page.js:291 +msgid " and " +msgstr "" + +#: website/static/js/pages/dashboard-page.js:35 +msgid "Could not set user timezone or locale" +msgstr "" + +#: website/static/js/pages/dashboard-page.js:53 +msgid "" +"This is taking longer than normal.
                            Try reloading the page. If the " +"problem persist, please contact us at %1$s" +msgstr "" + +#: website/static/js/pages/file-page.js:21 +msgid "Add a file tag to enhance discoverability" +msgstr "" + +#: website/static/js/pages/file-page.js:23 +#: website/static/js/pages/file-page.js:58 +#: website/static/js/pages/file-page.js:60 +#: website/static/js/pages/project-dashboard-page.js:632 +#: website/static/js/pages/project-dashboard-page.js:716 +#: website/static/js/pages/project-dashboard-page.js:749 +msgid "Removing tag" +msgstr "" + +#: website/static/js/pages/file-page.js:24 +#: website/static/js/pages/project-dashboard-page.js:633 +msgid "Add a tag" +msgstr "" + +#: website/static/js/pages/file-page.js:28 +msgid "Could not add tag." +msgstr "" + +#: website/static/js/pages/file-page.js:29 +#: website/static/js/pages/project-dashboard-page.js:656 +msgid "Failed to add tag" +msgstr "" + +#: website/static/js/pages/file-page.js:43 +msgid "Could not remove tag." +msgstr "" + +#: website/static/js/pages/file-page.js:44 +#: website/static/js/pages/project-dashboard-page.js:692 +msgid "Failed to remove tag" +msgstr "" + +#: website/static/js/pages/file-page.js:90 +msgid "The file title cannot be empty." +msgstr "" + +#: website/static/js/pages/file-page.js:92 +msgid "The file title cannot be more than 100 characters." +msgstr "" + +#: website/static/js/pages/file-page.js:103 +msgid "" +"Your file was successfully renamed. To view the new filename in the file " +"tree below, refresh the page." +msgstr "" + +#: website/static/js/pages/institution-page.js:30 +msgid "All Projects" +msgstr "" + +#: website/static/js/pages/institution-page.js:43 +msgid "" +"This is taking longer than normal.
                            Try reloading the page. If the " +"problem persist, please contact us at %1$s." +msgstr "" + +#: website/static/js/pages/notifications-config-page.js:21 +#: website/static/js/pages/project-settings-page.js:33 +msgid "Could not retrieve notification settings." +msgstr "" + +#: website/static/js/pages/profile-settings-addons-page.js:66 +#: website/static/js/pages/project-addons-page.js:15 +msgid "" +"Sorry, we had trouble saving your settings. If this persists please " +"contact " +msgstr "" + +#: website/static/js/pages/profile-settings-addons-page.js:68 +msgid "Request failed" +msgstr "" + +#: website/static/js/pages/profile-settings-addons-page.js:86 +msgid "Are you sure you want to remove the add-ons you have deselected? " +msgstr "" + +#: website/static/js/pages/profile-settings-addons-page.js:129 +msgid "The changes on addon setting are not submitted!" +msgstr "" + +#: website/static/js/pages/project-addons-page.js:10 +msgid "Your add-on settings have been successfully changed." +msgstr "" + +#: website/static/js/pages/project-addons-page.js:26 +msgid "Disable Add-on?" +msgstr "" + +#: website/static/js/pages/project-addons-page.js:27 +msgid "Are you sure you want to disable this add-on?" +msgstr "" + +#: website/static/js/pages/project-addons-page.js:37 +msgid "Disable" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:117 +msgid "Filter by users" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:118 +msgid "Select from current contributors" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:119 +msgid "Select including past contributors" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:120 +msgid "Include past project contributors in your search" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:121 +msgid "Use dropdown menu" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:417 +msgid "Add Component" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:419 +msgid "Create new component" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:613 +msgid "Error retrieving filebrowser" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:630 +msgid "Add a project tag to enhance discoverability" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:691 +msgid "Could not remove tag" +msgstr "" + +#: website/static/js/pages/project-settings-page.js:34 +msgid "Could not GET notification settings." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:54 +msgid "Could not retrieve wiki settings." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:55 +msgid "Could not GET wiki settings." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:104 +msgid "Successfully updated settings." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:115 +msgid "Could not set commenting configuration. Please try again." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:151 +msgid "Unable to update settings" +msgstr "" + +#: website/static/js/pages/project-settings-page.js:152 +msgid "Could not update settings." +msgstr "" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:31 +msgid "Import Account from Admin" +msgstr "" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:52 +#: website/static/js/pages/rdm-profile-settings-addons-page.js:54 +msgid "Successfully imported the account." +msgstr "" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:59 +#: website/static/js/pages/rdm-profile-settings-addons-page.js:61 +msgid "Failed to import the account." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:172 +msgid "A verify request is being processed!" +msgstr "" + +#: website/static/js/pages/timestamp-common.js:175 +msgid "Something went wrong with the Verify request." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:191 +msgid "Using the checkbox, please select the files to request timestamp." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:214 +msgid "Timestamp is being added to the selected files!" +msgstr "" + +#: website/static/js/pages/timestamp-common.js:217 +msgid "Something went wrong with the Request Trusted Timestamp request." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:222 +msgid "The task has been cancelled." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:231 +msgid "The task already finished." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:234 +msgid "Something went wrong in the cancel request." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:288 +msgid "Using the checkbox, please select the files to download." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:323 +msgid "Failed to log \"downloaded errors\" into Recent Activity" +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:64 +msgid "The wiki page name cannot be empty." +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:66 +msgid "The wiki page name cannot be more than 100 characters." +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:81 +msgid "Error in renaming wiki" +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:88 +msgid "An unexpected error occurred. Please try again." +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:108 +msgid "

                            Could not retrieve wiki pages. If this issue persists, " +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:109 +msgid "please report it to %1$s" +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:110 +msgid "Could not GET wiki menu pages" +msgstr "" + +#: addons/myskelton/static/node-cfg.js:90 +msgid "Admin Notes by %1$s" +msgstr "" + +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:34 +msgid "Saving admin notes was successful" +msgstr "" + +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:36 +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:46 +msgid "Error while saving admin notes" +msgstr "" + +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:44 +msgid "Permission error while saving admin notes" +msgstr "" + +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:63 +#: admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js:79 +msgid "Error while fetching admin notes" +msgstr "" diff --git a/site/guides/api/Decorators/index.html b/site/guides/api/Decorators/index.html new file mode 100644 index 0000000..cf36c80 --- /dev/null +++ b/site/guides/api/Decorators/index.html @@ -0,0 +1,2749 @@ + + + + + + + + + + + + + + + + + + + + + + + View処理で使えるPythonデコレータ - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

                            +
                            + +
                            + + + + +
                            + + +
                            + +
                            + + + + + + + + + +
                            +
                            + + + +
                            +
                            +
                            + + + + + + + +
                            +
                            +
                            + + + + + + + +
                            +
                            + + + + + + + +

                            View処理で使えるPythonデコレータ

                            +

                            views.py で定義される各View処理には、その処理の実行における前提をPythonのデコレータの形で記述することができます。

                            +

                            ここでは、よく使われているデコレータや、カスタムデコレータについて説明します。

                            +

                            framework.auth.decorators.must_be_logged_in

                            +

                            ユーザがログインしている状態である場合にのみ呼び出し可能であることを宣言します。

                            +

                            引数( **kwargs )には、以下のパラメータが追加されます。

                            +
                              +
                            • auth : 認証しているユーザに関する情報
                            • +
                            +

                            website.project.decorators.must_be_valid_project

                            +

                            対象のnodeがプロジェクトとして認められるものであることを宣言します。

                            +
                            +

                            プロジェクトとして認められないnodeとは、QuickFileNodeや撤回されたRegistrationなどがありますが、現在、RDMでは使用されていません。

                            +
                            +

                            引数( **kwargs )には、以下のパラメータが追加されます。

                            +
                              +
                            • node : 対象のプロジェクトに関する情報
                            • +
                            +

                            website.project.decorators.must_have_addon(addon_name, model)

                            +

                            アドオンに関する情報を必要とすることを宣言します。第1引数( addon_name )にはアドオン名を、第2引数( model )には 'user' か 'node' のいずれかを指定します。 'node' を指定した場合は、パスは /project/<pid>/ から始める必要があります。

                            +

                            引数( **kwargs )には、以下のパラメータが追加されます。

                            +
                              +
                            • 引数 model に 'user' を指定した場合
                            • +
                            • auth : 認証しているユーザに関する情報
                            • +
                            • user_addon 指定したアドオンのUserSettings
                            • +
                            • 引数 model に 'node' を指定した場合
                            • +
                            • node : 対象のプロジェクトに関する情報
                            • +
                            • node_addon 指定したアドオンのNodeSettings
                            • +
                            +

                            website.project.decorators.must_have_permission(permission)

                            +

                            必要なパーミッション( permission )を宣言します。パーミッションは osf.utils.permissions に定義されており、 'write' , 'read' , 'admin' のいずれかを指定します。

                            +

                            引数( **kwargs )には、以下のパラメータが追加されます。

                            +
                              +
                            • auth : 認証しているユーザに関する情報
                            • +
                            • node : 対象のプロジェクトに関する情報
                            • +
                            +

                            website.project.decorators.must_be_addon_authorizer(addon_name)

                            +

                            プロジェクトにアドオンを追加したユーザーのみ呼び出し可能であることを宣言します。プロジェクトのアドオンの設定にのみ使われるView処理などに宣言します。

                            +

                            引数( **kwargs )には、以下のパラメータが追加されます。

                            +
                              +
                            • node : 対象のプロジェクトに関する情報
                            • +
                            +

                            website.project.decorators.must_be_contributor_or_public

                            +

                            ユーザーがContributorであるか、プロジェクトが公開設定にされている場合のみ呼び出し可能であることを宣言します。

                            +

                            似たようなデコレータとして、以下のようなものがあります。

                            +
                              +
                            • must_be_contributor
                            • +
                            • must_be_contributor_or_public_but_not_anonymized
                            • +
                            • must_be_contributor_and_not_group_member
                            • +
                            +

                            引数( **kwargs )には、以下のパラメータが追加されます。

                            +
                              +
                            • auth : 認証しているユーザに関する情報
                            • +
                            • node : 対象のプロジェクトに関する情報
                            • +
                            +

                            admin.rdm_addons.decorators.must_be_rdm_addons_allowed

                            +

                            ユーザーが所属する機関が、指定したアドオンを使うことを許可されている場合にのみ呼び出し可能であることを宣言します。この機能はAdminのRdm Addons機能により提供されています。

                            + + + + + + + + + + + + + +
                            +
                            + + + +
                            + +
                            + + + +
                            +
                            +
                            +
                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/guides/api/README.legacy/index.html b/site/guides/api/README.legacy/index.html new file mode 100644 index 0000000..048290d --- /dev/null +++ b/site/guides/api/README.legacy/index.html @@ -0,0 +1,2773 @@ + + + + + + + + + + + + + + + + + + + + + + + APIの利用 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                            + +
                            + + + + +
                            + + +
                            + +
                            + + + + + + + + + +
                            +
                            + + + +
                            +
                            +
                            + + + + + + + +
                            +
                            +
                            + + + +
                            +
                            +
                            + + + +
                            +
                            +
                            + + + +
                            +
                            + + + + + + + +

                            APIの利用

                            +

                            RDMが研究データを効果的に管理するためには、外部システムとの連携や既存のRDMアドオンとの連携を行う必要が出てくるでしょう。 +このような時、外部システムやRDMおよびアドオンの間の境界面、特にAPI(Application Programming Interface)を意識しながら機能を実装することで、メンテナンス性を維持したり、今後の拡張を容易にしたりすることができます。

                            +

                            本ドキュメントではアドオンにおける実装に着目し、アドオンを外部システムから操作可能にする方法(アドオンAPIの公開)と、アドオンからRDMを操作する方法(既存APIによる操作)の2つの観点で説明します。

                            +

                            アドオンAPIの公開

                            +

                            アドオンの機能に対して、他のシステムからアクセス可能にするためのAPIの考え方、定義方法を説明します。

                            +

                            APIの実装

                            +

                            外部システムがアドオンの機能に対してアクセスする場合は、HTTP(S)によるRESTful API呼び出しを利用するのが便利です。 +RDMアドオンは スケルトン の追加方法で説明したように、Djangoアプリケーションの形で実装されます。 +そのため、DjangoやRDMが提供する各種補助機能を利用することができます。

                            +

                            HTTP(S)で呼び出し可能なエンドポイントを定義する場合、ビューにより実装するのが一般的です。 +スケルトンの作成#Viewの構成 に示すように、定義は以下の2種類から構成されます。

                            +
                              +
                            • Routes ... View処理をどのパスにマッピングし、どのような形式で出力するか。出力にはJSON形式や、HTMLのテンプレートを指定することができる
                            • +
                            • Views ... View処理の内容
                            • +
                            +

                            Routesは以下のようにパスとMethod(GET, POST, PUT, DELETE, ...)と、その組み合わせに対してどの関数を実行するか、その実行結果をどのように出力するかを定義します。 +例えば、画面拡張の例では以下のように定義しています。

                            +
                            api_routes = {
                            +    'rules': [
                            +        ...
                            +        Rule([ # (1)
                            +            '/project/<pid>/{}/config'.format(SHORT_NAME),
                            +            '/project/<pid>/node/<nid>/{}/config'.format(SHORT_NAME),
                            +        ], 'get', views.myscreen_get_config_ember, json_renderer),
                            +        Rule([ # (2)
                            +            '/project/<pid>/{}/config'.format(SHORT_NAME),
                            +            '/project/<pid>/node/<nid>/{}/config'.format(SHORT_NAME),
                            +        ], 'patch', views.myscreen_set_config_ember, json_renderer),
                            +        ...
                            +    ],
                            +}
                            +
                            +

                            ルール(1)は、/project/<pid>/アドオン名/config というエンドポイントへのGETリクエストに対する処理を、viewsモジュールで定義したmyscreen_get_config_emberという関数に行わせることを定義しています。json_rendererは、関数の戻り値として返されたオブジェクトを +JSONに変換、レスポンスとして返すことを定義しています。 +同様に、ルール(2)はPATCHリクエストに対してはmyscreen_set_config_emberで処理することを示しています。

                            +

                            Viewsでは、以下のように関数を定義しています。

                            +
                            @must_be_valid_project
                            +@must_have_permission('admin')
                            +@must_have_addon(SHORT_NAME, 'node')
                            +def myscreen_get_config_ember(**kwargs):
                            +    node = kwargs['node'] or kwargs['project']
                            +    addon = node.get_addon(SHORT_NAME)
                            +    return {'data': {'id': node._id, 'type': 'myscreen-config',
                            +                     'attributes': {
                            +                         'param1': addon.get_param_1()
                            +                     }}}
                            +
                            +@must_be_valid_project
                            +@must_have_permission('admin')
                            +@must_have_addon(SHORT_NAME, 'node')
                            +def myscreen_set_config_ember(**kwargs):
                            +    node = kwargs['node'] or kwargs['project']
                            +    addon = node.get_addon(SHORT_NAME)
                            +    try:
                            +        config = request.json['data']['attributes']
                            +        param_1 = config['param1']
                            +    except KeyError:
                            +        raise HTTPError(http_status.HTTP_400_BAD_REQUEST)
                            +
                            +    addon.set_param_1(param_1)
                            +    return {'data': {'id': node._id, 'type': 'myscreen-config',
                            +                     'attributes': {
                            +                         'param1': param_1
                            +                     }}}
                            +
                            +

                            いずれも、@must_から始まるデコレータと、defから始まる関数定義ブロックから構成されます。 +デコレータは、これらの関数に関する認可の要否や、使用可能なプロジェクトの条件を定義しています。 +また、kwargsには関数に与えられた引数が格納されます。nodeやprojectには、Django Modelが格納されます。 +(デコレータの定義によっては、格納されない場合もあります。) +アドオンはこれらのオブジェクトを介して、RDM内のデータベースの内容を操作することができます。 +(画面拡張の例では、Emberで定義した画面からこれらのエンドポイントに対してリクエストを出しています。)

                            +

                            これらのロジックの記述方法は一般的なDjangoのルールに則っています。したがって、DjangoやFlaskなどのPythonの +Webアプリケーションフレームワークの知識があれば比較的簡単に実装することができるでしょう。 +また、RDMではアクセス制御やプロジェクトの制限に便利なデコレータを提供しています。RDMが提供するデコレータ一覧を参考にしてください。

                            +

                            APIのセキュリティ

                            +

                            APIアクセスは適切なユーザ、またはシステムからのみ利用可能なようにアクセス制御を行う必要があります。 +アクセス制御方式の実現方法として、ユーザによる認可を経てアクセスを行う方式と、独自のセキュリティ機構を設ける方式について説明します。

                            +

                            ユーザによる認可

                            +

                            先のViewsの例では、 @must_have_permission('admin') という形で、この操作はadmin権限を持っているユーザにしか実施できないことを宣言しています。 +他にも、write権限が必要であるとか、様々な権限のコントロールが考えられます。

                            +

                            ここで重要なのは、ユーザによって、操作可能な範囲が異なるという点と、ユーザはアドオンを無制限に信頼してくれるわけではないという点です。 +ユーザの識別はWebアプリケーションにとっては当たり前のことですが、APIによる操作を考える場合にも非常に重要な点となります。 +ただ、APIのリクエスト側に「私はxxです」という申告を求めるわけにはいきません。詐称される可能性があるからです。 +また、秘密の情報(パスワード・秘密鍵等)で操作の主が認証できたとしても、そのユーザはこのアドオンを無制限に信頼してくれると考えるべきではありません。 +(RDM自体は信頼して使ってもらうことになりますが、RDMのAPIにアクセスするソフトウェアは信頼されているとは限りません。) +そのため、「このアドオンは情報yyの読み込みだけをします」であるとか、「読み込みと書き込みをします」であるとか、範囲を限定してユーザへの許可を求めることになります。

                            +

                            Personal Access Tokenによる認可

                            +

                            このような、ユーザの権限を行使するための機構の一つが、Personal Access Tokenです。RDMのユーザの [設定] 画面から、 [パーソナルアクセストークン] で取得することができます。

                            +

                            パーソナルアクセストークン

                            +

                            [新規トークン] ボタンをクリックすると、新規トークンを発行することができます。

                            +

                            新規トークン

                            +

                            新規トークンの発行の際に、スコープという複数のチェック項目が現れます。これが認可の範囲を示しています。(詳細は スコープの定義 を参照してください。) +[作成] ボタンをクリックして得たトークン(Access Token)はアプリケーションなどからAuthorization: Bearerヘッダを通して与えることで、APIにアクセスすることができるようになります。このようにすると、トークンの発行主の持つ権限と、(必要に応じて)スコープにより定義された認可範囲、 @must_have_permission などのデコレータによって定義された制約の検証が行われ、アクセスの許可・不許可が決定されます。

                            +

                            この方法は後述する OAuthによる認可 方式と異なり、Callback URLなどの準備が不要な一方、ユーザによるアクセストークン発行が必要なこと、そのアクセストークンが漏洩した際にユーザの協力を得ながら解決する必要があることなどから、開発中に利用できる便利な方式程度に考えるべきでしょう。

                            +

                            OAuthによる認可

                            +

                            Personal Access Tokenはユーザに手動でトークンを作成させ、トークンを何らかの方式でアプリケーションに渡す必要がありますが、RDMはOAuth https://tools.ietf.org/html/rfc6749 をサポートしており、OAuthによりアプリケーションとRDMの間で認可情報のやりとりを実現することができます。

                            +

                            アプリケーションがOAuthを通じてユーザから操作の認可を得るためには、RDMからConsumer KeyとConsumer Secretという情報を得る必要があります。 +この情報は、RDMのユーザの [設定] 画面から、 [開発者アプリ] で取得することができます。

                            +

                            開発者アプリ

                            +

                            APIに対してアクセスするアプリケーションは、OAuth 2.0に対応したクライアントライブラリを用いてOAuth認可フローを実装する必要があります。 +アプリケーションはOAuth認可フローを通して、ユーザにRDMへのログインと認可を求め、認可されるとAccess Token(または、要求したaccess_typeがofflineの場合、Refresh TokenとAccess Token)を取得することができます。あとはPersonal Access Tokenと同様に、Authorization: BearerヘッダにAccess Tokenを与えることで、APIアクセスを行うことができます。

                            +

                            頻繁に利用される可能性があるAccess Tokenは、悪用を防ぐために短時間(1時間)で期限切れとなるよう設計されています。そのため、認可を受けてから、長期間にわたってその認可された操作を実施したい場合は、Refresh Tokenを用いてAccess Tokenを定期的に新規取得する必要があります。 +これらの処理は、多くの場合OAuth対応クライアントライブラリにロジックが用意されており、RDMが提供するエンドポイントのURLを与えれば実現できます。 +(参考: エンドポイントの情報や可能な操作は https://github.com/RCOSDP/RDM-cas-overlay#web-server-authorization に記載されている。)

                            +
                            +

                            OAuthを用いたAPIの認可をローカル環境で試すためには、開発環境構築時に cas-overlayを含む構成で起動する 必要があります。

                            +
                            +

                            独自方式によるアクセス制御: Signing API requestsの例

                            +

                            RDMはアドオンに関してサンドボックスのような隔離モデルは採用しておらず、アドオンからRDM本体と同様の操作が実施することができます。 +これは、様々な処理をアドオンとして実現できる一方、その強力な自由度を悪用されないよう、アドオンでは適切な権限制御を行う必要があります。

                            +

                            先に示したのはユーザの認可を経て処理を実施する方式ですが、アドオンによっては、必ずしも操作主体となるユーザを限定しない形で振舞う必要があるかもしれません。 +このような場合に関してRDMは特別なセキュリティ機構を提供していないため、独自に外部システム(アドオン呼び出し元)とアドオンの間で取り決めをし、不正なユーザがアクセスすることができないようにセキュリティ機構を実装する必要があります。

                            +

                            このような機構を実現する場合に最も簡単な方法は、第三者が推測しにくいトークンを外部システムとアドオンの間で決め、アドオンはこのトークンをともなうリクエストのみを許可する方式です。 +この方式は実現が容易な一方、中間者攻撃などリクエストの内容が奪われてしまうとこのトークンも漏洩してしまうという問題があります。(攻撃者は秘密のトークンを用いて自由にアドオンを操作できてしまう。)

                            +

                            このような攻撃への対策として、秘密のトークンそのものをリクエストに含めるのではなく、秘密のトークンと、その他の情報を合わせたハッシュ値を計算し、そのハッシュをリクエストに含めることが考えられます。これにより、受信側は同様のハッシュ計算を行なって送信側のハッシュ値との比較を行うことで、送信側が秘密のトークンを所持しているかを検証することができます。

                            +

                            例として、IQB-RIMSアドオンの場合は、アドオンの設定情報に基づいたハッシュを生成し、独自のHTTPヘッダ X-RDM-Token に格納するようにしています。 +これにより、あるプロジェクトにアタッチされたアドオンにおいてハッシュが漏洩したとしても、別のアドオンに対して悪用はできないように配慮しています。 +ハッシュ生成処理は、RDMが提供するデコレータ一覧のようにデコレータとして定義することで、再利用性を高めています。

                            +

                            def must_have_valid_hash():
                            +    """Decorator factory that ensures that a request have valid X-RDM-Token header.
                            +    :returns: Decorator function
                            +    """
                            +    def wrapper(func):
                            +
                            +        @functools.wraps(func)
                            +        def wrapped(*args, **kwargs):
                            +            owner = kwargs['node']
                            +            addon = owner.get_addon(IQBRIMSAddonConfig.short_name)
                            +            if addon is None:
                            +                raise HTTPError(http.BAD_REQUEST)
                            +            secret = addon.get_secret()
                            +            process_def_id = addon.get_process_definition_id()
                            +            valid_hash = hashlib.sha256((secret + process_def_id + owner._id).encode('utf8')).hexdigest()
                            +            request_hash = request.headers.get('X-RDM-Token', None)
                            +            logger.debug('must_have_valid_hash: request_hash={}'.format(request_hash))
                            +            logger.debug('must_have_valid_hash: valid_hash={}'.format(valid_hash))
                            +            if request_hash != valid_hash:
                            +                raise HTTPError(
                            +                    http.FORBIDDEN,
                            +                    data={'message_long': ('User has restricted access to this page.')}
                            +                )
                            +            return func(*args, **kwargs)
                            +
                            +        return wrapped
                            +
                            +    return wrapper
                            +
                            +(引用: https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/iqbrims/utils.py#L142)

                            +

                            このように定義した独自の addons.iqbrims.utils.must_have_valid_hash デコレータを用いて、 +個々のViewsへのアクセスの際にハッシュ値の計算・設定が必要なことを明示しています。

                            +

                            @must_be_valid_project
                            +@must_have_addon(SHORT_NAME, 'node')
                            +@must_have_valid_hash()    # Hashの設定が必要なことを示す
                            +def iqbrims_post_workflow_state(**kwargs):
                            +    node = kwargs['node'] or kwargs['project']
                            +    ...    # Viewsの処理
                            +
                            +(引用: https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/iqbrims/views.py#L229)

                            +

                            これらのハッシュ計算にどの程度のリスクを想定するかは利用形態によって異なります。例えば、Amazon S3のSigning and authenticating REST requests https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html では、送信時刻を含むリクエストヘッダをハッシュ計算の対象に含めることで、ハッシュ値を含むリクエストが漏洩しても、同じオブジェクトに対するリクエストは以後不可能なように配慮がなされています。ハッシュ値の計算にどのような要素を使うかはアドオンの実装に依存する部分ではありますが、たとえリクエストが漏洩したとしても、その影響範囲がある程度限定的になるよう配慮してハッシュ計算を実装する必要があるでしょう。

                            +

                            既存APIによる操作

                            +

                            RDMは多くの機能をAPIとして提供しているため、すでにある機能については積極的に活用すべきでしょう。また、内部ではDjangoの規則にしたがって作成されたDjango Modelを介してデータベースの管理を行なっているため、この本章では、OSF APIv2による操作とDjango Modelによるモデルの直接操作に関して説明します。

                            +

                            OSF APIv2 による外部からの操作

                            +

                            OSF APIv2はRDMが備えるRESTful APIです。OSF APIv2ドキュメント https://developer.osf.io/ で説明されている通り、プロジェクトに対して様々な操作を実施することができます。

                            +

                            これらのAPIは外部システムからの呼び出しに利用される他、Emberベースのアプリケーションからの操作にも利用されます。また、JSON-API https://jsonapi.org/format/1.0/ に準拠した形式で提供されます。

                            +

                            スコープの定義

                            +

                            APIの操作にはOAuthにて説明したように、適切なスコープを指定する必要があります。 +RDMにて指定可能なスコープは oauth_scopes.public_scopes として定義されます。

                            +
                              +
                            • https://github.com/RCOSDP/RDM-osf.io/blob/develop/framework/auth/oauth_scopes.py#L291-L363
                            • +
                            +

                            これらのスコープはCoreScopes https://github.com/RCOSDP/RDM-osf.io/blob/develop/framework/auth/oauth_scopes.py#L23 の組み合わせとして表現されます。 +それぞれの操作がどのようなスコープを要求するかは、Viewクラスに定義されます。例えば、NodeListに関する操作 ( https://developer.osf.io/#operation/nodes_list や https://developer.osf.io/#operation/nodes_create ) であれば、

                            +

                            class NodeList(JSONAPIBaseView, bulk_views.BulkUpdateJSONAPIView, bulk_views.BulkDestroyJSONAPIView, bulk_views.ListBulkCreateJSONAPIView, NodesFilterMixin, WaterButlerMixin, NodeOptimizationMixin):
                            +    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_list).
                            +    """
                            +    permission_classes = (
                            +        drf_permissions.IsAuthenticatedOrReadOnly,
                            +        base_permissions.TokenHasScope,
                            +    )
                            +    required_read_scopes = [CoreScopes.NODE_BASE_READ]
                            +    required_write_scopes = [CoreScopes.NODE_BASE_WRITE]
                            +    model_class = apps.get_model('osf.AbstractNode')
                            +
                            +    parser_classes = (JSONAPIMultipleRelationshipsParser, JSONAPIMultipleRelationshipsParserForRegularJSON,)
                            +    serializer_class = NodeSerializer
                            +    ...
                            +
                            +(引用: https://github.com/RCOSDP/RDM-osf.io/blob/develop/api/nodes/views.py#L228-L229)

                            +

                            のように、 required_read_scopes と required_write_scopes として、必要なスコープが定義されます。

                            +

                            Django Modelによる内部からの操作

                            +

                            RDMはDjangoアプリケーションとして構成されているため、データベースへのアクセスはDjango Modelを介して行います。 +この操作の例として、django.dispatch.receiver によるモデル変更検知と、 osf.models 内のオブジェクトを介した操作例を示します。

                            +

                            from django.dispatch import receiver
                            +...
                            +from osf.models import Contributor, RdmAddonOption, AbstractNode
                            +
                            +...
                            +
                            +@receiver(post_save, sender=Node)
                            +def add_iqbrims_addon(sender, instance, created, **kwargs):
                            +    if IQBRIMSAddonConfig.short_name not in ws_settings.ADDONS_AVAILABLE_DICT:
                            +        return
                            +
                            +    inst_ids = instance.affiliated_institutions.values('id')
                            +    addon_option = RdmAddonOption.objects.filter(
                            +        provider=IQBRIMSAddonConfig.short_name,
                            +        institution_id__in=Subquery(inst_ids),
                            +        management_node__isnull=False,
                            +        is_allowed=True
                            +    ).first()
                            +    if addon_option is None:
                            +        return
                            +    if addon_option.organizational_node is not None and \
                            +            not addon_option.organizational_node.is_contributor(instance.creator):
                            +        return
                            +
                            +    instance.add_addon(IQBRIMSAddonConfig.short_name, auth=None, log=False)
                            +
                            +(引用: https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/iqbrims/models.py#L309-L327)

                            +

                            以下で、注目すべきコードについてそれぞれ説明します。

                            +

                            receiverによるモデル変更検知

                            +

                            django.dispatch.receiver デコレータを用いることで、特定のModelに変更が生じた場合の処理を記述することができます。

                            +
                            @receiver(post_save, sender=Node)
                            +def add_iqbrims_addon(sender, instance, created, **kwargs):
                            +    ...
                            +
                            +

                            この例の場合は、post_saveを指定していますので、Node型(プロジェクトはこの型のオブジェクトで表現されます)を持つオブジェクトの更新後に、add_iqbrims_addon関数が呼び出されます。

                            +
                            +

                            post_saveのほか、検知可能な変更操作は、 https://docs.djangoproject.com/en/3.1/ref/signals/ に列挙されています。 +RDM内では、 pre_save, post_save, post_delete, m2m_changed がすでに使用されています。

                            +
                            +

                            osf.modelsによるモデル操作

                            +

                            django.dispatch.receiver(post_save, sender=Node) デコレータの場合は、第2引数の instance オブジェクトにNodeへの参照が格納されます。 +Django Modelは osf.models に定義してあります。例えば Node Modelならば、 https://github.com/RCOSDP/RDM-osf.io/blob/develop/osf/models/node.py#L2457 で定義されています。

                            +

                            例えば、プロジェクト内で特定のアドオンを有効化したい場合は、 add_addon関数 https://github.com/RCOSDP/RDM-osf.io/blob/develop/osf/models/node.py#L2290 を呼び出すことで実現できます。

                            +
                            @receiver(post_save, sender=Node)
                            +def add_iqbrims_addon(sender, instance, created, **kwargs):
                            +    ...
                            +
                            +    instance.add_addon(IQBRIMSAddonConfig.short_name, auth=None, log=False)
                            +
                            +

                            このようにして、直接Modelを操作することで、RDMに対して様々な作用を与えることができます。 +モデル操作は自由に変更を行える一方、ユーザがこれらの変更を適切に理解できるようにする配慮を行う必要があります。 +さもないと、「何かが勝手に自身のプロジェクトを壊した」と思ってしまうかもしれません。アドオンが、ユーザ自身に許可された範囲で様々な変更を実施しているように、ユーザに理解してもらえるような動作を設計することが重要です。

                            + + + + + + + + + + + + + +
                            +
                            + + + +
                            + +
                            + + + +
                            +
                            +
                            +
                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/guides/api/images/dev-application.png b/site/guides/api/images/dev-application.png new file mode 100644 index 0000000..64dec7e Binary files /dev/null and b/site/guides/api/images/dev-application.png differ diff --git a/site/guides/api/images/new-token.png b/site/guides/api/images/new-token.png new file mode 100644 index 0000000..a3060a7 Binary files /dev/null and b/site/guides/api/images/new-token.png differ diff --git a/site/guides/api/images/personal-access-token.png b/site/guides/api/images/personal-access-token.png new file mode 100644 index 0000000..fe05077 Binary files /dev/null and b/site/guides/api/images/personal-access-token.png differ diff --git a/site/guides/api/index.html b/site/guides/api/index.html new file mode 100644 index 0000000..9352e3f --- /dev/null +++ b/site/guides/api/index.html @@ -0,0 +1,2889 @@ + + + + + + + + + + + + + + + + + + + + + + + API Guide / API ユーガイド - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                            + +
                            + + + + +
                            + + +
                            + +
                            + + + + + + + + + +
                            +
                            + + + +
                            +
                            +
                            + + + + + + + +
                            +
                            +
                            + + + +
                            +
                            +
                            + + + +
                            +
                            +
                            + + + +
                            +
                            + + + + + + + +

                            API Guide / API ユーガイド

                            +
                            +

                            Summary: Guide to using and exposing APIs in RDM addons +概要: RDM アドオンで API を使用および公開する手引き

                            +
                            +

                            Jump: English · 日本語

                            + +
                            +

                            +

                            English

                            +

                            → 日本語版へ

                            +

                            Overview

                            +

                            This guide explains how to:

                            +
                              +
                            • Expose your addon's functionality via API: Allow other systems to access your addon
                            • +
                            • Use existing APIs in your addon: Interact with RDM and other addons
                            • +
                            +

                            RDM addons can be accessed via HTTP(S) RESTful APIs, enabling integration with external systems and other RDM addons.

                            +

                            Prerequisites

                            + +

                            Quick start

                            +
                              +
                            1. Define Routes and Views in your addon to create API endpoints
                            2. +
                            3. Use decorators to control access (authentication, permissions)
                            4. +
                            5. Test your API with curl or Postman
                            6. +
                            7. Integrate with external systems using standard HTTP requests
                            8. +
                            +

                            Legacy content

                            +

                            The legacy API guide instructions are kept verbatim in README.legacy.md for reference and will be rewritten per milestone.

                            +
                            +

                            +

                            日本語

                            +

                            → To English

                            +

                            概要

                            +

                            このガイドでは、以下の方法を説明します:

                            +
                              +
                            • アドオンの機能を API で公開: 他のシステムがアドオンにアクセスできるようにする
                            • +
                            • 既存の API をアドオンで使用: RDM や他のアドオンと連携する
                            • +
                            +

                            RDM アドオンは HTTP(S) RESTful API でアクセス可能で、外部システムや他の RDM アドオンとの連携ができます。

                            +

                            前提条件

                            + +

                            クイックスタート

                            +
                              +
                            1. アドオンでルートとビューを定義して API エンドポイントを作成する
                            2. +
                            3. デコレーターを使用してアクセスを制御(認証、権限)
                            4. +
                            5. curl や Postman で API をテストする
                            6. +
                            7. 標準的な HTTP リクエストを使用して外部システムと連携する
                            8. +
                            +

                            過去のコンテンツ

                            +

                            過去の API ガイドの手順は、参考のために README.legacy.md にそのまま残しており、マイルストーンごとに書き直す予定です。

                            +
                            +

                            Glossary / 用語

                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                            TermEnglish note日本語注
                            API (Application Programming Interface)A way for programs to talk to each other using HTTP requests.プログラムが HTTP リクエストを使用して通信する方法。
                            RESTful APIAn API that follows standard HTTP methods (GET, POST, PUT, DELETE).標準的な HTTP メソッド(GET, POST, PUT, DELETE)に従った API。
                            DecoratorA special marker that controls who can access an API endpoint.API エンドポイントへのアクセスを制御する特別なマーク。
                            AuthenticationVerifying who is making the API request (like a username and password).API リクエストを作成した人が誰かを確認すること(ユーザー名とパスワードのようなもの)。
                            AuthorizationChecking what the user is allowed to do after logging in.ログインした後のユーザーが何をできるかを確認すること。
                            + + + + + + + + + + + + + +
                            +
                            + + + +
                            + +
                            + + + +
                            +
                            +
                            +
                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/guides/ec2/README.legacy/index.html b/site/guides/ec2/README.legacy/index.html new file mode 100644 index 0000000..6e9e173 --- /dev/null +++ b/site/guides/ec2/README.legacy/index.html @@ -0,0 +1,3146 @@ + + + + + + + + + + + + + + + + + + + + + + + OSF evaluation on AWS EC2 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                            + +
                            + + + + +
                            + + +
                            + +
                            + + + + + + + + + +
                            +
                            + + + +
                            +
                            +
                            + + + + + + + +
                            +
                            +
                            + + + + + + + +
                            +
                            + + + + + + + +

                            OSF evaluation on AWS EC2

                            +

                            Quick Start Guide

                            +

                            For setting up this project on your local environment, follow these steps:

                            +

                            1. Change to Project Directory

                            +

                            Setup for git: +

                            git config --global user.name 'Your github account name' 
                            +git config --global user.email 'Your email address'        
                            +git config --global core.editor 'code --wait'
                            +git config --global merge.tool 'code --wait "$MERGED"'
                            +git config --global push.default simple
                            +git config --list  # githuconfig confirmation 
                            +

                            +

                            You need generate and register your github token in your gitconfig.

                            +

                            link: https://docs.github.com/ja/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens

                            +

                            Navigate to the project root directory: +

                            git clone https://github.com/RCOSDP/RDM-osf.io.git
                            +git clone -b develop https://github.com/RCOSDP/RDM-ember-osf-web.git
                            +git clone https://github.com/RCOSDP/RDM-modular-file-renderer.git
                            +git clone https://github.com/RCOSDP/RDM-waterbutler.git
                            +

                            +

                            2. Docker Build

                            +

                            setup docker and docker compose.

                            +

                            link: https://docs.docker.jp/v1.12/compose/install.html

                            +

                            link: https://docs.docker.com/engine/install/ubuntu/

                            +

                            Build Docker images for each module: +

                            sudo docker build RDM-ember-osf-web -t rdm-osf-web:dev
                            +sudo docker build RDM-modular-file-renderer -t rdm-mfr:dev
                            +sudo docker build RDM-waterbutler -t rdm-wb:dev
                            +sudo docker build RDM-osf.io -t rdm-osf:dev
                            +

                            +

                            3. Setup Loopback Interface

                            +

                            Configure your loopback interface on your machine: +

                            sudo apt install net-tools
                            +sudo ifconfig lo:0 192.168.168.167 netmask 255.255.255.255 up
                            +

                            +

                            4. Change to Module Directory

                            +

                            Navigate to the module directory: +

                            cd RDM-osf.io/
                            +

                            +

                            5. Copy and Update Local Settings

                            +

                            Copy the local settings of the project: +

                            cp ./website/settings/local-dist.py ./website/settings/local.py
                            +cp ./api/base/settings/local-dist.py ./api/base/settings/local.py
                            +cp ./admin/base/settings/local-dist.py ./admin/base/settings/local.py
                            +cp ./tasks/local-dist.py ./tasks/local.py
                            +

                            +

                            Update the local settings of the project: +RDM-osf.io/.docker-compose.env +

                            DOMAIN=http://ec2.compute-1.amazonaws.com:5000
                            +INTERNAL_DOMAIN=http://web:5000
                            +API_DOMAIN=http://api.ec2.compute-1.amazonaws.com:8000
                            +ELASTIC_URI=elasticsearch:9200
                            +ELASTIC6_URI=elasticsearch6:9201
                            +OSF_DB_HOST=postgres
                            +DB_HOST=mongo
                            +WATERBUTLER_URL=http://files.ec2.compute-1.amazonaws.com:7777
                            +WATERBUTLER_INTERNAL_URL=http://wb:7777
                            +CAS_SERVER_URL=http://accounts.ec2.compute-1.amazonaws.com:8080
                            +MFR_SERVER_URL=http://mfr.ec2.compute-1.amazonaws.com:7778
                            +#SHARE_URL=http://192.168.168.167:8000
                            +BROKER_URL=amqp://guest:guest@rabbitmq:5672
                            +REDIS_URL=redis://192.168.168.167:6379/1
                            +
                            +ADMIN_URL=http://admin.ec2.compute-1.amazonaws.com:8001
                            +ADMIN_INTERNAL_DOCKER_URL=http://admin:8001
                            +
                            +RDM-osf.io/.docker-compose.osf-web.env +
                            OSF_COOKIE_DOMAIN=.ec2.compute-1.amazonaws.com
                            +OSF_URL=http://ec2.compute-1.amazonaws.com:5000
                            +OSF_API_URL=http://api.ec2.compute-1.amazonaws.com:8000
                            +OSF_MFR_URL=http://mfr.ec2.compute-1.amazonaws.com:7778
                            +OSF_RENDER_URL=http://mfr.ec2.compute-1.amazonaws.com:7778/render
                            +OSF_FILE_URL=http://files.ec2.compute-1.amazonaws.com:7777
                            +OSF_HELP_URL=http://ec2.compute-1.amazonaws.com:5000/help
                            +OSF_COOKIE_LOGIN_URL=http://accounts.ec2.compute-1.amazonaws.com:8080/login
                            +OSF_OAUTH_URL=http://accounts.ec2.compute-1.amazonaws.com:8080/oauth2/profile
                            +SHARE_BASE_URL=https://share.osf.io/
                            +SHARE_API_URL=https://share.osf.io/api/v2
                            +SHARE_SEARCH_URL=https://share.osf.io/api/v2/search/creativeworks/_search
                            +CAS_URL=http://accounts.ec2.compute-1.amazonaws.com:8080
                            +

                            +

                            RDM-osf.io/.docker-compose.wb.env

                            +
                            DEBUG=
                            +SERVER_CONFIG_DEBUG=
                            +SERVER_CONFIG_HMAC_SECRET=changeme
                            +SERVER_CONFIG_ADDRESS=0.0.0.0
                            +SERVER_CONFIG_DOMAIN=http://ec2.compute-1.amazonaws.com:7777
                            +OSF_AUTH_CONFIG_API_URL=http://ec2.compute-1.amazonaws.com:5000/api/v1/files/auth/
                            +OSF_URL=http://ec2.compute-1.amazonaws.com:5000
                            +
                            +TASKS_CONFIG_BROKER_URL=amqp://guest:guest@rabbitmq:5672//
                            +
                            +

                            RDM-osf.io/.docker-compose.mfr.env +

                            DEBUG=
                            +SERVER_CONFIG_DEBUG=
                            +SERVER_CONFIG_HMAC_SECRET=changeme
                            +
                            +SERVER_CONFIG_ADDRESS=0.0.0.0
                            +SERVER_CONFIG_ALLOWED_PROVIDER_DOMAINS='http://192.168.168.167:5000/ http://192.168.168.167:7777/ http://mfr:7777/ http://ec2.compute-1.amazonaws.com:5000/ http://files.ec2.compute-1.amazonaws.com:7777/'
                            +
                            +UNOCONV_PORT_2002_TCP_ADDR=192.168.168.167
                            +EXTENSION_CONFIG_LOCAL_DEVELOPMENT=1
                            +

                            +

                            RDM-osf.io/admin/base/settings/local.py +

                            SESSION_COOKIE_DOMAIN = 'ec2.compute-1.amazonaws.com'
                            +from .defaults import *
                            +
                            +ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', 'localhost,osf.io').split(',')
                            +

                            +

                            RDM-osf.io/docker-compose.override.yml

                            +
                            version: "3.4"
                            +
                            +services:
                            +  mfr_requirements:
                            +    image: rdm-mfr:dev
                            +  mfr:
                            +    image: rdm-mfr:dev
                            +  wb_requirements:
                            +    image: rdm-wb:dev
                            +  wb:
                            +    image: rdm-wb:dev
                            +  wb_worker:
                            +    image: rdm-wb:dev
                            +  ember_osf_web:
                            +    image: rdm-osf-web:dev
                            +    environment:
                            +      - BACKEND=env
                            +    env_file:
                            +      - .docker-compose.osf-web.env
                            +    volumes:
                            +      - ../RDM-ember-osf-web:/code:cached
                            +      - ember_osf_web_dist_vol:/code/dist
                            +  requirements:
                            +    image: rdm-osf:dev
                            +  assets:
                            +    image: rdm-osf:dev
                            +  admin_assets:
                            +    image: rdm-osf:dev
                            +  worker:
                            +    image: rdm-osf:dev
                            +  admin:
                            +    image: rdm-osf:dev
                            +  api:
                            +    image: rdm-osf:dev
                            +  web:
                            +    image: rdm-osf:dev
                            +  preprints:
                            +    environment:
                            +      - BACKEND=env
                            +    env_file:
                            +      - .docker-compose.osf-web.env
                            +  fakecas:
                            +    image: quay.io/centerforopenscience/fakecas:master
                            +    command: fakecas -host=0.0.0.0:8080 -osfhost=ec2.compute-1.amazonaws.com:5000 -dbaddress=postgres://postgres@postgres:5432/osf?sslmode=disable
                            +  registries:
                            +    environment:
                            +      - BACKEND=env
                            +    env_file:
                            +      - .docker-compose.osf-web.env
                            +  reviews:
                            +    environment:
                            +      - BACKEND=env
                            +    env_file:
                            +      - .docker-compose.osf-web.env
                            +
                            +

                            RDM-osf.io/website/settings/local.py +

                            DOMAIN = PROTOCOL + 'ec2.compute-1.amazonaws.com:5000/'
                            +INTERNAL_DOMAIN = DOMAIN
                            +API_DOMAIN = PROTOCOL + 'ec2.compute-1.amazonaws.com:8000/'
                            +OSF_COOKIE_DOMAIN = 'ec2.compute-1.amazonaws.com'
                            +

                            +

                            6. Docker Compose Up Requirements

                            +

                            Ensure you have the required services running: +

                            sudo docker compose up requirements wb_requirements mfr_requirements
                            +

                            +

                            7. Start Core Component Services (Detached)

                            +

                            Spin up denpent services: +

                            sudo docker compose up -d elasticsearch elasticsearch6 postgres mongo rabbitmq
                            +

                            +

                            8. Assets Setup

                            +

                            Remove your existing node_modules and start the assets: +

                            sudo rm -Rf ./node_modules
                            +sudo rm -Rf ./website/static/vendor/bower_components
                            +sudo rm -Rf ./admin/node_modules
                            +sudo rm -Rf ./admin/static/vendor/bower_components
                            +sudo docker compose up -d assets admin_assets
                            +

                            +

                            9. More Services

                            +

                            Upgrade dependency +RDM-osf.io/requirements/dev.txt +

                            pytest-xdist==1.34.0
                            +

                            +

                            Start additional services: +

                            sudo docker compose up -d unoconv mfr wb fakecas sharejs
                            +

                            +

                            10. Database Migration

                            +

                            When starting with an empty database you will need to run migrations and populate preprint providers. +Perform database migrations: +

                            sudo docker compose run --rm web python3 manage.py migrate
                            +
                            +See the Running arbitrary commands section below for instructions.

                            +

                            11. Run the Project

                            +

                            Finally start the OSF Web, API Server, and Preprints (Detached): +

                            sudo docker compose up -d wb_worker worker web api admin preprints ember_osf_web registries reviews
                            +

                            +

                            We can see containers and images list. +

                            sudo docker iamges
                            +sudo docker ps
                            +

                            +

                            We can see the rdm page through browser.

                            +

                            link : https://EC2-url:5000/

                            +

                            top page

                            +

                            Once you follow these steps, you should have a local environment up and running for development.

                            +

                            Configuration Guide

                            +

                            1. Let's Encrypt Setup

                            +

                            Configure AWS Credentials

                            +

                            Use the AWS CLI Docker image to configure your AWS credentials:

                            +

                            sudo docker run --rm -it -v "/root/.aws:/root/.aws" amazon/aws-cli configure
                            +
                            +Verify AWS Credentials +Nii has a Certificate Management Service link: https://certs.nii.ac.jp/ . You can contact to them if your service is created on NII infrastructure.

                            +

                            Verify if your AWS credentials are working and have nominal access to Route 53:

                            +

                            sudo docker run --rm -it -v "/root/.aws:/root/.aws" amazon/aws-cli route53 list-hosted-zones
                            +
                            +Request a Let's Encrypt Wildcard Certificate

                            +

                            Use the certbot/dns-route53 Docker image to request a wildcard certificate, forwarding your AWS credentials:

                            +
                            certbot certonly --dns-route53 --domain "your.com" --domain "*.your.com"
                            +
                            +

                            Automate Certificate Renewal

                            +

                            Create systemd timer to automate certificate renewal, then daemon-reload, enable, and start the timer. +Create /etc/systemd/system/certbot.service. For the docker command, remove --it for non-interactive execution by systemd, and pass /usr/bin to the container to allow execution of systemctl by --deploy-hook: +

                            [Unit]
                            +Description=Let's Encrypt certificate renewal
                            +
                            +[Service]
                            +Type=oneshot
                            +ExecStart=certbot renew --dns-route53 --quiet --agree-tos --deploy-hook "cd /home/ubuntu/RDM-osf.io && sudo docker compose restart web admin wb fakecas ember_osf_web  preprints registries reviews"
                            +

                            +

                            Then create /etc/systemd/system/certbot.timer: +

                            [Unit]
                            +Description=Monthly renewal of Let's Encrypt certificates
                            +
                            +[Timer]
                            +OnCalendar=monthly
                            +RandomizedDelaySec=12 hours
                            +Persistent=true
                            +
                            +[Install]
                            +WantedBy=timers.target
                            +

                            +

                            2. User Management

                            +

                            Setup SMTPrdm

                            +

                            We need to setup smtp and mailutils. We can install postfix with local only and deefault hostname +

                            apt install postfix mailutils
                            +

                            +

                            /etc/postfix/main.cf +

                            mynetworks = 10.0.0.0/0 # your network 
                            +inet_interfaces = all # 
                            +

                            +

                            Test for sending mail +

                            echo "test" | mail -s test root@ip-1-1-1-1.ap-northeast-1.compute.internal
                            +

                            +
                            root@ip-1-1-1-1:/etc/postfix# mail
                            +"/var/mail/root": 1 message 1 new
                            +>N   1 root               Mon Mar  4 05:29  14/656   test
                            +? 1  ### input number
                            +From: root <root@ip-1-1-1-1.ap-northeast-1.compute.internal>
                            +test
                            +
                            +

                            Create User

                            +

                            Method 1: +Create a user via register link: https://EC2-url:5000/register/

                            +

                            Method 2: +Create a user directly through the RDM shell. +

                            docker compose run --rm web invoke shell
                            +
                            +Create an OSF User with python code: +
                            user = OSFUser.create(username=<your_user@cos.io>,password=<password>,fullname=<full name>)
                            +

                            +
                            +

                            Note: User's registration status is to be shifted to True by adding user.is_registered = True user.have_email = True and user.date_confirmed = timezone.now(). Due to the lack of an inherited mail server in local environment, the newly created account is unable to send confirmation emails making the account unconfirmed.

                            +
                            +

                            Save your user with user.save() +Commit the changes with commit()

                            +

                            Admin User

                            +

                            Please refer to RDM-osf.io/admin/README.md for instructions on how to make existing user super admin.

                            + + + + + + + + + + + + + +
                            +
                            + + + +
                            + +
                            + + + +
                            +
                            +
                            +
                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/guides/ec2/index.html b/site/guides/ec2/index.html new file mode 100644 index 0000000..f566de2 --- /dev/null +++ b/site/guides/ec2/index.html @@ -0,0 +1,2879 @@ + + + + + + + + + + + + + + + + + + + + + + + EC2 Development Environment / EC2 での開発環境 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                            + +
                            + + + + +
                            + + +
                            + +
                            + + + + + + + + + +
                            +
                            + + + +
                            +
                            +
                            + + + + + + + +
                            +
                            +
                            + + + +
                            +
                            + +
                            +
                            + + + +
                            +
                            + + + + + + + +

                            EC2 Development Environment / EC2 での開発環境

                            +
                            +

                            Summary: Guide to setting up the GakuNin RDM development environment on Amazon EC2 +概要: Amazon EC2 に GakuNin RDM の開発環境を構築する手引き

                            +
                            +

                            Jump: English · 日本語

                            + +
                            +

                            +

                            English

                            +

                            → 日本語版へ

                            +

                            Overview

                            +

                            This guide shows how to set up the GakuNin RDM development environment on an Amazon EC2 instance.

                            +

                            Prerequisites

                            +
                              +
                            • An AWS account
                            • +
                            • Basic familiarity with Linux command-line tools
                            • +
                            • SSH access to your EC2 instance
                            • +
                            +

                            Quick start on EC2

                            +
                              +
                            1. Launch an EC2 instance (Ubuntu 22.04 or Amazon Linux 2 recommended)
                            2. +
                            3. Install Docker and Docker Compose
                            4. +
                            5. Clone this repository
                            6. +
                            7. Run ./installer/install.sh --yes
                            8. +
                            9. Configure your EC2 security group to allow HTTP (port 80) and SSH (port 22)
                            10. +
                            11. Open http://localhost:5000 in your browser
                            12. +
                            +
                            +

                            This command is available from milestone M2.

                            +
                            +

                            Legacy content

                            +

                            The legacy EC2 setup instructions are kept verbatim in README.legacy.md for reference and will be rewritten per milestone.

                            +
                            +

                            +

                            日本語

                            +

                            → To English

                            +

                            概要

                            +

                            このガイドは、Amazon EC2 上に GakuNin RDM の開発環境を構築する方法を示します。

                            +

                            前提条件

                            +
                              +
                            • AWS アカウント
                            • +
                            • Linux コマンドラインツールの基本的な使い方の理解
                            • +
                            • EC2 インスタンスへの SSH アクセス
                            • +
                            +

                            EC2 でのクイックスタート

                            +
                              +
                            1. EC2 インスタンスを起動する(Ubuntu 22.04 または Amazon Linux 2 を推奨)
                            2. +
                            3. Docker と Docker Compose をインストールする
                            4. +
                            5. このリポジトリを clone する
                            6. +
                            7. ./installer/install.sh --yes を実行する
                            8. +
                            9. EC2 のセキュリティグループで HTTP (ポート 80) と SSH (ポート 22) を許可する
                            10. +
                            11. ブラウザで http://localhost:5000 を開く
                            12. +
                            +
                            +

                            このコマンドは M2 マイルストーンから利用可能です。

                            +
                            +

                            過去のコンテンツ

                            +

                            過去の EC2 へのセットアップ手順は、参考のために README.legacy.md にそのまま残しており、マイルストーンごとに書き直す予定です。

                            +
                            +

                            Glossary / 用語

                            + + + + + + + + + + + + + + + + + + + + + + + + + +
                            TermEnglish note日本語注
                            EC2 (Elastic Compute Cloud)Amazon's service to run virtual computers on the internet.アマゾンがインターネット上で仮想コンピュータを実行するサービス。
                            Security groupA virtual firewall that controls traffic to your EC2 instance.EC2 インスタンスへのアクセスを制御する仮想のファイアウォール。
                            SSH (Secure Shell)A secure way to log in to your remote computer and run commands.リモートのコンピュータに安全にログインしてコマンドを実行する方法。
                            + + + + + + + + + + + + + +
                            +
                            + + + +
                            + +
                            + + + +
                            +
                            +
                            +
                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/guides/environment/README.legacy/index.html b/site/guides/environment/README.legacy/index.html new file mode 100644 index 0000000..4203c58 --- /dev/null +++ b/site/guides/environment/README.legacy/index.html @@ -0,0 +1,2834 @@ + + + + + + + + + + + + + + + + + + + + + + + 開発環境の準備 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                            + +
                            + + + + +
                            + + +
                            + +
                            + + + + + + + + + +
                            +
                            + + + +
                            +
                            +
                            + + + + + + + +
                            +
                            +
                            + + + +
                            +
                            +
                            + + + +
                            +
                            +
                            + + + +
                            +
                            + + + + + + + +

                            開発環境の準備

                            +

                            RDMは複数のマイクロサービスから構成されます。開発時にもこれらのサービスを動作させる必要がありますが、 +1つ1つのサービスを自身のOSに合わせてインストールしようとすると非常に手間がかかります。

                            +

                            そのため、Docker Compose を用いて開発環境を構築する方法が RDM-osf.ioドキュメント にて説明されています。

                            +

                            Dockerを用いることで、OS等の環境の差異をコンテナにより吸収することができます。本ドキュメントでは README-docker-compose.md に補助的な説明を加えていきます。

                            +

                            サービスの構成

                            +

                            docker-compose.ymlに定義されているサービスは以下の通りです。

                            +

                            Docker Compose

                            +

                            (Generated by https://github.com/pmsipilot/docker-compose-viz)

                            +

                            図中の円はポート番号, 矩形はサービスを示しています。 +サービスは大きく分けて以下の5種類に分類できます。(括弧はインストールされるRCOSDP内リポジトリ)

                            + +
                            +

                            GRDMでは preprints, registries は使用しません。

                            +
                            +

                            基本的な流れ

                            +
                              +
                            1. DockerとOSのセットアップ - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#docker-and-os-setup
                            2. +
                            3. Docker Composeを利用可能にするためにDocker Engineを自身の環境にインストールします。
                            4. +
                            5. RDMのサービス同士が互いに通信できるように、ループバックデバイスとして 192.168.168.167 を設定します。
                            6. +
                            7. ※注意: OSX ならびに Ubuntu については動作実績がありますが、Windows については動作が確認されていません。
                            8. +
                            9. アプリケーションの設定 - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#application-configuration
                            10. +
                            11. WebサーバとAPIサーバに関する、Djangoの設定ファイル local.py を準備します。特に変更の必要がなければ、それぞれの local-dist.py をコピーして使用します。
                            12. +
                            13. RDM-osf.io, RDM-waterbutlerリポジトリを使用するよう、Docker Composeサービス定義ファイルを変更します。docker-compose.yml を直接変更するのではなく、 docker-compose.override.yml を変更することで、誤って開発環境固有の情報をリポジトリにコミットすることを防止することができます。
                            14. +
                            15. アプリケーションの実行 - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#application-runtime
                            16. +
                            17. このDocker Compose環境は、Dockerイメージをベースに各サービスを起動しますが、PythonモジュールやNodeモジュールはイメージとは異なるボリュームに保持します。(開発中に更新される可能性を想定しているものと思われます。) そのため、サービス実行前に docker compose up requirements mfr_requirements wb_requirements を実施することで、必要なライブラリを各コンテナにインストールする必要があります。
                            18. +
                            19. ツールの利用 - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#running-arbitrary-commands
                            20. +
                            21. DjangoのMigrationファイルの作成や、RDMが保持するModelの確認、テストの実行など、Docker Compose経由でコマンドを実行することで、容易にこれらのコマンドを実行できます。
                            22. +
                            23. 環境のリセット - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#cleanup--docker-reset
                            24. +
                            25. Dockerを使うことで得られる恩恵の1つは、開発環境をいつでもリセットできるという点です。開発時の試行錯誤の副作用の蓄積を簡単にリセットし、動作確認を確実に行うことができます。
                            26. +
                            +

                            開発環境のカスタマイズ

                            +

                            初期状態では docker-compose.yml は quay.io/centerforopenscience/ からイメージを取得するようになっています。

                            +

                            GakuNin RDMの最新Docker Imageをベースに開発を行うには、これらのイメージを差し替える必要があります。以下の内容を docker-compose.override.yml に記述してください。 +(docker-compose.yml と同じディレクトリに作成してください。)

                            +
                            # Apple Silicon搭載Macの場合、platform指定のコメントアウト部分を外してARM版イメージを使用してください。
                            +services:
                            +  fakecas:
                            +    image: niicloudoperation/rdm-fakecas:latest
                            +    # platform: linux/arm64
                            +  # Apple Silicon搭載Macの場合、以下のコメントアウト部分を外してARM版Elasticsearchイメージを使用してください。
                            +  # elasticsearch:
                            +  #   image: quay.io/centerforopenscience/elasticsearch:es6-arm-6.3.1
                            +  #   platform: linux/arm64
                            +  admin:
                            +    image: niicloudoperation/rdm-osf.io:latest
                            +    # platform: linux/arm64
                            +    environment:
                            +      AWS_EC2_METADATA_DISABLED: "true"
                            +  admin_assets:
                            +    image: niicloudoperation/rdm-osf.io:latest
                            +    # platform: linux/arm64
                            +  api:
                            +    image: niicloudoperation/rdm-osf.io:latest
                            +    # platform: linux/arm64
                            +  assets:
                            +    image: niicloudoperation/rdm-osf.io:latest
                            +    # platform: linux/arm64
                            +  requirements:
                            +    image: niicloudoperation/rdm-osf.io:latest
                            +    # platform: linux/arm64
                            +    command:
                            +      - /bin/bash
                            +      - -c
                            +      - apk add --no-cache --virtual .build-deps build-base linux-headers python3-dev musl-dev libxml2-dev libxslt-dev postgresql-dev libffi-dev libpng-dev freetype-dev jpeg-dev &&
                            +        invoke requirements --all &&
                            +        (python3 -m compileall /usr/lib/python3.6 || true) &&
                            +        rm -Rf /python3.6/* &&
                            +        cp -Rf -p /usr/lib/python3.6 /
                            +  web:
                            +    image: niicloudoperation/rdm-osf.io:latest
                            +    # platform: linux/arm64
                            +    environment:
                            +      OAUTHLIB_INSECURE_TRANSPORT: '1'
                            +    # macOS 15.1.1以降の場合、5000ポートが使用されている場合があります。その場合は以下のコメントアウトをはずしてポートを変更してください。
                            +    # また、 `.docker-compose.env`, `.docker-compose.mfr.env`, `.docker-compose.wb.env` のポート指定 `:5000` にも同様の
                            +    # 変更を行ってください。
                            +    # ports: !override
                            +    #   - 5001:5000
                            +  worker:
                            +    image: niicloudoperation/rdm-osf.io:latest
                            +    # platform: linux/arm64
                            +  ember_osf_web:
                            +    image: niicloudoperation/rdm-ember-osf-web:latest
                            +    # platform: linux/amd64
                            +  cas:
                            +    image: niicloudoperation/rdm-cas-overlay:latest
                            +    # platform: linux/amd64
                            +  mfr:
                            +    image: niicloudoperation/rdm-modular-file-renderer:latest
                            +    # platform: linux/amd64
                            +    # ローカルのRDM-modular-file-rendererを試したい場合
                            +    # volumes:
                            +    #   - ../RDM-modular-file-renderer:/code
                            +  mfr_requirements:
                            +    image: niicloudoperation/rdm-modular-file-renderer:latest
                            +    # platform: linux/amd64
                            +    # ローカルのRDM-modular-file-rendererを試したい場合
                            +    # volumes:
                            +    #   - ../RDM-modular-file-renderer:/code
                            +  wb:
                            +    image: niicloudoperation/rdm-waterbutler:latest
                            +    # platform: linux/arm64
                            +    # ローカルのRDM-waterbutlerを試したい場合
                            +    # volumes:
                            +    #   - ../RDM-waterbutler:/code
                            +  wb_worker:
                            +    image: niicloudoperation/rdm-waterbutler:latest
                            +    # platform: linux/arm64
                            +    # ローカルのRDM-waterbutlerを試したい場合
                            +    # volumes:
                            +    #   - ../RDM-waterbutler:/code
                            +  wb_requirements:
                            +    image: niicloudoperation/rdm-waterbutler:latest
                            +    # platform: linux/arm64
                            +    # ローカルのRDM-waterbutlerを試したい場合
                            +    # volumes:
                            +    #   - ../RDM-waterbutler:/code
                            +
                            +

                            Apple Silicon搭載Macの場合、docker-compose.ymlのelasticsearchの制限に関するコメントアウト部分を外してください。 +Elasticsearch は並列分散処理ができるクラスタ設計されており、複数ノードでの連携を前提としています。開発環境のような単一ノードでの利用の場合はクラスタ機能を使う必要がないため、この設定を行うことで「シングルノードモード」で動作させるように指定します。またElasticsearch は起動時に「bootstrap チェック」という一連のシステム環境の検証を行います。その一部に system call filter の設定確認が含まれており、これはセキュリティ向上のために OS レベルの制限(システムコールのフィルタリング)を利用する機能です。しかし、Docker や他のコンテナ環境ではこのチェックが原因で起動エラーとなることがあります。 +ホスト側のデフォルトのulimit値がアプリケーションの要件を満たさない場合があるため、コンテナ内でのリソース制限を明示的に解除します。

                            +
                              elasticsearch:
                            +    image: elasticsearch:2
                            +    ports:
                            +      - 9200:9200
                            +    volumes:
                            +      - elasticsearch_data_vol:/usr/share/elasticsearch/data
                            +#    environment:
                            +#      - "ES_JAVA_OPTS=-Des.bootstrap.system_call_filter=false"
                            +#    ulimits:
                            +#      memlock:
                            +#        soft: -1
                            +#        hard: -1
                            +    stdin_open: true
                            +
                            +  # Temporary: Remove when we've upgraded to ES6
                            +  elasticsearch6:
                            +    image: docker.elastic.co/elasticsearch/elasticsearch:6.3.1
                            +    ports:
                            +      - 9201:9200
                            +    volumes:
                            +      - elasticsearch6_data_vol:/usr/share/elasticsearch/data
                            + #   environment:
                            + #     - "discovery.type=single-node"
                            + #     - "ES_JAVA_OPTS=-Des.bootstrap.system_call_filter=false"
                            + #   ulimits:
                            + #     memlock:
                            + #       soft: -1
                            + #       hard: -1
                            +    stdin_open: true
                            +
                            +

                            開発環境でRDMを起動する

                            +

                            サービスを起動する

                            +

                            Quickstart: Running all OSF services in the background に示されているように、以下のコマンドでサービスを実行することができます。

                            +
                            # ライブラリのインストール - 初回/ライブラリ定義変更時だけ必要
                            +$ docker compose up requirements mfr_requirements wb_requirements
                            +# DBのマイグレーション - 初回/DB定義変更時だけ必要
                            +$ docker compose run --rm web python3 manage.py migrate
                            +
                            +$ docker compose up -d assets admin_assets mfr wb wb_worker fakecas sharejs worker web api admin ember_osf_web
                            +
                            +
                            +

                            https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md では preprints, registries の起動について紹介していますが、GRDMでは preprints, registries は提供しないため無視してください。

                            +
                            +

                            シンプルな構成で起動する

                            +

                            動作確認したい内容に応じて、 mfr, admin_assets, admin, sharejs を除外することもできます。 +例えば、fakecasで認証し、プロジェクト作成、ファイル管理を確認したいだけであれば、

                            +
                            # ライブラリのインストール - 初回/ライブラリ定義変更時だけ必要
                            +$ docker compose up requirements wb_requirements
                            +# DBのマイグレーション - 初回/DB定義変更時だけ必要
                            +$ docker compose run --rm web python3 manage.py migrate
                            +
                            +$ docker compose up -d assets wb wb_worker fakecas worker web api ember_osf_web
                            +
                            +

                            でも十分でしょう。docker compose psで異常終了しているサービスがいないことを確認します。 +docker compose psの出力例は以下の通りです。docker compose up -dで指定したサービスがUpであることを確認します。

                            +
                            $ docker compose ps
                            +            Name                          Command               State                                              Ports                                           
                            +-------------------------------------------------------------------------------------------------------------------------------------------------------------------
                            +rdm2-osfio_api_1               docker-entrypoint.sh invok ...   Up       0.0.0.0:8000->8000/tcp                                                                    
                            +rdm2-osfio_assets_1            docker-entrypoint.sh invok ...   Up                                                                                                 
                            +rdm2-osfio_elasticsearch_1     /docker-entrypoint.sh elas ...   Up       0.0.0.0:9200->9200/tcp, 9300/tcp                                                          
                            +rdm2-osfio_ember_osf_web_1     docker-entrypoint.sh /bin/ ...   Up       0.0.0.0:41953->41953/tcp, 0.0.0.0:4200->4200/tcp                                          
                            +rdm2-osfio_fakecas_1           fakecas -host=0.0.0.0:8080 ...   Up       0.0.0.0:8080->8080/tcp                                                                    
                            +rdm2-osfio_postgres_1          docker-entrypoint.sh /bin/ ...   Up       0.0.0.0:5432->5432/tcp                                                                    
                            +rdm2-osfio_rabbitmq_1          docker-entrypoint.sh rabbi ...   Up       15671/tcp, 0.0.0.0:15672->15672/tcp, 25672/tcp, 4369/tcp, 5671/tcp, 0.0.0.0:5672->5672/tcp
                            +rdm2-osfio_requirements_1      docker-entrypoint.sh /bin/ ...   Exit 0                                                                                             
                            +rdm2-osfio_wb_1                invoke server                    Up       0.0.0.0:7777->7777/tcp                                                                    
                            +rdm2-osfio_wb_requirements_1   /bin/bash -c invoke instal ...   Exit 0                                                                                             
                            +rdm2-osfio_wb_worker_1         invoke celery                    Up       7777/tcp                                                                                  
                            +rdm2-osfio_web_1               docker-entrypoint.sh invok ...   Up       0.0.0.0:5000->5000/tcp                                                                    
                            +rdm2-osfio_worker_1            docker-entrypoint.sh invok ...   Up
                            +
                            +

                            cas-overlayを含む構成で起動する

                            +

                            fakecasは手軽にRDMの動作確認を行えますが、OAuthの動作確認などはできません。OAuthを用いたアプリケーションの開発時には、fakecasではなくcas-overlayを使ったテストが必要になります。このような場合、以下のようにfakecasの代わりに cas サービスを起動します。

                            +
                            # ライブラリのインストール - 初回/ライブラリ定義変更時だけ必要
                            +$ docker compose up requirements wb_requirements
                            +# DBのマイグレーション - 初回/DB定義変更時だけ必要
                            +$ docker compose run --rm web python3 manage.py migrate
                            +
                            +# fakecasではなくcasをサービスに指定する
                            +$ docker compose up -d assets wb wb_worker cas worker web api ember_osf_web
                            +
                            +# OAuthのスコープを登録する
                            +$ docker compose run --rm web python3 -m scripts.register_oauth_scopes
                            +
                            +

                            casはfakecasとは異なり、ログイン時に ユーザ作成手順(後述) において入力したパスワードが必要になります。他の操作方法はfakecasと同様です。

                            +

                            Web UIを開く

                            +

                            サービスが起動したことを確認したら、 http://localhost:5000 にアクセスし動作を確認してみましょう。

                            +

                            ログは docker compose logs コマンドで確認できます。ember_osf_webコンテナは起動にある程度時間がかかりますが、この状態を確認するには、以下のコマンドを入力します。

                            +
                            $ docker compose logs -f ember_osf_web
                            +...
                            +Build successful (xxxxxms) – Serving on http://0.0.0.0:4200/
                            +
                            +

                            テスト用ユーザを作成する

                            +

                            http://localhost:5000 が正常に参照できたら、Sign Upを行いましょう。以下の手順で行います。

                            +
                              +
                            1. Sign Upボタンを押し、ユーザ登録画面を開く
                            2. +
                            3. ユーザ登録画面に適当なユーザ名、Eメールアドレスとパスワードを入力する
                            4. +
                            5. デバッグログにEメール到達確認用のURL(http://localhost:5000/confirm/xxxxx/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/)が出力されるので、 docker compose logs web で確認する
                            6. +
                            +
                            +

                            本番環境の場合はここでEメールアドレス宛に到達確認用のURLを含むメールが届きますが、SMTPサーバを指定していないのでメールは送信されません。

                            +
                            +
                              +
                            1. 到達確認用のURLをブラウザでアクセスする
                            2. +
                            +
                            +

                            ブラウザはFirefoxを使用してください。Chromeの場合は、FakeCASとWeb UIの間でCookieが共有されず正常動作しない場合があります。

                            +
                            +

                            動作確認を実施する

                            +

                            これでユーザの作成は完了です。以降は、ログイン画面から、登録したEメールアドレスのみでログインできます。(開発用途に限定して利用してください。)

                            +

                            コマンドの実行例

                            +

                            ユニットテストを実行する

                            +

                            全てのユニットテストを実行するには、以下のようにコマンドを入力します。 +requirements サービスによりテストに必要なライブラリがインストールされ、invoke testでテストが実行できます。

                            +
                            # 初回だけ必要
                            +$ docker compose up requirements
                            +
                            +$ docker compose run --rm web invoke test
                            +
                            +

                            テストコードを限定する方法は https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#application-tests に記載されています。

                            +

                            Migrationファイルを作成する

                            +

                            RDM-osf.ioはDjangoアプリケーションとして実装されています。モデルの変更を行った場合、適切にデータベーススキーマに変更が反映されるよう、Migrationsファイルを作成する必要があります。 +以下のコマンドを入力することで、Djangoの管理コマンド makemigrations を実行できます。

                            +
                            $ docker compose run --rm web python3 manage.py makemigrations
                            +
                            +

                            作成したMigrationsファイルは、以下のコマンドで postgresサービスに反映できます。

                            +
                            $ docker compose run --rm web python3 manage.py migrate
                            +
                            +

                            ユーザを機関に所属させる

                            +

                            機関に関する機能を試すためには、ユーザを機関に所属させる必要があります。 +このような場合は、以下の手順を実施してください。

                            +

                            まず、実行中のRDMのデータベースに機関の情報を登録します。これは初回だけ必要です。

                            +
                            $ docker compose run --rm web python3 -m scripts.populate_institutions -e test -a
                            +
                            +

                            上記のコマンドを実行すると、Virginia Tech [Test] などの機関名を持つ機関が登録されます。

                            +

                            次に、shell機能を使って、ユーザに機関を紐付けます。以下のコマンドを実行します。

                            +
                            $ docker compose run --rm web invoke shell
                            +
                            +

                            上記コマンドを実行すると、以下のようなプロンプトが現れますので、Pythonスクリプトで処理を指示します。下記のようにスクリプトを実行すると、指定したEmailアドレスを持つユーザのモデルを取得することができます。

                            +
                            In[1]: user = OSFUser.objects.get(username='登録したEmailアドレス')
                            +
                            +In [2]: user
                            +Out[2]: <OSFUser('登録したEmailアドレス') with guid '登録されたユーザID'>
                            +
                            +

                            ユーザが所属する機関のリストは、user.affiliated_institutionsで管理されます。このリストに、先に登録した機関に対応するInstitutionオブジェクトを追加すると、ユーザを機関に所属させることができます。

                            +
                            # 機関名は例えば Virginia Tech [Test] 等: [i.name for i in Institution.objects.all()] で確認できる
                            +In [4]: user.affiliated_institutions.add(Institution.objects.get(name='機関名'))
                            +
                            +

                            変数を編集したら、モデルに対してsaveメソッドを呼び出し、commitも忘れないようにしておきましょう。

                            +
                            In [5]: user.save()
                            +
                            +In [6]: commit()
                            +Transaction committed.
                            +New transaction opened.
                            +
                            +

                            これでユーザを機関に所属させることができました。試しに、New Projectから新規プロジェクトの作成を実施してみましょう。所属のところに、Institutionで指定した機関が表示されます。

                            +

                            Institution

                            +

                            adminアクセス可能なユーザへと変更する

                            +

                            管理者機能は http://localhost:8001/ からアクセスすることができます。 +ユーザがadminアクセス可能かどうかは is_staff プロパティで定義することができます。

                            +

                            is_staffの編集には、shell機能を使います。

                            +
                            $ docker compose run --rm web invoke shell
                            +
                            +

                            shellから以下のようにコマンドを実行することで、指定したユーザの is_staff プロパティを変更することができます。

                            +
                            In[1]: user = OSFUser.objects.get(username='登録したEmailアドレス')
                            +
                            +In [2]: user
                            +Out[2]: <OSFUser('登録したEmailアドレス') with guid '登録されたユーザID'>
                            +
                            +In [3]: user.is_staff = True
                            +
                            +In [4]: user.save()
                            +
                            +In [5]: commit()
                            +Transaction committed.
                            +New transaction opened.
                            +
                            + + + + + + + + + + + + + +
                            +
                            + + + +
                            + +
                            + + + +
                            +
                            +
                            +
                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/guides/environment/images/docker-compose.png b/site/guides/environment/images/docker-compose.png new file mode 100644 index 0000000..7802b7c Binary files /dev/null and b/site/guides/environment/images/docker-compose.png differ diff --git a/site/guides/environment/images/institution.png b/site/guides/environment/images/institution.png new file mode 100644 index 0000000..432244f Binary files /dev/null and b/site/guides/environment/images/institution.png differ diff --git a/site/guides/environment/images/rdmTop.png b/site/guides/environment/images/rdmTop.png new file mode 100644 index 0000000..d2ac375 Binary files /dev/null and b/site/guides/environment/images/rdmTop.png differ diff --git a/site/guides/environment/index.html b/site/guides/environment/index.html new file mode 100644 index 0000000..82b5ee5 --- /dev/null +++ b/site/guides/environment/index.html @@ -0,0 +1,2896 @@ + + + + + + + + + + + + + + + + + + + + + + + Environment / 環境設定と開発環境 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                            + +
                            + + + + +
                            + + +
                            + +
                            + + + + + + + + + +
                            +
                            + + + +
                            +
                            +
                            + + + + + + + +
                            +
                            +
                            + + + +
                            + +
                            + + + +
                            +
                            + + + + + + + +

                            Environment / 環境設定と開発環境

                            +
                            +

                            Summary: Guide to setting up the development environment for GakuNin RDM using Docker Compose and the 2027 installer +概要: GakuNin RDM の開発環境を Docker Compose と 2027 インストーラーで構築する手引き

                            +
                            +

                            Jump: English · 日本語

                            + +
                            +

                            +

                            English

                            +

                            → 日本語版へ

                            +

                            Overview

                            +

                            This guide shows how to set up the GakuNin RDM development environment.

                            +
                            +

                            Warning: The loopback alias 192.168.168.167 and docker-compose.override.yml method described below are the OLD way. The 2027 installer uses a Compose internal network and 127.0.0.1 only. See ADR-02 Network Model and SPEC-02 Installer CLI.

                            +
                            +

                            For the current method, use the 2027 installer (installer/install.sh) which creates a self-contained environment under runtime/ with no host network changes.

                            +

                            Docker Compose services

                            +

                            The development environment uses Docker Compose to run multiple microservices:

                            +
                              +
                            • Data storage & sharing services: PostgreSQL, Elasticsearch, RabbitMQ, MongoDB
                            • +
                            • Core services: web server, API server, admin interface, worker (RDM-osf.io), WaterButler file storage service
                            • +
                            • UI services: Ember frontend, Modular File Renderer (MFR), Unoconv file converter
                            • +
                            • Test authentication service: FakeCAS or CAS-Overlay for OAuth testing
                            • +
                            +
                            +

                            In GakuNin RDM, the preprints and registries services are not used.

                            +
                            +

                            Quick start

                            +
                              +
                            1. Clone this repository
                            2. +
                            3. Run ./installer/install.sh --yes
                            4. +
                            5. Open http://127.0.0.1:5000 in your browser
                            6. +
                            +
                            +

                            This command is available from milestone M2.

                            +
                            +

                            Legacy content

                            +

                            The legacy Docker Compose instructions (loopback alias, manual setup) are kept verbatim in README.legacy.md for reference and will be rewritten per milestone.

                            +
                            +

                            +

                            日本語

                            +

                            → To English

                            +

                            概要

                            +

                            このガイドは、GakuNin RDM の開発環境を構築する方法を示します。

                            +
                            +

                            警告: 以下に説明する ループバックエイリアス 192.168.168.167 と docker-compose.override.yml の方法は、昔の方法です。2027 インストーラーは Compose の内部ネットワークと 127.0.0.1 のみを使用します。詳細は ADR-02 ネットワークモデル と SPEC-02 インストーラー CLI を参照してください。

                            +
                            +

                            現在の方法では、installer/install.sh コマンドを使用して、ホストのネットワーク設定を変更せずに runtime/ ディレクトリ内に自己完結型の環境を作成します。

                            +

                            Docker Compose サービス

                            +

                            開発環境は、複数のマイクロサービスを Docker Compose で実行します:

                            +
                              +
                            • データ保存・共有サービス: PostgreSQL, Elasticsearch, RabbitMQ, MongoDB
                            • +
                            • コアサービス: Webサーバー、APIサーバー、管理画面、ワーカー (RDM-osf.io)、WaterButler ファイルストレージサービス
                            • +
                            • UI サービス: Ember フロントエンド、Modular File Renderer (MFR)、Unoconv ファイル変換サービス
                            • +
                            • テスト認証サービス: FakeCAS または CAS-Overlay (OAuth テスト用)
                            • +
                            +
                            +

                            GakuNin RDM では、preprints と registries サービスは使用しません。

                            +
                            +

                            クイックスタート

                            +
                              +
                            1. このリポジトリを clone する
                            2. +
                            3. ./installer/install.sh --yes を実行する
                            4. +
                            5. ブラウザで http://127.0.0.1:5000 を開く
                            6. +
                            +
                            +

                            このコマンドは M2 マイルストーンから利用可能です。

                            +
                            +

                            過去のコンテンツ

                            +

                            過去の Docker Compose の手順(ループバックエイリアス、手動設定)は、参考のために README.legacy.md にそのまま残しており、マイルストーンごとに書き直す予定です。

                            +
                            +

                            Glossary / 用語

                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                            TermEnglish note日本語注
                            Docker ComposeA tool that runs multiple containers together using one configuration file.1つの設定ファイルで複数のコンテナを一緒に実行するツール。
                            MicroserviceA small program that does one job and works with other programs over the network.1つの仕事をする小さなプログラムで、ネットワーク経由で他のプログラムと連携します。
                            Loopback aliasA fake IP address added to your computer so programs can talk to each other.プログラム同士が通信できるようにコンピュータに追加する仮の IP アドレス。
                            Compose internal networkA private network created by Docker Compose so containers can talk without changing your computer.Docker Compose が作るプライベートネットワークで、コンピュータを変更せずにコンテナ同士が通信できます。
                            + + + + + + + + + + + + + +
                            +
                            + + + +
                            + +
                            + + + +
                            +
                            +
                            +
                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/guides/index.html b/site/guides/index.html new file mode 100644 index 0000000..f594bd0 --- /dev/null +++ b/site/guides/index.html @@ -0,0 +1,2757 @@ + + + + + + + + + + + + + + + + + + + + + + + Guides / ガイド - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                            + +
                            + + + + +
                            + + +
                            + +
                            + + + + + + + + + +
                            +
                            + + + +
                            +
                            +
                            + + + + + + + +
                            +
                            +
                            + + + +
                            +
                            +
                            + + + +
                            +
                            +
                            + + + +
                            +
                            + + + + + + + +

                            Guides / ガイド

                            +
                            +

                            Summary: Collection of guides for RDM addon development and environment setup +概要: RDM アドオン開発と環境セットアップのためのガイド集

                            +
                            +

                            Jump: English · 日本語

                            + +
                            +

                            +

                            English

                            +

                            → 日本語版へ

                            +

                            Available Guides

                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                            TitleDescription
                            EnvironmentDevelopment environment setup with Docker Compose and the 2027 installer
                            EC2Setting up RDM on Amazon EC2
                            SkeletonCreating your first addon using the skeleton template
                            Storage AddonBuilding storage addons for external services
                            Screen ExpansionAdding dashboard widgets and page tabs
                            APIUsing and exposing APIs in addons
                            Admin AddonCreating administrator-level addons with institutional management
                            +
                            +

                            +

                            日本語

                            +

                            → To English

                            +

                            利用可能なガイド

                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                            タイトル説明
                            環境Docker Compose と 2027 インストーラーでの開発環境セットアップ
                            EC2Amazon EC2 への RDM セットアップ
                            スケルトンスケルトンテンプレートを使用した最初のアドオン作成
                            ストレージアドオン外部サービス用のストレージアドオン構築
                            画面拡張ダッシュボードウィジェットとページタブの追加
                            APIアドオンでの API の使用と公開
                            管理者アドオン機関管理機能を持つ管理者レベルのアドオン作成
                            + + + + + + + + + + + + + +
                            +
                            + + + +
                            + +
                            + + + +
                            +
                            +
                            +
                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/guides/screen-expansion/README.legacy/index.html b/site/guides/screen-expansion/README.legacy/index.html new file mode 100644 index 0000000..2cd3fb2 --- /dev/null +++ b/site/guides/screen-expansion/README.legacy/index.html @@ -0,0 +1,3103 @@ + + + + + + + + + + + + + + + + + + + + + + + 画面拡張アドオンの作成 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                            + +
                            + + + + +
                            + + +
                            + +
                            + + + + + + + + + +
                            +
                            + + + +
                            +
                            +
                            + + + + + + + +
                            +
                            +
                            + + + +
                            +
                            +
                            + + + +
                            +
                            +
                            + + + +
                            +
                            + + + + + + + +

                            画面拡張アドオンの作成

                            +

                            以下の機能を持つ画面拡張アドオンを実装します。

                            +
                              +
                            • プロジェクトダッシュボード上のアドオンのウィジェッド
                            • +
                            • プロジェクトのナビゲーションバーから遷移できるアドオンの画面タブ(Emberを利用)
                            • +
                            +

                            基本的なアドオンの概要はスケルトンの作成を参照してください。

                            +

                            前提条件

                            +

                            開発環境の準備のガイドに従い、開発環境にてRDMを起動しているものとします。

                            +

                            画面拡張アドオンの設計

                            +

                            サービスの構成

                            +

                            画面拡張アドオンは以下の2つの要素から構成されます。

                            +
                              +
                            • OSF.ioサービスで動作するAddon: ユーザ・プロジェクト設定の管理
                            • +
                            • ember-osf-webサービスで動作する画面タブモジュール: 画面タブのView定義
                            • +
                            +

                            ember-osf-webは、 Ember.js をベースとしたOSFのフロントエンドUIの実装です。もともと、OSF.ioがフロントエンドも担当していましたが、COSはEmber.jsベースのコードに移行を進めています。

                            +

                            現在はosf-web(OSF.io)が外部からのリクエストを受け、要求されたエンドポイントをember-osf-webがサポートしていると判断される場合は、osf-webがember-osf-webに対してリクエストを転送する形式を取っています。実際のデータベースに対する操作は、従来のosf-api(OSF.io apiserver)が担います。ember-osf関連のフロントエンドは、必要に応じてAPIサーバへの問い合わせを行うことで、データベースに対する変更やストレージに対する操作を実施することができます。

                            +

                            ファイルの構成

                            +

                            典型的なファイル配置は以下のようになります。

                            +

                            OSF.io Addonのファイル構成

                            +
                            +

                            クラス構成はスケルトン アドオンと同様です。

                            +
                            +
                            /addons/アドオン名/
                            +├── __init__.py ... モジュールの定義
                            +├── apps.py ... (**) アプリケーションの定義
                            +├── models.py ... モデルの定義
                            +├── requirements.txt ... 利用するPythonモジュールの定義
                            +├── routes.py ... (**) View(Routes)の定義
                            +├── settings ... 設定を定義するモジュール
                            +│   ├── defaults.py ... デフォルト設定の定義
                            +│   └── __init__.py ... 設定の定義
                            +├── static ... Webブラウザから読み込むことを想定した静的ファイル
                            +│   ├── comicon.png ... アドオンのアイコン
                            +│   ├── アドオン名.css ... (*) ウィジェットのCSSファイル
                            +│   ├── node-cfg.js ... Node設定のエントリとなるJavaScriptファイル
                            +│   └── widget-cfg.js ... (*) ウィジェットのJavaScriptファイル
                            +├── templates ... テンプレートディレクトリ
                            +│   └── node_settings.mako ... Node設定パネル
                            +├── tests ... テストコード
                            +│   ├── __init__.py
                            +│   ├── conftest.py
                            +│   ├── factories.py
                            +│   ├── test_model.py
                            +│   ├── (**) test_view.py
                            +│   └── utils.py
                            +├── utils.py ... (*) ユーティリティ関数の定義
                            +└── views.py ... (**) View(Views)の定義
                            +
                            +

                            (*)が付いているファイルはスケルトン アドオンには存在しないファイルです。
                            +(**)が付いているファイルはスケルトン アドオンに存在しますが、変更が加えられているファイルです。

                            +

                            ember-osf-web 画面タブのファイル構成

                            +
                            app
                            +├── guid-node/アドオン名 ... アドオンの画面タブモジュール定義
                            +│   ├── controller.ts ... 画面タブのコントローラ定義
                            +│   ├── route.ts ... 画面タブのルーティング定義
                            +│   ├── styles.scss ... 画面タブのCSS(SCSS)定義
                            +│   └── template.hbs ... 画面タブのテンプレートファイル
                            +├── models/モデル名.ts ... 画面タブで使うモデル定義
                            +├── adapters/モデル名.ts ... 画面タブで使うモデルのアダプタ定義
                            +└── serializers/モデル名.ts ... 画面タブで使うモデルのシリアライザ定義
                            +
                            +tests ... テストコード
                            +├── acceptance/guid-node/アドオン名-test.ts
                            +└── unit/guid-node/アドオン名/controller-test.ts
                            +
                            +mirage ... アダプタ接続先APIのテスト用モック定義
                            +├── factories/モデル名.ts
                            +└── views/モデル名.ts
                            +
                            +

                            OSF.io Addonのモジュール構成

                            +

                            スケルトン アドオンと大きな違いはありません。スケルトン アドオンとの違いを中心に説明していきます。

                            +

                            Modelの構成

                            +

                            Modelの構成はスケルトン アドオンと同じです。

                            +

                            Viewの構成

                            +

                            スケルトン アドオンのViewsおよびRoutesの定義に、画面タブ用の定義を追加します。

                            +

                            画面タブでアドオンのデータをやり取りするには、ember-osf-webに新しくモデルを定義し、そのモデルに対応するJSON APIをOSF.io側に定義する必要があります。
                            +データは以下のような JSON:API で定められたフォーマットでやり取りします。

                            +
                            {
                            +  "data": {
                            +    "id": nodeのID
                            +    "type": "モデル名",
                            +    "attributes": データのDictionary
                            +  }
                            +}
                            +
                            +

                            My Screenアドオンの場合、以下のようにRoutesとViewsを定義します。

                            + +

                            フレームワークによって提供されるView

                            +

                            アドオンのウィジェット定義を追加します。

                            +

                            ウィジェットテンプレートは website/templates/util/render_addon_widget.mako に定義します。 +ウィジェットテンプレートの設定は website/project/views/node.py に定義します。

                            +

                            ウィジェットで使うJavaScriptは /addons/アドオン名/static/widget-cfg.js で、CSSは /addons/アドオン名/static/アドオン名.css で定義します。CSSはJavaScriptファイルから require() を使って読み込みます。

                            +

                            My Screenアドオンの場合、以下のように定義します。

                            + +

                            国際化

                            +

                            国際化の設定は website/translations/ 以下のファイルに、以下のように定義します。

                            +
                            msgid メッセージID
                            +msgstr 国際化後の文字列
                            +
                            +

                            *.pot ファイルには msgstr を "" (空文字)にして定義します。 +messages.* にはmakoのテンプレートファイルで使う国際化設定を、 js_messages.* にはJavaScriptで使う国際化設定を定義します。

                            +

                            JavaScriptで文字列を国際化するのは、以下のように書きます。

                            +
                            var _ = require('js/rdmGettext')._;
                            +const localizedStr = _('メッセージID');
                            +
                            +

                            makoで文字列を国際化するのは、以下のように書きます。

                            +
                            ${_("メッセージID")}
                            +
                            +

                            設定モジュール

                            +

                            設定モジュールはスケルトン アドオンと同じです。

                            +

                            AddonAppConfigの定義

                            +

                            ウィジェットと画面タブを有効にするために、 /addons/アドオン名/app.py の AddonAppConfig.views に、'widget' と 'page' を追加します。

                            +
                            class AddonAppConfig(BaseAddonAppConfig):
                            +    # 中略
                            +    views = ['widget', 'page']
                            +    # 中略
                            +
                            +

                            My Screenアドオンの場合、以下のように定義します。

                            + +

                            テストコード

                            +

                            スケルトン アドオンと同様に、ユニットテストを定義します。
                            +My Screenアドオンの場合、以下のように定義します。

                            + +

                            ember-osf-web 画面タブのモジュール構成

                            +

                            ember-osf-webは TypeScript によって実装されます。
                            +アプリケーションのコードは app/ に実装されます。

                            +

                            ember-osf-webは、OSFの画面を構成するページを単位としてモジュール分割されています。

                            +

                            router.ts

                            +

                            router.ts は、ページ全体を束ねるルーティング定義ファイルです。

                            +

                            例えば、 /プロジェクトID/アドオン名 というパスを追加する場合は、 Router.map に渡す関数に以下を追加します。

                            +
                            this.route('guid-node', { path: '--node/:guid' }, function() {
                            +    this.route('アドオン名');
                            +});
                            +
                            +

                            このパスにリクエストが与えられると、 app/guid-node/アドオン名 で定義されたページに処理が移行します。

                            +

                            ページの実装

                            +

                            画面の実装

                            +

                            画面の実装は Handlebars templating library を使用して、 template.hbs ファイルに定義します。

                            +

                            画面上の文字列は全て国際化を考慮し、 translations/en-us.yml に定義された値を埋め込む必要があります。

                            +

                            My Screenアドオンの場合、以下のように定義します。

                            + +
                            +

                            ボタン や DatePicker 、 ダイアログボックス などは、別のコンポーネントとして定義することで再利用できるようになっています。 +lib/osf-components のコードを確認して、コンポーネントを利用しましょう。

                            +
                            +

                            コントローラの定義

                            +

                            画面に埋め込む変数やハンドラの制御はコントローラが担います。
                            +コントローラには template.hbs に埋め込まれる変数やイベントに対する処理を記述します。

                            +

                            My Screenアドオンの場合、以下のように定義します。

                            + +

                            また、コントローラとバックエンドのやり取りは、Ember Dataが提供する DS.Store オブジェクトを経由して行われます。
                            +DS.Storeで操作可能なオブジェクトは models に定義され、 adapters に定義されたルールに基づき、APIサーバを介したオブジェクトの操作を行います。

                            +

                            なお、APIサーバは JSON:API に則っていることを前提とすることで、adapterは細かなエンドポイント生成処理を定義することなく、APIサーバとの連携を実現することができます。
                            +エンドポイント生成処理をカスタマイズしたい場合は、 serializers に定義を追加します。

                            +

                            My Screenアドオンの場合、myscreen-config というmodelと、対応するadapterおよびserializerを以下のように定義します。

                            + +

                            スタイルの定義

                            +

                            スタイルは Sass(SCSS) を使用して、 styles.scss ファイルに定義します。
                            +My Screenアドオンの場合、以下のように定義します。

                            + +

                            ルーティングの定義

                            +

                            モジュールに関する追加の経路定義を route.ts に定義します。
                            +My Screenアドオンの場合、以下のように定義します。

                            + +

                            テストコード

                            +

                            テストコードは tests/ に定義します。 +テストに使うAPIのモックは、 Mirage を使用して mirage/ に定義します。

                            +

                            My Screenアドオンの場合、以下のように定義します。

                            + +

                            My Screenアドオンの実装

                            +

                            ここでは、 myscreen という識別名のアドオンの実装を例に説明します。アドオンの完全名は My Screen とします。

                            +

                            アドオン名は様々な場所に埋め込まれています。アドオン名を変更したい場合は、以降で追加・変更するファイル名やコードの myscreen 、 My Screen 、 MyScreen という文字列を変更してください。

                            +

                            OSF.ioへの実装

                            +

                            addons.myscreen モジュールの定義

                            +

                            スケルトン アドオンと同様に、アドオンの実装例(osf.io/addon/)を addons/myscreen ディレクトリにコピーします。

                            +

                            RDMコードの変更

                            +

                            スケルトン アドオンと同様に、RDMのコードをいくつか変更します。

                            + +

                            ウィジェットテンプレートの変更

                            +

                            website/templates/util/render_addon_widget.mako に、ウィジェットのテンプレート定義を追加します。

                            +
                            % if addon_name == 'myscreen':
                            +    <div id="myscreen-content" class="scripted">
                            +        <!-- ko if: loading -->
                            +        <div>${_("Loading")}</div>
                            +        <!-- /ko -->
                            +        <!-- ko if: loadFailed -->
                            +        <div class="text-danger">${_("Error occurred")}</div>
                            +        <!-- /ko -->
                            +        <!-- ko if: loadCompleted -->
                            +        <h5 style="padding: 0.2em;">${_("My Screen Test")}</h5>
                            +        <div>
                            +            <label data-bind="text: param_1_label"></label>
                            +            <p data-bind="text: param_1"></p>
                            +        </div>
                            +        <!-- /ko -->
                            +    </div>
                            +% endif
                            +
                            +

                            website/project/views/node.py の view_project() 関数に、My Screenアドオンのウィジェットデータを読み込むコードを追加します。

                            +
                            def view_project(auth, node, **kwargs):
                            +    # 中略
                            +    addons_widget_data = {
                            +        # 中略
                            +        'myscreen': None
                            +    }
                            +
                            +    if 'myscreen' in ret['addons']:
                            +        addons_widget_data['myscreen'] = serialize_myscreen_widget(node)
                            +    # 中略
                            +
                            +

                            それぞれの変更例は、サンプル render_addon_widget.mako と node.py を参照してください。

                            +

                            国際化ファイルの変更

                            +

                            website/translations/ 以下の各国際化ファイルに、アドオンで表示する文字列の国際化設定を追加します。

                            +

                            website/translations/messages.pot と website/translations/en/LC_MESSAGES/messages.po:

                            +
                            #: website/templates/util/render_addon_widget.mako:245
                            +msgid "My Screen Test"
                            +msgstr ""
                            +
                            +

                            website/translations/ja/LC_MESSAGES/messages.po:

                            +
                            #: website/templates/util/render_addon_widget.mako:245
                            +msgid "My Screen Test"
                            +msgstr "My Screen テスト"
                            +
                            +

                            website/translations/js_messages.pot と website/translations/en/LC_MESSAGES/js_messages.po:

                            +
                            #: addons/myscreen/static/widget-cfg.js:22
                            +msgid "My Screen Param1 Label"
                            +msgstr ""
                            +
                            +

                            website/translations/ja/LC_MESSAGES/js_messages.po:

                            +
                            #: addons/myscreen/static/widget-cfg.js:22
                            +msgid "My Screen Param1 Label"
                            +msgstr "パラメーター1"
                            +
                            +

                            変更例は、サンプル translations/ を参照してください。

                            +

                            Migrationsファイルの作成

                            +

                            makemigrations コマンドを実行して、Migrationsファイルを作成します。

                            +
                            $ docker compose run --rm web python3 manage.py makemigrations
                            +
                            +

                            上記の出力中に以下のような出力が現れれば成功です。

                            +
                            Migrations for 'addons_myscreen':
                            +  addons/myscreen/migrations/0001_initial.py
                            +    - Create model NodeSettings
                            +    - Add field user_settings to nodesettings
                            +
                            +

                            Widgetの表示位置のカスタマイズ

                            +

                            デフォルトでは、アドオンのWidgetはダッシュボードの左カラムの下部(FileViewerの下)に、アドオンの名前順で表示されます。表示位置を変更する場合は、 website/templates/project/project.mako ファイルを編集します。

                            +
                            +

                            今後、プロジェクトダッシュボードの表示もEmber化されることが考えられます。その場合は、Ember側も合わせて変更する必要があります。

                            +
                            +

                            左カラムの一番上(Wikiウィジェットの上)に表示したい場合は、以下のように修正します。

                            +
                            @@ -431,6 +431,10 @@
                            +
                            +     <div class="col-sm-12 col-md-6 osf-dash-col">
                            +
                            ++        % if 'myscreen' in addons_enabled and addons['myscreen']['has_widget']:
                            ++            ${ render_addon_widget.render_addon_widget('myscreen', addons_widget_data['myscreen']) }
                            ++        % endif
                            ++
                            +         %if user['show_wiki_widget']:
                            +             ${ render_addon_widget.render_addon_widget('wiki', addons_widget_data['wiki']) }
                            +         %endif
                            +@@ -470,7 +474,7 @@
                            +             <!-- Show widgets in left column if present -->
                            +             % for addon in addons_enabled:
                            +                 % if addons[addon]['has_widget']:
                            +-                    %if addon != 'wiki' and addon != 'iqbrims': ## We already show the wiki widget at the top
                            ++                    %if addon != 'wiki' and addon != 'iqbrims' and addon != 'myscreen': ## We already show the wiki widget at the top
                            +                         ${ render_addon_widget.render_addon_widget(addon, addons_widget_data[addon]) }
                            +                     %endif
                            +                 % endif
                            +
                            +

                            右カラムの一番上に表示したい場合は、以下のように修正します。

                            +
                            @@ -470,7 +470,7 @@
                            +             <!-- Show widgets in left column if present -->
                            +             % for addon in addons_enabled:
                            +                 % if addons[addon]['has_widget']:
                            +-                    %if addon != 'wiki' and addon != 'iqbrims': ## We already show the wiki widget at the top
                            ++                    %if addon != 'wiki' and addon != 'iqbrims' and addon != 'myscreen': ## We already show the wiki widget at the top
                            +                         ${ render_addon_widget.render_addon_widget(addon, addons_widget_data[addon]) }
                            +                     %endif
                            +                 % endif
                            +             % endfor
                            +         % else:
                            +             <!-- If no widgets, show components -->
                            +             ${children()}
                            +         % endif
                            +
                            +     </div>
                            +
                            +     <div class="col-sm-12 col-md-6 osf-dash-col">
                            ++        % if 'myscreen' in addons_enabled and addons['myscreen']['has_widget']:
                            ++            ${ render_addon_widget.render_addon_widget('myscreen', addons_widget_data['myscreen']) }
                            ++        % endif
                            ++
                            +         % if addons:
                            +             <!-- Show IQB-RIMS widgets in right column if present -->
                            +             % for addon in addons_enabled:
                            +
                            +

                            変更例は、サンプル project.mako を参照してください。

                            +

                            画面タブリンクの表示位置のカスタマイズ

                            +

                            デフォルトでは、アドオン画面タブのリンクはナビゲーションバーのFiles(ファイル)タブの右に、アドオンの名前順で表示されます。表示位置を変更する場合は、website/templates/project/project_header.mako ファイルを編集します。

                            +
                            +

                            アドオン画面タブなどのember-osf-webが提供するViewを開いているときは、ember-osf-webで定義した node-navbar コンポーネントのテンプレート(後述)に従って表示されます。

                            +
                            +

                            アドオンリストの最後(Analytics(分析)の前)に表示する場合は、以下のように修正します。

                            +
                            @@ -43,7 +43,7 @@
                            +                         <!-- Add-on tabs  -->
                            +                         % for addon in addons_enabled:
                            +
                            +-                            % if addons[addon]['has_page']:
                            ++                            % if addon != 'myscreen' and addons[addon]['has_page']:
                            +                                 <li>
                            +                                     <a href="${node['url']}${addons[addon]['short_name']}">
                            +
                            +                                         % if addons[addon]['icon'] and addons[addon]['has_page_icon']:
                            +                                             <img src="${addons[addon]['icon']}" class="addon-logo"/>
                            +                                         % endif
                            +                                         ${addons[addon]['full_name']}
                            +                                     </a>
                            +                                 </li>
                            +                             % endif
                            +                         % endfor
                            +
                            ++                        % if 'myscreen' in addons_enabled and addons['myscreen']['has_page']:
                            ++                            <li>
                            ++                                <a href="${node['url']}${addons['myscreen']['short_name']}">
                            ++
                            ++                                    % if addons['myscreen']['icon'] and addons['myscreen']['has_page_icon']:
                            ++                                        <img src="${addons['myscreen']['icon']}" class="addon-logo"/>
                            ++                                    % endif
                            ++                                    ${addons['myscreen']['full_name']}
                            ++                                </a>
                            ++                            </li>
                            ++                        % endif
                            ++
                            +                         % if project_analytics:
                            +                         % if node['is_public'] or user['is_contributor_or_group_member']:
                            +                             <li><a href="${node['url']}analytics/">${ _("Analytics") }</a></li>
                            +
                            +

                            変更例は、サンプル project_header.mako を参照してください。

                            +

                            アドオンのテスト

                            +

                            以下のコマンドで、OSF.ioに追加したMy Screenアドオンのユニットテストを実行できます。

                            +
                            $ docker compose run --rm web invoke test_module -m addons/myscreen/tests/
                            +
                            +

                            ember-osf-webへの実装

                            +

                            画面タブの実装

                            +

                            画面タブの実装例(ember-osf-web/app/guid-node/myscreen/) を app/guid-node/myscreen ディレクトリにコピーします。

                            +

                            myscreen-config モデルの定義

                            +

                            My Screenアドオンの画面タブでは、NodeSettingsの param_1 プロパティに対応する param1 プロパティを持つ、 MyScreenConfig モデルを定義して扱います。MyScreenConfig モデルと、アダプタ、シリアライザを、それぞれ以下のようにコピーします。

                            + +

                            テストコードの定義

                            +

                            画面タブに関するテストコード例と、テストに利用するMirageのコード例を、それぞれ以下のようにコピーします。

                            + +

                            RDMコードの変更

                            +

                            ルーティングの設定

                            +

                            app/router.ts に、アドオンの画面タブページへのルーティング設定を追加します。

                            +
                            this.route('guid-node', { path: '--node/:guid' }, function() {
                            +    this.mount('analytics-page', { as: 'analytics' });
                            +    this.route('forks');
                            +    this.route('iqbrims');
                            +    this.route('myscreen');  // 追加
                            +    this.route('registrations');
                            +    this.route('drafts', { path: '/drafts/:draftId' }, function() {
                            +        this.route('register');
                            +    });
                            +});
                            +
                            +

                            変更例は、サンプル router.ts を参照してください。

                            +

                            ナビゲーションバー定義の変更

                            +

                            ember-osf-webが提供するViewから見えるプロジェクトのナビゲーションバーで、画面タブのリンクを表示するために、テンプレートファイル lib/osf-components/addon/components/node-navbar/template.hbs にコードを追加します。

                            +
                            {{#if this.myscreenEnabled }}
                            +    {{node-navbar/link node=@node useLinkTo=false destination='myscreen'}}
                            +{{/if}}
                            +
                            +

                            RDMでMy Screenアドオンが有効でないときはリンクを表示しないようにするために、コンポーネント定義ファイル lib/osf-components/addon/components/node-navbar/component.ts に myscreenEnabled プロパティを追加します。

                            +
                            @computed('node.addons.[]')
                            +get myscreenEnabled(): Promise<boolean> | null {
                            +    if (!this.node) {
                            +        return null;
                            +    }
                            +    const node = this.node;
                            +    return (async () => {
                            +        const addons = await node.addons;
                            +        if (!addons) {
                            +            return false;
                            +        }
                            +        const myscreen = addons.filter(addon => addon.id === 'myscreen');
                            +        return myscreen.length > 0;
                            +    })();
                            +}
                            +
                            +

                            ナビゲーションバーのテスト tests/integration/components/node-navbar/component-test.ts も修正します。

                            +

                            それぞれの変更例は、サンプル template.hbs 、 component.ts 、 component-test.ts を参照してください。

                            +

                            国際化ファイルの変更

                            +

                            translations/en-us.yml に、My Screenアドオンの画面タブで表示する文字列の国際化設定を追加します。

                            +
                            myscreen:
                            +  page_title: '{nodeTitle} My Screen'
                            +  header: 'My Screen'
                            +  loading: 'Loading My Screen config...'
                            +  param1: 'Param 1'
                            +  save_button: 'Save'
                            +  failed_to_submit: 'Failed to save'
                            +  placeholders:
                            +      param1: 'anything'
                            +
                            +

                            変更例は、サンプル en-us.yml を参照してください。

                            +

                            Mirage定義の変更

                            +

                            追加したMirageコードを利用してAPIをモックするように、 mirage/config.ts に以下を追加します。

                            +
                            this.get('/project/:id/myscreen/config', myscreenConfig);
                            +
                            +

                            変更例は、サンプル config.ts を参照してください。

                            +

                            docker-compose.override.yml の追加

                            +

                            変更したコードを使うように、RDMの docker-compose.override.yml で osf-ember-web サービスの volumes を指定します。

                            +

                            例えば、以下のようなディレクトリ階層の場合は、

                            +
                            .
                            +├── RDM-osf.io
                            +│   ├── docker-compose.override.yml
                            +│   └── docker-compose.yml
                            +└── RDM-ember-osf-web
                            +
                            +

                            RDM-osf.io/docker-compose.override.yml の内容を以下のようにします。

                            +
                            version: "3.4"
                            +
                            +services:
                            +  ember_osf_web:
                            +    volumes:
                            +      - ../RDM-ember-osf-web:/code
                            +
                            +

                            画面タブのテスト

                            +

                            以下のコマンドで、ember-osf-webに追加したMy Screen 画面タブのテストを実行できます。

                            +

                            コントローラの単体テスト:

                            +
                            $ docker compose run --rm ember_osf_web yarn test --module 'Unit | Controller | guid-node/myscreen'
                            +
                            +

                            ナビゲーションバーの結合テスト:

                            +
                            $ docker compose run --rm ember_osf_web yarn test --module 'Integration | Component | node-navbar'
                            +
                            +

                            画面タブの受け入れテスト:

                            +
                            $ docker compose run --rm ember_osf_web yarn test --module 'Acceptance | guid-node/myscreen'
                            +
                            +

                            ファイルを指定してlintを実行するのは、以下のコマンドを実行します。

                            +
                            $ docker compose run --rm ember_osf_web node_modules/.bin/eslint --ext js,ts --max-warnings=0 'app/guid-node/myscreen' 'app/**/myscreen-config.ts' 'app/router.ts' 'lib/osf-components/addon/components/node-navbar/component.ts' 'tests/integration/components/node-navbar/component-test.ts' 'mirage/config.ts'
                            +$ docker compose run --rm ember_osf_web node_modules/.bin/tslint -p . 'app/guid-node/myscreen/**/*.ts' 'app/**/myscreen-config.ts' 'app/router.ts' 'lib/osf-components/addon/components/node-navbar/component.ts' 'tests/integration/components/node-navbar/component-test.ts' 'mirage/config.ts'
                            +$ docker compose run --rm ember_osf_web node_modules/.bin/stylelint 'app/guid-node/myscreen/**/*.scss'
                            +$ docker compose run --rm ember_osf_web node_modules/.bin/ember-template-lint 'app/guid-node/myscreen/**/*.hbs' 'lib/osf-components/addon/components/node-navbar/template.hbs'
                            +
                            +

                            My Screenアドオンの動作確認

                            +

                            My Screenアドオンの動作確認をしてみましょう。

                            +

                            DBマイグレーション

                            +

                            マイグレーションを実行し、Migrations定義をPostgreSQLサービスに反映します。

                            +
                            $ docker compose run --rm web python3 manage.py migrate
                            +
                            +

                            国際化のコンパイル

                            +

                            .mako ファイルの国際化設定を適用するために、国際化ファイルをコンパイルします。

                            +
                            $ docker compose run --rm web pybabel compile -d ./website/translations
                            +
                            +
                            +

                            .js ファイルの国際化設定は、 assets サービスの再起動時に適用されます。

                            +
                            +

                            サービスの再起動

                            +

                            変更したファイルに関連するサービスを再起動します。

                            +
                            $ docker compose restart assets web api ember_osf_web
                            +
                            +

                            これでサービスへの反映は完了です。

                            +

                            ストレージアドオンを試す

                            +

                            My Screenアドオンの有効化手順は、スケルトン アドオンと同様です。 +My Screenアドオンを有効化すると、プロジェクトダッシュボードにウィジェットが表示され、ナビゲーションバーに画面タブのリンクが表示されます。

                            +

                            Project Dashboard

                            +

                            画面タブのリンクをクリックすると、画面タブのページを表示できます。

                            +

                            Addon Tab

                            +

                            ここで設定した param_1 プロパティの値が、ウィジェットに表示されます。

                            +

                            以上でMy Screenアドオンの動作確認は完了です!

                            + + + + + + + + + + + + + +
                            +
                            + + + +
                            + +
                            + + + +
                            +
                            +
                            +
                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/guides/screen-expansion/ember-osf-web/app/adapters/myscreen-config.ts b/site/guides/screen-expansion/ember-osf-web/app/adapters/myscreen-config.ts new file mode 100644 index 0000000..a43c253 --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/app/adapters/myscreen-config.ts @@ -0,0 +1,33 @@ +import DS from 'ember-data'; +import config from 'ember-get-config'; +import OsfAdapter from './osf-adapter'; + +const { + OSF: { + url: host, + webApiNamespace: namespace, + }, +} = config; + +export default class MyScreenConfigAdapter extends OsfAdapter { + host = host.replace(/\/+$/, ''); + namespace = namespace; + + buildURL( + _: string | undefined, + id: string | null, + __: DS.Snapshot | null, + ___: string, + ____?: {}, + ): string { + const nodeUrl = super.buildURL('node', null, null, 'findRecord', {}); + const url = nodeUrl.replace(/\/nodes\/$/, '/project/'); + return `${url}${id}/myscreen/config`; + } +} + +declare module 'ember-data/types/registries/adapter' { + export default interface AdapterRegistry { + 'myscreen-config': MyScreenConfigAdapter; + } // eslint-disable-line semi +} diff --git a/site/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/controller.ts b/site/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/controller.ts new file mode 100644 index 0000000..571a71a --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/controller.ts @@ -0,0 +1,91 @@ +import Controller from '@ember/controller'; +import EmberError from '@ember/error'; +import { action, computed } from '@ember/object'; +import { reads } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; + +import DS from 'ember-data'; + +import Intl from 'ember-intl/services/intl'; +import MyScreenConfigModel from 'ember-osf-web/models/myscreen-config'; +import Node from 'ember-osf-web/models/node'; +import Analytics from 'ember-osf-web/services/analytics'; +import StatusMessages from 'ember-osf-web/services/status-messages'; +import Toast from 'ember-toastr/services/toast'; + +export default class GuidNodeMyScreen extends Controller { + @service toast!: Toast; + @service intl!: Intl; + @service statusMessages!: StatusMessages; + @service analytics!: Analytics; + + @reads('model.taskInstance.value') + node?: Node; + + isPageDirty = false; + + configCache?: DS.PromiseObject; + + @computed('config.isFulfilled') + get loading(): boolean { + return !this.config || !this.config.get('isFulfilled'); + } + + @action + save(this: GuidNodeMyScreen) { + if (!this.config) { + throw new EmberError('Illegal config'); + } + const config = this.config.content as MyScreenConfigModel; + + config.save() + .then(() => { + this.set('isPageDirty', false); + }) + .catch(() => { + this.saveError(config); + }); + } + + saveError(config: MyScreenConfigModel) { + config.rollbackAttributes(); + const message = this.intl.t('myscreen.failed_to_save'); + this.toast.error(message); + } + + @computed('config.param1') + get param1() { + if (!this.config || !this.config.get('isFulfilled')) { + return ''; + } + const config = this.config.content as MyScreenConfigModel; + return config.param1; + } + + set param1(v: string) { + if (!this.config) { + throw new EmberError('Illegal config'); + } + const config = this.config.content as MyScreenConfigModel; + config.set('param1', v); + this.set('isPageDirty', true); + } + + @computed('node') + get config(): DS.PromiseObject | undefined { + if (this.configCache) { + return this.configCache; + } + if (!this.node) { + return undefined; + } + this.configCache = this.store.findRecord('myscreen-config', this.node.id); + return this.configCache!; + } +} + +declare module '@ember/controller' { + interface Registry { + 'guid-node/myscreen': GuidNodeMyScreen; + } +} diff --git a/site/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/route.ts b/site/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/route.ts new file mode 100644 index 0000000..4661345 --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/route.ts @@ -0,0 +1,33 @@ +import { action, computed } from '@ember/object'; +import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; +import ConfirmationMixin from 'ember-onbeforeunload/mixins/confirmation'; + +import GuidNodeMyScreen from 'ember-osf-web/guid-node/myscreen/controller'; +import Node from 'ember-osf-web/models/node'; +import { GuidRouteModel } from 'ember-osf-web/resolve-guid/guid-route'; +import Analytics from 'ember-osf-web/services/analytics'; + +export default class GuidNodeMyScreenRoute extends Route.extend(ConfirmationMixin, {}) { + @service analytics!: Analytics; + + model(this: GuidNodeMyScreenRoute) { + return this.modelFor('guid-node'); + } + + @action + async didTransition() { + const { taskInstance } = this.controller.model as GuidRouteModel; + await taskInstance; + const node = taskInstance.value; + + this.analytics.trackPage(node ? node.public : undefined, 'nodes'); + } + + // This tells ember-onbeforeunload's ConfirmationMixin whether or not to stop transitions + @computed('controller.isPageDirty') + get isPageDirty() { + const controller = this.controller as GuidNodeMyScreen; + return () => controller.isPageDirty; + } +} diff --git a/site/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/styles.scss b/site/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/styles.scss new file mode 100644 index 0000000..2eadd3a --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/styles.scss @@ -0,0 +1,15 @@ +@media screen and (max-width: 768px) { + .MyScreen { + margin: 0; + padding: 0; + } +} + +.MyScreen__header { + margin-bottom: 0.5em; +} + +.MyScreen__buttons { + margin-top: 1em; + margin-bottom: 2em; +} diff --git a/site/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/template.hbs b/site/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/template.hbs new file mode 100644 index 0000000..95d0d9c --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/app/guid-node/myscreen/template.hbs @@ -0,0 +1,30 @@ +{{! using unsafeTitle here to avoid double encoding because the title helper does its own }} +{{title (t 'myscreen.page_title' nodeTitle=this.model.taskInstance.value.unsafeTitle)}} +
                            + {{#if this.loading}} + {{t 'myscreen.loading'}} + {{else}} +
                            +

                            {{t 'myscreen.header'}}

                            +
                            + +
                            + {{input + name='param1' + placeholder=(t 'myscreen.placeholders.param1') + class='form-control' + value=this.param1 + type='text' + }} +
                            +
                            +
                            + + {{t 'myscreen.save_button'}} + +
                            +
                            + {{/if}} +
                            diff --git a/site/guides/screen-expansion/ember-osf-web/app/models/myscreen-config.ts b/site/guides/screen-expansion/ember-osf-web/app/models/myscreen-config.ts new file mode 100644 index 0000000..5065acc --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/app/models/myscreen-config.ts @@ -0,0 +1,14 @@ +import DS from 'ember-data'; +import OsfModel from './osf-model'; + +const { attr } = DS; + +export default class MyScreenConfigModel extends OsfModel { + @attr('string') param1!: string; +} + +declare module 'ember-data/types/registries/model' { + export default interface ModelRegistry { + 'myscreen-config': MyScreenConfigModel; + } // eslint-disable-line semi +} diff --git a/site/guides/screen-expansion/ember-osf-web/app/router.ts b/site/guides/screen-expansion/ember-osf-web/app/router.ts new file mode 100644 index 0000000..aa5d925 --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/app/router.ts @@ -0,0 +1,186 @@ +import { getOwner } from '@ember/application'; +import Transition from '@ember/routing/-private/transition'; +import EmberRouter from '@ember/routing/router'; +import { inject as service } from '@ember/service'; +import Ember from 'ember'; +import config from 'ember-get-config'; + +import { Blocker } from 'ember-osf-web/services/ready'; +import scrollTo from 'ember-osf-web/utils/scroll-to'; +import transitionTargetURL from 'ember-osf-web/utils/transition-target-url'; + +const { + engines: { + collections, + handbook, + registries, + }, + featureFlagNames: { + routes: routeFlags, + }, +} = config; + +const Router = EmberRouter.extend({ + currentUser: service('current-user'), + features: service('features'), + statusMessages: service('status-messages'), + ready: service('ready'), + + // eslint-disable-next-line ember/avoid-leaking-state-in-ember-objects + readyBlocker: null as Blocker | null, + location: config.locationType, + rootURL: config.rootURL, + shouldScrollTop: true, + + willTransition(oldInfo: any, newInfo: any, transition: { targetName: string }) { + if (!this.readyBlocker || this.readyBlocker.isDone()) { + this.readyBlocker = this.get('ready').getBlocker(); + } + + this._super(oldInfo, newInfo, transition); + }, + + didTransition(...args: any[]) { + this._super(...args); + + this.get('currentUser').checkShowTosConsentBanner(); + this.get('statusMessages').updateMessages(); + + if (this.shouldScrollTop) { + scrollTo(getOwner(this), 0); + } + + if (this.readyBlocker && !this.readyBlocker.isDone()) { + this.readyBlocker.done(); + } + }, + + _doTransition(...args: any[]) { + const transition = this._super(...args); + return this._beforeTransition(transition); + }, + + _doURLTransition(...args: any[]) { + const transition = this._super(...args); + return this._beforeTransition(transition); + }, + + _beforeTransition(transition: Transition) { + // Don't snap the page to the top if it's just a query param change + // IE registries, preprints, collections, etc + // There doesn't appear to be a good way to access the transition + // inside of didTransition, so the state is just plucked here for future reference. + this.shouldScrollTop = !transition.queryParamsOnly; + + const isInitialTransition = transition.sequence === 0; + if (!isInitialTransition) { + const flag = routeFlags[transition.targetName]; + if (flag && !this.get('features').isEnabled(flag)) { + if (!Ember.testing) { + try { + window.location.assign(transitionTargetURL(transition)); + } catch (e) { + window.location.reload(); + } + } + transition.abort(); + } + } + return transition; + }, +}); + +/* eslint-disable array-callback-return */ + +Router.map(function() { + // All non-guid routes (except error routes) belong above "Guid Routing" + this.route('home', { path: '/' }); + this.route('dashboard'); + this.route('goodbye'); + this.route('institutions', function() { + this.route('dashboard', { path: '/:institution_id/dashboard' }); + }); + this.route('quickfiles'); + this.route('register'); + this.route('settings', function() { + this.route('profile', function() { + this.route('education'); + this.route('employment'); + this.route('name'); + this.route('social'); + }); + this.route('developer-apps', { path: '/applications' }, function() { + this.route('edit', { path: '/:developer_app_id' }); + this.route('create'); + }); + this.route('account'); + this.route('tokens', function() { + this.route('edit', { path: '/:token_id' }); + this.route('create'); + }); + }); + this.route('support'); + this.route('meetings', function() { + this.route('detail', { path: '/:meeting_id' }); + }); + + if (collections.enabled) { + this.mount('collections'); + } + + if (handbook.enabled) { + this.mount('handbook'); + } + + if (registries.enabled) { + this.mount('registries', { path: '--registries' }); + } + + this.route('guid-file', { path: '--file/:guid' }); + + this.route('guid-node', { path: '--node/:guid' }, function() { + this.mount('analytics-page', { as: 'analytics' }); + this.route('forks'); + this.route('iqbrims'); + this.route('myscreen'); + this.route('registrations'); + this.route('drafts', { path: '/drafts/:draftId' }, function() { + this.route('register'); + }); + }); + + this.route('guid-preprint', { path: '--preprint/:guid' }); + + this.route('guid-registration', { path: '--registration/:guid' }, function() { + this.mount('analytics-page', { as: 'analytics' }); + this.route('forks'); + }); + + this.route('guid-user', { path: '--user/:guid' }, function() { + this.route('quickfiles'); + }); + + /* + * Guid Routing + * + * Root guid URLs (e.g. "/mst3k/") will match the `resolve-guid` route, which + * will ask the API what type of object the guid refers to, then transition + * to the appropriate route based off the `routeMap` property. + * + * Routes that handle guid objects should prefix their routes with the type + * it handles prefixed with `--` (e.g. "--user/:user_guid") + * The GuidLocation implementation will remove URL segments prefixed with `--` + * resulting in clean guid URLs while still respecting Ember's routing semantics. + */ + this.route('resolve-guid', { path: ':guid' }, function() { + this.route('subpath', { path: '*path' }); + }); + + // Error routes + this.route('error-no-api', { path: '*no_api_path' }); + this.route('not-found', { path: '*path' }); +}); + +/* eslint-enable array-callback-return */ + +export default Router; diff --git a/site/guides/screen-expansion/ember-osf-web/app/serializers/myscreen-config.ts b/site/guides/screen-expansion/ember-osf-web/app/serializers/myscreen-config.ts new file mode 100644 index 0000000..bddcfc4 --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/app/serializers/myscreen-config.ts @@ -0,0 +1,10 @@ +import OsfSerializer from './osf-serializer'; + +export default class MyScreenConfigSerializer extends OsfSerializer { +} + +declare module 'ember-data/types/registries/serializer' { + export default interface SerializerRegistry { + 'myscreen-config': MyScreenConfigSerializer; + } // eslint-disable-line semi +} diff --git a/site/guides/screen-expansion/ember-osf-web/lib/osf-components/addon/components/node-navbar/component.ts b/site/guides/screen-expansion/ember-osf-web/lib/osf-components/addon/components/node-navbar/component.ts new file mode 100644 index 0000000..c0b5744 --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/lib/osf-components/addon/components/node-navbar/component.ts @@ -0,0 +1,76 @@ +import Component from '@ember/component'; +import { action, computed } from '@ember/object'; +import config from 'ember-get-config'; + +import { layout } from 'ember-osf-web/decorators/component'; +import Node from 'ember-osf-web/models/node'; + +import styles from './styles'; +import template from './template'; + +export type NodeLike = Pick; + +@layout(template, styles) +export default class NodeNavbar extends Component { + // Optional parameters + node?: Node; + allowComments?: boolean; + renderInPlace?: boolean; + + // Private properties + secondaryNavbarId = config.secondaryNavbarId; + collapsedNav = true; + + @computed('node') + get fakeParent(): NodeLike | null { + if (this.node) { + const id = this.node.belongsTo('parent').id(); + if (id) { + return { + id, + // The parent of a registration is always a registration. When a component + // is registered without its parent, the registration is its own root. + isRegistration: this.node.isRegistration, + }; + } + } + return null; + } + + @computed('node.addons.[]') + get iqbrimsEnabled(): Promise | null { + if (!this.node) { + return null; + } + const { node } = this; + return (async () => { + const addons = await node.addons; + if (!addons) { + return false; + } + const iqbrims = addons.filter(addon => addon.id === 'iqbrims'); + return iqbrims.length > 0; + })(); + } + + @computed('node.addons.[]') + get myscreenEnabled(): Promise | null { + if (!this.node) { + return null; + } + const { node } = this; + return (async () => { + const addons = await node.addons; + if (!addons) { + return false; + } + const myscreen = addons.filter(addon => addon.id === 'myscreen'); + return myscreen.length > 0; + })(); + } + + @action + toggleNav() { + this.toggleProperty('collapsedNav'); + } +} diff --git a/site/guides/screen-expansion/ember-osf-web/lib/osf-components/addon/components/node-navbar/template.hbs b/site/guides/screen-expansion/ember-osf-web/lib/osf-components/addon/components/node-navbar/template.hbs new file mode 100644 index 0000000..c6d1528 --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/lib/osf-components/addon/components/node-navbar/template.hbs @@ -0,0 +1,68 @@ +{{#if @node}} + + +
                            +
                            +{{/if}} diff --git a/site/guides/screen-expansion/ember-osf-web/mirage/config.ts b/site/guides/screen-expansion/ember-osf-web/mirage/config.ts new file mode 100644 index 0000000..4ba65b1 --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/mirage/config.ts @@ -0,0 +1,261 @@ +import { Server } from 'ember-cli-mirage'; +import config from 'ember-get-config'; + +import { getCitation } from './views/citation'; +import { searchCollections } from './views/collection-search'; +import { reportDelete } from './views/comment'; +import { createBibliographicContributor } from './views/contributor'; +import { createDeveloperApp, updateDeveloperApp } from './views/developer-app'; +import { createDraftRegistration } from './views/draft-registration'; +import { + folderFilesList, + nodeFileProviderList, + nodeFilesListForProvider, + uploadToFolder, + uploadToRoot, +} from './views/file'; +import { createFork, createRegistrationFork } from './views/fork'; +import { guidDetail } from './views/guid'; +import { identifierCreate } from './views/identifier'; +import { summaryMetrics } from './views/institution'; +import { iqbrimsStatus } from './views/iqbrims-status'; +import { myscreenConfig } from './views/myscreen-config'; +import { createNode } from './views/node'; +import { osfNestedResource, osfResource, osfToManyRelationship } from './views/osf-resource'; +import { getProviderSubjects } from './views/provider-subjects'; +import { createRegistration, forkRegistration, registrationDetail } from './views/registration'; +import { rootDetail } from './views/root'; +import { createToken } from './views/token'; +import { createEmails, updateEmails } from './views/update-email'; +import { userNodeList } from './views/user'; +import { updatePassword } from './views/user-password'; +import * as userSettings from './views/user-setting'; +import * as wb from './views/wb'; + +const { OSF: { apiUrl, url } } = config; + +export default function(this: Server) { + this.passthrough(); // pass through all requests on currrent domain + + this.urlPrefix = apiUrl; + this.namespace = '/v2'; + + this.get('/', rootDetail); + + osfResource(this, 'developer-app', { path: 'applications', except: ['create', 'update'] }); + this.post('/applications', createDeveloperApp); + this.patch('/applications/:id', updateDeveloperApp); + + osfResource(this, 'file', { only: ['show', 'update'] }); + + this.get('/guids/:id', guidDetail); + + osfResource(this, 'institution', { only: ['index', 'show'], defaultPageSize: 1000 }); + osfNestedResource(this, 'institution', 'users', { + only: ['index'], + path: '/institutions/:parentID/users', + }); + osfNestedResource(this, 'institution', 'userMetrics', { + only: ['index'], + path: '/institutions/:parentID/metrics/users', + }); + osfNestedResource(this, 'institution', 'departmentMetrics', { + only: ['index'], + path: '/institutions/:parentID/metrics/departments', + }); + this.get('/institutions/:id/metrics/summary', summaryMetrics); + + osfResource(this, 'license', { only: ['index', 'show'] }); + osfResource(this, 'citation-style', { + only: ['index'], + path: '/citations/styles', + }); + + osfResource(this, 'node', { except: ['create'] }); + this.post('/nodes/', createNode); + osfResource(this, 'subject', { only: ['show'] }); + osfNestedResource(this, 'subject', 'children', { only: ['index'] }); + osfNestedResource(this, 'node', 'children'); + osfNestedResource(this, 'node', 'contributors', { + defaultSortKey: 'index', + onCreate: createBibliographicContributor, + }); + + this.get('/nodes/:parentID/files', nodeFileProviderList); // Node file providers list + this.get('/nodes/:parentID/files/:fileProviderId', nodeFilesListForProvider); // Node files list for file provider + this.get('/nodes/:parentID/files/:fileProviderId/:folderId', folderFilesList); // Node folder detail view + this.put('/nodes/:parentID/files/:fileProviderId/upload', uploadToRoot); // Upload to file provider + + osfNestedResource(this, 'node', 'bibliographicContributors', { + only: ['index'], + relatedModelName: 'contributor', + defaultSortKey: 'index', + }); + osfNestedResource(this, 'node', 'forks', { only: ['index'] }); + this.post('/nodes/:id/forks', createFork); + osfNestedResource(this, 'node', 'linkedNodes', { only: ['index'] }); + osfNestedResource(this, 'node', 'linkedRegistrations', { only: ['index'] }); + osfNestedResource(this, 'node', 'registrations', { only: ['index'] }); + this.post('/nodes/:id/registrations', createRegistration); + osfNestedResource(this, 'node', 'draftRegistrations', { only: ['index'] }); + this.post('/nodes/:guid/draft_registrations', createDraftRegistration); + osfNestedResource(this, 'node', 'identifiers', { only: ['index'] }); + osfToManyRelationship(this, 'node', 'affiliatedInstitutions', { + only: ['related', 'add', 'remove'], + path: '/nodes/:parentID/relationships/institutions', + }); + osfNestedResource(this, 'node', 'addons', { only: ['index'] }); + + osfToManyRelationship(this, 'node', 'subjects', { + only: ['related', 'self'], + }); + + osfResource(this, 'draft-registration', { + only: ['index', 'show', 'update'], + path: '/draft_registrations', + }); + osfToManyRelationship(this, 'draft-registration', 'subjects'); + osfToManyRelationship(this, 'draft-registration', 'affiliatedInstitutions', { + only: ['related', 'update', 'add', 'remove'], + path: '/draft_registrations/:parentID/relationships/institutions', + }); + osfNestedResource(this, 'draft-registration', 'contributors', { + defaultSortKey: 'index', + }); + + osfResource(this, 'registration', { except: ['show', 'create'] }); + this.post('/registrations', createRegistration); + this.get('/registrations/:id', registrationDetail); + osfNestedResource(this, 'registration', 'children'); + osfNestedResource(this, 'registration', 'forks', { except: ['create'] }); + this.post('/registrations/:id/forks', forkRegistration); + + osfNestedResource(this, 'registration', 'contributors', { defaultSortKey: 'index' }); + osfNestedResource(this, 'registration', 'bibliographicContributors', { + only: ['index'], + relatedModelName: 'contributor', + defaultSortKey: 'index', + }); + osfNestedResource(this, 'registration', 'forks', { only: ['index'] }); + this.post('/registrations/:id/forks', createRegistrationFork); + osfNestedResource(this, 'registration', 'linkedNodes', { only: ['index'] }); + osfNestedResource(this, 'registration', 'linkedRegistrations', { only: ['index'] }); + osfToManyRelationship(this, 'registration', 'affiliatedInstitutions', { + only: ['related', 'update', 'add', 'remove'], + path: '/registrations/:parentID/relationships/institutions', + }); + osfNestedResource(this, 'registration', 'identifiers', { only: ['index'] }); + this.post('/registrations/:parentID/identifiers/', identifierCreate); + osfNestedResource(this, 'registration', 'comments', { only: ['index'] }); + this.get('/registrations/:guid/citation/:citationStyleID', getCitation); + osfToManyRelationship(this, 'registration', 'subjects', { + only: ['related', 'self'], + }); + osfResource(this, 'subject', { only: ['show'] }); + + osfNestedResource(this, 'comment', 'reports', { + except: ['delete'], + path: '/comments/:parentID/reports', + relatedModelName: 'comment-report', + }); + this.del('/comments/:id/reports/:reporter_id', reportDelete); + + osfResource(this, 'registration-schema', { path: '/schemas/registrations' }); + osfNestedResource(this, 'registration-schema', 'schemaBlocks', { + path: '/schemas/registrations/:parentID/schema_blocks', + defaultSortKey: 'index', + defaultPageSize: 1000, + }); + + osfResource(this, 'collection'); + osfToManyRelationship(this, 'collection', 'linkedRegistrations', { + only: ['related', 'add', 'remove'], + }); + + osfResource(this, 'scope', { only: ['index', 'show'] }); + osfResource(this, 'region', { only: ['index', 'show'] }); + + this.get('/status', () => ({ meta: { version: '2.8' }, maintenance: null })); + + osfResource(this, 'token', { except: ['create'] }); + this.post('/tokens', createToken); + + osfResource(this, 'user', { except: ['create', 'delete'] }); + osfNestedResource(this, 'user', 'institutions', { only: ['index'] }); + this.get('/users/:id/settings', userSettings.getUserSetting); + this.patch('/users/:parentID/settings', userSettings.updateUserSetting); + osfNestedResource(this, 'user', 'emails', { + except: ['update', 'create'], + path: '/users/:parentID/settings/emails', + relatedModelName: 'user-email', + }); + this.patch('/users/:parentID/settings/emails/:emailID/', updateEmails); + this.post('/users/:parentID/settings/emails/', createEmails); + this.post('/users/:id/settings/export', userSettings.requestExport); + this.post('/users/:parentID/settings/password/', updatePassword); + + osfResource(this, 'external-identity', { + path: '/users/me/settings/identities', + only: ['index', 'delete'], + }); + + this.get('/users/:id/nodes', userNodeList); + this.get('/sparse/users/:id/nodes', userNodeList); + + osfNestedResource(this, 'user', 'quickfiles', { only: ['index', 'show'] }); + + osfResource(this, 'preprint-provider', { path: '/providers/preprints' }); + osfResource(this, 'registration-provider', { path: '/providers/registrations' }); + osfNestedResource(this, 'registration-provider', 'licensesAcceptable', { + only: ['index'], + path: '/providers/registrations/:parentID/licenses/', + relatedModelName: 'license', + }); + this.get('/providers/registrations/:parentID/subjects/', getProviderSubjects); + + osfResource(this, 'collection-provider', { path: '/providers/collections' }); + osfNestedResource(this, 'collection-provider', 'licensesAcceptable', { + path: 'providers/collections/:parentID/licenses/', + }); + osfNestedResource(this, 'collection', 'collectedMetadata', { + path: 'collections/:parentID/collected_metadata/', + }); + this.post('/search/collections/', searchCollections); + + // Waterbutler namespace + this.namespace = '/wb'; + this.post('/files/:id/move', wb.moveFile); + this.post('/files/:id/upload', wb.renameFile); + this.put('/files/:id/upload', uploadToFolder); + this.del('/files/:id/delete', wb.deleteFile); + this.get('/files/:id/download', wb.fileVersions); + + // Private namespace + this.namespace = '/_'; + + this.get('/banners/current/', () => ({ + data: { + attributes: { + }, + type: 'banners', + id: '', + }, + })); + + osfResource(this, 'meeting', { only: ['index', 'show'] }); + osfToManyRelationship(this, 'meeting', 'submissions', { + only: ['related'], + path: '/meetings/:parentID/submissions/', + }); + + // Endpoint on web pod + const apiNamespace = this.namespace; + this.urlPrefix = url; + this.namespace = '/api/v1'; + + this.get('/project/:id/iqbrims/status', iqbrimsStatus); + this.get('/project/:id/myscreen/config', myscreenConfig); + + this.urlPrefix = apiUrl; + this.namespace = apiNamespace; +} diff --git a/site/guides/screen-expansion/ember-osf-web/mirage/factories/myscreen-config.ts b/site/guides/screen-expansion/ember-osf-web/mirage/factories/myscreen-config.ts new file mode 100644 index 0000000..7cd77db --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/mirage/factories/myscreen-config.ts @@ -0,0 +1,12 @@ +import { Factory } from 'ember-cli-mirage'; + +import MyScreenConfigModel from 'ember-osf-web/models/iqbrims-status'; + +export default Factory.extend({ +}); + +declare module 'ember-cli-mirage/types/registries/schema' { + export default interface MirageSchemaRegistry { + myscreenConfigs: MyScreenConfigModel; + } // eslint-disable-line semi +} diff --git a/site/guides/screen-expansion/ember-osf-web/mirage/views/myscreen-config.ts b/site/guides/screen-expansion/ember-osf-web/mirage/views/myscreen-config.ts new file mode 100644 index 0000000..bf4cc7f --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/mirage/views/myscreen-config.ts @@ -0,0 +1,7 @@ +import { HandlerContext, Schema } from 'ember-cli-mirage'; + +export function myscreenConfig(this: HandlerContext, schema: Schema) { + const model = schema.myscreenConfigs.first(); + const json = this.serialize(model); + return json; +} diff --git a/site/guides/screen-expansion/ember-osf-web/tests/acceptance/guid-node/myscreen-test.ts b/site/guides/screen-expansion/ember-osf-web/tests/acceptance/guid-node/myscreen-test.ts new file mode 100644 index 0000000..165ba90 --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/tests/acceptance/guid-node/myscreen-test.ts @@ -0,0 +1,25 @@ +import { currentRouteName } from '@ember/test-helpers'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { percySnapshot } from 'ember-percy'; +import { module, test } from 'qunit'; + +import { currentURL, setupOSFApplicationTest, visit } from 'ember-osf-web/tests/helpers'; + +module('Acceptance | guid-node/myscreen', hooks => { + setupOSFApplicationTest(hooks); + setupMirage(hooks); + + test('logged in', async assert => { + const node = server.create('node', { id: 'i9bri' }); + server.create('myscreen-config', { id: node.id, param1: '123' }); + const url = `/${node.id}/myscreen`; + + await visit(url); + assert.equal(currentURL(), url, `We are on ${url}`); + assert.equal(currentRouteName(), 'guid-node.myscreen', 'We are at guid-node.myscreen'); + await percySnapshot(assert); + assert.dom('[data-test-param1] input').exists() + .hasValue('123'); + assert.dom('[data-test-save-button]').exists(); + }); +}); diff --git a/site/guides/screen-expansion/ember-osf-web/tests/integration/components/node-navbar/component-test.ts b/site/guides/screen-expansion/ember-osf-web/tests/integration/components/node-navbar/component-test.ts new file mode 100644 index 0000000..e717dcc --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/tests/integration/components/node-navbar/component-test.ts @@ -0,0 +1,335 @@ +import { render } from '@ember/test-helpers'; +import { hbs } from 'ember-cli-htmlbars'; +import { setupRenderingTest } from 'ember-qunit'; +import faker from 'faker'; +import { module, test } from 'qunit'; + +import { OsfLinkRouterStub } from '../../helpers/osf-link-router-stub'; + +enum NavCondition { + HasParent, + IQBRIMSEnabled, + MyScreenEnabled, + IsRegistration = 'isRegistration', + IsPublic = 'public', + UserCanRead = 'userHasReadPermission', + UserCanWrite = 'userHasWritePermission', + UserIsContributor = 'currentUserIsContributor', + WikiEnabled = 'wikiEnabled', +} + +enum NavLink { + ParentNode, + ThisNode, + Files = 'files', + IQBRIMS = 'iqbrims', + MyScreen = 'myscreen', + Wiki = 'wiki', + Analytics = 'analytics', + Registrations = 'registrations', + Contributors = 'contributors', + Addons = 'addons', + Settings = 'settings', +} + +interface NavTestCase { + conditions: NavCondition[]; + links: NavLink[]; +} + +export class FakeNode { + id: string = faker.random.uuid(); + title: string = faker.lorem.sentence(); + public: boolean = false; + isRegistration: boolean = false; + wikiEnabled: boolean = false; + currentUserIsContributor: boolean = false; + userHasWritePermission: boolean = false; + userHasReadPermission: boolean = false; + parentId: string | null = null; + links = { + html: 'http://localhost:4200/fak3d', + }; + + constructor(conditions: NavCondition[] = []) { + for (const condition of conditions) { + if (condition === NavCondition.HasParent) { + this.parentId = faker.random.uuid(); + } else if (condition !== NavCondition.IQBRIMSEnabled && condition !== NavCondition.MyScreenEnabled) { + this[condition] = true; + } + } + } + + belongsTo() { + return { id: () => this.parentId }; + } +} + +module('Integration | Component | node-navbar', () => { + module('basic rendering', hooks => { + setupRenderingTest(hooks); + + test('it renders', async function(assert) { + this.owner.register('service:router', OsfLinkRouterStub); + + this.set('node', new FakeNode()); + await render(hbs`{{node-navbar node=this.node renderInPlace=true}}`); + + assert.ok((this.element.textContent as string).trim()); + }); + + test('it renders active tab when in proper route', async function(assert) { + const routerStub = OsfLinkRouterStub.extend({ + isActive(routeName: string) { + return routeName.includes('guid-node.wiki'); + }, + }); + this.owner.register('service:router', routerStub); + + this.set('node', new FakeNode([NavCondition.WikiEnabled])); + await render(hbs`{{node-navbar node=this.node renderInPlace=true}}`); + + assert.dom('[data-test-node-navbar-link]').exists(); + const assertActiveLink = assert.dom('[data-test-node-navbar-links] .active'); + assertActiveLink.exists({ count: 1 }); + assertActiveLink.containsText('Wiki'); + }); + + test('it renders no active tabs', async function(assert) { + const routerStub = OsfLinkRouterStub.extend({ + isActive(routeName: string) { + return routeName.includes('guid-node.forks'); + }, + }); + this.owner.register('service:router', routerStub); + + this.set('node', new FakeNode()); + await render(hbs`{{node-navbar node=this.node renderInPlace=true}}`); + + assert.dom('[data-test-node-navbar-links] .active').doesNotExist(); + }); + }); + + module('renders the correct links', hooks => { + setupRenderingTest(hooks); + + const testCases: NavTestCase[] = [ + { + conditions: [], + links: [ + NavLink.ThisNode, + NavLink.Files, + NavLink.Registrations, + ], + }, + { + conditions: [NavCondition.IsRegistration], + links: [ + NavLink.ThisNode, + NavLink.Files, + ], + }, + { + conditions: [NavCondition.HasParent], + links: [ + NavLink.ParentNode, + NavLink.ThisNode, + NavLink.Files, + NavLink.Registrations, + ], + }, + { + conditions: [NavCondition.IsPublic], + links: [ + NavLink.ThisNode, + NavLink.Files, + NavLink.Analytics, + NavLink.Registrations, + ], + }, + { + conditions: [ + NavCondition.HasParent, + NavCondition.IsPublic, + ], + links: [ + NavLink.ParentNode, + NavLink.ThisNode, + NavLink.Files, + NavLink.Analytics, + NavLink.Registrations, + ], + }, + { + conditions: [ + NavCondition.UserIsContributor, + NavCondition.UserCanRead, + NavCondition.UserCanWrite, + ], + links: [ + NavLink.ThisNode, + NavLink.Files, + NavLink.Analytics, + NavLink.Registrations, + NavLink.Contributors, + NavLink.Addons, + NavLink.Settings, + ], + }, + { + conditions: [ + NavCondition.UserIsContributor, + NavCondition.UserCanRead, + ], + links: [ + NavLink.ThisNode, + NavLink.Files, + NavLink.Analytics, + NavLink.Registrations, + NavLink.Contributors, + NavLink.Settings, + ], + }, + { + conditions: [ + NavCondition.HasParent, + NavCondition.UserIsContributor, + NavCondition.UserCanRead, + NavCondition.UserCanWrite, + NavCondition.WikiEnabled, + ], + links: [ + NavLink.ParentNode, + NavLink.ThisNode, + NavLink.Files, + NavLink.Wiki, + NavLink.Analytics, + NavLink.Registrations, + NavLink.Contributors, + NavLink.Addons, + NavLink.Settings, + ], + }, + { + conditions: [ + NavCondition.IsRegistration, + NavCondition.UserIsContributor, + NavCondition.UserCanRead, + NavCondition.WikiEnabled, + ], + links: [ + NavLink.ThisNode, + NavLink.Files, + NavLink.Wiki, + NavLink.Analytics, + NavLink.Contributors, + ], + }, + { + conditions: [ + NavCondition.IsRegistration, + NavCondition.UserIsContributor, + NavCondition.UserCanRead, + NavCondition.UserCanWrite, + NavCondition.WikiEnabled, + ], + links: [ + NavLink.ThisNode, + NavLink.Files, + NavLink.Wiki, + NavLink.Analytics, + NavLink.Contributors, + NavLink.Settings, + ], + }, + { + conditions: [ + NavCondition.HasParent, + NavCondition.UserCanRead, + NavCondition.WikiEnabled, + ], + links: [ + NavLink.ParentNode, + NavLink.ThisNode, + NavLink.Files, + NavLink.Wiki, + NavLink.Registrations, + NavLink.Settings, + ], + }, + { + conditions: [ + NavCondition.HasParent, + NavCondition.IsRegistration, + NavCondition.IsPublic, + NavCondition.WikiEnabled, + ], + links: [ + NavLink.ParentNode, + NavLink.ThisNode, + NavLink.Files, + NavLink.Wiki, + NavLink.Analytics, + ], + }, + { + conditions: [ + NavCondition.IQBRIMSEnabled, + ], + links: [ + NavLink.ThisNode, + NavLink.Files, + NavLink.IQBRIMS, + NavLink.Registrations, + ], + }, + { + conditions: [ + NavCondition.MyScreenEnabled, + ], + links: [ + NavLink.ThisNode, + NavLink.Files, + NavLink.MyScreen, + NavLink.Registrations, + ], + }, + ]; + + testCases.forEach((testCase, i) => { + test(`it renders the correct links (${i})`, async function(assert) { + this.owner.register('service:router', OsfLinkRouterStub); + + const node = new FakeNode(testCase.conditions); + this.set('node', node); + const iqbrimsEnabled = testCase.conditions.filter(c => c === NavCondition.IQBRIMSEnabled); + this.set('iqbrimsEnabled', iqbrimsEnabled.length > 0); + const myscreenEnabled = testCase.conditions.filter(c => c === NavCondition.MyScreenEnabled); + this.set('myscreenEnabled', myscreenEnabled.length > 0); + + await render(hbs` + {{node-navbar + node=this.node iqbrimsEnabled=this.iqbrimsEnabled + myscreenEnabled=this.myscreenEnabled + renderInPlace=true + }}`); + + assert.dom('[data-test-node-navbar-link]').exists({ count: testCase.links.length }); + + for (const link of testCase.links) { + let key: string; + if (link === NavLink.ParentNode && node.parentId) { + key = node.parentId; + } else if (link === NavLink.ThisNode) { + key = node.id; + } else { + key = link.toString(); + } + + assert.dom(`[data-test-node-navbar-link="${key}"]`).exists({ count: 1 }); + } + }); + }); + }); +}); diff --git a/site/guides/screen-expansion/ember-osf-web/tests/unit/guid-node/myscreen/controller-test.ts b/site/guides/screen-expansion/ember-osf-web/tests/unit/guid-node/myscreen/controller-test.ts new file mode 100644 index 0000000..8f850a4 --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/tests/unit/guid-node/myscreen/controller-test.ts @@ -0,0 +1,12 @@ +import { setupTest } from 'ember-qunit'; +import { module, test } from 'qunit'; + +module('Unit | Controller | guid-node/myscreen', hooks => { + setupTest(hooks); + + // Replace this with your real tests. + test('it exists', function(assert) { + const controller = this.owner.lookup('controller:guid-node/myscreen'); + assert.ok(controller); + }); +}); diff --git a/site/guides/screen-expansion/ember-osf-web/translations/en-us.yml b/site/guides/screen-expansion/ember-osf-web/translations/en-us.yml new file mode 100644 index 0000000..cfbbbbe --- /dev/null +++ b/site/guides/screen-expansion/ember-osf-web/translations/en-us.yml @@ -0,0 +1,1752 @@ +documentType: + default: + plural: documents + pluralCapitalized: Documents + singular: document + singularCapitalized: Document + work: + plural: works + pluralCapitalized: Works + singular: work + singularCapitalized: Work + paper: + plural: papers + pluralCapitalized: Papers + singular: paper + singularCapitalized: Paper + preprint: + plural: preprints + pluralCapitalized: Preprints + singular: preprint + singularCapitalized: Preprint + thesis: + plural: theses + pluralCapitalized: Theses + singular: thesis + singularCapitalized: Thesis +general: + OSF: '{title}' + share: Share + embed: Embed + download: Download + download_url: 'Download url' + done: Done + delete: Delete + view: View + edit: Edit + cancel: Cancel + ok: OK + revisions: Revisions + md5: MD5 + date: Date + sha2: SHA2 + title: Title + contributors: Contributors + modified: Modified + description: Description + create: Create + and: and + or: or + bookmark: Bookmark + more: more + upload: Upload + rename: Rename + move: Move + name: Name + size: Size + version: Version + downloads: Downloads + close: Close + back: Back + public: Public + filter: Filter + revert: Revert + save: Save + ellipsis: … + warning: Warning + sort_asc: 'Sort ascending' + sort_desc: 'Sort descending' + last_modified: 'Last modified' + sort: Sort + asc_paren: (asc) + desc_paren: (desc) + loading: Loading... + next: next + previous: previous + help: Help + api: API + cos: '{organization}' + home: Home + period: . + settings: Settings + project: project + component: component + hosted_on_the_osf: 'Hosted on GakuNin RDM' + please_confirm: 'Please confirm' + required: Required + options: Options + optional: Optional + optional_paren: (optional) + services: + collections: Collections + institutions: Institutions + preprints: Preprints + registries: Registries + other: Other +node_categories: + analysis: Analysis + communication: Communication + data: Data + hypothesis: Hypothesis + instrumentation: Instrumentation + 'methods and measures': 'Methods and measures' + procedure: Procedure + project: Project + software: Software + other: Other + uncategorized: Uncategorized +maintenance: + line1: 'The site will undergo maintenance between {start} and {end} ({utc} UTC).' + line2: 'Thank you for your patience.' + title: 'Notice:' +quickfiles: + title: '{user-name}''s Quick Files' + description: 'Files uploaded here are publicly accessible and easy to share with others using the share link.' + feedback_dialog_text: 'Tell us what you think of Quick Files' + transition_auth: 'You must be logged in to view your Quick Files. Redirecting to the login page.' + share_by_email: 'Share by email' +feedback: + button_text: Feedback + placeholder: 'Share your feedback' + follow_up_label: 'Contact me about further opportunities to improve GakuNin RDM.' + title: 'Send feedback' + confirm_button_text: Send + thank_you: 'Thank you!' + success: 'Your feedback has been submitted.' + dismiss: 'Got it' +file_detail: + version: + id: 'Version ID' + title: '(Version: {version-number})' + embed: + dynamic: 'Dynamically render iframe with JavaScript' + direct: 'Direct iframe with fixed height and width' + tags: 'Tags:' + toggle: 'Toggle view:' + delete_file: + question: 'Delete file?' + confirm: 'Are you sure you want to delete {file-name}?' + sha2_description: 'SHA-2 is a cryptographic hash function designed by the NSA used to verify data integrity.' + md5_description: 'MD5 is an algorithm used to verify data integrity.' + delete_success: 'File deleted' + delete_fail: 'Unable to delete file' + save_success: 'File saved' + save_fail: 'Unable to save file' + mfr_iframe_title: 'Rendering of document' + embed_js_label: 'Embeddable javascript' + embed_iframe_label: 'Embeddable iframe' +file_browser: + loading: Loading... + delete_multiple: 'Delete multiple' + download_zip: 'Download as zip' + drop_placeholder: 'Drop files here to upload' + drop_reminder: 'Drop file to upload' + no_files: 'This user has not uploaded any Quick Files' + share_title: Share + clipboard_copy: 'Copy to clipboard' + info: + title: 'How to use the file browser' + upload: 'Upload: Upload single files via drag and drop or by clicking the upload button.' + select: 'Select rows: Click on a row to show further actions in the toolbar. Use Command or Shift keys to select multiple files.' + folders: 'Folders: Not supported; consider a GakuNin RDM project for uploading and managing many files.' + open1: 'Open files: Click a file name to view the file on GakuNin RDM.' + open2: 'Open files in new tab: Press Command (Ctrl in Windows) and click a file name to open it in a new tab.' + download: 'Download as zip: Click the "Download as zip" button in the toolbar to download all files as a .zip.' + delete_modal: + title: 'Delete "{filename}"?' + title_multiple: 'Delete multiple?' + body: 'This action is irreversible.' + conflict_modal: + title: 'An item named {textValue} already exists in this location.' + keep_info: '"Keep both" will retain both files (and their version histories) in this location.' + replace_info: '"Replace" will overwrite the existing file in this location. You will lose previous versions of the overwritten file. You will keep previous versions of the moved file.' + keep_button: 'Keep both' + replace_button: Replace + move_modal: + title: 'Move file to project' + move_button: 'Move file' + filtering: Filtering + file_added: 'This file has been added.' + file_added_toast: 'File added' + file_replaced: 'This file has been replaced.' + file_deleted: 'This file has been deleted.' + delete_failed: 'Unable to delete file' + rename_failed: 'Unable to rename file' + successfully_moved: 'This file has been successfully moved.' + successfully_renamed: 'This file has been successfully renamed.' +dashboard: + page_title: Home + title: Dashboard + create_new_project_button: 'Create new project' + quicksearch: + search: 'Search your projects' + other_links: |- + 'Go to My Projects to organize your work {useSearch, select, + true { 'or search' } + false { 'in' } + } GakuNin RDM' + no_results: 'No results found.' + no_projects: + line1: 'You have no projects yet. Create a project with the button on the top right.' + line2: 'This feature allows you to search and quickly access your projects.' + preview_alt: 'Preview of a full quick projects screen' + private_parent: 'Private project / ' + private_grandparent: 'Private project / Private / ' + noteworthy: + description: 'Discover public projects' + new_and_noteworthy: 'New and noteworthy' + failed_noteworthy: 'Failed loading "new and noteworthy" projects' + most_popular: 'Most popular' + failed_popular: 'Failed loading "most popular" projects' + search_more: 'Search for more projects' + by: by + meetings: + title: 'Hosting a conference or meeting?' + description: 'Use the GakuNin RDM for Meetings service to provide a central location for conference submissions.' + button: 'View meetings' + preprints: + title: 'Browse the latest research' + description: 'Check out the latest preprints hosted on GakuNin RDM covering a variety of research areas.' + button: 'View preprints' +new_project: + header: 'Create new project' + title_placeholder: 'Enter project title' + more: More + affiliation: Affiliation + remove_all: 'Remove all' + select_all: 'Select all' + no_matches: 'No matches found' + description_placeholder: 'Enter project description' + template_title: 'Template (optional)' + template_search_help: 'Start typing to search your projects. Selecting project as template will duplicate its structure in the new project without importing the content of that project.' + template_placeholder: 'Select a project to use as template' + success_message: 'New project created successfully!' + stay_here: 'Keep working here' + go_to_new: 'Go to new project' + storage_region: 'Storage location' + could_not_create_project: 'Could not create project' + creating: 'Saving your project...' + create_failed_header: 'Couldn''t create your project' + create_failed_msg: 'There was an unknown error. Please try again later.' +banners: + prereg: + description: 'Improve your next study. Enter the Prereg Challenge and you could win $1,000.' + button: 'Start Prereg Challenge' + view_only: + warning: 'You are viewing GakuNin RDM through a view-only link, which may limit the data you have permission to see.' + view_normally: 'Leave this view' +move_to_project: + create_new_project: 'Create new public project' + connect_to_existing: 'Connect file to existing GakuNin RDM project' + enter_project_title: 'Enter project title' + new_project_message: 'You have selected to create a new public project for your file. Users will still have access to your file unless the project becomes private.' + choose_project: 'Choose project' + select_placeholder: 'Click to select' + project_select_message: 'The list of projects appearing are projects and components for which you have write access. Registrations are not included here.' + no_projects_exist_error: 'You have no available projects. Go back to create a new project.' + could_not_create_project: 'Could not create project.' + convert_or_copy_message: + project: 'Clicking "Move file" will immediately make changes to your GakuNin RDM project and move your file.' + component: 'Clicking "Move file" will immediately make changes to your GakuNin RDM component and move your file.' + no_longer_public_warning: + project: 'Files moved to private projects will no longer be public or discoverable by others.' + component: 'Files moved to private components will no longer be public or discoverable by others.' + file_successfully_moved: 'File was moved successfully!' + could_not_move_file: 'Could not move file.' + keep_working_here: 'Keep working here' + go_to_new_project: 'Go to new project' + go_to_component: 'Go to component' + go_to_project: 'Go to project' +navbar: + add: Add + # add_a_preprint: 'Add a {preprintWords.preprint}' + browse: Browse + cancel_search: 'Cancel search' + donate: Donate + go_home: 'Go home' + my_projects: 'My Projects' + my_registrations: 'My Registrations' + my_quick_files: 'My Quick Files' + reviews: 'My Reviewing' + search: Search + search_help: 'Search help' + search_the_OSF: 'Search GakuNin RDM' + send_search: 'Send search query' + support: Support + toggle_primary: 'Toggle primary navigation' + toggle_secondary: 'Toggle secondary navigation' + other_views: 'Other GakuNin RDM views' + login: Login + join: Join + osf_logo: 'GakuNin RDM logo' + search_bar: 'Search bar for registries' +auth_dropdown: + log_out: 'Log Out' + my_profile: 'My Profile' + osf_support: 'RDM Support' + sign_up: 'Sign Up' + sign_in: 'Sign In' + user_gravatar: 'User gravatar' + toggle_auth_dropdown: 'Toggle auth dropdown' +support: + title: Support + faq_title: 'Frequently asked questions' + faq_paragraph: 'How can it be free? How will GakuNin RDM be useful to my research? What is a registration? Get your questions about GakuNin RDM answered on our FAQ page.' + faq_button: 'Visit FAQ' + guides_title: 'GakuNin RDM guides' + guides_paragraph: 'Learn how to use GakuNin RDM for improving your research workflow. Read our guides for step-by-step screenshots that show you the basics of project structures, version control, privacy, files, add-on support, and more!' + guides_button: 'Visit guides' + contact_title: 'Get in touch' + contact_questions: 'For technical support or other questions,' + contact_form: 'submit a request.' + prereg_title: 'Do you have questions about preregistration?' + prereg_paragraph: 'Check out our prereg page.' + status_title: 'Are you experiencing downtime with our services?' + status_paragraph: 'Check out our status page for updates on how our services are operating.' + consultation_title: 'Are you looking for hands-on training?' + consultation_paragraph: 'COS leads workshops and webinars on how to use GakuNin RDM and incorporate best practices in transparency into your research workflow. To learn more about this service visit our Training Services page.' + social_title: 'Other ways to get help' + social_twitter: 'Ask us a question on Twitter' + social_mailing: 'Join our mailing list' + social_facebook: 'Follow us on Facebook' + social_github: 'Connect with COS on GitHub' +not_found: + title: 'Page not found' + body: 'The requested resource could not be found. If this should not have occurred and the issue persists, please report it to {supportEmail}.' + registries: + contact: rdm_support@nii.ac.jp + go_to: 'Go to GakuNin RDM Registries' + line1: 'The page you were looking for is not found on the GakuNin RDM Registries service.' + line2: 'If this should not have occurred and the issue persists, please report it to ' +error_no_api: + title: 'API Unavailable' + body: 'Our API is currently unavailable. Try again in a few minutes. If the issue persists, please report it to {supportEmail}.' +osf_mode_footer: + dev_mode: 'This site is running in development mode.' +footer: + status: Status + faq: FAQ/Guides + source_code: 'Source Code' + rpp: 'Reproducibility Project: Psychology' + rpcb: 'Reproducibility Project: Cancer Biology' + top: 'TOP Guidelines' + donate: Donate + socialize: Socialize + contact: Contact + copyright: 'Copyright © 2011-{currentYear}' + terms: 'Terms of Use' + privacy: 'Privacy Policy' + separator: ' | ' +home: + title: Home + youtube_modal_title: 'Getting Started with GakuNin RDM' + alert_logged_out: 'You have successfully logged out.' + brand: '{brand}' + tagline: 'A scholarly commons to connect the entire research cycle' + youtube_label: 'GakuNin RDM YouTube Video' + osf_screenshot_alt: 'Screenshot of GakuNin RDM' + signup_title: 'Free and open source. Start now.' + collaboration: 'Simplified Scholarly Collaboration' + management: 'Cloud-based management for your projects.' + structured_projects_title: 'Structured projects' + structured_projects_paragraph: 'Keep all your files, data, and protocols in one centralized location. No more trawling emails to find files or scrambling to recover from lost data.' + secure_cloud: 'Secure Cloud' + control_access_title: 'Control access' + control_access_paragraph: 'You control which parts of your project are public or private making it easy to collaborate with the worldwide community or just your team.' + control_access_span: 'Project-level Permissions' + workflow_title: 'Respect for your workflow' + workflow_paragraph: 'Connect your favorite third party services directly to GakuNin RDM.' + workflow_span: '3rd Party Integrations' + student_main: '"GakuNin RDM is a game changer for those wanting to effectively share their research process in the spirit of collaboration."' + student_attrib: 'Patricia Ayala, Research Services Librarian, University of Toronto' + integrations_title: 'GakuNin RDM integrations make your workflow more efficient' + integrations_alt_dropbox: 'Dropbox logo' + integrations_alt_github: 'Github logo' + integrations_alt_amazon: 'Amazon S3 logo' + integrations_alt_box: 'Box logo' + integrations_alt_google: 'Google Drive logo' + integrations_alt_figshare: 'Figshare logo' + integrations_alt_dataverse: 'Dataverse logo' + integrations_alt_mendeley: 'Mendeley logo' + features_title: 'Everything your research needs to be a success' + features_manage_title: 'Manage your project' + features_manage_paragraph: 'View all of your projects from one dashboard.' + features_share_title: 'Quickly share files' + features_share_paragraph: 'Share key project information and allow others to use and cite it.' + features_changes_title: 'See project changes' + features_changes_paragraph: 'See the latest project changes, who is contributing and historical file versions.' + features_analytics_title: 'View project analytics' + features_analytics_paragraph: 'Access project data ranging from visits over time to top referring websites.' + features_archive_title: 'Archive your data' + features_archive_paragraph: 'Computer or collaborator explode? With GakuNin RDM you will never lose your project data.' + features_collaboration_title: 'Control access and collaboration' + features_collaboration_paragraph: 'Add others to your projects to collaborate, or provide private access to view.' + features_workflow_title: 'Supercharge your workflow' + features_workflow_paragraph: 'GakuNin RDM helps individuals, teams and labs make their research processes more efficient.' + features_registration_title: Registration + features_registration_paragraph: 'Preserve the state of a project at important parts of its lifecycle such as the onset of data collection.' + global_title: 'Contribute to global scientific efforts' + global_paragraph: 'Labs and teams across the globe use GakuNin RDM to open their projects up to the scientific community. You can browse the newest and most popular public projects' + global_link: 'right here.' + global_label: 'Get involved' + non_profit_title: 'We are a mission-driven non-profit' + non_profit_paragraph1: 'GakuNin RDM is a free, open source service of the' + non_profit_link: '{organization}' + non_profit_paragraph2: 'We’re aligning scientific practices with scientific values by improving openness, integrity and reproducibility of research.' + non_profit_label: Non-Profit + users_title: 'Teachers, researchers, and global teams rely on GakuNin RDM' + users_1_alt: 'Richard Ball' + users_1_title: 'Making research reproducible & verifiable' + users_1_paragraph: 'The GakuNin RDM helps our students understand and apply sound data management principles to their work. And since we have easy access to all of the files the students are working with, it greatly enhances our ability to offer them constructive guidance.' + users_1_small: 'Richard Ball, Professor of Economics, Haverford College' + users_2_title: 'Version control makes life easier' + users_2_paragraph: 'The GakuNin RDM makes version control effortless. My PI, my lab mates, and I have access to previous versions of a file at any time—and the most current version is always readily available.' + users_2_small: 'Erica Baranski, PhD Student, Social and Personality Psychology Funder Lab, UC Riverside' + users_2_alt: 'Erica Baranski' + users_3_alt: 'Anne Allison' + users_3_title: 'A centralized hub of information' + users_3_paragraph: 'The GakuNin RDM creates a centralized hub of information where I can oversee a diversity of research projects across multiple classes. The centralization, organization, and anywhere-access save me the time and energy necessary for managing these projects.' + users_3_small: 'Anne Allison, Associate Professor of Biology at Piedmont Virginia Community College' + free_title1: 'Free and open source.' + free_title2: 'GakuNin RDM is a public good built to support your research.' + free_link: 'Get started' + learn_more: 'Learn more' +new-home: + support-section: + header: 'How GakuNin RDM supports your research' + arrow: arrow + search: + header: 'Search and Discover' + description: 'Find papers, data, and materials to inspire your next research project. Search public projects to build on the work of others and find new collaborators.' + design: + header: 'Design Your Study' + description: 'Start a project and add collaborators, giving them access to protocols and other research materials. Built-in version control tracks the evolution of your study.' + analyze: + header: 'Collect and Analyze Data' + description: 'Store data, code, and other materials in GakuNin RDM Storage, or connect your Dropbox or other third-party account. Every file gets a unique, persistent URL for citing and sharing.' + publish: + header: 'Publish Your Reports' + description: 'Share papers in GakuNin RDM Preprints or a community-based preprint provider, so others can find and cite your work. Track impact with metrics like downloads and view counts.' + testimonials: + heading: 'What others are saying' + see_her_research: 'See her research' + see_his_research: 'See his research' + carousel_heading: 'User testimonials' + slide_1: + text: 'GakuNin RDM is a game changer for those wanting to effectively share their research process in the spirit of collaboration.' + alt: 'Patricia Ayala testimonial' + description: + name: 'Patricia Ayala' + position: 'Research Services Librarian
                            University of Toronto' + slide_2: + text: 'GakuNin RDM is indispensable in helping me create reproducible research pipelines from preregistration through data collection and analysis. Its versatility makes it my one-stop shop for projects. The Dropbox integration effortlessly transforms my existing local workflow to public repository.' + alt: 'Maya testimonial' + description: + name: 'Maya Mathur' + position: 'Department of Epidemiology
                            Harvard University' + slide_3: + text: 'Because SocArXiv is a not-for-profit organization, researchers can be assured that they are sharing their research in an environment where access, inclusivity, and preservation, rather than profit, will remain at the heart of the mission. A great benefit of partnering with GakuNin RDM is that this application is a free public good.' + alt: 'Philip Cohen testimonial' + description: + name: 'Philip Cohen' + position: 'SocArXiv papers' + integrations-section: + header: 'GakuNin RDM integrations make your workflow more efficient' + authentication: Authentication + discovery: Discovery + references: References + storage: Storage + incommon: 'Incommon logo' + sso: 'SSO logo' + google_scholar: 'Google Scholar logo' + orcid: 'Orcid logo' + mendeley: 'Mendeley logo' + zotero: 'Zotero logo' + dropbox: 'Dropbox logo' + google_drive: 'Google Drive logo' +tos_consent: + paragraph: 'We''ve updated our Terms of Use and Privacy Policy. Please read them carefully.' + have_read_and_agree: 'I have read and agree to these terms.' + continue: Continue + failed_save: 'Unable to save Terms of Services consent.' +validationErrors: + description: 'This field' + inclusion: '{description} is not included in the list.' + exclusion: '{description} is reserved.' + invalid: '{description} is invalid.' + confirmation: '{description} doesn''t match {on}.' + accepted: '{description} must be accepted.' + empty: 'This field can''t be empty.' + blank: 'This field can''t be blank.' + present: '{description} must be blank.' + collection: '{description} must be a collection.' + singular: '{description} can''t be a collection.' + tooLong: '{description} is too long (maximum is {max} characters).' + tooShort: '{description} is too short (minimum is {min} characters).' + before: '{description} must be before {before}.' + after: '{description} must be after {after}.' + wrongDateFormat: '{description} must be in the format of {format}.' + wrongLength: '{description} is the wrong length (should be {is} characters).' + notANumber: '{description} must be a number.' + notAnInteger: '{description} must be an integer.' + greaterThan: '{description} must be greater than {gt}.' + greaterThanOrEqualTo: '{description} must be greater than or equal to {gte}.' + equalTo: '{description} must be equal to {is}.' + lessThan: '{description} must be less than {lt}.' + lessThanOrEqualTo: '{description} must be less than or equal to {lte}.' + otherThan: '{description} must be other than {value}.' + odd: '{description} must be odd.' + even: '{description} must be even.' + positive: '{description} must be positive.' + date: '{description} must be a valid date.' + onOrAfter: '{description} must be on or after {onOrAfter}.' + onOrBefore: '{description} must be on or before {onOrBefore}.' + email: '{description} must be a valid email address.' + phone: '{description} must be a valid phone number.' + url: '{description} must be a valid url.' + https_url: '{description} must be a valid https url.' + email_registered: 'This email address has already been registered.' + email_invalid: 'Invalid email address. If this should not have occurred, please report this to {supportEmail}' + email_match: 'Email addresses must match.' + email_duplicate: 'Duplicate email' + password_email: 'Your password cannot be the same as your email address.' + password_old: 'Your new password cannot be the same as your old password.' + password_match: 'Passwords must match.' + recaptcha: 'Please complete reCAPTCHA.' + affirm_terms: 'You must read and agree to the Terms of Use and Privacy Policy.' + min_subjects: 'You must select at least one subject.' + node_license_invalid: 'Invalid required fields for the license' + node_license_missing_fields: 'The following required {numOfFields, plural, =1 {field is} other {fields are}} missing: {missingFields}' + invalid_doi: 'Please use a valid DOI format (10.xxxx/xxxxx)' + mustSelect: 'You must select a value for this field.' + mustSelectMinOne: 'You must select at least one value for this field.' + mustSelectFileMinOne: 'You must select at least one file for this field.' + onlyProjectOrComponentFiles: 'The {numOfFiles, plural, =1 {file} other {files}} "{missingFilesList}" cannot be found on this {projectOrComponent}.' + new_folder_name: 'Folder name must not be blank.' + year_format: 'Please specify a valid year.' +validated_input_form: + discard_changes: 'Discard changes' +node_navbar: + toggle: 'Toggle navigation' + project_nav: 'Project Navigation' + iqbrims: 'IQB-RIMS' + myscreen: 'My Screen' + wiki: Wiki + analytics: Analytics + registrations: Registrations + files: Files + contributors: Contributors + addons: Add-ons + settings: Settings + comments: Comments +status: + welcome_message: '

                            Welcome to GakuNin RDM!

                            Visit our Guides to learn about creating a project, or get inspiration from popular public projects.

                            ' + alternate_email_error: 'The email address has NOT been added to your account. Please log out and revisit the link in your email. Thank you.' + # remove_addon: 'Because the GitHub add-on for {extra.category} "{extra.title}" was authenticated by {extra.user}, authentication information has been deleted.' + project_deleted: 'Project has been successfully deleted.' + component_deleted: 'Component has been successfully deleted.' + remove_self_contrib: 'You have removed yourself as a contributor from this project.' + registration_archiving: 'Files are being copied to the newly created registration, and you will receive an email notification when the copying is finished.' + registration_submitted: 'Your submission has been received. You will be notified within two business days regarding the status of your submission. If you have questions you may contact us at prereg@cos.io.' + redirected_to_registrations: 'You have been redirected to the project''s registrations page. From here you can initiate a new Draft Registration to complete the registration process.' +dropzone_widget: + drop_files: 'Drop files here to upload' + error_multiple_files: 'Cannot upload multiple files' + error_directories: 'Cannot upload directories, applications, or packages' +join_osf: + header: 'Start managing your projects on GakuNin RDM today.' + pitch: 'Free and easy to use, GakuNin RDM supports the entire research lifecycle: planning, execution, reporting, archiving, and discovery.' + create_account: 'Create an account' + learn_more: 'learn more' + hide_message: 'Hide this message' +node_card: + generic: + private_tooltip: 'This project is private' + timestamp_label: "" + fork: + private_tooltip: 'This fork is private' + timestamp_label: 'Forked:' + manage_contributors: 'Manage contributors' + registration: + private_tooltip: 'This registration is private' + timestamp_label: 'Registered:' + statuses: + pending: 'Pending registration' + withdrawn: Withdrawn + pending_withdrawl: 'Pending withdrawal' + embargoed: Embargoed + pending_embargo: 'Pending embargo' + pending_embargo_termination: 'Pending embargo termination' + archiving: Archiving + tags: 'Tags:' + options: Options +forks: + fork: Fork + title: Forks + info: 'Forks you have permission to view are shown here.' + back: 'Back to Analytics' + new: 'Create fork' + loading_new: 'Creating new fork' + new_fork_info_title: 'Fork status' + new_fork_info: 'Your fork is being created. You''ll receive an email when it is complete.' + create_fork_modal: 'Are you sure you want to fork this project?' + unable_to_delete_fork: 'Any child components must be deleted prior to deleting this component.' + page_title: '{nodeTitle} Forks' + no_forks: 'A fork is a copy of a project that you can change without affecting the original project.' + new_fork_failed: 'Failed to create a new fork.' + delete_fork_failed: 'Failed to delete the project.' +node: + registrations: + new_registration_modal: + title: Register + info: 'Registration creates a frozen version of the project. Your original project remains editable and will have the registration linked. Things to know about registration:
                            • Registrations cannot be edited or deleted.
                            • Withdrawing a registration removes its contents, but leaves behind basic metadata: title, contributors, date registered, date withdrawn, and justification (if provided).
                            • Registrations can be public or embargoed for up to four years. Embargoed registrations will be made public automatically when the embargo expires.
                            Continue your registration by selecting a registration form:' + create: 'Create draft' + prereg_modal: + title: 'Preregistration Challenge' + notice: Notice + eligibility: 'Articles must be published by an approved journal by December 31, 2018, to be eligible for a prize.' + info: 'Below are some important items for those who choose to enter the Preregistration Challenge. If you do not agree to the terms you may still continue, use the form, and register your research study without entering the Challenge. Only Preregistrations that enter the challenge and undergo review are eligible for a $1,000 prize. We welcome questions and comments (learn more here or email us at prereg@cos.io).' + list: '
                          • After submitting your research plan for review, it is not yet registered. Your research plan will become a static, time stamped preregistration after it passes review. Please do not begin your study until it is registered. You will hear back from the review team within 2 business days.
                          • The published article must also be reviewed before receiving the prize.
                          • Prizes will be awarded at predetermined dates to eligible entrants. If more eligible entrants exist than available prizes, entrants will be ranked based on the date of registration.
                          • Articles must be published in an eligible journal.
                          • Residents of countries on the U.S. State Department''s list of embargoed countries may not participate in the Preregistration Challenge.
                          • Entering the Preregistration Challenge requires that you agree to all of its terms.
                          • ' + consent: 'I have read these terms. I understand that articles must be published by December 31, 2018, in order to be eligible for a prize.' + continue: Continue + page_title: '{nodeTitle} Registrations' + no_registrations: 'There have been no completed registrations of this project.' + only_admins_can_initiate: 'Only project administrators can initiate registrations.' + no_drafts: 'There are no draft registrations of this project.' + start_new: 'Start a new registration by clicking the “New registration” button. Once created, registrations cannot be edited or deleted.' + learn_more: 'Learn more about registrations here.' + register_entire_project: 'To register the entire project "{rootNodeTitle}" instead, click' + here: here + new: 'New registration' + registrations: Registrations + draft_registrations: 'Draft Registrations' +delete_modal: + title: 'Are you sure you want to delete this {nodeType}?' + body: 'It will no longer be available to other contributors on the {nodeType}.' + type_this: 'Type the following to continue:' + input_label: 'Scientist name verification' +paginator: + next: 'Next page' + previous: 'Previous page' + page: 'Page {page} of {max}' +social: + twitter: Twitter + facebook: Facebook + google_group: 'Google Group' + github: GitHub + linkedin: LinkedIn +institutions: + description: 'GakuNin RDM Institutions enhances transparency and increases the visibility of research outputs, accelerating discovery and reuse. Institutional members focus on generating and sharing research, and let GakuNin RDM Institutions handle the infrastructure.' + read_more: 'Read more' + footer: 'Interested in setting up an GakuNin RDM Institutions page for your research institution?' + contact_us: 'Contact us' + title: Institutions + search_placeholder: 'Search institutions' + dashboard: + title: '{institutionName} Dashboard' + last_update: 'Updated every 24 hours' + download_csv: 'Download CSV' + select_default: 'All Departments' + users_list: + name: Name + department: Department + projects: Projects + public_projects: 'Public Projects' + private_projects: 'Private Projects' + empty: 'No users found matching search criteria.' + users_connected_panel: 'SSO Users Connected' + projects_panel: 'Total Projects' + departments_panel: Departments + public: Public + private: Private + users: Users + empty: 'No data for institution found.' +registration: + project_alert: 'This registration is a frozen, non-editable version of this project' +list: + two_item: + delimiter: ' and ' + many_item: + first_delimiter: ', ' + each_delimiter: ', ' + last_delimiter: ', and ' +contributor_list: + x_more: '{x} more' + anonymous: 'Anonymous contributors' +app_components: + branded_navbar: + my_osf_projects: 'My GakuNin RDM Projects' + on_the_osf: 'On the GakuNin RDM:' + error_page: + email_message: 'If this should not have occurred and the issue persists, please report it to' + go_to: 'Go to {brand}' + license_picker: + faq: 'License FAQ' + show: 'Show full text' + hide: 'Hide full text' + fields: + copyrightHolders: 'Copyright Holders' + year: Year + license_text: + anonymized_placeholder: '[anonymized]' + navbar: + add_item: 'Add to {objectType}' + project_contributors: + title: Contributors + contributors_popover_title: 'Contributor Information' + contributors_popover: 'Projects must have at least one registered administrator and one author showing in the citation at all times. A registered administrator is a user who has both confirmed their account and has administrator privileges.' + instructions: 'Drag and drop authors to change authorship order.' + list: + name: Name + permissions: Permissions + permissions_popover_title: 'Permission Information' + permissions_popover: "\n
                            \n
                            Read
                            \n
                            \n
                              \n
                            • View project
                            • \n
                            \n
                            \n
                            Read + Write
                            \n
                            \n
                              \n
                            • Read privileges
                            • \n
                            • Add and configure project
                            • \n
                            • Add and edit content
                            • \n
                            \n
                            \n
                            Administrator
                            \n
                            \n
                              \n
                            • Read and write privileges
                            • \n
                            • Manage contributors
                            • \n
                            • Public-private settings
                            • \n
                            \n
                            \n
                            \n " + citation: Citiation + citation_popover_title: 'Citation Information' + citation_popover: 'Only checked contribotrs will be included in project citations. Contributors not in the citation can read and modify the project as normal.' + remove_contributor_success: 'Project contributor removed!' + remove_contributor_error: 'Could not remove contributor.' + item: + img_alt: Gravatar + in_citation_label: 'In citation:' + permissions_label: 'Permissions:' + permissions: + admin: Administrator + write: 'Read + Write' + read: Read + remove: Remove + remove_author: 'Remove author' + load_more_contributors: 'Load more contributors' + search: + placeholder: 'Search by name' + unregistered_description: 'Can''t find the user that you''re looking for?' + unregistered_button: 'Add author by email address' + results: Results + no_results: 'No results found.' + unregistered_contributor: + title: 'Add author by email' + full_name: 'Full name' + email: Email + paragraph: 'We will notify the user that they have been added to your project.' + cancel: Cancel + add: Add + add_success: 'Unregistered contributor added!' + add_error: 'Could not add unregistered contributor.' + result: + yourself: yourself + add: Add + add_contributor_success: 'Project contributor added!' + add_contributor_error: 'Could not add contributor.' + project_metadata: + field_title_label: 'Title:' + field_title_placeholder: "" + field_description_label: 'Description:' + field_description_placeholder: "" + field_license_label: 'Choose a license:' + field_license_placeholder: "" + field_tags_label: 'Tags:' + field_tags_placeholder: 'Add a tag' + save_success: 'Project Metadata saved.' + save_error: 'Unable to save Project Metadata.' + query_syntax: + allDatesIn: 'all dates in' + allFieldsSearched: 'By default, all available fields are searched, but you can choose to search specific fields instead' + allTagsBetween: 'all tags between' + and: and + booleanDesc1: 'By default, all terms in the query are optional, as long as one term matches. You can use boolean operators' + booleanDesc2: 'to have more control over the search' + booleanDesc3: 'The word' + booleanDesc4: 'be present. The words' + booleanDesc5: 'are optional but used for sorting by relevance' + booleanDesc6: 'Same as above, except the word' + booleanDesc7: 'be present' + booleanDesc8: 'Equivalent to' + booleanDesc9: 'The word' + booleanDesc10: 'The list of tags contains' + booleanOperators: 'Boolean Operators' + boosting: Boosting + boostingDesc1: 'Use the boost operator' + boostingDesc2: 'with a number to make one term more relevant than another. The boost can be any positive number. Boosts between 0 and 1 reduce relevance.' + boostingDesc3: 'Boost results with' + boostingDesc4: 'higher than results with just' + both: both + butNot: 'but not' + couldNotPerformQuery: 'Could not perform search query.' + damerauLevenshteinDistanceDesc: 'to match all words with at most 1 change. You can specify a different maximum edit distance with a number after the' + descriptionContainsPhrase: 'The description contains the exact phrase' + documentation: documentation + escapeReservedChars: ' If you want to use any of these reserved characters in your query, escape them with a leading backslash. For instance, to search for ' + except: except + excluding: excluding + fuzziness: Fuzziness + fuzzinessDesc1: 'after a word to indicate a ''fuzzy'' search, to include matches that are similar but not exactly the same.' + listContainsExactPhrase: 'The list of contributor names contains the exact phrase' + listOfIdentifiersContains: 'The list of identifiers contains' + match: Match + matchWordStartsWith: 'Match any word that starts with' + moreInformation: 'More Information' + moreInformationOnSearch: 'Please see below for more information on advanced search queries.' + moreInfoQuerySyntax: 'For more details about query syntax, see the' + must: must + mustNot: 'must not' + needToType: 'you would need to type' + or: or + phraseProximity: 'Phrase Proximity' + phraseProximityDesc1: 'You can also specify a maximum edit distance for phrases, to allow the words in the phrase to be farther apart or in a different order.' + ranges: Ranges + rangesDesc1: 'Use brackets to specify ranges for a field. Square brackets' + rangesDesc2: 'indicate inclusive ranges and curly brackets' + rangesDesc3: 'indicate exclusive ranges' + reservedChars: 'Reserved Characters' + searchByField: 'Searching by Field' + specialMeanings: 'The following characters have special meanings in a query' + theWord: 'the word' + thisUsesThe: 'This uses the' + titleContainsWord: 'The title contains the word' + use: Use + wildcards: Wildcards + wildcardsDesc1: 'Use wildcards to match multiple terms at once. Use' + wildcardsDesc2: 'to match any single character, or' + wildcardsDesc3: 'to match zero or more characters.' + search_help_modal: + close: Close + title: 'Search help' + queries: Queries + searchSyntax: 'Search uses the Lucene search syntax.' + helpDescription: 'This gives you many options, but can be very simple as well. Examples of valid searches include:' + search_paginator: + prev: « + next: » + submit_section: + discard: 'Discard changes' + save: 'Save and continue' + continue: Continue + click_to_edit: 'Click to edit' +collections: + general: + brand: '{name} Collection' + navbar: + add: 'Add to Collection' + index: + title: Collections + services_heading: 'Collection Services' + services_paragraph: 'Leading collection service providers use this open source infrastructure to support their communities.' + service_bottom: + p1: 'Create your own branded collection service backed by the GakuNin RDM.' + div: + line1: 'Check out the' + linkText1: 'open source code' + line2: 'and our' + linkText2: 'public road map' + line3: '. Input welcome!' + contact: 'Contact us' + provider: + title: Provider + discover: + title: Discover + search_heading: 'Collections Search' + search_placeholder: 'Search collection' + other_repositories: 'Other collections' + facet_titles: + collection_provider: Providers + status: Status + collected_type: Type + issue: Issue + program_area: 'Program Area' + volume: Volume + collections_submission: + title: Submit + add_header: 'Add to Collection' + update_header: 'Update in Collection' + project_select_title: 'Select a project' + project_select_project_label: 'Project:' + closed_tooltip: 'Complete the previous section to edit this section' + project_metadata_title: 'Project metadata' + project_metadata_description: 'Updates made in this section will update the project.' + project_metadata_title_label: 'Title:' + project_metadata_description_label: 'Description:' + project_metadata_license_label: 'License:' + project_metadata_tags_label: 'Tags:' + project_contributors_title: 'Project contributors' + project_contributors_description: 'Updates made to this section will update the project.' + collection_metadata_title: 'Collection metadata' + cancel: Cancel + add_button: 'Add to collection' + update_button: Update + add_save_success: '{title} has been added to the collection.' + update_save_success: '{title} has been updated in the collection.' + add_save_error: "Error adding {title} to the collection." + update_save_error: "Error updating {title} in the collection." + warning_body: 'Are you sure you want to discard changes to the submission? Changes saved to the project will persist.' + collection_submission_confirmation_modal: + header: 'Submit project' + body: 'Once this project is submitted to the collection, it will be made public, and you should assume that it will always be public. You can return it to private later, but search engines (including Google’s cache) or others may access files, wiki pages, or analytics before you do.' + add_button: 'Add to collection' + collection_item_picker: + after_options: + loading: Loading… + load_more: 'Load More Projects' + collection_metadata: + collected_type_label: 'Type:' + issue_label: 'Issue:' + program_area_label: 'Program Area:' + status_label: 'Status:' + volume_label: 'Volume:' + collection_search_result: + expand: 'Expand search result' + collapse: 'Collapse search result' + discover_page: + active_filters: + button: 'Clear filters' + heading: 'Active Filters' + remove_provider: 'Remove provider' + remove_type: 'Remove type' + remove_status: 'Remove status' + remove_issue: 'Remove issue' + remove_program_area: 'Remove program area' + remove_volume: 'Remove volume' + asOf: 'as of' + broadenSearch: 'Try broadening your search terms' + date: Date + funder: Funder + language: Language + luceneHelp: 'Lucene search help' + noResults: 'No results. Try removing some filters.' + noResultsFound: 'No results found.' + partnerRepositories: 'Partner Repositories' + people: People + poweredBy: 'powered by' + publisher: Publisher + refineSearch: 'Refine your search by' + removeRegistrationType: 'Remove registration type' + search: Search + searchLoading: 'Search loading' + searchPlaceholder: Search... + share: SHARE + searchUnavailable: 'Search is Unavailable' + sortBy: 'Sort by' + sortSearchResults: 'Sort search results' + source: Source + tag: Tag + type: Type +registries: + header: + search: Search + search_placeholder: 'Search registrations...' + searchable_as_of: '{registrations} searchable registrations as of {today}' + facets: + registration_type: + title: 'GakuNin RDM Registration Type' + only_available_with_osf: 'Only available with GakuNin RDM Registries' + registration_schema_error: 'An error occurred getting registration types.' + application: + page_title: 'GakuNin RDM Registries' + discover: + page_title: Search + SHARE: SHARE + registrations: Registrations + sort_by: 'Sort by' + powered_by: 'powered by' + no_results: 'No results found.' + try_broadening: 'Try broadening your search terms' + order: + relevance: Relevance + modified_ascending: 'Modified Date (oldest to newest)' + modified_descending: 'Modified Date (newest to oldest)' + sidebar: + refine_your_search: 'Refine your search by' + clear_filters: 'Clear filters' + active_filters: 'Active filters' + search_result: + last_edited: 'Last edited: {date}' + withdrawn: Withdrawn + pagination: + previous: « + next: » + start: + page_title: 'Start Registration' + forms: + page_title: 'Select Registration Forms' + form: + title: 'Choose From Existing Registration Schema' + help: + title: 'Help Choose Registration Form' + drafts: + page_title: 'View Registration Drafts' + index: + title: 'Choose Unfinished Draft' + draft: + metadata: + title: 'Fill out basic registration info' + page_label: Metadata + failed_auto_save: 'Failed to auto-save draft registration metadata' + save_institutions_error: 'Failed to save affiliated institutions' + load_institutions_error: 'Failed to load affiliated institutions' + form: + title: 'Fill out registration form' + next: Next + back: Back + save_draft: 'Save draft' + new_registration: 'New registration' + last_saved: 'Auto-saved: ' + save_failed: 'Save failed. Unsaved changes present.' + failed_auto_save: 'Failed to auto-save draft registration form' + review: + title: 'Review registration before submitting' + page_label: Review + start_review: Review + invalid_warning: 'Please address invalid or missing entries to complete registration.' + toggle_dropdown: 'Toggle navigation dropdown' + register: Register + submit_error: 'Unable to create a registration.' + index: + lead: 'The open registries network' + see_example: 'See an example' + services: + top: + heading: 'Registry Services' + paragraph: 'Leading registry service providers use this open source infrastructure to support their communities.' + bottom: + p1: 'Create your own branded registry backed by the GakuNin RDM.' + div: + line1: 'Check out the' + linkText1: 'open source code' + line2: 'and the' + linkText2: 'requirements and road map' + line3: '. Input welcome!' + contact: 'Contact us' + advisory: + heading: 'Advisory Group' + paragraph: 'Our advisory group includes leaders in registrations across disciplines' + recent: + title: 'Browse Registrations' + more: 'See more' + registration_metadata: + add_description: 'Add description' + add_license: 'Add license' + affiliated_institutions: 'Affiliated institutions' + category: Category + choose_license: 'Choose a License' + citation: Citation + contributors: Contributors + create_doi: 'Create DOI' + date_created: 'Date created' + date_registered: 'Date registered' + description: Description + disciplines: Disciplines + edit_field: 'Edit {field}' + license: License + metadata_page_heading: 'Registration Metadata' + metadata_page_description: 'This metadata applies only to the registration you are creating, and will not be applied to your project.' + no_affiliated_institutions: 'No affiliated institutions' + no_copyrightHolders: 'No copyright holders' + no_description: 'No description' + no_doi: 'No DOI assigned' + no_license: 'No license' + no_matches: 'No matches found' + no_publication_doi: 'No publication DOI' + no_subjects: 'No subjects' + no_title: 'No title' + no_year: 'No year' + publication_doi: 'Publication DOI' + registered_from: 'Registered from' + registration_doi: 'Registration DOI' + registration_type: 'Registration type' + select_license: 'Select license' + show_less: 'Show less' + show_more: 'Show more' + subjects: Subjects + tags: Tags + title: Title + edit_description: + success: 'Description successfully updated.' + error: 'Unable to save description.' + edit_category: + success: 'Category successfully updated.' + error: 'Unable to save category.' + mint_doi: + header: 'Are you sure you want to create a DOI for this registration?' + text: 'A DOI is persistent and will always resolve to this page.' + success: 'DOI successfully created.' + error: 'Unable to create registration DOI.' + edit_pub_doi: + success: 'Publication DOI successfully updated.' + error: 'Unable to save publication DOI.' + edit_institutions: + success: 'Affiliated institutions successfully updated.' + error: 'Unable to save affiliated institutions.' + edit_license: + success: 'License successfully updated.' + error: 'Unable to save license.' + edit_tags: + success: 'Tags successfully updated.' + error: 'Unable to save tags.' + nodeLicense: + year: 'Year' + copyrightHolders: 'Copyright Holders' + save_subjects_error: 'Unable to save subjects' + load_subjects_error: 'Unable to load subjects' + form_view: + none_selected: 'None selected' + overview: + title: Overview + collapse: Collapse + expand: Expand + contents: Contents + see_more: 'See more' + metadata: Metadata + component_of: 'This is a component of a registration:' + comments: + title: Comments + see_replies: 'See replies' + hide_replies: 'Hide replies' + report: Report + cancel: Cancel + load_more: 'Load more replies' + create_report: + success: 'Comment successfully reported' + error: 'Unable to report comment' + category_placeholder: 'Select a category that best describes abuse' + retract_report: + success: 'Report successfully retracted' + error: 'Unable to retract abuse report' + modified: 'Modified ' + report_placeholder: 'Describe abuse' + comment_abuse: 'Comment reported.' + comment_abuse_action: 'Not abuse' + abuse_spam: 'Spam or advertising' + abuse_hate: 'Hate speech' + abuse_violence: 'Violence or harmful behavior' + cannot_retract_report: 'Only the reporter can retract report' + no_comments: 'No comments.' + links: + title: Links + linked_nodes: 'Linked projects and components' + no_linked_nodes: 'This registration has no linked projects or components.' + linked_registrations: 'Linked registrations' + no_linked_registrations: 'This registration has no linked registrations.' + contributors: + title: Contributors + gravatar_alt: 'Gravatar for {name}' + components: + title: Components + no_components: 'This registration has no components.' + external_links: + files: Files + wiki: Wiki + analytics: Analytics + form_view: + no_files: 'No files selected' + withdrawn: + has_been_withdrawn: 'This registration has been withdrawn for the reason(s) stated below.' + date_withdrawn: 'Date withdrawn' + justification: 'Justification for withdrawal' + no_justification: 'None given' + state: Withdrawn + withdraw: + withdraw: 'Withdraw registration' + withdrawal_justification_label: 'Please provide your justification for withdrawing this registration.' + random_scientist_x: 'Type {x} below and click Withdraw Registration if you are sure you want to continue.' + success: 'Withdrawal request submitted successfully' + error: 'Unable to withdraw this registration' + warning: 'Withdrawing a registration will remove its content from the GakuNin RDM, but leave basic metadata behind. The title of a withdrawn registration and its contributor list will remain, as will justification or explanation of the withdrawal, should you wish to provide it. Withdrawn registrations will be marked with a "withdrawn" tag. This action is irreversible.' + archiving: + currently_archiving: 'This registration is currently archiving, and no changes can be made at this time.' + email_support: 'If this registration has been archiving for more than 72 hours, please email {supportEmail} for assistance.' + pending: + state: Pending + action: + approve: Approve + reject: Reject + public: + state: Public + text: 'Public registration' + short_description: Public + long_description: 'This public registration is a frozen, non-editable version of this project.' + pendingRegistration: + text: 'Pending registration' + short_description: 'Pending registration approval' + long_description: 'This is a pending registration of this project, awaiting approval from project administrators. This registration will be final when all project administrators approve the registration or 48 hours pass, whichever comes first.' + pendingWithdrawal: + text: 'Public registration' + short_description: 'Pending withdrawal' + long_description: 'This registration will be withdrawn when all project administrators approve the withdrawal.' + pendingEmbargo: + text: 'Pending registration' + short_description: 'Pending embargo approval' + long_description: 'This registration is pending approval. It will be final and enter an embargo period when all project administrators approve the registration or 48 hours pass, whichever comes first. The embargo will keep the registration private until the embargo period ends.' + pendingEmbargoTermination: + text: 'Embargoed registration' + short_description: 'Pending embargo termination' + long_description: 'This registration is embargoed. It will remain private until {embargoEndDate}. A request to make this registration public is pending.' + embargoed: + state: Embargoed + action: 'End embargo early' + action_success: 'Embargo termination request successfully sent' + action_error: 'Unable to submit embargo termination request' + confirm_text: 'By clicking confirm, an email will be sent to project administrator(s) to approve ending the embargo. If approved, this registration, including any components, will be made public immmediately. This action is irreversible.' + confirm_button_text: Confirm + text: 'Embargoed registration' + short_description: Embargoed + long_description: 'This registration is embargoed. It will remain private until {embargoEndDate}.' + bookmark: + add: + text: Bookmark + success: 'Registration successfully added to your bookmarks' + error: 'Unable to bookmark this registration' + remove: + text: 'Remove from bookmarks' + success: 'Registration successfully removed from your bookmarks' + error: 'Unable to remove this registration from bookmarks' + fork: + success: 'Your fork is being created. You''ll receive an email when it is complete' + success_title: 'Fork status' + error: 'Unable to fork registration' + view_forks: 'View forks' + fork_registration: 'Fork this registration' + tooltips: + bookmark: 'Bookmark this registration' + remove_bookmark: 'Remove bookmark' + share: 'Share this registration' + fork: 'Fork this registration' + partialRegistrationModal: + title: 'Select Components' + continueButton: Continue + cancelButton: Cancel + selectAll: 'Select All' + clearAll: 'Clear All' + finalizeRegistrationModal: + title: 'Almost done...' + notice: "Please keep in mind that:\n
                              \n
                            • \n Registrations cannot be modified or deleted once completed.\n
                            • \n
                            • \n The content and version history of Wiki and GakuNin RDM Storage will be copied to the registration.\n
                            • \n
                            • \n This project contains links to other projects. These links will be copied into your registration, but the\n projects that they link to will not be registered. If you wish to register the linked projects, they must be\n registered separately. Learn more about links.\n
                            • \n
                            " + immediateOption: 'Make registration public immediately' + embargoOption: 'Enter registration into embargo' + createDoi: 'Create DOI' + submit: Submit + back: Back + datePlaceholder: 'Choose embargo end date' +meetings: + index: + meetings-list: + min_5_submissions: 'Only conferences with at least five submissions are displayed.' + name: Name + submissions: Submissions + location: Location + date: Date + empty: 'No results found for this search term.' + meetings-hero-banner: + image_alt: 'Logo for GakuNin RDM meeting' + h3: 'A free poster and presentation sharing service for academic meetings and conferences' + conference_organizers_h3: 'For Conference Organizers' + conference_organizers_help_text: 'Register your event to broaden its impact. Events get a dedicated page, an easy submission process, and persistent links.' + conference_organizers_register_button: Register + conference_organizers_register_panel_texts: '

                            GakuNin RDM Meetings is a product that we offer to academic conferences at no cost. To request poster and talk hosting for a conference:

                            Submit this set-up form

                            We''ll review and add your conference within one business day.

                            ' + conference_participants_h3: 'For Conference Participants' + conference_participants_help_text: 'Share your posters and presentations along with any supporting data and materials. Get persistent links and usage analytics.' + conference_participants_upload_button: Upload + conference_participants_upload_panel_texts: '

                            The GakuNin RDM can host posters and talks for scholarly meetings. Submitting a presentation is easy:

                            • Find the email address for your conference by clicking on its name in the list below
                            • Send your materials to the GakuNin RDM Meetings email address for your conference

                            We’ll create a GakuNin RDM project for you. You''ll get a permanent link to your presentation, plus analytics about who has viewed and downloaded your work.

                            ' + meetings-footer: + discover: Discover + discover_text: 'Explore posters and presentations from events long after they''re over.' + share: Share + share_text: 'Get persistent links to your content and increase your impact.' + enhance: Enhance + enhance_text: 'Add supplementary data and materials to your submission to make your work more transparent.' + who_use_text: 'Who uses GakuNin RDM Meetings?' + aps_img_alt: 'Logo for American Physiological Society (APS)' + bitss_img_alt: 'Logo for Berkeley Initiative for Transparency in the Social Sciences (BITSS)' + nrao_img_alt: 'Logo for National Radio Astronomy Observatory (NRAO)' + spsp_img_alt: 'Logo for Society for Personality and Social Psychology (SPSP)' + detail: + meeting-submissions-list: + title: Title + author: Author + category: Category + dateCreated: 'Date created' + downloads: Downloads + noSubmissions: 'No submissions' + meeting-detail-header: + image_alt: 'Meeting logo image' + add_your: 'Add your' + send_email: 'Send an email to the following address(es) from the email account you would like used on the OSF:' + email_text: 'For {typeName}, email {emailAddress}' + format_header: 'The format of the email should be as follows:' + subject: Subject + message_body: 'Message body' + attachment: Attachment + panel_footer_note: 'Once sent, we will follow-up by sending you the permanent identifier that others can use to cite your work; you can also login and make changes, such as uploading additional files, to your project at that URL.If you didn''t have a GakuNin RDM account, one will be created automatically and a link to set your password will be emailed to you; if you do, we will simply create a new project in your account.By creating an account you agree to our Terms and that you have read our Privacy Policy, including our information on Cookie Use.' + conference_homepage: 'Conference homepage' +analytics: + pageTitle: '{nodeTitle} Analytics' + forks: Forks + viewForks: 'View forks' + links: 'Links to this project' + viewLinks: 'View links' + noLinks: 'No links to this project' + templateCopies: 'Template copies' + adblockWarning: 'The use of adblocking software may prevent site analytics from loading properly' + uniqueVisits: 'Unique visits' + visitTimes: 'Time of day of visits' + topReferrers: 'Top referrers' + popularPages: 'Popular pages' + showForDateRange: 'Show analytics for date range:' + directLink: 'direct link' + enableChart: 'Enable chart' + visits: Visits + hourOfDay: 'Hour of day' + keenError: 'Error loading analytics data' + dateRanges: + pastWeek: 'Past week' + pastTwoWeeks: 'Past two weeks' + pastMonth: 'Past month' + popularPageNames: + home: Home + files: Files + fileDetail: 'File: {fileName}' + analytics: Analytics + forks: Forks + registrations: Registrations + wiki: Wiki + privateProject: "\n

                            \n Analytics are not available for private projects. To view Analytics, make your project public\n by selecting Make Public from the project overview page. Public projects:\n

                            \n
                              \n
                            • are discoverable
                            • \n
                            • are citable
                            • \n
                            • can be affiliated with GakuNin RDM for Institutions partners
                            • \n
                            • promote open practices among peers
                            • \n
                            \n

                            \n Receive data on visitors to your project by enabling Analytics\n and begin discovering the impact of your work.\n

                            \n " +cookieBanner: + cookieWarning: 'The National Institute of Informatics (NII) uses cookies to operate the NII Research Data Cloud service and to improve your user experience. If you intend to use the GakuNin RDM, please read our Privacy Policy and information on NII use of cookies. By clicking Accept or continuing to use our website, you consent to the cookies use on this site. If you do not agree with the cookies use, please change your browser settings to disable cookies or stop using our website. Please be aware that you may not be able to use some functions on our website when you have cookies disabled.' + accept: Accept +discover: + relevance: Relevance + sort_oldest_newest: 'Modified Date (oldest to newest)' + sort_newest_oldest: 'Modified Date (newest to oldest)' + search_results: + lastEdited: 'Last edited: {date} (UTC)' + status: 'Status: {value}' +page_not_found: + heading: 'Page not found' + message: 'The page you were looking for is not found on the {brand} service.' +forbidden: + heading: Forbidden + message: 'User has restricted access to this page.' +resource_deleted: + heading: 'Resource deleted' + message: 'User has deleted this content.' +routes: + register: + sign_up: 'Sign Up' + create_a_free_account: 'Create a free account' + sign_up_using: 'Sign up using:' + orcid: ORCID + institution: Institution + email: Email +osf-components: + draft-registration-card: + initiated_by: 'Initiated by:' + form_type: 'Form:' + started: 'Started:' + last_updated: 'Last updated:' + review: Review + delete_draft_confirm: 'Are you sure you want to delete this draft registration?' + copyable-text: + copyToClipboard: 'Copy to clipboard' + copied: Copied + delete-button: + buttonLabel: Delete + confirmButtonText: Delete + cancelButtonText: Cancel + modalTitle: 'Are you sure you want to delete this?' + modalBody: 'This action is irreversible.' + hardConfirm: 'Type the following to continue: {text}' + error: 'There was an error deleting this item.' + paginated-list: + error: 'There was an error loading this list.' + sign-up-form: + full_name: 'Full name' + contact_email: 'Contact email' + confirm_email: 'Confirm email' + password: Password + sign_up_button_label: 'Sign up' + password_placeholder: 'Password (Must be {min} to {max} characters)' + registration_success: 'Registration successful. Please check {email} to confirm your email address.' + sign-up-policy: + paragraph: 'I have read and agree to the Terms of Use and Privacy Policy.' + tags-widget: + tags: Tags + add_tag: 'Add a tag to enhance discoverability' + no_tags: 'No tags' + institutions-list: + no_affiliated_institution: + project: 'This project has no affiliated institutions' + registration: 'This registration has no affiliated institutions' + institutions-select-list: + no_affiliated_institution: 'You have no institutional affiliations' + citation-viewer: + get_more: 'Get more citations' + placeholder: 'Enter citation style (e.g. "APA")' + type_to_search: 'Start typing to search citation styles' + search-bar: + aria: Search + heading: 'Discover public research' + subheading: 'Discover projects, data, materials, and collaborators on GakuNin RDM that might be helpful to your own research.' + placeholder: 'Search discipline, author...' + search: Search + hero-banner: + headingA: 'The place to share your research' + headingB: 'There’s a better way to manage your research' + subheading: 'GakuNin RDM is a free, open platform to support your research and enable collaboration.' + add_your_research: + heading: 'Add your research' + subheading: 'Labs and teams across the globe use GakuNin RDM to open their projects up to the scientific community.' + carousel: + current_slide: '(Current Slide)' + previous_slide: 'Previous slide' + next_slide: 'Next slide' + go_to_slide: 'Go to slide {slideIndex}' + registries: + read-only-contributors-list: + editContributorsOnYourProject: 'Edit contributors on your project' + schema-block-renderer/label: + showExample: 'Show example' + hideExample: 'Hide example' + editButtonAriaLabel: 'Edit {questionLabel}' + schema-block-renderer/editable/files: + instructions: 'You may attach up to 5 file(s) to this question. You may attach files that you already have in GakuNin RDM Storage in this {projectOrComponent} or upload (drag and drop) a new file from your computer. Uploaded files will automatically be added to this {projectOrComponent} so that they can be registered. To attach files from other components or an add-on, first add them to this {projectOrComponent}.' + schema-block-renderer/read-only/response: + noResponse: 'No response' + schema-block-renderer/read-only/files: + noFilesSelected: 'No files selected' + files-widget: + drag_drop_files: 'Drag and drop files here to upload files to this folder' + load_more: 'Load more files' + unselect_file: 'Unselect file' + upload_file: 'Upload file' + expand_files_menu: 'Expand files menu' + create_folder: 'Create folder' + create: Create + folder_name_placeholder: 'New folder name' + create_folder_failed: 'Failed to create folder' + subjects: + browse: + browse_all: 'Browse all subjects' + show_child_subjects: 'Show child subjects' + hide_child_subjects: 'Hide child subjects' + search: + search_all: 'Search subjects' + placeholder: 'Type to search' + no_results: 'No matching subjects found. Try a less specific search.' + display: + placeholder: 'Your selections will appear here' + remove_subject: 'Remove subject' + registries-side-nav: + expandSideNav: 'Expand registration form navigation' + collapseSideNav: 'Collapse registration form navigation' + registries-top-nav: + showRegistrationNavigation: 'Show registration form navigation' + metadata: 'Return to metadata' + previousPage: 'Previous page' + nextPage: 'Next page' + reviewRegistration: 'Review registration' + contributors: + headings: + name: 'Name' + permission: 'Permission' + citation: 'Citation' + permissions: + admin: 'Administrator' + write: 'Read + Write' + read: 'Read' + citation: + true: 'Yes' + false: 'No' +settings: + toggleNav: 'Toggle navigation' + profile: + title: 'Profile information' + name: + title: Name + fullName: 'Display name (e.g. Rosalind Elsie Franklin)' + givenName: 'Given name (e.g. Rosalind)' + middleNames: 'Middle names (e.g. Elsie)' + familyName: 'Family name (e.g. Franklin)' + suffix: Suffix + citationName: 'Citation name' + instructions: 'Your full name, above, will be displayed in your profile. To control the way your name will appear in citations, edit the fields below.' + apa: APA + mla: MLA + citationPreview: 'Citation preview' + social: + title: Social + education: + title: Education + employment: + title: Employment + account: + deactivation: + title: 'Deactivate account' + body: 'Deactivating your account will remove you from all public projects to which you are a contributor. Your account will no longer be associated with GakuNin RDM projects, and your work on the GakuNin RDM will be inaccessible. If this is a secondary account that you want to close, consider merging your accounts.' + warning: 'Warning:' + warningText: 'Once your deactivation has been approved the effects are irreversible.' + pending: 'Your account is currently pending deactivation.' + requestButton: 'Request deactivation' + confirmationTitle: 'Request account deactivation?' + confirmationBody: 'Are you sure you want to request account deactivation? A GakuNin RDM administrator will review your request. If accepted, you will NOT be able to reactivate your account.' + confirmationButton: Request + confirmationToastMessage: 'A GakuNin RDM administrator will contact you shortly to confirm your deactivation request.' + undoRequestButton: 'Undo deactivation request' + undoRequestConfirmationTitle: 'Undo deactivation request?' + undoRequestConfirmationBody: 'Are you sure you want to undo your account deactivation request? This will preserve your account status.' + undoRequestConfirmationButton: 'Undo deactivation request' + undoRequestToastMessage: 'Your deactivation request has been undone.' + defaultRegion: + title: 'Default storage location' + why: 'This location will be applied to new projects and components. It will not affect existing projects and components.' + updateButton: 'Update location' + successToast: 'You have successfully changed your default storage location to {region}' + saveError: 'Could not make this change. Try again in a few minutes. If the issue persists, please report it to {supportEmail}.' + export: + title: 'Export account data' + body: 'Exporting your account data allows you to keep a permanent copy of the current state of your account. Keeping a copy of your account data can provide peace of mind or assist in transferring your information to another provider.' + requestButton: 'Request export' + confirmationTitle: 'Request account export?' + confirmationBody: 'Are you sure you want to request account export?' + confirmationButton: Request + confirmationToastMessage: 'A GakuNin RDM administrator will contact you shortly to confirm your export request.' + saveError: 'Could not make this change. Try again in a few minutes. If the issue persists, please report it to {supportEmail}.' + security: + title: 'Security settings' + twoFactorAuth: 'Two-factor authentication' + enableTwoFactor: Configure + enableWarning: 'Configuring two-factor authentication will not immediately activate this feature for your account. You will need to follow the steps that appear below to complete the activation of two-factor authentication for your account.' + disableTwoFactor: Disable + why: 'By using two-factor authentication, you will protect your GakuNin RDM account with both your password and your mobile phone.' + enableButton: Configure + importantWarning: 'Important: If you lose access to your mobile device, you will not be able to log in to your GakuNin RDM account.' + howTo: 'To use, you must install an appropriate application on your mobile device. Google Authenticator is a popular choice and is available for both Android and iOS.' + onceVerified: 'Once verified, your device will display a six-digit code that must be entered during the login process. This code changes every few seconds, which means that unauthorized users will not be able to log in to you account, even if they know your password.' + scanImage: 'Scan the image below, or enter the secret key {secretKey} into your authentication device.' + enterVerification: 'Enter your verification code:' + verificationFailed: 'Verification failed. Please enter your verification code again.' + disableWarning: 'Are you sure you want to disable two-factor authentication?' + disableButton: Disable + saveError: 'Could not make this change. Try again in a few minutes. If the issue persists, please report it to {supportEmail}.' + submitVerification: Enable + title: 'Account settings' + connected_emails: + add_email: 'Add email' + add_email_modal: + title: 'Confirmation email sent' + body: '{emailAddress} was added to your account. You will receive a confirmation email at {emailAddress}. Please click the link in your email to confirm this action. You will be required to enter your password.' + alternate_emails: 'Alternate emails' + confirm_delete: + title: 'Remove email' + body: 'Are you sure you want to remove {emailAddress} from your email list?' + resend_confirmation_modal: + title: 'Resend email confirmation?' + body: 'Are you sure that you want to resend email confirmation to {emailAddress}?' + resend_button: Resend + resend_fail: 'Unable to resend confirmation email' + resend_success: 'Email resent' + delete_fail: 'Unable to delete email' + delete_success: 'Email deleted' + load_fail: 'Unable to load emails' + make_primary: 'Make primary' + merge_explanation: 'To merge an existing account with this one or to log in with multiple email addresses, add an alternate email address below. All projects and components will be displayed under the email address listed as primary.' + no_unconfirmed_emails: 'There are no unconfirmed emails' + no_alternate_emails: 'There are no alternate emails' + placeholder_text: 'Email address' + primary_email: 'Primary email' + resend_confirmation: 'Resend confirmation' + save_fail: 'Unable to add email' + save_success: 'Email added' + title: 'Connected emails' + unconfirmed_emails: 'Unconfirmed emails' + update_fail: 'Unable to update email' + update_success: 'Email updated' + changePassword: + title: 'Change password' + updateButton: 'Update password' + updateFail: 'Error updating password' + updateSuccess: 'Successfully changed password' + currentPassword: + placeholder: 'Old password' + newPassword: + placeholder: 'New password' + confirmPassword: + title: 'Confirm new password' + placeholder: 'Verify password' + connected_identities: + title: 'Connected identities' + description: 'Connected identities allow you to log in to the GakuNin RDM via a third-party service.
                            You can revoke these authorizations here.' + no_identities: 'You have not authorized any external services to log in to the GakuNin RDM.' + status: + verified: Verified + pending: Pending + confirm_remove: + title: 'Remove authorization?' + body: 'Are you sure you want to remove this authorization?' + confirm_button_text: Remove + remove_fail: 'Revocation request failed. Please contact {supportEmail} if the problem persists.' + remove_success: 'You have revoked this connected identity.' + addons: + title: 'Configure add-on accounts' + notifications: + title: Notifications + developer-apps: + title: 'Developer apps' + explanation: 'The GakuNin RDM allows third-party web applications to connect to the GakuNin RDM on behalf of other users via the OAuth 2.0 web application flow.' + createApp: 'Create developer app' + backToList: 'Back to list of developer apps' + appDetail: 'Detail for app {appName}' + editApp: 'Edit app' + appName: 'App name' + appHomepage: 'Project homepage URL' + appDescription: 'App description' + appCallbackUrl: 'Authorization callback URL' + clientID: 'Client ID' + clientIDDescription: 'The unique identifier for this developer app. It is safe to share publicly with others.' + clientSecret: 'Client secret' + clientSecretDescription: 'The client secret is known only to you and GakuNin RDM. Do not display or expose it to others.' + showSecret: 'Show client secret' + hideSecret: 'Hide client secret' + created: 'Developer app created.' + saved: 'Developer app saved.' + deleted: 'Developer app deleted.' + resetSecret: + label: 'Reset secret' + description: 'Resetting the client secret will render your application unusable until it is updated with the new client secret, and all users must reauthorize access. Previously issued access tokens will no longer work.' + modalTitle: 'Reset client secret?' + confirm: 'Are you sure you want to reset the client secret? This cannot be reversed.' + success: 'Client secret successfully reset.' + error: 'Error resetting client secret.' + confirmDelete: + title: 'Delete app {appName}?' + body: 'Are you sure you want to delete this developer app? All users'' access tokens will be revoked. This cannot be reversed.' + tokens: + title: 'Personal access tokens' + explanation: 'Personal access tokens function like ordinary OAuth access tokens. They can be used to authenticate to the API.' + createToken: 'Create token' + editToken: 'Edit token' + backToList: 'Back to list of tokens' + tokenName: 'Token name' + scopes: Scopes + scopesDescription: 'Scopes limit access for personal access tokens.' + created: 'Token created.' + saved: 'Token saved.' + deleted: 'Token deleted.' + confirmDelete: + title: 'Delete token {tokenName}?' + body: 'Are you sure you want to delete this personal access token? This cannot be reversed.' + createSuccess: + message: 'Token {tokenName} created:' + instructions: 'This token will never expire. This token should never be shared with others. If it is accidentally revealed publicly, it should be deactivated immediately.' + warning: 'This is the only time your token will be displayed.' + editScopes: 'Edit scopes' +verifyEmail: + merge: + header: 'Merge account?' + body: 'Would you like to merge {email} into your account? This action is irreversible.' + verifyButton: 'Merge account' + denyButton: 'Do not merge account' + verifySuccess: '{email} has been merged into your account.' + denySuccess: '{email} has not been merged into your account.' + verifyError: 'There was a problem merging {email} into your account.' + denyError: 'There was a problem canceling the request to merge {email} into your account.' + add: + header: 'Add alternate email?' + body: 'Would you like to add {email} to your account?' + verifyButton: 'Add email' + denyButton: 'Do not add email' + verifySuccess: '{email} has been added to your account.' + denySuccess: '{email} has not been added to your account.' + verifyError: 'There was a problem adding {email} to your account.' + denyError: 'There was a problem canceling the request to add {email} to your account.' +ipsum: + title: 'tempor nec feugiat nisl pretium' + sentence: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.' + paragraph: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Id velit ut tortor pretium. Nisi porta lorem mollis aliquam ut porttitor leo a. Cras fermentum odio eu feugiat. Eget mi proin sed libero enim. Quam adipiscing vitae proin sagittis. Volutpat consequat mauris nunc congue nisi vitae suscipit tellus. At varius vel pharetra vel turpis nunc eget. Purus ut faucibus pulvinar elementum integer enim neque volutpat. Turpis nunc eget lorem dolor. Mattis pellentesque id nibh tortor id aliquet lectus proin nibh. Arcu felis bibendum ut tristique et egestas quis. Nisl tincidunt eget nullam non nisi est sit amet. Fringilla urna porttitor rhoncus dolor purus non enim.' +dev_tools: + title: 'Dev tools' + zoom_to_route: + title: 'Zoom to route' + zoom: Zoom! + placeholder: 'Choose a route' + options: + toast_events: 'Display toast for tracked events' + show_url_bar: 'Show URL bar -- navigate by URL without reloading' +iqbrims: + page_title: '{nodeTitle} IQB-RIMS' + header_overview: 'Overview of Paper' + header_manuscripts: 'Final Manuscript/Composition' + header_data: 'Raw Data' + header_checklist: 'Checklist' + loading: 'Preparing folders for application...' + deposit_button: 'Deposit Manuscript & Data' + check_button: 'Image Scan only' + edit_button: 'Edit' + management_project: 'Management Project' + flowable_task_service: 'Flowable Task Service' + deposit_help: 'Register an accepted paper and deposit data' + check_help: 'Pre-submission image scan service' + paper_title: 'Paper Title' + contributors: 'Co-author/Worker' + edit_contributors: 'Edit' + labo: 'Laboratory' + email: 'Email for Notification' + accepted_date: 'Accepted Date' + journal_name: 'Journal Name' + doi: 'DOI' + publish_date: 'Publish Date' + volume: 'Volume' + page_number: 'Page Number' + directly_submit_data: 'Directly Submit Data' + workflow_overall_state: 'Current Status' + submit_manuscripts: 'Current Status' + submit_data: 'Current Status' + submit_checklist: 'Current Status' + submitted_no_data: 'No submitted data' + submitted_loading: 'Loading submitted data' + submitted_name: 'Submitted Name' + submitted_modified: 'Submitted Modified Date' + placeholders: + paper_title: 'Research Paper Title' + labo: 'Select affiliated laboratory' + accepted_date: 'YYYY/MM/DD' + journal_name: 'Journal Name' + doi: 'https://doi.org/XX.XXXX/Y.YYYYYY' + publish_date: 'YYYY/MM/DD' + volume: 'N' + page_number: 'N' + files_comment: '提出するファイルに関するコメント(任意)' + uploader_comment: '提出するファイルに関するコメント(任意)' + submit_button: 'Submit' + confirm_button: 'Update' + processing_submit_button: 'Submitting...' + discard_button: 'Discard Changes' + failed_to_submit: 'Failed to submit' + uploader_no_files: 'No files' + uploader_rejected_manuscript_files: 'Cannot upload TIFF, PNG, JPEG:' + uploader_rejected_data_files: 'Can upload only ZIP, Excel:' + uploader_rejected_checklist_files: 'Can upload only PDF:' + file_confirm_dialog_title: 'ファイルの提出' + file_confirm_dialog_body: 'ファイル提出後は変更・追加はできません。よろしいですか?' + file_confirm_dialog_notice: '処理完了にともない、通知メール Your move has finished が送られる場合があります。' + submit_files: '提出予定ファイル' + has_paper: '最終原稿・組図' + has_raw: '生データ' + has_checklist: 'チェックリスト' + files_comment: 'コメント' + uploader_comment: 'コメント' +myscreen: + page_title: '{nodeTitle} My Screen' + header: 'My Screen' + loading: 'Loading My Screen config...' + param1: 'Param 1' + save_button: 'Save' + failed_to_submit: 'Failed to save' + placeholders: + param1: 'anything' diff --git a/site/guides/screen-expansion/images/addon_tab.png b/site/guides/screen-expansion/images/addon_tab.png new file mode 100644 index 0000000..20f8bb0 Binary files /dev/null and b/site/guides/screen-expansion/images/addon_tab.png differ diff --git a/site/guides/screen-expansion/images/project_dashboard.png b/site/guides/screen-expansion/images/project_dashboard.png new file mode 100644 index 0000000..a811599 Binary files /dev/null and b/site/guides/screen-expansion/images/project_dashboard.png differ diff --git a/site/guides/screen-expansion/index.html b/site/guides/screen-expansion/index.html new file mode 100644 index 0000000..9aa4a13 --- /dev/null +++ b/site/guides/screen-expansion/index.html @@ -0,0 +1,2886 @@ + + + + + + + + + + + + + + + + + + + + + + + Screen Expansion Addon / 画面拡張アドオン - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                            + +
                            + + + + +
                            + + +
                            + +
                            + + + + + + + + + +
                            +
                            + + + +
                            +
                            +
                            + + + + + + + +
                            +
                            +
                            + + + +
                            +
                            +
                            + + + +
                            +
                            +
                            + + + +
                            +
                            + + + + + + + +

                            Screen Expansion Addon / 画面拡張アドオン

                            +
                            +

                            Summary: Guide to creating RDM screen expansion addons with dashboard widgets and page tabs +概要: ダッシュボードウィジェットとページタブを持つ RDM 画面拡張アドオンを作成する手引き

                            +
                            +

                            Jump: English · 日本語

                            + +
                            +

                            +

                            English

                            +

                            → 日本語版へ

                            +

                            Overview

                            +

                            This guide shows how to create RDM screen expansion addons that add:

                            +
                              +
                            • Dashboard widgets: Small UI elements on the project dashboard
                            • +
                            • Page tabs: New pages accessible from the project navigation bar
                            • +
                            +

                            Screen expansion addons use Ember.js for the frontend and Django for the backend.

                            +

                            Prerequisites

                            + +

                            Quick start

                            +
                              +
                            1. Create your addon using the skeleton as a base
                            2. +
                            3. Add widget template and configuration files
                            4. +
                            5. Add Ember.js page tab (route, controller, template)
                            6. +
                            7. Configure RDM to display your widget and tab
                            8. +
                            9. Test both the widget and page tab
                            10. +
                            +

                            Legacy content

                            +

                            The legacy screen expansion addon instructions are kept verbatim in README.legacy.md for reference and will be rewritten per milestone.

                            +
                            +

                            +

                            日本語

                            +

                            → To English

                            +

                            概要

                            +

                            このガイドは、以下の機能を持つ RDM 画面拡張アドオンを作成する方法を示します:

                            +
                              +
                            • ダッシュボードウィジェット: プロジェクトダッシュボード上の小さな UI 要素
                            • +
                            • ページタブ: プロジェクトのナビゲーションバーからアクセスできる新しいページ
                            • +
                            +

                            画面拡張アドオンは、フロントエンドに Ember.js、バックエンドに Django を使用します。

                            +

                            前提条件

                            + +

                            クイックスタート

                            +
                              +
                            1. スケルトンをベースにアドオンを作成する
                            2. +
                            3. ウィジェットのテンプレートと設定ファイルを追加する
                            4. +
                            5. Ember.js のページタブ(ルート、コントローラー、テンプレート)を追加する
                            6. +
                            7. RDM を設定してウィジェットとタブを表示する
                            8. +
                            9. ウィジェットとページタブの両方をテストする
                            10. +
                            +

                            過去のコンテンツ

                            +

                            過去の画面拡張アドオンの手順は、参考のために README.legacy.md にそのまま残しており、マイルストーンごとに書き直す予定です。

                            +
                            +

                            Glossary / 用語

                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                            TermEnglish note日本語注
                            Screen expansion addonAn addon that adds new UI elements and pages to RDM.RDM に新しい UI 要素とページを追加するアドオン。
                            Dashboard widgetA small UI element displayed on the project dashboard.プロジェクトダッシュボードに表示される小さな UI 要素。
                            Page tabA new page accessible from the project navigation bar.プロジェクトのナビゲーションバーからアクセスできる新しいページ。
                            Ember.jsA JavaScript framework for building interactive web applications.インタラクティブなウェブアプリケーションを構築するための JavaScript フレームワーク。
                            + + + + + + + + + + + + + +
                            +
                            + + + +
                            + +
                            + + + +
                            +
                            +
                            +
                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/guides/screen-expansion/osf.io/addon/__init__.py b/site/guides/screen-expansion/osf.io/addon/__init__.py new file mode 100644 index 0000000..eba4dd5 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/addon/__init__.py @@ -0,0 +1,4 @@ +SHORT_NAME = 'myscreen' +FULL_NAME = 'My Screen' + +default_app_config = 'addons.{}.apps.AddonAppConfig'.format(SHORT_NAME) diff --git a/ScreenExpansion/osf.io/addon/apps.py b/site/guides/screen-expansion/osf.io/addon/apps.py similarity index 100% rename from ScreenExpansion/osf.io/addon/apps.py rename to site/guides/screen-expansion/osf.io/addon/apps.py diff --git a/StorageAddon/osf.io/addon/migrations/__init__.py b/site/guides/screen-expansion/osf.io/addon/migrations/__init__.py similarity index 100% rename from StorageAddon/osf.io/addon/migrations/__init__.py rename to site/guides/screen-expansion/osf.io/addon/migrations/__init__.py diff --git a/site/guides/screen-expansion/osf.io/addon/models.py b/site/guides/screen-expansion/osf.io/addon/models.py new file mode 100644 index 0000000..64f6244 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/addon/models.py @@ -0,0 +1,20 @@ +import logging + +from addons.base.models import BaseNodeSettings +from django.db import models +from . import settings + +logger = logging.getLogger(__name__) + + +class NodeSettings(BaseNodeSettings): + param_1 = models.TextField(blank=True, null=True) + + def get_param_1(self): + if self.param_1 is None or self.param_1 == '': + return settings.DEFAULT_PARAM_1 + return self.param_1 + + def set_param_1(self, param_1): + self.param_1 = param_1 + self.save() diff --git a/StorageAddon/osf.io/addon/tests/__init__.py b/site/guides/screen-expansion/osf.io/addon/requirements.txt similarity index 100% rename from StorageAddon/osf.io/addon/tests/__init__.py rename to site/guides/screen-expansion/osf.io/addon/requirements.txt diff --git a/site/guides/screen-expansion/osf.io/addon/routes.py b/site/guides/screen-expansion/osf.io/addon/routes.py new file mode 100644 index 0000000..eed3d2c --- /dev/null +++ b/site/guides/screen-expansion/osf.io/addon/routes.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +from framework.routing import Rule, json_renderer +from website.routes import notemplate +from . import SHORT_NAME +from . import views + +# ember: ここから +# HTML endpoints +page_routes = { + 'rules': [ + # Home (Base) | GET + Rule( + [ + '//{}'.format(SHORT_NAME), + '//node//{}'.format(SHORT_NAME), + ], + 'get', + views.project_myscreen, + notemplate + ), + + ] +} +# ember: ここまで + +# JSON endpoints +api_routes = { + 'rules': [ + Rule([ + '/project//{}/settings'.format(SHORT_NAME), + '/project//node//{}/settings'.format(SHORT_NAME), + ], 'get', views.myscreen_get_config, json_renderer), + Rule([ + '/project//{}/settings'.format(SHORT_NAME), + '/project//node//{}/settings'.format(SHORT_NAME), + ], 'put', views.myscreen_set_config, json_renderer), + + # ember: ここから + Rule([ + '/project//{}/config'.format(SHORT_NAME), + '/project//node//{}/config'.format(SHORT_NAME), + ], 'get', views.myscreen_get_config_ember, json_renderer), + Rule([ + '/project//{}/config'.format(SHORT_NAME), + '/project//node//{}/config'.format(SHORT_NAME), + ], 'patch', views.myscreen_set_config_ember, json_renderer), + # ember: ここまで + ], + 'prefix': '/api/v1', +} diff --git a/site/guides/screen-expansion/osf.io/addon/settings/__init__.py b/site/guides/screen-expansion/osf.io/addon/settings/__init__.py new file mode 100644 index 0000000..2b2f988 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/addon/settings/__init__.py @@ -0,0 +1,10 @@ +import logging +from .defaults import * # noqa + + +logger = logging.getLogger(__name__) + +try: + from .local import * # noqa +except ImportError: + logger.warn('No local.py settings file found') diff --git a/site/guides/screen-expansion/osf.io/addon/settings/defaults.py b/site/guides/screen-expansion/osf.io/addon/settings/defaults.py new file mode 100644 index 0000000..a9e5175 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/addon/settings/defaults.py @@ -0,0 +1 @@ +DEFAULT_PARAM_1 = 'This is test!' diff --git a/site/guides/screen-expansion/osf.io/addon/static/comicon.png b/site/guides/screen-expansion/osf.io/addon/static/comicon.png new file mode 100644 index 0000000..81ddf48 Binary files /dev/null and b/site/guides/screen-expansion/osf.io/addon/static/comicon.png differ diff --git a/site/guides/screen-expansion/osf.io/addon/static/myscreen.css b/site/guides/screen-expansion/osf.io/addon/static/myscreen.css new file mode 100644 index 0000000..d60cfeb --- /dev/null +++ b/site/guides/screen-expansion/osf.io/addon/static/myscreen.css @@ -0,0 +1,5 @@ +/* widget用ファイル */ + +#myscreen-content p { + color: blue; +} \ No newline at end of file diff --git a/site/guides/screen-expansion/osf.io/addon/static/node-cfg.js b/site/guides/screen-expansion/osf.io/addon/static/node-cfg.js new file mode 100644 index 0000000..5b86939 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/addon/static/node-cfg.js @@ -0,0 +1,81 @@ +'use strict'; + +var $ = require('jquery'); +var m = require('mithril'); +var ko = require('knockout'); +var Raven = require('raven-js'); +var osfHelpers = require('js/osfHelpers'); +var ChangeMessageMixin = require('js/changeMessage'); +var SaveManager = require('js/saveManager'); + +var SHORT_NAME = 'myscreen'; +var logPrefix = '[' + SHORT_NAME + '] '; + + +function NodeSettings() { + var self = this; + self.baseUrl = window.contextVars.node.urls.api + SHORT_NAME + '/'; + + self.param_1 = ko.observable(''); + self.loaded_param_1 = ko.observable(''); + self.dirty = ko.computed(function() { + return self.param_1() != self.loaded_param_1(); + }) + + ChangeMessageMixin.call(self); + + self.saveManager = new SaveManager( + self.baseUrl + 'settings', + null, + { + dirty: function() { + return self.param_1() != self.loaded_param_1() + } + } + ); + + self.submit = function() { + console.log(logPrefix, 'submit', self.param_1()); + self.saveManager.save({'param_1': self.param_1()}) + .then(function (data) { + console.log(logPrefix, 'updated: ', data); + self.loaded_param_1(self.param_1()) + }, + function(reason) { + Raven.captureMessage('Error while updating addon info', { + extra: { + reason: reason + } + }); + }) + }; + + self.loadConfig = function() { + var url = self.baseUrl + 'settings'; + console.log(logPrefix, 'loading: ', url); + + return $.ajax({ + url: url, + type: 'GET', + dataType: 'json' + }).done(function (data) { + console.log(logPrefix, 'loaded: ', data); + self.loaded_param_1(data.param_1); + self.param_1(data.param_1); + }).fail(function(xhr, status, error) { + Raven.captureMessage('Error while retrieving addon info', { + extra: { + url: url, + status: status, + error: error + } + }); + }); + }; +} + +$.extend(NodeSettings.prototype, ChangeMessageMixin.prototype); + +var settings = new NodeSettings(); +osfHelpers.applyBindings(settings, '#' + SHORT_NAME + 'Scope'); +settings.loadConfig(); diff --git a/site/guides/screen-expansion/osf.io/addon/static/widget-cfg.js b/site/guides/screen-expansion/osf.io/addon/static/widget-cfg.js new file mode 100644 index 0000000..8508bad --- /dev/null +++ b/site/guides/screen-expansion/osf.io/addon/static/widget-cfg.js @@ -0,0 +1,52 @@ +'use strict'; +// widget用ファイル + +var $ = require('jquery'); +var ko = require('knockout'); +var Raven = require('raven-js'); +var osfHelpers = require('js/osfHelpers'); + +var logPrefix = '[myscreen] '; + +require('./myscreen.css'); + + +function MyScreenWidget() { + var self = this; + self.baseUrl = window.contextVars.node.urls.api + 'myscreen/'; + self.loading = ko.observable(true); + self.loadFailed = ko.observable(false); + self.loadCompleted = ko.observable(false); + self.param_1 = ko.observable(''); + + self.loadConfig = function() { + var url = self.baseUrl + 'settings'; + console.log(logPrefix, 'loading: ', url); + + return $.ajax({ + url: url, + type: 'GET', + dataType: 'json' + }).done(function (data) { + console.log(logPrefix, 'loaded: ', data); + self.loading(false); + self.loadCompleted(true); + self.param_1(data.param_1); + }).fail(function(xhr, status, error) { + self.loading(false); + self.loadFailed(true); + Raven.captureMessage('Error while retrieving addon info', { + extra: { + url: url, + status: status, + error: error + } + }); + }); + }; + +} + +var w = new MyScreenWidget(); +osfHelpers.applyBindings(w, '#myscreen-content'); +w.loadConfig(); diff --git a/site/guides/screen-expansion/osf.io/addon/templates/node_settings.mako b/site/guides/screen-expansion/osf.io/addon/templates/node_settings.mako new file mode 100644 index 0000000..8dc1ed8 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/addon/templates/node_settings.mako @@ -0,0 +1,26 @@ + + +
                            +

                            + + ${addon_full_name} +

                            + +
                            +
                            +
                            + +
                            + +
                            +
                            + +
                            +
                            + +
                            + +
                            +
                            diff --git a/StorageAddon/waterbutler/tests/__init__.py b/site/guides/screen-expansion/osf.io/addon/tests/__init__.py similarity index 100% rename from StorageAddon/waterbutler/tests/__init__.py rename to site/guides/screen-expansion/osf.io/addon/tests/__init__.py diff --git a/StorageAddon/osf.io/addon/tests/conftest.py b/site/guides/screen-expansion/osf.io/addon/tests/conftest.py similarity index 100% rename from StorageAddon/osf.io/addon/tests/conftest.py rename to site/guides/screen-expansion/osf.io/addon/tests/conftest.py diff --git a/site/guides/screen-expansion/osf.io/addon/tests/factories.py b/site/guides/screen-expansion/osf.io/addon/tests/factories.py new file mode 100644 index 0000000..1154b54 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/addon/tests/factories.py @@ -0,0 +1,13 @@ +"""Factories for the My Screen addon.""" +import factory +from factory.django import DjangoModelFactory +from osf_tests.factories import ProjectFactory + +from ..models import NodeSettings + + +class NodeSettingsFactory(DjangoModelFactory): + class Meta: + model = NodeSettings + + owner = factory.SubFactory(ProjectFactory) diff --git a/site/guides/screen-expansion/osf.io/addon/tests/test_model.py b/site/guides/screen-expansion/osf.io/addon/tests/test_model.py new file mode 100644 index 0000000..c060098 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/addon/tests/test_model.py @@ -0,0 +1,35 @@ +import mock +from nose.tools import * # noqa +import pytest +import unittest + +from tests.base import get_default_metaschema +from osf_tests.factories import ProjectFactory + +from framework.auth import Auth +from ..models import NodeSettings +from .factories import NodeSettingsFactory + + +pytestmark = pytest.mark.django_db + +class TestNodeSettings(unittest.TestCase): + _NodeSettingsFactory = NodeSettingsFactory + + def setUp(self): + super(TestNodeSettings, self).setUp() + self.node = ProjectFactory() + self.user = self.node.creator + + self.node_settings = self._NodeSettingsFactory(owner=self.node) + self.node_settings.save() + + def tearDown(self): + super(TestNodeSettings, self).tearDown() + self.node.delete() + self.user.delete() + + def test_set_param_1(self): + self.node_settings.set_param_1('TEST_PARAM_1') + self.node_settings.save() + assert_equal(self.node_settings.get_param_1(), 'TEST_PARAM_1') diff --git a/site/guides/screen-expansion/osf.io/addon/tests/test_view.py b/site/guides/screen-expansion/osf.io/addon/tests/test_view.py new file mode 100644 index 0000000..a7a8e39 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/addon/tests/test_view.py @@ -0,0 +1,51 @@ +# -*- coding: utf-8 -*- +from rest_framework import status as http_status + +import mock +from nose.tools import * # noqa + +from framework.auth import Auth +from tests.base import OsfTestCase, get_default_metaschema +from osf_tests.factories import ProjectFactory + +from .. import SHORT_NAME +from .. import settings +from .utils import BaseAddonTestCase +from website.util import api_url_for + + +class TestViews(BaseAddonTestCase, OsfTestCase): + + def test_empty_param_1(self): + self.node_settings.set_param_1('') + self.node_settings.save() + url = self.project.api_url_for('{}_get_config'.format(SHORT_NAME)) + res = self.app.get(url, auth=self.user.auth) + assert_equals(res.json['param_1'], settings.DEFAULT_PARAM_1) + + def test_param_1(self): + self.node_settings.set_param_1('PARAM_1') + self.node_settings.save() + url = self.project.api_url_for('{}_get_config'.format(SHORT_NAME)) + res = self.app.get(url, auth=self.user.auth) + assert_equals(res.json['param_1'], 'PARAM_1') + + # ember: ここから + def test_ember_empty_param_1(self): + self.node_settings.set_param_1('') + self.node_settings.save() + url = self.project.api_url_for('{}_get_config_ember'.format(SHORT_NAME)) + res = self.app.get(url, auth=self.user.auth) + assert_equals(res.json['data']['id'], self.node_settings._id) + assert_equals(res.json['data']['type'], 'myscreen-config') + assert_equals(res.json['data']['attributes']['param1'], settings.DEFAULT_PARAM_1) + + def test_ember_param_1(self): + self.node_settings.set_param_1('PARAM_1') + self.node_settings.save() + url = self.project.api_url_for('{}_get_config_ember'.format(SHORT_NAME)) + res = self.app.get(url, auth=self.user.auth) + assert_equals(res.json['data']['id'], self.node_settings._id) + assert_equals(res.json['data']['type'], 'myscreen-config') + assert_equals(res.json['data']['attributes']['param1'], 'PARAM_1') + # ember: ここまで diff --git a/site/guides/screen-expansion/osf.io/addon/tests/utils.py b/site/guides/screen-expansion/osf.io/addon/tests/utils.py new file mode 100644 index 0000000..1c4dbc0 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/addon/tests/utils.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +from addons.base.tests.base import OAuthAddonTestCaseMixin, AddonTestCase +from .. import SHORT_NAME + + +class BaseAddonTestCase(AddonTestCase): + ADDON_SHORT_NAME = SHORT_NAME + OWNERS = ['node'] + NODE_USER_FIELD = None + ExternalAccountFactory = None + Provider = None + Serializer = None + client = None + + def set_node_settings(self, settings): + return diff --git a/site/guides/screen-expansion/osf.io/addon/utils.py b/site/guides/screen-expansion/osf.io/addon/utils.py new file mode 100644 index 0000000..b3700be --- /dev/null +++ b/site/guides/screen-expansion/osf.io/addon/utils.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- + +# widget: ここから +def serialize_myscreen_widget(node): + myscreen = node.get_addon('myscreen') + ret = { + # if True, show widget body, otherwise show addon configuration page link. + 'complete': True + } + ret.update(myscreen.config.to_json()) + return ret +# widget: ここまで diff --git a/site/guides/screen-expansion/osf.io/addon/views.py b/site/guides/screen-expansion/osf.io/addon/views.py new file mode 100644 index 0000000..c690ae2 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/addon/views.py @@ -0,0 +1,73 @@ +# -*- coding: utf-8 -*- +from rest_framework import status as http_status +from flask import request +import logging + +from . import SHORT_NAME +from framework.exceptions import HTTPError +from website.project.decorators import ( + must_have_addon, + must_be_valid_project, + must_have_permission, +) +from website.ember_osf_web.views import use_ember_app + +logger = logging.getLogger(__name__) + +@must_be_valid_project +@must_have_permission('admin') +@must_have_addon(SHORT_NAME, 'node') +def myscreen_get_config(**kwargs): + node = kwargs['node'] or kwargs['project'] + addon = node.get_addon(SHORT_NAME) + return {'param_1': addon.get_param_1()} + +@must_be_valid_project +@must_have_permission('admin') +@must_have_addon(SHORT_NAME, 'node') +def myscreen_set_config(**kwargs): + node = kwargs['node'] or kwargs['project'] + addon = node.get_addon(SHORT_NAME) + try: + param_1 = request.json['param_1'] + except KeyError: + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + logger.info('param_1: {}'.format(param_1)) + addon.set_param_1(param_1) + return {} + +# ember: ここから +@must_be_valid_project +@must_have_addon(SHORT_NAME, 'node') +def project_myscreen(**kwargs): + return use_ember_app() + +@must_be_valid_project +@must_have_permission('admin') +@must_have_addon(SHORT_NAME, 'node') +def myscreen_get_config_ember(**kwargs): + node = kwargs['node'] or kwargs['project'] + addon = node.get_addon(SHORT_NAME) + return {'data': {'id': node._id, 'type': 'myscreen-config', + 'attributes': { + 'param1': addon.get_param_1() + }}} + +@must_be_valid_project +@must_have_permission('admin') +@must_have_addon(SHORT_NAME, 'node') +def myscreen_set_config_ember(**kwargs): + node = kwargs['node'] or kwargs['project'] + addon = node.get_addon(SHORT_NAME) + try: + config = request.json['data']['attributes'] + param_1 = config['param1'] + except KeyError: + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + + addon.set_param_1(param_1) + return {'data': {'id': node._id, 'type': 'myscreen-config', + 'attributes': { + 'param1': param_1 + }}} +# ember: ここまで diff --git a/site/guides/screen-expansion/osf.io/config/Dockerfile b/site/guides/screen-expansion/osf.io/config/Dockerfile new file mode 100644 index 0000000..a2285a4 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/config/Dockerfile @@ -0,0 +1,197 @@ +FROM node:8-alpine3.9 + +ARG NODE_OPTIONS='--max-old-space-size=4096' + +# Source: https://github.com/docker-library/httpd/blob/7976cabe162268bd5ad2d233d61e340447bfc371/2.4/alpine/Dockerfile#L3 +RUN set -x \ + && addgroup -g 82 -S www-data \ + && adduser -h /var/www -u 82 -D -S -G www-data www-data + +RUN apk add --no-cache --virtual .run-deps \ + su-exec \ + bash \ + python3 \ + git \ + # lxml2 + libxml2 \ + libxslt \ + # psycopg2 + postgresql-libs \ + # cryptography + libffi \ + # gevent + libev \ + libevent \ + openblas-dev \ + && yarn global add bower + +WORKDIR /code + +COPY ./requirements.txt ./ +COPY ./requirements/ ./requirements/ +COPY ./addons/bitbucket/requirements.txt ./addons/bitbucket/ +COPY ./addons/box/requirements.txt ./addons/box/ +#COPY ./addons/citations/requirements.txt ./addons/citations/ +COPY ./addons/dataverse/requirements.txt ./addons/dataverse/ +COPY ./addons/dropbox/requirements.txt ./addons/dropbox/ +#COPY ./addons/dropboxbusiness/requirements.txt ./addons/dropboxbusiness/ +#COPY ./addons/figshare/requirements.txt ./addons/figshare/ +#COPY ./addons/forward/requirements.txt ./addons/forward/ +COPY ./addons/github/requirements.txt ./addons/github/ +COPY ./addons/gitlab/requirements.txt ./addons/gitlab/ +#COPY ./addons/googledrive/requirements.txt ./addons/googledrive/ +#COPY ./addons/iqbrims/requirements.txt ./addons/iqbrims/ +COPY ./addons/mendeley/requirements.txt ./addons/mendeley/ +COPY ./addons/onedrive/requirements.txt /code/addons/onedrive/ +#COPY ./addons/osfstorage/requirements.txt ./addons/osfstorage/ +COPY ./addons/owncloud/requirements.txt ./addons/owncloud/ +COPY ./addons/s3/requirements.txt ./addons/s3/ +COPY ./addons/twofactor/requirements.txt ./addons/twofactor/ +#COPY ./addons/wiki/requirements.txt ./addons/wiki/ +COPY ./addons/zotero/requirements.txt ./addons/zotero/ +COPY ./addons/swift/requirements.txt ./addons/swift/ +COPY ./addons/azureblobstorage/requirements.txt ./addons/azureblobstorage/ +COPY ./addons/weko/requirements.txt ./addons/weko/ +COPY ./addons/s3compat/requirements.txt ./addons/s3compat/ +COPY ./addons/nextcloud/requirements.txt ./addons/nextcloud/ +COPY ./addons/nextcloudinstitutions/requirements.txt ./addons/nextcloudinstitutions/ +COPY ./addons/myscreen/requirements.txt ./addons/myscreen/ + +RUN set -ex \ + && mkdir -p /var/www \ + && chown www-data:www-data /var/www \ + && apk add --no-cache --virtual .build-deps \ + build-base \ + linux-headers \ + python3-dev \ + # lxml2 + musl-dev \ + libxml2-dev \ + libxslt-dev \ + # psycopg2 + postgresql-dev \ + # cryptography + libffi-dev \ + libpng-dev \ + freetype-dev \ + jpeg-dev \ + && pip3 install Cython \ + && for reqs_file in \ + /code/requirements.txt \ + /code/requirements/release.txt \ + /code/addons/*/requirements.txt \ + ; do \ + pip3 install --no-cache-dir -c /code/requirements/constraints.txt -r "$reqs_file" \ + ; done \ + && (pip3 uninstall uritemplate.py --yes || true) \ + && pip3 install --no-cache-dir uritemplate.py==0.3.0 \ + # Fix: https://github.com/CenterForOpenScience/osf.io/pull/6783 + && python3 -m compileall /usr/lib/python3.6 || true \ + && apk del .build-deps + +# Settings +COPY ./tasks/ ./tasks/ +COPY ./website/settings/ ./website/settings/ +COPY ./api/base/settings/ ./api/base/settings/ +COPY ./website/__init__.py ./website/__init__.py +COPY ./addons.json ./addons.json +RUN mv ./website/settings/local-dist.py ./website/settings/local.py \ + && mv ./api/base/settings/local-dist.py ./api/base/settings/local.py \ + && sed 's/DEBUG_MODE = True/DEBUG_MODE = False/' -i ./website/settings/local.py + +# Bower Assets +COPY ./.bowerrc ./bower.json ./ +COPY ./admin/.bowerrc ./admin/bower.json ./admin/ +RUN \ + # OSF + bower install --production --allow-root \ + && bower cache clean --allow-root \ + # Admin + && cd ./admin \ + && bower install --production --allow-root \ + && bower cache clean --allow-root + +# Webpack Assets +# +## OSF +COPY ./package.json ./.yarnrc ./yarn.lock ./ +COPY ./webpack* ./ +COPY ./website/static/ ./website/static/ +COPY ./scripts/translations/ ./scripts/translations/ +COPY ./website/translations/ ./website/translations/ +COPY ./website/static/js/translations/ ./website/static/js/translations/ +## Admin +COPY ./admin/package.json ./admin/yarn.lock ./admin/ +COPY ./admin/webpack* ./admin/ +COPY ./admin/static/ ./admin/static/ +## Addons +COPY ./addons/bitbucket/static/ ./addons/bitbucket/static/ +COPY ./addons/box/static/ ./addons/box/static/ +COPY ./addons/citations/static/ ./addons/citations/static/ +COPY ./addons/dataverse/static/ ./addons/dataverse/static/ +COPY ./addons/dropbox/static/ ./addons/dropbox/static/ +COPY ./addons/dropboxbusiness/static/ ./addons/dropboxbusiness/static/ +COPY ./addons/figshare/static/ ./addons/figshare/static/ +COPY ./addons/forward/static/ ./addons/forward/static/ +COPY ./addons/github/static/ ./addons/github/static/ +COPY ./addons/gitlab/static/ ./addons/gitlab/static/ +COPY ./addons/googledrive/static/ ./addons/googledrive/static/ +COPY ./addons/mendeley/static/ ./addons/mendeley/static/ +COPY ./addons/onedrive/static/ /code/addons/onedrive/static/ +COPY ./addons/osfstorage/static/ ./addons/osfstorage/static/ +COPY ./addons/owncloud/static/ ./addons/owncloud/static/ +COPY ./addons/s3/static/ ./addons/s3/static/ +COPY ./addons/twofactor/static/ ./addons/twofactor/static/ +COPY ./addons/wiki/static/ ./addons/wiki/static/ +COPY ./addons/zotero/static/ ./addons/zotero/static/ +COPY ./addons/swift/static/ ./addons/swift/static/ +COPY ./addons/azureblobstorage/static/ ./addons/azureblobstorage/static/ +COPY ./addons/weko/static/ ./addons/weko/static/ +COPY ./addons/jupyterhub/static/ ./addons/jupyterhub/static/ +COPY ./addons/s3compat/static/ ./addons/s3compat/static/ +COPY ./addons/nextcloud/static/ ./addons/nextcloud/static/ +COPY ./addons/nextcloudinstitutions/static/ ./addons/nextcloudinstitutions/static/ +COPY ./addons/iqbrims/static/ ./addons/iqbrims/static/ +COPY ./addons/myscreen/static/ ./addons/myscreen/static/ +RUN \ + # OSF + yarn install --frozen-lockfile \ + && mkdir -p ./website/static/built/ \ + && invoke build_js_config_files \ + && yarn run webpack-prod \ + # Admin + && cd ./admin \ + && yarn install --frozen-lockfile \ + && yarn run webpack-prod \ + && cd ../ \ + # Cleanup + && yarn cache clean \ + && npm cache clean --force + +# Copy the rest of the code over +COPY ./ ./ + +ARG GIT_COMMIT= +ENV GIT_COMMIT ${GIT_COMMIT} + +RUN pybabel compile -d ./website/translations +RUN pybabel compile -D django -d ./admin/translations + +# TODO: Admin/API should fully specify their bower static deps, and not include ./website/static in their defaults.py. +# (this adds an additional 300+mb to the build image) +RUN for module in \ + api.base.settings \ + admin.base.settings \ + ; do \ + export DJANGO_SETTINGS_MODULE=$module \ + && python3 manage.py collectstatic --noinput --no-init-app \ + ; done \ + && for file in \ + ./website/templates/_log_templates.mako \ + ./website/static/built/nodeCategories.json \ + ; do \ + touch $file && chmod o+w $file \ + ; done \ + && rm ./website/settings/local.py ./api/base/settings/local.py + +CMD ["su-exec", "nobody", "invoke", "--list"] diff --git a/site/guides/screen-expansion/osf.io/config/addons.json b/site/guides/screen-expansion/osf.io/config/addons.json new file mode 100644 index 0000000..45f0cc7 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/config/addons.json @@ -0,0 +1,146 @@ +{ + "addons": [ + "box", + "dataverse", + "dropbox", + "figshare", + "forward", + "github", + "gitlab", + "mendeley", + "zotero", + "osfstorage", + "owncloud", + "onedrive", + "s3", + "twofactor", + "wiki", + "googledrive", + "bitbucket", + "swift", + "azureblobstorage", + "weko", + "jupyterhub", + "s3compat", + "nextcloud", + "nextcloudinstitutions", + "iqbrims", + "dropboxbusiness", + "myscreen" + ], + "addons_default": [ + "osfstorage", + "nextcloudinstitutions", + "dropboxbusiness" + ], + "addons_archivable": { + "osfstorage": "full", + "box": "partial", + "dataverse": "partial", + "dropbox": "partial", + "figshare": "partial", + "forward": "full", + "googledrive": "partial", + "onedrive": "partial", + "github": "partial", + "gitlab": "partial", + "owncloud": "partial", + "s3": "partial", + "wiki": "full", + "bitbucket": "partial", + "swift": "partial", + "azureblobstorage": "partial", + "weko": "partial", + "s3compat": "partial", + "nextcloud": "partial", + "nextcloudinstitutions": "partial", + "iqbrims": "partial", + "dropboxbusiness": "partial", + "myscreen": "partial" + }, + "addons_commentable": [ + "osfstorage", + "box", + "dataverse", + "dropbox", + "figshare", + "github", + "gitlab", + "googledrive", + "owncloud", + "s3", + "bitbucket", + "onedrive", + "swift", + "swift", + "azureblobstorage", + "weko", + "s3compat", + "nextcloud", + "nextcloudinstitutions", + "iqbrims", + "dropboxbusiness", + "myscreen" + ], + "addons_based_on_ids": [ + "osfstorage", + "box", + "onedrive" + ], + "addons_oauth_no_redirect": [ + "bitbucket" + ], + "addons_description": { + "box": "Box is a file storage add-on. Connect your Box account to a GakuNin RDM project to interact with files hosted on Box via the GakuNin RDM.", + "dataverse": "Dataverse is an open source software application to share, cite, and archive data. Connect your Dataverse account to share your Dataverse datasets via the GakuNin RDM.", + "dropbox": "Dropbox is a file storage add-on. Connect your Dropbox account to a GakuNin RDM project to interact with files hosted on Dropbox via the GakuNin RDM.", + "figshare": "Figshare is an online digital repository. Connect your figshare account to share your figshare files along with other materials in your GakuNin RDM project.", + "forward": "The External Link add-on allows you to provide a link to a website outside of the GakuNin RDM.", + "github": "GitHub is a web-based Git repository hosting service. Connect your GitHub repo to your GakuNin RDM project to share your code alongside other materials in your GakuNin RDM project.", + "gitlab": "GitLab is an open-source web-based Git repository hosting tool and service. Connect your GitLab repo to your GakuNin RDM project to share your code alongside other materials in your GakuNin RDM project.", + "mendeley": "Mendeley is a reference management tool. Connecting Mendeley folders to GakuNin RDM projects allows you and others to view, copy, and download citations that are relevant to your project from the Project Overview page.", + "zotero": "Zotero is a reference management tool. Connecting Zotero folders to GakuNin RDM projects allows you and others to view, copy, and download citations that are relevant to your project from the Project Overview page.", + "osfstorage": "NII Storage is the default storage provider for GakuNin RDM projects.", + "owncloud": "ownCloud is an open source, self-hosted file sync and share app platform. Connect your ownCloud account to a GakuNin RDM project to interact with files hosted on ownCloud via the GakuNin RDM.", + "s3": "Amazon S3 is a file storage add-on. Connect your S3 account to a GakuNin RDM project to interact with files hosted on S3 via the GakuNin RDM.", + "twofactor": "Two-factor authentication is a security add-on. By using two-factor authentication, you'll protect your GakuNin RDM account with both your password and your mobile phone.", + "wiki": "The wiki is a versatile communication tool. Wikis can be used to explain the main points of your project and can contain information like lab notes or contact information.", + "googledrive": "Google Drive is a file storage add-on. Connect your Google Drive account to a GakuNin RDM project to interact with files hosted on Google Drive via the GakuNin RDM.", + "bitbucket": "Bitbucket is a web-based Git repository hosting service. Connect your Bitbucket repo to your GakuNin RDM project to share your code alongside other materials in your GakuNin RDM project.", + "onedrive": "Microsoft OneDrive is a file storage add-on. Connect your Microsoft OneDrive account to a GakuNin RDM project to interact with files hosted on Microsoft OneDrive via the GakuNin RDM.", + "swift": "OpenStack Swift is a file storage add-on. Connect your OpenStack Swift account to a GakuNin RDM project to interact with files hosted on OpenStack Swift via the GakuNin RDM.", + "azureblobstorage": "Azure Blob Storage is a file storage add-on. Connect your Azure Storage account to a GakuNin RDM project to interact with files hosted on Azure Blob Storage (Block Blob) via the GakuNin RDM.", + "weko": "WEKO is an application server to share, archive data.", + "jupyterhub": "Jupyter is a web-based interactive computational environment. Files on a GakuNin RDM project can be imported to/exported from Jupyter", + "s3compat": "S3 Compatible Storage is a file storage add-on. Connect your S3 Compatible Storage account to a GakuNin RDM project to interact with files hosted on S3 Compatible Storage via the GakuNin RDM.", + "nextcloud": "Nextcloud is an open source, self-hosted file sync and share app platform. Connect your Nextcloud account to a GakuNin RDM project to interact with files hosted on Nextcloud via the GakuNin RDM.", + "iqbrims": "IQB-RIMS is a file storage add-on. Connect your Google Drive account to a GakuNin RDM project to interact with files hosted on Google Drive via the GakuNin RDM.", + "nextcloudinstitutions": "Nextcloud for Institutions is a file storage add-on for Institutions. Connect your Nextcloud account to a GakuNin RDM project to interact with files hosted on Nextcloud via the GakuNin RDM.", + "dropboxbusiness": "Dropbox Business for Institutions is a file storage add-on for Institutions. Connect your Dropbox Business administrator account to a GakuNin RDM project to interact with files hosted on Dropbox via the GakuNin RDM.", + "myscreen": "My Screen Addon is ..." + }, + "addons_url": { + "box": "http://www.box.com", + "dataverse": "https://dataverse.harvard.edu/", + "dropbox": "http://www.dropbox.com", + "figshare": "http://www.figshare.com", + "github": "http://www.github.com", + "gitlab": "https://www.gitlab.com", + "mendeley": "http://www.mendeley.com", + "owncloud": "https://owncloud.org/", + "zotero": "http://www.zotero.org", + "s3": "https://aws.amazon.com/s3/", + "googledrive": "https://drive.google.com", + "bitbucket": "https://bitbucket.org/", + "onedrive": "https://onedrive.live.com", + "swift": "https://wiki.openstack.org/wiki/Swift", + "azureblobstorage": "https://azure.microsoft.com/", + "weko": "https://weko.at.nii.ac.jp/", + "jupyterhub": "https://jupyterhub.readthedocs.io/", + "s3compat": "https://aws.amazon.com/s3/", + "nextcloud": "https://nextcloud.com/", + "iqbrims": "https://drive.google.com", + "dropboxbusiness": "http://www.dropbox.com", + "myscreen": "https://dummy.nii.ac.jp/myscreen" + } +} diff --git a/site/guides/screen-expansion/osf.io/config/api/base/settings/defaults.py b/site/guides/screen-expansion/osf.io/config/api/base/settings/defaults.py new file mode 100644 index 0000000..f13fa6d --- /dev/null +++ b/site/guides/screen-expansion/osf.io/config/api/base/settings/defaults.py @@ -0,0 +1,493 @@ +""" +Django settings for api project. + +Generated by 'django-admin startproject' using Django 1.8. + +For more information on this file, see +https://docs.djangoproject.com/en/1.8/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.8/ref/settings/ +""" + +import os +from future.moves.urllib.parse import urlparse +from website import settings as osf_settings + +BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/ + +DATABASES = { + 'default': { + 'CONN_MAX_AGE': 0, + 'ENGINE': 'osf.db.backends.postgresql', # django.db.backends.postgresql + 'NAME': os.environ.get('OSF_DB_NAME', 'osf'), + 'USER': os.environ.get('OSF_DB_USER', 'postgres'), + 'PASSWORD': os.environ.get('OSF_DB_PASSWORD', ''), + 'HOST': os.environ.get('OSF_DB_HOST', '127.0.0.1'), + 'PORT': os.environ.get('OSF_DB_PORT', '5432'), + 'ATOMIC_REQUESTS': True, + 'TEST': { + 'SERIALIZE': False, + }, + }, +} + +DATABASE_ROUTERS = ['osf.db.router.PostgreSQLFailoverRouter', ] +PASSWORD_HASHERS = [ + 'django.contrib.auth.hashers.BCryptSHA256PasswordHasher', + 'django.contrib.auth.hashers.BCryptPasswordHasher', +] + +AUTH_USER_MODEL = 'osf.OSFUser' + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = osf_settings.SECRET_KEY + +AUTHENTICATION_BACKENDS = ( + 'api.base.authentication.backends.ODMBackend', + 'guardian.backends.ObjectPermissionBackend', +) + +# SECURITY WARNING: don't run with debug turned on in production! +DEV_MODE = osf_settings.DEV_MODE +DEBUG = osf_settings.DEBUG_MODE +DEBUG_PROPAGATE_EXCEPTIONS = True + +# session: +SESSION_COOKIE_NAME = 'api' +SESSION_COOKIE_SECURE = osf_settings.SECURE_MODE +SESSION_COOKIE_HTTPONLY = osf_settings.SESSION_COOKIE_HTTPONLY +SESSION_COOKIE_SAMESITE = osf_settings.SESSION_COOKIE_SAMESITE + +# csrf: +CSRF_COOKIE_NAME = 'api-csrf' +CSRF_COOKIE_SECURE = osf_settings.SECURE_MODE +CSRF_COOKIE_HTTPONLY = osf_settings.SECURE_MODE + +ALLOWED_HOSTS = [ + '.osf.io', +] + + +# Application definition + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.messages', + 'django.contrib.sessions', + 'django.contrib.staticfiles', + 'django.contrib.admin', + + # 3rd party + 'django_celery_beat', + 'django_celery_results', + 'rest_framework', + 'corsheaders', + 'raven.contrib.django.raven_compat', + 'django_extensions', + 'guardian', + 'storages', + 'waffle', + 'elasticsearch_metrics', + + # OSF + 'osf', + + # Addons + 'addons.osfstorage', + 'addons.bitbucket', + 'addons.box', + 'addons.dataverse', + 'addons.dropbox', + 'addons.figshare', + 'addons.forward', + 'addons.github', + 'addons.gitlab', + 'addons.googledrive', + 'addons.mendeley', + 'addons.onedrive', + 'addons.owncloud', + 'addons.s3', + 'addons.twofactor', + 'addons.wiki', + 'addons.zotero', + 'addons.swift', + 'addons.azureblobstorage', + 'addons.weko', + 'addons.jupyterhub', + 'addons.iqbrims', + 'addons.dropboxbusiness', + 'addons.nextcloudinstitutions', + 'addons.myscreen' +) + +# local development using https +if osf_settings.SECURE_MODE and DEBUG: + INSTALLED_APPS += ('sslserver',) + +# TODO: Are there more granular ways to configure reporting specifically related to the API? +RAVEN_CONFIG = { + 'tags': {'App': 'api'}, + 'dsn': osf_settings.SENTRY_DSN, + 'release': osf_settings.VERSION, +} + +BULK_SETTINGS = { + 'DEFAULT_BULK_LIMIT': 100, +} + +MAX_PAGE_SIZE = 100 + +REST_FRAMEWORK = { + 'PAGE_SIZE': 10, + 'DEFAULT_RENDERER_CLASSES': ( + 'api.base.renderers.JSONAPIRenderer', + 'api.base.renderers.JSONRendererWithESISupport', + 'api.base.renderers.BrowsableAPIRendererNoForms', + ), + 'DEFAULT_PARSER_CLASSES': ( + 'api.base.parsers.JSONAPIParser', + 'api.base.parsers.JSONAPIParserForRegularJSON', + 'rest_framework.parsers.FormParser', + 'rest_framework.parsers.MultiPartParser', + ), + 'EXCEPTION_HANDLER': 'api.base.exceptions.json_api_exception_handler', + 'DEFAULT_CONTENT_NEGOTIATION_CLASS': 'api.base.content_negotiation.JSONAPIContentNegotiation', + 'DEFAULT_VERSIONING_CLASS': 'api.base.versioning.BaseVersioning', + 'DEFAULT_VERSION': '2.0', + 'ALLOWED_VERSIONS': ( + '2.0', + '2.1', + '2.2', + '2.3', + '2.4', + '2.5', + '2.6', + '2.7', + '2.8', + '2.9', + '2.10', + '2.11', + '2.12', + '2.13', + '2.14', + '2.15', + '2.16', + '2.17', + '2.18', + '2.19', + '2.20', + ), + 'DEFAULT_FILTER_BACKENDS': ('api.base.filters.OSFOrderingFilter',), + 'DEFAULT_PAGINATION_CLASS': 'api.base.pagination.JSONAPIPagination', + 'ORDERING_PARAM': 'sort', + 'DEFAULT_AUTHENTICATION_CLASSES': ( + # Custom auth classes + 'api.base.authentication.drf.OSFBasicAuthentication', + 'api.base.authentication.drf.OSFSessionAuthentication', + 'api.base.authentication.drf.OSFCASAuthentication', + ), + 'DEFAULT_THROTTLE_CLASSES': ( + 'rest_framework.throttling.UserRateThrottle', + 'api.base.throttling.NonCookieAuthThrottle', + 'api.base.throttling.BurstRateThrottle', + ), + 'DEFAULT_THROTTLE_RATES': { + 'user': '10000/day', + 'non-cookie-auth': '100/hour', + 'add-contributor': '10/second', + 'create-guid': '1000/hour', + 'root-anon-throttle': '1000/hour', + 'test-user': '2/hour', + 'test-anon': '1/hour', + 'send-email': '2/minute', + 'burst': '10/second', + }, +} + +# Settings related to CORS Headers addon: allow API to receive authenticated requests from OSF +# CORS plugin only matches based on "netloc" part of URL, so as workaround we add that to the list +CORS_ORIGIN_ALLOW_ALL = False +CORS_ORIGIN_WHITELIST = ( + urlparse(osf_settings.DOMAIN).netloc, + osf_settings.DOMAIN, +) +# This needs to remain True to allow cross origin requests that are in CORS_ORIGIN_WHITELIST to +# use cookies. +CORS_ALLOW_CREDENTIALS = True +# Set dynamically on app init +ORIGINS_WHITELIST = () + +MIDDLEWARE = ( + 'api.base.middleware.DjangoGlobalMiddleware', + 'api.base.middleware.CeleryTaskMiddleware', + 'api.base.middleware.PostcommitTaskMiddleware', + # A profiling middleware. ONLY FOR DEV USE + # Uncomment and add "prof" to url params to recieve a profile for that url + # 'api.base.middleware.ProfileMiddleware', + + # 'django.contrib.sessions.middleware.SessionMiddleware', + 'api.base.middleware.CorsMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + # 'django.contrib.auth.middleware.AuthenticationMiddleware', + # 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', + # 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'django.middleware.security.SecurityMiddleware', + # 'waffle.middleware.WaffleMiddleware', + 'api.base.middleware.SloanOverrideWaffleMiddleware', # Delete this and uncomment WaffleMiddleware to revert Sloan +) + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [os.path.join(BASE_DIR, 'templates')], + 'APP_DIRS': True, + }, +] + + +ROOT_URLCONF = 'api.base.urls' +WSGI_APPLICATION = 'api.base.wsgi.application' + + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + +# https://django-storages.readthedocs.io/en/latest/backends/gcloud.html +if os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', False): + # Required to interact with Google Cloud Storage + DEFAULT_FILE_STORAGE = 'api.base.storage.RequestlessURLGoogleCloudStorage' + GS_BUCKET_NAME = os.environ.get('GS_BUCKET_NAME', 'cos-osf-stage-cdn-us') + GS_FILE_OVERWRITE = os.environ.get('GS_FILE_OVERWRITE', False) +elif osf_settings.DEV_MODE or osf_settings.DEBUG_MODE: + DEFAULT_FILE_STORAGE = 'api.base.storage.DevFileSystemStorage' + +# https://docs.djangoproject.com/en/1.8/howto/static-files/ + +STATIC_ROOT = os.path.join(BASE_DIR, 'static/vendor') + +API_BASE = 'v2/' +API_PRIVATE_BASE = '_/' +STATIC_URL = '/static/' + +NODE_CATEGORY_MAP = osf_settings.NODE_CATEGORY_MAP + +DEBUG_TRANSACTIONS = DEBUG + +JWT_SECRET = b'osf_api_cas_login_jwt_secret_32b' +JWE_SECRET = b'osf_api_cas_login_jwe_secret_32b' + +ENABLE_VARNISH = osf_settings.ENABLE_VARNISH +ENABLE_ESI = osf_settings.ENABLE_ESI +VARNISH_SERVERS = osf_settings.VARNISH_SERVERS +ESI_MEDIA_TYPES = osf_settings.ESI_MEDIA_TYPES + +ADDONS_FOLDER_CONFIGURABLE = ['box', 'dropbox', 's3', 'googledrive', 'figshare', 'owncloud', 'onedrive', 'swift', 'azureblobstorage', 'weko', 'iqbrims'] +ADDONS_OAUTH = ADDONS_FOLDER_CONFIGURABLE + ['dataverse', 'github', 'bitbucket', 'gitlab', 'mendeley', 'zotero', 'forward'] + +BYPASS_THROTTLE_TOKEN = 'test-token' + +OSF_SHELL_USER_IMPORTS = None + +# Settings for use in the admin +OSF_URL = 'https://osf.io' + +SELECT_FOR_UPDATE_ENABLED = True + +# Disable anonymous user permissions in django-guardian +ANONYMOUS_USER_NAME = None + +# If set to True, automated tests with extra queries will fail. +NPLUSONE_RAISE = False + +# Timestamp - number of requests to send to cloud storages per minute +TS_REQUESTS_PER_MIN = 30 + +# salt used for generating hashids +HASHIDS_SALT = 'pinkhimalayan' + +# django-elasticsearch-metrics +ELASTICSEARCH_DSL = { + 'default': { + 'hosts': os.environ.get('ELASTIC6_URI', '127.0.0.1:9201'), + 'retry_on_timeout': True, + }, +} +# Store yearly indices for time-series metrics +ELASTICSEARCH_METRICS_DATE_FORMAT = '%Y' + +WAFFLE_CACHE_NAME = 'waffle_cache' +STORAGE_USAGE_CACHE_NAME = 'storage_usage' + + +CACHES = { + 'default': { + 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', + }, + STORAGE_USAGE_CACHE_NAME: { + 'BACKEND': 'django.core.cache.backends.db.DatabaseCache', + 'LOCATION': 'osf_cache_table', + }, + WAFFLE_CACHE_NAME: { + 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', + }, +} + +SLOAN_ID_COOKIE_NAME = 'sloan_id' + +EGAP_PROVIDER_NAME = 'EGAP' + +MAX_SIZE_OF_ES_QUERY = 10000 +DEFAULT_ES_NULL_VALUE = 'N/A' + +TRAVIS_ENV = False + +### NII extensions +LOGIN_BY_EPPN = osf_settings.to_bool('LOGIN_BY_EPPN', False) +USER_TIMEZONE = osf_settings.USER_TIMEZONE +USER_LOCALE = osf_settings.USER_LOCALE +CLOUD_GATEWAY_ISMEMBEROF_PREFIX = osf_settings.CLOUD_GATEWAY_ISMEMBEROF_PREFIX +# install-addons.py +INSTALLED_APPS += ('addons.s3compat',) +ADDONS_FOLDER_CONFIGURABLE.append('s3compat') +ADDONS_OAUTH.append('s3compat') +INSTALLED_APPS += ('addons.nextcloud',) +ADDONS_FOLDER_CONFIGURABLE.append('nextcloud') +ADDONS_OAUTH.append('nextcloud') + +TST_COMMAND_DELIMITER = ' ' +# RSA key generation settings +SSL_GENERATE_KEY = 'openssl' + TST_COMMAND_DELIMITER + \ + 'genrsa' + TST_COMMAND_DELIMITER + \ + '-des3' + TST_COMMAND_DELIMITER + \ + '-out' + TST_COMMAND_DELIMITER + \ + '{0}.key {1}' +SSL_GENERATE_KEY_NOPASS = 'openssl' + TST_COMMAND_DELIMITER + \ + 'rsa' + TST_COMMAND_DELIMITER + \ + '-in' + TST_COMMAND_DELIMITER + \ + '{0}.key' + TST_COMMAND_DELIMITER + \ + '-out' + TST_COMMAND_DELIMITER + \ + '{0}.key.nopass' +SSL_GENERATE_CSR = 'openssl' + TST_COMMAND_DELIMITER + \ + 'req' + TST_COMMAND_DELIMITER + \ + '-new' + TST_COMMAND_DELIMITER + \ + '-key' + TST_COMMAND_DELIMITER + \ + '{0}.key.nopass' + TST_COMMAND_DELIMITER + \ + '-out' + TST_COMMAND_DELIMITER + \ + '{0}.csr' +SSL_GENERATE_SELF_SIGNED = 'openssl' + TST_COMMAND_DELIMITER + \ + 'req' + TST_COMMAND_DELIMITER + \ + '-x509' + TST_COMMAND_DELIMITER + \ + '-nodes' + TST_COMMAND_DELIMITER + \ + '-days' + TST_COMMAND_DELIMITER + \ + '365' + TST_COMMAND_DELIMITER + \ + '-newkey' + TST_COMMAND_DELIMITER + \ + 'rsa:2048' + TST_COMMAND_DELIMITER + \ + '-keyout' + TST_COMMAND_DELIMITER + \ + '{0}.key' + TST_COMMAND_DELIMITER + \ + '-out' + TST_COMMAND_DELIMITER + \ + '{0}.crt' +SSL_PRIVATE_KEY_GENERATION = 'openssl' + TST_COMMAND_DELIMITER + \ + 'genrsa' + TST_COMMAND_DELIMITER + \ + '-out' + TST_COMMAND_DELIMITER + \ + '{0}' + TST_COMMAND_DELIMITER + \ + '{1}' +SSL_PUBLIC_KEY_GENERATION = 'openssl' + TST_COMMAND_DELIMITER + \ + 'rsa' + TST_COMMAND_DELIMITER + \ + '-in' + TST_COMMAND_DELIMITER + \ + '{0}' + TST_COMMAND_DELIMITER + \ + '-pubout' + TST_COMMAND_DELIMITER + \ + '-out' + TST_COMMAND_DELIMITER + \ + '{1}' + +# UserKey Placement destination +KEY_NAME_PRIVATE = 'pvt' +KEY_NAME_PUBLIC = 'pub' +KEY_BIT_VALUE = '3072' +KEY_EXTENSION = '.pem' +KEY_SAVE_PATH = '/user_key_info/' +KEY_NAME_FORMAT = '{0}_{1}_{2}{3}' +PRIVATE_KEY_VALUE = 1 +PUBLIC_KEY_VALUE = 2 +# FreeTSA openation commands +SSL_CREATE_TIMESTAMP_REQUEST = 'openssl' + TST_COMMAND_DELIMITER + \ + 'ts' + TST_COMMAND_DELIMITER + \ + '-query' + TST_COMMAND_DELIMITER + \ + '-data' + TST_COMMAND_DELIMITER + \ + '{0}' + TST_COMMAND_DELIMITER + \ + '-cert' + TST_COMMAND_DELIMITER + \ + '-sha512' +SSL_GET_TIMESTAMP_RESPONSE = 'openssl' + TST_COMMAND_DELIMITER + \ + 'ts' + TST_COMMAND_DELIMITER + \ + '-verify' + TST_COMMAND_DELIMITER + \ + '-data' + TST_COMMAND_DELIMITER + \ + '{0}' + TST_COMMAND_DELIMITER + \ + '-in' + TST_COMMAND_DELIMITER + \ + '{1}' + TST_COMMAND_DELIMITER + \ + '-CAfile' + TST_COMMAND_DELIMITER + \ + '{2}' + +SSL_CREATE_TIMESTAMP_HASH_REQUEST = 'openssl ts -query -digest {digest} {digest_type} -cert' +SSL_GET_TIMESTAMP_HASH_RESPONSE = 'openssl ts -verify {digest_type} -digest {digest} -in {input} -CAfile {ca}' + +# openssl ts verify check value +OPENSSL_VERIFY_RESULT_OK = 'OK' +# timestamp verify rootKey +VERIFY_ROOT_CERTIFICATE = 'root_cert_verifycate.pem' +# timestamp request const +REQUEST_HEADER = {'Content-Type': 'application/timestamp-query'} +TIME_STAMP_AUTHORITY_URL = 'http://eswg.jnsa.org/freetsa' +ERROR_HTTP_STATUS = [400, 401, 402, 403, 500, 502, 503, 504] +REQUEST_TIME_OUT = 5 +RETRY_COUNT = 3 + +# UPKI flag +USE_UPKI = False + +#uPKI operation commands +UPKI_TIMESTAMP_URL = '' +UPKI_CREATE_TIMESTAMP = '' # {0}=target, {1}=out +UPKI_VERIFY_TIMESTAMP = '' # {0}=target, {1}=in +UPKI_CREATE_TIMESTAMP_HASH = '' # {digest_type}, {digest}, {output} +UPKI_VERIFY_TIMESTAMP_HASH = '' # {digest}, {input} +UPKI_VERIFY_INVALID_MSG = 'LPC_ERR_VERIFY_INVALID' + +# TimeStamp Inspection Status +TIME_STAMP_TOKEN_UNCHECKED = 0 +TIME_STAMP_TOKEN_CHECK_SUCCESS = 1 +TIME_STAMP_TOKEN_CHECK_SUCCESS_MSG = 'OK' +TIME_STAMP_TOKEN_CHECK_NG = 2 +TIME_STAMP_TOKEN_CHECK_NG_MSG = 'Fail: file modified.' +TIME_STAMP_TOKEN_CHECK_FILE_NOT_FOUND = 3 +TIME_STAMP_TOKEN_CHECK_FILE_NOT_FOUND_MSG = 'Fail: not inspected.' +TIME_STAMP_TOKEN_NO_DATA = 4 +TIME_STAMP_TOKEN_NO_DATA_MSG = 'Error: some errors has occurred in processing.' +FILE_NOT_EXISTS = 5 +FILE_NOT_EXISTS_MSG = 'Fail: deleted file.' +FILE_NOT_FOUND = 6 +FILE_NOT_FOUND_MSG = 'Fail: file was gone.' +TIME_STAMP_VERIFICATION_ERR = 7 +TIME_STAMP_VERIFICATION_ERR_MSG = 'Error: some errors has occurred in verification.' +TIME_STAMP_STORAGE_DISCONNECTED = 8 +TIME_STAMP_STORAGE_DISCONNECTED_MSG = 'Error: storage disconnected.' +TIME_STAMP_STORAGE_NOT_ACCESSIBLE = 9 +TIME_STAMP_STORAGE_NOT_ACCESSIBLE_MSG = 'Error: storage service connection error occurred.' + +# Quota settings +DEFAULT_MAX_QUOTA = 100 +WARNING_THRESHOLD = 0.9 +BASE_FOR_METRIC_PREFIX = 1000 +SIZE_UNIT_GB = BASE_FOR_METRIC_PREFIX ** 3 +NII_STORAGE_REGION_ID = 1 diff --git a/site/guides/screen-expansion/osf.io/config/framework/addons/data/addons.json b/site/guides/screen-expansion/osf.io/config/framework/addons/data/addons.json new file mode 100644 index 0000000..1050dcd --- /dev/null +++ b/site/guides/screen-expansion/osf.io/config/framework/addons/data/addons.json @@ -0,0 +1,628 @@ +{ + "addons": { + "GitHub": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making a GitHub repo public or private. The GakuNin RDM does not alter the permissions of linked GitHub repos." + }, + "View / download file versions": { + "status": "full", + "text": "GitHub files and their versions can be viewed/downloaded via GakuNin RDM." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in GitHub." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in GitHub." + }, + "Logs": { + "status": "full", + "text": "GitHub dynamically updates GakuNin RDM logs when files are modified outside the GakuNin RDM. Changes to GitHub repos made before the repo is linked to the GakuNin RDM will not be reflected in GakuNin RDM logs." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Github authorization unless the user forking the project is the same user who authorized the Github add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "GitHub content will be registered, but version history will not be copied to the registration." + } + }, + "GitLab": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making a GitLab repo public or private. The GakuNin RDM does not alter the permissions of linked GitLab repos." + }, + "View / download file versions": { + "status": "full", + "text": "GitLab files and their versions can be viewed/downloaded via GakuNin RDM." + }, + "Add / update files": { + "status": "none", + "text": "Adding/updating files in the project via GakuNin RDM is not implemented yet." + }, + "Delete files": { + "status": "none", + "text": "Deleting files via GakuNin RDM is not implemented yet." + }, + "Logs": { + "status": "none", + "text": "GakuNin RDM does not keep track of changes made using Gitlab directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy GitLab authorization unless the user forking the project is the same user who authorized the GitLab add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "GitLab content will be registered, but version history will not be copied to the registration." + } + }, + "Amazon S3": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making an S3 bucket public or private. The GakuNin RDM does not alter the permissions of linked S3 buckets." + }, + "View / download file versions": { + "status": "partial", + "text": "The S3 add-on supports file versions if versioning is enabled for your S3 buckets." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Amazon S3." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Amazon S3." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your S3 buckets through the GakuNin RDM, but not for changes made using S3 directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy S3 authorization unless the user forking the project is the same user who authorized the S3 add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "S3 content will be registered, but version history will not be copied to the registration." + } + }, + "figshare": { + "Permissions": { + "status": "partial", + "text": " Making a GakuNin RDM project public or private is independent of making figshare content public or private. The GakuNin RDM does not alter the permissions of linked figshare content." + }, + "View / download file versions": { + "status": "partial", + "text": "figshare files can be viewed/downloaded via GakuNin RDM, but version history is not supported." + }, + "Add / update files": { + "status": "partial", + "text": "Files can be added but not updated." + }, + "Delete files": { + "status": "partial", + "text": "Private files and filesets can be deleted via GakuNin RDM." + }, + "Logs": { + "status": "partial", + "text": "GakuNin RDM keeps track of changes you make to your figshare content through GakuNin RDM, but not for changes made using figshare directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy figshare authorization unless the user forking the project is the same user who authorized the figshare add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "figshare content will be registered, but version history will not be copied to the registration." + } + }, + "Dropbox": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of Dropbox privacy. The GakuNin RDM does not alter the permissions of linked Dropbox folders." + }, + "View / download file versions": { + "status": "full", + "text": "Dropbox files and their versions can be viewed/downloaded via GakuNin RDM." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Dropbox." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Dropbox." + }, + "Logs": { + "status": "partial", + "text": "GakuNin RDM keeps track of changes you make to your Dropbox content through GakuNin RDM, but not for changes made using Dropbox directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Dropbox authorization unless the user forking the project is the same user who authorized the Dropbox add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "Dropbox content will be registered, but version history will not be copied to the registration." + } + }, + "OneDrive": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of OneDrive privacy. The GakuNin RDM does not alter the permissions of linked OneDrive folders." + }, + "View / download file versions": { + "status": "full", + "text": "OneDrive files and their versions can be viewed/downloaded via GakuNin RDM. OneNote files are unexportable and cannot be downloaded or viewed." + }, + "Add / update files": { + "status": "none", + "text": "The OneDrive add-on is read-only." + }, + "Delete files": { + "status": "none", + "text": "The OneDrive add-on is read-only." + }, + "Logs": { + "status": "partial", + "text": "GakuNin RDM keeps track of changes you make to your OneDrive add-on configuration. It does not track changes to OneDrive content." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy OneDrive authorization unless the user forking the project is the same user who authorized the OneDrive add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "OneDrive content will be registered, but version history will not be copied to the registration. OneNote files are unexportable and will not be archived." + } + }, + "Dataverse": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making a Dataverse study public or private. The GakuNin RDM allows you to release the latest draft version of a Dataverse dataset." + }, + "View / download file versions": { + "status": "partial", + "text": "Files from the latest release of the selected Dataverse study can be viewed/downloaded. GakuNin RDM users with write permissions can view/download draft files as well." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Dataverse." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Dataverse." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your Dataverse studies through the GakuNin RDM, but not for changes made using Dataverse directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Dataverse authorization unless the user forking the project is the same user who authorized the Dataverse add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "Dataverse content will be registered, but version history will not be copied to the registration." + } + }, + "Google Drive": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of Google Drive privacy. The GakuNin RDM does not alter the permissions of linked Google Drive folders." + }, + "View / download file versions": { + "status": "full", + "text": "Google Drive files and their versions can be viewed/downloaded via GakuNin RDM." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Google Drive." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Google Drive." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your Google Drive content through the GakuNin RDM, but not for changes made using Google Drive directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Google Drive authorization unless the user forking the project is the same user who authorized the Google Drive add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "Google Drive content will be registered, but version history will not be copied to the registration." + } + }, + "Box": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of Box privacy. The GakuNin RDM does not alter the permissions of linked Box folders." + }, + "View / download file versions": { + "status": "full", + "text": "Box files and their versions can be viewed/downloaded via GakuNin RDM." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Box." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Box." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your Box content through the GakuNin RDM, but not for changes made using Box directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Box authorization unless the user forking the project is the same user who authorized the Box add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "Box content will be registered, but version history will not be copied to the registration." + } + }, + "Mendeley": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making a Mendeley folder public or private. The GakuNin RDM does not alter the permissions of a linked Mendeley folder." + }, + "View / download file versions": { + "status": "NA" + }, + "Add / update files": { + "status": "NA" + }, + "Delete files": { + "status": "NA" + }, + "Logs": { + "status": "NA" + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Mendeley authorization unless the user forking the project is the same user who authorized the Mendeley add-on in the source project being forked." + }, + "Registering": { + "status": "none", + "text": "Mendeley content will not be registered." + } + }, + "ownCloud": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of ownCloud privacy. The GakuNin RDM does not alter the permissions of linked ownCloud folders." + }, + "View / download file versions": { + "status": "partial", + "text": "ownCloud files can be viewed/downloaded via GakuNin RDM, but version history is not supported by the ownCloud WebDAV API." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in ownCloud." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in ownCloud." + }, + "Logs": { + "status": "partial", + "text": "GakuNin RDM keeps track of changes you make to your ownCloud content through GakuNin RDM, but not for changes made using ownCloud directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy ownCloud authorization unless the user forking the project is the same user who authorized the ownCloud add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "ownCloud content will be registered, but version history will not be copied to the registration." + } + }, + "Zotero": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making a Zotero folder public or private. The GakuNin RDM does not alter the permissions of a linked Zotero folder." + }, + "View / download file versions": { + "status": "NA" + }, + "Add / update files": { + "status": "NA" + }, + "Delete files": { + "status": "NA" + }, + "Logs": { + "status": "NA" + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Zotero authorization unless the user forking the project is the same user who authorized the Zotero add-on in the source project being forked." + }, + "Registering": { + "status": "none", + "text": "Zotero content will not be registered." + } + }, + "Bitbucket": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making a Bitbucket repo public or private. The GakuNin RDM does not alter the permissions of linked Bitbucket repos." + }, + "View / download file versions": { + "status": "full", + "text": "Bitbucket files and their versions can be viewed/downloaded via GakuNin RDM." + }, + "Add / update files": { + "status": "none", + "text": "Bitbucket does not support adding or updating files via their API." + }, + "Delete files": { + "status": "none", + "text": "Bitbucket does not support deleting files via their API." + }, + "Logs": { + "status": "full", + "text": "GakuNin RDM keeps track of changes you make to your Bitbucket content through GakuNin RDM, but not for changes made using Bitbucket directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Bitbucket authorization unless the user forking the project is the same user who authorized the Bitbucket add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "Bitbucket content will be registered, but version history will not be copied to the registration." + } + }, + "OpenStack Swift": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making an Swift container public or private." + }, + "View / download file versions": { + "status": "partial", + "text": "The Swift add-on does not support file versions." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Swift." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Swift." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your Swift containers through the GakuNin RDM, but not for changes made using Swift directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Swift authorization unless the user forking the project is the same user who authorized the Swift add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "Swift object will be registered, but version history will not be copied to the registration." + } + }, + "Azure Blob Storage": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making an Azure Blob Storage container public or private." + }, + "View / download file versions": { + "status": "partial", + "text": "The Azure Blob Storage add-on supports only Block Blobs, and does not support file versions." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Azure Blob Storage." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Azure Blob Storage." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your Azure Blob Storage containers through the GakuNin RDM, but not for changes made using Azure Blob Storage directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Azure Blob Storage authorization unless the user forking the project is the same user who authorized the Azure Blob Storage add-on in the source project being forked." + }, + "Registering": { + "status": "none", + "text": "Azure Blob Storage content will not be registered." + } + }, + "WEKO": { + "Permissions": { + "status": "NA" + }, + "View / download file versions": { + "status": "NA" + }, + "Add / update files": { + "status": "partial", + "text": "Adding/updating indices/items in the project via GakuNin RDM will be reflected in WEKO." + }, + "Delete files": { + "status": "partial", + "text": "Items deleted via GakuNin RDM will be deleted in WEKO." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your WEKO index through the GakuNin RDM, but not for changes made using WEKO directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy WEKO authorization unless the user forking the project is the same user who authorized the WEKO add-on in the source project being forked." + }, + "Registering": { + "status": "none", + "text": "WEKO content will not be registered." + } + }, + "S3 Compatible Storage": { + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy S3 Compatible Storage authorization unless the user forking the project is the same user who authorized the S3 Compatible Storage add-on in the source project being forked." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your S3 Compatible Storage buckets through the GakuNin RDM, but not for changes made using S3 Compatible Storage directly." + }, + "Registering": { + "status": "partial", + "text": "S3 Compatible Storage content will be registered, but version history will not be copied to the registration." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in S3 Compatible Storage." + }, + "View / download file versions": { + "status": "partial", + "text": "The S3 add-on supports file versions if versioning is enabled for your S3 Compatible Storage buckets." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in S3 Compatible Storage." + }, + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making an S3 Compatible Storage bucket public or private. The GakuNin RDM does not alter the permissions of linked S3 Compatible Storage buckets." + } + }, + "JupyterHub": { + "Permissions": { + "status": "none", + "text": "The GakuNin RDM does not affect the permissions of JupyterHub." + }, + "View / download file versions": { + "status": "none", + "text": "The JupyterHub add-on does not provide Storage Features." + }, + "Add / update files": { + "status": "none", + "text": "The JupyterHub add-on does not provide Storage Features." + }, + "Delete files": { + "status": "none", + "text": "The JupyterHub add-on does not provide Storage Features." + }, + "Logs": { + "status": "none", + "text": "The JupyterHub add-on does not provide Storage Features." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component copies information about linked JupyterHub but the GakuNin RDM does not affect authentication of JupyterHub." + }, + "Registering": { + "status": "none", + "text": "JupyterHub information will not be registered." + } + }, + "Nextcloud": { + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Nextcloud authorization unless the user forking the project is the same user who authorized the Nextcloud add-on in the source project being forked." + }, + "Logs": { + "status": "partial", + "text": "GakuNin RDM keeps track of changes you make to your Nextcloud content through GakuNin RDM, but not for changes made using Nextcloud directly." + }, + "Registering": { + "status": "partial", + "text": "Nextcloud content will be registered, but version history will not be copied to the registration." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Nextcloud." + }, + "View / download file versions": { + "status": "partial", + "text": "Nextcloud files can be viewed/downloaded via GakuNin RDM, but version history is not supported by the Nextcloud WebDAV API." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Nextcloud." + }, + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of Nextcloud privacy. The GakuNin RDM does not alter the permissions of linked Nextcloud folders." + } + }, + "IQB-RIMS": { + "Permissions": { + "status": "partial", + "text": "Making an GakuNin RDM project public or private is independent of Google Drive privacy. The GakuNin RDM does not alter the permissions of linked Google Drive folders." + }, + "View / download file versions": { + "status": "full", + "text": "IQB-RIMS files and their versions can be viewed/downloaded via GakuNin RDM." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Google Drive." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Google Drive." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your Google Drive content through the GakuNin RDM, but not for changes made using Google Drive directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Google Drive authorization unless the user forking the project is the same user who authorized the IQB-RIMS add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "IQB-RIMS content will be registered, but version history will not be copied to the registration." + } + }, + "My Screen": { + "Permissions": { + "status": "none", + "text": "The GakuNin RDM does not affect the permissions of My Screen." + }, + "View / download file versions": { + "status": "none", + "text": "The My Screen add-on does not provide Storage Features." + }, + "Add / update files": { + "status": "none", + "text": "The My Screen add-on does not provide Storage Features." + }, + "Delete files": { + "status": "none", + "text": "The My Screen add-on does not provide Storage Features." + }, + "Logs": { + "status": "none", + "text": "The My Screen add-on does not provide Storage Features." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component copies information about linked My Screen but the GakuNin RDM does not affect authentication of My Screen." + }, + "Registering": { + "status": "none", + "text": "My Screen information will not be registered." + } + } + }, + "disclaimers": [ + "This add-on connects your GakuNin RDM project to an external service. Use of this service is bound by its terms and conditions. The GakuNin RDM is not responsible for the service or for your use thereof.", + "This add-on allows you to store files using an external service. Files added to this add-on are not stored within the GakuNin RDM." + ] +} diff --git a/site/guides/screen-expansion/osf.io/website/project/views/node.py b/site/guides/screen-expansion/osf.io/website/project/views/node.py new file mode 100644 index 0000000..92f7052 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/website/project/views/node.py @@ -0,0 +1,1512 @@ +# -*- coding: utf-8 -*- +import os +import logging +from rest_framework import status as http_status +import math +from collections import defaultdict + +from flask import request +from django.apps import apps +from django.utils import timezone +from django.core.exceptions import ValidationError, ObjectDoesNotExist +from django.db.models import Q, OuterRef, Subquery + +from framework import status +from framework.utils import iso8601format +from framework.flask import redirect # VOL-aware redirect +from framework.auth.decorators import must_be_logged_in, collect_auth +from website.ember_osf_web.decorators import ember_flag_is_active +from api.waffle.utils import flag_is_active, storage_i18n_flag_active, storage_usage_flag_active +from framework.exceptions import HTTPError, PermissionsError +from osf.models.nodelog import NodeLog +from osf.utils.functional import rapply +from osf.utils.registrations import strip_registered_meta_comments +from osf.utils import sanitize +from osf import features + +from website import language + +from website.util import rubeus +from website.ember_osf_web.views import use_ember_app +from osf.exceptions import NodeStateError +from website.project import new_node, new_private_link +from website.project.decorators import ( + must_be_contributor_or_public_but_not_anonymized, + must_be_contributor_or_public, + must_be_valid_project, + must_have_permission, + must_not_be_registration, + must_not_be_retracted_registration, +) +from osf.utils.tokens import process_token_or_pass +from website.util.rubeus import collect_addon_js +from website.project.model import has_anonymous_link, NodeUpdateError, validate_title +from website.project.forms import NewNodeForm +from website.project.utils import sizeof_fmt +from website.project.metadata.utils import serialize_meta_schemas +from addons.wiki.models import WikiPage +from osf.models import AbstractNode, Collection, Contributor, Guid, PrivateLink, Node, NodeRelation, Preprint +from osf.models.licenses import serialize_node_license_record +from osf.utils.sanitize import strip_html +from osf.utils.permissions import ADMIN, READ, WRITE, CREATOR_PERMISSIONS, ADMIN_NODE +from osf.models import RdmTimestampGrantPattern +from website import settings +from website.views import find_bookmark_collection, validate_page_num +from website.views import serialize_node_summary, get_storage_region_list +from website.profile import utils +from addons.mendeley.provider import MendeleyCitationsProvider +from addons.zotero.provider import ZoteroCitationsProvider +from addons.wiki.utils import serialize_wiki_widget +from addons.wiki.models import WikiVersion +from addons.dataverse.utils import serialize_dataverse_widget +from addons.forward.utils import serialize_forward_widget +from addons.jupyterhub.utils import serialize_jupyterhub_widget +from addons.iqbrims.utils import serialize_iqbrims_widget +from addons.myscreen.utils import serialize_myscreen_widget +from admin.rdm_addons.utils import validate_rdm_addons_allowed +from api.base import settings as api_settings +from website.util import quota +from osf.models.project_storage_type import ProjectStorageType + + +from nii.mapcore_api import MAPCoreException +from nii.mapcore import (mapcore_sync_is_enabled, + mapcore_log_error, + mapcore_sync_rdm_project_or_map_group, + mapcore_sync_map_group) + +r_strip_html = lambda collection: rapply(collection, strip_html) +logger = logging.getLogger(__name__) + +@must_be_valid_project +@must_have_permission(WRITE) +def edit_node(auth, node, **kwargs): + post_data = request.json + edited_field = post_data.get('name') + value = post_data.get('value', '') + + new_val = None + if edited_field == 'title': + try: + node.set_title(value, auth=auth) + except ValidationError as e: + raise HTTPError( + http_status.HTTP_400_BAD_REQUEST, + data=dict(message_long=str(e)) + ) + new_val = node.title + elif edited_field == 'description': + node.set_description(value, auth=auth) + new_val = node.description + elif edited_field == 'category': + node.category = new_val = value + + try: + node.save() + except ValidationError as e: + raise HTTPError( + http_status.HTTP_400_BAD_REQUEST, + data=dict(message_long=str(e)) + ) + if mapcore_sync_is_enabled(): + mapcore_sync_map_group(auth.user, node) + return { + 'status': 'success', + 'newValue': new_val # Used by x-editable widget to reflect changes made by sanitizer + } + + +############################################################################## +# New Project +############################################################################## + + +@must_be_logged_in +def project_new(**kwargs): + return {} + +@must_be_logged_in +def project_new_post(auth, **kwargs): + user = auth.user + data = request.get_json() + title = strip_html(data.get('title')) + title = title.strip() + category = data.get('category', 'project') + template = data.get('template') + description = strip_html(data.get('description')) + campaign = data.get('campaign', None) + new_project = {} + + if template: + original_node = AbstractNode.load(template) + changes = { + 'title': title, + 'category': category, + 'template_node': original_node, + } + + if description: + changes['description'] = description + + project = original_node.use_as_template( + auth=auth, + changes={ + template: changes, + } + ) + + else: + try: + project = new_node(category, title, user, description, campaign=campaign) + except ValidationError as e: + raise HTTPError( + http_status.HTTP_400_BAD_REQUEST, + data=dict(message_long=str(e)) + ) + new_project = _view_project(project, auth) + return { + 'projectUrl': project.url, + 'newNode': new_project['node'] if new_project else None + }, http_status.HTTP_201_CREATED + + +@must_be_logged_in +@must_be_valid_project +def project_new_from_template(auth, node, **kwargs): + new_node = node.use_as_template( + auth=auth, + changes=dict(), + ) + return {'url': new_node.url}, http_status.HTTP_201_CREATED, None + + +############################################################################## +# New Node +############################################################################## + +@must_be_valid_project +@must_have_permission(WRITE) +@must_not_be_registration +def project_new_node(auth, node, **kwargs): + """ + There's an APIv2 endpoint that does this same thing! + If you make changes here, see if they need to be made there. + """ + form = NewNodeForm(request.form) + user = auth.user + if form.validate(): + try: + new_component = new_node( + title=strip_html(form.title.data), + user=user, + category=form.category.data, + parent=node, + ) + except ValidationError as e: + raise HTTPError( + http_status.HTTP_400_BAD_REQUEST, + data=dict(message_long=str(e)) + ) + redirect_url = node.url + message = ( + 'Your component was created successfully. You can keep working on the project page below, ' + 'or go to the new component.' + ).format(component_url=new_component.url) + if form.inherit_contributors.data and node.has_permission(user, WRITE): + for contributor in node.contributors: + # Using permission property off of Contributor model to get contributor permissions - not group member perms + perm = CREATOR_PERMISSIONS if contributor._id == user._id else Contributor.objects.get(user_id=contributor.id, node_id=node.id).permission + if contributor._id == user._id and not contributor.is_registered: + new_component.add_unregistered_contributor( + fullname=contributor.fullname, email=contributor.email, + permissions=perm, auth=auth, existing_user=contributor + ) + else: + new_component.add_contributor(contributor, permissions=perm, auth=auth) + + for group in node.osf_groups: + if group.is_manager(user): + new_component.add_osf_group(group, group.get_permission_to_node(node), auth=auth) + + new_component.save() + redirect_url = new_component.url + 'contributors/' + message = ( + 'Your component was created successfully. You can edit the contributor permissions below, ' + 'work on your component or return to the ' + 'project page.' + ).format(component_url=new_component.url, project_url=node.url) + status.push_status_message(message, kind='info', trust=True) + + return { + 'status': 'success', + }, 201, None, redirect_url + else: + # TODO: This function doesn't seem to exist anymore? + status.push_errors_to_status(form.errors) + raise HTTPError(http_status.HTTP_400_BAD_REQUEST, redirect_url=node.url) + + +@must_be_logged_in +@must_be_valid_project +def project_before_fork(auth, node, **kwargs): + user = auth.user + + prompts = node.callback('before_fork', user=user) + + if node.has_pointers_recursive: + prompts.append( + language.BEFORE_FORK_HAS_POINTERS.format( + category=node.project_or_component + ) + ) + + return {'prompts': prompts} + + +@must_be_logged_in +@must_be_valid_project +def project_before_template(auth, node, **kwargs): + prompts = [] + + for addon in node.get_addons(): + if 'node' in addon.config.configs: + if addon.to_json(auth.user)['addon_full_name']: + prompts.append(addon.to_json(auth.user)['addon_full_name']) + + return {'prompts': prompts, 'isRegistration': node.is_registration} + + +@must_be_valid_project +@must_be_contributor_or_public_but_not_anonymized +@must_not_be_registration +def node_registrations(auth, node, **kwargs): + if request.path.startswith('/project/'): + return redirect('/{}/registrations/'.format(node._id)) + return use_ember_app() + +@must_be_valid_project +@must_be_contributor_or_public_but_not_anonymized +@must_not_be_retracted_registration +def node_forks(auth, node, **kwargs): + if request.path.startswith('/project/'): + return redirect('/' + node._id + '/forks/') + return use_ember_app() + +@must_be_valid_project +@must_not_be_retracted_registration +@must_be_logged_in +@must_have_permission(READ) +@ember_flag_is_active(features.EMBER_PROJECT_SETTINGS) +def node_setting(auth, node, **kwargs): + if node.is_registration and flag_is_active(request, features.EMBER_REGISTRIES_DETAIL_PAGE): + # Registration settings page obviated during redesign + return redirect(node.url) + auth.user.update_affiliated_institutions_by_email_domain() + auth.user.save() + ret = _view_project(node, auth, primary=True) + + ret['include_wiki_settings'] = WikiPage.objects.include_wiki_settings(node) + ret['wiki_enabled'] = 'wiki' in node.get_addon_names() + + ret['comments'] = { + 'level': node.comment_level, + } + + addon_settings = {} + for addon in ['forward']: + addon_config = apps.get_app_config('addons_{}'.format(addon)) + config = addon_config.to_json() + config['template_lookup'] = addon_config.template_lookup + config['addon_icon_url'] = addon_config.icon_url + config['node_settings_template'] = os.path.basename(addon_config.node_settings_template) + addon_settings[addon] = config + + ret['addon_settings'] = addon_settings + + ret['categories'] = settings.NODE_CATEGORY_MAP + ret['categories'].update({ + 'project': 'Project' + }) + + ret['group'] = node.group.name if node.group is not None else None + ret['can_delete'] = True if node.group is None else False + + return ret + +@must_be_valid_project +@must_not_be_registration +@must_be_logged_in +@must_have_permission(WRITE) +def node_addons(auth, node, **kwargs): + + ret = _view_project(node, auth, primary=True) + + addon_settings = serialize_addons(node, auth) + + ret['addon_capabilities'] = settings.ADDON_CAPABILITIES + + # If an addon is default you cannot connect/disconnect so we don't have to load it. + ret['addon_settings'] = [addon for addon in addon_settings] + + # Addons can have multiple categories, but we only want a set of unique ones being used. + ret['addon_categories'] = set([item for addon in addon_settings for item in addon['categories']]) + + # The page only needs to load enabled addons and it refreshes when a new addon is being enabled. + ret['addon_js'] = collect_node_config_js([addon for addon in addon_settings if addon['enabled']]) + + try: + timestamp_pattern = RdmTimestampGrantPattern.objects.get(node_guid=node._id) + ret['timestamp_pattern_division'] = timestamp_pattern.timestamp_pattern_division + except ObjectDoesNotExist: + timestamp_pattern = None + + return ret +def get_timestamp_pattern_division(auth, node, **kwargs): + try: + timestamp_pattern = RdmTimestampGrantPattern.objects.get(node_guid=node._id) + timestamp_pattern_division = timestamp_pattern.timestamp_pattern_division + except ObjectDoesNotExist: + timestamp_pattern_division = None + + return timestamp_pattern_division + +def serialize_addons(node, auth): + + addon_settings = [] + addons_available = [addon for addon in settings.ADDONS_AVAILABLE + if addon not in settings.SYSTEM_ADDED_ADDONS['node'] + and addon.short_name not in ('wiki', 'forward', 'twofactor')] + +### forced Admin Settings + from admin.rdm_addons.utils import update_with_rdm_addon_settings + + owners_addons_available = sorted([ + owners_addon + for owners_addon in settings.ADDONS_AVAILABLE + if 'node' in owners_addon.owners + and owners_addon.short_name not in settings.SYSTEM_ADDED_ADDONS['node'] + and owners_addon.short_name not in ['wiki', 'forward', 'twofactor'] + ], key=lambda owners_addon: owners_addon.full_name.lower()) + rdm_addon_settings = [{'addon_short_name': owners_addon.short_name} for owners_addon in owners_addons_available] + update_with_rdm_addon_settings(rdm_addon_settings, auth.user) + addons_allowed = [ + addon['addon_short_name'] + for addon in rdm_addon_settings + if (addon['is_allowed'] and not addon['is_forced']) + or (addon['is_allowed'] and addon['is_forced'] and addon['has_user_external_accounts']) + ] + + for addon in addons_available: + addon_config = apps.get_app_config('addons_{}'.format(addon.short_name)) + config = addon_config.to_json() + config['template_lookup'] = addon_config.template_lookup + config['addon_icon_url'] = addon_config.icon_url + config['node_settings_template'] = os.path.basename(addon_config.node_settings_template) + config['addon_short_name'] = addon.short_name + config['addon_full_name'] = addon.full_name + config['categories'] = addon.categories + config['enabled'] = node.has_addon(addon.short_name) + config['default'] = addon.short_name in settings.ADDONS_DEFAULT + + if node.has_addon(addon.short_name): + node_json = node.get_addon(addon.short_name).to_json(auth.user) + config.update(node_json) + + if addon.short_name in addons_allowed: + addon_settings.append(config) + + addon_settings = sorted(addon_settings, key=lambda addon: addon['full_name'].lower()) + + return addon_settings + +def collect_node_config_js(addons): + """Collect webpack bundles for each of the addons' node-cfg.js modules. Return + the URLs for each of the JS modules to be included on the node addons config page. + + :param list addons: List of node's addon config records. + """ + js_modules = [] + for addon in addons: + source_path = os.path.join( + settings.ADDON_PATH, + addon['short_name'], + 'static', + 'node-cfg.js', + ) + if os.path.exists(source_path): + asset_path = os.path.join( + '/', + 'static', + 'public', + 'js', + addon['short_name'], + 'node-cfg.js', + ) + js_modules.append(asset_path) + + return js_modules + + +@must_have_permission(WRITE) +@must_not_be_registration +def node_choose_addons(auth, node, **kwargs): + config = request.json + try: + for addon_name, enabled in config.items(): + if enabled: + validate_rdm_addons_allowed(auth, addon_name) + except PermissionsError as e: + raise HTTPError( + http_status.HTTP_403_FORBIDDEN, + data=dict(message_long=str(e)) + ) + + node.config_addons(request.json, auth) + + +@must_be_valid_project +@must_not_be_retracted_registration +@must_have_permission(READ) +@ember_flag_is_active(features.EMBER_PROJECT_CONTRIBUTORS) +def node_contributors(auth, node, **kwargs): + ret = _view_project(node, auth, primary=True) + ret['contributors'] = utils.serialize_contributors(node.contributors, node) + ret['access_requests'] = utils.serialize_access_requests(node) + ret['adminContributors'] = utils.serialize_contributors(node.parent_admin_contributors, node, admin=True) + return ret + + +@must_have_permission(ADMIN) +def configure_comments(node, **kwargs): + comment_level = request.json.get('commentLevel') + if not comment_level: + node.comment_level = None + elif comment_level in ['public', 'private']: + node.comment_level = comment_level + else: + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + node.save() + +@must_have_permission(ADMIN) +@must_not_be_registration +def configure_requests(node, **kwargs): + access_requests_enabled = request.get_json().get('accessRequestsEnabled') + auth = kwargs.get('auth', None) + node.set_access_requests_enabled(access_requests_enabled, auth, save=True) + return {'access_requests_enabled': access_requests_enabled}, 200 + + +############################################################################## +# View Project +############################################################################## + +@process_token_or_pass +@must_be_valid_project(retractions_valid=True) +@must_be_contributor_or_public +@ember_flag_is_active(features.EMBER_PROJECT_DETAIL) +def view_project(auth, node, **kwargs): + primary = '/api/v1' not in request.path + ret = _view_project(node, auth, + primary=primary, + embed_contributors=True, + embed_descendants=True + ) + + ret['addon_capabilities'] = settings.ADDON_CAPABILITIES + # Collect the URIs to the static assets for addons that have widgets + ret['addon_widget_js'] = list(collect_addon_js( + node, + filename='widget-cfg.js', + config_entry='widget' + )) + ret.update(rubeus.collect_addon_assets(node)) + + access_request = node.requests.filter(creator=auth.user).exclude(machine_state='accepted') + ret['user']['access_request_state'] = access_request.get().machine_state if access_request else None + + addons_widget_data = { + 'wiki': None, + 'mendeley': None, + 'zotero': None, + 'forward': None, + 'dataverse': None, + 'jupyterhub': None, + # widget: ここから + 'myscreen': None + # widget: ここまで + } + + if 'wiki' in ret['addons']: + addons_widget_data['wiki'] = serialize_wiki_widget(node) + + if 'dataverse' in ret['addons']: + addons_widget_data['dataverse'] = serialize_dataverse_widget(node) + + if 'forward' in ret['addons']: + addons_widget_data['forward'] = serialize_forward_widget(node) + + if 'zotero' in ret['addons']: + node_addon = node.get_addon('zotero') + zotero_widget_data = ZoteroCitationsProvider().widget(node_addon) + addons_widget_data['zotero'] = zotero_widget_data + + if 'mendeley' in ret['addons']: + node_addon = node.get_addon('mendeley') + mendeley_widget_data = MendeleyCitationsProvider().widget(node_addon) + addons_widget_data['mendeley'] = mendeley_widget_data + + if 'jupyterhub' in ret['addons']: + addons_widget_data['jupyterhub'] = serialize_jupyterhub_widget(node) + + if 'iqbrims' in ret['addons']: + addons_widget_data['iqbrims'] = serialize_iqbrims_widget(node) + + # widget: ここから + if 'myscreen' in ret['addons']: + addons_widget_data['myscreen'] = serialize_myscreen_widget(node) + # widget: ここまで + + ret.update({'addons_widget_data': addons_widget_data}) + try: + projectStorageType = ProjectStorageType.objects.get(node=node) + ret['isCustomStorageLocation'] = projectStorageType.storage_type == ProjectStorageType.CUSTOM_STORAGE + except Exception as err: + logger.critical(err) + ret['isCustomStorageLocation'] = False + + return ret + + +@process_token_or_pass +@must_be_valid_project(retractions_valid=True) +@must_be_contributor_or_public +def token_action(auth, node, **kwargs): + return redirect(node.url) + + +# Reorder components +@must_be_valid_project +@must_not_be_registration +@must_have_permission(WRITE) +def project_reorder_components(node, **kwargs): + """Reorders the components in a project's component list. + + :param-json list new_list: List of strings that include node GUIDs. + """ + ordered_guids = request.get_json().get('new_list', []) + node_relations = ( + node.node_relations + .select_related('child') + .filter(child__is_deleted=False) + ) + deleted_node_relation_ids = list( + node.node_relations.select_related('child') + .filter(child__is_deleted=True) + .values_list('pk', flat=True) + ) + + if len(ordered_guids) > len(node_relations): + raise HTTPError(http_status.HTTP_400_BAD_REQUEST, data=dict(message_long='Too many node IDs')) + + # Ordered NodeRelation pks, sorted according the order of guids passed in the request payload + new_node_relation_ids = [ + each.id for each in sorted(node_relations, + key=lambda nr: ordered_guids.index(nr.child._id)) + ] + + if len(node_relations) == len(ordered_guids): + node.set_noderelation_order(new_node_relation_ids + deleted_node_relation_ids) + node.save() + return {'nodes': ordered_guids} + + logger.error('Got invalid node list in reorder components') + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + +@must_be_valid_project +@must_be_contributor_or_public +@must_not_be_retracted_registration +def project_statistics(auth, node, **kwargs): + if request.path.startswith('/project/'): + return redirect('/' + node._id + '/analytics/') + return use_ember_app() + + +############################################################################### +# Make Private/Public +############################################################################### + +@must_be_valid_project +@must_have_permission(ADMIN) +def project_set_privacy(auth, node, **kwargs): + + permissions = kwargs.get('permissions') + if permissions is None: + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + + try: + node.set_privacy(permissions, auth) + except NodeStateError as e: + raise HTTPError(http_status.HTTP_400_BAD_REQUEST, data=dict( + message_short="Can't change privacy", + message_long=str(e) + )) + + return { + 'status': 'success', + 'permissions': permissions, + } + + +@must_be_valid_project +@must_have_permission(WRITE) +def update_node(auth, node, **kwargs): + # in node.update() method there is a key list node.WRITABLE_WHITELIST only allow user to modify + # category, title, and description which can be edited by write permission contributor + data = r_strip_html(request.get_json()) + try: + updated_field_names = node.update(data, auth=auth) + except NodeUpdateError as e: + raise HTTPError(400, data=dict( + message_short='Failed to update attribute \'{0}\''.format(e.key), + message_long=e.reason + )) + # Need to cast tags to a string to make them JSON-serialiable + updated_fields_dict = { + key: getattr(node, key) if key != 'tags' else [str(tag) for tag in node.tags] + for key in updated_field_names + if key != 'logs' and key != 'modified' and key != 'last_logged' + } + return {'updated_fields': updated_fields_dict} + +@must_be_valid_project +@must_have_permission(ADMIN) +@must_not_be_registration +def component_remove(auth, node, **kwargs): + """Remove component, and recursively remove its children. If node has a + parent, add log and redirect to parent; else redirect to user dashboard. + + """ + try: + node.remove_node(auth) + except NodeStateError as e: + raise HTTPError( + http_status.HTTP_400_BAD_REQUEST, + data={ + 'message_short': 'Error', + 'message_long': 'Could not delete component: ' + str(e) + }, + ) + + message = '{} has been successfully deleted.'.format( + node.project_or_component.capitalize() + ) + id = '{}_deleted'.format(node.project_or_component) + status.push_status_message(message, kind='success', trust=False, id=id) + parent = node.parent_node + if parent and parent.can_view(auth): + redirect_url = node.parent_node.url + else: + redirect_url = '/dashboard/' + + return { + 'url': redirect_url, + } + + +@must_be_valid_project +@must_have_permission(ADMIN) +def remove_private_link(*args, **kwargs): + link_id = request.json['private_link_id'] + + try: + link = PrivateLink.objects.get(_id=link_id) + except PrivateLink.DoesNotExist: + raise HTTPError(http_status.HTTP_404_NOT_FOUND) + + link.is_deleted = True + link.deleted = timezone.now() + link.save() + + for node in link.nodes.all(): + log_dict = { + 'project': node.parent_id, + 'node': node._id, + 'user': kwargs.get('auth').user._id, + 'anonymous_link': link.anonymous, + } + + node.add_log( + NodeLog.VIEW_ONLY_LINK_REMOVED, + log_dict, + auth=kwargs.get('auth', None) + ) + +# TODO: Split into separate functions +def _render_addons(addons): + + widgets = {} + configs = {} + js = [] + css = [] + + for addon in addons: + configs[addon.config.short_name] = addon.config.to_json() + js.extend(addon.config.include_js.get('widget', [])) + css.extend(addon.config.include_css.get('widget', [])) + + js.extend(addon.config.include_js.get('files', [])) + css.extend(addon.config.include_css.get('files', [])) + + return widgets, configs, js, css + + +def _should_show_wiki_widget(node, user): + has_wiki = bool(node.get_addon('wiki')) + wiki_page = WikiVersion.objects.get_for_node(node, 'home') + + if node.has_permission(user, WRITE) and not node.is_registration: + return has_wiki + else: + return has_wiki and wiki_page and wiki_page.html(node) + + +def _view_project(node, auth, primary=False, + embed_contributors=False, embed_descendants=False, + embed_registrations=False, embed_forks=False): + """Build a JSON object containing everything needed to render + project.view.mako. + """ + node = AbstractNode.objects.filter(pk=node.pk).include('contributor__user__guids').get() + if node.is_deleted: + raise HTTPError(http_status.HTTP_410_GONE) + + user = auth.user + + if mapcore_sync_is_enabled(): + try: + mapcore_sync_rdm_project_or_map_group(auth.user, node) + except MAPCoreException as e: + # Do not call redirect() here + if settings.DEBUG_MODE: + import traceback + emsg = '
                            {}
                            '.format( + traceback.format_exc()) + else: + emsg = str(e) + mapcore_log_error('{}: {}'.format( + e.__class__.__name__, emsg)) + raise HTTPError(http_status.HTTP_503_SERVICE_UNAVAILABLE, data={ + 'message_short': 'mAP Core API Error', + 'message_long': emsg + }) + else: + # for CloudGateway API v1 + if node.group is not None and user.cggroups_sync is not None \ + and not user.cggroups_sync.filter(name=node.group.name).exists(): + from nii import project_sync + project_sync.project_sync_one(node, None) + user.cggroups_sync.add(node.group) # checked + user.save() + + in_bookmark_collection = False + bookmark_collection_id = '' + + parent = node.find_readable_antecedent(auth) + if user: + bookmark_collection = find_bookmark_collection(user) + if bookmark_collection: + bookmark_collection_id = bookmark_collection._id + in_bookmark_collection = bookmark_collection.guid_links.filter(_id=node._id).exists() + + view_only_link = auth.private_key or request.args.get('view_only', '').strip('/') + anonymous = has_anonymous_link(node, auth) + addons = list(node.get_addons()) + widgets, configs, js, css = _render_addons(addons) + redirect_url = node.url + '?view_only=None' + + disapproval_link = '' + if (node.is_pending_registration and node.has_permission(user, ADMIN)): + disapproval_link = node.root.registration_approval.stashed_urls.get(user._id, {}).get('reject', '') + + if (node.is_pending_embargo and node.has_permission(user, ADMIN)): + disapproval_link = node.root.embargo.stashed_urls.get(user._id, {}).get('reject', '') + + # Before page load callback; skip if not primary call + if primary: + for addon in addons: + messages = addon.before_page_load(node, user) or [] + for message in messages: + status.push_status_message(message, kind='info', dismissible=False, trust=True) + NodeRelation = apps.get_model('osf.NodeRelation') + max_quota, used_quota = quota.get_quota_info( + node.creator, quota.get_project_storage_type(node) + ) + is_registration = node.is_registration + timestamp_pattern = get_timestamp_pattern_division(auth, node) + data = { + 'node': { + 'disapproval_link': disapproval_link, + 'id': node._primary_key, + 'title': sanitize.unescape_entities(node.title), + 'category': node.category_display, + 'category_short': node.category, + 'used_quota': used_quota, + 'max_quota': max_quota * api_settings.SIZE_UNIT_GB, + 'threshold': api_settings.WARNING_THRESHOLD, + 'node_type': node.project_or_component, + 'description': node.description or '', + 'license': serialize_node_license_record(node.license), + 'url': node.url, + 'api_url': node.api_url, + 'absolute_url': node.absolute_url, + 'redirect_url': redirect_url, + 'display_absolute_url': node.display_absolute_url, + 'update_url': node.api_url_for('update_node'), + 'in_dashboard': in_bookmark_collection, + 'is_public': node.is_public, + 'is_archiving': node.archiving, + 'date_created': iso8601format(node.created), + 'date_modified': iso8601format(node.last_logged) if node.last_logged else '', + 'tags': list(node.tags.filter(system=False).values_list('name', flat=True)), + 'children': node.nodes_active.exists(), + 'child_exists': Node.objects.get_children(node, active=True).exists(), + 'is_supplemental_project': node.has_linked_published_preprints, + 'is_registration': is_registration, + 'is_pending_registration': node.is_pending_registration if is_registration else False, + 'is_retracted': node.is_retracted if is_registration else False, + 'is_pending_retraction': node.is_pending_retraction if is_registration else False, + 'retracted_justification': getattr(node.root.retraction, 'justification', None) if is_registration else None, + 'date_retracted': iso8601format(getattr(node.root.retraction, 'date_retracted', None)) if is_registration else '', + 'embargo_end_date': node.embargo_end_date.strftime('%A, %b %d, %Y') if is_registration and node.embargo_end_date else '', + 'is_pending_embargo': node.is_pending_embargo if is_registration else False, + 'is_embargoed': node.is_embargoed if is_registration else False, + 'is_pending_embargo_termination': is_registration and node.is_pending_embargo_termination, + 'registered_from_url': node.registered_from.url if is_registration else '', + 'registered_date': iso8601format(node.registered_date) if is_registration else '', + 'root_id': node.root._id if node.root else None, + 'registered_meta': strip_registered_meta_comments(node.registered_meta), + 'registered_schemas': serialize_meta_schemas(list(node.registered_schema.all())) if is_registration else False, + 'is_fork': node.is_fork, + 'is_collected': node.is_collected, + 'collections': serialize_collections(node.collecting_metadata_list, auth), + 'forked_from_id': node.forked_from._primary_key if node.is_fork else '', + 'forked_from_display_absolute_url': node.forked_from.display_absolute_url if node.is_fork else '', + 'forked_date': iso8601format(node.forked_date) if node.is_fork else '', + 'fork_count': node.forks.exclude(type='osf.registration').filter(is_deleted=False).count(), + 'private_links': [x.to_json() for x in node.private_links_active], + 'link': view_only_link, + 'templated_count': node.templated_list.count(), + 'linked_nodes_count': NodeRelation.objects.filter(child=node, is_node_link=True).exclude(parent__type='osf.collection').count(), + 'anonymous': anonymous, + 'comment_level': node.comment_level, + 'has_comments': node.comment_set.exists(), + 'identifiers': { + 'doi': node.get_identifier_value('doi'), + 'ark': node.get_identifier_value('ark'), + }, + 'visible_preprints': serialize_preprints(node, user), + 'institutions': get_affiliated_institutions(node) if node else [], + 'has_draft_registrations': node.has_active_draft_registrations, + 'timestamp_pattern_division': timestamp_pattern, + 'access_requests_enabled': node.access_requests_enabled, + 'storage_location': node.osfstorage_region.name, + 'waterbutler_url': node.osfstorage_region.waterbutler_url, + 'mfr_url': node.osfstorage_region.mfr_url, + 'groups': list(node.osf_groups.values_list('name', flat=True)), + }, + 'parent_node': { + 'exists': parent is not None, + 'id': parent._primary_key if parent else '', + 'title': parent.title if parent else '', + 'category': parent.category_display if parent else '', + 'url': parent.url if parent else '', + 'api_url': parent.api_url if parent else '', + 'absolute_url': parent.absolute_url if parent else '', + 'registrations_url': parent.web_url_for('node_registrations', _guid=True) if parent else '', + 'is_public': parent.is_public if parent else '', + 'is_contributor_or_group_member': parent.is_contributor_or_group_member(user) if parent else '', + 'is_contributor': parent.is_contributor(user) if parent else '', + 'can_view': parent.can_view(auth) if parent else False, + }, + 'user': { + 'is_contributor_or_group_member': node.is_contributor_or_group_member(user), + 'is_contributor': node.is_contributor(user), + 'is_admin': node.has_permission(user, ADMIN), + 'is_admin_parent_contributor': parent.is_admin_parent(user, include_group_admin=False) if parent else False, + 'is_admin_parent_contributor_or_group_member': parent.is_admin_parent(user) if parent else False, + 'can_edit': node.has_permission(user, WRITE), + 'can_edit_tags': node.has_permission(user, WRITE), + 'has_read_permissions': node.has_permission(user, READ), + 'permissions': node.get_permissions(user) if user else [], + 'id': user._id if user else None, + 'username': user.username if user else None, + 'fullname': user.fullname if user else '', + 'can_comment': node.can_comment(auth), + 'show_wiki_widget': _should_show_wiki_widget(node, user), + 'dashboard_id': bookmark_collection_id, + 'institutions': get_affiliated_institutions(user) if user else [], + }, + # TODO: Namespace with nested dicts + 'addons_enabled': [each.short_name for each in addons], + 'addons': configs, + 'addon_widgets': widgets, + 'addon_widget_js': js, + 'addon_widget_css': css, + 'node_categories': [ + {'value': key, 'display_name': value} + for key, value in list(settings.NODE_CATEGORY_MAP.items()) + ] + } + + # Default should be at top of list for UI and for the project overview page the default region + # for a component is that of the it's parent node. + region_list = get_storage_region_list(user, node=node) + + data.update({'storage_regions': region_list}) + data.update({'storage_flag_is_active': storage_i18n_flag_active()}) + if storage_usage_flag_active(): + storage_usage = node.storage_usage + if storage_usage: + data['node']['storage_usage'] = sizeof_fmt(storage_usage) + + if embed_contributors and not anonymous: + data['node']['contributors'] = utils.serialize_visible_contributors(node) + else: + data['node']['contributors'] = list(node.contributors.values_list('guids___id', flat=True)) + if embed_descendants: + descendants, all_readable = _get_readable_descendants(auth=auth, node=node) + data['user']['can_sort'] = all_readable + data['node']['descendants'] = [ + serialize_node_summary(node=each, auth=auth, primary=not node.has_node_link_to(each), show_path=False) + for each in descendants + ] + if embed_registrations: + data['node']['registrations'] = [ + serialize_node_summary(node=each, auth=auth, show_path=False) + for each in node.registrations_all.order_by('-registered_date').exclude(is_deleted=True) + ] + if embed_forks: + data['node']['forks'] = [ + serialize_node_summary(node=each, auth=auth, show_path=False) + for each in node.forks.exclude(type='osf.registration').exclude(is_deleted=True).order_by('-forked_date') + ] + return data + +def get_affiliated_institutions(obj): + ret = [] + for institution in obj.affiliated_institutions.all(): + ret.append({ + 'name': institution.name, + 'logo_path': institution.logo_path, + 'logo_path_rounded_corners': institution.logo_path_rounded_corners, + 'id': institution._id, + }) + return ret + +def serialize_collections(cgms, auth): + return [{ + 'title': cgm.collection.title, + 'name': cgm.collection.provider.name, + 'url': '/collections/{}/'.format(cgm.collection.provider._id), + 'status': cgm.status, + 'type': cgm.collected_type, + 'issue': cgm.issue, + 'volume': cgm.volume, + 'program_area': cgm.program_area, + 'subjects': list(cgm.subjects.values_list('text', flat=True)), + 'is_public': cgm.collection.is_public, + 'logo': cgm.collection.provider.get_asset_url('favicon') + } for cgm in cgms if cgm.collection.provider and (cgm.collection.is_public + or (auth.user and auth.user.has_perm('read_collection', cgm.collection)))] + +def serialize_preprints(node, user): + return [ + { + 'title': preprint.title, + 'is_moderated': preprint.provider.reviews_workflow, + 'is_withdrawn': preprint.date_withdrawn is not None, + 'state': preprint.machine_state, + 'word': preprint.provider.preprint_word, + 'provider': {'name': 'OSF Preprints' if preprint.provider.name == 'Open Science Framework' else preprint.provider.name, 'workflow': preprint.provider.reviews_workflow}, + 'url': preprint.url, + 'absolute_url': preprint.absolute_url + } for preprint in Preprint.objects.can_view(base_queryset=node.preprints, user=user).filter(date_withdrawn__isnull=True) + ] + + +def serialize_children(child_list, nested, indent=0): + """ + Returns the serialized representation of a list of child nodes. + + This is a helper function for _get_children and as such it does not + redundantly check permissions. + """ + results = [] + for child in child_list: + results.append({ + 'id': child._id, + 'title': child.title, + 'is_public': child.is_public, + 'parent_id': child.parentnode_id, + 'indent': indent + }) + if child._id in nested.keys(): + results.extend(serialize_children(nested.get(child._id), nested, indent + 1)) + return results + +def _get_children(node, auth): + """ + Returns the serialized representation of the given node and all of its children + for which the given user has ADMIN permission. + """ + parent_node_sqs = NodeRelation.objects.filter(child=OuterRef('pk'), is_node_link=False).values('parent__guids___id') + children = (Node.objects.get_children(node) + .filter(is_deleted=False) + .annotate(parentnode_id=Subquery(parent_node_sqs[:1]))) + admin_children = Node.objects.get_nodes_for_user(auth.user, ADMIN_NODE, children) + + nested = defaultdict(list) + for child in admin_children: + nested[child.parentnode_id].append(child) + + return serialize_children(nested[node._id], nested) + + +@must_be_valid_project +@must_have_permission(ADMIN) +def private_link_table(node, **kwargs): + data = { + 'node': { + 'absolute_url': node.absolute_url, + 'private_links': [x.to_json() for x in node.private_links_active], + } + } + return data + + +@collect_auth +@must_be_valid_project +@must_have_permission(ADMIN) +def get_editable_children(auth, node, **kwargs): + + children = _get_children(node, auth) + + return { + 'node': {'id': node._id, 'title': node.title, 'is_public': node.is_public}, + 'children': children, + } + + +@must_be_valid_project +def get_recent_logs(node, **kwargs): + logs = list(reversed(node.logs._to_primary_keys()))[:3] + return {'logs': logs} + + +def _get_readable_descendants(auth, node, permission=None): + descendants = [] + all_readable = True + for child in node.get_nodes(is_deleted=False): + if permission: + perm = permission.lower().strip() + if not child.has_permission(auth.user, perm): + all_readable = False + continue + # User can view child + if child.can_view(auth): + descendants.append(child) + # Child is a node link and user has write permission + elif node.linked_nodes.filter(id=child.id).exists(): + if node.has_permission(auth.user, WRITE): + descendants.append(child) + else: + all_readable = False + else: + all_readable = False + for descendant in child.find_readable_descendants(auth): + descendants.append(descendant) + return descendants, all_readable + +def serialize_child_tree(child_list, user, nested): + """ + Recursively serializes and returns a list of child nodes. + + This is a helper function for node_child_tree and as such it does not + redundantly check permissions. + """ + serialized_children = [] + for child in child_list: + if child.has_permission(user, READ) or child.has_permission_on_children(user, READ): + # is_admin further restricted here to mean user is a traditional admin group contributor - + # admin group membership not sufficient + contributors = [{ + 'id': contributor.user._id, + 'is_admin': child.is_admin_contributor(contributor.user), + 'is_confirmed': contributor.user.is_confirmed, + 'visible': contributor.visible + } for contributor in child.contributor_set.all()] + + serialized_children.append({ + 'node': { + 'id': child._id, + 'url': child.url, + 'title': sanitize.unescape_entities(child.title), + 'is_public': child.is_public, + 'contributors': contributors, + 'is_admin': child.has_permission(user, ADMIN), + 'is_supplemental_project': child.has_linked_published_preprints, + }, + 'user_id': user._id, + 'children': serialize_child_tree(nested.get(child._id), user, nested) if child._id in nested.keys() else [], + 'nodeType': 'project' if not child.parentnode_id else 'component', + 'category': child.category, + 'permissions': { + 'view': True, + 'is_admin': child.has_permission(user, ADMIN) + } + }) + + return sorted(serialized_children, key=lambda k: len(k['children']), reverse=True) + +def node_child_tree(user, node): + """ Returns the serialized representation (for treebeard) of a given node and its children. + :param user: OSFUser object + :param node: parent project Node object + :return: treebeard-formatted data + """ + serialized_nodes = [] + + assert node, '{} is not a valid Node.'.format(node._id) + + parent_node_sqs = NodeRelation.objects.filter(child=OuterRef('pk'), is_node_link=False).values('parent__guids___id') + children = (Node.objects.get_children(node) + .filter(is_deleted=False) + .annotate(parentnode_id=Subquery(parent_node_sqs[:1])) + .include('contributor__user__guids') + ) + + nested = defaultdict(list) + for child in children: + nested[child.parentnode_id].append(child) + + contributors = [{ + 'id': contributor.user._id, + 'is_admin': node.is_admin_contributor(contributor.user), + 'is_confirmed': contributor.user.is_confirmed, + 'visible': contributor.visible + } for contributor in node.contributor_set.all().include('user__guids')] + + can_read = node.has_permission(user, READ) + is_admin = node.has_permission(user, ADMIN) + + if can_read or node.has_permission_on_children(user, READ): + serialized_nodes.append({ + 'node': { + 'id': node._id, + 'url': node.url if can_read else '', + 'title': sanitize.unescape_entities(node.title) if can_read else 'Private Project', + 'is_public': node.is_public, + 'contributors': contributors, + 'is_admin': is_admin, + 'is_supplemental_project': node.has_linked_published_preprints, + + }, + 'user_id': user._id, + 'children': serialize_child_tree(nested.get(node._id), user, nested) if node._id in nested.keys() else [], + 'kind': 'folder' if not node.parent_node or not node.parent_node.has_permission(user, READ) else 'node', + 'nodeType': node.project_or_component, + 'category': node.category, + 'permissions': { + 'view': can_read, + 'is_admin': is_admin + } + }) + + return serialized_nodes + +@must_be_logged_in +@must_be_valid_project +def get_node_tree(auth, **kwargs): + node = kwargs.get('node') or kwargs['project'] + tree = node_child_tree(auth.user, node) + return tree + +@must_be_valid_project +@must_have_permission(ADMIN) +def project_generate_private_link_post(auth, node, **kwargs): + """ creata a new private link object and add it to the node and its selected children""" + + node_ids = request.json.get('node_ids', []) + name = request.json.get('name', '') + + anonymous = request.json.get('anonymous', False) + + if node._id not in node_ids: + node_ids.insert(0, node._id) + + nodes = [AbstractNode.load(node_id) for node_id in node_ids] + + try: + new_link = new_private_link( + name=name, user=auth.user, nodes=nodes, anonymous=anonymous + ) + except ValidationError as e: + raise HTTPError( + http_status.HTTP_400_BAD_REQUEST, + data=dict(message_long=str(e)) + ) + + return new_link + + +@must_be_valid_project +@must_have_permission(ADMIN) +def project_private_link_edit(auth, **kwargs): + name = request.json.get('value', '') + try: + validate_title(name) + except ValidationError as e: + message = 'Invalid link name.' if e.message == 'Invalid title.' else e.message + raise HTTPError( + http_status.HTTP_400_BAD_REQUEST, + data=dict(message_long=message) + ) + + private_link_id = request.json.get('pk', '') + private_link = PrivateLink.load(private_link_id) + + if private_link: + new_name = strip_html(name) + private_link.name = new_name + private_link.save() + return new_name + else: + raise HTTPError( + http_status.HTTP_400_BAD_REQUEST, + data=dict(message_long='View-only link not found.') + ) + + +def _serialize_node_search(node): + """Serialize a node for use in pointer search. + + :param Node node: Node to serialize + :return: Dictionary of node data + + """ + data = { + 'id': node._id, + 'title': node.title, + 'etal': len(node.visible_contributors) > 1, + 'isRegistration': node.is_registration + } + if node.is_registration: + data['title'] += ' (registration)' + data['dateRegistered'] = node.registered_date.isoformat() + else: + data['dateCreated'] = node.created.isoformat() + data['dateModified'] = node.modified.isoformat() + + first_author = node.visible_contributors[0] + data['firstAuthor'] = first_author.family_name or first_author.given_name or first_author.fullname + + return data + + +@must_be_logged_in +def search_node(auth, **kwargs): + """ + + """ + # Get arguments + node = AbstractNode.load(request.json.get('nodeId')) + include_public = request.json.get('includePublic') + size = float(request.json.get('size', '5').strip()) + page = request.json.get('page', 0) + query = request.json.get('query', '').strip() + + start = (page * size) + if not query: + return {'nodes': []} + + # Exclude current node from query if provided + nin = [node.id] + list(node._nodes.values_list('pk', flat=True)) if node else [] + + can_view_query = Q(_contributors=auth.user) + if include_public: + can_view_query = can_view_query | Q(is_public=True) + + nodes = (AbstractNode.objects + .filter( + can_view_query, + title__icontains=query, + is_deleted=False) + .exclude(id__in=nin) + .exclude(type='osf.collection') + .exclude(type='osf.quickfilesnode')) + + count = nodes.count() + pages = math.ceil(count / size) + validate_page_num(page, pages) + + return { + 'nodes': [ + _serialize_node_search(each) + for each in nodes[start: start + size] + if each.contributors + ], + 'total': count, + 'pages': pages, + 'page': page + } + + +def _add_pointers(node, pointers, auth): + """ + + :param Node node: Node to which pointers will be added + :param list pointers: Nodes to add as pointers + + """ + added = False + for pointer in pointers: + if isinstance(node, Collection): + node.collect_object(pointer, auth.user) + else: + node.add_pointer(pointer, auth, save=False) + added = True + + if added: + node.save() + + +@collect_auth +def add_pointer(auth): + """Add a single pointer to a node using only JSON parameters + + """ + to_node_id = request.json.get('toNodeID') + pointer_to_move = request.json.get('pointerID') + + if not (to_node_id and pointer_to_move): + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + + pointer = AbstractNode.load(pointer_to_move) + to_node = Guid.load(to_node_id).referent + try: + _add_pointers(to_node, [pointer], auth) + except ValueError: + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + + +@must_have_permission(WRITE) +@must_not_be_registration +def add_pointers(auth, node, **kwargs): + """Add pointers to a node. + + """ + node_ids = request.json.get('nodeIds') + + if not node_ids: + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + + nodes = [ + AbstractNode.load(node_id) + for node_id in node_ids + ] + + try: + _add_pointers(node, nodes, auth) + except ValueError: + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + + return {} + + +@must_have_permission(WRITE) +@must_not_be_registration +def remove_pointer(auth, node, **kwargs): + """Remove a pointer from a node, raising a 400 if the pointer is not + in `node.nodes`. + + """ + # TODO: since these a delete request, shouldn't use request body. put pointer + # id in the URL instead + pointer_id = request.json.get('pointerId') + if pointer_id is None: + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + + pointer = AbstractNode.load(pointer_id) + if pointer is None: + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + + try: + node.rm_pointer(pointer, auth=auth) + except ValueError: + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + + node.save() + + +@must_have_permission(WRITE) +@must_not_be_registration +def fork_pointer(auth, node, **kwargs): + """Fork a pointer. Raises BAD_REQUEST if pointer not provided, not found, + or not present in `nodes`. + + :param Auth auth: Consolidated authorization + :param Node node: root from which pointer is child + :return: Fork of node to which nodelink(pointer) points + """ + NodeRelation = apps.get_model('osf.NodeRelation') + + linked_node_id = request.json.get('nodeId') + linked_node = AbstractNode.load(linked_node_id) + pointer = NodeRelation.objects.filter(child=linked_node, is_node_link=True, parent=node).first() + + if pointer is None: + # TODO: Change this to 404? + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + + try: + fork = node.fork_pointer(pointer, auth=auth, save=True) + except ValueError: + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + + return { + 'data': { + 'node': serialize_node_summary(node=fork, auth=auth, show_path=False) + } + }, http_status.HTTP_201_CREATED + +def abbrev_authors(node): + lead_author = node.visible_contributors[0] + ret = lead_author.family_name or lead_author.given_name or lead_author.fullname + if node.visible_contributors.count() > 1: + ret += ' et al.' + return ret + + +def serialize_pointer(node, auth): + if node.can_view(auth): + return { + 'id': node._id, + 'url': node.url, + 'title': node.title, + 'authorShort': abbrev_authors(node), + } + return { + 'url': None, + 'title': 'Private Component', + 'authorShort': 'Private Author(s)', + } + + +@must_be_contributor_or_public +def get_pointed(auth, node, **kwargs): + """View that returns the pointers for a project.""" + NodeRelation = apps.get_model('osf.NodeRelation') + return {'pointed': [ + serialize_pointer(each.parent, auth) + for each in NodeRelation.objects.filter(child=node, is_node_link=True) + ]} diff --git a/site/guides/screen-expansion/osf.io/website/templates/project/project.mako b/site/guides/screen-expansion/osf.io/website/templates/project/project.mako new file mode 100644 index 0000000..94283e1 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/website/templates/project/project.mako @@ -0,0 +1,745 @@ +<%inherit file="project/project_base.mako"/> +<%namespace name="render_nodes" file="util/render_nodes.mako" /> +<%namespace name="contributor_list" file="util/contributor_list.mako" /> +<%namespace name="render_addon_widget" file="util/render_addon_widget.mako" /> +<%include file="project/nodes_privacy.mako"/> + +<% + is_project = node['node_type'] == 'project' +%> + +
                            +
                            +
                            +
                            + % if parent_node['exists']: + % if parent_node['can_view'] or parent_node['is_public'] or parent_node['is_contributor_or_group_member']: +

                            + ${parent_node['title']}  / +

                            + % else: +

                            + ${_("Private Project")} / +

                            + % endif + % endif + + % if node['institutions'] != [] and enable_institutions and not node['anonymous']: + + % endif + +

                            + ${node['title']} +

                            +
                            +
                            +
                            +
                            + % if node.get('storage_usage'): +
                            + +
                            + % endif +
                            + % if not node["is_public"]: + + % if project_makepublic: + % if permissions.ADMIN in user['permissions'] and not (node['is_pending_registration'] or node['is_pending_embargo']) and not (node['is_embargoed'] and parent_node['exists']): + + ${_("Make Public")} + + + + + % endif + % endif + % else: + % if permissions.ADMIN in user['permissions'] and not node['is_registration']: + ${_("Make Private")} + % endif + + % endif +
                            +
                            + +
                            +
                            + +
                            +
                            +
                            +
                            +
                            +
                            +
                            + % if user['is_contributor_or_group_member']: + ${_("Contributors")}: + % else: + ${_("Contributors:")} + % endif + + % if node['anonymous']: +
                              ${_("Anonymous Contributors")}
                            + % else: +
                              + ${contributor_list.render_contributors_full(contributors=node['contributors'])} +
                            + % endif +
                            + % if node['groups']: +
                            + Groups: + %for i, group_name in enumerate(node['groups']): +
                              + % if i == len(node['groups']) - 1: + ${group_name} + % else: + ${group_name}, + % endif +
                            + %endfor +
                            + % endif + % if enable_institutions and not node['anonymous']: + % if (permissions.ADMIN in user['permissions'] and not node['is_registration']) and (len(node['institutions']) != 0 or len(user['institutions']) != 0): + ${_("Affiliated Institutions:")} + % if node['institutions'] != []: + % for inst in node['institutions']: + % if inst != node['institutions'][-1]: + ${inst['name']}, + % else: + ${inst['name']} + % endif + % endfor + % else: + ${_("None")} + % endif + % endif + % if not (permissions.ADMIN in user['permissions'] and not node['is_registration']) and node['institutions'] != []: + Affiliated institutions: + % for inst in node['institutions']: + % if inst != node['institutions'][-1]: + ${inst['name']}, + % else: + ${inst['name']} + % endif + % endfor + % endif + % endif + % if node['is_fork']: +

                            + ${_('Forked from %(forkedFromDisplayAbsoluteUrl)s on\ + ') % dict(forkedFromId='class="node-forked-from"' + ' href=/' + h(node['forked_from_id']) + '/',\ + forkedFromDisplayAbsoluteUrl=h(node['forked_from_display_absolute_url']),dateForked='data-bind="text: dateForked.local, tooltip: {title: dateForked.utc}"') | n} +

                            + % endif + % if node['is_registration']: +

                            + ${_("Date registered:")} + +

                            + % endif +

                            + ${_("Date created:")} + + % if not node['is_registration']: + ${_("| Last Updated:")} + + % endif +

                            + +

                            + : + DOI + | ARK +

                            +
                            + + +

                            + + ${_("Creating DOI. Please wait...")} +

                            + + + +

                            + ${_("Create DOI")} +

                            + +
                            +

                            + ${_("Category:")} + ${_(node['category'])} +

                            + + % if (node['description']) or (not node['description'] and permissions.WRITE in user['permissions'] and not node['is_registration']): +

                            + ${_("Description:")} + ${node['description']} +

                            + % endif +
                            + % if not node['is_registration']: +
                            + % else: +
                            + % endif + % if (permissions.ADMIN in user['permissions'] or node['license'].get('name', 'No license') != 'No license'): +

                            + + ${_("License:")} + ${_(node['license'].get('name', 'No license'))} + +

                            + % endif +
                            + % if node['is_registration']: +
                            + % if len(node['registered_schemas']) == 1: + ${_("View Registration Form")} + % else: + ## This is a special case that is right now only possible on 12 Nodes in production + + % endif +
                            + % endif +
                            +
                            +
                            + +
                            +
                            + + +<%def name="title()">${node['title']} + +<%include file="project/modal_add_pointer.mako"/> + +% if (user['can_comment'] or node['has_comments']) and not node['anonymous']: + <%include file="include/comment_pane_template.mako"/> +% endif + +% if node['is_collected']: +
                            + % for i, collection in enumerate(node['collections'][:5]): +
                            +
                            +
                            + Included in ${collection['title']} + + % if permissions.ADMIN in user['permissions']: + + % endif +   +
                            +
                            +
                              + + % if collection['type']: +
                            • ${_("Type:")}  ${collection['type']}
                            • + % endif + + % if collection['status']: +
                            • ${_("Status:")}  ${collection['status']}
                            • + % endif + + % if collection['volume']: +
                            • ${_("Volume:")}  ${collection['volume']}
                            • + % endif + + % if collection['issue']: +
                            • ${_("Issue:")}  ${collection['issue']}
                            • + % endif + + % if collection['program_area']: +
                            • ${_("Program Area:")}  ${collection['program_area']}
                            • + % endif + + % if collection['subjects']: +
                            • +
                              +
                              ${_("Subjects:")}  
                              +
                              + % for subject in collection['subjects']: + + ${subject} + + % endfor +
                              +
                              +
                            • + % endif +
                            +
                            +
                            +
                            + % endfor +
                            +% endif + +% for i, preprint in enumerate(node['visible_preprints']): +
                            +
                            +
                            + Has supplemental materials for ${preprint['title']} + on ${preprint['provider']['name']} + % if user['is_admin_parent_contributor_or_group_member'] or user['is_contributor_or_group_member']: +   + % endif +
                            + % if user['is_admin_parent_contributor_or_group_member'] or user['is_contributor_or_group_member']: +
                            +
                              +
                            • + ${_("Status:")}   + + % if preprint['is_withdrawn']: + ${_("Withdrawn")} + % else: + ${preprint['state'].capitalize()} + % endif + + % if preprint['is_moderated'] and not preprint['is_withdrawn']: + <% icon_tooltip = ''%> + % if preprint['state'] == 'pending': + % if preprint['provider']['workflow'] == 'post-moderation': + <% icon_tooltip = _('This {preprint_word} is publicly available and searchable but is subject to' \ + ' removal by a moderator.').format(preprint_word=preprint['word'])%> + % else: + <% icon_tooltip = _('This {preprint_word} is not publicly available or searchable until approved ' \ + 'by a moderator.').format(preprint_word=preprint['word'])%> + % endif + % elif preprint['state'] == 'accepted': + <% icon_tooltip = _('This {preprint_word} is publicly available and searchable.').format(preprint_word=preprint['word'])%> + % else: + <% icon_tooltip = _('This {preprint_word} is not publicly available or searchable.').format(preprint_word=preprint['word'])%> + % endif + + % endif +
                            • +
                            +
                            + % endif +
                            +
                            +% endfor + + +
                            + +
                            + + + % if 'myscreen' in addons_enabled and addons['myscreen']['has_widget']: + ${ render_addon_widget.render_addon_widget('myscreen', addons_widget_data['myscreen']) } + % endif + + + %if user['show_wiki_widget']: + ${ render_addon_widget.render_addon_widget('wiki', addons_widget_data['wiki']) } + %endif + + +
                            +
                            +

                            ${_("Files")}

                            +
                            + +
                            +
                            + % if not node['is_registration'] and not node['anonymous'] and permissions.WRITE in user['permissions']: +
                            +
                            + ${_("Click on a storage provider or drag and drop to upload")} +
                            +
                            +
                            + %else: +
                            + %endif +
                            +
                            +
                            +
                            +
                            +

                            ${_("Loading files...")}

                            +
                            +
                            +
                            + + +
                            + + % if addons: + + % for addon in addons_enabled: + % if addons[addon]['has_widget']: + + %if addon != 'wiki' and addon != 'iqbrims' and addon != 'myscreen': ## We already show the wiki widget at the top + + ${ render_addon_widget.render_addon_widget(addon, addons_widget_data[addon]) } + %endif + % endif + % endfor + % else: + + ${children()} + % endif + +
                            + +
                            + % if addons: + + % for addon in addons_enabled: + % if addons[addon]['has_widget']: + %if addon == 'iqbrims': + ${ render_addon_widget.render_addon_widget(addon, addons_widget_data[addon]) } + %endif + % endif + % endfor + % endif + + + % if not node['anonymous']: + +
                            +
                            +

                            ${_("Citation")}

                            +
                            + +
                            +
                            +
                            + +
                            +
                            + % endif + + + % if addons: + ${children()} + % endif + + + %if node['tags'] or permissions.WRITE in user['permissions']: +
                            +
                            +

                            ${_("Tags")}

                            +
                            +
                            +
                            +
                            + +
                            +
                            + + %endif + + +
                            +
                            +

                            ${_("Recent Activity")}

                            +
                            ${_("Clear Filters")}
                            +
                            ${_("Refresh")}
                            +
                            +
                            + +
                            +
                            +
                            + +
                            +
                            + +
                            +
                            + + +
                            +
                            +
                            + +
                            +
                            +
                            + + +
                            +
                            +
                            +
                            +
                            +
                            +
                            +
                            +

                            ${_("Loading logs...")}

                            +
                            +
                            +
                            + % if 'admin' in user['permissions']: +
                            +

                            ${_("Download as file")}

                            +
                            ${_("Download")}
                            +
                            + % endif +
                            + +
                            + +
                            + +<%def name="children()"> +% if (permissions.WRITE in user['permissions'] and not node['is_registration']) or node['children']: +
                            +
                            +

                            ${_("Components")}

                            +
                            + % if permissions.WRITE in user['permissions'] and not node['is_registration']: + + + + ${_("Link Projects")} + % endif +
                            +
                            +
                            + % if node['children']: +
                            + ${render_nodes.render_nodes(nodes=node['descendants'], sortable=user['can_sort'], user=user, pluralized_node_type='components', show_path=False, include_js=True)} +
                            + % else: +

                            ${_("Add components to organize your project.")}

                            + % endif +
                            +
                            +%endif + + + +<%def name="stylesheets()"> + ${parent.stylesheets()} + % for style in addon_widget_css: + + % endfor + % for stylesheet in tree_css: + + % endfor + + + + +<%def name="javascript_bottom()"> + +${parent.javascript_bottom()} + +% for script in tree_js: + +% endfor + + + + + +% for asset in addon_widget_js: + +% endfor + + diff --git a/site/guides/screen-expansion/osf.io/website/templates/project/project_header.mako b/site/guides/screen-expansion/osf.io/website/templates/project/project_header.mako new file mode 100644 index 0000000..4744e68 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/website/templates/project/project_header.mako @@ -0,0 +1,221 @@ +# -*- coding: utf-8 -*- + +<% + is_project = node['node_type'] == 'project' +%> + +
                            +
                            + +
                            + + + + %if maintenance: + + %endif + + % if node['is_registration']: ## Begin registration undismissable labels + + % if not node['is_retracted']: + % if not node['is_pending_registration']: + % if file_name and urls.get('archived_from'): +
                            ${ _("This file is part of a registration and is being shown in its archived version (and cannot be altered).")} + ${_("The active file is viewable from within the live %(nodeType)s.") % dict(archivedFromUrl='class="link-solid" href="' + urls['archived_from'] +'"',registeredFromUrl='class="link-solid" href="' + node['registered_from_url'] + '"',nodeType=node['node_type'] ) | n}
                            + % else: +
                            ${ _('This registration is a frozen, non-editable version of this %(nodeType)s') % dict(registeredFromUrl='class="link-solid" href="' + h(node['registered_from_url']) + '"',nodeType=node['node_type']) }
                            + % endif + % else: +
                            +
                            ${ _('This is a pending registration of this %(nodeType)s, awaiting approval from project administrators. This registration will be final when all project administrators approve the registration or 48 hours pass, whichever comes first.') % dict(registeredFromUrl='class="link-solid" href="' + h(node['registered_from_url']) + '"', nodeType=h(node['node_type'])) | n }
                            + + % if 'permissions.ADMIN' in user['permissions']: +
                            +
                            + +
                            + <%include file="modal_confirm_cancel_registration.mako"/> + % endif +
                            + % endif + + + + % endif + + % if node['is_pending_retraction']: +
                            ${ _("This %(nodeType)s is currently pending withdrawal.") % dict(nodeType=node['node_type']) }
                            + % endif + + % if node['is_retracted']: +
                            ${ _('This %(nodeType)s is a withdrawn registration of this %(nodeType)s; the content of the %(nodeType)s has been taken down for the reason(s) stated below.') % dict(nodeType=node['node_type'],registeredFromUrl='class="link-solid" href="' + h(node['registered_from_url']) + '"') | n }
                            + % endif + + % if node['is_pending_embargo']: +
                            ${ _('This %(nodeType)s is currently pending registration, awaiting approval from project administrators. This registration will be final and enter the embargo period when all project administrators approve the registration or 48 hours pass, whichever comes first. The embargo will keep the registration private until the embargo period ends.') % dict(nodeType=node['node_type']) } + % if permissions.ADMIN in user['permissions']: +
                            +
                            + +
                            + <%include file="modal_confirm_cancel_registration.mako"/> + % endif +
                            + % endif + + % if node['is_embargoed']: +
                            ${ _('This registration is currently embargoed. It will remain private until its embargo end date, %(embargoEndDate)s.') % dict(embargoEndDate=node['embargo_end_date']) }
                            + % endif + + % endif ## End registration undismissable labels + + % if node['is_supplemental_project'] and user['is_contributor_or_group_member'] and not node['is_public']: +
                            ${ _('This %(nodeType)s contains supplemental materials for a preprint, but has been made Private. Make your supplemental materials discoverable by making this %(nodeType)s Public.') % dict(nodeType=node['node_type']) }
                            + % endif + + % if node['anonymous'] and user['is_contributor_or_group_member']: +
                            ${ _('This %(nodeType)s is being viewed through an anonymized, view-only link. If you want to view it as a contributor, click here.') % dict(nodeType=node['node_type'],redirectUrl='class="link-solid" href="' + h(node['redirect_url']) + '"') }
                            + % endif + + % if node['link'] and not node['is_public'] and not user['is_contributor_or_group_member']: +
                            ${ _('This %(nodeType)s is being viewed through a private, view-only link. Anyone with the link can view this project. Keep the link safe.') % dict(nodeType=node['node_type']) }
                            + % endif + + % if disk_saving_mode: +
                            ${ _("NOTICE: Forks, registrations, and uploads will be temporarily disabled while the GakuNin RDM undergoes a hardware upgrade. These features will return shortly. Thank you for your patience.") | n }
                            + % endif + +
                            diff --git a/site/guides/screen-expansion/osf.io/website/templates/util/render_addon_widget.mako b/site/guides/screen-expansion/osf.io/website/templates/util/render_addon_widget.mako new file mode 100644 index 0000000..a24d935 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/website/templates/util/render_addon_widget.mako @@ -0,0 +1,271 @@ +# -*- coding: utf-8 -*- + +<%def name="render_addon_widget(addon_name, addon_data)"> + + % if addon_data['complete'] or permissions.WRITE in user['permissions']: +
                            +
                            +

                            ${addon_data['full_name']}

                            +
                            + % if addon_data['has_page']: + + % endif + % if 'can_expand' in addon_data and addon_data['can_expand']: + + % endif +
                            +
                            + % if addon_data['complete']: +
                            + + % if addon_name == 'wiki': +
                            + % if addon_data['wiki_content']: + ${addon_data['wiki_content']} + % else: +

                            ${_("Add important information, links, or images here to describe your project.")}

                            + % endif +
                            + + + + + + + % endif + + % if addon_name == 'dataverse': + % if addon_data['complete']: +
                            + + + +
                            + +
                            ${_("Dataset")}
                            +
                            + +
                            ${_("Global ID")}
                            +
                            + +
                            ${_("Dataverse")}
                            +
                            ${_("Dataverse")}
                            + +
                            ${_("Citation")}
                            +
                            + +
                            +
                            + +
                            + +
                            +

                            +
                            + +
                            + % endif + + % endif + + % if addon_name == 'forward': +
                            + + + +
                            + +
                            + ${_('This project contains a forward to\ + .') % dict(textLinkDisplay='data-bind="attr: {href: url}, text: linkDisplay"') | n} +
                            + + + +
                            + +
                            + % endif + + % if addon_name == 'zotero' or addon_name == 'mendeley': + +
                            + +
                            +
                            +
                            +
                            +
                            +
                            +

                            ${_("Loading citations...")}

                            +
                            +
                            + % endif + + % if addon_name == 'jupyterhub': + + % endif + + % if addon_name == 'iqbrims': +
                            + +
                            ${_("Loading")}
                            + + +
                            ${_("Error occurred")}
                            + + + + ${_("Management Project")} + + + + + +
                            + + + +
                            + + +
                            + + + +
                            + + +
                            +
                            +
                            +
                            +
                            +
                            +
                            +
                            + + + +
                            + + + +
                            +
                            + + + +
                            + + + +
                            + % endif + + + % if addon_name == 'myscreen': +
                            + +
                            ${_("Loading")}
                            + + +
                            ${_("Error occurred")}
                            + + +
                            ${_("My Screen Test")}
                            +
                            + +

                            +
                            + +
                            + % endif + + +
                            + % else: +
                            + ${addon_data['full_name']} add-on is not configured properly. + % if user['is_contributor_or_group_member']: + ${_('Configure this add-on on the add-ons page.') % dict(nodeUrl='"' + h(node['url']) + 'addons/"') | n} + % endif +
                            + + % endif +
                            + % endif + + +<%inherit file="../project/addon/widget.mako"/> diff --git a/site/guides/screen-expansion/osf.io/website/translations/en/LC_MESSAGES/js_messages.po b/site/guides/screen-expansion/osf.io/website/translations/en/LC_MESSAGES/js_messages.po new file mode 100644 index 0000000..24e8423 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/website/translations/en/LC_MESSAGES/js_messages.po @@ -0,0 +1,6669 @@ +# English translations for . +# Copyright (C) 2020 ORGANIZATION +# This file is distributed under the same license as the project. +# FIRST AUTHOR , 2020. +# +msgid "" +msgstr "" +"Project-Id-Version: 0.6.0\n" +"Report-Msgid-Bugs-To: rocs-office@nii.ac.jp\n" +"POT-Creation-Date: 2020-09-03 12:45+0900\n" +"PO-Revision-Date: 2020-09-03 12:45+0900\n" +"Last-Translator: Takuya Ishibashi\n" +"Language: en\n" +"Language-Team: RCOS \n" +"Plural-Forms: nplurals=1; plural=0\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.7.0\n" + +#: addons/twofactor/static/twoFactorUserConfig.js:148 +#: addons/twofactor/static/twoFactorUserConfig.js:190 +#: admin/static/js/rdm_addons/rdm-addons-page.js:71 +#: website/static/js/accountSettings.js:286 +#: website/static/js/accountSettings.js:351 +#: website/static/js/accountSettings.js:477 +#: website/static/js/accountSettings.js:549 +#: website/static/js/addProjectPlugin.js:347 +#: website/static/js/addonPermissions.js:55 +#: website/static/js/addonSettings.js:71 website/static/js/addonSettings.js:134 +#: website/static/js/apiApplication.js:249 +#: website/static/js/apiApplication.js:420 +#: website/static/js/apiApplication.js:487 +#: website/static/js/apiPersonalToken.js:228 +#: website/static/js/apiPersonalToken.js:399 +#: website/static/js/apiPersonalToken.js:426 +#: website/static/js/citationsNodeConfig.js:169 +#: website/static/js/citationsNodeConfig.js:187 +#: website/static/js/contribManager.js:433 website/static/js/fangorn.js:537 +#: website/static/js/fangorn.js:542 website/static/js/fangorn.js:1212 +#: website/static/js/fangorn.js:1235 website/static/js/fangorn.js:1288 +#: website/static/js/fangorn.js:1307 website/static/js/fangorn.js:2006 +#: website/static/js/filepage/index.js:213 +#: website/static/js/folderPickerNodeConfig.js:510 +#: website/static/js/folderPickerNodeConfig.js:566 +#: website/static/js/institutionProjectSettings.js:102 +#: website/static/js/licensePicker.js:243 website/static/js/myProjects.js:1560 +#: website/static/js/myProjects.js:1608 website/static/js/myProjects.js:1632 +#: website/static/js/nodeControl.js:227 +#: website/static/js/oauthAddonNodeConfig.js:156 +#: website/static/js/oauthAddonNodeConfig.js:174 +#: website/static/js/osfHelpers.js:796 website/static/js/osfHelpers.js:897 +#: website/static/js/pages/profile-settings-addons-page.js:35 +#: website/static/js/pages/profile-settings-addons-page.js:101 +#: website/static/js/pages/project-addons-page.js:41 +#: website/static/js/pages/project-addons-page.js:66 +#: website/static/js/privateLinkTable.js:119 website/static/js/profile.js:373 +#: website/static/js/profile.js:743 website/static/js/profile.js:975 +#: website/static/js/project.js:39 website/static/js/project.js:143 +#: website/static/js/project.js:253 +#: website/static/js/wikiSettingsTreebeard.js:31 +msgid "Cancel" +msgstr "" + +#: addons/twofactor/static/twoFactorUserConfig.js:178 +msgid "Enable Two-factor Authentication" +msgstr "" + +#: addons/twofactor/static/twoFactorUserConfig.js:179 +msgid "" +"Enabling two-factor authentication will not immediately activate this " +"feature for your account. You will need to follow the steps that appear " +"below to complete the activation of two-factor authentication for your " +"account." +msgstr "" + +#: addons/twofactor/static/twoFactorUserConfig.js:187 +msgid "Enable" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:86 +msgid "Live editing mode" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:88 +msgid "Attempting to connect" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:90 +msgid "Unsupported browser" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:92 +msgid "Unavailable: Live editing" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:153 +msgid "The wiki content could not be loaded." +msgstr "" + +#: addons/wiki/static/WikiEditor.js:155 +msgid "Could not GET wiki contents." +msgstr "" + +#: addons/wiki/static/WikiEditor.js:176 +msgid "There are unsaved changes to your wiki. If you exit " +msgstr "" + +#: addons/wiki/static/WikiEditor.js:177 +msgid "the page now, those changes may be lost." +msgstr "" + +#: addons/wiki/static/wikiPage.js:94 +#: website/static/js/pages/project-dashboard-page.js:733 +msgid "" +"*Add important information, links, or images here to describe your " +"project.*" +msgstr "" + +#: addons/wiki/static/wikiPage.js:96 +#: website/static/js/pages/project-dashboard-page.js:735 +msgid "*No wiki content.*" +msgstr "" + +#: addons/wiki/static/wikiPage.js:220 +msgid "Live preview" +msgstr "" + +#: addons/wiki/static/wikiPage.js:222 +msgid "Current version" +msgstr "" + +#: addons/wiki/static/wikiPage.js:224 +msgid "Previous version" +msgstr "" + +#: addons/wiki/static/wikiPage.js:226 +msgid "Version " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:48 +msgid "Strong " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:51 +msgid "Emphasis " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:54 +msgid "Spellcheck: Toggle spellcheck on and off" +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:56 +msgid "Hyperlink " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:60 +msgid "Blockquote
                            " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:63 +msgid "Code Sample
                            "
                            +msgstr ""
                            +
                            +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:66
                            +msgid "Image "
                            +msgstr ""
                            +
                            +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:70
                            +msgid "Numbered List 
                              " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:71 +msgid "Bulleted List

                            " +msgstr "" + +#: website/static/js/institutionProjectSettings.js:85 +msgid "Remove %1$s from %2$s." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:157 +msgid "Updating affiliation... this may take a minute." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:202 +msgid "" +"Unable to modify the institution on this node. Please try again. If the " +"problem persists, email %1$s" +msgstr "" + +#: website/static/js/institutionProjectSettings.js:203 +msgid "Unable to modify this institution!" +msgstr "" + +#: website/static/js/js_messages.js:3 +msgid "Bookmarks" +msgstr "" + +#: website/static/js/js_messages.js:5 +msgid "Edit" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Analysis" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Communication" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Data" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Hypothesis" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Instrumentation" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Methods and Measures" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Procedure" +msgstr "" + +#: website/static/js/js_messages.js:7 +#: website/static/js/projectSettingsTreebeardBase.js:90 +msgid "Project" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Software" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Other" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "analysis" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "communication" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "data" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "hypothesis" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "instrumentation" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "methods and measures" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "procedure" +msgstr "" + +#: website/static/js/js_messages.js:9 website/static/js/nodeControl.js:114 +#: website/static/js/nodeSelectTreebeard.js:87 +#: website/static/js/nodesDeleteTreebeard.js:62 +#: website/static/js/nodesPrivacySettingsTreebeard.js:62 +msgid "project" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "software" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "other" +msgstr "" + +#: website/static/js/js_messages.js:11 website/static/js/js_messages.js:13 +msgid "Comments added" +msgstr "" + +#: website/static/js/js_messages.js:11 website/static/js/js_messages.js:13 +msgid "Files updated" +msgstr "" + +#: website/static/js/js_messages.js:13 +msgid "Replies to your comments" +msgstr "" + +#: website/static/js/js_messages.js:13 +msgid "Mentions added" +msgstr "" + +#: website/static/js/js_messages.js:13 +msgid "Preprint submissions updated" +msgstr "" + +#: website/static/js/js_messages.js:15 +msgid "No license" +msgstr "" + +#: website/static/js/js_messages.js:17 website/static/js/passwordForms.js:178 +#: website/static/js/passwordForms.js:241 +msgid "This field is required." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a value greater than or equal to {0}." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a value less than or equal to {0}." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter at least {0} characters." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter no more than {0} characters." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please check this value." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "The value must increment by {0}." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a proper email address." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a proper date." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a number." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a digit." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please specify a valid phone number." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Values must equal." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please choose another value." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please make sure the value is unique." +msgstr "" + +#: website/static/js/js_messages.js:19 +msgid "Project Wiki Pages" +msgstr "" + +#: website/static/js/js_messages.js:19 +msgid "Component Wiki Pages" +msgstr "" + +#: website/static/js/js_messages.js:19 +msgid "Home" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Projects" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Components" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Registrations" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Users" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "All Results" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Files" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Institutions" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Preprints" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Groups" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Wiki" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Comments" +msgstr "" + +#: website/static/js/js_messages.js:23 +msgid "Default Notification Settings" +msgstr "" + +#: website/static/js/js_messages.js:23 +msgid "" +"These are default settings for new projects you create or are added to. " +"Modifying these settings will not modify settings on existing projects." +msgstr "" + +#: website/static/js/js_messages.js:23 +msgid "Project Notifications" +msgstr "" + +#: website/static/js/js_messages.js:23 +msgid "" +"These are settings for each of your projects. Modifying these settings " +"will only modify the settings for the selected project." +msgstr "" + +#: website/static/js/js_messages.js:25 +msgid "moved" +msgstr "" + +#: website/static/js/js_messages.js:25 +msgid "renamed" +msgstr "" + +#: website/static/js/js_messages.js:27 +msgid "Skipped" +msgstr "" + +#: website/static/js/js_messages.js:27 +msgid "Moved or replaced old version" +msgstr "" + +#: website/static/js/js_messages.js:27 +msgid "Kept both versions" +msgstr "" + +#: website/static/js/js_messages.js:29 +msgid "admin" +msgstr "" + +#: website/static/js/js_messages.js:29 +msgid "write" +msgstr "" + +#: website/static/js/js_messages.js:29 +msgid "read" +msgstr "" + +#: website/static/js/js_messages.js:31 +msgid "home" +msgstr "" + +#: website/static/js/js_messages.js:33 +msgid "No tokens." +msgstr "" + +#: website/static/js/js_messages.js:33 +msgid "Invalid tokens." +msgstr "" + +#: website/static/js/js_messages.js:35 +msgid "Invalid folder." +msgstr "" + +#: website/static/js/js_messages.js:35 +msgid "Credentials are valid" +msgstr "" + +#: website/static/js/keen.js:114 +msgid "Error sending Keen data to %1$s:<%2$s>" +msgstr "" + +#: website/static/js/keen.js:132 +msgid "Error sending Keen data for multiple events: <%1$s>" +msgstr "" + +#: website/static/js/keen.js:141 +msgid "Error sending Keen data to %1$s." +msgstr "" + +#: website/static/js/keen.js:153 +msgid "Cannot instantiate another KeenTracker instance." +msgstr "" + +#: website/static/js/koHelpers.js:129 +msgid "End date must be greater than or equal to the start date." +msgstr "" + +#: website/static/js/koHelpers.js:147 +msgid "Date must be greater than or equal to 1900." +msgstr "" + +#: website/static/js/koHelpers.js:169 +msgid "Please enter a date prior to the current date." +msgstr "" + +#: website/static/js/koHelpers.js:175 +msgid "Please enter a valid year." +msgstr "" + +#: website/static/js/koHelpers.js:190 +msgid "Please enter a valid URL." +msgstr "" + +#: website/static/js/koHelpers.js:197 +msgid "The field does not match the required input." +msgstr "" + +#: website/static/js/licensePicker.js:20 website/static/js/profile.js:128 +#: website/static/js/profile.js:132 +msgid "Year" +msgstr "" + +#: website/static/js/licensePicker.js:21 +msgid "Copyright Holders" +msgstr "" + +#: website/static/js/licensePicker.js:26 +msgid "License:" +msgstr "" + +#: website/static/js/licensePicker.js:27 +msgid "Choose a license:" +msgstr "" + +#: website/static/js/licensePicker.js:28 +msgid ">Save<" +msgstr "" + +#: website/static/js/licensePicker.js:68 +msgid "Add a license" +msgstr "" + +#: website/static/js/licensePicker.js:104 +msgid "Please specify a valid year." +msgstr "" + +#: website/static/js/licensePicker.js:108 +msgid "Future years are not allowed." +msgstr "" + +#: website/static/js/licensePicker.js:190 +msgid "License updated successfully." +msgstr "" + +#: website/static/js/licensePicker.js:195 +msgid "There was a problem updating your license. Please try again." +msgstr "" + +#: website/static/js/licensePicker.js:239 +msgid "Your Own License" +msgstr "" + +#: website/static/js/licensePicker.js:240 +msgid "" +"You have opted to use your own license. Please upload a license file " +"named \"license.txt\" into the GakuNin RDM Storage of this project." +msgstr "" + +#: website/static/js/licensePicker.js:247 +msgid "Add license" +msgstr "" + +#: website/static/js/licenses.js:27 +msgid "Content:" +msgstr "" + +#: website/static/js/licenses.js:31 +msgid "Code - Permissive:" +msgstr "" + +#: website/static/js/licenses.js:35 +msgid "Code - Copyleft:" +msgstr "" + +#: website/static/js/licenses.js:39 +msgid "Code - Other:" +msgstr "" + +#: website/static/js/logActionsList_extract.js:3 +#: website/static/js/logActionsList_extract.js:70 +msgid "${user} created ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:4 +msgid "${user} registered ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:5 +msgid "${node} registered" +msgstr "" + +#: website/static/js/logActionsList_extract.js:6 +msgid "" +"${user} submitted for review to the Preregistration Challenge a " +"registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:7 +msgid "${user} deleted ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:8 +msgid "${user} created ${node} based on ${template}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:9 +msgid "${user} created a link to ${pointer_category} ${pointer}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:10 +msgid "${user} forked a link to ${pointer_category} ${pointer}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:11 +msgid "${user} removed a link to ${pointer_category} ${pointer}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:12 +msgid "${user} added ${group} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:13 +msgid "${user} removed ${group} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:14 +msgid "${user} changed ${group} permissions to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:15 +msgid "${user} made ${node} public" +msgstr "" + +#: website/static/js/logActionsList_extract.js:16 +msgid "${node} made public" +msgstr "" + +#: website/static/js/logActionsList_extract.js:17 +msgid "${user} made ${node} private" +msgstr "" + +#: website/static/js/logActionsList_extract.js:18 +msgid "${user} added tag ${tag} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:19 +msgid "${user} removed tag ${tag} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:20 +msgid "${user} changed the title from ${title_original} to ${title_new}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:21 +msgid "${user} edited description of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:22 +msgid "${user} changed the ${updated_fields} for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:23 +msgid "${user} created external identifier(s) ${identifiers} on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:24 +msgid "${user} created a custom citation for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:25 +msgid "${user} edited a custom citation for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:26 +msgid "${user} removed a custom citation for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:27 +msgid "${user} added ${contributors} as contributor(s) to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:28 +msgid "${user} removed ${contributors} as contributor(s) from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:29 +msgid "${user} reordered contributors for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:30 +msgid "${user} changed permissions for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:31 +msgid "" +"${user} made non-bibliographic contributor ${contributors} a " +"bibliographic contributor on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:32 +msgid "" +"${user} made bibliographic contributor ${contributors} a non-" +"bibliographic contributor on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:33 +msgid "${user} updated wiki page ${page} to version ${version} of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:34 +msgid "${user} deleted wiki page ${page} of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:35 +msgid "${user} renamed wiki page ${old_page} to ${page} of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:36 +msgid "${user} made the wiki of ${node} publicly editable" +msgstr "" + +#: website/static/js/logActionsList_extract.js:37 +msgid "${user} made the wiki of ${node} privately editable" +msgstr "" + +#: website/static/js/logActionsList_extract.js:38 +msgid "${user} added addon ${addon} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:39 +msgid "${user} removed addon ${addon} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:40 +msgid "${user} moved ${source} to ${destination} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:41 +msgid "${user} copied ${source} to ${destination} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:42 +msgid "${user} renamed ${source} to ${destination} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:43 +msgid "${user} created a folder in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:44 +msgid "${user} added file ${path} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:45 +msgid "${user} updated file in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:46 +msgid "${user} removed ${path_type} ${path} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:47 +msgid "${user} restored file ${path} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:48 +msgid "${user} updated the file metadata for ${path}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:49 +msgid "${user} checked out ${kind} ${path} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:50 +msgid "${user} checked in ${kind} ${path} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:51 +msgid "${user} added a comment ${comment_location} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:52 +msgid "${user} deleted a comment ${comment_location} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:53 +msgid "${user} restored a comment ${comment_location} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:54 +msgid "${user} updated a comment ${comment_location} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:55 +msgid "${user} initiated an embargoed registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:56 +msgid "${user} approved embargoed registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:57 +msgid "Embargo of registration of ${node} approved" +msgstr "" + +#: website/static/js/logActionsList_extract.js:58 +msgid "${user} cancelled embargoed registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:59 +msgid "${user} completed embargo of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:60 +msgid "Embargo for ${node} completed" +msgstr "" + +#: website/static/js/logActionsList_extract.js:61 +msgid "Embargo for ${node} ended" +msgstr "" + +#: website/static/js/logActionsList_extract.js:62 +msgid "${user} initiated withdrawal of registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:63 +msgid "A withdrawal of registration of ${node} is proposed" +msgstr "" + +#: website/static/js/logActionsList_extract.js:64 +msgid "${user} approved withdrawal of registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:65 +msgid "${user} cancelled withdrawal of registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:66 +msgid "${user} initiated registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:67 +msgid "${user} approved registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:68 +msgid "Registration of ${node} approved" +msgstr "" + +#: website/static/js/logActionsList_extract.js:69 +msgid "${user} cancelled registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:71 +msgid "${user} created fork from ${forked_from}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:72 +msgid "${user} removed ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:73 +msgid "${user} enabled access requests for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:74 +msgid "${user} disabled access requests for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:75 +msgid "${user} updated the license of ${node} ${license}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:76 +msgid "${user} added tag ${tag} to ${path} in ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:77 +msgid "${user} removed tag ${tag} from ${path} in ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:78 +msgid "${user} added file ${path} to ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:79 +msgid "${user} created folder ${path} in ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:80 +msgid "${user} updated file ${path} in ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:81 +msgid "${user} removed ${path_type} ${path} from ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:82 +msgid "${user} added ${institution} affiliation to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:83 +msgid "${user} removed ${institution} affiliation from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:84 +msgid "${user} made ${node} a ${preprint} on ${preprint_provider} Preprints" +msgstr "" + +#: website/static/js/logActionsList_extract.js:85 +msgid "" +"${user} updated the primary file of this ${preprint} on " +"${preprint_provider} Preprints" +msgstr "" + +#: website/static/js/logActionsList_extract.js:86 +msgid "" +"${user} updated the license of this ${preprint} on ${preprint_provider} " +"Preprints ${license}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:87 +msgid "${user} updated the subjects on ${node} to ${subjects}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:88 +msgid "${user} created ${anonymous_link} view-only link to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:89 +msgid "${user} removed ${anonymous_link} view-only link to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:90 +msgid "${user} verified timestamp" +msgstr "" + +#: website/static/js/logActionsList_extract.js:91 +msgid "${user} requested trusted timestamp" +msgstr "" + +#: website/static/js/logActionsList_extract.js:92 +msgid "${user} requested trusted timestamp file ${path}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:93 +msgid "" +"${user} downloaded a file of timestamp errors as a " +"${timestamp_errors_file_format}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:94 +msgid "" +"[MAPCORE_SYNC:ERROR] ${user} cannot create a new mAP group for GRDM " +"project <${node}> (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:95 +msgid "" +"[MAPCORE_SYNC:ERROR] mAP group for GRDM project <${node}> cannot be " +"updated (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:96 +msgid "" +"[MAPCORE_SYNC:ERROR] GRDM project <${node}> cannot be updated with mAP " +"group (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:97 +msgid "" +"[MAPCORE_SYNC:NOTICE] Unknown (unregistered in GRDM) users belong to mAP " +"group <${node}> (ignored) (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:98 +msgid "${user} linked the Azure Blob Storage container ${bucket} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:99 +msgid "${user} unselected the Azure Blob Storage container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:100 +msgid "" +"${user} added file ${path} to Azure Blob Storage container ${bucket} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:101 +msgid "" +"${user} removed ${path} in Azure Blob Storage container ${bucket} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:102 +msgid "" +"${user} updated file ${path} in Azure Blob Storage container ${bucket} in" +" ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:103 +msgid "" +"${user} created folder ${path} in Azure Blob Storage container ${bucket} " +"in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:104 +msgid "${user} authorized the Azure Blob Storage addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:105 +msgid "${user} deauthorized the Azure Blob Storage addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:106 +msgid "Azure Blob Storage addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:107 +msgid "${user} added file ${path} to Bitbucket repo ${bitbucket_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:108 +msgid "" +"${user} removed ${path_type} ${path} in Bitbucket repo ${bitbucket_repo} " +"in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:109 +msgid "" +"${user} updated file ${path} in Bitbucket repo ${bitbucket_repo} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:110 +msgid "" +"${user} created folder ${path} in Bitbucket repo ${bitbucket_repo} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:111 +msgid "${user} authorized the Bitbucket addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:112 +msgid "${user} deauthorized the Bitbucket addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:113 +msgid "Bitbucket addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:114 +msgid "${user} linked Bitbucket repo ${bitbucket_repo} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:115 +msgid "${user} added file ${path} to Box in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:116 +msgid "${user} removed ${path_type} ${path} from Box in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:117 +msgid "${user} updated file ${path} in Box in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:118 +msgid "${user} created folder ${path} in Box in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:119 +msgid "${user} linked Box folder ${box_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:120 +msgid "${user} authorized the Box addon in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:121 +msgid "${user} deauthorized the Box addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:122 +msgid "Box addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:123 +msgid "${user} added a citation ${citation} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:124 +msgid "${user} updated a citation ${citation} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:125 +msgid "${user} removed a citation ${citation} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:126 +msgid "${user} added file ${filename} to Dataverse dataset ${dataset} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:127 +msgid "" +"${user} removed file ${filename} from Dataverse dataset ${dataset} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:128 +msgid "${user} linked Dataverse dataset ${dataset} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:129 +msgid "${user} linked Dataverse dataset ${study} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:130 +msgid "${user} published a new version of Dataverse dataset ${dataset} on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:131 +msgid "${user} published a new version of Dataverse dataset ${study} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:132 +msgid "${user} authorized the Dataverse addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:133 +msgid "${user} deauthorized the Dataverse addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:134 +msgid "Dataverse addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:135 +msgid "${user} added file ${path} to Dropbox in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:136 +msgid "${user} removed ${path_type} ${path} from Dropbox in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:137 +msgid "${user} updated file ${path} in Dropbox in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:138 +msgid "${user} created folder ${path} in Dropbox in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:139 +msgid "${user} linked Dropbox folder ${dropbox_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:140 +msgid "${user} authorized the Dropbox addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:141 +msgid "${user} deauthorized the Dropbox addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:142 +msgid "Dropbox addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:143 +msgid "${user} added file ${path} to Dropbox Business in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:144 +msgid "${user} removed ${path_type} ${path} from Dropbox Business in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:145 +msgid "${user} updated file ${path} in Dropbox Business in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:146 +msgid "${user} created folder ${path} in Dropbox Business in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:147 +msgid "" +"${user} linked Dropbox Business folder ${dropboxbusiness_folder} to " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:148 +msgid "${user} authorized the Dropbox Business addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:149 +msgid "${user} deauthorized the Dropbox Business addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:150 +msgid "Dropbox Business addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:151 +msgid "${user} linked figshare ${folder} ${folder_name} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:152 +msgid "${user} unlinked content from figshare in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:153 +msgid "${user} added file ${path} to figshare in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:154 +msgid "${user} removed ${path_type} ${path} from figshare in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:155 +msgid "${user} created folder ${path} in figshare in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:156 +msgid "${user} authorized the figshare addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:157 +msgid "${user} deauthorized the figshare addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:158 +msgid "figshare addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:159 +msgid "${user} changed external link to ${forward_url} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:160 +msgid "${user} added file ${path} to GitHub repo ${repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:161 +msgid "${user} removed ${path_type} ${path} in GitHub repo ${repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:162 +msgid "${user} updated file ${path} in GitHub repo ${repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:163 +msgid "${user} created folder ${path} in GitHub repo ${repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:164 +msgid "${user} authorized the GitHub addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:165 +msgid "${user} deauthorized the GitHub addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:166 +msgid "GitHub addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:167 +msgid "${user} linked GitHub repo ${repo} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:168 +msgid "${user} added file ${path} to GitLab repo ${gitlab_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:169 +msgid "${user} removed file ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:170 +msgid "${user} updated file ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:171 +msgid "${user} created folder ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:172 +msgid "${user} authorized the GitLab addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:173 +msgid "${user} deauthorized the GitLab addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:174 +msgid "GitLab addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:175 +msgid "${user} linked GitLab repo ${gitlab_repo} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:176 +msgid "${user} added file ${googledrive_path} to Google Drive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:177 +msgid "" +"${user} removed ${path_type} ${googledrive_path} from Google Drive in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:178 +msgid "${user} updated file ${googledrive_path} in Google Drive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:179 +msgid "${user} created folder ${googledrive_path} in Google Drive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:180 +msgid "${user} linked Google Drive folder ${googledrive_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:181 +msgid "${user} authorized the Google Drive addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:182 +msgid "${user} deauthorized the Google Drive addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:183 +msgid "Google Drive addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:184 +msgid "${user} added file ${iqbrims_path} to IQB-RIMS in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:185 +msgid "${user} removed ${path_type} ${iqbrims_path} from IQB-RIMS in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:186 +msgid "${user} updated file ${iqbrims_path} in IQB-RIMS in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:187 +msgid "${user} created folder ${iqbrims_path} in IQB-RIMS in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:188 +msgid "${user} linked IQB-RIMS folder ${iqbrims_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:189 +msgid "${user} authorized the IQB-RIMS addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:190 +msgid "${user} deauthorized the IQB-RIMS addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:191 +msgid "IQB-RIMS addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:192 +#: website/static/js/logActionsList_extract.js:194 +msgid "${user} started IQB-RIMS workflow for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:193 +#: website/static/js/logActionsList_extract.js:195 +msgid "Finished workflow of ${user} for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:196 +msgid "${user} linked Mendeley folder ${folder_name} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:197 +msgid "${user} authorized the Mendeley addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:198 +msgid "${user} deauthorized the Mendeley addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:199 +msgid "${user} added file ${path} to Nextcloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:200 +msgid "${user} removed ${path_type} ${path} from Nextcloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:201 +msgid "${user} updated file ${path} in Nextcloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:202 +msgid "${user} created folder ${path} in Nextcloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:203 +msgid "${user} linked Nextcloud folder ${folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:204 +msgid "${user} authorized the Nextcloud addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:205 +msgid "${user} deauthorized the Nextcloud addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:206 +msgid "Nextcloud addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:207 +msgid "${user} added file ${path} to Microsoft OneDrive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:208 +msgid "${user} removed ${path_type} ${path} from Microsoft OneDrive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:209 +msgid "${user} updated file ${path} in Microsoft OneDrive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:210 +msgid "${user} created folder ${path} in Microsoft OneDrive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:211 +msgid "${user} linked Microsoft OneDrive folder ${onedrive_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:212 +msgid "${user} authorized the Microsoft OneDrive addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:213 +msgid "${user} deauthorized the Microsoft OneDrive addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:214 +msgid "Microsoft OneDrive addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:215 +msgid "${user} added file ${path} to ownCloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:216 +msgid "${user} removed ${path_type} ${path} from ownCloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:217 +msgid "${user} updated file ${path} in ownCloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:218 +msgid "${user} created folder ${path} in ownCloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:219 +msgid "${user} linked ownCloud folder ${folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:220 +msgid "${user} authorized the ownCloud addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:221 +msgid "${user} deauthorized the ownCloud addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:222 +msgid "ownCloud addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:223 +msgid "${user} linked the Amazon S3 bucket ${bucket} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:224 +msgid "${user} unselected the Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:225 +msgid "${user} added file ${path} to Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:226 +msgid "${user} removed ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:227 +msgid "${user} updated file ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:228 +msgid "${user} created folder ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:229 +msgid "${user} authorized the Amazon S3 addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:230 +msgid "${user} deauthorized the Amazon S3 addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:231 +msgid "Amazon S3 addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:232 +msgid "${user} linked the S3 Compatible Storage bucket ${bucket} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:233 +msgid "${user} unselected the S3 Compatible Storage bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:234 +msgid "" +"${user} added file ${path} to S3 Compatible Storage bucket ${bucket} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:235 +msgid "" +"${user} removed ${path} in S3 Compatible Storage bucket ${bucket} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:236 +msgid "" +"${user} updated file ${path} in S3 Compatible Storage bucket ${bucket} in" +" ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:237 +msgid "" +"${user} created folder ${path} in S3 Compatible Storage bucket ${bucket} " +"in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:238 +msgid "${user} authorized the S3 Compatible Storage addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:239 +msgid "${user} deauthorized the S3 Compatible Storage addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:240 +msgid "S3 Compatible Storage addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:241 +msgid "${user} linked the Swift container ${bucket} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:242 +msgid "${user} unselected the Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:243 +msgid "${user} added file ${path} to Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:244 +msgid "${user} removed ${path} in Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:245 +msgid "${user} updated file ${path} in Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:246 +msgid "${user} created folder ${path} in Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:247 +msgid "${user} authorized the Swift addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:248 +msgid "${user} deauthorized the Swift addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:249 +msgid "Swift addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:250 +msgid "${user} added file ${filename} to WEKO index ${dataset} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:251 +msgid "${user} removed file ${filename} from WEKO index ${dataset} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:252 +msgid "${user} linked WEKO index ${dataset} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:253 +msgid "${user} created an index ${filename} on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:254 +msgid "${user} created an item ${filename} on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:255 +msgid "${user} created folder ${filename} in WEKO index ${dataset} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:256 +msgid "${user} authorized the WEKO addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:257 +msgid "${user} deauthorized the WEKO addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:258 +msgid "WEKO addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:259 +msgid "${user} linked Zotero folder ${folder_name} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:260 +msgid "${user} linked Zotero library ${library_name} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:261 +msgid "${user} authorized the Zotero addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:262 +msgid "${user} deauthorized the Zotero addon for ${node}" +msgstr "" + +#: website/static/js/logTextParser.js:824 +msgid "unknown format" +msgstr "" + +#: website/static/js/meetings.js:24 +msgid "Submissions" +msgstr "" + +#: website/static/js/meetings.js:30 +msgid "Location" +msgstr "" + +#: website/static/js/filepage/revisions.js:109 website/static/js/meetings.js:36 +msgid "Date" +msgstr "" + +#: website/static/js/myProjects.js:308 +msgid "We're having some trouble contacting our servers. Try reloading the page." +msgstr "" + +#: website/static/js/myProjects.js:308 +msgid "Something went wrong!" +msgstr "" + +#: website/static/js/myProjects.js:433 +msgid "All my projects" +msgstr "" + +#: website/static/js/myProjects.js:461 +msgid "Error loading project category names." +msgstr "" + +#: website/static/js/myProjects.js:665 +msgid "Some projects" +msgstr "" + +#: website/static/js/myProjects.js:669 +msgid " could not be removed from the collection" +msgstr "" + +#: website/static/js/myProjects.js:671 +msgid "Please try again." +msgstr "" + +#: website/static/js/myProjects.js:764 +msgid "You have not created any projects yet." +msgstr "" + +#: website/static/js/myProjects.js:768 +msgid "" +"There have been no completed registrations for this institution, but you " +"can view the " +msgstr "" + +#: website/static/js/myProjects.js:769 +msgid "newest public registrations" +msgstr "" + +#: website/static/js/myProjects.js:770 website/static/js/myProjects.js:778 +msgid " or " +msgstr "" + +#: website/static/js/myProjects.js:771 +msgid "popular public registrations." +msgstr "" + +#: website/static/js/myProjects.js:774 +msgid "You have not made any registrations yet. Go to " +msgstr "" + +#: website/static/js/myProjects.js:775 +msgid "Guides" +msgstr "" + +#: website/static/js/myProjects.js:775 +msgid " to learn how registrations work." +msgstr "" + +#: website/static/js/myProjects.js:778 +msgid "You have not made any preprints yet. Learn more about preprints in the " +msgstr "" + +#: website/static/js/myProjects.js:778 +msgid "OSF Guides" +msgstr "" + +#: website/static/js/myProjects.js:778 +msgid "make one now." +msgstr "" + +#: website/static/js/myProjects.js:780 +msgid "" +"You have no bookmarks. You can add projects or registrations by dragging " +"them into your bookmarks or by clicking the Add to Bookmark button on the" +" project or registration." +msgstr "" + +#: website/static/js/myProjects.js:782 +msgid "This collection is empty." +msgstr "" + +#: website/static/js/myProjects.js:784 +msgid "" +" You can add projects, registrations, or preprints by dragging them into " +"the collection." +msgstr "" + +#: website/static/js/myProjects.js:795 +msgid "" +"No components to display. Either there are no components, or there are " +"private components in which you are not a contributor." +msgstr "" + +#: website/static/js/myProjects.js:966 +msgid "Collections could not be loaded." +msgstr "" + +#: website/static/js/myProjects.js:967 +msgid "Please reload the page." +msgstr "" + +#: website/static/js/myProjects.js:1109 +msgid "My Projects " +msgstr "" + +#: website/static/js/myProjects.js:1110 +msgid "Browse and organize all your projects" +msgstr "" + +#: website/static/js/myProjects.js:1115 +msgid "Create Project" +msgstr "" + +#: website/static/js/myProjects.js:1172 +msgid "Fetching more projects" +msgstr "" + +#: website/static/js/myProjects.js:1278 +msgid "\" collection could not be created." +msgstr "" + +#: website/static/js/myProjects.js:1279 website/static/js/myProjects.js:1311 +#: website/static/js/myProjects.js:1336 +msgid "Please try again" +msgstr "" + +#: website/static/js/myProjects.js:1310 +msgid "\" could not be deleted." +msgstr "" + +#: website/static/js/myProjects.js:1335 +msgid "\" could not be renamed." +msgstr "" + +#: website/static/js/myProjects.js:1383 +msgid "\" is already in \"%1$s\"" +msgstr "" + +#: website/static/js/myProjects.js:1469 +msgid "Collections " +msgstr "" + +#: website/static/js/myProjects.js:1472 +msgid "" +"Collections are groups of projects. You can create custom collections. " +"Drag and drop your projects or bookmarked projects to add them." +msgstr "" + +#: website/static/js/myProjects.js:1501 +msgid " Rename" +msgstr "" + +#: website/static/js/myProjects.js:1510 +msgid " Delete" +msgstr "" + +#: website/static/js/myProjects.js:1528 +msgid "Add new collection" +msgstr "" + +#: website/static/js/myProjects.js:1531 +msgid "" +"Collections are groups of projects that help you organize your work. " +"After you create your collection, you can add projects by dragging them " +"into the collection." +msgstr "" + +#: website/static/js/myProjects.js:1533 +msgid "Collection name" +msgstr "" + +#: website/static/js/myProjects.js:1548 +msgid "e.g. My Replications" +msgstr "" + +#: website/static/js/myProjects.js:1565 +msgid "Add" +msgstr "" + +#: website/static/js/myProjects.js:1576 +msgid "Rename collection" +msgstr "" + +#: website/static/js/myProjects.js:1581 +msgid "Rename to: " +msgstr "" + +#: website/static/js/myProjects.js:1624 +msgid "Delete collection \"%1$s\"?" +msgstr "" + +#: website/static/js/myProjects.js:1627 +msgid "This will delete your collection, but your projects will not be deleted." +msgstr "" + +#: website/static/js/myProjects.js:1737 +msgid "Parent projects" +msgstr "" + +#: website/static/js/myProjects.js:1786 +msgid "Create component" +msgstr "" + +#: website/static/js/myProjects.js:1875 +msgid "" +"No contributors to display in this collection. Project administrators can" +" add contributors." +msgstr "" + +#: website/static/js/myProjects.js:1898 +msgid "" +"No tags to display in this collection. Project administrators and write " +"contributors can add tags." +msgstr "" + +#: website/static/js/myProjects.js:1924 +msgid "Contributors " +msgstr "" + +#: website/static/js/myProjects.js:1927 +msgid "Click a contributor's name to see projects that you have in common." +msgstr "" + +#: website/static/js/myProjects.js:1938 website/static/js/myProjects.js:2019 +msgid "Tags" +msgstr "" + +#: website/static/js/myProjects.js:1963 +msgid "Select a row to view project details." +msgstr "" + +#: website/static/js/myProjects.js:1994 +msgid "Information" +msgstr "" + +#: website/static/js/myProjects.js:1998 +msgid "Activity" +msgstr "" + +#: website/static/js/myProjects.js:2005 +msgid "Visibility: " +msgstr "" + +#: website/static/js/myProjects.js:2005 +msgid "Public" +msgstr "" + +#: website/static/js/myProjects.js:2005 +msgid "Private" +msgstr "" + +#: website/static/js/myProjects.js:2007 +msgid "Category: " +msgstr "" + +#: website/static/js/myProjects.js:2011 +msgid "Permission: " +msgstr "" + +#: website/static/js/myProjects.js:2012 +msgid "Last Modified on: " +msgstr "" + +#: website/static/js/myProjects.js:2040 +msgid "Remove selected from collection" +msgstr "" + +#: website/static/js/nodeControl.js:61 +msgid "A request to make this registration public is pending" +msgstr "" + +#: website/static/js/nodeControl.js:102 +msgid "Edit Title" +msgstr "" + +#: website/static/js/nodeControl.js:106 +msgid "Title cannot be blank." +msgstr "" + +#: website/static/js/nodeControl.js:109 +msgid "Title cannot exceed 512 characters." +msgstr "" + +#: website/static/js/nodeControl.js:114 +msgid "component" +msgstr "" + +#: website/static/js/nodeControl.js:117 +msgid "Edit Description" +msgstr "" + +#: website/static/js/nodeControl.js:118 +msgid "Add a brief description to your %1$s" +msgstr "" + +#: website/static/js/nodeControl.js:135 +msgid "Select a category" +msgstr "" + +#: website/static/js/nodeControl.js:175 +msgid "The project could not be removed" +msgstr "" + +#: website/static/js/nodeControl.js:212 +msgid "Create DOI" +msgstr "" + +#: website/static/js/nodeControl.js:214 +msgid "Are you sure you want to create a DOI for this %1$s" +msgstr "" + +#: website/static/js/nodeControl.js:215 +msgid "? A DOI" +msgstr "" + +#: website/static/js/nodeControl.js:216 +msgid " is persistent and will always resolve to this page." +msgstr "" + +#: website/static/js/nodeControl.js:245 +msgid "We could not create the identifier at this time. " +msgstr "" + +#: website/static/js/nodeControl.js:246 +msgid "The DOI acquisition service may be down right now. " +msgstr "" + +#: website/static/js/nodeControl.js:247 +msgid "Please try again soon and/or contact %1$s" +msgstr "" + +#: website/static/js/nodeControl.js:249 +msgid "Could not create doi" +msgstr "" + +#: website/static/js/nodeSelectTreebeard.js:62 +#: website/static/js/notificationsTreebeard.js:62 +#: website/static/js/profile.js:320 +#: website/static/js/wikiSettingsTreebeard.js:57 +msgid "Could not update settings" +msgstr "" + +#: website/static/js/nodeSelectTreebeard.js:81 +#: website/static/js/nodesDeleteTreebeard.js:56 +#: website/static/js/nodesPrivacySettingsTreebeard.js:56 +msgid "checkBox" +msgstr "" + +#: website/static/js/nodesDelete.js:38 +msgid "" +"This %1$s also contains supplemental materials for a " +"preprint. It will" +msgstr "" + +#: website/static/js/nodesDelete.js:39 +msgid " no longer be available to contributors or connected to the preprint." +msgstr "" + +#: website/static/js/nodesDelete.js:43 +msgid "It will no longer be available to other contributors on the project." +msgstr "" + +#: website/static/js/nodesDelete.js:49 +msgid "Are you sure you want to delete this %1$s?" +msgstr "" + +#: website/static/js/nodesDelete.js:80 website/static/js/nodesDelete.js:340 +msgid "Unable to delete %1$s" +msgstr "" + +#: website/static/js/nodesDelete.js:84 website/static/js/nodesDelete.js:344 +msgid "Problem deleting %1$s" +msgstr "" + +#: website/static/js/nodesDelete.js:85 +msgid "Could not delete %$1s" +msgstr "" + +#: website/static/js/nodesDelete.js:116 +msgid "" +"

                            This %1$s also contains supplemental materials for a " +"preprint, and one or more of its %2$s contains " +"supplemental materials for a preprint." +msgstr "" + +#: website/static/js/nodesDelete.js:119 +msgid "" +"

                            This %1$s also contains supplemental materials for a " +"preprint." +msgstr "" + +#: website/static/js/nodesDelete.js:122 +msgid "" +"

                            This %1$s also has one or more %2$s that contain supplemental " +"materials for a preprint." +msgstr "" + +#: website/static/js/nodesDelete.js:150 +msgid "Delete %1$s" +msgstr "" + +#: website/static/js/nodesDelete.js:151 +msgid "Delete %1$s and %2$s" +msgstr "" + +#: website/static/js/nodesDelete.js:156 +msgid "This %1$s contains %2$s." +msgstr "" + +#: website/static/js/nodesDelete.js:156 +msgid " To delete this %1$s, you must also delete all %2$s." +msgstr "" + +#: website/static/js/nodesDelete.js:158 +msgid " The following %1$s and %2$s will be deleted." +msgstr "" + +#: website/static/js/nodesDelete.js:161 +msgid " This action is irreversible." +msgstr "" + +#: website/static/js/nodesDelete.js:167 +msgid "" +"Please note that deleting your %1$s will erase all your %2$s data and " +"this process is IRREVERSIBLE. Deleted %3$s and %4$s will no longer be " +"available to other contributors on the %5$s" +msgstr "" + +#: website/static/js/nodesDelete.js:168 +msgid " and will be disconnected from your preprints." +msgstr "" + +#: website/static/js/nodesDelete.js:168 +msgid "." +msgstr "" + +#: website/static/js/nodesDelete.js:331 +msgid "Your %1$s has been successfully deleted." +msgstr "" + +#: website/static/js/nodesDelete.js:345 +msgid "Could not batch delete project and its components." +msgstr "" + +#: website/static/js/nodesDeleteTreebeard.js:84 +msgid "You must have admin permissions on this component to be able to delete it." +msgstr "" + +#: website/static/js/nodesPrivacy.js:19 +msgid "" +"Please review your projects, components, and add-ons for sensitive or " +"restricted information before making them public." +msgstr "" + +#: website/static/js/nodesPrivacy.js:20 +msgid "" +"

                            Once they are made public, you should assume they will always be " +"public. You can " +msgstr "" + +#: website/static/js/nodesPrivacy.js:21 +msgid "" +"return them to private later, but search engines (including Google’s " +"cache) or others may access files, wiki pages, or analytics before you " +"do." +msgstr "" + +#: website/static/js/nodesPrivacy.js:23 +msgid "" +"
                            • Public forks and registrations of this project will remain " +"public.
                            • " +msgstr "" + +#: website/static/js/nodesPrivacy.js:24 website/static/js/nodesPrivacy.js:27 +msgid "" +"
                            • Search engines (including Google's cache) or others may have accessed" +" files, wiki pages, or analytics while this project was public.
                            " +msgstr "" + +#: website/static/js/nodesPrivacy.js:26 +msgid "" +"
                            • Preprints will remain public.
                            • Public forks and " +"registrations of this project will remain public.
                            • " +msgstr "" + +#: website/static/js/nodesPrivacy.js:28 +msgid "" +"By clicking confirm, an email will be sent to project administrator(s) to" +" approve ending the embargo. If approved, this registration, including " +"any components, will be made public immediately. This action is " +"irreversible." +msgstr "" + +#: website/static/js/nodesPrivacy.js:29 +msgid "End embargo early" +msgstr "" + +#: website/static/js/nodesPrivacy.js:30 +msgid "Adjust your privacy settings by checking the boxes below. " +msgstr "" + +#: website/static/js/nodesPrivacy.js:31 +msgid "" +"

                              Checked projects and components will be public. " +"
                              Unchecked components will be private." +msgstr "" + +#: website/static/js/nodesPrivacy.js:33 +msgid "The following projects and components will be made public." +msgstr "" + +#: website/static/js/nodesPrivacy.js:34 +msgid "The following projects and components will be made private." +msgstr "" + +#: website/static/js/nodesPrivacy.js:35 +msgid "No privacy settings were changed. Go back to make a change." +msgstr "" + +#: website/static/js/nodesPrivacy.js:36 +msgid "" +"You can only change the privacy of 100 projects and components at a time." +" Please go back and limit your selection." +msgstr "" + +#: website/static/js/nodesPrivacy.js:38 +msgid "This project/component contains supplemental materials for a preprint." +msgstr "" + +#: website/static/js/nodesPrivacy.js:39 +msgid "" +"

                              Making this project/component private will prevent others from" +" accessing it.

                              " +msgstr "" + +#: website/static/js/nodesPrivacy.js:155 +msgid "Make %1$s private" +msgstr "" + +#: website/static/js/nodesPrivacy.js:156 +msgid "Warning" +msgstr "" + +#: website/static/js/nodesPrivacy.js:157 +msgid "Change privacy settings" +msgstr "" + +#: website/static/js/nodesPrivacy.js:158 +msgid "Projects and components affected" +msgstr "" + +#: website/static/js/nodesPrivacy.js:247 +msgid "Updating Privacy" +msgstr "" + +#: website/static/js/nodesPrivacy.js:257 +msgid "Unable to update project privacy" +msgstr "" + +#: website/static/js/nodesPrivacy.js:261 +msgid "Problem changing privacy" +msgstr "" + +#: website/static/js/nodesPrivacy.js:262 +msgid "Could not PATCH project settings." +msgstr "" + +#: website/static/js/nodesPrivacy.js:318 +msgid "Submitting request to end embargo early ..." +msgstr "" + +#: website/static/js/nodesPrivacy.js:324 +msgid "Email sent" +msgstr "" + +#: website/static/js/nodesPrivacy.js:325 +msgid "" +"The administrator(s) can approve or cancel the action within 48 hours. If" +" 48 hours pass without any action taken, then the registration will " +"become public." +msgstr "" + +#: website/static/js/notificationsConfig.js:31 +msgid "Could not retrieve settings information." +msgstr "" + +#: website/static/js/notificationsConfig.js:63 +msgid "Could not update email preferences at this time. If this issue persists, " +msgstr "" + +#: website/static/js/notificationsConfig.js:64 +#: website/static/js/osfHelpers.js:316 +msgid "please report it to %1$s." +msgstr "" + +#: website/static/js/notificationsTreebeard.js:68 +#: website/static/js/notificationsTreebeard.js:182 +#: website/static/js/notificationsTreebeard.js:187 +#: website/static/js/notificationsTreebeard.js:230 +msgid "Instantly" +msgstr "" + +#: website/static/js/notificationsTreebeard.js:69 +#: website/static/js/notificationsTreebeard.js:188 +#: website/static/js/notificationsTreebeard.js:231 +msgid "Daily" +msgstr "" + +#: website/static/js/notificationsTreebeard.js:70 +msgid "Adopt setting from parent project" +msgstr "" + +#: website/static/js/notificationsTreebeard.js:71 +#: website/static/js/notificationsTreebeard.js:186 +#: website/static/js/notificationsTreebeard.js:229 +msgid "Never" +msgstr "" + +#: website/static/js/notificationsTreebeard.js:118 +msgid " No configured projects." +msgstr "" + +#: website/static/js/notificationsTreebeard.js:228 +msgid "Adopt setting from parent project %1$s" +msgstr "" + +#: website/static/js/oauthAddonNodeConfig.js:143 +msgid "Choose %1$s Account to Import" +msgstr "" + +#: website/static/js/osfHelpers.js:311 +msgid "Please refresh the page and try again or contact %1$s" +msgstr "" + +#: website/static/js/osfHelpers.js:315 +msgid "GakuNin RDM was unable to resolve your request. If this issue persists, " +msgstr "" + +#: website/static/js/osfHelpers.js:339 +msgid "Unexpected error occurred in JSON request" +msgstr "" + +#: website/static/js/osfHelpers.js:344 +msgid "Unexpected error occurred in an editable input" +msgstr "" + +#: website/static/js/osfHelpers.js:361 +#: website/static/js/privateLinkManager.js:105 +msgid "Please wait" +msgstr "" + +#: website/static/js/osfHelpers.js:800 +#: website/static/js/pages/profile-settings-addons-page.js:32 +#: website/static/js/pages/project-addons-page.js:63 +msgid "Confirm" +msgstr "" + +#: website/static/js/osfHelpers.js:811 +msgid "

                              Type the following to continue: " +msgstr "" + +#: website/static/js/passwordForms.js:23 +msgid "Please enter a more complex password." +msgstr "" + +#: website/static/js/passwordForms.js:117 +#: website/static/js/passwordForms.js:192 +#: website/static/js/passwordForms.js:258 +msgid "Your password cannot be the same as your email address." +msgstr "" + +#: website/static/js/passwordForms.js:132 +msgid "Your new password cannot be the same as your old password." +msgstr "" + +#: website/static/js/passwordForms.js:143 +#: website/static/js/passwordForms.js:203 +msgid "Passwords must match." +msgstr "" + +#: website/static/js/passwordForms.js:230 +msgid "Email addresses must match." +msgstr "" + +#: website/static/js/passwordForms.js:301 +msgid "You have already submitted. You cannot sign up more than once." +msgstr "" + +#: website/static/js/passwordForms.js:322 +msgid "Please complete reCAPTCHA" +msgstr "" + +#: website/static/js/pointers.js:28 +msgid "Search all projects" +msgstr "" + +#: website/static/js/pointers.js:29 +msgid "Search my projects" +msgstr "" + +#: website/static/js/pointers.js:133 +msgid "No results found." +msgstr "" + +#: website/static/js/pointers.js:183 +msgid "Error retrieving nodes" +msgstr "" + +#: website/static/js/pointers.js:328 +msgid "Registered: " +msgstr "" + +#: website/static/js/pointers.js:330 +msgid "Created: " +msgstr "" + +#: website/static/js/pointers.js:330 +msgid "" +"\n" +"Modified: " +msgstr "" + +#: website/static/js/pointers.js:362 +msgid "Could not get links" +msgstr "" + +#: website/static/js/privateLinkManager.js:63 +msgid "Could not retrieve projects." +msgstr "" + +#: website/static/js/privateLinkManager.js:63 +#: website/static/js/privateLinkTable.js:72 +msgid "Please refresh the page or " +msgstr "" + +#: website/static/js/privateLinkManager.js:64 +#: website/static/js/privateLinkTable.js:73 +msgid "contact %1$s" +msgstr "" + +#: website/static/js/privateLinkManager.js:64 +#: website/static/js/privateLinkTable.js:73 +msgid " if the " +msgstr "" + +#: website/static/js/privateLinkManager.js:65 +#: website/static/js/privateLinkTable.js:74 +msgid "problem persists." +msgstr "" + +#: website/static/js/privateLinkTable.js:37 +msgid "Yes" +msgstr "" + +#: website/static/js/privateLinkTable.js:37 +msgid "No" +msgstr "" + +#: website/static/js/privateLinkTable.js:72 +msgid "Could not retrieve view-only links." +msgstr "" + +#: website/static/js/privateLinkTable.js:96 +msgid "Remove view-only link?" +msgstr "" + +#: website/static/js/privateLinkTable.js:97 +msgid "Are you sure you want to remove this view-only link?" +msgstr "" + +#: website/static/js/privateLinkTable.js:109 +msgid "Failed to delete the private link." +msgstr "" + +#: website/static/js/privateLinkTable.js:138 +msgid "Edit Link Name" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "January" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "February" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "March" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "April" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "May" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "June" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "July" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "August" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "September" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "October" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "November" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "December" +msgstr "" + +#: website/static/js/profile.js:112 +msgid "ongoing" +msgstr "" + +#: website/static/js/profile.js:152 +msgid "Please enter a year for the start date." +msgstr "" + +#: website/static/js/profile.js:165 +msgid "Please enter an end date or mark as ongoing." +msgstr "" + +#: website/static/js/profile.js:168 +msgid "Please enter a year for the end date." +msgstr "" + +#: website/static/js/profile.js:265 website/static/js/profile.js:274 +msgid "There are unsaved changes to your settings." +msgstr "" + +#: website/static/js/profile.js:275 +msgid "Please save or discard your changes before switching " +msgstr "" + +#: website/static/js/profile.js:276 +msgid "tabs." +msgstr "" + +#: website/static/js/profile.js:341 +msgid "Could not fetch data" +msgstr "" + +#: website/static/js/profile.js:358 +msgid "Are you sure you want to discard your unsaved changes?" +msgstr "" + +#: website/static/js/profile.js:720 +msgid "Remove website?" +msgstr "" + +#: website/static/js/profile.js:721 +msgid "Are you sure you want to remove this website from your profile?" +msgstr "" + +#: website/static/js/profile.js:728 +msgid "Website removed" +msgstr "" + +#: website/static/js/profile.js:815 +msgid "Please update your website" +msgstr "" + +#: website/static/js/profile.js:953 +msgid "Remove Institution?" +msgstr "" + +#: website/static/js/profile.js:954 +msgid "Are you sure you want to remove this institution?" +msgstr "" + +#: website/static/js/profile.js:963 +msgid "Institution Removed" +msgstr "" + +#: website/static/js/profile.js:1078 +msgid "Institution/Employer required" +msgstr "" + +#: website/static/js/profile.js:1132 +msgid "Institution required" +msgstr "" + +#: website/static/js/components/publicNodes.js:103 +#: website/static/js/project-organizer.js:100 +msgid "A contributor" +msgstr "" + +#: website/static/js/project-organizer.js:197 +msgid "Contributors" +msgstr "" + +#: website/static/js/project-organizer.js:416 +msgid "" +"input.form-control[placeholder=\"Filter displayed " +"projects\"][type=\"text\"]" +msgstr "" + +#: website/static/js/project.js:28 +msgid "

                              Are you sure you want to fork this project?

                              " +msgstr "" + +#: website/static/js/project.js:36 website/static/js/project.js:115 +msgid "Fork" +msgstr "" + +#: website/static/js/project.js:50 +msgid "Fork created successfully!" +msgstr "" + +#: website/static/js/project.js:58 +msgid "Go to new fork" +msgstr "" + +#: website/static/js/project.js:87 +msgid "Your fork is being created. You'll receive an email when it is complete." +msgstr "" + +#: website/static/js/project.js:93 +msgid "Fork this project?" +msgstr "" + +#: website/static/js/project.js:94 +msgid "Are you sure you want to fork this project?" +msgstr "" + +#: website/static/js/project.js:109 +msgid "Could not fork link." +msgstr "" + +#: website/static/js/project.js:126 +msgid "" +"

                              Are you sure you want to create a new project using this project as a" +" template?

                              " +msgstr "" + +#: website/static/js/project.js:127 +msgid "" +"

                              Any add-ons configured for this project will not be authenticated in " +"the new project.

                              " +msgstr "" + +#: website/static/js/project.js:129 +msgid "" +"

                              Are you sure you want to create a new project using this registration" +" as a template?

                              " +msgstr "" + +#: website/static/js/project.js:205 +msgid "
                              Read
                              " +msgstr "" + +#: website/static/js/project.js:206 +msgid "
                              • View project content and comment
                              " +msgstr "" + +#: website/static/js/project.js:207 +msgid "
                              Read + Write
                              " +msgstr "" + +#: website/static/js/project.js:208 +msgid "
                              • Read privileges
                              • " +msgstr "" + +#: website/static/js/project.js:209 +msgid "
                              • Add and configure components
                              • " +msgstr "" + +#: website/static/js/project.js:210 +msgid "
                              • Add and edit content
                              " +msgstr "" + +#: website/static/js/project.js:211 +msgid "
                              Administrator
                                " +msgstr "" + +#: website/static/js/project.js:212 +msgid "
                              • Read and write privileges
                              • " +msgstr "" + +#: website/static/js/project.js:213 +msgid "
                              • Manage contributor
                              • " +msgstr "" + +#: website/static/js/project.js:214 +msgid "" +"
                              • Delete and register project
                              • Public-private " +"settings
                              " +msgstr "" + +#: website/static/js/project.js:223 +msgid "" +"Only bibliographic contributors will be displayed in the Contributors " +"list and in project citations. Non-bibliographic contributors can read " +"and modify the project as normal." +msgstr "" + +#: website/static/js/project.js:238 +msgid "Remove this link?" +msgstr "" + +#: website/static/js/project.js:239 +msgid "" +"Are you sure you want to remove this link? This will not remove the " +"project this link refers to." +msgstr "" + +#: website/static/js/projectSettingsTreebeardBase.js:96 +msgid "Editing Toggle" +msgstr "" + +#: website/static/js/requestAccess.js:17 +msgid "Request access" +msgstr "" + +#: website/static/js/requestAccess.js:27 website/static/js/requestAccess.js:62 +msgid "Access requested" +msgstr "" + +#: website/static/js/requestAccess.js:30 +msgid "Request declined" +msgstr "" + +#: website/static/js/requestAccess.js:67 +msgid "Access request failed. Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/requestAccess.js:70 +msgid "Error requesting project access" +msgstr "" + +#: website/static/js/requestAccess.js:83 +msgid "If this should not have occurred, please contact %1$s." +msgstr "" + +#: website/static/js/saveManager.js:24 +msgid "You have unsaved changes." +msgstr "" + +#: website/static/js/search-grdm.js:150 +msgid "Date Modified (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:151 +msgid "Date Modified (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:152 +msgid "Date Created (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:153 +msgid "Date Created (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:154 +msgid "Project name (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:155 +msgid "Project name (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:156 +msgid "File name (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:157 +msgid "File name (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:158 +msgid "User name (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:159 +msgid "User name (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:160 +msgid "Institution name (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:161 +msgid "Institution name (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:162 +msgid "Wiki title (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:163 +msgid "Wiki title (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:313 website/static/js/search.js:190 +msgid "Page %1$s of %2$s" +msgstr "" + +#: website/static/js/search-grdm.js:393 website/static/js/search.js:270 +msgid "Search help" +msgstr "" + +#: website/static/js/search-grdm.js:394 website/static/js/search.js:271 +msgid "

                              Queries

                              " +msgstr "" + +#: website/static/js/search-grdm.js:395 website/static/js/search.js:272 +msgid "" +"

                              Search uses the Lucene" +" search syntax. " +msgstr "" + +#: website/static/js/search-grdm.js:396 website/static/js/search.js:273 +msgid "This gives you many options, but can be very simple as well. " +msgstr "" + +#: website/static/js/search-grdm.js:397 website/static/js/search.js:274 +msgid "Examples of valid searches include:" +msgstr "" + +#: website/static/js/search-grdm.js:769 website/static/js/search-grdm.js:1067 +#: website/static/js/search.js:578 website/static/js/search.js:605 +msgid "GakuNin RDM | Search" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:26 +msgid "Make publicly editable" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:27 +msgid "" +"Are you sure you want to make the wiki of %1$s publicly editable? " +"This will allow any logged in user to edit the content of this wiki. " +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:28 +msgid "" +"Note: Users without write access will not be able to add, delete, " +"or rename pages." +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:36 +msgid "Apply" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:114 +msgid "Only admins may change permissions of this wiki." +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:116 +msgid "Select who can edit" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:116 +msgid "This feature is disabled for wikis of private %1$ss" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:133 +msgid "Contributors (with write access)" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:134 +msgid "All GakuNin RDM users" +msgstr "" + +#: website/static/js/components/autocomplete.js:84 +msgid "Could not GET autocomplete data" +msgstr "" + +#: website/static/js/components/autocomplete.js:150 +msgid "Initiated by: " +msgstr "" + +#: website/static/js/components/autocomplete.js:156 +msgid "Initiated: " +msgstr "" + +#: website/static/js/components/autocomplete.js:162 +msgid "Last updated: " +msgstr "" + +#: website/static/js/components/publicNodes.js:68 +msgid "Error retrieving projects" +msgstr "" + +#: website/static/js/components/publicNodes.js:120 +msgid " more" +msgstr "" + +#: website/static/js/components/publicNodes.js:152 +msgid "-- private project -- / " +msgstr "" + +#: website/static/js/components/publicNodes.js:190 +msgid "Unable to retrieve public %1$s" +msgstr "" + +#: website/static/js/components/publicNodes.js:190 +msgid " at this time. Please refresh the page or contact " +msgstr "" + +#: website/static/js/components/publicNodes.js:204 +msgid "You have no public %1$s." +msgstr "" + +#: website/static/js/components/publicNodes.js:206 +msgid "Find out how to make your %1$s" +msgstr "" + +#: website/static/js/components/publicNodes.js:207 +msgid "public" +msgstr "" + +#: website/static/js/components/publicNodes.js:211 +msgid "This user has no public %1$s." +msgstr "" + +#: website/static/js/components/quickFiles.js:54 +msgid "Error retrieving quickfiles" +msgstr "" + +#: website/static/js/components/quickFiles.js:121 +msgid "" +"Unable to retrieve quickfiles at this time. Please refresh the page or " +"contact " +msgstr "" + +#: website/static/js/components/quickFiles.js:134 +msgid "You have no public quickfiles" +msgstr "" + +#: website/static/js/components/quickFiles.js:135 +msgid "This user has no public quickfiles." +msgstr "" + +#: website/static/js/components/utils.js:15 +msgid "Missing required option: " +msgstr "" + +#: website/static/js/filepage/editor.js:82 +msgid "The file content could not be loaded." +msgstr "" + +#: website/static/js/filepage/editor.js:83 +msgid "Could not GET file contents." +msgstr "" + +#: website/static/js/filepage/editor.js:113 +msgid "Could not update file. Insufficient storage space in your Dropbox." +msgstr "" + +#: website/static/js/filepage/editor.js:115 +msgid "The file could not be updated." +msgstr "" + +#: website/static/js/filepage/editor.js:122 +msgid "Could not PUT file content." +msgstr "" + +#: website/static/js/filepage/editor.js:178 +msgid "Revert" +msgstr "" + +#: website/static/js/filepage/index.js:89 +msgid "Direct iframe with fixed height and width" +msgstr "" + +#: website/static/js/filepage/index.js:131 +#: website/static/js/filepage/index.js:136 +msgid "File is checked out." +msgstr "" + +#: website/static/js/filepage/index.js:132 +msgid "" +" This file has been checked out by a COS Preregistration Challenge " +"Reviewer and will become available when review is complete." +msgstr "" + +#: website/static/js/filepage/index.js:137 +msgid " This file has been checked out by a " +msgstr "" + +#: website/static/js/filepage/index.js:138 +msgid "collaborator" +msgstr "" + +#: website/static/js/filepage/index.js:139 +msgid ". It needs to be checked in before any changes can be made." +msgstr "" + +#: website/static/js/filepage/index.js:184 +msgid "Delete file?" +msgstr "" + +#: website/static/js/filepage/index.js:186 +msgid "Are you sure you want to delete %1$s?" +msgstr "" + +#: website/static/js/filepage/index.js:204 +msgid "Could not delete file." +msgstr "" + +#: website/static/js/filepage/index.js:220 +msgid "Confirm file check out?" +msgstr "" + +#: website/static/js/filepage/index.js:223 +msgid "as long as it is checked out. You can check it back in at anytime." +msgstr "" + +#: website/static/js/filepage/index.js:243 +msgid "Unable to check out file" +msgstr "" + +#: website/static/js/filepage/index.js:270 +msgid "Unable to check in file" +msgstr "" + +#: website/static/js/filepage/index.js:275 +msgid "Force check in file?" +msgstr "" + +#: website/static/js/filepage/index.js:276 +msgid "" +"This will check in the file for all users, allowing it to be edited. Are " +"you sure?" +msgstr "" + +#: website/static/js/filepage/index.js:279 +#: website/static/js/filepage/index.js:502 +msgid "Force check in" +msgstr "" + +#: website/static/js/filepage/index.js:302 +msgid "Unable to force check in file. Make sure you have admin privileges." +msgstr "" + +#: website/static/js/filepage/index.js:343 +msgid "Live editing mode " +msgstr "" + +#: website/static/js/filepage/index.js:344 +msgid "Attempting to connect " +msgstr "" + +#: website/static/js/filepage/index.js:345 +msgid "Unsupported browser " +msgstr "" + +#: website/static/js/filepage/index.js:346 +msgid "Saving... " +msgstr "" + +#: website/static/js/filepage/index.js:347 +msgid "Unavailable: Live editing " +msgstr "" + +#: website/static/js/filepage/index.js:470 +msgid "View this file on " +msgstr "" + +#: website/static/js/filepage/index.js:505 +msgid "Check out" +msgstr "" + +#: website/static/js/filepage/index.js:508 +msgid "Check in" +msgstr "" + +#: website/static/js/filepage/index.js:514 +msgid "Request Trusted Timestamp" +msgstr "" + +#: website/static/js/filepage/index.js:531 +msgid "Toggle view: " +msgstr "" + +#: website/static/js/filepage/index.js:570 +#: website/static/js/filepage/revisions.js:173 +msgid "Revisions" +msgstr "" + +#: website/static/js/filepage/revisions.js:72 +#: website/static/js/filepage/revisions.js:73 +msgid "Unable to fetch versions" +msgstr "" + +#: website/static/js/filepage/revisions.js:108 +msgid "Version ID" +msgstr "" + +#: website/static/js/filepage/revisions.js:110 +msgid "User" +msgstr "" + +#: website/static/js/filepage/revisions.js:113 +msgid "" +".fa.fa-question-circle[data-content=\"MD5 is an algorithm used to verify " +"data integrity.\"][rel=\"popover\"]" +msgstr "" + +#: website/static/js/filepage/revisions.js:116 +msgid "" +".fa.fa-question-circle[data-content=\"SHA-2 is a cryptographic hash " +"function designed by the NSA used to verify data " +"integrity.\"][rel=\"popover\"]" +msgstr "" + +#: website/static/js/filepage/revisions.js:133 +msgid "Anonymous Contributor" +msgstr "" + +#: website/static/js/filepage/util.js:36 +msgid " Loading... " +msgstr "" + +#: website/static/js/home-page/scheduledBannerPlugin.js:25 +msgid "Error in request to %1$s" +msgstr "" + +#: website/static/js/pages/base-page.js:130 +msgid "Merge account" +msgstr "" + +#: website/static/js/pages/base-page.js:131 +msgid "Would you like to merge %1$s into your account? " +msgstr "" + +#: website/static/js/pages/base-page.js:133 +msgid "%1$s has been merged into your account." +msgstr "" + +#: website/static/js/pages/base-page.js:134 +msgid "You have chosen to not merge %1$s into your account. " +msgstr "" + +#: website/static/js/pages/base-page.js:135 +#: website/static/js/pages/base-page.js:142 +msgid "" +"If you change your mind, visit the user " +"settings page." +msgstr "" + +#: website/static/js/pages/base-page.js:138 +#: website/static/js/pages/base-page.js:188 +msgid "Add email" +msgstr "" + +#: website/static/js/pages/base-page.js:139 +msgid "Would you like to add %1$s to your account?" +msgstr "" + +#: website/static/js/pages/base-page.js:140 +msgid "%1$s has been added into your account." +msgstr "" + +#: website/static/js/pages/base-page.js:141 +msgid "You have chosen not to add %1$s to your account. " +msgstr "" + +#: website/static/js/pages/base-page.js:145 +msgid "There was a problem adding " +msgstr "" + +#: website/static/js/pages/base-page.js:146 +#: website/static/js/pages/base-page.js:149 +msgid ". Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/pages/base-page.js:148 +msgid "There was a problem removing " +msgstr "" + +#: website/static/js/pages/base-page.js:160 +msgid "Do not add email" +msgstr "" + +#: website/static/js/pages/base-page.js:173 +msgid "Could not remove email" +msgstr "" + +#: website/static/js/pages/base-page.js:198 +msgid "Could not add email" +msgstr "" + +#: website/static/js/pages/base-page.js:291 +msgid " and " +msgstr "" + +#: website/static/js/pages/dashboard-page.js:35 +msgid "Could not set user timezone or locale" +msgstr "" + +#: website/static/js/pages/dashboard-page.js:53 +msgid "" +"This is taking longer than normal.
                              Try reloading the page. If the " +"problem persist, please contact us at %1$s" +msgstr "" + +#: website/static/js/pages/file-page.js:21 +msgid "Add a file tag to enhance discoverability" +msgstr "" + +#: website/static/js/pages/file-page.js:23 +#: website/static/js/pages/file-page.js:58 +#: website/static/js/pages/file-page.js:60 +#: website/static/js/pages/project-dashboard-page.js:632 +#: website/static/js/pages/project-dashboard-page.js:716 +#: website/static/js/pages/project-dashboard-page.js:749 +msgid "Removing tag" +msgstr "" + +#: website/static/js/pages/file-page.js:24 +#: website/static/js/pages/project-dashboard-page.js:633 +msgid "Add a tag" +msgstr "" + +#: website/static/js/pages/file-page.js:28 +msgid "Could not add tag." +msgstr "" + +#: website/static/js/pages/file-page.js:29 +#: website/static/js/pages/project-dashboard-page.js:656 +msgid "Failed to add tag" +msgstr "" + +#: website/static/js/pages/file-page.js:43 +msgid "Could not remove tag." +msgstr "" + +#: website/static/js/pages/file-page.js:44 +#: website/static/js/pages/project-dashboard-page.js:692 +msgid "Failed to remove tag" +msgstr "" + +#: website/static/js/pages/file-page.js:90 +msgid "The file title cannot be empty." +msgstr "" + +#: website/static/js/pages/file-page.js:92 +msgid "The file title cannot be more than 100 characters." +msgstr "" + +#: website/static/js/pages/file-page.js:103 +msgid "" +"Your file was successfully renamed. To view the new filename in the file " +"tree below, refresh the page." +msgstr "" + +#: website/static/js/pages/institution-page.js:30 +msgid "All Projects" +msgstr "" + +#: website/static/js/pages/institution-page.js:43 +msgid "" +"This is taking longer than normal.
                              Try reloading the page. If the " +"problem persist, please contact us at %1$s." +msgstr "" + +#: website/static/js/pages/notifications-config-page.js:21 +#: website/static/js/pages/project-settings-page.js:33 +msgid "Could not retrieve notification settings." +msgstr "" + +#: website/static/js/pages/profile-settings-addons-page.js:66 +#: website/static/js/pages/project-addons-page.js:15 +msgid "" +"Sorry, we had trouble saving your settings. If this persists please " +"contact " +msgstr "" + +#: website/static/js/pages/profile-settings-addons-page.js:68 +msgid "Request failed" +msgstr "" + +#: website/static/js/pages/profile-settings-addons-page.js:86 +msgid "Are you sure you want to remove the add-ons you have deselected? " +msgstr "" + +#: website/static/js/pages/profile-settings-addons-page.js:129 +msgid "The changes on addon setting are not submitted!" +msgstr "" + +#: website/static/js/pages/project-addons-page.js:10 +msgid "Your add-on settings have been successfully changed." +msgstr "" + +#: website/static/js/pages/project-addons-page.js:26 +msgid "Disable Add-on?" +msgstr "" + +#: website/static/js/pages/project-addons-page.js:27 +msgid "Are you sure you want to disable this add-on?" +msgstr "" + +#: website/static/js/pages/project-addons-page.js:37 +msgid "Disable" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:117 +msgid "Filter by users" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:118 +msgid "Select from current contributors" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:119 +msgid "Select including past contributors" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:120 +msgid "Include past project contributors in your search" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:121 +msgid "Use dropdown menu" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:417 +msgid "Add Component" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:419 +msgid "Create new component" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:613 +msgid "Error retrieving filebrowser" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:630 +msgid "Add a project tag to enhance discoverability" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:691 +msgid "Could not remove tag" +msgstr "" + +#: website/static/js/pages/project-settings-page.js:34 +msgid "Could not GET notification settings." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:54 +msgid "Could not retrieve wiki settings." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:55 +msgid "Could not GET wiki settings." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:104 +msgid "Successfully updated settings." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:115 +msgid "Could not set commenting configuration. Please try again." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:151 +msgid "Unable to update settings" +msgstr "" + +#: website/static/js/pages/project-settings-page.js:152 +msgid "Could not update settings." +msgstr "" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:31 +msgid "Import Account from Admin" +msgstr "" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:52 +#: website/static/js/pages/rdm-profile-settings-addons-page.js:54 +msgid "Successfully imported the account." +msgstr "" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:59 +#: website/static/js/pages/rdm-profile-settings-addons-page.js:61 +msgid "Failed to import the account." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:172 +msgid "A verify request is being processed!" +msgstr "" + +#: website/static/js/pages/timestamp-common.js:175 +msgid "Something went wrong with the Verify request." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:191 +msgid "Using the checkbox, please select the files to request timestamp." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:214 +msgid "Timestamp is being added to the selected files!" +msgstr "" + +#: website/static/js/pages/timestamp-common.js:217 +msgid "Something went wrong with the Request Trusted Timestamp request." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:222 +msgid "The task has been cancelled." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:231 +msgid "The task already finished." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:234 +msgid "Something went wrong in the cancel request." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:288 +msgid "Using the checkbox, please select the files to download." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:323 +msgid "Failed to log \"downloaded errors\" into Recent Activity" +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:64 +msgid "The wiki page name cannot be empty." +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:66 +msgid "The wiki page name cannot be more than 100 characters." +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:81 +msgid "Error in renaming wiki" +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:88 +msgid "An unexpected error occurred. Please try again." +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:108 +msgid "

                              Could not retrieve wiki pages. If this issue persists, " +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:109 +msgid "please report it to %1$s" +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:110 +msgid "Could not GET wiki menu pages" +msgstr "" + +#~ msgid "${user}updated file ${path} in Dropbox in ${node}" +#~ msgstr "" + +#~ msgid "${user}updated file ${path} in Dropbox Business in ${node}" +#~ msgstr "" + +#: addons/myscreen/static/widget-cfg.js:22 +msgid "My Screen Param1 Label" +msgstr "" diff --git a/site/guides/screen-expansion/osf.io/website/translations/en/LC_MESSAGES/messages.po b/site/guides/screen-expansion/osf.io/website/translations/en/LC_MESSAGES/messages.po new file mode 100644 index 0000000..6bce498 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/website/translations/en/LC_MESSAGES/messages.po @@ -0,0 +1,3778 @@ +# English translations for . +# Copyright (C) 2020 ORGANIZATION +# This file is distributed under the same license as the project. +# FIRST AUTHOR , 2020. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: 0.6.0\n" +"Report-Msgid-Bugs-To: rocs-office@nii.ac.jp\n" +"POT-Creation-Date: 2020-07-02 20:20+0900\n" +"PO-Revision-Date: 2020-07-02 20:20+0900\n" +"Last-Translator: Takuya Ishibashi\n" +"Language: en\n" +"Language-Team: RCOS \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.7.0\n" + +#: addons/azureblobstorage/templates/azureblobstorage_credentials_modal.mako:6 +msgid "Connect an Azure Blob Storage Account" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_credentials_modal.mako:17 +msgid "Account Name" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_credentials_modal.mako:21 +msgid "Account Key" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_credentials_modal.mako:36 +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:77 +#: addons/dataverse/templates/dataverse_credentials_modal.mako:75 +#: addons/gitlab/templates/gitlab_credentials_modal.mako:55 +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:99 +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:71 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:72 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:71 +#: addons/owncloud/templates/owncloud_node_settings.mako:72 +#: addons/s3/templates/s3_credentials_modal.mako:36 +#: addons/s3/templates/s3_node_settings.mako:77 +#: addons/s3compat/templates/s3compat_credentials_modal.mako:40 +#: addons/s3compat/templates/s3compat_node_settings.mako:77 +#: addons/swift/templates/swift_credentials_modal.mako:56 +#: addons/swift/templates/swift_node_settings.mako:77 +#: addons/weko/templates/weko_credentials_modal.mako:57 +#: addons/wiki/templates/add_wiki_page.mako:17 +#: addons/wiki/templates/delete_wiki_page.mako:13 +#: addons/zotero/templates/zotero_node_settings.mako:83 +#: addons/zotero/templates/zotero_node_settings.mako:127 +#: website/templates/include/comment_pane_template.mako:32 +#: website/templates/include/comment_template.mako:91 +#: website/templates/include/comment_template.mako:141 +#: website/templates/include/comment_template.mako:148 +#: website/templates/include/comment_template.mako:170 +#: website/templates/profile/oauth_app_detail.mako:84 +#: website/templates/profile/personal_tokens_detail.mako:49 +#: website/templates/project/addon/node_settings_default.mako:72 +#: website/templates/project/modal_add_contributor.mako:340 +#: website/templates/project/modal_generate_private_link.mako:86 +#: website/templates/project/modal_remove_contributor.mako:95 +#: website/templates/project/modal_remove_contributor.mako:104 +#: website/templates/project/modal_remove_contributor.mako:113 +#: website/templates/project/modal_remove_contributor.mako:122 +#: website/templates/project/nodes_delete.mako:89 +#: website/templates/project/nodes_privacy.mako:104 +#: website/templates/project/project.mako:568 +#: website/templates/project/settings.mako:131 +#: website/templates/project/timestamp.mako:71 +#: website/templates/util/render_addon_widget.mako:98 +msgid "Cancel" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_credentials_modal.mako:39 +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:79 +#: addons/dataverse/templates/dataverse_credentials_modal.mako:78 +#: addons/dataverse/templates/dataverse_node_settings.mako:118 +#: addons/forward/templates/forward_node_settings.mako:36 +#: addons/github/templates/github_node_settings.mako:54 +#: addons/gitlab/templates/gitlab_credentials_modal.mako:57 +#: addons/gitlab/templates/gitlab_node_settings.mako:64 +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:18 +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:74 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:74 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:74 +#: addons/owncloud/templates/owncloud_node_settings.mako:74 +#: addons/s3/templates/s3_credentials_modal.mako:39 +#: addons/s3/templates/s3_node_settings.mako:79 +#: addons/s3compat/templates/s3compat_credentials_modal.mako:43 +#: addons/s3compat/templates/s3compat_node_settings.mako:79 +#: addons/swift/templates/swift_credentials_modal.mako:59 +#: addons/swift/templates/swift_node_settings.mako:79 +#: addons/weko/templates/weko_node_settings.mako:83 +#: addons/wiki/templates/edit.mako:189 +#: addons/zotero/templates/zotero_node_settings.mako:85 +#: addons/zotero/templates/zotero_node_settings.mako:129 +#: website/templates/claim_account.mako:112 +#: website/templates/include/comment_template.mako:93 +#: website/templates/include/profile/jobs.mako:117 +#: website/templates/include/profile/jobs.mako:120 +#: website/templates/include/profile/names.mako:76 +#: website/templates/include/profile/names.mako:79 +#: website/templates/include/profile/schools.mako:117 +#: website/templates/include/profile/schools.mako:120 +#: website/templates/include/profile/social.mako:143 +#: website/templates/include/profile/social.mako:146 +#: website/templates/profile/oauth_app_detail.mako:88 +#: website/templates/profile/personal_tokens_detail.mako:55 +#: website/templates/project/addon/node_settings_default.mako:74 +#: website/templates/project/addon/user_settings.mako:13 +#: website/templates/project/project.mako:570 +#: website/templates/project/settings.mako:338 +msgid "Save" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:14 +#: addons/azureblobstorage/templates/azureblobstorage_user_settings.mako:18 +#: addons/bitbucket/templates/bitbucket_node_settings.mako:15 +#: addons/dataverse/templates/dataverse_node_settings.mako:15 +#: addons/dataverse/templates/dataverse_user_settings.mako:18 +#: addons/github/templates/github_node_settings.mako:15 +#: addons/gitlab/templates/gitlab_node_settings.mako:18 +#: addons/gitlab/templates/gitlab_user_settings.mako:18 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:15 +#: addons/nextcloud/templates/nextcloud_user_settings.mako:18 +#: addons/owncloud/templates/owncloud_node_settings.mako:15 +#: addons/owncloud/templates/owncloud_user_settings.mako:18 +#: addons/s3/templates/s3_node_settings.mako:14 +#: addons/s3/templates/s3_user_settings.mako:18 +#: addons/s3compat/templates/s3compat_node_settings.mako:14 +#: addons/s3compat/templates/s3compat_user_settings.mako:18 +#: addons/swift/templates/swift_node_settings.mako:14 +#: addons/swift/templates/swift_user_settings.mako:18 +#: addons/weko/templates/weko_node_settings.mako:15 +#: addons/weko/templates/weko_user_settings.mako:18 +#: addons/zotero/templates/zotero_node_settings.mako:10 +#: website/templates/profile/user_settings_default.mako:14 +#: website/templates/project/addon/node_settings_default.mako:10 +msgid "Disconnect Account" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:21 +#: addons/bitbucket/templates/bitbucket_node_settings.mako:21 +#: addons/dataverse/templates/dataverse_node_settings.mako:22 +#: addons/github/templates/github_node_settings.mako:21 +#: addons/gitlab/templates/gitlab_node_settings.mako:24 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:22 +#: addons/owncloud/templates/owncloud_node_settings.mako:22 +#: addons/s3/templates/s3_node_settings.mako:21 +#: addons/s3compat/templates/s3compat_node_settings.mako:21 +#: addons/swift/templates/swift_node_settings.mako:21 +#: addons/weko/templates/weko_node_settings.mako:22 +#: addons/zotero/templates/zotero_node_settings.mako:17 +#: website/templates/project/addon/node_settings_default.mako:17 +msgid "Import Account from Profile" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:28 +#: addons/s3/templates/s3_node_settings.mako:28 +#: addons/s3compat/templates/s3compat_node_settings.mako:28 +#: addons/swift/templates/swift_node_settings.mako:28 +#: addons/zotero/templates/zotero_node_settings.mako:24 +#: website/templates/project/addon/node_settings_default.mako:24 +msgid "Loading ..." +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:35 +#: addons/dataverse/templates/dataverse_node_settings.mako:29 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:29 +#: addons/owncloud/templates/owncloud_node_settings.mako:29 +#: addons/s3/templates/s3_node_settings.mako:35 +#: addons/s3compat/templates/s3compat_node_settings.mako:35 +#: addons/swift/templates/swift_node_settings.mako:35 +#: addons/weko/templates/weko_node_settings.mako:29 +msgid "Connect Account" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:50 +#: addons/bitbucket/templates/bitbucket_node_settings.mako:65 +#: addons/github/templates/github_node_settings.mako:62 +#: addons/gitlab/templates/gitlab_node_settings.mako:71 +#: addons/owncloud/templates/owncloud_node_settings.mako:47 +#: addons/s3/templates/s3_node_settings.mako:50 +#: addons/s3compat/templates/s3compat_node_settings.mako:50 +#: addons/swift/templates/swift_node_settings.mako:50 +#: addons/weko/templates/weko_node_settings.mako:49 +#: addons/zotero/templates/zotero_node_settings.mako:46 +#: addons/zotero/templates/zotero_node_settings.mako:101 +#: website/templates/project/addon/node_settings_default.mako:46 +#: website/templates/project/project.mako:202 +msgid "None" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:58 +#: addons/swift/templates/swift_node_settings.mako:58 +msgid "Create container" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:63 +#: addons/swift/templates/swift_node_settings.mako:63 +msgid "Loading containers..." +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:72 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:67 +#: addons/owncloud/templates/owncloud_node_settings.mako:67 +#: addons/s3/templates/s3_node_settings.mako:72 +#: addons/s3compat/templates/s3compat_node_settings.mako:72 +#: addons/swift/templates/swift_node_settings.mako:72 +#: addons/zotero/templates/zotero_node_settings.mako:122 +#: website/templates/project/addon/node_settings_default.mako:67 +#, python-format +msgid "Connect %(folderName)s?" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_user_settings.mako:12 +#: addons/dataverse/templates/dataverse_user_settings.mako:12 +#: addons/gitlab/templates/gitlab_user_settings.mako:12 +#: addons/nextcloud/templates/nextcloud_user_settings.mako:12 +#: addons/owncloud/templates/owncloud_user_settings.mako:12 +#: addons/s3/templates/s3_user_settings.mako:12 +#: addons/s3compat/templates/s3compat_user_settings.mako:12 +#: addons/swift/templates/swift_user_settings.mako:12 +#: addons/weko/templates/weko_user_settings.mako:12 +#: website/templates/profile/user_settings_default.mako:9 +msgid "Connect or Reauthorize Account" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_user_settings.mako:24 +#, python-format +msgid "Authorized by %(userName)s" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_user_settings.mako:32 +#: addons/dataverse/templates/dataverse_user_settings.mako:31 +#: addons/gitlab/templates/gitlab_user_settings.mako:31 +#: addons/nextcloud/templates/nextcloud_user_settings.mako:31 +#: addons/owncloud/templates/owncloud_user_settings.mako:31 +#: addons/s3/templates/s3_user_settings.mako:32 +#: addons/s3compat/templates/s3compat_user_settings.mako:32 +#: addons/swift/templates/swift_user_settings.mako:32 +#: addons/weko/templates/weko_user_settings.mako:31 +#: website/templates/profile/user_settings_default.mako:28 +msgid "Private project" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_user_settings.mako:36 +#: addons/s3/templates/s3_user_settings.mako:36 +#: addons/s3compat/templates/s3compat_user_settings.mako:36 +#: addons/swift/templates/swift_user_settings.mako:36 +#: addons/weko/templates/weko_user_settings.mako:35 +#: website/templates/profile/user_settings_default.mako:32 +msgid "disconnect Project" +msgstr "" + +#: addons/base/models.py:461 +msgid "" +"Because you have not configured the {addon} add-on, your authentication " +"will not be transferred to the forked {category}. You may authorize and " +"configure the {addon} add-on in the new fork on the settings page." +msgstr "" + +#: addons/base/models.py:469 +msgid "" +"Because you have authorized the {addon} add-on for this {category}, " +"forking it will also transfer your authentication to the forked " +"{category}." +msgstr "" + +#: addons/base/models.py:476 +msgid "" +"Because the {addon} add-on has been authorized by a different user, " +"forking it will not transfer authentication to the forked {category}. You" +" may authorize and configure the {addon} add-on in the new fork on the " +"settings page." +msgstr "" + +#: addons/bitbucket/templates/bitbucket_node_settings.mako:25 +#: addons/github/templates/github_node_settings.mako:25 +#: addons/gitlab/templates/gitlab_node_settings.mako:28 +#: addons/zotero/templates/zotero_node_settings.mako:31 +#: website/templates/project/addon/node_settings_default.mako:31 +msgid "Connect Account" +msgstr "" + +#: addons/bitbucket/templates/bitbucket_node_settings.mako:74 +#: addons/github/templates/github_node_settings.mako:71 +#, python-format +msgid "" +"Could not retrieve %(addonName)s settings at this time. The %(addonName)s" +" addon credentials may no longer be valid. Try " +"deauthorizing and reauthorizing %(addonName)s on your account settings page." +msgstr "" + +#: addons/bitbucket/templates/bitbucket_node_settings.mako:78 +#: addons/github/templates/github_node_settings.mako:75 +#, python-format +msgid "" +"Could not retrieve %(addonName)s settings at this time. The %(addonName)s" +" addon credentials may no longer be valid. Contact " +"%(authOsfName)s to verify." +msgstr "" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:6 +msgid "Connect a Dataverse Account" +msgstr "" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:18 +msgid "Dataverse Repository" +msgstr "" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:22 +msgid "Select a Dataverse repository" +msgstr "" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:35 +msgid "Only Dataverse repositories v4.0 or higher are supported." +msgstr "" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:46 +msgid "API Token" +msgstr "" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:50 +#, python-format +msgid "(Get from Dataverse %(dataverseLink)s)" +msgstr "" + +#: addons/dataverse/templates/dataverse_node_settings.mako:43 +msgid "Dataverse Repository:" +msgstr "" + +#: addons/dataverse/templates/dataverse_node_settings.mako:49 +msgid "Current Dataset:" +msgstr "" + +#: addons/dataverse/templates/dataverse_node_settings.mako:65 +msgid "The current dataset was not found on Dataverse." +msgstr "" + +#: addons/dataverse/templates/dataverse_node_settings.mako:74 +msgid "Dataverse:" +msgstr "" + +#: addons/dataverse/templates/dataverse_node_settings.mako:86 +msgid "Dataset:" +msgstr "" + +#: addons/dataverse/templates/dataverse_node_settings.mako:97 +msgid "No datasets available." +msgstr "" + +#: addons/dataverse/templates/dataverse_node_settings.mako:103 +msgid "Retrieving datasets..." +msgstr "" + +#: addons/dataverse/templates/dataverse_node_settings.mako:110 +msgid "" +"There are no dataverses, datasets, or files associated with the connected" +" account." +msgstr "" + +#: addons/dataverse/templates/dataverse_user_settings.mako:23 +#: addons/gitlab/templates/gitlab_user_settings.mako:23 +#, python-format +msgid "Authorized on %(addonHost)s" +msgstr "" + +#: addons/forward/templates/forward_node_settings.mako:14 +msgid "Send people who visit your GakuNin RDM project page to this link instead" +msgstr "" + +#: addons/forward/templates/forward_node_settings.mako:19 +msgid "Label" +msgstr "" + +#: addons/forward/templates/forward_node_settings.mako:24 +#: website/templates/profile/oauth_app_detail.mako:67 +#: website/templates/project/settings.mako:108 +msgid "Optional" +msgstr "" + +#: addons/github/templates/github_node_settings.mako:38 +#: addons/gitlab/templates/gitlab_node_settings.mako:42 +msgid "Current Repo: " +msgstr "" + +#: addons/github/templates/github_node_settings.mako:56 +msgid "Create Repo" +msgstr "" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:4 +msgid "Connect a GitLab Account" +msgstr "" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:11 +msgid "GitLab Repository" +msgstr "" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:14 +msgid "Select a GitLab repository" +msgstr "" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:27 +msgid "Only GitLab repositories v4.0 or higher are supported." +msgstr "" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:37 +msgid "Personal Access Token" +msgstr "" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:41 +#, python-format +msgid "(Get from GitLab %(externalLinkIcon)s)" +msgstr "" + +#: addons/gitlab/templates/gitlab_node_settings.mako:9 +msgid "GitLab" +msgstr "" + +#: addons/gitlab/templates/gitlab_node_settings.mako:12 +msgid "authorized by" +msgstr "" + +#: addons/gitlab/templates/gitlab_node_settings.mako:80 +#, python-format +msgid "" +"Could not retrieve %(addonName)s settings at this time. The %(addonName)s" +" addon credentials may no longer be valid. Try " +"deauthorizing and reauthorizing %(addonName)s on your " +"account settings page." +msgstr "" + +#: addons/gitlab/templates/gitlab_node_settings.mako:84 +#, python-format +msgid "" +"Could not retrieve %(addonName)s settings at this time. The %(addonName)s" +" addon credentials may no longer be valid. Contact " +"%(authOsfName)s to verify." +msgstr "" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:13 +#: addons/wiki/templates/edit.mako:34 +msgid "New" +msgstr "" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:31 +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:80 +msgid "Service Name" +msgstr "" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:32 +msgid "Base URL" +msgstr "" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:56 +msgid "No JupyterHubs" +msgstr "" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:69 +msgid "Link JupyterHub" +msgstr "" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:84 +msgid "Service Base URL" +msgstr "" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:102 +msgid "OK" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:6 +msgid "Connect an Nextcloud Account" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:17 +msgid "Nextcloud Instance" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:21 +msgid "Select an Nextcloud Instance" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:30 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:30 +msgid "Host URL" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:36 +#, python-format +msgid "" +"Only Nextcloud instances supporting WebDAV and OCS v1.7 are " +"supported." +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:46 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:46 +#: addons/swift/templates/swift_credentials_modal.mako:33 +msgid "Username" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:48 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:48 +#: website/templates/include/profile/social.mako:66 +msgid "username" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:50 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:50 +#: addons/swift/templates/swift_credentials_modal.mako:41 +msgid "Password" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:55 +#, python-format +msgid "" +"These credentials will be encrypted. However, we strongly " +"encourage using a Device (or App) " +"Password." +msgstr "" + +#: addons/nextcloud/templates/nextcloud_node_settings.mako:53 +#: addons/owncloud/templates/owncloud_node_settings.mako:53 +msgid "Change" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_node_settings.mako:58 +#: addons/owncloud/templates/owncloud_node_settings.mako:58 +#: addons/zotero/templates/zotero_node_settings.mako:113 +#: website/templates/project/addon/node_settings_default.mako:58 +msgid "Loading folders..." +msgstr "" + +#: addons/nextcloud/templates/nextcloud_user_settings.mako:23 +#: addons/owncloud/templates/owncloud_user_settings.mako:23 +#, python-format +msgid "Authorized by %(userName)s on %(profilePage)s" +msgstr "" + +#: addons/owncloud/templates/owncloud_credentials_modal.mako:6 +msgid "Connect an ownCloud Account" +msgstr "" + +#: addons/owncloud/templates/owncloud_credentials_modal.mako:17 +msgid "ownCloud Instance" +msgstr "" + +#: addons/owncloud/templates/owncloud_credentials_modal.mako:21 +msgid "Select an ownCloud Instance" +msgstr "" + +#: addons/owncloud/templates/owncloud_credentials_modal.mako:36 +#, python-format +msgid "" +"Only ownCloud instances supporting WebDAV and OCS v1.7 are " +"supported." +msgstr "" + +#: addons/owncloud/templates/owncloud_credentials_modal.mako:55 +#, python-format +msgid "" +" These credentials will be encrypted. However, we strongly " +"encourage using a Device (or App) " +"Password." +msgstr "" + +#: addons/owncloud/templates/owncloud_node_settings.mako:42 +#: website/templates/project/addon/node_settings_default.mako:41 +msgid "Current Folder:" +msgstr "" + +#: addons/s3/templates/s3_credentials_modal.mako:6 +msgid "Connect an Amazon S3 Account" +msgstr "" + +#: addons/s3/templates/s3_credentials_modal.mako:17 +#: addons/s3compat/templates/s3compat_credentials_modal.mako:21 +msgid "Access Key" +msgstr "" + +#: addons/s3/templates/s3_credentials_modal.mako:21 +#: addons/s3compat/templates/s3compat_credentials_modal.mako:25 +msgid "Secret Key" +msgstr "" + +#: addons/s3/templates/s3_node_settings.mako:58 +#: addons/s3compat/templates/s3compat_node_settings.mako:58 +msgid "Create bucket" +msgstr "" + +#: addons/s3/templates/s3_node_settings.mako:63 +msgid "Loading buckets..." +msgstr "" + +#: addons/s3/templates/s3_user_settings.mako:24 +#: addons/s3compat/templates/s3compat_user_settings.mako:24 +#: addons/swift/templates/swift_user_settings.mako:24 +#: addons/weko/templates/weko_user_settings.mako:23 +#: website/templates/profile/user_settings_default.mako:20 +msgid "Authorized by " +msgstr "" + +#: addons/s3compat/templates/s3compat_credentials_modal.mako:6 +msgid "Connect an S3 Compatible Storage Account" +msgstr "" + +#: addons/s3compat/templates/s3compat_credentials_modal.mako:17 +msgid "S3 Compatible Service" +msgstr "" + +#: addons/s3compat/templates/s3compat_node_settings.mako:45 +msgid "Current Bucket:" +msgstr "" + +#: addons/swift/templates/swift_credentials_modal.mako:6 +msgid "Connect an OpenStack Swift Account" +msgstr "" + +#: addons/swift/templates/swift_credentials_modal.mako:17 +msgid "Authentication(Keystone) Version" +msgstr "" + +#: addons/swift/templates/swift_credentials_modal.mako:21 +msgid "Authentication URL" +msgstr "" + +#: addons/swift/templates/swift_credentials_modal.mako:25 +msgid "Tenant name" +msgstr "" + +#: addons/swift/templates/swift_credentials_modal.mako:29 +msgid "Project Domain name" +msgstr "" + +#: addons/swift/templates/swift_credentials_modal.mako:37 +msgid "User Domain name" +msgstr "" + +#: addons/swift/templates/swift_node_settings.mako:45 +msgid "Current Container:" +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:3 +msgid "Two-factor Authentication" +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:7 +msgid "Disable Two-Factor Authentication" +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:12 +msgid "Enable Two-Factor Authentication" +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:19 +msgid "" +"By using two-factor authentication, you'll protect your GakuNin RDM " +"account with both your password and your mobile phone." +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:22 +msgid "Important: " +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:22 +msgid "" +" If you lose access to your mobile device, you will not be able to log in" +" to your GakuNin RDM account." +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:24 +#, python-format +msgid "" +"To use, you must install an appropriate application on your mobile " +"device. Google Authenticator is a popular choice and is available for " +"both Android and iOS." +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:26 +msgid "" +"Once verified, your device will display a six-digit code that must be " +"entered during the login process. This code changes every few seconds, " +"which means that unauthorized users will not be able to log in to you " +"account, even if they know your password." +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:28 +#, python-format +msgid "" +"Scan the image below, or enter the secret key %(secretKey)s into " +"your authentication device." +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:34 +msgid "Enter your verification code:" +msgstr "" + +#: addons/weko/templates/weko_credentials_modal.mako:6 +msgid "Connect a WEKO Account" +msgstr "" + +#: addons/weko/templates/weko_credentials_modal.mako:18 +msgid "WEKO Repository" +msgstr "" + +#: addons/weko/templates/weko_credentials_modal.mako:22 +msgid "Select a WEKO repository" +msgstr "" + +#: addons/weko/templates/weko_credentials_modal.mako:33 +msgid "WEKO SWORD URL" +msgstr "" + +#: addons/weko/templates/weko_credentials_modal.mako:37 +msgid "WEKO Username" +msgstr "" + +#: addons/weko/templates/weko_credentials_modal.mako:41 +msgid "WEKO Password" +msgstr "" + +#: addons/weko/templates/weko_credentials_modal.mako:60 +msgid "Connect" +msgstr "" + +#: addons/weko/templates/weko_node_settings.mako:43 +msgid "Current Index:" +msgstr "" + +#: addons/weko/templates/weko_node_settings.mako:63 +msgid "Index:" +msgstr "" + +#: addons/weko/templates/weko_node_settings.mako:75 +msgid "There are no indices associated with the connected account." +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:8 +msgid "Add new wiki page" +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:12 +msgid "New Wiki Name" +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:18 +#: addons/wiki/templates/add_wiki_page.mako:44 +#: addons/wiki/templates/add_wiki_page.mako:49 +#: addons/wiki/templates/add_wiki_page.mako:55 +#: addons/wiki/templates/add_wiki_page.mako:94 +#: website/templates/project/contributors.mako:57 +#: website/templates/project/contributors.mako:164 +#: website/templates/project/contributors.mako:337 +#: website/templates/project/contributors.mako:385 +#: website/templates/project/modal_add_contributor.mako:346 +#: website/templates/project/modal_add_contributor.mako:350 +#: website/templates/project/modal_add_contributor.mako:356 +#: website/templates/project/settings.mako:209 +#: website/templates/project/settings.mako:522 +msgid "Add" +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:38 +msgid "Creating new wiki page" +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:41 +msgid "The new wiki page name cannot be empty" +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:46 +msgid "The new wiki page name cannot be more than 100 characters." +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:52 +msgid "The new wiki page name cannot contain forward slashes." +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:70 +msgid "A wiki page with that name already exists." +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:73 +msgid "You do not have permission to perform this action." +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:74 +msgid "Unauthorized user can view wiki add button" +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:83 +msgid "Could not validate wiki page. Please try again." +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:84 +msgid "Error occurred while validating page" +msgstr "" + +#: addons/wiki/templates/delete_wiki_page.mako:7 +msgid "Delete wiki page" +msgstr "" + +#: addons/wiki/templates/delete_wiki_page.mako:10 +msgid "Are you sure you want to delete this wiki page?" +msgstr "" + +#: addons/wiki/templates/delete_wiki_page.mako:14 +#: addons/wiki/templates/edit.mako:38 +#: website/templates/include/comment_template.mako:149 +#: website/templates/profile/personal_tokens_detail.mako:53 +#: website/templates/project/nodes_delete.mako:91 +#: website/templates/util/render_node.mako:74 +msgid "Delete" +msgstr "" + +#: addons/wiki/templates/edit.mako:2 +#: website/templates/include/comment_pane_template.mako:19 +#: website/templates/project/settings.mako:36 +#: website/templates/project/settings.mako:257 +#: website/templates/search.mako:278 website/templates/search.mako:370 +#: website/templates/search_grdm.mako:405 +#: website/templates/search_grdm.mako:581 +msgid "Wiki" +msgstr "" + +#: addons/wiki/templates/edit.mako:42 +msgid "Menu" +msgstr "" + +#: addons/wiki/templates/edit.mako:53 +msgid "Loading wiki pages..." +msgstr "" + +#: addons/wiki/templates/edit.mako:75 addons/wiki/templates/edit.mako:82 +msgid "View" +msgstr "" + +#: addons/wiki/templates/edit.mako:88 +msgid "Wiki Version:" +msgstr "" + +#: addons/wiki/templates/edit.mako:92 +msgid "Preview" +msgstr "" + +#: addons/wiki/templates/edit.mako:95 addons/wiki/templates/edit.mako:218 +msgid "(Current)" +msgstr "" + +#: addons/wiki/templates/edit.mako:97 addons/wiki/templates/edit.mako:220 +msgid "Current" +msgstr "" + +#: addons/wiki/templates/edit.mako:117 +#: website/templates/util/render_addon_widget.mako:24 +msgid "Add important information, links, or images here to describe your project." +msgstr "" + +#: addons/wiki/templates/edit.mako:126 addons/wiki/templates/edit.mako:134 +#: website/templates/include/profile/schools.mako:180 +#: website/templates/include/profile/social.mako:184 +#: website/templates/project/project.mako:539 +msgid "Edit" +msgstr "" + +#: addons/wiki/templates/edit.mako:174 +msgid "Loading. . ." +msgstr "" + +#: addons/wiki/templates/edit.mako:186 +msgid "Revert" +msgstr "" + +#: addons/wiki/templates/edit.mako:205 addons/wiki/templates/edit.mako:212 +msgid "Compare" +msgstr "" + +#: addons/wiki/templates/edit.mako:215 +msgid " to" +msgstr "" + +#: addons/wiki/templates/edit.mako:257 +msgid "Page permissions have changed" +msgstr "" + +#: addons/wiki/templates/edit.mako:260 +msgid "Your browser should refresh shortly" +msgstr "" + +#: addons/wiki/templates/edit.mako:273 +msgid "Renaming wiki..." +msgstr "" + +#: addons/wiki/templates/edit.mako:283 +msgid "Wiki page deleted" +msgstr "" + +#: addons/wiki/templates/edit.mako:286 +msgid "Press Confirm to return to the project wiki home page." +msgstr "" + +#: addons/wiki/templates/edit.mako:289 +msgid "Confirm" +msgstr "" + +#: addons/wiki/templates/edit.mako:300 +msgid "Connected to the collaborative wiki" +msgstr "" + +#: addons/wiki/templates/edit.mako:304 +msgid "" +"This page is currently connected to the collaborative wiki. All edits " +"made will be visible to contributors with write permission in " +"real time. Changes will be stored but not published until you " +"click the \"Save\" button." +msgstr "" + +#: addons/wiki/templates/edit.mako:310 +#: addons/wiki/templates/wiki-bar-modal-help.mako:14 +#: website/templates/profile/modal_change_avatar.mako:20 +#: website/templates/project/view_file.mako:117 +#: website/templates/project/view_file.mako:137 +#: website/templates/project/view_file.mako:157 +#: website/templates/project/view_file.mako:177 +#: website/templates/search_bar_help_modal.mako:18 +msgid "Close" +msgstr "" + +#: addons/wiki/templates/edit.mako:321 +msgid "Connecting to the collaborative wiki" +msgstr "" + +#: addons/wiki/templates/edit.mako:325 +msgid "" +"This page is currently attempting to connect to the collaborative wiki. " +"You may continue to make edits." +msgstr "" + +#: addons/wiki/templates/edit.mako:326 addons/wiki/templates/edit.mako:343 +#: addons/wiki/templates/edit.mako:360 +#: website/templates/project/view_file.mako:133 +#: website/templates/project/view_file.mako:153 +#: website/templates/project/view_file.mako:173 +msgid "Changes will not be saved until you press the \"Save\" button." +msgstr "" + +#: addons/wiki/templates/edit.mako:338 +msgid "Collaborative wiki is unavailable" +msgstr "" + +#: addons/wiki/templates/edit.mako:342 +msgid "" +"The collaborative wiki is currently unavailable. You may continue to make" +" edits." +msgstr "" + +#: addons/wiki/templates/edit.mako:355 +#: website/templates/project/view_file.mako:168 +msgid "Browser unsupported" +msgstr "" + +#: addons/wiki/templates/edit.mako:359 +#: website/templates/project/view_file.mako:172 +msgid "" +"Your browser does not support collaborative editing. You may continue to " +"make edits." +msgstr "" + +#: addons/wiki/templates/status.mako:7 +msgid "Note: Home page cannot be renamed." +msgstr "" + +#: addons/wiki/templates/status.mako:9 +msgid "Home" +msgstr "" + +#: addons/wiki/templates/wiki-bar-modal-help.mako:6 +msgid "Wiki syntax help" +msgstr "" + +#: addons/wiki/templates/wiki-bar-modal-help.mako:10 +#, python-format +msgid "" +"The wiki uses the Markdown syntax. For more " +"information and examples, go to our Guides." +msgstr "" + +#: addons/zotero/templates/zotero_node_settings.mako:41 +msgid "Current Library:" +msgstr "" + +#: addons/zotero/templates/zotero_node_settings.mako:59 +msgid "Loading libraries..." +msgstr "" + +#: addons/zotero/templates/zotero_node_settings.mako:66 +msgid "Libraries" +msgstr "" + +#: addons/zotero/templates/zotero_node_settings.mako:69 +msgid "Select" +msgstr "" + +#: website/templates/base.mako:110 +msgid "Title" +msgstr "" + +#: website/templates/base.mako:111 +msgid "Date Merged" +msgstr "" + +#: website/templates/base.mako:134 +msgid "WARNING: This site is running in development mode." +msgstr "" + +#: website/templates/base.mako:145 +msgid "" +"OSF does not support the use of Internet Explorer. For optimal " +"performance, please switch to another browser." +msgstr "" + +#: website/templates/base.mako:148 website/templates/base.mako:161 +msgid "Accept" +msgstr "" + +#: website/templates/base.mako:154 +#, python-format +msgid "" +"The National Institute of Informatics (NII) uses cookies to operate the " +"NII Research Data Cloud service and to improve your user experience." +" If you intend to use the GakuNin RDM, please read our " +"Privacy Policy and information on NII use of cookies. By clicking " +"Accept or continuing to use our website, you consent to the cookies use " +"on this site. If you do not agree with the cookies use, " +"please change your browser settings to disable cookies or stop using our " +"website. Please be aware that you may not be able to use" +" some functions on our website when you have cookies disabled." +msgstr "" + +#: website/templates/base.mako:172 +msgid "Start managing your projects on the GakuNin RDM today." +msgstr "" + +#: website/templates/base.mako:173 +msgid "" +"Free and easy to use, the GakuNin RDM supports the entire research " +"lifecycle: planning, execution, reporting, archiving, and discovery." +msgstr "" + +#: website/templates/base.mako:175 +msgid "Create an Account" +msgstr "" + +#: website/templates/base.mako:177 +msgid "Learn More" +msgstr "" + +#: website/templates/base.mako:178 +msgid "Hide this message" +msgstr "" + +#: website/templates/claim_account.mako:2 +msgid "Claim Account" +msgstr "" + +#: website/templates/claim_account.mako:4 +msgid "Set Password" +msgstr "" + +#: website/templates/claim_account.mako:9 +#, python-format +msgid "Hello %(firstname)s! Please set a password to claim your account." +msgstr "" + +#: website/templates/claim_account.mako:10 +#, python-format +msgid "E-mail: %(email)s" +msgstr "" + +#: website/templates/claim_account.mako:93 +#, python-format +msgid "" +"I have read and agree to the Terms of Use " +"and Privacy Policy." +msgstr "" + +#: website/templates/claim_account.mako:105 +#, python-format +msgid "" +"If you are not %(fullname)s, or if you were erroneously added as a " +"contributor to the project described in the email invitation, please " +"email %(osfContactEmail)s" +msgstr "" + +#: website/templates/claim_account_eppn.mako:2 +#: website/templates/claim_account_eppn.mako:4 +#: website/templates/claim_account_registered.mako:2 +#: website/templates/claim_account_registered.mako:4 +msgid "Claim Contributor" +msgstr "" + +#: website/templates/claim_account_eppn.mako:9 +msgid "Please confirm to continue." +msgstr "" + +#: website/templates/claim_account_eppn.mako:12 +msgid "Full name (can be changed later):" +msgstr "" + +#: website/templates/claim_account_eppn.mako:16 +msgid "Primary Email (Username) (can be changed later):" +msgstr "" + +#: website/templates/claim_account_eppn.mako:21 +msgid "Alternate Email (can be changed later):" +msgstr "" + +#: website/templates/claim_account_eppn.mako:27 +#, python-format +msgid "I am not %(username)s." +msgstr "" + +#: website/templates/claim_account_eppn.mako:29 +#: website/templates/claim_account_registered.mako:25 +#: website/templates/prereg_landing_page.mako:24 +#: website/templates/project/modal_remove_contributor.mako:97 +msgid "Continue" +msgstr "" + +#: website/templates/claim_account_registered.mako:9 +msgid "Please enter your credentials to continue." +msgstr "" + +#: website/templates/claim_account_registered.mako:23 +#, python-format +msgid "I am not %(userFullname)s." +msgstr "" + +#: website/templates/copyright.mako:7 website/templates/copyright.mako:12 +#: website/templates/footer.mako:11 +msgid "National Institute of Informatics" +msgstr "" + +#: website/templates/copyright.mako:8 +msgid "Terms of Use" +msgstr "" + +#: website/templates/copyright.mako:9 +msgid "Privacy Policy" +msgstr "" + +#: website/templates/footer.mako:17 +msgid "Terms of Use" +msgstr "" + +#: website/templates/footer.mako:23 +msgid "Privacy Policy" +msgstr "" + +#: website/templates/footer.mako:30 +msgid "Status" +msgstr "" + +#: website/templates/footer.mako:44 +msgid "TOP Guidelines" +msgstr "" + +#: website/templates/footer.mako:52 +msgid "Reproducibility Project: Psychology" +msgstr "" + +#: website/templates/footer.mako:60 +msgid "Reproducibility Project: Cancer Biology" +msgstr "" + +#: website/templates/institution.mako:8 +#: website/templates/project/project_header.mako:200 +msgid "" +"NOTICE: Forks, registrations, and uploads will be " +"temporarily disabled while the GakuNin RDM undergoes a hardware upgrade. " +"These features will return shortly. Thank you for your patience." +msgstr "" + +#: website/templates/messages.mako:1 +msgid "Duplicate template" +msgstr "" + +#: website/templates/messages.mako:2 +msgid "Fork this Project" +msgstr "" + +#: website/templates/messages.mako:3 +msgid "Citations" +msgstr "" + +#: website/templates/messages.mako:4 +msgid "Storage" +msgstr "" + +#: website/templates/messages.mako:5 +msgid "Other" +msgstr "" + +#: website/templates/messages.mako:6 +msgid "No license" +msgstr "" + +#: website/templates/messages.mako:7 +msgid "Analysis" +msgstr "" + +#: website/templates/messages.mako:8 +msgid "Communication" +msgstr "" + +#: website/templates/messages.mako:9 +msgid "Data" +msgstr "" + +#: website/templates/messages.mako:10 +msgid "Hypothesis" +msgstr "" + +#: website/templates/messages.mako:11 +msgid "Instrumentation" +msgstr "" + +#: website/templates/messages.mako:12 +msgid "Methods and Measures" +msgstr "" + +#: website/templates/messages.mako:13 +msgid "Procedure" +msgstr "" + +#: website/templates/messages.mako:14 +msgid "Software" +msgstr "" + +#: website/templates/messages.mako:15 +msgid "Component has been successfully deleted." +msgstr "" + +#: website/templates/messages.mako:16 +msgid "Project has been successfully deleted." +msgstr "" + +#: website/templates/messages.mako:17 +msgid "" +"View all information associated with this account, including for private " +"projects." +msgstr "" + +#: website/templates/messages.mako:18 +msgid "" +"View and edit all information associated with this account, including for" +" private projects." +msgstr "" + +#: website/templates/messages.mako:19 +msgid "Read your profile data." +msgstr "" + +#: website/templates/messages.mako:20 +msgid "Read your primary email address." +msgstr "" + +#: website/templates/messages.mako:22 +msgid "" +"\n" +"

                              \n" +"
                              \n" +"

                              We've updated our Terms" +" of Use and Privacy" +" Policy. Please read them carefully.

                              " +msgstr "" + +#: website/templates/messages.mako:26 +msgid "" +"
                              I " +"have read and agree to these terms.
                              \n" +"
                              " +msgstr "" + +#: website/templates/messages.mako:28 +msgid "" +"\n" +"
                              " +msgstr "" + +#: website/templates/my_projects.mako:2 website/templates/nav.mako:51 +msgid "My Projects" +msgstr "" + +#: website/templates/my_projects.mako:8 +msgid "" +"NOTICE: Forks, registrations, and uploads will be " +"temporarily disabled while the GakuNin RDM undergoes a hardware upgrade. " +"These features will return shortly. Thank you for your patience." +msgstr "" + +#: website/templates/nav.mako:23 +msgid "HOME" +msgstr "" + +#: website/templates/nav.mako:24 +msgid "PREPRINTS" +msgstr "" + +#: website/templates/nav.mako:25 +msgid "REGISTRIES" +msgstr "" + +#: website/templates/nav.mako:26 +msgid "MEETINGS" +msgstr "" + +#: website/templates/nav.mako:28 +msgid "INSTITUTIONS" +msgstr "" + +#: website/templates/nav.mako:34 +msgid "Toggle navigation" +msgstr "" + +#: website/templates/nav.mako:49 +msgid "My Quick Files" +msgstr "" + +#: website/templates/nav.mako:54 +#: website/templates/project/modal_add_contributor.mako:22 +#: website/templates/search.mako:2 website/templates/search_grdm.mako:2 +msgid "Search" +msgstr "" + +#: website/templates/nav.mako:59 +msgid "Support" +msgstr "" + +#: website/templates/nav.mako:63 +msgid "Donate" +msgstr "" + +#: website/templates/nav.mako:78 +msgid "My Profile" +msgstr "" + +#: website/templates/nav.mako:79 website/templates/profile/account.mako:8 +#: website/templates/profile/add_email.mako:14 +#: website/templates/profile/addons.mako:19 +#: website/templates/profile/notifications.mako:6 +#: website/templates/profile/oauth_app_list.mako:4 +#: website/templates/profile/personal_tokens_detail.mako:5 +#: website/templates/profile/personal_tokens_list.mako:4 +#: website/templates/profile/settings.mako:2 +#: website/templates/profile/settings.mako:9 +#: website/templates/project/project_header.mako:80 +#: website/templates/project/settings.mako:2 +#: website/templates/project/settings.mako:5 +#: website/templates/util/render_node.mako:67 +msgid "Settings" +msgstr "" + +#: website/templates/nav.mako:81 +msgid "RDM Support" +msgstr "" + +#: website/templates/nav.mako:83 +msgid "Log out" +msgstr "" + +#: website/templates/nav.mako:92 +msgid "Sign in" +msgstr "" + +#: website/templates/nav.mako:102 +msgid "Sign Up" +msgstr "" + +#: website/templates/nav.mako:104 +msgid "Sign In" +msgstr "" + +#: website/templates/nav.mako:140 +msgid "Notice:" +msgstr "" + +#: website/templates/nav.mako:144 +msgid "" +"The site will undergo maintenance between ." +msgstr "" + +#: website/templates/nav.mako:145 +msgid "Thank you for your patience." +msgstr "" + +#: website/templates/prereg_landing_page.mako:5 +msgid "GakuNin RDM Preregistration" +msgstr "" + +#: website/templates/prereg_landing_page.mako:7 +msgid "GakuNin RDM Prereg Challenge" +msgstr "" + +#: website/templates/prereg_landing_page.mako:22 +msgid "Please provide a title for your project:" +msgstr "" + +#: website/templates/prereg_landing_page.mako:30 +msgid "Go to an existing preregistration:" +msgstr "" + +#: website/templates/prereg_landing_page.mako:32 +#: website/templates/prereg_landing_page.mako:41 +#: website/templates/prereg_landing_page.mako:71 +#: website/templates/prereg_landing_page.mako:115 +msgid "Preregister" +msgstr "" + +#: website/templates/prereg_landing_page.mako:39 +msgid "Preregister an existing project:" +msgstr "" + +#: website/templates/prereg_landing_page.mako:55 +#, python-format +msgid "" +"

                              Improve your research with preregistration. By" +" writing out specific details such as data collection methods, analysis " +"plans, and rules for data exclusion, you can make important decisions " +"early on and have a clear record of these choices. This can help reduce " +"biases that occur once the data are in front of you.

                              " +msgstr "" + +#: website/templates/prereg_landing_page.mako:56 +#, python-format +msgid "" +"

                              Use OSF Registries to discover previously " +"registered work.

                              " +msgstr "" + +#: website/templates/prereg_landing_page.mako:58 +#, python-format +msgid "" +"

                              Articles must be published by an approved journal by December 31, 2018, to be " +"eligible for a prize. Please use this this helpful workflow to " +"preregister, even if you are not seeking a prize.

                              " +msgstr "" + +#: website/templates/prereg_landing_page.mako:59 +#, python-format +msgid "" +"

                              Improve your research with preregistration. The process of creating a" +" preregistration is beneficial to both the " +"scientific field and to you, the scientist. By writing out detailed data " +"collection methods, analysis plans, and rules for excluding or missing " +"data, you can make important decisions that affect your workflow earlier," +" without the biases that occur once the data are in front of you.

                              " +msgstr "" + +#: website/templates/prereg_landing_page.mako:64 +#: website/templates/prereg_landing_page.mako:110 +msgid "Start a new preregistration" +msgstr "" + +#: website/templates/prereg_landing_page.mako:76 +#: website/templates/prereg_landing_page.mako:121 +msgid "Continue working on an existing draft preregistration" +msgstr "" + +#: website/templates/prereg_landing_page.mako:84 +#: website/templates/prereg_landing_page.mako:126 +msgid "Preregister a project you already have on the GakuNin RDM" +msgstr "" + +#: website/templates/profile.mako:23 +#, python-format +msgid "" +"This account has been merged with %(profileAbsoluteUrl)s" +msgstr "" + +#: website/templates/profile.mako:43 +msgid "Edit your profile" +msgstr "" + +#: website/templates/profile.mako:57 +msgid "Member Since" +msgstr "" + +#: website/templates/profile.mako:63 +msgid "Public Profile" +msgstr "" + +#: website/templates/profile.mako:69 +msgid "No" +msgstr "" + +#: website/templates/profile.mako:69 +msgid "activity point" +msgid_plural "activity points" +msgstr[0] "" +msgstr[1] "" + +#: website/templates/profile.mako:70 +msgid "project" +msgstr "" + +#: website/templates/profile.mako:70 +msgid " " +msgid_plural "s" +msgstr[0] "" +msgstr[1] "" + +#: website/templates/profile.mako:73 +msgid "Usage of storage" +msgstr "" + +#: website/templates/profile.mako:82 website/templates/profile/settings.mako:39 +msgid "Employment" +msgstr "" + +#: website/templates/profile.mako:83 website/templates/profile/settings.mako:40 +msgid "Education" +msgstr "" + +#: website/templates/profile.mako:84 website/templates/profile/settings.mako:41 +msgid "Social" +msgstr "" + +#: website/templates/profile.mako:115 +msgid "Public projects" +msgstr "" + +#: website/templates/profile.mako:135 +msgid "Public components" +msgstr "" + +#: website/templates/profile.mako:152 +msgid "Quick files" +msgstr "" + +#: website/templates/request_access.mako:2 +msgid "Request Access" +msgstr "" + +#: website/templates/request_access.mako:11 +msgid "You Need Permission" +msgstr "" + +#: website/templates/request_access.mako:13 +msgid "Ask for access, or switch to an account with permission." +msgstr "" + +#: website/templates/request_access.mako:14 +msgid "" +"Your request for access has been sent. You will receive an email if and " +"when your request is approved." +msgstr "" + +#: website/templates/request_access.mako:23 +msgid "Switch account" +msgstr "" + +#: website/templates/search.mako:36 website/templates/search_grdm.mako:37 +msgid "Improve your search" +msgstr "" + +#: website/templates/search.mako:69 website/templates/search_grdm.mako:70 +msgid "Filter by license" +msgstr "" + +#: website/templates/search.mako:93 website/templates/search_grdm.mako:95 +msgid "No results found." +msgstr "" + +#: website/templates/search.mako:96 website/templates/search_grdm.mako:98 +msgid "Type your search terms in the box above." +msgstr "" + +#: website/templates/search.mako:104 website/templates/search_nav_grdm.mako:4 +msgid "Previous Page" +msgstr "" + +#: website/templates/search.mako:110 website/templates/search_nav_grdm.mako:61 +msgid "Next Page" +msgstr "" + +#: website/templates/search.mako:123 website/templates/search.mako:341 +#: website/templates/search.mako:344 website/templates/search_grdm.mako:552 +#: website/templates/search_grdm.mako:555 +msgid "Withdrawn " +msgstr "" + +#: website/templates/search.mako:123 +msgid "Registration " +msgstr "" + +#: website/templates/search.mako:123 +msgid "File" +msgstr "" + +#: website/templates/search.mako:126 +msgid "(Preprint File)" +msgstr "" + +#: website/templates/search.mako:130 +#, python-format +msgid "From: " +msgstr "" + +#: website/templates/search.mako:131 +#, python-format +msgid "" +"From: / " +msgstr "" + +#: website/templates/search.mako:240 website/templates/search_grdm.mako:367 +msgid " Contributors" +msgstr "" + +#: website/templates/search.mako:262 website/templates/search_grdm.mako:389 +#: website/templates/search_grdm.mako:461 +msgid "Affiliated institutions" +msgstr "" + +#: website/templates/search.mako:276 website/templates/search.mako:368 +#: website/templates/search_grdm.mako:403 +#: website/templates/search_grdm.mako:579 +msgid "

                              Jump to:" +msgstr "" + +#: website/templates/search.mako:280 website/templates/search.mako:372 +#: website/templates/search_grdm.mako:407 +#: website/templates/search_grdm.mako:583 +msgid "Files" +msgstr "" + +#: website/templates/search.mako:291 website/templates/search_grdm.mako:502 +msgid "(Preprint)" +msgstr "" + +#: website/templates/search.mako:292 website/templates/search.mako:348 +#: website/templates/search_grdm.mako:440 +#: website/templates/search_grdm.mako:503 +#: website/templates/search_grdm.mako:559 +msgid "Description" +msgstr "" + +#: website/templates/project/contributors.mako:2 +#: website/templates/project/contributors.mako:8 +#: website/templates/project/contributors.mako:54 +#: website/templates/project/project.mako:163 +#: website/templates/project/project_header.mako:72 +#: website/templates/search.mako:295 website/templates/search.mako:352 +#: website/templates/search_grdm.mako:446 +#: website/templates/search_grdm.mako:506 +#: website/templates/search_grdm.mako:563 +msgid "Contributors" +msgstr "" + +#: website/templates/search.mako:314 website/templates/search_grdm.mako:525 +msgid "Managers" +msgstr "" + +#: website/templates/search.mako:327 website/templates/search_grdm.mako:538 +msgid "Members" +msgstr "" + +#: website/templates/search.mako:341 website/templates/search.mako:344 +#: website/templates/search_grdm.mako:552 +#: website/templates/search_grdm.mako:555 +msgid "Registration" +msgstr "" + +#: website/templates/project/project.mako:587 +#: website/templates/project/view_file.mako:76 +#: website/templates/search.mako:377 website/templates/search_grdm.mako:475 +#: website/templates/search_grdm.mako:588 +msgid "Tags" +msgstr "" + +#: website/templates/search_bar.mako:7 website/templates/search_bar.mako:8 +#: website/templates/search_bar_grdm.mako:7 +#: website/templates/search_bar_grdm.mako:8 +msgid "GakuNin RDM Search" +msgstr "" + +#: website/templates/search_bar_grdm.mako:20 +msgid "sort by" +msgstr "" + +#: website/templates/search_bar_grdm.mako:22 +msgid "per page" +msgstr "" + +#: website/templates/search_bar_help_modal.mako:6 +msgid "Search help" +msgstr "" + +#: website/templates/search_bar_help_modal.mako:9 +msgid "Queries" +msgstr "" + +#: website/templates/search_bar_help_modal.mako:10 +#, python-format +msgid "" +"

                              Search uses the Lucene search " +"syntax.This gives you many options, but can be very simple as well. " +"Examples of valid searches include:

                              " +msgstr "" + +#: website/templates/project/project_header.mako:16 +#: website/templates/search_grdm.mako:143 +#: website/templates/search_grdm.mako:317 +msgid "Project" +msgstr "" + +#: website/templates/search_grdm.mako:150 +msgid "Folder" +msgstr "" + +#: website/templates/search_grdm.mako:160 +#: website/templates/search_grdm.mako:339 +#: website/templates/search_grdm.mako:492 +msgid "Comment" +msgstr "" + +#: website/templates/search_grdm.mako:196 +msgid "Employment@search" +msgstr "Employment" + +#: website/templates/search_grdm.mako:206 +msgid "Education@search" +msgstr "Education" + +#: website/templates/search_grdm.mako:327 +msgid "Body of Wiki" +msgstr "" + +#: website/templates/search_grdm.mako:602 +msgid "Modified by" +msgstr "" + +#: website/templates/search_grdm.mako:605 +msgid "Created by" +msgstr "" + +#: website/templates/search_nav_grdm.mako:65 +msgid "Page" +msgstr "" + +#: website/templates/include/comment_pane_template.mako:3 +#: website/templates/project/project_header.mako:86 +msgid "Comments" +msgstr "" + +#: website/templates/include/comment_pane_template.mako:18 +#: website/templates/project/files.mako:2 +#: website/templates/project/files.mako:5 +#: website/templates/project/project.mako:441 +#: website/templates/project/project_header.mako:40 +msgid "Files" +msgstr "" + +#: website/templates/include/comment_pane_template.mako:18 +#: website/templates/include/comment_pane_template.mako:19 +#: website/templates/include/comment_pane_template.mako:20 +msgid "Discussion" +msgstr "" + +#: website/templates/include/comment_pane_template.mako:26 +#: website/templates/include/comment_template.mako:165 +msgid "Add a comment" +msgstr "" + +#: website/templates/include/comment_template.mako:13 +msgid "Comment confirmed as spam." +msgstr "" + +#: website/templates/include/comment_template.mako:23 +msgid "Comment deleted." +msgstr "" + +#: website/templates/include/comment_template.mako:30 +msgid "Restore" +msgstr "" + +#: website/templates/include/comment_template.mako:37 +msgid "Comment reported." +msgstr "" + +#: website/templates/include/comment_template.mako:44 +msgid "Not abuse" +msgstr "" + +#: website/templates/include/comment_template.mako:86 +msgid "Edit comment" +msgstr "" + +#: website/templates/include/comment_template.mako:138 +msgid "Describe abuse" +msgstr "" + +#: website/templates/include/comment_template.mako:142 +msgid "Report" +msgstr "" + +#: website/templates/include/comment_template.mako:186 +msgid "More replies" +msgstr "" + +#: website/templates/include/profile/jobs.mako:19 +#: website/templates/include/profile/schools.mako:19 +msgid "Position" +msgstr "" + +#: website/templates/include/profile/jobs.mako:26 +#: website/templates/include/profile/schools.mako:26 +#: website/templates/project/contributors.mako:332 +#: website/templates/project/contributors.mako:387 +#: website/templates/project/modal_remove_contributor.mako:96 +#: website/templates/project/modal_remove_contributor.mako:105 +#: website/templates/project/modal_remove_contributor.mako:114 +#: website/templates/project/project.mako:569 +#: website/templates/project/settings.mako:498 +#: website/templates/project/settings.mako:501 +msgid "Remove" +msgstr "" + +#: website/templates/include/profile/jobs.mako:31 +#: website/templates/include/profile/schools.mako:31 +msgid "Read IdP Profile" +msgstr "" + +#: website/templates/include/profile/jobs.mako:35 +msgid "Institution / Employer" +msgstr "" + +#: website/templates/include/profile/jobs.mako:37 +#: website/templates/include/profile/schools.mako:37 +#: website/templates/profile/oauth_app_detail.mako:55 +#: website/templates/profile/oauth_app_detail.mako:61 +#: website/templates/profile/oauth_app_detail.mako:73 +#: website/templates/profile/personal_tokens_detail.mako:26 +msgid "Required" +msgstr "" + +#: website/templates/include/profile/jobs.mako:44 +msgid "Department / Institute" +msgstr "" + +#: website/templates/include/profile/jobs.mako:49 +msgid "Job title" +msgstr "" + +#: website/templates/include/profile/jobs.mako:54 +#: website/templates/include/profile/schools.mako:54 +#: website/templates/project/project.mako:610 +msgid "Start date" +msgstr "" + +#: website/templates/include/profile/jobs.mako:58 +#: website/templates/include/profile/jobs.mako:73 +#: website/templates/include/profile/schools.mako:58 +#: website/templates/include/profile/schools.mako:73 +msgid "-- Month --" +msgstr "" + +#: website/templates/include/profile/jobs.mako:63 +#: website/templates/include/profile/jobs.mako:78 +#: website/templates/include/profile/schools.mako:63 +#: website/templates/include/profile/schools.mako:78 +msgid "Year" +msgstr "" + +#: website/templates/include/profile/jobs.mako:69 +#: website/templates/include/profile/schools.mako:69 +#: website/templates/project/project.mako:613 +msgid "End date" +msgstr "" + +#: website/templates/include/profile/jobs.mako:85 +#: website/templates/include/profile/schools.mako:85 +msgid "Ongoing" +msgstr "" + +#: website/templates/include/profile/jobs.mako:104 +msgid "Add another Employment" +msgstr "" + +#: website/templates/include/profile/jobs.mako:114 +#: website/templates/include/profile/names.mako:73 +#: website/templates/include/profile/schools.mako:114 +#: website/templates/include/profile/social.mako:140 +msgid "Discard changes" +msgstr "" + +#: website/templates/include/profile/jobs.mako:117 +#: website/templates/include/profile/names.mako:76 +#: website/templates/include/profile/schools.mako:117 +#: website/templates/include/profile/social.mako:143 +msgid "Saving" +msgstr "" + +#: website/templates/include/profile/jobs.mako:136 +#: website/templates/include/profile/schools.mako:136 +#: website/templates/include/profile/social.mako:180 +msgid "Not provided" +msgstr "" + +#: website/templates/include/profile/jobs.mako:149 +#: website/templates/include/profile/jobs.mako:159 +#: website/templates/include/profile/schools.mako:148 +#: website/templates/include/profile/schools.mako:158 +msgid "" +" " +msgstr "" + +#: website/templates/include/profile/jobs.mako:156 +msgid "Department / Institute:" +msgstr "" + +#: website/templates/include/profile/jobs.mako:157 +#: website/templates/project/settings.mako:101 +msgid "Title:" +msgstr "" + +#: website/templates/include/profile/jobs.mako:158 +#: website/templates/include/profile/schools.mako:157 +msgid "Dates:" +msgstr "" + +#: website/templates/include/profile/names.mako:6 +msgid "Full name (e.g. Rosalind Elsie Franklin)" +msgstr "" + +#: website/templates/include/profile/names.mako:15 +msgid "" +"Your full name, above, is the name that will be displayed in your " +"profile. To control the way your name will appear in " +"citations, you can use the \"Auto-fill\" button to " +"automatically infer your first name, last name, etc., or edit " +"the fields directly below." +msgstr "" + +#: website/templates/include/profile/names.mako:22 +msgid "Auto-fill" +msgstr "" + +#: website/templates/include/profile/names.mako:26 +msgid "Given name (e.g. Rosalind)" +msgstr "" + +#: website/templates/include/profile/names.mako:31 +msgid "Middle name(s) (e.g. Elsie)" +msgstr "" + +#: website/templates/include/profile/names.mako:36 +msgid "Family name (e.g. Franklin)" +msgstr "" + +#: website/templates/include/profile/names.mako:41 +msgid "Suffix" +msgstr "" + +#: website/templates/include/profile/names.mako:47 +msgid "Citation preview" +msgstr "" + +#: website/templates/include/profile/names.mako:51 +msgid "Style" +msgstr "" + +#: website/templates/include/profile/names.mako:52 +msgid "Citation format" +msgstr "" + +#: website/templates/include/profile/schools.mako:35 +msgid "Institution" +msgstr "" + +#: website/templates/include/profile/schools.mako:44 +msgid "Department" +msgstr "" + +#: website/templates/include/profile/schools.mako:49 +msgid "Degree" +msgstr "" + +#: website/templates/include/profile/schools.mako:104 +msgid "Add another Education" +msgstr "" + +#: website/templates/include/profile/schools.mako:155 +msgid "Department:" +msgstr "" + +#: website/templates/include/profile/schools.mako:156 +msgid "Degree:" +msgstr "" + +#: website/templates/include/profile/settings_navpanel.mako:6 +msgid "Profile information" +msgstr "" + +#: website/templates/include/profile/settings_navpanel.mako:9 +msgid "Account settings" +msgstr "" + +#: website/templates/include/profile/settings_navpanel.mako:12 +msgid "Configure add-on accounts" +msgstr "" + +#: website/templates/include/profile/settings_navpanel.mako:15 +#: website/templates/profile/notifications.mako:2 +msgid "Notifications" +msgstr "" + +#: website/templates/include/profile/settings_navpanel.mako:18 +msgid "Developer apps" +msgstr "" + +#: website/templates/include/profile/settings_navpanel.mako:21 +msgid "Personal access tokens" +msgstr "" + +#: website/templates/include/profile/social.mako:10 +msgid "Your websites" +msgstr "" + +#: website/templates/include/profile/social.mako:31 +msgid "Please enter a valid website" +msgstr "" + +#: website/templates/include/profile/social.mako:34 +msgid "Add website" +msgstr "" + +#: website/templates/include/profile/social.mako:88 +#: website/templates/include/profile/social.mako:96 +#: website/templates/include/profile/social.mako:104 +#: website/templates/include/profile/social.mako:114 +#: website/templates/include/profile/social.mako:122 +#: website/templates/include/profile/social.mako:130 +msgid "profileID" +msgstr "" + +#: website/templates/include/profile/social.mako:112 +msgid "institution" +msgstr "" + +#: website/templates/profile/account.mako:4 +#: website/templates/profile/add_email.mako:4 +msgid "Account Settings" +msgstr "" + +#: website/templates/profile/account.mako:15 +#: website/templates/profile/add_email.mako:21 +msgid "Connected Emails" +msgstr "" + +#: website/templates/profile/account.mako:20 +#: website/templates/profile/add_email.mako:27 +msgid "Primary Email" +msgstr "" + +#: website/templates/profile/account.mako:34 +#: website/templates/profile/add_email.mako:57 +msgid "Alternate Emails" +msgstr "" + +#: website/templates/profile/account.mako:40 +#: website/templates/profile/add_email.mako:63 +msgid "make primary" +msgstr "" + +#: website/templates/profile/account.mako:48 +#: website/templates/profile/add_email.mako:72 +msgid "Unconfirmed Emails" +msgstr "" + +#: website/templates/profile/account.mako:55 +#: website/templates/profile/add_email.mako:79 +msgid "resend confirmation" +msgstr "" + +#: website/templates/profile/account.mako:64 +#: website/templates/profile/add_email.mako:88 +msgid "" +"To merge an existing account with this one or to log in with multiple " +"email addresses, add an alternate email address below." +msgstr "" + +#: website/templates/profile/account.mako:65 +#: website/templates/profile/add_email.mako:89 +msgid "" +"Merging accounts will move all projects and components associated with " +"two emails into one account. All projects and components will be " +"displayed under the email address listed as primary." +msgstr "" + +#: website/templates/profile/account.mako:68 +msgid "" +"To log in with multiple email addresses, add an alternate email address " +"below." +msgstr "" + +#: website/templates/profile/account.mako:73 +#: website/templates/profile/add_email.mako:98 +msgid "Email address" +msgstr "" + +#: website/templates/profile/account.mako:75 +#: website/templates/profile/add_email.mako:100 +msgid "Add email" +msgstr "" + +#: website/templates/profile/account.mako:90 +msgid "Default Storage Location" +msgstr "" + +#: website/templates/profile/account.mako:98 +msgid "" +"This location will be applied to new projects and components. It will not" +" affect existing projects and components." +msgstr "" + +#: website/templates/profile/account.mako:103 +msgid "Update location" +msgstr "" + +#: website/templates/profile/account.mako:109 +#: website/templates/profile/add_email.mako:117 +msgid "Connected Identities" +msgstr "" + +#: website/templates/profile/account.mako:111 +#: website/templates/profile/add_email.mako:119 +msgid "" +"Connected identities allow you to log in to the GakuNin RDM via a third-" +"party service." +msgstr "" + +#: website/templates/profile/account.mako:112 +#: website/templates/profile/add_email.mako:120 +msgid "You can revoke these authorizations here." +msgstr "" + +#: website/templates/profile/account.mako:115 +#: website/templates/profile/add_email.mako:123 +msgid "" +"You have not authorized any external services to log in to the GakuNin " +"RDM." +msgstr "" + +#: website/templates/profile/account.mako:125 +#: website/templates/profile/add_email.mako:133 +msgid "Verified" +msgstr "" + +#: website/templates/profile/account.mako:127 +#: website/templates/profile/add_email.mako:135 +msgid "Pending" +msgstr "" + +#: website/templates/profile/account.mako:145 +#: website/templates/profile/add_email.mako:155 +msgid "Change Password" +msgstr "" + +#: website/templates/profile/account.mako:149 +#: website/templates/profile/add_email.mako:159 +msgid "Old password" +msgstr "" + +#: website/templates/profile/account.mako:154 +#: website/templates/profile/add_email.mako:164 +msgid "Old Password" +msgstr "" + +#: website/templates/profile/account.mako:166 +#: website/templates/profile/add_email.mako:176 +msgid "New password" +msgstr "" + +#: website/templates/profile/account.mako:171 +#: website/templates/profile/add_email.mako:181 +msgid "New Password" +msgstr "" + +#: website/templates/profile/account.mako:201 +#: website/templates/profile/add_email.mako:211 +msgid "Confirm new password" +msgstr "" + +#: website/templates/profile/account.mako:206 +#: website/templates/profile/add_email.mako:216 +msgid "Verify Password" +msgstr "" + +#: website/templates/profile/account.mako:217 +#: website/templates/profile/add_email.mako:227 +msgid "Update password" +msgstr "" + +#: website/templates/profile/account.mako:223 +#: website/templates/profile/add_email.mako:232 +msgid "Security Settings" +msgstr "" + +#: website/templates/profile/account.mako:235 +#: website/templates/profile/add_email.mako:245 +msgid "Export Account Data" +msgstr "" + +#: website/templates/profile/account.mako:237 +#: website/templates/profile/add_email.mako:247 +msgid "" +"Exporting your account data allows you to keep a permanent copy of the " +"current state of your account. Keeping a copy of your account data can " +"provide peace of mind or assist in transferring your information to " +"another provider." +msgstr "" + +#: website/templates/profile/account.mako:238 +#: website/templates/profile/add_email.mako:248 +msgid "Request export" +msgstr "" + +#: website/templates/profile/account.mako:242 +#: website/templates/profile/add_email.mako:254 +msgid "Deactivate Account" +msgstr "" + +#: website/templates/profile/account.mako:244 +msgid "" +"Warning: Once your deactivation has been approved the " +"effects are irreversible." +msgstr "" + +#: website/templates/profile/account.mako:245 +#: website/templates/profile/add_email.mako:259 +msgid "" +"Deactivating your account will remove you from all public projects to " +"which you are a contributor. Your account will no longer be associated " +"with GakuNin RDM projects, and your work on the GakuNin RDM will be " +"inaccessible." +msgstr "" + +#: website/templates/profile/account.mako:246 +#: website/templates/profile/add_email.mako:263 +msgid "Your account is currently pending deactivation." +msgstr "" + +#: website/templates/profile/account.mako:247 +#: website/templates/profile/add_email.mako:261 +msgid "Request deactivation" +msgstr "" + +#: website/templates/profile/account.mako:248 +msgid "Cancel deactivation request" +msgstr "" + +#: website/templates/profile/add_email.mako:42 +msgid "eduPersonPrincipalName (ePPN)" +msgstr "" + +#: website/templates/profile/add_email.mako:92 +msgid "Add an email address below." +msgstr "" + +#: website/templates/profile/add_email.mako:257 +msgid "Warning: This action is irreversible." +msgstr "" + +#: website/templates/profile/addon_permissions.mako:4 +#, python-format +msgid "Authorized by %(name)s" +msgstr "" + +#: website/templates/profile/addons.mako:2 +#: website/templates/profile/addons.mako:29 +msgid "Configure Add-on Accounts" +msgstr "" + +#: website/templates/profile/modal_change_avatar.mako:6 +msgid "Change Avatar" +msgstr "" + +#: website/templates/profile/modal_change_avatar.mako:9 +msgid "" +"Avatars on the GakuNin RDM use gravatar.org, a free" +" service that allows users to easily control their " +"identity and profile on multiple service across the " +"Internet." +msgstr "" + +#: website/templates/profile/modal_change_avatar.mako:14 +msgid "" +"To change your avatar image, please login or register at" +" gravatar.org, and" +" add the email address you use on the GakuNin RDM to " +"your Gravatar account." +msgstr "" + +#: website/templates/profile/notifications.mako:16 +msgid "Configure Email Preferences" +msgstr "" + +#: website/templates/profile/notifications.mako:26 +msgid "Receive general notifications about the GakuNin RDM every 2-3 weeks." +msgstr "" + +#: website/templates/profile/notifications.mako:35 +msgid "" +"Receive helpful tips on how to make the most of the GakuNin RDM, up to " +"once per week." +msgstr "" + +#: website/templates/profile/notifications.mako:53 +msgid "Configure Notification Preferences" +msgstr "" + +#: website/templates/profile/notifications.mako:56 +msgid "" +"NOTE: Regardless of your selected preferences, GakuNin RDM will continue " +"to provide transactional and administrative service emails." +msgstr "" + +#: website/templates/profile/notifications.mako:64 +#: website/templates/project/settings.mako:371 +msgid "Loading notification settings..." +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:2 +#: website/templates/profile/oauth_app_detail.mako:5 +msgid "Application Detail" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:16 +msgid "Return to list of registered applications" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:25 +msgid "The unique identifier for the application. May be seen publicly by others." +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:32 +msgid "" +"The client secret is known only to you and the GakuNin RDM. Do not " +"display or expose this information." +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:39 +msgid "Hide" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:40 +msgid "Show" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:42 +msgid "Reset Secret" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:44 +msgid "" +"Resetting the client secret will render your application unusable until " +"it is updated with the new client secret, and all users must reauthorize " +"access. Previously issued access tokens will no longer work." +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:48 +msgid "Deactivate application" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:54 +msgid "Application name" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:60 +msgid "Project homepage URL" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:66 +msgid "Application description" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:72 +msgid "Authorization callback URL" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:86 +msgid "Register" +msgstr "" + +#: website/templates/profile/oauth_app_list.mako:2 +#: website/templates/profile/oauth_app_list.mako:15 +msgid "Developer Applications" +msgstr "" + +#: website/templates/profile/oauth_app_list.mako:17 +msgid "New application" +msgstr "" + +#: website/templates/profile/oauth_app_list.mako:22 +msgid "" +"The GakuNin RDM allows third-party web applications to connect to the " +"GakuNin RDM on behalf of other users via the OAuth 2.0 web application " +"flow." +msgstr "" + +#: website/templates/profile/oauth_app_list.mako:24 +msgid "" +"You have not registered any applications that can connect to the GakuNin " +"RDM on behalf of other users." +msgstr "" + +#: website/templates/profile/oauth_app_list.mako:26 +msgid "" +"You have registered the following applications that can connect to the " +"GakuNin RDM on behalf of other users:" +msgstr "" + +#: website/templates/profile/oauth_app_list.mako:31 +msgid "Application" +msgstr "" + +#: website/templates/profile/oauth_app_list.mako:34 +#: website/templates/profile/personal_tokens_list.mako:34 +msgid "Deactivate" +msgstr "" + +#: website/templates/profile/oauth_app_list.mako:43 +msgid "Client ID:" +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:2 +msgid "Personal Token Detail" +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:16 +msgid "Return to list of registered tokens" +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:25 +msgid "Token name:" +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:25 +msgid "What this token is for." +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:31 +msgid "Scopes:" +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:32 +msgid "Scopes limit access for personal access tokens." +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:51 +msgid "Create" +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:65 +msgid "This is the only time your token will be displayed." +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:66 +msgid "Token ID" +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:67 +msgid "ID used to authenticate with this token. This will be shown only once." +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:70 +msgid "Copy to clipboard" +msgstr "" + +#: website/templates/profile/personal_tokens_list.mako:2 +#: website/templates/profile/personal_tokens_list.mako:15 +#: website/templates/profile/personal_tokens_list.mako:31 +msgid "Personal Access Tokens" +msgstr "" + +#: website/templates/profile/personal_tokens_list.mako:17 +msgid "New token" +msgstr "" + +#: website/templates/profile/personal_tokens_list.mako:22 +msgid "" +"Personal access tokens function like ordinary OAuth access tokens. They " +"can be used to authenticate to the API." +msgstr "" + +#: website/templates/profile/personal_tokens_list.mako:24 +msgid "" +"You have not created any access tokens that can connect to the GakuNin " +"RDM." +msgstr "" + +#: website/templates/profile/personal_tokens_list.mako:26 +msgid "You have generated the following personal access tokens:" +msgstr "" + +#: website/templates/profile/settings.mako:11 +msgid "View your profile" +msgstr "" + +#: website/templates/profile/settings.mako:38 +#: website/templates/project/contributors.mako:182 +#: website/templates/project/contributors.mako:229 +#: website/templates/project/modal_add_contributor.mako:216 +msgid "Name" +msgstr "" + +#: website/templates/project/addons.mako:14 +#: website/templates/project/addons.mako:33 +msgid "Select Add-ons" +msgstr "" + +#: website/templates/project/addons.mako:15 +#: website/templates/project/addons.mako:111 +msgid "Configure Add-ons" +msgstr "" + +#: website/templates/project/addons.mako:38 +msgid "" +"Sync your projects with external services to help stay connected and " +"organized. Select a category and browse the options." +msgstr "" + +#: website/templates/project/addons.mako:44 +msgid "Categories" +msgstr "" + +#: website/templates/project/addons.mako:47 +msgid "Search..." +msgstr "" + +#: website/templates/project/addons.mako:56 +msgid "All" +msgstr "" + +#: website/templates/project/addons.mako:82 +msgid "(This is a default addon)" +msgstr "" + +#: website/templates/project/addons.mako:84 +msgid "Disable" +msgstr "" + +#: website/templates/project/addons.mako:86 +msgid "Enable" +msgstr "" + +#: website/templates/project/addons.mako:128 +msgid "Don't see your GitHub organization repositories?" +msgstr "" + +#: website/templates/project/addons.mako:130 +msgid "You may need to reauthorize your GitHub access token." +msgstr "" + +#: website/templates/project/addons.mako:131 +#, python-format +msgid "" +"Follow the steps in the help guide to resolve the " +"issue." +msgstr "" + +#: website/templates/project/addons.mako:135 +#, python-format +msgid "" +"Please contact rdm_support@nii.ac.jp if you " +"have questions." +msgstr "" + +#: website/templates/project/contributors.mako:13 +msgid "Filter by name" +msgstr "" + +#: website/templates/project/contributors.mako:14 +#: website/templates/project/contributors.mako:186 +#: website/templates/project/contributors.mako:232 +#: website/templates/project/modal_add_contributor.mako:227 +msgid "Permissions" +msgstr "" + +#: website/templates/project/contributors.mako:17 +#: website/templates/project/contributors.mako:189 +#: website/templates/project/contributors.mako:235 +#: website/templates/project/modal_add_contributor.mako:230 +msgid "Permission Information" +msgstr "" + +#: website/templates/project/contributors.mako:24 +#: website/templates/project/contributors.mako:75 +msgid "Administrator" +msgstr "" + +#: website/templates/project/contributors.mako:27 +#: website/templates/project/contributors.mako:76 +msgid "Read + Write" +msgstr "" + +#: website/templates/project/contributors.mako:30 +#: website/templates/project/contributors.mako:77 +msgid "Read" +msgstr "" + +#: website/templates/project/contributors.mako:33 +#: website/templates/project/contributors.mako:196 +#: website/templates/project/contributors.mako:242 +#: website/templates/project/modal_add_contributor.mako:218 +msgid "Bibliographic Contributor" +msgstr "" + +#: website/templates/project/contributors.mako:36 +#: website/templates/project/contributors.mako:199 +#: website/templates/project/contributors.mako:245 +#: website/templates/project/modal_add_contributor.mako:221 +msgid "Bibliographic Contributor Information" +msgstr "" + +#: website/templates/project/contributors.mako:43 +msgid "Bibliographic" +msgstr "" + +#: website/templates/project/contributors.mako:46 +msgid "Non-Bibliographic" +msgstr "" + +#: website/templates/project/contributors.mako:63 +msgid "Drag and drop contributors to change listing order." +msgstr "" + +#: website/templates/project/contributors.mako:106 +msgid "No contributors found" +msgstr "" + +#: website/templates/project/contributors.mako:111 +msgid "Admins on Parent Projects" +msgstr "" + +#: website/templates/project/contributors.mako:135 +msgid "No administrators from parent project found." +msgstr "" + +#: website/templates/project/contributors.mako:143 +msgid "Requests for Access" +msgstr "" + +#: website/templates/project/contributors.mako:144 +msgid "The following users have requested access to this project." +msgstr "" + +#: website/templates/project/contributors.mako:162 +#: website/templates/project/settings.mako:29 +#: website/templates/project/settings.mako:202 +msgid "View-only Links" +msgstr "" + +#: website/templates/project/contributors.mako:167 +#: website/templates/project/settings.mako:206 +msgid "" +"Create a link to share this project so those who have the link can " +"view—but not edit—the project." +msgstr "" + +#: website/templates/project/contributors.mako:396 +msgid "Discard Changes" +msgstr "" + +#: website/templates/project/contributors.mako:397 +msgid "Save Changes" +msgstr "" + +#: website/templates/project/files.mako:8 +#: website/templates/project/project.mako:449 +msgid "Click on a storage provider or drag and drop to upload" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:20 +msgid "Search by name or user profile information" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:25 +msgid "Invite new contributor by e-mail" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:46 +msgid "Results" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:47 +msgid "Add all" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:63 +msgid "Add contributor" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:66 +msgid "Already added" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:164 +#: website/templates/project/modal_add_contributor.mako:254 +msgid "(unregistered)" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:181 +#, python-format +msgid "" +"Add as an " +"unregistered contributor." +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:186 +msgid "Searching contributors..." +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:190 +msgid "No results found. Try a more specific search." +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:193 +msgid "No results found. Try a more specific search" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:195 +msgid "or" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:196 +#, python-format +msgid "" +"add as an " +"unregistered contributor." +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:200 +msgid "" +"It looks like you are trying to search by email address. Please try your " +"search again using your collaborator's name. You will be able to add " +"users without GakuNin RDM accounts as unregistered contributors." +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:207 +msgid "Adding" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:208 +msgid "Remove all" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:241 +msgid "Remove contributor" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:281 +msgid "Adding contributor(s)" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:289 +msgid "" +"You can also add the contributor(s) to any components on which you are an" +" admin." +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:294 +#: website/templates/project/modal_generate_private_link.mako:71 +msgid "Select all" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:296 +msgid "Select none" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:309 +msgid "Loading projects and components..." +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:320 +msgid "Full Name" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:322 +msgid "Full name" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:325 +#: website/templates/project/modal_add_contributor.mako:327 +msgid "Email" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:330 +msgid "We will notify the user that they have been added to your project." +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:343 +#: website/templates/project/modal_add_contributor.mako:355 +#: website/templates/project/modal_remove_contributor.mako:112 +#: website/templates/project/nodes_delete.mako:87 +msgid "Back" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:351 +msgid "Next" +msgstr "" + +#: website/templates/project/modal_add_pointer.mako:8 +msgid "Link other GakuNin RDM projects" +msgstr "" + +#: website/templates/project/modal_add_pointer.mako:15 +msgid "Search projects" +msgstr "" + +#: website/templates/project/modal_add_pointer.mako:43 +msgid "Projects" +msgstr "" + +#: website/templates/project/modal_add_pointer.mako:55 +msgid "Results: All Projects" +msgstr "" + +#: website/templates/project/modal_add_pointer.mako:56 +msgid "Results: My Projects" +msgstr "" + +#: website/templates/project/modal_add_pointer.mako:96 +msgid "Done" +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:5 +msgid "Create a new link to share your project" +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:13 +msgid "Link name" +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:18 +msgid "Optional link name (e.g., For peer review, Sharing data, Share project)" +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:30 +msgid "" +"Anonymize contributor list for this link (e.g., for " +"blind peer review)." +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:32 +msgid "" +"Ensure the wiki pages, files, registration forms and add-ons do not " +"contain identifying information." +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:39 +msgid "" +"Which components would you like to associate with this " +"link?" +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:40 +msgid "" +"Anyone with the private link can view—but not edit—the" +" components associated with the link." +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:51 +#, python-format +msgid "(current component, public)" +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:59 +msgid "Parent needs to be checked" +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:62 +msgid "(public)" +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:74 +msgid "De-select all" +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:15 +#, python-format +msgid "" +"Do you want to remove from" +" , or from and every component in it?" +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:21 +#, python-format +msgid "" +"Remove from" +" ." +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:28 +#, python-format +msgid "" +"Remove from" +" and every" +" component in it." +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:37 +#, python-format +msgid "Remove from ?" +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:48 +#, python-format +msgid "" +" " +"will be removed from the following projects and/or components." +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:65 +#, python-format +msgid "" +" " +"cannot be removed from the following projects and/or components." +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:81 +#, python-format +msgid "" +" cannot be removed " +"as a contributor. You need at least one administrator, bibliographic " +"contributor, and registered user." +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:82 +msgid "" +"data-bind=\"text:removeSelf() ? 'You' : " +"contributorToRemove()['fullname']\"" +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:85 +msgid "" +"Please save or discard your existing changes before removing a " +"contributor." +msgstr "" + +#: website/templates/project/nodes_delete.mako:66 +#: website/templates/project/nodes_delete.mako:77 +msgid "Type the following to continue:" +msgstr "" + +#: website/templates/project/project.mako:22 +msgid "Private Project" +msgstr "" + +#: website/templates/project/project.mako:45 +msgid "Private" +msgstr "" + +#: website/templates/project/project.mako:49 +msgid "Make Public" +msgstr "" + +#: website/templates/project/project.mako:58 +msgid "Make Private" +msgstr "" + +#: website/templates/project/project.mako:60 +msgid "Public" +msgstr "" + +#: website/templates/project/project.mako:65 +msgid "Log in or create an account to duplicate this project" +msgstr "" + +#: website/templates/project/project.mako:100 +#, python-format +msgid "View Forks (%(forkCount)s)" +msgstr "" + +#: website/templates/project/project.mako:115 +msgid "Bookmark" +msgstr "" + +#: website/templates/project/project.mako:118 +msgid "Remove from bookmarks" +msgstr "" + +#: website/templates/project/project.mako:127 +msgid "Create view-only link" +msgstr "" + +#: website/templates/project/project.mako:137 +msgid "Share" +msgstr "" + +#: website/templates/project/project.mako:150 +msgid "Log in to request access" +msgstr "" + +#: website/templates/project/project.mako:165 +msgid "Contributors:" +msgstr "" + +#: website/templates/project/project.mako:169 +msgid "Anonymous Contributors" +msgstr "" + +#: website/templates/project/project.mako:192 +#: website/templates/project/settings.mako:488 +msgid "Affiliated Institutions:" +msgstr "" + +#: website/templates/project/project.mako:218 +#, python-format +msgid "" +"Forked from %(forkedFromDisplayAbsoluteUrl)s on" +" " +msgstr "" + +#: website/templates/project/project.mako:225 +msgid "Date registered:" +msgstr "" + +#: website/templates/project/project.mako:230 +msgid "Date created:" +msgstr "" + +#: website/templates/project/project.mako:233 +msgid "| Last Updated:" +msgstr "" + +#: website/templates/project/project.mako:248 +msgid "Creating DOI. Please wait..." +msgstr "" + +#: website/templates/project/project.mako:254 +msgid "Create DOI" +msgstr "" + +#: website/templates/project/project.mako:259 +#: website/templates/project/settings.mako:81 +msgid "Category:" +msgstr "" + +#: website/templates/project/project.mako:260 +msgid "category" +msgstr "" + +#: website/templates/project/project.mako:265 +#: website/templates/project/settings.mako:107 +msgid "Description:" +msgstr "" + +#: website/templates/project/project.mako:282 +msgid "License:" +msgstr "" + +#: website/templates/project/project.mako:283 +msgid "license" +msgstr "" + +#: website/templates/project/project.mako:291 +msgid "View Registration Form" +msgstr "" + +#: website/templates/project/project.mako:296 +msgid "View Registration Forms" +msgstr "" + +#: website/templates/project/project.mako:341 +msgid "Type:" +msgstr "" + +#: website/templates/project/project.mako:345 +#: website/templates/project/project.mako:396 +msgid "Status:" +msgstr "" + +#: website/templates/project/project.mako:349 +msgid "Volume:" +msgstr "" + +#: website/templates/project/project.mako:353 +msgid "Issue:" +msgstr "" + +#: website/templates/project/project.mako:357 +msgid "Program Area:" +msgstr "" + +#: website/templates/project/project.mako:363 +msgid "Subjects:" +msgstr "" + +#: website/templates/project/project.mako:399 +msgid "Withdrawn" +msgstr "" + +#: website/templates/project/project.mako:408 +msgid "" +"This {preprint_word} is publicly available and searchable but is subject " +"to removal by a moderator." +msgstr "" + +#: website/templates/project/project.mako:411 +msgid "" +"This {preprint_word} is not publicly available or searchable until " +"approved by a moderator." +msgstr "" + +#: website/templates/project/project.mako:415 +msgid "This {preprint_word} is publicly available and searchable." +msgstr "" + +#: website/templates/project/project.mako:417 +msgid "This {preprint_word} is not publicly available or searchable." +msgstr "" + +#: website/templates/project/project.mako:461 +#: website/templates/project/view_file.mako:57 +msgid "Loading files..." +msgstr "" + +#: website/templates/project/project.mako:502 +#: website/templates/util/render_addon_widget.mako:70 +msgid "Citation" +msgstr "" + +#: website/templates/project/addon/citations_widget.mako:16 +#: website/templates/project/project.mako:514 +#: website/templates/util/render_addon_widget.mako:136 +msgid "Loading citations..." +msgstr "" + +#: website/templates/project/project.mako:519 +msgid "Customize" +msgstr "" + +#: website/templates/project/project.mako:527 +msgid "Chicago" +msgstr "" + +#: website/templates/project/project.mako:531 +msgid "Get more citations" +msgstr "" + +#: website/templates/project/project.mako:549 +#, python-format +msgid "" +"
                              Cite as:
                              " +"" +msgstr "" + +#: website/templates/project/project.mako:560 +msgid "Enter custom citation" +msgstr "" + +#: website/templates/project/project.mako:601 +msgid "Recent Activity" +msgstr "" + +#: website/templates/project/project.mako:602 +msgid "Clear Filters" +msgstr "" + +#: website/templates/project/project.mako:603 +msgid "Refresh" +msgstr "" + +#: website/templates/project/project.mako:635 +msgid "Loading logs..." +msgstr "" + +#: website/templates/project/project.mako:641 +msgid "Download as file" +msgstr "" + +#: website/templates/project/project.mako:642 +#: website/templates/project/timestamp.mako:206 +msgid "Download" +msgstr "" + +#: website/templates/project/project.mako:655 +msgid "Components" +msgstr "" + +#: website/templates/project/project.mako:659 +msgid "Add Component" +msgstr "" + +#: website/templates/project/project.mako:661 +msgid "Link Projects" +msgstr "" + +#: website/templates/project/project.mako:671 +msgid "Add components to organize your project." +msgstr "" + +#: website/templates/project/project_header.mako:16 +msgid "Component" +msgstr "" + +#: website/templates/project/project_header.mako:16 +msgid "Navigation" +msgstr "" + +#: website/templates/project/project_header.mako:61 +msgid "Analytics" +msgstr "" + +#: website/templates/project/project_header.mako:67 +msgid "Registrations" +msgstr "" + +#: website/templates/project/project_header.mako:76 +msgid "Add-ons" +msgstr "" + +#: website/templates/project/project_header.mako:96 +#: website/templates/project/timestamp.mako:2 +msgid "Timestamp" +msgstr "" + +#: website/templates/project/project_header.mako:128 +msgid "" +"This file is part of a registration and is being shown in its archived " +"version (and cannot be altered)." +msgstr "" + +#: website/templates/project/project_header.mako:129 +#, python-format +msgid "" +"The active file is viewable from within the live %(nodeType)s." +msgstr "" + +#: website/templates/project/project_header.mako:131 +#, python-format +msgid "" +"This registration is a frozen, non-editable version of this %(nodeType)s" +msgstr "" + +#: website/templates/project/project_header.mako:135 +#, python-format +msgid "" +"This is a pending registration of this " +"%(nodeType)s, awaiting approval from project administrators. This " +"registration will be final when all project administrators approve the " +"registration or 48 hours pass, whichever comes first." +msgstr "" + +#: website/templates/project/project_header.mako:141 +#: website/templates/project/project_header.mako:173 +msgid "Cancel registration" +msgstr "" + +#: website/templates/project/project_header.mako:159 +#, python-format +msgid "This %(nodeType)s is currently pending withdrawal." +msgstr "" + +#: website/templates/project/project_header.mako:163 +#, python-format +msgid "" +"This %(nodeType)s is a withdrawn registration of this %(nodeType)s; the content of the " +"%(nodeType)s has been taken down for the reason(s) stated below." +msgstr "" + +#: website/templates/project/project_header.mako:168 +#, python-format +msgid "" +"This %(nodeType)s is currently pending registration, awaiting approval " +"from project administrators. This registration will be final and enter " +"the embargo period when all project administrators approve the " +"registration or 48 hours pass, whichever comes first. The embargo will " +"keep the registration private until the embargo period ends." +msgstr "" + +#: website/templates/project/project_header.mako:182 +#, python-format +msgid "" +"This registration is currently embargoed. It will remain private until " +"its embargo end date, %(embargoEndDate)s." +msgstr "" + +#: website/templates/project/project_header.mako:188 +#, python-format +msgid "" +"This %(nodeType)s contains supplemental materials for a preprint, but has" +" been made Private. Make your supplemental materials discoverable by " +"making this %(nodeType)s Public." +msgstr "" + +#: website/templates/project/project_header.mako:192 +#, python-format +msgid "" +"This %(nodeType)s is being viewed through an anonymized, view-only link. " +"If you want to view it as a contributor, click here." +msgstr "" + +#: website/templates/project/project_header.mako:196 +#, python-format +msgid "" +"This %(nodeType)s is being viewed through a private, view-only link. " +"Anyone with the link can view this project. Keep the link safe." +msgstr "" + +#: website/templates/project/settings.mako:17 +#: website/templates/project/settings.mako:76 +#: website/templates/project/settings.mako:150 +#: website/templates/project/settings.mako:163 +#: website/templates/util/render_node.mako:18 +msgid "node_type" +msgstr "" + +#: website/templates/project/settings.mako:21 +#: website/templates/project/settings.mako:178 +msgid "Storage Location" +msgstr "" + +#: website/templates/project/settings.mako:33 +#: website/templates/project/settings.mako:225 +msgid "Access Requests" +msgstr "" + +#: website/templates/project/settings.mako:39 +#: website/templates/project/settings.mako:318 +msgid "Commenting" +msgstr "" + +#: website/templates/project/settings.mako:42 +#: website/templates/project/settings.mako:359 +msgid "Email Notifications" +msgstr "" + +#: website/templates/project/settings.mako:44 +#: website/templates/project/settings.mako:391 +msgid "Redirect Link" +msgstr "" + +#: website/templates/project/settings.mako:51 +msgid "Withdraw Public Registration" +msgstr "" + +#: website/templates/project/settings.mako:57 +#: website/templates/project/settings.mako:469 +msgid "Project Affiliation / Branding" +msgstr "" + +#: website/templates/project/settings.mako:82 +msgid "(For descriptive purposes)" +msgstr "" + +#: website/templates/project/settings.mako:87 +msgid "Uncategorized" +msgstr "" + +#: website/templates/project/settings.mako:114 +msgid "Select Timestamp Function:" +msgstr "" + +#: website/templates/project/settings.mako:117 +#: website/templates/project/settings.mako:122 +msgid "Timestamp only" +msgstr "" + +#: website/templates/project/settings.mako:133 +msgid "Save changes" +msgstr "" + +#: website/templates/project/settings.mako:141 +msgid "" +"A project cannot be deleted if it has any components within it." +" To delete a parent project, you must " +"first delete all child components by " +"visiting their settings pages." +msgstr "" + +#: website/templates/project/settings.mako:150 +#: website/templates/project/settings.mako:163 +#, python-format +msgid "Delete %(nodeType)s" +msgstr "" + +#: website/templates/project/settings.mako:156 +#, python-format +msgid "" +"A project which is related to a external group (%(group)s) cannot be " +"deleted." +msgstr "" + +#: website/templates/project/settings.mako:185 +msgid "Storage location cannot be changed after project is created." +msgstr "" + +#: website/templates/project/settings.mako:237 +msgid "Allow users to request access to this project." +msgstr "" + +#: website/templates/project/settings.mako:270 +#, python-format +msgid "Enable the wiki in %(title)s." +msgstr "" + +#: website/templates/project/settings.mako:283 +msgid "Configure" +msgstr "" + +#: website/templates/project/settings.mako:286 +#, python-format +msgid "Control who can edit the wiki of %(title)s" +msgstr "" + +#: website/templates/project/settings.mako:288 +#, python-format +msgid "" +"Control who can edit your wiki. To allow all GakuNin RDM users to edit " +"the wiki, %(title)s must be public." +msgstr "" + +#: website/templates/project/settings.mako:298 +msgid "Loading wiki settings..." +msgstr "" + +#: website/templates/project/settings.mako:328 +msgid "Only contributors can post comments" +msgstr "" + +#: website/templates/project/settings.mako:334 +#, python-format +msgid "When the %(nodeType)s is public, any GakuNin RDM user can post comments" +msgstr "" + +#: website/templates/project/settings.mako:363 +msgid "" +"These notification settings only apply to you. They do NOT affect any " +"other contributor on this project." +msgstr "" + +#: website/templates/project/settings.mako:402 +msgid "Redirect visitors from your project page to an external webpage" +msgstr "" + +#: website/templates/project/settings.mako:427 +#: website/templates/project/settings.mako:449 +msgid "Withdraw Registration" +msgstr "" + +#: website/templates/project/settings.mako:435 +#, python-format +msgid "" +"Withdrawing children components of a registration is not allowed. Should " +"you wish to withdraw this component, " +"please withdraw its parent registration here." +msgstr "" + +#: website/templates/project/settings.mako:442 +msgid "" +"Withdrawing a registration will remove its content from the GakuNin RDM, " +"but leave basic metadata behind. The " +"title of a withdrawn registration and its contributor list will remain, " +"as will justification or explanation " +"of the withdrawal, should you wish to provide it. Withdrawn" +" registrations will be marked with a " +"withdrawn tag." +msgstr "" + +#: website/templates/project/settings.mako:451 +msgid "This registration is already pending withdrawal." +msgstr "" + +#: website/templates/project/settings.mako:474 +msgid "" +"Contributors with read-only permissions to this project cannot add or " +"remove institutional affiliations." +msgstr "" + +#: website/templates/project/settings.mako:477 +msgid "" +"Projects can be affiliated with institutions that have created GakuNin " +"RDM for Institutions accounts." +msgstr "" + +#: website/templates/project/settings.mako:478 +msgid "This allows:" +msgstr "" + +#: website/templates/project/settings.mako:480 +msgid "institutional logos to be displayed on public projects" +msgstr "" + +#: website/templates/project/settings.mako:481 +msgid "public projects to be discoverable on specific institutional landing pages" +msgstr "" + +#: website/templates/project/settings.mako:482 +msgid "single sign-on to the GakuNin RDM with institutional credentials" +msgstr "" + +#: website/templates/project/settings.mako:483 +msgid "FAQ" +msgstr "" + +#: website/templates/project/settings.mako:511 +msgid "Available Institutions:" +msgstr "" + +#: website/templates/project/timestamp.mako:10 +msgid "Timestamp Control" +msgstr "" + +#: website/templates/project/timestamp.mako:27 +msgid "Timestamp Error" +msgstr "" + +#: website/templates/project/timestamp.mako:41 +msgid "Start Date" +msgstr "" + +#: website/templates/project/timestamp.mako:47 +msgid "End Date" +msgstr "" + +#: website/templates/project/timestamp.mako:53 +msgid "User" +msgstr "" + +#: website/templates/project/timestamp.mako:60 +msgid "Apply" +msgstr "" + +#: website/templates/project/timestamp.mako:69 +msgid "Verify" +msgstr "" + +#: website/templates/project/timestamp.mako:70 +msgid "Request Trusted Timestamp" +msgstr "" + +#: website/templates/project/timestamp.mako:81 +msgid "Processing, please wait..." +msgstr "" + +#: website/templates/project/timestamp.mako:99 +msgid "per page:" +msgstr "" + +#: website/templates/project/timestamp.mako:122 +msgid "Provider" +msgstr "" + +#: website/templates/project/timestamp.mako:129 +msgid "File Path" +msgstr "" + +#: website/templates/project/timestamp.mako:136 +msgid "Timestamp by" +msgstr "" + +#: website/templates/project/timestamp.mako:143 +msgid "Updated at" +msgstr "" + +#: website/templates/project/timestamp.mako:150 +msgid "Timestamp Verification" +msgstr "" + +#: website/templates/project/view_file.mako:19 +msgid "Version:" +msgstr "" + +#: website/templates/project/view_file.mako:34 +#: website/templates/project/view_file.mako:36 +msgid "Timestamp verification:" +msgstr "" + +#: website/templates/project/view_file.mako:52 +msgid "No files" +msgstr "" + +#: website/templates/project/view_file.mako:107 +msgid "Connected to collaborative file editing" +msgstr "" + +#: website/templates/project/view_file.mako:111 +msgid "" +"This page is currently connected to collaborative file editing. All edits" +" made will be visible to contributors with write permission in " +"real time. Changes will be stored but not published until you " +"click the \"Save\" button." +msgstr "" + +#: website/templates/project/view_file.mako:128 +msgid "Connecting to collaborative file editing" +msgstr "" + +#: website/templates/project/view_file.mako:132 +msgid "" +"This page is currently attempting to connect to collaborative file " +"editing. You may continue to make edits." +msgstr "" + +#: website/templates/project/view_file.mako:148 +msgid "Collaborative file editing is unavailable" +msgstr "" + +#: website/templates/project/view_file.mako:152 +msgid "" +"Collaborative file editing is currently unavailable. You may continue to " +"make edits." +msgstr "" + +#: website/templates/project/addon/node_settings.mako:15 +msgid "Submit" +msgstr "" + +#: website/templates/project/addon/node_settings_default.mako:7 +#, python-format +msgid "authorized by %(ownerName)s" +msgstr "" + +#: website/templates/project/addon/page.mako:4 +msgid "Add-on" +msgstr "" + +#: website/templates/project/addon/page.mako:21 +#: website/templates/project/addon/widget.mako:17 +#, python-format +msgid "%(fullname)s add-on is not configured properly." +msgstr "" + +#: website/templates/project/addon/page.mako:23 +#: website/templates/project/addon/widget.mako:19 +#: website/templates/util/render_addon_widget.mako:240 +#, python-format +msgid "Configure this add-on on the add-ons page." +msgstr "" + +#: website/templates/util/contributor_list.mako:18 +#, python-format +msgid "%(othersCount)s more" +msgstr "" + +#: website/templates/util/oauth_complete.mako:9 +msgid "OAuth Complete" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:30 +msgid "Read More" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:61 +msgid "Dataset" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:64 +msgid "Global ID" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:67 +#: website/templates/util/render_addon_widget.mako:68 +msgid "Dataverse" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:93 +#, python-format +msgid "" +"This project contains a forward to ." +msgstr "" + +#: website/templates/util/render_addon_widget.mako:99 +#: website/templates/util/render_addon_widget.mako:112 +msgid "Redirect" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:107 +#, python-format +msgid "" +"This project contains a forward to ." +msgstr "" + +#: website/templates/util/render_addon_widget.mako:144 +#: website/templates/util/render_addon_widget.mako:175 +msgid "Loading" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:147 +#: website/templates/util/render_addon_widget.mako:178 +msgid "Error occurred" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:151 +msgid "Linked JupyterHubs" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:158 +msgid "Launch" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:166 +msgid "No Linked JupyterHubs" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:182 +msgid "Management Project" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:184 +msgid "Flowable Task Service" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:192 +#: website/templates/util/render_addon_widget.mako:219 +msgid "Deposit Manuscript & Data" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:200 +#: website/templates/util/render_addon_widget.mako:225 +msgid "Image Scan only" +msgstr "" + +#: website/templates/util/render_node.mako:5 +msgid "component" +msgstr "" + +#: website/templates/util/render_node.mako:18 +#, python-format +msgid "Linked %(nodeType)s" +msgstr "" + +#: website/templates/util/render_node.mako:22 +msgid "This project is private" +msgstr "" + +#: website/templates/util/render_node.mako:57 +msgid "Remove link" +msgstr "" + +#: website/templates/util/render_node.mako:58 +#, python-format +msgid "Create a fork of %(summaryTitle)s" +msgstr "" + +#: website/templates/util/render_node.mako:66 +msgid "Manage Contributors" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:245 +msgid "My Screen Test" +msgstr "" diff --git a/site/guides/screen-expansion/osf.io/website/translations/ja/LC_MESSAGES/js_messages.po b/site/guides/screen-expansion/osf.io/website/translations/ja/LC_MESSAGES/js_messages.po new file mode 100644 index 0000000..78f5fdf --- /dev/null +++ b/site/guides/screen-expansion/osf.io/website/translations/ja/LC_MESSAGES/js_messages.po @@ -0,0 +1,7796 @@ +# Japanese translations for . +# Copyright (C) 2020 ORGANIZATION +# This file is distributed under the same license as the project. +# FIRST AUTHOR , 2020. +# +msgid "" +msgstr "" +"Project-Id-Version: 0.6.0\n" +"Report-Msgid-Bugs-To: rocs-office@nii.ac.jp\n" +"POT-Creation-Date: 2020-09-03 12:45+0900\n" +"PO-Revision-Date: 2020-09-03 12:45+0900\n" +"Last-Translator: Shunta Nishikawa\n" +"Language: ja\n" +"Language-Team: RCOS \n" +"Plural-Forms: nplurals=1; plural=0\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.7.0\n" + +#: addons/twofactor/static/twoFactorUserConfig.js:148 +#: addons/twofactor/static/twoFactorUserConfig.js:190 +#: admin/static/js/rdm_addons/rdm-addons-page.js:71 +#: website/static/js/accountSettings.js:286 +#: website/static/js/accountSettings.js:351 +#: website/static/js/accountSettings.js:477 +#: website/static/js/accountSettings.js:549 +#: website/static/js/addProjectPlugin.js:347 +#: website/static/js/addonPermissions.js:55 +#: website/static/js/addonSettings.js:71 website/static/js/addonSettings.js:134 +#: website/static/js/apiApplication.js:249 +#: website/static/js/apiApplication.js:420 +#: website/static/js/apiApplication.js:487 +#: website/static/js/apiPersonalToken.js:228 +#: website/static/js/apiPersonalToken.js:399 +#: website/static/js/apiPersonalToken.js:426 +#: website/static/js/citationsNodeConfig.js:169 +#: website/static/js/citationsNodeConfig.js:187 +#: website/static/js/contribManager.js:433 website/static/js/fangorn.js:537 +#: website/static/js/fangorn.js:542 website/static/js/fangorn.js:1212 +#: website/static/js/fangorn.js:1235 website/static/js/fangorn.js:1288 +#: website/static/js/fangorn.js:1307 website/static/js/fangorn.js:2006 +#: website/static/js/filepage/index.js:213 +#: website/static/js/folderPickerNodeConfig.js:510 +#: website/static/js/folderPickerNodeConfig.js:566 +#: website/static/js/institutionProjectSettings.js:102 +#: website/static/js/licensePicker.js:243 website/static/js/myProjects.js:1560 +#: website/static/js/myProjects.js:1608 website/static/js/myProjects.js:1632 +#: website/static/js/nodeControl.js:227 +#: website/static/js/oauthAddonNodeConfig.js:156 +#: website/static/js/oauthAddonNodeConfig.js:174 +#: website/static/js/osfHelpers.js:796 website/static/js/osfHelpers.js:897 +#: website/static/js/pages/profile-settings-addons-page.js:35 +#: website/static/js/pages/profile-settings-addons-page.js:101 +#: website/static/js/pages/project-addons-page.js:41 +#: website/static/js/pages/project-addons-page.js:66 +#: website/static/js/privateLinkTable.js:119 website/static/js/profile.js:373 +#: website/static/js/profile.js:743 website/static/js/profile.js:975 +#: website/static/js/project.js:39 website/static/js/project.js:143 +#: website/static/js/project.js:253 +#: website/static/js/wikiSettingsTreebeard.js:31 +msgid "Cancel" +msgstr "キャンセル" + +#: addons/twofactor/static/twoFactorUserConfig.js:178 +msgid "Enable Two-factor Authentication" +msgstr "2要素認証を有効にする" + +#: addons/twofactor/static/twoFactorUserConfig.js:179 +msgid "" +"Enabling two-factor authentication will not immediately activate this " +"feature for your account. You will need to follow the steps that appear " +"below to complete the activation of two-factor authentication for your " +"account." +msgstr "" +"2要素認証を有効にしても、アカウントのこの機能はすぐには有効になりません。 " +"アカウントの2要素認証のアクティベーションを完了するには、以下に表示される手順に従う必要があります。" + +#: addons/twofactor/static/twoFactorUserConfig.js:187 +msgid "Enable" +msgstr "有効にする" + +#: addons/wiki/static/WikiEditor.js:86 +msgid "Live editing mode" +msgstr "ライブ編集モード" + +#: addons/wiki/static/WikiEditor.js:88 +msgid "Attempting to connect" +msgstr "接続試行中" + +#: addons/wiki/static/WikiEditor.js:90 +msgid "Unsupported browser" +msgstr "サポートされていないブラウザ" + +#: addons/wiki/static/WikiEditor.js:92 +msgid "Unavailable: Live editing" +msgstr "利用不可:ライブ編集" + +#: addons/wiki/static/WikiEditor.js:153 +msgid "The wiki content could not be loaded." +msgstr "Wikiコンテンツをロードできませんでした。" + +#: addons/wiki/static/WikiEditor.js:155 +msgid "Could not GET wiki contents." +msgstr "Wikiコンテンツを取得できませんでした。" + +#: addons/wiki/static/WikiEditor.js:176 +msgid "There are unsaved changes to your wiki. If you exit " +msgstr "wikiに未保存の変更があります。" + +#: addons/wiki/static/WikiEditor.js:177 +msgid "the page now, those changes may be lost." +msgstr "ここでページを終了すると、これらの変更が失われる可能性があります。" + +#: addons/wiki/static/wikiPage.js:94 +#: website/static/js/pages/project-dashboard-page.js:733 +msgid "" +"*Add important information, links, or images here to describe your " +"project.*" +msgstr "*重要な情報、リンク、または画像をここに追加して、プロジェクトを説明してください。*" + +#: addons/wiki/static/wikiPage.js:96 +#: website/static/js/pages/project-dashboard-page.js:735 +msgid "*No wiki content.*" +msgstr "* Wikiコンテンツはありません。*" + +#: addons/wiki/static/wikiPage.js:220 +msgid "Live preview" +msgstr "ライブプレビュー" + +#: addons/wiki/static/wikiPage.js:222 +msgid "Current version" +msgstr "現在のバージョン" + +#: addons/wiki/static/wikiPage.js:224 +msgid "Previous version" +msgstr "前のバージョン" + +#: addons/wiki/static/wikiPage.js:226 +msgid "Version " +msgstr "バージョン" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:48 +msgid "Strong " +msgstr "強調構文 " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:51 +msgid "Emphasis " +msgstr "強調構文 " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:54 +msgid "Spellcheck: Toggle spellcheck on and off" +msgstr "スペルチェック:スペルチェックのオンとオフを切り替えます" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:56 +msgid "Hyperlink " +msgstr "ハイパーリンク " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:60 +msgid "Blockquote
                              " +msgstr "引用構文
                              " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:63 +msgid "Code Sample
                              "
                              +msgstr "コードサンプル 
                              "
                              +
                              +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:66
                              +msgid "Image "
                              +msgstr "画像 "
                              +
                              +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:70
                              +msgid "Numbered List 
                                " +msgstr "段落番号
                                  " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:71 +msgid "Bulleted List
                                    " +msgstr "箇条書き
                                      " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:72 +msgid "List item" +msgstr "リストアイテム" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:74 +msgid "Heading

                                      /

                                      " +msgstr "見出し

                                      /

                                      " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:77 +msgid "Horizontal Rule
                                      " +msgstr "水平の罫線
                                      " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:79 +msgid "Undo -" +msgstr "元に戻す -" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:80 +msgid "Redo -" +msgstr "やり直す -" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:82 +msgid "Wiki Syntax Help" +msgstr "Wiki構文のヘルプ" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:1939 +msgid "Autocomplete" +msgstr "自動更新" + +#: admin/static/js/collection_providers/collectionProviders.js:9 +msgid "Hide Form" +msgstr "フォームを隠す" + +#: admin/static/js/collection_providers/collectionProviders.js:9 +msgid "Modify Collection Provider" +msgstr "コレクションプロバイダを変更" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:64 +#, python-format +msgid "Disallow %s?" +msgstr "%sを禁止しますか?" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:65 +msgid "Are you sure you want to disallow the %1$s?
                                      " +msgstr "%1$sを禁止してもよろしいですか?
                                      " + +#: admin/static/js/rdm_addons/rdm-addons-page.js:66 +msgid "" +"This will revoke access to %1$s for all projects using the " +"accounts.

                                      " +msgstr "これにより、アカウントを使用するすべてのプロジェクトの%1$sへのアクセスが取り消されます。

                                      " + +#: admin/static/js/rdm_addons/rdm-addons-page.js:67 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:395 +msgid "Type the following to continue: %1$s

                                      " +msgstr "次を入力して続行します。%1$s

                                      " + +#: admin/static/js/rdm_addons/rdm-addons-page.js:74 +msgid "Disallow" +msgstr "禁止" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:85 +msgid "Strings did not match" +msgstr "文字列が一致しませんでした" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:26 +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:19 +msgid "Other (Please Specify)" +msgstr "その他(具体的にご記入ください)" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:85 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:100 +#: website/static/js/addonSettings.js:171 +msgid "Error while updating addon account" +msgstr "アドオンアカウントの更新中にエラーが発生しました" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:100 +msgid "Please select a Dataverse repository." +msgstr "Dataverseリポジトリを選択してください。" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:105 +msgid "Please enter an API token." +msgstr "APIトークンを入力してください。" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:110 +msgid "Please enter a Dataverse host and an API token." +msgstr "DataverseホストとAPIトークンを入力してください。" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:131 +msgid "Could not authenticate with Dataverse" +msgstr "Dataverseで認証できませんでした" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:144 +msgid "Disconnect Dataverse Account?" +msgstr "Dataverseアカウントを切断しますか?" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:146 +msgid "" +"Are you sure you want to disconnect the Dataverse account on " +"%1$s? This will revoke access to Dataverse for all " +"projects associated with this account." +msgstr "" +"%1$sのDataverseアカウントを切断してもよろしいですか? " +"これにより、このアカウントに関連付けられているすべてのプロジェクトのDataverseへのアクセスが取り消されます。" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:155 +#: admin/static/js/rdm_addons/figshare/rdm-cfg.js:34 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:124 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:411 +#: website/static/js/addonSettings.js:130 +#: website/static/js/folderPickerNodeConfig.js:562 +msgid "Disconnect" +msgstr "切断" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:173 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:142 +#: website/static/js/addonSettings.js:150 +msgid "Error while removing addon authorization for %1$s" +msgstr "%1$sのアドオン認証を削除中にエラーが発生しました" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:212 +msgid "Could not GET Dataverse settings" +msgstr "Dataverse設定を取得できませんでした" + +#: admin/static/js/rdm_addons/figshare/rdm-cfg.js:17 +msgid "Disconnect figshare Account?" +msgstr "figshareアカウントを切断しますか?" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:46 +msgid "Invalid management URL: " +msgstr "無効な管理URL:" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:61 +msgid "Saving management project was successful" +msgstr "管理プロジェクトの保存に成功しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:63 +msgid "Error while saving addon management project" +msgstr "アドオン管理プロジェクトの保存中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:71 +msgid "Permission error while saving management project" +msgstr "管理プロジェクトの保存中のアクセス許可エラー" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:73 +msgid "Error while saving management project" +msgstr "管理プロジェクトの保存中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:91 +msgid "Removing management project was successful" +msgstr "管理プロジェクトの削除に成功しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:93 +msgid "Error while removing addon management project" +msgstr "アドオン管理プロジェクトの削除中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:101 +msgid "Permission error while removing management project" +msgstr "管理プロジェクトの削除中に権限エラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:103 +msgid "Error while removing management project" +msgstr "管理プロジェクトの削除中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:118 +msgid "Error while fetching addon management project" +msgstr "アドオン管理プロジェクトの取得中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:149 +msgid "Saving organizational project was successful" +msgstr "組織プロジェクトの保存に成功しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:151 +msgid "Error while saving addon organizational project" +msgstr "アドオン組織プロジェクトの保存中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:159 +msgid "Permission error while saving organizational project" +msgstr "組織プロジェクトの保存中に権限エラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:161 +msgid "Error while saving organizational project" +msgstr "組織プロジェクトの保存中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:179 +msgid "Removing organizational project was successful" +msgstr "組織プロジェクトの削除に成功しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:181 +msgid "Error while removing addon organizational project" +msgstr "アドオン組織プロジェクトの削除中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:189 +msgid "Permission error while removing organizational project" +msgstr "組織プロジェクトの削除中に許可エラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:191 +msgid "Error while removing organizational project" +msgstr "組織プロジェクトの削除中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:206 +msgid "Error while fetching addon organization project" +msgstr "アドオン組織プロジェクトの取得中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:222 +msgid "Error while fetching management project" +msgstr "管理プロジェクトの取得中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:226 +msgid "Error while fetching organizational project" +msgstr "組織プロジェクトの取得中にエラーが発生しました" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:58 +msgid "Could not GET OwnCloud settings" +msgstr "OwnCloud設定を取得できませんでした" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:75 +msgid "Please enter an ownCloud server." +msgstr "ownCloudサーバーを入力してください。" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:77 +msgid "Please select an ownCloud server." +msgstr "ownCloudサーバーを選択してください。" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:82 +msgid "Please enter a username and password." +msgstr "ユーザー名とパスワードを入力してください。" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:86 +msgid "Please enter an ownCloud host and credentials." +msgstr "ownCloudホストと資格情報を入力してください。" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:104 +msgid "Could not authenticate with ownCloud" +msgstr "ownCloudで認証できませんでした" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:48 +msgid "Please enter both an API access key and secret key." +msgstr "APIアクセスキーとシークレットキーの両方を入力してください。" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:53 +msgid "Please enter an API access key." +msgstr "APIアクセスキーを入力してください。" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:58 +msgid "Please enter an API secret key." +msgstr "APIシークレットキーを入力してください。" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:75 +msgid "Could not authenticate with S3" +msgstr "S3で認証できませんでした" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:113 +msgid "Disconnect Amazon S3 Account?" +msgstr "Amazon S3アカウントを切断しますか?" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:115 +msgid "" +"Are you sure you want to disconnect the S3 account %1$s?" +" This will revoke access to S3 for all projects associated with this " +"account." +msgstr "" +"S3アカウント%1$sを切断してもよろしいですか?これにより、このアカウントに関連付けられているすべてのプロジェクトのS3へのアクセスが取り消されます。" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:80 +msgid "Are you sure you want to change institutional storage?" +msgstr "機関のストレージを変更してもよろしいですか?" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:81 +msgid "" +"

                                      The previous storage will no longer be available to all contributors " +"on the project.

                                      " +msgstr "

                                      以前のストレージは、プロジェクトのすべてのメンバーが利用できなくなります。

                                      " + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:85 +#: website/static/js/folderPickerNodeConfig.js:100 +#: website/static/js/folderPickerNodeConfig.js:102 +#: website/static/js/folderPickerNodeConfig.js:594 +msgid "Change" +msgstr "変更" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:264 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:491 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:626 +msgid "Some errors occurred" +msgstr "いくつかのエラーが発生しました" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:311 +msgid "Institutional Storage set successfully" +msgstr "機関ストレージが正常に設定されました" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:391 +#: website/static/js/addonSettings.js:118 +msgid "Disconnect Account?" +msgstr "アカウントを切断しますか?" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:393 +msgid "" +"Are you sure you want to disconnect the %1$s account " +"%2$s?
                                      " +msgstr "1$sアカウント%2$sを切断してもよろしいですか?" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:394 +msgid "" +"This will revoke access to %1$s for all projects using this " +"account.

                                      " +msgstr "これにより、このアカウントを使用するすべてのプロジェクトの%1$sへのアクセスが取り消されます。" + +#: scripts/translations/messages_addonsJson.js:3 +msgid "" +"\n" +"\n" +"

                                      Box Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking a GakuNin RDM project public or private is " +"independent of Box privacy. The GakuNin RDM does not alter the " +"permissions of linked Box folders.
                                      View / download file versionsBox files and their versions can be viewed/downloaded" +" via GakuNin RDM.
                                      Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Box.
                                      Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Box.
                                      LogsThe GakuNin RDM keeps track of changes you make to " +"your Box content through the GakuNin RDM, but not for changes made using " +"Box directly.
                                      ForkingForking a project or component does not copy Box " +"authorization unless the user forking the project is the same user who " +"authorized the Box add-on in the source project being forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      Box アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Boxのプライバシー設定とは独立しています。GakuNin " +"RDMはリンクされたBoxフォルダの権限を変更することはありません。
                                      ファイルバージョンの閲覧/ダウンロードBoxファイルとそのバージョンはGakuNin RDM経由で閲覧/ダウンロードできます。
                                      ファイルの追加/更新GakuNin RDM経由でプロジェクトのファイルを追加/更新すると、Boxにも反映されます。
                                      ファイルの削除GakuNin RDM経由で削除したファイルは、Boxでも削除されます。
                                      ログGakuNin RDM経由で行われたBoxコンテンツへの変更の履歴はGakuNin " +"RDMに記録されますが、直接Boxを使って行われた変更は記録されません。
                                      フォークプロジェクトやコンポーネントのフォーク時、Boxの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでBoxアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:5 +msgid "" +"\n" +"\n" +"

                                      Dataverse Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Dataverse study public or private. The GakuNin " +"RDM allows you to release the latest draft version of a Dataverse " +"dataset.
                                      View / download file versionsFiles from the latest release of the selected " +"Dataverse study can be viewed/downloaded. GakuNin RDM users with write " +"permissions can view/download draft files as well.
                                      Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Dataverse.
                                      Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Dataverse.
                                      LogsThe GakuNin RDM keeps track of changes you make to " +"your Dataverse studies through the GakuNin RDM, but not for changes made " +"using Dataverse directly.
                                      ForkingForking a project or component does not copy " +"Dataverse authorization unless the user forking the project is the same " +"user who authorized the Dataverse add-on in the source project being " +"forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      Dataverse アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Dataverse研究をパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMでは最新のドラフトバージョンのDataverseデータセットのリリースが行えます。
                                      ファイルバージョンの閲覧/ダウンロード選択したDataverse研究の最新リリースのファイルを閲覧/ダウンロードできます。書き込み許可を持つGakuNin " +"RDMユーザーは、ドラフトファイルも閲覧/ダウンロードできます。
                                      ファイルの追加/更新GakuNin " +"RDM経由でプロジェクトのファイルを追加/更新すると、Dataverseにも反映されます。
                                      ファイルの削除GakuNin RDM経由で削除したファイルは、Dataverseでも削除されます。
                                      ログGakuNin RDM経由で行われたDataverse研究への変更の履歴はGakuNin " +"RDMに記録されますが、直接Dataverseを使って行われた変更は記録されません。
                                      フォークプロジェクトやコンポーネントのフォーク時、Dataverseの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでDataverseアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:7 +msgid "" +"\n" +"\n" +"

                                      Dropbox Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking a GakuNin RDM project public or private is " +"independent of Dropbox privacy. The GakuNin RDM does not alter the " +"permissions of linked Dropbox folders.
                                      View / download file versionsDropbox files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                      Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Dropbox.
                                      Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Dropbox.
                                      LogsGakuNin RDM keeps track of changes you make to your " +"Dropbox content through GakuNin RDM, but not for changes made using " +"Dropbox directly.
                                      ForkingForking a project or component does not copy Dropbox " +"authorization unless the user forking the project is the same user who " +"authorized the Dropbox add-on in the source project being forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      Dropbox アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Dropboxのプライバシー設定とは独立しています。GakuNin " +"RDMはリンクされたDropboxフォルダの権限を変更することはありません。
                                      ファイルバージョンの閲覧/ダウンロードDropboxファイルとそのバージョンはGakuNin RDM経由で閲覧/ダウンロードできます。
                                      ファイルの追加/更新GakuNin " +"RDM経由でプロジェクトのファイルを追加/更新すると、Dropboxにも反映されます。
                                      ファイルの削除GakuNin RDM経由で削除したファイルは、Dropboxでも削除されます。
                                      ログGakuNin RDM経由で行われたDropboxコンテンツへの変更の履歴はGakuNin " +"RDMに記録されますが、直接Dropboxを使って行われた変更は記録されません。
                                      フォークプロジェクトやコンポーネントのフォーク時、Dropboxの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでDropboxアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:9 +msgid "" +"\n" +"\n" +"

                                      figshare Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      Permissions Making a GakuNin RDM project public or private is " +"independent of making figshare content public or private. The GakuNin RDM" +" does not alter the permissions of linked figshare content.
                                      View / download file versionsfigshare files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported.
                                      Add / update filesFiles can be added but not updated.
                                      Delete filesPrivate files and filesets can be deleted via GakuNin" +" RDM.
                                      LogsGakuNin RDM keeps track of changes you make to your " +"figshare content through GakuNin RDM, but not for changes made using " +"figshare directly.
                                      ForkingForking a project or component does not copy figshare" +" authorization unless the user forking the project is the same user who " +"authorized the figshare add-on in the source project being forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      figshare アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、figshareコンテンツをパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMはリンクされたfigshareコンテンツの権限を変更することはありません。
                                      ファイルバージョンの閲覧/ダウンロードfigshareファイルはGakuNin " +"RDM経由で閲覧/ダウンロードできますが、バージョン履歴はサポートされていません。
                                      ファイルの追加/更新ファイルの追加はできますが更新はできません。
                                      ファイルの削除プライベートファイルとファイルセットはGakuNin RDM経由で削除できます。
                                      ログGakuNin RDM経由で行われたfigshareコンテンツへの変更の履歴はGakuNin " +"RDMに記録されますが、直接figshareを使って行われた変更は記録されません。
                                      フォークプロジェクトやコンポーネントのフォーク時、figshareの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでfigshareアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:11 +msgid "" +"\n" +"\n" +"

                                      GitHub Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a GitHub repo public or private. The GakuNin RDM " +"does not alter the permissions of linked GitHub repos.
                                      View / download file versionsGitHub files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                      Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in GitHub.
                                      Delete filesFiles deleted via GakuNin RDM will be deleted in " +"GitHub.
                                      LogsGitHub dynamically updates GakuNin RDM logs when " +"files are modified outside the GakuNin RDM. Changes to GitHub repos made " +"before the repo is linked to the GakuNin RDM will not be reflected in " +"GakuNin RDM logs.
                                      ForkingForking a project or component does not copy Github " +"authorization unless the user forking the project is the same user who " +"authorized the Github add-on in the source project being forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      GitHub アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、GitHubリポジトリをパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMはリンクされたGitHubリポジトリの権限を変更することはありません。
                                      ファイルバージョンの閲覧/ダウンロードGitHubファイルとそのバージョンはGakuNin RDM経由で閲覧/ダウンロードできます。
                                      ファイルの追加/更新GakuNin " +"RDM経由でプロジェクトのファイルを追加/更新すると、GitHubにも反映されます。
                                      ファイルの削除GakuNin RDM経由で削除したファイルは、GitHubでも削除されます。
                                      ログGakuNin RDM外でファイルが変更された場合、GitHubは同時にGakuNin " +"RDMログを更新します。GakuNin RDMへリンクする以前にGitHubリポジトリに加えられた変更は、GakuNin " +"RDMログには反映されません。
                                      フォークプロジェクトやコンポーネントのフォーク時、Githubの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでGithubアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:13 +msgid "" +"\n" +"\n" +"

                                      GitLab Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a GitLab repo public or private. The GakuNin RDM " +"does not alter the permissions of linked GitLab repos.
                                      View / download file versionsGitLab files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                      Add / update filesAdding/updating files in the project via GakuNin RDM " +"is not implemented yet.
                                      Delete filesDeleting files via GakuNin RDM is not implemented " +"yet.
                                      LogsGakuNin RDM does not keep track of changes made using" +" Gitlab directly.
                                      ForkingForking a project or component does not copy GitLab " +"authorization unless the user forking the project is the same user who " +"authorized the GitLab add-on in the source project being forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      GitLab アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                      規約ステータス
                                      権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、GitLabリポジトリをパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMはリンクされたGitLabリポジトリの権限を変更することはありません。
                                      ファイルバージョンの閲覧/ダウンロードGitLabファイルとそのバージョンはGakuNin RDM経由で閲覧/ダウンロードできます。
                                      ファイルの追加/更新GakuNin RDM経由でプロジェクトのファイルを追加/更新する機能はまだ実装されていません。
                                      ファイルの削除GakuNin RDM経由でファイルを削除する機能はまだ実装されていません。
                                      ログ直接Gitlabを使って行われた変更の履歴はGakuNin RDMに記録されません。
                                      フォークプロジェクトやコンポーネントのフォーク時、GitLabの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでGitLabアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:15 +msgid "" +"\n" +"\n" +"

                                      Mendeley Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Mendeley folder public or private. The GakuNin " +"RDM does not alter the permissions of a linked Mendeley folder.
                                      ForkingForking a project or component does not copy Mendeley" +" authorization unless the user forking the project is the same user who " +"authorized the Mendeley add-on in the source project being forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      Mendeley アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Mendeleyフォルダをパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMはリンクされたMendeleyフォルダの権限を変更することはありません。
                                      フォークプロジェクトやコンポーネントのフォーク時、Mendeleyの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでMendeleyアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:17 +msgid "" +"\n" +"\n" +"

                                      Zotero Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Zotero folder public or private. The GakuNin RDM " +"does not alter the permissions of a linked Zotero folder.
                                      ForkingForking a project or component does not copy Zotero " +"authorization unless the user forking the project is the same user who " +"authorized the Zotero add-on in the source project being forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      Zotero アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Zoteroフォルダをパブリックまたはプライベートにする設定とは独立しています。GakuNin " +"RDMはリンクされたZoteroフォルダの権限を変更することはありません。
                                      フォークプロジェクトやコンポーネントのフォーク時、Zoteroの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでZoteroアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:19 +msgid "" +"\n" +"\n" +"

                                      ownCloud Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking a GakuNin RDM project public or private is " +"independent of ownCloud privacy. The GakuNin RDM does not alter the " +"permissions of linked ownCloud folders.
                                      View / download file versionsownCloud files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported by the ownCloud WebDAV " +"API.
                                      Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in ownCloud.
                                      Delete filesFiles deleted via GakuNin RDM will be deleted in " +"ownCloud.
                                      LogsGakuNin RDM keeps track of changes you make to your " +"ownCloud content through GakuNin RDM, but not for changes made using " +"ownCloud directly.
                                      ForkingForking a project or component does not copy ownCloud" +" authorization unless the user forking the project is the same user who " +"authorized the ownCloud add-on in the source project being forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      ownCloud アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、ownCloudのプライバシー設定とは独立しています。GakuNin " +"RDMはリンクされたownCloudフォルダの権限を変更することはありません。
                                      ファイルバージョンの閲覧/ダウンロードownCloudのファイルは、GakuNin RDMから閲覧 / " +"ダウンロードをすることができますが、バージョン履歴はownCloud WebDAV APIではサポートされていません。
                                      ファイルの追加/更新GakuNin RDMからプロジェクトのファイルを追加 / " +"更新すると、ownCloudに反映されます。
                                      ファイルの削除GakuNin RDMから削除されたファイルは、ownCloudで削除されます。
                                      ログGakuNin RDMは、Gaku Nin " +"RDMからownCloudのコンテンツに行った変更を追跡しますが、ownCloudを使って直接行った変更については追跡しません。
                                      フォークプロジェクトやコンポーネントのフォーク時、ownCloudの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでownCloudアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:21 +msgid "" +"\n" +"\n" +"

                                      OneDrive Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking a GakuNin RDM project public or private is " +"independent of OneDrive privacy. The GakuNin RDM does not alter the " +"permissions of linked OneDrive folders.
                                      View / download file versionsOneDrive files and their versions can be " +"viewed/downloaded via GakuNin RDM. OneNote files are unexportable and " +"cannot be downloaded or viewed.
                                      Add / update filesThe OneDrive add-on is read-only.
                                      Delete filesThe OneDrive add-on is read-only.
                                      LogsGakuNin RDM keeps track of changes you make to your " +"OneDrive add-on configuration. It does not track changes to OneDrive " +"content.
                                      ForkingForking a project or component does not copy OneDrive" +" authorization unless the user forking the project is the same user who " +"authorized the OneDrive add-on in the source project being forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      OneDrive アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、OneDriveのプライバシー設定とは独立しています。GakuNin " +"RDMはリンクされたOneDriveフォルダの権限を変更することはありません。
                                      ファイルバージョンの閲覧/ダウンロードOneDriveファイルとそのバージョンはGakuNin " +"RDM経由で閲覧/ダウンロードできます。OneNoteファイルはエクスポート不可で、ダウンロードも閲覧もできません。
                                      ファイルの追加/更新OneDriveアドオンは読み取り専用です。
                                      ファイルの削除OneDriveアドオンは読み取り専用です。
                                      ログOneDriveアドオン設定に加えられた変更の履歴はGakuNin " +"RDMに記録されますが、OneDriveコンテンツへの変更の履歴は記録されません。
                                      フォークプロジェクトやコンポーネントのフォーク時、OneDriveの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでOneDriveアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:23 +msgid "" +"\n" +"\n" +"

                                      Amazon S3 Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an S3 bucket public or private. The GakuNin RDM " +"does not alter the permissions of linked S3 buckets.
                                      View / download file versionsThe S3 add-on supports file versions if versioning is" +" enabled for your S3 buckets.
                                      Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Amazon S3.
                                      Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Amazon S3.
                                      LogsThe GakuNin RDM keeps track of changes you make to " +"your S3 buckets through the GakuNin RDM, but not for changes made using " +"S3 directly.
                                      ForkingForking a project or component does not copy S3 " +"authorization unless the user forking the project is the same user who " +"authorized the S3 add-on in the source project being forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      Amazon S3 アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、S3バケットをパブリックまたはプライベートにする設定とは独立しています。GakuNin " +"RDMはリンクされたS3バケットの権限を変更することはありません。
                                      ファイルバージョンの閲覧/ダウンロードご利用のS3でバージョニングが有効になっている場合は、S3アドオンでファイルバージョンがサポートされます。
                                      ファイルの追加/更新GakuNin RDM経由でプロジェクトのファイルを追加/更新すると、Amazon " +"S3にも反映されます。
                                      ファイルの削除GakuNin RDM経由で削除したファイルは、Amazon S3でも削除されます。
                                      ログGakuNin RDM経由で行われたS3バケットへの変更の履歴はGakuNin " +"RDMに記録されますが、直接S3を使って行われた変更は記録されません。
                                      フォークプロジェクトやコンポーネントのフォーク時、S3の認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでS3アドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:25 +msgid "" +"\n" +"\n" +"

                                      Google Drive Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking a GakuNin RDM project public or private is " +"independent of Google Drive privacy. The GakuNin RDM does not alter the " +"permissions of linked Google Drive folders.
                                      View / download file versionsGoogle Drive files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                      Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Google Drive.
                                      Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Google Drive.
                                      LogsThe GakuNin RDM keeps track of changes you make to " +"your Google Drive content through the GakuNin RDM, but not for changes " +"made using Google Drive directly.
                                      ForkingForking a project or component does not copy Google " +"Drive authorization unless the user forking the project is the same user " +"who authorized the Google Drive add-on in the source project being " +"forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      Google Drive アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin RDMプロジェクトを公開または非公開にする設定は、Google " +"Driveのプライバシー設定とは独立しています。GakuNin RDMはリンクされたGoogle " +"Driveフォルダの権限を変更することはありません。
                                      ファイルバージョンの閲覧/ダウンロードGoogle DriveファイルとそのバージョンはGakuNin " +"RDM経由で閲覧/ダウンロードできます。
                                      ファイルの追加/更新GakuNin RDM経由でプロジェクトのファイルを追加/更新すると、Google " +"Driveにも反映されます。
                                      ファイルの削除GakuNin RDM経由で削除したファイルは、Google Driveでも削除されます。
                                      ログGakuNin RDM経由で行われたGoogle Driveコンテンツへの変更の履歴はGakuNin " +"RDMに記録されますが、直接Google Driveを使って行われた変更は記録されません。
                                      フォークプロジェクトやコンポーネントのフォーク時、Google " +"Driveの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでGoogle " +"Driveアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:27 +msgid "" +"\n" +"\n" +"

                                      Bitbucket Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Bitbucket repo public or private. The GakuNin RDM" +" does not alter the permissions of linked Bitbucket repos.
                                      View / download file versionsBitbucket files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                      Add / update filesBitbucket does not support adding or updating files " +"via their API.
                                      Delete filesBitbucket does not support deleting files via their " +"API.
                                      LogsGakuNin RDM keeps track of changes you make to your " +"Bitbucket content through GakuNin RDM, but not for changes made using " +"Bitbucket directly.
                                      ForkingForking a project or component does not copy " +"Bitbucket authorization unless the user forking the project is the same " +"user who authorized the Bitbucket add-on in the source project being " +"forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      Bitbucket アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                      規約ステータス
                                      権限GakuNin GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Bitbucketリポジトリをパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMはリンクされたBitbucketリポジトリの権限を変更することはありません。
                                      ファイルバージョンの閲覧/ダウンロードBitbucketのファイルおよびそのバージョンは、GakuNin RDMから閲覧 / " +"ダウンロードすることができます。
                                      ファイルの追加/更新Bitbucketは、APIからのファイルの追加または更新をサポートしていません。
                                      ファイルの削除Bitbucketは、APIからのファイルの削除をサポートしていません。
                                      ログGakuNin RDMは、Gaku Nin " +"RDMからBitbucketのコンテンツに行った変更を追跡しますが、Bitbucketを使って直接行った変更については追跡しません。
                                      フォークプロジェクトやコンポーネントのフォーク時、Bitbucketの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでBitbucketアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:29 +msgid "" +"\n" +"\n" +"

                                      Azure Blob Storage Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an Azure Blob Storage container public or " +"private.
                                      View / download file versionsThe Azure Blob Storage add-on supports only Block " +"Blobs, and does not support file versions.
                                      Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Azure Blob Storage.
                                      Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Azure Blob Storage.
                                      LogsThe GakuNin RDM keeps track of changes you make to " +"your Azure Blob Storage containers through the GakuNin RDM, but not for " +"changes made using Azure Blob Storage directly.
                                      ForkingForking a project or component does not copy Azure " +"Blob Storage authorization unless the user forking the project is the " +"same user who authorized the Azure Blob Storage add-on in the source " +"project being forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      Azure Blob Storage アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin RDMプロジェクトを公開または非公開にする設定は、Azure Blob " +"Storageコンテナをパブリックまたはプライベートにする設定とは独立しています。
                                      ファイルバージョンの閲覧/ダウンロードAzure Blob StorageのアドオンはBlock " +"Blobsのみをサポートしており、ファイルバージョンはサポートされていません。
                                      ファイルの追加/更新GakuNin RDMからプロジェクトのファイルを追加 / 更新すると、Azure Blob " +"Storageに反映されます。
                                      ファイルの削除GakuNin RDMから削除されたファイルは、Azure Blob " +"Storageで削除されます。
                                      ログGakuNin RDMは、Gaku Nin RDMからAzure Blob " +"Storageのコンテナに行った変更を追跡しますが、Azure Blob Storageを使って直接行った変更については追跡しません。
                                      フォークプロジェクトやコンポーネントのフォーク時、Azure Blob " +"Storageの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでAzure Blob " +"Storageアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:31 +msgid "" +"\n" +"\n" +"

                                      Nextcloud Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking a GakuNin RDM project public or private is " +"independent of Nextcloud privacy. The GakuNin RDM does not alter the " +"permissions of linked Nextcloud folders.
                                      View / download file versionsNextcloud files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported by the Nextcloud WebDAV " +"API.
                                      Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Nextcloud.
                                      Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Nextcloud.
                                      LogsGakuNin RDM keeps track of changes you make to your " +"Nextcloud content through GakuNin RDM, but not for changes made using " +"Nextcloud directly.
                                      ForkingForking a project or component does not copy " +"Nextcloud authorization unless the user forking the project is the same " +"user who authorized the Nextcloud add-on in the source project being " +"forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      Nextcloud アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Nextcloudのプライバシー設定とは独立しています。GakuNin " +"RDMはリンクされたNextcloudフォルダの権限を変更することはありません。
                                      ファイルバージョンの閲覧/ダウンロードNextcloudのファイルは、GakuNin RDMから閲覧 / " +"ダウンロードをすることができますが、バージョン履歴はNextcloud WebDAV APIではサポートされていません。
                                      ファイルの追加/更新GakuNin RDMからプロジェクトのファイルを追加 / " +"更新すると、Nextcloudに反映されます。
                                      ファイルの削除GakuNin RDMから削除されたファイルは、Nextcloudで削除されます。
                                      ログGakuNin RDMは、Gaku Nin " +"RDMからNextcloudのコンテンツに行った変更を追跡しますが、Nextcloudを使って直接行った変更については追跡しません。
                                      フォークプロジェクトやコンポーネントのフォーク時、Nextcloudの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでNextcloudアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:33 +msgid "" +"\n" +"\n" +"

                                      OpenStack Swift Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an Swift container public or private.
                                      View / download file versionsThe Swift add-on does not support file versions.
                                      Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Swift.
                                      Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Swift.
                                      LogsThe GakuNin RDM keeps track of changes you make to " +"your Swift containers through the GakuNin RDM, but not for changes made " +"using Swift directly.
                                      ForkingForking a project or component does not copy Swift " +"authorization unless the user forking the project is the same user who " +"authorized the Swift add-on in the source project being forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      OpenStack Swift アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Swiftコンテナをパブリックまたはプライベートにする設定とは独立しています。
                                      ファイルバージョンの閲覧/ダウンロードSwiftアドオンは、ファイルバージョンをサポートしていません。
                                      ファイルの追加/更新GakuNin RDMからプロジェクトのファイルを追加 / " +"更新すると、Swiftに反映されます。
                                      ファイルの削除GakuNin RDMから削除されたファイルは、Swiftで削除されます。
                                      ログGakuNin RDMは、Gaku Nin " +"RDMからSwiftのコンテナに行った変更を追跡しますが、Swiftを使って直接行った変更については追跡しません。
                                      フォークプロジェクトやコンポーネントのフォーク時、Swiftの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでSwiftアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:35 +msgid "" +"\n" +"\n" +"

                                      S3 Compatible Storage Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an S3 Compatible Storage bucket public or private. " +"The GakuNin RDM does not alter the permissions of linked S3 Compatible " +"Storage buckets.
                                      View / download file versionsThe S3 add-on supports file versions if versioning is" +" enabled for your S3 Compatible Storage buckets.
                                      Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in S3 Compatible Storage.
                                      Delete filesFiles deleted via GakuNin RDM will be deleted in S3 " +"Compatible Storage.
                                      LogsThe GakuNin RDM keeps track of changes you make to " +"your S3 Compatible Storage buckets through the GakuNin RDM, but not for " +"changes made using S3 Compatible Storage directly.
                                      ForkingForking a project or component does not copy S3 " +"Compatible Storage authorization unless the user forking the project is " +"the same user who authorized the S3 Compatible Storage add-on in the " +"source project being forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      S3 Compatible Storage アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin RDMプロジェクトを公開または非公開にする設定は、S3 Compatible " +"Storageバケットをパブリックまたはプライベートにする設定とは独立しています。GakuNin RDMはリンクされたS3 Compatible " +"Storageバケットの権限を変更することはありません。
                                      ファイルバージョンの閲覧/ダウンロードS3 Compatible " +"Storageバケットのバージョニングが有効になっていれば、S3アドオンはファイルバージョンをサポートします。
                                      ファイルの追加/更新GakuNin RDMからプロジェクトのファイルを追加 / 更新すると、S3 Compatible " +"Storageに反映されます。
                                      ファイルの削除GakuNin RDMから削除されたファイルは、S3 Compatible " +"Storageで削除されます。
                                      ログGakuNin RDMは、Gaku Nin RDMからS3 Compatible " +"Storageのバケットに行った変更を追跡しますが、S3 Compatible " +"Storageを使って直接行った変更については追跡しません。
                                      フォークプロジェクトやコンポーネントのフォーク時、S3 Compatible " +"Storageの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでS3 Compatible " +"Storageアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:37 +msgid "" +"\n" +"\n" +"

                                      WEKO Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      Add / update filesAdding/updating indices/items in the project via " +"GakuNin RDM will be reflected in WEKO.
                                      Delete filesItems deleted via GakuNin RDM will be deleted in " +"WEKO.
                                      LogsThe GakuNin RDM keeps track of changes you make to " +"your WEKO index through the GakuNin RDM, but not for changes made using " +"WEKO directly.
                                      ForkingForking a project or component does not copy WEKO " +"authorization unless the user forking the project is the same user who " +"authorized the WEKO add-on in the source project being forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      WEKO アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      ファイルの追加/更新GakuNin RDMからプロジェクトのインデックス / アイテムを追加 / " +"更新すると、WEKOに反映されます。
                                      ファイルの削除GakuNin RDMから削除されたアイテムは、WEKOで削除されます。
                                      ログGakuNin RDMは、Gaku Nin " +"RDMからWEKOのインデックスに行った変更を追跡しますが、WEKOを使って直接行った変更については追跡しません。
                                      フォークプロジェクトやコンポーネントのフォーク時、WEKOの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでWEKOアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:39 +msgid "" +"\n" +"\n" +"

                                      JupyterHub Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsThe GakuNin RDM does not affect the permissions of " +"JupyterHub.
                                      View / download file versionsThe JupyterHub add-on does not provide Storage " +"Features.
                                      Add / update filesThe JupyterHub add-on does not provide Storage " +"Features.
                                      Delete filesThe JupyterHub add-on does not provide Storage " +"Features.
                                      LogsThe JupyterHub add-on does not provide Storage " +"Features.
                                      ForkingForking a project or component copies information " +"about linked JupyterHub but the GakuNin RDM does not affect " +"authentication of JupyterHub.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      JupyterHub アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin RDMは、JupyterHubの権限に影響を及ぼしません。
                                      ファイルバージョンの閲覧/ダウンロードJupyterHubアドオンはストレージ機能を提供しません。
                                      ファイルの追加/更新JupyterHubアドオンはストレージ機能を提供しません。
                                      ファイルの削除JupyterHubアドオンはストレージ機能を提供しません。
                                      ログJupyterHubアドオンはストレージ機能を提供しません。
                                      フォークプロジェクトまたはコンポーネントのフォークを行うと、リンクされたJupyterHubに関する情報がコピーされますが、GakuNin " +"RDMはJupyterHubの認証に影響を及ぼしません。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: scripts/translations/messages_addonsJson.js:41 +msgid "" +"\n" +"\n" +"

                                      IQB-RIMS Add-on Terms

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      FunctionStatus
                                      PermissionsMaking an GakuNin RDM project public or private is " +"independent of Google Drive privacy. The GakuNin RDM does not alter the " +"permissions of linked Google Drive folders.
                                      View / download file versionsIQB-RIMS files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                      Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Google Drive.
                                      Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Google Drive.
                                      LogsThe GakuNin RDM keeps track of changes you make to " +"your Google Drive content through the GakuNin RDM, but not for changes " +"made using Google Drive directly.
                                      ForkingForking a project or component does not copy Google " +"Drive authorization unless the user forking the project is the same user " +"who authorized the IQB-RIMS add-on in the source project being " +"forked.
                                      \n" +"\n" +"
                                        \n" +"
                                      • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                      • \n" +"
                                      • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                      • \n" +"
                                      \n" +msgstr "" +"\n" +"\n" +"

                                      IQB-RIMS アドオン規約

                                      \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                      機能ステータス
                                      権限GakuNin RDMプロジェクトを公開または非公開にする設定は、Google " +"Driveのプライバシー設定とは独立しています。GakuNin RDMはリンクされたGoogle " +"Driveフォルダの権限を変更することはありません。
                                      ファイルバージョンの閲覧/ダウンロードIQB-RIMSのファイルとそのバージョンは、GakuNin RDMから閲覧 / " +"ダウンロードをすることができます。
                                      ファイルの追加/更新GakuNin RDM経由でプロジェクトのファイルを追加/更新すると、Google " +"Driveにも反映されます。
                                      ファイルの削除GakuNin RDM経由で削除したファイルは、Google Driveでも削除されます。
                                      ログGakuNin RDMは、Gaku Nin RDMからGoogle " +"Driveのコンテンツに行った変更を追跡しますが、Google Driveを使って直接行った変更については追跡しません。
                                      フォークプロジェクトやコンポーネントのフォーク時、Google Drive" +"の認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでIQB-" +"RIMSアドオンを承認したユーザーと同一である場合はコピーされます。
                                      \n" +"\n" +"
                                        \n" +"
                                      • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                      • \n" +" " +"
                                      • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                      • \n" +"
                                      \n" + +#: website/static/js/accessRequestManager.js:85 +msgid "There was a problem trying to %1$s the request from the user. %2$s" +msgstr "ユーザーからのリクエストを%1$sしようとして問題が発生しました。%2$s" + +#: website/static/js/accessRequestManager.js:86 +#: website/static/js/accessRequestManager.js:87 +msgid "Could not %1$s access request" +msgstr "アクセスリクエストを%1$sできませんでした" + +#: website/static/js/accessRequestManager.js:115 +#: website/static/js/contribAdder.js:71 website/static/js/contribManager.js:211 +msgid "Read" +msgstr "読込み" + +#: website/static/js/accessRequestManager.js:116 +#: website/static/js/contribAdder.js:72 website/static/js/contribManager.js:212 +msgid "Read + Write" +msgstr "読込み / 書込み" + +#: website/static/js/accessRequestManager.js:117 +#: website/static/js/contribAdder.js:73 website/static/js/contribManager.js:213 +msgid "Administrator" +msgstr "管理者" + +#: website/static/js/accountClaimer.js:34 +msgid "Email will arrive shortly" +msgstr "メールはまもなく届きます" + +#: website/static/js/accountClaimer.js:34 +msgid "Please check " +msgstr "こちらのメールアドレスをチェックしてください。" + +#: website/static/js/accountClaimer.js:41 +msgid "Claim as %1$s?" +msgstr "%1$sとして申し立てますか?" + +#: website/static/js/accountClaimer.js:42 +msgid "If you claim this account, a contributor of this project " +msgstr "このアカウントを申請すると、このプロジェクトのメンバー" + +#: website/static/js/accountClaimer.js:43 +msgid "will be emailed to confirm your identity." +msgstr "にメールで本人確認が行われます。" + +#: website/static/js/accountClaimer.js:61 +msgid "Claim" +msgstr "請求" + +#: website/static/js/accountClaimer.js:73 +msgid "Is this you? Click to claim" +msgstr "あなたですか? クリックして申し立てる" + +#: website/static/js/accountClaimer.js:99 +msgid "Claim Account" +msgstr "アカウントを請求" + +#: website/static/js/accountClaimer.js:101 +msgid "Enter email..." +msgstr "メールアドレスを入力…" + +#: website/static/js/accountClaimer.js:105 +msgid "Not a valid email." +msgstr "有効なメールではありません。" + +#: website/static/js/accountSettings.js:83 +msgid "Could not fetch user profile." +msgstr "ユーザープロフィールを取得できませんでした。" + +#: website/static/js/accountSettings.js:84 +#: website/static/js/accountSettings.js:115 +#: website/static/js/licensePicker.js:197 +msgid "Error fetching user profile" +msgstr "ユーザープロフィールの取得エラー" + +#: website/static/js/accountSettings.js:112 +msgid "" +"User profile not updated. Please refresh the page and try again or " +"contact %1$s if the problem persists." +msgstr "ユーザープロファイルは更新されません。 ページを更新して再試行するか、問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/accountSettings.js:199 +msgid "Duplicate Email" +msgstr "メールアドレスが重複" + +#: website/static/js/accountSettings.js:220 +msgid "Confirmation email sent" +msgstr "確認メールを送信しました" + +#: website/static/js/accountSettings.js:221 +msgid "%1$s was added to your account." +msgstr "%1$sがアカウントに追加されました。" + +#: website/static/js/accountSettings.js:222 +msgid " You will receive a confirmation email at %1$s." +msgstr "%1$sに確認メールが届きます。" + +#: website/static/js/accountSettings.js:223 +msgid "" +" Please click the link in your email to confirm this action. You will be " +"required to enter your password." +msgstr "このアクションを確認するには、メールのリンクをクリックしてください。 パスワードを入力する必要があります。" + +#: website/static/js/accountSettings.js:226 website/static/js/fangorn.js:2258 +#: website/static/js/folderPickerNodeConfig.js:591 +#: website/static/js/pages/profile-settings-addons-page.js:72 +#: website/static/js/pages/project-settings-page.js:118 +msgid "Close" +msgstr "閉じる" + +#: website/static/js/accountSettings.js:236 +msgid "Email cannot be empty." +msgstr "メールを空にすることはできません。" + +#: website/static/js/accountSettings.js:244 +msgid "Resend Email Confirmation?" +msgstr "メールの確認を再送信しますか?" + +#: website/static/js/accountSettings.js:245 +msgid "Are you sure that you want to resend email confirmation to %1$s?" +msgstr "確認メールを%1$sに再送信してもよろしいですか?" + +#: website/static/js/accountSettings.js:250 +msgid "Email confirmation resent to %1$s" +msgstr "確認メールを%1$sに再送信してもよろしいですか?" + +#: website/static/js/accountSettings.js:251 +msgid "You will receive a new confirmation email at %1$s." +msgstr "%1$sに新しい確認メールが届きます。" + +#: website/static/js/accountSettings.js:252 +msgid "" +" Please log out of this account and check your email to confirm this " +"action." +msgstr "このアカウントからログアウトし、メールを確認してこのアクションを確認してください。" + +#: website/static/js/accountSettings.js:259 +msgid "Resend" +msgstr "再送" + +#: website/static/js/accountSettings.js:270 +msgid "Remove Email?" +msgstr "メールを削除しますか?" + +#: website/static/js/accountSettings.js:271 +msgid "Are you sure that you want to remove %1$s from your email list?" +msgstr "メーリングリストから%1$sを削除してもよろしいですか?" + +#: website/static/js/accountSettings.js:282 +#: website/static/js/accountSettings.js:347 +#: website/static/js/addonPermissions.js:51 +#: website/static/js/addonSettings.js:67 +#: website/static/js/pages/profile-settings-addons-page.js:97 +#: website/static/js/privateLinkTable.js:115 website/static/js/profile.js:739 +#: website/static/js/profile.js:971 website/static/js/project.js:249 +msgid "Remove" +msgstr "削除" + +#: website/static/js/accountSettings.js:291 +#: website/static/js/accountSettings.js:304 +msgid "Please refresh the page and try again." +msgstr "ページを更新してもう一度お試しください。" + +#: website/static/js/accountSettings.js:317 +msgid "You have revoked this connected identity." +msgstr "この接続されたIDを取り消しました。" + +#: website/static/js/accountSettings.js:322 +msgid "Revocation request failed. Please contact %1$s if the problem persists." +msgstr "取り消し要求が失敗しました。 問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/accountSettings.js:325 +msgid "Error revoking connected identity" +msgstr "接続されたIDの取り消しエラー" + +#: website/static/js/accountSettings.js:338 +msgid "Remove authorization?" +msgstr "認証を削除しますか?" + +#: website/static/js/accountSettings.js:339 +msgid "Are you sure you want to remove this authorization?" +msgstr "この認証を削除してもよろしいですか?" + +#: website/static/js/accountSettings.js:383 +msgid "" +"You have successfully changed your default storage location to " +"%1$s." +msgstr "デフォルトの保存場所を%1$sに正常に変更しました。" + +#: website/static/js/accountSettings.js:387 +msgid "" +"Your attempt to change your default storage location has failed. Please " +"contact %1$s if the problem persists." +msgstr "デフォルトの保存場所を変更しようとして失敗しました。 問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/accountSettings.js:390 +msgid "Error updating default storage location " +msgstr "デフォルトの保管場所の更新エラー" + +#: website/static/js/accountSettings.js:413 +msgid "" +"An GakuNin RDM administrator will contact you shortly to confirm your " +"deactivation request." +msgstr "GakuNin RDM管理者がすぐに連絡して、非アクティブ化リクエストを確認します。" + +#: website/static/js/accountSettings.js:421 +msgid "Deactivation request failed. Please contact %1$s if the problem persists." +msgstr "非アクティブ化要求が失敗しました。 問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/accountSettings.js:425 +#: website/static/js/accountSettings.js:450 +msgid "Error requesting account deactivation" +msgstr "アカウントの無効化のリクエストエラー" + +#: website/static/js/accountSettings.js:438 +msgid "An GakuNin RDM account is no longer up for review." +msgstr "GakuNin RDMアカウントのレビューは終了しました。" + +#: website/static/js/accountSettings.js:446 +msgid "" +"Deactivation request failed. Please contact rdm_support@nii.ac.jp if the problem " +"persists." +msgstr "" +"非アクティブ化要求が失敗しました。 問題が解決しない場合は、
                                      rdm_support@nii.ac.jpまでご連絡ください。" + +#: website/static/js/accountSettings.js:463 +msgid "Request account deactivation?" +msgstr "アカウントの無効化をリクエストしますか?" + +#: website/static/js/accountSettings.js:464 +msgid "" +"Are you sure you want to request account deactivation? A GakuNinRDM " +"administrator will review your request. If accepted, you " +msgstr "アカウントの無効化をリクエストしてもよろしいですか? GakuNinRDM管理者がリクエストを確認します。 認証された場合、" + +#: website/static/js/accountSettings.js:465 +msgid "will NOT be able to reactivate your account." +msgstr "アカウントを再開することはできません。" + +#: website/static/js/accountSettings.js:473 +#: website/static/js/accountSettings.js:546 +msgid "Request" +msgstr "リクエスト" + +#: website/static/js/accountSettings.js:485 +msgid "Cancel deactivation request?" +msgstr "無効化リクエストをキャンセルしますか?" + +#: website/static/js/accountSettings.js:486 +msgid "" +"Are you sure you want to rescind your account deactivation request? This " +"will preserve your account status." +msgstr "アカウントの無効化リクエストを取り消してもよろしいですか? これにより、アカウントの状態が保持されます。" + +#: website/static/js/accountSettings.js:494 +msgid "Cancel Deactivation Request" +msgstr "無効化リクエストをキャンセルする" + +#: website/static/js/accountSettings.js:512 +msgid "" +"An GakuNin RDM administrator will contact you shortly to confirm your " +"export request." +msgstr "GakuNin RDM管理者がすぐに連絡して、非アクティブ化リクエストを確認します。" + +#: website/static/js/accountSettings.js:520 +msgid "Export request failed. Please contact %1$s if the problem persists." +msgstr "エクスポート要求が失敗しました。 問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/accountSettings.js:524 +msgid "Error requesting account export" +msgstr "アカウントのエクスポートをリクエスト中にエラーが発生しました" + +#: website/static/js/accountSettings.js:537 +msgid "Request account export?" +msgstr "アカウントのエクスポートをリクエストしますか?" + +#: website/static/js/accountSettings.js:538 +msgid "Are you sure you want to request account export?" +msgstr "アカウントのエクスポートをリクエストしてもよろしいですか?" + +#: website/static/js/addProjectPlugin.js:21 +#: website/static/js/addProjectPlugin.js:24 +#: website/static/js/myProjects.js:1118 +msgid "Create new project" +msgstr "新規プロジェクト作成" + +#: website/static/js/addProjectPlugin.js:57 +msgid "There was an unknown error. Please try again later." +msgstr "不明なエラーがありました。 後でもう一度やり直してください。" + +#: website/static/js/addProjectPlugin.js:184 website/static/js/conference.js:19 +msgid "Title" +msgstr "タイトル" + +#: website/static/js/addProjectPlugin.js:198 +msgid "Enter %1$s title" +msgstr "%1$sのタイトルを入力してください" + +#: website/static/js/addProjectPlugin.js:203 +msgid "Affiliation" +msgstr "所属" + +#: website/static/js/addProjectPlugin.js:210 +msgid "Remove all" +msgstr "全て削除" + +#: website/static/js/addProjectPlugin.js:217 +msgid "Select all" +msgstr "全て選択" + +#: website/static/js/addProjectPlugin.js:233 +msgid "Storage location" +msgstr "ストレージロケーション" + +#: website/static/js/addProjectPlugin.js:251 +msgid " Add contributors from " +msgstr "次からメンバーを追加する:" + +#: website/static/js/addProjectPlugin.js:253 +msgid " Admins of " +msgstr " " + +#: website/static/js/addProjectPlugin.js:253 +msgid " will have read access to this component." +msgstr "の管理者は、このコンポーネントへの読み取りアクセス権を持ちます。" + +#: website/static/js/addProjectPlugin.js:264 +msgid " Add tags from " +msgstr "次からタグを追加する:" + +#: website/static/js/addProjectPlugin.js:268 +msgid "License" +msgstr "ライセンス" + +#: website/static/js/addProjectPlugin.js:270 +msgid " This component will inherit the same license as " +msgstr "このコンポーネントは、次と同じライセンスを継承します:" + +#: website/static/js/addProjectPlugin.js:273 +msgid "Learn more." +msgstr "もっと詳しく見る" + +#: website/static/js/addProjectPlugin.js:282 +msgid " More" +msgstr "詳細" + +#: website/static/js/addProjectPlugin.js:286 +msgid "Description" +msgstr "説明" + +#: website/static/js/addProjectPlugin.js:295 +msgid "Enter %1$s description" +msgstr "%1$sの説明を入力する" + +#: website/static/js/addProjectPlugin.js:299 website/static/js/conference.js:31 +msgid "Category" +msgstr "カテゴリ" + +#: website/static/js/addProjectPlugin.js:300 +msgid " (for descriptive purposes)" +msgstr "(説明のため)" + +#: website/static/js/addProjectPlugin.js:307 +msgid "Uncategorized" +msgstr "未分類" + +#: website/static/js/addProjectPlugin.js:320 +msgid "(Empty category)" +msgstr "(空のカテゴリ)" + +#: website/static/js/addProjectPlugin.js:330 +msgid "Template (optional)" +msgstr "テンプレート(オプション)" + +#: website/static/js/addProjectPlugin.js:331 +msgid "" +"Start typing to search your projects. Selecting project as template will " +"duplicate its " +msgstr "入力を開始してプロジェクトを検索します。 プロジェクトをテンプレートとして選択すると、" + +#: website/static/js/addProjectPlugin.js:332 +msgid "" +"structure in the new project without importing the content of that " +"project." +msgstr "そのプロジェクトのコンテンツをインポートすることなく、新しいプロジェクトでその構造が複製されます。" + +#: website/static/js/addProjectPlugin.js:351 +#: website/static/js/nodeControl.js:224 +#: website/static/js/privateLinkManager.js:31 website/static/js/project.js:140 +msgid "Create" +msgstr "作成" + +#: website/static/js/addProjectPlugin.js:362 +#, python-format +msgid "Saving your %s..." +msgstr "%sを保存中..." + +#: website/static/js/addProjectPlugin.js:376 +msgid "New %1$s created successfully!" +msgstr "新しい%1$sが作成されました!" + +#: website/static/js/addProjectPlugin.js:386 +#: website/static/js/addProjectPlugin.js:434 website/static/js/project.js:62 +msgid "Keep working here" +msgstr "このページに留まる" + +#: website/static/js/addProjectPlugin.js:392 +#: website/static/js/addProjectPlugin.js:437 +msgid "Go to new %1$s" +msgstr "新しい%1$sへ移動する" + +#: website/static/js/addProjectPlugin.js:405 +msgid "Couldn't create your %1$s" +msgstr "%1$sが作成できませんでした。" + +#: website/static/js/addProjectPlugin.js:424 +msgid "Could not add institution affiliation to your new %1$s" +msgstr "新しい%1$sに所属機関を追加できませんでした" + +#: website/static/js/addProjectPlugin.js:471 +msgid "Select a project to use as a template" +msgstr "テンプレートとして使用するプロジェクトを選択します" + +#: website/static/js/addonHelper.js:37 +#: website/static/js/nodeSelectTreebeard.js:59 +#: website/static/js/notificationsTreebeard.js:59 +#: website/static/js/profile.js:311 +#: website/static/js/wikiSettingsTreebeard.js:54 +msgid "Settings updated" +msgstr "設定が更新されました" + +#: website/static/js/addonHelper.js:46 +msgid "Settings not updated." +msgstr "設定が更新されませんでした。" + +#: website/static/js/addonNodeConfig.js:39 +#: website/static/js/oauthAddonNodeConfig.js:47 +msgid "Successfully linked \"%1$s\"" +msgstr "\"%1$s\"が正常にリンクされました" + +#: website/static/js/addonNodeConfig.js:40 +#: website/static/js/oauthAddonNodeConfig.js:48 +msgid " Go to the Files page to view your content." +msgstr "ファイルページに移動して、コンテンツを表示します。" + +#: website/static/js/addonPermissions.js:21 +#: website/static/js/addonSettings.js:58 +msgid "Remove addon?" +msgstr "アドオンを削除しますか?" + +#: website/static/js/addonPermissions.js:22 +msgid "Are you sure you want to disconnnect the %1$s account from this project?" +msgstr "このプロジェクトから%1$sアカウントを切断してもよろしいですか?" + +#: website/static/js/addonPermissions.js:43 +msgid "An error occurred, the account is still connected to the project. " +msgstr "エラーが発生し、アカウントはまだプロジェクトに接続されています。" + +#: website/static/js/addonPermissions.js:44 +msgid "If the issue persists, please report it to %1$s." +msgstr "問題が解決しない場合は、%1$sに報告してください。" + +#: website/static/js/addonSettings.js:46 +msgid "Error deauthorizing node: " +msgstr "ノードの認証解除エラー:" + +#: website/static/js/addonSettings.js:59 +msgid "Are you sure you want to remove the %1$s authorization from this project?" +msgstr "このプロジェクトから%1$s認証を削除してもよろしいですか?" + +#: website/static/js/addonSettings.js:100 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of dropbox.com before attempting to connect to a second Dropbox " +"account on the GakuNin RDM. This will clear the credentials stored in " +"your browser." +msgstr "" +"アドオンが正常に認証されました。 別のアカウントをリンクする場合は、GakuNin " +"RDMの2番目のDropboxアカウントに接続する前に、dropbox.comからログアウトしてください。 " +"これにより、ブラウザに保存されている資格情報がクリアされます。" + +#: website/static/js/addonSettings.js:102 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of bitbucket.org before attempting to connect to a second " +"Bitbucket account on the GakuNin RDM. This will clear the credentials " +"stored in your browser." +msgstr "" +"アドオンが正常に認証されました。 別のアカウントをリンクする場合は、GakuNin " +"RDMの2つ目のBitbucketアカウントに接続する前に、bitbucket.orgからログアウトしてください。 " +"これにより、ブラウザに保存されている資格情報がクリアされます" + +#: website/static/js/addonSettings.js:104 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of onedrive.live.com before attempting to connect to a second " +"OneDrive account on the GakuNin RDM. This will clear the credentials " +"stored in your browser." +msgstr "" +"アドオンが正常に認証されました。 別のアカウントをリンクする場合は、GakuNin " +"RDMの2つ目のOneDriveアカウントに接続する前にonedrive.live.comからログアウトします。 " +"これにより、ブラウザに保存されている資格情報がクリアされます。" + +#: website/static/js/addonSettings.js:106 +msgid "" +"Add-on successfully authorized. To link this add-on to an GakuNin RDM " +"project, go to the settings page of the project, enable %1$s, and choose " +"content to connect." +msgstr "" +"アドオンが正常に認証されました。 このアドオンをGakuNin " +"RDMプロジェクトにリンクするには、プロジェクトの設定ページに移動し、%1$sを有効にして、接続するコンテンツを選択します。" + +#: website/static/js/addonSettings.js:109 +msgid "" +"Error while authorizing add-on. Please log in to your %1$s account and " +"grant access to the GakuNin RDM to enable this add-on." +msgstr "" +"アドオンの認証中にエラーが発生しました。 このアドオンを有効にするには、%1$sアカウントにログインし、GakuNin " +"RDMへのアクセスを許可してください。" + +#: website/static/js/addonSettings.js:120 +msgid "" +"Are you sure you want to disconnect the %1$s account " +"%2$s? This will revoke access to %1$s for all projects " +"you have authorized." +msgstr "" +"%1$sアカウント%2$sを切断してもよろしいですか? " +"これにより、認証したすべてのプロジェクトの%1$sへのアクセスが取り消されます。" + +#: website/static/js/alertsManager.js:42 +msgid "Could not dismiss alert. Please refresh page and try again." +msgstr "アラートを却下できませんでした。 ページを更新してもう一度お試しください。" + +#: website/static/js/alertsManager.js:43 website/static/js/alertsManager.js:77 +msgid "Error fetching user alerts" +msgstr "ユーザーアラートの取得エラー" + +#: website/static/js/alertsManager.js:76 +msgid "Could not fetch alerts for this page. Please refresh page and try again." +msgstr "このページのアラートを取得できませんでした。 ページを更新してもう一度お試しください。" + +#: website/static/js/apiApplication.js:215 +msgid "Error fetching list of registered applications" +msgstr "登録済みアプリケーションのリストの取得エラー" + +#: website/static/js/apiApplication.js:226 +#: website/static/js/apiApplication.js:396 +msgid "Deactivate application?" +msgstr "アプリケーションを無効にしますか?" + +#: website/static/js/apiApplication.js:234 +#: website/static/js/apiPersonalToken.js:213 +msgid " has been deactivated" +msgstr "は無効化されました" + +#: website/static/js/apiApplication.js:245 +#: website/static/js/apiApplication.js:416 +#: website/static/js/apiPersonalToken.js:224 +#: website/static/js/apiPersonalToken.js:395 +msgid "Deactivate" +msgstr "無効にする" + +#: website/static/js/apiApplication.js:295 +#: website/static/js/apiPersonalToken.js:274 +msgid "There are unsaved changes on this page." +msgstr "このページには未保存の変更があります。" + +#: website/static/js/apiApplication.js:309 +msgid "Error fetching application data" +msgstr "アプリケーションデータの取得エラー" + +#: website/static/js/apiApplication.js:344 +#: website/static/js/apiPersonalToken.js:323 +msgid "Error updating instance" +msgstr "インスタンスの更新エラー" + +#: website/static/js/apiApplication.js:370 +msgid "Error registering new OAuth2 application" +msgstr "新しいOAuth2アプリケーションの登録エラー" + +#: website/static/js/apiApplication.js:429 +msgid "Reset client secret?" +msgstr "クライアントシークレットをリセットしますか?" + +#: website/static/js/apiApplication.js:447 +msgid "Error resetting instance secret" +msgstr "インスタンスシークレットのリセットエラー" + +#: website/static/js/apiApplication.js:459 +msgid "Reset Secret" +msgstr "シークレットをリセット" + +#: website/static/js/apiApplication.js:473 +#: website/static/js/apiPersonalToken.js:412 website/static/js/profile.js:357 +msgid "Discard changes?" +msgstr "変更を破棄しますか?" + +#: website/static/js/apiApplication.js:483 +#: website/static/js/apiPersonalToken.js:422 website/static/js/profile.js:369 +msgid "Discard" +msgstr "破棄" + +#: website/static/js/apiPersonalToken.js:194 +msgid "Error fetching list of registered personal access tokens" +msgstr "登録済みの個人アクセストークンのリストの取得エラー" + +#: website/static/js/apiPersonalToken.js:205 +msgid "Deactivate personal access token?" +msgstr "パーソナルアクセストークンを無効にしますか?" + +#: website/static/js/apiPersonalToken.js:288 +msgid "Error fetching token data" +msgstr "トークンデータの取得エラー" + +#: website/static/js/apiPersonalToken.js:349 +msgid "Error registering new OAuth2 personal access token" +msgstr "新しいOAuth2個人用アクセストークンの登録エラー" + +#: website/static/js/apiPersonalToken.js:375 +msgid "Deactivate token?" +msgstr "トークンを無効にしますか?" + +#: website/static/js/citationGrid.js:180 +msgid "Copy citation" +msgstr "サイテーションをコピー" + +#: website/static/js/citationGrid.js:190 +msgid "View original document" +msgstr "元のドキュメントを表示" + +#: website/static/js/citationGrid.js:202 website/static/js/fangorn.js:2041 +msgid "View on %1$s" +msgstr "%1$sで表示" + +#: website/static/js/citationGrid.js:213 +msgid "Download citations" +msgstr "サイテーションをダウンロード" + +#: website/static/js/citationGrid.js:242 +msgid "Citation" +msgstr "引用" + +#: website/static/js/citationGrid.js:246 +msgid "Actions" +msgstr "アクション" + +#: website/static/js/citationGrid.js:294 +msgid "Only 200 citations may be displayed" +msgstr "200件のサイテーションのみが表示されます" + +#: website/static/js/citationGrid.js:311 website/static/js/citationWidget.js:44 +msgid "Enter citation style (e.g. \"APA\")" +msgstr "引用スタイルを入力します(例:\"APA\")" + +#: website/static/js/citationGrid.js:333 +msgid "Error while selecting citation style: " +msgstr "引用スタイルの選択中にエラーが発生しました:" + +#: website/static/js/citationGrid.js:412 +msgid "" +"Could not render entry. Please check the contents of your citations " +"for correctness." +msgstr "エントリをレンダリングできませんでした。 引用の内容が正しいかどうかを確認してください。" + +#: website/static/js/citationList.js:113 +msgid "Your custom citation not updated. Please refresh the page and try " +msgstr "カスタム引用は更新されません。 ページを更新して再試行するか、" + +#: website/static/js/citationList.js:114 +msgid "again or contact %1$s" +msgstr "問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/citationList.js:114 +#: website/static/js/components/publicNodes.js:192 +#: website/static/js/components/quickFiles.js:123 +#: website/static/js/osfHelpers.js:311 +msgid " if the problem persists." +msgstr " " + +#: website/static/js/citationWidget.js:46 +#: website/static/js/pages/project-dashboard-page.js:170 +#, python-format +msgid "Please enter %s or more characters" +msgstr "後%s文字入力してください" + +#: website/static/js/citationWidget.js:47 website/static/js/pointers.js:30 +msgid "Searching..." +msgstr "検索中..." + +#: website/static/js/citationWidget.js:48 +msgid "No matches found." +msgstr "該当なし" + +#: website/static/js/citationWidget.js:77 +msgid "Citation render failed" +msgstr "引用のレンダリングに失敗しました" + +#: website/static/js/citationWidget.js:78 +msgid "The requested citation format generated an error." +msgstr "要求された引用形式はエラーを生成しました。" + +#: website/static/js/citationWidget.js:81 +msgid "Unexpected error when fetching citation" +msgstr "引用を取得する際の予期しないエラー" + +#: website/static/js/citationsNodeConfig.js:38 +#: website/static/js/citationsNodeConfig.js:42 +msgid "Successfully linked \"%1$s\"." +msgstr "\"%1$s\"が正常にリンクされました。" + +#: website/static/js/citationsNodeConfig.js:38 +msgid " Go to the Overview page to view your citations." +msgstr "概要ページに移動して、引用を表示します。" + +#: website/static/js/citationsNodeConfig.js:42 +msgid " Next, choose which folder to link above." +msgstr "次に、上記のリンクするフォルダーを選択します。" + +#: website/static/js/citationsNodeConfig.js:81 +#: website/static/js/oauthAddonNodeConfig.js:209 +msgid "Could not GET %1$s accounts for user" +msgstr "ユーザーの%1$sアカウントを取得できませんでした" + +#: website/static/js/citationsNodeConfig.js:147 +msgid "Choose %1$s Access Token to Import" +msgstr "インポートする%1$s アクセストークンを選択してください" + +#: website/static/js/citationsNodeConfig.js:166 +#: website/static/js/citationsNodeConfig.js:184 +#: website/static/js/folderPickerNodeConfig.js:507 +#: website/static/js/oauthAddonNodeConfig.js:153 +#: website/static/js/oauthAddonNodeConfig.js:171 +msgid "Import" +msgstr "接続" + +#: website/static/js/citationsNodeConfig.js:175 +msgid "Import %1$s access token" +msgstr "%1$sアクセストークンをインポート" + +#: website/static/js/clipboard.js:27 +msgid "Copied!" +msgstr "コピーされました!" + +#: website/static/js/clipboard.js:32 +msgid "Copy failed!" +msgstr "コピーが失敗しました!" + +#: website/static/js/comment.js:55 +msgid "Error getting contributors and group members" +msgstr "メンバーとグループメンバーの取得エラー" + +#: website/static/js/comment.js:73 +msgid "Spam or advertising" +msgstr "スパムまたは広告" + +#: website/static/js/comment.js:74 +msgid "Hate speech" +msgstr "ヘイトスピーチ" + +#: website/static/js/comment.js:75 +msgid "Violence or harmful behavior" +msgstr "暴力や有害な行動" + +#: website/static/js/comment.js:212 +msgid "Commenting" +msgstr "コメント中" + +#: website/static/js/comment.js:212 +msgid "Comment" +msgstr "コメント" + +#: website/static/js/comment.js:232 +msgid "Exceeds character limit. Please reduce to %1$s characters or less." +msgstr "文字数の制限を超えています。%1$s文字以下に減らしてください。" + +#: website/static/js/comment.js:347 website/static/js/comment.js:555 +msgid "Please enter a comment" +msgstr "コメントを入れて下さい" + +#: website/static/js/comment.js:393 website/static/js/comment.js:588 +msgid "Could not submit comment" +msgstr "コメントを送信できませんでした" + +#: website/static/js/comment.js:394 +msgid "Error creating comment" +msgstr "コメント作成エラー" + +#: website/static/js/comment.js:589 +msgid "Error editing comment" +msgstr "コメント編集エラー" + +#: website/static/js/comment.js:634 +msgid "Could not report abuse." +msgstr "不正行為を報告できませんでした。" + +#: website/static/js/comment.js:635 +msgid "Error reporting abuse" +msgstr "不正行為の報告エラー" + +#: website/static/js/comment.js:664 +msgid "Error deleting comment" +msgstr "コメントの削除エラー" + +#: website/static/js/comment.js:702 +msgid "Error undeleting comment" +msgstr "コメントの削除解除エラー" + +#: website/static/js/comment.js:727 +msgid "Error unreporting comment" +msgstr "コメントの報告エラー" + +#: website/static/js/comment.js:807 +msgid "Your comments have unsaved changes. Are you sure " +msgstr "コメントには未保存の変更があります。" + +#: website/static/js/comment.js:808 +msgid "you want to leave this page?" +msgstr "このページから移動してもよろしいですか?" + +#: website/static/js/comment.js:826 +msgid "Could not update comment timestamp" +msgstr "コメントのタイムスタンプを更新できませんでした" + +#: website/static/js/commentpane.js:31 +msgid "Option `toggleWidth` must be greater than or equal to " +msgstr "オプション「toggleWidth」は、オプション「maxWidthProp」以上でなければなりません。" + +#: website/static/js/commentpane.js:32 +msgid "option `maxWidthProp`." +msgstr " " + +#: website/static/js/conference.js:25 +msgid "Author" +msgstr "著者" + +#: website/static/js/conference.js:37 +msgid "Date Created" +msgstr "作成日時" + +#: website/static/js/conference.js:43 website/static/js/fangorn.js:1683 +msgid "Downloads" +msgstr "ダウンロード" + +#: website/static/js/contribAdder.js:26 +msgid " project in common" +msgstr "共通プロジェクト" + +#: website/static/js/contribAdder.js:28 +msgid "Yourself" +msgstr "あなた自身" + +#: website/static/js/contribAdder.js:30 +msgid " projects in common" +msgstr "共通プロジェクト" + +#: website/static/js/contribAdder.js:82 +msgid "Add Contributors" +msgstr "メンバーを追加" + +#: website/static/js/contribAdder.js:83 +msgid "Select Components" +msgstr "コンポーネントを選択" + +#: website/static/js/contribAdder.js:85 +msgid "Invite new contributor by e-mail" +msgstr "電子メールで新しいメンバーを招待する" + +#: website/static/js/contribAdder.js:86 +msgid "Add Unregistered Contributor" +msgstr "未登録のメンバーを追加" + +#: website/static/js/contribAdder.js:331 +msgid "Full Name is required." +msgstr "氏名が必要です。" + +#: website/static/js/contribAdder.js:334 +msgid "Not a valid email address." +msgstr "有効な電子メールアドレスではありません。" + +#: website/static/js/contribAdder.js:341 +msgid "%1$s is already in queue." +msgstr "%1$sはすでにキューにあります。" + +#: website/static/js/contribAdder.js:460 +msgid "There was a problem trying to add contributors%1$s." +msgstr "メンバー%1$sを追加しようとして問題が発生しました。" + +#: website/static/js/contribAdder.js:461 +msgid "Could not add contributors" +msgstr "メンバーを追加できませんでした" + +#: website/static/js/contribAdder.js:462 +#: website/static/js/contribManager.js:139 +msgid "Error adding contributors" +msgstr "メンバーの追加エラー" + +#: website/static/js/contribAdder.js:532 +#: website/static/js/institutionProjectSettings.js:254 +#: website/static/js/nodesDelete.js:194 website/static/js/nodesPrivacy.js:207 +msgid "Unable to retrieve project settings" +msgstr "プロジェクト設定を取得できません" + +#: website/static/js/contribAdder.js:533 +#: website/static/js/institutionProjectSettings.js:255 +#: website/static/js/nodesDelete.js:195 website/static/js/nodesPrivacy.js:208 +msgid "Could not GET project settings." +msgstr "プロジェクト設定を取得できませんでした。" + +#: website/static/js/contribManager.js:137 +msgid "There was a problem trying to add the contributor. " +msgstr "メンバーを追加しようとして問題が発生しました。" + +#: website/static/js/contribManager.js:138 +msgid "Could not add contributor" +msgstr "メンバーを追加できませんでした" + +#: website/static/js/contribManager.js:300 +msgid "Must have at least one registered admin contributor" +msgstr "登録された管理メンバーーが少なくとも1人必要です" + +#: website/static/js/contribManager.js:308 +msgid "Must have at least one bibliographic contributor" +msgstr "少なくとも1人の書誌メンバーが必要です。" + +#: website/static/js/contribManager.js:364 +msgid "Your contributor list has unsaved changes. Please " +msgstr "メンバーリストには未保存の変更があります。 " + +#: website/static/js/contribManager.js:365 +msgid "save or cancel your changes before adding " +msgstr "メンバーを追加する前に、変更を保存または" + +#: website/static/js/contribManager.js:366 +msgid "contributors." +msgstr "キャンセルしてください。" + +#: website/static/js/contribManager.js:375 +msgid "There are unsaved changes to your contributor settings" +msgstr "メンバーの設定に保存されていない変更があります" + +#: website/static/js/contribManager.js:404 +msgid "Save changes?" +msgstr "変更を保存しますか?" + +#: website/static/js/contribManager.js:405 +msgid "Are you sure you want to save these changes?" +msgstr "これらの変更を保存してもよろしいですか?" + +#: website/static/js/contribManager.js:421 +msgid "Submission failed: " +msgstr "送信に失敗しました:" + +#: website/static/js/contribManager.js:429 +#: website/static/js/filepage/editor.js:180 +msgid "Save" +msgstr "保存" + +#: website/static/js/contribRemover.js:56 +#: website/static/js/contribRemover.js:57 +#: website/static/js/contribRemover.js:58 +msgid "Remove Contributor" +msgstr "メンバーを削除" + +#: website/static/js/contribRemover.js:208 +#: website/static/js/contribRemover.js:209 +msgid "Unable to retrieve projects and components" +msgstr "プロジェクトとコンポーネントを取得できません" + +#: website/static/js/contribRemover.js:232 +msgid "Unable to delete Contributor" +msgstr "メンバーを削除できません" + +#: website/static/js/contribRemover.js:233 +msgid "Could not DELETE Contributor." +msgstr "メンバーを削除できませんでした" + +#: website/static/js/fangorn.js:38 +msgid "Upload pending..." +msgstr "アップロード保留中" + +#: website/static/js/fangorn.js:41 +msgid "Copying " +msgstr "コピー中" + +#: website/static/js/fangorn.js:44 +msgid "Deleting " +msgstr "削除中" + +#: website/static/js/fangorn.js:47 +msgid "Moving " +msgstr "移動中" + +#: website/static/js/fangorn.js:50 +msgid "Renaming " +msgstr "名前を変更中" + +#: website/static/js/fangorn.js:448 +msgid "Not allowed: Private folder" +msgstr "許可されない:非公開フォルダ" + +#: website/static/js/fangorn.js:492 website/static/js/fangorn.js:522 +msgid "You cannot replace the Wiki images folder" +msgstr "Wiki画像フォルダーを置き換えることはできません" + +#: website/static/js/fangorn.js:497 website/static/js/fangorn.js:530 +msgid "An item named \"%1$s\" already exists in this location." +msgstr "\"%1$s\"という名前のアイテムはこの場所に既に存在します" + +#: website/static/js/fangorn.js:499 website/static/js/fangorn.js:508 +#: website/static/js/fangorn.js:532 +msgid "Keep Both" +msgstr "両方を保持" + +#: website/static/js/fangorn.js:499 website/static/js/fangorn.js:532 +msgid " will retain both files (and their version histories) in this location." +msgstr "はこの場所に両方のファイル(およびそれらのバージョン履歴)が保持されます。" + +#: website/static/js/fangorn.js:501 website/static/js/fangorn.js:509 +#: website/static/js/fangorn.js:534 +msgid "Replace" +msgstr "置換" + +#: website/static/js/fangorn.js:501 website/static/js/fangorn.js:534 +msgid " will overwrite the existing file in this location. " +msgstr "はこの場所にある既存のファイルを上書きします。" + +#: website/static/js/fangorn.js:502 website/static/js/fangorn.js:535 +msgid "You will lose previous versions of the overwritten file. " +msgstr "上書きされたファイルの以前のバージョンは失われます。" + +#: website/static/js/fangorn.js:503 website/static/js/fangorn.js:536 +msgid "You will keep previous versions of the moved file." +msgstr "移動したファイルの以前のバージョンを保持します。" + +#: website/static/js/fangorn.js:504 +msgid "\"Skip\" will skip the current file." +msgstr "\"スキップ\"は現在のファイルをスキップします。" + +#: website/static/js/fangorn.js:505 +msgid "\"Stop\" will only move files with no conflicts." +msgstr "\"停止\"は、競合のないファイルのみを移動します。" + +#: website/static/js/fangorn.js:510 +msgid "Skip" +msgstr "スキップ" + +#: website/static/js/fangorn.js:511 +msgid "Stop" +msgstr "停止" + +#: website/static/js/fangorn.js:513 +#, python-format +msgid "Replace \"%s\"?" +msgstr "\"%s\"を置換しますか?" + +#: website/static/js/fangorn.js:537 +msgid " will cancel the move." +msgstr "は移動をキャンセルします。" + +#: website/static/js/fangorn.js:546 +msgid "Replace \"%1$s\"?" +msgstr "\"%1$s\"を置換しますか?" + +#: website/static/js/fangorn.js:576 +msgid "%1$s conflicts left to resolve." +msgid_plural "%1$s conflict left to resolve." +msgstr[0] "%1$sの競合が残っています。" + +#: website/static/js/fangorn.js:655 +msgid "%1$s \"%2$s\" to \"%3$s\" is taking a bit longer than expected." +msgstr "%1$s \"%2$s\" 〜 \"%3$s\" は予想より少し時間がかかっています。" + +#: website/static/js/fangorn.js:656 +msgid "We'll send you an email when it has finished." +msgstr "終了したらメールをお送りします。" + +#: website/static/js/fangorn.js:657 +msgid "" +"In the mean time you can leave this page; your %1$s will still be " +"completed." +msgstr "それまでの間、このページを離れることができます。 あなたの%1$sはまだ完了しています。" + +#: website/static/js/fangorn.js:662 +msgid "Operation Information" +msgstr "運営情報" + +#: website/static/js/fangorn.js:668 +msgid "Successfully %1$s." +msgstr "%1$sに成功しました。" + +#: website/static/js/fangorn.js:715 +msgid "Please refresh the page or contact %1$s if the problem persists." +msgstr "問題が解決しない場合は、ページを更新するか%1$sに連絡してください。" + +#: website/static/js/fangorn.js:720 +msgid "Failed to move or copy file" +msgstr "ファイルの移動またはコピーに失敗しました" + +#: website/static/js/fangorn.js:998 +msgid "Could not upload file. The file may be invalid " +msgstr "ファイルをアップロードできませんでした。 ファイルが無効である" + +#: website/static/js/fangorn.js:999 +msgid "or the file folder has been deleted." +msgstr "か、ファイルフォルダーが削除されている可能性があります。" + +#: website/static/js/fangorn.js:1007 website/static/js/fangorn.js:1012 +msgid "Cannot upload folders." +msgstr "フォルダーをアップロードできません。" + +#: website/static/js/fangorn.js:1014 +msgid "Cannot upload file due to insufficient storage." +msgstr "ストレージが不十分なため、ファイルをアップロードできません。" + +#: website/static/js/fangorn.js:1019 +msgid "Could not upload file. Possible reasons:
                                      " +msgstr "ファイルをアップロードできませんでした。 考えられる理由:
                                      " + +#: website/static/js/fangorn.js:1020 +msgid "1. Cannot upload folders.
                                      2. " +msgstr "1.フォルダーをアップロードできません。
                                      2." + +#: website/static/js/fangorn.js:1022 +msgid "Unable to reach the provider, please try again later. " +msgstr "プロバイダーに到達できません。しばらくしてからもう一度お試しください。" + +#: website/static/js/fangorn.js:1023 +msgid "If the problem persists, please contact %1$s." +msgstr "問題が解決しない場合は、%1$sにお問い合わせください" + +#: website/static/js/fangorn.js:1111 +msgid "Please enter a folder name." +msgstr "フォルダー名を入力してください。" + +#: website/static/js/fangorn.js:1115 +msgid "Folder name contains illegal characters." +msgstr "フォルダー名に無効な文字が含まれています。" + +#: website/static/js/fangorn.js:1138 +msgid "New folder created!" +msgstr "新しいフォルダが作成されました。" + +#: website/static/js/fangorn.js:1147 +msgid "Folder creation failed." +msgstr "フォルダ作成に失敗しました。" + +#: website/static/js/fangorn.js:1165 +msgid " Deleting..." +msgstr " 削除中..." + +#: website/static/js/fangorn.js:1187 +msgid "Delete failed." +msgstr "削除に失敗しました。" + +#: website/static/js/fangorn.js:1202 +msgid "" +"This folder and all of its contents will be deleted. This folder is " +"linked to " +msgstr "このフォルダーとその内容はすべて削除されます。 このフォルダーは、" + +#: website/static/js/fangorn.js:1203 +msgid "your wiki(s). Deleting it will remove images embedded in your wiki(s). " +msgstr "Wikiにリンクされています。 削除すると、Wikiに埋め込まれた画像が削除されます。" + +#: website/static/js/fangorn.js:1204 website/static/js/fangorn.js:1232 +#: website/static/js/fangorn.js:1255 website/static/js/pages/base-page.js:132 +msgid "This action is irreversible." +msgstr "このアクションは元に戻せません。" + +#: website/static/js/fangorn.js:1207 +msgid "" +"This folder and ALL its contents will be deleted. This action is " +"irreversible." +msgstr "このフォルダーとその内容はすべて削除されます。 このアクションは元に戻せません。" + +#: website/static/js/fangorn.js:1213 website/static/js/fangorn.js:1236 +#: website/static/js/fangorn.js:1996 website/static/js/fangorn.js:2032 +#: website/static/js/filepage/index.js:209 +#: website/static/js/filepage/index.js:522 website/static/js/myProjects.js:1637 +msgid "Delete" +msgstr "削除" + +#: website/static/js/fangorn.js:1215 website/static/js/fangorn.js:1240 +msgid "Delete \"%1$s\"?" +msgstr "\"%1$s\"を削除しますか?" + +#: website/static/js/fangorn.js:1217 +msgid "You don't have permission to delete this file." +msgstr "このファイルを削除する権限がありません。" + +#: website/static/js/fangorn.js:1225 +msgid "This file may be linked to your wiki(s). Deleting it will remove the" +msgstr "このファイルはWikiにリンクされている場合があります。 削除すると、" + +#: website/static/js/fangorn.js:1226 +msgid " image embedded in your wiki(s). " +msgstr "Wikiに埋め込まれた画像が削除されます" + +#: website/static/js/fangorn.js:1266 +msgid "" +"Some of the selected items are folders. This will delete the folder(s) " +"and ALL of their content." +msgstr "選択したアイテムの一部はフォルダーです。 これにより、フォルダーとそのすべてのコンテンツが削除されます。" + +#: website/static/js/fangorn.js:1280 +msgid " may be linked to" +msgstr "ウィキにリンクされている可能性があります。" + +#: website/static/js/fangorn.js:1281 +msgid " your wiki(s). Deleting them will remove images embedded in your wiki(s). " +msgstr "れらを削除すると、ウィキに埋め込まれた画像が削除されます。" + +#: website/static/js/fangorn.js:1289 +msgid "Delete All" +msgstr "全て削除" + +#: website/static/js/fangorn.js:1293 +msgid "" +"Some of these files can't be deleted but you can delete the ones " +"highlighted with green. This action is irreversible." +msgstr "これらのファイルの一部は削除できませんが、削除できます" + +#: website/static/js/fangorn.js:1308 +msgid "Delete Some" +msgstr "一部を削除" + +#: website/static/js/fangorn.js:1311 +msgid "Delete multiple files?" +msgstr "複数のファイルを削除しますか?" + +#: website/static/js/fangorn.js:1337 +msgid "" +"Unable to check out file. This is most likely due to the file being " +"already checked-out" +msgstr "ファイルをチェックアウトできません。 これは、ファイルが別のユーザーによって既にチェックアウトされていることが原因" + +#: website/static/js/fangorn.js:1338 +msgid " by another user." +msgstr "である可能性があります。" + +#: website/static/js/fangorn.js:1670 website/static/js/fileViewTreebeard.js:63 +#: website/static/js/filesWidget.js:34 website/static/js/meetings.js:18 +#: website/static/js/pages/project-dashboard-page.js:549 +#: website/static/js/project-organizer.js:192 +#: website/static/js/project-organizer.js:208 website/static/js/wikiMenu.js:58 +msgid "Name" +msgstr "名前" + +#: website/static/js/fangorn.js:1675 +msgid "Size" +msgstr "サイズ" + +#: website/static/js/fangorn.js:1679 +msgid "Version" +msgstr "バージョン" + +#: website/static/js/fangorn.js:1687 +#: website/static/js/pages/project-dashboard-page.js:555 +#: website/static/js/project-organizer.js:201 +msgid "Modified" +msgstr "最終更新日時" + +#: website/static/js/fangorn.js:1761 +msgid "Unable to retrieve components." +msgstr "コンポーネントを取得できません。" + +#: website/static/js/fangorn.js:1763 +msgid "Unable to retrieve components for node %1$s" +msgstr "ノード%1$sのコンポーネントを取得できません" + +#: website/static/js/fangorn.js:1845 +msgid "You cannot rename your Wiki images folder." +msgstr "Wiki画像フォルダの名前を変更することはできません。" + +#: website/static/js/fangorn.js:1953 +msgid "Upload" +msgstr "アップロード" + +#: website/static/js/fangorn.js:1960 +msgid "Create Folder" +msgstr "新規フォルダ作成" + +#: website/static/js/fangorn.js:1967 +msgid "Delete Folder" +msgstr "フォルダを削除" + +#: website/static/js/fangorn.js:1976 website/static/js/filepage/index.js:525 +#: website/static/js/filepage/revisions.js:111 +msgid "Download" +msgstr "ダウンロード" + +#: website/static/js/fangorn.js:1986 website/static/js/filepage/index.js:547 +msgid "View" +msgstr "プレビュー" + +#: website/static/js/fangorn.js:2002 website/static/js/filepage/index.js:221 +msgid "This would mean " +msgstr "これは、" + +#: website/static/js/fangorn.js:2003 website/static/js/filepage/index.js:222 +msgid "" +"other contributors cannot edit, delete or upload new versions of this " +"file " +msgstr "チェックアウトされている限り他のメンバーがこのファイルの新しいバージョンを編集、削除、またはアップロードできないことを意味します。" + +#: website/static/js/fangorn.js:2004 +msgid "as long as it is checked-out. You can check it back in at anytime." +msgstr "いつでもチェックインできます。" + +#: website/static/js/fangorn.js:2009 website/static/js/fangorn.js:2014 +#: website/static/js/filepage/index.js:248 +msgid "Check out file" +msgstr "ファイルをチェックアウト" + +#: website/static/js/fangorn.js:2010 +msgid "Confirm file check-out?" +msgstr "ファイルのチェックアウトを確認しますか?" + +#: website/static/js/fangorn.js:2023 +msgid "Check in file" +msgstr "ファイルをチェックイン" + +#: website/static/js/fangorn.js:2051 +msgid "Download as zip" +msgstr "ZIPでダウンロード" + +#: website/static/js/fangorn.js:2062 website/static/js/myProjects.js:1613 +msgid "Rename" +msgstr "名前を変更" + +#: website/static/js/fangorn.js:2144 +msgid "New folder name" +msgstr "新しいフォルダ名" + +#: website/static/js/fangorn.js:2172 +msgid "Enter name" +msgstr "名前を入力" + +#: website/static/js/fangorn.js:2209 +msgid "Cancel Pending Uploads" +msgstr "保留中のアップロードをキャンセル" + +#: website/static/js/fangorn.js:2233 +msgid "Delete Multiple" +msgstr "複数削除" + +#: website/static/js/fangorn.js:2244 website/static/js/fangorn.js:2955 +msgid "Filter" +msgstr "フィルタ" + +#: website/static/js/fangorn.js:2249 +msgid "Select rows:" +msgstr "行を選択:" + +#: website/static/js/fangorn.js:2249 +msgid "" +" Click on a row (outside the add-on, file, or folder name) to show " +"further actions in the toolbar. Use Command or Shift keys to select " +"multiple files." +msgstr "" +"行(アドオン、ファイル、またはフォルダー名の外側)をクリックして、ツールバーにさらにアクションを表示します。 " +"複数のファイルを選択するには、コマンドまたはShiftキーを使用します。" + +#: website/static/js/fangorn.js:2250 +msgid "Open files:" +msgstr "ファイルを開く:" + +#: website/static/js/fangorn.js:2250 +msgid " Click a file name to go to view the file in the GakuNin RDM." +msgstr "ファイル名をクリックして、GakuNin RDMでファイルを表示します。" + +#: website/static/js/fangorn.js:2251 +msgid "Open files in new tab:" +msgstr "新しいタブでファイルを開く:" + +#: website/static/js/fangorn.js:2251 +msgid "" +" Press Command (Ctrl in Windows) and click a file name to open it in a " +"new tab." +msgstr "コマンド(WindowsではCtrl)を押し、ファイル名をクリックして新しいタブで開きます。" + +#: website/static/js/fangorn.js:2252 +msgid "Download as zip:" +msgstr "ZIPでダウンロード:" + +#: website/static/js/fangorn.js:2252 +msgid "" +" Click on the row of an add-on or folder and click the Download as Zip " +"button in the toolbar." +msgstr "アドオンまたはフォルダーの行をクリックし、ツールバーの [ZIPでダウンロード] ボタンをクリックします。" + +#: website/static/js/fangorn.js:2252 +msgid " Not available for all storage add-ons." +msgstr "すべてのストレージアドオンで利用できるわけではありません。" + +#: website/static/js/fangorn.js:2253 +msgid "Copy files:" +msgstr "ファイルをコピー:" + +#: website/static/js/fangorn.js:2253 +msgid "" +" Press Option (Alt in Windows) while dragging a file to a new folder or " +"component." +msgstr "オプション(WindowsではAlt)を押しながら、ファイルを新しいフォルダーまたはコンポーネントにドラッグします。" + +#: website/static/js/fangorn.js:2253 +msgid " Only for contributors with write access." +msgstr "書き込みアクセス権を持つメンバーのみ。" + +#: website/static/js/fangorn.js:2259 +msgid "How to Use the File Browser" +msgstr "ファイルブラウザの使用方法" + +#: website/static/js/fangorn.js:2323 +msgid "Please wait for current action to complete" +msgstr "現在のアクションが完了するまでお待ちください" + +#: website/static/js/fangorn.js:2504 +msgid "Upload Status" +msgstr "ステータスをアップロード" + +#: website/static/js/fangorn.js:2504 +msgid " files succeeded." +msgstr "ファイルが成功しました。" + +#: website/static/js/fangorn.js:2605 +msgid "Done" +msgstr "完了" + +#: website/static/js/fangorn.js:2607 +msgid "Move Status" +msgstr "移動ステータス" + +#: website/static/js/fangorn.js:2609 +msgid " files successfully moved." +msgstr "ファイルが移動成功しました。" + +#: website/static/js/fangorn.js:2610 +msgid " Skipped %1$s/%2$s files." +msgstr "%1$s/%2$sファイルをスキップしました。" + +#: website/static/js/fangorn.js:2880 +msgid "You have pending uploads, if you leave this page they may not complete." +msgstr "保留中のアップロードがあります。このページを離れると、アップロードが完了しない場合があります。" + +#: website/static/js/fangorn.js:2883 +msgid "" +"You have pending file operations, if you leave this page they may not " +"complete." +msgstr "保留中のファイル操作があります。このページを離れると、完了しない場合があります。" + +#: website/static/js/fangorn.js:2917 +msgid "This file is too large (%1$s). Max file size is %2$s." +msgstr "このファイルは大きすぎます(%1$s)。 最大ファイルサイズは%2$sです。" + +#: website/static/js/fangorn.js:2933 +msgid "Not enough quota to upload the file." +msgstr "ファイルをアップロードするのに十分なクォータがありません。" + +#: website/static/js/fangorn.js:2940 +msgid "Quota usage alert" +msgstr "クォータ使用量アラート" + +#: website/static/js/fangorn.js:2941 +#, python-format +msgid "You have used more than %1$s% of your quota." +msgstr "割り当ての%1$s%%以上を使用しました。" + +#: website/static/js/fileViewTreebeard.js:120 +msgid "Uploading %1$s..." +msgstr "%1$sをアップロードしています..." + +#: website/static/js/filesWidget.js:77 +msgid "Could not GET files" +msgstr "ファイルを取得できませんでした" + +#: website/static/js/filesWidget.js:92 +msgid "Sorry, we could not load files right now. " +msgstr "申し訳ありませんが、現在ファイルを読み込めませんでした。" + +#: website/static/js/firebase-messaging-sw.js:11 +msgid "RDM Announcements" +msgstr "RDMのお知らせ" + +#: website/static/js/firebase-messaging-sw.js:13 +msgid "Background Message body." +msgstr "背景メッセージ本文。" + +#: website/static/js/folderPickerNodeConfig.js:108 +msgid "" +"Could not retrieve %1$s settings at this time. The credentials associated" +" with this %1$s account may no longer be valid." +msgstr "現在、%1$sの設定を取得できませんでした。 この%1$sアカウントに関連付けられている資格情報は無効になっている可能性があります。" + +#: website/static/js/folderPickerNodeConfig.js:109 +msgid "" +" Try disconnecting and reconnecting the %1$s account on your account settings page." +msgstr "アカウント設定ページで%1$sアカウントを切断して再接続してみてください" + +#: website/static/js/folderPickerNodeConfig.js:112 +msgid "" +"Could not retrieve %1$s settings at this time. The %1$s addon credentials" +" may no longer be valid." +msgstr "現在、%1$sの設定を取得できませんでした。%1$sアドオンの資格情報は無効になっている可能性があります。" + +#: website/static/js/folderPickerNodeConfig.js:113 +msgid " Contact %1$s to verify." +msgstr "確認するには%1$sにお問い合わせください。" + +#: website/static/js/folderPickerNodeConfig.js:116 +msgid "" +"Could not retrieve %1$s settings at this time. Please refresh the page. " +"If the problem persists, email %2$s." +msgstr "現在、%1$sの設定を取得できませんでした。 ページを更新してください。 問題が解決しない場合は、%2$sにメールしてください。" + +#: website/static/js/folderPickerNodeConfig.js:119 +msgid "" +"Could not retrieve %1$s account list at this time. Please refresh the " +"page. If the problem persists, email %2$s." +msgstr "現在、%1$sアカウントリストを取得できませんでした。 ページを更新してください。 問題が解決しない場合は、%2$sにメールしてください。" + +#: website/static/js/folderPickerNodeConfig.js:122 +msgid "Disconnected %1$s." +msgstr "%1$sを切断しました。" + +#: website/static/js/folderPickerNodeConfig.js:125 +msgid "" +"Could not disconnect %1$s account because of an error. Please try again " +"later." +msgstr "エラーのため、%1$sアカウントを切断できませんでした。 後でもう一度やり直してください。" + +#: website/static/js/folderPickerNodeConfig.js:128 +msgid "Successfully connected a %1$s account" +msgstr "%1$sアカウントを正常に接続しました" + +#: website/static/js/folderPickerNodeConfig.js:131 +msgid "" +"Error while authorizing addon. Please log in to your %1$s account and " +"grant access to the GakuNin RDM to enable this addon." +msgstr "" +"アドオンの認証中にエラーが発生しました。 このアドオンを有効にするには、%1$sアカウントにログインし、GakuNin " +"RDMへのアクセスを許可してください。" + +#: website/static/js/folderPickerNodeConfig.js:139 +msgid "Could not change %1$s settings. Please try again later." +msgstr "%1$sの設定を変更できませんでした。 後でもう一度やり直してください。" + +#: website/static/js/folderPickerNodeConfig.js:142 +msgid "Are you sure you want to remove this %1$s account?" +msgstr "この%1$sアカウントを切断してもよろしいですか?" + +#: website/static/js/folderPickerNodeConfig.js:145 +msgid "Are you sure you want to link your %1$s account with this project?" +msgstr "%1$sアカウントをこのプロジェクトに接続してもよろしいですか?" + +#: website/static/js/folderPickerNodeConfig.js:148 +msgid "Successfully imported %1$s account from profile." +msgstr "プロファイルから%1$sアカウントを正常にインポートしました。" + +#: website/static/js/folderPickerNodeConfig.js:151 +msgid "Error occurred while importing %1$s account." +msgstr "%1$sアカウントのインポート中にエラーが発生しました。" + +#: website/static/js/folderPickerNodeConfig.js:154 +msgid "Error occurred while importing %1$s group libraries." +msgstr "%1$sアカウントのインポート中にエラーが発生しました。" + +#: website/static/js/folderPickerNodeConfig.js:157 +msgid "Could not connect to %1$s at this time. Please try again later." +msgstr "現在、%1$sに接続できませんでした。 後でもう一度やり直してください。" + +#: website/static/js/folderPickerNodeConfig.js:321 +msgid "Could not GET %1$s settings" +msgstr "%1$sの設定を取得できませんでした" + +#: website/static/js/folderPickerNodeConfig.js:349 +#: website/static/js/folderPickerNodeConfig.js:382 +msgid "Failed to update %1$s settings." +msgstr "%1$sの設定を更新できませんでした。" + +#: website/static/js/folderPickerNodeConfig.js:431 +msgid "Failed to import %1$s access token." +msgstr "%1$sアクセストークンのインポートに失敗しました。" + +#: website/static/js/folderPickerNodeConfig.js:443 +msgid "Failed to import %1$s group libraries." +msgstr "%1$sグループライブラリのインポートに失敗しました。" + +#: website/static/js/folderPickerNodeConfig.js:497 +#: website/static/js/oauthAddonNodeConfig.js:162 +msgid "Import %1$s Account?" +msgstr "%1$sアカウントに接続しますか?" + +#: website/static/js/folderPickerNodeConfig.js:536 +msgid "Could not deauthorize %1$s account from node" +msgstr "ノードから%1$sアカウントを認証解除できませんでした" + +#: website/static/js/folderPickerNodeConfig.js:552 +msgid "Disconnect %1$s Account?" +msgstr "%1$sアカウントを切断しますか?" + +#: website/static/js/folderPickerNodeConfig.js:645 +#: website/static/js/folderPickerNodeConfig.js:656 +msgid "Could not GET get %1$s contents." +msgstr "%1$sアカウントを切断しますか?" + +#: website/static/js/folderpicker.js:101 +msgid "Folders" +msgstr "フォルダ" + +#: website/static/js/folderpicker.js:105 +msgid "Select" +msgstr "選択" + +#: website/static/js/institutionNodes.js:26 +msgid "Failed to load Institution's nodes" +msgstr "機関のノードを読み込めませんでした" + +#: website/static/js/institutionProjectSettings.js:47 +#: website/static/js/institutionProjectSettings.js:127 +msgid "Add institution" +msgstr "機関を追加" + +#: website/static/js/institutionProjectSettings.js:47 +#: website/static/js/institutionProjectSettings.js:127 +msgid "Remove institution" +msgstr "機関を削除" + +#: website/static/js/institutionProjectSettings.js:59 +msgid "" +"Add %1$s to %2$s or to %3$s and every component in " +"it?

                                      " +msgstr "%1$sを%2$sまたは%3$sとその中のすべてのコンポーネントに追加しますか?" + +#: website/static/js/institutionProjectSettings.js:60 +msgid "Add to %1$s." +msgstr "%1$sに追加" + +#: website/static/js/institutionProjectSettings.js:61 +msgid "Add to %1$s and every component for which you have permission." +msgstr "%1$sと、許可があるすべてのコンポーネントに追加します。" + +#: website/static/js/institutionProjectSettings.js:64 +msgid "" +"Remove %1$s from %2$s or from %3$s and every " +"component in it?

                                      " +msgstr "%2$sまたは%3$sおよびその中のすべてのコンポーネントから%1$sを削除しますか?" + +#: website/static/js/institutionProjectSettings.js:65 +msgid "Remove from %1$s." +msgstr "%1$sから削除します。" + +#: website/static/js/institutionProjectSettings.js:66 +msgid "Remove from %1$s and every component for which you have permission." +msgstr "%1$sおよび許可されているすべてのコンポーネントから削除します。" + +#: website/static/js/institutionProjectSettings.js:69 +#: website/static/js/institutionProjectSettings.js:86 +msgid "Warning, you are not affiliated with %1$s." +msgstr "警告、%1$sと提携していません" + +#: website/static/js/institutionProjectSettings.js:70 +#: website/static/js/institutionProjectSettings.js:87 +msgid " If you remove it from your project, you cannot add it back.
                                      " +msgstr "プロジェクトから削除した場合、追加し直すことはできません。
                                      " + +#: website/static/js/institutionProjectSettings.js:85 +msgid "Remove %1$s from %2$s." +msgstr "%2$sから%1$sを削除します。" + +#: website/static/js/institutionProjectSettings.js:157 +msgid "Updating affiliation... this may take a minute." +msgstr "所属を更新しています...これには数分かかる場合があります。" + +#: website/static/js/institutionProjectSettings.js:202 +msgid "" +"Unable to modify the institution on this node. Please try again. If the " +"problem persists, email %1$s" +msgstr "このノードの機関を変更できません。もう一度試してください。問題が解決しない場合は、%1$sにメールを送信してください" + +#: website/static/js/institutionProjectSettings.js:203 +msgid "Unable to modify this institution!" +msgstr "この機関を変更できません!" + +#: website/static/js/js_messages.js:3 +msgid "Bookmarks" +msgstr "ブックマーク" + +#: website/static/js/js_messages.js:5 +msgid "Edit" +msgstr "編集" + +#: website/static/js/js_messages.js:7 +msgid "Analysis" +msgstr "分析" + +#: website/static/js/js_messages.js:7 +msgid "Communication" +msgstr "コミュニケーション" + +#: website/static/js/js_messages.js:7 +msgid "Data" +msgstr "データ" + +#: website/static/js/js_messages.js:7 +msgid "Hypothesis" +msgstr "仮説" + +#: website/static/js/js_messages.js:7 +msgid "Instrumentation" +msgstr "器具" + +#: website/static/js/js_messages.js:7 +msgid "Methods and Measures" +msgstr "方法と対策" + +#: website/static/js/js_messages.js:7 +msgid "Procedure" +msgstr "手順" + +#: website/static/js/js_messages.js:7 +#: website/static/js/projectSettingsTreebeardBase.js:90 +msgid "Project" +msgstr "プロジェクト" + +#: website/static/js/js_messages.js:7 +msgid "Software" +msgstr "ソフトウェア" + +#: website/static/js/js_messages.js:7 +msgid "Other" +msgstr "その他" + +#: website/static/js/js_messages.js:9 +msgid "analysis" +msgstr "分析" + +#: website/static/js/js_messages.js:9 +msgid "communication" +msgstr "コミュニケーション" + +#: website/static/js/js_messages.js:9 +msgid "data" +msgstr "データ" + +#: website/static/js/js_messages.js:9 +msgid "hypothesis" +msgstr "仮説" + +#: website/static/js/js_messages.js:9 +msgid "instrumentation" +msgstr "器具" + +#: website/static/js/js_messages.js:9 +msgid "methods and measures" +msgstr "方法と対策" + +#: website/static/js/js_messages.js:9 +msgid "procedure" +msgstr "手順" + +#: website/static/js/js_messages.js:9 website/static/js/nodeControl.js:114 +#: website/static/js/nodeSelectTreebeard.js:87 +#: website/static/js/nodesDeleteTreebeard.js:62 +#: website/static/js/nodesPrivacySettingsTreebeard.js:62 +msgid "project" +msgstr "プロジェクト" + +#: website/static/js/js_messages.js:9 +msgid "software" +msgstr "ソフトウェア" + +#: website/static/js/js_messages.js:9 +msgid "other" +msgstr "その他" + +#: website/static/js/js_messages.js:11 website/static/js/js_messages.js:13 +msgid "Comments added" +msgstr "コメント追加時" + +#: website/static/js/js_messages.js:11 website/static/js/js_messages.js:13 +msgid "Files updated" +msgstr "ファイルアップロード時" + +#: website/static/js/js_messages.js:13 +msgid "Replies to your comments" +msgstr "コメントへの返信時" + +#: website/static/js/js_messages.js:13 +msgid "Mentions added" +msgstr "メンション追加時" + +#: website/static/js/js_messages.js:13 +msgid "Preprint submissions updated" +msgstr "プレプリント提出の更新時" + +#: website/static/js/js_messages.js:15 +msgid "No license" +msgstr "ライセンスなし" + +#: website/static/js/js_messages.js:17 website/static/js/passwordForms.js:178 +#: website/static/js/passwordForms.js:241 +msgid "This field is required." +msgstr "この項目は必須です。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a value greater than or equal to {0}." +msgstr "{0}以上の値を入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a value less than or equal to {0}." +msgstr "{0}以下の値を入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter at least {0} characters." +msgstr "{0}文字以上入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter no more than {0} characters." +msgstr "{0}文字以下で入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please check this value." +msgstr "値を確認してください。" + +#: website/static/js/js_messages.js:17 +msgid "The value must increment by {0}." +msgstr "値は{0}ずつ増加する必要があります。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a proper email address." +msgstr "正しいメールアドレスを入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a proper date." +msgstr "適切な日付を入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a number." +msgstr "数字を入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a digit." +msgstr "数字を入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please specify a valid phone number." +msgstr "有効な電話番号を指定してください。" + +#: website/static/js/js_messages.js:17 +msgid "Values must equal." +msgstr "値は等しくなければなりません。" + +#: website/static/js/js_messages.js:17 +msgid "Please choose another value." +msgstr "別の値を選択してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please make sure the value is unique." +msgstr "値が一意であることを確認してください。" + +#: website/static/js/js_messages.js:19 +msgid "Project Wiki Pages" +msgstr "プロジェクトのWiki" + +#: website/static/js/js_messages.js:19 +msgid "Component Wiki Pages" +msgstr "コンポーネントのWiki" + +#: website/static/js/js_messages.js:19 +msgid "Home" +msgstr "ホーム" + +#: website/static/js/js_messages.js:21 +msgid "Projects" +msgstr "プロジェクト" + +#: website/static/js/js_messages.js:21 +msgid "Components" +msgstr "コンポーネント" + +#: website/static/js/js_messages.js:21 +msgid "Registrations" +msgstr "登録" + +#: website/static/js/js_messages.js:21 +msgid "Users" +msgstr "ユーザー" + +#: website/static/js/js_messages.js:21 +msgid "All Results" +msgstr "全検索結果" + +#: website/static/js/js_messages.js:21 +msgid "Files" +msgstr "ファイル" + +#: website/static/js/js_messages.js:21 +msgid "Institutions" +msgstr "機関" + +#: website/static/js/js_messages.js:21 +msgid "Preprints" +msgstr "プレプリント" + +#: website/static/js/js_messages.js:21 +msgid "Groups" +msgstr "グループ" + +#: website/static/js/js_messages.js:21 +msgid "Wiki" +msgstr "Wiki" + +#: website/static/js/js_messages.js:21 +msgid "Comments" +msgstr "コメント" + +#: website/static/js/js_messages.js:23 +msgid "Default Notification Settings" +msgstr "デフォルトの通知設定" + +#: website/static/js/js_messages.js:23 +msgid "" +"These are default settings for new projects you create or are added to. " +"Modifying these settings will not modify settings on existing projects." +msgstr "これらは、作成または追加される新しいプロジェクトのデフォルト設定です。 これらの設定を変更しても、既存のプロジェクトの設定は変更されません。" + +#: website/static/js/js_messages.js:23 +msgid "Project Notifications" +msgstr "プロジェクト通知" + +#: website/static/js/js_messages.js:23 +msgid "" +"These are settings for each of your projects. Modifying these settings " +"will only modify the settings for the selected project." +msgstr "これらは、プロジェクトごとの設定です。 これらの設定を変更すると、選択したプロジェクトの設定のみが変更されます。" + +#: website/static/js/js_messages.js:25 +msgid "moved" +msgstr "移動" + +#: website/static/js/js_messages.js:25 +msgid "renamed" +msgstr "名前の変更" + +#: website/static/js/js_messages.js:27 +msgid "Skipped" +msgstr "スキップ済" + +#: website/static/js/js_messages.js:27 +msgid "Moved or replaced old version" +msgstr "古いバージョンを移動または置換" + +#: website/static/js/js_messages.js:27 +msgid "Kept both versions" +msgstr "両方のバージョンを保持" + +#: website/static/js/js_messages.js:29 +msgid "admin" +msgstr "管理者" + +#: website/static/js/js_messages.js:29 +msgid "write" +msgstr "書込み" + +#: website/static/js/js_messages.js:29 +msgid "read" +msgstr "読込み" + +#: website/static/js/js_messages.js:31 +msgid "home" +msgstr "ホーム" + +#: website/static/js/js_messages.js:33 +msgid "No tokens." +msgstr "トークンがありません。" + +#: website/static/js/js_messages.js:33 +msgid "Invalid tokens." +msgstr "無効なトークンです。" + +#: website/static/js/js_messages.js:35 +msgid "Invalid folder." +msgstr "無効なフォルダです。" + +#: website/static/js/js_messages.js:35 +msgid "Credentials are valid" +msgstr "資格情報は有効です。" + +#: website/static/js/keen.js:114 +msgid "Error sending Keen data to %1$s:<%2$s>" +msgstr "Keenデータの%1$sへの送信エラー:<%2$s>" + +#: website/static/js/keen.js:132 +msgid "Error sending Keen data for multiple events: <%1$s>" +msgstr "複数のイベントのKeenデータの送信エラー:<%1$s>" + +#: website/static/js/keen.js:141 +msgid "Error sending Keen data to %1$s." +msgstr "Keenデータを%1$sに送信中にエラーが発生しました。" + +#: website/static/js/keen.js:153 +msgid "Cannot instantiate another KeenTracker instance." +msgstr "別のKeenTrackerインスタンスをインスタンス化できません。" + +#: website/static/js/koHelpers.js:129 +msgid "End date must be greater than or equal to the start date." +msgstr "終了日は開始日以上でなければなりません。" + +#: website/static/js/koHelpers.js:147 +msgid "Date must be greater than or equal to 1900." +msgstr "日付は1900以上でなければなりません。" + +#: website/static/js/koHelpers.js:169 +msgid "Please enter a date prior to the current date." +msgstr "現在の日付より前の日付を入力してください。" + +#: website/static/js/koHelpers.js:175 +msgid "Please enter a valid year." +msgstr "有効な年を入力してください。" + +#: website/static/js/koHelpers.js:190 +msgid "Please enter a valid URL." +msgstr "有効なURLを入力してください。" + +#: website/static/js/koHelpers.js:197 +msgid "The field does not match the required input." +msgstr "フィールドが必要な入力と一致しません。" + +#: website/static/js/licensePicker.js:20 website/static/js/profile.js:128 +#: website/static/js/profile.js:132 +msgid "Year" +msgstr "年" + +#: website/static/js/licensePicker.js:21 +msgid "Copyright Holders" +msgstr "著作権者" + +#: website/static/js/licensePicker.js:26 +msgid "License:" +msgstr "ライセンス:" + +#: website/static/js/licensePicker.js:27 +msgid "Choose a license:" +msgstr "ライセンスを選択:" + +#: website/static/js/licensePicker.js:28 +msgid ">Save<" +msgstr ">保存<" + +#: website/static/js/licensePicker.js:68 +msgid "Add a license" +msgstr "ライセンスを追加" + +#: website/static/js/licensePicker.js:104 +msgid "Please specify a valid year." +msgstr "有効な年を指定してください。" + +#: website/static/js/licensePicker.js:108 +msgid "Future years are not allowed." +msgstr "将来の年は許可されていません。" + +#: website/static/js/licensePicker.js:190 +msgid "License updated successfully." +msgstr "ライセンスが正常に更新されました。" + +#: website/static/js/licensePicker.js:195 +msgid "There was a problem updating your license. Please try again." +msgstr "ライセンスの更新中に問題が発生しました。 もう一度やり直してください。" + +#: website/static/js/licensePicker.js:239 +msgid "Your Own License" +msgstr "自分のライセンス" + +#: website/static/js/licensePicker.js:240 +msgid "" +"You have opted to use your own license. Please upload a license file " +"named \"license.txt\" into the GakuNin RDM Storage of this project." +msgstr "" +"独自のライセンスを使用することを選択しました。「license.txt」という名前のライセンスファイルをこのプロジェクトのGakuNin " +"RDMストレージにアップロードしてください。" + +#: website/static/js/licensePicker.js:247 +msgid "Add license" +msgstr "ライセンスを追加" + +#: website/static/js/licenses.js:27 +msgid "Content:" +msgstr "コンテンツ用" + +#: website/static/js/licenses.js:31 +msgid "Code - Permissive:" +msgstr "コード用 - 非コピーレフト" + +#: website/static/js/licenses.js:35 +msgid "Code - Copyleft:" +msgstr "コード用 - コピーレフト" + +#: website/static/js/licenses.js:39 +msgid "Code - Other:" +msgstr "コード用 - その他" + +#: website/static/js/logActionsList_extract.js:3 +#: website/static/js/logActionsList_extract.js:70 +msgid "${user} created ${node}" +msgstr "${user}が${node}を作成しました" + +#: website/static/js/logActionsList_extract.js:4 +msgid "${user} registered ${node}" +msgstr "${user}が${node}を登録しました" + +#: website/static/js/logActionsList_extract.js:5 +msgid "${node} registered" +msgstr "${node}が登録されました" + +#: website/static/js/logActionsList_extract.js:6 +msgid "" +"${user} submitted for review to the Preregistration Challenge a " +"registration of ${node}" +msgstr "${user}が${node}の登録を事前登録チャレンジにレビューのために提出しました" + +#: website/static/js/logActionsList_extract.js:7 +msgid "${user} deleted ${node}" +msgstr "${user}が${node}を削除しました" + +#: website/static/js/logActionsList_extract.js:8 +msgid "${user} created ${node} based on ${template}" +msgstr "${user}が${template}に基づいて${node}を作成しました" + +#: website/static/js/logActionsList_extract.js:9 +msgid "${user} created a link to ${pointer_category} ${pointer}" +msgstr "${user}が${pointer_category} ${pointer}へのリンクを作成しました" + +#: website/static/js/logActionsList_extract.js:10 +msgid "${user} forked a link to ${pointer_category} ${pointer}" +msgstr "${user}が${pointer_category} ${pointer}へのリンクをforkしました" + +#: website/static/js/logActionsList_extract.js:11 +msgid "${user} removed a link to ${pointer_category} ${pointer}" +msgstr "${user}が${pointer_category} ${pointer}へのリンクを削除しました" + +#: website/static/js/logActionsList_extract.js:12 +msgid "${user} added ${group} to ${node}" +msgstr "${user}が${group}を${node}に追加しました" + +#: website/static/js/logActionsList_extract.js:13 +msgid "${user} removed ${group} from ${node}" +msgstr "${user}が${node}から${group}を削除しました" + +#: website/static/js/logActionsList_extract.js:14 +msgid "${user} changed ${group} permissions to ${node}" +msgstr "${user}が${group}の権限を${node}に変更しました" + +#: website/static/js/logActionsList_extract.js:15 +msgid "${user} made ${node} public" +msgstr "${user}が${node}を公開しました" + +#: website/static/js/logActionsList_extract.js:16 +msgid "${node} made public" +msgstr "${node}が公開されました" + +#: website/static/js/logActionsList_extract.js:17 +msgid "${user} made ${node} private" +msgstr "${user}が${node}を非公開にしました" + +#: website/static/js/logActionsList_extract.js:18 +msgid "${user} added tag ${tag} to ${node}" +msgstr "${user}さんがタグ${tag}を${node}に追加しました" + +#: website/static/js/logActionsList_extract.js:19 +msgid "${user} removed tag ${tag} from ${node}" +msgstr "${user}が${node}からタグ${tag}を削除しました" + +#: website/static/js/logActionsList_extract.js:20 +msgid "${user} changed the title from ${title_original} to ${title_new}" +msgstr "${user}がタイトルを${title_original}から${title_new}に変更しました" + +#: website/static/js/logActionsList_extract.js:21 +msgid "${user} edited description of ${node}" +msgstr "${user}が${node}の説明を編集しました" + +#: website/static/js/logActionsList_extract.js:22 +msgid "${user} changed the ${updated_fields} for ${node}" +msgstr "${user}が${node}の${updated_fields}を変更しました" + +#: website/static/js/logActionsList_extract.js:23 +msgid "${user} created external identifier(s) ${identifiers} on ${node}" +msgstr "${user}が${node}に外部識別子${identifiers}を作成しました" + +#: website/static/js/logActionsList_extract.js:24 +msgid "${user} created a custom citation for ${node}" +msgstr "${user}が${node}のカスタム引用を作成しました" + +#: website/static/js/logActionsList_extract.js:25 +msgid "${user} edited a custom citation for ${node}" +msgstr "${user}が${node}のカスタム引用を編集しました" + +#: website/static/js/logActionsList_extract.js:26 +msgid "${user} removed a custom citation for ${node}" +msgstr "${user}が${node}のカスタム引用を削除しました" + +#: website/static/js/logActionsList_extract.js:27 +msgid "${user} added ${contributors} as contributor(s) to ${node}" +msgstr "${user}が${contributors}をコントリビューターとして${node}に追加しました" + +#: website/static/js/logActionsList_extract.js:28 +msgid "${user} removed ${contributors} as contributor(s) from ${node}" +msgstr "${user}が${node}からコントリビューターとして${contributors}を削除しました" + +#: website/static/js/logActionsList_extract.js:29 +msgid "${user} reordered contributors for ${node}" +msgstr "${user}が${node}の投稿者を並べ替えました" + +#: website/static/js/logActionsList_extract.js:30 +msgid "${user} changed permissions for ${node}" +msgstr "${user}が${node}の権限を変更しました" + +#: website/static/js/logActionsList_extract.js:31 +msgid "" +"${user} made non-bibliographic contributor ${contributors} a " +"bibliographic contributor on ${node}" +msgstr "${user}が目録非表示メンバー(${contributors})を${node}の目録表示メンバーにしました" + +#: website/static/js/logActionsList_extract.js:32 +msgid "" +"${user} made bibliographic contributor ${contributors} a non-" +"bibliographic contributor on ${node}" +msgstr "${user}が目録表示メンバー(${contributors})を${node}の目録非表示メンバーにしました" + +#: website/static/js/logActionsList_extract.js:33 +msgid "${user} updated wiki page ${page} to version ${version} of ${node}" +msgstr "${user}が${node}のWiki(${page})をバージョン${version}に更新" + +#: website/static/js/logActionsList_extract.js:34 +msgid "${user} deleted wiki page ${page} of ${node}" +msgstr "${user}が${node}のWikiページ${page}を削除しました" + +#: website/static/js/logActionsList_extract.js:35 +msgid "${user} renamed wiki page ${old_page} to ${page} of ${node}" +msgstr "${user}がWikiページ${old_page}の名前を${node}の${page}に変更しました" + +#: website/static/js/logActionsList_extract.js:36 +msgid "${user} made the wiki of ${node} publicly editable" +msgstr "${user}が${node}のwikiをパブリックに編集可能にしました" + +#: website/static/js/logActionsList_extract.js:37 +msgid "${user} made the wiki of ${node} privately editable" +msgstr "${user}が${node}のwikiをプライベートに編集可能にしました" + +#: website/static/js/logActionsList_extract.js:38 +msgid "${user} added addon ${addon} to ${node}" +msgstr "${user}が${node}にアドオン${addon}を追加しました" + +#: website/static/js/logActionsList_extract.js:39 +msgid "${user} removed addon ${addon} from ${node}" +msgstr "${user}が${node}からアドオン${addon}を削除しました" + +#: website/static/js/logActionsList_extract.js:40 +msgid "${user} moved ${source} to ${destination} in ${node}" +msgstr "${user}が${source}を${node}の${destination}に移動しました" + +#: website/static/js/logActionsList_extract.js:41 +msgid "${user} copied ${source} to ${destination} in ${node}" +msgstr "${user}が${source}を${node}の${destination}にコピーしました" + +#: website/static/js/logActionsList_extract.js:42 +msgid "${user} renamed ${source} to ${destination} in ${node}" +msgstr "${user}は${node}で${source}を${destination}に名前変更しました" + +#: website/static/js/logActionsList_extract.js:43 +msgid "${user} created a folder in ${node}" +msgstr "${user}が${node}にフォルダを作成しました" + +#: website/static/js/logActionsList_extract.js:44 +msgid "${user} added file ${path} to ${node}" +msgstr "${user}がファイル${path}を${node}に追加しました" + +#: website/static/js/logActionsList_extract.js:45 +msgid "${user} updated file in ${node}" +msgstr "${user}が${node}のファイルを更新しました" + +#: website/static/js/logActionsList_extract.js:46 +msgid "${user} removed ${path_type} ${path} from ${node}" +msgstr "${user}が${node}から${path_type} ${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:47 +msgid "${user} restored file ${path} from ${node}" +msgstr "${user}が${node}からファイル${path}を復元しました" + +#: website/static/js/logActionsList_extract.js:48 +msgid "${user} updated the file metadata for ${path}" +msgstr "${user}が${path}のファイルメタデータを更新しました" + +#: website/static/js/logActionsList_extract.js:49 +msgid "${user} checked out ${kind} ${path} from ${node}" +msgstr "${user}が${node}から${kind} ${path}をチェックアウトしました" + +#: website/static/js/logActionsList_extract.js:50 +msgid "${user} checked in ${kind} ${path} to ${node}" +msgstr "${user}が${kind} ${path}を${node}にチェックインしました" + +#: website/static/js/logActionsList_extract.js:51 +msgid "${user} added a comment ${comment_location} in ${node}" +msgstr "${user}さんが${node}にコメント${comment_location}を追加しました" + +#: website/static/js/logActionsList_extract.js:52 +msgid "${user} deleted a comment ${comment_location} in ${node}" +msgstr "${user}さんが${node}のコメント${comment_location}を削除しました" + +#: website/static/js/logActionsList_extract.js:53 +msgid "${user} restored a comment ${comment_location} in ${node}" +msgstr "${user}が${node}のコメント${comment_location}を復元しました" + +#: website/static/js/logActionsList_extract.js:54 +msgid "${user} updated a comment ${comment_location} in ${node}" +msgstr "${user}が${node}のコメント${comment_location}を更新しました" + +#: website/static/js/logActionsList_extract.js:55 +msgid "${user} initiated an embargoed registration of ${node}" +msgstr "${user}が${node}の禁止登録を開始しました" + +#: website/static/js/logActionsList_extract.js:56 +msgid "${user} approved embargoed registration of ${node}" +msgstr "${user}が${node}の禁止登録を承認しました" + +#: website/static/js/logActionsList_extract.js:57 +msgid "Embargo of registration of ${node} approved" +msgstr "${node}の登録の禁止が承認されました" + +#: website/static/js/logActionsList_extract.js:58 +msgid "${user} cancelled embargoed registration of ${node}" +msgstr "${user}が${node}の禁止登録をキャンセルしました" + +#: website/static/js/logActionsList_extract.js:59 +msgid "${user} completed embargo of ${node}" +msgstr "${user}が${node}の禁止を完了しました" + +#: website/static/js/logActionsList_extract.js:60 +msgid "Embargo for ${node} completed" +msgstr "${node}の禁止が完了しました" + +#: website/static/js/logActionsList_extract.js:61 +msgid "Embargo for ${node} ended" +msgstr "${node}の禁止が終了しました" + +#: website/static/js/logActionsList_extract.js:62 +msgid "${user} initiated withdrawal of registration of ${node}" +msgstr "${user}が${node}の登録の取り消しを開始しました" + +#: website/static/js/logActionsList_extract.js:63 +msgid "A withdrawal of registration of ${node} is proposed" +msgstr "${node}の登録の削除が提案されています" + +#: website/static/js/logActionsList_extract.js:64 +msgid "${user} approved withdrawal of registration of ${node}" +msgstr "${user}は${node}の登録の取り消しを承認しました" + +#: website/static/js/logActionsList_extract.js:65 +msgid "${user} cancelled withdrawal of registration of ${node}" +msgstr "${user}が${node}の登録の取り消しをキャンセルしました" + +#: website/static/js/logActionsList_extract.js:66 +msgid "${user} initiated registration of ${node}" +msgstr "${user}が${node}の登録を開始しました" + +#: website/static/js/logActionsList_extract.js:67 +msgid "${user} approved registration of ${node}" +msgstr "${user}が${node}の登録を承認しました" + +#: website/static/js/logActionsList_extract.js:68 +msgid "Registration of ${node} approved" +msgstr "${node}の登録が承認されました" + +#: website/static/js/logActionsList_extract.js:69 +msgid "${user} cancelled registration of ${node}" +msgstr "${user}が${node}の登録をキャンセルしました" + +#: website/static/js/logActionsList_extract.js:71 +msgid "${user} created fork from ${forked_from}" +msgstr "${user}が${forked_from}からフォークを作成しました" + +#: website/static/js/logActionsList_extract.js:72 +msgid "${user} removed ${node}" +msgstr "${user}が${node}を削除しました" + +#: website/static/js/logActionsList_extract.js:73 +msgid "${user} enabled access requests for ${node}" +msgstr "${user}が${node}のアクセス要求を有効にしました" + +#: website/static/js/logActionsList_extract.js:74 +msgid "${user} disabled access requests for ${node}" +msgstr "${user}が${node}のアクセス要求を無効にしました" + +#: website/static/js/logActionsList_extract.js:75 +msgid "${user} updated the license of ${node} ${license}" +msgstr "${user}が${node} ${license}のライセンスを更新しました" + +#: website/static/js/logActionsList_extract.js:76 +msgid "${user} added tag ${tag} to ${path} in ${storage_name} in ${node}" +msgstr "${user}が${node}の${storage_name}の${path}にタグ${tag}を追加しました" + +#: website/static/js/logActionsList_extract.js:77 +msgid "${user} removed tag ${tag} from ${path} in ${storage_name} in ${node}" +msgstr "${user}が${node}の${storage_name}の${path}からタグ${tag}を削除しました" + +#: website/static/js/logActionsList_extract.js:78 +msgid "${user} added file ${path} to ${storage_name} in ${node}" +msgstr "${user}が${node}の${storage_name}にファイル${path}を追加しました" + +#: website/static/js/logActionsList_extract.js:79 +msgid "${user} created folder ${path} in ${storage_name} in ${node}" +msgstr "${user}が${node}の${storage_name}にフォルダ${path}を作成しました" + +#: website/static/js/logActionsList_extract.js:80 +msgid "${user} updated file ${path} in ${storage_name} in ${node}" +msgstr "${user}が${node}の${storage_name}のファイル${path}を更新しました" + +#: website/static/js/logActionsList_extract.js:81 +msgid "${user} removed ${path_type} ${path} from ${storage_name} in ${node}" +msgstr "${user}は${node}の${storage_name}から${path_type} ${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:82 +msgid "${user} added ${institution} affiliation to ${node}" +msgstr "${user}が${institution}の所属を${node}に追加しました" + +#: website/static/js/logActionsList_extract.js:83 +msgid "${user} removed ${institution} affiliation from ${node}" +msgstr "${user}が${institution}の所属を${node}から削除しました" + +#: website/static/js/logActionsList_extract.js:84 +msgid "${user} made ${node} a ${preprint} on ${preprint_provider} Preprints" +msgstr "${user}が${preprint_provider}プレプリントで${node}を${preprint}にしました" + +#: website/static/js/logActionsList_extract.js:85 +msgid "" +"${user} updated the primary file of this ${preprint} on " +"${preprint_provider} Preprints" +msgstr "$ß{user}が${preprint_provider}プレプリントでこの${preprint}のプライマリファイルを更新しました" + +#: website/static/js/logActionsList_extract.js:86 +msgid "" +"${user} updated the license of this ${preprint} on ${preprint_provider} " +"Preprints ${license}" +msgstr "${user}が${preprint_provider}プレプリント${license}でこの${preprint}のライセンスを更新しました" + +#: website/static/js/logActionsList_extract.js:87 +msgid "${user} updated the subjects on ${node} to ${subjects}" +msgstr "${user}が${node}の件名を${subjects}に更新しました" + +#: website/static/js/logActionsList_extract.js:88 +msgid "${user} created ${anonymous_link} view-only link to ${node}" +msgstr "${user}が${node}への${anonymous_link}参照専用リンクを作成しました" + +#: website/static/js/logActionsList_extract.js:89 +msgid "${user} removed ${anonymous_link} view-only link to ${node}" +msgstr "${user}が${node}への${anonymous_link}参照専用リンクを削除しました" + +#: website/static/js/logActionsList_extract.js:90 +msgid "${user} verified timestamp" +msgstr "${user}がタイムスタンプ確認" + +#: website/static/js/logActionsList_extract.js:91 +msgid "${user} requested trusted timestamp" +msgstr "${user}がタイムスタンプを打つ" + +#: website/static/js/logActionsList_extract.js:92 +msgid "${user} requested trusted timestamp file ${path}" +msgstr "${user}がファイル${path}にタイムスタンプを打つ" + +#: website/static/js/logActionsList_extract.js:93 +msgid "" +"${user} downloaded a file of timestamp errors as a " +"${timestamp_errors_file_format}" +msgstr "${user}がタイムスタンプエラーのファイルを${timestamp_errors_file_format}でダウンロード" + +#: website/static/js/logActionsList_extract.js:94 +msgid "" +"[MAPCORE_SYNC:ERROR] ${user} cannot create a new mAP group for GRDM " +"project <${node}> (See logs for details)" +msgstr "" +"[MAPCORE_SYNC:ERROR] " +"${user}はGRDMプロジェクト<${node}>の新しいmAPグループを作成できません(詳細はログを参照してください)" + +#: website/static/js/logActionsList_extract.js:95 +msgid "" +"[MAPCORE_SYNC:ERROR] mAP group for GRDM project <${node}> cannot be " +"updated (See logs for details)" +msgstr "[MAPCORE_SYNC:ERROR] GRDMプロジェクト<${node}>のmAPグループを更新できません(詳細はログを参照してください)" + +#: website/static/js/logActionsList_extract.js:96 +msgid "" +"[MAPCORE_SYNC:ERROR] GRDM project <${node}> cannot be updated with mAP " +"group (See logs for details)" +msgstr "[MAPCORE_SYNC:ERROR] GRDMプロジェクト<${node}>はmAPグループで更新できません(詳細はログを参照してください)" + +#: website/static/js/logActionsList_extract.js:97 +msgid "" +"[MAPCORE_SYNC:NOTICE] Unknown (unregistered in GRDM) users belong to mAP " +"group <${node}> (ignored) (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:98 +msgid "${user} linked the Azure Blob Storage container ${bucket} to ${node}" +msgstr "${user}がAzure Blob Storageコンテナ${bucket}を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:99 +msgid "${user} unselected the Azure Blob Storage container ${bucket} in ${node}" +msgstr "${user}が${node}のAzure Blob Storageコンテナ${bucket}の選択を解除しました" + +#: website/static/js/logActionsList_extract.js:100 +msgid "" +"${user} added file ${path} to Azure Blob Storage container ${bucket} in " +"${node}" +msgstr "${user}がファイル${path}を${node}のAzure Blob Storageコンテナ${bucket}に追加しました" + +#: website/static/js/logActionsList_extract.js:101 +msgid "" +"${user} removed ${path} in Azure Blob Storage container ${bucket} in " +"${node}" +msgstr "${user}が${node}のAzure Blob Storageコンテナ${bucket}の${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:102 +msgid "" +"${user} updated file ${path} in Azure Blob Storage container ${bucket} in" +" ${node}" +msgstr "${user}が${node}のAzure Blob Storageコンテナ${bucket}のファイル${path}を更新しました" + +#: website/static/js/logActionsList_extract.js:103 +msgid "" +"${user} created folder ${path} in Azure Blob Storage container ${bucket} " +"in ${node}" +msgstr "${user}が${node}のAzure Blob Storageコンテナ${bucket}にフォルダ${path}を作成しました" + +#: website/static/js/logActionsList_extract.js:104 +msgid "${user} authorized the Azure Blob Storage addon for ${node}" +msgstr "${user}が${node}のAzure Blob Storageアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:105 +msgid "${user} deauthorized the Azure Blob Storage addon for ${node}" +msgstr "${user}が${node}のAzure Blob Storageアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:106 +msgid "Azure Blob Storage addon for ${node} deauthorized" +msgstr "許可されていない${node}のAzure Blob Storageアドオン" + +#: website/static/js/logActionsList_extract.js:107 +msgid "${user} added file ${path} to Bitbucket repo ${bitbucket_repo} in ${node}" +msgstr "${user}がファイル${path}を${node}のBitbucketリポジトリ(${bitbucket_repo})に追加しました" + +#: website/static/js/logActionsList_extract.js:108 +msgid "" +"${user} removed ${path_type} ${path} in Bitbucket repo ${bitbucket_repo} " +"in ${node}" +msgstr "${user}が${node}のBitbucketリポジトリ(${bitbucket_repo})で${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:109 +msgid "" +"${user} updated file ${path} in Bitbucket repo ${bitbucket_repo} in " +"${node}" +msgstr "${user}が${node}のBitbucketレポジトリ(${bitbucket_repo})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:110 +msgid "" +"${user} created folder ${path} in Bitbucket repo ${bitbucket_repo} in " +"${node}" +msgstr "${user}が${node}のBitbucketリポジトリ(${bitbucket_repo})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:111 +msgid "${user} authorized the Bitbucket addon for ${node}" +msgstr "${user}が${node}のBitbucketアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:112 +msgid "${user} deauthorized the Bitbucket addon for ${node}" +msgstr "${user}が${node}のBitbucketアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:113 +msgid "Bitbucket addon for ${node} deauthorized" +msgstr "許可されていない${node}のBitbucketアドオン" + +#: website/static/js/logActionsList_extract.js:114 +msgid "${user} linked Bitbucket repo ${bitbucket_repo} to ${node}" +msgstr "${user}がBitbucketリポジトリ(${bitbucket_repo})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:115 +msgid "${user} added file ${path} to Box in ${node}" +msgstr "${user}がファイル${path}を${node}のBoxに追加しました" + +#: website/static/js/logActionsList_extract.js:116 +msgid "${user} removed ${path_type} ${path} from Box in ${node}" +msgstr "${user}が${node}のBoxから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:117 +msgid "${user} updated file ${path} in Box in ${node}" +msgstr "${user}が${node}のBoxのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:118 +msgid "${user} created folder ${path} in Box in ${node}" +msgstr "${user}が${node}のBoxにフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:119 +msgid "${user} linked Box folder ${box_folder} to ${node}" +msgstr "${user}がBoxフォルダ(${box_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:120 +msgid "${user} authorized the Box addon in ${node}" +msgstr "${user}が${node}のBoxアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:121 +msgid "${user} deauthorized the Box addon for ${node}" +msgstr "${user}が${node}のBoxアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:122 +msgid "Box addon for ${node} deauthorized" +msgstr "許可されていない${node}のボックスアドオン" + +#: website/static/js/logActionsList_extract.js:123 +msgid "${user} added a citation ${citation} to ${node}" +msgstr "${user}が${node}に引用(${citation})を追加しました" + +#: website/static/js/logActionsList_extract.js:124 +msgid "${user} updated a citation ${citation} in ${node}" +msgstr "${user}が${node}の引用(${citation})を更新しました" + +#: website/static/js/logActionsList_extract.js:125 +msgid "${user} removed a citation ${citation} in ${node}" +msgstr "${user}が${node}の引用(${citation})を削除しました" + +#: website/static/js/logActionsList_extract.js:126 +msgid "${user} added file ${filename} to Dataverse dataset ${dataset} in ${node}" +msgstr "${user}がファイル(${filename})を${node}のDataverseデータセット(${dataset})に追加しました" + +#: website/static/js/logActionsList_extract.js:127 +msgid "" +"${user} removed file ${filename} from Dataverse dataset ${dataset} in " +"${node}" +msgstr "${user}が${node}のDataverseデータセット(${dataset})からファイル(${filename})を削除しました" + +#: website/static/js/logActionsList_extract.js:128 +msgid "${user} linked Dataverse dataset ${dataset} to ${node}" +msgstr "${user}がDataverseデータセット(${dataset})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:129 +msgid "${user} linked Dataverse dataset ${study} to ${node}" +msgstr "${user}がDataverseデータセット(${study})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:130 +msgid "${user} published a new version of Dataverse dataset ${dataset} on ${node}" +msgstr "${user}がDataverseデータセット(${dataset})の新しいバージョンを${node}に公開しました" + +#: website/static/js/logActionsList_extract.js:131 +msgid "${user} published a new version of Dataverse dataset ${study} to ${node}" +msgstr "${user}がDataverseデータセット(${study})の新しいバージョンを${node}に公開しました" + +#: website/static/js/logActionsList_extract.js:132 +msgid "${user} authorized the Dataverse addon for ${node}" +msgstr "${user}が${node}のDataverseアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:133 +msgid "${user} deauthorized the Dataverse addon for ${node}" +msgstr "${user}が${node}のDataverseアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:134 +msgid "Dataverse addon for ${node} deauthorized" +msgstr "許可されていない${node}のDataverseアドオン" + +#: website/static/js/logActionsList_extract.js:135 +msgid "${user} added file ${path} to Dropbox in ${node}" +msgstr "${user}がファイル${path}を${node}のDropboxに追加しました" + +#: website/static/js/logActionsList_extract.js:136 +msgid "${user} removed ${path_type} ${path} from Dropbox in ${node}" +msgstr "${user}が${node}のDropboxから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:137 +msgid "${user} updated file ${path} in Dropbox in ${node}" +msgstr "${user}が${node}のDropboxのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:138 +msgid "${user} created folder ${path} in Dropbox in ${node}" +msgstr "${user}が${node}のDropboxにフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:139 +msgid "${user} linked Dropbox folder ${dropbox_folder} to ${node}" +msgstr "${user}がDropboxフォルダ(${dropbox_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:140 +msgid "${user} authorized the Dropbox addon for ${node}" +msgstr "${user}が${node}のDropboxアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:141 +msgid "${user} deauthorized the Dropbox addon for ${node}" +msgstr "${user}が${node}のDropboxアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:142 +msgid "Dropbox addon for ${node} deauthorized" +msgstr "許可されていない${node}のDropboxアドオン" + +#: website/static/js/logActionsList_extract.js:143 +msgid "${user} added file ${path} to Dropbox Business in ${node}" +msgstr "${user}がファイル(${path})を${node}のDropbox Businessに追加しました" + +#: website/static/js/logActionsList_extract.js:144 +msgid "${user} removed ${path_type} ${path} from Dropbox Business in ${node}" +msgstr "${user}が${node}のDropbox Businessから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:145 +msgid "${user} updated file ${path} in Dropbox Business in ${node}" +msgstr "${user}が${node}のDropbox Businessのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:146 +msgid "${user} created folder ${path} in Dropbox Business in ${node}" +msgstr "${user}が${node}のDropbox Businessにフォルダ${path}を作成しました" + +#: website/static/js/logActionsList_extract.js:147 +msgid "" +"${user} linked Dropbox Business folder ${dropboxbusiness_folder} to " +"${node}" +msgstr "${user}がDropbox Businessフォルダ(${dropboxbusiness_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:148 +msgid "${user} authorized the Dropbox Business addon for ${node}" +msgstr "${user}が${node}のDropbox Businessアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:149 +msgid "${user} deauthorized the Dropbox Business addon for ${node}" +msgstr "${user}が${node}のDropbox Businessアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:150 +msgid "Dropbox Business addon for ${node} deauthorized" +msgstr "許可されていない${node}のDropbox Businessアドオン" + +#: website/static/js/logActionsList_extract.js:151 +msgid "${user} linked figshare ${folder} ${folder_name} to ${node}" +msgstr "${user}がfigshare ${folder}(${folder_name})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:152 +msgid "${user} unlinked content from figshare in ${node}" +msgstr "${user}が${node}のfigshareからリンク解除されたコンテンツ" + +#: website/static/js/logActionsList_extract.js:153 +msgid "${user} added file ${path} to figshare in ${node}" +msgstr "${user}がファイル${path}を${node}のfigshareに追加しました" + +#: website/static/js/logActionsList_extract.js:154 +msgid "${user} removed ${path_type} ${path} from figshare in ${node}" +msgstr "${user}が${node}のfigshareから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:155 +msgid "${user} created folder ${path} in figshare in ${node}" +msgstr "${user}が${node}のfigshareにフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:156 +msgid "${user} authorized the figshare addon for ${node}" +msgstr "${user}が${node}のfigshareアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:157 +msgid "${user} deauthorized the figshare addon for ${node}" +msgstr "${user}が${node}のfigshareアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:158 +msgid "figshare addon for ${node} deauthorized" +msgstr "許可されていない${node}のfigshareアドオン" + +#: website/static/js/logActionsList_extract.js:159 +msgid "${user} changed external link to ${forward_url} in ${node}" +msgstr "${user}が${node}の外部リンクを${forward_url}に変更しました" + +#: website/static/js/logActionsList_extract.js:160 +msgid "${user} added file ${path} to GitHub repo ${repo} in ${node}" +msgstr "${user}がファイル${path}を${node}のGitHubリポジトリ(${repo})に追加しました" + +#: website/static/js/logActionsList_extract.js:161 +msgid "${user} removed ${path_type} ${path} in GitHub repo ${repo} in ${node}" +msgstr "${user}が${node}のGitHubリポジトリ(${repo})で${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:162 +msgid "${user} updated file ${path} in GitHub repo ${repo} in ${node}" +msgstr "${user}が${node}のGitHubリポジトリ(${repo})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:163 +msgid "${user} created folder ${path} in GitHub repo ${repo} in ${node}" +msgstr "${user}が${node}のGitHubリポジトリ(${repo})にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:164 +msgid "${user} authorized the GitHub addon for ${node}" +msgstr "${user}が${node}のGitHubアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:165 +msgid "${user} deauthorized the GitHub addon for ${node}" +msgstr "${user}が${node}のGitHubアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:166 +msgid "GitHub addon for ${node} deauthorized" +msgstr "許可されていない${node}のGitHubアドオン" + +#: website/static/js/logActionsList_extract.js:167 +msgid "${user} linked GitHub repo ${repo} to ${node}" +msgstr "${user}がGitHubリポジトリ${repo}を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:168 +msgid "${user} added file ${path} to GitLab repo ${gitlab_repo} in ${node}" +msgstr "${user}がファイル(${path})を${node}のGitLabリポジトリ(${gitlab_repo})に追加しました" + +#: website/static/js/logActionsList_extract.js:169 +msgid "${user} removed file ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "${user}が${node}のGitLabリポジトリ(${gitlab_repo})のファイル(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:170 +msgid "${user} updated file ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "${user}が${node}のGitLabリポジトリ(${gitlab_repo})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:171 +msgid "${user} created folder ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "${user}が${node}のGitLabリポジトリ(${gitlab_repo})にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:172 +msgid "${user} authorized the GitLab addon for ${node}" +msgstr "${user}が${node}のGitLabアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:173 +msgid "${user} deauthorized the GitLab addon for ${node}" +msgstr "${user}が${node}のGitLabアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:174 +msgid "GitLab addon for ${node} deauthorized" +msgstr "許可されていない${node}のGitLabアドオン" + +#: website/static/js/logActionsList_extract.js:175 +msgid "${user} linked GitLab repo ${gitlab_repo} to ${node}" +msgstr "${user}がGitLabリポジトリ(${gitlab_repo})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:176 +msgid "${user} added file ${googledrive_path} to Google Drive in ${node}" +msgstr "${user}がファイル(${googledrive_path})を${node}のGoogle Driveに追加しました" + +#: website/static/js/logActionsList_extract.js:177 +msgid "" +"${user} removed ${path_type} ${googledrive_path} from Google Drive in " +"${node}" +msgstr "${user}が${node}のGoogle Driveから${path_type}(${googledrive_path})を削除しました" + +#: website/static/js/logActionsList_extract.js:178 +msgid "${user} updated file ${googledrive_path} in Google Drive in ${node}" +msgstr "${user}が${node}のGoogle Driveのファイル(${googledrive_path})を更新しました" + +#: website/static/js/logActionsList_extract.js:179 +msgid "${user} created folder ${googledrive_path} in Google Drive in ${node}" +msgstr "${user}が${node}のGoogle Driveにフォルダ(${googledrive_path})を作成しました" + +#: website/static/js/logActionsList_extract.js:180 +msgid "${user} linked Google Drive folder ${googledrive_folder} to ${node}" +msgstr "${user}がGoogle Driveフォルダ(${googledrive_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:181 +msgid "${user} authorized the Google Drive addon for ${node}" +msgstr "${user}が${node}のGoogle Driveアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:182 +msgid "${user} deauthorized the Google Drive addon for ${node}" +msgstr "${user}が${node}のGoogle Driveアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:183 +msgid "Google Drive addon for ${node} deauthorized" +msgstr "許可されていない${node}のGoogle Driveアドオン" + +#: website/static/js/logActionsList_extract.js:184 +msgid "${user} added file ${iqbrims_path} to IQB-RIMS in ${node}" +msgstr "${user}が${node}のIQB-RIMSにファイル$({iqbrims_path})を追加しました" + +#: website/static/js/logActionsList_extract.js:185 +msgid "${user} removed ${path_type} ${iqbrims_path} from IQB-RIMS in ${node}" +msgstr "${user}が${node}のIQB-RIMSから${path_type}(${iqbrims_path})を削除しました" + +#: website/static/js/logActionsList_extract.js:186 +msgid "${user} updated file ${iqbrims_path} in IQB-RIMS in ${node}" +msgstr "${user}が${node}のIQB-RIMSのファイル(${iqbrims_path})を更新しました" + +#: website/static/js/logActionsList_extract.js:187 +msgid "${user} created folder ${iqbrims_path} in IQB-RIMS in ${node}" +msgstr "${user}が${node}のIQB-RIMSにフォルダ(${iqbrims_path})を作成しました" + +#: website/static/js/logActionsList_extract.js:188 +msgid "${user} linked IQB-RIMS folder ${iqbrims_folder} to ${node}" +msgstr "${user}がIQB-RIMSフォルダ(${iqbrims_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:189 +msgid "${user} authorized the IQB-RIMS addon for ${node}" +msgstr "${user}が${node}のIQB-RIMSアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:190 +msgid "${user} deauthorized the IQB-RIMS addon for ${node}" +msgstr "${user}が${node}のIQB-RIMSアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:191 +msgid "IQB-RIMS addon for ${node} deauthorized" +msgstr "許可されていない${node}のIQB-RIMSアドオン" + +#: website/static/js/logActionsList_extract.js:192 +#: website/static/js/logActionsList_extract.js:194 +msgid "${user} started IQB-RIMS workflow for ${node}" +msgstr "${user}が${node}のIQB-RIMSワークフローを開始しました" + +#: website/static/js/logActionsList_extract.js:193 +#: website/static/js/logActionsList_extract.js:195 +msgid "Finished workflow of ${user} for ${node}" +msgstr "${node}の${user}のワークフローが終了しました" + +#: website/static/js/logActionsList_extract.js:196 +msgid "${user} linked Mendeley folder ${folder_name} to ${node}" +msgstr "${user}がMendeleyフォルダ(${folder_name})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:197 +msgid "${user} authorized the Mendeley addon for ${node}" +msgstr "${user}が${node}のMendeleyアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:198 +msgid "${user} deauthorized the Mendeley addon for ${node}" +msgstr "${user}が${node}のMendeleyアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:199 +msgid "${user} added file ${path} to Nextcloud in ${node}" +msgstr "${user}が${node}のNextcloudにファイル(${path})を追加しました" + +#: website/static/js/logActionsList_extract.js:200 +msgid "${user} removed ${path_type} ${path} from Nextcloud in ${node}" +msgstr "${user}が${node}のNextcloudから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:201 +msgid "${user} updated file ${path} in Nextcloud in ${node}" +msgstr "${user}が${node}のNextcloudのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:202 +msgid "${user} created folder ${path} in Nextcloud in ${node}" +msgstr "${user}が${node}のNextcloudにフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:203 +msgid "${user} linked Nextcloud folder ${folder} to ${node}" +msgstr "${user}がNextcloudフォルダ(${folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:204 +msgid "${user} authorized the Nextcloud addon for ${node}" +msgstr "${user}が${node}のNextcloudアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:205 +msgid "${user} deauthorized the Nextcloud addon for ${node}" +msgstr "${user}が${node}のNextcloudアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:206 +msgid "Nextcloud addon for ${node} deauthorized" +msgstr "許可されていない${node}のNextcloudアドオン" + +#: website/static/js/logActionsList_extract.js:207 +msgid "${user} added file ${path} to Microsoft OneDrive in ${node}" +msgstr "${user}が${node}のMicrosoft OneDriveにファイル(${path})を追加しました" + +#: website/static/js/logActionsList_extract.js:208 +msgid "${user} removed ${path_type} ${path} from Microsoft OneDrive in ${node}" +msgstr "${user}が${node}のMicrosoft OneDriveから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:209 +msgid "${user} updated file ${path} in Microsoft OneDrive in ${node}" +msgstr "${user}が${node}のMicrosoft OneDriveのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:210 +msgid "${user} created folder ${path} in Microsoft OneDrive in ${node}" +msgstr "${user}がMicrosoft OneDriveの${node}にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:211 +msgid "${user} linked Microsoft OneDrive folder ${onedrive_folder} to ${node}" +msgstr "${user}がMicrosoft OneDriveフォルダ(${onedrive_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:212 +msgid "${user} authorized the Microsoft OneDrive addon for ${node}" +msgstr "${user}が${node}のMicrosoft OneDriveアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:213 +msgid "${user} deauthorized the Microsoft OneDrive addon for ${node}" +msgstr "${user}が${node}のMicrosoft OneDriveアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:214 +msgid "Microsoft OneDrive addon for ${node} deauthorized" +msgstr "許可されていない${node}のMicrosoft OneDriveアドオン" + +#: website/static/js/logActionsList_extract.js:215 +msgid "${user} added file ${path} to ownCloud in ${node}" +msgstr "${user}がファイル${path}を${node}のownCloudに追加しました" + +#: website/static/js/logActionsList_extract.js:216 +msgid "${user} removed ${path_type} ${path} from ownCloud in ${node}" +msgstr "${user}が${node}のownCloudから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:217 +msgid "${user} updated file ${path} in ownCloud in ${node}" +msgstr "${user}が${node}のownCloudのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:218 +msgid "${user} created folder ${path} in ownCloud in ${node}" +msgstr "${user}が${node}のownCloudにフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:219 +msgid "${user} linked ownCloud folder ${folder} to ${node}" +msgstr "${user}がownCloudフォルダ(${folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:220 +msgid "${user} authorized the ownCloud addon for ${node}" +msgstr "${user}が${node}のownCloudアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:221 +msgid "${user} deauthorized the ownCloud addon for ${node}" +msgstr "${user}が${node}のownCloudアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:222 +msgid "ownCloud addon for ${node} deauthorized" +msgstr "許可されていない${node}のownCloudアドオン" + +#: website/static/js/logActionsList_extract.js:223 +msgid "${user} linked the Amazon S3 bucket ${bucket} to ${node}" +msgstr "${user}がAmazon S3バケット(${bucket})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:224 +msgid "${user} unselected the Amazon S3 bucket ${bucket} in ${node}" +msgstr "${user}が${node}のAmazon S3バケット(${bucket})を選択解除しました" + +#: website/static/js/logActionsList_extract.js:225 +msgid "${user} added file ${path} to Amazon S3 bucket ${bucket} in ${node}" +msgstr "${user}がファイル(${path})を${node}のAmazon S3バケット(${bucket})に追加しました" + +#: website/static/js/logActionsList_extract.js:226 +msgid "${user} removed ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "${user}が${node}のAmazon S3バケット(${bucket})で${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:227 +msgid "${user} updated file ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "${user}が${node}のAmazon S3バケット(${bucket}の)ファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:228 +msgid "${user} created folder ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "${user}が${node}のAmazon S3バケット$({bucket})にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:229 +msgid "${user} authorized the Amazon S3 addon for ${node}" +msgstr "${user}が${node}のAmazon S3アドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:230 +msgid "${user} deauthorized the Amazon S3 addon for ${node}" +msgstr "${user}が${node}のAmazon S3アドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:231 +msgid "Amazon S3 addon for ${node} deauthorized" +msgstr "許可されていない${node}のAmazon S3アドオン" + +#: website/static/js/logActionsList_extract.js:232 +msgid "${user} linked the S3 Compatible Storage bucket ${bucket} to ${node}" +msgstr "${user}がS3互換ストレージバケット(${bucket})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:233 +msgid "${user} unselected the S3 Compatible Storage bucket ${bucket} in ${node}" +msgstr "${user}が${node}のS3互換ストレージバケット(${bucket})の選択を解除しました" + +#: website/static/js/logActionsList_extract.js:234 +msgid "" +"${user} added file ${path} to S3 Compatible Storage bucket ${bucket} in " +"${node}" +msgstr "${user}がファイル(${path})を${node}のS3互換ストレージバケット(${bucket})に追加しました" + +#: website/static/js/logActionsList_extract.js:235 +msgid "" +"${user} removed ${path} in S3 Compatible Storage bucket ${bucket} in " +"${node}" +msgstr "${user}が${node}のS3互換ストレージバケット(${bucket})で${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:236 +msgid "" +"${user} updated file ${path} in S3 Compatible Storage bucket ${bucket} in" +" ${node}" +msgstr "${user}が${node}のS3互換ストレージバケット(${bucket})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:237 +msgid "" +"${user} created folder ${path} in S3 Compatible Storage bucket ${bucket} " +"in ${node}" +msgstr "${user}が${node}のS3互換ストレージバケット(${bucket})にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:238 +msgid "${user} authorized the S3 Compatible Storage addon for ${node}" +msgstr "${user}が${node}のS3互換ストレージアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:239 +msgid "${user} deauthorized the S3 Compatible Storage addon for ${node}" +msgstr "${user}が${node}のS3互換ストレージアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:240 +msgid "S3 Compatible Storage addon for ${node} deauthorized" +msgstr "許可されていない${node}のS3互換ストレージアドオン" + +#: website/static/js/logActionsList_extract.js:241 +msgid "${user} linked the Swift container ${bucket} to ${node}" +msgstr "${user}がSwiftコンテナ(${bucket})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:242 +msgid "${user} unselected the Swift container ${bucket} in ${node}" +msgstr "${user}が${node}のSwiftコンテナ(${bucket})の選択を解除しました" + +#: website/static/js/logActionsList_extract.js:243 +msgid "${user} added file ${path} to Swift container ${bucket} in ${node}" +msgstr "${user}がファイル(${path})を${node}のSwiftコンテナ(${bucket})に追加しました" + +#: website/static/js/logActionsList_extract.js:244 +msgid "${user} removed ${path} in Swift container ${bucket} in ${node}" +msgstr "${user}が${node}のSwiftコンテナ(${bucket})で${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:245 +msgid "${user} updated file ${path} in Swift container ${bucket} in ${node}" +msgstr "${user}が${node}のSwiftコンテナ(${bucket})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:246 +msgid "${user} created folder ${path} in Swift container ${bucket} in ${node}" +msgstr "${user}が${node}のSwiftコンテナ(${bucket})にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:247 +msgid "${user} authorized the Swift addon for ${node}" +msgstr "${user}が${node}のSwiftアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:248 +msgid "${user} deauthorized the Swift addon for ${node}" +msgstr "${user}が${node}のSwiftアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:249 +msgid "Swift addon for ${node} deauthorized" +msgstr "許可されていない${node}のSwiftアドオン" + +#: website/static/js/logActionsList_extract.js:250 +msgid "${user} added file ${filename} to WEKO index ${dataset} in ${node}" +msgstr "${user}が${node}のWEKOインデックス(${dataset})にファイル(${filename})を追加しました" + +#: website/static/js/logActionsList_extract.js:251 +msgid "${user} removed file ${filename} from WEKO index ${dataset} in ${node}" +msgstr "${user}が${node}のWEKOインデックス(${dataset})からファイル(${filename})を削除しました" + +#: website/static/js/logActionsList_extract.js:252 +msgid "${user} linked WEKO index ${dataset} to ${node}" +msgstr "${user}がWEKOインデックス(${dataset})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:253 +msgid "${user} created an index ${filename} on ${node}" +msgstr "${user}が${node}にインデックス(${filename})を作成しました" + +#: website/static/js/logActionsList_extract.js:254 +msgid "${user} created an item ${filename} on ${node}" +msgstr "${user}が${node}にアイテム(${filename})を作成しました" + +#: website/static/js/logActionsList_extract.js:255 +msgid "${user} created folder ${filename} in WEKO index ${dataset} in ${node}" +msgstr "${user}が${node}のWEKOインデックス(${dataset})にフォルダ(${filename})を作成しました" + +#: website/static/js/logActionsList_extract.js:256 +msgid "${user} authorized the WEKO addon for ${node}" +msgstr "${user}が${node}のWEKOアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:257 +msgid "${user} deauthorized the WEKO addon for ${node}" +msgstr "${user}が${node}のWEKOアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:258 +msgid "WEKO addon for ${node} deauthorized" +msgstr "許可されていない${node}のWEKOアドオン" + +#: website/static/js/logActionsList_extract.js:259 +msgid "${user} linked Zotero folder ${folder_name} to ${node}" +msgstr "${user}がZoteroフォルダ(${folder_name})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:260 +msgid "${user} linked Zotero library ${library_name} to ${node}" +msgstr "${user}がZoteroライブラリ(${library_name})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:261 +msgid "${user} authorized the Zotero addon for ${node}" +msgstr "${user}が${node}のZoteroアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:262 +msgid "${user} deauthorized the Zotero addon for ${node}" +msgstr "${user}が${node}のZoteroアドオンの認証を解除しました" + +#: website/static/js/logTextParser.js:824 +msgid "unknown format" +msgstr "不明な形式" + +#: website/static/js/meetings.js:24 +msgid "Submissions" +msgstr "提出" + +#: website/static/js/meetings.js:30 +msgid "Location" +msgstr "ロケーション" + +#: website/static/js/filepage/revisions.js:109 website/static/js/meetings.js:36 +msgid "Date" +msgstr "更新日時" + +#: website/static/js/myProjects.js:308 +msgid "We're having some trouble contacting our servers. Try reloading the page." +msgstr "サーバーへの接続に問題があります。 ページを再読み込みしてください。" + +#: website/static/js/myProjects.js:308 +msgid "Something went wrong!" +msgstr "何かがうまくいきませんでした!" + +#: website/static/js/myProjects.js:433 +msgid "All my projects" +msgstr "全てのプロジェクト" + +#: website/static/js/myProjects.js:461 +msgid "Error loading project category names." +msgstr "プロジェクトカテゴリ名の読み込みエラー。" + +#: website/static/js/myProjects.js:665 +msgid "Some projects" +msgstr "いくつかのプロジェクト" + +#: website/static/js/myProjects.js:669 +msgid " could not be removed from the collection" +msgstr "がコレクションから削除できませんでした" + +#: website/static/js/myProjects.js:671 +msgid "Please try again." +msgstr "もう一度やり直して下さい" + +#: website/static/js/myProjects.js:764 +msgid "You have not created any projects yet." +msgstr "プロジェクトはまだ作成されていません。" + +#: website/static/js/myProjects.js:768 +msgid "" +"There have been no completed registrations for this institution, but you " +"can view the " +msgstr "この機関の登録は完了していませんが、次を表示できます:" + +#: website/static/js/myProjects.js:769 +msgid "newest public registrations" +msgstr "最新の公開登録" + +#: website/static/js/myProjects.js:770 website/static/js/myProjects.js:778 +msgid " or " +msgstr "または" + +#: website/static/js/myProjects.js:771 +msgid "popular public registrations." +msgstr "人気のある公開登録。" + +#: website/static/js/myProjects.js:774 +msgid "You have not made any registrations yet. Go to " +msgstr "まだ登録していません。登録の" + +#: website/static/js/myProjects.js:775 +msgid "Guides" +msgstr "仕組みを学習するためにガイドに" + +#: website/static/js/myProjects.js:775 +msgid " to learn how registrations work." +msgstr "行って下さい。" + +#: website/static/js/myProjects.js:778 +msgid "You have not made any preprints yet. Learn more about preprints in the " +msgstr "まだプレプリントを作成していません。 プレプリントの詳細については、" + +#: website/static/js/myProjects.js:778 +msgid "OSF Guides" +msgstr "OSFガイド" + +#: website/static/js/myProjects.js:778 +msgid "make one now." +msgstr "を読むか、今すぐ作りましょう。" + +#: website/static/js/myProjects.js:780 +msgid "" +"You have no bookmarks. You can add projects or registrations by dragging " +"them into your bookmarks or by clicking the Add to Bookmark button on the" +" project or registration." +msgstr "" +"ブックマークがありません。 " +"プロジェクトまたは登録を追加するには、それらをブックマークにドラッグするか、プロジェクトまたは登録の[ブックマークに追加]ボタンをクリックします。" + +#: website/static/js/myProjects.js:782 +msgid "This collection is empty." +msgstr "このコレクションは空です。" + +#: website/static/js/myProjects.js:784 +msgid "" +" You can add projects, registrations, or preprints by dragging them into " +"the collection." +msgstr "プロジェクト、登録、またはプレプリントをコレクションにドラッグして追加できます。" + +#: website/static/js/myProjects.js:795 +msgid "" +"No components to display. Either there are no components, or there are " +"private components in which you are not a contributor." +msgstr "表示するコンポーネントはありません。 コンポーネントがないか、メンバーではないプライベートコンポーネントがあります。" + +#: website/static/js/myProjects.js:966 +msgid "Collections could not be loaded." +msgstr "コレクションを読み込めませんでした。" + +#: website/static/js/myProjects.js:967 +msgid "Please reload the page." +msgstr "ページをリロードしてください。" + +#: website/static/js/myProjects.js:1109 +msgid "My Projects " +msgstr "マイプロジェクト " + +#: website/static/js/myProjects.js:1110 +msgid "Browse and organize all your projects" +msgstr "すべてのプロジェクトを管理する" + +#: website/static/js/myProjects.js:1115 +msgid "Create Project" +msgstr "新規プロジェクト作成" + +#: website/static/js/myProjects.js:1172 +msgid "Fetching more projects" +msgstr "より多くのプロジェクトを取得する" + +#: website/static/js/myProjects.js:1278 +msgid "\" collection could not be created." +msgstr "\"コレクションを作成できませんでした。" + +#: website/static/js/myProjects.js:1279 website/static/js/myProjects.js:1311 +#: website/static/js/myProjects.js:1336 +msgid "Please try again" +msgstr "もう一度やり直して下さい。" + +#: website/static/js/myProjects.js:1310 +msgid "\" could not be deleted." +msgstr "\"は削除できませんでした。" + +#: website/static/js/myProjects.js:1335 +msgid "\" could not be renamed." +msgstr "\"は名前を変更できませんでした。" + +#: website/static/js/myProjects.js:1383 +msgid "\" is already in \"%1$s\"" +msgstr "はすでに「%1$s」にあります。" + +#: website/static/js/myProjects.js:1469 +msgid "Collections " +msgstr "コレクション" + +#: website/static/js/myProjects.js:1472 +msgid "" +"Collections are groups of projects. You can create custom collections. " +"Drag and drop your projects or bookmarked projects to add them." +msgstr "" +"コレクションはプロジェクトのグループです。 " +"カスタムコレクションを作成できます。プロジェクトまたはブックマークしたプロジェクトをドラッグアンドドロップして追加します。" + +#: website/static/js/myProjects.js:1501 +msgid " Rename" +msgstr "リネーム" + +#: website/static/js/myProjects.js:1510 +msgid " Delete" +msgstr "削除" + +#: website/static/js/myProjects.js:1528 +msgid "Add new collection" +msgstr "新しいコレクションを追加" + +#: website/static/js/myProjects.js:1531 +msgid "" +"Collections are groups of projects that help you organize your work. " +"After you create your collection, you can add projects by dragging them " +"into the collection." +msgstr "コレクションは、作業の整理に役立つプロジェクトのグループです。コレクションを作成したら、プロジェクトをコレクションにドラッグしてプロジェクトを追加できます。" + +#: website/static/js/myProjects.js:1533 +msgid "Collection name" +msgstr "コレクション名" + +#: website/static/js/myProjects.js:1548 +msgid "e.g. My Replications" +msgstr "例:マイコレクション" + +#: website/static/js/myProjects.js:1565 +msgid "Add" +msgstr "追加" + +#: website/static/js/myProjects.js:1576 +msgid "Rename collection" +msgstr "コレクションの名前を変更" + +#: website/static/js/myProjects.js:1581 +msgid "Rename to: " +msgstr "名前を変更:" + +#: website/static/js/myProjects.js:1624 +msgid "Delete collection \"%1$s\"?" +msgstr "コレクション(%1$s)を削除しますか?" + +#: website/static/js/myProjects.js:1627 +msgid "This will delete your collection, but your projects will not be deleted." +msgstr "これによりコレクションが削除されますが、プロジェクトは削除されません。" + +#: website/static/js/myProjects.js:1737 +msgid "Parent projects" +msgstr "親プロジェクト" + +#: website/static/js/myProjects.js:1786 +msgid "Create component" +msgstr "コンポーネントを作成" + +#: website/static/js/myProjects.js:1875 +msgid "" +"No contributors to display in this collection. Project administrators can" +" add contributors." +msgstr "このコレクションに表示するメンバーはいません。 プロジェクト管理者はメンバーを追加できます。" + +#: website/static/js/myProjects.js:1898 +msgid "" +"No tags to display in this collection. Project administrators and write " +"contributors can add tags." +msgstr "このコレクションに表示するタグはありません。 プロジェクト管理者とメンバーはタグを追加できます。" + +#: website/static/js/myProjects.js:1924 +msgid "Contributors " +msgstr "メンバー" + +#: website/static/js/myProjects.js:1927 +msgid "Click a contributor's name to see projects that you have in common." +msgstr "メンバーの名前をクリックすると、共通のプロジェクトが表示されます。" + +#: website/static/js/myProjects.js:1938 website/static/js/myProjects.js:2019 +msgid "Tags" +msgstr "タグ" + +#: website/static/js/myProjects.js:1963 +msgid "Select a row to view project details." +msgstr "行を選択して、プロジェクトの詳細を表示します。" + +#: website/static/js/myProjects.js:1994 +msgid "Information" +msgstr "プロジェクト情報" + +#: website/static/js/myProjects.js:1998 +msgid "Activity" +msgstr "最近の活動" + +#: website/static/js/myProjects.js:2005 +msgid "Visibility: " +msgstr "可視性:" + +#: website/static/js/myProjects.js:2005 +msgid "Public" +msgstr "公開" + +#: website/static/js/myProjects.js:2005 +msgid "Private" +msgstr "非公開" + +#: website/static/js/myProjects.js:2007 +msgid "Category: " +msgstr "カテゴリ:" + +#: website/static/js/myProjects.js:2011 +msgid "Permission: " +msgstr "権限:" + +#: website/static/js/myProjects.js:2012 +msgid "Last Modified on: " +msgstr "最終更新日時:" + +#: website/static/js/myProjects.js:2040 +msgid "Remove selected from collection" +msgstr "コレクションから選択を削除" + +#: website/static/js/nodeControl.js:61 +msgid "A request to make this registration public is pending" +msgstr "この登録を公開するリクエストは保留中です" + +#: website/static/js/nodeControl.js:102 +msgid "Edit Title" +msgstr "タイトルを編集" + +#: website/static/js/nodeControl.js:106 +msgid "Title cannot be blank." +msgstr "タイトルを空白にすることはできません。" + +#: website/static/js/nodeControl.js:109 +msgid "Title cannot exceed 512 characters." +msgstr "タイトルは512文字を超えることはできません。" + +#: website/static/js/nodeControl.js:114 +msgid "component" +msgstr "コンポーネント" + +#: website/static/js/nodeControl.js:117 +msgid "Edit Description" +msgstr "説明を編集" + +#: website/static/js/nodeControl.js:118 +msgid "Add a brief description to your %1$s" +msgstr "%1$sに簡単な説明を追加してください" + +#: website/static/js/nodeControl.js:135 +msgid "Select a category" +msgstr "カテゴリを編集" + +#: website/static/js/nodeControl.js:175 +msgid "The project could not be removed" +msgstr "プロジェクトを削除できませんでした" + +#: website/static/js/nodeControl.js:212 +msgid "Create DOI" +msgstr "DOIを作成" + +#: website/static/js/nodeControl.js:214 +msgid "Are you sure you want to create a DOI for this %1$s" +msgstr "%1$sのためのDOIを作成してもよろしいですか?" + +#: website/static/js/nodeControl.js:215 +msgid "? A DOI" +msgstr "DOIは" + +#: website/static/js/nodeControl.js:216 +msgid " is persistent and will always resolve to this page." +msgstr "永続的であり、常にこのページに解決されます。" + +#: website/static/js/nodeControl.js:245 +msgid "We could not create the identifier at this time. " +msgstr "現時点では識別子を作成できませんでした。" + +#: website/static/js/nodeControl.js:246 +msgid "The DOI acquisition service may be down right now. " +msgstr "DOI取得サービスは現在停止している可能性があります。" + +#: website/static/js/nodeControl.js:247 +msgid "Please try again soon and/or contact %1$s" +msgstr "すぐに再試行するか、%1$sにお問い合わせ下さい" + +#: website/static/js/nodeControl.js:249 +msgid "Could not create doi" +msgstr "DOIを作成できませんでした。" + +#: website/static/js/nodeSelectTreebeard.js:62 +#: website/static/js/notificationsTreebeard.js:62 +#: website/static/js/profile.js:320 +#: website/static/js/wikiSettingsTreebeard.js:57 +msgid "Could not update settings" +msgstr "設定を更新できませんでした" + +#: website/static/js/nodeSelectTreebeard.js:81 +#: website/static/js/nodesDeleteTreebeard.js:56 +#: website/static/js/nodesPrivacySettingsTreebeard.js:56 +msgid "checkBox" +msgstr "チェックボックス" + +#: website/static/js/nodesDelete.js:38 +msgid "" +"This %1$s also contains supplemental materials for a " +"preprint. It will" +msgstr "この%1$sには、プレプリントの補足資料も含まれています。" + +#: website/static/js/nodesDelete.js:39 +msgid " no longer be available to contributors or connected to the preprint." +msgstr "メンバーは利用できなくなり、プレプリントに接続できなくなります。" + +#: website/static/js/nodesDelete.js:43 +msgid "It will no longer be available to other contributors on the project." +msgstr "プロジェクトの他のメンバーは利用できなくなります。" + +#: website/static/js/nodesDelete.js:49 +msgid "Are you sure you want to delete this %1$s?" +msgstr "この%1$sを削除してもよろしいですか?" + +#: website/static/js/nodesDelete.js:80 website/static/js/nodesDelete.js:340 +msgid "Unable to delete %1$s" +msgstr "%1$sを削除できません" + +#: website/static/js/nodesDelete.js:84 website/static/js/nodesDelete.js:344 +msgid "Problem deleting %1$s" +msgstr "%1$sの削除中に問題が発生しました" + +#: website/static/js/nodesDelete.js:85 +msgid "Could not delete %$1s" +msgstr "%$1sを削除できませんでした" + +#: website/static/js/nodesDelete.js:116 +msgid "" +"

                                      This %1$s also contains supplemental materials for a " +"preprint, and one or more of its %2$s contains " +"supplemental materials for a preprint." +msgstr "

                                      この%1$sにはプレプリントの補足資料も含まれており、1つ以上の%2$sにはプレプリントの補足資料が含まれています。" + +#: website/static/js/nodesDelete.js:119 +msgid "" +"

                                      This %1$s also contains supplemental materials for a " +"preprint." +msgstr "

                                      この%1$sには、プレプリントの補足資料も含まれています。" + +#: website/static/js/nodesDelete.js:122 +msgid "" +"

                                      This %1$s also has one or more %2$s that contain supplemental " +"materials for a preprint." +msgstr "

                                      この%1$sには、プレプリントの補足資料を含む1つ以上の%2$sもあります。" + +#: website/static/js/nodesDelete.js:150 +msgid "Delete %1$s" +msgstr "%1$sを削除" + +#: website/static/js/nodesDelete.js:151 +msgid "Delete %1$s and %2$s" +msgstr "%1$sと%2$sを削除" + +#: website/static/js/nodesDelete.js:156 +msgid "This %1$s contains %2$s." +msgstr "この%1$sには%2$sが含まれています。" + +#: website/static/js/nodesDelete.js:156 +msgid " To delete this %1$s, you must also delete all %2$s." +msgstr "この%1$sを削除するには、すべての%2$sも削除する必要があります。" + +#: website/static/js/nodesDelete.js:158 +msgid " The following %1$s and %2$s will be deleted." +msgstr "次の%1$sと%2$sは削除されます。" + +#: website/static/js/nodesDelete.js:161 +msgid " This action is irreversible." +msgstr "このアクションは元に戻せません。" + +#: website/static/js/nodesDelete.js:167 +msgid "" +"Please note that deleting your %1$s will erase all your %2$s data and " +"this process is IRREVERSIBLE. Deleted %3$s and %4$s will no longer be " +"available to other contributors on the %5$s" +msgstr "" +"%1$sを削除すると、すべての%2$sデータが消去され、このプロセスは不可逆であることに注意してください。 " +"削除された%3$sと%4$sは、%5$sの他のメンバーが利用できなくなります" + +#: website/static/js/nodesDelete.js:168 +msgid " and will be disconnected from your preprints." +msgstr "そして、プレプリントから切断されます。" + +#: website/static/js/nodesDelete.js:168 +msgid "." +msgstr "。" + +#: website/static/js/nodesDelete.js:331 +msgid "Your %1$s has been successfully deleted." +msgstr "%1$sは正常に削除されました。" + +#: website/static/js/nodesDelete.js:345 +msgid "Could not batch delete project and its components." +msgstr "プロジェクトとそのコンポーネントをバッチ削除できませんでした。" + +#: website/static/js/nodesDeleteTreebeard.js:84 +msgid "You must have admin permissions on this component to be able to delete it." +msgstr "このコンポーネントを削除するには、このコンポーネントの管理者権限が必要です。" + +#: website/static/js/nodesPrivacy.js:19 +msgid "" +"Please review your projects, components, and add-ons for sensitive or " +"restricted information before making them public." +msgstr "このコンポーネントを削除するには、このコンポーネントの管理者権限が必要です。" + +#: website/static/js/nodesPrivacy.js:20 +msgid "" +"

                                      Once they are made public, you should assume they will always be " +"public. You can " +msgstr "

                                      それらが公開されると、それらは常に公開されると想定する必要があります。" + +#: website/static/js/nodesPrivacy.js:21 +msgid "" +"return them to private later, but search engines (including Google’s " +"cache) or others may access files, wiki pages, or analytics before you " +"do." +msgstr "後でプライベートに戻すことができますが、検索エンジン(Googleのキャッシュを含む)または他のユーザーは、ファイル、Wikiページ、または分析にアクセスする前にアクセスする場合があります。" + +#: website/static/js/nodesPrivacy.js:23 +msgid "" +"
                                      • Public forks and registrations of this project will remain " +"public.
                                      • " +msgstr "
                                        • このプロジェクトのパブリックフォークと登録はパブリックのままです。
                                        • " + +#: website/static/js/nodesPrivacy.js:24 website/static/js/nodesPrivacy.js:27 +msgid "" +"
                                        • Search engines (including Google's cache) or others may have accessed" +" files, wiki pages, or analytics while this project was public.
                                        " +msgstr "
                                      • このプロジェクトが公開されている間に、検索エンジン(Googleのキャッシュを含む)または他のユーザーがファイル、Wikiページ、または分析にアクセスした可能性があります。
                                      " + +#: website/static/js/nodesPrivacy.js:26 +msgid "" +"
                                      • Preprints will remain public.
                                      • Public forks and " +"registrations of this project will remain public.
                                      • " +msgstr "
                                        • プレプリントは公開されます。
                                        • このプロジェクトの公開フォークと登録は公開されます。
                                        • " + +#: website/static/js/nodesPrivacy.js:28 +msgid "" +"By clicking confirm, an email will be sent to project administrator(s) to" +" approve ending the embargo. If approved, this registration, including " +"any components, will be made public immediately. This action is " +"irreversible." +msgstr "" +"[確認]をクリックすると、禁止措置の終了を承認するためのメールがプロジェクト管理者に送信されます。 " +"承認されると、コンポーネントを含むこの登録はすぐに公開されます。 このアクションは元に戻せません。" + +#: website/static/js/nodesPrivacy.js:29 +msgid "End embargo early" +msgstr "禁止措置を早期に終了する" + +#: website/static/js/nodesPrivacy.js:30 +msgid "Adjust your privacy settings by checking the boxes below. " +msgstr "下のチェックボックスをオンにして、プライバシー設定を調整します。" + +#: website/static/js/nodesPrivacy.js:31 +msgid "" +"

                                          Checked projects and components will be public. " +"
                                          Unchecked components will be private." +msgstr "

                                          チェックされたプロジェクトとコンポーネントは公開になり、
                                          チェックされていないコンポーネントは非公開になります" + +#: website/static/js/nodesPrivacy.js:33 +msgid "The following projects and components will be made public." +msgstr "次のプロジェクトとコンポーネントが公開されます。" + +#: website/static/js/nodesPrivacy.js:34 +msgid "The following projects and components will be made private." +msgstr "次のプロジェクトとコンポーネントは非公開になります。" + +#: website/static/js/nodesPrivacy.js:35 +msgid "No privacy settings were changed. Go back to make a change." +msgstr "プライバシー設定は変更されていません。 戻って変更を加えます。" + +#: website/static/js/nodesPrivacy.js:36 +msgid "" +"You can only change the privacy of 100 projects and components at a time." +" Please go back and limit your selection." +msgstr "一度に変更できるのは、100個のプロジェクトとコンポーネントのプライバシーのみです。 戻って選択を制限してください。" + +#: website/static/js/nodesPrivacy.js:38 +msgid "This project/component contains supplemental materials for a preprint." +msgstr "このプロジェクト/コンポーネントには、プレプリントの補足資料が含まれています。" + +#: website/static/js/nodesPrivacy.js:39 +msgid "" +"

                                          Making this project/component private will prevent others from" +" accessing it.

                                          " +msgstr "

                                          このプロジェクト/コンポーネントを非公開にすると、他の人がアクセスできなくなります。

                                          " + +#: website/static/js/nodesPrivacy.js:155 +msgid "Make %1$s private" +msgstr "%1$sを非公開にします" + +#: website/static/js/nodesPrivacy.js:156 +msgid "Warning" +msgstr "警告" + +#: website/static/js/nodesPrivacy.js:157 +msgid "Change privacy settings" +msgstr "プライバシー設定を変更する" + +#: website/static/js/nodesPrivacy.js:158 +msgid "Projects and components affected" +msgstr "影響を受けるプロジェクトとコンポーネント" + +#: website/static/js/nodesPrivacy.js:247 +msgid "Updating Privacy" +msgstr "プライバシーの更新" + +#: website/static/js/nodesPrivacy.js:257 +msgid "Unable to update project privacy" +msgstr "プロジェクトのプライバシーを更新できません" + +#: website/static/js/nodesPrivacy.js:261 +msgid "Problem changing privacy" +msgstr "プライバシーを変更する問題" + +#: website/static/js/nodesPrivacy.js:262 +msgid "Could not PATCH project settings." +msgstr "プロジェクト設定をパッチできませんでした。" + +#: website/static/js/nodesPrivacy.js:318 +msgid "Submitting request to end embargo early ..." +msgstr "禁止措置を早期に終了する要求を送信しています..." + +#: website/static/js/nodesPrivacy.js:324 +msgid "Email sent" +msgstr "メールを送信しました" + +#: website/static/js/nodesPrivacy.js:325 +msgid "" +"The administrator(s) can approve or cancel the action within 48 hours. If" +" 48 hours pass without any action taken, then the registration will " +"become public." +msgstr "管理者は、48時間以内にアクションを承認またはキャンセルできます。 48時間経過してもアクションが実行されない場合、登録は公開されます。" + +#: website/static/js/notificationsConfig.js:31 +msgid "Could not retrieve settings information." +msgstr "設定情報を取得できませんでした。" + +#: website/static/js/notificationsConfig.js:63 +msgid "Could not update email preferences at this time. If this issue persists, " +msgstr "現在、メール設定を更新できませんでした。 この問題が続く場合、" + +#: website/static/js/notificationsConfig.js:64 +#: website/static/js/osfHelpers.js:316 +msgid "please report it to %1$s." +msgstr "%1$sに報告してください。" + +#: website/static/js/notificationsTreebeard.js:68 +#: website/static/js/notificationsTreebeard.js:182 +#: website/static/js/notificationsTreebeard.js:187 +#: website/static/js/notificationsTreebeard.js:230 +msgid "Instantly" +msgstr "すぐに" + +#: website/static/js/notificationsTreebeard.js:69 +#: website/static/js/notificationsTreebeard.js:188 +#: website/static/js/notificationsTreebeard.js:231 +msgid "Daily" +msgstr "毎日" + +#: website/static/js/notificationsTreebeard.js:70 +msgid "Adopt setting from parent project" +msgstr "親プロジェクトから設定を採用する" + +#: website/static/js/notificationsTreebeard.js:71 +#: website/static/js/notificationsTreebeard.js:186 +#: website/static/js/notificationsTreebeard.js:229 +msgid "Never" +msgstr "無し" + +#: website/static/js/notificationsTreebeard.js:118 +msgid " No configured projects." +msgstr "設定済みのプロジェクトはありません。" + +#: website/static/js/notificationsTreebeard.js:228 +msgid "Adopt setting from parent project %1$s" +msgstr "親プロジェクト%1$sから設定を採用" + +#: website/static/js/oauthAddonNodeConfig.js:143 +msgid "Choose %1$s Account to Import" +msgstr "インポートする%1$sアカウントを選択" + +#: website/static/js/osfHelpers.js:311 +msgid "Please refresh the page and try again or contact %1$s" +msgstr "ページを更新して再試行するか、%1$sに連絡してください" + +#: website/static/js/osfHelpers.js:315 +msgid "GakuNin RDM was unable to resolve your request. If this issue persists, " +msgstr "GakuNin RDMはリクエストを解決できませんでした。 この問題が解決しない場合、" + +#: website/static/js/osfHelpers.js:339 +msgid "Unexpected error occurred in JSON request" +msgstr "JSONリクエストで予期しないエラーが発生しました" + +#: website/static/js/osfHelpers.js:344 +msgid "Unexpected error occurred in an editable input" +msgstr "編集可能な入力で予期しないエラーが発生しました" + +#: website/static/js/osfHelpers.js:361 +#: website/static/js/privateLinkManager.js:105 +msgid "Please wait" +msgstr "お待ち下さい" + +#: website/static/js/osfHelpers.js:800 +#: website/static/js/pages/profile-settings-addons-page.js:32 +#: website/static/js/pages/project-addons-page.js:63 +msgid "Confirm" +msgstr "確認" + +#: website/static/js/osfHelpers.js:811 +msgid "

                                          Type the following to continue: " +msgstr "

                                          次を入力して続行します: " + +#: website/static/js/passwordForms.js:23 +msgid "Please enter a more complex password." +msgstr "より複雑なパスワードを入力してください。" + +#: website/static/js/passwordForms.js:117 +#: website/static/js/passwordForms.js:192 +#: website/static/js/passwordForms.js:258 +msgid "Your password cannot be the same as your email address." +msgstr "パスワードをメールアドレスと同じにすることはできません。" + +#: website/static/js/passwordForms.js:132 +msgid "Your new password cannot be the same as your old password." +msgstr "新しいパスワードを古いパスワードと同じにすることはできません。" + +#: website/static/js/passwordForms.js:143 +#: website/static/js/passwordForms.js:203 +msgid "Passwords must match." +msgstr "パスワードが一致する必要があります。" + +#: website/static/js/passwordForms.js:230 +msgid "Email addresses must match." +msgstr "メールアドレスは一致する必要があります。" + +#: website/static/js/passwordForms.js:301 +msgid "You have already submitted. You cannot sign up more than once." +msgstr "あなたはすでに提出しました。 複数回サインアップすることはできません。" + +#: website/static/js/passwordForms.js:322 +msgid "Please complete reCAPTCHA" +msgstr "reCAPTCHAを完了してください" + +#: website/static/js/pointers.js:28 +msgid "Search all projects" +msgstr "すべてのプロジェクトの検索" + +#: website/static/js/pointers.js:29 +msgid "Search my projects" +msgstr "マイプロジェクトの検索" + +#: website/static/js/pointers.js:133 +msgid "No results found." +msgstr "結果が見つかりません。" + +#: website/static/js/pointers.js:183 +msgid "Error retrieving nodes" +msgstr "ノードの取得エラー" + +#: website/static/js/pointers.js:328 +msgid "Registered: " +msgstr "登録日:" + +#: website/static/js/pointers.js:330 +msgid "Created: " +msgstr "作成日時:" + +#: website/static/js/pointers.js:330 +msgid "" +"\n" +"Modified: " +msgstr "" +"\n" +"最終更新日時:" + +#: website/static/js/pointers.js:362 +msgid "Could not get links" +msgstr "リンクを取得できませんでした" + +#: website/static/js/privateLinkManager.js:63 +msgid "Could not retrieve projects." +msgstr "プロジェクトを取得できませんでした。" + +#: website/static/js/privateLinkManager.js:63 +#: website/static/js/privateLinkTable.js:72 +msgid "Please refresh the page or " +msgstr "ページを更新するか、" + +#: website/static/js/privateLinkManager.js:64 +#: website/static/js/privateLinkTable.js:73 +msgid "contact %1$s" +msgstr "問題が解決しない場合は、%1$sに" + +#: website/static/js/privateLinkManager.js:64 +#: website/static/js/privateLinkTable.js:73 +msgid " if the " +msgstr "お問い合わせ" + +#: website/static/js/privateLinkManager.js:65 +#: website/static/js/privateLinkTable.js:74 +msgid "problem persists." +msgstr "下さい。" + +#: website/static/js/privateLinkTable.js:37 +msgid "Yes" +msgstr "はい" + +#: website/static/js/privateLinkTable.js:37 +msgid "No" +msgstr "いいえ" + +#: website/static/js/privateLinkTable.js:72 +msgid "Could not retrieve view-only links." +msgstr "参照専用リンクを取得できませんでした。" + +#: website/static/js/privateLinkTable.js:96 +msgid "Remove view-only link?" +msgstr "参照専用リンクを削除しますか?" + +#: website/static/js/privateLinkTable.js:97 +msgid "Are you sure you want to remove this view-only link?" +msgstr "この参照専用リンクを削除してもよろしいですか?" + +#: website/static/js/privateLinkTable.js:109 +msgid "Failed to delete the private link." +msgstr "プライベートリンクを削除できませんでした。" + +#: website/static/js/privateLinkTable.js:138 +msgid "Edit Link Name" +msgstr "リンク名を編集" + +#: website/static/js/profile.js:106 +msgid "January" +msgstr "1月" + +#: website/static/js/profile.js:106 +msgid "February" +msgstr "2月" + +#: website/static/js/profile.js:106 +msgid "March" +msgstr "3月" + +#: website/static/js/profile.js:106 +msgid "April" +msgstr "4月" + +#: website/static/js/profile.js:106 +msgid "May" +msgstr "5月" + +#: website/static/js/profile.js:106 +msgid "June" +msgstr "6月" + +#: website/static/js/profile.js:107 +msgid "July" +msgstr "7月" + +#: website/static/js/profile.js:107 +msgid "August" +msgstr "8月" + +#: website/static/js/profile.js:107 +msgid "September" +msgstr "9月" + +#: website/static/js/profile.js:107 +msgid "October" +msgstr "10月" + +#: website/static/js/profile.js:107 +msgid "November" +msgstr "11月" + +#: website/static/js/profile.js:107 +msgid "December" +msgstr "12月" + +#: website/static/js/profile.js:112 +msgid "ongoing" +msgstr "在籍" + +#: website/static/js/profile.js:152 +msgid "Please enter a year for the start date." +msgstr "開始日の年を入力してください。" + +#: website/static/js/profile.js:165 +msgid "Please enter an end date or mark as ongoing." +msgstr "終了日を入力するか、在籍としてマークしてください。" + +#: website/static/js/profile.js:168 +msgid "Please enter a year for the end date." +msgstr "終了日の年を入力してください。" + +#: website/static/js/profile.js:265 website/static/js/profile.js:274 +msgid "There are unsaved changes to your settings." +msgstr "設定に保存されていない変更があります。" + +#: website/static/js/profile.js:275 +msgid "Please save or discard your changes before switching " +msgstr "タブを切り替える前に変更を保存または破棄して" + +#: website/static/js/profile.js:276 +msgid "tabs." +msgstr "ください。" + +#: website/static/js/profile.js:341 +msgid "Could not fetch data" +msgstr "データを取得できませんでした" + +#: website/static/js/profile.js:358 +msgid "Are you sure you want to discard your unsaved changes?" +msgstr "保存していない変更を破棄してもよろしいですか?" + +#: website/static/js/profile.js:720 +msgid "Remove website?" +msgstr "ウェブサイトを削除しますか?" + +#: website/static/js/profile.js:721 +msgid "Are you sure you want to remove this website from your profile?" +msgstr "このウェブサイトをプロフィールから削除してもよろしいですか?" + +#: website/static/js/profile.js:728 +msgid "Website removed" +msgstr "ウェブサイトを削除しました" + +#: website/static/js/profile.js:815 +msgid "Please update your website" +msgstr "ウェブサイトを更新してください" + +#: website/static/js/profile.js:953 +msgid "Remove Institution?" +msgstr "機関を削除しますか?" + +#: website/static/js/profile.js:954 +msgid "Are you sure you want to remove this institution?" +msgstr "この機関を削除してもよろしいですか?" + +#: website/static/js/profile.js:963 +msgid "Institution Removed" +msgstr "機関が削除されました" + +#: website/static/js/profile.js:1078 +msgid "Institution/Employer required" +msgstr "機関/雇用者が必要です" + +#: website/static/js/profile.js:1132 +msgid "Institution required" +msgstr "機関が必要です" + +#: website/static/js/components/publicNodes.js:103 +#: website/static/js/project-organizer.js:100 +msgid "A contributor" +msgstr "一人のメンバー" + +#: website/static/js/project-organizer.js:197 +msgid "Contributors" +msgstr "メンバー" + +#: website/static/js/project-organizer.js:416 +msgid "" +"input.form-control[placeholder=\"Filter displayed " +"projects\"][type=\"text\"]" +msgstr "input.form-control[placeholder=\"表示されたプロジェクトをフィルターする\"][type=\"text\"]" + +#: website/static/js/project.js:28 +msgid "

                                          Are you sure you want to fork this project?

                                          " +msgstr "

                                          このプロジェクトをフォークしてもよろしいですか?

                                          " + +#: website/static/js/project.js:36 website/static/js/project.js:115 +msgid "Fork" +msgstr "フォーク" + +#: website/static/js/project.js:50 +msgid "Fork created successfully!" +msgstr "フォークが正常に作成されました!" + +#: website/static/js/project.js:58 +msgid "Go to new fork" +msgstr "新しいフォークに行く" + +#: website/static/js/project.js:87 +msgid "Your fork is being created. You'll receive an email when it is complete." +msgstr "フォークを作成しています。 完了するとメールが届きます。" + +#: website/static/js/project.js:93 +msgid "Fork this project?" +msgstr "このプロジェクトをフォークしますか?" + +#: website/static/js/project.js:94 +msgid "Are you sure you want to fork this project?" +msgstr "このプロジェクトをフォークしてもよろしいですか?" + +#: website/static/js/project.js:109 +msgid "Could not fork link." +msgstr "リンクを分岐できませんでした。" + +#: website/static/js/project.js:126 +msgid "" +"

                                          Are you sure you want to create a new project using this project as a" +" template?

                                          " +msgstr "

                                          このプロジェクトをテンプレートとして使用して新しいプロジェクトを作成してもよろしいですか?

                                          " + +#: website/static/js/project.js:127 +msgid "" +"

                                          Any add-ons configured for this project will not be authenticated in " +"the new project.

                                          " +msgstr "

                                          このプロジェクト用に設定されたアドオンは、新しいプロジェクトでは認証されません。

                                          " + +#: website/static/js/project.js:129 +msgid "" +"

                                          Are you sure you want to create a new project using this registration" +" as a template?

                                          " +msgstr "

                                          この登録をテンプレートとして使用して新しいプロジェクトを作成してもよろしいですか?

                                          " + +#: website/static/js/project.js:205 +msgid "
                                          Read
                                          " +msgstr "
                                          読込み
                                          " + +#: website/static/js/project.js:206 +msgid "
                                          • View project content and comment
                                          " +msgstr "
                                          • プロジェクトのコンテンツとコメントを表示
                                          " + +#: website/static/js/project.js:207 +msgid "
                                          Read + Write
                                          " +msgstr "
                                          読込み/書込み
                                          " + +#: website/static/js/project.js:208 +msgid "
                                          • Read privileges
                                          • " +msgstr "
                                            • 読込み権限
                                            • " + +#: website/static/js/project.js:209 +msgid "
                                            • Add and configure components
                                            • " +msgstr "
                                            • コンポーネントを追加および構成する
                                            • " + +#: website/static/js/project.js:210 +msgid "
                                            • Add and edit content
                                            " +msgstr "
                                          • コンテンツの追加と編集
                                          " + +#: website/static/js/project.js:211 +msgid "
                                          Administrator
                                            " +msgstr "
                                            管理者
                                              " + +#: website/static/js/project.js:212 +msgid "
                                            • Read and write privileges
                                            • " +msgstr "
                                            • 読込み/書込み権限
                                            • " + +#: website/static/js/project.js:213 +msgid "
                                            • Manage contributor
                                            • " +msgstr "
                                            • メンバーの管理
                                            • " + +#: website/static/js/project.js:214 +msgid "" +"
                                            • Delete and register project
                                            • Public-private " +"settings
                                            " +msgstr "
                                          • プロジェクトの削除と登録
                                          • 公開/非公開設定
                                          " + +#: website/static/js/project.js:223 +msgid "" +"Only bibliographic contributors will be displayed in the Contributors " +"list and in project citations. Non-bibliographic contributors can read " +"and modify the project as normal." +msgstr "メンバーリストおよびプロジェクトの引用には、書誌のメンバーのみが表示されます。 書誌以外のメンバーは、通常どおりプロジェクトを読んで修正できます。" + +#: website/static/js/project.js:238 +msgid "Remove this link?" +msgstr "このリンクを削除しますか?" + +#: website/static/js/project.js:239 +msgid "" +"Are you sure you want to remove this link? This will not remove the " +"project this link refers to." +msgstr "このリンクを削除してもよろしいですか?このリンクが参照するプロジェクトは削除されません。" + +#: website/static/js/projectSettingsTreebeardBase.js:96 +msgid "Editing Toggle" +msgstr "トグルを編集中" + +#: website/static/js/requestAccess.js:17 +msgid "Request access" +msgstr "アクセス権をリクエスト" + +#: website/static/js/requestAccess.js:27 website/static/js/requestAccess.js:62 +msgid "Access requested" +msgstr "アクセス権がリクエストされました" + +#: website/static/js/requestAccess.js:30 +msgid "Request declined" +msgstr "リクエストは拒否されました" + +#: website/static/js/requestAccess.js:67 +msgid "Access request failed. Please contact %1$s if the problem persists." +msgstr "アクセス要求が失敗しました。 問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/requestAccess.js:70 +msgid "Error requesting project access" +msgstr "プロジェクトアクセス権のリクエストエラー" + +#: website/static/js/requestAccess.js:83 +msgid "If this should not have occurred, please contact %1$s." +msgstr "これが発生してはならない場合は、%1$sにお問い合わせください。" + +#: website/static/js/saveManager.js:24 +msgid "You have unsaved changes." +msgstr "未保存の変更があります。" + +#: website/static/js/search-grdm.js:150 +msgid "Date Modified (Desc)" +msgstr "更新日時の新しい順" + +#: website/static/js/search-grdm.js:151 +msgid "Date Modified (Asc)" +msgstr "更新日時の古い順" + +#: website/static/js/search-grdm.js:152 +msgid "Date Created (Desc)" +msgstr "作成日時の新しい順" + +#: website/static/js/search-grdm.js:153 +msgid "Date Created (Asc)" +msgstr "作成日時の古い順" + +#: website/static/js/search-grdm.js:154 +msgid "Project name (Asc)" +msgstr "プロジェクト名の正順" + +#: website/static/js/search-grdm.js:155 +msgid "Project name (Desc)" +msgstr "プロジェクト名の逆順" + +#: website/static/js/search-grdm.js:156 +msgid "File name (Asc)" +msgstr "ファイル名の正順" + +#: website/static/js/search-grdm.js:157 +msgid "File name (Desc)" +msgstr "ファイル名の逆順" + +#: website/static/js/search-grdm.js:158 +msgid "User name (Asc)" +msgstr "ユーザー名の正順" + +#: website/static/js/search-grdm.js:159 +msgid "User name (Desc)" +msgstr "ユーザー名の逆順" + +#: website/static/js/search-grdm.js:160 +msgid "Institution name (Asc)" +msgstr "機関名の正順" + +#: website/static/js/search-grdm.js:161 +msgid "Institution name (Desc)" +msgstr "機関名の逆順" + +#: website/static/js/search-grdm.js:162 +msgid "Wiki title (Asc)" +msgstr "Wikiタイトルの正順" + +#: website/static/js/search-grdm.js:163 +msgid "Wiki title (Desc)" +msgstr "Wikiタイトルの逆順" + +#: website/static/js/search-grdm.js:313 website/static/js/search.js:190 +msgid "Page %1$s of %2$s" +msgstr "ページ %1$s / %2$s" + +#: website/static/js/search-grdm.js:393 website/static/js/search.js:270 +msgid "Search help" +msgstr "検索ヘルプ" + +#: website/static/js/search-grdm.js:394 website/static/js/search.js:271 +msgid "

                                          Queries

                                          " +msgstr "

                                          クエリ

                                          " + +#: website/static/js/search-grdm.js:395 website/static/js/search.js:272 +msgid "" +"

                                          Search uses the Lucene" +" search syntax. " +msgstr "" +"

                                          検索ではLucene検索構文を使用します。" +" " + +#: website/static/js/search-grdm.js:396 website/static/js/search.js:273 +msgid "This gives you many options, but can be very simple as well. " +msgstr "これにより多くのオプションが提供されますが、非常に簡単な場合もあります。" + +#: website/static/js/search-grdm.js:397 website/static/js/search.js:274 +msgid "Examples of valid searches include:" +msgstr "有効な検索の例は次のとおりです。" + +#: website/static/js/search-grdm.js:769 website/static/js/search-grdm.js:1067 +#: website/static/js/search.js:578 website/static/js/search.js:605 +msgid "GakuNin RDM | Search" +msgstr "GakuNin RDM | 検索" + +#: website/static/js/wikiSettingsTreebeard.js:26 +msgid "Make publicly editable" +msgstr "公開で編集可能にする" + +#: website/static/js/wikiSettingsTreebeard.js:27 +msgid "" +"Are you sure you want to make the wiki of %1$s publicly editable? " +"This will allow any logged in user to edit the content of this wiki. " +msgstr "" +"%1$sのwikiを一般に編集可能にしますか? " +"これにより、ログインしているユーザーがこのwikiのコンテンツを編集できるようになります。" + +#: website/static/js/wikiSettingsTreebeard.js:28 +msgid "" +"Note: Users without write access will not be able to add, delete, " +"or rename pages." +msgstr "注意:書き込みアクセス権のないユーザーは、ページを追加、削除、または名前変更できません。" + +#: website/static/js/wikiSettingsTreebeard.js:36 +msgid "Apply" +msgstr "適用" + +#: website/static/js/wikiSettingsTreebeard.js:114 +msgid "Only admins may change permissions of this wiki." +msgstr "このwikiの権限を変更できるのは管理者のみです。" + +#: website/static/js/wikiSettingsTreebeard.js:116 +msgid "Select who can edit" +msgstr "編集できるユーザーを選択" + +#: website/static/js/wikiSettingsTreebeard.js:116 +msgid "This feature is disabled for wikis of private %1$ss" +msgstr "この機能はプライベート%1$sのWikiでは無効になっています" + +#: website/static/js/wikiSettingsTreebeard.js:133 +msgid "Contributors (with write access)" +msgstr "メンバー(書き込みアクセス権付き)" + +#: website/static/js/wikiSettingsTreebeard.js:134 +msgid "All GakuNin RDM users" +msgstr "全てのGakuNin RDMユーザ" + +#: website/static/js/components/autocomplete.js:84 +msgid "Could not GET autocomplete data" +msgstr "オートコンプリートデータを取得できませんでした" + +#: website/static/js/components/autocomplete.js:150 +msgid "Initiated by: " +msgstr "発起人:" + +#: website/static/js/components/autocomplete.js:156 +msgid "Initiated: " +msgstr "開始日" + +#: website/static/js/components/autocomplete.js:162 +msgid "Last updated: " +msgstr "最終更新日" + +#: website/static/js/components/publicNodes.js:68 +msgid "Error retrieving projects" +msgstr "プロジェクトの取得エラー" + +#: website/static/js/components/publicNodes.js:120 +msgid " more" +msgstr "もっと" + +#: website/static/js/components/publicNodes.js:152 +msgid "-- private project -- / " +msgstr "-- 非公開プロジェクト -- / " + +#: website/static/js/components/publicNodes.js:190 +msgid "Unable to retrieve public %1$s" +msgstr "現在、パブリック%1$sを取得できません。" + +#: website/static/js/components/publicNodes.js:190 +msgid " at this time. Please refresh the page or contact " +msgstr "ページを更新するか、こちらに問い合わせて下さい" + +#: website/static/js/components/publicNodes.js:204 +msgid "You have no public %1$s." +msgstr "パブリック%1$sはありません。" + +#: website/static/js/components/publicNodes.js:206 +msgid "Find out how to make your %1$s" +msgstr "%1$sを公開にする方法を" + +#: website/static/js/components/publicNodes.js:207 +msgid "public" +msgstr "ご覧ください" + +#: website/static/js/components/publicNodes.js:211 +msgid "This user has no public %1$s." +msgstr "このユーザーにはパブリック%1$sがありません。" + +#: website/static/js/components/quickFiles.js:54 +msgid "Error retrieving quickfiles" +msgstr "クイックファイルの取得エラー" + +#: website/static/js/components/quickFiles.js:121 +msgid "" +"Unable to retrieve quickfiles at this time. Please refresh the page or " +"contact " +msgstr "現時点ではクイックファイルを取得できません。 ページを更新するか、こちらにお問い合わせ下さい。" + +#: website/static/js/components/quickFiles.js:134 +msgid "You have no public quickfiles" +msgstr "パブリッククイックファイルがありません" + +#: website/static/js/components/quickFiles.js:135 +msgid "This user has no public quickfiles." +msgstr "このユーザーには公開クイックファイルがありません。" + +#: website/static/js/components/utils.js:15 +msgid "Missing required option: " +msgstr "必須オプションがありません:" + +#: website/static/js/filepage/editor.js:82 +msgid "The file content could not be loaded." +msgstr "ファイルの内容をロードできませんでした。" + +#: website/static/js/filepage/editor.js:83 +msgid "Could not GET file contents." +msgstr "ファイルの内容を取得できませんでした。" + +#: website/static/js/filepage/editor.js:113 +msgid "Could not update file. Insufficient storage space in your Dropbox." +msgstr "ファイルを更新できませんでした。 Dropboxのストレージスペースが不足しています。" + +#: website/static/js/filepage/editor.js:115 +msgid "The file could not be updated." +msgstr "ファイルを更新できませんでした。" + +#: website/static/js/filepage/editor.js:122 +msgid "Could not PUT file content." +msgstr "ファイルコンテンツをPUTできませんでした。" + +#: website/static/js/filepage/editor.js:178 +msgid "Revert" +msgstr "元に戻す" + +#: website/static/js/filepage/index.js:89 +msgid "Direct iframe with fixed height and width" +msgstr "高さと幅を固定したiframeを管理する" + +#: website/static/js/filepage/index.js:131 +#: website/static/js/filepage/index.js:136 +msgid "File is checked out." +msgstr "ファイルはチェックアウトされています。" + +#: website/static/js/filepage/index.js:132 +msgid "" +" This file has been checked out by a COS Preregistration Challenge " +"Reviewer and will become available when review is complete." +msgstr "" +"このファイルはCOS Preregistration Challenge " +"Reviewerによってチェックアウトされており、レビューが完了すると利用可能になります。" + +#: website/static/js/filepage/index.js:137 +msgid " This file has been checked out by a " +msgstr "このファイルは" + +#: website/static/js/filepage/index.js:138 +msgid "collaborator" +msgstr "コラボレータ" + +#: website/static/js/filepage/index.js:139 +msgid ". It needs to be checked in before any changes can be made." +msgstr "によってチェックアウトされました。変更を行う前にチェックインする必要があります。" + +#: website/static/js/filepage/index.js:184 +msgid "Delete file?" +msgstr "ファイルを削除しますか?" + +#: website/static/js/filepage/index.js:186 +msgid "Are you sure you want to delete %1$s?" +msgstr "%1$sを削除してもよろしいですか?" + +#: website/static/js/filepage/index.js:204 +msgid "Could not delete file." +msgstr "ファイルを削除できませんでした。" + +#: website/static/js/filepage/index.js:220 +msgid "Confirm file check out?" +msgstr "ファイルのチェックアウトを確認しますか?" + +#: website/static/js/filepage/index.js:223 +msgid "as long as it is checked out. You can check it back in at anytime." +msgstr "いつでもチェックインできます。" + +#: website/static/js/filepage/index.js:243 +msgid "Unable to check out file" +msgstr "ファイルをチェックアウトできません" + +#: website/static/js/filepage/index.js:270 +msgid "Unable to check in file" +msgstr "ファイルをチェックインできません" + +#: website/static/js/filepage/index.js:275 +msgid "Force check in file?" +msgstr "ファイルを強制的にチェックインしますか?" + +#: website/static/js/filepage/index.js:276 +msgid "" +"This will check in the file for all users, allowing it to be edited. Are " +"you sure?" +msgstr "これにより、すべてのユーザーのファイルがチェックインされ、編集できるようになります。 よろしいですか?" + +#: website/static/js/filepage/index.js:279 +#: website/static/js/filepage/index.js:502 +msgid "Force check in" +msgstr "強制チェックイン" + +#: website/static/js/filepage/index.js:302 +msgid "Unable to force check in file. Make sure you have admin privileges." +msgstr "ファイルを強制的にチェックインできません。 管理者権限を持っていることを確認してください。" + +#: website/static/js/filepage/index.js:343 +msgid "Live editing mode " +msgstr "ライブ編集モード" + +#: website/static/js/filepage/index.js:344 +msgid "Attempting to connect " +msgstr "接続試行中" + +#: website/static/js/filepage/index.js:345 +msgid "Unsupported browser " +msgstr "サポートされていないブラウザ" + +#: website/static/js/filepage/index.js:346 +msgid "Saving... " +msgstr "保存中..." + +#: website/static/js/filepage/index.js:347 +msgid "Unavailable: Live editing " +msgstr "利用不可:ライブ編集" + +#: website/static/js/filepage/index.js:470 +msgid "View this file on " +msgstr "このファイルを次のアドオンで表示:" + +#: website/static/js/filepage/index.js:505 +msgid "Check out" +msgstr "チェックアウト" + +#: website/static/js/filepage/index.js:508 +msgid "Check in" +msgstr "チェックイン" + +#: website/static/js/filepage/index.js:514 +msgid "Request Trusted Timestamp" +msgstr "タイムスタンプを打つ" + +#: website/static/js/filepage/index.js:531 +msgid "Toggle view: " +msgstr "トグルビュー:" + +#: website/static/js/filepage/index.js:570 +#: website/static/js/filepage/revisions.js:173 +msgid "Revisions" +msgstr "バージョン管理" + +#: website/static/js/filepage/revisions.js:72 +#: website/static/js/filepage/revisions.js:73 +msgid "Unable to fetch versions" +msgstr "バージョンを取得できません" + +#: website/static/js/filepage/revisions.js:108 +msgid "Version ID" +msgstr "バージョンID" + +#: website/static/js/filepage/revisions.js:110 +msgid "User" +msgstr "ユーザ名" + +#: website/static/js/filepage/revisions.js:113 +msgid "" +".fa.fa-question-circle[data-content=\"MD5 is an algorithm used to verify " +"data integrity.\"][rel=\"popover\"]" +msgstr "" +".fa.fa-question-circle[data-" +"content=\"MD5は、データの整合性を検証するために使用されるアルゴリズムです。\"][rel=\"popover\"]" + +#: website/static/js/filepage/revisions.js:116 +msgid "" +".fa.fa-question-circle[data-content=\"SHA-2 is a cryptographic hash " +"function designed by the NSA used to verify data " +"integrity.\"][rel=\"popover\"]" +msgstr "" +".fa.fa-question-circle[data-" +"content=\"SHA-2は、データの整合性を検証するために使用されるNSAによって設計された暗号ハッシュ関数です。\"][rel=\"popover\"]" + +#: website/static/js/filepage/revisions.js:133 +msgid "Anonymous Contributor" +msgstr "匿名のメンバー" + +#: website/static/js/filepage/util.js:36 +msgid " Loading... " +msgstr "ロード中..." + +#: website/static/js/home-page/scheduledBannerPlugin.js:25 +msgid "Error in request to %1$s" +msgstr "%1$sへのリクエストでエラーが発生しました" + +#: website/static/js/pages/base-page.js:130 +msgid "Merge account" +msgstr "アカウントをマージ" + +#: website/static/js/pages/base-page.js:131 +msgid "Would you like to merge %1$s into your account? " +msgstr "%1$sをアカウントに統合しますか?" + +#: website/static/js/pages/base-page.js:133 +msgid "%1$s has been merged into your account." +msgstr "%1$sはアカウントに統合されました。" + +#: website/static/js/pages/base-page.js:134 +msgid "You have chosen to not merge %1$s into your account. " +msgstr "アカウントに%1$sをマージしないことを選択しました。" + +#: website/static/js/pages/base-page.js:135 +#: website/static/js/pages/base-page.js:142 +msgid "" +"If you change your mind, visit the user " +"settings page." +msgstr "意見が変わったら、ユーザー設定ページにアクセスしてください。" + +#: website/static/js/pages/base-page.js:138 +#: website/static/js/pages/base-page.js:188 +msgid "Add email" +msgstr "メールを追加" + +#: website/static/js/pages/base-page.js:139 +msgid "Would you like to add %1$s to your account?" +msgstr "アカウントに%1$sを追加しますか?" + +#: website/static/js/pages/base-page.js:140 +msgid "%1$s has been added into your account." +msgstr "%1$sがアカウントに追加されました。" + +#: website/static/js/pages/base-page.js:141 +msgid "You have chosen not to add %1$s to your account. " +msgstr "アカウントに%1$sを追加しないことを選択しました。" + +#: website/static/js/pages/base-page.js:145 +msgid "There was a problem adding " +msgstr "次のメールアドレスを追加中に問題が発生しました:" + +#: website/static/js/pages/base-page.js:146 +#: website/static/js/pages/base-page.js:149 +msgid ". Please contact %1$s if the problem persists." +msgstr "。問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/pages/base-page.js:148 +msgid "There was a problem removing " +msgstr "次のメールアドレスを削除中に問題が発生しました:" + +#: website/static/js/pages/base-page.js:160 +msgid "Do not add email" +msgstr "メールを追加しないで下さい" + +#: website/static/js/pages/base-page.js:173 +msgid "Could not remove email" +msgstr "メールを削除できませんでした" + +#: website/static/js/pages/base-page.js:198 +msgid "Could not add email" +msgstr "メールを追加できませんでした" + +#: website/static/js/pages/base-page.js:291 +msgid " and " +msgstr "と" + +#: website/static/js/pages/dashboard-page.js:35 +msgid "Could not set user timezone or locale" +msgstr "ユーザーのタイムゾーンまたはロケールを設定できませんでした" + +#: website/static/js/pages/dashboard-page.js:53 +msgid "" +"This is taking longer than normal.
                                          Try reloading the page. If the " +"problem persist, please contact us at %1$s" +msgstr "これには通常より時間がかかります。
                                          ページを再読み込みしてください。 問題が解決しない場合は、%1$sまでご連絡ください" + +#: website/static/js/pages/file-page.js:21 +msgid "Add a file tag to enhance discoverability" +msgstr "タグを追加してファイルを発見しやすくする" + +#: website/static/js/pages/file-page.js:23 +#: website/static/js/pages/file-page.js:58 +#: website/static/js/pages/file-page.js:60 +#: website/static/js/pages/project-dashboard-page.js:632 +#: website/static/js/pages/project-dashboard-page.js:716 +#: website/static/js/pages/project-dashboard-page.js:749 +msgid "Removing tag" +msgstr "タグを削除" + +#: website/static/js/pages/file-page.js:24 +#: website/static/js/pages/project-dashboard-page.js:633 +msgid "Add a tag" +msgstr "タグを追加" + +#: website/static/js/pages/file-page.js:28 +msgid "Could not add tag." +msgstr "タグを追加できませんでした" + +#: website/static/js/pages/file-page.js:29 +#: website/static/js/pages/project-dashboard-page.js:656 +msgid "Failed to add tag" +msgstr "タグの追加に失敗しました" + +#: website/static/js/pages/file-page.js:43 +msgid "Could not remove tag." +msgstr "タグを削除できませんでした。" + +#: website/static/js/pages/file-page.js:44 +#: website/static/js/pages/project-dashboard-page.js:692 +msgid "Failed to remove tag" +msgstr "タグの削除に失敗しました。" + +#: website/static/js/pages/file-page.js:90 +msgid "The file title cannot be empty." +msgstr "ファイルのタイトルを空にすることはできません。" + +#: website/static/js/pages/file-page.js:92 +msgid "The file title cannot be more than 100 characters." +msgstr "ファイルのタイトルは100文字を超えることはできません。" + +#: website/static/js/pages/file-page.js:103 +msgid "" +"Your file was successfully renamed. To view the new filename in the file " +"tree below, refresh the page." +msgstr "ファイルの名前が正常に変更されました。 下のファイルツリーで新しいファイル名を表示するには、ページを更新します。" + +#: website/static/js/pages/institution-page.js:30 +msgid "All Projects" +msgstr "全てのプロジェクト" + +#: website/static/js/pages/institution-page.js:43 +msgid "" +"This is taking longer than normal.
                                          Try reloading the page. If the " +"problem persist, please contact us at %1$s." +msgstr "これには通常より時間がかかります。
                                          ページを再読み込みしてください。 問題が解決しない場合は、%1$sまでご連絡ください。" + +#: website/static/js/pages/notifications-config-page.js:21 +#: website/static/js/pages/project-settings-page.js:33 +msgid "Could not retrieve notification settings." +msgstr "通知設定を取得できませんでした。" + +#: website/static/js/pages/profile-settings-addons-page.js:66 +#: website/static/js/pages/project-addons-page.js:15 +msgid "" +"Sorry, we had trouble saving your settings. If this persists please " +"contact " +msgstr "申し訳ありませんが、設定を保存できませんでした。 それでも解決しない場合は、こちらにお問い合わせ下さい:" + +#: website/static/js/pages/profile-settings-addons-page.js:68 +msgid "Request failed" +msgstr "要求が失敗しました" + +#: website/static/js/pages/profile-settings-addons-page.js:86 +msgid "Are you sure you want to remove the add-ons you have deselected? " +msgstr "選択解除したアドオンを削除してもよろしいですか?" + +#: website/static/js/pages/profile-settings-addons-page.js:129 +msgid "The changes on addon setting are not submitted!" +msgstr "アドオン設定の変更は送信されません!" + +#: website/static/js/pages/project-addons-page.js:10 +msgid "Your add-on settings have been successfully changed." +msgstr "アドオンの設定が正常に変更されました。" + +#: website/static/js/pages/project-addons-page.js:26 +msgid "Disable Add-on?" +msgstr "アドオンを無効にしますか?" + +#: website/static/js/pages/project-addons-page.js:27 +msgid "Are you sure you want to disable this add-on?" +msgstr "このアドオンを無効にしますか?" + +#: website/static/js/pages/project-addons-page.js:37 +msgid "Disable" +msgstr "無効にする" + +#: website/static/js/pages/project-dashboard-page.js:117 +msgid "Filter by users" +msgstr "ユーザでフィルタ" + +#: website/static/js/pages/project-dashboard-page.js:118 +msgid "Select from current contributors" +msgstr "現在のメンバーから選択" + +#: website/static/js/pages/project-dashboard-page.js:119 +msgid "Select including past contributors" +msgstr "過去のメンバーも含めて選択" + +#: website/static/js/pages/project-dashboard-page.js:120 +msgid "Include past project contributors in your search" +msgstr "過去のプロジェクトメンバーも含めて検索する" + +#: website/static/js/pages/project-dashboard-page.js:121 +msgid "Use dropdown menu" +msgstr "ドロップダウンメニュー使用" + +#: website/static/js/pages/project-dashboard-page.js:417 +msgid "Add Component" +msgstr "コンポーネントを追加" + +#: website/static/js/pages/project-dashboard-page.js:419 +msgid "Create new component" +msgstr "新しいコンポーネントを作成する" + +#: website/static/js/pages/project-dashboard-page.js:613 +msgid "Error retrieving filebrowser" +msgstr "ファイルブラウザの取得エラー" + +#: website/static/js/pages/project-dashboard-page.js:630 +msgid "Add a project tag to enhance discoverability" +msgstr "タグを追加してプロジェクトを発見しやすくする" + +#: website/static/js/pages/project-dashboard-page.js:691 +msgid "Could not remove tag" +msgstr "タグを削除できませんでした" + +#: website/static/js/pages/project-settings-page.js:34 +msgid "Could not GET notification settings." +msgstr "通知設定を取得できませんでした。" + +#: website/static/js/pages/project-settings-page.js:54 +msgid "Could not retrieve wiki settings." +msgstr "ウィキ設定を取得できませんでした。" + +#: website/static/js/pages/project-settings-page.js:55 +msgid "Could not GET wiki settings." +msgstr "ウィキ設定を取得できませんでした。" + +#: website/static/js/pages/project-settings-page.js:104 +msgid "Successfully updated settings." +msgstr "設定を更新しました。" + +#: website/static/js/pages/project-settings-page.js:115 +msgid "Could not set commenting configuration. Please try again." +msgstr "コメント設定を設定できませんでした。 もう一度やり直してください。" + +#: website/static/js/pages/project-settings-page.js:151 +msgid "Unable to update settings" +msgstr "設定を更新できません" + +#: website/static/js/pages/project-settings-page.js:152 +msgid "Could not update settings." +msgstr "設定を更新できませんでした。" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:31 +msgid "Import Account from Admin" +msgstr "管理者からアカウントをインポート" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:52 +#: website/static/js/pages/rdm-profile-settings-addons-page.js:54 +msgid "Successfully imported the account." +msgstr "アカウントを正常にインポートしました。" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:59 +#: website/static/js/pages/rdm-profile-settings-addons-page.js:61 +msgid "Failed to import the account." +msgstr "アカウントのインポートに失敗しました。" + +#: website/static/js/pages/timestamp-common.js:172 +msgid "A verify request is being processed!" +msgstr "確認リクエストが処理されています!" + +#: website/static/js/pages/timestamp-common.js:175 +msgid "Something went wrong with the Verify request." +msgstr "確認リクエストで問題が発生しました。" + +#: website/static/js/pages/timestamp-common.js:191 +msgid "Using the checkbox, please select the files to request timestamp." +msgstr "チェックボックスを使用して、タイムスタンプを要求するファイルを選択してください。" + +#: website/static/js/pages/timestamp-common.js:214 +msgid "Timestamp is being added to the selected files!" +msgstr "選択したファイルにタイムスタンプが追加されています!" + +#: website/static/js/pages/timestamp-common.js:217 +msgid "Something went wrong with the Request Trusted Timestamp request." +msgstr "Request Trusted Timestampリクエストで問題が発生しました。" + +#: website/static/js/pages/timestamp-common.js:222 +msgid "The task has been cancelled." +msgstr "タスクはキャンセルされました。" + +#: website/static/js/pages/timestamp-common.js:231 +msgid "The task already finished." +msgstr "タスクはすでに終了しています。" + +#: website/static/js/pages/timestamp-common.js:234 +msgid "Something went wrong in the cancel request." +msgstr "キャンセルリクエストで問題が発生しました。" + +#: website/static/js/pages/timestamp-common.js:288 +msgid "Using the checkbox, please select the files to download." +msgstr "チェックボックスを使用して、ダウンロードするファイルを選択してください。" + +#: website/static/js/pages/timestamp-common.js:323 +msgid "Failed to log \"downloaded errors\" into Recent Activity" +msgstr "エラーリストがダウンロードされたことを最近の活動に記録できませんでした。" + +#: website/static/js/pages/wiki-edit-page.js:64 +msgid "The wiki page name cannot be empty." +msgstr "Wikiページ名を空にすることはできません。" + +#: website/static/js/pages/wiki-edit-page.js:66 +msgid "The wiki page name cannot be more than 100 characters." +msgstr "Wikiページ名は100文字を超えることはできません。" + +#: website/static/js/pages/wiki-edit-page.js:81 +msgid "Error in renaming wiki" +msgstr "Wikiの名前変更中のエラー" + +#: website/static/js/pages/wiki-edit-page.js:88 +msgid "An unexpected error occurred. Please try again." +msgstr "予期しないエラーが発生しました。 もう一度やり直してください。" + +#: website/static/js/pages/wiki-edit-page.js:108 +msgid "

                                          Could not retrieve wiki pages. If this issue persists, " +msgstr "

                                          wikiページを取得できませんでした。 この問題が解決しない場合、" + +#: website/static/js/pages/wiki-edit-page.js:109 +msgid "please report it to %1$s" +msgstr "%1$sに報告してください" + +#: website/static/js/pages/wiki-edit-page.js:110 +msgid "Could not GET wiki menu pages" +msgstr "Wikiメニューページを取得できませんでした" + +#: addons/myscreen/static/widget-cfg.js:22 +msgid "My Screen Param1 Label" +msgstr "パラメーター1" diff --git a/site/guides/screen-expansion/osf.io/website/translations/ja/LC_MESSAGES/messages.mo b/site/guides/screen-expansion/osf.io/website/translations/ja/LC_MESSAGES/messages.mo new file mode 100644 index 0000000..6244cd8 Binary files /dev/null and b/site/guides/screen-expansion/osf.io/website/translations/ja/LC_MESSAGES/messages.mo differ diff --git a/site/guides/screen-expansion/osf.io/website/translations/ja/LC_MESSAGES/messages.po b/site/guides/screen-expansion/osf.io/website/translations/ja/LC_MESSAGES/messages.po new file mode 100644 index 0000000..37752e7 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/website/translations/ja/LC_MESSAGES/messages.po @@ -0,0 +1,3898 @@ +# Japanese translations for . +# Copyright (C) 2020 ORGANIZATION +# This file is distributed under the same license as the project. +# FIRST AUTHOR , 2020. +# +msgid "" +msgstr "" +"Project-Id-Version: 0.6.0\n" +"Report-Msgid-Bugs-To: rocs-office@nii.ac.jp\n" +"POT-Creation-Date: 2020-07-02 20:20+0900\n" +"PO-Revision-Date: 2020-07-02 20:20+0900\n" +"Last-Translator: Shunta Nishikawa\n" +"Language: ja\n" +"Language-Team: RCOS \n" +"Plural-Forms: nplurals=1; plural=0\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.7.0\n" + +#: addons/azureblobstorage/templates/azureblobstorage_credentials_modal.mako:6 +msgid "Connect an Azure Blob Storage Account" +msgstr "Azure Blob Storageアカウントを接続する" + +#: addons/azureblobstorage/templates/azureblobstorage_credentials_modal.mako:17 +msgid "Account Name" +msgstr "アカウント名" + +#: addons/azureblobstorage/templates/azureblobstorage_credentials_modal.mako:21 +msgid "Account Key" +msgstr "アカウントキー" + +#: addons/azureblobstorage/templates/azureblobstorage_credentials_modal.mako:36 +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:77 +#: addons/dataverse/templates/dataverse_credentials_modal.mako:75 +#: addons/gitlab/templates/gitlab_credentials_modal.mako:55 +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:99 +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:71 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:72 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:71 +#: addons/owncloud/templates/owncloud_node_settings.mako:72 +#: addons/s3/templates/s3_credentials_modal.mako:36 +#: addons/s3/templates/s3_node_settings.mako:77 +#: addons/s3compat/templates/s3compat_credentials_modal.mako:40 +#: addons/s3compat/templates/s3compat_node_settings.mako:77 +#: addons/swift/templates/swift_credentials_modal.mako:56 +#: addons/swift/templates/swift_node_settings.mako:77 +#: addons/weko/templates/weko_credentials_modal.mako:57 +#: addons/wiki/templates/add_wiki_page.mako:17 +#: addons/wiki/templates/delete_wiki_page.mako:13 +#: addons/zotero/templates/zotero_node_settings.mako:83 +#: addons/zotero/templates/zotero_node_settings.mako:127 +#: website/templates/include/comment_pane_template.mako:32 +#: website/templates/include/comment_template.mako:91 +#: website/templates/include/comment_template.mako:141 +#: website/templates/include/comment_template.mako:148 +#: website/templates/include/comment_template.mako:170 +#: website/templates/profile/oauth_app_detail.mako:84 +#: website/templates/profile/personal_tokens_detail.mako:49 +#: website/templates/project/addon/node_settings_default.mako:72 +#: website/templates/project/modal_add_contributor.mako:340 +#: website/templates/project/modal_generate_private_link.mako:86 +#: website/templates/project/modal_remove_contributor.mako:95 +#: website/templates/project/modal_remove_contributor.mako:104 +#: website/templates/project/modal_remove_contributor.mako:113 +#: website/templates/project/modal_remove_contributor.mako:122 +#: website/templates/project/nodes_delete.mako:89 +#: website/templates/project/nodes_privacy.mako:104 +#: website/templates/project/project.mako:568 +#: website/templates/project/settings.mako:131 +#: website/templates/project/timestamp.mako:71 +#: website/templates/util/render_addon_widget.mako:98 +msgid "Cancel" +msgstr "キャンセル" + +#: addons/azureblobstorage/templates/azureblobstorage_credentials_modal.mako:39 +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:79 +#: addons/dataverse/templates/dataverse_credentials_modal.mako:78 +#: addons/dataverse/templates/dataverse_node_settings.mako:118 +#: addons/forward/templates/forward_node_settings.mako:36 +#: addons/github/templates/github_node_settings.mako:54 +#: addons/gitlab/templates/gitlab_credentials_modal.mako:57 +#: addons/gitlab/templates/gitlab_node_settings.mako:64 +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:18 +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:74 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:74 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:74 +#: addons/owncloud/templates/owncloud_node_settings.mako:74 +#: addons/s3/templates/s3_credentials_modal.mako:39 +#: addons/s3/templates/s3_node_settings.mako:79 +#: addons/s3compat/templates/s3compat_credentials_modal.mako:43 +#: addons/s3compat/templates/s3compat_node_settings.mako:79 +#: addons/swift/templates/swift_credentials_modal.mako:59 +#: addons/swift/templates/swift_node_settings.mako:79 +#: addons/weko/templates/weko_node_settings.mako:83 +#: addons/wiki/templates/edit.mako:189 +#: addons/zotero/templates/zotero_node_settings.mako:85 +#: addons/zotero/templates/zotero_node_settings.mako:129 +#: website/templates/claim_account.mako:112 +#: website/templates/include/comment_template.mako:93 +#: website/templates/include/profile/jobs.mako:117 +#: website/templates/include/profile/jobs.mako:120 +#: website/templates/include/profile/names.mako:76 +#: website/templates/include/profile/names.mako:79 +#: website/templates/include/profile/schools.mako:117 +#: website/templates/include/profile/schools.mako:120 +#: website/templates/include/profile/social.mako:143 +#: website/templates/include/profile/social.mako:146 +#: website/templates/profile/oauth_app_detail.mako:88 +#: website/templates/profile/personal_tokens_detail.mako:55 +#: website/templates/project/addon/node_settings_default.mako:74 +#: website/templates/project/addon/user_settings.mako:13 +#: website/templates/project/project.mako:570 +#: website/templates/project/settings.mako:338 +msgid "Save" +msgstr "保存" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:14 +#: addons/azureblobstorage/templates/azureblobstorage_user_settings.mako:18 +#: addons/bitbucket/templates/bitbucket_node_settings.mako:15 +#: addons/dataverse/templates/dataverse_node_settings.mako:15 +#: addons/dataverse/templates/dataverse_user_settings.mako:18 +#: addons/github/templates/github_node_settings.mako:15 +#: addons/gitlab/templates/gitlab_node_settings.mako:18 +#: addons/gitlab/templates/gitlab_user_settings.mako:18 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:15 +#: addons/nextcloud/templates/nextcloud_user_settings.mako:18 +#: addons/owncloud/templates/owncloud_node_settings.mako:15 +#: addons/owncloud/templates/owncloud_user_settings.mako:18 +#: addons/s3/templates/s3_node_settings.mako:14 +#: addons/s3/templates/s3_user_settings.mako:18 +#: addons/s3compat/templates/s3compat_node_settings.mako:14 +#: addons/s3compat/templates/s3compat_user_settings.mako:18 +#: addons/swift/templates/swift_node_settings.mako:14 +#: addons/swift/templates/swift_user_settings.mako:18 +#: addons/weko/templates/weko_node_settings.mako:15 +#: addons/weko/templates/weko_user_settings.mako:18 +#: addons/zotero/templates/zotero_node_settings.mako:10 +#: website/templates/profile/user_settings_default.mako:14 +#: website/templates/project/addon/node_settings_default.mako:10 +msgid "Disconnect Account" +msgstr "アカウントを切断" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:21 +#: addons/bitbucket/templates/bitbucket_node_settings.mako:21 +#: addons/dataverse/templates/dataverse_node_settings.mako:22 +#: addons/github/templates/github_node_settings.mako:21 +#: addons/gitlab/templates/gitlab_node_settings.mako:24 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:22 +#: addons/owncloud/templates/owncloud_node_settings.mako:22 +#: addons/s3/templates/s3_node_settings.mako:21 +#: addons/s3compat/templates/s3compat_node_settings.mako:21 +#: addons/swift/templates/swift_node_settings.mako:21 +#: addons/weko/templates/weko_node_settings.mako:22 +#: addons/zotero/templates/zotero_node_settings.mako:17 +#: website/templates/project/addon/node_settings_default.mako:17 +msgid "Import Account from Profile" +msgstr "プロフィールからアカウントをインポート" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:28 +#: addons/s3/templates/s3_node_settings.mako:28 +#: addons/s3compat/templates/s3compat_node_settings.mako:28 +#: addons/swift/templates/swift_node_settings.mako:28 +#: addons/zotero/templates/zotero_node_settings.mako:24 +#: website/templates/project/addon/node_settings_default.mako:24 +msgid "Loading ..." +msgstr "ロード中..." + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:35 +#: addons/dataverse/templates/dataverse_node_settings.mako:29 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:29 +#: addons/owncloud/templates/owncloud_node_settings.mako:29 +#: addons/s3/templates/s3_node_settings.mako:35 +#: addons/s3compat/templates/s3compat_node_settings.mako:35 +#: addons/swift/templates/swift_node_settings.mako:35 +#: addons/weko/templates/weko_node_settings.mako:29 +msgid "Connect Account" +msgstr "アカウントに接続する" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:50 +#: addons/bitbucket/templates/bitbucket_node_settings.mako:65 +#: addons/github/templates/github_node_settings.mako:62 +#: addons/gitlab/templates/gitlab_node_settings.mako:71 +#: addons/owncloud/templates/owncloud_node_settings.mako:47 +#: addons/s3/templates/s3_node_settings.mako:50 +#: addons/s3compat/templates/s3compat_node_settings.mako:50 +#: addons/swift/templates/swift_node_settings.mako:50 +#: addons/weko/templates/weko_node_settings.mako:49 +#: addons/zotero/templates/zotero_node_settings.mako:46 +#: addons/zotero/templates/zotero_node_settings.mako:101 +#: website/templates/project/addon/node_settings_default.mako:46 +#: website/templates/project/project.mako:202 +msgid "None" +msgstr "無し" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:58 +#: addons/swift/templates/swift_node_settings.mako:58 +msgid "Create container" +msgstr "コンテナを作成" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:63 +#: addons/swift/templates/swift_node_settings.mako:63 +msgid "Loading containers..." +msgstr "コンテナをロード中..." + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:72 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:67 +#: addons/owncloud/templates/owncloud_node_settings.mako:67 +#: addons/s3/templates/s3_node_settings.mako:72 +#: addons/s3compat/templates/s3compat_node_settings.mako:72 +#: addons/swift/templates/swift_node_settings.mako:72 +#: addons/zotero/templates/zotero_node_settings.mako:122 +#: website/templates/project/addon/node_settings_default.mako:67 +#, python-format +msgid "Connect %(folderName)s?" +msgstr "%(folderName)sに接続しますか?" + +#: addons/azureblobstorage/templates/azureblobstorage_user_settings.mako:12 +#: addons/dataverse/templates/dataverse_user_settings.mako:12 +#: addons/gitlab/templates/gitlab_user_settings.mako:12 +#: addons/nextcloud/templates/nextcloud_user_settings.mako:12 +#: addons/owncloud/templates/owncloud_user_settings.mako:12 +#: addons/s3/templates/s3_user_settings.mako:12 +#: addons/s3compat/templates/s3compat_user_settings.mako:12 +#: addons/swift/templates/swift_user_settings.mako:12 +#: addons/weko/templates/weko_user_settings.mako:12 +#: website/templates/profile/user_settings_default.mako:9 +msgid "Connect or Reauthorize Account" +msgstr "アカウントの接続または再認証" + +#: addons/azureblobstorage/templates/azureblobstorage_user_settings.mako:24 +#, python-format +msgid "Authorized by %(userName)s" +msgstr "承認者:%(userName)s" + +#: addons/azureblobstorage/templates/azureblobstorage_user_settings.mako:32 +#: addons/dataverse/templates/dataverse_user_settings.mako:31 +#: addons/gitlab/templates/gitlab_user_settings.mako:31 +#: addons/nextcloud/templates/nextcloud_user_settings.mako:31 +#: addons/owncloud/templates/owncloud_user_settings.mako:31 +#: addons/s3/templates/s3_user_settings.mako:32 +#: addons/s3compat/templates/s3compat_user_settings.mako:32 +#: addons/swift/templates/swift_user_settings.mako:32 +#: addons/weko/templates/weko_user_settings.mako:31 +#: website/templates/profile/user_settings_default.mako:28 +msgid "Private project" +msgstr "非公開プロジェクト" + +#: addons/azureblobstorage/templates/azureblobstorage_user_settings.mako:36 +#: addons/s3/templates/s3_user_settings.mako:36 +#: addons/s3compat/templates/s3compat_user_settings.mako:36 +#: addons/swift/templates/swift_user_settings.mako:36 +#: addons/weko/templates/weko_user_settings.mako:35 +#: website/templates/profile/user_settings_default.mako:32 +msgid "disconnect Project" +msgstr "プロジェクトを切断する" + +#: addons/base/models.py:461 +msgid "" +"Because you have not configured the {addon} add-on, your authentication " +"will not be transferred to the forked {category}. You may authorize and " +"configure the {addon} add-on in the new fork on the settings page." +msgstr "{addon}アドオンを構成していないため、認証はフォークされた{category}に転送されません。設定ページの新しいフォークで{addon}アドオンを承認して設定できます。" + +#: addons/base/models.py:469 +msgid "" +"Because you have authorized the {addon} add-on for this {category}, " +"forking it will also transfer your authentication to the forked " +"{category}." +msgstr "この{category}の{addon}アドオンを承認したため、これをフォークすると、認証がフォークされた{category}にも転送されます。" + +#: addons/base/models.py:476 +msgid "" +"Because the {addon} add-on has been authorized by a different user, " +"forking it will not transfer authentication to the forked {category}. You" +" may authorize and configure the {addon} add-on in the new fork on the " +"settings page." +msgstr "{addon}アドオンは別のユーザーによって承認されているため、フォークすると、認証がフォークされた{category}に転送されません。設定ページの新しいフォークで{addon}アドオンを承認して設定できます。" + +#: addons/bitbucket/templates/bitbucket_node_settings.mako:25 +#: addons/github/templates/github_node_settings.mako:25 +#: addons/gitlab/templates/gitlab_node_settings.mako:28 +#: addons/zotero/templates/zotero_node_settings.mako:31 +#: website/templates/project/addon/node_settings_default.mako:31 +msgid "Connect Account" +msgstr "アカウントに接続する" + +#: addons/bitbucket/templates/bitbucket_node_settings.mako:74 +#: addons/github/templates/github_node_settings.mako:71 +#, python-format +msgid "" +"Could not retrieve %(addonName)s settings at this time. The %(addonName)s" +" addon credentials may no longer be valid. Try " +"deauthorizing and reauthorizing %(addonName)s on your account settings page." +msgstr "" +"現在、%(addonName)s設定を取得できませんでした。%(addonName)sアドオンの資格情報が無効になる場合があります。 アカウント設定ページで%(addonName)sの認証解除と再認証を試してください。" + +#: addons/bitbucket/templates/bitbucket_node_settings.mako:78 +#: addons/github/templates/github_node_settings.mako:75 +#, python-format +msgid "" +"Could not retrieve %(addonName)s settings at this time. The %(addonName)s" +" addon credentials may no longer be valid. Contact " +"%(authOsfName)s to verify." +msgstr "" +"現在、%(addonName)s 設定を取得できませんでした。%(addonName)sアドオンの資格情報が無効になる場合があります。 " +"%(authOsfName)sに連絡して確認してください。" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:6 +msgid "Connect a Dataverse Account" +msgstr "Dataverseアカウントに接続する" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:18 +msgid "Dataverse Repository" +msgstr "Dataverseレポジトリ" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:22 +msgid "Select a Dataverse repository" +msgstr "Dataverseレポジトリを選択する" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:35 +msgid "Only Dataverse repositories v4.0 or higher are supported." +msgstr "Dataverseリポジトリv4.0以降のみがサポートされています。" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:46 +msgid "API Token" +msgstr "APIトークン" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:50 +#, python-format +msgid "(Get from Dataverse %(dataverseLink)s)" +msgstr "(Dataverse %(dataverseLink)sから取得)" + +#: addons/dataverse/templates/dataverse_node_settings.mako:43 +msgid "Dataverse Repository:" +msgstr "Dataverseレポジトリ:" + +#: addons/dataverse/templates/dataverse_node_settings.mako:49 +msgid "Current Dataset:" +msgstr "現在のデータセット:" + +#: addons/dataverse/templates/dataverse_node_settings.mako:65 +msgid "The current dataset was not found on Dataverse." +msgstr "現在のデータセットがDataverseで見つかりませんでした。" + +#: addons/dataverse/templates/dataverse_node_settings.mako:74 +msgid "Dataverse:" +msgstr "Dataverse:" + +#: addons/dataverse/templates/dataverse_node_settings.mako:86 +msgid "Dataset:" +msgstr "データセット:" + +#: addons/dataverse/templates/dataverse_node_settings.mako:97 +msgid "No datasets available." +msgstr "利用可能なデータセットがありません。" + +#: addons/dataverse/templates/dataverse_node_settings.mako:103 +msgid "Retrieving datasets..." +msgstr "データセットを取得しています..." + +#: addons/dataverse/templates/dataverse_node_settings.mako:110 +msgid "" +"There are no dataverses, datasets, or files associated with the connected" +" account." +msgstr "接続されたアカウントに関連付けられたデータバース、データセット、またはファイルはありません。" + +#: addons/dataverse/templates/dataverse_user_settings.mako:23 +#: addons/gitlab/templates/gitlab_user_settings.mako:23 +#, python-format +msgid "Authorized on %(addonHost)s" +msgstr "%(addonHost)sで認証済み" + +#: addons/forward/templates/forward_node_settings.mako:14 +msgid "Send people who visit your GakuNin RDM project page to this link instead" +msgstr "代わりに、GakuNin RDMプロジェクトページにアクセスするユーザーをこのリンクに送信します" + +#: addons/forward/templates/forward_node_settings.mako:19 +msgid "Label" +msgstr "ラベル" + +#: addons/forward/templates/forward_node_settings.mako:24 +#: website/templates/profile/oauth_app_detail.mako:67 +#: website/templates/project/settings.mako:108 +msgid "Optional" +msgstr "任意" + +#: addons/github/templates/github_node_settings.mako:38 +#: addons/gitlab/templates/gitlab_node_settings.mako:42 +msgid "Current Repo: " +msgstr "現在のレポジトリ:" + +#: addons/github/templates/github_node_settings.mako:56 +msgid "Create Repo" +msgstr "レポジトリを作成する" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:4 +msgid "Connect a GitLab Account" +msgstr "GitLabアカウントに接続" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:11 +msgid "GitLab Repository" +msgstr "GitLabレポジトリ" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:14 +msgid "Select a GitLab repository" +msgstr "GitLabレポジトリを選択" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:27 +msgid "Only GitLab repositories v4.0 or higher are supported." +msgstr "GitLabリポジトリv4.0以降のみがサポートされています。" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:37 +msgid "Personal Access Token" +msgstr "パーソナルアクセストークン" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:41 +#, python-format +msgid "(Get from GitLab %(externalLinkIcon)s)" +msgstr "(GitLab %(externalLinkIcon)sから取得)" + +#: addons/gitlab/templates/gitlab_node_settings.mako:9 +msgid "GitLab" +msgstr "GitLab" + +#: addons/gitlab/templates/gitlab_node_settings.mako:12 +msgid "authorized by" +msgstr "認証者" + +#: addons/gitlab/templates/gitlab_node_settings.mako:80 +#, python-format +msgid "" +"Could not retrieve %(addonName)s settings at this time. The %(addonName)s" +" addon credentials may no longer be valid. Try " +"deauthorizing and reauthorizing %(addonName)s on your " +"account settings page." +msgstr "" +"現在、%(addonName)s設定を取得できませんでした。%(addonName)sアドオンの資格情報が無効になる場合があります。 アカウント設定ページで%(addonName)sの認証解除と再認証を試してください。" + +#: addons/gitlab/templates/gitlab_node_settings.mako:84 +#, python-format +msgid "" +"Could not retrieve %(addonName)s settings at this time. The %(addonName)s" +" addon credentials may no longer be valid. Contact " +"%(authOsfName)s to verify." +msgstr "現在、%(addonName)s設定を取得できませんでした。%(addonName)sアドオンの資格情報が無効になる場合があります。%(authOsfName)sに連絡して確認してください。" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:13 +#: addons/wiki/templates/edit.mako:34 +msgid "New" +msgstr "新規" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:31 +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:80 +msgid "Service Name" +msgstr "サービス名" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:32 +msgid "Base URL" +msgstr "ベースURL" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:56 +msgid "No JupyterHubs" +msgstr "JupyterHubはありません" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:69 +msgid "Link JupyterHub" +msgstr "JupyterHubをリンク" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:84 +msgid "Service Base URL" +msgstr "サービスベースURL" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:102 +msgid "OK" +msgstr "OK" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:6 +msgid "Connect an Nextcloud Account" +msgstr "Nextcloudアカウントに接続" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:17 +msgid "Nextcloud Instance" +msgstr "Nextcloudインスタンス" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:21 +msgid "Select an Nextcloud Instance" +msgstr "Nextcloudインスタンスを選択" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:30 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:30 +msgid "Host URL" +msgstr "ホストURL" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:36 +#, python-format +msgid "" +"Only Nextcloud instances supporting WebDAV and OCS v1.7 are " +"supported." +msgstr "" +"WebDAVおよびOCS v1.7 " +"をサポートするNextcloudインスタンスのみがサポートされます。" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:46 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:46 +#: addons/swift/templates/swift_credentials_modal.mako:33 +msgid "Username" +msgstr "ユーザ名" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:48 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:48 +#: website/templates/include/profile/social.mako:66 +msgid "username" +msgstr "ユーザ名" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:50 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:50 +#: addons/swift/templates/swift_credentials_modal.mako:41 +msgid "Password" +msgstr "パスワード" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:55 +#, python-format +msgid "" +"These credentials will be encrypted. However, we strongly " +"encourage using a Device (or App) " +"Password." +msgstr "" +"これらの資格情報は暗号化されます。 ただし、デバイス(またはアプリ)パスワードの使用を強くお勧めします。" + +#: addons/nextcloud/templates/nextcloud_node_settings.mako:53 +#: addons/owncloud/templates/owncloud_node_settings.mako:53 +msgid "Change" +msgstr "変更" + +#: addons/nextcloud/templates/nextcloud_node_settings.mako:58 +#: addons/owncloud/templates/owncloud_node_settings.mako:58 +#: addons/zotero/templates/zotero_node_settings.mako:113 +#: website/templates/project/addon/node_settings_default.mako:58 +msgid "Loading folders..." +msgstr "フォルダをロード中..." + +#: addons/nextcloud/templates/nextcloud_user_settings.mako:23 +#: addons/owncloud/templates/owncloud_user_settings.mako:23 +#, python-format +msgid "Authorized by %(userName)s on %(profilePage)s" +msgstr "%(profilePage)sでの認証者:%(userName)s" + +#: addons/owncloud/templates/owncloud_credentials_modal.mako:6 +msgid "Connect an ownCloud Account" +msgstr "ownCloudアカウントに接続" + +#: addons/owncloud/templates/owncloud_credentials_modal.mako:17 +msgid "ownCloud Instance" +msgstr "ownCloudインスタンス" + +#: addons/owncloud/templates/owncloud_credentials_modal.mako:21 +msgid "Select an ownCloud Instance" +msgstr "ownCloudインスタンスを選択" + +#: addons/owncloud/templates/owncloud_credentials_modal.mako:36 +#, python-format +msgid "" +"Only ownCloud instances supporting WebDAV and OCS v1.7 are " +"supported." +msgstr "" +"WebDAVおよびOCS " +"v1.7をサポートするownCloudインスタンスのみがサポートされます。" + +#: addons/owncloud/templates/owncloud_credentials_modal.mako:55 +#, python-format +msgid "" +" These credentials will be encrypted. However, we strongly " +"encourage using a Device (or App) " +"Password." +msgstr "" +"これらの資格情報は暗号化されます。 ただし、デバイス(またはアプリ)パスワードの使用を強くお勧めします。" + +#: addons/owncloud/templates/owncloud_node_settings.mako:42 +#: website/templates/project/addon/node_settings_default.mako:41 +msgid "Current Folder:" +msgstr "現在のフォルダ:" + +#: addons/s3/templates/s3_credentials_modal.mako:6 +msgid "Connect an Amazon S3 Account" +msgstr "Amazon S3に接続" + +#: addons/s3/templates/s3_credentials_modal.mako:17 +#: addons/s3compat/templates/s3compat_credentials_modal.mako:21 +msgid "Access Key" +msgstr "アクセスキー" + +#: addons/s3/templates/s3_credentials_modal.mako:21 +#: addons/s3compat/templates/s3compat_credentials_modal.mako:25 +msgid "Secret Key" +msgstr "シークレットキー" + +#: addons/s3/templates/s3_node_settings.mako:58 +#: addons/s3compat/templates/s3compat_node_settings.mako:58 +msgid "Create bucket" +msgstr "bucketを作成" + +#: addons/s3/templates/s3_node_settings.mako:63 +msgid "Loading buckets..." +msgstr "bucketをロード中..." + +#: addons/s3/templates/s3_user_settings.mako:24 +#: addons/s3compat/templates/s3compat_user_settings.mako:24 +#: addons/swift/templates/swift_user_settings.mako:24 +#: addons/weko/templates/weko_user_settings.mako:23 +#: website/templates/profile/user_settings_default.mako:20 +msgid "Authorized by " +msgstr "認証者:" + +#: addons/s3compat/templates/s3compat_credentials_modal.mako:6 +msgid "Connect an S3 Compatible Storage Account" +msgstr "S3互換ストレージアカウントを接続する" + +#: addons/s3compat/templates/s3compat_credentials_modal.mako:17 +msgid "S3 Compatible Service" +msgstr "S3互換サービス" + +#: addons/s3compat/templates/s3compat_node_settings.mako:45 +msgid "Current Bucket:" +msgstr "現在のBucket:" + +#: addons/swift/templates/swift_credentials_modal.mako:6 +msgid "Connect an OpenStack Swift Account" +msgstr "OpenStack Swiftアカウントを接続する" + +#: addons/swift/templates/swift_credentials_modal.mako:17 +msgid "Authentication(Keystone) Version" +msgstr "認証(キーストーン)バージョン" + +#: addons/swift/templates/swift_credentials_modal.mako:21 +msgid "Authentication URL" +msgstr "認証URL" + +#: addons/swift/templates/swift_credentials_modal.mako:25 +msgid "Tenant name" +msgstr "テナント名" + +#: addons/swift/templates/swift_credentials_modal.mako:29 +msgid "Project Domain name" +msgstr "プロジェクトドメイン名" + +#: addons/swift/templates/swift_credentials_modal.mako:37 +msgid "User Domain name" +msgstr "ユーザドメイン名" + +#: addons/swift/templates/swift_node_settings.mako:45 +msgid "Current Container:" +msgstr "現在のコンテナ:" + +#: addons/twofactor/templates/twofactor_user_settings.mako:3 +msgid "Two-factor Authentication" +msgstr "2要素認証" + +#: addons/twofactor/templates/twofactor_user_settings.mako:7 +msgid "Disable Two-Factor Authentication" +msgstr "2要素認証を無効にする" + +#: addons/twofactor/templates/twofactor_user_settings.mako:12 +msgid "Enable Two-Factor Authentication" +msgstr "2要素認証を有効にする" + +#: addons/twofactor/templates/twofactor_user_settings.mako:19 +msgid "" +"By using two-factor authentication, you'll protect your GakuNin RDM " +"account with both your password and your mobile phone." +msgstr "2要素認証を使用すると、パスワードと携帯電話の両方でGakuNin RDMアカウントを保護できます。" + +#: addons/twofactor/templates/twofactor_user_settings.mako:22 +msgid "Important: " +msgstr "重要:" + +#: addons/twofactor/templates/twofactor_user_settings.mako:22 +msgid "" +" If you lose access to your mobile device, you will not be able to log in" +" to your GakuNin RDM account." +msgstr "モバイルデバイスにアクセスできなくなると、GakuNin RDMアカウントにログインできなくなります。" + +#: addons/twofactor/templates/twofactor_user_settings.mako:24 +#, python-format +msgid "" +"To use, you must install an appropriate application on your mobile " +"device. Google Authenticator is a popular choice and is available for " +"both Android and iOS." +msgstr "" +"使用するには、モバイルデバイスに適切なアプリケーションをインストールする必要があります。Google認証システムは人気のある選択肢であり、AndroidとiOSの両方で利用できます。" + +#: addons/twofactor/templates/twofactor_user_settings.mako:26 +msgid "" +"Once verified, your device will display a six-digit code that must be " +"entered during the login process. This code changes every few seconds, " +"which means that unauthorized users will not be able to log in to you " +"account, even if they know your password." +msgstr "" +"確認が完了すると、ログインプロセス中に入力する必要がある6桁のコードがデバイスに表示されます。 " +"このコードは数秒ごとに変更されます。つまり、権限のないユーザーは、パスワードを知っていてもアカウントにログインできません。" + +#: addons/twofactor/templates/twofactor_user_settings.mako:28 +#, python-format +msgid "" +"Scan the image below, or enter the secret key %(secretKey)s into " +"your authentication device." +msgstr "以下の画像をスキャンするか、認証デバイスにシークレットキー%(secretKey)sを入力します。" + +#: addons/twofactor/templates/twofactor_user_settings.mako:34 +msgid "Enter your verification code:" +msgstr "確認コードを入力してください:" + +#: addons/weko/templates/weko_credentials_modal.mako:6 +msgid "Connect a WEKO Account" +msgstr "WEKOアカウントに接続" + +#: addons/weko/templates/weko_credentials_modal.mako:18 +msgid "WEKO Repository" +msgstr "WEKOレポジトリ" + +#: addons/weko/templates/weko_credentials_modal.mako:22 +msgid "Select a WEKO repository" +msgstr "WEKOレポジトリを選択" + +#: addons/weko/templates/weko_credentials_modal.mako:33 +msgid "WEKO SWORD URL" +msgstr "WEKO SWORD URL" + +#: addons/weko/templates/weko_credentials_modal.mako:37 +msgid "WEKO Username" +msgstr "WEKOユーザ名" + +#: addons/weko/templates/weko_credentials_modal.mako:41 +msgid "WEKO Password" +msgstr "WEKOパスワード" + +#: addons/weko/templates/weko_credentials_modal.mako:60 +msgid "Connect" +msgstr "接続" + +#: addons/weko/templates/weko_node_settings.mako:43 +msgid "Current Index:" +msgstr "現在のインデックス:" + +#: addons/weko/templates/weko_node_settings.mako:63 +msgid "Index:" +msgstr "インデックス:" + +#: addons/weko/templates/weko_node_settings.mako:75 +msgid "There are no indices associated with the connected account." +msgstr "接続されたアカウントに関連付けられたインデックスはありません。" + +#: addons/wiki/templates/add_wiki_page.mako:8 +msgid "Add new wiki page" +msgstr "新規Wikiページを追加" + +#: addons/wiki/templates/add_wiki_page.mako:12 +msgid "New Wiki Name" +msgstr "新規Wiki名" + +#: addons/wiki/templates/add_wiki_page.mako:18 +#: addons/wiki/templates/add_wiki_page.mako:44 +#: addons/wiki/templates/add_wiki_page.mako:49 +#: addons/wiki/templates/add_wiki_page.mako:55 +#: addons/wiki/templates/add_wiki_page.mako:94 +#: website/templates/project/contributors.mako:57 +#: website/templates/project/contributors.mako:164 +#: website/templates/project/contributors.mako:337 +#: website/templates/project/contributors.mako:385 +#: website/templates/project/modal_add_contributor.mako:346 +#: website/templates/project/modal_add_contributor.mako:350 +#: website/templates/project/modal_add_contributor.mako:356 +#: website/templates/project/settings.mako:209 +#: website/templates/project/settings.mako:522 +msgid "Add" +msgstr "追加" + +#: addons/wiki/templates/add_wiki_page.mako:38 +msgid "Creating new wiki page" +msgstr "新規Wikiページを作成中" + +#: addons/wiki/templates/add_wiki_page.mako:41 +msgid "The new wiki page name cannot be empty" +msgstr "新規Wikiページ名は空にできません" + +#: addons/wiki/templates/add_wiki_page.mako:46 +msgid "The new wiki page name cannot be more than 100 characters." +msgstr "新規Wikiページ名は100文字を超えることはできません。" + +#: addons/wiki/templates/add_wiki_page.mako:52 +msgid "The new wiki page name cannot contain forward slashes." +msgstr "新規Wikiページ名にスラッシュを含めることはできません。" + +#: addons/wiki/templates/add_wiki_page.mako:70 +msgid "A wiki page with that name already exists." +msgstr "その名前のWikiページは既に存在します。" + +#: addons/wiki/templates/add_wiki_page.mako:73 +msgid "You do not have permission to perform this action." +msgstr "このアクションを実行する権限がありません。" + +#: addons/wiki/templates/add_wiki_page.mako:74 +msgid "Unauthorized user can view wiki add button" +msgstr "許可されていないユーザーはwiki追加ボタンを表示できます" + +#: addons/wiki/templates/add_wiki_page.mako:83 +msgid "Could not validate wiki page. Please try again." +msgstr "Wikiページを検証できませんでした。 もう一度やり直してください。" + +#: addons/wiki/templates/add_wiki_page.mako:84 +msgid "Error occurred while validating page" +msgstr "ページの検証中にエラーが発生しました" + +#: addons/wiki/templates/delete_wiki_page.mako:7 +msgid "Delete wiki page" +msgstr "Wikiページを削除" + +#: addons/wiki/templates/delete_wiki_page.mako:10 +msgid "Are you sure you want to delete this wiki page?" +msgstr "このWikiページを削除してもよろしいですか?" + +#: addons/wiki/templates/delete_wiki_page.mako:14 +#: addons/wiki/templates/edit.mako:38 +#: website/templates/include/comment_template.mako:149 +#: website/templates/profile/personal_tokens_detail.mako:53 +#: website/templates/project/nodes_delete.mako:91 +#: website/templates/util/render_node.mako:74 +msgid "Delete" +msgstr "削除" + +#: addons/wiki/templates/edit.mako:2 +#: website/templates/include/comment_pane_template.mako:19 +#: website/templates/project/settings.mako:36 +#: website/templates/project/settings.mako:257 +#: website/templates/search.mako:278 website/templates/search.mako:370 +#: website/templates/search_grdm.mako:405 +#: website/templates/search_grdm.mako:581 +msgid "Wiki" +msgstr "Wiki" + +#: addons/wiki/templates/edit.mako:42 +msgid "Menu" +msgstr "メニュー" + +#: addons/wiki/templates/edit.mako:53 +msgid "Loading wiki pages..." +msgstr "Wikiページをロード中" + +#: addons/wiki/templates/edit.mako:75 addons/wiki/templates/edit.mako:82 +msgid "View" +msgstr "ビュー" + +#: addons/wiki/templates/edit.mako:88 +msgid "Wiki Version:" +msgstr "WIkiバージョン" + +#: addons/wiki/templates/edit.mako:92 +msgid "Preview" +msgstr "プレビュー" + +#: addons/wiki/templates/edit.mako:95 addons/wiki/templates/edit.mako:218 +msgid "(Current)" +msgstr "(現在)" + +#: addons/wiki/templates/edit.mako:97 addons/wiki/templates/edit.mako:220 +msgid "Current" +msgstr "最新" + +#: addons/wiki/templates/edit.mako:117 +#: website/templates/util/render_addon_widget.mako:24 +msgid "Add important information, links, or images here to describe your project." +msgstr "重要な情報、リンク、または画像をここに追加して、プロジェクトを説明します。" + +#: addons/wiki/templates/edit.mako:126 addons/wiki/templates/edit.mako:134 +#: website/templates/include/profile/schools.mako:180 +#: website/templates/include/profile/social.mako:184 +#: website/templates/project/project.mako:539 +msgid "Edit" +msgstr "編集" + +#: addons/wiki/templates/edit.mako:174 +msgid "Loading. . ." +msgstr "ロード中..." + +#: addons/wiki/templates/edit.mako:186 +msgid "Revert" +msgstr "元に戻す" + +#: addons/wiki/templates/edit.mako:205 addons/wiki/templates/edit.mako:212 +msgid "Compare" +msgstr "比較" + +#: addons/wiki/templates/edit.mako:215 +msgid " to" +msgstr " と" + +#: addons/wiki/templates/edit.mako:257 +msgid "Page permissions have changed" +msgstr "ページの権限が変更されました" + +#: addons/wiki/templates/edit.mako:260 +msgid "Your browser should refresh shortly" +msgstr "ブラウザは間もなく更新されます" + +#: addons/wiki/templates/edit.mako:273 +msgid "Renaming wiki..." +msgstr "wikiの名前を変更しています..." + +#: addons/wiki/templates/edit.mako:283 +msgid "Wiki page deleted" +msgstr "Wikiページを削除しました" + +#: addons/wiki/templates/edit.mako:286 +msgid "Press Confirm to return to the project wiki home page." +msgstr "[確認]を押して、プロジェクトWikiのホームページに戻ります。" + +#: addons/wiki/templates/edit.mako:289 +msgid "Confirm" +msgstr "確認" + +#: addons/wiki/templates/edit.mako:300 +msgid "Connected to the collaborative wiki" +msgstr "共同ウィキに接続しました" + +# Notice: ”Save" は別のmsgid "Save"への参照なので文言を揃える +#: addons/wiki/templates/edit.mako:304 +msgid "" +"This page is currently connected to the collaborative wiki. All edits " +"made will be visible to contributors with write permission in " +"real time. Changes will be stored but not published until you " +"click the \"Save\" button." +msgstr "" +"このページは現在、共同ウィキに接続されています。 行われたすべての編集は、書き込み許可を持つ投稿者にリアルタイムで表示されます。 " +"変更は保存されますが、[保存]ボタンをクリックするまで公開されません。" + +#: addons/wiki/templates/edit.mako:310 +#: addons/wiki/templates/wiki-bar-modal-help.mako:14 +#: website/templates/profile/modal_change_avatar.mako:20 +#: website/templates/project/view_file.mako:117 +#: website/templates/project/view_file.mako:137 +#: website/templates/project/view_file.mako:157 +#: website/templates/project/view_file.mako:177 +#: website/templates/search_bar_help_modal.mako:18 +msgid "Close" +msgstr "閉じる" + +#: addons/wiki/templates/edit.mako:321 +msgid "Connecting to the collaborative wiki" +msgstr "共同ウィキへの接続" + +#: addons/wiki/templates/edit.mako:325 +msgid "" +"This page is currently attempting to connect to the collaborative wiki. " +"You may continue to make edits." +msgstr "このページは現在、共同ウィキに接続しようとしています。 引き続き編集を行うことができます。" + +# Notice: ”Save" は別のmsgid "Save"への参照なので文言を揃える +#: addons/wiki/templates/edit.mako:326 addons/wiki/templates/edit.mako:343 +#: addons/wiki/templates/edit.mako:360 +#: website/templates/project/view_file.mako:133 +#: website/templates/project/view_file.mako:153 +#: website/templates/project/view_file.mako:173 +msgid "Changes will not be saved until you press the \"Save\" button." +msgstr "[保存]ボタンを押すまで、変更は保存されません。" + +#: addons/wiki/templates/edit.mako:338 +msgid "Collaborative wiki is unavailable" +msgstr "共同ウィキは利用できません" + +#: addons/wiki/templates/edit.mako:342 +msgid "" +"The collaborative wiki is currently unavailable. You may continue to make" +" edits." +msgstr "共同ウィキは現在利用できません。 引き続き編集を行うことができます。" + +#: addons/wiki/templates/edit.mako:355 +#: website/templates/project/view_file.mako:168 +msgid "Browser unsupported" +msgstr "サポートされていないブラウザ" + +#: addons/wiki/templates/edit.mako:359 +#: website/templates/project/view_file.mako:172 +msgid "" +"Your browser does not support collaborative editing. You may continue to " +"make edits." +msgstr "お使いのブラウザは共有編集をサポートしていません。 引き続き編集を行うことができます。" + +#: addons/wiki/templates/status.mako:7 +msgid "Note: Home page cannot be renamed." +msgstr "注:ホームページの名前は変更できません。" + +#: addons/wiki/templates/status.mako:9 +msgid "Home" +msgstr "ホーム" + +#: addons/wiki/templates/wiki-bar-modal-help.mako:6 +msgid "Wiki syntax help" +msgstr "Wiki構文のヘルプ" + +#: addons/wiki/templates/wiki-bar-modal-help.mako:10 +#, python-format +msgid "" +"The wiki uses the Markdown syntax. For more " +"information and examples, go to our Guides." +msgstr "" +"wikiはMarkdown構文を使用します。 詳細と例については、ガイドをご覧ください。" + +#: addons/zotero/templates/zotero_node_settings.mako:41 +msgid "Current Library:" +msgstr "現在のライブラリ:" + +#: addons/zotero/templates/zotero_node_settings.mako:59 +msgid "Loading libraries..." +msgstr "ライブラリをロード中..." + +#: addons/zotero/templates/zotero_node_settings.mako:66 +msgid "Libraries" +msgstr "ライブラリ" + +#: addons/zotero/templates/zotero_node_settings.mako:69 +msgid "Select" +msgstr "選択" + +#: website/templates/base.mako:110 +msgid "Title" +msgstr "タイトル" + +#: website/templates/base.mako:111 +msgid "Date Merged" +msgstr "合併日" + +#: website/templates/base.mako:134 +msgid "WARNING: This site is running in development mode." +msgstr "警告: このサイトは開発モードで実行されています。" + +#: website/templates/base.mako:145 +msgid "" +"OSF does not support the use of Internet Explorer. For optimal " +"performance, please switch to another browser." +msgstr "OSFはInternet Explorerの使用をサポートしていません。 最適なパフォーマンスを得るには、別のブラウザに切り替えてください。" + +#: website/templates/base.mako:148 website/templates/base.mako:161 +msgid "Accept" +msgstr "同意する" + +#: website/templates/base.mako:154 +#, python-format +msgid "" +"The National Institute of Informatics (NII) uses cookies to operate the " +"NII Research Data Cloud service and to improve your user experience." +" If you intend to use the GakuNin RDM, please read our " +"Privacy Policy and information on NII use of cookies. By clicking " +"Accept or continuing to use our website, you consent to the cookies use " +"on this site. If you do not agree with the cookies use, " +"please change your browser settings to disable cookies or stop using our " +"website. Please be aware that you may not be able to use" +" some functions on our website when you have cookies disabled." +msgstr "" +"国立情報学研究所では、NII Research Data " +"Cloudサービスの運営およびユーザ体験の向上を目的にクッキーを利用しております。GakuNin RDMをご利用されるお客様には、プライバシーポリシー、およびクッキー使用に関する情報をご覧ください。「同意する」をクリックまたは当サイトの利用を継続されることで、弊所がクッキーを使用することにご同意いただいたものとさせていただきます。ご同意いただけない場合には、お客様のブラウザ設定でクッキーを無効化していただくか、または当サイトの利用を中止して下さい。クッキーを利用しないことで、当サイトの一部の機能がご利用いただけない可能性がございますがご了承ください。" + +#: website/templates/base.mako:172 +msgid "Start managing your projects on the GakuNin RDM today." +msgstr "GakuNin RDMでプロジェクトの管理を今すぐ始めましょう。" + +#: website/templates/base.mako:173 +msgid "" +"Free and easy to use, the GakuNin RDM supports the entire research " +"lifecycle: planning, execution, reporting, archiving, and discovery." +msgstr "使いやすいGakuNin RDMは、計画、実行、レポート、アーカイブ、および発見という研究ライフサイクル全体をサポートします。" + +#: website/templates/base.mako:175 +msgid "Create an Account" +msgstr "アカウント作成" + +#: website/templates/base.mako:177 +msgid "Learn More" +msgstr "もっと詳しく知る" + +#: website/templates/base.mako:178 +msgid "Hide this message" +msgstr "このメッセージを非表示" + +#: website/templates/claim_account.mako:2 +msgid "Claim Account" +msgstr "アカウントを請求" + +#: website/templates/claim_account.mako:4 +msgid "Set Password" +msgstr "パスワードを設定" + +#: website/templates/claim_account.mako:9 +#, python-format +msgid "Hello %(firstname)s! Please set a password to claim your account." +msgstr "こんにちは%(firstname)sさん!アカウントを申請するにはパスワードを設定してください。" + +#: website/templates/claim_account.mako:10 +#, python-format +msgid "E-mail: %(email)s" +msgstr "メールアドレス: %(email)s" + +#: website/templates/claim_account.mako:93 +#, python-format +msgid "" +"I have read and agree to the Terms of Use " +"and Privacy Policy." +msgstr "" +"利用規約とプライバシーポリシーを読み、同意します。" + +#: website/templates/claim_account.mako:105 +#, python-format +msgid "" +"If you are not %(fullname)s, or if you were erroneously added as a " +"contributor to the project described in the email invitation, please " +"email %(osfContactEmail)s" +msgstr "" +"あなたが%(fullname)sでない場合、または招待メールに記載されているプロジェクトへのメンバーとして誤って追加された場合は、%(osfContactEmail)sにメールしてください" + +#: website/templates/claim_account_eppn.mako:2 +#: website/templates/claim_account_eppn.mako:4 +#: website/templates/claim_account_registered.mako:2 +#: website/templates/claim_account_registered.mako:4 +msgid "Claim Contributor" +msgstr "メンバーを請求" + +#: website/templates/claim_account_eppn.mako:9 +msgid "Please confirm to continue." +msgstr "続行するには確認してください。" + +#: website/templates/claim_account_eppn.mako:12 +msgid "Full name (can be changed later):" +msgstr "氏名(後で変更できます):" + +#: website/templates/claim_account_eppn.mako:16 +msgid "Primary Email (Username) (can be changed later):" +msgstr "\"プライマリメール(ユーザ名)(後で変更できます)" + +#: website/templates/claim_account_eppn.mako:21 +msgid "Alternate Email (can be changed later):" +msgstr "代替メールアドレス(後で変更できます)" + +#: website/templates/claim_account_eppn.mako:27 +#, python-format +msgid "I am not %(username)s." +msgstr "私は%(username)sではありません。" + +#: website/templates/claim_account_eppn.mako:29 +#: website/templates/claim_account_registered.mako:25 +#: website/templates/prereg_landing_page.mako:24 +#: website/templates/project/modal_remove_contributor.mako:97 +msgid "Continue" +msgstr "続ける" + +#: website/templates/claim_account_registered.mako:9 +msgid "Please enter your credentials to continue." +msgstr "続行するには資格情報を入力してください。" + +#: website/templates/claim_account_registered.mako:23 +#, python-format +msgid "I am not %(userFullname)s." +msgstr "私は%(userFullname)sではありません。" + +#: website/templates/copyright.mako:7 website/templates/copyright.mako:12 +#: website/templates/footer.mako:11 +msgid "National Institute of Informatics" +msgstr "国立情報学研究所" + +#: website/templates/copyright.mako:8 +msgid "Terms of Use" +msgstr "利用規約" + +#: website/templates/copyright.mako:9 +msgid "Privacy Policy" +msgstr "プライバシーポリシー" + +#: website/templates/footer.mako:17 +msgid "Terms of Use" +msgstr "利用規約" + +#: website/templates/footer.mako:23 +msgid "Privacy Policy" +msgstr "プライバシーポリシー" + +#: website/templates/footer.mako:30 +msgid "Status" +msgstr "ステータス" + +#: website/templates/footer.mako:44 +msgid "TOP Guidelines" +msgstr "トップガイドライン" + +#: website/templates/footer.mako:52 +msgid "Reproducibility Project: Psychology" +msgstr "再現性 プロジェクト:心理学" + +#: website/templates/footer.mako:60 +msgid "Reproducibility Project: Cancer Biology" +msgstr "再現性 プロジェクト:がん生物学" + +#: website/templates/institution.mako:8 +#: website/templates/project/project_header.mako:200 +msgid "" +"NOTICE: Forks, registrations, and uploads will be " +"temporarily disabled while the GakuNin RDM undergoes a hardware upgrade. " +"These features will return shortly. Thank you for your patience." +msgstr "" +"注意: GakuNin " +"RDMのハードウェアアップグレード中は、フォーク、登録、アップロードが一時的に無効になります。 これらの機能はまもなく戻ります。 " +"お待たせして申し訳ありません。" + +#: website/templates/messages.mako:1 +msgid "Duplicate template" +msgstr "テンプレートを複製" + +#: website/templates/messages.mako:2 +msgid "Fork this Project" +msgstr "このプロジェクトをフォーク" + +#: website/templates/messages.mako:3 +msgid "Citations" +msgstr "文献管理" + +#: website/templates/messages.mako:4 +msgid "Storage" +msgstr "ストレージ" + +#: website/templates/messages.mako:5 +msgid "Other" +msgstr "その他" + +#: website/templates/messages.mako:6 +msgid "No license" +msgstr "ライセンスなし" + +#: website/templates/messages.mako:7 +msgid "Analysis" +msgstr "分析" + +#: website/templates/messages.mako:8 +msgid "Communication" +msgstr "コミュニケーション" + +#: website/templates/messages.mako:9 +msgid "Data" +msgstr "データ" + +#: website/templates/messages.mako:10 +msgid "Hypothesis" +msgstr "仮説" + +#: website/templates/messages.mako:11 +msgid "Instrumentation" +msgstr "器具" + +#: website/templates/messages.mako:12 +msgid "Methods and Measures" +msgstr "方法と対策" + +#: website/templates/messages.mako:13 +msgid "Procedure" +msgstr "手順" + +#: website/templates/messages.mako:14 +msgid "Software" +msgstr "ソフトウェア" + +#: website/templates/messages.mako:15 +msgid "Component has been successfully deleted." +msgstr "コンポーネントは正常に削除されました。" + +#: website/templates/messages.mako:16 +msgid "Project has been successfully deleted." +msgstr "プロジェクトは正常に削除されました。" + +#: website/templates/messages.mako:17 +msgid "" +"View all information associated with this account, including for private " +"projects." +msgstr "プライベートプロジェクトを含む、このアカウントに関連付けられているすべての情報を表示します。" + +#: website/templates/messages.mako:18 +msgid "" +"View and edit all information associated with this account, including for" +" private projects." +msgstr "プライベートプロジェクトを含む、このアカウントに関連付けられているすべての情報を表示および編集します。" + +#: website/templates/messages.mako:19 +msgid "Read your profile data." +msgstr "プロフィールデータを読込む" + +#: website/templates/messages.mako:20 +msgid "Read your primary email address." +msgstr "プライマリメールアドレスを読込む" + +# ##Please translate carefully with html. +#: website/templates/messages.mako:22 +msgid "" +"\n" +"

                                          \n" +"
                                          \n" +"

                                          We've updated our Terms" +" of Use and Privacy" +" Policy. Please read them carefully.

                                          " +msgstr "" +"\n" +"
                                          \n" +"
                                          \n" +"

                                          利用規約とプライバシーポリシーを更新しました。注意深くお読みください。

                                          " + +# ##Please translate carefully with html. +#: website/templates/messages.mako:26 +msgid "" +"
                                          I " +"have read and agree to these terms.
                                          \n" +"
                                          " +msgstr "" +"
                                          これらの規約を読み、同意します
                                          \n" +"
                                          " + +# ##Please translate carefully with html. +#: website/templates/messages.mako:28 +msgid "" +"\n" +"
                                          " +msgstr "" +"\n" +"
                                          " + +#: website/templates/my_projects.mako:2 website/templates/nav.mako:51 +msgid "My Projects" +msgstr "マイプロジェクト" + +#: website/templates/my_projects.mako:8 +msgid "" +"NOTICE: Forks, registrations, and uploads will be " +"temporarily disabled while the GakuNin RDM undergoes a hardware upgrade. " +"These features will return shortly. Thank you for your patience." +msgstr "" +"注意: GakuNin " +"RDMのハードウェアアップグレード中は、フォーク、登録、アップロードが一時的に無効になります。 これらの機能はまもなく戻ります。 " +"お待たせしてすみません。" + +#: website/templates/nav.mako:23 +msgid "HOME" +msgstr "ホーム" + +#: website/templates/nav.mako:24 +msgid "PREPRINTS" +msgstr "プレプリント" + +#: website/templates/nav.mako:25 +msgid "REGISTRIES" +msgstr "レジストリー" + +#: website/templates/nav.mako:26 +msgid "MEETINGS" +msgstr "ミーティング" + +#: website/templates/nav.mako:28 +msgid "INSTITUTIONS" +msgstr "インスティチューション" + +#: website/templates/nav.mako:34 +msgid "Toggle navigation" +msgstr "ナビゲーションを切り替える" + +#: website/templates/nav.mako:49 +msgid "My Quick Files" +msgstr "マイクイックファイル" + +#: website/templates/nav.mako:54 +#: website/templates/project/modal_add_contributor.mako:22 +#: website/templates/search.mako:2 website/templates/search_grdm.mako:2 +msgid "Search" +msgstr "検索" + +#: website/templates/nav.mako:59 +msgid "Support" +msgstr "サポート" + +#: website/templates/nav.mako:63 +msgid "Donate" +msgstr "寄付" + +#: website/templates/nav.mako:78 +msgid "My Profile" +msgstr "プロフィール" + +#: website/templates/nav.mako:79 website/templates/profile/account.mako:8 +#: website/templates/profile/add_email.mako:14 +#: website/templates/profile/addons.mako:19 +#: website/templates/profile/notifications.mako:6 +#: website/templates/profile/oauth_app_list.mako:4 +#: website/templates/profile/personal_tokens_detail.mako:5 +#: website/templates/profile/personal_tokens_list.mako:4 +#: website/templates/profile/settings.mako:2 +#: website/templates/profile/settings.mako:9 +#: website/templates/project/project_header.mako:80 +#: website/templates/project/settings.mako:2 +#: website/templates/project/settings.mako:5 +#: website/templates/util/render_node.mako:67 +msgid "Settings" +msgstr "設定" + +#: website/templates/nav.mako:81 +msgid "RDM Support" +msgstr "RDM サポート" + +#: website/templates/nav.mako:83 +msgid "Log out" +msgstr "ログアウト" + +#: website/templates/nav.mako:92 +msgid "Sign in" +msgstr "サインイン" + +#: website/templates/nav.mako:102 +msgid "Sign Up" +msgstr "サインアップ" + +#: website/templates/nav.mako:104 +msgid "Sign In" +msgstr "サインイン" + +#: website/templates/nav.mako:140 +msgid "Notice:" +msgstr "注意:" + +#: website/templates/nav.mako:144 +msgid "" +"The site will undergo maintenance between ." +msgstr "の間メンテナスが行われます。" + +#: website/templates/nav.mako:145 +msgid "Thank you for your patience." +msgstr "お待たせしてすみません。" + +#: website/templates/prereg_landing_page.mako:5 +msgid "GakuNin RDM Preregistration" +msgstr "GakuNin RDM 事前登録" + +#: website/templates/prereg_landing_page.mako:7 +msgid "GakuNin RDM Prereg Challenge" +msgstr "GakuNin RDM プレレグチャレンジ" + +#: website/templates/prereg_landing_page.mako:22 +msgid "Please provide a title for your project:" +msgstr "プロジェクトのタイトルを入力してください:" + +#: website/templates/prereg_landing_page.mako:30 +msgid "Go to an existing preregistration:" +msgstr "既存の事前登録に移動します:" + +#: website/templates/prereg_landing_page.mako:32 +#: website/templates/prereg_landing_page.mako:41 +#: website/templates/prereg_landing_page.mako:71 +#: website/templates/prereg_landing_page.mako:115 +msgid "Preregister" +msgstr "事前登録" + +#: website/templates/prereg_landing_page.mako:39 +msgid "Preregister an existing project:" +msgstr "既存のプロジェクトを事前登録する" + +#: website/templates/prereg_landing_page.mako:55 +#, python-format +msgid "" +"

                                          Improve your research with preregistration. By" +" writing out specific details such as data collection methods, analysis " +"plans, and rules for data exclusion, you can make important decisions " +"early on and have a clear record of these choices. This can help reduce " +"biases that occur once the data are in front of you.

                                          " +msgstr "" +"

                                          事前登録により研究を改善します。データ収集方法、分析計画、データ除外ルールなどの特定の詳細を記述することにより、重要な決定を早期に行い、これらの選択を明確に記録できます。これにより、データが目の前にあるときに発生するバイアスを減らすことができます。

                                          " + +#: website/templates/prereg_landing_page.mako:56 +#, python-format +msgid "" +"

                                          Use OSF Registries to discover previously " +"registered work.

                                          " +msgstr "

                                          OSFレジストリを使用して、以前に登録した作品を発見します。

                                          " + +#: website/templates/prereg_landing_page.mako:58 +#, python-format +msgid "" +"

                                          Articles must be published by an approved journal by December 31, 2018, to be " +"eligible for a prize. Please use this this helpful workflow to " +"preregister, even if you are not seeking a prize.

                                          " +msgstr "" +"

                                          賞品を獲得するには、2018年12月31日までに承認済みジャーナルで記事を公開する必要があります。賞品を探していない場合でも、この便利なワークフローを使用して事前登録してください。

                                          " + +#: website/templates/prereg_landing_page.mako:59 +#, python-format +msgid "" +"

                                          Improve your research with preregistration. The process of creating a" +" preregistration is beneficial to both the " +"scientific field and to you, the scientist. By writing out detailed data " +"collection methods, analysis plans, and rules for excluding or missing " +"data, you can make important decisions that affect your workflow earlier," +" without the biases that occur once the data are in front of you.

                                          " +msgstr "" +"

                                          事前登録により研究を改善します。 事前登録を作成するプロセスは、科学分野と科学者の両方にとって有益です。詳細なデータ収集方法、分析計画、およびデータの除外または欠落に関するルールを記述することにより、データが目の前に発生するような偏りを生じることなく、ワークフローに影響を与える重要な決定を早期に行うことができます。

                                          " + +#: website/templates/prereg_landing_page.mako:64 +#: website/templates/prereg_landing_page.mako:110 +msgid "Start a new preregistration" +msgstr "新しい事前登録を開始する" + +#: website/templates/prereg_landing_page.mako:76 +#: website/templates/prereg_landing_page.mako:121 +msgid "Continue working on an existing draft preregistration" +msgstr "既存の事前登録ドラフトの作業を続行します" + +#: website/templates/prereg_landing_page.mako:84 +#: website/templates/prereg_landing_page.mako:126 +msgid "Preregister a project you already have on the GakuNin RDM" +msgstr "GakuNin RDMに既にあるプロジェクトを事前登録する" + +#: website/templates/profile.mako:23 +#, python-format +msgid "" +"This account has been merged with %(profileAbsoluteUrl)s" +msgstr "このアカウントは%(profileAbsoluteUrl)sと統合されました" + +#: website/templates/profile.mako:43 +msgid "Edit your profile" +msgstr "プロフィールを編集" + +#: website/templates/profile.mako:57 +msgid "Member Since" +msgstr "利用開始日" + +#: website/templates/profile.mako:63 +msgid "Public Profile" +msgstr "公開プロフィール" + +#: website/templates/profile.mako:69 +msgid "No" +msgstr "0" + +#: website/templates/profile.mako:69 +msgid "activity point" +msgid_plural "activity points" +msgstr[0] "回の貢献" + +#: website/templates/profile.mako:70 +msgid "project" +msgstr "プロジェクト" + +#: website/templates/profile.mako:70 +msgid " " +msgid_plural "s" +msgstr[0] " " + +#: website/templates/profile.mako:73 +msgid "Usage of storage" +msgstr "ストレージ使用率" + +#: website/templates/profile.mako:82 website/templates/profile/settings.mako:39 +msgid "Employment" +msgstr "職歴" + +#: website/templates/profile.mako:83 website/templates/profile/settings.mako:40 +msgid "Education" +msgstr "学歴" + +#: website/templates/profile.mako:84 website/templates/profile/settings.mako:41 +msgid "Social" +msgstr "SNS" + +#: website/templates/profile.mako:115 +msgid "Public projects" +msgstr "公開プロジェクト" + +#: website/templates/profile.mako:135 +msgid "Public components" +msgstr "公開コンポーネント" + +#: website/templates/profile.mako:152 +msgid "Quick files" +msgstr "クイックファイル" + +#: website/templates/request_access.mako:2 +msgid "Request Access" +msgstr "アクセスをリクエスト" + +#: website/templates/request_access.mako:11 +msgid "You Need Permission" +msgstr "許可が必要です" + +#: website/templates/request_access.mako:13 +msgid "Ask for access, or switch to an account with permission." +msgstr "アクセス権を要求するか、許可を得てアカウントに切り替えてください。" + +#: website/templates/request_access.mako:14 +msgid "" +"Your request for access has been sent. You will receive an email if and " +"when your request is approved." +msgstr "アクセス権のリクエストが送信されました。 リクエストが承認されると、メールが届きます。" + +#: website/templates/request_access.mako:23 +msgid "Switch account" +msgstr "アカウントを切り替える" + +#: website/templates/search.mako:36 website/templates/search_grdm.mako:37 +msgid "Improve your search" +msgstr "検索結果をしぼる" + +#: website/templates/search.mako:69 website/templates/search_grdm.mako:70 +msgid "Filter by license" +msgstr "ライセンスでフィルタ" + +#: website/templates/search.mako:93 website/templates/search_grdm.mako:95 +msgid "No results found." +msgstr "結果が見つかりません。" + +#: website/templates/search.mako:96 website/templates/search_grdm.mako:98 +msgid "Type your search terms in the box above." +msgstr "上のボックスに検索キーワードを入力します。" + +#: website/templates/search.mako:104 website/templates/search_nav_grdm.mako:4 +msgid "Previous Page" +msgstr "前のページ" + +#: website/templates/search.mako:110 website/templates/search_nav_grdm.mako:61 +msgid "Next Page" +msgstr "次のページ" + +#: website/templates/search.mako:123 website/templates/search.mako:341 +#: website/templates/search.mako:344 website/templates/search_grdm.mako:552 +#: website/templates/search_grdm.mako:555 +msgid "Withdrawn " +msgstr "取り下げられた" + +#: website/templates/search.mako:123 +msgid "Registration " +msgstr "登録" + +#: website/templates/search.mako:123 +msgid "File" +msgstr "ファイル" + +#: website/templates/search.mako:126 +msgid "(Preprint File)" +msgstr "(プレプリントファイル)" + +#: website/templates/search.mako:130 +#, python-format +msgid "From: " +msgstr " より" + +#: website/templates/search.mako:131 +#, python-format +msgid "" +"From: / " +msgstr "" +" /より" + +#: website/templates/search.mako:240 website/templates/search_grdm.mako:367 +msgid " Contributors" +msgstr "メンバー" + +#: website/templates/search.mako:262 website/templates/search_grdm.mako:389 +#: website/templates/search_grdm.mako:461 +msgid "Affiliated institutions" +msgstr "所属機関" + +#: website/templates/search.mako:276 website/templates/search.mako:368 +#: website/templates/search_grdm.mako:403 +#: website/templates/search_grdm.mako:579 +msgid "

                                          Jump to:" +msgstr "

                                          " + +# コードの都合上、[Jump to:]の翻訳を組み込む +#: website/templates/search.mako:280 website/templates/search.mako:372 +#: website/templates/search_grdm.mako:407 +#: website/templates/search_grdm.mako:583 +msgid "Files" +msgstr "ファイルへ移動" + +#: website/templates/search.mako:291 website/templates/search_grdm.mako:502 +msgid "(Preprint)" +msgstr "(プレプリント)" + +#: website/templates/search.mako:292 website/templates/search.mako:348 +#: website/templates/search_grdm.mako:440 +#: website/templates/search_grdm.mako:503 +#: website/templates/search_grdm.mako:559 +msgid "Description" +msgstr "説明" + +#: website/templates/project/contributors.mako:2 +#: website/templates/project/contributors.mako:8 +#: website/templates/project/contributors.mako:54 +#: website/templates/project/project.mako:163 +#: website/templates/project/project_header.mako:72 +#: website/templates/search.mako:295 website/templates/search.mako:352 +#: website/templates/search_grdm.mako:446 +#: website/templates/search_grdm.mako:506 +#: website/templates/search_grdm.mako:563 +msgid "Contributors" +msgstr "メンバー" + +#: website/templates/search.mako:314 website/templates/search_grdm.mako:525 +msgid "Managers" +msgstr "マネージャ" + +#: website/templates/search.mako:327 website/templates/search_grdm.mako:538 +msgid "Members" +msgstr "グループメンバー" + +#: website/templates/search.mako:341 website/templates/search.mako:344 +#: website/templates/search_grdm.mako:552 +#: website/templates/search_grdm.mako:555 +msgid "Registration" +msgstr "登録" + +#: website/templates/project/project.mako:587 +#: website/templates/project/view_file.mako:76 +#: website/templates/search.mako:377 website/templates/search_grdm.mako:475 +#: website/templates/search_grdm.mako:588 +msgid "Tags" +msgstr "タグ" + +#: website/templates/search_bar.mako:7 website/templates/search_bar.mako:8 +#: website/templates/search_bar_grdm.mako:7 +#: website/templates/search_bar_grdm.mako:8 +msgid "GakuNin RDM Search" +msgstr "GakuNin RDM 検索" + +#: website/templates/search_bar_grdm.mako:20 +msgid "sort by" +msgstr "ソート順" + +#: website/templates/search_bar_grdm.mako:22 +msgid "per page" +msgstr "表示件数" + +#: website/templates/search_bar_help_modal.mako:6 +msgid "Search help" +msgstr "検索ヘルプ" + +#: website/templates/search_bar_help_modal.mako:9 +msgid "Queries" +msgstr "クエリ" + +#: website/templates/search_bar_help_modal.mako:10 +#, python-format +msgid "" +"

                                          Search uses the Lucene search " +"syntax.This gives you many options, but can be very simple as well. " +"Examples of valid searches include:

                                          " +msgstr "" +"

                                          検索ではLucene検索構文を使用します。これにより多くのオプションが提供されますが、非常にシンプルにすることもできます。有効な検索の例は次のとおりです。

                                          " + +#: website/templates/project/project_header.mako:16 +#: website/templates/search_grdm.mako:143 +#: website/templates/search_grdm.mako:317 +msgid "Project" +msgstr "プロジェクト" + +#: website/templates/search_grdm.mako:150 +msgid "Folder" +msgstr "フォルダ" + +#: website/templates/search_grdm.mako:160 +#: website/templates/search_grdm.mako:339 +#: website/templates/search_grdm.mako:492 +msgid "Comment" +msgstr "コメント" + +#: website/templates/search_grdm.mako:196 +msgid "Employment@search" +msgstr "所属(勤務先)" + +#: website/templates/search_grdm.mako:206 +msgid "Education@search" +msgstr "所属(学校)" + +#: website/templates/search_grdm.mako:327 +msgid "Body of Wiki" +msgstr "Wiki本文" + +#: website/templates/search_grdm.mako:602 +msgid "Modified by" +msgstr "更新者" + +#: website/templates/search_grdm.mako:605 +msgid "Created by" +msgstr "作成者" + +#: website/templates/search_nav_grdm.mako:65 +msgid "Page" +msgstr "ページ" + +#: website/templates/include/comment_pane_template.mako:3 +#: website/templates/project/project_header.mako:86 +msgid "Comments" +msgstr "コメント" + +#: website/templates/include/comment_pane_template.mako:18 +#: website/templates/project/files.mako:2 +#: website/templates/project/files.mako:5 +#: website/templates/project/project.mako:441 +#: website/templates/project/project_header.mako:40 +msgid "Files" +msgstr "ファイル" + +#: website/templates/include/comment_pane_template.mako:18 +#: website/templates/include/comment_pane_template.mako:19 +#: website/templates/include/comment_pane_template.mako:20 +msgid "Discussion" +msgstr "ディスカッション" + +#: website/templates/include/comment_pane_template.mako:26 +#: website/templates/include/comment_template.mako:165 +msgid "Add a comment" +msgstr "コメントを追加" + +#: website/templates/include/comment_template.mako:13 +msgid "Comment confirmed as spam." +msgstr "コメントはスパムとして確認されました。" + +#: website/templates/include/comment_template.mako:23 +msgid "Comment deleted." +msgstr "コメントは削除されました" + +#: website/templates/include/comment_template.mako:30 +msgid "Restore" +msgstr "戻す" + +#: website/templates/include/comment_template.mako:37 +msgid "Comment reported." +msgstr "コメントが報告されました。" + +#: website/templates/include/comment_template.mako:44 +msgid "Not abuse" +msgstr "不正使用ではない" + +#: website/templates/include/comment_template.mako:86 +msgid "Edit comment" +msgstr "コメントを編集" + +#: website/templates/include/comment_template.mako:138 +msgid "Describe abuse" +msgstr "不正使用を説明" + +#: website/templates/include/comment_template.mako:142 +msgid "Report" +msgstr "報告" + +#: website/templates/include/comment_template.mako:186 +msgid "More replies" +msgstr "より多くの返信" + +#: website/templates/include/profile/jobs.mako:19 +#: website/templates/include/profile/schools.mako:19 +msgid "Position" +msgstr "ポジション" + +#: website/templates/include/profile/jobs.mako:26 +#: website/templates/include/profile/schools.mako:26 +#: website/templates/project/contributors.mako:332 +#: website/templates/project/contributors.mako:387 +#: website/templates/project/modal_remove_contributor.mako:96 +#: website/templates/project/modal_remove_contributor.mako:105 +#: website/templates/project/modal_remove_contributor.mako:114 +#: website/templates/project/project.mako:569 +#: website/templates/project/settings.mako:498 +#: website/templates/project/settings.mako:501 +msgid "Remove" +msgstr "削除" + +#: website/templates/include/profile/jobs.mako:31 +#: website/templates/include/profile/schools.mako:31 +msgid "Read IdP Profile" +msgstr "IdPプロフィールから読込み" + +#: website/templates/include/profile/jobs.mako:35 +msgid "Institution / Employer" +msgstr "機関 / 雇用者" + +#: website/templates/include/profile/jobs.mako:37 +#: website/templates/include/profile/schools.mako:37 +#: website/templates/profile/oauth_app_detail.mako:55 +#: website/templates/profile/oauth_app_detail.mako:61 +#: website/templates/profile/oauth_app_detail.mako:73 +#: website/templates/profile/personal_tokens_detail.mako:26 +msgid "Required" +msgstr "必須" + +#: website/templates/include/profile/jobs.mako:44 +msgid "Department / Institute" +msgstr "部門 / 研究所" + +#: website/templates/include/profile/jobs.mako:49 +msgid "Job title" +msgstr "職名" + +#: website/templates/include/profile/jobs.mako:54 +#: website/templates/include/profile/schools.mako:54 +#: website/templates/project/project.mako:610 +msgid "Start date" +msgstr "開始日" + +#: website/templates/include/profile/jobs.mako:58 +#: website/templates/include/profile/jobs.mako:73 +#: website/templates/include/profile/schools.mako:58 +#: website/templates/include/profile/schools.mako:73 +msgid "-- Month --" +msgstr "-- 月 --" + +#: website/templates/include/profile/jobs.mako:63 +#: website/templates/include/profile/jobs.mako:78 +#: website/templates/include/profile/schools.mako:63 +#: website/templates/include/profile/schools.mako:78 +msgid "Year" +msgstr "年" + +#: website/templates/include/profile/jobs.mako:69 +#: website/templates/include/profile/schools.mako:69 +#: website/templates/project/project.mako:613 +msgid "End date" +msgstr "終了日" + +#: website/templates/include/profile/jobs.mako:85 +#: website/templates/include/profile/schools.mako:85 +msgid "Ongoing" +msgstr "在籍" + +#: website/templates/include/profile/jobs.mako:104 +msgid "Add another Employment" +msgstr "別の職歴を追加" + +#: website/templates/include/profile/jobs.mako:114 +#: website/templates/include/profile/names.mako:73 +#: website/templates/include/profile/schools.mako:114 +#: website/templates/include/profile/social.mako:140 +msgid "Discard changes" +msgstr "変更を破棄" + +#: website/templates/include/profile/jobs.mako:117 +#: website/templates/include/profile/names.mako:76 +#: website/templates/include/profile/schools.mako:117 +#: website/templates/include/profile/social.mako:143 +msgid "Saving" +msgstr "保存中" + +#: website/templates/include/profile/jobs.mako:136 +#: website/templates/include/profile/schools.mako:136 +#: website/templates/include/profile/social.mako:180 +msgid "Not provided" +msgstr "未設定" + +#: website/templates/include/profile/jobs.mako:149 +#: website/templates/include/profile/jobs.mako:159 +#: website/templates/include/profile/schools.mako:148 +#: website/templates/include/profile/schools.mako:158 +msgid "" +" " +msgstr "" +"年 " + +#: website/templates/include/profile/jobs.mako:156 +msgid "Department / Institute:" +msgstr "部門 / 研究所:" + +#: website/templates/include/profile/jobs.mako:157 +#: website/templates/project/settings.mako:101 +msgid "Title:" +msgstr "タイトル:" + +#: website/templates/include/profile/jobs.mako:158 +#: website/templates/include/profile/schools.mako:157 +msgid "Dates:" +msgstr "日付:" + +#: website/templates/include/profile/names.mako:6 +msgid "Full name (e.g. Rosalind Elsie Franklin)" +msgstr "氏名 (例: Taro Suzuki Sato)" + +#: website/templates/include/profile/names.mako:15 +msgid "" +"Your full name, above, is the name that will be displayed in your " +"profile. To control the way your name will appear in " +"citations, you can use the \"Auto-fill\" button to " +"automatically infer your first name, last name, etc., or edit " +"the fields directly below." +msgstr "" +"上記の氏名は、プロフィールに表示される名前です。引用での名前の表示方法を制御するには、[自動入力]ボタンを使用して、名や姓などを自動的に補完できます。" +" または下のフィールドを編集します。" + +#: website/templates/include/profile/names.mako:22 +msgid "Auto-fill" +msgstr "自動入力" + +#: website/templates/include/profile/names.mako:26 +msgid "Given name (e.g. Rosalind)" +msgstr "名 (例: Taro)" + +#: website/templates/include/profile/names.mako:31 +msgid "Middle name(s) (e.g. Elsie)" +msgstr "旧姓・ミドルネーム等 (例: Suzuki)" + +#: website/templates/include/profile/names.mako:36 +msgid "Family name (e.g. Franklin)" +msgstr "姓 (例: Sato)" + +#: website/templates/include/profile/names.mako:41 +msgid "Suffix" +msgstr "敬称 (例:Dr., Prof., Ph.D., M.D.等)" + +#: website/templates/include/profile/names.mako:47 +msgid "Citation preview" +msgstr "引用のプレビュー" + +#: website/templates/include/profile/names.mako:51 +msgid "Style" +msgstr "スタイル" + +#: website/templates/include/profile/names.mako:52 +msgid "Citation format" +msgstr "引用形式" + +#: website/templates/include/profile/schools.mako:35 +msgid "Institution" +msgstr "機関" + +#: website/templates/include/profile/schools.mako:44 +msgid "Department" +msgstr "部門" + +#: website/templates/include/profile/schools.mako:49 +msgid "Degree" +msgstr "学位" + +#: website/templates/include/profile/schools.mako:104 +msgid "Add another Education" +msgstr "別の学歴を追加" + +#: website/templates/include/profile/schools.mako:155 +msgid "Department:" +msgstr "部門:" + +#: website/templates/include/profile/schools.mako:156 +msgid "Degree:" +msgstr "学位:" + +#: website/templates/include/profile/settings_navpanel.mako:6 +msgid "Profile information" +msgstr "プロフィール" + +#: website/templates/include/profile/settings_navpanel.mako:9 +msgid "Account settings" +msgstr "アカウント設定" + +#: website/templates/include/profile/settings_navpanel.mako:12 +msgid "Configure add-on accounts" +msgstr "アドオンアカウント構成" + +#: website/templates/include/profile/settings_navpanel.mako:15 +#: website/templates/profile/notifications.mako:2 +msgid "Notifications" +msgstr "メール通知設定" + +#: website/templates/include/profile/settings_navpanel.mako:18 +msgid "Developer apps" +msgstr "開発者アプリ" + +#: website/templates/include/profile/settings_navpanel.mako:21 +msgid "Personal access tokens" +msgstr "パーソナルアクセストークン" + +#: website/templates/include/profile/social.mako:10 +msgid "Your websites" +msgstr "あなたのウェブサイト" + +#: website/templates/include/profile/social.mako:31 +msgid "Please enter a valid website" +msgstr "有効なウェブサイトを入力してください" + +#: website/templates/include/profile/social.mako:34 +msgid "Add website" +msgstr "ウェブサイトを追加" + +#: website/templates/include/profile/social.mako:88 +#: website/templates/include/profile/social.mako:96 +#: website/templates/include/profile/social.mako:104 +#: website/templates/include/profile/social.mako:114 +#: website/templates/include/profile/social.mako:122 +#: website/templates/include/profile/social.mako:130 +msgid "profileID" +msgstr "プロフィールID" + +#: website/templates/include/profile/social.mako:112 +msgid "institution" +msgstr "機関" + +#: website/templates/profile/account.mako:4 +#: website/templates/profile/add_email.mako:4 +msgid "Account Settings" +msgstr "アカウント設定" + +#: website/templates/profile/account.mako:15 +#: website/templates/profile/add_email.mako:21 +msgid "Connected Emails" +msgstr "メールアドレスに接続しました" + +#: website/templates/profile/account.mako:20 +#: website/templates/profile/add_email.mako:27 +msgid "Primary Email" +msgstr "プライマリメール" + +#: website/templates/profile/account.mako:34 +#: website/templates/profile/add_email.mako:57 +msgid "Alternate Emails" +msgstr "代替メール" + +#: website/templates/profile/account.mako:40 +#: website/templates/profile/add_email.mako:63 +msgid "make primary" +msgstr "プライマリにする" + +#: website/templates/profile/account.mako:48 +#: website/templates/profile/add_email.mako:72 +msgid "Unconfirmed Emails" +msgstr "未確認のメール" + +#: website/templates/profile/account.mako:55 +#: website/templates/profile/add_email.mako:79 +msgid "resend confirmation" +msgstr "確認を再送する" + +#: website/templates/profile/account.mako:64 +#: website/templates/profile/add_email.mako:88 +msgid "" +"To merge an existing account with this one or to log in with multiple " +"email addresses, add an alternate email address below." +msgstr "既存のアカウントをこのアカウントと統合するか、複数のメールアドレスでログインするには、下に別のメールアドレスを追加します。" + +#: website/templates/profile/account.mako:65 +#: website/templates/profile/add_email.mako:89 +msgid "" +"Merging accounts will move all projects and components associated with " +"two emails into one account. All projects and components will be " +"displayed under the email address listed as primary." +msgstr "" +"アカウントを統合すると、2つのメールに関連付けられたすべてのプロジェクトとコンポーネントが1つのアカウントに移動します。 " +"すべてのプロジェクトとコンポーネントは、プライマリとしてリストされているメールアドレスの下に表示されます。" + +#: website/templates/profile/account.mako:68 +msgid "" +"To log in with multiple email addresses, add an alternate email address " +"below." +msgstr "複数のメールアドレスでログインするには、下に別のメールアドレスを追加してください。" + +#: website/templates/profile/account.mako:73 +#: website/templates/profile/add_email.mako:98 +msgid "Email address" +msgstr "メールアドレス" + +#: website/templates/profile/account.mako:75 +#: website/templates/profile/add_email.mako:100 +msgid "Add email" +msgstr "メールアドレスを追加" + +#: website/templates/profile/account.mako:90 +msgid "Default Storage Location" +msgstr "デフォルトの保管場所" + +#: website/templates/profile/account.mako:98 +msgid "" +"This location will be applied to new projects and components. It will not" +" affect existing projects and components." +msgstr "この場所は、新しいプロジェクトとコンポーネントに適用されます。 既存のプロジェクトとコンポーネントには影響しません。" + +#: website/templates/profile/account.mako:103 +msgid "Update location" +msgstr "ロケーションを更新" + +#: website/templates/profile/account.mako:109 +#: website/templates/profile/add_email.mako:117 +msgid "Connected Identities" +msgstr "接続されたアイデンティティ" + +#: website/templates/profile/account.mako:111 +#: website/templates/profile/add_email.mako:119 +msgid "" +"Connected identities allow you to log in to the GakuNin RDM via a third-" +"party service." +msgstr "接続されたアイデンティティにより、サードパーティのサービスを介してGakuNin RDMにログインできます。" + +#: website/templates/profile/account.mako:112 +#: website/templates/profile/add_email.mako:120 +msgid "You can revoke these authorizations here." +msgstr "ここでこれらの認証を取り消すことができます。" + +#: website/templates/profile/account.mako:115 +#: website/templates/profile/add_email.mako:123 +msgid "" +"You have not authorized any external services to log in to the GakuNin " +"RDM." +msgstr "GakuNin RDMにログインする外部サービスを許可していません。" + +#: website/templates/profile/account.mako:125 +#: website/templates/profile/add_email.mako:133 +msgid "Verified" +msgstr "検証済" + +#: website/templates/profile/account.mako:127 +#: website/templates/profile/add_email.mako:135 +msgid "Pending" +msgstr "保留中" + +#: website/templates/profile/account.mako:145 +#: website/templates/profile/add_email.mako:155 +msgid "Change Password" +msgstr "パスワードを変更する" + +#: website/templates/profile/account.mako:149 +#: website/templates/profile/add_email.mako:159 +msgid "Old password" +msgstr "古いパスワード" + +#: website/templates/profile/account.mako:154 +#: website/templates/profile/add_email.mako:164 +msgid "Old Password" +msgstr "古いパスワード" + +#: website/templates/profile/account.mako:166 +#: website/templates/profile/add_email.mako:176 +msgid "New password" +msgstr "新しいパスワード" + +#: website/templates/profile/account.mako:171 +#: website/templates/profile/add_email.mako:181 +msgid "New Password" +msgstr "新しいパスワード" + +#: website/templates/profile/account.mako:201 +#: website/templates/profile/add_email.mako:211 +msgid "Confirm new password" +msgstr "新しいパスワードを確認" + +#: website/templates/profile/account.mako:206 +#: website/templates/profile/add_email.mako:216 +msgid "Verify Password" +msgstr "パスワードを照合" + +#: website/templates/profile/account.mako:217 +#: website/templates/profile/add_email.mako:227 +msgid "Update password" +msgstr "パスワードを更新" + +#: website/templates/profile/account.mako:223 +#: website/templates/profile/add_email.mako:232 +msgid "Security Settings" +msgstr "セキュリティ設定" + +#: website/templates/profile/account.mako:235 +#: website/templates/profile/add_email.mako:245 +msgid "Export Account Data" +msgstr "アカウントデータをエクスポート" + +#: website/templates/profile/account.mako:237 +#: website/templates/profile/add_email.mako:247 +msgid "" +"Exporting your account data allows you to keep a permanent copy of the " +"current state of your account. Keeping a copy of your account data can " +"provide peace of mind or assist in transferring your information to " +"another provider." +msgstr "" +"アカウントデータをエクスポートすると、アカウントの現在の状態の永続的なコピーを保持できます。 " +"アカウントデータのコピーを保存しておくと、安心して他のプロバイダーに情報を転送するのに役立ちます。" + +#: website/templates/profile/account.mako:238 +#: website/templates/profile/add_email.mako:248 +msgid "Request export" +msgstr "エクスポートをリクエスト" + +#: website/templates/profile/account.mako:242 +#: website/templates/profile/add_email.mako:254 +msgid "Deactivate Account" +msgstr "アカウントを非アクティブにする" + +#: website/templates/profile/account.mako:244 +msgid "" +"Warning: Once your deactivation has been approved the " +"effects are irreversible." +msgstr "警告: 非アクティブ化が承認されると、元に戻せません。" + +#: website/templates/profile/account.mako:245 +#: website/templates/profile/add_email.mako:259 +msgid "" +"Deactivating your account will remove you from all public projects to " +"which you are a contributor. Your account will no longer be associated " +"with GakuNin RDM projects, and your work on the GakuNin RDM will be " +"inaccessible." +msgstr "" +"アカウントを非アクティブにすると、投稿者であるすべての公開プロジェクトから削除されます。 アカウントはGakuNin " +"RDMプロジェクトに関連付けられなくなり、GakuNin RDMでの作業にアクセスできなくなります。" + +#: website/templates/profile/account.mako:246 +#: website/templates/profile/add_email.mako:263 +msgid "Your account is currently pending deactivation." +msgstr "アカウントは現在、非アクティブ化が保留されています。" + +#: website/templates/profile/account.mako:247 +#: website/templates/profile/add_email.mako:261 +msgid "Request deactivation" +msgstr "非アクティブ化をリクエスト" + +#: website/templates/profile/account.mako:248 +msgid "Cancel deactivation request" +msgstr "非アクティブ化をキャンセル" + +#: website/templates/profile/add_email.mako:42 +msgid "eduPersonPrincipalName (ePPN)" +msgstr "eduPersonPrincipalName (ePPN)" + +#: website/templates/profile/add_email.mako:92 +msgid "Add an email address below." +msgstr "以下にメールアドレスを追加してください。" + +#: website/templates/profile/add_email.mako:257 +msgid "Warning: This action is irreversible." +msgstr "警告: この操作は元に戻せません。" + +#: website/templates/profile/addon_permissions.mako:4 +#, python-format +msgid "Authorized by %(name)s" +msgstr "認証者:%(name)s" + +#: website/templates/profile/addons.mako:2 +#: website/templates/profile/addons.mako:29 +msgid "Configure Add-on Accounts" +msgstr "アドオンアカウントを構成する" + +#: website/templates/profile/modal_change_avatar.mako:6 +msgid "Change Avatar" +msgstr "アバターを変更" + +#: website/templates/profile/modal_change_avatar.mako:9 +msgid "" +"Avatars on the GakuNin RDM use gravatar.org, a free" +" service that allows users to easily control their " +"identity and profile on multiple service across the " +"Internet." +msgstr "" +"GakuNin RDMのアバターはgravatar.orgを使用します。これは、ユーザーがインターネット上の複数のサービスで自分のIDとプロファイルを簡単に制御できるようにする無料のサービスです。" + +#: website/templates/profile/modal_change_avatar.mako:14 +msgid "" +"To change your avatar image, please login or register at" +" gravatar.org, and" +" add the email address you use on the GakuNin RDM to " +"your Gravatar account." +msgstr "" +"アバター画像を変更するには、gravatar.orgでログインまたは登録し、GakuNin " +"RDMで使用するメールアドレスをGravatarアカウントに追加してください。" + +#: website/templates/profile/notifications.mako:16 +msgid "Configure Email Preferences" +msgstr "メール設定を構成する" + +#: website/templates/profile/notifications.mako:26 +msgid "Receive general notifications about the GakuNin RDM every 2-3 weeks." +msgstr "GakuNin RDMに関する一般的な通知を2〜3週間ごとに受け取ります。" + +#: website/templates/profile/notifications.mako:35 +msgid "" +"Receive helpful tips on how to make the most of the GakuNin RDM, up to " +"once per week." +msgstr "GakuNin RDMを最大限に活用する方法に関する役立つヒントを週に1回まで受け取ります。" + +#: website/templates/profile/notifications.mako:53 +msgid "Configure Notification Preferences" +msgstr "メール通知を設定する" + +#: website/templates/profile/notifications.mako:56 +msgid "" +"NOTE: Regardless of your selected preferences, GakuNin RDM will continue " +"to provide transactional and administrative service emails." +msgstr "注:選択した設定に関係なく、GakuNin RDMは引き続きトランザクションサービスおよび管理サービスの電子メールを提供します。" + +#: website/templates/profile/notifications.mako:64 +#: website/templates/project/settings.mako:371 +msgid "Loading notification settings..." +msgstr "通知設定をロード中..." + +#: website/templates/profile/oauth_app_detail.mako:2 +#: website/templates/profile/oauth_app_detail.mako:5 +msgid "Application Detail" +msgstr "アプリケーション詳細" + +#: website/templates/profile/oauth_app_detail.mako:16 +msgid "Return to list of registered applications" +msgstr "登録済みアプリケーションのリストに戻る" + +#: website/templates/profile/oauth_app_detail.mako:25 +msgid "The unique identifier for the application. May be seen publicly by others." +msgstr "アプリケーションの一意の識別子。 他人に公開される可能性があります。" + +#: website/templates/profile/oauth_app_detail.mako:32 +msgid "" +"The client secret is known only to you and the GakuNin RDM. Do not " +"display or expose this information." +msgstr "クライアントシークレットは、あなたとGakuNin RDMのみが知っています。 この情報を表示または公開しないでください。" + +#: website/templates/profile/oauth_app_detail.mako:39 +msgid "Hide" +msgstr "隠す" + +#: website/templates/profile/oauth_app_detail.mako:40 +msgid "Show" +msgstr "表示する" + +#: website/templates/profile/oauth_app_detail.mako:42 +msgid "Reset Secret" +msgstr "シークレットをリセット" + +#: website/templates/profile/oauth_app_detail.mako:44 +msgid "" +"Resetting the client secret will render your application unusable until " +"it is updated with the new client secret, and all users must reauthorize " +"access. Previously issued access tokens will no longer work." +msgstr "" +"クライアントシークレットをリセットすると、新しいクライアントシークレットで更新されるまでアプリケーションが使用できなくなり、すべてのユーザーがアクセスを再認証する必要があります。" +" 以前に発行されたアクセストークンは機能しなくなります。" + +#: website/templates/profile/oauth_app_detail.mako:48 +msgid "Deactivate application" +msgstr "非アクティブアプリケーション" + +#: website/templates/profile/oauth_app_detail.mako:54 +msgid "Application name" +msgstr "アプリケーション名" + +#: website/templates/profile/oauth_app_detail.mako:60 +msgid "Project homepage URL" +msgstr "プロジェクトホームページURL" + +#: website/templates/profile/oauth_app_detail.mako:66 +msgid "Application description" +msgstr "アプリケーションの説明" + +#: website/templates/profile/oauth_app_detail.mako:72 +msgid "Authorization callback URL" +msgstr "認証コールバックURL" + +#: website/templates/profile/oauth_app_detail.mako:86 +msgid "Register" +msgstr "登録" + +#: website/templates/profile/oauth_app_list.mako:2 +#: website/templates/profile/oauth_app_list.mako:15 +msgid "Developer Applications" +msgstr "開発者向けアプリケーション" + +#: website/templates/profile/oauth_app_list.mako:17 +msgid "New application" +msgstr "新しいアプリケーション登録" + +#: website/templates/profile/oauth_app_list.mako:22 +msgid "" +"The GakuNin RDM allows third-party web applications to connect to the " +"GakuNin RDM on behalf of other users via the OAuth 2.0 web application " +"flow." +msgstr "" +"GakuNin RDMを使用すると、サードパーティのWebアプリケーションがOAuth 2.0 " +"Webアプリケーションフローを介して他のユーザーに代わってGakuNin RDMに接続できます。" + +#: website/templates/profile/oauth_app_list.mako:24 +msgid "" +"You have not registered any applications that can connect to the GakuNin " +"RDM on behalf of other users." +msgstr "他のユーザーに代わってGakuNin RDMに接続できるアプリケーションを登録していません。" + +#: website/templates/profile/oauth_app_list.mako:26 +msgid "" +"You have registered the following applications that can connect to the " +"GakuNin RDM on behalf of other users:" +msgstr "他のユーザーに代わってGakuNin RDMに接続できる次のアプリケーションを登録しました。" + +#: website/templates/profile/oauth_app_list.mako:31 +msgid "Application" +msgstr "アプリケーション" + +#: website/templates/profile/oauth_app_list.mako:34 +#: website/templates/profile/personal_tokens_list.mako:34 +msgid "Deactivate" +msgstr "非アクティブ" + +#: website/templates/profile/oauth_app_list.mako:43 +msgid "Client ID:" +msgstr "クライアントID" + +#: website/templates/profile/personal_tokens_detail.mako:2 +msgid "Personal Token Detail" +msgstr "パーソナルトークンの詳細" + +#: website/templates/profile/personal_tokens_detail.mako:16 +msgid "Return to list of registered tokens" +msgstr "登録済みトークンのリストに戻る" + +#: website/templates/profile/personal_tokens_detail.mako:25 +msgid "Token name:" +msgstr "トークン名" + +#: website/templates/profile/personal_tokens_detail.mako:25 +msgid "What this token is for." +msgstr "このトークンの目的" + +#: website/templates/profile/personal_tokens_detail.mako:31 +msgid "Scopes:" +msgstr "スコープ" + +#: website/templates/profile/personal_tokens_detail.mako:32 +msgid "Scopes limit access for personal access tokens." +msgstr "スコープは、個人アクセストークンのアクセスを制限します。" + +#: website/templates/profile/personal_tokens_detail.mako:51 +msgid "Create" +msgstr "作成" + +#: website/templates/profile/personal_tokens_detail.mako:65 +msgid "This is the only time your token will be displayed." +msgstr "画面を離れると、トークンは二度と表示されません" + +#: website/templates/profile/personal_tokens_detail.mako:66 +msgid "Token ID" +msgstr "トークンID" + +#: website/templates/profile/personal_tokens_detail.mako:67 +msgid "ID used to authenticate with this token. This will be shown only once." +msgstr "このトークンでの認証に使用されるID。 これは一度だけ表示されます。" + +#: website/templates/profile/personal_tokens_detail.mako:70 +msgid "Copy to clipboard" +msgstr "クリップボードにコピー" + +#: website/templates/profile/personal_tokens_list.mako:2 +#: website/templates/profile/personal_tokens_list.mako:15 +#: website/templates/profile/personal_tokens_list.mako:31 +msgid "Personal Access Tokens" +msgstr "パーソナルアクセストークン" + +#: website/templates/profile/personal_tokens_list.mako:17 +msgid "New token" +msgstr "新規トークン" + +#: website/templates/profile/personal_tokens_list.mako:22 +msgid "" +"Personal access tokens function like ordinary OAuth access tokens. They " +"can be used to authenticate to the API." +msgstr "パーソナルアクセストークンは、通常のOAuthアクセストークンのように機能します。 APIの認証に使用できます。" + +#: website/templates/profile/personal_tokens_list.mako:24 +msgid "" +"You have not created any access tokens that can connect to the GakuNin " +"RDM." +msgstr "GakuNin RDMに接続できるアクセストークンを作成していません。" + +#: website/templates/profile/personal_tokens_list.mako:26 +msgid "You have generated the following personal access tokens:" +msgstr "次のパーソナルアクセストークンを生成しました。" + +#: website/templates/profile/settings.mako:11 +msgid "View your profile" +msgstr "プロフィールを表示" + +#: website/templates/profile/settings.mako:38 +#: website/templates/project/contributors.mako:182 +#: website/templates/project/contributors.mako:229 +#: website/templates/project/modal_add_contributor.mako:216 +msgid "Name" +msgstr "名前" + +#: website/templates/project/addons.mako:14 +#: website/templates/project/addons.mako:33 +msgid "Select Add-ons" +msgstr "アドオンを選択" + +#: website/templates/project/addons.mako:15 +#: website/templates/project/addons.mako:111 +msgid "Configure Add-ons" +msgstr "アドオンを構成" + +#: website/templates/project/addons.mako:38 +msgid "" +"Sync your projects with external services to help stay connected and " +"organized. Select a category and browse the options." +msgstr "プロジェクトを外部サービスと同期して、接続と整理を維持します。 カテゴリーを選択し、オプションを参照します。" + +#: website/templates/project/addons.mako:44 +msgid "Categories" +msgstr "カテゴリー" + +#: website/templates/project/addons.mako:47 +msgid "Search..." +msgstr "検索する..." + +#: website/templates/project/addons.mako:56 +msgid "All" +msgstr "すべて" + +#: website/templates/project/addons.mako:82 +msgid "(This is a default addon)" +msgstr "(これは標準ストレージです)" + +#: website/templates/project/addons.mako:84 +msgid "Disable" +msgstr "無効にする" + +#: website/templates/project/addons.mako:86 +msgid "Enable" +msgstr "有効にする" + +#: website/templates/project/addons.mako:128 +msgid "Don't see your GitHub organization repositories?" +msgstr "GitHub組織のリポジトリが表示されませんか?" + +#: website/templates/project/addons.mako:130 +msgid "You may need to reauthorize your GitHub access token." +msgstr "GitHubアクセストークンの再認証が必要になる場合があります。" + +#: website/templates/project/addons.mako:131 +#, python-format +msgid "" +"Follow the steps in the help guide to resolve the " +"issue." +msgstr "ヘルプガイドの手順に従って問題を解決してください。" + +#: website/templates/project/addons.mako:135 +#, python-format +msgid "" +"Please contact rdm_support@nii.ac.jp if you " +"have questions." +msgstr "ご質問がある場合は、rdm_support@nii.ac.jpまでご連絡ください。" + +#: website/templates/project/contributors.mako:13 +msgid "Filter by name" +msgstr "氏名でフィルタ" + +#: website/templates/project/contributors.mako:14 +#: website/templates/project/contributors.mako:186 +#: website/templates/project/contributors.mako:232 +#: website/templates/project/modal_add_contributor.mako:227 +msgid "Permissions" +msgstr "権限" + +#: website/templates/project/contributors.mako:17 +#: website/templates/project/contributors.mako:189 +#: website/templates/project/contributors.mako:235 +#: website/templates/project/modal_add_contributor.mako:230 +msgid "Permission Information" +msgstr "権限管理の情報" + +#: website/templates/project/contributors.mako:24 +#: website/templates/project/contributors.mako:75 +msgid "Administrator" +msgstr "管理者" + +#: website/templates/project/contributors.mako:27 +#: website/templates/project/contributors.mako:76 +msgid "Read + Write" +msgstr "読込み / 書込み" + +#: website/templates/project/contributors.mako:30 +#: website/templates/project/contributors.mako:77 +msgid "Read" +msgstr "読込み" + +#: website/templates/project/contributors.mako:33 +#: website/templates/project/contributors.mako:196 +#: website/templates/project/contributors.mako:242 +#: website/templates/project/modal_add_contributor.mako:218 +msgid "Bibliographic Contributor" +msgstr "目録表示メンバー" + +#: website/templates/project/contributors.mako:36 +#: website/templates/project/contributors.mako:199 +#: website/templates/project/contributors.mako:245 +#: website/templates/project/modal_add_contributor.mako:221 +msgid "Bibliographic Contributor Information" +msgstr "目録表示メンバーの情報" + +#: website/templates/project/contributors.mako:43 +msgid "Bibliographic" +msgstr "目録で表示" + +#: website/templates/project/contributors.mako:46 +msgid "Non-Bibliographic" +msgstr "目録で非表示" + +#: website/templates/project/contributors.mako:63 +msgid "Drag and drop contributors to change listing order." +msgstr "メンバーをドラッグ&ドロップして、リストの順序を変更します。" + +#: website/templates/project/contributors.mako:106 +msgid "No contributors found" +msgstr "メンバーが見つかりません" + +#: website/templates/project/contributors.mako:111 +msgid "Admins on Parent Projects" +msgstr "親プロジェクトの管理者" + +#: website/templates/project/contributors.mako:135 +msgid "No administrators from parent project found." +msgstr "親プロジェクトの管理者が見つかりません" + +#: website/templates/project/contributors.mako:143 +msgid "Requests for Access" +msgstr "アクセスのリクエスト" + +#: website/templates/project/contributors.mako:144 +msgid "The following users have requested access to this project." +msgstr "次のユーザーがこのプロジェクトへのアクセスをリクエストしています。" + +#: website/templates/project/contributors.mako:162 +#: website/templates/project/settings.mako:29 +#: website/templates/project/settings.mako:202 +msgid "View-only Links" +msgstr "参照用リンク" + +#: website/templates/project/contributors.mako:167 +#: website/templates/project/settings.mako:206 +msgid "" +"Create a link to share this project so those who have the link can " +"view—but not edit—the project." +msgstr "このプロジェクトを共有するリンクを作成して、リンクを知っているユーザーがプロジェクトを表示できるようにします。(編集はできません)" + +#: website/templates/project/contributors.mako:396 +msgid "Discard Changes" +msgstr "変更を破棄" + +#: website/templates/project/contributors.mako:397 +msgid "Save Changes" +msgstr "変更を保存" + +#: website/templates/project/files.mako:8 +#: website/templates/project/project.mako:449 +msgid "Click on a storage provider or drag and drop to upload" +msgstr "ストレージプロバイダーをクリックするか、ドラッグ&ドロップしてファイルをアップロードします" + +#: website/templates/project/modal_add_contributor.mako:20 +msgid "Search by name or user profile information" +msgstr "名前またはユーザープロフィール情報で検索する" + +#: website/templates/project/modal_add_contributor.mako:25 +msgid "Invite new contributor by e-mail" +msgstr "メールで新規メンバーを招待する" + +#: website/templates/project/modal_add_contributor.mako:46 +msgid "Results" +msgstr "結果" + +#: website/templates/project/modal_add_contributor.mako:47 +msgid "Add all" +msgstr "全て追加する" + +#: website/templates/project/modal_add_contributor.mako:63 +msgid "Add contributor" +msgstr "メンバーを追加" + +#: website/templates/project/modal_add_contributor.mako:66 +msgid "Already added" +msgstr "追加済" + +#: website/templates/project/modal_add_contributor.mako:164 +#: website/templates/project/modal_add_contributor.mako:254 +msgid "(unregistered)" +msgstr "(未登録)" + +#: website/templates/project/modal_add_contributor.mako:181 +#, python-format +msgid "" +"Add as an " +"unregistered contributor." +msgstr "" +"未登録のメンバーとしてを追加します。" + +#: website/templates/project/modal_add_contributor.mako:186 +msgid "Searching contributors..." +msgstr "メンバーを検索しています..." + +#: website/templates/project/modal_add_contributor.mako:190 +msgid "No results found. Try a more specific search." +msgstr "結果が見つかりません。より具体的な検索を試してください。" + +#: website/templates/project/modal_add_contributor.mako:193 +msgid "No results found. Try a more specific search" +msgstr "結果が見つかりません。より具体的な検索を試してください" + +#: website/templates/project/modal_add_contributor.mako:195 +msgid "or" +msgstr "または" + +#: website/templates/project/modal_add_contributor.mako:196 +#, python-format +msgid "" +"add as an " +"unregistered contributor." +msgstr "" +"未登録のメンバーとしてを追加します。" + +#: website/templates/project/modal_add_contributor.mako:200 +msgid "" +"It looks like you are trying to search by email address. Please try your " +"search again using your collaborator's name. You will be able to add " +"users without GakuNin RDM accounts as unregistered contributors." +msgstr "" +"メールアドレスで検索しようとしているようです。 共同編集者の名前を使用して検索を再試行してください。 GakuNin " +"RDMアカウントを持たないユーザーを未登録のメンバーとして追加できます。" + +#: website/templates/project/modal_add_contributor.mako:207 +msgid "Adding" +msgstr "追加中" + +#: website/templates/project/modal_add_contributor.mako:208 +msgid "Remove all" +msgstr "全て削除" + +#: website/templates/project/modal_add_contributor.mako:241 +msgid "Remove contributor" +msgstr "メンバーを削除" + +#: website/templates/project/modal_add_contributor.mako:281 +msgid "Adding contributor(s)" +msgstr "メンバーを追加中" + +#: website/templates/project/modal_add_contributor.mako:289 +msgid "" +"You can also add the contributor(s) to any components on which you are an" +" admin." +msgstr "管理者であるコンポーネントにメンバーを追加することもできます。" + +#: website/templates/project/modal_add_contributor.mako:294 +#: website/templates/project/modal_generate_private_link.mako:71 +msgid "Select all" +msgstr "全て選択" + +#: website/templates/project/modal_add_contributor.mako:296 +msgid "Select none" +msgstr "何も選択しない" + +#: website/templates/project/modal_add_contributor.mako:309 +msgid "Loading projects and components..." +msgstr "プロジェクトとコンポーネントの読み込み..." + +#: website/templates/project/modal_add_contributor.mako:320 +msgid "Full Name" +msgstr "氏名" + +#: website/templates/project/modal_add_contributor.mako:322 +msgid "Full name" +msgstr "氏名" + +#: website/templates/project/modal_add_contributor.mako:325 +#: website/templates/project/modal_add_contributor.mako:327 +msgid "Email" +msgstr "メールアドレス" + +#: website/templates/project/modal_add_contributor.mako:330 +msgid "We will notify the user that they have been added to your project." +msgstr "プロジェクトに追加されたことをユーザーに通知します。" + +#: website/templates/project/modal_add_contributor.mako:343 +#: website/templates/project/modal_add_contributor.mako:355 +#: website/templates/project/modal_remove_contributor.mako:112 +#: website/templates/project/nodes_delete.mako:87 +msgid "Back" +msgstr "戻る" + +#: website/templates/project/modal_add_contributor.mako:351 +msgid "Next" +msgstr "次へ" + +#: website/templates/project/modal_add_pointer.mako:8 +msgid "Link other GakuNin RDM projects" +msgstr "他のGakuNin RDMプロジェクトをリンク" + +#: website/templates/project/modal_add_pointer.mako:15 +msgid "Search projects" +msgstr "プロジェクトの検索" + +#: website/templates/project/modal_add_pointer.mako:43 +msgid "Projects" +msgstr "プロジェクト" + +#: website/templates/project/modal_add_pointer.mako:55 +msgid "Results: All Projects" +msgstr "結果:全てのプロジェクト" + +#: website/templates/project/modal_add_pointer.mako:56 +msgid "Results: My Projects" +msgstr "結果:マイプロジェクト" + +#: website/templates/project/modal_add_pointer.mako:96 +msgid "Done" +msgstr "決定" + +#: website/templates/project/modal_generate_private_link.mako:5 +msgid "Create a new link to share your project" +msgstr "プロジェクトを共有するための新しいリンクを作成します" + +#: website/templates/project/modal_generate_private_link.mako:13 +msgid "Link name" +msgstr "リンク名" + +#: website/templates/project/modal_generate_private_link.mako:18 +msgid "Optional link name (e.g., For peer review, Sharing data, Share project)" +msgstr "オプションのリンク名(例:査読、データの共有、プロジェクトの共有)" + +#: website/templates/project/modal_generate_private_link.mako:30 +msgid "" +"Anonymize contributor list for this link (e.g., for " +"blind peer review)." +msgstr "このリンクの投稿者リストを匿名化します(例:ブラインドピアレビュー用)。" + +#: website/templates/project/modal_generate_private_link.mako:32 +msgid "" +"Ensure the wiki pages, files, registration forms and add-ons do not " +"contain identifying information." +msgstr "Wikiページ、ファイル、登録フォーム、アドオンに識別情報が含まれていないことを確認してください。" + +#: website/templates/project/modal_generate_private_link.mako:39 +msgid "" +"Which components would you like to associate with this " +"link?" +msgstr "このリンクにどのコンポーネントを関連付けますか?" + +#: website/templates/project/modal_generate_private_link.mako:40 +msgid "" +"Anyone with the private link can view—but not edit—the" +" components associated with the link." +msgstr "プライベートリンクを持つユーザーは誰でも、リンクに関連付けられているコンポーネントを表示できますが、編集することはできません。" + +#: website/templates/project/modal_generate_private_link.mako:51 +#, python-format +msgid "(current component, public)" +msgstr "(現在のコンポーネント、公開)" + +#: website/templates/project/modal_generate_private_link.mako:59 +msgid "Parent needs to be checked" +msgstr "親を確認する必要があります" + +#: website/templates/project/modal_generate_private_link.mako:62 +msgid "(public)" +msgstr "(公開)" + +#: website/templates/project/modal_generate_private_link.mako:74 +msgid "De-select all" +msgstr "全選択解除" + +#: website/templates/project/modal_remove_contributor.mako:15 +#, python-format +msgid "" +"Do you want to remove from" +" , or from and every component in it?" +msgstr "" +"をから、またはとその中のすべてのコンポーネントから削除しますか?" + +#: website/templates/project/modal_remove_contributor.mako:21 +#, python-format +msgid "" +"Remove from" +" ." +msgstr "からを削除します。" + +#: website/templates/project/modal_remove_contributor.mako:28 +#, python-format +msgid "" +"Remove from" +" and every" +" component in it." +msgstr "" +"をおよびその中のすべてのコンポーネントから削除します。" + +#: website/templates/project/modal_remove_contributor.mako:37 +#, python-format +msgid "Remove from ?" +msgstr "からを削除しますか?" + +#: website/templates/project/modal_remove_contributor.mako:48 +#, python-format +msgid "" +" " +"will be removed from the following projects and/or components." +msgstr "は、以下のプロジェクトおよび/またはコンポーネントから削除されます。" + +#: website/templates/project/modal_remove_contributor.mako:65 +#, python-format +msgid "" +" " +"cannot be removed from the following projects and/or components." +msgstr "は、以下のプロジェクトやコンポーネントから削除できません。" + +#: website/templates/project/modal_remove_contributor.mako:81 +#, python-format +msgid "" +" cannot be removed " +"as a contributor. You need at least one administrator, bibliographic " +"contributor, and registered user." +msgstr "" +"はメンバーとして削除できません。少なくとも1人の管理者、目録表示メンバー、および登録ユーザーが必要です。" + +#: website/templates/project/modal_remove_contributor.mako:82 +msgid "" +"data-bind=\"text:removeSelf() ? 'You' : " +"contributorToRemove()['fullname']\"" +msgstr "" +"data-bind=\"text:removeSelf() ? 'あなた' : " +"contributorToRemove()['fullname']\"" + +#: website/templates/project/modal_remove_contributor.mako:85 +msgid "" +"Please save or discard your existing changes before removing a " +"contributor." +msgstr "メンバーを削除する前に、既存の変更を保存または破棄してください。" + +#: website/templates/project/nodes_delete.mako:66 +#: website/templates/project/nodes_delete.mako:77 +msgid "Type the following to continue:" +msgstr "次の文字列を入力して続行します:" + +#: website/templates/project/project.mako:22 +msgid "Private Project" +msgstr "非公開プロジェクト" + +#: website/templates/project/project.mako:45 +msgid "Private" +msgstr "非公開" + +#: website/templates/project/project.mako:49 +msgid "Make Public" +msgstr "公開にする" + +#: website/templates/project/project.mako:58 +msgid "Make Private" +msgstr "非公開にする" + +#: website/templates/project/project.mako:60 +msgid "Public" +msgstr "公開" + +#: website/templates/project/project.mako:65 +msgid "Log in or create an account to duplicate this project" +msgstr "このプロジェクトを複製するには、ログインするかアカウントを作成してください" + +#: website/templates/project/project.mako:100 +#, python-format +msgid "View Forks (%(forkCount)s)" +msgstr "フォークを表示(%(forkCount)s)" + +#: website/templates/project/project.mako:115 +msgid "Bookmark" +msgstr "ブックマーク" + +#: website/templates/project/project.mako:118 +msgid "Remove from bookmarks" +msgstr "ブックマークから削除" + +#: website/templates/project/project.mako:127 +msgid "Create view-only link" +msgstr "参照用リンクを作成" + +#: website/templates/project/project.mako:137 +msgid "Share" +msgstr "共有" + +#: website/templates/project/project.mako:150 +msgid "Log in to request access" +msgstr "ログインしてアクセスをリクエスト" + +#: website/templates/project/project.mako:165 +msgid "Contributors:" +msgstr "メンバー:" + +#: website/templates/project/project.mako:169 +msgid "Anonymous Contributors" +msgstr "匿名メンバー" + +#: website/templates/project/project.mako:192 +#: website/templates/project/settings.mako:488 +msgid "Affiliated Institutions:" +msgstr "所属機関:" + +#: website/templates/project/project.mako:218 +#, python-format +msgid "" +"Forked from %(forkedFromDisplayAbsoluteUrl)s on" +" " +msgstr "" +"%(forkedFromDisplayAbsoluteUrl)sからフォーク()" + +#: website/templates/project/project.mako:225 +msgid "Date registered:" +msgstr "登録日" + +#: website/templates/project/project.mako:230 +msgid "Date created:" +msgstr "作成日時" + +#: website/templates/project/project.mako:233 +msgid "| Last Updated:" +msgstr "| 最終更新日時" + +#: website/templates/project/project.mako:248 +msgid "Creating DOI. Please wait..." +msgstr "DOIを作成しています。お待ち下さい..." + +#: website/templates/project/project.mako:254 +msgid "Create DOI" +msgstr "DOIを作成" + +#: website/templates/project/project.mako:259 +#: website/templates/project/settings.mako:81 +msgid "Category:" +msgstr "カテゴリー:" + +# 変数のためmsgstrを""にしておく +#: website/templates/project/project.mako:260 +msgid "category" +msgstr "" + +#: website/templates/project/project.mako:265 +#: website/templates/project/settings.mako:107 +msgid "Description:" +msgstr "説明:" + +#: website/templates/project/project.mako:282 +msgid "License:" +msgstr "ライセンス:" + +# 変数のためmsgstrを""にしておく +#: website/templates/project/project.mako:283 +msgid "license" +msgstr "" + +#: website/templates/project/project.mako:291 +msgid "View Registration Form" +msgstr "登録フォームを表示" + +#: website/templates/project/project.mako:296 +msgid "View Registration Forms" +msgstr "登録フォームを表示" + +#: website/templates/project/project.mako:341 +msgid "Type:" +msgstr "タイプ:" + +#: website/templates/project/project.mako:345 +#: website/templates/project/project.mako:396 +msgid "Status:" +msgstr "ステータス:" + +#: website/templates/project/project.mako:349 +msgid "Volume:" +msgstr "ボリューム:" + +#: website/templates/project/project.mako:353 +msgid "Issue:" +msgstr "イシュー:" + +#: website/templates/project/project.mako:357 +msgid "Program Area:" +msgstr "プログラムエリア" + +#: website/templates/project/project.mako:363 +msgid "Subjects:" +msgstr "学科:" + +#: website/templates/project/project.mako:399 +msgid "Withdrawn" +msgstr "取り下げ" + +#: website/templates/project/project.mako:408 +msgid "" +"This {preprint_word} is publicly available and searchable but is subject " +"to removal by a moderator." +msgstr "この{preprint_word}は一般公開されており検索可能ですが、モデレーターによる削除の対象となります。" + +#: website/templates/project/project.mako:411 +msgid "" +"This {preprint_word} is not publicly available or searchable until " +"approved by a moderator." +msgstr "この{preprint_word}は、モデレーターによって承認されるまで公開または検索できません。" + +#: website/templates/project/project.mako:415 +msgid "This {preprint_word} is publicly available and searchable." +msgstr "この{preprint_word}は公開されており、検索可能です。" + +#: website/templates/project/project.mako:417 +msgid "This {preprint_word} is not publicly available or searchable." +msgstr "この{preprint_word}は一般公開も検索もできません。" + +#: website/templates/project/project.mako:461 +#: website/templates/project/view_file.mako:57 +msgid "Loading files..." +msgstr "ファイルをロード中" + +#: website/templates/project/project.mako:502 +#: website/templates/util/render_addon_widget.mako:70 +msgid "Citation" +msgstr "引用" + +#: website/templates/project/addon/citations_widget.mako:16 +#: website/templates/project/project.mako:514 +#: website/templates/util/render_addon_widget.mako:136 +msgid "Loading citations..." +msgstr "引用をロード中..." + +#: website/templates/project/project.mako:519 +msgid "Customize" +msgstr "カスタマイズ" + +#: website/templates/project/project.mako:527 +msgid "Chicago" +msgstr "シカゴ" + +#: website/templates/project/project.mako:531 +msgid "Get more citations" +msgstr "より多くの引用スタイルを取得" + +#: website/templates/project/project.mako:549 +#, python-format +msgid "" +"
                                          Cite as:
                                          " +"" +msgstr "として
                                          引用:
                                          " + +#: website/templates/project/project.mako:560 +msgid "Enter custom citation" +msgstr "カスタム引用の入力" + +#: website/templates/project/project.mako:601 +msgid "Recent Activity" +msgstr "最近の活動" + +#: website/templates/project/project.mako:602 +msgid "Clear Filters" +msgstr "フィルタをクリア" + +#: website/templates/project/project.mako:603 +msgid "Refresh" +msgstr "更新" + +#: website/templates/project/project.mako:635 +msgid "Loading logs..." +msgstr "ログをロード中..." + +#: website/templates/project/project.mako:641 +msgid "Download as file" +msgstr "ファイルをダウンロード" + +#: website/templates/project/project.mako:642 +#: website/templates/project/timestamp.mako:206 +msgid "Download" +msgstr "ダウンロード" + +#: website/templates/project/project.mako:655 +msgid "Components" +msgstr "コンポーネント" + +#: website/templates/project/project.mako:659 +msgid "Add Component" +msgstr "コンポーネントを追加" + +#: website/templates/project/project.mako:661 +msgid "Link Projects" +msgstr "プロジェクトをリンク" + +#: website/templates/project/project.mako:671 +msgid "Add components to organize your project." +msgstr "コンポーネントを追加して、プロジェクトを整理します。" + +#: website/templates/project/project_header.mako:16 +msgid "Component" +msgstr "コンポーネント" + +#: website/templates/project/project_header.mako:16 +msgid "Navigation" +msgstr "ナビゲーション" + +#: website/templates/project/project_header.mako:61 +msgid "Analytics" +msgstr "分析" + +#: website/templates/project/project_header.mako:67 +msgid "Registrations" +msgstr "登録" + +#: website/templates/project/project_header.mako:76 +msgid "Add-ons" +msgstr "アドオン" + +#: website/templates/project/project_header.mako:96 +#: website/templates/project/timestamp.mako:2 +msgid "Timestamp" +msgstr "証跡管理" + +#: website/templates/project/project_header.mako:128 +msgid "" +"This file is part of a registration and is being shown in its archived " +"version (and cannot be altered)." +msgstr "このファイルは登録の一部であり、アーカイブバージョンで表示されています(変更できません)。" + +#: website/templates/project/project_header.mako:129 +#, python-format +msgid "" +"The active file is viewable from within the live %(nodeType)s." +msgstr "" +"アクティブなファイルは、ライブ%(nodeType)s内から表示できます。" + +#: website/templates/project/project_header.mako:131 +#, python-format +msgid "" +"This registration is a frozen, non-editable version of this %(nodeType)s" +msgstr "この登録は、この%(nodeType)sの凍結された編集不可バージョンです" + +#: website/templates/project/project_header.mako:135 +#, python-format +msgid "" +"This is a pending registration of this " +"%(nodeType)s, awaiting approval from project administrators. This " +"registration will be final when all project administrators approve the " +"registration or 48 hours pass, whichever comes first." +msgstr "" +"これはこの%(nodeType)sの保留中の登録であり、プロジェクト管理者からの承認を待っています。この登録は、すべてのプロジェクト管理者が登録または48時間のパスのいずれか早い方を承認したときに最終となります。" + +#: website/templates/project/project_header.mako:141 +#: website/templates/project/project_header.mako:173 +msgid "Cancel registration" +msgstr "登録をキャンセル" + +#: website/templates/project/project_header.mako:159 +#, python-format +msgid "This %(nodeType)s is currently pending withdrawal." +msgstr "この%(nodeType)sは現在、保留中です。" + +#: website/templates/project/project_header.mako:163 +#, python-format +msgid "" +"This %(nodeType)s is a withdrawn registration of this %(nodeType)s; the content of the " +"%(nodeType)s has been taken down for the reason(s) stated below." +msgstr "" +"この%(nodeType)sは、この%(nodeType)sの登録の撤回です。%(nodeType)sのコンテンツは、下記の理由により削除されました。" + +#: website/templates/project/project_header.mako:168 +#, python-format +msgid "" +"This %(nodeType)s is currently pending registration, awaiting approval " +"from project administrators. This registration will be final and enter " +"the embargo period when all project administrators approve the " +"registration or 48 hours pass, whichever comes first. The embargo will " +"keep the registration private until the embargo period ends." +msgstr "この%(nodeType)sは現在登録を保留しており、プロジェクト管理者からの承認を待っています。この登録は最終的なものであり、すべてのプロジェクト管理者が登録を承認するか、48時間のパスのいずれか早いほうを承認した時点で禁止期間に入ります。禁止措置は、禁止期間が終了するまで登録を非公開にします。" + +#: website/templates/project/project_header.mako:182 +#, python-format +msgid "" +"This registration is currently embargoed. It will remain private until " +"its embargo end date, %(embargoEndDate)s." +msgstr "現在、この登録は禁止されています。 禁止終了日(%(embargoEndDate)s)まで非公開のままです。" + +#: website/templates/project/project_header.mako:188 +#, python-format +msgid "" +"This %(nodeType)s contains supplemental materials for a preprint, but has" +" been made Private. Make your supplemental materials discoverable by " +"making this %(nodeType)s Public." +msgstr "この%(nodeType)sにはプレプリントの補足資料が含まれていますが、非公開になっています。この%(nodeType)sを公開することで、補足資料を見つけやすくします。" + +#: website/templates/project/project_header.mako:192 +#, python-format +msgid "" +"This %(nodeType)s is being viewed through an anonymized, view-only link. " +"If you want to view it as a contributor, click here." +msgstr "" +"この%(nodeType)sは、匿名化された参照専用リンクを介して表示されています。メンバーとして表示する場合は、こちらをクリックしてください。" + +#: website/templates/project/project_header.mako:196 +#, python-format +msgid "" +"This %(nodeType)s is being viewed through a private, view-only link. " +"Anyone with the link can view this project. Keep the link safe." +msgstr "" +"この%(nodeType)sは、プライベートな参照専用リンクを介して表示されています。リンクを知っている全員がこのプロジェクトを閲覧できます。 " +"リンクを安全に保ちます。" + +# 変数のためmsgstrを""にしておく +#: website/templates/project/settings.mako:17 +#: website/templates/project/settings.mako:76 +#: website/templates/project/settings.mako:150 +#: website/templates/project/settings.mako:163 +#: website/templates/util/render_node.mako:18 +msgid "node_type" +msgstr "" + +#: website/templates/project/settings.mako:21 +#: website/templates/project/settings.mako:178 +msgid "Storage Location" +msgstr "ストレージロケーション" + +#: website/templates/project/settings.mako:33 +#: website/templates/project/settings.mako:225 +msgid "Access Requests" +msgstr "アクセスリクエスト" + +#: website/templates/project/settings.mako:39 +#: website/templates/project/settings.mako:318 +msgid "Commenting" +msgstr "コメント" + +#: website/templates/project/settings.mako:42 +#: website/templates/project/settings.mako:359 +msgid "Email Notifications" +msgstr "メール通知" + +#: website/templates/project/settings.mako:44 +#: website/templates/project/settings.mako:391 +msgid "Redirect Link" +msgstr "リダイレクトリンク" + +#: website/templates/project/settings.mako:51 +msgid "Withdraw Public Registration" +msgstr "公開登録を取り下げる" + +#: website/templates/project/settings.mako:57 +#: website/templates/project/settings.mako:469 +msgid "Project Affiliation / Branding" +msgstr "プロジェクト管理機関" + +#: website/templates/project/settings.mako:82 +msgid "(For descriptive purposes)" +msgstr "説明のため" + +#: website/templates/project/settings.mako:87 +msgid "Uncategorized" +msgstr "未分類" + +#: website/templates/project/settings.mako:114 +msgid "Select Timestamp Function:" +msgstr "タイムスタンプ機能を選択:" + +#: website/templates/project/settings.mako:117 +#: website/templates/project/settings.mako:122 +msgid "Timestamp only" +msgstr "タイムスタンプのみ" + +#: website/templates/project/settings.mako:133 +msgid "Save changes" +msgstr "変更を保存" + +#: website/templates/project/settings.mako:141 +msgid "" +"A project cannot be deleted if it has any components within it." +" To delete a parent project, you must " +"first delete all child components by " +"visiting their settings pages." +msgstr "プロジェクトにコンポーネントがある場合、プロジェクトを削除することはできません。親プロジェクトを削除するには、まず設定ページにアクセスして、すべての子コンポーネントを削除する必要があります。" + +#: website/templates/project/settings.mako:150 +#: website/templates/project/settings.mako:163 +#, python-format +msgid "Delete %(nodeType)s" +msgstr "%(nodeType)sを削除" + +#: website/templates/project/settings.mako:156 +#, python-format +msgid "" +"A project which is related to a external group (%(group)s) cannot be " +"deleted." +msgstr "外部グループ(%(group)s)に関連するプロジェクトは削除できません。" + +#: website/templates/project/settings.mako:185 +msgid "Storage location cannot be changed after project is created." +msgstr "プロジェクトの作成後、保存場所を変更することはできません。" + +#: website/templates/project/settings.mako:237 +msgid "Allow users to request access to this project." +msgstr "ユーザーがこのプロジェクトへのアクセスをリクエストできるようにします。" + +#: website/templates/project/settings.mako:270 +#, python-format +msgid "Enable the wiki in %(title)s." +msgstr "%(title)s内でウィキを有効にする" + +#: website/templates/project/settings.mako:283 +msgid "Configure" +msgstr "構成" + +#: website/templates/project/settings.mako:286 +#, python-format +msgid "Control who can edit the wiki of %(title)s" +msgstr "%(title)s内のWikiを編集できるユーザーを制御します" + +#: website/templates/project/settings.mako:288 +#, python-format +msgid "" +"Control who can edit your wiki. To allow all GakuNin RDM users to edit " +"the wiki, %(title)s must be public." +msgstr "" +"Wikiを編集できるユーザーを制御します。 すべてのGakuNin " +"RDMユーザーがwikiを編集できるようにするには、%(title)sを公開する必要があります。" + +#: website/templates/project/settings.mako:298 +msgid "Loading wiki settings..." +msgstr "ウィキの設定をロード中..." + +#: website/templates/project/settings.mako:328 +msgid "Only contributors can post comments" +msgstr "メンバーのみがコメントを投稿できます" + +#: website/templates/project/settings.mako:334 +#, python-format +msgid "When the %(nodeType)s is public, any GakuNin RDM user can post comments" +msgstr "%(nodeType)sが公開の場合、GakuNin RDMユーザーはコメントを投稿できます" + +#: website/templates/project/settings.mako:363 +msgid "" +"These notification settings only apply to you. They do NOT affect any " +"other contributor on this project." +msgstr "これらの通知設定は自分にのみ適用されます。 このプロジェクトの他のメンバーには影響しません。" + +#: website/templates/project/settings.mako:402 +msgid "Redirect visitors from your project page to an external webpage" +msgstr "訪問者をプロジェクトページから外部Webページにリダイレクトする" + +#: website/templates/project/settings.mako:427 +#: website/templates/project/settings.mako:449 +msgid "Withdraw Registration" +msgstr "登録を取り下げる" + +#: website/templates/project/settings.mako:435 +#, python-format +msgid "" +"Withdrawing children components of a registration is not allowed. Should " +"you wish to withdraw this component, " +"please withdraw its parent registration here." +msgstr "" +"登録の子コンポーネントの撤回は許可されていません。このコンポーネントを撤回する場合は、ここでその親登録を撤回してください。" + +#: website/templates/project/settings.mako:442 +msgid "" +"Withdrawing a registration will remove its content from the GakuNin RDM, " +"but leave basic metadata behind. The " +"title of a withdrawn registration and its contributor list will remain, " +"as will justification or explanation " +"of the withdrawal, should you wish to provide it. Withdrawn" +" registrations will be marked with a " +"withdrawn tag." +msgstr "" +"登録を取り消すと、コンテンツがGakuNin RDMから削除されますが、基本的なメタデータは残されます。 " +"取り下げられた登録のタイトルとそのメンバーリストは、引き取りの正当化または説明と同様に、もしあなたがそれを提供したいなら、残ります。 " +"取り下げられた登録には、取り下げられたタグが付いています。" + +#: website/templates/project/settings.mako:451 +msgid "This registration is already pending withdrawal." +msgstr "この登録は既に取り下げが保留されています。" + +#: website/templates/project/settings.mako:474 +msgid "" +"Contributors with read-only permissions to this project cannot add or " +"remove institutional affiliations." +msgstr "このプロジェクトの参照専用権限を持つメンバーは、所属機関を追加または削除できません。" + +#: website/templates/project/settings.mako:477 +msgid "" +"Projects can be affiliated with institutions that have created GakuNin " +"RDM for Institutions accounts." +msgstr "プロジェクトは、機関向けGakuNin RDMアカウントを作成した機関と提携できます。" + +#: website/templates/project/settings.mako:478 +msgid "This allows:" +msgstr "これにより" + +#: website/templates/project/settings.mako:480 +msgid "institutional logos to be displayed on public projects" +msgstr "公開プロジェクトに表示される機関のロゴ" + +#: website/templates/project/settings.mako:481 +msgid "public projects to be discoverable on specific institutional landing pages" +msgstr "特定の機関のリンク先ページで発見できる公開プロジェクト" + +#: website/templates/project/settings.mako:482 +msgid "single sign-on to the GakuNin RDM with institutional credentials" +msgstr "機関証明書を使用したGakuNin RDMへのシングルサインオン" + +#: website/templates/project/settings.mako:483 +msgid "FAQ" +msgstr "FAQ" + +#: website/templates/project/settings.mako:511 +msgid "Available Institutions:" +msgstr "利用可能な機関:" + +#: website/templates/project/timestamp.mako:10 +msgid "Timestamp Control" +msgstr "証跡管理" + +#: website/templates/project/timestamp.mako:27 +msgid "Timestamp Error" +msgstr "タイムスタンプ管理" + +#: website/templates/project/timestamp.mako:41 +msgid "Start Date" +msgstr "開始日" + +#: website/templates/project/timestamp.mako:47 +msgid "End Date" +msgstr "終了日" + +#: website/templates/project/timestamp.mako:53 +msgid "User" +msgstr "ユーザー" + +#: website/templates/project/timestamp.mako:60 +msgid "Apply" +msgstr "適用" + +#: website/templates/project/timestamp.mako:69 +msgid "Verify" +msgstr "タイムスタンプ確認" + +#: website/templates/project/timestamp.mako:70 +msgid "Request Trusted Timestamp" +msgstr "タイムスタンプを打つ" + +#: website/templates/project/timestamp.mako:81 +msgid "Processing, please wait..." +msgstr "処理しています。お待ちください..." + +#: website/templates/project/timestamp.mako:99 +msgid "per page:" +msgstr "1ページあたり" + +#: website/templates/project/timestamp.mako:122 +msgid "Provider" +msgstr "プロバイダ" + +#: website/templates/project/timestamp.mako:129 +msgid "File Path" +msgstr "ファイルパス" + +#: website/templates/project/timestamp.mako:136 +msgid "Timestamp by" +msgstr "タイムスタンプ押印者" + +#: website/templates/project/timestamp.mako:143 +msgid "Updated at" +msgstr "更新日時" + +#: website/templates/project/timestamp.mako:150 +msgid "Timestamp Verification" +msgstr "タイムスタンプの検証" + +#: website/templates/project/view_file.mako:19 +msgid "Version:" +msgstr "バージョン:" + +#: website/templates/project/view_file.mako:34 +#: website/templates/project/view_file.mako:36 +msgid "Timestamp verification:" +msgstr "タイムスタンプの検証:" + +#: website/templates/project/view_file.mako:52 +msgid "No files" +msgstr "ファイルなし" + +#: website/templates/project/view_file.mako:107 +msgid "Connected to collaborative file editing" +msgstr "共有ファイル編集に接続しました" + +# Notice: ”Save" は別のmsgid "Save"への参照なので文言を揃える +#: website/templates/project/view_file.mako:111 +msgid "" +"This page is currently connected to collaborative file editing. All edits" +" made will be visible to contributors with write permission in " +"real time. Changes will be stored but not published until you " +"click the \"Save\" button." +msgstr "" +"このページは現在、共有ファイル編集に接続されています。 行われたすべての編集は、書き込み許可を持つメンバーにリアルタイムで表示されます。 " +"変更は保存されますが、[保存]ボタンをクリックするまで公開されません。" + +#: website/templates/project/view_file.mako:128 +msgid "Connecting to collaborative file editing" +msgstr "共有ファイル編集へ接続しています" + +#: website/templates/project/view_file.mako:132 +msgid "" +"This page is currently attempting to connect to collaborative file " +"editing. You may continue to make edits." +msgstr "このページは現在、共有ファイル編集に接続しようとしています。 引き続き編集を行うことができます。" + +#: website/templates/project/view_file.mako:148 +msgid "Collaborative file editing is unavailable" +msgstr "共有ファイル編集は利用できません" + +#: website/templates/project/view_file.mako:152 +msgid "" +"Collaborative file editing is currently unavailable. You may continue to " +"make edits." +msgstr "共有ファイル編集は現在利用できません。 引き続き編集を行うことができます。" + +#: website/templates/project/addon/node_settings.mako:15 +msgid "Submit" +msgstr "提出" + +#: website/templates/project/addon/node_settings_default.mako:7 +#, python-format +msgid "authorized by %(ownerName)s" +msgstr "は%(ownerName)sによって認証済みです" + +#: website/templates/project/addon/page.mako:4 +msgid "Add-on" +msgstr "アドオン" + +#: website/templates/project/addon/page.mako:21 +#: website/templates/project/addon/widget.mako:17 +#, python-format +msgid "%(fullname)s add-on is not configured properly." +msgstr "%(fullname)sアドオンが正しく構成されていません。" + +#: website/templates/project/addon/page.mako:23 +#: website/templates/project/addon/widget.mako:19 +#: website/templates/util/render_addon_widget.mako:240 +#, python-format +msgid "Configure this add-on on the add-ons page." +msgstr "アドオンページでこのアドオンを構成します。" + +#: website/templates/util/contributor_list.mako:18 +#, python-format +msgid "%(othersCount)s more" +msgstr "あと%(othersCount)s人" + +#: website/templates/util/oauth_complete.mako:9 +msgid "OAuth Complete" +msgstr "OAuthの完了" + +#: website/templates/util/render_addon_widget.mako:30 +msgid "Read More" +msgstr "続きを読む" + +#: website/templates/util/render_addon_widget.mako:61 +msgid "Dataset" +msgstr "データセット" + +#: website/templates/util/render_addon_widget.mako:64 +msgid "Global ID" +msgstr "グローバルID" + +#: website/templates/util/render_addon_widget.mako:67 +#: website/templates/util/render_addon_widget.mako:68 +msgid "Dataverse" +msgstr "Dataverse" + +#: website/templates/util/render_addon_widget.mako:93 +#, python-format +msgid "" +"This project contains a forward to ." +msgstr "このプロジェクトには、への転送が含まれています。" + +#: website/templates/util/render_addon_widget.mako:99 +#: website/templates/util/render_addon_widget.mako:112 +msgid "Redirect" +msgstr "リダイレクト" + +#: website/templates/util/render_addon_widget.mako:107 +#, python-format +msgid "" +"This project contains a forward to ." +msgstr "このプロジェクトには、への転送が含まれています。" + +#: website/templates/util/render_addon_widget.mako:144 +#: website/templates/util/render_addon_widget.mako:175 +msgid "Loading" +msgstr "ロード中" + +#: website/templates/util/render_addon_widget.mako:147 +#: website/templates/util/render_addon_widget.mako:178 +msgid "Error occurred" +msgstr "エラーが発生しました。" + +#: website/templates/util/render_addon_widget.mako:151 +msgid "Linked JupyterHubs" +msgstr "リンクされたJupyterHubs" + +#: website/templates/util/render_addon_widget.mako:158 +msgid "Launch" +msgstr "始める" + +#: website/templates/util/render_addon_widget.mako:166 +msgid "No Linked JupyterHubs" +msgstr "リンクされたJupyterHubはありません" + +#: website/templates/util/render_addon_widget.mako:182 +msgid "Management Project" +msgstr "管理プロジェクト" + +#: website/templates/util/render_addon_widget.mako:184 +msgid "Flowable Task Service" +msgstr "Flowable タスクサービス" + +#: website/templates/util/render_addon_widget.mako:192 +#: website/templates/util/render_addon_widget.mako:219 +msgid "Deposit Manuscript & Data" +msgstr "論文登録申請" + +#: website/templates/util/render_addon_widget.mako:200 +#: website/templates/util/render_addon_widget.mako:225 +msgid "Image Scan only" +msgstr "投稿前画像スキャン依頼" + +#: website/templates/util/render_node.mako:5 +msgid "component" +msgstr "コンポーネント" + +#: website/templates/util/render_node.mako:18 +#, python-format +msgid "Linked %(nodeType)s" +msgstr "リンクされた%(nodeType)s" + +#: website/templates/util/render_node.mako:22 +msgid "This project is private" +msgstr "このプロジェクトは非公開です" + +#: website/templates/util/render_node.mako:57 +msgid "Remove link" +msgstr "リンクを削除" + +#: website/templates/util/render_node.mako:58 +#, python-format +msgid "Create a fork of %(summaryTitle)s" +msgstr "%(summaryTitle)sのフォークを作成" + +#: website/templates/util/render_node.mako:66 +msgid "Manage Contributors" +msgstr "メンバー管理" + +#: website/templates/util/render_addon_widget.mako:245 +msgid "My Screen Test" +msgstr "My Screen テスト" diff --git a/site/guides/screen-expansion/osf.io/website/translations/js_messages.pot b/site/guides/screen-expansion/osf.io/website/translations/js_messages.pot new file mode 100644 index 0000000..92cc082 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/website/translations/js_messages.pot @@ -0,0 +1,6663 @@ +# Translations template for PROJECT. +# Copyright (C) 2020 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR , 2020. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: 0.6.0\n" +"Report-Msgid-Bugs-To: rocs-office@nii.ac.jp\n" +"POT-Creation-Date: 2020-09-03 12:45+0900\n" +"PO-Revision-Date: 2020-09-03 12:45+0900\n" +"Last-Translator: Shunta Nishikawa\n" +"Language-Team: RCOS \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.7.0\n" + +#: addons/twofactor/static/twoFactorUserConfig.js:148 +#: addons/twofactor/static/twoFactorUserConfig.js:190 +#: admin/static/js/rdm_addons/rdm-addons-page.js:71 +#: website/static/js/accountSettings.js:286 +#: website/static/js/accountSettings.js:351 +#: website/static/js/accountSettings.js:477 +#: website/static/js/accountSettings.js:549 +#: website/static/js/addProjectPlugin.js:347 +#: website/static/js/addonPermissions.js:55 +#: website/static/js/addonSettings.js:71 website/static/js/addonSettings.js:134 +#: website/static/js/apiApplication.js:249 +#: website/static/js/apiApplication.js:420 +#: website/static/js/apiApplication.js:487 +#: website/static/js/apiPersonalToken.js:228 +#: website/static/js/apiPersonalToken.js:399 +#: website/static/js/apiPersonalToken.js:426 +#: website/static/js/citationsNodeConfig.js:169 +#: website/static/js/citationsNodeConfig.js:187 +#: website/static/js/contribManager.js:433 website/static/js/fangorn.js:537 +#: website/static/js/fangorn.js:542 website/static/js/fangorn.js:1212 +#: website/static/js/fangorn.js:1235 website/static/js/fangorn.js:1288 +#: website/static/js/fangorn.js:1307 website/static/js/fangorn.js:2006 +#: website/static/js/filepage/index.js:213 +#: website/static/js/folderPickerNodeConfig.js:510 +#: website/static/js/folderPickerNodeConfig.js:566 +#: website/static/js/institutionProjectSettings.js:102 +#: website/static/js/licensePicker.js:243 website/static/js/myProjects.js:1560 +#: website/static/js/myProjects.js:1608 website/static/js/myProjects.js:1632 +#: website/static/js/nodeControl.js:227 +#: website/static/js/oauthAddonNodeConfig.js:156 +#: website/static/js/oauthAddonNodeConfig.js:174 +#: website/static/js/osfHelpers.js:796 website/static/js/osfHelpers.js:897 +#: website/static/js/pages/profile-settings-addons-page.js:35 +#: website/static/js/pages/profile-settings-addons-page.js:101 +#: website/static/js/pages/project-addons-page.js:41 +#: website/static/js/pages/project-addons-page.js:66 +#: website/static/js/privateLinkTable.js:119 website/static/js/profile.js:373 +#: website/static/js/profile.js:743 website/static/js/profile.js:975 +#: website/static/js/project.js:39 website/static/js/project.js:143 +#: website/static/js/project.js:253 +#: website/static/js/wikiSettingsTreebeard.js:31 +msgid "Cancel" +msgstr "" + +#: addons/twofactor/static/twoFactorUserConfig.js:178 +msgid "Enable Two-factor Authentication" +msgstr "" + +#: addons/twofactor/static/twoFactorUserConfig.js:179 +msgid "" +"Enabling two-factor authentication will not immediately activate this " +"feature for your account. You will need to follow the steps that appear " +"below to complete the activation of two-factor authentication for your " +"account." +msgstr "" + +#: addons/twofactor/static/twoFactorUserConfig.js:187 +msgid "Enable" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:86 +msgid "Live editing mode" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:88 +msgid "Attempting to connect" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:90 +msgid "Unsupported browser" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:92 +msgid "Unavailable: Live editing" +msgstr "" + +#: addons/wiki/static/WikiEditor.js:153 +msgid "The wiki content could not be loaded." +msgstr "" + +#: addons/wiki/static/WikiEditor.js:155 +msgid "Could not GET wiki contents." +msgstr "" + +#: addons/wiki/static/WikiEditor.js:176 +msgid "There are unsaved changes to your wiki. If you exit " +msgstr "" + +#: addons/wiki/static/WikiEditor.js:177 +msgid "the page now, those changes may be lost." +msgstr "" + +#: addons/wiki/static/wikiPage.js:94 +#: website/static/js/pages/project-dashboard-page.js:733 +msgid "" +"*Add important information, links, or images here to describe your " +"project.*" +msgstr "" + +#: addons/wiki/static/wikiPage.js:96 +#: website/static/js/pages/project-dashboard-page.js:735 +msgid "*No wiki content.*" +msgstr "" + +#: addons/wiki/static/wikiPage.js:220 +msgid "Live preview" +msgstr "" + +#: addons/wiki/static/wikiPage.js:222 +msgid "Current version" +msgstr "" + +#: addons/wiki/static/wikiPage.js:224 +msgid "Previous version" +msgstr "" + +#: addons/wiki/static/wikiPage.js:226 +msgid "Version " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:48 +msgid "Strong " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:51 +msgid "Emphasis " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:54 +msgid "Spellcheck: Toggle spellcheck on and off" +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:56 +msgid "Hyperlink " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:60 +msgid "Blockquote
                                          " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:63 +msgid "Code Sample
                                          "
                                          +msgstr ""
                                          +
                                          +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:66
                                          +msgid "Image "
                                          +msgstr ""
                                          +
                                          +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:70
                                          +msgid "Numbered List 
                                            " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:71 +msgid "Bulleted List
                                              " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:72 +msgid "List item" +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:74 +msgid "Heading

                                              /

                                              " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:77 +msgid "Horizontal Rule
                                              " +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:79 +msgid "Undo -" +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:80 +msgid "Redo -" +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:82 +msgid "Wiki Syntax Help" +msgstr "" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:1939 +msgid "Autocomplete" +msgstr "" + +#: admin/static/js/collection_providers/collectionProviders.js:9 +msgid "Hide Form" +msgstr "" + +#: admin/static/js/collection_providers/collectionProviders.js:9 +msgid "Modify Collection Provider" +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:64 +#, python-format +msgid "Disallow %s?" +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:65 +msgid "Are you sure you want to disallow the %1$s?
                                              " +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:66 +msgid "" +"This will revoke access to %1$s for all projects using the " +"accounts.

                                              " +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:67 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:395 +msgid "Type the following to continue: %1$s

                                              " +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:74 +msgid "Disallow" +msgstr "" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:85 +msgid "Strings did not match" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:26 +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:19 +msgid "Other (Please Specify)" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:85 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:100 +#: website/static/js/addonSettings.js:171 +msgid "Error while updating addon account" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:100 +msgid "Please select a Dataverse repository." +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:105 +msgid "Please enter an API token." +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:110 +msgid "Please enter a Dataverse host and an API token." +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:131 +msgid "Could not authenticate with Dataverse" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:144 +msgid "Disconnect Dataverse Account?" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:146 +msgid "" +"Are you sure you want to disconnect the Dataverse account on " +"%1$s? This will revoke access to Dataverse for all " +"projects associated with this account." +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:155 +#: admin/static/js/rdm_addons/figshare/rdm-cfg.js:34 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:124 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:411 +#: website/static/js/addonSettings.js:130 +#: website/static/js/folderPickerNodeConfig.js:562 +msgid "Disconnect" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:173 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:142 +#: website/static/js/addonSettings.js:150 +msgid "Error while removing addon authorization for %1$s" +msgstr "" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:212 +msgid "Could not GET Dataverse settings" +msgstr "" + +#: admin/static/js/rdm_addons/figshare/rdm-cfg.js:17 +msgid "Disconnect figshare Account?" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:46 +msgid "Invalid management URL: " +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:61 +msgid "Saving management project was successful" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:63 +msgid "Error while saving addon management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:71 +msgid "Permission error while saving management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:73 +msgid "Error while saving management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:91 +msgid "Removing management project was successful" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:93 +msgid "Error while removing addon management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:101 +msgid "Permission error while removing management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:103 +msgid "Error while removing management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:118 +msgid "Error while fetching addon management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:149 +msgid "Saving organizational project was successful" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:151 +msgid "Error while saving addon organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:159 +msgid "Permission error while saving organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:161 +msgid "Error while saving organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:179 +msgid "Removing organizational project was successful" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:181 +msgid "Error while removing addon organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:189 +msgid "Permission error while removing organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:191 +msgid "Error while removing organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:206 +msgid "Error while fetching addon organization project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:222 +msgid "Error while fetching management project" +msgstr "" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:226 +msgid "Error while fetching organizational project" +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:58 +msgid "Could not GET OwnCloud settings" +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:75 +msgid "Please enter an ownCloud server." +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:77 +msgid "Please select an ownCloud server." +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:82 +msgid "Please enter a username and password." +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:86 +msgid "Please enter an ownCloud host and credentials." +msgstr "" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:104 +msgid "Could not authenticate with ownCloud" +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:48 +msgid "Please enter both an API access key and secret key." +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:53 +msgid "Please enter an API access key." +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:58 +msgid "Please enter an API secret key." +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:75 +msgid "Could not authenticate with S3" +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:113 +msgid "Disconnect Amazon S3 Account?" +msgstr "" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:115 +msgid "" +"Are you sure you want to disconnect the S3 account %1$s?" +" This will revoke access to S3 for all projects associated with this " +"account." +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:80 +msgid "Are you sure you want to change institutional storage?" +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:81 +msgid "" +"

                                              The previous storage will no longer be available to all contributors " +"on the project.

                                              " +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:85 +#: website/static/js/folderPickerNodeConfig.js:100 +#: website/static/js/folderPickerNodeConfig.js:102 +#: website/static/js/folderPickerNodeConfig.js:594 +msgid "Change" +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:264 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:491 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:626 +msgid "Some errors occurred" +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:311 +msgid "Institutional Storage set successfully" +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:391 +#: website/static/js/addonSettings.js:118 +msgid "Disconnect Account?" +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:393 +msgid "" +"Are you sure you want to disconnect the %1$s account " +"%2$s?
                                              " +msgstr "" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:394 +msgid "" +"This will revoke access to %1$s for all projects using this " +"account.

                                              " +msgstr "" + +#: scripts/translations/messages_addonsJson.js:3 +msgid "" +"\n" +"\n" +"

                                              Box Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking a GakuNin RDM project public or private is " +"independent of Box privacy. The GakuNin RDM does not alter the " +"permissions of linked Box folders.
                                              View / download file versionsBox files and their versions can be viewed/downloaded" +" via GakuNin RDM.
                                              Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Box.
                                              Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Box.
                                              LogsThe GakuNin RDM keeps track of changes you make to " +"your Box content through the GakuNin RDM, but not for changes made using " +"Box directly.
                                              ForkingForking a project or component does not copy Box " +"authorization unless the user forking the project is the same user who " +"authorized the Box add-on in the source project being forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:5 +msgid "" +"\n" +"\n" +"

                                              Dataverse Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Dataverse study public or private. The GakuNin " +"RDM allows you to release the latest draft version of a Dataverse " +"dataset.
                                              View / download file versionsFiles from the latest release of the selected " +"Dataverse study can be viewed/downloaded. GakuNin RDM users with write " +"permissions can view/download draft files as well.
                                              Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Dataverse.
                                              Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Dataverse.
                                              LogsThe GakuNin RDM keeps track of changes you make to " +"your Dataverse studies through the GakuNin RDM, but not for changes made " +"using Dataverse directly.
                                              ForkingForking a project or component does not copy " +"Dataverse authorization unless the user forking the project is the same " +"user who authorized the Dataverse add-on in the source project being " +"forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:7 +msgid "" +"\n" +"\n" +"

                                              Dropbox Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking a GakuNin RDM project public or private is " +"independent of Dropbox privacy. The GakuNin RDM does not alter the " +"permissions of linked Dropbox folders.
                                              View / download file versionsDropbox files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                              Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Dropbox.
                                              Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Dropbox.
                                              LogsGakuNin RDM keeps track of changes you make to your " +"Dropbox content through GakuNin RDM, but not for changes made using " +"Dropbox directly.
                                              ForkingForking a project or component does not copy Dropbox " +"authorization unless the user forking the project is the same user who " +"authorized the Dropbox add-on in the source project being forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:9 +msgid "" +"\n" +"\n" +"

                                              figshare Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              Permissions Making a GakuNin RDM project public or private is " +"independent of making figshare content public or private. The GakuNin RDM" +" does not alter the permissions of linked figshare content.
                                              View / download file versionsfigshare files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported.
                                              Add / update filesFiles can be added but not updated.
                                              Delete filesPrivate files and filesets can be deleted via GakuNin" +" RDM.
                                              LogsGakuNin RDM keeps track of changes you make to your " +"figshare content through GakuNin RDM, but not for changes made using " +"figshare directly.
                                              ForkingForking a project or component does not copy figshare" +" authorization unless the user forking the project is the same user who " +"authorized the figshare add-on in the source project being forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:11 +msgid "" +"\n" +"\n" +"

                                              GitHub Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a GitHub repo public or private. The GakuNin RDM " +"does not alter the permissions of linked GitHub repos.
                                              View / download file versionsGitHub files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                              Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in GitHub.
                                              Delete filesFiles deleted via GakuNin RDM will be deleted in " +"GitHub.
                                              LogsGitHub dynamically updates GakuNin RDM logs when " +"files are modified outside the GakuNin RDM. Changes to GitHub repos made " +"before the repo is linked to the GakuNin RDM will not be reflected in " +"GakuNin RDM logs.
                                              ForkingForking a project or component does not copy Github " +"authorization unless the user forking the project is the same user who " +"authorized the Github add-on in the source project being forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:13 +msgid "" +"\n" +"\n" +"

                                              GitLab Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a GitLab repo public or private. The GakuNin RDM " +"does not alter the permissions of linked GitLab repos.
                                              View / download file versionsGitLab files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                              Add / update filesAdding/updating files in the project via GakuNin RDM " +"is not implemented yet.
                                              Delete filesDeleting files via GakuNin RDM is not implemented " +"yet.
                                              LogsGakuNin RDM does not keep track of changes made using" +" Gitlab directly.
                                              ForkingForking a project or component does not copy GitLab " +"authorization unless the user forking the project is the same user who " +"authorized the GitLab add-on in the source project being forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:15 +msgid "" +"\n" +"\n" +"

                                              Mendeley Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Mendeley folder public or private. The GakuNin " +"RDM does not alter the permissions of a linked Mendeley folder.
                                              ForkingForking a project or component does not copy Mendeley" +" authorization unless the user forking the project is the same user who " +"authorized the Mendeley add-on in the source project being forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:17 +msgid "" +"\n" +"\n" +"

                                              Zotero Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Zotero folder public or private. The GakuNin RDM " +"does not alter the permissions of a linked Zotero folder.
                                              ForkingForking a project or component does not copy Zotero " +"authorization unless the user forking the project is the same user who " +"authorized the Zotero add-on in the source project being forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:19 +msgid "" +"\n" +"\n" +"

                                              ownCloud Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking a GakuNin RDM project public or private is " +"independent of ownCloud privacy. The GakuNin RDM does not alter the " +"permissions of linked ownCloud folders.
                                              View / download file versionsownCloud files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported by the ownCloud WebDAV " +"API.
                                              Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in ownCloud.
                                              Delete filesFiles deleted via GakuNin RDM will be deleted in " +"ownCloud.
                                              LogsGakuNin RDM keeps track of changes you make to your " +"ownCloud content through GakuNin RDM, but not for changes made using " +"ownCloud directly.
                                              ForkingForking a project or component does not copy ownCloud" +" authorization unless the user forking the project is the same user who " +"authorized the ownCloud add-on in the source project being forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:21 +msgid "" +"\n" +"\n" +"

                                              OneDrive Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking a GakuNin RDM project public or private is " +"independent of OneDrive privacy. The GakuNin RDM does not alter the " +"permissions of linked OneDrive folders.
                                              View / download file versionsOneDrive files and their versions can be " +"viewed/downloaded via GakuNin RDM. OneNote files are unexportable and " +"cannot be downloaded or viewed.
                                              Add / update filesThe OneDrive add-on is read-only.
                                              Delete filesThe OneDrive add-on is read-only.
                                              LogsGakuNin RDM keeps track of changes you make to your " +"OneDrive add-on configuration. It does not track changes to OneDrive " +"content.
                                              ForkingForking a project or component does not copy OneDrive" +" authorization unless the user forking the project is the same user who " +"authorized the OneDrive add-on in the source project being forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:23 +msgid "" +"\n" +"\n" +"

                                              Amazon S3 Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an S3 bucket public or private. The GakuNin RDM " +"does not alter the permissions of linked S3 buckets.
                                              View / download file versionsThe S3 add-on supports file versions if versioning is" +" enabled for your S3 buckets.
                                              Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Amazon S3.
                                              Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Amazon S3.
                                              LogsThe GakuNin RDM keeps track of changes you make to " +"your S3 buckets through the GakuNin RDM, but not for changes made using " +"S3 directly.
                                              ForkingForking a project or component does not copy S3 " +"authorization unless the user forking the project is the same user who " +"authorized the S3 add-on in the source project being forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:25 +msgid "" +"\n" +"\n" +"

                                              Google Drive Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking a GakuNin RDM project public or private is " +"independent of Google Drive privacy. The GakuNin RDM does not alter the " +"permissions of linked Google Drive folders.
                                              View / download file versionsGoogle Drive files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                              Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Google Drive.
                                              Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Google Drive.
                                              LogsThe GakuNin RDM keeps track of changes you make to " +"your Google Drive content through the GakuNin RDM, but not for changes " +"made using Google Drive directly.
                                              ForkingForking a project or component does not copy Google " +"Drive authorization unless the user forking the project is the same user " +"who authorized the Google Drive add-on in the source project being " +"forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:27 +msgid "" +"\n" +"\n" +"

                                              Bitbucket Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Bitbucket repo public or private. The GakuNin RDM" +" does not alter the permissions of linked Bitbucket repos.
                                              View / download file versionsBitbucket files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                              Add / update filesBitbucket does not support adding or updating files " +"via their API.
                                              Delete filesBitbucket does not support deleting files via their " +"API.
                                              LogsGakuNin RDM keeps track of changes you make to your " +"Bitbucket content through GakuNin RDM, but not for changes made using " +"Bitbucket directly.
                                              ForkingForking a project or component does not copy " +"Bitbucket authorization unless the user forking the project is the same " +"user who authorized the Bitbucket add-on in the source project being " +"forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:29 +msgid "" +"\n" +"\n" +"

                                              Azure Blob Storage Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an Azure Blob Storage container public or " +"private.
                                              View / download file versionsThe Azure Blob Storage add-on supports only Block " +"Blobs, and does not support file versions.
                                              Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Azure Blob Storage.
                                              Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Azure Blob Storage.
                                              LogsThe GakuNin RDM keeps track of changes you make to " +"your Azure Blob Storage containers through the GakuNin RDM, but not for " +"changes made using Azure Blob Storage directly.
                                              ForkingForking a project or component does not copy Azure " +"Blob Storage authorization unless the user forking the project is the " +"same user who authorized the Azure Blob Storage add-on in the source " +"project being forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:31 +msgid "" +"\n" +"\n" +"

                                              Nextcloud Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking a GakuNin RDM project public or private is " +"independent of Nextcloud privacy. The GakuNin RDM does not alter the " +"permissions of linked Nextcloud folders.
                                              View / download file versionsNextcloud files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported by the Nextcloud WebDAV " +"API.
                                              Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Nextcloud.
                                              Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Nextcloud.
                                              LogsGakuNin RDM keeps track of changes you make to your " +"Nextcloud content through GakuNin RDM, but not for changes made using " +"Nextcloud directly.
                                              ForkingForking a project or component does not copy " +"Nextcloud authorization unless the user forking the project is the same " +"user who authorized the Nextcloud add-on in the source project being " +"forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:33 +msgid "" +"\n" +"\n" +"

                                              OpenStack Swift Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an Swift container public or private.
                                              View / download file versionsThe Swift add-on does not support file versions.
                                              Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Swift.
                                              Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Swift.
                                              LogsThe GakuNin RDM keeps track of changes you make to " +"your Swift containers through the GakuNin RDM, but not for changes made " +"using Swift directly.
                                              ForkingForking a project or component does not copy Swift " +"authorization unless the user forking the project is the same user who " +"authorized the Swift add-on in the source project being forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:35 +msgid "" +"\n" +"\n" +"

                                              S3 Compatible Storage Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an S3 Compatible Storage bucket public or private. " +"The GakuNin RDM does not alter the permissions of linked S3 Compatible " +"Storage buckets.
                                              View / download file versionsThe S3 add-on supports file versions if versioning is" +" enabled for your S3 Compatible Storage buckets.
                                              Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in S3 Compatible Storage.
                                              Delete filesFiles deleted via GakuNin RDM will be deleted in S3 " +"Compatible Storage.
                                              LogsThe GakuNin RDM keeps track of changes you make to " +"your S3 Compatible Storage buckets through the GakuNin RDM, but not for " +"changes made using S3 Compatible Storage directly.
                                              ForkingForking a project or component does not copy S3 " +"Compatible Storage authorization unless the user forking the project is " +"the same user who authorized the S3 Compatible Storage add-on in the " +"source project being forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:37 +msgid "" +"\n" +"\n" +"

                                              WEKO Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              Add / update filesAdding/updating indices/items in the project via " +"GakuNin RDM will be reflected in WEKO.
                                              Delete filesItems deleted via GakuNin RDM will be deleted in " +"WEKO.
                                              LogsThe GakuNin RDM keeps track of changes you make to " +"your WEKO index through the GakuNin RDM, but not for changes made using " +"WEKO directly.
                                              ForkingForking a project or component does not copy WEKO " +"authorization unless the user forking the project is the same user who " +"authorized the WEKO add-on in the source project being forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:39 +msgid "" +"\n" +"\n" +"

                                              JupyterHub Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsThe GakuNin RDM does not affect the permissions of " +"JupyterHub.
                                              View / download file versionsThe JupyterHub add-on does not provide Storage " +"Features.
                                              Add / update filesThe JupyterHub add-on does not provide Storage " +"Features.
                                              Delete filesThe JupyterHub add-on does not provide Storage " +"Features.
                                              LogsThe JupyterHub add-on does not provide Storage " +"Features.
                                              ForkingForking a project or component copies information " +"about linked JupyterHub but the GakuNin RDM does not affect " +"authentication of JupyterHub.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: scripts/translations/messages_addonsJson.js:41 +msgid "" +"\n" +"\n" +"

                                              IQB-RIMS Add-on Terms

                                              \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                              FunctionStatus
                                              PermissionsMaking an GakuNin RDM project public or private is " +"independent of Google Drive privacy. The GakuNin RDM does not alter the " +"permissions of linked Google Drive folders.
                                              View / download file versionsIQB-RIMS files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                              Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Google Drive.
                                              Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Google Drive.
                                              LogsThe GakuNin RDM keeps track of changes you make to " +"your Google Drive content through the GakuNin RDM, but not for changes " +"made using Google Drive directly.
                                              ForkingForking a project or component does not copy Google " +"Drive authorization unless the user forking the project is the same user " +"who authorized the IQB-RIMS add-on in the source project being " +"forked.
                                              \n" +"\n" +"
                                                \n" +"
                                              • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                              • \n" +"
                                              • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                              • \n" +"
                                              \n" +msgstr "" + +#: website/static/js/accessRequestManager.js:85 +msgid "There was a problem trying to %1$s the request from the user. %2$s" +msgstr "" + +#: website/static/js/accessRequestManager.js:86 +#: website/static/js/accessRequestManager.js:87 +msgid "Could not %1$s access request" +msgstr "" + +#: website/static/js/accessRequestManager.js:115 +#: website/static/js/contribAdder.js:71 website/static/js/contribManager.js:211 +msgid "Read" +msgstr "" + +#: website/static/js/accessRequestManager.js:116 +#: website/static/js/contribAdder.js:72 website/static/js/contribManager.js:212 +msgid "Read + Write" +msgstr "" + +#: website/static/js/accessRequestManager.js:117 +#: website/static/js/contribAdder.js:73 website/static/js/contribManager.js:213 +msgid "Administrator" +msgstr "" + +#: website/static/js/accountClaimer.js:34 +msgid "Email will arrive shortly" +msgstr "" + +#: website/static/js/accountClaimer.js:34 +msgid "Please check " +msgstr "" + +#: website/static/js/accountClaimer.js:41 +msgid "Claim as %1$s?" +msgstr "" + +#: website/static/js/accountClaimer.js:42 +msgid "If you claim this account, a contributor of this project " +msgstr "" + +#: website/static/js/accountClaimer.js:43 +msgid "will be emailed to confirm your identity." +msgstr "" + +#: website/static/js/accountClaimer.js:61 +msgid "Claim" +msgstr "" + +#: website/static/js/accountClaimer.js:73 +msgid "Is this you? Click to claim" +msgstr "" + +#: website/static/js/accountClaimer.js:99 +msgid "Claim Account" +msgstr "" + +#: website/static/js/accountClaimer.js:101 +msgid "Enter email..." +msgstr "" + +#: website/static/js/accountClaimer.js:105 +msgid "Not a valid email." +msgstr "" + +#: website/static/js/accountSettings.js:83 +msgid "Could not fetch user profile." +msgstr "" + +#: website/static/js/accountSettings.js:84 +#: website/static/js/accountSettings.js:115 +#: website/static/js/licensePicker.js:197 +msgid "Error fetching user profile" +msgstr "" + +#: website/static/js/accountSettings.js:112 +msgid "" +"User profile not updated. Please refresh the page and try again or " +"contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/accountSettings.js:199 +msgid "Duplicate Email" +msgstr "" + +#: website/static/js/accountSettings.js:220 +msgid "Confirmation email sent" +msgstr "" + +#: website/static/js/accountSettings.js:221 +msgid "%1$s was added to your account." +msgstr "" + +#: website/static/js/accountSettings.js:222 +msgid " You will receive a confirmation email at %1$s." +msgstr "" + +#: website/static/js/accountSettings.js:223 +msgid "" +" Please click the link in your email to confirm this action. You will be " +"required to enter your password." +msgstr "" + +#: website/static/js/accountSettings.js:226 website/static/js/fangorn.js:2258 +#: website/static/js/folderPickerNodeConfig.js:591 +#: website/static/js/pages/profile-settings-addons-page.js:72 +#: website/static/js/pages/project-settings-page.js:118 +msgid "Close" +msgstr "" + +#: website/static/js/accountSettings.js:236 +msgid "Email cannot be empty." +msgstr "" + +#: website/static/js/accountSettings.js:244 +msgid "Resend Email Confirmation?" +msgstr "" + +#: website/static/js/accountSettings.js:245 +msgid "Are you sure that you want to resend email confirmation to %1$s?" +msgstr "" + +#: website/static/js/accountSettings.js:250 +msgid "Email confirmation resent to %1$s" +msgstr "" + +#: website/static/js/accountSettings.js:251 +msgid "You will receive a new confirmation email at %1$s." +msgstr "" + +#: website/static/js/accountSettings.js:252 +msgid "" +" Please log out of this account and check your email to confirm this " +"action." +msgstr "" + +#: website/static/js/accountSettings.js:259 +msgid "Resend" +msgstr "" + +#: website/static/js/accountSettings.js:270 +msgid "Remove Email?" +msgstr "" + +#: website/static/js/accountSettings.js:271 +msgid "Are you sure that you want to remove %1$s from your email list?" +msgstr "" + +#: website/static/js/accountSettings.js:282 +#: website/static/js/accountSettings.js:347 +#: website/static/js/addonPermissions.js:51 +#: website/static/js/addonSettings.js:67 +#: website/static/js/pages/profile-settings-addons-page.js:97 +#: website/static/js/privateLinkTable.js:115 website/static/js/profile.js:739 +#: website/static/js/profile.js:971 website/static/js/project.js:249 +msgid "Remove" +msgstr "" + +#: website/static/js/accountSettings.js:291 +#: website/static/js/accountSettings.js:304 +msgid "Please refresh the page and try again." +msgstr "" + +#: website/static/js/accountSettings.js:317 +msgid "You have revoked this connected identity." +msgstr "" + +#: website/static/js/accountSettings.js:322 +msgid "Revocation request failed. Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/accountSettings.js:325 +msgid "Error revoking connected identity" +msgstr "" + +#: website/static/js/accountSettings.js:338 +msgid "Remove authorization?" +msgstr "" + +#: website/static/js/accountSettings.js:339 +msgid "Are you sure you want to remove this authorization?" +msgstr "" + +#: website/static/js/accountSettings.js:383 +msgid "" +"You have successfully changed your default storage location to " +"%1$s." +msgstr "" + +#: website/static/js/accountSettings.js:387 +msgid "" +"Your attempt to change your default storage location has failed. Please " +"contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/accountSettings.js:390 +msgid "Error updating default storage location " +msgstr "" + +#: website/static/js/accountSettings.js:413 +msgid "" +"An GakuNin RDM administrator will contact you shortly to confirm your " +"deactivation request." +msgstr "" + +#: website/static/js/accountSettings.js:421 +msgid "Deactivation request failed. Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/accountSettings.js:425 +#: website/static/js/accountSettings.js:450 +msgid "Error requesting account deactivation" +msgstr "" + +#: website/static/js/accountSettings.js:438 +msgid "An GakuNin RDM account is no longer up for review." +msgstr "" + +#: website/static/js/accountSettings.js:446 +msgid "" +"Deactivation request failed. Please contact
                                              rdm_support@nii.ac.jp if the problem " +"persists." +msgstr "" + +#: website/static/js/accountSettings.js:463 +msgid "Request account deactivation?" +msgstr "" + +#: website/static/js/accountSettings.js:464 +msgid "" +"Are you sure you want to request account deactivation? A GakuNinRDM " +"administrator will review your request. If accepted, you " +msgstr "" + +#: website/static/js/accountSettings.js:465 +msgid "will NOT be able to reactivate your account." +msgstr "" + +#: website/static/js/accountSettings.js:473 +#: website/static/js/accountSettings.js:546 +msgid "Request" +msgstr "" + +#: website/static/js/accountSettings.js:485 +msgid "Cancel deactivation request?" +msgstr "" + +#: website/static/js/accountSettings.js:486 +msgid "" +"Are you sure you want to rescind your account deactivation request? This " +"will preserve your account status." +msgstr "" + +#: website/static/js/accountSettings.js:494 +msgid "Cancel Deactivation Request" +msgstr "" + +#: website/static/js/accountSettings.js:512 +msgid "" +"An GakuNin RDM administrator will contact you shortly to confirm your " +"export request." +msgstr "" + +#: website/static/js/accountSettings.js:520 +msgid "Export request failed. Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/accountSettings.js:524 +msgid "Error requesting account export" +msgstr "" + +#: website/static/js/accountSettings.js:537 +msgid "Request account export?" +msgstr "" + +#: website/static/js/accountSettings.js:538 +msgid "Are you sure you want to request account export?" +msgstr "" + +#: website/static/js/addProjectPlugin.js:21 +#: website/static/js/addProjectPlugin.js:24 +#: website/static/js/myProjects.js:1118 +msgid "Create new project" +msgstr "" + +#: website/static/js/addProjectPlugin.js:57 +msgid "There was an unknown error. Please try again later." +msgstr "" + +#: website/static/js/addProjectPlugin.js:184 website/static/js/conference.js:19 +msgid "Title" +msgstr "" + +#: website/static/js/addProjectPlugin.js:198 +msgid "Enter %1$s title" +msgstr "" + +#: website/static/js/addProjectPlugin.js:203 +msgid "Affiliation" +msgstr "" + +#: website/static/js/addProjectPlugin.js:210 +msgid "Remove all" +msgstr "" + +#: website/static/js/addProjectPlugin.js:217 +msgid "Select all" +msgstr "" + +#: website/static/js/addProjectPlugin.js:233 +msgid "Storage location" +msgstr "" + +#: website/static/js/addProjectPlugin.js:251 +msgid " Add contributors from " +msgstr "" + +#: website/static/js/addProjectPlugin.js:253 +msgid " Admins of " +msgstr "" + +#: website/static/js/addProjectPlugin.js:253 +msgid " will have read access to this component." +msgstr "" + +#: website/static/js/addProjectPlugin.js:264 +msgid " Add tags from " +msgstr "" + +#: website/static/js/addProjectPlugin.js:268 +msgid "License" +msgstr "" + +#: website/static/js/addProjectPlugin.js:270 +msgid " This component will inherit the same license as " +msgstr "" + +#: website/static/js/addProjectPlugin.js:273 +msgid "Learn more." +msgstr "" + +#: website/static/js/addProjectPlugin.js:282 +msgid " More" +msgstr "" + +#: website/static/js/addProjectPlugin.js:286 +msgid "Description" +msgstr "" + +#: website/static/js/addProjectPlugin.js:295 +msgid "Enter %1$s description" +msgstr "" + +#: website/static/js/addProjectPlugin.js:299 website/static/js/conference.js:31 +msgid "Category" +msgstr "" + +#: website/static/js/addProjectPlugin.js:300 +msgid " (for descriptive purposes)" +msgstr "" + +#: website/static/js/addProjectPlugin.js:307 +msgid "Uncategorized" +msgstr "" + +#: website/static/js/addProjectPlugin.js:320 +msgid "(Empty category)" +msgstr "" + +#: website/static/js/addProjectPlugin.js:330 +msgid "Template (optional)" +msgstr "" + +#: website/static/js/addProjectPlugin.js:331 +msgid "" +"Start typing to search your projects. Selecting project as template will " +"duplicate its " +msgstr "" + +#: website/static/js/addProjectPlugin.js:332 +msgid "" +"structure in the new project without importing the content of that " +"project." +msgstr "" + +#: website/static/js/addProjectPlugin.js:351 +#: website/static/js/nodeControl.js:224 +#: website/static/js/privateLinkManager.js:31 website/static/js/project.js:140 +msgid "Create" +msgstr "" + +#: website/static/js/addProjectPlugin.js:362 +#, python-format +msgid "Saving your %s..." +msgstr "" + +#: website/static/js/addProjectPlugin.js:376 +msgid "New %1$s created successfully!" +msgstr "" + +#: website/static/js/addProjectPlugin.js:386 +#: website/static/js/addProjectPlugin.js:434 website/static/js/project.js:62 +msgid "Keep working here" +msgstr "" + +#: website/static/js/addProjectPlugin.js:392 +#: website/static/js/addProjectPlugin.js:437 +msgid "Go to new %1$s" +msgstr "" + +#: website/static/js/addProjectPlugin.js:405 +msgid "Couldn't create your %1$s" +msgstr "" + +#: website/static/js/addProjectPlugin.js:424 +msgid "Could not add institution affiliation to your new %1$s" +msgstr "" + +#: website/static/js/addProjectPlugin.js:471 +msgid "Select a project to use as a template" +msgstr "" + +#: website/static/js/addonHelper.js:37 +#: website/static/js/nodeSelectTreebeard.js:59 +#: website/static/js/notificationsTreebeard.js:59 +#: website/static/js/profile.js:311 +#: website/static/js/wikiSettingsTreebeard.js:54 +msgid "Settings updated" +msgstr "" + +#: website/static/js/addonHelper.js:46 +msgid "Settings not updated." +msgstr "" + +#: website/static/js/addonNodeConfig.js:39 +#: website/static/js/oauthAddonNodeConfig.js:47 +msgid "Successfully linked \"%1$s\"" +msgstr "" + +#: website/static/js/addonNodeConfig.js:40 +#: website/static/js/oauthAddonNodeConfig.js:48 +msgid " Go to the Files page to view your content." +msgstr "" + +#: website/static/js/addonPermissions.js:21 +#: website/static/js/addonSettings.js:58 +msgid "Remove addon?" +msgstr "" + +#: website/static/js/addonPermissions.js:22 +msgid "Are you sure you want to disconnnect the %1$s account from this project?" +msgstr "" + +#: website/static/js/addonPermissions.js:43 +msgid "An error occurred, the account is still connected to the project. " +msgstr "" + +#: website/static/js/addonPermissions.js:44 +msgid "If the issue persists, please report it to %1$s." +msgstr "" + +#: website/static/js/addonSettings.js:46 +msgid "Error deauthorizing node: " +msgstr "" + +#: website/static/js/addonSettings.js:59 +msgid "Are you sure you want to remove the %1$s authorization from this project?" +msgstr "" + +#: website/static/js/addonSettings.js:100 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of dropbox.com before attempting to connect to a second Dropbox " +"account on the GakuNin RDM. This will clear the credentials stored in " +"your browser." +msgstr "" + +#: website/static/js/addonSettings.js:102 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of bitbucket.org before attempting to connect to a second " +"Bitbucket account on the GakuNin RDM. This will clear the credentials " +"stored in your browser." +msgstr "" + +#: website/static/js/addonSettings.js:104 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of onedrive.live.com before attempting to connect to a second " +"OneDrive account on the GakuNin RDM. This will clear the credentials " +"stored in your browser." +msgstr "" + +#: website/static/js/addonSettings.js:106 +msgid "" +"Add-on successfully authorized. To link this add-on to an GakuNin RDM " +"project, go to the settings page of the project, enable %1$s, and choose " +"content to connect." +msgstr "" + +#: website/static/js/addonSettings.js:109 +msgid "" +"Error while authorizing add-on. Please log in to your %1$s account and " +"grant access to the GakuNin RDM to enable this add-on." +msgstr "" + +#: website/static/js/addonSettings.js:120 +msgid "" +"Are you sure you want to disconnect the %1$s account " +"%2$s? This will revoke access to %1$s for all projects " +"you have authorized." +msgstr "" + +#: website/static/js/alertsManager.js:42 +msgid "Could not dismiss alert. Please refresh page and try again." +msgstr "" + +#: website/static/js/alertsManager.js:43 website/static/js/alertsManager.js:77 +msgid "Error fetching user alerts" +msgstr "" + +#: website/static/js/alertsManager.js:76 +msgid "Could not fetch alerts for this page. Please refresh page and try again." +msgstr "" + +#: website/static/js/apiApplication.js:215 +msgid "Error fetching list of registered applications" +msgstr "" + +#: website/static/js/apiApplication.js:226 +#: website/static/js/apiApplication.js:396 +msgid "Deactivate application?" +msgstr "" + +#: website/static/js/apiApplication.js:234 +#: website/static/js/apiPersonalToken.js:213 +msgid " has been deactivated" +msgstr "" + +#: website/static/js/apiApplication.js:245 +#: website/static/js/apiApplication.js:416 +#: website/static/js/apiPersonalToken.js:224 +#: website/static/js/apiPersonalToken.js:395 +msgid "Deactivate" +msgstr "" + +#: website/static/js/apiApplication.js:295 +#: website/static/js/apiPersonalToken.js:274 +msgid "There are unsaved changes on this page." +msgstr "" + +#: website/static/js/apiApplication.js:309 +msgid "Error fetching application data" +msgstr "" + +#: website/static/js/apiApplication.js:344 +#: website/static/js/apiPersonalToken.js:323 +msgid "Error updating instance" +msgstr "" + +#: website/static/js/apiApplication.js:370 +msgid "Error registering new OAuth2 application" +msgstr "" + +#: website/static/js/apiApplication.js:429 +msgid "Reset client secret?" +msgstr "" + +#: website/static/js/apiApplication.js:447 +msgid "Error resetting instance secret" +msgstr "" + +#: website/static/js/apiApplication.js:459 +msgid "Reset Secret" +msgstr "" + +#: website/static/js/apiApplication.js:473 +#: website/static/js/apiPersonalToken.js:412 website/static/js/profile.js:357 +msgid "Discard changes?" +msgstr "" + +#: website/static/js/apiApplication.js:483 +#: website/static/js/apiPersonalToken.js:422 website/static/js/profile.js:369 +msgid "Discard" +msgstr "" + +#: website/static/js/apiPersonalToken.js:194 +msgid "Error fetching list of registered personal access tokens" +msgstr "" + +#: website/static/js/apiPersonalToken.js:205 +msgid "Deactivate personal access token?" +msgstr "" + +#: website/static/js/apiPersonalToken.js:288 +msgid "Error fetching token data" +msgstr "" + +#: website/static/js/apiPersonalToken.js:349 +msgid "Error registering new OAuth2 personal access token" +msgstr "" + +#: website/static/js/apiPersonalToken.js:375 +msgid "Deactivate token?" +msgstr "" + +#: website/static/js/citationGrid.js:180 +msgid "Copy citation" +msgstr "" + +#: website/static/js/citationGrid.js:190 +msgid "View original document" +msgstr "" + +#: website/static/js/citationGrid.js:202 website/static/js/fangorn.js:2041 +msgid "View on %1$s" +msgstr "" + +#: website/static/js/citationGrid.js:213 +msgid "Download citations" +msgstr "" + +#: website/static/js/citationGrid.js:242 +msgid "Citation" +msgstr "" + +#: website/static/js/citationGrid.js:246 +msgid "Actions" +msgstr "" + +#: website/static/js/citationGrid.js:294 +msgid "Only 200 citations may be displayed" +msgstr "" + +#: website/static/js/citationGrid.js:311 website/static/js/citationWidget.js:44 +msgid "Enter citation style (e.g. \"APA\")" +msgstr "" + +#: website/static/js/citationGrid.js:333 +msgid "Error while selecting citation style: " +msgstr "" + +#: website/static/js/citationGrid.js:412 +msgid "" +"Could not render entry. Please check the contents of your citations " +"for correctness." +msgstr "" + +#: website/static/js/citationList.js:113 +msgid "Your custom citation not updated. Please refresh the page and try " +msgstr "" + +#: website/static/js/citationList.js:114 +msgid "again or contact %1$s" +msgstr "" + +#: website/static/js/citationList.js:114 +#: website/static/js/components/publicNodes.js:192 +#: website/static/js/components/quickFiles.js:123 +#: website/static/js/osfHelpers.js:311 +msgid " if the problem persists." +msgstr "" + +#: website/static/js/citationWidget.js:46 +#: website/static/js/pages/project-dashboard-page.js:170 +#, python-format +msgid "Please enter %s or more characters" +msgstr "" + +#: website/static/js/citationWidget.js:47 website/static/js/pointers.js:30 +msgid "Searching..." +msgstr "" + +#: website/static/js/citationWidget.js:48 +msgid "No matches found." +msgstr "" + +#: website/static/js/citationWidget.js:77 +msgid "Citation render failed" +msgstr "" + +#: website/static/js/citationWidget.js:78 +msgid "The requested citation format generated an error." +msgstr "" + +#: website/static/js/citationWidget.js:81 +msgid "Unexpected error when fetching citation" +msgstr "" + +#: website/static/js/citationsNodeConfig.js:38 +#: website/static/js/citationsNodeConfig.js:42 +msgid "Successfully linked \"%1$s\"." +msgstr "" + +#: website/static/js/citationsNodeConfig.js:38 +msgid " Go to the Overview page to view your citations." +msgstr "" + +#: website/static/js/citationsNodeConfig.js:42 +msgid " Next, choose which folder to link above." +msgstr "" + +#: website/static/js/citationsNodeConfig.js:81 +#: website/static/js/oauthAddonNodeConfig.js:209 +msgid "Could not GET %1$s accounts for user" +msgstr "" + +#: website/static/js/citationsNodeConfig.js:147 +msgid "Choose %1$s Access Token to Import" +msgstr "" + +#: website/static/js/citationsNodeConfig.js:166 +#: website/static/js/citationsNodeConfig.js:184 +#: website/static/js/folderPickerNodeConfig.js:507 +#: website/static/js/oauthAddonNodeConfig.js:153 +#: website/static/js/oauthAddonNodeConfig.js:171 +msgid "Import" +msgstr "" + +#: website/static/js/citationsNodeConfig.js:175 +msgid "Import %1$s access token" +msgstr "" + +#: website/static/js/clipboard.js:27 +msgid "Copied!" +msgstr "" + +#: website/static/js/clipboard.js:32 +msgid "Copy failed!" +msgstr "" + +#: website/static/js/comment.js:55 +msgid "Error getting contributors and group members" +msgstr "" + +#: website/static/js/comment.js:73 +msgid "Spam or advertising" +msgstr "" + +#: website/static/js/comment.js:74 +msgid "Hate speech" +msgstr "" + +#: website/static/js/comment.js:75 +msgid "Violence or harmful behavior" +msgstr "" + +#: website/static/js/comment.js:212 +msgid "Commenting" +msgstr "" + +#: website/static/js/comment.js:212 +msgid "Comment" +msgstr "" + +#: website/static/js/comment.js:232 +msgid "Exceeds character limit. Please reduce to %1$s characters or less." +msgstr "" + +#: website/static/js/comment.js:347 website/static/js/comment.js:555 +msgid "Please enter a comment" +msgstr "" + +#: website/static/js/comment.js:393 website/static/js/comment.js:588 +msgid "Could not submit comment" +msgstr "" + +#: website/static/js/comment.js:394 +msgid "Error creating comment" +msgstr "" + +#: website/static/js/comment.js:589 +msgid "Error editing comment" +msgstr "" + +#: website/static/js/comment.js:634 +msgid "Could not report abuse." +msgstr "" + +#: website/static/js/comment.js:635 +msgid "Error reporting abuse" +msgstr "" + +#: website/static/js/comment.js:664 +msgid "Error deleting comment" +msgstr "" + +#: website/static/js/comment.js:702 +msgid "Error undeleting comment" +msgstr "" + +#: website/static/js/comment.js:727 +msgid "Error unreporting comment" +msgstr "" + +#: website/static/js/comment.js:807 +msgid "Your comments have unsaved changes. Are you sure " +msgstr "" + +#: website/static/js/comment.js:808 +msgid "you want to leave this page?" +msgstr "" + +#: website/static/js/comment.js:826 +msgid "Could not update comment timestamp" +msgstr "" + +#: website/static/js/commentpane.js:31 +msgid "Option `toggleWidth` must be greater than or equal to " +msgstr "" + +#: website/static/js/commentpane.js:32 +msgid "option `maxWidthProp`." +msgstr "" + +#: website/static/js/conference.js:25 +msgid "Author" +msgstr "" + +#: website/static/js/conference.js:37 +msgid "Date Created" +msgstr "" + +#: website/static/js/conference.js:43 website/static/js/fangorn.js:1683 +msgid "Downloads" +msgstr "" + +#: website/static/js/contribAdder.js:26 +msgid " project in common" +msgstr "" + +#: website/static/js/contribAdder.js:28 +msgid "Yourself" +msgstr "" + +#: website/static/js/contribAdder.js:30 +msgid " projects in common" +msgstr "" + +#: website/static/js/contribAdder.js:82 +msgid "Add Contributors" +msgstr "" + +#: website/static/js/contribAdder.js:83 +msgid "Select Components" +msgstr "" + +#: website/static/js/contribAdder.js:85 +msgid "Invite new contributor by e-mail" +msgstr "" + +#: website/static/js/contribAdder.js:86 +msgid "Add Unregistered Contributor" +msgstr "" + +#: website/static/js/contribAdder.js:331 +msgid "Full Name is required." +msgstr "" + +#: website/static/js/contribAdder.js:334 +msgid "Not a valid email address." +msgstr "" + +#: website/static/js/contribAdder.js:341 +msgid "%1$s is already in queue." +msgstr "" + +#: website/static/js/contribAdder.js:460 +msgid "There was a problem trying to add contributors%1$s." +msgstr "" + +#: website/static/js/contribAdder.js:461 +msgid "Could not add contributors" +msgstr "" + +#: website/static/js/contribAdder.js:462 +#: website/static/js/contribManager.js:139 +msgid "Error adding contributors" +msgstr "" + +#: website/static/js/contribAdder.js:532 +#: website/static/js/institutionProjectSettings.js:254 +#: website/static/js/nodesDelete.js:194 website/static/js/nodesPrivacy.js:207 +msgid "Unable to retrieve project settings" +msgstr "" + +#: website/static/js/contribAdder.js:533 +#: website/static/js/institutionProjectSettings.js:255 +#: website/static/js/nodesDelete.js:195 website/static/js/nodesPrivacy.js:208 +msgid "Could not GET project settings." +msgstr "" + +#: website/static/js/contribManager.js:137 +msgid "There was a problem trying to add the contributor. " +msgstr "" + +#: website/static/js/contribManager.js:138 +msgid "Could not add contributor" +msgstr "" + +#: website/static/js/contribManager.js:300 +msgid "Must have at least one registered admin contributor" +msgstr "" + +#: website/static/js/contribManager.js:308 +msgid "Must have at least one bibliographic contributor" +msgstr "" + +#: website/static/js/contribManager.js:364 +msgid "Your contributor list has unsaved changes. Please " +msgstr "" + +#: website/static/js/contribManager.js:365 +msgid "save or cancel your changes before adding " +msgstr "" + +#: website/static/js/contribManager.js:366 +msgid "contributors." +msgstr "" + +#: website/static/js/contribManager.js:375 +msgid "There are unsaved changes to your contributor settings" +msgstr "" + +#: website/static/js/contribManager.js:404 +msgid "Save changes?" +msgstr "" + +#: website/static/js/contribManager.js:405 +msgid "Are you sure you want to save these changes?" +msgstr "" + +#: website/static/js/contribManager.js:421 +msgid "Submission failed: " +msgstr "" + +#: website/static/js/contribManager.js:429 +#: website/static/js/filepage/editor.js:180 +msgid "Save" +msgstr "" + +#: website/static/js/contribRemover.js:56 +#: website/static/js/contribRemover.js:57 +#: website/static/js/contribRemover.js:58 +msgid "Remove Contributor" +msgstr "" + +#: website/static/js/contribRemover.js:208 +#: website/static/js/contribRemover.js:209 +msgid "Unable to retrieve projects and components" +msgstr "" + +#: website/static/js/contribRemover.js:232 +msgid "Unable to delete Contributor" +msgstr "" + +#: website/static/js/contribRemover.js:233 +msgid "Could not DELETE Contributor." +msgstr "" + +#: website/static/js/fangorn.js:38 +msgid "Upload pending..." +msgstr "" + +#: website/static/js/fangorn.js:41 +msgid "Copying " +msgstr "" + +#: website/static/js/fangorn.js:44 +msgid "Deleting " +msgstr "" + +#: website/static/js/fangorn.js:47 +msgid "Moving " +msgstr "" + +#: website/static/js/fangorn.js:50 +msgid "Renaming " +msgstr "" + +#: website/static/js/fangorn.js:448 +msgid "Not allowed: Private folder" +msgstr "" + +#: website/static/js/fangorn.js:492 website/static/js/fangorn.js:522 +msgid "You cannot replace the Wiki images folder" +msgstr "" + +#: website/static/js/fangorn.js:497 website/static/js/fangorn.js:530 +msgid "An item named \"%1$s\" already exists in this location." +msgstr "" + +#: website/static/js/fangorn.js:499 website/static/js/fangorn.js:508 +#: website/static/js/fangorn.js:532 +msgid "Keep Both" +msgstr "" + +#: website/static/js/fangorn.js:499 website/static/js/fangorn.js:532 +msgid " will retain both files (and their version histories) in this location." +msgstr "" + +#: website/static/js/fangorn.js:501 website/static/js/fangorn.js:509 +#: website/static/js/fangorn.js:534 +msgid "Replace" +msgstr "" + +#: website/static/js/fangorn.js:501 website/static/js/fangorn.js:534 +msgid " will overwrite the existing file in this location. " +msgstr "" + +#: website/static/js/fangorn.js:502 website/static/js/fangorn.js:535 +msgid "You will lose previous versions of the overwritten file. " +msgstr "" + +#: website/static/js/fangorn.js:503 website/static/js/fangorn.js:536 +msgid "You will keep previous versions of the moved file." +msgstr "" + +#: website/static/js/fangorn.js:504 +msgid "\"Skip\" will skip the current file." +msgstr "" + +#: website/static/js/fangorn.js:505 +msgid "\"Stop\" will only move files with no conflicts." +msgstr "" + +#: website/static/js/fangorn.js:510 +msgid "Skip" +msgstr "" + +#: website/static/js/fangorn.js:511 +msgid "Stop" +msgstr "" + +#: website/static/js/fangorn.js:513 +#, python-format +msgid "Replace \"%s\"?" +msgstr "" + +#: website/static/js/fangorn.js:537 +msgid " will cancel the move." +msgstr "" + +#: website/static/js/fangorn.js:546 +msgid "Replace \"%1$s\"?" +msgstr "" + +#: website/static/js/fangorn.js:576 +msgid "%1$s conflicts left to resolve." +msgid_plural "%1$s conflict left to resolve." +msgstr[0] "" +msgstr[1] "" + +#: website/static/js/fangorn.js:655 +msgid "%1$s \"%2$s\" to \"%3$s\" is taking a bit longer than expected." +msgstr "" + +#: website/static/js/fangorn.js:656 +msgid "We'll send you an email when it has finished." +msgstr "" + +#: website/static/js/fangorn.js:657 +msgid "" +"In the mean time you can leave this page; your %1$s will still be " +"completed." +msgstr "" + +#: website/static/js/fangorn.js:662 +msgid "Operation Information" +msgstr "" + +#: website/static/js/fangorn.js:668 +msgid "Successfully %1$s." +msgstr "" + +#: website/static/js/fangorn.js:715 +msgid "Please refresh the page or contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/fangorn.js:720 +msgid "Failed to move or copy file" +msgstr "" + +#: website/static/js/fangorn.js:998 +msgid "Could not upload file. The file may be invalid " +msgstr "" + +#: website/static/js/fangorn.js:999 +msgid "or the file folder has been deleted." +msgstr "" + +#: website/static/js/fangorn.js:1007 website/static/js/fangorn.js:1012 +msgid "Cannot upload folders." +msgstr "" + +#: website/static/js/fangorn.js:1014 +msgid "Cannot upload file due to insufficient storage." +msgstr "" + +#: website/static/js/fangorn.js:1019 +msgid "Could not upload file. Possible reasons:
                                              " +msgstr "" + +#: website/static/js/fangorn.js:1020 +msgid "1. Cannot upload folders.
                                              2. " +msgstr "" + +#: website/static/js/fangorn.js:1022 +msgid "Unable to reach the provider, please try again later. " +msgstr "" + +#: website/static/js/fangorn.js:1023 +msgid "If the problem persists, please contact %1$s." +msgstr "" + +#: website/static/js/fangorn.js:1111 +msgid "Please enter a folder name." +msgstr "" + +#: website/static/js/fangorn.js:1115 +msgid "Folder name contains illegal characters." +msgstr "" + +#: website/static/js/fangorn.js:1138 +msgid "New folder created!" +msgstr "" + +#: website/static/js/fangorn.js:1147 +msgid "Folder creation failed." +msgstr "" + +#: website/static/js/fangorn.js:1165 +msgid " Deleting..." +msgstr "" + +#: website/static/js/fangorn.js:1187 +msgid "Delete failed." +msgstr "" + +#: website/static/js/fangorn.js:1202 +msgid "" +"This folder and all of its contents will be deleted. This folder is " +"linked to " +msgstr "" + +#: website/static/js/fangorn.js:1203 +msgid "your wiki(s). Deleting it will remove images embedded in your wiki(s). " +msgstr "" + +#: website/static/js/fangorn.js:1204 website/static/js/fangorn.js:1232 +#: website/static/js/fangorn.js:1255 website/static/js/pages/base-page.js:132 +msgid "This action is irreversible." +msgstr "" + +#: website/static/js/fangorn.js:1207 +msgid "" +"This folder and ALL its contents will be deleted. This action is " +"irreversible." +msgstr "" + +#: website/static/js/fangorn.js:1213 website/static/js/fangorn.js:1236 +#: website/static/js/fangorn.js:1996 website/static/js/fangorn.js:2032 +#: website/static/js/filepage/index.js:209 +#: website/static/js/filepage/index.js:522 website/static/js/myProjects.js:1637 +msgid "Delete" +msgstr "" + +#: website/static/js/fangorn.js:1215 website/static/js/fangorn.js:1240 +msgid "Delete \"%1$s\"?" +msgstr "" + +#: website/static/js/fangorn.js:1217 +msgid "You don't have permission to delete this file." +msgstr "" + +#: website/static/js/fangorn.js:1225 +msgid "This file may be linked to your wiki(s). Deleting it will remove the" +msgstr "" + +#: website/static/js/fangorn.js:1226 +msgid " image embedded in your wiki(s). " +msgstr "" + +#: website/static/js/fangorn.js:1266 +msgid "" +"Some of the selected items are folders. This will delete the folder(s) " +"and ALL of their content." +msgstr "" + +#: website/static/js/fangorn.js:1280 +msgid " may be linked to" +msgstr "" + +#: website/static/js/fangorn.js:1281 +msgid " your wiki(s). Deleting them will remove images embedded in your wiki(s). " +msgstr "" + +#: website/static/js/fangorn.js:1289 +msgid "Delete All" +msgstr "" + +#: website/static/js/fangorn.js:1293 +msgid "" +"Some of these files can't be deleted but you can delete the ones " +"highlighted with green. This action is irreversible." +msgstr "" + +#: website/static/js/fangorn.js:1308 +msgid "Delete Some" +msgstr "" + +#: website/static/js/fangorn.js:1311 +msgid "Delete multiple files?" +msgstr "" + +#: website/static/js/fangorn.js:1337 +msgid "" +"Unable to check out file. This is most likely due to the file being " +"already checked-out" +msgstr "" + +#: website/static/js/fangorn.js:1338 +msgid " by another user." +msgstr "" + +#: website/static/js/fangorn.js:1670 website/static/js/fileViewTreebeard.js:63 +#: website/static/js/filesWidget.js:34 website/static/js/meetings.js:18 +#: website/static/js/pages/project-dashboard-page.js:549 +#: website/static/js/project-organizer.js:192 +#: website/static/js/project-organizer.js:208 website/static/js/wikiMenu.js:58 +msgid "Name" +msgstr "" + +#: website/static/js/fangorn.js:1675 +msgid "Size" +msgstr "" + +#: website/static/js/fangorn.js:1679 +msgid "Version" +msgstr "" + +#: website/static/js/fangorn.js:1687 +#: website/static/js/pages/project-dashboard-page.js:555 +#: website/static/js/project-organizer.js:201 +msgid "Modified" +msgstr "" + +#: website/static/js/fangorn.js:1761 +msgid "Unable to retrieve components." +msgstr "" + +#: website/static/js/fangorn.js:1763 +msgid "Unable to retrieve components for node %1$s" +msgstr "" + +#: website/static/js/fangorn.js:1845 +msgid "You cannot rename your Wiki images folder." +msgstr "" + +#: website/static/js/fangorn.js:1953 +msgid "Upload" +msgstr "" + +#: website/static/js/fangorn.js:1960 +msgid "Create Folder" +msgstr "" + +#: website/static/js/fangorn.js:1967 +msgid "Delete Folder" +msgstr "" + +#: website/static/js/fangorn.js:1976 website/static/js/filepage/index.js:525 +#: website/static/js/filepage/revisions.js:111 +msgid "Download" +msgstr "" + +#: website/static/js/fangorn.js:1986 website/static/js/filepage/index.js:547 +msgid "View" +msgstr "" + +#: website/static/js/fangorn.js:2002 website/static/js/filepage/index.js:221 +msgid "This would mean " +msgstr "" + +#: website/static/js/fangorn.js:2003 website/static/js/filepage/index.js:222 +msgid "" +"other contributors cannot edit, delete or upload new versions of this " +"file " +msgstr "" + +#: website/static/js/fangorn.js:2004 +msgid "as long as it is checked-out. You can check it back in at anytime." +msgstr "" + +#: website/static/js/fangorn.js:2009 website/static/js/fangorn.js:2014 +#: website/static/js/filepage/index.js:248 +msgid "Check out file" +msgstr "" + +#: website/static/js/fangorn.js:2010 +msgid "Confirm file check-out?" +msgstr "" + +#: website/static/js/fangorn.js:2023 +msgid "Check in file" +msgstr "" + +#: website/static/js/fangorn.js:2051 +msgid "Download as zip" +msgstr "" + +#: website/static/js/fangorn.js:2062 website/static/js/myProjects.js:1613 +msgid "Rename" +msgstr "" + +#: website/static/js/fangorn.js:2144 +msgid "New folder name" +msgstr "" + +#: website/static/js/fangorn.js:2172 +msgid "Enter name" +msgstr "" + +#: website/static/js/fangorn.js:2209 +msgid "Cancel Pending Uploads" +msgstr "" + +#: website/static/js/fangorn.js:2233 +msgid "Delete Multiple" +msgstr "" + +#: website/static/js/fangorn.js:2244 website/static/js/fangorn.js:2955 +msgid "Filter" +msgstr "" + +#: website/static/js/fangorn.js:2249 +msgid "Select rows:" +msgstr "" + +#: website/static/js/fangorn.js:2249 +msgid "" +" Click on a row (outside the add-on, file, or folder name) to show " +"further actions in the toolbar. Use Command or Shift keys to select " +"multiple files." +msgstr "" + +#: website/static/js/fangorn.js:2250 +msgid "Open files:" +msgstr "" + +#: website/static/js/fangorn.js:2250 +msgid " Click a file name to go to view the file in the GakuNin RDM." +msgstr "" + +#: website/static/js/fangorn.js:2251 +msgid "Open files in new tab:" +msgstr "" + +#: website/static/js/fangorn.js:2251 +msgid "" +" Press Command (Ctrl in Windows) and click a file name to open it in a " +"new tab." +msgstr "" + +#: website/static/js/fangorn.js:2252 +msgid "Download as zip:" +msgstr "" + +#: website/static/js/fangorn.js:2252 +msgid "" +" Click on the row of an add-on or folder and click the Download as Zip " +"button in the toolbar." +msgstr "" + +#: website/static/js/fangorn.js:2252 +msgid " Not available for all storage add-ons." +msgstr "" + +#: website/static/js/fangorn.js:2253 +msgid "Copy files:" +msgstr "" + +#: website/static/js/fangorn.js:2253 +msgid "" +" Press Option (Alt in Windows) while dragging a file to a new folder or " +"component." +msgstr "" + +#: website/static/js/fangorn.js:2253 +msgid " Only for contributors with write access." +msgstr "" + +#: website/static/js/fangorn.js:2259 +msgid "How to Use the File Browser" +msgstr "" + +#: website/static/js/fangorn.js:2323 +msgid "Please wait for current action to complete" +msgstr "" + +#: website/static/js/fangorn.js:2504 +msgid "Upload Status" +msgstr "" + +#: website/static/js/fangorn.js:2504 +msgid " files succeeded." +msgstr "" + +#: website/static/js/fangorn.js:2605 +msgid "Done" +msgstr "" + +#: website/static/js/fangorn.js:2607 +msgid "Move Status" +msgstr "" + +#: website/static/js/fangorn.js:2609 +msgid " files successfully moved." +msgstr "" + +#: website/static/js/fangorn.js:2610 +msgid " Skipped %1$s/%2$s files." +msgstr "" + +#: website/static/js/fangorn.js:2880 +msgid "You have pending uploads, if you leave this page they may not complete." +msgstr "" + +#: website/static/js/fangorn.js:2883 +msgid "" +"You have pending file operations, if you leave this page they may not " +"complete." +msgstr "" + +#: website/static/js/fangorn.js:2917 +msgid "This file is too large (%1$s). Max file size is %2$s." +msgstr "" + +#: website/static/js/fangorn.js:2933 +msgid "Not enough quota to upload the file." +msgstr "" + +#: website/static/js/fangorn.js:2940 +msgid "Quota usage alert" +msgstr "" + +#: website/static/js/fangorn.js:2941 +#, python-format +msgid "You have used more than %1$s% of your quota." +msgstr "" + +#: website/static/js/fileViewTreebeard.js:120 +msgid "Uploading %1$s..." +msgstr "" + +#: website/static/js/filesWidget.js:77 +msgid "Could not GET files" +msgstr "" + +#: website/static/js/filesWidget.js:92 +msgid "Sorry, we could not load files right now. " +msgstr "" + +#: website/static/js/firebase-messaging-sw.js:11 +msgid "RDM Announcements" +msgstr "" + +#: website/static/js/firebase-messaging-sw.js:13 +msgid "Background Message body." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:108 +msgid "" +"Could not retrieve %1$s settings at this time. The credentials associated" +" with this %1$s account may no longer be valid." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:109 +msgid "" +" Try disconnecting and reconnecting the %1$s account on your account settings page." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:112 +msgid "" +"Could not retrieve %1$s settings at this time. The %1$s addon credentials" +" may no longer be valid." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:113 +msgid " Contact %1$s to verify." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:116 +msgid "" +"Could not retrieve %1$s settings at this time. Please refresh the page. " +"If the problem persists, email %2$s." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:119 +msgid "" +"Could not retrieve %1$s account list at this time. Please refresh the " +"page. If the problem persists, email %2$s." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:122 +msgid "Disconnected %1$s." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:125 +msgid "" +"Could not disconnect %1$s account because of an error. Please try again " +"later." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:128 +msgid "Successfully connected a %1$s account" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:131 +msgid "" +"Error while authorizing addon. Please log in to your %1$s account and " +"grant access to the GakuNin RDM to enable this addon." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:139 +msgid "Could not change %1$s settings. Please try again later." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:142 +msgid "Are you sure you want to remove this %1$s account?" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:145 +msgid "Are you sure you want to link your %1$s account with this project?" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:148 +msgid "Successfully imported %1$s account from profile." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:151 +msgid "Error occurred while importing %1$s account." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:154 +msgid "Error occurred while importing %1$s group libraries." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:157 +msgid "Could not connect to %1$s at this time. Please try again later." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:321 +msgid "Could not GET %1$s settings" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:349 +#: website/static/js/folderPickerNodeConfig.js:382 +msgid "Failed to update %1$s settings." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:431 +msgid "Failed to import %1$s access token." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:443 +msgid "Failed to import %1$s group libraries." +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:497 +#: website/static/js/oauthAddonNodeConfig.js:162 +msgid "Import %1$s Account?" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:536 +msgid "Could not deauthorize %1$s account from node" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:552 +msgid "Disconnect %1$s Account?" +msgstr "" + +#: website/static/js/folderPickerNodeConfig.js:645 +#: website/static/js/folderPickerNodeConfig.js:656 +msgid "Could not GET get %1$s contents." +msgstr "" + +#: website/static/js/folderpicker.js:101 +msgid "Folders" +msgstr "" + +#: website/static/js/folderpicker.js:105 +msgid "Select" +msgstr "" + +#: website/static/js/institutionNodes.js:26 +msgid "Failed to load Institution's nodes" +msgstr "" + +#: website/static/js/institutionProjectSettings.js:47 +#: website/static/js/institutionProjectSettings.js:127 +msgid "Add institution" +msgstr "" + +#: website/static/js/institutionProjectSettings.js:47 +#: website/static/js/institutionProjectSettings.js:127 +msgid "Remove institution" +msgstr "" + +#: website/static/js/institutionProjectSettings.js:59 +msgid "" +"Add %1$s to %2$s or to %3$s and every component in " +"it?

                                              " +msgstr "" + +#: website/static/js/institutionProjectSettings.js:60 +msgid "Add to %1$s." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:61 +msgid "Add to %1$s and every component for which you have permission." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:64 +msgid "" +"Remove %1$s from %2$s or from %3$s and every " +"component in it?

                                              " +msgstr "" + +#: website/static/js/institutionProjectSettings.js:65 +msgid "Remove from %1$s." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:66 +msgid "Remove from %1$s and every component for which you have permission." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:69 +#: website/static/js/institutionProjectSettings.js:86 +msgid "Warning, you are not affiliated with %1$s." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:70 +#: website/static/js/institutionProjectSettings.js:87 +msgid " If you remove it from your project, you cannot add it back.
                                              " +msgstr "" + +#: website/static/js/institutionProjectSettings.js:85 +msgid "Remove %1$s from %2$s." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:157 +msgid "Updating affiliation... this may take a minute." +msgstr "" + +#: website/static/js/institutionProjectSettings.js:202 +msgid "" +"Unable to modify the institution on this node. Please try again. If the " +"problem persists, email %1$s" +msgstr "" + +#: website/static/js/institutionProjectSettings.js:203 +msgid "Unable to modify this institution!" +msgstr "" + +#: website/static/js/js_messages.js:3 +msgid "Bookmarks" +msgstr "" + +#: website/static/js/js_messages.js:5 +msgid "Edit" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Analysis" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Communication" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Data" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Hypothesis" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Instrumentation" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Methods and Measures" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Procedure" +msgstr "" + +#: website/static/js/js_messages.js:7 +#: website/static/js/projectSettingsTreebeardBase.js:90 +msgid "Project" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Software" +msgstr "" + +#: website/static/js/js_messages.js:7 +msgid "Other" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "analysis" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "communication" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "data" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "hypothesis" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "instrumentation" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "methods and measures" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "procedure" +msgstr "" + +#: website/static/js/js_messages.js:9 website/static/js/nodeControl.js:114 +#: website/static/js/nodeSelectTreebeard.js:87 +#: website/static/js/nodesDeleteTreebeard.js:62 +#: website/static/js/nodesPrivacySettingsTreebeard.js:62 +msgid "project" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "software" +msgstr "" + +#: website/static/js/js_messages.js:9 +msgid "other" +msgstr "" + +#: website/static/js/js_messages.js:11 website/static/js/js_messages.js:13 +msgid "Comments added" +msgstr "" + +#: website/static/js/js_messages.js:11 website/static/js/js_messages.js:13 +msgid "Files updated" +msgstr "" + +#: website/static/js/js_messages.js:13 +msgid "Replies to your comments" +msgstr "" + +#: website/static/js/js_messages.js:13 +msgid "Mentions added" +msgstr "" + +#: website/static/js/js_messages.js:13 +msgid "Preprint submissions updated" +msgstr "" + +#: website/static/js/js_messages.js:15 +msgid "No license" +msgstr "" + +#: website/static/js/js_messages.js:17 website/static/js/passwordForms.js:178 +#: website/static/js/passwordForms.js:241 +msgid "This field is required." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a value greater than or equal to {0}." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a value less than or equal to {0}." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter at least {0} characters." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter no more than {0} characters." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please check this value." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "The value must increment by {0}." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a proper email address." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a proper date." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a number." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a digit." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please specify a valid phone number." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Values must equal." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please choose another value." +msgstr "" + +#: website/static/js/js_messages.js:17 +msgid "Please make sure the value is unique." +msgstr "" + +#: website/static/js/js_messages.js:19 +msgid "Project Wiki Pages" +msgstr "" + +#: website/static/js/js_messages.js:19 +msgid "Component Wiki Pages" +msgstr "" + +#: website/static/js/js_messages.js:19 +msgid "Home" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Projects" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Components" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Registrations" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Users" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "All Results" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Files" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Institutions" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Preprints" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Groups" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Wiki" +msgstr "" + +#: website/static/js/js_messages.js:21 +msgid "Comments" +msgstr "" + +#: website/static/js/js_messages.js:23 +msgid "Default Notification Settings" +msgstr "" + +#: website/static/js/js_messages.js:23 +msgid "" +"These are default settings for new projects you create or are added to. " +"Modifying these settings will not modify settings on existing projects." +msgstr "" + +#: website/static/js/js_messages.js:23 +msgid "Project Notifications" +msgstr "" + +#: website/static/js/js_messages.js:23 +msgid "" +"These are settings for each of your projects. Modifying these settings " +"will only modify the settings for the selected project." +msgstr "" + +#: website/static/js/js_messages.js:25 +msgid "moved" +msgstr "" + +#: website/static/js/js_messages.js:25 +msgid "renamed" +msgstr "" + +#: website/static/js/js_messages.js:27 +msgid "Skipped" +msgstr "" + +#: website/static/js/js_messages.js:27 +msgid "Moved or replaced old version" +msgstr "" + +#: website/static/js/js_messages.js:27 +msgid "Kept both versions" +msgstr "" + +#: website/static/js/js_messages.js:29 +msgid "admin" +msgstr "" + +#: website/static/js/js_messages.js:29 +msgid "write" +msgstr "" + +#: website/static/js/js_messages.js:29 +msgid "read" +msgstr "" + +#: website/static/js/js_messages.js:31 +msgid "home" +msgstr "" + +#: website/static/js/js_messages.js:33 +msgid "No tokens." +msgstr "" + +#: website/static/js/js_messages.js:33 +msgid "Invalid tokens." +msgstr "" + +#: website/static/js/js_messages.js:35 +msgid "Invalid folder." +msgstr "" + +#: website/static/js/js_messages.js:35 +msgid "Credentials are valid" +msgstr "" + +#: website/static/js/keen.js:114 +msgid "Error sending Keen data to %1$s:<%2$s>" +msgstr "" + +#: website/static/js/keen.js:132 +msgid "Error sending Keen data for multiple events: <%1$s>" +msgstr "" + +#: website/static/js/keen.js:141 +msgid "Error sending Keen data to %1$s." +msgstr "" + +#: website/static/js/keen.js:153 +msgid "Cannot instantiate another KeenTracker instance." +msgstr "" + +#: website/static/js/koHelpers.js:129 +msgid "End date must be greater than or equal to the start date." +msgstr "" + +#: website/static/js/koHelpers.js:147 +msgid "Date must be greater than or equal to 1900." +msgstr "" + +#: website/static/js/koHelpers.js:169 +msgid "Please enter a date prior to the current date." +msgstr "" + +#: website/static/js/koHelpers.js:175 +msgid "Please enter a valid year." +msgstr "" + +#: website/static/js/koHelpers.js:190 +msgid "Please enter a valid URL." +msgstr "" + +#: website/static/js/koHelpers.js:197 +msgid "The field does not match the required input." +msgstr "" + +#: website/static/js/licensePicker.js:20 website/static/js/profile.js:128 +#: website/static/js/profile.js:132 +msgid "Year" +msgstr "" + +#: website/static/js/licensePicker.js:21 +msgid "Copyright Holders" +msgstr "" + +#: website/static/js/licensePicker.js:26 +msgid "License:" +msgstr "" + +#: website/static/js/licensePicker.js:27 +msgid "Choose a license:" +msgstr "" + +#: website/static/js/licensePicker.js:28 +msgid ">Save<" +msgstr "" + +#: website/static/js/licensePicker.js:68 +msgid "Add a license" +msgstr "" + +#: website/static/js/licensePicker.js:104 +msgid "Please specify a valid year." +msgstr "" + +#: website/static/js/licensePicker.js:108 +msgid "Future years are not allowed." +msgstr "" + +#: website/static/js/licensePicker.js:190 +msgid "License updated successfully." +msgstr "" + +#: website/static/js/licensePicker.js:195 +msgid "There was a problem updating your license. Please try again." +msgstr "" + +#: website/static/js/licensePicker.js:239 +msgid "Your Own License" +msgstr "" + +#: website/static/js/licensePicker.js:240 +msgid "" +"You have opted to use your own license. Please upload a license file " +"named \"license.txt\" into the GakuNin RDM Storage of this project." +msgstr "" + +#: website/static/js/licensePicker.js:247 +msgid "Add license" +msgstr "" + +#: website/static/js/licenses.js:27 +msgid "Content:" +msgstr "" + +#: website/static/js/licenses.js:31 +msgid "Code - Permissive:" +msgstr "" + +#: website/static/js/licenses.js:35 +msgid "Code - Copyleft:" +msgstr "" + +#: website/static/js/licenses.js:39 +msgid "Code - Other:" +msgstr "" + +#: website/static/js/logActionsList_extract.js:3 +#: website/static/js/logActionsList_extract.js:70 +msgid "${user} created ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:4 +msgid "${user} registered ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:5 +msgid "${node} registered" +msgstr "" + +#: website/static/js/logActionsList_extract.js:6 +msgid "" +"${user} submitted for review to the Preregistration Challenge a " +"registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:7 +msgid "${user} deleted ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:8 +msgid "${user} created ${node} based on ${template}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:9 +msgid "${user} created a link to ${pointer_category} ${pointer}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:10 +msgid "${user} forked a link to ${pointer_category} ${pointer}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:11 +msgid "${user} removed a link to ${pointer_category} ${pointer}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:12 +msgid "${user} added ${group} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:13 +msgid "${user} removed ${group} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:14 +msgid "${user} changed ${group} permissions to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:15 +msgid "${user} made ${node} public" +msgstr "" + +#: website/static/js/logActionsList_extract.js:16 +msgid "${node} made public" +msgstr "" + +#: website/static/js/logActionsList_extract.js:17 +msgid "${user} made ${node} private" +msgstr "" + +#: website/static/js/logActionsList_extract.js:18 +msgid "${user} added tag ${tag} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:19 +msgid "${user} removed tag ${tag} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:20 +msgid "${user} changed the title from ${title_original} to ${title_new}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:21 +msgid "${user} edited description of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:22 +msgid "${user} changed the ${updated_fields} for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:23 +msgid "${user} created external identifier(s) ${identifiers} on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:24 +msgid "${user} created a custom citation for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:25 +msgid "${user} edited a custom citation for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:26 +msgid "${user} removed a custom citation for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:27 +msgid "${user} added ${contributors} as contributor(s) to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:28 +msgid "${user} removed ${contributors} as contributor(s) from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:29 +msgid "${user} reordered contributors for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:30 +msgid "${user} changed permissions for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:31 +msgid "" +"${user} made non-bibliographic contributor ${contributors} a " +"bibliographic contributor on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:32 +msgid "" +"${user} made bibliographic contributor ${contributors} a non-" +"bibliographic contributor on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:33 +msgid "${user} updated wiki page ${page} to version ${version} of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:34 +msgid "${user} deleted wiki page ${page} of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:35 +msgid "${user} renamed wiki page ${old_page} to ${page} of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:36 +msgid "${user} made the wiki of ${node} publicly editable" +msgstr "" + +#: website/static/js/logActionsList_extract.js:37 +msgid "${user} made the wiki of ${node} privately editable" +msgstr "" + +#: website/static/js/logActionsList_extract.js:38 +msgid "${user} added addon ${addon} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:39 +msgid "${user} removed addon ${addon} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:40 +msgid "${user} moved ${source} to ${destination} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:41 +msgid "${user} copied ${source} to ${destination} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:42 +msgid "${user} renamed ${source} to ${destination} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:43 +msgid "${user} created a folder in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:44 +msgid "${user} added file ${path} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:45 +msgid "${user} updated file in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:46 +msgid "${user} removed ${path_type} ${path} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:47 +msgid "${user} restored file ${path} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:48 +msgid "${user} updated the file metadata for ${path}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:49 +msgid "${user} checked out ${kind} ${path} from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:50 +msgid "${user} checked in ${kind} ${path} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:51 +msgid "${user} added a comment ${comment_location} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:52 +msgid "${user} deleted a comment ${comment_location} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:53 +msgid "${user} restored a comment ${comment_location} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:54 +msgid "${user} updated a comment ${comment_location} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:55 +msgid "${user} initiated an embargoed registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:56 +msgid "${user} approved embargoed registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:57 +msgid "Embargo of registration of ${node} approved" +msgstr "" + +#: website/static/js/logActionsList_extract.js:58 +msgid "${user} cancelled embargoed registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:59 +msgid "${user} completed embargo of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:60 +msgid "Embargo for ${node} completed" +msgstr "" + +#: website/static/js/logActionsList_extract.js:61 +msgid "Embargo for ${node} ended" +msgstr "" + +#: website/static/js/logActionsList_extract.js:62 +msgid "${user} initiated withdrawal of registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:63 +msgid "A withdrawal of registration of ${node} is proposed" +msgstr "" + +#: website/static/js/logActionsList_extract.js:64 +msgid "${user} approved withdrawal of registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:65 +msgid "${user} cancelled withdrawal of registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:66 +msgid "${user} initiated registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:67 +msgid "${user} approved registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:68 +msgid "Registration of ${node} approved" +msgstr "" + +#: website/static/js/logActionsList_extract.js:69 +msgid "${user} cancelled registration of ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:71 +msgid "${user} created fork from ${forked_from}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:72 +msgid "${user} removed ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:73 +msgid "${user} enabled access requests for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:74 +msgid "${user} disabled access requests for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:75 +msgid "${user} updated the license of ${node} ${license}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:76 +msgid "${user} added tag ${tag} to ${path} in ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:77 +msgid "${user} removed tag ${tag} from ${path} in ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:78 +msgid "${user} added file ${path} to ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:79 +msgid "${user} created folder ${path} in ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:80 +msgid "${user} updated file ${path} in ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:81 +msgid "${user} removed ${path_type} ${path} from ${storage_name} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:82 +msgid "${user} added ${institution} affiliation to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:83 +msgid "${user} removed ${institution} affiliation from ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:84 +msgid "${user} made ${node} a ${preprint} on ${preprint_provider} Preprints" +msgstr "" + +#: website/static/js/logActionsList_extract.js:85 +msgid "" +"${user} updated the primary file of this ${preprint} on " +"${preprint_provider} Preprints" +msgstr "" + +#: website/static/js/logActionsList_extract.js:86 +msgid "" +"${user} updated the license of this ${preprint} on ${preprint_provider} " +"Preprints ${license}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:87 +msgid "${user} updated the subjects on ${node} to ${subjects}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:88 +msgid "${user} created ${anonymous_link} view-only link to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:89 +msgid "${user} removed ${anonymous_link} view-only link to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:90 +msgid "${user} verified timestamp" +msgstr "" + +#: website/static/js/logActionsList_extract.js:91 +msgid "${user} requested trusted timestamp" +msgstr "" + +#: website/static/js/logActionsList_extract.js:92 +msgid "${user} requested trusted timestamp file ${path}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:93 +msgid "" +"${user} downloaded a file of timestamp errors as a " +"${timestamp_errors_file_format}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:94 +msgid "" +"[MAPCORE_SYNC:ERROR] ${user} cannot create a new mAP group for GRDM " +"project <${node}> (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:95 +msgid "" +"[MAPCORE_SYNC:ERROR] mAP group for GRDM project <${node}> cannot be " +"updated (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:96 +msgid "" +"[MAPCORE_SYNC:ERROR] GRDM project <${node}> cannot be updated with mAP " +"group (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:97 +msgid "" +"[MAPCORE_SYNC:NOTICE] Unknown (unregistered in GRDM) users belong to mAP " +"group <${node}> (ignored) (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:98 +msgid "${user} linked the Azure Blob Storage container ${bucket} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:99 +msgid "${user} unselected the Azure Blob Storage container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:100 +msgid "" +"${user} added file ${path} to Azure Blob Storage container ${bucket} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:101 +msgid "" +"${user} removed ${path} in Azure Blob Storage container ${bucket} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:102 +msgid "" +"${user} updated file ${path} in Azure Blob Storage container ${bucket} in" +" ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:103 +msgid "" +"${user} created folder ${path} in Azure Blob Storage container ${bucket} " +"in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:104 +msgid "${user} authorized the Azure Blob Storage addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:105 +msgid "${user} deauthorized the Azure Blob Storage addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:106 +msgid "Azure Blob Storage addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:107 +msgid "${user} added file ${path} to Bitbucket repo ${bitbucket_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:108 +msgid "" +"${user} removed ${path_type} ${path} in Bitbucket repo ${bitbucket_repo} " +"in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:109 +msgid "" +"${user} updated file ${path} in Bitbucket repo ${bitbucket_repo} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:110 +msgid "" +"${user} created folder ${path} in Bitbucket repo ${bitbucket_repo} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:111 +msgid "${user} authorized the Bitbucket addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:112 +msgid "${user} deauthorized the Bitbucket addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:113 +msgid "Bitbucket addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:114 +msgid "${user} linked Bitbucket repo ${bitbucket_repo} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:115 +msgid "${user} added file ${path} to Box in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:116 +msgid "${user} removed ${path_type} ${path} from Box in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:117 +msgid "${user} updated file ${path} in Box in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:118 +msgid "${user} created folder ${path} in Box in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:119 +msgid "${user} linked Box folder ${box_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:120 +msgid "${user} authorized the Box addon in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:121 +msgid "${user} deauthorized the Box addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:122 +msgid "Box addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:123 +msgid "${user} added a citation ${citation} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:124 +msgid "${user} updated a citation ${citation} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:125 +msgid "${user} removed a citation ${citation} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:126 +msgid "${user} added file ${filename} to Dataverse dataset ${dataset} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:127 +msgid "" +"${user} removed file ${filename} from Dataverse dataset ${dataset} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:128 +msgid "${user} linked Dataverse dataset ${dataset} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:129 +msgid "${user} linked Dataverse dataset ${study} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:130 +msgid "${user} published a new version of Dataverse dataset ${dataset} on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:131 +msgid "${user} published a new version of Dataverse dataset ${study} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:132 +msgid "${user} authorized the Dataverse addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:133 +msgid "${user} deauthorized the Dataverse addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:134 +msgid "Dataverse addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:135 +msgid "${user} added file ${path} to Dropbox in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:136 +msgid "${user} removed ${path_type} ${path} from Dropbox in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:137 +msgid "${user} updated file ${path} in Dropbox in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:138 +msgid "${user} created folder ${path} in Dropbox in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:139 +msgid "${user} linked Dropbox folder ${dropbox_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:140 +msgid "${user} authorized the Dropbox addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:141 +msgid "${user} deauthorized the Dropbox addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:142 +msgid "Dropbox addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:143 +msgid "${user} added file ${path} to Dropbox Business in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:144 +msgid "${user} removed ${path_type} ${path} from Dropbox Business in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:145 +msgid "${user} updated file ${path} in Dropbox Business in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:146 +msgid "${user} created folder ${path} in Dropbox Business in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:147 +msgid "" +"${user} linked Dropbox Business folder ${dropboxbusiness_folder} to " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:148 +msgid "${user} authorized the Dropbox Business addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:149 +msgid "${user} deauthorized the Dropbox Business addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:150 +msgid "Dropbox Business addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:151 +msgid "${user} linked figshare ${folder} ${folder_name} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:152 +msgid "${user} unlinked content from figshare in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:153 +msgid "${user} added file ${path} to figshare in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:154 +msgid "${user} removed ${path_type} ${path} from figshare in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:155 +msgid "${user} created folder ${path} in figshare in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:156 +msgid "${user} authorized the figshare addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:157 +msgid "${user} deauthorized the figshare addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:158 +msgid "figshare addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:159 +msgid "${user} changed external link to ${forward_url} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:160 +msgid "${user} added file ${path} to GitHub repo ${repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:161 +msgid "${user} removed ${path_type} ${path} in GitHub repo ${repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:162 +msgid "${user} updated file ${path} in GitHub repo ${repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:163 +msgid "${user} created folder ${path} in GitHub repo ${repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:164 +msgid "${user} authorized the GitHub addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:165 +msgid "${user} deauthorized the GitHub addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:166 +msgid "GitHub addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:167 +msgid "${user} linked GitHub repo ${repo} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:168 +msgid "${user} added file ${path} to GitLab repo ${gitlab_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:169 +msgid "${user} removed file ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:170 +msgid "${user} updated file ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:171 +msgid "${user} created folder ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:172 +msgid "${user} authorized the GitLab addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:173 +msgid "${user} deauthorized the GitLab addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:174 +msgid "GitLab addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:175 +msgid "${user} linked GitLab repo ${gitlab_repo} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:176 +msgid "${user} added file ${googledrive_path} to Google Drive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:177 +msgid "" +"${user} removed ${path_type} ${googledrive_path} from Google Drive in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:178 +msgid "${user} updated file ${googledrive_path} in Google Drive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:179 +msgid "${user} created folder ${googledrive_path} in Google Drive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:180 +msgid "${user} linked Google Drive folder ${googledrive_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:181 +msgid "${user} authorized the Google Drive addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:182 +msgid "${user} deauthorized the Google Drive addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:183 +msgid "Google Drive addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:184 +msgid "${user} added file ${iqbrims_path} to IQB-RIMS in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:185 +msgid "${user} removed ${path_type} ${iqbrims_path} from IQB-RIMS in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:186 +msgid "${user} updated file ${iqbrims_path} in IQB-RIMS in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:187 +msgid "${user} created folder ${iqbrims_path} in IQB-RIMS in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:188 +msgid "${user} linked IQB-RIMS folder ${iqbrims_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:189 +msgid "${user} authorized the IQB-RIMS addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:190 +msgid "${user} deauthorized the IQB-RIMS addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:191 +msgid "IQB-RIMS addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:192 +#: website/static/js/logActionsList_extract.js:194 +msgid "${user} started IQB-RIMS workflow for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:193 +#: website/static/js/logActionsList_extract.js:195 +msgid "Finished workflow of ${user} for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:196 +msgid "${user} linked Mendeley folder ${folder_name} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:197 +msgid "${user} authorized the Mendeley addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:198 +msgid "${user} deauthorized the Mendeley addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:199 +msgid "${user} added file ${path} to Nextcloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:200 +msgid "${user} removed ${path_type} ${path} from Nextcloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:201 +msgid "${user} updated file ${path} in Nextcloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:202 +msgid "${user} created folder ${path} in Nextcloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:203 +msgid "${user} linked Nextcloud folder ${folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:204 +msgid "${user} authorized the Nextcloud addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:205 +msgid "${user} deauthorized the Nextcloud addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:206 +msgid "Nextcloud addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:207 +msgid "${user} added file ${path} to Microsoft OneDrive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:208 +msgid "${user} removed ${path_type} ${path} from Microsoft OneDrive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:209 +msgid "${user} updated file ${path} in Microsoft OneDrive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:210 +msgid "${user} created folder ${path} in Microsoft OneDrive in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:211 +msgid "${user} linked Microsoft OneDrive folder ${onedrive_folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:212 +msgid "${user} authorized the Microsoft OneDrive addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:213 +msgid "${user} deauthorized the Microsoft OneDrive addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:214 +msgid "Microsoft OneDrive addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:215 +msgid "${user} added file ${path} to ownCloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:216 +msgid "${user} removed ${path_type} ${path} from ownCloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:217 +msgid "${user} updated file ${path} in ownCloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:218 +msgid "${user} created folder ${path} in ownCloud in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:219 +msgid "${user} linked ownCloud folder ${folder} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:220 +msgid "${user} authorized the ownCloud addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:221 +msgid "${user} deauthorized the ownCloud addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:222 +msgid "ownCloud addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:223 +msgid "${user} linked the Amazon S3 bucket ${bucket} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:224 +msgid "${user} unselected the Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:225 +msgid "${user} added file ${path} to Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:226 +msgid "${user} removed ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:227 +msgid "${user} updated file ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:228 +msgid "${user} created folder ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:229 +msgid "${user} authorized the Amazon S3 addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:230 +msgid "${user} deauthorized the Amazon S3 addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:231 +msgid "Amazon S3 addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:232 +msgid "${user} linked the S3 Compatible Storage bucket ${bucket} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:233 +msgid "${user} unselected the S3 Compatible Storage bucket ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:234 +msgid "" +"${user} added file ${path} to S3 Compatible Storage bucket ${bucket} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:235 +msgid "" +"${user} removed ${path} in S3 Compatible Storage bucket ${bucket} in " +"${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:236 +msgid "" +"${user} updated file ${path} in S3 Compatible Storage bucket ${bucket} in" +" ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:237 +msgid "" +"${user} created folder ${path} in S3 Compatible Storage bucket ${bucket} " +"in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:238 +msgid "${user} authorized the S3 Compatible Storage addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:239 +msgid "${user} deauthorized the S3 Compatible Storage addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:240 +msgid "S3 Compatible Storage addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:241 +msgid "${user} linked the Swift container ${bucket} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:242 +msgid "${user} unselected the Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:243 +msgid "${user} added file ${path} to Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:244 +msgid "${user} removed ${path} in Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:245 +msgid "${user} updated file ${path} in Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:246 +msgid "${user} created folder ${path} in Swift container ${bucket} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:247 +msgid "${user} authorized the Swift addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:248 +msgid "${user} deauthorized the Swift addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:249 +msgid "Swift addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:250 +msgid "${user} added file ${filename} to WEKO index ${dataset} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:251 +msgid "${user} removed file ${filename} from WEKO index ${dataset} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:252 +msgid "${user} linked WEKO index ${dataset} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:253 +msgid "${user} created an index ${filename} on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:254 +msgid "${user} created an item ${filename} on ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:255 +msgid "${user} created folder ${filename} in WEKO index ${dataset} in ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:256 +msgid "${user} authorized the WEKO addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:257 +msgid "${user} deauthorized the WEKO addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:258 +msgid "WEKO addon for ${node} deauthorized" +msgstr "" + +#: website/static/js/logActionsList_extract.js:259 +msgid "${user} linked Zotero folder ${folder_name} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:260 +msgid "${user} linked Zotero library ${library_name} to ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:261 +msgid "${user} authorized the Zotero addon for ${node}" +msgstr "" + +#: website/static/js/logActionsList_extract.js:262 +msgid "${user} deauthorized the Zotero addon for ${node}" +msgstr "" + +#: website/static/js/logTextParser.js:824 +msgid "unknown format" +msgstr "" + +#: website/static/js/meetings.js:24 +msgid "Submissions" +msgstr "" + +#: website/static/js/meetings.js:30 +msgid "Location" +msgstr "" + +#: website/static/js/filepage/revisions.js:109 website/static/js/meetings.js:36 +msgid "Date" +msgstr "" + +#: website/static/js/myProjects.js:308 +msgid "We're having some trouble contacting our servers. Try reloading the page." +msgstr "" + +#: website/static/js/myProjects.js:308 +msgid "Something went wrong!" +msgstr "" + +#: website/static/js/myProjects.js:433 +msgid "All my projects" +msgstr "" + +#: website/static/js/myProjects.js:461 +msgid "Error loading project category names." +msgstr "" + +#: website/static/js/myProjects.js:665 +msgid "Some projects" +msgstr "" + +#: website/static/js/myProjects.js:669 +msgid " could not be removed from the collection" +msgstr "" + +#: website/static/js/myProjects.js:671 +msgid "Please try again." +msgstr "" + +#: website/static/js/myProjects.js:764 +msgid "You have not created any projects yet." +msgstr "" + +#: website/static/js/myProjects.js:768 +msgid "" +"There have been no completed registrations for this institution, but you " +"can view the " +msgstr "" + +#: website/static/js/myProjects.js:769 +msgid "newest public registrations" +msgstr "" + +#: website/static/js/myProjects.js:770 website/static/js/myProjects.js:778 +msgid " or " +msgstr "" + +#: website/static/js/myProjects.js:771 +msgid "popular public registrations." +msgstr "" + +#: website/static/js/myProjects.js:774 +msgid "You have not made any registrations yet. Go to " +msgstr "" + +#: website/static/js/myProjects.js:775 +msgid "Guides" +msgstr "" + +#: website/static/js/myProjects.js:775 +msgid " to learn how registrations work." +msgstr "" + +#: website/static/js/myProjects.js:778 +msgid "You have not made any preprints yet. Learn more about preprints in the " +msgstr "" + +#: website/static/js/myProjects.js:778 +msgid "OSF Guides" +msgstr "" + +#: website/static/js/myProjects.js:778 +msgid "make one now." +msgstr "" + +#: website/static/js/myProjects.js:780 +msgid "" +"You have no bookmarks. You can add projects or registrations by dragging " +"them into your bookmarks or by clicking the Add to Bookmark button on the" +" project or registration." +msgstr "" + +#: website/static/js/myProjects.js:782 +msgid "This collection is empty." +msgstr "" + +#: website/static/js/myProjects.js:784 +msgid "" +" You can add projects, registrations, or preprints by dragging them into " +"the collection." +msgstr "" + +#: website/static/js/myProjects.js:795 +msgid "" +"No components to display. Either there are no components, or there are " +"private components in which you are not a contributor." +msgstr "" + +#: website/static/js/myProjects.js:966 +msgid "Collections could not be loaded." +msgstr "" + +#: website/static/js/myProjects.js:967 +msgid "Please reload the page." +msgstr "" + +#: website/static/js/myProjects.js:1109 +msgid "My Projects " +msgstr "" + +#: website/static/js/myProjects.js:1110 +msgid "Browse and organize all your projects" +msgstr "" + +#: website/static/js/myProjects.js:1115 +msgid "Create Project" +msgstr "" + +#: website/static/js/myProjects.js:1172 +msgid "Fetching more projects" +msgstr "" + +#: website/static/js/myProjects.js:1278 +msgid "\" collection could not be created." +msgstr "" + +#: website/static/js/myProjects.js:1279 website/static/js/myProjects.js:1311 +#: website/static/js/myProjects.js:1336 +msgid "Please try again" +msgstr "" + +#: website/static/js/myProjects.js:1310 +msgid "\" could not be deleted." +msgstr "" + +#: website/static/js/myProjects.js:1335 +msgid "\" could not be renamed." +msgstr "" + +#: website/static/js/myProjects.js:1383 +msgid "\" is already in \"%1$s\"" +msgstr "" + +#: website/static/js/myProjects.js:1469 +msgid "Collections " +msgstr "" + +#: website/static/js/myProjects.js:1472 +msgid "" +"Collections are groups of projects. You can create custom collections. " +"Drag and drop your projects or bookmarked projects to add them." +msgstr "" + +#: website/static/js/myProjects.js:1501 +msgid " Rename" +msgstr "" + +#: website/static/js/myProjects.js:1510 +msgid " Delete" +msgstr "" + +#: website/static/js/myProjects.js:1528 +msgid "Add new collection" +msgstr "" + +#: website/static/js/myProjects.js:1531 +msgid "" +"Collections are groups of projects that help you organize your work. " +"After you create your collection, you can add projects by dragging them " +"into the collection." +msgstr "" + +#: website/static/js/myProjects.js:1533 +msgid "Collection name" +msgstr "" + +#: website/static/js/myProjects.js:1548 +msgid "e.g. My Replications" +msgstr "" + +#: website/static/js/myProjects.js:1565 +msgid "Add" +msgstr "" + +#: website/static/js/myProjects.js:1576 +msgid "Rename collection" +msgstr "" + +#: website/static/js/myProjects.js:1581 +msgid "Rename to: " +msgstr "" + +#: website/static/js/myProjects.js:1624 +msgid "Delete collection \"%1$s\"?" +msgstr "" + +#: website/static/js/myProjects.js:1627 +msgid "This will delete your collection, but your projects will not be deleted." +msgstr "" + +#: website/static/js/myProjects.js:1737 +msgid "Parent projects" +msgstr "" + +#: website/static/js/myProjects.js:1786 +msgid "Create component" +msgstr "" + +#: website/static/js/myProjects.js:1875 +msgid "" +"No contributors to display in this collection. Project administrators can" +" add contributors." +msgstr "" + +#: website/static/js/myProjects.js:1898 +msgid "" +"No tags to display in this collection. Project administrators and write " +"contributors can add tags." +msgstr "" + +#: website/static/js/myProjects.js:1924 +msgid "Contributors " +msgstr "" + +#: website/static/js/myProjects.js:1927 +msgid "Click a contributor's name to see projects that you have in common." +msgstr "" + +#: website/static/js/myProjects.js:1938 website/static/js/myProjects.js:2019 +msgid "Tags" +msgstr "" + +#: website/static/js/myProjects.js:1963 +msgid "Select a row to view project details." +msgstr "" + +#: website/static/js/myProjects.js:1994 +msgid "Information" +msgstr "" + +#: website/static/js/myProjects.js:1998 +msgid "Activity" +msgstr "" + +#: website/static/js/myProjects.js:2005 +msgid "Visibility: " +msgstr "" + +#: website/static/js/myProjects.js:2005 +msgid "Public" +msgstr "" + +#: website/static/js/myProjects.js:2005 +msgid "Private" +msgstr "" + +#: website/static/js/myProjects.js:2007 +msgid "Category: " +msgstr "" + +#: website/static/js/myProjects.js:2011 +msgid "Permission: " +msgstr "" + +#: website/static/js/myProjects.js:2012 +msgid "Last Modified on: " +msgstr "" + +#: website/static/js/myProjects.js:2040 +msgid "Remove selected from collection" +msgstr "" + +#: website/static/js/nodeControl.js:61 +msgid "A request to make this registration public is pending" +msgstr "" + +#: website/static/js/nodeControl.js:102 +msgid "Edit Title" +msgstr "" + +#: website/static/js/nodeControl.js:106 +msgid "Title cannot be blank." +msgstr "" + +#: website/static/js/nodeControl.js:109 +msgid "Title cannot exceed 512 characters." +msgstr "" + +#: website/static/js/nodeControl.js:114 +msgid "component" +msgstr "" + +#: website/static/js/nodeControl.js:117 +msgid "Edit Description" +msgstr "" + +#: website/static/js/nodeControl.js:118 +msgid "Add a brief description to your %1$s" +msgstr "" + +#: website/static/js/nodeControl.js:135 +msgid "Select a category" +msgstr "" + +#: website/static/js/nodeControl.js:175 +msgid "The project could not be removed" +msgstr "" + +#: website/static/js/nodeControl.js:212 +msgid "Create DOI" +msgstr "" + +#: website/static/js/nodeControl.js:214 +msgid "Are you sure you want to create a DOI for this %1$s" +msgstr "" + +#: website/static/js/nodeControl.js:215 +msgid "? A DOI" +msgstr "" + +#: website/static/js/nodeControl.js:216 +msgid " is persistent and will always resolve to this page." +msgstr "" + +#: website/static/js/nodeControl.js:245 +msgid "We could not create the identifier at this time. " +msgstr "" + +#: website/static/js/nodeControl.js:246 +msgid "The DOI acquisition service may be down right now. " +msgstr "" + +#: website/static/js/nodeControl.js:247 +msgid "Please try again soon and/or contact %1$s" +msgstr "" + +#: website/static/js/nodeControl.js:249 +msgid "Could not create doi" +msgstr "" + +#: website/static/js/nodeSelectTreebeard.js:62 +#: website/static/js/notificationsTreebeard.js:62 +#: website/static/js/profile.js:320 +#: website/static/js/wikiSettingsTreebeard.js:57 +msgid "Could not update settings" +msgstr "" + +#: website/static/js/nodeSelectTreebeard.js:81 +#: website/static/js/nodesDeleteTreebeard.js:56 +#: website/static/js/nodesPrivacySettingsTreebeard.js:56 +msgid "checkBox" +msgstr "" + +#: website/static/js/nodesDelete.js:38 +msgid "" +"This %1$s also contains supplemental materials for a " +"preprint. It will" +msgstr "" + +#: website/static/js/nodesDelete.js:39 +msgid " no longer be available to contributors or connected to the preprint." +msgstr "" + +#: website/static/js/nodesDelete.js:43 +msgid "It will no longer be available to other contributors on the project." +msgstr "" + +#: website/static/js/nodesDelete.js:49 +msgid "Are you sure you want to delete this %1$s?" +msgstr "" + +#: website/static/js/nodesDelete.js:80 website/static/js/nodesDelete.js:340 +msgid "Unable to delete %1$s" +msgstr "" + +#: website/static/js/nodesDelete.js:84 website/static/js/nodesDelete.js:344 +msgid "Problem deleting %1$s" +msgstr "" + +#: website/static/js/nodesDelete.js:85 +msgid "Could not delete %$1s" +msgstr "" + +#: website/static/js/nodesDelete.js:116 +msgid "" +"

                                              This %1$s also contains supplemental materials for a " +"preprint, and one or more of its %2$s contains " +"supplemental materials for a preprint." +msgstr "" + +#: website/static/js/nodesDelete.js:119 +msgid "" +"

                                              This %1$s also contains supplemental materials for a " +"preprint." +msgstr "" + +#: website/static/js/nodesDelete.js:122 +msgid "" +"

                                              This %1$s also has one or more %2$s that contain supplemental " +"materials for a preprint." +msgstr "" + +#: website/static/js/nodesDelete.js:150 +msgid "Delete %1$s" +msgstr "" + +#: website/static/js/nodesDelete.js:151 +msgid "Delete %1$s and %2$s" +msgstr "" + +#: website/static/js/nodesDelete.js:156 +msgid "This %1$s contains %2$s." +msgstr "" + +#: website/static/js/nodesDelete.js:156 +msgid " To delete this %1$s, you must also delete all %2$s." +msgstr "" + +#: website/static/js/nodesDelete.js:158 +msgid " The following %1$s and %2$s will be deleted." +msgstr "" + +#: website/static/js/nodesDelete.js:161 +msgid " This action is irreversible." +msgstr "" + +#: website/static/js/nodesDelete.js:167 +msgid "" +"Please note that deleting your %1$s will erase all your %2$s data and " +"this process is IRREVERSIBLE. Deleted %3$s and %4$s will no longer be " +"available to other contributors on the %5$s" +msgstr "" + +#: website/static/js/nodesDelete.js:168 +msgid " and will be disconnected from your preprints." +msgstr "" + +#: website/static/js/nodesDelete.js:168 +msgid "." +msgstr "" + +#: website/static/js/nodesDelete.js:331 +msgid "Your %1$s has been successfully deleted." +msgstr "" + +#: website/static/js/nodesDelete.js:345 +msgid "Could not batch delete project and its components." +msgstr "" + +#: website/static/js/nodesDeleteTreebeard.js:84 +msgid "You must have admin permissions on this component to be able to delete it." +msgstr "" + +#: website/static/js/nodesPrivacy.js:19 +msgid "" +"Please review your projects, components, and add-ons for sensitive or " +"restricted information before making them public." +msgstr "" + +#: website/static/js/nodesPrivacy.js:20 +msgid "" +"

                                              Once they are made public, you should assume they will always be " +"public. You can " +msgstr "" + +#: website/static/js/nodesPrivacy.js:21 +msgid "" +"return them to private later, but search engines (including Google’s " +"cache) or others may access files, wiki pages, or analytics before you " +"do." +msgstr "" + +#: website/static/js/nodesPrivacy.js:23 +msgid "" +"
                                              • Public forks and registrations of this project will remain " +"public.
                                              • " +msgstr "" + +#: website/static/js/nodesPrivacy.js:24 website/static/js/nodesPrivacy.js:27 +msgid "" +"
                                              • Search engines (including Google's cache) or others may have accessed" +" files, wiki pages, or analytics while this project was public.
                                              " +msgstr "" + +#: website/static/js/nodesPrivacy.js:26 +msgid "" +"
                                              • Preprints will remain public.
                                              • Public forks and " +"registrations of this project will remain public.
                                              • " +msgstr "" + +#: website/static/js/nodesPrivacy.js:28 +msgid "" +"By clicking confirm, an email will be sent to project administrator(s) to" +" approve ending the embargo. If approved, this registration, including " +"any components, will be made public immediately. This action is " +"irreversible." +msgstr "" + +#: website/static/js/nodesPrivacy.js:29 +msgid "End embargo early" +msgstr "" + +#: website/static/js/nodesPrivacy.js:30 +msgid "Adjust your privacy settings by checking the boxes below. " +msgstr "" + +#: website/static/js/nodesPrivacy.js:31 +msgid "" +"

                                                Checked projects and components will be public. " +"
                                                Unchecked components will be private." +msgstr "" + +#: website/static/js/nodesPrivacy.js:33 +msgid "The following projects and components will be made public." +msgstr "" + +#: website/static/js/nodesPrivacy.js:34 +msgid "The following projects and components will be made private." +msgstr "" + +#: website/static/js/nodesPrivacy.js:35 +msgid "No privacy settings were changed. Go back to make a change." +msgstr "" + +#: website/static/js/nodesPrivacy.js:36 +msgid "" +"You can only change the privacy of 100 projects and components at a time." +" Please go back and limit your selection." +msgstr "" + +#: website/static/js/nodesPrivacy.js:38 +msgid "This project/component contains supplemental materials for a preprint." +msgstr "" + +#: website/static/js/nodesPrivacy.js:39 +msgid "" +"

                                                Making this project/component private will prevent others from" +" accessing it.

                                                " +msgstr "" + +#: website/static/js/nodesPrivacy.js:155 +msgid "Make %1$s private" +msgstr "" + +#: website/static/js/nodesPrivacy.js:156 +msgid "Warning" +msgstr "" + +#: website/static/js/nodesPrivacy.js:157 +msgid "Change privacy settings" +msgstr "" + +#: website/static/js/nodesPrivacy.js:158 +msgid "Projects and components affected" +msgstr "" + +#: website/static/js/nodesPrivacy.js:247 +msgid "Updating Privacy" +msgstr "" + +#: website/static/js/nodesPrivacy.js:257 +msgid "Unable to update project privacy" +msgstr "" + +#: website/static/js/nodesPrivacy.js:261 +msgid "Problem changing privacy" +msgstr "" + +#: website/static/js/nodesPrivacy.js:262 +msgid "Could not PATCH project settings." +msgstr "" + +#: website/static/js/nodesPrivacy.js:318 +msgid "Submitting request to end embargo early ..." +msgstr "" + +#: website/static/js/nodesPrivacy.js:324 +msgid "Email sent" +msgstr "" + +#: website/static/js/nodesPrivacy.js:325 +msgid "" +"The administrator(s) can approve or cancel the action within 48 hours. If" +" 48 hours pass without any action taken, then the registration will " +"become public." +msgstr "" + +#: website/static/js/notificationsConfig.js:31 +msgid "Could not retrieve settings information." +msgstr "" + +#: website/static/js/notificationsConfig.js:63 +msgid "Could not update email preferences at this time. If this issue persists, " +msgstr "" + +#: website/static/js/notificationsConfig.js:64 +#: website/static/js/osfHelpers.js:316 +msgid "please report it to %1$s." +msgstr "" + +#: website/static/js/notificationsTreebeard.js:68 +#: website/static/js/notificationsTreebeard.js:182 +#: website/static/js/notificationsTreebeard.js:187 +#: website/static/js/notificationsTreebeard.js:230 +msgid "Instantly" +msgstr "" + +#: website/static/js/notificationsTreebeard.js:69 +#: website/static/js/notificationsTreebeard.js:188 +#: website/static/js/notificationsTreebeard.js:231 +msgid "Daily" +msgstr "" + +#: website/static/js/notificationsTreebeard.js:70 +msgid "Adopt setting from parent project" +msgstr "" + +#: website/static/js/notificationsTreebeard.js:71 +#: website/static/js/notificationsTreebeard.js:186 +#: website/static/js/notificationsTreebeard.js:229 +msgid "Never" +msgstr "" + +#: website/static/js/notificationsTreebeard.js:118 +msgid " No configured projects." +msgstr "" + +#: website/static/js/notificationsTreebeard.js:228 +msgid "Adopt setting from parent project %1$s" +msgstr "" + +#: website/static/js/oauthAddonNodeConfig.js:143 +msgid "Choose %1$s Account to Import" +msgstr "" + +#: website/static/js/osfHelpers.js:311 +msgid "Please refresh the page and try again or contact %1$s" +msgstr "" + +#: website/static/js/osfHelpers.js:315 +msgid "GakuNin RDM was unable to resolve your request. If this issue persists, " +msgstr "" + +#: website/static/js/osfHelpers.js:339 +msgid "Unexpected error occurred in JSON request" +msgstr "" + +#: website/static/js/osfHelpers.js:344 +msgid "Unexpected error occurred in an editable input" +msgstr "" + +#: website/static/js/osfHelpers.js:361 +#: website/static/js/privateLinkManager.js:105 +msgid "Please wait" +msgstr "" + +#: website/static/js/osfHelpers.js:800 +#: website/static/js/pages/profile-settings-addons-page.js:32 +#: website/static/js/pages/project-addons-page.js:63 +msgid "Confirm" +msgstr "" + +#: website/static/js/osfHelpers.js:811 +msgid "

                                                Type the following to continue: " +msgstr "" + +#: website/static/js/passwordForms.js:23 +msgid "Please enter a more complex password." +msgstr "" + +#: website/static/js/passwordForms.js:117 +#: website/static/js/passwordForms.js:192 +#: website/static/js/passwordForms.js:258 +msgid "Your password cannot be the same as your email address." +msgstr "" + +#: website/static/js/passwordForms.js:132 +msgid "Your new password cannot be the same as your old password." +msgstr "" + +#: website/static/js/passwordForms.js:143 +#: website/static/js/passwordForms.js:203 +msgid "Passwords must match." +msgstr "" + +#: website/static/js/passwordForms.js:230 +msgid "Email addresses must match." +msgstr "" + +#: website/static/js/passwordForms.js:301 +msgid "You have already submitted. You cannot sign up more than once." +msgstr "" + +#: website/static/js/passwordForms.js:322 +msgid "Please complete reCAPTCHA" +msgstr "" + +#: website/static/js/pointers.js:28 +msgid "Search all projects" +msgstr "" + +#: website/static/js/pointers.js:29 +msgid "Search my projects" +msgstr "" + +#: website/static/js/pointers.js:133 +msgid "No results found." +msgstr "" + +#: website/static/js/pointers.js:183 +msgid "Error retrieving nodes" +msgstr "" + +#: website/static/js/pointers.js:328 +msgid "Registered: " +msgstr "" + +#: website/static/js/pointers.js:330 +msgid "Created: " +msgstr "" + +#: website/static/js/pointers.js:330 +msgid "" +"\n" +"Modified: " +msgstr "" + +#: website/static/js/pointers.js:362 +msgid "Could not get links" +msgstr "" + +#: website/static/js/privateLinkManager.js:63 +msgid "Could not retrieve projects." +msgstr "" + +#: website/static/js/privateLinkManager.js:63 +#: website/static/js/privateLinkTable.js:72 +msgid "Please refresh the page or " +msgstr "" + +#: website/static/js/privateLinkManager.js:64 +#: website/static/js/privateLinkTable.js:73 +msgid "contact %1$s" +msgstr "" + +#: website/static/js/privateLinkManager.js:64 +#: website/static/js/privateLinkTable.js:73 +msgid " if the " +msgstr "" + +#: website/static/js/privateLinkManager.js:65 +#: website/static/js/privateLinkTable.js:74 +msgid "problem persists." +msgstr "" + +#: website/static/js/privateLinkTable.js:37 +msgid "Yes" +msgstr "" + +#: website/static/js/privateLinkTable.js:37 +msgid "No" +msgstr "" + +#: website/static/js/privateLinkTable.js:72 +msgid "Could not retrieve view-only links." +msgstr "" + +#: website/static/js/privateLinkTable.js:96 +msgid "Remove view-only link?" +msgstr "" + +#: website/static/js/privateLinkTable.js:97 +msgid "Are you sure you want to remove this view-only link?" +msgstr "" + +#: website/static/js/privateLinkTable.js:109 +msgid "Failed to delete the private link." +msgstr "" + +#: website/static/js/privateLinkTable.js:138 +msgid "Edit Link Name" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "January" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "February" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "March" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "April" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "May" +msgstr "" + +#: website/static/js/profile.js:106 +msgid "June" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "July" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "August" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "September" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "October" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "November" +msgstr "" + +#: website/static/js/profile.js:107 +msgid "December" +msgstr "" + +#: website/static/js/profile.js:112 +msgid "ongoing" +msgstr "" + +#: website/static/js/profile.js:152 +msgid "Please enter a year for the start date." +msgstr "" + +#: website/static/js/profile.js:165 +msgid "Please enter an end date or mark as ongoing." +msgstr "" + +#: website/static/js/profile.js:168 +msgid "Please enter a year for the end date." +msgstr "" + +#: website/static/js/profile.js:265 website/static/js/profile.js:274 +msgid "There are unsaved changes to your settings." +msgstr "" + +#: website/static/js/profile.js:275 +msgid "Please save or discard your changes before switching " +msgstr "" + +#: website/static/js/profile.js:276 +msgid "tabs." +msgstr "" + +#: website/static/js/profile.js:341 +msgid "Could not fetch data" +msgstr "" + +#: website/static/js/profile.js:358 +msgid "Are you sure you want to discard your unsaved changes?" +msgstr "" + +#: website/static/js/profile.js:720 +msgid "Remove website?" +msgstr "" + +#: website/static/js/profile.js:721 +msgid "Are you sure you want to remove this website from your profile?" +msgstr "" + +#: website/static/js/profile.js:728 +msgid "Website removed" +msgstr "" + +#: website/static/js/profile.js:815 +msgid "Please update your website" +msgstr "" + +#: website/static/js/profile.js:953 +msgid "Remove Institution?" +msgstr "" + +#: website/static/js/profile.js:954 +msgid "Are you sure you want to remove this institution?" +msgstr "" + +#: website/static/js/profile.js:963 +msgid "Institution Removed" +msgstr "" + +#: website/static/js/profile.js:1078 +msgid "Institution/Employer required" +msgstr "" + +#: website/static/js/profile.js:1132 +msgid "Institution required" +msgstr "" + +#: website/static/js/components/publicNodes.js:103 +#: website/static/js/project-organizer.js:100 +msgid "A contributor" +msgstr "" + +#: website/static/js/project-organizer.js:197 +msgid "Contributors" +msgstr "" + +#: website/static/js/project-organizer.js:416 +msgid "" +"input.form-control[placeholder=\"Filter displayed " +"projects\"][type=\"text\"]" +msgstr "" + +#: website/static/js/project.js:28 +msgid "

                                                Are you sure you want to fork this project?

                                                " +msgstr "" + +#: website/static/js/project.js:36 website/static/js/project.js:115 +msgid "Fork" +msgstr "" + +#: website/static/js/project.js:50 +msgid "Fork created successfully!" +msgstr "" + +#: website/static/js/project.js:58 +msgid "Go to new fork" +msgstr "" + +#: website/static/js/project.js:87 +msgid "Your fork is being created. You'll receive an email when it is complete." +msgstr "" + +#: website/static/js/project.js:93 +msgid "Fork this project?" +msgstr "" + +#: website/static/js/project.js:94 +msgid "Are you sure you want to fork this project?" +msgstr "" + +#: website/static/js/project.js:109 +msgid "Could not fork link." +msgstr "" + +#: website/static/js/project.js:126 +msgid "" +"

                                                Are you sure you want to create a new project using this project as a" +" template?

                                                " +msgstr "" + +#: website/static/js/project.js:127 +msgid "" +"

                                                Any add-ons configured for this project will not be authenticated in " +"the new project.

                                                " +msgstr "" + +#: website/static/js/project.js:129 +msgid "" +"

                                                Are you sure you want to create a new project using this registration" +" as a template?

                                                " +msgstr "" + +#: website/static/js/project.js:205 +msgid "
                                                Read
                                                " +msgstr "" + +#: website/static/js/project.js:206 +msgid "
                                                • View project content and comment
                                                " +msgstr "" + +#: website/static/js/project.js:207 +msgid "
                                                Read + Write
                                                " +msgstr "" + +#: website/static/js/project.js:208 +msgid "
                                                • Read privileges
                                                • " +msgstr "" + +#: website/static/js/project.js:209 +msgid "
                                                • Add and configure components
                                                • " +msgstr "" + +#: website/static/js/project.js:210 +msgid "
                                                • Add and edit content
                                                " +msgstr "" + +#: website/static/js/project.js:211 +msgid "
                                                Administrator
                                                  " +msgstr "" + +#: website/static/js/project.js:212 +msgid "
                                                • Read and write privileges
                                                • " +msgstr "" + +#: website/static/js/project.js:213 +msgid "
                                                • Manage contributor
                                                • " +msgstr "" + +#: website/static/js/project.js:214 +msgid "" +"
                                                • Delete and register project
                                                • Public-private " +"settings
                                                " +msgstr "" + +#: website/static/js/project.js:223 +msgid "" +"Only bibliographic contributors will be displayed in the Contributors " +"list and in project citations. Non-bibliographic contributors can read " +"and modify the project as normal." +msgstr "" + +#: website/static/js/project.js:238 +msgid "Remove this link?" +msgstr "" + +#: website/static/js/project.js:239 +msgid "" +"Are you sure you want to remove this link? This will not remove the " +"project this link refers to." +msgstr "" + +#: website/static/js/projectSettingsTreebeardBase.js:96 +msgid "Editing Toggle" +msgstr "" + +#: website/static/js/requestAccess.js:17 +msgid "Request access" +msgstr "" + +#: website/static/js/requestAccess.js:27 website/static/js/requestAccess.js:62 +msgid "Access requested" +msgstr "" + +#: website/static/js/requestAccess.js:30 +msgid "Request declined" +msgstr "" + +#: website/static/js/requestAccess.js:67 +msgid "Access request failed. Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/requestAccess.js:70 +msgid "Error requesting project access" +msgstr "" + +#: website/static/js/requestAccess.js:83 +msgid "If this should not have occurred, please contact %1$s." +msgstr "" + +#: website/static/js/saveManager.js:24 +msgid "You have unsaved changes." +msgstr "" + +#: website/static/js/search-grdm.js:150 +msgid "Date Modified (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:151 +msgid "Date Modified (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:152 +msgid "Date Created (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:153 +msgid "Date Created (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:154 +msgid "Project name (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:155 +msgid "Project name (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:156 +msgid "File name (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:157 +msgid "File name (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:158 +msgid "User name (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:159 +msgid "User name (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:160 +msgid "Institution name (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:161 +msgid "Institution name (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:162 +msgid "Wiki title (Asc)" +msgstr "" + +#: website/static/js/search-grdm.js:163 +msgid "Wiki title (Desc)" +msgstr "" + +#: website/static/js/search-grdm.js:313 website/static/js/search.js:190 +msgid "Page %1$s of %2$s" +msgstr "" + +#: website/static/js/search-grdm.js:393 website/static/js/search.js:270 +msgid "Search help" +msgstr "" + +#: website/static/js/search-grdm.js:394 website/static/js/search.js:271 +msgid "

                                                Queries

                                                " +msgstr "" + +#: website/static/js/search-grdm.js:395 website/static/js/search.js:272 +msgid "" +"

                                                Search uses the Lucene" +" search syntax. " +msgstr "" + +#: website/static/js/search-grdm.js:396 website/static/js/search.js:273 +msgid "This gives you many options, but can be very simple as well. " +msgstr "" + +#: website/static/js/search-grdm.js:397 website/static/js/search.js:274 +msgid "Examples of valid searches include:" +msgstr "" + +#: website/static/js/search-grdm.js:769 website/static/js/search-grdm.js:1067 +#: website/static/js/search.js:578 website/static/js/search.js:605 +msgid "GakuNin RDM | Search" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:26 +msgid "Make publicly editable" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:27 +msgid "" +"Are you sure you want to make the wiki of %1$s publicly editable? " +"This will allow any logged in user to edit the content of this wiki. " +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:28 +msgid "" +"Note: Users without write access will not be able to add, delete, " +"or rename pages." +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:36 +msgid "Apply" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:114 +msgid "Only admins may change permissions of this wiki." +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:116 +msgid "Select who can edit" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:116 +msgid "This feature is disabled for wikis of private %1$ss" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:133 +msgid "Contributors (with write access)" +msgstr "" + +#: website/static/js/wikiSettingsTreebeard.js:134 +msgid "All GakuNin RDM users" +msgstr "" + +#: website/static/js/components/autocomplete.js:84 +msgid "Could not GET autocomplete data" +msgstr "" + +#: website/static/js/components/autocomplete.js:150 +msgid "Initiated by: " +msgstr "" + +#: website/static/js/components/autocomplete.js:156 +msgid "Initiated: " +msgstr "" + +#: website/static/js/components/autocomplete.js:162 +msgid "Last updated: " +msgstr "" + +#: website/static/js/components/publicNodes.js:68 +msgid "Error retrieving projects" +msgstr "" + +#: website/static/js/components/publicNodes.js:120 +msgid " more" +msgstr "" + +#: website/static/js/components/publicNodes.js:152 +msgid "-- private project -- / " +msgstr "" + +#: website/static/js/components/publicNodes.js:190 +msgid "Unable to retrieve public %1$s" +msgstr "" + +#: website/static/js/components/publicNodes.js:190 +msgid " at this time. Please refresh the page or contact " +msgstr "" + +#: website/static/js/components/publicNodes.js:204 +msgid "You have no public %1$s." +msgstr "" + +#: website/static/js/components/publicNodes.js:206 +msgid "Find out how to make your %1$s" +msgstr "" + +#: website/static/js/components/publicNodes.js:207 +msgid "public" +msgstr "" + +#: website/static/js/components/publicNodes.js:211 +msgid "This user has no public %1$s." +msgstr "" + +#: website/static/js/components/quickFiles.js:54 +msgid "Error retrieving quickfiles" +msgstr "" + +#: website/static/js/components/quickFiles.js:121 +msgid "" +"Unable to retrieve quickfiles at this time. Please refresh the page or " +"contact " +msgstr "" + +#: website/static/js/components/quickFiles.js:134 +msgid "You have no public quickfiles" +msgstr "" + +#: website/static/js/components/quickFiles.js:135 +msgid "This user has no public quickfiles." +msgstr "" + +#: website/static/js/components/utils.js:15 +msgid "Missing required option: " +msgstr "" + +#: website/static/js/filepage/editor.js:82 +msgid "The file content could not be loaded." +msgstr "" + +#: website/static/js/filepage/editor.js:83 +msgid "Could not GET file contents." +msgstr "" + +#: website/static/js/filepage/editor.js:113 +msgid "Could not update file. Insufficient storage space in your Dropbox." +msgstr "" + +#: website/static/js/filepage/editor.js:115 +msgid "The file could not be updated." +msgstr "" + +#: website/static/js/filepage/editor.js:122 +msgid "Could not PUT file content." +msgstr "" + +#: website/static/js/filepage/editor.js:178 +msgid "Revert" +msgstr "" + +#: website/static/js/filepage/index.js:89 +msgid "Direct iframe with fixed height and width" +msgstr "" + +#: website/static/js/filepage/index.js:131 +#: website/static/js/filepage/index.js:136 +msgid "File is checked out." +msgstr "" + +#: website/static/js/filepage/index.js:132 +msgid "" +" This file has been checked out by a COS Preregistration Challenge " +"Reviewer and will become available when review is complete." +msgstr "" + +#: website/static/js/filepage/index.js:137 +msgid " This file has been checked out by a " +msgstr "" + +#: website/static/js/filepage/index.js:138 +msgid "collaborator" +msgstr "" + +#: website/static/js/filepage/index.js:139 +msgid ". It needs to be checked in before any changes can be made." +msgstr "" + +#: website/static/js/filepage/index.js:184 +msgid "Delete file?" +msgstr "" + +#: website/static/js/filepage/index.js:186 +msgid "Are you sure you want to delete %1$s?" +msgstr "" + +#: website/static/js/filepage/index.js:204 +msgid "Could not delete file." +msgstr "" + +#: website/static/js/filepage/index.js:220 +msgid "Confirm file check out?" +msgstr "" + +#: website/static/js/filepage/index.js:223 +msgid "as long as it is checked out. You can check it back in at anytime." +msgstr "" + +#: website/static/js/filepage/index.js:243 +msgid "Unable to check out file" +msgstr "" + +#: website/static/js/filepage/index.js:270 +msgid "Unable to check in file" +msgstr "" + +#: website/static/js/filepage/index.js:275 +msgid "Force check in file?" +msgstr "" + +#: website/static/js/filepage/index.js:276 +msgid "" +"This will check in the file for all users, allowing it to be edited. Are " +"you sure?" +msgstr "" + +#: website/static/js/filepage/index.js:279 +#: website/static/js/filepage/index.js:502 +msgid "Force check in" +msgstr "" + +#: website/static/js/filepage/index.js:302 +msgid "Unable to force check in file. Make sure you have admin privileges." +msgstr "" + +#: website/static/js/filepage/index.js:343 +msgid "Live editing mode " +msgstr "" + +#: website/static/js/filepage/index.js:344 +msgid "Attempting to connect " +msgstr "" + +#: website/static/js/filepage/index.js:345 +msgid "Unsupported browser " +msgstr "" + +#: website/static/js/filepage/index.js:346 +msgid "Saving... " +msgstr "" + +#: website/static/js/filepage/index.js:347 +msgid "Unavailable: Live editing " +msgstr "" + +#: website/static/js/filepage/index.js:470 +msgid "View this file on " +msgstr "" + +#: website/static/js/filepage/index.js:505 +msgid "Check out" +msgstr "" + +#: website/static/js/filepage/index.js:508 +msgid "Check in" +msgstr "" + +#: website/static/js/filepage/index.js:514 +msgid "Request Trusted Timestamp" +msgstr "" + +#: website/static/js/filepage/index.js:531 +msgid "Toggle view: " +msgstr "" + +#: website/static/js/filepage/index.js:570 +#: website/static/js/filepage/revisions.js:173 +msgid "Revisions" +msgstr "" + +#: website/static/js/filepage/revisions.js:72 +#: website/static/js/filepage/revisions.js:73 +msgid "Unable to fetch versions" +msgstr "" + +#: website/static/js/filepage/revisions.js:108 +msgid "Version ID" +msgstr "" + +#: website/static/js/filepage/revisions.js:110 +msgid "User" +msgstr "" + +#: website/static/js/filepage/revisions.js:113 +msgid "" +".fa.fa-question-circle[data-content=\"MD5 is an algorithm used to verify " +"data integrity.\"][rel=\"popover\"]" +msgstr "" + +#: website/static/js/filepage/revisions.js:116 +msgid "" +".fa.fa-question-circle[data-content=\"SHA-2 is a cryptographic hash " +"function designed by the NSA used to verify data " +"integrity.\"][rel=\"popover\"]" +msgstr "" + +#: website/static/js/filepage/revisions.js:133 +msgid "Anonymous Contributor" +msgstr "" + +#: website/static/js/filepage/util.js:36 +msgid " Loading... " +msgstr "" + +#: website/static/js/home-page/scheduledBannerPlugin.js:25 +msgid "Error in request to %1$s" +msgstr "" + +#: website/static/js/pages/base-page.js:130 +msgid "Merge account" +msgstr "" + +#: website/static/js/pages/base-page.js:131 +msgid "Would you like to merge %1$s into your account? " +msgstr "" + +#: website/static/js/pages/base-page.js:133 +msgid "%1$s has been merged into your account." +msgstr "" + +#: website/static/js/pages/base-page.js:134 +msgid "You have chosen to not merge %1$s into your account. " +msgstr "" + +#: website/static/js/pages/base-page.js:135 +#: website/static/js/pages/base-page.js:142 +msgid "" +"If you change your mind, visit the user " +"settings page." +msgstr "" + +#: website/static/js/pages/base-page.js:138 +#: website/static/js/pages/base-page.js:188 +msgid "Add email" +msgstr "" + +#: website/static/js/pages/base-page.js:139 +msgid "Would you like to add %1$s to your account?" +msgstr "" + +#: website/static/js/pages/base-page.js:140 +msgid "%1$s has been added into your account." +msgstr "" + +#: website/static/js/pages/base-page.js:141 +msgid "You have chosen not to add %1$s to your account. " +msgstr "" + +#: website/static/js/pages/base-page.js:145 +msgid "There was a problem adding " +msgstr "" + +#: website/static/js/pages/base-page.js:146 +#: website/static/js/pages/base-page.js:149 +msgid ". Please contact %1$s if the problem persists." +msgstr "" + +#: website/static/js/pages/base-page.js:148 +msgid "There was a problem removing " +msgstr "" + +#: website/static/js/pages/base-page.js:160 +msgid "Do not add email" +msgstr "" + +#: website/static/js/pages/base-page.js:173 +msgid "Could not remove email" +msgstr "" + +#: website/static/js/pages/base-page.js:198 +msgid "Could not add email" +msgstr "" + +#: website/static/js/pages/base-page.js:291 +msgid " and " +msgstr "" + +#: website/static/js/pages/dashboard-page.js:35 +msgid "Could not set user timezone or locale" +msgstr "" + +#: website/static/js/pages/dashboard-page.js:53 +msgid "" +"This is taking longer than normal.
                                                Try reloading the page. If the " +"problem persist, please contact us at %1$s" +msgstr "" + +#: website/static/js/pages/file-page.js:21 +msgid "Add a file tag to enhance discoverability" +msgstr "" + +#: website/static/js/pages/file-page.js:23 +#: website/static/js/pages/file-page.js:58 +#: website/static/js/pages/file-page.js:60 +#: website/static/js/pages/project-dashboard-page.js:632 +#: website/static/js/pages/project-dashboard-page.js:716 +#: website/static/js/pages/project-dashboard-page.js:749 +msgid "Removing tag" +msgstr "" + +#: website/static/js/pages/file-page.js:24 +#: website/static/js/pages/project-dashboard-page.js:633 +msgid "Add a tag" +msgstr "" + +#: website/static/js/pages/file-page.js:28 +msgid "Could not add tag." +msgstr "" + +#: website/static/js/pages/file-page.js:29 +#: website/static/js/pages/project-dashboard-page.js:656 +msgid "Failed to add tag" +msgstr "" + +#: website/static/js/pages/file-page.js:43 +msgid "Could not remove tag." +msgstr "" + +#: website/static/js/pages/file-page.js:44 +#: website/static/js/pages/project-dashboard-page.js:692 +msgid "Failed to remove tag" +msgstr "" + +#: website/static/js/pages/file-page.js:90 +msgid "The file title cannot be empty." +msgstr "" + +#: website/static/js/pages/file-page.js:92 +msgid "The file title cannot be more than 100 characters." +msgstr "" + +#: website/static/js/pages/file-page.js:103 +msgid "" +"Your file was successfully renamed. To view the new filename in the file " +"tree below, refresh the page." +msgstr "" + +#: website/static/js/pages/institution-page.js:30 +msgid "All Projects" +msgstr "" + +#: website/static/js/pages/institution-page.js:43 +msgid "" +"This is taking longer than normal.
                                                Try reloading the page. If the " +"problem persist, please contact us at %1$s." +msgstr "" + +#: website/static/js/pages/notifications-config-page.js:21 +#: website/static/js/pages/project-settings-page.js:33 +msgid "Could not retrieve notification settings." +msgstr "" + +#: website/static/js/pages/profile-settings-addons-page.js:66 +#: website/static/js/pages/project-addons-page.js:15 +msgid "" +"Sorry, we had trouble saving your settings. If this persists please " +"contact " +msgstr "" + +#: website/static/js/pages/profile-settings-addons-page.js:68 +msgid "Request failed" +msgstr "" + +#: website/static/js/pages/profile-settings-addons-page.js:86 +msgid "Are you sure you want to remove the add-ons you have deselected? " +msgstr "" + +#: website/static/js/pages/profile-settings-addons-page.js:129 +msgid "The changes on addon setting are not submitted!" +msgstr "" + +#: website/static/js/pages/project-addons-page.js:10 +msgid "Your add-on settings have been successfully changed." +msgstr "" + +#: website/static/js/pages/project-addons-page.js:26 +msgid "Disable Add-on?" +msgstr "" + +#: website/static/js/pages/project-addons-page.js:27 +msgid "Are you sure you want to disable this add-on?" +msgstr "" + +#: website/static/js/pages/project-addons-page.js:37 +msgid "Disable" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:117 +msgid "Filter by users" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:118 +msgid "Select from current contributors" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:119 +msgid "Select including past contributors" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:120 +msgid "Include past project contributors in your search" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:121 +msgid "Use dropdown menu" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:417 +msgid "Add Component" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:419 +msgid "Create new component" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:613 +msgid "Error retrieving filebrowser" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:630 +msgid "Add a project tag to enhance discoverability" +msgstr "" + +#: website/static/js/pages/project-dashboard-page.js:691 +msgid "Could not remove tag" +msgstr "" + +#: website/static/js/pages/project-settings-page.js:34 +msgid "Could not GET notification settings." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:54 +msgid "Could not retrieve wiki settings." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:55 +msgid "Could not GET wiki settings." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:104 +msgid "Successfully updated settings." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:115 +msgid "Could not set commenting configuration. Please try again." +msgstr "" + +#: website/static/js/pages/project-settings-page.js:151 +msgid "Unable to update settings" +msgstr "" + +#: website/static/js/pages/project-settings-page.js:152 +msgid "Could not update settings." +msgstr "" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:31 +msgid "Import Account from Admin" +msgstr "" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:52 +#: website/static/js/pages/rdm-profile-settings-addons-page.js:54 +msgid "Successfully imported the account." +msgstr "" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:59 +#: website/static/js/pages/rdm-profile-settings-addons-page.js:61 +msgid "Failed to import the account." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:172 +msgid "A verify request is being processed!" +msgstr "" + +#: website/static/js/pages/timestamp-common.js:175 +msgid "Something went wrong with the Verify request." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:191 +msgid "Using the checkbox, please select the files to request timestamp." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:214 +msgid "Timestamp is being added to the selected files!" +msgstr "" + +#: website/static/js/pages/timestamp-common.js:217 +msgid "Something went wrong with the Request Trusted Timestamp request." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:222 +msgid "The task has been cancelled." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:231 +msgid "The task already finished." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:234 +msgid "Something went wrong in the cancel request." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:288 +msgid "Using the checkbox, please select the files to download." +msgstr "" + +#: website/static/js/pages/timestamp-common.js:323 +msgid "Failed to log \"downloaded errors\" into Recent Activity" +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:64 +msgid "The wiki page name cannot be empty." +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:66 +msgid "The wiki page name cannot be more than 100 characters." +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:81 +msgid "Error in renaming wiki" +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:88 +msgid "An unexpected error occurred. Please try again." +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:108 +msgid "

                                                Could not retrieve wiki pages. If this issue persists, " +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:109 +msgid "please report it to %1$s" +msgstr "" + +#: website/static/js/pages/wiki-edit-page.js:110 +msgid "Could not GET wiki menu pages" +msgstr "" + +#: addons/myscreen/static/widget-cfg.js:22 +msgid "My Screen Param1 Label" +msgstr "" diff --git a/site/guides/screen-expansion/osf.io/website/translations/messages.pot b/site/guides/screen-expansion/osf.io/website/translations/messages.pot new file mode 100644 index 0000000..7fac1c6 --- /dev/null +++ b/site/guides/screen-expansion/osf.io/website/translations/messages.pot @@ -0,0 +1,3776 @@ +# Translations template for PROJECT. +# Copyright (C) 2020 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR , 2020. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: 0.6.0\n" +"Report-Msgid-Bugs-To: rocs-office@nii.ac.jp\n" +"POT-Creation-Date: 2020-07-02 20:20+0900\n" +"PO-Revision-Date: 2020-07-02 20:20+0900\n" +"Last-Translator: Shunta Nishikawa\n" +"Language-Team: RCOS \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.7.0\n" + +#: addons/azureblobstorage/templates/azureblobstorage_credentials_modal.mako:6 +msgid "Connect an Azure Blob Storage Account" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_credentials_modal.mako:17 +msgid "Account Name" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_credentials_modal.mako:21 +msgid "Account Key" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_credentials_modal.mako:36 +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:77 +#: addons/dataverse/templates/dataverse_credentials_modal.mako:75 +#: addons/gitlab/templates/gitlab_credentials_modal.mako:55 +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:99 +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:71 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:72 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:71 +#: addons/owncloud/templates/owncloud_node_settings.mako:72 +#: addons/s3/templates/s3_credentials_modal.mako:36 +#: addons/s3/templates/s3_node_settings.mako:77 +#: addons/s3compat/templates/s3compat_credentials_modal.mako:40 +#: addons/s3compat/templates/s3compat_node_settings.mako:77 +#: addons/swift/templates/swift_credentials_modal.mako:56 +#: addons/swift/templates/swift_node_settings.mako:77 +#: addons/weko/templates/weko_credentials_modal.mako:57 +#: addons/wiki/templates/add_wiki_page.mako:17 +#: addons/wiki/templates/delete_wiki_page.mako:13 +#: addons/zotero/templates/zotero_node_settings.mako:83 +#: addons/zotero/templates/zotero_node_settings.mako:127 +#: website/templates/include/comment_pane_template.mako:32 +#: website/templates/include/comment_template.mako:91 +#: website/templates/include/comment_template.mako:141 +#: website/templates/include/comment_template.mako:148 +#: website/templates/include/comment_template.mako:170 +#: website/templates/profile/oauth_app_detail.mako:84 +#: website/templates/profile/personal_tokens_detail.mako:49 +#: website/templates/project/addon/node_settings_default.mako:72 +#: website/templates/project/modal_add_contributor.mako:340 +#: website/templates/project/modal_generate_private_link.mako:86 +#: website/templates/project/modal_remove_contributor.mako:95 +#: website/templates/project/modal_remove_contributor.mako:104 +#: website/templates/project/modal_remove_contributor.mako:113 +#: website/templates/project/modal_remove_contributor.mako:122 +#: website/templates/project/nodes_delete.mako:89 +#: website/templates/project/nodes_privacy.mako:104 +#: website/templates/project/project.mako:568 +#: website/templates/project/settings.mako:131 +#: website/templates/project/timestamp.mako:71 +#: website/templates/util/render_addon_widget.mako:98 +msgid "Cancel" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_credentials_modal.mako:39 +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:79 +#: addons/dataverse/templates/dataverse_credentials_modal.mako:78 +#: addons/dataverse/templates/dataverse_node_settings.mako:118 +#: addons/forward/templates/forward_node_settings.mako:36 +#: addons/github/templates/github_node_settings.mako:54 +#: addons/gitlab/templates/gitlab_credentials_modal.mako:57 +#: addons/gitlab/templates/gitlab_node_settings.mako:64 +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:18 +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:74 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:74 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:74 +#: addons/owncloud/templates/owncloud_node_settings.mako:74 +#: addons/s3/templates/s3_credentials_modal.mako:39 +#: addons/s3/templates/s3_node_settings.mako:79 +#: addons/s3compat/templates/s3compat_credentials_modal.mako:43 +#: addons/s3compat/templates/s3compat_node_settings.mako:79 +#: addons/swift/templates/swift_credentials_modal.mako:59 +#: addons/swift/templates/swift_node_settings.mako:79 +#: addons/weko/templates/weko_node_settings.mako:83 +#: addons/wiki/templates/edit.mako:189 +#: addons/zotero/templates/zotero_node_settings.mako:85 +#: addons/zotero/templates/zotero_node_settings.mako:129 +#: website/templates/claim_account.mako:112 +#: website/templates/include/comment_template.mako:93 +#: website/templates/include/profile/jobs.mako:117 +#: website/templates/include/profile/jobs.mako:120 +#: website/templates/include/profile/names.mako:76 +#: website/templates/include/profile/names.mako:79 +#: website/templates/include/profile/schools.mako:117 +#: website/templates/include/profile/schools.mako:120 +#: website/templates/include/profile/social.mako:143 +#: website/templates/include/profile/social.mako:146 +#: website/templates/profile/oauth_app_detail.mako:88 +#: website/templates/profile/personal_tokens_detail.mako:55 +#: website/templates/project/addon/node_settings_default.mako:74 +#: website/templates/project/addon/user_settings.mako:13 +#: website/templates/project/project.mako:570 +#: website/templates/project/settings.mako:338 +msgid "Save" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:14 +#: addons/azureblobstorage/templates/azureblobstorage_user_settings.mako:18 +#: addons/bitbucket/templates/bitbucket_node_settings.mako:15 +#: addons/dataverse/templates/dataverse_node_settings.mako:15 +#: addons/dataverse/templates/dataverse_user_settings.mako:18 +#: addons/github/templates/github_node_settings.mako:15 +#: addons/gitlab/templates/gitlab_node_settings.mako:18 +#: addons/gitlab/templates/gitlab_user_settings.mako:18 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:15 +#: addons/nextcloud/templates/nextcloud_user_settings.mako:18 +#: addons/owncloud/templates/owncloud_node_settings.mako:15 +#: addons/owncloud/templates/owncloud_user_settings.mako:18 +#: addons/s3/templates/s3_node_settings.mako:14 +#: addons/s3/templates/s3_user_settings.mako:18 +#: addons/s3compat/templates/s3compat_node_settings.mako:14 +#: addons/s3compat/templates/s3compat_user_settings.mako:18 +#: addons/swift/templates/swift_node_settings.mako:14 +#: addons/swift/templates/swift_user_settings.mako:18 +#: addons/weko/templates/weko_node_settings.mako:15 +#: addons/weko/templates/weko_user_settings.mako:18 +#: addons/zotero/templates/zotero_node_settings.mako:10 +#: website/templates/profile/user_settings_default.mako:14 +#: website/templates/project/addon/node_settings_default.mako:10 +msgid "Disconnect Account" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:21 +#: addons/bitbucket/templates/bitbucket_node_settings.mako:21 +#: addons/dataverse/templates/dataverse_node_settings.mako:22 +#: addons/github/templates/github_node_settings.mako:21 +#: addons/gitlab/templates/gitlab_node_settings.mako:24 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:22 +#: addons/owncloud/templates/owncloud_node_settings.mako:22 +#: addons/s3/templates/s3_node_settings.mako:21 +#: addons/s3compat/templates/s3compat_node_settings.mako:21 +#: addons/swift/templates/swift_node_settings.mako:21 +#: addons/weko/templates/weko_node_settings.mako:22 +#: addons/zotero/templates/zotero_node_settings.mako:17 +#: website/templates/project/addon/node_settings_default.mako:17 +msgid "Import Account from Profile" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:28 +#: addons/s3/templates/s3_node_settings.mako:28 +#: addons/s3compat/templates/s3compat_node_settings.mako:28 +#: addons/swift/templates/swift_node_settings.mako:28 +#: addons/zotero/templates/zotero_node_settings.mako:24 +#: website/templates/project/addon/node_settings_default.mako:24 +msgid "Loading ..." +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:35 +#: addons/dataverse/templates/dataverse_node_settings.mako:29 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:29 +#: addons/owncloud/templates/owncloud_node_settings.mako:29 +#: addons/s3/templates/s3_node_settings.mako:35 +#: addons/s3compat/templates/s3compat_node_settings.mako:35 +#: addons/swift/templates/swift_node_settings.mako:35 +#: addons/weko/templates/weko_node_settings.mako:29 +msgid "Connect Account" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:50 +#: addons/bitbucket/templates/bitbucket_node_settings.mako:65 +#: addons/github/templates/github_node_settings.mako:62 +#: addons/gitlab/templates/gitlab_node_settings.mako:71 +#: addons/owncloud/templates/owncloud_node_settings.mako:47 +#: addons/s3/templates/s3_node_settings.mako:50 +#: addons/s3compat/templates/s3compat_node_settings.mako:50 +#: addons/swift/templates/swift_node_settings.mako:50 +#: addons/weko/templates/weko_node_settings.mako:49 +#: addons/zotero/templates/zotero_node_settings.mako:46 +#: addons/zotero/templates/zotero_node_settings.mako:101 +#: website/templates/project/addon/node_settings_default.mako:46 +#: website/templates/project/project.mako:202 +msgid "None" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:58 +#: addons/swift/templates/swift_node_settings.mako:58 +msgid "Create container" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:63 +#: addons/swift/templates/swift_node_settings.mako:63 +msgid "Loading containers..." +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_node_settings.mako:72 +#: addons/nextcloud/templates/nextcloud_node_settings.mako:67 +#: addons/owncloud/templates/owncloud_node_settings.mako:67 +#: addons/s3/templates/s3_node_settings.mako:72 +#: addons/s3compat/templates/s3compat_node_settings.mako:72 +#: addons/swift/templates/swift_node_settings.mako:72 +#: addons/zotero/templates/zotero_node_settings.mako:122 +#: website/templates/project/addon/node_settings_default.mako:67 +#, python-format +msgid "Connect %(folderName)s?" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_user_settings.mako:12 +#: addons/dataverse/templates/dataverse_user_settings.mako:12 +#: addons/gitlab/templates/gitlab_user_settings.mako:12 +#: addons/nextcloud/templates/nextcloud_user_settings.mako:12 +#: addons/owncloud/templates/owncloud_user_settings.mako:12 +#: addons/s3/templates/s3_user_settings.mako:12 +#: addons/s3compat/templates/s3compat_user_settings.mako:12 +#: addons/swift/templates/swift_user_settings.mako:12 +#: addons/weko/templates/weko_user_settings.mako:12 +#: website/templates/profile/user_settings_default.mako:9 +msgid "Connect or Reauthorize Account" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_user_settings.mako:24 +#, python-format +msgid "Authorized by %(userName)s" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_user_settings.mako:32 +#: addons/dataverse/templates/dataverse_user_settings.mako:31 +#: addons/gitlab/templates/gitlab_user_settings.mako:31 +#: addons/nextcloud/templates/nextcloud_user_settings.mako:31 +#: addons/owncloud/templates/owncloud_user_settings.mako:31 +#: addons/s3/templates/s3_user_settings.mako:32 +#: addons/s3compat/templates/s3compat_user_settings.mako:32 +#: addons/swift/templates/swift_user_settings.mako:32 +#: addons/weko/templates/weko_user_settings.mako:31 +#: website/templates/profile/user_settings_default.mako:28 +msgid "Private project" +msgstr "" + +#: addons/azureblobstorage/templates/azureblobstorage_user_settings.mako:36 +#: addons/s3/templates/s3_user_settings.mako:36 +#: addons/s3compat/templates/s3compat_user_settings.mako:36 +#: addons/swift/templates/swift_user_settings.mako:36 +#: addons/weko/templates/weko_user_settings.mako:35 +#: website/templates/profile/user_settings_default.mako:32 +msgid "disconnect Project" +msgstr "" + +#: addons/base/models.py:461 +msgid "" +"Because you have not configured the {addon} add-on, your authentication " +"will not be transferred to the forked {category}. You may authorize and " +"configure the {addon} add-on in the new fork on the settings page." +msgstr "" + +#: addons/base/models.py:469 +msgid "" +"Because you have authorized the {addon} add-on for this {category}, " +"forking it will also transfer your authentication to the forked " +"{category}." +msgstr "" + +#: addons/base/models.py:476 +msgid "" +"Because the {addon} add-on has been authorized by a different user, " +"forking it will not transfer authentication to the forked {category}. You" +" may authorize and configure the {addon} add-on in the new fork on the " +"settings page." +msgstr "" + +#: addons/bitbucket/templates/bitbucket_node_settings.mako:25 +#: addons/github/templates/github_node_settings.mako:25 +#: addons/gitlab/templates/gitlab_node_settings.mako:28 +#: addons/zotero/templates/zotero_node_settings.mako:31 +#: website/templates/project/addon/node_settings_default.mako:31 +msgid "Connect Account" +msgstr "" + +#: addons/bitbucket/templates/bitbucket_node_settings.mako:74 +#: addons/github/templates/github_node_settings.mako:71 +#, python-format +msgid "" +"Could not retrieve %(addonName)s settings at this time. The %(addonName)s" +" addon credentials may no longer be valid. Try " +"deauthorizing and reauthorizing %(addonName)s on your account settings page." +msgstr "" + +#: addons/bitbucket/templates/bitbucket_node_settings.mako:78 +#: addons/github/templates/github_node_settings.mako:75 +#, python-format +msgid "" +"Could not retrieve %(addonName)s settings at this time. The %(addonName)s" +" addon credentials may no longer be valid. Contact " +"%(authOsfName)s to verify." +msgstr "" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:6 +msgid "Connect a Dataverse Account" +msgstr "" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:18 +msgid "Dataverse Repository" +msgstr "" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:22 +msgid "Select a Dataverse repository" +msgstr "" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:35 +msgid "Only Dataverse repositories v4.0 or higher are supported." +msgstr "" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:46 +msgid "API Token" +msgstr "" + +#: addons/dataverse/templates/dataverse_credentials_modal.mako:50 +#, python-format +msgid "(Get from Dataverse %(dataverseLink)s)" +msgstr "" + +#: addons/dataverse/templates/dataverse_node_settings.mako:43 +msgid "Dataverse Repository:" +msgstr "" + +#: addons/dataverse/templates/dataverse_node_settings.mako:49 +msgid "Current Dataset:" +msgstr "" + +#: addons/dataverse/templates/dataverse_node_settings.mako:65 +msgid "The current dataset was not found on Dataverse." +msgstr "" + +#: addons/dataverse/templates/dataverse_node_settings.mako:74 +msgid "Dataverse:" +msgstr "" + +#: addons/dataverse/templates/dataverse_node_settings.mako:86 +msgid "Dataset:" +msgstr "" + +#: addons/dataverse/templates/dataverse_node_settings.mako:97 +msgid "No datasets available." +msgstr "" + +#: addons/dataverse/templates/dataverse_node_settings.mako:103 +msgid "Retrieving datasets..." +msgstr "" + +#: addons/dataverse/templates/dataverse_node_settings.mako:110 +msgid "" +"There are no dataverses, datasets, or files associated with the connected" +" account." +msgstr "" + +#: addons/dataverse/templates/dataverse_user_settings.mako:23 +#: addons/gitlab/templates/gitlab_user_settings.mako:23 +#, python-format +msgid "Authorized on %(addonHost)s" +msgstr "" + +#: addons/forward/templates/forward_node_settings.mako:14 +msgid "Send people who visit your GakuNin RDM project page to this link instead" +msgstr "" + +#: addons/forward/templates/forward_node_settings.mako:19 +msgid "Label" +msgstr "" + +#: addons/forward/templates/forward_node_settings.mako:24 +#: website/templates/profile/oauth_app_detail.mako:67 +#: website/templates/project/settings.mako:108 +msgid "Optional" +msgstr "" + +#: addons/github/templates/github_node_settings.mako:38 +#: addons/gitlab/templates/gitlab_node_settings.mako:42 +msgid "Current Repo: " +msgstr "" + +#: addons/github/templates/github_node_settings.mako:56 +msgid "Create Repo" +msgstr "" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:4 +msgid "Connect a GitLab Account" +msgstr "" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:11 +msgid "GitLab Repository" +msgstr "" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:14 +msgid "Select a GitLab repository" +msgstr "" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:27 +msgid "Only GitLab repositories v4.0 or higher are supported." +msgstr "" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:37 +msgid "Personal Access Token" +msgstr "" + +#: addons/gitlab/templates/gitlab_credentials_modal.mako:41 +#, python-format +msgid "(Get from GitLab %(externalLinkIcon)s)" +msgstr "" + +#: addons/gitlab/templates/gitlab_node_settings.mako:9 +msgid "GitLab" +msgstr "" + +#: addons/gitlab/templates/gitlab_node_settings.mako:12 +msgid "authorized by" +msgstr "" + +#: addons/gitlab/templates/gitlab_node_settings.mako:80 +#, python-format +msgid "" +"Could not retrieve %(addonName)s settings at this time. The %(addonName)s" +" addon credentials may no longer be valid. Try " +"deauthorizing and reauthorizing %(addonName)s on your " +"account settings page." +msgstr "" + +#: addons/gitlab/templates/gitlab_node_settings.mako:84 +#, python-format +msgid "" +"Could not retrieve %(addonName)s settings at this time. The %(addonName)s" +" addon credentials may no longer be valid. Contact " +"%(authOsfName)s to verify." +msgstr "" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:13 +#: addons/wiki/templates/edit.mako:34 +msgid "New" +msgstr "" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:31 +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:80 +msgid "Service Name" +msgstr "" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:32 +msgid "Base URL" +msgstr "" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:56 +msgid "No JupyterHubs" +msgstr "" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:69 +msgid "Link JupyterHub" +msgstr "" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:84 +msgid "Service Base URL" +msgstr "" + +#: addons/jupyterhub/templates/jupyterhub_node_settings.mako:102 +msgid "OK" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:6 +msgid "Connect an Nextcloud Account" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:17 +msgid "Nextcloud Instance" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:21 +msgid "Select an Nextcloud Instance" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:30 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:30 +msgid "Host URL" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:36 +#, python-format +msgid "" +"Only Nextcloud instances supporting WebDAV and OCS v1.7 are " +"supported." +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:46 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:46 +#: addons/swift/templates/swift_credentials_modal.mako:33 +msgid "Username" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:48 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:48 +#: website/templates/include/profile/social.mako:66 +msgid "username" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:50 +#: addons/owncloud/templates/owncloud_credentials_modal.mako:50 +#: addons/swift/templates/swift_credentials_modal.mako:41 +msgid "Password" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_credentials_modal.mako:55 +#, python-format +msgid "" +"These credentials will be encrypted. However, we strongly " +"encourage using a Device (or App) " +"Password." +msgstr "" + +#: addons/nextcloud/templates/nextcloud_node_settings.mako:53 +#: addons/owncloud/templates/owncloud_node_settings.mako:53 +msgid "Change" +msgstr "" + +#: addons/nextcloud/templates/nextcloud_node_settings.mako:58 +#: addons/owncloud/templates/owncloud_node_settings.mako:58 +#: addons/zotero/templates/zotero_node_settings.mako:113 +#: website/templates/project/addon/node_settings_default.mako:58 +msgid "Loading folders..." +msgstr "" + +#: addons/nextcloud/templates/nextcloud_user_settings.mako:23 +#: addons/owncloud/templates/owncloud_user_settings.mako:23 +#, python-format +msgid "Authorized by %(userName)s on %(profilePage)s" +msgstr "" + +#: addons/owncloud/templates/owncloud_credentials_modal.mako:6 +msgid "Connect an ownCloud Account" +msgstr "" + +#: addons/owncloud/templates/owncloud_credentials_modal.mako:17 +msgid "ownCloud Instance" +msgstr "" + +#: addons/owncloud/templates/owncloud_credentials_modal.mako:21 +msgid "Select an ownCloud Instance" +msgstr "" + +#: addons/owncloud/templates/owncloud_credentials_modal.mako:36 +#, python-format +msgid "" +"Only ownCloud instances supporting WebDAV and OCS v1.7 are " +"supported." +msgstr "" + +#: addons/owncloud/templates/owncloud_credentials_modal.mako:55 +#, python-format +msgid "" +" These credentials will be encrypted. However, we strongly " +"encourage using a Device (or App) " +"Password." +msgstr "" + +#: addons/owncloud/templates/owncloud_node_settings.mako:42 +#: website/templates/project/addon/node_settings_default.mako:41 +msgid "Current Folder:" +msgstr "" + +#: addons/s3/templates/s3_credentials_modal.mako:6 +msgid "Connect an Amazon S3 Account" +msgstr "" + +#: addons/s3/templates/s3_credentials_modal.mako:17 +#: addons/s3compat/templates/s3compat_credentials_modal.mako:21 +msgid "Access Key" +msgstr "" + +#: addons/s3/templates/s3_credentials_modal.mako:21 +#: addons/s3compat/templates/s3compat_credentials_modal.mako:25 +msgid "Secret Key" +msgstr "" + +#: addons/s3/templates/s3_node_settings.mako:58 +#: addons/s3compat/templates/s3compat_node_settings.mako:58 +msgid "Create bucket" +msgstr "" + +#: addons/s3/templates/s3_node_settings.mako:63 +msgid "Loading buckets..." +msgstr "" + +#: addons/s3/templates/s3_user_settings.mako:24 +#: addons/s3compat/templates/s3compat_user_settings.mako:24 +#: addons/swift/templates/swift_user_settings.mako:24 +#: addons/weko/templates/weko_user_settings.mako:23 +#: website/templates/profile/user_settings_default.mako:20 +msgid "Authorized by " +msgstr "" + +#: addons/s3compat/templates/s3compat_credentials_modal.mako:6 +msgid "Connect an S3 Compatible Storage Account" +msgstr "" + +#: addons/s3compat/templates/s3compat_credentials_modal.mako:17 +msgid "S3 Compatible Service" +msgstr "" + +#: addons/s3compat/templates/s3compat_node_settings.mako:45 +msgid "Current Bucket:" +msgstr "" + +#: addons/swift/templates/swift_credentials_modal.mako:6 +msgid "Connect an OpenStack Swift Account" +msgstr "" + +#: addons/swift/templates/swift_credentials_modal.mako:17 +msgid "Authentication(Keystone) Version" +msgstr "" + +#: addons/swift/templates/swift_credentials_modal.mako:21 +msgid "Authentication URL" +msgstr "" + +#: addons/swift/templates/swift_credentials_modal.mako:25 +msgid "Tenant name" +msgstr "" + +#: addons/swift/templates/swift_credentials_modal.mako:29 +msgid "Project Domain name" +msgstr "" + +#: addons/swift/templates/swift_credentials_modal.mako:37 +msgid "User Domain name" +msgstr "" + +#: addons/swift/templates/swift_node_settings.mako:45 +msgid "Current Container:" +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:3 +msgid "Two-factor Authentication" +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:7 +msgid "Disable Two-Factor Authentication" +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:12 +msgid "Enable Two-Factor Authentication" +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:19 +msgid "" +"By using two-factor authentication, you'll protect your GakuNin RDM " +"account with both your password and your mobile phone." +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:22 +msgid "Important: " +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:22 +msgid "" +" If you lose access to your mobile device, you will not be able to log in" +" to your GakuNin RDM account." +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:24 +#, python-format +msgid "" +"To use, you must install an appropriate application on your mobile " +"device. Google Authenticator is a popular choice and is available for " +"both Android and iOS." +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:26 +msgid "" +"Once verified, your device will display a six-digit code that must be " +"entered during the login process. This code changes every few seconds, " +"which means that unauthorized users will not be able to log in to you " +"account, even if they know your password." +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:28 +#, python-format +msgid "" +"Scan the image below, or enter the secret key %(secretKey)s into " +"your authentication device." +msgstr "" + +#: addons/twofactor/templates/twofactor_user_settings.mako:34 +msgid "Enter your verification code:" +msgstr "" + +#: addons/weko/templates/weko_credentials_modal.mako:6 +msgid "Connect a WEKO Account" +msgstr "" + +#: addons/weko/templates/weko_credentials_modal.mako:18 +msgid "WEKO Repository" +msgstr "" + +#: addons/weko/templates/weko_credentials_modal.mako:22 +msgid "Select a WEKO repository" +msgstr "" + +#: addons/weko/templates/weko_credentials_modal.mako:33 +msgid "WEKO SWORD URL" +msgstr "" + +#: addons/weko/templates/weko_credentials_modal.mako:37 +msgid "WEKO Username" +msgstr "" + +#: addons/weko/templates/weko_credentials_modal.mako:41 +msgid "WEKO Password" +msgstr "" + +#: addons/weko/templates/weko_credentials_modal.mako:60 +msgid "Connect" +msgstr "" + +#: addons/weko/templates/weko_node_settings.mako:43 +msgid "Current Index:" +msgstr "" + +#: addons/weko/templates/weko_node_settings.mako:63 +msgid "Index:" +msgstr "" + +#: addons/weko/templates/weko_node_settings.mako:75 +msgid "There are no indices associated with the connected account." +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:8 +msgid "Add new wiki page" +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:12 +msgid "New Wiki Name" +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:18 +#: addons/wiki/templates/add_wiki_page.mako:44 +#: addons/wiki/templates/add_wiki_page.mako:49 +#: addons/wiki/templates/add_wiki_page.mako:55 +#: addons/wiki/templates/add_wiki_page.mako:94 +#: website/templates/project/contributors.mako:57 +#: website/templates/project/contributors.mako:164 +#: website/templates/project/contributors.mako:337 +#: website/templates/project/contributors.mako:385 +#: website/templates/project/modal_add_contributor.mako:346 +#: website/templates/project/modal_add_contributor.mako:350 +#: website/templates/project/modal_add_contributor.mako:356 +#: website/templates/project/settings.mako:209 +#: website/templates/project/settings.mako:522 +msgid "Add" +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:38 +msgid "Creating new wiki page" +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:41 +msgid "The new wiki page name cannot be empty" +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:46 +msgid "The new wiki page name cannot be more than 100 characters." +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:52 +msgid "The new wiki page name cannot contain forward slashes." +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:70 +msgid "A wiki page with that name already exists." +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:73 +msgid "You do not have permission to perform this action." +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:74 +msgid "Unauthorized user can view wiki add button" +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:83 +msgid "Could not validate wiki page. Please try again." +msgstr "" + +#: addons/wiki/templates/add_wiki_page.mako:84 +msgid "Error occurred while validating page" +msgstr "" + +#: addons/wiki/templates/delete_wiki_page.mako:7 +msgid "Delete wiki page" +msgstr "" + +#: addons/wiki/templates/delete_wiki_page.mako:10 +msgid "Are you sure you want to delete this wiki page?" +msgstr "" + +#: addons/wiki/templates/delete_wiki_page.mako:14 +#: addons/wiki/templates/edit.mako:38 +#: website/templates/include/comment_template.mako:149 +#: website/templates/profile/personal_tokens_detail.mako:53 +#: website/templates/project/nodes_delete.mako:91 +#: website/templates/util/render_node.mako:74 +msgid "Delete" +msgstr "" + +#: addons/wiki/templates/edit.mako:2 +#: website/templates/include/comment_pane_template.mako:19 +#: website/templates/project/settings.mako:36 +#: website/templates/project/settings.mako:257 +#: website/templates/search.mako:278 website/templates/search.mako:370 +#: website/templates/search_grdm.mako:405 +#: website/templates/search_grdm.mako:581 +msgid "Wiki" +msgstr "" + +#: addons/wiki/templates/edit.mako:42 +msgid "Menu" +msgstr "" + +#: addons/wiki/templates/edit.mako:53 +msgid "Loading wiki pages..." +msgstr "" + +#: addons/wiki/templates/edit.mako:75 addons/wiki/templates/edit.mako:82 +msgid "View" +msgstr "" + +#: addons/wiki/templates/edit.mako:88 +msgid "Wiki Version:" +msgstr "" + +#: addons/wiki/templates/edit.mako:92 +msgid "Preview" +msgstr "" + +#: addons/wiki/templates/edit.mako:95 addons/wiki/templates/edit.mako:218 +msgid "(Current)" +msgstr "" + +#: addons/wiki/templates/edit.mako:97 addons/wiki/templates/edit.mako:220 +msgid "Current" +msgstr "" + +#: addons/wiki/templates/edit.mako:117 +#: website/templates/util/render_addon_widget.mako:24 +msgid "Add important information, links, or images here to describe your project." +msgstr "" + +#: addons/wiki/templates/edit.mako:126 addons/wiki/templates/edit.mako:134 +#: website/templates/include/profile/schools.mako:180 +#: website/templates/include/profile/social.mako:184 +#: website/templates/project/project.mako:539 +msgid "Edit" +msgstr "" + +#: addons/wiki/templates/edit.mako:174 +msgid "Loading. . ." +msgstr "" + +#: addons/wiki/templates/edit.mako:186 +msgid "Revert" +msgstr "" + +#: addons/wiki/templates/edit.mako:205 addons/wiki/templates/edit.mako:212 +msgid "Compare" +msgstr "" + +#: addons/wiki/templates/edit.mako:215 +msgid " to" +msgstr "" + +#: addons/wiki/templates/edit.mako:257 +msgid "Page permissions have changed" +msgstr "" + +#: addons/wiki/templates/edit.mako:260 +msgid "Your browser should refresh shortly" +msgstr "" + +#: addons/wiki/templates/edit.mako:273 +msgid "Renaming wiki..." +msgstr "" + +#: addons/wiki/templates/edit.mako:283 +msgid "Wiki page deleted" +msgstr "" + +#: addons/wiki/templates/edit.mako:286 +msgid "Press Confirm to return to the project wiki home page." +msgstr "" + +#: addons/wiki/templates/edit.mako:289 +msgid "Confirm" +msgstr "" + +#: addons/wiki/templates/edit.mako:300 +msgid "Connected to the collaborative wiki" +msgstr "" + +#: addons/wiki/templates/edit.mako:304 +msgid "" +"This page is currently connected to the collaborative wiki. All edits " +"made will be visible to contributors with write permission in " +"real time. Changes will be stored but not published until you " +"click the \"Save\" button." +msgstr "" + +#: addons/wiki/templates/edit.mako:310 +#: addons/wiki/templates/wiki-bar-modal-help.mako:14 +#: website/templates/profile/modal_change_avatar.mako:20 +#: website/templates/project/view_file.mako:117 +#: website/templates/project/view_file.mako:137 +#: website/templates/project/view_file.mako:157 +#: website/templates/project/view_file.mako:177 +#: website/templates/search_bar_help_modal.mako:18 +msgid "Close" +msgstr "" + +#: addons/wiki/templates/edit.mako:321 +msgid "Connecting to the collaborative wiki" +msgstr "" + +#: addons/wiki/templates/edit.mako:325 +msgid "" +"This page is currently attempting to connect to the collaborative wiki. " +"You may continue to make edits." +msgstr "" + +#: addons/wiki/templates/edit.mako:326 addons/wiki/templates/edit.mako:343 +#: addons/wiki/templates/edit.mako:360 +#: website/templates/project/view_file.mako:133 +#: website/templates/project/view_file.mako:153 +#: website/templates/project/view_file.mako:173 +msgid "Changes will not be saved until you press the \"Save\" button." +msgstr "" + +#: addons/wiki/templates/edit.mako:338 +msgid "Collaborative wiki is unavailable" +msgstr "" + +#: addons/wiki/templates/edit.mako:342 +msgid "" +"The collaborative wiki is currently unavailable. You may continue to make" +" edits." +msgstr "" + +#: addons/wiki/templates/edit.mako:355 +#: website/templates/project/view_file.mako:168 +msgid "Browser unsupported" +msgstr "" + +#: addons/wiki/templates/edit.mako:359 +#: website/templates/project/view_file.mako:172 +msgid "" +"Your browser does not support collaborative editing. You may continue to " +"make edits." +msgstr "" + +#: addons/wiki/templates/status.mako:7 +msgid "Note: Home page cannot be renamed." +msgstr "" + +#: addons/wiki/templates/status.mako:9 +msgid "Home" +msgstr "" + +#: addons/wiki/templates/wiki-bar-modal-help.mako:6 +msgid "Wiki syntax help" +msgstr "" + +#: addons/wiki/templates/wiki-bar-modal-help.mako:10 +#, python-format +msgid "" +"The wiki uses the Markdown syntax. For more " +"information and examples, go to our Guides." +msgstr "" + +#: addons/zotero/templates/zotero_node_settings.mako:41 +msgid "Current Library:" +msgstr "" + +#: addons/zotero/templates/zotero_node_settings.mako:59 +msgid "Loading libraries..." +msgstr "" + +#: addons/zotero/templates/zotero_node_settings.mako:66 +msgid "Libraries" +msgstr "" + +#: addons/zotero/templates/zotero_node_settings.mako:69 +msgid "Select" +msgstr "" + +#: website/templates/base.mako:110 +msgid "Title" +msgstr "" + +#: website/templates/base.mako:111 +msgid "Date Merged" +msgstr "" + +#: website/templates/base.mako:134 +msgid "WARNING: This site is running in development mode." +msgstr "" + +#: website/templates/base.mako:145 +msgid "" +"OSF does not support the use of Internet Explorer. For optimal " +"performance, please switch to another browser." +msgstr "" + +#: website/templates/base.mako:148 website/templates/base.mako:161 +msgid "Accept" +msgstr "" + +#: website/templates/base.mako:154 +#, python-format +msgid "" +"The National Institute of Informatics (NII) uses cookies to operate the " +"NII Research Data Cloud service and to improve your user experience." +" If you intend to use the GakuNin RDM, please read our " +"Privacy Policy and information on NII use of cookies. By clicking " +"Accept or continuing to use our website, you consent to the cookies use " +"on this site. If you do not agree with the cookies use, " +"please change your browser settings to disable cookies or stop using our " +"website. Please be aware that you may not be able to use" +" some functions on our website when you have cookies disabled." +msgstr "" + +#: website/templates/base.mako:172 +msgid "Start managing your projects on the GakuNin RDM today." +msgstr "" + +#: website/templates/base.mako:173 +msgid "" +"Free and easy to use, the GakuNin RDM supports the entire research " +"lifecycle: planning, execution, reporting, archiving, and discovery." +msgstr "" + +#: website/templates/base.mako:175 +msgid "Create an Account" +msgstr "" + +#: website/templates/base.mako:177 +msgid "Learn More" +msgstr "" + +#: website/templates/base.mako:178 +msgid "Hide this message" +msgstr "" + +#: website/templates/claim_account.mako:2 +msgid "Claim Account" +msgstr "" + +#: website/templates/claim_account.mako:4 +msgid "Set Password" +msgstr "" + +#: website/templates/claim_account.mako:9 +#, python-format +msgid "Hello %(firstname)s! Please set a password to claim your account." +msgstr "" + +#: website/templates/claim_account.mako:10 +#, python-format +msgid "E-mail: %(email)s" +msgstr "" + +#: website/templates/claim_account.mako:93 +#, python-format +msgid "" +"I have read and agree to the Terms of Use " +"and Privacy Policy." +msgstr "" + +#: website/templates/claim_account.mako:105 +#, python-format +msgid "" +"If you are not %(fullname)s, or if you were erroneously added as a " +"contributor to the project described in the email invitation, please " +"email %(osfContactEmail)s" +msgstr "" + +#: website/templates/claim_account_eppn.mako:2 +#: website/templates/claim_account_eppn.mako:4 +#: website/templates/claim_account_registered.mako:2 +#: website/templates/claim_account_registered.mako:4 +msgid "Claim Contributor" +msgstr "" + +#: website/templates/claim_account_eppn.mako:9 +msgid "Please confirm to continue." +msgstr "" + +#: website/templates/claim_account_eppn.mako:12 +msgid "Full name (can be changed later):" +msgstr "" + +#: website/templates/claim_account_eppn.mako:16 +msgid "Primary Email (Username) (can be changed later):" +msgstr "" + +#: website/templates/claim_account_eppn.mako:21 +msgid "Alternate Email (can be changed later):" +msgstr "" + +#: website/templates/claim_account_eppn.mako:27 +#, python-format +msgid "I am not %(username)s." +msgstr "" + +#: website/templates/claim_account_eppn.mako:29 +#: website/templates/claim_account_registered.mako:25 +#: website/templates/prereg_landing_page.mako:24 +#: website/templates/project/modal_remove_contributor.mako:97 +msgid "Continue" +msgstr "" + +#: website/templates/claim_account_registered.mako:9 +msgid "Please enter your credentials to continue." +msgstr "" + +#: website/templates/claim_account_registered.mako:23 +#, python-format +msgid "I am not %(userFullname)s." +msgstr "" + +#: website/templates/copyright.mako:7 website/templates/copyright.mako:12 +#: website/templates/footer.mako:11 +msgid "National Institute of Informatics" +msgstr "" + +#: website/templates/copyright.mako:8 +msgid "Terms of Use" +msgstr "" + +#: website/templates/copyright.mako:9 +msgid "Privacy Policy" +msgstr "" + +#: website/templates/footer.mako:17 +msgid "Terms of Use" +msgstr "" + +#: website/templates/footer.mako:23 +msgid "Privacy Policy" +msgstr "" + +#: website/templates/footer.mako:30 +msgid "Status" +msgstr "" + +#: website/templates/footer.mako:44 +msgid "TOP Guidelines" +msgstr "" + +#: website/templates/footer.mako:52 +msgid "Reproducibility Project: Psychology" +msgstr "" + +#: website/templates/footer.mako:60 +msgid "Reproducibility Project: Cancer Biology" +msgstr "" + +#: website/templates/institution.mako:8 +#: website/templates/project/project_header.mako:200 +msgid "" +"NOTICE: Forks, registrations, and uploads will be " +"temporarily disabled while the GakuNin RDM undergoes a hardware upgrade. " +"These features will return shortly. Thank you for your patience." +msgstr "" + +#: website/templates/messages.mako:1 +msgid "Duplicate template" +msgstr "" + +#: website/templates/messages.mako:2 +msgid "Fork this Project" +msgstr "" + +#: website/templates/messages.mako:3 +msgid "Citations" +msgstr "" + +#: website/templates/messages.mako:4 +msgid "Storage" +msgstr "" + +#: website/templates/messages.mako:5 +msgid "Other" +msgstr "" + +#: website/templates/messages.mako:6 +msgid "No license" +msgstr "" + +#: website/templates/messages.mako:7 +msgid "Analysis" +msgstr "" + +#: website/templates/messages.mako:8 +msgid "Communication" +msgstr "" + +#: website/templates/messages.mako:9 +msgid "Data" +msgstr "" + +#: website/templates/messages.mako:10 +msgid "Hypothesis" +msgstr "" + +#: website/templates/messages.mako:11 +msgid "Instrumentation" +msgstr "" + +#: website/templates/messages.mako:12 +msgid "Methods and Measures" +msgstr "" + +#: website/templates/messages.mako:13 +msgid "Procedure" +msgstr "" + +#: website/templates/messages.mako:14 +msgid "Software" +msgstr "" + +#: website/templates/messages.mako:15 +msgid "Component has been successfully deleted." +msgstr "" + +#: website/templates/messages.mako:16 +msgid "Project has been successfully deleted." +msgstr "" + +#: website/templates/messages.mako:17 +msgid "" +"View all information associated with this account, including for private " +"projects." +msgstr "" + +#: website/templates/messages.mako:18 +msgid "" +"View and edit all information associated with this account, including for" +" private projects." +msgstr "" + +#: website/templates/messages.mako:19 +msgid "Read your profile data." +msgstr "" + +#: website/templates/messages.mako:20 +msgid "Read your primary email address." +msgstr "" + +#: website/templates/messages.mako:22 +msgid "" +"\n" +"

                                                \n" +"
                                                \n" +"

                                                We've updated our Terms" +" of Use and Privacy" +" Policy. Please read them carefully.

                                                " +msgstr "" + +#: website/templates/messages.mako:26 +msgid "" +"
                                                I " +"have read and agree to these terms.
                                                \n" +"
                                                " +msgstr "" + +#: website/templates/messages.mako:28 +msgid "" +"\n" +"
                                                " +msgstr "" + +#: website/templates/my_projects.mako:2 website/templates/nav.mako:51 +msgid "My Projects" +msgstr "" + +#: website/templates/my_projects.mako:8 +msgid "" +"NOTICE: Forks, registrations, and uploads will be " +"temporarily disabled while the GakuNin RDM undergoes a hardware upgrade. " +"These features will return shortly. Thank you for your patience." +msgstr "" + +#: website/templates/nav.mako:23 +msgid "HOME" +msgstr "" + +#: website/templates/nav.mako:24 +msgid "PREPRINTS" +msgstr "" + +#: website/templates/nav.mako:25 +msgid "REGISTRIES" +msgstr "" + +#: website/templates/nav.mako:26 +msgid "MEETINGS" +msgstr "" + +#: website/templates/nav.mako:28 +msgid "INSTITUTIONS" +msgstr "" + +#: website/templates/nav.mako:34 +msgid "Toggle navigation" +msgstr "" + +#: website/templates/nav.mako:49 +msgid "My Quick Files" +msgstr "" + +#: website/templates/nav.mako:54 +#: website/templates/project/modal_add_contributor.mako:22 +#: website/templates/search.mako:2 website/templates/search_grdm.mako:2 +msgid "Search" +msgstr "" + +#: website/templates/nav.mako:59 +msgid "Support" +msgstr "" + +#: website/templates/nav.mako:63 +msgid "Donate" +msgstr "" + +#: website/templates/nav.mako:78 +msgid "My Profile" +msgstr "" + +#: website/templates/nav.mako:79 website/templates/profile/account.mako:8 +#: website/templates/profile/add_email.mako:14 +#: website/templates/profile/addons.mako:19 +#: website/templates/profile/notifications.mako:6 +#: website/templates/profile/oauth_app_list.mako:4 +#: website/templates/profile/personal_tokens_detail.mako:5 +#: website/templates/profile/personal_tokens_list.mako:4 +#: website/templates/profile/settings.mako:2 +#: website/templates/profile/settings.mako:9 +#: website/templates/project/project_header.mako:80 +#: website/templates/project/settings.mako:2 +#: website/templates/project/settings.mako:5 +#: website/templates/util/render_node.mako:67 +msgid "Settings" +msgstr "" + +#: website/templates/nav.mako:81 +msgid "RDM Support" +msgstr "" + +#: website/templates/nav.mako:83 +msgid "Log out" +msgstr "" + +#: website/templates/nav.mako:92 +msgid "Sign in" +msgstr "" + +#: website/templates/nav.mako:102 +msgid "Sign Up" +msgstr "" + +#: website/templates/nav.mako:104 +msgid "Sign In" +msgstr "" + +#: website/templates/nav.mako:140 +msgid "Notice:" +msgstr "" + +#: website/templates/nav.mako:144 +msgid "" +"The site will undergo maintenance between ." +msgstr "" + +#: website/templates/nav.mako:145 +msgid "Thank you for your patience." +msgstr "" + +#: website/templates/prereg_landing_page.mako:5 +msgid "GakuNin RDM Preregistration" +msgstr "" + +#: website/templates/prereg_landing_page.mako:7 +msgid "GakuNin RDM Prereg Challenge" +msgstr "" + +#: website/templates/prereg_landing_page.mako:22 +msgid "Please provide a title for your project:" +msgstr "" + +#: website/templates/prereg_landing_page.mako:30 +msgid "Go to an existing preregistration:" +msgstr "" + +#: website/templates/prereg_landing_page.mako:32 +#: website/templates/prereg_landing_page.mako:41 +#: website/templates/prereg_landing_page.mako:71 +#: website/templates/prereg_landing_page.mako:115 +msgid "Preregister" +msgstr "" + +#: website/templates/prereg_landing_page.mako:39 +msgid "Preregister an existing project:" +msgstr "" + +#: website/templates/prereg_landing_page.mako:55 +#, python-format +msgid "" +"

                                                Improve your research with preregistration. By" +" writing out specific details such as data collection methods, analysis " +"plans, and rules for data exclusion, you can make important decisions " +"early on and have a clear record of these choices. This can help reduce " +"biases that occur once the data are in front of you.

                                                " +msgstr "" + +#: website/templates/prereg_landing_page.mako:56 +#, python-format +msgid "" +"

                                                Use OSF Registries to discover previously " +"registered work.

                                                " +msgstr "" + +#: website/templates/prereg_landing_page.mako:58 +#, python-format +msgid "" +"

                                                Articles must be published by an approved journal by December 31, 2018, to be " +"eligible for a prize. Please use this this helpful workflow to " +"preregister, even if you are not seeking a prize.

                                                " +msgstr "" + +#: website/templates/prereg_landing_page.mako:59 +#, python-format +msgid "" +"

                                                Improve your research with preregistration. The process of creating a" +" preregistration is beneficial to both the " +"scientific field and to you, the scientist. By writing out detailed data " +"collection methods, analysis plans, and rules for excluding or missing " +"data, you can make important decisions that affect your workflow earlier," +" without the biases that occur once the data are in front of you.

                                                " +msgstr "" + +#: website/templates/prereg_landing_page.mako:64 +#: website/templates/prereg_landing_page.mako:110 +msgid "Start a new preregistration" +msgstr "" + +#: website/templates/prereg_landing_page.mako:76 +#: website/templates/prereg_landing_page.mako:121 +msgid "Continue working on an existing draft preregistration" +msgstr "" + +#: website/templates/prereg_landing_page.mako:84 +#: website/templates/prereg_landing_page.mako:126 +msgid "Preregister a project you already have on the GakuNin RDM" +msgstr "" + +#: website/templates/profile.mako:23 +#, python-format +msgid "" +"This account has been merged with %(profileAbsoluteUrl)s" +msgstr "" + +#: website/templates/profile.mako:43 +msgid "Edit your profile" +msgstr "" + +#: website/templates/profile.mako:57 +msgid "Member Since" +msgstr "" + +#: website/templates/profile.mako:63 +msgid "Public Profile" +msgstr "" + +#: website/templates/profile.mako:69 +msgid "No" +msgstr "" + +#: website/templates/profile.mako:69 +msgid "activity point" +msgid_plural "activity points" +msgstr[0] "" +msgstr[1] "" + +#: website/templates/profile.mako:70 +msgid "project" +msgstr "" + +#: website/templates/profile.mako:70 +msgid " " +msgid_plural "s" +msgstr[0] "" +msgstr[1] "" + +#: website/templates/profile.mako:73 +msgid "Usage of storage" +msgstr "" + +#: website/templates/profile.mako:82 website/templates/profile/settings.mako:39 +msgid "Employment" +msgstr "" + +#: website/templates/profile.mako:83 website/templates/profile/settings.mako:40 +msgid "Education" +msgstr "" + +#: website/templates/profile.mako:84 website/templates/profile/settings.mako:41 +msgid "Social" +msgstr "" + +#: website/templates/profile.mako:115 +msgid "Public projects" +msgstr "" + +#: website/templates/profile.mako:135 +msgid "Public components" +msgstr "" + +#: website/templates/profile.mako:152 +msgid "Quick files" +msgstr "" + +#: website/templates/request_access.mako:2 +msgid "Request Access" +msgstr "" + +#: website/templates/request_access.mako:11 +msgid "You Need Permission" +msgstr "" + +#: website/templates/request_access.mako:13 +msgid "Ask for access, or switch to an account with permission." +msgstr "" + +#: website/templates/request_access.mako:14 +msgid "" +"Your request for access has been sent. You will receive an email if and " +"when your request is approved." +msgstr "" + +#: website/templates/request_access.mako:23 +msgid "Switch account" +msgstr "" + +#: website/templates/search.mako:36 website/templates/search_grdm.mako:37 +msgid "Improve your search" +msgstr "" + +#: website/templates/search.mako:69 website/templates/search_grdm.mako:70 +msgid "Filter by license" +msgstr "" + +#: website/templates/search.mako:93 website/templates/search_grdm.mako:95 +msgid "No results found." +msgstr "" + +#: website/templates/search.mako:96 website/templates/search_grdm.mako:98 +msgid "Type your search terms in the box above." +msgstr "" + +#: website/templates/search.mako:104 website/templates/search_nav_grdm.mako:4 +msgid "Previous Page" +msgstr "" + +#: website/templates/search.mako:110 website/templates/search_nav_grdm.mako:61 +msgid "Next Page" +msgstr "" + +#: website/templates/search.mako:123 website/templates/search.mako:341 +#: website/templates/search.mako:344 website/templates/search_grdm.mako:552 +#: website/templates/search_grdm.mako:555 +msgid "Withdrawn " +msgstr "" + +#: website/templates/search.mako:123 +msgid "Registration " +msgstr "" + +#: website/templates/search.mako:123 +msgid "File" +msgstr "" + +#: website/templates/search.mako:126 +msgid "(Preprint File)" +msgstr "" + +#: website/templates/search.mako:130 +#, python-format +msgid "From: " +msgstr "" + +#: website/templates/search.mako:131 +#, python-format +msgid "" +"From: / " +msgstr "" + +#: website/templates/search.mako:240 website/templates/search_grdm.mako:367 +msgid " Contributors" +msgstr "" + +#: website/templates/search.mako:262 website/templates/search_grdm.mako:389 +#: website/templates/search_grdm.mako:461 +msgid "Affiliated institutions" +msgstr "" + +#: website/templates/search.mako:276 website/templates/search.mako:368 +#: website/templates/search_grdm.mako:403 +#: website/templates/search_grdm.mako:579 +msgid "

                                                Jump to:" +msgstr "" + +#: website/templates/search.mako:280 website/templates/search.mako:372 +#: website/templates/search_grdm.mako:407 +#: website/templates/search_grdm.mako:583 +msgid "Files" +msgstr "" + +#: website/templates/search.mako:291 website/templates/search_grdm.mako:502 +msgid "(Preprint)" +msgstr "" + +#: website/templates/search.mako:292 website/templates/search.mako:348 +#: website/templates/search_grdm.mako:440 +#: website/templates/search_grdm.mako:503 +#: website/templates/search_grdm.mako:559 +msgid "Description" +msgstr "" + +#: website/templates/project/contributors.mako:2 +#: website/templates/project/contributors.mako:8 +#: website/templates/project/contributors.mako:54 +#: website/templates/project/project.mako:163 +#: website/templates/project/project_header.mako:72 +#: website/templates/search.mako:295 website/templates/search.mako:352 +#: website/templates/search_grdm.mako:446 +#: website/templates/search_grdm.mako:506 +#: website/templates/search_grdm.mako:563 +msgid "Contributors" +msgstr "" + +#: website/templates/search.mako:314 website/templates/search_grdm.mako:525 +msgid "Managers" +msgstr "" + +#: website/templates/search.mako:327 website/templates/search_grdm.mako:538 +msgid "Members" +msgstr "" + +#: website/templates/search.mako:341 website/templates/search.mako:344 +#: website/templates/search_grdm.mako:552 +#: website/templates/search_grdm.mako:555 +msgid "Registration" +msgstr "" + +#: website/templates/project/project.mako:587 +#: website/templates/project/view_file.mako:76 +#: website/templates/search.mako:377 website/templates/search_grdm.mako:475 +#: website/templates/search_grdm.mako:588 +msgid "Tags" +msgstr "" + +#: website/templates/search_bar.mako:7 website/templates/search_bar.mako:8 +#: website/templates/search_bar_grdm.mako:7 +#: website/templates/search_bar_grdm.mako:8 +msgid "GakuNin RDM Search" +msgstr "" + +#: website/templates/search_bar_grdm.mako:20 +msgid "sort by" +msgstr "" + +#: website/templates/search_bar_grdm.mako:22 +msgid "per page" +msgstr "" + +#: website/templates/search_bar_help_modal.mako:6 +msgid "Search help" +msgstr "" + +#: website/templates/search_bar_help_modal.mako:9 +msgid "Queries" +msgstr "" + +#: website/templates/search_bar_help_modal.mako:10 +#, python-format +msgid "" +"

                                                Search uses the Lucene search " +"syntax.This gives you many options, but can be very simple as well. " +"Examples of valid searches include:

                                                " +msgstr "" + +#: website/templates/project/project_header.mako:16 +#: website/templates/search_grdm.mako:143 +#: website/templates/search_grdm.mako:317 +msgid "Project" +msgstr "" + +#: website/templates/search_grdm.mako:150 +msgid "Folder" +msgstr "" + +#: website/templates/search_grdm.mako:160 +#: website/templates/search_grdm.mako:339 +#: website/templates/search_grdm.mako:492 +msgid "Comment" +msgstr "" + +#: website/templates/search_grdm.mako:196 +msgid "Employment@search" +msgstr "" + +#: website/templates/search_grdm.mako:206 +msgid "Education@search" +msgstr "" + +#: website/templates/search_grdm.mako:327 +msgid "Body of Wiki" +msgstr "" + +#: website/templates/search_grdm.mako:602 +msgid "Modified by" +msgstr "" + +#: website/templates/search_grdm.mako:605 +msgid "Created by" +msgstr "" + +#: website/templates/search_nav_grdm.mako:65 +msgid "Page" +msgstr "" + +#: website/templates/include/comment_pane_template.mako:3 +#: website/templates/project/project_header.mako:86 +msgid "Comments" +msgstr "" + +#: website/templates/include/comment_pane_template.mako:18 +#: website/templates/project/files.mako:2 +#: website/templates/project/files.mako:5 +#: website/templates/project/project.mako:441 +#: website/templates/project/project_header.mako:40 +msgid "Files" +msgstr "" + +#: website/templates/include/comment_pane_template.mako:18 +#: website/templates/include/comment_pane_template.mako:19 +#: website/templates/include/comment_pane_template.mako:20 +msgid "Discussion" +msgstr "" + +#: website/templates/include/comment_pane_template.mako:26 +#: website/templates/include/comment_template.mako:165 +msgid "Add a comment" +msgstr "" + +#: website/templates/include/comment_template.mako:13 +msgid "Comment confirmed as spam." +msgstr "" + +#: website/templates/include/comment_template.mako:23 +msgid "Comment deleted." +msgstr "" + +#: website/templates/include/comment_template.mako:30 +msgid "Restore" +msgstr "" + +#: website/templates/include/comment_template.mako:37 +msgid "Comment reported." +msgstr "" + +#: website/templates/include/comment_template.mako:44 +msgid "Not abuse" +msgstr "" + +#: website/templates/include/comment_template.mako:86 +msgid "Edit comment" +msgstr "" + +#: website/templates/include/comment_template.mako:138 +msgid "Describe abuse" +msgstr "" + +#: website/templates/include/comment_template.mako:142 +msgid "Report" +msgstr "" + +#: website/templates/include/comment_template.mako:186 +msgid "More replies" +msgstr "" + +#: website/templates/include/profile/jobs.mako:19 +#: website/templates/include/profile/schools.mako:19 +msgid "Position" +msgstr "" + +#: website/templates/include/profile/jobs.mako:26 +#: website/templates/include/profile/schools.mako:26 +#: website/templates/project/contributors.mako:332 +#: website/templates/project/contributors.mako:387 +#: website/templates/project/modal_remove_contributor.mako:96 +#: website/templates/project/modal_remove_contributor.mako:105 +#: website/templates/project/modal_remove_contributor.mako:114 +#: website/templates/project/project.mako:569 +#: website/templates/project/settings.mako:498 +#: website/templates/project/settings.mako:501 +msgid "Remove" +msgstr "" + +#: website/templates/include/profile/jobs.mako:31 +#: website/templates/include/profile/schools.mako:31 +msgid "Read IdP Profile" +msgstr "" + +#: website/templates/include/profile/jobs.mako:35 +msgid "Institution / Employer" +msgstr "" + +#: website/templates/include/profile/jobs.mako:37 +#: website/templates/include/profile/schools.mako:37 +#: website/templates/profile/oauth_app_detail.mako:55 +#: website/templates/profile/oauth_app_detail.mako:61 +#: website/templates/profile/oauth_app_detail.mako:73 +#: website/templates/profile/personal_tokens_detail.mako:26 +msgid "Required" +msgstr "" + +#: website/templates/include/profile/jobs.mako:44 +msgid "Department / Institute" +msgstr "" + +#: website/templates/include/profile/jobs.mako:49 +msgid "Job title" +msgstr "" + +#: website/templates/include/profile/jobs.mako:54 +#: website/templates/include/profile/schools.mako:54 +#: website/templates/project/project.mako:610 +msgid "Start date" +msgstr "" + +#: website/templates/include/profile/jobs.mako:58 +#: website/templates/include/profile/jobs.mako:73 +#: website/templates/include/profile/schools.mako:58 +#: website/templates/include/profile/schools.mako:73 +msgid "-- Month --" +msgstr "" + +#: website/templates/include/profile/jobs.mako:63 +#: website/templates/include/profile/jobs.mako:78 +#: website/templates/include/profile/schools.mako:63 +#: website/templates/include/profile/schools.mako:78 +msgid "Year" +msgstr "" + +#: website/templates/include/profile/jobs.mako:69 +#: website/templates/include/profile/schools.mako:69 +#: website/templates/project/project.mako:613 +msgid "End date" +msgstr "" + +#: website/templates/include/profile/jobs.mako:85 +#: website/templates/include/profile/schools.mako:85 +msgid "Ongoing" +msgstr "" + +#: website/templates/include/profile/jobs.mako:104 +msgid "Add another Employment" +msgstr "" + +#: website/templates/include/profile/jobs.mako:114 +#: website/templates/include/profile/names.mako:73 +#: website/templates/include/profile/schools.mako:114 +#: website/templates/include/profile/social.mako:140 +msgid "Discard changes" +msgstr "" + +#: website/templates/include/profile/jobs.mako:117 +#: website/templates/include/profile/names.mako:76 +#: website/templates/include/profile/schools.mako:117 +#: website/templates/include/profile/social.mako:143 +msgid "Saving" +msgstr "" + +#: website/templates/include/profile/jobs.mako:136 +#: website/templates/include/profile/schools.mako:136 +#: website/templates/include/profile/social.mako:180 +msgid "Not provided" +msgstr "" + +#: website/templates/include/profile/jobs.mako:149 +#: website/templates/include/profile/jobs.mako:159 +#: website/templates/include/profile/schools.mako:148 +#: website/templates/include/profile/schools.mako:158 +msgid "" +" " +msgstr "" + +#: website/templates/include/profile/jobs.mako:156 +msgid "Department / Institute:" +msgstr "" + +#: website/templates/include/profile/jobs.mako:157 +#: website/templates/project/settings.mako:101 +msgid "Title:" +msgstr "" + +#: website/templates/include/profile/jobs.mako:158 +#: website/templates/include/profile/schools.mako:157 +msgid "Dates:" +msgstr "" + +#: website/templates/include/profile/names.mako:6 +msgid "Full name (e.g. Rosalind Elsie Franklin)" +msgstr "" + +#: website/templates/include/profile/names.mako:15 +msgid "" +"Your full name, above, is the name that will be displayed in your " +"profile. To control the way your name will appear in " +"citations, you can use the \"Auto-fill\" button to " +"automatically infer your first name, last name, etc., or edit " +"the fields directly below." +msgstr "" + +#: website/templates/include/profile/names.mako:22 +msgid "Auto-fill" +msgstr "" + +#: website/templates/include/profile/names.mako:26 +msgid "Given name (e.g. Rosalind)" +msgstr "" + +#: website/templates/include/profile/names.mako:31 +msgid "Middle name(s) (e.g. Elsie)" +msgstr "" + +#: website/templates/include/profile/names.mako:36 +msgid "Family name (e.g. Franklin)" +msgstr "" + +#: website/templates/include/profile/names.mako:41 +msgid "Suffix" +msgstr "" + +#: website/templates/include/profile/names.mako:47 +msgid "Citation preview" +msgstr "" + +#: website/templates/include/profile/names.mako:51 +msgid "Style" +msgstr "" + +#: website/templates/include/profile/names.mako:52 +msgid "Citation format" +msgstr "" + +#: website/templates/include/profile/schools.mako:35 +msgid "Institution" +msgstr "" + +#: website/templates/include/profile/schools.mako:44 +msgid "Department" +msgstr "" + +#: website/templates/include/profile/schools.mako:49 +msgid "Degree" +msgstr "" + +#: website/templates/include/profile/schools.mako:104 +msgid "Add another Education" +msgstr "" + +#: website/templates/include/profile/schools.mako:155 +msgid "Department:" +msgstr "" + +#: website/templates/include/profile/schools.mako:156 +msgid "Degree:" +msgstr "" + +#: website/templates/include/profile/settings_navpanel.mako:6 +msgid "Profile information" +msgstr "" + +#: website/templates/include/profile/settings_navpanel.mako:9 +msgid "Account settings" +msgstr "" + +#: website/templates/include/profile/settings_navpanel.mako:12 +msgid "Configure add-on accounts" +msgstr "" + +#: website/templates/include/profile/settings_navpanel.mako:15 +#: website/templates/profile/notifications.mako:2 +msgid "Notifications" +msgstr "" + +#: website/templates/include/profile/settings_navpanel.mako:18 +msgid "Developer apps" +msgstr "" + +#: website/templates/include/profile/settings_navpanel.mako:21 +msgid "Personal access tokens" +msgstr "" + +#: website/templates/include/profile/social.mako:10 +msgid "Your websites" +msgstr "" + +#: website/templates/include/profile/social.mako:31 +msgid "Please enter a valid website" +msgstr "" + +#: website/templates/include/profile/social.mako:34 +msgid "Add website" +msgstr "" + +#: website/templates/include/profile/social.mako:88 +#: website/templates/include/profile/social.mako:96 +#: website/templates/include/profile/social.mako:104 +#: website/templates/include/profile/social.mako:114 +#: website/templates/include/profile/social.mako:122 +#: website/templates/include/profile/social.mako:130 +msgid "profileID" +msgstr "" + +#: website/templates/include/profile/social.mako:112 +msgid "institution" +msgstr "" + +#: website/templates/profile/account.mako:4 +#: website/templates/profile/add_email.mako:4 +msgid "Account Settings" +msgstr "" + +#: website/templates/profile/account.mako:15 +#: website/templates/profile/add_email.mako:21 +msgid "Connected Emails" +msgstr "" + +#: website/templates/profile/account.mako:20 +#: website/templates/profile/add_email.mako:27 +msgid "Primary Email" +msgstr "" + +#: website/templates/profile/account.mako:34 +#: website/templates/profile/add_email.mako:57 +msgid "Alternate Emails" +msgstr "" + +#: website/templates/profile/account.mako:40 +#: website/templates/profile/add_email.mako:63 +msgid "make primary" +msgstr "" + +#: website/templates/profile/account.mako:48 +#: website/templates/profile/add_email.mako:72 +msgid "Unconfirmed Emails" +msgstr "" + +#: website/templates/profile/account.mako:55 +#: website/templates/profile/add_email.mako:79 +msgid "resend confirmation" +msgstr "" + +#: website/templates/profile/account.mako:64 +#: website/templates/profile/add_email.mako:88 +msgid "" +"To merge an existing account with this one or to log in with multiple " +"email addresses, add an alternate email address below." +msgstr "" + +#: website/templates/profile/account.mako:65 +#: website/templates/profile/add_email.mako:89 +msgid "" +"Merging accounts will move all projects and components associated with " +"two emails into one account. All projects and components will be " +"displayed under the email address listed as primary." +msgstr "" + +#: website/templates/profile/account.mako:68 +msgid "" +"To log in with multiple email addresses, add an alternate email address " +"below." +msgstr "" + +#: website/templates/profile/account.mako:73 +#: website/templates/profile/add_email.mako:98 +msgid "Email address" +msgstr "" + +#: website/templates/profile/account.mako:75 +#: website/templates/profile/add_email.mako:100 +msgid "Add email" +msgstr "" + +#: website/templates/profile/account.mako:90 +msgid "Default Storage Location" +msgstr "" + +#: website/templates/profile/account.mako:98 +msgid "" +"This location will be applied to new projects and components. It will not" +" affect existing projects and components." +msgstr "" + +#: website/templates/profile/account.mako:103 +msgid "Update location" +msgstr "" + +#: website/templates/profile/account.mako:109 +#: website/templates/profile/add_email.mako:117 +msgid "Connected Identities" +msgstr "" + +#: website/templates/profile/account.mako:111 +#: website/templates/profile/add_email.mako:119 +msgid "" +"Connected identities allow you to log in to the GakuNin RDM via a third-" +"party service." +msgstr "" + +#: website/templates/profile/account.mako:112 +#: website/templates/profile/add_email.mako:120 +msgid "You can revoke these authorizations here." +msgstr "" + +#: website/templates/profile/account.mako:115 +#: website/templates/profile/add_email.mako:123 +msgid "" +"You have not authorized any external services to log in to the GakuNin " +"RDM." +msgstr "" + +#: website/templates/profile/account.mako:125 +#: website/templates/profile/add_email.mako:133 +msgid "Verified" +msgstr "" + +#: website/templates/profile/account.mako:127 +#: website/templates/profile/add_email.mako:135 +msgid "Pending" +msgstr "" + +#: website/templates/profile/account.mako:145 +#: website/templates/profile/add_email.mako:155 +msgid "Change Password" +msgstr "" + +#: website/templates/profile/account.mako:149 +#: website/templates/profile/add_email.mako:159 +msgid "Old password" +msgstr "" + +#: website/templates/profile/account.mako:154 +#: website/templates/profile/add_email.mako:164 +msgid "Old Password" +msgstr "" + +#: website/templates/profile/account.mako:166 +#: website/templates/profile/add_email.mako:176 +msgid "New password" +msgstr "" + +#: website/templates/profile/account.mako:171 +#: website/templates/profile/add_email.mako:181 +msgid "New Password" +msgstr "" + +#: website/templates/profile/account.mako:201 +#: website/templates/profile/add_email.mako:211 +msgid "Confirm new password" +msgstr "" + +#: website/templates/profile/account.mako:206 +#: website/templates/profile/add_email.mako:216 +msgid "Verify Password" +msgstr "" + +#: website/templates/profile/account.mako:217 +#: website/templates/profile/add_email.mako:227 +msgid "Update password" +msgstr "" + +#: website/templates/profile/account.mako:223 +#: website/templates/profile/add_email.mako:232 +msgid "Security Settings" +msgstr "" + +#: website/templates/profile/account.mako:235 +#: website/templates/profile/add_email.mako:245 +msgid "Export Account Data" +msgstr "" + +#: website/templates/profile/account.mako:237 +#: website/templates/profile/add_email.mako:247 +msgid "" +"Exporting your account data allows you to keep a permanent copy of the " +"current state of your account. Keeping a copy of your account data can " +"provide peace of mind or assist in transferring your information to " +"another provider." +msgstr "" + +#: website/templates/profile/account.mako:238 +#: website/templates/profile/add_email.mako:248 +msgid "Request export" +msgstr "" + +#: website/templates/profile/account.mako:242 +#: website/templates/profile/add_email.mako:254 +msgid "Deactivate Account" +msgstr "" + +#: website/templates/profile/account.mako:244 +msgid "" +"Warning: Once your deactivation has been approved the " +"effects are irreversible." +msgstr "" + +#: website/templates/profile/account.mako:245 +#: website/templates/profile/add_email.mako:259 +msgid "" +"Deactivating your account will remove you from all public projects to " +"which you are a contributor. Your account will no longer be associated " +"with GakuNin RDM projects, and your work on the GakuNin RDM will be " +"inaccessible." +msgstr "" + +#: website/templates/profile/account.mako:246 +#: website/templates/profile/add_email.mako:263 +msgid "Your account is currently pending deactivation." +msgstr "" + +#: website/templates/profile/account.mako:247 +#: website/templates/profile/add_email.mako:261 +msgid "Request deactivation" +msgstr "" + +#: website/templates/profile/account.mako:248 +msgid "Cancel deactivation request" +msgstr "" + +#: website/templates/profile/add_email.mako:42 +msgid "eduPersonPrincipalName (ePPN)" +msgstr "" + +#: website/templates/profile/add_email.mako:92 +msgid "Add an email address below." +msgstr "" + +#: website/templates/profile/add_email.mako:257 +msgid "Warning: This action is irreversible." +msgstr "" + +#: website/templates/profile/addon_permissions.mako:4 +#, python-format +msgid "Authorized by %(name)s" +msgstr "" + +#: website/templates/profile/addons.mako:2 +#: website/templates/profile/addons.mako:29 +msgid "Configure Add-on Accounts" +msgstr "" + +#: website/templates/profile/modal_change_avatar.mako:6 +msgid "Change Avatar" +msgstr "" + +#: website/templates/profile/modal_change_avatar.mako:9 +msgid "" +"Avatars on the GakuNin RDM use gravatar.org, a free" +" service that allows users to easily control their " +"identity and profile on multiple service across the " +"Internet." +msgstr "" + +#: website/templates/profile/modal_change_avatar.mako:14 +msgid "" +"To change your avatar image, please login or register at" +" gravatar.org, and" +" add the email address you use on the GakuNin RDM to " +"your Gravatar account." +msgstr "" + +#: website/templates/profile/notifications.mako:16 +msgid "Configure Email Preferences" +msgstr "" + +#: website/templates/profile/notifications.mako:26 +msgid "Receive general notifications about the GakuNin RDM every 2-3 weeks." +msgstr "" + +#: website/templates/profile/notifications.mako:35 +msgid "" +"Receive helpful tips on how to make the most of the GakuNin RDM, up to " +"once per week." +msgstr "" + +#: website/templates/profile/notifications.mako:53 +msgid "Configure Notification Preferences" +msgstr "" + +#: website/templates/profile/notifications.mako:56 +msgid "" +"NOTE: Regardless of your selected preferences, GakuNin RDM will continue " +"to provide transactional and administrative service emails." +msgstr "" + +#: website/templates/profile/notifications.mako:64 +#: website/templates/project/settings.mako:371 +msgid "Loading notification settings..." +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:2 +#: website/templates/profile/oauth_app_detail.mako:5 +msgid "Application Detail" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:16 +msgid "Return to list of registered applications" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:25 +msgid "The unique identifier for the application. May be seen publicly by others." +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:32 +msgid "" +"The client secret is known only to you and the GakuNin RDM. Do not " +"display or expose this information." +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:39 +msgid "Hide" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:40 +msgid "Show" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:42 +msgid "Reset Secret" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:44 +msgid "" +"Resetting the client secret will render your application unusable until " +"it is updated with the new client secret, and all users must reauthorize " +"access. Previously issued access tokens will no longer work." +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:48 +msgid "Deactivate application" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:54 +msgid "Application name" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:60 +msgid "Project homepage URL" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:66 +msgid "Application description" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:72 +msgid "Authorization callback URL" +msgstr "" + +#: website/templates/profile/oauth_app_detail.mako:86 +msgid "Register" +msgstr "" + +#: website/templates/profile/oauth_app_list.mako:2 +#: website/templates/profile/oauth_app_list.mako:15 +msgid "Developer Applications" +msgstr "" + +#: website/templates/profile/oauth_app_list.mako:17 +msgid "New application" +msgstr "" + +#: website/templates/profile/oauth_app_list.mako:22 +msgid "" +"The GakuNin RDM allows third-party web applications to connect to the " +"GakuNin RDM on behalf of other users via the OAuth 2.0 web application " +"flow." +msgstr "" + +#: website/templates/profile/oauth_app_list.mako:24 +msgid "" +"You have not registered any applications that can connect to the GakuNin " +"RDM on behalf of other users." +msgstr "" + +#: website/templates/profile/oauth_app_list.mako:26 +msgid "" +"You have registered the following applications that can connect to the " +"GakuNin RDM on behalf of other users:" +msgstr "" + +#: website/templates/profile/oauth_app_list.mako:31 +msgid "Application" +msgstr "" + +#: website/templates/profile/oauth_app_list.mako:34 +#: website/templates/profile/personal_tokens_list.mako:34 +msgid "Deactivate" +msgstr "" + +#: website/templates/profile/oauth_app_list.mako:43 +msgid "Client ID:" +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:2 +msgid "Personal Token Detail" +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:16 +msgid "Return to list of registered tokens" +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:25 +msgid "Token name:" +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:25 +msgid "What this token is for." +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:31 +msgid "Scopes:" +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:32 +msgid "Scopes limit access for personal access tokens." +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:51 +msgid "Create" +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:65 +msgid "This is the only time your token will be displayed." +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:66 +msgid "Token ID" +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:67 +msgid "ID used to authenticate with this token. This will be shown only once." +msgstr "" + +#: website/templates/profile/personal_tokens_detail.mako:70 +msgid "Copy to clipboard" +msgstr "" + +#: website/templates/profile/personal_tokens_list.mako:2 +#: website/templates/profile/personal_tokens_list.mako:15 +#: website/templates/profile/personal_tokens_list.mako:31 +msgid "Personal Access Tokens" +msgstr "" + +#: website/templates/profile/personal_tokens_list.mako:17 +msgid "New token" +msgstr "" + +#: website/templates/profile/personal_tokens_list.mako:22 +msgid "" +"Personal access tokens function like ordinary OAuth access tokens. They " +"can be used to authenticate to the API." +msgstr "" + +#: website/templates/profile/personal_tokens_list.mako:24 +msgid "" +"You have not created any access tokens that can connect to the GakuNin " +"RDM." +msgstr "" + +#: website/templates/profile/personal_tokens_list.mako:26 +msgid "You have generated the following personal access tokens:" +msgstr "" + +#: website/templates/profile/settings.mako:11 +msgid "View your profile" +msgstr "" + +#: website/templates/profile/settings.mako:38 +#: website/templates/project/contributors.mako:182 +#: website/templates/project/contributors.mako:229 +#: website/templates/project/modal_add_contributor.mako:216 +msgid "Name" +msgstr "" + +#: website/templates/project/addons.mako:14 +#: website/templates/project/addons.mako:33 +msgid "Select Add-ons" +msgstr "" + +#: website/templates/project/addons.mako:15 +#: website/templates/project/addons.mako:111 +msgid "Configure Add-ons" +msgstr "" + +#: website/templates/project/addons.mako:38 +msgid "" +"Sync your projects with external services to help stay connected and " +"organized. Select a category and browse the options." +msgstr "" + +#: website/templates/project/addons.mako:44 +msgid "Categories" +msgstr "" + +#: website/templates/project/addons.mako:47 +msgid "Search..." +msgstr "" + +#: website/templates/project/addons.mako:56 +msgid "All" +msgstr "" + +#: website/templates/project/addons.mako:82 +msgid "(This is a default addon)" +msgstr "" + +#: website/templates/project/addons.mako:84 +msgid "Disable" +msgstr "" + +#: website/templates/project/addons.mako:86 +msgid "Enable" +msgstr "" + +#: website/templates/project/addons.mako:128 +msgid "Don't see your GitHub organization repositories?" +msgstr "" + +#: website/templates/project/addons.mako:130 +msgid "You may need to reauthorize your GitHub access token." +msgstr "" + +#: website/templates/project/addons.mako:131 +#, python-format +msgid "" +"Follow the steps in the help guide to resolve the " +"issue." +msgstr "" + +#: website/templates/project/addons.mako:135 +#, python-format +msgid "" +"Please contact rdm_support@nii.ac.jp if you " +"have questions." +msgstr "" + +#: website/templates/project/contributors.mako:13 +msgid "Filter by name" +msgstr "" + +#: website/templates/project/contributors.mako:14 +#: website/templates/project/contributors.mako:186 +#: website/templates/project/contributors.mako:232 +#: website/templates/project/modal_add_contributor.mako:227 +msgid "Permissions" +msgstr "" + +#: website/templates/project/contributors.mako:17 +#: website/templates/project/contributors.mako:189 +#: website/templates/project/contributors.mako:235 +#: website/templates/project/modal_add_contributor.mako:230 +msgid "Permission Information" +msgstr "" + +#: website/templates/project/contributors.mako:24 +#: website/templates/project/contributors.mako:75 +msgid "Administrator" +msgstr "" + +#: website/templates/project/contributors.mako:27 +#: website/templates/project/contributors.mako:76 +msgid "Read + Write" +msgstr "" + +#: website/templates/project/contributors.mako:30 +#: website/templates/project/contributors.mako:77 +msgid "Read" +msgstr "" + +#: website/templates/project/contributors.mako:33 +#: website/templates/project/contributors.mako:196 +#: website/templates/project/contributors.mako:242 +#: website/templates/project/modal_add_contributor.mako:218 +msgid "Bibliographic Contributor" +msgstr "" + +#: website/templates/project/contributors.mako:36 +#: website/templates/project/contributors.mako:199 +#: website/templates/project/contributors.mako:245 +#: website/templates/project/modal_add_contributor.mako:221 +msgid "Bibliographic Contributor Information" +msgstr "" + +#: website/templates/project/contributors.mako:43 +msgid "Bibliographic" +msgstr "" + +#: website/templates/project/contributors.mako:46 +msgid "Non-Bibliographic" +msgstr "" + +#: website/templates/project/contributors.mako:63 +msgid "Drag and drop contributors to change listing order." +msgstr "" + +#: website/templates/project/contributors.mako:106 +msgid "No contributors found" +msgstr "" + +#: website/templates/project/contributors.mako:111 +msgid "Admins on Parent Projects" +msgstr "" + +#: website/templates/project/contributors.mako:135 +msgid "No administrators from parent project found." +msgstr "" + +#: website/templates/project/contributors.mako:143 +msgid "Requests for Access" +msgstr "" + +#: website/templates/project/contributors.mako:144 +msgid "The following users have requested access to this project." +msgstr "" + +#: website/templates/project/contributors.mako:162 +#: website/templates/project/settings.mako:29 +#: website/templates/project/settings.mako:202 +msgid "View-only Links" +msgstr "" + +#: website/templates/project/contributors.mako:167 +#: website/templates/project/settings.mako:206 +msgid "" +"Create a link to share this project so those who have the link can " +"view—but not edit—the project." +msgstr "" + +#: website/templates/project/contributors.mako:396 +msgid "Discard Changes" +msgstr "" + +#: website/templates/project/contributors.mako:397 +msgid "Save Changes" +msgstr "" + +#: website/templates/project/files.mako:8 +#: website/templates/project/project.mako:449 +msgid "Click on a storage provider or drag and drop to upload" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:20 +msgid "Search by name or user profile information" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:25 +msgid "Invite new contributor by e-mail" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:46 +msgid "Results" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:47 +msgid "Add all" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:63 +msgid "Add contributor" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:66 +msgid "Already added" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:164 +#: website/templates/project/modal_add_contributor.mako:254 +msgid "(unregistered)" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:181 +#, python-format +msgid "" +"Add as an " +"unregistered contributor." +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:186 +msgid "Searching contributors..." +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:190 +msgid "No results found. Try a more specific search." +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:193 +msgid "No results found. Try a more specific search" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:195 +msgid "or" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:196 +#, python-format +msgid "" +"add as an " +"unregistered contributor." +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:200 +msgid "" +"It looks like you are trying to search by email address. Please try your " +"search again using your collaborator's name. You will be able to add " +"users without GakuNin RDM accounts as unregistered contributors." +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:207 +msgid "Adding" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:208 +msgid "Remove all" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:241 +msgid "Remove contributor" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:281 +msgid "Adding contributor(s)" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:289 +msgid "" +"You can also add the contributor(s) to any components on which you are an" +" admin." +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:294 +#: website/templates/project/modal_generate_private_link.mako:71 +msgid "Select all" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:296 +msgid "Select none" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:309 +msgid "Loading projects and components..." +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:320 +msgid "Full Name" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:322 +msgid "Full name" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:325 +#: website/templates/project/modal_add_contributor.mako:327 +msgid "Email" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:330 +msgid "We will notify the user that they have been added to your project." +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:343 +#: website/templates/project/modal_add_contributor.mako:355 +#: website/templates/project/modal_remove_contributor.mako:112 +#: website/templates/project/nodes_delete.mako:87 +msgid "Back" +msgstr "" + +#: website/templates/project/modal_add_contributor.mako:351 +msgid "Next" +msgstr "" + +#: website/templates/project/modal_add_pointer.mako:8 +msgid "Link other GakuNin RDM projects" +msgstr "" + +#: website/templates/project/modal_add_pointer.mako:15 +msgid "Search projects" +msgstr "" + +#: website/templates/project/modal_add_pointer.mako:43 +msgid "Projects" +msgstr "" + +#: website/templates/project/modal_add_pointer.mako:55 +msgid "Results: All Projects" +msgstr "" + +#: website/templates/project/modal_add_pointer.mako:56 +msgid "Results: My Projects" +msgstr "" + +#: website/templates/project/modal_add_pointer.mako:96 +msgid "Done" +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:5 +msgid "Create a new link to share your project" +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:13 +msgid "Link name" +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:18 +msgid "Optional link name (e.g., For peer review, Sharing data, Share project)" +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:30 +msgid "" +"Anonymize contributor list for this link (e.g., for " +"blind peer review)." +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:32 +msgid "" +"Ensure the wiki pages, files, registration forms and add-ons do not " +"contain identifying information." +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:39 +msgid "" +"Which components would you like to associate with this " +"link?" +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:40 +msgid "" +"Anyone with the private link can view—but not edit—the" +" components associated with the link." +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:51 +#, python-format +msgid "(current component, public)" +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:59 +msgid "Parent needs to be checked" +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:62 +msgid "(public)" +msgstr "" + +#: website/templates/project/modal_generate_private_link.mako:74 +msgid "De-select all" +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:15 +#, python-format +msgid "" +"Do you want to remove from" +" , or from and every component in it?" +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:21 +#, python-format +msgid "" +"Remove from" +" ." +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:28 +#, python-format +msgid "" +"Remove from" +" and every" +" component in it." +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:37 +#, python-format +msgid "Remove from ?" +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:48 +#, python-format +msgid "" +" " +"will be removed from the following projects and/or components." +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:65 +#, python-format +msgid "" +" " +"cannot be removed from the following projects and/or components." +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:81 +#, python-format +msgid "" +" cannot be removed " +"as a contributor. You need at least one administrator, bibliographic " +"contributor, and registered user." +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:82 +msgid "" +"data-bind=\"text:removeSelf() ? 'You' : " +"contributorToRemove()['fullname']\"" +msgstr "" + +#: website/templates/project/modal_remove_contributor.mako:85 +msgid "" +"Please save or discard your existing changes before removing a " +"contributor." +msgstr "" + +#: website/templates/project/nodes_delete.mako:66 +#: website/templates/project/nodes_delete.mako:77 +msgid "Type the following to continue:" +msgstr "" + +#: website/templates/project/project.mako:22 +msgid "Private Project" +msgstr "" + +#: website/templates/project/project.mako:45 +msgid "Private" +msgstr "" + +#: website/templates/project/project.mako:49 +msgid "Make Public" +msgstr "" + +#: website/templates/project/project.mako:58 +msgid "Make Private" +msgstr "" + +#: website/templates/project/project.mako:60 +msgid "Public" +msgstr "" + +#: website/templates/project/project.mako:65 +msgid "Log in or create an account to duplicate this project" +msgstr "" + +#: website/templates/project/project.mako:100 +#, python-format +msgid "View Forks (%(forkCount)s)" +msgstr "" + +#: website/templates/project/project.mako:115 +msgid "Bookmark" +msgstr "" + +#: website/templates/project/project.mako:118 +msgid "Remove from bookmarks" +msgstr "" + +#: website/templates/project/project.mako:127 +msgid "Create view-only link" +msgstr "" + +#: website/templates/project/project.mako:137 +msgid "Share" +msgstr "" + +#: website/templates/project/project.mako:150 +msgid "Log in to request access" +msgstr "" + +#: website/templates/project/project.mako:165 +msgid "Contributors:" +msgstr "" + +#: website/templates/project/project.mako:169 +msgid "Anonymous Contributors" +msgstr "" + +#: website/templates/project/project.mako:192 +#: website/templates/project/settings.mako:488 +msgid "Affiliated Institutions:" +msgstr "" + +#: website/templates/project/project.mako:218 +#, python-format +msgid "" +"Forked from %(forkedFromDisplayAbsoluteUrl)s on" +" " +msgstr "" + +#: website/templates/project/project.mako:225 +msgid "Date registered:" +msgstr "" + +#: website/templates/project/project.mako:230 +msgid "Date created:" +msgstr "" + +#: website/templates/project/project.mako:233 +msgid "| Last Updated:" +msgstr "" + +#: website/templates/project/project.mako:248 +msgid "Creating DOI. Please wait..." +msgstr "" + +#: website/templates/project/project.mako:254 +msgid "Create DOI" +msgstr "" + +#: website/templates/project/project.mako:259 +#: website/templates/project/settings.mako:81 +msgid "Category:" +msgstr "" + +#: website/templates/project/project.mako:260 +msgid "category" +msgstr "" + +#: website/templates/project/project.mako:265 +#: website/templates/project/settings.mako:107 +msgid "Description:" +msgstr "" + +#: website/templates/project/project.mako:282 +msgid "License:" +msgstr "" + +#: website/templates/project/project.mako:283 +msgid "license" +msgstr "" + +#: website/templates/project/project.mako:291 +msgid "View Registration Form" +msgstr "" + +#: website/templates/project/project.mako:296 +msgid "View Registration Forms" +msgstr "" + +#: website/templates/project/project.mako:341 +msgid "Type:" +msgstr "" + +#: website/templates/project/project.mako:345 +#: website/templates/project/project.mako:396 +msgid "Status:" +msgstr "" + +#: website/templates/project/project.mako:349 +msgid "Volume:" +msgstr "" + +#: website/templates/project/project.mako:353 +msgid "Issue:" +msgstr "" + +#: website/templates/project/project.mako:357 +msgid "Program Area:" +msgstr "" + +#: website/templates/project/project.mako:363 +msgid "Subjects:" +msgstr "" + +#: website/templates/project/project.mako:399 +msgid "Withdrawn" +msgstr "" + +#: website/templates/project/project.mako:408 +msgid "" +"This {preprint_word} is publicly available and searchable but is subject " +"to removal by a moderator." +msgstr "" + +#: website/templates/project/project.mako:411 +msgid "" +"This {preprint_word} is not publicly available or searchable until " +"approved by a moderator." +msgstr "" + +#: website/templates/project/project.mako:415 +msgid "This {preprint_word} is publicly available and searchable." +msgstr "" + +#: website/templates/project/project.mako:417 +msgid "This {preprint_word} is not publicly available or searchable." +msgstr "" + +#: website/templates/project/project.mako:461 +#: website/templates/project/view_file.mako:57 +msgid "Loading files..." +msgstr "" + +#: website/templates/project/project.mako:502 +#: website/templates/util/render_addon_widget.mako:70 +msgid "Citation" +msgstr "" + +#: website/templates/project/addon/citations_widget.mako:16 +#: website/templates/project/project.mako:514 +#: website/templates/util/render_addon_widget.mako:136 +msgid "Loading citations..." +msgstr "" + +#: website/templates/project/project.mako:519 +msgid "Customize" +msgstr "" + +#: website/templates/project/project.mako:527 +msgid "Chicago" +msgstr "" + +#: website/templates/project/project.mako:531 +msgid "Get more citations" +msgstr "" + +#: website/templates/project/project.mako:549 +#, python-format +msgid "" +"
                                                Cite as:
                                                " +"" +msgstr "" + +#: website/templates/project/project.mako:560 +msgid "Enter custom citation" +msgstr "" + +#: website/templates/project/project.mako:601 +msgid "Recent Activity" +msgstr "" + +#: website/templates/project/project.mako:602 +msgid "Clear Filters" +msgstr "" + +#: website/templates/project/project.mako:603 +msgid "Refresh" +msgstr "" + +#: website/templates/project/project.mako:635 +msgid "Loading logs..." +msgstr "" + +#: website/templates/project/project.mako:641 +msgid "Download as file" +msgstr "" + +#: website/templates/project/project.mako:642 +#: website/templates/project/timestamp.mako:206 +msgid "Download" +msgstr "" + +#: website/templates/project/project.mako:655 +msgid "Components" +msgstr "" + +#: website/templates/project/project.mako:659 +msgid "Add Component" +msgstr "" + +#: website/templates/project/project.mako:661 +msgid "Link Projects" +msgstr "" + +#: website/templates/project/project.mako:671 +msgid "Add components to organize your project." +msgstr "" + +#: website/templates/project/project_header.mako:16 +msgid "Component" +msgstr "" + +#: website/templates/project/project_header.mako:16 +msgid "Navigation" +msgstr "" + +#: website/templates/project/project_header.mako:61 +msgid "Analytics" +msgstr "" + +#: website/templates/project/project_header.mako:67 +msgid "Registrations" +msgstr "" + +#: website/templates/project/project_header.mako:76 +msgid "Add-ons" +msgstr "" + +#: website/templates/project/project_header.mako:96 +#: website/templates/project/timestamp.mako:2 +msgid "Timestamp" +msgstr "" + +#: website/templates/project/project_header.mako:128 +msgid "" +"This file is part of a registration and is being shown in its archived " +"version (and cannot be altered)." +msgstr "" + +#: website/templates/project/project_header.mako:129 +#, python-format +msgid "" +"The active file is viewable from within the live %(nodeType)s." +msgstr "" + +#: website/templates/project/project_header.mako:131 +#, python-format +msgid "" +"This registration is a frozen, non-editable version of this %(nodeType)s" +msgstr "" + +#: website/templates/project/project_header.mako:135 +#, python-format +msgid "" +"This is a pending registration of this " +"%(nodeType)s, awaiting approval from project administrators. This " +"registration will be final when all project administrators approve the " +"registration or 48 hours pass, whichever comes first." +msgstr "" + +#: website/templates/project/project_header.mako:141 +#: website/templates/project/project_header.mako:173 +msgid "Cancel registration" +msgstr "" + +#: website/templates/project/project_header.mako:159 +#, python-format +msgid "This %(nodeType)s is currently pending withdrawal." +msgstr "" + +#: website/templates/project/project_header.mako:163 +#, python-format +msgid "" +"This %(nodeType)s is a withdrawn registration of this %(nodeType)s; the content of the " +"%(nodeType)s has been taken down for the reason(s) stated below." +msgstr "" + +#: website/templates/project/project_header.mako:168 +#, python-format +msgid "" +"This %(nodeType)s is currently pending registration, awaiting approval " +"from project administrators. This registration will be final and enter " +"the embargo period when all project administrators approve the " +"registration or 48 hours pass, whichever comes first. The embargo will " +"keep the registration private until the embargo period ends." +msgstr "" + +#: website/templates/project/project_header.mako:182 +#, python-format +msgid "" +"This registration is currently embargoed. It will remain private until " +"its embargo end date, %(embargoEndDate)s." +msgstr "" + +#: website/templates/project/project_header.mako:188 +#, python-format +msgid "" +"This %(nodeType)s contains supplemental materials for a preprint, but has" +" been made Private. Make your supplemental materials discoverable by " +"making this %(nodeType)s Public." +msgstr "" + +#: website/templates/project/project_header.mako:192 +#, python-format +msgid "" +"This %(nodeType)s is being viewed through an anonymized, view-only link. " +"If you want to view it as a contributor, click here." +msgstr "" + +#: website/templates/project/project_header.mako:196 +#, python-format +msgid "" +"This %(nodeType)s is being viewed through a private, view-only link. " +"Anyone with the link can view this project. Keep the link safe." +msgstr "" + +#: website/templates/project/settings.mako:17 +#: website/templates/project/settings.mako:76 +#: website/templates/project/settings.mako:150 +#: website/templates/project/settings.mako:163 +#: website/templates/util/render_node.mako:18 +msgid "node_type" +msgstr "" + +#: website/templates/project/settings.mako:21 +#: website/templates/project/settings.mako:178 +msgid "Storage Location" +msgstr "" + +#: website/templates/project/settings.mako:33 +#: website/templates/project/settings.mako:225 +msgid "Access Requests" +msgstr "" + +#: website/templates/project/settings.mako:39 +#: website/templates/project/settings.mako:318 +msgid "Commenting" +msgstr "" + +#: website/templates/project/settings.mako:42 +#: website/templates/project/settings.mako:359 +msgid "Email Notifications" +msgstr "" + +#: website/templates/project/settings.mako:44 +#: website/templates/project/settings.mako:391 +msgid "Redirect Link" +msgstr "" + +#: website/templates/project/settings.mako:51 +msgid "Withdraw Public Registration" +msgstr "" + +#: website/templates/project/settings.mako:57 +#: website/templates/project/settings.mako:469 +msgid "Project Affiliation / Branding" +msgstr "" + +#: website/templates/project/settings.mako:82 +msgid "(For descriptive purposes)" +msgstr "" + +#: website/templates/project/settings.mako:87 +msgid "Uncategorized" +msgstr "" + +#: website/templates/project/settings.mako:114 +msgid "Select Timestamp Function:" +msgstr "" + +#: website/templates/project/settings.mako:117 +#: website/templates/project/settings.mako:122 +msgid "Timestamp only" +msgstr "" + +#: website/templates/project/settings.mako:133 +msgid "Save changes" +msgstr "" + +#: website/templates/project/settings.mako:141 +msgid "" +"A project cannot be deleted if it has any components within it." +" To delete a parent project, you must " +"first delete all child components by " +"visiting their settings pages." +msgstr "" + +#: website/templates/project/settings.mako:150 +#: website/templates/project/settings.mako:163 +#, python-format +msgid "Delete %(nodeType)s" +msgstr "" + +#: website/templates/project/settings.mako:156 +#, python-format +msgid "" +"A project which is related to a external group (%(group)s) cannot be " +"deleted." +msgstr "" + +#: website/templates/project/settings.mako:185 +msgid "Storage location cannot be changed after project is created." +msgstr "" + +#: website/templates/project/settings.mako:237 +msgid "Allow users to request access to this project." +msgstr "" + +#: website/templates/project/settings.mako:270 +#, python-format +msgid "Enable the wiki in %(title)s." +msgstr "" + +#: website/templates/project/settings.mako:283 +msgid "Configure" +msgstr "" + +#: website/templates/project/settings.mako:286 +#, python-format +msgid "Control who can edit the wiki of %(title)s" +msgstr "" + +#: website/templates/project/settings.mako:288 +#, python-format +msgid "" +"Control who can edit your wiki. To allow all GakuNin RDM users to edit " +"the wiki, %(title)s must be public." +msgstr "" + +#: website/templates/project/settings.mako:298 +msgid "Loading wiki settings..." +msgstr "" + +#: website/templates/project/settings.mako:328 +msgid "Only contributors can post comments" +msgstr "" + +#: website/templates/project/settings.mako:334 +#, python-format +msgid "When the %(nodeType)s is public, any GakuNin RDM user can post comments" +msgstr "" + +#: website/templates/project/settings.mako:363 +msgid "" +"These notification settings only apply to you. They do NOT affect any " +"other contributor on this project." +msgstr "" + +#: website/templates/project/settings.mako:402 +msgid "Redirect visitors from your project page to an external webpage" +msgstr "" + +#: website/templates/project/settings.mako:427 +#: website/templates/project/settings.mako:449 +msgid "Withdraw Registration" +msgstr "" + +#: website/templates/project/settings.mako:435 +#, python-format +msgid "" +"Withdrawing children components of a registration is not allowed. Should " +"you wish to withdraw this component, " +"please withdraw its parent registration here." +msgstr "" + +#: website/templates/project/settings.mako:442 +msgid "" +"Withdrawing a registration will remove its content from the GakuNin RDM, " +"but leave basic metadata behind. The " +"title of a withdrawn registration and its contributor list will remain, " +"as will justification or explanation " +"of the withdrawal, should you wish to provide it. Withdrawn" +" registrations will be marked with a " +"withdrawn tag." +msgstr "" + +#: website/templates/project/settings.mako:451 +msgid "This registration is already pending withdrawal." +msgstr "" + +#: website/templates/project/settings.mako:474 +msgid "" +"Contributors with read-only permissions to this project cannot add or " +"remove institutional affiliations." +msgstr "" + +#: website/templates/project/settings.mako:477 +msgid "" +"Projects can be affiliated with institutions that have created GakuNin " +"RDM for Institutions accounts." +msgstr "" + +#: website/templates/project/settings.mako:478 +msgid "This allows:" +msgstr "" + +#: website/templates/project/settings.mako:480 +msgid "institutional logos to be displayed on public projects" +msgstr "" + +#: website/templates/project/settings.mako:481 +msgid "public projects to be discoverable on specific institutional landing pages" +msgstr "" + +#: website/templates/project/settings.mako:482 +msgid "single sign-on to the GakuNin RDM with institutional credentials" +msgstr "" + +#: website/templates/project/settings.mako:483 +msgid "FAQ" +msgstr "" + +#: website/templates/project/settings.mako:511 +msgid "Available Institutions:" +msgstr "" + +#: website/templates/project/timestamp.mako:10 +msgid "Timestamp Control" +msgstr "" + +#: website/templates/project/timestamp.mako:27 +msgid "Timestamp Error" +msgstr "" + +#: website/templates/project/timestamp.mako:41 +msgid "Start Date" +msgstr "" + +#: website/templates/project/timestamp.mako:47 +msgid "End Date" +msgstr "" + +#: website/templates/project/timestamp.mako:53 +msgid "User" +msgstr "" + +#: website/templates/project/timestamp.mako:60 +msgid "Apply" +msgstr "" + +#: website/templates/project/timestamp.mako:69 +msgid "Verify" +msgstr "" + +#: website/templates/project/timestamp.mako:70 +msgid "Request Trusted Timestamp" +msgstr "" + +#: website/templates/project/timestamp.mako:81 +msgid "Processing, please wait..." +msgstr "" + +#: website/templates/project/timestamp.mako:99 +msgid "per page:" +msgstr "" + +#: website/templates/project/timestamp.mako:122 +msgid "Provider" +msgstr "" + +#: website/templates/project/timestamp.mako:129 +msgid "File Path" +msgstr "" + +#: website/templates/project/timestamp.mako:136 +msgid "Timestamp by" +msgstr "" + +#: website/templates/project/timestamp.mako:143 +msgid "Updated at" +msgstr "" + +#: website/templates/project/timestamp.mako:150 +msgid "Timestamp Verification" +msgstr "" + +#: website/templates/project/view_file.mako:19 +msgid "Version:" +msgstr "" + +#: website/templates/project/view_file.mako:34 +#: website/templates/project/view_file.mako:36 +msgid "Timestamp verification:" +msgstr "" + +#: website/templates/project/view_file.mako:52 +msgid "No files" +msgstr "" + +#: website/templates/project/view_file.mako:107 +msgid "Connected to collaborative file editing" +msgstr "" + +#: website/templates/project/view_file.mako:111 +msgid "" +"This page is currently connected to collaborative file editing. All edits" +" made will be visible to contributors with write permission in " +"real time. Changes will be stored but not published until you " +"click the \"Save\" button." +msgstr "" + +#: website/templates/project/view_file.mako:128 +msgid "Connecting to collaborative file editing" +msgstr "" + +#: website/templates/project/view_file.mako:132 +msgid "" +"This page is currently attempting to connect to collaborative file " +"editing. You may continue to make edits." +msgstr "" + +#: website/templates/project/view_file.mako:148 +msgid "Collaborative file editing is unavailable" +msgstr "" + +#: website/templates/project/view_file.mako:152 +msgid "" +"Collaborative file editing is currently unavailable. You may continue to " +"make edits." +msgstr "" + +#: website/templates/project/addon/node_settings.mako:15 +msgid "Submit" +msgstr "" + +#: website/templates/project/addon/node_settings_default.mako:7 +#, python-format +msgid "authorized by %(ownerName)s" +msgstr "" + +#: website/templates/project/addon/page.mako:4 +msgid "Add-on" +msgstr "" + +#: website/templates/project/addon/page.mako:21 +#: website/templates/project/addon/widget.mako:17 +#, python-format +msgid "%(fullname)s add-on is not configured properly." +msgstr "" + +#: website/templates/project/addon/page.mako:23 +#: website/templates/project/addon/widget.mako:19 +#: website/templates/util/render_addon_widget.mako:240 +#, python-format +msgid "Configure this add-on on the add-ons page." +msgstr "" + +#: website/templates/util/contributor_list.mako:18 +#, python-format +msgid "%(othersCount)s more" +msgstr "" + +#: website/templates/util/oauth_complete.mako:9 +msgid "OAuth Complete" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:30 +msgid "Read More" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:61 +msgid "Dataset" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:64 +msgid "Global ID" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:67 +#: website/templates/util/render_addon_widget.mako:68 +msgid "Dataverse" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:93 +#, python-format +msgid "" +"This project contains a forward to ." +msgstr "" + +#: website/templates/util/render_addon_widget.mako:99 +#: website/templates/util/render_addon_widget.mako:112 +msgid "Redirect" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:107 +#, python-format +msgid "" +"This project contains a forward to ." +msgstr "" + +#: website/templates/util/render_addon_widget.mako:144 +#: website/templates/util/render_addon_widget.mako:175 +msgid "Loading" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:147 +#: website/templates/util/render_addon_widget.mako:178 +msgid "Error occurred" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:151 +msgid "Linked JupyterHubs" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:158 +msgid "Launch" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:166 +msgid "No Linked JupyterHubs" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:182 +msgid "Management Project" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:184 +msgid "Flowable Task Service" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:192 +#: website/templates/util/render_addon_widget.mako:219 +msgid "Deposit Manuscript & Data" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:200 +#: website/templates/util/render_addon_widget.mako:225 +msgid "Image Scan only" +msgstr "" + +#: website/templates/util/render_node.mako:5 +msgid "component" +msgstr "" + +#: website/templates/util/render_node.mako:18 +#, python-format +msgid "Linked %(nodeType)s" +msgstr "" + +#: website/templates/util/render_node.mako:22 +msgid "This project is private" +msgstr "" + +#: website/templates/util/render_node.mako:57 +msgid "Remove link" +msgstr "" + +#: website/templates/util/render_node.mako:58 +#, python-format +msgid "Create a fork of %(summaryTitle)s" +msgstr "" + +#: website/templates/util/render_node.mako:66 +msgid "Manage Contributors" +msgstr "" + +#: website/templates/util/render_addon_widget.mako:245 +msgid "My Screen Test" +msgstr "" diff --git a/site/guides/skeleton/README.legacy/index.html b/site/guides/skeleton/README.legacy/index.html new file mode 100644 index 0000000..31198b5 --- /dev/null +++ b/site/guides/skeleton/README.legacy/index.html @@ -0,0 +1,2862 @@ + + + + + + + + + + + + + + + + + + + + + + + スケルトンの作成 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                + +
                                                + + + + +
                                                + + +
                                                + +
                                                + + + + + + + + + +
                                                +
                                                + + + +
                                                +
                                                +
                                                + + + + + + + +
                                                +
                                                +
                                                + + + +
                                                +
                                                +
                                                + + + +
                                                +
                                                +
                                                + + + +
                                                +
                                                + + + + + + + +

                                                スケルトンの作成

                                                +

                                                アドオン開発の第一歩として、以下のような単純な機能を持つ「スケルトン」アドオンを実装します。

                                                +

                                                スケルトンは以下の機能を持つものとします。

                                                +
                                                  +
                                                • 任意のプロジェクトにてスケルトンを有効化可能
                                                • +
                                                • スケルトンは param_1 というパラメータを持ち、プロジェクトごとに異なる値を設定することができる
                                                • +
                                                • param_1 パラメータはプロジェクトのアドオン設定画面で設定することができる
                                                • +
                                                +

                                                前提条件

                                                +

                                                本ドキュメントの実施にあたり、以下の前提条件を満たしているものとします。

                                                +
                                                  +
                                                • RDM-osf.ioリポジトリをフォークし、ローカル環境にcloneしていること
                                                • +
                                                • 特に指定がない限りはdevelopブランチからアドオン開発用ブランチ(例えば、 feature/myskelton-addon)を作成し作業する
                                                • +
                                                • アドオン開発用ブランチには定期的にdevelopブランチをpullして変更を取り込む
                                                • +
                                                • cloneしたアドオン開発用ブランチで、 開発環境の準備 のガイドに従い、開発用RDMを起動していること
                                                • +
                                                +

                                                RDMアドオンの設計

                                                +

                                                ファイルの構成

                                                +

                                                RDMにおいてアドオンはDjangoアプリケーションの形式で記述されます。以下のようなファイルおよびクラスから構成されます。

                                                +

                                                クラス構成

                                                +

                                                典型的なファイル配置は以下のようになります。

                                                +
                                                /addons/アドオン名/
                                                +├── __init__.py ... モジュールの定義
                                                +├── apps.py ... アプリケーションの定義
                                                +├── models.py ... モデルの定義
                                                +├── requirements.txt ... 利用するPythonモジュールの定義
                                                +├── routes.py ... View(Routes)の定義
                                                +├── settings ... 設定を定義するモジュール。ここにlocal.pyを配置することでカスタマイズできる。
                                                +│   ├── defaults.py ... デフォルト設定の定義
                                                +│   └── __init__.py ... 設定の定義
                                                +├── static ... Webブラウザから読み込むことを想定した静的ファイル
                                                +│   ├── comicon.png ... アドオンのアイコン
                                                +│   └── node-cfg.js ... Node設定を定義するJavaScriptファイル
                                                +├── templates ... テンプレートディレクトリ
                                                +│   └── node_settings.mako ... Node設定パネル
                                                +├── tests ... テストコード
                                                +│   ├── conftest.py
                                                +│   ├── factories.py
                                                +│   ├── test_model.py
                                                +│   ├── test_view.py
                                                +│   └── utils.py
                                                +└── views.py ... View(Views)の定義
                                                +
                                                +

                                                アドオンのモジュール構成

                                                +

                                                アドオンはDjangoの作法に従い、Model-Viewアーキテクチャにより実装します。それぞれの責務は以下のように分担されます。

                                                +
                                                  +
                                                • Model ... ユーザとNode(プロジェクト)それぞれに対応したモデルを実装する。それぞれのモデルには認証情報やプロジェクト固有の情報を格納することができる
                                                • +
                                                • View ... アドオンに応じた設定、データ取得、保存処理など、HTTP上のエンドポイント(パス)を定義する
                                                • +
                                                +

                                                Modelはフレームワークにより自動的にそれぞれの利用者、プロジェクトに対応して生成、管理され、永続化されるのに対し、Viewはアプリケーションがロードされる際に構築されます。 +フレームワークによりそれぞれのライフサイクルが適切に管理されるので、アドオン開発者は機能面の実装に注力することができます。

                                                +

                                                Modelの構成

                                                +

                                                Node(プロジェクト)に関する情報や、ユーザごとの情報(認証情報等)を記録、管理したい場合、Modelを定義します。

                                                +

                                                UserSettingsは利用者ごとにインスタンスが生成され、永続化されます。また、NodeSettingsはプロジェクトごとにインスタンスが生成、永続化されます。これらのインスタンスの生成や破棄をアドオンのコードが行うことは原則としてありません。

                                                +

                                                スケルトンの場合、以下のようにNodeに関するModelを定義します。

                                                + +

                                                NodeSettingsは永続化すべきプロパティと、各種setterとgetterを定義しています。

                                                +

                                                Viewの構成

                                                +

                                                ViewはFlaskのPluggable Viewsのように、サービス上のパスと処理の関係を定義します。定義はRoutesとViewsの2種類の要素から構成されます。

                                                +
                                                  +
                                                • Routes ... View処理をどのパスにマッピングし、どのような形式で出力するか。出力にはJSON形式や、HTMLのテンプレートを指定することができる
                                                • +
                                                • Views ... View処理の内容
                                                • +
                                                +

                                                Routesは以下のようにパスとMethod(GET, POST, PUT, DELETE, ...)と、その組み合わせに対してどの関数を実行するか、その実行結果をどのように出力するかを定義します。

                                                +

                                                各View処理には、その処理の実行における前提をPythonのデコレータの形で記述することができます。指定可能なデコレータには以下のようなものがあります。

                                                +
                                                  +
                                                • framework.auth.decorators.must_be_logged_in ... ユーザがログインしている状態である場合にのみ呼び出し可能であることを宣言する。引数にはauthパラメータが追加され、認証しているユーザに関する情報を得ることができる
                                                • +
                                                • website.project.decorators.must_have_addon ... アドオンに関する情報を必要とすることを宣言する。第1引数にはアドオン名を(例では myskelton)、第2引数には'user'か'node'のいずれかを定義する。('node'にした場合は、パスは /project// から始める必要がある)
                                                • +
                                                • website.project.decorators.must_have_permission ... 必要なパーミッションを宣言する。引数には'write', 'read', 'admin'のいずれかを指定する。
                                                • +
                                                +

                                                スケルトンの場合、以下のようにRoutesとViewsを定義します。

                                                + +

                                                コンテキストに応じてデコレータを宣言しておくことで、Viewの処理の中でModel(利用者が操作対象としているUserやNode)を参照することができます。

                                                +

                                                フレームワークによって提供されるView

                                                +

                                                Routes, Viewsを使うことでさまざまなAPIやインタフェースを定義することができますが、アドオンが持つ利用者用設定画面(認証情報の入力画面)とプロジェクト用設定画面(プロジェクトでアドオンを有効化した場合の設定画面)はフレームワークによってあらかじめテンプレート化されています。

                                                + +

                                                このファイルは、テンプレート言語 mako で記述されます。

                                                +

                                                テンプレートを動的に操作するためのJavaScriptのライブラリにはKnockout.jsを利用することができます。JavaScriptコードについては、アドオンのstaticディレクトリにて定義することができます。

                                                + +

                                                また、staticディレクトリにはアドオンのアイコンを定義する必要があります。

                                                + +

                                                設定モジュール

                                                +

                                                アドオンの動作を環境によりカスタマイズ可能にするため、settingsモジュールを用意します。

                                                + +

                                                RDMのアプリケーション設定と同様に、settingsディレクトリ内に local.py ファイルを定義することで、アドオンの動作をカスタマイズできるようになります。 +設定値は defaults.py で定義します。スケルトンの場合、以下のように定義します。

                                                + +

                                                テストコード

                                                +

                                                アドオンのユニットテストを定義します。スケルトンの場合、以下のようにModelのテスト(test_model.py)とViewのテスト(test_view.py)を定義しています。

                                                + +

                                                Migrations定義

                                                +

                                                Migrationsファイルは、Modelの内容をRDBのテーブルに対応づけをするために使用します。Modelの内容はバージョンによって変化しますから、各バージョンごとに適切にテーブルの変更がなされるよう、Migrationsファイルを適切に定義する必要があります。 +スケルトンの場合、空の __init__.py を定義しています。

                                                + +

                                                Migrationsファイルの作成にて作成方法を説明します。

                                                +

                                                スケルトン アドオンの実装

                                                +

                                                ここでは、 myskelton という識別名のアドオンの実装を例に説明します。

                                                +

                                                addons.myskelton モジュールの定義

                                                +

                                                スケルトンコードの例を addons/myskelton ディレクトリにコピーします。ファイルの構成で示したツリー構造となるようにコピーしてください。

                                                +

                                                このスケルトンでは、アドオン名(識別名)をmyskeltonとしています。 +識別名はモジュール名と一致させる必要がありますので、myskelton以外の名前にしたい場合は、addons/(識別名) ディレクトリにスケルトンコードを配置するようにしてください。

                                                +

                                                また、この名前を変更したい場合は、以下のコードを変更する必要があります。

                                                + +

                                                また、アドオンの完全名を My Skelton としています。これは、Web UIでの表示等に使われます。この名前を変更したい場合は、以下のコードを変更する必要があります。

                                                + +

                                                RDMコードの変更

                                                +

                                                追加したアドオンをRDMに認識させるために、RDMのコードをいくつか変更します。

                                                +

                                                addons.json の変更

                                                +

                                                addons.json に、アドオンに関する情報を追加します。このファイルはJSONファイル形式であり、キーごとに以下の値を登録します。

                                                +

                                                変更例はサンプル addons.json を参照してください。

                                                +
                                                  +
                                                • addons ... 利用可能なアドオン一覧。必ず登録する
                                                • +
                                                • addons_default ... プロジェクト作成時にデフォルトで有効になるアドオン一覧
                                                • +
                                                • addons_archivable ... アドオンごとのアーカイブに関する情報
                                                • +
                                                • addons_commentable ... コメント可能なアドオン一覧
                                                • +
                                                • addons_description ... アドオン名と説明の定義
                                                • +
                                                +
                                                "myskelton": "My Skelton Addon is ..."
                                                +
                                                +
                                                  +
                                                • addons_url ... アドオンの関連URLの定義
                                                • +
                                                +
                                                "myskelton": "https://dummy.nii.ac.jp/myskelton"
                                                +
                                                +

                                                framework/addons/data/addons.json の変更

                                                +

                                                framework/addons/data/addons.json に、アドオン登録時のメッセージリソースを登録します。 +addons オブジェクトに、アドオンの完全名(AddonAppConfig.full_name に相当)をキーとして情報を登録します。

                                                +

                                                変更例はサンプル addons.json を参照してください。

                                                +
                                                +

                                                この定義ファイルの内容は画面表示のためだけに利用され、動作には影響しません。

                                                +
                                                +
                                                "My Skelton": {
                                                +    "Permissions": {
                                                +        "status": "none",
                                                +        "text": "The GakuNin RDM does not affect the permissions of My Skelton."
                                                +    },
                                                +    "View / download file versions": {
                                                +        "status": "none",
                                                +        "text": "The My Skelton add-on does not provide Storage Features."
                                                +    },
                                                +    "Add / update files": {
                                                +        "status": "none",
                                                +        "text": "The My Skelton add-on does not provide Storage Features."
                                                +    },
                                                +    "Delete files": {
                                                +        "status": "none",
                                                +        "text": "The My Skelton add-on does not provide Storage Features."
                                                +    },
                                                +    "Logs": {
                                                +        "status": "none",
                                                +        "text": "The My Skelton add-on does not provide Storage Features."
                                                +    },
                                                +    "Forking": {
                                                +        "status": "partial",
                                                +        "text": "Forking a project or component copies information about linked My Skelton but the GakuNin RDM does not affect authentication of My Skelton."
                                                +    },
                                                +    "Registering": {
                                                +        "status": "none",
                                                +        "text": "My Skelton information will not be registered."
                                                +    }
                                                +}
                                                +
                                                +

                                                このメッセージの国際化については 国際化メッセージファイルの作成を参照してください。

                                                +

                                                Dockerfile の変更

                                                +

                                                Dockerfile に、アドオン関連のファイルコピー定義を追加します。

                                                +

                                                変更例はサンプル Dockerfile を参照してください。

                                                +
                                                  +
                                                • +

                                                  requirements.txtのコピー +

                                                  COPY ./addons/myskelton/requirements.txt ./addons/myskelton/
                                                  +

                                                  +
                                                • +
                                                • +

                                                  staticディレクトリの変更 +

                                                  COPY ./addons/myskelton/static/ ./addons/myskelton/static/
                                                  +

                                                  +
                                                • +
                                                +

                                                api/base/settings/defaults.py への追加

                                                +

                                                api/base/settings/defaults.py の INSTALLED_APPS にアドオン名を追加します。

                                                +

                                                変更例はサンプル defaults.py を参照してください。

                                                +
                                                'addons.myskelton',
                                                +
                                                +

                                                Migrationsファイルの作成

                                                +

                                                Modelで定義したプロパティがRDBに保存されるよう、makemigrationsコマンドを実行します。このコマンドを実行すると、 addons/myskelton/migrations にPythonファイルが作成されます。

                                                +
                                                $ docker compose run --rm web python3 manage.py makemigrations
                                                +
                                                +

                                                上記の出力中に以下の出力が現れれば成功です。現れない場合、RDMがアドオンを認識していない可能性があります。特にaddons.json, api/base/settings/defaults.pyの設定が漏れていないかどうかを確認してください。

                                                +
                                                Migrations for 'addons_myskelton':
                                                +  addons/myskelton/migrations/0001_initial.py
                                                +    - Create model NodeSettings
                                                +
                                                +

                                                国際化メッセージファイルの作成

                                                +

                                                国際化メッセージファイルの定義ファイルは以下のコマンドで生成することができます。

                                                +
                                                +

                                                このセクションの実施時は各サービスを停止状態にしてください。

                                                +
                                                +
                                                # framework/addons/data/addons.jsonに定義されたメッセージをJavaScriptファイルへと変換する
                                                +$ docker compose run --rm web python3 -m scripts.generate_addons_translations
                                                +
                                                +# メッセージ定義テンプレートファイル website/translations/js_messages.pot を更新する
                                                +$ docker compose run --rm web pybabel extract -F ./website/settings/babel_js.cfg -o ./website/translations/js_messages.pot .
                                                +
                                                +# メッセージ定義ファイル website/translations/ja/LC_MESSAGES/js_messages.po を更新する
                                                +$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/en/LC_MESSAGES/js_messages.po -l en
                                                +$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/ja/LC_MESSAGES/js_messages.po -l ja
                                                +
                                                +

                                                上記を実行すると、website/translations/ja/LC_MESSAGES/js_messages.poにある英語メッセージと日本語メッセージの対応づけが更新されます。 +変更例のサンプル js_messages.po を参考に日本語メッセージを追加してください。

                                                +
                                                #: scripts/translations/messages_addonsJson.js:45
                                                +msgid ""
                                                +"\n"
                                                +"\n"
                                                +"<h3>My Skelton Add-on Terms</h3>\n"
                                                +"\n"
                                                +...
                                                +msgstr ""
                                                +"\n"
                                                +"\n"
                                                +"<h3>My Skelton アドオン規約</h3>\n"
                                                +"\n"
                                                +"<table class=\"table table-bordered table-addon-terms\">\n"
                                                +...
                                                +
                                                +

                                                このメッセージを追加後、assetsサービスの再起動時にメッセージ定義が反映されます。

                                                +

                                                スケルトンのテスト

                                                +

                                                これでアドオンのコードの作成は完了です。以下のコマンドで追加した addons/myskelton のユニットテストを実行してみましょう。

                                                +
                                                $ docker compose run --rm web invoke test_module -m addons/myskelton/tests/
                                                +
                                                +

                                                スケルトン アドオンの動作確認

                                                +

                                                スケルトン アドオンを動作確認をしてみましょう。 +アドオンには新規に定義されたModelが含まれていますので、Migrations定義をサービス中のPostgreSQLサービスに反映しましょう。

                                                +
                                                $ docker compose run --rm web python3 manage.py migrate
                                                +
                                                +

                                                また、新規にJavaScriptファイルを追加したので、新たなファイルがロード対象となるように、RDM-osf.ioをイメージとしたサービスの再起動を実施します。

                                                +
                                                $ docker compose restart assets web api
                                                +
                                                +

                                                これでサービスへの反映は完了です。スケルトン アドオンを試すには、以下のような操作を実施します。

                                                +
                                                  +
                                                1. RDM Web UIにアクセスする http://localhost:5000
                                                2. +
                                                3. +

                                                  適当なプロジェクトを作成する + Create Project

                                                  +
                                                4. +
                                                5. +

                                                  Add-onsページを開く

                                                  +
                                                6. +
                                                7. My Skeltonアドオンを有効化する + Enable Addon
                                                8. +
                                                +

                                                これで、node_settings.makoで定義したNode設定画面が現れます。テキストボックスに入力した値が param_1 プロパティに反映される様子が確認できるはずです。

                                                +

                                                Addon

                                                +

                                                以上でスケルトンアドオンの動作確認は完了です!

                                                + + + + + + + + + + + + + +
                                                +
                                                + + + +
                                                + +
                                                + + + +
                                                +
                                                +
                                                +
                                                + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/guides/skeleton/addon/__init__.py b/site/guides/skeleton/addon/__init__.py new file mode 100644 index 0000000..f53f140 --- /dev/null +++ b/site/guides/skeleton/addon/__init__.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +""" +本パッケージによりロードすべき `AddonAppConfig`を定義する。 +""" + +# 本アドオンの識別名。スケルトンではパッケージ名と合致させる必要がある。 +# 定義の簡便化のために用意している... +# `AddonAppConfig`の`short_name`等に個別に名前を定義しても良い。 +SHORT_NAME = 'myskelton' + +# `apps.py`に定義した`AddonAppConfig`クラス名の指定 +# 特別な理由がなければ、 `addons.アドオン名.apps.AddonAppConfig` +default_app_config = 'addons.{}.apps.AddonAppConfig'.format(SHORT_NAME) diff --git a/Skelton/addon/apps.py b/site/guides/skeleton/addon/apps.py similarity index 100% rename from Skelton/addon/apps.py rename to site/guides/skeleton/addon/apps.py diff --git a/site/guides/skeleton/addon/migrations/__init__.py b/site/guides/skeleton/addon/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/site/guides/skeleton/addon/models.py b/site/guides/skeleton/addon/models.py new file mode 100644 index 0000000..cd1570f --- /dev/null +++ b/site/guides/skeleton/addon/models.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +import logging +import json + +from addons.base.models import BaseNodeSettings +from django.db import models +from . import settings + +logger = logging.getLogger(__name__) + + +class NodeSettings(BaseNodeSettings): + """ + プロジェクトにアタッチされたアドオンに関するモデルを定義する。 + + サンプルとして、 `param_1` のみを定義する。 + """ + param_1 = models.TextField(blank=True, null=True) + + def get_param_1(self): + if self.param_1 is None or self.param_1 == '': + return settings.DEFAULT_PARAM_1 + return self.param_1 + + def set_param_1(self, param_1): + self.param_1 = param_1 + self.save() diff --git a/site/guides/skeleton/addon/requirements.txt b/site/guides/skeleton/addon/requirements.txt new file mode 100644 index 0000000..80f30bc --- /dev/null +++ b/site/guides/skeleton/addon/requirements.txt @@ -0,0 +1 @@ +# 必要に応じてライブラリを記述 diff --git a/site/guides/skeleton/addon/routes.py b/site/guides/skeleton/addon/routes.py new file mode 100644 index 0000000..2c52d77 --- /dev/null +++ b/site/guides/skeleton/addon/routes.py @@ -0,0 +1,21 @@ +""" +Routes associated with the jupyterhub addon +""" + +from framework.routing import Rule, json_renderer +from . import SHORT_NAME +from . import views + +api_routes = { + 'rules': [ + Rule([ + '/project//{}/settings'.format(SHORT_NAME), + '/project//node//{}/settings'.format(SHORT_NAME), + ], 'get', views.myskelton_get_config, json_renderer), + Rule([ + '/project//{}/settings'.format(SHORT_NAME), + '/project//node//{}/settings'.format(SHORT_NAME), + ], 'put', views.myskelton_set_config, json_renderer), + ], + 'prefix': '/api/v1', +} diff --git a/site/guides/skeleton/addon/settings/__init__.py b/site/guides/skeleton/addon/settings/__init__.py new file mode 100644 index 0000000..2b2f988 --- /dev/null +++ b/site/guides/skeleton/addon/settings/__init__.py @@ -0,0 +1,10 @@ +import logging +from .defaults import * # noqa + + +logger = logging.getLogger(__name__) + +try: + from .local import * # noqa +except ImportError: + logger.warn('No local.py settings file found') diff --git a/site/guides/skeleton/addon/settings/defaults.py b/site/guides/skeleton/addon/settings/defaults.py new file mode 100644 index 0000000..5e94a20 --- /dev/null +++ b/site/guides/skeleton/addon/settings/defaults.py @@ -0,0 +1,7 @@ +""" +アドオンのデフォルト設定を定義する。 +この定義は `addons/アドオン名/settings/local.py` に記述された設定により上書きされる。 +""" + +# NodeSettingsモデル `models.py` の `param_1` のデフォルト値 +DEFAULT_PARAM_1 = 'This is test!' diff --git a/site/guides/skeleton/addon/static/comicon.png b/site/guides/skeleton/addon/static/comicon.png new file mode 100644 index 0000000..81ddf48 Binary files /dev/null and b/site/guides/skeleton/addon/static/comicon.png differ diff --git a/site/guides/skeleton/addon/static/node-cfg.js b/site/guides/skeleton/addon/static/node-cfg.js new file mode 100644 index 0000000..f4a63dd --- /dev/null +++ b/site/guides/skeleton/addon/static/node-cfg.js @@ -0,0 +1,81 @@ +'use strict'; + +var $ = require('jquery'); +var m = require('mithril'); +var ko = require('knockout'); +var Raven = require('raven-js'); +var osfHelpers = require('js/osfHelpers'); +var ChangeMessageMixin = require('js/changeMessage'); +var SaveManager = require('js/saveManager'); + +var SHORT_NAME = 'myskelton'; +var logPrefix = '[' + SHORT_NAME + '] '; + + +function NodeSettings() { + var self = this; + self.baseUrl = window.contextVars.node.urls.api + SHORT_NAME + '/'; + + self.param_1 = ko.observable(''); + self.loaded_param_1 = ko.observable(''); + self.dirty = ko.computed(function() { + return self.param_1() != self.loaded_param_1(); + }) + + ChangeMessageMixin.call(self); + + self.saveManager = new SaveManager( + self.baseUrl + 'settings', + null, + { + dirty: function() { + return self.param_1() != self.loaded_param_1() + } + } + ); + + self.submit = function() { + console.log(logPrefix, 'submit', self.param_1()); + self.saveManager.save({'param_1': self.param_1()}) + .then(function (data) { + console.log(logPrefix, 'updated: ', data); + self.loaded_param_1(self.param_1()) + }, + function(reason) { + Raven.captureMessage('Error while updating addon info', { + extra: { + reason: reason + } + }); + }) + }; + + self.loadConfig = function() { + var url = self.baseUrl + 'settings'; + console.log(logPrefix, 'loading: ', url); + + return $.ajax({ + url: url, + type: 'GET', + dataType: 'json' + }).done(function (data) { + console.log(logPrefix, 'loaded: ', data); + self.loaded_param_1(data.param_1); + self.param_1(data.param_1); + }).fail(function(xhr, status, error) { + Raven.captureMessage('Error while retrieving addon info', { + extra: { + url: url, + status: status, + error: error + } + }); + }); + }; +} + +$.extend(NodeSettings.prototype, ChangeMessageMixin.prototype); + +var settings = new NodeSettings(); +osfHelpers.applyBindings(settings, '#' + SHORT_NAME + 'Scope'); +settings.loadConfig(); diff --git a/site/guides/skeleton/addon/templates/node_settings.mako b/site/guides/skeleton/addon/templates/node_settings.mako new file mode 100644 index 0000000..56c06dd --- /dev/null +++ b/site/guides/skeleton/addon/templates/node_settings.mako @@ -0,0 +1,24 @@ +
                                                +

                                                + + ${addon_full_name} +

                                                + +
                                                +
                                                +
                                                + +
                                                + +
                                                +
                                                + +
                                                +
                                                + +
                                                + +
                                                +
                                                diff --git a/site/guides/skeleton/addon/tests/__init__.py b/site/guides/skeleton/addon/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/site/guides/skeleton/addon/tests/conftest.py b/site/guides/skeleton/addon/tests/conftest.py new file mode 100644 index 0000000..da9f243 --- /dev/null +++ b/site/guides/skeleton/addon/tests/conftest.py @@ -0,0 +1 @@ +from osf_tests.conftest import * # noqa diff --git a/site/guides/skeleton/addon/tests/factories.py b/site/guides/skeleton/addon/tests/factories.py new file mode 100644 index 0000000..d94f832 --- /dev/null +++ b/site/guides/skeleton/addon/tests/factories.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +"""Factories for the Swift addon.""" +import factory +from factory.django import DjangoModelFactory +from osf_tests.factories import ProjectFactory + +from ..models import NodeSettings + + +class NodeSettingsFactory(DjangoModelFactory): + class Meta: + model = NodeSettings + + owner = factory.SubFactory(ProjectFactory) diff --git a/site/guides/skeleton/addon/tests/test_model.py b/site/guides/skeleton/addon/tests/test_model.py new file mode 100644 index 0000000..c060098 --- /dev/null +++ b/site/guides/skeleton/addon/tests/test_model.py @@ -0,0 +1,35 @@ +import mock +from nose.tools import * # noqa +import pytest +import unittest + +from tests.base import get_default_metaschema +from osf_tests.factories import ProjectFactory + +from framework.auth import Auth +from ..models import NodeSettings +from .factories import NodeSettingsFactory + + +pytestmark = pytest.mark.django_db + +class TestNodeSettings(unittest.TestCase): + _NodeSettingsFactory = NodeSettingsFactory + + def setUp(self): + super(TestNodeSettings, self).setUp() + self.node = ProjectFactory() + self.user = self.node.creator + + self.node_settings = self._NodeSettingsFactory(owner=self.node) + self.node_settings.save() + + def tearDown(self): + super(TestNodeSettings, self).tearDown() + self.node.delete() + self.user.delete() + + def test_set_param_1(self): + self.node_settings.set_param_1('TEST_PARAM_1') + self.node_settings.save() + assert_equal(self.node_settings.get_param_1(), 'TEST_PARAM_1') diff --git a/site/guides/skeleton/addon/tests/test_view.py b/site/guides/skeleton/addon/tests/test_view.py new file mode 100644 index 0000000..4c07897 --- /dev/null +++ b/site/guides/skeleton/addon/tests/test_view.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +from rest_framework import status as http_status + +import mock +from nose.tools import * # noqa + +from framework.auth import Auth +from tests.base import OsfTestCase, get_default_metaschema +from osf_tests.factories import ProjectFactory + +from .. import SHORT_NAME +from .. import settings +from .utils import BaseAddonTestCase +from website.util import api_url_for + + +class TestViews(BaseAddonTestCase, OsfTestCase): + + def test_empty_param_1(self): + self.node_settings.set_param_1('') + self.node_settings.save() + url = self.project.api_url_for('{}_get_config'.format(SHORT_NAME)) + res = self.app.get(url, auth=self.user.auth) + assert_equals(res.json['param_1'], settings.DEFAULT_PARAM_1) + + def test_param_1(self): + self.node_settings.set_param_1('PARAM_1') + self.node_settings.save() + url = self.project.api_url_for('{}_get_config'.format(SHORT_NAME)) + res = self.app.get(url, auth=self.user.auth) + assert_equals(res.json['param_1'], 'PARAM_1') diff --git a/site/guides/skeleton/addon/tests/utils.py b/site/guides/skeleton/addon/tests/utils.py new file mode 100644 index 0000000..1c4dbc0 --- /dev/null +++ b/site/guides/skeleton/addon/tests/utils.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +from addons.base.tests.base import OAuthAddonTestCaseMixin, AddonTestCase +from .. import SHORT_NAME + + +class BaseAddonTestCase(AddonTestCase): + ADDON_SHORT_NAME = SHORT_NAME + OWNERS = ['node'] + NODE_USER_FIELD = None + ExternalAccountFactory = None + Provider = None + Serializer = None + client = None + + def set_node_settings(self, settings): + return diff --git a/site/guides/skeleton/addon/views.py b/site/guides/skeleton/addon/views.py new file mode 100644 index 0000000..c68d54c --- /dev/null +++ b/site/guides/skeleton/addon/views.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +from rest_framework import status as http_status +from flask import request +import logging + +from . import SHORT_NAME +from . import settings +from framework.exceptions import HTTPError +from website.project.decorators import ( + must_be_contributor_or_public, + must_have_addon, + must_be_valid_project, + must_have_permission, +) + +logger = logging.getLogger(__name__) + + +@must_be_valid_project +@must_have_permission('admin') +@must_have_addon(SHORT_NAME, 'node') +def myskelton_get_config(**kwargs): + node = kwargs['node'] or kwargs['project'] + addon = node.get_addon(SHORT_NAME) + return {'param_1': addon.get_param_1()} + +@must_be_valid_project +@must_have_permission('admin') +@must_have_addon(SHORT_NAME, 'node') +def myskelton_set_config(**kwargs): + node = kwargs['node'] or kwargs['project'] + addon = node.get_addon(SHORT_NAME) + try: + param_1 = request.json['param_1'] + except KeyError: + raise HTTPError(http_status.HTTP_400_BAD_REQUEST) + logger.info('param_1: {}'.format(param_1)) + addon.set_param_1(param_1) + return {} diff --git a/site/guides/skeleton/config/Dockerfile b/site/guides/skeleton/config/Dockerfile new file mode 100644 index 0000000..911d8f5 --- /dev/null +++ b/site/guides/skeleton/config/Dockerfile @@ -0,0 +1,197 @@ +FROM node:8-alpine3.9 + +ARG NODE_OPTIONS='--max-old-space-size=4096' + +# Source: https://github.com/docker-library/httpd/blob/7976cabe162268bd5ad2d233d61e340447bfc371/2.4/alpine/Dockerfile#L3 +RUN set -x \ + && addgroup -g 82 -S www-data \ + && adduser -h /var/www -u 82 -D -S -G www-data www-data + +RUN apk add --no-cache --virtual .run-deps \ + su-exec \ + bash \ + python3 \ + git \ + # lxml2 + libxml2 \ + libxslt \ + # psycopg2 + postgresql-libs \ + # cryptography + libffi \ + # gevent + libev \ + libevent \ + openblas-dev \ + && yarn global add bower + +WORKDIR /code + +COPY ./requirements.txt ./ +COPY ./requirements/ ./requirements/ +COPY ./addons/bitbucket/requirements.txt ./addons/bitbucket/ +COPY ./addons/box/requirements.txt ./addons/box/ +#COPY ./addons/citations/requirements.txt ./addons/citations/ +COPY ./addons/dataverse/requirements.txt ./addons/dataverse/ +COPY ./addons/dropbox/requirements.txt ./addons/dropbox/ +#COPY ./addons/dropboxbusiness/requirements.txt ./addons/dropboxbusiness/ +#COPY ./addons/figshare/requirements.txt ./addons/figshare/ +#COPY ./addons/forward/requirements.txt ./addons/forward/ +COPY ./addons/github/requirements.txt ./addons/github/ +COPY ./addons/gitlab/requirements.txt ./addons/gitlab/ +#COPY ./addons/googledrive/requirements.txt ./addons/googledrive/ +#COPY ./addons/iqbrims/requirements.txt ./addons/iqbrims/ +COPY ./addons/mendeley/requirements.txt ./addons/mendeley/ +COPY ./addons/onedrive/requirements.txt /code/addons/onedrive/ +#COPY ./addons/osfstorage/requirements.txt ./addons/osfstorage/ +COPY ./addons/owncloud/requirements.txt ./addons/owncloud/ +COPY ./addons/s3/requirements.txt ./addons/s3/ +COPY ./addons/twofactor/requirements.txt ./addons/twofactor/ +#COPY ./addons/wiki/requirements.txt ./addons/wiki/ +COPY ./addons/zotero/requirements.txt ./addons/zotero/ +COPY ./addons/swift/requirements.txt ./addons/swift/ +COPY ./addons/azureblobstorage/requirements.txt ./addons/azureblobstorage/ +COPY ./addons/weko/requirements.txt ./addons/weko/ +COPY ./addons/s3compat/requirements.txt ./addons/s3compat/ +COPY ./addons/nextcloud/requirements.txt ./addons/nextcloud/ +COPY ./addons/nextcloudinstitutions/requirements.txt ./addons/nextcloudinstitutions/ +COPY ./addons/myskelton/requirements.txt ./addons/myskelton/ + +RUN set -ex \ + && mkdir -p /var/www \ + && chown www-data:www-data /var/www \ + && apk add --no-cache --virtual .build-deps \ + build-base \ + linux-headers \ + python3-dev \ + # lxml2 + musl-dev \ + libxml2-dev \ + libxslt-dev \ + # psycopg2 + postgresql-dev \ + # cryptography + libffi-dev \ + libpng-dev \ + freetype-dev \ + jpeg-dev \ + && pip3 install Cython \ + && for reqs_file in \ + /code/requirements.txt \ + /code/requirements/release.txt \ + /code/addons/*/requirements.txt \ + ; do \ + pip3 install --no-cache-dir -c /code/requirements/constraints.txt -r "$reqs_file" \ + ; done \ + && (pip3 uninstall uritemplate.py --yes || true) \ + && pip3 install --no-cache-dir uritemplate.py==0.3.0 \ + # Fix: https://github.com/CenterForOpenScience/osf.io/pull/6783 + && python3 -m compileall /usr/lib/python3.6 || true \ + && apk del .build-deps + +# Settings +COPY ./tasks/ ./tasks/ +COPY ./website/settings/ ./website/settings/ +COPY ./api/base/settings/ ./api/base/settings/ +COPY ./website/__init__.py ./website/__init__.py +COPY ./addons.json ./addons.json +RUN mv ./website/settings/local-dist.py ./website/settings/local.py \ + && mv ./api/base/settings/local-dist.py ./api/base/settings/local.py \ + && sed 's/DEBUG_MODE = True/DEBUG_MODE = False/' -i ./website/settings/local.py + +# Bower Assets +COPY ./.bowerrc ./bower.json ./ +COPY ./admin/.bowerrc ./admin/bower.json ./admin/ +RUN \ + # OSF + bower install --production --allow-root \ + && bower cache clean --allow-root \ + # Admin + && cd ./admin \ + && bower install --production --allow-root \ + && bower cache clean --allow-root + +# Webpack Assets +# +## OSF +COPY ./package.json ./.yarnrc ./yarn.lock ./ +COPY ./webpack* ./ +COPY ./website/static/ ./website/static/ +COPY ./scripts/translations/ ./scripts/translations/ +COPY ./website/translations/ ./website/translations/ +COPY ./website/static/js/translations/ ./website/static/js/translations/ +## Admin +COPY ./admin/package.json ./admin/yarn.lock ./admin/ +COPY ./admin/webpack* ./admin/ +COPY ./admin/static/ ./admin/static/ +## Addons +COPY ./addons/bitbucket/static/ ./addons/bitbucket/static/ +COPY ./addons/box/static/ ./addons/box/static/ +COPY ./addons/citations/static/ ./addons/citations/static/ +COPY ./addons/dataverse/static/ ./addons/dataverse/static/ +COPY ./addons/dropbox/static/ ./addons/dropbox/static/ +COPY ./addons/dropboxbusiness/static/ ./addons/dropboxbusiness/static/ +COPY ./addons/figshare/static/ ./addons/figshare/static/ +COPY ./addons/forward/static/ ./addons/forward/static/ +COPY ./addons/github/static/ ./addons/github/static/ +COPY ./addons/gitlab/static/ ./addons/gitlab/static/ +COPY ./addons/googledrive/static/ ./addons/googledrive/static/ +COPY ./addons/mendeley/static/ ./addons/mendeley/static/ +COPY ./addons/onedrive/static/ /code/addons/onedrive/static/ +COPY ./addons/osfstorage/static/ ./addons/osfstorage/static/ +COPY ./addons/owncloud/static/ ./addons/owncloud/static/ +COPY ./addons/s3/static/ ./addons/s3/static/ +COPY ./addons/twofactor/static/ ./addons/twofactor/static/ +COPY ./addons/wiki/static/ ./addons/wiki/static/ +COPY ./addons/zotero/static/ ./addons/zotero/static/ +COPY ./addons/swift/static/ ./addons/swift/static/ +COPY ./addons/azureblobstorage/static/ ./addons/azureblobstorage/static/ +COPY ./addons/weko/static/ ./addons/weko/static/ +COPY ./addons/jupyterhub/static/ ./addons/jupyterhub/static/ +COPY ./addons/s3compat/static/ ./addons/s3compat/static/ +COPY ./addons/nextcloud/static/ ./addons/nextcloud/static/ +COPY ./addons/nextcloudinstitutions/static/ ./addons/nextcloudinstitutions/static/ +COPY ./addons/iqbrims/static/ ./addons/iqbrims/static/ +COPY ./addons/myskelton/static/ ./addons/myskelton/static/ +RUN \ + # OSF + yarn install --frozen-lockfile \ + && mkdir -p ./website/static/built/ \ + && invoke build_js_config_files \ + && yarn run webpack-prod \ + # Admin + && cd ./admin \ + && yarn install --frozen-lockfile \ + && yarn run webpack-prod \ + && cd ../ \ + # Cleanup + && yarn cache clean \ + && npm cache clean --force + +# Copy the rest of the code over +COPY ./ ./ + +ARG GIT_COMMIT= +ENV GIT_COMMIT ${GIT_COMMIT} + +RUN pybabel compile -d ./website/translations +RUN pybabel compile -D django -d ./admin/translations + +# TODO: Admin/API should fully specify their bower static deps, and not include ./website/static in their defaults.py. +# (this adds an additional 300+mb to the build image) +RUN for module in \ + api.base.settings \ + admin.base.settings \ + ; do \ + export DJANGO_SETTINGS_MODULE=$module \ + && python3 manage.py collectstatic --noinput --no-init-app \ + ; done \ + && for file in \ + ./website/templates/_log_templates.mako \ + ./website/static/built/nodeCategories.json \ + ; do \ + touch $file && chmod o+w $file \ + ; done \ + && rm ./website/settings/local.py ./api/base/settings/local.py + +CMD ["su-exec", "nobody", "invoke", "--list"] diff --git a/site/guides/skeleton/config/addons.json b/site/guides/skeleton/config/addons.json new file mode 100644 index 0000000..c51476c --- /dev/null +++ b/site/guides/skeleton/config/addons.json @@ -0,0 +1,144 @@ +{ + "addons": [ + "box", + "dataverse", + "dropbox", + "figshare", + "forward", + "github", + "gitlab", + "mendeley", + "zotero", + "osfstorage", + "owncloud", + "onedrive", + "s3", + "twofactor", + "wiki", + "googledrive", + "bitbucket", + "swift", + "azureblobstorage", + "weko", + "jupyterhub", + "s3compat", + "nextcloud", + "nextcloudinstitutions", + "iqbrims", + "dropboxbusiness", + "myskelton" + ], + "addons_default": [ + "osfstorage", + "nextcloudinstitutions", + "dropboxbusiness" + ], + "addons_archivable": { + "osfstorage": "full", + "box": "partial", + "dataverse": "partial", + "dropbox": "partial", + "figshare": "partial", + "forward": "full", + "googledrive": "partial", + "onedrive": "partial", + "github": "partial", + "gitlab": "partial", + "owncloud": "partial", + "s3": "partial", + "wiki": "full", + "bitbucket": "partial", + "swift": "partial", + "azureblobstorage": "partial", + "weko": "partial", + "s3compat": "partial", + "nextcloud": "partial", + "nextcloudinstitutions": "partial", + "iqbrims": "partial", + "dropboxbusiness": "partial" + }, + "addons_commentable": [ + "osfstorage", + "box", + "dataverse", + "dropbox", + "figshare", + "github", + "gitlab", + "googledrive", + "owncloud", + "s3", + "bitbucket", + "onedrive", + "swift", + "swift", + "azureblobstorage", + "weko", + "s3compat", + "nextcloud", + "nextcloudinstitutions", + "iqbrims", + "dropboxbusiness" + ], + "addons_based_on_ids": [ + "osfstorage", + "box", + "onedrive" + ], + "addons_oauth_no_redirect": [ + "bitbucket" + ], + "addons_description": { + "box": "Box is a file storage add-on. Connect your Box account to a GakuNin RDM project to interact with files hosted on Box via the GakuNin RDM.", + "dataverse": "Dataverse is an open source software application to share, cite, and archive data. Connect your Dataverse account to share your Dataverse datasets via the GakuNin RDM.", + "dropbox": "Dropbox is a file storage add-on. Connect your Dropbox account to a GakuNin RDM project to interact with files hosted on Dropbox via the GakuNin RDM.", + "figshare": "Figshare is an online digital repository. Connect your figshare account to share your figshare files along with other materials in your GakuNin RDM project.", + "forward": "The External Link add-on allows you to provide a link to a website outside of the GakuNin RDM.", + "github": "GitHub is a web-based Git repository hosting service. Connect your GitHub repo to your GakuNin RDM project to share your code alongside other materials in your GakuNin RDM project.", + "gitlab": "GitLab is an open-source web-based Git repository hosting tool and service. Connect your GitLab repo to your GakuNin RDM project to share your code alongside other materials in your GakuNin RDM project.", + "mendeley": "Mendeley is a reference management tool. Connecting Mendeley folders to GakuNin RDM projects allows you and others to view, copy, and download citations that are relevant to your project from the Project Overview page.", + "zotero": "Zotero is a reference management tool. Connecting Zotero folders to GakuNin RDM projects allows you and others to view, copy, and download citations that are relevant to your project from the Project Overview page.", + "osfstorage": "NII Storage is the default storage provider for GakuNin RDM projects.", + "owncloud": "ownCloud is an open source, self-hosted file sync and share app platform. Connect your ownCloud account to a GakuNin RDM project to interact with files hosted on ownCloud via the GakuNin RDM.", + "s3": "Amazon S3 is a file storage add-on. Connect your S3 account to a GakuNin RDM project to interact with files hosted on S3 via the GakuNin RDM.", + "twofactor": "Two-factor authentication is a security add-on. By using two-factor authentication, you'll protect your GakuNin RDM account with both your password and your mobile phone.", + "wiki": "The wiki is a versatile communication tool. Wikis can be used to explain the main points of your project and can contain information like lab notes or contact information.", + "googledrive": "Google Drive is a file storage add-on. Connect your Google Drive account to a GakuNin RDM project to interact with files hosted on Google Drive via the GakuNin RDM.", + "bitbucket": "Bitbucket is a web-based Git repository hosting service. Connect your Bitbucket repo to your GakuNin RDM project to share your code alongside other materials in your GakuNin RDM project.", + "onedrive": "Microsoft OneDrive is a file storage add-on. Connect your Microsoft OneDrive account to a GakuNin RDM project to interact with files hosted on Microsoft OneDrive via the GakuNin RDM.", + "swift": "OpenStack Swift is a file storage add-on. Connect your OpenStack Swift account to a GakuNin RDM project to interact with files hosted on OpenStack Swift via the GakuNin RDM.", + "azureblobstorage": "Azure Blob Storage is a file storage add-on. Connect your Azure Storage account to a GakuNin RDM project to interact with files hosted on Azure Blob Storage (Block Blob) via the GakuNin RDM.", + "weko": "WEKO is an application server to share, archive data.", + "jupyterhub": "Jupyter is a web-based interactive computational environment. Files on a GakuNin RDM project can be imported to/exported from Jupyter", + "s3compat": "S3 Compatible Storage is a file storage add-on. Connect your S3 Compatible Storage account to a GakuNin RDM project to interact with files hosted on S3 Compatible Storage via the GakuNin RDM.", + "nextcloud": "Nextcloud is an open source, self-hosted file sync and share app platform. Connect your Nextcloud account to a GakuNin RDM project to interact with files hosted on Nextcloud via the GakuNin RDM.", + "iqbrims": "IQB-RIMS is a file storage add-on. Connect your Google Drive account to a GakuNin RDM project to interact with files hosted on Google Drive via the GakuNin RDM.", + "nextcloudinstitutions": "Nextcloud for Institutions is a file storage add-on for Institutions. Connect your Nextcloud account to a GakuNin RDM project to interact with files hosted on Nextcloud via the GakuNin RDM.", + "dropboxbusiness": "Dropbox Business for Institutions is a file storage add-on for Institutions. Connect your Dropbox Business administrator account to a GakuNin RDM project to interact with files hosted on Dropbox via the GakuNin RDM.", + "myskelton": "My Skelton Addon is ..." + }, + "addons_url": { + "box": "http://www.box.com", + "dataverse": "https://dataverse.harvard.edu/", + "dropbox": "http://www.dropbox.com", + "figshare": "http://www.figshare.com", + "github": "http://www.github.com", + "gitlab": "https://www.gitlab.com", + "mendeley": "http://www.mendeley.com", + "owncloud": "https://owncloud.org/", + "zotero": "http://www.zotero.org", + "s3": "https://aws.amazon.com/s3/", + "googledrive": "https://drive.google.com", + "bitbucket": "https://bitbucket.org/", + "onedrive": "https://onedrive.live.com", + "swift": "https://wiki.openstack.org/wiki/Swift", + "azureblobstorage": "https://azure.microsoft.com/", + "weko": "https://weko.at.nii.ac.jp/", + "jupyterhub": "https://jupyterhub.readthedocs.io/", + "s3compat": "https://aws.amazon.com/s3/", + "nextcloud": "https://nextcloud.com/", + "iqbrims": "https://drive.google.com", + "dropboxbusiness": "http://www.dropbox.com", + "myskelton": "https://dummy.nii.ac.jp/myskelton" + } +} diff --git a/site/guides/skeleton/config/api/base/settings/defaults.py b/site/guides/skeleton/config/api/base/settings/defaults.py new file mode 100644 index 0000000..d5747b7 --- /dev/null +++ b/site/guides/skeleton/config/api/base/settings/defaults.py @@ -0,0 +1,493 @@ +""" +Django settings for api project. + +Generated by 'django-admin startproject' using Django 1.8. + +For more information on this file, see +https://docs.djangoproject.com/en/1.8/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.8/ref/settings/ +""" + +import os +from future.moves.urllib.parse import urlparse +from website import settings as osf_settings + +BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/ + +DATABASES = { + 'default': { + 'CONN_MAX_AGE': 0, + 'ENGINE': 'osf.db.backends.postgresql', # django.db.backends.postgresql + 'NAME': os.environ.get('OSF_DB_NAME', 'osf'), + 'USER': os.environ.get('OSF_DB_USER', 'postgres'), + 'PASSWORD': os.environ.get('OSF_DB_PASSWORD', ''), + 'HOST': os.environ.get('OSF_DB_HOST', '127.0.0.1'), + 'PORT': os.environ.get('OSF_DB_PORT', '5432'), + 'ATOMIC_REQUESTS': True, + 'TEST': { + 'SERIALIZE': False, + }, + }, +} + +DATABASE_ROUTERS = ['osf.db.router.PostgreSQLFailoverRouter', ] +PASSWORD_HASHERS = [ + 'django.contrib.auth.hashers.BCryptSHA256PasswordHasher', + 'django.contrib.auth.hashers.BCryptPasswordHasher', +] + +AUTH_USER_MODEL = 'osf.OSFUser' + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = osf_settings.SECRET_KEY + +AUTHENTICATION_BACKENDS = ( + 'api.base.authentication.backends.ODMBackend', + 'guardian.backends.ObjectPermissionBackend', +) + +# SECURITY WARNING: don't run with debug turned on in production! +DEV_MODE = osf_settings.DEV_MODE +DEBUG = osf_settings.DEBUG_MODE +DEBUG_PROPAGATE_EXCEPTIONS = True + +# session: +SESSION_COOKIE_NAME = 'api' +SESSION_COOKIE_SECURE = osf_settings.SECURE_MODE +SESSION_COOKIE_HTTPONLY = osf_settings.SESSION_COOKIE_HTTPONLY +SESSION_COOKIE_SAMESITE = osf_settings.SESSION_COOKIE_SAMESITE + +# csrf: +CSRF_COOKIE_NAME = 'api-csrf' +CSRF_COOKIE_SECURE = osf_settings.SECURE_MODE +CSRF_COOKIE_HTTPONLY = osf_settings.SECURE_MODE + +ALLOWED_HOSTS = [ + '.osf.io', +] + + +# Application definition + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.messages', + 'django.contrib.sessions', + 'django.contrib.staticfiles', + 'django.contrib.admin', + + # 3rd party + 'django_celery_beat', + 'django_celery_results', + 'rest_framework', + 'corsheaders', + 'raven.contrib.django.raven_compat', + 'django_extensions', + 'guardian', + 'storages', + 'waffle', + 'elasticsearch_metrics', + + # OSF + 'osf', + + # Addons + 'addons.osfstorage', + 'addons.bitbucket', + 'addons.box', + 'addons.dataverse', + 'addons.dropbox', + 'addons.figshare', + 'addons.forward', + 'addons.github', + 'addons.gitlab', + 'addons.googledrive', + 'addons.mendeley', + 'addons.onedrive', + 'addons.owncloud', + 'addons.s3', + 'addons.twofactor', + 'addons.wiki', + 'addons.zotero', + 'addons.swift', + 'addons.azureblobstorage', + 'addons.weko', + 'addons.jupyterhub', + 'addons.iqbrims', + 'addons.dropboxbusiness', + 'addons.nextcloudinstitutions', + 'addons.myskelton', +) + +# local development using https +if osf_settings.SECURE_MODE and DEBUG: + INSTALLED_APPS += ('sslserver',) + +# TODO: Are there more granular ways to configure reporting specifically related to the API? +RAVEN_CONFIG = { + 'tags': {'App': 'api'}, + 'dsn': osf_settings.SENTRY_DSN, + 'release': osf_settings.VERSION, +} + +BULK_SETTINGS = { + 'DEFAULT_BULK_LIMIT': 100, +} + +MAX_PAGE_SIZE = 100 + +REST_FRAMEWORK = { + 'PAGE_SIZE': 10, + 'DEFAULT_RENDERER_CLASSES': ( + 'api.base.renderers.JSONAPIRenderer', + 'api.base.renderers.JSONRendererWithESISupport', + 'api.base.renderers.BrowsableAPIRendererNoForms', + ), + 'DEFAULT_PARSER_CLASSES': ( + 'api.base.parsers.JSONAPIParser', + 'api.base.parsers.JSONAPIParserForRegularJSON', + 'rest_framework.parsers.FormParser', + 'rest_framework.parsers.MultiPartParser', + ), + 'EXCEPTION_HANDLER': 'api.base.exceptions.json_api_exception_handler', + 'DEFAULT_CONTENT_NEGOTIATION_CLASS': 'api.base.content_negotiation.JSONAPIContentNegotiation', + 'DEFAULT_VERSIONING_CLASS': 'api.base.versioning.BaseVersioning', + 'DEFAULT_VERSION': '2.0', + 'ALLOWED_VERSIONS': ( + '2.0', + '2.1', + '2.2', + '2.3', + '2.4', + '2.5', + '2.6', + '2.7', + '2.8', + '2.9', + '2.10', + '2.11', + '2.12', + '2.13', + '2.14', + '2.15', + '2.16', + '2.17', + '2.18', + '2.19', + '2.20', + ), + 'DEFAULT_FILTER_BACKENDS': ('api.base.filters.OSFOrderingFilter',), + 'DEFAULT_PAGINATION_CLASS': 'api.base.pagination.JSONAPIPagination', + 'ORDERING_PARAM': 'sort', + 'DEFAULT_AUTHENTICATION_CLASSES': ( + # Custom auth classes + 'api.base.authentication.drf.OSFBasicAuthentication', + 'api.base.authentication.drf.OSFSessionAuthentication', + 'api.base.authentication.drf.OSFCASAuthentication', + ), + 'DEFAULT_THROTTLE_CLASSES': ( + 'rest_framework.throttling.UserRateThrottle', + 'api.base.throttling.NonCookieAuthThrottle', + 'api.base.throttling.BurstRateThrottle', + ), + 'DEFAULT_THROTTLE_RATES': { + 'user': '10000/day', + 'non-cookie-auth': '100/hour', + 'add-contributor': '10/second', + 'create-guid': '1000/hour', + 'root-anon-throttle': '1000/hour', + 'test-user': '2/hour', + 'test-anon': '1/hour', + 'send-email': '2/minute', + 'burst': '10/second', + }, +} + +# Settings related to CORS Headers addon: allow API to receive authenticated requests from OSF +# CORS plugin only matches based on "netloc" part of URL, so as workaround we add that to the list +CORS_ORIGIN_ALLOW_ALL = False +CORS_ORIGIN_WHITELIST = ( + urlparse(osf_settings.DOMAIN).netloc, + osf_settings.DOMAIN, +) +# This needs to remain True to allow cross origin requests that are in CORS_ORIGIN_WHITELIST to +# use cookies. +CORS_ALLOW_CREDENTIALS = True +# Set dynamically on app init +ORIGINS_WHITELIST = () + +MIDDLEWARE = ( + 'api.base.middleware.DjangoGlobalMiddleware', + 'api.base.middleware.CeleryTaskMiddleware', + 'api.base.middleware.PostcommitTaskMiddleware', + # A profiling middleware. ONLY FOR DEV USE + # Uncomment and add "prof" to url params to recieve a profile for that url + # 'api.base.middleware.ProfileMiddleware', + + # 'django.contrib.sessions.middleware.SessionMiddleware', + 'api.base.middleware.CorsMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + # 'django.contrib.auth.middleware.AuthenticationMiddleware', + # 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', + # 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'django.middleware.security.SecurityMiddleware', + # 'waffle.middleware.WaffleMiddleware', + 'api.base.middleware.SloanOverrideWaffleMiddleware', # Delete this and uncomment WaffleMiddleware to revert Sloan +) + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [os.path.join(BASE_DIR, 'templates')], + 'APP_DIRS': True, + }, +] + + +ROOT_URLCONF = 'api.base.urls' +WSGI_APPLICATION = 'api.base.wsgi.application' + + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + +# https://django-storages.readthedocs.io/en/latest/backends/gcloud.html +if os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', False): + # Required to interact with Google Cloud Storage + DEFAULT_FILE_STORAGE = 'api.base.storage.RequestlessURLGoogleCloudStorage' + GS_BUCKET_NAME = os.environ.get('GS_BUCKET_NAME', 'cos-osf-stage-cdn-us') + GS_FILE_OVERWRITE = os.environ.get('GS_FILE_OVERWRITE', False) +elif osf_settings.DEV_MODE or osf_settings.DEBUG_MODE: + DEFAULT_FILE_STORAGE = 'api.base.storage.DevFileSystemStorage' + +# https://docs.djangoproject.com/en/1.8/howto/static-files/ + +STATIC_ROOT = os.path.join(BASE_DIR, 'static/vendor') + +API_BASE = 'v2/' +API_PRIVATE_BASE = '_/' +STATIC_URL = '/static/' + +NODE_CATEGORY_MAP = osf_settings.NODE_CATEGORY_MAP + +DEBUG_TRANSACTIONS = DEBUG + +JWT_SECRET = b'osf_api_cas_login_jwt_secret_32b' +JWE_SECRET = b'osf_api_cas_login_jwe_secret_32b' + +ENABLE_VARNISH = osf_settings.ENABLE_VARNISH +ENABLE_ESI = osf_settings.ENABLE_ESI +VARNISH_SERVERS = osf_settings.VARNISH_SERVERS +ESI_MEDIA_TYPES = osf_settings.ESI_MEDIA_TYPES + +ADDONS_FOLDER_CONFIGURABLE = ['box', 'dropbox', 's3', 'googledrive', 'figshare', 'owncloud', 'onedrive', 'swift', 'azureblobstorage', 'weko', 'iqbrims'] +ADDONS_OAUTH = ADDONS_FOLDER_CONFIGURABLE + ['dataverse', 'github', 'bitbucket', 'gitlab', 'mendeley', 'zotero', 'forward'] + +BYPASS_THROTTLE_TOKEN = 'test-token' + +OSF_SHELL_USER_IMPORTS = None + +# Settings for use in the admin +OSF_URL = 'https://osf.io' + +SELECT_FOR_UPDATE_ENABLED = True + +# Disable anonymous user permissions in django-guardian +ANONYMOUS_USER_NAME = None + +# If set to True, automated tests with extra queries will fail. +NPLUSONE_RAISE = False + +# Timestamp - number of requests to send to cloud storages per minute +TS_REQUESTS_PER_MIN = 30 + +# salt used for generating hashids +HASHIDS_SALT = 'pinkhimalayan' + +# django-elasticsearch-metrics +ELASTICSEARCH_DSL = { + 'default': { + 'hosts': os.environ.get('ELASTIC6_URI', '127.0.0.1:9201'), + 'retry_on_timeout': True, + }, +} +# Store yearly indices for time-series metrics +ELASTICSEARCH_METRICS_DATE_FORMAT = '%Y' + +WAFFLE_CACHE_NAME = 'waffle_cache' +STORAGE_USAGE_CACHE_NAME = 'storage_usage' + + +CACHES = { + 'default': { + 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', + }, + STORAGE_USAGE_CACHE_NAME: { + 'BACKEND': 'django.core.cache.backends.db.DatabaseCache', + 'LOCATION': 'osf_cache_table', + }, + WAFFLE_CACHE_NAME: { + 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', + }, +} + +SLOAN_ID_COOKIE_NAME = 'sloan_id' + +EGAP_PROVIDER_NAME = 'EGAP' + +MAX_SIZE_OF_ES_QUERY = 10000 +DEFAULT_ES_NULL_VALUE = 'N/A' + +TRAVIS_ENV = False + +### NII extensions +LOGIN_BY_EPPN = osf_settings.to_bool('LOGIN_BY_EPPN', False) +USER_TIMEZONE = osf_settings.USER_TIMEZONE +USER_LOCALE = osf_settings.USER_LOCALE +CLOUD_GATEWAY_ISMEMBEROF_PREFIX = osf_settings.CLOUD_GATEWAY_ISMEMBEROF_PREFIX +# install-addons.py +INSTALLED_APPS += ('addons.s3compat',) +ADDONS_FOLDER_CONFIGURABLE.append('s3compat') +ADDONS_OAUTH.append('s3compat') +INSTALLED_APPS += ('addons.nextcloud',) +ADDONS_FOLDER_CONFIGURABLE.append('nextcloud') +ADDONS_OAUTH.append('nextcloud') + +TST_COMMAND_DELIMITER = ' ' +# RSA key generation settings +SSL_GENERATE_KEY = 'openssl' + TST_COMMAND_DELIMITER + \ + 'genrsa' + TST_COMMAND_DELIMITER + \ + '-des3' + TST_COMMAND_DELIMITER + \ + '-out' + TST_COMMAND_DELIMITER + \ + '{0}.key {1}' +SSL_GENERATE_KEY_NOPASS = 'openssl' + TST_COMMAND_DELIMITER + \ + 'rsa' + TST_COMMAND_DELIMITER + \ + '-in' + TST_COMMAND_DELIMITER + \ + '{0}.key' + TST_COMMAND_DELIMITER + \ + '-out' + TST_COMMAND_DELIMITER + \ + '{0}.key.nopass' +SSL_GENERATE_CSR = 'openssl' + TST_COMMAND_DELIMITER + \ + 'req' + TST_COMMAND_DELIMITER + \ + '-new' + TST_COMMAND_DELIMITER + \ + '-key' + TST_COMMAND_DELIMITER + \ + '{0}.key.nopass' + TST_COMMAND_DELIMITER + \ + '-out' + TST_COMMAND_DELIMITER + \ + '{0}.csr' +SSL_GENERATE_SELF_SIGNED = 'openssl' + TST_COMMAND_DELIMITER + \ + 'req' + TST_COMMAND_DELIMITER + \ + '-x509' + TST_COMMAND_DELIMITER + \ + '-nodes' + TST_COMMAND_DELIMITER + \ + '-days' + TST_COMMAND_DELIMITER + \ + '365' + TST_COMMAND_DELIMITER + \ + '-newkey' + TST_COMMAND_DELIMITER + \ + 'rsa:2048' + TST_COMMAND_DELIMITER + \ + '-keyout' + TST_COMMAND_DELIMITER + \ + '{0}.key' + TST_COMMAND_DELIMITER + \ + '-out' + TST_COMMAND_DELIMITER + \ + '{0}.crt' +SSL_PRIVATE_KEY_GENERATION = 'openssl' + TST_COMMAND_DELIMITER + \ + 'genrsa' + TST_COMMAND_DELIMITER + \ + '-out' + TST_COMMAND_DELIMITER + \ + '{0}' + TST_COMMAND_DELIMITER + \ + '{1}' +SSL_PUBLIC_KEY_GENERATION = 'openssl' + TST_COMMAND_DELIMITER + \ + 'rsa' + TST_COMMAND_DELIMITER + \ + '-in' + TST_COMMAND_DELIMITER + \ + '{0}' + TST_COMMAND_DELIMITER + \ + '-pubout' + TST_COMMAND_DELIMITER + \ + '-out' + TST_COMMAND_DELIMITER + \ + '{1}' + +# UserKey Placement destination +KEY_NAME_PRIVATE = 'pvt' +KEY_NAME_PUBLIC = 'pub' +KEY_BIT_VALUE = '3072' +KEY_EXTENSION = '.pem' +KEY_SAVE_PATH = '/user_key_info/' +KEY_NAME_FORMAT = '{0}_{1}_{2}{3}' +PRIVATE_KEY_VALUE = 1 +PUBLIC_KEY_VALUE = 2 +# FreeTSA openation commands +SSL_CREATE_TIMESTAMP_REQUEST = 'openssl' + TST_COMMAND_DELIMITER + \ + 'ts' + TST_COMMAND_DELIMITER + \ + '-query' + TST_COMMAND_DELIMITER + \ + '-data' + TST_COMMAND_DELIMITER + \ + '{0}' + TST_COMMAND_DELIMITER + \ + '-cert' + TST_COMMAND_DELIMITER + \ + '-sha512' +SSL_GET_TIMESTAMP_RESPONSE = 'openssl' + TST_COMMAND_DELIMITER + \ + 'ts' + TST_COMMAND_DELIMITER + \ + '-verify' + TST_COMMAND_DELIMITER + \ + '-data' + TST_COMMAND_DELIMITER + \ + '{0}' + TST_COMMAND_DELIMITER + \ + '-in' + TST_COMMAND_DELIMITER + \ + '{1}' + TST_COMMAND_DELIMITER + \ + '-CAfile' + TST_COMMAND_DELIMITER + \ + '{2}' + +SSL_CREATE_TIMESTAMP_HASH_REQUEST = 'openssl ts -query -digest {digest} {digest_type} -cert' +SSL_GET_TIMESTAMP_HASH_RESPONSE = 'openssl ts -verify {digest_type} -digest {digest} -in {input} -CAfile {ca}' + +# openssl ts verify check value +OPENSSL_VERIFY_RESULT_OK = 'OK' +# timestamp verify rootKey +VERIFY_ROOT_CERTIFICATE = 'root_cert_verifycate.pem' +# timestamp request const +REQUEST_HEADER = {'Content-Type': 'application/timestamp-query'} +TIME_STAMP_AUTHORITY_URL = 'http://eswg.jnsa.org/freetsa' +ERROR_HTTP_STATUS = [400, 401, 402, 403, 500, 502, 503, 504] +REQUEST_TIME_OUT = 5 +RETRY_COUNT = 3 + +# UPKI flag +USE_UPKI = False + +#uPKI operation commands +UPKI_TIMESTAMP_URL = '' +UPKI_CREATE_TIMESTAMP = '' # {0}=target, {1}=out +UPKI_VERIFY_TIMESTAMP = '' # {0}=target, {1}=in +UPKI_CREATE_TIMESTAMP_HASH = '' # {digest_type}, {digest}, {output} +UPKI_VERIFY_TIMESTAMP_HASH = '' # {digest}, {input} +UPKI_VERIFY_INVALID_MSG = 'LPC_ERR_VERIFY_INVALID' + +# TimeStamp Inspection Status +TIME_STAMP_TOKEN_UNCHECKED = 0 +TIME_STAMP_TOKEN_CHECK_SUCCESS = 1 +TIME_STAMP_TOKEN_CHECK_SUCCESS_MSG = 'OK' +TIME_STAMP_TOKEN_CHECK_NG = 2 +TIME_STAMP_TOKEN_CHECK_NG_MSG = 'Fail: file modified.' +TIME_STAMP_TOKEN_CHECK_FILE_NOT_FOUND = 3 +TIME_STAMP_TOKEN_CHECK_FILE_NOT_FOUND_MSG = 'Fail: not inspected.' +TIME_STAMP_TOKEN_NO_DATA = 4 +TIME_STAMP_TOKEN_NO_DATA_MSG = 'Error: some errors has occurred in processing.' +FILE_NOT_EXISTS = 5 +FILE_NOT_EXISTS_MSG = 'Fail: deleted file.' +FILE_NOT_FOUND = 6 +FILE_NOT_FOUND_MSG = 'Fail: file was gone.' +TIME_STAMP_VERIFICATION_ERR = 7 +TIME_STAMP_VERIFICATION_ERR_MSG = 'Error: some errors has occurred in verification.' +TIME_STAMP_STORAGE_DISCONNECTED = 8 +TIME_STAMP_STORAGE_DISCONNECTED_MSG = 'Error: storage disconnected.' +TIME_STAMP_STORAGE_NOT_ACCESSIBLE = 9 +TIME_STAMP_STORAGE_NOT_ACCESSIBLE_MSG = 'Error: storage service connection error occurred.' + +# Quota settings +DEFAULT_MAX_QUOTA = 100 +WARNING_THRESHOLD = 0.9 +BASE_FOR_METRIC_PREFIX = 1000 +SIZE_UNIT_GB = BASE_FOR_METRIC_PREFIX ** 3 +NII_STORAGE_REGION_ID = 1 diff --git a/site/guides/skeleton/config/framework/addons/data/addons.json b/site/guides/skeleton/config/framework/addons/data/addons.json new file mode 100644 index 0000000..caa309c --- /dev/null +++ b/site/guides/skeleton/config/framework/addons/data/addons.json @@ -0,0 +1,628 @@ +{ + "addons": { + "GitHub": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making a GitHub repo public or private. The GakuNin RDM does not alter the permissions of linked GitHub repos." + }, + "View / download file versions": { + "status": "full", + "text": "GitHub files and their versions can be viewed/downloaded via GakuNin RDM." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in GitHub." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in GitHub." + }, + "Logs": { + "status": "full", + "text": "GitHub dynamically updates GakuNin RDM logs when files are modified outside the GakuNin RDM. Changes to GitHub repos made before the repo is linked to the GakuNin RDM will not be reflected in GakuNin RDM logs." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Github authorization unless the user forking the project is the same user who authorized the Github add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "GitHub content will be registered, but version history will not be copied to the registration." + } + }, + "GitLab": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making a GitLab repo public or private. The GakuNin RDM does not alter the permissions of linked GitLab repos." + }, + "View / download file versions": { + "status": "full", + "text": "GitLab files and their versions can be viewed/downloaded via GakuNin RDM." + }, + "Add / update files": { + "status": "none", + "text": "Adding/updating files in the project via GakuNin RDM is not implemented yet." + }, + "Delete files": { + "status": "none", + "text": "Deleting files via GakuNin RDM is not implemented yet." + }, + "Logs": { + "status": "none", + "text": "GakuNin RDM does not keep track of changes made using Gitlab directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy GitLab authorization unless the user forking the project is the same user who authorized the GitLab add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "GitLab content will be registered, but version history will not be copied to the registration." + } + }, + "Amazon S3": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making an S3 bucket public or private. The GakuNin RDM does not alter the permissions of linked S3 buckets." + }, + "View / download file versions": { + "status": "partial", + "text": "The S3 add-on supports file versions if versioning is enabled for your S3 buckets." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Amazon S3." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Amazon S3." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your S3 buckets through the GakuNin RDM, but not for changes made using S3 directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy S3 authorization unless the user forking the project is the same user who authorized the S3 add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "S3 content will be registered, but version history will not be copied to the registration." + } + }, + "figshare": { + "Permissions": { + "status": "partial", + "text": " Making a GakuNin RDM project public or private is independent of making figshare content public or private. The GakuNin RDM does not alter the permissions of linked figshare content." + }, + "View / download file versions": { + "status": "partial", + "text": "figshare files can be viewed/downloaded via GakuNin RDM, but version history is not supported." + }, + "Add / update files": { + "status": "partial", + "text": "Files can be added but not updated." + }, + "Delete files": { + "status": "partial", + "text": "Private files and filesets can be deleted via GakuNin RDM." + }, + "Logs": { + "status": "partial", + "text": "GakuNin RDM keeps track of changes you make to your figshare content through GakuNin RDM, but not for changes made using figshare directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy figshare authorization unless the user forking the project is the same user who authorized the figshare add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "figshare content will be registered, but version history will not be copied to the registration." + } + }, + "Dropbox": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of Dropbox privacy. The GakuNin RDM does not alter the permissions of linked Dropbox folders." + }, + "View / download file versions": { + "status": "full", + "text": "Dropbox files and their versions can be viewed/downloaded via GakuNin RDM." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Dropbox." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Dropbox." + }, + "Logs": { + "status": "partial", + "text": "GakuNin RDM keeps track of changes you make to your Dropbox content through GakuNin RDM, but not for changes made using Dropbox directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Dropbox authorization unless the user forking the project is the same user who authorized the Dropbox add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "Dropbox content will be registered, but version history will not be copied to the registration." + } + }, + "OneDrive": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of OneDrive privacy. The GakuNin RDM does not alter the permissions of linked OneDrive folders." + }, + "View / download file versions": { + "status": "full", + "text": "OneDrive files and their versions can be viewed/downloaded via GakuNin RDM. OneNote files are unexportable and cannot be downloaded or viewed." + }, + "Add / update files": { + "status": "none", + "text": "The OneDrive add-on is read-only." + }, + "Delete files": { + "status": "none", + "text": "The OneDrive add-on is read-only." + }, + "Logs": { + "status": "partial", + "text": "GakuNin RDM keeps track of changes you make to your OneDrive add-on configuration. It does not track changes to OneDrive content." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy OneDrive authorization unless the user forking the project is the same user who authorized the OneDrive add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "OneDrive content will be registered, but version history will not be copied to the registration. OneNote files are unexportable and will not be archived." + } + }, + "Dataverse": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making a Dataverse study public or private. The GakuNin RDM allows you to release the latest draft version of a Dataverse dataset." + }, + "View / download file versions": { + "status": "partial", + "text": "Files from the latest release of the selected Dataverse study can be viewed/downloaded. GakuNin RDM users with write permissions can view/download draft files as well." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Dataverse." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Dataverse." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your Dataverse studies through the GakuNin RDM, but not for changes made using Dataverse directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Dataverse authorization unless the user forking the project is the same user who authorized the Dataverse add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "Dataverse content will be registered, but version history will not be copied to the registration." + } + }, + "Google Drive": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of Google Drive privacy. The GakuNin RDM does not alter the permissions of linked Google Drive folders." + }, + "View / download file versions": { + "status": "full", + "text": "Google Drive files and their versions can be viewed/downloaded via GakuNin RDM." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Google Drive." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Google Drive." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your Google Drive content through the GakuNin RDM, but not for changes made using Google Drive directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Google Drive authorization unless the user forking the project is the same user who authorized the Google Drive add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "Google Drive content will be registered, but version history will not be copied to the registration." + } + }, + "Box": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of Box privacy. The GakuNin RDM does not alter the permissions of linked Box folders." + }, + "View / download file versions": { + "status": "full", + "text": "Box files and their versions can be viewed/downloaded via GakuNin RDM." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Box." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Box." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your Box content through the GakuNin RDM, but not for changes made using Box directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Box authorization unless the user forking the project is the same user who authorized the Box add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "Box content will be registered, but version history will not be copied to the registration." + } + }, + "Mendeley": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making a Mendeley folder public or private. The GakuNin RDM does not alter the permissions of a linked Mendeley folder." + }, + "View / download file versions": { + "status": "NA" + }, + "Add / update files": { + "status": "NA" + }, + "Delete files": { + "status": "NA" + }, + "Logs": { + "status": "NA" + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Mendeley authorization unless the user forking the project is the same user who authorized the Mendeley add-on in the source project being forked." + }, + "Registering": { + "status": "none", + "text": "Mendeley content will not be registered." + } + }, + "ownCloud": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of ownCloud privacy. The GakuNin RDM does not alter the permissions of linked ownCloud folders." + }, + "View / download file versions": { + "status": "partial", + "text": "ownCloud files can be viewed/downloaded via GakuNin RDM, but version history is not supported by the ownCloud WebDAV API." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in ownCloud." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in ownCloud." + }, + "Logs": { + "status": "partial", + "text": "GakuNin RDM keeps track of changes you make to your ownCloud content through GakuNin RDM, but not for changes made using ownCloud directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy ownCloud authorization unless the user forking the project is the same user who authorized the ownCloud add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "ownCloud content will be registered, but version history will not be copied to the registration." + } + }, + "Zotero": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making a Zotero folder public or private. The GakuNin RDM does not alter the permissions of a linked Zotero folder." + }, + "View / download file versions": { + "status": "NA" + }, + "Add / update files": { + "status": "NA" + }, + "Delete files": { + "status": "NA" + }, + "Logs": { + "status": "NA" + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Zotero authorization unless the user forking the project is the same user who authorized the Zotero add-on in the source project being forked." + }, + "Registering": { + "status": "none", + "text": "Zotero content will not be registered." + } + }, + "Bitbucket": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making a Bitbucket repo public or private. The GakuNin RDM does not alter the permissions of linked Bitbucket repos." + }, + "View / download file versions": { + "status": "full", + "text": "Bitbucket files and their versions can be viewed/downloaded via GakuNin RDM." + }, + "Add / update files": { + "status": "none", + "text": "Bitbucket does not support adding or updating files via their API." + }, + "Delete files": { + "status": "none", + "text": "Bitbucket does not support deleting files via their API." + }, + "Logs": { + "status": "full", + "text": "GakuNin RDM keeps track of changes you make to your Bitbucket content through GakuNin RDM, but not for changes made using Bitbucket directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Bitbucket authorization unless the user forking the project is the same user who authorized the Bitbucket add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "Bitbucket content will be registered, but version history will not be copied to the registration." + } + }, + "OpenStack Swift": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making an Swift container public or private." + }, + "View / download file versions": { + "status": "partial", + "text": "The Swift add-on does not support file versions." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Swift." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Swift." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your Swift containers through the GakuNin RDM, but not for changes made using Swift directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Swift authorization unless the user forking the project is the same user who authorized the Swift add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "Swift object will be registered, but version history will not be copied to the registration." + } + }, + "Azure Blob Storage": { + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making an Azure Blob Storage container public or private." + }, + "View / download file versions": { + "status": "partial", + "text": "The Azure Blob Storage add-on supports only Block Blobs, and does not support file versions." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Azure Blob Storage." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Azure Blob Storage." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your Azure Blob Storage containers through the GakuNin RDM, but not for changes made using Azure Blob Storage directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Azure Blob Storage authorization unless the user forking the project is the same user who authorized the Azure Blob Storage add-on in the source project being forked." + }, + "Registering": { + "status": "none", + "text": "Azure Blob Storage content will not be registered." + } + }, + "WEKO": { + "Permissions": { + "status": "NA" + }, + "View / download file versions": { + "status": "NA" + }, + "Add / update files": { + "status": "partial", + "text": "Adding/updating indices/items in the project via GakuNin RDM will be reflected in WEKO." + }, + "Delete files": { + "status": "partial", + "text": "Items deleted via GakuNin RDM will be deleted in WEKO." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your WEKO index through the GakuNin RDM, but not for changes made using WEKO directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy WEKO authorization unless the user forking the project is the same user who authorized the WEKO add-on in the source project being forked." + }, + "Registering": { + "status": "none", + "text": "WEKO content will not be registered." + } + }, + "S3 Compatible Storage": { + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy S3 Compatible Storage authorization unless the user forking the project is the same user who authorized the S3 Compatible Storage add-on in the source project being forked." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your S3 Compatible Storage buckets through the GakuNin RDM, but not for changes made using S3 Compatible Storage directly." + }, + "Registering": { + "status": "partial", + "text": "S3 Compatible Storage content will be registered, but version history will not be copied to the registration." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in S3 Compatible Storage." + }, + "View / download file versions": { + "status": "partial", + "text": "The S3 add-on supports file versions if versioning is enabled for your S3 Compatible Storage buckets." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in S3 Compatible Storage." + }, + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of making an S3 Compatible Storage bucket public or private. The GakuNin RDM does not alter the permissions of linked S3 Compatible Storage buckets." + } + }, + "JupyterHub": { + "Permissions": { + "status": "none", + "text": "The GakuNin RDM does not affect the permissions of JupyterHub." + }, + "View / download file versions": { + "status": "none", + "text": "The JupyterHub add-on does not provide Storage Features." + }, + "Add / update files": { + "status": "none", + "text": "The JupyterHub add-on does not provide Storage Features." + }, + "Delete files": { + "status": "none", + "text": "The JupyterHub add-on does not provide Storage Features." + }, + "Logs": { + "status": "none", + "text": "The JupyterHub add-on does not provide Storage Features." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component copies information about linked JupyterHub but the GakuNin RDM does not affect authentication of JupyterHub." + }, + "Registering": { + "status": "none", + "text": "JupyterHub information will not be registered." + } + }, + "Nextcloud": { + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Nextcloud authorization unless the user forking the project is the same user who authorized the Nextcloud add-on in the source project being forked." + }, + "Logs": { + "status": "partial", + "text": "GakuNin RDM keeps track of changes you make to your Nextcloud content through GakuNin RDM, but not for changes made using Nextcloud directly." + }, + "Registering": { + "status": "partial", + "text": "Nextcloud content will be registered, but version history will not be copied to the registration." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Nextcloud." + }, + "View / download file versions": { + "status": "partial", + "text": "Nextcloud files can be viewed/downloaded via GakuNin RDM, but version history is not supported by the Nextcloud WebDAV API." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Nextcloud." + }, + "Permissions": { + "status": "partial", + "text": "Making a GakuNin RDM project public or private is independent of Nextcloud privacy. The GakuNin RDM does not alter the permissions of linked Nextcloud folders." + } + }, + "IQB-RIMS": { + "Permissions": { + "status": "partial", + "text": "Making an GakuNin RDM project public or private is independent of Google Drive privacy. The GakuNin RDM does not alter the permissions of linked Google Drive folders." + }, + "View / download file versions": { + "status": "full", + "text": "IQB-RIMS files and their versions can be viewed/downloaded via GakuNin RDM." + }, + "Add / update files": { + "status": "full", + "text": "Adding/updating files in the project via GakuNin RDM will be reflected in Google Drive." + }, + "Delete files": { + "status": "full", + "text": "Files deleted via GakuNin RDM will be deleted in Google Drive." + }, + "Logs": { + "status": "partial", + "text": "The GakuNin RDM keeps track of changes you make to your Google Drive content through the GakuNin RDM, but not for changes made using Google Drive directly." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component does not copy Google Drive authorization unless the user forking the project is the same user who authorized the IQB-RIMS add-on in the source project being forked." + }, + "Registering": { + "status": "partial", + "text": "IQB-RIMS content will be registered, but version history will not be copied to the registration." + } + }, + "My Skelton": { + "Permissions": { + "status": "none", + "text": "The GakuNin RDM does not affect the permissions of My Skelton." + }, + "View / download file versions": { + "status": "none", + "text": "The My Skelton add-on does not provide Storage Features." + }, + "Add / update files": { + "status": "none", + "text": "The My Skelton add-on does not provide Storage Features." + }, + "Delete files": { + "status": "none", + "text": "The My Skelton add-on does not provide Storage Features." + }, + "Logs": { + "status": "none", + "text": "The My Skelton add-on does not provide Storage Features." + }, + "Forking": { + "status": "partial", + "text": "Forking a project or component copies information about linked My Skelton but the GakuNin RDM does not affect authentication of My Skelton." + }, + "Registering": { + "status": "none", + "text": "My Skelton information will not be registered." + } + } + }, + "disclaimers": [ + "This add-on connects your GakuNin RDM project to an external service. Use of this service is bound by its terms and conditions. The GakuNin RDM is not responsible for the service or for your use thereof.", + "This add-on allows you to store files using an external service. Files added to this add-on are not stored within the GakuNin RDM." + ] +} diff --git a/site/guides/skeleton/config/website/translations/ja/LC_MESSAGES/js_messages.po b/site/guides/skeleton/config/website/translations/ja/LC_MESSAGES/js_messages.po new file mode 100644 index 0000000..96ca57d --- /dev/null +++ b/site/guides/skeleton/config/website/translations/ja/LC_MESSAGES/js_messages.po @@ -0,0 +1,8010 @@ +# Japanese translations for . +# Copyright (C) 2020 ORGANIZATION +# This file is distributed under the same license as the project. +# FIRST AUTHOR , 2020. +# +msgid "" +msgstr "" +"Project-Id-Version: 0.6.0\n" +"Report-Msgid-Bugs-To: rocs-office@nii.ac.jp\n" +"POT-Creation-Date: 2021-03-23 23:13+0000\n" +"PO-Revision-Date: 2020-11-23 09:30+0900\n" +"Last-Translator: Takuya Ishibashi\n" +"Language: ja\n" +"Language-Team: RCOS \n" +"Plural-Forms: nplurals=1; plural=0\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.5.1\n" + +#: addons/jupyterhub/static/files.js:93 +msgid "Launch" +msgstr "起動" + +#: addons/twofactor/static/twoFactorUserConfig.js:148 +#: addons/twofactor/static/twoFactorUserConfig.js:190 +#: admin/static/js/rdm_addons/rdm-addons-page.js:71 +#: website/static/js/accountSettings.js:286 +#: website/static/js/accountSettings.js:351 +#: website/static/js/accountSettings.js:477 +#: website/static/js/accountSettings.js:549 +#: website/static/js/addProjectPlugin.js:347 +#: website/static/js/addonPermissions.js:55 +#: website/static/js/addonSettings.js:71 website/static/js/addonSettings.js:134 +#: website/static/js/apiApplication.js:249 +#: website/static/js/apiApplication.js:420 +#: website/static/js/apiApplication.js:487 +#: website/static/js/apiPersonalToken.js:240 +#: website/static/js/apiPersonalToken.js:411 +#: website/static/js/apiPersonalToken.js:438 +#: website/static/js/citationsNodeConfig.js:169 +#: website/static/js/citationsNodeConfig.js:187 +#: website/static/js/contribManager.js:433 website/static/js/fangorn.js:546 +#: website/static/js/fangorn.js:551 website/static/js/fangorn.js:1215 +#: website/static/js/fangorn.js:1238 website/static/js/fangorn.js:1291 +#: website/static/js/fangorn.js:1310 website/static/js/fangorn.js:2028 +#: website/static/js/filepage/index.js:208 +#: website/static/js/folderPickerNodeConfig.js:510 +#: website/static/js/folderPickerNodeConfig.js:566 +#: website/static/js/institutionProjectSettings.js:102 +#: website/static/js/licensePicker.js:243 website/static/js/myProjects.js:1560 +#: website/static/js/myProjects.js:1608 website/static/js/myProjects.js:1632 +#: website/static/js/nodeControl.js:227 +#: website/static/js/oauthAddonNodeConfig.js:156 +#: website/static/js/oauthAddonNodeConfig.js:174 +#: website/static/js/osfHelpers.js:796 website/static/js/osfHelpers.js:897 +#: website/static/js/pages/profile-settings-addons-page.js:35 +#: website/static/js/pages/profile-settings-addons-page.js:101 +#: website/static/js/pages/project-addons-page.js:41 +#: website/static/js/pages/project-addons-page.js:66 +#: website/static/js/privateLinkTable.js:119 website/static/js/profile.js:373 +#: website/static/js/profile.js:743 website/static/js/profile.js:975 +#: website/static/js/project.js:39 website/static/js/project.js:143 +#: website/static/js/project.js:253 +#: website/static/js/wikiSettingsTreebeard.js:31 +msgid "Cancel" +msgstr "キャンセル" + +#: addons/twofactor/static/twoFactorUserConfig.js:178 +msgid "Enable Two-factor Authentication" +msgstr "2要素認証を有効にする" + +#: addons/twofactor/static/twoFactorUserConfig.js:179 +msgid "" +"Enabling two-factor authentication will not immediately activate this " +"feature for your account. You will need to follow the steps that appear " +"below to complete the activation of two-factor authentication for your " +"account." +msgstr "" +"2要素認証を有効にしても、アカウントのこの機能はすぐには有効になりません。 " +"アカウントの2要素認証のアクティベーションを完了するには、以下に表示される手順に従う必要があります。" + +#: addons/twofactor/static/twoFactorUserConfig.js:187 +msgid "Enable" +msgstr "有効にする" + +#: addons/wiki/static/WikiEditor.js:86 +msgid "Live editing mode" +msgstr "ライブ編集モード" + +#: addons/wiki/static/WikiEditor.js:88 +msgid "Attempting to connect" +msgstr "接続試行中" + +#: addons/wiki/static/WikiEditor.js:90 +msgid "Unsupported browser" +msgstr "サポートされていないブラウザ" + +#: addons/wiki/static/WikiEditor.js:92 +msgid "Unavailable: Live editing" +msgstr "利用不可:ライブ編集" + +#: addons/wiki/static/WikiEditor.js:153 +msgid "The wiki content could not be loaded." +msgstr "Wikiコンテンツをロードできませんでした。" + +#: addons/wiki/static/WikiEditor.js:155 +msgid "Could not GET wiki contents." +msgstr "Wikiコンテンツを取得できませんでした。" + +#: addons/wiki/static/WikiEditor.js:176 +msgid "There are unsaved changes to your wiki. If you exit " +msgstr "wikiに未保存の変更があります。" + +#: addons/wiki/static/WikiEditor.js:177 +msgid "the page now, those changes may be lost." +msgstr "ここでページを終了すると、これらの変更が失われる可能性があります。" + +#: addons/wiki/static/wikiPage.js:94 +#: website/static/js/pages/project-dashboard-page.js:733 +msgid "" +"*Add important information, links, or images here to describe your " +"project.*" +msgstr "*重要な情報、リンク、または画像をここに追加して、プロジェクトを説明してください。*" + +#: addons/wiki/static/wikiPage.js:96 +#: website/static/js/pages/project-dashboard-page.js:735 +msgid "*No wiki content.*" +msgstr "* Wikiコンテンツはありません。*" + +#: addons/wiki/static/wikiPage.js:220 +msgid "Live preview" +msgstr "ライブプレビュー" + +#: addons/wiki/static/wikiPage.js:222 +msgid "Current version" +msgstr "現在のバージョン" + +#: addons/wiki/static/wikiPage.js:224 +msgid "Previous version" +msgstr "前のバージョン" + +#: addons/wiki/static/wikiPage.js:226 +msgid "Version " +msgstr "バージョン" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:48 +msgid "Strong " +msgstr "強調構文 " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:51 +msgid "Emphasis " +msgstr "強調構文 " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:54 +msgid "Spellcheck: Toggle spellcheck on and off" +msgstr "スペルチェック:スペルチェックのオンとオフを切り替えます" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:56 +msgid "Hyperlink " +msgstr "ハイパーリンク " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:60 +msgid "Blockquote
                                                " +msgstr "引用構文
                                                " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:63 +msgid "Code Sample
                                                "
                                                +msgstr "コードサンプル 
                                                "
                                                +
                                                +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:66
                                                +msgid "Image "
                                                +msgstr "画像 "
                                                +
                                                +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:70
                                                +msgid "Numbered List 
                                                  " +msgstr "段落番号
                                                    " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:71 +msgid "Bulleted List
                                                      " +msgstr "箇条書き
                                                        " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:72 +msgid "List item" +msgstr "リストアイテム" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:74 +msgid "Heading

                                                        /

                                                        " +msgstr "見出し

                                                        /

                                                        " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:77 +msgid "Horizontal Rule
                                                        " +msgstr "水平の罫線
                                                        " + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:79 +msgid "Undo -" +msgstr "元に戻す -" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:80 +msgid "Redo -" +msgstr "やり直す -" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:82 +msgid "Wiki Syntax Help" +msgstr "Wiki構文のヘルプ" + +#: addons/wiki/static/pagedown-ace/Markdown.Editor.js:1939 +msgid "Autocomplete" +msgstr "自動更新" + +#: admin/static/js/collection_providers/collectionProviders.js:9 +msgid "Hide Form" +msgstr "フォームを隠す" + +#: admin/static/js/collection_providers/collectionProviders.js:9 +msgid "Modify Collection Provider" +msgstr "コレクションプロバイダを変更" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:64 +#, python-format +msgid "Disallow %s?" +msgstr "%sを禁止しますか?" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:65 +msgid "Are you sure you want to disallow the %1$s?
                                                        " +msgstr "%1$sを禁止してもよろしいですか?
                                                        " + +#: admin/static/js/rdm_addons/rdm-addons-page.js:66 +msgid "" +"This will revoke access to %1$s for all projects using the " +"accounts.

                                                        " +msgstr "これにより、アカウントを使用するすべてのプロジェクトの%1$sへのアクセスが取り消されます。

                                                        " + +#: admin/static/js/rdm_addons/rdm-addons-page.js:67 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:445 +msgid "Type the following to continue: %1$s

                                                        " +msgstr "次を入力して続行します。%1$s

                                                        " + +#: admin/static/js/rdm_addons/rdm-addons-page.js:74 +msgid "Disallow" +msgstr "禁止" + +#: admin/static/js/rdm_addons/rdm-addons-page.js:85 +msgid "Strings did not match" +msgstr "文字列が一致しませんでした" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:26 +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:19 +msgid "Other (Please Specify)" +msgstr "その他(具体的にご記入ください)" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:85 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:100 +#: website/static/js/addonSettings.js:171 +msgid "Error while updating addon account" +msgstr "アドオンアカウントの更新中にエラーが発生しました" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:100 +msgid "Please select a Dataverse repository." +msgstr "Dataverseリポジトリを選択してください。" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:105 +msgid "Please enter an API token." +msgstr "APIトークンを入力してください。" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:110 +msgid "Please enter a Dataverse host and an API token." +msgstr "DataverseホストとAPIトークンを入力してください。" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:131 +msgid "Could not authenticate with Dataverse" +msgstr "Dataverseで認証できませんでした" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:144 +msgid "Disconnect Dataverse Account?" +msgstr "Dataverseアカウントを切断しますか?" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:146 +msgid "" +"Are you sure you want to disconnect the Dataverse account on " +"%1$s? This will revoke access to Dataverse for all " +"projects associated with this account." +msgstr "" +"%1$sのDataverseアカウントを切断してもよろしいですか? " +"これにより、このアカウントに関連付けられているすべてのプロジェクトのDataverseへのアクセスが取り消されます。" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:155 +#: admin/static/js/rdm_addons/figshare/rdm-cfg.js:34 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:124 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:461 +#: website/static/js/addonSettings.js:130 +#: website/static/js/folderPickerNodeConfig.js:562 +msgid "Disconnect" +msgstr "切断" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:173 +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:142 +#: website/static/js/addonSettings.js:150 +msgid "Error while removing addon authorization for %1$s" +msgstr "%1$sのアドオン認証を削除中にエラーが発生しました" + +#: admin/static/js/rdm_addons/dataverse/dataverseRdmConfig.js:212 +msgid "Could not GET Dataverse settings" +msgstr "Dataverse設定を取得できませんでした" + +#: admin/static/js/rdm_addons/figshare/rdm-cfg.js:17 +msgid "Disconnect figshare Account?" +msgstr "figshareアカウントを切断しますか?" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:46 +msgid "Invalid management URL: " +msgstr "無効な管理URL:" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:61 +msgid "Saving management project was successful" +msgstr "管理プロジェクトの保存に成功しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:63 +msgid "Error while saving addon management project" +msgstr "アドオン管理プロジェクトの保存中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:71 +msgid "Permission error while saving management project" +msgstr "管理プロジェクトの保存中のアクセス許可エラー" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:73 +msgid "Error while saving management project" +msgstr "管理プロジェクトの保存中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:91 +msgid "Removing management project was successful" +msgstr "管理プロジェクトの削除に成功しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:93 +msgid "Error while removing addon management project" +msgstr "アドオン管理プロジェクトの削除中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:101 +msgid "Permission error while removing management project" +msgstr "管理プロジェクトの削除中に権限エラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:103 +msgid "Error while removing management project" +msgstr "管理プロジェクトの削除中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:118 +msgid "Error while fetching addon management project" +msgstr "アドオン管理プロジェクトの取得中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:149 +msgid "Saving organizational project was successful" +msgstr "組織プロジェクトの保存に成功しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:151 +msgid "Error while saving addon organizational project" +msgstr "アドオン組織プロジェクトの保存中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:159 +msgid "Permission error while saving organizational project" +msgstr "組織プロジェクトの保存中に権限エラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:161 +msgid "Error while saving organizational project" +msgstr "組織プロジェクトの保存中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:179 +msgid "Removing organizational project was successful" +msgstr "組織プロジェクトの削除に成功しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:181 +msgid "Error while removing addon organizational project" +msgstr "アドオン組織プロジェクトの削除中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:189 +msgid "Permission error while removing organizational project" +msgstr "組織プロジェクトの削除中に許可エラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:191 +msgid "Error while removing organizational project" +msgstr "組織プロジェクトの削除中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:206 +msgid "Error while fetching addon organization project" +msgstr "アドオン組織プロジェクトの取得中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:222 +msgid "Error while fetching management project" +msgstr "管理プロジェクトの取得中にエラーが発生しました" + +#: admin/static/js/rdm_addons/iqbrims/iqbrimsRdmConfig.js:226 +msgid "Error while fetching organizational project" +msgstr "組織プロジェクトの取得中にエラーが発生しました" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:58 +msgid "Could not GET OwnCloud settings" +msgstr "OwnCloud設定を取得できませんでした" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:75 +msgid "Please enter an ownCloud server." +msgstr "ownCloudサーバーを入力してください。" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:77 +msgid "Please select an ownCloud server." +msgstr "ownCloudサーバーを選択してください。" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:82 +msgid "Please enter a username and password." +msgstr "ユーザー名とパスワードを入力してください。" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:86 +msgid "Please enter an ownCloud host and credentials." +msgstr "ownCloudホストと認証情報を入力してください。" + +#: admin/static/js/rdm_addons/owncloud/owncloudRdmConfig.js:104 +msgid "Could not authenticate with ownCloud" +msgstr "ownCloudで認証できませんでした" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:48 +msgid "Please enter both an API access key and secret key." +msgstr "APIアクセスキーとシークレットキーの両方を入力してください。" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:53 +msgid "Please enter an API access key." +msgstr "APIアクセスキーを入力してください。" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:58 +msgid "Please enter an API secret key." +msgstr "APIシークレットキーを入力してください。" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:75 +msgid "Could not authenticate with S3" +msgstr "S3で認証できませんでした" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:113 +msgid "Disconnect Amazon S3 Account?" +msgstr "Amazon S3アカウントを切断しますか?" + +#: admin/static/js/rdm_addons/s3/s3RdmConfig.js:115 +msgid "" +"Are you sure you want to disconnect the S3 account %1$s?" +" This will revoke access to S3 for all projects associated with this " +"account." +msgstr "" +"S3アカウント%1$sを切断してもよろしいですか?これにより、このアカウントに関連付けられているすべてのプロジェクトのS3へのアクセスが取り消されます。" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:84 +msgid "Are you sure you want to change institutional storage?" +msgstr "機関のストレージを変更してもよろしいですか?" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:85 +msgid "" +"

                                                        The previous storage will no longer be available to all contributors " +"on the project.

                                                        " +msgstr "

                                                        以前のストレージは、プロジェクトのすべてのメンバーが利用できなくなります。

                                                        " + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:89 +#: website/static/js/folderPickerNodeConfig.js:100 +#: website/static/js/folderPickerNodeConfig.js:102 +#: website/static/js/folderPickerNodeConfig.js:594 +msgid "Change" +msgstr "変更" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:314 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:546 +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:681 +msgid "Some errors occurred" +msgstr "いくつかのエラーが発生しました" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:361 +msgid "Institutional Storage set successfully" +msgstr "機関ストレージが正常に設定されました" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:441 +#: website/static/js/addonSettings.js:118 +msgid "Disconnect Account?" +msgstr "アカウントを切断しますか?" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:443 +msgid "" +"Are you sure you want to disconnect the %1$s account " +"%2$s?
                                                        " +msgstr "1$sアカウント%2$sを切断してもよろしいですか?" + +#: admin/static/js/rdm_custom_storage_location/rdm-institutional-storage-page.js:444 +msgid "" +"This will revoke access to %1$s for all projects using this " +"account.

                                                        " +msgstr "これにより、このアカウントを使用するすべてのプロジェクトの%1$sへのアクセスが取り消されます。" + +#: scripts/translations/messages_addonsJson.js:3 +msgid "" +"\n" +"\n" +"

                                                        Box Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking a GakuNin RDM project public or private is " +"independent of Box privacy. The GakuNin RDM does not alter the " +"permissions of linked Box folders.
                                                        View / download file versionsBox files and their versions can be viewed/downloaded" +" via GakuNin RDM.
                                                        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Box.
                                                        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Box.
                                                        LogsThe GakuNin RDM keeps track of changes you make to " +"your Box content through the GakuNin RDM, but not for changes made using " +"Box directly.
                                                        ForkingForking a project or component does not copy Box " +"authorization unless the user forking the project is the same user who " +"authorized the Box add-on in the source project being forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        Box アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Boxのプライバシー設定とは独立しています。GakuNin " +"RDMはリンクされたBoxフォルダの権限を変更することはありません。
                                                        ファイルバージョンの閲覧/ダウンロードBoxファイルとそのバージョンはGakuNin RDM経由で閲覧/ダウンロードできます。
                                                        ファイルの追加/更新GakuNin RDM経由でプロジェクトのファイルを追加/更新すると、Boxにも反映されます。
                                                        ファイルの削除GakuNin RDM経由で削除したファイルは、Boxでも削除されます。
                                                        ログGakuNin RDM経由で行われたBoxコンテンツへの変更の履歴はGakuNin " +"RDMに記録されますが、直接Boxを使って行われた変更は記録されません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、Boxの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでBoxアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:5 +msgid "" +"\n" +"\n" +"

                                                        Dataverse Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Dataverse study public or private. The GakuNin " +"RDM allows you to release the latest draft version of a Dataverse " +"dataset.
                                                        View / download file versionsFiles from the latest release of the selected " +"Dataverse study can be viewed/downloaded. GakuNin RDM users with write " +"permissions can view/download draft files as well.
                                                        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Dataverse.
                                                        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Dataverse.
                                                        LogsThe GakuNin RDM keeps track of changes you make to " +"your Dataverse studies through the GakuNin RDM, but not for changes made " +"using Dataverse directly.
                                                        ForkingForking a project or component does not copy " +"Dataverse authorization unless the user forking the project is the same " +"user who authorized the Dataverse add-on in the source project being " +"forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        Dataverse アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Dataverse研究をパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMでは最新のドラフトバージョンのDataverseデータセットのリリースが行えます。
                                                        ファイルバージョンの閲覧/ダウンロード選択したDataverse研究の最新リリースのファイルを閲覧/ダウンロードできます。書き込み許可を持つGakuNin " +"RDMユーザーは、ドラフトファイルも閲覧/ダウンロードできます。
                                                        ファイルの追加/更新GakuNin " +"RDM経由でプロジェクトのファイルを追加/更新すると、Dataverseにも反映されます。
                                                        ファイルの削除GakuNin RDM経由で削除したファイルは、Dataverseでも削除されます。
                                                        ログGakuNin RDM経由で行われたDataverse研究への変更の履歴はGakuNin " +"RDMに記録されますが、直接Dataverseを使って行われた変更は記録されません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、Dataverseの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでDataverseアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:7 +msgid "" +"\n" +"\n" +"

                                                        Dropbox Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking a GakuNin RDM project public or private is " +"independent of Dropbox privacy. The GakuNin RDM does not alter the " +"permissions of linked Dropbox folders.
                                                        View / download file versionsDropbox files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                                        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Dropbox.
                                                        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Dropbox.
                                                        LogsGakuNin RDM keeps track of changes you make to your " +"Dropbox content through GakuNin RDM, but not for changes made using " +"Dropbox directly.
                                                        ForkingForking a project or component does not copy Dropbox " +"authorization unless the user forking the project is the same user who " +"authorized the Dropbox add-on in the source project being forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        Dropbox アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Dropboxのプライバシー設定とは独立しています。GakuNin " +"RDMはリンクされたDropboxフォルダの権限を変更することはありません。
                                                        ファイルバージョンの閲覧/ダウンロードDropboxファイルとそのバージョンはGakuNin RDM経由で閲覧/ダウンロードできます。
                                                        ファイルの追加/更新GakuNin " +"RDM経由でプロジェクトのファイルを追加/更新すると、Dropboxにも反映されます。
                                                        ファイルの削除GakuNin RDM経由で削除したファイルは、Dropboxでも削除されます。
                                                        ログGakuNin RDM経由で行われたDropboxコンテンツへの変更の履歴はGakuNin " +"RDMに記録されますが、直接Dropboxを使って行われた変更は記録されません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、Dropboxの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでDropboxアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:9 +msgid "" +"\n" +"\n" +"

                                                        figshare Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        Permissions Making a GakuNin RDM project public or private is " +"independent of making figshare content public or private. The GakuNin RDM" +" does not alter the permissions of linked figshare content.
                                                        View / download file versionsfigshare files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported.
                                                        Add / update filesFiles can be added but not updated.
                                                        Delete filesPrivate files and filesets can be deleted via GakuNin" +" RDM.
                                                        LogsGakuNin RDM keeps track of changes you make to your " +"figshare content through GakuNin RDM, but not for changes made using " +"figshare directly.
                                                        ForkingForking a project or component does not copy figshare" +" authorization unless the user forking the project is the same user who " +"authorized the figshare add-on in the source project being forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        figshare アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、figshareコンテンツをパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMはリンクされたfigshareコンテンツの権限を変更することはありません。
                                                        ファイルバージョンの閲覧/ダウンロードfigshareファイルはGakuNin " +"RDM経由で閲覧/ダウンロードできますが、バージョン履歴はサポートされていません。
                                                        ファイルの追加/更新ファイルの追加はできますが更新はできません。
                                                        ファイルの削除プライベートファイルとファイルセットはGakuNin RDM経由で削除できます。
                                                        ログGakuNin RDM経由で行われたfigshareコンテンツへの変更の履歴はGakuNin " +"RDMに記録されますが、直接figshareを使って行われた変更は記録されません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、figshareの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでfigshareアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:11 +msgid "" +"\n" +"\n" +"

                                                        GitHub Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a GitHub repo public or private. The GakuNin RDM " +"does not alter the permissions of linked GitHub repos.
                                                        View / download file versionsGitHub files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                                        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in GitHub.
                                                        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"GitHub.
                                                        LogsGitHub dynamically updates GakuNin RDM logs when " +"files are modified outside the GakuNin RDM. Changes to GitHub repos made " +"before the repo is linked to the GakuNin RDM will not be reflected in " +"GakuNin RDM logs.
                                                        ForkingForking a project or component does not copy Github " +"authorization unless the user forking the project is the same user who " +"authorized the Github add-on in the source project being forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        GitHub アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、GitHubリポジトリをパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMはリンクされたGitHubリポジトリの権限を変更することはありません。
                                                        ファイルバージョンの閲覧/ダウンロードGitHubファイルとそのバージョンはGakuNin RDM経由で閲覧/ダウンロードできます。
                                                        ファイルの追加/更新GakuNin " +"RDM経由でプロジェクトのファイルを追加/更新すると、GitHubにも反映されます。
                                                        ファイルの削除GakuNin RDM経由で削除したファイルは、GitHubでも削除されます。
                                                        ログGakuNin RDM外でファイルが変更された場合、GitHubは同時にGakuNin " +"RDMログを更新します。GakuNin RDMへリンクする以前にGitHubリポジトリに加えられた変更は、GakuNin " +"RDMログには反映されません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、Githubの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでGithubアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:13 +msgid "" +"\n" +"\n" +"

                                                        GitLab Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a GitLab repo public or private. The GakuNin RDM " +"does not alter the permissions of linked GitLab repos.
                                                        View / download file versionsGitLab files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                                        Add / update filesAdding/updating files in the project via GakuNin RDM " +"is not implemented yet.
                                                        Delete filesDeleting files via GakuNin RDM is not implemented " +"yet.
                                                        LogsGakuNin RDM does not keep track of changes made using" +" Gitlab directly.
                                                        ForkingForking a project or component does not copy GitLab " +"authorization unless the user forking the project is the same user who " +"authorized the GitLab add-on in the source project being forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        GitLab アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                                        規約ステータス
                                                        権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、GitLabリポジトリをパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMはリンクされたGitLabリポジトリの権限を変更することはありません。
                                                        ファイルバージョンの閲覧/ダウンロードGitLabファイルとそのバージョンはGakuNin RDM経由で閲覧/ダウンロードできます。
                                                        ファイルの追加/更新GakuNin RDM経由でプロジェクトのファイルを追加/更新する機能はまだ実装されていません。
                                                        ファイルの削除GakuNin RDM経由でファイルを削除する機能はまだ実装されていません。
                                                        ログ直接Gitlabを使って行われた変更の履歴はGakuNin RDMに記録されません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、GitLabの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでGitLabアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:15 +msgid "" +"\n" +"\n" +"

                                                        Mendeley Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Mendeley folder public or private. The GakuNin " +"RDM does not alter the permissions of a linked Mendeley folder.
                                                        ForkingForking a project or component does not copy Mendeley" +" authorization unless the user forking the project is the same user who " +"authorized the Mendeley add-on in the source project being forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        Mendeley アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Mendeleyフォルダをパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMはリンクされたMendeleyフォルダの権限を変更することはありません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、Mendeleyの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでMendeleyアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:17 +msgid "" +"\n" +"\n" +"

                                                        Zotero Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Zotero folder public or private. The GakuNin RDM " +"does not alter the permissions of a linked Zotero folder.
                                                        ForkingForking a project or component does not copy Zotero " +"authorization unless the user forking the project is the same user who " +"authorized the Zotero add-on in the source project being forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        Zotero アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Zoteroフォルダをパブリックまたはプライベートにする設定とは独立しています。GakuNin " +"RDMはリンクされたZoteroフォルダの権限を変更することはありません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、Zoteroの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでZoteroアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:19 +msgid "" +"\n" +"\n" +"

                                                        ownCloud Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking a GakuNin RDM project public or private is " +"independent of ownCloud privacy. The GakuNin RDM does not alter the " +"permissions of linked ownCloud folders.
                                                        View / download file versionsownCloud files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported by the ownCloud WebDAV " +"API.
                                                        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in ownCloud.
                                                        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"ownCloud.
                                                        LogsGakuNin RDM keeps track of changes you make to your " +"ownCloud content through GakuNin RDM, but not for changes made using " +"ownCloud directly.
                                                        ForkingForking a project or component does not copy ownCloud" +" authorization unless the user forking the project is the same user who " +"authorized the ownCloud add-on in the source project being forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        ownCloud アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、ownCloudのプライバシー設定とは独立しています。GakuNin " +"RDMはリンクされたownCloudフォルダの権限を変更することはありません。
                                                        ファイルバージョンの閲覧/ダウンロードownCloudのファイルは、GakuNin RDMから閲覧 / " +"ダウンロードをすることができますが、バージョン履歴はownCloud WebDAV APIではサポートされていません。
                                                        ファイルの追加/更新GakuNin RDMからプロジェクトのファイルを追加 / " +"更新すると、ownCloudに反映されます。
                                                        ファイルの削除GakuNin RDMから削除されたファイルは、ownCloudで削除されます。
                                                        ログGakuNin RDMは、Gaku Nin " +"RDMからownCloudのコンテンツに行った変更を追跡しますが、ownCloudを使って直接行った変更については追跡しません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、ownCloudの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでownCloudアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:21 +msgid "" +"\n" +"\n" +"

                                                        OneDrive Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking a GakuNin RDM project public or private is " +"independent of OneDrive privacy. The GakuNin RDM does not alter the " +"permissions of linked OneDrive folders.
                                                        View / download file versionsOneDrive files and their versions can be " +"viewed/downloaded via GakuNin RDM. OneNote files are unexportable and " +"cannot be downloaded or viewed.
                                                        Add / update filesThe OneDrive add-on is read-only.
                                                        Delete filesThe OneDrive add-on is read-only.
                                                        LogsGakuNin RDM keeps track of changes you make to your " +"OneDrive add-on configuration. It does not track changes to OneDrive " +"content.
                                                        ForkingForking a project or component does not copy OneDrive" +" authorization unless the user forking the project is the same user who " +"authorized the OneDrive add-on in the source project being forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        OneDrive アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、OneDriveのプライバシー設定とは独立しています。GakuNin " +"RDMはリンクされたOneDriveフォルダの権限を変更することはありません。
                                                        ファイルバージョンの閲覧/ダウンロードOneDriveファイルとそのバージョンはGakuNin " +"RDM経由で閲覧/ダウンロードできます。OneNoteファイルはエクスポート不可で、ダウンロードも閲覧もできません。
                                                        ファイルの追加/更新OneDriveアドオンは読み取り専用です。
                                                        ファイルの削除OneDriveアドオンは読み取り専用です。
                                                        ログOneDriveアドオン設定に加えられた変更の履歴はGakuNin " +"RDMに記録されますが、OneDriveコンテンツへの変更の履歴は記録されません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、OneDriveの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでOneDriveアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:23 +msgid "" +"\n" +"\n" +"

                                                        Amazon S3 Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an S3 bucket public or private. The GakuNin RDM " +"does not alter the permissions of linked S3 buckets.
                                                        View / download file versionsThe S3 add-on supports file versions if versioning is" +" enabled for your S3 buckets.
                                                        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Amazon S3.
                                                        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Amazon S3.
                                                        LogsThe GakuNin RDM keeps track of changes you make to " +"your S3 buckets through the GakuNin RDM, but not for changes made using " +"S3 directly.
                                                        ForkingForking a project or component does not copy S3 " +"authorization unless the user forking the project is the same user who " +"authorized the S3 add-on in the source project being forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        Amazon S3 アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、S3バケットをパブリックまたはプライベートにする設定とは独立しています。GakuNin " +"RDMはリンクされたS3バケットの権限を変更することはありません。
                                                        ファイルバージョンの閲覧/ダウンロードご利用のS3でバージョニングが有効になっている場合は、S3アドオンでファイルバージョンがサポートされます。
                                                        ファイルの追加/更新GakuNin RDM経由でプロジェクトのファイルを追加/更新すると、Amazon " +"S3にも反映されます。
                                                        ファイルの削除GakuNin RDM経由で削除したファイルは、Amazon S3でも削除されます。
                                                        ログGakuNin RDM経由で行われたS3バケットへの変更の履歴はGakuNin " +"RDMに記録されますが、直接S3を使って行われた変更は記録されません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、S3の認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでS3アドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:25 +msgid "" +"\n" +"\n" +"

                                                        Google Drive Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking a GakuNin RDM project public or private is " +"independent of Google Drive privacy. The GakuNin RDM does not alter the " +"permissions of linked Google Drive folders.
                                                        View / download file versionsGoogle Drive files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                                        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Google Drive.
                                                        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Google Drive.
                                                        LogsThe GakuNin RDM keeps track of changes you make to " +"your Google Drive content through the GakuNin RDM, but not for changes " +"made using Google Drive directly.
                                                        ForkingForking a project or component does not copy Google " +"Drive authorization unless the user forking the project is the same user " +"who authorized the Google Drive add-on in the source project being " +"forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        Google Drive アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin RDMプロジェクトを公開または非公開にする設定は、Google " +"Driveのプライバシー設定とは独立しています。GakuNin RDMはリンクされたGoogle " +"Driveフォルダの権限を変更することはありません。
                                                        ファイルバージョンの閲覧/ダウンロードGoogle DriveファイルとそのバージョンはGakuNin " +"RDM経由で閲覧/ダウンロードできます。
                                                        ファイルの追加/更新GakuNin RDM経由でプロジェクトのファイルを追加/更新すると、Google " +"Driveにも反映されます。
                                                        ファイルの削除GakuNin RDM経由で削除したファイルは、Google Driveでも削除されます。
                                                        ログGakuNin RDM経由で行われたGoogle Driveコンテンツへの変更の履歴はGakuNin " +"RDMに記録されますが、直接Google Driveを使って行われた変更は記録されません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、Google " +"Driveの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでGoogle " +"Driveアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:27 +msgid "" +"\n" +"\n" +"

                                                        Bitbucket Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making a Bitbucket repo public or private. The GakuNin RDM" +" does not alter the permissions of linked Bitbucket repos.
                                                        View / download file versionsBitbucket files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                                        Add / update filesBitbucket does not support adding or updating files " +"via their API.
                                                        Delete filesBitbucket does not support deleting files via their " +"API.
                                                        LogsGakuNin RDM keeps track of changes you make to your " +"Bitbucket content through GakuNin RDM, but not for changes made using " +"Bitbucket directly.
                                                        ForkingForking a project or component does not copy " +"Bitbucket authorization unless the user forking the project is the same " +"user who authorized the Bitbucket add-on in the source project being " +"forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        Bitbucket アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                                        規約ステータス
                                                        権限GakuNin GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Bitbucketリポジトリをパブリックまたはプライベートにする設定とは独立しています。GakuNin" +" RDMはリンクされたBitbucketリポジトリの権限を変更することはありません。
                                                        ファイルバージョンの閲覧/ダウンロードBitbucketのファイルおよびそのバージョンは、GakuNin RDMから閲覧 / " +"ダウンロードすることができます。
                                                        ファイルの追加/更新Bitbucketは、APIからのファイルの追加または更新をサポートしていません。
                                                        ファイルの削除Bitbucketは、APIからのファイルの削除をサポートしていません。
                                                        ログGakuNin RDMは、Gaku Nin " +"RDMからBitbucketのコンテンツに行った変更を追跡しますが、Bitbucketを使って直接行った変更については追跡しません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、Bitbucketの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでBitbucketアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:29 +msgid "" +"\n" +"\n" +"

                                                        OpenStack Swift Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an Swift container public or private.
                                                        View / download file versionsThe Swift add-on does not support file versions.
                                                        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Swift.
                                                        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Swift.
                                                        LogsThe GakuNin RDM keeps track of changes you make to " +"your Swift containers through the GakuNin RDM, but not for changes made " +"using Swift directly.
                                                        ForkingForking a project or component does not copy Swift " +"authorization unless the user forking the project is the same user who " +"authorized the Swift add-on in the source project being forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        OpenStack Swift アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Swiftコンテナをパブリックまたはプライベートにする設定とは独立しています。
                                                        ファイルバージョンの閲覧/ダウンロードSwiftアドオンは、ファイルバージョンをサポートしていません。
                                                        ファイルの追加/更新GakuNin RDMからプロジェクトのファイルを追加 / " +"更新すると、Swiftに反映されます。
                                                        ファイルの削除GakuNin RDMから削除されたファイルは、Swiftで削除されます。
                                                        ログGakuNin RDMは、Gaku Nin " +"RDMからSwiftのコンテナに行った変更を追跡しますが、Swiftを使って直接行った変更については追跡しません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、Swiftの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでSwiftアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:31 +msgid "" +"\n" +"\n" +"

                                                        Azure Blob Storage Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an Azure Blob Storage container public or " +"private.
                                                        View / download file versionsThe Azure Blob Storage add-on supports only Block " +"Blobs, and does not support file versions.
                                                        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Azure Blob Storage.
                                                        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Azure Blob Storage.
                                                        LogsThe GakuNin RDM keeps track of changes you make to " +"your Azure Blob Storage containers through the GakuNin RDM, but not for " +"changes made using Azure Blob Storage directly.
                                                        ForkingForking a project or component does not copy Azure " +"Blob Storage authorization unless the user forking the project is the " +"same user who authorized the Azure Blob Storage add-on in the source " +"project being forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        Azure Blob Storage アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin RDMプロジェクトを公開または非公開にする設定は、Azure Blob " +"Storageコンテナをパブリックまたはプライベートにする設定とは独立しています。
                                                        ファイルバージョンの閲覧/ダウンロードAzure Blob StorageのアドオンはBlock " +"Blobsのみをサポートしており、ファイルバージョンはサポートされていません。
                                                        ファイルの追加/更新GakuNin RDMからプロジェクトのファイルを追加 / 更新すると、Azure Blob " +"Storageに反映されます。
                                                        ファイルの削除GakuNin RDMから削除されたファイルは、Azure Blob " +"Storageで削除されます。
                                                        ログGakuNin RDMは、Gaku Nin RDMからAzure Blob " +"Storageのコンテナに行った変更を追跡しますが、Azure Blob Storageを使って直接行った変更については追跡しません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、Azure Blob " +"Storageの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでAzure Blob " +"Storageアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:33 +msgid "" +"\n" +"\n" +"

                                                        WEKO Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        Add / update filesAdding/updating indices/items in the project via " +"GakuNin RDM will be reflected in WEKO.
                                                        Delete filesItems deleted via GakuNin RDM will be deleted in " +"WEKO.
                                                        LogsThe GakuNin RDM keeps track of changes you make to " +"your WEKO index through the GakuNin RDM, but not for changes made using " +"WEKO directly.
                                                        ForkingForking a project or component does not copy WEKO " +"authorization unless the user forking the project is the same user who " +"authorized the WEKO add-on in the source project being forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        WEKO アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        ファイルの追加/更新GakuNin RDMからプロジェクトのインデックス / アイテムを追加 / " +"更新すると、WEKOに反映されます。
                                                        ファイルの削除GakuNin RDMから削除されたアイテムは、WEKOで削除されます。
                                                        ログGakuNin RDMは、Gaku Nin " +"RDMからWEKOのインデックスに行った変更を追跡しますが、WEKOを使って直接行った変更については追跡しません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、WEKOの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでWEKOアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:35 +msgid "" +"\n" +"\n" +"

                                                        JupyterHub Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsThe GakuNin RDM does not affect the permissions of " +"JupyterHub.
                                                        View / download file versionsThe JupyterHub add-on does not provide Storage " +"Features.
                                                        Add / update filesThe JupyterHub add-on does not provide Storage " +"Features.
                                                        Delete filesThe JupyterHub add-on does not provide Storage " +"Features.
                                                        LogsThe JupyterHub add-on does not provide Storage " +"Features.
                                                        ForkingForking a project or component copies information " +"about linked JupyterHub but the GakuNin RDM does not affect " +"authentication of JupyterHub.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        JupyterHub アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"\n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin RDMは、JupyterHubの権限に影響を及ぼしません。
                                                        ファイルバージョンの閲覧/ダウンロードJupyterHubアドオンはストレージ機能を提供しません。
                                                        ファイルの追加/更新JupyterHubアドオンはストレージ機能を提供しません。
                                                        ファイルの削除JupyterHubアドオンはストレージ機能を提供しません。
                                                        ログJupyterHubアドオンはストレージ機能を提供しません。
                                                        フォークプロジェクトまたはコンポーネントのフォークを行うと、リンクされたJupyterHubに関する情報がコピーされますが、GakuNin " +"RDMはJupyterHubの認証に影響を及ぼしません。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:37 +#: scripts/translations/messages_addonsJson.js:39 +msgid "" +"\n" +"\n" +"

                                                        S3 Compatible Storage Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking a GakuNin RDM project public or private is " +"independent of making an S3 Compatible Storage bucket public or private. " +"The GakuNin RDM does not alter the permissions of linked S3 Compatible " +"Storage buckets.
                                                        View / download file versionsThe S3 add-on supports file versions if versioning is" +" enabled for your S3 Compatible Storage buckets.
                                                        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in S3 Compatible Storage.
                                                        Delete filesFiles deleted via GakuNin RDM will be deleted in S3 " +"Compatible Storage.
                                                        LogsThe GakuNin RDM keeps track of changes you make to " +"your S3 Compatible Storage buckets through the GakuNin RDM, but not for " +"changes made using S3 Compatible Storage directly.
                                                        ForkingForking a project or component does not copy S3 " +"Compatible Storage authorization unless the user forking the project is " +"the same user who authorized the S3 Compatible Storage add-on in the " +"source project being forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        S3 Compatible Storage アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin RDMプロジェクトを公開または非公開にする設定は、S3 Compatible " +"Storageバケットをパブリックまたはプライベートにする設定とは独立しています。GakuNin RDMはリンクされたS3 Compatible " +"Storageバケットの権限を変更することはありません。
                                                        ファイルバージョンの閲覧/ダウンロードS3 Compatible " +"Storageバケットのバージョニングが有効になっていれば、S3アドオンはファイルバージョンをサポートします。
                                                        ファイルの追加/更新GakuNin RDMからプロジェクトのファイルを追加 / 更新すると、S3 Compatible " +"Storageに反映されます。
                                                        ファイルの削除GakuNin RDMから削除されたファイルは、S3 Compatible " +"Storageで削除されます。
                                                        ログGakuNin RDMは、Gaku Nin RDMからS3 Compatible " +"Storageのバケットに行った変更を追跡しますが、S3 Compatible " +"Storageを使って直接行った変更については追跡しません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、S3 Compatible " +"Storageの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでS3 Compatible " +"Storageアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:41 +msgid "" +"\n" +"\n" +"

                                                        Nextcloud Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking a GakuNin RDM project public or private is " +"independent of Nextcloud privacy. The GakuNin RDM does not alter the " +"permissions of linked Nextcloud folders.
                                                        View / download file versionsNextcloud files can be viewed/downloaded via GakuNin " +"RDM, but version history is not supported by the Nextcloud WebDAV " +"API.
                                                        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Nextcloud.
                                                        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Nextcloud.
                                                        LogsGakuNin RDM keeps track of changes you make to your " +"Nextcloud content through GakuNin RDM, but not for changes made using " +"Nextcloud directly.
                                                        ForkingForking a project or component does not copy " +"Nextcloud authorization unless the user forking the project is the same " +"user who authorized the Nextcloud add-on in the source project being " +"forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        Nextcloud アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +"" +"\n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin " +"RDMプロジェクトを公開または非公開にする設定は、Nextcloudのプライバシー設定とは独立しています。GakuNin " +"RDMはリンクされたNextcloudフォルダの権限を変更することはありません。
                                                        ファイルバージョンの閲覧/ダウンロードNextcloudのファイルは、GakuNin RDMから閲覧 / " +"ダウンロードをすることができますが、バージョン履歴はNextcloud WebDAV APIではサポートされていません。
                                                        ファイルの追加/更新GakuNin RDMからプロジェクトのファイルを追加 / " +"更新すると、Nextcloudに反映されます。
                                                        ファイルの削除GakuNin RDMから削除されたファイルは、Nextcloudで削除されます。
                                                        ログGakuNin RDMは、Gaku Nin " +"RDMからNextcloudのコンテンツに行った変更を追跡しますが、Nextcloudを使って直接行った変更については追跡しません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、Nextcloudの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでNextcloudアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:43 +msgid "" +"\n" +"\n" +"

                                                        IQB-RIMS Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsMaking an GakuNin RDM project public or private is " +"independent of Google Drive privacy. The GakuNin RDM does not alter the " +"permissions of linked Google Drive folders.
                                                        View / download file versionsIQB-RIMS files and their versions can be " +"viewed/downloaded via GakuNin RDM.
                                                        Add / update filesAdding/updating files in the project via GakuNin RDM " +"will be reflected in Google Drive.
                                                        Delete filesFiles deleted via GakuNin RDM will be deleted in " +"Google Drive.
                                                        LogsThe GakuNin RDM keeps track of changes you make to " +"your Google Drive content through the GakuNin RDM, but not for changes " +"made using Google Drive directly.
                                                        ForkingForking a project or component does not copy Google " +"Drive authorization unless the user forking the project is the same user " +"who authorized the IQB-RIMS add-on in the source project being " +"forked.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        IQB-RIMS アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin RDMプロジェクトを公開または非公開にする設定は、Google " +"Driveのプライバシー設定とは独立しています。GakuNin RDMはリンクされたGoogle " +"Driveフォルダの権限を変更することはありません。
                                                        ファイルバージョンの閲覧/ダウンロードIQB-RIMSのファイルとそのバージョンは、GakuNin RDMから閲覧 / " +"ダウンロードをすることができます。
                                                        ファイルの追加/更新GakuNin RDM経由でプロジェクトのファイルを追加/更新すると、Google " +"Driveにも反映されます。
                                                        ファイルの削除GakuNin RDM経由で削除したファイルは、Google Driveでも削除されます。
                                                        ログGakuNin RDMは、Gaku Nin RDMからGoogle " +"Driveのコンテンツに行った変更を追跡しますが、Google Driveを使って直接行った変更については追跡しません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、Google " +"Driveの認証はコピーされません。ただし、プロジェクトをフォークするユーザーが、フォーク元のプロジェクトでIQB-" +"RIMSアドオンを承認したユーザーと同一である場合はコピーされます。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: scripts/translations/messages_addonsJson.js:45 +msgid "" +"\n" +"\n" +"

                                                        My Skelton Add-on Terms

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        FunctionStatus
                                                        PermissionsThe GakuNin RDM does not affect the permissions of My" +" Skelton.
                                                        View / download file versionsThe My Skelton add-on does not provide Storage " +"Features.
                                                        Add / update filesThe My Skelton add-on does not provide Storage " +"Features.
                                                        Delete filesThe My Skelton add-on does not provide Storage " +"Features.
                                                        LogsThe My Skelton add-on does not provide Storage " +"Features.
                                                        ForkingForking a project or component copies information " +"about linked My Skelton but the GakuNin RDM does not affect " +"authentication of My Skelton.
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • This add-on connects your GakuNin RDM project to an external " +"service. Use of this service is bound by its terms and conditions. The " +"GakuNin RDM is not responsible for the service or for your use " +"thereof.
                                                        • \n" +"
                                                        • This add-on allows you to store files using an external " +"service. Files added to this add-on are not stored within the GakuNin " +"RDM.
                                                        • \n" +"
                                                        \n" +msgstr "" +"\n" +"\n" +"

                                                        My Skelton アドオン規約

                                                        \n" +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"
                                                        機能ステータス
                                                        権限GakuNin RDM は My" +" Skeltonの権限に関して影響を及ぼしません。
                                                        ファイルバージョンの閲覧/ダウンロードMy Skeltonアドオンはストレージ機能を" +"提供しません。
                                                        ファイルの追加/更新My Skeltonアドオンはストレージ機能を" +"提供しません。
                                                        ファイルの削除My Skeltonアドオンはストレージ機能を" +"提供しません。
                                                        ログMy Skeltonアドオンはストレージ機能を" +"提供しません。
                                                        フォークプロジェクトやコンポーネントのフォーク時、My Skeltonアドオンに" +"関する情報はコピーされます。ただし、GakuNin RDMは" +"My Skeltonの認証情報には影響を及ぼしません。
                                                        \n" +"\n" +"
                                                          \n" +"
                                                        • このアドオンにより、GakuNin " +"RDMプロジェクトは外部サービスに接続されます。このサービスを利用することで、それら外部サービスの利用規約に拘束されます。GakuNin " +"RDMは、それらサービスまたはユーザーによるその利用に対して責任を負いません。
                                                        • \n" +" " +"
                                                        • このアドオンにより、外部サービスを使ってファイルを保存することが可能となります。このアドオンに追加されたファイルは、GakuNin " +"RDM内には保存されません。
                                                        • \n" +"
                                                        \n" + +#: website/static/js/accessRequestManager.js:85 +msgid "There was a problem trying to %1$s the request from the user. %2$s" +msgstr "ユーザーからのリクエストを%1$sしようとして問題が発生しました。%2$s" + +#: website/static/js/accessRequestManager.js:86 +#: website/static/js/accessRequestManager.js:87 +msgid "Could not %1$s access request" +msgstr "アクセスリクエストを%1$sできませんでした" + +#: website/static/js/accessRequestManager.js:115 +#: website/static/js/contribAdder.js:71 website/static/js/contribManager.js:211 +msgid "Read" +msgstr "読込み" + +#: website/static/js/accessRequestManager.js:116 +#: website/static/js/contribAdder.js:72 website/static/js/contribManager.js:212 +msgid "Read + Write" +msgstr "読込み / 書込み" + +#: website/static/js/accessRequestManager.js:117 +#: website/static/js/contribAdder.js:73 website/static/js/contribManager.js:213 +msgid "Administrator" +msgstr "管理者" + +#: website/static/js/accountClaimer.js:34 +msgid "Email will arrive shortly" +msgstr "メールはまもなく届きます" + +#: website/static/js/accountClaimer.js:34 +msgid "Please check " +msgstr "こちらのメールアドレスをチェックしてください。" + +#: website/static/js/accountClaimer.js:41 +msgid "Claim as %1$s?" +msgstr "%1$sとして申し立てますか?" + +#: website/static/js/accountClaimer.js:42 +msgid "If you claim this account, a contributor of this project " +msgstr "このアカウントを申請すると、このプロジェクトのメンバー" + +#: website/static/js/accountClaimer.js:43 +msgid "will be emailed to confirm your identity." +msgstr "にメールで本人確認が行われます。" + +#: website/static/js/accountClaimer.js:61 +msgid "Claim" +msgstr "請求" + +#: website/static/js/accountClaimer.js:73 +msgid "Is this you? Click to claim" +msgstr "あなたですか? クリックして申し立てる" + +#: website/static/js/accountClaimer.js:99 +msgid "Claim Account" +msgstr "アカウントを請求" + +#: website/static/js/accountClaimer.js:101 +msgid "Enter email..." +msgstr "メールアドレスを入力…" + +#: website/static/js/accountClaimer.js:105 +msgid "Not a valid email." +msgstr "有効なメールではありません。" + +#: website/static/js/accountSettings.js:83 +msgid "Could not fetch user profile." +msgstr "ユーザープロフィールを取得できませんでした。" + +#: website/static/js/accountSettings.js:84 +#: website/static/js/accountSettings.js:115 +#: website/static/js/licensePicker.js:197 +msgid "Error fetching user profile" +msgstr "ユーザープロフィールの取得エラー" + +#: website/static/js/accountSettings.js:112 +msgid "" +"User profile not updated. Please refresh the page and try again or " +"contact %1$s if the problem persists." +msgstr "ユーザープロファイルは更新されません。 ページを更新して再試行するか、問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/accountSettings.js:199 +msgid "Duplicate Email" +msgstr "メールアドレスが重複" + +#: website/static/js/accountSettings.js:220 +msgid "Confirmation email sent" +msgstr "確認メールを送信しました" + +#: website/static/js/accountSettings.js:221 +msgid "%1$s was added to your account." +msgstr "%1$sがアカウントに追加されました。" + +#: website/static/js/accountSettings.js:222 +msgid " You will receive a confirmation email at %1$s." +msgstr "%1$sに確認メールが届きます。" + +#: website/static/js/accountSettings.js:223 +msgid "" +" Please click the link in your email to confirm this action. You will be " +"required to enter your password." +msgstr "このアクションを確認するには、メールのリンクをクリックしてください。 パスワードを入力する必要があります。" + +#: website/static/js/accountSettings.js:226 website/static/js/fangorn.js:2289 +#: website/static/js/folderPickerNodeConfig.js:591 +#: website/static/js/pages/profile-settings-addons-page.js:72 +#: website/static/js/pages/project-settings-page.js:118 +msgid "Close" +msgstr "閉じる" + +#: website/static/js/accountSettings.js:236 +msgid "Email cannot be empty." +msgstr "メールを空にすることはできません。" + +#: website/static/js/accountSettings.js:244 +msgid "Resend Email Confirmation?" +msgstr "メールの確認を再送信しますか?" + +#: website/static/js/accountSettings.js:245 +msgid "Are you sure that you want to resend email confirmation to %1$s?" +msgstr "確認メールを%1$sに再送信してもよろしいですか?" + +#: website/static/js/accountSettings.js:250 +msgid "Email confirmation resent to %1$s" +msgstr "確認メールを%1$sに再送信してもよろしいですか?" + +#: website/static/js/accountSettings.js:251 +msgid "You will receive a new confirmation email at %1$s." +msgstr "%1$sに新しい確認メールが届きます。" + +#: website/static/js/accountSettings.js:252 +msgid "" +" Please log out of this account and check your email to confirm this " +"action." +msgstr "このアカウントからログアウトし、メールを確認してこのアクションを確認してください。" + +#: website/static/js/accountSettings.js:259 +msgid "Resend" +msgstr "再送" + +#: website/static/js/accountSettings.js:270 +msgid "Remove Email?" +msgstr "メールを削除しますか?" + +#: website/static/js/accountSettings.js:271 +msgid "Are you sure that you want to remove %1$s from your email list?" +msgstr "メーリングリストから%1$sを削除してもよろしいですか?" + +#: website/static/js/accountSettings.js:282 +#: website/static/js/accountSettings.js:347 +#: website/static/js/addonPermissions.js:51 +#: website/static/js/addonSettings.js:67 +#: website/static/js/pages/profile-settings-addons-page.js:97 +#: website/static/js/privateLinkTable.js:115 website/static/js/profile.js:739 +#: website/static/js/profile.js:971 website/static/js/project.js:249 +msgid "Remove" +msgstr "削除" + +#: website/static/js/accountSettings.js:291 +#: website/static/js/accountSettings.js:304 +msgid "Please refresh the page and try again." +msgstr "ページを更新してもう一度お試しください。" + +#: website/static/js/accountSettings.js:317 +msgid "You have revoked this connected identity." +msgstr "この接続されたIDを取り消しました。" + +#: website/static/js/accountSettings.js:322 +msgid "Revocation request failed. Please contact %1$s if the problem persists." +msgstr "取り消し要求が失敗しました。 問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/accountSettings.js:325 +msgid "Error revoking connected identity" +msgstr "接続されたIDの取り消しエラー" + +#: website/static/js/accountSettings.js:338 +msgid "Remove authorization?" +msgstr "認証を削除しますか?" + +#: website/static/js/accountSettings.js:339 +msgid "Are you sure you want to remove this authorization?" +msgstr "この認証を削除してもよろしいですか?" + +#: website/static/js/accountSettings.js:383 +msgid "" +"You have successfully changed your default storage location to " +"%1$s." +msgstr "デフォルトの保存場所を%1$sに正常に変更しました。" + +#: website/static/js/accountSettings.js:387 +msgid "" +"Your attempt to change your default storage location has failed. Please " +"contact %1$s if the problem persists." +msgstr "デフォルトの保存場所を変更しようとして失敗しました。 問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/accountSettings.js:390 +msgid "Error updating default storage location " +msgstr "デフォルトの保管場所の更新エラー" + +#: website/static/js/accountSettings.js:413 +msgid "" +"An GakuNin RDM administrator will contact you shortly to confirm your " +"deactivation request." +msgstr "GakuNin RDM管理者がすぐに連絡して、非アクティブ化リクエストを確認します。" + +#: website/static/js/accountSettings.js:421 +msgid "Deactivation request failed. Please contact %1$s if the problem persists." +msgstr "非アクティブ化要求が失敗しました。 問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/accountSettings.js:425 +#: website/static/js/accountSettings.js:450 +msgid "Error requesting account deactivation" +msgstr "アカウントの無効化のリクエストエラー" + +#: website/static/js/accountSettings.js:438 +msgid "An GakuNin RDM account is no longer up for review." +msgstr "GakuNin RDMアカウントのレビューは終了しました。" + +#: website/static/js/accountSettings.js:446 +msgid "" +"Deactivation request failed. Please contact rdm_support@nii.ac.jp if the problem " +"persists." +msgstr "" +"非アクティブ化要求が失敗しました。 問題が解決しない場合は、
                                                        rdm_support@nii.ac.jpまでご連絡ください。" + +#: website/static/js/accountSettings.js:463 +msgid "Request account deactivation?" +msgstr "アカウントの無効化をリクエストしますか?" + +#: website/static/js/accountSettings.js:464 +msgid "" +"Are you sure you want to request account deactivation? A GakuNinRDM " +"administrator will review your request. If accepted, you " +msgstr "アカウントの無効化をリクエストしてもよろしいですか? GakuNinRDM管理者がリクエストを確認します。 認証された場合、" + +#: website/static/js/accountSettings.js:465 +msgid "will NOT be able to reactivate your account." +msgstr "アカウントを再開することはできません。" + +#: website/static/js/accountSettings.js:473 +#: website/static/js/accountSettings.js:546 +msgid "Request" +msgstr "リクエスト" + +#: website/static/js/accountSettings.js:485 +msgid "Cancel deactivation request?" +msgstr "無効化リクエストをキャンセルしますか?" + +#: website/static/js/accountSettings.js:486 +msgid "" +"Are you sure you want to rescind your account deactivation request? This " +"will preserve your account status." +msgstr "アカウントの無効化リクエストを取り消してもよろしいですか? これにより、アカウントの状態が保持されます。" + +#: website/static/js/accountSettings.js:494 +msgid "Cancel Deactivation Request" +msgstr "無効化リクエストをキャンセルする" + +#: website/static/js/accountSettings.js:512 +msgid "" +"An GakuNin RDM administrator will contact you shortly to confirm your " +"export request." +msgstr "GakuNin RDM管理者がすぐに連絡して、非アクティブ化リクエストを確認します。" + +#: website/static/js/accountSettings.js:520 +msgid "Export request failed. Please contact %1$s if the problem persists." +msgstr "エクスポート要求が失敗しました。 問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/accountSettings.js:524 +msgid "Error requesting account export" +msgstr "アカウントのエクスポートをリクエスト中にエラーが発生しました" + +#: website/static/js/accountSettings.js:537 +msgid "Request account export?" +msgstr "アカウントのエクスポートをリクエストしますか?" + +#: website/static/js/accountSettings.js:538 +msgid "Are you sure you want to request account export?" +msgstr "アカウントのエクスポートをリクエストしてもよろしいですか?" + +#: website/static/js/addProjectPlugin.js:21 +#: website/static/js/addProjectPlugin.js:24 +#: website/static/js/myProjects.js:1118 +msgid "Create new project" +msgstr "新規プロジェクト作成" + +#: website/static/js/addProjectPlugin.js:57 +msgid "There was an unknown error. Please try again later." +msgstr "不明なエラーがありました。 後でもう一度やり直してください。" + +#: website/static/js/addProjectPlugin.js:184 website/static/js/conference.js:19 +msgid "Title" +msgstr "タイトル" + +#: website/static/js/addProjectPlugin.js:198 +msgid "Enter %1$s title" +msgstr "%1$sのタイトルを入力してください" + +#: website/static/js/addProjectPlugin.js:203 +msgid "Affiliation" +msgstr "所属" + +#: website/static/js/addProjectPlugin.js:210 +msgid "Remove all" +msgstr "全て削除" + +#: website/static/js/addProjectPlugin.js:217 +msgid "Select all" +msgstr "全て選択" + +#: website/static/js/addProjectPlugin.js:233 +msgid "Storage location" +msgstr "ストレージロケーション" + +#: website/static/js/addProjectPlugin.js:251 +msgid " Add contributors from " +msgstr "次からメンバーを追加する:" + +#: website/static/js/addProjectPlugin.js:253 +msgid " Admins of " +msgstr " " + +#: website/static/js/addProjectPlugin.js:253 +msgid " will have read access to this component." +msgstr "の管理者は、このコンポーネントへの読み取りアクセス権を持ちます。" + +#: website/static/js/addProjectPlugin.js:264 +msgid " Add tags from " +msgstr "次からタグを追加する:" + +#: website/static/js/addProjectPlugin.js:268 +msgid "License" +msgstr "ライセンス" + +#: website/static/js/addProjectPlugin.js:270 +msgid " This component will inherit the same license as " +msgstr "このコンポーネントは、次と同じライセンスを継承します:" + +#: website/static/js/addProjectPlugin.js:273 +msgid "Learn more." +msgstr "もっと詳しく見る" + +#: website/static/js/addProjectPlugin.js:282 +msgid " More" +msgstr "詳細" + +#: website/static/js/addProjectPlugin.js:286 +msgid "Description" +msgstr "説明" + +#: website/static/js/addProjectPlugin.js:295 +msgid "Enter %1$s description" +msgstr "%1$sの説明を入力する" + +#: website/static/js/addProjectPlugin.js:299 website/static/js/conference.js:31 +msgid "Category" +msgstr "カテゴリ" + +#: website/static/js/addProjectPlugin.js:300 +msgid " (for descriptive purposes)" +msgstr "(説明のため)" + +#: website/static/js/addProjectPlugin.js:307 +msgid "Uncategorized" +msgstr "未分類" + +#: website/static/js/addProjectPlugin.js:320 +msgid "(Empty category)" +msgstr "(空のカテゴリ)" + +#: website/static/js/addProjectPlugin.js:330 +msgid "Template (optional)" +msgstr "テンプレート(オプション)" + +#: website/static/js/addProjectPlugin.js:331 +msgid "" +"Start typing to search your projects. Selecting project as template will " +"duplicate its " +msgstr "入力を開始してプロジェクトを検索します。 プロジェクトをテンプレートとして選択すると、" + +#: website/static/js/addProjectPlugin.js:332 +msgid "" +"structure in the new project without importing the content of that " +"project." +msgstr "そのプロジェクトのコンテンツをインポートすることなく、新しいプロジェクトでその構造が複製されます。" + +#: website/static/js/addProjectPlugin.js:351 +#: website/static/js/nodeControl.js:224 +#: website/static/js/privateLinkManager.js:31 website/static/js/project.js:140 +msgid "Create" +msgstr "作成" + +#: website/static/js/addProjectPlugin.js:362 +#, python-format +msgid "Saving your %s..." +msgstr "%sを保存中..." + +#: website/static/js/addProjectPlugin.js:376 +msgid "New %1$s created successfully!" +msgstr "新しい%1$sが作成されました!" + +#: website/static/js/addProjectPlugin.js:386 +#: website/static/js/addProjectPlugin.js:434 website/static/js/project.js:62 +msgid "Keep working here" +msgstr "このページに留まる" + +#: website/static/js/addProjectPlugin.js:392 +#: website/static/js/addProjectPlugin.js:437 +msgid "Go to new %1$s" +msgstr "新しい%1$sへ移動する" + +#: website/static/js/addProjectPlugin.js:405 +msgid "Couldn't create your %1$s" +msgstr "%1$sが作成できませんでした。" + +#: website/static/js/addProjectPlugin.js:424 +msgid "Could not add institution affiliation to your new %1$s" +msgstr "新しい%1$sに所属機関を追加できませんでした" + +#: website/static/js/addProjectPlugin.js:471 +msgid "Select a project to use as a template" +msgstr "テンプレートとして使用するプロジェクトを選択します" + +#: website/static/js/addonHelper.js:37 +#: website/static/js/nodeSelectTreebeard.js:59 +#: website/static/js/notificationsTreebeard.js:59 +#: website/static/js/profile.js:311 +#: website/static/js/wikiSettingsTreebeard.js:54 +msgid "Settings updated" +msgstr "設定が更新されました" + +#: website/static/js/addonHelper.js:46 +msgid "Settings not updated." +msgstr "設定が更新されませんでした。" + +#: website/static/js/addonNodeConfig.js:39 +#: website/static/js/oauthAddonNodeConfig.js:47 +msgid "Successfully linked \"%1$s\"" +msgstr "\"%1$s\"が正常にリンクされました" + +#: website/static/js/addonNodeConfig.js:40 +#: website/static/js/oauthAddonNodeConfig.js:48 +msgid " Go to the Files page to view your content." +msgstr "ファイルページに移動して、コンテンツを表示します。" + +#: website/static/js/addonPermissions.js:21 +#: website/static/js/addonSettings.js:58 +msgid "Remove addon?" +msgstr "アドオンを削除しますか?" + +#: website/static/js/addonPermissions.js:22 +msgid "Are you sure you want to disconnnect the %1$s account from this project?" +msgstr "このプロジェクトから%1$sアカウントを切断してもよろしいですか?" + +#: website/static/js/addonPermissions.js:43 +msgid "An error occurred, the account is still connected to the project. " +msgstr "エラーが発生し、アカウントはまだプロジェクトに接続されています。" + +#: website/static/js/addonPermissions.js:44 +msgid "If the issue persists, please report it to %1$s." +msgstr "問題が解決しない場合は、%1$sに報告してください。" + +#: website/static/js/addonSettings.js:46 +msgid "Error deauthorizing node: " +msgstr "ノードの認証解除エラー:" + +#: website/static/js/addonSettings.js:59 +msgid "Are you sure you want to remove the %1$s authorization from this project?" +msgstr "このプロジェクトから%1$s認証を削除してもよろしいですか?" + +#: website/static/js/addonSettings.js:100 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of dropbox.com before attempting to connect to a second Dropbox " +"account on the GakuNin RDM. This will clear the credentials stored in " +"your browser." +msgstr "" +"アドオンが正常に認証されました。 別のアカウントをリンクする場合は、GakuNin " +"RDMの2番目のDropboxアカウントに接続する前に、dropbox.comからログアウトしてください。 " +"これにより、ブラウザに保存されている認証情報がクリアされます。" + +#: website/static/js/addonSettings.js:102 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of bitbucket.org before attempting to connect to a second " +"Bitbucket account on the GakuNin RDM. This will clear the credentials " +"stored in your browser." +msgstr "" +"アドオンが正常に認証されました。 別のアカウントをリンクする場合は、GakuNin " +"RDMの2つ目のBitbucketアカウントに接続する前に、bitbucket.orgからログアウトしてください。 " +"これにより、ブラウザに保存されている認証情報がクリアされます" + +#: website/static/js/addonSettings.js:104 +msgid "" +"Add-on successfully authorized. If you wish to link a different account, " +"log out of onedrive.live.com before attempting to connect to a second " +"OneDrive account on the GakuNin RDM. This will clear the credentials " +"stored in your browser." +msgstr "" +"アドオンが正常に認証されました。 別のアカウントをリンクする場合は、GakuNin " +"RDMの2つ目のOneDriveアカウントに接続する前にonedrive.live.comからログアウトします。 " +"これにより、ブラウザに保存されている認証情報がクリアされます。" + +#: website/static/js/addonSettings.js:106 +msgid "" +"Add-on successfully authorized. To link this add-on to an GakuNin RDM " +"project, go to the settings page of the project, enable %1$s, and choose " +"content to connect." +msgstr "" +"アドオンが正常に認証されました。 このアドオンをGakuNin " +"RDMプロジェクトにリンクするには、プロジェクトの設定ページに移動し、%1$sを有効にして、接続するコンテンツを選択します。" + +#: website/static/js/addonSettings.js:109 +msgid "" +"Error while authorizing add-on. Please log in to your %1$s account and " +"grant access to the GakuNin RDM to enable this add-on." +msgstr "" +"アドオンの認証中にエラーが発生しました。 このアドオンを有効にするには、%1$sアカウントにログインし、GakuNin " +"RDMへのアクセスを許可してください。" + +#: website/static/js/addonSettings.js:120 +msgid "" +"Are you sure you want to disconnect the %1$s account " +"%2$s? This will revoke access to %1$s for all projects " +"you have authorized." +msgstr "" +"%1$sアカウント%2$sを切断してもよろしいですか? " +"これにより、認証したすべてのプロジェクトの%1$sへのアクセスが取り消されます。" + +#: website/static/js/alertsManager.js:42 +msgid "Could not dismiss alert. Please refresh page and try again." +msgstr "アラートを却下できませんでした。 ページを更新してもう一度お試しください。" + +#: website/static/js/alertsManager.js:43 website/static/js/alertsManager.js:77 +msgid "Error fetching user alerts" +msgstr "ユーザーアラートの取得エラー" + +#: website/static/js/alertsManager.js:76 +msgid "Could not fetch alerts for this page. Please refresh page and try again." +msgstr "このページのアラートを取得できませんでした。 ページを更新してもう一度お試しください。" + +#: website/static/js/apiApplication.js:215 +msgid "Error fetching list of registered applications" +msgstr "登録済みアプリケーションのリストの取得エラー" + +#: website/static/js/apiApplication.js:226 +#: website/static/js/apiApplication.js:396 +msgid "Deactivate application?" +msgstr "アプリケーションを無効にしますか?" + +#: website/static/js/apiApplication.js:234 +#: website/static/js/apiPersonalToken.js:225 +msgid " has been deactivated" +msgstr "は無効化されました" + +#: website/static/js/apiApplication.js:245 +#: website/static/js/apiApplication.js:416 +#: website/static/js/apiPersonalToken.js:236 +#: website/static/js/apiPersonalToken.js:407 +msgid "Deactivate" +msgstr "無効にする" + +#: website/static/js/apiApplication.js:295 +#: website/static/js/apiPersonalToken.js:286 +msgid "There are unsaved changes on this page." +msgstr "このページには未保存の変更があります。" + +#: website/static/js/apiApplication.js:309 +msgid "Error fetching application data" +msgstr "アプリケーションデータの取得エラー" + +#: website/static/js/apiApplication.js:344 +#: website/static/js/apiPersonalToken.js:335 +msgid "Error updating instance" +msgstr "インスタンスの更新エラー" + +#: website/static/js/apiApplication.js:370 +msgid "Error registering new OAuth2 application" +msgstr "新しいOAuth2アプリケーションの登録エラー" + +#: website/static/js/apiApplication.js:429 +msgid "Reset client secret?" +msgstr "クライアントシークレットをリセットしますか?" + +#: website/static/js/apiApplication.js:447 +msgid "Error resetting instance secret" +msgstr "インスタンスシークレットのリセットエラー" + +#: website/static/js/apiApplication.js:459 +msgid "Reset Secret" +msgstr "シークレットをリセット" + +#: website/static/js/apiApplication.js:473 +#: website/static/js/apiPersonalToken.js:424 website/static/js/profile.js:357 +msgid "Discard changes?" +msgstr "変更を破棄しますか?" + +#: website/static/js/apiApplication.js:483 +#: website/static/js/apiPersonalToken.js:434 website/static/js/profile.js:369 +msgid "Discard" +msgstr "破棄" + +#: website/static/js/apiPersonalToken.js:206 +msgid "Error fetching list of registered personal access tokens" +msgstr "登録済みの個人アクセストークンのリストの取得エラー" + +#: website/static/js/apiPersonalToken.js:217 +msgid "Deactivate personal access token?" +msgstr "パーソナルアクセストークンを無効にしますか?" + +#: website/static/js/apiPersonalToken.js:300 +msgid "Error fetching token data" +msgstr "トークンデータの取得エラー" + +#: website/static/js/apiPersonalToken.js:361 +msgid "Error registering new OAuth2 personal access token" +msgstr "新しいOAuth2個人用アクセストークンの登録エラー" + +#: website/static/js/apiPersonalToken.js:387 +msgid "Deactivate token?" +msgstr "トークンを無効にしますか?" + +#: website/static/js/citationGrid.js:180 +msgid "Copy citation" +msgstr "サイテーションをコピー" + +#: website/static/js/citationGrid.js:190 +msgid "View original document" +msgstr "元のドキュメントを表示" + +#: website/static/js/citationGrid.js:202 website/static/js/fangorn.js:2063 +msgid "View on %1$s" +msgstr "%1$sで表示" + +#: website/static/js/citationGrid.js:213 +msgid "Download citations" +msgstr "サイテーションをダウンロード" + +#: website/static/js/citationGrid.js:242 +msgid "Citation" +msgstr "引用" + +#: website/static/js/citationGrid.js:246 +msgid "Actions" +msgstr "アクション" + +#: website/static/js/citationGrid.js:294 +msgid "Only 200 citations may be displayed" +msgstr "200件のサイテーションのみが表示されます" + +#: website/static/js/citationGrid.js:311 website/static/js/citationWidget.js:44 +msgid "Enter citation style (e.g. \"APA\")" +msgstr "引用スタイルを入力します(例:\"APA\")" + +#: website/static/js/citationGrid.js:333 +msgid "Error while selecting citation style: " +msgstr "引用スタイルの選択中にエラーが発生しました:" + +#: website/static/js/citationGrid.js:412 +msgid "" +"Could not render entry. Please check the contents of your citations " +"for correctness." +msgstr "エントリをレンダリングできませんでした。 引用の内容が正しいかどうかを確認してください。" + +#: website/static/js/citationList.js:113 +msgid "Your custom citation not updated. Please refresh the page and try " +msgstr "カスタム引用は更新されません。 ページを更新して再試行するか、" + +#: website/static/js/citationList.js:114 +msgid "again or contact %1$s" +msgstr "問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/citationList.js:114 +#: website/static/js/components/publicNodes.js:192 +#: website/static/js/components/quickFiles.js:123 +#: website/static/js/osfHelpers.js:311 +msgid " if the problem persists." +msgstr " " + +#: website/static/js/citationWidget.js:46 +#: website/static/js/pages/project-dashboard-page.js:170 +#, python-format +msgid "Please enter %s or more characters" +msgstr "後%s文字入力してください" + +#: website/static/js/citationWidget.js:47 website/static/js/pointers.js:30 +msgid "Searching..." +msgstr "検索中..." + +#: website/static/js/citationWidget.js:48 +msgid "No matches found." +msgstr "該当なし" + +#: website/static/js/citationWidget.js:77 +msgid "Citation render failed" +msgstr "引用のレンダリングに失敗しました" + +#: website/static/js/citationWidget.js:78 +msgid "The requested citation format generated an error." +msgstr "要求された引用形式はエラーを生成しました。" + +#: website/static/js/citationWidget.js:81 +msgid "Unexpected error when fetching citation" +msgstr "引用を取得する際の予期しないエラー" + +#: website/static/js/citationsNodeConfig.js:38 +#: website/static/js/citationsNodeConfig.js:42 +msgid "Successfully linked \"%1$s\"." +msgstr "\"%1$s\"が正常にリンクされました。" + +#: website/static/js/citationsNodeConfig.js:38 +msgid " Go to the Overview page to view your citations." +msgstr "概要ページに移動して、引用を表示します。" + +#: website/static/js/citationsNodeConfig.js:42 +msgid " Next, choose which folder to link above." +msgstr "次に、上記のリンクするフォルダーを選択します。" + +#: website/static/js/citationsNodeConfig.js:81 +#: website/static/js/oauthAddonNodeConfig.js:209 +msgid "Could not GET %1$s accounts for user" +msgstr "ユーザーの%1$sアカウントを取得できませんでした" + +#: website/static/js/citationsNodeConfig.js:147 +msgid "Choose %1$s Access Token to Import" +msgstr "インポートする%1$s アクセストークンを選択してください" + +#: website/static/js/citationsNodeConfig.js:166 +#: website/static/js/citationsNodeConfig.js:184 +#: website/static/js/folderPickerNodeConfig.js:507 +#: website/static/js/oauthAddonNodeConfig.js:153 +#: website/static/js/oauthAddonNodeConfig.js:171 +msgid "Import" +msgstr "接続" + +#: website/static/js/citationsNodeConfig.js:175 +msgid "Import %1$s access token" +msgstr "%1$sアクセストークンをインポート" + +#: website/static/js/clipboard.js:27 website/static/js/fangorn.js:1483 +msgid "Copied!" +msgstr "コピーされました!" + +#: website/static/js/clipboard.js:32 +msgid "Copy failed!" +msgstr "コピーが失敗しました!" + +#: website/static/js/comment.js:55 +msgid "Error getting contributors and group members" +msgstr "メンバーとグループメンバーの取得エラー" + +#: website/static/js/comment.js:73 +msgid "Spam or advertising" +msgstr "スパムまたは広告" + +#: website/static/js/comment.js:74 +msgid "Hate speech" +msgstr "ヘイトスピーチ" + +#: website/static/js/comment.js:75 +msgid "Violence or harmful behavior" +msgstr "暴力や有害な行動" + +#: website/static/js/comment.js:212 +msgid "Commenting" +msgstr "コメント中" + +#: website/static/js/comment.js:212 +msgid "Comment" +msgstr "コメント" + +#: website/static/js/comment.js:232 +msgid "Exceeds character limit. Please reduce to %1$s characters or less." +msgstr "文字数の制限を超えています。%1$s文字以下に減らしてください。" + +#: website/static/js/comment.js:347 website/static/js/comment.js:555 +msgid "Please enter a comment" +msgstr "コメントを入れて下さい" + +#: website/static/js/comment.js:393 website/static/js/comment.js:588 +msgid "Could not submit comment" +msgstr "コメントを送信できませんでした" + +#: website/static/js/comment.js:394 +msgid "Error creating comment" +msgstr "コメント作成エラー" + +#: website/static/js/comment.js:589 +msgid "Error editing comment" +msgstr "コメント編集エラー" + +#: website/static/js/comment.js:634 +msgid "Could not report abuse." +msgstr "不正行為を報告できませんでした。" + +#: website/static/js/comment.js:635 +msgid "Error reporting abuse" +msgstr "不正行為の報告エラー" + +#: website/static/js/comment.js:664 +msgid "Error deleting comment" +msgstr "コメントの削除エラー" + +#: website/static/js/comment.js:702 +msgid "Error undeleting comment" +msgstr "コメントの削除解除エラー" + +#: website/static/js/comment.js:727 +msgid "Error unreporting comment" +msgstr "コメントの報告エラー" + +#: website/static/js/comment.js:807 +msgid "Your comments have unsaved changes. Are you sure " +msgstr "コメントには未保存の変更があります。" + +#: website/static/js/comment.js:808 +msgid "you want to leave this page?" +msgstr "このページから移動してもよろしいですか?" + +#: website/static/js/comment.js:826 +msgid "Could not update comment timestamp" +msgstr "コメントのタイムスタンプを更新できませんでした" + +#: website/static/js/commentpane.js:31 +msgid "Option `toggleWidth` must be greater than or equal to " +msgstr "オプション「toggleWidth」は、オプション「maxWidthProp」以上でなければなりません。" + +#: website/static/js/commentpane.js:32 +msgid "option `maxWidthProp`." +msgstr " " + +#: website/static/js/conference.js:25 +msgid "Author" +msgstr "著者" + +#: website/static/js/conference.js:37 +msgid "Date Created" +msgstr "作成日時" + +#: website/static/js/conference.js:43 website/static/js/fangorn.js:1705 +msgid "Downloads" +msgstr "ダウンロード" + +#: website/static/js/contribAdder.js:26 +msgid " project in common" +msgstr "共通プロジェクト" + +#: website/static/js/contribAdder.js:28 +msgid "Yourself" +msgstr "あなた自身" + +#: website/static/js/contribAdder.js:30 +msgid " projects in common" +msgstr "共通プロジェクト" + +#: website/static/js/contribAdder.js:82 +msgid "Add Contributors" +msgstr "メンバーを追加" + +#: website/static/js/contribAdder.js:83 +msgid "Select Components" +msgstr "コンポーネントを選択" + +#: website/static/js/contribAdder.js:85 +msgid "Invite new contributor by e-mail" +msgstr "電子メールで新しいメンバーを招待する" + +#: website/static/js/contribAdder.js:86 +msgid "Add Unregistered Contributor" +msgstr "未登録のメンバーを追加" + +#: website/static/js/contribAdder.js:331 +msgid "Full Name is required." +msgstr "氏名が必要です。" + +#: website/static/js/contribAdder.js:334 +msgid "Not a valid email address." +msgstr "有効な電子メールアドレスではありません。" + +#: website/static/js/contribAdder.js:341 +msgid "%1$s is already in queue." +msgstr "%1$sはすでにキューにあります。" + +#: website/static/js/contribAdder.js:457 +msgid "There was a problem trying to add contributors%1$s." +msgstr "メンバー%1$sを追加しようとして問題が発生しました。" + +#: website/static/js/contribAdder.js:458 +msgid "Could not add contributors" +msgstr "メンバーを追加できませんでした" + +#: website/static/js/contribAdder.js:459 +#: website/static/js/contribManager.js:139 +msgid "Error adding contributors" +msgstr "メンバーの追加エラー" + +#: website/static/js/contribAdder.js:533 +#: website/static/js/institutionProjectSettings.js:254 +#: website/static/js/nodesDelete.js:194 website/static/js/nodesPrivacy.js:207 +msgid "Unable to retrieve project settings" +msgstr "プロジェクト設定を取得できません" + +#: website/static/js/contribAdder.js:534 +#: website/static/js/institutionProjectSettings.js:255 +#: website/static/js/nodesDelete.js:195 website/static/js/nodesPrivacy.js:208 +msgid "Could not GET project settings." +msgstr "プロジェクト設定を取得できませんでした。" + +#: website/static/js/contribManager.js:137 +msgid "There was a problem trying to add the contributor. " +msgstr "メンバーを追加しようとして問題が発生しました。" + +#: website/static/js/contribManager.js:138 +msgid "Could not add contributor" +msgstr "メンバーを追加できませんでした" + +#: website/static/js/contribManager.js:300 +msgid "Must have at least one registered admin contributor" +msgstr "登録された管理メンバーーが少なくとも1人必要です" + +#: website/static/js/contribManager.js:308 +msgid "Must have at least one bibliographic contributor" +msgstr "少なくとも1人の書誌メンバーが必要です。" + +#: website/static/js/contribManager.js:364 +msgid "Your contributor list has unsaved changes. Please " +msgstr "メンバーリストには未保存の変更があります。 " + +#: website/static/js/contribManager.js:365 +msgid "save or cancel your changes before adding " +msgstr "メンバーを追加する前に、変更を保存または" + +#: website/static/js/contribManager.js:366 +msgid "contributors." +msgstr "キャンセルしてください。" + +#: website/static/js/contribManager.js:375 +msgid "There are unsaved changes to your contributor settings" +msgstr "メンバーの設定に保存されていない変更があります" + +#: website/static/js/contribManager.js:404 +msgid "Save changes?" +msgstr "変更を保存しますか?" + +#: website/static/js/contribManager.js:405 +msgid "Are you sure you want to save these changes?" +msgstr "これらの変更を保存してもよろしいですか?" + +#: website/static/js/contribManager.js:421 +msgid "Submission failed: " +msgstr "送信に失敗しました:" + +#: website/static/js/contribManager.js:429 +#: website/static/js/filepage/editor.js:180 +msgid "Save" +msgstr "保存" + +#: website/static/js/contribRemover.js:56 +#: website/static/js/contribRemover.js:57 +#: website/static/js/contribRemover.js:58 +msgid "Remove Contributor" +msgstr "メンバーを削除" + +#: website/static/js/contribRemover.js:208 +#: website/static/js/contribRemover.js:209 +msgid "Unable to retrieve projects and components" +msgstr "プロジェクトとコンポーネントを取得できません" + +#: website/static/js/contribRemover.js:232 +msgid "Unable to delete Contributor" +msgstr "メンバーを削除できません" + +#: website/static/js/contribRemover.js:233 +msgid "Could not DELETE Contributor." +msgstr "メンバーを削除できませんでした" + +#: website/static/js/fangorn.js:38 +msgid "Upload pending..." +msgstr "アップロード保留中" + +#: website/static/js/fangorn.js:41 +msgid "Copying " +msgstr "コピー中" + +#: website/static/js/fangorn.js:44 +msgid "Deleting " +msgstr "削除中" + +#: website/static/js/fangorn.js:47 +msgid "Moving " +msgstr "移動中" + +#: website/static/js/fangorn.js:50 +msgid "Renaming " +msgstr "名前を変更中" + +#: website/static/js/fangorn.js:457 +msgid "Not allowed: Private folder" +msgstr "許可されない:非公開フォルダ" + +#: website/static/js/fangorn.js:501 website/static/js/fangorn.js:531 +msgid "You cannot replace the Wiki images folder" +msgstr "Wiki画像フォルダーを置き換えることはできません" + +#: website/static/js/fangorn.js:506 website/static/js/fangorn.js:539 +msgid "An item named \"%1$s\" already exists in this location." +msgstr "\"%1$s\"という名前のアイテムはこの場所に既に存在します" + +#: website/static/js/fangorn.js:508 website/static/js/fangorn.js:517 +#: website/static/js/fangorn.js:541 +msgid "Keep Both" +msgstr "両方を保持" + +#: website/static/js/fangorn.js:508 website/static/js/fangorn.js:541 +msgid " will retain both files (and their version histories) in this location." +msgstr "はこの場所に両方のファイル(およびそれらのバージョン履歴)が保持されます。" + +#: website/static/js/fangorn.js:510 website/static/js/fangorn.js:518 +#: website/static/js/fangorn.js:543 +msgid "Replace" +msgstr "置換" + +#: website/static/js/fangorn.js:510 website/static/js/fangorn.js:543 +msgid " will overwrite the existing file in this location. " +msgstr "はこの場所にある既存のファイルを上書きします。" + +#: website/static/js/fangorn.js:511 website/static/js/fangorn.js:544 +msgid "You will lose previous versions of the overwritten file. " +msgstr "上書きされたファイルの以前のバージョンは失われます。" + +#: website/static/js/fangorn.js:512 website/static/js/fangorn.js:545 +msgid "You will keep previous versions of the moved file." +msgstr "移動したファイルの以前のバージョンを保持します。" + +#: website/static/js/fangorn.js:513 +msgid "\"Skip\" will skip the current file." +msgstr "\"スキップ\"は現在のファイルをスキップします。" + +#: website/static/js/fangorn.js:514 +msgid "\"Stop\" will only move files with no conflicts." +msgstr "\"停止\"は、競合のないファイルのみを移動します。" + +#: website/static/js/fangorn.js:519 +msgid "Skip" +msgstr "スキップ" + +#: website/static/js/fangorn.js:520 +msgid "Stop" +msgstr "停止" + +#: website/static/js/fangorn.js:522 +#, python-format +msgid "Replace \"%s\"?" +msgstr "\"%s\"を置換しますか?" + +#: website/static/js/fangorn.js:546 +msgid " will cancel the move." +msgstr "は移動をキャンセルします。" + +#: website/static/js/fangorn.js:555 +msgid "Replace \"%1$s\"?" +msgstr "\"%1$s\"を置換しますか?" + +#: website/static/js/fangorn.js:585 +msgid "%1$s conflicts left to resolve." +msgid_plural "%1$s conflict left to resolve." +msgstr[0] "%1$sの競合が残っています。" + +#: website/static/js/fangorn.js:669 +msgid "Successfully %1$s." +msgstr "%1$sに成功しました。" + +#: website/static/js/fangorn.js:716 +msgid "Please refresh the page or contact %1$s if the problem persists." +msgstr "問題が解決しない場合は、ページを更新するか%1$sに連絡してください。" + +#: website/static/js/fangorn.js:721 +msgid "Failed to move or copy file" +msgstr "ファイルの移動またはコピーに失敗しました" + +#: website/static/js/fangorn.js:1001 +msgid "Could not upload file. The file may be invalid " +msgstr "ファイルをアップロードできませんでした。 ファイルが無効である" + +#: website/static/js/fangorn.js:1002 +msgid "or the file folder has been deleted." +msgstr "か、ファイルフォルダーが削除されている可能性があります。" + +#: website/static/js/fangorn.js:1010 website/static/js/fangorn.js:1015 +msgid "Cannot upload folders." +msgstr "フォルダーをアップロードできません。" + +#: website/static/js/fangorn.js:1017 +msgid "Cannot upload file due to insufficient storage." +msgstr "ストレージが不十分なため、ファイルをアップロードできません。" + +#: website/static/js/fangorn.js:1022 +msgid "Could not upload file. Possible reasons:
                                                        " +msgstr "ファイルをアップロードできませんでした。 考えられる理由:
                                                        " + +#: website/static/js/fangorn.js:1023 +msgid "1. Cannot upload folders.
                                                        2. " +msgstr "1.フォルダーをアップロードできません。
                                                        2." + +#: website/static/js/fangorn.js:1025 +msgid "Unable to reach the provider, please try again later. " +msgstr "プロバイダーに到達できません。しばらくしてからもう一度お試しください。" + +#: website/static/js/fangorn.js:1026 +msgid "If the problem persists, please contact %1$s." +msgstr "問題が解決しない場合は、%1$sにお問い合わせください" + +#: website/static/js/fangorn.js:1114 +msgid "Please enter a folder name." +msgstr "フォルダー名を入力してください。" + +#: website/static/js/fangorn.js:1118 +msgid "Folder name contains illegal characters." +msgstr "フォルダー名に無効な文字が含まれています。" + +#: website/static/js/fangorn.js:1141 +msgid "New folder created!" +msgstr "新しいフォルダが作成されました。" + +#: website/static/js/fangorn.js:1150 +msgid "Folder creation failed." +msgstr "フォルダ作成に失敗しました。" + +#: website/static/js/fangorn.js:1168 +msgid " Deleting..." +msgstr " 削除中..." + +#: website/static/js/fangorn.js:1190 +msgid "Delete failed." +msgstr "削除に失敗しました。" + +#: website/static/js/fangorn.js:1205 +msgid "" +"This folder and all of its contents will be deleted. This folder is " +"linked to " +msgstr "このフォルダーとその内容はすべて削除されます。 このフォルダーは、" + +#: website/static/js/fangorn.js:1206 +msgid "your wiki(s). Deleting it will remove images embedded in your wiki(s). " +msgstr "Wikiにリンクされています。 削除すると、Wikiに埋め込まれた画像が削除されます。" + +#: website/static/js/fangorn.js:1207 website/static/js/fangorn.js:1235 +#: website/static/js/fangorn.js:1258 website/static/js/pages/base-page.js:132 +msgid "This action is irreversible." +msgstr "このアクションは元に戻せません。" + +#: website/static/js/fangorn.js:1210 +msgid "" +"This folder and ALL its contents will be deleted. This action is " +"irreversible." +msgstr "このフォルダーとその内容はすべて削除されます。 このアクションは元に戻せません。" + +#: website/static/js/fangorn.js:1216 website/static/js/fangorn.js:1239 +#: website/static/js/fangorn.js:2018 website/static/js/fangorn.js:2054 +#: website/static/js/filepage/index.js:204 +#: website/static/js/filepage/index.js:517 website/static/js/myProjects.js:1637 +msgid "Delete" +msgstr "削除" + +#: website/static/js/fangorn.js:1218 website/static/js/fangorn.js:1243 +msgid "Delete \"%1$s\"?" +msgstr "\"%1$s\"を削除しますか?" + +#: website/static/js/fangorn.js:1220 +msgid "You don't have permission to delete this file." +msgstr "このファイルを削除する権限がありません。" + +#: website/static/js/fangorn.js:1228 +msgid "This file may be linked to your wiki(s). Deleting it will remove the" +msgstr "このファイルはWikiにリンクされている場合があります。 削除すると、" + +#: website/static/js/fangorn.js:1229 +msgid " image embedded in your wiki(s). " +msgstr "Wikiに埋め込まれた画像が削除されます" + +#: website/static/js/fangorn.js:1269 +msgid "" +"Some of the selected items are folders. This will delete the folder(s) " +"and ALL of their content." +msgstr "選択したアイテムの一部はフォルダーです。 これにより、フォルダーとそのすべてのコンテンツが削除されます。" + +#: website/static/js/fangorn.js:1283 +msgid " may be linked to" +msgstr "ウィキにリンクされている可能性があります。" + +#: website/static/js/fangorn.js:1284 +msgid " your wiki(s). Deleting them will remove images embedded in your wiki(s). " +msgstr "れらを削除すると、ウィキに埋め込まれた画像が削除されます。" + +#: website/static/js/fangorn.js:1292 +msgid "Delete All" +msgstr "全て削除" + +#: website/static/js/fangorn.js:1296 +msgid "" +"Some of these files can't be deleted but you can delete the ones " +"highlighted with green. This action is irreversible." +msgstr "これらのファイルの一部は削除できませんが、削除できます" + +#: website/static/js/fangorn.js:1311 +msgid "Delete Some" +msgstr "一部を削除" + +#: website/static/js/fangorn.js:1314 +msgid "Delete multiple files?" +msgstr "複数のファイルを削除しますか?" + +#: website/static/js/fangorn.js:1340 +msgid "" +"Unable to check out file. This is most likely due to the file being " +"already checked-out" +msgstr "ファイルをチェックアウトできません。 これは、ファイルが別のユーザーによって既にチェックアウトされていることが原因" + +#: website/static/js/fangorn.js:1341 +msgid " by another user." +msgstr "である可能性があります。" + +#: website/static/js/fangorn.js:1692 website/static/js/fileViewTreebeard.js:63 +#: website/static/js/filesWidget.js:34 website/static/js/meetings.js:18 +#: website/static/js/pages/project-dashboard-page.js:549 +#: website/static/js/project-organizer.js:192 +#: website/static/js/project-organizer.js:208 website/static/js/wikiMenu.js:58 +msgid "Name" +msgstr "名前" + +#: website/static/js/fangorn.js:1697 +msgid "Size" +msgstr "サイズ" + +#: website/static/js/fangorn.js:1701 +msgid "Version" +msgstr "バージョン" + +#: website/static/js/fangorn.js:1709 +#: website/static/js/pages/project-dashboard-page.js:555 +#: website/static/js/project-organizer.js:201 +msgid "Modified" +msgstr "最終更新日時" + +#: website/static/js/fangorn.js:1783 +msgid "Unable to retrieve components." +msgstr "コンポーネントを取得できません。" + +#: website/static/js/fangorn.js:1785 +msgid "Unable to retrieve components for node %1$s" +msgstr "ノード%1$sのコンポーネントを取得できません" + +#: website/static/js/fangorn.js:1867 +msgid "You cannot rename your Wiki images folder." +msgstr "Wiki画像フォルダの名前を変更することはできません。" + +#: website/static/js/fangorn.js:1975 +msgid "Upload" +msgstr "アップロード" + +#: website/static/js/fangorn.js:1982 +msgid "Create Folder" +msgstr "新規フォルダ作成" + +#: website/static/js/fangorn.js:1989 +msgid "Delete Folder" +msgstr "フォルダを削除" + +#: website/static/js/fangorn.js:1998 website/static/js/filepage/index.js:520 +#: website/static/js/filepage/revisions.js:111 +msgid "Download" +msgstr "ダウンロード" + +#: website/static/js/fangorn.js:2008 website/static/js/filepage/index.js:542 +msgid "View" +msgstr "プレビュー" + +#: website/static/js/fangorn.js:2024 website/static/js/filepage/index.js:216 +msgid "This would mean " +msgstr "これは、" + +#: website/static/js/fangorn.js:2025 website/static/js/filepage/index.js:217 +msgid "" +"other contributors cannot edit, delete or upload new versions of this " +"file " +msgstr "チェックアウトされている限り他のメンバーがこのファイルの新しいバージョンを編集、削除、またはアップロードできないことを意味します。" + +#: website/static/js/fangorn.js:2026 +msgid "as long as it is checked-out. You can check it back in at anytime." +msgstr "いつでもチェックインできます。" + +#: website/static/js/fangorn.js:2031 website/static/js/fangorn.js:2036 +#: website/static/js/filepage/index.js:243 +msgid "Check out file" +msgstr "ファイルをチェックアウト" + +#: website/static/js/fangorn.js:2032 +msgid "Confirm file check-out?" +msgstr "ファイルのチェックアウトを確認しますか?" + +#: website/static/js/fangorn.js:2045 +msgid "Check in file" +msgstr "ファイルをチェックイン" + +#: website/static/js/fangorn.js:2073 +msgid "Download as zip" +msgstr "ZIPでダウンロード" + +#: website/static/js/fangorn.js:2084 website/static/js/myProjects.js:1613 +msgid "Rename" +msgstr "名前を変更" + +#: website/static/js/fangorn.js:2093 +msgid "copy link" +msgstr "リンクをコピー" + +#: website/static/js/fangorn.js:2175 +msgid "New folder name" +msgstr "新しいフォルダ名" + +#: website/static/js/fangorn.js:2203 +msgid "Enter name" +msgstr "名前を入力" + +#: website/static/js/fangorn.js:2240 +msgid "Cancel Pending Uploads" +msgstr "保留中のアップロードをキャンセル" + +#: website/static/js/fangorn.js:2264 +msgid "Delete Multiple" +msgstr "複数削除" + +#: website/static/js/fangorn.js:2275 website/static/js/fangorn.js:2996 +msgid "Filter" +msgstr "フィルタ" + +#: website/static/js/fangorn.js:2280 +msgid "Select rows:" +msgstr "行を選択:" + +#: website/static/js/fangorn.js:2280 +msgid "" +" Click on a row (outside the add-on, file, or folder name) to show " +"further actions in the toolbar. Use Command or Shift keys to select " +"multiple files." +msgstr "" +"行(アドオン、ファイル、またはフォルダー名の外側)をクリックして、ツールバーにさらにアクションを表示します。 " +"複数のファイルを選択するには、コマンドまたはShiftキーを使用します。" + +#: website/static/js/fangorn.js:2281 +msgid "Open files:" +msgstr "ファイルを開く:" + +#: website/static/js/fangorn.js:2281 +msgid " Click a file name to go to view the file in the GakuNin RDM." +msgstr "ファイル名をクリックして、GakuNin RDMでファイルを表示します。" + +#: website/static/js/fangorn.js:2282 +msgid "Open files in new tab:" +msgstr "新しいタブでファイルを開く:" + +#: website/static/js/fangorn.js:2282 +msgid "" +" Press Command (Ctrl in Windows) and click a file name to open it in a " +"new tab." +msgstr "コマンド(WindowsではCtrl)を押し、ファイル名をクリックして新しいタブで開きます。" + +#: website/static/js/fangorn.js:2283 +msgid "Download as zip:" +msgstr "ZIPでダウンロード:" + +#: website/static/js/fangorn.js:2283 +msgid "" +" Click on the row of an add-on or folder and click the Download as Zip " +"button in the toolbar." +msgstr "アドオンまたはフォルダーの行をクリックし、ツールバーの [ZIPでダウンロード] ボタンをクリックします。" + +#: website/static/js/fangorn.js:2283 +msgid " Not available for all storage add-ons." +msgstr "すべてのストレージアドオンで利用できるわけではありません。" + +#: website/static/js/fangorn.js:2284 +msgid "Copy files:" +msgstr "ファイルをコピー:" + +#: website/static/js/fangorn.js:2284 +msgid "" +" Press Option (Alt in Windows) while dragging a file to a new folder or " +"component." +msgstr "オプション(WindowsではAlt)を押しながら、ファイルを新しいフォルダーまたはコンポーネントにドラッグします。" + +#: website/static/js/fangorn.js:2284 +msgid " Only for contributors with write access." +msgstr "書き込みアクセス権を持つメンバーのみ。" + +#: website/static/js/fangorn.js:2290 +msgid "How to Use the File Browser" +msgstr "ファイルブラウザの使用方法" + +#: website/static/js/fangorn.js:2354 +msgid "Please wait for current action to complete" +msgstr "現在のアクションが完了するまでお待ちください" + +#: website/static/js/fangorn.js:2535 +msgid "Upload Status" +msgstr "ステータスをアップロード" + +#: website/static/js/fangorn.js:2535 +msgid " files succeeded." +msgstr "ファイルが成功しました。" + +#: website/static/js/fangorn.js:2646 +msgid "Done" +msgstr "完了" + +#: website/static/js/fangorn.js:2648 +msgid "Move Status" +msgstr "移動ステータス" + +#: website/static/js/fangorn.js:2650 +msgid " files successfully moved." +msgstr "ファイルが移動成功しました。" + +#: website/static/js/fangorn.js:2651 +msgid " Skipped %1$s/%2$s files." +msgstr "%1$s/%2$sファイルをスキップしました。" + +#: website/static/js/fangorn.js:2921 +msgid "You have pending uploads, if you leave this page they may not complete." +msgstr "保留中のアップロードがあります。このページを離れると、アップロードが完了しない場合があります。" + +#: website/static/js/fangorn.js:2924 +msgid "" +"You have pending file operations, if you leave this page they may not " +"complete." +msgstr "保留中のファイル操作があります。このページを離れると、完了しない場合があります。" + +#: website/static/js/fangorn.js:2958 +msgid "This file is too large (%1$s). Max file size is %2$s." +msgstr "このファイルは大きすぎます(%1$s)。 最大ファイルサイズは%2$sです。" + +#: website/static/js/fangorn.js:2974 +msgid "Not enough quota to upload the file." +msgstr "ファイルをアップロードするのに十分なクォータがありません。" + +#: website/static/js/fangorn.js:2981 +msgid "Quota usage alert" +msgstr "クォータ使用量アラート" + +#: website/static/js/fangorn.js:2982 +#, python-format +msgid "You have used more than %1$s% of your quota." +msgstr "割り当ての%1$s%%以上を使用しました。" + +#: website/static/js/fileViewTreebeard.js:120 +msgid "Uploading %1$s..." +msgstr "%1$sをアップロードしています..." + +#: website/static/js/filesWidget.js:77 +msgid "Could not GET files" +msgstr "ファイルを取得できませんでした" + +#: website/static/js/filesWidget.js:92 +msgid "Sorry, we could not load files right now. " +msgstr "申し訳ありませんが、現在ファイルを読み込めませんでした。" + +#: website/static/js/firebase-messaging-sw.js:11 +msgid "RDM Announcements" +msgstr "RDMのお知らせ" + +#: website/static/js/firebase-messaging-sw.js:13 +msgid "Background Message body." +msgstr "背景メッセージ本文。" + +#: website/static/js/folderPickerNodeConfig.js:108 +msgid "" +"Could not retrieve %1$s settings at this time. The credentials associated" +" with this %1$s account may no longer be valid." +msgstr "現在、%1$sの設定を取得できませんでした。 この%1$sアカウントに関連付けられている認証情報は無効になっている可能性があります。" + +#: website/static/js/folderPickerNodeConfig.js:109 +msgid "" +" Try disconnecting and reconnecting the %1$s account on your account settings page." +msgstr "アカウント設定ページで%1$sアカウントを切断して再接続してみてください" + +#: website/static/js/folderPickerNodeConfig.js:112 +msgid "" +"Could not retrieve %1$s settings at this time. The %1$s addon credentials" +" may no longer be valid." +msgstr "現在、%1$sの設定を取得できませんでした。%1$sアドオンの認証情報は無効になっている可能性があります。" + +#: website/static/js/folderPickerNodeConfig.js:113 +msgid " Contact %1$s to verify." +msgstr "確認するには%1$sにお問い合わせください。" + +#: website/static/js/folderPickerNodeConfig.js:116 +msgid "" +"Could not retrieve %1$s settings at this time. Please refresh the page. " +"If the problem persists, email %2$s." +msgstr "現在、%1$sの設定を取得できませんでした。 ページを更新してください。 問題が解決しない場合は、%2$sにメールしてください。" + +#: website/static/js/folderPickerNodeConfig.js:119 +msgid "" +"Could not retrieve %1$s account list at this time. Please refresh the " +"page. If the problem persists, email %2$s." +msgstr "現在、%1$sアカウントリストを取得できませんでした。 ページを更新してください。 問題が解決しない場合は、%2$sにメールしてください。" + +#: website/static/js/folderPickerNodeConfig.js:122 +msgid "Disconnected %1$s." +msgstr "%1$sを切断しました。" + +#: website/static/js/folderPickerNodeConfig.js:125 +msgid "" +"Could not disconnect %1$s account because of an error. Please try again " +"later." +msgstr "エラーのため、%1$sアカウントを切断できませんでした。 後でもう一度やり直してください。" + +#: website/static/js/folderPickerNodeConfig.js:128 +msgid "Successfully connected a %1$s account" +msgstr "%1$sアカウントを正常に接続しました" + +#: website/static/js/folderPickerNodeConfig.js:131 +msgid "" +"Error while authorizing addon. Please log in to your %1$s account and " +"grant access to the GakuNin RDM to enable this addon." +msgstr "" +"アドオンの認証中にエラーが発生しました。 このアドオンを有効にするには、%1$sアカウントにログインし、GakuNin " +"RDMへのアクセスを許可してください。" + +#: website/static/js/folderPickerNodeConfig.js:139 +msgid "Could not change %1$s settings. Please try again later." +msgstr "%1$sの設定を変更できませんでした。 後でもう一度やり直してください。" + +#: website/static/js/folderPickerNodeConfig.js:142 +msgid "Are you sure you want to remove this %1$s account?" +msgstr "この%1$sアカウントを切断してもよろしいですか?" + +#: website/static/js/folderPickerNodeConfig.js:145 +msgid "Are you sure you want to link your %1$s account with this project?" +msgstr "%1$sアカウントをこのプロジェクトに接続してもよろしいですか?" + +#: website/static/js/folderPickerNodeConfig.js:148 +msgid "Successfully imported %1$s account from profile." +msgstr "プロファイルから%1$sアカウントを正常にインポートしました。" + +#: website/static/js/folderPickerNodeConfig.js:151 +msgid "Error occurred while importing %1$s account." +msgstr "%1$sアカウントのインポート中にエラーが発生しました。" + +#: website/static/js/folderPickerNodeConfig.js:154 +msgid "Error occurred while importing %1$s group libraries." +msgstr "%1$sアカウントのインポート中にエラーが発生しました。" + +#: website/static/js/folderPickerNodeConfig.js:157 +msgid "Could not connect to %1$s at this time. Please try again later." +msgstr "現在、%1$sに接続できませんでした。 後でもう一度やり直してください。" + +#: website/static/js/folderPickerNodeConfig.js:321 +msgid "Could not GET %1$s settings" +msgstr "%1$sの設定を取得できませんでした" + +#: website/static/js/folderPickerNodeConfig.js:349 +#: website/static/js/folderPickerNodeConfig.js:382 +msgid "Failed to update %1$s settings." +msgstr "%1$sの設定を更新できませんでした。" + +#: website/static/js/folderPickerNodeConfig.js:431 +msgid "Failed to import %1$s access token." +msgstr "%1$sアクセストークンのインポートに失敗しました。" + +#: website/static/js/folderPickerNodeConfig.js:443 +msgid "Failed to import %1$s group libraries." +msgstr "%1$sグループライブラリのインポートに失敗しました。" + +#: website/static/js/folderPickerNodeConfig.js:497 +#: website/static/js/oauthAddonNodeConfig.js:162 +msgid "Import %1$s Account?" +msgstr "%1$sアカウントに接続しますか?" + +#: website/static/js/folderPickerNodeConfig.js:536 +msgid "Could not deauthorize %1$s account from node" +msgstr "ノードから%1$sアカウントを認証解除できませんでした" + +#: website/static/js/folderPickerNodeConfig.js:552 +msgid "Disconnect %1$s Account?" +msgstr "%1$sアカウントを切断しますか?" + +#: website/static/js/folderPickerNodeConfig.js:645 +#: website/static/js/folderPickerNodeConfig.js:656 +msgid "Could not GET get %1$s contents." +msgstr "%1$sアカウントを切断しますか?" + +#: website/static/js/folderpicker.js:101 +msgid "Folders" +msgstr "フォルダ" + +#: website/static/js/folderpicker.js:105 +msgid "Select" +msgstr "選択" + +#: website/static/js/institutionNodes.js:26 +msgid "Failed to load Institution's nodes" +msgstr "機関のノードを読み込めませんでした" + +#: website/static/js/institutionProjectSettings.js:47 +#: website/static/js/institutionProjectSettings.js:127 +msgid "Add institution" +msgstr "機関を追加" + +#: website/static/js/institutionProjectSettings.js:47 +#: website/static/js/institutionProjectSettings.js:127 +msgid "Remove institution" +msgstr "機関を削除" + +#: website/static/js/institutionProjectSettings.js:59 +msgid "" +"Add %1$s to %2$s or to %3$s and every component in " +"it?

                                                        " +msgstr "%1$sを%2$sまたは%3$sとその中のすべてのコンポーネントに追加しますか?" + +#: website/static/js/institutionProjectSettings.js:60 +msgid "Add to %1$s." +msgstr "%1$sに追加" + +#: website/static/js/institutionProjectSettings.js:61 +msgid "Add to %1$s and every component for which you have permission." +msgstr "%1$sと、許可があるすべてのコンポーネントに追加します。" + +#: website/static/js/institutionProjectSettings.js:64 +msgid "" +"Remove %1$s from %2$s or from %3$s and every " +"component in it?

                                                        " +msgstr "%2$sまたは%3$sおよびその中のすべてのコンポーネントから%1$sを削除しますか?" + +#: website/static/js/institutionProjectSettings.js:65 +msgid "Remove from %1$s." +msgstr "%1$sから削除します。" + +#: website/static/js/institutionProjectSettings.js:66 +msgid "Remove from %1$s and every component for which you have permission." +msgstr "%1$sおよび許可されているすべてのコンポーネントから削除します。" + +#: website/static/js/institutionProjectSettings.js:69 +#: website/static/js/institutionProjectSettings.js:86 +msgid "Warning, you are not affiliated with %1$s." +msgstr "警告、%1$sと提携していません" + +#: website/static/js/institutionProjectSettings.js:70 +#: website/static/js/institutionProjectSettings.js:87 +msgid " If you remove it from your project, you cannot add it back.
                                                        " +msgstr "プロジェクトから削除した場合、追加し直すことはできません。
                                                        " + +#: website/static/js/institutionProjectSettings.js:85 +msgid "Remove %1$s from %2$s." +msgstr "%2$sから%1$sを削除します。" + +#: website/static/js/institutionProjectSettings.js:157 +msgid "Updating affiliation... this may take a minute." +msgstr "所属を更新しています...これには数分かかる場合があります。" + +#: website/static/js/institutionProjectSettings.js:202 +msgid "" +"Unable to modify the institution on this node. Please try again. If the " +"problem persists, email %1$s" +msgstr "このノードの機関を変更できません。もう一度試してください。問題が解決しない場合は、%1$sにメールを送信してください" + +#: website/static/js/institutionProjectSettings.js:203 +msgid "Unable to modify this institution!" +msgstr "この機関を変更できません!" + +#: website/static/js/js_messages.js:3 +msgid "Bookmarks" +msgstr "ブックマーク" + +#: website/static/js/js_messages.js:5 +msgid "Edit" +msgstr "編集" + +#: website/static/js/js_messages.js:7 +msgid "Analysis" +msgstr "分析" + +#: website/static/js/js_messages.js:7 +msgid "Communication" +msgstr "コミュニケーション" + +#: website/static/js/js_messages.js:7 +msgid "Data" +msgstr "データ" + +#: website/static/js/js_messages.js:7 +msgid "Hypothesis" +msgstr "仮説" + +#: website/static/js/js_messages.js:7 +msgid "Instrumentation" +msgstr "器具" + +#: website/static/js/js_messages.js:7 +msgid "Methods and Measures" +msgstr "方法と対策" + +#: website/static/js/js_messages.js:7 +msgid "Procedure" +msgstr "手順" + +#: website/static/js/js_messages.js:7 +#: website/static/js/projectSettingsTreebeardBase.js:90 +msgid "Project" +msgstr "プロジェクト" + +#: website/static/js/js_messages.js:7 +msgid "Software" +msgstr "ソフトウェア" + +#: website/static/js/js_messages.js:7 +msgid "Other" +msgstr "その他" + +#: website/static/js/js_messages.js:9 +msgid "analysis" +msgstr "分析" + +#: website/static/js/js_messages.js:9 +msgid "communication" +msgstr "コミュニケーション" + +#: website/static/js/js_messages.js:9 +msgid "data" +msgstr "データ" + +#: website/static/js/js_messages.js:9 +msgid "hypothesis" +msgstr "仮説" + +#: website/static/js/js_messages.js:9 +msgid "instrumentation" +msgstr "器具" + +#: website/static/js/js_messages.js:9 +msgid "methods and measures" +msgstr "方法と対策" + +#: website/static/js/js_messages.js:9 +msgid "procedure" +msgstr "手順" + +#: website/static/js/js_messages.js:9 website/static/js/nodeControl.js:114 +#: website/static/js/nodeSelectTreebeard.js:87 +#: website/static/js/nodesDeleteTreebeard.js:62 +#: website/static/js/nodesPrivacySettingsTreebeard.js:62 +msgid "project" +msgstr "プロジェクト" + +#: website/static/js/js_messages.js:9 +msgid "software" +msgstr "ソフトウェア" + +#: website/static/js/js_messages.js:9 +msgid "other" +msgstr "その他" + +#: website/static/js/js_messages.js:11 website/static/js/js_messages.js:13 +msgid "Comments added" +msgstr "コメント追加時" + +#: website/static/js/js_messages.js:11 website/static/js/js_messages.js:13 +msgid "Files updated" +msgstr "ファイルアップロード時" + +#: website/static/js/js_messages.js:13 +msgid "Replies to your comments" +msgstr "コメントへの返信時" + +#: website/static/js/js_messages.js:13 +msgid "Mentions added" +msgstr "メンション追加時" + +#: website/static/js/js_messages.js:13 +msgid "Preprint submissions updated" +msgstr "プレプリント提出の更新時" + +#: website/static/js/js_messages.js:15 +msgid "No license" +msgstr "ライセンスなし" + +#: website/static/js/js_messages.js:17 website/static/js/passwordForms.js:178 +#: website/static/js/passwordForms.js:241 +msgid "This field is required." +msgstr "この項目は必須です。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a value greater than or equal to {0}." +msgstr "{0}以上の値を入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a value less than or equal to {0}." +msgstr "{0}以下の値を入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter at least {0} characters." +msgstr "{0}文字以上入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter no more than {0} characters." +msgstr "{0}文字以下で入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please check this value." +msgstr "値を確認してください。" + +#: website/static/js/js_messages.js:17 +msgid "The value must increment by {0}." +msgstr "値は{0}ずつ増加する必要があります。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a proper email address." +msgstr "正しいメールアドレスを入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a proper date." +msgstr "適切な日付を入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a number." +msgstr "数字を入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please enter a digit." +msgstr "数字を入力してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please specify a valid phone number." +msgstr "有効な電話番号を指定してください。" + +#: website/static/js/js_messages.js:17 +msgid "Values must equal." +msgstr "値は等しくなければなりません。" + +#: website/static/js/js_messages.js:17 +msgid "Please choose another value." +msgstr "別の値を選択してください。" + +#: website/static/js/js_messages.js:17 +msgid "Please make sure the value is unique." +msgstr "値が一意であることを確認してください。" + +#: website/static/js/js_messages.js:19 +msgid "Project Wiki Pages" +msgstr "プロジェクトのWiki" + +#: website/static/js/js_messages.js:19 +msgid "Component Wiki Pages" +msgstr "コンポーネントのWiki" + +#: website/static/js/js_messages.js:19 +msgid "Home" +msgstr "ホーム" + +#: website/static/js/js_messages.js:21 +msgid "Projects" +msgstr "プロジェクト" + +#: website/static/js/js_messages.js:21 +msgid "Components" +msgstr "コンポーネント" + +#: website/static/js/js_messages.js:21 +msgid "Registrations" +msgstr "登録" + +#: website/static/js/js_messages.js:21 +msgid "Users" +msgstr "ユーザー" + +#: website/static/js/js_messages.js:21 +msgid "All Results" +msgstr "全検索結果" + +#: website/static/js/js_messages.js:21 +msgid "Files" +msgstr "ファイル" + +#: website/static/js/js_messages.js:21 +msgid "Institutions" +msgstr "機関" + +#: website/static/js/js_messages.js:21 +msgid "Preprints" +msgstr "プレプリント" + +#: website/static/js/js_messages.js:21 +msgid "Groups" +msgstr "グループ" + +#: website/static/js/js_messages.js:21 +msgid "Wiki" +msgstr "Wiki" + +#: website/static/js/js_messages.js:21 +msgid "Comments" +msgstr "コメント" + +#: website/static/js/js_messages.js:23 +msgid "Default Notification Settings" +msgstr "デフォルトの通知設定" + +#: website/static/js/js_messages.js:23 +msgid "" +"These are default settings for new projects you create or are added to. " +"Modifying these settings will not modify settings on existing projects." +msgstr "これらは、作成または追加される新しいプロジェクトのデフォルト設定です。 これらの設定を変更しても、既存のプロジェクトの設定は変更されません。" + +#: website/static/js/js_messages.js:23 +msgid "Project Notifications" +msgstr "プロジェクト通知" + +#: website/static/js/js_messages.js:23 +msgid "" +"These are settings for each of your projects. Modifying these settings " +"will only modify the settings for the selected project." +msgstr "これらは、プロジェクトごとの設定です。 これらの設定を変更すると、選択したプロジェクトの設定のみが変更されます。" + +#: website/static/js/js_messages.js:25 +msgid "moved" +msgstr "移動" + +#: website/static/js/js_messages.js:25 +msgid "renamed" +msgstr "名前の変更" + +#: website/static/js/js_messages.js:27 +msgid "Skipped" +msgstr "スキップ済" + +#: website/static/js/js_messages.js:27 +msgid "Moved or replaced old version" +msgstr "古いバージョンを移動または置換" + +#: website/static/js/js_messages.js:27 +msgid "Kept both versions" +msgstr "両方のバージョンを保持" + +#: website/static/js/js_messages.js:29 +msgid "admin" +msgstr "管理者" + +#: website/static/js/js_messages.js:29 +msgid "write" +msgstr "書込み" + +#: website/static/js/js_messages.js:29 +msgid "read" +msgstr "読込み" + +#: website/static/js/js_messages.js:31 +msgid "home" +msgstr "ホーム" + +#: website/static/js/js_messages.js:33 +msgid "No tokens." +msgstr "トークンがありません。" + +#: website/static/js/js_messages.js:33 +msgid "Invalid tokens." +msgstr "無効なトークンです。" + +#: website/static/js/js_messages.js:35 +msgid "Invalid folder." +msgstr "無効なフォルダです。" + +#: website/static/js/js_messages.js:35 +msgid "Credentials are valid" +msgstr "有効な認証情報が設定されています。" + +#: website/static/js/keen.js:114 +msgid "Error sending Keen data to %1$s:<%2$s>" +msgstr "Keenデータの%1$sへの送信エラー:<%2$s>" + +#: website/static/js/keen.js:132 +msgid "Error sending Keen data for multiple events: <%1$s>" +msgstr "複数のイベントのKeenデータの送信エラー:<%1$s>" + +#: website/static/js/keen.js:141 +msgid "Error sending Keen data to %1$s." +msgstr "Keenデータを%1$sに送信中にエラーが発生しました。" + +#: website/static/js/keen.js:153 +msgid "Cannot instantiate another KeenTracker instance." +msgstr "別のKeenTrackerインスタンスをインスタンス化できません。" + +#: website/static/js/koHelpers.js:129 +msgid "End date must be greater than or equal to the start date." +msgstr "終了日は開始日以上でなければなりません。" + +#: website/static/js/koHelpers.js:147 +msgid "Date must be greater than or equal to 1900." +msgstr "日付は1900以上でなければなりません。" + +#: website/static/js/koHelpers.js:169 +msgid "Please enter a date prior to the current date." +msgstr "現在の日付より前の日付を入力してください。" + +#: website/static/js/koHelpers.js:175 +msgid "Please enter a valid year." +msgstr "有効な年を入力してください。" + +#: website/static/js/koHelpers.js:190 +msgid "Please enter a valid URL." +msgstr "有効なURLを入力してください。" + +#: website/static/js/koHelpers.js:197 +msgid "The field does not match the required input." +msgstr "フィールドが必要な入力と一致しません。" + +#: website/static/js/licensePicker.js:20 website/static/js/profile.js:128 +#: website/static/js/profile.js:132 +msgid "Year" +msgstr "年" + +#: website/static/js/licensePicker.js:21 +msgid "Copyright Holders" +msgstr "著作権者" + +#: website/static/js/licensePicker.js:26 +msgid "License:" +msgstr "ライセンス:" + +#: website/static/js/licensePicker.js:27 +msgid "Choose a license:" +msgstr "ライセンスを選択:" + +#: website/static/js/licensePicker.js:28 +msgid ">Save<" +msgstr ">保存<" + +#: website/static/js/licensePicker.js:68 +msgid "Add a license" +msgstr "ライセンスを追加" + +#: website/static/js/licensePicker.js:104 +msgid "Please specify a valid year." +msgstr "有効な年を指定してください。" + +#: website/static/js/licensePicker.js:108 +msgid "Future years are not allowed." +msgstr "将来の年は許可されていません。" + +#: website/static/js/licensePicker.js:190 +msgid "License updated successfully." +msgstr "ライセンスが正常に更新されました。" + +#: website/static/js/licensePicker.js:195 +msgid "There was a problem updating your license. Please try again." +msgstr "ライセンスの更新中に問題が発生しました。 もう一度やり直してください。" + +#: website/static/js/licensePicker.js:239 +msgid "Your Own License" +msgstr "自分のライセンス" + +#: website/static/js/licensePicker.js:240 +msgid "" +"You have opted to use your own license. Please upload a license file " +"named \"license.txt\" into the GakuNin RDM Storage of this project." +msgstr "" +"独自のライセンスを使用することを選択しました。「license.txt」という名前のライセンスファイルをこのプロジェクトのGakuNin " +"RDMストレージにアップロードしてください。" + +#: website/static/js/licensePicker.js:247 +msgid "Add license" +msgstr "ライセンスを追加" + +#: website/static/js/licenses.js:27 +msgid "Content:" +msgstr "コンテンツ用" + +#: website/static/js/licenses.js:31 +msgid "Code - Permissive:" +msgstr "コード用 - 非コピーレフト" + +#: website/static/js/licenses.js:35 +msgid "Code - Copyleft:" +msgstr "コード用 - コピーレフト" + +#: website/static/js/licenses.js:39 +msgid "Code - Other:" +msgstr "コード用 - その他" + +#: website/static/js/logActionsList_extract.js:3 +#: website/static/js/logActionsList_extract.js:70 +msgid "${user} created ${node}" +msgstr "${user}が${node}を作成しました" + +#: website/static/js/logActionsList_extract.js:4 +msgid "${user} registered ${node}" +msgstr "${user}が${node}を登録しました" + +#: website/static/js/logActionsList_extract.js:5 +msgid "${node} registered" +msgstr "${node}が登録されました" + +#: website/static/js/logActionsList_extract.js:6 +msgid "" +"${user} submitted for review to the Preregistration Challenge a " +"registration of ${node}" +msgstr "${user}が${node}の登録を事前登録チャレンジにレビューのために提出しました" + +#: website/static/js/logActionsList_extract.js:7 +msgid "${user} deleted ${node}" +msgstr "${user}が${node}を削除しました" + +#: website/static/js/logActionsList_extract.js:8 +msgid "${user} created ${node} based on ${template}" +msgstr "${user}が${template}に基づいて${node}を作成しました" + +#: website/static/js/logActionsList_extract.js:9 +msgid "${user} created a link to ${pointer_category} ${pointer}" +msgstr "${user}が${pointer_category} ${pointer}へのリンクを作成しました" + +#: website/static/js/logActionsList_extract.js:10 +msgid "${user} forked a link to ${pointer_category} ${pointer}" +msgstr "${user}が${pointer_category} ${pointer}へのリンクをforkしました" + +#: website/static/js/logActionsList_extract.js:11 +msgid "${user} removed a link to ${pointer_category} ${pointer}" +msgstr "${user}が${pointer_category} ${pointer}へのリンクを削除しました" + +#: website/static/js/logActionsList_extract.js:12 +msgid "${user} added ${group} to ${node}" +msgstr "${user}が${group}を${node}に追加しました" + +#: website/static/js/logActionsList_extract.js:13 +msgid "${user} removed ${group} from ${node}" +msgstr "${user}が${node}から${group}を削除しました" + +#: website/static/js/logActionsList_extract.js:14 +msgid "${user} changed ${group} permissions to ${node}" +msgstr "${user}が${group}の権限を${node}に変更しました" + +#: website/static/js/logActionsList_extract.js:15 +msgid "${user} made ${node} public" +msgstr "${user}が${node}を公開しました" + +#: website/static/js/logActionsList_extract.js:16 +msgid "${node} made public" +msgstr "${node}が公開されました" + +#: website/static/js/logActionsList_extract.js:17 +msgid "${user} made ${node} private" +msgstr "${user}が${node}を非公開にしました" + +#: website/static/js/logActionsList_extract.js:18 +msgid "${user} added tag ${tag} to ${node}" +msgstr "${user}さんがタグ${tag}を${node}に追加しました" + +#: website/static/js/logActionsList_extract.js:19 +msgid "${user} removed tag ${tag} from ${node}" +msgstr "${user}が${node}からタグ${tag}を削除しました" + +#: website/static/js/logActionsList_extract.js:20 +msgid "${user} changed the title from ${title_original} to ${title_new}" +msgstr "${user}がタイトルを${title_original}から${title_new}に変更しました" + +#: website/static/js/logActionsList_extract.js:21 +msgid "${user} edited description of ${node}" +msgstr "${user}が${node}の説明を編集しました" + +#: website/static/js/logActionsList_extract.js:22 +msgid "${user} changed the ${updated_fields} for ${node}" +msgstr "${user}が${node}の${updated_fields}を変更しました" + +#: website/static/js/logActionsList_extract.js:23 +msgid "${user} created external identifier(s) ${identifiers} on ${node}" +msgstr "${user}が${node}に外部識別子${identifiers}を作成しました" + +#: website/static/js/logActionsList_extract.js:24 +msgid "${user} created a custom citation for ${node}" +msgstr "${user}が${node}のカスタム引用を作成しました" + +#: website/static/js/logActionsList_extract.js:25 +msgid "${user} edited a custom citation for ${node}" +msgstr "${user}が${node}のカスタム引用を編集しました" + +#: website/static/js/logActionsList_extract.js:26 +msgid "${user} removed a custom citation for ${node}" +msgstr "${user}が${node}のカスタム引用を削除しました" + +#: website/static/js/logActionsList_extract.js:27 +msgid "${user} added ${contributors} as contributor(s) to ${node}" +msgstr "${user}が${contributors}をコントリビューターとして${node}に追加しました" + +#: website/static/js/logActionsList_extract.js:28 +msgid "${user} removed ${contributors} as contributor(s) from ${node}" +msgstr "${user}が${node}からコントリビューターとして${contributors}を削除しました" + +#: website/static/js/logActionsList_extract.js:29 +msgid "${user} reordered contributors for ${node}" +msgstr "${user}が${node}の投稿者を並べ替えました" + +#: website/static/js/logActionsList_extract.js:30 +msgid "${user} changed permissions for ${node}" +msgstr "${user}が${node}の権限を変更しました" + +#: website/static/js/logActionsList_extract.js:31 +msgid "" +"${user} made non-bibliographic contributor ${contributors} a " +"bibliographic contributor on ${node}" +msgstr "${user}が目録非表示メンバー(${contributors})を${node}の目録表示メンバーにしました" + +#: website/static/js/logActionsList_extract.js:32 +msgid "" +"${user} made bibliographic contributor ${contributors} a non-" +"bibliographic contributor on ${node}" +msgstr "${user}が目録表示メンバー(${contributors})を${node}の目録非表示メンバーにしました" + +#: website/static/js/logActionsList_extract.js:33 +msgid "${user} updated wiki page ${page} to version ${version} of ${node}" +msgstr "${user}が${node}のWiki(${page})をバージョン${version}に更新" + +#: website/static/js/logActionsList_extract.js:34 +msgid "${user} deleted wiki page ${page} of ${node}" +msgstr "${user}が${node}のWikiページ${page}を削除しました" + +#: website/static/js/logActionsList_extract.js:35 +msgid "${user} renamed wiki page ${old_page} to ${page} of ${node}" +msgstr "${user}がWikiページ${old_page}の名前を${node}の${page}に変更しました" + +#: website/static/js/logActionsList_extract.js:36 +msgid "${user} made the wiki of ${node} publicly editable" +msgstr "${user}が${node}のwikiをパブリックに編集可能にしました" + +#: website/static/js/logActionsList_extract.js:37 +msgid "${user} made the wiki of ${node} privately editable" +msgstr "${user}が${node}のwikiをプライベートに編集可能にしました" + +#: website/static/js/logActionsList_extract.js:38 +msgid "${user} added addon ${addon} to ${node}" +msgstr "${user}が${node}にアドオン${addon}を追加しました" + +#: website/static/js/logActionsList_extract.js:39 +msgid "${user} removed addon ${addon} from ${node}" +msgstr "${user}が${node}からアドオン${addon}を削除しました" + +#: website/static/js/logActionsList_extract.js:40 +msgid "${user} moved ${source} to ${destination} in ${node}" +msgstr "${user}が${source}を${node}の${destination}に移動しました" + +#: website/static/js/logActionsList_extract.js:41 +msgid "${user} copied ${source} to ${destination} in ${node}" +msgstr "${user}が${source}を${node}の${destination}にコピーしました" + +#: website/static/js/logActionsList_extract.js:42 +msgid "${user} renamed ${source} to ${destination} in ${node}" +msgstr "${user}は${node}で${source}を${destination}に名前変更しました" + +#: website/static/js/logActionsList_extract.js:43 +msgid "${user} created a folder in ${node}" +msgstr "${user}が${node}にフォルダを作成しました" + +#: website/static/js/logActionsList_extract.js:44 +msgid "${user} added file ${path} to ${node}" +msgstr "${user}がファイル${path}を${node}に追加しました" + +#: website/static/js/logActionsList_extract.js:45 +msgid "${user} updated file in ${node}" +msgstr "${user}が${node}のファイルを更新しました" + +#: website/static/js/logActionsList_extract.js:46 +msgid "${user} removed ${path_type} ${path} from ${node}" +msgstr "${user}が${node}から${path_type} ${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:47 +msgid "${user} restored file ${path} from ${node}" +msgstr "${user}が${node}からファイル${path}を復元しました" + +#: website/static/js/logActionsList_extract.js:48 +msgid "${user} updated the file metadata for ${path}" +msgstr "${user}が${path}のファイルメタデータを更新しました" + +#: website/static/js/logActionsList_extract.js:49 +msgid "${user} checked out ${kind} ${path} from ${node}" +msgstr "${user}が${node}から${kind} ${path}をチェックアウトしました" + +#: website/static/js/logActionsList_extract.js:50 +msgid "${user} checked in ${kind} ${path} to ${node}" +msgstr "${user}が${kind} ${path}を${node}にチェックインしました" + +#: website/static/js/logActionsList_extract.js:51 +msgid "${user} added a comment ${comment_location} in ${node}" +msgstr "${user}さんが${node}にコメント${comment_location}を追加しました" + +#: website/static/js/logActionsList_extract.js:52 +msgid "${user} deleted a comment ${comment_location} in ${node}" +msgstr "${user}さんが${node}のコメント${comment_location}を削除しました" + +#: website/static/js/logActionsList_extract.js:53 +msgid "${user} restored a comment ${comment_location} in ${node}" +msgstr "${user}が${node}のコメント${comment_location}を復元しました" + +#: website/static/js/logActionsList_extract.js:54 +msgid "${user} updated a comment ${comment_location} in ${node}" +msgstr "${user}が${node}のコメント${comment_location}を更新しました" + +#: website/static/js/logActionsList_extract.js:55 +msgid "${user} initiated an embargoed registration of ${node}" +msgstr "${user}が${node}の禁止登録を開始しました" + +#: website/static/js/logActionsList_extract.js:56 +msgid "${user} approved embargoed registration of ${node}" +msgstr "${user}が${node}の禁止登録を承認しました" + +#: website/static/js/logActionsList_extract.js:57 +msgid "Embargo of registration of ${node} approved" +msgstr "${node}の登録の禁止が承認されました" + +#: website/static/js/logActionsList_extract.js:58 +msgid "${user} cancelled embargoed registration of ${node}" +msgstr "${user}が${node}の禁止登録をキャンセルしました" + +#: website/static/js/logActionsList_extract.js:59 +msgid "${user} completed embargo of ${node}" +msgstr "${user}が${node}の禁止を完了しました" + +#: website/static/js/logActionsList_extract.js:60 +msgid "Embargo for ${node} completed" +msgstr "${node}の禁止が完了しました" + +#: website/static/js/logActionsList_extract.js:61 +msgid "Embargo for ${node} ended" +msgstr "${node}の禁止が終了しました" + +#: website/static/js/logActionsList_extract.js:62 +msgid "${user} initiated withdrawal of registration of ${node}" +msgstr "${user}が${node}の登録の取り消しを開始しました" + +#: website/static/js/logActionsList_extract.js:63 +msgid "A withdrawal of registration of ${node} is proposed" +msgstr "${node}の登録の削除が提案されています" + +#: website/static/js/logActionsList_extract.js:64 +msgid "${user} approved withdrawal of registration of ${node}" +msgstr "${user}は${node}の登録の取り消しを承認しました" + +#: website/static/js/logActionsList_extract.js:65 +msgid "${user} cancelled withdrawal of registration of ${node}" +msgstr "${user}が${node}の登録の取り消しをキャンセルしました" + +#: website/static/js/logActionsList_extract.js:66 +msgid "${user} initiated registration of ${node}" +msgstr "${user}が${node}の登録を開始しました" + +#: website/static/js/logActionsList_extract.js:67 +msgid "${user} approved registration of ${node}" +msgstr "${user}が${node}の登録を承認しました" + +#: website/static/js/logActionsList_extract.js:68 +msgid "Registration of ${node} approved" +msgstr "${node}の登録が承認されました" + +#: website/static/js/logActionsList_extract.js:69 +msgid "${user} cancelled registration of ${node}" +msgstr "${user}が${node}の登録をキャンセルしました" + +#: website/static/js/logActionsList_extract.js:71 +msgid "${user} created fork from ${forked_from}" +msgstr "${user}が${forked_from}からフォークを作成しました" + +#: website/static/js/logActionsList_extract.js:72 +msgid "${user} removed ${node}" +msgstr "${user}が${node}を削除しました" + +#: website/static/js/logActionsList_extract.js:73 +msgid "${user} enabled access requests for ${node}" +msgstr "${user}が${node}のアクセス要求を有効にしました" + +#: website/static/js/logActionsList_extract.js:74 +msgid "${user} disabled access requests for ${node}" +msgstr "${user}が${node}のアクセス要求を無効にしました" + +#: website/static/js/logActionsList_extract.js:75 +msgid "${user} updated the license of ${node} ${license}" +msgstr "${user}が${node} ${license}のライセンスを更新しました" + +#: website/static/js/logActionsList_extract.js:76 +msgid "${user} added tag ${tag} to ${path} in ${storage_name} in ${node}" +msgstr "${user}が${node}の${storage_name}の${path}にタグ${tag}を追加しました" + +#: website/static/js/logActionsList_extract.js:77 +msgid "${user} removed tag ${tag} from ${path} in ${storage_name} in ${node}" +msgstr "${user}が${node}の${storage_name}の${path}からタグ${tag}を削除しました" + +#: website/static/js/logActionsList_extract.js:78 +msgid "${user} added file ${path} to ${storage_name} in ${node}" +msgstr "${user}が${node}の${storage_name}にファイル${path}を追加しました" + +#: website/static/js/logActionsList_extract.js:79 +msgid "${user} created folder ${path} in ${storage_name} in ${node}" +msgstr "${user}が${node}の${storage_name}にフォルダ${path}を作成しました" + +#: website/static/js/logActionsList_extract.js:80 +msgid "${user} updated file ${path} in ${storage_name} in ${node}" +msgstr "${user}が${node}の${storage_name}のファイル${path}を更新しました" + +#: website/static/js/logActionsList_extract.js:81 +msgid "${user} removed ${path_type} ${path} from ${storage_name} in ${node}" +msgstr "${user}は${node}の${storage_name}から${path_type} ${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:82 +msgid "${user} added ${institution} affiliation to ${node}" +msgstr "${user}が${institution}の所属を${node}に追加しました" + +#: website/static/js/logActionsList_extract.js:83 +msgid "${user} removed ${institution} affiliation from ${node}" +msgstr "${user}が${institution}の所属を${node}から削除しました" + +#: website/static/js/logActionsList_extract.js:84 +msgid "${user} made ${node} a ${preprint} on ${preprint_provider} Preprints" +msgstr "${user}が${preprint_provider}プレプリントで${node}を${preprint}にしました" + +#: website/static/js/logActionsList_extract.js:85 +msgid "" +"${user} updated the primary file of this ${preprint} on " +"${preprint_provider} Preprints" +msgstr "$ß{user}が${preprint_provider}プレプリントでこの${preprint}のプライマリファイルを更新しました" + +#: website/static/js/logActionsList_extract.js:86 +msgid "" +"${user} updated the license of this ${preprint} on ${preprint_provider} " +"Preprints ${license}" +msgstr "${user}が${preprint_provider}プレプリント${license}でこの${preprint}のライセンスを更新しました" + +#: website/static/js/logActionsList_extract.js:87 +msgid "${user} updated the subjects on ${node} to ${subjects}" +msgstr "${user}が${node}の件名を${subjects}に更新しました" + +#: website/static/js/logActionsList_extract.js:88 +msgid "${user} created ${anonymous_link} view-only link to ${node}" +msgstr "${user}が${node}への${anonymous_link}参照専用リンクを作成しました" + +#: website/static/js/logActionsList_extract.js:89 +msgid "${user} removed ${anonymous_link} view-only link to ${node}" +msgstr "${user}が${node}への${anonymous_link}参照専用リンクを削除しました" + +#: website/static/js/logActionsList_extract.js:90 +msgid "${user} verified timestamp" +msgstr "${user}がタイムスタンプ確認" + +#: website/static/js/logActionsList_extract.js:91 +msgid "${user} requested trusted timestamp" +msgstr "${user}がタイムスタンプを打つ" + +#: website/static/js/logActionsList_extract.js:92 +msgid "${user} requested trusted timestamp file ${path}" +msgstr "${user}がファイル${path}にタイムスタンプを打つ" + +#: website/static/js/logActionsList_extract.js:93 +msgid "" +"${user} downloaded a file of timestamp errors as a " +"${timestamp_errors_file_format}" +msgstr "${user}がタイムスタンプエラーのファイルを${timestamp_errors_file_format}でダウンロード" + +#: website/static/js/logActionsList_extract.js:94 +msgid "" +"[MAPCORE_SYNC:ERROR] ${user} cannot create a new mAP group for GRDM " +"project <${node}> (See logs for details)" +msgstr "" +"[MAPCORE_SYNC:ERROR] " +"${user}はGRDMプロジェクト<${node}>の新しいmAPグループを作成できません(詳細はログを参照してください)" + +#: website/static/js/logActionsList_extract.js:95 +msgid "" +"[MAPCORE_SYNC:ERROR] mAP group for GRDM project <${node}> cannot be " +"updated (See logs for details)" +msgstr "[MAPCORE_SYNC:ERROR] GRDMプロジェクト<${node}>のmAPグループを更新できません(詳細はログを参照してください)" + +#: website/static/js/logActionsList_extract.js:96 +msgid "" +"[MAPCORE_SYNC:ERROR] GRDM project <${node}> cannot be updated with mAP " +"group (See logs for details)" +msgstr "[MAPCORE_SYNC:ERROR] GRDMプロジェクト<${node}>はmAPグループで更新できません(詳細はログを参照してください)" + +#: website/static/js/logActionsList_extract.js:97 +msgid "" +"[MAPCORE_SYNC:NOTICE] Unknown (unregistered in GRDM) users belong to mAP " +"group <${node}> (ignored) (See logs for details)" +msgstr "" + +#: website/static/js/logActionsList_extract.js:98 +msgid "${user} linked the Azure Blob Storage container ${bucket} to ${node}" +msgstr "${user}がAzure Blob Storageコンテナ${bucket}を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:99 +msgid "${user} unselected the Azure Blob Storage container ${bucket} in ${node}" +msgstr "${user}が${node}のAzure Blob Storageコンテナ${bucket}の選択を解除しました" + +#: website/static/js/logActionsList_extract.js:100 +msgid "" +"${user} added file ${path} to Azure Blob Storage container ${bucket} in " +"${node}" +msgstr "${user}がファイル${path}を${node}のAzure Blob Storageコンテナ${bucket}に追加しました" + +#: website/static/js/logActionsList_extract.js:101 +msgid "" +"${user} removed ${path} in Azure Blob Storage container ${bucket} in " +"${node}" +msgstr "${user}が${node}のAzure Blob Storageコンテナ${bucket}の${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:102 +msgid "" +"${user} updated file ${path} in Azure Blob Storage container ${bucket} in" +" ${node}" +msgstr "${user}が${node}のAzure Blob Storageコンテナ${bucket}のファイル${path}を更新しました" + +#: website/static/js/logActionsList_extract.js:103 +msgid "" +"${user} created folder ${path} in Azure Blob Storage container ${bucket} " +"in ${node}" +msgstr "${user}が${node}のAzure Blob Storageコンテナ${bucket}にフォルダ${path}を作成しました" + +#: website/static/js/logActionsList_extract.js:104 +msgid "${user} authorized the Azure Blob Storage addon for ${node}" +msgstr "${user}が${node}のAzure Blob Storageアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:105 +msgid "${user} deauthorized the Azure Blob Storage addon for ${node}" +msgstr "${user}が${node}のAzure Blob Storageアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:106 +msgid "Azure Blob Storage addon for ${node} deauthorized" +msgstr "許可されていない${node}のAzure Blob Storageアドオン" + +#: website/static/js/logActionsList_extract.js:107 +msgid "${user} added file ${path} to Bitbucket repo ${bitbucket_repo} in ${node}" +msgstr "${user}がファイル${path}を${node}のBitbucketリポジトリ(${bitbucket_repo})に追加しました" + +#: website/static/js/logActionsList_extract.js:108 +msgid "" +"${user} removed ${path_type} ${path} in Bitbucket repo ${bitbucket_repo} " +"in ${node}" +msgstr "${user}が${node}のBitbucketリポジトリ(${bitbucket_repo})で${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:109 +msgid "" +"${user} updated file ${path} in Bitbucket repo ${bitbucket_repo} in " +"${node}" +msgstr "${user}が${node}のBitbucketレポジトリ(${bitbucket_repo})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:110 +msgid "" +"${user} created folder ${path} in Bitbucket repo ${bitbucket_repo} in " +"${node}" +msgstr "${user}が${node}のBitbucketリポジトリ(${bitbucket_repo})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:111 +msgid "${user} authorized the Bitbucket addon for ${node}" +msgstr "${user}が${node}のBitbucketアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:112 +msgid "${user} deauthorized the Bitbucket addon for ${node}" +msgstr "${user}が${node}のBitbucketアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:113 +msgid "Bitbucket addon for ${node} deauthorized" +msgstr "許可されていない${node}のBitbucketアドオン" + +#: website/static/js/logActionsList_extract.js:114 +msgid "${user} linked Bitbucket repo ${bitbucket_repo} to ${node}" +msgstr "${user}がBitbucketリポジトリ(${bitbucket_repo})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:115 +msgid "${user} added file ${path} to Box in ${node}" +msgstr "${user}がファイル${path}を${node}のBoxに追加しました" + +#: website/static/js/logActionsList_extract.js:116 +msgid "${user} removed ${path_type} ${path} from Box in ${node}" +msgstr "${user}が${node}のBoxから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:117 +msgid "${user} updated file ${path} in Box in ${node}" +msgstr "${user}が${node}のBoxのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:118 +msgid "${user} created folder ${path} in Box in ${node}" +msgstr "${user}が${node}のBoxにフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:119 +msgid "${user} linked Box folder ${box_folder} to ${node}" +msgstr "${user}がBoxフォルダ(${box_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:120 +msgid "${user} authorized the Box addon in ${node}" +msgstr "${user}が${node}のBoxアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:121 +msgid "${user} deauthorized the Box addon for ${node}" +msgstr "${user}が${node}のBoxアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:122 +msgid "Box addon for ${node} deauthorized" +msgstr "許可されていない${node}のボックスアドオン" + +#: website/static/js/logActionsList_extract.js:123 +msgid "${user} added a citation ${citation} to ${node}" +msgstr "${user}が${node}に引用(${citation})を追加しました" + +#: website/static/js/logActionsList_extract.js:124 +msgid "${user} updated a citation ${citation} in ${node}" +msgstr "${user}が${node}の引用(${citation})を更新しました" + +#: website/static/js/logActionsList_extract.js:125 +msgid "${user} removed a citation ${citation} in ${node}" +msgstr "${user}が${node}の引用(${citation})を削除しました" + +#: website/static/js/logActionsList_extract.js:126 +msgid "${user} added file ${filename} to Dataverse dataset ${dataset} in ${node}" +msgstr "${user}がファイル(${filename})を${node}のDataverseデータセット(${dataset})に追加しました" + +#: website/static/js/logActionsList_extract.js:127 +msgid "" +"${user} removed file ${filename} from Dataverse dataset ${dataset} in " +"${node}" +msgstr "${user}が${node}のDataverseデータセット(${dataset})からファイル(${filename})を削除しました" + +#: website/static/js/logActionsList_extract.js:128 +msgid "${user} linked Dataverse dataset ${dataset} to ${node}" +msgstr "${user}がDataverseデータセット(${dataset})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:129 +msgid "${user} linked Dataverse dataset ${study} to ${node}" +msgstr "${user}がDataverseデータセット(${study})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:130 +msgid "${user} published a new version of Dataverse dataset ${dataset} on ${node}" +msgstr "${user}がDataverseデータセット(${dataset})の新しいバージョンを${node}に公開しました" + +#: website/static/js/logActionsList_extract.js:131 +msgid "${user} published a new version of Dataverse dataset ${study} to ${node}" +msgstr "${user}がDataverseデータセット(${study})の新しいバージョンを${node}に公開しました" + +#: website/static/js/logActionsList_extract.js:132 +msgid "${user} authorized the Dataverse addon for ${node}" +msgstr "${user}が${node}のDataverseアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:133 +msgid "${user} deauthorized the Dataverse addon for ${node}" +msgstr "${user}が${node}のDataverseアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:134 +msgid "Dataverse addon for ${node} deauthorized" +msgstr "許可されていない${node}のDataverseアドオン" + +#: website/static/js/logActionsList_extract.js:135 +msgid "${user} added file ${path} to Dropbox in ${node}" +msgstr "${user}がファイル${path}を${node}のDropboxに追加しました" + +#: website/static/js/logActionsList_extract.js:136 +msgid "${user} removed ${path_type} ${path} from Dropbox in ${node}" +msgstr "${user}が${node}のDropboxから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:137 +msgid "${user} updated file ${path} in Dropbox in ${node}" +msgstr "${user}が${node}のDropboxのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:138 +msgid "${user} created folder ${path} in Dropbox in ${node}" +msgstr "${user}が${node}のDropboxにフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:139 +msgid "${user} linked Dropbox folder ${dropbox_folder} to ${node}" +msgstr "${user}がDropboxフォルダ(${dropbox_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:140 +msgid "${user} authorized the Dropbox addon for ${node}" +msgstr "${user}が${node}のDropboxアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:141 +msgid "${user} deauthorized the Dropbox addon for ${node}" +msgstr "${user}が${node}のDropboxアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:142 +msgid "Dropbox addon for ${node} deauthorized" +msgstr "許可されていない${node}のDropboxアドオン" + +#: website/static/js/logActionsList_extract.js:143 +msgid "${user} added file ${path} to Dropbox Business in ${node}" +msgstr "${user}がファイル(${path})を${node}のDropbox Businessに追加しました" + +#: website/static/js/logActionsList_extract.js:144 +msgid "${user} removed ${path_type} ${path} from Dropbox Business in ${node}" +msgstr "${user}が${node}のDropbox Businessから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:145 +msgid "${user} updated file ${path} in Dropbox Business in ${node}" +msgstr "${user}が${node}のDropbox Businessのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:146 +msgid "${user} created folder ${path} in Dropbox Business in ${node}" +msgstr "${user}が${node}のDropbox Businessにフォルダ${path}を作成しました" + +#: website/static/js/logActionsList_extract.js:147 +msgid "" +"${user} linked Dropbox Business folder ${dropboxbusiness_folder} to " +"${node}" +msgstr "${user}がDropbox Businessフォルダ(${dropboxbusiness_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:148 +msgid "${user} authorized the Dropbox Business addon for ${node}" +msgstr "${user}が${node}のDropbox Businessアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:149 +msgid "${user} deauthorized the Dropbox Business addon for ${node}" +msgstr "${user}が${node}のDropbox Businessアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:150 +msgid "Dropbox Business addon for ${node} deauthorized" +msgstr "許可されていない${node}のDropbox Businessアドオン" + +#: website/static/js/logActionsList_extract.js:151 +msgid "${user} linked figshare ${folder} ${folder_name} to ${node}" +msgstr "${user}がfigshare ${folder}(${folder_name})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:152 +msgid "${user} unlinked content from figshare in ${node}" +msgstr "${user}が${node}のfigshareからリンク解除されたコンテンツ" + +#: website/static/js/logActionsList_extract.js:153 +msgid "${user} added file ${path} to figshare in ${node}" +msgstr "${user}がファイル${path}を${node}のfigshareに追加しました" + +#: website/static/js/logActionsList_extract.js:154 +msgid "${user} removed ${path_type} ${path} from figshare in ${node}" +msgstr "${user}が${node}のfigshareから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:155 +msgid "${user} created folder ${path} in figshare in ${node}" +msgstr "${user}が${node}のfigshareにフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:156 +msgid "${user} authorized the figshare addon for ${node}" +msgstr "${user}が${node}のfigshareアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:157 +msgid "${user} deauthorized the figshare addon for ${node}" +msgstr "${user}が${node}のfigshareアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:158 +msgid "figshare addon for ${node} deauthorized" +msgstr "許可されていない${node}のfigshareアドオン" + +#: website/static/js/logActionsList_extract.js:159 +msgid "${user} changed external link to ${forward_url} in ${node}" +msgstr "${user}が${node}の外部リンクを${forward_url}に変更しました" + +#: website/static/js/logActionsList_extract.js:160 +msgid "${user} added file ${path} to GitHub repo ${repo} in ${node}" +msgstr "${user}がファイル${path}を${node}のGitHubリポジトリ(${repo})に追加しました" + +#: website/static/js/logActionsList_extract.js:161 +msgid "${user} removed ${path_type} ${path} in GitHub repo ${repo} in ${node}" +msgstr "${user}が${node}のGitHubリポジトリ(${repo})で${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:162 +msgid "${user} updated file ${path} in GitHub repo ${repo} in ${node}" +msgstr "${user}が${node}のGitHubリポジトリ(${repo})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:163 +msgid "${user} created folder ${path} in GitHub repo ${repo} in ${node}" +msgstr "${user}が${node}のGitHubリポジトリ(${repo})にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:164 +msgid "${user} authorized the GitHub addon for ${node}" +msgstr "${user}が${node}のGitHubアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:165 +msgid "${user} deauthorized the GitHub addon for ${node}" +msgstr "${user}が${node}のGitHubアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:166 +msgid "GitHub addon for ${node} deauthorized" +msgstr "許可されていない${node}のGitHubアドオン" + +#: website/static/js/logActionsList_extract.js:167 +msgid "${user} linked GitHub repo ${repo} to ${node}" +msgstr "${user}がGitHubリポジトリ${repo}を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:168 +msgid "${user} added file ${path} to GitLab repo ${gitlab_repo} in ${node}" +msgstr "${user}がファイル(${path})を${node}のGitLabリポジトリ(${gitlab_repo})に追加しました" + +#: website/static/js/logActionsList_extract.js:169 +msgid "${user} removed file ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "${user}が${node}のGitLabリポジトリ(${gitlab_repo})のファイル(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:170 +msgid "${user} updated file ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "${user}が${node}のGitLabリポジトリ(${gitlab_repo})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:171 +msgid "${user} created folder ${path} in GitLab repo ${gitlab_repo} in ${node}" +msgstr "${user}が${node}のGitLabリポジトリ(${gitlab_repo})にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:172 +msgid "${user} authorized the GitLab addon for ${node}" +msgstr "${user}が${node}のGitLabアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:173 +msgid "${user} deauthorized the GitLab addon for ${node}" +msgstr "${user}が${node}のGitLabアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:174 +msgid "GitLab addon for ${node} deauthorized" +msgstr "許可されていない${node}のGitLabアドオン" + +#: website/static/js/logActionsList_extract.js:175 +msgid "${user} linked GitLab repo ${gitlab_repo} to ${node}" +msgstr "${user}がGitLabリポジトリ(${gitlab_repo})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:176 +msgid "${user} added file ${googledrive_path} to Google Drive in ${node}" +msgstr "${user}がファイル(${googledrive_path})を${node}のGoogle Driveに追加しました" + +#: website/static/js/logActionsList_extract.js:177 +msgid "" +"${user} removed ${path_type} ${googledrive_path} from Google Drive in " +"${node}" +msgstr "${user}が${node}のGoogle Driveから${path_type}(${googledrive_path})を削除しました" + +#: website/static/js/logActionsList_extract.js:178 +msgid "${user} updated file ${googledrive_path} in Google Drive in ${node}" +msgstr "${user}が${node}のGoogle Driveのファイル(${googledrive_path})を更新しました" + +#: website/static/js/logActionsList_extract.js:179 +msgid "${user} created folder ${googledrive_path} in Google Drive in ${node}" +msgstr "${user}が${node}のGoogle Driveにフォルダ(${googledrive_path})を作成しました" + +#: website/static/js/logActionsList_extract.js:180 +msgid "${user} linked Google Drive folder ${googledrive_folder} to ${node}" +msgstr "${user}がGoogle Driveフォルダ(${googledrive_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:181 +msgid "${user} authorized the Google Drive addon for ${node}" +msgstr "${user}が${node}のGoogle Driveアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:182 +msgid "${user} deauthorized the Google Drive addon for ${node}" +msgstr "${user}が${node}のGoogle Driveアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:183 +msgid "Google Drive addon for ${node} deauthorized" +msgstr "許可されていない${node}のGoogle Driveアドオン" + +#: website/static/js/logActionsList_extract.js:184 +msgid "${user} added file ${iqbrims_path} to IQB-RIMS in ${node}" +msgstr "${user}が${node}のIQB-RIMSにファイル$({iqbrims_path})を追加しました" + +#: website/static/js/logActionsList_extract.js:185 +msgid "${user} removed ${path_type} ${iqbrims_path} from IQB-RIMS in ${node}" +msgstr "${user}が${node}のIQB-RIMSから${path_type}(${iqbrims_path})を削除しました" + +#: website/static/js/logActionsList_extract.js:186 +msgid "${user} updated file ${iqbrims_path} in IQB-RIMS in ${node}" +msgstr "${user}が${node}のIQB-RIMSのファイル(${iqbrims_path})を更新しました" + +#: website/static/js/logActionsList_extract.js:187 +msgid "${user} created folder ${iqbrims_path} in IQB-RIMS in ${node}" +msgstr "${user}が${node}のIQB-RIMSにフォルダ(${iqbrims_path})を作成しました" + +#: website/static/js/logActionsList_extract.js:188 +msgid "${user} linked IQB-RIMS folder ${iqbrims_folder} to ${node}" +msgstr "${user}がIQB-RIMSフォルダ(${iqbrims_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:189 +msgid "${user} authorized the IQB-RIMS addon for ${node}" +msgstr "${user}が${node}のIQB-RIMSアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:190 +msgid "${user} deauthorized the IQB-RIMS addon for ${node}" +msgstr "${user}が${node}のIQB-RIMSアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:191 +msgid "IQB-RIMS addon for ${node} deauthorized" +msgstr "許可されていない${node}のIQB-RIMSアドオン" + +#: website/static/js/logActionsList_extract.js:192 +#: website/static/js/logActionsList_extract.js:194 +msgid "${user} started IQB-RIMS workflow for ${node}" +msgstr "${user}が${node}のIQB-RIMSワークフローを開始しました" + +#: website/static/js/logActionsList_extract.js:193 +#: website/static/js/logActionsList_extract.js:195 +msgid "Finished workflow of ${user} for ${node}" +msgstr "${node}の${user}のワークフローが終了しました" + +#: website/static/js/logActionsList_extract.js:196 +msgid "${user} linked Mendeley folder ${folder_name} to ${node}" +msgstr "${user}がMendeleyフォルダ(${folder_name})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:197 +msgid "${user} authorized the Mendeley addon for ${node}" +msgstr "${user}が${node}のMendeleyアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:198 +msgid "${user} deauthorized the Mendeley addon for ${node}" +msgstr "${user}が${node}のMendeleyアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:199 +msgid "${user} added file ${path} to Nextcloud in ${node}" +msgstr "${user}が${node}のNextcloudにファイル(${path})を追加しました" + +#: website/static/js/logActionsList_extract.js:200 +msgid "${user} removed ${path_type} ${path} from Nextcloud in ${node}" +msgstr "${user}が${node}のNextcloudから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:201 +msgid "${user} updated file ${path} in Nextcloud in ${node}" +msgstr "${user}が${node}のNextcloudのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:202 +msgid "${user} created folder ${path} in Nextcloud in ${node}" +msgstr "${user}が${node}のNextcloudにフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:203 +msgid "${user} linked Nextcloud folder ${folder} to ${node}" +msgstr "${user}がNextcloudフォルダ(${folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:204 +msgid "${user} authorized the Nextcloud addon for ${node}" +msgstr "${user}が${node}のNextcloudアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:205 +msgid "${user} deauthorized the Nextcloud addon for ${node}" +msgstr "${user}が${node}のNextcloudアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:206 +msgid "Nextcloud addon for ${node} deauthorized" +msgstr "許可されていない${node}のNextcloudアドオン" + +#: website/static/js/logActionsList_extract.js:207 +msgid "${user} added file ${path} to Microsoft OneDrive in ${node}" +msgstr "${user}が${node}のMicrosoft OneDriveにファイル(${path})を追加しました" + +#: website/static/js/logActionsList_extract.js:208 +msgid "${user} removed ${path_type} ${path} from Microsoft OneDrive in ${node}" +msgstr "${user}が${node}のMicrosoft OneDriveから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:209 +msgid "${user} updated file ${path} in Microsoft OneDrive in ${node}" +msgstr "${user}が${node}のMicrosoft OneDriveのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:210 +msgid "${user} created folder ${path} in Microsoft OneDrive in ${node}" +msgstr "${user}がMicrosoft OneDriveの${node}にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:211 +msgid "${user} linked Microsoft OneDrive folder ${onedrive_folder} to ${node}" +msgstr "${user}がMicrosoft OneDriveフォルダ(${onedrive_folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:212 +msgid "${user} authorized the Microsoft OneDrive addon for ${node}" +msgstr "${user}が${node}のMicrosoft OneDriveアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:213 +msgid "${user} deauthorized the Microsoft OneDrive addon for ${node}" +msgstr "${user}が${node}のMicrosoft OneDriveアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:214 +msgid "Microsoft OneDrive addon for ${node} deauthorized" +msgstr "許可されていない${node}のMicrosoft OneDriveアドオン" + +#: website/static/js/logActionsList_extract.js:215 +msgid "${user} added file ${path} to ownCloud in ${node}" +msgstr "${user}がファイル${path}を${node}のownCloudに追加しました" + +#: website/static/js/logActionsList_extract.js:216 +msgid "${user} removed ${path_type} ${path} from ownCloud in ${node}" +msgstr "${user}が${node}のownCloudから${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:217 +msgid "${user} updated file ${path} in ownCloud in ${node}" +msgstr "${user}が${node}のownCloudのファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:218 +msgid "${user} created folder ${path} in ownCloud in ${node}" +msgstr "${user}が${node}のownCloudにフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:219 +msgid "${user} linked ownCloud folder ${folder} to ${node}" +msgstr "${user}がownCloudフォルダ(${folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:220 +msgid "${user} authorized the ownCloud addon for ${node}" +msgstr "${user}が${node}のownCloudアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:221 +msgid "${user} deauthorized the ownCloud addon for ${node}" +msgstr "${user}が${node}のownCloudアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:222 +msgid "ownCloud addon for ${node} deauthorized" +msgstr "許可されていない${node}のownCloudアドオン" + +#: website/static/js/logActionsList_extract.js:223 +msgid "${user} linked the Amazon S3 bucket ${bucket} to ${node}" +msgstr "${user}がAmazon S3バケット(${bucket})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:224 +msgid "${user} unselected the Amazon S3 bucket ${bucket} in ${node}" +msgstr "${user}が${node}のAmazon S3バケット(${bucket})を選択解除しました" + +#: website/static/js/logActionsList_extract.js:225 +msgid "${user} added file ${path} to Amazon S3 bucket ${bucket} in ${node}" +msgstr "${user}がファイル(${path})を${node}のAmazon S3バケット(${bucket})に追加しました" + +#: website/static/js/logActionsList_extract.js:226 +msgid "${user} removed ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "${user}が${node}のAmazon S3バケット(${bucket})で${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:227 +msgid "${user} updated file ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "${user}が${node}のAmazon S3バケット(${bucket}の)ファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:228 +msgid "${user} created folder ${path} in Amazon S3 bucket ${bucket} in ${node}" +msgstr "${user}が${node}のAmazon S3バケット$({bucket})にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:229 +msgid "${user} authorized the Amazon S3 addon for ${node}" +msgstr "${user}が${node}のAmazon S3アドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:230 +msgid "${user} deauthorized the Amazon S3 addon for ${node}" +msgstr "${user}が${node}のAmazon S3アドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:231 +msgid "Amazon S3 addon for ${node} deauthorized" +msgstr "許可されていない${node}のAmazon S3アドオン" + +#: website/static/js/logActionsList_extract.js:232 +msgid "${user} linked the S3 Compatible Storage bucket ${bucket} to ${node}" +msgstr "${user}がS3互換ストレージバケット(${bucket})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:233 +msgid "${user} unselected the S3 Compatible Storage bucket ${bucket} in ${node}" +msgstr "${user}が${node}のS3互換ストレージバケット(${bucket})の選択を解除しました" + +#: website/static/js/logActionsList_extract.js:234 +msgid "" +"${user} added file ${path} to S3 Compatible Storage bucket ${bucket} in " +"${node}" +msgstr "${user}がファイル(${path})を${node}のS3互換ストレージバケット(${bucket})に追加しました" + +#: website/static/js/logActionsList_extract.js:235 +msgid "" +"${user} removed ${path} in S3 Compatible Storage bucket ${bucket} in " +"${node}" +msgstr "${user}が${node}のS3互換ストレージバケット(${bucket})で${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:236 +msgid "" +"${user} updated file ${path} in S3 Compatible Storage bucket ${bucket} in" +" ${node}" +msgstr "${user}が${node}のS3互換ストレージバケット(${bucket})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:237 +msgid "" +"${user} created folder ${path} in S3 Compatible Storage bucket ${bucket} " +"in ${node}" +msgstr "${user}が${node}のS3互換ストレージバケット(${bucket})にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:238 +msgid "${user} authorized the S3 Compatible Storage addon for ${node}" +msgstr "${user}が${node}のS3互換ストレージアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:239 +msgid "${user} deauthorized the S3 Compatible Storage addon for ${node}" +msgstr "${user}が${node}のS3互換ストレージアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:240 +msgid "S3 Compatible Storage addon for ${node} deauthorized" +msgstr "許可されていない${node}のS3互換ストレージアドオン" + +#: website/static/js/logActionsList_extract.js:241 +msgid "${user} linked the Swift container ${bucket} to ${node}" +msgstr "${user}がSwiftコンテナ(${bucket})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:242 +msgid "${user} unselected the Swift container ${bucket} in ${node}" +msgstr "${user}が${node}のSwiftコンテナ(${bucket})の選択を解除しました" + +#: website/static/js/logActionsList_extract.js:243 +msgid "${user} added file ${path} to Swift container ${bucket} in ${node}" +msgstr "${user}がファイル(${path})を${node}のSwiftコンテナ(${bucket})に追加しました" + +#: website/static/js/logActionsList_extract.js:244 +msgid "${user} removed ${path} in Swift container ${bucket} in ${node}" +msgstr "${user}が${node}のSwiftコンテナ(${bucket})で${path}を削除しました" + +#: website/static/js/logActionsList_extract.js:245 +msgid "${user} updated file ${path} in Swift container ${bucket} in ${node}" +msgstr "${user}が${node}のSwiftコンテナ(${bucket})のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:246 +msgid "${user} created folder ${path} in Swift container ${bucket} in ${node}" +msgstr "${user}が${node}のSwiftコンテナ(${bucket})にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:247 +msgid "${user} authorized the Swift addon for ${node}" +msgstr "${user}が${node}のSwiftアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:248 +msgid "${user} deauthorized the Swift addon for ${node}" +msgstr "${user}が${node}のSwiftアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:249 +msgid "Swift addon for ${node} deauthorized" +msgstr "許可されていない${node}のSwiftアドオン" + +#: website/static/js/logActionsList_extract.js:250 +msgid "${user} added file ${filename} to WEKO index ${dataset} in ${node}" +msgstr "${user}が${node}のWEKOインデックス(${dataset})にファイル(${filename})を追加しました" + +#: website/static/js/logActionsList_extract.js:251 +msgid "${user} removed file ${filename} from WEKO index ${dataset} in ${node}" +msgstr "${user}が${node}のWEKOインデックス(${dataset})からファイル(${filename})を削除しました" + +#: website/static/js/logActionsList_extract.js:252 +msgid "${user} linked WEKO index ${dataset} to ${node}" +msgstr "${user}がWEKOインデックス(${dataset})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:253 +msgid "${user} created an index ${filename} on ${node}" +msgstr "${user}が${node}にインデックス(${filename})を作成しました" + +#: website/static/js/logActionsList_extract.js:254 +msgid "${user} created an item ${filename} on ${node}" +msgstr "${user}が${node}にアイテム(${filename})を作成しました" + +#: website/static/js/logActionsList_extract.js:255 +msgid "${user} created folder ${filename} in WEKO index ${dataset} in ${node}" +msgstr "${user}が${node}のWEKOインデックス(${dataset})にフォルダ(${filename})を作成しました" + +#: website/static/js/logActionsList_extract.js:256 +msgid "${user} authorized the WEKO addon for ${node}" +msgstr "${user}が${node}のWEKOアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:257 +msgid "${user} deauthorized the WEKO addon for ${node}" +msgstr "${user}が${node}のWEKOアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:258 +msgid "WEKO addon for ${node} deauthorized" +msgstr "許可されていない${node}のWEKOアドオン" + +#: website/static/js/logActionsList_extract.js:259 +msgid "${user} linked Zotero folder ${folder_name} to ${node}" +msgstr "${user}がZoteroフォルダ(${folder_name})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:260 +msgid "${user} linked Zotero library ${library_name} to ${node}" +msgstr "${user}がZoteroライブラリ(${library_name})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:261 +msgid "${user} authorized the Zotero addon for ${node}" +msgstr "${user}が${node}のZoteroアドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:262 +msgid "${user} deauthorized the Zotero addon for ${node}" +msgstr "${user}が${node}のZoteroアドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:263 +msgid "${user} added file ${path} to Nextcloud (for Institutions) in ${node}" +msgstr "${user}が${node}のNextcloud(for Institutions)にファイル(${path})を追加しました" + +#: website/static/js/logActionsList_extract.js:264 +msgid "" +"${user} removed ${path_type} ${path} from Nextcloud (for Institutions) in" +" ${node}" +msgstr "${user}が${node}のNextcloud(for Institutions)から${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:265 +msgid "${user} updated file ${path} in Nextcloud (for Institutions) in ${node}" +msgstr "${user}が${node}のNextcloud(for Institutions)のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:266 +msgid "${user} created folder ${path} in Nextcloud (for Institutions) in ${node}" +msgstr "${user}が${node}のNextcloud(for Institutions)にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:267 +msgid "${user} linked Nextcloud (for Institutions) folder ${folder} to ${node}" +msgstr "${user}がNextcloud(for Institutions)フォルダ(${folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:268 +msgid "${user} authorized the Nextcloud (for Institutions) addon for ${node}" +msgstr "${user}が${node}のNextcloud(for Institutions)アドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:269 +msgid "${user} deauthorized the Nextcloud (for Institutions) addon for ${node}" +msgstr "${user}が${node}のNextcloud(for Institutions)アドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:270 +msgid "Nextcloud (for Institutions) addon for ${node} deauthorized" +msgstr "${node}のNextcloud(for Institutions)アドオンの認証が解除されました" + +#: website/static/js/logActionsList_extract.js:271 +msgid "" +"${user} added file ${path} to S3 Compatible Storage for Institutions in " +"${node}" +msgstr "${user}が${node}のS3互換ストレージ(for Institutions)にファイル(${path})を追加しました" + +#: website/static/js/logActionsList_extract.js:272 +msgid "" +"${user} removed ${path_type} ${path} from S3 Compatible Storage for " +"Institutions in ${node}" +msgstr "${user}が${node}のS3互換ストレージ(for Institutions)から${path_type}(${path})を削除しました" + +#: website/static/js/logActionsList_extract.js:273 +msgid "" +"${user} updated file ${path} in S3 Compatible Storage for Institutions in" +" ${node}" +msgstr "${user}が${node}のS3互換ストレージ(for Institutions)のファイル(${path})を更新しました" + +#: website/static/js/logActionsList_extract.js:274 +msgid "" +"${user} created folder ${path} in S3 Compatible Storage for Institutions " +"in ${node}" +msgstr "${user}が${node}のS3互換ストレージ(for Institutions)にフォルダ(${path})を作成しました" + +#: website/static/js/logActionsList_extract.js:275 +msgid "" +"${user} linked S3 Compatible Storage for Institutions folder ${folder} to" +" ${node}" +msgstr "${user}がS3互換ストレージ(for Institutions)のフォルダ(${folder})を${node}にリンクしました" + +#: website/static/js/logActionsList_extract.js:276 +msgid "" +"${user} authorized the S3 Compatible Storage for Institutions addon for " +"${node}" +msgstr "${user}が${node}のS3互換ストレージ(for Institutions)アドオンを承認しました" + +#: website/static/js/logActionsList_extract.js:277 +msgid "" +"${user} deauthorized the S3 Compatible Storage for Institutions addon for" +" ${node}" +msgstr "${user}が${node}のS3互換ストレージ(for Institutions)アドオンの認証を解除しました" + +#: website/static/js/logActionsList_extract.js:278 +msgid "S3 Compatible Storage for Institutions addon for ${node} deauthorized" +msgstr "${node}のS3互換ストレージ(for Institutions)アドオンの認証が解除されました" + +#: website/static/js/logTextParser.js:828 +msgid "unknown format" +msgstr "不明な形式" + +#: website/static/js/meetings.js:24 +msgid "Submissions" +msgstr "提出" + +#: website/static/js/meetings.js:30 +msgid "Location" +msgstr "ロケーション" + +#: website/static/js/filepage/revisions.js:109 website/static/js/meetings.js:36 +msgid "Date" +msgstr "更新日時" + +#: website/static/js/myProjects.js:308 +msgid "We're having some trouble contacting our servers. Try reloading the page." +msgstr "サーバーへの接続に問題があります。 ページを再読み込みしてください。" + +#: website/static/js/myProjects.js:308 +msgid "Something went wrong!" +msgstr "何かがうまくいきませんでした!" + +#: website/static/js/myProjects.js:433 +msgid "All my projects" +msgstr "全てのプロジェクト" + +#: website/static/js/myProjects.js:461 +msgid "Error loading project category names." +msgstr "プロジェクトカテゴリ名の読み込みエラー。" + +#: website/static/js/myProjects.js:665 +msgid "Some projects" +msgstr "いくつかのプロジェクト" + +#: website/static/js/myProjects.js:669 +msgid " could not be removed from the collection" +msgstr "がコレクションから削除できませんでした" + +#: website/static/js/myProjects.js:671 +msgid "Please try again." +msgstr "もう一度やり直して下さい" + +#: website/static/js/myProjects.js:764 +msgid "You have not created any projects yet." +msgstr "プロジェクトはまだ作成されていません。" + +#: website/static/js/myProjects.js:768 +msgid "" +"There have been no completed registrations for this institution, but you " +"can view the " +msgstr "この機関の登録は完了していませんが、次を表示できます:" + +#: website/static/js/myProjects.js:769 +msgid "newest public registrations" +msgstr "最新の公開登録" + +#: website/static/js/myProjects.js:770 website/static/js/myProjects.js:778 +msgid " or " +msgstr "または" + +#: website/static/js/myProjects.js:771 +msgid "popular public registrations." +msgstr "人気のある公開登録。" + +#: website/static/js/myProjects.js:774 +msgid "You have not made any registrations yet. Go to " +msgstr "まだ登録していません。登録の" + +#: website/static/js/myProjects.js:775 +msgid "Guides" +msgstr "仕組みを学習するためにガイドに" + +#: website/static/js/myProjects.js:775 +msgid " to learn how registrations work." +msgstr "行って下さい。" + +#: website/static/js/myProjects.js:778 +msgid "You have not made any preprints yet. Learn more about preprints in the " +msgstr "まだプレプリントを作成していません。 プレプリントの詳細については、" + +#: website/static/js/myProjects.js:778 +msgid "OSF Guides" +msgstr "OSFガイド" + +#: website/static/js/myProjects.js:778 +msgid "make one now." +msgstr "を読むか、今すぐ作りましょう。" + +#: website/static/js/myProjects.js:780 +msgid "" +"You have no bookmarks. You can add projects or registrations by dragging " +"them into your bookmarks or by clicking the Add to Bookmark button on the" +" project or registration." +msgstr "" +"ブックマークがありません。 " +"プロジェクトまたは登録を追加するには、それらをブックマークにドラッグするか、プロジェクトまたは登録の[ブックマークに追加]ボタンをクリックします。" + +#: website/static/js/myProjects.js:782 +msgid "This collection is empty." +msgstr "このコレクションは空です。" + +#: website/static/js/myProjects.js:784 +msgid "" +" You can add projects, registrations, or preprints by dragging them into " +"the collection." +msgstr "プロジェクト、登録、またはプレプリントをコレクションにドラッグして追加できます。" + +#: website/static/js/myProjects.js:795 +msgid "" +"No components to display. Either there are no components, or there are " +"private components in which you are not a contributor." +msgstr "表示するコンポーネントはありません。 コンポーネントがないか、メンバーではないプライベートコンポーネントがあります。" + +#: website/static/js/myProjects.js:966 +msgid "Collections could not be loaded." +msgstr "コレクションを読み込めませんでした。" + +#: website/static/js/myProjects.js:967 +msgid "Please reload the page." +msgstr "ページをリロードしてください。" + +#: website/static/js/myProjects.js:1109 +msgid "My Projects " +msgstr "マイプロジェクト " + +#: website/static/js/myProjects.js:1110 +msgid "Browse and organize all your projects" +msgstr "すべてのプロジェクトを管理する" + +#: website/static/js/myProjects.js:1115 +msgid "Create Project" +msgstr "新規プロジェクト作成" + +#: website/static/js/myProjects.js:1172 +msgid "Fetching more projects" +msgstr "より多くのプロジェクトを取得する" + +#: website/static/js/myProjects.js:1278 +msgid "\" collection could not be created." +msgstr "\"コレクションを作成できませんでした。" + +#: website/static/js/myProjects.js:1279 website/static/js/myProjects.js:1311 +#: website/static/js/myProjects.js:1336 +msgid "Please try again" +msgstr "もう一度やり直して下さい。" + +#: website/static/js/myProjects.js:1310 +msgid "\" could not be deleted." +msgstr "\"は削除できませんでした。" + +#: website/static/js/myProjects.js:1335 +msgid "\" could not be renamed." +msgstr "\"は名前を変更できませんでした。" + +#: website/static/js/myProjects.js:1383 +msgid "\" is already in \"%1$s\"" +msgstr "はすでに「%1$s」にあります。" + +#: website/static/js/myProjects.js:1469 +msgid "Collections " +msgstr "コレクション" + +#: website/static/js/myProjects.js:1472 +msgid "" +"Collections are groups of projects. You can create custom collections. " +"Drag and drop your projects or bookmarked projects to add them." +msgstr "" +"コレクションはプロジェクトのグループです。 " +"カスタムコレクションを作成できます。プロジェクトまたはブックマークしたプロジェクトをドラッグアンドドロップして追加します。" + +#: website/static/js/myProjects.js:1501 +msgid " Rename" +msgstr "リネーム" + +#: website/static/js/myProjects.js:1510 +msgid " Delete" +msgstr "削除" + +#: website/static/js/myProjects.js:1528 +msgid "Add new collection" +msgstr "新しいコレクションを追加" + +#: website/static/js/myProjects.js:1531 +msgid "" +"Collections are groups of projects that help you organize your work. " +"After you create your collection, you can add projects by dragging them " +"into the collection." +msgstr "コレクションは、作業の整理に役立つプロジェクトのグループです。コレクションを作成したら、プロジェクトをコレクションにドラッグしてプロジェクトを追加できます。" + +#: website/static/js/myProjects.js:1533 +msgid "Collection name" +msgstr "コレクション名" + +#: website/static/js/myProjects.js:1548 +msgid "e.g. My Replications" +msgstr "例:マイコレクション" + +#: website/static/js/myProjects.js:1565 +msgid "Add" +msgstr "追加" + +#: website/static/js/myProjects.js:1576 +msgid "Rename collection" +msgstr "コレクションの名前を変更" + +#: website/static/js/myProjects.js:1581 +msgid "Rename to: " +msgstr "名前を変更:" + +#: website/static/js/myProjects.js:1624 +msgid "Delete collection \"%1$s\"?" +msgstr "コレクション(%1$s)を削除しますか?" + +#: website/static/js/myProjects.js:1627 +msgid "This will delete your collection, but your projects will not be deleted." +msgstr "これによりコレクションが削除されますが、プロジェクトは削除されません。" + +#: website/static/js/myProjects.js:1737 +msgid "Parent projects" +msgstr "親プロジェクト" + +#: website/static/js/myProjects.js:1786 +msgid "Create component" +msgstr "コンポーネントを作成" + +#: website/static/js/myProjects.js:1875 +msgid "" +"No contributors to display in this collection. Project administrators can" +" add contributors." +msgstr "このコレクションに表示するメンバーはいません。 プロジェクト管理者はメンバーを追加できます。" + +#: website/static/js/myProjects.js:1898 +msgid "" +"No tags to display in this collection. Project administrators and write " +"contributors can add tags." +msgstr "このコレクションに表示するタグはありません。 プロジェクト管理者とメンバーはタグを追加できます。" + +#: website/static/js/myProjects.js:1924 +msgid "Contributors " +msgstr "メンバー" + +#: website/static/js/myProjects.js:1927 +msgid "Click a contributor's name to see projects that you have in common." +msgstr "メンバーの名前をクリックすると、共通のプロジェクトが表示されます。" + +#: website/static/js/myProjects.js:1938 website/static/js/myProjects.js:2019 +msgid "Tags" +msgstr "タグ" + +#: website/static/js/myProjects.js:1963 +msgid "Select a row to view project details." +msgstr "行を選択して、プロジェクトの詳細を表示します。" + +#: website/static/js/myProjects.js:1994 +msgid "Information" +msgstr "プロジェクト情報" + +#: website/static/js/myProjects.js:1998 +msgid "Activity" +msgstr "最近の活動" + +#: website/static/js/myProjects.js:2005 +msgid "Visibility: " +msgstr "可視性:" + +#: website/static/js/myProjects.js:2005 +msgid "Public" +msgstr "公開" + +#: website/static/js/myProjects.js:2005 +msgid "Private" +msgstr "非公開" + +#: website/static/js/myProjects.js:2007 +msgid "Category: " +msgstr "カテゴリ:" + +#: website/static/js/myProjects.js:2011 +msgid "Permission: " +msgstr "権限:" + +#: website/static/js/myProjects.js:2012 +msgid "Last Modified on: " +msgstr "最終更新日時:" + +#: website/static/js/myProjects.js:2040 +msgid "Remove selected from collection" +msgstr "コレクションから選択を削除" + +#: website/static/js/nodeControl.js:61 +msgid "A request to make this registration public is pending" +msgstr "この登録を公開するリクエストは保留中です" + +#: website/static/js/nodeControl.js:102 +msgid "Edit Title" +msgstr "タイトルを編集" + +#: website/static/js/nodeControl.js:106 +msgid "Title cannot be blank." +msgstr "タイトルを空白にすることはできません。" + +#: website/static/js/nodeControl.js:109 +msgid "Title cannot exceed 512 characters." +msgstr "タイトルは512文字を超えることはできません。" + +#: website/static/js/nodeControl.js:114 +msgid "component" +msgstr "コンポーネント" + +#: website/static/js/nodeControl.js:117 +msgid "Edit Description" +msgstr "説明を編集" + +#: website/static/js/nodeControl.js:118 +msgid "Add a brief description to your %1$s" +msgstr "%1$sに簡単な説明を追加してください" + +#: website/static/js/nodeControl.js:135 +msgid "Select a category" +msgstr "カテゴリを編集" + +#: website/static/js/nodeControl.js:175 +msgid "The project could not be removed" +msgstr "プロジェクトを削除できませんでした" + +#: website/static/js/nodeControl.js:212 +msgid "Create DOI" +msgstr "DOIを作成" + +#: website/static/js/nodeControl.js:214 +msgid "Are you sure you want to create a DOI for this %1$s" +msgstr "%1$sのためのDOIを作成してもよろしいですか?" + +#: website/static/js/nodeControl.js:215 +msgid "? A DOI" +msgstr "DOIは" + +#: website/static/js/nodeControl.js:216 +msgid " is persistent and will always resolve to this page." +msgstr "永続的であり、常にこのページに解決されます。" + +#: website/static/js/nodeControl.js:245 +msgid "We could not create the identifier at this time. " +msgstr "現時点では識別子を作成できませんでした。" + +#: website/static/js/nodeControl.js:246 +msgid "The DOI acquisition service may be down right now. " +msgstr "DOI取得サービスは現在停止している可能性があります。" + +#: website/static/js/nodeControl.js:247 +msgid "Please try again soon and/or contact %1$s" +msgstr "すぐに再試行するか、%1$sにお問い合わせ下さい" + +#: website/static/js/nodeControl.js:249 +msgid "Could not create doi" +msgstr "DOIを作成できませんでした。" + +#: website/static/js/nodeSelectTreebeard.js:62 +#: website/static/js/notificationsTreebeard.js:62 +#: website/static/js/profile.js:320 +#: website/static/js/wikiSettingsTreebeard.js:57 +msgid "Could not update settings" +msgstr "設定を更新できませんでした" + +#: website/static/js/nodeSelectTreebeard.js:81 +#: website/static/js/nodesDeleteTreebeard.js:56 +#: website/static/js/nodesPrivacySettingsTreebeard.js:56 +msgid "checkBox" +msgstr "チェックボックス" + +#: website/static/js/nodesDelete.js:38 +msgid "" +"This %1$s also contains supplemental materials for a " +"preprint. It will" +msgstr "この%1$sには、プレプリントの補足資料も含まれています。" + +#: website/static/js/nodesDelete.js:39 +msgid " no longer be available to contributors or connected to the preprint." +msgstr "メンバーは利用できなくなり、プレプリントに接続できなくなります。" + +#: website/static/js/nodesDelete.js:43 +msgid "It will no longer be available to other contributors on the project." +msgstr "プロジェクトの他のメンバーは利用できなくなります。" + +#: website/static/js/nodesDelete.js:49 +msgid "Are you sure you want to delete this %1$s?" +msgstr "この%1$sを削除してもよろしいですか?" + +#: website/static/js/nodesDelete.js:80 website/static/js/nodesDelete.js:340 +msgid "Unable to delete %1$s" +msgstr "%1$sを削除できません" + +#: website/static/js/nodesDelete.js:84 website/static/js/nodesDelete.js:344 +msgid "Problem deleting %1$s" +msgstr "%1$sの削除中に問題が発生しました" + +#: website/static/js/nodesDelete.js:85 +msgid "Could not delete %$1s" +msgstr "%$1sを削除できませんでした" + +#: website/static/js/nodesDelete.js:116 +msgid "" +"

                                                        This %1$s also contains supplemental materials for a " +"preprint, and one or more of its %2$s contains " +"supplemental materials for a preprint." +msgstr "

                                                        この%1$sにはプレプリントの補足資料も含まれており、1つ以上の%2$sにはプレプリントの補足資料が含まれています。" + +#: website/static/js/nodesDelete.js:119 +msgid "" +"

                                                        This %1$s also contains supplemental materials for a " +"preprint." +msgstr "

                                                        この%1$sには、プレプリントの補足資料も含まれています。" + +#: website/static/js/nodesDelete.js:122 +msgid "" +"

                                                        This %1$s also has one or more %2$s that contain supplemental " +"materials for a preprint." +msgstr "

                                                        この%1$sには、プレプリントの補足資料を含む1つ以上の%2$sもあります。" + +#: website/static/js/nodesDelete.js:150 +msgid "Delete %1$s" +msgstr "%1$sを削除" + +#: website/static/js/nodesDelete.js:151 +msgid "Delete %1$s and %2$s" +msgstr "%1$sと%2$sを削除" + +#: website/static/js/nodesDelete.js:156 +msgid "This %1$s contains %2$s." +msgstr "この%1$sには%2$sが含まれています。" + +#: website/static/js/nodesDelete.js:156 +msgid " To delete this %1$s, you must also delete all %2$s." +msgstr "この%1$sを削除するには、すべての%2$sも削除する必要があります。" + +#: website/static/js/nodesDelete.js:158 +msgid " The following %1$s and %2$s will be deleted." +msgstr "次の%1$sと%2$sは削除されます。" + +#: website/static/js/nodesDelete.js:161 +msgid " This action is irreversible." +msgstr "このアクションは元に戻せません。" + +#: website/static/js/nodesDelete.js:167 +msgid "" +"Please note that deleting your %1$s will erase all your %2$s data and " +"this process is IRREVERSIBLE. Deleted %3$s and %4$s will no longer be " +"available to other contributors on the %5$s" +msgstr "" +"%1$sを削除すると、すべての%2$sデータが消去され、このプロセスは不可逆であることに注意してください。 " +"削除された%3$sと%4$sは、%5$sの他のメンバーが利用できなくなります" + +#: website/static/js/nodesDelete.js:168 +msgid " and will be disconnected from your preprints." +msgstr "そして、プレプリントから切断されます。" + +#: website/static/js/nodesDelete.js:168 +msgid "." +msgstr "。" + +#: website/static/js/nodesDelete.js:331 +msgid "Your %1$s has been successfully deleted." +msgstr "%1$sは正常に削除されました。" + +#: website/static/js/nodesDelete.js:345 +msgid "Could not batch delete project and its components." +msgstr "プロジェクトとそのコンポーネントをバッチ削除できませんでした。" + +#: website/static/js/nodesDeleteTreebeard.js:84 +msgid "You must have admin permissions on this component to be able to delete it." +msgstr "このコンポーネントを削除するには、このコンポーネントの管理者権限が必要です。" + +#: website/static/js/nodesPrivacy.js:19 +msgid "" +"Please review your projects, components, and add-ons for sensitive or " +"restricted information before making them public." +msgstr "このコンポーネントを削除するには、このコンポーネントの管理者権限が必要です。" + +#: website/static/js/nodesPrivacy.js:20 +msgid "" +"

                                                        Once they are made public, you should assume they will always be " +"public. You can " +msgstr "

                                                        それらが公開されると、それらは常に公開されると想定する必要があります。" + +#: website/static/js/nodesPrivacy.js:21 +msgid "" +"return them to private later, but search engines (including Google’s " +"cache) or others may access files, wiki pages, or analytics before you " +"do." +msgstr "後でプライベートに戻すことができますが、検索エンジン(Googleのキャッシュを含む)または他のユーザーは、ファイル、Wikiページ、または分析にアクセスする前にアクセスする場合があります。" + +#: website/static/js/nodesPrivacy.js:23 +msgid "" +"
                                                        • Public forks and registrations of this project will remain " +"public.
                                                        • " +msgstr "
                                                          • このプロジェクトのパブリックフォークと登録はパブリックのままです。
                                                          • " + +#: website/static/js/nodesPrivacy.js:24 website/static/js/nodesPrivacy.js:27 +msgid "" +"
                                                          • Search engines (including Google's cache) or others may have accessed" +" files, wiki pages, or analytics while this project was public.
                                                          " +msgstr "
                                                        • このプロジェクトが公開されている間に、検索エンジン(Googleのキャッシュを含む)または他のユーザーがファイル、Wikiページ、または分析にアクセスした可能性があります。
                                                        " + +#: website/static/js/nodesPrivacy.js:26 +msgid "" +"
                                                        • Preprints will remain public.
                                                        • Public forks and " +"registrations of this project will remain public.
                                                        • " +msgstr "
                                                          • プレプリントは公開されます。
                                                          • このプロジェクトの公開フォークと登録は公開されます。
                                                          • " + +#: website/static/js/nodesPrivacy.js:28 +msgid "" +"By clicking confirm, an email will be sent to project administrator(s) to" +" approve ending the embargo. If approved, this registration, including " +"any components, will be made public immediately. This action is " +"irreversible." +msgstr "" +"[確認]をクリックすると、禁止措置の終了を承認するためのメールがプロジェクト管理者に送信されます。 " +"承認されると、コンポーネントを含むこの登録はすぐに公開されます。 このアクションは元に戻せません。" + +#: website/static/js/nodesPrivacy.js:29 +msgid "End embargo early" +msgstr "禁止措置を早期に終了する" + +#: website/static/js/nodesPrivacy.js:30 +msgid "Adjust your privacy settings by checking the boxes below. " +msgstr "下のチェックボックスをオンにして、プライバシー設定を調整します。" + +#: website/static/js/nodesPrivacy.js:31 +msgid "" +"

                                                            Checked projects and components will be public. " +"
                                                            Unchecked components will be private." +msgstr "

                                                            チェックされたプロジェクトとコンポーネントは公開になり、
                                                            チェックされていないコンポーネントは非公開になります" + +#: website/static/js/nodesPrivacy.js:33 +msgid "The following projects and components will be made public." +msgstr "次のプロジェクトとコンポーネントが公開されます。" + +#: website/static/js/nodesPrivacy.js:34 +msgid "The following projects and components will be made private." +msgstr "次のプロジェクトとコンポーネントは非公開になります。" + +#: website/static/js/nodesPrivacy.js:35 +msgid "No privacy settings were changed. Go back to make a change." +msgstr "プライバシー設定は変更されていません。 戻って変更を加えます。" + +#: website/static/js/nodesPrivacy.js:36 +msgid "" +"You can only change the privacy of 100 projects and components at a time." +" Please go back and limit your selection." +msgstr "一度に変更できるのは、100個のプロジェクトとコンポーネントのプライバシーのみです。 戻って選択を制限してください。" + +#: website/static/js/nodesPrivacy.js:38 +msgid "This project/component contains supplemental materials for a preprint." +msgstr "このプロジェクト/コンポーネントには、プレプリントの補足資料が含まれています。" + +#: website/static/js/nodesPrivacy.js:39 +msgid "" +"

                                                            Making this project/component private will prevent others from" +" accessing it.

                                                            " +msgstr "

                                                            このプロジェクト/コンポーネントを非公開にすると、他の人がアクセスできなくなります。

                                                            " + +#: website/static/js/nodesPrivacy.js:155 +msgid "Make %1$s private" +msgstr "%1$sを非公開にします" + +#: website/static/js/nodesPrivacy.js:156 +msgid "Warning" +msgstr "警告" + +#: website/static/js/nodesPrivacy.js:157 +msgid "Change privacy settings" +msgstr "プライバシー設定を変更する" + +#: website/static/js/nodesPrivacy.js:158 +msgid "Projects and components affected" +msgstr "影響を受けるプロジェクトとコンポーネント" + +#: website/static/js/nodesPrivacy.js:247 +msgid "Updating Privacy" +msgstr "プライバシーの更新" + +#: website/static/js/nodesPrivacy.js:257 +msgid "Unable to update project privacy" +msgstr "プロジェクトのプライバシーを更新できません" + +#: website/static/js/nodesPrivacy.js:261 +msgid "Problem changing privacy" +msgstr "プライバシーを変更する問題" + +#: website/static/js/nodesPrivacy.js:262 +msgid "Could not PATCH project settings." +msgstr "プロジェクト設定をパッチできませんでした。" + +#: website/static/js/nodesPrivacy.js:318 +msgid "Submitting request to end embargo early ..." +msgstr "禁止措置を早期に終了する要求を送信しています..." + +#: website/static/js/nodesPrivacy.js:324 +msgid "Email sent" +msgstr "メールを送信しました" + +#: website/static/js/nodesPrivacy.js:325 +msgid "" +"The administrator(s) can approve or cancel the action within 48 hours. If" +" 48 hours pass without any action taken, then the registration will " +"become public." +msgstr "管理者は、48時間以内にアクションを承認またはキャンセルできます。 48時間経過してもアクションが実行されない場合、登録は公開されます。" + +#: website/static/js/notificationsConfig.js:31 +msgid "Could not retrieve settings information." +msgstr "設定情報を取得できませんでした。" + +#: website/static/js/notificationsConfig.js:63 +msgid "Could not update email preferences at this time. If this issue persists, " +msgstr "現在、メール設定を更新できませんでした。 この問題が続く場合、" + +#: website/static/js/notificationsConfig.js:64 +#: website/static/js/osfHelpers.js:316 +msgid "please report it to %1$s." +msgstr "%1$sに報告してください。" + +#: website/static/js/notificationsTreebeard.js:68 +#: website/static/js/notificationsTreebeard.js:182 +#: website/static/js/notificationsTreebeard.js:187 +#: website/static/js/notificationsTreebeard.js:230 +msgid "Instantly" +msgstr "すぐに" + +#: website/static/js/notificationsTreebeard.js:69 +#: website/static/js/notificationsTreebeard.js:188 +#: website/static/js/notificationsTreebeard.js:231 +msgid "Daily" +msgstr "毎日" + +#: website/static/js/notificationsTreebeard.js:70 +msgid "Adopt setting from parent project" +msgstr "親プロジェクトから設定を採用する" + +#: website/static/js/notificationsTreebeard.js:71 +#: website/static/js/notificationsTreebeard.js:186 +#: website/static/js/notificationsTreebeard.js:229 +msgid "Never" +msgstr "無し" + +#: website/static/js/notificationsTreebeard.js:118 +msgid " No configured projects." +msgstr "設定済みのプロジェクトはありません。" + +#: website/static/js/notificationsTreebeard.js:228 +msgid "Adopt setting from parent project %1$s" +msgstr "親プロジェクト%1$sから設定を採用" + +#: website/static/js/oauthAddonNodeConfig.js:143 +msgid "Choose %1$s Account to Import" +msgstr "インポートする%1$sアカウントを選択" + +#: website/static/js/osfHelpers.js:311 +msgid "Please refresh the page and try again or contact %1$s" +msgstr "ページを更新して再試行するか、%1$sに連絡してください" + +#: website/static/js/osfHelpers.js:315 +msgid "GakuNin RDM was unable to resolve your request. If this issue persists, " +msgstr "GakuNin RDMはリクエストを解決できませんでした。 この問題が解決しない場合、" + +#: website/static/js/osfHelpers.js:339 +msgid "Unexpected error occurred in JSON request" +msgstr "JSONリクエストで予期しないエラーが発生しました" + +#: website/static/js/osfHelpers.js:344 +msgid "Unexpected error occurred in an editable input" +msgstr "編集可能な入力で予期しないエラーが発生しました" + +#: website/static/js/osfHelpers.js:361 +#: website/static/js/privateLinkManager.js:105 +msgid "Please wait" +msgstr "お待ち下さい" + +#: website/static/js/osfHelpers.js:800 +#: website/static/js/pages/profile-settings-addons-page.js:32 +#: website/static/js/pages/project-addons-page.js:63 +msgid "Confirm" +msgstr "確認" + +#: website/static/js/osfHelpers.js:811 +msgid "

                                                            Type the following to continue: " +msgstr "

                                                            次を入力して続行します: " + +#: website/static/js/passwordForms.js:23 +msgid "Please enter a more complex password." +msgstr "より複雑なパスワードを入力してください。" + +#: website/static/js/passwordForms.js:117 +#: website/static/js/passwordForms.js:192 +#: website/static/js/passwordForms.js:258 +msgid "Your password cannot be the same as your email address." +msgstr "パスワードをメールアドレスと同じにすることはできません。" + +#: website/static/js/passwordForms.js:132 +msgid "Your new password cannot be the same as your old password." +msgstr "新しいパスワードを古いパスワードと同じにすることはできません。" + +#: website/static/js/passwordForms.js:143 +#: website/static/js/passwordForms.js:203 +msgid "Passwords must match." +msgstr "パスワードが一致する必要があります。" + +#: website/static/js/passwordForms.js:230 +msgid "Email addresses must match." +msgstr "メールアドレスは一致する必要があります。" + +#: website/static/js/passwordForms.js:301 +msgid "You have already submitted. You cannot sign up more than once." +msgstr "あなたはすでに提出しました。 複数回サインアップすることはできません。" + +#: website/static/js/passwordForms.js:322 +msgid "Please complete reCAPTCHA" +msgstr "reCAPTCHAを完了してください" + +#: website/static/js/pointers.js:28 +msgid "Search all projects" +msgstr "すべてのプロジェクトの検索" + +#: website/static/js/pointers.js:29 +msgid "Search my projects" +msgstr "マイプロジェクトの検索" + +#: website/static/js/pointers.js:133 +msgid "No results found." +msgstr "結果が見つかりません。" + +#: website/static/js/pointers.js:183 +msgid "Error retrieving nodes" +msgstr "ノードの取得エラー" + +#: website/static/js/pointers.js:328 +msgid "Registered: " +msgstr "登録日:" + +#: website/static/js/pointers.js:330 +msgid "Created: " +msgstr "作成日時:" + +#: website/static/js/pointers.js:330 +msgid "" +"\n" +"Modified: " +msgstr "" +"\n" +"最終更新日時:" + +#: website/static/js/pointers.js:362 +msgid "Could not get links" +msgstr "リンクを取得できませんでした" + +#: website/static/js/privateLinkManager.js:63 +msgid "Could not retrieve projects." +msgstr "プロジェクトを取得できませんでした。" + +#: website/static/js/privateLinkManager.js:63 +#: website/static/js/privateLinkTable.js:72 +msgid "Please refresh the page or " +msgstr "ページを更新するか、" + +#: website/static/js/privateLinkManager.js:64 +#: website/static/js/privateLinkTable.js:73 +msgid "contact %1$s" +msgstr "問題が解決しない場合は、%1$sに" + +#: website/static/js/privateLinkManager.js:64 +#: website/static/js/privateLinkTable.js:73 +msgid " if the " +msgstr "お問い合わせ" + +#: website/static/js/privateLinkManager.js:65 +#: website/static/js/privateLinkTable.js:74 +msgid "problem persists." +msgstr "下さい。" + +#: website/static/js/privateLinkTable.js:37 +msgid "Yes" +msgstr "はい" + +#: website/static/js/privateLinkTable.js:37 +msgid "No" +msgstr "いいえ" + +#: website/static/js/privateLinkTable.js:72 +msgid "Could not retrieve view-only links." +msgstr "参照専用リンクを取得できませんでした。" + +#: website/static/js/privateLinkTable.js:96 +msgid "Remove view-only link?" +msgstr "参照専用リンクを削除しますか?" + +#: website/static/js/privateLinkTable.js:97 +msgid "Are you sure you want to remove this view-only link?" +msgstr "この参照専用リンクを削除してもよろしいですか?" + +#: website/static/js/privateLinkTable.js:109 +msgid "Failed to delete the private link." +msgstr "プライベートリンクを削除できませんでした。" + +#: website/static/js/privateLinkTable.js:138 +msgid "Edit Link Name" +msgstr "リンク名を編集" + +#: website/static/js/profile.js:106 +msgid "January" +msgstr "1月" + +#: website/static/js/profile.js:106 +msgid "February" +msgstr "2月" + +#: website/static/js/profile.js:106 +msgid "March" +msgstr "3月" + +#: website/static/js/profile.js:106 +msgid "April" +msgstr "4月" + +#: website/static/js/profile.js:106 +msgid "May" +msgstr "5月" + +#: website/static/js/profile.js:106 +msgid "June" +msgstr "6月" + +#: website/static/js/profile.js:107 +msgid "July" +msgstr "7月" + +#: website/static/js/profile.js:107 +msgid "August" +msgstr "8月" + +#: website/static/js/profile.js:107 +msgid "September" +msgstr "9月" + +#: website/static/js/profile.js:107 +msgid "October" +msgstr "10月" + +#: website/static/js/profile.js:107 +msgid "November" +msgstr "11月" + +#: website/static/js/profile.js:107 +msgid "December" +msgstr "12月" + +#: website/static/js/profile.js:112 +msgid "ongoing" +msgstr "在籍" + +#: website/static/js/profile.js:152 +msgid "Please enter a year for the start date." +msgstr "開始日の年を入力してください。" + +#: website/static/js/profile.js:165 +msgid "Please enter an end date or mark as ongoing." +msgstr "終了日を入力するか、在籍としてマークしてください。" + +#: website/static/js/profile.js:168 +msgid "Please enter a year for the end date." +msgstr "終了日の年を入力してください。" + +#: website/static/js/profile.js:265 website/static/js/profile.js:274 +msgid "There are unsaved changes to your settings." +msgstr "設定に保存されていない変更があります。" + +#: website/static/js/profile.js:275 +msgid "Please save or discard your changes before switching " +msgstr "タブを切り替える前に変更を保存または破棄して" + +#: website/static/js/profile.js:276 +msgid "tabs." +msgstr "ください。" + +#: website/static/js/profile.js:341 +msgid "Could not fetch data" +msgstr "データを取得できませんでした" + +#: website/static/js/profile.js:358 +msgid "Are you sure you want to discard your unsaved changes?" +msgstr "保存していない変更を破棄してもよろしいですか?" + +#: website/static/js/profile.js:720 +msgid "Remove website?" +msgstr "ウェブサイトを削除しますか?" + +#: website/static/js/profile.js:721 +msgid "Are you sure you want to remove this website from your profile?" +msgstr "このウェブサイトをプロフィールから削除してもよろしいですか?" + +#: website/static/js/profile.js:728 +msgid "Website removed" +msgstr "ウェブサイトを削除しました" + +#: website/static/js/profile.js:815 +msgid "Please update your website" +msgstr "ウェブサイトを更新してください" + +#: website/static/js/profile.js:953 +msgid "Remove Institution?" +msgstr "機関を削除しますか?" + +#: website/static/js/profile.js:954 +msgid "Are you sure you want to remove this institution?" +msgstr "この機関を削除してもよろしいですか?" + +#: website/static/js/profile.js:963 +msgid "Institution Removed" +msgstr "機関が削除されました" + +#: website/static/js/profile.js:1078 +msgid "Institution/Employer required" +msgstr "機関/雇用者が必要です" + +#: website/static/js/profile.js:1132 +msgid "Institution required" +msgstr "機関が必要です" + +#: website/static/js/components/publicNodes.js:103 +#: website/static/js/project-organizer.js:100 +msgid "A contributor" +msgstr "一人のメンバー" + +#: website/static/js/project-organizer.js:197 +msgid "Contributors" +msgstr "メンバー" + +#: website/static/js/project-organizer.js:416 +msgid "" +"input.form-control[placeholder=\"Filter displayed " +"projects\"][type=\"text\"]" +msgstr "input.form-control[placeholder=\"表示されたプロジェクトをフィルターする\"][type=\"text\"]" + +#: website/static/js/project.js:28 +msgid "

                                                            Are you sure you want to fork this project?

                                                            " +msgstr "

                                                            このプロジェクトをフォークしてもよろしいですか?

                                                            " + +#: website/static/js/project.js:36 website/static/js/project.js:115 +msgid "Fork" +msgstr "フォーク" + +#: website/static/js/project.js:50 +msgid "Fork created successfully!" +msgstr "フォークが正常に作成されました!" + +#: website/static/js/project.js:58 +msgid "Go to new fork" +msgstr "新しいフォークに行く" + +#: website/static/js/project.js:87 +msgid "Your fork is being created. You'll receive an email when it is complete." +msgstr "フォークを作成しています。 完了するとメールが届きます。" + +#: website/static/js/project.js:93 +msgid "Fork this project?" +msgstr "このプロジェクトをフォークしますか?" + +#: website/static/js/project.js:94 +msgid "Are you sure you want to fork this project?" +msgstr "このプロジェクトをフォークしてもよろしいですか?" + +#: website/static/js/project.js:109 +msgid "Could not fork link." +msgstr "リンクを分岐できませんでした。" + +#: website/static/js/project.js:126 +msgid "" +"

                                                            Are you sure you want to create a new project using this project as a" +" template?

                                                            " +msgstr "

                                                            このプロジェクトをテンプレートとして使用して新しいプロジェクトを作成してもよろしいですか?

                                                            " + +#: website/static/js/project.js:127 +msgid "" +"

                                                            Any add-ons configured for this project will not be authenticated in " +"the new project.

                                                            " +msgstr "

                                                            このプロジェクト用に設定されたアドオンは、新しいプロジェクトでは認証されません。

                                                            " + +#: website/static/js/project.js:129 +msgid "" +"

                                                            Are you sure you want to create a new project using this registration" +" as a template?

                                                            " +msgstr "

                                                            この登録をテンプレートとして使用して新しいプロジェクトを作成してもよろしいですか?

                                                            " + +#: website/static/js/project.js:205 +msgid "
                                                            Read
                                                            " +msgstr "
                                                            読込み
                                                            " + +#: website/static/js/project.js:206 +msgid "
                                                            • View project content and comment
                                                            " +msgstr "
                                                            • プロジェクトのコンテンツとコメントを表示
                                                            " + +#: website/static/js/project.js:207 +msgid "
                                                            Read + Write
                                                            " +msgstr "
                                                            読込み/書込み
                                                            " + +#: website/static/js/project.js:208 +msgid "
                                                            • Read privileges
                                                            • " +msgstr "
                                                              • 読込み権限
                                                              • " + +#: website/static/js/project.js:209 +msgid "
                                                              • Add and configure components
                                                              • " +msgstr "
                                                              • コンポーネントを追加および構成する
                                                              • " + +#: website/static/js/project.js:210 +msgid "
                                                              • Add and edit content
                                                              " +msgstr "
                                                            • コンテンツの追加と編集
                                                            " + +#: website/static/js/project.js:211 +msgid "
                                                            Administrator
                                                              " +msgstr "
                                                              管理者
                                                                " + +#: website/static/js/project.js:212 +msgid "
                                                              • Read and write privileges
                                                              • " +msgstr "
                                                              • 読込み/書込み権限
                                                              • " + +#: website/static/js/project.js:213 +msgid "
                                                              • Manage contributor
                                                              • " +msgstr "
                                                              • メンバーの管理
                                                              • " + +#: website/static/js/project.js:214 +msgid "" +"
                                                              • Delete and register project
                                                              • Public-private " +"settings
                                                              " +msgstr "
                                                            • プロジェクトの削除と登録
                                                            • 公開/非公開設定
                                                            " + +#: website/static/js/project.js:223 +msgid "" +"Only bibliographic contributors will be displayed in the Contributors " +"list and in project citations. Non-bibliographic contributors can read " +"and modify the project as normal." +msgstr "メンバーリストおよびプロジェクトの引用には、書誌のメンバーのみが表示されます。 書誌以外のメンバーは、通常どおりプロジェクトを読んで修正できます。" + +#: website/static/js/project.js:238 +msgid "Remove this link?" +msgstr "このリンクを削除しますか?" + +#: website/static/js/project.js:239 +msgid "" +"Are you sure you want to remove this link? This will not remove the " +"project this link refers to." +msgstr "このリンクを削除してもよろしいですか?このリンクが参照するプロジェクトは削除されません。" + +#: website/static/js/projectSettingsTreebeardBase.js:96 +msgid "Editing Toggle" +msgstr "トグルを編集中" + +#: website/static/js/requestAccess.js:17 +msgid "Request access" +msgstr "アクセス権をリクエスト" + +#: website/static/js/requestAccess.js:27 website/static/js/requestAccess.js:62 +msgid "Access requested" +msgstr "アクセス権がリクエストされました" + +#: website/static/js/requestAccess.js:30 +msgid "Request declined" +msgstr "リクエストは拒否されました" + +#: website/static/js/requestAccess.js:67 +msgid "Access request failed. Please contact %1$s if the problem persists." +msgstr "アクセス要求が失敗しました。 問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/requestAccess.js:70 +msgid "Error requesting project access" +msgstr "プロジェクトアクセス権のリクエストエラー" + +#: website/static/js/requestAccess.js:83 +msgid "If this should not have occurred, please contact %1$s." +msgstr "これが発生してはならない場合は、%1$sにお問い合わせください。" + +#: website/static/js/saveManager.js:24 +msgid "You have unsaved changes." +msgstr "未保存の変更があります。" + +#: website/static/js/search-grdm.js:150 +msgid "Date Modified (Desc)" +msgstr "更新日時の新しい順" + +#: website/static/js/search-grdm.js:151 +msgid "Date Modified (Asc)" +msgstr "更新日時の古い順" + +#: website/static/js/search-grdm.js:152 +msgid "Date Created (Desc)" +msgstr "作成日時の新しい順" + +#: website/static/js/search-grdm.js:153 +msgid "Date Created (Asc)" +msgstr "作成日時の古い順" + +#: website/static/js/search-grdm.js:154 +msgid "Project name (Asc)" +msgstr "プロジェクト名の正順" + +#: website/static/js/search-grdm.js:155 +msgid "Project name (Desc)" +msgstr "プロジェクト名の逆順" + +#: website/static/js/search-grdm.js:156 +msgid "File name (Asc)" +msgstr "ファイル名の正順" + +#: website/static/js/search-grdm.js:157 +msgid "File name (Desc)" +msgstr "ファイル名の逆順" + +#: website/static/js/search-grdm.js:158 +msgid "User name (Asc)" +msgstr "ユーザー名の正順" + +#: website/static/js/search-grdm.js:159 +msgid "User name (Desc)" +msgstr "ユーザー名の逆順" + +#: website/static/js/search-grdm.js:160 +msgid "Institution name (Asc)" +msgstr "機関名の正順" + +#: website/static/js/search-grdm.js:161 +msgid "Institution name (Desc)" +msgstr "機関名の逆順" + +#: website/static/js/search-grdm.js:162 +msgid "Wiki title (Asc)" +msgstr "Wikiタイトルの正順" + +#: website/static/js/search-grdm.js:163 +msgid "Wiki title (Desc)" +msgstr "Wikiタイトルの逆順" + +#: website/static/js/search-grdm.js:313 website/static/js/search.js:190 +msgid "Page %1$s of %2$s" +msgstr "ページ %1$s / %2$s" + +#: website/static/js/search-grdm.js:393 website/static/js/search.js:270 +msgid "Search help" +msgstr "検索ヘルプ" + +#: website/static/js/search-grdm.js:394 website/static/js/search.js:271 +msgid "

                                                            Queries

                                                            " +msgstr "

                                                            クエリ

                                                            " + +#: website/static/js/search-grdm.js:395 website/static/js/search.js:272 +msgid "" +"

                                                            Search uses the Lucene" +" search syntax. " +msgstr "" +"

                                                            検索ではLucene検索構文を使用します。" +" " + +#: website/static/js/search-grdm.js:396 website/static/js/search.js:273 +msgid "This gives you many options, but can be very simple as well. " +msgstr "これにより多くのオプションが提供されますが、非常に簡単な場合もあります。" + +#: website/static/js/search-grdm.js:397 website/static/js/search.js:274 +msgid "Examples of valid searches include:" +msgstr "有効な検索の例は次のとおりです。" + +#: website/static/js/search-grdm.js:769 website/static/js/search-grdm.js:1067 +#: website/static/js/search.js:578 website/static/js/search.js:605 +msgid "GakuNin RDM | Search" +msgstr "GakuNin RDM | 検索" + +#: website/static/js/wikiSettingsTreebeard.js:26 +msgid "Make publicly editable" +msgstr "公開で編集可能にする" + +#: website/static/js/wikiSettingsTreebeard.js:27 +msgid "" +"Are you sure you want to make the wiki of %1$s publicly editable? " +"This will allow any logged in user to edit the content of this wiki. " +msgstr "" +"%1$sのwikiを一般に編集可能にしますか? " +"これにより、ログインしているユーザーがこのwikiのコンテンツを編集できるようになります。" + +#: website/static/js/wikiSettingsTreebeard.js:28 +msgid "" +"Note: Users without write access will not be able to add, delete, " +"or rename pages." +msgstr "注意:書き込みアクセス権のないユーザーは、ページを追加、削除、または名前変更できません。" + +#: website/static/js/wikiSettingsTreebeard.js:36 +msgid "Apply" +msgstr "適用" + +#: website/static/js/wikiSettingsTreebeard.js:114 +msgid "Only admins may change permissions of this wiki." +msgstr "このwikiの権限を変更できるのは管理者のみです。" + +#: website/static/js/wikiSettingsTreebeard.js:116 +msgid "Select who can edit" +msgstr "編集できるユーザーを選択" + +#: website/static/js/wikiSettingsTreebeard.js:116 +msgid "This feature is disabled for wikis of private %1$ss" +msgstr "この機能はプライベート%1$sのWikiでは無効になっています" + +#: website/static/js/wikiSettingsTreebeard.js:133 +msgid "Contributors (with write access)" +msgstr "メンバー(書き込みアクセス権付き)" + +#: website/static/js/wikiSettingsTreebeard.js:134 +msgid "All GakuNin RDM users" +msgstr "全てのGakuNin RDMユーザ" + +#: website/static/js/components/autocomplete.js:84 +msgid "Could not GET autocomplete data" +msgstr "オートコンプリートデータを取得できませんでした" + +#: website/static/js/components/autocomplete.js:150 +msgid "Initiated by: " +msgstr "発起人:" + +#: website/static/js/components/autocomplete.js:156 +msgid "Initiated: " +msgstr "開始日" + +#: website/static/js/components/autocomplete.js:162 +msgid "Last updated: " +msgstr "最終更新日" + +#: website/static/js/components/publicNodes.js:68 +msgid "Error retrieving projects" +msgstr "プロジェクトの取得エラー" + +#: website/static/js/components/publicNodes.js:120 +msgid " more" +msgstr "もっと" + +#: website/static/js/components/publicNodes.js:152 +msgid "-- private project -- / " +msgstr "-- 非公開プロジェクト -- / " + +#: website/static/js/components/publicNodes.js:190 +msgid "Unable to retrieve public %1$s" +msgstr "現在、パブリック%1$sを取得できません。" + +#: website/static/js/components/publicNodes.js:190 +msgid " at this time. Please refresh the page or contact " +msgstr "ページを更新するか、こちらに問い合わせて下さい" + +#: website/static/js/components/publicNodes.js:204 +msgid "You have no public %1$s." +msgstr "パブリック%1$sはありません。" + +#: website/static/js/components/publicNodes.js:206 +msgid "Find out how to make your %1$s" +msgstr "%1$sを公開にする方法を" + +#: website/static/js/components/publicNodes.js:207 +msgid "public" +msgstr "ご覧ください" + +#: website/static/js/components/publicNodes.js:211 +msgid "This user has no public %1$s." +msgstr "このユーザーにはパブリック%1$sがありません。" + +#: website/static/js/components/quickFiles.js:54 +msgid "Error retrieving quickfiles" +msgstr "クイックファイルの取得エラー" + +#: website/static/js/components/quickFiles.js:121 +msgid "" +"Unable to retrieve quickfiles at this time. Please refresh the page or " +"contact " +msgstr "現時点ではクイックファイルを取得できません。 ページを更新するか、こちらにお問い合わせ下さい。" + +#: website/static/js/components/quickFiles.js:134 +msgid "You have no public quickfiles" +msgstr "パブリッククイックファイルがありません" + +#: website/static/js/components/quickFiles.js:135 +msgid "This user has no public quickfiles." +msgstr "このユーザーには公開クイックファイルがありません。" + +#: website/static/js/components/utils.js:15 +msgid "Missing required option: " +msgstr "必須オプションがありません:" + +#: website/static/js/filepage/editor.js:82 +msgid "The file content could not be loaded." +msgstr "ファイルの内容をロードできませんでした。" + +#: website/static/js/filepage/editor.js:83 +msgid "Could not GET file contents." +msgstr "ファイルの内容を取得できませんでした。" + +#: website/static/js/filepage/editor.js:113 +msgid "Could not update file. Insufficient storage space in your Dropbox." +msgstr "ファイルを更新できませんでした。 Dropboxのストレージスペースが不足しています。" + +#: website/static/js/filepage/editor.js:115 +msgid "The file could not be updated." +msgstr "ファイルを更新できませんでした。" + +#: website/static/js/filepage/editor.js:122 +msgid "Could not PUT file content." +msgstr "ファイルコンテンツをPUTできませんでした。" + +#: website/static/js/filepage/editor.js:178 +msgid "Revert" +msgstr "元に戻す" + +#: website/static/js/filepage/index.js:89 +msgid "Direct iframe with fixed height and width" +msgstr "高さと幅を固定したiframeを管理する" + +#: website/static/js/filepage/index.js:131 +msgid "File is checked out." +msgstr "ファイルはチェックアウトされています。" + +#: website/static/js/filepage/index.js:132 +msgid " This file has been checked out by a " +msgstr "このファイルは" + +#: website/static/js/filepage/index.js:133 +msgid "collaborator" +msgstr "コラボレータ" + +#: website/static/js/filepage/index.js:134 +msgid ". It needs to be checked in before any changes can be made." +msgstr "によってチェックアウトされました。変更を行う前にチェックインする必要があります。" + +#: website/static/js/filepage/index.js:179 +msgid "Delete file?" +msgstr "ファイルを削除しますか?" + +#: website/static/js/filepage/index.js:181 +msgid "Are you sure you want to delete %1$s?" +msgstr "%1$sを削除してもよろしいですか?" + +#: website/static/js/filepage/index.js:199 +msgid "Could not delete file." +msgstr "ファイルを削除できませんでした。" + +#: website/static/js/filepage/index.js:215 +msgid "Confirm file check out?" +msgstr "ファイルのチェックアウトを確認しますか?" + +#: website/static/js/filepage/index.js:218 +msgid "as long as it is checked out. You can check it back in at anytime." +msgstr "いつでもチェックインできます。" + +#: website/static/js/filepage/index.js:238 +msgid "Unable to check out file" +msgstr "ファイルをチェックアウトできません" + +#: website/static/js/filepage/index.js:265 +msgid "Unable to check in file" +msgstr "ファイルをチェックインできません" + +#: website/static/js/filepage/index.js:270 +msgid "Force check in file?" +msgstr "ファイルを強制的にチェックインしますか?" + +#: website/static/js/filepage/index.js:271 +msgid "" +"This will check in the file for all users, allowing it to be edited. Are " +"you sure?" +msgstr "これにより、すべてのユーザーのファイルがチェックインされ、編集できるようになります。 よろしいですか?" + +#: website/static/js/filepage/index.js:274 +msgid "Force check in" +msgstr "強制チェックイン" + +#: website/static/js/filepage/index.js:297 +msgid "Unable to force check in file. Make sure you have admin privileges." +msgstr "ファイルを強制的にチェックインできません。 管理者権限を持っていることを確認してください。" + +#: website/static/js/filepage/index.js:338 +msgid "Live editing mode " +msgstr "ライブ編集モード" + +#: website/static/js/filepage/index.js:339 +msgid "Attempting to connect " +msgstr "接続試行中" + +#: website/static/js/filepage/index.js:340 +msgid "Unsupported browser " +msgstr "サポートされていないブラウザ" + +#: website/static/js/filepage/index.js:341 +msgid "Saving... " +msgstr "保存中..." + +#: website/static/js/filepage/index.js:342 +msgid "Unavailable: Live editing " +msgstr "利用不可:ライブ編集" + +#: website/static/js/filepage/index.js:465 +msgid "View this file on " +msgstr "このファイルを次のアドオンで表示:" + +#: website/static/js/filepage/index.js:500 +msgid "Check out" +msgstr "チェックアウト" + +#: website/static/js/filepage/index.js:503 +msgid "Check in" +msgstr "チェックイン" + +#: website/static/js/filepage/index.js:509 +msgid "Request Trusted Timestamp" +msgstr "タイムスタンプを打つ" + +#: website/static/js/filepage/index.js:526 +msgid "Toggle view: " +msgstr "トグルビュー:" + +#: website/static/js/filepage/index.js:565 +#: website/static/js/filepage/revisions.js:173 +msgid "Revisions" +msgstr "バージョン管理" + +#: website/static/js/filepage/revisions.js:72 +#: website/static/js/filepage/revisions.js:73 +msgid "Unable to fetch versions" +msgstr "バージョンを取得できません" + +#: website/static/js/filepage/revisions.js:108 +msgid "Version ID" +msgstr "バージョンID" + +#: website/static/js/filepage/revisions.js:110 +msgid "User" +msgstr "ユーザ名" + +#: website/static/js/filepage/revisions.js:113 +msgid "" +".fa.fa-question-circle[data-content=\"MD5 is an algorithm used to verify " +"data integrity.\"][rel=\"popover\"]" +msgstr "" +".fa.fa-question-circle[data-" +"content=\"MD5は、データの整合性を検証するために使用されるアルゴリズムです。\"][rel=\"popover\"]" + +#: website/static/js/filepage/revisions.js:116 +msgid "" +".fa.fa-question-circle[data-content=\"SHA-2 is a cryptographic hash " +"function designed by the NSA used to verify data " +"integrity.\"][rel=\"popover\"]" +msgstr "" +".fa.fa-question-circle[data-" +"content=\"SHA-2は、データの整合性を検証するために使用されるNSAによって設計された暗号ハッシュ関数です。\"][rel=\"popover\"]" + +#: website/static/js/filepage/revisions.js:133 +msgid "Anonymous Contributor" +msgstr "匿名のメンバー" + +#: website/static/js/filepage/util.js:36 +msgid " Loading... " +msgstr "ロード中..." + +#: website/static/js/home-page/scheduledBannerPlugin.js:25 +msgid "Error in request to %1$s" +msgstr "%1$sへのリクエストでエラーが発生しました" + +#: website/static/js/pages/base-page.js:130 +msgid "Merge account" +msgstr "アカウントをマージ" + +#: website/static/js/pages/base-page.js:131 +msgid "Would you like to merge %1$s into your account? " +msgstr "%1$sをアカウントに統合しますか?" + +#: website/static/js/pages/base-page.js:133 +msgid "%1$s has been merged into your account." +msgstr "%1$sはアカウントに統合されました。" + +#: website/static/js/pages/base-page.js:134 +msgid "You have chosen to not merge %1$s into your account. " +msgstr "アカウントに%1$sをマージしないことを選択しました。" + +#: website/static/js/pages/base-page.js:135 +#: website/static/js/pages/base-page.js:142 +msgid "" +"If you change your mind, visit the user " +"settings page." +msgstr "意見が変わったら、ユーザー設定ページにアクセスしてください。" + +#: website/static/js/pages/base-page.js:138 +#: website/static/js/pages/base-page.js:188 +msgid "Add email" +msgstr "メールを追加" + +#: website/static/js/pages/base-page.js:139 +msgid "Would you like to add %1$s to your account?" +msgstr "アカウントに%1$sを追加しますか?" + +#: website/static/js/pages/base-page.js:140 +msgid "%1$s has been added into your account." +msgstr "%1$sがアカウントに追加されました。" + +#: website/static/js/pages/base-page.js:141 +msgid "You have chosen not to add %1$s to your account. " +msgstr "アカウントに%1$sを追加しないことを選択しました。" + +#: website/static/js/pages/base-page.js:145 +msgid "There was a problem adding " +msgstr "次のメールアドレスを追加中に問題が発生しました:" + +#: website/static/js/pages/base-page.js:146 +#: website/static/js/pages/base-page.js:149 +msgid ". Please contact %1$s if the problem persists." +msgstr "。問題が解決しない場合は%1$sにお問い合わせください。" + +#: website/static/js/pages/base-page.js:148 +msgid "There was a problem removing " +msgstr "次のメールアドレスを削除中に問題が発生しました:" + +#: website/static/js/pages/base-page.js:160 +msgid "Do not add email" +msgstr "メールを追加しないで下さい" + +#: website/static/js/pages/base-page.js:173 +msgid "Could not remove email" +msgstr "メールを削除できませんでした" + +#: website/static/js/pages/base-page.js:198 +msgid "Could not add email" +msgstr "メールを追加できませんでした" + +#: website/static/js/pages/base-page.js:291 +msgid " and " +msgstr "と" + +#: website/static/js/pages/dashboard-page.js:35 +msgid "Could not set user timezone or locale" +msgstr "ユーザーのタイムゾーンまたはロケールを設定できませんでした" + +#: website/static/js/pages/dashboard-page.js:53 +msgid "" +"This is taking longer than normal.
                                                            Try reloading the page. If the " +"problem persist, please contact us at %1$s" +msgstr "これには通常より時間がかかります。
                                                            ページを再読み込みしてください。 問題が解決しない場合は、%1$sまでご連絡ください" + +#: website/static/js/pages/file-page.js:21 +msgid "Add a file tag to enhance discoverability" +msgstr "タグを追加してファイルを発見しやすくする" + +#: website/static/js/pages/file-page.js:23 +#: website/static/js/pages/file-page.js:58 +#: website/static/js/pages/file-page.js:60 +#: website/static/js/pages/project-dashboard-page.js:632 +#: website/static/js/pages/project-dashboard-page.js:716 +#: website/static/js/pages/project-dashboard-page.js:749 +msgid "Removing tag" +msgstr "タグを削除" + +#: website/static/js/pages/file-page.js:24 +#: website/static/js/pages/project-dashboard-page.js:633 +msgid "Add a tag" +msgstr "タグを追加" + +#: website/static/js/pages/file-page.js:28 +msgid "Could not add tag." +msgstr "タグを追加できませんでした" + +#: website/static/js/pages/file-page.js:29 +#: website/static/js/pages/project-dashboard-page.js:656 +msgid "Failed to add tag" +msgstr "タグの追加に失敗しました" + +#: website/static/js/pages/file-page.js:43 +msgid "Could not remove tag." +msgstr "タグを削除できませんでした。" + +#: website/static/js/pages/file-page.js:44 +#: website/static/js/pages/project-dashboard-page.js:692 +msgid "Failed to remove tag" +msgstr "タグの削除に失敗しました。" + +#: website/static/js/pages/file-page.js:90 +msgid "The file title cannot be empty." +msgstr "ファイルのタイトルを空にすることはできません。" + +#: website/static/js/pages/file-page.js:92 +msgid "The file title cannot be more than 100 characters." +msgstr "ファイルのタイトルは100文字を超えることはできません。" + +#: website/static/js/pages/file-page.js:103 +msgid "" +"Your file was successfully renamed. To view the new filename in the file " +"tree below, refresh the page." +msgstr "ファイルの名前が正常に変更されました。 下のファイルツリーで新しいファイル名を表示するには、ページを更新します。" + +#: website/static/js/pages/file-page.js:124 +#: website/static/js/pages/file-page.js:127 +msgid "Timestamp verification:" +msgstr "タイムスタンプの検証:" + +#: website/static/js/pages/file-page.js:127 +msgid "Fail: not responded" +msgstr "失敗:レスポンスなし" + +#: website/static/js/pages/files-page.js:57 +#: website/static/js/pages/files-page.js:104 +msgid "Could not open the path" +msgstr "指定パスを開けませんでした" + +#: website/static/js/pages/institution-page.js:30 +msgid "All Projects" +msgstr "全てのプロジェクト" + +#: website/static/js/pages/institution-page.js:43 +msgid "" +"This is taking longer than normal.
                                                            Try reloading the page. If the " +"problem persist, please contact us at %1$s." +msgstr "これには通常より時間がかかります。
                                                            ページを再読み込みしてください。 問題が解決しない場合は、%1$sまでご連絡ください。" + +#: website/static/js/pages/notifications-config-page.js:21 +#: website/static/js/pages/project-settings-page.js:33 +msgid "Could not retrieve notification settings." +msgstr "通知設定を取得できませんでした。" + +#: website/static/js/pages/profile-settings-addons-page.js:66 +#: website/static/js/pages/project-addons-page.js:15 +msgid "" +"Sorry, we had trouble saving your settings. If this persists please " +"contact " +msgstr "申し訳ありませんが、設定を保存できませんでした。 それでも解決しない場合は、こちらにお問い合わせ下さい:" + +#: website/static/js/pages/profile-settings-addons-page.js:68 +msgid "Request failed" +msgstr "要求が失敗しました" + +#: website/static/js/pages/profile-settings-addons-page.js:86 +msgid "Are you sure you want to remove the add-ons you have deselected? " +msgstr "選択解除したアドオンを削除してもよろしいですか?" + +#: website/static/js/pages/profile-settings-addons-page.js:129 +msgid "The changes on addon setting are not submitted!" +msgstr "アドオン設定の変更は送信されません!" + +#: website/static/js/pages/project-addons-page.js:10 +msgid "Your add-on settings have been successfully changed." +msgstr "アドオンの設定が正常に変更されました。" + +#: website/static/js/pages/project-addons-page.js:26 +msgid "Disable Add-on?" +msgstr "アドオンを無効にしますか?" + +#: website/static/js/pages/project-addons-page.js:27 +msgid "Are you sure you want to disable this add-on?" +msgstr "このアドオンを無効にしますか?" + +#: website/static/js/pages/project-addons-page.js:37 +msgid "Disable" +msgstr "無効にする" + +#: website/static/js/pages/project-dashboard-page.js:117 +msgid "Filter by users" +msgstr "ユーザでフィルタ" + +#: website/static/js/pages/project-dashboard-page.js:118 +msgid "Select from current contributors" +msgstr "現在のメンバーから選択" + +#: website/static/js/pages/project-dashboard-page.js:119 +msgid "Select including past contributors" +msgstr "過去のメンバーも含めて選択" + +#: website/static/js/pages/project-dashboard-page.js:120 +msgid "Include past project contributors in your search" +msgstr "過去のプロジェクトメンバーも含めて検索する" + +#: website/static/js/pages/project-dashboard-page.js:121 +msgid "Use dropdown menu" +msgstr "ドロップダウンメニュー使用" + +#: website/static/js/pages/project-dashboard-page.js:417 +msgid "Add Component" +msgstr "コンポーネントを追加" + +#: website/static/js/pages/project-dashboard-page.js:419 +msgid "Create new component" +msgstr "新しいコンポーネントを作成する" + +#: website/static/js/pages/project-dashboard-page.js:613 +msgid "Error retrieving filebrowser" +msgstr "ファイルブラウザの取得エラー" + +#: website/static/js/pages/project-dashboard-page.js:630 +msgid "Add a project tag to enhance discoverability" +msgstr "タグを追加してプロジェクトを発見しやすくする" + +#: website/static/js/pages/project-dashboard-page.js:691 +msgid "Could not remove tag" +msgstr "タグを削除できませんでした" + +#: website/static/js/pages/project-settings-page.js:34 +msgid "Could not GET notification settings." +msgstr "通知設定を取得できませんでした。" + +#: website/static/js/pages/project-settings-page.js:54 +msgid "Could not retrieve wiki settings." +msgstr "ウィキ設定を取得できませんでした。" + +#: website/static/js/pages/project-settings-page.js:55 +msgid "Could not GET wiki settings." +msgstr "ウィキ設定を取得できませんでした。" + +#: website/static/js/pages/project-settings-page.js:104 +msgid "Successfully updated settings." +msgstr "設定を更新しました。" + +#: website/static/js/pages/project-settings-page.js:115 +msgid "Could not set commenting configuration. Please try again." +msgstr "コメント設定を設定できませんでした。 もう一度やり直してください。" + +#: website/static/js/pages/project-settings-page.js:151 +msgid "Unable to update settings" +msgstr "設定を更新できません" + +#: website/static/js/pages/project-settings-page.js:152 +msgid "Could not update settings." +msgstr "設定を更新できませんでした。" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:31 +msgid "Import Account from Admin" +msgstr "管理者からアカウントをインポート" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:52 +#: website/static/js/pages/rdm-profile-settings-addons-page.js:54 +msgid "Successfully imported the account." +msgstr "アカウントを正常にインポートしました。" + +#: website/static/js/pages/rdm-profile-settings-addons-page.js:59 +#: website/static/js/pages/rdm-profile-settings-addons-page.js:61 +msgid "Failed to import the account." +msgstr "アカウントのインポートに失敗しました。" + +#: website/static/js/pages/timestamp-common.js:172 +msgid "A verify request is being processed!" +msgstr "確認リクエストが処理されています!" + +#: website/static/js/pages/timestamp-common.js:175 +msgid "Something went wrong with the Verify request." +msgstr "確認リクエストで問題が発生しました。" + +#: website/static/js/pages/timestamp-common.js:191 +msgid "Using the checkbox, please select the files to request timestamp." +msgstr "チェックボックスを使用して、タイムスタンプを要求するファイルを選択してください。" + +#: website/static/js/pages/timestamp-common.js:214 +msgid "Timestamp is being added to the selected files!" +msgstr "選択したファイルにタイムスタンプが追加されています!" + +#: website/static/js/pages/timestamp-common.js:217 +msgid "Something went wrong with the Request Trusted Timestamp request." +msgstr "Request Trusted Timestampリクエストで問題が発生しました。" + +#: website/static/js/pages/timestamp-common.js:222 +msgid "The task has been cancelled." +msgstr "タスクはキャンセルされました。" + +#: website/static/js/pages/timestamp-common.js:231 +msgid "The task already finished." +msgstr "タスクはすでに終了しています。" + +#: website/static/js/pages/timestamp-common.js:234 +msgid "Something went wrong in the cancel request." +msgstr "キャンセルリクエストで問題が発生しました。" + +#: website/static/js/pages/timestamp-common.js:288 +msgid "Using the checkbox, please select the files to download." +msgstr "チェックボックスを使用して、ダウンロードするファイルを選択してください。" + +#: website/static/js/pages/timestamp-common.js:323 +msgid "Failed to log \"downloaded errors\" into Recent Activity" +msgstr "エラーリストがダウンロードされたことを最近の活動に記録できませんでした。" + +#: website/static/js/pages/wiki-edit-page.js:64 +msgid "The wiki page name cannot be empty." +msgstr "Wikiページ名を空にすることはできません。" + +#: website/static/js/pages/wiki-edit-page.js:66 +msgid "The wiki page name cannot be more than 100 characters." +msgstr "Wikiページ名は100文字を超えることはできません。" + +#: website/static/js/pages/wiki-edit-page.js:81 +msgid "Error in renaming wiki" +msgstr "Wikiの名前変更中のエラー" + +#: website/static/js/pages/wiki-edit-page.js:88 +msgid "An unexpected error occurred. Please try again." +msgstr "予期しないエラーが発生しました。 もう一度やり直してください。" + +#: website/static/js/pages/wiki-edit-page.js:108 +msgid "

                                                            Could not retrieve wiki pages. If this issue persists, " +msgstr "

                                                            wikiページを取得できませんでした。 この問題が解決しない場合、" + +#: website/static/js/pages/wiki-edit-page.js:109 +msgid "please report it to %1$s" +msgstr "%1$sに報告してください" + +#: website/static/js/pages/wiki-edit-page.js:110 +msgid "Could not GET wiki menu pages" +msgstr "Wikiメニューページを取得できませんでした" + +#~ msgid "%1$s \"%2$s\" to \"%3$s\" is taking a bit longer than expected." +#~ msgstr "%1$s \"%2$s\" 〜 \"%3$s\" は予想より少し時間がかかっています。" + +#~ msgid "We'll send you an email when it has finished." +#~ msgstr "終了したらメールをお送りします。" + +#~ msgid "" +#~ "In the mean time you can leave " +#~ "this page; your %1$s will still be" +#~ " completed." +#~ msgstr "それまでの間、このページを離れることができます。 あなたの%1$sはまだ完了しています。" + +#~ msgid "Operation Information" +#~ msgstr "運営情報" + +#~ msgid "" +#~ " This file has been checked out" +#~ " by a COS Preregistration Challenge " +#~ "Reviewer and will become available when" +#~ " review is complete." +#~ msgstr "" +#~ "このファイルはCOS Preregistration Challenge " +#~ "Reviewerによってチェックアウトされており、レビューが完了すると利用可能になります。" diff --git a/site/guides/skeleton/images/class.png b/site/guides/skeleton/images/class.png new file mode 100644 index 0000000..ce9f7b3 Binary files /dev/null and b/site/guides/skeleton/images/class.png differ diff --git a/site/guides/skeleton/images/class.uml b/site/guides/skeleton/images/class.uml new file mode 100644 index 0000000..4daf6c3 --- /dev/null +++ b/site/guides/skeleton/images/class.uml @@ -0,0 +1,37 @@ +# Build: +# $ cat class.uml | docker run --rm -i think/plantuml -tpng > class.png +@startuml + +package addons.base.apps <> { + class BaseAddonAppConfig +} + +package addons.base.models <> { + class BaseNodeSettings +} + +package addons.$(addon_short_name).apps <> { + class AddonAppConfig +} + +package addons.$(addon_short_name).routes <> { + object api_routes +} + +package addons.$(addon_short_name).models <> { + class NodeSettings +} + +package addons.$(addon_short_name).views <> { + object some_getter + object some_setter +} + +BaseAddonAppConfig <|-- AddonAppConfig +BaseNodeSettings <|-- NodeSettings +AddonAppConfig ..> api_routes +AddonAppConfig ..> NodeSettings +api_routes ..> some_getter +api_routes ..> some_setter + +@enduml diff --git a/site/guides/skeleton/images/create-project.png b/site/guides/skeleton/images/create-project.png new file mode 100644 index 0000000..298cfbc Binary files /dev/null and b/site/guides/skeleton/images/create-project.png differ diff --git a/site/guides/skeleton/images/enable-addon.png b/site/guides/skeleton/images/enable-addon.png new file mode 100644 index 0000000..66f4b09 Binary files /dev/null and b/site/guides/skeleton/images/enable-addon.png differ diff --git a/site/guides/skeleton/images/enabled-addon.png b/site/guides/skeleton/images/enabled-addon.png new file mode 100644 index 0000000..44f4297 Binary files /dev/null and b/site/guides/skeleton/images/enabled-addon.png differ diff --git a/site/guides/skeleton/index.html b/site/guides/skeleton/index.html new file mode 100644 index 0000000..3772510 --- /dev/null +++ b/site/guides/skeleton/index.html @@ -0,0 +1,2886 @@ + + + + + + + + + + + + + + + + + + + + + + + Skeleton Addon / スケルトンアドオン - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

                                                            +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            + + + + + + + +

                                                            Skeleton Addon / スケルトンアドオン

                                                            +
                                                            +

                                                            Summary: Guide to creating your first RDM addon using the skeleton template +概要: スケルトンテンプレートを使用して最初の RDM アドオンを作成する手引き

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            + +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            Overview

                                                            +

                                                            This guide shows how to create your first RDM addon using the skeleton template. A skeleton addon is a simple addon with basic features that you can customize to build your own functionality.

                                                            +

                                                            The skeleton addon has the following capabilities:

                                                            +
                                                              +
                                                            • Can be enabled in any project
                                                            • +
                                                            • Has a parameter param_1 that can be set differently for each project
                                                            • +
                                                            • The param_1 parameter can be configured in the project's addon settings page
                                                            • +
                                                            +

                                                            Prerequisites

                                                            + +

                                                            Quick start

                                                            +
                                                              +
                                                            1. Copy the skeleton code to addons/your-addon-name
                                                            2. +
                                                            3. Update the addon name in all required files
                                                            4. +
                                                            5. Modify RDM code to register your addon (addons.json, Dockerfile, etc.)
                                                            6. +
                                                            7. Run migrations and restart services
                                                            8. +
                                                            9. Enable your addon in a project and test it
                                                            10. +
                                                            +

                                                            Legacy content

                                                            +

                                                            The legacy skeleton addon instructions are kept verbatim in README.legacy.md for reference and will be rewritten per milestone.

                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            概要

                                                            +

                                                            このガイドは、スケルトンテンプレートを使用して最初の RDM アドオンを作成する方法を示します。スケルトンアドオンは、カスタマイズして独自の機能を構築できる基本的な機能を持つシンプルなアドオンです。

                                                            +

                                                            スケルトンの機能は以下の通りです:

                                                            +
                                                              +
                                                            • 任意のプロジェクトで有効化可能
                                                            • +
                                                            • param_1 というパラメータを持ち、プロジェクトごとに異なる値を設定可能
                                                            • +
                                                            • param_1 パラメータはプロジェクトのアドオン設定画面で設定可能
                                                            • +
                                                            +

                                                            前提条件

                                                            + +

                                                            クイックスタート

                                                            +
                                                              +
                                                            1. スケルトンコードを addons/アドオン名 にコピーする
                                                            2. +
                                                            3. すべての必要なファイルでアドオン名を更新する
                                                            4. +
                                                            5. RDM のコードを修正してアドオンを登録する(addons.json, Dockerfile など)
                                                            6. +
                                                            7. マイグレーションを実行してサービスを再起動する
                                                            8. +
                                                            9. プロジェクトでアドオンを有効化してテストする
                                                            10. +
                                                            +

                                                            過去のコンテンツ

                                                            +

                                                            過去のスケルトンアドオンの手順は、参考のために README.legacy.md にそのまま残しており、マイルストーンごとに書き直す予定です。

                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            AddonA small program that adds new features to RDM.RDM に新しい機能を追加する小さなプログラム。
                                                            SkeletonA template or sample code that you can customize to build your own program.独自のプログラムを構築するためにカスタマイズできるテンプレートやサンプルコード。
                                                            ParameterA value that you can change to modify how the addon works.アドオンの動作を変更するために変更できる値。
                                                            MigrationA script that updates the database when you change the data structure.データ構造を変更したときにデータベースを更新するスクリプト。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/guides/storage-addon/README.legacy/index.html b/site/guides/storage-addon/README.legacy/index.html new file mode 100644 index 0000000..5356fc1 --- /dev/null +++ b/site/guides/storage-addon/README.legacy/index.html @@ -0,0 +1,3215 @@ + + + + + + + + + + + + + + + + + + + + + + + ストレージアドオンの作成 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            + + + + + + + +

                                                            ストレージアドオンの作成

                                                            +

                                                            具体的なストレージアドオンの例として、AWS S3互換のMinIOと接続するストレージアドオンを実装します。このアドオンは特定のMinIOサーバーと接続するものとし、 My MinIOアドオンと名付けることとします。

                                                            +

                                                            基本的なアドオンの概要はスケルトンの作成を参照してください。

                                                            +

                                                            前提条件

                                                            +

                                                            開発環境の準備のガイドに従い、開発環境にてRDMを起動しているものとします。

                                                            +

                                                            ストレージアドオンの設計

                                                            +

                                                            サービスの構成

                                                            +

                                                            ストレージアドオンは以下の2つの要素から構成されます。

                                                            +
                                                              +
                                                            • OSF.ioサービスで動作するAddon: ユーザ・プロジェクト設定の管理
                                                            • +
                                                            • WaterButlerサービスで動作するProvider: ストレージへのアクセスの仲介
                                                            • +
                                                            +

                                                            Addonによりユーザからの認証情報の受領や各種設定を行い、Providerはこの認証情報・設定情報をAddonから譲渡してもらい、実際のストレージへのアクセスを行います。

                                                            +

                                                            ファイルの構成

                                                            +

                                                            典型的なクラス構成とファイル配置は以下のようになります。

                                                            +

                                                            OSF.io Addonのクラス構成とファイル構成

                                                            +

                                                            OSF.io Addon クラス構成

                                                            +

                                                            (*)が付いているファイルはスケルトン アドオンには存在しないファイルです。

                                                            +
                                                            /addons/アドオン名/
                                                            +├── __init__.py ... モジュールの定義
                                                            +├── apps.py ... アプリケーションの定義
                                                            +├── models.py ... モデルの定義
                                                            +├── provider.py ... (*) 認証プロバイダの定義
                                                            +├── requirements.txt ... 利用するPythonモジュールの定義
                                                            +├── routes.py ... View(Routes)の定義
                                                            +├── serializer.py ... (*) モデル-ビュー(JavaScript)間の情報交換用シリアライザの定義
                                                            +├── settings ... 設定を定義するモジュール
                                                            +│   ├── defaults.py ... デフォルト設定の定義
                                                            +│   ├── __init__.py ... 設定の定義
                                                            +│   └── local-dist.py ... (*) local.pyのサンプルファイル
                                                            +├── static ... Webブラウザから読み込むことを想定した静的ファイル
                                                            +│   ├── comicon.png ... アドオンのアイコン
                                                            +│   ├── myminioAnonymousLogActionList.json ... (*) 変更履歴メッセージ定義
                                                            +│   ├── myminioLogActionList.json ... (*) 変更履歴メッセージ定義
                                                            +│   ├── myminioNodeConfig.js ... (*) Node設定の定義
                                                            +│   ├── myminioUserConfig.js ... (*) User設定の定義
                                                            +│   ├── node-cfg.js ... Node設定のエントリとなるJavaScriptファイル
                                                            +│   └── user-cfg.js ... (*) User設定のエントリとなるJavaScriptファイル
                                                            +├── templates ... テンプレートディレクトリ
                                                            +│   ├── credentials_modal.mako ... (*) 認証情報の設定用ダイアログ
                                                            +│   ├── node_settings.mako ... Node設定パネル
                                                            +│   └── user_settings.mako ... (*) User設定パネル
                                                            +├── tests ... テストコード
                                                            +│   ├── __init__.py
                                                            +│   ├── conftest.py
                                                            +│   ├── factories.py
                                                            +│   ├── test_model.py
                                                            +│   ├── test_serializer.py ... (*)
                                                            +│   ├── test_view.py
                                                            +│   └── utils.py
                                                            +├── utils.py ... (*) ユーティリティ関数の定義
                                                            +└── views.py ... View(Views)の定義
                                                            +
                                                            +

                                                            WaterButler Providerのクラス構成とファイル構成

                                                            +

                                                            WaterButler Addon クラス構成

                                                            +
                                                            waterbutler/providers/アドオン名/
                                                            +├── __init__.py ... Providerクラスの参照
                                                            +├── metadata.py ... Metadataの定義
                                                            +├── provider.py ... Providerの定義
                                                            +└── settings.py ... デフォルト設定の定義
                                                            +
                                                            +tests/providers/アドオン名/
                                                            +├── __init__.py
                                                            +└── provider.py ... Providerのテストコード
                                                            +
                                                            +

                                                            OSF.io Addonのモジュール構成

                                                            +

                                                            スケルトン アドオンとの違いを中心に説明していきます。

                                                            +

                                                            Modelの構成

                                                            +

                                                            models.py に、以下のModelを定義します。

                                                            +
                                                              +
                                                            • UserSettings: ユーザーに関する情報(認証情報等)
                                                            • +
                                                            • NodeSettings: プロジェクトに関する情報
                                                            • +
                                                            • アドオン名FileNode: ファイル・フォルダオブジェクトの親定義
                                                            • +
                                                            • アドオン名File: ファイルオブジェクトの定義
                                                            • +
                                                            • アドオン名Folder: ファイルオブジェクトの定義
                                                            • +
                                                            +

                                                            provider.py に アドオン名Provider を、 serializer.py に アドオン名Serializer を定義します。OAuthを用いる場合は osf.models.external.ExternalProvider を継承し、必要なメンバを定義します。実装は GitHubの例 などを参考にしてください(GitHubアドオンは アドオン名Provider を models.py に定義しています)。 +アドオン名Serializer にはビュー(JavaScript)にURLリストや接続先フォルダなどを渡すための関数を定義します。

                                                            +

                                                            OAuth認証をしない場合であっても、ストレージアドオンの UserSettings と NodeSettings は、 BaseOAuthUserSettings と BaseOAuthNodeSettings をそれぞれ継承して定義し、 oauth_provider にアドオン名Provider を指定します。こうすることで、統一的な構造で簡単に認証の仕組みを実装することができます。

                                                            +

                                                            My MinIOアドオンの場合は、以下のように定義します。

                                                            + +

                                                            Viewの構成

                                                            +

                                                            views.pyには、おおよそ以下の関数を定義します。

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            関数名処理
                                                            set_configプロジェクトの設定を保存する。デフォルトでは接続先のフォルダとクライアント用のAPIのURLリストのみ。
                                                            get_configプロジェクトの設定を取得する。
                                                            import_authログイン中のユーザの認証情報をプロジェクトにインポートする。
                                                            deauthorize_nodeプロジェクトの認証情報を取り消す。
                                                            add_user_accountユーザの認証情報を追加する。
                                                            account_listユーザの認証情報リストを取得する。
                                                            create_folderストレージサービスにフォルダを追加する。プロジェクトのアドオン設定ページでフォルダを作る機能を提供しない場合は不要。
                                                            folder_listストレージサービスのフォルダリストを取得する。
                                                            +

                                                            シリアライザ(serializer.py)を定義し、 addons.base.generic_views を利用することで、以下のように一部のView処理を簡単に定義することができます。

                                                            +
                                                            import_auth = addons.base.generic_views.import_auth(
                                                            +    SHORT_NAME,
                                                            +    Serializer
                                                            +)
                                                            +
                                                            +

                                                            generic_views で提供していないView処理を追加したい場合や、View処理をカスタマイズしたい場合は、以下のように views.py に個別の関数を定義します。

                                                            +
                                                            @must_have_addon(SHORT_NAME, 'node')
                                                            +@must_be_addon_authorizer(SHORT_NAME)
                                                            +def folder_list(node_addon, **kwargs):
                                                            +    return node_addon.get_folders()
                                                            +
                                                            +

                                                            フォルダの作成やフォルダリストの取得をするために、Addonでもストレージサービスへ接続する必要があります。

                                                            +

                                                            My MinIOアドオンの場合は、以下のように定義します。

                                                            + +

                                                            フレームワークによって提供されるView

                                                            +

                                                            アドオンが持つ利用者用設定画面(user_settings.mako)とプロジェクト用設定画面(node_settings.mako)のテンプレートをそれぞれ定義します。認証情報の設定用ダイアログ(credentials_modal.mako)はどちらの画面でも利用するので、別のファイルで定義し、それぞれから参照します。
                                                            +My MinIOアドオンの場合は、以下のように定義します。

                                                            + +

                                                            利用者用設定画面のJavaScriptファイル(user-cfg.js, myminioUserConfig.js)と、プロジェクト用設定画面のJavaScriptファイル(node-cfg.js, myminioNodeConfig.js)をそれぞれ定義します。今回は、エントリとなるJavaScriptファイル(*-cfg.js)と定義ファイル(myminio*Config.js)を分けましたが、スケルトン アドオンのように *-cfg.js に定義を書いても構いません。
                                                            +My MinIOアドオンの場合は、以下のように定義します。

                                                            + +

                                                            また、変更履歴メッセージの定義ファイルも追加します。
                                                            +My MinIOアドオンの場合は、以下のように定義します。

                                                            + +

                                                            ストレージ操作UIであるFileViewerはFangornを使って実装されています。アイテム選択時に表示するボタンをカスタマイズしたい場合は、 Fangorn.config.アドオン名 を定義し、 files.js ファイルで読み込みます。 +My MinIOアドオンではカスタマイズせずデフォルト動作を使用しています。カスタマイズ例は、GitHubアドオンやIQB-RIMSアドオンを参照してください。

                                                            +

                                                            設定モジュール

                                                            +

                                                            環境ごとの設定ファイル local.py の雛形として local-dist.py ファイルを定義します。サービス管理者は local-dist.py を local.py にコピーして、適宜設定値を書き換えます。

                                                            +

                                                            My MinIOアドオンの場合は、以下のように定義します。接続するMinIOサービスのホスト名を HOST プロパティに設定します。

                                                            + +

                                                            テストコード

                                                            +

                                                            シリアライザのテスト(test_serializer.py)を定義します。
                                                            +My MinIOアドオンの場合は、以下のように定義します。

                                                            + +

                                                            WaterButler Providerのモジュール構成

                                                            +

                                                            WaterButler Providerは、WaterButlerプロジェクトの中でPythonモジュールとして実装されます。

                                                            +

                                                            metadata.py には、フォルダやファイルのメタデータと、リビジョンを持つクラスを定義します。
                                                            +My MinIOアドオンの場合は、以下のように定義します。

                                                            + +

                                                            provider.pyには、ストレージサービスと接続しCRUD操作などを行うProviderクラスを定義します。

                                                            +

                                                            Providerが提供するメソッドには以下のようなものがあります。

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            関数名引数戻り値処理
                                                            validate_v1_pathpath, **kwargsWaterButlerPath文字列で与えられたパス情報(path)を検証し、属性付きのWaterButlerPathオブジェクトを返す。
                                                            validate_pathpath, **kwargsWaterButlerPath同上(廃止予定のv0仕様との互換性維持のため、2つのメソッドに分かれている)。
                                                            downloadpath, accept_url=False, version=None, range=None, **kwargsStream指定されたパス(path)のデータをダウンロードする。戻り値にはデータアクセス用のStreamを返す。
                                                            uploadstream, path, conflict='replace', **kwargsMetadata指定されたパス(path)に指定されたデータ(stream)をアップロードする。戻り値にはアップロードしたファイルを示すMetadataを返す。
                                                            deletepath, confirm_delete=0, **kwargsなし指定されたパス(path)のファイル・フォルダを削除する。
                                                            revisionspath, **kwargsList(Revision)指定されたパス(path)のリビジョン情報を取得する。
                                                            metadatapath, revision=None, **kwargsMetadata or List(Metadata)指定されたパス(path)のメタデータを取得する。path がfileの場合 Metadata , directoryの場合 List(Metadata) を返す。
                                                            create_folderpath, folder_precheck=True, **kwargsMetadata指定されたパスにフォルダを作成する。戻り値には作成したフォルダを示すMetadataを返す。
                                                            can_intra_copydest_provider, path=NoneBool指定された送信先Provider(dest_provider), パス(path)に対してintra_copy(内部コピー: ストレージサービス上でのコピー)が可能かどうかを判定する。これがFalseの場合、いったん一時ディレクトリにdownloadして、destにuploadするという操作となる。
                                                            can_intra_movedest_provider, path=NoneBool指定された送信先Provider(dest_provider), パス(path)に対してintra_move(内部移動: ストレージサービス中での移動)が可能かどうかを判定する。これがFalseの場合、いったん一時ディレクトリにdownloadして、destにupload、コピー元ファイルをdeleteするという操作となる。
                                                            intra_copydest_provider, src_path, dest_pathBool内部コピーを実施する。成功すればTrueを返す。
                                                            intra_movedest_provider, src_path, dest_pathBool内部移動を実施する。成功すればTrueを返す。
                                                            +

                                                            My MinIOアドオンの場合は、以下のように定義します。

                                                            + +

                                                            OSF.io AddonとWaterButler Providerの認証情報の委譲

                                                            +

                                                            OSF.io Addonは、WaterButler Providerが必要なサービスに接続できるよう、認証情報を委譲します。この認証情報の形式はAddonにより異なるため、AddonとProviderのバージョンを合わせるなど依存関係に配慮する必要があります。

                                                            +

                                                            認証情報などの委譲

                                                            +

                                                            Addonにおける委譲設定は、 addons.アドオン名.models.NodeSettings.serialize_waterbutler_credentials() 関数で設定します。接続先のフォルダなどの情報は、同クラスの serialize_waterbutler_settings() 関数で設定します。例えば IQB-RIMSアドオンの serialize_waterbutler_settings() 関数 では、フォルダごとの権限設定を渡します。

                                                            +

                                                            My MinIOアドオンの場合は、以下のように定義します。認証情報として、アクセス先のホスト名、アクセスキー、シークレットキーを渡します。設定情報として、接続先のバケットIDを渡します。

                                                            +
                                                            def serialize_waterbutler_credentials(self):
                                                            +    if not self.has_auth:
                                                            +        raise exceptions.AddonError('Cannot serialize credentials for {} addon'.format(FULL_NAME))
                                                            +    return {
                                                            +        'host': settings.HOST,
                                                            +        'access_key': self.external_account.oauth_key,
                                                            +        'secret_key': self.external_account.oauth_secret,
                                                            +    }
                                                            +
                                                            +def serialize_waterbutler_settings(self):
                                                            +    if not self.folder_id:
                                                            +        raise exceptions.AddonError('Cannot serialize settings for {} addon'.format(FULL_NAME))
                                                            +    return {
                                                            +        'bucket': self.folder_id
                                                            +    }
                                                            +
                                                            +

                                                            Provider側では、認証情報と設定情報を waterbutler.providers.アドオン名.アドオン名Provider クラスのコンストラクタ(__init__())の引数 credentials と settings にDictionary型でそれぞれ受け取ります。

                                                            +

                                                            My MinIOアドオンの場合は、以下のように定義します。認証情報を使ってMy MinIOサービスとの接続を確立し、設定情報を使って接続先バケットを取得します。

                                                            +
                                                            class MyMinIOProvider(provider.BaseProvider):
                                                            +    def __init__(self, auth, credentials, settings):
                                                            +        super().__init__(auth, credentials, settings)
                                                            +
                                                            +        host = credentials['host']
                                                            +        port = 443
                                                            +        m = re.match(r'^(.+)\:([0-9]+)$', host)
                                                            +        if m is not None:
                                                            +            host = m.group(1)
                                                            +            port = int(m.group(2))
                                                            +        self.connection = MyMinIOConnection(credentials['access_key'],
                                                            +                                            credentials['secret_key'],
                                                            +                                            calling_format=OrdinaryCallingFormat(),
                                                            +                                            host=host,
                                                            +                                            port=port,
                                                            +                                            is_secure=port == 443)
                                                            +        self.bucket = self.connection.get_bucket(settings['bucket'], validate=False)
                                                            +
                                                            +

                                                            Recent Activityの記録・表示

                                                            +

                                                            何らかのユーザ操作を契機としてアドオンに対して行われた操作は、Recent Activityという形で記録することができます。

                                                            +

                                                            NodeLogモデルの追加

                                                            +

                                                            Recent ActivityはNodeLogモデルにより表現されます。 +ログの追加はNode(プロジェクトに対応するモデル)の add_logメソッド により行うことができます。

                                                            +

                                                            models.py +

                                                            self.owner.add_log(
                                                            +    '{0}_{1}'.format(SHORT_NAME, action),
                                                            +    auth=auth,
                                                            +    params={
                                                            +        'project': self.owner.parent_id,
                                                            +        'node': self.owner._id,
                                                            +        'path': metadata['materialized'],
                                                            +        'bucket': self.folder_id,
                                                            +        'urls': {
                                                            +            'view': url,
                                                            +            'download': url + '?action=download'
                                                            +        }
                                                            +    },
                                                            +)
                                                            +

                                                            +

                                                            この例では、NodeSettingsモデルのowner(Node)に対してログの追加を指示しています。 +パラメータには以下の値を指定することができます。

                                                            +
                                                              +
                                                            • action ... ログのアクション種別を示す名前。アドオン名_アクション名となる。本サンプルにより記録されるアクション名には以下のものがある。
                                                            • +
                                                            • node_authorized, node_deauthorized, node_deauthorized_no_user ... プロジェクトに本アドオンが設定あるいは解除された場合に記録されるログ
                                                            • +
                                                            • bucket_linked, bucket_unlinked ... プロジェクト設定画面により、バケットが設定あるいは解除された場合に記録されるログ
                                                            • +
                                                            • file_added, file_removed, file_updated, folder_created ... WaterButlerによるファイル操作が行われた場合に記録されるログ
                                                            • +
                                                            • params ... ログのパラメータ。任意のdictオブジェクトを指定することができる
                                                            • +
                                                            • auth ... 操作を実施したユーザの情報。framework.auth.Authクラスのインスタンスを与えることができる
                                                            • +
                                                            +

                                                            NodeLogモデルの表示

                                                            +

                                                            記録されたログをどのように表示するかは、以下のJSONファイルにより定義します。

                                                            +

                                                            myminioLogActionList.json +

                                                            "myminio_bucket_linked" : "${user} linked the My MinIO bucket ${bucket} to ${node}",
                                                            +

                                                            +

                                                            myminioAnonymousLogActionList.json +

                                                            "myminio_bucket_linked" : "A user linked an My MinIO bucket to a project",
                                                            +

                                                            +

                                                            アドオン名LogActionList.jsonはログインした状態でのプロジェクト表示の際に利用され、アドオン名AnonymousLogActionList.jsonはパブリックなプロジェクト(RDMでは利用を想定していません)に利用されます。 +どのメッセージがログ表示に利用されるかは、add_logメソッドの action 引数に与えられた文字列がキーとして使用されます。また、メッセージ定義中の ${パラメータ名} にはadd_logメソッドの params 引数に与えられたパラメータ中のキーを指定することができます。

                                                            +

                                                            メッセージの国際化はpybabelコマンドを用いて行うことができます。定義したアドオンのメッセージ(英語で記載する)に対応する日本語メッセージの定義ファイルを生成するためには、 +以下のコマンドを実行します。

                                                            +
                                                            # メッセージ定義JSONなどをJavaScriptファイルへと変換する
                                                            +$ docker compose run --rm web invoke assets
                                                            +
                                                            +# メッセージ定義テンプレートファイル website/translations/js_messages.pot を更新する
                                                            +$ docker compose run --rm web pybabel extract -F ./website/settings/babel_js.cfg -o ./website/translations/js_messages.pot .
                                                            +
                                                            +# メッセージ定義ファイル website/translations/ja/LC_MESSAGES/js_messages.po を更新する
                                                            +$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/en/LC_MESSAGES/js_messages.po -l en
                                                            +$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/ja/LC_MESSAGES/js_messages.po -l ja
                                                            +
                                                            +

                                                            すると、website/translations/ja/LC_MESSAGES/js_messages.poファイルに、以下のような空の項目が追加されます。

                                                            +
                                                            #: website/static/js/logActionsList_extract.js:246
                                                            +msgid "${user} linked the My MinIO bucket ${bucket} to ${node}"
                                                            +msgstr ""
                                                            +
                                                            +

                                                            この msgstr に日本語によるメッセージ定義を追加することで、メッセージを国際化することができます。

                                                            +
                                                            #: website/static/js/logActionsList_extract.js:246
                                                            +msgid "${user} linked the My MinIO bucket ${bucket} to ${node}"
                                                            +msgstr "${user}が My MinIOバケット(${bucket})を接続しました"
                                                            +
                                                            +

                                                            js_messages.po を変更したら、assetsサービスを再起動してください。最新のjs_messages.poファイルがメッセージの表示に使用されるようになります。

                                                            +
                                                            $ docker compose restart assets
                                                            +
                                                            +

                                                            タイムスタンプの処理

                                                            +

                                                            RDMではユーザが任意のタイミングで、プロジェクト中のファイルに対してタイムスタンプを打つことができます。タイムスタンプは、ファイルに関してその時点での内容を証明するもので、研究の証跡としてのデータを考える上で非常に重要です。

                                                            +

                                                            なお、docker-composeで起動した状態では FreeTSA Project のサーバを用いてタイムスタンプを付与します。実環境への配備時はUPKI電子証明書発行サービスによりタイムスタンプ付与することを想定しています。

                                                            +

                                                            ユーザによるタイムスタンプの追加

                                                            +

                                                            タイムスタンプは、ファイルの内容から計算したハッシュ値を署名する形で作成されます。ハッシュの取得は以下のいずれかの方法でおこないます。

                                                            +
                                                              +
                                                            • osf.models.files.File サブクラスの get_hash_for_timestampにより取得する
                                                            • +
                                                            • WaterButlerを経由してファイルをダウンロードし、ハッシュ計算を行う
                                                            • +
                                                            +

                                                            osf.models.files.File サブクラスはアドオンのモデルとしてハッシュ値の取得方法を定義するものです。本サンプルでは models.py にあります。 +ストレージにより容易にハッシュ相当の値を取得・管理する方法がある場合は、このモデルにget_hash_for_timestamp(self)メソッドを定義します。 +タイムスタンプ処理はこのメソッドを通じてハッシュ値を取得することができます。 +get_hash_for_timestamp(self)メソッドの実装は dropboxbusinessアドオンの DropboxBusinessFileクラス を参考にしてください。

                                                            +

                                                            osf.models.files.Fileモデルにget_hash_for_timestamp(self)が定義されていない場合は、タイムスタンプ処理はWaterButlerを経由してファイルをダウンロードする方法を試行します。

                                                            +

                                                            RDM以外でのファイル変更によるタイムスタンプの追加

                                                            +

                                                            RDM以外でのファイル変更時に実施する場合も、ファイルが変更されたことを示すためにタイムスタンプを付加したい場合があります。 +このような処理を実行するためには website.util.timestamp モジュールを使用します。 +例えばDropbox Businessアドオンでは以下のように実装しています。

                                                            +

                                                            dropboxbusiness/utils.py +

                                                            ...
                                                            +from website.util import timestamp
                                                            +
                                                            +...
                                                            +
                                                            +file_info = {
                                                            +    'file_id': file_node._id,
                                                            +    'file_name': attrs.get('name'),
                                                            +    'file_path': attrs.get('materialized'),
                                                            +    'size': attrs.get('size'),
                                                            +    'created': attrs.get('created_utc'),
                                                            +    'modified': attrs.get('modified_utc'),
                                                            +    'file_version': '',
                                                            +    'provider': PROVIDER_NAME
                                                            +}
                                                            +# verified by admin
                                                            +verify_result = timestamp.check_file_timestamp(
                                                            +    admin.id, node, file_info, verify_external_only=True)
                                                            +

                                                            +

                                                            check_file_timestamp(uid, node, data, verify_external_only=False)関数は以下のパラメータを指定することができます。

                                                            +
                                                              +
                                                            • uid ... タイムスタンプ操作を行うユーザを示すOSFUserのID
                                                            • +
                                                            • node ... ファイルが所属するプロジェクトを示すNode
                                                            • +
                                                            • data ... タイムスタンプにより署名検証するデータを示す辞書型データ
                                                            • +
                                                            • verify_external_only ... タイムスタンプ検証情報の格納にosf.models.RdmFileTimestamptokenVerifyResultを使う場合はFalse, 使わない場合(osf.models.files.File サブクラスのdef set_timestamp(self, timestamp_data, timestamp_status, context)に格納する場合)はTrueとする (デフォルトはFalse)
                                                            • +
                                                            +

                                                            なお、def set_timestamp(self, timestamp_data, timestamp_status, context) の定義方法は dropboxbusinessアドオンの DropboxBusinessFileクラス を参考にしてください。

                                                            +

                                                            また、タイムスタンプの付加処理はストレージのAPI呼び出しやタイムスタンプの付加処理などI/Oを伴うため、viewsモジュール内の関数など、リクエストハンドラとして振る舞う関数中で処理を行ってしまうと、他のハンドラが待たされる要因になります。 +このような状況に対応するため、RDMではCeleryによるワーカーが用意されています。 +関数をCeleryタスクとして定義することで、時間がかかる処理はワーカーに委譲することができます。 +例えばDropbox Businessアドオンでは以下のように定義しています。

                                                            +

                                                            dropboxbusiness/utils.py +

                                                            ...
                                                            +from framework.celery_tasks import app as celery_app
                                                            +
                                                            +...
                                                            +
                                                            +@celery_app.task(bind=True, base=AbortableTask)
                                                            +def celery_check_updated_files(self, team_ids):
                                                            +    ...
                                                            +

                                                            +

                                                            呼び出し側では以下のように関数を実行することで、ワーカーに処理を任せ、自身の処理を続行することができます。

                                                            +

                                                            dropboxbusiness/views.py +

                                                            utils.celery_check_updated_files.delay(team_ids)
                                                            +

                                                            +

                                                            My MinIOアドオンの実装

                                                            +

                                                            ここでは、 myminio という識別名のアドオンの実装を例に説明します。アドオンの完全名は My MinIO とします。

                                                            +

                                                            アドオン名は様々な場所に埋め込まれています。アドオン名を変更したい場合は、以降で追加・変更するファイル名やコードの myminio 、 My MinIO 、 MyMinIO という文字列を変更してください。

                                                            +

                                                            My MinIOアドオンは、AWS S3互換サービスと接続するアドオンなので、Amazon S3アドオンやS3 Compatible Storageアドオンを参考に実装することができます。Amazon S3アドオンやS3 Compatible Storageアドオンとの違いは以下の通りです。

                                                            +
                                                              +
                                                            • My MinIOアドオンは簡単のため、アップロードの暗号化機能を実装しない。
                                                            • +
                                                            • Amazon S3アドオンやS3 Compatible Storageアドオンは、アカウントごとに接続するサービスやLocationなどを選択できるが、My MinIOはサービス側で指定した特定のMinIOサービスのみを扱う。
                                                            • +
                                                            +

                                                            OSF.ioへの実装

                                                            +

                                                            addons.myminio モジュールの定義

                                                            +

                                                            スケルトン アドオンと同様に、アドオンの実装例(osf.io/addon/)を addons/myminio ディレクトリにコピーします。

                                                            +

                                                            RDMコードの変更

                                                            +

                                                            スケルトン アドオンと同様に、RDMのコードをいくつか変更します。

                                                            + +

                                                            api/base/settings/defaults.py は、 INSTALLED_APPS の他に、 ADDONS_FOLDER_CONFIGURABLE 、 ADDONS_OAUTH にもアドオン名を追加します。変更例サンプルでは、Amazon S3アドオンに合わせて、スケルトン アドオンとは異なる方法で設定しています。

                                                            +
                                                            INSTALLED_APPS += ('addons.myminio',)
                                                            +ADDONS_FOLDER_CONFIGURABLE.append('myminio')
                                                            +ADDONS_OAUTH.append('myminio')
                                                            +
                                                            +

                                                            他にもストレージアドオンでは、 website/static/storageAddons.json にも設定を追加する必要があります。

                                                            +

                                                            変更例は storageAddons.json を参照してください。

                                                            +
                                                                "myminio": {
                                                            +        "fullName": "My MinIO",
                                                            +        "externalView": false
                                                            +    },
                                                            +
                                                            +
                                                            +

                                                            externalView を true に設定すると、FileViewerでファイルの外部ページリンクボタンが表示されるようになります。リンクを正しく動作させるには、WaterButlerのProviderを修正する必要があります。詳細はGoogleDriveの実装などを参照してください。

                                                            +

                                                            FileViewerで、フォルダの操作はできるがファイルの操作ができない場合は、 storageAddons.json の設定が漏れている可能性があります。

                                                            +
                                                            +

                                                            Migrationsファイルの作成

                                                            +

                                                            makemigrations コマンドを実行して、Migrationsファイルを作成します。

                                                            +
                                                            $ docker compose run --rm web python3 manage.py makemigrations
                                                            +
                                                            +

                                                            上記の出力中に以下のような出力が現れれば成功です。ストレージアドオンの場合、 osf/migrations と addons/myminio/migrations の2つのディレクトリ内にPythonファイルが作成されます。

                                                            +
                                                            +

                                                            osf/migrations 配下に作成されるファイル名は、作成日時やRDMのバージョンによって異なります。

                                                            +
                                                            +
                                                            Migrations for 'osf':
                                                            +  osf/migrations/0214_auto_20201001_0007.py
                                                            +    - Create proxy model MyMinIOFileNode
                                                            +    - Alter field type on basefilenode
                                                            +    - Create proxy model MyMinIOFile
                                                            +    - Create proxy model MyMinIOFolder
                                                            +Migrations for 'addons_myminio':
                                                            +  addons/myminio/migrations/0001_initial.py
                                                            +    - Create model NodeSettings
                                                            +    - Create model UserSettings
                                                            +    - Add field user_settings to nodesettings
                                                            +
                                                            +

                                                            国際化メッセージファイルの作成

                                                            +

                                                            国際化メッセージファイルの定義ファイルは以下のコマンドで生成することができます。

                                                            +
                                                            +

                                                            このセクションの実施時は各サービスを停止状態にしてください。

                                                            +
                                                            +
                                                            # メッセージ定義JSONなどをJavaScriptファイルへと変換する。各サービスが停止している状態で実施する。
                                                            +$ docker compose run --rm web invoke assets
                                                            +
                                                            +# メッセージ定義テンプレートファイル website/translations/js_messages.pot を更新する
                                                            +$ docker compose run --rm web pybabel extract -F ./website/settings/babel_js.cfg -o ./website/translations/js_messages.pot .
                                                            +
                                                            +# メッセージ定義ファイル website/translations/ja/LC_MESSAGES/js_messages.po を更新する
                                                            +$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/en/LC_MESSAGES/js_messages.po -l en
                                                            +$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/ja/LC_MESSAGES/js_messages.po -l ja
                                                            +
                                                            +

                                                            変更例のサンプル js_messages.po を参考に日本語メッセージを追加してください。

                                                            +
                                                            #: website/static/js/logActionsList_extract.js:246
                                                            +msgid "${user} linked the My MinIO bucket ${bucket} to ${node}"
                                                            +msgstr "${user}がMy MinIOバケット(${bucket})を${node}にリンクしました"
                                                            +
                                                            +#: website/static/js/logActionsList_extract.js:247
                                                            +msgid "${user} unselected the My MinIO bucket ${bucket} in ${node}"
                                                            +msgstr "${user}が${node}のMy MinIOバケット(${bucket})の選択を解除しました"
                                                            +
                                                            +...
                                                            +
                                                            +

                                                            このメッセージを追加後、assetsサービスの再起動時にメッセージ定義が反映されます。

                                                            +

                                                            アドオンのテスト

                                                            +

                                                            以下のコマンドで、OSF.ioに追加したMy MinIOアドオンのユニットテストを実行できます。

                                                            +
                                                            $ docker compose run --rm web invoke test_module -m addons/myminio/tests/
                                                            +
                                                            +

                                                            WaterButlerへの実装

                                                            +

                                                            waterbutler.providers.myminio モジュールの定義

                                                            +

                                                            Providerの実装例(waterbutler/provider/) を waterbutler/providers/myminio にコピーします。また、Providerのテストコード例(waterbutler/tests) を tests/providers/myminio にコピーします。

                                                            +

                                                            RDMコードの変更

                                                            +

                                                            setup.py に、アドオンのエントリポイント定義を追加します。setup() 関数の引数 entry_points に指定するDictionaryの waterbutler.providers キーに指定する配列に、以下を追加します。

                                                            +
                                                            'myminio = waterbutler.providers.myminio:MyMinIOProvider',
                                                            +
                                                            +

                                                            変更例はサンプル setup.py を参照してください。

                                                            +

                                                            docker-compose.override.yml の追加

                                                            +

                                                            変更したコードを使うよう、RDMの docker-compose.override.yml で WaterButler のサービスの volumes を指定します。

                                                            +

                                                            例えば、以下のようなディレクトリ階層の場合は、

                                                            +
                                                            .
                                                            +├── RDM-osf.io
                                                            +│   ├── docker-compose.override.yml
                                                            +│   └── docker-compose.yml
                                                            +└── RDM-waterbutler
                                                            +
                                                            +

                                                            RDM-osf.io/docker-compose.override.yml の内容を以下のようにします。

                                                            +
                                                            version: "3.4"
                                                            +
                                                            +services:
                                                            +  wb:
                                                            +    volumes:
                                                            +      - ../RDM-waterbutler:/code
                                                            +  wb_worker:
                                                            +    volumes:
                                                            +      - ../RDM-waterbutler:/code
                                                            +  wb_requirements:
                                                            +    volumes:
                                                            +      - ../RDM-waterbutler:/code
                                                            +
                                                            +

                                                            アドオンのテスト

                                                            +

                                                            以下のコマンドで、WaterButlerに追加したMy MinIOアドオン Providerのユニットテストを実行できます。

                                                            +
                                                            $ docker compose run --rm wb invoke test --provider myminio
                                                            +
                                                            +

                                                            My MinIOアドオンの動作確認

                                                            +

                                                            My MinIOアドオンの動作確認をしてみましょう。

                                                            +

                                                            MinIOサービスの起動

                                                            +

                                                            接続先のMinIOサービスを起動します。

                                                            +
                                                            docker run -p 9001:9000 \
                                                            +  -e "MINIO_ACCESS_KEY=minioadmin" \
                                                            +  -e "MINIO_SECRET_KEY=minioadmin" \
                                                            +  minio/minio server /data
                                                            +
                                                            +

                                                            RDMと同じコンピュータで実行する場合、9000番ポートが競合してしまうので、MinIOサービスのホストへの割り当てポートは9001などに設定します。 +MINIO_ACCESS_KEY と MINIO_SECRET_KEY は認証に使うキーです。適宜書き換えてください。

                                                            +

                                                            その他MinIOに関する詳しい説明はMinIOのドキュメントを参照してください。

                                                            +

                                                            OSF.io Addonの設定

                                                            +

                                                            OSF.io Addonの設定をします。 addons/myminio/settings/local-dist.py を addons/myminio/settings/local.py にコピーし、 HOST プロパティに先ほど起動したMinIOサービスのホスト名を指定します。

                                                            +
                                                            HOST = '192.168.168.167:9001'
                                                            +
                                                            +

                                                            RDMとMinIOサービスを同じ環境で実行している場合は、ループバックエイリアスを指定します。

                                                            +

                                                            DBマイグレーション

                                                            +

                                                            マイグレーションを実行し、Migrations定義をPostgreSQLサービスに反映します。

                                                            +
                                                            $ docker compose run --rm web python3 manage.py migrate
                                                            +
                                                            +

                                                            サービスの再起動

                                                            +

                                                            WaterButlerに追加したProviderを有効にするために、 wb_requirements を起動します。

                                                            +
                                                            $ docker compose up wb_requirements
                                                            +
                                                            +

                                                            変更したファイルに関連するサービスを再起動します。

                                                            +
                                                            $ docker compose restart assets web api wb
                                                            +
                                                            +

                                                            これでサービスへの反映は完了です。

                                                            +

                                                            ストレージアドオンを試す

                                                            +

                                                            My MinIOアドオンを試すには、以下のような操作を実施します。

                                                            +
                                                              +
                                                            1. RDM Web UIにアクセスする http://localhost:5000
                                                            2. +
                                                            3. ユーザ設定ページを開く
                                                            4. +
                                                            5. Configure add-on accountsページを開く
                                                            6. +
                                                            7. My MinIOアドオンの認証情報を設定をする + Authorize Addon + 認証情報の設定ダイアログが表示されるので、MinIOサービスの MINIO_ACCESS_KEY と MINIO_SECRET_KEY を、それぞれ、Access Key と Secret Key フォームに入力して保存します。 + Filled Credential + 成功すれば、切断ボタンと利用しているプロジェクトリストが表示されるエリアが表示されます。 + Successful Authorization Addon
                                                            8. +
                                                            9. 適当なプロジェクトを作成する
                                                            10. +
                                                            11. Add-onsページを開く
                                                            12. +
                                                            13. My MinIOアドオンを有効化する + Enable Addon
                                                            14. +
                                                            15. My MinIOアドオンの設定をする + Configure Addon + Import Account from Profileボタンから、アドオンの設定を行います。 + 接続に成功すると、ルート直下のフォルダリストが表示されるので、プロジェクトに紐付けるフォルダを選択し、保存します。このページでフォルダを作成することもできます。 + Select Current Folder
                                                            16. +
                                                            +

                                                            これで、作成したプロジェクトでMy MinIOアドオンが使えるようになりました。 +プロジェクトページのFiles ウィジェットやFilesページから、My MinIOサービスに対してフォルダの作成やファイルのアップロード、削除、ダウンロードなどができるようになるはずです。

                                                            +

                                                            Enabled Addon

                                                            +

                                                            以上でMy MinIOアドオンの動作確認は完了です!

                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/guides/storage-addon/images/authorize-addon.png b/site/guides/storage-addon/images/authorize-addon.png new file mode 100644 index 0000000..952cd79 Binary files /dev/null and b/site/guides/storage-addon/images/authorize-addon.png differ diff --git a/site/guides/storage-addon/images/configure-addon.png b/site/guides/storage-addon/images/configure-addon.png new file mode 100644 index 0000000..23b79d7 Binary files /dev/null and b/site/guides/storage-addon/images/configure-addon.png differ diff --git a/StorageAddon/images/crud.png b/site/guides/storage-addon/images/crud.png similarity index 100% rename from StorageAddon/images/crud.png rename to site/guides/storage-addon/images/crud.png diff --git a/StorageAddon/images/crud.uml b/site/guides/storage-addon/images/crud.uml similarity index 100% rename from StorageAddon/images/crud.uml rename to site/guides/storage-addon/images/crud.uml diff --git a/site/guides/storage-addon/images/enable-addon.png b/site/guides/storage-addon/images/enable-addon.png new file mode 100644 index 0000000..a03e97c Binary files /dev/null and b/site/guides/storage-addon/images/enable-addon.png differ diff --git a/site/guides/storage-addon/images/enabled-addon.png b/site/guides/storage-addon/images/enabled-addon.png new file mode 100644 index 0000000..b4776bb Binary files /dev/null and b/site/guides/storage-addon/images/enabled-addon.png differ diff --git a/site/guides/storage-addon/images/filled-credential.png b/site/guides/storage-addon/images/filled-credential.png new file mode 100644 index 0000000..4ce59bc Binary files /dev/null and b/site/guides/storage-addon/images/filled-credential.png differ diff --git a/StorageAddon/images/osf_class.png b/site/guides/storage-addon/images/osf_class.png similarity index 100% rename from StorageAddon/images/osf_class.png rename to site/guides/storage-addon/images/osf_class.png diff --git a/StorageAddon/images/osf_class.uml b/site/guides/storage-addon/images/osf_class.uml similarity index 100% rename from StorageAddon/images/osf_class.uml rename to site/guides/storage-addon/images/osf_class.uml diff --git a/site/guides/storage-addon/images/select-current-folder.png b/site/guides/storage-addon/images/select-current-folder.png new file mode 100644 index 0000000..f28526f Binary files /dev/null and b/site/guides/storage-addon/images/select-current-folder.png differ diff --git a/site/guides/storage-addon/images/successful-authorization-addon.png b/site/guides/storage-addon/images/successful-authorization-addon.png new file mode 100644 index 0000000..b87f043 Binary files /dev/null and b/site/guides/storage-addon/images/successful-authorization-addon.png differ diff --git a/StorageAddon/images/wb_class.png b/site/guides/storage-addon/images/wb_class.png similarity index 100% rename from StorageAddon/images/wb_class.png rename to site/guides/storage-addon/images/wb_class.png diff --git a/StorageAddon/images/wb_class.uml b/site/guides/storage-addon/images/wb_class.uml similarity index 100% rename from StorageAddon/images/wb_class.uml rename to site/guides/storage-addon/images/wb_class.uml diff --git a/site/guides/storage-addon/index.html b/site/guides/storage-addon/index.html new file mode 100644 index 0000000..560b714 --- /dev/null +++ b/site/guides/storage-addon/index.html @@ -0,0 +1,2886 @@ + + + + + + + + + + + + + + + + + + + + + + + Storage Addon / ストレージアドオン - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            + + + + + + + +

                                                            Storage Addon / ストレージアドオン

                                                            +
                                                            +

                                                            Summary: Guide to creating an RDM storage addon that connects to external storage services +概要: 外部ストレージサービスに接続する RDM ストレージアドオンを作成する手引き

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            + +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            Overview

                                                            +

                                                            This guide shows how to create an RDM storage addon that connects to external storage services like AWS S3 or MinIO. Storage addons consist of two parts:

                                                            +
                                                              +
                                                            • Addon (runs on OSF.io): Manages user and project settings
                                                            • +
                                                            • Provider (runs on WaterButler): Handles actual storage access
                                                            • +
                                                            +

                                                            The Addon receives authentication credentials and settings from users, while the Provider uses this information to communicate with the actual storage service.

                                                            +

                                                            Prerequisites

                                                            + +

                                                            Quick start

                                                            +
                                                              +
                                                            1. Create your addon using the skeleton as a base
                                                            2. +
                                                            3. Implement the Provider class for your storage service
                                                            4. +
                                                            5. Configure authentication and authorization between Addon and Provider
                                                            6. +
                                                            7. Test file operations (upload, download, delete)
                                                            8. +
                                                            9. Deploy and test with your storage service
                                                            10. +
                                                            +

                                                            Legacy content

                                                            +

                                                            The legacy storage addon instructions are kept verbatim in README.legacy.md for reference and will be rewritten per milestone.

                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            概要

                                                            +

                                                            このガイドは、AWS S3 や MinIO のような外部ストレージサービスに接続する RDM ストレージアドオンを作成する方法を示します。ストレージアドオンは以下の2つの部分から構成されます:

                                                            +
                                                              +
                                                            • アドオン (OSF.io 上で実行): ユーザーとプロジェクトの設定を管理
                                                            • +
                                                            • プロバイダ (WaterButler 上で実行): 実際のストレージアクセスを処理
                                                            • +
                                                            +

                                                            アドオンがユーザーから認証情報と設定を受け取り、プロバイダがその情報を使用して実際のストレージサービスと通信します。

                                                            +

                                                            前提条件

                                                            + +

                                                            クイックスタート

                                                            +
                                                              +
                                                            1. スケルトンをベースにアドオンを作成する
                                                            2. +
                                                            3. ストレージサービス用のプロバイダクラスを実装する
                                                            4. +
                                                            5. アドオンとプロバイダ間の認証と認可を設定する
                                                            6. +
                                                            7. ファイル操作(アップロード、ダウンロード、削除)をテストする
                                                            8. +
                                                            9. デプロイしてストレージサービスでテストする
                                                            10. +
                                                            +

                                                            過去のコンテンツ

                                                            +

                                                            過去のストレージアドオンの手順は、参考のために README.legacy.md にそのまま残しており、マイルストーンごとに書き直す予定です。

                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            Storage addonAn addon that connects RDM to external storage services like AWS S3.AWS S3 のような外部ストレージサービスに RDM を接続するアドオン。
                                                            ProviderA component that actually communicates with the storage service.ストレージサービスと実際に通信するコンポーネント。
                                                            AuthenticationThe process of verifying who you are (like a username and password).あなたが誰であるかを確認するプロセス(ユーザー名とパスワードのようなもの)。
                                                            AuthorizationThe process of checking what you are allowed to do after logging in.ログインした後、あなたが何をできるかを確認するプロセス。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/StorageAddon/osf.io/addon/__init__.py b/site/guides/storage-addon/osf.io/addon/__init__.py similarity index 100% rename from StorageAddon/osf.io/addon/__init__.py rename to site/guides/storage-addon/osf.io/addon/__init__.py diff --git a/StorageAddon/osf.io/addon/apps.py b/site/guides/storage-addon/osf.io/addon/apps.py similarity index 100% rename from StorageAddon/osf.io/addon/apps.py rename to site/guides/storage-addon/osf.io/addon/apps.py diff --git a/site/guides/storage-addon/osf.io/addon/migrations/__init__.py b/site/guides/storage-addon/osf.io/addon/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/StorageAddon/osf.io/addon/models.py b/site/guides/storage-addon/osf.io/addon/models.py similarity index 100% rename from StorageAddon/osf.io/addon/models.py rename to site/guides/storage-addon/osf.io/addon/models.py diff --git a/StorageAddon/osf.io/addon/provider.py b/site/guides/storage-addon/osf.io/addon/provider.py similarity index 100% rename from StorageAddon/osf.io/addon/provider.py rename to site/guides/storage-addon/osf.io/addon/provider.py diff --git a/StorageAddon/osf.io/addon/requirements.txt b/site/guides/storage-addon/osf.io/addon/requirements.txt similarity index 100% rename from StorageAddon/osf.io/addon/requirements.txt rename to site/guides/storage-addon/osf.io/addon/requirements.txt diff --git a/StorageAddon/osf.io/addon/routes.py b/site/guides/storage-addon/osf.io/addon/routes.py similarity index 100% rename from StorageAddon/osf.io/addon/routes.py rename to site/guides/storage-addon/osf.io/addon/routes.py diff --git a/StorageAddon/osf.io/addon/serializer.py b/site/guides/storage-addon/osf.io/addon/serializer.py similarity index 100% rename from StorageAddon/osf.io/addon/serializer.py rename to site/guides/storage-addon/osf.io/addon/serializer.py diff --git a/StorageAddon/osf.io/addon/settings/__init__.py b/site/guides/storage-addon/osf.io/addon/settings/__init__.py similarity index 100% rename from StorageAddon/osf.io/addon/settings/__init__.py rename to site/guides/storage-addon/osf.io/addon/settings/__init__.py diff --git a/StorageAddon/osf.io/addon/settings/defaults.py b/site/guides/storage-addon/osf.io/addon/settings/defaults.py similarity index 100% rename from StorageAddon/osf.io/addon/settings/defaults.py rename to site/guides/storage-addon/osf.io/addon/settings/defaults.py diff --git a/StorageAddon/osf.io/addon/settings/local-dist.py b/site/guides/storage-addon/osf.io/addon/settings/local-dist.py similarity index 100% rename from StorageAddon/osf.io/addon/settings/local-dist.py rename to site/guides/storage-addon/osf.io/addon/settings/local-dist.py diff --git a/StorageAddon/osf.io/addon/static/comicon.png b/site/guides/storage-addon/osf.io/addon/static/comicon.png similarity index 100% rename from StorageAddon/osf.io/addon/static/comicon.png rename to site/guides/storage-addon/osf.io/addon/static/comicon.png diff --git a/StorageAddon/osf.io/addon/static/myminioAnonymousLogActionList.json b/site/guides/storage-addon/osf.io/addon/static/myminioAnonymousLogActionList.json similarity index 100% rename from StorageAddon/osf.io/addon/static/myminioAnonymousLogActionList.json rename to site/guides/storage-addon/osf.io/addon/static/myminioAnonymousLogActionList.json diff --git a/StorageAddon/osf.io/addon/static/myminioLogActionList.json b/site/guides/storage-addon/osf.io/addon/static/myminioLogActionList.json similarity index 100% rename from StorageAddon/osf.io/addon/static/myminioLogActionList.json rename to site/guides/storage-addon/osf.io/addon/static/myminioLogActionList.json diff --git a/StorageAddon/osf.io/addon/static/myminioNodeConfig.js b/site/guides/storage-addon/osf.io/addon/static/myminioNodeConfig.js similarity index 100% rename from StorageAddon/osf.io/addon/static/myminioNodeConfig.js rename to site/guides/storage-addon/osf.io/addon/static/myminioNodeConfig.js diff --git a/StorageAddon/osf.io/addon/static/myminioUserConfig.js b/site/guides/storage-addon/osf.io/addon/static/myminioUserConfig.js similarity index 100% rename from StorageAddon/osf.io/addon/static/myminioUserConfig.js rename to site/guides/storage-addon/osf.io/addon/static/myminioUserConfig.js diff --git a/StorageAddon/osf.io/addon/static/node-cfg.js b/site/guides/storage-addon/osf.io/addon/static/node-cfg.js similarity index 100% rename from StorageAddon/osf.io/addon/static/node-cfg.js rename to site/guides/storage-addon/osf.io/addon/static/node-cfg.js diff --git a/StorageAddon/osf.io/addon/static/user-cfg.js b/site/guides/storage-addon/osf.io/addon/static/user-cfg.js similarity index 100% rename from StorageAddon/osf.io/addon/static/user-cfg.js rename to site/guides/storage-addon/osf.io/addon/static/user-cfg.js diff --git a/StorageAddon/osf.io/addon/templates/credentials_modal.mako b/site/guides/storage-addon/osf.io/addon/templates/credentials_modal.mako similarity index 100% rename from StorageAddon/osf.io/addon/templates/credentials_modal.mako rename to site/guides/storage-addon/osf.io/addon/templates/credentials_modal.mako diff --git a/StorageAddon/osf.io/addon/templates/node_settings.mako b/site/guides/storage-addon/osf.io/addon/templates/node_settings.mako similarity index 100% rename from StorageAddon/osf.io/addon/templates/node_settings.mako rename to site/guides/storage-addon/osf.io/addon/templates/node_settings.mako diff --git a/StorageAddon/osf.io/addon/templates/user_settings.mako b/site/guides/storage-addon/osf.io/addon/templates/user_settings.mako similarity index 100% rename from StorageAddon/osf.io/addon/templates/user_settings.mako rename to site/guides/storage-addon/osf.io/addon/templates/user_settings.mako diff --git a/site/guides/storage-addon/osf.io/addon/tests/__init__.py b/site/guides/storage-addon/osf.io/addon/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/site/guides/storage-addon/osf.io/addon/tests/conftest.py b/site/guides/storage-addon/osf.io/addon/tests/conftest.py new file mode 100644 index 0000000..da9f243 --- /dev/null +++ b/site/guides/storage-addon/osf.io/addon/tests/conftest.py @@ -0,0 +1 @@ +from osf_tests.conftest import * # noqa diff --git a/StorageAddon/osf.io/addon/tests/factories.py b/site/guides/storage-addon/osf.io/addon/tests/factories.py similarity index 100% rename from StorageAddon/osf.io/addon/tests/factories.py rename to site/guides/storage-addon/osf.io/addon/tests/factories.py diff --git a/StorageAddon/osf.io/addon/tests/test_model.py b/site/guides/storage-addon/osf.io/addon/tests/test_model.py similarity index 100% rename from StorageAddon/osf.io/addon/tests/test_model.py rename to site/guides/storage-addon/osf.io/addon/tests/test_model.py diff --git a/StorageAddon/osf.io/addon/tests/test_serializer.py b/site/guides/storage-addon/osf.io/addon/tests/test_serializer.py similarity index 100% rename from StorageAddon/osf.io/addon/tests/test_serializer.py rename to site/guides/storage-addon/osf.io/addon/tests/test_serializer.py diff --git a/StorageAddon/osf.io/addon/tests/test_view.py b/site/guides/storage-addon/osf.io/addon/tests/test_view.py similarity index 100% rename from StorageAddon/osf.io/addon/tests/test_view.py rename to site/guides/storage-addon/osf.io/addon/tests/test_view.py diff --git a/StorageAddon/osf.io/addon/tests/utils.py b/site/guides/storage-addon/osf.io/addon/tests/utils.py similarity index 100% rename from StorageAddon/osf.io/addon/tests/utils.py rename to site/guides/storage-addon/osf.io/addon/tests/utils.py diff --git a/StorageAddon/osf.io/addon/utils.py b/site/guides/storage-addon/osf.io/addon/utils.py similarity index 100% rename from StorageAddon/osf.io/addon/utils.py rename to site/guides/storage-addon/osf.io/addon/utils.py diff --git a/StorageAddon/osf.io/addon/views.py b/site/guides/storage-addon/osf.io/addon/views.py similarity index 100% rename from StorageAddon/osf.io/addon/views.py rename to site/guides/storage-addon/osf.io/addon/views.py diff --git a/StorageAddon/osf.io/config/Dockerfile b/site/guides/storage-addon/osf.io/config/Dockerfile similarity index 100% rename from StorageAddon/osf.io/config/Dockerfile rename to site/guides/storage-addon/osf.io/config/Dockerfile diff --git a/StorageAddon/osf.io/config/addons.json b/site/guides/storage-addon/osf.io/config/addons.json similarity index 100% rename from StorageAddon/osf.io/config/addons.json rename to site/guides/storage-addon/osf.io/config/addons.json diff --git a/StorageAddon/osf.io/config/api/base/settings/defaults.py b/site/guides/storage-addon/osf.io/config/api/base/settings/defaults.py similarity index 100% rename from StorageAddon/osf.io/config/api/base/settings/defaults.py rename to site/guides/storage-addon/osf.io/config/api/base/settings/defaults.py diff --git a/StorageAddon/osf.io/config/framework/addons/data/addons.json b/site/guides/storage-addon/osf.io/config/framework/addons/data/addons.json similarity index 100% rename from StorageAddon/osf.io/config/framework/addons/data/addons.json rename to site/guides/storage-addon/osf.io/config/framework/addons/data/addons.json diff --git a/StorageAddon/osf.io/config/website/static/storageAddons.json b/site/guides/storage-addon/osf.io/config/website/static/storageAddons.json similarity index 100% rename from StorageAddon/osf.io/config/website/static/storageAddons.json rename to site/guides/storage-addon/osf.io/config/website/static/storageAddons.json diff --git a/StorageAddon/osf.io/config/website/translations/ja/LC_MESSAGES/js_messages.po b/site/guides/storage-addon/osf.io/config/website/translations/ja/LC_MESSAGES/js_messages.po similarity index 100% rename from StorageAddon/osf.io/config/website/translations/ja/LC_MESSAGES/js_messages.po rename to site/guides/storage-addon/osf.io/config/website/translations/ja/LC_MESSAGES/js_messages.po diff --git a/StorageAddon/waterbutler/config/setup.py b/site/guides/storage-addon/waterbutler/config/setup.py similarity index 100% rename from StorageAddon/waterbutler/config/setup.py rename to site/guides/storage-addon/waterbutler/config/setup.py diff --git a/StorageAddon/waterbutler/provider/__init__.py b/site/guides/storage-addon/waterbutler/provider/__init__.py similarity index 100% rename from StorageAddon/waterbutler/provider/__init__.py rename to site/guides/storage-addon/waterbutler/provider/__init__.py diff --git a/StorageAddon/waterbutler/provider/metadata.py b/site/guides/storage-addon/waterbutler/provider/metadata.py similarity index 100% rename from StorageAddon/waterbutler/provider/metadata.py rename to site/guides/storage-addon/waterbutler/provider/metadata.py diff --git a/StorageAddon/waterbutler/provider/provider.py b/site/guides/storage-addon/waterbutler/provider/provider.py similarity index 100% rename from StorageAddon/waterbutler/provider/provider.py rename to site/guides/storage-addon/waterbutler/provider/provider.py diff --git a/StorageAddon/waterbutler/provider/settings.py b/site/guides/storage-addon/waterbutler/provider/settings.py similarity index 100% rename from StorageAddon/waterbutler/provider/settings.py rename to site/guides/storage-addon/waterbutler/provider/settings.py diff --git a/site/guides/storage-addon/waterbutler/tests/__init__.py b/site/guides/storage-addon/waterbutler/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/StorageAddon/waterbutler/tests/test_provider.py b/site/guides/storage-addon/waterbutler/tests/test_provider.py similarity index 100% rename from StorageAddon/waterbutler/tests/test_provider.py rename to site/guides/storage-addon/waterbutler/tests/test_provider.py diff --git a/site/handoff/index.html b/site/handoff/index.html new file mode 100644 index 0000000..bf71a5e --- /dev/null +++ b/site/handoff/index.html @@ -0,0 +1,2884 @@ + + + + + + + + + + + + + + + + + + + + + + + Hand-off Records / 引継ぎ記録 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            Hand-off Records / 引継ぎ記録

                                                            +
                                                            +

                                                            Summary: Requests to other teams or agents: each record is a dated file named YYYY-MM-DD_.md. Hand-offs may request review, merge approval, or other actions from external teams. +<strong>概要:</strong> 他のチームやエージェントへの依頼:各記録は日付付きファイル、YYYY-MM-DD_<Title>.md の形式。引継ぎはレビュー、マージ承認、その他のアクションを外部チームに依頼することがあります。</p> +</blockquote> +<p><strong>Jump:</strong> <a href="#english">English</a> · <a href="#japanese">日本語</a></p> +<ul> +<li>Version / 版: 0.1 — 2026-11-05. <strong>Learned:</strong> without a hand-off record, it was unclear what was requested of Codex Astra; naming convention makes the request searchable and trackable. / 引継ぎ記録がなければ、Codex Astra に何を依頼したか分からず、命名規則で要求が検索可能で追跡可能になると分かった。</li> +<li>Normative for: Hand-off records naming convention, review record naming.</li> +<li>Related: <a href="../">../README.md</a> · <a href="../reviews/">reviews/</a> · <a href="../status/">status/</a></li> +</ul> +<hr /> +<p><a id="english"></a></p> +<h2 id="english">English<a class="headerlink" href="#english" title="Permanent link">¶</a></h2> +<p><a href="#japanese">→ 日本語版へ</a></p> +<h3 id="1-what-belongs-here">1. What belongs here<a class="headerlink" href="#1-what-belongs-here" title="Permanent link">¶</a></h3> +<p>A <em>hand-off</em> is a request to another team or agent. This folder contains:</p> +<table> +<thead> +<tr> +<th>Type</th> +<th>Naming convention</th> +<th>Description</th> +</tr> +</thead> +<tbody> +<tr> +<td>Hand-off</td> +<td><code>YYYY-MM-DD_<Title>.md</code></td> +<td>Request to external team (review, merge, deploy).</td> +</tr> +<tr> +<td>Review</td> +<td><code>YYYY-MM-DD_<Title>_rN.md</code></td> +<td>Review record written by REV (Codex Astra).</td> +</tr> +</tbody> +</table> +<h3 id="2-open-items-no-entries-yet--まだありません">2. Open items (no entries yet / まだありません)<a class="headerlink" href="#2-open-items-no-entries-yet--まだありません" title="Permanent link">¶</a></h3> +<table> +<thead> +<tr> +<th>Date</th> +<th>Title</th> +<th>Requested by</th> +<th>Status</th> +</tr> +</thead> +<tbody> +<tr> +<td>—</td> +<td>—</td> +<td>—</td> +<td>—</td> +</tr> +</tbody> +</table> +<h3 id="3-creating-a-new-hand-off-record">3. Creating a new hand-off record<a class="headerlink" href="#3-creating-a-new-hand-off-record" title="Permanent link">¶</a></h3> +<ol> +<li>Name the file <code>YYYY-MM-DD_<Title>.md</code>.</li> +<li>Describe: what is ready, who should review, what decision is needed.</li> +<li>Link to related PRs and documents.</li> +<li>Assign the hand-off to the appropriate team (REV, owner, deployment).</li> +</ol> +<hr /> +<p><a id="japanese"></a></p> +<h2 id="日本語">日本語<a class="headerlink" href="#日本語" title="Permanent link">¶</a></h2> +<p><a href="#english">→ To English</a></p> +<h3 id="1-ここに属するもの">1. ここに属するもの<a class="headerlink" href="#1-ここに属するもの" title="Permanent link">¶</a></h3> +<p>「引継ぎ」は他のチームやエージェントへの依頼です。このフォルダには次が含まれます:</p> +<table> +<thead> +<tr> +<th>種別</th> +<th>命名規則</th> +<th>説明</th> +</tr> +</thead> +<tbody> +<tr> +<td>引継ぎ</td> +<td><code>YYYY-MM-DD_<Title>.md</code></td> +<td>外部チームへの依頼(レビュー、マージ、配備)。</td> +</tr> +<tr> +<td>レビュー</td> +<td><code>YYYY-MM-DD_<Title>_rN.md</code></td> +<td>REV(Codex Astra)が書くレビュー記録。</td> +</tr> +</tbody> +</table> +<h3 id="2-未解決項目まだありません--no-entries-yet">2. 未解決項目(まだありません / no entries yet)<a class="headerlink" href="#2-未解決項目まだありません--no-entries-yet" title="Permanent link">¶</a></h3> +<table> +<thead> +<tr> +<th>日付</th> +<th>タイトル</th> +<th>依頼者</th> +<th>ステータス</th> +</tr> +</thead> +<tbody> +<tr> +<td>—</td> +<td>—</td> +<td>—</td> +<td>—</td> +</tr> +</tbody> +</table> +<h3 id="3-新しい引継ぎ記録をつくるには">3. 新しい引継ぎ記録をつくるには<a class="headerlink" href="#3-新しい引継ぎ記録をつくるには" title="Permanent link">¶</a></h3> +<ol> +<li>ファイル名を <code>YYYY-MM-DD_<Title>.md</code> にする。</li> +<li>記述:いつ準備ができているか、誰がレビューすべきか、どのような決断が必要か。</li> +<li>関連する PR と文書へリンクする。</li> +<li>引継ぎを適切なチーム(REV、所有者、配備)に割り当てる。</li> +</ol> +<hr /> +<h2 id="glossary--用語">Glossary / 用語<a class="headerlink" href="#glossary--用語" title="Permanent link">¶</a></h2> +<table> +<thead> +<tr> +<th>Term</th> +<th>English note</th> +<th>日本語注</th> +</tr> +</thead> +<tbody> +<tr> +<td>Hand-off</td> +<td>A request to another team or agent.</td> +<td>他のチームやエージェントへの依頼。</td> +</tr> +<tr> +<td>Record</td> +<td>A document that captures an event or request.</td> +<td>イベントや要求を記録する文書。</td> +</tr> +<tr> +<td>Review</td> +<td>An independent assessment of a pull request.</td> +<td>プルリクエストの独立した評価。</td> +</tr> +<tr> +<td>Merge approval</td> +<td>Permission from the owner to merge a PR.</td> +<td>PR をマージするための所有者の承認。</td> +</tr> +<tr> +<td>Deploy</td> +<td>Release a version to production.</td> +<td>本番環境へのバージョンリリース。</td> +</tr> +</tbody> +</table> + + + + + + + + + + + + + + </article> + </div> + + +<script>var target=document.getElementById(location.hash.slice(1));target&&target.name&&(target.checked=target.name.startsWith("__tabbed_"))</script> + </div> + + </main> + + <footer class="md-footer"> + + <div class="md-footer-meta md-typeset"> + <div class="md-footer-meta__inner md-grid"> + <div class="md-copyright"> + + + Made with + <a href="https://squidfunk.github.io/mkdocs-material/" target="_blank" rel="noopener"> + Material for MkDocs + </a> + +</div> + + </div> + </div> +</footer> + + </div> + <div class="md-dialog" data-md-component="dialog"> + <div class="md-dialog__inner md-typeset"></div> + </div> + + + <script id="__config" type="application/json">{"base": "..", "features": ["navigation.tabs", "navigation.sections", "toc.scrollspy", "content.code.copy"], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}}</script> + + + <script src="../assets/javascripts/bundle.d6f25eb3.min.js"></script> + + <script src="../assets/mermaid.min.js"></script> + + <script src="../assets/mermaid-init.js"></script> + + + </body> +</html> \ No newline at end of file diff --git a/site/index.html b/site/index.html new file mode 100644 index 0000000..36362db --- /dev/null +++ b/site/index.html @@ -0,0 +1,2920 @@ + +<!doctype html> +<html lang="en" class="no-js"> + <head> + + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width,initial-scale=1"> + + + + + + <link rel="next" href="assets/"> + + + <link rel="icon" href="assets/images/favicon.png"> + <meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.37"> + + + + <title>GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

                                                            +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            + + + + + + + +

                                                            Documentation Index / 文書索引

                                                            +
                                                            +

                                                            Summary: The index of all documents in this repository: policies (our position), specifications (rules to implement), decisions (why we chose), demos (records of what was actually done), status (milestone progress), hand-offs (requests to other teams), reviews (review records), and reference (external facts). A Mermaid diagram shows how a change flows through the process. +概要: このリポジトリのすべての文書の索引。方針(私たちの立場)、仕様(実装するルール)、決定(なぜ選んだか)、実証(実際にやったことの記録)、進捗(節目の進行状況)、引継ぎ(他のチームへの依頼)、レビュー(レビュー記録)、参考(外部事実)。Mermaid 図は、変更がプロセスを通る流れを示します。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: without a single index page, it was unclear which folder to check for the latest milestone status or review records; putting everything in one place makes the documentation tree navigable. / 単一の索引ページが無ければ、最新の節目進捗やレビュー記録をどのフォルダで探すべきか分からず、文書ツリーのナビゲートが不可能になると分かった。
                                                            • +
                                                            • Normative for: every document under docs/, especially README.md files.
                                                            • +
                                                            • Related: ../README.md · site/index.html
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            1. Document folders

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            FolderDescription
                                                            policy/Our position on what we will and will not do. Each document states our stance on a topic.
                                                            spec/Rules to implement: specifications, acceptance tests, security gate, installer CLI.
                                                            decisions/Decision records: why we chose one way and not another.
                                                            demo/Records of what was actually done: acceptance runs, integration test results.
                                                            status/Milestone progress: M1–M5 status, open items, upstream tracking reports.
                                                            handoff/Requests to other teams: dated files, named YYYY-MM-DD_.md.</td> +</tr> +<tr> +<td><a href="reviews/">reviews/</a></td> +<td>Review records: dated files, named YYYY-MM-DD_<Title>_rN.md.</td> +</tr> +<tr> +<td><a href="reference/">reference/</a></td> +<td>External facts: glossary, tool versions, upstream metadata.</td> +</tr> +</tbody> +</table> +<h3 id="2-how-a-change-flows">2. How a change flows<a class="headerlink" href="#2-how-a-change-flows" title="Permanent link">¶</a></h3> +<pre class="mermaid"><code>flowchart TD + A[Demo / Acceptance run] --> B{Pass?} + B -- yes --> C[Policy: position on the change] + B -- no --> D[Policy: rejection reason] + C --> E[Spec / ADR: rules to implement the change] + D --> E + E --> F[Code: implement the spec / decision] + F --> G[Demos: acceptance run with new behavior] + G --> H[Status: update milestone progress] + H --> I[Hand-off: request review / merge if ready] + I --> J[Reviews: independent assessment recorded] + J --> K{Decision} + K -- accept --> L[Merge to develop] + K -- reject --> M[Return for fix]</code></pre> +<h3 id="3-links">3. Links<a class="headerlink" href="#3-links" title="Permanent link">¶</a></h3> +<ul> +<li><a href="../README.md">../README.md</a> — Root index of the whole repository.</li> +<li><a href="../site/index.html">site/index.html</a> — HTML site built by MkDocs.</li> +</ul> +<hr /> +<p><a id="japanese"></a></p> +<h2 id="日本語">日本語<a class="headerlink" href="#日本語" title="Permanent link">¶</a></h2> +<p><a href="#english">→ To English</a></p> +<h3 id="1-文書フォルダ">1. 文書フォルダ<a class="headerlink" href="#1-文書フォルダ" title="Permanent link">¶</a></h3> +<table> +<thead> +<tr> +<th>フォルダ</th> +<th>説明</th> +</tr> +</thead> +<tbody> +<tr> +<td><a href="policy/">policy/</a></td> +<td>我々が何をし、何をしないかの立場。各文書はトピックに関する私たちの姿勢を述べます。</td> +</tr> +<tr> +<td><a href="spec/">spec/</a></td> +<td>実装するルール:仕様、受入試験、セキュリティの門、インストーラー CLI。</td> +</tr> +<tr> +<td><a href="decisions/">decisions/</a></td> +<td>決定の記録:なぜその道を選び、ほかを選ばなかったか。</td> +</tr> +<tr> +<td><a href="demo/">demo/</a></td> +<td>実際にやったことの記録:受入試験、統合試験結果。</td> +</tr> +<tr> +<td><a href="status/">status/</a></td> +<td>節目の進行状況:M1〜M5 の進捗、未解決項目、上流追従報告。</td> +</tr> +<tr> +<td><a href="handoff/">handoff/</a></td> +<td>他のチームへの依頼:日付付きファイル、YYYY-MM-DD_<Title>.md の形式。</td> +</tr> +<tr> +<td><a href="reviews/">reviews/</a></td> +<td>レビュー記録:日付付きファイル、YYYY-MM-DD_<Title>_rN の形式。</td> +</tr> +<tr> +<td><a href="reference/">reference/</a></td> +<td>外部事実:用語集、道具の版、上流メタデータ。</td> +</tr> +</tbody> +</table> +<h3 id="2-変更が流れる流れ">2. 変更が流れる流れ<a class="headerlink" href="#2-変更が流れる流れ" title="Permanent link">¶</a></h3> +<pre class="mermaid"><code>flowchart TD + A[実証/受入試験] --> B{合格?} + B -- はい --> C[方針:変更に関する立場] + B -- いいえ --> D[方針:拒否理由] + C --> E[仕様/ADR:変更を実装するルール] + D --> E + E --> F[コード:spec/ADR を実装] + F --> G[実証:新しい動作での受入試験] + G --> H[進捗:節目の進行状況を更新] + H --> I[引継ぎ:レビュー/マージの依頼] + I --> J[レビュー:独立した評価を記録] + J --> K{決定} + K -- 承認 --> L[develop へマージ] + K -- 拒否 --> M[修正のために戻す]</code></pre> +<h3 id="3-リンク">3. リンク<a class="headerlink" href="#3-リンク" title="Permanent link">¶</a></h3> +<ul> +<li><a href="../README.md">../README.md</a> — リポジトリ全体のルート索引。</li> +<li><a href="../site/index.html">site/index.html</a> — MkDocs が生成する HTML サイト。</li> +</ul> +<hr /> +<h2 id="glossary--用語">Glossary / 用語<a class="headerlink" href="#glossary--用語" title="Permanent link">¶</a></h2> +<table> +<thead> +<tr> +<th>Term</th> +<th>English note</th> +<th>日本語注</th> +</tr> +</thead> +<tbody> +<tr> +<td>Policy</td> +<td>A statement of our position on what we will and will not do.</td> +<td>我々が何をし、何をしないかの立場。</td> +</tr> +<tr> +<td>Specification</td> +<td>A rule book that implementers must follow.</td> +<td>実装する人が守るルールブック。</td> +</tr> +<tr> +<td>Decision record (ADR)</td> +<td>A note explaining why we chose one way and not another.</td> +<td>なぜその道を選び、ほかを選ばなかったかのメモ。</td> +</tr> +<tr> +<td>Demo</td> +<td>Records of what was actually done, including acceptance runs.</td> +<td>実際にやったことの記録、受入試験を含む。</td> +</tr> +<tr> +<td>Milestone</td> +<td>A checkpoint with a pass/fail test.</td> +<td>合否の試験がある関門。</td> +</tr> +<tr> +<td>Hand-off</td> +<td>A request to another team or agent.</td> +<td>他のチーム・エージェントへの依頼。</td> +</tr> +<tr> +<td>Review</td> +<td>An independent assessment of a pull request.</td> +<td>プルリクエストの独立した評価。</td> +</tr> +<tr> +<td>Reference</td> +<td>External facts such as glossaries, tool versions.</td> +<td>用語集や道具の版などの外部事実。</td> +</tr> +</tbody> +</table> + + + + + + + + + + + + + + </article> + </div> + + +<script>var target=document.getElementById(location.hash.slice(1));target&&target.name&&(target.checked=target.name.startsWith("__tabbed_"))</script> + </div> + + </main> + + <footer class="md-footer"> + + <div class="md-footer-meta md-typeset"> + <div class="md-footer-meta__inner md-grid"> + <div class="md-copyright"> + + + Made with + <a href="https://squidfunk.github.io/mkdocs-material/" target="_blank" rel="noopener"> + Material for MkDocs + </a> + +</div> + + </div> + </div> +</footer> + + </div> + <div class="md-dialog" data-md-component="dialog"> + <div class="md-dialog__inner md-typeset"></div> + </div> + + + <script id="__config" type="application/json">{"base": ".", "features": ["navigation.tabs", "navigation.sections", "toc.scrollspy", "content.code.copy"], "search": "assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}}</script> + + + <script src="assets/javascripts/bundle.d6f25eb3.min.js"></script> + + <script src="assets/mermaid.min.js"></script> + + <script src="assets/mermaid-init.js"></script> + + + </body> +</html> \ No newline at end of file diff --git a/site/policy/POL-01_Developer_Environment_2027_Position/index.html b/site/policy/POL-01_Developer_Environment_2027_Position/index.html new file mode 100644 index 0000000..b035c62 --- /dev/null +++ b/site/policy/POL-01_Developer_Environment_2027_Position/index.html @@ -0,0 +1,3017 @@ + +<!doctype html> +<html lang="en" class="no-js"> + <head> + + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width,initial-scale=1"> + + + + + <link rel="prev" href="../"> + + + <link rel="next" href="../../reference/"> + + + <link rel="icon" href="../../assets/images/favicon.png"> + <meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.37"> + + + + <title>POL-01 Position on the Developer Environment 2027 / 開発環境 2027 版の位置づけ - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            POL-01 Position on the Developer Environment 2027 / 開発環境 2027 版の位置づけ

                                                            +
                                                            +

                                                            Summary: Our stance on why and how we build the GakuNin RDM developer environment 2027: one-shot, multi-architecture, security-first, kept alive by AI agents with humans deciding merge and publication, documented in public while integration code stays private. +概要: GakuNin RDM の開発環境 2027 版を、なぜ・どのように作るかの立場。一発導入、複数アーキテクチャ、安全第一、AI エージェントが保ち、マージと公開は人が決める。文書は公開し、統合コードは非公開に置く。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            + +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            1. Why this policy exists

                                                            +

                                                            GakuNin RDM is the research data management service of NII, built on OSF (the Open Science Framework, a web service for sharing research projects, made by COS, the Center for Open Science in the United States). Our copies of the OSF code live in GitHub repositories (a repository is a folder whose every change is remembered, so you can always go back) owned by the RCOSDP organization. There are six public core repositories, six -private security-verified versions of them, and five private subsystems. Today nobody can install all of them together in one step, and the base images they run on reached EOL (end of life: the makers no longer fix bugs or security holes in them).

                                                            +

                                                            A policy is the position we take. This one says what the "developer environment 2027" is for, what we will and will not do, and where every piece lives. Rules for implementers are in the specifications; the reasons behind individual choices are in the decision records.

                                                            +

                                                            2. Our stance

                                                            +
                                                              +
                                                            1. Goal. One command installs a developer environment that combines the public core develop branches, the -private security versions, and the subsystems, on macOS (Apple Silicon), Ubuntu 24.04 (amd64 and arm64) and Windows 11 with WSL2. It can be handed to partners abroad. AI agents (programs that read, write and test code on their own, under rules we set) keep it secure, so GakuNin RDM continues even if COS stops maintaining OSF.
                                                            2. +
                                                            3. Modernize rather than tolerate. When an old library or base image carries known vulnerabilities (weak spots an attacker could use), we move to a current version, even when that takes longer. We do not ship a known hole because fixing it is work.
                                                            4. +
                                                            5. Remove vulnerabilities until top-tier AI attackers fail. The bar is not "no scanner warnings" but "an approved AI red team (a team whose job is to attack our own system, in an isolated network, to find holes before real attackers do) finds no unresolved way in". We reach that bar in stages through a security gate (a checkpoint the build must pass before anyone may use it), defined in SPEC-03 and ADR-03: report-only at first, stop on HIGH at M4, zero CRITICAL/HIGH plus red-team pass at M5.
                                                            6. +
                                                            7. Humans decide; AI does the work. AI detects, fixes, reviews and tests. A human decides to merge (accept a change into the shared branch), to publish, and to grant exceptions. No AI merges its own work, and no author accepts their own change. Details in ADR-04.
                                                            8. +
                                                            9. This repository is public and holds no code from private sources. It contains documentation, the manifest (a list naming each upstream repository and the exact SHA, the fingerprint of one commit, that we build from) and the installer (the program that sets everything up). Integration code lives in private repositories named RDM-<name>-dev2027. We name them in text but never link to them by URL. Secret scanning in CI (continuous integration: automatic checks that run on every change) is mandatory.
                                                            10. +
                                                            11. Documents are bilingual and newcomer-readable. English first, Japanese second, on the same page, with glossary notes on every technical term the first time it appears. Rules in SPEC-06; shared terms in REF-01.
                                                            12. +
                                                            13. Relationship to upstream policies. This repository is GRDM-specific. The cross-cutting canon — the charter, folder rules (POL-02), human/AI responsibilities (POL-05), pull request rules (SPEC-10) and installer form (SPEC-11) — stays in RDM-grdm-core-test and niirdcplus. We link to it and never copy it, so there is only one place to fix a rule.
                                                            14. +
                                                            15. Role model and write boundary. Roles use the three-letter codes of the owning team: AID (AI developer: Orca Open Code 2 workers on a local LLM), QAE (QA engineer: Claude Code Fable), REV (reviewer: Codex Astra), and the owner for policy, acceptance, merge and publication. The agents working on this plan may write only to this repository and to newly created RDM-<name>-dev2027 repositories. They never write to existing upstream repositories, never delete a repository or branch, and never force-push (overwrite shared history).
                                                            16. +
                                                            +

                                                            3. Where things live

                                                            +
                                                            flowchart LR
                                                            +  subgraph PUBLIC["Public (RCOSDP)"]
                                                            +    DG["RDM-developer-guide<br/>docs/ · manifest/ · installer/<br/>names + SHAs only"]
                                                            +    CORE["6 public cores<br/>RDM-osf.io, RDM-waterbutler, RDM-modular-file-renderer,<br/>RDM-ember-osf-web, RDM-cas-overlay, RDM-wiki-frontend"]
                                                            +    CANON["Cross-cutting canon<br/>RDM-grdm-core-test · niirdcplus<br/>(POL-02, POL-05, SPEC-10, SPEC-11)"]
                                                            +  end
                                                            +  subgraph PRIVATE["Private (RCOSDP)"]
                                                            +    PRIV["6 -private security versions<br/>+ 5 private subsystems"]
                                                            +    DEV["RDM-&lt;name&gt;-dev2027 × 11<br/>develop = integration<br/>upstream/* tracking branches"]
                                                            +  end
                                                            +  COS["CenterForOpenScience/*<br/>(reference tracking only)"]
                                                            +  CORE -->|"upstream/public-<branch>"| DEV
                                                            +  PRIV -->|"upstream/private-<branch>"| DEV
                                                            +  COS -->|"upstream/cos-develop"| DEV
                                                            +  DEV -->|"SHA recorded in manifest"| DG
                                                            +  CANON -.->|"linked, never copied"| DG
                                                            +  DG -->|"installer builds from SHAs"| LOCAL["Developer machine<br/>127.0.0.1 only, non-root"]
                                                            +

                                                            Read the picture from left to right: upstream code flows into the private integration repositories; only names and SHAs flow into this public repository; the installer on a developer machine builds from those SHAs.

                                                            +

                                                            4. Milestone ladder

                                                            +

                                                            The canonical plan is kept by the owner; the excerpt is in TOON (a compact text form of JSON that people and AI both read easily).

                                                            +
                                                            milestones[5]{id,goal,gate,proof}:
                                                            +  M1,"docs skeleton, manifest, 11 dev2027 integration repos","report-only scan, allow-list recorded","Codex-reviewed PR merged to develop"
                                                            +  M2,"6 cores install in one shot on Mac Studio (arm64); amd64 build passes","report-only, allow-list count recorded","Playwright acceptance: login, project, file up/down, wiki co-edit, preview, institution admin; success + rejection"
                                                            +  M3,"5 subsystems start (y-websocket, OASys, Shibboleth-SP + test IdP, rdmcp, aipf_mcp_data_grdm)","allow-list smaller than M2","one success + one rejection case per subsystem"
                                                            +  M4,"waterbutler, mfr, osf.io on Python 3.13","install stops on HIGH or above; first AI red team","regression of M2/M3 acceptance passes"
                                                            +  M5,"ES2 and mongo 3.4 retired; ES8 and PostgreSQL 15+","zero CRITICAL/HIGH; AI red team finds no unresolved path","distributable abroad; licenses settled"
                                                            +steady_state:
                                                            +  daily: "upstream mirror, diff report, CVE scan"
                                                            +  weekly: "AI integration PR → Codex review → regression and acceptance"
                                                            +  human_only: "merge, publish, exceptions"
                                                            +

                                                            Deadlines are set by the owner when each milestone starts.

                                                            +

                                                            5. What we will not do

                                                            +
                                                              +
                                                            • We will not keep the loopback alias 192.168.168.167 that needed sudo (administrator rights) and exposed services to the local network. See ADR-02.
                                                            • +
                                                            • We will not place private code, secrets, or private repository URLs in this repository.
                                                            • +
                                                            • We will not let an AI merge or publish, nor let an author accept their own change.
                                                            • +
                                                            • We will not copy the upstream charter or policies here; we link.
                                                            • +
                                                            • We will not push images built from -private code to a public registry.
                                                            • +
                                                            +

                                                            6. How this policy is used

                                                            +

                                                            Specifications (SPEC-00 to SPEC-06) implement this stance. Decision records (ADR-01 to ADR-04) explain the individual choices. When a specification and this policy disagree, fix both in one commit and record what was learned in the version line.

                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            1. なぜこの方針があるのか

                                                            +

                                                            GakuNin RDM は NII の研究データ管理サービスで、OSF(Open Science Framework。研究プロジェクトを共有する Web サービス。米国の COS = Center for Open Science が作った)を土台にしています。OSF のコードの私たちの写しは、RCOSDP という GitHub の組織が持つ「リポジトリ」(変更を全部覚えているフォルダ。いつでも前に戻せる)にあります。公開コアが 6 本、それに対応する -private のセキュリティ検証版が 6 本、非公開のサブシステムが 5 本です。いま、これら全部を一度に導入する手段はありません。しかも動かしている土台のイメージは全部 EOL(end of life。作った人がバグや穴を直してくれなくなった状態)です。

                                                            +

                                                            「方針」は私たちの立場を書いたものです。この方針は、「開発環境 2027 版」が何のためにあり、何をし、何をせず、それぞれの部品がどこに置かれるかを述べます。実装する人が守る規則は仕様に、個々の選択の理由は決定の記録にあります。

                                                            +

                                                            2. 私たちの立場

                                                            +
                                                              +
                                                            1. ゴール。 一つのコマンドで、公開コアの develop、-private のセキュリティ版、サブシステムを重ねた開発環境が、macOS(Apple Silicon)、Ubuntu 24.04(amd64 と arm64)、Windows 11 の WSL2 に入ります。海外の協力者にも渡せます。AI エージェント(私たちの決めた規則のもとで、自分でコードを読み・書き・試すプログラム)が安全に保ち、COS が OSF の保守をやめても GakuNin RDM を続けられます。
                                                            2. +
                                                            3. 我慢せず最新化する。 古いライブラリや土台のイメージに既知の「脆弱性」(攻撃者が使える弱い場所)があれば、時間がかかっても現行版へ移ります。直すのが大変だからといって、既知の穴を残して出荷しません。
                                                            4. +
                                                            5. 最上位の AI 攻撃者が失敗するまで脆弱性を除く。 基準は「スキャナの警告がない」ではなく、「承認された AI レッドチーム(本物の攻撃者より先に穴を見つけるために、隔離したネットワークの中で自分たちのシステムを攻める係)が、未解決の侵入経路を見つけない」です。そこへは「セキュリティ門」(通らないと使えない検問所)を段階的に厳しくして到達します。SPEC-03 と ADR-03 に定義し、最初は報告のみ、M4 で HIGH 停止、M5 で CRITICAL/HIGH ゼロとレッドチーム合格を必須にします。
                                                            6. +
                                                            7. 人が決め、AI が働く。 AI は検出・修正・レビュー・試験を行います。「マージ」(変更を共有ブランチへ受け入れること)、公開、例外の付与は人が決めます。AI は自分の成果をマージせず、作者は自分の変更を受け入れません。詳細は ADR-04。
                                                            8. +
                                                            9. このリポジトリは公開で、非公開由来のコードを持たない。 置くのは文書、「manifest」(取り込む上流リポジトリの名前と、どのコミットから作るかを示す「SHA」= コミット一つの指紋、を並べた一覧)、「インストーラー」(全部を組み立てるプログラム)だけです。統合コードは RDM-<name>-dev2027 という非公開リポジトリに置きます。文中では名前だけを書き、URL は書きません。CI(continuous integration。変更ごとに自動で走る検査)での秘密スキャンを必須にします。
                                                            10. +
                                                            11. 文書は二言語で、新入社員が読める。 同じページに英語を先、日本語を後に置き、専門用語には初出で用語注を付けます。規則は SPEC-06、共通の用語は REF-01。
                                                            12. +
                                                            13. 上流方針との関係。 このリポジトリは GRDM 固有です。横断の正本 — 憲章、置き場の規則(POL-02)、人と AI の責任(POL-05)、PR の規則(SPEC-10)、インストーラーの型(SPEC-11)— は RDM-grdm-core-test と niirdcplus にあります。リンクで指し、写しません。規則を直す場所を一つにするためです。
                                                            14. +
                                                            15. 役割モデルと書込の境界。 役割は所属チームの 3 文字略称で表します。AID(AI開発担当者。ローカル LLM で動く Orca の Open Code 2 ワーカー)、QAE(QA担当。Claude Code Fable)、REV(担当レビュワ。Codex Astra)、そして方針・受入・マージ・公開を担う所有者です。この計画で働くエージェントが書き込めるのは、このリポジトリと、新設の RDM-<name>-dev2027 だけです。既存の上流リポジトリには書かず、リポジトリやブランチを削除せず、「force push」(共有の履歴の上書き)をしません。
                                                            16. +
                                                            +

                                                            3. 物の置き場

                                                            +
                                                            flowchart LR
                                                            +  subgraph PUBLIC["公開(RCOSDP)"]
                                                            +    DG["RDM-developer-guide<br/>docs/ · manifest/ · installer/<br/>名前と SHA のみ"]
                                                            +    CORE["公開コア 6 本<br/>RDM-osf.io, RDM-waterbutler, RDM-modular-file-renderer,<br/>RDM-ember-osf-web, RDM-cas-overlay, RDM-wiki-frontend"]
                                                            +    CANON["横断の正本<br/>RDM-grdm-core-test · niirdcplus<br/>(POL-02, POL-05, SPEC-10, SPEC-11)"]
                                                            +  end
                                                            +  subgraph PRIVATE["非公開(RCOSDP)"]
                                                            +    PRIV["-private セキュリティ版 6 本<br/>+ 非公開サブシステム 5 本"]
                                                            +    DEV["RDM-&lt;name&gt;-dev2027 × 11<br/>develop = 統合<br/>upstream/* 追跡ブランチ"]
                                                            +  end
                                                            +  COS["CenterForOpenScience/*<br/>(参照追跡のみ)"]
                                                            +  CORE -->|"upstream/public-<branch>"| DEV
                                                            +  PRIV -->|"upstream/private-<branch>"| DEV
                                                            +  COS -->|"upstream/cos-develop"| DEV
                                                            +  DEV -->|"SHA を manifest に記録"| DG
                                                            +  CANON -.->|"リンクのみ、写さない"| DG
                                                            +  DG -->|"インストーラーが SHA から組み立て"| LOCAL["開発者の計算機<br/>127.0.0.1 のみ、非 root"]
                                                            +

                                                            左から右へ読みます。上流のコードは非公開の統合リポジトリへ流れ、公開のこのリポジトリへは名前と SHA だけが流れ、開発者の計算機のインストーラーがその SHA から組み立てます。

                                                            +

                                                            4. 節目のはしご

                                                            +

                                                            計画の正本は所有者が持ちます。抄録は TOON(JSON を短い字下げ付きの文字で表した形。人も AI も読みやすい)で示します。

                                                            +
                                                            milestones[5]{id,goal,gate,proof}:
                                                            +  M1,"docs 骨格・manifest・dev2027 統合リポジトリ 11 本","報告のみ、許容リストを記録","Codex レビュー済み PR が develop にマージ"
                                                            +  M2,"コア 6 本が Mac Studio(arm64)で一発導入、amd64 はビルド確認","報告のみ、許容リスト件数を記録","Playwright 受入: ログイン・プロジェクト・ファイル上下載・Wiki 共同編集・プレビュー・機関管理。成功+拒否"
                                                            +  M3,"サブシステム 5 本が起動(y-websocket, OASys, Shibboleth-SP+テスト IdP, rdmcp, aipf_mcp_data_grdm)","許容リストが M2 より少ない","各 1 本の正常系+拒否ケース"
                                                            +  M4,"waterbutler・mfr・osf.io を Python 3.13 へ","HIGH 以上で導入停止、AI レッドチーム初回","M2/M3 受入の回帰が合格"
                                                            +  M5,"ES2・mongo 3.4 を廃止、ES8・PostgreSQL 15 以降","CRITICAL/HIGH ゼロ、AI レッドチームが未解決経路ゼロ","海外配布可、ライセンス整理済み"
                                                            +steady_state:
                                                            +  daily: "上流ミラー、差分報告、CVE スキャン"
                                                            +  weekly: "AI 統合 PR → Codex レビュー → 回帰・受入"
                                                            +  human_only: "マージ、公開、例外"
                                                            +

                                                            各節目の期限は、着手時に所有者が決めます。

                                                            +

                                                            5. しないこと

                                                            +
                                                              +
                                                            • sudo(管理者権限)が要り、サービスを LAN に露出させていたループバックの別名 192.168.168.167 は使いません。ADR-02 を参照。
                                                            • +
                                                            • このリポジトリに非公開のコード、秘密、非公開リポジトリの URL を置きません。
                                                            • +
                                                            • AI にマージや公開をさせません。作者に自分の変更を受け入れさせません。
                                                            • +
                                                            • 上流の憲章や方針をここに写しません。リンクします。
                                                            • +
                                                            • -private 由来のコードから作ったイメージを公開レジストリに出しません。
                                                            • +
                                                            +

                                                            6. この方針の使い方

                                                            +

                                                            仕様(SPEC-00〜SPEC-06)がこの立場を実装します。決定の記録(ADR-01〜ADR-04)が個々の選択の理由を説明します。仕様とこの方針が食い違ったら、同じコミットで両方を直し、版の行に分かったことを書きます。

                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            RepositoryA folder that remembers every change, so you can always go back.変更を全部覚えているフォルダ。いつでも前に戻せる。
                                                            SHAThe fingerprint of one saved change (commit); no two are alike.保存した変更(コミット)一つの指紋。同じものは二つない。
                                                            ManifestThe list of which repositories, at which SHA, we build from.どのリポジトリのどの SHA から組み立てるかの一覧。
                                                            EOLEnd of life: the makers no longer fix it.作った人が直してくれなくなった状態。
                                                            Security gateA checkpoint the build must pass before anyone may use it.通らないと使えない検問所。
                                                            AI red teamA team that attacks our own system, in isolation, to find holes first.隔離した中で自分のシステムを攻めて、穴を先に見つける係。
                                                            Force pushOverwriting shared history on GitHub; forbidden here.GitHub 上の共有の履歴を上書きすること。ここでは禁止。
                                                            +

                                                            Full shared glossary: REF-01 Glossary.

                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/policy/index.html b/site/policy/index.html new file mode 100644 index 0000000..1363fcd --- /dev/null +++ b/site/policy/index.html @@ -0,0 +1,2898 @@ + + + + + + + + + + + + + + + + + + + + + + + Policy / 方針 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            Policy / 方針

                                                            +
                                                            +

                                                            Summary: Documents stating our position on what we will and will not do: developer environment goals, security stance, human/AI responsibilities. Each document states our position on a topic; specifications implement the stance. +概要: 我々が何をし、何をしないかの立場を述べる文書:開発環境のゴール、セキュリティの姿勢、人と AI の責任。各文書はトピックに関する私たちの立場を述べ、仕様がその立場を実装します。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: writing the stance down first showed that "public documentation, private code" is not a detail but the rule every other document depends on. / 立場を先に書いてみると、「文書は公開、コードは非公開」が細部ではなく他の全文書の前提だと分かった。
                                                            • +
                                                            • Normative for: POL-01 Position and future policy documents.
                                                            • +
                                                            • Related: ../README.md · ../spec/ · decisions/ · reference/REF-01_Glossary.md
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            1. What belongs here

                                                            +

                                                            A policy is the position we take. This folder contains:

                                                            + + + + + + + + + + + + + +
                                                            FilePurpose
                                                            POL-01_Developer_Environment_2027_Position.mdOur stance on why and how we build the developer environment 2027.
                                                            +

                                                            Future policies may include:

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TopicDescription
                                                            POL-02Folder and file naming rules
                                                            POL-03Pull request rules
                                                            POL-04Release process
                                                            POL-05Human/AI responsibilities
                                                            +

                                                            2. How policies relate to other documents

                                                            +
                                                            flowchart TD
                                                            +    P[Policy: position on a topic] --> S[Spec: rules to implement]
                                                            +    P --> A[Decision record: why we chose this]
                                                            +    S --> C[Code: implement the rule]
                                                            +    A --> C
                                                            +

                                                            3. Creating a new policy

                                                            +
                                                              +
                                                            1. Name the file POL-NN_<Title>.md (two-digit number).
                                                            2. +
                                                            3. Follow SPEC-06 documentation conventions.
                                                            4. +
                                                            5. Link to other documents that depend on this policy.
                                                            6. +
                                                            7. The owner approves; AID writes the implementation spec.
                                                            8. +
                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            1. ここに属するもの

                                                            +

                                                            「方針」は私たちの立場を書いたものです。このフォルダには次が含まれます:

                                                            + + + + + + + + + + + + + +
                                                            ファイル目的
                                                            POL-01_Developer_Environment_2027_Position.md開発環境 2027 版を、なぜ・どのように作るかの立場。
                                                            +

                                                            今後の方針として以下が考えられます:

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            トピック説明
                                                            POL-02フォルダとファイル命名規則
                                                            POL-03プルリクエスト規則
                                                            POL-04リリースプロセス
                                                            POL-05人と AI の責任
                                                            +

                                                            2. 方針が他の文書とどう関係するか

                                                            +
                                                            flowchart TD
                                                            +    P[方針:トピックに関する立場] --> S[仕様:実装するルール]
                                                            +    P --> A[決定の記録:なぜこの道を選んだか]
                                                            +    S --> C[コード:ルールを実装]
                                                            +    A --> C
                                                            +

                                                            3. 新しい方針を作るには

                                                            +
                                                              +
                                                            1. ファイル名を POL-NN_<題>.md(2 桁の番号)にする。
                                                            2. +
                                                            3. SPEC-06 文書規約に従う。
                                                            4. +
                                                            5. この方針に依存する他の文書へリンクする。
                                                            6. +
                                                            7. 所有者が承認;AID が実装仕様を書く。
                                                            8. +
                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            PolicyA statement of our position on what we will and will not do.我々が何をし、何をしないかの立場。
                                                            SpecA rule book that implementers must follow.実装する人が守るルールブック。
                                                            Decision record (ADR)A note explaining why we chose one way and not another.なぜその道を選び、ほかを選ばなかったかのメモ。
                                                            ImplementationWriting code that follows the spec.仕様に従ってコードを書くこと。
                                                            OwnerThe human who approves policies.方針を承認する人。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/reference/REF-01_Glossary/index.html b/site/reference/REF-01_Glossary/index.html new file mode 100644 index 0000000..262e0cd --- /dev/null +++ b/site/reference/REF-01_Glossary/index.html @@ -0,0 +1,4101 @@ + + + + + + + + + + + + + + + + + + + + + + + REF-01 Glossary / 用語集 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            REF-01 Glossary / 用語集

                                                            +
                                                            +

                                                            Summary: The shared glossary that SPEC-06 §3 refers to. Every technical term used in this project, with a one-line explanation a primary-school child could follow, the precise meaning for engineers, and where the term is used. +概要: SPEC-06 §3 が指す共通用語集。このプロジェクトで使う専門用語を、小学生にも分かる一行、技術者向けの正確な意味、使われる場所の三つで説明する。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: listing every term in one place showed that about a third of them (CAS, SAML, IdP/SP, Shibboleth, GakuNin) belong to one topic — login — and that newcomers stumble there first, so the login terms were written to read as one connected story. / 全部の語を一か所に並べてみると、約三分の一(CAS、SAML、IdP/SP、Shibboleth、GakuNin)が「ログイン」という一つの話題に属し、新入社員はまずそこでつまずくと分かった。そこでログインの語は一つの続いた話として読めるように書いた。
                                                            • +
                                                            • Applies to: every document in this repository. Documents still add a short note on first use and link here (SPEC-06 §3). grdm-dev docs check uses the Term column of the English table as its word list.
                                                            • +
                                                            • Related: docs/README.md · SPEC-00 Overview · SPEC-01 Manifest · SPEC-02 Installer CLI · SPEC-03 Security Gate · SPEC-04 Acceptance Tests · SPEC-05 Upstream Tracking · POL-01 · ADR-01 · ADR-02 · ADR-03 · ADR-04
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            How to read the table

                                                            +
                                                              +
                                                            • For everyone is the one-line note that documents copy on first use.
                                                            • +
                                                            • For engineers is the precise meaning. When the two differ in emphasis, the engineer column wins for implementation.
                                                            • +
                                                            • Where used names the documents or commands where the term matters most. Links are relative; private -dev2027 repositories are named, never linked.
                                                            • +
                                                            • Terms are grouped by topic, then alphabetical inside the group. Add a term in both halves in the same commit.
                                                            • +
                                                            +

                                                            A. Git and GitHub

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermFor everyoneFor engineersWhere used
                                                            RepositoryA folder that remembers every change, so you can always go back.A Git object store plus working tree, hosted on GitHub under the RCOSDP organization.everywhere
                                                            BranchA separate line of work in a repository, like a side road that can rejoin the main road.A movable pointer to a commit; develop is the integration branch, upstream/* are tracking branches.ADR-01, SPEC-05
                                                            CommitOne saved step of changes with a message saying why.A snapshot of the tree with parent pointers, author, and message; subjects are Japanese here.SPEC-06 §6
                                                            SHAThe fingerprint of one commit; no two are alike.The SHA-1 (40 hex chars) identifying a commit; the manifest pins full SHAs.SPEC-01
                                                            ForkYour own copy of someone's repository that remembers where it came from.A GitHub-side copy with an upstream link; impossible inside the same organization.ADR-01
                                                            UpstreamThe original place a copy came from; changes flow down from it.The source repository or branch we mirror and merge from; tracking branches are named upstream/<kind>-<branch> (for example upstream/public-develop, upstream/private-master, upstream/cos-develop).SPEC-01 §4, SPEC-05
                                                            MirrorAn identical copy that is refreshed automatically.A branch kept equal to an upstream ref by a daily fetch and fast-forward; never edited directly.SPEC-05
                                                            Pull request (PR)A proposed change waiting for someone to review and accept it.A GitHub review unit; every change to develop goes through one; reviewed by REV, checked by QAE, merged by the owner.ADR-04
                                                            MergeAccepting a change into the shared branch.Creating a merge commit on the target branch; here only a human merges; no force-push.POL-01 §2
                                                            ManifestThe list of which repositories, at which SHA, we build from.manifest/upstreams.json (canonical) with a TOON excerpt; names, branches, SHAs, dates, PR numbers only.SPEC-01
                                                            GitHub ActionsGitHub's robot that runs checks whenever code changes.GitHub's CI service; workflows under .github/workflows/ run link checks, secret scans, MkDocs, Semgrep, amd64 builds, Trivy.SPEC-03
                                                            Self-hosted runnerOur own computer that GitHub's robot borrows to run checks.A GitHub Actions runner on the Mac Studio for arm64 builds and Playwright acceptance; private repositories only.SPEC-04
                                                            CIContinuous integration: automatic checks on every change.The set of required workflows that must pass before a PR can be merged.SPEC-03
                                                            +

                                                            B. Containers and platforms

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermFor everyoneFor engineersWhere used
                                                            ContainerA box that holds one program and everything it needs, so it runs the same anywhere.An isolated process group sharing the host kernel, created from an image; runs non-root here.SPEC-02
                                                            ImageThe recipe and ingredients a container is made from.A layered, read-only filesystem built from a Dockerfile; built locally by default, optionally pushed to a private registry.SPEC-02
                                                            DockerThe tool that builds images and runs containers.Docker Engine 27 or newer (29.x on the Mac Studio) with the Compose and buildx plugins; the only container runtime supported by the installer.SPEC-02
                                                            Docker ComposeA tool that starts many containers together from one file.The docker compose plugin (v2 or newer; 5.x on the Mac Studio) reading the generated runtime/docker-compose.yml; provides the internal network and DNS.ADR-02
                                                            buildxDocker's helper that builds one image for several kinds of computer at once.The BuildKit-based builder; --platform linux/amd64,linux/arm64 produces multi-architecture images.SPEC-02
                                                            Multi-architecture (arm64 / amd64)Making the same program run on both kinds of computer chip.Building images for linux/arm64 (Apple Silicon, ARM servers) and linux/amd64 (Intel/AMD); the installer selects platform automatically.SPEC-02
                                                            Apple SiliconThe chips Apple puts in its Macs since 2020.arm64 CPUs (M-series); the primary development target on the Mac Studio.SPEC-00
                                                            WSL2A way to run Linux inside Windows.Windows Subsystem for Linux 2; Docker Desktop with the WSL2 backend is the supported Windows 11 path.SPEC-02
                                                            Loopback / localhostThe network path that leads back to your own computer.The lo interface; 127.0.0.1 (IPv4) and ::1 (IPv6); the only publishing address allowed.ADR-02
                                                            PortA numbered door on an address through which one program listens.A TCP/UDP port; default host ports (5000 web, 8000 api, 8001 admin, 7777 wb, 7778 mfr, 8080 fakecas, 4200 ember) are defined in the ports table of SPEC-02 §4.SPEC-02 §4, ADR-02
                                                            Non-rootRunning as an ordinary user, not as the all-powerful administrator.Containers run with a non-zero UID; no sudo anywhere in the installer.SPEC-03
                                                            venvA private box of Python tools for one project so projects do not fight.A Python virtual environment; the installer, grdm-dev, and Playwright tests share one venv.SPEC-02
                                                            EOLEnd of life: the makers no longer fix bugs or security holes.A version past its vendor support date; all current upstream base images are EOL and are replaced in M4–M5.POL-01 §1
                                                            +

                                                            C. Security

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermFor everyoneFor engineersWhere used
                                                            VulnerabilityA weak spot an attacker could use to get in.A security defect, typically tracked as a CVE with a severity rating.SPEC-03
                                                            CVEA public ID number given to one known security hole.Common Vulnerabilities and Exposures identifier (CVE-YYYY-NNNNN) with CVSS severity; gate thresholds are CRITICAL/HIGH.SPEC-03, ADR-03
                                                            SBOMA full list of every ingredient inside our software.Software Bill of Materials (CycloneDX or SPDX) produced per image by Trivy.SPEC-03
                                                            SecretA password or key that must never be written where others can read it.Credentials and tokens; generated as random values at install time, never committed; secret scanning is mandatory in CI.SPEC-03
                                                            Allow-listA short list of known problems we have looked at and accept for now.Accepted CVEs with reason, owner, and expiry in manifest/allowlist.json; the count must shrink at each milestone.SPEC-03 §5, ADR-03
                                                            Security gateA checkpoint the build must pass before anyone may use it.The staged policy: report-only (M1–M3), stop on HIGH (M4), zero CRITICAL/HIGH plus red-team pass (M5).ADR-03
                                                            TrivyA scanner that reads our images and lists the holes it knows about.Aqua Security's scanner for images and filesystems; produces SBOM and CVE reports; Grype is the alternative.SPEC-03
                                                            SemgrepA tool that reads source code looking for dangerous patterns.Static analysis (SAST) with rule packs; runs in CI on every PR; CodeQL is the alternative.SPEC-03
                                                            OWASP ZAPA tool that pokes at a running website the way an attacker would.Dynamic application security testing (DAST) proxy from OWASP; run against the local instance only.SPEC-03
                                                            Red teamPeople or programs that attack our own system on purpose to find holes first.Approved AI red team working only against our own instance inside an isolated network; approval procedure in SPEC-03.ADR-03
                                                            +

                                                            D. Testing and quality

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermFor everyoneFor engineersWhere used
                                                            Unit testA check that one small piece works on its own.A test of a single function or class in isolation; Python unittest/pytest.SPEC-04
                                                            Integration testA check that several pieces work together.A test across service boundaries (for example web calls wb through the Compose network).SPEC-04
                                                            Acceptance testA check that the whole thing does what the user asked for.End-to-end scenarios through the browser: login, project creation, file up/download, wiki co-edit, preview, institution admin; each with a success and a rejection case.SPEC-04
                                                            Regression testA check that something that used to work still works.Re-running earlier acceptance and unit suites after each change; required before merge.SPEC-04
                                                            PlaywrightA robot that drives a web browser to test a website.Playwright for Python running in the shared venv against Chromium on 127.0.0.1.SPEC-04
                                                            +

                                                            E. Documents and data formats

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermFor everyoneFor engineersWhere used
                                                            MkDocsA tool that turns Markdown files into a website.MkDocs with the Material theme; grdm-dev docs builds site/; published on GitHub Pages.SPEC-06 §5
                                                            MermaidA way to draw diagrams by typing text.Fenced ```mermaid blocks rendered by GitHub and MkDocs; the only allowed form for architecture and flow diagrams.SPEC-06 §4
                                                            TOONA compact text form of JSON data that people and AI read easily.Token-Oriented Object Notation; used for data in documents; canonical data stays in JSON/YAML and grdm-dev manifest check verifies they agree.SPEC-06 §4
                                                            JSONA plain-text way to write data with braces and quotes that programs read easily.JavaScript Object Notation; canonical format for the manifest and reports.SPEC-01
                                                            YAMLA plain-text way to write data with indentation that people read easily.Used for Compose files, MkDocs, and GitHub Actions workflows.SPEC-02
                                                            +

                                                            F. Login and identity

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermFor everyoneFor engineersWhere used
                                                            CASA login service that many websites share: log in once, use them all.Central Authentication Service protocol; GRDM's cas-overlay implements it and OSF web/api trust it.SPEC-04
                                                            fakecasA pretend CAS for developers: any name logs in, no password.A tiny Go service standing in for cas-overlay in development; mutually exclusive with Shibboleth in acceptance.ADR-02, SPEC-04
                                                            SAMLA standard way for one website to tell another "yes, this person has logged in".Security Assertion Markup Language 2.0; XML assertions between IdP and SP.SPEC-04
                                                            IdP / SPIdP is the place where you log in; SP is the website that trusts it.Identity Provider and Service Provider in SAML; a test IdP container is bundled for acceptance.SPEC-04
                                                            ShibbolethSoftware that makes SAML login work for universities.The Shibboleth SP (Apache module) in RDM-Shibboleth-SP; the subsystem that connects GRDM to GakuNin.SPEC-00
                                                            GakuNinJapan's academic network for logging in with your university account.The Japanese academic access management federation operated by NII; GRDM accepts GakuNin IdPs through Shibboleth.SPEC-00
                                                            +

                                                            G. GRDM components and upstream

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermFor everyoneFor engineersWhere used
                                                            OSF / COSOSF is the website for sharing research that GRDM is built on; COS is the group in the US that makes it.Open Science Framework by the Center for Open Science; CenterForOpenScience/* is tracked as upstream/cos-develop.ADR-01
                                                            osf.ioThe main part of GRDM: the website and its API.Django application (RDM-osf.io); services web, api, admin, worker.SPEC-00
                                                            waterbutler (wb)The part that moves files in and out of storage.Python/aiohttp file-access service (RDM-waterbutler); services wb, wb_worker.SPEC-00
                                                            modular-file-renderer (mfr)The part that shows a preview of a file in the browser.Python/aiohttp rendering service (RDM-modular-file-renderer); service mfr.SPEC-00
                                                            ember-osf-webThe newer web pages of GRDM.Ember.js front end (RDM-ember-osf-web); service ember_osf_web.SPEC-00
                                                            cas-overlayGRDM's real login server.Apereo CAS overlay (RDM-cas-overlay, JDK); service cas.SPEC-00
                                                            wiki-frontendThe wiki editor pages.Front end for the GRDM wiki (RDM-wiki-frontend), paired with y-websocket for live co-editing.SPEC-00
                                                            y-websocketThe helper that lets two people edit the same wiki page at once.Yjs WebSocket server (RDM-y-webocket-develop-private; repository name carries the upstream spelling) for collaborative editing.SPEC-00
                                                            OASysA GRDM subsystem (private) added in M3.Subsystem from RDM-OASys-main-private; scope and tests defined in M3.SPEC-00
                                                            rdmcp / MCPA way for AI assistants to talk to GRDM through a standard plug.Model Context Protocol server for GRDM (RDM-rdmcp-private).SPEC-00
                                                            AIPFA GRDM data connector for the AI platform (private).RDM-aipf_mcp_data_grdm-private, an MCP data source for GRDM.SPEC-00
                                                            ElasticsearchThe search engine inside GRDM.ES 2 and 6.3.1 today; consolidated on ES 8 in M5.POL-01 §4
                                                            PostgreSQLThe main database where GRDM keeps its records.PostgreSQL 9.6 today; 15 or later in M5.POL-01 §4
                                                            MongoDBAn older database GRDM still uses for a few things.MongoDB 3.4 (sharejs); retired in M5.POL-01 §4
                                                            RabbitMQThe message queue: a line where jobs wait for a worker.AMQP broker used by Celery workers in osf.io.SPEC-00
                                                            RedisA very fast memory store used for caching and sessions.In-memory key-value store used by osf.io and wb/mfr.SPEC-00
                                                            +

                                                            H. AI tools and roles

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermFor everyoneFor engineersWhere used
                                                            LLM / local LLMA large language model is an AI that reads and writes text; a local one runs on our own computer.A local LLM (Qwen 3 Coder Next via LM Studio) powers AID workers; nothing from private code is sent to external models without the data-handling rules in POL-05.ADR-04
                                                            OrcaThe desk where our AI workers sit: it opens workspaces and terminals for them.The orchestration tool that runs Open Code 2 and Codex workers in separate worktrees.ADR-04
                                                            Open Code 2The AI program that writes the code (our AID worker).The implementation agent running on the local LLM inside Orca.ADR-04
                                                            CodexThe AI program that reviews every PR (our REV).Codex Astra (gpt-6-astra) as an Orca worker; records reviews in docs/reviews/ and PR comments.ADR-04
                                                            Claude CodeThe AI program that writes specifications and checks results (our QAE).Claude Code (Fable) running this plan's QA, regression and acceptance judgement.ADR-04
                                                            AIDAI Developer: the role that writes code and documents to spec.Role code from the team table; held by Open Code 2 workers.ADR-04
                                                            QAEQA Engineer: the role that checks and judges.Role code; held by Claude Code Fable.ADR-04
                                                            REVReviewer: the role that independently reviews each PR.Role code; held by Codex Astra.ADR-04
                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            表の読み方

                                                            +
                                                              +
                                                            • みんな向け は、文書が初出で写す一行の注です。
                                                            • +
                                                            • 技術者向け は正確な意味です。重点が違うときは、実装では技術者向けの列が優先します。
                                                            • +
                                                            • 使われる場所 は、その語が最も効く文書やコマンドです。リンクは相対で、非公開の -dev2027 は名前だけを書きリンクしません。
                                                            • +
                                                            • 語は話題で分け、その中では英語の表と同じ順です。語を足すときは、英和の両方を同じコミットで足します。
                                                            • +
                                                            +

                                                            A. Git と GitHub

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            用語みんな向け技術者向け使われる場所
                                                            リポジトリ(repository)変更を全部覚えているフォルダ。いつでも前に戻せる。Git のオブジェクト保存庫と作業ツリー。RCOSDP 組織の GitHub に置く。全文書
                                                            ブランチ(branch)リポジトリの中の別の作業の道。脇道で、あとで本道に戻れる。コミットを指す動くポインタ。develop が統合ブランチ、upstream/* が追跡ブランチ。ADR-01、SPEC-05
                                                            コミット(commit)変更の一歩を、理由のメッセージ付きで保存したもの。ツリーのスナップショットに親・作者・メッセージが付いたもの。件名は日本語。SPEC-06 §6
                                                            SHAコミット一つの指紋。同じものは二つない。コミットを識別する SHA-1(16 進 40 文字)。manifest は完全な SHA を固定する。SPEC-01
                                                            フォーク(fork)他人のリポジトリの自分用の写し。出どころを覚えている。GitHub 側の写しで upstream へのリンクを持つ。同じ組織内には作れない。ADR-01
                                                            上流(upstream)写しの元の場所。変更はそこから流れてくる。ミラーしマージする元のリポジトリやブランチ。追跡ブランチの名前は upstream/<kind>-<branch>(例: upstream/public-develop、upstream/private-master、upstream/cos-develop)。SPEC-01 §4、SPEC-05
                                                            ミラー(mirror)自動で更新される、そっくり同じ写し。日次の fetch と fast-forward で上流の参照と等しく保つブランチ。直接編集しない。SPEC-05
                                                            プルリクエスト(PR)誰かが見て受け入れるのを待っている、変更の提案。GitHub のレビュー単位。develop への変更はすべて PR を通り、REV がレビュー、QAE が検査、所有者がマージ。ADR-04
                                                            マージ(merge)変更を共有のブランチへ受け入れること。対象ブランチにマージコミットを作ること。ここでは人だけがマージし、force push はしない。POL-01 §2
                                                            manifestどのリポジトリのどの SHA から組み立てるかの一覧。manifest/upstreams.json(正本)と TOON 抄録。名前・ブランチ・SHA・日付・PR 番号のみ。SPEC-01
                                                            GitHub Actionsコードが変わるたびに検査を走らせる GitHub のロボット。GitHub の CI。.github/workflows/ のワークフローがリンク検査・秘密スキャン・MkDocs・Semgrep・amd64 ビルド・Trivy を走らせる。SPEC-03
                                                            セルフホストランナーGitHub のロボットが検査のために借りる、私たちの計算機。Mac Studio 上の GitHub Actions ランナー。arm64 ビルドと Playwright 受入に使い、非公開リポジトリ限定。SPEC-04
                                                            CIcontinuous integration。変更ごとに自動で走る検査。PR をマージする前に合格が必須のワークフローの集まり。SPEC-03
                                                            +

                                                            B. コンテナと実行環境

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            用語みんな向け技術者向け使われる場所
                                                            コンテナ(container)一つのプログラムと必要なものを一箱に入れ、どこでも同じように動かす箱。ホストのカーネルを共有する隔離されたプロセス群。イメージから作り、ここでは非 root で動かす。SPEC-02
                                                            イメージ(image)コンテナを作るためのレシピと材料。Dockerfile から作る層状の読み取り専用ファイルシステム。既定はローカルビルド、任意で非公開レジストリへ。SPEC-02
                                                            Dockerイメージを作り、コンテナを動かす道具。Docker Engine 27 以上(Mac Studio では 29.x)と Compose・buildx プラグイン。インストーラーが対応する唯一のコンテナ実行基盤。SPEC-02
                                                            Docker Compose一つのファイルから多くのコンテナをまとめて起こす道具。生成した runtime/docker-compose.yml を読む docker compose プラグイン(v2 以上。Mac Studio では 5.x)。内部ネットワークと DNS を提供する。ADR-02
                                                            buildx一つのイメージを何種類かの計算機向けに一度に作る Docker の助手。BuildKit ベースのビルダー。--platform linux/amd64,linux/arm64 で複数アーキテクチャのイメージを作る。SPEC-02
                                                            マルチアーキテクチャ(arm64 / amd64)同じプログラムを、二種類のチップの計算機で動かすこと。linux/arm64(Apple Silicon、ARM サーバ)と linux/amd64(Intel/AMD)向けのイメージを作る。インストーラーが platform を自動判定する。SPEC-02
                                                            Apple Silicon2020 年から Apple が Mac に入れているチップ。arm64 の CPU(M シリーズ)。Mac Studio 上の主な開発対象。SPEC-00
                                                            WSL2Windows の中で Linux を動かす仕組み。Windows Subsystem for Linux 2。WSL2 バックエンドの Docker Desktop が Windows 11 で対応する経路。SPEC-02
                                                            ループバック / localhost自分の計算機へ戻ってくるネットワークの道。lo インタフェース。127.0.0.1(IPv4)と ::1(IPv6)。公開を許す唯一のアドレス。ADR-02
                                                            ポート(port)アドレスに付いた番号付きの扉。プログラムはここで待つ。TCP/UDP のポート。既定のホスト側ポート(5000 web、8000 api、8001 admin、7777 wb、7778 mfr、8080 fakecas、4200 ember)は SPEC-02 §4 のポート表で定める。SPEC-02 §4、ADR-02
                                                            非 root(non-root)なんでもできる管理者ではなく、普通の利用者として動かすこと。コンテナは 0 以外の UID で動く。インストーラーのどこにも sudo がない。SPEC-03
                                                            venvプロジェクトごとの Python 道具箱。プロジェクト同士がけんかしない。Python の仮想環境。インストーラー、grdm-dev、Playwright 試験が一つの venv を共有する。SPEC-02
                                                            EOLend of life。作った人がバグや穴を直してくれなくなった状態。ベンダーのサポート期限を過ぎた版。現在の上流の土台イメージはすべて EOL で、M4〜M5 で置き換える。POL-01 §1
                                                            +

                                                            C. セキュリティ

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            用語みんな向け技術者向け使われる場所
                                                            脆弱性(vulnerability)攻撃者が入り込める弱い場所。セキュリティ上の欠陥。多くは CVE として深刻度付きで追跡される。SPEC-03
                                                            CVE既知の穴一つに付けられた公開の番号。Common Vulnerabilities and Exposures の識別子(CVE-YYYY-NNNNN)と CVSS 深刻度。門の閾値は CRITICAL/HIGH。SPEC-03、ADR-03
                                                            SBOMソフトウェアの中身の材料をすべて書いた一覧。Software Bill of Materials(CycloneDX か SPDX)。Trivy がイメージごとに出す。SPEC-03
                                                            秘密(secret)他人が読める場所に書いてはいけないパスワードや鍵。資格情報とトークン。導入時に乱数で生成し、コミットしない。CI の秘密スキャンは必須。SPEC-03
                                                            許容リスト(allow-list)見た上で今は受け入れる、既知の問題の短い一覧。理由・担当・期限付きで受け入れた CVE を manifest/allowlist.json に置く。件数は節目ごとに減らす。SPEC-03 §5、ADR-03
                                                            セキュリティ門(security gate)通らないと使えない検問所。段階方式: 報告のみ(M1〜M3)、HIGH で停止(M4)、CRITICAL/HIGH ゼロとレッドチーム合格(M5)。ADR-03
                                                            Trivyイメージを読んで、知っている穴を並べるスキャナ。Aqua Security のイメージ・ファイルシステム用スキャナ。SBOM と CVE 報告を出す。代替は Grype。SPEC-03
                                                            Semgrepソースコードを読んで危ない書き方を探す道具。ルールパック付きの静的解析(SAST)。全 PR の CI で走る。代替は CodeQL。SPEC-03
                                                            OWASP ZAP動いている Web サイトを、攻撃者のやり方でつつく道具。OWASP の動的アプリケーションセキュリティ試験(DAST)プロキシ。ローカルインスタンスだけに向ける。SPEC-03
                                                            レッドチーム(red team)穴を先に見つけるために、わざと自分のシステムを攻める人やプログラム。承認済み AI レッドチーム。隔離ネットワーク内の自環境だけを対象にする。承認手順は SPEC-03。ADR-03
                                                            +

                                                            D. 試験と品質

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            用語みんな向け技術者向け使われる場所
                                                            単体試験(unit test)小さな部品一つが単独で動くかの確認。関数やクラス一つを切り離して試す。Python の unittest/pytest。SPEC-04
                                                            統合試験(integration test)いくつかの部品が一緒に動くかの確認。サービスの境界をまたぐ試験(例: web が Compose ネットワーク経由で wb を呼ぶ)。SPEC-04
                                                            受入試験(acceptance test)全体が利用者の望みどおりに動くかの確認。ブラウザを通した端から端までのシナリオ: ログイン、プロジェクト作成、ファイル上下載、Wiki 共同編集、プレビュー、機関管理。各シナリオに成功と拒否のケース。SPEC-04
                                                            回帰試験(regression test)前に動いていたものが、今も動くかの確認。変更ごとに以前の受入・単体の一式を再実行する。マージ前に必須。SPEC-04
                                                            PlaywrightWeb ブラウザを操作して Web サイトを試すロボット。Playwright for Python。共有 venv で、127.0.0.1 の Chromium に対して走る。SPEC-04
                                                            +

                                                            E. 文書とデータ形式

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            用語みんな向け技術者向け使われる場所
                                                            MkDocsMarkdown のファイルを Web サイトに変える道具。Material テーマの MkDocs。grdm-dev docs が site/ を作り、GitHub Pages で公開。SPEC-06 §5
                                                            Mermaid文字を打って図を描く仕組み。```mermaid のコードブロック。GitHub と MkDocs が描画する。構成図・流れ図はこれだけを許す。SPEC-06 §4
                                                            TOONJSON のデータを短く字下げで書いた形。人にも AI にも読みやすい。Token-Oriented Object Notation。文書内のデータに使う。正本は JSON/YAML に置き、grdm-dev manifest check が一致を確かめる。SPEC-06 §4
                                                            JSON波括弧と引用符でデータを書く、プログラムが読みやすい文字の形。JavaScript Object Notation。manifest と報告書の正本の形式。SPEC-01
                                                            YAML字下げでデータを書く、人が読みやすい文字の形。Compose ファイル、MkDocs、GitHub Actions のワークフローに使う。SPEC-02
                                                            +

                                                            F. ログインと身元

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            用語みんな向け技術者向け使われる場所
                                                            CASたくさんの Web サイトが共有するログイン係。一度ログインすれば全部使える。Central Authentication Service プロトコル。GRDM の cas-overlay が実装し、OSF の web/api がそれを信頼する。SPEC-04
                                                            fakecas開発者向けの「にせもの CAS」。どんな名前でもパスワードなしで入れる。開発で cas-overlay の代わりに立つ小さな Go のサービス。受入では Shibboleth と排他。ADR-02、SPEC-04
                                                            SAMLある Web サイトが別のサイトに「この人は確かにログインした」と伝える標準の方法。Security Assertion Markup Language 2.0。IdP と SP の間の XML アサーション。SPEC-04
                                                            IdP / SPIdP はログインする場所、SP はそれを信じる Web サイト。SAML の Identity Provider と Service Provider。受入のためにテスト用 IdP コンテナを同梱する。SPEC-04
                                                            Shibboleth大学向けに SAML ログインを動かすソフト。RDM-Shibboleth-SP の Shibboleth SP(Apache モジュール)。GRDM を GakuNin につなぐサブシステム。SPEC-00
                                                            GakuNin(学認)大学のアカウントでログインするための日本の学術ネットワーク。NII が運営する日本の学術アクセス管理フェデレーション。GRDM は Shibboleth 経由で GakuNin の IdP を受け入れる。SPEC-00
                                                            +

                                                            G. GRDM の部品と上流

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            用語みんな向け技術者向け使われる場所
                                                            OSF / COSOSF は GRDM の土台になった研究共有の Web サイト。COS はそれを作る米国の団体。Center for Open Science の Open Science Framework。CenterForOpenScience/* を upstream/cos-develop として追跡する。ADR-01
                                                            osf.ioGRDM の中心。Web サイトと API。Django アプリケーション(RDM-osf.io)。サービスは web、api、admin、worker。SPEC-00
                                                            waterbutler(wb)ファイルを保管場所へ出し入れする部品。Python/aiohttp のファイルアクセスサービス(RDM-waterbutler)。サービスは wb、wb_worker。SPEC-00
                                                            modular-file-renderer(mfr)ファイルのプレビューをブラウザに見せる部品。Python/aiohttp の描画サービス(RDM-modular-file-renderer)。サービスは mfr。SPEC-00
                                                            ember-osf-webGRDM の新しい方の Web 画面。Ember.js のフロントエンド(RDM-ember-osf-web)。サービスは ember_osf_web。SPEC-00
                                                            cas-overlayGRDM の本物のログインサーバ。Apereo CAS のオーバーレイ(RDM-cas-overlay、JDK)。サービスは cas。SPEC-00
                                                            wiki-frontendWiki の編集画面。GRDM Wiki のフロントエンド(RDM-wiki-frontend)。共同編集は y-websocket と組む。SPEC-00
                                                            y-websocket二人が同じ Wiki ページを同時に編集できるようにする裏方。共同編集のための Yjs WebSocket サーバ(RDM-y-webocket-develop-private。リポジトリ名は上流の綴りのまま)。SPEC-00
                                                            OASysM3 で加える GRDM のサブシステム(非公開)。RDM-OASys-main-private のサブシステム。範囲と試験は M3 で定める。SPEC-00
                                                            rdmcp / MCPAI アシスタントが標準の差し込み口で GRDM と話す仕組み。GRDM 向けの Model Context Protocol サーバ(RDM-rdmcp-private)。SPEC-00
                                                            AIPFAI 基盤向けの GRDM データ接続部品(非公開)。RDM-aipf_mcp_data_grdm-private。GRDM の MCP データソース。SPEC-00
                                                            ElasticsearchGRDM の中の検索エンジン。現在は ES 2 と 6.3.1。M5 で ES 8 に集約。POL-01 §4
                                                            PostgreSQLGRDM が記録を保存する主なデータベース。現在は PostgreSQL 9.6。M5 で 15 以降。POL-01 §4
                                                            MongoDBGRDM が一部でまだ使っている古いデータベース。MongoDB 3.4(sharejs 用)。M5 で廃止。POL-01 §4
                                                            RabbitMQメッセージの待ち行列。仕事が作業者を待つ列。osf.io の Celery ワーカーが使う AMQP ブローカー。SPEC-00
                                                            Redisキャッシュやセッションに使う、とても速いメモリの保管庫。osf.io と wb/mfr が使うインメモリのキー値ストア。SPEC-00
                                                            +

                                                            H. AI の道具と役割

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            用語みんな向け技術者向け使われる場所
                                                            LLM / ローカル LLM大規模言語モデルは文章を読み書きする AI。ローカル版は自分の計算機で動く。ローカル LLM(LM Studio 経由の Qwen 3 Coder Next)が AID ワーカーを動かす。非公開コード由来のものは、POL-05 のデータ取り扱い規則なしに外部モデルへ送らない。ADR-04
                                                            OrcaAI ワーカーの作業机。作業場と端末を開いてあげる。Open Code 2 と Codex のワーカーを別々の worktree で動かすオーケストレーション道具。ADR-04
                                                            Open Code 2コードを書く AI プログラム(私たちの AID ワーカー)。Orca の中でローカル LLM で動く実装エージェント。ADR-04
                                                            Codex全 PR をレビューする AI プログラム(私たちの REV)。Orca ワーカーとしての Codex Astra(gpt-6-astra)。レビューを docs/reviews/ と PR コメントに記録する。ADR-04
                                                            Claude Code仕様を書き、結果を検査する AI プログラム(私たちの QAE)。この計画の QA・回帰・受入の判定を担う Claude Code(Fable)。ADR-04
                                                            AIDAI開発担当者。仕様どおりにコードと文書を書く役割。チームの対応表の役割略称。Open Code 2 ワーカーが担う。ADR-04
                                                            QAEQA担当。検査し判定する役割。役割略称。Claude Code Fable が担う。ADR-04
                                                            REV担当レビュワ。各 PR を独立にレビューする役割。役割略称。Codex Astra が担う。ADR-04
                                                            +
                                                            +

                                                            Glossary / 用語

                                                            +

                                                            The tables above are the glossary. Documents that use a term from the Term / 用語 column add a short note on first use and link to the matching section (for example [REF-01 §C](../reference/REF-01_Glossary.md#english)). / 上の表そのものが用語集です。Term / 用語 列の語を使う文書は、初出で短い注を付け、該当する節へリンクします。

                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/reference/index.html b/site/reference/index.html new file mode 100644 index 0000000..f2517b8 --- /dev/null +++ b/site/reference/index.html @@ -0,0 +1,2881 @@ + + + + + + + + + + + + + + + + + + + + + + + Reference / 参考 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            Reference / 参考

                                                            +
                                                            +

                                                            Summary: External facts such as the shared glossary, tool versions, upstream metadata. Reference documents contain fixed information that other documents link to. +概要: 共通用語集、道具の版、上流メタデータなどの外部事実。参考文書は他の文書がリンクする固定情報を持ちます。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: a shared glossary is needed because the same term (for example "upstream" or "port") appears in several specifications and must mean one thing everywhere. / 同じ用語(例:「上流」「ポート」)が複数の仕様に出てくるため、どこでも一つの意味になるよう共通の用語集が必要だと分かった。
                                                            • +
                                                            • Normative for: REF-01 Glossary and future reference documents.
                                                            • +
                                                            • Related: ../README.md · policy/ · spec/ · decisions/
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            1. What belongs here

                                                            +

                                                            A reference document contains external facts that other documents link to. This folder contains:

                                                            + + + + + + + + + + + + + + + +
                                                            IDFilePurpose
                                                            REF-01REF-01_Glossary.mdThe shared glossary: technical terms with one-line notes for everyone and precise meanings for engineers.
                                                            +

                                                            Future reference documents may include:

                                                            + + + + + + + + + + + + + + + + + +
                                                            IDTopic
                                                            REF-02Tool versions and compatibility matrix
                                                            REF-03Upstream repository metadata (default branches, tags)
                                                            +

                                                            2. How reference documents are used

                                                            +

                                                            Reference documents are linked from other documents using relative links:

                                                            +
                                                              +
                                                            • Glossary terms: [term](../reference/REF-01_Glossary.md#english) (section anchor)
                                                            • +
                                                            • Tool versions: [docker](../reference/REF-02_Tool_Versions.md#english) (file link)
                                                            • +
                                                            +

                                                            3. Creating a new reference document

                                                            +
                                                              +
                                                            1. Name the file REF-NN_<Title>.md (two-digit number, next available).
                                                            2. +
                                                            3. Follow SPEC-06 documentation conventions.
                                                            4. +
                                                            5. Include only fixed facts, not opinions or processes.
                                                            6. +
                                                            7. Link from documents that need the reference.
                                                            8. +
                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            1. ここに属するもの

                                                            +

                                                            「参考」文書は他の文書がリンクする外部事実を含みます。このフォルダには次が含まれます:

                                                            + + + + + + + + + + + + + + + +
                                                            IDファイル目的
                                                            REF-01REF-01_Glossary.md共通用語集:専門用語に、誰向けに一行の注と技術者向けの正確な意味を付ける。
                                                            +

                                                            今後の参考文書として以下が考えられます:

                                                            + + + + + + + + + + + + + + + + + +
                                                            IDトピック
                                                            REF-02道具の版と互換性マトリクス
                                                            REF-03上流リポジトリメタデータ(既定ブランチ、タグ)
                                                            +

                                                            2. 参考文書がどう使われるか

                                                            +

                                                            参考文書は他の文書から相対リンクで参照されます:

                                                            +
                                                              +
                                                            • 用語集の語: [用語](../reference/REF-01_Glossary.md#japanese)(節アンカー)
                                                            • +
                                                            • 道具の版: [docker](../reference/REF-02_Tool_Versions.md#japanese)(ファイルリンク)
                                                            • +
                                                            +

                                                            3. 新しい参考文書をつくるには

                                                            +
                                                              +
                                                            1. ファイル名を REF-NN_<題>.md(2 桁の番号、次に空いているもの)にする。
                                                            2. +
                                                            3. SPEC-06 文書規約に従う。
                                                            4. +
                                                            5. 意見やプロセスではなく、固定事実だけを含む。
                                                            6. +
                                                            7. 参考が必要な文書へリンクする。
                                                            8. +
                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            ReferenceA document containing external facts that other documents link to.他の文書がリンクする外部事実を含む文書。
                                                            GlossaryA collection of technical terms with explanations.専門用語の集合。
                                                            LinkA navigational element that jumps to another part of a document.文書の別の部分へ飛ぶナビゲーション要素。
                                                            AnchorA bookmark inside a page that a link can jump to.ページの中の「しおり」。リンクで飛べる。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1/index.html b/site/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1/index.html new file mode 100644 index 0000000..6de708e --- /dev/null +++ b/site/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1/index.html @@ -0,0 +1,2936 @@ + + + + + + + + + + + + + + + + + + + + + + + REV M1 Skeleton PR Review r1 / M1 文書骨格 PR レビュー r1 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            REV M1 Skeleton PR Review r1 / M1 文書骨格 PR レビュー r1

                                                            +
                                                            +

                                                            Summary: Request changes on PR #19: private repository URLs remain in public text, the secret scanner has no enabled detection rules, despite green CI. Validation and specification defects also need correction. +概要: PR #19 は修正要求。公開文書に非公開リポジトリ URL が残り、秘密スキャナーの検出規則が有効でなく、CI 合格でも保護を保証できません。検査と仕様の不具合も修正が必要です。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: passing local checks did not establish specification compliance: independent parsing found malformed blocks, and source inspection found missing validation. / ローカル検査の合格だけでは仕様準拠を示せず、独立した構文解析とコード確認で構文不正と未実装の検査を確認した。
                                                            • +
                                                            • Applies to: PR #19, feat/m1-skeleton → develop, final reviewed head 1a01c3b1352fb58cfa100e6d200c737213b70464 (updated during review from df7a4ce).
                                                            • +
                                                            • Related: Review index · SPEC-06 · SPEC-01 · SPEC-02.
                                                            • +
                                                            • Used by: owner merge decision and the author's correction pass.
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            Verdict and terms

                                                            +

                                                            Request changes. A PR (pull request) is a proposed change awaiting review; this verdict is a review recommendation, not a GitHub approval or merge. P1 means fix before merge because a protection is ineffective or a required check fails; P2 means a reproducible correctness or documentation defect. CI means the automated checks GitHub runs. See the shared glossary.

                                                            +

                                                            Findings, highest severity first

                                                            +
                                                              +
                                                            1. +

                                                              R1 — P1: prohibited private URLs are published as negative examples. manifest/README.md:48–49,102–103 contains actual HTTPS and SSH addresses for the private integration repository. Calling them “never write” examples still publishes them and violates SPEC-06 §5 and the task's publication rule. The PR body's “private URL grep: none” is incorrect. Replace them with non-address prose; scan all tracked files, not just the two data files. No private URL is repeated in this review.

                                                              +
                                                            2. +
                                                            3. +

                                                              R2 — P1: gitleaks runs with zero detection rules. .gitleaks.toml:6–28 supplies only an allowlist (exceptions to detection), no rules and no [extend] useDefault = true. default = true at line 28 is inside [allowlist] and is not a supported setting that enables defaults. The pinned version's configuration source defines Extend.UseDefault and no such allowlist field. The workflow explicitly selects this config at .github/workflows/security.yml:23, so its green “68 commits scanned / no leaks found” is not evidence of an effective secret scan. Enable the default rules, remove unsupported entropy, and replace the global unanchored 40-hex exemption with narrowly justified exceptions: secret values can also be 40 hex characters. Verify a synthetic secret is rejected without placing it in Git, then rescan history with redacted output. Add a separate private-URL policy check; default secret rules alone do not enforce that policy.

                                                              +
                                                            4. +
                                                            5. +

                                                              R3 — P2: declared Trivy coverage is not delivered. docs/spec/03_security_gate.md:234,458 promises gitleaks, Semgrep and Trivy on every PR, but .github/workflows/security.yml:11–59 has no Trivy job. Implement it or explicitly delimit M1's delivered scope. The original Semgrep failure (77 findings) was resolved during review in 1a01c3b by action SHA pinning and documented exclusions for generated output and legacy examples; the latest job passes. That initial failure is no longer an open finding. The owner should explicitly accept the documented legacy deferral.

                                                              +
                                                            6. +
                                                            7. +

                                                              R4 — P2: manifest validation does not enforce its advertised contract. tools/manifest_check.py:225–235 checks JSON and searches text for URLs, but never calls validate_toon or compares JSON and TOON (the compact data notation). Missing TOON passes; changing any TOON SHA, profile, repository, or PR number passes. validate_component at lines 122–146 checks only four required fields and validates a SHA only if present. An in-memory component with invalid role and an upstream with no SHA returns no errors; a synthetic token also passes validate_no_secrets. Implement SPEC-01 MC-01–11/13 or explicitly document which checks are deferred, without claiming equivalence. The current files do agree semantically, but CI cannot keep them that way. Keep the helper's exit 1 distinct from the future CLI's specified exit 20, or align and document the interface.

                                                              +
                                                            8. +
                                                            9. +

                                                              R5 — P2: ZAP is instructed to scan itself. docs/spec/03_security_gate.md:98,322 starts ZAP (a scanner of a running web application) inside a container on the internal network, then targets 127.0.0.1:5000/8001/4200. Loopback in that container names ZAP itself, not the web/admin/ember containers or the host. This conflicts with docs/decisions/ADR-02_Network_Model.md:53–57,131–135, which separates service-name traffic inside Compose from host loopback traffic. Specify internal service names and container ports for ZAP, retaining SPEC-02's host-port table for browsers and host-side checks; include port-remapping behavior.

                                                              +
                                                            10. +
                                                            11. +

                                                              R6 — P2: one diagram and three data blocks do not parse. With the site's Mermaid 11.4.1 parser (text-to-diagram syntax), docs/spec/04_acceptance_tests.md:94 fails: the semicolon in the English sequence-diagram note starts another statement. Use supported note text/escaping and regenerate HTML. TOON 4.4.0 rejects docs/spec/02_installer_cli.md:133–134,138 because unquoted commas turn two-column exit-code rows into extra columns. docs/status/upstream/README.md:38–46,92–100 declares 11 tabular rows but supplies an object-style item and an ellipsis. Supply a valid one-item example, or all 11 correctly shaped items. These errors survive MkDocs strict because it does not parse those embedded languages. The Japanese SPEC-04 diagram parses, so the two rendered halves differ.

                                                              +
                                                            12. +
                                                            13. +

                                                              R7 — P2: the documentation checker silently skips promised checks and scope. tools/docs_check.py:18–43 checks only docs/ plus root README and excludes legacy content, leaving manifest/README.md, installer README and old-path pointers outside SPEC-06 coverage. Lines 96–98 skip every link containing #, even when its file does not exist; a call with absent-file.md#english returns no errors. Lines 123–126 perform no TOON parity or glossary warning check, despite docs/spec/06_documentation_conventions.md:87–95. Check the file portion before the fragment, cover new Markdown throughout the repository, and document an explicit legacy-format exception. The existing 35-file pass is only a subset check.

                                                              +
                                                            14. +
                                                            15. +

                                                              R8 — P2: M2 acceptance criteria contradict the profile definition. docs/spec/04_acceptance_tests.md:54,59,122 makes C4 depend on y_websocket, allows it to skip in core, yet requires all C1–C6 success and rejection cases green for M2. SPEC-02's profile table at docs/spec/02_installer_cli.md:96–99 places that service in full; the manifest agrees. Define whether M2 includes this service or explicitly defers C4 to M3, and update both language halves. Otherwise a skipped test can be mistaken for a completed milestone.

                                                              +
                                                            16. +
                                                            +

                                                            What was verified

                                                            +

                                                            All commands ran from the repository root. These read-only checks returned exit 0; the second initially reported 35 files; after the concurrent asset-index addition and this review it reported 37 files:

                                                            +
                                                            python3 tools/manifest_check.py
                                                            +python3 tools/docs_check.py
                                                            +
                                                            +

                                                            The requested comparison was 506 files changed, 246,242 insertions and 3,246 deletions:

                                                            +
                                                            git diff develop...feat/m1-skeleton --stat
                                                            +
                                                            +
                                                              +
                                                            • Searched tracked text across the full tree, including site HTML, search-index JSON, legacy Markdown, hidden workflow files, and manifest files. Found the four prohibited URL occurrences in R1. Token-format/private-key searches found no additional matching credential. Legacy default JWT/JWE/test-token values and guest broker credentials exist; these are inherited examples, not verified live credentials. The EC2 legacy guide at lines 364/372 and its HTML/search-index copies contain a clearly placeholder-shaped internal hostname. Institutional support addresses and test emails are not evidence of personal-data leakage. No claim of exhaustive secret clearance is made, especially given R2.
                                                            • +
                                                            • Visually sampled new-token.png, dev-application.png and filled-credential.png: the first has no issued token, while sensitive application/credential values in the latter two are blurred or password-masked. Other images were not exhaustively inspected; a text search cannot inspect their pixels.
                                                            • +
                                                            • Observed actual GitHub runs: docs links and MkDocs strict pass, manifest passes, gitleaks exits 0 with the R2 limitation, Semgrep initially failed but the latest head passes all five checks (R3 records the remaining coverage gap). Successful jobs establish usable YAML, action versions, Python 3.11 and pinned MkDocs requirements on the hosted runner. The gitleaks Docker invocation and Semgrep container actually start. Local Docker daemon was unavailable, so containers were not rerun locally.
                                                            • +
                                                            • Independently parsed all 34 Mermaid and 44 TOON fences in tracked Markdown using Mermaid 11.4.1, a DOM shim (browser-like objects for the parser), and @toon-format/toon 4.4.0 installed in a temporary directory outside the repository. Results: 33/34 Mermaid and 41/44 TOON pass. Parsed manifest/upstreams.toon and compared its specified projection with JSON: equal, including upstream fields and adopted PRs. This establishes semantic equality, not byte-for-byte output from an unimplemented CLI generator.
                                                            • +
                                                            • Checked JSON required component fields, roles, profiles, core platforms, SHA shape, service names and tracking-name rules. Counted 20 components, 11 integration repositories, 8 adopted PRs and 25 candidates, matching the PR body. The requested authenticated branch query for RDM-osf.io-dev2027 returns develop, integrate/public-develop-20261105, upstream/public-develop, upstream/private-develop, upstream/cos-develop, and upstream/private-sec-test-fix-sec-test; all four required tracking branches match SPEC-01 rule 7. Reachability and all 11 repositories' creation/mirroring were not independently audited.
                                                            • +
                                                            • Compared SPEC-01–05 with ADR-02 and REF-01. The seven default host ports agree; exit 20/40/50–53/60 and principal subcommand names agree at specification level. R5 and R8 are behavioral contradictions despite matching numbers. Legacy guides are intentionally historical; they should not be read as current installation procedures.
                                                            • +
                                                            • English/Japanese core sections largely align. First-use explanations exist for central terms but full SPEC-06 term-by-term compliance is not established. “Learned” claims about the eleven-upstream survey (SPEC-05:8) and newcomer behavior (REF-01:8) lack linked evidence in this PR; they are unverified, not proven fabricated. Provide the evidence or phrase them as design rationale. No mixed-language corruption was identified in the reviewed normative text.
                                                            • +
                                                            • The claimed normative documents, guide pointers, committed site, requirements, and two workflows exist. M2 installer/acceptance implementations are not claimed M1 deliveries. The initial integration-order exception remains explicitly proposed in ADR-01 §5. Commit messages and the PR body carry a Claude session link; its accessibility/content was not inspected.
                                                            • +
                                                            +

                                                            Owner decisions

                                                            +

                                                            Resolve R1–R8 before merging. Decide the M1 Semgrep/Trivy enforcement scope, the M2 C4 scope, and whether to accept ADR-01 §5's bootstrap interpretation. Decide whether the Claude session link belongs in public metadata after assessing its sharing visibility; no session content is reproduced here. Approving the bootstrap exception must be reflected in SPEC-01 and the affected records, not silently treated as already approved. Add evidence for empirical “Learned” claims or reword them. Author corrections should regenerate site/ and rerun both parser checks and hosted CI.

                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            判定と用語

                                                            +

                                                            Request changes(修正要求)。 PR(プルリクエスト)はレビューを待つ変更提案です。この判定は推奨であり、GitHub の承認やマージではありません。P1 は保護機能が無効または必須検査が失敗するためマージ前に修正すべきもの、P2 は再現可能な仕様・文書・検査の不具合です。CI は GitHub が自動実行する検査です。共通用語集も参照してください。

                                                            +

                                                            重大度順の指摘

                                                            +
                                                              +
                                                            1. +

                                                              R1 — P1: 禁止例に実際の非公開 URL を掲載。 manifest/README.md:48–49,102–103 に非公開統合リポジトリの HTTPS/SSH アドレスが計4件あります。「書かない例」でも公開に当たり、SPEC-06 §5 と今回の公開ルールに違反します。PR 本文の「private URL grep 検出なし」は誤りです。アドレスを含まない説明に置き換え、データ2ファイルだけでなく追跡対象の全ファイルを検査してください。このレビューには該当 URL を転記していません。

                                                              +
                                                            2. +
                                                            3. +

                                                              R2 — P1: gitleaks の検出規則がゼロ。 .gitleaks.toml:6–28 には allowlist(検出から除外する条件)しかなく、規則も [extend] useDefault = true もありません。28行の default = true は [allowlist] 内にあり、既定規則を有効にする設定ではありません。固定版の設定コードは Extend.UseDefault を定義し、該当 allowlist 項目は定義していません。.github/workflows/security.yml:23 がこの設定を指定するため、「68 commits scanned / no leaks found」の成功表示は有効な秘密検査の証拠になりません。既定規則を有効化し、未対応の entropy を削除し、全域の40桁16進除外を根拠のある狭い例外へ変更してください。秘密も40桁16進になり得ます。Git に入れない模擬秘密で拒否を確認し、伏字で履歴を再検査してください。非公開 URL は既定の秘密規則だけでは禁止できないため、別の公開ポリシー検査も必要です。

                                                              +
                                                            4. +
                                                            5. +

                                                              R3 — P2: 約束した Trivy の検査がない。 docs/spec/03_security_gate.md:234,458 は全 PR で gitleaks・Semgrep・Trivy を要求しますが、.github/workflows/security.yml:11–59 に Trivy ジョブはありません。実装するか M1 の提供範囲を明示してください。初回 Semgrep の77件の失敗は、レビュー中の 1a01c3b で action SHA 固定と生成物・旧サンプルの理由付き除外により解消し、最新ジョブは合格しています。初回失敗は未解決指摘ではありません。所有者は記録された旧資料の延期を明示的に受け入れる必要があります。

                                                              +
                                                            6. +
                                                            7. +

                                                              R4 — P2: manifest 検査が契約を実施しない。 tools/manifest_check.py:225–235 は JSON 検査と URL 検索のみで、validate_toon の呼び出しも JSON と TOON(短いデータ記法)の比較もありません。TOON 欠落、SHA・profile・repo・PR 番号の変更が合格します。122–146行の validate_component は必須4項目だけを検査し、SHA は存在するときだけ検査します。メモリ上の試験で不正 role と SHA のない upstream が無指摘、模擬 token も validate_no_secrets を通過しました。SPEC-01 MC-01–11/13 を実装するか、未実装項目を明示し同等と主張しないでください。現行データは一致しますが CI は一致を維持できません。補助ツールの終了1と将来 CLI の終了20は別契約として明示するか統一してください。

                                                              +
                                                            8. +
                                                            9. +

                                                              R5 — P2: ZAP が自分自身を検査する指定。 docs/spec/03_security_gate.md:98,322 は ZAP(稼働中の Web アプリを検査する道具)を内部ネットワークのコンテナで起動し、127.0.0.1:5000/8001/4200 を対象にします。そのループバックは ZAP 自身であり、web/admin/ember やホストではありません。docs/decisions/ADR-02_Network_Model.md:53–57,131–135 の内部サービス名とホスト側ループバックの分離に反します。ZAP には内部サービス名・コンテナ側ポートを指定し、SPEC-02 のホスト側表はブラウザとホスト側検査に使ってください。ポート付け替え時の動作も定めてください。

                                                              +
                                                            10. +
                                                            11. +

                                                              R6 — P2: 図1件・データ3件が構文不正。 サイトと同じ Mermaid 11.4.1(文字から図を作る記法)のパーサーで docs/spec/04_acceptance_tests.md:94 が失敗します。英語のシーケンス図の注のセミコロンが別の文として解釈されます。対応する記法に直し HTML を再生成してください。TOON 4.4.0 では docs/spec/02_installer_cli.md:133–134,138 の非引用カンマで終了コード表の列が増えて失敗します。docs/status/upstream/README.md:38–46,92–100 は11行の表を宣言しつつオブジェクト形式1件と省略記号を載せています。正しい1件の例か11件の表にしてください。MkDocs strict はこれらの内部言語を構文解析しないため見逃します。日本語の SPEC-04 図は解析でき、英和の表示が異なります。

                                                              +
                                                            12. +
                                                            13. +

                                                              R7 — P2: docs チェッカーが範囲と約束した検査を省略。 tools/docs_check.py:18–43 は docs/ とルート README だけを検査し旧資料を除外します。manifest/README.md、installer README、旧パスの誘導は SPEC-06 検査の対象外です。96–98行は # を含むリンクを丸ごと無視し、ファイル自体がない absent-file.md#english も無指摘です。123–126行には docs/spec/06_documentation_conventions.md:87–95 が約束する TOON 一致検査・用語注警告もありません。フラグメントより前のファイルを検査し、新しい Markdown 全体を対象にして、旧資料の形式例外は規約にも明記してください。35件合格は部分検査にすぎません。

                                                              +
                                                            14. +
                                                            15. +

                                                              R8 — P2: M2 受入基準と profile が矛盾。 docs/spec/04_acceptance_tests.md:54,59,122 は C4 に y_websocket を要求し、core ではスキップを認めながら、M2 では C1–C6 の成功・拒否ケース全合格を要求します。docs/spec/02_installer_cli.md:96–99 はそのサービスを full に置き、manifest も一致します。M2 に当該サービスを含めるか C4 を M3 に延期するかを決め、両言語を修正してください。スキップを節目完了と誤認するおそれがあります。

                                                              +
                                                            16. +
                                                            +

                                                            確認したこと

                                                            +

                                                            すべてリポジトリルートで実行しました。次の読み取り検査は終了0で、後者は初回35ファイル、並行した assets 索引追加と本レビュー追加後は37ファイル合格でした。

                                                            +
                                                            python3 tools/manifest_check.py
                                                            +python3 tools/docs_check.py
                                                            +
                                                            +

                                                            指定の差分は506ファイル、追加246,242行、削除3,246行でした。

                                                            +
                                                            git diff develop...feat/m1-skeleton --stat
                                                            +
                                                            +
                                                              +
                                                            • サイト HTML・検索 JSON・旧 Markdown・隠し workflow・manifest を含む追跡対象テキスト全体を検索し、R1 の禁止 URL 4件を確認しました。token 形式・秘密鍵の検索では追加の該当認証情報は見つかりませんでした。旧 JWT/JWE/test-token の既定値と guest の接続情報は存在しますが、引き継いだ例であり生きた認証情報とは確認していません。EC2 旧資料364/372行と HTML/検索コピーに明らかな仮値形式の内部ホスト名があります。組織サポートアドレスや試験メールを個人情報漏洩の証拠とは扱いません。特に R2 があるため完全な秘密クリアランスは主張しません。
                                                            • +
                                                            • new-token.png、dev-application.png、filled-credential.png を目視確認しました。最初は未発行画面、後二つの機微な値はぼかしまたはパスワード伏字です。他の画像は網羅的に見ていません。文字検索では画素を検査できません。
                                                            • +
                                                            • GitHub の実行で docs リンク・MkDocs strict・manifest は合格、gitleaks は R2 の制限付きで終了0、Semgrep は初回失敗しましたが最新 head では5検査すべて合格です(R3 は残る検査範囲の不一致です)。成功ジョブから、YAML・action バージョン・Python 3.11・固定 MkDocs 依存は hosted runner で利用可能と確認できます。gitleaks の Docker 呼び出しと Semgrep コンテナは起動しています。ローカル Docker daemon は利用できず再実行していません。
                                                            • +
                                                            • 追跡 Markdown の Mermaid 34件・TOON 44件を Mermaid 11.4.1、DOM shim(パーサー用にブラウザのオブジェクトを用意する仕組み)、@toon-format/toon 4.4.0 で独立解析しました。依存はリポジトリ外の一時ディレクトリに置きました。合格は Mermaid 33/34、TOON 41/44。manifest の TOON は解析でき、上流全項目と採用 PR を含む規定の抄録が JSON と意味的に一致しました。未実装 CLI の生成結果とのバイト単位一致は証明していません。
                                                            • +
                                                            • JSON の必須部品項目、role、profile、コアの platform、SHA 形式、サービス名、追跡名規則を確認しました。部品20、統合リポジトリ11、採用 PR 8、候補25で PR 本文と一致します。指定の認証付きブランチ照会で RDM-osf.io-dev2027 は develop、integrate/public-develop-20261105、upstream/public-develop、upstream/private-develop、upstream/cos-develop、upstream/private-sec-test-fix-sec-test を返しました。必須追跡4本は SPEC-01 規則7と一致します。到達性と11リポジトリすべての作成・ミラーは独立監査していません。
                                                            • +
                                                            • SPEC-01〜05 と ADR-02、REF-01 を比較しました。ホスト側既定7ポート、終了20/40/50〜53/60、主要サブコマンド名は仕様間で一致します。R5/R8 は数値が一致していても動作が矛盾する点です。旧ガイドは歴史資料であり現行導入手順ではありません。
                                                            • +
                                                            • 英和の主要節は概ね対応し、中心用語には初出説明がありますが、全専門語の SPEC-06 準拠までは確認できていません。上流11本の調査(SPEC-05:8)と新入社員の行動(REF-01:8)の Learned は PR 内に根拠リンクがなく、未検証です。捏造と断定はしません。証拠を添えるか設計理由として記述してください。確認した規範文書に混在言語による文字の破損は見つかりませんでした。
                                                            • +
                                                            • 主張される規範文書・ガイド誘導・コミット済み site・依存ファイル・workflow 2本は存在します。M2 のインストーラー・受入実装は M1 の提供物とは主張されていません。初回統合順の例外は ADR-01 §5 で提案中と明記されています。コミットメッセージと PR 本文には Claude セッションリンクがあり、公開状態や内容は調べていません。
                                                            • +
                                                            +

                                                            所有者が決めること

                                                            +

                                                            マージ前に R1〜R8 を解消してください。M1 の Semgrep/Trivy の合否範囲、M2 の C4 の範囲、ADR-01 §5 の初回構築解釈を決める必要があります。Claude セッションリンクの共有状態を確認し、公開メタデータに残すか判断してください。セッション内容は転載していません。初回構築の例外を認める場合は SPEC-01 と関連記録へ反映し、承認済みと黙って扱わないでください。実証を述べる Learned には根拠を添えるか表現を直してください。作者の修正後は site/ を再生成し、構文解析と hosted CI を再実行してください。

                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            PRA change proposed for review and merging.レビューと統合を求める変更提案。
                                                            CIChecks run automatically when code changes.変更時に自動実行する検査。
                                                            SHAA fingerprint identifying a Git commit.Git の変更記録を識別する指紋。
                                                            TOONA compact way to write structured data as text.構造を持つデータを短い文字で書く形式。
                                                            MermaidText that a renderer turns into a diagram.描画処理が図に変える文字の記法。
                                                            LoopbackAn address pointing back to the same host or container.自分自身のホストまたはコンテナを指す番地。
                                                            AllowlistExplicit exceptions to a check.検査から除外すると明示した例外。
                                                            ParserA program that checks and reads a notation's structure.記法の構造を検査して読み取るプログラム。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/index.html b/site/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/index.html new file mode 100644 index 0000000..c7a27f5 --- /dev/null +++ b/site/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/index.html @@ -0,0 +1,3030 @@ + + + + + + + + + + + + + + + + + + + + + + + REV M1 Skeleton PR Review r2 / M1 文書骨格 PR 再レビュー r2 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            REV M1 Skeleton PR Review r2 / M1 文書骨格 PR 再レビュー r2

                                                            +
                                                            +

                                                            Summary: Request changes on PR #19 at bf320ed. Most r1 corrections are verified, but the publication-policy scan skips published files and the manifest validator accepts invalid types or crashes on malformed input. +概要: PR #19 の bf320ed は修正要求。r1 の修正は大半を確認しましたが、公開ポリシー検査の公開ファイル除外と、manifest 検査の不正型受理・例外終了が残っています。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: green regression tests and workflows can coexist with an uncovered policy path and malformed-input failures; independent rejection cases exposed both. / 回帰試験と workflow が合格しても、方針検査の対象漏れと不正入力処理の不具合は残り得る。独立した拒否ケースで両方を確認した。
                                                            • +
                                                            • Applies to: PR #19, feat/m1-skeleton → develop, head bf320ede99936ee4987356b0b3fece1cb8844cda.
                                                            • +
                                                            • Related: Review index · r1 · SPEC-01 · SPEC-06.
                                                            • +
                                                            • Used by: the owner's merge decision and the author's next correction.
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            Verdict

                                                            +

                                                            Request changes. A PR (pull request) is a proposed change awaiting review. This is a recommendation, not a GitHub approval. CI (continuous integration) means automated checks; all current workflows pass, but the rejection cases below do not. P1 blocks merge for ineffective publication protection; P2 is a correctness defect; P3 is a documentation correction. Terms are also explained in the shared glossary.

                                                            +

                                                            Remaining findings

                                                            +
                                                              +
                                                            1. +

                                                              R2-01 — P1: the private-URL policy excludes published material. tools/manifest_check.py:566–575,603–612 excludes all site/, *.legacy.md, and nested legacy sample files, then filters remaining files by suffix. The workflow at .github/workflows/security.yml:110–113 describes an all-tracked-files policy. Temporary-directory tests placed the same synthetic prohibited address in site/index.html, docs/guides/api/README.legacy.md, and docs/guides/api/addon/x.py: run_policy_scan(root, [path]) returned zero findings for each; the control docs/README.md returned one. A formatting or Semgrep legacy exception must not become an exception to public disclosure rules. Gitleaks default secret rules do not enforce private-repository URL policy. Remove these path exemptions from the publication-policy scan and inspect every tracked readable text file, including generated HTML/search data and legacy sources. Add positive detection tests for each previously excluded category. The independent full-tree scan found no current matching address/token; this finding concerns the ineffective gate, not a new demonstrated leak.

                                                              +
                                                            2. +
                                                            3. +

                                                              R2-02 — P2: schema validation accepts invalid types and breaks its exit-code contract. tools/manifest_check.py:169–170 compares schema_version with 1 without requiring an integer distinct from boolean; 232–234 checks only the keys of target_image, not their values. Against temporary copies of the real JSON and unchanged TOON, --manifest-only returned 0 for schema_version: true, and separately for target_image.M4: true. Both violate SPEC-01's types. Also components: "bad" returned 1 with AttributeError, and a component role: [] returned 1 with TypeError; invalid manifests must produce findings and exit 20. Evidence: unguarded set membership at 204, followed by unconditional TOON comparison at 629–631 and projection of unvalidated objects at 491–500. Validate scalar and container types before set membership/projection, reject boolean schema versions, validate target-image values, and stop dependent checks when structural validation fails. Add subprocess tests asserting exit 20 with no traceback for malformed JSON shapes. Existing valid-file/TOON checks are substantially improved, but r1 R4 is only partially resolved.

                                                              +
                                                            4. +
                                                            5. +

                                                              R2-03 — P3: the documented fragment-check behavior is stale. docs/spec/06_documentation_conventions.md:96,185 says fragments are not verified, while tools/docs_check.py:212–249 verifies both same-file and Markdown-target anchors. Update both languages to describe the behavior actually implemented. The implementation is useful; weakening it is unnecessary.

                                                              +
                                                            6. +
                                                            +

                                                            Disposition of r1 findings

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            r1ResultEvidence / remaining scope
                                                            R1 private URLs in examplesResolved for current treemanifest/README.md uses prose; full tracked-text scan without exclusions found zero policy matches.
                                                            R2 gitleaks rules disabledResolved[extend] useDefault = true; four whole-line patterns with regexTarget = "line"; no path exemption. Hosted scan reports 70 commits and no leaks. Author reports a synthetic-secret rejection; I did not independently rerun that container test.
                                                            R3 missing TrivyResolvedSHA-pinned filesystem scan and report artifact are present; M1 report-only scope is explicit in SPEC-03. Both Trivy steps and artifact upload succeed.
                                                            R4 manifest validationPartially resolvedRequired fields, TOON comparison and failure modes are implemented; R2-01 and R2-02 remain.
                                                            R5 ZAP loopbackResolved at specification levelSPEC-03 uses Compose service names and container ports, separates host remapping, and updates both languages/diagrams. No running installer is delivered at M1, so runtime connectivity was not tested.
                                                            R6 Mermaid/TOON syntaxResolvedAll 34 Mermaid blocks and 44 TOON blocks parse independently.
                                                            R7 docs-check scopeSubstantially resolvedAll tracked Markdown is classified; legacy/pointer exceptions and the present SHA-only excerpt check are explicit; missing file plus fragment is checked; glossary warnings exist. R2-03 is the remaining wording correction.
                                                            R8 C4/M2/core conflictResolvedy_websocket belongs to core in SPEC-00/02 and manifest JSON/TOON; SPEC-04 requires C4 in both core/full without skipping.
                                                            +

                                                            TOON is a compact notation for structured data; Mermaid is a notation that turns text into diagrams. The documentation excerpt check intentionally tests SHA membership only, as now disclosed in SPEC-06; it does not prove arbitrary excerpt-field equality. The manifest's standalone TOON comparison checks its prescribed fields.

                                                            +

                                                            Verification and limits

                                                            +

                                                            From the repository root, these checks succeeded:

                                                            +
                                                            python3 tools/manifest_check.py
                                                            +python3 tools/docs_check.py
                                                            +python3 -m unittest discover -s tools/tests -v
                                                            +
                                                            +

                                                            The documentation checker reported 45 checked files, 8 exempt files and 111 nonblocking glossary warnings. All 46 unit tests passed. The new untracked r2 file was separately checked directly through the checker API; it is not included in the tracked-file counts.

                                                            +

                                                            The independent parser harness from r1, outside the repository, used Mermaid 11.4.1 and TOON 4.4.0. All 34/44 blocks parsed; the JSON projection and standalone TOON were semantically equal. Negative cases used temporary files only and left the tracked source unchanged. The correction commit changes 69 files, with 5,755 insertions and 523 deletions relative to 1a01c3b.

                                                            +

                                                            The authenticated GitHub connector confirmed the same PR head and successful documentation workflow and security workflow, including all four security jobs. The gitleaks log confirms the Docker invocation scans 70 commits. Local gh could not reach the API in this session, so connected GitHub tools supplied remote evidence. Posting the review comment was attempted once but rejected because the tool requires approval while this session uses approval policy never; no r2 comment was posted. No new independent audit of all private integration repositories, image pixels, or deployed installer behavior was performed.

                                                            +

                                                            Owner decisions

                                                            +

                                                            Fix R2-01/R2-02 before merge and update R2-03 in both languages. The earlier owner decisions remain: ADR-01 §5 bootstrap interpretation, public retention of the Claude session link, and acceptance of the documented legacy Semgrep deferral. The new core definition resolves the C4 ambiguity; retain that scope explicitly. M1 Trivy findings are reports, not a claim that vulnerabilities are absent. Regenerate site/ after documentation changes and rerun rejection tests and CI.

                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            判定

                                                            +

                                                            Request changes(修正要求)。 PR(プルリクエスト)はレビューを待つ変更提案です。この判定は推奨であり GitHub の承認ではありません。CI(継続的インテグレーション)は変更を自動検査する仕組みです。現行 workflow は合格していますが、次の拒否ケースが不正です。P1 は公開保護が無効になるマージ阻害事項、P2 は正しさの不具合、P3 は文書の修正です。共通用語集も参照してください。

                                                            +

                                                            残る指摘

                                                            +
                                                              +
                                                            1. +

                                                              R2-01 — P1: 非公開 URL の方針検査が公開物を除外。 tools/manifest_check.py:566–575,603–612 は site/ 全体、*.legacy.md、旧サンプルの下位ファイルを除外し、残りも拡張子で絞ります。.github/workflows/security.yml:110–113 は全追跡ファイルを対象と説明しています。一時ディレクトリで同じ模擬禁止アドレスを site/index.html、docs/guides/api/README.legacy.md、docs/guides/api/addon/x.py に置き、run_policy_scan(root, [path]) が各0件、対照の docs/README.md は1件と再現しました。旧資料の形式・Semgrep 例外を公開禁止事項の例外にしてはいけません。gitleaks の既定秘密規則は非公開リポジトリ URL の公開方針を検査しません。公開方針検査のパス除外をなくし、生成 HTML・検索データ・旧資料も含め、追跡された読み取り可能なテキスト全体を対象にしてください。各除外カテゴリで検出する試験を追加してください。除外なしの独立検索では現在の該当アドレス・token は0件でした。新たな漏洩の実証ではなく、検査が漏洩を拒否できない指摘です。

                                                              +
                                                            2. +
                                                            3. +

                                                              R2-02 — P2: 不正な型を受理し、終了コード契約も破る。 tools/manifest_check.py:169–170 は schema_version を 1 と比較するだけで真偽値を整数から区別せず、232–234 は target_image のキーだけを見て値の型を検査しません。現行 JSON の一時コピーと変更していない TOON で、schema_version: true と、別ケースの target_image.M4: true がいずれも --manifest-only で 終了0 になりました。ともに SPEC-01 の型に反します。また components: "bad" は AttributeError、部品の role: [] は TypeError で 終了1 になります。不正 manifest は指摘を出し 終了20 にする契約です。根拠は204行の型未確認の集合所属判定、629–631行の無条件 TOON 比較、491–500行の未検証オブジェクトからの抄録生成です。集合判定・抄録生成の前に型を検査し、真偽値の schema version を拒否し、target-image の値も検証し、構造不正時には依存する検査を止めてください。不正な JSON 構造で traceback なし・終了20を確かめるサブプロセス試験が必要です。正常ファイル・TOON 検査は大幅に改善しましたが r1 R4 は一部未解決です。

                                                              +
                                                            4. +
                                                            5. +

                                                              R2-03 — P3: フラグメント検査の説明が古い。 docs/spec/06_documentation_conventions.md:96,185 はフラグメントを検査しないと説明しますが、tools/docs_check.py:212–249 は同一ファイル・リンク先 Markdown のアンカーを検査しています。両言語を実装に合わせて更新してください。実装は有用なので弱める必要はありません。

                                                              +
                                                            6. +
                                                            +

                                                            r1 各指摘の扱い

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            r1結果根拠・残る範囲
                                                            R1 禁止例の private URL現在のツリーでは解消manifest/README.md は散文化。除外なしの追跡テキスト検索で方針該当0件。
                                                            R2 gitleaks 無効解消[extend] useDefault = true、行全体に限定した4パターンと regexTarget = "line"、パス除外なし。hosted 検査は70コミットで検出なし。作者は模擬秘密の拒否も報告していますが、そのコンテナ試験は独立再実行していません。
                                                            R3 Trivy 欠落解消SHA 固定の filesystem 検査と報告 artifact があり、SPEC-03 に M1 報告のみの範囲を明示。Trivy の2ステップと artifact アップロードが成功。
                                                            R4 manifest 検査一部解消必須項目、TOON 比較、拒否処理は実装。R2-01/R2-02 が残る。
                                                            R5 ZAP loopback仕様上解消SPEC-03 は Compose サービス名・コンテナ側ポートを使用し、ホストの付け替えと分離。英和と図を更新。M1 は稼働インストーラーを提供しないため実接続は未検証。
                                                            R6 Mermaid/TOON 構文解消Mermaid 34件・TOON 44件が独立解析ですべて合格。
                                                            R7 docs-check 範囲大半を解消全追跡 Markdown を分類し、旧資料・誘導の例外と現段階の SHA 限定抄録検査を明記。file#fragment の欠落ファイルを検査し、用語警告もある。説明修正 R2-03 が残る。
                                                            R8 C4/M2/core 矛盾解消SPEC-00/02 と manifest JSON/TOON が y_websocket を core に配置。SPEC-04 は core/full 双方で C4 必須・スキップなし。
                                                            +

                                                            TOON は構造を持つデータの短い記法、Mermaid は文字から図を作る記法です。文書の抄録検査は SPEC-06 に明示されたとおり SHA の存在確認のみであり、任意の項目の一致を証明するものではありません。manifest の独立した TOON 比較では規定された項目を比較します。

                                                            +

                                                            検証と限界

                                                            +

                                                            リポジトリルートで次の検査が成功しました。

                                                            +
                                                            python3 tools/manifest_check.py
                                                            +python3 tools/docs_check.py
                                                            +python3 -m unittest discover -s tools/tests -v
                                                            +
                                                            +

                                                            文書検査は45ファイル検査、8ファイル例外、合否を左右しない用語警告111件でした。単体試験46件はすべて合格です。未追跡の新規 r2 文書はチェッカー API で別途直接確認し、追跡ファイル件数には含まれません。

                                                            +

                                                            r1 で用意したリポジトリ外の独立パーサーは Mermaid 11.4.1 と TOON 4.4.0 を使用しました。34/44ブロックすべてが解析でき、JSON の規定抄録と独立 TOON は意味的に一致しました。拒否ケースは一時ファイルのみで行い、追跡ソースを変更していません。修正コミットは 1a01c3b 比で69ファイル、追加5,755行、削除523行です。

                                                            +

                                                            認証済み GitHub コネクターで PR の同一 head と、docs workflow・security workflow の成功を確認し、security の4ジョブもすべて成功しています。gitleaks ログは Docker 呼び出しと70コミットの検査を確認できます。このセッションのローカル gh は API に接続できなかったため、接続済み GitHub ツールでリモート情報を確認しました。コメント投稿は1回試みましたが、ツールが承認を要求し、このセッションは approval policy が never のため拒否されました。r2 コメントは未投稿です。非公開統合リポジトリ全体、画像の画素、導入済みインストーラーの動作について新しい独立監査はしていません。

                                                            +

                                                            所有者の判断事項

                                                            +

                                                            マージ前に R2-01/R2-02 を修正し、R2-03 を両言語で直してください。従来の所有者判断事項である ADR-01 §5 の初回構築解釈、Claude セッションリンクの公開保持、旧資料の Semgrep 延期承認は残ります。新しい core 定義で C4 の曖昧さは解消したため、この範囲を明示的に維持してください。M1 の Trivy は報告であり、脆弱性ゼロの宣言ではありません。文書修正後は site/ を再生成し、拒否ケースと CI を再実行してください。

                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            PRA change proposed for review and merging.レビューと統合を求める変更提案。
                                                            CIAutomated checks of changes.変更に対する自動検査。
                                                            SchemaThe permitted fields and value types of data.データに許す項目と値の型。
                                                            TOONA compact text notation for structured data.構造を持つデータを短く書く文字形式。
                                                            MermaidText notation rendered as diagrams.図として描画する文字の記法。
                                                            SHAA fingerprint identifying one commit.一つのコミットを指す指紋。
                                                            Exit codeA number returned when a program finishes.プログラムが終了時に返す数。
                                                            Fragment / anchorA link suffix and its destination within a page.ページ内の場所を指すリンク末尾と、その行き先。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/index.html b/site/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/index.html new file mode 100644 index 0000000..6867d13 --- /dev/null +++ b/site/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/index.html @@ -0,0 +1,3027 @@ + + + + + + + + + + + + + + + + + + + + + + + REV M1 Skeleton PR Review r3 / REV(担当レビュワ)M1 文書骨格 PR 再レビュー r3 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            REV M1 Skeleton PR Review r3 / REV(担当レビュワ)M1 文書骨格 PR 再レビュー r3

                                                            +
                                                            +

                                                            Summary: Approve recommendation for PR (pull request: a proposed change) #19 at 413520e. All three r2 findings are resolved; no regression was found in the r1 corrections within the checks recorded here. +概要: PR(プルリクエスト: 変更提案)#19 の 413520e は approve 推奨。r2 の3件は解消し、記録した検査の範囲では r1 修正の回帰も見つかりませんでした。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: replaying the earlier failing inputs confirms both rejection and safe reporting; a passing normal-input check alone cannot establish either. / 過去に失敗した入力の再実行で、拒否と安全な報告の両方を確かめられた。正常入力の合格だけでは両方を保証できない。
                                                            • +
                                                            • Applies to: PR #19, feat/m1-skeleton → develop, head 413520e20a98862d7eb5b203bdda1900d49019ac.
                                                            • +
                                                            • Related: Review index · r1 · r2 · SPEC-01 · SPEC-06.
                                                            • +
                                                            • Used by: the owner's integration decision under ADR-01 §5.
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            Verdict

                                                            +

                                                            Approve. No remaining technical findings from r2 and no newly identified regression in r1 fixes. This is an independent review recommendation, not a GitHub approval or merge. The three owner decisions remain open. CI (continuous integration: automatic checks of changes) passes on the exact reviewed head. See the shared glossary for background terms.

                                                            +

                                                            Resolution of r2 findings

                                                            +
                                                              +
                                                            1. +

                                                              R2-01 resolved. scan_policy in tools/manifest_check.py scans tracked files without path or extension exclusions. An independent temporary copy detected a runtime-built prohibited address on line 2 in each of seven paths: site/index.html, site/search/search_index.json, docs/guides/api/README.legacy.md, docs/guides/api/addon/x.py, docs/README.md, Dockerfile, and assets/data.unknownext. Each direct call returned one finding; the temporary Git repository's command-line policy check rejected the files with exit code (the completion status number) 1. Neither output included the matched address. The real tree reports 451 scanned, 62 skipped as non-UTF-8 (not readable in the expected text encoding), zero over 5 MB, and zero findings. Binary/size skip accounting and detection in former exclusions are covered by tests. Source inspection also shows unreadable files are recorded as skipped; this is a technical read limitation, not a path exemption. The scan does not inspect image pixels.

                                                              +
                                                            2. +
                                                            3. +

                                                              R2-02 resolved. STRUCT_TOP, STRUCT_COMPONENT, STRUCT_UPSTREAM, and STRUCT_PR declare field types; validate_structure runs before value comparisons and TOON (a compact text form of structured data) projection. Integer validation explicitly excludes booleans. The independent copy used the real JSON (structured data written as named fields), with the real TOON unchanged. Each original rejection case—schema_version: true, target_image.M4: true, components: "bad", and component role: []—now reports the relevant MC (manifest-check rule) finding, exits 20, and produces no traceback (an internal error stack). The unchanged copy exits 0. Structural failures do not attempt MC-11 comparison. Added subprocess tests in tools/tests/test_manifest_check.py assert these outcomes and additional malformed shapes; all pass.

                                                              +
                                                            4. +
                                                            5. +

                                                              R2-03 resolved. SPEC-06 §8 version 0.3 now describes file and fragment checking in both languages. The implementation checks same-file anchors (page bookmarks) and anchors/headings in Markdown targets. Independent negative checks reject a missing file with fragment, a missing same-file anchor, and a missing anchor in an existing Markdown file; an existing #english target passes. tools/docs_check.py is unchanged from r2.

                                                              +
                                                            6. +
                                                            +

                                                            Regression check of r1 fixes

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            r1 findingr3 evidence and disposition
                                                            R1 published private addressesResolved: real-tree policy scan has zero findings, and old excluded locations now reject synthetic cases.
                                                            R2 disabled gitleaksResolved: unchanged [extend] useDefault = true, four whole-line exceptions, no path exception; hosted secret scan passes. gitleaks is the secret-detection tool. Its synthetic-secret container test was not independently rerun in r3.
                                                            R3 missing TrivyResolved: unchanged pinned filesystem job and report artifact, with explicit M1 report-only scope; hosted job passes. Trivy is the vulnerability/configuration scanner; a green report-only job does not mean zero vulnerabilities.
                                                            R4 incomplete manifest validationResolved for the reviewed defects: 66 checker tests pass, normal JSON/TOON comparison passes, and original malformed-input cases now reject correctly.
                                                            R5 ZAP scans itselfStill resolved in both language specifications: ZAP (the running-web-application scanner) uses service names and internal ports; host port remapping does not change those targets. Specification unchanged since r2; no deployed installer test was performed.
                                                            R6 malformed diagram/data blocksAll 34 Mermaid (text-defined diagram) blocks reparse successfully using the existing Mermaid 11.4.1 harness. All 34 Mermaid and 44 TOON blocks are unchanged from r2; the 44 TOON blocks retain r2's independent parse evidence rather than a new external-parser run.
                                                            R7 documentation checker gapsResolved within the disclosed M1 scope: checker tests pass, fragment rejection was independently reproduced, and explicit legacy-format exceptions and SHA-only excerpt checking remain documented. SHA is a revision fingerprint; excerpt checking does not prove equality of arbitrary fields.
                                                            R8 C4/core/M2 conflictStill resolved: unchanged JSON/TOON and SPEC-00/02/04 place y_websocket in core and require C4 in both core/full without skipping.
                                                            +

                                                            Reproduction and CI evidence

                                                            +

                                                            Run these commands from the repository root; all returned 0:

                                                            +
                                                            python3 tools/manifest_check.py
                                                            +python3 tools/docs_check.py
                                                            +python3 -m unittest discover -s tools/tests -v
                                                            +gh pr checks 19 -R RCOSDP/RDM-developer-guide
                                                            +
                                                            +

                                                            The unit suite reports 66 tests passed. Documentation checking reports 46 checked files, 8 exempt files, and 116 nonblocking glossary warnings before adding this untracked review. The new review is checked separately through check_file; tracked-file enumeration does not include it yet.

                                                            +

                                                            The independent negative cases ran only in scratchpad/rev-r3-toxvm83j/ under the task's designated temporary directory. The checker and real manifest files were copied there; synthetic addresses were assembled at runtime and never written to this repository. The four original type mutations were tested separately with unchanged TOON. No production file was mutated for rejection tests.

                                                            +

                                                            Using only gh, PR (pull request: a proposed change) metadata and both run records confirmed head 413520e20a98862d7eb5b203bdda1900d49019ac. All six checks pass: MkDocs (the documentation-to-website tool) site build, links, manifest/policy, gitleaks, Semgrep (source-code pattern checking), and Trivy. Both the documentation run and security run conclude success. The generated SPEC-06 site page changed along with its source. This review does not newly audit private integration repositories, session-link contents, all image pixels, or deployed installer behavior.

                                                            +

                                                            Remaining owner decisions

                                                            +
                                                              +
                                                            • ADR-01 §5 bootstrap interpretation: the initial integration-order interpretation remains explicitly proposed and awaiting the owner. This recommendation does not approve that exception; record the owner's decision and align affected normative records if accepted.
                                                            • +
                                                            • Claude-Session link retention: decide whether to retain the session link in public metadata after checking sharing visibility. The link's contents were not inspected or republished.
                                                            • +
                                                            • Legacy Semgrep deferral: explicitly accept or reject the documented M2/M3 deferral of historical sample-code findings. Publication-policy scanning now covers those paths even while Semgrep exceptions remain.
                                                            • +
                                                            +

                                                            No code correction is requested by r3. The coordinator still needs to integrate this review record and handle the owner decisions; no commit, push, approval, or merge was performed by this reviewer.

                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            判定

                                                            +

                                                            Approve。r2 の技術的指摘は残っておらず、r1 修正に新しい回帰も見つかりませんでした。 独立レビューの推奨であり、GitHub の承認やマージ操作ではありません。所有者の判断3点は未決です。CI(変更を自動検査する仕組み)は、確認対象と同じ head で合格しています。背景用語は共通用語集も参照してください。

                                                            +

                                                            r2 指摘の解消確認

                                                            +
                                                              +
                                                            1. +

                                                              R2-01 解消。 tools/manifest_check.py の scan_policy はパス・拡張子の除外なく追跡ファイルを検査します。独立した一時コピーで、実行時に組み立てた禁止アドレスを7種類のパスの2行目に配置しました。対象は site/index.html、site/search/search_index.json、docs/guides/api/README.legacy.md、docs/guides/api/addon/x.py、docs/README.md、Dockerfile、assets/data.unknownext です。直接呼出しは各1件を検出し、一時 Git リポジトリのコマンドライン検査も終了コード(処理結果を表す数)1で拒否しました。出力に一致アドレスはありません。実ツリーは451ファイル検査、UTF-8(想定する文字の符号化方式)で読めない62ファイルをスキップ、5 MB超は0件、検出0件でした。旧除外領域の検出とバイナリ・サイズ別の集計は試験でも確認しました。コード上は読取不能もスキップとして記録します。これは読取の技術的限界であり、パス例外ではありません。画像の画素は検査しません。

                                                              +
                                                            2. +
                                                            3. +

                                                              R2-02 解消。 STRUCT_TOP、STRUCT_COMPONENT、STRUCT_UPSTREAM、STRUCT_PR が項目の型を宣言し、validate_structure が値の比較と TOON(構造化データを短く表す文字形式)の抄録生成に先行します。整数判定は真偽値を明示的に除きます。独立コピーでは実際の JSON(名前付き項目で書く構造化データ)を使用し、TOON は変更していません。元の4ケース schema_version: true、target_image.M4: true、components: "bad"、部品の role: [] はすべて対応する MC(manifest 検査規則)の指摘を出し、終了20、traceback(内部エラーの呼出し履歴)なしでした。無変更コピーは終了0です。構造不正時は MC-11 比較を実行しません。tools/tests/test_manifest_check.py に追加された子プロセス試験もこれらと追加の不正構造を検査し、すべて合格しました。

                                                              +
                                                            4. +
                                                            5. +

                                                              R2-03 解消。 SPEC-06 §8 の版0.3は、両言語ともファイルとフラグメントの検査を説明しています。実装は同一ファイルのアンカー(ページ内のしおり)とリンク先 Markdown のアンカー・見出しを検査します。独立試験で、存在しないファイルにフラグメントを付けたリンク、同一ファイルの欠落アンカー、存在する Markdown 内の欠落アンカーを拒否し、存在する #english は合格しました。tools/docs_check.py は r2 から変更されていません。

                                                              +
                                                            6. +
                                                            +

                                                            r1 修正の回帰確認

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            r1 指摘r3 の根拠と扱い
                                                            R1 非公開アドレス掲載解消。実ツリーの方針検出0件。旧除外領域の模擬ケースも拒否。
                                                            R2 gitleaks 無効解消。[extend] useDefault = true、行全体に限定した4例外、パス例外なしを維持し、hosted 検査も合格。gitleaks は秘密検出ツール。模擬秘密のコンテナ試験は r3 で独立再実行していません。
                                                            R3 Trivy 欠落解消。版固定のファイルシステム検査・報告保存と M1 報告のみの範囲は不変で、hosted 検査も合格。Trivy は脆弱性・設定の検査ツールで、報告のみの合格は脆弱性ゼロを意味しません。
                                                            R4 manifest 検査不足レビュー対象の不具合は解消。66試験と正常 JSON/TOON 比較が合格し、元の不正型を正しく拒否。
                                                            R5 ZAP が自身を検査英和仕様上の解消を維持。ZAP(稼働中の Web アプリを検査するツール)はサービス名・内部ポートを使用し、ホスト側ポート変更で対象は変わりません。仕様は r2 から不変。導入済みインストーラーは未検証。
                                                            R6 図・データの構文既存 Mermaid 11.4.1 検証器で Mermaid(文字で図を定義する記法)34ブロックが再解析に合格。Mermaid 34件と TOON 44件はすべて r2 と同一。TOON は外部解析器の新規実行ではなく、r2 の独立解析の根拠を引き継ぎます。
                                                            R7 文書検査の不足明示された M1 範囲では解消。試験合格とフラグメント拒否の独立再現を確認。旧形式の例外と SHA 限定の抄録検査は明記を維持。SHA は版を識別する指紋で、抄録の任意項目の同一性は保証しません。
                                                            R8 C4/core/M2 矛盾解消を維持。JSON/TOON と SPEC-00/02/04 は不変で、y_websocket を core に含め、core/full とも C4 必須・スキップなし。
                                                            +

                                                            再現と CI の根拠

                                                            +

                                                            リポジトリルートで次を実行し、すべて終了0でした。

                                                            +
                                                            python3 tools/manifest_check.py
                                                            +python3 tools/docs_check.py
                                                            +python3 -m unittest discover -s tools/tests -v
                                                            +gh pr checks 19 -R RCOSDP/RDM-developer-guide
                                                            +
                                                            +

                                                            単体試験は 66件合格。新規の未追跡 r3 記録を追加する前の文書検査は 46ファイル検査、8例外、合否を左右しない用語警告116件 でした。新規記録は check_file で別途検査し、まだ追跡ファイル件数には含めていません。

                                                            +

                                                            独立した拒否試験は、指定一時ディレクトリ配下の scratchpad/rev-r3-toxvm83j/ のみで行いました。検査プログラムと実 manifest をコピーし、模擬禁止アドレスは実行時に組み立て、このリポジトリには一切書いていません。元の型不正4件は、TOON 無変更で個別に試験しました。拒否試験のために本体ファイルを変更していません。

                                                            +

                                                            GitHub の確認には gh だけを使い、PR 情報と両 run が head 413520e20a98862d7eb5b203bdda1900d49019ac を指すと確認しました。MkDocs(文書を Web サイトにする道具)の構築、リンク、manifest/方針、gitleaks、Semgrep(ソースコードの危険な書き方の検査)、Trivy の6件すべてが合格です。docs run と security run はいずれも success でした。生成された SPEC-06 のサイトページも元文書とともに変更されています。非公開統合リポジトリ、セッションリンクの内容、画像全画素、導入済みインストーラーは新規監査していません。

                                                            +

                                                            所有者に残る判断

                                                            +
                                                              +
                                                            • ADR-01 §5 の初回構築解釈: 提案・所有者承認待ちのままです。この推奨で例外を承認したことにはなりません。所有者の決定を記録し、承認時は関連する規範記録を整合させてください。
                                                            • +
                                                            • Claude-Session リンク保持: 共有範囲を確認したうえで、公開メタデータに保持するか判断してください。リンクの内容は閲覧・再掲載していません。
                                                            • +
                                                            • 旧資料の Semgrep 延期: 歴史的サンプルの指摘を M2/M3 へ延期する記録について、明示的に承認または却下してください。Semgrep 例外が残る領域も、公開方針検査は対象に含めます。
                                                            • +
                                                            +

                                                            r3 はコード修正を要求しません。調整担当にはレビュー記録の取り込みと所有者判断の整理が残ります。レビュワはコミット、push、承認、マージを行っていません。

                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            PRA proposed change awaiting review.レビューを求める変更提案。
                                                            CIAutomatic checks of changes.変更の自動検査。
                                                            Exit codeThe number a program returns on completion.処理終了時に返す結果の数。
                                                            JSON / TOONText formats for structured data.構造化データを文字で書く形式。
                                                            MCA named manifest-validation rule.manifest 検査規則の識別子。
                                                            Anchor / fragmentA page bookmark and the link suffix naming it.ページ内のしおりと、その場所を指すリンク末尾。
                                                            SHAA revision fingerprint.版を識別する指紋。
                                                            TracebackAn internal error's call history.内部エラーの呼出し履歴。
                                                            BootstrapThe first construction before routine updates.通常更新を始める前の初回構築。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1/index.html b/site/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1/index.html new file mode 100644 index 0000000..36b5466 --- /dev/null +++ b/site/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1/index.html @@ -0,0 +1,2995 @@ + + + + + + + + + + + + + + + + + + + + + + + REV PR21 Installer review r1 / インストーラーレビュー r1 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            REV PR21 Installer review r1 / インストーラーレビュー r1

                                                            +
                                                            +

                                                            Summary: Independent review of PR #21 at 6985d0600c2a9dcec5c50331aebcb60fb4f23b13. Changes requested: security checks can pass unsafe states, generated settings fail their own baseline, and acceptance evidence is incomplete. +概要: PR #21 の 6985d0600c2a9dcec5c50331aebcb60fb4f23b13 を独立レビューした。安全でない状態を検査が合格させ、生成設定が自身の必須検査に落ち、受入証跡も不足するため修正を要求する。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            + +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            Verdict and method

                                                            +

                                                            Changes requested. P1 means a defect to fix before relying on the installer; P2 means a functional or contract defect requiring correction. A security gate is a check that decides whether the environment is safe enough to use. Docker (a tool for running separate application boxes) is the tool that runs applications in separate containers; Compose describes those containers together. Unit tests replace external programs with controlled responses and do not prove real container behavior.

                                                            +

                                                            Reviewed the PR (a proposed change) body and diff through gh, the specified rules, source, tests, templates, manifests (lists of selected versions), and the supplied upstream reference files. Ran the required checks and all 21 leaf command helps plus root help. Reproductions used temporary directories and injected runners; no real Docker build, startup, registry push, or attack was run. No product source was modified.

                                                            +

                                                            The remote head moved to 1caaaceb4d436db99a35aa159a7abd9586df6462 before publication. This review remains scoped to the requested 6985d06; it does not certify the newer revision. A final repository docs check passed on the changed tracked set (49 checked, 8 exempt, 121 warnings), superseding the local docs failure only for that changed workspace.

                                                            +

                                                            Ranked findings

                                                            +
                                                              +
                                                            1. +

                                                              P1 — Rotation does not replace live credentials. installer/grdm_dev/secrets.py:232,246 writes new values, then installer/grdm_dev/lifecycle.py:54 calls docker compose restart. Existing containers retain their original environment; the captured command confirms no recreation. Database initialization passwords also do not change passwords in an existing database. After a captured secret, the old credential therefore remains usable while .env claims a different value. Implement coordinated application/database rotation and recreation, with failure recovery and an old-credential rejection test (SPEC-03 §6).

                                                              +
                                                            2. +
                                                            3. +

                                                              P1 — Baseline validation both misses root and rejects the shipped configuration. installer/grdm_dev/scan.py:252-295 accepts any nonempty user, including 0:0; a synthetic root service with cap_drop: ALL and loopback ports returns no findings. It does not validate .env mode/defaults, resource limits, or network isolation. Conversely, rendering the actual core manifest and hardening exceptions produces five BASE-USER failures: postgres, elasticsearch, mongo, rabbitmq, unoconv. The validator never reads those exceptions. Reconcile the non-root rule with the approved exception contract, then test renderer output through the real baseline checker; the current install cannot reach a successful full gate even if startup succeeds.

                                                              +
                                                            4. +
                                                            5. +

                                                              P1 — Network health silently ignores listeners without visible process ownership. installer/grdm_dev/health.py:174-204 filters exclusively by Docker process name. On Linux, unprivileged ss -ltnp can show a root-owned wildcard listener without its process field. Feeding LISTEN 0 4096 0.0.0.0:5000 0.0.0.0:* yields no offending socket and no error. Correlate actual project port bindings through Docker inspection and fail closed when ownership cannot be established. Cover Docker Desktop on macOS and Linux without elevated privileges.

                                                              +
                                                            6. +
                                                            7. +

                                                              P1 — The red-team egress probe cannot establish isolation. installer/grdm_dev/redteam.py:24,90-99 probes example.invalid, which cannot resolve even on an unrestricted network, and labels wget failure as blocked. It runs a fresh Alpine container, not the attacker container whose other network attachments and routes matter. Checking the selected network's Internal flag does not close that gap. Verify the actual attacker network namespace against controlled reachable destinations, distinguishing probe failure from proven isolation; also validate the approval record's scope and owner rather than file existence alone (:114-119).

                                                              +
                                                            8. +
                                                            9. +

                                                              P1 — Scanner errors can become clean results and the scan omits infrastructure images. installer/grdm_dev/scan.py:398-407 accepts Semgrep (a source-code checker) JSON (structured machine-readable text) regardless of nonzero exit or its errors array; exit 2 with {"errors":[{"message":"failed"}],"results":[]} is reported as result: ok. :355-395 selects only locally tagged grdm-dev/ images, excluding postgres, Redis (a fast data store), Mongo and other images actually used by Compose; integration lockfiles are not explicitly scanned once local images exist. SBOM (a list of software parts) generation failures only add notes. Return 51 for incomplete scanners and enumerate all project images and required lockfiles (SPEC-03 §4); use all four required Semgrep packs, not only p/default.

                                                              +
                                                            10. +
                                                            11. +

                                                              P1 — Acceptance logs bypass secret masking. installer/grdm_dev/accept.py:307,318,320 prints seed/cleanup subprocess output and writes pytest output verbatim under docs/demo/runs/. Unlike scan.py and report_cmd.py, this path never applies .env masking. An injected synthetic secret in runner output was copied unchanged to pytest.log. Exceptions can include credentials, and traces can include session material. Sanitize output before persistence or display, restrict evidence permissions, and test the evidence paths with synthetic .env values; do not rely on later report bundling to clean already-written files.

                                                              +
                                                            12. +
                                                            13. +

                                                              P1 — Acceptance's network guard does not cover every request. installer/acceptance/conftest.py:136-156 installs only browser routing. Calls through context.request and independently created API request contexts (for example installer/acceptance/test_c3_file_upload.py:29,41-43) are not intercepted by that browser route and may follow external redirects. The download URL prefix assertion also accepts lookalike hostnames. Parse exact origins and guard API requests, redirects, WebSockets, and service-worker traffic, or enforce isolation outside the browser; SPEC-04 §3.4 promises every non-loopback request is blocked.

                                                              +
                                                            14. +
                                                            15. +

                                                              P1 — The generated network has no Docker internal isolation flag. installer/grdm_dev/compose.py:316 emits only a named bridge, without internal: true. The actual rendered core configuration confirms this. A regular bridge permits outbound routes, contrary to the internal-network baseline in SPEC-03 §3.2 and ADR-03 §3.2. Make the intended isolation explicit and verify it on Docker Desktop; if ordinary development requires egress, obtain a normative change instead of claiming that the existing output enforces the baseline.

                                                              +
                                                            16. +
                                                            17. +

                                                              P2 — Private repository URL fails the mandatory policy check. installer/tests/test_build.py:88 contains a full private integration repository URL. Production build.py:64-66 correctly composes its URL at runtime, but the test violates the same names-only policy. Construct the expected value from separate components without committing a private URL. tools/manifest_check.py and the tools regression suite both reject this exact line. No apparent live token was found in the diff search; that limited search is not a full secret-scanner certification.

                                                              +
                                                            18. +
                                                            19. +

                                                              P2 — Rendering a running installation changes its own ports. installer/grdm_dev/compose.py:116-153,649 treats every occupied port as foreign. Re-running install while its own web service occupies 5000 assigns 5001 and rewrites URLs; repeated runs keep moving. The idempotence test at installer/tests/test_compose.py:180 uses a checker that always returns free (:40), so it cannot detect this. Preserve project-owned bindings and test both own-service and unrelated-process collisions.

                                                              +
                                                            20. +
                                                            21. +

                                                              P2 — build --push attempts to publish the local tag as well. installer/grdm_dev/build.py:123-127 supplies both grdm-dev/<component> and ghcr.io/rcosdp/<component> with --push. The unqualified first tag addresses Docker Hub, outside the promised private GHCR destination, and can fail authorization or publish to the wrong registry. Use only the GHCR tag for push; keep local tags for load. Test the complete argument list and the absence of other registry destinations.

                                                              +
                                                            22. +
                                                            23. +

                                                              P2 — Acceptance omits the mandatory integration precheck and has weak success criteria. installer/grdm_dev/accept.py:265-320 proceeds directly to pytest after dependency/path checks; a fake successful pytest yields exit 0 with no health/integration call and zero collected result rows. SPEC-04 §2 requires integration first. C2 supplies ['admin'] when permissions are missing (installer/acceptance/test_c2_create_project.py:31); C3 tests anonymous PUT instead of a signed-in non-contributor (test_c3_file_upload.py:35-48); C4 checks only B-to-A propagation (test_c4_wiki_collab.py:47-53); C6 accepts API 404 although the contract requires 403 (test_c6_admin.py:39-40). Require the specified success and rejection evidence and fail incomplete runs. Check Chromium's executable, not merely a nonempty browser directory (accept.py:277-279).

                                                              +
                                                            24. +
                                                            25. +

                                                              P2 — Installed package omits its acceptance suite. installer/pyproject.toml:25-30 packages only grdm_dev, messages and templates; installer/grdm_dev/accept.py:44 searches a sibling acceptance directory. In a non-editable installation that suite is absent. Include it in the distribution or resolve it explicitly from the selected repository. The PR's console-script/data-file smoke test does not validate acceptance execution from the installed package.

                                                              +
                                                            26. +
                                                            27. +

                                                              P2 — Documentation and reported validation are not green at the reviewed head. The PR-added docs/reviews/2026-11-05_RDM-developer-guide_PR20_Manifest_Shibboleth_r3.md:10 links to the absent 2026-11-05_dev2027_Strict_Reconstruction_PRs_r2.md; confirmed in the remote head through gh api. The first docs run reports that broken link; later runs report the tracked review file missing locally. Installer tests consequently fail their repository docs check. Report this workspace change separately from the confirmed remote-head broken link. Fix the link and update the PR's passing-test claims after rerunning on a stable checkout.

                                                              +
                                                            28. +
                                                            +

                                                            Coverage, contract gaps, and evidence

                                                            +

                                                            The following are observations, not additional security approvals. Secret (a password or key) generation uses random values and writes .env as 0600 inside a 0700 directory. Rendered files preserve secret references rather than values, bind published ports to 127.0.0.1, set cap_drop: ALL and no-new-privileges, and use non-root users except the reasoned hardening exceptions. The old alias occurs in prohibition checks/tests and historical material in the diff; it is not emitted by the renderer or added to the host. Report masking covers known .env string values of length at least eight; it is not universal redaction of unknown secrets.

                                                            +

                                                            All requested helps returned 0 and the 13 message codes agree with SPEC-02 §6. upstream mirror/integrate exist only as exit-2 placeholders (installer/grdm_dev/upstream.py:1-32), so full §3 conformance is not delivered; the PR body does not explicitly claim those two functions. Non-interactive confirmation is implemented for reset through Context.confirm; there is no general no-terminal/without---yes rejection for install or seed. Resolve the distinction between the global flag's “required without a terminal” wording and §7's question-specific rule. secrets init keeps an existing file by refusing with exit 2, consistent with §3's overwrite prohibition but not a repeated-success interpretation of §7.

                                                            +

                                                            The staged thresholds correctly distinguish M1 reporting, M2/M3 count ceilings, M4 open HIGH/CRITICAL and M5 high-severity allow-list restrictions. Expired entries stop suppressing findings. However, malformed milestone JSON silently falls back to M1 (scan.py:100-112,560-566), and no next-milestone expiry boundary is enforced; these are further fail-closed contract gaps to address before later milestones. The current scan also does not implement the promised docs/status/security_<milestone>.md excerpt or an M5 unresolved-red-team-path check.

                                                            +

                                                            SPEC-01 adds matching integration_sha rows in both halves, but the Japanese row is English. All current integration pins remain null, explicitly disallowed for M2 acceptance. SPEC-04's browser-install wording is consistent in both languages. The README files have bilingual anchors, Jump, versions and glossary tables; the installer README still lacks an Applies-to line and a link to its acceptance child, and its test procedure is inline rather than a complete fenced procedure required by SPEC-06. Compared the generated local settings with the supplied upstream reference; URL separation is present, but runtime consumer names, authentication paths and writable directory ownership still require stage-two validation.

                                                            +

                                                            Observed results (TOON is a compact text form for structured data; these are review observations, not mirrored canonical data):

                                                            +
                                                            checks[6]{check,result}:
                                                            +  installer_unittest,"174 run; 1 failure in test_docs"
                                                            +  tools_unittest,"66 run; 1 failure in tracked private-URL policy"
                                                            +  manifest_check,"exit 1; test_build.py:88 private URL"
                                                            +  docs_check,"exit 1; PR20 review link or locally missing tracked file"
                                                            +  cli_help,"root and 21 leaf helps exit 0"
                                                            +  bash_syntax,"bash -n passes; no executable Bash-4-only construct found"
                                                            +

                                                            Commands were run from the repository root; expected merge-ready results are zero exits:

                                                            +
                                                            PYTHONPATH=installer python3 -m unittest discover -s installer/tests
                                                            +python3 -m unittest discover -s tools/tests
                                                            +python3 tools/manifest_check.py
                                                            +python3 tools/docs_check.py
                                                            +PYTHONPATH=installer python3 -m grdm_dev.cli --help
                                                            +bash -n installer/install.sh
                                                            +
                                                            +

                                                            Required second stage on Mac Studio

                                                            +

                                                            Real-Docker build, up, and acceptance are deferred to stage two, as the PR body states; none is certified by this review. After fixing the findings, verify all of the following before declaring M2 complete:

                                                            +
                                                              +
                                                            • Pin integration SHAs (exact source revisions) and base-image digests (exact image identities), then build cleanly on arm64 (the Apple Silicon CPU family); verify Dockerfile selection, image tags and Compose image identity, and separately verify amd64 (the Intel/AMD CPU family)/multi-platform behavior.
                                                            • +
                                                            • Start minimum/core and test volume ownership, non-root startup, read-only paths, capability exceptions and resource limits. Verify the settings consumers against the pinned upstream code, not only the reference sample.
                                                            • +
                                                            • Measure host listeners on macOS, loopback accessibility, internal connectivity and egress isolation. Test an AirPlay port collision and repeat install/render/up without changing existing project ports.
                                                            • +
                                                            • Rotate secrets on an initialized database and prove new credentials work while old credentials fail; inject a synthetic credential into failure output and inspect every report/log/trace for leakage.
                                                            • +
                                                            • Run the full scanner suite against every running image and integration lockfile, including scanner failure, allow-list expiry/count and staged threshold cases; verify generated hardening passes the intended baseline.
                                                            • +
                                                            • Run C1–C6 success/rejection cases through Chromium, verify fakecas (a test login server) redirects/cookies, file byte equality and preview, two-way Wiki convergence and 4401 rejection, and institution-scoped admin behavior. Confirm seed APIs, exact selectors and cleanup, including partial seeding failure; retain sanitized JSON/TOON evidence under docs/demo/runs/.
                                                            • +
                                                            • Exercise non-editable installation and its acceptance resources. Treat S1–S5 (currently unconditional M3 skips), Shibboleth (a system for institution logins) wiring, and upstream automation placeholders as remaining scope, not delivered acceptance.
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            判定と方法

                                                            +

                                                            修正要求。 P1 はインストーラーを信頼する前に直す欠陥、P2 は機能または契約の欠陥を表す。セキュリティの門とは、安全に使えるかを決める検査である。Docker は分離された箱でプログラムを動かす道具、Compose は複数の箱をまとめて記述する仕組みである。単体テストは外部の道具を決まった応答に置き換えるため、実機の動作を証明しない。

                                                            +

                                                            gh で PR(変更案)の本文と差分を読み、指定仕様、実装、試験、テンプレート、manifest(採用版の一覧)、指定された上流参考ファイルを照合した。必須検査と root および末端 21 コマンドの help を実行した。再現には一時ディレクトリと差し替え関数を使った。実 Docker のビルド・起動・イメージ公開・攻撃は行わず、製品のソースは変更していない。

                                                            +

                                                            公開前にリモート head は 1caaaceb4d436db99a35aa159a7abd9586df6462 へ進んだ。このレビューは指定された 6985d06 が対象で、新版を認証しない。変更後の追跡対象に対する最終 docs 検査は合格した(検査 49、除外 8、警告 121)。これは変更後の作業場所についてのみ、先のローカル文書検査失敗を更新する。

                                                            +

                                                            重要度順の指摘

                                                            +
                                                              +
                                                            1. +

                                                              P1 — 秘密の更新が稼働中の認証情報を置き換えない。 installer/grdm_dev/secrets.py:232,246 は新値を保存するが、installer/grdm_dev/lifecycle.py:54 は docker compose restart だけを呼ぶ。既存の箱の環境変数は変わらず、既存データベースのパスワードも初期化用環境変数では変わらない。呼出引数の再現でも再作成がなかった。漏洩した旧認証情報が使える一方で .env だけ新値になる。アプリとデータベースを協調更新し、失敗回復と旧値拒否を試験する(SPEC-03 §6)。

                                                              +
                                                            2. +
                                                            3. +

                                                              P1 — 必須検査が root を見逃し、同梱の生成結果を拒否する。 installer/grdm_dev/scan.py:252-295 は user が空でなければ許し、0:0、cap_drop: ALL、ループバック公開の合成設定を指摘ゼロで通した。.env の権限・既定値、資源制限、ネットワーク隔離も調べない。逆に実 manifest と hardening 例外から core を生成すると postgres、elasticsearch、mongo、rabbitmq、unoconv の五つが BASE-USER になる。検査が例外を読まないためである。非 root 規則と承認済み例外の契約を整え、生成結果を実検査へ渡す試験を追加する。現状は起動しても全体検査を成功できない。

                                                              +
                                                            4. +
                                                            5. +

                                                              P1 — プロセス所有者が見えない待受をネットワーク検査が無視する。 installer/grdm_dev/health.py:174-204 は Docker のプロセス名だけで抽出する。Linux の一般権限の ss -ltnp は root 所有の待受のプロセス欄を省略する場合がある。LISTEN 0 4096 0.0.0.0:5000 0.0.0.0:* を与えると違反もエラーもゼロになる。Docker の実際の公開設定と照合し、所有関係が不明なら合格させない。macOS の Docker Desktop と一般権限の Linux を試験する。

                                                              +
                                                            6. +
                                                            7. +

                                                              P1 — レッドチームの外向き通信検査が隔離を証明できない。 installer/grdm_dev/redteam.py:24,90-99 は通常の接続でも名前解決できない example.invalid に接続し、失敗を遮断と判定する。実際の攻撃側の箱でなく、新しい Alpine の箱を使うため、別ネットワークへの接続や経路も確認できない。指定ネットワークの Internal 属性だけでは不足する。管理された接続可能な宛先に対して実際の攻撃側の環境で検査し、検査不能と遮断を分ける。承認記録も存在だけでなく所有者と対象範囲を検証する(:114-119)。

                                                              +
                                                            8. +
                                                            9. +

                                                              P1 — スキャナーのエラーが正常扱いになり、基盤イメージが漏れる。 installer/grdm_dev/scan.py:398-407 は Semgrep の終了値と errors 配列を確認しない。終了 2、エラーあり、結果空の JSON(機械が読む構造化データ)を渡しても result: ok となる。:355-395 は grdm-dev/ イメージだけを選び、実際に使う postgres、Redis、Mongo などを除外する。ローカルイメージがあれば統合側の依存固定ファイルも明示的に検査しない。構成部品一覧の生成失敗も注記だけである。不完全な検査は 51 とし、全イメージ・依存固定ファイルと、p/default 以外も含む必須四組の Semgrep 規則を検査する(SPEC-03 §4)。

                                                              +
                                                            10. +
                                                            11. +

                                                              P1 — 受入ログが秘密のマスクを通らない。 installer/grdm_dev/accept.py:307,318,320 は seed・cleanup の出力を表示し、pytest の出力を docs/demo/runs/ にそのまま書く。scan.py と report_cmd.py と違い .env の値を隠さない。差し替え関数の合成秘密文字列が pytest.log に残ることを確認した。例外や追跡記録には認証情報が入る場合がある。表示・保存前のマスクと証跡の権限制限を行い、合成 .env 値で全出力を試験する。後の報告集約だけでは既存ファイルを消毒できない。

                                                              +
                                                            12. +
                                                            13. +

                                                              P1 — 受入の通信制限が全要求を覆わない。 installer/acceptance/conftest.py:136-156 はブラウザ経路だけを遮断する。context.request や独立した API 要求の文脈(例 installer/acceptance/test_c3_file_upload.py:29,41-43)はその経路を通らず、外部への転送を追える。ダウンロード URL の前方一致も似たホスト名を許す。正確な接続先を解析し、API・転送・WebSocket・service worker を制限するかブラウザ外で隔離する。SPEC-04 §3.4 の約束は全非ループバック要求の遮断である。

                                                              +
                                                            14. +
                                                            15. +

                                                              P1 — 生成ネットワークに Docker の内部隔離属性がない。 installer/grdm_dev/compose.py:316 は名前付き bridge だけを生成し、internal: true がない。実 core の生成結果でも確認した。通常の bridge は外向き経路を持ち、SPEC-03 §3.2 と ADR-03 §3.2 の内部ネットワーク必須対策に合わない。隔離設定を明示し Docker Desktop で確認する。通常開発で外向き通信が必要なら、現出力が必須対策を満たすと主張せず規範側の変更を行う。

                                                              +
                                                            16. +
                                                            17. +

                                                              P2 — 非公開リポジトリ URL が必須方針検査に落ちる。 installer/tests/test_build.py:88 に非公開統合リポジトリの URL 全体が直書きされる。本体 build.py:64-66 は実行時に組み立てているが、試験も名前だけの方針に従う必要がある。期待値を別々の部品から組み立てる。tools/manifest_check.py と tools の回帰試験がこの行を拒否した。差分検索で実トークンらしい値は見つけなかったが、完全な秘密検査の認証ではない。

                                                              +
                                                            18. +
                                                            19. +

                                                              P2 — 稼働中に再生成すると自身のポートが移動する。 installer/grdm_dev/compose.py:116-153,649 は使用中ポートをすべて他者のものと扱う。自分の web が 5000 を使っていると再導入で 5001 に変わり、URL を書き換える。繰返すたびに移動する。installer/tests/test_compose.py:180 の再実行試験は常に空きと返す関数(:40)のため検出できない。自分の公開設定を保持し、自身と他プロセスの両方の衝突を試験する。

                                                              +
                                                            20. +
                                                            21. +

                                                              P2 — build --push がローカル用タグも公開しようとする。 installer/grdm_dev/build.py:123-127 は --push に grdm-dev/<component> と ghcr.io/rcosdp/<component> の両方を渡す。最初の省略形式は Docker Hub を指すため、認証失敗や意図しない公開先への送信になる。push は GHCR 用タグだけにし、ローカル用は load に限定する。引数全体と余分な公開先がないことを試験する。

                                                              +
                                                            22. +
                                                            23. +

                                                              P2 — 受入が必須の統合事前検査をせず、合格条件も弱い。 installer/grdm_dev/accept.py:265-320 は依存・パス確認後に直接 pytest を呼ぶ。合成 pytest の正常終了だけで、health・統合検査なし、結果行ゼロでも 0 になった。SPEC-04 §2 は統合検査を先に要求する。C2 は権限欠落時に ['admin'] を補う(installer/acceptance/test_c2_create_project.py:31)。C3 はログイン済み非参加者でなく匿名 PUT(test_c3_file_upload.py:35-48)、C4 は B→A の片方向(test_c4_wiki_collab.py:47-53)、C6 は契約の 403 に加えて 404 も許す(test_c6_admin.py:39-40)。所定の成功・拒否証跡を必須にし、不完全実行を失敗させる。ブラウザも空でないディレクトリでなく実行ファイルを検査する(accept.py:277-279)。

                                                              +
                                                            24. +
                                                            25. +

                                                              P2 — 通常インストールの配布物に受入スイートがない。 installer/pyproject.toml:25-30 は grdm_dev と messages・templates だけを同梱するが、installer/grdm_dev/accept.py:44 は隣の acceptance を探す。非 editable 導入では存在しない。配布物へ含めるか、指定リポジトリから明示的に解決する。PR の console script とデータファイルの確認だけでは受入実行を証明できない。

                                                              +
                                                            26. +
                                                            27. +

                                                              P2 — 文書検査と PR の合格報告が一致しない。 PR が追加する docs/reviews/2026-11-05_RDM-developer-guide_PR20_Manifest_Shibboleth_r3.md:10 は存在しない 2026-11-05_dev2027_Strict_Reconstruction_PRs_r2.md を参照する。gh api で対象 head の内容も確認した。最初の docs 検査はリンク切れ、その後は追跡済みレビュー自体がローカルで見つからないと報告した。installer 試験も文書検査で落ちる。作業場所の変化と、対象 head で確認したリンク切れを区別して扱う。修正後に安定した checkout で再検査し、PR 本文の全件合格記載を更新する。

                                                              +
                                                            28. +
                                                            +

                                                            確認範囲・契約の不足・証拠

                                                            +

                                                            次は観測であり追加の安全承認ではない。秘密は乱数生成され .env は 0600、親は 0700 で保存する。生成ファイルは秘密の値でなく参照を保持し、公開は 127.0.0.1、cap_drop: ALL と no-new-privileges を設定し、理由付き例外以外は非 root にする。旧別名は差分の禁止検査・試験・歴史資料に現れるが、生成結果やホスト設定には追加しない。報告のマスクは .env にある八文字以上の既知の文字列が対象であり、未知の秘密をすべて消す仕組みではない。

                                                            +

                                                            全 help は 0、13 個のメッセージコードは SPEC-02 §6 と一致した。upstream mirror/integrate は終了 2 の未実装入口である(installer/grdm_dev/upstream.py:1-32)。§3 全体への準拠は未達だが、PR 本文はこの二機能を明示的に主張していない。非対話確認は reset で Context.confirm を通す。install・seed 全般には端末なし・--yes なしの拒否がない。グローバルフラグの「端末なしで必須」と §7 の質問に対する規則の違いを整理する。secrets init は既存ファイルを残して 2 を返す。§3 の上書き拒否には合うが、§7 を再実行でも成功と読むなら一致しない。

                                                            +

                                                            段階別の判定は M1 報告、M2/M3 件数上限、M4 未許容 HIGH/CRITICAL、M5 高重大度の許容禁止を区別する。期限切れは抑制対象から外れる。ただし milestone JSON の破損は M1 に戻る(scan.py:100-112,560-566)。次の節目より前という期限境界も検証しない。後続段階までに、検査不能なら通さない契約へ直す必要がある。約束された docs/status/security_<milestone>.md の抄録と、M5 の未解決侵入経路確認も未実装である。

                                                            +

                                                            SPEC-01 の integration_sha 行は両半分で対応するが、日本語側も英文のままである。現在の統合 pin(正確な版の指定)はすべて null で、M2 受入には不可と明記される。SPEC-04 のブラウザ導入説明は英和一致する。両 README は英和アンカー・Jump・版・用語表を備えるが、installer README は適用対象行と子の acceptance へのリンクがなく、試験手順も SPEC-06 の完全なコードブロックでなく本文内表記である。生成 local 設定を指定の上流参考と照合し、内外 URL の分離は確認した。実際の利用側の設定名、認証経路、書込ディレクトリ所有者は第二段階で検証する。

                                                            +

                                                            観測結果を TOON(構造化データを短く書く文字形式)で記す。正本の転載ではなくレビュー実測である。

                                                            +
                                                            checks[6]{check,result}:
                                                            +  installer_unittest,"174 件実行; test_docs で 1 件失敗"
                                                            +  tools_unittest,"66 件実行; 非公開 URL 方針で 1 件失敗"
                                                            +  manifest_check,"終了 1; test_build.py:88 非公開 URL"
                                                            +  docs_check,"終了 1; PR20 レビューのリンクまたはローカル追跡ファイル欠落"
                                                            +  cli_help,"root と末端 21 個の help が終了 0"
                                                            +  bash_syntax,"bash -n 合格; Bash 4 専用の実行構文なし"
                                                            +

                                                            リポジトリのルートで実行した。統合可能な状態ではすべて終了 0 を期待する。

                                                            +
                                                            PYTHONPATH=installer python3 -m unittest discover -s installer/tests
                                                            +python3 -m unittest discover -s tools/tests
                                                            +python3 tools/manifest_check.py
                                                            +python3 tools/docs_check.py
                                                            +PYTHONPATH=installer python3 -m grdm_dev.cli --help
                                                            +bash -n installer/install.sh
                                                            +
                                                            +

                                                            Mac Studio で必須の第二段階

                                                            +

                                                            実 Docker の build・up・受入は PR 本文のとおり第二段階へ延期され、このレビューでは認証していない。 指摘修正後、M2 完了前に次を実施する。

                                                            +
                                                              +
                                                            • 統合 SHA(ソースの正確な版)と基盤 digest(イメージの正確な識別値)を固定し arm64 で新規ビルドする。Dockerfile 選択、タグと Compose の参照一致、別途 amd64・複数環境向けのビルドを確認する。
                                                            • +
                                                            • minimum/core を起動し、保存領域の所有者、非 root 起動、読取専用パス、権限例外、資源制限を確認する。設定を読む実コードも固定した上流版と突き合わせる。
                                                            • +
                                                            • macOS の実待受、ループバック接続、内部通信、外向き隔離を測る。AirPlay 衝突と再導入・再生成・再起動でも自身のポートが変わらないことを確認する。
                                                            • +
                                                            • 初期化済みデータベースの秘密を更新し、新値成功・旧値拒否を確認する。合成秘密を異常出力へ入れ、全報告・ログ・追跡記録に漏れがないか確認する。
                                                            • +
                                                            • 全稼働イメージと統合側の依存固定ファイルを検査し、検査不能、許容期限・件数、段階別閾値も確認する。生成 hardening が意図した必須検査を通ることを確認する。
                                                            • +
                                                            • Chromium で C1–C6 の成功・拒否を実行する。fakecas の転送と cookie、ファイル一致とプレビュー、Wiki の双方向同期と 4401、所属機関の管理画面を確認する。seed API・セレクタ・部分失敗時も含む後片付けを確定し、秘密を除いた JSON/TOON を docs/demo/runs/ に残す。
                                                            • +
                                                            • 非 editable 導入で受入資源を確認する。現在 M3 として無条件スキップする S1–S5、Shibboleth 接続、上流自動化の未実装入口は、受入済みでなく残作業とする。
                                                            • +
                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            P1 / P2Before-reliance defect / functional or contract defect.信頼する前に直す欠陥/機能・契約の欠陥。
                                                            Credential rotationReplace keys and make the previous keys stop working.鍵を交換し、以前の鍵を使えなくすること。
                                                            LoopbackAn address that leads back to the same computer.同じ計算機へ戻るアドレス。
                                                            EgressA connection leaving the isolated environment.隔離環境から外へ向かう通信。
                                                            RunnerA function that executes an external program, replaced in tests.外部プログラムを実行し、試験で置き換える関数。
                                                            RegistryA service that stores and distributes container images.コンテナのイメージを保管・配布する場所。
                                                            IdempotenceRepeating an operation preserves the intended state.繰返しても意図した状態を保つこと。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/index.html b/site/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/index.html new file mode 100644 index 0000000..d727d3b --- /dev/null +++ b/site/reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/index.html @@ -0,0 +1,3127 @@ + + + + + + + + + + + + + + + + + + + + + + + REV PR21 Installer review r2 / インストーラーレビュー r2 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            REV PR21 Installer review r2 / インストーラーレビュー r2

                                                            +
                                                            +

                                                            Summary: Re-review of all 14 r1 findings at 3149c7601f8e199d599c5e0abb721d87f56e2696. Changes requested: three security defects and two implementation/documentation contract defects remain despite 247 passing unit tests. +概要: 3149c7601f8e199d599c5e0abb721d87f56e2696 で r1 の14件を再レビューした。単体テスト247件は合格したが、安全性の欠陥3件と実装・文書の契約不一致2件が残るため修正を要求する。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            + +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            Verdict and scope

                                                            +

                                                            Changes requested. P1 means a safety defect to fix before reliance; P2 means an implementation or documentation contract defect. A unit test replaces external programs with controlled responses; it does not certify a real installation. Docker (a tool for running applications in separate boxes) runs applications in separate containers; Compose describes those containers together. A secret is a password or key; egress is traffic leaving a network.

                                                            +

                                                            Terminology: PR (a proposed change), CI (automatic checks), Semgrep (a source-code checker), Playwright (a browser automation tool), arm64 (the Apple Silicon CPU family), amd64 (the Intel/AMD CPU family), and mfr (the file-preview service).

                                                            +

                                                            Read the r1 record, the fixes in 1caaace, ae273d4, and 3149c76, source, tests, and the requested specifications. GitHub access used gh only. No Docker command was executed against the real daemon, and no product source, commit, push, approval, merge, or closure was made. Local probes used temporary directories, synthetic secrets, and injected command runners. The second real install, if running, was left alone.

                                                            +

                                                            The shared checkout and remote head advanced to 1c2a925d6af687129e8f9c23f06d629db58996c0 during review. That commit changes only Semgrep annotations in accept.py and a synthetic test literal in test_accept.py. Downloaded the exact 3149c76 archive through gh api, repeated all 247 installer tests and the probes with that source, and checked its documentation separately. Findings refer to 3149c76; the newer CI result is reported separately.

                                                            +

                                                            Remaining findings

                                                            +
                                                              +
                                                            1. +

                                                              R2-01 — P1: retained browser traces still contain secrets (r1 #6 partially fixed). installer/grdm_dev/accept.py:275 enables --tracing retain-on-failure, but sanitize_run_dir at lines 359–363 masks only junit.xml, collector.json, and pytest.log. Files under artifacts/ only receive permission changes. Reproduction: write a synthetic .env value into both pytest.log and a trace.network member of artifacts/trace.zip, then call sanitize_run_dir(run_dir, [value]). The log is masked; the ZIP member still contains the exact value. Browser traces may carry cookies, headers and response bodies, so 0600 permissions do not satisfy the no-secret evidence contract. Sanitize retained trace contents and other exported artefacts, or disable/quarantine them until safe; add a ZIP-content assertion. The existing test named “every evidence file” covers text files only.

                                                              +
                                                            2. +
                                                            3. +

                                                              R2-02 — P1: the API guard allows redirects to bypass the origin check (r1 #7 partially fixed). installer/acceptance/conftest.py:162 uses kwargs.setdefault("max_redirects", 0). Calling GuardedRequest(...).get("http://127.0.0.1:5000", max_redirects=20) passes 20 unchanged to the underlying request context; captured arguments confirm it. A local response can therefore redirect externally before the response URL is checked. A later failure cannot undo the request, and an external hop returning to loopback is invisible to the final-URL check. Force zero redirects and validate each manually followed hop, or reject the override. Also, guard_context silently omits WebSocket routing when the method is absent (:204), while pyproject.toml:19 permits Playwright 1.47; enforce a compatible capability/version or fail closed. Exact-origin parsing, guarded core call sites, and blocked service workers are improvements, but do not close these paths.

                                                              +
                                                            4. +
                                                            5. +

                                                              R2-03 — P1: a broken attacker-side probe is still classified as proven isolation (r1 #4 partially fixed). installer/grdm_dev/redteam.py:207–220 maps every nonzero nc execution to GRDM_REACH_FAIL, then to unreachable. Reproduction without network access: place a stub nc on PATH that exits 2 (representing unsupported options), execute probe_script("192.0.2.1", 443) through /bin/sh, and pass its output to verdict. The shell exits 0, emits GRDM_REACH_FAIL, and receives unreachable, not inconclusive. The positive control uses another container's binary, so it cannot validate the attacker's tool. The HTTP fallback against port 443 can likewise fail after making a connection. Use a known TCP probe, verify its operation in the attacker environment, distinguish tool/protocol errors from blocked connections, and return 53 on uncertainty. The new missing-tool, absent-marker, failed-control, attachment, and approval-field tests pass, but do not cover this case.

                                                              +
                                                            6. +
                                                            7. +

                                                              R2-04 — P2: explicitly granted egress fails the baseline (r1 #8/#2 follow-up). installer/grdm_dev/scan.py:487–489 rejects every non-publishing service on a non-internal network, without reading the recorded GRDM_EGRESS_SERVICES grant. Reproduction: render the real core manifest with egress="worker"; rendering returns 0 and records the choice, but check_baseline(compose_path, hardening_path, env_path) emits BASE-NETWORK for worker. The same render without egress has zero findings and 14 accepted hardening controls. SPEC-03 §3.2 explicitly says a recorded grant is not a baseline violation. Validate the recorded grant against actual attachments, accept the authorized service, and still reject undeclared attachments; add a renderer-to-baseline test for both cases.

                                                              +
                                                            8. +
                                                            9. +

                                                              R2-05 — P2: the changed documentation still omits or misstates contracts. SPEC-01 mentions build_platform in its new version note, but neither §3 schema table defines the field, accepted values, optionality, or precedence. Its Japanese integration_sha row remains entirely English. SPEC-02 §3 still describes the build default as host-only although components now choose amd64, and calls redteam preflight read-only although it creates/removes a canary container/network. ADR-02 §3 describes dual attachment for published services, but §4 says “no egress by default”; those seven services already have an ordinary bridge attachment without an explicit grant. Correct both language halves together and describe that exposure plainly. The two halves of the new SPEC-03 §3.2/§6, ADR-02 §3/§4, and SPEC-02 changed rows are otherwise materially equivalent; parity alone does not make the statements accurate.

                                                              +
                                                            10. +
                                                            +

                                                            Disposition of all 14 r1 findings

                                                            +

                                                            “Resolved” means the reported code-level defect is corrected in this review scope; real-Docker confirmation remains a separate stage. Each row uses the original r1 number.

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            r1r2 dispositionEvidence
                                                            1Resolved at code/test levelLive PostgreSQL/RabbitMQ changes, old/new authentication checks and force recreation replace restart. Injected RabbitMQ failure returns 40 and restores both .env and the PostgreSQL fake store. Health-failure rollback test also passes. Real stores remain unverified.
                                                            2Original cases resolveduser: 0:0 now emits BASE-USER; actual core render yields zero findings and 14 accepted exception controls. Environment mode/defaults, exceptions and expiry are tested. See R2-04 for explicit egress.
                                                            3ResolvedOwnerless LISTEN 0 4096 0.0.0.0:5000 0.0.0.0:* is now a project-port violation; the corresponding command test returns 40. Inspect/ps address and command-failure tests pass.
                                                            4PartialActual attacker attachment, canary control and approval scope/date checks added; inconclusive tests return 53. Broken-tool path remains R2-03.
                                                            5Resolved for reported casesSemgrep exit 2 with errors yields incomplete/51; all four local packs are invoked. Tests cover every Compose image, integration filesystem scans, failed SBOM generation and failed image scans.
                                                            6PartialSynthetic values are masked in logs, result text and seed/cleanup messages; owner-only modes pass. Trace ZIP still leaks (R2-01).
                                                            7PartialExact origins and guarded API/browser contexts added; redirects and absent WebSocket interception remain R2-02.
                                                            8Partialgrdm.internal: true is generated; published services additionally use grdm-edge, now described normatively. Explicit egress and documentation remain R2-04/R2-05.
                                                            9ResolvedPrivate URL literal removed; manifest/private-URL policy check passes on the shared checkout and CI.
                                                            10ResolvedRe-render with own web listener on 5000 preserves 127.0.0.1:5000:5000; foreign collision/remap tests pass.
                                                            11ResolvedCaptured push arguments contain one tag, ghcr.io/rcosdp/web:abc123, and no local registry destination; load-form test also passes.
                                                            12Resolved for reported casesHealth precheck precedes pytest; missing Chromium, zero rows and missing rejection fail. C2 checks actual permissions, C3 uses a signed-in non-contributor, C4 checks both directions, C6 requires API 403. Selectors and real integration still need stage two.
                                                            13ResolvedNon-editable install into a temporary target resolves the installed acceptance package, with 11 scenario files, conftest.py and pytest.ini, outside the checkout.
                                                            14Original link/check failure resolvedRequired docs check passes. At requested head Semgrep CI fails; follow-up 1c2a925 makes all six CI jobs pass. New documentation defects are R2-05.
                                                            +

                                                            Validation and documentation evidence

                                                            +

                                                            Observed results, not a canonical manifest (TOON is a compact text form for structured data):

                                                            +
                                                            checks[7]{check,result}:
                                                            +  pinned_installer_tests,"247 run; OK at 3149c76"
                                                            +  pinned_docs_check,"PASSED; 51 checked; 8 exempt; 126 warnings"
                                                            +  shared_installer_tests,"247 run; OK"
                                                            +  shared_docs_check,"PASSED before this review; 51 checked; 8 exempt; 126 warnings"
                                                            +  installed_package,"non-editable install OK; 11 scenario files plus conftest and pytest.ini"
                                                            +  requested_head_ci,"5 pass; Semgrep fail"
                                                            +  followup_head_ci,"1c2a925: all 6 pass"
                                                            +

                                                            Run from the repository root; expected result is exit 0. Tests use fake external runners and do not change Docker state:

                                                            +
                                                            PYTHONPATH=installer python3 -m unittest discover -s installer/tests
                                                            +python3 tools/docs_check.py
                                                            +python3 tools/manifest_check.py
                                                            +python3 -m unittest discover -s tools/tests
                                                            +gh pr checks 21 --repo RCOSDP/RDM-developer-guide
                                                            +
                                                            +

                                                            The shared-checkout tools suite also passed all 66 tests; the manifest/private-URL policy check passed with zero findings. The Playwright 1.47 generated API, retrieved through gh api, has no route_web_socket method.

                                                            +

                                                            The original Semgrep failure reports two 0700 directory-mode findings and one synthetic JWT literal. Do not weaken owner-only permissions to satisfy it; the follow-up uses documented suppression and a constructed test string. Requested-head CI and follow-up CI are distinct evidence.

                                                            +

                                                            Packaging initially generated installer/build/ inside the temporary archive and caused an extra docs-check failure there. Removed only that temporary build output and reran: 51 checked, zero errors. The archive has no Git metadata, so its private-URL policy scan cannot run; the real-checkout policy check and CI supply that evidence. This tooling artefact is not attributed to the PR. The new, untracked review was additionally passed directly to docs_check.check_file: zero errors; the tracked-file command alone does not include it.

                                                            +

                                                            DEMO-20 run 1 has matching English/Japanese commands, host facts, five step outcomes and three image outcomes. It accurately labels the attempt as exit 30 before startup, not a completed installation. The source build flow supports stopping at the first failed component. However, the full log exists only in the author's session scratchpad, so the recorded host measurements, sizes and package failure were not independently re-established here. The failed mfr build alone does not prove ember/cas cannot build on arm64, nor prove the chosen amd64 builds succeed. “runtime holds two built images” should distinguish Docker's image store from files under runtime/. No claim is made about run 2 or M2 acceptance completion.

                                                            +

                                                            Required follow-up

                                                            +

                                                            Fix R2-01–R2-05 and add tests that traverse the failing paths, then re-review the resulting head. Keep real install/build/startup, credential rejection against initialized stores, browser C1–C6 and actual network behavior as stage-two evidence. Existing M3 skips and upstream command placeholders are not delivered acceptance. This review grants no red-team execution or merge approval.

                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            判定と範囲

                                                            +

                                                            修正要求。 P1 は信頼する前に直す安全性の欠陥、P2 は実装または文書の契約不一致を表す。単体テストは外部プログラムを決まった応答へ置き換えるもので、実機導入の証明ではない。Docker はプログラムを分離したコンテナで動かし、Compose はその箱をまとめて記述する。秘密とはパスワードや鍵、egress とはネットワークの外へ出る通信である。

                                                            +

                                                            用語注: PR(変更案)、CI(自動検査)、Semgrep(ソースコード検査道具)、Playwright(ブラウザ操作の自動化道具)、arm64(Apple Silicon の CPU 系列)、amd64(Intel/AMD の CPU 系列)、mfr(ファイルプレビュー用サービス)。

                                                            +

                                                            r1、1caaace・ae273d4・3149c76 の修正、ソース、テスト、指定仕様を確認した。GitHub 操作は gh のみ。実 Docker へのコマンド実行、製品ソース変更、commit・push・approve・merge・close はしていない。再現は一時ディレクトリ・合成秘密・差し替えた実行関数を使用した。実行中の可能性がある第2回の実機導入には触れていない。

                                                            +

                                                            レビュー中に共有 checkout と remote head が 1c2a925d6af687129e8f9c23f06d629db58996c0 へ進んだ。この変更は accept.py の Semgrep 注釈と test_accept.py の合成リテラルだけである。gh api で正確な 3149c76 のアーカイブを取得し、そのソースで247件と再現試験を実行し、文書も別途検査した。指摘の対象は 3149c76 とし、新しい CI 結果は分けて記載する。

                                                            +

                                                            残る指摘

                                                            +
                                                              +
                                                            1. +

                                                              R2-01 — P1: 保存するブラウザ trace に秘密が残る(r1 #6 は一部解消)。 installer/grdm_dev/accept.py:275 は --tracing retain-on-failure を指定するが、359〜363行の sanitize_run_dir は junit.xml・collector.json・pytest.log しかマスクしない。artifacts/ 以下は権限変更だけである。再現では、合成 .env 値を pytest.log と artifacts/trace.zip の trace.network メンバーに入れ、sanitize_run_dir(run_dir, [value]) を実行した。ログは消えたが ZIP 内には同じ値が残った。trace は cookie・ヘッダ・応答本文を持ち得るため、0600 だけでは証跡へ秘密を書かない契約を満たさない。trace 内部と他の出力を無害化するか、安全になるまで無効化・隔離し、ZIP 内部の検査を追加する。「every evidence file」という既存テストはテキストだけを検査している。

                                                              +
                                                            2. +
                                                            3. +

                                                              R2-02 — P1: API の転送が通信ガードを迂回する(r1 #7 は一部解消)。 installer/acceptance/conftest.py:162 は kwargs.setdefault("max_redirects", 0) である。GuardedRequest(...).get("http://127.0.0.1:5000", max_redirects=20) を呼ぶと、下位の要求に20がそのまま渡ることを引数捕捉で確認した。ローカル応答から外部へ転送すると、応答 URL の確認前に通信が発生する。後からの失敗では取り消せず、外部を経てループバックへ戻る場合は最終 URL 検査でも分からない。転送を強制的に0にして各転送先を確認するか、上書きを拒否する。また guard_context:204 は WebSocket ルーティングのメソッドが無い場合に黙って省略し、pyproject.toml:19 は Playwright 1.47 を許す。必要な機能・版を必須にするか、検査不能なら停止する。正確な origin 判定、コア試験のラップ、service worker 禁止は改善だが、これらの経路は残る。

                                                              +
                                                            4. +
                                                            5. +

                                                              R2-03 — P1: 攻撃側の壊れた疎通検査を隔離の証明と誤認する(r1 #4 は一部解消)。 installer/grdm_dev/redteam.py:207–220 は nc のすべての非ゼロ終了を GRDM_REACH_FAIL、さらに unreachable と扱う。通信しない再現として、未対応オプションを模した終了2の nc スタブを PATH に置き、/bin/sh で probe_script("192.0.2.1", 443) を実行して verdict へ渡した。シェルは終了0で GRDM_REACH_FAIL を出し、inconclusive でなく unreachable となる。対照試験は別コンテナの別の実行ファイルなので攻撃側の道具を検証できない。443への HTTP 代替処理も接続後に失敗し得る。既知の TCP 検査を用い、攻撃側で道具自体の動作を確認し、道具・プロトコルの異常と通信遮断を区別し、不確かなら53を返す。道具欠落・マーカー欠落・対照失敗・接続先・承認欄の追加試験は合格したが、この経路を覆わない。

                                                              +
                                                            6. +
                                                            7. +

                                                              R2-04 — P2: 明示的に許可した外向き通信を baseline が拒否する(r1 #8/#2 の続き)。 installer/grdm_dev/scan.py:487–489 は、ポートを公開しないサービスの外部ネットワーク接続を、記録済みの GRDM_EGRESS_SERVICES を見ずに拒否する。実 core manifest を egress="worker" で生成すると終了0で選択も記録されるが、check_baseline(compose_path, hardening_path, env_path) は worker の BASE-NETWORK を返した。外向き許可なしなら検出0件、hardening 例外対策14件を受理する。SPEC-03 §3.2 は記録した許可を違反としないと明記する。許可記録と実接続を照合し、許可済みは通し、未申告は拒否する生成→検査の試験を追加する。

                                                              +
                                                            8. +
                                                            9. +

                                                              R2-05 — P2: 変更文書にも契約の欠落・誤記がある。 SPEC-01 は新版履歴に build_platform を挙げるが、両言語の §3 の表に型・許容値・任意性・優先順位の定義がない。日本語 integration_sha 行も全文英語のままである。SPEC-02 §3 は部品が amd64 を選ぶようになっても build 既定をホストのみと記し、カナリアのコンテナ・ネットワークを作成・削除する redteam preflight を read-only とする。ADR-02 §3 は公開サービスの二重接続を説明するが、§4 は「既定では外向き通信がない」と述べる。その7サービスは明示許可なしでも通常 bridge に接続する。両言語を同時に直し、外へ通信できる範囲を明記する。新しい SPEC-03 §3.2/§6、ADR-02 §3/§4、SPEC-02 の変更行は、それ以外では英和の意味が対応するが、翻訳一致だけでは内容の正しさにならない。

                                                              +
                                                            10. +
                                                            +

                                                            r1 全14件の判定

                                                            +

                                                            「解消」は報告されたコード上の欠陥が対象範囲で直ったという意味で、実 Docker の確認は別段階である。番号は r1 と同じ。

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            r1r2 判定証拠
                                                            1コード・試験上解消PostgreSQL/RabbitMQ の実効更新、新旧認証確認、強制再作成へ変更。RabbitMQ 失敗注入で40を返し .env と PostgreSQL の模擬値を旧値へ復元。再作成後 health 失敗の復旧試験も合格。実 DB は未確認。
                                                            2元の再現は解消user: 0:0 は BASE-USER。実 core 生成は検出0、例外対策14件受理。環境ファイルの権限・既定値・例外・期限も試験済み。明示 egress は R2-04。
                                                            3解消所有者なしの LISTEN 0 4096 0.0.0.0:5000 0.0.0.0:* はプロジェクトポート違反。対応コマンド試験は40。inspect/ps の公開先と道具失敗の試験も合格。
                                                            4一部解消実攻撃側の接続網・カナリア対照・承認範囲と日付を追加。不確かな場合の試験は53。壊れた道具は R2-03。
                                                            5報告した経路は解消Semgrep 終了2+errors は incomplete/51。ローカル4パック、全 Compose イメージ、統合ソースの filesystem、SBOM 失敗、イメージ検査失敗を試験。
                                                            6一部解消ログ・結果テキスト・seed/cleanup 出力の合成秘密をマスクし、所有者限定権限も合格。trace ZIP は R2-01。
                                                            7一部解消正確な origin と API/browser のガード追加。転送と WebSocket 遮断欠落は R2-02。
                                                            8一部解消grdm.internal: true を生成し、公開サービスは仕様改定どおり grdm-edge にも接続。明示 egress と文書は R2-04/R2-05。
                                                            9解消非公開 URL 直書きを除去。共有 checkout と CI の manifest/非公開 URL 方針検査合格。
                                                            10解消自身の web が5000使用中でも再生成後は 127.0.0.1:5000:5000。他プロセスの衝突・再割当試験も合格。
                                                            11解消push 引数のタグは ghcr.io/rcosdp/web:abc123 の一つで、ローカルタグの送信先なし。load 形式の試験も合格。
                                                            12報告した経路は解消pytest 前の health、Chromium 実体、結果0行・拒否行欠落の失敗を確認。C2 実権限、C3 ログイン済み非参加者、C4 双方向、C6 API 403 を要求。実セレクタ・統合は第二段階。
                                                            13解消一時領域へ非 editable 導入し、checkout 外で同梱 acceptance を解決。シナリオ11ファイル、conftest、pytest.ini を確認。
                                                            14元のリンク・検査失敗は解消必須文書検査合格。指定 head の Semgrep CI は失敗したが、追補 1c2a925 は6ジョブすべて合格。新たな文書欠陥は R2-05。
                                                            +

                                                            検証と文書証跡

                                                            +

                                                            実測であり manifest 正本の転載ではない。TOON は構造化データを短く表す文字形式である。

                                                            +
                                                            checks[7]{check,result}:
                                                            +  pinned_installer_tests,"3149c76 で247件; OK"
                                                            +  pinned_docs_check,"合格; 51検査; 8除外; 126警告"
                                                            +  shared_installer_tests,"247件; OK"
                                                            +  shared_docs_check,"本レビュー追加前に合格; 51検査; 8除外; 126警告"
                                                            +  installed_package,"非 editable 導入成功; シナリオ11ファイルと conftest・pytest.ini"
                                                            +  requested_head_ci,"5合格; Semgrep失敗"
                                                            +  followup_head_ci,"1c2a925: 6件すべて合格"
                                                            +

                                                            リポジトリ root から実行し、期待値は終了0。単体テストは外部実行を模擬するため Docker の状態を変更しない。

                                                            +
                                                            PYTHONPATH=installer python3 -m unittest discover -s installer/tests
                                                            +python3 tools/docs_check.py
                                                            +python3 tools/manifest_check.py
                                                            +python3 -m unittest discover -s tools/tests
                                                            +gh pr checks 21 --repo RCOSDP/RDM-developer-guide
                                                            +
                                                            +

                                                            共有 checkout の tools テストも66件すべて合格し、manifest/非公開 URL 方針検査は検出0件で合格した。gh api で取得した Playwright 1.47 の生成 API に route_web_socket メソッドがないことも確認した。

                                                            +

                                                            元の Semgrep 失敗は0700ディレクトリ権限2箇所と合成 JWT リテラル1箇所である。権限を緩めて直すべきではなく、追補は根拠付き除外とテスト文字列の構築を使用する。指定 head の CI と 追補 CI は別の証跡である。

                                                            +

                                                            パッケージ試験が一時アーカイブ内に installer/build/ を作り、その一時領域の文書検査が追加で失敗した。その生成物だけを除去して再実行し、51件検査・エラー0となった。アーカイブには Git 情報がないので非公開 URL 方針検査を実行できず、実 checkout と CI の検査を証拠とした。この検証作業の生成物による失敗を PR の欠陥とは扱わない。未追跡の新レビュー自体も docs_check.check_file へ直接渡し、エラー0を確認した。追跡済みファイルだけを見る通常コマンドには含まれないためである。

                                                            +

                                                            DEMO-20 第1回は、英和でコマンド・ホスト情報・5段階の結果・3イメージの結果が一致する。起動前の終了30と明記し、導入完了と誤記していない。build の制御も最初の失敗で止まる。ただし全ログは作者のセッション作業領域にしかなく、ホスト実測・サイズ・パッケージ失敗を本レビューで独立再確認したわけではない。mfr の失敗だけでは ember/cas の arm64 不可や amd64 成功を証明しない。また「runtime にビルド済みイメージ2つ」は Docker のイメージ保管場所と runtime のファイルを区別すべきである。第2回や M2 受入完了は認定していない。

                                                            +

                                                            必要な次の作業

                                                            +

                                                            R2-01〜R2-05 を直し、失敗経路を通る試験を加えて、その head を再レビューする。実導入・build・起動、初期化済み DB の旧認証拒否、ブラウザ C1〜C6、実ネットワーク挙動は第二段階の証跡とする。M3 向け skip と upstream の未実装入口は受入完了ではない。本レビューはレッドチーム実行やマージの承認ではない。

                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            BaselineChecks that every installation must pass.すべての導入が通る必須検査。
                                                            TraceA saved record of browser actions and network exchanges.ブラウザ操作と通信を保存した記録。
                                                            OriginThe exact scheme, host and port of a URL.URL の方式・ホスト・ポートの組合せ。
                                                            Canary / controlA known reachable target used to check the probe itself.検査自体が動くか確かめる既知の接続先。
                                                            RollbackRestore the previous working values after a failure.失敗後に以前の値へ戻す処理。
                                                            CIAutomatic checks run for a proposed code change.変更案に対して自動で実行する検査。
                                                            SBOMA list of the software parts in an image or project.イメージやプロジェクトに入るソフトウェア部品の一覧。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1/index.html b/site/reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1/index.html new file mode 100644 index 0000000..8ff86af --- /dev/null +++ b/site/reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1/index.html @@ -0,0 +1,2804 @@ + + + + + + + + + + + + + + + + + + + + + + + PR #1 public develop merge — REV review r1 / 公開 develop 統合レビュー - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            PR #1 public develop merge — REV review r1 / 公開 develop 統合レビュー

                                                            +

                                                            Jump: English · 日本語

                                                            +

                                                            Version: 0.1 — 2026-11-05

                                                            +

                                                            Learned / 分かったこと: the merge preserves both upstream histories and the private tree outside two public files; conflict-free integration does not establish test correctness or compliance with the documented integration order.

                                                            +

                                                            Reviewer: REV(担当レビュワ, Codex Astra)

                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: review r1 of RDM-osf.io-dev2027 PR #1 by REV (Codex Astra); header lines added by QAE for SPEC-06 compliance, body unchanged. / REV(Codex Astra)による PR #1 のレビュー r1。見出し行は SPEC-06 準拠のため QAE が追加し、本文は変更していない。
                                                            • +
                                                            • Related: docs/reviews/README.md · ADR-04 AI Autonomy and Roles · SPEC-01 Manifest
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            Verdict: request changes

                                                            +

                                                            Reviewed repository RCOSDP/RDM-osf.io-dev2027, PR #1, head 546969eb33f42e35be5dc5c5ac8bfe55e3ef0bbc. This is a review recommendation, not a submitted approval or merge. No production-code regression or loss of private hardening was found in the two-file delta. Resolve R1 and R2 before merging; R3 is an owner disclosure decision.

                                                            +

                                                            Findings, ranked by severity

                                                            +
                                                              +
                                                            1. R1 — Medium (P2): the new anonymous API 2.10 test supplies authentication. At head, api_tests/users/views/test_user_detail.py:260–262, test_social_values_old_version_not_logged_in passes auth=user_one while expecting 401. The same test's 2.9 request at lines 256–258 omits authentication; successful authenticated requests at lines 234–248 use user_one.auth. Consequently the 2.10 case is not a clean test of absent credentials: rejection of the supplied authentication can satisfy the assertion, or helper handling can fail before the intended assertion. Remove the auth argument and run both versions' anonymous and authenticated cases. This defect originates in public commit 3243fd7; preserve that history and add a follow-up fix. Runtime failure is not claimed: the test suite was not executed.
                                                            2. +
                                                            3. R2 — Medium (P2): the stated integration order does not describe the actual topology. PR body “内容” item 2 and merge commit body line 4 claim the SPEC-01 public → private → adopted-PR order. However the first parent is the already-private tip 3f4c9cd, and the second is newer public tip bacfe64. SPEC-01 §4 rule 3 fixes the order. This is a private-seeded incremental public merge, not a literal execution of that recipe. The non-overlap makes the resulting content safe from a private/public conflict in this instance, but does not resolve the policy statement. Correct the PR explanation and record the owner's accepted bootstrap/incremental interpretation or exception in documentation; if strict reconstruction is required, propose it separately without rewriting or force-pushing upstream history. An additional commit can clarify the historical commit's assertion without amending it.
                                                            4. +
                                                            5. R3 — Low (P3): a conversation-session URL is retained in metadata. PR body line 14 and merge commit body line 8 (Claude-Session) contain a link to an individual AI session. It is not a private repository URL, and no access token or password was found in the inspected PR metadata/delta. The session's contents and access controls were not inspected, so it is not proven to expose secrets. The owner should decide whether this provenance link belongs in durable metadata; remove it from the editable PR body if unnecessary. Do not reproduce the URL in public review records or rewrite history merely to remove a non-secret reference.
                                                            6. +
                                                            +

                                                            Verification and evidence

                                                            +
                                                              +
                                                            • Read gh pr view 1 -R RCOSDP/RDM-osf.io-dev2027 --json title,body,commits,files (also head/base SHA) and gh pr diff 1 -R RCOSDP/RDM-osf.io-dev2027.
                                                            • +
                                                            • gh api repos/RCOSDP/RDM-osf.io-dev2027/commits/546969eb33f42e35be5dc5c5ac8bfe55e3ef0bbc confirms exactly two parents: 3f4c9cd32e2e118f42a6b5aacbe2a5ff066a8a38 and bacfe64fdc002f09df47145fc17f57630772ac82. This is a real merge, not a squash. The three public commits retain their original SHAs: 5f78e37d591986ace4d241c992c1454e8af0a632 (permission), 3243fd7943428cb5e0c1f3a741b354dfa1369bdb (tests), and bacfe64fdc002f09df47145fc17f57630772ac82 (public PR merge). Historical force-push activity cannot be established from this snapshot alone.
                                                            • +
                                                            • The requested compare endpoint compare/upstream/public-develop...upstream/private-develop reports divergence: private ahead 161, behind 3, common ancestor b7eacc4c2f2a50f72f3489fc9c3d105b46ea8108. Its 260 changed files do not include either incoming file; thus there is no net file overlap, including private security changes. This checks net changes, not every transient edit in 161 commits.
                                                            • +
                                                            • Compared the pinned private tip → PR head against common ancestor → pinned public tip using the compare API. Both return exactly api/users/views.py and api_tests/users/views/test_user_detail.py; both patches and final blob SHAs match. No other private-base files change. This establishes preservation of the private tree, including hardening outside these files, rather than relying only on the PR's “no conflicts” claim.
                                                            • +
                                                            • api/users/views.py:177–184 requires authentication while retaining current-user/write and token-scope permissions. Inspected the test changes, api_tests/conftest.py:10–11, and tests/json_api_test_app.py:41–51 to identify the test application. Authenticated cross-user access remains tested in test_get.
                                                            • +
                                                            • The new integration commit uses a scoped Japanese merge(upstream): subject and includes reason, validation, and the explicit deferral of build/acceptance to M2. These requested convention elements are present; R2 concerns factual accuracy. Existing English upstream subjects should not be rewritten to enforce local style.
                                                            • +
                                                            • Manually inspected all four PR commit messages, PR body and two-file patch for secrets/credentials/private URLs. Found the session reference described in R3, no obvious credential and no private repository URL. This is not a full-history or automated secret scan.
                                                            • +
                                                            • GitHub checks at inspection: JavaScript/TypeScript CodeQL passed; Python CodeQL and two build-image jobs were pending. No local build, application test, or acceptance test was run. Pending checks are not passes, and static tree preservation is not proof of runtime compatibility.
                                                            • +
                                                            +

                                                            Owner decisions before merge

                                                            +

                                                            Require R1's follow-up test correction and targeted execution evidence. Resolve R2's integration-order interpretation and accurately document it without rewriting upstream history. Decide R3's session-link retention and whether to accept deferring broader build/acceptance testing to M2; obtain the final required CI results. Explicitly accept that anonymous user-detail reads, including view-only-link requests, are now denied; validate dependent clients at M2. Preserve both upstream histories with a normal merge, not squash/rebase. This review makes no changes to the reviewed repository beyond the single requested PR comment.

                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            判定: request changes(修正要求)

                                                            +

                                                            対象は RCOSDP/RDM-osf.io-dev2027 PR #1、head 546969eb33f42e35be5dc5c5ac8bfe55e3ef0bbc。これはレビュー上の推奨判定であり、承認やマージ操作ではありません。2ファイルの差分から、本番コードの回帰や非公開側のセキュリティ変更の消失は見つかりませんでした。マージ前に R1・R2 を解決し、R3 は所有者が情報公開の観点から判断してください。

                                                            +

                                                            重要度順の指摘

                                                            +
                                                              +
                                                            1. R1 — 中(P2): 未ログインの API 2.10 試験に認証引数が残っています。 head の api_tests/users/views/test_user_detail.py:260–262 は test_social_values_old_version_not_logged_in で auth=user_one を渡し、401 を期待しています。同じ試験の 2.9(256–258行)は認証なし、認証成功ケース(234–248行)は user_one.auth です。2.10 は資格情報が存在しない場合の純粋な試験になっておらず、渡した認証の拒否でも期待値を満たす、またはヘルパーの扱いによって検証前に失敗する可能性があります。auth 引数を除去し、両バージョンの未認証・認証済みケースを実行してください。公開コミット 3243fd7 由来なので、その履歴を保持して追加コミットで修正します。試験未実行のため、実行時の失敗を断定するものではありません。
                                                            2. +
                                                            3. R2 — 中(P2): 説明する統合順と実際の履歴が一致しません。 PR本文「内容」の2項目とマージコミット本文4行目は SPEC-01 の公開 → 非公開 → 採用PR の順を主張しています。しかし第1親は既に非公開側を含む 3f4c9cd、第2親が新しい公開側 bacfe64 です。SPEC-01 §4 規則3 の手順を文字どおり実施した形ではなく、非公開側起点の増分公開マージです。今回は差分ファイルが重ならず非公開・公開間の競合による消失はありませんが、規則との説明上の不一致は残ります。PR説明を訂正し、初期化・増分更新として認める解釈または例外を所有者判断として文書化してください。厳密な再構築が必要なら、上流履歴の書換えや force-push をせず別途提案します。過去コミットの説明は amend ではなく追加コミットで補足できます。
                                                            4. +
                                                            5. R3 — 低(P3): 会話セッションへのURLがメタデータにあります。 PR本文14行目、マージコミット本文8行目の Claude-Session に個別AIセッションへのリンクがあります。非公開リポジトリURLではなく、検査したメタデータ・差分にはアクセストークンやパスワードは見つかりませんでした。セッション内容とアクセス制御は確認していないため、秘密漏えいとは断定しません。所有者は永続メタデータに残す必要性を判断し、不要なら編集可能なPR本文から除去してください。公開レビュー記録にURLを転載せず、秘密でない参照を消すだけの目的で履歴を書き換えないでください。
                                                            6. +
                                                            +

                                                            確認方法と根拠

                                                            +
                                                              +
                                                            • 指定された gh pr view(title/body/commits/files、追加で head/base SHA)と gh pr diff を確認しました。
                                                            • +
                                                            • head のコミットAPIが返した親は 3f4c9cd32e2e118f42a6b5aacbe2a5ff066a8a38 と bacfe64fdc002f09df47145fc17f57630772ac82 の2つです。squash ではなく真のマージです。公開側の権限修正 5f78e37d591986ace4d241c992c1454e8af0a632、試験修正 3243fd7943428cb5e0c1f3a741b354dfa1369bdb、公開PRマージ bacfe64fdc002f09df47145fc17f57630772ac82 は元のSHAで保持されています。この時点の履歴だけから過去の force-push 有無までは判断できません。
                                                            • +
                                                            • 指定の compare/upstream/public-develop...upstream/private-develop は private ahead 161 / behind 3、共通祖先 b7eacc4c2f2a50f72f3489fc9c3d105b46ea8108 を返しました。非公開側の変更260ファイルと、今回の2ファイルとの積集合は空です。セキュリティ変更を含む最終差分の重複はありません。161コミット中の一時的な編集すべてを調べたという意味ではありません。
                                                            • +
                                                            • 固定した非公開tip→PR head と、共通祖先→固定した公開tip を compare API で比較しました。双方とも api/users/views.py と api_tests/users/views/test_user_detail.py の2ファイルだけで、patch と最終blob SHAも一致します。それ以外の非公開側ファイルは変更されておらず、関連するセキュリティ強化の保持を「衝突なし」という説明以外の根拠で確認しました。
                                                            • +
                                                            • api/users/views.py:177–184 で認証必須化と、本人による更新・トークンスコープ権限の保持を確認しました。試験差分、api_tests/conftest.py:10–11、tests/json_api_test_app.py:41–51 で試験アプリも確認しています。認証済み別ユーザーからの参照は test_get に残っています。
                                                            • +
                                                            • 新しい統合コミットは日本語の merge(upstream):、理由、検証、ビルド・受入の M2 延期を明記し、指定された形式要素を満たしています。R2 は事実関係の問題です。既存の英語上流コミットをローカル規約に合わせて書き換える必要はありません。
                                                            • +
                                                            • PRの4コミットのメッセージ、本文、2ファイルの差分を目視確認しました。R3 のセッション参照以外に明白な資格情報・非公開リポジトリURLはありません。全履歴の検査や自動秘密スキャンではありません。
                                                            • +
                                                            • 確認時点では JavaScript/TypeScript CodeQL が成功、Python CodeQL と2件の build-image は pending でした。ローカルのビルド・アプリ試験・受入試験は実行していません。pending は成功ではなく、静的なツリー保持だけでは動作互換性を保証しません。
                                                            • +
                                                            +

                                                            マージ前に所有者が決めること

                                                            +

                                                            R1 の追加修正と対象試験の実行結果を求めてください。R2 の統合順の扱いを決め、上流履歴を書き換えず正確に記録してください。R3 のリンク保持と、広範なビルド・受入を M2 に延期することの受容可否を判断し、必須CIの最終結果を確認してください。view-onlyリンクを含め未認証のユーザー詳細参照が拒否される変更を明示的に受容し、依存クライアントは M2 で検証します。squash/rebase ではなく通常マージで両上流の履歴を保持してください。このレビューでは指定されたPRコメント1件以外、対象リポジトリを変更しません。

                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2/index.html b/site/reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2/index.html new file mode 100644 index 0000000..50af9ae --- /dev/null +++ b/site/reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2/index.html @@ -0,0 +1,2847 @@ + + + + + + + + + + + + + + + + + + + + + + + PR #1 public develop merge — REV review r2 / 公開 develop 統合再レビュー - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            PR #1 public develop merge — REV review r2 / 公開 develop 統合再レビュー

                                                            +

                                                            Jump: English · 日本語

                                                            +

                                                            Version: 0.1 — 2026-11-05

                                                            +

                                                            Learned / 分かったこと: the anonymous test correction preserves upstream history; explaining an initial integration exception does not itself constitute owner acceptance. / 未認証試験は履歴を保持して修正されたが、初回統合の例外を説明することと所有者が承認することは別である。

                                                            +

                                                            Reviewer: REV(担当レビュワ, Codex Astra)

                                                            +

                                                            Previous record: r1

                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: review r2 of RDM-osf.io-dev2027 PR #1 by REV (Codex Astra); header lines added by QAE for SPEC-06 compliance, body unchanged. / REV(Codex Astra)による PR #1 のレビュー r2。見出し行は SPEC-06 準拠のため QAE が追加し、本文は変更していない。
                                                            • +
                                                            • Related: docs/reviews/README.md · ADR-04 AI Autonomy and Roles · SPEC-01 Manifest
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            Verdict: request changes — R1 code correction verified; R2 owner decision outstanding

                                                            +

                                                            Re-reviewed RCOSDP/RDM-osf.io-dev2027 PR #1 at head ef2be2c815e2432c86d89e0480e77674710f5912. No new code defect was found in the follow-up. This verdict concerns the unresolved integration-policy decision, not a request to rewrite the merge. No approval or merge was submitted.

                                                            +

                                                            Findings and disposition

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            Priority / IDStatusEvidence and remaining action
                                                            P2 / R2Partially resolved; owner decision pendingPR body lines 2–3 now correctly describe a private-seeded incremental merge. Line 7 nevertheless says the initial construction “satisfied” SPEC-01, while line 8 requests owner approval to document that interpretation in ADR-01. SPEC-01 §4, currently line 94, still fixes public → private → adopted PRs; ADR-01, lines 52–59, still describes public-history initialization and the same order. Record the owner's acceptance and align the normative documentation before treating the exception as settled. Until then, label it a proposed interpretation rather than established compliance.
                                                            P2 / R1Code issue resolved; runtime evidence deferredapi_tests/users/views/test_user_detail.py:260–262 now calls the API 2.10 endpoint without an auth argument and expects 401, matching the 2.9 anonymous case. The follow-up changes exactly one line. Both authenticated-version cases remain present. No further code correction is requested for R1; targeted execution remains unverified and is explicitly deferred to M2 in the PR.
                                                            P3 / R3Retained as requested; owner decision pending, not a demonstrated secretThe assignment says the session reference is mandatory report metadata and is retained for owner judgment. The PR and follow-up commit retain it. This review accepts that stated handling and does not demand deletion or history rewriting. No obvious credential was found in the updated metadata or delta; session access controls/content were not inspected. The URL is not reproduced here.
                                                            +

                                                            The new PR body's “private is a superset” statement should be understood relative to the shared older public history, not to the newer bacfe64 tip: the r1 comparison showed private ahead 161 and behind 3. Non-overlapping net changes support this particular integration's content preservation, not a general exception to ordering policy.

                                                            +

                                                            What was verified

                                                            +
                                                              +
                                                            • Re-read gh pr view 1 -R RCOSDP/RDM-osf.io-dev2027 --json title,body,commits,files,headRefOid,baseRefOid and the full gh pr diff.
                                                            • +
                                                            • The commit API confirms ef2be2c815e2432c86d89e0480e77674710f5912 has exactly one parent, the previously reviewed merge 546969eb33f42e35be5dc5c5ac8bfe55e3ef0bbc. Its sole patch removes the authentication argument from one test request.
                                                            • +
                                                            • Rechecked that merge's two parents: private 3f4c9cd32e2e118f42a6b5aacbe2a5ff066a8a38 and public bacfe64fdc002f09df47145fc17f57630772ac82. All three original public commits and the original integration merge remain in the PR's commit list. The new head is an ordinary follow-up commit, not itself a merge; ancestry is preserved.
                                                            • +
                                                            • Fetched the test file at the exact new head. Python AST parsing succeeded, and a targeted structural assertion confirmed that both get calls in test_social_values_old_version_not_logged_in omit auth. This is syntax/structure verification, not an application test or HTTP result.
                                                            • +
                                                            • The PR still changes only the original two files. Since the delta from r1 is solely that public-origin test correction, r1's private-tree preservation finding remains applicable; the 260-file comparison was not rerun. Production permission changes are unchanged.
                                                            • +
                                                            • The new Japanese fix(api-tests): commit includes a reason, explicit test non-execution, M2 validation plans, and an explanation of the proposed R2 interpretation. It corrects the historical explanation without amending existing commits.
                                                            • +
                                                            • gh pr checks for the new head reported both CodeQL languages and both build-image jobs pending (exit 8). The PR body's statement that JS/TS CodeQL passed is from an earlier run and does not establish success for this head. No runtime test or build was performed by this reviewer.
                                                            • +
                                                            +

                                                            Before merging

                                                            +

                                                            The owner must accept or reject the initial-construction interpretation and record the accepted policy consistently in ADR-01/SPEC-01. The owner must also decide whether M2 deferral of targeted runtime verification is acceptable, retain the session reference under the stated reporting requirement, and confirm final required CI results for this head. The anonymous user-detail access restriction remains an intentional behavior change to cover in acceptance testing. Use a normal merge preserving upstream history. No force-push, approval, merge, or repository code edit was performed during this re-review; the only remote write is the requested r2 comment.

                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            判定: request changes(修正要求)— R1 のコード修正を確認、R2 の所有者判断が未決

                                                            +

                                                            対象は RCOSDP/RDM-osf.io-dev2027 PR #1、head ef2be2c815e2432c86d89e0480e77674710f5912。追加修正に新しいコード不具合は見つかりませんでした。この判定は統合規則の解釈が未決であることによるもので、マージ履歴の書換えを求めるものではありません。承認・マージ操作は行っていません。

                                                            +

                                                            指摘と対応状況

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            重要度 / ID状況根拠と残作業
                                                            P2 / R2一部解決・所有者判断待ちPR本文2–3行目は private 起点の増分マージを正しく説明しています。一方、7行目では初回構築で SPEC-01 を「満たした」とし、8行目では ADR-01 に解釈を記録する所有者承認を求めています。SPEC-01 §4 の現94行目は公開→private→採用PRを固定し、ADR-01 の52–59行目も公開履歴による初期化と同じ順序を規定しています。例外を確定扱いにする前に、所有者の受容を記録し規範文書と整合させてください。それまでは適合済みではなく「提案する解釈」と記述します。
                                                            P2 / R1コード上は解決・実行証跡は延期api_tests/users/views/test_user_detail.py:260–262 の2.10要求は auth 引数なしで401を期待し、2.9未認証ケースと一致しています。追加修正はこの1行だけです。認証済みの両バージョンの試験も残っています。R1 の追加コード修正は求めませんが、対象試験の実行は未検証で、PRはM2への延期を明記しています。
                                                            P3 / R3指示どおり保持・所有者判断待ち、秘密値とは断定せず今回の依頼ではセッション参照を帳票の必須メタデータとして保持し、所有者判断に委ねるとされています。PRと追加コミットに保持されています。その扱いを受け入れ、削除や履歴書換えは求めません。更新メタデータ・差分に明白な資格情報は見つかりませんでしたが、セッションの内容・アクセス制御は未確認です。URLは本記録に転載しません。
                                                            +

                                                            PR本文の「private は上位互換」は共通の古い公開履歴に対する説明として扱う必要があります。新しい公開tip bacfe64 に対しては、r1で private ahead 161 / behind 3 を確認しています。最終差分が重ならないことは今回の内容保持の根拠ですが、統合順の一般的な例外を成立させる根拠ではありません。

                                                            +

                                                            確認したこと

                                                            +
                                                              +
                                                            • gh pr view で title/body/commits/files/headRefOid/baseRefOid を再取得し、gh pr diff の全差分を確認しました。
                                                            • +
                                                            • コミットAPIで新head ef2be2c815e2432c86d89e0480e77674710f5912 の親が、前回レビューした 546969eb33f42e35be5dc5c5ac8bfe55e3ef0bbc の1つだけであることを確認しました。差分は試験要求の認証引数を除く1行だけです。
                                                            • +
                                                            • 元マージの親が private 3f4c9cd32e2e118f42a6b5aacbe2a5ff066a8a38 と public bacfe64fdc002f09df47145fc17f57630772ac82 の2つであることを再確認しました。公開3コミットと元の統合コミットもPRのコミット一覧に残っています。新head自体は通常の追加コミットであり、マージではありません。祖先履歴は保持されています。
                                                            • +
                                                            • 新headに固定して試験ファイルを取得しました。Python AST構文解析と対象メソッド内の2つの get 呼出しに auth がないことを確認する構造検査が成功しました。これは構文・構造の検証であり、アプリ試験やHTTP結果の確認ではありません。
                                                            • +
                                                            • PRの変更ファイルは引き続き元の2ファイルのみです。r1以降の差分は公開由来の試験1行だけなので、r1の非公開側ツリー保持の結論は引き続き有効です。260ファイルの比較は再実行していません。本番の権限変更も変わっていません。
                                                            • +
                                                            • 追加コミットは日本語の fix(api-tests): を用い、理由、試験未実行、M2での検証予定、R2の解釈提案を明記しています。既存コミットをamendせず、過去の説明を補足しています。
                                                            • +
                                                            • 新headの gh pr checks は両言語のCodeQLと2件の build-image がすべてpending(終了値8)でした。PR本文のJS/TS CodeQL合格は以前の実行の記載であり、このheadの成功証跡ではありません。レビュワによる実行試験・ビルドは行っていません。
                                                            • +
                                                            +

                                                            マージ前に必要な判断

                                                            +

                                                            所有者は初回構築の解釈を採否判断し、受容した規則をADR-01/SPEC-01と整合する形で記録してください。対象試験の動作検証をM2へ延期することの受容可否、帳票要件に基づくセッション参照の保持、新headの必須CI最終結果も確認してください。未認証ユーザー詳細参照の拒否は意図的な動作変更として受入試験に含めます。上流履歴を保持する通常マージを用いてください。再レビューではforce-push・承認・マージ・対象コード編集は行わず、リモートへの書込みは指定されたr2コメントだけです。

                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/reviews/index.html b/site/reviews/index.html new file mode 100644 index 0000000..98ebcb9 --- /dev/null +++ b/site/reviews/index.html @@ -0,0 +1,2930 @@ + + + + + + + + + + + + + + + + + + + + + + + Review Records / レビュー記録 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            Review Records / レビュー記録

                                                            +
                                                            +

                                                            Summary: Independent assessment of pull requests: each record is a dated file named YYYY-MM-DD_<em>rN.md, written by REV (Codex Astra). Reviews are linked from the PR and stored here for auditability. +<strong>概要:</strong> プルリクエストの独立した評価:各記録は日付付きファイル、YYYY-MM-DD</em><Title>_rN.md の形式。REV(Codex Astra)が書く。レビューは PR からリンクされ、監査のためにここに保管される。</p> +</blockquote> +<p><strong>Jump:</strong> <a href="#english">English</a> · <a href="#japanese">日本語</a></p> +<ul> +<li>Version / 版: 0.1 — 2026-11-05. <strong>Learned:</strong> every PR gets an independent review, and the review must be kept as its own record so that what was checked, and why, can be read later. / すべての PR は独立したレビューを受け、何をなぜ確かめたかを後から読めるよう、レビューは独自の記録として残す必要があると分かった。</li> +<li>Normative for: <a href="../spec/04_acceptance_tests/">SPEC-04 Acceptance Tests</a> review section, <a href="../decisions/ADR-04_AI_Autonomy_and_Roles/">ADR-04 AI Autonomy and Roles</a> review section.</li> +<li>Related: <a href="../">../README.md</a> · <a href="../handoff/">handoff/</a> · <a href="../status/">status/</a></li> +</ul> +<hr /> +<p><a id="english"></a></p> +<h2 id="english">English<a class="headerlink" href="#english" title="Permanent link">¶</a></h2> +<p><a href="#japanese">→ 日本語版へ</a></p> +<h3 id="1-what-belongs-here">1. What belongs here<a class="headerlink" href="#1-what-belongs-here" title="Permanent link">¶</a></h3> +<p>A <em>review record</em> documents REV's (Codex Astra) independent assessment of a pull request. This folder contains:</p> +<table> +<thead> +<tr> +<th>Type</th> +<th>Naming convention</th> +<th>Description</th> +</tr> +</thead> +<tbody> +<tr> +<td>Review</td> +<td><code>YYYY-MM-DD_<Title>_rN.md</code></td> +<td>Review of PR #<N>; includes findings, approval/rejection, and suggestions.</td> +</tr> +</tbody> +</table> +<h3 id="2-review-format">2. Review format<a class="headerlink" href="#2-review-format" title="Permanent link">¶</a></h3> +<p>A review record includes:</p> +<ul> +<li>Date of review</li> +<li>PR title and number</li> +<li>Scope of review (files changed, lines affected)</li> +<li>Findings: security issues, bugs, style issues</li> +<li>Approval status: approved / rejected / needs revision</li> +<li>Suggested changes (if rejection or revision needed)</li> +</ul> +<h3 id="3-open-items-no-entries-yet--まだありません">3. Open items (no entries yet / まだありません)<a class="headerlink" href="#3-open-items-no-entries-yet--まだありません" title="Permanent link">¶</a></h3> +<table> +<thead> +<tr> +<th>Date</th> +<th>Title</th> +<th>PR</th> +<th>Status</th> +</tr> +</thead> +<tbody> +<tr> +<td>—</td> +<td>—</td> +<td>—</td> +<td>—</td> +</tr> +</tbody> +</table> +<h3 id="4-creating-a-new-review-record">4. Creating a new review record<a class="headerlink" href="#4-creating-a-new-review-record" title="Permanent link">¶</a></h3> +<ol> +<li>Name the file <code>YYYY-MM-DD_<Title>_rN.md</code>.</li> +<li>Link to the PR number in the header.</li> +<li>Describe scope, findings, and approval decision.</li> +<li>Link from the PR as "reviewed by REV (Codex Astra)".</li> +</ol> +<hr /> +<p><a id="japanese"></a></p> +<h2 id="日本語">日本語<a class="headerlink" href="#日本語" title="Permanent link">¶</a></h2> +<p><a href="#english">→ To English</a></p> +<h3 id="1-ここに属するもの">1. ここに属するもの<a class="headerlink" href="#1-ここに属するもの" title="Permanent link">¶</a></h3> +<p>「レビュー記録」は REV(Codex Astra)がプルリクエストに対して行った独立した評価を文書化します。このフォルダには次が含まれます:</p> +<table> +<thead> +<tr> +<th>種別</th> +<th>命名規則</th> +<th>説明</th> +</tr> +</thead> +<tbody> +<tr> +<td>レビュー</td> +<td><code>YYYY-MM-DD_<Title>_rN.md</code></td> +<td>PR #<N> のレビュー。調査結果、承認/拒否、提案を含む。</td> +</tr> +</tbody> +</table> +<h3 id="2-レビューの形式">2. レビューの形式<a class="headerlink" href="#2-レビューの形式" title="Permanent link">¶</a></h3> +<p>レビュー記録には次が含まれます:</p> +<ul> +<li>レビュー日</li> +<li>PR の題名と番号</li> +<li>レビュー範囲(変更ファイル、影響行)</li> +<li>調査結果:セキュリティ問題、バグ、スタイル問題</li> +<li>承認ステータス:承認/拒否/修正必要</li> +<li>提案される変更(拒否または修正が必要な場合)</li> +</ul> +<h3 id="3-未解決項目まだありません--no-entries-yet">3. 未解決項目(まだありません / no entries yet)<a class="headerlink" href="#3-未解決項目まだありません--no-entries-yet" title="Permanent link">¶</a></h3> +<table> +<thead> +<tr> +<th>日付</th> +<th>タイトル</th> +<th>PR</th> +<th>ステータス</th> +</tr> +</thead> +<tbody> +<tr> +<td>—</td> +<td>—</td> +<td>—</td> +<td>—</td> +</tr> +</tbody> +</table> +<h3 id="4-新しいレビュー記録をつくるには">4. 新しいレビュー記録をつくるには<a class="headerlink" href="#4-新しいレビュー記録をつくるには" title="Permanent link">¶</a></h3> +<ol> +<li>ファイル名を <code>YYYY-MM-DD_<Title>_rN.md</code> にする。</li> +<li>ヘッダに PR 番号へリンクする。</li> +<li>範囲、調査結果、承認決定を記述する。</li> +<li>PR から「REV(Codex Astra)レビュー済み」としてリンクする。</li> +</ol> +<hr /> +<h2 id="glossary--用語">Glossary / 用語<a class="headerlink" href="#glossary--用語" title="Permanent link">¶</a></h2> +<table> +<thead> +<tr> +<th>Term</th> +<th>English note</th> +<th>日本語注</th> +</tr> +</thead> +<tbody> +<tr> +<td>Review record</td> +<td>A document of REV's independent assessment of a PR.</td> +<td>PR の REV の独立した評価を文書化したもの。</td> +</tr> +<tr> +<td>Reviewer (REV)</td> +<td>Codex Astra, the independent PR reviewer.</td> +<td>独立した PR レビュー担当者(Codex Astra)。</td> +</tr> +<tr> +<td>Approval status</td> +<td>Whether the PR is approved, rejected, or needs revision.</td> +<td>PR が承認、拒否、または修正必要かどうか。</td> +</tr> +<tr> +<td>Findings</td> +<td>Security issues, bugs, or style issues discovered during review.</td> +<td>レビュー中に発見したセキュリティ問題、バグ、スタイル問題。</td> +</tr> +<tr> +<td>Auditability</td> +<td>The ability to verify that a process was done correctly.</td> +<td>プロセスが正しく行われたか検証できる能力。</td> +</tr> +</tbody> +</table> + + + + + + + + + + + + + + </article> + </div> + + +<script>var target=document.getElementById(location.hash.slice(1));target&&target.name&&(target.checked=target.name.startsWith("__tabbed_"))</script> + </div> + + </main> + + <footer class="md-footer"> + + <div class="md-footer-meta md-typeset"> + <div class="md-footer-meta__inner md-grid"> + <div class="md-copyright"> + + + Made with + <a href="https://squidfunk.github.io/mkdocs-material/" target="_blank" rel="noopener"> + Material for MkDocs + </a> + +</div> + + </div> + </div> +</footer> + + </div> + <div class="md-dialog" data-md-component="dialog"> + <div class="md-dialog__inner md-typeset"></div> + </div> + + + <script id="__config" type="application/json">{"base": "..", "features": ["navigation.tabs", "navigation.sections", "toc.scrollspy", "content.code.copy"], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}}</script> + + + <script src="../assets/javascripts/bundle.d6f25eb3.min.js"></script> + + <script src="../assets/mermaid.min.js"></script> + + <script src="../assets/mermaid-init.js"></script> + + + </body> +</html> \ No newline at end of file diff --git a/site/search/search_index.json b/site/search/search_index.json new file mode 100644 index 0000000..80773b8 --- /dev/null +++ b/site/search/search_index.json @@ -0,0 +1 @@ +{"config":{"lang":["en"],"separator":"[\\s\\-]+","pipeline":["stopWordFilter"]},"docs":[{"location":"","title":"Documentation Index / \u6587\u66f8\u7d22\u5f15","text":"<p>Summary: The index of all documents in this repository: policies (our position), specifications (rules to implement), decisions (why we chose), demos (records of what was actually done), status (milestone progress), hand-offs (requests to other teams), reviews (review records), and reference (external facts). A Mermaid diagram shows how a change flows through the process. \u6982\u8981: \u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u3059\u3079\u3066\u306e\u6587\u66f8\u306e\u7d22\u5f15\u3002\u65b9\u91dd\uff08\u79c1\u305f\u3061\u306e\u7acb\u5834\uff09\u3001\u4ed5\u69d8\uff08\u5b9f\u88c5\u3059\u308b\u30eb\u30fc\u30eb\uff09\u3001\u6c7a\u5b9a\uff08\u306a\u305c\u9078\u3093\u3060\u304b\uff09\u3001\u5b9f\u8a3c\uff08\u5b9f\u969b\u306b\u3084\u3063\u305f\u3053\u3068\u306e\u8a18\u9332\uff09\u3001\u9032\u6357\uff08\u7bc0\u76ee\u306e\u9032\u884c\u72b6\u6cc1\uff09\u3001\u5f15\u7d99\u304e\uff08\u4ed6\u306e\u30c1\u30fc\u30e0\u3078\u306e\u4f9d\u983c\uff09\u3001\u30ec\u30d3\u30e5\u30fc\uff08\u30ec\u30d3\u30e5\u30fc\u8a18\u9332\uff09\u3001\u53c2\u8003\uff08\u5916\u90e8\u4e8b\u5b9f\uff09\u3002Mermaid \u56f3\u306f\u3001\u5909\u66f4\u304c\u30d7\u30ed\u30bb\u30b9\u3092\u901a\u308b\u6d41\u308c\u3092\u793a\u3057\u307e\u3059\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: without a single index page, it was unclear which folder to check for the latest milestone status or review records; putting everything in one place makes the documentation tree navigable. \uff0f \u5358\u4e00\u306e\u7d22\u5f15\u30da\u30fc\u30b8\u304c\u7121\u3051\u308c\u3070\u3001\u6700\u65b0\u306e\u7bc0\u76ee\u9032\u6357\u3084\u30ec\u30d3\u30e5\u30fc\u8a18\u9332\u3092\u3069\u306e\u30d5\u30a9\u30eb\u30c0\u3067\u63a2\u3059\u3079\u304d\u304b\u5206\u304b\u3089\u305a\u3001\u6587\u66f8\u30c4\u30ea\u30fc\u306e\u30ca\u30d3\u30b2\u30fc\u30c8\u304c\u4e0d\u53ef\u80fd\u306b\u306a\u308b\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Normative for: every document under <code>docs/</code>, especially README.md files.</li> <li>Related: ../README.md \u00b7 site/index.html</li> </ul> <p></p>"},{"location":"#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"#1-document-folders","title":"1. Document folders","text":"Folder Description policy/ Our position on what we will and will not do. Each document states our stance on a topic. spec/ Rules to implement: specifications, acceptance tests, security gate, installer CLI. decisions/ Decision records: why we chose one way and not another. demo/ Records of what was actually done: acceptance runs, integration test results. status/ Milestone progress: M1\u2013M5 status, open items, upstream tracking reports. handoff/ Requests to other teams: dated files, named YYYY-MM-DD_.md.</td> </tr> <tr> <td><a href=\"reviews/\">reviews/</a></td> <td>Review records: dated files, named YYYY-MM-DD_<Title>_rN.md.</td> </tr> <tr> <td><a href=\"reference/\">reference/</a></td> <td>External facts: glossary, tool versions, upstream metadata.</td> </tr> </tbody> </table> <h3 id=\"2-how-a-change-flows\">2. How a change flows<a class=\"headerlink\" href=\"#2-how-a-change-flows\" title=\"Permanent link\">\u00b6</a></h3> <pre class=\"mermaid\"><code>flowchart TD A[Demo / Acceptance run] --> B{Pass?} B -- yes --> C[Policy: position on the change] B -- no --> D[Policy: rejection reason] C --> E[Spec / ADR: rules to implement the change] D --> E E --> F[Code: implement the spec / decision] F --> G[Demos: acceptance run with new behavior] G --> H[Status: update milestone progress] H --> I[Hand-off: request review / merge if ready] I --> J[Reviews: independent assessment recorded] J --> K{Decision} K -- accept --> L[Merge to develop] K -- reject --> M[Return for fix]</code></pre> <h3 id=\"3-links\">3. Links<a class=\"headerlink\" href=\"#3-links\" title=\"Permanent link\">\u00b6</a></h3> <ul> <li><a href=\"../README.md\">../README.md</a> \u2014 Root index of the whole repository.</li> <li><a href=\"../site/index.html\">site/index.html</a> \u2014 HTML site built by MkDocs.</li> </ul> <hr /> <p><a id=\"japanese\"></a></p> <h2 id=\"\u65e5\u672c\u8a9e\">\u65e5\u672c\u8a9e<a class=\"headerlink\" href=\"#\u65e5\u672c\u8a9e\" title=\"Permanent link\">\u00b6</a></h2> <p><a href=\"#english\">\u2192 To English</a></p> <h3 id=\"1-\u6587\u66f8\u30d5\u30a9\u30eb\u30c0\">1. \u6587\u66f8\u30d5\u30a9\u30eb\u30c0<a class=\"headerlink\" href=\"#1-\u6587\u66f8\u30d5\u30a9\u30eb\u30c0\" title=\"Permanent link\">\u00b6</a></h3> <table> <thead> <tr> <th>\u30d5\u30a9\u30eb\u30c0</th> <th>\u8aac\u660e</th> </tr> </thead> <tbody> <tr> <td><a href=\"policy/\">policy/</a></td> <td>\u6211\u3005\u304c\u4f55\u3092\u3057\u3001\u4f55\u3092\u3057\u306a\u3044\u304b\u306e\u7acb\u5834\u3002\u5404\u6587\u66f8\u306f\u30c8\u30d4\u30c3\u30af\u306b\u95a2\u3059\u308b\u79c1\u305f\u3061\u306e\u59ff\u52e2\u3092\u8ff0\u3079\u307e\u3059\u3002</td> </tr> <tr> <td><a href=\"spec/\">spec/</a></td> <td>\u5b9f\u88c5\u3059\u308b\u30eb\u30fc\u30eb\uff1a\u4ed5\u69d8\u3001\u53d7\u5165\u8a66\u9a13\u3001\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u9580\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc CLI\u3002</td> </tr> <tr> <td><a href=\"decisions/\">decisions/</a></td> <td>\u6c7a\u5b9a\u306e\u8a18\u9332\uff1a\u306a\u305c\u305d\u306e\u9053\u3092\u9078\u3073\u3001\u307b\u304b\u3092\u9078\u3070\u306a\u304b\u3063\u305f\u304b\u3002</td> </tr> <tr> <td><a href=\"demo/\">demo/</a></td> <td>\u5b9f\u969b\u306b\u3084\u3063\u305f\u3053\u3068\u306e\u8a18\u9332\uff1a\u53d7\u5165\u8a66\u9a13\u3001\u7d71\u5408\u8a66\u9a13\u7d50\u679c\u3002</td> </tr> <tr> <td><a href=\"status/\">status/</a></td> <td>\u7bc0\u76ee\u306e\u9032\u884c\u72b6\u6cc1\uff1aM1\u301cM5 \u306e\u9032\u6357\u3001\u672a\u89e3\u6c7a\u9805\u76ee\u3001\u4e0a\u6d41\u8ffd\u5f93\u5831\u544a\u3002</td> </tr> <tr> <td><a href=\"handoff/\">handoff/</a></td> <td>\u4ed6\u306e\u30c1\u30fc\u30e0\u3078\u306e\u4f9d\u983c\uff1a\u65e5\u4ed8\u4ed8\u304d\u30d5\u30a1\u30a4\u30eb\u3001YYYY-MM-DD_<Title>.md \u306e\u5f62\u5f0f\u3002</td> </tr> <tr> <td><a href=\"reviews/\">reviews/</a></td> <td>\u30ec\u30d3\u30e5\u30fc\u8a18\u9332\uff1a\u65e5\u4ed8\u4ed8\u304d\u30d5\u30a1\u30a4\u30eb\u3001YYYY-MM-DD_<Title>_rN \u306e\u5f62\u5f0f\u3002</td> </tr> <tr> <td><a href=\"reference/\">reference/</a></td> <td>\u5916\u90e8\u4e8b\u5b9f\uff1a\u7528\u8a9e\u96c6\u3001\u9053\u5177\u306e\u7248\u3001\u4e0a\u6d41\u30e1\u30bf\u30c7\u30fc\u30bf\u3002</td> </tr> </tbody> </table> <h3 id=\"2-\u5909\u66f4\u304c\u6d41\u308c\u308b\u6d41\u308c\">2. \u5909\u66f4\u304c\u6d41\u308c\u308b\u6d41\u308c<a class=\"headerlink\" href=\"#2-\u5909\u66f4\u304c\u6d41\u308c\u308b\u6d41\u308c\" title=\"Permanent link\">\u00b6</a></h3> <pre class=\"mermaid\"><code>flowchart TD A[\u5b9f\u8a3c\uff0f\u53d7\u5165\u8a66\u9a13] --> B{\u5408\u683c?} B -- \u306f\u3044 --> C[\u65b9\u91dd\uff1a\u5909\u66f4\u306b\u95a2\u3059\u308b\u7acb\u5834] B -- \u3044\u3044\u3048 --> D[\u65b9\u91dd\uff1a\u62d2\u5426\u7406\u7531] C --> E[\u4ed5\u69d8\uff0fADR\uff1a\u5909\u66f4\u3092\u5b9f\u88c5\u3059\u308b\u30eb\u30fc\u30eb] D --> E E --> F[\u30b3\u30fc\u30c9\uff1aspec/ADR \u3092\u5b9f\u88c5] F --> G[\u5b9f\u8a3c\uff1a\u65b0\u3057\u3044\u52d5\u4f5c\u3067\u306e\u53d7\u5165\u8a66\u9a13] G --> H[\u9032\u6357\uff1a\u7bc0\u76ee\u306e\u9032\u884c\u72b6\u6cc1\u3092\u66f4\u65b0] H --> I[\u5f15\u7d99\u304e\uff1a\u30ec\u30d3\u30e5\u30fc\uff0f\u30de\u30fc\u30b8\u306e\u4f9d\u983c] I --> J[\u30ec\u30d3\u30e5\u30fc\uff1a\u72ec\u7acb\u3057\u305f\u8a55\u4fa1\u3092\u8a18\u9332] J --> K{\u6c7a\u5b9a} K -- \u627f\u8a8d --> L[develop \u3078\u30de\u30fc\u30b8] K -- \u62d2\u5426 --> M[\u4fee\u6b63\u306e\u305f\u3081\u306b\u623b\u3059]</code></pre> <h3 id=\"3-\u30ea\u30f3\u30af\">3. \u30ea\u30f3\u30af<a class=\"headerlink\" href=\"#3-\u30ea\u30f3\u30af\" title=\"Permanent link\">\u00b6</a></h3> <ul> <li><a href=\"../README.md\">../README.md</a> \u2014 \u30ea\u30dd\u30b8\u30c8\u30ea\u5168\u4f53\u306e\u30eb\u30fc\u30c8\u7d22\u5f15\u3002</li> <li><a href=\"../site/index.html\">site/index.html</a> \u2014 MkDocs \u304c\u751f\u6210\u3059\u308b HTML \u30b5\u30a4\u30c8\u3002</li> </ul> <hr /> <h2 id=\"glossary--\u7528\u8a9e\">Glossary / \u7528\u8a9e<a class=\"headerlink\" href=\"#glossary--\u7528\u8a9e\" title=\"Permanent link\">\u00b6</a></h2> <table> <thead> <tr> <th>Term</th> <th>English note</th> <th>\u65e5\u672c\u8a9e\u6ce8</th> </tr> </thead> <tbody> <tr> <td>Policy</td> <td>A statement of our position on what we will and will not do.</td> <td>\u6211\u3005\u304c\u4f55\u3092\u3057\u3001\u4f55\u3092\u3057\u306a\u3044\u304b\u306e\u7acb\u5834\u3002</td> </tr> <tr> <td>Specification</td> <td>A rule book that implementers must follow.</td> <td>\u5b9f\u88c5\u3059\u308b\u4eba\u304c\u5b88\u308b\u30eb\u30fc\u30eb\u30d6\u30c3\u30af\u3002</td> </tr> <tr> <td>Decision record (ADR)</td> <td>A note explaining why we chose one way and not another.</td> <td>\u306a\u305c\u305d\u306e\u9053\u3092\u9078\u3073\u3001\u307b\u304b\u3092\u9078\u3070\u306a\u304b\u3063\u305f\u304b\u306e\u30e1\u30e2\u3002</td> </tr> <tr> <td>Demo</td> <td>Records of what was actually done, including acceptance runs.</td> <td>\u5b9f\u969b\u306b\u3084\u3063\u305f\u3053\u3068\u306e\u8a18\u9332\u3001\u53d7\u5165\u8a66\u9a13\u3092\u542b\u3080\u3002</td> </tr> <tr> <td>Milestone</td> <td>A checkpoint with a pass/fail test.</td> <td>\u5408\u5426\u306e\u8a66\u9a13\u304c\u3042\u308b\u95a2\u9580\u3002</td> </tr> <tr> <td>Hand-off</td> <td>A request to another team or agent.</td> <td>\u4ed6\u306e\u30c1\u30fc\u30e0\u30fb\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3078\u306e\u4f9d\u983c\u3002</td> </tr> <tr> <td>Review</td> <td>An independent assessment of a pull request.</td> <td>\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u72ec\u7acb\u3057\u305f\u8a55\u4fa1\u3002</td> </tr> <tr> <td>Reference</td> <td>External facts such as glossaries, tool versions.</td> <td>\u7528\u8a9e\u96c6\u3084\u9053\u5177\u306e\u7248\u306a\u3069\u306e\u5916\u90e8\u4e8b\u5b9f\u3002</td> </tr> </tbody> </table>"},{"location":"assets/","title":"Site Assets / \u30b5\u30a4\u30c8\u7528\u306e\u90e8\u54c1","text":"<p>Summary: Third-party and local files that the MkDocs site loads. Kept in the repository so the HTML version works without any external network. \u6982\u8981: MkDocs \u306e\u30b5\u30a4\u30c8\u304c\u8aad\u307f\u8fbc\u3080\u5916\u90e8\u30fb\u81ea\u4f5c\u306e\u30d5\u30a1\u30a4\u30eb\u3002\u5916\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306a\u3057\u3067 HTML \u7248\u304c\u52d5\u304f\u3088\u3046\u3001\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u540c\u68b1\u3059\u308b\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: loading Mermaid from a CDN made every generated page depend on an external host (Semgrep flagged 43 pages for missing integrity), so the library is vendored here instead. \uff0f Mermaid \u3092 CDN \u304b\u3089\u8aad\u307f\u8fbc\u3080\u3068\u751f\u6210\u30da\u30fc\u30b8\u5168\u90e8\u304c\u5916\u90e8\u30db\u30b9\u30c8\u306b\u4f9d\u5b58\u3059\u308b\uff08Semgrep \u304c 43 \u30da\u30fc\u30b8\u3092 integrity \u6b20\u843d\u3068\u3057\u3066\u691c\u51fa\uff09\u3068\u5206\u304b\u308a\u3001\u3053\u3053\u306b\u540c\u68b1\u306b\u5909\u3048\u305f\u3002</li> <li>Related: docs/README.md \u00b7 SPEC-06 \u00a74</li> </ul> <p></p>"},{"location":"assets/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p> File Origin License Note <code>mermaid.min.js</code> mermaid 11.4.1, <code>https://unpkg.com/mermaid@11.4.1/dist/mermaid.min.js</code> MIT Draws diagrams written as text (Mermaid). Do not edit. Update by replacing the file and this row. <code>mermaid-init.js</code> written here MIT (this repository) Starts Mermaid on page load. <p></p>"},{"location":"assets/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p> \u30d5\u30a1\u30a4\u30eb \u51fa\u6240 \u30e9\u30a4\u30bb\u30f3\u30b9 \u5099\u8003 <code>mermaid.min.js</code> mermaid 11.4.1\u3001<code>https://unpkg.com/mermaid@11.4.1/dist/mermaid.min.js</code> MIT \u6587\u5b57\u3067\u66f8\u3044\u305f\u56f3\uff08Mermaid\uff09\u3092\u63cf\u304f\u3002\u7de8\u96c6\u3057\u306a\u3044\u3002\u66f4\u65b0\u306f\u30d5\u30a1\u30a4\u30eb\u3068\u3053\u306e\u884c\u3092\u5dee\u3057\u66ff\u3048\u308b\u3002 <code>mermaid-init.js</code> \u672c\u30ea\u30dd\u30b8\u30c8\u30ea\u3067\u4f5c\u6210 MIT\uff08\u672c\u30ea\u30dd\u30b8\u30c8\u30ea\uff09 \u30da\u30fc\u30b8\u8aad\u307f\u8fbc\u307f\u6642\u306b Mermaid \u3092\u8d77\u52d5\u3059\u308b\u3002"},{"location":"decisions/","title":"Decision Records / \u6c7a\u5b9a\u306e\u8a18\u9332","text":"<p>Summary: Documents explaining why we chose one way and not another: integration repository placement, network model, staged security gate, AI autonomy and roles. Each record captures the context, options considered, and final decision. \u6982\u8981: \u306a\u305c\u305d\u306e\u9053\u3092\u9078\u3073\u3001\u307b\u304b\u3092\u9078\u3070\u306a\u304b\u3063\u305f\u304b\u3092\u8aac\u660e\u3059\u308b\u6587\u66f8\uff1a\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u7f6e\u304d\u5834\u3001\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u65b9\u5f0f\u3001\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u9580\u306e\u6bb5\u968e\u5316\u3001AI \u306e\u81ea\u5f8b\u5ea6\u3068\u5f79\u5272\u3002\u5404\u8a18\u9332\u306f\u6587\u8108\u3001\u691c\u8a0e\u3057\u305f\u9078\u629e\u80a2\u3001\u6700\u7d42\u6c7a\u5b9a\u3092\u6349\u3048\u307e\u3059\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: writing decisions as records turned subjective choices into objective, reviewable documents that explain the reasoning behind each rule. \uff0f \u6c7a\u5b9a\u3092\u8a18\u9332\u3068\u3057\u3066\u6b8b\u3059\u3053\u3068\u3067\u3001\u4e3b\u89b3\u7684\u306a\u9078\u629e\u3092\u5ba2\u89b3\u7684\u3067\u30ec\u30d3\u30e5\u30fc\u53ef\u80fd\u306a\u6587\u66f8\u306b\u3057\u3001\u5404\u30eb\u30fc\u30eb\u306e\u80cc\u5f8c\u306b\u3042\u308b\u63a8\u8ad6\u3092\u8aac\u660e\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u3063\u305f\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Normative for: ADR-01 Integration Repository Placement through ADR-04 AI Autonomy and Roles.</li> <li>Related: ../README.md \u00b7 policy/ \u00b7 spec/ \u00b7 reference/REF-01_Glossary.md</li> </ul> <p></p>"},{"location":"decisions/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"decisions/#1-what-belongs-here","title":"1. What belongs here","text":"<p>A decision record (ADR) explains why we chose one way and not another. This folder contains:</p> ID File Purpose ADR-01 ADR-01_Integration_Repository_Placement.md Where integration code lives: new private repos, not in this public repo. ADR-02 ADR-02_Network_Model.md Drop loopback alias 192.168.168.167; use Compose internal network and 127.0.0.1 only. ADR-03 ADR-03_Staged_Security_Gate.md Gate starts as report-only at M1, becomes zero CRITICAL/HIGH plus red team pass at M5. ADR-04 ADR-04_AI_Autonomy_and_Roles.md AI detects, fixes, reviews, tests; humans merge and publish. <p>Future decision records may cover:</p> Topic Description ADR-05 Repository branching strategy ADR-06 Tool version policy (Docker, Python, Node.js) ADR-07 Open source license compatibility"},{"location":"decisions/#2-creating-a-new-decision-record","title":"2. Creating a new decision record","text":"<ol> <li>Name the file <code>ADR-NN_<Title>.md</code> (two-digit number, next available).</li> <li>Follow SPEC-06 documentation conventions.</li> <li>Include: context, options considered (use TOON if multiple), decision, rationale.</li> <li>Link to related policies and specifications.</li> <li>The owner approves.</li> </ol>"},{"location":"decisions/#3-how-decision-records-relate-to-other-documents","title":"3. How decision records relate to other documents","text":"<pre><code>flowchart TD\n P[Policy: position] --> A[Decision record: why we chose this]\n S[Spec: rules to implement] --> A\n A --> C[Code: implement the rule]</code></pre>"},{"location":"decisions/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"decisions/#1-\u3053\u3053\u306b\u5c5e\u3059\u308b\u3082\u306e","title":"1. \u3053\u3053\u306b\u5c5e\u3059\u308b\u3082\u306e","text":"<p>\u300c\u6c7a\u5b9a\u306e\u8a18\u9332\u300d\uff08ADR\uff09\u306f\u3001\u306a\u305c\u305d\u306e\u9053\u3092\u9078\u3073\u3001\u307b\u304b\u3092\u9078\u3070\u306a\u304b\u3063\u305f\u304b\u3092\u8aac\u660e\u3059\u308b\u6587\u66f8\u3067\u3059\u3002\u3053\u306e\u30d5\u30a9\u30eb\u30c0\u306b\u306f\u6b21\u304c\u542b\u307e\u308c\u307e\u3059\uff1a</p> ID \u30d5\u30a1\u30a4\u30eb \u76ee\u7684 ADR-01 ADR-01_Integration_Repository_Placement.md \u7d71\u5408\u30b3\u30fc\u30c9\u306e\u7f6e\u304d\u5834\uff1a\u65b0\u8a2d\u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u3001\u3053\u306e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u306f\u7f6e\u304b\u306a\u3044\u3002 ADR-02 ADR-02_Network_Model.md \u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u5225\u540d 192.168.168.167 \u3092\u5ec3\u6b62\uff1bCompose \u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3068 127.0.0.1 \u306e\u307f\u3092\u4f7f\u3046\u3002 ADR-03 ADR-03_Staged_Security_Gate.md \u9580\u306f M1 \u3067\u306f\u5831\u544a\u306e\u307f\u3001M5 \u3067 CRITICAL/HIGH \u30bc\u30ed\uff0b\u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u5408\u683c\u3078\u3002 ADR-04 ADR-04_AI_Autonomy_and_Roles.md AI \u306f\u691c\u51fa\u30fb\u4fee\u6b63\u30fb\u30ec\u30d3\u30e5\u30fc\u30fb\u8a66\u9a13\uff1b\u4eba\u306f\u30de\u30fc\u30b8\u3068\u516c\u958b\u3002 <p>\u4eca\u5f8c\u306e\u6c7a\u5b9a\u8a18\u9332\u3068\u3057\u3066\u4ee5\u4e0b\u304c\u8003\u3048\u3089\u308c\u307e\u3059\uff1a</p> \u30c8\u30d4\u30c3\u30af \u8aac\u660e ADR-05 \u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30d6\u30e9\u30f3\u30c1\u6226\u7565 ADR-06 \u9053\u5177\u7248\u65b9\u91dd\uff08Docker\u3001Python\u3001Node.js\uff09 ADR-07 \u30aa\u30fc\u30d7\u30f3\u30bd\u30fc\u30b9\u30e9\u30a4\u30bb\u30f3\u30b9\u306e\u4e92\u63db\u6027"},{"location":"decisions/#2-\u65b0\u3057\u3044\u6c7a\u5b9a\u8a18\u9332\u3092\u3064\u304f\u308b\u306b\u306f","title":"2. \u65b0\u3057\u3044\u6c7a\u5b9a\u8a18\u9332\u3092\u3064\u304f\u308b\u306b\u306f","text":"<ol> <li>\u30d5\u30a1\u30a4\u30eb\u540d\u3092 <code>ADR-NN_<\u984c>.md</code>\uff082 \u6841\u306e\u756a\u53f7\u3001\u6b21\u306b\u7a7a\u3044\u3066\u3044\u308b\u3082\u306e\uff09\u306b\u3059\u308b\u3002</li> <li>SPEC-06 \u6587\u66f8\u898f\u7d04\u306b\u5f93\u3046\u3002</li> <li>\u6587\u8108\u3001\u691c\u8a0e\u3057\u305f\u9078\u629e\u80a2\uff08\u8907\u6570\u3042\u308b\u5834\u5408\u306f TOON \u4f7f\u7528\uff09\u3001\u6c7a\u5b9a\u3001\u7406\u7531\u3092\u542b\u3080\u3002</li> <li>\u95a2\u9023\u3059\u308b\u65b9\u91dd\u3068\u4ed5\u69d8\u3078\u30ea\u30f3\u30af\u3059\u308b\u3002</li> <li>\u6240\u6709\u8005\u304c\u627f\u8a8d\u3002</li> </ol>"},{"location":"decisions/#3-\u6c7a\u5b9a\u8a18\u9332\u304c\u4ed6\u306e\u6587\u66f8\u3068\u3069\u3046\u95a2\u4fc2\u3059\u308b\u304b","title":"3. \u6c7a\u5b9a\u8a18\u9332\u304c\u4ed6\u306e\u6587\u66f8\u3068\u3069\u3046\u95a2\u4fc2\u3059\u308b\u304b","text":"<pre><code>flowchart TD\n P[\u65b9\u91dd\uff1a\u7acb\u5834] --> A[\u6c7a\u5b9a\u306e\u8a18\u9332\uff1a\u306a\u305c\u3053\u306e\u9053\u3092\u9078\u3093\u3060\u304b]\n S[\u4ed5\u69d8\uff1a\u5b9f\u88c5\u3059\u308b\u30eb\u30fc\u30eb] --> A\n A --> C[\u30b3\u30fc\u30c9\uff1a\u30eb\u30fc\u30eb\u3092\u5b9f\u88c5]</code></pre>"},{"location":"decisions/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Decision record (ADR) A note explaining why we chose one way and not another. \u306a\u305c\u305d\u306e\u9053\u3092\u9078\u3073\u3001\u307b\u304b\u3092\u9078\u3070\u306a\u304b\u3063\u305f\u304b\u306e\u30e1\u30e2\u3002 Context The problem or situation that requires a decision. \u6c7a\u5b9a\u3092\u5fc5\u8981\u3068\u3059\u308b\u554f\u984c\u3084\u72b6\u6cc1\u3002 Options considered The alternatives evaluated before choosing one. \u9078\u629e\u3059\u308b\u524d\u306b\u8a55\u4fa1\u3057\u305f\u4ee3\u66ff\u6848\u3002 Rationale The reasoning behind the final decision. \u6700\u7d42\u6c7a\u5b9a\u306e\u80cc\u5f8c\u306b\u3042\u308b\u63a8\u8ad6\u3002 Policy A statement of our position on what we will and will not do. \u6211\u3005\u304c\u4f55\u3092\u3057\u3001\u4f55\u3092\u3057\u306a\u3044\u304b\u306e\u7acb\u5834\u3002"},{"location":"decisions/ADR-01_Integration_Repository_Placement/","title":"ADR-01 Integration Repository Placement / \u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u7f6e\u304d\u5834","text":"<p>Summary: Where the code that combines the public cores, the <code>-private</code> security versions and the subsystems is kept: new private repositories <code>RDM-<name>-dev2027</code> inside RCOSDP, with a <code>develop</code> integration branch and <code>upstream/*</code> tracking branches, never in this public repository. \u6982\u8981: \u516c\u958b\u30b3\u30a2\u30fb<code>-private</code> \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u7248\u30fb\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\u3092\u91cd\u306d\u305f\u30b3\u30fc\u30c9\u3092\u3069\u3053\u306b\u7f6e\u304f\u304b\u3002RCOSDP \u5185\u306b\u65b0\u8a2d\u3059\u308b\u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea <code>RDM-<name>-dev2027</code> \u306b\u7f6e\u304d\u3001<code>develop</code> \u3092\u7d71\u5408\u30d6\u30e9\u30f3\u30c1\u3001<code>upstream/*</code> \u3092\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\u3068\u3059\u308b\u3002\u516c\u958b\u306e\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u306f\u7f6e\u304b\u306a\u3044\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.3 \u2014 2026-11-05. Learned: the owner prefers a literal, reproducible integration order over a convenient bootstrap, so the first construction is redone public-first on a new branch and proposed as a superseding pull request. \uff0f \u6240\u6709\u8005\u306f\u4fbf\u5229\u306a\u521d\u56de\u69cb\u7bc9\u3088\u308a\u3001\u6587\u5b57\u3069\u304a\u308a\u518d\u73fe\u3067\u304d\u308b\u7d71\u5408\u9806\u3092\u9078\u3076\u3068\u5206\u304b\u3063\u305f\u3002\u521d\u56de\u69cb\u7bc9\u306f\u65b0\u3057\u3044\u30d6\u30e9\u30f3\u30c1\u3067\u300c\u516c\u958b\u304c\u5148\u300d\u306b\u3084\u308a\u76f4\u3057\u3001\u7f6e\u304d\u63db\u3048\u306e PR \u3068\u3057\u3066\u63d0\u6848\u3059\u308b\u3002 0.2 \u2014 2026-11-05. Learned: the first construction of a <code>-dev2027</code> repository cannot literally replay \"public \u2192 private \u2192 adopted PRs\", so the rule needs a stated bootstrap interpretation; it is proposed in \u00a75 and awaits the owner. \uff0f <code>-dev2027</code> \u306e\u521d\u56de\u69cb\u7bc9\u3067\u306f\u300c\u516c\u958b \u2192 private \u2192 \u63a1\u7528 PR\u300d\u3092\u6587\u5b57\u3069\u304a\u308a\u518d\u73fe\u3067\u304d\u306a\u3044\u305f\u3081\u3001\u521d\u56de\u69cb\u7bc9\u306e\u89e3\u91c8\u3092\u660e\u6587\u5316\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u3068\u5206\u304b\u3063\u305f\u3002\u00a75 \u306b\u63d0\u6848\u3057\u6240\u6709\u8005\u306e\u627f\u8a8d\u3092\u5f85\u3064\u3002 0.1 \u2014 2026-11-05. Learned: GitHub refuses a fork inside the same organization, so \"fork and integrate\" had to become \"new repository with history pushed\", and that in turn made the no-force-push and no-delete rules the only way to keep the pushed history trustworthy. \uff0f GitHub \u306f\u540c\u3058\u7d44\u7e54\u5185\u3078\u306e\u30d5\u30a9\u30fc\u30af\u3092\u8a31\u3055\u306a\u3044\u305f\u3081\u300c\u30d5\u30a9\u30fc\u30af\u3057\u3066\u7d71\u5408\u300d\u306f\u300c\u5c65\u6b74\u3092 push \u3057\u305f\u65b0\u898f\u30ea\u30dd\u30b8\u30c8\u30ea\u300d\u306b\u306a\u308a\u3001\u305d\u306e\u7d50\u679c force push \u7981\u6b62\u3068\u524a\u9664\u7981\u6b62\u304c\u3001push \u3057\u305f\u5c65\u6b74\u3092\u4fe1\u3058\u3089\u308c\u308b\u3082\u306e\u306b\u4fdd\u3064\u552f\u4e00\u306e\u624b\u6bb5\u3060\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Status: Accepted by the owner, 2026-11-05 (plan-interview).</li> <li>Records a decision for: POL-01 \u00a72 item 5 \u00b7 SPEC-01 Manifest \u00b7 SPEC-05 Upstream Tracking</li> <li>Related: docs/README.md \u00b7 SPEC-00 Overview \u00b7 ADR-02 Network Model \u00b7 ADR-04 AI Autonomy and Roles \u00b7 REF-01 Glossary</li> </ul> <p></p>"},{"location":"decisions/ADR-01_Integration_Repository_Placement/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"decisions/ADR-01_Integration_Repository_Placement/#1-context","title":"1. Context","text":"<p>A decision record (ADR) explains why we chose one way and not another. This one is about where the integration code lives.</p> <p>We must combine, without contradiction, three groups of code kept in GitHub repositories (folders that remember every change):</p> <ul> <li>six public cores: <code>RDM-osf.io</code>, <code>RDM-waterbutler</code>, <code>RDM-modular-file-renderer</code>, <code>RDM-ember-osf-web</code>, <code>RDM-cas-overlay</code>, <code>RDM-wiki-frontend</code>;</li> <li>six <code>-private</code> security-verified versions, each of which already contains the history of its public core (so it is a superset, not a rival);</li> <li>five private subsystems: y-websocket, OASys, Shibboleth-SP, rdmcp, aipf_mcp_data_grdm.</li> </ul> <p>Three constraints shaped the choice:</p> <ol> <li>Same-organization forks are impossible. On GitHub a fork (your own copy of someone's repository that remembers where it came from) cannot be created inside the same organization that owns the original. All these repositories are in RCOSDP, so a plain fork is unavailable.</li> <li>Write boundary. The agents on this plan may write only to this repository (<code>RDM-developer-guide</code>) and to repositories they create. Existing repositories, including the <code>-private</code> ones, are read-only to us. Deleting a repository or branch and force-pushing (overwriting shared history) are forbidden.</li> <li>This repository is public. Members abroad read it. Anything derived from <code>-private</code> code \u2014 files, patches, even URLs of private repositories \u2014 must not appear here.</li> </ol>"},{"location":"decisions/ADR-01_Integration_Repository_Placement/#2-options-considered","title":"2. Options considered","text":"<pre><code>options[4]{id,option,keeps_private_code_private,within_write_boundary,upstream_follow_cost,verdict}:\n A,\"New private repositories RDM-<name>-dev2027 in RCOSDP, history pushed, develop = integration, upstream/* tracking\",yes,yes,low,chosen\n B,\"Fork to a personal GitHub account\",no,yes,low,rejected\n C,\"Keep patches inside this public repository and apply at install time\",no,yes,high,rejected\n D,\"Use the -private repositories directly as the canon and integrate there\",yes,no,low,rejected</code></pre> <ul> <li>B puts code derived from private sources under a personal account, outside the organization's access control. Rejected.</li> <li>C keeps a pile of patches (small text files describing changes) that must be re-fitted every time an upstream repository moves; with eleven moving upstreams the conflicts arrive faster than they are solved, and any patch touching <code>-private</code> code would leak it into a public repository. Rejected.</li> <li>D would be the simplest, but we are not allowed to write to the <code>-private</code> repositories, and integrating in them would mix verification work with security verification history. Rejected.</li> </ul>"},{"location":"decisions/ADR-01_Integration_Repository_Placement/#3-decision","title":"3. Decision","text":"<ol> <li>For each of the eleven upstream repositories, create a private repository in RCOSDP named <code>RDM-<name>-dev2027</code> (for example <code>RDM-osf.io-dev2027</code>). Push the full history of the public core so that <code>git log</code> remains truthful and SHAs (fingerprints of commits) match upstream.</li> <li>Branches in each <code>-dev2027</code> repository:</li> <li><code>develop</code> \u2014 the integration branch; the only branch the installer builds from (its SHA is recorded in the manifest, see SPEC-01);</li> <li>one tracking branch per upstream listed in the manifest, named <code>upstream/<kind>-<branch></code> where <code><kind></code> is <code>public</code>, <code>private</code>, or <code>cos</code> and <code><branch></code> is the upstream branch name with <code>/</code> replaced by <code>-</code> (SPEC-01 \u00a74 rule 7);</li> <li><code>upstream/public-<branch></code> \u2014 an exact mirror (identical copy, refreshed automatically) of the public core's default branch: <code>upstream/public-develop</code> for osf.io, waterbutler, mfr, cas-overlay, wiki-frontend; <code>upstream/public-master</code> for ember-osf-web and y-websocket;</li> <li><code>upstream/private-<branch></code> \u2014 a mirror of the <code>-private</code> default branch: <code>upstream/private-develop</code>, <code>upstream/private-master</code> (ember-osf-web, y-websocket), or <code>upstream/private-main</code> (OASys, Shibboleth-SP, rdmcp, aipf_mcp_data_grdm, which have no public upstream and only this branch);</li> <li><code>upstream/cos-develop</code> \u2014 a mirror of the CenterForOpenScience original, for reference only (not for wiki-frontend, which has no COS original);</li> <li>a second upstream of the same kind gets a tag: <code>upstream/private-sec-test-fix-sec-test</code> mirrors <code>RDM-osf.io-private</code> (branch <code>fix/sec-test</code>) as a candidate. Mirrors are refreshed daily (SPEC-05).</li> <li>Integration order on <code>develop</code>: public <code>develop</code> \u2192 <code>-private</code> \u2192 adopted pull requests (proposed changes waiting for review). Merged upstream changes are taken in full; unmerged PRs are adopted one by one, security and authentication first, and listed as candidates in the manifest.</li> <li>No force-push, no deletion. Conflicts are solved by new commits in a PR, never by rewriting history. Branches are archived with a tag rather than deleted.</li> <li>Nothing from a <code>-dev2027</code> repository is copied into this public repository except names, branch names, SHAs, dates and PR numbers. Image builds from <code>-private</code> code go only to local Docker or to a private registry, never to a public one.</li> </ol> <pre><code>flowchart TD\n PUB[\"public core<br/>default branch\"] -->|daily mirror| UP1[\"upstream/public-<branch>\"]\n PRV[\"-private<br/>default branch\"] -->|daily mirror| UP2[\"upstream/private-<branch>\"]\n COS[\"CenterForOpenScience<br/>develop\"] -->|daily mirror| UP3[\"upstream/cos-develop\"]\n UP1 -->|1. merge| DEV[\"develop (integration)\"]\n UP2 -->|2. merge| DEV\n PRS[\"adopted PRs<br/>(security, auth first)\"] -->|3. PR, Codex review| DEV\n UP3 -.->|reference only| DEV\n DEV -->|\"name + SHA\"| MAN[\"manifest/upstreams.json<br/>(public repository)\"]</code></pre>"},{"location":"decisions/ADR-01_Integration_Repository_Placement/#4-consequences","title":"4. Consequences","text":"<ul> <li>Good: one place per component where \"public + private + adopted PRs\" is resolved; the installer needs only a name and a SHA; daily mirrors keep diffs small; history is complete and auditable.</li> <li>Good: the write boundary is respected without asking for new permissions on existing repositories.</li> <li>Cost: eleven more repositories to watch. Mitigated by automation in SPEC-05 and the status board.</li> <li>Cost: <code>-dev2027</code> repositories are private, so GitHub Actions minutes and self-hosted runner usage count against the Team plan. Accepted.</li> <li>Risk \u2014 leakage into this public repository. A single careless copy of a file, a stack trace or a URL from a <code>-dev2027</code> or <code>-private</code> repository would publish private security work. Controls: secret scanning in CI is mandatory; reviewers check every PR to this repository for private paths and URLs; the manifest schema allows only names, branches, SHAs, dates and PR numbers; documents name private repositories but never link to them (SPEC-06 \u00a75).</li> <li>Risk \u2014 drift between public and private cores. On 2026-11-05 the public <code>RDM-osf.io</code> develop was newer than its <code>-private</code> counterpart. The integration order (public first, then private) and daily mirrors make such drift visible as a merge, not as a silent overwrite.</li> <li>Open: how to treat <code>RDM-osf.io-private</code> (branch <code>fix/sec-test</code>), which is distinct from <code>RDM-osf.io-develop-private</code>. It is mirrored as <code>upstream/private-sec-test-fix-sec-test</code> and listed in the manifest with <code>status: candidate</code> (SPEC-01 \u00a74 rule 6); the owner decides whether it is merged.</li> </ul>"},{"location":"decisions/ADR-01_Integration_Repository_Placement/#5-bootstrap-of-the-integration-order-decided-2026-11-05-strict-reconstruction","title":"5. Bootstrap of the integration order (decided 2026-11-05: strict reconstruction)","text":"<p>Status: the owner rejected the proposed interpretation \"seed from the <code>-private</code> tip and merge the newer public tip\" (review r1/r2 of RDM-osf.io-dev2027 PR #1, finding R2). The integration order of SPEC-01 \u00a74 applies literally, also to the first construction.</p> <p>Procedure for every <code>-dev2027</code> repository:</p> <ol> <li>Start a branch <code>integrate/strict-<YYYYMMDD></code> at the tip of <code>upstream/public-<branch></code>.</li> <li>Merge <code>upstream/private-<branch></code> into it with a normal two-parent merge (<code>--no-ff</code>), resolving conflicts on the branch.</li> <li>Re-apply adopted PRs from the manifest, each as its own merge.</li> <li>Open a pull request from that branch to <code>develop</code>. The <code>develop</code> branch is never force-pushed or deleted; the pull request supersedes any earlier integration pull request, which is closed with a comment pointing to the new one.</li> <li>Review by REV, check by QAE, merge by the owner (ADR-04).</li> </ol> <p>Consequence: the first <code>develop</code> of each repository (seeded from the <code>-private</code> tip during bootstrap) stays in history. The strictly reconstructed branch is merged on top of it, so from the first strict merge onward every <code>develop</code> carries the public-first order.</p> <p></p>"},{"location":"decisions/ADR-01_Integration_Repository_Placement/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"decisions/ADR-01_Integration_Repository_Placement/#1-\u80cc\u666f","title":"1. \u80cc\u666f","text":"<p>\u300c\u6c7a\u5b9a\u306e\u8a18\u9332\u300d\uff08ADR\uff09\u306f\u3001\u306a\u305c\u305d\u306e\u9053\u3092\u9078\u3073\u3001\u307b\u304b\u3092\u9078\u3070\u306a\u304b\u3063\u305f\u304b\u3092\u6b8b\u3059\u30e1\u30e2\u3067\u3059\u3002\u3053\u306e\u8a18\u9332\u306f\u3001\u7d71\u5408\u30b3\u30fc\u30c9\u3092\u3069\u3053\u306b\u7f6e\u304f\u304b\u306b\u3064\u3044\u3066\u306e\u3082\u306e\u3067\u3059\u3002</p> <p>GitHub \u306e\u300c\u30ea\u30dd\u30b8\u30c8\u30ea\u300d\uff08\u5909\u66f4\u3092\u5168\u90e8\u899a\u3048\u3066\u3044\u308b\u30d5\u30a9\u30eb\u30c0\uff09\u306b\u7f6e\u304b\u308c\u305f\u4e09\u3064\u306e\u7fa4\u306e\u30b3\u30fc\u30c9\u3092\u3001\u77db\u76fe\u306a\u304f\u91cd\u306d\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002</p> <ul> <li>\u516c\u958b\u30b3\u30a2 6 \u672c: <code>RDM-osf.io</code>\u3001<code>RDM-waterbutler</code>\u3001<code>RDM-modular-file-renderer</code>\u3001<code>RDM-ember-osf-web</code>\u3001<code>RDM-cas-overlay</code>\u3001<code>RDM-wiki-frontend</code>\u3002</li> <li><code>-private</code> \u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u691c\u8a3c\u7248 6 \u672c\u3002\u3044\u305a\u308c\u3082\u5bfe\u5fdc\u3059\u308b\u516c\u958b\u30b3\u30a2\u306e\u5c65\u6b74\u3092\u542b\u3093\u3067\u3044\u308b\uff08\u3064\u307e\u308a\u5bfe\u7acb\u3067\u306f\u306a\u304f\u4e0a\u4f4d\u4e92\u63db\uff09\u3002</li> <li>\u975e\u516c\u958b\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0 5 \u672c: y-websocket\u3001OASys\u3001Shibboleth-SP\u3001rdmcp\u3001aipf_mcp_data_grdm\u3002</li> </ul> <p>\u9078\u629e\u3092\u6c7a\u3081\u305f\u5236\u7d04\u306f\u4e09\u3064\u3067\u3059\u3002</p> <ol> <li>\u540c\u3058\u7d44\u7e54\u5185\u3078\u306e\u30d5\u30a9\u30fc\u30af\u306f\u3067\u304d\u306a\u3044\u3002 GitHub \u306e\u300c\u30d5\u30a9\u30fc\u30af\u300d\uff08\u4ed6\u4eba\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u81ea\u5206\u7528\u306e\u5199\u3057\u3067\u3001\u51fa\u3069\u3053\u308d\u3092\u899a\u3048\u3066\u3044\u308b\u3082\u306e\uff09\u306f\u3001\u5143\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u6301\u3064\u7d44\u7e54\u306e\u4e2d\u306b\u306f\u4f5c\u308c\u307e\u305b\u3093\u3002\u5bfe\u8c61\u306f\u5168\u90e8 RCOSDP \u306b\u3042\u308b\u306e\u3067\u3001\u666e\u901a\u306e\u30d5\u30a9\u30fc\u30af\u306f\u4f7f\u3048\u307e\u305b\u3093\u3002</li> <li>\u66f8\u8fbc\u306e\u5883\u754c\u3002 \u3053\u306e\u8a08\u753b\u306e\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u304c\u66f8\u304d\u8fbc\u3081\u308b\u306e\u306f\u3001\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\uff08<code>RDM-developer-guide</code>\uff09\u3068\u81ea\u5206\u3067\u65b0\u8a2d\u3057\u305f\u30ea\u30dd\u30b8\u30c8\u30ea\u3060\u3051\u3067\u3059\u3002<code>-private</code> \u3092\u542b\u3080\u65e2\u5b58\u30ea\u30dd\u30b8\u30c8\u30ea\u306f\u8aad\u307f\u53d6\u308a\u5c02\u7528\u3067\u3059\u3002\u30ea\u30dd\u30b8\u30c8\u30ea\u3084\u30d6\u30e9\u30f3\u30c1\u306e\u524a\u9664\u3068\u300cforce push\u300d\uff08\u5171\u6709\u306e\u5c65\u6b74\u306e\u4e0a\u66f8\u304d\uff09\u306f\u7981\u6b62\u3067\u3059\u3002</li> <li>\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306f\u516c\u958b\u3002 \u6d77\u5916\u306e\u30e1\u30f3\u30d0\u30fc\u304c\u8aad\u307f\u307e\u3059\u3002<code>-private</code> \u7531\u6765\u306e\u3082\u306e \u2014 \u30d5\u30a1\u30a4\u30eb\u3001\u30d1\u30c3\u30c1\u3001\u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u306e URL \u307e\u3067 \u2014 \u3092\u3053\u3053\u306b\u51fa\u3057\u3066\u306f\u3044\u3051\u307e\u305b\u3093\u3002</li> </ol>"},{"location":"decisions/ADR-01_Integration_Repository_Placement/#2-\u691c\u8a0e\u3057\u305f\u9078\u629e\u80a2","title":"2. \u691c\u8a0e\u3057\u305f\u9078\u629e\u80a2","text":"<pre><code>options[4]{id,option,keeps_private_code_private,within_write_boundary,upstream_follow_cost,verdict}:\n A,\"RCOSDP \u5185\u306b\u975e\u516c\u958b\u306e RDM-<name>-dev2027 \u3092\u65b0\u8a2d\u3001\u5c65\u6b74\u3092 push\u3001develop = \u7d71\u5408\u3001upstream/* \u3067\u8ffd\u8de1\",yes,yes,low,\u63a1\u7528\n B,\"\u500b\u4eba\u306e GitHub \u30a2\u30ab\u30a6\u30f3\u30c8\u3078\u30d5\u30a9\u30fc\u30af\",no,yes,low,\u4e0d\u63a1\u7528\n C,\"\u516c\u958b\u306e\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u30d1\u30c3\u30c1\u3092\u540c\u68b1\u3057\u5c0e\u5165\u6642\u306b\u5f53\u3066\u308b\",no,yes,high,\u4e0d\u63a1\u7528\n D,\"-private \u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u76f4\u63a5\u6b63\u672c\u306b\u3057\u3066\u305d\u3053\u3067\u7d71\u5408\",yes,no,low,\u4e0d\u63a1\u7528</code></pre> <ul> <li>B \u306f\u975e\u516c\u958b\u7531\u6765\u306e\u30b3\u30fc\u30c9\u3092\u3001\u7d44\u7e54\u306e\u30a2\u30af\u30bb\u30b9\u7ba1\u7406\u306e\u5916\u306b\u3042\u308b\u500b\u4eba\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u4e0b\u306b\u51fa\u3057\u307e\u3059\u3002\u4e0d\u63a1\u7528\u3002</li> <li>C \u306f\u300c\u30d1\u30c3\u30c1\u300d\uff08\u5909\u66f4\u5185\u5bb9\u3092\u66f8\u3044\u305f\u5c0f\u3055\u306a\u6587\u5b57\u30d5\u30a1\u30a4\u30eb\uff09\u306e\u5c71\u3092\u6301\u3061\u3001\u4e0a\u6d41\u304c\u52d5\u304f\u305f\u3073\u306b\u5f53\u3066\u76f4\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u300211 \u672c\u306e\u4e0a\u6d41\u304c\u52d5\u304f\u3068\u3001\u885d\u7a81\u306f\u89e3\u304f\u901f\u3055\u3088\u308a\u65e9\u304f\u5c4a\u304d\u307e\u3059\u3002\u3057\u304b\u3082 <code>-private</code> \u306b\u89e6\u308b\u30d1\u30c3\u30c1\u306f\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u3078\u306e\u6f0f\u3048\u3044\u306b\u306a\u308a\u307e\u3059\u3002\u4e0d\u63a1\u7528\u3002</li> <li>D \u306f\u6700\u3082\u5358\u7d14\u3067\u3059\u304c\u3001<code>-private</code> \u30ea\u30dd\u30b8\u30c8\u30ea\u3078\u306e\u66f8\u8fbc\u306f\u8a31\u3055\u308c\u3066\u304a\u3089\u305a\u3001\u305d\u3053\u3067\u7d71\u5408\u3059\u308b\u3068\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u691c\u8a3c\u306e\u5c65\u6b74\u3068\u7d71\u5408\u4f5c\u696d\u304c\u6df7\u3056\u308a\u307e\u3059\u3002\u4e0d\u63a1\u7528\u3002</li> </ul>"},{"location":"decisions/ADR-01_Integration_Repository_Placement/#3-\u6c7a\u5b9a","title":"3. \u6c7a\u5b9a","text":"<ol> <li>\u4e0a\u6d41 11 \u672c\u305d\u308c\u305e\u308c\u306b\u3001RCOSDP \u5185\u306b \u975e\u516c\u958b \u306e\u30ea\u30dd\u30b8\u30c8\u30ea <code>RDM-<name>-dev2027</code>\uff08\u4f8b: <code>RDM-osf.io-dev2027</code>\uff09\u3092\u65b0\u8a2d\u3057\u307e\u3059\u3002\u516c\u958b\u30b3\u30a2\u306e\u5168\u5c65\u6b74\u3092 push \u3057\u3001<code>git log</code> \u304c\u672c\u5f53\u306e\u3053\u3068\u3092\u793a\u3057\u3001\u300cSHA\u300d\uff08\u30b3\u30df\u30c3\u30c8\u306e\u6307\u7d0b\uff09\u304c\u4e0a\u6d41\u3068\u4e00\u81f4\u3059\u308b\u3088\u3046\u306b\u3057\u307e\u3059\u3002</li> <li>\u5404 <code>-dev2027</code> \u306e\u30d6\u30e9\u30f3\u30c1:</li> <li><code>develop</code> \u2014 \u7d71\u5408\u30d6\u30e9\u30f3\u30c1\u3002\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u304c\u7d44\u307f\u7acb\u3066\u308b\u552f\u4e00\u306e\u30d6\u30e9\u30f3\u30c1\uff08\u305d\u306e SHA \u3092 manifest \u306b\u8a18\u9332\u3002SPEC-01\uff09\u3002</li> <li>manifest \u306b\u8f09\u305b\u305f\u4e0a\u6d41\u3054\u3068\u306b\u4e00\u672c\u306e\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\u3002\u540d\u524d\u306f <code>upstream/<kind>-<branch></code> \u3067\u3001<code><kind></code> \u306f <code>public</code>\u30fb<code>private</code>\u30fb<code>cos</code>\u3001<code><branch></code> \u306f\u4e0a\u6d41\u306e\u30d6\u30e9\u30f3\u30c1\u540d\u306e <code>/</code> \u3092 <code>-</code> \u306b\u7f6e\u304d\u63db\u3048\u305f\u3082\u306e\uff08SPEC-01 \u00a74 \u306e\u898f\u5247 7\uff09\u3002</li> <li><code>upstream/public-<branch></code> \u2014 \u516c\u958b\u30b3\u30a2\u306e\u65e2\u5b9a\u30d6\u30e9\u30f3\u30c1\u306e\u6b63\u78ba\u306a\u300c\u30df\u30e9\u30fc\u300d\uff08\u81ea\u52d5\u3067\u66f4\u65b0\u3055\u308c\u308b\u540c\u4e00\u306e\u5199\u3057\uff09\u3002osf.io\u30fbwaterbutler\u30fbmfr\u30fbcas-overlay\u30fbwiki-frontend \u306f <code>upstream/public-develop</code>\u3001ember-osf-web \u3068 y-websocket \u306f <code>upstream/public-master</code>\u3002</li> <li><code>upstream/private-<branch></code> \u2014 <code>-private</code> \u306e\u65e2\u5b9a\u30d6\u30e9\u30f3\u30c1\u306e\u30df\u30e9\u30fc\u3002<code>upstream/private-develop</code>\u3001<code>upstream/private-master</code>\uff08ember-osf-web\u3001y-websocket\uff09\u3001\u307e\u305f\u306f <code>upstream/private-main</code>\uff08OASys\u3001Shibboleth-SP\u3001rdmcp\u3001aipf_mcp_data_grdm\u3002\u516c\u958b\u306e\u4e0a\u6d41\u304c\u306a\u3044\u306e\u3067\u3053\u306e\u4e00\u672c\u3060\u3051\uff09\u3002</li> <li><code>upstream/cos-develop</code> \u2014 CenterForOpenScience \u672c\u5bb6\u306e\u30df\u30e9\u30fc\u3002\u53c2\u7167\u306e\u307f\uff08COS \u672c\u5bb6\u306e\u306a\u3044 wiki-frontend \u306b\u306f\u306a\u3044\uff09\u3002</li> <li>\u540c\u3058 kind \u306e\u4e8c\u3064\u76ee\u306e\u4e0a\u6d41\u306b\u306f\u30bf\u30b0\u3092\u631f\u3080\u3002<code>upstream/private-sec-test-fix-sec-test</code> \u306f <code>RDM-osf.io-private</code>\uff08\u30d6\u30e9\u30f3\u30c1 <code>fix/sec-test</code>\uff09\u3092\u5019\u88dc\u3068\u3057\u3066\u5199\u3057\u305f\u3082\u306e\u3002 \u30df\u30e9\u30fc\u306f\u65e5\u6b21\u3067\u66f4\u65b0\u3057\u307e\u3059\uff08SPEC-05\uff09\u3002</li> <li><code>develop</code> \u3078\u306e\u7d71\u5408\u9806: \u516c\u958b <code>develop</code> \u2192 <code>-private</code> \u2192 \u63a1\u7528\u3057\u305f\u300c\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u300d\uff08\u30ec\u30d3\u30e5\u30fc\u5f85\u3061\u306e\u5909\u66f4\u306e\u63d0\u6848\uff09\u3002\u4e0a\u6d41\u3067\u30de\u30fc\u30b8\u6e08\u307f\u306e\u5909\u66f4\u306f\u5168\u4ef6\u53d6\u308a\u8fbc\u307f\u3001\u672a\u30de\u30fc\u30b8 PR \u306f\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fb\u8a8d\u8a3c\u7cfb\u3092\u5148\u306b\u4e00\u4ef6\u305a\u3064\u63a1\u5426\u3092\u6c7a\u3081\u3001\u5019\u88dc\u306f manifest \u306b\u8f09\u305b\u307e\u3059\u3002</li> <li>force push \u306a\u3057\u3001\u524a\u9664\u306a\u3057\u3002 \u885d\u7a81\u306f PR \u4e0a\u306e\u65b0\u3057\u3044\u30b3\u30df\u30c3\u30c8\u3067\u89e3\u304d\u3001\u5c65\u6b74\u306f\u66f8\u304d\u63db\u3048\u307e\u305b\u3093\u3002\u30d6\u30e9\u30f3\u30c1\u306f\u524a\u9664\u305b\u305a\u30bf\u30b0\u3067\u4fdd\u7ba1\u3057\u307e\u3059\u3002</li> <li><code>-dev2027</code> \u304b\u3089\u516c\u958b\u306e\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3078\u5199\u3059\u306e\u306f\u3001\u540d\u524d\u3001\u30d6\u30e9\u30f3\u30c1\u540d\u3001SHA\u3001\u65e5\u4ed8\u3001PR \u756a\u53f7\u3060\u3051\u3002 <code>-private</code> \u7531\u6765\u306e\u30b3\u30fc\u30c9\u304b\u3089\u4f5c\u308b\u30a4\u30e1\u30fc\u30b8\u306f\u3001\u30ed\u30fc\u30ab\u30eb\u306e Docker \u304b\u975e\u516c\u958b\u30ec\u30b8\u30b9\u30c8\u30ea\u306b\u3060\u3051\u7f6e\u304d\u3001\u516c\u958b\u30ec\u30b8\u30b9\u30c8\u30ea\u306b\u306f\u51fa\u3057\u307e\u305b\u3093\u3002</li> </ol> <pre><code>flowchart TD\n PUB[\"\u516c\u958b\u30b3\u30a2<br/>\u65e2\u5b9a\u30d6\u30e9\u30f3\u30c1\"] -->|\u65e5\u6b21\u30df\u30e9\u30fc| UP1[\"upstream/public-<branch>\"]\n PRV[\"-private<br/>\u65e2\u5b9a\u30d6\u30e9\u30f3\u30c1\"] -->|\u65e5\u6b21\u30df\u30e9\u30fc| UP2[\"upstream/private-<branch>\"]\n COS[\"CenterForOpenScience<br/>develop\"] -->|\u65e5\u6b21\u30df\u30e9\u30fc| UP3[\"upstream/cos-develop\"]\n UP1 -->|1. \u30de\u30fc\u30b8| DEV[\"develop\uff08\u7d71\u5408\uff09\"]\n UP2 -->|2. \u30de\u30fc\u30b8| DEV\n PRS[\"\u63a1\u7528 PR<br/>\uff08\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fb\u8a8d\u8a3c\u3092\u5148\u306b\uff09\"] -->|3. PR \u3068 Codex \u30ec\u30d3\u30e5\u30fc| DEV\n UP3 -.->|\u53c2\u7167\u306e\u307f| DEV\n DEV -->|\"\u540d\u524d\u3068 SHA\"| MAN[\"manifest/upstreams.json<br/>\uff08\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\uff09\"]</code></pre>"},{"location":"decisions/ADR-01_Integration_Repository_Placement/#4-\u7d50\u679c","title":"4. \u7d50\u679c","text":"<ul> <li>\u826f\u3044\u70b9: \u300c\u516c\u958b\uff0b\u975e\u516c\u958b\uff0b\u63a1\u7528 PR\u300d\u3092\u89e3\u304f\u5834\u6240\u304c\u90e8\u54c1\u3054\u3068\u306b\u4e00\u3064\u306b\u306a\u308b\u3002\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306f\u540d\u524d\u3068 SHA \u3060\u3051\u3067\u8db3\u308a\u308b\u3002\u65e5\u6b21\u30df\u30e9\u30fc\u3067\u5dee\u5206\u304c\u5c0f\u3055\u304f\u4fdd\u305f\u308c\u308b\u3002\u5c65\u6b74\u304c\u5b8c\u5168\u3067\u76e3\u67fb\u3067\u304d\u308b\u3002</li> <li>\u826f\u3044\u70b9: \u65e2\u5b58\u30ea\u30dd\u30b8\u30c8\u30ea\u3078\u306e\u65b0\u3057\u3044\u6a29\u9650\u3092\u6c42\u3081\u305a\u306b\u3001\u66f8\u8fbc\u306e\u5883\u754c\u3092\u5b88\u308c\u308b\u3002</li> <li>\u30b3\u30b9\u30c8: \u898b\u5b88\u308b\u30ea\u30dd\u30b8\u30c8\u30ea\u304c 11 \u672c\u5897\u3048\u308b\u3002SPEC-05 \u306e\u81ea\u52d5\u5316\u3068\u9032\u6357\u30dc\u30fc\u30c9\u3067\u548c\u3089\u3052\u308b\u3002</li> <li>\u30b3\u30b9\u30c8: <code>-dev2027</code> \u306f\u975e\u516c\u958b\u306e\u305f\u3081\u3001GitHub Actions \u306e\u5b9f\u884c\u6642\u9593\u3068\u30bb\u30eb\u30d5\u30db\u30b9\u30c8\u30e9\u30f3\u30ca\u30fc\u306e\u5229\u7528\u304c Team \u30d7\u30e9\u30f3\u306e\u67a0\u3092\u4f7f\u3046\u3002\u53d7\u3051\u5165\u308c\u308b\u3002</li> <li>\u30ea\u30b9\u30af \u2014 \u516c\u958b\u306e\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3078\u306e\u6f0f\u3048\u3044\u3002 <code>-dev2027</code> \u3084 <code>-private</code> \u304b\u3089\u30d5\u30a1\u30a4\u30eb\u3001\u30b9\u30bf\u30c3\u30af\u30c8\u30ec\u30fc\u30b9\u3001URL \u3092\u4e00\u3064\u4e0d\u6ce8\u610f\u306b\u5199\u3059\u3060\u3051\u3067\u3001\u975e\u516c\u958b\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u4f5c\u696d\u304c\u516c\u958b\u3055\u308c\u307e\u3059\u3002\u5bfe\u7b56: CI \u306e\u79d8\u5bc6\u30b9\u30ad\u30e3\u30f3\u3092\u5fc5\u9808\u306b\u3059\u308b\u3002\u30ec\u30d3\u30e5\u30ef\u306f\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3078\u306e\u5168 PR \u3067\u975e\u516c\u958b\u306e\u30d1\u30b9\u3068 URL \u3092\u78ba\u304b\u3081\u308b\u3002manifest \u306e\u30b9\u30ad\u30fc\u30de\u306f\u540d\u524d\u30fb\u30d6\u30e9\u30f3\u30c1\u30fbSHA\u30fb\u65e5\u4ed8\u30fbPR \u756a\u53f7\u3057\u304b\u8a31\u3055\u306a\u3044\u3002\u6587\u66f8\u306f\u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u540d\u524d\u3067\u547c\u3073\u3001\u30ea\u30f3\u30af\u3057\u306a\u3044\uff08SPEC-06 \u00a75\uff09\u3002</li> <li>\u30ea\u30b9\u30af \u2014 \u516c\u958b\u3068\u975e\u516c\u958b\u306e\u305a\u308c\u3002 2026-11-05 \u6642\u70b9\u3067\u516c\u958b <code>RDM-osf.io</code> \u306e develop \u306f <code>-private</code> \u3088\u308a\u65b0\u3057\u304b\u3063\u305f\u3002\u7d71\u5408\u9806\uff08\u516c\u958b\u3092\u5148\u3001\u6b21\u306b\u975e\u516c\u958b\uff09\u3068\u65e5\u6b21\u30df\u30e9\u30fc\u306b\u3088\u308a\u3001\u3053\u3046\u3057\u305f\u305a\u308c\u306f\u9ed9\u3063\u305f\u4e0a\u66f8\u304d\u3067\u306f\u306a\u304f\u30de\u30fc\u30b8\u3068\u3057\u3066\u898b\u3048\u307e\u3059\u3002</li> <li>\u672a\u6c7a: <code>RDM-osf.io-develop-private</code> \u3068\u306f\u5225\u7269\u306e <code>RDM-osf.io-private</code>\uff08\u30d6\u30e9\u30f3\u30c1 <code>fix/sec-test</code>\uff09\u306e\u6271\u3044\u3002<code>upstream/private-sec-test-fix-sec-test</code> \u3068\u3057\u3066\u30df\u30e9\u30fc\u3057\u3001manifest \u306b\u306f <code>status: candidate</code> \u3067\u8f09\u305b\u3066\u3044\u307e\u3059\uff08SPEC-01 \u00a74 \u306e\u898f\u5247 6\uff09\u3002\u30de\u30fc\u30b8\u3059\u308b\u304b\u306f\u6240\u6709\u8005\u304c\u6c7a\u3081\u307e\u3059\u3002</li> </ul>"},{"location":"decisions/ADR-01_Integration_Repository_Placement/#5-\u7d71\u5408\u9806\u306e\u521d\u56de\u69cb\u7bc92026-11-05-\u6c7a\u5b9a-\u53b3\u5bc6\u306b\u518d\u69cb\u7bc9\u3059\u308b","title":"5. \u7d71\u5408\u9806\u306e\u521d\u56de\u69cb\u7bc9\uff082026-11-05 \u6c7a\u5b9a: \u53b3\u5bc6\u306b\u518d\u69cb\u7bc9\u3059\u308b\uff09","text":"<p>\u72b6\u614b: \u6240\u6709\u8005\u306f\u300c<code>-private</code> \u306e\u5148\u7aef\u3092\u8d77\u70b9\u306b\u3057\u3066\u3001\u3088\u308a\u65b0\u3057\u3044\u516c\u958b\u306e\u5148\u7aef\u3092\u30de\u30fc\u30b8\u3059\u308b\u300d\u3068\u3044\u3046\u89e3\u91c8\u306e\u63d0\u6848\u3092 \u9000\u3051\u305f\uff08RDM-osf.io-dev2027 PR #1 \u306e\u30ec\u30d3\u30e5\u30fc r1/r2\u3001\u6307\u6458 R2\uff09\u3002SPEC-01 \u00a74 \u306e\u7d71\u5408\u9806\u306f\u3001\u521d\u56de\u69cb\u7bc9\u306b\u3082\u6587\u5b57\u3069\u304a\u308a\u9069\u7528\u3059\u308b\u3002</p> <p>\u5404 <code>-dev2027</code> \u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u624b\u9806:</p> <ol> <li><code>upstream/public-<branch></code> \u306e\u5148\u7aef\u304b\u3089\u30d6\u30e9\u30f3\u30c1 <code>integrate/strict-<YYYYMMDD></code> \u3092\u5207\u308b\u3002</li> <li>\u305d\u3053\u3078 <code>upstream/private-<branch></code> \u3092\u901a\u5e38\u306e 2 \u89aa\u30de\u30fc\u30b8\uff08<code>--no-ff</code>\uff09\u3067\u53d6\u308a\u8fbc\u307f\u3001\u885d\u7a81\u306f\u305d\u306e\u30d6\u30e9\u30f3\u30c1\u4e0a\u3067\u89e3\u6d88\u3059\u308b\u3002</li> <li>manifest \u306e\u63a1\u7528 PR \u3092\u3001\u305d\u308c\u305e\u308c\u72ec\u7acb\u3057\u305f\u30de\u30fc\u30b8\u3068\u3057\u3066\u518d\u9069\u7528\u3059\u308b\u3002</li> <li>\u305d\u306e\u30d6\u30e9\u30f3\u30c1\u304b\u3089 <code>develop</code> \u3078 PR \u3092\u51fa\u3059\u3002<code>develop</code> \u306f force push \u3082\u524a\u9664\u3082\u3057\u306a\u3044\u3002\u3053\u306e PR \u306f\u4ee5\u524d\u306e\u7d71\u5408 PR \u3092\u7f6e\u304d\u63db\u3048\u3001\u4ee5\u524d\u306e PR \u306f\u65b0\u3057\u3044 PR \u3092\u793a\u3059\u30b3\u30e1\u30f3\u30c8\u3092\u4ed8\u3051\u3066\u9589\u3058\u308b\u3002</li> <li>REV \u306e\u30ec\u30d3\u30e5\u30fc\u3001QAE \u306e\u691c\u67fb\u3001\u6240\u6709\u8005\u306e\u30de\u30fc\u30b8\uff08ADR-04\uff09\u3002</li> </ol> <p>\u7d50\u679c: \u5404\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u6700\u521d\u306e <code>develop</code>\uff08\u521d\u56de\u69cb\u7bc9\u3067 <code>-private</code> \u306e\u5148\u7aef\u304b\u3089\u4f5c\u3063\u305f\u3082\u306e\uff09\u306f\u5c65\u6b74\u306b\u6b8b\u308b\u3002\u53b3\u5bc6\u306b\u518d\u69cb\u7bc9\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u306f\u305d\u306e\u4e0a\u306b\u30de\u30fc\u30b8\u3055\u308c\u308b\u306e\u3067\u3001\u6700\u521d\u306e\u53b3\u5bc6\u30de\u30fc\u30b8\u4ee5\u964d\u3001\u3069\u306e <code>develop</code> \u3082\u300c\u516c\u958b\u304c\u5148\u300d\u306e\u9806\u5e8f\u3092\u6301\u3064\u3002</p>"},{"location":"decisions/ADR-01_Integration_Repository_Placement/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Fork Your own copy of someone's repository that remembers where it came from. \u4ed6\u4eba\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u81ea\u5206\u7528\u306e\u5199\u3057\u3002\u51fa\u3069\u3053\u308d\u3092\u899a\u3048\u3066\u3044\u308b\u3002 Mirror An identical copy that is refreshed automatically. \u81ea\u52d5\u3067\u66f4\u65b0\u3055\u308c\u308b\u3001\u305d\u3063\u304f\u308a\u540c\u3058\u5199\u3057\u3002 Pull request (PR) A proposed change waiting for someone to review and accept it. \u8ab0\u304b\u304c\u898b\u3066\u53d7\u3051\u5165\u308c\u308b\u306e\u3092\u5f85\u3063\u3066\u3044\u308b\u3001\u5909\u66f4\u306e\u63d0\u6848\u3002 Patch A small text file that describes a change to code. \u30b3\u30fc\u30c9\u306e\u5909\u66f4\u5185\u5bb9\u3092\u66f8\u3044\u305f\u5c0f\u3055\u306a\u6587\u5b57\u30d5\u30a1\u30a4\u30eb\u3002 Force push Overwriting shared history; forbidden here. \u5171\u6709\u306e\u5c65\u6b74\u306e\u4e0a\u66f8\u304d\u3002\u3053\u3053\u3067\u306f\u7981\u6b62\u3002 <p>Full shared glossary: REF-01 Glossary.</p>"},{"location":"decisions/ADR-02_Network_Model/","title":"ADR-02 Network Model / \u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u65b9\u5f0f","text":"<p>Summary: We drop the upstream loopback alias <code>192.168.168.167</code> (which needed <code>sudo</code> and exposed services to the local network) and use the Docker Compose internal network for service-to-service traffic plus <code>127.0.0.1</code>-only publishing for the browser. \u6982\u8981: \u4e0a\u6d41\u306e\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u5225\u540d <code>192.168.168.167</code>\uff08<code>sudo</code> \u304c\u8981\u308a\u3001\u30b5\u30fc\u30d3\u30b9\u3092 LAN \u306b\u9732\u51fa\u3057\u305f\uff09\u3092\u3084\u3081\u3001\u30b5\u30fc\u30d3\u30b9\u9593\u306f Docker Compose \u306e\u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3001\u30d6\u30e9\u30a6\u30b6\u5411\u3051\u306f <code>127.0.0.1</code> \u3060\u3051\u3078\u306e\u516c\u958b\u306b\u3059\u308b\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.2 \u2014 2026-11-05. Learned: Docker cannot publish ports from an internal network, so \"one internal network\" became two networks with an explicit egress switch (PR #21 review r1, finding 8). \uff0f Docker \u306f\u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u304b\u3089\u30dd\u30fc\u30c8\u3092\u516c\u958b\u3067\u304d\u306a\u3044\u305f\u3081\u3001\u300c\u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u4e00\u3064\u300d\u306f\u4e8c\u3064\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3068\u660e\u793a\u7684\u306a egress \u306e\u5207\u66ff\u306b\u306a\u3063\u305f\uff08PR #21 \u30ec\u30d3\u30e5\u30fc r1\u3001\u6307\u6458 8\uff09\u3002 0.1 \u2014 2026-11-05. Learned: the alias existed only so that one address worked both inside containers and in the browser; once services talk by Compose service name and the browser talks to <code>127.0.0.1</code>, no shared address is needed and the <code>sudo</code> step disappears with it. \uff0f \u5225\u540d\u306f\u300c\u4e00\u3064\u306e\u30a2\u30c9\u30ec\u30b9\u304c\u30b3\u30f3\u30c6\u30ca\u306e\u4e2d\u3067\u3082\u30d6\u30e9\u30a6\u30b6\u3067\u3082\u901a\u308b\u300d\u305f\u3081\u3060\u3051\u306b\u5b58\u5728\u3057\u3066\u3044\u305f\u3002\u30b5\u30fc\u30d3\u30b9\u9593\u304c Compose \u306e\u30b5\u30fc\u30d3\u30b9\u540d\u3067\u3001\u30d6\u30e9\u30a6\u30b6\u304c <code>127.0.0.1</code> \u3067\u8a71\u305b\u3070\u5171\u901a\u30a2\u30c9\u30ec\u30b9\u306f\u4e0d\u8981\u306b\u306a\u308a\u3001<code>sudo</code> \u306e\u624b\u9806\u3082\u4e00\u7dd2\u306b\u6d88\u3048\u308b\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Status: Accepted by the owner, 2026-11-05 (plan-interview).</li> <li>Records a decision for: POL-01 \u00a75 \u00b7 SPEC-02 Installer CLI \u00b7 SPEC-03 Security Gate</li> <li>Related: docs/README.md \u00b7 SPEC-00 Overview \u00b7 SPEC-04 Acceptance Tests \u00b7 ADR-01 \u00b7 ADR-03 \u00b7 REF-01 Glossary \u00b7 legacy guide <code>docs/guides/environment/README.md</code> (moved from <code>Environment.md</code>)</li> </ul> <p></p>"},{"location":"decisions/ADR-02_Network_Model/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"decisions/ADR-02_Network_Model/#1-context","title":"1. Context","text":"<p>The upstream <code>docker-compose.yml</code> of <code>RDM-osf.io</code> and its <code>README-docker-compose.md</code> ask the developer to add <code>192.168.168.167</code> as an alias (an extra name or address for the same thing) on the loopback interface (the network path that leads back to your own computer; <code>127.0.0.1</code> and <code>localhost</code> are its usual names). The alias is configured with administrator rights:</p> <ul> <li>macOS: <code>sudo ifconfig lo0 alias 192.168.168.167/24</code></li> <li>Linux: an interface configuration or <code>ip addr add</code> with <code>sudo</code></li> <li>Windows: <code>netsh interface ip add address \"Loopback\" 192.168.168.167 255.255.255.0</code> as administrator</li> </ul> <p>The reason is a single address that works in two places. Containers (boxes that hold one program and everything it needs) talk to each other \u2014 the <code>web</code> service calls <code>wb</code> (waterbutler), <code>mfr</code> and <code>fakecas</code>; the browser on the host also needs those addresses in redirects and in JavaScript. Giving the host a fixed alias and publishing every port (a numbered door on an address through which one program listens) on <code>0.0.0.0</code> made both paths use one address.</p> <p>This conflicts with three rules of the 2027 environment (POL-01):</p> <ol> <li>localhost only \u2014 nothing listens on an address reachable from the local network;</li> <li>no LAN exposure \u2014 <code>0.0.0.0</code> publishing is not allowed, because a development instance with EOL components must never be reachable by a neighbour on the same Wi-Fi;</li> <li>no sudo \u2014 the installer runs as an ordinary user, so it is safe to run on a laptop managed by someone else and simple to run in CI.</li> </ol> <p>The alias also fails in practice: it disappears after reboot on macOS, Windows setups were never confirmed, and port <code>5000</code> collides with macOS AirPlay Receiver on macOS 15 and later (the legacy guide already recommends remapping it).</p>"},{"location":"decisions/ADR-02_Network_Model/#2-options-considered","title":"2. Options considered","text":"<pre><code>options[3]{id,option,needs_sudo,lan_exposure,matches_upstream_docs,test_matrix,verdict}:\n A,\"Keep the 192.168.168.167 loopback alias as upstream does\",yes,yes,yes,1,rejected\n B,\"Drop the alias: Compose internal network for services, 127.0.0.1 publishing for the browser\",no,no,no,1,chosen\n C,\"Support both, selected by --legacy-network\",partly,partly,partly,2,rejected</code></pre> <ul> <li>A keeps upstream documents literally true but violates all three rules above. Rejected.</li> <li>C doubles the test matrix (every acceptance test twice) and keeps <code>sudo</code> code paths alive in the installer. Rejected; a developer who really needs the alias can still follow the upstream README by hand, outside the installer.</li> </ul>"},{"location":"decisions/ADR-02_Network_Model/#3-decision","title":"3. Decision","text":"<ol> <li>Service-to-service traffic uses the internal Compose network <code>grdm</code> (<code>internal: true</code>). Every service addresses another by its Compose service name (<code>web</code>, <code>api</code>, <code>wb</code>, <code>mfr</code>, <code>fakecas</code>, <code>cas</code>, <code>postgres</code>, <code>elasticsearch</code>, <code>rabbitmq</code>, <code>redis</code>, <code>mongo</code>); Docker's built-in DNS resolves them, no fixed IP addresses. An internal network has no egress. Browser-facing services are additionally attached to the plain bridge <code>grdm-edge</code>, from which their ports are published on <code>127.0.0.1</code> (decision 2). A service that needs the Internet is attached to <code>grdm-edge</code> explicitly with <code>compose render --egress</code>, recorded in <code>runtime/.env</code> (<code>GRDM_EGRESS_SERVICES</code>); the default grants none.</li> <li>Browser-facing traffic is published on <code>127.0.0.1</code> only. The generated Compose file writes <code>127.0.0.1:<host-port>:<container-port></code>, never <code>0.0.0.0</code> or a bare port. The default host ports are defined once, in the ports table of SPEC-02 \u00a74 (<code>5000</code> web, <code>8000</code> api, <code>8001</code> admin, <code>7777</code> wb, <code>7778</code> mfr, <code>8080</code> fakecas, <code>4200</code> ember). The installer checks each port is free and remaps on collision (macOS AirPlay on <code>5000</code> is the known case), recording the mapping in <code>runtime/.env</code> and the install report.</li> <li>Settings that differ from upstream documents are rewritten by the installer, not by hand:</li> <li><code>website/settings/local.py</code> and <code>api/base/settings/local.py</code>: <code>DOMAIN</code>, <code>API_DOMAIN</code>, <code>WATERBUTLER_URL</code>, <code>MFR_SERVER_URL</code>, <code>CAS_SERVER_URL</code> and similar \u2014 the internal URLs use service names, the external (browser) URLs use <code>http://127.0.0.1:<port>/</code>;</li> <li><code>.docker-compose.env</code>, <code>.docker-compose.wb.env</code>, <code>.docker-compose.mfr.env</code>, <code>.docker-compose.sharejs.env</code>: hostnames and ports as above; secrets are random values generated at install time (SPEC-03);</li> <li><code>runtime/docker-compose.yml</code> is generated from the manifest and the host profile (SPEC-02 \u00a73); the upstream <code>docker-compose.yml</code> files in the integration repositories are left untouched so upstream diffs stay clean.</li> <li><code>grdm-dev health --network</code> fails if any container port is listening on an address other than <code>127.0.0.1</code> on the host (SPEC-04).</li> <li>Browser behaviour: acceptance tests and users open <code>http://127.0.0.1:5000/</code>. <code>localhost</code> is accepted as an equivalent in docs, but the installer writes <code>127.0.0.1</code> to avoid IPv6 <code>::1</code> surprises in Node-based services.</li> </ol> <pre><code>flowchart LR\n subgraph OLD[\"Old: loopback alias (upstream)\"]\n H1[\"Host: sudo ifconfig lo0 alias<br/>192.168.168.167\"]\n B1[\"Browser \u2192 192.168.168.167:5000\"]\n W1[\"web\"] -->|\"192.168.168.167:7777\"| WB1[\"wb\"]\n W1 -->|\"192.168.168.167:8080\"| FC1[\"fakecas\"]\n B1 --> W1\n H1 -. \"0.0.0.0 publishing<br/>reachable from LAN\" .-> W1\n end\n subgraph NEW[\"New: internal network + 127.0.0.1 (chosen)\"]\n B2[\"Browser \u2192 127.0.0.1:5000\"]\n subgraph NET[\"compose network (private DNS)\"]\n W2[\"web\"] -->|\"http://wb:7777\"| WB2[\"wb\"]\n W2 -->|\"http://fakecas:8080\"| FC2[\"fakecas\"]\n end\n B2 -->|\"127.0.0.1:5000 \u2192 web\"| W2\n B2 -->|\"127.0.0.1:7777 \u2192 wb\"| WB2\n end</code></pre>"},{"location":"decisions/ADR-02_Network_Model/#4-consequences","title":"4. Consequences","text":"<ul> <li> <p>Exposure to be aware of. The seven browser-facing services (<code>web</code>, <code>api</code>, <code>admin</code>, <code>wb</code>, <code>mfr</code>, <code>fakecas</code>, <code>ember_osf_web</code>) sit on the ordinary bridge <code>grdm-edge</code> so that their ports can be published; on that network they also have outbound access to the Internet. All other services have no egress by default. Add-on development against external providers from a non-publishing service requires <code>compose render --egress <service></code>; every grant, implicit or explicit, is visible to the security gate.</p> </li> <li> <p>Good: no <code>sudo</code>, nothing survives a reboot that must be redone, nothing is reachable from the LAN, the same Compose file works on macOS, Ubuntu and WSL2, and CI can run it unmodified.</p> </li> <li>Good: fewer moving parts for the security gate \u2014 the \"listening address\" check in SPEC-03 becomes a one-line rule.</li> <li>Cost \u2014 divergence from upstream documents. <code>README-docker-compose.md</code> in the public cores still describes the alias. Every place where our settings differ is explained in the environment guide at <code>docs/guides/environment/README.md</code>, with a table \"upstream says / we do / why\". Developers who copy commands from upstream must read that table first.</li> <li>Cost \u2014 redirects and absolute URLs. OSF builds absolute URLs from <code>DOMAIN</code> and <code>API_DOMAIN</code>; if a service receives an internal name and echoes it to the browser, the browser cannot resolve it. The installer therefore separates internal and external URL settings, and the acceptance tests include a redirect-chain check (login via fakecas, file download via wb, preview via mfr).</li> <li>Cost \u2014 Chrome cookie sharing. The legacy guide noted that Chrome did not share cookies between fakecas and the web UI under the alias. With everything on <code>127.0.0.1</code> and distinct ports, cookies are per host, so the same caution applies; the login scenario of the acceptance tests (Chromium, SPEC-04 \u00a71) catches it.</li> <li>Not provided: access from another machine on the LAN (for example, testing from a phone). If needed later, it is a separate, explicit decision, not a flag.</li> </ul> <p></p>"},{"location":"decisions/ADR-02_Network_Model/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"decisions/ADR-02_Network_Model/#1-\u80cc\u666f","title":"1. \u80cc\u666f","text":"<p><code>RDM-osf.io</code> \u306e\u4e0a\u6d41 <code>docker-compose.yml</code> \u3068 <code>README-docker-compose.md</code> \u306f\u3001\u958b\u767a\u8005\u306b <code>192.168.168.167</code> \u3092\u300c\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u300d\uff08\u81ea\u5206\u306e\u8a08\u7b97\u6a5f\u3078\u623b\u3063\u3066\u304f\u308b\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u9053\u3002\u666e\u6bb5\u306f <code>127.0.0.1</code> \u3084 <code>localhost</code> \u3068\u547c\u3076\uff09\u306e\u300c\u5225\u540d\u300d\uff08\u540c\u3058\u3082\u306e\u306b\u4ed8\u3051\u308b\u8ffd\u52a0\u306e\u540d\u524d\u3084\u30a2\u30c9\u30ec\u30b9\uff09\u3068\u3057\u3066\u8db3\u3059\u3088\u3046\u6c42\u3081\u307e\u3059\u3002\u3053\u306e\u8a2d\u5b9a\u306b\u306f\u7ba1\u7406\u8005\u6a29\u9650\u304c\u8981\u308a\u307e\u3059\u3002</p> <ul> <li>macOS: <code>sudo ifconfig lo0 alias 192.168.168.167/24</code></li> <li>Linux: \u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u3001\u307e\u305f\u306f <code>sudo</code> \u4ed8\u304d\u306e <code>ip addr add</code></li> <li>Windows: \u7ba1\u7406\u8005\u3067 <code>netsh interface ip add address \"Loopback\" 192.168.168.167 255.255.255.0</code></li> </ul> <p>\u7406\u7531\u306f\u3001\u4e00\u3064\u306e\u30a2\u30c9\u30ec\u30b9\u3092\u4e8c\u3064\u306e\u5834\u6240\u3067\u901a\u3059\u305f\u3081\u3067\u3059\u3002\u300c\u30b3\u30f3\u30c6\u30ca\u300d\uff08\u4e00\u3064\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u3068\u5fc5\u8981\u306a\u3082\u306e\u3092\u5165\u308c\u305f\u7bb1\uff09\u540c\u58eb\u304c\u8a71\u3059 \u2014 <code>web</code> \u304c <code>wb</code>\uff08waterbutler\uff09\u3001<code>mfr</code>\u3001<code>fakecas</code> \u3092\u547c\u3076 \u2014 \u4e00\u65b9\u3067\u3001\u30db\u30b9\u30c8\u306e\u30d6\u30e9\u30a6\u30b6\u3082\u8ee2\u9001\u5148\u3084 JavaScript \u306e\u4e2d\u3067\u305d\u306e\u30a2\u30c9\u30ec\u30b9\u3092\u5fc5\u8981\u3068\u3057\u307e\u3059\u3002\u30db\u30b9\u30c8\u306b\u56fa\u5b9a\u306e\u5225\u540d\u3092\u4ed8\u3051\u3001\u5168\u300c\u30dd\u30fc\u30c8\u300d\uff08\u4e00\u3064\u306e\u30a2\u30c9\u30ec\u30b9\u306b\u4ed8\u3044\u305f\u756a\u53f7\u4ed8\u304d\u306e\u6249\u3002\u30d7\u30ed\u30b0\u30e9\u30e0\u306f\u3053\u3053\u3067\u5f85\u3064\uff09\u3092 <code>0.0.0.0</code> \u3067\u516c\u958b\u3059\u308c\u3070\u3001\u4e21\u65b9\u306e\u9053\u304c\u4e00\u3064\u306e\u30a2\u30c9\u30ec\u30b9\u3067\u6e08\u3093\u3060\u306e\u3067\u3059\u3002</p> <p>\u3053\u308c\u306f 2027 \u7248\u306e\u4e09\u3064\u306e\u898f\u5247\uff08POL-01\uff09\u3068\u885d\u7a81\u3057\u307e\u3059\u3002</p> <ol> <li>localhost \u306e\u307f \u2014 LAN \u304b\u3089\u5c4a\u304f\u30a2\u30c9\u30ec\u30b9\u3067\u5f85\u3064\u3082\u306e\u3092\u7f6e\u304b\u306a\u3044\u3002</li> <li>LAN \u3078\u306e\u9732\u51fa\u306a\u3057 \u2014 <code>0.0.0.0</code> \u3067\u306e\u516c\u958b\u306f\u8a8d\u3081\u306a\u3044\u3002EOL \u90e8\u54c1\u3092\u542b\u3080\u958b\u767a\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u304c\u3001\u540c\u3058 Wi-Fi \u306e\u96a3\u4eba\u304b\u3089\u5c4a\u3044\u3066\u306f\u306a\u3089\u306a\u3044\u3002</li> <li>sudo \u4e0d\u8981 \u2014 \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306f\u4e00\u822c\u30e6\u30fc\u30b6\u30fc\u3067\u52d5\u304f\u3002\u4ed6\u4eba\u304c\u7ba1\u7406\u3059\u308b\u30ce\u30fc\u30c8 PC \u3067\u3082\u5b89\u5168\u306b\u3001CI \u3067\u3082\u7c21\u5358\u306b\u52d5\u304b\u305b\u308b\u3002</li> </ol> <p>\u5225\u540d\u306f\u5b9f\u52d9\u3067\u3082\u3064\u307e\u305a\u304d\u307e\u3059\u3002macOS \u3067\u306f\u518d\u8d77\u52d5\u3067\u6d88\u3048\u3001Windows \u306f\u52d5\u4f5c\u672a\u78ba\u8a8d\u3067\u3001\u30dd\u30fc\u30c8 <code>5000</code> \u306f macOS 15 \u4ee5\u964d\u306e AirPlay \u30ec\u30b7\u30fc\u30d0\u30fc\u3068\u885d\u7a81\u3057\u307e\u3059\uff08\u65e7\u624b\u5f15\u304d\u304c\u65e2\u306b\u4ed8\u3051\u66ff\u3048\u3092\u52e7\u3081\u3066\u3044\u307e\u3059\uff09\u3002</p>"},{"location":"decisions/ADR-02_Network_Model/#2-\u691c\u8a0e\u3057\u305f\u9078\u629e\u80a2","title":"2. \u691c\u8a0e\u3057\u305f\u9078\u629e\u80a2","text":"<pre><code>options[3]{id,option,needs_sudo,lan_exposure,matches_upstream_docs,test_matrix,verdict}:\n A,\"\u4e0a\u6d41\u3069\u304a\u308a 192.168.168.167 \u306e\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u5225\u540d\u3092\u7dad\u6301\",yes,yes,yes,1,\u4e0d\u63a1\u7528\n B,\"\u5225\u540d\u3092\u5ec3\u6b62\u3002\u30b5\u30fc\u30d3\u30b9\u9593\u306f Compose \u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3001\u30d6\u30e9\u30a6\u30b6\u5411\u3051\u306f 127.0.0.1 \u3067\u516c\u958b\",no,no,no,1,\u63a1\u7528\n C,\"\u4e21\u5bfe\u5fdc\u3002--legacy-network \u3067\u5207\u66ff\",partly,partly,partly,2,\u4e0d\u63a1\u7528</code></pre> <ul> <li>A \u306f\u4e0a\u6d41\u6587\u66f8\u3092\u6587\u5b57\u3069\u304a\u308a\u6b63\u3057\u3044\u307e\u307e\u306b\u3057\u307e\u3059\u304c\u3001\u4e0a\u306e\u4e09\u3064\u306e\u898f\u5247\u3092\u3059\u3079\u3066\u7834\u308a\u307e\u3059\u3002\u4e0d\u63a1\u7528\u3002</li> <li>C \u306f\u8a66\u9a13\u306e\u7d44\u307f\u5408\u308f\u305b\u3092\u500d\u306b\u3057\uff08\u5168\u53d7\u5165\u8a66\u9a13\u3092\u4e8c\u5ea6\uff09\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306b <code>sudo</code> \u306e\u7d4c\u8def\u3092\u6b8b\u3057\u307e\u3059\u3002\u4e0d\u63a1\u7528\u3002\u672c\u5f53\u306b\u5225\u540d\u304c\u8981\u308b\u958b\u767a\u8005\u306f\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306e\u5916\u3067\u4e0a\u6d41 README \u3092\u624b\u3067\u8ffd\u3048\u307e\u3059\u3002</li> </ul>"},{"location":"decisions/ADR-02_Network_Model/#3-\u6c7a\u5b9a","title":"3. \u6c7a\u5b9a","text":"<ol> <li>\u30b5\u30fc\u30d3\u30b9\u9593\u901a\u4fe1\u306f\u5185\u90e8 Compose \u30cd\u30c3\u30c8\u30ef\u30fc\u30af <code>grdm</code>\uff08<code>internal: true</code>\uff09\u3092\u4f7f\u3046\u3002 \u5404\u30b5\u30fc\u30d3\u30b9\u306f\u76f8\u624b\u3092 Compose \u306e\u30b5\u30fc\u30d3\u30b9\u540d\uff08<code>web</code>\u3001<code>api</code>\u3001<code>wb</code>\u3001<code>mfr</code>\u3001<code>fakecas</code>\u3001<code>cas</code>\u3001<code>postgres</code>\u3001<code>elasticsearch</code>\u3001<code>rabbitmq</code>\u3001<code>redis</code>\u3001<code>mongo</code>\uff09\u3067\u547c\u3073\u3001Docker \u5185\u8535\u306e DNS\uff08\u540d\u524d\u3092\u30a2\u30c9\u30ec\u30b9\u306b\u5909\u3048\u308b\u96fb\u8a71\u5e33\uff09\u304c\u89e3\u6c7a\u3059\u308b\u3002\u56fa\u5b9a IP \u306f\u4f7f\u308f\u306a\u3044\u3002\u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306b\u306f\u5916\u5411\u304d\u901a\u4fe1\u304c\u306a\u3044\u3002\u30d6\u30e9\u30a6\u30b6\u5411\u3051\u30b5\u30fc\u30d3\u30b9\u306f\u901a\u5e38\u306e bridge <code>grdm-edge</code> \u306b\u3082\u63a5\u7d9a\u3057\u3001\u305d\u3053\u304b\u3089 <code>127.0.0.1</code> \u306b\u30dd\u30fc\u30c8\u3092\u516c\u958b\u3059\u308b\uff08\u6c7a\u5b9a 2\uff09\u3002\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u304c\u5fc5\u8981\u306a\u30b5\u30fc\u30d3\u30b9\u306f <code>compose render --egress</code> \u3067\u660e\u793a\u7684\u306b <code>grdm-edge</code> \u3078\u63a5\u7d9a\u3057\u3001<code>runtime/.env</code>\uff08<code>GRDM_EGRESS_SERVICES</code>\uff09\u306b\u8a18\u9332\u3059\u308b\u3002\u65e2\u5b9a\u3067\u306f\u4f55\u3082\u4e0e\u3048\u306a\u3044\u3002</li> <li>\u30d6\u30e9\u30a6\u30b6\u5411\u3051\u306e\u516c\u958b\u306f <code>127.0.0.1</code> \u3060\u3051\u3002 \u751f\u6210\u3059\u308b Compose \u30d5\u30a1\u30a4\u30eb\u306b\u306f <code>127.0.0.1:<\u30db\u30b9\u30c8\u5074\u30dd\u30fc\u30c8>:<\u30b3\u30f3\u30c6\u30ca\u5074\u30dd\u30fc\u30c8></code> \u3068\u66f8\u304d\u3001<code>0.0.0.0</code> \u3084\u30dd\u30fc\u30c8\u756a\u53f7\u3060\u3051\u306e\u66f8\u304d\u65b9\u306f\u3057\u307e\u305b\u3093\u3002\u65e2\u5b9a\u306e\u30db\u30b9\u30c8\u5074\u30dd\u30fc\u30c8\u306f SPEC-02 \u00a74 \u306e\u30dd\u30fc\u30c8\u8868\u3067\u4e00\u5ea6\u3060\u3051\u5b9a\u3081\u307e\u3059\uff08<code>5000</code> web\u3001<code>8000</code> api\u3001<code>8001</code> admin\u3001<code>7777</code> wb\u3001<code>7778</code> mfr\u3001<code>8080</code> fakecas\u3001<code>4200</code> ember\uff09\u3002\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306f\u5404\u30dd\u30fc\u30c8\u306e\u7a7a\u304d\u3092\u78ba\u304b\u3081\u3001\u885d\u7a81\u6642\uff08macOS \u306e AirPlay \u3068 <code>5000</code> \u304c\u65e2\u77e5\uff09\u306f\u4ed8\u3051\u66ff\u3048\u3066 <code>runtime/.env</code> \u3068\u5c0e\u5165\u5831\u544a\u66f8\u306b\u8a18\u9332\u3057\u307e\u3059\u3002</li> <li>\u4e0a\u6d41\u6587\u66f8\u3068\u7570\u306a\u308b\u8a2d\u5b9a\u306f\u3001\u624b\u3067\u306f\u306a\u304f\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u304c\u66f8\u304d\u63db\u3048\u308b\u3002</li> <li><code>website/settings/local.py</code> \u3068 <code>api/base/settings/local.py</code>: <code>DOMAIN</code>\u3001<code>API_DOMAIN</code>\u3001<code>WATERBUTLER_URL</code>\u3001<code>MFR_SERVER_URL</code>\u3001<code>CAS_SERVER_URL</code> \u304a\u3088\u3073\u305d\u306e\u985e\u3002\u300c\u5185\u90e8\u300d\u306e URL \u306f\u30b5\u30fc\u30d3\u30b9\u540d\u3001\u300c\u5916\u90e8\u300d\uff08\u30d6\u30e9\u30a6\u30b6\uff09\u306e URL \u306f <code>http://127.0.0.1:<\u30dd\u30fc\u30c8>/</code>\u3002</li> <li><code>.docker-compose.env</code>\u3001<code>.docker-compose.wb.env</code>\u3001<code>.docker-compose.mfr.env</code>\u3001<code>.docker-compose.sharejs.env</code>: \u30db\u30b9\u30c8\u540d\u3068\u30dd\u30fc\u30c8\u306f\u4e0a\u8a18\u306e\u3068\u304a\u308a\u3002\u79d8\u5bc6\u306f\u5c0e\u5165\u6642\u306b\u4e71\u6570\u3067\u751f\u6210\uff08SPEC-03\uff09\u3002</li> <li><code>runtime/docker-compose.yml</code> \u306f manifest \u3068\u30db\u30b9\u30c8\u306e\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u751f\u6210\uff08SPEC-02 \u00a73\uff09\u3002\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306e\u4e0a\u6d41\u306e <code>docker-compose.yml</code> \u306b\u306f\u89e6\u308c\u305a\u3001\u4e0a\u6d41\u3068\u306e\u5dee\u5206\u3092\u6c5a\u3057\u307e\u305b\u3093\u3002</li> <li><code>grdm-dev health --network</code> \u306f\u3001\u30db\u30b9\u30c8\u4e0a\u3067 <code>127.0.0.1</code> \u4ee5\u5916\u306e\u30a2\u30c9\u30ec\u30b9\u3067\u5f85\u3064\u30b3\u30f3\u30c6\u30ca\u306e\u30dd\u30fc\u30c8\u304c\u3042\u308c\u3070\u4e0d\u5408\u683c\u306b\u3057\u307e\u3059\uff08SPEC-04\uff09\u3002</li> <li>\u30d6\u30e9\u30a6\u30b6\u306e\u6319\u52d5: \u53d7\u5165\u8a66\u9a13\u3068\u5229\u7528\u8005\u306f <code>http://127.0.0.1:5000/</code> \u3092\u958b\u304d\u307e\u3059\u3002\u6587\u66f8\u3067\u306f <code>localhost</code> \u3082\u540c\u7fa9\u3068\u3057\u3066\u8a8d\u3081\u307e\u3059\u304c\u3001Node \u7cfb\u30b5\u30fc\u30d3\u30b9\u3067 IPv6 \u306e <code>::1</code> \u306b\u5316\u3051\u308b\u4e8b\u6545\u3092\u907f\u3051\u308b\u305f\u3081\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306f <code>127.0.0.1</code> \u3092\u66f8\u304d\u307e\u3059\u3002</li> </ol> <pre><code>flowchart LR\n subgraph OLD[\"\u65e7: \u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u5225\u540d\uff08\u4e0a\u6d41\uff09\"]\n H1[\"\u30db\u30b9\u30c8: sudo ifconfig lo0 alias<br/>192.168.168.167\"]\n B1[\"\u30d6\u30e9\u30a6\u30b6 \u2192 192.168.168.167:5000\"]\n W1[\"web\"] -->|\"192.168.168.167:7777\"| WB1[\"wb\"]\n W1 -->|\"192.168.168.167:8080\"| FC1[\"fakecas\"]\n B1 --> W1\n H1 -. \"0.0.0.0 \u516c\u958b<br/>LAN \u304b\u3089\u5c4a\u304f\" .-> W1\n end\n subgraph NEW[\"\u65b0: \u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\uff0b127.0.0.1\uff08\u63a1\u7528\uff09\"]\n B2[\"\u30d6\u30e9\u30a6\u30b6 \u2192 127.0.0.1:5000\"]\n subgraph NET[\"compose \u30cd\u30c3\u30c8\u30ef\u30fc\u30af\uff08\u5185\u90e8 DNS\uff09\"]\n W2[\"web\"] -->|\"http://wb:7777\"| WB2[\"wb\"]\n W2 -->|\"http://fakecas:8080\"| FC2[\"fakecas\"]\n end\n B2 -->|\"127.0.0.1:5000 \u2192 web\"| W2\n B2 -->|\"127.0.0.1:7777 \u2192 wb\"| WB2\n end</code></pre>"},{"location":"decisions/ADR-02_Network_Model/#4-\u7d50\u679c","title":"4. \u7d50\u679c","text":"<ul> <li> <p>\u77e5\u3063\u3066\u304a\u304f\u3079\u304d\u9732\u51fa\u3002 \u30d6\u30e9\u30a6\u30b6\u5411\u3051\u306e 7 \u30b5\u30fc\u30d3\u30b9\uff08<code>web</code>\u3001<code>api</code>\u3001<code>admin</code>\u3001<code>wb</code>\u3001<code>mfr</code>\u3001<code>fakecas</code>\u3001<code>ember_osf_web</code>\uff09\u306f\u30dd\u30fc\u30c8\u3092\u516c\u958b\u3059\u308b\u305f\u3081\u306b\u901a\u5e38\u306e bridge <code>grdm-edge</code> \u306b\u3044\u3066\u3001\u305d\u306e\u7db2\u3067\u306f\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u3078\u306e\u5916\u5411\u304d\u901a\u4fe1\u3082\u3067\u304d\u308b\u3002\u305d\u308c\u4ee5\u5916\u306e\u30b5\u30fc\u30d3\u30b9\u306b\u306f\u65e2\u5b9a\u3067\u5916\u5411\u304d\u901a\u4fe1\u304c\u306a\u3044\u3002\u516c\u958b\u3057\u306a\u3044\u30b5\u30fc\u30d3\u30b9\u304b\u3089\u5916\u90e8\u30d7\u30ed\u30d0\u30a4\u30c0\u3078\u5411\u304b\u3046\u30a2\u30c9\u30aa\u30f3\u958b\u767a\u306b\u306f <code>compose render --egress <service></code> \u304c\u8981\u308a\u3001\u6697\u9ed9\u30fb\u660e\u793a\u3092\u554f\u308f\u305a\u3059\u3079\u3066\u306e\u4ed8\u4e0e\u306f\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u9580\u304b\u3089\u898b\u3048\u308b\u3002</p> </li> <li> <p>\u826f\u3044\u70b9: <code>sudo</code> \u304c\u4e0d\u8981\u3002\u518d\u8d77\u52d5\u5f8c\u306b\u3084\u308a\u76f4\u3059\u624b\u9806\u304c\u306a\u3044\u3002LAN \u304b\u3089\u5c4a\u304f\u3082\u306e\u304c\u306a\u3044\u3002\u540c\u3058 Compose \u30d5\u30a1\u30a4\u30eb\u304c macOS\u30fbUbuntu\u30fbWSL2 \u3067\u52d5\u304d\u3001CI \u3067\u3082\u305d\u306e\u307e\u307e\u52d5\u304f\u3002</p> </li> <li>\u826f\u3044\u70b9: \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u9580\u306e\u90e8\u54c1\u304c\u6e1b\u308b\u3002SPEC-03 \u306e\u300c\u5f85\u3061\u53d7\u3051\u30a2\u30c9\u30ec\u30b9\u300d\u306e\u691c\u67fb\u304c\u4e00\u884c\u306e\u898f\u5247\u306b\u306a\u308b\u3002</li> <li>\u30b3\u30b9\u30c8 \u2014 \u4e0a\u6d41\u6587\u66f8\u3068\u306e\u5dee\u3002 \u516c\u958b\u30b3\u30a2\u306e <code>README-docker-compose.md</code> \u306f\u4eca\u3082\u5225\u540d\u3092\u8aac\u660e\u3057\u3066\u3044\u307e\u3059\u3002\u79c1\u305f\u3061\u306e\u8a2d\u5b9a\u304c\u7570\u306a\u308b\u7b87\u6240\u306f\u3059\u3079\u3066 <code>docs/guides/environment/README.md</code> \u306e\u74b0\u5883\u624b\u5f15\u304d\u3067\u3001\u300c\u4e0a\u6d41\u306f\u3053\u3046\uff0f\u79c1\u305f\u3061\u306f\u3053\u3046\uff0f\u7406\u7531\u300d\u306e\u8868\u306b\u3057\u3066\u8aac\u660e\u3057\u307e\u3059\u3002\u4e0a\u6d41\u304b\u3089\u30b3\u30de\u30f3\u30c9\u3092\u5199\u3059\u958b\u767a\u8005\u306f\u3001\u307e\u305a\u305d\u306e\u8868\u3092\u8aad\u307f\u307e\u3059\u3002</li> <li>\u30b3\u30b9\u30c8 \u2014 \u8ee2\u9001\u3068\u7d76\u5bfe URL\u3002 OSF \u306f <code>DOMAIN</code> \u3068 <code>API_DOMAIN</code> \u304b\u3089\u7d76\u5bfe URL \u3092\u4f5c\u308a\u307e\u3059\u3002\u30b5\u30fc\u30d3\u30b9\u304c\u5185\u90e8\u540d\u3092\u53d7\u3051\u53d6\u3063\u3066\u30d6\u30e9\u30a6\u30b6\u3078\u305d\u306e\u307e\u307e\u8fd4\u3059\u3068\u3001\u30d6\u30e9\u30a6\u30b6\u306f\u89e3\u6c7a\u3067\u304d\u307e\u305b\u3093\u3002\u305d\u306e\u305f\u3081\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306f\u5185\u90e8\u7528\u3068\u5916\u90e8\u7528\u306e URL \u8a2d\u5b9a\u3092\u5206\u3051\u3001\u53d7\u5165\u8a66\u9a13\u306b\u8ee2\u9001\u9023\u9396\u306e\u78ba\u8a8d\uff08fakecas \u3067\u306e\u30ed\u30b0\u30a4\u30f3\u3001wb \u3067\u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3001mfr \u3067\u306e\u30d7\u30ec\u30d3\u30e5\u30fc\uff09\u3092\u542b\u3081\u307e\u3059\u3002</li> <li>\u30b3\u30b9\u30c8 \u2014 Chrome \u306e Cookie \u5171\u6709\u3002 \u65e7\u624b\u5f15\u304d\u306f\u3001\u5225\u540d\u306e\u4e0b\u3067\u306f Chrome \u304c fakecas \u3068 Web UI \u306e\u9593\u3067 Cookie \u3092\u5171\u6709\u3057\u306a\u3044\u3068\u6ce8\u610f\u3057\u3066\u3044\u307e\u3057\u305f\u3002\u3059\u3079\u3066 <code>127.0.0.1</code> \u3067\u5225\u30dd\u30fc\u30c8\u3067\u3082 Cookie \u306f\u30db\u30b9\u30c8\u5358\u4f4d\u306a\u306e\u3067\u3001\u540c\u3058\u6ce8\u610f\u304c\u6b8b\u308a\u307e\u3059\u3002\u53d7\u5165\u8a66\u9a13\u306e\u30ed\u30b0\u30a4\u30f3\u306e\u30b7\u30ca\u30ea\u30aa\uff08Chromium\u3002SPEC-04 \u00a71\uff09\u304c\u3053\u308c\u3092\u691c\u51fa\u3057\u307e\u3059\u3002</li> <li>\u63d0\u4f9b\u3057\u306a\u3044\u3082\u306e: LAN \u4e0a\u306e\u5225\u306e\u8a08\u7b97\u6a5f\u304b\u3089\u306e\u30a2\u30af\u30bb\u30b9\uff08\u4f8b: \u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30f3\u304b\u3089\u306e\u78ba\u8a8d\uff09\u3002\u5f8c\u3067\u5fc5\u8981\u306b\u306a\u308c\u3070\u3001\u30d5\u30e9\u30b0\u3067\u306f\u306a\u304f\u5225\u306e\u660e\u793a\u7684\u306a\u6c7a\u5b9a\u306b\u3057\u307e\u3059\u3002</li> </ul>"},{"location":"decisions/ADR-02_Network_Model/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Loopback / localhost The network path that leads back to your own computer; <code>127.0.0.1</code>. \u81ea\u5206\u306e\u8a08\u7b97\u6a5f\u3078\u623b\u3063\u3066\u304f\u308b\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u9053\u3002<code>127.0.0.1</code>\u3002 Alias An extra name or address for the same thing. \u540c\u3058\u3082\u306e\u306b\u4ed8\u3051\u308b\u8ffd\u52a0\u306e\u540d\u524d\u3084\u30a2\u30c9\u30ec\u30b9\u3002 Port A numbered door on an address through which one program listens. \u30a2\u30c9\u30ec\u30b9\u306b\u4ed8\u3044\u305f\u756a\u53f7\u4ed8\u304d\u306e\u6249\u3002\u30d7\u30ed\u30b0\u30e9\u30e0\u306f\u3053\u3053\u3067\u5f85\u3064\u3002 DNS The phone book that turns a name into an address. \u540d\u524d\u3092\u30a2\u30c9\u30ec\u30b9\u306b\u5909\u3048\u308b\u96fb\u8a71\u5e33\u3002 Docker Compose A tool that starts many containers together from one file. \u4e00\u3064\u306e\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u591a\u304f\u306e\u30b3\u30f3\u30c6\u30ca\u3092\u307e\u3068\u3081\u3066\u8d77\u3053\u3059\u9053\u5177\u3002 sudo Running a command with administrator rights. \u7ba1\u7406\u8005\u306e\u6a29\u9650\u3067\u30b3\u30de\u30f3\u30c9\u3092\u52d5\u304b\u3059\u3053\u3068\u3002 <p>Full shared glossary: REF-01 Glossary.</p>"},{"location":"decisions/ADR-03_Staged_Security_Gate/","title":"ADR-03 Staged Security Gate / \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u9580\u306e\u6bb5\u968e\u5316","text":"<p>Summary: We want zero vulnerabilities that would resist a top-tier AI attacker, but every current base image is end-of-life. We decided on a gate that starts as \"report plus a shrinking allow-list\" at M1 and becomes \"zero CRITICAL/HIGH plus a passing AI red team\" at M5, instead of enforcing zero from the first day or warning forever. \u6982\u8981: \u6700\u4e0a\u4f4d\u306e AI \u653b\u6483\u8005\u306b\u3082\u8010\u3048\u308b\u8106\u5f31\u6027\u30bc\u30ed\u3092\u76ee\u6307\u3059\u304c\u3001\u73fe\u884c\u306e\u30d9\u30fc\u30b9\u30a4\u30e1\u30fc\u30b8\u306f\u3059\u3079\u3066\u30b5\u30dd\u30fc\u30c8\u7d42\u4e86\u3067\u3042\u308b\u3002\u521d\u65e5\u304b\u3089\u30bc\u30ed\u3092\u5f37\u5236\u3059\u308b\u6848\u3082\u3001\u305a\u3063\u3068\u8b66\u544a\u3060\u3051\u306e\u6848\u3082\u63a1\u3089\u305a\u3001M1 \u3067\u306f\u300c\u5831\u544a\uff0b\u6e1b\u3063\u3066\u3044\u304f\u8a31\u5bb9\u30ea\u30b9\u30c8\u300d\u3001M5 \u3067\u306f\u300cCRITICAL/HIGH \u30bc\u30ed\uff0bAI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u5408\u683c\u300d\u3078\u53b3\u3057\u304f\u306a\u308b\u9580\u3092\u63a1\u3063\u305f\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: a safety rule that cannot be met on the day it is written is not a rule but a wish; writing the schedule down turns the wish into something we can measure at each milestone. \uff0f \u66f8\u3044\u305f\u65e5\u306b\u5b88\u308c\u306a\u3044\u5b89\u5168\u898f\u5247\u306f\u898f\u5247\u3067\u306f\u306a\u304f\u9858\u3044\u306b\u3059\u304e\u305a\u3001\u4e88\u5b9a\u8868\u3068\u3057\u3066\u66f8\u304f\u3053\u3068\u3067\u3001\u7bc0\u76ee\u3054\u3068\u306b\u6e2c\u308c\u308b\u3082\u306e\u306b\u306a\u308b\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Status: Accepted (owner, 2026-11-05). Review date: at the start of M4.</li> <li>Related: SPEC-03 Security Gate \u00b7 SPEC-00 Overview \u00b7 SPEC-02 Installer CLI \u00b7 SPEC-05 Upstream Tracking \u00b7 SPEC-06 Documentation Conventions \u00b7 POL-01 Position \u00b7 ADR-01 Integration Repository Placement \u00b7 ADR-02 Network Model \u00b7 ADR-04 AI Autonomy and Roles \u00b7 docs/README.md</li> </ul> <p></p>"},{"location":"decisions/ADR-03_Staged_Security_Gate/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"decisions/ADR-03_Staged_Security_Gate/#1-context","title":"1. Context","text":"<p>The owner's final goal for the developer environment 2027 (POL-01) is to remove vulnerabilities (known weak spots that an attacker could use) until the system resists even a top-tier AI attacker, and to keep removing them with AI agents even if COS discontinues OSF. A security gate (a checkpoint an install must pass) is the tool that makes this measurable: see SPEC-03.</p> <p>The starting point is far from zero. The base images (the ready-made operating system and language layers our containers are built on) used by the six core repositories are all end-of-life (EOL: the maker no longer publishes security fixes):</p> <pre><code>base_images_2026_11[9]{service,base,eol_status}:\n osf.io,\"node:12 + Python 3.6\",EOL\n waterbutler,\"Python 3.6\",EOL\n mfr,\"Python 3.5\",EOL\n ember-osf-web,\"node:8\",EOL\n cas-overlay,\"JDK 8\",EOL\n postgres,\"9.6\",EOL\n mongo,\"3.4\",EOL\n elasticsearch,\"2.x\",EOL\n elasticsearch,\"6.3.1\",EOL</code></pre> <p>A first Trivy scan of such a stack reports hundreds of CVEs, dozens of them HIGH or CRITICAL, and most of them cannot be fixed without the Python 3.13 port planned for M4 and the middleware consolidation planned for M5. If the gate demanded zero at M1, no install would ever complete, and we would have no running baseline to measure the acceptance tests of SPEC-04 against. On the other hand, a gate that only warns gives nobody a reason to fix anything, and the final goal would never be reached.</p>"},{"location":"decisions/ADR-03_Staged_Security_Gate/#2-options-considered","title":"2. Options considered","text":"Option Description Why rejected / chosen A. Enforce zero from M1 <code>grdm-dev install</code> stops on any HIGH or CRITICAL from the first day. Rejected. Every install would fail. There would be no running environment to port against, no regression baseline, and no evidence of what the fixes change. B. Warn only, forever Scan, print the counts, never stop. Rejected. Contradicts the owner's goal. The counts would stay high because nothing forces them down. Overseas distribution (M5) would ship known weaknesses. C. Staged gate with a shrinking allow-list (chosen) M1\u2013M3: baseline controls are mandatory; CVEs are reported and listed in an allow-list whose entry count must never grow between milestones. M4: fail on HIGH/CRITICAL not allow-listed; first AI red team. M5: fail on any CRITICAL/HIGH; AI red team reports zero unresolved intrusion paths. Chosen. Installs run from day one, the direction of travel is enforced by the never-increasing count, and the final state equals the owner's goal. <p>A variant of C that counted only CRITICAL at M4 was considered and dropped: the Python 3.13 port removes most HIGH findings at the same time, so splitting the threshold would buy nothing.</p>"},{"location":"decisions/ADR-03_Staged_Security_Gate/#3-decision","title":"3. Decision","text":"<ol> <li>The gate follows the schedule in SPEC-03 \u00a75.2. The current milestone is stored in <code>manifest/milestone.json</code> and only the owner changes it.</li> <li>The baseline controls of SPEC-03 \u00a73 (random secrets with mode 0600, publish only on <code>127.0.0.1</code>, internal network, non-root, no privileged, resource limits, pinned digests, secret scanning in CI) have no stage and no allow-list. They fail the gate at every milestone, including M1.</li> <li>The allow-list (<code>manifest/allowlist.json</code>) is the only way to pass a known finding. Every entry carries a CVE id, component, reason, owner, and expiry date. The entry count is compared with the previous milestone's baseline and must never increase. Only the owner approves additions.</li> <li>From M4, any HIGH or CRITICAL finding not in the allow-list stops <code>grdm-dev install</code> with exit code 50 (SPEC-02).</li> <li>At M5 and in steady state, CRITICAL and HIGH must be zero, the allow-list may contain no CRITICAL or HIGH entry, and the AI red team (SPEC-03 \u00a76) must report zero unresolved intrusion paths.</li> <li>The environment is documented as development-only and never exposed outside <code>127.0.0.1</code> while any allow-list entry exists (ADR-02).</li> </ol> <pre><code>flowchart LR\n M1[M1<br/>report + allow-list created] --> M2[M2<br/>count \u2264 M1]\n M2 --> M3[M3<br/>count \u2264 M2]\n M3 --> M4[M4<br/>fail on HIGH/CRITICAL<br/>first AI red team]\n M4 --> M5[M5<br/>zero CRITICAL/HIGH<br/>red team: zero paths]\n M5 --> S[steady state<br/>daily scan, auto fix PR]</code></pre>"},{"location":"decisions/ADR-03_Staged_Security_Gate/#4-consequences","title":"4. Consequences","text":"<p>Positive:</p> <ul> <li>Installs work from M1, so acceptance tests and the Python 3.13 port have a running baseline.</li> <li>Every milestone has a number the owner can check: the allow-list count, which may only go down.</li> <li>The final state (M5) is exactly the owner's goal, written in a form that <code>grdm-dev scan</code> can verify.</li> <li>The non-staged baseline controls mean that even an M1 install is not exposed to the LAN and has no default passwords.</li> </ul> <p>Negative and how we handle them:</p> <ul> <li>Between M1 and M3 the environment knowingly runs EOL software. We state this in every report header and in docs/README.md, and we keep the environment on <code>127.0.0.1</code> only.</li> <li>The allow-list needs maintenance: expiry dates force re-evaluation at each milestone. AID (AI\u958b\u767a\u62c5\u5f53\u8005) proposes, REV (\u62c5\u5f53\u30ec\u30d3\u30e5\u30ef) and QAE (QA\u62c5\u5f53) check, the owner approves (ADR-04).</li> <li>The jump from M3 to M4 is large. The M4 switch is therefore done only after the Python 3.13 port lands, and this decision is reviewed at the start of M4 (see \u00a75).</li> </ul>"},{"location":"decisions/ADR-03_Staged_Security_Gate/#5-review","title":"5. Review","text":"<p>This decision is reviewed at the start of M4. Questions to answer then: whether the allow-list count has in fact decreased at M2 and M3; whether the M4 threshold should include MEDIUM for network-facing services; and which model and runner the AI red team uses (open item in POL-01).</p> <p></p>"},{"location":"decisions/ADR-03_Staged_Security_Gate/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"decisions/ADR-03_Staged_Security_Gate/#1-\u80cc\u666f","title":"1. \u80cc\u666f","text":"<p>\u958b\u767a\u74b0\u5883 2027 \u7248\u306e\u6240\u6709\u8005\u306e\u6700\u7d42\u30b4\u30fc\u30eb\uff08POL-01\uff09\u306f\u3001\u300c\u8106\u5f31\u6027\u300d\uff08\u653b\u6483\u8005\u304c\u4fb5\u5165\u306b\u4f7f\u3048\u308b\u3068\u5206\u304b\u3063\u3066\u3044\u308b\u5f31\u3044\u6240\uff09\u3092\u6700\u4e0a\u4f4d\u306e AI \u653b\u6483\u8005\u306b\u3082\u8010\u3048\u308b\u307e\u3067\u9664\u53bb\u3057\u3001COS \u304c OSF \u3092\u5ec3\u6b62\u3057\u3066\u3082 AI \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3067\u9664\u53bb\u3092\u7d9a\u3051\u308b\u3053\u3068\u3067\u3059\u3002\u300c\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u9580\u300d\uff08\u5c0e\u5165\u304c\u5fc5\u305a\u901a\u308b\u691c\u554f\u6240\uff09\u306f\u3001\u3053\u308c\u3092\u6e2c\u308c\u308b\u3088\u3046\u306b\u3059\u308b\u9053\u5177\u3067\u3059\uff08SPEC-03\uff09\u3002</p> <p>\u51fa\u767a\u70b9\u306f\u30bc\u30ed\u304b\u3089\u9060\u3044\u6240\u306b\u3042\u308a\u307e\u3059\u3002\u30b3\u30a2 6 \u672c\u304c\u4f7f\u3046\u300c\u30d9\u30fc\u30b9\u30a4\u30e1\u30fc\u30b8\u300d\uff08\u30b3\u30f3\u30c6\u30ca\u306e\u571f\u53f0\u306b\u306a\u308b\u3001\u51fa\u6765\u5408\u3044\u306e OS \u3068\u8a00\u8a9e\u306e\u5c64\uff09\u306f\u3001\u3059\u3079\u3066\u300c\u30b5\u30dd\u30fc\u30c8\u7d42\u4e86\u300d\uff08EOL\u3002\u4f5c\u308a\u624b\u304c\u5b89\u5168\u4e0a\u306e\u4fee\u6b63\u3092\u51fa\u3055\u306a\u304f\u306a\u3063\u305f\u72b6\u614b\uff09\u3067\u3059\u3002</p> <pre><code>base_images_2026_11[9]{service,base,eol_status}:\n osf.io,\"node:12 + Python 3.6\",EOL\n waterbutler,\"Python 3.6\",EOL\n mfr,\"Python 3.5\",EOL\n ember-osf-web,\"node:8\",EOL\n cas-overlay,\"JDK 8\",EOL\n postgres,\"9.6\",EOL\n mongo,\"3.4\",EOL\n elasticsearch,\"2.x\",EOL\n elasticsearch,\"6.3.1\",EOL</code></pre> <p>\u3053\u306e\u69cb\u6210\u3092 Trivy \u3067\u521d\u3081\u3066\u30b9\u30ad\u30e3\u30f3\u3059\u308b\u3068\u6570\u767e\u4ef6\u306e CVE \u304c\u51fa\u3066\u3001\u305d\u306e\u3046\u3061\u6570\u5341\u4ef6\u304c HIGH \u304b CRITICAL \u3067\u3001\u5927\u534a\u306f M4 \u4e88\u5b9a\u306e Python 3.13 \u79fb\u690d\u3068 M5 \u4e88\u5b9a\u306e\u30df\u30c9\u30eb\u30a6\u30a7\u30a2\u96c6\u7d04\u306a\u3057\u306b\u306f\u76f4\u305b\u307e\u305b\u3093\u3002\u9580\u304c M1 \u3067\u30bc\u30ed\u3092\u6c42\u3081\u308c\u3070\u3001\u5c0e\u5165\u306f\u4e00\u5ea6\u3082\u5b8c\u4e86\u305b\u305a\u3001SPEC-04 \u306e\u53d7\u5165\u8a66\u9a13\u3092\u6e2c\u308b\u52d5\u304f\u57fa\u6e96\u74b0\u5883\u3082\u5f97\u3089\u308c\u307e\u305b\u3093\u3002\u9006\u306b\u3001\u8b66\u544a\u3060\u3051\u306e\u9580\u3067\u306f\u8ab0\u306b\u3082\u76f4\u3059\u7406\u7531\u304c\u306a\u304f\u3001\u6700\u7d42\u30b4\u30fc\u30eb\u306b\u306f\u6c38\u9060\u306b\u5c4a\u304d\u307e\u305b\u3093\u3002</p>"},{"location":"decisions/ADR-03_Staged_Security_Gate/#2-\u691c\u8a0e\u3057\u305f\u9078\u629e\u80a2","title":"2. \u691c\u8a0e\u3057\u305f\u9078\u629e\u80a2","text":"\u9078\u629e\u80a2 \u5185\u5bb9 \u9000\u3051\u305f\u30fb\u63a1\u3063\u305f\u7406\u7531 A. M1 \u304b\u3089\u30bc\u30ed\u3092\u5f37\u5236 \u521d\u65e5\u304b\u3089 HIGH \u304b CRITICAL \u304c\u4e00\u4ef6\u3067\u3082\u3042\u308c\u3070 <code>grdm-dev install</code> \u3092\u6b62\u3081\u308b\u3002 \u9000\u3051\u305f\u3002\u3059\u3079\u3066\u306e\u5c0e\u5165\u304c\u5931\u6557\u3059\u308b\u3002\u79fb\u690d\u306e\u571f\u53f0\u3068\u306a\u308b\u52d5\u304f\u74b0\u5883\u3082\u3001\u56de\u5e30\u306e\u57fa\u6e96\u3082\u3001\u4fee\u6b63\u304c\u4f55\u3092\u5909\u3048\u305f\u304b\u306e\u8a3c\u62e0\u3082\u5f97\u3089\u308c\u306a\u3044\u3002 B. \u305a\u3063\u3068\u8b66\u544a\u306e\u307f \u30b9\u30ad\u30e3\u30f3\u3057\u3066\u4ef6\u6570\u3092\u51fa\u3059\u3060\u3051\u3067\u3001\u6b62\u3081\u306a\u3044\u3002 \u9000\u3051\u305f\u3002\u6240\u6709\u8005\u306e\u30b4\u30fc\u30eb\u3068\u77db\u76fe\u3059\u308b\u3002\u6e1b\u3089\u3059\u529b\u304c\u50cd\u304b\u305a\u4ef6\u6570\u306f\u9ad8\u3044\u307e\u307e\u3002\u6d77\u5916\u914d\u5e03\uff08M5\uff09\u3067\u65e2\u77e5\u306e\u5f31\u70b9\u3092\u51fa\u8377\u3059\u308b\u3053\u3068\u306b\u306a\u308b\u3002 C. \u6e1b\u3063\u3066\u3044\u304f\u8a31\u5bb9\u30ea\u30b9\u30c8\u4ed8\u304d\u306e\u6bb5\u968e\u7684\u306a\u9580\uff08\u63a1\u7528\uff09 M1\u301cM3: \u57fa\u672c\u5bfe\u7b56\u306f\u5fc5\u9808\u3002CVE \u306f\u5831\u544a\u3057\u3001\u7bc0\u76ee\u3092\u307e\u305f\u3044\u3067\u4ef6\u6570\u304c\u5897\u3048\u306a\u3044\u8a31\u5bb9\u30ea\u30b9\u30c8\u306b\u8f09\u305b\u308b\u3002M4: \u8a31\u5bb9\u30ea\u30b9\u30c8\u5916\u306e HIGH/CRITICAL \u3067\u505c\u6b62\u3002\u521d\u56de\u306e AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u3002M5: CRITICAL/HIGH \u304c\u4e00\u4ef6\u3067\u3082\u3042\u308c\u3070\u505c\u6b62\u3002AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u304c\u672a\u89e3\u6c7a\u306e\u4fb5\u5165\u7d4c\u8def\u30bc\u30ed\u3092\u5831\u544a\u3002 \u63a1\u7528\u3002\u521d\u65e5\u304b\u3089\u5c0e\u5165\u304c\u52d5\u304d\u3001\u300c\u5897\u3048\u306a\u3044\u4ef6\u6570\u300d\u304c\u9032\u3080\u65b9\u5411\u3092\u5f37\u5236\u3057\u3001\u6700\u7d42\u72b6\u614b\u304c\u6240\u6709\u8005\u306e\u30b4\u30fc\u30eb\u3068\u4e00\u81f4\u3059\u308b\u3002 <p>C \u306e\u5909\u7a2e\u3068\u3057\u3066\u3001M4 \u3067\u306f CRITICAL \u3060\u3051\u3092\u6570\u3048\u308b\u6848\u3082\u691c\u8a0e\u3057\u3066\u843d\u3068\u3057\u307e\u3057\u305f\u3002Python 3.13 \u79fb\u690d\u304c HIGH \u306e\u5927\u534a\u3082\u540c\u6642\u306b\u53d6\u308a\u9664\u304f\u305f\u3081\u3001\u57fa\u6e96\u3092\u5206\u3051\u3066\u3082\u5f97\u308b\u3082\u306e\u304c\u306a\u3044\u304b\u3089\u3067\u3059\u3002</p>"},{"location":"decisions/ADR-03_Staged_Security_Gate/#3-\u6c7a\u5b9a","title":"3. \u6c7a\u5b9a","text":"<ol> <li>\u9580\u306f SPEC-03 \u00a75.2 \u306e\u4e88\u5b9a\u8868\u306b\u5f93\u3046\u3002\u73fe\u5728\u306e\u7bc0\u76ee\u306f <code>manifest/milestone.json</code> \u306b\u7f6e\u304d\u3001\u5909\u66f4\u3067\u304d\u308b\u306e\u306f\u6240\u6709\u8005\u3060\u3051\u3002</li> <li>SPEC-03 \u00a73 \u306e\u300c\u57fa\u672c\u5bfe\u7b56\u300d\uff08\u4e71\u6570\u306e\u79d8\u5bc6\u3092\u30e2\u30fc\u30c9 0600 \u3067\u3001<code>127.0.0.1</code> \u306e\u307f\u516c\u958b\u3001\u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3001\u975e root\u3001privileged \u306a\u3057\u3001\u8cc7\u6e90\u5236\u9650\u3001\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u56fa\u5b9a\u3001CI \u3067\u306e\u79d8\u5bc6\u30b9\u30ad\u30e3\u30f3\uff09\u306b\u306f\u6bb5\u968e\u3082\u8a31\u5bb9\u30ea\u30b9\u30c8\u3082\u306a\u3044\u3002M1 \u3092\u542b\u3080\u3059\u3079\u3066\u306e\u7bc0\u76ee\u3067\u9580\u3092\u843d\u3068\u3059\u3002</li> <li>\u65e2\u77e5\u306e\u691c\u51fa\u3092\u901a\u3059\u552f\u4e00\u306e\u65b9\u6cd5\u306f\u300c\u8a31\u5bb9\u30ea\u30b9\u30c8\u300d\uff08<code>manifest/allowlist.json</code>\uff09\u3002\u5404\u9805\u76ee\u306f CVE \u756a\u53f7\u3001\u90e8\u54c1\u3001\u7406\u7531\u3001\u62c5\u5f53\u3001\u671f\u9650\u3092\u6301\u3064\u3002\u4ef6\u6570\u306f\u524d\u306e\u7bc0\u76ee\u306e\u57fa\u6e96\u3068\u6bd4\u3079\u3001\u6c7a\u3057\u3066\u5897\u3048\u3066\u306f\u306a\u3089\u306a\u3044\u3002\u8ffd\u52a0\u306e\u627f\u8a8d\u306f\u6240\u6709\u8005\u3060\u3051\u3002</li> <li>M4 \u304b\u3089\u3001\u8a31\u5bb9\u30ea\u30b9\u30c8\u306b\u306a\u3044 HIGH\u30fbCRITICAL \u306e\u691c\u51fa\u306f <code>grdm-dev install</code> \u3092\u7d42\u4e86\u30b3\u30fc\u30c9 50 \u3067\u6b62\u3081\u308b\uff08SPEC-02\uff09\u3002</li> <li>M5 \u3068\u6052\u5e38\u904b\u7528\u3067\u306f\u3001CRITICAL \u3068 HIGH \u306f\u30bc\u30ed\u3001\u8a31\u5bb9\u30ea\u30b9\u30c8\u306b CRITICAL\u30fbHIGH \u306e\u9805\u76ee\u304c\u3042\u3063\u3066\u306f\u306a\u3089\u305a\u3001AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\uff08SPEC-03 \u00a76\uff09\u304c\u672a\u89e3\u6c7a\u306e\u4fb5\u5165\u7d4c\u8def\u30bc\u30ed\u3092\u5831\u544a\u3057\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u3002</li> <li>\u8a31\u5bb9\u30ea\u30b9\u30c8\u306b\u9805\u76ee\u304c\u3042\u308b\u9593\u306f\u3001\u74b0\u5883\u3092\u958b\u767a\u5c02\u7528\u3068\u660e\u8a18\u3057\u3001<code>127.0.0.1</code> \u306e\u5916\u3078\u51fa\u3055\u306a\u3044\uff08ADR-02\uff09\u3002</li> </ol> <pre><code>flowchart LR\n M1[M1<br/>\u5831\u544a\uff0b\u8a31\u5bb9\u30ea\u30b9\u30c8\u4f5c\u6210] --> M2[M2<br/>\u4ef6\u6570 \u2264 M1]\n M2 --> M3[M3<br/>\u4ef6\u6570 \u2264 M2]\n M3 --> M4[M4<br/>HIGH/CRITICAL \u3067\u505c\u6b62<br/>\u521d\u56de AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0]\n M4 --> M5[M5<br/>CRITICAL/HIGH \u30bc\u30ed<br/>\u30ec\u30c3\u30c9\u30c1\u30fc\u30e0: \u7d4c\u8def\u30bc\u30ed]\n M5 --> S[\u6052\u5e38\u904b\u7528<br/>\u65e5\u6b21\u30b9\u30ad\u30e3\u30f3\u30fb\u81ea\u52d5\u4fee\u6b63 PR]</code></pre>"},{"location":"decisions/ADR-03_Staged_Security_Gate/#4-\u7d50\u679c","title":"4. \u7d50\u679c","text":"<p>\u826f\u3044\u70b9:</p> <ul> <li>M1 \u304b\u3089\u5c0e\u5165\u304c\u52d5\u304f\u306e\u3067\u3001\u53d7\u5165\u8a66\u9a13\u3068 Python 3.13 \u79fb\u690d\u306b\u52d5\u304f\u57fa\u6e96\u74b0\u5883\u304c\u3042\u308b\u3002</li> <li>\u5404\u7bc0\u76ee\u306b\u6240\u6709\u8005\u304c\u78ba\u304b\u3081\u3089\u308c\u308b\u6570\u5b57\u304c\u3042\u308b\u3002\u8a31\u5bb9\u30ea\u30b9\u30c8\u306e\u4ef6\u6570\u3067\u3001\u6e1b\u308b\u65b9\u5411\u306b\u3057\u304b\u52d5\u304b\u306a\u3044\u3002</li> <li>\u6700\u7d42\u72b6\u614b\uff08M5\uff09\u306f\u6240\u6709\u8005\u306e\u30b4\u30fc\u30eb\u305d\u306e\u3082\u306e\u3067\u3001<code>grdm-dev scan</code> \u304c\u691c\u8a3c\u3067\u304d\u308b\u5f62\u3067\u66f8\u304b\u308c\u3066\u3044\u308b\u3002</li> <li>\u6bb5\u968e\u306e\u306a\u3044\u57fa\u672c\u5bfe\u7b56\u306b\u3088\u308a\u3001M1 \u306e\u5c0e\u5165\u3067\u3082 LAN \u306b\u9732\u51fa\u305b\u305a\u3001\u65e2\u5b9a\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3082\u306a\u3044\u3002</li> </ul> <p>\u60aa\u3044\u70b9\u3068\u305d\u306e\u6271\u3044:</p> <ul> <li>M1\u301cM3 \u306e\u9593\u3001\u74b0\u5883\u306f\u627f\u77e5\u306e\u4e0a\u3067\u30b5\u30dd\u30fc\u30c8\u7d42\u4e86\u306e\u30bd\u30d5\u30c8\u3092\u52d5\u304b\u3059\u3002\u3053\u308c\u3092\u5168\u5831\u544a\u306e\u30d8\u30c3\u30c0\u3068 docs/README.md \u306b\u660e\u8a18\u3057\u3001\u74b0\u5883\u3092 <code>127.0.0.1</code> \u3060\u3051\u306b\u7559\u3081\u308b\u3002</li> <li>\u8a31\u5bb9\u30ea\u30b9\u30c8\u306b\u306f\u624b\u5165\u308c\u304c\u8981\u308b\u3002\u671f\u9650\u304c\u5404\u7bc0\u76ee\u3067\u518d\u8a55\u4fa1\u3092\u5f37\u5236\u3059\u308b\u3002AID\uff08AI\u958b\u767a\u62c5\u5f53\u8005\uff09\u304c\u63d0\u6848\u3057\u3001REV\uff08\u62c5\u5f53\u30ec\u30d3\u30e5\u30ef\uff09\u3068 QAE\uff08QA\u62c5\u5f53\uff09\u304c\u78ba\u8a8d\u3057\u3001\u6240\u6709\u8005\u304c\u627f\u8a8d\u3059\u308b\uff08ADR-04\uff09\u3002</li> <li>M3 \u304b\u3089 M4 \u3078\u306e\u6bb5\u5dee\u304c\u5927\u304d\u3044\u3002\u305d\u306e\u305f\u3081 M4 \u3078\u306e\u5207\u66ff\u306f Python 3.13 \u79fb\u690d\u304c\u5165\u3063\u305f\u5f8c\u306b\u3060\u3051\u884c\u3044\u3001\u3053\u306e\u6c7a\u5b9a\u3092 M4 \u306e\u958b\u59cb\u6642\u306b\u898b\u76f4\u3059\uff08\u00a75\uff09\u3002</li> </ul>"},{"location":"decisions/ADR-03_Staged_Security_Gate/#5-\u898b\u76f4\u3057","title":"5. \u898b\u76f4\u3057","text":"<p>\u3053\u306e\u6c7a\u5b9a\u306f M4 \u306e\u958b\u59cb\u6642\u306b\u898b\u76f4\u3057\u307e\u3059\u3002\u305d\u306e\u3068\u304d\u7b54\u3048\u308b\u554f\u3044: M2\u30fbM3 \u3067\u8a31\u5bb9\u30ea\u30b9\u30c8\u306e\u4ef6\u6570\u304c\u5b9f\u969b\u306b\u6e1b\u3063\u305f\u304b\u3002\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306b\u9762\u3059\u308b\u30b5\u30fc\u30d3\u30b9\u306b\u3064\u3044\u3066 M4 \u306e\u57fa\u6e96\u306b MEDIUM \u3092\u542b\u3081\u308b\u3079\u304d\u304b\u3002AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u306b\u4f7f\u3046\u30e2\u30c7\u30eb\u3068\u5b9f\u884c\u57fa\u76e4\u3092\u3069\u3046\u3059\u308b\u304b\uff08POL-01 \u306e\u672a\u6c7a\u4e8b\u9805\uff09\u3002</p>"},{"location":"decisions/ADR-03_Staged_Security_Gate/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 End-of-life (EOL) The maker no longer publishes security fixes for that version. \u4f5c\u308a\u624b\u304c\u305d\u306e\u7248\u306e\u5b89\u5168\u4e0a\u306e\u4fee\u6b63\u3092\u51fa\u3055\u306a\u304f\u306a\u3063\u305f\u72b6\u614b\u3002 Base image The ready-made OS and language layer a container is built on. \u30b3\u30f3\u30c6\u30ca\u306e\u571f\u53f0\u306b\u306a\u308b\u3001\u51fa\u6765\u5408\u3044\u306e OS \u3068\u8a00\u8a9e\u306e\u5c64\u3002 Allow-list Known findings we accept for a limited time, with a reason and an owner. \u7406\u7531\u3068\u62c5\u5f53\u3092\u4ed8\u3051\u3066\u671f\u9650\u4ed8\u304d\u3067\u53d7\u3051\u5165\u308c\u308b\u65e2\u77e5\u306e\u691c\u51fa\u306e\u4e00\u89a7\u3002 Threshold The line that decides pass or fail. \u5408\u683c\u3068\u4e0d\u5408\u683c\u3092\u5206\u3051\u308b\u7dda\u3002 Exit code The number a program returns when it finishes; 0 means success. \u30d7\u30ed\u30b0\u30e9\u30e0\u304c\u7d42\u308f\u308b\u3068\u304d\u306b\u8fd4\u3059\u756a\u53f7\u30020 \u306f\u6210\u529f\u3002"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/","title":"ADR-04 AI Autonomy and Roles / AI \u306e\u81ea\u5f8b\u5ea6\u3068\u5f79\u5272","text":"<p>Summary: AI agents detect vulnerabilities, write fix pull requests, review them, and run regression and acceptance tests on their own. Humans keep two actions: merge and publish. This record names who plays which role (AID, QAE, REV, owner), what the agents may never do, and the one question left open. \u6982\u8981: AI \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u306f\u8106\u5f31\u6027\u306e\u691c\u51fa\u3001\u4fee\u6b63 PR \u306e\u4f5c\u6210\u3001\u30ec\u30d3\u30e5\u30fc\u3001\u56de\u5e30\u30fb\u53d7\u5165\u8a66\u9a13\u306e\u5b9f\u884c\u307e\u3067\u3092\u81ea\u5f8b\u7684\u306b\u884c\u3046\u3002\u4eba\u306b\u6b8b\u3059\u306e\u306f\u30de\u30fc\u30b8\u3068\u516c\u958b\u306e\u4e8c\u3064\u3002\u8ab0\u304c\u3069\u306e\u5f79\u5272\uff08AID\u30fbQAE\u30fbREV\u30fb\u6240\u6709\u8005\uff09\u3092\u62c5\u3046\u304b\u3001\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u304c\u6c7a\u3057\u3066\u3057\u3066\u306f\u306a\u3089\u306a\u3044\u3053\u3068\u3001\u6b8b\u3057\u305f\u4e00\u3064\u306e\u672a\u6c7a\u4e8b\u9805\u3092\u8a18\u3059\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.2 \u2014 2026-11-05. Learned: a one-time delegation must be written down with scope, grantor and evidence before it is used, or the human-merge rule erodes silently. \uff0f \u4e00\u56de\u9650\u308a\u306e\u59d4\u4efb\u3067\u3082\u3001\u4f7f\u3046\u524d\u306b\u7bc4\u56f2\u30fb\u8a31\u53ef\u8005\u30fb\u8a3c\u8de1\u3092\u66f8\u304d\u6b8b\u3055\u306a\u3051\u308c\u3070\u300c\u4eba\u304c\u30de\u30fc\u30b8\u3059\u308b\u300d\u898f\u5247\u304c\u9759\u304b\u306b\u5d29\u308c\u308b\u3068\u5206\u304b\u3063\u305f\u3002 0.1 \u2014 2026-11-05. Learned: the line between \"automatic\" and \"human\" is easiest to defend when it sits on two concrete commands, merge and publish, rather than on a judgment such as \"important changes\". \uff0f \u300c\u81ea\u52d5\u300d\u3068\u300c\u4eba\u300d\u306e\u5883\u76ee\u306f\u3001\u300c\u91cd\u8981\u306a\u5909\u66f4\u300d\u306e\u3088\u3046\u306a\u5224\u65ad\u3067\u306f\u306a\u304f\u3001\u30de\u30fc\u30b8\u3068\u516c\u958b\u3068\u3044\u3046\u4e8c\u3064\u306e\u5177\u4f53\u7684\u306a\u64cd\u4f5c\u306b\u7f6e\u304f\u3068\u6700\u3082\u5b88\u308a\u3084\u3059\u3044\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Status: Accepted (owner, 2026-11-05). Review date: after steady-state operation has run for one month (open question in \u00a75).</li> <li>Related: SPEC-00 Overview \u00b7 SPEC-02 Installer CLI \u00b7 SPEC-03 Security Gate \u00b7 SPEC-04 Acceptance Tests \u00b7 SPEC-05 Upstream Tracking \u00b7 SPEC-06 Documentation Conventions \u00b7 POL-01 Position \u00b7 ADR-01 Integration Repository Placement \u00b7 ADR-02 Network Model \u00b7 ADR-03 Staged Security Gate \u00b7 docs/README.md</li> </ul> <p></p>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#1-context","title":"1. Context","text":"<p>The owner's goal (POL-01) is that GRDM keeps being provided even if COS discontinues OSF, through continuous vulnerability remediation (finding and fixing weak spots again and again, every day, not once) done by AI agents (programs that read, write, and test code on their own when given a task). The security gate of SPEC-03 produces a daily list of findings; someone must turn each finding into a fix.</p> <p>At the same time, the development policy POL-05 of the GRDM core repository, which this repository inherits, draws two lines that must not move:</p> <ul> <li>An author never accepts their own work. The one who wrote a change does not judge whether it passes.</li> <li>Merge and publish are human actions. No agent commits to the main branch or publishes an image or a release.</li> </ul> <p>The question is how much of the path between \"finding\" and \"merge\" AI agents may walk alone.</p>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#2-options-considered","title":"2. Options considered","text":"Option Description Why rejected / chosen 1. Detect only Agents scan and open issues; humans do everything else. Rejected. Does not scale to daily findings across eleven repositories. The owner would be the bottleneck, and the goal of continued provision without COS would not be met. 2. Detect \u2192 fix PR \u2192 review \u2192 automatic regression and acceptance; humans merge and publish (chosen) Agents do all the work that produces evidence. Humans do the two actions that change what others receive. Chosen. Keeps both POL-05 lines intact. Author (AID), reviewer (REV), and judge (QAE) are three different agents, so no one accepts their own work. The owner sees a PR with review and test evidence attached and only decides. 3. Auto-merge after review Same as 2, but the PR merges itself when review and tests pass. Rejected for now. Conflicts with POL-05 \"merge by humans\". A narrow exception for vulnerability-only fixes is kept as an open question (\u00a75)."},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#3-decision","title":"3. Decision","text":""},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#31-roles","title":"3.1 Roles","text":"<p>Role abbreviations follow the table in <code>AGENTS.md</code>. In records, write the abbreviation with the Japanese role name, for example <code>AID\uff08AI\u958b\u767a\u62c5\u5f53\u8005\uff09</code>.</p> <pre><code>roles[4]{abbr,ja_name,who,runs_on,does}:\n AID,AI\u958b\u767a\u62c5\u5f53\u8005,\"Orca Open Code 2 workers\",\"local LLM Qwen 3 Coder Next (model id lmstudio/qwen3-coder-next-mlx)\",\"implement to spec, write fix PRs, propose allow-list entries\"\n QAE,QA\u62c5\u5f53,\"Claude Code Fable\",\"Claude Code session on Mac Studio\",\"check implementations, run regression and acceptance (SPEC-04), judge pass/fail, write correction requests\"\n REV,\u62c5\u5f53\u30ec\u30d3\u30e5\u30ef,\"Codex Astra (model id gpt-6-astra)\",\"Orca worker\",\"independent review of every PR; record in docs/reviews/ and as a PR comment\"\n owner,\u6240\u6709\u8005,\"Yusuke Komiyama\",\"human\",\"merge, publish, exceptions, milestone changes, red-team approval\"</code></pre> <p>The three agent roles are played by three different models on purpose, so that an error habit of one model is not shared by its reviewer or its judge.</p>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#32-flow","title":"3.2 Flow","text":"<pre><code>flowchart LR\n S[grdm-dev scan<br/>daily finding] --> A[AID<br/>fix PR on a branch]\n A --> R[REV<br/>review \u2192 docs/reviews/ + PR comment]\n R -- changes requested --> A\n R -- approved --> Q[QAE<br/>regression + acceptance<br/>SPEC-04]\n Q -- fail \u2192 correction request --> A\n Q -- pass --> O[Owner<br/>merge]\n O --> P[Owner<br/>publish image / release]</code></pre> <ul> <li>Every step up to and including QAE's judgment is automatic and may run without a human present.</li> <li>The owner merges with <code>gh pr merge</code> (Japanese subject) or declines. The owner publishes images to <code>ghcr.io/rcosdp</code> and tags releases.</li> <li>Subagents (helper agents an agent starts to split its work) are unlimited in number. The role that started them is responsible for their output.</li> </ul>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#33-evidence-trail","title":"3.3 Evidence trail","text":"<p>Every PR carries, before the owner sees it:</p> <ol> <li>The finding it fixes (CVE id or scan report path from SPEC-03 \u00a77).</li> <li>REV's review record in <code>docs/reviews/YYYY-MM-DD_<Title>_rN.md</code> and the same text as a PR comment.</li> <li>QAE's test record: the <code>grdm-dev accept</code> and <code>grdm-dev scan</code> TOON excerpts, pass or fail, and the commit SHA tested.</li> <li>A Japanese commit subject with a scoped prefix (<code>fix(security):</code>).</li> </ol> <p>A PR without all four is not ready for the owner; QAE returns it to AID.</p>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#34-forbidden-for-every-agent","title":"3.4 Forbidden for every agent","text":"<ul> <li><code>git push --force</code> to any branch, ever.</li> <li>Deleting branches, tags, repositories, images, or data of any kind.</li> <li>Writing (push, PR creation, issue creation, comments) to any upstream repository: RCOSDP public cores, RCOSDP <code>-private</code> variants, or CenterForOpenScience. Agents write only to this repository and to the <code>-dev2027</code> repositories.</li> <li>Merging to <code>develop</code> or any protected branch; enabling auto-merge; changing branch protection.</li> <li>Publishing images, releases, or documentation sites.</li> <li>Copying <code>-private</code> code, secrets, or private repository URLs into this public repository (ADR-01).</li> <li>Running red-team techniques against anything outside the isolated environment (SPEC-03 \u00a76).</li> </ul>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#4-consequences","title":"4. Consequences","text":"<ul> <li>Remediation keeps pace with daily scans without waiting for human working hours; the owner's work shrinks to reading evidence and clicking merge.</li> <li>Three different models in three roles raise the cost of a shared blind spot and satisfy \"no self-acceptance\" structurally.</li> <li>Local LLM workers (AID) have variable quality. The spec-first rule (specifications in <code>docs/spec/</code> are written before work is handed to AID) and the QAE check are the compensation. A PR that fails QAE twice is closed and restarted from the spec.</li> <li>Running three agent systems costs Mac Studio resources. Concurrency of Open Code 2 workers is an open item of POL-01.</li> <li>Review time from the owner is the only remaining latency. If it becomes the bottleneck for vulnerability fixes, \u00a75 is revisited.</li> </ul>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#5-open-question","title":"5. Open question","text":"<p>Should vulnerability-only fixes be allowed to auto-merge after REV approval and QAE pass? Arguments for: faster closure of HIGH findings in steady state. Arguments against: POL-05 keeps merge human; a wrong automatic merge in a security path is the most expensive kind of error. Decision deferred until steady-state operation has run for about one month and the owner has seen the real volume and quality of fix PRs. Until then, option 2 stands as written.</p>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#recorded-exceptions","title":"Recorded exceptions","text":"Date Exception Scope Granted by Evidence 2026-11-05 QAE (Claude Code Fable) merges PR #19 of RDM-developer-guide itself, using the repository administrator path of the branch protection because the author cannot approve its own pull request This one pull request only. Merge, not approve; no other repository Owner, in the session dialogue REV r3 record <code>docs/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3.md</code> (approve recommended), CI 6/6 green on the merged head <p>The rule \"merge and publish are human\" is unchanged; every further merge needs its own recorded exception or the owner's hand.</p> <p></p>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#1-\u80cc\u666f","title":"1. \u80cc\u666f","text":"<p>\u6240\u6709\u8005\u306e\u30b4\u30fc\u30eb\uff08POL-01\uff09\u306f\u3001COS \u304c OSF \u3092\u5ec3\u6b62\u3057\u3066\u3082\u3001\u300cAI \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u300d\uff08\u8ab2\u984c\u3092\u4e0e\u3048\u308b\u3068\u81ea\u5206\u3067\u30b3\u30fc\u30c9\u3092\u8aad\u307f\u30fb\u66f8\u304d\u30fb\u8a66\u3059\u30d7\u30ed\u30b0\u30e9\u30e0\uff09\u306b\u3088\u308b\u300c\u7d99\u7d9a\u7684\u306a\u8106\u5f31\u6027\u5bfe\u5fdc\u300d\uff08\u5f31\u3044\u6240\u3092\u4e00\u5ea6\u3067\u306a\u304f\u6bce\u65e5\u304f\u308a\u8fd4\u3057\u898b\u3064\u3051\u3066\u76f4\u3059\u3053\u3068\uff09\u3067 GRDM \u306e\u63d0\u4f9b\u3092\u7d9a\u3051\u308b\u3053\u3068\u3067\u3059\u3002SPEC-03 \u306e\u9580\u306f\u6bce\u65e5\u691c\u51fa\u306e\u4e00\u89a7\u3092\u51fa\u3057\u307e\u3059\u3002\u8ab0\u304b\u304c\u305d\u306e\u4e00\u4ef6\u4e00\u4ef6\u3092\u4fee\u6b63\u306b\u5909\u3048\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002</p> <p>\u4e00\u65b9\u3067\u3001\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u304c\u7d99\u627f\u3059\u308b GRDM \u30b3\u30a2\u306e\u958b\u767a\u65b9\u91dd POL-05 \u306f\u3001\u52d5\u304b\u3057\u3066\u306f\u306a\u3089\u306a\u3044\u4e8c\u672c\u306e\u7dda\u3092\u5f15\u3044\u3066\u3044\u307e\u3059\u3002</p> <ul> <li>\u4f5c\u8005\u306f\u81ea\u5206\u306e\u6210\u679c\u3092\u53d7\u3051\u5165\u308c\u306a\u3044\u3002 \u5909\u66f4\u3092\u66f8\u3044\u305f\u8005\u304c\u5408\u5426\u3092\u5224\u5b9a\u3057\u306a\u3044\u3002</li> <li>\u30de\u30fc\u30b8\u3068\u516c\u958b\u306f\u4eba\u306e\u64cd\u4f5c\u3002 \u3069\u306e\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3082\u4e3b\u30d6\u30e9\u30f3\u30c1\u306b\u30b3\u30df\u30c3\u30c8\u305b\u305a\u3001\u30a4\u30e1\u30fc\u30b8\u3084\u30ea\u30ea\u30fc\u30b9\u3092\u516c\u958b\u3057\u306a\u3044\u3002</li> </ul> <p>\u554f\u3044\u306f\u3001\u300c\u691c\u51fa\u300d\u304b\u3089\u300c\u30de\u30fc\u30b8\u300d\u307e\u3067\u306e\u9053\u306e\u3069\u3053\u307e\u3067\u3092 AI \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u304c\u4e00\u4eba\u3067\u6b69\u3044\u3066\u3088\u3044\u304b\u3067\u3059\u3002</p>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#2-\u691c\u8a0e\u3057\u305f\u9078\u629e\u80a2","title":"2. \u691c\u8a0e\u3057\u305f\u9078\u629e\u80a2","text":"\u9078\u629e\u80a2 \u5185\u5bb9 \u9000\u3051\u305f\u30fb\u63a1\u3063\u305f\u7406\u7531 1. \u691c\u51fa\u306e\u307f \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u306f\u30b9\u30ad\u30e3\u30f3\u3057\u3066 issue \u3092\u958b\u304d\u3001\u6b8b\u308a\u306f\u4eba\u304c\u884c\u3046\u3002 \u9000\u3051\u305f\u300211 \u672c\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3067\u6bce\u65e5\u51fa\u308b\u691c\u51fa\u306b\u8ffd\u3044\u3064\u304b\u306a\u3044\u3002\u6240\u6709\u8005\u304c\u30dc\u30c8\u30eb\u30cd\u30c3\u30af\u306b\u306a\u308a\u3001COS \u306a\u3057\u3067\u63d0\u4f9b\u3092\u7d9a\u3051\u308b\u30b4\u30fc\u30eb\u306b\u5c4a\u304b\u306a\u3044\u3002 2. \u691c\u51fa \u2192 \u4fee\u6b63 PR \u2192 \u30ec\u30d3\u30e5\u30fc \u2192 \u56de\u5e30\u30fb\u53d7\u5165\u306e\u81ea\u52d5\u5b9f\u884c\u3002\u30de\u30fc\u30b8\u3068\u516c\u958b\u306f\u4eba\uff08\u63a1\u7528\uff09 \u8a3c\u62e0\u3092\u4f5c\u308b\u4ed5\u4e8b\u306f\u3059\u3079\u3066\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u304c\u884c\u3046\u3002\u4ed6\u8005\u304c\u53d7\u3051\u53d6\u308b\u3082\u306e\u3092\u5909\u3048\u308b\u4e8c\u3064\u306e\u64cd\u4f5c\u3060\u3051\u3092\u4eba\u304c\u884c\u3046\u3002 \u63a1\u7528\u3002POL-05 \u306e\u4e8c\u672c\u306e\u7dda\u3092\u305d\u306e\u307e\u307e\u5b88\u308c\u308b\u3002\u4f5c\u8005\uff08AID\uff09\u3001\u30ec\u30d3\u30e5\u30ef\uff08REV\uff09\u3001\u5224\u5b9a\u8005\uff08QAE\uff09\u304c\u5225\u3005\u306e\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u306a\u306e\u3067\u3001\u8ab0\u3082\u81ea\u5206\u306e\u6210\u679c\u3092\u53d7\u3051\u5165\u308c\u306a\u3044\u3002\u6240\u6709\u8005\u306f\u30ec\u30d3\u30e5\u30fc\u3068\u8a66\u9a13\u306e\u8a3c\u62e0\u304c\u4ed8\u3044\u305f PR \u3092\u898b\u3066\u3001\u6c7a\u3081\u308b\u3060\u3051\u3067\u3088\u3044\u3002 3. \u30ec\u30d3\u30e5\u30fc\u5f8c\u306b\u81ea\u52d5\u30de\u30fc\u30b8 2 \u3068\u540c\u3058\u3060\u304c\u3001\u30ec\u30d3\u30e5\u30fc\u3068\u8a66\u9a13\u306b\u5408\u683c\u3059\u308b\u3068 PR \u304c\u81ea\u5206\u3067\u30de\u30fc\u30b8\u3055\u308c\u308b\u3002 \u4eca\u306f\u9000\u3051\u305f\u3002POL-05 \u306e\u300c\u30de\u30fc\u30b8\u306f\u4eba\u300d\u3068\u885d\u7a81\u3059\u308b\u3002\u8106\u5f31\u6027\u4fee\u6b63\u3060\u3051\u306e\u72ed\u3044\u4f8b\u5916\u306f\u672a\u6c7a\u4e8b\u9805\u3068\u3057\u3066\u6b8b\u3059\uff08\u00a75\uff09\u3002"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#3-\u6c7a\u5b9a","title":"3. \u6c7a\u5b9a","text":""},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#31-\u5f79\u5272","title":"3.1 \u5f79\u5272","text":"<p>\u5f79\u5272\u306e\u7565\u79f0\u306f <code>AGENTS.md</code> \u306e\u5bfe\u5fdc\u8868\u306b\u5f93\u3044\u307e\u3059\u3002\u8a18\u9332\u3067\u306f <code>AID\uff08AI\u958b\u767a\u62c5\u5f53\u8005\uff09</code> \u306e\u3088\u3046\u306b\u7565\u79f0\u3068\u65e5\u672c\u8a9e\u306e\u5f79\u5272\u540d\u3092\u4f75\u8a18\u3057\u307e\u3059\u3002</p> <pre><code>roles[4]{abbr,ja_name,who,runs_on,does}:\n AID,AI\u958b\u767a\u62c5\u5f53\u8005,\"Orca \u306e Open Code 2 \u30ef\u30fc\u30ab\u30fc\",\"\u30ed\u30fc\u30ab\u30eb LLM Qwen 3 Coder Next\uff08\u30e2\u30c7\u30eb ID lmstudio/qwen3-coder-next-mlx\uff09\",\"\u4ed5\u69d8\u3069\u304a\u308a\u306e\u5b9f\u88c5\u3001\u4fee\u6b63 PR \u306e\u4f5c\u6210\u3001\u8a31\u5bb9\u30ea\u30b9\u30c8\u9805\u76ee\u306e\u63d0\u6848\"\n QAE,QA\u62c5\u5f53,\"Claude Code Fable\",\"Mac Studio \u4e0a\u306e Claude Code \u30bb\u30c3\u30b7\u30e7\u30f3\",\"\u5b9f\u88c5\u306e\u691c\u67fb\u3001\u56de\u5e30\u30fb\u53d7\u5165\u306e\u5b9f\u884c\uff08SPEC-04\uff09\u3001\u5408\u5426\u306e\u5224\u5b9a\u3001\u4fee\u6b63\u6307\u793a\u306e\u4f5c\u6210\"\n REV,\u62c5\u5f53\u30ec\u30d3\u30e5\u30ef,\"Codex Astra\uff08\u30e2\u30c7\u30eb ID gpt-6-astra\uff09\",\"Orca \u30ef\u30fc\u30ab\u30fc\",\"\u5168 PR \u306e\u72ec\u7acb\u30ec\u30d3\u30e5\u30fc\u3002docs/reviews/ \u3068 PR \u30b3\u30e1\u30f3\u30c8\u306b\u8a18\u9332\"\n owner,\u6240\u6709\u8005,\"\u8fbc\u5c71\u60a0\u4ecb\",\"\u4eba\",\"\u30de\u30fc\u30b8\u3001\u516c\u958b\u3001\u4f8b\u5916\u3001\u7bc0\u76ee\u306e\u5909\u66f4\u3001\u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u306e\u627f\u8a8d\"</code></pre> <p>\u4e09\u3064\u306e\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u306e\u5f79\u5272\u3092\u4e09\u3064\u306e\u7570\u306a\u308b\u30e2\u30c7\u30eb\u306b\u5272\u308a\u5f53\u3066\u308b\u306e\u306f\u610f\u56f3\u7684\u3067\u3059\u3002\u4e00\u3064\u306e\u30e2\u30c7\u30eb\u306e\u9593\u9055\u3044\u306e\u7656\u3092\u3001\u305d\u306e\u30ec\u30d3\u30e5\u30ef\u3084\u5224\u5b9a\u8005\u304c\u5171\u6709\u3057\u306a\u3044\u3088\u3046\u306b\u3059\u308b\u305f\u3081\u3067\u3059\u3002</p>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#32-\u6d41\u308c","title":"3.2 \u6d41\u308c","text":"<pre><code>flowchart LR\n S[grdm-dev scan<br/>\u65e5\u6b21\u306e\u691c\u51fa] --> A[AID<br/>\u30d6\u30e9\u30f3\u30c1\u306b\u4fee\u6b63 PR]\n A --> R[REV<br/>\u30ec\u30d3\u30e5\u30fc \u2192 docs/reviews/\uff0bPR \u30b3\u30e1\u30f3\u30c8]\n R -- \u4fee\u6b63\u8981\u6c42 --> A\n R -- \u627f\u8a8d --> Q[QAE<br/>\u56de\u5e30\uff0b\u53d7\u5165<br/>SPEC-04]\n Q -- \u4e0d\u5408\u683c \u2192 \u4fee\u6b63\u6307\u793a --> A\n Q -- \u5408\u683c --> O[\u6240\u6709\u8005<br/>\u30de\u30fc\u30b8]\n O --> P[\u6240\u6709\u8005<br/>\u30a4\u30e1\u30fc\u30b8\u30fb\u30ea\u30ea\u30fc\u30b9\u306e\u516c\u958b]</code></pre> <ul> <li>QAE \u306e\u5224\u5b9a\u307e\u3067\u306e\u3059\u3079\u3066\u306e\u6bb5\u968e\u306f\u81ea\u52d5\u3067\u3001\u4eba\u304c\u3044\u306a\u304f\u3066\u3082\u52d5\u3044\u3066\u3088\u3044\u3002</li> <li>\u6240\u6709\u8005\u306f <code>gh pr merge</code>\uff08\u65e5\u672c\u8a9e\u306e\u4ef6\u540d\uff09\u3067\u30de\u30fc\u30b8\u3059\u308b\u304b\u3001\u5374\u4e0b\u3059\u308b\u3002\u6240\u6709\u8005\u304c <code>ghcr.io/rcosdp</code> \u306b\u30a4\u30e1\u30fc\u30b8\u3092\u516c\u958b\u3057\u3001\u30ea\u30ea\u30fc\u30b9\u306b\u30bf\u30b0\u3092\u4ed8\u3051\u308b\u3002</li> <li>\u300c\u30b5\u30d6\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u300d\uff08\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u304c\u4ed5\u4e8b\u3092\u5206\u3051\u308b\u305f\u3081\u306b\u8d77\u3053\u3059\u88dc\u52a9\u306e\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\uff09\u306e\u6570\u306b\u5236\u9650\u306f\u306a\u3044\u3002\u8d77\u3053\u3057\u305f\u5f79\u5272\u304c\u305d\u306e\u6210\u679c\u306b\u8cac\u4efb\u3092\u6301\u3064\u3002</li> </ul>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#33-\u8a3c\u8de1","title":"3.3 \u8a3c\u8de1","text":"<p>\u6240\u6709\u8005\u304c\u898b\u308b\u524d\u306b\u3001\u3059\u3079\u3066\u306e PR \u306f\u6b21\u3092\u6301\u3061\u307e\u3059\u3002</p> <ol> <li>\u76f4\u3059\u691c\u51fa\uff08CVE \u756a\u53f7\u304b\u3001SPEC-03 \u00a77 \u306e\u30b9\u30ad\u30e3\u30f3\u5831\u544a\u306e\u30d1\u30b9\uff09\u3002</li> <li>REV \u306e\u30ec\u30d3\u30e5\u30fc\u8a18\u9332 <code>docs/reviews/YYYY-MM-DD_<\u984c>_rN.md</code> \u3068\u3001\u540c\u3058\u6587\u306e PR \u30b3\u30e1\u30f3\u30c8\u3002</li> <li>QAE \u306e\u8a66\u9a13\u8a18\u9332: <code>grdm-dev accept</code> \u3068 <code>grdm-dev scan</code> \u306e TOON \u6284\u9332\u3001\u5408\u5426\u3001\u8a66\u9a13\u3057\u305f\u30b3\u30df\u30c3\u30c8 SHA\u3002</li> <li>\u63a5\u982d\u8f9e\u4ed8\u304d\u306e\u65e5\u672c\u8a9e\u306e\u30b3\u30df\u30c3\u30c8\u4ef6\u540d\uff08<code>fix(security):</code>\uff09\u3002</li> </ol> <p>\u56db\u3064\u304c\u305d\u308d\u308f\u306a\u3044 PR \u306f\u6240\u6709\u8005\u306b\u51fa\u3059\u72b6\u614b\u3067\u306f\u306a\u304f\u3001QAE \u304c AID \u3078\u623b\u3057\u307e\u3059\u3002</p>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#34-\u3059\u3079\u3066\u306e\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u306b\u7981\u6b62\u3059\u308b\u3053\u3068","title":"3.4 \u3059\u3079\u3066\u306e\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u306b\u7981\u6b62\u3059\u308b\u3053\u3068","text":"<ul> <li>\u3069\u306e\u30d6\u30e9\u30f3\u30c1\u3078\u3082\u3001\u3044\u3064\u3067\u3082\u3001<code>git push --force</code> \u3092\u3057\u306a\u3044\u3002</li> <li>\u30d6\u30e9\u30f3\u30c1\u3001\u30bf\u30b0\u3001\u30ea\u30dd\u30b8\u30c8\u30ea\u3001\u30a4\u30e1\u30fc\u30b8\u3001\u3042\u3089\u3086\u308b\u30c7\u30fc\u30bf\u3092\u524a\u9664\u3057\u306a\u3044\u3002</li> <li>\u4e0a\u6d41\u30ea\u30dd\u30b8\u30c8\u30ea\uff08RCOSDP \u306e\u516c\u958b\u30b3\u30a2\u3001RCOSDP \u306e <code>-private</code> \u7248\u3001CenterForOpenScience\uff09\u3078\u66f8\u304d\u8fbc\u307e\u306a\u3044\uff08push\u3001PR \u4f5c\u6210\u3001issue \u4f5c\u6210\u3001\u30b3\u30e1\u30f3\u30c8\uff09\u3002\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u304c\u66f8\u304f\u306e\u306f\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3068 <code>-dev2027</code> \u7fa4\u3060\u3051\u3002</li> <li><code>develop</code> \u3084\u4fdd\u8b77\u3055\u308c\u305f\u30d6\u30e9\u30f3\u30c1\u3078\u30de\u30fc\u30b8\u3057\u306a\u3044\u3002\u81ea\u52d5\u30de\u30fc\u30b8\u3092\u6709\u52b9\u306b\u3057\u306a\u3044\u3002\u30d6\u30e9\u30f3\u30c1\u4fdd\u8b77\u3092\u5909\u3048\u306a\u3044\u3002</li> <li>\u30a4\u30e1\u30fc\u30b8\u3001\u30ea\u30ea\u30fc\u30b9\u3001\u6587\u66f8\u30b5\u30a4\u30c8\u3092\u516c\u958b\u3057\u306a\u3044\u3002</li> <li><code>-private</code> \u306e\u30b3\u30fc\u30c9\u3001\u79d8\u5bc6\u3001\u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u306e URL \u3092\u3053\u306e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u5199\u3055\u306a\u3044\uff08ADR-01\uff09\u3002</li> <li>\u9694\u96e2\u74b0\u5883\u306e\u5916\u306e\u3069\u3053\u306b\u3082\u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u306e\u624b\u6cd5\u3092\u4f7f\u308f\u306a\u3044\uff08SPEC-03 \u00a76\uff09\u3002</li> </ul>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#4-\u7d50\u679c","title":"4. \u7d50\u679c","text":"<ul> <li>\u4fee\u6b63\u304c\u4eba\u306e\u52e4\u52d9\u6642\u9593\u3092\u5f85\u305f\u305a\u306b\u65e5\u6b21\u30b9\u30ad\u30e3\u30f3\u3068\u540c\u3058\u901f\u3055\u3067\u9032\u3080\u3002\u6240\u6709\u8005\u306e\u4ed5\u4e8b\u306f\u8a3c\u62e0\u3092\u8aad\u3093\u3067\u30de\u30fc\u30b8\u3092\u62bc\u3059\u3053\u3068\u306b\u7e2e\u3080\u3002</li> <li>\u4e09\u3064\u306e\u5f79\u5272\u306b\u4e09\u3064\u306e\u7570\u306a\u308b\u30e2\u30c7\u30eb\u3092\u7f6e\u304f\u3053\u3068\u3067\u3001\u5171\u901a\u306e\u76f2\u70b9\u304c\u751f\u307e\u308c\u306b\u304f\u304f\u306a\u308a\u3001\u300c\u81ea\u5df1\u53d7\u5165\u306e\u7981\u6b62\u300d\u304c\u69cb\u9020\u3068\u3057\u3066\u6e80\u305f\u3055\u308c\u308b\u3002</li> <li>\u30ed\u30fc\u30ab\u30eb LLM \u306e\u30ef\u30fc\u30ab\u30fc\uff08AID\uff09\u306f\u54c1\u8cea\u304c\u3070\u3089\u3064\u304f\u3002\u4ed5\u69d8\u5148\u884c\u306e\u6c7a\u307e\u308a\uff08<code>docs/spec/</code> \u306e\u4ed5\u69d8\u3092\u66f8\u3044\u3066\u304b\u3089 AID \u306b\u6e21\u3059\uff09\u3068 QAE \u306e\u691c\u67fb\u304c\u305d\u306e\u88dc\u3044\u306b\u306a\u308b\u3002QAE \u306b\u4e8c\u5ea6\u843d\u3061\u305f PR \u306f\u9589\u3058\u3001\u4ed5\u69d8\u304b\u3089\u3084\u308a\u76f4\u3059\u3002</li> <li>\u4e09\u3064\u306e\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u4f53\u7cfb\u3092\u52d5\u304b\u3059\u3068 Mac Studio \u306e\u8cc7\u6e90\u3092\u4f7f\u3046\u3002Open Code 2 \u30ef\u30fc\u30ab\u30fc\u306e\u540c\u6642\u5b9f\u884c\u6570\u306f POL-01 \u306e\u672a\u6c7a\u4e8b\u9805\u3002</li> <li>\u6b8b\u308b\u5f85\u3061\u6642\u9593\u306f\u6240\u6709\u8005\u306e\u30ec\u30d3\u30e5\u30fc\u6642\u9593\u3060\u3051\u3002\u305d\u308c\u304c\u8106\u5f31\u6027\u4fee\u6b63\u306e\u30dc\u30c8\u30eb\u30cd\u30c3\u30af\u306b\u306a\u3063\u305f\u3089 \u00a75 \u3092\u898b\u76f4\u3059\u3002</li> </ul>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#5-\u672a\u6c7a\u4e8b\u9805","title":"5. \u672a\u6c7a\u4e8b\u9805","text":"<p>\u8106\u5f31\u6027\u4fee\u6b63\u3060\u3051\u306e PR \u306b\u3001REV \u627f\u8a8d\u3068 QAE \u5408\u683c\u306e\u5f8c\u306e\u81ea\u52d5\u30de\u30fc\u30b8\u3092\u8a8d\u3081\u308b\u304b\u3002 \u8cdb\u6210\u306e\u7406\u7531: \u6052\u5e38\u904b\u7528\u3067 HIGH \u306e\u691c\u51fa\u3092\u3088\u308a\u65e9\u304f\u9589\u3058\u3089\u308c\u308b\u3002\u53cd\u5bfe\u306e\u7406\u7531: POL-05 \u306f\u30de\u30fc\u30b8\u3092\u4eba\u306b\u6b8b\u3057\u3066\u3044\u308b\u3002\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u7d4c\u8def\u3067\u306e\u8aa4\u3063\u305f\u81ea\u52d5\u30de\u30fc\u30b8\u306f\u6700\u3082\u9ad8\u304f\u3064\u304f\u7a2e\u985e\u306e\u8aa4\u308a\u3067\u3042\u308b\u3002\u6052\u5e38\u904b\u7528\u3092\u7d04\u4e00\u304b\u6708\u56de\u3057\u3001\u6240\u6709\u8005\u304c\u4fee\u6b63 PR \u306e\u5b9f\u969b\u306e\u91cf\u3068\u8cea\u3092\u898b\u3066\u304b\u3089\u6c7a\u3081\u308b\u3002\u305d\u308c\u307e\u3067\u306f\u9078\u629e\u80a2 2 \u3092\u66f8\u3044\u305f\u3068\u304a\u308a\u306b\u9069\u7528\u3059\u308b\u3002</p>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#\u8a18\u9332\u3057\u305f\u4f8b\u5916","title":"\u8a18\u9332\u3057\u305f\u4f8b\u5916","text":"\u65e5\u4ed8 \u4f8b\u5916 \u7bc4\u56f2 \u8a31\u53ef\u8005 \u8a3c\u8de1 2026-11-05 QAE\uff08Claude Code Fable\uff09\u304c RDM-developer-guide \u81ea\u8eab\u306e PR #19 \u3092\u30de\u30fc\u30b8\u3059\u308b\u3002\u4f5c\u8005\u306f\u81ea\u5206\u306e PR \u3092\u627f\u8a8d\u3067\u304d\u306a\u3044\u305f\u3081\u3001\u30d6\u30e9\u30f3\u30c1\u4fdd\u8b77\u306e\u7ba1\u7406\u8005\u7d4c\u8def\u3092\u4f7f\u3046 \u3053\u306e PR 1 \u4ef6\u306e\u307f\u3002\u627f\u8a8d\u3067\u306f\u306a\u304f\u30de\u30fc\u30b8\u3002\u4ed6\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u306f\u53ca\u3070\u306a\u3044 \u6240\u6709\u8005\uff08\u30bb\u30c3\u30b7\u30e7\u30f3\u5185\u306e\u5bfe\u8a71\uff09 REV r3 \u8a18\u9332 <code>docs/reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3.md</code>\uff08approve \u63a8\u5968\uff09\u3001\u30de\u30fc\u30b8\u5bfe\u8c61 head \u3067 CI 6/6 \u5408\u683c <p>\u300c\u30de\u30fc\u30b8\u3068\u516c\u958b\u306f\u4eba\u304c\u884c\u3046\u300d\u3068\u3044\u3046\u898f\u5247\u306f\u5909\u308f\u3089\u306a\u3044\u3002\u4ee5\u5f8c\u306e\u30de\u30fc\u30b8\u306f\u305d\u308c\u305e\u308c\u4f8b\u5916\u306e\u8a18\u9332\u304b\u6240\u6709\u8005\u306e\u624b\u3092\u8981\u3059\u308b\u3002</p>"},{"location":"decisions/ADR-04_AI_Autonomy_and_Roles/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 AI agent A program that reads, writes, and tests code on its own when given a task. \u8ab2\u984c\u3092\u4e0e\u3048\u308b\u3068\u81ea\u5206\u3067\u30b3\u30fc\u30c9\u3092\u8aad\u307f\u30fb\u66f8\u304d\u30fb\u8a66\u3059\u30d7\u30ed\u30b0\u30e9\u30e0\u3002 Subagent A helper agent that an agent starts to split its work. \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u304c\u4ed5\u4e8b\u3092\u5206\u3051\u308b\u305f\u3081\u306b\u8d77\u3053\u3059\u88dc\u52a9\u306e\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3002 Pull request (PR) A proposed change that others can review before it joins the main code. \u4e3b\u306a\u30b3\u30fc\u30c9\u306b\u5165\u308b\u524d\u306b\u3001\u4ed6\u306e\u4eba\u304c\u78ba\u304b\u3081\u3089\u308c\u308b\u5909\u66f4\u306e\u63d0\u6848\u3002 Merge Joining a reviewed change into the main branch. \u30ec\u30d3\u30e5\u30fc\u6e08\u307f\u306e\u5909\u66f4\u3092\u4e3b\u30d6\u30e9\u30f3\u30c1\u306b\u5165\u308c\u308b\u3053\u3068\u3002 Publish Making an image, release, or site available to others. \u30a4\u30e1\u30fc\u30b8\u3001\u30ea\u30ea\u30fc\u30b9\u3001\u30b5\u30a4\u30c8\u3092\u4ed6\u306e\u4eba\u304c\u4f7f\u3048\u308b\u72b6\u614b\u306b\u3059\u308b\u3053\u3068\u3002 Force push Overwriting shared history on a branch; it can erase other people's work. \u5171\u6709\u3055\u308c\u305f\u5c65\u6b74\u3092\u4e0a\u66f8\u304d\u3059\u308b\u3053\u3068\u3002\u4ed6\u306e\u4eba\u306e\u4f5c\u696d\u3092\u6d88\u3059\u3053\u3068\u304c\u3042\u308b\u3002 Self-acceptance An author judging that their own work passes. \u4f5c\u8005\u304c\u81ea\u5206\u306e\u6210\u679c\u3092\u5408\u683c\u3068\u5224\u5b9a\u3059\u308b\u3053\u3068\u3002"},{"location":"demo/","title":"Demonstration Records / \u5b9f\u8a3c\u8a18\u9332","text":"<p>Summary: Records of what was actually done: acceptance runs, integration test results. Each record lives under <code>demo/runs/</code> and includes results.toon, screenshots, and traces. \u6982\u8981: \u5b9f\u969b\u306b\u3084\u3063\u305f\u3053\u3068\u306e\u8a18\u9332\uff1a\u53d7\u5165\u8a66\u9a13\u3001\u7d71\u5408\u8a66\u9a13\u7d50\u679c\u3002\u5404\u8a18\u9332\u306f <code>demo/runs/</code> \u306e\u4e0b\u306b\u3042\u308a\u3001results.toon\u3001\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8\u3001\u30c8\u30ec\u30fc\u30b9\u3092\u542b\u307f\u307e\u3059\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: a milestone can only be called passed if the acceptance run that passed it is recorded with its evidence; this folder is where that evidence lives. \uff0f \u7bc0\u76ee\u3092\u300c\u5408\u683c\u300d\u3068\u547c\u3079\u308b\u306e\u306f\u3001\u5408\u683c\u3057\u305f\u53d7\u5165\u5b9f\u884c\u304c\u8a3c\u8de1\u3068\u3068\u3082\u306b\u8a18\u9332\u3055\u308c\u3066\u3044\u308b\u3068\u304d\u3060\u3051\u3067\u3042\u308a\u3001\u305d\u306e\u7f6e\u304d\u5834\u304c\u3053\u306e\u30d5\u30a9\u30eb\u30c0\u3060\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Normative for: SPEC-04 Acceptance Tests, SPEC-03 Security Gate.</li> <li>Related: ../README.md \u00b7 status/ \u00b7 demo/runs/</li> </ul> <p></p>"},{"location":"demo/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"demo/#1-what-belongs-here","title":"1. What belongs here","text":"<p>A demo record documents what was actually done, including acceptance and integration tests. This folder contains:</p> Subfolder Purpose runs/ Individual run results: <code>acc-<timestamp>-<6 hex>/</code> with evidence. <p>The record format is defined in SPEC-04 \u00a77:</p> <pre><code>evidence:\n results.toon: one line per test with id, case, status, duration_ms, http_status\n results.json: same data, canonical\n junit.xml: for CI and GitHub checks tab\n screenshots/: <test>_<case>.png, taken only on failure\n trace/: Playwright trace zip, only on failure, kept 14 days in CI</code></pre>"},{"location":"demo/#2-open-items-no-entries-yet--\u307e\u3060\u3042\u308a\u307e\u305b\u3093","title":"2. Open items (no entries yet / \u307e\u3060\u3042\u308a\u307e\u305b\u3093)","text":"Date Title Status \u2014 \u2014 \u2014"},{"location":"demo/#3-creating-a-new-demo-record","title":"3. Creating a new demo record","text":"<ol> <li>Run <code>grdm-dev accept</code> (acceptance) or <code>grdm-dev health --network</code> (integration).</li> <li>The record is written to <code>docs/demo/runs/<run_id>/</code>.</li> <li>Link the run folder from status reports or milestone documents.</li> </ol>"},{"location":"demo/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"demo/#1-\u3053\u3053\u306b\u5c5e\u3059\u308b\u3082\u306e","title":"1. \u3053\u3053\u306b\u5c5e\u3059\u308b\u3082\u306e","text":"<p>\u300c\u5b9f\u8a3c\u300d\u8a18\u9332\u306f\u3001\u5b9f\u969b\u306b\u3084\u3063\u305f\u3053\u3068\uff08\u53d7\u5165\u8a66\u9a13\u3001\u7d71\u5408\u8a66\u9a13\uff09\u3092\u6587\u66f8\u5316\u3057\u307e\u3059\u3002\u3053\u306e\u30d5\u30a9\u30eb\u30c0\u306b\u306f\u6b21\u304c\u542b\u307e\u308c\u307e\u3059\uff1a</p> \u30b5\u30d6\u30d5\u30a9\u30eb\u30c0 \u76ee\u7684 runs/ \u500b\u5225\u306e\u5b9f\u884c\u7d50\u679c\uff1a<code>acc-<\u6642\u523b>-<6 \u6841\u306e16\u9032>/</code> \u306b\u8a3c\u8de1\u304c\u7f6e\u304b\u308c\u308b\u3002 <p>\u8a18\u9332\u5f62\u5f0f\u306f SPEC-04 \u00a77 \u306b\u5b9a\u3081\u3089\u308c\u3066\u3044\u307e\u3059\uff1a</p> <pre><code>\u8a3c\u8de1:\n results.toon: \u8a66\u9a13\u3054\u3068\u306b\u4e00\u884c\u3002id\u30fbcase\u30fbstatus\u30fbduration_ms\u30fbhttp_status\n results.json: \u540c\u3058\u30c7\u30fc\u30bf\u306e\u6b63\u672c\n junit.xml: CI \u3068 GitHub \u306e checks \u30bf\u30d6\u5411\u3051\n screenshots/: <\u8a66\u9a13>_<\u30b1\u30fc\u30b9>.png\u3002\u5931\u6557\u6642\u3060\u3051\u64ae\u308b\n trace/: Playwright \u306e\u30c8\u30ec\u30fc\u30b9 zip\u3002\u5931\u6557\u6642\u3060\u3051\u3002CI \u3067\u306f 14 \u65e5\u4fdd\u6301</code></pre>"},{"location":"demo/#2-\u672a\u89e3\u6c7a\u9805\u76ee\u307e\u3060\u3042\u308a\u307e\u305b\u3093--no-entries-yet","title":"2. \u672a\u89e3\u6c7a\u9805\u76ee\uff08\u307e\u3060\u3042\u308a\u307e\u305b\u3093 / no entries yet\uff09","text":"\u65e5\u4ed8 \u30bf\u30a4\u30c8\u30eb \u30b9\u30c6\u30fc\u30bf\u30b9 \u2014 \u2014 \u2014"},{"location":"demo/#3-\u65b0\u3057\u3044\u5b9f\u8a3c\u8a18\u9332\u3092\u3064\u304f\u308b\u306b\u306f","title":"3. \u65b0\u3057\u3044\u5b9f\u8a3c\u8a18\u9332\u3092\u3064\u304f\u308b\u306b\u306f","text":"<ol> <li><code>grdm-dev accept</code>\uff08\u53d7\u5165\uff09\u307e\u305f\u306f <code>grdm-dev health --network</code>\uff08\u7d71\u5408\uff09\u3092\u5b9f\u884c\u3059\u308b\u3002</li> <li>\u8a18\u9332\u306f <code>docs/demo/runs/<\u5b9f\u884cID>/</code> \u306b\u66f8\u304b\u308c\u308b\u3002</li> <li>\u72b6\u6cc1\u5831\u544a\u3084\u7bc0\u76ee\u6587\u66f8\u3078\u5b9f\u884c\u30d5\u30a9\u30eb\u30c0\u306b\u30ea\u30f3\u30af\u3059\u308b\u3002</li> </ol>"},{"location":"demo/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Demo record A document of what was actually done, including acceptance and integration tests. \u5b9f\u969b\u306b\u3084\u3063\u305f\u3053\u3068\uff08\u53d7\u5165\u8a66\u9a13\u3001\u7d71\u5408\u8a66\u9a13\uff09\u3092\u6587\u66f8\u5316\u3057\u305f\u3082\u306e\u3002 Evidence Files that prove a test run: results, screenshots, traces. \u8a66\u9a13\u5b9f\u884c\u3092\u8a3c\u660e\u3059\u308b\u30d5\u30a1\u30a4\u30eb\uff1a\u7d50\u679c\u3001\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8\u3001\u30c8\u30ec\u30fc\u30b9\u3002 Acceptance test A check that the whole thing does what the user asked for. \u5168\u4f53\u304c\u5229\u7528\u8005\u306e\u671b\u307f\u3069\u304a\u308a\u306b\u52d5\u304f\u304b\u306e\u78ba\u8a8d\u3002 Integration test A check that several pieces work together. \u3044\u304f\u3064\u304b\u306e\u90e8\u54c1\u304c\u4e00\u7dd2\u306b\u52d5\u304f\u304b\u306e\u78ba\u8a8d\u3002"},{"location":"demo/20_core_install_mac_studio/","title":"DEMO-20 Core Install on Mac Studio / Mac Studio \u3067\u306e\u30b3\u30a2\u5c0e\u5165\u8a18\u9332","text":"<p>Summary: What actually happened when <code>./installer/install.sh --yes --no-open --profile core</code> was run on the Mac Studio (Apple Silicon). One entry per run; nothing is edited after the fact. \u6982\u8981: Mac Studio\uff08Apple Silicon\uff09\u3067 <code>./installer/install.sh --yes --no-open --profile core</code> \u3092\u5b9f\u884c\u3057\u305f\u3068\u304d\u306b\u5b9f\u969b\u306b\u8d77\u304d\u305f\u3053\u3068\u3002\u5b9f\u884c\u3054\u3068\u306b 1 \u7bc0\u3002\u5f8c\u304b\u3089\u66f8\u304d\u63db\u3048\u306a\u3044\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.2 \u2014 2026-11-05. Learned: emulation solves missing arm64 wheels but not a base image that current Docker refuses outright; that needs a prebuilt fallback until the Dockerfile is modernized. \uff0f \u30a8\u30df\u30e5\u30ec\u30fc\u30b7\u30e7\u30f3\u306f arm64 \u306e wheel \u4e0d\u8db3\u3092\u89e3\u304f\u304c\u3001\u73fe\u884c Docker \u304c\u53d6\u5f97\u305d\u306e\u3082\u306e\u3092\u62d2\u3080\u30d9\u30fc\u30b9\u30a4\u30e1\u30fc\u30b8\u306b\u306f\u52b9\u304b\u306a\u3044\u3002Dockerfile \u3092\u8fd1\u4ee3\u5316\u3059\u308b\u307e\u3067\u306f\u914d\u5e03\u6e08\u307f\u30a4\u30e1\u30fc\u30b8\u306e\u4ee3\u66ff\u304c\u8981\u308b\u3002 0.1 \u2014 2026-11-05. Learned: the first real run proved the stop-at-first-failure design and exposed that an EOL Python 3.5 image cannot be built for arm64, which the specifications had only predicted. \uff0f \u6700\u521d\u306e\u5b9f\u884c\u3067\u300c\u6700\u521d\u306e\u5931\u6557\u3067\u6b62\u307e\u308b\u300d\u8a2d\u8a08\u304c\u50cd\u304f\u3053\u3068\u3068\u3001EOL \u306e Python 3.5 \u30a4\u30e1\u30fc\u30b8\u306f arm64 \u3067\u7d44\u3081\u306a\u3044\u3053\u3068\uff08\u4ed5\u69d8\u3067\u306f\u4e88\u6e2c\u3060\u3063\u305f\uff09\u304c\u5b9f\u8a3c\u3055\u308c\u305f\u3002</li> <li>Normative source: SPEC-02 Installer CLI \u00b7 SPEC-04 Acceptance Tests</li> <li>Related: docs/demo/README.md \u00b7 docs/status/README.md \u00b7 ADR-03 Staged Security Gate</li> </ul> <p></p>"},{"location":"demo/20_core_install_mac_studio/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"demo/20_core_install_mac_studio/#run-1--2026-11-05-branch-featm2-installer-pr-21-before-review-fixes","title":"Run 1 \u2014 2026-11-05, branch <code>feat/m2-installer</code> (PR #21, before review fixes)","text":"<p>Host (from <code>grdm-dev doctor</code>): macOS 27.2, arm64, 128 GiB memory, Docker 29.5.2, Compose 5.6.0, buildx present. Supported, Docker OK.</p> <pre><code>run1:\n command: ./installer/install.sh --yes --no-open --profile core\n env: GRDM_WITH_ACCEPT=1\n result: exit 30 (image build failed)\n steps[5]{step,code,status}:\n doctor,0,ok\n plan,0,ok\n \"secrets init\",0,ok\n \"compose render\",0,ok\n build,30,failed\n images[3]{component,platform,status,note}:\n osf.io,linux/arm64,built,\"2.92 GB; Debian buster archive packages (EOL base)\"\n waterbutler,linux/arm64,built,1.28 GB\n modular-file-renderer,linux/arm64,build-failed,\"pip: no matching distribution for pandas==0.25.1 on Python 3.5 / arm64\"</code></pre> <p>What this proves:</p> <ul> <li>The bootstrap (<code>install.sh</code> \u2192 <code>.venv/</code> \u2192 <code>grdm-dev install</code>) works end to end on a clean macOS shell.</li> <li>The sequence stops at the first failing step and returns that step's exit code (30), as SPEC-02 \u00a72.1 requires; nothing was started.</li> <li>The EOL base images (see ADR-03) are not only a security problem but a build problem on Apple Silicon.</li> </ul> <p>Decision taken: components whose base cannot be built for arm64 (modular-file-renderer, ember-osf-web, cas-overlay) get <code>build_platform: linux/amd64</code> in the manifest (SPEC-01) and run under emulation until M4 modernizes them. Run 2 will be recorded below after the review fixes land.</p>"},{"location":"demo/20_core_install_mac_studio/#run-2--2026-11-05-branch-featm2-installer-after-review-fixes-r1-commit-3149c76--1c2a925","title":"Run 2 \u2014 2026-11-05, branch <code>feat/m2-installer</code> (after review fixes r1, commit 3149c76 + 1c2a925)","text":"<p>Same host. Changes since run 1: <code>build_platform: linux/amd64</code> for modular-file-renderer, ember-osf-web and cas-overlay; two networks (<code>grdm</code> internal, <code>grdm-edge</code> publishing); PostgreSQL 9.6 <code>auth-host=md5</code>.</p> <pre><code>run2:\n command: ./installer/install.sh --yes --no-open --profile core\n result: exit 30 (image build failed)\n steps[5]{step,code,status}:\n \"secrets init\",0,\"skipped (runtime/.env exists)\"\n doctor,0,ok\n plan,0,ok\n \"compose render\",0,ok\n build,30,failed\n images[4]{component,platform,status,note}:\n osf.io,linux/arm64,built,cached from run 1\n waterbutler,linux/arm64,built,cached from run 1\n modular-file-renderer,linux/amd64,built,\"emulated build succeeded (pandas 0.25.1 has an amd64 wheel)\"\n ember-osf-web,linux/amd64,build-failed,\"base image quay.io/centerforopenscience/ember-base is a Docker manifest v2 schema 1 image; current Docker refuses to pull it\"</code></pre> <p>What this proves:</p> <ul> <li><code>build_platform</code> works: the component that could not be built for arm64 in run 1 now builds under emulation.</li> <li><code>secrets init</code> is idempotent (kept the existing <code>runtime/.env</code>), and re-rendering did not move ports.</li> <li>The ember-osf-web Dockerfile cannot be built at all with current Docker, independent of CPU. This is a defect of the EOL base, to be fixed in the integration repository at M4.</li> </ul> <p>Decision taken: add a documented, digest-pinned <code>prebuilt_image</code> fallback to the manifest (SPEC-01) for ember-osf-web until M4, using the distribution image the legacy guide relied on. Run 3 will be recorded below.</p> <p>Evidence (run 1): full log kept in the session scratchpad only (contains package download noise, no secrets). The <code>runtime/</code> directory on the Mac Studio holds <code>.env</code> (0600), the rendered Compose file and two built images; it is git-ignored.</p> <p></p>"},{"location":"demo/20_core_install_mac_studio/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"demo/20_core_install_mac_studio/#\u7b2c-1-\u56de--2026-11-05\u30d6\u30e9\u30f3\u30c1-featm2-installerpr-21\u30ec\u30d3\u30e5\u30fc\u4fee\u6b63\u524d","title":"\u7b2c 1 \u56de \u2014 2026-11-05\u3001\u30d6\u30e9\u30f3\u30c1 <code>feat/m2-installer</code>\uff08PR #21\u3001\u30ec\u30d3\u30e5\u30fc\u4fee\u6b63\u524d\uff09","text":"<p>\u30db\u30b9\u30c8\uff08<code>grdm-dev doctor</code> \u3088\u308a\uff09: macOS 27.2\u3001arm64\u3001\u30e1\u30e2\u30ea 128 GiB\u3001Docker 29.5.2\u3001Compose 5.6.0\u3001buildx \u3042\u308a\u3002\u5bfe\u5fdc\u30db\u30b9\u30c8\u3001Docker \u6b63\u5e38\u3002</p> <pre><code>run1:\n command: ./installer/install.sh --yes --no-open --profile core\n env: GRDM_WITH_ACCEPT=1\n result: \"\u7d42\u4e86\u30b3\u30fc\u30c9 30\uff08\u30a4\u30e1\u30fc\u30b8\u306e\u30d3\u30eb\u30c9\u5931\u6557\uff09\"\n steps[5]{step,code,status}:\n doctor,0,ok\n plan,0,ok\n \"secrets init\",0,ok\n \"compose render\",0,ok\n build,30,failed\n images[3]{component,platform,status,note}:\n osf.io,linux/arm64,built,\"2.92 GB\u3002Debian buster \u306e\u30a2\u30fc\u30ab\u30a4\u30d6\u304b\u3089\u30d1\u30c3\u30b1\u30fc\u30b8\u53d6\u5f97\uff08EOL \u30d9\u30fc\u30b9\uff09\"\n waterbutler,linux/arm64,built,1.28 GB\n modular-file-renderer,linux/arm64,build-failed,\"pip: Python 3.5 / arm64 \u5411\u3051\u306e pandas==0.25.1 \u304c\u5b58\u5728\u3057\u306a\u3044\"</code></pre> <p>\u3053\u308c\u3067\u5206\u304b\u3063\u305f\u3053\u3068:</p> <ul> <li>\u30d6\u30fc\u30c8\u30b9\u30c8\u30e9\u30c3\u30d7\uff08<code>install.sh</code> \u2192 <code>.venv/</code> \u2192 <code>grdm-dev install</code>\uff09\u306f\u3001\u7d20\u306e macOS \u306e\u30b7\u30a7\u30eb\u3067\u7aef\u304b\u3089\u7aef\u307e\u3067\u52d5\u304f\u3002</li> <li>\u624b\u9806\u306f\u6700\u521d\u306b\u5931\u6557\u3057\u305f\u6bb5\u968e\u3067\u6b62\u307e\u308a\u3001\u305d\u306e\u6bb5\u968e\u306e\u7d42\u4e86\u30b3\u30fc\u30c9\uff0830\uff09\u3092\u8fd4\u3059\u3002SPEC-02 \u00a72.1 \u306e\u3068\u304a\u308a\u3067\u3001\u30b5\u30fc\u30d3\u30b9\u306f\u4f55\u3082\u8d77\u52d5\u3057\u3066\u3044\u306a\u3044\u3002</li> <li>EOL \u306e\u30d9\u30fc\u30b9\u30a4\u30e1\u30fc\u30b8\uff08ADR-03\uff09\u306f\u5b89\u5168\u6027\u306e\u554f\u984c\u3060\u3051\u3067\u306a\u304f\u3001Apple Silicon \u3067\u306f\u30d3\u30eb\u30c9\u306e\u554f\u984c\u3067\u3082\u3042\u308b\u3002</li> </ul> <p>\u6c7a\u3081\u305f\u3053\u3068: arm64 \u3067\u7d44\u3081\u306a\u3044\u90e8\u54c1\uff08modular-file-renderer\u3001ember-osf-web\u3001cas-overlay\uff09\u306f manifest \u306b <code>build_platform: linux/amd64</code> \u3092\u6301\u305f\u305b\uff08SPEC-01\uff09\u3001M4 \u3067\u8fd1\u4ee3\u5316\u3059\u308b\u307e\u3067\u30a8\u30df\u30e5\u30ec\u30fc\u30b7\u30e7\u30f3\u3067\u52d5\u304b\u3059\u3002\u7b2c 2 \u56de\u306f\u30ec\u30d3\u30e5\u30fc\u4fee\u6b63\u306e\u53cd\u6620\u5f8c\u306b\u4e0b\u3078\u8ffd\u8a18\u3059\u308b\u3002</p>"},{"location":"demo/20_core_install_mac_studio/#\u7b2c-2-\u56de--2026-11-05\u30d6\u30e9\u30f3\u30c1-featm2-installer\u30ec\u30d3\u30e5\u30fc-r1-\u5bfe\u5fdc\u5f8c\u30b3\u30df\u30c3\u30c8-3149c76--1c2a925","title":"\u7b2c 2 \u56de \u2014 2026-11-05\u3001\u30d6\u30e9\u30f3\u30c1 <code>feat/m2-installer</code>\uff08\u30ec\u30d3\u30e5\u30fc r1 \u5bfe\u5fdc\u5f8c\u3001\u30b3\u30df\u30c3\u30c8 3149c76 \uff0b 1c2a925\uff09","text":"<p>\u540c\u3058\u30db\u30b9\u30c8\u3002\u7b2c 1 \u56de\u304b\u3089\u306e\u5909\u66f4: modular-file-renderer\u30fbember-osf-web\u30fbcas-overlay \u306b <code>build_platform: linux/amd64</code>\u3001\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3092\u4e8c\u3064\uff08\u5185\u90e8\u306e <code>grdm</code> \u3068\u516c\u958b\u7528\u306e <code>grdm-edge</code>\uff09\u3001PostgreSQL 9.6 \u306e <code>auth-host=md5</code>\u3002</p> <pre><code>run2:\n command: ./installer/install.sh --yes --no-open --profile core\n result: \"\u7d42\u4e86\u30b3\u30fc\u30c9 30\uff08\u30a4\u30e1\u30fc\u30b8\u306e\u30d3\u30eb\u30c9\u5931\u6557\uff09\"\n steps[5]{step,code,status}:\n \"secrets init\",0,\"skipped\uff08runtime/.env \u304c\u3042\u308b\u305f\u3081\uff09\"\n doctor,0,ok\n plan,0,ok\n \"compose render\",0,ok\n build,30,failed\n images[4]{component,platform,status,note}:\n osf.io,linux/arm64,built,\u7b2c 1 \u56de\u306e\u30ad\u30e3\u30c3\u30b7\u30e5\n waterbutler,linux/arm64,built,\u7b2c 1 \u56de\u306e\u30ad\u30e3\u30c3\u30b7\u30e5\n modular-file-renderer,linux/amd64,built,\"\u30a8\u30df\u30e5\u30ec\u30fc\u30b7\u30e7\u30f3\u3067\u306e\u30d3\u30eb\u30c9\u306b\u6210\u529f\uff08pandas 0.25.1 \u306b amd64 \u306e wheel \u304c\u3042\u308b\uff09\"\n ember-osf-web,linux/amd64,build-failed,\"\u30d9\u30fc\u30b9\u30a4\u30e1\u30fc\u30b8 quay.io/centerforopenscience/ember-base \u304c Docker \u306e manifest v2 schema 1 \u5f62\u5f0f\u3067\u3001\u73fe\u884c Docker \u306f\u53d6\u5f97\u3092\u62d2\u5426\u3059\u308b\"</code></pre> <p>\u3053\u308c\u3067\u5206\u304b\u3063\u305f\u3053\u3068:</p> <ul> <li><code>build_platform</code> \u306f\u50cd\u304f\u3002\u7b2c 1 \u56de\u3067 arm64 \u5411\u3051\u306b\u7d44\u3081\u306a\u304b\u3063\u305f\u90e8\u54c1\u304c\u3001\u30a8\u30df\u30e5\u30ec\u30fc\u30b7\u30e7\u30f3\u3067\u7d44\u3081\u305f\u3002</li> <li><code>secrets init</code> \u306f\u51aa\u7b49\uff08\u65e2\u5b58\u306e <code>runtime/.env</code> \u3092\u4fdd\u6301\uff09\u3067\u3001\u518d\u63cf\u753b\u3067\u30dd\u30fc\u30c8\u306f\u52d5\u304b\u306a\u304b\u3063\u305f\u3002</li> <li>ember-osf-web \u306e Dockerfile \u306f CPU \u306b\u95a2\u4fc2\u306a\u304f\u73fe\u884c Docker \u3067\u306f\u307e\u3063\u305f\u304f\u7d44\u3081\u306a\u3044\u3002EOL \u30d9\u30fc\u30b9\u306e\u6b20\u9665\u3067\u3042\u308a\u3001M4 \u3067\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u5074\u3092\u76f4\u3059\u3002</li> </ul> <p>\u6c7a\u3081\u305f\u3053\u3068: M4 \u307e\u3067\u3001ember-osf-web \u306b\u306f manifest \u306e\u8a18\u9332\u4ed8\u304d\u30fb\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u56fa\u5b9a\u306e <code>prebuilt_image</code>\uff08\u65e7\u30ac\u30a4\u30c9\u304c\u983c\u3063\u3066\u3044\u305f\u914d\u5e03\u30a4\u30e1\u30fc\u30b8\uff09\u3092\u4f7f\u3046\uff08SPEC-01\uff09\u3002\u7b2c 3 \u56de\u306f\u4e0b\u3078\u8ffd\u8a18\u3059\u308b\u3002</p> <p>\u8a3c\u8de1\uff08\u7b2c 1 \u56de\uff09: \u5168\u30ed\u30b0\u306f\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u4f5c\u696d\u9818\u57df\u306b\u306e\u307f\u4fdd\u7ba1\uff08\u30d1\u30c3\u30b1\u30fc\u30b8\u53d6\u5f97\u306e\u51fa\u529b\u304c\u5927\u534a\u3067\u3001\u79d8\u5bc6\u306f\u542b\u307e\u306a\u3044\uff09\u3002Mac Studio \u306e <code>runtime/</code> \u306b\u306f <code>.env</code>\uff080600\uff09\u3001\u751f\u6210\u3057\u305f Compose \u30d5\u30a1\u30a4\u30eb\u3001\u30d3\u30eb\u30c9\u6e08\u307f\u30a4\u30e1\u30fc\u30b8 2 \u3064\u304c\u3042\u308a\u3001git \u3067\u306f\u7121\u8996\u3055\u308c\u308b\u3002</p>"},{"location":"demo/20_core_install_mac_studio/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Emulation Running a program built for one kind of CPU on another kind, slower but working. \u3042\u308b\u7a2e\u985e\u306e CPU \u5411\u3051\u306b\u4f5c\u3063\u305f\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u5225\u306e CPU \u3067\u52d5\u304b\u3059\u3053\u3068\u3002\u9045\u3044\u304c\u52d5\u304f\u3002 Wheel A ready-made package of Python code for one CPU type; if none exists, pip must compile it. \u3042\u308b CPU \u5411\u3051\u306b\u3067\u304d\u3042\u304c\u3063\u305f Python \u306e\u90e8\u54c1\u306e\u7bb1\u3002\u7121\u3044\u3068 pip \u304c\u81ea\u5206\u3067\u7d44\u307f\u7acb\u3066\u308b\u3002"},{"location":"demo/runs/","title":"Acceptance Run Records / \u53d7\u5165\u5b9f\u884c\u306e\u8a18\u9332","text":"<p>Summary: Each run of <code>grdm-dev accept</code> writes its evidence into a folder here, named by run id. Nothing is here yet; the first records arrive at milestone M2. \u6982\u8981: <code>grdm-dev accept</code> \u3092\u5b9f\u884c\u3059\u308b\u305f\u3073\u306b\u3001\u305d\u306e\u8a3c\u8de1\u304c\u5b9f\u884c ID \u540d\u306e\u30d5\u30a9\u30eb\u30c0\u3068\u3057\u3066\u3053\u3053\u306b\u66f8\u304b\u308c\u307e\u3059\u3002\u307e\u3060\u8a18\u9332\u306f\u306a\u304f\u3001\u6700\u521d\u306e\u8a18\u9332\u306f\u7bc0\u76ee M2 \u3067\u4f5c\u3089\u308c\u307e\u3059\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.2 \u2014 2026-11-05. Learned: traces are raw and may hold secrets, so the public evidence folder keeps only screenshots and masked text (PR #21 review r2). \uff0f \u30c8\u30ec\u30fc\u30b9\u306f\u751f\u3067\u79d8\u5bc6\u3092\u542b\u307f\u5f97\u308b\u305f\u3081\u3001\u516c\u958b\u306e\u8a3c\u8de1\u30d5\u30a9\u30eb\u30c0\u306b\u306f\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8\u3068\u30de\u30b9\u30af\u6e08\u307f\u306e\u6587\u5b57\u3060\u3051\u3092\u7f6e\u304f\uff08PR #21 \u30ec\u30d3\u30e5\u30fc r2\uff09\u3002 0.1 \u2014 2026-11-05. Learned: the evidence folder must exist with a stated layout before the first run, so that SPEC-04 and the demo index can link to it. \uff0f \u6700\u521d\u306e\u5b9f\u884c\u306e\u524d\u306b\u3001\u8a3c\u8de1\u30d5\u30a9\u30eb\u30c0\u3068\u6c7a\u307e\u3063\u305f\u4e2d\u8eab\u3092\u3053\u3053\u306b\u66f8\u3044\u3066\u304a\u304f\u5fc5\u8981\u304c\u3042\u308b\u3068\u5206\u304b\u3063\u305f\u3002SPEC-04 \u3068\u5b9f\u8a3c\u306e\u7d22\u5f15\u304c\u30ea\u30f3\u30af\u3067\u304d\u308b\u3088\u3046\u306b\u3059\u308b\u305f\u3081\u3067\u3042\u308b\u3002</li> <li>Normative source: SPEC-04 Acceptance Tests</li> <li>Related: docs/demo/README.md \u00b7 docs/status/README.md</li> </ul> <p></p>"},{"location":"demo/runs/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"demo/runs/#what-is-stored-here","title":"What is stored here","text":"<p>Every run of the acceptance tests (automated browser tests that check the environment works, see SPEC-04) creates one folder <code>runs/<run_id>/</code> with:</p> File Meaning <code>results.toon</code> Human- and AI-readable summary (TOON: a compact text form of JSON) <code>results.json</code> The same data for machines (canonical) <code>junit.xml</code> Test results in the format CI tools read <code>screenshots/</code> Only when a test failed: what the browser saw. Browser traces are not kept here; with <code>--trace</code> they go to <code>runtime/reports/quarantine/<run_id>/</code>, which is private and git-ignored <p>Records are written by <code>grdm-dev accept</code>; do not edit them by hand. No secrets are ever written here.</p>"},{"location":"demo/runs/#current-state","title":"Current state","text":"<p>No runs yet. The first records are expected at milestone M2 (core services on Mac Studio).</p> <p></p>"},{"location":"demo/runs/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"demo/runs/#\u3053\u3053\u306b\u7f6e\u304f\u3082\u306e","title":"\u3053\u3053\u306b\u7f6e\u304f\u3082\u306e","text":"<p>\u53d7\u5165\u8a66\u9a13\uff08\u74b0\u5883\u304c\u52d5\u304f\u3053\u3068\u3092\u78ba\u304b\u3081\u308b\u81ea\u52d5\u306e\u30d6\u30e9\u30a6\u30b6\u8a66\u9a13\u3002SPEC-04 \u53c2\u7167\uff09\u3092\u5b9f\u884c\u3059\u308b\u305f\u3073\u306b\u3001<code>runs/<run_id>/</code> \u3068\u3044\u3046\u30d5\u30a9\u30eb\u30c0\u304c\u4e00\u3064\u4f5c\u3089\u308c\u3001\u6b21\u304c\u5165\u308a\u307e\u3059\u3002</p> \u30d5\u30a1\u30a4\u30eb \u610f\u5473 <code>results.toon</code> \u4eba\u3068 AI \u304c\u8aad\u3080\u8981\u7d04\uff08TOON: JSON \u3092\u77ed\u3044\u6587\u5b57\u3067\u8868\u3057\u305f\u5f62\uff09 <code>results.json</code> \u6a5f\u68b0\u304c\u8aad\u3080\u540c\u3058\u30c7\u30fc\u30bf\uff08\u6b63\u672c\uff09 <code>junit.xml</code> CI \u306e\u9053\u5177\u304c\u8aad\u3080\u5f62\u5f0f\u306e\u8a66\u9a13\u7d50\u679c <code>screenshots/</code> \u8a66\u9a13\u304c\u5931\u6557\u3057\u305f\u3068\u304d\u3060\u3051: \u30d6\u30e9\u30a6\u30b6\u304c\u898b\u3066\u3044\u305f\u753b\u9762\u3002\u30d6\u30e9\u30a6\u30b6\u306e\u30c8\u30ec\u30fc\u30b9\u306f\u3053\u3053\u306b\u306f\u7f6e\u304b\u306a\u3044\u3002<code>--trace</code> \u306e\u3068\u304d\u306f <code>runtime/reports/quarantine/<run_id>/</code>\uff08\u975e\u516c\u958b\u3001git \u7ba1\u7406\u5916\uff09\u3078 <p>\u8a18\u9332\u306f <code>grdm-dev accept</code> \u304c\u66f8\u304d\u307e\u3059\u3002\u624b\u3067\u7de8\u96c6\u3057\u306a\u3044\u3067\u304f\u3060\u3055\u3044\u3002\u79d8\u5bc6\u60c5\u5831\u306f\u3053\u3053\u306b\u66f8\u304b\u308c\u307e\u305b\u3093\u3002</p>"},{"location":"demo/runs/#\u3044\u307e\u306e\u72b6\u614b","title":"\u3044\u307e\u306e\u72b6\u614b","text":"<p>\u307e\u3060\u5b9f\u884c\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u6700\u521d\u306e\u8a18\u9332\u306f\u7bc0\u76ee M2\uff08Mac Studio \u3067\u30b3\u30a2\u3092\u8d77\u52d5\uff09\u3067\u4f5c\u3089\u308c\u308b\u898b\u8fbc\u307f\u3067\u3059\u3002</p>"},{"location":"demo/runs/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Run id A short unique name for one test run, like a receipt number. \u4e00\u56de\u306e\u8a66\u9a13\u5b9f\u884c\u306b\u3064\u3051\u308b\u77ed\u3044\u540d\u524d\u3002\u30ec\u30b7\u30fc\u30c8\u756a\u53f7\u306e\u3088\u3046\u306a\u3082\u306e\u3002 JUnit XML A standard file format that test tools use to report pass/fail. \u8a66\u9a13\u306e\u9053\u5177\u304c\u5408\u5426\u3092\u5831\u544a\u3059\u308b\u3068\u304d\u306e\u6a19\u6e96\u306e\u5f62\u5f0f\u3002"},{"location":"guides/","title":"Guides / \u30ac\u30a4\u30c9","text":"<p>Summary: Collection of guides for RDM addon development and environment setup \u6982\u8981: RDM \u30a2\u30c9\u30aa\u30f3\u958b\u767a\u3068\u74b0\u5883\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u306e\u305f\u3081\u306e\u30ac\u30a4\u30c9\u96c6</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05</li> <li>Normative for: <code>docs/guides/</code></li> <li>Related: SPEC-06 Documentation Conventions</li> </ul> <p></p>"},{"location":"guides/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"guides/#available-guides","title":"Available Guides","text":"Title Description Environment Development environment setup with Docker Compose and the 2027 installer EC2 Setting up RDM on Amazon EC2 Skeleton Creating your first addon using the skeleton template Storage Addon Building storage addons for external services Screen Expansion Adding dashboard widgets and page tabs API Using and exposing APIs in addons Admin Addon Creating administrator-level addons with institutional management"},{"location":"guides/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"guides/#\u5229\u7528\u53ef\u80fd\u306a\u30ac\u30a4\u30c9","title":"\u5229\u7528\u53ef\u80fd\u306a\u30ac\u30a4\u30c9","text":"\u30bf\u30a4\u30c8\u30eb \u8aac\u660e \u74b0\u5883 Docker Compose \u3068 2027 \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u3067\u306e\u958b\u767a\u74b0\u5883\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7 EC2 Amazon EC2 \u3078\u306e RDM \u30bb\u30c3\u30c8\u30a2\u30c3\u30d7 \u30b9\u30b1\u30eb\u30c8\u30f3 \u30b9\u30b1\u30eb\u30c8\u30f3\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u4f7f\u7528\u3057\u305f\u6700\u521d\u306e\u30a2\u30c9\u30aa\u30f3\u4f5c\u6210 \u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3 \u5916\u90e8\u30b5\u30fc\u30d3\u30b9\u7528\u306e\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u69cb\u7bc9 \u753b\u9762\u62e1\u5f35 \u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u3068\u30da\u30fc\u30b8\u30bf\u30d6\u306e\u8ffd\u52a0 API \u30a2\u30c9\u30aa\u30f3\u3067\u306e API \u306e\u4f7f\u7528\u3068\u516c\u958b \u7ba1\u7406\u8005\u30a2\u30c9\u30aa\u30f3 \u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u3092\u6301\u3064\u7ba1\u7406\u8005\u30ec\u30d9\u30eb\u306e\u30a2\u30c9\u30aa\u30f3\u4f5c\u6210"},{"location":"guides/admin-addon/","title":"Admin Addon Guide / \u7ba1\u7406\u8005\u30a2\u30c9\u30aa\u30f3\u30ac\u30a4\u30c9","text":"<p>Summary: Guide to creating administrator-level RDM addons with institutional management features \u6982\u8981: \u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u3092\u6301\u3064\u7ba1\u7406\u8005\u30ec\u30d9\u30eb\u306e RDM \u30a2\u30c9\u30aa\u30f3\u3092\u4f5c\u6210\u3059\u308b\u624b\u5f15\u304d</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05</li> <li>Normative for: <code>docs/guides/admin-addon/</code></li> <li>Related: SPEC-06 Documentation Conventions \u00b7 Skeleton Guide</li> </ul> <p></p>"},{"location":"guides/admin-addon/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"guides/admin-addon/#overview","title":"Overview","text":"<p>This guide shows how to create administrator-level RDM addons that include:</p> <ul> <li>Institutional management: Control addon availability per institution</li> <li>Admin Notes: Display special messages to users from administrators</li> </ul> <p>The administrator interface runs on a separate port (default 8001) and allows institutional administrators to manage addon settings.</p>"},{"location":"guides/admin-addon/#prerequisites","title":"Prerequisites","text":"<ul> <li>Basic understanding of Python, Django, and Django admin interface</li> <li>The development environment set up following the Environment Guide</li> <li>Completed the Skeleton Addon Guide and API Guide</li> </ul>"},{"location":"guides/admin-addon/#quick-start","title":"Quick start","text":"<ol> <li>Create your addon using the skeleton as a base</li> <li>Add institutional management features to your addon</li> <li>Create admin templates and JavaScript configurations</li> <li>Deploy with admin services (<code>admin</code>, <code>admin_assets</code>)</li> <li>Configure institutional administrators' access</li> </ol>"},{"location":"guides/admin-addon/#legacy-content","title":"Legacy content","text":"<p>The legacy admin addon instructions are kept verbatim in <code>README.legacy.md</code> for reference and will be rewritten per milestone.</p> <p></p>"},{"location":"guides/admin-addon/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"guides/admin-addon/#\u6982\u8981","title":"\u6982\u8981","text":"<p>\u3053\u306e\u30ac\u30a4\u30c9\u306f\u3001\u4ee5\u4e0b\u306e\u6a5f\u80fd\u3092\u6301\u3064\u7ba1\u7406\u8005\u30ec\u30d9\u30eb\u306e RDM \u30a2\u30c9\u30aa\u30f3\u3092\u4f5c\u6210\u3059\u308b\u65b9\u6cd5\u3092\u793a\u3057\u307e\u3059:</p> <ul> <li>\u6a5f\u95a2\u7ba1\u7406: \u6a5f\u95a2\u3054\u3068\u306b\u30a2\u30c9\u30aa\u30f3\u306e\u5229\u7528\u53ef\u5426\u3092\u5236\u5fa1</li> <li>\u7ba1\u7406\u8005\u30ce\u30fc\u30c8: \u7ba1\u7406\u8005\u304b\u3089\u30e6\u30fc\u30b6\u30fc\u306b\u7279\u5225\u306a\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u8868\u793a</li> </ul> <p>\u7ba1\u7406\u8005\u753b\u9762\u306f\u5225\u306e\u30dd\u30fc\u30c8\uff08\u30c7\u30d5\u30a9\u30eb\u30c8 8001\uff09\u3067\u5b9f\u884c\u3055\u308c\u3001\u6a5f\u95a2\u7ba1\u7406\u8005\u304c\u30a2\u30c9\u30aa\u30f3\u8a2d\u5b9a\u3092\u7ba1\u7406\u3067\u304d\u307e\u3059\u3002</p>"},{"location":"guides/admin-addon/#\u524d\u63d0\u6761\u4ef6","title":"\u524d\u63d0\u6761\u4ef6","text":"<ul> <li>Python, Django, Django \u7ba1\u7406\u753b\u9762\u306e\u57fa\u672c\u7684\u306a\u7406\u89e3</li> <li>\u74b0\u5883\u30ac\u30a4\u30c9\u306b\u5f93\u3063\u3066\u958b\u767a\u74b0\u5883\u3092\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3057\u3066\u3044\u308b\u3053\u3068</li> <li>\u30b9\u30b1\u30eb\u30c8\u30f3\u30a2\u30c9\u30aa\u30f3\u30ac\u30a4\u30c9\u3068 API \u30ac\u30a4\u30c9\u3092\u5b8c\u4e86\u3057\u3066\u3044\u308b\u3053\u3068</li> </ul>"},{"location":"guides/admin-addon/#\u30af\u30a4\u30c3\u30af\u30b9\u30bf\u30fc\u30c8","title":"\u30af\u30a4\u30c3\u30af\u30b9\u30bf\u30fc\u30c8","text":"<ol> <li>\u30b9\u30b1\u30eb\u30c8\u30f3\u3092\u30d9\u30fc\u30b9\u306b\u30a2\u30c9\u30aa\u30f3\u3092\u4f5c\u6210\u3059\u308b</li> <li>\u30a2\u30c9\u30aa\u30f3\u306b\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u3092\u8ffd\u52a0\u3059\u308b</li> <li>\u7ba1\u7406\u8005\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3068 JavaScript \u8a2d\u5b9a\u3092\u4f5c\u6210\u3059\u308b</li> <li>admin \u30b5\u30fc\u30d3\u30b9\uff08admin, admin_assets\uff09\u3067\u30c7\u30d7\u30ed\u30a4\u3059\u308b</li> <li>\u6a5f\u95a2\u7ba1\u7406\u8005\u306e\u30a2\u30af\u30bb\u30b9\u3092\u8a2d\u5b9a\u3059\u308b</li> </ol>"},{"location":"guides/admin-addon/#\u904e\u53bb\u306e\u30b3\u30f3\u30c6\u30f3\u30c4","title":"\u904e\u53bb\u306e\u30b3\u30f3\u30c6\u30f3\u30c4","text":"<p>\u904e\u53bb\u306e\u7ba1\u7406\u8005\u30a2\u30c9\u30aa\u30f3\u306e\u624b\u9806\u306f\u3001\u53c2\u8003\u306e\u305f\u3081\u306b <code>README.legacy.md</code> \u306b\u305d\u306e\u307e\u307e\u6b8b\u3057\u3066\u304a\u308a\u3001\u30de\u30a4\u30eb\u30b9\u30c8\u30fc\u30f3\u3054\u3068\u306b\u66f8\u304d\u76f4\u3059\u4e88\u5b9a\u3067\u3059\u3002</p>"},{"location":"guides/admin-addon/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Institutional management Controlling which addons are available to each institution. \u5404\u6a5f\u95a2\u306b\u5bfe\u3057\u3066\u3069\u306e\u30a2\u30c9\u30aa\u30f3\u3092\u5229\u7528\u53ef\u80fd\u306b\u3059\u308b\u304b\u3092\u5236\u5fa1\u3059\u308b\u3053\u3068\u3002 Admin interface A separate page where institutional administrators manage settings. \u6a5f\u95a2\u7ba1\u7406\u8005\u304c\u8a2d\u5b9a\u3092\u7ba1\u7406\u3059\u308b\u305f\u3081\u306e\u5225\u306e\u30da\u30fc\u30b8\u3002 Admin Notes Special messages that administrators can display to users. \u7ba1\u7406\u8005\u304c\u30e6\u30fc\u30b6\u30fc\u306b\u8868\u793a\u3067\u304d\u308b\u7279\u5225\u306a\u30e1\u30c3\u30bb\u30fc\u30b8\u3002 Institution An organization (like a university or company) that uses RDM. RDM \u3092\u4f7f\u7528\u3059\u308b\u7d44\u7e54\uff08\u5927\u5b66\u3084\u4f1a\u793e\u306a\u3069\uff09\u3002"},{"location":"guides/admin-addon/README.legacy/","title":"\u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306e\u5229\u7528","text":"<p>\u30e6\u30fc\u30b6\u306e\u6240\u5c5e\u6a5f\u95a2\u304c\u7ba1\u7406\u3067\u304d\u308b\u300c\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u300d\u306b\u304a\u3044\u3066\u3001\u30a2\u30c9\u30aa\u30f3\u306b\u95a2\u3059\u308b\u6a5f\u80fd(RDM Addon)\u306b\u3064\u3044\u3066\u8aac\u660e\u3057\u307e\u3059\u3002</p> <p>\u5177\u4f53\u7684\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u65b9\u6cd5\u3092\u8aac\u660e\u3057\u307e\u3059\u3002</p> <ul> <li>\u30a2\u30c9\u30aa\u30f3\u306b\u5171\u901a\u3059\u308b\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u3092\u3001\u65b0\u3057\u304f\u8ffd\u52a0\u3057\u305f\u30a2\u30c9\u30aa\u30f3\u3067\u5229\u7528\u3067\u304d\u308b\u3088\u3046\u306b\u3059\u308b\u65b9\u6cd5 (\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306e\u5bfe\u5fdc)</li> <li>\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306b\u65b0\u3057\u3044\u6a5f\u80fd\u3092\u8ffd\u52a0\u3059\u308b\u65b9\u6cd5 (Admin Notes\u306e\u5b9f\u88c5)</li> </ul> <p>\u3059\u3079\u3066\u306e\u30a2\u30c9\u30aa\u30f3\u306b\u5171\u901a\u3059\u308b\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306f\u3001\u73fe\u5728(2021\u5e742\u6708\u57f7\u7b46\u6642\u70b9)\u3001\u30a2\u30c9\u30aa\u30f3\u306e\u7121\u52b9\u5316\u6a5f\u80fd\u306e\u307f\u3067\u3059\u3002\u6a5f\u95a2\u3054\u3068\u306b\u3001\u6307\u5b9a\u3057\u305f\u30a2\u30c9\u30aa\u30f3\u3092\u7121\u52b9\u306b\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u7121\u52b9\u306a\u30a2\u30c9\u30aa\u30f3\u306f\u3001\u30e6\u30fc\u30b6\u30fc\u3084\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30a2\u30c9\u30aa\u30f3\u8a2d\u5b9a\u753b\u9762\u306b\u8868\u793a\u3055\u308c\u306a\u304f\u306a\u308a\u3001\u5229\u7528\u3082\u3067\u304d\u306a\u304f\u306a\u308a\u307e\u3059\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#\u524d\u63d0\u6761\u4ef6","title":"\u524d\u63d0\u6761\u4ef6","text":"<p>\u958b\u767a\u74b0\u5883\u306e\u6e96\u5099 \u306e\u30ac\u30a4\u30c9\u306b\u5f93\u3044\u3001\u958b\u767a\u74b0\u5883\u306b\u3066RDM\u3092\u8d77\u52d5\u3057\u3066\u3044\u308b\u3082\u306e\u3068\u3057\u307e\u3059\u3002</p> <p>\u672c\u30ac\u30a4\u30c9\u3067\u306f\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u3092\u5229\u7528\u3059\u308b\u305f\u3081\u3001<code>admin</code> \u3068 <code>admin_assets</code> \u30b5\u30fc\u30d3\u30b9\u3082\u8d77\u52d5\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p>\u52d5\u4f5c\u78ba\u8a8d\u306e\u305f\u3081\u306e\u30e6\u30fc\u30b6\u306f\u3001 \u958b\u767a\u74b0\u5883\u306e\u6e96\u5099#\u30e6\u30fc\u30b6\u3092\u6a5f\u95a2\u306b\u6240\u5c5e\u3055\u305b\u308b \u304a\u3088\u3073 \u958b\u767a\u74b0\u5883\u306e\u6e96\u5099#admin\u30a2\u30af\u30bb\u30b9\u53ef\u80fd\u306a\u30e6\u30fc\u30b6\u3078\u3068\u5909\u66f4\u3059\u308b \u306e\u30ac\u30a4\u30c9\u306b\u5f93\u3044\u3001\u4f55\u304b\u3057\u3089\u306e\u6a5f\u95a2\u306b\u6240\u5c5e\u3057\u3001\u305d\u306e\u6a5f\u95a2\u306e\u6a5f\u95a2\u7ba1\u7406\u8005\u3067\u3042\u308b\u3068\u3057\u307e\u3059\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#\u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306e\u8a2d\u8a08","title":"\u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306e\u8a2d\u8a08","text":""},{"location":"guides/admin-addon/README.legacy/#\u30d5\u30a1\u30a4\u30eb\u306e\u69cb\u6210","title":"\u30d5\u30a1\u30a4\u30eb\u306e\u69cb\u6210","text":"<p>\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u3082\u30a2\u30c9\u30aa\u30f3\u3068\u540c\u69d8\u306bDjango\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u5f62\u5f0f\u3067\u8a18\u8ff0\u3055\u308c\u307e\u3059\u3002\u305f\u3060\u3057\u3001OSF.io\u672c\u4f53\u3084\u30a2\u30c9\u30aa\u30f3\u3068\u306f\u82e5\u5e72\u4e2d\u8eab\u304c\u7570\u306a\u308a\u307e\u3059\u3002</p> <p>\u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd(RDM Addon)\u306e\u57fa\u672c\u7684\u306a\u30d5\u30a1\u30a4\u30eb\u914d\u7f6e\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u306a\u308a\u307e\u3059(Force to use\u306b\u95a2\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u306f\u8a18\u8f09\u3057\u3066\u3044\u307e\u305b\u3093)\u3002</p> <pre><code>/admin/\n\u251c\u2500\u2500 rdm_addons ... \u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\n\u2502 \u251c\u2500\u2500 api_v1 ... API\u30e2\u30b8\u30e5\u30fc\u30eb\n\u2502 \u2502 \u251c\u2500\u2500 __init__.py ... \u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9a\u7fa9\n\u2502 \u2502 \u251c\u2500\u2500 urls.py ... API\u306eView\u306e\u30eb\u30fc\u30c6\u30a3\u30f3\u30b0\u5b9a\u7fa9\n\u2502 \u2502 \u2514\u2500\u2500 views.py ... API\u306eView\u306e\u5b9a\u7fa9\n\u2502 \u251c\u2500\u2500 __init__.py ... \u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9a\u7fa9\n\u2502 \u251c\u2500\u2500 decorators.py ... \u30c7\u30b3\u30ec\u30fc\u30bf\u30fc\u306e\u5b9a\u7fa9\n\u2502 \u251c\u2500\u2500 urls.py ... View\u306e\u30eb\u30fc\u30c6\u30a3\u30f3\u30b0\u5b9a\u7fa9\n\u2502 \u251c\u2500\u2500 utils.py ... \u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u95a2\u6570\u306e\u5b9a\u7fa9\n\u2502 \u2514\u2500\u2500 views.py ... View\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 static ... Web\u30d6\u30e9\u30a6\u30b6\u304b\u3089\u8aad\u307f\u8fbc\u3080\u3053\u3068\u3092\u60f3\u5b9a\u3057\u305f\u9759\u7684\u30d5\u30a1\u30a4\u30eb\n\u2502 \u251c\u2500\u2500 css/rdm_addons.css ... \u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u8a2d\u5b9a\u306eCSS\u30d5\u30a1\u30a4\u30eb\n\u2502 \u2514\u2500\u2500 rdm_addons ... \u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u8a2d\u5b9a\u306eJavaScript\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\n\u2502 \u251c\u2500\u2500 \u30a2\u30c9\u30aa\u30f3\u540d ...\u30a2\u30c9\u30aa\u30f3\u3054\u3068\u306eJavaScript\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\n\u2502 \u2502 \u251c\u2500\u2500 \u30a2\u30c9\u30aa\u30f3\u540dRdmConfig.js ... \u30a2\u30c9\u30aa\u30f3\u3054\u3068\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u8a2d\u5b9a\u306e\u5b9a\u7fa9\n\u2502 \u2502 \u2514\u2500\u2500 rdm-cfg.js ... \u30a2\u30c9\u30aa\u30f3\u3054\u3068\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u8a2d\u5b9a\u306e\u30a8\u30f3\u30c8\u30ea\u3068\u306a\u308bJavaScript\u30d5\u30a1\u30a4\u30eb\n\u2502 \u251c\u2500\u2500 rdm-addons-page.js ... \u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u8a2d\u5b9a\u306e\u30a8\u30f3\u30c8\u30ea\u3068\u306a\u308bJavaScript\u30d5\u30a1\u30a4\u30eb\n\u2502 \u2514\u2500\u2500 rdmAddonSettings.js ... \u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u8a2d\u5b9a\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 templates ... \u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\n\u2502 \u2514\u2500\u2500 rdm_addons ... \u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u8a2d\u5b9a\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\n\u2502 \u251c\u2500\u2500 addons ... \u30a2\u30c9\u30aa\u30f3\u3054\u3068\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\n\u2502 \u2502 \u2514\u2500\u2500 \u30a2\u30c9\u30aa\u30f3\u540d_institution_settings.html ... \u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u8a2d\u5b9a\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\n\u2502 \u251c\u2500\u2500 addon_list.html ... \u30a2\u30c9\u30aa\u30f3\u4e00\u89a7\u753b\u9762\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\n\u2502 \u2514\u2500\u2500 institution_list.html ... \u6a5f\u95a2\u4e00\u89a7\u753b\u9762\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\n\u2514\u2500\u2500 translations ... \u56fd\u969b\u5316\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\n \u251c\u2500\u2500 en/LC_MESSAGES ... \u82f1\u8a9e\u306e\u56fd\u969b\u5316\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\n \u2502 \u2514\u2500\u2500 django.po ... \u6a5f\u95a2\u7ba1\u7406\u753b\u9762\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u56fd\u969b\u5316\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\n \u251c\u2500\u2500 ja/LC_MESSAGES ... \u65e5\u672c\u8a9e\u306e\u56fd\u969b\u5316\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\n \u2502 \u2514\u2500\u2500 django.po ... \u6a5f\u95a2\u7ba1\u7406\u753b\u9762\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u56fd\u969b\u5316\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\n \u2514\u2500\u2500 django.pot ... \u6a5f\u95a2\u7ba1\u7406\u753b\u9762\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u56fd\u969b\u5316\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\n</code></pre> <p>\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306e\u30e2\u30c7\u30eb\u5b9a\u7fa9\u306f <code>/osf/models/</code> \u4ee5\u4e0b\u306b\u7f6e\u304d\u307e\u3059\u3002</p> <pre><code>/osf/models/\n\u2514\u2500\u2500 rdm_addons.py ... \u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u8a2d\u5b9a\u306e\u30e2\u30c7\u30eb\u5b9a\u7fa9\n</code></pre> <p>JavaScript\u3067\u4f7f\u3046\u56fd\u969b\u5316\u8a2d\u5b9a\u306f <code>/website/translations/</code> \u4ee5\u4e0b\u306e\u30d5\u30a1\u30a4\u30eb\u306b\u8a18\u8ff0\u3057\u307e\u3059\u3002</p> <pre><code>/website/translations/\n\u251c\u2500\u2500 en/LC_MESSAGES ... \u82f1\u8a9e\u306e\u56fd\u969b\u5316\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\n\u2502 \u2514\u2500\u2500 js_messages.po ... \u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306eJavaScript\u3067\u4f7f\u3046\u56fd\u969b\u5316\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\n\u251c\u2500\u2500 ja/LC_MESSAGES ... \u65e5\u672c\u8a9e\u306e\u56fd\u969b\u5316\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\n\u2502 \u2514\u2500\u2500 js_messages.po ... \u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306eJavaScript\u3067\u4f7f\u3046\u56fd\u969b\u5316\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\n\u2514\u2500\u2500 js_messages.pot ... \u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306eJavaScript\u3067\u4f7f\u3046\u56fd\u969b\u5316\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\n</code></pre> <p>\u30c6\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u306f <code>/admin_tests/</code> \u4ee5\u4e0b\u306b\u7f6e\u304d\u307e\u3059\u3002</p> <pre><code>/admin_tests/\n\u2514\u2500\u2500 rdm_addons ... \u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u8a2d\u5b9a\u306e\u30c6\u30b9\u30c8\n \u251c\u2500\u2500 api_v1\n \u2502 \u251c\u2500\u2500 __init__.py\n \u2502 \u2514\u2500\u2500 test_views.py\n \u251c\u2500\u2500 __init__.py\n \u251c\u2500\u2500 factories.py\n \u2514\u2500\u2500 test_views.py\n</code></pre>"},{"location":"guides/admin-addon/README.legacy/#\u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u69cb\u6210","title":"\u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u69cb\u6210","text":"<p>\u30a2\u30c9\u30aa\u30f3\u3068\u540c\u69d8\u3001Django\u306e\u4f5c\u6cd5\u306b\u5f93\u3044\u3001Model-View\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3\u306b\u3088\u308a\u5b9f\u88c5\u3057\u307e\u3059\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#model\u306e\u69cb\u6210","title":"Model\u306e\u69cb\u6210","text":"<p>\u6a5f\u95a2\u3054\u3068\u306e\u30a2\u30c9\u30aa\u30f3\u306e\u8a2d\u5b9a\u3092\u4fdd\u6301\u3059\u308b <code>RdmAddonOption</code> \u30e2\u30c7\u30eb\u304a\u3088\u3073 <code>RdmAddonNoInstitutionOption</code> \u30e2\u30c7\u30eb\u304c osf/models/rdm_addons.py \u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u8a2d\u5b9a\u9805\u76ee\u3092\u8ffd\u52a0\u3059\u308b\u5834\u5408\u306f\u3001\u3053\u308c\u3089\u30e2\u30c7\u30eb\u3092\u5909\u66f4\u3057\u307e\u3059\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#view\u306e\u69cb\u6210","title":"View\u306e\u69cb\u6210","text":"<p>View\u306e\u5b9a\u7fa9\u65b9\u6cd5\u306f\u30a2\u30c9\u30aa\u30f3\u3068\u7570\u306a\u3063\u3066\u3044\u308b\u3088\u3046\u306b\u898b\u3048\u307e\u3059\u304c\u3001\u57fa\u672c\u7684\u306a\u8003\u3048\u65b9\u306f\u540c\u3058\u3067\u3059\u3002</p> <p>\u30eb\u30fc\u30c6\u30a3\u30f3\u30b0(\u30a2\u30c9\u30aa\u30f3\u306b\u304a\u3051\u308b<code>routes.py</code>)\u306f admin/rdm_addons/urls.py \u306b\u5b9a\u7fa9\u3057\u3001\u5404View\u51e6\u7406\u306f admin/rdm_addons/views.py \u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <p>API\u306b\u95a2\u3059\u308bView\u5b9a\u7fa9\u306f\u3001 admin/rdm_addons/api_v1/urls.py \u3068 admin/rdm_addons/api_v1/views.py \u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u308bview","title":"\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u308bView","text":"<p>HTML\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3068JavaScript\u306e\u5b9a\u7fa9\u65b9\u6cd5\u3084\u3001\u5229\u7528\u3067\u304d\u308b\u30e9\u30a4\u30d6\u30e9\u30ea\u306f\u3001\u30a2\u30c9\u30aa\u30f3\u3068\u4f3c\u3066\u3044\u307e\u3059\u3002</p> <p>HTML\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u306f admin/templates/rdm_addons/ \u4ee5\u4e0b\u306b\u914d\u7f6e\u3057\u307e\u3059\u3002\u62e1\u5f35\u5b50\u304c<code>.html</code>\u3067\u3059\u304c\u3001\u30a2\u30c9\u30aa\u30f3\u3068\u540c\u69d8\u306b\u3001\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u8a00\u8a9e mako \u3067\u8a18\u8ff0\u3057\u307e\u3059\u3002 \u5404\u30a2\u30c9\u30aa\u30f3\u306b\u95a2\u3059\u308b\u8a2d\u5b9a\u753b\u9762\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u306f\u3001\u30c7\u30d5\u30a9\u30eb\u30c8\u3067 admin/templates/rdm_addons/addons/institution_settings_default.html \u304c\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002\u500b\u5225\u306b\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u6307\u5b9a\u3059\u308b\u65b9\u6cd5\u306f #UI \u306e\u8ffd\u52a0 \u3067\u8aac\u660e\u3057\u307e\u3059\u3002</p> <p>\u5404\u753b\u9762\u3067\u8aad\u307f\u8fbc\u3080JavaScript\u30d5\u30a1\u30a4\u30eb\u306f admin/static/js/rdm_addons/ \u4ee5\u4e0b\u306b\u914d\u7f6e\u3057\u307e\u3059\u3002\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u52d5\u7684\u306b\u64cd\u4f5c\u3059\u308b\u305f\u3081\u306eJavaScript\u306e\u30e9\u30a4\u30d6\u30e9\u30ea\u306b\u306f Knockout.js \u3092\u5229\u7528\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 \u30a2\u30c9\u30aa\u30f3\u3068\u9055\u3044\u3001\u8ffd\u52a0\u3057\u305f\u30a8\u30f3\u30c8\u30ea\u30fc\u30d5\u30a1\u30a4\u30eb\u306f admin/webpack.admin.config.js \u306e <code>entry</code> \u30d7\u30ed\u30d1\u30c6\u30a3\u306b\u8ffd\u52a0\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u3053\u3068\u306b\u6ce8\u610f\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u8a2d\u5b9a\u65b9\u6cd5\u306f #UI \u306e\u8ffd\u52a0 \u3067\u8aac\u660e\u3057\u307e\u3059\u3002</p> <p>\u5404\u753b\u9762\u306b\u95a2\u3059\u308b\u30b9\u30bf\u30a4\u30eb\u5b9a\u7fa9\u306f admin/static/css/rdm_addons.css \u306b\u307e\u3068\u3081\u3066\u8a18\u8ff0\u3057\u307e\u3059\u3002</p> <p>\u6a5f\u95a2\u7ba1\u7406\u8005\u753b\u9762\u3067\u306f\u3001ember-osf-web\u3067\u5229\u7528\u3067\u304d\u308b\u3088\u3046\u306aUI Component\u306f\u63d0\u4f9b\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u304c\u3001 Bootstrap3 \u306eCSS\u3084\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u3092\u5229\u7528\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9","title":"\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9","text":"<p>\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9\u306f admin_tests/rdm_addons \u4ee5\u4e0b\u306b\u4f5c\u6210\u3057\u307e\u3059\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#migrations\u5b9a\u7fa9","title":"Migrations\u5b9a\u7fa9","text":"<p>Migrations\u30d5\u30a1\u30a4\u30eb\u306f osf/migrations \u4ee5\u4e0b\u306b\u4f5c\u6210\u3055\u308c\u307e\u3059\u3002Migrations\u30d5\u30a1\u30a4\u30eb\u306e\u69cb\u9020\u306f\u30a2\u30c9\u30aa\u30f3\u3068\u540c\u69d8\u3067\u3059\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#\u56fd\u969b\u5316","title":"\u56fd\u969b\u5316","text":"<p>HTML\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3067\u4f7f\u3046\u56fd\u969b\u5316\u8a2d\u5b9a\u306f admin/translations/ \u4ee5\u4e0b\u306e <code>django.pot</code> \u304a\u3088\u3073 <code>django.po</code> \u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <p>JavaScript\u3067\u4f7f\u3046\u56fd\u969b\u5316\u8a2d\u5b9a\u306f website/translations/ \u4ee5\u4e0b\u306e <code>js_messages.pot</code> \u304a\u3088\u3073 <code>js_messages.po</code> \u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <p>\u5b9a\u7fa9\u65b9\u6cd5\u3084\u4f7f\u3044\u65b9\u306f\u3001 ScreenExpansion#\u56fd\u969b\u5316 \u3067\u8aac\u660e\u3057\u3066\u3044\u307e\u3059\u3002HTML\u30d5\u30a1\u30a4\u30eb\u5185\u3067\u6587\u5b57\u5217\u3092\u56fd\u969b\u5316\u3059\u308b\u65b9\u6cd5\u306f\u3001mako\u3068\u540c\u69d8\u3067\u3059\u3002</p> <p>JavaScript\u3060\u3051\u3001<code>website/translations/</code> \u4ee5\u4e0b\u306e\u30d5\u30a1\u30a4\u30eb\u306b\u5b9a\u7fa9\u3059\u308b\u3053\u3068\u306b\u6c17\u3092\u3064\u3051\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#\u30b9\u30b1\u30eb\u30c8\u30f3-\u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306e\u5bfe\u5fdc","title":"\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306e\u5bfe\u5fdc","text":"<p><code>myskelton</code> \u3068\u3044\u3046\u8b58\u5225\u540d\u306e\u30a2\u30c9\u30aa\u30f3\u3092\u3001\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u3067\u7ba1\u7406\u3059\u308b\u305f\u3081\u306e\u5b9f\u88c5\u3092\u4f8b\u306b\u8aac\u660e\u3057\u307e\u3059\u3002</p> <p>\u30b9\u30b1\u30eb\u30c8\u30f3\u306e\u4f5c\u6210#\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306e\u5b9f\u88c5 \u306b\u5f93\u3044\u3001\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306e\u5b9f\u88c5\u304c\u5b8c\u4e86\u3057\u3066\u3044\u308b\u3053\u3068\u3092\u524d\u63d0\u3068\u3057\u307e\u3059\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#addonsmyskelton-\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5909\u66f4","title":"addons.myskelton \u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5909\u66f4","text":"<p>\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u3001\u3053\u306e\u5909\u66f4\u306f\u4e0d\u8981\u3067\u3059\u3002</p> <p>\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u3067\u7ba1\u7406\u3059\u308b\u30a2\u30c9\u30aa\u30f3\u306f\u3001<code>AppConfig.config</code> \u306b <code>accounts</code> \u304c\u542b\u307e\u308c\u3066\u3044\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 <code>AppConfig.config</code> \u306b <code>accounts</code> \u304c\u542b\u307e\u308c\u3066\u3044\u308b\u30a2\u30c9\u30aa\u30f3\u306f\u3001\u30e6\u30fc\u30b6\u306e\u30a2\u30c9\u30aa\u30f3\u30a2\u30ab\u30a6\u30f3\u30c8\u69cb\u6210\u753b\u9762\u306b\u8868\u793a\u3055\u308c\u3001\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306fOAuth\u306e\u8a8d\u8a3c\u8a2d\u5b9aUI\u3092\u542b\u3080\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u304c\u53c2\u7167\u3055\u308c\u307e\u3059\u3002\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306f\u8a8d\u8a3c\u8a2d\u5b9a\u304c\u4e0d\u8981\u306a\u306e\u3067\u3001\u30a2\u30c9\u30aa\u30f3\u540d\u3092\u8868\u793a\u3059\u308b\u3060\u3051\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u5b9a\u7fa9\u3057\u3066\u3001\u305d\u308c\u3092\u53c2\u7167\u3059\u308b\u3088\u3046\u306b\u3057\u307e\u3059\u3002</p> <p>\u307e\u305a\u306f user_settings.mako \u3092 <code>addons/myskelton/templates/user_settings.mako</code> \u306b\u3001user-cfg.js \u3092 <code>addons/myskelton/static/user-cfg.js</code> \u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002</p> <p>\u6b21\u306b\u3001<code>addons/myskelton/apps.py</code> \u3092\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5909\u66f4\u3057\u307e\u3059\u3002 \u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb apps.py \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <pre><code>class AddonAppConfig(BaseAddonAppConfig):\n\n- configs = ['node']\n+ configs = ['node', 'accounts']\n\n node_settings_template = os.path.join(TEMPLATE_PATH, 'node_settings.mako')\n+ user_settings_template = os.path.join(TEMPLATE_PATH, 'user_settings.mako')\n\n # \u4ed6\u5909\u66f4\u306a\u3057\n</code></pre>"},{"location":"guides/admin-addon/README.legacy/#rdm\u30b3\u30fc\u30c9\u306e\u5909\u66f4","title":"RDM\u30b3\u30fc\u30c9\u306e\u5909\u66f4","text":""},{"location":"guides/admin-addon/README.legacy/#adminbasesettingsdefaultspy-\u3078\u306e\u8ffd\u52a0","title":"admin/base/settings/defaults.py \u3078\u306e\u8ffd\u52a0","text":"<p>admin/base/settings/defaults.py \u306e <code>INSTALLED_APPS</code> \u306b\u30a2\u30c9\u30aa\u30f3\u540d\u3092\u3001<code>MIGRATION_MODULES</code> \u306b\u30ad\u30fc\u304c\u30a2\u30c9\u30aa\u30f3\u540d\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <p><code>INSTALLED_APPS</code> \u306b\u8ffd\u52a0\u3059\u308b\u5024\u306f <code>addons.\u30a2\u30c9\u30aa\u30f3\u540d</code> \u3067\u3059\u304c\u3001<code>MIGRATION_MODULES</code> \u306b\u8ffd\u52a0\u3059\u308b\u30ad\u30fc\u540d\u306f <code>addons_\u30a2\u30c9\u30aa\u30f3\u540d</code> \u3067\u3059\u3002<code>.</code> \u3068 <code>_</code> \u306e\u9055\u3044\u306b\u6ce8\u610f\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p>\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306f\u3001Force to use\u3068\u3044\u3046\u3001\u6a5f\u95a2\u306b\u5c5e\u3059\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u30a2\u30c9\u30aa\u30f3\u3092\u5f37\u5236\u7684\u306b\u6709\u52b9\u306b\u3059\u308b\u6a5f\u80fd\u304c\u5229\u7528\u3067\u304d\u307e\u3059\u3002\u3057\u304b\u3057\u3001\u3053\u306e\u6a5f\u80fd\u3092\u5229\u7528\u3059\u308b\u305f\u3081\u306b\u306f\u3001\u8a8d\u8a3c\u60c5\u5831\u3092\u4fdd\u5b58\u3059\u308b\u305f\u3081\u306e\u4ed5\u7d44\u307f\u3092\u30a2\u30c9\u30aa\u30f3\u306b\u5b9f\u88c5\u3057\u3066\u304a\u304f\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306f\u8a8d\u8a3c\u60c5\u5831\u3092\u6301\u305f\u306a\u3044\u305f\u3081\u3001<code>UNSUPPORTED_FORCE_TO_USE_ADDONS</code> \u306b\u30a2\u30c9\u30aa\u30f3\u540d\u3092\u8ffd\u52a0\u3057\u3001\u3053\u306e\u6a5f\u80fd\u3092\u7121\u52b9\u306b\u3057\u307e\u3059\u3002</p> <p>\u5b9f\u88c5\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb defaults.py \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#\u30b9\u30b1\u30eb\u30c8\u30f3-\u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306e\u52d5\u4f5c\u78ba\u8a8d","title":"\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306e\u52d5\u4f5c\u78ba\u8a8d","text":"<p>\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u3092\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u3067\u7ba1\u7406\u3057\u3066\u307f\u307e\u3057\u3087\u3046\u3002</p> <p>\u5909\u66f4\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306b\u95a2\u9023\u3059\u308b\u30b5\u30fc\u30d3\u30b9\u3092\u518d\u8d77\u52d5\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose restart web api assets admin\n</code></pre> <p>\u3053\u308c\u3067\u30b5\u30fc\u30d3\u30b9\u3078\u306e\u53cd\u6620\u306f\u5b8c\u4e86\u3067\u3059\u3002\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u3067\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306e\u8a2d\u5b9a\u3092\u5909\u66f4\u3067\u304d\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3059\u308b\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u64cd\u4f5c\u3092\u5b9f\u65bd\u3057\u307e\u3059\u3002</p> <ol> <li>RDM Web UI\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b <code>http://localhost:5000</code></li> <li>\u300c\u30a2\u30c9\u30aa\u30f3\u30a2\u30ab\u30a6\u30f3\u30c8\u69cb\u6210\u300d\u30da\u30fc\u30b8\u3092\u958b\u304f\u3002</li> <li>My Skelton\u30a2\u30c9\u30aa\u30f3\u304c\u8868\u793a\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3059\u308b\u3002 </li> <li>\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306eWeb UI\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b <code>http://localhost:8001</code></li> <li>RDM Addons\u30da\u30fc\u30b8\u3092\u958b\u304f\u3002</li> <li>\u81ea\u5206\u306e\u6240\u5c5e\u6a5f\u95a2\u306e\u30da\u30fc\u30b8\u3092\u958b\u304f\u3002</li> <li>My Skelton\u30a2\u30c9\u30aa\u30f3\u306e\u5de6\u306e\u30c1\u30a7\u30c3\u30af\u30dc\u30c3\u30af\u30b9\u3092\u5916\u3057\u3001\u30a2\u30c9\u30aa\u30f3\u3092\u7121\u52b9\u5316\u3059\u308b\u3002 </li> <li>\u518d\u5ea6\u3001RDM Web UI\u3067\u300c\u30a2\u30c9\u30aa\u30f3\u30a2\u30ab\u30a6\u30f3\u30c8\u69cb\u6210\u300d\u30da\u30fc\u30b8\u3092\u958b\u304f\u3002</li> <li>My Skelton\u30a2\u30c9\u30aa\u30f3\u304c\u8868\u793a\u3055\u308c\u3066\u3044\u306a\u3044\u3053\u3068\u3092\u78ba\u8a8d\u3059\u308b\u3002</li> </ol> <p>\u4ee5\u4e0a\u3067\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306e\u52d5\u4f5c\u78ba\u8a8d\u306f\u5b8c\u4e86\u3067\u3059\uff01</p>"},{"location":"guides/admin-addon/README.legacy/#admin-notes\u306e\u5b9f\u88c5","title":"Admin Notes\u306e\u5b9f\u88c5","text":"<p>\u3053\u3053\u3067\u306f\u3001\u6a5f\u95a2\u7ba1\u7406\u8005\u304c\u3001\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306b\u95a2\u3059\u308b\u30e6\u30fc\u30b6\u3078\u306e\u6ce8\u610f\u66f8\u304d\u3092\u8a2d\u5b9a\u3067\u304d\u308b Admin Notes \u3068\u3044\u3046\u6a5f\u80fd\u306e\u5b9f\u88c5\u3092\u4f8b\u306b\u8aac\u660e\u3057\u307e\u3059\u3002</p> <p>\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306e\u5bfe\u5fdc \u304c\u5b8c\u4e86\u3057\u3066\u3044\u308b\u3053\u3068\u3092\u524d\u63d0\u3068\u3057\u307e\u3059\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#rdm\u30b3\u30fc\u30c9\u306e\u5909\u66f4_1","title":"RDM\u30b3\u30fc\u30c9\u306e\u5909\u66f4","text":""},{"location":"guides/admin-addon/README.legacy/#rdmaddonoption-\u30e2\u30c7\u30eb\u306e\u5909\u66f4","title":"RdmAddonOption \u30e2\u30c7\u30eb\u306e\u5909\u66f4","text":"<p>osf/models/rdm_addons.py \u306e <code>RdmAddonOption</code> \u30e2\u30c7\u30eb\u304a\u3088\u3073 <code>RdmAddonNoInstitutionOption</code> \u30e2\u30c7\u30eb\u306b\u3001Admin Notes\u306e\u5185\u5bb9\u3092\u4fdd\u5b58\u3059\u308b <code>admin_notes</code> \u30ab\u30e9\u30e0\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002 \u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb rdm_addons.py \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#api\u306e\u8ffd\u52a0","title":"API\u306e\u8ffd\u52a0","text":"<p>Admin Notes\u3092\u53d6\u5f97\u30fb\u8a2d\u5b9a\u3059\u308b\u305f\u3081\u306eAPI\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <p>admin/rdm_addons/api_v1/views.py \u306b <code>AdminNotesView</code> \u30af\u30e9\u30b9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002 \u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb views.py \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p>admin/rdm_addons/api_v1/urls.py \u306b <code>AdminNotesView</code> \u3078\u306e\u30eb\u30fc\u30c6\u30a3\u30f3\u30b0\u8a2d\u5b9a\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002 \u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb urls.py \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#ui\u306e\u8ffd\u52a0","title":"UI\u306e\u8ffd\u52a0","text":"<p>Admin Notes\u3092\u8a2d\u5b9a\u3059\u308b\u305f\u3081\u306eUI\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002 \u4eca\u56de\u306f\u3001\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306b\u5bfe\u3057\u3066\u306e\u307fAdmin Notes\u3092\u8a2d\u5b9a\u3067\u304d\u308b\u3088\u3046\u306b\u3001\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u7528\u306e\u8a2d\u5b9aUI\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002</p> <p>\u4ee5\u4e0b\u306b\u5f93\u3063\u3066\u3001\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u3068JavaScript\u30d5\u30a1\u30a4\u30eb\u3092\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002</p> <ul> <li>myskelton_institution_settings.html \u3092 <code>admin/templates/rdm_addons/addons/myskelton_institution_settings.html</code> \u306b\u30b3\u30d4\u30fc\u3059\u308b\u3002</li> <li>myskeltonRdmConfig.js \u3092 <code>admin/static/js/rdm_addons/myskelton/myskeltonRdmConfig.js</code> \u306b\u30b3\u30d4\u30fc\u3059\u308b\u3002</li> <li>rdm-cfg.js \u3092 <code>admin/static/js/rdm_addons/myskelton/rdm-cfg.js</code> \u306b\u30b3\u30d4\u30fc\u3059\u308b\u3002</li> </ul> <p>\u4f5c\u6210\u3057\u305f\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u3080\u3088\u3046\u306b\u3001 admin/rdm_addons/utils.py \u306e <code>get_institusion_settings_template()</code> \u95a2\u6570\u306e\u4e00\u90e8\u3092\u5909\u66f4\u3057\u307e\u3059\u3002 \u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb utils.py \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p>\u4f5c\u6210\u3057\u305fJavaScript\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u3080\u3088\u3046\u306b\u3001 admin/webpack.admin.config.js \u306e <code>entry</code> \u306b <code>rdm-myskelton-cfg</code> \u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002 \u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb webpack.admin.config.js \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p>\u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fdUI\u3067\u8aad\u307f\u8fbc\u307e\u308c\u308bCSS\u30d5\u30a1\u30a4\u30eb admin/static/css/rdm_addons.css \u306b\u3001Admin Notes\u306b\u95a2\u3059\u308bCSS\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002 \u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb rdm_addons.css \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#addonsmyskelton-\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5909\u66f4_1","title":"addons.myskelton \u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5909\u66f4","text":"<p>Admin Notes\u306e\u5185\u5bb9\u3092\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u300c\u30a2\u30c9\u30aa\u30f3\u3092\u69cb\u6210\u300d\u30da\u30fc\u30b8\u306b\u8868\u793a\u3059\u308b\u305f\u3081\u306e\u5909\u66f4\u3092\u52a0\u3048\u307e\u3059\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#api\u306e\u8ffd\u52a0_1","title":"API\u306e\u8ffd\u52a0","text":"<p>Admin Notes\u3092\u53d6\u5f97\u3059\u308b\u305f\u3081\u306eAPI\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <p><code>addons/myskelton/views.py</code> \u306b <code>myskelton_get_admin_notes</code> \u95a2\u6570\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002 \u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb views.py \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p><code>addons/myskelton/routes.py</code> \u306b <code>myskelton_get_admin_notes</code> \u3078\u306e\u30eb\u30fc\u30c6\u30a3\u30f3\u30b0\u8a2d\u5b9a\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002 \u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb routes.py \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#ui\u306e\u8ffd\u52a0_1","title":"UI\u306e\u8ffd\u52a0","text":"<p>Admin Notes\u3092\u8868\u793a\u3059\u308b\u305f\u3081\u306eUI\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <p><code>addons/myskelton/templates/node_settings.mako</code> \u306bAdmin Notes\u3092\u8868\u793a\u3059\u308b\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002 \u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb node_settings.mako \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p><code>addons/myskelton/static/node-cfg.js</code> \u306bAdmin Notes\u3092\u8aad\u307f\u8fbc\u3080\u95a2\u6570\u3068Admin Notes\u306e\u5185\u5bb9\u3092\u4fdd\u6301\u3059\u308b\u5909\u6570\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002 \u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb node-cfg.js \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#\u56fd\u969b\u5316_1","title":"\u56fd\u969b\u5316","text":"<p>website/translations/ \u4ee5\u4e0b\u306e\u30d5\u30a1\u30a4\u30eb <code>js_messages.*</code> \u306e\u672b\u5c3e\u306b\u3001Admin Notes\u306b\u95a2\u3059\u308b\u56fd\u969b\u5316\u8a2d\u5b9a\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002 \u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb website/translations/ \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p>admin/translations/ \u4ee5\u4e0b\u306e\u5404\u30d5\u30a1\u30a4\u30eb\u306e\u672b\u5c3e\u306b\u3001Admin Notes\u306b\u95a2\u3059\u308b\u56fd\u969b\u5316\u8a2d\u5b9a\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002 \u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb admin/translations/ \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#\u30c6\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4","title":"\u30c6\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4","text":""},{"location":"guides/admin-addon/README.legacy/#admin_testsrdm_addonsapi_v1test_viewspy-\u306e\u5909\u66f4","title":"admin_tests/rdm_addons/api_v1/test_views.py \u306e\u5909\u66f4","text":"<p>\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306b\u8ffd\u52a0\u3057\u305fAPI\u306e\u30c6\u30b9\u30c8\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <p>admin_tests/rdm_addons/api_v1/test_views.py \u306b\u3001Admin Notes\u53d6\u5f97\u30fb\u8a2d\u5b9aAPI\u3092\u30c6\u30b9\u30c8\u3059\u308b <code>TestAdminNotesView</code> \u30af\u30e9\u30b9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002 \u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb test_views.py \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#addonsmyskeltonteststest_viewpy-\u306e\u5909\u66f4","title":"addons/myskelton/tests/test_view.py \u306e\u5909\u66f4","text":"<p>\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306eAdmin Notes\u306e\u53d6\u5f97API\u306e\u30c6\u30b9\u30c8\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <p><code>addons/myskelton/tests/test_view.py</code> \u306b\u3001Admin Notes\u53d6\u5f97API\u3092\u30c6\u30b9\u30c8\u3059\u308b <code>TestAdminNotesViews</code> \u30af\u30e9\u30b9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002 \u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb test_views.py \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002 </p>"},{"location":"guides/admin-addon/README.legacy/#migrations\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210","title":"Migrations\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210","text":"<p>makemigrations \u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u3066\u3001Migrations\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web python3 manage.py makemigrations\n</code></pre> <p>\u4e0a\u8a18\u306e\u51fa\u529b\u4e2d\u306b\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u51fa\u529b\u304c\u73fe\u308c\u308c\u3070\u6210\u529f\u3067\u3059\u3002</p> <p><code>osf/migrations</code> \u914d\u4e0b\u306b\u4f5c\u6210\u3055\u308c\u308b\u30d5\u30a1\u30a4\u30eb\u540d\u306f\u3001\u4f5c\u6210\u65e5\u6642\u3084RDM\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306b\u3088\u3063\u3066\u7570\u306a\u308a\u307e\u3059\u3002</p> <pre><code>Migrations for 'osf':\n osf/migrations/0214_auto_20210214_1431.py\n - Add field admin_notes to rdmaddonnoinstitutionoption\n - Add field admin_notes to rdmaddonoption\n</code></pre>"},{"location":"guides/admin-addon/README.legacy/#\u30c6\u30b9\u30c8","title":"\u30c6\u30b9\u30c8","text":"<p>\u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306b\u304a\u3051\u308bAdmin Notes\u306b\u95a2\u3059\u308b\u30e6\u30cb\u30c3\u30c8\u30c6\u30b9\u30c8\u306f\u3001\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3067\u5b9f\u884c\u3067\u304d\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web invoke test_module -m admin_tests/rdm_addons/api_v1/test_views.py::TestAdminNotesView\n</code></pre> <p>\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306b\u304a\u3051\u308bAdmin Notes\u306b\u95a2\u3059\u308b\u30e6\u30cb\u30c3\u30c8\u30c6\u30b9\u30c8\u306f\u3001\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3067\u5b9f\u884c\u3067\u304d\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web invoke test_module -m addons/myskelton/tests/test_view.py::TestAdminNotesViews\n</code></pre>"},{"location":"guides/admin-addon/README.legacy/#admin-notes\u306e\u52d5\u4f5c\u78ba\u8a8d","title":"Admin Notes\u306e\u52d5\u4f5c\u78ba\u8a8d","text":"<p>Admin Notes\u306e\u52d5\u4f5c\u3092\u78ba\u8a8d\u3057\u3066\u307f\u307e\u3057\u3087\u3046\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#db\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3","title":"DB\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3","text":"<p>\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u3092\u5b9f\u884c\u3057\u3001Migrations\u5b9a\u7fa9\u3092PostgreSQL\u30b5\u30fc\u30d3\u30b9\u306b\u53cd\u6620\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web python3 manage.py migrate\n</code></pre>"},{"location":"guides/admin-addon/README.legacy/#\u56fd\u969b\u5316\u306e\u30b3\u30f3\u30d1\u30a4\u30eb","title":"\u56fd\u969b\u5316\u306e\u30b3\u30f3\u30d1\u30a4\u30eb","text":"<p>\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u56fd\u969b\u5316\u8a2d\u5b9a\u3092\u9069\u7528\u3059\u308b\u305f\u3081\u306b\u3001\u56fd\u969b\u5316\u30d5\u30a1\u30a4\u30eb\u3092\u30b3\u30f3\u30d1\u30a4\u30eb\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web pybabel compile -D django -d ./admin/translations\n</code></pre>"},{"location":"guides/admin-addon/README.legacy/#\u30b5\u30fc\u30d3\u30b9\u306e\u518d\u8d77\u52d5","title":"\u30b5\u30fc\u30d3\u30b9\u306e\u518d\u8d77\u52d5","text":"<p>\u5909\u66f4\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306b\u95a2\u3059\u308b\u30b5\u30fc\u30d3\u30b9\u3092\u518d\u8d77\u52d5\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose restart web api assets admin admin_assets\n</code></pre> <p>\u3053\u308c\u3067\u30b5\u30fc\u30d3\u30b9\u3078\u306e\u53cd\u6620\u306f\u5b8c\u4e86\u3067\u3059\u3002</p>"},{"location":"guides/admin-addon/README.legacy/#admin-notes\u3092\u8a66\u3059","title":"Admin Notes\u3092\u8a66\u3059","text":"<p>Admin Notes\u306e\u8a2d\u5b9a\u304a\u3088\u3073\u8868\u793a\u306e\u78ba\u8a8d\u3092\u3059\u308b\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u64cd\u4f5c\u3092\u5b9f\u65bd\u3057\u307e\u3059\u3002</p> <ol> <li>\u6a5f\u95a2\u7ba1\u7406\u6a5f\u80fd\u306eWeb UI\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u3002 <code>http://localhost:8001</code></li> <li>\u30a2\u30c9\u30aa\u30f3\u5229\u7528\u5236\u5fa1(RDM Addons)\u30da\u30fc\u30b8\u3092\u958b\u304f\u3002</li> <li>\u81ea\u5206\u306e\u6240\u5c5e\u6a5f\u95a2\u306e\u30da\u30fc\u30b8\u3092\u958b\u304f\u3002</li> <li>My Skelton\u30a2\u30c9\u30aa\u30f3\u306e\u4e2d\u306e\u7ba1\u7406\u8005\u30ce\u30fc\u30c8(Admin Notes)\u306e\u4e0b\u306b\u3042\u308b\u30c6\u30ad\u30b9\u30c8\u30dc\u30c3\u30af\u30b9\u306b\u4efb\u610f\u306e\u30c6\u30ad\u30b9\u30c8\u3092\u5165\u529b\u3057\u3001\u4fdd\u5b58\u3059\u308b\u3002 </li> <li>RDM Web UI\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u3002 <code>http://localhost:5000</code></li> <li>\u9069\u5f53\u306a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210\u3059\u308b\u3002</li> <li>\u300c\u30a2\u30c9\u30aa\u30f3\u300d\u30da\u30fc\u30b8\u3092\u958b\u304f\u3002</li> <li>My Skelton\u30a2\u30c9\u30aa\u30f3\u3092\u6709\u52b9\u5316\u3059\u308b\u3002</li> <li>\u300c\u30a2\u30c9\u30aa\u30f3\u3092\u69cb\u6210\u300d\u306eMy Skelton\u306e\u6b04\u306b\u3001\u8a2d\u5b9a\u3057\u305fAdmin Notes\u304c\u8868\u793a\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3059\u308b\u3002 </li> </ol> <p>\u4ee5\u4e0a\u3067Admin Notes\u306e\u52d5\u4f5c\u78ba\u8a8d\u306f\u5b8c\u4e86\u3067\u3059\uff01</p>"},{"location":"guides/api/","title":"API Guide / API \u30e6\u30fc\u30ac\u30a4\u30c9","text":"<p>Summary: Guide to using and exposing APIs in RDM addons \u6982\u8981: RDM \u30a2\u30c9\u30aa\u30f3\u3067 API \u3092\u4f7f\u7528\u304a\u3088\u3073\u516c\u958b\u3059\u308b\u624b\u5f15\u304d</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05</li> <li>Normative for: <code>docs/guides/api/</code></li> <li>Related: SPEC-06 Documentation Conventions \u00b7 Skeleton Guide</li> </ul> <p></p>"},{"location":"guides/api/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"guides/api/#overview","title":"Overview","text":"<p>This guide explains how to:</p> <ul> <li>Expose your addon's functionality via API: Allow other systems to access your addon</li> <li>Use existing APIs in your addon: Interact with RDM and other addons</li> </ul> <p>RDM addons can be accessed via HTTP(S) RESTful APIs, enabling integration with external systems and other RDM addons.</p>"},{"location":"guides/api/#prerequisites","title":"Prerequisites","text":"<ul> <li>Basic understanding of Python, Django, and REST APIs</li> <li>The development environment set up following the Environment Guide</li> <li>Completed the Skeleton Addon Guide</li> </ul>"},{"location":"guides/api/#quick-start","title":"Quick start","text":"<ol> <li>Define Routes and Views in your addon to create API endpoints</li> <li>Use decorators to control access (authentication, permissions)</li> <li>Test your API with curl or Postman</li> <li>Integrate with external systems using standard HTTP requests</li> </ol>"},{"location":"guides/api/#legacy-content","title":"Legacy content","text":"<p>The legacy API guide instructions are kept verbatim in <code>README.legacy.md</code> for reference and will be rewritten per milestone.</p> <p></p>"},{"location":"guides/api/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"guides/api/#\u6982\u8981","title":"\u6982\u8981","text":"<p>\u3053\u306e\u30ac\u30a4\u30c9\u3067\u306f\u3001\u4ee5\u4e0b\u306e\u65b9\u6cd5\u3092\u8aac\u660e\u3057\u307e\u3059:</p> <ul> <li>\u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u80fd\u3092 API \u3067\u516c\u958b: \u4ed6\u306e\u30b7\u30b9\u30c6\u30e0\u304c\u30a2\u30c9\u30aa\u30f3\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u308b\u3088\u3046\u306b\u3059\u308b</li> <li>\u65e2\u5b58\u306e API \u3092\u30a2\u30c9\u30aa\u30f3\u3067\u4f7f\u7528: RDM \u3084\u4ed6\u306e\u30a2\u30c9\u30aa\u30f3\u3068\u9023\u643a\u3059\u308b</li> </ul> <p>RDM \u30a2\u30c9\u30aa\u30f3\u306f HTTP(S) RESTful API \u3067\u30a2\u30af\u30bb\u30b9\u53ef\u80fd\u3067\u3001\u5916\u90e8\u30b7\u30b9\u30c6\u30e0\u3084\u4ed6\u306e RDM \u30a2\u30c9\u30aa\u30f3\u3068\u306e\u9023\u643a\u304c\u3067\u304d\u307e\u3059\u3002</p>"},{"location":"guides/api/#\u524d\u63d0\u6761\u4ef6","title":"\u524d\u63d0\u6761\u4ef6","text":"<ul> <li>Python, Django, REST API \u306e\u57fa\u672c\u7684\u306a\u7406\u89e3</li> <li>\u74b0\u5883\u30ac\u30a4\u30c9\u306b\u5f93\u3063\u3066\u958b\u767a\u74b0\u5883\u3092\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3057\u3066\u3044\u308b\u3053\u3068</li> <li>\u30b9\u30b1\u30eb\u30c8\u30f3\u30a2\u30c9\u30aa\u30f3\u30ac\u30a4\u30c9\u3092\u5b8c\u4e86\u3057\u3066\u3044\u308b\u3053\u3068</li> </ul>"},{"location":"guides/api/#\u30af\u30a4\u30c3\u30af\u30b9\u30bf\u30fc\u30c8","title":"\u30af\u30a4\u30c3\u30af\u30b9\u30bf\u30fc\u30c8","text":"<ol> <li>\u30a2\u30c9\u30aa\u30f3\u3067\u30eb\u30fc\u30c8\u3068\u30d3\u30e5\u30fc\u3092\u5b9a\u7fa9\u3057\u3066 API \u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8\u3092\u4f5c\u6210\u3059\u308b</li> <li>\u30c7\u30b3\u30ec\u30fc\u30bf\u30fc\u3092\u4f7f\u7528\u3057\u3066\u30a2\u30af\u30bb\u30b9\u3092\u5236\u5fa1\uff08\u8a8d\u8a3c\u3001\u6a29\u9650\uff09</li> <li>curl \u3084 Postman \u3067 API \u3092\u30c6\u30b9\u30c8\u3059\u308b</li> <li>\u6a19\u6e96\u7684\u306a HTTP \u30ea\u30af\u30a8\u30b9\u30c8\u3092\u4f7f\u7528\u3057\u3066\u5916\u90e8\u30b7\u30b9\u30c6\u30e0\u3068\u9023\u643a\u3059\u308b</li> </ol>"},{"location":"guides/api/#\u904e\u53bb\u306e\u30b3\u30f3\u30c6\u30f3\u30c4","title":"\u904e\u53bb\u306e\u30b3\u30f3\u30c6\u30f3\u30c4","text":"<p>\u904e\u53bb\u306e API \u30ac\u30a4\u30c9\u306e\u624b\u9806\u306f\u3001\u53c2\u8003\u306e\u305f\u3081\u306b <code>README.legacy.md</code> \u306b\u305d\u306e\u307e\u307e\u6b8b\u3057\u3066\u304a\u308a\u3001\u30de\u30a4\u30eb\u30b9\u30c8\u30fc\u30f3\u3054\u3068\u306b\u66f8\u304d\u76f4\u3059\u4e88\u5b9a\u3067\u3059\u3002</p>"},{"location":"guides/api/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 API (Application Programming Interface) A way for programs to talk to each other using HTTP requests. \u30d7\u30ed\u30b0\u30e9\u30e0\u304c HTTP \u30ea\u30af\u30a8\u30b9\u30c8\u3092\u4f7f\u7528\u3057\u3066\u901a\u4fe1\u3059\u308b\u65b9\u6cd5\u3002 RESTful API An API that follows standard HTTP methods (GET, POST, PUT, DELETE). \u6a19\u6e96\u7684\u306a HTTP \u30e1\u30bd\u30c3\u30c9\uff08GET, POST, PUT, DELETE\uff09\u306b\u5f93\u3063\u305f API\u3002 Decorator A special marker that controls who can access an API endpoint. API \u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8\u3078\u306e\u30a2\u30af\u30bb\u30b9\u3092\u5236\u5fa1\u3059\u308b\u7279\u5225\u306a\u30de\u30fc\u30af\u3002 Authentication Verifying who is making the API request (like a username and password). API \u30ea\u30af\u30a8\u30b9\u30c8\u3092\u4f5c\u6210\u3057\u305f\u4eba\u304c\u8ab0\u304b\u3092\u78ba\u8a8d\u3059\u308b\u3053\u3068\uff08\u30e6\u30fc\u30b6\u30fc\u540d\u3068\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u3088\u3046\u306a\u3082\u306e\uff09\u3002 Authorization Checking what the user is allowed to do after logging in. \u30ed\u30b0\u30a4\u30f3\u3057\u305f\u5f8c\u306e\u30e6\u30fc\u30b6\u30fc\u304c\u4f55\u3092\u3067\u304d\u308b\u304b\u3092\u78ba\u8a8d\u3059\u308b\u3053\u3068\u3002"},{"location":"guides/api/Decorators/","title":"View\u51e6\u7406\u3067\u4f7f\u3048\u308bPython\u30c7\u30b3\u30ec\u30fc\u30bf","text":"<p><code>views.py</code> \u3067\u5b9a\u7fa9\u3055\u308c\u308b\u5404View\u51e6\u7406\u306b\u306f\u3001\u305d\u306e\u51e6\u7406\u306e\u5b9f\u884c\u306b\u304a\u3051\u308b\u524d\u63d0\u3092Python\u306e\u30c7\u30b3\u30ec\u30fc\u30bf\u306e\u5f62\u3067\u8a18\u8ff0\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p>\u3053\u3053\u3067\u306f\u3001\u3088\u304f\u4f7f\u308f\u308c\u3066\u3044\u308b\u30c7\u30b3\u30ec\u30fc\u30bf\u3084\u3001\u30ab\u30b9\u30bf\u30e0\u30c7\u30b3\u30ec\u30fc\u30bf\u306b\u3064\u3044\u3066\u8aac\u660e\u3057\u307e\u3059\u3002</p>"},{"location":"guides/api/Decorators/#frameworkauthdecoratorsmust_be_logged_in","title":"framework.auth.decorators.must_be_logged_in","text":"<p>\u30e6\u30fc\u30b6\u304c\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u3044\u308b\u72b6\u614b\u3067\u3042\u308b\u5834\u5408\u306b\u306e\u307f\u547c\u3073\u51fa\u3057\u53ef\u80fd\u3067\u3042\u308b\u3053\u3068\u3092\u5ba3\u8a00\u3057\u307e\u3059\u3002</p> <p>\u5f15\u6570( <code>**kwargs</code> )\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3059\u3002</p> <ul> <li><code>auth</code> : \u8a8d\u8a3c\u3057\u3066\u3044\u308b\u30e6\u30fc\u30b6\u306b\u95a2\u3059\u308b\u60c5\u5831</li> </ul>"},{"location":"guides/api/Decorators/#websiteprojectdecoratorsmust_be_valid_project","title":"website.project.decorators.must_be_valid_project","text":"<p>\u5bfe\u8c61\u306enode\u304c\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3068\u3057\u3066\u8a8d\u3081\u3089\u308c\u308b\u3082\u306e\u3067\u3042\u308b\u3053\u3068\u3092\u5ba3\u8a00\u3057\u307e\u3059\u3002</p> <p>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3068\u3057\u3066\u8a8d\u3081\u3089\u308c\u306a\u3044node\u3068\u306f\u3001QuickFileNode\u3084\u64a4\u56de\u3055\u308c\u305fRegistration\u306a\u3069\u304c\u3042\u308a\u307e\u3059\u304c\u3001\u73fe\u5728\u3001RDM\u3067\u306f\u4f7f\u7528\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002</p> <p>\u5f15\u6570( <code>**kwargs</code> )\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3059\u3002</p> <ul> <li><code>node</code> : \u5bfe\u8c61\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u95a2\u3059\u308b\u60c5\u5831</li> </ul>"},{"location":"guides/api/Decorators/#websiteprojectdecoratorsmust_have_addonaddon_name-model","title":"website.project.decorators.must_have_addon(addon_name, model)","text":"<p>\u30a2\u30c9\u30aa\u30f3\u306b\u95a2\u3059\u308b\u60c5\u5831\u3092\u5fc5\u8981\u3068\u3059\u308b\u3053\u3068\u3092\u5ba3\u8a00\u3057\u307e\u3059\u3002\u7b2c1\u5f15\u6570( <code>addon_name</code> )\u306b\u306f\u30a2\u30c9\u30aa\u30f3\u540d\u3092\u3001\u7b2c2\u5f15\u6570( <code>model</code> )\u306b\u306f <code>'user'</code> \u304b <code>'node'</code> \u306e\u3044\u305a\u308c\u304b\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002 <code>'node'</code> \u3092\u6307\u5b9a\u3057\u305f\u5834\u5408\u306f\u3001\u30d1\u30b9\u306f <code>/project/<pid>/</code> \u304b\u3089\u59cb\u3081\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002</p> <p>\u5f15\u6570( <code>**kwargs</code> )\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3059\u3002</p> <ul> <li>\u5f15\u6570 <code>model</code> \u306b <code>'user'</code> \u3092\u6307\u5b9a\u3057\u305f\u5834\u5408</li> <li><code>auth</code> : \u8a8d\u8a3c\u3057\u3066\u3044\u308b\u30e6\u30fc\u30b6\u306b\u95a2\u3059\u308b\u60c5\u5831</li> <li><code>user_addon</code> \u6307\u5b9a\u3057\u305f\u30a2\u30c9\u30aa\u30f3\u306eUserSettings</li> <li>\u5f15\u6570 <code>model</code> \u306b <code>'node'</code> \u3092\u6307\u5b9a\u3057\u305f\u5834\u5408</li> <li><code>node</code> : \u5bfe\u8c61\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u95a2\u3059\u308b\u60c5\u5831</li> <li><code>node_addon</code> \u6307\u5b9a\u3057\u305f\u30a2\u30c9\u30aa\u30f3\u306eNodeSettings</li> </ul>"},{"location":"guides/api/Decorators/#websiteprojectdecoratorsmust_have_permissionpermission","title":"website.project.decorators.must_have_permission(permission)","text":"<p>\u5fc5\u8981\u306a\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3( <code>permission</code> )\u3092\u5ba3\u8a00\u3057\u307e\u3059\u3002\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u306f osf.utils.permissions \u306b\u5b9a\u7fa9\u3055\u308c\u3066\u304a\u308a\u3001 <code>'write'</code> , <code>'read'</code> , <code>'admin'</code> \u306e\u3044\u305a\u308c\u304b\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002</p> <p>\u5f15\u6570( <code>**kwargs</code> )\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3059\u3002</p> <ul> <li><code>auth</code> : \u8a8d\u8a3c\u3057\u3066\u3044\u308b\u30e6\u30fc\u30b6\u306b\u95a2\u3059\u308b\u60c5\u5831</li> <li><code>node</code> : \u5bfe\u8c61\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u95a2\u3059\u308b\u60c5\u5831</li> </ul>"},{"location":"guides/api/Decorators/#websiteprojectdecoratorsmust_be_addon_authorizeraddon_name","title":"website.project.decorators.must_be_addon_authorizer(addon_name)","text":"<p>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u30a2\u30c9\u30aa\u30f3\u3092\u8ffd\u52a0\u3057\u305f\u30e6\u30fc\u30b6\u30fc\u306e\u307f\u547c\u3073\u51fa\u3057\u53ef\u80fd\u3067\u3042\u308b\u3053\u3068\u3092\u5ba3\u8a00\u3057\u307e\u3059\u3002\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30a2\u30c9\u30aa\u30f3\u306e\u8a2d\u5b9a\u306b\u306e\u307f\u4f7f\u308f\u308c\u308bView\u51e6\u7406\u306a\u3069\u306b\u5ba3\u8a00\u3057\u307e\u3059\u3002</p> <p>\u5f15\u6570( <code>**kwargs</code> )\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3059\u3002</p> <ul> <li><code>node</code> : \u5bfe\u8c61\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u95a2\u3059\u308b\u60c5\u5831</li> </ul>"},{"location":"guides/api/Decorators/#websiteprojectdecoratorsmust_be_contributor_or_public","title":"website.project.decorators.must_be_contributor_or_public","text":"<p>\u30e6\u30fc\u30b6\u30fc\u304cContributor\u3067\u3042\u308b\u304b\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u516c\u958b\u8a2d\u5b9a\u306b\u3055\u308c\u3066\u3044\u308b\u5834\u5408\u306e\u307f\u547c\u3073\u51fa\u3057\u53ef\u80fd\u3067\u3042\u308b\u3053\u3068\u3092\u5ba3\u8a00\u3057\u307e\u3059\u3002</p> <p>\u4f3c\u305f\u3088\u3046\u306a\u30c7\u30b3\u30ec\u30fc\u30bf\u3068\u3057\u3066\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u3082\u306e\u304c\u3042\u308a\u307e\u3059\u3002</p> <ul> <li><code>must_be_contributor</code></li> <li><code>must_be_contributor_or_public_but_not_anonymized</code></li> <li><code>must_be_contributor_and_not_group_member</code></li> </ul> <p>\u5f15\u6570( <code>**kwargs</code> )\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3059\u3002</p> <ul> <li><code>auth</code> : \u8a8d\u8a3c\u3057\u3066\u3044\u308b\u30e6\u30fc\u30b6\u306b\u95a2\u3059\u308b\u60c5\u5831</li> <li><code>node</code> : \u5bfe\u8c61\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u95a2\u3059\u308b\u60c5\u5831</li> </ul>"},{"location":"guides/api/Decorators/#adminrdm_addonsdecoratorsmust_be_rdm_addons_allowed","title":"admin.rdm_addons.decorators.must_be_rdm_addons_allowed","text":"<p>\u30e6\u30fc\u30b6\u30fc\u304c\u6240\u5c5e\u3059\u308b\u6a5f\u95a2\u304c\u3001\u6307\u5b9a\u3057\u305f\u30a2\u30c9\u30aa\u30f3\u3092\u4f7f\u3046\u3053\u3068\u3092\u8a31\u53ef\u3055\u308c\u3066\u3044\u308b\u5834\u5408\u306b\u306e\u307f\u547c\u3073\u51fa\u3057\u53ef\u80fd\u3067\u3042\u308b\u3053\u3068\u3092\u5ba3\u8a00\u3057\u307e\u3059\u3002\u3053\u306e\u6a5f\u80fd\u306fAdmin\u306eRdm Addons\u6a5f\u80fd\u306b\u3088\u308a\u63d0\u4f9b\u3055\u308c\u3066\u3044\u307e\u3059\u3002</p>"},{"location":"guides/api/README.legacy/","title":"API\u306e\u5229\u7528","text":"<p>RDM\u304c\u7814\u7a76\u30c7\u30fc\u30bf\u3092\u52b9\u679c\u7684\u306b\u7ba1\u7406\u3059\u308b\u305f\u3081\u306b\u306f\u3001\u5916\u90e8\u30b7\u30b9\u30c6\u30e0\u3068\u306e\u9023\u643a\u3084\u65e2\u5b58\u306eRDM\u30a2\u30c9\u30aa\u30f3\u3068\u306e\u9023\u643a\u3092\u884c\u3046\u5fc5\u8981\u304c\u51fa\u3066\u304f\u308b\u3067\u3057\u3087\u3046\u3002 \u3053\u306e\u3088\u3046\u306a\u6642\u3001\u5916\u90e8\u30b7\u30b9\u30c6\u30e0\u3084RDM\u304a\u3088\u3073\u30a2\u30c9\u30aa\u30f3\u306e\u9593\u306e\u5883\u754c\u9762\u3001\u7279\u306bAPI(Application Programming Interface)\u3092\u610f\u8b58\u3057\u306a\u304c\u3089\u6a5f\u80fd\u3092\u5b9f\u88c5\u3059\u308b\u3053\u3068\u3067\u3001\u30e1\u30f3\u30c6\u30ca\u30f3\u30b9\u6027\u3092\u7dad\u6301\u3057\u305f\u308a\u3001\u4eca\u5f8c\u306e\u62e1\u5f35\u3092\u5bb9\u6613\u306b\u3057\u305f\u308a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p>\u672c\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3067\u306f\u30a2\u30c9\u30aa\u30f3\u306b\u304a\u3051\u308b\u5b9f\u88c5\u306b\u7740\u76ee\u3057\u3001\u30a2\u30c9\u30aa\u30f3\u3092\u5916\u90e8\u30b7\u30b9\u30c6\u30e0\u304b\u3089\u64cd\u4f5c\u53ef\u80fd\u306b\u3059\u308b\u65b9\u6cd5(\u30a2\u30c9\u30aa\u30f3API\u306e\u516c\u958b)\u3068\u3001\u30a2\u30c9\u30aa\u30f3\u304b\u3089RDM\u3092\u64cd\u4f5c\u3059\u308b\u65b9\u6cd5(\u65e2\u5b58API\u306b\u3088\u308b\u64cd\u4f5c)\u306e2\u3064\u306e\u89b3\u70b9\u3067\u8aac\u660e\u3057\u307e\u3059\u3002</p>"},{"location":"guides/api/README.legacy/#\u30a2\u30c9\u30aa\u30f3api\u306e\u516c\u958b","title":"\u30a2\u30c9\u30aa\u30f3API\u306e\u516c\u958b","text":"<p>\u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u80fd\u306b\u5bfe\u3057\u3066\u3001\u4ed6\u306e\u30b7\u30b9\u30c6\u30e0\u304b\u3089\u30a2\u30af\u30bb\u30b9\u53ef\u80fd\u306b\u3059\u308b\u305f\u3081\u306eAPI\u306e\u8003\u3048\u65b9\u3001\u5b9a\u7fa9\u65b9\u6cd5\u3092\u8aac\u660e\u3057\u307e\u3059\u3002</p>"},{"location":"guides/api/README.legacy/#api\u306e\u5b9f\u88c5","title":"API\u306e\u5b9f\u88c5","text":"<p>\u5916\u90e8\u30b7\u30b9\u30c6\u30e0\u304c\u30a2\u30c9\u30aa\u30f3\u306e\u6a5f\u80fd\u306b\u5bfe\u3057\u3066\u30a2\u30af\u30bb\u30b9\u3059\u308b\u5834\u5408\u306f\u3001HTTP(S)\u306b\u3088\u308bRESTful API\u547c\u3073\u51fa\u3057\u3092\u5229\u7528\u3059\u308b\u306e\u304c\u4fbf\u5229\u3067\u3059\u3002 RDM\u30a2\u30c9\u30aa\u30f3\u306f \u30b9\u30b1\u30eb\u30c8\u30f3 \u306e\u8ffd\u52a0\u65b9\u6cd5\u3067\u8aac\u660e\u3057\u305f\u3088\u3046\u306b\u3001Django\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u5f62\u3067\u5b9f\u88c5\u3055\u308c\u307e\u3059\u3002 \u305d\u306e\u305f\u3081\u3001Django\u3084RDM\u304c\u63d0\u4f9b\u3059\u308b\u5404\u7a2e\u88dc\u52a9\u6a5f\u80fd\u3092\u5229\u7528\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p>HTTP(S)\u3067\u547c\u3073\u51fa\u3057\u53ef\u80fd\u306a\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8\u3092\u5b9a\u7fa9\u3059\u308b\u5834\u5408\u3001\u30d3\u30e5\u30fc\u306b\u3088\u308a\u5b9f\u88c5\u3059\u308b\u306e\u304c\u4e00\u822c\u7684\u3067\u3059\u3002 \u30b9\u30b1\u30eb\u30c8\u30f3\u306e\u4f5c\u6210#View\u306e\u69cb\u6210 \u306b\u793a\u3059\u3088\u3046\u306b\u3001\u5b9a\u7fa9\u306f\u4ee5\u4e0b\u306e2\u7a2e\u985e\u304b\u3089\u69cb\u6210\u3055\u308c\u307e\u3059\u3002</p> <ul> <li>Routes ... View\u51e6\u7406\u3092\u3069\u306e\u30d1\u30b9\u306b\u30de\u30c3\u30d4\u30f3\u30b0\u3057\u3001\u3069\u306e\u3088\u3046\u306a\u5f62\u5f0f\u3067\u51fa\u529b\u3059\u308b\u304b\u3002\u51fa\u529b\u306b\u306fJSON\u5f62\u5f0f\u3084\u3001HTML\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u6307\u5b9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u308b</li> <li>Views ... View\u51e6\u7406\u306e\u5185\u5bb9</li> </ul> <p>Routes\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u30d1\u30b9\u3068Method(GET, POST, PUT, DELETE, ...)\u3068\u3001\u305d\u306e\u7d44\u307f\u5408\u308f\u305b\u306b\u5bfe\u3057\u3066\u3069\u306e\u95a2\u6570\u3092\u5b9f\u884c\u3059\u308b\u304b\u3001\u305d\u306e\u5b9f\u884c\u7d50\u679c\u3092\u3069\u306e\u3088\u3046\u306b\u51fa\u529b\u3059\u308b\u304b\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002 \u4f8b\u3048\u3070\u3001\u753b\u9762\u62e1\u5f35\u306e\u4f8b\u3067\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u3066\u3044\u307e\u3059\u3002</p> <pre><code>api_routes = {\n 'rules': [\n ...\n Rule([ # (1)\n '/project/<pid>/{}/config'.format(SHORT_NAME),\n '/project/<pid>/node/<nid>/{}/config'.format(SHORT_NAME),\n ], 'get', views.myscreen_get_config_ember, json_renderer),\n Rule([ # (2)\n '/project/<pid>/{}/config'.format(SHORT_NAME),\n '/project/<pid>/node/<nid>/{}/config'.format(SHORT_NAME),\n ], 'patch', views.myscreen_set_config_ember, json_renderer),\n ...\n ],\n}\n</code></pre> <p>\u30eb\u30fc\u30eb(1)\u306f\u3001<code>/project/<pid>/\u30a2\u30c9\u30aa\u30f3\u540d/config</code> \u3068\u3044\u3046\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8\u3078\u306e<code>GET</code>\u30ea\u30af\u30a8\u30b9\u30c8\u306b\u5bfe\u3059\u308b\u51e6\u7406\u3092\u3001views\u30e2\u30b8\u30e5\u30fc\u30eb\u3067\u5b9a\u7fa9\u3057\u305f<code>myscreen_get_config_ember</code>\u3068\u3044\u3046\u95a2\u6570\u306b\u884c\u308f\u305b\u308b\u3053\u3068\u3092\u5b9a\u7fa9\u3057\u3066\u3044\u307e\u3059\u3002<code>json_renderer</code>\u306f\u3001\u95a2\u6570\u306e\u623b\u308a\u5024\u3068\u3057\u3066\u8fd4\u3055\u308c\u305f\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092 JSON\u306b\u5909\u63db\u3001\u30ec\u30b9\u30dd\u30f3\u30b9\u3068\u3057\u3066\u8fd4\u3059\u3053\u3068\u3092\u5b9a\u7fa9\u3057\u3066\u3044\u307e\u3059\u3002 \u540c\u69d8\u306b\u3001\u30eb\u30fc\u30eb(2)\u306f<code>PATCH</code>\u30ea\u30af\u30a8\u30b9\u30c8\u306b\u5bfe\u3057\u3066\u306f<code>myscreen_set_config_ember</code>\u3067\u51e6\u7406\u3059\u308b\u3053\u3068\u3092\u793a\u3057\u3066\u3044\u307e\u3059\u3002</p> <p>Views\u3067\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u95a2\u6570\u3092\u5b9a\u7fa9\u3057\u3066\u3044\u307e\u3059\u3002</p> <pre><code>@must_be_valid_project\n@must_have_permission('admin')\n@must_have_addon(SHORT_NAME, 'node')\ndef myscreen_get_config_ember(**kwargs):\n node = kwargs['node'] or kwargs['project']\n addon = node.get_addon(SHORT_NAME)\n return {'data': {'id': node._id, 'type': 'myscreen-config',\n 'attributes': {\n 'param1': addon.get_param_1()\n }}}\n\n@must_be_valid_project\n@must_have_permission('admin')\n@must_have_addon(SHORT_NAME, 'node')\ndef myscreen_set_config_ember(**kwargs):\n node = kwargs['node'] or kwargs['project']\n addon = node.get_addon(SHORT_NAME)\n try:\n config = request.json['data']['attributes']\n param_1 = config['param1']\n except KeyError:\n raise HTTPError(http_status.HTTP_400_BAD_REQUEST)\n\n addon.set_param_1(param_1)\n return {'data': {'id': node._id, 'type': 'myscreen-config',\n 'attributes': {\n 'param1': param_1\n }}}\n</code></pre> <p>\u3044\u305a\u308c\u3082\u3001<code>@must_</code>\u304b\u3089\u59cb\u307e\u308b\u30c7\u30b3\u30ec\u30fc\u30bf\u3068\u3001<code>def</code>\u304b\u3089\u59cb\u307e\u308b\u95a2\u6570\u5b9a\u7fa9\u30d6\u30ed\u30c3\u30af\u304b\u3089\u69cb\u6210\u3055\u308c\u307e\u3059\u3002 \u30c7\u30b3\u30ec\u30fc\u30bf\u306f\u3001\u3053\u308c\u3089\u306e\u95a2\u6570\u306b\u95a2\u3059\u308b\u8a8d\u53ef\u306e\u8981\u5426\u3084\u3001\u4f7f\u7528\u53ef\u80fd\u306a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u6761\u4ef6\u3092\u5b9a\u7fa9\u3057\u3066\u3044\u307e\u3059\u3002 \u307e\u305f\u3001<code>kwargs</code>\u306b\u306f\u95a2\u6570\u306b\u4e0e\u3048\u3089\u308c\u305f\u5f15\u6570\u304c\u683c\u7d0d\u3055\u308c\u307e\u3059\u3002<code>node</code>\u3084<code>project</code>\u306b\u306f\u3001Django Model\u304c\u683c\u7d0d\u3055\u308c\u307e\u3059\u3002 (\u30c7\u30b3\u30ec\u30fc\u30bf\u306e\u5b9a\u7fa9\u306b\u3088\u3063\u3066\u306f\u3001\u683c\u7d0d\u3055\u308c\u306a\u3044\u5834\u5408\u3082\u3042\u308a\u307e\u3059\u3002) \u30a2\u30c9\u30aa\u30f3\u306f\u3053\u308c\u3089\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u4ecb\u3057\u3066\u3001RDM\u5185\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u5185\u5bb9\u3092\u64cd\u4f5c\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 (\u753b\u9762\u62e1\u5f35\u306e\u4f8b\u3067\u306f\u3001Ember\u3067\u5b9a\u7fa9\u3057\u305f\u753b\u9762\u304b\u3089\u3053\u308c\u3089\u306e\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8\u306b\u5bfe\u3057\u3066\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u51fa\u3057\u3066\u3044\u307e\u3059\u3002)</p> <p>\u3053\u308c\u3089\u306e\u30ed\u30b8\u30c3\u30af\u306e\u8a18\u8ff0\u65b9\u6cd5\u306f\u4e00\u822c\u7684\u306aDjango\u306e\u30eb\u30fc\u30eb\u306b\u5247\u3063\u3066\u3044\u307e\u3059\u3002\u3057\u305f\u304c\u3063\u3066\u3001Django\u3084Flask\u306a\u3069\u306ePython\u306e Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306e\u77e5\u8b58\u304c\u3042\u308c\u3070\u6bd4\u8f03\u7684\u7c21\u5358\u306b\u5b9f\u88c5\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u308b\u3067\u3057\u3087\u3046\u3002 \u307e\u305f\u3001RDM\u3067\u306f\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u3084\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u5236\u9650\u306b\u4fbf\u5229\u306a\u30c7\u30b3\u30ec\u30fc\u30bf\u3092\u63d0\u4f9b\u3057\u3066\u3044\u307e\u3059\u3002RDM\u304c\u63d0\u4f9b\u3059\u308b\u30c7\u30b3\u30ec\u30fc\u30bf\u4e00\u89a7\u3092\u53c2\u8003\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/api/README.legacy/#api\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3","title":"API\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3","text":"<p>API\u30a2\u30af\u30bb\u30b9\u306f\u9069\u5207\u306a\u30e6\u30fc\u30b6\u3001\u307e\u305f\u306f\u30b7\u30b9\u30c6\u30e0\u304b\u3089\u306e\u307f\u5229\u7528\u53ef\u80fd\u306a\u3088\u3046\u306b\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u3092\u884c\u3046\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 \u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u65b9\u5f0f\u306e\u5b9f\u73fe\u65b9\u6cd5\u3068\u3057\u3066\u3001\u30e6\u30fc\u30b6\u306b\u3088\u308b\u8a8d\u53ef\u3092\u7d4c\u3066\u30a2\u30af\u30bb\u30b9\u3092\u884c\u3046\u65b9\u5f0f\u3068\u3001\u72ec\u81ea\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u6a5f\u69cb\u3092\u8a2d\u3051\u308b\u65b9\u5f0f\u306b\u3064\u3044\u3066\u8aac\u660e\u3057\u307e\u3059\u3002</p>"},{"location":"guides/api/README.legacy/#\u30e6\u30fc\u30b6\u306b\u3088\u308b\u8a8d\u53ef","title":"\u30e6\u30fc\u30b6\u306b\u3088\u308b\u8a8d\u53ef","text":"<p>\u5148\u306eViews\u306e\u4f8b\u3067\u306f\u3001 <code>@must_have_permission('admin')</code> \u3068\u3044\u3046\u5f62\u3067\u3001\u3053\u306e\u64cd\u4f5c\u306f<code>admin</code>\u6a29\u9650\u3092\u6301\u3063\u3066\u3044\u308b\u30e6\u30fc\u30b6\u306b\u3057\u304b\u5b9f\u65bd\u3067\u304d\u306a\u3044\u3053\u3068\u3092\u5ba3\u8a00\u3057\u3066\u3044\u307e\u3059\u3002 \u4ed6\u306b\u3082\u3001<code>write</code>\u6a29\u9650\u304c\u5fc5\u8981\u3067\u3042\u308b\u3068\u304b\u3001\u69d8\u3005\u306a\u6a29\u9650\u306e\u30b3\u30f3\u30c8\u30ed\u30fc\u30eb\u304c\u8003\u3048\u3089\u308c\u307e\u3059\u3002</p> <p>\u3053\u3053\u3067\u91cd\u8981\u306a\u306e\u306f\u3001\u30e6\u30fc\u30b6\u306b\u3088\u3063\u3066\u3001\u64cd\u4f5c\u53ef\u80fd\u306a\u7bc4\u56f2\u304c\u7570\u306a\u308b\u3068\u3044\u3046\u70b9\u3068\u3001\u30e6\u30fc\u30b6\u306f\u30a2\u30c9\u30aa\u30f3\u3092\u7121\u5236\u9650\u306b\u4fe1\u983c\u3057\u3066\u304f\u308c\u308b\u308f\u3051\u3067\u306f\u306a\u3044\u3068\u3044\u3046\u70b9\u3067\u3059\u3002 \u30e6\u30fc\u30b6\u306e\u8b58\u5225\u306fWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306b\u3068\u3063\u3066\u306f\u5f53\u305f\u308a\u524d\u306e\u3053\u3068\u3067\u3059\u304c\u3001API\u306b\u3088\u308b\u64cd\u4f5c\u3092\u8003\u3048\u308b\u5834\u5408\u306b\u3082\u975e\u5e38\u306b\u91cd\u8981\u306a\u70b9\u3068\u306a\u308a\u307e\u3059\u3002 \u305f\u3060\u3001API\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u5074\u306b\u300c\u79c1\u306fxx\u3067\u3059\u300d\u3068\u3044\u3046\u7533\u544a\u3092\u6c42\u3081\u308b\u308f\u3051\u306b\u306f\u3044\u304d\u307e\u305b\u3093\u3002\u8a50\u79f0\u3055\u308c\u308b\u53ef\u80fd\u6027\u304c\u3042\u308b\u304b\u3089\u3067\u3059\u3002 \u307e\u305f\u3001\u79d8\u5bc6\u306e\u60c5\u5831(\u30d1\u30b9\u30ef\u30fc\u30c9\u30fb\u79d8\u5bc6\u9375\u7b49)\u3067\u64cd\u4f5c\u306e\u4e3b\u304c\u8a8d\u8a3c\u3067\u304d\u305f\u3068\u3057\u3066\u3082\u3001\u305d\u306e\u30e6\u30fc\u30b6\u306f\u3053\u306e\u30a2\u30c9\u30aa\u30f3\u3092\u7121\u5236\u9650\u306b\u4fe1\u983c\u3057\u3066\u304f\u308c\u308b\u3068\u8003\u3048\u308b\u3079\u304d\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 (RDM\u81ea\u4f53\u306f\u4fe1\u983c\u3057\u3066\u4f7f\u3063\u3066\u3082\u3089\u3046\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u304c\u3001RDM\u306eAPI\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u306f\u4fe1\u983c\u3055\u308c\u3066\u3044\u308b\u3068\u306f\u9650\u308a\u307e\u305b\u3093\u3002) \u305d\u306e\u305f\u3081\u3001\u300c\u3053\u306e\u30a2\u30c9\u30aa\u30f3\u306f\u60c5\u5831yy\u306e\u8aad\u307f\u8fbc\u307f\u3060\u3051\u3092\u3057\u307e\u3059\u300d\u3067\u3042\u308b\u3068\u304b\u3001\u300c\u8aad\u307f\u8fbc\u307f\u3068\u66f8\u304d\u8fbc\u307f\u3092\u3057\u307e\u3059\u300d\u3067\u3042\u308b\u3068\u304b\u3001\u7bc4\u56f2\u3092\u9650\u5b9a\u3057\u3066\u30e6\u30fc\u30b6\u3078\u306e\u8a31\u53ef\u3092\u6c42\u3081\u308b\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u3002</p>"},{"location":"guides/api/README.legacy/#personal-access-token\u306b\u3088\u308b\u8a8d\u53ef","title":"Personal Access Token\u306b\u3088\u308b\u8a8d\u53ef","text":"<p>\u3053\u306e\u3088\u3046\u306a\u3001\u30e6\u30fc\u30b6\u306e\u6a29\u9650\u3092\u884c\u4f7f\u3059\u308b\u305f\u3081\u306e\u6a5f\u69cb\u306e\u4e00\u3064\u304c\u3001Personal Access Token\u3067\u3059\u3002RDM\u306e\u30e6\u30fc\u30b6\u306e [\u8a2d\u5b9a] \u753b\u9762\u304b\u3089\u3001 [\u30d1\u30fc\u30bd\u30ca\u30eb\u30a2\u30af\u30bb\u30b9\u30c8\u30fc\u30af\u30f3] \u3067\u53d6\u5f97\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p></p> <p>[\u65b0\u898f\u30c8\u30fc\u30af\u30f3] \u30dc\u30bf\u30f3\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u3068\u3001\u65b0\u898f\u30c8\u30fc\u30af\u30f3\u3092\u767a\u884c\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p></p> <p>\u65b0\u898f\u30c8\u30fc\u30af\u30f3\u306e\u767a\u884c\u306e\u969b\u306b\u3001\u30b9\u30b3\u30fc\u30d7\u3068\u3044\u3046\u8907\u6570\u306e\u30c1\u30a7\u30c3\u30af\u9805\u76ee\u304c\u73fe\u308c\u307e\u3059\u3002\u3053\u308c\u304c\u8a8d\u53ef\u306e\u7bc4\u56f2\u3092\u793a\u3057\u3066\u3044\u307e\u3059\u3002(\u8a73\u7d30\u306f \u30b9\u30b3\u30fc\u30d7\u306e\u5b9a\u7fa9 \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002) [\u4f5c\u6210] \u30dc\u30bf\u30f3\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u5f97\u305f\u30c8\u30fc\u30af\u30f3(Access Token)\u306f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306a\u3069\u304b\u3089<code>Authorization: Bearer</code>\u30d8\u30c3\u30c0\u3092\u901a\u3057\u3066\u4e0e\u3048\u308b\u3053\u3068\u3067\u3001API\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002\u3053\u306e\u3088\u3046\u306b\u3059\u308b\u3068\u3001\u30c8\u30fc\u30af\u30f3\u306e\u767a\u884c\u4e3b\u306e\u6301\u3064\u6a29\u9650\u3068\u3001(\u5fc5\u8981\u306b\u5fdc\u3058\u3066)\u30b9\u30b3\u30fc\u30d7\u306b\u3088\u308a\u5b9a\u7fa9\u3055\u308c\u305f\u8a8d\u53ef\u7bc4\u56f2\u3001 <code>@must_have_permission</code> \u306a\u3069\u306e\u30c7\u30b3\u30ec\u30fc\u30bf\u306b\u3088\u3063\u3066\u5b9a\u7fa9\u3055\u308c\u305f\u5236\u7d04\u306e\u691c\u8a3c\u304c\u884c\u308f\u308c\u3001\u30a2\u30af\u30bb\u30b9\u306e\u8a31\u53ef\u30fb\u4e0d\u8a31\u53ef\u304c\u6c7a\u5b9a\u3055\u308c\u307e\u3059\u3002</p> <p>\u3053\u306e\u65b9\u6cd5\u306f\u5f8c\u8ff0\u3059\u308b OAuth\u306b\u3088\u308b\u8a8d\u53ef \u65b9\u5f0f\u3068\u7570\u306a\u308a\u3001Callback URL\u306a\u3069\u306e\u6e96\u5099\u304c\u4e0d\u8981\u306a\u4e00\u65b9\u3001\u30e6\u30fc\u30b6\u306b\u3088\u308b\u30a2\u30af\u30bb\u30b9\u30c8\u30fc\u30af\u30f3\u767a\u884c\u304c\u5fc5\u8981\u306a\u3053\u3068\u3001\u305d\u306e\u30a2\u30af\u30bb\u30b9\u30c8\u30fc\u30af\u30f3\u304c\u6f0f\u6d29\u3057\u305f\u969b\u306b\u30e6\u30fc\u30b6\u306e\u5354\u529b\u3092\u5f97\u306a\u304c\u3089\u89e3\u6c7a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u3053\u3068\u306a\u3069\u304b\u3089\u3001\u958b\u767a\u4e2d\u306b\u5229\u7528\u3067\u304d\u308b\u4fbf\u5229\u306a\u65b9\u5f0f\u7a0b\u5ea6\u306b\u8003\u3048\u308b\u3079\u304d\u3067\u3057\u3087\u3046\u3002</p>"},{"location":"guides/api/README.legacy/#oauth\u306b\u3088\u308b\u8a8d\u53ef","title":"OAuth\u306b\u3088\u308b\u8a8d\u53ef","text":"<p>Personal Access Token\u306f\u30e6\u30fc\u30b6\u306b\u624b\u52d5\u3067\u30c8\u30fc\u30af\u30f3\u3092\u4f5c\u6210\u3055\u305b\u3001\u30c8\u30fc\u30af\u30f3\u3092\u4f55\u3089\u304b\u306e\u65b9\u5f0f\u3067\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306b\u6e21\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u304c\u3001RDM\u306fOAuth https://tools.ietf.org/html/rfc6749 \u3092\u30b5\u30dd\u30fc\u30c8\u3057\u3066\u304a\u308a\u3001OAuth\u306b\u3088\u308a\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3068RDM\u306e\u9593\u3067\u8a8d\u53ef\u60c5\u5831\u306e\u3084\u308a\u3068\u308a\u3092\u5b9f\u73fe\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p>\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304cOAuth\u3092\u901a\u3058\u3066\u30e6\u30fc\u30b6\u304b\u3089\u64cd\u4f5c\u306e\u8a8d\u53ef\u3092\u5f97\u308b\u305f\u3081\u306b\u306f\u3001RDM\u304b\u3089Consumer Key\u3068Consumer Secret\u3068\u3044\u3046\u60c5\u5831\u3092\u5f97\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 \u3053\u306e\u60c5\u5831\u306f\u3001RDM\u306e\u30e6\u30fc\u30b6\u306e [\u8a2d\u5b9a] \u753b\u9762\u304b\u3089\u3001 [\u958b\u767a\u8005\u30a2\u30d7\u30ea] \u3067\u53d6\u5f97\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p></p> <p>API\u306b\u5bfe\u3057\u3066\u30a2\u30af\u30bb\u30b9\u3059\u308b\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306f\u3001OAuth 2.0\u306b\u5bfe\u5fdc\u3057\u305f\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u7528\u3044\u3066OAuth\u8a8d\u53ef\u30d5\u30ed\u30fc\u3092\u5b9f\u88c5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306fOAuth\u8a8d\u53ef\u30d5\u30ed\u30fc\u3092\u901a\u3057\u3066\u3001\u30e6\u30fc\u30b6\u306bRDM\u3078\u306e\u30ed\u30b0\u30a4\u30f3\u3068\u8a8d\u53ef\u3092\u6c42\u3081\u3001\u8a8d\u53ef\u3055\u308c\u308b\u3068Access Token(\u307e\u305f\u306f\u3001\u8981\u6c42\u3057\u305f<code>access_type</code>\u304c<code>offline</code>\u306e\u5834\u5408\u3001Refresh Token\u3068Access Token)\u3092\u53d6\u5f97\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u3042\u3068\u306fPersonal Access Token\u3068\u540c\u69d8\u306b\u3001<code>Authorization: Bearer</code>\u30d8\u30c3\u30c0\u306bAccess Token\u3092\u4e0e\u3048\u308b\u3053\u3068\u3067\u3001API\u30a2\u30af\u30bb\u30b9\u3092\u884c\u3046\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p>\u983b\u7e41\u306b\u5229\u7528\u3055\u308c\u308b\u53ef\u80fd\u6027\u304c\u3042\u308bAccess Token\u306f\u3001\u60aa\u7528\u3092\u9632\u3050\u305f\u3081\u306b\u77ed\u6642\u9593(1\u6642\u9593)\u3067\u671f\u9650\u5207\u308c\u3068\u306a\u308b\u3088\u3046\u8a2d\u8a08\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u305d\u306e\u305f\u3081\u3001\u8a8d\u53ef\u3092\u53d7\u3051\u3066\u304b\u3089\u3001\u9577\u671f\u9593\u306b\u308f\u305f\u3063\u3066\u305d\u306e\u8a8d\u53ef\u3055\u308c\u305f\u64cd\u4f5c\u3092\u5b9f\u65bd\u3057\u305f\u3044\u5834\u5408\u306f\u3001Refresh Token\u3092\u7528\u3044\u3066Access Token\u3092\u5b9a\u671f\u7684\u306b\u65b0\u898f\u53d6\u5f97\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 \u3053\u308c\u3089\u306e\u51e6\u7406\u306f\u3001\u591a\u304f\u306e\u5834\u5408OAuth\u5bfe\u5fdc\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30e9\u30a4\u30d6\u30e9\u30ea\u306b\u30ed\u30b8\u30c3\u30af\u304c\u7528\u610f\u3055\u308c\u3066\u304a\u308a\u3001RDM\u304c\u63d0\u4f9b\u3059\u308b\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8\u306eURL\u3092\u4e0e\u3048\u308c\u3070\u5b9f\u73fe\u3067\u304d\u307e\u3059\u3002 (\u53c2\u8003: \u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8\u306e\u60c5\u5831\u3084\u53ef\u80fd\u306a\u64cd\u4f5c\u306f https://github.com/RCOSDP/RDM-cas-overlay#web-server-authorization \u306b\u8a18\u8f09\u3055\u308c\u3066\u3044\u308b\u3002)</p> <p>OAuth\u3092\u7528\u3044\u305fAPI\u306e\u8a8d\u53ef\u3092\u30ed\u30fc\u30ab\u30eb\u74b0\u5883\u3067\u8a66\u3059\u305f\u3081\u306b\u306f\u3001\u958b\u767a\u74b0\u5883\u69cb\u7bc9\u6642\u306b cas-overlay\u3092\u542b\u3080\u69cb\u6210\u3067\u8d77\u52d5\u3059\u308b \u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002</p>"},{"location":"guides/api/README.legacy/#\u72ec\u81ea\u65b9\u5f0f\u306b\u3088\u308b\u30a2\u30af\u30bb\u30b9\u5236\u5fa1-signing-api-requests\u306e\u4f8b","title":"\u72ec\u81ea\u65b9\u5f0f\u306b\u3088\u308b\u30a2\u30af\u30bb\u30b9\u5236\u5fa1: Signing API requests\u306e\u4f8b","text":"<p>RDM\u306f\u30a2\u30c9\u30aa\u30f3\u306b\u95a2\u3057\u3066\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u306e\u3088\u3046\u306a\u9694\u96e2\u30e2\u30c7\u30eb\u306f\u63a1\u7528\u3057\u3066\u304a\u3089\u305a\u3001\u30a2\u30c9\u30aa\u30f3\u304b\u3089RDM\u672c\u4f53\u3068\u540c\u69d8\u306e\u64cd\u4f5c\u304c\u5b9f\u65bd\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 \u3053\u308c\u306f\u3001\u69d8\u3005\u306a\u51e6\u7406\u3092\u30a2\u30c9\u30aa\u30f3\u3068\u3057\u3066\u5b9f\u73fe\u3067\u304d\u308b\u4e00\u65b9\u3001\u305d\u306e\u5f37\u529b\u306a\u81ea\u7531\u5ea6\u3092\u60aa\u7528\u3055\u308c\u306a\u3044\u3088\u3046\u3001\u30a2\u30c9\u30aa\u30f3\u3067\u306f\u9069\u5207\u306a\u6a29\u9650\u5236\u5fa1\u3092\u884c\u3046\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002</p> <p>\u5148\u306b\u793a\u3057\u305f\u306e\u306f\u30e6\u30fc\u30b6\u306e\u8a8d\u53ef\u3092\u7d4c\u3066\u51e6\u7406\u3092\u5b9f\u65bd\u3059\u308b\u65b9\u5f0f\u3067\u3059\u304c\u3001\u30a2\u30c9\u30aa\u30f3\u306b\u3088\u3063\u3066\u306f\u3001\u5fc5\u305a\u3057\u3082\u64cd\u4f5c\u4e3b\u4f53\u3068\u306a\u308b\u30e6\u30fc\u30b6\u3092\u9650\u5b9a\u3057\u306a\u3044\u5f62\u3067\u632f\u821e\u3046\u5fc5\u8981\u304c\u3042\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002 \u3053\u306e\u3088\u3046\u306a\u5834\u5408\u306b\u95a2\u3057\u3066RDM\u306f\u7279\u5225\u306a\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u6a5f\u69cb\u3092\u63d0\u4f9b\u3057\u3066\u3044\u306a\u3044\u305f\u3081\u3001\u72ec\u81ea\u306b\u5916\u90e8\u30b7\u30b9\u30c6\u30e0(\u30a2\u30c9\u30aa\u30f3\u547c\u3073\u51fa\u3057\u5143)\u3068\u30a2\u30c9\u30aa\u30f3\u306e\u9593\u3067\u53d6\u308a\u6c7a\u3081\u3092\u3057\u3001\u4e0d\u6b63\u306a\u30e6\u30fc\u30b6\u304c\u30a2\u30af\u30bb\u30b9\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u306a\u3044\u3088\u3046\u306b\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u6a5f\u69cb\u3092\u5b9f\u88c5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002</p> <p>\u3053\u306e\u3088\u3046\u306a\u6a5f\u69cb\u3092\u5b9f\u73fe\u3059\u308b\u5834\u5408\u306b\u6700\u3082\u7c21\u5358\u306a\u65b9\u6cd5\u306f\u3001\u7b2c\u4e09\u8005\u304c\u63a8\u6e2c\u3057\u306b\u304f\u3044\u30c8\u30fc\u30af\u30f3\u3092\u5916\u90e8\u30b7\u30b9\u30c6\u30e0\u3068\u30a2\u30c9\u30aa\u30f3\u306e\u9593\u3067\u6c7a\u3081\u3001\u30a2\u30c9\u30aa\u30f3\u306f\u3053\u306e\u30c8\u30fc\u30af\u30f3\u3092\u3068\u3082\u306a\u3046\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u307f\u3092\u8a31\u53ef\u3059\u308b\u65b9\u5f0f\u3067\u3059\u3002 \u3053\u306e\u65b9\u5f0f\u306f\u5b9f\u73fe\u304c\u5bb9\u6613\u306a\u4e00\u65b9\u3001\u4e2d\u9593\u8005\u653b\u6483\u306a\u3069\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u5185\u5bb9\u304c\u596a\u308f\u308c\u3066\u3057\u307e\u3046\u3068\u3053\u306e\u30c8\u30fc\u30af\u30f3\u3082\u6f0f\u6d29\u3057\u3066\u3057\u307e\u3046\u3068\u3044\u3046\u554f\u984c\u304c\u3042\u308a\u307e\u3059\u3002(\u653b\u6483\u8005\u306f\u79d8\u5bc6\u306e\u30c8\u30fc\u30af\u30f3\u3092\u7528\u3044\u3066\u81ea\u7531\u306b\u30a2\u30c9\u30aa\u30f3\u3092\u64cd\u4f5c\u3067\u304d\u3066\u3057\u307e\u3046\u3002)</p> <p>\u3053\u306e\u3088\u3046\u306a\u653b\u6483\u3078\u306e\u5bfe\u7b56\u3068\u3057\u3066\u3001\u79d8\u5bc6\u306e\u30c8\u30fc\u30af\u30f3\u305d\u306e\u3082\u306e\u3092\u30ea\u30af\u30a8\u30b9\u30c8\u306b\u542b\u3081\u308b\u306e\u3067\u306f\u306a\u304f\u3001\u79d8\u5bc6\u306e\u30c8\u30fc\u30af\u30f3\u3068\u3001\u305d\u306e\u4ed6\u306e\u60c5\u5831\u3092\u5408\u308f\u305b\u305f\u30cf\u30c3\u30b7\u30e5\u5024\u3092\u8a08\u7b97\u3057\u3001\u305d\u306e\u30cf\u30c3\u30b7\u30e5\u3092\u30ea\u30af\u30a8\u30b9\u30c8\u306b\u542b\u3081\u308b\u3053\u3068\u304c\u8003\u3048\u3089\u308c\u307e\u3059\u3002\u3053\u308c\u306b\u3088\u308a\u3001\u53d7\u4fe1\u5074\u306f\u540c\u69d8\u306e\u30cf\u30c3\u30b7\u30e5\u8a08\u7b97\u3092\u884c\u306a\u3063\u3066\u9001\u4fe1\u5074\u306e\u30cf\u30c3\u30b7\u30e5\u5024\u3068\u306e\u6bd4\u8f03\u3092\u884c\u3046\u3053\u3068\u3067\u3001\u9001\u4fe1\u5074\u304c\u79d8\u5bc6\u306e\u30c8\u30fc\u30af\u30f3\u3092\u6240\u6301\u3057\u3066\u3044\u308b\u304b\u3092\u691c\u8a3c\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p>\u4f8b\u3068\u3057\u3066\u3001IQB-RIMS\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u306f\u3001\u30a2\u30c9\u30aa\u30f3\u306e\u8a2d\u5b9a\u60c5\u5831\u306b\u57fa\u3065\u3044\u305f\u30cf\u30c3\u30b7\u30e5\u3092\u751f\u6210\u3057\u3001\u72ec\u81ea\u306eHTTP\u30d8\u30c3\u30c0 <code>X-RDM-Token</code> \u306b\u683c\u7d0d\u3059\u308b\u3088\u3046\u306b\u3057\u3066\u3044\u307e\u3059\u3002 \u3053\u308c\u306b\u3088\u308a\u3001\u3042\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u30a2\u30bf\u30c3\u30c1\u3055\u308c\u305f\u30a2\u30c9\u30aa\u30f3\u306b\u304a\u3044\u3066\u30cf\u30c3\u30b7\u30e5\u304c\u6f0f\u6d29\u3057\u305f\u3068\u3057\u3066\u3082\u3001\u5225\u306e\u30a2\u30c9\u30aa\u30f3\u306b\u5bfe\u3057\u3066\u60aa\u7528\u306f\u3067\u304d\u306a\u3044\u3088\u3046\u306b\u914d\u616e\u3057\u3066\u3044\u307e\u3059\u3002 \u30cf\u30c3\u30b7\u30e5\u751f\u6210\u51e6\u7406\u306f\u3001RDM\u304c\u63d0\u4f9b\u3059\u308b\u30c7\u30b3\u30ec\u30fc\u30bf\u4e00\u89a7\u306e\u3088\u3046\u306b\u30c7\u30b3\u30ec\u30fc\u30bf\u3068\u3057\u3066\u5b9a\u7fa9\u3059\u308b\u3053\u3068\u3067\u3001\u518d\u5229\u7528\u6027\u3092\u9ad8\u3081\u3066\u3044\u307e\u3059\u3002</p> <p><pre><code>def must_have_valid_hash():\n \"\"\"Decorator factory that ensures that a request have valid X-RDM-Token header.\n :returns: Decorator function\n \"\"\"\n def wrapper(func):\n\n @functools.wraps(func)\n def wrapped(*args, **kwargs):\n owner = kwargs['node']\n addon = owner.get_addon(IQBRIMSAddonConfig.short_name)\n if addon is None:\n raise HTTPError(http.BAD_REQUEST)\n secret = addon.get_secret()\n process_def_id = addon.get_process_definition_id()\n valid_hash = hashlib.sha256((secret + process_def_id + owner._id).encode('utf8')).hexdigest()\n request_hash = request.headers.get('X-RDM-Token', None)\n logger.debug('must_have_valid_hash: request_hash={}'.format(request_hash))\n logger.debug('must_have_valid_hash: valid_hash={}'.format(valid_hash))\n if request_hash != valid_hash:\n raise HTTPError(\n http.FORBIDDEN,\n data={'message_long': ('User has restricted access to this page.')}\n )\n return func(*args, **kwargs)\n\n return wrapped\n\n return wrapper\n</code></pre> (\u5f15\u7528: https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/iqbrims/utils.py#L142)</p> <p>\u3053\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u305f\u72ec\u81ea\u306e <code>addons.iqbrims.utils.must_have_valid_hash</code> \u30c7\u30b3\u30ec\u30fc\u30bf\u3092\u7528\u3044\u3066\u3001 \u500b\u3005\u306eViews\u3078\u306e\u30a2\u30af\u30bb\u30b9\u306e\u969b\u306b\u30cf\u30c3\u30b7\u30e5\u5024\u306e\u8a08\u7b97\u30fb\u8a2d\u5b9a\u304c\u5fc5\u8981\u306a\u3053\u3068\u3092\u660e\u793a\u3057\u3066\u3044\u307e\u3059\u3002</p> <p><pre><code>@must_be_valid_project\n@must_have_addon(SHORT_NAME, 'node')\n@must_have_valid_hash() # Hash\u306e\u8a2d\u5b9a\u304c\u5fc5\u8981\u306a\u3053\u3068\u3092\u793a\u3059\ndef iqbrims_post_workflow_state(**kwargs):\n node = kwargs['node'] or kwargs['project']\n ... # Views\u306e\u51e6\u7406\n</code></pre> (\u5f15\u7528: https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/iqbrims/views.py#L229)</p> <p>\u3053\u308c\u3089\u306e\u30cf\u30c3\u30b7\u30e5\u8a08\u7b97\u306b\u3069\u306e\u7a0b\u5ea6\u306e\u30ea\u30b9\u30af\u3092\u60f3\u5b9a\u3059\u308b\u304b\u306f\u5229\u7528\u5f62\u614b\u306b\u3088\u3063\u3066\u7570\u306a\u308a\u307e\u3059\u3002\u4f8b\u3048\u3070\u3001Amazon S3\u306eSigning and authenticating REST requests https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html \u3067\u306f\u3001\u9001\u4fe1\u6642\u523b\u3092\u542b\u3080\u30ea\u30af\u30a8\u30b9\u30c8\u30d8\u30c3\u30c0\u3092\u30cf\u30c3\u30b7\u30e5\u8a08\u7b97\u306e\u5bfe\u8c61\u306b\u542b\u3081\u308b\u3053\u3068\u3067\u3001\u30cf\u30c3\u30b7\u30e5\u5024\u3092\u542b\u3080\u30ea\u30af\u30a8\u30b9\u30c8\u304c\u6f0f\u6d29\u3057\u3066\u3082\u3001\u540c\u3058\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306b\u5bfe\u3059\u308b\u30ea\u30af\u30a8\u30b9\u30c8\u306f\u4ee5\u5f8c\u4e0d\u53ef\u80fd\u306a\u3088\u3046\u306b\u914d\u616e\u304c\u306a\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u30cf\u30c3\u30b7\u30e5\u5024\u306e\u8a08\u7b97\u306b\u3069\u306e\u3088\u3046\u306a\u8981\u7d20\u3092\u4f7f\u3046\u304b\u306f\u30a2\u30c9\u30aa\u30f3\u306e\u5b9f\u88c5\u306b\u4f9d\u5b58\u3059\u308b\u90e8\u5206\u3067\u306f\u3042\u308a\u307e\u3059\u304c\u3001\u305f\u3068\u3048\u30ea\u30af\u30a8\u30b9\u30c8\u304c\u6f0f\u6d29\u3057\u305f\u3068\u3057\u3066\u3082\u3001\u305d\u306e\u5f71\u97ff\u7bc4\u56f2\u304c\u3042\u308b\u7a0b\u5ea6\u9650\u5b9a\u7684\u306b\u306a\u308b\u3088\u3046\u914d\u616e\u3057\u3066\u30cf\u30c3\u30b7\u30e5\u8a08\u7b97\u3092\u5b9f\u88c5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u3067\u3057\u3087\u3046\u3002</p>"},{"location":"guides/api/README.legacy/#\u65e2\u5b58api\u306b\u3088\u308b\u64cd\u4f5c","title":"\u65e2\u5b58API\u306b\u3088\u308b\u64cd\u4f5c","text":"<p>RDM\u306f\u591a\u304f\u306e\u6a5f\u80fd\u3092API\u3068\u3057\u3066\u63d0\u4f9b\u3057\u3066\u3044\u308b\u305f\u3081\u3001\u3059\u3067\u306b\u3042\u308b\u6a5f\u80fd\u306b\u3064\u3044\u3066\u306f\u7a4d\u6975\u7684\u306b\u6d3b\u7528\u3059\u3079\u304d\u3067\u3057\u3087\u3046\u3002\u307e\u305f\u3001\u5185\u90e8\u3067\u306fDjango\u306e\u898f\u5247\u306b\u3057\u305f\u304c\u3063\u3066\u4f5c\u6210\u3055\u308c\u305fDjango Model\u3092\u4ecb\u3057\u3066\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u7ba1\u7406\u3092\u884c\u306a\u3063\u3066\u3044\u308b\u305f\u3081\u3001\u3053\u306e\u672c\u7ae0\u3067\u306f\u3001OSF APIv2\u306b\u3088\u308b\u64cd\u4f5c\u3068Django Model\u306b\u3088\u308b\u30e2\u30c7\u30eb\u306e\u76f4\u63a5\u64cd\u4f5c\u306b\u95a2\u3057\u3066\u8aac\u660e\u3057\u307e\u3059\u3002</p>"},{"location":"guides/api/README.legacy/#osf-apiv2-\u306b\u3088\u308b\u5916\u90e8\u304b\u3089\u306e\u64cd\u4f5c","title":"OSF APIv2 \u306b\u3088\u308b\u5916\u90e8\u304b\u3089\u306e\u64cd\u4f5c","text":"<p>OSF APIv2\u306fRDM\u304c\u5099\u3048\u308bRESTful API\u3067\u3059\u3002OSF APIv2\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8 https://developer.osf.io/ \u3067\u8aac\u660e\u3055\u308c\u3066\u3044\u308b\u901a\u308a\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u5bfe\u3057\u3066\u69d8\u3005\u306a\u64cd\u4f5c\u3092\u5b9f\u65bd\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p>\u3053\u308c\u3089\u306eAPI\u306f\u5916\u90e8\u30b7\u30b9\u30c6\u30e0\u304b\u3089\u306e\u547c\u3073\u51fa\u3057\u306b\u5229\u7528\u3055\u308c\u308b\u4ed6\u3001Ember\u30d9\u30fc\u30b9\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304b\u3089\u306e\u64cd\u4f5c\u306b\u3082\u5229\u7528\u3055\u308c\u307e\u3059\u3002\u307e\u305f\u3001JSON-API https://jsonapi.org/format/1.0/ \u306b\u6e96\u62e0\u3057\u305f\u5f62\u5f0f\u3067\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002</p>"},{"location":"guides/api/README.legacy/#\u30b9\u30b3\u30fc\u30d7\u306e\u5b9a\u7fa9","title":"\u30b9\u30b3\u30fc\u30d7\u306e\u5b9a\u7fa9","text":"<p>API\u306e\u64cd\u4f5c\u306b\u306fOAuth\u306b\u3066\u8aac\u660e\u3057\u305f\u3088\u3046\u306b\u3001\u9069\u5207\u306a\u30b9\u30b3\u30fc\u30d7\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 RDM\u306b\u3066\u6307\u5b9a\u53ef\u80fd\u306a\u30b9\u30b3\u30fc\u30d7\u306f <code>oauth_scopes.public_scopes</code> \u3068\u3057\u3066\u5b9a\u7fa9\u3055\u308c\u307e\u3059\u3002</p> <ul> <li>https://github.com/RCOSDP/RDM-osf.io/blob/develop/framework/auth/oauth_scopes.py#L291-L363</li> </ul> <p>\u3053\u308c\u3089\u306e\u30b9\u30b3\u30fc\u30d7\u306f<code>CoreScopes</code> https://github.com/RCOSDP/RDM-osf.io/blob/develop/framework/auth/oauth_scopes.py#L23 \u306e\u7d44\u307f\u5408\u308f\u305b\u3068\u3057\u3066\u8868\u73fe\u3055\u308c\u307e\u3059\u3002 \u305d\u308c\u305e\u308c\u306e\u64cd\u4f5c\u304c\u3069\u306e\u3088\u3046\u306a\u30b9\u30b3\u30fc\u30d7\u3092\u8981\u6c42\u3059\u308b\u304b\u306f\u3001View\u30af\u30e9\u30b9\u306b\u5b9a\u7fa9\u3055\u308c\u307e\u3059\u3002\u4f8b\u3048\u3070\u3001NodeList\u306b\u95a2\u3059\u308b\u64cd\u4f5c ( https://developer.osf.io/#operation/nodes_list \u3084 https://developer.osf.io/#operation/nodes_create ) \u3067\u3042\u308c\u3070\u3001</p> <p><pre><code>class NodeList(JSONAPIBaseView, bulk_views.BulkUpdateJSONAPIView, bulk_views.BulkDestroyJSONAPIView, bulk_views.ListBulkCreateJSONAPIView, NodesFilterMixin, WaterButlerMixin, NodeOptimizationMixin):\n \"\"\"The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_list).\n \"\"\"\n permission_classes = (\n drf_permissions.IsAuthenticatedOrReadOnly,\n base_permissions.TokenHasScope,\n )\n required_read_scopes = [CoreScopes.NODE_BASE_READ]\n required_write_scopes = [CoreScopes.NODE_BASE_WRITE]\n model_class = apps.get_model('osf.AbstractNode')\n\n parser_classes = (JSONAPIMultipleRelationshipsParser, JSONAPIMultipleRelationshipsParserForRegularJSON,)\n serializer_class = NodeSerializer\n ...\n</code></pre> (\u5f15\u7528: https://github.com/RCOSDP/RDM-osf.io/blob/develop/api/nodes/views.py#L228-L229)</p> <p>\u306e\u3088\u3046\u306b\u3001 <code>required_read_scopes</code> \u3068 <code>required_write_scopes</code> \u3068\u3057\u3066\u3001\u5fc5\u8981\u306a\u30b9\u30b3\u30fc\u30d7\u304c\u5b9a\u7fa9\u3055\u308c\u307e\u3059\u3002</p>"},{"location":"guides/api/README.legacy/#django-model\u306b\u3088\u308b\u5185\u90e8\u304b\u3089\u306e\u64cd\u4f5c","title":"Django Model\u306b\u3088\u308b\u5185\u90e8\u304b\u3089\u306e\u64cd\u4f5c","text":"<p>RDM\u306fDjango\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3068\u3057\u3066\u69cb\u6210\u3055\u308c\u3066\u3044\u308b\u305f\u3081\u3001\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3078\u306e\u30a2\u30af\u30bb\u30b9\u306fDjango Model\u3092\u4ecb\u3057\u3066\u884c\u3044\u307e\u3059\u3002 \u3053\u306e\u64cd\u4f5c\u306e\u4f8b\u3068\u3057\u3066\u3001<code>django.dispatch.receiver</code> \u306b\u3088\u308b\u30e2\u30c7\u30eb\u5909\u66f4\u691c\u77e5\u3068\u3001 <code>osf.models</code> \u5185\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u4ecb\u3057\u305f\u64cd\u4f5c\u4f8b\u3092\u793a\u3057\u307e\u3059\u3002</p> <p><pre><code>from django.dispatch import receiver\n...\nfrom osf.models import Contributor, RdmAddonOption, AbstractNode\n\n...\n\n@receiver(post_save, sender=Node)\ndef add_iqbrims_addon(sender, instance, created, **kwargs):\n if IQBRIMSAddonConfig.short_name not in ws_settings.ADDONS_AVAILABLE_DICT:\n return\n\n inst_ids = instance.affiliated_institutions.values('id')\n addon_option = RdmAddonOption.objects.filter(\n provider=IQBRIMSAddonConfig.short_name,\n institution_id__in=Subquery(inst_ids),\n management_node__isnull=False,\n is_allowed=True\n ).first()\n if addon_option is None:\n return\n if addon_option.organizational_node is not None and \\\n not addon_option.organizational_node.is_contributor(instance.creator):\n return\n\n instance.add_addon(IQBRIMSAddonConfig.short_name, auth=None, log=False)\n</code></pre> (\u5f15\u7528: https://github.com/RCOSDP/RDM-osf.io/blob/develop/addons/iqbrims/models.py#L309-L327)</p> <p>\u4ee5\u4e0b\u3067\u3001\u6ce8\u76ee\u3059\u3079\u304d\u30b3\u30fc\u30c9\u306b\u3064\u3044\u3066\u305d\u308c\u305e\u308c\u8aac\u660e\u3057\u307e\u3059\u3002</p>"},{"location":"guides/api/README.legacy/#receiver\u306b\u3088\u308b\u30e2\u30c7\u30eb\u5909\u66f4\u691c\u77e5","title":"receiver\u306b\u3088\u308b\u30e2\u30c7\u30eb\u5909\u66f4\u691c\u77e5","text":"<p><code>django.dispatch.receiver</code> \u30c7\u30b3\u30ec\u30fc\u30bf\u3092\u7528\u3044\u308b\u3053\u3068\u3067\u3001\u7279\u5b9a\u306eModel\u306b\u5909\u66f4\u304c\u751f\u3058\u305f\u5834\u5408\u306e\u51e6\u7406\u3092\u8a18\u8ff0\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <pre><code>@receiver(post_save, sender=Node)\ndef add_iqbrims_addon(sender, instance, created, **kwargs):\n ...\n</code></pre> <p>\u3053\u306e\u4f8b\u306e\u5834\u5408\u306f\u3001<code>post_save</code>\u3092\u6307\u5b9a\u3057\u3066\u3044\u307e\u3059\u306e\u3067\u3001Node\u578b(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u3053\u306e\u578b\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3067\u8868\u73fe\u3055\u308c\u307e\u3059)\u3092\u6301\u3064\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u66f4\u65b0\u5f8c\u306b\u3001<code>add_iqbrims_addon</code>\u95a2\u6570\u304c\u547c\u3073\u51fa\u3055\u308c\u307e\u3059\u3002</p> <p><code>post_save</code>\u306e\u307b\u304b\u3001\u691c\u77e5\u53ef\u80fd\u306a\u5909\u66f4\u64cd\u4f5c\u306f\u3001 https://docs.djangoproject.com/en/3.1/ref/signals/ \u306b\u5217\u6319\u3055\u308c\u3066\u3044\u307e\u3059\u3002 RDM\u5185\u3067\u306f\u3001 <code>pre_save</code>, <code>post_save</code>, <code>post_delete</code>, <code>m2m_changed</code> \u304c\u3059\u3067\u306b\u4f7f\u7528\u3055\u308c\u3066\u3044\u307e\u3059\u3002</p>"},{"location":"guides/api/README.legacy/#osfmodels\u306b\u3088\u308b\u30e2\u30c7\u30eb\u64cd\u4f5c","title":"osf.models\u306b\u3088\u308b\u30e2\u30c7\u30eb\u64cd\u4f5c","text":"<p><code>django.dispatch.receiver(post_save, sender=Node)</code> \u30c7\u30b3\u30ec\u30fc\u30bf\u306e\u5834\u5408\u306f\u3001\u7b2c2\u5f15\u6570\u306e <code>instance</code> \u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306bNode\u3078\u306e\u53c2\u7167\u304c\u683c\u7d0d\u3055\u308c\u307e\u3059\u3002 Django Model\u306f <code>osf.models</code> \u306b\u5b9a\u7fa9\u3057\u3066\u3042\u308a\u307e\u3059\u3002\u4f8b\u3048\u3070 Node Model\u306a\u3089\u3070\u3001 https://github.com/RCOSDP/RDM-osf.io/blob/develop/osf/models/node.py#L2457 \u3067\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u3059\u3002</p> <p>\u4f8b\u3048\u3070\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5185\u3067\u7279\u5b9a\u306e\u30a2\u30c9\u30aa\u30f3\u3092\u6709\u52b9\u5316\u3057\u305f\u3044\u5834\u5408\u306f\u3001 <code>add_addon</code>\u95a2\u6570 https://github.com/RCOSDP/RDM-osf.io/blob/develop/osf/models/node.py#L2290 \u3092\u547c\u3073\u51fa\u3059\u3053\u3068\u3067\u5b9f\u73fe\u3067\u304d\u307e\u3059\u3002</p> <pre><code>@receiver(post_save, sender=Node)\ndef add_iqbrims_addon(sender, instance, created, **kwargs):\n ...\n\n instance.add_addon(IQBRIMSAddonConfig.short_name, auth=None, log=False)\n</code></pre> <p>\u3053\u306e\u3088\u3046\u306b\u3057\u3066\u3001\u76f4\u63a5Model\u3092\u64cd\u4f5c\u3059\u308b\u3053\u3068\u3067\u3001RDM\u306b\u5bfe\u3057\u3066\u69d8\u3005\u306a\u4f5c\u7528\u3092\u4e0e\u3048\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 \u30e2\u30c7\u30eb\u64cd\u4f5c\u306f\u81ea\u7531\u306b\u5909\u66f4\u3092\u884c\u3048\u308b\u4e00\u65b9\u3001\u30e6\u30fc\u30b6\u304c\u3053\u308c\u3089\u306e\u5909\u66f4\u3092\u9069\u5207\u306b\u7406\u89e3\u3067\u304d\u308b\u3088\u3046\u306b\u3059\u308b\u914d\u616e\u3092\u884c\u3046\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 \u3055\u3082\u306a\u3044\u3068\u3001\u300c\u4f55\u304b\u304c\u52dd\u624b\u306b\u81ea\u8eab\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u58ca\u3057\u305f\u300d\u3068\u601d\u3063\u3066\u3057\u307e\u3046\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002\u30a2\u30c9\u30aa\u30f3\u304c\u3001\u30e6\u30fc\u30b6\u81ea\u8eab\u306b\u8a31\u53ef\u3055\u308c\u305f\u7bc4\u56f2\u3067\u69d8\u3005\u306a\u5909\u66f4\u3092\u5b9f\u65bd\u3057\u3066\u3044\u308b\u3088\u3046\u306b\u3001\u30e6\u30fc\u30b6\u306b\u7406\u89e3\u3057\u3066\u3082\u3089\u3048\u308b\u3088\u3046\u306a\u52d5\u4f5c\u3092\u8a2d\u8a08\u3059\u308b\u3053\u3068\u304c\u91cd\u8981\u3067\u3059\u3002</p>"},{"location":"guides/ec2/","title":"EC2 Development Environment / EC2 \u3067\u306e\u958b\u767a\u74b0\u5883","text":"<p>Summary: Guide to setting up the GakuNin RDM development environment on Amazon EC2 \u6982\u8981: Amazon EC2 \u306b GakuNin RDM \u306e\u958b\u767a\u74b0\u5883\u3092\u69cb\u7bc9\u3059\u308b\u624b\u5f15\u304d</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05</li> <li>Normative for: <code>docs/guides/ec2/</code></li> <li>Related: SPEC-06 Documentation Conventions</li> </ul> <p></p>"},{"location":"guides/ec2/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"guides/ec2/#overview","title":"Overview","text":"<p>This guide shows how to set up the GakuNin RDM development environment on an Amazon EC2 instance.</p>"},{"location":"guides/ec2/#prerequisites","title":"Prerequisites","text":"<ul> <li>An AWS account</li> <li>Basic familiarity with Linux command-line tools</li> <li>SSH access to your EC2 instance</li> </ul>"},{"location":"guides/ec2/#quick-start-on-ec2","title":"Quick start on EC2","text":"<ol> <li>Launch an EC2 instance (Ubuntu 22.04 or Amazon Linux 2 recommended)</li> <li>Install Docker and Docker Compose</li> <li>Clone this repository</li> <li>Run <code>./installer/install.sh --yes</code></li> <li>Configure your EC2 security group to allow HTTP (port 80) and SSH (port 22)</li> <li>Open http://localhost:5000 in your browser</li> </ol> <p>This command is available from milestone M2.</p>"},{"location":"guides/ec2/#legacy-content","title":"Legacy content","text":"<p>The legacy EC2 setup instructions are kept verbatim in <code>README.legacy.md</code> for reference and will be rewritten per milestone.</p> <p></p>"},{"location":"guides/ec2/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"guides/ec2/#\u6982\u8981","title":"\u6982\u8981","text":"<p>\u3053\u306e\u30ac\u30a4\u30c9\u306f\u3001Amazon EC2 \u4e0a\u306b GakuNin RDM \u306e\u958b\u767a\u74b0\u5883\u3092\u69cb\u7bc9\u3059\u308b\u65b9\u6cd5\u3092\u793a\u3057\u307e\u3059\u3002</p>"},{"location":"guides/ec2/#\u524d\u63d0\u6761\u4ef6","title":"\u524d\u63d0\u6761\u4ef6","text":"<ul> <li>AWS \u30a2\u30ab\u30a6\u30f3\u30c8</li> <li>Linux \u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u30c4\u30fc\u30eb\u306e\u57fa\u672c\u7684\u306a\u4f7f\u3044\u65b9\u306e\u7406\u89e3</li> <li>EC2 \u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3078\u306e SSH \u30a2\u30af\u30bb\u30b9</li> </ul>"},{"location":"guides/ec2/#ec2-\u3067\u306e\u30af\u30a4\u30c3\u30af\u30b9\u30bf\u30fc\u30c8","title":"EC2 \u3067\u306e\u30af\u30a4\u30c3\u30af\u30b9\u30bf\u30fc\u30c8","text":"<ol> <li>EC2 \u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u8d77\u52d5\u3059\u308b\uff08Ubuntu 22.04 \u307e\u305f\u306f Amazon Linux 2 \u3092\u63a8\u5968\uff09</li> <li>Docker \u3068 Docker Compose \u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3059\u308b</li> <li>\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3092 clone \u3059\u308b</li> <li><code>./installer/install.sh --yes</code> \u3092\u5b9f\u884c\u3059\u308b</li> <li>EC2 \u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30b0\u30eb\u30fc\u30d7\u3067 HTTP (\u30dd\u30fc\u30c8 80) \u3068 SSH (\u30dd\u30fc\u30c8 22) \u3092\u8a31\u53ef\u3059\u308b</li> <li>\u30d6\u30e9\u30a6\u30b6\u3067 http://localhost:5000 \u3092\u958b\u304f</li> </ol> <p>\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306f M2 \u30de\u30a4\u30eb\u30b9\u30c8\u30fc\u30f3\u304b\u3089\u5229\u7528\u53ef\u80fd\u3067\u3059\u3002</p>"},{"location":"guides/ec2/#\u904e\u53bb\u306e\u30b3\u30f3\u30c6\u30f3\u30c4","title":"\u904e\u53bb\u306e\u30b3\u30f3\u30c6\u30f3\u30c4","text":"<p>\u904e\u53bb\u306e EC2 \u3078\u306e\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u624b\u9806\u306f\u3001\u53c2\u8003\u306e\u305f\u3081\u306b <code>README.legacy.md</code> \u306b\u305d\u306e\u307e\u307e\u6b8b\u3057\u3066\u304a\u308a\u3001\u30de\u30a4\u30eb\u30b9\u30c8\u30fc\u30f3\u3054\u3068\u306b\u66f8\u304d\u76f4\u3059\u4e88\u5b9a\u3067\u3059\u3002</p>"},{"location":"guides/ec2/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 EC2 (Elastic Compute Cloud) Amazon's service to run virtual computers on the internet. \u30a2\u30de\u30be\u30f3\u304c\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u4e0a\u3067\u4eee\u60f3\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u3092\u5b9f\u884c\u3059\u308b\u30b5\u30fc\u30d3\u30b9\u3002 Security group A virtual firewall that controls traffic to your EC2 instance. EC2 \u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3078\u306e\u30a2\u30af\u30bb\u30b9\u3092\u5236\u5fa1\u3059\u308b\u4eee\u60f3\u306e\u30d5\u30a1\u30a4\u30a2\u30a6\u30a9\u30fc\u30eb\u3002 SSH (Secure Shell) A secure way to log in to your remote computer and run commands. \u30ea\u30e2\u30fc\u30c8\u306e\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u306b\u5b89\u5168\u306b\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u65b9\u6cd5\u3002"},{"location":"guides/ec2/README.legacy/","title":"OSF evaluation on AWS EC2","text":""},{"location":"guides/ec2/README.legacy/#quick-start-guide","title":"Quick Start Guide","text":"<p>For setting up this project on your local environment, follow these steps:</p>"},{"location":"guides/ec2/README.legacy/#1-change-to-project-directory","title":"1. Change to Project Directory","text":"<p>Setup for git: <pre><code>git config --global user.name 'Your github account name' \ngit config --global user.email 'Your email address' \ngit config --global core.editor 'code --wait'\ngit config --global merge.tool 'code --wait \"$MERGED\"'\ngit config --global push.default simple\ngit config --list # githuconfig confirmation \n</code></pre></p> <p>You need generate and register your github token in your gitconfig.</p> <p>link: https://docs.github.com/ja/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens</p> <p>Navigate to the project root directory: <pre><code>git clone https://github.com/RCOSDP/RDM-osf.io.git\ngit clone -b develop https://github.com/RCOSDP/RDM-ember-osf-web.git\ngit clone https://github.com/RCOSDP/RDM-modular-file-renderer.git\ngit clone https://github.com/RCOSDP/RDM-waterbutler.git\n</code></pre></p>"},{"location":"guides/ec2/README.legacy/#2-docker-build","title":"2. Docker Build","text":"<p>setup docker and docker compose.</p> <p>link: https://docs.docker.jp/v1.12/compose/install.html</p> <p>link: https://docs.docker.com/engine/install/ubuntu/</p> <p>Build Docker images for each module: <pre><code>sudo docker build RDM-ember-osf-web -t rdm-osf-web:dev\nsudo docker build RDM-modular-file-renderer -t rdm-mfr:dev\nsudo docker build RDM-waterbutler -t rdm-wb:dev\nsudo docker build RDM-osf.io -t rdm-osf:dev\n</code></pre></p>"},{"location":"guides/ec2/README.legacy/#3-setup-loopback-interface","title":"3. Setup Loopback Interface","text":"<p>Configure your loopback interface on your machine: <pre><code>sudo apt install net-tools\nsudo ifconfig lo:0 192.168.168.167 netmask 255.255.255.255 up\n</code></pre></p>"},{"location":"guides/ec2/README.legacy/#4-change-to-module-directory","title":"4. Change to Module Directory","text":"<p>Navigate to the module directory: <pre><code>cd RDM-osf.io/\n</code></pre></p>"},{"location":"guides/ec2/README.legacy/#5-copy-and-update-local-settings","title":"5. Copy and Update Local Settings","text":"<p>Copy the local settings of the project: <pre><code>cp ./website/settings/local-dist.py ./website/settings/local.py\ncp ./api/base/settings/local-dist.py ./api/base/settings/local.py\ncp ./admin/base/settings/local-dist.py ./admin/base/settings/local.py\ncp ./tasks/local-dist.py ./tasks/local.py\n</code></pre></p> <p>Update the local settings of the project: RDM-osf.io/.docker-compose.env <pre><code>DOMAIN=http://ec2.compute-1.amazonaws.com:5000\nINTERNAL_DOMAIN=http://web:5000\nAPI_DOMAIN=http://api.ec2.compute-1.amazonaws.com:8000\nELASTIC_URI=elasticsearch:9200\nELASTIC6_URI=elasticsearch6:9201\nOSF_DB_HOST=postgres\nDB_HOST=mongo\nWATERBUTLER_URL=http://files.ec2.compute-1.amazonaws.com:7777\nWATERBUTLER_INTERNAL_URL=http://wb:7777\nCAS_SERVER_URL=http://accounts.ec2.compute-1.amazonaws.com:8080\nMFR_SERVER_URL=http://mfr.ec2.compute-1.amazonaws.com:7778\n#SHARE_URL=http://192.168.168.167:8000\nBROKER_URL=amqp://guest:guest@rabbitmq:5672\nREDIS_URL=redis://192.168.168.167:6379/1\n\nADMIN_URL=http://admin.ec2.compute-1.amazonaws.com:8001\nADMIN_INTERNAL_DOCKER_URL=http://admin:8001\n</code></pre> RDM-osf.io/.docker-compose.osf-web.env <pre><code>OSF_COOKIE_DOMAIN=.ec2.compute-1.amazonaws.com\nOSF_URL=http://ec2.compute-1.amazonaws.com:5000\nOSF_API_URL=http://api.ec2.compute-1.amazonaws.com:8000\nOSF_MFR_URL=http://mfr.ec2.compute-1.amazonaws.com:7778\nOSF_RENDER_URL=http://mfr.ec2.compute-1.amazonaws.com:7778/render\nOSF_FILE_URL=http://files.ec2.compute-1.amazonaws.com:7777\nOSF_HELP_URL=http://ec2.compute-1.amazonaws.com:5000/help\nOSF_COOKIE_LOGIN_URL=http://accounts.ec2.compute-1.amazonaws.com:8080/login\nOSF_OAUTH_URL=http://accounts.ec2.compute-1.amazonaws.com:8080/oauth2/profile\nSHARE_BASE_URL=https://share.osf.io/\nSHARE_API_URL=https://share.osf.io/api/v2\nSHARE_SEARCH_URL=https://share.osf.io/api/v2/search/creativeworks/_search\nCAS_URL=http://accounts.ec2.compute-1.amazonaws.com:8080\n</code></pre></p> <p>RDM-osf.io/.docker-compose.wb.env</p> <pre><code>DEBUG=\nSERVER_CONFIG_DEBUG=\nSERVER_CONFIG_HMAC_SECRET=changeme\nSERVER_CONFIG_ADDRESS=0.0.0.0\nSERVER_CONFIG_DOMAIN=http://ec2.compute-1.amazonaws.com:7777\nOSF_AUTH_CONFIG_API_URL=http://ec2.compute-1.amazonaws.com:5000/api/v1/files/auth/\nOSF_URL=http://ec2.compute-1.amazonaws.com:5000\n\nTASKS_CONFIG_BROKER_URL=amqp://guest:guest@rabbitmq:5672//\n</code></pre> <p>RDM-osf.io/.docker-compose.mfr.env <pre><code>DEBUG=\nSERVER_CONFIG_DEBUG=\nSERVER_CONFIG_HMAC_SECRET=changeme\n\nSERVER_CONFIG_ADDRESS=0.0.0.0\nSERVER_CONFIG_ALLOWED_PROVIDER_DOMAINS='http://192.168.168.167:5000/ http://192.168.168.167:7777/ http://mfr:7777/ http://ec2.compute-1.amazonaws.com:5000/ http://files.ec2.compute-1.amazonaws.com:7777/'\n\nUNOCONV_PORT_2002_TCP_ADDR=192.168.168.167\nEXTENSION_CONFIG_LOCAL_DEVELOPMENT=1\n</code></pre></p> <p>RDM-osf.io/admin/base/settings/local.py <pre><code>SESSION_COOKIE_DOMAIN = 'ec2.compute-1.amazonaws.com'\nfrom .defaults import *\n\nALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', 'localhost,osf.io').split(',')\n</code></pre></p> <p>RDM-osf.io/docker-compose.override.yml</p> <pre><code>version: \"3.4\"\n\nservices:\n mfr_requirements:\n image: rdm-mfr:dev\n mfr:\n image: rdm-mfr:dev\n wb_requirements:\n image: rdm-wb:dev\n wb:\n image: rdm-wb:dev\n wb_worker:\n image: rdm-wb:dev\n ember_osf_web:\n image: rdm-osf-web:dev\n environment:\n - BACKEND=env\n env_file:\n - .docker-compose.osf-web.env\n volumes:\n - ../RDM-ember-osf-web:/code:cached\n - ember_osf_web_dist_vol:/code/dist\n requirements:\n image: rdm-osf:dev\n assets:\n image: rdm-osf:dev\n admin_assets:\n image: rdm-osf:dev\n worker:\n image: rdm-osf:dev\n admin:\n image: rdm-osf:dev\n api:\n image: rdm-osf:dev\n web:\n image: rdm-osf:dev\n preprints:\n environment:\n - BACKEND=env\n env_file:\n - .docker-compose.osf-web.env\n fakecas:\n image: quay.io/centerforopenscience/fakecas:master\n command: fakecas -host=0.0.0.0:8080 -osfhost=ec2.compute-1.amazonaws.com:5000 -dbaddress=postgres://postgres@postgres:5432/osf?sslmode=disable\n registries:\n environment:\n - BACKEND=env\n env_file:\n - .docker-compose.osf-web.env\n reviews:\n environment:\n - BACKEND=env\n env_file:\n - .docker-compose.osf-web.env\n</code></pre> <p>RDM-osf.io/website/settings/local.py <pre><code>DOMAIN = PROTOCOL + 'ec2.compute-1.amazonaws.com:5000/'\nINTERNAL_DOMAIN = DOMAIN\nAPI_DOMAIN = PROTOCOL + 'ec2.compute-1.amazonaws.com:8000/'\nOSF_COOKIE_DOMAIN = 'ec2.compute-1.amazonaws.com'\n</code></pre></p>"},{"location":"guides/ec2/README.legacy/#6-docker-compose-up-requirements","title":"6. Docker Compose Up Requirements","text":"<p>Ensure you have the required services running: <pre><code>sudo docker compose up requirements wb_requirements mfr_requirements\n</code></pre></p>"},{"location":"guides/ec2/README.legacy/#7-start-core-component-services-detached","title":"7. Start Core Component Services (Detached)","text":"<p>Spin up denpent services: <pre><code>sudo docker compose up -d elasticsearch elasticsearch6 postgres mongo rabbitmq\n</code></pre></p>"},{"location":"guides/ec2/README.legacy/#8-assets-setup","title":"8. Assets Setup","text":"<p>Remove your existing node_modules and start the assets: <pre><code>sudo rm -Rf ./node_modules\nsudo rm -Rf ./website/static/vendor/bower_components\nsudo rm -Rf ./admin/node_modules\nsudo rm -Rf ./admin/static/vendor/bower_components\nsudo docker compose up -d assets admin_assets\n</code></pre></p>"},{"location":"guides/ec2/README.legacy/#9-more-services","title":"9. More Services","text":"<p>Upgrade dependency RDM-osf.io/requirements/dev.txt <pre><code>pytest-xdist==1.34.0\n</code></pre></p> <p>Start additional services: <pre><code>sudo docker compose up -d unoconv mfr wb fakecas sharejs\n</code></pre></p>"},{"location":"guides/ec2/README.legacy/#10-database-migration","title":"10. Database Migration","text":"<p>When starting with an empty database you will need to run migrations and populate preprint providers. Perform database migrations: <pre><code>sudo docker compose run --rm web python3 manage.py migrate\n</code></pre> See the Running arbitrary commands section below for instructions.</p>"},{"location":"guides/ec2/README.legacy/#11-run-the-project","title":"11. Run the Project","text":"<p>Finally start the OSF Web, API Server, and Preprints (Detached): <pre><code>sudo docker compose up -d wb_worker worker web api admin preprints ember_osf_web registries reviews\n</code></pre></p> <p>We can see containers and images list. <pre><code>sudo docker iamges\nsudo docker ps\n</code></pre></p> <p>We can see the rdm page through browser. </p> <p>link : https://EC2-url:5000/</p> <p></p> <p>Once you follow these steps, you should have a local environment up and running for development.</p>"},{"location":"guides/ec2/README.legacy/#configuration-guide","title":"Configuration Guide","text":""},{"location":"guides/ec2/README.legacy/#1-lets-encrypt-setup","title":"1. Let's Encrypt Setup","text":"<p>Configure AWS Credentials</p> <p>Use the AWS CLI Docker image to configure your AWS credentials:</p> <p><pre><code>sudo docker run --rm -it -v \"/root/.aws:/root/.aws\" amazon/aws-cli configure\n</code></pre> Verify AWS Credentials Nii has a Certificate Management Service link: https://certs.nii.ac.jp/ . You can contact to them if your service is created on NII infrastructure.</p> <p>Verify if your AWS credentials are working and have nominal access to Route 53:</p> <p><pre><code>sudo docker run --rm -it -v \"/root/.aws:/root/.aws\" amazon/aws-cli route53 list-hosted-zones\n</code></pre> Request a Let's Encrypt Wildcard Certificate</p> <p>Use the certbot/dns-route53 Docker image to request a wildcard certificate, forwarding your AWS credentials:</p> <pre><code>certbot certonly --dns-route53 --domain \"your.com\" --domain \"*.your.com\"\n</code></pre> <p>Automate Certificate Renewal</p> <p>Create systemd timer to automate certificate renewal, then daemon-reload, enable, and start the timer. Create /etc/systemd/system/certbot.service. For the docker command, remove --it for non-interactive execution by systemd, and pass /usr/bin to the container to allow execution of systemctl by --deploy-hook: <pre><code>[Unit]\nDescription=Let's Encrypt certificate renewal\n\n[Service]\nType=oneshot\nExecStart=certbot renew --dns-route53 --quiet --agree-tos --deploy-hook \"cd /home/ubuntu/RDM-osf.io && sudo docker compose restart web admin wb fakecas ember_osf_web preprints registries reviews\"\n</code></pre></p> <p>Then create /etc/systemd/system/certbot.timer: <pre><code>[Unit]\nDescription=Monthly renewal of Let's Encrypt certificates\n\n[Timer]\nOnCalendar=monthly\nRandomizedDelaySec=12 hours\nPersistent=true\n\n[Install]\nWantedBy=timers.target\n</code></pre></p>"},{"location":"guides/ec2/README.legacy/#2-user-management","title":"2. User Management","text":"<p>Setup SMTPrdm</p> <p>We need to setup smtp and mailutils. We can install postfix with local only and deefault hostname <pre><code>apt install postfix mailutils\n</code></pre></p> <p>/etc/postfix/main.cf <pre><code>mynetworks = 10.0.0.0/0 # your network \ninet_interfaces = all # \n</code></pre></p> <p>Test for sending mail <pre><code>echo \"test\" | mail -s test root@ip-1-1-1-1.ap-northeast-1.compute.internal\n</code></pre></p> <pre><code>root@ip-1-1-1-1:/etc/postfix# mail\n\"/var/mail/root\": 1 message 1 new\n>N 1 root Mon Mar 4 05:29 14/656 test\n? 1 ### input number\nFrom: root <root@ip-1-1-1-1.ap-northeast-1.compute.internal>\ntest\n</code></pre> <p>Create User</p> <p>Method 1: Create a user via register link: https://EC2-url:5000/register/</p> <p>Method 2: Create a user directly through the RDM shell. <pre><code>docker compose run --rm web invoke shell\n</code></pre> Create an OSF User with python code: <pre><code>user = OSFUser.create(username=<your_user@cos.io>,password=<password>,fullname=<full name>)\n</code></pre></p> <p>Note: User's registration status is to be shifted to True by adding <code>user.is_registered = True</code> <code>user.have_email = True</code> and <code>user.date_confirmed = timezone.now()</code>. Due to the lack of an inherited mail server in local environment, the newly created account is unable to send confirmation emails making the account unconfirmed.</p> <p>Save your user with <code>user.save()</code> Commit the changes with <code>commit()</code></p> <p>Admin User</p> <p>Please refer to RDM-osf.io/admin/README.md for instructions on how to make existing user super admin.</p>"},{"location":"guides/environment/","title":"Environment / \u74b0\u5883\u8a2d\u5b9a\u3068\u958b\u767a\u74b0\u5883","text":"<p>Summary: Guide to setting up the development environment for GakuNin RDM using Docker Compose and the 2027 installer \u6982\u8981: GakuNin RDM \u306e\u958b\u767a\u74b0\u5883\u3092 Docker Compose \u3068 2027 \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u3067\u69cb\u7bc9\u3059\u308b\u624b\u5f15\u304d</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05</li> <li>Normative for: <code>docs/guides/environment/</code></li> <li>Related: SPEC-02 Installer CLI \u00b7 ADR-02 Network Model \u00b7 SPEC-06 Documentation Conventions</li> </ul> <p></p>"},{"location":"guides/environment/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"guides/environment/#overview","title":"Overview","text":"<p>This guide shows how to set up the GakuNin RDM development environment.</p> <p>Warning: The loopback alias <code>192.168.168.167</code> and <code>docker-compose.override.yml</code> method described below are the OLD way. The 2027 installer uses a Compose internal network and <code>127.0.0.1</code> only. See ADR-02 Network Model and SPEC-02 Installer CLI.</p> <p>For the current method, use the 2027 installer (<code>installer/install.sh</code>) which creates a self-contained environment under <code>runtime/</code> with no host network changes.</p>"},{"location":"guides/environment/#docker-compose-services","title":"Docker Compose services","text":"<p>The development environment uses Docker Compose to run multiple microservices:</p> <ul> <li>Data storage & sharing services: PostgreSQL, Elasticsearch, RabbitMQ, MongoDB</li> <li>Core services: web server, API server, admin interface, worker (RDM-osf.io), WaterButler file storage service</li> <li>UI services: Ember frontend, Modular File Renderer (MFR), Unoconv file converter</li> <li>Test authentication service: FakeCAS or CAS-Overlay for OAuth testing</li> </ul> <p>In GakuNin RDM, the <code>preprints</code> and <code>registries</code> services are not used.</p>"},{"location":"guides/environment/#quick-start","title":"Quick start","text":"<ol> <li>Clone this repository</li> <li>Run <code>./installer/install.sh --yes</code></li> <li>Open http://127.0.0.1:5000 in your browser</li> </ol> <p>This command is available from milestone M2.</p>"},{"location":"guides/environment/#legacy-content","title":"Legacy content","text":"<p>The legacy Docker Compose instructions (loopback alias, manual setup) are kept verbatim in <code>README.legacy.md</code> for reference and will be rewritten per milestone.</p> <p></p>"},{"location":"guides/environment/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"guides/environment/#\u6982\u8981","title":"\u6982\u8981","text":"<p>\u3053\u306e\u30ac\u30a4\u30c9\u306f\u3001GakuNin RDM \u306e\u958b\u767a\u74b0\u5883\u3092\u69cb\u7bc9\u3059\u308b\u65b9\u6cd5\u3092\u793a\u3057\u307e\u3059\u3002</p> <p>\u8b66\u544a: \u4ee5\u4e0b\u306b\u8aac\u660e\u3059\u308b \u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u30a8\u30a4\u30ea\u30a2\u30b9 <code>192.168.168.167</code> \u3068 <code>docker-compose.override.yml</code> \u306e\u65b9\u6cd5\u306f\u3001\u6614\u306e\u65b9\u6cd5\u3067\u3059\u30022027 \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306f Compose \u306e\u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3068 <code>127.0.0.1</code> \u306e\u307f\u3092\u4f7f\u7528\u3057\u307e\u3059\u3002\u8a73\u7d30\u306f ADR-02 \u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30e2\u30c7\u30eb \u3068 SPEC-02 \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc CLI \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p>\u73fe\u5728\u306e\u65b9\u6cd5\u3067\u306f\u3001<code>installer/install.sh</code> \u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u7528\u3057\u3066\u3001\u30db\u30b9\u30c8\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u8a2d\u5b9a\u3092\u5909\u66f4\u305b\u305a\u306b <code>runtime/</code> \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5185\u306b\u81ea\u5df1\u5b8c\u7d50\u578b\u306e\u74b0\u5883\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002</p>"},{"location":"guides/environment/#docker-compose-\u30b5\u30fc\u30d3\u30b9","title":"Docker Compose \u30b5\u30fc\u30d3\u30b9","text":"<p>\u958b\u767a\u74b0\u5883\u306f\u3001\u8907\u6570\u306e\u30de\u30a4\u30af\u30ed\u30b5\u30fc\u30d3\u30b9\u3092 Docker Compose \u3067\u5b9f\u884c\u3057\u307e\u3059:</p> <ul> <li>\u30c7\u30fc\u30bf\u4fdd\u5b58\u30fb\u5171\u6709\u30b5\u30fc\u30d3\u30b9: PostgreSQL, Elasticsearch, RabbitMQ, MongoDB</li> <li>\u30b3\u30a2\u30b5\u30fc\u30d3\u30b9: Web\u30b5\u30fc\u30d0\u30fc\u3001API\u30b5\u30fc\u30d0\u30fc\u3001\u7ba1\u7406\u753b\u9762\u3001\u30ef\u30fc\u30ab\u30fc (RDM-osf.io)\u3001WaterButler \u30d5\u30a1\u30a4\u30eb\u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d3\u30b9</li> <li>UI \u30b5\u30fc\u30d3\u30b9: Ember \u30d5\u30ed\u30f3\u30c8\u30a8\u30f3\u30c9\u3001Modular File Renderer (MFR)\u3001Unoconv \u30d5\u30a1\u30a4\u30eb\u5909\u63db\u30b5\u30fc\u30d3\u30b9</li> <li>\u30c6\u30b9\u30c8\u8a8d\u8a3c\u30b5\u30fc\u30d3\u30b9: FakeCAS \u307e\u305f\u306f CAS-Overlay (OAuth \u30c6\u30b9\u30c8\u7528)</li> </ul> <p>GakuNin RDM \u3067\u306f\u3001<code>preprints</code> \u3068 <code>registries</code> \u30b5\u30fc\u30d3\u30b9\u306f\u4f7f\u7528\u3057\u307e\u305b\u3093\u3002</p>"},{"location":"guides/environment/#\u30af\u30a4\u30c3\u30af\u30b9\u30bf\u30fc\u30c8","title":"\u30af\u30a4\u30c3\u30af\u30b9\u30bf\u30fc\u30c8","text":"<ol> <li>\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3092 clone \u3059\u308b</li> <li><code>./installer/install.sh --yes</code> \u3092\u5b9f\u884c\u3059\u308b</li> <li>\u30d6\u30e9\u30a6\u30b6\u3067 http://127.0.0.1:5000 \u3092\u958b\u304f</li> </ol> <p>\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306f M2 \u30de\u30a4\u30eb\u30b9\u30c8\u30fc\u30f3\u304b\u3089\u5229\u7528\u53ef\u80fd\u3067\u3059\u3002</p>"},{"location":"guides/environment/#\u904e\u53bb\u306e\u30b3\u30f3\u30c6\u30f3\u30c4","title":"\u904e\u53bb\u306e\u30b3\u30f3\u30c6\u30f3\u30c4","text":"<p>\u904e\u53bb\u306e Docker Compose \u306e\u624b\u9806\uff08\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u30a8\u30a4\u30ea\u30a2\u30b9\u3001\u624b\u52d5\u8a2d\u5b9a\uff09\u306f\u3001\u53c2\u8003\u306e\u305f\u3081\u306b <code>README.legacy.md</code> \u306b\u305d\u306e\u307e\u307e\u6b8b\u3057\u3066\u304a\u308a\u3001\u30de\u30a4\u30eb\u30b9\u30c8\u30fc\u30f3\u3054\u3068\u306b\u66f8\u304d\u76f4\u3059\u4e88\u5b9a\u3067\u3059\u3002</p>"},{"location":"guides/environment/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Docker Compose A tool that runs multiple containers together using one configuration file. 1\u3064\u306e\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u3067\u8907\u6570\u306e\u30b3\u30f3\u30c6\u30ca\u3092\u4e00\u7dd2\u306b\u5b9f\u884c\u3059\u308b\u30c4\u30fc\u30eb\u3002 Microservice A small program that does one job and works with other programs over the network. 1\u3064\u306e\u4ed5\u4e8b\u3092\u3059\u308b\u5c0f\u3055\u306a\u30d7\u30ed\u30b0\u30e9\u30e0\u3067\u3001\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u7d4c\u7531\u3067\u4ed6\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u3068\u9023\u643a\u3057\u307e\u3059\u3002 Loopback alias A fake IP address added to your computer so programs can talk to each other. \u30d7\u30ed\u30b0\u30e9\u30e0\u540c\u58eb\u304c\u901a\u4fe1\u3067\u304d\u308b\u3088\u3046\u306b\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u306b\u8ffd\u52a0\u3059\u308b\u4eee\u306e IP \u30a2\u30c9\u30ec\u30b9\u3002 Compose internal network A private network created by Docker Compose so containers can talk without changing your computer. Docker Compose \u304c\u4f5c\u308b\u30d7\u30e9\u30a4\u30d9\u30fc\u30c8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3067\u3001\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u3092\u5909\u66f4\u305b\u305a\u306b\u30b3\u30f3\u30c6\u30ca\u540c\u58eb\u304c\u901a\u4fe1\u3067\u304d\u307e\u3059\u3002"},{"location":"guides/environment/README.legacy/","title":"\u958b\u767a\u74b0\u5883\u306e\u6e96\u5099","text":"<p>RDM\u306f\u8907\u6570\u306e\u30de\u30a4\u30af\u30ed\u30b5\u30fc\u30d3\u30b9\u304b\u3089\u69cb\u6210\u3055\u308c\u307e\u3059\u3002\u958b\u767a\u6642\u306b\u3082\u3053\u308c\u3089\u306e\u30b5\u30fc\u30d3\u30b9\u3092\u52d5\u4f5c\u3055\u305b\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u304c\u3001 1\u30641\u3064\u306e\u30b5\u30fc\u30d3\u30b9\u3092\u81ea\u8eab\u306eOS\u306b\u5408\u308f\u305b\u3066\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u3088\u3046\u3068\u3059\u308b\u3068\u975e\u5e38\u306b\u624b\u9593\u304c\u304b\u304b\u308a\u307e\u3059\u3002</p> <p>\u305d\u306e\u305f\u3081\u3001Docker Compose \u3092\u7528\u3044\u3066\u958b\u767a\u74b0\u5883\u3092\u69cb\u7bc9\u3059\u308b\u65b9\u6cd5\u304c RDM-osf.io\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8 \u306b\u3066\u8aac\u660e\u3055\u308c\u3066\u3044\u307e\u3059\u3002</p> <p>Docker\u3092\u7528\u3044\u308b\u3053\u3068\u3067\u3001OS\u7b49\u306e\u74b0\u5883\u306e\u5dee\u7570\u3092\u30b3\u30f3\u30c6\u30ca\u306b\u3088\u308a\u5438\u53ce\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u672c\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3067\u306f README-docker-compose.md \u306b\u88dc\u52a9\u7684\u306a\u8aac\u660e\u3092\u52a0\u3048\u3066\u3044\u304d\u307e\u3059\u3002</p>"},{"location":"guides/environment/README.legacy/#\u30b5\u30fc\u30d3\u30b9\u306e\u69cb\u6210","title":"\u30b5\u30fc\u30d3\u30b9\u306e\u69cb\u6210","text":"<p><code>docker-compose.yml</code>\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u308b\u30b5\u30fc\u30d3\u30b9\u306f\u4ee5\u4e0b\u306e\u901a\u308a\u3067\u3059\u3002</p> <p></p> <p>(Generated by https://github.com/pmsipilot/docker-compose-viz)</p> <p>\u56f3\u4e2d\u306e\u5186\u306f\u30dd\u30fc\u30c8\u756a\u53f7, \u77e9\u5f62\u306f\u30b5\u30fc\u30d3\u30b9\u3092\u793a\u3057\u3066\u3044\u307e\u3059\u3002 \u30b5\u30fc\u30d3\u30b9\u306f\u5927\u304d\u304f\u5206\u3051\u3066\u4ee5\u4e0b\u306e5\u7a2e\u985e\u306b\u5206\u985e\u3067\u304d\u307e\u3059\u3002(\u62ec\u5f27\u306f\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u308bRCOSDP\u5185\u30ea\u30dd\u30b8\u30c8\u30ea)</p> <ul> <li>\u30c7\u30fc\u30bf\u4fdd\u5b58\u30fb\u5171\u6709\u30b5\u30fc\u30d3\u30b9: postgres, elasticsearch, elasticsearch6, rabbitmq, mongo</li> <li>\u57fa\u672c\u30b5\u30fc\u30d3\u30b9: web, api, admin, worker (RDM-osf.io), wb, wb_worker (RDM-waterbutler)</li> <li>UI\u30b5\u30fc\u30d3\u30b9: ember_osf_web (RDM-ember-osf-web), mfr (RDM-modular-file-renderer), unoconv, registries, preprints, reviews, sharejs</li> <li>\u30c6\u30b9\u30c8\u7528\u8a8d\u8a3c\u30b5\u30fc\u30d3\u30b9: fakecas</li> <li>\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30b5\u30fc\u30d3\u30b9: requirements (RDM-osf.io), mfr_requirements (RDM-modular-file-renderer), wb_requirements (RDM-waterbutler), assets, admin_assets (RDM-osf.io)</li> </ul> <p>GRDM\u3067\u306f preprints, registries \u306f\u4f7f\u7528\u3057\u307e\u305b\u3093\u3002</p>"},{"location":"guides/environment/README.legacy/#\u57fa\u672c\u7684\u306a\u6d41\u308c","title":"\u57fa\u672c\u7684\u306a\u6d41\u308c","text":"<ol> <li>Docker\u3068OS\u306e\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7 - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#docker-and-os-setup</li> <li>Docker Compose\u3092\u5229\u7528\u53ef\u80fd\u306b\u3059\u308b\u305f\u3081\u306bDocker Engine\u3092\u81ea\u8eab\u306e\u74b0\u5883\u306b\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3059\u3002</li> <li>RDM\u306e\u30b5\u30fc\u30d3\u30b9\u540c\u58eb\u304c\u4e92\u3044\u306b\u901a\u4fe1\u3067\u304d\u308b\u3088\u3046\u306b\u3001\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u30c7\u30d0\u30a4\u30b9\u3068\u3057\u3066 <code>192.168.168.167</code> \u3092\u8a2d\u5b9a\u3057\u307e\u3059\u3002</li> <li>\u203b\u6ce8\u610f: OSX \u306a\u3089\u3073\u306b Ubuntu \u306b\u3064\u3044\u3066\u306f\u52d5\u4f5c\u5b9f\u7e3e\u304c\u3042\u308a\u307e\u3059\u304c\u3001Windows \u306b\u3064\u3044\u3066\u306f\u52d5\u4f5c\u304c\u78ba\u8a8d\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002</li> <li>\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u8a2d\u5b9a - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#application-configuration</li> <li>Web\u30b5\u30fc\u30d0\u3068API\u30b5\u30fc\u30d0\u306b\u95a2\u3059\u308b\u3001Django\u306e\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb <code>local.py</code> \u3092\u6e96\u5099\u3057\u307e\u3059\u3002\u7279\u306b\u5909\u66f4\u306e\u5fc5\u8981\u304c\u306a\u3051\u308c\u3070\u3001\u305d\u308c\u305e\u308c\u306e <code>local-dist.py</code> \u3092\u30b3\u30d4\u30fc\u3057\u3066\u4f7f\u7528\u3057\u307e\u3059\u3002</li> <li>RDM-osf.io, RDM-waterbutler\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u4f7f\u7528\u3059\u308b\u3088\u3046\u3001Docker Compose\u30b5\u30fc\u30d3\u30b9\u5b9a\u7fa9\u30d5\u30a1\u30a4\u30eb\u3092\u5909\u66f4\u3057\u307e\u3059\u3002<code>docker-compose.yml</code> \u3092\u76f4\u63a5\u5909\u66f4\u3059\u308b\u306e\u3067\u306f\u306a\u304f\u3001 <code>docker-compose.override.yml</code> \u3092\u5909\u66f4\u3059\u308b\u3053\u3068\u3067\u3001\u8aa4\u3063\u3066\u958b\u767a\u74b0\u5883\u56fa\u6709\u306e\u60c5\u5831\u3092\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u30b3\u30df\u30c3\u30c8\u3059\u308b\u3053\u3068\u3092\u9632\u6b62\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</li> <li>\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u5b9f\u884c - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#application-runtime</li> <li>\u3053\u306eDocker Compose\u74b0\u5883\u306f\u3001Docker\u30a4\u30e1\u30fc\u30b8\u3092\u30d9\u30fc\u30b9\u306b\u5404\u30b5\u30fc\u30d3\u30b9\u3092\u8d77\u52d5\u3057\u307e\u3059\u304c\u3001Python\u30e2\u30b8\u30e5\u30fc\u30eb\u3084Node\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u30a4\u30e1\u30fc\u30b8\u3068\u306f\u7570\u306a\u308b\u30dc\u30ea\u30e5\u30fc\u30e0\u306b\u4fdd\u6301\u3057\u307e\u3059\u3002(\u958b\u767a\u4e2d\u306b\u66f4\u65b0\u3055\u308c\u308b\u53ef\u80fd\u6027\u3092\u60f3\u5b9a\u3057\u3066\u3044\u308b\u3082\u306e\u3068\u601d\u308f\u308c\u307e\u3059\u3002) \u305d\u306e\u305f\u3081\u3001\u30b5\u30fc\u30d3\u30b9\u5b9f\u884c\u524d\u306b <code>docker compose up requirements mfr_requirements wb_requirements</code> \u3092\u5b9f\u65bd\u3059\u308b\u3053\u3068\u3067\u3001\u5fc5\u8981\u306a\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u5404\u30b3\u30f3\u30c6\u30ca\u306b\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002</li> <li>\u30c4\u30fc\u30eb\u306e\u5229\u7528 - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#running-arbitrary-commands</li> <li>Django\u306eMigration\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210\u3084\u3001RDM\u304c\u4fdd\u6301\u3059\u308bModel\u306e\u78ba\u8a8d\u3001\u30c6\u30b9\u30c8\u306e\u5b9f\u884c\u306a\u3069\u3001Docker Compose\u7d4c\u7531\u3067\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u3067\u3001\u5bb9\u6613\u306b\u3053\u308c\u3089\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3067\u304d\u307e\u3059\u3002</li> <li>\u74b0\u5883\u306e\u30ea\u30bb\u30c3\u30c8 - https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#cleanup--docker-reset</li> <li>Docker\u3092\u4f7f\u3046\u3053\u3068\u3067\u5f97\u3089\u308c\u308b\u6069\u6075\u306e1\u3064\u306f\u3001\u958b\u767a\u74b0\u5883\u3092\u3044\u3064\u3067\u3082\u30ea\u30bb\u30c3\u30c8\u3067\u304d\u308b\u3068\u3044\u3046\u70b9\u3067\u3059\u3002\u958b\u767a\u6642\u306e\u8a66\u884c\u932f\u8aa4\u306e\u526f\u4f5c\u7528\u306e\u84c4\u7a4d\u3092\u7c21\u5358\u306b\u30ea\u30bb\u30c3\u30c8\u3057\u3001\u52d5\u4f5c\u78ba\u8a8d\u3092\u78ba\u5b9f\u306b\u884c\u3046\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</li> </ol>"},{"location":"guides/environment/README.legacy/#\u958b\u767a\u74b0\u5883\u306e\u30ab\u30b9\u30bf\u30de\u30a4\u30ba","title":"\u958b\u767a\u74b0\u5883\u306e\u30ab\u30b9\u30bf\u30de\u30a4\u30ba","text":"<p>\u521d\u671f\u72b6\u614b\u3067\u306f <code>docker-compose.yml</code> \u306f <code>quay.io/centerforopenscience/</code> \u304b\u3089\u30a4\u30e1\u30fc\u30b8\u3092\u53d6\u5f97\u3059\u308b\u3088\u3046\u306b\u306a\u3063\u3066\u3044\u307e\u3059\u3002</p> <p>GakuNin RDM\u306e\u6700\u65b0Docker Image\u3092\u30d9\u30fc\u30b9\u306b\u958b\u767a\u3092\u884c\u3046\u306b\u306f\u3001\u3053\u308c\u3089\u306e\u30a4\u30e1\u30fc\u30b8\u3092\u5dee\u3057\u66ff\u3048\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u4ee5\u4e0b\u306e\u5185\u5bb9\u3092 <code>docker-compose.override.yml</code> \u306b\u8a18\u8ff0\u3057\u3066\u304f\u3060\u3055\u3044\u3002 (<code>docker-compose.yml</code> \u3068\u540c\u3058\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u4f5c\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002)</p> <pre><code># Apple Silicon\u642d\u8f09Mac\u306e\u5834\u5408\u3001platform\u6307\u5b9a\u306e\u30b3\u30e1\u30f3\u30c8\u30a2\u30a6\u30c8\u90e8\u5206\u3092\u5916\u3057\u3066ARM\u7248\u30a4\u30e1\u30fc\u30b8\u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002\nservices:\n fakecas:\n image: niicloudoperation/rdm-fakecas:latest\n # platform: linux/arm64\n # Apple Silicon\u642d\u8f09Mac\u306e\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u30b3\u30e1\u30f3\u30c8\u30a2\u30a6\u30c8\u90e8\u5206\u3092\u5916\u3057\u3066ARM\u7248Elasticsearch\u30a4\u30e1\u30fc\u30b8\u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n # elasticsearch:\n # image: quay.io/centerforopenscience/elasticsearch:es6-arm-6.3.1\n # platform: linux/arm64\n admin:\n image: niicloudoperation/rdm-osf.io:latest\n # platform: linux/arm64\n environment:\n AWS_EC2_METADATA_DISABLED: \"true\"\n admin_assets:\n image: niicloudoperation/rdm-osf.io:latest\n # platform: linux/arm64\n api:\n image: niicloudoperation/rdm-osf.io:latest\n # platform: linux/arm64\n assets:\n image: niicloudoperation/rdm-osf.io:latest\n # platform: linux/arm64\n requirements:\n image: niicloudoperation/rdm-osf.io:latest\n # platform: linux/arm64\n command:\n - /bin/bash\n - -c\n - apk add --no-cache --virtual .build-deps build-base linux-headers python3-dev musl-dev libxml2-dev libxslt-dev postgresql-dev libffi-dev libpng-dev freetype-dev jpeg-dev &&\n invoke requirements --all &&\n (python3 -m compileall /usr/lib/python3.6 || true) &&\n rm -Rf /python3.6/* &&\n cp -Rf -p /usr/lib/python3.6 /\n web:\n image: niicloudoperation/rdm-osf.io:latest\n # platform: linux/arm64\n environment:\n OAUTHLIB_INSECURE_TRANSPORT: '1'\n # macOS 15.1.1\u4ee5\u964d\u306e\u5834\u5408\u30015000\u30dd\u30fc\u30c8\u304c\u4f7f\u7528\u3055\u308c\u3066\u3044\u308b\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002\u305d\u306e\u5834\u5408\u306f\u4ee5\u4e0b\u306e\u30b3\u30e1\u30f3\u30c8\u30a2\u30a6\u30c8\u3092\u306f\u305a\u3057\u3066\u30dd\u30fc\u30c8\u3092\u5909\u66f4\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n # \u307e\u305f\u3001 `.docker-compose.env`, `.docker-compose.mfr.env`, `.docker-compose.wb.env` \u306e\u30dd\u30fc\u30c8\u6307\u5b9a `:5000` \u306b\u3082\u540c\u69d8\u306e\n # \u5909\u66f4\u3092\u884c\u3063\u3066\u304f\u3060\u3055\u3044\u3002\n # ports: !override\n # - 5001:5000\n worker:\n image: niicloudoperation/rdm-osf.io:latest\n # platform: linux/arm64\n ember_osf_web:\n image: niicloudoperation/rdm-ember-osf-web:latest\n # platform: linux/amd64\n cas:\n image: niicloudoperation/rdm-cas-overlay:latest\n # platform: linux/amd64\n mfr:\n image: niicloudoperation/rdm-modular-file-renderer:latest\n # platform: linux/amd64\n # \u30ed\u30fc\u30ab\u30eb\u306eRDM-modular-file-renderer\u3092\u8a66\u3057\u305f\u3044\u5834\u5408\n # volumes:\n # - ../RDM-modular-file-renderer:/code\n mfr_requirements:\n image: niicloudoperation/rdm-modular-file-renderer:latest\n # platform: linux/amd64\n # \u30ed\u30fc\u30ab\u30eb\u306eRDM-modular-file-renderer\u3092\u8a66\u3057\u305f\u3044\u5834\u5408\n # volumes:\n # - ../RDM-modular-file-renderer:/code\n wb:\n image: niicloudoperation/rdm-waterbutler:latest\n # platform: linux/arm64\n # \u30ed\u30fc\u30ab\u30eb\u306eRDM-waterbutler\u3092\u8a66\u3057\u305f\u3044\u5834\u5408\n # volumes:\n # - ../RDM-waterbutler:/code\n wb_worker:\n image: niicloudoperation/rdm-waterbutler:latest\n # platform: linux/arm64\n # \u30ed\u30fc\u30ab\u30eb\u306eRDM-waterbutler\u3092\u8a66\u3057\u305f\u3044\u5834\u5408\n # volumes:\n # - ../RDM-waterbutler:/code\n wb_requirements:\n image: niicloudoperation/rdm-waterbutler:latest\n # platform: linux/arm64\n # \u30ed\u30fc\u30ab\u30eb\u306eRDM-waterbutler\u3092\u8a66\u3057\u305f\u3044\u5834\u5408\n # volumes:\n # - ../RDM-waterbutler:/code\n</code></pre> <p>Apple Silicon\u642d\u8f09Mac\u306e\u5834\u5408\u3001<code>docker-compose.yml</code>\u306eelasticsearch\u306e\u5236\u9650\u306b\u95a2\u3059\u308b\u30b3\u30e1\u30f3\u30c8\u30a2\u30a6\u30c8\u90e8\u5206\u3092\u5916\u3057\u3066\u304f\u3060\u3055\u3044\u3002 Elasticsearch \u306f\u4e26\u5217\u5206\u6563\u51e6\u7406\u304c\u3067\u304d\u308b\u30af\u30e9\u30b9\u30bf\u8a2d\u8a08\u3055\u308c\u3066\u304a\u308a\u3001\u8907\u6570\u30ce\u30fc\u30c9\u3067\u306e\u9023\u643a\u3092\u524d\u63d0\u3068\u3057\u3066\u3044\u307e\u3059\u3002\u958b\u767a\u74b0\u5883\u306e\u3088\u3046\u306a\u5358\u4e00\u30ce\u30fc\u30c9\u3067\u306e\u5229\u7528\u306e\u5834\u5408\u306f\u30af\u30e9\u30b9\u30bf\u6a5f\u80fd\u3092\u4f7f\u3046\u5fc5\u8981\u304c\u306a\u3044\u305f\u3081\u3001\u3053\u306e\u8a2d\u5b9a\u3092\u884c\u3046\u3053\u3068\u3067\u300c\u30b7\u30f3\u30b0\u30eb\u30ce\u30fc\u30c9\u30e2\u30fc\u30c9\u300d\u3067\u52d5\u4f5c\u3055\u305b\u308b\u3088\u3046\u306b\u6307\u5b9a\u3057\u307e\u3059\u3002\u307e\u305fElasticsearch \u306f\u8d77\u52d5\u6642\u306b\u300cbootstrap \u30c1\u30a7\u30c3\u30af\u300d\u3068\u3044\u3046\u4e00\u9023\u306e\u30b7\u30b9\u30c6\u30e0\u74b0\u5883\u306e\u691c\u8a3c\u3092\u884c\u3044\u307e\u3059\u3002\u305d\u306e\u4e00\u90e8\u306b system call filter \u306e\u8a2d\u5b9a\u78ba\u8a8d\u304c\u542b\u307e\u308c\u3066\u304a\u308a\u3001\u3053\u308c\u306f\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5411\u4e0a\u306e\u305f\u3081\u306b OS \u30ec\u30d9\u30eb\u306e\u5236\u9650\uff08\u30b7\u30b9\u30c6\u30e0\u30b3\u30fc\u30eb\u306e\u30d5\u30a3\u30eb\u30bf\u30ea\u30f3\u30b0\uff09\u3092\u5229\u7528\u3059\u308b\u6a5f\u80fd\u3067\u3059\u3002\u3057\u304b\u3057\u3001Docker \u3084\u4ed6\u306e\u30b3\u30f3\u30c6\u30ca\u74b0\u5883\u3067\u306f\u3053\u306e\u30c1\u30a7\u30c3\u30af\u304c\u539f\u56e0\u3067\u8d77\u52d5\u30a8\u30e9\u30fc\u3068\u306a\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002 \u30db\u30b9\u30c8\u5074\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u306eulimit\u5024\u304c\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u8981\u4ef6\u3092\u6e80\u305f\u3055\u306a\u3044\u5834\u5408\u304c\u3042\u308b\u305f\u3081\u3001\u30b3\u30f3\u30c6\u30ca\u5185\u3067\u306e\u30ea\u30bd\u30fc\u30b9\u5236\u9650\u3092\u660e\u793a\u7684\u306b\u89e3\u9664\u3057\u307e\u3059\u3002</p> <pre><code> elasticsearch:\n image: elasticsearch:2\n ports:\n - 9200:9200\n volumes:\n - elasticsearch_data_vol:/usr/share/elasticsearch/data\n# environment:\n# - \"ES_JAVA_OPTS=-Des.bootstrap.system_call_filter=false\"\n# ulimits:\n# memlock:\n# soft: -1\n# hard: -1\n stdin_open: true\n\n # Temporary: Remove when we've upgraded to ES6\n elasticsearch6:\n image: docker.elastic.co/elasticsearch/elasticsearch:6.3.1\n ports:\n - 9201:9200\n volumes:\n - elasticsearch6_data_vol:/usr/share/elasticsearch/data\n # environment:\n # - \"discovery.type=single-node\"\n # - \"ES_JAVA_OPTS=-Des.bootstrap.system_call_filter=false\"\n # ulimits:\n # memlock:\n # soft: -1\n # hard: -1\n stdin_open: true\n</code></pre>"},{"location":"guides/environment/README.legacy/#\u958b\u767a\u74b0\u5883\u3067rdm\u3092\u8d77\u52d5\u3059\u308b","title":"\u958b\u767a\u74b0\u5883\u3067RDM\u3092\u8d77\u52d5\u3059\u308b","text":""},{"location":"guides/environment/README.legacy/#\u30b5\u30fc\u30d3\u30b9\u3092\u8d77\u52d5\u3059\u308b","title":"\u30b5\u30fc\u30d3\u30b9\u3092\u8d77\u52d5\u3059\u308b","text":"<p>Quickstart: Running all OSF services in the background \u306b\u793a\u3055\u308c\u3066\u3044\u308b\u3088\u3046\u306b\u3001\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3067\u30b5\u30fc\u30d3\u30b9\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <pre><code># \u30e9\u30a4\u30d6\u30e9\u30ea\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb - \u521d\u56de/\u30e9\u30a4\u30d6\u30e9\u30ea\u5b9a\u7fa9\u5909\u66f4\u6642\u3060\u3051\u5fc5\u8981\n$ docker compose up requirements mfr_requirements wb_requirements\n# DB\u306e\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3 - \u521d\u56de/DB\u5b9a\u7fa9\u5909\u66f4\u6642\u3060\u3051\u5fc5\u8981\n$ docker compose run --rm web python3 manage.py migrate\n\n$ docker compose up -d assets admin_assets mfr wb wb_worker fakecas sharejs worker web api admin ember_osf_web\n</code></pre> <p>https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md \u3067\u306f preprints, registries \u306e\u8d77\u52d5\u306b\u3064\u3044\u3066\u7d39\u4ecb\u3057\u3066\u3044\u307e\u3059\u304c\u3001GRDM\u3067\u306f preprints, registries \u306f\u63d0\u4f9b\u3057\u306a\u3044\u305f\u3081\u7121\u8996\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/environment/README.legacy/#\u30b7\u30f3\u30d7\u30eb\u306a\u69cb\u6210\u3067\u8d77\u52d5\u3059\u308b","title":"\u30b7\u30f3\u30d7\u30eb\u306a\u69cb\u6210\u3067\u8d77\u52d5\u3059\u308b","text":"<p>\u52d5\u4f5c\u78ba\u8a8d\u3057\u305f\u3044\u5185\u5bb9\u306b\u5fdc\u3058\u3066\u3001 mfr, admin_assets, admin, sharejs \u3092\u9664\u5916\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002 \u4f8b\u3048\u3070\u3001fakecas\u3067\u8a8d\u8a3c\u3057\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u4f5c\u6210\u3001\u30d5\u30a1\u30a4\u30eb\u7ba1\u7406\u3092\u78ba\u8a8d\u3057\u305f\u3044\u3060\u3051\u3067\u3042\u308c\u3070\u3001</p> <pre><code># \u30e9\u30a4\u30d6\u30e9\u30ea\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb - \u521d\u56de/\u30e9\u30a4\u30d6\u30e9\u30ea\u5b9a\u7fa9\u5909\u66f4\u6642\u3060\u3051\u5fc5\u8981\n$ docker compose up requirements wb_requirements\n# DB\u306e\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3 - \u521d\u56de/DB\u5b9a\u7fa9\u5909\u66f4\u6642\u3060\u3051\u5fc5\u8981\n$ docker compose run --rm web python3 manage.py migrate\n\n$ docker compose up -d assets wb wb_worker fakecas worker web api ember_osf_web\n</code></pre> <p>\u3067\u3082\u5341\u5206\u3067\u3057\u3087\u3046\u3002<code>docker compose ps</code>\u3067\u7570\u5e38\u7d42\u4e86\u3057\u3066\u3044\u308b\u30b5\u30fc\u30d3\u30b9\u304c\u3044\u306a\u3044\u3053\u3068\u3092\u78ba\u8a8d\u3057\u307e\u3059\u3002 <code>docker compose ps</code>\u306e\u51fa\u529b\u4f8b\u306f\u4ee5\u4e0b\u306e\u901a\u308a\u3067\u3059\u3002<code>docker compose up -d</code>\u3067\u6307\u5b9a\u3057\u305f\u30b5\u30fc\u30d3\u30b9\u304c<code>Up</code>\u3067\u3042\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose ps\n Name Command State Ports \n-------------------------------------------------------------------------------------------------------------------------------------------------------------------\nrdm2-osfio_api_1 docker-entrypoint.sh invok ... Up 0.0.0.0:8000->8000/tcp \nrdm2-osfio_assets_1 docker-entrypoint.sh invok ... Up \nrdm2-osfio_elasticsearch_1 /docker-entrypoint.sh elas ... Up 0.0.0.0:9200->9200/tcp, 9300/tcp \nrdm2-osfio_ember_osf_web_1 docker-entrypoint.sh /bin/ ... Up 0.0.0.0:41953->41953/tcp, 0.0.0.0:4200->4200/tcp \nrdm2-osfio_fakecas_1 fakecas -host=0.0.0.0:8080 ... Up 0.0.0.0:8080->8080/tcp \nrdm2-osfio_postgres_1 docker-entrypoint.sh /bin/ ... Up 0.0.0.0:5432->5432/tcp \nrdm2-osfio_rabbitmq_1 docker-entrypoint.sh rabbi ... Up 15671/tcp, 0.0.0.0:15672->15672/tcp, 25672/tcp, 4369/tcp, 5671/tcp, 0.0.0.0:5672->5672/tcp\nrdm2-osfio_requirements_1 docker-entrypoint.sh /bin/ ... Exit 0 \nrdm2-osfio_wb_1 invoke server Up 0.0.0.0:7777->7777/tcp \nrdm2-osfio_wb_requirements_1 /bin/bash -c invoke instal ... Exit 0 \nrdm2-osfio_wb_worker_1 invoke celery Up 7777/tcp \nrdm2-osfio_web_1 docker-entrypoint.sh invok ... Up 0.0.0.0:5000->5000/tcp \nrdm2-osfio_worker_1 docker-entrypoint.sh invok ... Up\n</code></pre>"},{"location":"guides/environment/README.legacy/#cas-overlay\u3092\u542b\u3080\u69cb\u6210\u3067\u8d77\u52d5\u3059\u308b","title":"cas-overlay\u3092\u542b\u3080\u69cb\u6210\u3067\u8d77\u52d5\u3059\u308b","text":"<p>fakecas\u306f\u624b\u8efd\u306bRDM\u306e\u52d5\u4f5c\u78ba\u8a8d\u3092\u884c\u3048\u307e\u3059\u304c\u3001OAuth\u306e\u52d5\u4f5c\u78ba\u8a8d\u306a\u3069\u306f\u3067\u304d\u307e\u305b\u3093\u3002OAuth\u3092\u7528\u3044\u305f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u958b\u767a\u6642\u306b\u306f\u3001fakecas\u3067\u306f\u306a\u304fcas-overlay\u3092\u4f7f\u3063\u305f\u30c6\u30b9\u30c8\u304c\u5fc5\u8981\u306b\u306a\u308a\u307e\u3059\u3002\u3053\u306e\u3088\u3046\u306a\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306bfakecas\u306e\u4ee3\u308f\u308a\u306b cas \u30b5\u30fc\u30d3\u30b9\u3092\u8d77\u52d5\u3057\u307e\u3059\u3002</p> <pre><code># \u30e9\u30a4\u30d6\u30e9\u30ea\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb - \u521d\u56de/\u30e9\u30a4\u30d6\u30e9\u30ea\u5b9a\u7fa9\u5909\u66f4\u6642\u3060\u3051\u5fc5\u8981\n$ docker compose up requirements wb_requirements\n# DB\u306e\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3 - \u521d\u56de/DB\u5b9a\u7fa9\u5909\u66f4\u6642\u3060\u3051\u5fc5\u8981\n$ docker compose run --rm web python3 manage.py migrate\n\n# fakecas\u3067\u306f\u306a\u304fcas\u3092\u30b5\u30fc\u30d3\u30b9\u306b\u6307\u5b9a\u3059\u308b\n$ docker compose up -d assets wb wb_worker cas worker web api ember_osf_web\n\n# OAuth\u306e\u30b9\u30b3\u30fc\u30d7\u3092\u767b\u9332\u3059\u308b\n$ docker compose run --rm web python3 -m scripts.register_oauth_scopes\n</code></pre> <p>cas\u306ffakecas\u3068\u306f\u7570\u306a\u308a\u3001\u30ed\u30b0\u30a4\u30f3\u6642\u306b \u30e6\u30fc\u30b6\u4f5c\u6210\u624b\u9806(\u5f8c\u8ff0) \u306b\u304a\u3044\u3066\u5165\u529b\u3057\u305f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u5fc5\u8981\u306b\u306a\u308a\u307e\u3059\u3002\u4ed6\u306e\u64cd\u4f5c\u65b9\u6cd5\u306ffakecas\u3068\u540c\u69d8\u3067\u3059\u3002</p>"},{"location":"guides/environment/README.legacy/#web-ui\u3092\u958b\u304f","title":"Web UI\u3092\u958b\u304f","text":"<p>\u30b5\u30fc\u30d3\u30b9\u304c\u8d77\u52d5\u3057\u305f\u3053\u3068\u3092\u78ba\u8a8d\u3057\u305f\u3089\u3001 <code>http://localhost:5000</code> \u306b\u30a2\u30af\u30bb\u30b9\u3057\u52d5\u4f5c\u3092\u78ba\u8a8d\u3057\u3066\u307f\u307e\u3057\u3087\u3046\u3002</p> <p>\u30ed\u30b0\u306f <code>docker compose logs</code> \u30b3\u30de\u30f3\u30c9\u3067\u78ba\u8a8d\u3067\u304d\u307e\u3059\u3002ember_osf_web\u30b3\u30f3\u30c6\u30ca\u306f\u8d77\u52d5\u306b\u3042\u308b\u7a0b\u5ea6\u6642\u9593\u304c\u304b\u304b\u308a\u307e\u3059\u304c\u3001\u3053\u306e\u72b6\u614b\u3092\u78ba\u8a8d\u3059\u308b\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5165\u529b\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose logs -f ember_osf_web\n...\nBuild successful (xxxxxms) \u2013 Serving on http://0.0.0.0:4200/\n</code></pre>"},{"location":"guides/environment/README.legacy/#\u30c6\u30b9\u30c8\u7528\u30e6\u30fc\u30b6\u3092\u4f5c\u6210\u3059\u308b","title":"\u30c6\u30b9\u30c8\u7528\u30e6\u30fc\u30b6\u3092\u4f5c\u6210\u3059\u308b","text":"<p><code>http://localhost:5000</code> \u304c\u6b63\u5e38\u306b\u53c2\u7167\u3067\u304d\u305f\u3089\u3001<code>Sign Up</code>\u3092\u884c\u3044\u307e\u3057\u3087\u3046\u3002\u4ee5\u4e0b\u306e\u624b\u9806\u3067\u884c\u3044\u307e\u3059\u3002</p> <ol> <li><code>Sign Up</code>\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3001\u30e6\u30fc\u30b6\u767b\u9332\u753b\u9762\u3092\u958b\u304f</li> <li>\u30e6\u30fc\u30b6\u767b\u9332\u753b\u9762\u306b\u9069\u5f53\u306a\u30e6\u30fc\u30b6\u540d\u3001E\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3068\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3059\u308b</li> <li>\u30c7\u30d0\u30c3\u30b0\u30ed\u30b0\u306bE\u30e1\u30fc\u30eb\u5230\u9054\u78ba\u8a8d\u7528\u306eURL(<code>http://localhost:5000/confirm/xxxxx/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/</code>)\u304c\u51fa\u529b\u3055\u308c\u308b\u306e\u3067\u3001 <code>docker compose logs web</code> \u3067\u78ba\u8a8d\u3059\u308b</li> </ol> <p>\u672c\u756a\u74b0\u5883\u306e\u5834\u5408\u306f\u3053\u3053\u3067E\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u5b9b\u306b\u5230\u9054\u78ba\u8a8d\u7528\u306eURL\u3092\u542b\u3080\u30e1\u30fc\u30eb\u304c\u5c4a\u304d\u307e\u3059\u304c\u3001SMTP\u30b5\u30fc\u30d0\u3092\u6307\u5b9a\u3057\u3066\u3044\u306a\u3044\u306e\u3067\u30e1\u30fc\u30eb\u306f\u9001\u4fe1\u3055\u308c\u307e\u305b\u3093\u3002</p> <ol> <li>\u5230\u9054\u78ba\u8a8d\u7528\u306eURL\u3092\u30d6\u30e9\u30a6\u30b6\u3067\u30a2\u30af\u30bb\u30b9\u3059\u308b</li> </ol> <p>\u30d6\u30e9\u30a6\u30b6\u306fFirefox\u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002Chrome\u306e\u5834\u5408\u306f\u3001FakeCAS\u3068Web UI\u306e\u9593\u3067Cookie\u304c\u5171\u6709\u3055\u308c\u305a\u6b63\u5e38\u52d5\u4f5c\u3057\u306a\u3044\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002</p>"},{"location":"guides/environment/README.legacy/#\u52d5\u4f5c\u78ba\u8a8d\u3092\u5b9f\u65bd\u3059\u308b","title":"\u52d5\u4f5c\u78ba\u8a8d\u3092\u5b9f\u65bd\u3059\u308b","text":"<p>\u3053\u308c\u3067\u30e6\u30fc\u30b6\u306e\u4f5c\u6210\u306f\u5b8c\u4e86\u3067\u3059\u3002\u4ee5\u964d\u306f\u3001\u30ed\u30b0\u30a4\u30f3\u753b\u9762\u304b\u3089\u3001\u767b\u9332\u3057\u305fE\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306e\u307f\u3067\u30ed\u30b0\u30a4\u30f3\u3067\u304d\u307e\u3059\u3002(\u958b\u767a\u7528\u9014\u306b\u9650\u5b9a\u3057\u3066\u5229\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002)</p>"},{"location":"guides/environment/README.legacy/#\u30b3\u30de\u30f3\u30c9\u306e\u5b9f\u884c\u4f8b","title":"\u30b3\u30de\u30f3\u30c9\u306e\u5b9f\u884c\u4f8b","text":""},{"location":"guides/environment/README.legacy/#\u30e6\u30cb\u30c3\u30c8\u30c6\u30b9\u30c8\u3092\u5b9f\u884c\u3059\u308b","title":"\u30e6\u30cb\u30c3\u30c8\u30c6\u30b9\u30c8\u3092\u5b9f\u884c\u3059\u308b","text":"<p>\u5168\u3066\u306e\u30e6\u30cb\u30c3\u30c8\u30c6\u30b9\u30c8\u3092\u5b9f\u884c\u3059\u308b\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u30b3\u30de\u30f3\u30c9\u3092\u5165\u529b\u3057\u307e\u3059\u3002 <code>requirements</code> \u30b5\u30fc\u30d3\u30b9\u306b\u3088\u308a\u30c6\u30b9\u30c8\u306b\u5fc5\u8981\u306a\u30e9\u30a4\u30d6\u30e9\u30ea\u304c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3001<code>invoke test</code>\u3067\u30c6\u30b9\u30c8\u304c\u5b9f\u884c\u3067\u304d\u307e\u3059\u3002</p> <pre><code># \u521d\u56de\u3060\u3051\u5fc5\u8981\n$ docker compose up requirements\n\n$ docker compose run --rm web invoke test\n</code></pre> <p>\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9\u3092\u9650\u5b9a\u3059\u308b\u65b9\u6cd5\u306f https://github.com/RCOSDP/RDM-osf.io/blob/develop/README-docker-compose.md#application-tests \u306b\u8a18\u8f09\u3055\u308c\u3066\u3044\u307e\u3059\u3002</p>"},{"location":"guides/environment/README.legacy/#migration\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3059\u308b","title":"Migration\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3059\u308b","text":"<p>RDM-osf.io\u306fDjango\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3068\u3057\u3066\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u30e2\u30c7\u30eb\u306e\u5909\u66f4\u3092\u884c\u3063\u305f\u5834\u5408\u3001\u9069\u5207\u306b\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30b9\u30ad\u30fc\u30de\u306b\u5909\u66f4\u304c\u53cd\u6620\u3055\u308c\u308b\u3088\u3046\u3001Migrations\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 \u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5165\u529b\u3059\u308b\u3053\u3068\u3067\u3001Django\u306e\u7ba1\u7406\u30b3\u30de\u30f3\u30c9 <code>makemigrations</code> \u3092\u5b9f\u884c\u3067\u304d\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web python3 manage.py makemigrations\n</code></pre> <p>\u4f5c\u6210\u3057\u305fMigrations\u30d5\u30a1\u30a4\u30eb\u306f\u3001\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3067 <code>postgres</code>\u30b5\u30fc\u30d3\u30b9\u306b\u53cd\u6620\u3067\u304d\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web python3 manage.py migrate\n</code></pre>"},{"location":"guides/environment/README.legacy/#\u30e6\u30fc\u30b6\u3092\u6a5f\u95a2\u306b\u6240\u5c5e\u3055\u305b\u308b","title":"\u30e6\u30fc\u30b6\u3092\u6a5f\u95a2\u306b\u6240\u5c5e\u3055\u305b\u308b","text":"<p>\u6a5f\u95a2\u306b\u95a2\u3059\u308b\u6a5f\u80fd\u3092\u8a66\u3059\u305f\u3081\u306b\u306f\u3001\u30e6\u30fc\u30b6\u3092\u6a5f\u95a2\u306b\u6240\u5c5e\u3055\u305b\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 \u3053\u306e\u3088\u3046\u306a\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u624b\u9806\u3092\u5b9f\u65bd\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p>\u307e\u305a\u3001\u5b9f\u884c\u4e2d\u306eRDM\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u6a5f\u95a2\u306e\u60c5\u5831\u3092\u767b\u9332\u3057\u307e\u3059\u3002\u3053\u308c\u306f\u521d\u56de\u3060\u3051\u5fc5\u8981\u3067\u3059\u3002</p> <pre><code>$ docker compose run --rm web python3 -m scripts.populate_institutions -e test -a\n</code></pre> <p>\u4e0a\u8a18\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3068\u3001<code>Virginia Tech [Test]</code> \u306a\u3069\u306e\u6a5f\u95a2\u540d\u3092\u6301\u3064\u6a5f\u95a2\u304c\u767b\u9332\u3055\u308c\u307e\u3059\u3002</p> <p>\u6b21\u306b\u3001shell\u6a5f\u80fd\u3092\u4f7f\u3063\u3066\u3001\u30e6\u30fc\u30b6\u306b\u6a5f\u95a2\u3092\u7d10\u4ed8\u3051\u307e\u3059\u3002\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web invoke shell\n</code></pre> <p>\u4e0a\u8a18\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3068\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u30d7\u30ed\u30f3\u30d7\u30c8\u304c\u73fe\u308c\u307e\u3059\u306e\u3067\u3001Python\u30b9\u30af\u30ea\u30d7\u30c8\u3067\u51e6\u7406\u3092\u6307\u793a\u3057\u307e\u3059\u3002\u4e0b\u8a18\u306e\u3088\u3046\u306b\u30b9\u30af\u30ea\u30d7\u30c8\u3092\u5b9f\u884c\u3059\u308b\u3068\u3001\u6307\u5b9a\u3057\u305fEmail\u30a2\u30c9\u30ec\u30b9\u3092\u6301\u3064\u30e6\u30fc\u30b6\u306e\u30e2\u30c7\u30eb\u3092\u53d6\u5f97\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <pre><code>In[1]: user = OSFUser.objects.get(username='\u767b\u9332\u3057\u305fEmail\u30a2\u30c9\u30ec\u30b9')\n\nIn [2]: user\nOut[2]: <OSFUser('\u767b\u9332\u3057\u305fEmail\u30a2\u30c9\u30ec\u30b9') with guid '\u767b\u9332\u3055\u308c\u305f\u30e6\u30fc\u30b6ID'>\n</code></pre> <p>\u30e6\u30fc\u30b6\u304c\u6240\u5c5e\u3059\u308b\u6a5f\u95a2\u306e\u30ea\u30b9\u30c8\u306f\u3001<code>user.affiliated_institutions</code>\u3067\u7ba1\u7406\u3055\u308c\u307e\u3059\u3002\u3053\u306e\u30ea\u30b9\u30c8\u306b\u3001\u5148\u306b\u767b\u9332\u3057\u305f\u6a5f\u95a2\u306b\u5bfe\u5fdc\u3059\u308b<code>Institution</code>\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u8ffd\u52a0\u3059\u308b\u3068\u3001\u30e6\u30fc\u30b6\u3092\u6a5f\u95a2\u306b\u6240\u5c5e\u3055\u305b\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <pre><code># \u6a5f\u95a2\u540d\u306f\u4f8b\u3048\u3070 Virginia Tech [Test] \u7b49: [i.name for i in Institution.objects.all()] \u3067\u78ba\u8a8d\u3067\u304d\u308b\nIn [4]: user.affiliated_institutions.add(Institution.objects.get(name='\u6a5f\u95a2\u540d'))\n</code></pre> <p>\u5909\u6570\u3092\u7de8\u96c6\u3057\u305f\u3089\u3001\u30e2\u30c7\u30eb\u306b\u5bfe\u3057\u3066<code>save</code>\u30e1\u30bd\u30c3\u30c9\u3092\u547c\u3073\u51fa\u3057\u3001<code>commit</code>\u3082\u5fd8\u308c\u306a\u3044\u3088\u3046\u306b\u3057\u3066\u304a\u304d\u307e\u3057\u3087\u3046\u3002</p> <pre><code>In [5]: user.save()\n\nIn [6]: commit()\nTransaction committed.\nNew transaction opened.\n</code></pre> <p>\u3053\u308c\u3067\u30e6\u30fc\u30b6\u3092\u6a5f\u95a2\u306b\u6240\u5c5e\u3055\u305b\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3057\u305f\u3002\u8a66\u3057\u306b\u3001New Project\u304b\u3089\u65b0\u898f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u4f5c\u6210\u3092\u5b9f\u65bd\u3057\u3066\u307f\u307e\u3057\u3087\u3046\u3002\u6240\u5c5e\u306e\u3068\u3053\u308d\u306b\u3001Institution\u3067\u6307\u5b9a\u3057\u305f\u6a5f\u95a2\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002</p> <p></p>"},{"location":"guides/environment/README.legacy/#admin\u30a2\u30af\u30bb\u30b9\u53ef\u80fd\u306a\u30e6\u30fc\u30b6\u3078\u3068\u5909\u66f4\u3059\u308b","title":"admin\u30a2\u30af\u30bb\u30b9\u53ef\u80fd\u306a\u30e6\u30fc\u30b6\u3078\u3068\u5909\u66f4\u3059\u308b","text":"<p>\u7ba1\u7406\u8005\u6a5f\u80fd\u306f <code>http://localhost:8001/</code> \u304b\u3089\u30a2\u30af\u30bb\u30b9\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 \u30e6\u30fc\u30b6\u304cadmin\u30a2\u30af\u30bb\u30b9\u53ef\u80fd\u304b\u3069\u3046\u304b\u306f <code>is_staff</code> \u30d7\u30ed\u30d1\u30c6\u30a3\u3067\u5b9a\u7fa9\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p><code>is_staff</code>\u306e\u7de8\u96c6\u306b\u306f\u3001shell\u6a5f\u80fd\u3092\u4f7f\u3044\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web invoke shell\n</code></pre> <p>shell\u304b\u3089\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u3067\u3001\u6307\u5b9a\u3057\u305f\u30e6\u30fc\u30b6\u306e <code>is_staff</code> \u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u5909\u66f4\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <pre><code>In[1]: user = OSFUser.objects.get(username='\u767b\u9332\u3057\u305fEmail\u30a2\u30c9\u30ec\u30b9')\n\nIn [2]: user\nOut[2]: <OSFUser('\u767b\u9332\u3057\u305fEmail\u30a2\u30c9\u30ec\u30b9') with guid '\u767b\u9332\u3055\u308c\u305f\u30e6\u30fc\u30b6ID'>\n\nIn [3]: user.is_staff = True\n\nIn [4]: user.save()\n\nIn [5]: commit()\nTransaction committed.\nNew transaction opened.\n</code></pre>"},{"location":"guides/screen-expansion/","title":"Screen Expansion Addon / \u753b\u9762\u62e1\u5f35\u30a2\u30c9\u30aa\u30f3","text":"<p>Summary: Guide to creating RDM screen expansion addons with dashboard widgets and page tabs \u6982\u8981: \u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u3068\u30da\u30fc\u30b8\u30bf\u30d6\u3092\u6301\u3064 RDM \u753b\u9762\u62e1\u5f35\u30a2\u30c9\u30aa\u30f3\u3092\u4f5c\u6210\u3059\u308b\u624b\u5f15\u304d</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05</li> <li>Normative for: <code>docs/guides/screen-expansion/</code></li> <li>Related: SPEC-06 Documentation Conventions \u00b7 Skeleton Guide</li> </ul> <p></p>"},{"location":"guides/screen-expansion/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"guides/screen-expansion/#overview","title":"Overview","text":"<p>This guide shows how to create RDM screen expansion addons that add:</p> <ul> <li>Dashboard widgets: Small UI elements on the project dashboard</li> <li>Page tabs: New pages accessible from the project navigation bar</li> </ul> <p>Screen expansion addons use Ember.js for the frontend and Django for the backend.</p>"},{"location":"guides/screen-expansion/#prerequisites","title":"Prerequisites","text":"<ul> <li>Basic understanding of Python, Django, and JavaScript</li> <li>The development environment set up following the Environment Guide</li> <li>Completed the Skeleton Addon Guide</li> </ul>"},{"location":"guides/screen-expansion/#quick-start","title":"Quick start","text":"<ol> <li>Create your addon using the skeleton as a base</li> <li>Add widget template and configuration files</li> <li>Add Ember.js page tab (route, controller, template)</li> <li>Configure RDM to display your widget and tab</li> <li>Test both the widget and page tab</li> </ol>"},{"location":"guides/screen-expansion/#legacy-content","title":"Legacy content","text":"<p>The legacy screen expansion addon instructions are kept verbatim in <code>README.legacy.md</code> for reference and will be rewritten per milestone.</p> <p></p>"},{"location":"guides/screen-expansion/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"guides/screen-expansion/#\u6982\u8981","title":"\u6982\u8981","text":"<p>\u3053\u306e\u30ac\u30a4\u30c9\u306f\u3001\u4ee5\u4e0b\u306e\u6a5f\u80fd\u3092\u6301\u3064 RDM \u753b\u9762\u62e1\u5f35\u30a2\u30c9\u30aa\u30f3\u3092\u4f5c\u6210\u3059\u308b\u65b9\u6cd5\u3092\u793a\u3057\u307e\u3059:</p> <ul> <li>\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8: \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u4e0a\u306e\u5c0f\u3055\u306a UI \u8981\u7d20</li> <li>\u30da\u30fc\u30b8\u30bf\u30d6: \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30d0\u30fc\u304b\u3089\u30a2\u30af\u30bb\u30b9\u3067\u304d\u308b\u65b0\u3057\u3044\u30da\u30fc\u30b8</li> </ul> <p>\u753b\u9762\u62e1\u5f35\u30a2\u30c9\u30aa\u30f3\u306f\u3001\u30d5\u30ed\u30f3\u30c8\u30a8\u30f3\u30c9\u306b Ember.js\u3001\u30d0\u30c3\u30af\u30a8\u30f3\u30c9\u306b Django \u3092\u4f7f\u7528\u3057\u307e\u3059\u3002</p>"},{"location":"guides/screen-expansion/#\u524d\u63d0\u6761\u4ef6","title":"\u524d\u63d0\u6761\u4ef6","text":"<ul> <li>Python, Django, JavaScript \u306e\u57fa\u672c\u7684\u306a\u7406\u89e3</li> <li>\u74b0\u5883\u30ac\u30a4\u30c9\u306b\u5f93\u3063\u3066\u958b\u767a\u74b0\u5883\u3092\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3057\u3066\u3044\u308b\u3053\u3068</li> <li>\u30b9\u30b1\u30eb\u30c8\u30f3\u30a2\u30c9\u30aa\u30f3\u30ac\u30a4\u30c9\u3092\u5b8c\u4e86\u3057\u3066\u3044\u308b\u3053\u3068</li> </ul>"},{"location":"guides/screen-expansion/#\u30af\u30a4\u30c3\u30af\u30b9\u30bf\u30fc\u30c8","title":"\u30af\u30a4\u30c3\u30af\u30b9\u30bf\u30fc\u30c8","text":"<ol> <li>\u30b9\u30b1\u30eb\u30c8\u30f3\u3092\u30d9\u30fc\u30b9\u306b\u30a2\u30c9\u30aa\u30f3\u3092\u4f5c\u6210\u3059\u308b</li> <li>\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3068\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0\u3059\u308b</li> <li>Ember.js \u306e\u30da\u30fc\u30b8\u30bf\u30d6\uff08\u30eb\u30fc\u30c8\u3001\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc\u3001\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\uff09\u3092\u8ffd\u52a0\u3059\u308b</li> <li>RDM \u3092\u8a2d\u5b9a\u3057\u3066\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u3068\u30bf\u30d6\u3092\u8868\u793a\u3059\u308b</li> <li>\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u3068\u30da\u30fc\u30b8\u30bf\u30d6\u306e\u4e21\u65b9\u3092\u30c6\u30b9\u30c8\u3059\u308b</li> </ol>"},{"location":"guides/screen-expansion/#\u904e\u53bb\u306e\u30b3\u30f3\u30c6\u30f3\u30c4","title":"\u904e\u53bb\u306e\u30b3\u30f3\u30c6\u30f3\u30c4","text":"<p>\u904e\u53bb\u306e\u753b\u9762\u62e1\u5f35\u30a2\u30c9\u30aa\u30f3\u306e\u624b\u9806\u306f\u3001\u53c2\u8003\u306e\u305f\u3081\u306b <code>README.legacy.md</code> \u306b\u305d\u306e\u307e\u307e\u6b8b\u3057\u3066\u304a\u308a\u3001\u30de\u30a4\u30eb\u30b9\u30c8\u30fc\u30f3\u3054\u3068\u306b\u66f8\u304d\u76f4\u3059\u4e88\u5b9a\u3067\u3059\u3002</p>"},{"location":"guides/screen-expansion/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Screen expansion addon An addon that adds new UI elements and pages to RDM. RDM \u306b\u65b0\u3057\u3044 UI \u8981\u7d20\u3068\u30da\u30fc\u30b8\u3092\u8ffd\u52a0\u3059\u308b\u30a2\u30c9\u30aa\u30f3\u3002 Dashboard widget A small UI element displayed on the project dashboard. \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u306b\u8868\u793a\u3055\u308c\u308b\u5c0f\u3055\u306a UI \u8981\u7d20\u3002 Page tab A new page accessible from the project navigation bar. \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30d0\u30fc\u304b\u3089\u30a2\u30af\u30bb\u30b9\u3067\u304d\u308b\u65b0\u3057\u3044\u30da\u30fc\u30b8\u3002 Ember.js A JavaScript framework for building interactive web applications. \u30a4\u30f3\u30bf\u30e9\u30af\u30c6\u30a3\u30d6\u306a\u30a6\u30a7\u30d6\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u69cb\u7bc9\u3059\u308b\u305f\u3081\u306e JavaScript \u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u3002"},{"location":"guides/screen-expansion/README.legacy/","title":"\u753b\u9762\u62e1\u5f35\u30a2\u30c9\u30aa\u30f3\u306e\u4f5c\u6210","text":"<p>\u4ee5\u4e0b\u306e\u6a5f\u80fd\u3092\u6301\u3064\u753b\u9762\u62e1\u5f35\u30a2\u30c9\u30aa\u30f3\u3092\u5b9f\u88c5\u3057\u307e\u3059\u3002</p> <ul> <li>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u4e0a\u306e\u30a2\u30c9\u30aa\u30f3\u306e\u30a6\u30a3\u30b8\u30a7\u30c3\u30c9</li> <li>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30d0\u30fc\u304b\u3089\u9077\u79fb\u3067\u304d\u308b\u30a2\u30c9\u30aa\u30f3\u306e\u753b\u9762\u30bf\u30d6(Ember\u3092\u5229\u7528)</li> </ul> <p>\u57fa\u672c\u7684\u306a\u30a2\u30c9\u30aa\u30f3\u306e\u6982\u8981\u306f\u30b9\u30b1\u30eb\u30c8\u30f3\u306e\u4f5c\u6210\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#\u524d\u63d0\u6761\u4ef6","title":"\u524d\u63d0\u6761\u4ef6","text":"<p>\u958b\u767a\u74b0\u5883\u306e\u6e96\u5099\u306e\u30ac\u30a4\u30c9\u306b\u5f93\u3044\u3001\u958b\u767a\u74b0\u5883\u306b\u3066RDM\u3092\u8d77\u52d5\u3057\u3066\u3044\u308b\u3082\u306e\u3068\u3057\u307e\u3059\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#\u753b\u9762\u62e1\u5f35\u30a2\u30c9\u30aa\u30f3\u306e\u8a2d\u8a08","title":"\u753b\u9762\u62e1\u5f35\u30a2\u30c9\u30aa\u30f3\u306e\u8a2d\u8a08","text":""},{"location":"guides/screen-expansion/README.legacy/#\u30b5\u30fc\u30d3\u30b9\u306e\u69cb\u6210","title":"\u30b5\u30fc\u30d3\u30b9\u306e\u69cb\u6210","text":"<p>\u753b\u9762\u62e1\u5f35\u30a2\u30c9\u30aa\u30f3\u306f\u4ee5\u4e0b\u306e2\u3064\u306e\u8981\u7d20\u304b\u3089\u69cb\u6210\u3055\u308c\u307e\u3059\u3002</p> <ul> <li>OSF.io\u30b5\u30fc\u30d3\u30b9\u3067\u52d5\u4f5c\u3059\u308bAddon: \u30e6\u30fc\u30b6\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u8a2d\u5b9a\u306e\u7ba1\u7406</li> <li>ember-osf-web\u30b5\u30fc\u30d3\u30b9\u3067\u52d5\u4f5c\u3059\u308b\u753b\u9762\u30bf\u30d6\u30e2\u30b8\u30e5\u30fc\u30eb: \u753b\u9762\u30bf\u30d6\u306eView\u5b9a\u7fa9</li> </ul> <p>ember-osf-web\u306f\u3001 Ember.js \u3092\u30d9\u30fc\u30b9\u3068\u3057\u305fOSF\u306e\u30d5\u30ed\u30f3\u30c8\u30a8\u30f3\u30c9UI\u306e\u5b9f\u88c5\u3067\u3059\u3002\u3082\u3068\u3082\u3068\u3001OSF.io\u304c\u30d5\u30ed\u30f3\u30c8\u30a8\u30f3\u30c9\u3082\u62c5\u5f53\u3057\u3066\u3044\u307e\u3057\u305f\u304c\u3001COS\u306fEmber.js\u30d9\u30fc\u30b9\u306e\u30b3\u30fc\u30c9\u306b\u79fb\u884c\u3092\u9032\u3081\u3066\u3044\u307e\u3059\u3002</p> <p>\u73fe\u5728\u306fosf-web(OSF.io)\u304c\u5916\u90e8\u304b\u3089\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u53d7\u3051\u3001\u8981\u6c42\u3055\u308c\u305f\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8\u3092ember-osf-web\u304c\u30b5\u30dd\u30fc\u30c8\u3057\u3066\u3044\u308b\u3068\u5224\u65ad\u3055\u308c\u308b\u5834\u5408\u306f\u3001osf-web\u304cember-osf-web\u306b\u5bfe\u3057\u3066\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u8ee2\u9001\u3059\u308b\u5f62\u5f0f\u3092\u53d6\u3063\u3066\u3044\u307e\u3059\u3002\u5b9f\u969b\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u5bfe\u3059\u308b\u64cd\u4f5c\u306f\u3001\u5f93\u6765\u306eosf-api(OSF.io apiserver)\u304c\u62c5\u3044\u307e\u3059\u3002ember-osf\u95a2\u9023\u306e\u30d5\u30ed\u30f3\u30c8\u30a8\u30f3\u30c9\u306f\u3001\u5fc5\u8981\u306b\u5fdc\u3058\u3066API\u30b5\u30fc\u30d0\u3078\u306e\u554f\u3044\u5408\u308f\u305b\u3092\u884c\u3046\u3053\u3068\u3067\u3001\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u5bfe\u3059\u308b\u5909\u66f4\u3084\u30b9\u30c8\u30ec\u30fc\u30b8\u306b\u5bfe\u3059\u308b\u64cd\u4f5c\u3092\u5b9f\u65bd\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#\u30d5\u30a1\u30a4\u30eb\u306e\u69cb\u6210","title":"\u30d5\u30a1\u30a4\u30eb\u306e\u69cb\u6210","text":"<p>\u5178\u578b\u7684\u306a\u30d5\u30a1\u30a4\u30eb\u914d\u7f6e\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#osfio-addon\u306e\u30d5\u30a1\u30a4\u30eb\u69cb\u6210","title":"OSF.io Addon\u306e\u30d5\u30a1\u30a4\u30eb\u69cb\u6210","text":"<p>\u30af\u30e9\u30b9\u69cb\u6210\u306f\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u3068\u540c\u69d8\u3067\u3059\u3002</p> <pre><code>/addons/\u30a2\u30c9\u30aa\u30f3\u540d/\n\u251c\u2500\u2500 __init__.py ... \u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 apps.py ... (**) \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 models.py ... \u30e2\u30c7\u30eb\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 requirements.txt ... \u5229\u7528\u3059\u308bPython\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 routes.py ... (**) View(Routes)\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 settings ... \u8a2d\u5b9a\u3092\u5b9a\u7fa9\u3059\u308b\u30e2\u30b8\u30e5\u30fc\u30eb\n\u2502 \u251c\u2500\u2500 defaults.py ... \u30c7\u30d5\u30a9\u30eb\u30c8\u8a2d\u5b9a\u306e\u5b9a\u7fa9\n\u2502 \u2514\u2500\u2500 __init__.py ... \u8a2d\u5b9a\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 static ... Web\u30d6\u30e9\u30a6\u30b6\u304b\u3089\u8aad\u307f\u8fbc\u3080\u3053\u3068\u3092\u60f3\u5b9a\u3057\u305f\u9759\u7684\u30d5\u30a1\u30a4\u30eb\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 comicon.png ... \u30a2\u30c9\u30aa\u30f3\u306e\u30a2\u30a4\u30b3\u30f3\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 \u30a2\u30c9\u30aa\u30f3\u540d.css ... (*) \u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u306eCSS\u30d5\u30a1\u30a4\u30eb\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 node-cfg.js ... Node\u8a2d\u5b9a\u306e\u30a8\u30f3\u30c8\u30ea\u3068\u306a\u308bJavaScript\u30d5\u30a1\u30a4\u30eb\n\u2502\u00a0\u00a0 \u2514\u2500\u2500 widget-cfg.js ... (*) \u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u306eJavaScript\u30d5\u30a1\u30a4\u30eb\n\u251c\u2500\u2500 templates ... \u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\n\u2502\u00a0\u00a0 \u2514\u2500\u2500 node_settings.mako ... Node\u8a2d\u5b9a\u30d1\u30cd\u30eb\n\u251c\u2500\u2500 tests ... \u30c6\u30b9\u30c8\u30b3\u30fc\u30c9\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 __init__.py\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 conftest.py\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 factories.py\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 test_model.py\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 (**) test_view.py\n\u2502\u00a0\u00a0 \u2514\u2500\u2500 utils.py\n\u251c\u2500\u2500 utils.py ... (*) \u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u95a2\u6570\u306e\u5b9a\u7fa9\n\u2514\u2500\u2500 views.py ... (**) View(Views)\u306e\u5b9a\u7fa9\n</code></pre> <p><code>(*)</code>\u304c\u4ed8\u3044\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u306f\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306b\u306f\u5b58\u5728\u3057\u306a\u3044\u30d5\u30a1\u30a4\u30eb\u3067\u3059\u3002 <code>(**)</code>\u304c\u4ed8\u3044\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u306f\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306b\u5b58\u5728\u3057\u307e\u3059\u304c\u3001\u5909\u66f4\u304c\u52a0\u3048\u3089\u308c\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u3067\u3059\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#ember-osf-web-\u753b\u9762\u30bf\u30d6\u306e\u30d5\u30a1\u30a4\u30eb\u69cb\u6210","title":"ember-osf-web \u753b\u9762\u30bf\u30d6\u306e\u30d5\u30a1\u30a4\u30eb\u69cb\u6210","text":"<pre><code>app\n\u251c\u2500\u2500 guid-node/\u30a2\u30c9\u30aa\u30f3\u540d ... \u30a2\u30c9\u30aa\u30f3\u306e\u753b\u9762\u30bf\u30d6\u30e2\u30b8\u30e5\u30fc\u30eb\u5b9a\u7fa9\n\u2502 \u251c\u2500\u2500 controller.ts ... \u753b\u9762\u30bf\u30d6\u306e\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u5b9a\u7fa9\n\u2502 \u251c\u2500\u2500 route.ts ... \u753b\u9762\u30bf\u30d6\u306e\u30eb\u30fc\u30c6\u30a3\u30f3\u30b0\u5b9a\u7fa9\n\u2502 \u251c\u2500\u2500 styles.scss ... \u753b\u9762\u30bf\u30d6\u306eCSS(SCSS)\u5b9a\u7fa9\n\u2502 \u2514\u2500\u2500 template.hbs ... \u753b\u9762\u30bf\u30d6\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\n\u251c\u2500\u2500 models/\u30e2\u30c7\u30eb\u540d.ts ... \u753b\u9762\u30bf\u30d6\u3067\u4f7f\u3046\u30e2\u30c7\u30eb\u5b9a\u7fa9\n\u251c\u2500\u2500 adapters/\u30e2\u30c7\u30eb\u540d.ts ... \u753b\u9762\u30bf\u30d6\u3067\u4f7f\u3046\u30e2\u30c7\u30eb\u306e\u30a2\u30c0\u30d7\u30bf\u5b9a\u7fa9\n\u2514\u2500\u2500 serializers/\u30e2\u30c7\u30eb\u540d.ts ... \u753b\u9762\u30bf\u30d6\u3067\u4f7f\u3046\u30e2\u30c7\u30eb\u306e\u30b7\u30ea\u30a2\u30e9\u30a4\u30b6\u5b9a\u7fa9\n\ntests ... \u30c6\u30b9\u30c8\u30b3\u30fc\u30c9\n\u251c\u2500\u2500 acceptance/guid-node/\u30a2\u30c9\u30aa\u30f3\u540d-test.ts\n\u2514\u2500\u2500 unit/guid-node/\u30a2\u30c9\u30aa\u30f3\u540d/controller-test.ts\n\nmirage ... \u30a2\u30c0\u30d7\u30bf\u63a5\u7d9a\u5148API\u306e\u30c6\u30b9\u30c8\u7528\u30e2\u30c3\u30af\u5b9a\u7fa9\n\u251c\u2500\u2500 factories/\u30e2\u30c7\u30eb\u540d.ts\n\u2514\u2500\u2500 views/\u30e2\u30c7\u30eb\u540d.ts\n</code></pre>"},{"location":"guides/screen-expansion/README.legacy/#osfio-addon\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u69cb\u6210","title":"OSF.io Addon\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u69cb\u6210","text":"<p>\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u3068\u5927\u304d\u306a\u9055\u3044\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u3068\u306e\u9055\u3044\u3092\u4e2d\u5fc3\u306b\u8aac\u660e\u3057\u3066\u3044\u304d\u307e\u3059\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#model\u306e\u69cb\u6210","title":"Model\u306e\u69cb\u6210","text":"<p>Model\u306e\u69cb\u6210\u306f\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u3068\u540c\u3058\u3067\u3059\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#view\u306e\u69cb\u6210","title":"View\u306e\u69cb\u6210","text":"<p>\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306eViews\u304a\u3088\u3073Routes\u306e\u5b9a\u7fa9\u306b\u3001\u753b\u9762\u30bf\u30d6\u7528\u306e\u5b9a\u7fa9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <p>\u753b\u9762\u30bf\u30d6\u3067\u30a2\u30c9\u30aa\u30f3\u306e\u30c7\u30fc\u30bf\u3092\u3084\u308a\u53d6\u308a\u3059\u308b\u306b\u306f\u3001ember-osf-web\u306b\u65b0\u3057\u304f\u30e2\u30c7\u30eb\u3092\u5b9a\u7fa9\u3057\u3001\u305d\u306e\u30e2\u30c7\u30eb\u306b\u5bfe\u5fdc\u3059\u308bJSON API\u3092OSF.io\u5074\u306b\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 \u30c7\u30fc\u30bf\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306a JSON:API \u3067\u5b9a\u3081\u3089\u308c\u305f\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3067\u3084\u308a\u53d6\u308a\u3057\u307e\u3059\u3002</p> <pre><code>{\n \"data\": {\n \"id\": node\u306eID\n \"type\": \"\u30e2\u30c7\u30eb\u540d\",\n \"attributes\": \u30c7\u30fc\u30bf\u306eDictionary\n }\n}\n</code></pre> <p>My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306bRoutes\u3068Views\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>routes.py</li> <li>views.py</li> </ul>"},{"location":"guides/screen-expansion/README.legacy/#\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u308bview","title":"\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u308bView","text":"<p>\u30a2\u30c9\u30aa\u30f3\u306e\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u5b9a\u7fa9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <p>\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306f website/templates/util/render_addon_widget.mako \u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002 \u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u8a2d\u5b9a\u306f website/project/views/node.py \u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <p>\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u3067\u4f7f\u3046JavaScript\u306f <code>/addons/\u30a2\u30c9\u30aa\u30f3\u540d/static/widget-cfg.js</code> \u3067\u3001CSS\u306f <code>/addons/\u30a2\u30c9\u30aa\u30f3\u540d/static/\u30a2\u30c9\u30aa\u30f3\u540d.css</code> \u3067\u5b9a\u7fa9\u3057\u307e\u3059\u3002CSS\u306fJavaScript\u30d5\u30a1\u30a4\u30eb\u304b\u3089 <code>require()</code> \u3092\u4f7f\u3063\u3066\u8aad\u307f\u8fbc\u307f\u307e\u3059\u3002</p> <p>My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>render_addon_widget.mako</li> <li>node.py</li> <li>widget-cfg.js</li> <li>myscreen.css</li> </ul>"},{"location":"guides/screen-expansion/README.legacy/#\u56fd\u969b\u5316","title":"\u56fd\u969b\u5316","text":"<p>\u56fd\u969b\u5316\u306e\u8a2d\u5b9a\u306f website/translations/ \u4ee5\u4e0b\u306e\u30d5\u30a1\u30a4\u30eb\u306b\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <pre><code>msgid \u30e1\u30c3\u30bb\u30fc\u30b8ID\nmsgstr \u56fd\u969b\u5316\u5f8c\u306e\u6587\u5b57\u5217\n</code></pre> <p><code>*.pot</code> \u30d5\u30a1\u30a4\u30eb\u306b\u306f <code>msgstr</code> \u3092 <code>\"\"</code> (\u7a7a\u6587\u5b57)\u306b\u3057\u3066\u5b9a\u7fa9\u3057\u307e\u3059\u3002 <code>messages.*</code> \u306b\u306fmako\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u3067\u4f7f\u3046\u56fd\u969b\u5316\u8a2d\u5b9a\u3092\u3001 <code>js_messages.*</code> \u306b\u306fJavaScript\u3067\u4f7f\u3046\u56fd\u969b\u5316\u8a2d\u5b9a\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <p>JavaScript\u3067\u6587\u5b57\u5217\u3092\u56fd\u969b\u5316\u3059\u308b\u306e\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u66f8\u304d\u307e\u3059\u3002</p> <pre><code>var _ = require('js/rdmGettext')._;\nconst localizedStr = _('\u30e1\u30c3\u30bb\u30fc\u30b8ID');\n</code></pre> <p>mako\u3067\u6587\u5b57\u5217\u3092\u56fd\u969b\u5316\u3059\u308b\u306e\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u66f8\u304d\u307e\u3059\u3002</p> <pre><code>${_(\"\u30e1\u30c3\u30bb\u30fc\u30b8ID\")}\n</code></pre>"},{"location":"guides/screen-expansion/README.legacy/#\u8a2d\u5b9a\u30e2\u30b8\u30e5\u30fc\u30eb","title":"\u8a2d\u5b9a\u30e2\u30b8\u30e5\u30fc\u30eb","text":"<p>\u8a2d\u5b9a\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u3068\u540c\u3058\u3067\u3059\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#addonappconfig\u306e\u5b9a\u7fa9","title":"AddonAppConfig\u306e\u5b9a\u7fa9","text":"<p>\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u3068\u753b\u9762\u30bf\u30d6\u3092\u6709\u52b9\u306b\u3059\u308b\u305f\u3081\u306b\u3001 <code>/addons/\u30a2\u30c9\u30aa\u30f3\u540d/app.py</code> \u306e <code>AddonAppConfig.views</code> \u306b\u3001<code>'widget'</code> \u3068 <code>'page'</code> \u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <pre><code>class AddonAppConfig(BaseAddonAppConfig):\n # \u4e2d\u7565\n views = ['widget', 'page']\n # \u4e2d\u7565\n</code></pre> <p>My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>apps.py</li> </ul>"},{"location":"guides/screen-expansion/README.legacy/#\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9","title":"\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9","text":"<p>\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u3068\u540c\u69d8\u306b\u3001\u30e6\u30cb\u30c3\u30c8\u30c6\u30b9\u30c8\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002 My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>tests/</li> </ul>"},{"location":"guides/screen-expansion/README.legacy/#ember-osf-web-\u753b\u9762\u30bf\u30d6\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u69cb\u6210","title":"ember-osf-web \u753b\u9762\u30bf\u30d6\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u69cb\u6210","text":"<p>ember-osf-web\u306f TypeScript \u306b\u3088\u3063\u3066\u5b9f\u88c5\u3055\u308c\u307e\u3059\u3002 \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u30b3\u30fc\u30c9\u306f app/ \u306b\u5b9f\u88c5\u3055\u308c\u307e\u3059\u3002</p> <p>ember-osf-web\u306f\u3001OSF\u306e\u753b\u9762\u3092\u69cb\u6210\u3059\u308b\u30da\u30fc\u30b8\u3092\u5358\u4f4d\u3068\u3057\u3066\u30e2\u30b8\u30e5\u30fc\u30eb\u5206\u5272\u3055\u308c\u3066\u3044\u307e\u3059\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#routerts","title":"router.ts","text":"<p>router.ts \u306f\u3001\u30da\u30fc\u30b8\u5168\u4f53\u3092\u675f\u306d\u308b\u30eb\u30fc\u30c6\u30a3\u30f3\u30b0\u5b9a\u7fa9\u30d5\u30a1\u30a4\u30eb\u3067\u3059\u3002</p> <p>\u4f8b\u3048\u3070\u3001 <code>/\u30d7\u30ed\u30b8\u30a7\u30af\u30c8ID/\u30a2\u30c9\u30aa\u30f3\u540d</code> \u3068\u3044\u3046\u30d1\u30b9\u3092\u8ffd\u52a0\u3059\u308b\u5834\u5408\u306f\u3001 <code>Router.map</code> \u306b\u6e21\u3059\u95a2\u6570\u306b\u4ee5\u4e0b\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <pre><code>this.route('guid-node', { path: '--node/:guid' }, function() {\n this.route('\u30a2\u30c9\u30aa\u30f3\u540d');\n});\n</code></pre> <p>\u3053\u306e\u30d1\u30b9\u306b\u30ea\u30af\u30a8\u30b9\u30c8\u304c\u4e0e\u3048\u3089\u308c\u308b\u3068\u3001 <code>app/guid-node/\u30a2\u30c9\u30aa\u30f3\u540d</code> \u3067\u5b9a\u7fa9\u3055\u308c\u305f\u30da\u30fc\u30b8\u306b\u51e6\u7406\u304c\u79fb\u884c\u3057\u307e\u3059\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#\u30da\u30fc\u30b8\u306e\u5b9f\u88c5","title":"\u30da\u30fc\u30b8\u306e\u5b9f\u88c5","text":""},{"location":"guides/screen-expansion/README.legacy/#\u753b\u9762\u306e\u5b9f\u88c5","title":"\u753b\u9762\u306e\u5b9f\u88c5","text":"<p>\u753b\u9762\u306e\u5b9f\u88c5\u306f Handlebars templating library \u3092\u4f7f\u7528\u3057\u3066\u3001 <code>template.hbs</code> \u30d5\u30a1\u30a4\u30eb\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <p>\u753b\u9762\u4e0a\u306e\u6587\u5b57\u5217\u306f\u5168\u3066\u56fd\u969b\u5316\u3092\u8003\u616e\u3057\u3001 translations/en-us.yml \u306b\u5b9a\u7fa9\u3055\u308c\u305f\u5024\u3092\u57cb\u3081\u8fbc\u3080\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002</p> <p>My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>template.hbs</li> <li>translations/en-us.yml</li> </ul> <p>\u30dc\u30bf\u30f3 \u3084 DatePicker \u3001 \u30c0\u30a4\u30a2\u30ed\u30b0\u30dc\u30c3\u30af\u30b9 \u306a\u3069\u306f\u3001\u5225\u306e\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u3068\u3057\u3066\u5b9a\u7fa9\u3059\u308b\u3053\u3068\u3067\u518d\u5229\u7528\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u3063\u3066\u3044\u307e\u3059\u3002 lib/osf-components \u306e\u30b3\u30fc\u30c9\u3092\u78ba\u8a8d\u3057\u3066\u3001\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u3092\u5229\u7528\u3057\u307e\u3057\u3087\u3046\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u306e\u5b9a\u7fa9","title":"\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u306e\u5b9a\u7fa9","text":"<p>\u753b\u9762\u306b\u57cb\u3081\u8fbc\u3080\u5909\u6570\u3084\u30cf\u30f3\u30c9\u30e9\u306e\u5236\u5fa1\u306f\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u304c\u62c5\u3044\u307e\u3059\u3002 \u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u306b\u306f <code>template.hbs</code> \u306b\u57cb\u3081\u8fbc\u307e\u308c\u308b\u5909\u6570\u3084\u30a4\u30d9\u30f3\u30c8\u306b\u5bfe\u3059\u308b\u51e6\u7406\u3092\u8a18\u8ff0\u3057\u307e\u3059\u3002</p> <p>My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>controller.ts</li> </ul> <p>\u307e\u305f\u3001\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u3068\u30d0\u30c3\u30af\u30a8\u30f3\u30c9\u306e\u3084\u308a\u53d6\u308a\u306f\u3001Ember Data\u304c\u63d0\u4f9b\u3059\u308b DS.Store \u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u7d4c\u7531\u3057\u3066\u884c\u308f\u308c\u307e\u3059\u3002 DS.Store\u3067\u64cd\u4f5c\u53ef\u80fd\u306a\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306f models \u306b\u5b9a\u7fa9\u3055\u308c\u3001 adapters \u306b\u5b9a\u7fa9\u3055\u308c\u305f\u30eb\u30fc\u30eb\u306b\u57fa\u3065\u304d\u3001API\u30b5\u30fc\u30d0\u3092\u4ecb\u3057\u305f\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u64cd\u4f5c\u3092\u884c\u3044\u307e\u3059\u3002</p> <p>\u306a\u304a\u3001API\u30b5\u30fc\u30d0\u306f JSON:API \u306b\u5247\u3063\u3066\u3044\u308b\u3053\u3068\u3092\u524d\u63d0\u3068\u3059\u308b\u3053\u3068\u3067\u3001adapter\u306f\u7d30\u304b\u306a\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8\u751f\u6210\u51e6\u7406\u3092\u5b9a\u7fa9\u3059\u308b\u3053\u3068\u306a\u304f\u3001API\u30b5\u30fc\u30d0\u3068\u306e\u9023\u643a\u3092\u5b9f\u73fe\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 \u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8\u751f\u6210\u51e6\u7406\u3092\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3057\u305f\u3044\u5834\u5408\u306f\u3001 serializers \u306b\u5b9a\u7fa9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <p>My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u3001<code>myscreen-config</code> \u3068\u3044\u3046model\u3068\u3001\u5bfe\u5fdc\u3059\u308badapter\u304a\u3088\u3073serializer\u3092\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>models/myscreen-config.ts</li> <li>adapters/myscreen-config.ts</li> <li>serializers/myscreen-config.ts</li> </ul>"},{"location":"guides/screen-expansion/README.legacy/#\u30b9\u30bf\u30a4\u30eb\u306e\u5b9a\u7fa9","title":"\u30b9\u30bf\u30a4\u30eb\u306e\u5b9a\u7fa9","text":"<p>\u30b9\u30bf\u30a4\u30eb\u306f Sass(SCSS) \u3092\u4f7f\u7528\u3057\u3066\u3001 <code>styles.scss</code> \u30d5\u30a1\u30a4\u30eb\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002 My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>styles.scss</li> </ul>"},{"location":"guides/screen-expansion/README.legacy/#\u30eb\u30fc\u30c6\u30a3\u30f3\u30b0\u306e\u5b9a\u7fa9","title":"\u30eb\u30fc\u30c6\u30a3\u30f3\u30b0\u306e\u5b9a\u7fa9","text":"<p>\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u95a2\u3059\u308b\u8ffd\u52a0\u306e\u7d4c\u8def\u5b9a\u7fa9\u3092 <code>route.ts</code> \u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002 My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>route.ts</li> </ul>"},{"location":"guides/screen-expansion/README.legacy/#\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9_1","title":"\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9","text":"<p>\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9\u306f tests/ \u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002 \u30c6\u30b9\u30c8\u306b\u4f7f\u3046API\u306e\u30e2\u30c3\u30af\u306f\u3001 Mirage \u3092\u4f7f\u7528\u3057\u3066 mirage/ \u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <p>My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>tests/</li> <li>mirage/</li> </ul>"},{"location":"guides/screen-expansion/README.legacy/#my-screen\u30a2\u30c9\u30aa\u30f3\u306e\u5b9f\u88c5","title":"My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u5b9f\u88c5","text":"<p>\u3053\u3053\u3067\u306f\u3001 <code>myscreen</code> \u3068\u3044\u3046\u8b58\u5225\u540d\u306e\u30a2\u30c9\u30aa\u30f3\u306e\u5b9f\u88c5\u3092\u4f8b\u306b\u8aac\u660e\u3057\u307e\u3059\u3002\u30a2\u30c9\u30aa\u30f3\u306e\u5b8c\u5168\u540d\u306f <code>My Screen</code> \u3068\u3057\u307e\u3059\u3002</p> <p>\u30a2\u30c9\u30aa\u30f3\u540d\u306f\u69d8\u3005\u306a\u5834\u6240\u306b\u57cb\u3081\u8fbc\u307e\u308c\u3066\u3044\u307e\u3059\u3002\u30a2\u30c9\u30aa\u30f3\u540d\u3092\u5909\u66f4\u3057\u305f\u3044\u5834\u5408\u306f\u3001\u4ee5\u964d\u3067\u8ffd\u52a0\u30fb\u5909\u66f4\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u540d\u3084\u30b3\u30fc\u30c9\u306e <code>myscreen</code> \u3001 <code>My Screen</code> \u3001 <code>MyScreen</code> \u3068\u3044\u3046\u6587\u5b57\u5217\u3092\u5909\u66f4\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#osfio\u3078\u306e\u5b9f\u88c5","title":"OSF.io\u3078\u306e\u5b9f\u88c5","text":""},{"location":"guides/screen-expansion/README.legacy/#addonsmyscreen-\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9a\u7fa9","title":"addons.myscreen \u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9a\u7fa9","text":"<p>\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u3068\u540c\u69d8\u306b\u3001\u30a2\u30c9\u30aa\u30f3\u306e\u5b9f\u88c5\u4f8b(<code>osf.io/addon/</code>)\u3092 <code>addons/myscreen</code> \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#rdm\u30b3\u30fc\u30c9\u306e\u5909\u66f4","title":"RDM\u30b3\u30fc\u30c9\u306e\u5909\u66f4","text":"<p>\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u3068\u540c\u69d8\u306b\u3001RDM\u306e\u30b3\u30fc\u30c9\u3092\u3044\u304f\u3064\u304b\u5909\u66f4\u3057\u307e\u3059\u3002</p> <ul> <li>addons.json</li> <li>\u5909\u66f4\u4f8b\u306e\u30b5\u30f3\u30d7\u30eb: addons.json</li> <li>framework/addons/data/addons.json</li> <li>\u5909\u66f4\u4f8b\u306e\u30b5\u30f3\u30d7\u30eb: addons.json</li> <li>Dockerfile</li> <li>\u5909\u66f4\u4f8b\u306e\u30b5\u30f3\u30d7\u30eb: Dockerfile</li> <li>api/base/settings/defaults.py</li> <li>\u5909\u66f4\u4f8b\u306e\u30b5\u30f3\u30d7\u30eb: defaults.py</li> </ul>"},{"location":"guides/screen-expansion/README.legacy/#\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u5909\u66f4","title":"\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u5909\u66f4","text":"<p>website/templates/util/render_addon_widget.mako \u306b\u3001\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u5b9a\u7fa9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <pre><code>% if addon_name == 'myscreen':\n <div id=\"myscreen-content\" class=\"scripted\">\n <!-- ko if: loading -->\n <div>${_(\"Loading\")}</div>\n <!-- /ko -->\n <!-- ko if: loadFailed -->\n <div class=\"text-danger\">${_(\"Error occurred\")}</div>\n <!-- /ko -->\n <!-- ko if: loadCompleted -->\n <h5 style=\"padding: 0.2em;\">${_(\"My Screen Test\")}</h5>\n <div>\n <label data-bind=\"text: param_1_label\"></label>\n <p data-bind=\"text: param_1\"></p>\n </div>\n <!-- /ko -->\n </div>\n% endif\n</code></pre> <p>website/project/views/node.py \u306e <code>view_project()</code> \u95a2\u6570\u306b\u3001My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u30c7\u30fc\u30bf\u3092\u8aad\u307f\u8fbc\u3080\u30b3\u30fc\u30c9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <pre><code>def view_project(auth, node, **kwargs):\n # \u4e2d\u7565\n addons_widget_data = {\n # \u4e2d\u7565\n 'myscreen': None\n }\n\n if 'myscreen' in ret['addons']:\n addons_widget_data['myscreen'] = serialize_myscreen_widget(node)\n # \u4e2d\u7565\n</code></pre> <p>\u305d\u308c\u305e\u308c\u306e\u5909\u66f4\u4f8b\u306f\u3001\u30b5\u30f3\u30d7\u30eb render_addon_widget.mako \u3068 node.py \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#\u56fd\u969b\u5316\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4","title":"\u56fd\u969b\u5316\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4","text":"<p>website/translations/ \u4ee5\u4e0b\u306e\u5404\u56fd\u969b\u5316\u30d5\u30a1\u30a4\u30eb\u306b\u3001\u30a2\u30c9\u30aa\u30f3\u3067\u8868\u793a\u3059\u308b\u6587\u5b57\u5217\u306e\u56fd\u969b\u5316\u8a2d\u5b9a\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <p><code>website/translations/messages.pot</code> \u3068 <code>website/translations/en/LC_MESSAGES/messages.po</code>:</p> <pre><code>#: website/templates/util/render_addon_widget.mako:245\nmsgid \"My Screen Test\"\nmsgstr \"\"\n</code></pre> <p><code>website/translations/ja/LC_MESSAGES/messages.po</code>:</p> <pre><code>#: website/templates/util/render_addon_widget.mako:245\nmsgid \"My Screen Test\"\nmsgstr \"My Screen \u30c6\u30b9\u30c8\"\n</code></pre> <p><code>website/translations/js_messages.pot</code> \u3068 <code>website/translations/en/LC_MESSAGES/js_messages.po</code>:</p> <pre><code>#: addons/myscreen/static/widget-cfg.js:22\nmsgid \"My Screen Param1 Label\"\nmsgstr \"\"\n</code></pre> <p><code>website/translations/ja/LC_MESSAGES/js_messages.po</code>:</p> <pre><code>#: addons/myscreen/static/widget-cfg.js:22\nmsgid \"My Screen Param1 Label\"\nmsgstr \"\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc1\"\n</code></pre> <p>\u5909\u66f4\u4f8b\u306f\u3001\u30b5\u30f3\u30d7\u30eb translations/ \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#migrations\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210","title":"Migrations\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210","text":"<p><code>makemigrations</code> \u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u3066\u3001Migrations\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web python3 manage.py makemigrations\n</code></pre> <p>\u4e0a\u8a18\u306e\u51fa\u529b\u4e2d\u306b\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u51fa\u529b\u304c\u73fe\u308c\u308c\u3070\u6210\u529f\u3067\u3059\u3002</p> <pre><code>Migrations for 'addons_myscreen':\n addons/myscreen/migrations/0001_initial.py\n - Create model NodeSettings\n - Add field user_settings to nodesettings\n</code></pre>"},{"location":"guides/screen-expansion/README.legacy/#widget\u306e\u8868\u793a\u4f4d\u7f6e\u306e\u30ab\u30b9\u30bf\u30de\u30a4\u30ba","title":"Widget\u306e\u8868\u793a\u4f4d\u7f6e\u306e\u30ab\u30b9\u30bf\u30de\u30a4\u30ba","text":"<p>\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306f\u3001\u30a2\u30c9\u30aa\u30f3\u306eWidget\u306f\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u306e\u5de6\u30ab\u30e9\u30e0\u306e\u4e0b\u90e8(FileViewer\u306e\u4e0b)\u306b\u3001\u30a2\u30c9\u30aa\u30f3\u306e\u540d\u524d\u9806\u3067\u8868\u793a\u3055\u308c\u307e\u3059\u3002\u8868\u793a\u4f4d\u7f6e\u3092\u5909\u66f4\u3059\u308b\u5834\u5408\u306f\u3001 website/templates/project/project.mako \u30d5\u30a1\u30a4\u30eb\u3092\u7de8\u96c6\u3057\u307e\u3059\u3002</p> <p>\u4eca\u5f8c\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u306e\u8868\u793a\u3082Ember\u5316\u3055\u308c\u308b\u3053\u3068\u304c\u8003\u3048\u3089\u308c\u307e\u3059\u3002\u305d\u306e\u5834\u5408\u306f\u3001Ember\u5074\u3082\u5408\u308f\u305b\u3066\u5909\u66f4\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002</p> <p>\u5de6\u30ab\u30e9\u30e0\u306e\u4e00\u756a\u4e0a(Wiki\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u306e\u4e0a)\u306b\u8868\u793a\u3057\u305f\u3044\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u4fee\u6b63\u3057\u307e\u3059\u3002</p> <pre><code>@@ -431,6 +431,10 @@\n\n <div class=\"col-sm-12 col-md-6 osf-dash-col\">\n\n+ % if 'myscreen' in addons_enabled and addons['myscreen']['has_widget']:\n+ ${ render_addon_widget.render_addon_widget('myscreen', addons_widget_data['myscreen']) }\n+ % endif\n+\n %if user['show_wiki_widget']:\n ${ render_addon_widget.render_addon_widget('wiki', addons_widget_data['wiki']) }\n %endif\n@@ -470,7 +474,7 @@\n <!-- Show widgets in left column if present -->\n % for addon in addons_enabled:\n % if addons[addon]['has_widget']:\n- %if addon != 'wiki' and addon != 'iqbrims': ## We already show the wiki widget at the top\n+ %if addon != 'wiki' and addon != 'iqbrims' and addon != 'myscreen': ## We already show the wiki widget at the top\n ${ render_addon_widget.render_addon_widget(addon, addons_widget_data[addon]) }\n %endif\n % endif\n</code></pre> <p>\u53f3\u30ab\u30e9\u30e0\u306e\u4e00\u756a\u4e0a\u306b\u8868\u793a\u3057\u305f\u3044\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u4fee\u6b63\u3057\u307e\u3059\u3002</p> <pre><code>@@ -470,7 +470,7 @@\n <!-- Show widgets in left column if present -->\n % for addon in addons_enabled:\n % if addons[addon]['has_widget']:\n- %if addon != 'wiki' and addon != 'iqbrims': ## We already show the wiki widget at the top\n+ %if addon != 'wiki' and addon != 'iqbrims' and addon != 'myscreen': ## We already show the wiki widget at the top\n ${ render_addon_widget.render_addon_widget(addon, addons_widget_data[addon]) }\n %endif\n % endif\n % endfor\n % else:\n <!-- If no widgets, show components -->\n ${children()}\n % endif\n\n </div>\n\n <div class=\"col-sm-12 col-md-6 osf-dash-col\">\n+ % if 'myscreen' in addons_enabled and addons['myscreen']['has_widget']:\n+ ${ render_addon_widget.render_addon_widget('myscreen', addons_widget_data['myscreen']) }\n+ % endif\n+\n % if addons:\n <!-- Show IQB-RIMS widgets in right column if present -->\n % for addon in addons_enabled:\n</code></pre> <p>\u5909\u66f4\u4f8b\u306f\u3001\u30b5\u30f3\u30d7\u30eb project.mako \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#\u753b\u9762\u30bf\u30d6\u30ea\u30f3\u30af\u306e\u8868\u793a\u4f4d\u7f6e\u306e\u30ab\u30b9\u30bf\u30de\u30a4\u30ba","title":"\u753b\u9762\u30bf\u30d6\u30ea\u30f3\u30af\u306e\u8868\u793a\u4f4d\u7f6e\u306e\u30ab\u30b9\u30bf\u30de\u30a4\u30ba","text":"<p>\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306f\u3001\u30a2\u30c9\u30aa\u30f3\u753b\u9762\u30bf\u30d6\u306e\u30ea\u30f3\u30af\u306f\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30d0\u30fc\u306eFiles(\u30d5\u30a1\u30a4\u30eb)\u30bf\u30d6\u306e\u53f3\u306b\u3001\u30a2\u30c9\u30aa\u30f3\u306e\u540d\u524d\u9806\u3067\u8868\u793a\u3055\u308c\u307e\u3059\u3002\u8868\u793a\u4f4d\u7f6e\u3092\u5909\u66f4\u3059\u308b\u5834\u5408\u306f\u3001website/templates/project/project_header.mako \u30d5\u30a1\u30a4\u30eb\u3092\u7de8\u96c6\u3057\u307e\u3059\u3002</p> <p>\u30a2\u30c9\u30aa\u30f3\u753b\u9762\u30bf\u30d6\u306a\u3069\u306eember-osf-web\u304c\u63d0\u4f9b\u3059\u308bView\u3092\u958b\u3044\u3066\u3044\u308b\u3068\u304d\u306f\u3001ember-osf-web\u3067\u5b9a\u7fa9\u3057\u305f <code>node-navbar</code> \u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8(\u5f8c\u8ff0)\u306b\u5f93\u3063\u3066\u8868\u793a\u3055\u308c\u307e\u3059\u3002</p> <p>\u30a2\u30c9\u30aa\u30f3\u30ea\u30b9\u30c8\u306e\u6700\u5f8c\uff08Analytics\uff08\u5206\u6790\uff09\u306e\u524d\uff09\u306b\u8868\u793a\u3059\u308b\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u4fee\u6b63\u3057\u307e\u3059\u3002</p> <pre><code>@@ -43,7 +43,7 @@\n <!-- Add-on tabs -->\n % for addon in addons_enabled:\n\n- % if addons[addon]['has_page']:\n+ % if addon != 'myscreen' and addons[addon]['has_page']:\n <li>\n <a href=\"${node['url']}${addons[addon]['short_name']}\">\n\n % if addons[addon]['icon'] and addons[addon]['has_page_icon']:\n <img src=\"${addons[addon]['icon']}\" class=\"addon-logo\"/>\n % endif\n ${addons[addon]['full_name']}\n </a>\n </li>\n % endif\n % endfor\n\n+ % if 'myscreen' in addons_enabled and addons['myscreen']['has_page']:\n+ <li>\n+ <a href=\"${node['url']}${addons['myscreen']['short_name']}\">\n+\n+ % if addons['myscreen']['icon'] and addons['myscreen']['has_page_icon']:\n+ <img src=\"${addons['myscreen']['icon']}\" class=\"addon-logo\"/>\n+ % endif\n+ ${addons['myscreen']['full_name']}\n+ </a>\n+ </li>\n+ % endif\n+\n % if project_analytics:\n % if node['is_public'] or user['is_contributor_or_group_member']:\n <li><a href=\"${node['url']}analytics/\">${ _(\"Analytics\") }</a></li>\n</code></pre> <p>\u5909\u66f4\u4f8b\u306f\u3001\u30b5\u30f3\u30d7\u30eb project_header.mako \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#\u30a2\u30c9\u30aa\u30f3\u306e\u30c6\u30b9\u30c8","title":"\u30a2\u30c9\u30aa\u30f3\u306e\u30c6\u30b9\u30c8","text":"<p>\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3067\u3001OSF.io\u306b\u8ffd\u52a0\u3057\u305fMy Screen\u30a2\u30c9\u30aa\u30f3\u306e\u30e6\u30cb\u30c3\u30c8\u30c6\u30b9\u30c8\u3092\u5b9f\u884c\u3067\u304d\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web invoke test_module -m addons/myscreen/tests/\n</code></pre>"},{"location":"guides/screen-expansion/README.legacy/#ember-osf-web\u3078\u306e\u5b9f\u88c5","title":"ember-osf-web\u3078\u306e\u5b9f\u88c5","text":""},{"location":"guides/screen-expansion/README.legacy/#\u753b\u9762\u30bf\u30d6\u306e\u5b9f\u88c5","title":"\u753b\u9762\u30bf\u30d6\u306e\u5b9f\u88c5","text":"<p>\u753b\u9762\u30bf\u30d6\u306e\u5b9f\u88c5\u4f8b(<code>ember-osf-web/app/guid-node/myscreen/</code>) \u3092 <code>app/guid-node/myscreen</code> \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#myscreen-config-\u30e2\u30c7\u30eb\u306e\u5b9a\u7fa9","title":"myscreen-config \u30e2\u30c7\u30eb\u306e\u5b9a\u7fa9","text":"<p>My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u753b\u9762\u30bf\u30d6\u3067\u306f\u3001NodeSettings\u306e <code>param_1</code> \u30d7\u30ed\u30d1\u30c6\u30a3\u306b\u5bfe\u5fdc\u3059\u308b <code>param1</code> \u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u6301\u3064\u3001 <code>MyScreenConfig</code> \u30e2\u30c7\u30eb\u3092\u5b9a\u7fa9\u3057\u3066\u6271\u3044\u307e\u3059\u3002<code>MyScreenConfig</code> \u30e2\u30c7\u30eb\u3068\u3001\u30a2\u30c0\u30d7\u30bf\u3001\u30b7\u30ea\u30a2\u30e9\u30a4\u30b6\u3092\u3001\u305d\u308c\u305e\u308c\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002</p> <ul> <li>MyScreenConfig\u30e2\u30c7\u30eb\u306e\u5b9f\u88c5\u4f8b \u3092 <code>app/models/myscreen-config.ts</code> \u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002</li> <li>MyScreenConfig\u30a2\u30c0\u30d7\u30bf\u306e\u5b9f\u88c5\u4f8b \u3092 <code>app/adapters/myscreen-config.ts</code> \u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002</li> <li>MyScreenConfig\u30b7\u30ea\u30a2\u30e9\u30a4\u30b6\u306e\u5b9f\u88c5\u4f8b \u3092 <code>app/serializers/myscreen-config.ts</code> \u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002</li> </ul>"},{"location":"guides/screen-expansion/README.legacy/#\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9\u306e\u5b9a\u7fa9","title":"\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9\u306e\u5b9a\u7fa9","text":"<p>\u753b\u9762\u30bf\u30d6\u306b\u95a2\u3059\u308b\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9\u4f8b\u3068\u3001\u30c6\u30b9\u30c8\u306b\u5229\u7528\u3059\u308bMirage\u306e\u30b3\u30fc\u30c9\u4f8b\u3092\u3001\u305d\u308c\u305e\u308c\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002</p> <ul> <li>\u753b\u9762\u30bf\u30d6\u306e\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u306e\u5358\u4f53\u30c6\u30b9\u30c8\u306e\u30b3\u30fc\u30c9\u4f8b \u3092 <code>tests/acceptance/guid-node/myscreen-test.ts</code> \u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002</li> <li>\u753b\u9762\u30bf\u30d6\u306e\u53d7\u3051\u5165\u308c\u30c6\u30b9\u30c8\u306e\u30b3\u30fc\u30c9\u4f8b \u3092 <code>tests/unit/guid-node/myscreen/controller-test.ts</code> \u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002</li> <li>MyScreenConfig\u306eMirage Factory\u30b3\u30fc\u30c9\u4f8b \u3092 <code>mirage/factories/myscreen-config.ts</code> \u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002</li> <li>MyScreenConfig\u306eMirage Views\u30b3\u30fc\u30c9\u4f8b \u3092 <code>mirage/views/myscreen-config.ts</code> \u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002</li> </ul>"},{"location":"guides/screen-expansion/README.legacy/#rdm\u30b3\u30fc\u30c9\u306e\u5909\u66f4_1","title":"RDM\u30b3\u30fc\u30c9\u306e\u5909\u66f4","text":""},{"location":"guides/screen-expansion/README.legacy/#\u30eb\u30fc\u30c6\u30a3\u30f3\u30b0\u306e\u8a2d\u5b9a","title":"\u30eb\u30fc\u30c6\u30a3\u30f3\u30b0\u306e\u8a2d\u5b9a","text":"<p>app/router.ts \u306b\u3001\u30a2\u30c9\u30aa\u30f3\u306e\u753b\u9762\u30bf\u30d6\u30da\u30fc\u30b8\u3078\u306e\u30eb\u30fc\u30c6\u30a3\u30f3\u30b0\u8a2d\u5b9a\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <pre><code>this.route('guid-node', { path: '--node/:guid' }, function() {\n this.mount('analytics-page', { as: 'analytics' });\n this.route('forks');\n this.route('iqbrims');\n this.route('myscreen'); // \u8ffd\u52a0\n this.route('registrations');\n this.route('drafts', { path: '/drafts/:draftId' }, function() {\n this.route('register');\n });\n});\n</code></pre> <p>\u5909\u66f4\u4f8b\u306f\u3001\u30b5\u30f3\u30d7\u30eb router.ts \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30d0\u30fc\u5b9a\u7fa9\u306e\u5909\u66f4","title":"\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30d0\u30fc\u5b9a\u7fa9\u306e\u5909\u66f4","text":"<p>ember-osf-web\u304c\u63d0\u4f9b\u3059\u308bView\u304b\u3089\u898b\u3048\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30d0\u30fc\u3067\u3001\u753b\u9762\u30bf\u30d6\u306e\u30ea\u30f3\u30af\u3092\u8868\u793a\u3059\u308b\u305f\u3081\u306b\u3001\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb lib/osf-components/addon/components/node-navbar/template.hbs \u306b\u30b3\u30fc\u30c9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <pre><code>{{#if this.myscreenEnabled }}\n {{node-navbar/link node=@node useLinkTo=false destination='myscreen'}}\n{{/if}}\n</code></pre> <p>RDM\u3067My Screen\u30a2\u30c9\u30aa\u30f3\u304c\u6709\u52b9\u3067\u306a\u3044\u3068\u304d\u306f\u30ea\u30f3\u30af\u3092\u8868\u793a\u3057\u306a\u3044\u3088\u3046\u306b\u3059\u308b\u305f\u3081\u306b\u3001\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u5b9a\u7fa9\u30d5\u30a1\u30a4\u30eb lib/osf-components/addon/components/node-navbar/component.ts \u306b <code>myscreenEnabled</code> \u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <pre><code>@computed('node.addons.[]')\nget myscreenEnabled(): Promise<boolean> | null {\n if (!this.node) {\n return null;\n }\n const node = this.node;\n return (async () => {\n const addons = await node.addons;\n if (!addons) {\n return false;\n }\n const myscreen = addons.filter(addon => addon.id === 'myscreen');\n return myscreen.length > 0;\n })();\n}\n</code></pre> <p>\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30d0\u30fc\u306e\u30c6\u30b9\u30c8 tests/integration/components/node-navbar/component-test.ts \u3082\u4fee\u6b63\u3057\u307e\u3059\u3002</p> <p>\u305d\u308c\u305e\u308c\u306e\u5909\u66f4\u4f8b\u306f\u3001\u30b5\u30f3\u30d7\u30eb template.hbs \u3001 component.ts \u3001 component-test.ts \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#\u56fd\u969b\u5316\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4_1","title":"\u56fd\u969b\u5316\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4","text":"<p>translations/en-us.yml \u306b\u3001My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u753b\u9762\u30bf\u30d6\u3067\u8868\u793a\u3059\u308b\u6587\u5b57\u5217\u306e\u56fd\u969b\u5316\u8a2d\u5b9a\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <pre><code>myscreen:\n page_title: '{nodeTitle} My Screen'\n header: 'My Screen'\n loading: 'Loading My Screen config...'\n param1: 'Param 1'\n save_button: 'Save'\n failed_to_submit: 'Failed to save'\n placeholders:\n param1: 'anything'\n</code></pre> <p>\u5909\u66f4\u4f8b\u306f\u3001\u30b5\u30f3\u30d7\u30eb en-us.yml \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#mirage\u5b9a\u7fa9\u306e\u5909\u66f4","title":"Mirage\u5b9a\u7fa9\u306e\u5909\u66f4","text":"<p>\u8ffd\u52a0\u3057\u305fMirage\u30b3\u30fc\u30c9\u3092\u5229\u7528\u3057\u3066API\u3092\u30e2\u30c3\u30af\u3059\u308b\u3088\u3046\u306b\u3001 mirage/config.ts \u306b\u4ee5\u4e0b\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <pre><code>this.get('/project/:id/myscreen/config', myscreenConfig);\n</code></pre> <p>\u5909\u66f4\u4f8b\u306f\u3001\u30b5\u30f3\u30d7\u30eb config.ts \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#docker-composeoverrideyml-\u306e\u8ffd\u52a0","title":"docker-compose.override.yml \u306e\u8ffd\u52a0","text":"<p>\u5909\u66f4\u3057\u305f\u30b3\u30fc\u30c9\u3092\u4f7f\u3046\u3088\u3046\u306b\u3001RDM\u306e <code>docker-compose.override.yml</code> \u3067 osf-ember-web \u30b5\u30fc\u30d3\u30b9\u306e <code>volumes</code> \u3092\u6307\u5b9a\u3057\u307e\u3059\u3002</p> <p>\u4f8b\u3048\u3070\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u968e\u5c64\u306e\u5834\u5408\u306f\u3001</p> <pre><code>.\n\u251c\u2500\u2500 RDM-osf.io\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 docker-compose.override.yml\n\u2502\u00a0\u00a0 \u2514\u2500\u2500 docker-compose.yml\n\u2514\u2500\u2500 RDM-ember-osf-web\n</code></pre> <p><code>RDM-osf.io/docker-compose.override.yml</code> \u306e\u5185\u5bb9\u3092\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u3057\u307e\u3059\u3002</p> <pre><code>version: \"3.4\"\n\nservices:\n ember_osf_web:\n volumes:\n - ../RDM-ember-osf-web:/code\n</code></pre>"},{"location":"guides/screen-expansion/README.legacy/#\u753b\u9762\u30bf\u30d6\u306e\u30c6\u30b9\u30c8","title":"\u753b\u9762\u30bf\u30d6\u306e\u30c6\u30b9\u30c8","text":"<p>\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3067\u3001ember-osf-web\u306b\u8ffd\u52a0\u3057\u305fMy Screen \u753b\u9762\u30bf\u30d6\u306e\u30c6\u30b9\u30c8\u3092\u5b9f\u884c\u3067\u304d\u307e\u3059\u3002</p> <p>\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u306e\u5358\u4f53\u30c6\u30b9\u30c8:</p> <pre><code>$ docker compose run --rm ember_osf_web yarn test --module 'Unit | Controller | guid-node/myscreen'\n</code></pre> <p>\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30d0\u30fc\u306e\u7d50\u5408\u30c6\u30b9\u30c8:</p> <pre><code>$ docker compose run --rm ember_osf_web yarn test --module 'Integration | Component | node-navbar'\n</code></pre> <p>\u753b\u9762\u30bf\u30d6\u306e\u53d7\u3051\u5165\u308c\u30c6\u30b9\u30c8:</p> <pre><code>$ docker compose run --rm ember_osf_web yarn test --module 'Acceptance | guid-node/myscreen'\n</code></pre> <p>\u30d5\u30a1\u30a4\u30eb\u3092\u6307\u5b9a\u3057\u3066lint\u3092\u5b9f\u884c\u3059\u308b\u306e\u306f\u3001\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm ember_osf_web node_modules/.bin/eslint --ext js,ts --max-warnings=0 'app/guid-node/myscreen' 'app/**/myscreen-config.ts' 'app/router.ts' 'lib/osf-components/addon/components/node-navbar/component.ts' 'tests/integration/components/node-navbar/component-test.ts' 'mirage/config.ts'\n$ docker compose run --rm ember_osf_web node_modules/.bin/tslint -p . 'app/guid-node/myscreen/**/*.ts' 'app/**/myscreen-config.ts' 'app/router.ts' 'lib/osf-components/addon/components/node-navbar/component.ts' 'tests/integration/components/node-navbar/component-test.ts' 'mirage/config.ts'\n$ docker compose run --rm ember_osf_web node_modules/.bin/stylelint 'app/guid-node/myscreen/**/*.scss'\n$ docker compose run --rm ember_osf_web node_modules/.bin/ember-template-lint 'app/guid-node/myscreen/**/*.hbs' 'lib/osf-components/addon/components/node-navbar/template.hbs'\n</code></pre>"},{"location":"guides/screen-expansion/README.legacy/#my-screen\u30a2\u30c9\u30aa\u30f3\u306e\u52d5\u4f5c\u78ba\u8a8d","title":"My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u52d5\u4f5c\u78ba\u8a8d","text":"<p>My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u52d5\u4f5c\u78ba\u8a8d\u3092\u3057\u3066\u307f\u307e\u3057\u3087\u3046\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#db\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3","title":"DB\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3","text":"<p>\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u3092\u5b9f\u884c\u3057\u3001Migrations\u5b9a\u7fa9\u3092PostgreSQL\u30b5\u30fc\u30d3\u30b9\u306b\u53cd\u6620\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web python3 manage.py migrate\n</code></pre>"},{"location":"guides/screen-expansion/README.legacy/#\u56fd\u969b\u5316\u306e\u30b3\u30f3\u30d1\u30a4\u30eb","title":"\u56fd\u969b\u5316\u306e\u30b3\u30f3\u30d1\u30a4\u30eb","text":"<p><code>.mako</code> \u30d5\u30a1\u30a4\u30eb\u306e\u56fd\u969b\u5316\u8a2d\u5b9a\u3092\u9069\u7528\u3059\u308b\u305f\u3081\u306b\u3001\u56fd\u969b\u5316\u30d5\u30a1\u30a4\u30eb\u3092\u30b3\u30f3\u30d1\u30a4\u30eb\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web pybabel compile -d ./website/translations\n</code></pre> <p><code>.js</code> \u30d5\u30a1\u30a4\u30eb\u306e\u56fd\u969b\u5316\u8a2d\u5b9a\u306f\u3001 <code>assets</code> \u30b5\u30fc\u30d3\u30b9\u306e\u518d\u8d77\u52d5\u6642\u306b\u9069\u7528\u3055\u308c\u307e\u3059\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#\u30b5\u30fc\u30d3\u30b9\u306e\u518d\u8d77\u52d5","title":"\u30b5\u30fc\u30d3\u30b9\u306e\u518d\u8d77\u52d5","text":"<p>\u5909\u66f4\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306b\u95a2\u9023\u3059\u308b\u30b5\u30fc\u30d3\u30b9\u3092\u518d\u8d77\u52d5\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose restart assets web api ember_osf_web\n</code></pre> <p>\u3053\u308c\u3067\u30b5\u30fc\u30d3\u30b9\u3078\u306e\u53cd\u6620\u306f\u5b8c\u4e86\u3067\u3059\u3002</p>"},{"location":"guides/screen-expansion/README.legacy/#\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u3092\u8a66\u3059","title":"\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u3092\u8a66\u3059","text":"<p>My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u6709\u52b9\u5316\u624b\u9806\u306f\u3001\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u3068\u540c\u69d8\u3067\u3059\u3002 My Screen\u30a2\u30c9\u30aa\u30f3\u3092\u6709\u52b9\u5316\u3059\u308b\u3068\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u306b\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u304c\u8868\u793a\u3055\u308c\u3001\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30d0\u30fc\u306b\u753b\u9762\u30bf\u30d6\u306e\u30ea\u30f3\u30af\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002</p> <p></p> <p>\u753b\u9762\u30bf\u30d6\u306e\u30ea\u30f3\u30af\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u3068\u3001\u753b\u9762\u30bf\u30d6\u306e\u30da\u30fc\u30b8\u3092\u8868\u793a\u3067\u304d\u307e\u3059\u3002</p> <p></p> <p>\u3053\u3053\u3067\u8a2d\u5b9a\u3057\u305f <code>param_1</code> \u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u5024\u304c\u3001\u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u306b\u8868\u793a\u3055\u308c\u307e\u3059\u3002</p> <p>\u4ee5\u4e0a\u3067My Screen\u30a2\u30c9\u30aa\u30f3\u306e\u52d5\u4f5c\u78ba\u8a8d\u306f\u5b8c\u4e86\u3067\u3059\uff01</p>"},{"location":"guides/skeleton/","title":"Skeleton Addon / \u30b9\u30b1\u30eb\u30c8\u30f3\u30a2\u30c9\u30aa\u30f3","text":"<p>Summary: Guide to creating your first RDM addon using the skeleton template \u6982\u8981: \u30b9\u30b1\u30eb\u30c8\u30f3\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u4f7f\u7528\u3057\u3066\u6700\u521d\u306e RDM \u30a2\u30c9\u30aa\u30f3\u3092\u4f5c\u6210\u3059\u308b\u624b\u5f15\u304d</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05</li> <li>Normative for: <code>docs/guides/skeleton/</code></li> <li>Related: SPEC-06 Documentation Conventions \u00b7 Environment Guide</li> </ul> <p></p>"},{"location":"guides/skeleton/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"guides/skeleton/#overview","title":"Overview","text":"<p>This guide shows how to create your first RDM addon using the skeleton template. A skeleton addon is a simple addon with basic features that you can customize to build your own functionality.</p> <p>The skeleton addon has the following capabilities:</p> <ul> <li>Can be enabled in any project</li> <li>Has a parameter <code>param_1</code> that can be set differently for each project</li> <li>The <code>param_1</code> parameter can be configured in the project's addon settings page</li> </ul>"},{"location":"guides/skeleton/#prerequisites","title":"Prerequisites","text":"<ul> <li>A fork of the RDM-osf.io repository</li> <li>The development environment set up following the Environment Guide</li> </ul>"},{"location":"guides/skeleton/#quick-start","title":"Quick start","text":"<ol> <li>Copy the skeleton code to <code>addons/your-addon-name</code></li> <li>Update the addon name in all required files</li> <li>Modify RDM code to register your addon (addons.json, Dockerfile, etc.)</li> <li>Run migrations and restart services</li> <li>Enable your addon in a project and test it</li> </ol>"},{"location":"guides/skeleton/#legacy-content","title":"Legacy content","text":"<p>The legacy skeleton addon instructions are kept verbatim in <code>README.legacy.md</code> for reference and will be rewritten per milestone.</p> <p></p>"},{"location":"guides/skeleton/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"guides/skeleton/#\u6982\u8981","title":"\u6982\u8981","text":"<p>\u3053\u306e\u30ac\u30a4\u30c9\u306f\u3001\u30b9\u30b1\u30eb\u30c8\u30f3\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u4f7f\u7528\u3057\u3066\u6700\u521d\u306e RDM \u30a2\u30c9\u30aa\u30f3\u3092\u4f5c\u6210\u3059\u308b\u65b9\u6cd5\u3092\u793a\u3057\u307e\u3059\u3002\u30b9\u30b1\u30eb\u30c8\u30f3\u30a2\u30c9\u30aa\u30f3\u306f\u3001\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3057\u3066\u72ec\u81ea\u306e\u6a5f\u80fd\u3092\u69cb\u7bc9\u3067\u304d\u308b\u57fa\u672c\u7684\u306a\u6a5f\u80fd\u3092\u6301\u3064\u30b7\u30f3\u30d7\u30eb\u306a\u30a2\u30c9\u30aa\u30f3\u3067\u3059\u3002</p> <p>\u30b9\u30b1\u30eb\u30c8\u30f3\u306e\u6a5f\u80fd\u306f\u4ee5\u4e0b\u306e\u901a\u308a\u3067\u3059:</p> <ul> <li>\u4efb\u610f\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u6709\u52b9\u5316\u53ef\u80fd</li> <li><code>param_1</code> \u3068\u3044\u3046\u30d1\u30e9\u30e1\u30fc\u30bf\u3092\u6301\u3061\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3054\u3068\u306b\u7570\u306a\u308b\u5024\u3092\u8a2d\u5b9a\u53ef\u80fd</li> <li><code>param_1</code> \u30d1\u30e9\u30e1\u30fc\u30bf\u306f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30a2\u30c9\u30aa\u30f3\u8a2d\u5b9a\u753b\u9762\u3067\u8a2d\u5b9a\u53ef\u80fd</li> </ul>"},{"location":"guides/skeleton/#\u524d\u63d0\u6761\u4ef6","title":"\u524d\u63d0\u6761\u4ef6","text":"<ul> <li>RDM-osf.io \u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u30d5\u30a9\u30fc\u30af\u3057\u3066\u3044\u308b\u3053\u3068</li> <li>\u74b0\u5883\u30ac\u30a4\u30c9\u306b\u5f93\u3063\u3066\u958b\u767a\u74b0\u5883\u3092\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3057\u3066\u3044\u308b\u3053\u3068</li> </ul>"},{"location":"guides/skeleton/#\u30af\u30a4\u30c3\u30af\u30b9\u30bf\u30fc\u30c8","title":"\u30af\u30a4\u30c3\u30af\u30b9\u30bf\u30fc\u30c8","text":"<ol> <li>\u30b9\u30b1\u30eb\u30c8\u30f3\u30b3\u30fc\u30c9\u3092 <code>addons/\u30a2\u30c9\u30aa\u30f3\u540d</code> \u306b\u30b3\u30d4\u30fc\u3059\u308b</li> <li>\u3059\u3079\u3066\u306e\u5fc5\u8981\u306a\u30d5\u30a1\u30a4\u30eb\u3067\u30a2\u30c9\u30aa\u30f3\u540d\u3092\u66f4\u65b0\u3059\u308b</li> <li>RDM \u306e\u30b3\u30fc\u30c9\u3092\u4fee\u6b63\u3057\u3066\u30a2\u30c9\u30aa\u30f3\u3092\u767b\u9332\u3059\u308b\uff08addons.json, Dockerfile \u306a\u3069\uff09</li> <li>\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u3092\u5b9f\u884c\u3057\u3066\u30b5\u30fc\u30d3\u30b9\u3092\u518d\u8d77\u52d5\u3059\u308b</li> <li>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u30a2\u30c9\u30aa\u30f3\u3092\u6709\u52b9\u5316\u3057\u3066\u30c6\u30b9\u30c8\u3059\u308b</li> </ol>"},{"location":"guides/skeleton/#\u904e\u53bb\u306e\u30b3\u30f3\u30c6\u30f3\u30c4","title":"\u904e\u53bb\u306e\u30b3\u30f3\u30c6\u30f3\u30c4","text":"<p>\u904e\u53bb\u306e\u30b9\u30b1\u30eb\u30c8\u30f3\u30a2\u30c9\u30aa\u30f3\u306e\u624b\u9806\u306f\u3001\u53c2\u8003\u306e\u305f\u3081\u306b <code>README.legacy.md</code> \u306b\u305d\u306e\u307e\u307e\u6b8b\u3057\u3066\u304a\u308a\u3001\u30de\u30a4\u30eb\u30b9\u30c8\u30fc\u30f3\u3054\u3068\u306b\u66f8\u304d\u76f4\u3059\u4e88\u5b9a\u3067\u3059\u3002</p>"},{"location":"guides/skeleton/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Addon A small program that adds new features to RDM. RDM \u306b\u65b0\u3057\u3044\u6a5f\u80fd\u3092\u8ffd\u52a0\u3059\u308b\u5c0f\u3055\u306a\u30d7\u30ed\u30b0\u30e9\u30e0\u3002 Skeleton A template or sample code that you can customize to build your own program. \u72ec\u81ea\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u69cb\u7bc9\u3059\u308b\u305f\u3081\u306b\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3067\u304d\u308b\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3084\u30b5\u30f3\u30d7\u30eb\u30b3\u30fc\u30c9\u3002 Parameter A value that you can change to modify how the addon works. \u30a2\u30c9\u30aa\u30f3\u306e\u52d5\u4f5c\u3092\u5909\u66f4\u3059\u308b\u305f\u3081\u306b\u5909\u66f4\u3067\u304d\u308b\u5024\u3002 Migration A script that updates the database when you change the data structure. \u30c7\u30fc\u30bf\u69cb\u9020\u3092\u5909\u66f4\u3057\u305f\u3068\u304d\u306b\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u66f4\u65b0\u3059\u308b\u30b9\u30af\u30ea\u30d7\u30c8\u3002"},{"location":"guides/skeleton/README.legacy/","title":"\u30b9\u30b1\u30eb\u30c8\u30f3\u306e\u4f5c\u6210","text":"<p>\u30a2\u30c9\u30aa\u30f3\u958b\u767a\u306e\u7b2c\u4e00\u6b69\u3068\u3057\u3066\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u5358\u7d14\u306a\u6a5f\u80fd\u3092\u6301\u3064\u300c\u30b9\u30b1\u30eb\u30c8\u30f3\u300d\u30a2\u30c9\u30aa\u30f3\u3092\u5b9f\u88c5\u3057\u307e\u3059\u3002</p> <p>\u30b9\u30b1\u30eb\u30c8\u30f3\u306f\u4ee5\u4e0b\u306e\u6a5f\u80fd\u3092\u6301\u3064\u3082\u306e\u3068\u3057\u307e\u3059\u3002</p> <ul> <li>\u4efb\u610f\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u3066\u30b9\u30b1\u30eb\u30c8\u30f3\u3092\u6709\u52b9\u5316\u53ef\u80fd</li> <li>\u30b9\u30b1\u30eb\u30c8\u30f3\u306f <code>param_1</code> \u3068\u3044\u3046\u30d1\u30e9\u30e1\u30fc\u30bf\u3092\u6301\u3061\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3054\u3068\u306b\u7570\u306a\u308b\u5024\u3092\u8a2d\u5b9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u308b</li> <li><code>param_1</code> \u30d1\u30e9\u30e1\u30fc\u30bf\u306f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30a2\u30c9\u30aa\u30f3\u8a2d\u5b9a\u753b\u9762\u3067\u8a2d\u5b9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u308b</li> </ul>"},{"location":"guides/skeleton/README.legacy/#\u524d\u63d0\u6761\u4ef6","title":"\u524d\u63d0\u6761\u4ef6","text":"<p>\u672c\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u5b9f\u65bd\u306b\u3042\u305f\u308a\u3001\u4ee5\u4e0b\u306e\u524d\u63d0\u6761\u4ef6\u3092\u6e80\u305f\u3057\u3066\u3044\u308b\u3082\u306e\u3068\u3057\u307e\u3059\u3002</p> <ul> <li>RDM-osf.io\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u30d5\u30a9\u30fc\u30af\u3057\u3001\u30ed\u30fc\u30ab\u30eb\u74b0\u5883\u306bclone\u3057\u3066\u3044\u308b\u3053\u3068</li> <li>\u7279\u306b\u6307\u5b9a\u304c\u306a\u3044\u9650\u308a\u306fdevelop\u30d6\u30e9\u30f3\u30c1\u304b\u3089\u30a2\u30c9\u30aa\u30f3\u958b\u767a\u7528\u30d6\u30e9\u30f3\u30c1(\u4f8b\u3048\u3070\u3001 <code>feature/myskelton-addon</code>)\u3092\u4f5c\u6210\u3057\u4f5c\u696d\u3059\u308b</li> <li>\u30a2\u30c9\u30aa\u30f3\u958b\u767a\u7528\u30d6\u30e9\u30f3\u30c1\u306b\u306f\u5b9a\u671f\u7684\u306bdevelop\u30d6\u30e9\u30f3\u30c1\u3092pull\u3057\u3066\u5909\u66f4\u3092\u53d6\u308a\u8fbc\u3080</li> <li>clone\u3057\u305f\u30a2\u30c9\u30aa\u30f3\u958b\u767a\u7528\u30d6\u30e9\u30f3\u30c1\u3067\u3001 \u958b\u767a\u74b0\u5883\u306e\u6e96\u5099 \u306e\u30ac\u30a4\u30c9\u306b\u5f93\u3044\u3001\u958b\u767a\u7528RDM\u3092\u8d77\u52d5\u3057\u3066\u3044\u308b\u3053\u3068</li> </ul>"},{"location":"guides/skeleton/README.legacy/#rdm\u30a2\u30c9\u30aa\u30f3\u306e\u8a2d\u8a08","title":"RDM\u30a2\u30c9\u30aa\u30f3\u306e\u8a2d\u8a08","text":""},{"location":"guides/skeleton/README.legacy/#\u30d5\u30a1\u30a4\u30eb\u306e\u69cb\u6210","title":"\u30d5\u30a1\u30a4\u30eb\u306e\u69cb\u6210","text":"<p>RDM\u306b\u304a\u3044\u3066\u30a2\u30c9\u30aa\u30f3\u306fDjango\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u5f62\u5f0f\u3067\u8a18\u8ff0\u3055\u308c\u307e\u3059\u3002\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u30d5\u30a1\u30a4\u30eb\u304a\u3088\u3073\u30af\u30e9\u30b9\u304b\u3089\u69cb\u6210\u3055\u308c\u307e\u3059\u3002</p> <p></p> <p>\u5178\u578b\u7684\u306a\u30d5\u30a1\u30a4\u30eb\u914d\u7f6e\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002</p> <pre><code>/addons/\u30a2\u30c9\u30aa\u30f3\u540d/\n\u251c\u2500\u2500 __init__.py ... \u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 apps.py ... \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 models.py ... \u30e2\u30c7\u30eb\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 requirements.txt ... \u5229\u7528\u3059\u308bPython\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 routes.py ... View(Routes)\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 settings ... \u8a2d\u5b9a\u3092\u5b9a\u7fa9\u3059\u308b\u30e2\u30b8\u30e5\u30fc\u30eb\u3002\u3053\u3053\u306blocal.py\u3092\u914d\u7f6e\u3059\u308b\u3053\u3068\u3067\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3067\u304d\u308b\u3002\n\u2502 \u251c\u2500\u2500 defaults.py ... \u30c7\u30d5\u30a9\u30eb\u30c8\u8a2d\u5b9a\u306e\u5b9a\u7fa9\n\u2502 \u2514\u2500\u2500 __init__.py ... \u8a2d\u5b9a\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 static ... Web\u30d6\u30e9\u30a6\u30b6\u304b\u3089\u8aad\u307f\u8fbc\u3080\u3053\u3068\u3092\u60f3\u5b9a\u3057\u305f\u9759\u7684\u30d5\u30a1\u30a4\u30eb\n\u2502 \u251c\u2500\u2500 comicon.png ... \u30a2\u30c9\u30aa\u30f3\u306e\u30a2\u30a4\u30b3\u30f3\n\u2502 \u2514\u2500\u2500 node-cfg.js ... Node\u8a2d\u5b9a\u3092\u5b9a\u7fa9\u3059\u308bJavaScript\u30d5\u30a1\u30a4\u30eb\n\u251c\u2500\u2500 templates ... \u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\n\u2502 \u2514\u2500\u2500 node_settings.mako ... Node\u8a2d\u5b9a\u30d1\u30cd\u30eb\n\u251c\u2500\u2500 tests ... \u30c6\u30b9\u30c8\u30b3\u30fc\u30c9\n\u2502 \u251c\u2500\u2500 conftest.py\n\u2502 \u251c\u2500\u2500 factories.py\n\u2502 \u251c\u2500\u2500 test_model.py\n\u2502 \u251c\u2500\u2500 test_view.py\n\u2502 \u2514\u2500\u2500 utils.py\n\u2514\u2500\u2500 views.py ... View(Views)\u306e\u5b9a\u7fa9\n</code></pre>"},{"location":"guides/skeleton/README.legacy/#\u30a2\u30c9\u30aa\u30f3\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u69cb\u6210","title":"\u30a2\u30c9\u30aa\u30f3\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u69cb\u6210","text":"<p>\u30a2\u30c9\u30aa\u30f3\u306fDjango\u306e\u4f5c\u6cd5\u306b\u5f93\u3044\u3001Model-View\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3\u306b\u3088\u308a\u5b9f\u88c5\u3057\u307e\u3059\u3002\u305d\u308c\u305e\u308c\u306e\u8cac\u52d9\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5206\u62c5\u3055\u308c\u307e\u3059\u3002</p> <ul> <li>Model ... \u30e6\u30fc\u30b6\u3068Node(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8)\u305d\u308c\u305e\u308c\u306b\u5bfe\u5fdc\u3057\u305f\u30e2\u30c7\u30eb\u3092\u5b9f\u88c5\u3059\u308b\u3002\u305d\u308c\u305e\u308c\u306e\u30e2\u30c7\u30eb\u306b\u306f\u8a8d\u8a3c\u60c5\u5831\u3084\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u56fa\u6709\u306e\u60c5\u5831\u3092\u683c\u7d0d\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u308b</li> <li>View ... \u30a2\u30c9\u30aa\u30f3\u306b\u5fdc\u3058\u305f\u8a2d\u5b9a\u3001\u30c7\u30fc\u30bf\u53d6\u5f97\u3001\u4fdd\u5b58\u51e6\u7406\u306a\u3069\u3001HTTP\u4e0a\u306e\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8(\u30d1\u30b9)\u3092\u5b9a\u7fa9\u3059\u308b</li> </ul> <p>Model\u306f\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306b\u3088\u308a\u81ea\u52d5\u7684\u306b\u305d\u308c\u305e\u308c\u306e\u5229\u7528\u8005\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u5bfe\u5fdc\u3057\u3066\u751f\u6210\u3001\u7ba1\u7406\u3055\u308c\u3001\u6c38\u7d9a\u5316\u3055\u308c\u308b\u306e\u306b\u5bfe\u3057\u3001View\u306f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304c\u30ed\u30fc\u30c9\u3055\u308c\u308b\u969b\u306b\u69cb\u7bc9\u3055\u308c\u307e\u3059\u3002 \u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306b\u3088\u308a\u305d\u308c\u305e\u308c\u306e\u30e9\u30a4\u30d5\u30b5\u30a4\u30af\u30eb\u304c\u9069\u5207\u306b\u7ba1\u7406\u3055\u308c\u308b\u306e\u3067\u3001\u30a2\u30c9\u30aa\u30f3\u958b\u767a\u8005\u306f\u6a5f\u80fd\u9762\u306e\u5b9f\u88c5\u306b\u6ce8\u529b\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p>"},{"location":"guides/skeleton/README.legacy/#model\u306e\u69cb\u6210","title":"Model\u306e\u69cb\u6210","text":"<p>Node(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8)\u306b\u95a2\u3059\u308b\u60c5\u5831\u3084\u3001\u30e6\u30fc\u30b6\u3054\u3068\u306e\u60c5\u5831(\u8a8d\u8a3c\u60c5\u5831\u7b49)\u3092\u8a18\u9332\u3001\u7ba1\u7406\u3057\u305f\u3044\u5834\u5408\u3001Model\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <p>UserSettings\u306f\u5229\u7528\u8005\u3054\u3068\u306b\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u304c\u751f\u6210\u3055\u308c\u3001\u6c38\u7d9a\u5316\u3055\u308c\u307e\u3059\u3002\u307e\u305f\u3001NodeSettings\u306f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3054\u3068\u306b\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u304c\u751f\u6210\u3001\u6c38\u7d9a\u5316\u3055\u308c\u307e\u3059\u3002\u3053\u308c\u3089\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u751f\u6210\u3084\u7834\u68c4\u3092\u30a2\u30c9\u30aa\u30f3\u306e\u30b3\u30fc\u30c9\u304c\u884c\u3046\u3053\u3068\u306f\u539f\u5247\u3068\u3057\u3066\u3042\u308a\u307e\u305b\u3093\u3002</p> <p>\u30b9\u30b1\u30eb\u30c8\u30f3\u306e\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306bNode\u306b\u95a2\u3059\u308bModel\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>addons.myskelton.NodeSettings</li> </ul> <p>NodeSettings\u306f\u6c38\u7d9a\u5316\u3059\u3079\u304d\u30d7\u30ed\u30d1\u30c6\u30a3\u3068\u3001\u5404\u7a2esetter\u3068getter\u3092\u5b9a\u7fa9\u3057\u3066\u3044\u307e\u3059\u3002</p>"},{"location":"guides/skeleton/README.legacy/#view\u306e\u69cb\u6210","title":"View\u306e\u69cb\u6210","text":"<p>View\u306fFlask\u306ePluggable Views\u306e\u3088\u3046\u306b\u3001\u30b5\u30fc\u30d3\u30b9\u4e0a\u306e\u30d1\u30b9\u3068\u51e6\u7406\u306e\u95a2\u4fc2\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002\u5b9a\u7fa9\u306fRoutes\u3068Views\u306e2\u7a2e\u985e\u306e\u8981\u7d20\u304b\u3089\u69cb\u6210\u3055\u308c\u307e\u3059\u3002</p> <ul> <li>Routes ... View\u51e6\u7406\u3092\u3069\u306e\u30d1\u30b9\u306b\u30de\u30c3\u30d4\u30f3\u30b0\u3057\u3001\u3069\u306e\u3088\u3046\u306a\u5f62\u5f0f\u3067\u51fa\u529b\u3059\u308b\u304b\u3002\u51fa\u529b\u306b\u306fJSON\u5f62\u5f0f\u3084\u3001HTML\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u6307\u5b9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u308b</li> <li>Views ... View\u51e6\u7406\u306e\u5185\u5bb9</li> </ul> <p>Routes\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u30d1\u30b9\u3068Method(GET, POST, PUT, DELETE, ...)\u3068\u3001\u305d\u306e\u7d44\u307f\u5408\u308f\u305b\u306b\u5bfe\u3057\u3066\u3069\u306e\u95a2\u6570\u3092\u5b9f\u884c\u3059\u308b\u304b\u3001\u305d\u306e\u5b9f\u884c\u7d50\u679c\u3092\u3069\u306e\u3088\u3046\u306b\u51fa\u529b\u3059\u308b\u304b\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <p>\u5404View\u51e6\u7406\u306b\u306f\u3001\u305d\u306e\u51e6\u7406\u306e\u5b9f\u884c\u306b\u304a\u3051\u308b\u524d\u63d0\u3092Python\u306e\u30c7\u30b3\u30ec\u30fc\u30bf\u306e\u5f62\u3067\u8a18\u8ff0\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u6307\u5b9a\u53ef\u80fd\u306a\u30c7\u30b3\u30ec\u30fc\u30bf\u306b\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u3082\u306e\u304c\u3042\u308a\u307e\u3059\u3002</p> <ul> <li><code>framework.auth.decorators.must_be_logged_in</code> ... \u30e6\u30fc\u30b6\u304c\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u3044\u308b\u72b6\u614b\u3067\u3042\u308b\u5834\u5408\u306b\u306e\u307f\u547c\u3073\u51fa\u3057\u53ef\u80fd\u3067\u3042\u308b\u3053\u3068\u3092\u5ba3\u8a00\u3059\u308b\u3002\u5f15\u6570\u306b\u306fauth\u30d1\u30e9\u30e1\u30fc\u30bf\u304c\u8ffd\u52a0\u3055\u308c\u3001\u8a8d\u8a3c\u3057\u3066\u3044\u308b\u30e6\u30fc\u30b6\u306b\u95a2\u3059\u308b\u60c5\u5831\u3092\u5f97\u308b\u3053\u3068\u304c\u3067\u304d\u308b</li> <li><code>website.project.decorators.must_have_addon</code> ... \u30a2\u30c9\u30aa\u30f3\u306b\u95a2\u3059\u308b\u60c5\u5831\u3092\u5fc5\u8981\u3068\u3059\u308b\u3053\u3068\u3092\u5ba3\u8a00\u3059\u308b\u3002\u7b2c1\u5f15\u6570\u306b\u306f\u30a2\u30c9\u30aa\u30f3\u540d\u3092(\u4f8b\u3067\u306f <code>myskelton</code>)\u3001\u7b2c2\u5f15\u6570\u306b\u306f'user'\u304b'node'\u306e\u3044\u305a\u308c\u304b\u3092\u5b9a\u7fa9\u3059\u308b\u3002('node'\u306b\u3057\u305f\u5834\u5408\u306f\u3001\u30d1\u30b9\u306f /project// \u304b\u3089\u59cb\u3081\u308b\u5fc5\u8981\u304c\u3042\u308b) <li><code>website.project.decorators.must_have_permission</code> ... \u5fc5\u8981\u306a\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u5ba3\u8a00\u3059\u308b\u3002\u5f15\u6570\u306b\u306f'write', 'read', 'admin'\u306e\u3044\u305a\u308c\u304b\u3092\u6307\u5b9a\u3059\u308b\u3002</li> <p>\u30b9\u30b1\u30eb\u30c8\u30f3\u306e\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306bRoutes\u3068Views\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>api_routes</li> <li>myskelton_get_config, myskelton_set_config</li> </ul> <p>\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u5fdc\u3058\u3066\u30c7\u30b3\u30ec\u30fc\u30bf\u3092\u5ba3\u8a00\u3057\u3066\u304a\u304f\u3053\u3068\u3067\u3001View\u306e\u51e6\u7406\u306e\u4e2d\u3067Model(\u5229\u7528\u8005\u304c\u64cd\u4f5c\u5bfe\u8c61\u3068\u3057\u3066\u3044\u308bUser\u3084Node)\u3092\u53c2\u7167\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p>"},{"location":"guides/skeleton/README.legacy/#\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u308bview","title":"\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u308bView","text":"<p>Routes, Views\u3092\u4f7f\u3046\u3053\u3068\u3067\u3055\u307e\u3056\u307e\u306aAPI\u3084\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u3092\u5b9a\u7fa9\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u304c\u3001\u30a2\u30c9\u30aa\u30f3\u304c\u6301\u3064\u5229\u7528\u8005\u7528\u8a2d\u5b9a\u753b\u9762(\u8a8d\u8a3c\u60c5\u5831\u306e\u5165\u529b\u753b\u9762)\u3068\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u7528\u8a2d\u5b9a\u753b\u9762(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u30a2\u30c9\u30aa\u30f3\u3092\u6709\u52b9\u5316\u3057\u305f\u5834\u5408\u306e\u8a2d\u5b9a\u753b\u9762)\u306f\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306b\u3088\u3063\u3066\u3042\u3089\u304b\u3058\u3081\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u5316\u3055\u308c\u3066\u3044\u307e\u3059\u3002</p> <ul> <li>node_settings.mako</li> </ul> <p>\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u8a00\u8a9e mako \u3067\u8a18\u8ff0\u3055\u308c\u307e\u3059\u3002</p> <p>\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u52d5\u7684\u306b\u64cd\u4f5c\u3059\u308b\u305f\u3081\u306eJavaScript\u306e\u30e9\u30a4\u30d6\u30e9\u30ea\u306b\u306fKnockout.js\u3092\u5229\u7528\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002JavaScript\u30b3\u30fc\u30c9\u306b\u3064\u3044\u3066\u306f\u3001\u30a2\u30c9\u30aa\u30f3\u306estatic\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u3066\u5b9a\u7fa9\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <ul> <li>node-cfg.js</li> </ul> <p>\u307e\u305f\u3001static\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u306f\u30a2\u30c9\u30aa\u30f3\u306e\u30a2\u30a4\u30b3\u30f3\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002</p> <ul> <li>comicon.png</li> </ul>"},{"location":"guides/skeleton/README.legacy/#\u8a2d\u5b9a\u30e2\u30b8\u30e5\u30fc\u30eb","title":"\u8a2d\u5b9a\u30e2\u30b8\u30e5\u30fc\u30eb","text":"<p>\u30a2\u30c9\u30aa\u30f3\u306e\u52d5\u4f5c\u3092\u74b0\u5883\u306b\u3088\u308a\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u53ef\u80fd\u306b\u3059\u308b\u305f\u3081\u3001settings\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u7528\u610f\u3057\u307e\u3059\u3002</p> <ul> <li>settings</li> </ul> <p>RDM\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u8a2d\u5b9a\u3068\u540c\u69d8\u306b\u3001settings\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5185\u306b <code>local.py</code> \u30d5\u30a1\u30a4\u30eb\u3092\u5b9a\u7fa9\u3059\u308b\u3053\u3068\u3067\u3001\u30a2\u30c9\u30aa\u30f3\u306e\u52d5\u4f5c\u3092\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002 \u8a2d\u5b9a\u5024\u306f <code>defaults.py</code> \u3067\u5b9a\u7fa9\u3057\u307e\u3059\u3002\u30b9\u30b1\u30eb\u30c8\u30f3\u306e\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>defaults.py</li> </ul>"},{"location":"guides/skeleton/README.legacy/#\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9","title":"\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9","text":"<p>\u30a2\u30c9\u30aa\u30f3\u306e\u30e6\u30cb\u30c3\u30c8\u30c6\u30b9\u30c8\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002\u30b9\u30b1\u30eb\u30c8\u30f3\u306e\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306bModel\u306e\u30c6\u30b9\u30c8(<code>test_model.py</code>)\u3068View\u306e\u30c6\u30b9\u30c8(<code>test_view.py</code>)\u3092\u5b9a\u7fa9\u3057\u3066\u3044\u307e\u3059\u3002</p> <ul> <li>tests</li> </ul>"},{"location":"guides/skeleton/README.legacy/#migrations\u5b9a\u7fa9","title":"Migrations\u5b9a\u7fa9","text":"<p>Migrations\u30d5\u30a1\u30a4\u30eb\u306f\u3001Model\u306e\u5185\u5bb9\u3092RDB\u306e\u30c6\u30fc\u30d6\u30eb\u306b\u5bfe\u5fdc\u3065\u3051\u3092\u3059\u308b\u305f\u3081\u306b\u4f7f\u7528\u3057\u307e\u3059\u3002Model\u306e\u5185\u5bb9\u306f\u30d0\u30fc\u30b8\u30e7\u30f3\u306b\u3088\u3063\u3066\u5909\u5316\u3057\u307e\u3059\u304b\u3089\u3001\u5404\u30d0\u30fc\u30b8\u30e7\u30f3\u3054\u3068\u306b\u9069\u5207\u306b\u30c6\u30fc\u30d6\u30eb\u306e\u5909\u66f4\u304c\u306a\u3055\u308c\u308b\u3088\u3046\u3001Migrations\u30d5\u30a1\u30a4\u30eb\u3092\u9069\u5207\u306b\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 \u30b9\u30b1\u30eb\u30c8\u30f3\u306e\u5834\u5408\u3001\u7a7a\u306e <code>__init__.py</code> \u3092\u5b9a\u7fa9\u3057\u3066\u3044\u307e\u3059\u3002</p> <ul> <li>migrations</li> </ul> <p>Migrations\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210\u306b\u3066\u4f5c\u6210\u65b9\u6cd5\u3092\u8aac\u660e\u3057\u307e\u3059\u3002</p>"},{"location":"guides/skeleton/README.legacy/#\u30b9\u30b1\u30eb\u30c8\u30f3-\u30a2\u30c9\u30aa\u30f3\u306e\u5b9f\u88c5","title":"\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306e\u5b9f\u88c5","text":"<p>\u3053\u3053\u3067\u306f\u3001 <code>myskelton</code> \u3068\u3044\u3046\u8b58\u5225\u540d\u306e\u30a2\u30c9\u30aa\u30f3\u306e\u5b9f\u88c5\u3092\u4f8b\u306b\u8aac\u660e\u3057\u307e\u3059\u3002</p>"},{"location":"guides/skeleton/README.legacy/#addonsmyskelton-\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9a\u7fa9","title":"addons.myskelton \u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9a\u7fa9","text":"<p>\u30b9\u30b1\u30eb\u30c8\u30f3\u30b3\u30fc\u30c9\u306e\u4f8b\u3092 <code>addons/myskelton</code> \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002\u30d5\u30a1\u30a4\u30eb\u306e\u69cb\u6210\u3067\u793a\u3057\u305f\u30c4\u30ea\u30fc\u69cb\u9020\u3068\u306a\u308b\u3088\u3046\u306b\u30b3\u30d4\u30fc\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p>\u3053\u306e\u30b9\u30b1\u30eb\u30c8\u30f3\u3067\u306f\u3001\u30a2\u30c9\u30aa\u30f3\u540d(\u8b58\u5225\u540d)\u3092<code>myskelton</code>\u3068\u3057\u3066\u3044\u307e\u3059\u3002 \u8b58\u5225\u540d\u306f\u30e2\u30b8\u30e5\u30fc\u30eb\u540d\u3068\u4e00\u81f4\u3055\u305b\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u306e\u3067\u3001<code>myskelton</code>\u4ee5\u5916\u306e\u540d\u524d\u306b\u3057\u305f\u3044\u5834\u5408\u306f\u3001<code>addons/(\u8b58\u5225\u540d)</code> \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u30b9\u30b1\u30eb\u30c8\u30f3\u30b3\u30fc\u30c9\u3092\u914d\u7f6e\u3059\u308b\u3088\u3046\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p>\u307e\u305f\u3001\u3053\u306e\u540d\u524d\u3092\u5909\u66f4\u3057\u305f\u3044\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u30b3\u30fc\u30c9\u3092\u5909\u66f4\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002</p> <ul> <li>SHORT_NAME(Python)</li> <li>SHORT_NAME(JavaScript)</li> <li>view\u95a2\u6570\u306e\u30d7\u30ec\u30d5\u30a3\u30c3\u30af\u30b9(myskelton_*) - \u53c2\u7167\u5143</li> </ul> <p>\u307e\u305f\u3001\u30a2\u30c9\u30aa\u30f3\u306e\u5b8c\u5168\u540d\u3092 <code>My Skelton</code> \u3068\u3057\u3066\u3044\u307e\u3059\u3002\u3053\u308c\u306f\u3001Web UI\u3067\u306e\u8868\u793a\u7b49\u306b\u4f7f\u308f\u308c\u307e\u3059\u3002\u3053\u306e\u540d\u524d\u3092\u5909\u66f4\u3057\u305f\u3044\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u30b3\u30fc\u30c9\u3092\u5909\u66f4\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002</p> <ul> <li>AddonAppConfig.full_name</li> </ul>"},{"location":"guides/skeleton/README.legacy/#rdm\u30b3\u30fc\u30c9\u306e\u5909\u66f4","title":"RDM\u30b3\u30fc\u30c9\u306e\u5909\u66f4","text":"<p>\u8ffd\u52a0\u3057\u305f\u30a2\u30c9\u30aa\u30f3\u3092RDM\u306b\u8a8d\u8b58\u3055\u305b\u308b\u305f\u3081\u306b\u3001RDM\u306e\u30b3\u30fc\u30c9\u3092\u3044\u304f\u3064\u304b\u5909\u66f4\u3057\u307e\u3059\u3002</p>"},{"location":"guides/skeleton/README.legacy/#addonsjson-\u306e\u5909\u66f4","title":"addons.json \u306e\u5909\u66f4","text":"<p>addons.json \u306b\u3001\u30a2\u30c9\u30aa\u30f3\u306b\u95a2\u3059\u308b\u60c5\u5831\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306fJSON\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u3067\u3042\u308a\u3001\u30ad\u30fc\u3054\u3068\u306b\u4ee5\u4e0b\u306e\u5024\u3092\u767b\u9332\u3057\u307e\u3059\u3002</p> <p>\u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb addons.json \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <ul> <li><code>addons</code> ... \u5229\u7528\u53ef\u80fd\u306a\u30a2\u30c9\u30aa\u30f3\u4e00\u89a7\u3002\u5fc5\u305a\u767b\u9332\u3059\u308b</li> <li><code>addons_default</code> ... \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u4f5c\u6210\u6642\u306b\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u6709\u52b9\u306b\u306a\u308b\u30a2\u30c9\u30aa\u30f3\u4e00\u89a7</li> <li><code>addons_archivable</code> ... \u30a2\u30c9\u30aa\u30f3\u3054\u3068\u306e\u30a2\u30fc\u30ab\u30a4\u30d6\u306b\u95a2\u3059\u308b\u60c5\u5831</li> <li><code>addons_commentable</code> ... \u30b3\u30e1\u30f3\u30c8\u53ef\u80fd\u306a\u30a2\u30c9\u30aa\u30f3\u4e00\u89a7</li> <li><code>addons_description</code> ... \u30a2\u30c9\u30aa\u30f3\u540d\u3068\u8aac\u660e\u306e\u5b9a\u7fa9</li> </ul> <pre><code>\"myskelton\": \"My Skelton Addon is ...\"\n</code></pre> <ul> <li><code>addons_url</code> ... \u30a2\u30c9\u30aa\u30f3\u306e\u95a2\u9023URL\u306e\u5b9a\u7fa9</li> </ul> <pre><code>\"myskelton\": \"https://dummy.nii.ac.jp/myskelton\"\n</code></pre>"},{"location":"guides/skeleton/README.legacy/#frameworkaddonsdataaddonsjson-\u306e\u5909\u66f4","title":"framework/addons/data/addons.json \u306e\u5909\u66f4","text":"<p>framework/addons/data/addons.json \u306b\u3001\u30a2\u30c9\u30aa\u30f3\u767b\u9332\u6642\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u30ea\u30bd\u30fc\u30b9\u3092\u767b\u9332\u3057\u307e\u3059\u3002 <code>addons</code> \u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306b\u3001\u30a2\u30c9\u30aa\u30f3\u306e\u5b8c\u5168\u540d(<code>AddonAppConfig.full_name</code> \u306b\u76f8\u5f53)\u3092\u30ad\u30fc\u3068\u3057\u3066\u60c5\u5831\u3092\u767b\u9332\u3057\u307e\u3059\u3002</p> <p>\u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb addons.json \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p>\u3053\u306e\u5b9a\u7fa9\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9\u306f\u753b\u9762\u8868\u793a\u306e\u305f\u3081\u3060\u3051\u306b\u5229\u7528\u3055\u308c\u3001\u52d5\u4f5c\u306b\u306f\u5f71\u97ff\u3057\u307e\u305b\u3093\u3002</p> <pre><code>\"My Skelton\": {\n \"Permissions\": {\n \"status\": \"none\",\n \"text\": \"The GakuNin RDM does not affect the permissions of My Skelton.\"\n },\n \"View / download file versions\": {\n \"status\": \"none\",\n \"text\": \"The My Skelton add-on does not provide Storage Features.\"\n },\n \"Add / update files\": {\n \"status\": \"none\",\n \"text\": \"The My Skelton add-on does not provide Storage Features.\"\n },\n \"Delete files\": {\n \"status\": \"none\",\n \"text\": \"The My Skelton add-on does not provide Storage Features.\"\n },\n \"Logs\": {\n \"status\": \"none\",\n \"text\": \"The My Skelton add-on does not provide Storage Features.\"\n },\n \"Forking\": {\n \"status\": \"partial\",\n \"text\": \"Forking a project or component copies information about linked My Skelton but the GakuNin RDM does not affect authentication of My Skelton.\"\n },\n \"Registering\": {\n \"status\": \"none\",\n \"text\": \"My Skelton information will not be registered.\"\n }\n}\n</code></pre> <p>\u3053\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u56fd\u969b\u5316\u306b\u3064\u3044\u3066\u306f \u56fd\u969b\u5316\u30e1\u30c3\u30bb\u30fc\u30b8\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/skeleton/README.legacy/#dockerfile-\u306e\u5909\u66f4","title":"Dockerfile \u306e\u5909\u66f4","text":"<p>Dockerfile \u306b\u3001\u30a2\u30c9\u30aa\u30f3\u95a2\u9023\u306e\u30d5\u30a1\u30a4\u30eb\u30b3\u30d4\u30fc\u5b9a\u7fa9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <p>\u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb Dockerfile \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <ul> <li> <p>requirements.txt\u306e\u30b3\u30d4\u30fc <pre><code>COPY ./addons/myskelton/requirements.txt ./addons/myskelton/\n</code></pre></p> </li> <li> <p>static\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u5909\u66f4 <pre><code>COPY ./addons/myskelton/static/ ./addons/myskelton/static/\n</code></pre></p> </li> </ul>"},{"location":"guides/skeleton/README.legacy/#apibasesettingsdefaultspy-\u3078\u306e\u8ffd\u52a0","title":"api/base/settings/defaults.py \u3078\u306e\u8ffd\u52a0","text":"<p>api/base/settings/defaults.py \u306e <code>INSTALLED_APPS</code> \u306b\u30a2\u30c9\u30aa\u30f3\u540d\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <p>\u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb defaults.py \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <pre><code>'addons.myskelton',\n</code></pre>"},{"location":"guides/skeleton/README.legacy/#migrations\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210","title":"Migrations\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210","text":"<p>Model\u3067\u5b9a\u7fa9\u3057\u305f\u30d7\u30ed\u30d1\u30c6\u30a3\u304cRDB\u306b\u4fdd\u5b58\u3055\u308c\u308b\u3088\u3046\u3001<code>makemigrations</code>\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u307e\u3059\u3002\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3068\u3001 <code>addons/myskelton/migrations</code> \u306bPython\u30d5\u30a1\u30a4\u30eb\u304c\u4f5c\u6210\u3055\u308c\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web python3 manage.py makemigrations\n</code></pre> <p>\u4e0a\u8a18\u306e\u51fa\u529b\u4e2d\u306b\u4ee5\u4e0b\u306e\u51fa\u529b\u304c\u73fe\u308c\u308c\u3070\u6210\u529f\u3067\u3059\u3002\u73fe\u308c\u306a\u3044\u5834\u5408\u3001RDM\u304c\u30a2\u30c9\u30aa\u30f3\u3092\u8a8d\u8b58\u3057\u3066\u3044\u306a\u3044\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\u7279\u306b<code>addons.json</code>, <code>api/base/settings/defaults.py</code>\u306e\u8a2d\u5b9a\u304c\u6f0f\u308c\u3066\u3044\u306a\u3044\u304b\u3069\u3046\u304b\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <pre><code>Migrations for 'addons_myskelton':\n addons/myskelton/migrations/0001_initial.py\n - Create model NodeSettings\n</code></pre>"},{"location":"guides/skeleton/README.legacy/#\u56fd\u969b\u5316\u30e1\u30c3\u30bb\u30fc\u30b8\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210","title":"\u56fd\u969b\u5316\u30e1\u30c3\u30bb\u30fc\u30b8\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210","text":"<p>\u56fd\u969b\u5316\u30e1\u30c3\u30bb\u30fc\u30b8\u30d5\u30a1\u30a4\u30eb\u306e\u5b9a\u7fa9\u30d5\u30a1\u30a4\u30eb\u306f\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3067\u751f\u6210\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p>\u3053\u306e\u30bb\u30af\u30b7\u30e7\u30f3\u306e\u5b9f\u65bd\u6642\u306f\u5404\u30b5\u30fc\u30d3\u30b9\u3092\u505c\u6b62\u72b6\u614b\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <pre><code># framework/addons/data/addons.json\u306b\u5b9a\u7fa9\u3055\u308c\u305f\u30e1\u30c3\u30bb\u30fc\u30b8\u3092JavaScript\u30d5\u30a1\u30a4\u30eb\u3078\u3068\u5909\u63db\u3059\u308b\n$ docker compose run --rm web python3 -m scripts.generate_addons_translations\n\n# \u30e1\u30c3\u30bb\u30fc\u30b8\u5b9a\u7fa9\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb website/translations/js_messages.pot \u3092\u66f4\u65b0\u3059\u308b\n$ docker compose run --rm web pybabel extract -F ./website/settings/babel_js.cfg -o ./website/translations/js_messages.pot .\n\n# \u30e1\u30c3\u30bb\u30fc\u30b8\u5b9a\u7fa9\u30d5\u30a1\u30a4\u30eb website/translations/ja/LC_MESSAGES/js_messages.po \u3092\u66f4\u65b0\u3059\u308b\n$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/en/LC_MESSAGES/js_messages.po -l en\n$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/ja/LC_MESSAGES/js_messages.po -l ja\n</code></pre> <p>\u4e0a\u8a18\u3092\u5b9f\u884c\u3059\u308b\u3068\u3001<code>website/translations/ja/LC_MESSAGES/js_messages.po</code>\u306b\u3042\u308b\u82f1\u8a9e\u30e1\u30c3\u30bb\u30fc\u30b8\u3068\u65e5\u672c\u8a9e\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u5bfe\u5fdc\u3065\u3051\u304c\u66f4\u65b0\u3055\u308c\u307e\u3059\u3002 \u5909\u66f4\u4f8b\u306e\u30b5\u30f3\u30d7\u30eb js_messages.po \u3092\u53c2\u8003\u306b\u65e5\u672c\u8a9e\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u8ffd\u52a0\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <pre><code>#: scripts/translations/messages_addonsJson.js:45\nmsgid \"\"\n\"\\n\"\n\"\\n\"\n\"<h3>My Skelton Add-on Terms</h3>\\n\"\n\"\\n\"\n...\nmsgstr \"\"\n\"\\n\"\n\"\\n\"\n\"<h3>My Skelton \u30a2\u30c9\u30aa\u30f3\u898f\u7d04</h3>\\n\"\n\"\\n\"\n\"<table class=\\\"table table-bordered table-addon-terms\\\">\\n\"\n...\n</code></pre> <p>\u3053\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u8ffd\u52a0\u5f8c\u3001<code>assets</code>\u30b5\u30fc\u30d3\u30b9\u306e\u518d\u8d77\u52d5\u6642\u306b\u30e1\u30c3\u30bb\u30fc\u30b8\u5b9a\u7fa9\u304c\u53cd\u6620\u3055\u308c\u307e\u3059\u3002</p>"},{"location":"guides/skeleton/README.legacy/#\u30b9\u30b1\u30eb\u30c8\u30f3\u306e\u30c6\u30b9\u30c8","title":"\u30b9\u30b1\u30eb\u30c8\u30f3\u306e\u30c6\u30b9\u30c8","text":"<p>\u3053\u308c\u3067\u30a2\u30c9\u30aa\u30f3\u306e\u30b3\u30fc\u30c9\u306e\u4f5c\u6210\u306f\u5b8c\u4e86\u3067\u3059\u3002\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3067\u8ffd\u52a0\u3057\u305f <code>addons/myskelton</code> \u306e\u30e6\u30cb\u30c3\u30c8\u30c6\u30b9\u30c8\u3092\u5b9f\u884c\u3057\u3066\u307f\u307e\u3057\u3087\u3046\u3002</p> <pre><code>$ docker compose run --rm web invoke test_module -m addons/myskelton/tests/\n</code></pre>"},{"location":"guides/skeleton/README.legacy/#\u30b9\u30b1\u30eb\u30c8\u30f3-\u30a2\u30c9\u30aa\u30f3\u306e\u52d5\u4f5c\u78ba\u8a8d","title":"\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306e\u52d5\u4f5c\u78ba\u8a8d","text":"<p>\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u3092\u52d5\u4f5c\u78ba\u8a8d\u3092\u3057\u3066\u307f\u307e\u3057\u3087\u3046\u3002 \u30a2\u30c9\u30aa\u30f3\u306b\u306f\u65b0\u898f\u306b\u5b9a\u7fa9\u3055\u308c\u305fModel\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u306e\u3067\u3001Migrations\u5b9a\u7fa9\u3092\u30b5\u30fc\u30d3\u30b9\u4e2d\u306ePostgreSQL\u30b5\u30fc\u30d3\u30b9\u306b\u53cd\u6620\u3057\u307e\u3057\u3087\u3046\u3002</p> <pre><code>$ docker compose run --rm web python3 manage.py migrate\n</code></pre> <p>\u307e\u305f\u3001\u65b0\u898f\u306bJavaScript\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0\u3057\u305f\u306e\u3067\u3001\u65b0\u305f\u306a\u30d5\u30a1\u30a4\u30eb\u304c\u30ed\u30fc\u30c9\u5bfe\u8c61\u3068\u306a\u308b\u3088\u3046\u306b\u3001<code>RDM-osf.io</code>\u3092\u30a4\u30e1\u30fc\u30b8\u3068\u3057\u305f\u30b5\u30fc\u30d3\u30b9\u306e\u518d\u8d77\u52d5\u3092\u5b9f\u65bd\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose restart assets web api\n</code></pre> <p>\u3053\u308c\u3067\u30b5\u30fc\u30d3\u30b9\u3078\u306e\u53cd\u6620\u306f\u5b8c\u4e86\u3067\u3059\u3002\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u3092\u8a66\u3059\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u64cd\u4f5c\u3092\u5b9f\u65bd\u3057\u307e\u3059\u3002</p> <ol> <li>RDM Web UI\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b <code>http://localhost:5000</code></li> <li> <p>\u9069\u5f53\u306a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210\u3059\u308b </p> </li> <li> <p>Add-ons\u30da\u30fc\u30b8\u3092\u958b\u304f</p> </li> <li>My Skelton\u30a2\u30c9\u30aa\u30f3\u3092\u6709\u52b9\u5316\u3059\u308b </li> </ol> <p>\u3053\u308c\u3067\u3001<code>node_settings.mako</code>\u3067\u5b9a\u7fa9\u3057\u305fNode\u8a2d\u5b9a\u753b\u9762\u304c\u73fe\u308c\u307e\u3059\u3002\u30c6\u30ad\u30b9\u30c8\u30dc\u30c3\u30af\u30b9\u306b\u5165\u529b\u3057\u305f\u5024\u304c <code>param_1</code> \u30d7\u30ed\u30d1\u30c6\u30a3\u306b\u53cd\u6620\u3055\u308c\u308b\u69d8\u5b50\u304c\u78ba\u8a8d\u3067\u304d\u308b\u306f\u305a\u3067\u3059\u3002</p> <p></p> <p>\u4ee5\u4e0a\u3067\u30b9\u30b1\u30eb\u30c8\u30f3\u30a2\u30c9\u30aa\u30f3\u306e\u52d5\u4f5c\u78ba\u8a8d\u306f\u5b8c\u4e86\u3067\u3059\uff01</p>"},{"location":"guides/storage-addon/","title":"Storage Addon / \u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3","text":"<p>Summary: Guide to creating an RDM storage addon that connects to external storage services \u6982\u8981: \u5916\u90e8\u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d3\u30b9\u306b\u63a5\u7d9a\u3059\u308b RDM \u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u3092\u4f5c\u6210\u3059\u308b\u624b\u5f15\u304d</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05</li> <li>Normative for: <code>docs/guides/storage-addon/</code></li> <li>Related: SPEC-06 Documentation Conventions \u00b7 Skeleton Guide</li> </ul> <p></p>"},{"location":"guides/storage-addon/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"guides/storage-addon/#overview","title":"Overview","text":"<p>This guide shows how to create an RDM storage addon that connects to external storage services like AWS S3 or MinIO. Storage addons consist of two parts:</p> <ul> <li>Addon (runs on OSF.io): Manages user and project settings</li> <li>Provider (runs on WaterButler): Handles actual storage access</li> </ul> <p>The Addon receives authentication credentials and settings from users, while the Provider uses this information to communicate with the actual storage service.</p>"},{"location":"guides/storage-addon/#prerequisites","title":"Prerequisites","text":"<ul> <li>Basic understanding of Python and Django</li> <li>The development environment set up following the Environment Guide</li> <li>Completed the Skeleton Addon Guide</li> </ul>"},{"location":"guides/storage-addon/#quick-start","title":"Quick start","text":"<ol> <li>Create your addon using the skeleton as a base</li> <li>Implement the Provider class for your storage service</li> <li>Configure authentication and authorization between Addon and Provider</li> <li>Test file operations (upload, download, delete)</li> <li>Deploy and test with your storage service</li> </ol>"},{"location":"guides/storage-addon/#legacy-content","title":"Legacy content","text":"<p>The legacy storage addon instructions are kept verbatim in <code>README.legacy.md</code> for reference and will be rewritten per milestone.</p> <p></p>"},{"location":"guides/storage-addon/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"guides/storage-addon/#\u6982\u8981","title":"\u6982\u8981","text":"<p>\u3053\u306e\u30ac\u30a4\u30c9\u306f\u3001AWS S3 \u3084 MinIO \u306e\u3088\u3046\u306a\u5916\u90e8\u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d3\u30b9\u306b\u63a5\u7d9a\u3059\u308b RDM \u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u3092\u4f5c\u6210\u3059\u308b\u65b9\u6cd5\u3092\u793a\u3057\u307e\u3059\u3002\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u306f\u4ee5\u4e0b\u306e2\u3064\u306e\u90e8\u5206\u304b\u3089\u69cb\u6210\u3055\u308c\u307e\u3059:</p> <ul> <li>\u30a2\u30c9\u30aa\u30f3 (OSF.io \u4e0a\u3067\u5b9f\u884c): \u30e6\u30fc\u30b6\u30fc\u3068\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u8a2d\u5b9a\u3092\u7ba1\u7406</li> <li>\u30d7\u30ed\u30d0\u30a4\u30c0 (WaterButler \u4e0a\u3067\u5b9f\u884c): \u5b9f\u969b\u306e\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30af\u30bb\u30b9\u3092\u51e6\u7406</li> </ul> <p>\u30a2\u30c9\u30aa\u30f3\u304c\u30e6\u30fc\u30b6\u30fc\u304b\u3089\u8a8d\u8a3c\u60c5\u5831\u3068\u8a2d\u5b9a\u3092\u53d7\u3051\u53d6\u308a\u3001\u30d7\u30ed\u30d0\u30a4\u30c0\u304c\u305d\u306e\u60c5\u5831\u3092\u4f7f\u7528\u3057\u3066\u5b9f\u969b\u306e\u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d3\u30b9\u3068\u901a\u4fe1\u3057\u307e\u3059\u3002</p>"},{"location":"guides/storage-addon/#\u524d\u63d0\u6761\u4ef6","title":"\u524d\u63d0\u6761\u4ef6","text":"<ul> <li>Python \u3068 Django \u306e\u57fa\u672c\u7684\u306a\u7406\u89e3</li> <li>\u74b0\u5883\u30ac\u30a4\u30c9\u306b\u5f93\u3063\u3066\u958b\u767a\u74b0\u5883\u3092\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3057\u3066\u3044\u308b\u3053\u3068</li> <li>\u30b9\u30b1\u30eb\u30c8\u30f3\u30a2\u30c9ongaon \u30ac\u30a4\u30c9\u3092\u5b8c\u4e86\u3057\u3066\u3044\u308b\u3053\u3068</li> </ul>"},{"location":"guides/storage-addon/#\u30af\u30a4\u30c3\u30af\u30b9\u30bf\u30fc\u30c8","title":"\u30af\u30a4\u30c3\u30af\u30b9\u30bf\u30fc\u30c8","text":"<ol> <li>\u30b9\u30b1\u30eb\u30c8\u30f3\u3092\u30d9\u30fc\u30b9\u306b\u30a2\u30c9\u30aa\u30f3\u3092\u4f5c\u6210\u3059\u308b</li> <li>\u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d3\u30b9\u7528\u306e\u30d7\u30ed\u30d0\u30a4\u30c0\u30af\u30e9\u30b9\u3092\u5b9f\u88c5\u3059\u308b</li> <li>\u30a2\u30c9\u30aa\u30f3\u3068\u30d7\u30ed\u30d0\u30a4\u30c0\u9593\u306e\u8a8d\u8a3c\u3068\u8a8d\u53ef\u3092\u8a2d\u5b9a\u3059\u308b</li> <li>\u30d5\u30a1\u30a4\u30eb\u64cd\u4f5c\uff08\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3001\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3001\u524a\u9664\uff09\u3092\u30c6\u30b9\u30c8\u3059\u308b</li> <li>\u30c7\u30d7\u30ed\u30a4\u3057\u3066\u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d3\u30b9\u3067\u30c6\u30b9\u30c8\u3059\u308b</li> </ol>"},{"location":"guides/storage-addon/#\u904e\u53bb\u306e\u30b3\u30f3\u30c6\u30f3\u30c4","title":"\u904e\u53bb\u306e\u30b3\u30f3\u30c6\u30f3\u30c4","text":"<p>\u904e\u53bb\u306e\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u306e\u624b\u9806\u306f\u3001\u53c2\u8003\u306e\u305f\u3081\u306b <code>README.legacy.md</code> \u306b\u305d\u306e\u307e\u307e\u6b8b\u3057\u3066\u304a\u308a\u3001\u30de\u30a4\u30eb\u30b9\u30c8\u30fc\u30f3\u3054\u3068\u306b\u66f8\u304d\u76f4\u3059\u4e88\u5b9a\u3067\u3059\u3002</p>"},{"location":"guides/storage-addon/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Storage addon An addon that connects RDM to external storage services like AWS S3. AWS S3 \u306e\u3088\u3046\u306a\u5916\u90e8\u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d3\u30b9\u306b RDM \u3092\u63a5\u7d9a\u3059\u308b\u30a2\u30c9\u30aa\u30f3\u3002 Provider A component that actually communicates with the storage service. \u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d3\u30b9\u3068\u5b9f\u969b\u306b\u901a\u4fe1\u3059\u308b\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u3002 Authentication The process of verifying who you are (like a username and password). \u3042\u306a\u305f\u304c\u8ab0\u3067\u3042\u308b\u304b\u3092\u78ba\u8a8d\u3059\u308b\u30d7\u30ed\u30bb\u30b9\uff08\u30e6\u30fc\u30b6\u30fc\u540d\u3068\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u3088\u3046\u306a\u3082\u306e\uff09\u3002 Authorization The process of checking what you are allowed to do after logging in. \u30ed\u30b0\u30a4\u30f3\u3057\u305f\u5f8c\u3001\u3042\u306a\u305f\u304c\u4f55\u3092\u3067\u304d\u308b\u304b\u3092\u78ba\u8a8d\u3059\u308b\u30d7\u30ed\u30bb\u30b9\u3002"},{"location":"guides/storage-addon/README.legacy/","title":"\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u306e\u4f5c\u6210","text":"<p>\u5177\u4f53\u7684\u306a\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u306e\u4f8b\u3068\u3057\u3066\u3001AWS S3\u4e92\u63db\u306eMinIO\u3068\u63a5\u7d9a\u3059\u308b\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u3092\u5b9f\u88c5\u3057\u307e\u3059\u3002\u3053\u306e\u30a2\u30c9\u30aa\u30f3\u306f\u7279\u5b9a\u306eMinIO\u30b5\u30fc\u30d0\u30fc\u3068\u63a5\u7d9a\u3059\u308b\u3082\u306e\u3068\u3057\u3001 My MinIO\u30a2\u30c9\u30aa\u30f3\u3068\u540d\u4ed8\u3051\u308b\u3053\u3068\u3068\u3057\u307e\u3059\u3002</p> <p>\u57fa\u672c\u7684\u306a\u30a2\u30c9\u30aa\u30f3\u306e\u6982\u8981\u306f\u30b9\u30b1\u30eb\u30c8\u30f3\u306e\u4f5c\u6210\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#\u524d\u63d0\u6761\u4ef6","title":"\u524d\u63d0\u6761\u4ef6","text":"<p>\u958b\u767a\u74b0\u5883\u306e\u6e96\u5099\u306e\u30ac\u30a4\u30c9\u306b\u5f93\u3044\u3001\u958b\u767a\u74b0\u5883\u306b\u3066RDM\u3092\u8d77\u52d5\u3057\u3066\u3044\u308b\u3082\u306e\u3068\u3057\u307e\u3059\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u306e\u8a2d\u8a08","title":"\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u306e\u8a2d\u8a08","text":""},{"location":"guides/storage-addon/README.legacy/#\u30b5\u30fc\u30d3\u30b9\u306e\u69cb\u6210","title":"\u30b5\u30fc\u30d3\u30b9\u306e\u69cb\u6210","text":"<p>\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u306f\u4ee5\u4e0b\u306e2\u3064\u306e\u8981\u7d20\u304b\u3089\u69cb\u6210\u3055\u308c\u307e\u3059\u3002</p> <ul> <li>OSF.io\u30b5\u30fc\u30d3\u30b9\u3067\u52d5\u4f5c\u3059\u308bAddon: \u30e6\u30fc\u30b6\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u8a2d\u5b9a\u306e\u7ba1\u7406</li> <li>WaterButler\u30b5\u30fc\u30d3\u30b9\u3067\u52d5\u4f5c\u3059\u308bProvider: \u30b9\u30c8\u30ec\u30fc\u30b8\u3078\u306e\u30a2\u30af\u30bb\u30b9\u306e\u4ef2\u4ecb</li> </ul> <p>Addon\u306b\u3088\u308a\u30e6\u30fc\u30b6\u304b\u3089\u306e\u8a8d\u8a3c\u60c5\u5831\u306e\u53d7\u9818\u3084\u5404\u7a2e\u8a2d\u5b9a\u3092\u884c\u3044\u3001Provider\u306f\u3053\u306e\u8a8d\u8a3c\u60c5\u5831\u30fb\u8a2d\u5b9a\u60c5\u5831\u3092Addon\u304b\u3089\u8b72\u6e21\u3057\u3066\u3082\u3089\u3044\u3001\u5b9f\u969b\u306e\u30b9\u30c8\u30ec\u30fc\u30b8\u3078\u306e\u30a2\u30af\u30bb\u30b9\u3092\u884c\u3044\u307e\u3059\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#\u30d5\u30a1\u30a4\u30eb\u306e\u69cb\u6210","title":"\u30d5\u30a1\u30a4\u30eb\u306e\u69cb\u6210","text":"<p>\u5178\u578b\u7684\u306a\u30af\u30e9\u30b9\u69cb\u6210\u3068\u30d5\u30a1\u30a4\u30eb\u914d\u7f6e\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#osfio-addon\u306e\u30af\u30e9\u30b9\u69cb\u6210\u3068\u30d5\u30a1\u30a4\u30eb\u69cb\u6210","title":"OSF.io Addon\u306e\u30af\u30e9\u30b9\u69cb\u6210\u3068\u30d5\u30a1\u30a4\u30eb\u69cb\u6210","text":"<p><code>(*)</code>\u304c\u4ed8\u3044\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u306f\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306b\u306f\u5b58\u5728\u3057\u306a\u3044\u30d5\u30a1\u30a4\u30eb\u3067\u3059\u3002</p> <pre><code>/addons/\u30a2\u30c9\u30aa\u30f3\u540d/\n\u251c\u2500\u2500 __init__.py ... \u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 apps.py ... \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 models.py ... \u30e2\u30c7\u30eb\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 provider.py ... (*) \u8a8d\u8a3c\u30d7\u30ed\u30d0\u30a4\u30c0\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 requirements.txt ... \u5229\u7528\u3059\u308bPython\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 routes.py ... View(Routes)\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 serializer.py ... (*) \u30e2\u30c7\u30eb-\u30d3\u30e5\u30fc(JavaScript)\u9593\u306e\u60c5\u5831\u4ea4\u63db\u7528\u30b7\u30ea\u30a2\u30e9\u30a4\u30b6\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 settings ... \u8a2d\u5b9a\u3092\u5b9a\u7fa9\u3059\u308b\u30e2\u30b8\u30e5\u30fc\u30eb\n\u2502 \u251c\u2500\u2500 defaults.py ... \u30c7\u30d5\u30a9\u30eb\u30c8\u8a2d\u5b9a\u306e\u5b9a\u7fa9\n\u2502 \u251c\u2500\u2500 __init__.py ... \u8a2d\u5b9a\u306e\u5b9a\u7fa9\n\u2502\u00a0\u00a0 \u2514\u2500\u2500 local-dist.py ... (*) local.py\u306e\u30b5\u30f3\u30d7\u30eb\u30d5\u30a1\u30a4\u30eb\n\u251c\u2500\u2500 static ... Web\u30d6\u30e9\u30a6\u30b6\u304b\u3089\u8aad\u307f\u8fbc\u3080\u3053\u3068\u3092\u60f3\u5b9a\u3057\u305f\u9759\u7684\u30d5\u30a1\u30a4\u30eb\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 comicon.png ... \u30a2\u30c9\u30aa\u30f3\u306e\u30a2\u30a4\u30b3\u30f3\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 myminioAnonymousLogActionList.json ... (*) \u5909\u66f4\u5c65\u6b74\u30e1\u30c3\u30bb\u30fc\u30b8\u5b9a\u7fa9\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 myminioLogActionList.json ... (*) \u5909\u66f4\u5c65\u6b74\u30e1\u30c3\u30bb\u30fc\u30b8\u5b9a\u7fa9\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 myminioNodeConfig.js ... (*) Node\u8a2d\u5b9a\u306e\u5b9a\u7fa9\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 myminioUserConfig.js ... (*) User\u8a2d\u5b9a\u306e\u5b9a\u7fa9\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 node-cfg.js ... Node\u8a2d\u5b9a\u306e\u30a8\u30f3\u30c8\u30ea\u3068\u306a\u308bJavaScript\u30d5\u30a1\u30a4\u30eb\n\u2502\u00a0\u00a0 \u2514\u2500\u2500 user-cfg.js ... (*) User\u8a2d\u5b9a\u306e\u30a8\u30f3\u30c8\u30ea\u3068\u306a\u308bJavaScript\u30d5\u30a1\u30a4\u30eb\n\u251c\u2500\u2500 templates ... \u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 credentials_modal.mako ... (*) \u8a8d\u8a3c\u60c5\u5831\u306e\u8a2d\u5b9a\u7528\u30c0\u30a4\u30a2\u30ed\u30b0\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 node_settings.mako ... Node\u8a2d\u5b9a\u30d1\u30cd\u30eb\n\u2502\u00a0\u00a0 \u2514\u2500\u2500 user_settings.mako ... (*) User\u8a2d\u5b9a\u30d1\u30cd\u30eb\n\u251c\u2500\u2500 tests ... \u30c6\u30b9\u30c8\u30b3\u30fc\u30c9\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 __init__.py\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 conftest.py\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 factories.py\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 test_model.py\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 test_serializer.py ... (*)\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 test_view.py\n\u2502\u00a0\u00a0 \u2514\u2500\u2500 utils.py\n\u251c\u2500\u2500 utils.py ... (*) \u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u95a2\u6570\u306e\u5b9a\u7fa9\n\u2514\u2500\u2500 views.py ... View(Views)\u306e\u5b9a\u7fa9\n</code></pre>"},{"location":"guides/storage-addon/README.legacy/#waterbutler-provider\u306e\u30af\u30e9\u30b9\u69cb\u6210\u3068\u30d5\u30a1\u30a4\u30eb\u69cb\u6210","title":"WaterButler Provider\u306e\u30af\u30e9\u30b9\u69cb\u6210\u3068\u30d5\u30a1\u30a4\u30eb\u69cb\u6210","text":"<pre><code>waterbutler/providers/\u30a2\u30c9\u30aa\u30f3\u540d/\n\u251c\u2500\u2500 __init__.py ... Provider\u30af\u30e9\u30b9\u306e\u53c2\u7167\n\u251c\u2500\u2500 metadata.py ... Metadata\u306e\u5b9a\u7fa9\n\u251c\u2500\u2500 provider.py ... Provider\u306e\u5b9a\u7fa9\n\u2514\u2500\u2500 settings.py ... \u30c7\u30d5\u30a9\u30eb\u30c8\u8a2d\u5b9a\u306e\u5b9a\u7fa9\n\ntests/providers/\u30a2\u30c9\u30aa\u30f3\u540d/\n\u251c\u2500\u2500 __init__.py\n\u2514\u2500\u2500 provider.py ... Provider\u306e\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9\n</code></pre>"},{"location":"guides/storage-addon/README.legacy/#osfio-addon\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u69cb\u6210","title":"OSF.io Addon\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u69cb\u6210","text":"<p>\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u3068\u306e\u9055\u3044\u3092\u4e2d\u5fc3\u306b\u8aac\u660e\u3057\u3066\u3044\u304d\u307e\u3059\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#model\u306e\u69cb\u6210","title":"Model\u306e\u69cb\u6210","text":"<p><code>models.py</code> \u306b\u3001\u4ee5\u4e0b\u306eModel\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li><code>UserSettings</code>: \u30e6\u30fc\u30b6\u30fc\u306b\u95a2\u3059\u308b\u60c5\u5831(\u8a8d\u8a3c\u60c5\u5831\u7b49)</li> <li><code>NodeSettings</code>: \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u95a2\u3059\u308b\u60c5\u5831</li> <li><code>\u30a2\u30c9\u30aa\u30f3\u540dFileNode</code>: \u30d5\u30a1\u30a4\u30eb\u30fb\u30d5\u30a9\u30eb\u30c0\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u89aa\u5b9a\u7fa9</li> <li><code>\u30a2\u30c9\u30aa\u30f3\u540dFile</code>: \u30d5\u30a1\u30a4\u30eb\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u5b9a\u7fa9</li> <li><code>\u30a2\u30c9\u30aa\u30f3\u540dFolder</code>: \u30d5\u30a1\u30a4\u30eb\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u5b9a\u7fa9</li> </ul> <p><code>provider.py</code> \u306b <code>\u30a2\u30c9\u30aa\u30f3\u540dProvider</code> \u3092\u3001 <code>serializer.py</code> \u306b <code>\u30a2\u30c9\u30aa\u30f3\u540dSerializer</code> \u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002OAuth\u3092\u7528\u3044\u308b\u5834\u5408\u306f <code>osf.models.external.ExternalProvider</code> \u3092\u7d99\u627f\u3057\u3001\u5fc5\u8981\u306a\u30e1\u30f3\u30d0\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002\u5b9f\u88c5\u306f GitHub\u306e\u4f8b \u306a\u3069\u3092\u53c2\u8003\u306b\u3057\u3066\u304f\u3060\u3055\u3044(GitHub\u30a2\u30c9\u30aa\u30f3\u306f <code>\u30a2\u30c9\u30aa\u30f3\u540dProvider</code> \u3092 <code>models.py</code> \u306b\u5b9a\u7fa9\u3057\u3066\u3044\u307e\u3059)\u3002 <code>\u30a2\u30c9\u30aa\u30f3\u540dSerializer</code> \u306b\u306f\u30d3\u30e5\u30fc(JavaScript)\u306bURL\u30ea\u30b9\u30c8\u3084\u63a5\u7d9a\u5148\u30d5\u30a9\u30eb\u30c0\u306a\u3069\u3092\u6e21\u3059\u305f\u3081\u306e\u95a2\u6570\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <p>OAuth\u8a8d\u8a3c\u3092\u3057\u306a\u3044\u5834\u5408\u3067\u3042\u3063\u3066\u3082\u3001\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u306e <code>UserSettings</code> \u3068 <code>NodeSettings</code> \u306f\u3001 <code>BaseOAuthUserSettings</code> \u3068 <code>BaseOAuthNodeSettings</code> \u3092\u305d\u308c\u305e\u308c\u7d99\u627f\u3057\u3066\u5b9a\u7fa9\u3057\u3001 <code>oauth_provider</code> \u306b<code>\u30a2\u30c9\u30aa\u30f3\u540dProvider</code> \u3092\u6307\u5b9a\u3057\u307e\u3059\u3002\u3053\u3046\u3059\u308b\u3053\u3068\u3067\u3001\u7d71\u4e00\u7684\u306a\u69cb\u9020\u3067\u7c21\u5358\u306b\u8a8d\u8a3c\u306e\u4ed5\u7d44\u307f\u3092\u5b9f\u88c5\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p>My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>models.py</li> <li>provider.py</li> <li>serializer.py</li> </ul>"},{"location":"guides/storage-addon/README.legacy/#view\u306e\u69cb\u6210","title":"View\u306e\u69cb\u6210","text":"<p><code>views.py</code>\u306b\u306f\u3001\u304a\u304a\u3088\u305d\u4ee5\u4e0b\u306e\u95a2\u6570\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> \u95a2\u6570\u540d \u51e6\u7406 set_config \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u8a2d\u5b9a\u3092\u4fdd\u5b58\u3059\u308b\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306f\u63a5\u7d9a\u5148\u306e\u30d5\u30a9\u30eb\u30c0\u3068\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u7528\u306eAPI\u306eURL\u30ea\u30b9\u30c8\u306e\u307f\u3002 get_config \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u8a2d\u5b9a\u3092\u53d6\u5f97\u3059\u308b\u3002 import_auth \u30ed\u30b0\u30a4\u30f3\u4e2d\u306e\u30e6\u30fc\u30b6\u306e\u8a8d\u8a3c\u60c5\u5831\u3092\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u30a4\u30f3\u30dd\u30fc\u30c8\u3059\u308b\u3002 deauthorize_node \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u8a8d\u8a3c\u60c5\u5831\u3092\u53d6\u308a\u6d88\u3059\u3002 add_user_account \u30e6\u30fc\u30b6\u306e\u8a8d\u8a3c\u60c5\u5831\u3092\u8ffd\u52a0\u3059\u308b\u3002 account_list \u30e6\u30fc\u30b6\u306e\u8a8d\u8a3c\u60c5\u5831\u30ea\u30b9\u30c8\u3092\u53d6\u5f97\u3059\u308b\u3002 create_folder \u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d3\u30b9\u306b\u30d5\u30a9\u30eb\u30c0\u3092\u8ffd\u52a0\u3059\u308b\u3002\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30a2\u30c9\u30aa\u30f3\u8a2d\u5b9a\u30da\u30fc\u30b8\u3067\u30d5\u30a9\u30eb\u30c0\u3092\u4f5c\u308b\u6a5f\u80fd\u3092\u63d0\u4f9b\u3057\u306a\u3044\u5834\u5408\u306f\u4e0d\u8981\u3002 folder_list \u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d3\u30b9\u306e\u30d5\u30a9\u30eb\u30c0\u30ea\u30b9\u30c8\u3092\u53d6\u5f97\u3059\u308b\u3002 <p>\u30b7\u30ea\u30a2\u30e9\u30a4\u30b6(<code>serializer.py</code>)\u3092\u5b9a\u7fa9\u3057\u3001 <code>addons.base.generic_views</code> \u3092\u5229\u7528\u3059\u308b\u3053\u3068\u3067\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u4e00\u90e8\u306eView\u51e6\u7406\u3092\u7c21\u5358\u306b\u5b9a\u7fa9\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <pre><code>import_auth = addons.base.generic_views.import_auth(\n SHORT_NAME,\n Serializer\n)\n</code></pre> <p><code>generic_views</code> \u3067\u63d0\u4f9b\u3057\u3066\u3044\u306a\u3044View\u51e6\u7406\u3092\u8ffd\u52a0\u3057\u305f\u3044\u5834\u5408\u3084\u3001View\u51e6\u7406\u3092\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3057\u305f\u3044\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b <code>views.py</code> \u306b\u500b\u5225\u306e\u95a2\u6570\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <pre><code>@must_have_addon(SHORT_NAME, 'node')\n@must_be_addon_authorizer(SHORT_NAME)\ndef folder_list(node_addon, **kwargs):\n return node_addon.get_folders()\n</code></pre> <p>\u30d5\u30a9\u30eb\u30c0\u306e\u4f5c\u6210\u3084\u30d5\u30a9\u30eb\u30c0\u30ea\u30b9\u30c8\u306e\u53d6\u5f97\u3092\u3059\u308b\u305f\u3081\u306b\u3001Addon\u3067\u3082\u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d3\u30b9\u3078\u63a5\u7d9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002</p> <p>My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>routes.py</li> <li>views.py</li> </ul>"},{"location":"guides/storage-addon/README.legacy/#\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u308bview","title":"\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u308bView","text":"<p>\u30a2\u30c9\u30aa\u30f3\u304c\u6301\u3064\u5229\u7528\u8005\u7528\u8a2d\u5b9a\u753b\u9762(<code>user_settings.mako</code>)\u3068\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u7528\u8a2d\u5b9a\u753b\u9762(<code>node_settings.mako</code>)\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u305d\u308c\u305e\u308c\u5b9a\u7fa9\u3057\u307e\u3059\u3002\u8a8d\u8a3c\u60c5\u5831\u306e\u8a2d\u5b9a\u7528\u30c0\u30a4\u30a2\u30ed\u30b0(<code>credentials_modal.mako</code>)\u306f\u3069\u3061\u3089\u306e\u753b\u9762\u3067\u3082\u5229\u7528\u3059\u308b\u306e\u3067\u3001\u5225\u306e\u30d5\u30a1\u30a4\u30eb\u3067\u5b9a\u7fa9\u3057\u3001\u305d\u308c\u305e\u308c\u304b\u3089\u53c2\u7167\u3057\u307e\u3059\u3002 My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>user_settings.mako</li> <li>node_settings.mako</li> <li>credentials_modal.mako</li> </ul> <p>\u5229\u7528\u8005\u7528\u8a2d\u5b9a\u753b\u9762\u306eJavaScript\u30d5\u30a1\u30a4\u30eb(<code>user-cfg.js</code>, <code>myminioUserConfig.js</code>)\u3068\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u7528\u8a2d\u5b9a\u753b\u9762\u306eJavaScript\u30d5\u30a1\u30a4\u30eb(<code>node-cfg.js</code>, <code>myminioNodeConfig.js</code>)\u3092\u305d\u308c\u305e\u308c\u5b9a\u7fa9\u3057\u307e\u3059\u3002\u4eca\u56de\u306f\u3001\u30a8\u30f3\u30c8\u30ea\u3068\u306a\u308bJavaScript\u30d5\u30a1\u30a4\u30eb(<code>*-cfg.js</code>)\u3068\u5b9a\u7fa9\u30d5\u30a1\u30a4\u30eb(<code>myminio*Config.js</code>)\u3092\u5206\u3051\u307e\u3057\u305f\u304c\u3001\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u306e\u3088\u3046\u306b <code>*-cfg.js</code> \u306b\u5b9a\u7fa9\u3092\u66f8\u3044\u3066\u3082\u69cb\u3044\u307e\u305b\u3093\u3002 My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>user-cfg.js</li> <li>node-cfg.js</li> <li>myminioUserConfig.js</li> <li>myminioNodeConfig.js</li> </ul> <p>\u307e\u305f\u3001\u5909\u66f4\u5c65\u6b74\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u5b9a\u7fa9\u30d5\u30a1\u30a4\u30eb\u3082\u8ffd\u52a0\u3057\u307e\u3059\u3002 My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>myminioAnonymousLogActionList.json</li> <li>myminioLogActionList.json</li> </ul> <p>\u30b9\u30c8\u30ec\u30fc\u30b8\u64cd\u4f5cUI\u3067\u3042\u308bFileViewer\u306fFangorn\u3092\u4f7f\u3063\u3066\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u30a2\u30a4\u30c6\u30e0\u9078\u629e\u6642\u306b\u8868\u793a\u3059\u308b\u30dc\u30bf\u30f3\u3092\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3057\u305f\u3044\u5834\u5408\u306f\u3001 <code>Fangorn.config.\u30a2\u30c9\u30aa\u30f3\u540d</code> \u3092\u5b9a\u7fa9\u3057\u3001 <code>files.js</code> \u30d5\u30a1\u30a4\u30eb\u3067\u8aad\u307f\u8fbc\u307f\u307e\u3059\u3002 My MinIO\u30a2\u30c9\u30aa\u30f3\u3067\u306f\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u305b\u305a\u30c7\u30d5\u30a9\u30eb\u30c8\u52d5\u4f5c\u3092\u4f7f\u7528\u3057\u3066\u3044\u307e\u3059\u3002\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u4f8b\u306f\u3001GitHub\u30a2\u30c9\u30aa\u30f3\u3084IQB-RIMS\u30a2\u30c9\u30aa\u30f3\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#\u8a2d\u5b9a\u30e2\u30b8\u30e5\u30fc\u30eb","title":"\u8a2d\u5b9a\u30e2\u30b8\u30e5\u30fc\u30eb","text":"<p>\u74b0\u5883\u3054\u3068\u306e\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb <code>local.py</code> \u306e\u96db\u5f62\u3068\u3057\u3066 <code>local-dist.py</code> \u30d5\u30a1\u30a4\u30eb\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002\u30b5\u30fc\u30d3\u30b9\u7ba1\u7406\u8005\u306f <code>local-dist.py</code> \u3092 <code>local.py</code> \u306b\u30b3\u30d4\u30fc\u3057\u3066\u3001\u9069\u5b9c\u8a2d\u5b9a\u5024\u3092\u66f8\u304d\u63db\u3048\u307e\u3059\u3002</p> <p>My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002\u63a5\u7d9a\u3059\u308bMinIO\u30b5\u30fc\u30d3\u30b9\u306e\u30db\u30b9\u30c8\u540d\u3092 <code>HOST</code> \u30d7\u30ed\u30d1\u30c6\u30a3\u306b\u8a2d\u5b9a\u3057\u307e\u3059\u3002</p> <ul> <li>local-dist.py</li> </ul>"},{"location":"guides/storage-addon/README.legacy/#\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9","title":"\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9","text":"<p>\u30b7\u30ea\u30a2\u30e9\u30a4\u30b6\u306e\u30c6\u30b9\u30c8(<code>test_serializer.py</code>)\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002 My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>test_serializer.py</li> </ul>"},{"location":"guides/storage-addon/README.legacy/#waterbutler-provider\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u69cb\u6210","title":"WaterButler Provider\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u69cb\u6210","text":"<p>WaterButler Provider\u306f\u3001WaterButler\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u4e2d\u3067Python\u30e2\u30b8\u30e5\u30fc\u30eb\u3068\u3057\u3066\u5b9f\u88c5\u3055\u308c\u307e\u3059\u3002</p> <p><code>metadata.py</code> \u306b\u306f\u3001\u30d5\u30a9\u30eb\u30c0\u3084\u30d5\u30a1\u30a4\u30eb\u306e\u30e1\u30bf\u30c7\u30fc\u30bf\u3068\u3001\u30ea\u30d3\u30b8\u30e7\u30f3\u3092\u6301\u3064\u30af\u30e9\u30b9\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002 My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>metadata.py</li> </ul> <p><code>provider.py</code>\u306b\u306f\u3001\u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d3\u30b9\u3068\u63a5\u7d9a\u3057CRUD\u64cd\u4f5c\u306a\u3069\u3092\u884c\u3046Provider\u30af\u30e9\u30b9\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <p>Provider\u304c\u63d0\u4f9b\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u306b\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u3082\u306e\u304c\u3042\u308a\u307e\u3059\u3002</p> \u95a2\u6570\u540d \u5f15\u6570 \u623b\u308a\u5024 \u51e6\u7406 validate_v1_path path, **kwargs WaterButlerPath \u6587\u5b57\u5217\u3067\u4e0e\u3048\u3089\u308c\u305f\u30d1\u30b9\u60c5\u5831(<code>path</code>)\u3092\u691c\u8a3c\u3057\u3001\u5c5e\u6027\u4ed8\u304d\u306eWaterButlerPath\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u8fd4\u3059\u3002 validate_path path, **kwargs WaterButlerPath \u540c\u4e0a(\u5ec3\u6b62\u4e88\u5b9a\u306ev0\u4ed5\u69d8\u3068\u306e\u4e92\u63db\u6027\u7dad\u6301\u306e\u305f\u3081\u30012\u3064\u306e\u30e1\u30bd\u30c3\u30c9\u306b\u5206\u304b\u308c\u3066\u3044\u308b)\u3002 download path, accept_url=False, version=None, range=None, **kwargs Stream \u6307\u5b9a\u3055\u308c\u305f\u30d1\u30b9(<code>path</code>)\u306e\u30c7\u30fc\u30bf\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b\u3002\u623b\u308a\u5024\u306b\u306f\u30c7\u30fc\u30bf\u30a2\u30af\u30bb\u30b9\u7528\u306eStream\u3092\u8fd4\u3059\u3002 upload stream, path, conflict='replace', **kwargs Metadata \u6307\u5b9a\u3055\u308c\u305f\u30d1\u30b9(<code>path</code>)\u306b\u6307\u5b9a\u3055\u308c\u305f\u30c7\u30fc\u30bf(<code>stream</code>)\u3092\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3059\u308b\u3002\u623b\u308a\u5024\u306b\u306f\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u793a\u3059Metadata\u3092\u8fd4\u3059\u3002 delete path, confirm_delete=0, **kwargs \u306a\u3057 \u6307\u5b9a\u3055\u308c\u305f\u30d1\u30b9(<code>path</code>)\u306e\u30d5\u30a1\u30a4\u30eb\u30fb\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3059\u308b\u3002 revisions path, **kwargs List(Revision) \u6307\u5b9a\u3055\u308c\u305f\u30d1\u30b9(<code>path</code>)\u306e\u30ea\u30d3\u30b8\u30e7\u30f3\u60c5\u5831\u3092\u53d6\u5f97\u3059\u308b\u3002 metadata path, revision=None, **kwargs Metadata or List(Metadata) \u6307\u5b9a\u3055\u308c\u305f\u30d1\u30b9(<code>path</code>)\u306e\u30e1\u30bf\u30c7\u30fc\u30bf\u3092\u53d6\u5f97\u3059\u308b\u3002<code>path</code> \u304cfile\u306e\u5834\u5408 <code>Metadata</code> , directory\u306e\u5834\u5408 <code>List(Metadata)</code> \u3092\u8fd4\u3059\u3002 create_folder path, folder_precheck=True, **kwargs Metadata \u6307\u5b9a\u3055\u308c\u305f\u30d1\u30b9\u306b\u30d5\u30a9\u30eb\u30c0\u3092\u4f5c\u6210\u3059\u308b\u3002\u623b\u308a\u5024\u306b\u306f\u4f5c\u6210\u3057\u305f\u30d5\u30a9\u30eb\u30c0\u3092\u793a\u3059Metadata\u3092\u8fd4\u3059\u3002 can_intra_copy dest_provider, path=None Bool \u6307\u5b9a\u3055\u308c\u305f\u9001\u4fe1\u5148Provider(<code>dest_provider</code>), \u30d1\u30b9(<code>path</code>)\u306b\u5bfe\u3057\u3066intra_copy(\u5185\u90e8\u30b3\u30d4\u30fc: \u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d3\u30b9\u4e0a\u3067\u306e\u30b3\u30d4\u30fc)\u304c\u53ef\u80fd\u304b\u3069\u3046\u304b\u3092\u5224\u5b9a\u3059\u308b\u3002\u3053\u308c\u304cFalse\u306e\u5834\u5408\u3001\u3044\u3063\u305f\u3093\u4e00\u6642\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306bdownload\u3057\u3066\u3001dest\u306bupload\u3059\u308b\u3068\u3044\u3046\u64cd\u4f5c\u3068\u306a\u308b\u3002 can_intra_move dest_provider, path=None Bool \u6307\u5b9a\u3055\u308c\u305f\u9001\u4fe1\u5148Provider(<code>dest_provider</code>), \u30d1\u30b9(<code>path</code>)\u306b\u5bfe\u3057\u3066intra_move(\u5185\u90e8\u79fb\u52d5: \u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d3\u30b9\u4e2d\u3067\u306e\u79fb\u52d5)\u304c\u53ef\u80fd\u304b\u3069\u3046\u304b\u3092\u5224\u5b9a\u3059\u308b\u3002\u3053\u308c\u304cFalse\u306e\u5834\u5408\u3001\u3044\u3063\u305f\u3093\u4e00\u6642\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306bdownload\u3057\u3066\u3001dest\u306bupload\u3001\u30b3\u30d4\u30fc\u5143\u30d5\u30a1\u30a4\u30eb\u3092delete\u3059\u308b\u3068\u3044\u3046\u64cd\u4f5c\u3068\u306a\u308b\u3002 intra_copy dest_provider, src_path, dest_path Bool \u5185\u90e8\u30b3\u30d4\u30fc\u3092\u5b9f\u65bd\u3059\u308b\u3002\u6210\u529f\u3059\u308c\u3070True\u3092\u8fd4\u3059\u3002 intra_move dest_provider, src_path, dest_path Bool \u5185\u90e8\u79fb\u52d5\u3092\u5b9f\u65bd\u3059\u308b\u3002\u6210\u529f\u3059\u308c\u3070True\u3092\u8fd4\u3059\u3002 <p>My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <ul> <li>provider.py</li> </ul>"},{"location":"guides/storage-addon/README.legacy/#osfio-addon\u3068waterbutler-provider\u306e\u8a8d\u8a3c\u60c5\u5831\u306e\u59d4\u8b72","title":"OSF.io Addon\u3068WaterButler Provider\u306e\u8a8d\u8a3c\u60c5\u5831\u306e\u59d4\u8b72","text":"<p>OSF.io Addon\u306f\u3001WaterButler Provider\u304c\u5fc5\u8981\u306a\u30b5\u30fc\u30d3\u30b9\u306b\u63a5\u7d9a\u3067\u304d\u308b\u3088\u3046\u3001\u8a8d\u8a3c\u60c5\u5831\u3092\u59d4\u8b72\u3057\u307e\u3059\u3002\u3053\u306e\u8a8d\u8a3c\u60c5\u5831\u306e\u5f62\u5f0f\u306fAddon\u306b\u3088\u308a\u7570\u306a\u308b\u305f\u3081\u3001Addon\u3068Provider\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5408\u308f\u305b\u308b\u306a\u3069\u4f9d\u5b58\u95a2\u4fc2\u306b\u914d\u616e\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002</p> <p></p> <p>Addon\u306b\u304a\u3051\u308b\u59d4\u8b72\u8a2d\u5b9a\u306f\u3001 <code>addons.\u30a2\u30c9\u30aa\u30f3\u540d.models.NodeSettings.serialize_waterbutler_credentials()</code> \u95a2\u6570\u3067\u8a2d\u5b9a\u3057\u307e\u3059\u3002\u63a5\u7d9a\u5148\u306e\u30d5\u30a9\u30eb\u30c0\u306a\u3069\u306e\u60c5\u5831\u306f\u3001\u540c\u30af\u30e9\u30b9\u306e <code>serialize_waterbutler_settings()</code> \u95a2\u6570\u3067\u8a2d\u5b9a\u3057\u307e\u3059\u3002\u4f8b\u3048\u3070 IQB-RIMS\u30a2\u30c9\u30aa\u30f3\u306e <code>serialize_waterbutler_settings()</code> \u95a2\u6570 \u3067\u306f\u3001\u30d5\u30a9\u30eb\u30c0\u3054\u3068\u306e\u6a29\u9650\u8a2d\u5b9a\u3092\u6e21\u3057\u307e\u3059\u3002</p> <p>My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002\u8a8d\u8a3c\u60c5\u5831\u3068\u3057\u3066\u3001\u30a2\u30af\u30bb\u30b9\u5148\u306e\u30db\u30b9\u30c8\u540d\u3001\u30a2\u30af\u30bb\u30b9\u30ad\u30fc\u3001\u30b7\u30fc\u30af\u30ec\u30c3\u30c8\u30ad\u30fc\u3092\u6e21\u3057\u307e\u3059\u3002\u8a2d\u5b9a\u60c5\u5831\u3068\u3057\u3066\u3001\u63a5\u7d9a\u5148\u306e\u30d0\u30b1\u30c3\u30c8ID\u3092\u6e21\u3057\u307e\u3059\u3002</p> <pre><code>def serialize_waterbutler_credentials(self):\n if not self.has_auth:\n raise exceptions.AddonError('Cannot serialize credentials for {} addon'.format(FULL_NAME))\n return {\n 'host': settings.HOST,\n 'access_key': self.external_account.oauth_key,\n 'secret_key': self.external_account.oauth_secret,\n }\n\ndef serialize_waterbutler_settings(self):\n if not self.folder_id:\n raise exceptions.AddonError('Cannot serialize settings for {} addon'.format(FULL_NAME))\n return {\n 'bucket': self.folder_id\n }\n</code></pre> <p>Provider\u5074\u3067\u306f\u3001\u8a8d\u8a3c\u60c5\u5831\u3068\u8a2d\u5b9a\u60c5\u5831\u3092 <code>waterbutler.providers.\u30a2\u30c9\u30aa\u30f3\u540d.\u30a2\u30c9\u30aa\u30f3\u540dProvider</code> \u30af\u30e9\u30b9\u306e\u30b3\u30f3\u30b9\u30c8\u30e9\u30af\u30bf(<code>__init__()</code>)\u306e\u5f15\u6570 <code>credentials</code> \u3068 <code>settings</code> \u306bDictionary\u578b\u3067\u305d\u308c\u305e\u308c\u53d7\u3051\u53d6\u308a\u307e\u3059\u3002</p> <p>My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u307e\u3059\u3002\u8a8d\u8a3c\u60c5\u5831\u3092\u4f7f\u3063\u3066My MinIO\u30b5\u30fc\u30d3\u30b9\u3068\u306e\u63a5\u7d9a\u3092\u78ba\u7acb\u3057\u3001\u8a2d\u5b9a\u60c5\u5831\u3092\u4f7f\u3063\u3066\u63a5\u7d9a\u5148\u30d0\u30b1\u30c3\u30c8\u3092\u53d6\u5f97\u3057\u307e\u3059\u3002</p> <pre><code>class MyMinIOProvider(provider.BaseProvider):\n def __init__(self, auth, credentials, settings):\n super().__init__(auth, credentials, settings)\n\n host = credentials['host']\n port = 443\n m = re.match(r'^(.+)\\:([0-9]+)$', host)\n if m is not None:\n host = m.group(1)\n port = int(m.group(2))\n self.connection = MyMinIOConnection(credentials['access_key'],\n credentials['secret_key'],\n calling_format=OrdinaryCallingFormat(),\n host=host,\n port=port,\n is_secure=port == 443)\n self.bucket = self.connection.get_bucket(settings['bucket'], validate=False)\n</code></pre>"},{"location":"guides/storage-addon/README.legacy/#recent-activity\u306e\u8a18\u9332\u8868\u793a","title":"Recent Activity\u306e\u8a18\u9332\u30fb\u8868\u793a","text":"<p>\u4f55\u3089\u304b\u306e\u30e6\u30fc\u30b6\u64cd\u4f5c\u3092\u5951\u6a5f\u3068\u3057\u3066\u30a2\u30c9\u30aa\u30f3\u306b\u5bfe\u3057\u3066\u884c\u308f\u308c\u305f\u64cd\u4f5c\u306f\u3001Recent Activity\u3068\u3044\u3046\u5f62\u3067\u8a18\u9332\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#nodelog\u30e2\u30c7\u30eb\u306e\u8ffd\u52a0","title":"NodeLog\u30e2\u30c7\u30eb\u306e\u8ffd\u52a0","text":"<p>Recent Activity\u306fNodeLog\u30e2\u30c7\u30eb\u306b\u3088\u308a\u8868\u73fe\u3055\u308c\u307e\u3059\u3002 \u30ed\u30b0\u306e\u8ffd\u52a0\u306fNode(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u5bfe\u5fdc\u3059\u308b\u30e2\u30c7\u30eb)\u306e add_log\u30e1\u30bd\u30c3\u30c9 \u306b\u3088\u308a\u884c\u3046\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p>models.py <pre><code>self.owner.add_log(\n '{0}_{1}'.format(SHORT_NAME, action),\n auth=auth,\n params={\n 'project': self.owner.parent_id,\n 'node': self.owner._id,\n 'path': metadata['materialized'],\n 'bucket': self.folder_id,\n 'urls': {\n 'view': url,\n 'download': url + '?action=download'\n }\n },\n)\n</code></pre></p> <p>\u3053\u306e\u4f8b\u3067\u306f\u3001NodeSettings\u30e2\u30c7\u30eb\u306eowner(Node)\u306b\u5bfe\u3057\u3066\u30ed\u30b0\u306e\u8ffd\u52a0\u3092\u6307\u793a\u3057\u3066\u3044\u307e\u3059\u3002 \u30d1\u30e9\u30e1\u30fc\u30bf\u306b\u306f\u4ee5\u4e0b\u306e\u5024\u3092\u6307\u5b9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <ul> <li><code>action</code> ... \u30ed\u30b0\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u7a2e\u5225\u3092\u793a\u3059\u540d\u524d\u3002<code>\u30a2\u30c9\u30aa\u30f3\u540d_\u30a2\u30af\u30b7\u30e7\u30f3\u540d</code>\u3068\u306a\u308b\u3002\u672c\u30b5\u30f3\u30d7\u30eb\u306b\u3088\u308a\u8a18\u9332\u3055\u308c\u308b<code>\u30a2\u30af\u30b7\u30e7\u30f3\u540d</code>\u306b\u306f\u4ee5\u4e0b\u306e\u3082\u306e\u304c\u3042\u308b\u3002</li> <li><code>node_authorized</code>, <code>node_deauthorized</code>, <code>node_deauthorized_no_user</code> ... \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u672c\u30a2\u30c9\u30aa\u30f3\u304c\u8a2d\u5b9a\u3042\u308b\u3044\u306f\u89e3\u9664\u3055\u308c\u305f\u5834\u5408\u306b\u8a18\u9332\u3055\u308c\u308b\u30ed\u30b0</li> <li><code>bucket_linked</code>, <code>bucket_unlinked</code> ... \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u8a2d\u5b9a\u753b\u9762\u306b\u3088\u308a\u3001\u30d0\u30b1\u30c3\u30c8\u304c\u8a2d\u5b9a\u3042\u308b\u3044\u306f\u89e3\u9664\u3055\u308c\u305f\u5834\u5408\u306b\u8a18\u9332\u3055\u308c\u308b\u30ed\u30b0</li> <li><code>file_added</code>, <code>file_removed</code>, <code>file_updated</code>, <code>folder_created</code> ... WaterButler\u306b\u3088\u308b\u30d5\u30a1\u30a4\u30eb\u64cd\u4f5c\u304c\u884c\u308f\u308c\u305f\u5834\u5408\u306b\u8a18\u9332\u3055\u308c\u308b\u30ed\u30b0</li> <li><code>params</code> ... \u30ed\u30b0\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u3002\u4efb\u610f\u306edict\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u6307\u5b9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u308b</li> <li><code>auth</code> ... \u64cd\u4f5c\u3092\u5b9f\u65bd\u3057\u305f\u30e6\u30fc\u30b6\u306e\u60c5\u5831\u3002framework.auth.Auth\u30af\u30e9\u30b9\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u4e0e\u3048\u308b\u3053\u3068\u304c\u3067\u304d\u308b</li> </ul>"},{"location":"guides/storage-addon/README.legacy/#nodelog\u30e2\u30c7\u30eb\u306e\u8868\u793a","title":"NodeLog\u30e2\u30c7\u30eb\u306e\u8868\u793a","text":"<p>\u8a18\u9332\u3055\u308c\u305f\u30ed\u30b0\u3092\u3069\u306e\u3088\u3046\u306b\u8868\u793a\u3059\u308b\u304b\u306f\u3001\u4ee5\u4e0b\u306eJSON\u30d5\u30a1\u30a4\u30eb\u306b\u3088\u308a\u5b9a\u7fa9\u3057\u307e\u3059\u3002</p> <p>myminioLogActionList.json <pre><code>\"myminio_bucket_linked\" : \"${user} linked the My MinIO bucket ${bucket} to ${node}\",\n</code></pre></p> <p>myminioAnonymousLogActionList.json <pre><code>\"myminio_bucket_linked\" : \"A user linked an My MinIO bucket to a project\",\n</code></pre></p> <p><code>\u30a2\u30c9\u30aa\u30f3\u540dLogActionList.json</code>\u306f\u30ed\u30b0\u30a4\u30f3\u3057\u305f\u72b6\u614b\u3067\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u8868\u793a\u306e\u969b\u306b\u5229\u7528\u3055\u308c\u3001<code>\u30a2\u30c9\u30aa\u30f3\u540dAnonymousLogActionList.json</code>\u306f\u30d1\u30d6\u30ea\u30c3\u30af\u306a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8(RDM\u3067\u306f\u5229\u7528\u3092\u60f3\u5b9a\u3057\u3066\u3044\u307e\u305b\u3093)\u306b\u5229\u7528\u3055\u308c\u307e\u3059\u3002 \u3069\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u304c\u30ed\u30b0\u8868\u793a\u306b\u5229\u7528\u3055\u308c\u308b\u304b\u306f\u3001add_log\u30e1\u30bd\u30c3\u30c9\u306e <code>action</code> \u5f15\u6570\u306b\u4e0e\u3048\u3089\u308c\u305f\u6587\u5b57\u5217\u304c\u30ad\u30fc\u3068\u3057\u3066\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002\u307e\u305f\u3001\u30e1\u30c3\u30bb\u30fc\u30b8\u5b9a\u7fa9\u4e2d\u306e <code>${\u30d1\u30e9\u30e1\u30fc\u30bf\u540d}</code> \u306b\u306fadd_log\u30e1\u30bd\u30c3\u30c9\u306e <code>params</code> \u5f15\u6570\u306b\u4e0e\u3048\u3089\u308c\u305f\u30d1\u30e9\u30e1\u30fc\u30bf\u4e2d\u306e\u30ad\u30fc\u3092\u6307\u5b9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p>\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u56fd\u969b\u5316\u306fpybabel\u30b3\u30de\u30f3\u30c9\u3092\u7528\u3044\u3066\u884c\u3046\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u5b9a\u7fa9\u3057\u305f\u30a2\u30c9\u30aa\u30f3\u306e\u30e1\u30c3\u30bb\u30fc\u30b8(\u82f1\u8a9e\u3067\u8a18\u8f09\u3059\u308b)\u306b\u5bfe\u5fdc\u3059\u308b\u65e5\u672c\u8a9e\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u5b9a\u7fa9\u30d5\u30a1\u30a4\u30eb\u3092\u751f\u6210\u3059\u308b\u305f\u3081\u306b\u306f\u3001 \u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u307e\u3059\u3002</p> <pre><code># \u30e1\u30c3\u30bb\u30fc\u30b8\u5b9a\u7fa9JSON\u306a\u3069\u3092JavaScript\u30d5\u30a1\u30a4\u30eb\u3078\u3068\u5909\u63db\u3059\u308b\n$ docker compose run --rm web invoke assets\n\n# \u30e1\u30c3\u30bb\u30fc\u30b8\u5b9a\u7fa9\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb website/translations/js_messages.pot \u3092\u66f4\u65b0\u3059\u308b\n$ docker compose run --rm web pybabel extract -F ./website/settings/babel_js.cfg -o ./website/translations/js_messages.pot .\n\n# \u30e1\u30c3\u30bb\u30fc\u30b8\u5b9a\u7fa9\u30d5\u30a1\u30a4\u30eb website/translations/ja/LC_MESSAGES/js_messages.po \u3092\u66f4\u65b0\u3059\u308b\n$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/en/LC_MESSAGES/js_messages.po -l en\n$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/ja/LC_MESSAGES/js_messages.po -l ja\n</code></pre> <p>\u3059\u308b\u3068\u3001<code>website/translations/ja/LC_MESSAGES/js_messages.po</code>\u30d5\u30a1\u30a4\u30eb\u306b\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u7a7a\u306e\u9805\u76ee\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3059\u3002</p> <pre><code>#: website/static/js/logActionsList_extract.js:246\nmsgid \"${user} linked the My MinIO bucket ${bucket} to ${node}\"\nmsgstr \"\"\n</code></pre> <p>\u3053\u306e <code>msgstr</code> \u306b\u65e5\u672c\u8a9e\u306b\u3088\u308b\u30e1\u30c3\u30bb\u30fc\u30b8\u5b9a\u7fa9\u3092\u8ffd\u52a0\u3059\u308b\u3053\u3068\u3067\u3001\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u56fd\u969b\u5316\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <pre><code>#: website/static/js/logActionsList_extract.js:246\nmsgid \"${user} linked the My MinIO bucket ${bucket} to ${node}\"\nmsgstr \"${user}\u304c My MinIO\u30d0\u30b1\u30c3\u30c8(${bucket})\u3092\u63a5\u7d9a\u3057\u307e\u3057\u305f\"\n</code></pre> <p><code>js_messages.po</code> \u3092\u5909\u66f4\u3057\u305f\u3089\u3001<code>assets</code>\u30b5\u30fc\u30d3\u30b9\u3092\u518d\u8d77\u52d5\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u6700\u65b0\u306e<code>js_messages.po</code>\u30d5\u30a1\u30a4\u30eb\u304c\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u8868\u793a\u306b\u4f7f\u7528\u3055\u308c\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002</p> <pre><code>$ docker compose restart assets\n</code></pre>"},{"location":"guides/storage-addon/README.legacy/#\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u306e\u51e6\u7406","title":"\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u306e\u51e6\u7406","text":"<p>RDM\u3067\u306f\u30e6\u30fc\u30b6\u304c\u4efb\u610f\u306e\u30bf\u30a4\u30df\u30f3\u30b0\u3067\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u4e2d\u306e\u30d5\u30a1\u30a4\u30eb\u306b\u5bfe\u3057\u3066\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u3092\u6253\u3064\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u306f\u3001\u30d5\u30a1\u30a4\u30eb\u306b\u95a2\u3057\u3066\u305d\u306e\u6642\u70b9\u3067\u306e\u5185\u5bb9\u3092\u8a3c\u660e\u3059\u308b\u3082\u306e\u3067\u3001\u7814\u7a76\u306e\u8a3c\u8de1\u3068\u3057\u3066\u306e\u30c7\u30fc\u30bf\u3092\u8003\u3048\u308b\u4e0a\u3067\u975e\u5e38\u306b\u91cd\u8981\u3067\u3059\u3002</p> <p>\u306a\u304a\u3001docker-compose\u3067\u8d77\u52d5\u3057\u305f\u72b6\u614b\u3067\u306f FreeTSA Project \u306e\u30b5\u30fc\u30d0\u3092\u7528\u3044\u3066\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u3092\u4ed8\u4e0e\u3057\u307e\u3059\u3002\u5b9f\u74b0\u5883\u3078\u306e\u914d\u5099\u6642\u306fUPKI\u96fb\u5b50\u8a3c\u660e\u66f8\u767a\u884c\u30b5\u30fc\u30d3\u30b9\u306b\u3088\u308a\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u4ed8\u4e0e\u3059\u308b\u3053\u3068\u3092\u60f3\u5b9a\u3057\u3066\u3044\u307e\u3059\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#\u30e6\u30fc\u30b6\u306b\u3088\u308b\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u306e\u8ffd\u52a0","title":"\u30e6\u30fc\u30b6\u306b\u3088\u308b\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u306e\u8ffd\u52a0","text":"<p>\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u306f\u3001\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9\u304b\u3089\u8a08\u7b97\u3057\u305f\u30cf\u30c3\u30b7\u30e5\u5024\u3092\u7f72\u540d\u3059\u308b\u5f62\u3067\u4f5c\u6210\u3055\u308c\u307e\u3059\u3002\u30cf\u30c3\u30b7\u30e5\u306e\u53d6\u5f97\u306f\u4ee5\u4e0b\u306e\u3044\u305a\u308c\u304b\u306e\u65b9\u6cd5\u3067\u304a\u3053\u306a\u3044\u307e\u3059\u3002</p> <ul> <li><code>osf.models.files.File</code> \u30b5\u30d6\u30af\u30e9\u30b9\u306e <code>get_hash_for_timestamp</code>\u306b\u3088\u308a\u53d6\u5f97\u3059\u308b</li> <li>WaterButler\u3092\u7d4c\u7531\u3057\u3066\u30d5\u30a1\u30a4\u30eb\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u3001\u30cf\u30c3\u30b7\u30e5\u8a08\u7b97\u3092\u884c\u3046</li> </ul> <p><code>osf.models.files.File</code> \u30b5\u30d6\u30af\u30e9\u30b9\u306f\u30a2\u30c9\u30aa\u30f3\u306e\u30e2\u30c7\u30eb\u3068\u3057\u3066\u30cf\u30c3\u30b7\u30e5\u5024\u306e\u53d6\u5f97\u65b9\u6cd5\u3092\u5b9a\u7fa9\u3059\u308b\u3082\u306e\u3067\u3059\u3002\u672c\u30b5\u30f3\u30d7\u30eb\u3067\u306f models.py \u306b\u3042\u308a\u307e\u3059\u3002 \u30b9\u30c8\u30ec\u30fc\u30b8\u306b\u3088\u308a\u5bb9\u6613\u306b\u30cf\u30c3\u30b7\u30e5\u76f8\u5f53\u306e\u5024\u3092\u53d6\u5f97\u30fb\u7ba1\u7406\u3059\u308b\u65b9\u6cd5\u304c\u3042\u308b\u5834\u5408\u306f\u3001\u3053\u306e\u30e2\u30c7\u30eb\u306b<code>get_hash_for_timestamp(self)</code>\u30e1\u30bd\u30c3\u30c9\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002 \u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u51e6\u7406\u306f\u3053\u306e\u30e1\u30bd\u30c3\u30c9\u3092\u901a\u3058\u3066\u30cf\u30c3\u30b7\u30e5\u5024\u3092\u53d6\u5f97\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 <code>get_hash_for_timestamp(self)</code>\u30e1\u30bd\u30c3\u30c9\u306e\u5b9f\u88c5\u306f dropboxbusiness\u30a2\u30c9\u30aa\u30f3\u306e DropboxBusinessFile\u30af\u30e9\u30b9 \u3092\u53c2\u8003\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p><code>osf.models.files.File</code>\u30e2\u30c7\u30eb\u306b<code>get_hash_for_timestamp(self)</code>\u304c\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u306f\u3001\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u51e6\u7406\u306fWaterButler\u3092\u7d4c\u7531\u3057\u3066\u30d5\u30a1\u30a4\u30eb\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b\u65b9\u6cd5\u3092\u8a66\u884c\u3057\u307e\u3059\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#rdm\u4ee5\u5916\u3067\u306e\u30d5\u30a1\u30a4\u30eb\u5909\u66f4\u306b\u3088\u308b\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u306e\u8ffd\u52a0","title":"RDM\u4ee5\u5916\u3067\u306e\u30d5\u30a1\u30a4\u30eb\u5909\u66f4\u306b\u3088\u308b\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u306e\u8ffd\u52a0","text":"<p>RDM\u4ee5\u5916\u3067\u306e\u30d5\u30a1\u30a4\u30eb\u5909\u66f4\u6642\u306b\u5b9f\u65bd\u3059\u308b\u5834\u5408\u3082\u3001\u30d5\u30a1\u30a4\u30eb\u304c\u5909\u66f4\u3055\u308c\u305f\u3053\u3068\u3092\u793a\u3059\u305f\u3081\u306b\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u3092\u4ed8\u52a0\u3057\u305f\u3044\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002 \u3053\u306e\u3088\u3046\u306a\u51e6\u7406\u3092\u5b9f\u884c\u3059\u308b\u305f\u3081\u306b\u306f <code>website.util.timestamp</code> \u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u4f7f\u7528\u3057\u307e\u3059\u3002 \u4f8b\u3048\u3070Dropbox Business\u30a2\u30c9\u30aa\u30f3\u3067\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9f\u88c5\u3057\u3066\u3044\u307e\u3059\u3002</p> <p>dropboxbusiness/utils.py <pre><code>...\nfrom website.util import timestamp\n\n...\n\nfile_info = {\n 'file_id': file_node._id,\n 'file_name': attrs.get('name'),\n 'file_path': attrs.get('materialized'),\n 'size': attrs.get('size'),\n 'created': attrs.get('created_utc'),\n 'modified': attrs.get('modified_utc'),\n 'file_version': '',\n 'provider': PROVIDER_NAME\n}\n# verified by admin\nverify_result = timestamp.check_file_timestamp(\n admin.id, node, file_info, verify_external_only=True)\n</code></pre></p> <p><code>check_file_timestamp(uid, node, data, verify_external_only=False)</code>\u95a2\u6570\u306f\u4ee5\u4e0b\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u3092\u6307\u5b9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <ul> <li><code>uid</code> ... \u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u64cd\u4f5c\u3092\u884c\u3046\u30e6\u30fc\u30b6\u3092\u793a\u3059OSFUser\u306eID</li> <li><code>node</code> ... \u30d5\u30a1\u30a4\u30eb\u304c\u6240\u5c5e\u3059\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u793a\u3059Node</li> <li><code>data</code> ... \u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u306b\u3088\u308a\u7f72\u540d\u691c\u8a3c\u3059\u308b\u30c7\u30fc\u30bf\u3092\u793a\u3059\u8f9e\u66f8\u578b\u30c7\u30fc\u30bf</li> <li><code>verify_external_only</code> ... \u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u691c\u8a3c\u60c5\u5831\u306e\u683c\u7d0d\u306b<code>osf.models.RdmFileTimestamptokenVerifyResult</code>\u3092\u4f7f\u3046\u5834\u5408\u306fFalse, \u4f7f\u308f\u306a\u3044\u5834\u5408(<code>osf.models.files.File</code> \u30b5\u30d6\u30af\u30e9\u30b9\u306e<code>def set_timestamp(self, timestamp_data, timestamp_status, context)</code>\u306b\u683c\u7d0d\u3059\u308b\u5834\u5408)\u306fTrue\u3068\u3059\u308b (\u30c7\u30d5\u30a9\u30eb\u30c8\u306fFalse)</li> </ul> <p>\u306a\u304a\u3001<code>def set_timestamp(self, timestamp_data, timestamp_status, context)</code> \u306e\u5b9a\u7fa9\u65b9\u6cd5\u306f dropboxbusiness\u30a2\u30c9\u30aa\u30f3\u306e DropboxBusinessFile\u30af\u30e9\u30b9 \u3092\u53c2\u8003\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p>\u307e\u305f\u3001\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u306e\u4ed8\u52a0\u51e6\u7406\u306f\u30b9\u30c8\u30ec\u30fc\u30b8\u306eAPI\u547c\u3073\u51fa\u3057\u3084\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u306e\u4ed8\u52a0\u51e6\u7406\u306a\u3069I/O\u3092\u4f34\u3046\u305f\u3081\u3001views\u30e2\u30b8\u30e5\u30fc\u30eb\u5185\u306e\u95a2\u6570\u306a\u3069\u3001\u30ea\u30af\u30a8\u30b9\u30c8\u30cf\u30f3\u30c9\u30e9\u3068\u3057\u3066\u632f\u308b\u821e\u3046\u95a2\u6570\u4e2d\u3067\u51e6\u7406\u3092\u884c\u3063\u3066\u3057\u307e\u3046\u3068\u3001\u4ed6\u306e\u30cf\u30f3\u30c9\u30e9\u304c\u5f85\u305f\u3055\u308c\u308b\u8981\u56e0\u306b\u306a\u308a\u307e\u3059\u3002 \u3053\u306e\u3088\u3046\u306a\u72b6\u6cc1\u306b\u5bfe\u5fdc\u3059\u308b\u305f\u3081\u3001RDM\u3067\u306fCelery\u306b\u3088\u308b\u30ef\u30fc\u30ab\u30fc\u304c\u7528\u610f\u3055\u308c\u3066\u3044\u307e\u3059\u3002 \u95a2\u6570\u3092Celery\u30bf\u30b9\u30af\u3068\u3057\u3066\u5b9a\u7fa9\u3059\u308b\u3053\u3068\u3067\u3001\u6642\u9593\u304c\u304b\u304b\u308b\u51e6\u7406\u306f\u30ef\u30fc\u30ab\u30fc\u306b\u59d4\u8b72\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 \u4f8b\u3048\u3070Dropbox Business\u30a2\u30c9\u30aa\u30f3\u3067\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u3066\u3044\u307e\u3059\u3002</p> <p>dropboxbusiness/utils.py <pre><code>...\nfrom framework.celery_tasks import app as celery_app\n\n...\n\n@celery_app.task(bind=True, base=AbortableTask)\ndef celery_check_updated_files(self, team_ids):\n ...\n</code></pre></p> <p>\u547c\u3073\u51fa\u3057\u5074\u3067\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u95a2\u6570\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u3067\u3001\u30ef\u30fc\u30ab\u30fc\u306b\u51e6\u7406\u3092\u4efb\u305b\u3001\u81ea\u8eab\u306e\u51e6\u7406\u3092\u7d9a\u884c\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p>dropboxbusiness/views.py <pre><code>utils.celery_check_updated_files.delay(team_ids)\n</code></pre></p>"},{"location":"guides/storage-addon/README.legacy/#my-minio\u30a2\u30c9\u30aa\u30f3\u306e\u5b9f\u88c5","title":"My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u5b9f\u88c5","text":"<p>\u3053\u3053\u3067\u306f\u3001 <code>myminio</code> \u3068\u3044\u3046\u8b58\u5225\u540d\u306e\u30a2\u30c9\u30aa\u30f3\u306e\u5b9f\u88c5\u3092\u4f8b\u306b\u8aac\u660e\u3057\u307e\u3059\u3002\u30a2\u30c9\u30aa\u30f3\u306e\u5b8c\u5168\u540d\u306f <code>My MinIO</code> \u3068\u3057\u307e\u3059\u3002</p> <p>\u30a2\u30c9\u30aa\u30f3\u540d\u306f\u69d8\u3005\u306a\u5834\u6240\u306b\u57cb\u3081\u8fbc\u307e\u308c\u3066\u3044\u307e\u3059\u3002\u30a2\u30c9\u30aa\u30f3\u540d\u3092\u5909\u66f4\u3057\u305f\u3044\u5834\u5408\u306f\u3001\u4ee5\u964d\u3067\u8ffd\u52a0\u30fb\u5909\u66f4\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u540d\u3084\u30b3\u30fc\u30c9\u306e <code>myminio</code> \u3001 <code>My MinIO</code> \u3001 <code>MyMinIO</code> \u3068\u3044\u3046\u6587\u5b57\u5217\u3092\u5909\u66f4\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p>My MinIO\u30a2\u30c9\u30aa\u30f3\u306f\u3001AWS S3\u4e92\u63db\u30b5\u30fc\u30d3\u30b9\u3068\u63a5\u7d9a\u3059\u308b\u30a2\u30c9\u30aa\u30f3\u306a\u306e\u3067\u3001Amazon S3\u30a2\u30c9\u30aa\u30f3\u3084S3 Compatible Storage\u30a2\u30c9\u30aa\u30f3\u3092\u53c2\u8003\u306b\u5b9f\u88c5\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002Amazon S3\u30a2\u30c9\u30aa\u30f3\u3084S3 Compatible Storage\u30a2\u30c9\u30aa\u30f3\u3068\u306e\u9055\u3044\u306f\u4ee5\u4e0b\u306e\u901a\u308a\u3067\u3059\u3002</p> <ul> <li>My MinIO\u30a2\u30c9\u30aa\u30f3\u306f\u7c21\u5358\u306e\u305f\u3081\u3001\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u306e\u6697\u53f7\u5316\u6a5f\u80fd\u3092\u5b9f\u88c5\u3057\u306a\u3044\u3002</li> <li>Amazon S3\u30a2\u30c9\u30aa\u30f3\u3084S3 Compatible Storage\u30a2\u30c9\u30aa\u30f3\u306f\u3001\u30a2\u30ab\u30a6\u30f3\u30c8\u3054\u3068\u306b\u63a5\u7d9a\u3059\u308b\u30b5\u30fc\u30d3\u30b9\u3084Location\u306a\u3069\u3092\u9078\u629e\u3067\u304d\u308b\u304c\u3001My MinIO\u306f\u30b5\u30fc\u30d3\u30b9\u5074\u3067\u6307\u5b9a\u3057\u305f\u7279\u5b9a\u306eMinIO\u30b5\u30fc\u30d3\u30b9\u306e\u307f\u3092\u6271\u3046\u3002</li> </ul>"},{"location":"guides/storage-addon/README.legacy/#osfio\u3078\u306e\u5b9f\u88c5","title":"OSF.io\u3078\u306e\u5b9f\u88c5","text":""},{"location":"guides/storage-addon/README.legacy/#addonsmyminio-\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9a\u7fa9","title":"addons.myminio \u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9a\u7fa9","text":"<p>\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u3068\u540c\u69d8\u306b\u3001\u30a2\u30c9\u30aa\u30f3\u306e\u5b9f\u88c5\u4f8b(<code>osf.io/addon/</code>)\u3092 <code>addons/myminio</code> \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#rdm\u30b3\u30fc\u30c9\u306e\u5909\u66f4","title":"RDM\u30b3\u30fc\u30c9\u306e\u5909\u66f4","text":"<p>\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u3068\u540c\u69d8\u306b\u3001RDM\u306e\u30b3\u30fc\u30c9\u3092\u3044\u304f\u3064\u304b\u5909\u66f4\u3057\u307e\u3059\u3002</p> <ul> <li>addons.json</li> <li>\u5909\u66f4\u4f8b\u306e\u30b5\u30f3\u30d7\u30eb: addons.json</li> <li>framework/addons/data/addons.json</li> <li>\u5909\u66f4\u4f8b\u306e\u30b5\u30f3\u30d7\u30eb: addons.json</li> <li>Dockerfile</li> <li>\u5909\u66f4\u4f8b\u306e\u30b5\u30f3\u30d7\u30eb: Dockerfile</li> <li>api/base/settings/defaults.py</li> <li>\u5909\u66f4\u4f8b\u306e\u30b5\u30f3\u30d7\u30eb: defaults.py</li> </ul> <p><code>api/base/settings/defaults.py</code> \u306f\u3001 <code>INSTALLED_APPS</code> \u306e\u4ed6\u306b\u3001 <code>ADDONS_FOLDER_CONFIGURABLE</code> \u3001 <code>ADDONS_OAUTH</code> \u306b\u3082\u30a2\u30c9\u30aa\u30f3\u540d\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002\u5909\u66f4\u4f8b\u30b5\u30f3\u30d7\u30eb\u3067\u306f\u3001Amazon S3\u30a2\u30c9\u30aa\u30f3\u306b\u5408\u308f\u305b\u3066\u3001\u30b9\u30b1\u30eb\u30c8\u30f3 \u30a2\u30c9\u30aa\u30f3\u3068\u306f\u7570\u306a\u308b\u65b9\u6cd5\u3067\u8a2d\u5b9a\u3057\u3066\u3044\u307e\u3059\u3002</p> <pre><code>INSTALLED_APPS += ('addons.myminio',)\nADDONS_FOLDER_CONFIGURABLE.append('myminio')\nADDONS_OAUTH.append('myminio')\n</code></pre> <p>\u4ed6\u306b\u3082\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u3067\u306f\u3001 website/static/storageAddons.json \u306b\u3082\u8a2d\u5b9a\u3092\u8ffd\u52a0\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002</p> <p>\u5909\u66f4\u4f8b\u306f storageAddons.json \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <pre><code> \"myminio\": {\n \"fullName\": \"My MinIO\",\n \"externalView\": false\n },\n</code></pre> <p><code>externalView</code> \u3092 <code>true</code> \u306b\u8a2d\u5b9a\u3059\u308b\u3068\u3001FileViewer\u3067\u30d5\u30a1\u30a4\u30eb\u306e\u5916\u90e8\u30da\u30fc\u30b8\u30ea\u30f3\u30af\u30dc\u30bf\u30f3\u304c\u8868\u793a\u3055\u308c\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002\u30ea\u30f3\u30af\u3092\u6b63\u3057\u304f\u52d5\u4f5c\u3055\u305b\u308b\u306b\u306f\u3001WaterButler\u306eProvider\u3092\u4fee\u6b63\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u8a73\u7d30\u306fGoogleDrive\u306e\u5b9f\u88c5\u306a\u3069\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <p>FileViewer\u3067\u3001\u30d5\u30a9\u30eb\u30c0\u306e\u64cd\u4f5c\u306f\u3067\u304d\u308b\u304c\u30d5\u30a1\u30a4\u30eb\u306e\u64cd\u4f5c\u304c\u3067\u304d\u306a\u3044\u5834\u5408\u306f\u3001 <code>storageAddons.json</code> \u306e\u8a2d\u5b9a\u304c\u6f0f\u308c\u3066\u3044\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#migrations\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210","title":"Migrations\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210","text":"<p><code>makemigrations</code> \u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u3066\u3001Migrations\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web python3 manage.py makemigrations\n</code></pre> <p>\u4e0a\u8a18\u306e\u51fa\u529b\u4e2d\u306b\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u51fa\u529b\u304c\u73fe\u308c\u308c\u3070\u6210\u529f\u3067\u3059\u3002\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u306e\u5834\u5408\u3001 <code>osf/migrations</code> \u3068 <code>addons/myminio/migrations</code> \u306e2\u3064\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5185\u306bPython\u30d5\u30a1\u30a4\u30eb\u304c\u4f5c\u6210\u3055\u308c\u307e\u3059\u3002</p> <p><code>osf/migrations</code> \u914d\u4e0b\u306b\u4f5c\u6210\u3055\u308c\u308b\u30d5\u30a1\u30a4\u30eb\u540d\u306f\u3001\u4f5c\u6210\u65e5\u6642\u3084RDM\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306b\u3088\u3063\u3066\u7570\u306a\u308a\u307e\u3059\u3002</p> <pre><code>Migrations for 'osf':\n osf/migrations/0214_auto_20201001_0007.py\n - Create proxy model MyMinIOFileNode\n - Alter field type on basefilenode\n - Create proxy model MyMinIOFile\n - Create proxy model MyMinIOFolder\nMigrations for 'addons_myminio':\n addons/myminio/migrations/0001_initial.py\n - Create model NodeSettings\n - Create model UserSettings\n - Add field user_settings to nodesettings\n</code></pre>"},{"location":"guides/storage-addon/README.legacy/#\u56fd\u969b\u5316\u30e1\u30c3\u30bb\u30fc\u30b8\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210","title":"\u56fd\u969b\u5316\u30e1\u30c3\u30bb\u30fc\u30b8\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210","text":"<p>\u56fd\u969b\u5316\u30e1\u30c3\u30bb\u30fc\u30b8\u30d5\u30a1\u30a4\u30eb\u306e\u5b9a\u7fa9\u30d5\u30a1\u30a4\u30eb\u306f\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3067\u751f\u6210\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002</p> <p>\u3053\u306e\u30bb\u30af\u30b7\u30e7\u30f3\u306e\u5b9f\u65bd\u6642\u306f\u5404\u30b5\u30fc\u30d3\u30b9\u3092\u505c\u6b62\u72b6\u614b\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <pre><code># \u30e1\u30c3\u30bb\u30fc\u30b8\u5b9a\u7fa9JSON\u306a\u3069\u3092JavaScript\u30d5\u30a1\u30a4\u30eb\u3078\u3068\u5909\u63db\u3059\u308b\u3002\u5404\u30b5\u30fc\u30d3\u30b9\u304c\u505c\u6b62\u3057\u3066\u3044\u308b\u72b6\u614b\u3067\u5b9f\u65bd\u3059\u308b\u3002\n$ docker compose run --rm web invoke assets\n\n# \u30e1\u30c3\u30bb\u30fc\u30b8\u5b9a\u7fa9\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb website/translations/js_messages.pot \u3092\u66f4\u65b0\u3059\u308b\n$ docker compose run --rm web pybabel extract -F ./website/settings/babel_js.cfg -o ./website/translations/js_messages.pot .\n\n# \u30e1\u30c3\u30bb\u30fc\u30b8\u5b9a\u7fa9\u30d5\u30a1\u30a4\u30eb website/translations/ja/LC_MESSAGES/js_messages.po \u3092\u66f4\u65b0\u3059\u308b\n$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/en/LC_MESSAGES/js_messages.po -l en\n$ docker compose run --rm web pybabel update -i ./website/translations/js_messages.pot -o ./website/translations/ja/LC_MESSAGES/js_messages.po -l ja\n</code></pre> <p>\u5909\u66f4\u4f8b\u306e\u30b5\u30f3\u30d7\u30eb js_messages.po \u3092\u53c2\u8003\u306b\u65e5\u672c\u8a9e\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u8ffd\u52a0\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> <pre><code>#: website/static/js/logActionsList_extract.js:246\nmsgid \"${user} linked the My MinIO bucket ${bucket} to ${node}\"\nmsgstr \"${user}\u304cMy MinIO\u30d0\u30b1\u30c3\u30c8(${bucket})\u3092${node}\u306b\u30ea\u30f3\u30af\u3057\u307e\u3057\u305f\"\n\n#: website/static/js/logActionsList_extract.js:247\nmsgid \"${user} unselected the My MinIO bucket ${bucket} in ${node}\"\nmsgstr \"${user}\u304c${node}\u306eMy MinIO\u30d0\u30b1\u30c3\u30c8(${bucket})\u306e\u9078\u629e\u3092\u89e3\u9664\u3057\u307e\u3057\u305f\"\n\n...\n</code></pre> <p>\u3053\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u8ffd\u52a0\u5f8c\u3001<code>assets</code>\u30b5\u30fc\u30d3\u30b9\u306e\u518d\u8d77\u52d5\u6642\u306b\u30e1\u30c3\u30bb\u30fc\u30b8\u5b9a\u7fa9\u304c\u53cd\u6620\u3055\u308c\u307e\u3059\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#\u30a2\u30c9\u30aa\u30f3\u306e\u30c6\u30b9\u30c8","title":"\u30a2\u30c9\u30aa\u30f3\u306e\u30c6\u30b9\u30c8","text":"<p>\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3067\u3001OSF.io\u306b\u8ffd\u52a0\u3057\u305fMy MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u30e6\u30cb\u30c3\u30c8\u30c6\u30b9\u30c8\u3092\u5b9f\u884c\u3067\u304d\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web invoke test_module -m addons/myminio/tests/\n</code></pre>"},{"location":"guides/storage-addon/README.legacy/#waterbutler\u3078\u306e\u5b9f\u88c5","title":"WaterButler\u3078\u306e\u5b9f\u88c5","text":""},{"location":"guides/storage-addon/README.legacy/#waterbutlerprovidersmyminio-\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9a\u7fa9","title":"waterbutler.providers.myminio \u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9a\u7fa9","text":"<p>Provider\u306e\u5b9f\u88c5\u4f8b(<code>waterbutler/provider/</code>) \u3092 <code>waterbutler/providers/myminio</code> \u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002\u307e\u305f\u3001Provider\u306e\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9\u4f8b(<code>waterbutler/tests</code>) \u3092 <code>tests/providers/myminio</code> \u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#rdm\u30b3\u30fc\u30c9\u306e\u5909\u66f4_1","title":"RDM\u30b3\u30fc\u30c9\u306e\u5909\u66f4","text":"<p>setup.py \u306b\u3001\u30a2\u30c9\u30aa\u30f3\u306e\u30a8\u30f3\u30c8\u30ea\u30dd\u30a4\u30f3\u30c8\u5b9a\u7fa9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002<code>setup()</code> \u95a2\u6570\u306e\u5f15\u6570 <code>entry_points</code> \u306b\u6307\u5b9a\u3059\u308bDictionary\u306e <code>waterbutler.providers</code> \u30ad\u30fc\u306b\u6307\u5b9a\u3059\u308b\u914d\u5217\u306b\u3001\u4ee5\u4e0b\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002</p> <pre><code>'myminio = waterbutler.providers.myminio:MyMinIOProvider',\n</code></pre> <p>\u5909\u66f4\u4f8b\u306f\u30b5\u30f3\u30d7\u30eb setup.py \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#docker-composeoverrideyml-\u306e\u8ffd\u52a0","title":"docker-compose.override.yml \u306e\u8ffd\u52a0","text":"<p>\u5909\u66f4\u3057\u305f\u30b3\u30fc\u30c9\u3092\u4f7f\u3046\u3088\u3046\u3001RDM\u306e <code>docker-compose.override.yml</code> \u3067 WaterButler \u306e\u30b5\u30fc\u30d3\u30b9\u306e <code>volumes</code> \u3092\u6307\u5b9a\u3057\u307e\u3059\u3002</p> <p>\u4f8b\u3048\u3070\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u968e\u5c64\u306e\u5834\u5408\u306f\u3001</p> <pre><code>.\n\u251c\u2500\u2500 RDM-osf.io\n\u2502\u00a0\u00a0 \u251c\u2500\u2500 docker-compose.override.yml\n\u2502\u00a0\u00a0 \u2514\u2500\u2500 docker-compose.yml\n\u2514\u2500\u2500 RDM-waterbutler\n</code></pre> <p><code>RDM-osf.io/docker-compose.override.yml</code> \u306e\u5185\u5bb9\u3092\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u3057\u307e\u3059\u3002</p> <pre><code>version: \"3.4\"\n\nservices:\n wb:\n volumes:\n - ../RDM-waterbutler:/code\n wb_worker:\n volumes:\n - ../RDM-waterbutler:/code\n wb_requirements:\n volumes:\n - ../RDM-waterbutler:/code\n</code></pre>"},{"location":"guides/storage-addon/README.legacy/#\u30a2\u30c9\u30aa\u30f3\u306e\u30c6\u30b9\u30c8_1","title":"\u30a2\u30c9\u30aa\u30f3\u306e\u30c6\u30b9\u30c8","text":"<p>\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3067\u3001WaterButler\u306b\u8ffd\u52a0\u3057\u305fMy MinIO\u30a2\u30c9\u30aa\u30f3 Provider\u306e\u30e6\u30cb\u30c3\u30c8\u30c6\u30b9\u30c8\u3092\u5b9f\u884c\u3067\u304d\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm wb invoke test --provider myminio\n</code></pre>"},{"location":"guides/storage-addon/README.legacy/#my-minio\u30a2\u30c9\u30aa\u30f3\u306e\u52d5\u4f5c\u78ba\u8a8d","title":"My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u52d5\u4f5c\u78ba\u8a8d","text":"<p>My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u52d5\u4f5c\u78ba\u8a8d\u3092\u3057\u3066\u307f\u307e\u3057\u3087\u3046\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#minio\u30b5\u30fc\u30d3\u30b9\u306e\u8d77\u52d5","title":"MinIO\u30b5\u30fc\u30d3\u30b9\u306e\u8d77\u52d5","text":"<p>\u63a5\u7d9a\u5148\u306eMinIO\u30b5\u30fc\u30d3\u30b9\u3092\u8d77\u52d5\u3057\u307e\u3059\u3002</p> <pre><code>docker run -p 9001:9000 \\\n -e \"MINIO_ACCESS_KEY=minioadmin\" \\\n -e \"MINIO_SECRET_KEY=minioadmin\" \\\n minio/minio server /data\n</code></pre> <p>RDM\u3068\u540c\u3058\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u3067\u5b9f\u884c\u3059\u308b\u5834\u5408\u30019000\u756a\u30dd\u30fc\u30c8\u304c\u7af6\u5408\u3057\u3066\u3057\u307e\u3046\u306e\u3067\u3001MinIO\u30b5\u30fc\u30d3\u30b9\u306e\u30db\u30b9\u30c8\u3078\u306e\u5272\u308a\u5f53\u3066\u30dd\u30fc\u30c8\u306f9001\u306a\u3069\u306b\u8a2d\u5b9a\u3057\u307e\u3059\u3002 <code>MINIO_ACCESS_KEY</code> \u3068 <code>MINIO_SECRET_KEY</code> \u306f\u8a8d\u8a3c\u306b\u4f7f\u3046\u30ad\u30fc\u3067\u3059\u3002\u9069\u5b9c\u66f8\u304d\u63db\u3048\u3066\u304f\u3060\u3055\u3044\u3002</p> <p>\u305d\u306e\u4ed6MinIO\u306b\u95a2\u3059\u308b\u8a73\u3057\u3044\u8aac\u660e\u306fMinIO\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#osfio-addon\u306e\u8a2d\u5b9a","title":"OSF.io Addon\u306e\u8a2d\u5b9a","text":"<p>OSF.io Addon\u306e\u8a2d\u5b9a\u3092\u3057\u307e\u3059\u3002 <code>addons/myminio/settings/local-dist.py</code> \u3092 <code>addons/myminio/settings/local.py</code> \u306b\u30b3\u30d4\u30fc\u3057\u3001 <code>HOST</code> \u30d7\u30ed\u30d1\u30c6\u30a3\u306b\u5148\u307b\u3069\u8d77\u52d5\u3057\u305fMinIO\u30b5\u30fc\u30d3\u30b9\u306e\u30db\u30b9\u30c8\u540d\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002</p> <pre><code>HOST = '192.168.168.167:9001'\n</code></pre> <p>RDM\u3068MinIO\u30b5\u30fc\u30d3\u30b9\u3092\u540c\u3058\u74b0\u5883\u3067\u5b9f\u884c\u3057\u3066\u3044\u308b\u5834\u5408\u306f\u3001\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u30a8\u30a4\u30ea\u30a2\u30b9\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#db\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3","title":"DB\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3","text":"<p>\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u3092\u5b9f\u884c\u3057\u3001Migrations\u5b9a\u7fa9\u3092PostgreSQL\u30b5\u30fc\u30d3\u30b9\u306b\u53cd\u6620\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose run --rm web python3 manage.py migrate\n</code></pre>"},{"location":"guides/storage-addon/README.legacy/#\u30b5\u30fc\u30d3\u30b9\u306e\u518d\u8d77\u52d5","title":"\u30b5\u30fc\u30d3\u30b9\u306e\u518d\u8d77\u52d5","text":"<p>WaterButler\u306b\u8ffd\u52a0\u3057\u305fProvider\u3092\u6709\u52b9\u306b\u3059\u308b\u305f\u3081\u306b\u3001 <code>wb_requirements</code> \u3092\u8d77\u52d5\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose up wb_requirements\n</code></pre> <p>\u5909\u66f4\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306b\u95a2\u9023\u3059\u308b\u30b5\u30fc\u30d3\u30b9\u3092\u518d\u8d77\u52d5\u3057\u307e\u3059\u3002</p> <pre><code>$ docker compose restart assets web api wb\n</code></pre> <p>\u3053\u308c\u3067\u30b5\u30fc\u30d3\u30b9\u3078\u306e\u53cd\u6620\u306f\u5b8c\u4e86\u3067\u3059\u3002</p>"},{"location":"guides/storage-addon/README.legacy/#\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u3092\u8a66\u3059","title":"\u30b9\u30c8\u30ec\u30fc\u30b8\u30a2\u30c9\u30aa\u30f3\u3092\u8a66\u3059","text":"<p>My MinIO\u30a2\u30c9\u30aa\u30f3\u3092\u8a66\u3059\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u64cd\u4f5c\u3092\u5b9f\u65bd\u3057\u307e\u3059\u3002</p> <ol> <li>RDM Web UI\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b <code>http://localhost:5000</code></li> <li>\u30e6\u30fc\u30b6\u8a2d\u5b9a\u30da\u30fc\u30b8\u3092\u958b\u304f</li> <li>Configure add-on accounts\u30da\u30fc\u30b8\u3092\u958b\u304f</li> <li>My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u8a8d\u8a3c\u60c5\u5831\u3092\u8a2d\u5b9a\u3092\u3059\u308b \u8a8d\u8a3c\u60c5\u5831\u306e\u8a2d\u5b9a\u30c0\u30a4\u30a2\u30ed\u30b0\u304c\u8868\u793a\u3055\u308c\u308b\u306e\u3067\u3001MinIO\u30b5\u30fc\u30d3\u30b9\u306e <code>MINIO_ACCESS_KEY</code> \u3068 <code>MINIO_SECRET_KEY</code> \u3092\u3001\u305d\u308c\u305e\u308c\u3001<code>Access Key</code> \u3068 <code>Secret Key</code> \u30d5\u30a9\u30fc\u30e0\u306b\u5165\u529b\u3057\u3066\u4fdd\u5b58\u3057\u307e\u3059\u3002 \u6210\u529f\u3059\u308c\u3070\u3001\u5207\u65ad\u30dc\u30bf\u30f3\u3068\u5229\u7528\u3057\u3066\u3044\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30ea\u30b9\u30c8\u304c\u8868\u793a\u3055\u308c\u308b\u30a8\u30ea\u30a2\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002 </li> <li>\u9069\u5f53\u306a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210\u3059\u308b</li> <li>Add-ons\u30da\u30fc\u30b8\u3092\u958b\u304f</li> <li>My MinIO\u30a2\u30c9\u30aa\u30f3\u3092\u6709\u52b9\u5316\u3059\u308b </li> <li>My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u8a2d\u5b9a\u3092\u3059\u308b <code>Import Account from Profile</code>\u30dc\u30bf\u30f3\u304b\u3089\u3001\u30a2\u30c9\u30aa\u30f3\u306e\u8a2d\u5b9a\u3092\u884c\u3044\u307e\u3059\u3002 \u63a5\u7d9a\u306b\u6210\u529f\u3059\u308b\u3068\u3001\u30eb\u30fc\u30c8\u76f4\u4e0b\u306e\u30d5\u30a9\u30eb\u30c0\u30ea\u30b9\u30c8\u304c\u8868\u793a\u3055\u308c\u308b\u306e\u3067\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u7d10\u4ed8\u3051\u308b\u30d5\u30a9\u30eb\u30c0\u3092\u9078\u629e\u3057\u3001\u4fdd\u5b58\u3057\u307e\u3059\u3002\u3053\u306e\u30da\u30fc\u30b8\u3067\u30d5\u30a9\u30eb\u30c0\u3092\u4f5c\u6210\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002 </li> </ol> <p>\u3053\u308c\u3067\u3001\u4f5c\u6210\u3057\u305f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067My MinIO\u30a2\u30c9\u30aa\u30f3\u304c\u4f7f\u3048\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3057\u305f\u3002 \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30da\u30fc\u30b8\u306eFiles \u30a6\u30a3\u30b8\u30a7\u30c3\u30c8\u3084Files\u30da\u30fc\u30b8\u304b\u3089\u3001My MinIO\u30b5\u30fc\u30d3\u30b9\u306b\u5bfe\u3057\u3066\u30d5\u30a9\u30eb\u30c0\u306e\u4f5c\u6210\u3084\u30d5\u30a1\u30a4\u30eb\u306e\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3001\u524a\u9664\u3001\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u306a\u3069\u304c\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308b\u306f\u305a\u3067\u3059\u3002</p> <p></p> <p>\u4ee5\u4e0a\u3067My MinIO\u30a2\u30c9\u30aa\u30f3\u306e\u52d5\u4f5c\u78ba\u8a8d\u306f\u5b8c\u4e86\u3067\u3059\uff01</p>"},{"location":"handoff/","title":"Hand-off Records / \u5f15\u7d99\u304e\u8a18\u9332","text":"<p>Summary: Requests to other teams or agents: each record is a dated file named YYYY-MM-DD_.md. Hand-offs may request review, merge approval, or other actions from external teams. <strong>\u6982\u8981:</strong> \u4ed6\u306e\u30c1\u30fc\u30e0\u3084\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3078\u306e\u4f9d\u983c\uff1a\u5404\u8a18\u9332\u306f\u65e5\u4ed8\u4ed8\u304d\u30d5\u30a1\u30a4\u30eb\u3001YYYY-MM-DD_<Title>.md \u306e\u5f62\u5f0f\u3002\u5f15\u7d99\u304e\u306f\u30ec\u30d3\u30e5\u30fc\u3001\u30de\u30fc\u30b8\u627f\u8a8d\u3001\u305d\u306e\u4ed6\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u5916\u90e8\u30c1\u30fc\u30e0\u306b\u4f9d\u983c\u3059\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002</p> </blockquote> <p><strong>Jump:</strong> <a href=\"#english\">English</a> \u00b7 <a href=\"#japanese\">\u65e5\u672c\u8a9e</a></p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. <strong>Learned:</strong> without a hand-off record, it was unclear what was requested of Codex Astra; naming convention makes the request searchable and trackable. \uff0f \u5f15\u7d99\u304e\u8a18\u9332\u304c\u306a\u3051\u308c\u3070\u3001Codex Astra \u306b\u4f55\u3092\u4f9d\u983c\u3057\u305f\u304b\u5206\u304b\u3089\u305a\u3001\u547d\u540d\u898f\u5247\u3067\u8981\u6c42\u304c\u691c\u7d22\u53ef\u80fd\u3067\u8ffd\u8de1\u53ef\u80fd\u306b\u306a\u308b\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Normative for: Hand-off records naming convention, review record naming.</li> <li>Related: <a href=\"../\">../README.md</a> \u00b7 <a href=\"../reviews/\">reviews/</a> \u00b7 <a href=\"../status/\">status/</a></li> </ul> <hr /> <p><a id=\"english\"></a></p> <h2 id=\"english\">English<a class=\"headerlink\" href=\"#english\" title=\"Permanent link\">\u00b6</a></h2> <p><a href=\"#japanese\">\u2192 \u65e5\u672c\u8a9e\u7248\u3078</a></p> <h3 id=\"1-what-belongs-here\">1. What belongs here<a class=\"headerlink\" href=\"#1-what-belongs-here\" title=\"Permanent link\">\u00b6</a></h3> <p>A <em>hand-off</em> is a request to another team or agent. This folder contains:</p> <table> <thead> <tr> <th>Type</th> <th>Naming convention</th> <th>Description</th> </tr> </thead> <tbody> <tr> <td>Hand-off</td> <td><code>YYYY-MM-DD_<Title>.md</code></td> <td>Request to external team (review, merge, deploy).</td> </tr> <tr> <td>Review</td> <td><code>YYYY-MM-DD_<Title>_rN.md</code></td> <td>Review record written by REV (Codex Astra).</td> </tr> </tbody> </table> <h3 id=\"2-open-items-no-entries-yet--\u307e\u3060\u3042\u308a\u307e\u305b\u3093\">2. Open items (no entries yet / \u307e\u3060\u3042\u308a\u307e\u305b\u3093)<a class=\"headerlink\" href=\"#2-open-items-no-entries-yet--\u307e\u3060\u3042\u308a\u307e\u305b\u3093\" title=\"Permanent link\">\u00b6</a></h3> <table> <thead> <tr> <th>Date</th> <th>Title</th> <th>Requested by</th> <th>Status</th> </tr> </thead> <tbody> <tr> <td>\u2014</td> <td>\u2014</td> <td>\u2014</td> <td>\u2014</td> </tr> </tbody> </table> <h3 id=\"3-creating-a-new-hand-off-record\">3. Creating a new hand-off record<a class=\"headerlink\" href=\"#3-creating-a-new-hand-off-record\" title=\"Permanent link\">\u00b6</a></h3> <ol> <li>Name the file <code>YYYY-MM-DD_<Title>.md</code>.</li> <li>Describe: what is ready, who should review, what decision is needed.</li> <li>Link to related PRs and documents.</li> <li>Assign the hand-off to the appropriate team (REV, owner, deployment).</li> </ol> <hr /> <p><a id=\"japanese\"></a></p> <h2 id=\"\u65e5\u672c\u8a9e\">\u65e5\u672c\u8a9e<a class=\"headerlink\" href=\"#\u65e5\u672c\u8a9e\" title=\"Permanent link\">\u00b6</a></h2> <p><a href=\"#english\">\u2192 To English</a></p> <h3 id=\"1-\u3053\u3053\u306b\u5c5e\u3059\u308b\u3082\u306e\">1. \u3053\u3053\u306b\u5c5e\u3059\u308b\u3082\u306e<a class=\"headerlink\" href=\"#1-\u3053\u3053\u306b\u5c5e\u3059\u308b\u3082\u306e\" title=\"Permanent link\">\u00b6</a></h3> <p>\u300c\u5f15\u7d99\u304e\u300d\u306f\u4ed6\u306e\u30c1\u30fc\u30e0\u3084\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3078\u306e\u4f9d\u983c\u3067\u3059\u3002\u3053\u306e\u30d5\u30a9\u30eb\u30c0\u306b\u306f\u6b21\u304c\u542b\u307e\u308c\u307e\u3059\uff1a</p> <table> <thead> <tr> <th>\u7a2e\u5225</th> <th>\u547d\u540d\u898f\u5247</th> <th>\u8aac\u660e</th> </tr> </thead> <tbody> <tr> <td>\u5f15\u7d99\u304e</td> <td><code>YYYY-MM-DD_<Title>.md</code></td> <td>\u5916\u90e8\u30c1\u30fc\u30e0\u3078\u306e\u4f9d\u983c\uff08\u30ec\u30d3\u30e5\u30fc\u3001\u30de\u30fc\u30b8\u3001\u914d\u5099\uff09\u3002</td> </tr> <tr> <td>\u30ec\u30d3\u30e5\u30fc</td> <td><code>YYYY-MM-DD_<Title>_rN.md</code></td> <td>REV\uff08Codex Astra\uff09\u304c\u66f8\u304f\u30ec\u30d3\u30e5\u30fc\u8a18\u9332\u3002</td> </tr> </tbody> </table> <h3 id=\"2-\u672a\u89e3\u6c7a\u9805\u76ee\u307e\u3060\u3042\u308a\u307e\u305b\u3093--no-entries-yet\">2. \u672a\u89e3\u6c7a\u9805\u76ee\uff08\u307e\u3060\u3042\u308a\u307e\u305b\u3093 / no entries yet\uff09<a class=\"headerlink\" href=\"#2-\u672a\u89e3\u6c7a\u9805\u76ee\u307e\u3060\u3042\u308a\u307e\u305b\u3093--no-entries-yet\" title=\"Permanent link\">\u00b6</a></h3> <table> <thead> <tr> <th>\u65e5\u4ed8</th> <th>\u30bf\u30a4\u30c8\u30eb</th> <th>\u4f9d\u983c\u8005</th> <th>\u30b9\u30c6\u30fc\u30bf\u30b9</th> </tr> </thead> <tbody> <tr> <td>\u2014</td> <td>\u2014</td> <td>\u2014</td> <td>\u2014</td> </tr> </tbody> </table> <h3 id=\"3-\u65b0\u3057\u3044\u5f15\u7d99\u304e\u8a18\u9332\u3092\u3064\u304f\u308b\u306b\u306f\">3. \u65b0\u3057\u3044\u5f15\u7d99\u304e\u8a18\u9332\u3092\u3064\u304f\u308b\u306b\u306f<a class=\"headerlink\" href=\"#3-\u65b0\u3057\u3044\u5f15\u7d99\u304e\u8a18\u9332\u3092\u3064\u304f\u308b\u306b\u306f\" title=\"Permanent link\">\u00b6</a></h3> <ol> <li>\u30d5\u30a1\u30a4\u30eb\u540d\u3092 <code>YYYY-MM-DD_<Title>.md</code> \u306b\u3059\u308b\u3002</li> <li>\u8a18\u8ff0\uff1a\u3044\u3064\u6e96\u5099\u304c\u3067\u304d\u3066\u3044\u308b\u304b\u3001\u8ab0\u304c\u30ec\u30d3\u30e5\u30fc\u3059\u3079\u304d\u304b\u3001\u3069\u306e\u3088\u3046\u306a\u6c7a\u65ad\u304c\u5fc5\u8981\u304b\u3002</li> <li>\u95a2\u9023\u3059\u308b PR \u3068\u6587\u66f8\u3078\u30ea\u30f3\u30af\u3059\u308b\u3002</li> <li>\u5f15\u7d99\u304e\u3092\u9069\u5207\u306a\u30c1\u30fc\u30e0\uff08REV\u3001\u6240\u6709\u8005\u3001\u914d\u5099\uff09\u306b\u5272\u308a\u5f53\u3066\u308b\u3002</li> </ol> <hr /> <h2 id=\"glossary--\u7528\u8a9e\">Glossary / \u7528\u8a9e<a class=\"headerlink\" href=\"#glossary--\u7528\u8a9e\" title=\"Permanent link\">\u00b6</a></h2> <table> <thead> <tr> <th>Term</th> <th>English note</th> <th>\u65e5\u672c\u8a9e\u6ce8</th> </tr> </thead> <tbody> <tr> <td>Hand-off</td> <td>A request to another team or agent.</td> <td>\u4ed6\u306e\u30c1\u30fc\u30e0\u3084\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3078\u306e\u4f9d\u983c\u3002</td> </tr> <tr> <td>Record</td> <td>A document that captures an event or request.</td> <td>\u30a4\u30d9\u30f3\u30c8\u3084\u8981\u6c42\u3092\u8a18\u9332\u3059\u308b\u6587\u66f8\u3002</td> </tr> <tr> <td>Review</td> <td>An independent assessment of a pull request.</td> <td>\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u72ec\u7acb\u3057\u305f\u8a55\u4fa1\u3002</td> </tr> <tr> <td>Merge approval</td> <td>Permission from the owner to merge a PR.</td> <td>PR \u3092\u30de\u30fc\u30b8\u3059\u308b\u305f\u3081\u306e\u6240\u6709\u8005\u306e\u627f\u8a8d\u3002</td> </tr> <tr> <td>Deploy</td> <td>Release a version to production.</td> <td>\u672c\u756a\u74b0\u5883\u3078\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u30ea\u30ea\u30fc\u30b9\u3002</td> </tr> </tbody> </table>"},{"location":"policy/","title":"Policy / \u65b9\u91dd","text":"<p>Summary: Documents stating our position on what we will and will not do: developer environment goals, security stance, human/AI responsibilities. Each document states our position on a topic; specifications implement the stance. \u6982\u8981: \u6211\u3005\u304c\u4f55\u3092\u3057\u3001\u4f55\u3092\u3057\u306a\u3044\u304b\u306e\u7acb\u5834\u3092\u8ff0\u3079\u308b\u6587\u66f8\uff1a\u958b\u767a\u74b0\u5883\u306e\u30b4\u30fc\u30eb\u3001\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u59ff\u52e2\u3001\u4eba\u3068 AI \u306e\u8cac\u4efb\u3002\u5404\u6587\u66f8\u306f\u30c8\u30d4\u30c3\u30af\u306b\u95a2\u3059\u308b\u79c1\u305f\u3061\u306e\u7acb\u5834\u3092\u8ff0\u3079\u3001\u4ed5\u69d8\u304c\u305d\u306e\u7acb\u5834\u3092\u5b9f\u88c5\u3057\u307e\u3059\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: writing the stance down first showed that \"public documentation, private code\" is not a detail but the rule every other document depends on. \uff0f \u7acb\u5834\u3092\u5148\u306b\u66f8\u3044\u3066\u307f\u308b\u3068\u3001\u300c\u6587\u66f8\u306f\u516c\u958b\u3001\u30b3\u30fc\u30c9\u306f\u975e\u516c\u958b\u300d\u304c\u7d30\u90e8\u3067\u306f\u306a\u304f\u4ed6\u306e\u5168\u6587\u66f8\u306e\u524d\u63d0\u3060\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Normative for: POL-01 Position and future policy documents.</li> <li>Related: ../README.md \u00b7 ../spec/ \u00b7 decisions/ \u00b7 reference/REF-01_Glossary.md</li> </ul> <p></p>"},{"location":"policy/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"policy/#1-what-belongs-here","title":"1. What belongs here","text":"<p>A policy is the position we take. This folder contains:</p> File Purpose POL-01_Developer_Environment_2027_Position.md Our stance on why and how we build the developer environment 2027. <p>Future policies may include:</p> Topic Description POL-02 Folder and file naming rules POL-03 Pull request rules POL-04 Release process POL-05 Human/AI responsibilities"},{"location":"policy/#2-how-policies-relate-to-other-documents","title":"2. How policies relate to other documents","text":"<pre><code>flowchart TD\n P[Policy: position on a topic] --> S[Spec: rules to implement]\n P --> A[Decision record: why we chose this]\n S --> C[Code: implement the rule]\n A --> C</code></pre>"},{"location":"policy/#3-creating-a-new-policy","title":"3. Creating a new policy","text":"<ol> <li>Name the file <code>POL-NN_<Title>.md</code> (two-digit number).</li> <li>Follow SPEC-06 documentation conventions.</li> <li>Link to other documents that depend on this policy.</li> <li>The owner approves; AID writes the implementation spec.</li> </ol>"},{"location":"policy/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"policy/#1-\u3053\u3053\u306b\u5c5e\u3059\u308b\u3082\u306e","title":"1. \u3053\u3053\u306b\u5c5e\u3059\u308b\u3082\u306e","text":"<p>\u300c\u65b9\u91dd\u300d\u306f\u79c1\u305f\u3061\u306e\u7acb\u5834\u3092\u66f8\u3044\u305f\u3082\u306e\u3067\u3059\u3002\u3053\u306e\u30d5\u30a9\u30eb\u30c0\u306b\u306f\u6b21\u304c\u542b\u307e\u308c\u307e\u3059\uff1a</p> \u30d5\u30a1\u30a4\u30eb \u76ee\u7684 POL-01_Developer_Environment_2027_Position.md \u958b\u767a\u74b0\u5883 2027 \u7248\u3092\u3001\u306a\u305c\u30fb\u3069\u306e\u3088\u3046\u306b\u4f5c\u308b\u304b\u306e\u7acb\u5834\u3002 <p>\u4eca\u5f8c\u306e\u65b9\u91dd\u3068\u3057\u3066\u4ee5\u4e0b\u304c\u8003\u3048\u3089\u308c\u307e\u3059\uff1a</p> \u30c8\u30d4\u30c3\u30af \u8aac\u660e POL-02 \u30d5\u30a9\u30eb\u30c0\u3068\u30d5\u30a1\u30a4\u30eb\u547d\u540d\u898f\u5247 POL-03 \u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u898f\u5247 POL-04 \u30ea\u30ea\u30fc\u30b9\u30d7\u30ed\u30bb\u30b9 POL-05 \u4eba\u3068 AI \u306e\u8cac\u4efb"},{"location":"policy/#2-\u65b9\u91dd\u304c\u4ed6\u306e\u6587\u66f8\u3068\u3069\u3046\u95a2\u4fc2\u3059\u308b\u304b","title":"2. \u65b9\u91dd\u304c\u4ed6\u306e\u6587\u66f8\u3068\u3069\u3046\u95a2\u4fc2\u3059\u308b\u304b","text":"<pre><code>flowchart TD\n P[\u65b9\u91dd\uff1a\u30c8\u30d4\u30c3\u30af\u306b\u95a2\u3059\u308b\u7acb\u5834] --> S[\u4ed5\u69d8\uff1a\u5b9f\u88c5\u3059\u308b\u30eb\u30fc\u30eb]\n P --> A[\u6c7a\u5b9a\u306e\u8a18\u9332\uff1a\u306a\u305c\u3053\u306e\u9053\u3092\u9078\u3093\u3060\u304b]\n S --> C[\u30b3\u30fc\u30c9\uff1a\u30eb\u30fc\u30eb\u3092\u5b9f\u88c5]\n A --> C</code></pre>"},{"location":"policy/#3-\u65b0\u3057\u3044\u65b9\u91dd\u3092\u4f5c\u308b\u306b\u306f","title":"3. \u65b0\u3057\u3044\u65b9\u91dd\u3092\u4f5c\u308b\u306b\u306f","text":"<ol> <li>\u30d5\u30a1\u30a4\u30eb\u540d\u3092 <code>POL-NN_<\u984c>.md</code>\uff082 \u6841\u306e\u756a\u53f7\uff09\u306b\u3059\u308b\u3002</li> <li>SPEC-06 \u6587\u66f8\u898f\u7d04\u306b\u5f93\u3046\u3002</li> <li>\u3053\u306e\u65b9\u91dd\u306b\u4f9d\u5b58\u3059\u308b\u4ed6\u306e\u6587\u66f8\u3078\u30ea\u30f3\u30af\u3059\u308b\u3002</li> <li>\u6240\u6709\u8005\u304c\u627f\u8a8d\uff1bAID \u304c\u5b9f\u88c5\u4ed5\u69d8\u3092\u66f8\u304f\u3002</li> </ol>"},{"location":"policy/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Policy A statement of our position on what we will and will not do. \u6211\u3005\u304c\u4f55\u3092\u3057\u3001\u4f55\u3092\u3057\u306a\u3044\u304b\u306e\u7acb\u5834\u3002 Spec A rule book that implementers must follow. \u5b9f\u88c5\u3059\u308b\u4eba\u304c\u5b88\u308b\u30eb\u30fc\u30eb\u30d6\u30c3\u30af\u3002 Decision record (ADR) A note explaining why we chose one way and not another. \u306a\u305c\u305d\u306e\u9053\u3092\u9078\u3073\u3001\u307b\u304b\u3092\u9078\u3070\u306a\u304b\u3063\u305f\u304b\u306e\u30e1\u30e2\u3002 Implementation Writing code that follows the spec. \u4ed5\u69d8\u306b\u5f93\u3063\u3066\u30b3\u30fc\u30c9\u3092\u66f8\u304f\u3053\u3068\u3002 Owner The human who approves policies. \u65b9\u91dd\u3092\u627f\u8a8d\u3059\u308b\u4eba\u3002"},{"location":"policy/POL-01_Developer_Environment_2027_Position/","title":"POL-01 Position on the Developer Environment 2027 / \u958b\u767a\u74b0\u5883 2027 \u7248\u306e\u4f4d\u7f6e\u3065\u3051","text":"<p>Summary: Our stance on why and how we build the GakuNin RDM developer environment 2027: one-shot, multi-architecture, security-first, kept alive by AI agents with humans deciding merge and publication, documented in public while integration code stays private. \u6982\u8981: GakuNin RDM \u306e\u958b\u767a\u74b0\u5883 2027 \u7248\u3092\u3001\u306a\u305c\u30fb\u3069\u306e\u3088\u3046\u306b\u4f5c\u308b\u304b\u306e\u7acb\u5834\u3002\u4e00\u767a\u5c0e\u5165\u3001\u8907\u6570\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3\u3001\u5b89\u5168\u7b2c\u4e00\u3001AI \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u304c\u4fdd\u3061\u3001\u30de\u30fc\u30b8\u3068\u516c\u958b\u306f\u4eba\u304c\u6c7a\u3081\u308b\u3002\u6587\u66f8\u306f\u516c\u958b\u3057\u3001\u7d71\u5408\u30b3\u30fc\u30c9\u306f\u975e\u516c\u958b\u306b\u7f6e\u304f\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: writing the stance down first showed that \"public documentation, private code\" is not a detail but the rule every other document depends on, because this repository is read abroad and must never carry private code. \uff0f \u7acb\u5834\u3092\u5148\u306b\u66f8\u3044\u3066\u307f\u308b\u3068\u3001\u300c\u6587\u66f8\u306f\u516c\u958b\u3001\u30b3\u30fc\u30c9\u306f\u975e\u516c\u958b\u300d\u304c\u7d30\u90e8\u3067\u306f\u306a\u304f\u4ed6\u306e\u5168\u6587\u66f8\u306e\u524d\u63d0\u3060\u3068\u5206\u304b\u3063\u305f\u3002\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306f\u6d77\u5916\u304b\u3089\u3082\u8aad\u307e\u308c\u3001\u975e\u516c\u958b\u306e\u30b3\u30fc\u30c9\u3092\u4e00\u7247\u3067\u3082\u7f6e\u3051\u306a\u3044\u304b\u3089\u3067\u3042\u308b\u3002</li> <li>Applies to: everything under this repository and the integration repositories named <code>RDM-<name>-dev2027</code>.</li> <li>Related: docs/README.md \u00b7 SPEC-00 Overview \u00b7 SPEC-01 Manifest \u00b7 SPEC-02 Installer CLI \u00b7 SPEC-03 Security Gate \u00b7 SPEC-04 Acceptance Tests \u00b7 SPEC-05 Upstream Tracking \u00b7 SPEC-06 Documentation Conventions \u00b7 ADR-01 \u00b7 ADR-02 \u00b7 ADR-03 \u00b7 ADR-04 \u00b7 REF-01 Glossary</li> </ul> <p></p>"},{"location":"policy/POL-01_Developer_Environment_2027_Position/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"policy/POL-01_Developer_Environment_2027_Position/#1-why-this-policy-exists","title":"1. Why this policy exists","text":"<p>GakuNin RDM is the research data management service of NII, built on OSF (the Open Science Framework, a web service for sharing research projects, made by COS, the Center for Open Science in the United States). Our copies of the OSF code live in GitHub repositories (a repository is a folder whose every change is remembered, so you can always go back) owned by the RCOSDP organization. There are six public core repositories, six <code>-private</code> security-verified versions of them, and five private subsystems. Today nobody can install all of them together in one step, and the base images they run on reached EOL (end of life: the makers no longer fix bugs or security holes in them).</p> <p>A policy is the position we take. This one says what the \"developer environment 2027\" is for, what we will and will not do, and where every piece lives. Rules for implementers are in the specifications; the reasons behind individual choices are in the decision records.</p>"},{"location":"policy/POL-01_Developer_Environment_2027_Position/#2-our-stance","title":"2. Our stance","text":"<ol> <li>Goal. One command installs a developer environment that combines the public core <code>develop</code> branches, the <code>-private</code> security versions, and the subsystems, on macOS (Apple Silicon), Ubuntu 24.04 (amd64 and arm64) and Windows 11 with WSL2. It can be handed to partners abroad. AI agents (programs that read, write and test code on their own, under rules we set) keep it secure, so GakuNin RDM continues even if COS stops maintaining OSF.</li> <li>Modernize rather than tolerate. When an old library or base image carries known vulnerabilities (weak spots an attacker could use), we move to a current version, even when that takes longer. We do not ship a known hole because fixing it is work.</li> <li>Remove vulnerabilities until top-tier AI attackers fail. The bar is not \"no scanner warnings\" but \"an approved AI red team (a team whose job is to attack our own system, in an isolated network, to find holes before real attackers do) finds no unresolved way in\". We reach that bar in stages through a security gate (a checkpoint the build must pass before anyone may use it), defined in SPEC-03 and ADR-03: report-only at first, stop on HIGH at M4, zero CRITICAL/HIGH plus red-team pass at M5.</li> <li>Humans decide; AI does the work. AI detects, fixes, reviews and tests. A human decides to merge (accept a change into the shared branch), to publish, and to grant exceptions. No AI merges its own work, and no author accepts their own change. Details in ADR-04.</li> <li>This repository is public and holds no code from private sources. It contains documentation, the manifest (a list naming each upstream repository and the exact SHA, the fingerprint of one commit, that we build from) and the installer (the program that sets everything up). Integration code lives in private repositories named <code>RDM-<name>-dev2027</code>. We name them in text but never link to them by URL. Secret scanning in CI (continuous integration: automatic checks that run on every change) is mandatory.</li> <li>Documents are bilingual and newcomer-readable. English first, Japanese second, on the same page, with glossary notes on every technical term the first time it appears. Rules in SPEC-06; shared terms in REF-01.</li> <li>Relationship to upstream policies. This repository is GRDM-specific. The cross-cutting canon \u2014 the charter, folder rules (POL-02), human/AI responsibilities (POL-05), pull request rules (SPEC-10) and installer form (SPEC-11) \u2014 stays in <code>RDM-grdm-core-test</code> and <code>niirdcplus</code>. We link to it and never copy it, so there is only one place to fix a rule.</li> <li>Role model and write boundary. Roles use the three-letter codes of the owning team: AID (AI developer: Orca Open Code 2 workers on a local LLM), QAE (QA engineer: Claude Code Fable), REV (reviewer: Codex Astra), and the owner for policy, acceptance, merge and publication. The agents working on this plan may write only to this repository and to newly created <code>RDM-<name>-dev2027</code> repositories. They never write to existing upstream repositories, never delete a repository or branch, and never force-push (overwrite shared history).</li> </ol>"},{"location":"policy/POL-01_Developer_Environment_2027_Position/#3-where-things-live","title":"3. Where things live","text":"<pre><code>flowchart LR\n subgraph PUBLIC[\"Public (RCOSDP)\"]\n DG[\"RDM-developer-guide<br/>docs/ \u00b7 manifest/ \u00b7 installer/<br/>names + SHAs only\"]\n CORE[\"6 public cores<br/>RDM-osf.io, RDM-waterbutler, RDM-modular-file-renderer,<br/>RDM-ember-osf-web, RDM-cas-overlay, RDM-wiki-frontend\"]\n CANON[\"Cross-cutting canon<br/>RDM-grdm-core-test \u00b7 niirdcplus<br/>(POL-02, POL-05, SPEC-10, SPEC-11)\"]\n end\n subgraph PRIVATE[\"Private (RCOSDP)\"]\n PRIV[\"6 -private security versions<br/>+ 5 private subsystems\"]\n DEV[\"RDM-&lt;name&gt;-dev2027 \u00d7 11<br/>develop = integration<br/>upstream/* tracking branches\"]\n end\n COS[\"CenterForOpenScience/*<br/>(reference tracking only)\"]\n CORE -->|\"upstream/public-<branch>\"| DEV\n PRIV -->|\"upstream/private-<branch>\"| DEV\n COS -->|\"upstream/cos-develop\"| DEV\n DEV -->|\"SHA recorded in manifest\"| DG\n CANON -.->|\"linked, never copied\"| DG\n DG -->|\"installer builds from SHAs\"| LOCAL[\"Developer machine<br/>127.0.0.1 only, non-root\"]</code></pre> <p>Read the picture from left to right: upstream code flows into the private integration repositories; only names and SHAs flow into this public repository; the installer on a developer machine builds from those SHAs.</p>"},{"location":"policy/POL-01_Developer_Environment_2027_Position/#4-milestone-ladder","title":"4. Milestone ladder","text":"<p>The canonical plan is kept by the owner; the excerpt is in TOON (a compact text form of JSON that people and AI both read easily).</p> <pre><code>milestones[5]{id,goal,gate,proof}:\n M1,\"docs skeleton, manifest, 11 dev2027 integration repos\",\"report-only scan, allow-list recorded\",\"Codex-reviewed PR merged to develop\"\n M2,\"6 cores install in one shot on Mac Studio (arm64); amd64 build passes\",\"report-only, allow-list count recorded\",\"Playwright acceptance: login, project, file up/down, wiki co-edit, preview, institution admin; success + rejection\"\n M3,\"5 subsystems start (y-websocket, OASys, Shibboleth-SP + test IdP, rdmcp, aipf_mcp_data_grdm)\",\"allow-list smaller than M2\",\"one success + one rejection case per subsystem\"\n M4,\"waterbutler, mfr, osf.io on Python 3.13\",\"install stops on HIGH or above; first AI red team\",\"regression of M2/M3 acceptance passes\"\n M5,\"ES2 and mongo 3.4 retired; ES8 and PostgreSQL 15+\",\"zero CRITICAL/HIGH; AI red team finds no unresolved path\",\"distributable abroad; licenses settled\"\nsteady_state:\n daily: \"upstream mirror, diff report, CVE scan\"\n weekly: \"AI integration PR \u2192 Codex review \u2192 regression and acceptance\"\n human_only: \"merge, publish, exceptions\"</code></pre> <p>Deadlines are set by the owner when each milestone starts.</p>"},{"location":"policy/POL-01_Developer_Environment_2027_Position/#5-what-we-will-not-do","title":"5. What we will not do","text":"<ul> <li>We will not keep the loopback alias <code>192.168.168.167</code> that needed <code>sudo</code> (administrator rights) and exposed services to the local network. See ADR-02.</li> <li>We will not place private code, secrets, or private repository URLs in this repository.</li> <li>We will not let an AI merge or publish, nor let an author accept their own change.</li> <li>We will not copy the upstream charter or policies here; we link.</li> <li>We will not push images built from <code>-private</code> code to a public registry.</li> </ul>"},{"location":"policy/POL-01_Developer_Environment_2027_Position/#6-how-this-policy-is-used","title":"6. How this policy is used","text":"<p>Specifications (SPEC-00 to SPEC-06) implement this stance. Decision records (ADR-01 to ADR-04) explain the individual choices. When a specification and this policy disagree, fix both in one commit and record what was learned in the version line.</p> <p></p>"},{"location":"policy/POL-01_Developer_Environment_2027_Position/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"policy/POL-01_Developer_Environment_2027_Position/#1-\u306a\u305c\u3053\u306e\u65b9\u91dd\u304c\u3042\u308b\u306e\u304b","title":"1. \u306a\u305c\u3053\u306e\u65b9\u91dd\u304c\u3042\u308b\u306e\u304b","text":"<p>GakuNin RDM \u306f NII \u306e\u7814\u7a76\u30c7\u30fc\u30bf\u7ba1\u7406\u30b5\u30fc\u30d3\u30b9\u3067\u3001OSF\uff08Open Science Framework\u3002\u7814\u7a76\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u5171\u6709\u3059\u308b Web \u30b5\u30fc\u30d3\u30b9\u3002\u7c73\u56fd\u306e COS = Center for Open Science \u304c\u4f5c\u3063\u305f\uff09\u3092\u571f\u53f0\u306b\u3057\u3066\u3044\u307e\u3059\u3002OSF \u306e\u30b3\u30fc\u30c9\u306e\u79c1\u305f\u3061\u306e\u5199\u3057\u306f\u3001RCOSDP \u3068\u3044\u3046 GitHub \u306e\u7d44\u7e54\u304c\u6301\u3064\u300c\u30ea\u30dd\u30b8\u30c8\u30ea\u300d\uff08\u5909\u66f4\u3092\u5168\u90e8\u899a\u3048\u3066\u3044\u308b\u30d5\u30a9\u30eb\u30c0\u3002\u3044\u3064\u3067\u3082\u524d\u306b\u623b\u305b\u308b\uff09\u306b\u3042\u308a\u307e\u3059\u3002\u516c\u958b\u30b3\u30a2\u304c 6 \u672c\u3001\u305d\u308c\u306b\u5bfe\u5fdc\u3059\u308b <code>-private</code> \u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u691c\u8a3c\u7248\u304c 6 \u672c\u3001\u975e\u516c\u958b\u306e\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\u304c 5 \u672c\u3067\u3059\u3002\u3044\u307e\u3001\u3053\u308c\u3089\u5168\u90e8\u3092\u4e00\u5ea6\u306b\u5c0e\u5165\u3059\u308b\u624b\u6bb5\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u3057\u304b\u3082\u52d5\u304b\u3057\u3066\u3044\u308b\u571f\u53f0\u306e\u30a4\u30e1\u30fc\u30b8\u306f\u5168\u90e8 EOL\uff08end of life\u3002\u4f5c\u3063\u305f\u4eba\u304c\u30d0\u30b0\u3084\u7a74\u3092\u76f4\u3057\u3066\u304f\u308c\u306a\u304f\u306a\u3063\u305f\u72b6\u614b\uff09\u3067\u3059\u3002</p> <p>\u300c\u65b9\u91dd\u300d\u306f\u79c1\u305f\u3061\u306e\u7acb\u5834\u3092\u66f8\u3044\u305f\u3082\u306e\u3067\u3059\u3002\u3053\u306e\u65b9\u91dd\u306f\u3001\u300c\u958b\u767a\u74b0\u5883 2027 \u7248\u300d\u304c\u4f55\u306e\u305f\u3081\u306b\u3042\u308a\u3001\u4f55\u3092\u3057\u3001\u4f55\u3092\u305b\u305a\u3001\u305d\u308c\u305e\u308c\u306e\u90e8\u54c1\u304c\u3069\u3053\u306b\u7f6e\u304b\u308c\u308b\u304b\u3092\u8ff0\u3079\u307e\u3059\u3002\u5b9f\u88c5\u3059\u308b\u4eba\u304c\u5b88\u308b\u898f\u5247\u306f\u4ed5\u69d8\u306b\u3001\u500b\u3005\u306e\u9078\u629e\u306e\u7406\u7531\u306f\u6c7a\u5b9a\u306e\u8a18\u9332\u306b\u3042\u308a\u307e\u3059\u3002</p>"},{"location":"policy/POL-01_Developer_Environment_2027_Position/#2-\u79c1\u305f\u3061\u306e\u7acb\u5834","title":"2. \u79c1\u305f\u3061\u306e\u7acb\u5834","text":"<ol> <li>\u30b4\u30fc\u30eb\u3002 \u4e00\u3064\u306e\u30b3\u30de\u30f3\u30c9\u3067\u3001\u516c\u958b\u30b3\u30a2\u306e <code>develop</code>\u3001<code>-private</code> \u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u7248\u3001\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\u3092\u91cd\u306d\u305f\u958b\u767a\u74b0\u5883\u304c\u3001macOS\uff08Apple Silicon\uff09\u3001Ubuntu 24.04\uff08amd64 \u3068 arm64\uff09\u3001Windows 11 \u306e WSL2 \u306b\u5165\u308a\u307e\u3059\u3002\u6d77\u5916\u306e\u5354\u529b\u8005\u306b\u3082\u6e21\u305b\u307e\u3059\u3002AI \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\uff08\u79c1\u305f\u3061\u306e\u6c7a\u3081\u305f\u898f\u5247\u306e\u3082\u3068\u3067\u3001\u81ea\u5206\u3067\u30b3\u30fc\u30c9\u3092\u8aad\u307f\u30fb\u66f8\u304d\u30fb\u8a66\u3059\u30d7\u30ed\u30b0\u30e9\u30e0\uff09\u304c\u5b89\u5168\u306b\u4fdd\u3061\u3001COS \u304c OSF \u306e\u4fdd\u5b88\u3092\u3084\u3081\u3066\u3082 GakuNin RDM \u3092\u7d9a\u3051\u3089\u308c\u307e\u3059\u3002</li> <li>\u6211\u6162\u305b\u305a\u6700\u65b0\u5316\u3059\u308b\u3002 \u53e4\u3044\u30e9\u30a4\u30d6\u30e9\u30ea\u3084\u571f\u53f0\u306e\u30a4\u30e1\u30fc\u30b8\u306b\u65e2\u77e5\u306e\u300c\u8106\u5f31\u6027\u300d\uff08\u653b\u6483\u8005\u304c\u4f7f\u3048\u308b\u5f31\u3044\u5834\u6240\uff09\u304c\u3042\u308c\u3070\u3001\u6642\u9593\u304c\u304b\u304b\u3063\u3066\u3082\u73fe\u884c\u7248\u3078\u79fb\u308a\u307e\u3059\u3002\u76f4\u3059\u306e\u304c\u5927\u5909\u3060\u304b\u3089\u3068\u3044\u3063\u3066\u3001\u65e2\u77e5\u306e\u7a74\u3092\u6b8b\u3057\u3066\u51fa\u8377\u3057\u307e\u305b\u3093\u3002</li> <li>\u6700\u4e0a\u4f4d\u306e AI \u653b\u6483\u8005\u304c\u5931\u6557\u3059\u308b\u307e\u3067\u8106\u5f31\u6027\u3092\u9664\u304f\u3002 \u57fa\u6e96\u306f\u300c\u30b9\u30ad\u30e3\u30ca\u306e\u8b66\u544a\u304c\u306a\u3044\u300d\u3067\u306f\u306a\u304f\u3001\u300c\u627f\u8a8d\u3055\u308c\u305f AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\uff08\u672c\u7269\u306e\u653b\u6483\u8005\u3088\u308a\u5148\u306b\u7a74\u3092\u898b\u3064\u3051\u308b\u305f\u3081\u306b\u3001\u9694\u96e2\u3057\u305f\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u4e2d\u3067\u81ea\u5206\u305f\u3061\u306e\u30b7\u30b9\u30c6\u30e0\u3092\u653b\u3081\u308b\u4fc2\uff09\u304c\u3001\u672a\u89e3\u6c7a\u306e\u4fb5\u5165\u7d4c\u8def\u3092\u898b\u3064\u3051\u306a\u3044\u300d\u3067\u3059\u3002\u305d\u3053\u3078\u306f\u300c\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u9580\u300d\uff08\u901a\u3089\u306a\u3044\u3068\u4f7f\u3048\u306a\u3044\u691c\u554f\u6240\uff09\u3092\u6bb5\u968e\u7684\u306b\u53b3\u3057\u304f\u3057\u3066\u5230\u9054\u3057\u307e\u3059\u3002SPEC-03 \u3068 ADR-03 \u306b\u5b9a\u7fa9\u3057\u3001\u6700\u521d\u306f\u5831\u544a\u306e\u307f\u3001M4 \u3067 HIGH \u505c\u6b62\u3001M5 \u3067 CRITICAL/HIGH \u30bc\u30ed\u3068\u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u5408\u683c\u3092\u5fc5\u9808\u306b\u3057\u307e\u3059\u3002</li> <li>\u4eba\u304c\u6c7a\u3081\u3001AI \u304c\u50cd\u304f\u3002 AI \u306f\u691c\u51fa\u30fb\u4fee\u6b63\u30fb\u30ec\u30d3\u30e5\u30fc\u30fb\u8a66\u9a13\u3092\u884c\u3044\u307e\u3059\u3002\u300c\u30de\u30fc\u30b8\u300d\uff08\u5909\u66f4\u3092\u5171\u6709\u30d6\u30e9\u30f3\u30c1\u3078\u53d7\u3051\u5165\u308c\u308b\u3053\u3068\uff09\u3001\u516c\u958b\u3001\u4f8b\u5916\u306e\u4ed8\u4e0e\u306f\u4eba\u304c\u6c7a\u3081\u307e\u3059\u3002AI \u306f\u81ea\u5206\u306e\u6210\u679c\u3092\u30de\u30fc\u30b8\u305b\u305a\u3001\u4f5c\u8005\u306f\u81ea\u5206\u306e\u5909\u66f4\u3092\u53d7\u3051\u5165\u308c\u307e\u305b\u3093\u3002\u8a73\u7d30\u306f ADR-04\u3002</li> <li>\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306f\u516c\u958b\u3067\u3001\u975e\u516c\u958b\u7531\u6765\u306e\u30b3\u30fc\u30c9\u3092\u6301\u305f\u306a\u3044\u3002 \u7f6e\u304f\u306e\u306f\u6587\u66f8\u3001\u300cmanifest\u300d\uff08\u53d6\u308a\u8fbc\u3080\u4e0a\u6d41\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u540d\u524d\u3068\u3001\u3069\u306e\u30b3\u30df\u30c3\u30c8\u304b\u3089\u4f5c\u308b\u304b\u3092\u793a\u3059\u300cSHA\u300d= \u30b3\u30df\u30c3\u30c8\u4e00\u3064\u306e\u6307\u7d0b\u3001\u3092\u4e26\u3079\u305f\u4e00\u89a7\uff09\u3001\u300c\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u300d\uff08\u5168\u90e8\u3092\u7d44\u307f\u7acb\u3066\u308b\u30d7\u30ed\u30b0\u30e9\u30e0\uff09\u3060\u3051\u3067\u3059\u3002\u7d71\u5408\u30b3\u30fc\u30c9\u306f <code>RDM-<name>-dev2027</code> \u3068\u3044\u3046\u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u7f6e\u304d\u307e\u3059\u3002\u6587\u4e2d\u3067\u306f\u540d\u524d\u3060\u3051\u3092\u66f8\u304d\u3001URL \u306f\u66f8\u304d\u307e\u305b\u3093\u3002CI\uff08continuous integration\u3002\u5909\u66f4\u3054\u3068\u306b\u81ea\u52d5\u3067\u8d70\u308b\u691c\u67fb\uff09\u3067\u306e\u79d8\u5bc6\u30b9\u30ad\u30e3\u30f3\u3092\u5fc5\u9808\u306b\u3057\u307e\u3059\u3002</li> <li>\u6587\u66f8\u306f\u4e8c\u8a00\u8a9e\u3067\u3001\u65b0\u5165\u793e\u54e1\u304c\u8aad\u3081\u308b\u3002 \u540c\u3058\u30da\u30fc\u30b8\u306b\u82f1\u8a9e\u3092\u5148\u3001\u65e5\u672c\u8a9e\u3092\u5f8c\u306b\u7f6e\u304d\u3001\u5c02\u9580\u7528\u8a9e\u306b\u306f\u521d\u51fa\u3067\u7528\u8a9e\u6ce8\u3092\u4ed8\u3051\u307e\u3059\u3002\u898f\u5247\u306f SPEC-06\u3001\u5171\u901a\u306e\u7528\u8a9e\u306f REF-01\u3002</li> <li>\u4e0a\u6d41\u65b9\u91dd\u3068\u306e\u95a2\u4fc2\u3002 \u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306f GRDM \u56fa\u6709\u3067\u3059\u3002\u6a2a\u65ad\u306e\u6b63\u672c \u2014 \u61b2\u7ae0\u3001\u7f6e\u304d\u5834\u306e\u898f\u5247\uff08POL-02\uff09\u3001\u4eba\u3068 AI \u306e\u8cac\u4efb\uff08POL-05\uff09\u3001PR \u306e\u898f\u5247\uff08SPEC-10\uff09\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306e\u578b\uff08SPEC-11\uff09\u2014 \u306f <code>RDM-grdm-core-test</code> \u3068 <code>niirdcplus</code> \u306b\u3042\u308a\u307e\u3059\u3002\u30ea\u30f3\u30af\u3067\u6307\u3057\u3001\u5199\u3057\u307e\u305b\u3093\u3002\u898f\u5247\u3092\u76f4\u3059\u5834\u6240\u3092\u4e00\u3064\u306b\u3059\u308b\u305f\u3081\u3067\u3059\u3002</li> <li>\u5f79\u5272\u30e2\u30c7\u30eb\u3068\u66f8\u8fbc\u306e\u5883\u754c\u3002 \u5f79\u5272\u306f\u6240\u5c5e\u30c1\u30fc\u30e0\u306e 3 \u6587\u5b57\u7565\u79f0\u3067\u8868\u3057\u307e\u3059\u3002AID\uff08AI\u958b\u767a\u62c5\u5f53\u8005\u3002\u30ed\u30fc\u30ab\u30eb LLM \u3067\u52d5\u304f Orca \u306e Open Code 2 \u30ef\u30fc\u30ab\u30fc\uff09\u3001QAE\uff08QA\u62c5\u5f53\u3002Claude Code Fable\uff09\u3001REV\uff08\u62c5\u5f53\u30ec\u30d3\u30e5\u30ef\u3002Codex Astra\uff09\u3001\u305d\u3057\u3066\u65b9\u91dd\u30fb\u53d7\u5165\u30fb\u30de\u30fc\u30b8\u30fb\u516c\u958b\u3092\u62c5\u3046\u6240\u6709\u8005\u3067\u3059\u3002\u3053\u306e\u8a08\u753b\u3067\u50cd\u304f\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u304c\u66f8\u304d\u8fbc\u3081\u308b\u306e\u306f\u3001\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u3001\u65b0\u8a2d\u306e <code>RDM-<name>-dev2027</code> \u3060\u3051\u3067\u3059\u3002\u65e2\u5b58\u306e\u4e0a\u6d41\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u306f\u66f8\u304b\u305a\u3001\u30ea\u30dd\u30b8\u30c8\u30ea\u3084\u30d6\u30e9\u30f3\u30c1\u3092\u524a\u9664\u305b\u305a\u3001\u300cforce push\u300d\uff08\u5171\u6709\u306e\u5c65\u6b74\u306e\u4e0a\u66f8\u304d\uff09\u3092\u3057\u307e\u305b\u3093\u3002</li> </ol>"},{"location":"policy/POL-01_Developer_Environment_2027_Position/#3-\u7269\u306e\u7f6e\u304d\u5834","title":"3. \u7269\u306e\u7f6e\u304d\u5834","text":"<pre><code>flowchart LR\n subgraph PUBLIC[\"\u516c\u958b\uff08RCOSDP\uff09\"]\n DG[\"RDM-developer-guide<br/>docs/ \u00b7 manifest/ \u00b7 installer/<br/>\u540d\u524d\u3068 SHA \u306e\u307f\"]\n CORE[\"\u516c\u958b\u30b3\u30a2 6 \u672c<br/>RDM-osf.io, RDM-waterbutler, RDM-modular-file-renderer,<br/>RDM-ember-osf-web, RDM-cas-overlay, RDM-wiki-frontend\"]\n CANON[\"\u6a2a\u65ad\u306e\u6b63\u672c<br/>RDM-grdm-core-test \u00b7 niirdcplus<br/>(POL-02, POL-05, SPEC-10, SPEC-11)\"]\n end\n subgraph PRIVATE[\"\u975e\u516c\u958b\uff08RCOSDP\uff09\"]\n PRIV[\"-private \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u7248 6 \u672c<br/>+ \u975e\u516c\u958b\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0 5 \u672c\"]\n DEV[\"RDM-&lt;name&gt;-dev2027 \u00d7 11<br/>develop = \u7d71\u5408<br/>upstream/* \u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\"]\n end\n COS[\"CenterForOpenScience/*<br/>\uff08\u53c2\u7167\u8ffd\u8de1\u306e\u307f\uff09\"]\n CORE -->|\"upstream/public-<branch>\"| DEV\n PRIV -->|\"upstream/private-<branch>\"| DEV\n COS -->|\"upstream/cos-develop\"| DEV\n DEV -->|\"SHA \u3092 manifest \u306b\u8a18\u9332\"| DG\n CANON -.->|\"\u30ea\u30f3\u30af\u306e\u307f\u3001\u5199\u3055\u306a\u3044\"| DG\n DG -->|\"\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u304c SHA \u304b\u3089\u7d44\u307f\u7acb\u3066\"| LOCAL[\"\u958b\u767a\u8005\u306e\u8a08\u7b97\u6a5f<br/>127.0.0.1 \u306e\u307f\u3001\u975e root\"]</code></pre> <p>\u5de6\u304b\u3089\u53f3\u3078\u8aad\u307f\u307e\u3059\u3002\u4e0a\u6d41\u306e\u30b3\u30fc\u30c9\u306f\u975e\u516c\u958b\u306e\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u3078\u6d41\u308c\u3001\u516c\u958b\u306e\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3078\u306f\u540d\u524d\u3068 SHA \u3060\u3051\u304c\u6d41\u308c\u3001\u958b\u767a\u8005\u306e\u8a08\u7b97\u6a5f\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u304c\u305d\u306e SHA \u304b\u3089\u7d44\u307f\u7acb\u3066\u307e\u3059\u3002</p>"},{"location":"policy/POL-01_Developer_Environment_2027_Position/#4-\u7bc0\u76ee\u306e\u306f\u3057\u3054","title":"4. \u7bc0\u76ee\u306e\u306f\u3057\u3054","text":"<p>\u8a08\u753b\u306e\u6b63\u672c\u306f\u6240\u6709\u8005\u304c\u6301\u3061\u307e\u3059\u3002\u6284\u9332\u306f TOON\uff08JSON \u3092\u77ed\u3044\u5b57\u4e0b\u3052\u4ed8\u304d\u306e\u6587\u5b57\u3067\u8868\u3057\u305f\u5f62\u3002\u4eba\u3082 AI \u3082\u8aad\u307f\u3084\u3059\u3044\uff09\u3067\u793a\u3057\u307e\u3059\u3002</p> <pre><code>milestones[5]{id,goal,gate,proof}:\n M1,\"docs \u9aa8\u683c\u30fbmanifest\u30fbdev2027 \u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea 11 \u672c\",\"\u5831\u544a\u306e\u307f\u3001\u8a31\u5bb9\u30ea\u30b9\u30c8\u3092\u8a18\u9332\",\"Codex \u30ec\u30d3\u30e5\u30fc\u6e08\u307f PR \u304c develop \u306b\u30de\u30fc\u30b8\"\n M2,\"\u30b3\u30a2 6 \u672c\u304c Mac Studio\uff08arm64\uff09\u3067\u4e00\u767a\u5c0e\u5165\u3001amd64 \u306f\u30d3\u30eb\u30c9\u78ba\u8a8d\",\"\u5831\u544a\u306e\u307f\u3001\u8a31\u5bb9\u30ea\u30b9\u30c8\u4ef6\u6570\u3092\u8a18\u9332\",\"Playwright \u53d7\u5165: \u30ed\u30b0\u30a4\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u4e0a\u4e0b\u8f09\u30fbWiki \u5171\u540c\u7de8\u96c6\u30fb\u30d7\u30ec\u30d3\u30e5\u30fc\u30fb\u6a5f\u95a2\u7ba1\u7406\u3002\u6210\u529f\uff0b\u62d2\u5426\"\n M3,\"\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0 5 \u672c\u304c\u8d77\u52d5\uff08y-websocket, OASys, Shibboleth-SP\uff0b\u30c6\u30b9\u30c8 IdP, rdmcp, aipf_mcp_data_grdm\uff09\",\"\u8a31\u5bb9\u30ea\u30b9\u30c8\u304c M2 \u3088\u308a\u5c11\u306a\u3044\",\"\u5404 1 \u672c\u306e\u6b63\u5e38\u7cfb\uff0b\u62d2\u5426\u30b1\u30fc\u30b9\"\n M4,\"waterbutler\u30fbmfr\u30fbosf.io \u3092 Python 3.13 \u3078\",\"HIGH \u4ee5\u4e0a\u3067\u5c0e\u5165\u505c\u6b62\u3001AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u521d\u56de\",\"M2/M3 \u53d7\u5165\u306e\u56de\u5e30\u304c\u5408\u683c\"\n M5,\"ES2\u30fbmongo 3.4 \u3092\u5ec3\u6b62\u3001ES8\u30fbPostgreSQL 15 \u4ee5\u964d\",\"CRITICAL/HIGH \u30bc\u30ed\u3001AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u304c\u672a\u89e3\u6c7a\u7d4c\u8def\u30bc\u30ed\",\"\u6d77\u5916\u914d\u5e03\u53ef\u3001\u30e9\u30a4\u30bb\u30f3\u30b9\u6574\u7406\u6e08\u307f\"\nsteady_state:\n daily: \"\u4e0a\u6d41\u30df\u30e9\u30fc\u3001\u5dee\u5206\u5831\u544a\u3001CVE \u30b9\u30ad\u30e3\u30f3\"\n weekly: \"AI \u7d71\u5408 PR \u2192 Codex \u30ec\u30d3\u30e5\u30fc \u2192 \u56de\u5e30\u30fb\u53d7\u5165\"\n human_only: \"\u30de\u30fc\u30b8\u3001\u516c\u958b\u3001\u4f8b\u5916\"</code></pre> <p>\u5404\u7bc0\u76ee\u306e\u671f\u9650\u306f\u3001\u7740\u624b\u6642\u306b\u6240\u6709\u8005\u304c\u6c7a\u3081\u307e\u3059\u3002</p>"},{"location":"policy/POL-01_Developer_Environment_2027_Position/#5-\u3057\u306a\u3044\u3053\u3068","title":"5. \u3057\u306a\u3044\u3053\u3068","text":"<ul> <li><code>sudo</code>\uff08\u7ba1\u7406\u8005\u6a29\u9650\uff09\u304c\u8981\u308a\u3001\u30b5\u30fc\u30d3\u30b9\u3092 LAN \u306b\u9732\u51fa\u3055\u305b\u3066\u3044\u305f\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u306e\u5225\u540d <code>192.168.168.167</code> \u306f\u4f7f\u3044\u307e\u305b\u3093\u3002ADR-02 \u3092\u53c2\u7167\u3002</li> <li>\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u975e\u516c\u958b\u306e\u30b3\u30fc\u30c9\u3001\u79d8\u5bc6\u3001\u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u306e URL \u3092\u7f6e\u304d\u307e\u305b\u3093\u3002</li> <li>AI \u306b\u30de\u30fc\u30b8\u3084\u516c\u958b\u3092\u3055\u305b\u307e\u305b\u3093\u3002\u4f5c\u8005\u306b\u81ea\u5206\u306e\u5909\u66f4\u3092\u53d7\u3051\u5165\u308c\u3055\u305b\u307e\u305b\u3093\u3002</li> <li>\u4e0a\u6d41\u306e\u61b2\u7ae0\u3084\u65b9\u91dd\u3092\u3053\u3053\u306b\u5199\u3057\u307e\u305b\u3093\u3002\u30ea\u30f3\u30af\u3057\u307e\u3059\u3002</li> <li><code>-private</code> \u7531\u6765\u306e\u30b3\u30fc\u30c9\u304b\u3089\u4f5c\u3063\u305f\u30a4\u30e1\u30fc\u30b8\u3092\u516c\u958b\u30ec\u30b8\u30b9\u30c8\u30ea\u306b\u51fa\u3057\u307e\u305b\u3093\u3002</li> </ul>"},{"location":"policy/POL-01_Developer_Environment_2027_Position/#6-\u3053\u306e\u65b9\u91dd\u306e\u4f7f\u3044\u65b9","title":"6. \u3053\u306e\u65b9\u91dd\u306e\u4f7f\u3044\u65b9","text":"<p>\u4ed5\u69d8\uff08SPEC-00\u301cSPEC-06\uff09\u304c\u3053\u306e\u7acb\u5834\u3092\u5b9f\u88c5\u3057\u307e\u3059\u3002\u6c7a\u5b9a\u306e\u8a18\u9332\uff08ADR-01\u301cADR-04\uff09\u304c\u500b\u3005\u306e\u9078\u629e\u306e\u7406\u7531\u3092\u8aac\u660e\u3057\u307e\u3059\u3002\u4ed5\u69d8\u3068\u3053\u306e\u65b9\u91dd\u304c\u98df\u3044\u9055\u3063\u305f\u3089\u3001\u540c\u3058\u30b3\u30df\u30c3\u30c8\u3067\u4e21\u65b9\u3092\u76f4\u3057\u3001\u7248\u306e\u884c\u306b\u5206\u304b\u3063\u305f\u3053\u3068\u3092\u66f8\u304d\u307e\u3059\u3002</p>"},{"location":"policy/POL-01_Developer_Environment_2027_Position/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Repository A folder that remembers every change, so you can always go back. \u5909\u66f4\u3092\u5168\u90e8\u899a\u3048\u3066\u3044\u308b\u30d5\u30a9\u30eb\u30c0\u3002\u3044\u3064\u3067\u3082\u524d\u306b\u623b\u305b\u308b\u3002 SHA The fingerprint of one saved change (commit); no two are alike. \u4fdd\u5b58\u3057\u305f\u5909\u66f4\uff08\u30b3\u30df\u30c3\u30c8\uff09\u4e00\u3064\u306e\u6307\u7d0b\u3002\u540c\u3058\u3082\u306e\u306f\u4e8c\u3064\u306a\u3044\u3002 Manifest The list of which repositories, at which SHA, we build from. \u3069\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u3069\u306e SHA \u304b\u3089\u7d44\u307f\u7acb\u3066\u308b\u304b\u306e\u4e00\u89a7\u3002 EOL End of life: the makers no longer fix it. \u4f5c\u3063\u305f\u4eba\u304c\u76f4\u3057\u3066\u304f\u308c\u306a\u304f\u306a\u3063\u305f\u72b6\u614b\u3002 Security gate A checkpoint the build must pass before anyone may use it. \u901a\u3089\u306a\u3044\u3068\u4f7f\u3048\u306a\u3044\u691c\u554f\u6240\u3002 AI red team A team that attacks our own system, in isolation, to find holes first. \u9694\u96e2\u3057\u305f\u4e2d\u3067\u81ea\u5206\u306e\u30b7\u30b9\u30c6\u30e0\u3092\u653b\u3081\u3066\u3001\u7a74\u3092\u5148\u306b\u898b\u3064\u3051\u308b\u4fc2\u3002 Force push Overwriting shared history on GitHub; forbidden here. GitHub \u4e0a\u306e\u5171\u6709\u306e\u5c65\u6b74\u3092\u4e0a\u66f8\u304d\u3059\u308b\u3053\u3068\u3002\u3053\u3053\u3067\u306f\u7981\u6b62\u3002 <p>Full shared glossary: REF-01 Glossary.</p>"},{"location":"reference/","title":"Reference / \u53c2\u8003","text":"<p>Summary: External facts such as the shared glossary, tool versions, upstream metadata. Reference documents contain fixed information that other documents link to. \u6982\u8981: \u5171\u901a\u7528\u8a9e\u96c6\u3001\u9053\u5177\u306e\u7248\u3001\u4e0a\u6d41\u30e1\u30bf\u30c7\u30fc\u30bf\u306a\u3069\u306e\u5916\u90e8\u4e8b\u5b9f\u3002\u53c2\u8003\u6587\u66f8\u306f\u4ed6\u306e\u6587\u66f8\u304c\u30ea\u30f3\u30af\u3059\u308b\u56fa\u5b9a\u60c5\u5831\u3092\u6301\u3061\u307e\u3059\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: a shared glossary is needed because the same term (for example \"upstream\" or \"port\") appears in several specifications and must mean one thing everywhere. \uff0f \u540c\u3058\u7528\u8a9e\uff08\u4f8b:\u300c\u4e0a\u6d41\u300d\u300c\u30dd\u30fc\u30c8\u300d\uff09\u304c\u8907\u6570\u306e\u4ed5\u69d8\u306b\u51fa\u3066\u304f\u308b\u305f\u3081\u3001\u3069\u3053\u3067\u3082\u4e00\u3064\u306e\u610f\u5473\u306b\u306a\u308b\u3088\u3046\u5171\u901a\u306e\u7528\u8a9e\u96c6\u304c\u5fc5\u8981\u3060\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Normative for: REF-01 Glossary and future reference documents.</li> <li>Related: ../README.md \u00b7 policy/ \u00b7 spec/ \u00b7 decisions/</li> </ul> <p></p>"},{"location":"reference/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"reference/#1-what-belongs-here","title":"1. What belongs here","text":"<p>A reference document contains external facts that other documents link to. This folder contains:</p> ID File Purpose REF-01 REF-01_Glossary.md The shared glossary: technical terms with one-line notes for everyone and precise meanings for engineers. <p>Future reference documents may include:</p> ID Topic REF-02 Tool versions and compatibility matrix REF-03 Upstream repository metadata (default branches, tags)"},{"location":"reference/#2-how-reference-documents-are-used","title":"2. How reference documents are used","text":"<p>Reference documents are linked from other documents using relative links:</p> <ul> <li>Glossary terms: <code>[term](../reference/REF-01_Glossary.md#english)</code> (section anchor)</li> <li>Tool versions: <code>[docker](../reference/REF-02_Tool_Versions.md#english)</code> (file link)</li> </ul>"},{"location":"reference/#3-creating-a-new-reference-document","title":"3. Creating a new reference document","text":"<ol> <li>Name the file <code>REF-NN_<Title>.md</code> (two-digit number, next available).</li> <li>Follow SPEC-06 documentation conventions.</li> <li>Include only fixed facts, not opinions or processes.</li> <li>Link from documents that need the reference.</li> </ol>"},{"location":"reference/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"reference/#1-\u3053\u3053\u306b\u5c5e\u3059\u308b\u3082\u306e","title":"1. \u3053\u3053\u306b\u5c5e\u3059\u308b\u3082\u306e","text":"<p>\u300c\u53c2\u8003\u300d\u6587\u66f8\u306f\u4ed6\u306e\u6587\u66f8\u304c\u30ea\u30f3\u30af\u3059\u308b\u5916\u90e8\u4e8b\u5b9f\u3092\u542b\u307f\u307e\u3059\u3002\u3053\u306e\u30d5\u30a9\u30eb\u30c0\u306b\u306f\u6b21\u304c\u542b\u307e\u308c\u307e\u3059\uff1a</p> ID \u30d5\u30a1\u30a4\u30eb \u76ee\u7684 REF-01 REF-01_Glossary.md \u5171\u901a\u7528\u8a9e\u96c6\uff1a\u5c02\u9580\u7528\u8a9e\u306b\u3001\u8ab0\u5411\u3051\u306b\u4e00\u884c\u306e\u6ce8\u3068\u6280\u8853\u8005\u5411\u3051\u306e\u6b63\u78ba\u306a\u610f\u5473\u3092\u4ed8\u3051\u308b\u3002 <p>\u4eca\u5f8c\u306e\u53c2\u8003\u6587\u66f8\u3068\u3057\u3066\u4ee5\u4e0b\u304c\u8003\u3048\u3089\u308c\u307e\u3059\uff1a</p> ID \u30c8\u30d4\u30c3\u30af REF-02 \u9053\u5177\u306e\u7248\u3068\u4e92\u63db\u6027\u30de\u30c8\u30ea\u30af\u30b9 REF-03 \u4e0a\u6d41\u30ea\u30dd\u30b8\u30c8\u30ea\u30e1\u30bf\u30c7\u30fc\u30bf\uff08\u65e2\u5b9a\u30d6\u30e9\u30f3\u30c1\u3001\u30bf\u30b0\uff09"},{"location":"reference/#2-\u53c2\u8003\u6587\u66f8\u304c\u3069\u3046\u4f7f\u308f\u308c\u308b\u304b","title":"2. \u53c2\u8003\u6587\u66f8\u304c\u3069\u3046\u4f7f\u308f\u308c\u308b\u304b","text":"<p>\u53c2\u8003\u6587\u66f8\u306f\u4ed6\u306e\u6587\u66f8\u304b\u3089\u76f8\u5bfe\u30ea\u30f3\u30af\u3067\u53c2\u7167\u3055\u308c\u307e\u3059\uff1a</p> <ul> <li>\u7528\u8a9e\u96c6\u306e\u8a9e: <code>[\u7528\u8a9e](../reference/REF-01_Glossary.md#japanese)</code>\uff08\u7bc0\u30a2\u30f3\u30ab\u30fc\uff09</li> <li>\u9053\u5177\u306e\u7248: <code>[docker](../reference/REF-02_Tool_Versions.md#japanese)</code>\uff08\u30d5\u30a1\u30a4\u30eb\u30ea\u30f3\u30af\uff09</li> </ul>"},{"location":"reference/#3-\u65b0\u3057\u3044\u53c2\u8003\u6587\u66f8\u3092\u3064\u304f\u308b\u306b\u306f","title":"3. \u65b0\u3057\u3044\u53c2\u8003\u6587\u66f8\u3092\u3064\u304f\u308b\u306b\u306f","text":"<ol> <li>\u30d5\u30a1\u30a4\u30eb\u540d\u3092 <code>REF-NN_<\u984c>.md</code>\uff082 \u6841\u306e\u756a\u53f7\u3001\u6b21\u306b\u7a7a\u3044\u3066\u3044\u308b\u3082\u306e\uff09\u306b\u3059\u308b\u3002</li> <li>SPEC-06 \u6587\u66f8\u898f\u7d04\u306b\u5f93\u3046\u3002</li> <li>\u610f\u898b\u3084\u30d7\u30ed\u30bb\u30b9\u3067\u306f\u306a\u304f\u3001\u56fa\u5b9a\u4e8b\u5b9f\u3060\u3051\u3092\u542b\u3080\u3002</li> <li>\u53c2\u8003\u304c\u5fc5\u8981\u306a\u6587\u66f8\u3078\u30ea\u30f3\u30af\u3059\u308b\u3002</li> </ol>"},{"location":"reference/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Reference A document containing external facts that other documents link to. \u4ed6\u306e\u6587\u66f8\u304c\u30ea\u30f3\u30af\u3059\u308b\u5916\u90e8\u4e8b\u5b9f\u3092\u542b\u3080\u6587\u66f8\u3002 Glossary A collection of technical terms with explanations. \u5c02\u9580\u7528\u8a9e\u306e\u96c6\u5408\u3002 Link A navigational element that jumps to another part of a document. \u6587\u66f8\u306e\u5225\u306e\u90e8\u5206\u3078\u98db\u3076\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u8981\u7d20\u3002 Anchor A bookmark inside a page that a link can jump to. \u30da\u30fc\u30b8\u306e\u4e2d\u306e\u300c\u3057\u304a\u308a\u300d\u3002\u30ea\u30f3\u30af\u3067\u98db\u3079\u308b\u3002"},{"location":"reference/REF-01_Glossary/","title":"REF-01 Glossary / \u7528\u8a9e\u96c6","text":"<p>Summary: The shared glossary that SPEC-06 \u00a73 refers to. Every technical term used in this project, with a one-line explanation a primary-school child could follow, the precise meaning for engineers, and where the term is used. \u6982\u8981: SPEC-06 \u00a73 \u304c\u6307\u3059\u5171\u901a\u7528\u8a9e\u96c6\u3002\u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u4f7f\u3046\u5c02\u9580\u7528\u8a9e\u3092\u3001\u5c0f\u5b66\u751f\u306b\u3082\u5206\u304b\u308b\u4e00\u884c\u3001\u6280\u8853\u8005\u5411\u3051\u306e\u6b63\u78ba\u306a\u610f\u5473\u3001\u4f7f\u308f\u308c\u308b\u5834\u6240\u306e\u4e09\u3064\u3067\u8aac\u660e\u3059\u308b\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: listing every term in one place showed that about a third of them (CAS, SAML, IdP/SP, Shibboleth, GakuNin) belong to one topic \u2014 login \u2014 and that newcomers stumble there first, so the login terms were written to read as one connected story. \uff0f \u5168\u90e8\u306e\u8a9e\u3092\u4e00\u304b\u6240\u306b\u4e26\u3079\u3066\u307f\u308b\u3068\u3001\u7d04\u4e09\u5206\u306e\u4e00\uff08CAS\u3001SAML\u3001IdP/SP\u3001Shibboleth\u3001GakuNin\uff09\u304c\u300c\u30ed\u30b0\u30a4\u30f3\u300d\u3068\u3044\u3046\u4e00\u3064\u306e\u8a71\u984c\u306b\u5c5e\u3057\u3001\u65b0\u5165\u793e\u54e1\u306f\u307e\u305a\u305d\u3053\u3067\u3064\u307e\u305a\u304f\u3068\u5206\u304b\u3063\u305f\u3002\u305d\u3053\u3067\u30ed\u30b0\u30a4\u30f3\u306e\u8a9e\u306f\u4e00\u3064\u306e\u7d9a\u3044\u305f\u8a71\u3068\u3057\u3066\u8aad\u3081\u308b\u3088\u3046\u306b\u66f8\u3044\u305f\u3002</li> <li>Applies to: every document in this repository. Documents still add a short note on first use and link here (SPEC-06 \u00a73). <code>grdm-dev docs check</code> uses the Term column of the English table as its word list.</li> <li>Related: docs/README.md \u00b7 SPEC-00 Overview \u00b7 SPEC-01 Manifest \u00b7 SPEC-02 Installer CLI \u00b7 SPEC-03 Security Gate \u00b7 SPEC-04 Acceptance Tests \u00b7 SPEC-05 Upstream Tracking \u00b7 POL-01 \u00b7 ADR-01 \u00b7 ADR-02 \u00b7 ADR-03 \u00b7 ADR-04</li> </ul> <p></p>"},{"location":"reference/REF-01_Glossary/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"reference/REF-01_Glossary/#how-to-read-the-table","title":"How to read the table","text":"<ul> <li>For everyone is the one-line note that documents copy on first use.</li> <li>For engineers is the precise meaning. When the two differ in emphasis, the engineer column wins for implementation.</li> <li>Where used names the documents or commands where the term matters most. Links are relative; private <code>-dev2027</code> repositories are named, never linked.</li> <li>Terms are grouped by topic, then alphabetical inside the group. Add a term in both halves in the same commit.</li> </ul>"},{"location":"reference/REF-01_Glossary/#a-git-and-github","title":"A. Git and GitHub","text":"Term For everyone For engineers Where used Repository A folder that remembers every change, so you can always go back. A Git object store plus working tree, hosted on GitHub under the RCOSDP organization. everywhere Branch A separate line of work in a repository, like a side road that can rejoin the main road. A movable pointer to a commit; <code>develop</code> is the integration branch, <code>upstream/*</code> are tracking branches. ADR-01, SPEC-05 Commit One saved step of changes with a message saying why. A snapshot of the tree with parent pointers, author, and message; subjects are Japanese here. SPEC-06 \u00a76 SHA The fingerprint of one commit; no two are alike. The SHA-1 (40 hex chars) identifying a commit; the manifest pins full SHAs. SPEC-01 Fork Your own copy of someone's repository that remembers where it came from. A GitHub-side copy with an upstream link; impossible inside the same organization. ADR-01 Upstream The original place a copy came from; changes flow down from it. The source repository or branch we mirror and merge from; tracking branches are named <code>upstream/<kind>-<branch></code> (for example <code>upstream/public-develop</code>, <code>upstream/private-master</code>, <code>upstream/cos-develop</code>). SPEC-01 \u00a74, SPEC-05 Mirror An identical copy that is refreshed automatically. A branch kept equal to an upstream ref by a daily fetch and fast-forward; never edited directly. SPEC-05 Pull request (PR) A proposed change waiting for someone to review and accept it. A GitHub review unit; every change to <code>develop</code> goes through one; reviewed by REV, checked by QAE, merged by the owner. ADR-04 Merge Accepting a change into the shared branch. Creating a merge commit on the target branch; here only a human merges; no force-push. POL-01 \u00a72 Manifest The list of which repositories, at which SHA, we build from. <code>manifest/upstreams.json</code> (canonical) with a TOON excerpt; names, branches, SHAs, dates, PR numbers only. SPEC-01 GitHub Actions GitHub's robot that runs checks whenever code changes. GitHub's CI service; workflows under <code>.github/workflows/</code> run link checks, secret scans, MkDocs, Semgrep, amd64 builds, Trivy. SPEC-03 Self-hosted runner Our own computer that GitHub's robot borrows to run checks. A GitHub Actions runner on the Mac Studio for arm64 builds and Playwright acceptance; private repositories only. SPEC-04 CI Continuous integration: automatic checks on every change. The set of required workflows that must pass before a PR can be merged. SPEC-03"},{"location":"reference/REF-01_Glossary/#b-containers-and-platforms","title":"B. Containers and platforms","text":"Term For everyone For engineers Where used Container A box that holds one program and everything it needs, so it runs the same anywhere. An isolated process group sharing the host kernel, created from an image; runs non-root here. SPEC-02 Image The recipe and ingredients a container is made from. A layered, read-only filesystem built from a Dockerfile; built locally by default, optionally pushed to a private registry. SPEC-02 Docker The tool that builds images and runs containers. Docker Engine 27 or newer (29.x on the Mac Studio) with the Compose and buildx plugins; the only container runtime supported by the installer. SPEC-02 Docker Compose A tool that starts many containers together from one file. The <code>docker compose</code> plugin (v2 or newer; 5.x on the Mac Studio) reading the generated <code>runtime/docker-compose.yml</code>; provides the internal network and DNS. ADR-02 buildx Docker's helper that builds one image for several kinds of computer at once. The BuildKit-based builder; <code>--platform linux/amd64,linux/arm64</code> produces multi-architecture images. SPEC-02 Multi-architecture (arm64 / amd64) Making the same program run on both kinds of computer chip. Building images for <code>linux/arm64</code> (Apple Silicon, ARM servers) and <code>linux/amd64</code> (Intel/AMD); the installer selects <code>platform</code> automatically. SPEC-02 Apple Silicon The chips Apple puts in its Macs since 2020. arm64 CPUs (M-series); the primary development target on the Mac Studio. SPEC-00 WSL2 A way to run Linux inside Windows. Windows Subsystem for Linux 2; Docker Desktop with the WSL2 backend is the supported Windows 11 path. SPEC-02 Loopback / localhost The network path that leads back to your own computer. The <code>lo</code> interface; <code>127.0.0.1</code> (IPv4) and <code>::1</code> (IPv6); the only publishing address allowed. ADR-02 Port A numbered door on an address through which one program listens. A TCP/UDP port; default host ports (<code>5000</code> web, <code>8000</code> api, <code>8001</code> admin, <code>7777</code> wb, <code>7778</code> mfr, <code>8080</code> fakecas, <code>4200</code> ember) are defined in the ports table of SPEC-02 \u00a74. SPEC-02 \u00a74, ADR-02 Non-root Running as an ordinary user, not as the all-powerful administrator. Containers run with a non-zero UID; no <code>sudo</code> anywhere in the installer. SPEC-03 venv A private box of Python tools for one project so projects do not fight. A Python virtual environment; the installer, <code>grdm-dev</code>, and Playwright tests share one venv. SPEC-02 EOL End of life: the makers no longer fix bugs or security holes. A version past its vendor support date; all current upstream base images are EOL and are replaced in M4\u2013M5. POL-01 \u00a71"},{"location":"reference/REF-01_Glossary/#c-security","title":"C. Security","text":"Term For everyone For engineers Where used Vulnerability A weak spot an attacker could use to get in. A security defect, typically tracked as a CVE with a severity rating. SPEC-03 CVE A public ID number given to one known security hole. Common Vulnerabilities and Exposures identifier (<code>CVE-YYYY-NNNNN</code>) with CVSS severity; gate thresholds are CRITICAL/HIGH. SPEC-03, ADR-03 SBOM A full list of every ingredient inside our software. Software Bill of Materials (CycloneDX or SPDX) produced per image by Trivy. SPEC-03 Secret A password or key that must never be written where others can read it. Credentials and tokens; generated as random values at install time, never committed; secret scanning is mandatory in CI. SPEC-03 Allow-list A short list of known problems we have looked at and accept for now. Accepted CVEs with reason, owner, and expiry in <code>manifest/allowlist.json</code>; the count must shrink at each milestone. SPEC-03 \u00a75, ADR-03 Security gate A checkpoint the build must pass before anyone may use it. The staged policy: report-only (M1\u2013M3), stop on HIGH (M4), zero CRITICAL/HIGH plus red-team pass (M5). ADR-03 Trivy A scanner that reads our images and lists the holes it knows about. Aqua Security's scanner for images and filesystems; produces SBOM and CVE reports; Grype is the alternative. SPEC-03 Semgrep A tool that reads source code looking for dangerous patterns. Static analysis (SAST) with rule packs; runs in CI on every PR; CodeQL is the alternative. SPEC-03 OWASP ZAP A tool that pokes at a running website the way an attacker would. Dynamic application security testing (DAST) proxy from OWASP; run against the local instance only. SPEC-03 Red team People or programs that attack our own system on purpose to find holes first. Approved AI red team working only against our own instance inside an isolated network; approval procedure in SPEC-03. ADR-03"},{"location":"reference/REF-01_Glossary/#d-testing-and-quality","title":"D. Testing and quality","text":"Term For everyone For engineers Where used Unit test A check that one small piece works on its own. A test of a single function or class in isolation; Python <code>unittest</code>/pytest. SPEC-04 Integration test A check that several pieces work together. A test across service boundaries (for example web calls wb through the Compose network). SPEC-04 Acceptance test A check that the whole thing does what the user asked for. End-to-end scenarios through the browser: login, project creation, file up/download, wiki co-edit, preview, institution admin; each with a success and a rejection case. SPEC-04 Regression test A check that something that used to work still works. Re-running earlier acceptance and unit suites after each change; required before merge. SPEC-04 Playwright A robot that drives a web browser to test a website. Playwright for Python running in the shared venv against Chromium on <code>127.0.0.1</code>. SPEC-04"},{"location":"reference/REF-01_Glossary/#e-documents-and-data-formats","title":"E. Documents and data formats","text":"Term For everyone For engineers Where used MkDocs A tool that turns Markdown files into a website. MkDocs with the Material theme; <code>grdm-dev docs</code> builds <code>site/</code>; published on GitHub Pages. SPEC-06 \u00a75 Mermaid A way to draw diagrams by typing text. Fenced <code>```mermaid</code> blocks rendered by GitHub and MkDocs; the only allowed form for architecture and flow diagrams. SPEC-06 \u00a74 TOON A compact text form of JSON data that people and AI read easily. Token-Oriented Object Notation; used for data in documents; canonical data stays in JSON/YAML and <code>grdm-dev manifest check</code> verifies they agree. SPEC-06 \u00a74 JSON A plain-text way to write data with braces and quotes that programs read easily. JavaScript Object Notation; canonical format for the manifest and reports. SPEC-01 YAML A plain-text way to write data with indentation that people read easily. Used for Compose files, MkDocs, and GitHub Actions workflows. SPEC-02"},{"location":"reference/REF-01_Glossary/#f-login-and-identity","title":"F. Login and identity","text":"Term For everyone For engineers Where used CAS A login service that many websites share: log in once, use them all. Central Authentication Service protocol; GRDM's <code>cas-overlay</code> implements it and OSF web/api trust it. SPEC-04 fakecas A pretend CAS for developers: any name logs in, no password. A tiny Go service standing in for cas-overlay in development; mutually exclusive with Shibboleth in acceptance. ADR-02, SPEC-04 SAML A standard way for one website to tell another \"yes, this person has logged in\". Security Assertion Markup Language 2.0; XML assertions between IdP and SP. SPEC-04 IdP / SP IdP is the place where you log in; SP is the website that trusts it. Identity Provider and Service Provider in SAML; a test IdP container is bundled for acceptance. SPEC-04 Shibboleth Software that makes SAML login work for universities. The Shibboleth SP (Apache module) in <code>RDM-Shibboleth-SP</code>; the subsystem that connects GRDM to GakuNin. SPEC-00 GakuNin Japan's academic network for logging in with your university account. The Japanese academic access management federation operated by NII; GRDM accepts GakuNin IdPs through Shibboleth. SPEC-00"},{"location":"reference/REF-01_Glossary/#g-grdm-components-and-upstream","title":"G. GRDM components and upstream","text":"Term For everyone For engineers Where used OSF / COS OSF is the website for sharing research that GRDM is built on; COS is the group in the US that makes it. Open Science Framework by the Center for Open Science; <code>CenterForOpenScience/*</code> is tracked as <code>upstream/cos-develop</code>. ADR-01 osf.io The main part of GRDM: the website and its API. Django application (<code>RDM-osf.io</code>); services <code>web</code>, <code>api</code>, <code>admin</code>, <code>worker</code>. SPEC-00 waterbutler (wb) The part that moves files in and out of storage. Python/aiohttp file-access service (<code>RDM-waterbutler</code>); services <code>wb</code>, <code>wb_worker</code>. SPEC-00 modular-file-renderer (mfr) The part that shows a preview of a file in the browser. Python/aiohttp rendering service (<code>RDM-modular-file-renderer</code>); service <code>mfr</code>. SPEC-00 ember-osf-web The newer web pages of GRDM. Ember.js front end (<code>RDM-ember-osf-web</code>); service <code>ember_osf_web</code>. SPEC-00 cas-overlay GRDM's real login server. Apereo CAS overlay (<code>RDM-cas-overlay</code>, JDK); service <code>cas</code>. SPEC-00 wiki-frontend The wiki editor pages. Front end for the GRDM wiki (<code>RDM-wiki-frontend</code>), paired with y-websocket for live co-editing. SPEC-00 y-websocket The helper that lets two people edit the same wiki page at once. Yjs WebSocket server (<code>RDM-y-webocket-develop-private</code>; repository name carries the upstream spelling) for collaborative editing. SPEC-00 OASys A GRDM subsystem (private) added in M3. Subsystem from <code>RDM-OASys-main-private</code>; scope and tests defined in M3. SPEC-00 rdmcp / MCP A way for AI assistants to talk to GRDM through a standard plug. Model Context Protocol server for GRDM (<code>RDM-rdmcp-private</code>). SPEC-00 AIPF A GRDM data connector for the AI platform (private). <code>RDM-aipf_mcp_data_grdm-private</code>, an MCP data source for GRDM. SPEC-00 Elasticsearch The search engine inside GRDM. ES 2 and 6.3.1 today; consolidated on ES 8 in M5. POL-01 \u00a74 PostgreSQL The main database where GRDM keeps its records. PostgreSQL 9.6 today; 15 or later in M5. POL-01 \u00a74 MongoDB An older database GRDM still uses for a few things. MongoDB 3.4 (sharejs); retired in M5. POL-01 \u00a74 RabbitMQ The message queue: a line where jobs wait for a worker. AMQP broker used by Celery workers in osf.io. SPEC-00 Redis A very fast memory store used for caching and sessions. In-memory key-value store used by osf.io and wb/mfr. SPEC-00"},{"location":"reference/REF-01_Glossary/#h-ai-tools-and-roles","title":"H. AI tools and roles","text":"Term For everyone For engineers Where used LLM / local LLM A large language model is an AI that reads and writes text; a local one runs on our own computer. A local LLM (Qwen 3 Coder Next via LM Studio) powers AID workers; nothing from private code is sent to external models without the data-handling rules in POL-05. ADR-04 Orca The desk where our AI workers sit: it opens workspaces and terminals for them. The orchestration tool that runs Open Code 2 and Codex workers in separate worktrees. ADR-04 Open Code 2 The AI program that writes the code (our AID worker). The implementation agent running on the local LLM inside Orca. ADR-04 Codex The AI program that reviews every PR (our REV). Codex Astra (<code>gpt-6-astra</code>) as an Orca worker; records reviews in <code>docs/reviews/</code> and PR comments. ADR-04 Claude Code The AI program that writes specifications and checks results (our QAE). Claude Code (Fable) running this plan's QA, regression and acceptance judgement. ADR-04 AID AI Developer: the role that writes code and documents to spec. Role code from the team table; held by Open Code 2 workers. ADR-04 QAE QA Engineer: the role that checks and judges. Role code; held by Claude Code Fable. ADR-04 REV Reviewer: the role that independently reviews each PR. Role code; held by Codex Astra. ADR-04"},{"location":"reference/REF-01_Glossary/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"reference/REF-01_Glossary/#\u8868\u306e\u8aad\u307f\u65b9","title":"\u8868\u306e\u8aad\u307f\u65b9","text":"<ul> <li>\u307f\u3093\u306a\u5411\u3051 \u306f\u3001\u6587\u66f8\u304c\u521d\u51fa\u3067\u5199\u3059\u4e00\u884c\u306e\u6ce8\u3067\u3059\u3002</li> <li>\u6280\u8853\u8005\u5411\u3051 \u306f\u6b63\u78ba\u306a\u610f\u5473\u3067\u3059\u3002\u91cd\u70b9\u304c\u9055\u3046\u3068\u304d\u306f\u3001\u5b9f\u88c5\u3067\u306f\u6280\u8853\u8005\u5411\u3051\u306e\u5217\u304c\u512a\u5148\u3057\u307e\u3059\u3002</li> <li>\u4f7f\u308f\u308c\u308b\u5834\u6240 \u306f\u3001\u305d\u306e\u8a9e\u304c\u6700\u3082\u52b9\u304f\u6587\u66f8\u3084\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002\u30ea\u30f3\u30af\u306f\u76f8\u5bfe\u3067\u3001\u975e\u516c\u958b\u306e <code>-dev2027</code> \u306f\u540d\u524d\u3060\u3051\u3092\u66f8\u304d\u30ea\u30f3\u30af\u3057\u307e\u305b\u3093\u3002</li> <li>\u8a9e\u306f\u8a71\u984c\u3067\u5206\u3051\u3001\u305d\u306e\u4e2d\u3067\u306f\u82f1\u8a9e\u306e\u8868\u3068\u540c\u3058\u9806\u3067\u3059\u3002\u8a9e\u3092\u8db3\u3059\u3068\u304d\u306f\u3001\u82f1\u548c\u306e\u4e21\u65b9\u3092\u540c\u3058\u30b3\u30df\u30c3\u30c8\u3067\u8db3\u3057\u307e\u3059\u3002</li> </ul>"},{"location":"reference/REF-01_Glossary/#a-git-\u3068-github","title":"A. Git \u3068 GitHub","text":"\u7528\u8a9e \u307f\u3093\u306a\u5411\u3051 \u6280\u8853\u8005\u5411\u3051 \u4f7f\u308f\u308c\u308b\u5834\u6240 \u30ea\u30dd\u30b8\u30c8\u30ea\uff08repository\uff09 \u5909\u66f4\u3092\u5168\u90e8\u899a\u3048\u3066\u3044\u308b\u30d5\u30a9\u30eb\u30c0\u3002\u3044\u3064\u3067\u3082\u524d\u306b\u623b\u305b\u308b\u3002 Git \u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u4fdd\u5b58\u5eab\u3068\u4f5c\u696d\u30c4\u30ea\u30fc\u3002RCOSDP \u7d44\u7e54\u306e GitHub \u306b\u7f6e\u304f\u3002 \u5168\u6587\u66f8 \u30d6\u30e9\u30f3\u30c1\uff08branch\uff09 \u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u4e2d\u306e\u5225\u306e\u4f5c\u696d\u306e\u9053\u3002\u8107\u9053\u3067\u3001\u3042\u3068\u3067\u672c\u9053\u306b\u623b\u308c\u308b\u3002 \u30b3\u30df\u30c3\u30c8\u3092\u6307\u3059\u52d5\u304f\u30dd\u30a4\u30f3\u30bf\u3002<code>develop</code> \u304c\u7d71\u5408\u30d6\u30e9\u30f3\u30c1\u3001<code>upstream/*</code> \u304c\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\u3002 ADR-01\u3001SPEC-05 \u30b3\u30df\u30c3\u30c8\uff08commit\uff09 \u5909\u66f4\u306e\u4e00\u6b69\u3092\u3001\u7406\u7531\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u4ed8\u304d\u3067\u4fdd\u5b58\u3057\u305f\u3082\u306e\u3002 \u30c4\u30ea\u30fc\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u306b\u89aa\u30fb\u4f5c\u8005\u30fb\u30e1\u30c3\u30bb\u30fc\u30b8\u304c\u4ed8\u3044\u305f\u3082\u306e\u3002\u4ef6\u540d\u306f\u65e5\u672c\u8a9e\u3002 SPEC-06 \u00a76 SHA \u30b3\u30df\u30c3\u30c8\u4e00\u3064\u306e\u6307\u7d0b\u3002\u540c\u3058\u3082\u306e\u306f\u4e8c\u3064\u306a\u3044\u3002 \u30b3\u30df\u30c3\u30c8\u3092\u8b58\u5225\u3059\u308b SHA-1\uff0816 \u9032 40 \u6587\u5b57\uff09\u3002manifest \u306f\u5b8c\u5168\u306a SHA \u3092\u56fa\u5b9a\u3059\u308b\u3002 SPEC-01 \u30d5\u30a9\u30fc\u30af\uff08fork\uff09 \u4ed6\u4eba\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u81ea\u5206\u7528\u306e\u5199\u3057\u3002\u51fa\u3069\u3053\u308d\u3092\u899a\u3048\u3066\u3044\u308b\u3002 GitHub \u5074\u306e\u5199\u3057\u3067 upstream \u3078\u306e\u30ea\u30f3\u30af\u3092\u6301\u3064\u3002\u540c\u3058\u7d44\u7e54\u5185\u306b\u306f\u4f5c\u308c\u306a\u3044\u3002 ADR-01 \u4e0a\u6d41\uff08upstream\uff09 \u5199\u3057\u306e\u5143\u306e\u5834\u6240\u3002\u5909\u66f4\u306f\u305d\u3053\u304b\u3089\u6d41\u308c\u3066\u304f\u308b\u3002 \u30df\u30e9\u30fc\u3057\u30de\u30fc\u30b8\u3059\u308b\u5143\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3084\u30d6\u30e9\u30f3\u30c1\u3002\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\u306e\u540d\u524d\u306f <code>upstream/<kind>-<branch></code>\uff08\u4f8b: <code>upstream/public-develop</code>\u3001<code>upstream/private-master</code>\u3001<code>upstream/cos-develop</code>\uff09\u3002 SPEC-01 \u00a74\u3001SPEC-05 \u30df\u30e9\u30fc\uff08mirror\uff09 \u81ea\u52d5\u3067\u66f4\u65b0\u3055\u308c\u308b\u3001\u305d\u3063\u304f\u308a\u540c\u3058\u5199\u3057\u3002 \u65e5\u6b21\u306e fetch \u3068 fast-forward \u3067\u4e0a\u6d41\u306e\u53c2\u7167\u3068\u7b49\u3057\u304f\u4fdd\u3064\u30d6\u30e9\u30f3\u30c1\u3002\u76f4\u63a5\u7de8\u96c6\u3057\u306a\u3044\u3002 SPEC-05 \u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\uff08PR\uff09 \u8ab0\u304b\u304c\u898b\u3066\u53d7\u3051\u5165\u308c\u308b\u306e\u3092\u5f85\u3063\u3066\u3044\u308b\u3001\u5909\u66f4\u306e\u63d0\u6848\u3002 GitHub \u306e\u30ec\u30d3\u30e5\u30fc\u5358\u4f4d\u3002<code>develop</code> \u3078\u306e\u5909\u66f4\u306f\u3059\u3079\u3066 PR \u3092\u901a\u308a\u3001REV \u304c\u30ec\u30d3\u30e5\u30fc\u3001QAE \u304c\u691c\u67fb\u3001\u6240\u6709\u8005\u304c\u30de\u30fc\u30b8\u3002 ADR-04 \u30de\u30fc\u30b8\uff08merge\uff09 \u5909\u66f4\u3092\u5171\u6709\u306e\u30d6\u30e9\u30f3\u30c1\u3078\u53d7\u3051\u5165\u308c\u308b\u3053\u3068\u3002 \u5bfe\u8c61\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u308b\u3053\u3068\u3002\u3053\u3053\u3067\u306f\u4eba\u3060\u3051\u304c\u30de\u30fc\u30b8\u3057\u3001force push \u306f\u3057\u306a\u3044\u3002 POL-01 \u00a72 manifest \u3069\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u3069\u306e SHA \u304b\u3089\u7d44\u307f\u7acb\u3066\u308b\u304b\u306e\u4e00\u89a7\u3002 <code>manifest/upstreams.json</code>\uff08\u6b63\u672c\uff09\u3068 TOON \u6284\u9332\u3002\u540d\u524d\u30fb\u30d6\u30e9\u30f3\u30c1\u30fbSHA\u30fb\u65e5\u4ed8\u30fbPR \u756a\u53f7\u306e\u307f\u3002 SPEC-01 GitHub Actions \u30b3\u30fc\u30c9\u304c\u5909\u308f\u308b\u305f\u3073\u306b\u691c\u67fb\u3092\u8d70\u3089\u305b\u308b GitHub \u306e\u30ed\u30dc\u30c3\u30c8\u3002 GitHub \u306e CI\u3002<code>.github/workflows/</code> \u306e\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u304c\u30ea\u30f3\u30af\u691c\u67fb\u30fb\u79d8\u5bc6\u30b9\u30ad\u30e3\u30f3\u30fbMkDocs\u30fbSemgrep\u30fbamd64 \u30d3\u30eb\u30c9\u30fbTrivy \u3092\u8d70\u3089\u305b\u308b\u3002 SPEC-03 \u30bb\u30eb\u30d5\u30db\u30b9\u30c8\u30e9\u30f3\u30ca\u30fc GitHub \u306e\u30ed\u30dc\u30c3\u30c8\u304c\u691c\u67fb\u306e\u305f\u3081\u306b\u501f\u308a\u308b\u3001\u79c1\u305f\u3061\u306e\u8a08\u7b97\u6a5f\u3002 Mac Studio \u4e0a\u306e GitHub Actions \u30e9\u30f3\u30ca\u30fc\u3002arm64 \u30d3\u30eb\u30c9\u3068 Playwright \u53d7\u5165\u306b\u4f7f\u3044\u3001\u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u9650\u5b9a\u3002 SPEC-04 CI continuous integration\u3002\u5909\u66f4\u3054\u3068\u306b\u81ea\u52d5\u3067\u8d70\u308b\u691c\u67fb\u3002 PR \u3092\u30de\u30fc\u30b8\u3059\u308b\u524d\u306b\u5408\u683c\u304c\u5fc5\u9808\u306e\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306e\u96c6\u307e\u308a\u3002 SPEC-03"},{"location":"reference/REF-01_Glossary/#b-\u30b3\u30f3\u30c6\u30ca\u3068\u5b9f\u884c\u74b0\u5883","title":"B. \u30b3\u30f3\u30c6\u30ca\u3068\u5b9f\u884c\u74b0\u5883","text":"\u7528\u8a9e \u307f\u3093\u306a\u5411\u3051 \u6280\u8853\u8005\u5411\u3051 \u4f7f\u308f\u308c\u308b\u5834\u6240 \u30b3\u30f3\u30c6\u30ca\uff08container\uff09 \u4e00\u3064\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u3068\u5fc5\u8981\u306a\u3082\u306e\u3092\u4e00\u7bb1\u306b\u5165\u308c\u3001\u3069\u3053\u3067\u3082\u540c\u3058\u3088\u3046\u306b\u52d5\u304b\u3059\u7bb1\u3002 \u30db\u30b9\u30c8\u306e\u30ab\u30fc\u30cd\u30eb\u3092\u5171\u6709\u3059\u308b\u9694\u96e2\u3055\u308c\u305f\u30d7\u30ed\u30bb\u30b9\u7fa4\u3002\u30a4\u30e1\u30fc\u30b8\u304b\u3089\u4f5c\u308a\u3001\u3053\u3053\u3067\u306f\u975e root \u3067\u52d5\u304b\u3059\u3002 SPEC-02 \u30a4\u30e1\u30fc\u30b8\uff08image\uff09 \u30b3\u30f3\u30c6\u30ca\u3092\u4f5c\u308b\u305f\u3081\u306e\u30ec\u30b7\u30d4\u3068\u6750\u6599\u3002 Dockerfile \u304b\u3089\u4f5c\u308b\u5c64\u72b6\u306e\u8aad\u307f\u53d6\u308a\u5c02\u7528\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u3002\u65e2\u5b9a\u306f\u30ed\u30fc\u30ab\u30eb\u30d3\u30eb\u30c9\u3001\u4efb\u610f\u3067\u975e\u516c\u958b\u30ec\u30b8\u30b9\u30c8\u30ea\u3078\u3002 SPEC-02 Docker \u30a4\u30e1\u30fc\u30b8\u3092\u4f5c\u308a\u3001\u30b3\u30f3\u30c6\u30ca\u3092\u52d5\u304b\u3059\u9053\u5177\u3002 Docker Engine 27 \u4ee5\u4e0a\uff08Mac Studio \u3067\u306f 29.x\uff09\u3068 Compose\u30fbbuildx \u30d7\u30e9\u30b0\u30a4\u30f3\u3002\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u304c\u5bfe\u5fdc\u3059\u308b\u552f\u4e00\u306e\u30b3\u30f3\u30c6\u30ca\u5b9f\u884c\u57fa\u76e4\u3002 SPEC-02 Docker Compose \u4e00\u3064\u306e\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u591a\u304f\u306e\u30b3\u30f3\u30c6\u30ca\u3092\u307e\u3068\u3081\u3066\u8d77\u3053\u3059\u9053\u5177\u3002 \u751f\u6210\u3057\u305f <code>runtime/docker-compose.yml</code> \u3092\u8aad\u3080 <code>docker compose</code> \u30d7\u30e9\u30b0\u30a4\u30f3\uff08v2 \u4ee5\u4e0a\u3002Mac Studio \u3067\u306f 5.x\uff09\u3002\u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3068 DNS \u3092\u63d0\u4f9b\u3059\u308b\u3002 ADR-02 buildx \u4e00\u3064\u306e\u30a4\u30e1\u30fc\u30b8\u3092\u4f55\u7a2e\u985e\u304b\u306e\u8a08\u7b97\u6a5f\u5411\u3051\u306b\u4e00\u5ea6\u306b\u4f5c\u308b Docker \u306e\u52a9\u624b\u3002 BuildKit \u30d9\u30fc\u30b9\u306e\u30d3\u30eb\u30c0\u30fc\u3002<code>--platform linux/amd64,linux/arm64</code> \u3067\u8907\u6570\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3\u306e\u30a4\u30e1\u30fc\u30b8\u3092\u4f5c\u308b\u3002 SPEC-02 \u30de\u30eb\u30c1\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3\uff08arm64 / amd64\uff09 \u540c\u3058\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u3001\u4e8c\u7a2e\u985e\u306e\u30c1\u30c3\u30d7\u306e\u8a08\u7b97\u6a5f\u3067\u52d5\u304b\u3059\u3053\u3068\u3002 <code>linux/arm64</code>\uff08Apple Silicon\u3001ARM \u30b5\u30fc\u30d0\uff09\u3068 <code>linux/amd64</code>\uff08Intel/AMD\uff09\u5411\u3051\u306e\u30a4\u30e1\u30fc\u30b8\u3092\u4f5c\u308b\u3002\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u304c <code>platform</code> \u3092\u81ea\u52d5\u5224\u5b9a\u3059\u308b\u3002 SPEC-02 Apple Silicon 2020 \u5e74\u304b\u3089 Apple \u304c Mac \u306b\u5165\u308c\u3066\u3044\u308b\u30c1\u30c3\u30d7\u3002 arm64 \u306e CPU\uff08M \u30b7\u30ea\u30fc\u30ba\uff09\u3002Mac Studio \u4e0a\u306e\u4e3b\u306a\u958b\u767a\u5bfe\u8c61\u3002 SPEC-00 WSL2 Windows \u306e\u4e2d\u3067 Linux \u3092\u52d5\u304b\u3059\u4ed5\u7d44\u307f\u3002 Windows Subsystem for Linux 2\u3002WSL2 \u30d0\u30c3\u30af\u30a8\u30f3\u30c9\u306e Docker Desktop \u304c Windows 11 \u3067\u5bfe\u5fdc\u3059\u308b\u7d4c\u8def\u3002 SPEC-02 \u30eb\u30fc\u30d7\u30d0\u30c3\u30af / localhost \u81ea\u5206\u306e\u8a08\u7b97\u6a5f\u3078\u623b\u3063\u3066\u304f\u308b\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u9053\u3002 <code>lo</code> \u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u3002<code>127.0.0.1</code>\uff08IPv4\uff09\u3068 <code>::1</code>\uff08IPv6\uff09\u3002\u516c\u958b\u3092\u8a31\u3059\u552f\u4e00\u306e\u30a2\u30c9\u30ec\u30b9\u3002 ADR-02 \u30dd\u30fc\u30c8\uff08port\uff09 \u30a2\u30c9\u30ec\u30b9\u306b\u4ed8\u3044\u305f\u756a\u53f7\u4ed8\u304d\u306e\u6249\u3002\u30d7\u30ed\u30b0\u30e9\u30e0\u306f\u3053\u3053\u3067\u5f85\u3064\u3002 TCP/UDP \u306e\u30dd\u30fc\u30c8\u3002\u65e2\u5b9a\u306e\u30db\u30b9\u30c8\u5074\u30dd\u30fc\u30c8\uff08<code>5000</code> web\u3001<code>8000</code> api\u3001<code>8001</code> admin\u3001<code>7777</code> wb\u3001<code>7778</code> mfr\u3001<code>8080</code> fakecas\u3001<code>4200</code> ember\uff09\u306f SPEC-02 \u00a74 \u306e\u30dd\u30fc\u30c8\u8868\u3067\u5b9a\u3081\u308b\u3002 SPEC-02 \u00a74\u3001ADR-02 \u975e root\uff08non-root\uff09 \u306a\u3093\u3067\u3082\u3067\u304d\u308b\u7ba1\u7406\u8005\u3067\u306f\u306a\u304f\u3001\u666e\u901a\u306e\u5229\u7528\u8005\u3068\u3057\u3066\u52d5\u304b\u3059\u3053\u3068\u3002 \u30b3\u30f3\u30c6\u30ca\u306f 0 \u4ee5\u5916\u306e UID \u3067\u52d5\u304f\u3002\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306e\u3069\u3053\u306b\u3082 <code>sudo</code> \u304c\u306a\u3044\u3002 SPEC-03 venv \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3054\u3068\u306e Python \u9053\u5177\u7bb1\u3002\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540c\u58eb\u304c\u3051\u3093\u304b\u3057\u306a\u3044\u3002 Python \u306e\u4eee\u60f3\u74b0\u5883\u3002\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u3001<code>grdm-dev</code>\u3001Playwright \u8a66\u9a13\u304c\u4e00\u3064\u306e venv \u3092\u5171\u6709\u3059\u308b\u3002 SPEC-02 EOL end of life\u3002\u4f5c\u3063\u305f\u4eba\u304c\u30d0\u30b0\u3084\u7a74\u3092\u76f4\u3057\u3066\u304f\u308c\u306a\u304f\u306a\u3063\u305f\u72b6\u614b\u3002 \u30d9\u30f3\u30c0\u30fc\u306e\u30b5\u30dd\u30fc\u30c8\u671f\u9650\u3092\u904e\u304e\u305f\u7248\u3002\u73fe\u5728\u306e\u4e0a\u6d41\u306e\u571f\u53f0\u30a4\u30e1\u30fc\u30b8\u306f\u3059\u3079\u3066 EOL \u3067\u3001M4\u301cM5 \u3067\u7f6e\u304d\u63db\u3048\u308b\u3002 POL-01 \u00a71"},{"location":"reference/REF-01_Glossary/#c-\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3","title":"C. \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3","text":"\u7528\u8a9e \u307f\u3093\u306a\u5411\u3051 \u6280\u8853\u8005\u5411\u3051 \u4f7f\u308f\u308c\u308b\u5834\u6240 \u8106\u5f31\u6027\uff08vulnerability\uff09 \u653b\u6483\u8005\u304c\u5165\u308a\u8fbc\u3081\u308b\u5f31\u3044\u5834\u6240\u3002 \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u4e0a\u306e\u6b20\u9665\u3002\u591a\u304f\u306f CVE \u3068\u3057\u3066\u6df1\u523b\u5ea6\u4ed8\u304d\u3067\u8ffd\u8de1\u3055\u308c\u308b\u3002 SPEC-03 CVE \u65e2\u77e5\u306e\u7a74\u4e00\u3064\u306b\u4ed8\u3051\u3089\u308c\u305f\u516c\u958b\u306e\u756a\u53f7\u3002 Common Vulnerabilities and Exposures \u306e\u8b58\u5225\u5b50\uff08<code>CVE-YYYY-NNNNN</code>\uff09\u3068 CVSS \u6df1\u523b\u5ea6\u3002\u9580\u306e\u95be\u5024\u306f CRITICAL/HIGH\u3002 SPEC-03\u3001ADR-03 SBOM \u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u306e\u4e2d\u8eab\u306e\u6750\u6599\u3092\u3059\u3079\u3066\u66f8\u3044\u305f\u4e00\u89a7\u3002 Software Bill of Materials\uff08CycloneDX \u304b SPDX\uff09\u3002Trivy \u304c\u30a4\u30e1\u30fc\u30b8\u3054\u3068\u306b\u51fa\u3059\u3002 SPEC-03 \u79d8\u5bc6\uff08secret\uff09 \u4ed6\u4eba\u304c\u8aad\u3081\u308b\u5834\u6240\u306b\u66f8\u3044\u3066\u306f\u3044\u3051\u306a\u3044\u30d1\u30b9\u30ef\u30fc\u30c9\u3084\u9375\u3002 \u8cc7\u683c\u60c5\u5831\u3068\u30c8\u30fc\u30af\u30f3\u3002\u5c0e\u5165\u6642\u306b\u4e71\u6570\u3067\u751f\u6210\u3057\u3001\u30b3\u30df\u30c3\u30c8\u3057\u306a\u3044\u3002CI \u306e\u79d8\u5bc6\u30b9\u30ad\u30e3\u30f3\u306f\u5fc5\u9808\u3002 SPEC-03 \u8a31\u5bb9\u30ea\u30b9\u30c8\uff08allow-list\uff09 \u898b\u305f\u4e0a\u3067\u4eca\u306f\u53d7\u3051\u5165\u308c\u308b\u3001\u65e2\u77e5\u306e\u554f\u984c\u306e\u77ed\u3044\u4e00\u89a7\u3002 \u7406\u7531\u30fb\u62c5\u5f53\u30fb\u671f\u9650\u4ed8\u304d\u3067\u53d7\u3051\u5165\u308c\u305f CVE \u3092 <code>manifest/allowlist.json</code> \u306b\u7f6e\u304f\u3002\u4ef6\u6570\u306f\u7bc0\u76ee\u3054\u3068\u306b\u6e1b\u3089\u3059\u3002 SPEC-03 \u00a75\u3001ADR-03 \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u9580\uff08security gate\uff09 \u901a\u3089\u306a\u3044\u3068\u4f7f\u3048\u306a\u3044\u691c\u554f\u6240\u3002 \u6bb5\u968e\u65b9\u5f0f: \u5831\u544a\u306e\u307f\uff08M1\u301cM3\uff09\u3001HIGH \u3067\u505c\u6b62\uff08M4\uff09\u3001CRITICAL/HIGH \u30bc\u30ed\u3068\u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u5408\u683c\uff08M5\uff09\u3002 ADR-03 Trivy \u30a4\u30e1\u30fc\u30b8\u3092\u8aad\u3093\u3067\u3001\u77e5\u3063\u3066\u3044\u308b\u7a74\u3092\u4e26\u3079\u308b\u30b9\u30ad\u30e3\u30ca\u3002 Aqua Security \u306e\u30a4\u30e1\u30fc\u30b8\u30fb\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u7528\u30b9\u30ad\u30e3\u30ca\u3002SBOM \u3068 CVE \u5831\u544a\u3092\u51fa\u3059\u3002\u4ee3\u66ff\u306f Grype\u3002 SPEC-03 Semgrep \u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u3092\u8aad\u3093\u3067\u5371\u306a\u3044\u66f8\u304d\u65b9\u3092\u63a2\u3059\u9053\u5177\u3002 \u30eb\u30fc\u30eb\u30d1\u30c3\u30af\u4ed8\u304d\u306e\u9759\u7684\u89e3\u6790\uff08SAST\uff09\u3002\u5168 PR \u306e CI \u3067\u8d70\u308b\u3002\u4ee3\u66ff\u306f CodeQL\u3002 SPEC-03 OWASP ZAP \u52d5\u3044\u3066\u3044\u308b Web \u30b5\u30a4\u30c8\u3092\u3001\u653b\u6483\u8005\u306e\u3084\u308a\u65b9\u3067\u3064\u3064\u304f\u9053\u5177\u3002 OWASP \u306e\u52d5\u7684\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u8a66\u9a13\uff08DAST\uff09\u30d7\u30ed\u30ad\u30b7\u3002\u30ed\u30fc\u30ab\u30eb\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3060\u3051\u306b\u5411\u3051\u308b\u3002 SPEC-03 \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\uff08red team\uff09 \u7a74\u3092\u5148\u306b\u898b\u3064\u3051\u308b\u305f\u3081\u306b\u3001\u308f\u3056\u3068\u81ea\u5206\u306e\u30b7\u30b9\u30c6\u30e0\u3092\u653b\u3081\u308b\u4eba\u3084\u30d7\u30ed\u30b0\u30e9\u30e0\u3002 \u627f\u8a8d\u6e08\u307f AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u3002\u9694\u96e2\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u5185\u306e\u81ea\u74b0\u5883\u3060\u3051\u3092\u5bfe\u8c61\u306b\u3059\u308b\u3002\u627f\u8a8d\u624b\u9806\u306f SPEC-03\u3002 ADR-03"},{"location":"reference/REF-01_Glossary/#d-\u8a66\u9a13\u3068\u54c1\u8cea","title":"D. \u8a66\u9a13\u3068\u54c1\u8cea","text":"\u7528\u8a9e \u307f\u3093\u306a\u5411\u3051 \u6280\u8853\u8005\u5411\u3051 \u4f7f\u308f\u308c\u308b\u5834\u6240 \u5358\u4f53\u8a66\u9a13\uff08unit test\uff09 \u5c0f\u3055\u306a\u90e8\u54c1\u4e00\u3064\u304c\u5358\u72ec\u3067\u52d5\u304f\u304b\u306e\u78ba\u8a8d\u3002 \u95a2\u6570\u3084\u30af\u30e9\u30b9\u4e00\u3064\u3092\u5207\u308a\u96e2\u3057\u3066\u8a66\u3059\u3002Python \u306e <code>unittest</code>/pytest\u3002 SPEC-04 \u7d71\u5408\u8a66\u9a13\uff08integration test\uff09 \u3044\u304f\u3064\u304b\u306e\u90e8\u54c1\u304c\u4e00\u7dd2\u306b\u52d5\u304f\u304b\u306e\u78ba\u8a8d\u3002 \u30b5\u30fc\u30d3\u30b9\u306e\u5883\u754c\u3092\u307e\u305f\u3050\u8a66\u9a13\uff08\u4f8b: web \u304c Compose \u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u7d4c\u7531\u3067 wb \u3092\u547c\u3076\uff09\u3002 SPEC-04 \u53d7\u5165\u8a66\u9a13\uff08acceptance test\uff09 \u5168\u4f53\u304c\u5229\u7528\u8005\u306e\u671b\u307f\u3069\u304a\u308a\u306b\u52d5\u304f\u304b\u306e\u78ba\u8a8d\u3002 \u30d6\u30e9\u30a6\u30b6\u3092\u901a\u3057\u305f\u7aef\u304b\u3089\u7aef\u307e\u3067\u306e\u30b7\u30ca\u30ea\u30aa: \u30ed\u30b0\u30a4\u30f3\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u4f5c\u6210\u3001\u30d5\u30a1\u30a4\u30eb\u4e0a\u4e0b\u8f09\u3001Wiki \u5171\u540c\u7de8\u96c6\u3001\u30d7\u30ec\u30d3\u30e5\u30fc\u3001\u6a5f\u95a2\u7ba1\u7406\u3002\u5404\u30b7\u30ca\u30ea\u30aa\u306b\u6210\u529f\u3068\u62d2\u5426\u306e\u30b1\u30fc\u30b9\u3002 SPEC-04 \u56de\u5e30\u8a66\u9a13\uff08regression test\uff09 \u524d\u306b\u52d5\u3044\u3066\u3044\u305f\u3082\u306e\u304c\u3001\u4eca\u3082\u52d5\u304f\u304b\u306e\u78ba\u8a8d\u3002 \u5909\u66f4\u3054\u3068\u306b\u4ee5\u524d\u306e\u53d7\u5165\u30fb\u5358\u4f53\u306e\u4e00\u5f0f\u3092\u518d\u5b9f\u884c\u3059\u308b\u3002\u30de\u30fc\u30b8\u524d\u306b\u5fc5\u9808\u3002 SPEC-04 Playwright Web \u30d6\u30e9\u30a6\u30b6\u3092\u64cd\u4f5c\u3057\u3066 Web \u30b5\u30a4\u30c8\u3092\u8a66\u3059\u30ed\u30dc\u30c3\u30c8\u3002 Playwright for Python\u3002\u5171\u6709 venv \u3067\u3001<code>127.0.0.1</code> \u306e Chromium \u306b\u5bfe\u3057\u3066\u8d70\u308b\u3002 SPEC-04"},{"location":"reference/REF-01_Glossary/#e-\u6587\u66f8\u3068\u30c7\u30fc\u30bf\u5f62\u5f0f","title":"E. \u6587\u66f8\u3068\u30c7\u30fc\u30bf\u5f62\u5f0f","text":"\u7528\u8a9e \u307f\u3093\u306a\u5411\u3051 \u6280\u8853\u8005\u5411\u3051 \u4f7f\u308f\u308c\u308b\u5834\u6240 MkDocs Markdown \u306e\u30d5\u30a1\u30a4\u30eb\u3092 Web \u30b5\u30a4\u30c8\u306b\u5909\u3048\u308b\u9053\u5177\u3002 Material \u30c6\u30fc\u30de\u306e MkDocs\u3002<code>grdm-dev docs</code> \u304c <code>site/</code> \u3092\u4f5c\u308a\u3001GitHub Pages \u3067\u516c\u958b\u3002 SPEC-06 \u00a75 Mermaid \u6587\u5b57\u3092\u6253\u3063\u3066\u56f3\u3092\u63cf\u304f\u4ed5\u7d44\u307f\u3002 <code>```mermaid</code> \u306e\u30b3\u30fc\u30c9\u30d6\u30ed\u30c3\u30af\u3002GitHub \u3068 MkDocs \u304c\u63cf\u753b\u3059\u308b\u3002\u69cb\u6210\u56f3\u30fb\u6d41\u308c\u56f3\u306f\u3053\u308c\u3060\u3051\u3092\u8a31\u3059\u3002 SPEC-06 \u00a74 TOON JSON \u306e\u30c7\u30fc\u30bf\u3092\u77ed\u304f\u5b57\u4e0b\u3052\u3067\u66f8\u3044\u305f\u5f62\u3002\u4eba\u306b\u3082 AI \u306b\u3082\u8aad\u307f\u3084\u3059\u3044\u3002 Token-Oriented Object Notation\u3002\u6587\u66f8\u5185\u306e\u30c7\u30fc\u30bf\u306b\u4f7f\u3046\u3002\u6b63\u672c\u306f JSON/YAML \u306b\u7f6e\u304d\u3001<code>grdm-dev manifest check</code> \u304c\u4e00\u81f4\u3092\u78ba\u304b\u3081\u308b\u3002 SPEC-06 \u00a74 JSON \u6ce2\u62ec\u5f27\u3068\u5f15\u7528\u7b26\u3067\u30c7\u30fc\u30bf\u3092\u66f8\u304f\u3001\u30d7\u30ed\u30b0\u30e9\u30e0\u304c\u8aad\u307f\u3084\u3059\u3044\u6587\u5b57\u306e\u5f62\u3002 JavaScript Object Notation\u3002manifest \u3068\u5831\u544a\u66f8\u306e\u6b63\u672c\u306e\u5f62\u5f0f\u3002 SPEC-01 YAML \u5b57\u4e0b\u3052\u3067\u30c7\u30fc\u30bf\u3092\u66f8\u304f\u3001\u4eba\u304c\u8aad\u307f\u3084\u3059\u3044\u6587\u5b57\u306e\u5f62\u3002 Compose \u30d5\u30a1\u30a4\u30eb\u3001MkDocs\u3001GitHub Actions \u306e\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306b\u4f7f\u3046\u3002 SPEC-02"},{"location":"reference/REF-01_Glossary/#f-\u30ed\u30b0\u30a4\u30f3\u3068\u8eab\u5143","title":"F. \u30ed\u30b0\u30a4\u30f3\u3068\u8eab\u5143","text":"\u7528\u8a9e \u307f\u3093\u306a\u5411\u3051 \u6280\u8853\u8005\u5411\u3051 \u4f7f\u308f\u308c\u308b\u5834\u6240 CAS \u305f\u304f\u3055\u3093\u306e Web \u30b5\u30a4\u30c8\u304c\u5171\u6709\u3059\u308b\u30ed\u30b0\u30a4\u30f3\u4fc2\u3002\u4e00\u5ea6\u30ed\u30b0\u30a4\u30f3\u3059\u308c\u3070\u5168\u90e8\u4f7f\u3048\u308b\u3002 Central Authentication Service \u30d7\u30ed\u30c8\u30b3\u30eb\u3002GRDM \u306e <code>cas-overlay</code> \u304c\u5b9f\u88c5\u3057\u3001OSF \u306e web/api \u304c\u305d\u308c\u3092\u4fe1\u983c\u3059\u308b\u3002 SPEC-04 fakecas \u958b\u767a\u8005\u5411\u3051\u306e\u300c\u306b\u305b\u3082\u306e CAS\u300d\u3002\u3069\u3093\u306a\u540d\u524d\u3067\u3082\u30d1\u30b9\u30ef\u30fc\u30c9\u306a\u3057\u3067\u5165\u308c\u308b\u3002 \u958b\u767a\u3067 cas-overlay \u306e\u4ee3\u308f\u308a\u306b\u7acb\u3064\u5c0f\u3055\u306a Go \u306e\u30b5\u30fc\u30d3\u30b9\u3002\u53d7\u5165\u3067\u306f Shibboleth \u3068\u6392\u4ed6\u3002 ADR-02\u3001SPEC-04 SAML \u3042\u308b Web \u30b5\u30a4\u30c8\u304c\u5225\u306e\u30b5\u30a4\u30c8\u306b\u300c\u3053\u306e\u4eba\u306f\u78ba\u304b\u306b\u30ed\u30b0\u30a4\u30f3\u3057\u305f\u300d\u3068\u4f1d\u3048\u308b\u6a19\u6e96\u306e\u65b9\u6cd5\u3002 Security Assertion Markup Language 2.0\u3002IdP \u3068 SP \u306e\u9593\u306e XML \u30a2\u30b5\u30fc\u30b7\u30e7\u30f3\u3002 SPEC-04 IdP / SP IdP \u306f\u30ed\u30b0\u30a4\u30f3\u3059\u308b\u5834\u6240\u3001SP \u306f\u305d\u308c\u3092\u4fe1\u3058\u308b Web \u30b5\u30a4\u30c8\u3002 SAML \u306e Identity Provider \u3068 Service Provider\u3002\u53d7\u5165\u306e\u305f\u3081\u306b\u30c6\u30b9\u30c8\u7528 IdP \u30b3\u30f3\u30c6\u30ca\u3092\u540c\u68b1\u3059\u308b\u3002 SPEC-04 Shibboleth \u5927\u5b66\u5411\u3051\u306b SAML \u30ed\u30b0\u30a4\u30f3\u3092\u52d5\u304b\u3059\u30bd\u30d5\u30c8\u3002 <code>RDM-Shibboleth-SP</code> \u306e Shibboleth SP\uff08Apache \u30e2\u30b8\u30e5\u30fc\u30eb\uff09\u3002GRDM \u3092 GakuNin \u306b\u3064\u306a\u3050\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\u3002 SPEC-00 GakuNin\uff08\u5b66\u8a8d\uff09 \u5927\u5b66\u306e\u30a2\u30ab\u30a6\u30f3\u30c8\u3067\u30ed\u30b0\u30a4\u30f3\u3059\u308b\u305f\u3081\u306e\u65e5\u672c\u306e\u5b66\u8853\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3002 NII \u304c\u904b\u55b6\u3059\u308b\u65e5\u672c\u306e\u5b66\u8853\u30a2\u30af\u30bb\u30b9\u7ba1\u7406\u30d5\u30a7\u30c7\u30ec\u30fc\u30b7\u30e7\u30f3\u3002GRDM \u306f Shibboleth \u7d4c\u7531\u3067 GakuNin \u306e IdP \u3092\u53d7\u3051\u5165\u308c\u308b\u3002 SPEC-00"},{"location":"reference/REF-01_Glossary/#g-grdm-\u306e\u90e8\u54c1\u3068\u4e0a\u6d41","title":"G. GRDM \u306e\u90e8\u54c1\u3068\u4e0a\u6d41","text":"\u7528\u8a9e \u307f\u3093\u306a\u5411\u3051 \u6280\u8853\u8005\u5411\u3051 \u4f7f\u308f\u308c\u308b\u5834\u6240 OSF / COS OSF \u306f GRDM \u306e\u571f\u53f0\u306b\u306a\u3063\u305f\u7814\u7a76\u5171\u6709\u306e Web \u30b5\u30a4\u30c8\u3002COS \u306f\u305d\u308c\u3092\u4f5c\u308b\u7c73\u56fd\u306e\u56e3\u4f53\u3002 Center for Open Science \u306e Open Science Framework\u3002<code>CenterForOpenScience/*</code> \u3092 <code>upstream/cos-develop</code> \u3068\u3057\u3066\u8ffd\u8de1\u3059\u308b\u3002 ADR-01 osf.io GRDM \u306e\u4e2d\u5fc3\u3002Web \u30b5\u30a4\u30c8\u3068 API\u3002 Django \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\uff08<code>RDM-osf.io</code>\uff09\u3002\u30b5\u30fc\u30d3\u30b9\u306f <code>web</code>\u3001<code>api</code>\u3001<code>admin</code>\u3001<code>worker</code>\u3002 SPEC-00 waterbutler\uff08wb\uff09 \u30d5\u30a1\u30a4\u30eb\u3092\u4fdd\u7ba1\u5834\u6240\u3078\u51fa\u3057\u5165\u308c\u3059\u308b\u90e8\u54c1\u3002 Python/aiohttp \u306e\u30d5\u30a1\u30a4\u30eb\u30a2\u30af\u30bb\u30b9\u30b5\u30fc\u30d3\u30b9\uff08<code>RDM-waterbutler</code>\uff09\u3002\u30b5\u30fc\u30d3\u30b9\u306f <code>wb</code>\u3001<code>wb_worker</code>\u3002 SPEC-00 modular-file-renderer\uff08mfr\uff09 \u30d5\u30a1\u30a4\u30eb\u306e\u30d7\u30ec\u30d3\u30e5\u30fc\u3092\u30d6\u30e9\u30a6\u30b6\u306b\u898b\u305b\u308b\u90e8\u54c1\u3002 Python/aiohttp \u306e\u63cf\u753b\u30b5\u30fc\u30d3\u30b9\uff08<code>RDM-modular-file-renderer</code>\uff09\u3002\u30b5\u30fc\u30d3\u30b9\u306f <code>mfr</code>\u3002 SPEC-00 ember-osf-web GRDM \u306e\u65b0\u3057\u3044\u65b9\u306e Web \u753b\u9762\u3002 Ember.js \u306e\u30d5\u30ed\u30f3\u30c8\u30a8\u30f3\u30c9\uff08<code>RDM-ember-osf-web</code>\uff09\u3002\u30b5\u30fc\u30d3\u30b9\u306f <code>ember_osf_web</code>\u3002 SPEC-00 cas-overlay GRDM \u306e\u672c\u7269\u306e\u30ed\u30b0\u30a4\u30f3\u30b5\u30fc\u30d0\u3002 Apereo CAS \u306e\u30aa\u30fc\u30d0\u30fc\u30ec\u30a4\uff08<code>RDM-cas-overlay</code>\u3001JDK\uff09\u3002\u30b5\u30fc\u30d3\u30b9\u306f <code>cas</code>\u3002 SPEC-00 wiki-frontend Wiki \u306e\u7de8\u96c6\u753b\u9762\u3002 GRDM Wiki \u306e\u30d5\u30ed\u30f3\u30c8\u30a8\u30f3\u30c9\uff08<code>RDM-wiki-frontend</code>\uff09\u3002\u5171\u540c\u7de8\u96c6\u306f y-websocket \u3068\u7d44\u3080\u3002 SPEC-00 y-websocket \u4e8c\u4eba\u304c\u540c\u3058 Wiki \u30da\u30fc\u30b8\u3092\u540c\u6642\u306b\u7de8\u96c6\u3067\u304d\u308b\u3088\u3046\u306b\u3059\u308b\u88cf\u65b9\u3002 \u5171\u540c\u7de8\u96c6\u306e\u305f\u3081\u306e Yjs WebSocket \u30b5\u30fc\u30d0\uff08<code>RDM-y-webocket-develop-private</code>\u3002\u30ea\u30dd\u30b8\u30c8\u30ea\u540d\u306f\u4e0a\u6d41\u306e\u7db4\u308a\u306e\u307e\u307e\uff09\u3002 SPEC-00 OASys M3 \u3067\u52a0\u3048\u308b GRDM \u306e\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\uff08\u975e\u516c\u958b\uff09\u3002 <code>RDM-OASys-main-private</code> \u306e\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\u3002\u7bc4\u56f2\u3068\u8a66\u9a13\u306f M3 \u3067\u5b9a\u3081\u308b\u3002 SPEC-00 rdmcp / MCP AI \u30a2\u30b7\u30b9\u30bf\u30f3\u30c8\u304c\u6a19\u6e96\u306e\u5dee\u3057\u8fbc\u307f\u53e3\u3067 GRDM \u3068\u8a71\u3059\u4ed5\u7d44\u307f\u3002 GRDM \u5411\u3051\u306e Model Context Protocol \u30b5\u30fc\u30d0\uff08<code>RDM-rdmcp-private</code>\uff09\u3002 SPEC-00 AIPF AI \u57fa\u76e4\u5411\u3051\u306e GRDM \u30c7\u30fc\u30bf\u63a5\u7d9a\u90e8\u54c1\uff08\u975e\u516c\u958b\uff09\u3002 <code>RDM-aipf_mcp_data_grdm-private</code>\u3002GRDM \u306e MCP \u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u3002 SPEC-00 Elasticsearch GRDM \u306e\u4e2d\u306e\u691c\u7d22\u30a8\u30f3\u30b8\u30f3\u3002 \u73fe\u5728\u306f ES 2 \u3068 6.3.1\u3002M5 \u3067 ES 8 \u306b\u96c6\u7d04\u3002 POL-01 \u00a74 PostgreSQL GRDM \u304c\u8a18\u9332\u3092\u4fdd\u5b58\u3059\u308b\u4e3b\u306a\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3002 \u73fe\u5728\u306f PostgreSQL 9.6\u3002M5 \u3067 15 \u4ee5\u964d\u3002 POL-01 \u00a74 MongoDB GRDM \u304c\u4e00\u90e8\u3067\u307e\u3060\u4f7f\u3063\u3066\u3044\u308b\u53e4\u3044\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3002 MongoDB 3.4\uff08sharejs \u7528\uff09\u3002M5 \u3067\u5ec3\u6b62\u3002 POL-01 \u00a74 RabbitMQ \u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u5f85\u3061\u884c\u5217\u3002\u4ed5\u4e8b\u304c\u4f5c\u696d\u8005\u3092\u5f85\u3064\u5217\u3002 osf.io \u306e Celery \u30ef\u30fc\u30ab\u30fc\u304c\u4f7f\u3046 AMQP \u30d6\u30ed\u30fc\u30ab\u30fc\u3002 SPEC-00 Redis \u30ad\u30e3\u30c3\u30b7\u30e5\u3084\u30bb\u30c3\u30b7\u30e7\u30f3\u306b\u4f7f\u3046\u3001\u3068\u3066\u3082\u901f\u3044\u30e1\u30e2\u30ea\u306e\u4fdd\u7ba1\u5eab\u3002 osf.io \u3068 wb/mfr \u304c\u4f7f\u3046\u30a4\u30f3\u30e1\u30e2\u30ea\u306e\u30ad\u30fc\u5024\u30b9\u30c8\u30a2\u3002 SPEC-00"},{"location":"reference/REF-01_Glossary/#h-ai-\u306e\u9053\u5177\u3068\u5f79\u5272","title":"H. AI \u306e\u9053\u5177\u3068\u5f79\u5272","text":"\u7528\u8a9e \u307f\u3093\u306a\u5411\u3051 \u6280\u8853\u8005\u5411\u3051 \u4f7f\u308f\u308c\u308b\u5834\u6240 LLM / \u30ed\u30fc\u30ab\u30eb LLM \u5927\u898f\u6a21\u8a00\u8a9e\u30e2\u30c7\u30eb\u306f\u6587\u7ae0\u3092\u8aad\u307f\u66f8\u304d\u3059\u308b AI\u3002\u30ed\u30fc\u30ab\u30eb\u7248\u306f\u81ea\u5206\u306e\u8a08\u7b97\u6a5f\u3067\u52d5\u304f\u3002 \u30ed\u30fc\u30ab\u30eb LLM\uff08LM Studio \u7d4c\u7531\u306e Qwen 3 Coder Next\uff09\u304c AID \u30ef\u30fc\u30ab\u30fc\u3092\u52d5\u304b\u3059\u3002\u975e\u516c\u958b\u30b3\u30fc\u30c9\u7531\u6765\u306e\u3082\u306e\u306f\u3001POL-05 \u306e\u30c7\u30fc\u30bf\u53d6\u308a\u6271\u3044\u898f\u5247\u306a\u3057\u306b\u5916\u90e8\u30e2\u30c7\u30eb\u3078\u9001\u3089\u306a\u3044\u3002 ADR-04 Orca AI \u30ef\u30fc\u30ab\u30fc\u306e\u4f5c\u696d\u673a\u3002\u4f5c\u696d\u5834\u3068\u7aef\u672b\u3092\u958b\u3044\u3066\u3042\u3052\u308b\u3002 Open Code 2 \u3068 Codex \u306e\u30ef\u30fc\u30ab\u30fc\u3092\u5225\u3005\u306e worktree \u3067\u52d5\u304b\u3059\u30aa\u30fc\u30b1\u30b9\u30c8\u30ec\u30fc\u30b7\u30e7\u30f3\u9053\u5177\u3002 ADR-04 Open Code 2 \u30b3\u30fc\u30c9\u3092\u66f8\u304f AI \u30d7\u30ed\u30b0\u30e9\u30e0\uff08\u79c1\u305f\u3061\u306e AID \u30ef\u30fc\u30ab\u30fc\uff09\u3002 Orca \u306e\u4e2d\u3067\u30ed\u30fc\u30ab\u30eb LLM \u3067\u52d5\u304f\u5b9f\u88c5\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3002 ADR-04 Codex \u5168 PR \u3092\u30ec\u30d3\u30e5\u30fc\u3059\u308b AI \u30d7\u30ed\u30b0\u30e9\u30e0\uff08\u79c1\u305f\u3061\u306e REV\uff09\u3002 Orca \u30ef\u30fc\u30ab\u30fc\u3068\u3057\u3066\u306e Codex Astra\uff08<code>gpt-6-astra</code>\uff09\u3002\u30ec\u30d3\u30e5\u30fc\u3092 <code>docs/reviews/</code> \u3068 PR \u30b3\u30e1\u30f3\u30c8\u306b\u8a18\u9332\u3059\u308b\u3002 ADR-04 Claude Code \u4ed5\u69d8\u3092\u66f8\u304d\u3001\u7d50\u679c\u3092\u691c\u67fb\u3059\u308b AI \u30d7\u30ed\u30b0\u30e9\u30e0\uff08\u79c1\u305f\u3061\u306e QAE\uff09\u3002 \u3053\u306e\u8a08\u753b\u306e QA\u30fb\u56de\u5e30\u30fb\u53d7\u5165\u306e\u5224\u5b9a\u3092\u62c5\u3046 Claude Code\uff08Fable\uff09\u3002 ADR-04 AID AI\u958b\u767a\u62c5\u5f53\u8005\u3002\u4ed5\u69d8\u3069\u304a\u308a\u306b\u30b3\u30fc\u30c9\u3068\u6587\u66f8\u3092\u66f8\u304f\u5f79\u5272\u3002 \u30c1\u30fc\u30e0\u306e\u5bfe\u5fdc\u8868\u306e\u5f79\u5272\u7565\u79f0\u3002Open Code 2 \u30ef\u30fc\u30ab\u30fc\u304c\u62c5\u3046\u3002 ADR-04 QAE QA\u62c5\u5f53\u3002\u691c\u67fb\u3057\u5224\u5b9a\u3059\u308b\u5f79\u5272\u3002 \u5f79\u5272\u7565\u79f0\u3002Claude Code Fable \u304c\u62c5\u3046\u3002 ADR-04 REV \u62c5\u5f53\u30ec\u30d3\u30e5\u30ef\u3002\u5404 PR \u3092\u72ec\u7acb\u306b\u30ec\u30d3\u30e5\u30fc\u3059\u308b\u5f79\u5272\u3002 \u5f79\u5272\u7565\u79f0\u3002Codex Astra \u304c\u62c5\u3046\u3002 ADR-04"},{"location":"reference/REF-01_Glossary/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"<p>The tables above are the glossary. Documents that use a term from the Term / \u7528\u8a9e column add a short note on first use and link to the matching section (for example <code>[REF-01 \u00a7C](../reference/REF-01_Glossary.md#english)</code>). \uff0f \u4e0a\u306e\u8868\u305d\u306e\u3082\u306e\u304c\u7528\u8a9e\u96c6\u3067\u3059\u3002Term / \u7528\u8a9e \u5217\u306e\u8a9e\u3092\u4f7f\u3046\u6587\u66f8\u306f\u3001\u521d\u51fa\u3067\u77ed\u3044\u6ce8\u3092\u4ed8\u3051\u3001\u8a72\u5f53\u3059\u308b\u7bc0\u3078\u30ea\u30f3\u30af\u3057\u307e\u3059\u3002</p>"},{"location":"reviews/","title":"Review Records / \u30ec\u30d3\u30e5\u30fc\u8a18\u9332","text":"<p>Summary: Independent assessment of pull requests: each record is a dated file named YYYY-MM-DD_<em>rN.md, written by REV (Codex Astra). Reviews are linked from the PR and stored here for auditability. <strong>\u6982\u8981:</strong> \u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u72ec\u7acb\u3057\u305f\u8a55\u4fa1\uff1a\u5404\u8a18\u9332\u306f\u65e5\u4ed8\u4ed8\u304d\u30d5\u30a1\u30a4\u30eb\u3001YYYY-MM-DD</em><Title>_rN.md \u306e\u5f62\u5f0f\u3002REV\uff08Codex Astra\uff09\u304c\u66f8\u304f\u3002\u30ec\u30d3\u30e5\u30fc\u306f PR \u304b\u3089\u30ea\u30f3\u30af\u3055\u308c\u3001\u76e3\u67fb\u306e\u305f\u3081\u306b\u3053\u3053\u306b\u4fdd\u7ba1\u3055\u308c\u308b\u3002</p> </blockquote> <p><strong>Jump:</strong> <a href=\"#english\">English</a> \u00b7 <a href=\"#japanese\">\u65e5\u672c\u8a9e</a></p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. <strong>Learned:</strong> every PR gets an independent review, and the review must be kept as its own record so that what was checked, and why, can be read later. \uff0f \u3059\u3079\u3066\u306e PR \u306f\u72ec\u7acb\u3057\u305f\u30ec\u30d3\u30e5\u30fc\u3092\u53d7\u3051\u3001\u4f55\u3092\u306a\u305c\u78ba\u304b\u3081\u305f\u304b\u3092\u5f8c\u304b\u3089\u8aad\u3081\u308b\u3088\u3046\u3001\u30ec\u30d3\u30e5\u30fc\u306f\u72ec\u81ea\u306e\u8a18\u9332\u3068\u3057\u3066\u6b8b\u3059\u5fc5\u8981\u304c\u3042\u308b\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Normative for: <a href=\"../spec/04_acceptance_tests/\">SPEC-04 Acceptance Tests</a> review section, <a href=\"../decisions/ADR-04_AI_Autonomy_and_Roles/\">ADR-04 AI Autonomy and Roles</a> review section.</li> <li>Related: <a href=\"../\">../README.md</a> \u00b7 <a href=\"../handoff/\">handoff/</a> \u00b7 <a href=\"../status/\">status/</a></li> </ul> <hr /> <p><a id=\"english\"></a></p> <h2 id=\"english\">English<a class=\"headerlink\" href=\"#english\" title=\"Permanent link\">\u00b6</a></h2> <p><a href=\"#japanese\">\u2192 \u65e5\u672c\u8a9e\u7248\u3078</a></p> <h3 id=\"1-what-belongs-here\">1. What belongs here<a class=\"headerlink\" href=\"#1-what-belongs-here\" title=\"Permanent link\">\u00b6</a></h3> <p>A <em>review record</em> documents REV's (Codex Astra) independent assessment of a pull request. This folder contains:</p> <table> <thead> <tr> <th>Type</th> <th>Naming convention</th> <th>Description</th> </tr> </thead> <tbody> <tr> <td>Review</td> <td><code>YYYY-MM-DD_<Title>_rN.md</code></td> <td>Review of PR #<N>; includes findings, approval/rejection, and suggestions.</td> </tr> </tbody> </table> <h3 id=\"2-review-format\">2. Review format<a class=\"headerlink\" href=\"#2-review-format\" title=\"Permanent link\">\u00b6</a></h3> <p>A review record includes:</p> <ul> <li>Date of review</li> <li>PR title and number</li> <li>Scope of review (files changed, lines affected)</li> <li>Findings: security issues, bugs, style issues</li> <li>Approval status: approved / rejected / needs revision</li> <li>Suggested changes (if rejection or revision needed)</li> </ul> <h3 id=\"3-open-items-no-entries-yet--\u307e\u3060\u3042\u308a\u307e\u305b\u3093\">3. Open items (no entries yet / \u307e\u3060\u3042\u308a\u307e\u305b\u3093)<a class=\"headerlink\" href=\"#3-open-items-no-entries-yet--\u307e\u3060\u3042\u308a\u307e\u305b\u3093\" title=\"Permanent link\">\u00b6</a></h3> <table> <thead> <tr> <th>Date</th> <th>Title</th> <th>PR</th> <th>Status</th> </tr> </thead> <tbody> <tr> <td>\u2014</td> <td>\u2014</td> <td>\u2014</td> <td>\u2014</td> </tr> </tbody> </table> <h3 id=\"4-creating-a-new-review-record\">4. Creating a new review record<a class=\"headerlink\" href=\"#4-creating-a-new-review-record\" title=\"Permanent link\">\u00b6</a></h3> <ol> <li>Name the file <code>YYYY-MM-DD_<Title>_rN.md</code>.</li> <li>Link to the PR number in the header.</li> <li>Describe scope, findings, and approval decision.</li> <li>Link from the PR as \"reviewed by REV (Codex Astra)\".</li> </ol> <hr /> <p><a id=\"japanese\"></a></p> <h2 id=\"\u65e5\u672c\u8a9e\">\u65e5\u672c\u8a9e<a class=\"headerlink\" href=\"#\u65e5\u672c\u8a9e\" title=\"Permanent link\">\u00b6</a></h2> <p><a href=\"#english\">\u2192 To English</a></p> <h3 id=\"1-\u3053\u3053\u306b\u5c5e\u3059\u308b\u3082\u306e\">1. \u3053\u3053\u306b\u5c5e\u3059\u308b\u3082\u306e<a class=\"headerlink\" href=\"#1-\u3053\u3053\u306b\u5c5e\u3059\u308b\u3082\u306e\" title=\"Permanent link\">\u00b6</a></h3> <p>\u300c\u30ec\u30d3\u30e5\u30fc\u8a18\u9332\u300d\u306f REV\uff08Codex Astra\uff09\u304c\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306b\u5bfe\u3057\u3066\u884c\u3063\u305f\u72ec\u7acb\u3057\u305f\u8a55\u4fa1\u3092\u6587\u66f8\u5316\u3057\u307e\u3059\u3002\u3053\u306e\u30d5\u30a9\u30eb\u30c0\u306b\u306f\u6b21\u304c\u542b\u307e\u308c\u307e\u3059\uff1a</p> <table> <thead> <tr> <th>\u7a2e\u5225</th> <th>\u547d\u540d\u898f\u5247</th> <th>\u8aac\u660e</th> </tr> </thead> <tbody> <tr> <td>\u30ec\u30d3\u30e5\u30fc</td> <td><code>YYYY-MM-DD_<Title>_rN.md</code></td> <td>PR #<N> \u306e\u30ec\u30d3\u30e5\u30fc\u3002\u8abf\u67fb\u7d50\u679c\u3001\u627f\u8a8d\uff0f\u62d2\u5426\u3001\u63d0\u6848\u3092\u542b\u3080\u3002</td> </tr> </tbody> </table> <h3 id=\"2-\u30ec\u30d3\u30e5\u30fc\u306e\u5f62\u5f0f\">2. \u30ec\u30d3\u30e5\u30fc\u306e\u5f62\u5f0f<a class=\"headerlink\" href=\"#2-\u30ec\u30d3\u30e5\u30fc\u306e\u5f62\u5f0f\" title=\"Permanent link\">\u00b6</a></h3> <p>\u30ec\u30d3\u30e5\u30fc\u8a18\u9332\u306b\u306f\u6b21\u304c\u542b\u307e\u308c\u307e\u3059\uff1a</p> <ul> <li>\u30ec\u30d3\u30e5\u30fc\u65e5</li> <li>PR \u306e\u984c\u540d\u3068\u756a\u53f7</li> <li>\u30ec\u30d3\u30e5\u30fc\u7bc4\u56f2\uff08\u5909\u66f4\u30d5\u30a1\u30a4\u30eb\u3001\u5f71\u97ff\u884c\uff09</li> <li>\u8abf\u67fb\u7d50\u679c\uff1a\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u554f\u984c\u3001\u30d0\u30b0\u3001\u30b9\u30bf\u30a4\u30eb\u554f\u984c</li> <li>\u627f\u8a8d\u30b9\u30c6\u30fc\u30bf\u30b9\uff1a\u627f\u8a8d\uff0f\u62d2\u5426\uff0f\u4fee\u6b63\u5fc5\u8981</li> <li>\u63d0\u6848\u3055\u308c\u308b\u5909\u66f4\uff08\u62d2\u5426\u307e\u305f\u306f\u4fee\u6b63\u304c\u5fc5\u8981\u306a\u5834\u5408\uff09</li> </ul> <h3 id=\"3-\u672a\u89e3\u6c7a\u9805\u76ee\u307e\u3060\u3042\u308a\u307e\u305b\u3093--no-entries-yet\">3. \u672a\u89e3\u6c7a\u9805\u76ee\uff08\u307e\u3060\u3042\u308a\u307e\u305b\u3093 / no entries yet\uff09<a class=\"headerlink\" href=\"#3-\u672a\u89e3\u6c7a\u9805\u76ee\u307e\u3060\u3042\u308a\u307e\u305b\u3093--no-entries-yet\" title=\"Permanent link\">\u00b6</a></h3> <table> <thead> <tr> <th>\u65e5\u4ed8</th> <th>\u30bf\u30a4\u30c8\u30eb</th> <th>PR</th> <th>\u30b9\u30c6\u30fc\u30bf\u30b9</th> </tr> </thead> <tbody> <tr> <td>\u2014</td> <td>\u2014</td> <td>\u2014</td> <td>\u2014</td> </tr> </tbody> </table> <h3 id=\"4-\u65b0\u3057\u3044\u30ec\u30d3\u30e5\u30fc\u8a18\u9332\u3092\u3064\u304f\u308b\u306b\u306f\">4. \u65b0\u3057\u3044\u30ec\u30d3\u30e5\u30fc\u8a18\u9332\u3092\u3064\u304f\u308b\u306b\u306f<a class=\"headerlink\" href=\"#4-\u65b0\u3057\u3044\u30ec\u30d3\u30e5\u30fc\u8a18\u9332\u3092\u3064\u304f\u308b\u306b\u306f\" title=\"Permanent link\">\u00b6</a></h3> <ol> <li>\u30d5\u30a1\u30a4\u30eb\u540d\u3092 <code>YYYY-MM-DD_<Title>_rN.md</code> \u306b\u3059\u308b\u3002</li> <li>\u30d8\u30c3\u30c0\u306b PR \u756a\u53f7\u3078\u30ea\u30f3\u30af\u3059\u308b\u3002</li> <li>\u7bc4\u56f2\u3001\u8abf\u67fb\u7d50\u679c\u3001\u627f\u8a8d\u6c7a\u5b9a\u3092\u8a18\u8ff0\u3059\u308b\u3002</li> <li>PR \u304b\u3089\u300cREV\uff08Codex Astra\uff09\u30ec\u30d3\u30e5\u30fc\u6e08\u307f\u300d\u3068\u3057\u3066\u30ea\u30f3\u30af\u3059\u308b\u3002</li> </ol> <hr /> <h2 id=\"glossary--\u7528\u8a9e\">Glossary / \u7528\u8a9e<a class=\"headerlink\" href=\"#glossary--\u7528\u8a9e\" title=\"Permanent link\">\u00b6</a></h2> <table> <thead> <tr> <th>Term</th> <th>English note</th> <th>\u65e5\u672c\u8a9e\u6ce8</th> </tr> </thead> <tbody> <tr> <td>Review record</td> <td>A document of REV's independent assessment of a PR.</td> <td>PR \u306e REV \u306e\u72ec\u7acb\u3057\u305f\u8a55\u4fa1\u3092\u6587\u66f8\u5316\u3057\u305f\u3082\u306e\u3002</td> </tr> <tr> <td>Reviewer (REV)</td> <td>Codex Astra, the independent PR reviewer.</td> <td>\u72ec\u7acb\u3057\u305f PR \u30ec\u30d3\u30e5\u30fc\u62c5\u5f53\u8005\uff08Codex Astra\uff09\u3002</td> </tr> <tr> <td>Approval status</td> <td>Whether the PR is approved, rejected, or needs revision.</td> <td>PR \u304c\u627f\u8a8d\u3001\u62d2\u5426\u3001\u307e\u305f\u306f\u4fee\u6b63\u5fc5\u8981\u304b\u3069\u3046\u304b\u3002</td> </tr> <tr> <td>Findings</td> <td>Security issues, bugs, or style issues discovered during review.</td> <td>\u30ec\u30d3\u30e5\u30fc\u4e2d\u306b\u767a\u898b\u3057\u305f\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u554f\u984c\u3001\u30d0\u30b0\u3001\u30b9\u30bf\u30a4\u30eb\u554f\u984c\u3002</td> </tr> <tr> <td>Auditability</td> <td>The ability to verify that a process was done correctly.</td> <td>\u30d7\u30ed\u30bb\u30b9\u304c\u6b63\u3057\u304f\u884c\u308f\u308c\u305f\u304b\u691c\u8a3c\u3067\u304d\u308b\u80fd\u529b\u3002</td> </tr> </tbody> </table>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1/","title":"REV M1 Skeleton PR Review r1 / M1 \u6587\u66f8\u9aa8\u683c PR \u30ec\u30d3\u30e5\u30fc r1","text":"<p>Summary: Request changes on PR #19: private repository URLs remain in public text, the secret scanner has no enabled detection rules, despite green CI. Validation and specification defects also need correction. \u6982\u8981: PR #19 \u306f\u4fee\u6b63\u8981\u6c42\u3002\u516c\u958b\u6587\u66f8\u306b\u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea URL \u304c\u6b8b\u308a\u3001\u79d8\u5bc6\u30b9\u30ad\u30e3\u30ca\u30fc\u306e\u691c\u51fa\u898f\u5247\u304c\u6709\u52b9\u3067\u306a\u304f\u3001CI \u5408\u683c\u3067\u3082\u4fdd\u8b77\u3092\u4fdd\u8a3c\u3067\u304d\u307e\u305b\u3093\u3002\u691c\u67fb\u3068\u4ed5\u69d8\u306e\u4e0d\u5177\u5408\u3082\u4fee\u6b63\u304c\u5fc5\u8981\u3067\u3059\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: passing local checks did not establish specification compliance: independent parsing found malformed blocks, and source inspection found missing validation. \uff0f \u30ed\u30fc\u30ab\u30eb\u691c\u67fb\u306e\u5408\u683c\u3060\u3051\u3067\u306f\u4ed5\u69d8\u6e96\u62e0\u3092\u793a\u305b\u305a\u3001\u72ec\u7acb\u3057\u305f\u69cb\u6587\u89e3\u6790\u3068\u30b3\u30fc\u30c9\u78ba\u8a8d\u3067\u69cb\u6587\u4e0d\u6b63\u3068\u672a\u5b9f\u88c5\u306e\u691c\u67fb\u3092\u78ba\u8a8d\u3057\u305f\u3002</li> <li>Applies to: PR #19, <code>feat/m1-skeleton</code> \u2192 <code>develop</code>, final reviewed head <code>1a01c3b1352fb58cfa100e6d200c737213b70464</code> (updated during review from <code>df7a4ce</code>).</li> <li>Related: Review index \u00b7 SPEC-06 \u00b7 SPEC-01 \u00b7 SPEC-02.</li> <li>Used by: owner merge decision and the author's correction pass.</li> </ul> <p></p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1/#verdict-and-terms","title":"Verdict and terms","text":"<p>Request changes. A PR (pull request) is a proposed change awaiting review; this verdict is a review recommendation, not a GitHub approval or merge. P1 means fix before merge because a protection is ineffective or a required check fails; P2 means a reproducible correctness or documentation defect. CI means the automated checks GitHub runs. See the shared glossary.</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1/#findings-highest-severity-first","title":"Findings, highest severity first","text":"<ol> <li> <p>R1 \u2014 P1: prohibited private URLs are published as negative examples. <code>manifest/README.md:48\u201349,102\u2013103</code> contains actual HTTPS and SSH addresses for the private integration repository. Calling them \u201cnever write\u201d examples still publishes them and violates SPEC-06 \u00a75 and the task's publication rule. The PR body's \u201cprivate URL grep: none\u201d is incorrect. Replace them with non-address prose; scan all tracked files, not just the two data files. No private URL is repeated in this review.</p> </li> <li> <p>R2 \u2014 P1: gitleaks runs with zero detection rules. <code>.gitleaks.toml:6\u201328</code> supplies only an allowlist (exceptions to detection), no rules and no <code>[extend] useDefault = true</code>. <code>default = true</code> at line 28 is inside <code>[allowlist]</code> and is not a supported setting that enables defaults. The pinned version's configuration source defines <code>Extend.UseDefault</code> and no such allowlist field. The workflow explicitly selects this config at <code>.github/workflows/security.yml:23</code>, so its green \u201c68 commits scanned / no leaks found\u201d is not evidence of an effective secret scan. Enable the default rules, remove unsupported <code>entropy</code>, and replace the global unanchored 40-hex exemption with narrowly justified exceptions: secret values can also be 40 hex characters. Verify a synthetic secret is rejected without placing it in Git, then rescan history with redacted output. Add a separate private-URL policy check; default secret rules alone do not enforce that policy.</p> </li> <li> <p>R3 \u2014 P2: declared Trivy coverage is not delivered. <code>docs/spec/03_security_gate.md:234,458</code> promises gitleaks, Semgrep and Trivy on every PR, but <code>.github/workflows/security.yml:11\u201359</code> has no Trivy job. Implement it or explicitly delimit M1's delivered scope. The original Semgrep failure (77 findings) was resolved during review in <code>1a01c3b</code> by action SHA pinning and documented exclusions for generated output and legacy examples; the latest job passes. That initial failure is no longer an open finding. The owner should explicitly accept the documented legacy deferral.</p> </li> <li> <p>R4 \u2014 P2: manifest validation does not enforce its advertised contract. <code>tools/manifest_check.py:225\u2013235</code> checks JSON and searches text for URLs, but never calls <code>validate_toon</code> or compares JSON and TOON (the compact data notation). Missing TOON passes; changing any TOON SHA, profile, repository, or PR number passes. <code>validate_component</code> at lines 122\u2013146 checks only four required fields and validates a SHA only if present. An in-memory component with invalid role and an upstream with no SHA returns no errors; a synthetic token also passes <code>validate_no_secrets</code>. Implement SPEC-01 MC-01\u201311/13 or explicitly document which checks are deferred, without claiming equivalence. The current files do agree semantically, but CI cannot keep them that way. Keep the helper's exit 1 distinct from the future CLI's specified exit 20, or align and document the interface.</p> </li> <li> <p>R5 \u2014 P2: ZAP is instructed to scan itself. <code>docs/spec/03_security_gate.md:98,322</code> starts ZAP (a scanner of a running web application) inside a container on the internal network, then targets <code>127.0.0.1:5000/8001/4200</code>. Loopback in that container names ZAP itself, not the web/admin/ember containers or the host. This conflicts with <code>docs/decisions/ADR-02_Network_Model.md:53\u201357,131\u2013135</code>, which separates service-name traffic inside Compose from host loopback traffic. Specify internal service names and container ports for ZAP, retaining SPEC-02's host-port table for browsers and host-side checks; include port-remapping behavior.</p> </li> <li> <p>R6 \u2014 P2: one diagram and three data blocks do not parse. With the site's Mermaid 11.4.1 parser (text-to-diagram syntax), <code>docs/spec/04_acceptance_tests.md:94</code> fails: the semicolon in the English sequence-diagram note starts another statement. Use supported note text/escaping and regenerate HTML. TOON 4.4.0 rejects <code>docs/spec/02_installer_cli.md:133\u2013134,138</code> because unquoted commas turn two-column exit-code rows into extra columns. <code>docs/status/upstream/README.md:38\u201346,92\u2013100</code> declares 11 tabular rows but supplies an object-style item and an ellipsis. Supply a valid one-item example, or all 11 correctly shaped items. These errors survive MkDocs strict because it does not parse those embedded languages. The Japanese SPEC-04 diagram parses, so the two rendered halves differ.</p> </li> <li> <p>R7 \u2014 P2: the documentation checker silently skips promised checks and scope. <code>tools/docs_check.py:18\u201343</code> checks only <code>docs/</code> plus root README and excludes legacy content, leaving <code>manifest/README.md</code>, installer README and old-path pointers outside SPEC-06 coverage. Lines 96\u201398 skip every link containing <code>#</code>, even when its file does not exist; a call with <code>absent-file.md#english</code> returns no errors. Lines 123\u2013126 perform no TOON parity or glossary warning check, despite <code>docs/spec/06_documentation_conventions.md:87\u201395</code>. Check the file portion before the fragment, cover new Markdown throughout the repository, and document an explicit legacy-format exception. The existing 35-file pass is only a subset check.</p> </li> <li> <p>R8 \u2014 P2: M2 acceptance criteria contradict the profile definition. <code>docs/spec/04_acceptance_tests.md:54,59,122</code> makes C4 depend on <code>y_websocket</code>, allows it to skip in <code>core</code>, yet requires all C1\u2013C6 success and rejection cases green for M2. SPEC-02's profile table at <code>docs/spec/02_installer_cli.md:96\u201399</code> places that service in <code>full</code>; the manifest agrees. Define whether M2 includes this service or explicitly defers C4 to M3, and update both language halves. Otherwise a skipped test can be mistaken for a completed milestone.</p> </li> </ol>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1/#what-was-verified","title":"What was verified","text":"<p>All commands ran from the repository root. These read-only checks returned exit 0; the second initially reported 35 files; after the concurrent asset-index addition and this review it reported 37 files:</p> <pre><code>python3 tools/manifest_check.py\npython3 tools/docs_check.py\n</code></pre> <p>The requested comparison was 506 files changed, 246,242 insertions and 3,246 deletions:</p> <pre><code>git diff develop...feat/m1-skeleton --stat\n</code></pre> <ul> <li>Searched tracked text across the full tree, including site HTML, search-index JSON, legacy Markdown, hidden workflow files, and manifest files. Found the four prohibited URL occurrences in R1. Token-format/private-key searches found no additional matching credential. Legacy default JWT/JWE/test-token values and guest broker credentials exist; these are inherited examples, not verified live credentials. The EC2 legacy guide at lines 364/372 and its HTML/search-index copies contain a clearly placeholder-shaped internal hostname. Institutional support addresses and test emails are not evidence of personal-data leakage. No claim of exhaustive secret clearance is made, especially given R2.</li> <li>Visually sampled <code>new-token.png</code>, <code>dev-application.png</code> and <code>filled-credential.png</code>: the first has no issued token, while sensitive application/credential values in the latter two are blurred or password-masked. Other images were not exhaustively inspected; a text search cannot inspect their pixels.</li> <li>Observed actual GitHub runs: docs links and MkDocs strict pass, manifest passes, gitleaks exits 0 with the R2 limitation, Semgrep initially failed but the latest head passes all five checks (R3 records the remaining coverage gap). Successful jobs establish usable YAML, action versions, Python 3.11 and pinned MkDocs requirements on the hosted runner. The gitleaks Docker invocation and Semgrep container actually start. Local Docker daemon was unavailable, so containers were not rerun locally.</li> <li>Independently parsed all 34 Mermaid and 44 TOON fences in tracked Markdown using Mermaid 11.4.1, a DOM shim (browser-like objects for the parser), and <code>@toon-format/toon</code> 4.4.0 installed in a temporary directory outside the repository. Results: 33/34 Mermaid and 41/44 TOON pass. Parsed <code>manifest/upstreams.toon</code> and compared its specified projection with JSON: equal, including upstream fields and adopted PRs. This establishes semantic equality, not byte-for-byte output from an unimplemented CLI generator.</li> <li>Checked JSON required component fields, roles, profiles, core platforms, SHA shape, service names and tracking-name rules. Counted 20 components, 11 integration repositories, 8 adopted PRs and 25 candidates, matching the PR body. The requested authenticated branch query for <code>RDM-osf.io-dev2027</code> returns <code>develop</code>, <code>integrate/public-develop-20261105</code>, <code>upstream/public-develop</code>, <code>upstream/private-develop</code>, <code>upstream/cos-develop</code>, and <code>upstream/private-sec-test-fix-sec-test</code>; all four required tracking branches match SPEC-01 rule 7. Reachability and all 11 repositories' creation/mirroring were not independently audited.</li> <li>Compared SPEC-01\u201305 with ADR-02 and REF-01. The seven default host ports agree; exit 20/40/50\u201353/60 and principal subcommand names agree at specification level. R5 and R8 are behavioral contradictions despite matching numbers. Legacy guides are intentionally historical; they should not be read as current installation procedures.</li> <li>English/Japanese core sections largely align. First-use explanations exist for central terms but full SPEC-06 term-by-term compliance is not established. \u201cLearned\u201d claims about the eleven-upstream survey (<code>SPEC-05:8</code>) and newcomer behavior (<code>REF-01:8</code>) lack linked evidence in this PR; they are unverified, not proven fabricated. Provide the evidence or phrase them as design rationale. No mixed-language corruption was identified in the reviewed normative text.</li> <li>The claimed normative documents, guide pointers, committed site, requirements, and two workflows exist. M2 installer/acceptance implementations are not claimed M1 deliveries. The initial integration-order exception remains explicitly proposed in ADR-01 \u00a75. Commit messages and the PR body carry a Claude session link; its accessibility/content was not inspected.</li> </ul>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1/#owner-decisions","title":"Owner decisions","text":"<p>Resolve R1\u2013R8 before merging. Decide the M1 Semgrep/Trivy enforcement scope, the M2 C4 scope, and whether to accept ADR-01 \u00a75's bootstrap interpretation. Decide whether the Claude session link belongs in public metadata after assessing its sharing visibility; no session content is reproduced here. Approving the bootstrap exception must be reflected in SPEC-01 and the affected records, not silently treated as already approved. Add evidence for empirical \u201cLearned\u201d claims or reword them. Author corrections should regenerate <code>site/</code> and rerun both parser checks and hosted CI.</p> <p></p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1/#\u5224\u5b9a\u3068\u7528\u8a9e","title":"\u5224\u5b9a\u3068\u7528\u8a9e","text":"<p>Request changes\uff08\u4fee\u6b63\u8981\u6c42\uff09\u3002 PR\uff08\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\uff09\u306f\u30ec\u30d3\u30e5\u30fc\u3092\u5f85\u3064\u5909\u66f4\u63d0\u6848\u3067\u3059\u3002\u3053\u306e\u5224\u5b9a\u306f\u63a8\u5968\u3067\u3042\u308a\u3001GitHub \u306e\u627f\u8a8d\u3084\u30de\u30fc\u30b8\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002P1 \u306f\u4fdd\u8b77\u6a5f\u80fd\u304c\u7121\u52b9\u307e\u305f\u306f\u5fc5\u9808\u691c\u67fb\u304c\u5931\u6557\u3059\u308b\u305f\u3081\u30de\u30fc\u30b8\u524d\u306b\u4fee\u6b63\u3059\u3079\u304d\u3082\u306e\u3001P2 \u306f\u518d\u73fe\u53ef\u80fd\u306a\u4ed5\u69d8\u30fb\u6587\u66f8\u30fb\u691c\u67fb\u306e\u4e0d\u5177\u5408\u3067\u3059\u3002CI \u306f GitHub \u304c\u81ea\u52d5\u5b9f\u884c\u3059\u308b\u691c\u67fb\u3067\u3059\u3002\u5171\u901a\u7528\u8a9e\u96c6\u3082\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1/#\u91cd\u5927\u5ea6\u9806\u306e\u6307\u6458","title":"\u91cd\u5927\u5ea6\u9806\u306e\u6307\u6458","text":"<ol> <li> <p>R1 \u2014 P1: \u7981\u6b62\u4f8b\u306b\u5b9f\u969b\u306e\u975e\u516c\u958b URL \u3092\u63b2\u8f09\u3002 <code>manifest/README.md:48\u201349,102\u2013103</code> \u306b\u975e\u516c\u958b\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u306e HTTPS/SSH \u30a2\u30c9\u30ec\u30b9\u304c\u8a084\u4ef6\u3042\u308a\u307e\u3059\u3002\u300c\u66f8\u304b\u306a\u3044\u4f8b\u300d\u3067\u3082\u516c\u958b\u306b\u5f53\u305f\u308a\u3001SPEC-06 \u00a75 \u3068\u4eca\u56de\u306e\u516c\u958b\u30eb\u30fc\u30eb\u306b\u9055\u53cd\u3057\u307e\u3059\u3002PR \u672c\u6587\u306e\u300cprivate URL grep \u691c\u51fa\u306a\u3057\u300d\u306f\u8aa4\u308a\u3067\u3059\u3002\u30a2\u30c9\u30ec\u30b9\u3092\u542b\u307e\u306a\u3044\u8aac\u660e\u306b\u7f6e\u304d\u63db\u3048\u3001\u30c7\u30fc\u30bf2\u30d5\u30a1\u30a4\u30eb\u3060\u3051\u3067\u306a\u304f\u8ffd\u8de1\u5bfe\u8c61\u306e\u5168\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u67fb\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3053\u306e\u30ec\u30d3\u30e5\u30fc\u306b\u306f\u8a72\u5f53 URL \u3092\u8ee2\u8a18\u3057\u3066\u3044\u307e\u305b\u3093\u3002</p> </li> <li> <p>R2 \u2014 P1: gitleaks \u306e\u691c\u51fa\u898f\u5247\u304c\u30bc\u30ed\u3002 <code>.gitleaks.toml:6\u201328</code> \u306b\u306f allowlist\uff08\u691c\u51fa\u304b\u3089\u9664\u5916\u3059\u308b\u6761\u4ef6\uff09\u3057\u304b\u306a\u304f\u3001\u898f\u5247\u3082 <code>[extend] useDefault = true</code> \u3082\u3042\u308a\u307e\u305b\u3093\u300228\u884c\u306e <code>default = true</code> \u306f <code>[allowlist]</code> \u5185\u306b\u3042\u308a\u3001\u65e2\u5b9a\u898f\u5247\u3092\u6709\u52b9\u306b\u3059\u308b\u8a2d\u5b9a\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u56fa\u5b9a\u7248\u306e\u8a2d\u5b9a\u30b3\u30fc\u30c9\u306f <code>Extend.UseDefault</code> \u3092\u5b9a\u7fa9\u3057\u3001\u8a72\u5f53 allowlist \u9805\u76ee\u306f\u5b9a\u7fa9\u3057\u3066\u3044\u307e\u305b\u3093\u3002<code>.github/workflows/security.yml:23</code> \u304c\u3053\u306e\u8a2d\u5b9a\u3092\u6307\u5b9a\u3059\u308b\u305f\u3081\u3001\u300c68 commits scanned / no leaks found\u300d\u306e\u6210\u529f\u8868\u793a\u306f\u6709\u52b9\u306a\u79d8\u5bc6\u691c\u67fb\u306e\u8a3c\u62e0\u306b\u306a\u308a\u307e\u305b\u3093\u3002\u65e2\u5b9a\u898f\u5247\u3092\u6709\u52b9\u5316\u3057\u3001\u672a\u5bfe\u5fdc\u306e <code>entropy</code> \u3092\u524a\u9664\u3057\u3001\u5168\u57df\u306e40\u684116\u9032\u9664\u5916\u3092\u6839\u62e0\u306e\u3042\u308b\u72ed\u3044\u4f8b\u5916\u3078\u5909\u66f4\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u79d8\u5bc6\u308240\u684116\u9032\u306b\u306a\u308a\u5f97\u307e\u3059\u3002Git \u306b\u5165\u308c\u306a\u3044\u6a21\u64ec\u79d8\u5bc6\u3067\u62d2\u5426\u3092\u78ba\u8a8d\u3057\u3001\u4f0f\u5b57\u3067\u5c65\u6b74\u3092\u518d\u691c\u67fb\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u975e\u516c\u958b URL \u306f\u65e2\u5b9a\u306e\u79d8\u5bc6\u898f\u5247\u3060\u3051\u3067\u306f\u7981\u6b62\u3067\u304d\u306a\u3044\u305f\u3081\u3001\u5225\u306e\u516c\u958b\u30dd\u30ea\u30b7\u30fc\u691c\u67fb\u3082\u5fc5\u8981\u3067\u3059\u3002</p> </li> <li> <p>R3 \u2014 P2: \u7d04\u675f\u3057\u305f Trivy \u306e\u691c\u67fb\u304c\u306a\u3044\u3002 <code>docs/spec/03_security_gate.md:234,458</code> \u306f\u5168 PR \u3067 gitleaks\u30fbSemgrep\u30fbTrivy \u3092\u8981\u6c42\u3057\u307e\u3059\u304c\u3001<code>.github/workflows/security.yml:11\u201359</code> \u306b Trivy \u30b8\u30e7\u30d6\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u5b9f\u88c5\u3059\u308b\u304b M1 \u306e\u63d0\u4f9b\u7bc4\u56f2\u3092\u660e\u793a\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u521d\u56de Semgrep \u306e77\u4ef6\u306e\u5931\u6557\u306f\u3001\u30ec\u30d3\u30e5\u30fc\u4e2d\u306e <code>1a01c3b</code> \u3067 action SHA \u56fa\u5b9a\u3068\u751f\u6210\u7269\u30fb\u65e7\u30b5\u30f3\u30d7\u30eb\u306e\u7406\u7531\u4ed8\u304d\u9664\u5916\u306b\u3088\u308a\u89e3\u6d88\u3057\u3001\u6700\u65b0\u30b8\u30e7\u30d6\u306f\u5408\u683c\u3057\u3066\u3044\u307e\u3059\u3002\u521d\u56de\u5931\u6557\u306f\u672a\u89e3\u6c7a\u6307\u6458\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u6240\u6709\u8005\u306f\u8a18\u9332\u3055\u308c\u305f\u65e7\u8cc7\u6599\u306e\u5ef6\u671f\u3092\u660e\u793a\u7684\u306b\u53d7\u3051\u5165\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002</p> </li> <li> <p>R4 \u2014 P2: manifest \u691c\u67fb\u304c\u5951\u7d04\u3092\u5b9f\u65bd\u3057\u306a\u3044\u3002 <code>tools/manifest_check.py:225\u2013235</code> \u306f JSON \u691c\u67fb\u3068 URL \u691c\u7d22\u306e\u307f\u3067\u3001<code>validate_toon</code> \u306e\u547c\u3073\u51fa\u3057\u3082 JSON \u3068 TOON\uff08\u77ed\u3044\u30c7\u30fc\u30bf\u8a18\u6cd5\uff09\u306e\u6bd4\u8f03\u3082\u3042\u308a\u307e\u305b\u3093\u3002TOON \u6b20\u843d\u3001SHA\u30fbprofile\u30fbrepo\u30fbPR \u756a\u53f7\u306e\u5909\u66f4\u304c\u5408\u683c\u3057\u307e\u3059\u3002122\u2013146\u884c\u306e <code>validate_component</code> \u306f\u5fc5\u98084\u9805\u76ee\u3060\u3051\u3092\u691c\u67fb\u3057\u3001SHA \u306f\u5b58\u5728\u3059\u308b\u3068\u304d\u3060\u3051\u691c\u67fb\u3057\u307e\u3059\u3002\u30e1\u30e2\u30ea\u4e0a\u306e\u8a66\u9a13\u3067\u4e0d\u6b63 role \u3068 SHA \u306e\u306a\u3044 upstream \u304c\u7121\u6307\u6458\u3001\u6a21\u64ec token \u3082 <code>validate_no_secrets</code> \u3092\u901a\u904e\u3057\u307e\u3057\u305f\u3002SPEC-01 MC-01\u201311/13 \u3092\u5b9f\u88c5\u3059\u308b\u304b\u3001\u672a\u5b9f\u88c5\u9805\u76ee\u3092\u660e\u793a\u3057\u540c\u7b49\u3068\u4e3b\u5f35\u3057\u306a\u3044\u3067\u304f\u3060\u3055\u3044\u3002\u73fe\u884c\u30c7\u30fc\u30bf\u306f\u4e00\u81f4\u3057\u307e\u3059\u304c CI \u306f\u4e00\u81f4\u3092\u7dad\u6301\u3067\u304d\u307e\u305b\u3093\u3002\u88dc\u52a9\u30c4\u30fc\u30eb\u306e\u7d42\u4e861\u3068\u5c06\u6765 CLI \u306e\u7d42\u4e8620\u306f\u5225\u5951\u7d04\u3068\u3057\u3066\u660e\u793a\u3059\u308b\u304b\u7d71\u4e00\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p> </li> <li> <p>R5 \u2014 P2: ZAP \u304c\u81ea\u5206\u81ea\u8eab\u3092\u691c\u67fb\u3059\u308b\u6307\u5b9a\u3002 <code>docs/spec/03_security_gate.md:98,322</code> \u306f ZAP\uff08\u7a3c\u50cd\u4e2d\u306e Web \u30a2\u30d7\u30ea\u3092\u691c\u67fb\u3059\u308b\u9053\u5177\uff09\u3092\u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u30b3\u30f3\u30c6\u30ca\u3067\u8d77\u52d5\u3057\u3001<code>127.0.0.1:5000/8001/4200</code> \u3092\u5bfe\u8c61\u306b\u3057\u307e\u3059\u3002\u305d\u306e\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u306f ZAP \u81ea\u8eab\u3067\u3042\u308a\u3001web/admin/ember \u3084\u30db\u30b9\u30c8\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002<code>docs/decisions/ADR-02_Network_Model.md:53\u201357,131\u2013135</code> \u306e\u5185\u90e8\u30b5\u30fc\u30d3\u30b9\u540d\u3068\u30db\u30b9\u30c8\u5074\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u306e\u5206\u96e2\u306b\u53cd\u3057\u307e\u3059\u3002ZAP \u306b\u306f\u5185\u90e8\u30b5\u30fc\u30d3\u30b9\u540d\u30fb\u30b3\u30f3\u30c6\u30ca\u5074\u30dd\u30fc\u30c8\u3092\u6307\u5b9a\u3057\u3001SPEC-02 \u306e\u30db\u30b9\u30c8\u5074\u8868\u306f\u30d6\u30e9\u30a6\u30b6\u3068\u30db\u30b9\u30c8\u5074\u691c\u67fb\u306b\u4f7f\u3063\u3066\u304f\u3060\u3055\u3044\u3002\u30dd\u30fc\u30c8\u4ed8\u3051\u66ff\u3048\u6642\u306e\u52d5\u4f5c\u3082\u5b9a\u3081\u3066\u304f\u3060\u3055\u3044\u3002</p> </li> <li> <p>R6 \u2014 P2: \u56f31\u4ef6\u30fb\u30c7\u30fc\u30bf3\u4ef6\u304c\u69cb\u6587\u4e0d\u6b63\u3002 \u30b5\u30a4\u30c8\u3068\u540c\u3058 Mermaid 11.4.1\uff08\u6587\u5b57\u304b\u3089\u56f3\u3092\u4f5c\u308b\u8a18\u6cd5\uff09\u306e\u30d1\u30fc\u30b5\u30fc\u3067 <code>docs/spec/04_acceptance_tests.md:94</code> \u304c\u5931\u6557\u3057\u307e\u3059\u3002\u82f1\u8a9e\u306e\u30b7\u30fc\u30b1\u30f3\u30b9\u56f3\u306e\u6ce8\u306e\u30bb\u30df\u30b3\u30ed\u30f3\u304c\u5225\u306e\u6587\u3068\u3057\u3066\u89e3\u91c8\u3055\u308c\u307e\u3059\u3002\u5bfe\u5fdc\u3059\u308b\u8a18\u6cd5\u306b\u76f4\u3057 HTML \u3092\u518d\u751f\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002TOON 4.4.0 \u3067\u306f <code>docs/spec/02_installer_cli.md:133\u2013134,138</code> \u306e\u975e\u5f15\u7528\u30ab\u30f3\u30de\u3067\u7d42\u4e86\u30b3\u30fc\u30c9\u8868\u306e\u5217\u304c\u5897\u3048\u3066\u5931\u6557\u3057\u307e\u3059\u3002<code>docs/status/upstream/README.md:38\u201346,92\u2013100</code> \u306f11\u884c\u306e\u8868\u3092\u5ba3\u8a00\u3057\u3064\u3064\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u5f62\u5f0f1\u4ef6\u3068\u7701\u7565\u8a18\u53f7\u3092\u8f09\u305b\u3066\u3044\u307e\u3059\u3002\u6b63\u3057\u30441\u4ef6\u306e\u4f8b\u304b11\u4ef6\u306e\u8868\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002MkDocs strict \u306f\u3053\u308c\u3089\u306e\u5185\u90e8\u8a00\u8a9e\u3092\u69cb\u6587\u89e3\u6790\u3057\u306a\u3044\u305f\u3081\u898b\u9003\u3057\u307e\u3059\u3002\u65e5\u672c\u8a9e\u306e SPEC-04 \u56f3\u306f\u89e3\u6790\u3067\u304d\u3001\u82f1\u548c\u306e\u8868\u793a\u304c\u7570\u306a\u308a\u307e\u3059\u3002</p> </li> <li> <p>R7 \u2014 P2: docs \u30c1\u30a7\u30c3\u30ab\u30fc\u304c\u7bc4\u56f2\u3068\u7d04\u675f\u3057\u305f\u691c\u67fb\u3092\u7701\u7565\u3002 <code>tools/docs_check.py:18\u201343</code> \u306f <code>docs/</code> \u3068\u30eb\u30fc\u30c8 README \u3060\u3051\u3092\u691c\u67fb\u3057\u65e7\u8cc7\u6599\u3092\u9664\u5916\u3057\u307e\u3059\u3002<code>manifest/README.md</code>\u3001installer README\u3001\u65e7\u30d1\u30b9\u306e\u8a98\u5c0e\u306f SPEC-06 \u691c\u67fb\u306e\u5bfe\u8c61\u5916\u3067\u3059\u300296\u201398\u884c\u306f <code>#</code> \u3092\u542b\u3080\u30ea\u30f3\u30af\u3092\u4e38\u3054\u3068\u7121\u8996\u3057\u3001\u30d5\u30a1\u30a4\u30eb\u81ea\u4f53\u304c\u306a\u3044 <code>absent-file.md#english</code> \u3082\u7121\u6307\u6458\u3067\u3059\u3002123\u2013126\u884c\u306b\u306f <code>docs/spec/06_documentation_conventions.md:87\u201395</code> \u304c\u7d04\u675f\u3059\u308b TOON \u4e00\u81f4\u691c\u67fb\u30fb\u7528\u8a9e\u6ce8\u8b66\u544a\u3082\u3042\u308a\u307e\u305b\u3093\u3002\u30d5\u30e9\u30b0\u30e1\u30f3\u30c8\u3088\u308a\u524d\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u67fb\u3057\u3001\u65b0\u3057\u3044 Markdown \u5168\u4f53\u3092\u5bfe\u8c61\u306b\u3057\u3066\u3001\u65e7\u8cc7\u6599\u306e\u5f62\u5f0f\u4f8b\u5916\u306f\u898f\u7d04\u306b\u3082\u660e\u8a18\u3057\u3066\u304f\u3060\u3055\u3044\u300235\u4ef6\u5408\u683c\u306f\u90e8\u5206\u691c\u67fb\u306b\u3059\u304e\u307e\u305b\u3093\u3002</p> </li> <li> <p>R8 \u2014 P2: M2 \u53d7\u5165\u57fa\u6e96\u3068 profile \u304c\u77db\u76fe\u3002 <code>docs/spec/04_acceptance_tests.md:54,59,122</code> \u306f C4 \u306b <code>y_websocket</code> \u3092\u8981\u6c42\u3057\u3001<code>core</code> \u3067\u306f\u30b9\u30ad\u30c3\u30d7\u3092\u8a8d\u3081\u306a\u304c\u3089\u3001M2 \u3067\u306f C1\u2013C6 \u306e\u6210\u529f\u30fb\u62d2\u5426\u30b1\u30fc\u30b9\u5168\u5408\u683c\u3092\u8981\u6c42\u3057\u307e\u3059\u3002<code>docs/spec/02_installer_cli.md:96\u201399</code> \u306f\u305d\u306e\u30b5\u30fc\u30d3\u30b9\u3092 <code>full</code> \u306b\u7f6e\u304d\u3001manifest \u3082\u4e00\u81f4\u3057\u307e\u3059\u3002M2 \u306b\u5f53\u8a72\u30b5\u30fc\u30d3\u30b9\u3092\u542b\u3081\u308b\u304b C4 \u3092 M3 \u306b\u5ef6\u671f\u3059\u308b\u304b\u3092\u6c7a\u3081\u3001\u4e21\u8a00\u8a9e\u3092\u4fee\u6b63\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u30b9\u30ad\u30c3\u30d7\u3092\u7bc0\u76ee\u5b8c\u4e86\u3068\u8aa4\u8a8d\u3059\u308b\u304a\u305d\u308c\u304c\u3042\u308a\u307e\u3059\u3002</p> </li> </ol>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1/#\u78ba\u8a8d\u3057\u305f\u3053\u3068","title":"\u78ba\u8a8d\u3057\u305f\u3053\u3068","text":"<p>\u3059\u3079\u3066\u30ea\u30dd\u30b8\u30c8\u30ea\u30eb\u30fc\u30c8\u3067\u5b9f\u884c\u3057\u307e\u3057\u305f\u3002\u6b21\u306e\u8aad\u307f\u53d6\u308a\u691c\u67fb\u306f\u7d42\u4e860\u3067\u3001\u5f8c\u8005\u306f\u521d\u56de35\u30d5\u30a1\u30a4\u30eb\u3001\u4e26\u884c\u3057\u305f assets \u7d22\u5f15\u8ffd\u52a0\u3068\u672c\u30ec\u30d3\u30e5\u30fc\u8ffd\u52a0\u5f8c\u306f37\u30d5\u30a1\u30a4\u30eb\u5408\u683c\u3067\u3057\u305f\u3002</p> <pre><code>python3 tools/manifest_check.py\npython3 tools/docs_check.py\n</code></pre> <p>\u6307\u5b9a\u306e\u5dee\u5206\u306f506\u30d5\u30a1\u30a4\u30eb\u3001\u8ffd\u52a0246,242\u884c\u3001\u524a\u96643,246\u884c\u3067\u3057\u305f\u3002</p> <pre><code>git diff develop...feat/m1-skeleton --stat\n</code></pre> <ul> <li>\u30b5\u30a4\u30c8 HTML\u30fb\u691c\u7d22 JSON\u30fb\u65e7 Markdown\u30fb\u96a0\u3057 workflow\u30fbmanifest \u3092\u542b\u3080\u8ffd\u8de1\u5bfe\u8c61\u30c6\u30ad\u30b9\u30c8\u5168\u4f53\u3092\u691c\u7d22\u3057\u3001R1 \u306e\u7981\u6b62 URL 4\u4ef6\u3092\u78ba\u8a8d\u3057\u307e\u3057\u305f\u3002token \u5f62\u5f0f\u30fb\u79d8\u5bc6\u9375\u306e\u691c\u7d22\u3067\u306f\u8ffd\u52a0\u306e\u8a72\u5f53\u8a8d\u8a3c\u60c5\u5831\u306f\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u65e7 JWT/JWE/test-token \u306e\u65e2\u5b9a\u5024\u3068 guest \u306e\u63a5\u7d9a\u60c5\u5831\u306f\u5b58\u5728\u3057\u307e\u3059\u304c\u3001\u5f15\u304d\u7d99\u3044\u3060\u4f8b\u3067\u3042\u308a\u751f\u304d\u305f\u8a8d\u8a3c\u60c5\u5831\u3068\u306f\u78ba\u8a8d\u3057\u3066\u3044\u307e\u305b\u3093\u3002EC2 \u65e7\u8cc7\u6599364/372\u884c\u3068 HTML/\u691c\u7d22\u30b3\u30d4\u30fc\u306b\u660e\u3089\u304b\u306a\u4eee\u5024\u5f62\u5f0f\u306e\u5185\u90e8\u30db\u30b9\u30c8\u540d\u304c\u3042\u308a\u307e\u3059\u3002\u7d44\u7e54\u30b5\u30dd\u30fc\u30c8\u30a2\u30c9\u30ec\u30b9\u3084\u8a66\u9a13\u30e1\u30fc\u30eb\u3092\u500b\u4eba\u60c5\u5831\u6f0f\u6d29\u306e\u8a3c\u62e0\u3068\u306f\u6271\u3044\u307e\u305b\u3093\u3002\u7279\u306b R2 \u304c\u3042\u308b\u305f\u3081\u5b8c\u5168\u306a\u79d8\u5bc6\u30af\u30ea\u30a2\u30e9\u30f3\u30b9\u306f\u4e3b\u5f35\u3057\u307e\u305b\u3093\u3002</li> <li><code>new-token.png</code>\u3001<code>dev-application.png</code>\u3001<code>filled-credential.png</code> \u3092\u76ee\u8996\u78ba\u8a8d\u3057\u307e\u3057\u305f\u3002\u6700\u521d\u306f\u672a\u767a\u884c\u753b\u9762\u3001\u5f8c\u4e8c\u3064\u306e\u6a5f\u5fae\u306a\u5024\u306f\u307c\u304b\u3057\u307e\u305f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u4f0f\u5b57\u3067\u3059\u3002\u4ed6\u306e\u753b\u50cf\u306f\u7db2\u7f85\u7684\u306b\u898b\u3066\u3044\u307e\u305b\u3093\u3002\u6587\u5b57\u691c\u7d22\u3067\u306f\u753b\u7d20\u3092\u691c\u67fb\u3067\u304d\u307e\u305b\u3093\u3002</li> <li>GitHub \u306e\u5b9f\u884c\u3067 docs \u30ea\u30f3\u30af\u30fbMkDocs strict\u30fbmanifest \u306f\u5408\u683c\u3001gitleaks \u306f R2 \u306e\u5236\u9650\u4ed8\u304d\u3067\u7d42\u4e860\u3001Semgrep \u306f\u521d\u56de\u5931\u6557\u3057\u307e\u3057\u305f\u304c\u6700\u65b0 head \u3067\u306f5\u691c\u67fb\u3059\u3079\u3066\u5408\u683c\u3067\u3059\uff08R3 \u306f\u6b8b\u308b\u691c\u67fb\u7bc4\u56f2\u306e\u4e0d\u4e00\u81f4\u3067\u3059\uff09\u3002\u6210\u529f\u30b8\u30e7\u30d6\u304b\u3089\u3001YAML\u30fbaction \u30d0\u30fc\u30b8\u30e7\u30f3\u30fbPython 3.11\u30fb\u56fa\u5b9a MkDocs \u4f9d\u5b58\u306f hosted runner \u3067\u5229\u7528\u53ef\u80fd\u3068\u78ba\u8a8d\u3067\u304d\u307e\u3059\u3002gitleaks \u306e Docker \u547c\u3073\u51fa\u3057\u3068 Semgrep \u30b3\u30f3\u30c6\u30ca\u306f\u8d77\u52d5\u3057\u3066\u3044\u307e\u3059\u3002\u30ed\u30fc\u30ab\u30eb Docker daemon \u306f\u5229\u7528\u3067\u304d\u305a\u518d\u5b9f\u884c\u3057\u3066\u3044\u307e\u305b\u3093\u3002</li> <li>\u8ffd\u8de1 Markdown \u306e Mermaid 34\u4ef6\u30fbTOON 44\u4ef6\u3092 Mermaid 11.4.1\u3001DOM shim\uff08\u30d1\u30fc\u30b5\u30fc\u7528\u306b\u30d6\u30e9\u30a6\u30b6\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u7528\u610f\u3059\u308b\u4ed5\u7d44\u307f\uff09\u3001<code>@toon-format/toon</code> 4.4.0 \u3067\u72ec\u7acb\u89e3\u6790\u3057\u307e\u3057\u305f\u3002\u4f9d\u5b58\u306f\u30ea\u30dd\u30b8\u30c8\u30ea\u5916\u306e\u4e00\u6642\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u7f6e\u304d\u307e\u3057\u305f\u3002\u5408\u683c\u306f Mermaid 33/34\u3001TOON 41/44\u3002manifest \u306e TOON \u306f\u89e3\u6790\u3067\u304d\u3001\u4e0a\u6d41\u5168\u9805\u76ee\u3068\u63a1\u7528 PR \u3092\u542b\u3080\u898f\u5b9a\u306e\u6284\u9332\u304c JSON \u3068\u610f\u5473\u7684\u306b\u4e00\u81f4\u3057\u307e\u3057\u305f\u3002\u672a\u5b9f\u88c5 CLI \u306e\u751f\u6210\u7d50\u679c\u3068\u306e\u30d0\u30a4\u30c8\u5358\u4f4d\u4e00\u81f4\u306f\u8a3c\u660e\u3057\u3066\u3044\u307e\u305b\u3093\u3002</li> <li>JSON \u306e\u5fc5\u9808\u90e8\u54c1\u9805\u76ee\u3001role\u3001profile\u3001\u30b3\u30a2\u306e platform\u3001SHA \u5f62\u5f0f\u3001\u30b5\u30fc\u30d3\u30b9\u540d\u3001\u8ffd\u8de1\u540d\u898f\u5247\u3092\u78ba\u8a8d\u3057\u307e\u3057\u305f\u3002\u90e8\u54c120\u3001\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea11\u3001\u63a1\u7528 PR 8\u3001\u5019\u88dc25\u3067 PR \u672c\u6587\u3068\u4e00\u81f4\u3057\u307e\u3059\u3002\u6307\u5b9a\u306e\u8a8d\u8a3c\u4ed8\u304d\u30d6\u30e9\u30f3\u30c1\u7167\u4f1a\u3067 <code>RDM-osf.io-dev2027</code> \u306f <code>develop</code>\u3001<code>integrate/public-develop-20261105</code>\u3001<code>upstream/public-develop</code>\u3001<code>upstream/private-develop</code>\u3001<code>upstream/cos-develop</code>\u3001<code>upstream/private-sec-test-fix-sec-test</code> \u3092\u8fd4\u3057\u307e\u3057\u305f\u3002\u5fc5\u9808\u8ffd\u8de14\u672c\u306f SPEC-01 \u898f\u52477\u3068\u4e00\u81f4\u3057\u307e\u3059\u3002\u5230\u9054\u6027\u306811\u30ea\u30dd\u30b8\u30c8\u30ea\u3059\u3079\u3066\u306e\u4f5c\u6210\u30fb\u30df\u30e9\u30fc\u306f\u72ec\u7acb\u76e3\u67fb\u3057\u3066\u3044\u307e\u305b\u3093\u3002</li> <li>SPEC-01\u301c05 \u3068 ADR-02\u3001REF-01 \u3092\u6bd4\u8f03\u3057\u307e\u3057\u305f\u3002\u30db\u30b9\u30c8\u5074\u65e2\u5b9a7\u30dd\u30fc\u30c8\u3001\u7d42\u4e8620/40/50\u301c53/60\u3001\u4e3b\u8981\u30b5\u30d6\u30b3\u30de\u30f3\u30c9\u540d\u306f\u4ed5\u69d8\u9593\u3067\u4e00\u81f4\u3057\u307e\u3059\u3002R5/R8 \u306f\u6570\u5024\u304c\u4e00\u81f4\u3057\u3066\u3044\u3066\u3082\u52d5\u4f5c\u304c\u77db\u76fe\u3059\u308b\u70b9\u3067\u3059\u3002\u65e7\u30ac\u30a4\u30c9\u306f\u6b74\u53f2\u8cc7\u6599\u3067\u3042\u308a\u73fe\u884c\u5c0e\u5165\u624b\u9806\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002</li> <li>\u82f1\u548c\u306e\u4e3b\u8981\u7bc0\u306f\u6982\u306d\u5bfe\u5fdc\u3057\u3001\u4e2d\u5fc3\u7528\u8a9e\u306b\u306f\u521d\u51fa\u8aac\u660e\u304c\u3042\u308a\u307e\u3059\u304c\u3001\u5168\u5c02\u9580\u8a9e\u306e SPEC-06 \u6e96\u62e0\u307e\u3067\u306f\u78ba\u8a8d\u3067\u304d\u3066\u3044\u307e\u305b\u3093\u3002\u4e0a\u6d4111\u672c\u306e\u8abf\u67fb\uff08<code>SPEC-05:8</code>\uff09\u3068\u65b0\u5165\u793e\u54e1\u306e\u884c\u52d5\uff08<code>REF-01:8</code>\uff09\u306e Learned \u306f PR \u5185\u306b\u6839\u62e0\u30ea\u30f3\u30af\u304c\u306a\u304f\u3001\u672a\u691c\u8a3c\u3067\u3059\u3002\u634f\u9020\u3068\u65ad\u5b9a\u306f\u3057\u307e\u305b\u3093\u3002\u8a3c\u62e0\u3092\u6dfb\u3048\u308b\u304b\u8a2d\u8a08\u7406\u7531\u3068\u3057\u3066\u8a18\u8ff0\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u78ba\u8a8d\u3057\u305f\u898f\u7bc4\u6587\u66f8\u306b\u6df7\u5728\u8a00\u8a9e\u306b\u3088\u308b\u6587\u5b57\u306e\u7834\u640d\u306f\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002</li> <li>\u4e3b\u5f35\u3055\u308c\u308b\u898f\u7bc4\u6587\u66f8\u30fb\u30ac\u30a4\u30c9\u8a98\u5c0e\u30fb\u30b3\u30df\u30c3\u30c8\u6e08\u307f site\u30fb\u4f9d\u5b58\u30d5\u30a1\u30a4\u30eb\u30fbworkflow 2\u672c\u306f\u5b58\u5728\u3057\u307e\u3059\u3002M2 \u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u30fb\u53d7\u5165\u5b9f\u88c5\u306f M1 \u306e\u63d0\u4f9b\u7269\u3068\u306f\u4e3b\u5f35\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u521d\u56de\u7d71\u5408\u9806\u306e\u4f8b\u5916\u306f ADR-01 \u00a75 \u3067\u63d0\u6848\u4e2d\u3068\u660e\u8a18\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3068 PR \u672c\u6587\u306b\u306f Claude \u30bb\u30c3\u30b7\u30e7\u30f3\u30ea\u30f3\u30af\u304c\u3042\u308a\u3001\u516c\u958b\u72b6\u614b\u3084\u5185\u5bb9\u306f\u8abf\u3079\u3066\u3044\u307e\u305b\u3093\u3002</li> </ul>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1/#\u6240\u6709\u8005\u304c\u6c7a\u3081\u308b\u3053\u3068","title":"\u6240\u6709\u8005\u304c\u6c7a\u3081\u308b\u3053\u3068","text":"<p>\u30de\u30fc\u30b8\u524d\u306b R1\u301cR8 \u3092\u89e3\u6d88\u3057\u3066\u304f\u3060\u3055\u3044\u3002M1 \u306e Semgrep/Trivy \u306e\u5408\u5426\u7bc4\u56f2\u3001M2 \u306e C4 \u306e\u7bc4\u56f2\u3001ADR-01 \u00a75 \u306e\u521d\u56de\u69cb\u7bc9\u89e3\u91c8\u3092\u6c7a\u3081\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002Claude \u30bb\u30c3\u30b7\u30e7\u30f3\u30ea\u30f3\u30af\u306e\u5171\u6709\u72b6\u614b\u3092\u78ba\u8a8d\u3057\u3001\u516c\u958b\u30e1\u30bf\u30c7\u30fc\u30bf\u306b\u6b8b\u3059\u304b\u5224\u65ad\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u30bb\u30c3\u30b7\u30e7\u30f3\u5185\u5bb9\u306f\u8ee2\u8f09\u3057\u3066\u3044\u307e\u305b\u3093\u3002\u521d\u56de\u69cb\u7bc9\u306e\u4f8b\u5916\u3092\u8a8d\u3081\u308b\u5834\u5408\u306f SPEC-01 \u3068\u95a2\u9023\u8a18\u9332\u3078\u53cd\u6620\u3057\u3001\u627f\u8a8d\u6e08\u307f\u3068\u9ed9\u3063\u3066\u6271\u308f\u306a\u3044\u3067\u304f\u3060\u3055\u3044\u3002\u5b9f\u8a3c\u3092\u8ff0\u3079\u308b Learned \u306b\u306f\u6839\u62e0\u3092\u6dfb\u3048\u308b\u304b\u8868\u73fe\u3092\u76f4\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u4f5c\u8005\u306e\u4fee\u6b63\u5f8c\u306f <code>site/</code> \u3092\u518d\u751f\u6210\u3057\u3001\u69cb\u6587\u89e3\u6790\u3068 hosted CI \u3092\u518d\u5b9f\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r1/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 PR A change proposed for review and merging. \u30ec\u30d3\u30e5\u30fc\u3068\u7d71\u5408\u3092\u6c42\u3081\u308b\u5909\u66f4\u63d0\u6848\u3002 CI Checks run automatically when code changes. \u5909\u66f4\u6642\u306b\u81ea\u52d5\u5b9f\u884c\u3059\u308b\u691c\u67fb\u3002 SHA A fingerprint identifying a Git commit. Git \u306e\u5909\u66f4\u8a18\u9332\u3092\u8b58\u5225\u3059\u308b\u6307\u7d0b\u3002 TOON A compact way to write structured data as text. \u69cb\u9020\u3092\u6301\u3064\u30c7\u30fc\u30bf\u3092\u77ed\u3044\u6587\u5b57\u3067\u66f8\u304f\u5f62\u5f0f\u3002 Mermaid Text that a renderer turns into a diagram. \u63cf\u753b\u51e6\u7406\u304c\u56f3\u306b\u5909\u3048\u308b\u6587\u5b57\u306e\u8a18\u6cd5\u3002 Loopback An address pointing back to the same host or container. \u81ea\u5206\u81ea\u8eab\u306e\u30db\u30b9\u30c8\u307e\u305f\u306f\u30b3\u30f3\u30c6\u30ca\u3092\u6307\u3059\u756a\u5730\u3002 Allowlist Explicit exceptions to a check. \u691c\u67fb\u304b\u3089\u9664\u5916\u3059\u308b\u3068\u660e\u793a\u3057\u305f\u4f8b\u5916\u3002 Parser A program that checks and reads a notation's structure. \u8a18\u6cd5\u306e\u69cb\u9020\u3092\u691c\u67fb\u3057\u3066\u8aad\u307f\u53d6\u308b\u30d7\u30ed\u30b0\u30e9\u30e0\u3002"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/","title":"REV M1 Skeleton PR Review r2 / M1 \u6587\u66f8\u9aa8\u683c PR \u518d\u30ec\u30d3\u30e5\u30fc r2","text":"<p>Summary: Request changes on PR #19 at bf320ed. Most r1 corrections are verified, but the publication-policy scan skips published files and the manifest validator accepts invalid types or crashes on malformed input. \u6982\u8981: PR #19 \u306e bf320ed \u306f\u4fee\u6b63\u8981\u6c42\u3002r1 \u306e\u4fee\u6b63\u306f\u5927\u534a\u3092\u78ba\u8a8d\u3057\u307e\u3057\u305f\u304c\u3001\u516c\u958b\u30dd\u30ea\u30b7\u30fc\u691c\u67fb\u306e\u516c\u958b\u30d5\u30a1\u30a4\u30eb\u9664\u5916\u3068\u3001manifest \u691c\u67fb\u306e\u4e0d\u6b63\u578b\u53d7\u7406\u30fb\u4f8b\u5916\u7d42\u4e86\u304c\u6b8b\u3063\u3066\u3044\u307e\u3059\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: green regression tests and workflows can coexist with an uncovered policy path and malformed-input failures; independent rejection cases exposed both. \uff0f \u56de\u5e30\u8a66\u9a13\u3068 workflow \u304c\u5408\u683c\u3057\u3066\u3082\u3001\u65b9\u91dd\u691c\u67fb\u306e\u5bfe\u8c61\u6f0f\u308c\u3068\u4e0d\u6b63\u5165\u529b\u51e6\u7406\u306e\u4e0d\u5177\u5408\u306f\u6b8b\u308a\u5f97\u308b\u3002\u72ec\u7acb\u3057\u305f\u62d2\u5426\u30b1\u30fc\u30b9\u3067\u4e21\u65b9\u3092\u78ba\u8a8d\u3057\u305f\u3002</li> <li>Applies to: PR #19, <code>feat/m1-skeleton</code> \u2192 <code>develop</code>, head <code>bf320ede99936ee4987356b0b3fece1cb8844cda</code>.</li> <li>Related: Review index \u00b7 r1 \u00b7 SPEC-01 \u00b7 SPEC-06.</li> <li>Used by: the owner's merge decision and the author's next correction.</li> </ul> <p></p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/#verdict","title":"Verdict","text":"<p>Request changes. A PR (pull request) is a proposed change awaiting review. This is a recommendation, not a GitHub approval. CI (continuous integration) means automated checks; all current workflows pass, but the rejection cases below do not. P1 blocks merge for ineffective publication protection; P2 is a correctness defect; P3 is a documentation correction. Terms are also explained in the shared glossary.</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/#remaining-findings","title":"Remaining findings","text":"<ol> <li> <p>R2-01 \u2014 P1: the private-URL policy excludes published material. <code>tools/manifest_check.py:566\u2013575,603\u2013612</code> excludes all <code>site/</code>, <code>*.legacy.md</code>, and nested legacy sample files, then filters remaining files by suffix. The workflow at <code>.github/workflows/security.yml:110\u2013113</code> describes an all-tracked-files policy. Temporary-directory tests placed the same synthetic prohibited address in <code>site/index.html</code>, <code>docs/guides/api/README.legacy.md</code>, and <code>docs/guides/api/addon/x.py</code>: <code>run_policy_scan(root, [path])</code> returned zero findings for each; the control <code>docs/README.md</code> returned one. A formatting or Semgrep legacy exception must not become an exception to public disclosure rules. Gitleaks default secret rules do not enforce private-repository URL policy. Remove these path exemptions from the publication-policy scan and inspect every tracked readable text file, including generated HTML/search data and legacy sources. Add positive detection tests for each previously excluded category. The independent full-tree scan found no current matching address/token; this finding concerns the ineffective gate, not a new demonstrated leak.</p> </li> <li> <p>R2-02 \u2014 P2: schema validation accepts invalid types and breaks its exit-code contract. <code>tools/manifest_check.py:169\u2013170</code> compares <code>schema_version</code> with <code>1</code> without requiring an integer distinct from boolean; <code>232\u2013234</code> checks only the keys of <code>target_image</code>, not their values. Against temporary copies of the real JSON and unchanged TOON, <code>--manifest-only</code> returned 0 for <code>schema_version: true</code>, and separately for <code>target_image.M4: true</code>. Both violate SPEC-01's types. Also <code>components: \"bad\"</code> returned 1 with <code>AttributeError</code>, and a component <code>role: []</code> returned 1 with <code>TypeError</code>; invalid manifests must produce findings and exit 20. Evidence: unguarded set membership at <code>204</code>, followed by unconditional TOON comparison at <code>629\u2013631</code> and projection of unvalidated objects at <code>491\u2013500</code>. Validate scalar and container types before set membership/projection, reject boolean schema versions, validate target-image values, and stop dependent checks when structural validation fails. Add subprocess tests asserting exit 20 with no traceback for malformed JSON shapes. Existing valid-file/TOON checks are substantially improved, but r1 R4 is only partially resolved.</p> </li> <li> <p>R2-03 \u2014 P3: the documented fragment-check behavior is stale. <code>docs/spec/06_documentation_conventions.md:96,185</code> says fragments are not verified, while <code>tools/docs_check.py:212\u2013249</code> verifies both same-file and Markdown-target anchors. Update both languages to describe the behavior actually implemented. The implementation is useful; weakening it is unnecessary.</p> </li> </ol>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/#disposition-of-r1-findings","title":"Disposition of r1 findings","text":"r1 Result Evidence / remaining scope R1 private URLs in examples Resolved for current tree <code>manifest/README.md</code> uses prose; full tracked-text scan without exclusions found zero policy matches. R2 gitleaks rules disabled Resolved <code>[extend] useDefault = true</code>; four whole-line patterns with <code>regexTarget = \"line\"</code>; no path exemption. Hosted scan reports 70 commits and no leaks. Author reports a synthetic-secret rejection; I did not independently rerun that container test. R3 missing Trivy Resolved SHA-pinned filesystem scan and report artifact are present; M1 report-only scope is explicit in SPEC-03. Both Trivy steps and artifact upload succeed. R4 manifest validation Partially resolved Required fields, TOON comparison and failure modes are implemented; R2-01 and R2-02 remain. R5 ZAP loopback Resolved at specification level SPEC-03 uses Compose service names and container ports, separates host remapping, and updates both languages/diagrams. No running installer is delivered at M1, so runtime connectivity was not tested. R6 Mermaid/TOON syntax Resolved All 34 Mermaid blocks and 44 TOON blocks parse independently. R7 docs-check scope Substantially resolved All tracked Markdown is classified; legacy/pointer exceptions and the present SHA-only excerpt check are explicit; missing file plus fragment is checked; glossary warnings exist. R2-03 is the remaining wording correction. R8 C4/M2/core conflict Resolved <code>y_websocket</code> belongs to <code>core</code> in SPEC-00/02 and manifest JSON/TOON; SPEC-04 requires C4 in both core/full without skipping. <p>TOON is a compact notation for structured data; Mermaid is a notation that turns text into diagrams. The documentation excerpt check intentionally tests SHA membership only, as now disclosed in SPEC-06; it does not prove arbitrary excerpt-field equality. The manifest's standalone TOON comparison checks its prescribed fields.</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/#verification-and-limits","title":"Verification and limits","text":"<p>From the repository root, these checks succeeded:</p> <pre><code>python3 tools/manifest_check.py\npython3 tools/docs_check.py\npython3 -m unittest discover -s tools/tests -v\n</code></pre> <p>The documentation checker reported 45 checked files, 8 exempt files and 111 nonblocking glossary warnings. All 46 unit tests passed. The new untracked r2 file was separately checked directly through the checker API; it is not included in the tracked-file counts.</p> <p>The independent parser harness from r1, outside the repository, used Mermaid 11.4.1 and TOON 4.4.0. All 34/44 blocks parsed; the JSON projection and standalone TOON were semantically equal. Negative cases used temporary files only and left the tracked source unchanged. The correction commit changes 69 files, with 5,755 insertions and 523 deletions relative to <code>1a01c3b</code>.</p> <p>The authenticated GitHub connector confirmed the same PR head and successful documentation workflow and security workflow, including all four security jobs. The gitleaks log confirms the Docker invocation scans 70 commits. Local <code>gh</code> could not reach the API in this session, so connected GitHub tools supplied remote evidence. Posting the review comment was attempted once but rejected because the tool requires approval while this session uses approval policy <code>never</code>; no r2 comment was posted. No new independent audit of all private integration repositories, image pixels, or deployed installer behavior was performed.</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/#owner-decisions","title":"Owner decisions","text":"<p>Fix R2-01/R2-02 before merge and update R2-03 in both languages. The earlier owner decisions remain: ADR-01 \u00a75 bootstrap interpretation, public retention of the Claude session link, and acceptance of the documented legacy Semgrep deferral. The new <code>core</code> definition resolves the C4 ambiguity; retain that scope explicitly. M1 Trivy findings are reports, not a claim that vulnerabilities are absent. Regenerate <code>site/</code> after documentation changes and rerun rejection tests and CI.</p> <p></p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/#\u5224\u5b9a","title":"\u5224\u5b9a","text":"<p>Request changes\uff08\u4fee\u6b63\u8981\u6c42\uff09\u3002 PR\uff08\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\uff09\u306f\u30ec\u30d3\u30e5\u30fc\u3092\u5f85\u3064\u5909\u66f4\u63d0\u6848\u3067\u3059\u3002\u3053\u306e\u5224\u5b9a\u306f\u63a8\u5968\u3067\u3042\u308a GitHub \u306e\u627f\u8a8d\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002CI\uff08\u7d99\u7d9a\u7684\u30a4\u30f3\u30c6\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\uff09\u306f\u5909\u66f4\u3092\u81ea\u52d5\u691c\u67fb\u3059\u308b\u4ed5\u7d44\u307f\u3067\u3059\u3002\u73fe\u884c workflow \u306f\u5408\u683c\u3057\u3066\u3044\u307e\u3059\u304c\u3001\u6b21\u306e\u62d2\u5426\u30b1\u30fc\u30b9\u304c\u4e0d\u6b63\u3067\u3059\u3002P1 \u306f\u516c\u958b\u4fdd\u8b77\u304c\u7121\u52b9\u306b\u306a\u308b\u30de\u30fc\u30b8\u963b\u5bb3\u4e8b\u9805\u3001P2 \u306f\u6b63\u3057\u3055\u306e\u4e0d\u5177\u5408\u3001P3 \u306f\u6587\u66f8\u306e\u4fee\u6b63\u3067\u3059\u3002\u5171\u901a\u7528\u8a9e\u96c6\u3082\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/#\u6b8b\u308b\u6307\u6458","title":"\u6b8b\u308b\u6307\u6458","text":"<ol> <li> <p>R2-01 \u2014 P1: \u975e\u516c\u958b URL \u306e\u65b9\u91dd\u691c\u67fb\u304c\u516c\u958b\u7269\u3092\u9664\u5916\u3002 <code>tools/manifest_check.py:566\u2013575,603\u2013612</code> \u306f <code>site/</code> \u5168\u4f53\u3001<code>*.legacy.md</code>\u3001\u65e7\u30b5\u30f3\u30d7\u30eb\u306e\u4e0b\u4f4d\u30d5\u30a1\u30a4\u30eb\u3092\u9664\u5916\u3057\u3001\u6b8b\u308a\u3082\u62e1\u5f35\u5b50\u3067\u7d5e\u308a\u307e\u3059\u3002<code>.github/workflows/security.yml:110\u2013113</code> \u306f\u5168\u8ffd\u8de1\u30d5\u30a1\u30a4\u30eb\u3092\u5bfe\u8c61\u3068\u8aac\u660e\u3057\u3066\u3044\u307e\u3059\u3002\u4e00\u6642\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u540c\u3058\u6a21\u64ec\u7981\u6b62\u30a2\u30c9\u30ec\u30b9\u3092 <code>site/index.html</code>\u3001<code>docs/guides/api/README.legacy.md</code>\u3001<code>docs/guides/api/addon/x.py</code> \u306b\u7f6e\u304d\u3001<code>run_policy_scan(root, [path])</code> \u304c\u54040\u4ef6\u3001\u5bfe\u7167\u306e <code>docs/README.md</code> \u306f1\u4ef6\u3068\u518d\u73fe\u3057\u307e\u3057\u305f\u3002\u65e7\u8cc7\u6599\u306e\u5f62\u5f0f\u30fbSemgrep \u4f8b\u5916\u3092\u516c\u958b\u7981\u6b62\u4e8b\u9805\u306e\u4f8b\u5916\u306b\u3057\u3066\u306f\u3044\u3051\u307e\u305b\u3093\u3002gitleaks \u306e\u65e2\u5b9a\u79d8\u5bc6\u898f\u5247\u306f\u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea URL \u306e\u516c\u958b\u65b9\u91dd\u3092\u691c\u67fb\u3057\u307e\u305b\u3093\u3002\u516c\u958b\u65b9\u91dd\u691c\u67fb\u306e\u30d1\u30b9\u9664\u5916\u3092\u306a\u304f\u3057\u3001\u751f\u6210 HTML\u30fb\u691c\u7d22\u30c7\u30fc\u30bf\u30fb\u65e7\u8cc7\u6599\u3082\u542b\u3081\u3001\u8ffd\u8de1\u3055\u308c\u305f\u8aad\u307f\u53d6\u308a\u53ef\u80fd\u306a\u30c6\u30ad\u30b9\u30c8\u5168\u4f53\u3092\u5bfe\u8c61\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u5404\u9664\u5916\u30ab\u30c6\u30b4\u30ea\u3067\u691c\u51fa\u3059\u308b\u8a66\u9a13\u3092\u8ffd\u52a0\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u9664\u5916\u306a\u3057\u306e\u72ec\u7acb\u691c\u7d22\u3067\u306f\u73fe\u5728\u306e\u8a72\u5f53\u30a2\u30c9\u30ec\u30b9\u30fbtoken \u306f0\u4ef6\u3067\u3057\u305f\u3002\u65b0\u305f\u306a\u6f0f\u6d29\u306e\u5b9f\u8a3c\u3067\u306f\u306a\u304f\u3001\u691c\u67fb\u304c\u6f0f\u6d29\u3092\u62d2\u5426\u3067\u304d\u306a\u3044\u6307\u6458\u3067\u3059\u3002</p> </li> <li> <p>R2-02 \u2014 P2: \u4e0d\u6b63\u306a\u578b\u3092\u53d7\u7406\u3057\u3001\u7d42\u4e86\u30b3\u30fc\u30c9\u5951\u7d04\u3082\u7834\u308b\u3002 <code>tools/manifest_check.py:169\u2013170</code> \u306f <code>schema_version</code> \u3092 <code>1</code> \u3068\u6bd4\u8f03\u3059\u308b\u3060\u3051\u3067\u771f\u507d\u5024\u3092\u6574\u6570\u304b\u3089\u533a\u5225\u305b\u305a\u3001<code>232\u2013234</code> \u306f <code>target_image</code> \u306e\u30ad\u30fc\u3060\u3051\u3092\u898b\u3066\u5024\u306e\u578b\u3092\u691c\u67fb\u3057\u307e\u305b\u3093\u3002\u73fe\u884c JSON \u306e\u4e00\u6642\u30b3\u30d4\u30fc\u3068\u5909\u66f4\u3057\u3066\u3044\u306a\u3044 TOON \u3067\u3001<code>schema_version: true</code> \u3068\u3001\u5225\u30b1\u30fc\u30b9\u306e <code>target_image.M4: true</code> \u304c\u3044\u305a\u308c\u3082 <code>--manifest-only</code> \u3067 \u7d42\u4e860 \u306b\u306a\u308a\u307e\u3057\u305f\u3002\u3068\u3082\u306b SPEC-01 \u306e\u578b\u306b\u53cd\u3057\u307e\u3059\u3002\u307e\u305f <code>components: \"bad\"</code> \u306f <code>AttributeError</code>\u3001\u90e8\u54c1\u306e <code>role: []</code> \u306f <code>TypeError</code> \u3067 \u7d42\u4e861 \u306b\u306a\u308a\u307e\u3059\u3002\u4e0d\u6b63 manifest \u306f\u6307\u6458\u3092\u51fa\u3057 \u7d42\u4e8620 \u306b\u3059\u308b\u5951\u7d04\u3067\u3059\u3002\u6839\u62e0\u306f204\u884c\u306e\u578b\u672a\u78ba\u8a8d\u306e\u96c6\u5408\u6240\u5c5e\u5224\u5b9a\u3001629\u2013631\u884c\u306e\u7121\u6761\u4ef6 TOON \u6bd4\u8f03\u3001491\u2013500\u884c\u306e\u672a\u691c\u8a3c\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u304b\u3089\u306e\u6284\u9332\u751f\u6210\u3067\u3059\u3002\u96c6\u5408\u5224\u5b9a\u30fb\u6284\u9332\u751f\u6210\u306e\u524d\u306b\u578b\u3092\u691c\u67fb\u3057\u3001\u771f\u507d\u5024\u306e schema version \u3092\u62d2\u5426\u3057\u3001target-image \u306e\u5024\u3082\u691c\u8a3c\u3057\u3001\u69cb\u9020\u4e0d\u6b63\u6642\u306b\u306f\u4f9d\u5b58\u3059\u308b\u691c\u67fb\u3092\u6b62\u3081\u3066\u304f\u3060\u3055\u3044\u3002\u4e0d\u6b63\u306a JSON \u69cb\u9020\u3067 traceback \u306a\u3057\u30fb\u7d42\u4e8620\u3092\u78ba\u304b\u3081\u308b\u30b5\u30d6\u30d7\u30ed\u30bb\u30b9\u8a66\u9a13\u304c\u5fc5\u8981\u3067\u3059\u3002\u6b63\u5e38\u30d5\u30a1\u30a4\u30eb\u30fbTOON \u691c\u67fb\u306f\u5927\u5e45\u306b\u6539\u5584\u3057\u307e\u3057\u305f\u304c r1 R4 \u306f\u4e00\u90e8\u672a\u89e3\u6c7a\u3067\u3059\u3002</p> </li> <li> <p>R2-03 \u2014 P3: \u30d5\u30e9\u30b0\u30e1\u30f3\u30c8\u691c\u67fb\u306e\u8aac\u660e\u304c\u53e4\u3044\u3002 <code>docs/spec/06_documentation_conventions.md:96,185</code> \u306f\u30d5\u30e9\u30b0\u30e1\u30f3\u30c8\u3092\u691c\u67fb\u3057\u306a\u3044\u3068\u8aac\u660e\u3057\u307e\u3059\u304c\u3001<code>tools/docs_check.py:212\u2013249</code> \u306f\u540c\u4e00\u30d5\u30a1\u30a4\u30eb\u30fb\u30ea\u30f3\u30af\u5148 Markdown \u306e\u30a2\u30f3\u30ab\u30fc\u3092\u691c\u67fb\u3057\u3066\u3044\u307e\u3059\u3002\u4e21\u8a00\u8a9e\u3092\u5b9f\u88c5\u306b\u5408\u308f\u305b\u3066\u66f4\u65b0\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u5b9f\u88c5\u306f\u6709\u7528\u306a\u306e\u3067\u5f31\u3081\u308b\u5fc5\u8981\u306f\u3042\u308a\u307e\u305b\u3093\u3002</p> </li> </ol>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/#r1-\u5404\u6307\u6458\u306e\u6271\u3044","title":"r1 \u5404\u6307\u6458\u306e\u6271\u3044","text":"r1 \u7d50\u679c \u6839\u62e0\u30fb\u6b8b\u308b\u7bc4\u56f2 R1 \u7981\u6b62\u4f8b\u306e private URL \u73fe\u5728\u306e\u30c4\u30ea\u30fc\u3067\u306f\u89e3\u6d88 <code>manifest/README.md</code> \u306f\u6563\u6587\u5316\u3002\u9664\u5916\u306a\u3057\u306e\u8ffd\u8de1\u30c6\u30ad\u30b9\u30c8\u691c\u7d22\u3067\u65b9\u91dd\u8a72\u5f530\u4ef6\u3002 R2 gitleaks \u7121\u52b9 \u89e3\u6d88 <code>[extend] useDefault = true</code>\u3001\u884c\u5168\u4f53\u306b\u9650\u5b9a\u3057\u305f4\u30d1\u30bf\u30fc\u30f3\u3068 <code>regexTarget = \"line\"</code>\u3001\u30d1\u30b9\u9664\u5916\u306a\u3057\u3002hosted \u691c\u67fb\u306f70\u30b3\u30df\u30c3\u30c8\u3067\u691c\u51fa\u306a\u3057\u3002\u4f5c\u8005\u306f\u6a21\u64ec\u79d8\u5bc6\u306e\u62d2\u5426\u3082\u5831\u544a\u3057\u3066\u3044\u307e\u3059\u304c\u3001\u305d\u306e\u30b3\u30f3\u30c6\u30ca\u8a66\u9a13\u306f\u72ec\u7acb\u518d\u5b9f\u884c\u3057\u3066\u3044\u307e\u305b\u3093\u3002 R3 Trivy \u6b20\u843d \u89e3\u6d88 SHA \u56fa\u5b9a\u306e filesystem \u691c\u67fb\u3068\u5831\u544a artifact \u304c\u3042\u308a\u3001SPEC-03 \u306b M1 \u5831\u544a\u306e\u307f\u306e\u7bc4\u56f2\u3092\u660e\u793a\u3002Trivy \u306e2\u30b9\u30c6\u30c3\u30d7\u3068 artifact \u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u304c\u6210\u529f\u3002 R4 manifest \u691c\u67fb \u4e00\u90e8\u89e3\u6d88 \u5fc5\u9808\u9805\u76ee\u3001TOON \u6bd4\u8f03\u3001\u62d2\u5426\u51e6\u7406\u306f\u5b9f\u88c5\u3002R2-01/R2-02 \u304c\u6b8b\u308b\u3002 R5 ZAP loopback \u4ed5\u69d8\u4e0a\u89e3\u6d88 SPEC-03 \u306f Compose \u30b5\u30fc\u30d3\u30b9\u540d\u30fb\u30b3\u30f3\u30c6\u30ca\u5074\u30dd\u30fc\u30c8\u3092\u4f7f\u7528\u3057\u3001\u30db\u30b9\u30c8\u306e\u4ed8\u3051\u66ff\u3048\u3068\u5206\u96e2\u3002\u82f1\u548c\u3068\u56f3\u3092\u66f4\u65b0\u3002M1 \u306f\u7a3c\u50cd\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u3092\u63d0\u4f9b\u3057\u306a\u3044\u305f\u3081\u5b9f\u63a5\u7d9a\u306f\u672a\u691c\u8a3c\u3002 R6 Mermaid/TOON \u69cb\u6587 \u89e3\u6d88 Mermaid 34\u4ef6\u30fbTOON 44\u4ef6\u304c\u72ec\u7acb\u89e3\u6790\u3067\u3059\u3079\u3066\u5408\u683c\u3002 R7 docs-check \u7bc4\u56f2 \u5927\u534a\u3092\u89e3\u6d88 \u5168\u8ffd\u8de1 Markdown \u3092\u5206\u985e\u3057\u3001\u65e7\u8cc7\u6599\u30fb\u8a98\u5c0e\u306e\u4f8b\u5916\u3068\u73fe\u6bb5\u968e\u306e SHA \u9650\u5b9a\u6284\u9332\u691c\u67fb\u3092\u660e\u8a18\u3002file#fragment \u306e\u6b20\u843d\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u67fb\u3057\u3001\u7528\u8a9e\u8b66\u544a\u3082\u3042\u308b\u3002\u8aac\u660e\u4fee\u6b63 R2-03 \u304c\u6b8b\u308b\u3002 R8 C4/M2/core \u77db\u76fe \u89e3\u6d88 SPEC-00/02 \u3068 manifest JSON/TOON \u304c <code>y_websocket</code> \u3092 <code>core</code> \u306b\u914d\u7f6e\u3002SPEC-04 \u306f core/full \u53cc\u65b9\u3067 C4 \u5fc5\u9808\u30fb\u30b9\u30ad\u30c3\u30d7\u306a\u3057\u3002 <p>TOON \u306f\u69cb\u9020\u3092\u6301\u3064\u30c7\u30fc\u30bf\u306e\u77ed\u3044\u8a18\u6cd5\u3001Mermaid \u306f\u6587\u5b57\u304b\u3089\u56f3\u3092\u4f5c\u308b\u8a18\u6cd5\u3067\u3059\u3002\u6587\u66f8\u306e\u6284\u9332\u691c\u67fb\u306f SPEC-06 \u306b\u660e\u793a\u3055\u308c\u305f\u3068\u304a\u308a SHA \u306e\u5b58\u5728\u78ba\u8a8d\u306e\u307f\u3067\u3042\u308a\u3001\u4efb\u610f\u306e\u9805\u76ee\u306e\u4e00\u81f4\u3092\u8a3c\u660e\u3059\u308b\u3082\u306e\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002manifest \u306e\u72ec\u7acb\u3057\u305f TOON \u6bd4\u8f03\u3067\u306f\u898f\u5b9a\u3055\u308c\u305f\u9805\u76ee\u3092\u6bd4\u8f03\u3057\u307e\u3059\u3002</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/#\u691c\u8a3c\u3068\u9650\u754c","title":"\u691c\u8a3c\u3068\u9650\u754c","text":"<p>\u30ea\u30dd\u30b8\u30c8\u30ea\u30eb\u30fc\u30c8\u3067\u6b21\u306e\u691c\u67fb\u304c\u6210\u529f\u3057\u307e\u3057\u305f\u3002</p> <pre><code>python3 tools/manifest_check.py\npython3 tools/docs_check.py\npython3 -m unittest discover -s tools/tests -v\n</code></pre> <p>\u6587\u66f8\u691c\u67fb\u306f45\u30d5\u30a1\u30a4\u30eb\u691c\u67fb\u30018\u30d5\u30a1\u30a4\u30eb\u4f8b\u5916\u3001\u5408\u5426\u3092\u5de6\u53f3\u3057\u306a\u3044\u7528\u8a9e\u8b66\u544a111\u4ef6\u3067\u3057\u305f\u3002\u5358\u4f53\u8a66\u9a1346\u4ef6\u306f\u3059\u3079\u3066\u5408\u683c\u3067\u3059\u3002\u672a\u8ffd\u8de1\u306e\u65b0\u898f r2 \u6587\u66f8\u306f\u30c1\u30a7\u30c3\u30ab\u30fc API \u3067\u5225\u9014\u76f4\u63a5\u78ba\u8a8d\u3057\u3001\u8ffd\u8de1\u30d5\u30a1\u30a4\u30eb\u4ef6\u6570\u306b\u306f\u542b\u307e\u308c\u307e\u305b\u3093\u3002</p> <p>r1 \u3067\u7528\u610f\u3057\u305f\u30ea\u30dd\u30b8\u30c8\u30ea\u5916\u306e\u72ec\u7acb\u30d1\u30fc\u30b5\u30fc\u306f Mermaid 11.4.1 \u3068 TOON 4.4.0 \u3092\u4f7f\u7528\u3057\u307e\u3057\u305f\u300234/44\u30d6\u30ed\u30c3\u30af\u3059\u3079\u3066\u304c\u89e3\u6790\u3067\u304d\u3001JSON \u306e\u898f\u5b9a\u6284\u9332\u3068\u72ec\u7acb TOON \u306f\u610f\u5473\u7684\u306b\u4e00\u81f4\u3057\u307e\u3057\u305f\u3002\u62d2\u5426\u30b1\u30fc\u30b9\u306f\u4e00\u6642\u30d5\u30a1\u30a4\u30eb\u306e\u307f\u3067\u884c\u3044\u3001\u8ffd\u8de1\u30bd\u30fc\u30b9\u3092\u5909\u66f4\u3057\u3066\u3044\u307e\u305b\u3093\u3002\u4fee\u6b63\u30b3\u30df\u30c3\u30c8\u306f <code>1a01c3b</code> \u6bd4\u306769\u30d5\u30a1\u30a4\u30eb\u3001\u8ffd\u52a05,755\u884c\u3001\u524a\u9664523\u884c\u3067\u3059\u3002</p> <p>\u8a8d\u8a3c\u6e08\u307f GitHub \u30b3\u30cd\u30af\u30bf\u30fc\u3067 PR \u306e\u540c\u4e00 head \u3068\u3001docs workflow\u30fbsecurity workflow \u306e\u6210\u529f\u3092\u78ba\u8a8d\u3057\u3001security \u306e4\u30b8\u30e7\u30d6\u3082\u3059\u3079\u3066\u6210\u529f\u3057\u3066\u3044\u307e\u3059\u3002gitleaks \u30ed\u30b0\u306f Docker \u547c\u3073\u51fa\u3057\u306870\u30b3\u30df\u30c3\u30c8\u306e\u691c\u67fb\u3092\u78ba\u8a8d\u3067\u304d\u307e\u3059\u3002\u3053\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u30ed\u30fc\u30ab\u30eb <code>gh</code> \u306f API \u306b\u63a5\u7d9a\u3067\u304d\u306a\u304b\u3063\u305f\u305f\u3081\u3001\u63a5\u7d9a\u6e08\u307f GitHub \u30c4\u30fc\u30eb\u3067\u30ea\u30e2\u30fc\u30c8\u60c5\u5831\u3092\u78ba\u8a8d\u3057\u307e\u3057\u305f\u3002\u30b3\u30e1\u30f3\u30c8\u6295\u7a3f\u306f1\u56de\u8a66\u307f\u307e\u3057\u305f\u304c\u3001\u30c4\u30fc\u30eb\u304c\u627f\u8a8d\u3092\u8981\u6c42\u3057\u3001\u3053\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u306f approval policy \u304c <code>never</code> \u306e\u305f\u3081\u62d2\u5426\u3055\u308c\u307e\u3057\u305f\u3002r2 \u30b3\u30e1\u30f3\u30c8\u306f\u672a\u6295\u7a3f\u3067\u3059\u3002\u975e\u516c\u958b\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u5168\u4f53\u3001\u753b\u50cf\u306e\u753b\u7d20\u3001\u5c0e\u5165\u6e08\u307f\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306e\u52d5\u4f5c\u306b\u3064\u3044\u3066\u65b0\u3057\u3044\u72ec\u7acb\u76e3\u67fb\u306f\u3057\u3066\u3044\u307e\u305b\u3093\u3002</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/#\u6240\u6709\u8005\u306e\u5224\u65ad\u4e8b\u9805","title":"\u6240\u6709\u8005\u306e\u5224\u65ad\u4e8b\u9805","text":"<p>\u30de\u30fc\u30b8\u524d\u306b R2-01/R2-02 \u3092\u4fee\u6b63\u3057\u3001R2-03 \u3092\u4e21\u8a00\u8a9e\u3067\u76f4\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u5f93\u6765\u306e\u6240\u6709\u8005\u5224\u65ad\u4e8b\u9805\u3067\u3042\u308b ADR-01 \u00a75 \u306e\u521d\u56de\u69cb\u7bc9\u89e3\u91c8\u3001Claude \u30bb\u30c3\u30b7\u30e7\u30f3\u30ea\u30f3\u30af\u306e\u516c\u958b\u4fdd\u6301\u3001\u65e7\u8cc7\u6599\u306e Semgrep \u5ef6\u671f\u627f\u8a8d\u306f\u6b8b\u308a\u307e\u3059\u3002\u65b0\u3057\u3044 <code>core</code> \u5b9a\u7fa9\u3067 C4 \u306e\u66d6\u6627\u3055\u306f\u89e3\u6d88\u3057\u305f\u305f\u3081\u3001\u3053\u306e\u7bc4\u56f2\u3092\u660e\u793a\u7684\u306b\u7dad\u6301\u3057\u3066\u304f\u3060\u3055\u3044\u3002M1 \u306e Trivy \u306f\u5831\u544a\u3067\u3042\u308a\u3001\u8106\u5f31\u6027\u30bc\u30ed\u306e\u5ba3\u8a00\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u6587\u66f8\u4fee\u6b63\u5f8c\u306f <code>site/</code> \u3092\u518d\u751f\u6210\u3057\u3001\u62d2\u5426\u30b1\u30fc\u30b9\u3068 CI \u3092\u518d\u5b9f\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r2/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 PR A change proposed for review and merging. \u30ec\u30d3\u30e5\u30fc\u3068\u7d71\u5408\u3092\u6c42\u3081\u308b\u5909\u66f4\u63d0\u6848\u3002 CI Automated checks of changes. \u5909\u66f4\u306b\u5bfe\u3059\u308b\u81ea\u52d5\u691c\u67fb\u3002 Schema The permitted fields and value types of data. \u30c7\u30fc\u30bf\u306b\u8a31\u3059\u9805\u76ee\u3068\u5024\u306e\u578b\u3002 TOON A compact text notation for structured data. \u69cb\u9020\u3092\u6301\u3064\u30c7\u30fc\u30bf\u3092\u77ed\u304f\u66f8\u304f\u6587\u5b57\u5f62\u5f0f\u3002 Mermaid Text notation rendered as diagrams. \u56f3\u3068\u3057\u3066\u63cf\u753b\u3059\u308b\u6587\u5b57\u306e\u8a18\u6cd5\u3002 SHA A fingerprint identifying one commit. \u4e00\u3064\u306e\u30b3\u30df\u30c3\u30c8\u3092\u6307\u3059\u6307\u7d0b\u3002 Exit code A number returned when a program finishes. \u30d7\u30ed\u30b0\u30e9\u30e0\u304c\u7d42\u4e86\u6642\u306b\u8fd4\u3059\u6570\u3002 Fragment / anchor A link suffix and its destination within a page. \u30da\u30fc\u30b8\u5185\u306e\u5834\u6240\u3092\u6307\u3059\u30ea\u30f3\u30af\u672b\u5c3e\u3068\u3001\u305d\u306e\u884c\u304d\u5148\u3002"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/","title":"REV M1 Skeleton PR Review r3 / REV\uff08\u62c5\u5f53\u30ec\u30d3\u30e5\u30ef\uff09M1 \u6587\u66f8\u9aa8\u683c PR \u518d\u30ec\u30d3\u30e5\u30fc r3","text":"<p>Summary: Approve recommendation for PR (pull request: a proposed change) #19 at 413520e. All three r2 findings are resolved; no regression was found in the r1 corrections within the checks recorded here. \u6982\u8981: PR\uff08\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8: \u5909\u66f4\u63d0\u6848\uff09#19 \u306e 413520e \u306f approve \u63a8\u5968\u3002r2 \u306e3\u4ef6\u306f\u89e3\u6d88\u3057\u3001\u8a18\u9332\u3057\u305f\u691c\u67fb\u306e\u7bc4\u56f2\u3067\u306f r1 \u4fee\u6b63\u306e\u56de\u5e30\u3082\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: replaying the earlier failing inputs confirms both rejection and safe reporting; a passing normal-input check alone cannot establish either. \uff0f \u904e\u53bb\u306b\u5931\u6557\u3057\u305f\u5165\u529b\u306e\u518d\u5b9f\u884c\u3067\u3001\u62d2\u5426\u3068\u5b89\u5168\u306a\u5831\u544a\u306e\u4e21\u65b9\u3092\u78ba\u304b\u3081\u3089\u308c\u305f\u3002\u6b63\u5e38\u5165\u529b\u306e\u5408\u683c\u3060\u3051\u3067\u306f\u4e21\u65b9\u3092\u4fdd\u8a3c\u3067\u304d\u306a\u3044\u3002</li> <li>Applies to: PR #19, <code>feat/m1-skeleton</code> \u2192 <code>develop</code>, head <code>413520e20a98862d7eb5b203bdda1900d49019ac</code>.</li> <li>Related: Review index \u00b7 r1 \u00b7 r2 \u00b7 SPEC-01 \u00b7 SPEC-06.</li> <li>Used by: the owner's integration decision under ADR-01 \u00a75.</li> </ul> <p></p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/#verdict","title":"Verdict","text":"<p>Approve. No remaining technical findings from r2 and no newly identified regression in r1 fixes. This is an independent review recommendation, not a GitHub approval or merge. The three owner decisions remain open. CI (continuous integration: automatic checks of changes) passes on the exact reviewed head. See the shared glossary for background terms.</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/#resolution-of-r2-findings","title":"Resolution of r2 findings","text":"<ol> <li> <p>R2-01 resolved. <code>scan_policy</code> in <code>tools/manifest_check.py</code> scans tracked files without path or extension exclusions. An independent temporary copy detected a runtime-built prohibited address on line 2 in each of seven paths: <code>site/index.html</code>, <code>site/search/search_index.json</code>, <code>docs/guides/api/README.legacy.md</code>, <code>docs/guides/api/addon/x.py</code>, <code>docs/README.md</code>, <code>Dockerfile</code>, and <code>assets/data.unknownext</code>. Each direct call returned one finding; the temporary Git repository's command-line policy check rejected the files with exit code (the completion status number) 1. Neither output included the matched address. The real tree reports 451 scanned, 62 skipped as non-UTF-8 (not readable in the expected text encoding), zero over 5 MB, and zero findings. Binary/size skip accounting and detection in former exclusions are covered by tests. Source inspection also shows unreadable files are recorded as skipped; this is a technical read limitation, not a path exemption. The scan does not inspect image pixels.</p> </li> <li> <p>R2-02 resolved. <code>STRUCT_TOP</code>, <code>STRUCT_COMPONENT</code>, <code>STRUCT_UPSTREAM</code>, and <code>STRUCT_PR</code> declare field types; <code>validate_structure</code> runs before value comparisons and TOON (a compact text form of structured data) projection. Integer validation explicitly excludes booleans. The independent copy used the real JSON (structured data written as named fields), with the real TOON unchanged. Each original rejection case\u2014<code>schema_version: true</code>, <code>target_image.M4: true</code>, <code>components: \"bad\"</code>, and component <code>role: []</code>\u2014now reports the relevant MC (manifest-check rule) finding, exits 20, and produces no traceback (an internal error stack). The unchanged copy exits 0. Structural failures do not attempt MC-11 comparison. Added subprocess tests in <code>tools/tests/test_manifest_check.py</code> assert these outcomes and additional malformed shapes; all pass.</p> </li> <li> <p>R2-03 resolved. SPEC-06 \u00a78 version 0.3 now describes file and fragment checking in both languages. The implementation checks same-file anchors (page bookmarks) and anchors/headings in Markdown targets. Independent negative checks reject a missing file with fragment, a missing same-file anchor, and a missing anchor in an existing Markdown file; an existing <code>#english</code> target passes. <code>tools/docs_check.py</code> is unchanged from r2.</p> </li> </ol>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/#regression-check-of-r1-fixes","title":"Regression check of r1 fixes","text":"r1 finding r3 evidence and disposition R1 published private addresses Resolved: real-tree policy scan has zero findings, and old excluded locations now reject synthetic cases. R2 disabled gitleaks Resolved: unchanged <code>[extend] useDefault = true</code>, four whole-line exceptions, no path exception; hosted secret scan passes. gitleaks is the secret-detection tool. Its synthetic-secret container test was not independently rerun in r3. R3 missing Trivy Resolved: unchanged pinned filesystem job and report artifact, with explicit M1 report-only scope; hosted job passes. Trivy is the vulnerability/configuration scanner; a green report-only job does not mean zero vulnerabilities. R4 incomplete manifest validation Resolved for the reviewed defects: 66 checker tests pass, normal JSON/TOON comparison passes, and original malformed-input cases now reject correctly. R5 ZAP scans itself Still resolved in both language specifications: ZAP (the running-web-application scanner) uses service names and internal ports; host port remapping does not change those targets. Specification unchanged since r2; no deployed installer test was performed. R6 malformed diagram/data blocks All 34 Mermaid (text-defined diagram) blocks reparse successfully using the existing Mermaid 11.4.1 harness. All 34 Mermaid and 44 TOON blocks are unchanged from r2; the 44 TOON blocks retain r2's independent parse evidence rather than a new external-parser run. R7 documentation checker gaps Resolved within the disclosed M1 scope: checker tests pass, fragment rejection was independently reproduced, and explicit legacy-format exceptions and SHA-only excerpt checking remain documented. SHA is a revision fingerprint; excerpt checking does not prove equality of arbitrary fields. R8 C4/core/M2 conflict Still resolved: unchanged JSON/TOON and SPEC-00/02/04 place <code>y_websocket</code> in <code>core</code> and require C4 in both core/full without skipping."},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/#reproduction-and-ci-evidence","title":"Reproduction and CI evidence","text":"<p>Run these commands from the repository root; all returned 0:</p> <pre><code>python3 tools/manifest_check.py\npython3 tools/docs_check.py\npython3 -m unittest discover -s tools/tests -v\ngh pr checks 19 -R RCOSDP/RDM-developer-guide\n</code></pre> <p>The unit suite reports 66 tests passed. Documentation checking reports 46 checked files, 8 exempt files, and 116 nonblocking glossary warnings before adding this untracked review. The new review is checked separately through <code>check_file</code>; tracked-file enumeration does not include it yet.</p> <p>The independent negative cases ran only in <code>scratchpad/rev-r3-toxvm83j/</code> under the task's designated temporary directory. The checker and real manifest files were copied there; synthetic addresses were assembled at runtime and never written to this repository. The four original type mutations were tested separately with unchanged TOON. No production file was mutated for rejection tests.</p> <p>Using only <code>gh</code>, PR (pull request: a proposed change) metadata and both run records confirmed head <code>413520e20a98862d7eb5b203bdda1900d49019ac</code>. All six checks pass: MkDocs (the documentation-to-website tool) site build, links, manifest/policy, gitleaks, Semgrep (source-code pattern checking), and Trivy. Both the documentation run and security run conclude <code>success</code>. The generated SPEC-06 site page changed along with its source. This review does not newly audit private integration repositories, session-link contents, all image pixels, or deployed installer behavior.</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/#remaining-owner-decisions","title":"Remaining owner decisions","text":"<ul> <li>ADR-01 \u00a75 bootstrap interpretation: the initial integration-order interpretation remains explicitly proposed and awaiting the owner. This recommendation does not approve that exception; record the owner's decision and align affected normative records if accepted.</li> <li>Claude-Session link retention: decide whether to retain the session link in public metadata after checking sharing visibility. The link's contents were not inspected or republished.</li> <li>Legacy Semgrep deferral: explicitly accept or reject the documented M2/M3 deferral of historical sample-code findings. Publication-policy scanning now covers those paths even while Semgrep exceptions remain.</li> </ul> <p>No code correction is requested by r3. The coordinator still needs to integrate this review record and handle the owner decisions; no commit, push, approval, or merge was performed by this reviewer.</p> <p></p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/#\u5224\u5b9a","title":"\u5224\u5b9a","text":"<p>Approve\u3002r2 \u306e\u6280\u8853\u7684\u6307\u6458\u306f\u6b8b\u3063\u3066\u304a\u3089\u305a\u3001r1 \u4fee\u6b63\u306b\u65b0\u3057\u3044\u56de\u5e30\u3082\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002 \u72ec\u7acb\u30ec\u30d3\u30e5\u30fc\u306e\u63a8\u5968\u3067\u3042\u308a\u3001GitHub \u306e\u627f\u8a8d\u3084\u30de\u30fc\u30b8\u64cd\u4f5c\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u6240\u6709\u8005\u306e\u5224\u65ad3\u70b9\u306f\u672a\u6c7a\u3067\u3059\u3002CI\uff08\u5909\u66f4\u3092\u81ea\u52d5\u691c\u67fb\u3059\u308b\u4ed5\u7d44\u307f\uff09\u306f\u3001\u78ba\u8a8d\u5bfe\u8c61\u3068\u540c\u3058 head \u3067\u5408\u683c\u3057\u3066\u3044\u307e\u3059\u3002\u80cc\u666f\u7528\u8a9e\u306f\u5171\u901a\u7528\u8a9e\u96c6\u3082\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/#r2-\u6307\u6458\u306e\u89e3\u6d88\u78ba\u8a8d","title":"r2 \u6307\u6458\u306e\u89e3\u6d88\u78ba\u8a8d","text":"<ol> <li> <p>R2-01 \u89e3\u6d88\u3002 <code>tools/manifest_check.py</code> \u306e <code>scan_policy</code> \u306f\u30d1\u30b9\u30fb\u62e1\u5f35\u5b50\u306e\u9664\u5916\u306a\u304f\u8ffd\u8de1\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u67fb\u3057\u307e\u3059\u3002\u72ec\u7acb\u3057\u305f\u4e00\u6642\u30b3\u30d4\u30fc\u3067\u3001\u5b9f\u884c\u6642\u306b\u7d44\u307f\u7acb\u3066\u305f\u7981\u6b62\u30a2\u30c9\u30ec\u30b9\u30927\u7a2e\u985e\u306e\u30d1\u30b9\u306e2\u884c\u76ee\u306b\u914d\u7f6e\u3057\u307e\u3057\u305f\u3002\u5bfe\u8c61\u306f <code>site/index.html</code>\u3001<code>site/search/search_index.json</code>\u3001<code>docs/guides/api/README.legacy.md</code>\u3001<code>docs/guides/api/addon/x.py</code>\u3001<code>docs/README.md</code>\u3001<code>Dockerfile</code>\u3001<code>assets/data.unknownext</code> \u3067\u3059\u3002\u76f4\u63a5\u547c\u51fa\u3057\u306f\u54041\u4ef6\u3092\u691c\u51fa\u3057\u3001\u4e00\u6642 Git \u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u691c\u67fb\u3082\u7d42\u4e86\u30b3\u30fc\u30c9\uff08\u51e6\u7406\u7d50\u679c\u3092\u8868\u3059\u6570\uff091\u3067\u62d2\u5426\u3057\u307e\u3057\u305f\u3002\u51fa\u529b\u306b\u4e00\u81f4\u30a2\u30c9\u30ec\u30b9\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u5b9f\u30c4\u30ea\u30fc\u306f451\u30d5\u30a1\u30a4\u30eb\u691c\u67fb\u3001UTF-8\uff08\u60f3\u5b9a\u3059\u308b\u6587\u5b57\u306e\u7b26\u53f7\u5316\u65b9\u5f0f\uff09\u3067\u8aad\u3081\u306a\u304462\u30d5\u30a1\u30a4\u30eb\u3092\u30b9\u30ad\u30c3\u30d7\u30015 MB\u8d85\u306f0\u4ef6\u3001\u691c\u51fa0\u4ef6\u3067\u3057\u305f\u3002\u65e7\u9664\u5916\u9818\u57df\u306e\u691c\u51fa\u3068\u30d0\u30a4\u30ca\u30ea\u30fb\u30b5\u30a4\u30ba\u5225\u306e\u96c6\u8a08\u306f\u8a66\u9a13\u3067\u3082\u78ba\u8a8d\u3057\u307e\u3057\u305f\u3002\u30b3\u30fc\u30c9\u4e0a\u306f\u8aad\u53d6\u4e0d\u80fd\u3082\u30b9\u30ad\u30c3\u30d7\u3068\u3057\u3066\u8a18\u9332\u3057\u307e\u3059\u3002\u3053\u308c\u306f\u8aad\u53d6\u306e\u6280\u8853\u7684\u9650\u754c\u3067\u3042\u308a\u3001\u30d1\u30b9\u4f8b\u5916\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u753b\u50cf\u306e\u753b\u7d20\u306f\u691c\u67fb\u3057\u307e\u305b\u3093\u3002</p> </li> <li> <p>R2-02 \u89e3\u6d88\u3002 <code>STRUCT_TOP</code>\u3001<code>STRUCT_COMPONENT</code>\u3001<code>STRUCT_UPSTREAM</code>\u3001<code>STRUCT_PR</code> \u304c\u9805\u76ee\u306e\u578b\u3092\u5ba3\u8a00\u3057\u3001<code>validate_structure</code> \u304c\u5024\u306e\u6bd4\u8f03\u3068 TOON\uff08\u69cb\u9020\u5316\u30c7\u30fc\u30bf\u3092\u77ed\u304f\u8868\u3059\u6587\u5b57\u5f62\u5f0f\uff09\u306e\u6284\u9332\u751f\u6210\u306b\u5148\u884c\u3057\u307e\u3059\u3002\u6574\u6570\u5224\u5b9a\u306f\u771f\u507d\u5024\u3092\u660e\u793a\u7684\u306b\u9664\u304d\u307e\u3059\u3002\u72ec\u7acb\u30b3\u30d4\u30fc\u3067\u306f\u5b9f\u969b\u306e JSON\uff08\u540d\u524d\u4ed8\u304d\u9805\u76ee\u3067\u66f8\u304f\u69cb\u9020\u5316\u30c7\u30fc\u30bf\uff09\u3092\u4f7f\u7528\u3057\u3001TOON \u306f\u5909\u66f4\u3057\u3066\u3044\u307e\u305b\u3093\u3002\u5143\u306e4\u30b1\u30fc\u30b9 <code>schema_version: true</code>\u3001<code>target_image.M4: true</code>\u3001<code>components: \"bad\"</code>\u3001\u90e8\u54c1\u306e <code>role: []</code> \u306f\u3059\u3079\u3066\u5bfe\u5fdc\u3059\u308b MC\uff08manifest \u691c\u67fb\u898f\u5247\uff09\u306e\u6307\u6458\u3092\u51fa\u3057\u3001\u7d42\u4e8620\u3001traceback\uff08\u5185\u90e8\u30a8\u30e9\u30fc\u306e\u547c\u51fa\u3057\u5c65\u6b74\uff09\u306a\u3057\u3067\u3057\u305f\u3002\u7121\u5909\u66f4\u30b3\u30d4\u30fc\u306f\u7d42\u4e860\u3067\u3059\u3002\u69cb\u9020\u4e0d\u6b63\u6642\u306f MC-11 \u6bd4\u8f03\u3092\u5b9f\u884c\u3057\u307e\u305b\u3093\u3002<code>tools/tests/test_manifest_check.py</code> \u306b\u8ffd\u52a0\u3055\u308c\u305f\u5b50\u30d7\u30ed\u30bb\u30b9\u8a66\u9a13\u3082\u3053\u308c\u3089\u3068\u8ffd\u52a0\u306e\u4e0d\u6b63\u69cb\u9020\u3092\u691c\u67fb\u3057\u3001\u3059\u3079\u3066\u5408\u683c\u3057\u307e\u3057\u305f\u3002</p> </li> <li> <p>R2-03 \u89e3\u6d88\u3002 SPEC-06 \u00a78 \u306e\u72480.3\u306f\u3001\u4e21\u8a00\u8a9e\u3068\u3082\u30d5\u30a1\u30a4\u30eb\u3068\u30d5\u30e9\u30b0\u30e1\u30f3\u30c8\u306e\u691c\u67fb\u3092\u8aac\u660e\u3057\u3066\u3044\u307e\u3059\u3002\u5b9f\u88c5\u306f\u540c\u4e00\u30d5\u30a1\u30a4\u30eb\u306e\u30a2\u30f3\u30ab\u30fc\uff08\u30da\u30fc\u30b8\u5185\u306e\u3057\u304a\u308a\uff09\u3068\u30ea\u30f3\u30af\u5148 Markdown \u306e\u30a2\u30f3\u30ab\u30fc\u30fb\u898b\u51fa\u3057\u3092\u691c\u67fb\u3057\u307e\u3059\u3002\u72ec\u7acb\u8a66\u9a13\u3067\u3001\u5b58\u5728\u3057\u306a\u3044\u30d5\u30a1\u30a4\u30eb\u306b\u30d5\u30e9\u30b0\u30e1\u30f3\u30c8\u3092\u4ed8\u3051\u305f\u30ea\u30f3\u30af\u3001\u540c\u4e00\u30d5\u30a1\u30a4\u30eb\u306e\u6b20\u843d\u30a2\u30f3\u30ab\u30fc\u3001\u5b58\u5728\u3059\u308b Markdown \u5185\u306e\u6b20\u843d\u30a2\u30f3\u30ab\u30fc\u3092\u62d2\u5426\u3057\u3001\u5b58\u5728\u3059\u308b <code>#english</code> \u306f\u5408\u683c\u3057\u307e\u3057\u305f\u3002<code>tools/docs_check.py</code> \u306f r2 \u304b\u3089\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002</p> </li> </ol>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/#r1-\u4fee\u6b63\u306e\u56de\u5e30\u78ba\u8a8d","title":"r1 \u4fee\u6b63\u306e\u56de\u5e30\u78ba\u8a8d","text":"r1 \u6307\u6458 r3 \u306e\u6839\u62e0\u3068\u6271\u3044 R1 \u975e\u516c\u958b\u30a2\u30c9\u30ec\u30b9\u63b2\u8f09 \u89e3\u6d88\u3002\u5b9f\u30c4\u30ea\u30fc\u306e\u65b9\u91dd\u691c\u51fa0\u4ef6\u3002\u65e7\u9664\u5916\u9818\u57df\u306e\u6a21\u64ec\u30b1\u30fc\u30b9\u3082\u62d2\u5426\u3002 R2 gitleaks \u7121\u52b9 \u89e3\u6d88\u3002<code>[extend] useDefault = true</code>\u3001\u884c\u5168\u4f53\u306b\u9650\u5b9a\u3057\u305f4\u4f8b\u5916\u3001\u30d1\u30b9\u4f8b\u5916\u306a\u3057\u3092\u7dad\u6301\u3057\u3001hosted \u691c\u67fb\u3082\u5408\u683c\u3002gitleaks \u306f\u79d8\u5bc6\u691c\u51fa\u30c4\u30fc\u30eb\u3002\u6a21\u64ec\u79d8\u5bc6\u306e\u30b3\u30f3\u30c6\u30ca\u8a66\u9a13\u306f r3 \u3067\u72ec\u7acb\u518d\u5b9f\u884c\u3057\u3066\u3044\u307e\u305b\u3093\u3002 R3 Trivy \u6b20\u843d \u89e3\u6d88\u3002\u7248\u56fa\u5b9a\u306e\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u691c\u67fb\u30fb\u5831\u544a\u4fdd\u5b58\u3068 M1 \u5831\u544a\u306e\u307f\u306e\u7bc4\u56f2\u306f\u4e0d\u5909\u3067\u3001hosted \u691c\u67fb\u3082\u5408\u683c\u3002Trivy \u306f\u8106\u5f31\u6027\u30fb\u8a2d\u5b9a\u306e\u691c\u67fb\u30c4\u30fc\u30eb\u3067\u3001\u5831\u544a\u306e\u307f\u306e\u5408\u683c\u306f\u8106\u5f31\u6027\u30bc\u30ed\u3092\u610f\u5473\u3057\u307e\u305b\u3093\u3002 R4 manifest \u691c\u67fb\u4e0d\u8db3 \u30ec\u30d3\u30e5\u30fc\u5bfe\u8c61\u306e\u4e0d\u5177\u5408\u306f\u89e3\u6d88\u300266\u8a66\u9a13\u3068\u6b63\u5e38 JSON/TOON \u6bd4\u8f03\u304c\u5408\u683c\u3057\u3001\u5143\u306e\u4e0d\u6b63\u578b\u3092\u6b63\u3057\u304f\u62d2\u5426\u3002 R5 ZAP \u304c\u81ea\u8eab\u3092\u691c\u67fb \u82f1\u548c\u4ed5\u69d8\u4e0a\u306e\u89e3\u6d88\u3092\u7dad\u6301\u3002ZAP\uff08\u7a3c\u50cd\u4e2d\u306e Web \u30a2\u30d7\u30ea\u3092\u691c\u67fb\u3059\u308b\u30c4\u30fc\u30eb\uff09\u306f\u30b5\u30fc\u30d3\u30b9\u540d\u30fb\u5185\u90e8\u30dd\u30fc\u30c8\u3092\u4f7f\u7528\u3057\u3001\u30db\u30b9\u30c8\u5074\u30dd\u30fc\u30c8\u5909\u66f4\u3067\u5bfe\u8c61\u306f\u5909\u308f\u308a\u307e\u305b\u3093\u3002\u4ed5\u69d8\u306f r2 \u304b\u3089\u4e0d\u5909\u3002\u5c0e\u5165\u6e08\u307f\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306f\u672a\u691c\u8a3c\u3002 R6 \u56f3\u30fb\u30c7\u30fc\u30bf\u306e\u69cb\u6587 \u65e2\u5b58 Mermaid 11.4.1 \u691c\u8a3c\u5668\u3067 Mermaid\uff08\u6587\u5b57\u3067\u56f3\u3092\u5b9a\u7fa9\u3059\u308b\u8a18\u6cd5\uff0934\u30d6\u30ed\u30c3\u30af\u304c\u518d\u89e3\u6790\u306b\u5408\u683c\u3002Mermaid 34\u4ef6\u3068 TOON 44\u4ef6\u306f\u3059\u3079\u3066 r2 \u3068\u540c\u4e00\u3002TOON \u306f\u5916\u90e8\u89e3\u6790\u5668\u306e\u65b0\u898f\u5b9f\u884c\u3067\u306f\u306a\u304f\u3001r2 \u306e\u72ec\u7acb\u89e3\u6790\u306e\u6839\u62e0\u3092\u5f15\u304d\u7d99\u304e\u307e\u3059\u3002 R7 \u6587\u66f8\u691c\u67fb\u306e\u4e0d\u8db3 \u660e\u793a\u3055\u308c\u305f M1 \u7bc4\u56f2\u3067\u306f\u89e3\u6d88\u3002\u8a66\u9a13\u5408\u683c\u3068\u30d5\u30e9\u30b0\u30e1\u30f3\u30c8\u62d2\u5426\u306e\u72ec\u7acb\u518d\u73fe\u3092\u78ba\u8a8d\u3002\u65e7\u5f62\u5f0f\u306e\u4f8b\u5916\u3068 SHA \u9650\u5b9a\u306e\u6284\u9332\u691c\u67fb\u306f\u660e\u8a18\u3092\u7dad\u6301\u3002SHA \u306f\u7248\u3092\u8b58\u5225\u3059\u308b\u6307\u7d0b\u3067\u3001\u6284\u9332\u306e\u4efb\u610f\u9805\u76ee\u306e\u540c\u4e00\u6027\u306f\u4fdd\u8a3c\u3057\u307e\u305b\u3093\u3002 R8 C4/core/M2 \u77db\u76fe \u89e3\u6d88\u3092\u7dad\u6301\u3002JSON/TOON \u3068 SPEC-00/02/04 \u306f\u4e0d\u5909\u3067\u3001<code>y_websocket</code> \u3092 <code>core</code> \u306b\u542b\u3081\u3001core/full \u3068\u3082 C4 \u5fc5\u9808\u30fb\u30b9\u30ad\u30c3\u30d7\u306a\u3057\u3002"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/#\u518d\u73fe\u3068-ci-\u306e\u6839\u62e0","title":"\u518d\u73fe\u3068 CI \u306e\u6839\u62e0","text":"<p>\u30ea\u30dd\u30b8\u30c8\u30ea\u30eb\u30fc\u30c8\u3067\u6b21\u3092\u5b9f\u884c\u3057\u3001\u3059\u3079\u3066\u7d42\u4e860\u3067\u3057\u305f\u3002</p> <pre><code>python3 tools/manifest_check.py\npython3 tools/docs_check.py\npython3 -m unittest discover -s tools/tests -v\ngh pr checks 19 -R RCOSDP/RDM-developer-guide\n</code></pre> <p>\u5358\u4f53\u8a66\u9a13\u306f 66\u4ef6\u5408\u683c\u3002\u65b0\u898f\u306e\u672a\u8ffd\u8de1 r3 \u8a18\u9332\u3092\u8ffd\u52a0\u3059\u308b\u524d\u306e\u6587\u66f8\u691c\u67fb\u306f 46\u30d5\u30a1\u30a4\u30eb\u691c\u67fb\u30018\u4f8b\u5916\u3001\u5408\u5426\u3092\u5de6\u53f3\u3057\u306a\u3044\u7528\u8a9e\u8b66\u544a116\u4ef6 \u3067\u3057\u305f\u3002\u65b0\u898f\u8a18\u9332\u306f <code>check_file</code> \u3067\u5225\u9014\u691c\u67fb\u3057\u3001\u307e\u3060\u8ffd\u8de1\u30d5\u30a1\u30a4\u30eb\u4ef6\u6570\u306b\u306f\u542b\u3081\u3066\u3044\u307e\u305b\u3093\u3002</p> <p>\u72ec\u7acb\u3057\u305f\u62d2\u5426\u8a66\u9a13\u306f\u3001\u6307\u5b9a\u4e00\u6642\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u914d\u4e0b\u306e <code>scratchpad/rev-r3-toxvm83j/</code> \u306e\u307f\u3067\u884c\u3044\u307e\u3057\u305f\u3002\u691c\u67fb\u30d7\u30ed\u30b0\u30e9\u30e0\u3068\u5b9f manifest \u3092\u30b3\u30d4\u30fc\u3057\u3001\u6a21\u64ec\u7981\u6b62\u30a2\u30c9\u30ec\u30b9\u306f\u5b9f\u884c\u6642\u306b\u7d44\u307f\u7acb\u3066\u3001\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u306f\u4e00\u5207\u66f8\u3044\u3066\u3044\u307e\u305b\u3093\u3002\u5143\u306e\u578b\u4e0d\u6b634\u4ef6\u306f\u3001TOON \u7121\u5909\u66f4\u3067\u500b\u5225\u306b\u8a66\u9a13\u3057\u307e\u3057\u305f\u3002\u62d2\u5426\u8a66\u9a13\u306e\u305f\u3081\u306b\u672c\u4f53\u30d5\u30a1\u30a4\u30eb\u3092\u5909\u66f4\u3057\u3066\u3044\u307e\u305b\u3093\u3002</p> <p>GitHub \u306e\u78ba\u8a8d\u306b\u306f <code>gh</code> \u3060\u3051\u3092\u4f7f\u3044\u3001PR \u60c5\u5831\u3068\u4e21 run \u304c head <code>413520e20a98862d7eb5b203bdda1900d49019ac</code> \u3092\u6307\u3059\u3068\u78ba\u8a8d\u3057\u307e\u3057\u305f\u3002MkDocs\uff08\u6587\u66f8\u3092 Web \u30b5\u30a4\u30c8\u306b\u3059\u308b\u9053\u5177\uff09\u306e\u69cb\u7bc9\u3001\u30ea\u30f3\u30af\u3001manifest/\u65b9\u91dd\u3001gitleaks\u3001Semgrep\uff08\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u306e\u5371\u967a\u306a\u66f8\u304d\u65b9\u306e\u691c\u67fb\uff09\u3001Trivy \u306e6\u4ef6\u3059\u3079\u3066\u304c\u5408\u683c\u3067\u3059\u3002docs run \u3068 security run \u306f\u3044\u305a\u308c\u3082 <code>success</code> \u3067\u3057\u305f\u3002\u751f\u6210\u3055\u308c\u305f SPEC-06 \u306e\u30b5\u30a4\u30c8\u30da\u30fc\u30b8\u3082\u5143\u6587\u66f8\u3068\u3068\u3082\u306b\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u975e\u516c\u958b\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u3001\u30bb\u30c3\u30b7\u30e7\u30f3\u30ea\u30f3\u30af\u306e\u5185\u5bb9\u3001\u753b\u50cf\u5168\u753b\u7d20\u3001\u5c0e\u5165\u6e08\u307f\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306f\u65b0\u898f\u76e3\u67fb\u3057\u3066\u3044\u307e\u305b\u3093\u3002</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/#\u6240\u6709\u8005\u306b\u6b8b\u308b\u5224\u65ad","title":"\u6240\u6709\u8005\u306b\u6b8b\u308b\u5224\u65ad","text":"<ul> <li>ADR-01 \u00a75 \u306e\u521d\u56de\u69cb\u7bc9\u89e3\u91c8: \u63d0\u6848\u30fb\u6240\u6709\u8005\u627f\u8a8d\u5f85\u3061\u306e\u307e\u307e\u3067\u3059\u3002\u3053\u306e\u63a8\u5968\u3067\u4f8b\u5916\u3092\u627f\u8a8d\u3057\u305f\u3053\u3068\u306b\u306f\u306a\u308a\u307e\u305b\u3093\u3002\u6240\u6709\u8005\u306e\u6c7a\u5b9a\u3092\u8a18\u9332\u3057\u3001\u627f\u8a8d\u6642\u306f\u95a2\u9023\u3059\u308b\u898f\u7bc4\u8a18\u9332\u3092\u6574\u5408\u3055\u305b\u3066\u304f\u3060\u3055\u3044\u3002</li> <li>Claude-Session \u30ea\u30f3\u30af\u4fdd\u6301: \u5171\u6709\u7bc4\u56f2\u3092\u78ba\u8a8d\u3057\u305f\u3046\u3048\u3067\u3001\u516c\u958b\u30e1\u30bf\u30c7\u30fc\u30bf\u306b\u4fdd\u6301\u3059\u308b\u304b\u5224\u65ad\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u30ea\u30f3\u30af\u306e\u5185\u5bb9\u306f\u95b2\u89a7\u30fb\u518d\u63b2\u8f09\u3057\u3066\u3044\u307e\u305b\u3093\u3002</li> <li>\u65e7\u8cc7\u6599\u306e Semgrep \u5ef6\u671f: \u6b74\u53f2\u7684\u30b5\u30f3\u30d7\u30eb\u306e\u6307\u6458\u3092 M2/M3 \u3078\u5ef6\u671f\u3059\u308b\u8a18\u9332\u306b\u3064\u3044\u3066\u3001\u660e\u793a\u7684\u306b\u627f\u8a8d\u307e\u305f\u306f\u5374\u4e0b\u3057\u3066\u304f\u3060\u3055\u3044\u3002Semgrep \u4f8b\u5916\u304c\u6b8b\u308b\u9818\u57df\u3082\u3001\u516c\u958b\u65b9\u91dd\u691c\u67fb\u306f\u5bfe\u8c61\u306b\u542b\u3081\u307e\u3059\u3002</li> </ul> <p>r3 \u306f\u30b3\u30fc\u30c9\u4fee\u6b63\u3092\u8981\u6c42\u3057\u307e\u305b\u3093\u3002\u8abf\u6574\u62c5\u5f53\u306b\u306f\u30ec\u30d3\u30e5\u30fc\u8a18\u9332\u306e\u53d6\u308a\u8fbc\u307f\u3068\u6240\u6709\u8005\u5224\u65ad\u306e\u6574\u7406\u304c\u6b8b\u308a\u307e\u3059\u3002\u30ec\u30d3\u30e5\u30ef\u306f\u30b3\u30df\u30c3\u30c8\u3001push\u3001\u627f\u8a8d\u3001\u30de\u30fc\u30b8\u3092\u884c\u3063\u3066\u3044\u307e\u305b\u3093\u3002</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_M1_Skeleton_PR_r3/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 PR A proposed change awaiting review. \u30ec\u30d3\u30e5\u30fc\u3092\u6c42\u3081\u308b\u5909\u66f4\u63d0\u6848\u3002 CI Automatic checks of changes. \u5909\u66f4\u306e\u81ea\u52d5\u691c\u67fb\u3002 Exit code The number a program returns on completion. \u51e6\u7406\u7d42\u4e86\u6642\u306b\u8fd4\u3059\u7d50\u679c\u306e\u6570\u3002 JSON / TOON Text formats for structured data. \u69cb\u9020\u5316\u30c7\u30fc\u30bf\u3092\u6587\u5b57\u3067\u66f8\u304f\u5f62\u5f0f\u3002 MC A named manifest-validation rule. manifest \u691c\u67fb\u898f\u5247\u306e\u8b58\u5225\u5b50\u3002 Anchor / fragment A page bookmark and the link suffix naming it. \u30da\u30fc\u30b8\u5185\u306e\u3057\u304a\u308a\u3068\u3001\u305d\u306e\u5834\u6240\u3092\u6307\u3059\u30ea\u30f3\u30af\u672b\u5c3e\u3002 SHA A revision fingerprint. \u7248\u3092\u8b58\u5225\u3059\u308b\u6307\u7d0b\u3002 Traceback An internal error's call history. \u5185\u90e8\u30a8\u30e9\u30fc\u306e\u547c\u51fa\u3057\u5c65\u6b74\u3002 Bootstrap The first construction before routine updates. \u901a\u5e38\u66f4\u65b0\u3092\u59cb\u3081\u308b\u524d\u306e\u521d\u56de\u69cb\u7bc9\u3002"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1/","title":"REV PR21 Installer review r1 / \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u30ec\u30d3\u30e5\u30fc r1","text":"<p>Summary: Independent review of PR #21 at <code>6985d0600c2a9dcec5c50331aebcb60fb4f23b13</code>. Changes requested: security checks can pass unsafe states, generated settings fail their own baseline, and acceptance evidence is incomplete. \u6982\u8981: PR #21 \u306e <code>6985d0600c2a9dcec5c50331aebcb60fb4f23b13</code> \u3092\u72ec\u7acb\u30ec\u30d3\u30e5\u30fc\u3057\u305f\u3002\u5b89\u5168\u3067\u306a\u3044\u72b6\u614b\u3092\u691c\u67fb\u304c\u5408\u683c\u3055\u305b\u3001\u751f\u6210\u8a2d\u5b9a\u304c\u81ea\u8eab\u306e\u5fc5\u9808\u691c\u67fb\u306b\u843d\u3061\u3001\u53d7\u5165\u8a3c\u8de1\u3082\u4e0d\u8db3\u3059\u308b\u305f\u3081\u4fee\u6b63\u3092\u8981\u6c42\u3059\u308b\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: passing isolated command tests does not prove that generated configuration, scanners, and credential rotation agree. \uff0f \u30b3\u30de\u30f3\u30c9\u5358\u72ec\u306e\u8a66\u9a13\u3060\u3051\u3067\u306f\u3001\u751f\u6210\u8a2d\u5b9a\u30fb\u691c\u67fb\u30fb\u8a8d\u8a3c\u60c5\u5831\u66f4\u65b0\u306e\u6574\u5408\u306f\u8a3c\u660e\u3067\u304d\u306a\u3044\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Applies to: PR #21, <code>feat/m2-installer</code> \u2192 <code>develop</code>; independent REV review, no merge or approval.</li> <li>Related: Review index \u00b7 SPEC-01 \u00b7 SPEC-02 \u00b7 SPEC-03 \u00b7 SPEC-04 \u00b7 SPEC-06 \u00b7 ADR-02 \u00b7 ADR-03 \u00b7 ADR-04 \u00b7 Shared glossary.</li> <li>Used by: Installer \u00b7 Acceptance suite \u00b7 Status board.</li> </ul> <p></p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1/#verdict-and-method","title":"Verdict and method","text":"<p>Changes requested. P1 means a defect to fix before relying on the installer; P2 means a functional or contract defect requiring correction. A security gate is a check that decides whether the environment is safe enough to use. Docker (a tool for running separate application boxes) is the tool that runs applications in separate containers; Compose describes those containers together. Unit tests replace external programs with controlled responses and do not prove real container behavior.</p> <p>Reviewed the PR (a proposed change) body and diff through <code>gh</code>, the specified rules, source, tests, templates, manifests (lists of selected versions), and the supplied upstream reference files. Ran the required checks and all 21 leaf command helps plus root help. Reproductions used temporary directories and injected runners; no real Docker build, startup, registry push, or attack was run. No product source was modified.</p> <p>The remote head moved to <code>1caaaceb4d436db99a35aa159a7abd9586df6462</code> before publication. This review remains scoped to the requested <code>6985d06</code>; it does not certify the newer revision. A final repository docs check passed on the changed tracked set (49 checked, 8 exempt, 121 warnings), superseding the local docs failure only for that changed workspace.</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1/#ranked-findings","title":"Ranked findings","text":"<ol> <li> <p>P1 \u2014 Rotation does not replace live credentials. <code>installer/grdm_dev/secrets.py:232,246</code> writes new values, then <code>installer/grdm_dev/lifecycle.py:54</code> calls <code>docker compose restart</code>. Existing containers retain their original environment; the captured command confirms no recreation. Database initialization passwords also do not change passwords in an existing database. After a captured secret, the old credential therefore remains usable while <code>.env</code> claims a different value. Implement coordinated application/database rotation and recreation, with failure recovery and an old-credential rejection test (SPEC-03 \u00a76).</p> </li> <li> <p>P1 \u2014 Baseline validation both misses root and rejects the shipped configuration. <code>installer/grdm_dev/scan.py:252-295</code> accepts any nonempty <code>user</code>, including <code>0:0</code>; a synthetic root service with <code>cap_drop: ALL</code> and loopback ports returns no findings. It does not validate <code>.env</code> mode/defaults, resource limits, or network isolation. Conversely, rendering the actual core manifest and hardening exceptions produces five <code>BASE-USER</code> failures: postgres, elasticsearch, mongo, rabbitmq, unoconv. The validator never reads those exceptions. Reconcile the non-root rule with the approved exception contract, then test renderer output through the real baseline checker; the current install cannot reach a successful full gate even if startup succeeds.</p> </li> <li> <p>P1 \u2014 Network health silently ignores listeners without visible process ownership. <code>installer/grdm_dev/health.py:174-204</code> filters exclusively by Docker process name. On Linux, unprivileged <code>ss -ltnp</code> can show a root-owned wildcard listener without its process field. Feeding <code>LISTEN 0 4096 0.0.0.0:5000 0.0.0.0:*</code> yields no offending socket and no error. Correlate actual project port bindings through Docker inspection and fail closed when ownership cannot be established. Cover Docker Desktop on macOS and Linux without elevated privileges.</p> </li> <li> <p>P1 \u2014 The red-team egress probe cannot establish isolation. <code>installer/grdm_dev/redteam.py:24,90-99</code> probes <code>example.invalid</code>, which cannot resolve even on an unrestricted network, and labels wget failure as blocked. It runs a fresh Alpine container, not the attacker container whose other network attachments and routes matter. Checking the selected network's <code>Internal</code> flag does not close that gap. Verify the actual attacker network namespace against controlled reachable destinations, distinguishing probe failure from proven isolation; also validate the approval record's scope and owner rather than file existence alone (<code>:114-119</code>).</p> </li> <li> <p>P1 \u2014 Scanner errors can become clean results and the scan omits infrastructure images. <code>installer/grdm_dev/scan.py:398-407</code> accepts Semgrep (a source-code checker) JSON (structured machine-readable text) regardless of nonzero exit or its <code>errors</code> array; exit 2 with <code>{\"errors\":[{\"message\":\"failed\"}],\"results\":[]}</code> is reported as <code>result: ok</code>. <code>:355-395</code> selects only locally tagged <code>grdm-dev/</code> images, excluding postgres, Redis (a fast data store), Mongo and other images actually used by Compose; integration lockfiles are not explicitly scanned once local images exist. SBOM (a list of software parts) generation failures only add notes. Return 51 for incomplete scanners and enumerate all project images and required lockfiles (SPEC-03 \u00a74); use all four required Semgrep packs, not only <code>p/default</code>.</p> </li> <li> <p>P1 \u2014 Acceptance logs bypass secret masking. <code>installer/grdm_dev/accept.py:307,318,320</code> prints seed/cleanup subprocess output and writes pytest output verbatim under <code>docs/demo/runs/</code>. Unlike <code>scan.py</code> and <code>report_cmd.py</code>, this path never applies <code>.env</code> masking. An injected synthetic secret in runner output was copied unchanged to <code>pytest.log</code>. Exceptions can include credentials, and traces can include session material. Sanitize output before persistence or display, restrict evidence permissions, and test the evidence paths with synthetic <code>.env</code> values; do not rely on later report bundling to clean already-written files.</p> </li> <li> <p>P1 \u2014 Acceptance's network guard does not cover every request. <code>installer/acceptance/conftest.py:136-156</code> installs only browser routing. Calls through <code>context.request</code> and independently created API request contexts (for example <code>installer/acceptance/test_c3_file_upload.py:29,41-43</code>) are not intercepted by that browser route and may follow external redirects. The download URL prefix assertion also accepts lookalike hostnames. Parse exact origins and guard API requests, redirects, WebSockets, and service-worker traffic, or enforce isolation outside the browser; SPEC-04 \u00a73.4 promises every non-loopback request is blocked.</p> </li> <li> <p>P1 \u2014 The generated network has no Docker internal isolation flag. <code>installer/grdm_dev/compose.py:316</code> emits only a named bridge, without <code>internal: true</code>. The actual rendered core configuration confirms this. A regular bridge permits outbound routes, contrary to the internal-network baseline in SPEC-03 \u00a73.2 and ADR-03 \u00a73.2. Make the intended isolation explicit and verify it on Docker Desktop; if ordinary development requires egress, obtain a normative change instead of claiming that the existing output enforces the baseline.</p> </li> <li> <p>P2 \u2014 Private repository URL fails the mandatory policy check. <code>installer/tests/test_build.py:88</code> contains a full private integration repository URL. Production <code>build.py:64-66</code> correctly composes its URL at runtime, but the test violates the same names-only policy. Construct the expected value from separate components without committing a private URL. <code>tools/manifest_check.py</code> and the tools regression suite both reject this exact line. No apparent live token was found in the diff search; that limited search is not a full secret-scanner certification.</p> </li> <li> <p>P2 \u2014 Rendering a running installation changes its own ports. <code>installer/grdm_dev/compose.py:116-153,649</code> treats every occupied port as foreign. Re-running install while its own web service occupies 5000 assigns 5001 and rewrites URLs; repeated runs keep moving. The idempotence test at <code>installer/tests/test_compose.py:180</code> uses a checker that always returns free (<code>:40</code>), so it cannot detect this. Preserve project-owned bindings and test both own-service and unrelated-process collisions.</p> </li> <li> <p>P2 \u2014 <code>build --push</code> attempts to publish the local tag as well. <code>installer/grdm_dev/build.py:123-127</code> supplies both <code>grdm-dev/<component></code> and <code>ghcr.io/rcosdp/<component></code> with <code>--push</code>. The unqualified first tag addresses Docker Hub, outside the promised private GHCR destination, and can fail authorization or publish to the wrong registry. Use only the GHCR tag for push; keep local tags for load. Test the complete argument list and the absence of other registry destinations.</p> </li> <li> <p>P2 \u2014 Acceptance omits the mandatory integration precheck and has weak success criteria. <code>installer/grdm_dev/accept.py:265-320</code> proceeds directly to pytest after dependency/path checks; a fake successful pytest yields exit 0 with no health/integration call and zero collected result rows. SPEC-04 \u00a72 requires integration first. C2 supplies <code>['admin']</code> when permissions are missing (<code>installer/acceptance/test_c2_create_project.py:31</code>); C3 tests anonymous PUT instead of a signed-in non-contributor (<code>test_c3_file_upload.py:35-48</code>); C4 checks only B-to-A propagation (<code>test_c4_wiki_collab.py:47-53</code>); C6 accepts API 404 although the contract requires 403 (<code>test_c6_admin.py:39-40</code>). Require the specified success and rejection evidence and fail incomplete runs. Check Chromium's executable, not merely a nonempty browser directory (<code>accept.py:277-279</code>).</p> </li> <li> <p>P2 \u2014 Installed package omits its acceptance suite. <code>installer/pyproject.toml:25-30</code> packages only <code>grdm_dev</code>, messages and templates; <code>installer/grdm_dev/accept.py:44</code> searches a sibling <code>acceptance</code> directory. In a non-editable installation that suite is absent. Include it in the distribution or resolve it explicitly from the selected repository. The PR's console-script/data-file smoke test does not validate acceptance execution from the installed package.</p> </li> <li> <p>P2 \u2014 Documentation and reported validation are not green at the reviewed head. The PR-added <code>docs/reviews/2026-11-05_RDM-developer-guide_PR20_Manifest_Shibboleth_r3.md:10</code> links to the absent <code>2026-11-05_dev2027_Strict_Reconstruction_PRs_r2.md</code>; confirmed in the remote head through <code>gh api</code>. The first docs run reports that broken link; later runs report the tracked review file missing locally. Installer tests consequently fail their repository docs check. Report this workspace change separately from the confirmed remote-head broken link. Fix the link and update the PR's passing-test claims after rerunning on a stable checkout.</p> </li> </ol>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1/#coverage-contract-gaps-and-evidence","title":"Coverage, contract gaps, and evidence","text":"<p>The following are observations, not additional security approvals. Secret (a password or key) generation uses random values and writes <code>.env</code> as 0600 inside a 0700 directory. Rendered files preserve secret references rather than values, bind published ports to 127.0.0.1, set <code>cap_drop: ALL</code> and <code>no-new-privileges</code>, and use non-root users except the reasoned hardening exceptions. The old alias occurs in prohibition checks/tests and historical material in the diff; it is not emitted by the renderer or added to the host. Report masking covers known <code>.env</code> string values of length at least eight; it is not universal redaction of unknown secrets.</p> <p>All requested helps returned 0 and the 13 message codes agree with SPEC-02 \u00a76. <code>upstream mirror/integrate</code> exist only as exit-2 placeholders (<code>installer/grdm_dev/upstream.py:1-32</code>), so full \u00a73 conformance is not delivered; the PR body does not explicitly claim those two functions. Non-interactive confirmation is implemented for reset through <code>Context.confirm</code>; there is no general no-terminal/without-<code>--yes</code> rejection for install or seed. Resolve the distinction between the global flag's \u201crequired without a terminal\u201d wording and \u00a77's question-specific rule. <code>secrets init</code> keeps an existing file by refusing with exit 2, consistent with \u00a73's overwrite prohibition but not a repeated-success interpretation of \u00a77.</p> <p>The staged thresholds correctly distinguish M1 reporting, M2/M3 count ceilings, M4 open HIGH/CRITICAL and M5 high-severity allow-list restrictions. Expired entries stop suppressing findings. However, malformed milestone JSON silently falls back to M1 (<code>scan.py:100-112,560-566</code>), and no next-milestone expiry boundary is enforced; these are further fail-closed contract gaps to address before later milestones. The current scan also does not implement the promised <code>docs/status/security_<milestone>.md</code> excerpt or an M5 unresolved-red-team-path check.</p> <p>SPEC-01 adds matching <code>integration_sha</code> rows in both halves, but the Japanese row is English. All current integration pins remain null, explicitly disallowed for M2 acceptance. SPEC-04's browser-install wording is consistent in both languages. The README files have bilingual anchors, Jump, versions and glossary tables; the installer README still lacks an Applies-to line and a link to its acceptance child, and its test procedure is inline rather than a complete fenced procedure required by SPEC-06. Compared the generated local settings with the supplied upstream reference; URL separation is present, but runtime consumer names, authentication paths and writable directory ownership still require stage-two validation.</p> <p>Observed results (TOON is a compact text form for structured data; these are review observations, not mirrored canonical data):</p> <pre><code>checks[6]{check,result}:\n installer_unittest,\"174 run; 1 failure in test_docs\"\n tools_unittest,\"66 run; 1 failure in tracked private-URL policy\"\n manifest_check,\"exit 1; test_build.py:88 private URL\"\n docs_check,\"exit 1; PR20 review link or locally missing tracked file\"\n cli_help,\"root and 21 leaf helps exit 0\"\n bash_syntax,\"bash -n passes; no executable Bash-4-only construct found\"</code></pre> <p>Commands were run from the repository root; expected merge-ready results are zero exits:</p> <pre><code>PYTHONPATH=installer python3 -m unittest discover -s installer/tests\npython3 -m unittest discover -s tools/tests\npython3 tools/manifest_check.py\npython3 tools/docs_check.py\nPYTHONPATH=installer python3 -m grdm_dev.cli --help\nbash -n installer/install.sh\n</code></pre>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1/#required-second-stage-on-mac-studio","title":"Required second stage on Mac Studio","text":"<p>Real-Docker build, up, and acceptance are deferred to stage two, as the PR body states; none is certified by this review. After fixing the findings, verify all of the following before declaring M2 complete:</p> <ul> <li>Pin integration SHAs (exact source revisions) and base-image digests (exact image identities), then build cleanly on arm64 (the Apple Silicon CPU family); verify Dockerfile selection, image tags and Compose image identity, and separately verify amd64 (the Intel/AMD CPU family)/multi-platform behavior.</li> <li>Start minimum/core and test volume ownership, non-root startup, read-only paths, capability exceptions and resource limits. Verify the settings consumers against the pinned upstream code, not only the reference sample.</li> <li>Measure host listeners on macOS, loopback accessibility, internal connectivity and egress isolation. Test an AirPlay port collision and repeat install/render/up without changing existing project ports.</li> <li>Rotate secrets on an initialized database and prove new credentials work while old credentials fail; inject a synthetic credential into failure output and inspect every report/log/trace for leakage.</li> <li>Run the full scanner suite against every running image and integration lockfile, including scanner failure, allow-list expiry/count and staged threshold cases; verify generated hardening passes the intended baseline.</li> <li>Run C1\u2013C6 success/rejection cases through Chromium, verify fakecas (a test login server) redirects/cookies, file byte equality and preview, two-way Wiki convergence and 4401 rejection, and institution-scoped admin behavior. Confirm seed APIs, exact selectors and cleanup, including partial seeding failure; retain sanitized JSON/TOON evidence under <code>docs/demo/runs/</code>.</li> <li>Exercise non-editable installation and its acceptance resources. Treat S1\u2013S5 (currently unconditional M3 skips), Shibboleth (a system for institution logins) wiring, and upstream automation placeholders as remaining scope, not delivered acceptance.</li> </ul> <p></p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1/#\u5224\u5b9a\u3068\u65b9\u6cd5","title":"\u5224\u5b9a\u3068\u65b9\u6cd5","text":"<p>\u4fee\u6b63\u8981\u6c42\u3002 P1 \u306f\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u3092\u4fe1\u983c\u3059\u308b\u524d\u306b\u76f4\u3059\u6b20\u9665\u3001P2 \u306f\u6a5f\u80fd\u307e\u305f\u306f\u5951\u7d04\u306e\u6b20\u9665\u3092\u8868\u3059\u3002\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u9580\u3068\u306f\u3001\u5b89\u5168\u306b\u4f7f\u3048\u308b\u304b\u3092\u6c7a\u3081\u308b\u691c\u67fb\u3067\u3042\u308b\u3002Docker \u306f\u5206\u96e2\u3055\u308c\u305f\u7bb1\u3067\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u52d5\u304b\u3059\u9053\u5177\u3001Compose \u306f\u8907\u6570\u306e\u7bb1\u3092\u307e\u3068\u3081\u3066\u8a18\u8ff0\u3059\u308b\u4ed5\u7d44\u307f\u3067\u3042\u308b\u3002\u5358\u4f53\u30c6\u30b9\u30c8\u306f\u5916\u90e8\u306e\u9053\u5177\u3092\u6c7a\u307e\u3063\u305f\u5fdc\u7b54\u306b\u7f6e\u304d\u63db\u3048\u308b\u305f\u3081\u3001\u5b9f\u6a5f\u306e\u52d5\u4f5c\u3092\u8a3c\u660e\u3057\u306a\u3044\u3002</p> <p><code>gh</code> \u3067 PR\uff08\u5909\u66f4\u6848\uff09\u306e\u672c\u6587\u3068\u5dee\u5206\u3092\u8aad\u307f\u3001\u6307\u5b9a\u4ed5\u69d8\u3001\u5b9f\u88c5\u3001\u8a66\u9a13\u3001\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3001manifest\uff08\u63a1\u7528\u7248\u306e\u4e00\u89a7\uff09\u3001\u6307\u5b9a\u3055\u308c\u305f\u4e0a\u6d41\u53c2\u8003\u30d5\u30a1\u30a4\u30eb\u3092\u7167\u5408\u3057\u305f\u3002\u5fc5\u9808\u691c\u67fb\u3068 root \u304a\u3088\u3073\u672b\u7aef 21 \u30b3\u30de\u30f3\u30c9\u306e help \u3092\u5b9f\u884c\u3057\u305f\u3002\u518d\u73fe\u306b\u306f\u4e00\u6642\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3068\u5dee\u3057\u66ff\u3048\u95a2\u6570\u3092\u4f7f\u3063\u305f\u3002\u5b9f Docker \u306e\u30d3\u30eb\u30c9\u30fb\u8d77\u52d5\u30fb\u30a4\u30e1\u30fc\u30b8\u516c\u958b\u30fb\u653b\u6483\u306f\u884c\u308f\u305a\u3001\u88fd\u54c1\u306e\u30bd\u30fc\u30b9\u306f\u5909\u66f4\u3057\u3066\u3044\u306a\u3044\u3002</p> <p>\u516c\u958b\u524d\u306b\u30ea\u30e2\u30fc\u30c8 head \u306f <code>1caaaceb4d436db99a35aa159a7abd9586df6462</code> \u3078\u9032\u3093\u3060\u3002\u3053\u306e\u30ec\u30d3\u30e5\u30fc\u306f\u6307\u5b9a\u3055\u308c\u305f <code>6985d06</code> \u304c\u5bfe\u8c61\u3067\u3001\u65b0\u7248\u3092\u8a8d\u8a3c\u3057\u306a\u3044\u3002\u5909\u66f4\u5f8c\u306e\u8ffd\u8de1\u5bfe\u8c61\u306b\u5bfe\u3059\u308b\u6700\u7d42 docs \u691c\u67fb\u306f\u5408\u683c\u3057\u305f\uff08\u691c\u67fb 49\u3001\u9664\u5916 8\u3001\u8b66\u544a 121\uff09\u3002\u3053\u308c\u306f\u5909\u66f4\u5f8c\u306e\u4f5c\u696d\u5834\u6240\u306b\u3064\u3044\u3066\u306e\u307f\u3001\u5148\u306e\u30ed\u30fc\u30ab\u30eb\u6587\u66f8\u691c\u67fb\u5931\u6557\u3092\u66f4\u65b0\u3059\u308b\u3002</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1/#\u91cd\u8981\u5ea6\u9806\u306e\u6307\u6458","title":"\u91cd\u8981\u5ea6\u9806\u306e\u6307\u6458","text":"<ol> <li> <p>P1 \u2014 \u79d8\u5bc6\u306e\u66f4\u65b0\u304c\u7a3c\u50cd\u4e2d\u306e\u8a8d\u8a3c\u60c5\u5831\u3092\u7f6e\u304d\u63db\u3048\u306a\u3044\u3002 <code>installer/grdm_dev/secrets.py:232,246</code> \u306f\u65b0\u5024\u3092\u4fdd\u5b58\u3059\u308b\u304c\u3001<code>installer/grdm_dev/lifecycle.py:54</code> \u306f <code>docker compose restart</code> \u3060\u3051\u3092\u547c\u3076\u3002\u65e2\u5b58\u306e\u7bb1\u306e\u74b0\u5883\u5909\u6570\u306f\u5909\u308f\u3089\u305a\u3001\u65e2\u5b58\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3082\u521d\u671f\u5316\u7528\u74b0\u5883\u5909\u6570\u3067\u306f\u5909\u308f\u3089\u306a\u3044\u3002\u547c\u51fa\u5f15\u6570\u306e\u518d\u73fe\u3067\u3082\u518d\u4f5c\u6210\u304c\u306a\u304b\u3063\u305f\u3002\u6f0f\u6d29\u3057\u305f\u65e7\u8a8d\u8a3c\u60c5\u5831\u304c\u4f7f\u3048\u308b\u4e00\u65b9\u3067 <code>.env</code> \u3060\u3051\u65b0\u5024\u306b\u306a\u308b\u3002\u30a2\u30d7\u30ea\u3068\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u5354\u8abf\u66f4\u65b0\u3057\u3001\u5931\u6557\u56de\u5fa9\u3068\u65e7\u5024\u62d2\u5426\u3092\u8a66\u9a13\u3059\u308b\uff08SPEC-03 \u00a76\uff09\u3002</p> </li> <li> <p>P1 \u2014 \u5fc5\u9808\u691c\u67fb\u304c root \u3092\u898b\u9003\u3057\u3001\u540c\u68b1\u306e\u751f\u6210\u7d50\u679c\u3092\u62d2\u5426\u3059\u308b\u3002 <code>installer/grdm_dev/scan.py:252-295</code> \u306f <code>user</code> \u304c\u7a7a\u3067\u306a\u3051\u308c\u3070\u8a31\u3057\u3001<code>0:0</code>\u3001<code>cap_drop: ALL</code>\u3001\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u516c\u958b\u306e\u5408\u6210\u8a2d\u5b9a\u3092\u6307\u6458\u30bc\u30ed\u3067\u901a\u3057\u305f\u3002<code>.env</code> \u306e\u6a29\u9650\u30fb\u65e2\u5b9a\u5024\u3001\u8cc7\u6e90\u5236\u9650\u3001\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u9694\u96e2\u3082\u8abf\u3079\u306a\u3044\u3002\u9006\u306b\u5b9f manifest \u3068 hardening \u4f8b\u5916\u304b\u3089 core \u3092\u751f\u6210\u3059\u308b\u3068 postgres\u3001elasticsearch\u3001mongo\u3001rabbitmq\u3001unoconv \u306e\u4e94\u3064\u304c <code>BASE-USER</code> \u306b\u306a\u308b\u3002\u691c\u67fb\u304c\u4f8b\u5916\u3092\u8aad\u307e\u306a\u3044\u305f\u3081\u3067\u3042\u308b\u3002\u975e root \u898f\u5247\u3068\u627f\u8a8d\u6e08\u307f\u4f8b\u5916\u306e\u5951\u7d04\u3092\u6574\u3048\u3001\u751f\u6210\u7d50\u679c\u3092\u5b9f\u691c\u67fb\u3078\u6e21\u3059\u8a66\u9a13\u3092\u8ffd\u52a0\u3059\u308b\u3002\u73fe\u72b6\u306f\u8d77\u52d5\u3057\u3066\u3082\u5168\u4f53\u691c\u67fb\u3092\u6210\u529f\u3067\u304d\u306a\u3044\u3002</p> </li> <li> <p>P1 \u2014 \u30d7\u30ed\u30bb\u30b9\u6240\u6709\u8005\u304c\u898b\u3048\u306a\u3044\u5f85\u53d7\u3092\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u691c\u67fb\u304c\u7121\u8996\u3059\u308b\u3002 <code>installer/grdm_dev/health.py:174-204</code> \u306f Docker \u306e\u30d7\u30ed\u30bb\u30b9\u540d\u3060\u3051\u3067\u62bd\u51fa\u3059\u308b\u3002Linux \u306e\u4e00\u822c\u6a29\u9650\u306e <code>ss -ltnp</code> \u306f root \u6240\u6709\u306e\u5f85\u53d7\u306e\u30d7\u30ed\u30bb\u30b9\u6b04\u3092\u7701\u7565\u3059\u308b\u5834\u5408\u304c\u3042\u308b\u3002<code>LISTEN 0 4096 0.0.0.0:5000 0.0.0.0:*</code> \u3092\u4e0e\u3048\u308b\u3068\u9055\u53cd\u3082\u30a8\u30e9\u30fc\u3082\u30bc\u30ed\u306b\u306a\u308b\u3002Docker \u306e\u5b9f\u969b\u306e\u516c\u958b\u8a2d\u5b9a\u3068\u7167\u5408\u3057\u3001\u6240\u6709\u95a2\u4fc2\u304c\u4e0d\u660e\u306a\u3089\u5408\u683c\u3055\u305b\u306a\u3044\u3002macOS \u306e Docker Desktop \u3068\u4e00\u822c\u6a29\u9650\u306e Linux \u3092\u8a66\u9a13\u3059\u308b\u3002</p> </li> <li> <p>P1 \u2014 \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u306e\u5916\u5411\u304d\u901a\u4fe1\u691c\u67fb\u304c\u9694\u96e2\u3092\u8a3c\u660e\u3067\u304d\u306a\u3044\u3002 <code>installer/grdm_dev/redteam.py:24,90-99</code> \u306f\u901a\u5e38\u306e\u63a5\u7d9a\u3067\u3082\u540d\u524d\u89e3\u6c7a\u3067\u304d\u306a\u3044 <code>example.invalid</code> \u306b\u63a5\u7d9a\u3057\u3001\u5931\u6557\u3092\u906e\u65ad\u3068\u5224\u5b9a\u3059\u308b\u3002\u5b9f\u969b\u306e\u653b\u6483\u5074\u306e\u7bb1\u3067\u306a\u304f\u3001\u65b0\u3057\u3044 Alpine \u306e\u7bb1\u3092\u4f7f\u3046\u305f\u3081\u3001\u5225\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3078\u306e\u63a5\u7d9a\u3084\u7d4c\u8def\u3082\u78ba\u8a8d\u3067\u304d\u306a\u3044\u3002\u6307\u5b9a\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e <code>Internal</code> \u5c5e\u6027\u3060\u3051\u3067\u306f\u4e0d\u8db3\u3059\u308b\u3002\u7ba1\u7406\u3055\u308c\u305f\u63a5\u7d9a\u53ef\u80fd\u306a\u5b9b\u5148\u306b\u5bfe\u3057\u3066\u5b9f\u969b\u306e\u653b\u6483\u5074\u306e\u74b0\u5883\u3067\u691c\u67fb\u3057\u3001\u691c\u67fb\u4e0d\u80fd\u3068\u906e\u65ad\u3092\u5206\u3051\u308b\u3002\u627f\u8a8d\u8a18\u9332\u3082\u5b58\u5728\u3060\u3051\u3067\u306a\u304f\u6240\u6709\u8005\u3068\u5bfe\u8c61\u7bc4\u56f2\u3092\u691c\u8a3c\u3059\u308b\uff08<code>:114-119</code>\uff09\u3002</p> </li> <li> <p>P1 \u2014 \u30b9\u30ad\u30e3\u30ca\u30fc\u306e\u30a8\u30e9\u30fc\u304c\u6b63\u5e38\u6271\u3044\u306b\u306a\u308a\u3001\u57fa\u76e4\u30a4\u30e1\u30fc\u30b8\u304c\u6f0f\u308c\u308b\u3002 <code>installer/grdm_dev/scan.py:398-407</code> \u306f Semgrep \u306e\u7d42\u4e86\u5024\u3068 <code>errors</code> \u914d\u5217\u3092\u78ba\u8a8d\u3057\u306a\u3044\u3002\u7d42\u4e86 2\u3001\u30a8\u30e9\u30fc\u3042\u308a\u3001\u7d50\u679c\u7a7a\u306e JSON\uff08\u6a5f\u68b0\u304c\u8aad\u3080\u69cb\u9020\u5316\u30c7\u30fc\u30bf\uff09\u3092\u6e21\u3057\u3066\u3082 <code>result: ok</code> \u3068\u306a\u308b\u3002<code>:355-395</code> \u306f <code>grdm-dev/</code> \u30a4\u30e1\u30fc\u30b8\u3060\u3051\u3092\u9078\u3073\u3001\u5b9f\u969b\u306b\u4f7f\u3046 postgres\u3001Redis\u3001Mongo \u306a\u3069\u3092\u9664\u5916\u3059\u308b\u3002\u30ed\u30fc\u30ab\u30eb\u30a4\u30e1\u30fc\u30b8\u304c\u3042\u308c\u3070\u7d71\u5408\u5074\u306e\u4f9d\u5b58\u56fa\u5b9a\u30d5\u30a1\u30a4\u30eb\u3082\u660e\u793a\u7684\u306b\u691c\u67fb\u3057\u306a\u3044\u3002\u69cb\u6210\u90e8\u54c1\u4e00\u89a7\u306e\u751f\u6210\u5931\u6557\u3082\u6ce8\u8a18\u3060\u3051\u3067\u3042\u308b\u3002\u4e0d\u5b8c\u5168\u306a\u691c\u67fb\u306f 51 \u3068\u3057\u3001\u5168\u30a4\u30e1\u30fc\u30b8\u30fb\u4f9d\u5b58\u56fa\u5b9a\u30d5\u30a1\u30a4\u30eb\u3068\u3001<code>p/default</code> \u4ee5\u5916\u3082\u542b\u3080\u5fc5\u9808\u56db\u7d44\u306e Semgrep \u898f\u5247\u3092\u691c\u67fb\u3059\u308b\uff08SPEC-03 \u00a74\uff09\u3002</p> </li> <li> <p>P1 \u2014 \u53d7\u5165\u30ed\u30b0\u304c\u79d8\u5bc6\u306e\u30de\u30b9\u30af\u3092\u901a\u3089\u306a\u3044\u3002 <code>installer/grdm_dev/accept.py:307,318,320</code> \u306f seed\u30fbcleanup \u306e\u51fa\u529b\u3092\u8868\u793a\u3057\u3001pytest \u306e\u51fa\u529b\u3092 <code>docs/demo/runs/</code> \u306b\u305d\u306e\u307e\u307e\u66f8\u304f\u3002<code>scan.py</code> \u3068 <code>report_cmd.py</code> \u3068\u9055\u3044 <code>.env</code> \u306e\u5024\u3092\u96a0\u3055\u306a\u3044\u3002\u5dee\u3057\u66ff\u3048\u95a2\u6570\u306e\u5408\u6210\u79d8\u5bc6\u6587\u5b57\u5217\u304c <code>pytest.log</code> \u306b\u6b8b\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u305f\u3002\u4f8b\u5916\u3084\u8ffd\u8de1\u8a18\u9332\u306b\u306f\u8a8d\u8a3c\u60c5\u5831\u304c\u5165\u308b\u5834\u5408\u304c\u3042\u308b\u3002\u8868\u793a\u30fb\u4fdd\u5b58\u524d\u306e\u30de\u30b9\u30af\u3068\u8a3c\u8de1\u306e\u6a29\u9650\u5236\u9650\u3092\u884c\u3044\u3001\u5408\u6210 <code>.env</code> \u5024\u3067\u5168\u51fa\u529b\u3092\u8a66\u9a13\u3059\u308b\u3002\u5f8c\u306e\u5831\u544a\u96c6\u7d04\u3060\u3051\u3067\u306f\u65e2\u5b58\u30d5\u30a1\u30a4\u30eb\u3092\u6d88\u6bd2\u3067\u304d\u306a\u3044\u3002</p> </li> <li> <p>P1 \u2014 \u53d7\u5165\u306e\u901a\u4fe1\u5236\u9650\u304c\u5168\u8981\u6c42\u3092\u8986\u308f\u306a\u3044\u3002 <code>installer/acceptance/conftest.py:136-156</code> \u306f\u30d6\u30e9\u30a6\u30b6\u7d4c\u8def\u3060\u3051\u3092\u906e\u65ad\u3059\u308b\u3002<code>context.request</code> \u3084\u72ec\u7acb\u3057\u305f API \u8981\u6c42\u306e\u6587\u8108\uff08\u4f8b <code>installer/acceptance/test_c3_file_upload.py:29,41-43</code>\uff09\u306f\u305d\u306e\u7d4c\u8def\u3092\u901a\u3089\u305a\u3001\u5916\u90e8\u3078\u306e\u8ee2\u9001\u3092\u8ffd\u3048\u308b\u3002\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9 URL \u306e\u524d\u65b9\u4e00\u81f4\u3082\u4f3c\u305f\u30db\u30b9\u30c8\u540d\u3092\u8a31\u3059\u3002\u6b63\u78ba\u306a\u63a5\u7d9a\u5148\u3092\u89e3\u6790\u3057\u3001API\u30fb\u8ee2\u9001\u30fbWebSocket\u30fbservice worker \u3092\u5236\u9650\u3059\u308b\u304b\u30d6\u30e9\u30a6\u30b6\u5916\u3067\u9694\u96e2\u3059\u308b\u3002SPEC-04 \u00a73.4 \u306e\u7d04\u675f\u306f\u5168\u975e\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u8981\u6c42\u306e\u906e\u65ad\u3067\u3042\u308b\u3002</p> </li> <li> <p>P1 \u2014 \u751f\u6210\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306b Docker \u306e\u5185\u90e8\u9694\u96e2\u5c5e\u6027\u304c\u306a\u3044\u3002 <code>installer/grdm_dev/compose.py:316</code> \u306f\u540d\u524d\u4ed8\u304d bridge \u3060\u3051\u3092\u751f\u6210\u3057\u3001<code>internal: true</code> \u304c\u306a\u3044\u3002\u5b9f core \u306e\u751f\u6210\u7d50\u679c\u3067\u3082\u78ba\u8a8d\u3057\u305f\u3002\u901a\u5e38\u306e bridge \u306f\u5916\u5411\u304d\u7d4c\u8def\u3092\u6301\u3061\u3001SPEC-03 \u00a73.2 \u3068 ADR-03 \u00a73.2 \u306e\u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u5fc5\u9808\u5bfe\u7b56\u306b\u5408\u308f\u306a\u3044\u3002\u9694\u96e2\u8a2d\u5b9a\u3092\u660e\u793a\u3057 Docker Desktop \u3067\u78ba\u8a8d\u3059\u308b\u3002\u901a\u5e38\u958b\u767a\u3067\u5916\u5411\u304d\u901a\u4fe1\u304c\u5fc5\u8981\u306a\u3089\u3001\u73fe\u51fa\u529b\u304c\u5fc5\u9808\u5bfe\u7b56\u3092\u6e80\u305f\u3059\u3068\u4e3b\u5f35\u305b\u305a\u898f\u7bc4\u5074\u306e\u5909\u66f4\u3092\u884c\u3046\u3002</p> </li> <li> <p>P2 \u2014 \u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea URL \u304c\u5fc5\u9808\u65b9\u91dd\u691c\u67fb\u306b\u843d\u3061\u308b\u3002 <code>installer/tests/test_build.py:88</code> \u306b\u975e\u516c\u958b\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u306e URL \u5168\u4f53\u304c\u76f4\u66f8\u304d\u3055\u308c\u308b\u3002\u672c\u4f53 <code>build.py:64-66</code> \u306f\u5b9f\u884c\u6642\u306b\u7d44\u307f\u7acb\u3066\u3066\u3044\u308b\u304c\u3001\u8a66\u9a13\u3082\u540d\u524d\u3060\u3051\u306e\u65b9\u91dd\u306b\u5f93\u3046\u5fc5\u8981\u304c\u3042\u308b\u3002\u671f\u5f85\u5024\u3092\u5225\u3005\u306e\u90e8\u54c1\u304b\u3089\u7d44\u307f\u7acb\u3066\u308b\u3002<code>tools/manifest_check.py</code> \u3068 tools \u306e\u56de\u5e30\u8a66\u9a13\u304c\u3053\u306e\u884c\u3092\u62d2\u5426\u3057\u305f\u3002\u5dee\u5206\u691c\u7d22\u3067\u5b9f\u30c8\u30fc\u30af\u30f3\u3089\u3057\u3044\u5024\u306f\u898b\u3064\u3051\u306a\u304b\u3063\u305f\u304c\u3001\u5b8c\u5168\u306a\u79d8\u5bc6\u691c\u67fb\u306e\u8a8d\u8a3c\u3067\u306f\u306a\u3044\u3002</p> </li> <li> <p>P2 \u2014 \u7a3c\u50cd\u4e2d\u306b\u518d\u751f\u6210\u3059\u308b\u3068\u81ea\u8eab\u306e\u30dd\u30fc\u30c8\u304c\u79fb\u52d5\u3059\u308b\u3002 <code>installer/grdm_dev/compose.py:116-153,649</code> \u306f\u4f7f\u7528\u4e2d\u30dd\u30fc\u30c8\u3092\u3059\u3079\u3066\u4ed6\u8005\u306e\u3082\u306e\u3068\u6271\u3046\u3002\u81ea\u5206\u306e web \u304c 5000 \u3092\u4f7f\u3063\u3066\u3044\u308b\u3068\u518d\u5c0e\u5165\u3067 5001 \u306b\u5909\u308f\u308a\u3001URL \u3092\u66f8\u304d\u63db\u3048\u308b\u3002\u7e70\u8fd4\u3059\u305f\u3073\u306b\u79fb\u52d5\u3059\u308b\u3002<code>installer/tests/test_compose.py:180</code> \u306e\u518d\u5b9f\u884c\u8a66\u9a13\u306f\u5e38\u306b\u7a7a\u304d\u3068\u8fd4\u3059\u95a2\u6570\uff08<code>:40</code>\uff09\u306e\u305f\u3081\u691c\u51fa\u3067\u304d\u306a\u3044\u3002\u81ea\u5206\u306e\u516c\u958b\u8a2d\u5b9a\u3092\u4fdd\u6301\u3057\u3001\u81ea\u8eab\u3068\u4ed6\u30d7\u30ed\u30bb\u30b9\u306e\u4e21\u65b9\u306e\u885d\u7a81\u3092\u8a66\u9a13\u3059\u308b\u3002</p> </li> <li> <p>P2 \u2014 <code>build --push</code> \u304c\u30ed\u30fc\u30ab\u30eb\u7528\u30bf\u30b0\u3082\u516c\u958b\u3057\u3088\u3046\u3068\u3059\u308b\u3002 <code>installer/grdm_dev/build.py:123-127</code> \u306f <code>--push</code> \u306b <code>grdm-dev/<component></code> \u3068 <code>ghcr.io/rcosdp/<component></code> \u306e\u4e21\u65b9\u3092\u6e21\u3059\u3002\u6700\u521d\u306e\u7701\u7565\u5f62\u5f0f\u306f Docker Hub \u3092\u6307\u3059\u305f\u3081\u3001\u8a8d\u8a3c\u5931\u6557\u3084\u610f\u56f3\u3057\u306a\u3044\u516c\u958b\u5148\u3078\u306e\u9001\u4fe1\u306b\u306a\u308b\u3002push \u306f GHCR \u7528\u30bf\u30b0\u3060\u3051\u306b\u3057\u3001\u30ed\u30fc\u30ab\u30eb\u7528\u306f load \u306b\u9650\u5b9a\u3059\u308b\u3002\u5f15\u6570\u5168\u4f53\u3068\u4f59\u5206\u306a\u516c\u958b\u5148\u304c\u306a\u3044\u3053\u3068\u3092\u8a66\u9a13\u3059\u308b\u3002</p> </li> <li> <p>P2 \u2014 \u53d7\u5165\u304c\u5fc5\u9808\u306e\u7d71\u5408\u4e8b\u524d\u691c\u67fb\u3092\u305b\u305a\u3001\u5408\u683c\u6761\u4ef6\u3082\u5f31\u3044\u3002 <code>installer/grdm_dev/accept.py:265-320</code> \u306f\u4f9d\u5b58\u30fb\u30d1\u30b9\u78ba\u8a8d\u5f8c\u306b\u76f4\u63a5 pytest \u3092\u547c\u3076\u3002\u5408\u6210 pytest \u306e\u6b63\u5e38\u7d42\u4e86\u3060\u3051\u3067\u3001health\u30fb\u7d71\u5408\u691c\u67fb\u306a\u3057\u3001\u7d50\u679c\u884c\u30bc\u30ed\u3067\u3082 0 \u306b\u306a\u3063\u305f\u3002SPEC-04 \u00a72 \u306f\u7d71\u5408\u691c\u67fb\u3092\u5148\u306b\u8981\u6c42\u3059\u308b\u3002C2 \u306f\u6a29\u9650\u6b20\u843d\u6642\u306b <code>['admin']</code> \u3092\u88dc\u3046\uff08<code>installer/acceptance/test_c2_create_project.py:31</code>\uff09\u3002C3 \u306f\u30ed\u30b0\u30a4\u30f3\u6e08\u307f\u975e\u53c2\u52a0\u8005\u3067\u306a\u304f\u533f\u540d PUT\uff08<code>test_c3_file_upload.py:35-48</code>\uff09\u3001C4 \u306f B\u2192A \u306e\u7247\u65b9\u5411\uff08<code>test_c4_wiki_collab.py:47-53</code>\uff09\u3001C6 \u306f\u5951\u7d04\u306e 403 \u306b\u52a0\u3048\u3066 404 \u3082\u8a31\u3059\uff08<code>test_c6_admin.py:39-40</code>\uff09\u3002\u6240\u5b9a\u306e\u6210\u529f\u30fb\u62d2\u5426\u8a3c\u8de1\u3092\u5fc5\u9808\u306b\u3057\u3001\u4e0d\u5b8c\u5168\u5b9f\u884c\u3092\u5931\u6557\u3055\u305b\u308b\u3002\u30d6\u30e9\u30a6\u30b6\u3082\u7a7a\u3067\u306a\u3044\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u306a\u304f\u5b9f\u884c\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u67fb\u3059\u308b\uff08<code>accept.py:277-279</code>\uff09\u3002</p> </li> <li> <p>P2 \u2014 \u901a\u5e38\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u306e\u914d\u5e03\u7269\u306b\u53d7\u5165\u30b9\u30a4\u30fc\u30c8\u304c\u306a\u3044\u3002 <code>installer/pyproject.toml:25-30</code> \u306f <code>grdm_dev</code> \u3068 messages\u30fbtemplates \u3060\u3051\u3092\u540c\u68b1\u3059\u308b\u304c\u3001<code>installer/grdm_dev/accept.py:44</code> \u306f\u96a3\u306e <code>acceptance</code> \u3092\u63a2\u3059\u3002\u975e editable \u5c0e\u5165\u3067\u306f\u5b58\u5728\u3057\u306a\u3044\u3002\u914d\u5e03\u7269\u3078\u542b\u3081\u308b\u304b\u3001\u6307\u5b9a\u30ea\u30dd\u30b8\u30c8\u30ea\u304b\u3089\u660e\u793a\u7684\u306b\u89e3\u6c7a\u3059\u308b\u3002PR \u306e console script \u3068\u30c7\u30fc\u30bf\u30d5\u30a1\u30a4\u30eb\u306e\u78ba\u8a8d\u3060\u3051\u3067\u306f\u53d7\u5165\u5b9f\u884c\u3092\u8a3c\u660e\u3067\u304d\u306a\u3044\u3002</p> </li> <li> <p>P2 \u2014 \u6587\u66f8\u691c\u67fb\u3068 PR \u306e\u5408\u683c\u5831\u544a\u304c\u4e00\u81f4\u3057\u306a\u3044\u3002 PR \u304c\u8ffd\u52a0\u3059\u308b <code>docs/reviews/2026-11-05_RDM-developer-guide_PR20_Manifest_Shibboleth_r3.md:10</code> \u306f\u5b58\u5728\u3057\u306a\u3044 <code>2026-11-05_dev2027_Strict_Reconstruction_PRs_r2.md</code> \u3092\u53c2\u7167\u3059\u308b\u3002<code>gh api</code> \u3067\u5bfe\u8c61 head \u306e\u5185\u5bb9\u3082\u78ba\u8a8d\u3057\u305f\u3002\u6700\u521d\u306e docs \u691c\u67fb\u306f\u30ea\u30f3\u30af\u5207\u308c\u3001\u305d\u306e\u5f8c\u306f\u8ffd\u8de1\u6e08\u307f\u30ec\u30d3\u30e5\u30fc\u81ea\u4f53\u304c\u30ed\u30fc\u30ab\u30eb\u3067\u898b\u3064\u304b\u3089\u306a\u3044\u3068\u5831\u544a\u3057\u305f\u3002installer \u8a66\u9a13\u3082\u6587\u66f8\u691c\u67fb\u3067\u843d\u3061\u308b\u3002\u4f5c\u696d\u5834\u6240\u306e\u5909\u5316\u3068\u3001\u5bfe\u8c61 head \u3067\u78ba\u8a8d\u3057\u305f\u30ea\u30f3\u30af\u5207\u308c\u3092\u533a\u5225\u3057\u3066\u6271\u3046\u3002\u4fee\u6b63\u5f8c\u306b\u5b89\u5b9a\u3057\u305f checkout \u3067\u518d\u691c\u67fb\u3057\u3001PR \u672c\u6587\u306e\u5168\u4ef6\u5408\u683c\u8a18\u8f09\u3092\u66f4\u65b0\u3059\u308b\u3002</p> </li> </ol>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1/#\u78ba\u8a8d\u7bc4\u56f2\u5951\u7d04\u306e\u4e0d\u8db3\u8a3c\u62e0","title":"\u78ba\u8a8d\u7bc4\u56f2\u30fb\u5951\u7d04\u306e\u4e0d\u8db3\u30fb\u8a3c\u62e0","text":"<p>\u6b21\u306f\u89b3\u6e2c\u3067\u3042\u308a\u8ffd\u52a0\u306e\u5b89\u5168\u627f\u8a8d\u3067\u306f\u306a\u3044\u3002\u79d8\u5bc6\u306f\u4e71\u6570\u751f\u6210\u3055\u308c <code>.env</code> \u306f 0600\u3001\u89aa\u306f 0700 \u3067\u4fdd\u5b58\u3059\u308b\u3002\u751f\u6210\u30d5\u30a1\u30a4\u30eb\u306f\u79d8\u5bc6\u306e\u5024\u3067\u306a\u304f\u53c2\u7167\u3092\u4fdd\u6301\u3057\u3001\u516c\u958b\u306f 127.0.0.1\u3001<code>cap_drop: ALL</code> \u3068 <code>no-new-privileges</code> \u3092\u8a2d\u5b9a\u3057\u3001\u7406\u7531\u4ed8\u304d\u4f8b\u5916\u4ee5\u5916\u306f\u975e root \u306b\u3059\u308b\u3002\u65e7\u5225\u540d\u306f\u5dee\u5206\u306e\u7981\u6b62\u691c\u67fb\u30fb\u8a66\u9a13\u30fb\u6b74\u53f2\u8cc7\u6599\u306b\u73fe\u308c\u308b\u304c\u3001\u751f\u6210\u7d50\u679c\u3084\u30db\u30b9\u30c8\u8a2d\u5b9a\u306b\u306f\u8ffd\u52a0\u3057\u306a\u3044\u3002\u5831\u544a\u306e\u30de\u30b9\u30af\u306f <code>.env</code> \u306b\u3042\u308b\u516b\u6587\u5b57\u4ee5\u4e0a\u306e\u65e2\u77e5\u306e\u6587\u5b57\u5217\u304c\u5bfe\u8c61\u3067\u3042\u308a\u3001\u672a\u77e5\u306e\u79d8\u5bc6\u3092\u3059\u3079\u3066\u6d88\u3059\u4ed5\u7d44\u307f\u3067\u306f\u306a\u3044\u3002</p> <p>\u5168 help \u306f 0\u300113 \u500b\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u30b3\u30fc\u30c9\u306f SPEC-02 \u00a76 \u3068\u4e00\u81f4\u3057\u305f\u3002<code>upstream mirror/integrate</code> \u306f\u7d42\u4e86 2 \u306e\u672a\u5b9f\u88c5\u5165\u53e3\u3067\u3042\u308b\uff08<code>installer/grdm_dev/upstream.py:1-32</code>\uff09\u3002\u00a73 \u5168\u4f53\u3078\u306e\u6e96\u62e0\u306f\u672a\u9054\u3060\u304c\u3001PR \u672c\u6587\u306f\u3053\u306e\u4e8c\u6a5f\u80fd\u3092\u660e\u793a\u7684\u306b\u4e3b\u5f35\u3057\u3066\u3044\u306a\u3044\u3002\u975e\u5bfe\u8a71\u78ba\u8a8d\u306f reset \u3067 <code>Context.confirm</code> \u3092\u901a\u3059\u3002install\u30fbseed \u5168\u822c\u306b\u306f\u7aef\u672b\u306a\u3057\u30fb<code>--yes</code> \u306a\u3057\u306e\u62d2\u5426\u304c\u306a\u3044\u3002\u30b0\u30ed\u30fc\u30d0\u30eb\u30d5\u30e9\u30b0\u306e\u300c\u7aef\u672b\u306a\u3057\u3067\u5fc5\u9808\u300d\u3068 \u00a77 \u306e\u8cea\u554f\u306b\u5bfe\u3059\u308b\u898f\u5247\u306e\u9055\u3044\u3092\u6574\u7406\u3059\u308b\u3002<code>secrets init</code> \u306f\u65e2\u5b58\u30d5\u30a1\u30a4\u30eb\u3092\u6b8b\u3057\u3066 2 \u3092\u8fd4\u3059\u3002\u00a73 \u306e\u4e0a\u66f8\u304d\u62d2\u5426\u306b\u306f\u5408\u3046\u304c\u3001\u00a77 \u3092\u518d\u5b9f\u884c\u3067\u3082\u6210\u529f\u3068\u8aad\u3080\u306a\u3089\u4e00\u81f4\u3057\u306a\u3044\u3002</p> <p>\u6bb5\u968e\u5225\u306e\u5224\u5b9a\u306f M1 \u5831\u544a\u3001M2/M3 \u4ef6\u6570\u4e0a\u9650\u3001M4 \u672a\u8a31\u5bb9 HIGH/CRITICAL\u3001M5 \u9ad8\u91cd\u5927\u5ea6\u306e\u8a31\u5bb9\u7981\u6b62\u3092\u533a\u5225\u3059\u308b\u3002\u671f\u9650\u5207\u308c\u306f\u6291\u5236\u5bfe\u8c61\u304b\u3089\u5916\u308c\u308b\u3002\u305f\u3060\u3057 milestone JSON \u306e\u7834\u640d\u306f M1 \u306b\u623b\u308b\uff08<code>scan.py:100-112,560-566</code>\uff09\u3002\u6b21\u306e\u7bc0\u76ee\u3088\u308a\u524d\u3068\u3044\u3046\u671f\u9650\u5883\u754c\u3082\u691c\u8a3c\u3057\u306a\u3044\u3002\u5f8c\u7d9a\u6bb5\u968e\u307e\u3067\u306b\u3001\u691c\u67fb\u4e0d\u80fd\u306a\u3089\u901a\u3055\u306a\u3044\u5951\u7d04\u3078\u76f4\u3059\u5fc5\u8981\u304c\u3042\u308b\u3002\u7d04\u675f\u3055\u308c\u305f <code>docs/status/security_<milestone>.md</code> \u306e\u6284\u9332\u3068\u3001M5 \u306e\u672a\u89e3\u6c7a\u4fb5\u5165\u7d4c\u8def\u78ba\u8a8d\u3082\u672a\u5b9f\u88c5\u3067\u3042\u308b\u3002</p> <p>SPEC-01 \u306e <code>integration_sha</code> \u884c\u306f\u4e21\u534a\u5206\u3067\u5bfe\u5fdc\u3059\u308b\u304c\u3001\u65e5\u672c\u8a9e\u5074\u3082\u82f1\u6587\u306e\u307e\u307e\u3067\u3042\u308b\u3002\u73fe\u5728\u306e\u7d71\u5408 pin\uff08\u6b63\u78ba\u306a\u7248\u306e\u6307\u5b9a\uff09\u306f\u3059\u3079\u3066 null \u3067\u3001M2 \u53d7\u5165\u306b\u306f\u4e0d\u53ef\u3068\u660e\u8a18\u3055\u308c\u308b\u3002SPEC-04 \u306e\u30d6\u30e9\u30a6\u30b6\u5c0e\u5165\u8aac\u660e\u306f\u82f1\u548c\u4e00\u81f4\u3059\u308b\u3002\u4e21 README \u306f\u82f1\u548c\u30a2\u30f3\u30ab\u30fc\u30fbJump\u30fb\u7248\u30fb\u7528\u8a9e\u8868\u3092\u5099\u3048\u308b\u304c\u3001installer README \u306f\u9069\u7528\u5bfe\u8c61\u884c\u3068\u5b50\u306e acceptance \u3078\u306e\u30ea\u30f3\u30af\u304c\u306a\u304f\u3001\u8a66\u9a13\u624b\u9806\u3082 SPEC-06 \u306e\u5b8c\u5168\u306a\u30b3\u30fc\u30c9\u30d6\u30ed\u30c3\u30af\u3067\u306a\u304f\u672c\u6587\u5185\u8868\u8a18\u3067\u3042\u308b\u3002\u751f\u6210 local \u8a2d\u5b9a\u3092\u6307\u5b9a\u306e\u4e0a\u6d41\u53c2\u8003\u3068\u7167\u5408\u3057\u3001\u5185\u5916 URL \u306e\u5206\u96e2\u306f\u78ba\u8a8d\u3057\u305f\u3002\u5b9f\u969b\u306e\u5229\u7528\u5074\u306e\u8a2d\u5b9a\u540d\u3001\u8a8d\u8a3c\u7d4c\u8def\u3001\u66f8\u8fbc\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u6240\u6709\u8005\u306f\u7b2c\u4e8c\u6bb5\u968e\u3067\u691c\u8a3c\u3059\u308b\u3002</p> <p>\u89b3\u6e2c\u7d50\u679c\u3092 TOON\uff08\u69cb\u9020\u5316\u30c7\u30fc\u30bf\u3092\u77ed\u304f\u66f8\u304f\u6587\u5b57\u5f62\u5f0f\uff09\u3067\u8a18\u3059\u3002\u6b63\u672c\u306e\u8ee2\u8f09\u3067\u306f\u306a\u304f\u30ec\u30d3\u30e5\u30fc\u5b9f\u6e2c\u3067\u3042\u308b\u3002</p> <pre><code>checks[6]{check,result}:\n installer_unittest,\"174 \u4ef6\u5b9f\u884c; test_docs \u3067 1 \u4ef6\u5931\u6557\"\n tools_unittest,\"66 \u4ef6\u5b9f\u884c; \u975e\u516c\u958b URL \u65b9\u91dd\u3067 1 \u4ef6\u5931\u6557\"\n manifest_check,\"\u7d42\u4e86 1; test_build.py:88 \u975e\u516c\u958b URL\"\n docs_check,\"\u7d42\u4e86 1; PR20 \u30ec\u30d3\u30e5\u30fc\u306e\u30ea\u30f3\u30af\u307e\u305f\u306f\u30ed\u30fc\u30ab\u30eb\u8ffd\u8de1\u30d5\u30a1\u30a4\u30eb\u6b20\u843d\"\n cli_help,\"root \u3068\u672b\u7aef 21 \u500b\u306e help \u304c\u7d42\u4e86 0\"\n bash_syntax,\"bash -n \u5408\u683c; Bash 4 \u5c02\u7528\u306e\u5b9f\u884c\u69cb\u6587\u306a\u3057\"</code></pre> <p>\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30eb\u30fc\u30c8\u3067\u5b9f\u884c\u3057\u305f\u3002\u7d71\u5408\u53ef\u80fd\u306a\u72b6\u614b\u3067\u306f\u3059\u3079\u3066\u7d42\u4e86 0 \u3092\u671f\u5f85\u3059\u308b\u3002</p> <pre><code>PYTHONPATH=installer python3 -m unittest discover -s installer/tests\npython3 -m unittest discover -s tools/tests\npython3 tools/manifest_check.py\npython3 tools/docs_check.py\nPYTHONPATH=installer python3 -m grdm_dev.cli --help\nbash -n installer/install.sh\n</code></pre>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1/#mac-studio-\u3067\u5fc5\u9808\u306e\u7b2c\u4e8c\u6bb5\u968e","title":"Mac Studio \u3067\u5fc5\u9808\u306e\u7b2c\u4e8c\u6bb5\u968e","text":"<p>\u5b9f Docker \u306e build\u30fbup\u30fb\u53d7\u5165\u306f PR \u672c\u6587\u306e\u3068\u304a\u308a\u7b2c\u4e8c\u6bb5\u968e\u3078\u5ef6\u671f\u3055\u308c\u3001\u3053\u306e\u30ec\u30d3\u30e5\u30fc\u3067\u306f\u8a8d\u8a3c\u3057\u3066\u3044\u306a\u3044\u3002 \u6307\u6458\u4fee\u6b63\u5f8c\u3001M2 \u5b8c\u4e86\u524d\u306b\u6b21\u3092\u5b9f\u65bd\u3059\u308b\u3002</p> <ul> <li>\u7d71\u5408 SHA\uff08\u30bd\u30fc\u30b9\u306e\u6b63\u78ba\u306a\u7248\uff09\u3068\u57fa\u76e4 digest\uff08\u30a4\u30e1\u30fc\u30b8\u306e\u6b63\u78ba\u306a\u8b58\u5225\u5024\uff09\u3092\u56fa\u5b9a\u3057 arm64 \u3067\u65b0\u898f\u30d3\u30eb\u30c9\u3059\u308b\u3002Dockerfile \u9078\u629e\u3001\u30bf\u30b0\u3068 Compose \u306e\u53c2\u7167\u4e00\u81f4\u3001\u5225\u9014 amd64\u30fb\u8907\u6570\u74b0\u5883\u5411\u3051\u306e\u30d3\u30eb\u30c9\u3092\u78ba\u8a8d\u3059\u308b\u3002</li> <li>minimum/core \u3092\u8d77\u52d5\u3057\u3001\u4fdd\u5b58\u9818\u57df\u306e\u6240\u6709\u8005\u3001\u975e root \u8d77\u52d5\u3001\u8aad\u53d6\u5c02\u7528\u30d1\u30b9\u3001\u6a29\u9650\u4f8b\u5916\u3001\u8cc7\u6e90\u5236\u9650\u3092\u78ba\u8a8d\u3059\u308b\u3002\u8a2d\u5b9a\u3092\u8aad\u3080\u5b9f\u30b3\u30fc\u30c9\u3082\u56fa\u5b9a\u3057\u305f\u4e0a\u6d41\u7248\u3068\u7a81\u304d\u5408\u308f\u305b\u308b\u3002</li> <li>macOS \u306e\u5b9f\u5f85\u53d7\u3001\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u63a5\u7d9a\u3001\u5185\u90e8\u901a\u4fe1\u3001\u5916\u5411\u304d\u9694\u96e2\u3092\u6e2c\u308b\u3002AirPlay \u885d\u7a81\u3068\u518d\u5c0e\u5165\u30fb\u518d\u751f\u6210\u30fb\u518d\u8d77\u52d5\u3067\u3082\u81ea\u8eab\u306e\u30dd\u30fc\u30c8\u304c\u5909\u308f\u3089\u306a\u3044\u3053\u3068\u3092\u78ba\u8a8d\u3059\u308b\u3002</li> <li>\u521d\u671f\u5316\u6e08\u307f\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u79d8\u5bc6\u3092\u66f4\u65b0\u3057\u3001\u65b0\u5024\u6210\u529f\u30fb\u65e7\u5024\u62d2\u5426\u3092\u78ba\u8a8d\u3059\u308b\u3002\u5408\u6210\u79d8\u5bc6\u3092\u7570\u5e38\u51fa\u529b\u3078\u5165\u308c\u3001\u5168\u5831\u544a\u30fb\u30ed\u30b0\u30fb\u8ffd\u8de1\u8a18\u9332\u306b\u6f0f\u308c\u304c\u306a\u3044\u304b\u78ba\u8a8d\u3059\u308b\u3002</li> <li>\u5168\u7a3c\u50cd\u30a4\u30e1\u30fc\u30b8\u3068\u7d71\u5408\u5074\u306e\u4f9d\u5b58\u56fa\u5b9a\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u67fb\u3057\u3001\u691c\u67fb\u4e0d\u80fd\u3001\u8a31\u5bb9\u671f\u9650\u30fb\u4ef6\u6570\u3001\u6bb5\u968e\u5225\u95be\u5024\u3082\u78ba\u8a8d\u3059\u308b\u3002\u751f\u6210 hardening \u304c\u610f\u56f3\u3057\u305f\u5fc5\u9808\u691c\u67fb\u3092\u901a\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3059\u308b\u3002</li> <li>Chromium \u3067 C1\u2013C6 \u306e\u6210\u529f\u30fb\u62d2\u5426\u3092\u5b9f\u884c\u3059\u308b\u3002fakecas \u306e\u8ee2\u9001\u3068 cookie\u3001\u30d5\u30a1\u30a4\u30eb\u4e00\u81f4\u3068\u30d7\u30ec\u30d3\u30e5\u30fc\u3001Wiki \u306e\u53cc\u65b9\u5411\u540c\u671f\u3068 4401\u3001\u6240\u5c5e\u6a5f\u95a2\u306e\u7ba1\u7406\u753b\u9762\u3092\u78ba\u8a8d\u3059\u308b\u3002seed API\u30fb\u30bb\u30ec\u30af\u30bf\u30fb\u90e8\u5206\u5931\u6557\u6642\u3082\u542b\u3080\u5f8c\u7247\u4ed8\u3051\u3092\u78ba\u5b9a\u3057\u3001\u79d8\u5bc6\u3092\u9664\u3044\u305f JSON/TOON \u3092 <code>docs/demo/runs/</code> \u306b\u6b8b\u3059\u3002</li> <li>\u975e editable \u5c0e\u5165\u3067\u53d7\u5165\u8cc7\u6e90\u3092\u78ba\u8a8d\u3059\u308b\u3002\u73fe\u5728 M3 \u3068\u3057\u3066\u7121\u6761\u4ef6\u30b9\u30ad\u30c3\u30d7\u3059\u308b S1\u2013S5\u3001Shibboleth \u63a5\u7d9a\u3001\u4e0a\u6d41\u81ea\u52d5\u5316\u306e\u672a\u5b9f\u88c5\u5165\u53e3\u306f\u3001\u53d7\u5165\u6e08\u307f\u3067\u306a\u304f\u6b8b\u4f5c\u696d\u3068\u3059\u308b\u3002</li> </ul>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r1/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 P1 / P2 Before-reliance defect / functional or contract defect. \u4fe1\u983c\u3059\u308b\u524d\u306b\u76f4\u3059\u6b20\u9665\uff0f\u6a5f\u80fd\u30fb\u5951\u7d04\u306e\u6b20\u9665\u3002 Credential rotation Replace keys and make the previous keys stop working. \u9375\u3092\u4ea4\u63db\u3057\u3001\u4ee5\u524d\u306e\u9375\u3092\u4f7f\u3048\u306a\u304f\u3059\u308b\u3053\u3068\u3002 Loopback An address that leads back to the same computer. \u540c\u3058\u8a08\u7b97\u6a5f\u3078\u623b\u308b\u30a2\u30c9\u30ec\u30b9\u3002 Egress A connection leaving the isolated environment. \u9694\u96e2\u74b0\u5883\u304b\u3089\u5916\u3078\u5411\u304b\u3046\u901a\u4fe1\u3002 Runner A function that executes an external program, replaced in tests. \u5916\u90e8\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u5b9f\u884c\u3057\u3001\u8a66\u9a13\u3067\u7f6e\u304d\u63db\u3048\u308b\u95a2\u6570\u3002 Registry A service that stores and distributes container images. \u30b3\u30f3\u30c6\u30ca\u306e\u30a4\u30e1\u30fc\u30b8\u3092\u4fdd\u7ba1\u30fb\u914d\u5e03\u3059\u308b\u5834\u6240\u3002 Idempotence Repeating an operation preserves the intended state. \u7e70\u8fd4\u3057\u3066\u3082\u610f\u56f3\u3057\u305f\u72b6\u614b\u3092\u4fdd\u3064\u3053\u3068\u3002"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/","title":"REV PR21 Installer review r2 / \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u30ec\u30d3\u30e5\u30fc r2","text":"<p>Summary: Re-review of all 14 r1 findings at <code>3149c7601f8e199d599c5e0abb721d87f56e2696</code>. Changes requested: three security defects and two implementation/documentation contract defects remain despite 247 passing unit tests. \u6982\u8981: <code>3149c7601f8e199d599c5e0abb721d87f56e2696</code> \u3067 r1 \u306e14\u4ef6\u3092\u518d\u30ec\u30d3\u30e5\u30fc\u3057\u305f\u3002\u5358\u4f53\u30c6\u30b9\u30c8247\u4ef6\u306f\u5408\u683c\u3057\u305f\u304c\u3001\u5b89\u5168\u6027\u306e\u6b20\u96653\u4ef6\u3068\u5b9f\u88c5\u30fb\u6587\u66f8\u306e\u5951\u7d04\u4e0d\u4e00\u81f42\u4ef6\u304c\u6b8b\u308b\u305f\u3081\u4fee\u6b63\u3092\u8981\u6c42\u3059\u308b\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: correcting the original examples is insufficient when failure artefacts and alternative probe paths bypass the same protection. \uff0f \u5143\u306e\u518d\u73fe\u4f8b\u3092\u76f4\u3057\u3066\u3082\u3001\u5931\u6557\u6642\u306e\u8a3c\u8de1\u3084\u5225\u306e\u691c\u67fb\u7d4c\u8def\u304c\u540c\u3058\u4fdd\u8b77\u3092\u8fc2\u56de\u3059\u308b\u306a\u3089\u5341\u5206\u3067\u306f\u306a\u3044\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Applies to: PR #21, <code>feat/m2-installer</code> \u2192 <code>develop</code>; REV (\u62c5\u5f53\u30ec\u30d3\u30e5\u30ef), independent r2, no approval or merge.</li> <li>Related: Review index \u00b7 r1 \u00b7 SPEC-01 \u00b7 SPEC-02 \u00b7 SPEC-03 \u00b7 SPEC-04 \u00b7 SPEC-06 \u00b7 ADR-02 \u00b7 Shared glossary.</li> <li>Used by: Installer \u00b7 Acceptance suite \u00b7 Status board \u00b7 Mac Studio run record.</li> </ul> <p></p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/#verdict-and-scope","title":"Verdict and scope","text":"<p>Changes requested. P1 means a safety defect to fix before reliance; P2 means an implementation or documentation contract defect. A unit test replaces external programs with controlled responses; it does not certify a real installation. Docker (a tool for running applications in separate boxes) runs applications in separate containers; Compose describes those containers together. A secret is a password or key; egress is traffic leaving a network.</p> <p>Terminology: PR (a proposed change), CI (automatic checks), Semgrep (a source-code checker), Playwright (a browser automation tool), arm64 (the Apple Silicon CPU family), amd64 (the Intel/AMD CPU family), and mfr (the file-preview service).</p> <p>Read the r1 record, the fixes in <code>1caaace</code>, <code>ae273d4</code>, and <code>3149c76</code>, source, tests, and the requested specifications. GitHub access used <code>gh</code> only. No Docker command was executed against the real daemon, and no product source, commit, push, approval, merge, or closure was made. Local probes used temporary directories, synthetic secrets, and injected command runners. The second real install, if running, was left alone.</p> <p>The shared checkout and remote head advanced to <code>1c2a925d6af687129e8f9c23f06d629db58996c0</code> during review. That commit changes only Semgrep annotations in <code>accept.py</code> and a synthetic test literal in <code>test_accept.py</code>. Downloaded the exact <code>3149c76</code> archive through <code>gh api</code>, repeated all 247 installer tests and the probes with that source, and checked its documentation separately. Findings refer to <code>3149c76</code>; the newer CI result is reported separately.</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/#remaining-findings","title":"Remaining findings","text":"<ol> <li> <p>R2-01 \u2014 P1: retained browser traces still contain secrets (r1 #6 partially fixed). <code>installer/grdm_dev/accept.py:275</code> enables <code>--tracing retain-on-failure</code>, but <code>sanitize_run_dir</code> at lines 359\u2013363 masks only <code>junit.xml</code>, <code>collector.json</code>, and <code>pytest.log</code>. Files under <code>artifacts/</code> only receive permission changes. Reproduction: write a synthetic <code>.env</code> value into both <code>pytest.log</code> and a <code>trace.network</code> member of <code>artifacts/trace.zip</code>, then call <code>sanitize_run_dir(run_dir, [value])</code>. The log is masked; the ZIP member still contains the exact value. Browser traces may carry cookies, headers and response bodies, so 0600 permissions do not satisfy the no-secret evidence contract. Sanitize retained trace contents and other exported artefacts, or disable/quarantine them until safe; add a ZIP-content assertion. The existing test named \u201cevery evidence file\u201d covers text files only.</p> </li> <li> <p>R2-02 \u2014 P1: the API guard allows redirects to bypass the origin check (r1 #7 partially fixed). <code>installer/acceptance/conftest.py:162</code> uses <code>kwargs.setdefault(\"max_redirects\", 0)</code>. Calling <code>GuardedRequest(...).get(\"http://127.0.0.1:5000\", max_redirects=20)</code> passes 20 unchanged to the underlying request context; captured arguments confirm it. A local response can therefore redirect externally before the response URL is checked. A later failure cannot undo the request, and an external hop returning to loopback is invisible to the final-URL check. Force zero redirects and validate each manually followed hop, or reject the override. Also, <code>guard_context</code> silently omits WebSocket routing when the method is absent (<code>:204</code>), while <code>pyproject.toml:19</code> permits Playwright 1.47; enforce a compatible capability/version or fail closed. Exact-origin parsing, guarded core call sites, and blocked service workers are improvements, but do not close these paths.</p> </li> <li> <p>R2-03 \u2014 P1: a broken attacker-side probe is still classified as proven isolation (r1 #4 partially fixed). <code>installer/grdm_dev/redteam.py:207\u2013220</code> maps every nonzero <code>nc</code> execution to <code>GRDM_REACH_FAIL</code>, then to <code>unreachable</code>. Reproduction without network access: place a stub <code>nc</code> on PATH that exits 2 (representing unsupported options), execute <code>probe_script(\"192.0.2.1\", 443)</code> through <code>/bin/sh</code>, and pass its output to <code>verdict</code>. The shell exits 0, emits <code>GRDM_REACH_FAIL</code>, and receives <code>unreachable</code>, not <code>inconclusive</code>. The positive control uses another container's binary, so it cannot validate the attacker's tool. The HTTP fallback against port 443 can likewise fail after making a connection. Use a known TCP probe, verify its operation in the attacker environment, distinguish tool/protocol errors from blocked connections, and return 53 on uncertainty. The new missing-tool, absent-marker, failed-control, attachment, and approval-field tests pass, but do not cover this case.</p> </li> <li> <p>R2-04 \u2014 P2: explicitly granted egress fails the baseline (r1 #8/#2 follow-up). <code>installer/grdm_dev/scan.py:487\u2013489</code> rejects every non-publishing service on a non-internal network, without reading the recorded <code>GRDM_EGRESS_SERVICES</code> grant. Reproduction: render the real core manifest with <code>egress=\"worker\"</code>; rendering returns 0 and records the choice, but <code>check_baseline(compose_path, hardening_path, env_path)</code> emits <code>BASE-NETWORK</code> for <code>worker</code>. The same render without egress has zero findings and 14 accepted hardening controls. SPEC-03 \u00a73.2 explicitly says a recorded grant is not a baseline violation. Validate the recorded grant against actual attachments, accept the authorized service, and still reject undeclared attachments; add a renderer-to-baseline test for both cases.</p> </li> <li> <p>R2-05 \u2014 P2: the changed documentation still omits or misstates contracts. SPEC-01 mentions <code>build_platform</code> in its new version note, but neither \u00a73 schema table defines the field, accepted values, optionality, or precedence. Its Japanese <code>integration_sha</code> row remains entirely English. SPEC-02 \u00a73 still describes the build default as host-only although components now choose amd64, and calls <code>redteam preflight</code> read-only although it creates/removes a canary container/network. ADR-02 \u00a73 describes dual attachment for published services, but \u00a74 says \u201cno egress by default\u201d; those seven services already have an ordinary bridge attachment without an explicit grant. Correct both language halves together and describe that exposure plainly. The two halves of the new SPEC-03 \u00a73.2/\u00a76, ADR-02 \u00a73/\u00a74, and SPEC-02 changed rows are otherwise materially equivalent; parity alone does not make the statements accurate.</p> </li> </ol>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/#disposition-of-all-14-r1-findings","title":"Disposition of all 14 r1 findings","text":"<p>\u201cResolved\u201d means the reported code-level defect is corrected in this review scope; real-Docker confirmation remains a separate stage. Each row uses the original r1 number.</p> r1 r2 disposition Evidence 1 Resolved at code/test level Live PostgreSQL/RabbitMQ changes, old/new authentication checks and force recreation replace restart. Injected RabbitMQ failure returns 40 and restores both <code>.env</code> and the PostgreSQL fake store. Health-failure rollback test also passes. Real stores remain unverified. 2 Original cases resolved <code>user: 0:0</code> now emits <code>BASE-USER</code>; actual core render yields zero findings and 14 accepted exception controls. Environment mode/defaults, exceptions and expiry are tested. See R2-04 for explicit egress. 3 Resolved Ownerless <code>LISTEN 0 4096 0.0.0.0:5000 0.0.0.0:*</code> is now a project-port violation; the corresponding command test returns 40. Inspect/ps address and command-failure tests pass. 4 Partial Actual attacker attachment, canary control and approval scope/date checks added; inconclusive tests return 53. Broken-tool path remains R2-03. 5 Resolved for reported cases Semgrep exit 2 with <code>errors</code> yields incomplete/51; all four local packs are invoked. Tests cover every Compose image, integration filesystem scans, failed SBOM generation and failed image scans. 6 Partial Synthetic values are masked in logs, result text and seed/cleanup messages; owner-only modes pass. Trace ZIP still leaks (R2-01). 7 Partial Exact origins and guarded API/browser contexts added; redirects and absent WebSocket interception remain R2-02. 8 Partial <code>grdm.internal: true</code> is generated; published services additionally use <code>grdm-edge</code>, now described normatively. Explicit egress and documentation remain R2-04/R2-05. 9 Resolved Private URL literal removed; manifest/private-URL policy check passes on the shared checkout and CI. 10 Resolved Re-render with own web listener on 5000 preserves <code>127.0.0.1:5000:5000</code>; foreign collision/remap tests pass. 11 Resolved Captured push arguments contain one tag, <code>ghcr.io/rcosdp/web:abc123</code>, and no local registry destination; load-form test also passes. 12 Resolved for reported cases Health precheck precedes pytest; missing Chromium, zero rows and missing rejection fail. C2 checks actual permissions, C3 uses a signed-in non-contributor, C4 checks both directions, C6 requires API 403. Selectors and real integration still need stage two. 13 Resolved Non-editable install into a temporary target resolves the installed acceptance package, with 11 scenario files, <code>conftest.py</code> and <code>pytest.ini</code>, outside the checkout. 14 Original link/check failure resolved Required docs check passes. At requested head Semgrep CI fails; follow-up <code>1c2a925</code> makes all six CI jobs pass. New documentation defects are R2-05."},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/#validation-and-documentation-evidence","title":"Validation and documentation evidence","text":"<p>Observed results, not a canonical manifest (TOON is a compact text form for structured data):</p> <pre><code>checks[7]{check,result}:\n pinned_installer_tests,\"247 run; OK at 3149c76\"\n pinned_docs_check,\"PASSED; 51 checked; 8 exempt; 126 warnings\"\n shared_installer_tests,\"247 run; OK\"\n shared_docs_check,\"PASSED before this review; 51 checked; 8 exempt; 126 warnings\"\n installed_package,\"non-editable install OK; 11 scenario files plus conftest and pytest.ini\"\n requested_head_ci,\"5 pass; Semgrep fail\"\n followup_head_ci,\"1c2a925: all 6 pass\"</code></pre> <p>Run from the repository root; expected result is exit 0. Tests use fake external runners and do not change Docker state:</p> <pre><code>PYTHONPATH=installer python3 -m unittest discover -s installer/tests\npython3 tools/docs_check.py\npython3 tools/manifest_check.py\npython3 -m unittest discover -s tools/tests\ngh pr checks 21 --repo RCOSDP/RDM-developer-guide\n</code></pre> <p>The shared-checkout tools suite also passed all 66 tests; the manifest/private-URL policy check passed with zero findings. The Playwright 1.47 generated API, retrieved through <code>gh api</code>, has no <code>route_web_socket</code> method.</p> <p>The original Semgrep failure reports two 0700 directory-mode findings and one synthetic JWT literal. Do not weaken owner-only permissions to satisfy it; the follow-up uses documented suppression and a constructed test string. Requested-head CI and follow-up CI are distinct evidence.</p> <p>Packaging initially generated <code>installer/build/</code> inside the temporary archive and caused an extra docs-check failure there. Removed only that temporary build output and reran: 51 checked, zero errors. The archive has no Git metadata, so its private-URL policy scan cannot run; the real-checkout policy check and CI supply that evidence. This tooling artefact is not attributed to the PR. The new, untracked review was additionally passed directly to <code>docs_check.check_file</code>: zero errors; the tracked-file command alone does not include it.</p> <p>DEMO-20 run 1 has matching English/Japanese commands, host facts, five step outcomes and three image outcomes. It accurately labels the attempt as exit 30 before startup, not a completed installation. The source build flow supports stopping at the first failed component. However, the full log exists only in the author's session scratchpad, so the recorded host measurements, sizes and package failure were not independently re-established here. The failed mfr build alone does not prove ember/cas cannot build on arm64, nor prove the chosen amd64 builds succeed. \u201cruntime holds two built images\u201d should distinguish Docker's image store from files under <code>runtime/</code>. No claim is made about run 2 or M2 acceptance completion.</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/#required-follow-up","title":"Required follow-up","text":"<p>Fix R2-01\u2013R2-05 and add tests that traverse the failing paths, then re-review the resulting head. Keep real install/build/startup, credential rejection against initialized stores, browser C1\u2013C6 and actual network behavior as stage-two evidence. Existing M3 skips and upstream command placeholders are not delivered acceptance. This review grants no red-team execution or merge approval.</p> <p></p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/#\u5224\u5b9a\u3068\u7bc4\u56f2","title":"\u5224\u5b9a\u3068\u7bc4\u56f2","text":"<p>\u4fee\u6b63\u8981\u6c42\u3002 P1 \u306f\u4fe1\u983c\u3059\u308b\u524d\u306b\u76f4\u3059\u5b89\u5168\u6027\u306e\u6b20\u9665\u3001P2 \u306f\u5b9f\u88c5\u307e\u305f\u306f\u6587\u66f8\u306e\u5951\u7d04\u4e0d\u4e00\u81f4\u3092\u8868\u3059\u3002\u5358\u4f53\u30c6\u30b9\u30c8\u306f\u5916\u90e8\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u6c7a\u307e\u3063\u305f\u5fdc\u7b54\u3078\u7f6e\u304d\u63db\u3048\u308b\u3082\u306e\u3067\u3001\u5b9f\u6a5f\u5c0e\u5165\u306e\u8a3c\u660e\u3067\u306f\u306a\u3044\u3002Docker \u306f\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u5206\u96e2\u3057\u305f\u30b3\u30f3\u30c6\u30ca\u3067\u52d5\u304b\u3057\u3001Compose \u306f\u305d\u306e\u7bb1\u3092\u307e\u3068\u3081\u3066\u8a18\u8ff0\u3059\u308b\u3002\u79d8\u5bc6\u3068\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u3084\u9375\u3001egress \u3068\u306f\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u5916\u3078\u51fa\u308b\u901a\u4fe1\u3067\u3042\u308b\u3002</p> <p>\u7528\u8a9e\u6ce8: PR\uff08\u5909\u66f4\u6848\uff09\u3001CI\uff08\u81ea\u52d5\u691c\u67fb\uff09\u3001Semgrep\uff08\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u691c\u67fb\u9053\u5177\uff09\u3001Playwright\uff08\u30d6\u30e9\u30a6\u30b6\u64cd\u4f5c\u306e\u81ea\u52d5\u5316\u9053\u5177\uff09\u3001arm64\uff08Apple Silicon \u306e CPU \u7cfb\u5217\uff09\u3001amd64\uff08Intel/AMD \u306e CPU \u7cfb\u5217\uff09\u3001mfr\uff08\u30d5\u30a1\u30a4\u30eb\u30d7\u30ec\u30d3\u30e5\u30fc\u7528\u30b5\u30fc\u30d3\u30b9\uff09\u3002</p> <p>r1\u3001<code>1caaace</code>\u30fb<code>ae273d4</code>\u30fb<code>3149c76</code> \u306e\u4fee\u6b63\u3001\u30bd\u30fc\u30b9\u3001\u30c6\u30b9\u30c8\u3001\u6307\u5b9a\u4ed5\u69d8\u3092\u78ba\u8a8d\u3057\u305f\u3002GitHub \u64cd\u4f5c\u306f <code>gh</code> \u306e\u307f\u3002\u5b9f Docker \u3078\u306e\u30b3\u30de\u30f3\u30c9\u5b9f\u884c\u3001\u88fd\u54c1\u30bd\u30fc\u30b9\u5909\u66f4\u3001commit\u30fbpush\u30fbapprove\u30fbmerge\u30fbclose \u306f\u3057\u3066\u3044\u306a\u3044\u3002\u518d\u73fe\u306f\u4e00\u6642\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fb\u5408\u6210\u79d8\u5bc6\u30fb\u5dee\u3057\u66ff\u3048\u305f\u5b9f\u884c\u95a2\u6570\u3092\u4f7f\u7528\u3057\u305f\u3002\u5b9f\u884c\u4e2d\u306e\u53ef\u80fd\u6027\u304c\u3042\u308b\u7b2c2\u56de\u306e\u5b9f\u6a5f\u5c0e\u5165\u306b\u306f\u89e6\u308c\u3066\u3044\u306a\u3044\u3002</p> <p>\u30ec\u30d3\u30e5\u30fc\u4e2d\u306b\u5171\u6709 checkout \u3068 remote head \u304c <code>1c2a925d6af687129e8f9c23f06d629db58996c0</code> \u3078\u9032\u3093\u3060\u3002\u3053\u306e\u5909\u66f4\u306f <code>accept.py</code> \u306e Semgrep \u6ce8\u91c8\u3068 <code>test_accept.py</code> \u306e\u5408\u6210\u30ea\u30c6\u30e9\u30eb\u3060\u3051\u3067\u3042\u308b\u3002<code>gh api</code> \u3067\u6b63\u78ba\u306a <code>3149c76</code> \u306e\u30a2\u30fc\u30ab\u30a4\u30d6\u3092\u53d6\u5f97\u3057\u3001\u305d\u306e\u30bd\u30fc\u30b9\u3067247\u4ef6\u3068\u518d\u73fe\u8a66\u9a13\u3092\u5b9f\u884c\u3057\u3001\u6587\u66f8\u3082\u5225\u9014\u691c\u67fb\u3057\u305f\u3002\u6307\u6458\u306e\u5bfe\u8c61\u306f <code>3149c76</code> \u3068\u3057\u3001\u65b0\u3057\u3044 CI \u7d50\u679c\u306f\u5206\u3051\u3066\u8a18\u8f09\u3059\u308b\u3002</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/#\u6b8b\u308b\u6307\u6458","title":"\u6b8b\u308b\u6307\u6458","text":"<ol> <li> <p>R2-01 \u2014 P1: \u4fdd\u5b58\u3059\u308b\u30d6\u30e9\u30a6\u30b6 trace \u306b\u79d8\u5bc6\u304c\u6b8b\u308b\uff08r1 #6 \u306f\u4e00\u90e8\u89e3\u6d88\uff09\u3002 <code>installer/grdm_dev/accept.py:275</code> \u306f <code>--tracing retain-on-failure</code> \u3092\u6307\u5b9a\u3059\u308b\u304c\u3001359\u301c363\u884c\u306e <code>sanitize_run_dir</code> \u306f <code>junit.xml</code>\u30fb<code>collector.json</code>\u30fb<code>pytest.log</code> \u3057\u304b\u30de\u30b9\u30af\u3057\u306a\u3044\u3002<code>artifacts/</code> \u4ee5\u4e0b\u306f\u6a29\u9650\u5909\u66f4\u3060\u3051\u3067\u3042\u308b\u3002\u518d\u73fe\u3067\u306f\u3001\u5408\u6210 <code>.env</code> \u5024\u3092 <code>pytest.log</code> \u3068 <code>artifacts/trace.zip</code> \u306e <code>trace.network</code> \u30e1\u30f3\u30d0\u30fc\u306b\u5165\u308c\u3001<code>sanitize_run_dir(run_dir, [value])</code> \u3092\u5b9f\u884c\u3057\u305f\u3002\u30ed\u30b0\u306f\u6d88\u3048\u305f\u304c ZIP \u5185\u306b\u306f\u540c\u3058\u5024\u304c\u6b8b\u3063\u305f\u3002trace \u306f cookie\u30fb\u30d8\u30c3\u30c0\u30fb\u5fdc\u7b54\u672c\u6587\u3092\u6301\u3061\u5f97\u308b\u305f\u3081\u30010600 \u3060\u3051\u3067\u306f\u8a3c\u8de1\u3078\u79d8\u5bc6\u3092\u66f8\u304b\u306a\u3044\u5951\u7d04\u3092\u6e80\u305f\u3055\u306a\u3044\u3002trace \u5185\u90e8\u3068\u4ed6\u306e\u51fa\u529b\u3092\u7121\u5bb3\u5316\u3059\u308b\u304b\u3001\u5b89\u5168\u306b\u306a\u308b\u307e\u3067\u7121\u52b9\u5316\u30fb\u9694\u96e2\u3057\u3001ZIP \u5185\u90e8\u306e\u691c\u67fb\u3092\u8ffd\u52a0\u3059\u308b\u3002\u300cevery evidence file\u300d\u3068\u3044\u3046\u65e2\u5b58\u30c6\u30b9\u30c8\u306f\u30c6\u30ad\u30b9\u30c8\u3060\u3051\u3092\u691c\u67fb\u3057\u3066\u3044\u308b\u3002</p> </li> <li> <p>R2-02 \u2014 P1: API \u306e\u8ee2\u9001\u304c\u901a\u4fe1\u30ac\u30fc\u30c9\u3092\u8fc2\u56de\u3059\u308b\uff08r1 #7 \u306f\u4e00\u90e8\u89e3\u6d88\uff09\u3002 <code>installer/acceptance/conftest.py:162</code> \u306f <code>kwargs.setdefault(\"max_redirects\", 0)</code> \u3067\u3042\u308b\u3002<code>GuardedRequest(...).get(\"http://127.0.0.1:5000\", max_redirects=20)</code> \u3092\u547c\u3076\u3068\u3001\u4e0b\u4f4d\u306e\u8981\u6c42\u306b20\u304c\u305d\u306e\u307e\u307e\u6e21\u308b\u3053\u3068\u3092\u5f15\u6570\u6355\u6349\u3067\u78ba\u8a8d\u3057\u305f\u3002\u30ed\u30fc\u30ab\u30eb\u5fdc\u7b54\u304b\u3089\u5916\u90e8\u3078\u8ee2\u9001\u3059\u308b\u3068\u3001\u5fdc\u7b54 URL \u306e\u78ba\u8a8d\u524d\u306b\u901a\u4fe1\u304c\u767a\u751f\u3059\u308b\u3002\u5f8c\u304b\u3089\u306e\u5931\u6557\u3067\u306f\u53d6\u308a\u6d88\u305b\u305a\u3001\u5916\u90e8\u3092\u7d4c\u3066\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u3078\u623b\u308b\u5834\u5408\u306f\u6700\u7d42 URL \u691c\u67fb\u3067\u3082\u5206\u304b\u3089\u306a\u3044\u3002\u8ee2\u9001\u3092\u5f37\u5236\u7684\u306b0\u306b\u3057\u3066\u5404\u8ee2\u9001\u5148\u3092\u78ba\u8a8d\u3059\u308b\u304b\u3001\u4e0a\u66f8\u304d\u3092\u62d2\u5426\u3059\u308b\u3002\u307e\u305f <code>guard_context:204</code> \u306f WebSocket \u30eb\u30fc\u30c6\u30a3\u30f3\u30b0\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u7121\u3044\u5834\u5408\u306b\u9ed9\u3063\u3066\u7701\u7565\u3057\u3001<code>pyproject.toml:19</code> \u306f Playwright 1.47 \u3092\u8a31\u3059\u3002\u5fc5\u8981\u306a\u6a5f\u80fd\u30fb\u7248\u3092\u5fc5\u9808\u306b\u3059\u308b\u304b\u3001\u691c\u67fb\u4e0d\u80fd\u306a\u3089\u505c\u6b62\u3059\u308b\u3002\u6b63\u78ba\u306a origin \u5224\u5b9a\u3001\u30b3\u30a2\u8a66\u9a13\u306e\u30e9\u30c3\u30d7\u3001service worker \u7981\u6b62\u306f\u6539\u5584\u3060\u304c\u3001\u3053\u308c\u3089\u306e\u7d4c\u8def\u306f\u6b8b\u308b\u3002</p> </li> <li> <p>R2-03 \u2014 P1: \u653b\u6483\u5074\u306e\u58ca\u308c\u305f\u758e\u901a\u691c\u67fb\u3092\u9694\u96e2\u306e\u8a3c\u660e\u3068\u8aa4\u8a8d\u3059\u308b\uff08r1 #4 \u306f\u4e00\u90e8\u89e3\u6d88\uff09\u3002 <code>installer/grdm_dev/redteam.py:207\u2013220</code> \u306f <code>nc</code> \u306e\u3059\u3079\u3066\u306e\u975e\u30bc\u30ed\u7d42\u4e86\u3092 <code>GRDM_REACH_FAIL</code>\u3001\u3055\u3089\u306b <code>unreachable</code> \u3068\u6271\u3046\u3002\u901a\u4fe1\u3057\u306a\u3044\u518d\u73fe\u3068\u3057\u3066\u3001\u672a\u5bfe\u5fdc\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u6a21\u3057\u305f\u7d42\u4e862\u306e <code>nc</code> \u30b9\u30bf\u30d6\u3092 PATH \u306b\u7f6e\u304d\u3001<code>/bin/sh</code> \u3067 <code>probe_script(\"192.0.2.1\", 443)</code> \u3092\u5b9f\u884c\u3057\u3066 <code>verdict</code> \u3078\u6e21\u3057\u305f\u3002\u30b7\u30a7\u30eb\u306f\u7d42\u4e860\u3067 <code>GRDM_REACH_FAIL</code> \u3092\u51fa\u3057\u3001<code>inconclusive</code> \u3067\u306a\u304f <code>unreachable</code> \u3068\u306a\u308b\u3002\u5bfe\u7167\u8a66\u9a13\u306f\u5225\u30b3\u30f3\u30c6\u30ca\u306e\u5225\u306e\u5b9f\u884c\u30d5\u30a1\u30a4\u30eb\u306a\u306e\u3067\u653b\u6483\u5074\u306e\u9053\u5177\u3092\u691c\u8a3c\u3067\u304d\u306a\u3044\u3002443\u3078\u306e HTTP \u4ee3\u66ff\u51e6\u7406\u3082\u63a5\u7d9a\u5f8c\u306b\u5931\u6557\u3057\u5f97\u308b\u3002\u65e2\u77e5\u306e TCP \u691c\u67fb\u3092\u7528\u3044\u3001\u653b\u6483\u5074\u3067\u9053\u5177\u81ea\u4f53\u306e\u52d5\u4f5c\u3092\u78ba\u8a8d\u3057\u3001\u9053\u5177\u30fb\u30d7\u30ed\u30c8\u30b3\u30eb\u306e\u7570\u5e38\u3068\u901a\u4fe1\u906e\u65ad\u3092\u533a\u5225\u3057\u3001\u4e0d\u78ba\u304b\u306a\u308953\u3092\u8fd4\u3059\u3002\u9053\u5177\u6b20\u843d\u30fb\u30de\u30fc\u30ab\u30fc\u6b20\u843d\u30fb\u5bfe\u7167\u5931\u6557\u30fb\u63a5\u7d9a\u5148\u30fb\u627f\u8a8d\u6b04\u306e\u8ffd\u52a0\u8a66\u9a13\u306f\u5408\u683c\u3057\u305f\u304c\u3001\u3053\u306e\u7d4c\u8def\u3092\u8986\u308f\u306a\u3044\u3002</p> </li> <li> <p>R2-04 \u2014 P2: \u660e\u793a\u7684\u306b\u8a31\u53ef\u3057\u305f\u5916\u5411\u304d\u901a\u4fe1\u3092 baseline \u304c\u62d2\u5426\u3059\u308b\uff08r1 #8/#2 \u306e\u7d9a\u304d\uff09\u3002 <code>installer/grdm_dev/scan.py:487\u2013489</code> \u306f\u3001\u30dd\u30fc\u30c8\u3092\u516c\u958b\u3057\u306a\u3044\u30b5\u30fc\u30d3\u30b9\u306e\u5916\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u63a5\u7d9a\u3092\u3001\u8a18\u9332\u6e08\u307f\u306e <code>GRDM_EGRESS_SERVICES</code> \u3092\u898b\u305a\u306b\u62d2\u5426\u3059\u308b\u3002\u5b9f core manifest \u3092 <code>egress=\"worker\"</code> \u3067\u751f\u6210\u3059\u308b\u3068\u7d42\u4e860\u3067\u9078\u629e\u3082\u8a18\u9332\u3055\u308c\u308b\u304c\u3001<code>check_baseline(compose_path, hardening_path, env_path)</code> \u306f <code>worker</code> \u306e <code>BASE-NETWORK</code> \u3092\u8fd4\u3057\u305f\u3002\u5916\u5411\u304d\u8a31\u53ef\u306a\u3057\u306a\u3089\u691c\u51fa0\u4ef6\u3001hardening \u4f8b\u5916\u5bfe\u7b5614\u4ef6\u3092\u53d7\u7406\u3059\u308b\u3002SPEC-03 \u00a73.2 \u306f\u8a18\u9332\u3057\u305f\u8a31\u53ef\u3092\u9055\u53cd\u3068\u3057\u306a\u3044\u3068\u660e\u8a18\u3059\u308b\u3002\u8a31\u53ef\u8a18\u9332\u3068\u5b9f\u63a5\u7d9a\u3092\u7167\u5408\u3057\u3001\u8a31\u53ef\u6e08\u307f\u306f\u901a\u3057\u3001\u672a\u7533\u544a\u306f\u62d2\u5426\u3059\u308b\u751f\u6210\u2192\u691c\u67fb\u306e\u8a66\u9a13\u3092\u8ffd\u52a0\u3059\u308b\u3002</p> </li> <li> <p>R2-05 \u2014 P2: \u5909\u66f4\u6587\u66f8\u306b\u3082\u5951\u7d04\u306e\u6b20\u843d\u30fb\u8aa4\u8a18\u304c\u3042\u308b\u3002 SPEC-01 \u306f\u65b0\u7248\u5c65\u6b74\u306b <code>build_platform</code> \u3092\u6319\u3052\u308b\u304c\u3001\u4e21\u8a00\u8a9e\u306e \u00a73 \u306e\u8868\u306b\u578b\u30fb\u8a31\u5bb9\u5024\u30fb\u4efb\u610f\u6027\u30fb\u512a\u5148\u9806\u4f4d\u306e\u5b9a\u7fa9\u304c\u306a\u3044\u3002\u65e5\u672c\u8a9e <code>integration_sha</code> \u884c\u3082\u5168\u6587\u82f1\u8a9e\u306e\u307e\u307e\u3067\u3042\u308b\u3002SPEC-02 \u00a73 \u306f\u90e8\u54c1\u304c amd64 \u3092\u9078\u3076\u3088\u3046\u306b\u306a\u3063\u3066\u3082 build \u65e2\u5b9a\u3092\u30db\u30b9\u30c8\u306e\u307f\u3068\u8a18\u3057\u3001\u30ab\u30ca\u30ea\u30a2\u306e\u30b3\u30f3\u30c6\u30ca\u30fb\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3092\u4f5c\u6210\u30fb\u524a\u9664\u3059\u308b <code>redteam preflight</code> \u3092 read-only \u3068\u3059\u308b\u3002ADR-02 \u00a73 \u306f\u516c\u958b\u30b5\u30fc\u30d3\u30b9\u306e\u4e8c\u91cd\u63a5\u7d9a\u3092\u8aac\u660e\u3059\u308b\u304c\u3001\u00a74 \u306f\u300c\u65e2\u5b9a\u3067\u306f\u5916\u5411\u304d\u901a\u4fe1\u304c\u306a\u3044\u300d\u3068\u8ff0\u3079\u308b\u3002\u305d\u306e7\u30b5\u30fc\u30d3\u30b9\u306f\u660e\u793a\u8a31\u53ef\u306a\u3057\u3067\u3082\u901a\u5e38 bridge \u306b\u63a5\u7d9a\u3059\u308b\u3002\u4e21\u8a00\u8a9e\u3092\u540c\u6642\u306b\u76f4\u3057\u3001\u5916\u3078\u901a\u4fe1\u3067\u304d\u308b\u7bc4\u56f2\u3092\u660e\u8a18\u3059\u308b\u3002\u65b0\u3057\u3044 SPEC-03 \u00a73.2/\u00a76\u3001ADR-02 \u00a73/\u00a74\u3001SPEC-02 \u306e\u5909\u66f4\u884c\u306f\u3001\u305d\u308c\u4ee5\u5916\u3067\u306f\u82f1\u548c\u306e\u610f\u5473\u304c\u5bfe\u5fdc\u3059\u308b\u304c\u3001\u7ffb\u8a33\u4e00\u81f4\u3060\u3051\u3067\u306f\u5185\u5bb9\u306e\u6b63\u3057\u3055\u306b\u306a\u3089\u306a\u3044\u3002</p> </li> </ol>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/#r1-\u516814\u4ef6\u306e\u5224\u5b9a","title":"r1 \u516814\u4ef6\u306e\u5224\u5b9a","text":"<p>\u300c\u89e3\u6d88\u300d\u306f\u5831\u544a\u3055\u308c\u305f\u30b3\u30fc\u30c9\u4e0a\u306e\u6b20\u9665\u304c\u5bfe\u8c61\u7bc4\u56f2\u3067\u76f4\u3063\u305f\u3068\u3044\u3046\u610f\u5473\u3067\u3001\u5b9f Docker \u306e\u78ba\u8a8d\u306f\u5225\u6bb5\u968e\u3067\u3042\u308b\u3002\u756a\u53f7\u306f r1 \u3068\u540c\u3058\u3002</p> r1 r2 \u5224\u5b9a \u8a3c\u62e0 1 \u30b3\u30fc\u30c9\u30fb\u8a66\u9a13\u4e0a\u89e3\u6d88 PostgreSQL/RabbitMQ \u306e\u5b9f\u52b9\u66f4\u65b0\u3001\u65b0\u65e7\u8a8d\u8a3c\u78ba\u8a8d\u3001\u5f37\u5236\u518d\u4f5c\u6210\u3078\u5909\u66f4\u3002RabbitMQ \u5931\u6557\u6ce8\u5165\u306740\u3092\u8fd4\u3057 <code>.env</code> \u3068 PostgreSQL \u306e\u6a21\u64ec\u5024\u3092\u65e7\u5024\u3078\u5fa9\u5143\u3002\u518d\u4f5c\u6210\u5f8c health \u5931\u6557\u306e\u5fa9\u65e7\u8a66\u9a13\u3082\u5408\u683c\u3002\u5b9f DB \u306f\u672a\u78ba\u8a8d\u3002 2 \u5143\u306e\u518d\u73fe\u306f\u89e3\u6d88 <code>user: 0:0</code> \u306f <code>BASE-USER</code>\u3002\u5b9f core \u751f\u6210\u306f\u691c\u51fa0\u3001\u4f8b\u5916\u5bfe\u7b5614\u4ef6\u53d7\u7406\u3002\u74b0\u5883\u30d5\u30a1\u30a4\u30eb\u306e\u6a29\u9650\u30fb\u65e2\u5b9a\u5024\u30fb\u4f8b\u5916\u30fb\u671f\u9650\u3082\u8a66\u9a13\u6e08\u307f\u3002\u660e\u793a egress \u306f R2-04\u3002 3 \u89e3\u6d88 \u6240\u6709\u8005\u306a\u3057\u306e <code>LISTEN 0 4096 0.0.0.0:5000 0.0.0.0:*</code> \u306f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30dd\u30fc\u30c8\u9055\u53cd\u3002\u5bfe\u5fdc\u30b3\u30de\u30f3\u30c9\u8a66\u9a13\u306f40\u3002inspect/ps \u306e\u516c\u958b\u5148\u3068\u9053\u5177\u5931\u6557\u306e\u8a66\u9a13\u3082\u5408\u683c\u3002 4 \u4e00\u90e8\u89e3\u6d88 \u5b9f\u653b\u6483\u5074\u306e\u63a5\u7d9a\u7db2\u30fb\u30ab\u30ca\u30ea\u30a2\u5bfe\u7167\u30fb\u627f\u8a8d\u7bc4\u56f2\u3068\u65e5\u4ed8\u3092\u8ffd\u52a0\u3002\u4e0d\u78ba\u304b\u306a\u5834\u5408\u306e\u8a66\u9a13\u306f53\u3002\u58ca\u308c\u305f\u9053\u5177\u306f R2-03\u3002 5 \u5831\u544a\u3057\u305f\u7d4c\u8def\u306f\u89e3\u6d88 Semgrep \u7d42\u4e862\uff0berrors \u306f incomplete/51\u3002\u30ed\u30fc\u30ab\u30eb4\u30d1\u30c3\u30af\u3001\u5168 Compose \u30a4\u30e1\u30fc\u30b8\u3001\u7d71\u5408\u30bd\u30fc\u30b9\u306e filesystem\u3001SBOM \u5931\u6557\u3001\u30a4\u30e1\u30fc\u30b8\u691c\u67fb\u5931\u6557\u3092\u8a66\u9a13\u3002 6 \u4e00\u90e8\u89e3\u6d88 \u30ed\u30b0\u30fb\u7d50\u679c\u30c6\u30ad\u30b9\u30c8\u30fbseed/cleanup \u51fa\u529b\u306e\u5408\u6210\u79d8\u5bc6\u3092\u30de\u30b9\u30af\u3057\u3001\u6240\u6709\u8005\u9650\u5b9a\u6a29\u9650\u3082\u5408\u683c\u3002trace ZIP \u306f R2-01\u3002 7 \u4e00\u90e8\u89e3\u6d88 \u6b63\u78ba\u306a origin \u3068 API/browser \u306e\u30ac\u30fc\u30c9\u8ffd\u52a0\u3002\u8ee2\u9001\u3068 WebSocket \u906e\u65ad\u6b20\u843d\u306f R2-02\u3002 8 \u4e00\u90e8\u89e3\u6d88 <code>grdm.internal: true</code> \u3092\u751f\u6210\u3057\u3001\u516c\u958b\u30b5\u30fc\u30d3\u30b9\u306f\u4ed5\u69d8\u6539\u5b9a\u3069\u304a\u308a <code>grdm-edge</code> \u306b\u3082\u63a5\u7d9a\u3002\u660e\u793a egress \u3068\u6587\u66f8\u306f R2-04/R2-05\u3002 9 \u89e3\u6d88 \u975e\u516c\u958b URL \u76f4\u66f8\u304d\u3092\u9664\u53bb\u3002\u5171\u6709 checkout \u3068 CI \u306e manifest/\u975e\u516c\u958b URL \u65b9\u91dd\u691c\u67fb\u5408\u683c\u3002 10 \u89e3\u6d88 \u81ea\u8eab\u306e web \u304c5000\u4f7f\u7528\u4e2d\u3067\u3082\u518d\u751f\u6210\u5f8c\u306f <code>127.0.0.1:5000:5000</code>\u3002\u4ed6\u30d7\u30ed\u30bb\u30b9\u306e\u885d\u7a81\u30fb\u518d\u5272\u5f53\u8a66\u9a13\u3082\u5408\u683c\u3002 11 \u89e3\u6d88 push \u5f15\u6570\u306e\u30bf\u30b0\u306f <code>ghcr.io/rcosdp/web:abc123</code> \u306e\u4e00\u3064\u3067\u3001\u30ed\u30fc\u30ab\u30eb\u30bf\u30b0\u306e\u9001\u4fe1\u5148\u306a\u3057\u3002load \u5f62\u5f0f\u306e\u8a66\u9a13\u3082\u5408\u683c\u3002 12 \u5831\u544a\u3057\u305f\u7d4c\u8def\u306f\u89e3\u6d88 pytest \u524d\u306e health\u3001Chromium \u5b9f\u4f53\u3001\u7d50\u679c0\u884c\u30fb\u62d2\u5426\u884c\u6b20\u843d\u306e\u5931\u6557\u3092\u78ba\u8a8d\u3002C2 \u5b9f\u6a29\u9650\u3001C3 \u30ed\u30b0\u30a4\u30f3\u6e08\u307f\u975e\u53c2\u52a0\u8005\u3001C4 \u53cc\u65b9\u5411\u3001C6 API 403 \u3092\u8981\u6c42\u3002\u5b9f\u30bb\u30ec\u30af\u30bf\u30fb\u7d71\u5408\u306f\u7b2c\u4e8c\u6bb5\u968e\u3002 13 \u89e3\u6d88 \u4e00\u6642\u9818\u57df\u3078\u975e editable \u5c0e\u5165\u3057\u3001checkout \u5916\u3067\u540c\u68b1 acceptance \u3092\u89e3\u6c7a\u3002\u30b7\u30ca\u30ea\u30aa11\u30d5\u30a1\u30a4\u30eb\u3001conftest\u3001pytest.ini \u3092\u78ba\u8a8d\u3002 14 \u5143\u306e\u30ea\u30f3\u30af\u30fb\u691c\u67fb\u5931\u6557\u306f\u89e3\u6d88 \u5fc5\u9808\u6587\u66f8\u691c\u67fb\u5408\u683c\u3002\u6307\u5b9a head \u306e Semgrep CI \u306f\u5931\u6557\u3057\u305f\u304c\u3001\u8ffd\u88dc <code>1c2a925</code> \u306f6\u30b8\u30e7\u30d6\u3059\u3079\u3066\u5408\u683c\u3002\u65b0\u305f\u306a\u6587\u66f8\u6b20\u9665\u306f R2-05\u3002"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/#\u691c\u8a3c\u3068\u6587\u66f8\u8a3c\u8de1","title":"\u691c\u8a3c\u3068\u6587\u66f8\u8a3c\u8de1","text":"<p>\u5b9f\u6e2c\u3067\u3042\u308a manifest \u6b63\u672c\u306e\u8ee2\u8f09\u3067\u306f\u306a\u3044\u3002TOON \u306f\u69cb\u9020\u5316\u30c7\u30fc\u30bf\u3092\u77ed\u304f\u8868\u3059\u6587\u5b57\u5f62\u5f0f\u3067\u3042\u308b\u3002</p> <pre><code>checks[7]{check,result}:\n pinned_installer_tests,\"3149c76 \u3067247\u4ef6; OK\"\n pinned_docs_check,\"\u5408\u683c; 51\u691c\u67fb; 8\u9664\u5916; 126\u8b66\u544a\"\n shared_installer_tests,\"247\u4ef6; OK\"\n shared_docs_check,\"\u672c\u30ec\u30d3\u30e5\u30fc\u8ffd\u52a0\u524d\u306b\u5408\u683c; 51\u691c\u67fb; 8\u9664\u5916; 126\u8b66\u544a\"\n installed_package,\"\u975e editable \u5c0e\u5165\u6210\u529f; \u30b7\u30ca\u30ea\u30aa11\u30d5\u30a1\u30a4\u30eb\u3068 conftest\u30fbpytest.ini\"\n requested_head_ci,\"5\u5408\u683c; Semgrep\u5931\u6557\"\n followup_head_ci,\"1c2a925: 6\u4ef6\u3059\u3079\u3066\u5408\u683c\"</code></pre> <p>\u30ea\u30dd\u30b8\u30c8\u30ea root \u304b\u3089\u5b9f\u884c\u3057\u3001\u671f\u5f85\u5024\u306f\u7d42\u4e860\u3002\u5358\u4f53\u30c6\u30b9\u30c8\u306f\u5916\u90e8\u5b9f\u884c\u3092\u6a21\u64ec\u3059\u308b\u305f\u3081 Docker \u306e\u72b6\u614b\u3092\u5909\u66f4\u3057\u306a\u3044\u3002</p> <pre><code>PYTHONPATH=installer python3 -m unittest discover -s installer/tests\npython3 tools/docs_check.py\npython3 tools/manifest_check.py\npython3 -m unittest discover -s tools/tests\ngh pr checks 21 --repo RCOSDP/RDM-developer-guide\n</code></pre> <p>\u5171\u6709 checkout \u306e tools \u30c6\u30b9\u30c8\u308266\u4ef6\u3059\u3079\u3066\u5408\u683c\u3057\u3001manifest/\u975e\u516c\u958b URL \u65b9\u91dd\u691c\u67fb\u306f\u691c\u51fa0\u4ef6\u3067\u5408\u683c\u3057\u305f\u3002<code>gh api</code> \u3067\u53d6\u5f97\u3057\u305f Playwright 1.47 \u306e\u751f\u6210 API \u306b <code>route_web_socket</code> \u30e1\u30bd\u30c3\u30c9\u304c\u306a\u3044\u3053\u3068\u3082\u78ba\u8a8d\u3057\u305f\u3002</p> <p>\u5143\u306e Semgrep \u5931\u6557\u306f0700\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u6a29\u96502\u7b87\u6240\u3068\u5408\u6210 JWT \u30ea\u30c6\u30e9\u30eb1\u7b87\u6240\u3067\u3042\u308b\u3002\u6a29\u9650\u3092\u7de9\u3081\u3066\u76f4\u3059\u3079\u304d\u3067\u306f\u306a\u304f\u3001\u8ffd\u88dc\u306f\u6839\u62e0\u4ed8\u304d\u9664\u5916\u3068\u30c6\u30b9\u30c8\u6587\u5b57\u5217\u306e\u69cb\u7bc9\u3092\u4f7f\u7528\u3059\u308b\u3002\u6307\u5b9a head \u306e CI \u3068 \u8ffd\u88dc CI \u306f\u5225\u306e\u8a3c\u8de1\u3067\u3042\u308b\u3002</p> <p>\u30d1\u30c3\u30b1\u30fc\u30b8\u8a66\u9a13\u304c\u4e00\u6642\u30a2\u30fc\u30ab\u30a4\u30d6\u5185\u306b <code>installer/build/</code> \u3092\u4f5c\u308a\u3001\u305d\u306e\u4e00\u6642\u9818\u57df\u306e\u6587\u66f8\u691c\u67fb\u304c\u8ffd\u52a0\u3067\u5931\u6557\u3057\u305f\u3002\u305d\u306e\u751f\u6210\u7269\u3060\u3051\u3092\u9664\u53bb\u3057\u3066\u518d\u5b9f\u884c\u3057\u300151\u4ef6\u691c\u67fb\u30fb\u30a8\u30e9\u30fc0\u3068\u306a\u3063\u305f\u3002\u30a2\u30fc\u30ab\u30a4\u30d6\u306b\u306f Git \u60c5\u5831\u304c\u306a\u3044\u306e\u3067\u975e\u516c\u958b URL \u65b9\u91dd\u691c\u67fb\u3092\u5b9f\u884c\u3067\u304d\u305a\u3001\u5b9f checkout \u3068 CI \u306e\u691c\u67fb\u3092\u8a3c\u62e0\u3068\u3057\u305f\u3002\u3053\u306e\u691c\u8a3c\u4f5c\u696d\u306e\u751f\u6210\u7269\u306b\u3088\u308b\u5931\u6557\u3092 PR \u306e\u6b20\u9665\u3068\u306f\u6271\u308f\u306a\u3044\u3002\u672a\u8ffd\u8de1\u306e\u65b0\u30ec\u30d3\u30e5\u30fc\u81ea\u4f53\u3082 <code>docs_check.check_file</code> \u3078\u76f4\u63a5\u6e21\u3057\u3001\u30a8\u30e9\u30fc0\u3092\u78ba\u8a8d\u3057\u305f\u3002\u8ffd\u8de1\u6e08\u307f\u30d5\u30a1\u30a4\u30eb\u3060\u3051\u3092\u898b\u308b\u901a\u5e38\u30b3\u30de\u30f3\u30c9\u306b\u306f\u542b\u307e\u308c\u306a\u3044\u305f\u3081\u3067\u3042\u308b\u3002</p> <p>DEMO-20 \u7b2c1\u56de\u306f\u3001\u82f1\u548c\u3067\u30b3\u30de\u30f3\u30c9\u30fb\u30db\u30b9\u30c8\u60c5\u5831\u30fb5\u6bb5\u968e\u306e\u7d50\u679c\u30fb3\u30a4\u30e1\u30fc\u30b8\u306e\u7d50\u679c\u304c\u4e00\u81f4\u3059\u308b\u3002\u8d77\u52d5\u524d\u306e\u7d42\u4e8630\u3068\u660e\u8a18\u3057\u3001\u5c0e\u5165\u5b8c\u4e86\u3068\u8aa4\u8a18\u3057\u3066\u3044\u306a\u3044\u3002build \u306e\u5236\u5fa1\u3082\u6700\u521d\u306e\u5931\u6557\u3067\u6b62\u307e\u308b\u3002\u305f\u3060\u3057\u5168\u30ed\u30b0\u306f\u4f5c\u8005\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u4f5c\u696d\u9818\u57df\u306b\u3057\u304b\u306a\u304f\u3001\u30db\u30b9\u30c8\u5b9f\u6e2c\u30fb\u30b5\u30a4\u30ba\u30fb\u30d1\u30c3\u30b1\u30fc\u30b8\u5931\u6557\u3092\u672c\u30ec\u30d3\u30e5\u30fc\u3067\u72ec\u7acb\u518d\u78ba\u8a8d\u3057\u305f\u308f\u3051\u3067\u306f\u306a\u3044\u3002mfr \u306e\u5931\u6557\u3060\u3051\u3067\u306f ember/cas \u306e arm64 \u4e0d\u53ef\u3084 amd64 \u6210\u529f\u3092\u8a3c\u660e\u3057\u306a\u3044\u3002\u307e\u305f\u300cruntime \u306b\u30d3\u30eb\u30c9\u6e08\u307f\u30a4\u30e1\u30fc\u30b82\u3064\u300d\u306f Docker \u306e\u30a4\u30e1\u30fc\u30b8\u4fdd\u7ba1\u5834\u6240\u3068 runtime \u306e\u30d5\u30a1\u30a4\u30eb\u3092\u533a\u5225\u3059\u3079\u304d\u3067\u3042\u308b\u3002\u7b2c2\u56de\u3084 M2 \u53d7\u5165\u5b8c\u4e86\u306f\u8a8d\u5b9a\u3057\u3066\u3044\u306a\u3044\u3002</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/#\u5fc5\u8981\u306a\u6b21\u306e\u4f5c\u696d","title":"\u5fc5\u8981\u306a\u6b21\u306e\u4f5c\u696d","text":"<p>R2-01\u301cR2-05 \u3092\u76f4\u3057\u3001\u5931\u6557\u7d4c\u8def\u3092\u901a\u308b\u8a66\u9a13\u3092\u52a0\u3048\u3066\u3001\u305d\u306e head \u3092\u518d\u30ec\u30d3\u30e5\u30fc\u3059\u308b\u3002\u5b9f\u5c0e\u5165\u30fbbuild\u30fb\u8d77\u52d5\u3001\u521d\u671f\u5316\u6e08\u307f DB \u306e\u65e7\u8a8d\u8a3c\u62d2\u5426\u3001\u30d6\u30e9\u30a6\u30b6 C1\u301cC6\u3001\u5b9f\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u6319\u52d5\u306f\u7b2c\u4e8c\u6bb5\u968e\u306e\u8a3c\u8de1\u3068\u3059\u308b\u3002M3 \u5411\u3051 skip \u3068 upstream \u306e\u672a\u5b9f\u88c5\u5165\u53e3\u306f\u53d7\u5165\u5b8c\u4e86\u3067\u306f\u306a\u3044\u3002\u672c\u30ec\u30d3\u30e5\u30fc\u306f\u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u5b9f\u884c\u3084\u30de\u30fc\u30b8\u306e\u627f\u8a8d\u3067\u306f\u306a\u3044\u3002</p>"},{"location":"reviews/2026-11-05_RDM-developer-guide_PR21_Installer_r2/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Baseline Checks that every installation must pass. \u3059\u3079\u3066\u306e\u5c0e\u5165\u304c\u901a\u308b\u5fc5\u9808\u691c\u67fb\u3002 Trace A saved record of browser actions and network exchanges. \u30d6\u30e9\u30a6\u30b6\u64cd\u4f5c\u3068\u901a\u4fe1\u3092\u4fdd\u5b58\u3057\u305f\u8a18\u9332\u3002 Origin The exact scheme, host and port of a URL. URL \u306e\u65b9\u5f0f\u30fb\u30db\u30b9\u30c8\u30fb\u30dd\u30fc\u30c8\u306e\u7d44\u5408\u305b\u3002 Canary / control A known reachable target used to check the probe itself. \u691c\u67fb\u81ea\u4f53\u304c\u52d5\u304f\u304b\u78ba\u304b\u3081\u308b\u65e2\u77e5\u306e\u63a5\u7d9a\u5148\u3002 Rollback Restore the previous working values after a failure. \u5931\u6557\u5f8c\u306b\u4ee5\u524d\u306e\u5024\u3078\u623b\u3059\u51e6\u7406\u3002 CI Automatic checks run for a proposed code change. \u5909\u66f4\u6848\u306b\u5bfe\u3057\u3066\u81ea\u52d5\u3067\u5b9f\u884c\u3059\u308b\u691c\u67fb\u3002 SBOM A list of the software parts in an image or project. \u30a4\u30e1\u30fc\u30b8\u3084\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u5165\u308b\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u90e8\u54c1\u306e\u4e00\u89a7\u3002"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1/","title":"PR #1 public develop merge \u2014 REV review r1 / \u516c\u958b develop \u7d71\u5408\u30ec\u30d3\u30e5\u30fc","text":"<p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <p>Version: 0.1 \u2014 2026-11-05</p> <p>Learned / \u5206\u304b\u3063\u305f\u3053\u3068: the merge preserves both upstream histories and the private tree outside two public files; conflict-free integration does not establish test correctness or compliance with the documented integration order.</p> <p>Reviewer: REV\uff08\u62c5\u5f53\u30ec\u30d3\u30e5\u30ef, Codex Astra\uff09</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: review r1 of RDM-osf.io-dev2027 PR #1 by REV (Codex Astra); header lines added by QAE for SPEC-06 compliance, body unchanged. \uff0f REV\uff08Codex Astra\uff09\u306b\u3088\u308b PR #1 \u306e\u30ec\u30d3\u30e5\u30fc r1\u3002\u898b\u51fa\u3057\u884c\u306f SPEC-06 \u6e96\u62e0\u306e\u305f\u3081 QAE \u304c\u8ffd\u52a0\u3057\u3001\u672c\u6587\u306f\u5909\u66f4\u3057\u3066\u3044\u306a\u3044\u3002</li> <li>Related: docs/reviews/README.md \u00b7 ADR-04 AI Autonomy and Roles \u00b7 SPEC-01 Manifest</li> </ul> <p></p>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1/#english","title":"English","text":""},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1/#verdict-request-changes","title":"Verdict: request changes","text":"<p>Reviewed repository <code>RCOSDP/RDM-osf.io-dev2027</code>, PR #1, head <code>546969eb33f42e35be5dc5c5ac8bfe55e3ef0bbc</code>. This is a review recommendation, not a submitted approval or merge. No production-code regression or loss of private hardening was found in the two-file delta. Resolve R1 and R2 before merging; R3 is an owner disclosure decision.</p>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1/#findings-ranked-by-severity","title":"Findings, ranked by severity","text":"<ol> <li>R1 \u2014 Medium (P2): the new anonymous API 2.10 test supplies authentication. At head, <code>api_tests/users/views/test_user_detail.py:260\u2013262</code>, <code>test_social_values_old_version_not_logged_in</code> passes <code>auth=user_one</code> while expecting 401. The same test's 2.9 request at lines 256\u2013258 omits authentication; successful authenticated requests at lines 234\u2013248 use <code>user_one.auth</code>. Consequently the 2.10 case is not a clean test of absent credentials: rejection of the supplied authentication can satisfy the assertion, or helper handling can fail before the intended assertion. Remove the <code>auth</code> argument and run both versions' anonymous and authenticated cases. This defect originates in public commit <code>3243fd7</code>; preserve that history and add a follow-up fix. Runtime failure is not claimed: the test suite was not executed.</li> <li>R2 \u2014 Medium (P2): the stated integration order does not describe the actual topology. PR body \u201c\u5185\u5bb9\u201d item 2 and merge commit body line 4 claim the SPEC-01 public \u2192 private \u2192 adopted-PR order. However the first parent is the already-private tip <code>3f4c9cd</code>, and the second is newer public tip <code>bacfe64</code>. SPEC-01 \u00a74 rule 3 fixes the order. This is a private-seeded incremental public merge, not a literal execution of that recipe. The non-overlap makes the resulting content safe from a private/public conflict in this instance, but does not resolve the policy statement. Correct the PR explanation and record the owner's accepted bootstrap/incremental interpretation or exception in documentation; if strict reconstruction is required, propose it separately without rewriting or force-pushing upstream history. An additional commit can clarify the historical commit's assertion without amending it.</li> <li>R3 \u2014 Low (P3): a conversation-session URL is retained in metadata. PR body line 14 and merge commit body line 8 (<code>Claude-Session</code>) contain a link to an individual AI session. It is not a private repository URL, and no access token or password was found in the inspected PR metadata/delta. The session's contents and access controls were not inspected, so it is not proven to expose secrets. The owner should decide whether this provenance link belongs in durable metadata; remove it from the editable PR body if unnecessary. Do not reproduce the URL in public review records or rewrite history merely to remove a non-secret reference.</li> </ol>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1/#verification-and-evidence","title":"Verification and evidence","text":"<ul> <li>Read <code>gh pr view 1 -R RCOSDP/RDM-osf.io-dev2027 --json title,body,commits,files</code> (also head/base SHA) and <code>gh pr diff 1 -R RCOSDP/RDM-osf.io-dev2027</code>.</li> <li><code>gh api repos/RCOSDP/RDM-osf.io-dev2027/commits/546969eb33f42e35be5dc5c5ac8bfe55e3ef0bbc</code> confirms exactly two parents: <code>3f4c9cd32e2e118f42a6b5aacbe2a5ff066a8a38</code> and <code>bacfe64fdc002f09df47145fc17f57630772ac82</code>. This is a real merge, not a squash. The three public commits retain their original SHAs: <code>5f78e37d591986ace4d241c992c1454e8af0a632</code> (permission), <code>3243fd7943428cb5e0c1f3a741b354dfa1369bdb</code> (tests), and <code>bacfe64fdc002f09df47145fc17f57630772ac82</code> (public PR merge). Historical force-push activity cannot be established from this snapshot alone.</li> <li>The requested compare endpoint <code>compare/upstream/public-develop...upstream/private-develop</code> reports divergence: private ahead 161, behind 3, common ancestor <code>b7eacc4c2f2a50f72f3489fc9c3d105b46ea8108</code>. Its 260 changed files do not include either incoming file; thus there is no net file overlap, including private security changes. This checks net changes, not every transient edit in 161 commits.</li> <li>Compared the pinned private tip \u2192 PR head against common ancestor \u2192 pinned public tip using the compare API. Both return exactly <code>api/users/views.py</code> and <code>api_tests/users/views/test_user_detail.py</code>; both patches and final blob SHAs match. No other private-base files change. This establishes preservation of the private tree, including hardening outside these files, rather than relying only on the PR's \u201cno conflicts\u201d claim.</li> <li><code>api/users/views.py:177\u2013184</code> requires authentication while retaining current-user/write and token-scope permissions. Inspected the test changes, <code>api_tests/conftest.py:10\u201311</code>, and <code>tests/json_api_test_app.py:41\u201351</code> to identify the test application. Authenticated cross-user access remains tested in <code>test_get</code>.</li> <li>The new integration commit uses a scoped Japanese <code>merge(upstream):</code> subject and includes reason, validation, and the explicit deferral of build/acceptance to M2. These requested convention elements are present; R2 concerns factual accuracy. Existing English upstream subjects should not be rewritten to enforce local style.</li> <li>Manually inspected all four PR commit messages, PR body and two-file patch for secrets/credentials/private URLs. Found the session reference described in R3, no obvious credential and no private repository URL. This is not a full-history or automated secret scan.</li> <li>GitHub checks at inspection: JavaScript/TypeScript CodeQL passed; Python CodeQL and two <code>build-image</code> jobs were pending. No local build, application test, or acceptance test was run. Pending checks are not passes, and static tree preservation is not proof of runtime compatibility.</li> </ul>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1/#owner-decisions-before-merge","title":"Owner decisions before merge","text":"<p>Require R1's follow-up test correction and targeted execution evidence. Resolve R2's integration-order interpretation and accurately document it without rewriting upstream history. Decide R3's session-link retention and whether to accept deferring broader build/acceptance testing to M2; obtain the final required CI results. Explicitly accept that anonymous user-detail reads, including view-only-link requests, are now denied; validate dependent clients at M2. Preserve both upstream histories with a normal merge, not squash/rebase. This review makes no changes to the reviewed repository beyond the single requested PR comment.</p> <p></p>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":""},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1/#\u5224\u5b9a-request-changes\u4fee\u6b63\u8981\u6c42","title":"\u5224\u5b9a: request changes\uff08\u4fee\u6b63\u8981\u6c42\uff09","text":"<p>\u5bfe\u8c61\u306f <code>RCOSDP/RDM-osf.io-dev2027</code> PR #1\u3001head <code>546969eb33f42e35be5dc5c5ac8bfe55e3ef0bbc</code>\u3002\u3053\u308c\u306f\u30ec\u30d3\u30e5\u30fc\u4e0a\u306e\u63a8\u5968\u5224\u5b9a\u3067\u3042\u308a\u3001\u627f\u8a8d\u3084\u30de\u30fc\u30b8\u64cd\u4f5c\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u30022\u30d5\u30a1\u30a4\u30eb\u306e\u5dee\u5206\u304b\u3089\u3001\u672c\u756a\u30b3\u30fc\u30c9\u306e\u56de\u5e30\u3084\u975e\u516c\u958b\u5074\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5909\u66f4\u306e\u6d88\u5931\u306f\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30de\u30fc\u30b8\u524d\u306b R1\u30fbR2 \u3092\u89e3\u6c7a\u3057\u3001R3 \u306f\u6240\u6709\u8005\u304c\u60c5\u5831\u516c\u958b\u306e\u89b3\u70b9\u304b\u3089\u5224\u65ad\u3057\u3066\u304f\u3060\u3055\u3044\u3002</p>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1/#\u91cd\u8981\u5ea6\u9806\u306e\u6307\u6458","title":"\u91cd\u8981\u5ea6\u9806\u306e\u6307\u6458","text":"<ol> <li>R1 \u2014 \u4e2d\uff08P2\uff09: \u672a\u30ed\u30b0\u30a4\u30f3\u306e API 2.10 \u8a66\u9a13\u306b\u8a8d\u8a3c\u5f15\u6570\u304c\u6b8b\u3063\u3066\u3044\u307e\u3059\u3002 head \u306e <code>api_tests/users/views/test_user_detail.py:260\u2013262</code> \u306f <code>test_social_values_old_version_not_logged_in</code> \u3067 <code>auth=user_one</code> \u3092\u6e21\u3057\u3001401 \u3092\u671f\u5f85\u3057\u3066\u3044\u307e\u3059\u3002\u540c\u3058\u8a66\u9a13\u306e 2.9\uff08256\u2013258\u884c\uff09\u306f\u8a8d\u8a3c\u306a\u3057\u3001\u8a8d\u8a3c\u6210\u529f\u30b1\u30fc\u30b9\uff08234\u2013248\u884c\uff09\u306f <code>user_one.auth</code> \u3067\u3059\u30022.10 \u306f\u8cc7\u683c\u60c5\u5831\u304c\u5b58\u5728\u3057\u306a\u3044\u5834\u5408\u306e\u7d14\u7c8b\u306a\u8a66\u9a13\u306b\u306a\u3063\u3066\u304a\u3089\u305a\u3001\u6e21\u3057\u305f\u8a8d\u8a3c\u306e\u62d2\u5426\u3067\u3082\u671f\u5f85\u5024\u3092\u6e80\u305f\u3059\u3001\u307e\u305f\u306f\u30d8\u30eb\u30d1\u30fc\u306e\u6271\u3044\u306b\u3088\u3063\u3066\u691c\u8a3c\u524d\u306b\u5931\u6557\u3059\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002<code>auth</code> \u5f15\u6570\u3092\u9664\u53bb\u3057\u3001\u4e21\u30d0\u30fc\u30b8\u30e7\u30f3\u306e\u672a\u8a8d\u8a3c\u30fb\u8a8d\u8a3c\u6e08\u307f\u30b1\u30fc\u30b9\u3092\u5b9f\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u516c\u958b\u30b3\u30df\u30c3\u30c8 <code>3243fd7</code> \u7531\u6765\u306a\u306e\u3067\u3001\u305d\u306e\u5c65\u6b74\u3092\u4fdd\u6301\u3057\u3066\u8ffd\u52a0\u30b3\u30df\u30c3\u30c8\u3067\u4fee\u6b63\u3057\u307e\u3059\u3002\u8a66\u9a13\u672a\u5b9f\u884c\u306e\u305f\u3081\u3001\u5b9f\u884c\u6642\u306e\u5931\u6557\u3092\u65ad\u5b9a\u3059\u308b\u3082\u306e\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002</li> <li>R2 \u2014 \u4e2d\uff08P2\uff09: \u8aac\u660e\u3059\u308b\u7d71\u5408\u9806\u3068\u5b9f\u969b\u306e\u5c65\u6b74\u304c\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002 PR\u672c\u6587\u300c\u5185\u5bb9\u300d\u306e2\u9805\u76ee\u3068\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u672c\u65874\u884c\u76ee\u306f SPEC-01 \u306e\u516c\u958b \u2192 \u975e\u516c\u958b \u2192 \u63a1\u7528PR \u306e\u9806\u3092\u4e3b\u5f35\u3057\u3066\u3044\u307e\u3059\u3002\u3057\u304b\u3057\u7b2c1\u89aa\u306f\u65e2\u306b\u975e\u516c\u958b\u5074\u3092\u542b\u3080 <code>3f4c9cd</code>\u3001\u7b2c2\u89aa\u304c\u65b0\u3057\u3044\u516c\u958b\u5074 <code>bacfe64</code> \u3067\u3059\u3002SPEC-01 \u00a74 \u898f\u52473 \u306e\u624b\u9806\u3092\u6587\u5b57\u3069\u304a\u308a\u5b9f\u65bd\u3057\u305f\u5f62\u3067\u306f\u306a\u304f\u3001\u975e\u516c\u958b\u5074\u8d77\u70b9\u306e\u5897\u5206\u516c\u958b\u30de\u30fc\u30b8\u3067\u3059\u3002\u4eca\u56de\u306f\u5dee\u5206\u30d5\u30a1\u30a4\u30eb\u304c\u91cd\u306a\u3089\u305a\u975e\u516c\u958b\u30fb\u516c\u958b\u9593\u306e\u7af6\u5408\u306b\u3088\u308b\u6d88\u5931\u306f\u3042\u308a\u307e\u305b\u3093\u304c\u3001\u898f\u5247\u3068\u306e\u8aac\u660e\u4e0a\u306e\u4e0d\u4e00\u81f4\u306f\u6b8b\u308a\u307e\u3059\u3002PR\u8aac\u660e\u3092\u8a02\u6b63\u3057\u3001\u521d\u671f\u5316\u30fb\u5897\u5206\u66f4\u65b0\u3068\u3057\u3066\u8a8d\u3081\u308b\u89e3\u91c8\u307e\u305f\u306f\u4f8b\u5916\u3092\u6240\u6709\u8005\u5224\u65ad\u3068\u3057\u3066\u6587\u66f8\u5316\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u53b3\u5bc6\u306a\u518d\u69cb\u7bc9\u304c\u5fc5\u8981\u306a\u3089\u3001\u4e0a\u6d41\u5c65\u6b74\u306e\u66f8\u63db\u3048\u3084 force-push \u3092\u305b\u305a\u5225\u9014\u63d0\u6848\u3057\u307e\u3059\u3002\u904e\u53bb\u30b3\u30df\u30c3\u30c8\u306e\u8aac\u660e\u306f amend \u3067\u306f\u306a\u304f\u8ffd\u52a0\u30b3\u30df\u30c3\u30c8\u3067\u88dc\u8db3\u3067\u304d\u307e\u3059\u3002</li> <li>R3 \u2014 \u4f4e\uff08P3\uff09: \u4f1a\u8a71\u30bb\u30c3\u30b7\u30e7\u30f3\u3078\u306eURL\u304c\u30e1\u30bf\u30c7\u30fc\u30bf\u306b\u3042\u308a\u307e\u3059\u3002 PR\u672c\u658714\u884c\u76ee\u3001\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u672c\u65878\u884c\u76ee\u306e <code>Claude-Session</code> \u306b\u500b\u5225AI\u30bb\u30c3\u30b7\u30e7\u30f3\u3078\u306e\u30ea\u30f3\u30af\u304c\u3042\u308a\u307e\u3059\u3002\u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30eaURL\u3067\u306f\u306a\u304f\u3001\u691c\u67fb\u3057\u305f\u30e1\u30bf\u30c7\u30fc\u30bf\u30fb\u5dee\u5206\u306b\u306f\u30a2\u30af\u30bb\u30b9\u30c8\u30fc\u30af\u30f3\u3084\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30bb\u30c3\u30b7\u30e7\u30f3\u5185\u5bb9\u3068\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u306f\u78ba\u8a8d\u3057\u3066\u3044\u306a\u3044\u305f\u3081\u3001\u79d8\u5bc6\u6f0f\u3048\u3044\u3068\u306f\u65ad\u5b9a\u3057\u307e\u305b\u3093\u3002\u6240\u6709\u8005\u306f\u6c38\u7d9a\u30e1\u30bf\u30c7\u30fc\u30bf\u306b\u6b8b\u3059\u5fc5\u8981\u6027\u3092\u5224\u65ad\u3057\u3001\u4e0d\u8981\u306a\u3089\u7de8\u96c6\u53ef\u80fd\u306aPR\u672c\u6587\u304b\u3089\u9664\u53bb\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u516c\u958b\u30ec\u30d3\u30e5\u30fc\u8a18\u9332\u306bURL\u3092\u8ee2\u8f09\u305b\u305a\u3001\u79d8\u5bc6\u3067\u306a\u3044\u53c2\u7167\u3092\u6d88\u3059\u3060\u3051\u306e\u76ee\u7684\u3067\u5c65\u6b74\u3092\u66f8\u304d\u63db\u3048\u306a\u3044\u3067\u304f\u3060\u3055\u3044\u3002</li> </ol>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1/#\u78ba\u8a8d\u65b9\u6cd5\u3068\u6839\u62e0","title":"\u78ba\u8a8d\u65b9\u6cd5\u3068\u6839\u62e0","text":"<ul> <li>\u6307\u5b9a\u3055\u308c\u305f <code>gh pr view</code>\uff08title/body/commits/files\u3001\u8ffd\u52a0\u3067 head/base SHA\uff09\u3068 <code>gh pr diff</code> \u3092\u78ba\u8a8d\u3057\u307e\u3057\u305f\u3002</li> <li>head \u306e\u30b3\u30df\u30c3\u30c8API\u304c\u8fd4\u3057\u305f\u89aa\u306f <code>3f4c9cd32e2e118f42a6b5aacbe2a5ff066a8a38</code> \u3068 <code>bacfe64fdc002f09df47145fc17f57630772ac82</code> \u306e2\u3064\u3067\u3059\u3002squash \u3067\u306f\u306a\u304f\u771f\u306e\u30de\u30fc\u30b8\u3067\u3059\u3002\u516c\u958b\u5074\u306e\u6a29\u9650\u4fee\u6b63 <code>5f78e37d591986ace4d241c992c1454e8af0a632</code>\u3001\u8a66\u9a13\u4fee\u6b63 <code>3243fd7943428cb5e0c1f3a741b354dfa1369bdb</code>\u3001\u516c\u958bPR\u30de\u30fc\u30b8 <code>bacfe64fdc002f09df47145fc17f57630772ac82</code> \u306f\u5143\u306eSHA\u3067\u4fdd\u6301\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u3053\u306e\u6642\u70b9\u306e\u5c65\u6b74\u3060\u3051\u304b\u3089\u904e\u53bb\u306e force-push \u6709\u7121\u307e\u3067\u306f\u5224\u65ad\u3067\u304d\u307e\u305b\u3093\u3002</li> <li>\u6307\u5b9a\u306e <code>compare/upstream/public-develop...upstream/private-develop</code> \u306f private ahead 161 / behind 3\u3001\u5171\u901a\u7956\u5148 <code>b7eacc4c2f2a50f72f3489fc9c3d105b46ea8108</code> \u3092\u8fd4\u3057\u307e\u3057\u305f\u3002\u975e\u516c\u958b\u5074\u306e\u5909\u66f4260\u30d5\u30a1\u30a4\u30eb\u3068\u3001\u4eca\u56de\u306e2\u30d5\u30a1\u30a4\u30eb\u3068\u306e\u7a4d\u96c6\u5408\u306f\u7a7a\u3067\u3059\u3002\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5909\u66f4\u3092\u542b\u3080\u6700\u7d42\u5dee\u5206\u306e\u91cd\u8907\u306f\u3042\u308a\u307e\u305b\u3093\u3002161\u30b3\u30df\u30c3\u30c8\u4e2d\u306e\u4e00\u6642\u7684\u306a\u7de8\u96c6\u3059\u3079\u3066\u3092\u8abf\u3079\u305f\u3068\u3044\u3046\u610f\u5473\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002</li> <li>\u56fa\u5b9a\u3057\u305f\u975e\u516c\u958btip\u2192PR head \u3068\u3001\u5171\u901a\u7956\u5148\u2192\u56fa\u5b9a\u3057\u305f\u516c\u958btip \u3092 compare API \u3067\u6bd4\u8f03\u3057\u307e\u3057\u305f\u3002\u53cc\u65b9\u3068\u3082 <code>api/users/views.py</code> \u3068 <code>api_tests/users/views/test_user_detail.py</code> \u306e2\u30d5\u30a1\u30a4\u30eb\u3060\u3051\u3067\u3001patch \u3068\u6700\u7d42blob SHA\u3082\u4e00\u81f4\u3057\u307e\u3059\u3002\u305d\u308c\u4ee5\u5916\u306e\u975e\u516c\u958b\u5074\u30d5\u30a1\u30a4\u30eb\u306f\u5909\u66f4\u3055\u308c\u3066\u304a\u3089\u305a\u3001\u95a2\u9023\u3059\u308b\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5f37\u5316\u306e\u4fdd\u6301\u3092\u300c\u885d\u7a81\u306a\u3057\u300d\u3068\u3044\u3046\u8aac\u660e\u4ee5\u5916\u306e\u6839\u62e0\u3067\u78ba\u8a8d\u3057\u307e\u3057\u305f\u3002</li> <li><code>api/users/views.py:177\u2013184</code> \u3067\u8a8d\u8a3c\u5fc5\u9808\u5316\u3068\u3001\u672c\u4eba\u306b\u3088\u308b\u66f4\u65b0\u30fb\u30c8\u30fc\u30af\u30f3\u30b9\u30b3\u30fc\u30d7\u6a29\u9650\u306e\u4fdd\u6301\u3092\u78ba\u8a8d\u3057\u307e\u3057\u305f\u3002\u8a66\u9a13\u5dee\u5206\u3001<code>api_tests/conftest.py:10\u201311</code>\u3001<code>tests/json_api_test_app.py:41\u201351</code> \u3067\u8a66\u9a13\u30a2\u30d7\u30ea\u3082\u78ba\u8a8d\u3057\u3066\u3044\u307e\u3059\u3002\u8a8d\u8a3c\u6e08\u307f\u5225\u30e6\u30fc\u30b6\u30fc\u304b\u3089\u306e\u53c2\u7167\u306f <code>test_get</code> \u306b\u6b8b\u3063\u3066\u3044\u307e\u3059\u3002</li> <li>\u65b0\u3057\u3044\u7d71\u5408\u30b3\u30df\u30c3\u30c8\u306f\u65e5\u672c\u8a9e\u306e <code>merge(upstream):</code>\u3001\u7406\u7531\u3001\u691c\u8a3c\u3001\u30d3\u30eb\u30c9\u30fb\u53d7\u5165\u306e M2 \u5ef6\u671f\u3092\u660e\u8a18\u3057\u3001\u6307\u5b9a\u3055\u308c\u305f\u5f62\u5f0f\u8981\u7d20\u3092\u6e80\u305f\u3057\u3066\u3044\u307e\u3059\u3002R2 \u306f\u4e8b\u5b9f\u95a2\u4fc2\u306e\u554f\u984c\u3067\u3059\u3002\u65e2\u5b58\u306e\u82f1\u8a9e\u4e0a\u6d41\u30b3\u30df\u30c3\u30c8\u3092\u30ed\u30fc\u30ab\u30eb\u898f\u7d04\u306b\u5408\u308f\u305b\u3066\u66f8\u304d\u63db\u3048\u308b\u5fc5\u8981\u306f\u3042\u308a\u307e\u305b\u3093\u3002</li> <li>PR\u306e4\u30b3\u30df\u30c3\u30c8\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u3001\u672c\u6587\u30012\u30d5\u30a1\u30a4\u30eb\u306e\u5dee\u5206\u3092\u76ee\u8996\u78ba\u8a8d\u3057\u307e\u3057\u305f\u3002R3 \u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u53c2\u7167\u4ee5\u5916\u306b\u660e\u767d\u306a\u8cc7\u683c\u60c5\u5831\u30fb\u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30eaURL\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u5168\u5c65\u6b74\u306e\u691c\u67fb\u3084\u81ea\u52d5\u79d8\u5bc6\u30b9\u30ad\u30e3\u30f3\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002</li> <li>\u78ba\u8a8d\u6642\u70b9\u3067\u306f JavaScript/TypeScript CodeQL \u304c\u6210\u529f\u3001Python CodeQL \u30682\u4ef6\u306e <code>build-image</code> \u306f pending \u3067\u3057\u305f\u3002\u30ed\u30fc\u30ab\u30eb\u306e\u30d3\u30eb\u30c9\u30fb\u30a2\u30d7\u30ea\u8a66\u9a13\u30fb\u53d7\u5165\u8a66\u9a13\u306f\u5b9f\u884c\u3057\u3066\u3044\u307e\u305b\u3093\u3002pending \u306f\u6210\u529f\u3067\u306f\u306a\u304f\u3001\u9759\u7684\u306a\u30c4\u30ea\u30fc\u4fdd\u6301\u3060\u3051\u3067\u306f\u52d5\u4f5c\u4e92\u63db\u6027\u3092\u4fdd\u8a3c\u3057\u307e\u305b\u3093\u3002</li> </ul>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r1/#\u30de\u30fc\u30b8\u524d\u306b\u6240\u6709\u8005\u304c\u6c7a\u3081\u308b\u3053\u3068","title":"\u30de\u30fc\u30b8\u524d\u306b\u6240\u6709\u8005\u304c\u6c7a\u3081\u308b\u3053\u3068","text":"<p>R1 \u306e\u8ffd\u52a0\u4fee\u6b63\u3068\u5bfe\u8c61\u8a66\u9a13\u306e\u5b9f\u884c\u7d50\u679c\u3092\u6c42\u3081\u3066\u304f\u3060\u3055\u3044\u3002R2 \u306e\u7d71\u5408\u9806\u306e\u6271\u3044\u3092\u6c7a\u3081\u3001\u4e0a\u6d41\u5c65\u6b74\u3092\u66f8\u304d\u63db\u3048\u305a\u6b63\u78ba\u306b\u8a18\u9332\u3057\u3066\u304f\u3060\u3055\u3044\u3002R3 \u306e\u30ea\u30f3\u30af\u4fdd\u6301\u3068\u3001\u5e83\u7bc4\u306a\u30d3\u30eb\u30c9\u30fb\u53d7\u5165\u3092 M2 \u306b\u5ef6\u671f\u3059\u308b\u3053\u3068\u306e\u53d7\u5bb9\u53ef\u5426\u3092\u5224\u65ad\u3057\u3001\u5fc5\u9808CI\u306e\u6700\u7d42\u7d50\u679c\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002view-only\u30ea\u30f3\u30af\u3092\u542b\u3081\u672a\u8a8d\u8a3c\u306e\u30e6\u30fc\u30b6\u30fc\u8a73\u7d30\u53c2\u7167\u304c\u62d2\u5426\u3055\u308c\u308b\u5909\u66f4\u3092\u660e\u793a\u7684\u306b\u53d7\u5bb9\u3057\u3001\u4f9d\u5b58\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u306f M2 \u3067\u691c\u8a3c\u3057\u307e\u3059\u3002squash/rebase \u3067\u306f\u306a\u304f\u901a\u5e38\u30de\u30fc\u30b8\u3067\u4e21\u4e0a\u6d41\u306e\u5c65\u6b74\u3092\u4fdd\u6301\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3053\u306e\u30ec\u30d3\u30e5\u30fc\u3067\u306f\u6307\u5b9a\u3055\u308c\u305fPR\u30b3\u30e1\u30f3\u30c81\u4ef6\u4ee5\u5916\u3001\u5bfe\u8c61\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u5909\u66f4\u3057\u307e\u305b\u3093\u3002</p>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2/","title":"PR #1 public develop merge \u2014 REV review r2 / \u516c\u958b develop \u7d71\u5408\u518d\u30ec\u30d3\u30e5\u30fc","text":"<p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <p>Version: 0.1 \u2014 2026-11-05</p> <p>Learned / \u5206\u304b\u3063\u305f\u3053\u3068: the anonymous test correction preserves upstream history; explaining an initial integration exception does not itself constitute owner acceptance. \uff0f \u672a\u8a8d\u8a3c\u8a66\u9a13\u306f\u5c65\u6b74\u3092\u4fdd\u6301\u3057\u3066\u4fee\u6b63\u3055\u308c\u305f\u304c\u3001\u521d\u56de\u7d71\u5408\u306e\u4f8b\u5916\u3092\u8aac\u660e\u3059\u308b\u3053\u3068\u3068\u6240\u6709\u8005\u304c\u627f\u8a8d\u3059\u308b\u3053\u3068\u306f\u5225\u3067\u3042\u308b\u3002</p> <p>Reviewer: REV\uff08\u62c5\u5f53\u30ec\u30d3\u30e5\u30ef, Codex Astra\uff09</p> <p>Previous record: r1</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: review r2 of RDM-osf.io-dev2027 PR #1 by REV (Codex Astra); header lines added by QAE for SPEC-06 compliance, body unchanged. \uff0f REV\uff08Codex Astra\uff09\u306b\u3088\u308b PR #1 \u306e\u30ec\u30d3\u30e5\u30fc r2\u3002\u898b\u51fa\u3057\u884c\u306f SPEC-06 \u6e96\u62e0\u306e\u305f\u3081 QAE \u304c\u8ffd\u52a0\u3057\u3001\u672c\u6587\u306f\u5909\u66f4\u3057\u3066\u3044\u306a\u3044\u3002</li> <li>Related: docs/reviews/README.md \u00b7 ADR-04 AI Autonomy and Roles \u00b7 SPEC-01 Manifest</li> </ul> <p></p>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2/#english","title":"English","text":""},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2/#verdict-request-changes--r1-code-correction-verified-r2-owner-decision-outstanding","title":"Verdict: request changes \u2014 R1 code correction verified; R2 owner decision outstanding","text":"<p>Re-reviewed <code>RCOSDP/RDM-osf.io-dev2027</code> PR #1 at head <code>ef2be2c815e2432c86d89e0480e77674710f5912</code>. No new code defect was found in the follow-up. This verdict concerns the unresolved integration-policy decision, not a request to rewrite the merge. No approval or merge was submitted.</p>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2/#findings-and-disposition","title":"Findings and disposition","text":"Priority / ID Status Evidence and remaining action P2 / R2 Partially resolved; owner decision pending PR body lines 2\u20133 now correctly describe a private-seeded incremental merge. Line 7 nevertheless says the initial construction \u201csatisfied\u201d SPEC-01, while line 8 requests owner approval to document that interpretation in ADR-01. SPEC-01 \u00a74, currently line 94, still fixes public \u2192 private \u2192 adopted PRs; ADR-01, lines 52\u201359, still describes public-history initialization and the same order. Record the owner's acceptance and align the normative documentation before treating the exception as settled. Until then, label it a proposed interpretation rather than established compliance. P2 / R1 Code issue resolved; runtime evidence deferred <code>api_tests/users/views/test_user_detail.py:260\u2013262</code> now calls the API 2.10 endpoint without an <code>auth</code> argument and expects 401, matching the 2.9 anonymous case. The follow-up changes exactly one line. Both authenticated-version cases remain present. No further code correction is requested for R1; targeted execution remains unverified and is explicitly deferred to M2 in the PR. P3 / R3 Retained as requested; owner decision pending, not a demonstrated secret The assignment says the session reference is mandatory report metadata and is retained for owner judgment. The PR and follow-up commit retain it. This review accepts that stated handling and does not demand deletion or history rewriting. No obvious credential was found in the updated metadata or delta; session access controls/content were not inspected. The URL is not reproduced here. <p>The new PR body's \u201cprivate is a superset\u201d statement should be understood relative to the shared older public history, not to the newer <code>bacfe64</code> tip: the r1 comparison showed private ahead 161 and behind 3. Non-overlapping net changes support this particular integration's content preservation, not a general exception to ordering policy.</p>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2/#what-was-verified","title":"What was verified","text":"<ul> <li>Re-read <code>gh pr view 1 -R RCOSDP/RDM-osf.io-dev2027 --json title,body,commits,files,headRefOid,baseRefOid</code> and the full <code>gh pr diff</code>.</li> <li>The commit API confirms <code>ef2be2c815e2432c86d89e0480e77674710f5912</code> has exactly one parent, the previously reviewed merge <code>546969eb33f42e35be5dc5c5ac8bfe55e3ef0bbc</code>. Its sole patch removes the authentication argument from one test request.</li> <li>Rechecked that merge's two parents: private <code>3f4c9cd32e2e118f42a6b5aacbe2a5ff066a8a38</code> and public <code>bacfe64fdc002f09df47145fc17f57630772ac82</code>. All three original public commits and the original integration merge remain in the PR's commit list. The new head is an ordinary follow-up commit, not itself a merge; ancestry is preserved.</li> <li>Fetched the test file at the exact new head. Python AST parsing succeeded, and a targeted structural assertion confirmed that both <code>get</code> calls in <code>test_social_values_old_version_not_logged_in</code> omit <code>auth</code>. This is syntax/structure verification, not an application test or HTTP result.</li> <li>The PR still changes only the original two files. Since the delta from r1 is solely that public-origin test correction, r1's private-tree preservation finding remains applicable; the 260-file comparison was not rerun. Production permission changes are unchanged.</li> <li>The new Japanese <code>fix(api-tests):</code> commit includes a reason, explicit test non-execution, M2 validation plans, and an explanation of the proposed R2 interpretation. It corrects the historical explanation without amending existing commits.</li> <li><code>gh pr checks</code> for the new head reported both CodeQL languages and both <code>build-image</code> jobs pending (exit 8). The PR body's statement that JS/TS CodeQL passed is from an earlier run and does not establish success for this head. No runtime test or build was performed by this reviewer.</li> </ul>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2/#before-merging","title":"Before merging","text":"<p>The owner must accept or reject the initial-construction interpretation and record the accepted policy consistently in ADR-01/SPEC-01. The owner must also decide whether M2 deferral of targeted runtime verification is acceptable, retain the session reference under the stated reporting requirement, and confirm final required CI results for this head. The anonymous user-detail access restriction remains an intentional behavior change to cover in acceptance testing. Use a normal merge preserving upstream history. No force-push, approval, merge, or repository code edit was performed during this re-review; the only remote write is the requested r2 comment.</p> <p></p>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":""},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2/#\u5224\u5b9a-request-changes\u4fee\u6b63\u8981\u6c42-r1-\u306e\u30b3\u30fc\u30c9\u4fee\u6b63\u3092\u78ba\u8a8dr2-\u306e\u6240\u6709\u8005\u5224\u65ad\u304c\u672a\u6c7a","title":"\u5224\u5b9a: request changes\uff08\u4fee\u6b63\u8981\u6c42\uff09\u2014 R1 \u306e\u30b3\u30fc\u30c9\u4fee\u6b63\u3092\u78ba\u8a8d\u3001R2 \u306e\u6240\u6709\u8005\u5224\u65ad\u304c\u672a\u6c7a","text":"<p>\u5bfe\u8c61\u306f <code>RCOSDP/RDM-osf.io-dev2027</code> PR #1\u3001head <code>ef2be2c815e2432c86d89e0480e77674710f5912</code>\u3002\u8ffd\u52a0\u4fee\u6b63\u306b\u65b0\u3057\u3044\u30b3\u30fc\u30c9\u4e0d\u5177\u5408\u306f\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u3053\u306e\u5224\u5b9a\u306f\u7d71\u5408\u898f\u5247\u306e\u89e3\u91c8\u304c\u672a\u6c7a\u3067\u3042\u308b\u3053\u3068\u306b\u3088\u308b\u3082\u306e\u3067\u3001\u30de\u30fc\u30b8\u5c65\u6b74\u306e\u66f8\u63db\u3048\u3092\u6c42\u3081\u308b\u3082\u306e\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u627f\u8a8d\u30fb\u30de\u30fc\u30b8\u64cd\u4f5c\u306f\u884c\u3063\u3066\u3044\u307e\u305b\u3093\u3002</p>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2/#\u6307\u6458\u3068\u5bfe\u5fdc\u72b6\u6cc1","title":"\u6307\u6458\u3068\u5bfe\u5fdc\u72b6\u6cc1","text":"\u91cd\u8981\u5ea6 / ID \u72b6\u6cc1 \u6839\u62e0\u3068\u6b8b\u4f5c\u696d P2 / R2 \u4e00\u90e8\u89e3\u6c7a\u30fb\u6240\u6709\u8005\u5224\u65ad\u5f85\u3061 PR\u672c\u65872\u20133\u884c\u76ee\u306f private \u8d77\u70b9\u306e\u5897\u5206\u30de\u30fc\u30b8\u3092\u6b63\u3057\u304f\u8aac\u660e\u3057\u3066\u3044\u307e\u3059\u3002\u4e00\u65b9\u30017\u884c\u76ee\u3067\u306f\u521d\u56de\u69cb\u7bc9\u3067 SPEC-01 \u3092\u300c\u6e80\u305f\u3057\u305f\u300d\u3068\u3057\u30018\u884c\u76ee\u3067\u306f ADR-01 \u306b\u89e3\u91c8\u3092\u8a18\u9332\u3059\u308b\u6240\u6709\u8005\u627f\u8a8d\u3092\u6c42\u3081\u3066\u3044\u307e\u3059\u3002SPEC-01 \u00a74 \u306e\u73fe94\u884c\u76ee\u306f\u516c\u958b\u2192private\u2192\u63a1\u7528PR\u3092\u56fa\u5b9a\u3057\u3001ADR-01 \u306e52\u201359\u884c\u76ee\u3082\u516c\u958b\u5c65\u6b74\u306b\u3088\u308b\u521d\u671f\u5316\u3068\u540c\u3058\u9806\u5e8f\u3092\u898f\u5b9a\u3057\u3066\u3044\u307e\u3059\u3002\u4f8b\u5916\u3092\u78ba\u5b9a\u6271\u3044\u306b\u3059\u308b\u524d\u306b\u3001\u6240\u6709\u8005\u306e\u53d7\u5bb9\u3092\u8a18\u9332\u3057\u898f\u7bc4\u6587\u66f8\u3068\u6574\u5408\u3055\u305b\u3066\u304f\u3060\u3055\u3044\u3002\u305d\u308c\u307e\u3067\u306f\u9069\u5408\u6e08\u307f\u3067\u306f\u306a\u304f\u300c\u63d0\u6848\u3059\u308b\u89e3\u91c8\u300d\u3068\u8a18\u8ff0\u3057\u307e\u3059\u3002 P2 / R1 \u30b3\u30fc\u30c9\u4e0a\u306f\u89e3\u6c7a\u30fb\u5b9f\u884c\u8a3c\u8de1\u306f\u5ef6\u671f <code>api_tests/users/views/test_user_detail.py:260\u2013262</code> \u306e2.10\u8981\u6c42\u306f <code>auth</code> \u5f15\u6570\u306a\u3057\u3067401\u3092\u671f\u5f85\u3057\u30012.9\u672a\u8a8d\u8a3c\u30b1\u30fc\u30b9\u3068\u4e00\u81f4\u3057\u3066\u3044\u307e\u3059\u3002\u8ffd\u52a0\u4fee\u6b63\u306f\u3053\u306e1\u884c\u3060\u3051\u3067\u3059\u3002\u8a8d\u8a3c\u6e08\u307f\u306e\u4e21\u30d0\u30fc\u30b8\u30e7\u30f3\u306e\u8a66\u9a13\u3082\u6b8b\u3063\u3066\u3044\u307e\u3059\u3002R1 \u306e\u8ffd\u52a0\u30b3\u30fc\u30c9\u4fee\u6b63\u306f\u6c42\u3081\u307e\u305b\u3093\u304c\u3001\u5bfe\u8c61\u8a66\u9a13\u306e\u5b9f\u884c\u306f\u672a\u691c\u8a3c\u3067\u3001PR\u306fM2\u3078\u306e\u5ef6\u671f\u3092\u660e\u8a18\u3057\u3066\u3044\u307e\u3059\u3002 P3 / R3 \u6307\u793a\u3069\u304a\u308a\u4fdd\u6301\u30fb\u6240\u6709\u8005\u5224\u65ad\u5f85\u3061\u3001\u79d8\u5bc6\u5024\u3068\u306f\u65ad\u5b9a\u305b\u305a \u4eca\u56de\u306e\u4f9d\u983c\u3067\u306f\u30bb\u30c3\u30b7\u30e7\u30f3\u53c2\u7167\u3092\u5e33\u7968\u306e\u5fc5\u9808\u30e1\u30bf\u30c7\u30fc\u30bf\u3068\u3057\u3066\u4fdd\u6301\u3057\u3001\u6240\u6709\u8005\u5224\u65ad\u306b\u59d4\u306d\u308b\u3068\u3055\u308c\u3066\u3044\u307e\u3059\u3002PR\u3068\u8ffd\u52a0\u30b3\u30df\u30c3\u30c8\u306b\u4fdd\u6301\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u305d\u306e\u6271\u3044\u3092\u53d7\u3051\u5165\u308c\u3001\u524a\u9664\u3084\u5c65\u6b74\u66f8\u63db\u3048\u306f\u6c42\u3081\u307e\u305b\u3093\u3002\u66f4\u65b0\u30e1\u30bf\u30c7\u30fc\u30bf\u30fb\u5dee\u5206\u306b\u660e\u767d\u306a\u8cc7\u683c\u60c5\u5831\u306f\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u304c\u3001\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u5185\u5bb9\u30fb\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u306f\u672a\u78ba\u8a8d\u3067\u3059\u3002URL\u306f\u672c\u8a18\u9332\u306b\u8ee2\u8f09\u3057\u307e\u305b\u3093\u3002 <p>PR\u672c\u6587\u306e\u300cprivate \u306f\u4e0a\u4f4d\u4e92\u63db\u300d\u306f\u5171\u901a\u306e\u53e4\u3044\u516c\u958b\u5c65\u6b74\u306b\u5bfe\u3059\u308b\u8aac\u660e\u3068\u3057\u3066\u6271\u3046\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u65b0\u3057\u3044\u516c\u958btip <code>bacfe64</code> \u306b\u5bfe\u3057\u3066\u306f\u3001r1\u3067 private ahead 161 / behind 3 \u3092\u78ba\u8a8d\u3057\u3066\u3044\u307e\u3059\u3002\u6700\u7d42\u5dee\u5206\u304c\u91cd\u306a\u3089\u306a\u3044\u3053\u3068\u306f\u4eca\u56de\u306e\u5185\u5bb9\u4fdd\u6301\u306e\u6839\u62e0\u3067\u3059\u304c\u3001\u7d71\u5408\u9806\u306e\u4e00\u822c\u7684\u306a\u4f8b\u5916\u3092\u6210\u7acb\u3055\u305b\u308b\u6839\u62e0\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002</p>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2/#\u78ba\u8a8d\u3057\u305f\u3053\u3068","title":"\u78ba\u8a8d\u3057\u305f\u3053\u3068","text":"<ul> <li><code>gh pr view</code> \u3067 title/body/commits/files/headRefOid/baseRefOid \u3092\u518d\u53d6\u5f97\u3057\u3001<code>gh pr diff</code> \u306e\u5168\u5dee\u5206\u3092\u78ba\u8a8d\u3057\u307e\u3057\u305f\u3002</li> <li>\u30b3\u30df\u30c3\u30c8API\u3067\u65b0head <code>ef2be2c815e2432c86d89e0480e77674710f5912</code> \u306e\u89aa\u304c\u3001\u524d\u56de\u30ec\u30d3\u30e5\u30fc\u3057\u305f <code>546969eb33f42e35be5dc5c5ac8bfe55e3ef0bbc</code> \u306e1\u3064\u3060\u3051\u3067\u3042\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u307e\u3057\u305f\u3002\u5dee\u5206\u306f\u8a66\u9a13\u8981\u6c42\u306e\u8a8d\u8a3c\u5f15\u6570\u3092\u9664\u304f1\u884c\u3060\u3051\u3067\u3059\u3002</li> <li>\u5143\u30de\u30fc\u30b8\u306e\u89aa\u304c private <code>3f4c9cd32e2e118f42a6b5aacbe2a5ff066a8a38</code> \u3068 public <code>bacfe64fdc002f09df47145fc17f57630772ac82</code> \u306e2\u3064\u3067\u3042\u308b\u3053\u3068\u3092\u518d\u78ba\u8a8d\u3057\u307e\u3057\u305f\u3002\u516c\u958b3\u30b3\u30df\u30c3\u30c8\u3068\u5143\u306e\u7d71\u5408\u30b3\u30df\u30c3\u30c8\u3082PR\u306e\u30b3\u30df\u30c3\u30c8\u4e00\u89a7\u306b\u6b8b\u3063\u3066\u3044\u307e\u3059\u3002\u65b0head\u81ea\u4f53\u306f\u901a\u5e38\u306e\u8ffd\u52a0\u30b3\u30df\u30c3\u30c8\u3067\u3042\u308a\u3001\u30de\u30fc\u30b8\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u7956\u5148\u5c65\u6b74\u306f\u4fdd\u6301\u3055\u308c\u3066\u3044\u307e\u3059\u3002</li> <li>\u65b0head\u306b\u56fa\u5b9a\u3057\u3066\u8a66\u9a13\u30d5\u30a1\u30a4\u30eb\u3092\u53d6\u5f97\u3057\u307e\u3057\u305f\u3002Python AST\u69cb\u6587\u89e3\u6790\u3068\u5bfe\u8c61\u30e1\u30bd\u30c3\u30c9\u5185\u306e2\u3064\u306e <code>get</code> \u547c\u51fa\u3057\u306b <code>auth</code> \u304c\u306a\u3044\u3053\u3068\u3092\u78ba\u8a8d\u3059\u308b\u69cb\u9020\u691c\u67fb\u304c\u6210\u529f\u3057\u307e\u3057\u305f\u3002\u3053\u308c\u306f\u69cb\u6587\u30fb\u69cb\u9020\u306e\u691c\u8a3c\u3067\u3042\u308a\u3001\u30a2\u30d7\u30ea\u8a66\u9a13\u3084HTTP\u7d50\u679c\u306e\u78ba\u8a8d\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002</li> <li>PR\u306e\u5909\u66f4\u30d5\u30a1\u30a4\u30eb\u306f\u5f15\u304d\u7d9a\u304d\u5143\u306e2\u30d5\u30a1\u30a4\u30eb\u306e\u307f\u3067\u3059\u3002r1\u4ee5\u964d\u306e\u5dee\u5206\u306f\u516c\u958b\u7531\u6765\u306e\u8a66\u9a131\u884c\u3060\u3051\u306a\u306e\u3067\u3001r1\u306e\u975e\u516c\u958b\u5074\u30c4\u30ea\u30fc\u4fdd\u6301\u306e\u7d50\u8ad6\u306f\u5f15\u304d\u7d9a\u304d\u6709\u52b9\u3067\u3059\u3002260\u30d5\u30a1\u30a4\u30eb\u306e\u6bd4\u8f03\u306f\u518d\u5b9f\u884c\u3057\u3066\u3044\u307e\u305b\u3093\u3002\u672c\u756a\u306e\u6a29\u9650\u5909\u66f4\u3082\u5909\u308f\u3063\u3066\u3044\u307e\u305b\u3093\u3002</li> <li>\u8ffd\u52a0\u30b3\u30df\u30c3\u30c8\u306f\u65e5\u672c\u8a9e\u306e <code>fix(api-tests):</code> \u3092\u7528\u3044\u3001\u7406\u7531\u3001\u8a66\u9a13\u672a\u5b9f\u884c\u3001M2\u3067\u306e\u691c\u8a3c\u4e88\u5b9a\u3001R2\u306e\u89e3\u91c8\u63d0\u6848\u3092\u660e\u8a18\u3057\u3066\u3044\u307e\u3059\u3002\u65e2\u5b58\u30b3\u30df\u30c3\u30c8\u3092amend\u305b\u305a\u3001\u904e\u53bb\u306e\u8aac\u660e\u3092\u88dc\u8db3\u3057\u3066\u3044\u307e\u3059\u3002</li> <li>\u65b0head\u306e <code>gh pr checks</code> \u306f\u4e21\u8a00\u8a9e\u306eCodeQL\u30682\u4ef6\u306e <code>build-image</code> \u304c\u3059\u3079\u3066pending\uff08\u7d42\u4e86\u50248\uff09\u3067\u3057\u305f\u3002PR\u672c\u6587\u306eJS/TS CodeQL\u5408\u683c\u306f\u4ee5\u524d\u306e\u5b9f\u884c\u306e\u8a18\u8f09\u3067\u3042\u308a\u3001\u3053\u306ehead\u306e\u6210\u529f\u8a3c\u8de1\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u30ec\u30d3\u30e5\u30ef\u306b\u3088\u308b\u5b9f\u884c\u8a66\u9a13\u30fb\u30d3\u30eb\u30c9\u306f\u884c\u3063\u3066\u3044\u307e\u305b\u3093\u3002</li> </ul>"},{"location":"reviews/2026-11-05_RDM-osf.io-dev2027_PR1_Public_Develop_Merge_r2/#\u30de\u30fc\u30b8\u524d\u306b\u5fc5\u8981\u306a\u5224\u65ad","title":"\u30de\u30fc\u30b8\u524d\u306b\u5fc5\u8981\u306a\u5224\u65ad","text":"<p>\u6240\u6709\u8005\u306f\u521d\u56de\u69cb\u7bc9\u306e\u89e3\u91c8\u3092\u63a1\u5426\u5224\u65ad\u3057\u3001\u53d7\u5bb9\u3057\u305f\u898f\u5247\u3092ADR-01/SPEC-01\u3068\u6574\u5408\u3059\u308b\u5f62\u3067\u8a18\u9332\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u5bfe\u8c61\u8a66\u9a13\u306e\u52d5\u4f5c\u691c\u8a3c\u3092M2\u3078\u5ef6\u671f\u3059\u308b\u3053\u3068\u306e\u53d7\u5bb9\u53ef\u5426\u3001\u5e33\u7968\u8981\u4ef6\u306b\u57fa\u3065\u304f\u30bb\u30c3\u30b7\u30e7\u30f3\u53c2\u7167\u306e\u4fdd\u6301\u3001\u65b0head\u306e\u5fc5\u9808CI\u6700\u7d42\u7d50\u679c\u3082\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u672a\u8a8d\u8a3c\u30e6\u30fc\u30b6\u30fc\u8a73\u7d30\u53c2\u7167\u306e\u62d2\u5426\u306f\u610f\u56f3\u7684\u306a\u52d5\u4f5c\u5909\u66f4\u3068\u3057\u3066\u53d7\u5165\u8a66\u9a13\u306b\u542b\u3081\u307e\u3059\u3002\u4e0a\u6d41\u5c65\u6b74\u3092\u4fdd\u6301\u3059\u308b\u901a\u5e38\u30de\u30fc\u30b8\u3092\u7528\u3044\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u30ec\u30d3\u30e5\u30fc\u3067\u306fforce-push\u30fb\u627f\u8a8d\u30fb\u30de\u30fc\u30b8\u30fb\u5bfe\u8c61\u30b3\u30fc\u30c9\u7de8\u96c6\u306f\u884c\u308f\u305a\u3001\u30ea\u30e2\u30fc\u30c8\u3078\u306e\u66f8\u8fbc\u307f\u306f\u6307\u5b9a\u3055\u308c\u305fr2\u30b3\u30e1\u30f3\u30c8\u3060\u3051\u3067\u3059\u3002</p>"},{"location":"spec/","title":"Specifications / \u4ed5\u69d8","text":"<p>Summary: Rules to implement: how the installer works, security gate thresholds, acceptance test scenarios, upstream tracking, documentation conventions. These documents tell implementers what to build. \u6982\u8981: \u5b9f\u88c5\u3059\u308b\u30eb\u30fc\u30eb\uff1a\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306e\u4ed5\u7d44\u307f\u3001\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u9580\u306e\u57fa\u6e96\u3001\u53d7\u5165\u8a66\u9a13\u306e\u30b7\u30ca\u30ea\u30aa\u3001\u4e0a\u6d41\u8ffd\u5f93\u3001\u6587\u66f8\u898f\u7d04\u3002\u3053\u308c\u3089\u306e\u6587\u66f8\u306f\u5b9f\u88c5\u8005\u306b\u4f55\u3092\u69cb\u7bc9\u3059\u3079\u304d\u304b\u3092\u4f1d\u3048\u307e\u3059\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: the installer, the security gate and the acceptance tests had to be written down as rules before any code, otherwise each implementer would fill the gaps differently. \uff0f \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u3001\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u9580\u3001\u53d7\u5165\u8a66\u9a13\u306f\u3001\u30b3\u30fc\u30c9\u3088\u308a\u5148\u306b\u898f\u5247\u3068\u3057\u3066\u66f8\u3044\u3066\u304a\u304b\u306a\u3044\u3068\u3001\u5b9f\u88c5\u3059\u308b\u4eba\u3054\u3068\u306b\u9699\u9593\u306e\u57cb\u3081\u65b9\u304c\u5909\u308f\u308b\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Normative for: SPEC-00 Overview through SPEC-06 Documentation Conventions.</li> <li>Related: ../README.md \u00b7 policy/ \u00b7 decisions/ \u00b7 reference/REF-01_Glossary.md</li> </ul> <p></p>"},{"location":"spec/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"spec/#1-what-belongs-here","title":"1. What belongs here","text":"<p>A specification is a rule book that implementers must follow. This folder contains:</p> ID File Purpose SPEC-00 00_overview.md Component map, milestones, roles, the big picture. SPEC-01 01_manifest.md The manifest: which upstream commits and PRs the installer builds. SPEC-02 02_installer_cli.md The <code>grdm-dev</code> CLI and <code>install.sh</code>: host checks, secrets, compose, build, health, reports. SPEC-03 03_security_gate.md SBOM, CVE scan, static analysis, ZAP, AI red team, per-milestone thresholds. SPEC-04 04_acceptance_tests.md Playwright Python acceptance: success and rejection cases per feature. SPEC-05 05_upstream_tracking.md Daily mirror and diff report, weekly AI integration PR, COS reference tracking. SPEC-06 06_documentation_conventions.md How every document is written."},{"location":"spec/#2-creating-a-new-specification","title":"2. Creating a new specification","text":"<ol> <li>Name the file <code>NN_<Topic>.md</code> (two-digit number, next available).</li> <li>Follow SPEC-06 documentation conventions.</li> <li>Link to related policies (POL-NN) and decisions (ADR-NN).</li> <li>Create a decision record if the specification records a choice.</li> <li>The owner approves; QAE writes specifications for new features.</li> </ol>"},{"location":"spec/#3-how-specifications-relate-to-other-documents","title":"3. How specifications relate to other documents","text":"<pre><code>flowchart TD\n P[Policy: position] --> S[Spec: rules to implement]\n A[Decision record: why we chose this] --> S\n S --> C[Code: implement the rule]</code></pre>"},{"location":"spec/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"spec/#1-\u3053\u3053\u306b\u5c5e\u3059\u308b\u3082\u306e","title":"1. \u3053\u3053\u306b\u5c5e\u3059\u308b\u3082\u306e","text":"<p>\u300c\u4ed5\u69d8\u300d\u306f\u5b9f\u88c5\u3059\u308b\u4eba\u304c\u5b88\u308b\u30eb\u30fc\u30eb\u30d6\u30c3\u30af\u3067\u3059\u3002\u3053\u306e\u30d5\u30a9\u30eb\u30c0\u306b\u306f\u6b21\u304c\u542b\u307e\u308c\u307e\u3059\uff1a</p> ID \u30d5\u30a1\u30a4\u30eb \u76ee\u7684 SPEC-00 00_overview.md \u90e8\u54c1\u306e\u5730\u56f3\u3001\u7bc0\u76ee\u3001\u5f79\u5272\u3001\u5168\u4f53\u50cf\u3002 SPEC-01 01_manifest.md \u30de\u30cb\u30d5\u30a7\u30b9\u30c8\uff1a\u3069\u306e\u4e0a\u6d41\u306e\u30b3\u30df\u30c3\u30c8\u3068 PR \u3092\u7d44\u3080\u304b\u3002 SPEC-02 02_installer_cli.md <code>grdm-dev</code> CLI \u3068 <code>install.sh</code>\uff1a\u30db\u30b9\u30c8\u5224\u5b9a\u3001\u79d8\u5bc6\u3001compose\u3001\u30d3\u30eb\u30c9\u3001\u5065\u5eb7\u78ba\u8a8d\u3001\u5831\u544a\u3002 SPEC-03 03_security_gate.md SBOM\u3001CVE \u30b9\u30ad\u30e3\u30f3\u3001\u9759\u7684\u89e3\u6790\u3001ZAP\u3001AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u3001\u7bc0\u76ee\u3054\u3068\u306e\u57fa\u6e96\u3002 SPEC-04 04_acceptance_tests.md Playwright Python \u53d7\u5165\uff1a\u6a5f\u80fd\u3054\u3068\u306e\u6210\u529f\u30fb\u62d2\u5426\u30b1\u30fc\u30b9\u3002 SPEC-05 05_upstream_tracking.md \u65e5\u6b21\u30df\u30e9\u30fc\u3068\u5dee\u5206\u5831\u544a\u3001\u9031\u6b21\u306e AI \u7d71\u5408 PR\u3001COS \u53c2\u7167\u8ffd\u8de1\u3002 SPEC-06 06_documentation_conventions.md \u3059\u3079\u3066\u306e\u6587\u66f8\u306e\u66f8\u304d\u65b9\u3002"},{"location":"spec/#2-\u65b0\u3057\u3044\u4ed5\u69d8\u3092\u3064\u304f\u308b\u306b\u306f","title":"2. \u65b0\u3057\u3044\u4ed5\u69d8\u3092\u3064\u304f\u308b\u306b\u306f","text":"<ol> <li>\u30d5\u30a1\u30a4\u30eb\u540d\u3092 <code>NN_<\u984c>.md</code>\uff082 \u6841\u306e\u756a\u53f7\u3001\u6b21\u306b\u7a7a\u3044\u3066\u3044\u308b\u3082\u306e\uff09\u306b\u3059\u308b\u3002</li> <li>SPEC-06 \u6587\u66f8\u898f\u7d04\u306b\u5f93\u3046\u3002</li> <li>\u95a2\u9023\u3059\u308b\u65b9\u91dd\uff08POL-NN\uff09\u3068\u6c7a\u5b9a\uff08ADR-NN\uff09\u3078\u30ea\u30f3\u30af\u3059\u308b\u3002</li> <li>\u4ed5\u69d8\u304c\u9078\u629e\u3092\u8a18\u9332\u3059\u308b\u5834\u5408\u306f\u6c7a\u5b9a\u306e\u8a18\u9332\u3092\u4f5c\u6210\u3059\u308b\u3002</li> <li>\u6240\u6709\u8005\u304c\u627f\u8a8d\uff1bQAE \u304c\u65b0\u6a5f\u80fd\u306e\u4ed5\u69d8\u3092\u66f8\u304f\u3002</li> </ol>"},{"location":"spec/#3-\u4ed5\u69d8\u304c\u4ed6\u306e\u6587\u66f8\u3068\u3069\u3046\u95a2\u4fc2\u3059\u308b\u304b","title":"3. \u4ed5\u69d8\u304c\u4ed6\u306e\u6587\u66f8\u3068\u3069\u3046\u95a2\u4fc2\u3059\u308b\u304b","text":"<pre><code>flowchart TD\n P[\u65b9\u91dd\uff1a\u7acb\u5834] --> S[\u4ed5\u69d8\uff1a\u5b9f\u88c5\u3059\u308b\u30eb\u30fc\u30eb]\n A[\u6c7a\u5b9a\u306e\u8a18\u9332\uff1a\u306a\u305c\u3053\u306e\u9053\u3092\u9078\u3093\u3060\u304b] --> S\n S --> C[\u30b3\u30fc\u30c9\uff1a\u30eb\u30fc\u30eb\u3092\u5b9f\u88c5]</code></pre>"},{"location":"spec/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Specification A rule book that implementers must follow. \u5b9f\u88c5\u3059\u308b\u4eba\u304c\u5b88\u308b\u30eb\u30fc\u30eb\u30d6\u30c3\u30af\u3002 Policy A statement of our position on what we will and will not do. \u6211\u3005\u304c\u4f55\u3092\u3057\u3001\u4f55\u3092\u3057\u306a\u3044\u304b\u306e\u7acb\u5834\u3002 Decision record (ADR) A note explaining why we chose one way and not another. \u306a\u305c\u305d\u306e\u9053\u3092\u9078\u3073\u3001\u307b\u304b\u3092\u9078\u3070\u306a\u304b\u3063\u305f\u304b\u306e\u30e1\u30e2\u3002 Implementation Writing code that follows the spec. \u4ed5\u69d8\u306b\u5f93\u3063\u3066\u30b3\u30fc\u30c9\u3092\u66f8\u304f\u3053\u3068\u3002 Milestone A checkpoint with a pass/fail test. \u5408\u5426\u306e\u8a66\u9a13\u304c\u3042\u308b\u95a2\u9580\u3002 Acceptance test A check that the whole thing does what the user asked for. \u5168\u4f53\u304c\u5229\u7528\u8005\u306e\u671b\u307f\u3069\u304a\u308a\u306b\u52d5\u304f\u304b\u306e\u78ba\u8a8d\u3002"},{"location":"spec/00_overview/","title":"SPEC-00 Overview and Architecture / \u5168\u4f53\u50cf\u3068\u69cb\u6210","text":"<p>Summary: What the GakuNin RDM developer environment 2027 is, which parts it is made of, how upstream code is combined, how the network is shaped, which milestones it passes, who does what, and where the other specifications are. \u6982\u8981: GakuNin RDM \u958b\u767a\u74b0\u5883 2027 \u7248\u3068\u306f\u4f55\u304b\u3002\u3069\u306e\u90e8\u54c1\u3067\u3067\u304d\u3066\u3044\u308b\u304b\u3001\u4e0a\u6d41\u306e\u30b3\u30fc\u30c9\u3092\u3069\u3046\u91cd\u306d\u308b\u304b\u3001\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306f\u3069\u3093\u306a\u5f62\u304b\u3001\u3069\u306e\u7bc0\u76ee\u3092\u901a\u308b\u304b\u3001\u8ab0\u304c\u4f55\u3092\u3059\u308b\u304b\u3001\u4ed6\u306e\u4ed5\u69d8\u306f\u3069\u3053\u306b\u3042\u308b\u304b\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.2 \u2014 2026-11-05. Learned: the profile of one component (y-websocket) is decided by the milestone that tests it (Wiki co-editing, M2), not by its role, so the overview must mirror SPEC-02 and the manifest. \uff0f \u90e8\u54c1\u306e\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u306f\u5f79\u5272\u3067\u306a\u304f\u3001\u305d\u308c\u3092\u8a66\u9a13\u3059\u308b\u7bc0\u76ee\uff08Wiki \u5171\u540c\u7de8\u96c6\u306f M2\uff09\u304c\u6c7a\u3081\u308b\u305f\u3081\u3001\u6982\u8981\u56f3\u3068\u6284\u9332\u306f SPEC-02 \u3068 manifest \u306b\u5408\u308f\u305b\u7d9a\u3051\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: eleven upstream repositories and three tracking branches per component cannot be held in anyone's head, so the map, the manifest, and the roles had to be written down before the first integration repository was created. \uff0f \u4e0a\u6d41 11 \u672c\u3068\u90e8\u54c1\u3054\u3068\u306e\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1 3 \u672c\u306f\u982d\u306e\u4e2d\u3067\u306f\u7ba1\u7406\u3067\u304d\u306a\u3044\u306e\u3067\u3001\u6700\u521d\u306e\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u4f5c\u308b\u524d\u306b\u3001\u5730\u56f3\u30fb\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u30fb\u5f79\u5272\u5206\u62c5\u3092\u6587\u66f8\u306b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Normative for: the shape of the whole environment. Every other specification (<code>01</code>\u2013<code>06</code>) refines one part of this page.</li> <li>Related: POL-01 Position \u00b7 ADR-01 Integration repository placement \u00b7 ADR-02 Network model \u00b7 ADR-03 Staged security gate \u00b7 ADR-04 AI autonomy and roles \u00b7 SPEC-01 Manifest \u00b7 SPEC-05 Upstream tracking \u00b7 SPEC-06 Documentation conventions \u00b7 docs/README.md</li> </ul> <p></p>"},{"location":"spec/00_overview/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"spec/00_overview/#1-purpose","title":"1. Purpose","text":"<p>The developer environment 2027 is a set of instructions and tools that lets one person start a complete GakuNin RDM (GRDM, the research data management service run by NII) on one computer with one command. It runs on macOS arm64, Ubuntu 24.04 (amd64 and arm64), and Windows 11 WSL2. It has three jobs:</p> <ol> <li>Combine the public core repositories, their <code>-private</code> security-verified versions, and the private subsystems into one consistent build.</li> <li>Move every base image (a base image is the ready-made operating-system layer a program is built on top of) from end-of-life versions to current ones, step by step.</li> <li>Keep removing security vulnerabilities (a vulnerability is a weak spot an attacker could use) with AI agents, so GRDM can continue even if the Center for Open Science (COS) stops developing OSF, the software GRDM is based on.</li> </ol> <p>This repository, <code>RDM-developer-guide</code>, is public. It holds documents, the manifest (the list of exactly which upstream versions we build; see SPEC-01), and the installer. It never holds code copied from <code>-private</code> repositories, secrets, or links to private repositories.</p>"},{"location":"spec/00_overview/#2-component-map","title":"2. Component map","text":"<p>A component is one program that runs as its own container (a box that holds one program and everything it needs, so it runs the same on any computer). Core components are the GRDM application itself. Infrastructure components are shared services such as databases. Subsystems are optional extras that plug into the core.</p> <pre><code>flowchart LR\n subgraph browser[\"Browser on the developer's computer (127.0.0.1 only)\"]\n B[Web browser]\n end\n subgraph core[\"Core (6 repositories)\"]\n EMB[ember-osf-web]\n OSFW[osf.io web]\n OSFA[osf.io api]\n OSFM[osf.io admin]\n OSFK[osf.io worker]\n WB[waterbutler]\n MFR[modular-file-renderer]\n CAS[\"cas-overlay (+ fakecas for dev)\"]\n WIKI[wiki-frontend]\n end\n subgraph infra[\"Infrastructure\"]\n PG[(postgres)]\n ES[(elasticsearch)]\n MQ[rabbitmq]\n MG[(\"mongo (legacy)\")]\n RD[(redis)]\n SJ[sharejs]\n UNO[unoconv]\n end\n subgraph subs[\"Subsystems (y-websocket in profile core, the others in full)\"]\n YWS[y-websocket]\n OAS[OASys]\n SHIB[\"Shibboleth-SP + test IdP\"]\n MCP[rdmcp]\n AIPF[aipf_mcp_data_grdm]\n end\n B --> EMB & OSFW & OSFA & OSFM & CAS & WIKI\n OSFW & OSFA & OSFM & OSFK --> PG & ES & MQ & RD\n OSFW --> SJ & MG\n WB --> OSFA\n MFR --> WB & UNO\n WIKI --> YWS\n SHIB --> OSFW\n MCP & AIPF --> OSFA\n OAS --> OSFA</code></pre> <p>The inventory in TOON (a compact text form of JSON; see SPEC-06 \u00a74). The canonical, machine-read list is <code>manifest/upstreams.json</code> (SPEC-01); this excerpt shows only <code>id</code>, <code>role</code>, <code>services</code>, <code>integration_repo</code>, and <code>profile</code> (the smallest installer profile that includes the component, SPEC-02 \u00a74). Service names are the Compose service names.</p> <pre><code>components[20]{id,role,services,integration_repo,profile}:\n osf.io,core,\"web,api,admin,worker\",RDM-osf.io-dev2027,minimum\n waterbutler,core,\"wb,wb_worker\",RDM-waterbutler-dev2027,core\n modular-file-renderer,core,mfr,RDM-modular-file-renderer-dev2027,core\n ember-osf-web,core,ember_osf_web,RDM-ember-osf-web-dev2027,core\n cas-overlay,core,cas,RDM-cas-overlay-dev2027,core\n wiki-frontend,core,wiki,RDM-wiki-frontend-dev2027,core\n postgres,infra,postgres,null,minimum\n elasticsearch2,infra,elasticsearch,null,minimum\n elasticsearch6,infra,elasticsearch6,null,core\n rabbitmq,infra,rabbitmq,null,minimum\n mongo,infra,mongo,null,core\n redis,infra,redis,null,core\n sharejs,infra,sharejs,null,core\n unoconv,infra,unoconv,null,core\n fakecas,infra,fakecas,null,minimum\n y-websocket,subsystem,y_websocket,RDM-y-websocket-dev2027,core\n OASys,subsystem,oasys,RDM-OASys-dev2027,full\n Shibboleth-SP,subsystem,\"shibboleth_sp,test_idp\",RDM-Shibboleth-SP-dev2027,full\n rdmcp,subsystem,rdmcp,RDM-rdmcp-dev2027,full\n aipf_mcp_data_grdm,subsystem,aipf_mcp_data_grdm,RDM-aipf_mcp_data_grdm-dev2027,full</code></pre> <p><code>mongo</code> and <code>elasticsearch2</code> are legacy and are removed at M5 (\u00a75).</p> <p><code>fakecas</code> and the Shibboleth test IdP (an IdP, identity provider, is the server that checks who you are when you log in) are both login helpers for development. They are mutually exclusive: the installer starts one or the other, never both.</p>"},{"location":"spec/00_overview/#3-integration-model","title":"3. Integration model","text":"<p>Each core component and each subsystem gets one private integration repository in the RCOSDP organization, named <code>RDM-<name>-dev2027</code>. Its <code>develop</code> branch is what the installer builds. Beside it sit tracking branches (read-only copies of someone else's branch), one per upstream listed in the manifest, named <code>upstream/<kind>-<branch></code> where <code><branch></code> is the upstream branch name with <code>/</code> replaced by <code>-</code> (SPEC-01 \u00a74 rule 7):</p> <ul> <li><code>upstream/public-<branch></code> \u2014 the public RCOSDP repository's default branch. Examples: <code>upstream/public-develop</code> (osf.io, waterbutler, mfr, cas-overlay, wiki-frontend), <code>upstream/public-master</code> (ember-osf-web, y-websocket).</li> <li><code>upstream/private-<branch></code> \u2014 the <code>-private</code> security-verified repository's default branch. Examples: <code>upstream/private-develop</code>, <code>upstream/private-master</code> (ember-osf-web, y-websocket), <code>upstream/private-main</code> (OASys, Shibboleth-SP, rdmcp, aipf_mcp_data_grdm, which have no public upstream and therefore only this one branch).</li> <li><code>upstream/cos-develop</code> \u2014 the original COS repository, kept for reference only (the six cores except wiki-frontend).</li> <li>A second upstream of the same kind gets a tag: <code>upstream/private-sec-test-fix-sec-test</code> mirrors <code>RDM-osf.io-private</code> (branch <code>fix/sec-test</code>) as a candidate that is not merged.</li> </ul> <pre><code>flowchart LR\n PUB[\"RDM-<name> (public)<br/>default branch\"] -->|mirror| UP1[\"upstream/public-<branch>\"]\n PRV[\"RDM-<name>-*-private<br/>default branch\"] -->|mirror| UP2[\"upstream/private-<branch>\"]\n COS[\"CenterForOpenScience/<name><br/>develop\"] -->|mirror| UP3[\"upstream/cos-develop (reference)\"]\n UP1 -->|1. merge| DEV[\"RDM-<name>-dev2027<br/>develop\"]\n UP2 -->|2. merge| DEV\n PRS[\"adopted PRs<br/>(listed in manifest)\"] -->|3. apply| DEV\n UP3 -.->|compare only| DEV\n DEV -->|installer builds| IMG[\"Local images\"]</code></pre> <p>Order matters: public first, then private, then adopted pull requests. The manifest (SPEC-01) records the exact commit (by SHA, the 40-character fingerprint of a commit) for each step. The daily and weekly jobs that keep this up to date are in SPEC-05. Why the repositories are placed this way is in ADR-01.</p>"},{"location":"spec/00_overview/#4-network-model","title":"4. Network model","text":"<ul> <li>The loopback alias <code>192.168.168.167</code> used by the old guide is gone. It needed <code>sudo</code> (administrator rights) and exposed services to the local network.</li> <li>Containers talk to each other on the Compose internal network (a private network that only the containers of one project can see) by service name, for example <code>http://api:8000</code>.</li> <li>Only ports bound to <code>127.0.0.1</code> (the address that means \"this computer only\") are published to the host. Nothing listens on other interfaces.</li> <li>No step of installation requires <code>sudo</code>. The reasoning is in ADR-02.</li> </ul>"},{"location":"spec/00_overview/#5-milestone-ladder","title":"5. Milestone ladder","text":"<p>A milestone is a checkpoint with a pass/fail test. The security gate is the test that decides whether a build may be installed; it gets stricter at each milestone (ADR-03).</p> <pre><code>milestones[5]{id,goal,security_gate}:\n M1,\"docs skeleton, manifest, dev2027 repositories exist; reviewed PRs merged to develop\",\"report + allow-list\"\n M2,\"core 6 install with one command on Mac Studio; Playwright acceptance passes; amd64 builds\",\"report + allow-list (fewer entries than M1)\"\n M3,\"5 subsystems start; one success + one rejection case each\",\"report + allow-list (fewer entries than M2)\"\n M4,\"waterbutler, mfr, osf.io on Python 3.13\",\"stop on HIGH or above; first AI red-team run\"\n M5,\"ES2 and mongo removed; ES8 + postgres 15 or later; distributable abroad\",\"zero CRITICAL/HIGH; zero open AI red-team paths\"</code></pre>"},{"location":"spec/00_overview/#6-roles","title":"6. Roles","text":"<p>Role codes follow the shared table in <code>AGENTS.md</code>. An AI agent is a program that reads instructions, writes code or documents, and reports back.</p> Code Who Does AID (AI Developer) Orca Open Code 2 workers on a local LLM Implements what the specifications say; writes documents and code in PRs QAE (QA Engineer) Claude Code Fable Writes specifications, checks implementations, runs and judges regression and acceptance tests REV (Reviewer) Codex Astra Independent review of every PR; records results in <code>docs/reviews/</code> and PR comments Owner Human Decides policy, accepts, merges, publishes <p>Detection, fix PR, review, and automated tests run without a human. Merging and publishing are always done by the owner (ADR-04).</p>"},{"location":"spec/00_overview/#7-index-of-specifications","title":"7. Index of specifications","text":"ID File One line SPEC-01 01_manifest.md The manifest: which upstream commits and PRs the installer builds SPEC-02 02_installer_cli.md The <code>grdm-dev</code> CLI and <code>install.sh</code>: host checks, secrets, compose, build, health, reports SPEC-03 03_security_gate.md SBOM, CVE scan, static analysis, ZAP, AI red team, and the per-milestone thresholds SPEC-04 04_acceptance_tests.md Playwright Python acceptance: success and rejection cases per feature SPEC-05 05_upstream_tracking.md Daily mirror and diff report, weekly AI integration PR, COS reference tracking SPEC-06 06_documentation_conventions.md How every document is written"},{"location":"spec/00_overview/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"spec/00_overview/#1-\u76ee\u7684","title":"1. \u76ee\u7684","text":"<p>\u300c\u958b\u767a\u74b0\u5883 2027 \u7248\u300d\u306f\u3001GakuNin RDM\uff08GRDM\u3002NII \u304c\u904b\u7528\u3059\u308b\u7814\u7a76\u30c7\u30fc\u30bf\u7ba1\u7406\u30b5\u30fc\u30d3\u30b9\uff09\u306e\u4e00\u5f0f\u3092\u3001\u4e00\u53f0\u306e\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u4e0a\u3067\u4e00\u3064\u306e\u30b3\u30de\u30f3\u30c9\u3067\u7acb\u3061\u4e0a\u3052\u308b\u305f\u3081\u306e\u624b\u5f15\u304d\u3068\u9053\u5177\u306e\u96c6\u307e\u308a\u3067\u3059\u3002macOS arm64\u3001Ubuntu 24.04\uff08amd64 \u3068 arm64\uff09\u3001Windows 11 WSL2 \u3067\u52d5\u304d\u307e\u3059\u3002\u5f79\u76ee\u306f\u4e09\u3064\u3067\u3059\u3002</p> <ol> <li>\u516c\u958b\u30b3\u30a2\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3001\u305d\u306e <code>-private</code>\uff08\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u691c\u8a3c\u7248\uff09\u3001\u975e\u516c\u958b\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\u3092\u3001\u77db\u76fe\u306a\u304f\u4e00\u3064\u306e\u30d3\u30eb\u30c9\u306b\u91cd\u306d\u308b\u3002</li> <li>\u3059\u3079\u3066\u306e\u30d9\u30fc\u30b9\u30a4\u30e1\u30fc\u30b8\uff08\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u8f09\u305b\u308b\u571f\u53f0\u306b\u306a\u308b\u3001\u3067\u304d\u3042\u3044\u306e OS \u306e\u5c64\uff09\u3092\u3001\u30b5\u30dd\u30fc\u30c8\u5207\u308c\u306e\u7248\u304b\u3089\u73fe\u884c\u306e\u7248\u3078\u6bb5\u968e\u7684\u306b\u79fb\u3059\u3002</li> <li>AI \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3067\u8106\u5f31\u6027\uff08\u653b\u6483\u8005\u306b\u3064\u3051\u8fbc\u307e\u308c\u308b\u5f31\u3044\u6240\uff09\u3092\u53d6\u308a\u9664\u304d\u7d9a\u3051\u3001GRDM \u306e\u5143\u306b\u306a\u3063\u3066\u3044\u308b OSF \u306e\u958b\u767a\u3092 Center for Open Science\uff08COS\uff09\u304c\u3084\u3081\u3066\u3082\u3001GRDM \u3092\u63d0\u4f9b\u3057\u7d9a\u3051\u3089\u308c\u308b\u3088\u3046\u306b\u3059\u308b\u3002</li> </ol> <p>\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea <code>RDM-developer-guide</code> \u306f \u516c\u958b \u3067\u3059\u3002\u6587\u66f8\u3001\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\uff08\u3069\u306e\u4e0a\u6d41\u306e\u7248\u3092\u7d44\u3080\u304b\u3092\u6c7a\u3081\u308b\u4e00\u89a7\u3002SPEC-01\uff09\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u3092\u7f6e\u304d\u307e\u3059\u3002<code>-private</code> \u7531\u6765\u306e\u30b3\u30fc\u30c9\u3001\u79d8\u5bc6\u3001\u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u3078\u306e\u30ea\u30f3\u30af\u306f\u7d76\u5bfe\u306b\u7f6e\u304d\u307e\u305b\u3093\u3002</p>"},{"location":"spec/00_overview/#2-\u90e8\u54c1\u306e\u5730\u56f3","title":"2. \u90e8\u54c1\u306e\u5730\u56f3","text":"<p>\u300c\u90e8\u54c1\uff08\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\uff09\u300d\u306f\u3001\u305d\u308c\u305e\u308c\u81ea\u5206\u306e\u30b3\u30f3\u30c6\u30ca\uff08\u4e00\u3064\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u3068\u5fc5\u8981\u306a\u3082\u306e\u3092\u4e00\u7bb1\u306b\u5165\u308c\u3001\u3069\u306e\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u3067\u3082\u540c\u3058\u3088\u3046\u306b\u52d5\u304b\u3059\u305f\u3081\u306e\u7bb1\uff09\u3067\u52d5\u304f\u4e00\u3064\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u3067\u3059\u3002\u300c\u30b3\u30a2\u300d\u306f GRDM \u672c\u4f53\u3001\u300c\u57fa\u76e4\u300d\u306f\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u3088\u3046\u306a\u5171\u7528\u30b5\u30fc\u30d3\u30b9\u3001\u300c\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\u300d\u306f\u30b3\u30a2\u306b\u5dee\u3057\u8fbc\u3080\u8ffd\u52a0\u6a5f\u80fd\u3067\u3059\u3002</p> <pre><code>flowchart LR\n subgraph browser[\"\u958b\u767a\u8005\u306e\u30d6\u30e9\u30a6\u30b6\uff08127.0.0.1 \u306e\u307f\uff09\"]\n B[Web \u30d6\u30e9\u30a6\u30b6]\n end\n subgraph core[\"\u30b3\u30a2\uff086 \u30ea\u30dd\u30b8\u30c8\u30ea\uff09\"]\n EMB[ember-osf-web]\n OSFW[osf.io web]\n OSFA[osf.io api]\n OSFM[osf.io admin]\n OSFK[osf.io worker]\n WB[waterbutler]\n MFR[modular-file-renderer]\n CAS[\"cas-overlay\uff08\u958b\u767a\u7528 fakecas \u4ed8\u304d\uff09\"]\n WIKI[wiki-frontend]\n end\n subgraph infra[\"\u57fa\u76e4\"]\n PG[(postgres)]\n ES[(elasticsearch)]\n MQ[rabbitmq]\n MG[(\"mongo\uff08\u65e7\uff09\")]\n RD[(redis)]\n SJ[sharejs]\n UNO[unoconv]\n end\n subgraph subs[\"\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\uff08y-websocket \u306f core\u3001\u307b\u304b\u306f full\uff09\"]\n YWS[y-websocket]\n OAS[OASys]\n SHIB[\"Shibboleth-SP \uff0b \u30c6\u30b9\u30c8 IdP\"]\n MCP[rdmcp]\n AIPF[aipf_mcp_data_grdm]\n end\n B --> EMB & OSFW & OSFA & OSFM & CAS & WIKI\n OSFW & OSFA & OSFM & OSFK --> PG & ES & MQ & RD\n OSFW --> SJ & MG\n WB --> OSFA\n MFR --> WB & UNO\n WIKI --> YWS\n SHIB --> OSFW\n MCP & AIPF --> OSFA\n OAS --> OSFA</code></pre> <p>\u4e00\u89a7\u3092 TOON\uff08JSON \u3092\u77ed\u304f\u5b57\u4e0b\u3052\u3067\u66f8\u3044\u305f\u5f62\u3002SPEC-06 \u00a74\uff09\u3067\u793a\u3057\u307e\u3059\u3002\u6a5f\u68b0\u304c\u8aad\u3080\u6b63\u672c\u306f <code>manifest/upstreams.json</code>\uff08SPEC-01\uff09\u3067\u3001\u3053\u306e\u6284\u9332\u306f <code>id</code>\u30fb<code>role</code>\u30fb<code>services</code>\u30fb<code>integration_repo</code>\u30fb<code>profile</code>\uff08\u305d\u306e\u90e8\u54c1\u3092\u542b\u3080\u6700\u5c0f\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3002SPEC-02 \u00a74\uff09\u3060\u3051\u3092\u8f09\u305b\u3066\u3044\u307e\u3059\u3002\u30b5\u30fc\u30d3\u30b9\u540d\u306f Compose \u306e\u30b5\u30fc\u30d3\u30b9\u540d\u3067\u3059\u3002</p> <pre><code>components[20]{id,role,services,integration_repo,profile}:\n osf.io,core,\"web,api,admin,worker\",RDM-osf.io-dev2027,minimum\n waterbutler,core,\"wb,wb_worker\",RDM-waterbutler-dev2027,core\n modular-file-renderer,core,mfr,RDM-modular-file-renderer-dev2027,core\n ember-osf-web,core,ember_osf_web,RDM-ember-osf-web-dev2027,core\n cas-overlay,core,cas,RDM-cas-overlay-dev2027,core\n wiki-frontend,core,wiki,RDM-wiki-frontend-dev2027,core\n postgres,infra,postgres,null,minimum\n elasticsearch2,infra,elasticsearch,null,minimum\n elasticsearch6,infra,elasticsearch6,null,core\n rabbitmq,infra,rabbitmq,null,minimum\n mongo,infra,mongo,null,core\n redis,infra,redis,null,core\n sharejs,infra,sharejs,null,core\n unoconv,infra,unoconv,null,core\n fakecas,infra,fakecas,null,minimum\n y-websocket,subsystem,y_websocket,RDM-y-websocket-dev2027,core\n OASys,subsystem,oasys,RDM-OASys-dev2027,full\n Shibboleth-SP,subsystem,\"shibboleth_sp,test_idp\",RDM-Shibboleth-SP-dev2027,full\n rdmcp,subsystem,rdmcp,RDM-rdmcp-dev2027,full\n aipf_mcp_data_grdm,subsystem,aipf_mcp_data_grdm,RDM-aipf_mcp_data_grdm-dev2027,full</code></pre> <p><code>mongo</code> \u3068 <code>elasticsearch2</code> \u306f\u65e7\u6765\u306e\u90e8\u54c1\u3067\u3001M5 \u3067\u5ec3\u6b62\u3057\u307e\u3059\uff08\u00a75\uff09\u3002</p> <p><code>fakecas</code> \u3068 Shibboleth \u306e\u30c6\u30b9\u30c8 IdP\uff08IdP\uff1d\u30a2\u30a4\u30c7\u30f3\u30c6\u30a3\u30c6\u30a3\u30d7\u30ed\u30d0\u30a4\u30c0\u3002\u30ed\u30b0\u30a4\u30f3\u306e\u3068\u304d\u306b\u300c\u3042\u306a\u305f\u306f\u8ab0\u304b\u300d\u3092\u78ba\u304b\u3081\u308b\u30b5\u30fc\u30d0\uff09\u306f\u3001\u3069\u3061\u3089\u3082\u958b\u767a\u7528\u306e\u30ed\u30b0\u30a4\u30f3\u306e\u52a9\u3051\u5f79\u3067\u3059\u3002\u4e8c\u3064\u306f\u6392\u4ed6\u3067\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306f\u3069\u3061\u3089\u304b\u4e00\u65b9\u3060\u3051\u3092\u8d77\u52d5\u3057\u307e\u3059\u3002</p>"},{"location":"spec/00_overview/#3-\u7d71\u5408\u306e\u4ed5\u7d44\u307f","title":"3. \u7d71\u5408\u306e\u4ed5\u7d44\u307f","text":"<p>\u30b3\u30a2\u306e\u5404\u90e8\u54c1\u3068\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\u306b\u306f\u3001RCOSDP \u7d44\u7e54\u5185\u306b\u975e\u516c\u958b\u306e\u300c\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u300d\u3092\u4e00\u3064\u305a\u3064\u4f5c\u308a\u307e\u3059\u3002\u540d\u524d\u306f <code>RDM-<name>-dev2027</code> \u3067\u3059\u3002\u305d\u306e <code>develop</code> \u30d6\u30e9\u30f3\u30c1\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u304c\u7d44\u307f\u307e\u3059\u3002\u6a2a\u306b\u300c\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\u300d\uff08\u4ed6\u306e\u5834\u6240\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u8aad\u307f\u53d6\u308a\u5c02\u7528\u3067\u5199\u3057\u305f\u3082\u306e\uff09\u3092\u3001\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306b\u8f09\u305b\u305f\u4e0a\u6d41\u3054\u3068\u306b\u4e00\u672c\u7f6e\u304d\u307e\u3059\u3002\u540d\u524d\u306f <code>upstream/<kind>-<branch></code> \u3067\u3001<code><branch></code> \u306f\u4e0a\u6d41\u306e\u30d6\u30e9\u30f3\u30c1\u540d\u306e <code>/</code> \u3092 <code>-</code> \u306b\u7f6e\u304d\u63db\u3048\u305f\u3082\u306e\u3067\u3059\uff08SPEC-01 \u00a74 \u306e\u898f\u5247 7\uff09\u3002</p> <ul> <li><code>upstream/public-<branch></code> \u2014 \u516c\u958b RCOSDP \u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u65e2\u5b9a\u30d6\u30e9\u30f3\u30c1\u3002\u4f8b: <code>upstream/public-develop</code>\uff08osf.io\u3001waterbutler\u3001mfr\u3001cas-overlay\u3001wiki-frontend\uff09\u3001<code>upstream/public-master</code>\uff08ember-osf-web\u3001y-websocket\uff09\u3002</li> <li><code>upstream/private-<branch></code> \u2014 <code>-private</code> \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u691c\u8a3c\u7248\u306e\u65e2\u5b9a\u30d6\u30e9\u30f3\u30c1\u3002\u4f8b: <code>upstream/private-develop</code>\u3001<code>upstream/private-master</code>\uff08ember-osf-web\u3001y-websocket\uff09\u3001<code>upstream/private-main</code>\uff08OASys\u3001Shibboleth-SP\u3001rdmcp\u3001aipf_mcp_data_grdm\u3002\u516c\u958b\u306e\u4e0a\u6d41\u304c\u306a\u3044\u306e\u3067\u3001\u3053\u306e\u4e00\u672c\u3060\u3051\uff09\u3002</li> <li><code>upstream/cos-develop</code> \u2014 COS \u672c\u5bb6\u3002\u53c2\u7167\u5c02\u7528\uff08wiki-frontend \u3092\u9664\u304f\u30b3\u30a2 5 \u672c\uff09\u3002</li> <li>\u540c\u3058 kind \u306e\u4e0a\u6d41\u304c\u4e8c\u3064\u3042\u308b\u3068\u304d\u306f\u30bf\u30b0\u3092\u631f\u307f\u307e\u3059\u3002<code>upstream/private-sec-test-fix-sec-test</code> \u306f <code>RDM-osf.io-private</code>\uff08\u30d6\u30e9\u30f3\u30c1 <code>fix/sec-test</code>\uff09\u3092\u3001\u30de\u30fc\u30b8\u3057\u306a\u3044\u5019\u88dc\u3068\u3057\u3066\u5199\u3057\u305f\u3082\u306e\u3067\u3059\u3002</li> </ul> <pre><code>flowchart LR\n PUB[\"RDM-<name>\uff08\u516c\u958b\uff09<br/>\u65e2\u5b9a\u30d6\u30e9\u30f3\u30c1\"] -->|\u30df\u30e9\u30fc| UP1[\"upstream/public-<branch>\"]\n PRV[\"RDM-<name>-*-private<br/>\u65e2\u5b9a\u30d6\u30e9\u30f3\u30c1\"] -->|\u30df\u30e9\u30fc| UP2[\"upstream/private-<branch>\"]\n COS[\"CenterForOpenScience/<name><br/>develop\"] -->|\u30df\u30e9\u30fc| UP3[\"upstream/cos-develop\uff08\u53c2\u7167\uff09\"]\n UP1 -->|1. \u30de\u30fc\u30b8| DEV[\"RDM-<name>-dev2027<br/>develop\"]\n UP2 -->|2. \u30de\u30fc\u30b8| DEV\n PRS[\"\u63a1\u7528 PR<br/>\uff08\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306b\u5217\u6319\uff09\"] -->|3. \u9069\u7528| DEV\n UP3 -.->|\u6bd4\u8f03\u306e\u307f| DEV\n DEV -->|\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u304c\u7d44\u3080| IMG[\"\u30ed\u30fc\u30ab\u30eb\u306e\u30a4\u30e1\u30fc\u30b8\"]</code></pre> <p>\u9806\u756a\u304c\u5927\u4e8b\u3067\u3059\u3002\u516c\u958b\u7248\u3001\u6b21\u306b private \u7248\u3001\u6700\u5f8c\u306b\u63a1\u7528 PR\u3002\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\uff08SPEC-01\uff09\u304c\u5404\u6bb5\u306e\u30b3\u30df\u30c3\u30c8\u3092 SHA\uff08\u30b3\u30df\u30c3\u30c8\u306e 40 \u6587\u5b57\u306e\u6307\u7d0b\uff09\u3067\u8a18\u9332\u3057\u307e\u3059\u3002\u3053\u308c\u3092\u6bce\u65e5\u30fb\u6bce\u9031\u4fdd\u3064\u4ed5\u4e8b\u306f SPEC-05 \u306b\u3001\u306a\u305c\u3053\u306e\u7f6e\u304d\u65b9\u306b\u3057\u305f\u304b\u306f ADR-01 \u306b\u3042\u308a\u307e\u3059\u3002</p>"},{"location":"spec/00_overview/#4-\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u5f62","title":"4. \u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u5f62","text":"<ul> <li>\u65e7\u624b\u5f15\u304d\u306e\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u5225\u540d <code>192.168.168.167</code> \u306f \u5ec3\u6b62 \u3057\u307e\u3057\u305f\u3002<code>sudo</code>\uff08\u7ba1\u7406\u8005\u6a29\u9650\uff09\u304c\u8981\u308a\u3001\u30b5\u30fc\u30d3\u30b9\u304c LAN \u306b\u898b\u3048\u3066\u3057\u307e\u3046\u304b\u3089\u3067\u3059\u3002</li> <li>\u30b3\u30f3\u30c6\u30ca\u540c\u58eb\u306f Compose \u306e\u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\uff08\u4e00\u3064\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30b3\u30f3\u30c6\u30ca\u3060\u3051\u304c\u898b\u3048\u308b\u79c1\u8a2d\u306e\u7db2\uff09\u3067\u30b5\u30fc\u30d3\u30b9\u540d\u3092\u4f7f\u3063\u3066\u8a71\u3057\u307e\u3059\u3002\u4f8b: <code>http://api:8000</code>\u3002</li> <li>\u30db\u30b9\u30c8\u306b\u516c\u958b\u3059\u308b\u30dd\u30fc\u30c8\u306f <code>127.0.0.1</code>\uff08\u300c\u3053\u306e\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u3060\u3051\u300d\u3092\u610f\u5473\u3059\u308b\u756a\u5730\uff09\u306b\u7d50\u3073\u4ed8\u3051\u305f\u3082\u306e\u3060\u3051\u3067\u3059\u3002\u4ed6\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u3067\u306f\u4f55\u3082\u5f85\u3061\u53d7\u3051\u307e\u305b\u3093\u3002</li> <li>\u5c0e\u5165\u306e\u3069\u306e\u624b\u9806\u306b\u3082 <code>sudo</code> \u306f\u8981\u308a\u307e\u305b\u3093\u3002\u7406\u7531\u306f ADR-02 \u306b\u3042\u308a\u307e\u3059\u3002</li> </ul>"},{"location":"spec/00_overview/#5-\u7bc0\u76ee\u306e\u306f\u3057\u3054","title":"5. \u7bc0\u76ee\u306e\u306f\u3057\u3054","text":"<p>\u300c\u7bc0\u76ee\uff08\u30de\u30a4\u30eb\u30b9\u30c8\u30fc\u30f3\uff09\u300d\u306f\u5408\u5426\u306e\u8a66\u9a13\u304c\u3042\u308b\u95a2\u9580\u3067\u3059\u3002\u300c\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u9580\u300d\u306f\u305d\u306e\u30d3\u30eb\u30c9\u3092\u5c0e\u5165\u3057\u3066\u3088\u3044\u304b\u3092\u6c7a\u3081\u308b\u8a66\u9a13\u3067\u3001\u7bc0\u76ee\u3054\u3068\u306b\u53b3\u3057\u304f\u306a\u308a\u307e\u3059\uff08ADR-03\uff09\u3002</p> <pre><code>milestones[5]{id,goal,security_gate}:\n M1,\"docs \u306e\u9aa8\u683c\u30fbmanifest\u30fbdev2027 \u30ea\u30dd\u30b8\u30c8\u30ea\u7fa4\u304c\u3042\u308b\u3002\u30ec\u30d3\u30e5\u30fc\u6e08\u307f PR \u304c develop \u306b\u30de\u30fc\u30b8\u6e08\u307f\",\"\u5831\u544a\uff0b\u8a31\u5bb9\u30ea\u30b9\u30c8\"\n M2,\"\u30b3\u30a2 6 \u672c\u304c Mac Studio \u3067\u4e00\u767a\u5c0e\u5165\u3002Playwright \u53d7\u5165\u5408\u683c\u3002amd64 \u30d3\u30eb\u30c9\u78ba\u8a8d\",\"\u5831\u544a\uff0b\u8a31\u5bb9\u30ea\u30b9\u30c8\uff08M1 \u3088\u308a\u4ef6\u6570\u3092\u6e1b\u3089\u3059\uff09\"\n M3,\"\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0 5 \u672c\u304c\u8d77\u52d5\u3002\u5404 1 \u672c\u306e\u6b63\u5e38\u7cfb\uff0b\u62d2\u5426\u30b1\u30fc\u30b9\",\"\u5831\u544a\uff0b\u8a31\u5bb9\u30ea\u30b9\u30c8\uff08M2 \u3088\u308a\u4ef6\u6570\u3092\u6e1b\u3089\u3059\uff09\"\n M4,\"waterbutler\u30fbmfr\u30fbosf.io \u3092 Python 3.13 \u3078\",\"HIGH \u4ee5\u4e0a\u3067\u505c\u6b62\u3002AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u521d\u56de\"\n M5,\"ES2\u30fbmongo \u5ec3\u6b62\u3002ES8\uff0bpostgres 15 \u4ee5\u964d\u3002\u6d77\u5916\u914d\u5e03\u53ef\",\"CRITICAL/HIGH \u30bc\u30ed\u3002AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u306e\u672a\u89e3\u6c7a\u7d4c\u8def\u30bc\u30ed\"</code></pre>"},{"location":"spec/00_overview/#6-\u5f79\u5272","title":"6. \u5f79\u5272","text":"<p>\u5f79\u5272\u306e\u7565\u79f0\u306f <code>AGENTS.md</code> \u306e\u5bfe\u5fdc\u8868\u306b\u5f93\u3044\u307e\u3059\u3002\u300cAI \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u300d\u306f\u3001\u6307\u793a\u3092\u8aad\u307f\u3001\u30b3\u30fc\u30c9\u3084\u6587\u66f8\u3092\u66f8\u304d\u3001\u7d50\u679c\u3092\u5831\u544a\u3059\u308b\u30d7\u30ed\u30b0\u30e9\u30e0\u3067\u3059\u3002</p> \u7565\u79f0 \u8ab0 \u4f55\u3092\u3059\u308b AID\uff08AI\u958b\u767a\u62c5\u5f53\u8005\uff09 Orca \u306e Open Code 2 \u30ef\u30fc\u30ab\u30fc\uff08\u30ed\u30fc\u30ab\u30eb LLM\uff09 \u4ed5\u69d8\u3069\u304a\u308a\u306b\u5b9f\u88c5\u3059\u308b\u3002\u6587\u66f8\u3068\u30b3\u30fc\u30c9\u3092 PR \u3067\u51fa\u3059 QAE\uff08QA\u62c5\u5f53\uff09 Claude Code Fable \u4ed5\u69d8\u3092\u66f8\u304f\u3002\u5b9f\u88c5\u3092\u691c\u67fb\u3059\u308b\u3002\u56de\u5e30\u30fb\u53d7\u5165\u8a66\u9a13\u3092\u5b9f\u884c\u3057\u5224\u5b9a\u3059\u308b REV\uff08\u62c5\u5f53\u30ec\u30d3\u30e5\u30ef\uff09 Codex Astra \u5168 PR \u306e\u72ec\u7acb\u30ec\u30d3\u30e5\u30fc\u3002\u7d50\u679c\u3092 <code>docs/reviews/</code> \u3068 PR \u30b3\u30e1\u30f3\u30c8\u306b\u6b8b\u3059 \u6240\u6709\u8005 \u4eba \u65b9\u91dd\u3092\u6c7a\u3081\u308b\u3002\u53d7\u3051\u5165\u308c\u308b\u3002\u30de\u30fc\u30b8\u3057\u516c\u958b\u3059\u308b <p>\u691c\u51fa\u3001\u4fee\u6b63 PR\u3001\u30ec\u30d3\u30e5\u30fc\u3001\u81ea\u52d5\u8a66\u9a13\u307e\u3067\u306f\u4eba\u304c\u4ecb\u5728\u3057\u307e\u305b\u3093\u3002\u30de\u30fc\u30b8\u3068\u516c\u958b\u306f\u5fc5\u305a\u6240\u6709\u8005\u304c\u884c\u3044\u307e\u3059\uff08ADR-04\uff09\u3002</p>"},{"location":"spec/00_overview/#7-\u4ed5\u69d8\u306e\u7d22\u5f15","title":"7. \u4ed5\u69d8\u306e\u7d22\u5f15","text":"ID \u30d5\u30a1\u30a4\u30eb \u4e00\u884c\u8aac\u660e SPEC-01 01_manifest.md \u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u3002\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u304c\u7d44\u3080\u4e0a\u6d41\u306e\u30b3\u30df\u30c3\u30c8\u3068 PR SPEC-02 02_installer_cli.md <code>grdm-dev</code> CLI \u3068 <code>install.sh</code>\u3002\u30db\u30b9\u30c8\u5224\u5b9a\u30fb\u79d8\u5bc6\u30fbcompose\u30fb\u30d3\u30eb\u30c9\u30fb\u5065\u5eb7\u78ba\u8a8d\u30fb\u5831\u544a SPEC-03 03_security_gate.md SBOM\u3001CVE \u30b9\u30ad\u30e3\u30f3\u3001\u9759\u7684\u89e3\u6790\u3001ZAP\u3001AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u3068\u7bc0\u76ee\u3054\u3068\u306e\u57fa\u6e96 SPEC-04 04_acceptance_tests.md Playwright Python \u306e\u53d7\u5165\u3002\u6a5f\u80fd\u3054\u3068\u306e\u6b63\u5e38\u7cfb\u3068\u62d2\u5426\u30b1\u30fc\u30b9 SPEC-05 05_upstream_tracking.md \u65e5\u6b21\u30df\u30e9\u30fc\u3068\u5dee\u5206\u5831\u544a\u3001\u9031\u6b21\u306e AI \u7d71\u5408 PR\u3001COS \u306e\u53c2\u7167\u8ffd\u8de1 SPEC-06 06_documentation_conventions.md \u3059\u3079\u3066\u306e\u6587\u66f8\u306e\u66f8\u304d\u65b9"},{"location":"spec/00_overview/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Container A box that holds one program and everything it needs, so it runs the same anywhere. \u4e00\u3064\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u3068\u5fc5\u8981\u306a\u3082\u306e\u3092\u4e00\u7bb1\u306b\u5165\u308c\u3001\u3069\u3053\u3067\u3082\u540c\u3058\u3088\u3046\u306b\u52d5\u304b\u3059\u7bb1\u3002 Base image The ready-made operating-system layer a program is built on. \u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u8f09\u305b\u308b\u571f\u53f0\u306b\u306a\u308b\u3001\u3067\u304d\u3042\u3044\u306e OS \u306e\u5c64\u3002 Upstream The original repository we copy code from. \u30b3\u30fc\u30c9\u3092\u5199\u3057\u3066\u304f\u308b\u5143\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3002 Tracking branch A read-only copy of a branch that lives somewhere else. \u4ed6\u306e\u5834\u6240\u306b\u3042\u308b\u30d6\u30e9\u30f3\u30c1\u306e\u8aad\u307f\u53d6\u308a\u5c02\u7528\u306e\u5199\u3057\u3002 SHA The 40-character fingerprint that names one commit. \u4e00\u3064\u306e\u30b3\u30df\u30c3\u30c8\u3092\u6307\u3059 40 \u6587\u5b57\u306e\u6307\u7d0b\u3002 Loopback / 127.0.0.1 The network address that means \"this computer only\". \u300c\u3053\u306e\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u3060\u3051\u300d\u3092\u610f\u5473\u3059\u308b\u756a\u5730\u3002 Security gate The test that decides whether a build may be installed. \u30d3\u30eb\u30c9\u3092\u5c0e\u5165\u3057\u3066\u3088\u3044\u304b\u3092\u6c7a\u3081\u308b\u8a66\u9a13\u3002 Milestone A checkpoint with a pass/fail test. \u5408\u5426\u306e\u8a66\u9a13\u304c\u3042\u308b\u95a2\u9580\u3002"},{"location":"spec/01_manifest/","title":"SPEC-01 Upstream Manifest / \u4e0a\u6d41\u30de\u30cb\u30d5\u30a7\u30b9\u30c8","text":"<p>Summary: The manifest is the single source of truth for what the installer builds: every component, its upstream repositories pinned to exact commits, the pull requests we adopt, the base and target images, and the profiles and platforms. This page defines its schema, its rules, and the checks that <code>grdm-dev manifest check</code> runs. \u6982\u8981: \u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306f\u300c\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u304c\u4f55\u3092\u7d44\u3080\u304b\u300d\u306e\u552f\u4e00\u306e\u6b63\u672c\u3067\u3059\u3002\u5168\u90e8\u54c1\u3001\u56fa\u5b9a\u3057\u305f\u30b3\u30df\u30c3\u30c8\u306e\u4e0a\u6d41\u3001\u63a1\u7528\u3059\u308b PR\u3001\u73fe\u884c\u3068\u76ee\u6a19\u306e\u30a4\u30e1\u30fc\u30b8\u3001\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3068\u5bfe\u5fdc\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3\u3092\u6301\u3061\u307e\u3059\u3002\u3053\u306e\u6587\u66f8\u306f\u305d\u306e\u5f62\u3001\u898f\u5247\u3001<code>grdm-dev manifest check</code> \u306e\u691c\u67fb\u9805\u76ee\u3092\u5b9a\u3081\u307e\u3059\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.5 \u2014 2026-11-05. Learned: the second real install on Apple Silicon showed that a Dockerfile whose base image is a schema-1 manifest cannot be built by current Docker at all, so a digest-pinned <code>prebuilt_image</code> fallback is needed per component, with a note and an M4 removal date, because it bypasses the build-from-pinned-source guarantee. \uff0f Apple Silicon \u3067\u306e\u4e8c\u5ea6\u76ee\u306e\u5b9f\u5c0e\u5165\u3067\u3001\u30d9\u30fc\u30b9\u30a4\u30e1\u30fc\u30b8\u304c schema 1 \u306e\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u3067\u3042\u308b Dockerfile \u306f\u73fe\u884c Docker \u3067\u306f\u307e\u3063\u305f\u304f\u7d44\u3081\u306a\u3044\u3068\u5206\u304b\u3063\u305f\u3002\u3060\u304b\u3089\u300c\u56fa\u5b9a\u3057\u305f\u5143\u304b\u3089\u7d44\u3080\u300d\u4fdd\u8a3c\u3092\u5916\u3059\u4ee3\u308f\u308a\u306b\u3001\u7406\u7531\u3068 M4 \u3067\u306e\u64a4\u53bb\u3092\u66f8\u3044\u305f <code>note</code> \u3092\u4f34\u3046\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u56fa\u5b9a\u306e <code>prebuilt_image</code> \u304c\u90e8\u54c1\u3054\u3068\u306b\u8981\u308b\u3002 0.4 \u2014 2026-11-05. Learned: the first real build on Apple Silicon showed that an EOL Python 3.5 base cannot install pandas 0.25.1 for arm64, so a per-component <code>build_platform</code> is needed until M4 modernizes those images. \uff0f Apple Silicon \u3067\u306e\u6700\u521d\u306e\u5b9f\u30d3\u30eb\u30c9\u3067\u3001EOL \u306e Python 3.5 \u30d9\u30fc\u30b9\u306f arm64 \u5411\u3051 pandas 0.25.1 \u3092\u5165\u308c\u3089\u308c\u306a\u3044\u3068\u5206\u304b\u3063\u305f\u3002M4 \u3067\u8fd1\u4ee3\u5316\u3059\u308b\u307e\u3067\u90e8\u54c1\u3054\u3068\u306e <code>build_platform</code> \u304c\u8981\u308b\u3002 0.3 \u2014 2026-11-05. Learned: building from \"the tip of develop\" is not reproducible unless the manifest pins that tip, so each component needs an <code>integration_sha</code> (nullable until the first strict merge). \uff0f \u300cdevelop \u306e\u5148\u7aef\u300d\u304b\u3089\u7d44\u3080\u306e\u3067\u306f\u518d\u73fe\u3067\u304d\u306a\u3044\u305f\u3081\u3001\u5404\u90e8\u54c1\u306b <code>integration_sha</code>\uff08\u6700\u521d\u306e\u53b3\u5bc6\u30de\u30fc\u30b8\u307e\u3067\u306f null \u53ef\uff09\u304c\u8981\u308b\u3068\u5206\u304b\u3063\u305f\u3002 0.2 \u2014 2026-11-05. Learned: a TOON block that is only an example must say so, or readers and the checker treat it as data that has to stay in step with the JSON. \uff0f \u4f8b\u306b\u3059\u304e\u306a\u3044 TOON \u30d6\u30ed\u30c3\u30af\u306f\u305d\u3046\u660e\u8a18\u3057\u306a\u3044\u3068\u3001\u8aad\u8005\u3082\u691c\u67fb\u3082 JSON \u3068\u4e00\u81f4\u3055\u305b\u308b\u3079\u304d\u30c7\u30fc\u30bf\u3068\u3057\u3066\u6271\u3063\u3066\u3057\u307e\u3046\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: the public osf.io <code>develop</code> (2026-11-05) is already newer than its <code>-private</code> twin (2026-11-02), so \"the latest\" is not one answer; only a file that pins each upstream to a SHA can say what \"consistent\" means. \uff0f \u516c\u958b osf.io \u306e <code>develop</code>\uff082026-11-05\uff09\u306f <code>-private</code>\uff082026-11-02\uff09\u3088\u308a\u65e2\u306b\u65b0\u3057\u304f\u3001\u300c\u6700\u65b0\u300d\u306f\u4e00\u3064\u306b\u6c7a\u307e\u3089\u306a\u3044\u3002\u5404\u4e0a\u6d41\u3092 SHA \u3067\u56fa\u5b9a\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u3063\u3066\u3053\u305d\u300c\u77db\u76fe\u306a\u304f\u300d\u3092\u5b9a\u7fa9\u3067\u304d\u308b\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Normative for: <code>manifest/upstreams.json</code> (canonical), <code>manifest/upstreams.toon</code> (excerpt), <code>manifest/README.md</code>, the <code>manifest</code> subcommand of <code>grdm-dev</code> (SPEC-02), and every document that quotes the manifest.</li> <li>Related: SPEC-00 Overview \u00b7 SPEC-05 Upstream tracking \u00b7 SPEC-06 Documentation conventions \u00b7 POL-01 Position \u00b7 ADR-01 Integration repository placement \u00b7 ADR-03 Staged security gate \u00b7 docs/README.md</li> </ul> <p></p>"},{"location":"spec/01_manifest/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"spec/01_manifest/#1-what-the-manifest-is","title":"1. What the manifest is","text":"<p>A manifest is a packing list: it says exactly what goes into the box. Ours says, for every component of the environment (SPEC-00 \u00a72), which upstream repositories (the original places we copy code from) are combined, at which SHA (the 40-character fingerprint of one commit), and which pull requests (PRs, proposed changes waiting to be merged) we add on top.</p> <p>The installer reads the manifest and nothing else to decide what to build. If a fact is not in the manifest, the installer does not know it.</p>"},{"location":"spec/01_manifest/#2-files","title":"2. Files","text":"File Role <code>manifest/upstreams.json</code> Canonical. The only file machines trust. JSON, UTF-8, two-space indent, keys sorted. <code>manifest/upstreams.toon</code> Excerpt in TOON (a compact text form of JSON that people read easily; SPEC-06 \u00a74). Generated from the JSON by <code>grdm-dev manifest toon</code>. Must always equal the JSON. <code>manifest/README.md</code> Explains the two files for readers, bilingual. <p>The excerpt contains the top-level fields and, for every component, <code>id</code>, <code>role</code>, <code>integration_repo</code>, <code>profile</code>, every field of <code>upstreams[]</code>, and <code>adopted_prs[]</code> reduced to <code>repo</code>, <code>number</code>, <code>status</code>. It omits <code>candidate_prs</code>, images, services, and platforms. Other files under <code>manifest/</code> (<code>allowlist.json</code>, <code>allowlist.baseline.json</code>, <code>milestone.json</code>, <code>hardening.json</code>, <code>redteam-targets.json</code>) are defined by SPEC-03; their file list is in SPEC-02 \u00a79.</p> <p>Warning: This repository is public. The manifest contains repository names and SHAs only. It never contains URLs to private repositories, access tokens, or code fragments from <code>-private</code> repositories. The CI secret scan fails the PR if it finds any.</p>"},{"location":"spec/01_manifest/#3-schema","title":"3. Schema","text":"<p>The top level has <code>schema_version</code> (integer, currently <code>1</code>), <code>generated_at</code> (ISO date), an optional <code>note</code> (free text), and <code>components[]</code>. Infrastructure images (databases, queues, <code>fakecas</code>) are components with <code>role: infra</code>. Each component has:</p> Field Type Meaning <code>id</code> string Short name, same as in SPEC-00 \u00a72. Unique. <code>role</code> <code>core</code> | <code>infra</code> | <code>subsystem</code> What kind of component. COS repositories are not components; they appear as <code>upstreams[]</code> entries with <code>kind: cos</code>. <code>services[]</code> list The Compose service names the component provides, as used in SPEC-02 \u00a74 (for example <code>web</code>, <code>api</code>, <code>admin</code>, <code>worker</code> for <code>osf.io</code>). Never empty. <code>integration_repo</code> string or <code>null</code> Name of the private integration repository, <code>RDM-<name>-dev2027</code>. Name only, never a URL. <code>null</code> for <code>infra</code>. <code>integration_branch</code> string or <code>null</code> Always <code>develop</code>; <code>null</code> for <code>infra</code>. <code>integration_sha</code> string (40 hex) or null The commit at the tip of the integration branch <code>develop</code> that this manifest pins. <code>grdm-dev build</code> and <code>compose render</code> use it for image tags. May be <code>null</code> until the strict reconstruction PRs are merged; required for M2 acceptance. <code>build_platform</code> string or absent Platform used to build and run this component's image, for example <code>linux/amd64</code>. Absent means the host platform. <code>grdm-dev build --platform</code> overrides it. Components whose EOL base has no arm64 wheels (modular-file-renderer, ember-osf-web, cas-overlay until M4) set <code>linux/amd64</code>; Compose then runs them under emulation. Must be <code>null</code> or absent for <code>infra</code>. <code>prebuilt_image</code> string or absent A registry image reference pinned by digest (<code>name@sha256:<64 hex></code>, for example <code>niicloudoperation/rdm-ember-osf-web@sha256:\u2026</code>) that is run instead of building from the integration repository. Allowed only together with a <code>note</code> that says why the build is impossible and until which milestone the fallback stays; never a URL or a private-repository reference; not allowed for <code>infra</code>. <code>grdm-dev build</code> records the component as <code>prebuilt</code>, pulls the reference and does not clone or build; <code>compose render</code> writes it as <code>image:</code> (with <code>platform:</code> from <code>build_platform</code>); <code>scan</code> treats it like any other compose image. A prebuilt image bypasses the \"build from pinned source\" guarantee of this specification: nobody can show which commits are inside it. It is a temporary measure for M2 and must be removed by M4. Current use: <code>ember-osf-web</code>, whose Dockerfile base <code>quay.io/centerforopenscience/ember-base</code> is a Docker image manifest v2 schema 1 image that current Docker refuses to pull. <code>upstreams[]</code> list Each: <code>repo</code> (name), <code>branch</code>, <code>kind</code> (<code>public</code> | <code>private</code> | <code>cos</code>), <code>tracking_branch</code> (named by rule 7), <code>status</code> (<code>merged</code> | <code>reference</code> | <code>candidate</code>), <code>sha</code> (40 lowercase hex), <code>fetched_at</code> (ISO date). Empty for <code>infra</code>. <code>adopted_prs[]</code> list Each: <code>repo</code>, <code>number</code>, <code>title</code>, <code>reason</code>, <code>status</code> (<code>adopted</code>). PRs applied on top of the merged upstreams. <code>candidate_prs[]</code> list Same shape; <code>status</code> is <code>candidate</code> or <code>rejected</code>. Not built. <code>base_image</code> string The image the component builds from today (for example <code>python:3.6-slim</code>). For <code>infra</code>, the image that is run. <code>base_image_digest</code> string or <code>null</code> The <code>sha256:</code> digest of <code>base_image</code> once pinned (SPEC-03 \u00a73.4); <code>null</code> until then. <code>target_image</code> object Keys <code>M4</code> and <code>M5</code>, each the image planned at that milestone (a milestone is a checkpoint; SPEC-00 \u00a75), or <code>null</code> when nothing changes at that milestone. <code>profile</code> <code>minimum</code> | <code>core</code> | <code>full</code> The smallest installer profile that includes the component (SPEC-02 \u00a74). <code>platforms[]</code> list Subset of <code>linux/arm64</code>, <code>linux/amd64</code>. <code>note</code> string or <code>null</code> Optional free text (for example \"mutually exclusive with fakecas\"). <p>Example for one component, in TOON:</p> <pre><code>schema_version: 1\ngenerated_at: 2026-11-05\nnote: \"Names and SHAs only.\"\ncomponents[1]:\n - id: waterbutler\n role: core\n services[2]: wb,wb_worker\n integration_repo: RDM-waterbutler-dev2027\n integration_branch: develop\n upstreams[3]{repo,branch,kind,tracking_branch,status,sha,fetched_at}:\n RDM-waterbutler,develop,public,upstream/public-develop,merged,0000000000000000000000000000000000000000,2026-11-05\n RDM-waterbutler-develop-private,develop,private,upstream/private-develop,merged,0000000000000000000000000000000000000000,2026-11-05\n CenterForOpenScience/waterbutler,develop,cos,upstream/cos-develop,reference,0000000000000000000000000000000000000000,2026-11-05\n adopted_prs[1]{repo,number,title,reason,status}:\n RDM-waterbutler,101,\"Python 3.13, dependency update, multi-stage image (WIP)\",\"vulnerability remediation (M4)\",adopted\n candidate_prs[1]{repo,number,title,reason,status}:\n RDM-waterbutler,93,\"S3 SigV4\",feature,candidate\n base_image: python:3.6-slim-buster\n base_image_digest: null\n target_image:\n M4: \"python:3.13-slim multi-stage, non-root\"\n M5: null\n profile: core\n platforms[2]: linux/arm64,linux/amd64\n note: null</code></pre> <p>The all-zero SHAs above are placeholders for the example only; a real manifest never contains them. The block is an illustrative example, not a mirror of <code>manifest/upstreams.json</code>, so it carries no <code><!-- canonical: ... --></code> declaration (SPEC-06 \u00a74); blocks that do mirror the manifest (for example in SPEC-00 \u00a72) declare it.</p>"},{"location":"spec/01_manifest/#4-rules","title":"4. Rules","text":"<ol> <li>SHAs are pinned. Every <code>upstreams[].sha</code> is a real 40-character commit that exists on the named branch at <code>fetched_at</code>. Branch names alone are never enough.</li> <li>A change to the manifest is a PR. Nobody edits <code>upstreams.json</code> on <code>develop</code> directly. The weekly integration PR (SPEC-05 \u00a73) is the normal way SHAs move. Adopting or rejecting a PR is also a manifest PR, with the <code>reason</code> filled in.</li> <li>Integration order is fixed: merge the <code>public</code> upstream with <code>status: merged</code>, then the <code>private</code> one, then apply <code>adopted_prs</code> in list order. A component that has no <code>public</code> upstream (the private subsystems) starts from its <code>private</code> upstream. The <code>cos</code> upstream (<code>status: reference</code>) is never merged; it is compared.</li> <li>\"Consistent\" (\u77db\u76fe\u306a\u304f) means all of the following:</li> <li>No two components reference two different SHAs of the same upstream repository and branch.</li> <li>Every <code>adopted_prs[]</code> entry applies cleanly (no conflict) on the integration branch built from the pinned upstreams.</li> <li><code>upstreams.toon</code> is byte-for-byte what <code>grdm-dev manifest toon</code> produces from <code>upstreams.json</code>.</li> <li>Every <code>integration_repo</code> named exists and has the branch <code>develop</code> plus one tracking branch per <code>upstreams[]</code> entry, named exactly as its <code>tracking_branch</code>.</li> <li>Names only. <code>repo</code> and <code>integration_repo</code> are bare names (<code>RDM-osf.io-dev2027</code>). A value starting with <code>http</code>, <code>git@</code>, or containing <code>github.com</code> is invalid.</li> <li>Undecided upstreams are listed with <code>status: candidate</code>. They are mirrored to their tracking branch but not merged. Example: <code>RDM-osf.io-private</code> (branch <code>fix/sec-test</code>, tracking branch <code>upstream/private-sec-test-fix-sec-test</code>) is a candidate until the owner decides (plan \u00a77).</li> <li>Tracking branches are named by one rule: <code>upstream/<kind>-<branch></code>, where <code><branch></code> is the upstream branch name with every <code>/</code> replaced by <code>-</code>. When one component lists two upstreams of the same <code>kind</code>, the second inserts a short tag after the kind: <code>upstream/<kind>-<tag>-<branch></code>. Examples: <code>RDM-ember-osf-web</code> (<code>master</code>) \u2192 <code>upstream/public-master</code>; <code>RDM-ember-osf-web-master-private</code> \u2192 <code>upstream/private-master</code>; <code>RDM-OASys-main-private</code> \u2192 <code>upstream/private-main</code>; <code>CenterForOpenScience/osf.io</code> \u2192 <code>upstream/cos-develop</code>; <code>RDM-osf.io-private</code> (<code>fix/sec-test</code>) \u2192 <code>upstream/private-sec-test-fix-sec-test</code>. The same rule is stated in SPEC-05 \u00a71 and ADR-01 \u00a73.</li> </ol>"},{"location":"spec/01_manifest/#5-validation-grdm-dev-manifest-check","title":"5. Validation: <code>grdm-dev manifest check</code>","text":"<p>Run from the repository root. Exit code <code>0</code> means pass; any failure prints one line per finding and exits <code>20</code> (manifest invalid, SPEC-02 \u00a76).</p> <pre><code>grdm-dev manifest check\n</code></pre> <p>Checks, in order:</p> <pre><code>checks[13]{id,rule,severity}:\n MC-01,\"upstreams.json parses as JSON and matches schema_version 1\",error\n MC-02,\"every component id is unique and matches ^[A-Za-z0-9_.-]+$\",error\n MC-03,\"role is one of core|infra|subsystem; services is a non-empty list\",error\n MC-04,\"integration_repo matches ^RDM-[A-Za-z0-9_.-]+-dev2027$ or is null for infra\",error\n MC-05,\"integration_branch is develop, or null for infra\",error\n MC-06,\"every sha matches ^[0-9a-f]{40}$; base_image_digest is null or sha256:<64 hex>; fetched_at is an ISO date not in the future; prebuilt_image, when present, is name@sha256:<64 hex>, has a non-empty note, is not a URL or private-repository reference, and is not on infra\",error\n MC-07,\"no value anywhere contains http, git@, github.com, or a token-like string\",error\n MC-08,\"the same (repo, branch) pair has one sha across all components\",error\n MC-09,\"adopted_prs status is adopted; candidate_prs status is candidate|rejected; upstreams status is merged|reference|candidate and cos upstreams are reference; number is a positive integer\",error\n MC-10,\"profile and platforms use only the allowed values; core components list both platforms\",error\n MC-11,\"upstreams.toon equals the output of grdm-dev manifest toon\",error\n MC-12,\"with --remote: each integration_repo has develop plus every tracking_branch listed, and each sha is reachable from its tracking_branch\",error\n MC-13,\"every tracking_branch follows rule 7 (upstream/<kind>[-<tag>]-<branch with / replaced by ->)\",error</code></pre> <p><code>--remote</code> needs network and credentials and is run in the private <code>-dev2027</code> CI, not in this public repository's CI. The documentation check in SPEC-06 \u00a78 reuses MC-11 for TOON blocks quoted in documents.</p>"},{"location":"spec/01_manifest/#6-who-changes-it","title":"6. Who changes it","text":"Change Opened by Reviewed by Merged by Weekly SHA advance AID agent (weekly job, SPEC-05) REV (Codex Astra), check by QAE (Claude Code Fable) Owner Adopt / reject a PR AID or QAE, with <code>reason</code> REV Owner Change <code>target_image</code> QAE, referencing the milestone plan REV Owner"},{"location":"spec/01_manifest/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"spec/01_manifest/#1-\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u3068\u306f","title":"1. \u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u3068\u306f","text":"<p>\u300c\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u300d\u306f\u8377\u7269\u306e\u660e\u7d30\u66f8\u3067\u3059\u3002\u7bb1\u306b\u4f55\u304c\u5165\u308b\u304b\u3092\u6b63\u78ba\u306b\u66f8\u304d\u307e\u3059\u3002\u79c1\u305f\u3061\u306e\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306f\u3001\u74b0\u5883\u306e\u5168\u90e8\u54c1\uff08SPEC-00 \u00a72\uff09\u306b\u3064\u3044\u3066\u3001\u3069\u306e\u4e0a\u6d41\uff08\u30b3\u30fc\u30c9\u3092\u5199\u3057\u3066\u304f\u308b\u5143\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\uff09\u3092\u3001\u3069\u306e SHA\uff08\u4e00\u3064\u306e\u30b3\u30df\u30c3\u30c8\u3092\u6307\u3059 40 \u6587\u5b57\u306e\u6307\u7d0b\uff09\u3067\u91cd\u306d\u3001\u3069\u306e PR\uff08\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3002\u30de\u30fc\u30b8\u3092\u5f85\u3063\u3066\u3044\u308b\u5909\u66f4\u306e\u63d0\u6848\uff09\u3092\u305d\u306e\u4e0a\u306b\u8db3\u3059\u304b\u3092\u66f8\u304d\u307e\u3059\u3002</p> <p>\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306f\u4f55\u3092\u7d44\u3080\u304b\u3092\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u3060\u3051\u304b\u3089\u6c7a\u3081\u307e\u3059\u3002\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306b\u7121\u3044\u3053\u3068\u306f\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306f\u77e5\u308a\u307e\u305b\u3093\u3002</p>"},{"location":"spec/01_manifest/#2-\u30d5\u30a1\u30a4\u30eb","title":"2. \u30d5\u30a1\u30a4\u30eb","text":"\u30d5\u30a1\u30a4\u30eb \u5f79\u5272 <code>manifest/upstreams.json</code> \u6b63\u672c\u3002 \u6a5f\u68b0\u304c\u4fe1\u3058\u308b\u552f\u4e00\u306e\u30d5\u30a1\u30a4\u30eb\u3002JSON\u3001UTF-8\u3001\u5b57\u4e0b\u3052 2 \u3064\u3001\u30ad\u30fc\u306f\u4e26\u3079\u66ff\u3048\u6e08\u307f\u3002 <code>manifest/upstreams.toon</code> TOON\uff08JSON \u3092\u4eba\u304c\u8aad\u307f\u3084\u3059\u3044\u77ed\u3044\u6587\u5b57\u5f62\u5f0f\u306b\u3057\u305f\u3082\u306e\u3002SPEC-06 \u00a74\uff09\u306e \u6284\u9332\u3002<code>grdm-dev manifest toon</code> \u304c JSON \u304b\u3089\u751f\u6210\u3059\u308b\u3002\u5e38\u306b JSON \u3068\u4e00\u81f4\u3057\u3066\u3044\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u3002 <code>manifest/README.md</code> \u4e8c\u3064\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u8005\u5411\u3051\u306b\u4e8c\u8a00\u8a9e\u3067\u8aac\u660e\u3059\u308b\u3002 <p>\u6284\u9332\u306b\u306f\u3001\u6700\u4e0a\u4f4d\u306e\u9805\u76ee\u3068\u3001\u5404\u90e8\u54c1\u306e <code>id</code>\u30fb<code>role</code>\u30fb<code>integration_repo</code>\u30fb<code>profile</code>\u3001<code>upstreams[]</code> \u306e\u5168\u9805\u76ee\u3001\u305d\u3057\u3066 <code>repo</code>\u30fb<code>number</code>\u30fb<code>status</code> \u306b\u7d5e\u3063\u305f <code>adopted_prs[]</code> \u3092\u8f09\u305b\u307e\u3059\u3002<code>candidate_prs</code>\u3001\u30a4\u30e1\u30fc\u30b8\u3001\u30b5\u30fc\u30d3\u30b9\u3001platform \u306f\u8f09\u305b\u307e\u305b\u3093\u3002<code>manifest/</code> \u306e\u4e0b\u306e\u307b\u304b\u306e\u30d5\u30a1\u30a4\u30eb\uff08<code>allowlist.json</code>\u3001<code>allowlist.baseline.json</code>\u3001<code>milestone.json</code>\u3001<code>hardening.json</code>\u3001<code>redteam-targets.json</code>\uff09\u306f SPEC-03 \u304c\u5b9a\u3081\u3001\u4e00\u89a7\u306f SPEC-02 \u00a79 \u306b\u3042\u308a\u307e\u3059\u3002</p> <p>Warning: \u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306f\u516c\u958b\u3067\u3059\u3002\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306b\u306f \u30ea\u30dd\u30b8\u30c8\u30ea\u540d\u3068 SHA \u3060\u3051 \u3092\u66f8\u304d\u307e\u3059\u3002\u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u306e URL\u3001\u30a2\u30af\u30bb\u30b9\u30c8\u30fc\u30af\u30f3\u3001<code>-private</code> \u7531\u6765\u306e\u30b3\u30fc\u30c9\u65ad\u7247\u306f\u6c7a\u3057\u3066\u66f8\u304d\u307e\u305b\u3093\u3002CI \u306e\u79d8\u5bc6\u30b9\u30ad\u30e3\u30f3\u304c\u898b\u3064\u3051\u305f\u3089 PR \u306f\u4e0d\u5408\u683c\u3067\u3059\u3002</p>"},{"location":"spec/01_manifest/#3-\u5f62\u30b9\u30ad\u30fc\u30de","title":"3. \u5f62\uff08\u30b9\u30ad\u30fc\u30de\uff09","text":"<p>\u6700\u4e0a\u4f4d\u306f <code>schema_version</code>\uff08\u6574\u6570\u3002\u4eca\u306f <code>1</code>\uff09\u3001<code>generated_at</code>\uff08ISO \u65e5\u4ed8\uff09\u3001\u4efb\u610f\u306e <code>note</code>\uff08\u81ea\u7531\u8a18\u8ff0\uff09\u3001<code>components[]</code> \u3067\u3059\u3002\u57fa\u76e4\u306e\u30a4\u30e1\u30fc\u30b8\uff08\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3001\u30ad\u30e5\u30fc\u3001<code>fakecas</code>\uff09\u3082 <code>role: infra</code> \u306e\u90e8\u54c1\u3068\u3057\u3066\u8f09\u305b\u307e\u3059\u3002\u5404\u90e8\u54c1\u306f\u6b21\u3092\u6301\u3061\u307e\u3059\u3002</p> \u9805\u76ee \u578b \u610f\u5473 <code>id</code> \u6587\u5b57\u5217 \u77ed\u3044\u540d\u524d\u3002SPEC-00 \u00a72 \u3068\u540c\u3058\u3002\u91cd\u8907\u3057\u306a\u3044\u3002 <code>role</code> <code>core</code> | <code>infra</code> | <code>subsystem</code> \u90e8\u54c1\u306e\u7a2e\u985e\u3002COS \u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306f\u90e8\u54c1\u3067\u306f\u306a\u304f\u3001<code>kind: cos</code> \u306e <code>upstreams[]</code> \u8981\u7d20\u3068\u3057\u3066\u73fe\u308c\u308b\u3002 <code>services[]</code> \u914d\u5217 \u305d\u306e\u90e8\u54c1\u304c\u63d0\u4f9b\u3059\u308b Compose \u306e\u30b5\u30fc\u30d3\u30b9\u540d\u3002SPEC-02 \u00a74 \u3068\u540c\u3058\u540d\u524d\uff08\u4f8b: <code>osf.io</code> \u306f <code>web</code>\u3001<code>api</code>\u3001<code>admin</code>\u3001<code>worker</code>\uff09\u3002\u7a7a\u306b\u3057\u306a\u3044\u3002 <code>integration_repo</code> \u6587\u5b57\u5217\u307e\u305f\u306f <code>null</code> \u975e\u516c\u958b\u306e\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u540d\u524d <code>RDM-<name>-dev2027</code>\u3002\u540d\u524d\u3060\u3051\u3067 URL \u306f\u66f8\u304b\u306a\u3044\u3002<code>infra</code> \u306f <code>null</code>\u3002 <code>integration_branch</code> \u6587\u5b57\u5217\u307e\u305f\u306f <code>null</code> \u5e38\u306b <code>develop</code>\u3002<code>infra</code> \u306f <code>null</code>\u3002 <code>integration_sha</code> \u6587\u5b57\u5217\uff0840 \u6841\u306e 16 \u9032\uff09\u307e\u305f\u306f <code>null</code> \u3053\u306e\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u304c\u56fa\u5b9a\u3059\u308b\u7d71\u5408\u30d6\u30e9\u30f3\u30c1 <code>develop</code> \u306e\u5148\u7aef\u306e\u30b3\u30df\u30c3\u30c8\u3002<code>grdm-dev build</code> \u3068 <code>compose render</code> \u306f\u3053\u306e\u5024\u3092\u30a4\u30e1\u30fc\u30b8\u306e\u30bf\u30b0\u306b\u4f7f\u3046\u3002\u53b3\u5bc6\u518d\u69cb\u7bc9 PR \u306e\u30de\u30fc\u30b8\u524d\u306f <code>null</code> \u3067\u3088\u3044\u304c\u3001M2 \u306e\u53d7\u5165\u3067\u306f\u5fc5\u9808\u3002 <code>build_platform</code> \u6587\u5b57\u5217\u307e\u305f\u306f\u7701\u7565 \u3053\u306e\u90e8\u54c1\u306e\u30a4\u30e1\u30fc\u30b8\u3092\u7d44\u3093\u3067\u52d5\u304b\u3059\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3002\u4f8b: <code>linux/amd64</code>\u3002\u7701\u7565\u6642\u306f\u30db\u30b9\u30c8\u3068\u540c\u3058\u3002<code>grdm-dev build --platform</code> \u304c\u512a\u5148\u3059\u308b\u3002EOL \u30d9\u30fc\u30b9\u3067 arm64 \u306e wheel \u304c\u306a\u3044\u90e8\u54c1\uff08M4 \u307e\u3067\u306e modular-file-renderer\u30fbember-osf-web\u30fbcas-overlay\uff09\u306f <code>linux/amd64</code> \u3092\u6307\u5b9a\u3057\u3001Compose \u306f\u30a8\u30df\u30e5\u30ec\u30fc\u30b7\u30e7\u30f3\u3067\u52d5\u304b\u3059\u3002<code>infra</code> \u3067\u306f <code>null</code> \u304b\u7701\u7565\u3002 <code>prebuilt_image</code> \u6587\u5b57\u5217\u307e\u305f\u306f\u7701\u7565 \u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u304b\u3089\u7d44\u3080 \u4ee3\u308f\u308a\u306b \u52d5\u304b\u3059\u3001\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u3067\u56fa\u5b9a\u3057\u305f\u30ec\u30b8\u30b9\u30c8\u30ea\u306e\u30a4\u30e1\u30fc\u30b8\u53c2\u7167\uff08<code>name@sha256:<16 \u9032 64 \u6587\u5b57></code>\u3002\u4f8b: <code>niicloudoperation/rdm-ember-osf-web@sha256:\u2026</code>\uff09\u3002\u306a\u305c\u7d44\u3081\u306a\u3044\u304b\u3001\u3069\u306e\u7bc0\u76ee\u307e\u3067\u3053\u306e\u4ee3\u66ff\u3092\u7d9a\u3051\u308b\u304b\u3092\u66f8\u3044\u305f <code>note</code> \u3068\u4e00\u7dd2\u306b\u3057\u304b\u66f8\u3051\u306a\u3044\u3002URL \u3084\u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u53c2\u7167\u306f\u4e0d\u53ef\u3002<code>infra</code> \u306b\u306f\u4f7f\u3048\u306a\u3044\u3002<code>grdm-dev build</code> \u306f\u305d\u306e\u90e8\u54c1\u3092 <code>prebuilt</code> \u3068\u3057\u3066\u8a18\u9332\u3057\u3001\u53c2\u7167\u3092 pull \u3059\u308b\u3060\u3051\u3067 clone \u3082 build \u3082\u3057\u306a\u3044\u3002<code>compose render</code> \u306f\u305d\u308c\u3092 <code>image:</code> \u306b\u66f8\u304d\uff08<code>platform:</code> \u306f <code>build_platform</code> \u304b\u3089\uff09\u3001<code>scan</code> \u306f\u307b\u304b\u306e Compose \u30a4\u30e1\u30fc\u30b8\u3068\u540c\u3058\u306b\u6271\u3046\u3002\u4e8b\u524d\u30d3\u30eb\u30c9\u6e08\u307f\u30a4\u30e1\u30fc\u30b8\u306f\u3001\u3053\u306e\u4ed5\u69d8\u306e\u300c\u56fa\u5b9a\u3057\u305f\u5143\u304b\u3089\u7d44\u3080\u300d\u4fdd\u8a3c\u3092\u5916\u3059\u3002\u4e2d\u306b\u3069\u306e\u30b3\u30df\u30c3\u30c8\u304c\u5165\u3063\u3066\u3044\u308b\u304b\u3092\u8ab0\u3082\u793a\u305b\u306a\u3044\u3002 M2 \u306e\u305f\u3081\u306e\u4e00\u6642\u63aa\u7f6e\u3067\u3042\u308a\u3001M4 \u307e\u3067\u306b\u5fc5\u305a\u5916\u3059\u3002\u73fe\u5728\u306e\u4f7f\u7528: <code>ember-osf-web</code>\u3002\u305d\u306e Dockerfile \u306e\u30d9\u30fc\u30b9 <code>quay.io/centerforopenscience/ember-base</code> \u306f Docker image manifest v2 schema 1 \u306e\u30a4\u30e1\u30fc\u30b8\u3067\u3001\u73fe\u884c\u306e Docker \u306f pull \u3092\u62d2\u5426\u3059\u308b\u3002 <code>upstreams[]</code> \u914d\u5217 \u5404\u8981\u7d20: <code>repo</code>\uff08\u540d\u524d\uff09\u3001<code>branch</code>\u3001<code>kind</code>\uff08<code>public</code> | <code>private</code> | <code>cos</code>\uff09\u3001<code>tracking_branch</code>\uff08\u898f\u5247 7 \u3067\u547d\u540d\uff09\u3001<code>status</code>\uff08<code>merged</code> | <code>reference</code> | <code>candidate</code>\uff09\u3001<code>sha</code>\uff08\u5c0f\u6587\u5b57 16 \u9032 40 \u6587\u5b57\uff09\u3001<code>fetched_at</code>\uff08ISO \u65e5\u4ed8\uff09\u3002<code>infra</code> \u306f\u7a7a\u3002 <code>adopted_prs[]</code> \u914d\u5217 \u5404\u8981\u7d20: <code>repo</code>\u3001<code>number</code>\u3001<code>title</code>\u3001<code>reason</code>\u3001<code>status</code>\uff08<code>adopted</code>\uff09\u3002\u4e0a\u6d41\u3092\u30de\u30fc\u30b8\u3057\u305f\u4e0a\u306b\u9069\u7528\u3059\u308b PR\u3002 <code>candidate_prs[]</code> \u914d\u5217 \u540c\u3058\u5f62\u3002<code>status</code> \u306f <code>candidate</code> \u304b <code>rejected</code>\u3002\u7d44\u307e\u306a\u3044\u3002 <code>base_image</code> \u6587\u5b57\u5217 \u305d\u306e\u90e8\u54c1\u304c\u4eca\u65e5\u7d44\u3080\u5143\u306e\u30a4\u30e1\u30fc\u30b8\uff08\u4f8b <code>python:3.6-slim</code>\uff09\u3002<code>infra</code> \u3067\u306f\u5b9f\u884c\u3059\u308b\u30a4\u30e1\u30fc\u30b8\u3002 <code>base_image_digest</code> \u6587\u5b57\u5217\u307e\u305f\u306f <code>null</code> <code>base_image</code> \u3092\u56fa\u5b9a\u3057\u305f\u3068\u304d\u306e <code>sha256:</code> \u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\uff08SPEC-03 \u00a73.4\uff09\u3002\u56fa\u5b9a\u3059\u308b\u307e\u3067\u306f <code>null</code>\u3002 <code>target_image</code> \u30aa\u30d6\u30b8\u30a7\u30af\u30c8 \u30ad\u30fc <code>M4</code> \u3068 <code>M5</code>\u3002\u5404\u7bc0\u76ee\uff08\u5408\u5426\u306e\u8a66\u9a13\u304c\u3042\u308b\u95a2\u9580\u3002SPEC-00 \u00a75\uff09\u3067\u4e88\u5b9a\u3059\u308b\u30a4\u30e1\u30fc\u30b8\u3002\u305d\u306e\u7bc0\u76ee\u3067\u5909\u3048\u306a\u3044\u306a\u3089 <code>null</code>\u3002 <code>profile</code> <code>minimum</code> | <code>core</code> | <code>full</code> \u305d\u306e\u90e8\u54c1\u3092\u542b\u3080\u6700\u5c0f\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\uff08SPEC-02 \u00a74\uff09\u3002 <code>platforms[]</code> \u914d\u5217 <code>linux/arm64</code>\u3001<code>linux/amd64</code> \u306e\u90e8\u5206\u96c6\u5408\u3002 <code>note</code> \u6587\u5b57\u5217\u307e\u305f\u306f <code>null</code> \u4efb\u610f\u306e\u81ea\u7531\u8a18\u8ff0\uff08\u4f8b:\u300cfakecas \u3068\u6392\u4ed6\u300d\uff09\u3002 <p>\u4e00\u90e8\u54c1\u306e\u4f8b\u3092 TOON \u3067\u793a\u3057\u307e\u3059\u3002</p> <pre><code>schema_version: 1\ngenerated_at: 2026-11-05\nnote: \"Names and SHAs only.\"\ncomponents[1]:\n - id: waterbutler\n role: core\n services[2]: wb,wb_worker\n integration_repo: RDM-waterbutler-dev2027\n integration_branch: develop\n upstreams[3]{repo,branch,kind,tracking_branch,status,sha,fetched_at}:\n RDM-waterbutler,develop,public,upstream/public-develop,merged,0000000000000000000000000000000000000000,2026-11-05\n RDM-waterbutler-develop-private,develop,private,upstream/private-develop,merged,0000000000000000000000000000000000000000,2026-11-05\n CenterForOpenScience/waterbutler,develop,cos,upstream/cos-develop,reference,0000000000000000000000000000000000000000,2026-11-05\n adopted_prs[1]{repo,number,title,reason,status}:\n RDM-waterbutler,101,\"Python 3.13, dependency update, multi-stage image (WIP)\",\"vulnerability remediation (M4)\",adopted\n candidate_prs[1]{repo,number,title,reason,status}:\n RDM-waterbutler,93,\"S3 SigV4\",feature,candidate\n base_image: python:3.6-slim-buster\n base_image_digest: null\n target_image:\n M4: \"python:3.13-slim multi-stage, non-root\"\n M5: null\n profile: core\n platforms[2]: linux/arm64,linux/amd64\n note: null</code></pre> <p>\u4e0a\u306e\u5168\u90e8\u30bc\u30ed\u306e SHA \u306f\u4f8b\u306e\u305f\u3081\u306e\u4eee\u306e\u5024\u3067\u3059\u3002\u672c\u7269\u306e\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306b\u306f\u73fe\u308c\u307e\u305b\u3093\u3002\u3053\u306e\u30d6\u30ed\u30c3\u30af\u306f\u8aac\u660e\u306e\u305f\u3081\u306e\u4f8b\u3067\u3042\u3063\u3066 <code>manifest/upstreams.json</code> \u306e\u5199\u3057\u3067\u306f\u306a\u3044\u306e\u3067\u3001<code><!-- canonical: ... --></code> \u306e\u5ba3\u8a00\u306f\u4ed8\u3051\u307e\u305b\u3093\uff08SPEC-06 \u00a74\uff09\u3002\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u3092\u5199\u3059\u30d6\u30ed\u30c3\u30af\uff08\u305f\u3068\u3048\u3070 SPEC-00 \u00a72\uff09\u306b\u306f\u5ba3\u8a00\u3092\u4ed8\u3051\u307e\u3059\u3002</p>"},{"location":"spec/01_manifest/#4-\u898f\u5247","title":"4. \u898f\u5247","text":"<ol> <li>SHA \u3092\u56fa\u5b9a\u3059\u308b\u3002 \u3059\u3079\u3066\u306e <code>upstreams[].sha</code> \u306f\u3001<code>fetched_at</code> \u306e\u6642\u70b9\u3067\u305d\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u5b9f\u5728\u3059\u308b 40 \u6587\u5b57\u306e\u30b3\u30df\u30c3\u30c8\u3067\u3059\u3002\u30d6\u30e9\u30f3\u30c1\u540d\u3060\u3051\u3067\u306f\u8db3\u308a\u307e\u305b\u3093\u3002</li> <li>\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306e\u5909\u66f4\u306f PR \u3067\u884c\u3046\u3002 <code>develop</code> \u4e0a\u306e <code>upstreams.json</code> \u3092\u76f4\u63a5\u7de8\u96c6\u3059\u308b\u4eba\u306f\u3044\u307e\u305b\u3093\u3002SHA \u304c\u9032\u3080\u901a\u5e38\u306e\u7d4c\u8def\u306f\u9031\u6b21\u306e\u7d71\u5408 PR\uff08SPEC-05 \u00a73\uff09\u3067\u3059\u3002PR \u306e\u63a1\u7528\u30fb\u5374\u4e0b\u3082\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306e PR \u3067\u3001<code>reason</code> \u3092\u66f8\u304d\u307e\u3059\u3002</li> <li>\u7d71\u5408\u306e\u9806\u756a\u306f\u56fa\u5b9a: <code>status: merged</code> \u306e <code>public</code> \u306e\u4e0a\u6d41\u3092\u30de\u30fc\u30b8\u3001\u6b21\u306b <code>private</code> \u306e\u4e0a\u6d41\u3092\u30de\u30fc\u30b8\u3001\u6700\u5f8c\u306b <code>adopted_prs</code> \u3092\u4e26\u3073\u9806\u306b\u9069\u7528\u3002<code>public</code> \u306e\u4e0a\u6d41\u304c\u306a\u3044\u90e8\u54c1\uff08\u975e\u516c\u958b\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\uff09\u306f <code>private</code> \u306e\u4e0a\u6d41\u304b\u3089\u59cb\u3081\u307e\u3059\u3002<code>cos</code> \u306e\u4e0a\u6d41\uff08<code>status: reference</code>\uff09\u306f\u30de\u30fc\u30b8\u305b\u305a\u3001\u6bd4\u8f03\u3060\u3051\u306b\u4f7f\u3044\u307e\u3059\u3002</li> <li>\u300c\u77db\u76fe\u306a\u304f\u300d\u3068\u306f\u6b21\u306e\u3059\u3079\u3066\u3092\u6e80\u305f\u3059\u3053\u3068:</li> <li>\u540c\u3058\u4e0a\u6d41\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u540c\u3058\u30d6\u30e9\u30f3\u30c1\u306b\u3064\u3044\u3066\u3001\u4e8c\u3064\u306e\u90e8\u54c1\u304c\u7570\u306a\u308b SHA \u3092\u53c2\u7167\u3057\u3066\u3044\u306a\u3044\u3002</li> <li>\u3059\u3079\u3066\u306e <code>adopted_prs[]</code> \u304c\u3001\u56fa\u5b9a\u3057\u305f\u4e0a\u6d41\u304b\u3089\u7d44\u3093\u3060\u7d71\u5408\u30d6\u30e9\u30f3\u30c1\u306b\u304d\u308c\u3044\u306b\uff08\u885d\u7a81\u306a\u304f\uff09\u5f53\u305f\u308b\u3002</li> <li><code>upstreams.toon</code> \u304c\u3001<code>grdm-dev manifest toon</code> \u304c <code>upstreams.json</code> \u304b\u3089\u51fa\u3059\u7d50\u679c\u3068 1 \u30d0\u30a4\u30c8\u3082\u9055\u308f\u306a\u3044\u3002</li> <li>\u540d\u524d\u3092\u66f8\u3044\u305f <code>integration_repo</code> \u304c\u3059\u3079\u3066\u5b58\u5728\u3057\u3001<code>develop</code> \u3068\u3001<code>upstreams[]</code> \u306e\u5404\u8981\u7d20\u306b\u3064\u304d\u4e00\u672c\u306e\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\uff08\u540d\u524d\u306f\u305d\u306e <code>tracking_branch</code> \u3068\u5b8c\u5168\u306b\u540c\u3058\uff09\u3092\u6301\u3064\u3002</li> <li>\u540d\u524d\u3060\u3051\u3092\u66f8\u304f\u3002 <code>repo</code> \u3068 <code>integration_repo</code> \u306f\u88f8\u306e\u540d\u524d\uff08<code>RDM-osf.io-dev2027</code>\uff09\u3067\u3059\u3002<code>http</code> \u3084 <code>git@</code> \u3067\u59cb\u307e\u308b\u5024\u3001<code>github.com</code> \u3092\u542b\u3080\u5024\u306f\u4e0d\u6b63\u3067\u3059\u3002</li> <li>\u6c7a\u307e\u3063\u3066\u3044\u306a\u3044\u4e0a\u6d41\u306f <code>status: candidate</code> \u3067\u8f09\u305b\u308b\u3002 \u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\u306b\u306f\u30df\u30e9\u30fc\u3059\u308b\u304c\u3001\u30de\u30fc\u30b8\u306f\u3057\u306a\u3044\u3002\u4f8b: <code>RDM-osf.io-private</code>\uff08\u30d6\u30e9\u30f3\u30c1 <code>fix/sec-test</code>\u3001\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1 <code>upstream/private-sec-test-fix-sec-test</code>\uff09\u306f\u6240\u6709\u8005\u304c\u6c7a\u3081\u308b\u307e\u3067\u5019\u88dc\u3067\u3059\uff08\u8a08\u753b\u66f8 \u00a77\uff09\u3002</li> <li>\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\u306e\u540d\u524d\u306f\u4e00\u3064\u306e\u898f\u5247\u3067\u6c7a\u3081\u308b: <code>upstream/<kind>-<branch></code>\u3002<code><branch></code> \u306f\u4e0a\u6d41\u306e\u30d6\u30e9\u30f3\u30c1\u540d\u306e <code>/</code> \u3092\u3059\u3079\u3066 <code>-</code> \u306b\u7f6e\u304d\u63db\u3048\u305f\u3082\u306e\u3002\u4e00\u3064\u306e\u90e8\u54c1\u306b\u540c\u3058 <code>kind</code> \u306e\u4e0a\u6d41\u304c\u4e8c\u3064\u3042\u308b\u3068\u304d\u306f\u3001\u4e8c\u3064\u76ee\u306f kind \u306e\u5f8c\u308d\u306b\u77ed\u3044\u30bf\u30b0\u3092\u631f\u3080: <code>upstream/<kind>-<tag>-<branch></code>\u3002\u4f8b: <code>RDM-ember-osf-web</code>\uff08<code>master</code>\uff09\u2192 <code>upstream/public-master</code>\u3001<code>RDM-ember-osf-web-master-private</code> \u2192 <code>upstream/private-master</code>\u3001<code>RDM-OASys-main-private</code> \u2192 <code>upstream/private-main</code>\u3001<code>CenterForOpenScience/osf.io</code> \u2192 <code>upstream/cos-develop</code>\u3001<code>RDM-osf.io-private</code>\uff08<code>fix/sec-test</code>\uff09\u2192 <code>upstream/private-sec-test-fix-sec-test</code>\u3002\u540c\u3058\u898f\u5247\u3092 SPEC-05 \u00a71 \u3068 ADR-01 \u00a73 \u306b\u3082\u66f8\u3044\u3066\u3044\u307e\u3059\u3002</li> </ol>"},{"location":"spec/01_manifest/#5-\u691c\u67fb-grdm-dev-manifest-check","title":"5. \u691c\u67fb: <code>grdm-dev manifest check</code>","text":"<p>\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30eb\u30fc\u30c8\u3067\u5b9f\u884c\u3057\u307e\u3059\u3002\u7d42\u4e86\u30b3\u30fc\u30c9 <code>0</code> \u304c\u5408\u683c\u3002\u4e0d\u5408\u683c\u306a\u3089\u6307\u6458\u3054\u3068\u306b\u4e00\u884c\u51fa\u3057\u3066 <code>20</code>\uff08manifest \u304c\u4e0d\u6b63\u3002SPEC-02 \u00a76\uff09\u3067\u7d42\u308f\u308a\u307e\u3059\u3002</p> <pre><code>grdm-dev manifest check\n</code></pre> <p>\u691c\u67fb\u306f\u6b21\u306e\u9806\u3067\u884c\u3044\u307e\u3059\u3002</p> <pre><code>checks[13]{id,rule,severity}:\n MC-01,\"upstreams.json \u304c JSON \u3068\u3057\u3066\u8aad\u3081\u3001schema_version 1 \u306e\u5f62\u306b\u5408\u3046\",error\n MC-02,\"\u90e8\u54c1\u306e id \u304c\u91cd\u8907\u305b\u305a ^[A-Za-z0-9_.-]+$ \u306b\u5408\u3046\",error\n MC-03,\"role \u304c core|infra|subsystem \u306e\u3044\u305a\u308c\u304b\u3002services \u304c\u7a7a\u3067\u306a\u3044\u914d\u5217\",error\n MC-04,\"integration_repo \u304c ^RDM-[A-Za-z0-9_.-]+-dev2027$ \u306b\u5408\u3046\u3002infra \u306f null\",error\n MC-05,\"integration_branch \u304c develop\u3002infra \u306f null\",error\n MC-06,\"sha \u304c ^[0-9a-f]{40}$ \u306b\u5408\u3046\u3002base_image_digest \u306f null \u304b sha256:<16 \u9032 64 \u6587\u5b57>\u3002fetched_at \u304c\u672a\u6765\u3067\u306a\u3044 ISO \u65e5\u4ed8\u3002prebuilt_image \u304c\u3042\u308b\u3068\u304d\u306f name@sha256:<16 \u9032 64 \u6587\u5b57> \u3067\u3001\u7a7a\u3067\u306a\u3044 note \u3092\u4f34\u3044\u3001URL \u3084\u975e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u53c2\u7167\u3067\u306a\u304f\u3001infra \u306b\u7121\u3044\",error\n MC-07,\"\u3069\u306e\u5024\u306b\u3082 http\u3001git@\u3001github.com\u3001\u30c8\u30fc\u30af\u30f3\u3089\u3057\u3044\u6587\u5b57\u5217\u304c\u542b\u307e\u308c\u306a\u3044\",error\n MC-08,\"\u540c\u3058 (repo, branch) \u306e\u7d44\u306f\u5168\u90e8\u54c1\u3067\u4e00\u3064\u306e sha\",error\n MC-09,\"adopted_prs \u306e status \u306f adopted\u3002candidate_prs \u306f candidate|rejected\u3002upstreams \u306e status \u306f merged|reference|candidate \u3067 cos \u306f reference\u3002number \u306f\u6b63\u306e\u6574\u6570\",error\n MC-10,\"profile \u3068 platforms \u304c\u8a31\u3055\u308c\u305f\u5024\u3060\u3051\u3002core \u306e\u90e8\u54c1\u306f\u4e21 platform \u3092\u6301\u3064\",error\n MC-11,\"upstreams.toon \u304c grdm-dev manifest toon \u306e\u51fa\u529b\u3068\u4e00\u81f4\",error\n MC-12,\"--remote \u4ed8\u304d: \u5404 integration_repo \u304c develop \u3068\u5217\u6319\u3057\u305f\u5168 tracking_branch \u3092\u6301\u3061\u3001\u5404 sha \u304c\u305d\u306e tracking_branch \u304b\u3089\u5230\u9054\u3067\u304d\u308b\",error\n MC-13,\"\u3059\u3079\u3066\u306e tracking_branch \u304c\u898f\u5247 7\uff08upstream/<kind>[-<tag>]-<branch \u306e / \u3092 - \u306b\u7f6e\u63db>\uff09\u306b\u5408\u3046\",error</code></pre> <p><code>--remote</code> \u306f\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3068\u8a8d\u8a3c\u60c5\u5831\u304c\u8981\u308b\u306e\u3067\u3001\u516c\u958b\u3067\u3042\u308b\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e CI \u3067\u306f\u306a\u304f\u3001\u975e\u516c\u958b\u306e <code>-dev2027</code> \u5074\u306e CI \u3067\u5b9f\u884c\u3057\u307e\u3059\u3002SPEC-06 \u00a78 \u306e\u6587\u66f8\u691c\u67fb\u306f\u3001\u6587\u66f8\u5185\u306b\u5f15\u7528\u3057\u305f TOON \u30d6\u30ed\u30c3\u30af\u306b MC-11 \u3092\u4f7f\u3044\u56de\u3057\u307e\u3059\u3002</p>"},{"location":"spec/01_manifest/#6-\u8ab0\u304c\u5909\u3048\u308b\u304b","title":"6. \u8ab0\u304c\u5909\u3048\u308b\u304b","text":"\u5909\u66f4 \u8d77\u7968 \u30ec\u30d3\u30e5\u30fc \u30de\u30fc\u30b8 \u9031\u6b21\u306e SHA \u524d\u9032 AID \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\uff08\u9031\u6b21\u30b8\u30e7\u30d6\u3002SPEC-05\uff09 REV\uff08Codex Astra\uff09\u3002\u691c\u67fb\u306f QAE\uff08Claude Code Fable\uff09 \u6240\u6709\u8005 PR \u306e\u63a1\u7528\u30fb\u5374\u4e0b AID \u307e\u305f\u306f QAE\u3002<code>reason</code> \u4ed8\u304d REV \u6240\u6709\u8005 <code>target_image</code> \u306e\u5909\u66f4 QAE\u3002\u7bc0\u76ee\u306e\u8a08\u753b\u3092\u53c2\u7167 REV \u6240\u6709\u8005"},{"location":"spec/01_manifest/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Manifest A packing list that says exactly what goes into the build. \u30d3\u30eb\u30c9\u306b\u4f55\u304c\u5165\u308b\u304b\u3092\u6b63\u78ba\u306b\u66f8\u3044\u305f\u660e\u7d30\u66f8\u3002 Upstream The original repository we copy code from. \u30b3\u30fc\u30c9\u3092\u5199\u3057\u3066\u304f\u308b\u5143\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3002 SHA The 40-character fingerprint that names one commit. \u4e00\u3064\u306e\u30b3\u30df\u30c3\u30c8\u3092\u6307\u3059 40 \u6587\u5b57\u306e\u6307\u7d0b\u3002 Pull request (PR) A proposed change waiting to be reviewed and merged. \u30ec\u30d3\u30e5\u30fc\u3068\u30de\u30fc\u30b8\u3092\u5f85\u3064\u5909\u66f4\u306e\u63d0\u6848\u3002 Schema The agreed shape of a data file: which fields, which types. \u30c7\u30fc\u30bf\u30d5\u30a1\u30a4\u30eb\u306e\u6c7a\u307e\u3063\u305f\u5f62\u3002\u3069\u306e\u9805\u76ee\u304c\u3069\u306e\u578b\u304b\u3002 Profile A named set of components the installer starts together. \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u304c\u307e\u3068\u3081\u3066\u8d77\u52d5\u3059\u308b\u90e8\u54c1\u306e\u7d44\u306b\u4ed8\u3051\u305f\u540d\u524d\u3002 Token A secret string that proves who you are to a computer. \u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u306b\u300c\u81ea\u5206\u306f\u8ab0\u304b\u300d\u3092\u793a\u3059\u79d8\u5bc6\u306e\u6587\u5b57\u5217\u3002"},{"location":"spec/02_installer_cli/","title":"SPEC-02 Installer CLI / \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc CLI","text":"<p>Summary: The contract of the two entry points that install the GakuNin RDM developer environment: the thin bootstrap <code>installer/install.sh</code> and the Python command <code>grdm-dev</code> with its subcommands, profiles, flags, exit codes, and directory layout. \u6982\u8981: GakuNin RDM \u958b\u767a\u74b0\u5883\u3092\u5c0e\u5165\u3059\u308b\u4e8c\u3064\u306e\u5165\u53e3\u3001\u8584\u3044\u8d77\u52d5\u30b9\u30af\u30ea\u30d7\u30c8 <code>installer/install.sh</code> \u3068 Python \u30b3\u30de\u30f3\u30c9 <code>grdm-dev</code> \u306e\u5951\u7d04\u3002\u30b5\u30d6\u30b3\u30de\u30f3\u30c9\u3001\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3001\u30d5\u30e9\u30b0\u3001\u7d42\u4e86\u30b3\u30fc\u30c9\u3001\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u69cb\u6210\u3092\u5b9a\u3081\u308b\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.3 \u2014 2026-11-05. Learned: <code>secrets rotate</code> had to become a coordinated database-password change plus container recreation, because <code>restart</code> keeps the old environment and leaves the captured credential valid (PR #21 review r1). \uff0f <code>restart</code> \u306f\u65e7\u3044\u74b0\u5883\u3092\u4fdd\u3064\u305f\u3081\u3001\u6355\u3089\u308c\u305f\u8cc7\u683c\u60c5\u5831\u304c\u6709\u52b9\u306a\u307e\u307e\u6b8b\u308b\u3002<code>secrets rotate</code> \u306f DB \u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u5909\u66f4\u3068\u30b3\u30f3\u30c6\u30ca\u518d\u4f5c\u6210\u3092\u675f\u306d\u305f\u624b\u9806\u306b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u3068\u5206\u304b\u3063\u305f\uff08PR #21 \u30ec\u30d3\u30e5\u30fc r1\uff09\u3002 0.2 \u2014 2026-11-05. Learned: a profile table and the acceptance criteria that depend on it must change together, and a TOON row whose text contains a comma or a colon must be quoted or the parser sees extra columns. \uff0f \u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u8868\u3068\u3001\u305d\u308c\u306b\u4f9d\u5b58\u3059\u308b\u53d7\u5165\u57fa\u6e96\u306f\u540c\u6642\u306b\u5909\u3048\u306a\u3051\u308c\u3070\u306a\u3089\u305a\u3001\u30ab\u30f3\u30de\u3084\u30b3\u30ed\u30f3\u3092\u542b\u3080 TOON \u306e\u884c\u306f\u5f15\u7528\u7b26\u3067\u56f2\u307e\u306a\u3044\u3068\u5217\u304c\u5897\u3048\u3066\u89e3\u6790\u306b\u5931\u6557\u3059\u308b\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: keeping the shell part to a bootstrap and putting every decision in one Python command is the only way to make the OS differences, the manifest check, and the reports testable with <code>unittest</code>. \uff0f \u30b7\u30a7\u30eb\u306f\u8d77\u52d5\u3060\u3051\u306b\u7559\u3081\u3001\u5224\u65ad\u3092\u3059\u3079\u3066\u4e00\u3064\u306e Python \u30b3\u30de\u30f3\u30c9\u306b\u96c6\u3081\u306a\u3044\u3068\u3001OS \u306e\u9055\u3044\u30fbmanifest \u306e\u6574\u5408\u30fb\u5831\u544a\u66f8\u3092 <code>unittest</code> \u3067\u8a66\u9a13\u3067\u304d\u306a\u3044\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Normative for: <code>installer/install.sh</code>, <code>installer/grdm_dev/</code>, <code>installer/tests/</code>, <code>runtime/</code>.</li> <li>Related: SPEC-00 Overview \u00b7 SPEC-01 Manifest \u00b7 SPEC-03 Security Gate \u00b7 SPEC-04 Acceptance Tests \u00b7 SPEC-05 Upstream Tracking \u00b7 SPEC-06 Documentation Conventions \u00b7 ADR-02 Network Model \u00b7 ADR-03 Staged Security Gate \u00b7 POL-01 Position \u00b7 docs/README.md</li> </ul> <p></p>"},{"location":"spec/02_installer_cli/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"spec/02_installer_cli/#1-scope-and-goal","title":"1. Scope and goal","text":"<p>The installer turns a fresh checkout of this repository into a running GakuNin RDM developer environment with one command, on the hosts listed in \u00a78. It never needs <code>sudo</code> (a way to run a command as the computer's administrator), never changes network settings on the host, and can be run again at any time without harm. Everything it creates lives under <code>runtime/</code>, which is ignored by Git.</p> <p>Glossary notes. An installer is a program that prepares other programs so they can run. A CLI (command line interface) is a program you drive by typing commands. A container is a box that holds one program and everything it needs, so it runs the same on any computer. Docker Compose is the tool that starts many containers together from one description file. A manifest is the list that says exactly which version of each source repository we use (SPEC-01).</p>"},{"location":"spec/02_installer_cli/#2-two-entry-points","title":"2. Two entry points","text":""},{"location":"spec/02_installer_cli/#21-installerinstallsh--thin-bootstrap","title":"2.1 <code>installer/install.sh</code> \u2014 thin bootstrap","text":"<p><code>install.sh</code> does four things and nothing else:</p> <ol> <li>Runs with the <code>bash</code> that ships with macOS (version 3.2), so it uses no feature newer than that: no associative arrays, no <code>mapfile</code>, no <code>${var,,}</code>.</li> <li>Finds <code>python3</code> and checks that it is 3.11 or newer. If not, it prints how to install one for the detected OS and exits with code 10.</li> <li>Creates a virtual environment (a private folder of Python and its libraries, separate from the system) at <code>.venv/</code> and installs the <code>installer/</code> package into it with <code>pip install -e installer</code>.</li> <li>Hands every argument to <code>.venv/bin/grdm-dev install \"$@\"</code> and exits with that command's exit code.</li> </ol> <p>OS differences are not written in <code>install.sh</code>. They live in <code>installer/grdm_dev/host.py</code>. User-facing messages come from <code>installer/grdm_dev/messages.tsv</code> (one line per code, English and Japanese columns) so that the script and the Python command say the same thing.</p> <pre><code>flowchart TD\n A[./installer/install.sh --yes] --> B{python3 >= 3.11?}\n B -- no --> X10[exit 10: how to install Python]\n B -- yes --> C[create .venv/ and pip install -e installer]\n C --> D[grdm-dev doctor]\n D -- unsupported host --> X10b[exit 10]\n D -- Docker missing --> X11[exit 11]\n D --> E[grdm-dev plan]\n E -- manifest invalid --> X20[exit 20]\n E --> F[grdm-dev secrets init]\n F --> G[grdm-dev compose render]\n G --> H[grdm-dev build]\n H -- failed --> X30[exit 30]\n H --> I[grdm-dev up]\n I --> J[grdm-dev health --network]\n J -- failed --> X40[exit 40]\n J --> K[grdm-dev scan]\n K -- gate failed --> X50[exit 50]\n K --> L[grdm-dev report]\n L --> Z[exit 0 and print URL http://127.0.0.1:5000]</code></pre>"},{"location":"spec/02_installer_cli/#22-grdm-dev--the-python-command","title":"2.2 <code>grdm-dev</code> \u2014 the Python command","text":"<p><code>grdm-dev</code> is the package <code>installer/grdm_dev/</code>, exposed as a console script. Rules:</p> <ul> <li>Standard library first. The command itself has no third-party dependency. The manifest is JSON (read with <code>json</code>), the host is read with <code>platform</code>, <code>shutil</code>, <code>socket</code>, and <code>subprocess</code>, and the generated Compose file is written as JSON, which Docker Compose accepts because JSON is valid YAML. PyYAML is therefore not required.</li> <li>Optional extra <code>accept</code>. <code>pip install -e \"installer[accept]\"</code> adds <code>pytest</code>, <code>pytest-playwright</code>, and <code>playwright</code>. Only <code>grdm-dev accept</code> imports them (SPEC-04).</li> <li>External tools are called as subprocesses and checked by <code>doctor</code>: <code>docker</code> (27 or newer) with the Compose plugin (v2 or newer) and buildx, <code>trivy</code>, <code>gitleaks</code>, and <code>semgrep</code> for <code>scan</code>, the OWASP ZAP container image for <code>scan --dynamic</code>, and <code>mkdocs</code> for <code>docs</code>. A missing scanner makes <code>scan</code> exit 51 (SPEC-03 \u00a78).</li> <li>Every subcommand supports <code>--json</code>, which prints the same report as machine-readable JSON instead of TOON (a compact text form of JSON, see SPEC-06 \u00a74).</li> </ul>"},{"location":"spec/02_installer_cli/#3-subcommands","title":"3. Subcommands","text":"Subcommand Contract Touches Docker <code>doctor</code> Detects OS (macOS, Ubuntu, WSL2), CPU (<code>arm64</code>, <code>amd64</code>), memory, free disk, Docker \u2265 27, Compose plugin (v2 or newer), buildx. Prints a TOON report. Exit 10 if the host is unsupported, 11 if Docker is missing or not running. read-only <code>plan</code> Resolves manifest + profile and prints which images would be built and which services started, with the published ports (\u00a74). Changes nothing. Exit 20 if the manifest fails SPEC-01 checks. no <code>secrets init</code> / <code>secrets rotate</code> <code>init</code> writes random secrets (database passwords, Django secret key, CAS keys) into <code>runtime/.env</code> with file mode <code>0600</code>. Never writes a default or example password. Refuses to overwrite an existing file unless <code>--force</code>. <code>rotate</code> regenerates every secret, changes the live PostgreSQL and RabbitMQ passwords, recreates the containers so they receive the new environment, and verifies that the old credentials are rejected; any failure restores the previous <code>runtime/.env</code> and exits 40. Used after a red-team capture (SPEC-03 \u00a76). no / yes <code>compose render</code> Writes <code>runtime/docker-compose.yml</code> from manifest + profile: the internal network <code>grdm</code> plus the publishing-only <code>grdm-edge</code> (<code>--egress <services></code> attaches more, recorded in <code>runtime/.env</code>; SPEC-03 \u00a73.2), per-component <code>platform:</code> from the manifest's <code>build_platform</code>, ports published only on <code>127.0.0.1</code> (\u00a74), non-root <code>user:</code> for every service, <code>read_only</code>, <code>cap_drop</code>, and resource limits (<code>mem_limit</code>, <code>cpus</code>, <code>pids_limit</code>) scaled from the memory <code>doctor</code> detected, with per-service exceptions from <code>manifest/hardening.json</code> (SPEC-03 \u00a73.3), <code>platform:</code> chosen from <code>doctor</code>, named volumes mapped under <code>runtime/volumes/</code>. Follows ADR-02. no <code>build</code> Builds images with <code>docker buildx</code>. The platform is, in order of precedence, <code>--platform</code>, the component's <code>build_platform</code> in the manifest (for example <code>linux/amd64</code> for components whose EOL base cannot be built for arm64, run under emulation), otherwise the host platform; the image is loaded locally. A component with <code>prebuilt_image</code> (SPEC-01) is not built: the digest-pinned image is pulled and reported as <code>prebuilt</code> (<code>pull-failed</code> \u2192 exit 30). <code>--push</code> pushes the multi-arch manifest to <code>ghcr.io/rcosdp/<name></code> (private). Exit 30 on failure. yes <code>up</code> / <code>down</code> / <code>reset</code> <code>up</code> starts the profile and waits for health; <code>down</code> stops containers and keeps volumes; <code>reset</code> stops and deletes <code>runtime/volumes/</code> after a confirmation (skipped by <code>--yes</code>). yes <code>health</code> Checks every service's health endpoint. With <code>--network</code>, also lists listening sockets on the host and fails (exit 40) if any container port is bound to a non-loopback address. read-only <code>scan</code> Runs the whole security gate of SPEC-03: baseline controls, Trivy SBOM (software bill of materials: the list of all parts inside an image) and CVE list, gitleaks, Semgrep, and OWASP ZAP; writes <code>runtime/reports/scan_<date>.json</code> plus TOON, and diffs findings against <code>manifest/allowlist.json</code> and <code>manifest/allowlist.baseline.json</code> for the milestone in <code>manifest/milestone.json</code>. Gate per ADR-03: M1\u2013M3 report only, M4 exit 50 on HIGH, M5 exit 50 on CRITICAL or HIGH. Flags <code>--baseline</code>, <code>--secrets</code>, <code>--dynamic</code> run one part only. Exit 51 if a scanner cannot run, 52 if <code>--dynamic</code> was asked for while services are unhealthy. read-only <code>redteam preflight</code> Verifies, before an AI red-team run, that the attacker container of the red-team Compose project is isolated (proved with a reachable canary, see SPEC-03 \u00a76), that only the containers named in <code>manifest/redteam-targets.json</code> are attached, and that the approval record is present and current. Exit 53 if either check fails. See SPEC-03 \u00a76. yes (starts and removes a canary container and network for the probe) <code>accept</code> Runs the Playwright Python acceptance suite in the same <code>.venv/</code>. <code>--only <scenario></code> runs one scenario; <code>--seed</code> creates the disposable test users. Exit 60 on any failing test. See SPEC-04. read-only <code>upstream mirror</code> / <code>upstream integrate</code> Runs the daily mirror or the weekly integration of SPEC-05 by hand. Needs Git credentials for the private <code>-dev2027</code> repositories; never run in this repository's CI. no (Git only) <code>manifest check</code> / <code>manifest toon</code> <code>check</code> validates <code>manifest/upstreams.json</code> (SPEC-01 \u00a75) and verifies that every TOON excerpt in <code>docs/</code> and <code>manifest/upstreams.toon</code> agree with it. Exit 20 on mismatch. <code>toon</code> prints the excerpt that <code>upstreams.toon</code> must equal. no <code>docs build</code> / <code>docs check</code> <code>build</code> runs MkDocs into <code>site/</code>. <code>check</code> enforces SPEC-06 \u00a78: anchors, Jump line, relative links, TOON consistency, Version line. no <code>report</code> Bundles the latest reports of <code>doctor</code>, <code>plan</code>, <code>health</code>, <code>scan</code>, and <code>accept</code> into <code>runtime/reports/<timestamp>.toon</code> and <code>.json</code>. no <code>install</code> The sequence shown in the flowchart. Stops at the first non-zero step. yes"},{"location":"spec/02_installer_cli/#4-profiles-and-published-ports","title":"4. Profiles and published ports","text":"<pre><code>profiles[3]{name,services,note}:\n minimum,\"web api postgres elasticsearch rabbitmq fakecas\",smallest set that shows a login and a project page\n core,\"minimum + admin worker wb wb_worker mfr unoconv ember_osf_web cas wiki mongo sharejs elasticsearch6 redis y_websocket\",\"the six core repositories with their infrastructure, plus y_websocket for Wiki collaborative editing\"\n full,\"core + rdmcp aipf_mcp_data_grdm oasys shibboleth_sp test_idp\",everything; shibboleth_sp replaces fakecas</code></pre> <p>Service names follow the upstream <code>docker-compose.yml</code> of RDM-osf.io so that existing guides keep working, and they are the <code>services[]</code> values of the manifest (SPEC-01 \u00a73). The <code>shibboleth</code> Compose profile and the <code>fakecas</code> service are mutually exclusive: <code>compose render --profile full --auth shibboleth</code> removes <code>fakecas</code> and adds <code>shibboleth_sp</code> and <code>test_idp</code>; the default for <code>full</code> is <code>fakecas</code>. <code>y_websocket</code> belongs to <code>core</code>, not <code>full</code>, because Wiki collaborative editing is an M2 acceptance scenario (C4 in SPEC-04 \u00a74); the manifest's <code>profile</code> for the <code>y-websocket</code> component is <code>core</code> accordingly (SPEC-01 \u00a73).</p> <p>Published ports. This table is the only place where default host ports are defined; ADR-02, SPEC-03, and REF-01 point here. Every port is published on <code>127.0.0.1</code> only.</p> <pre><code>ports[7]{service,host_port,profile,url}:\n web,5000,minimum,http://127.0.0.1:5000\n api,8000,minimum,http://127.0.0.1:8000\n admin,8001,core,http://127.0.0.1:8001\n wb,7777,core,http://127.0.0.1:7777\n mfr,7778,core,http://127.0.0.1:7778\n fakecas,8080,minimum,http://127.0.0.1:8080\n ember_osf_web,4200,core,http://127.0.0.1:4200</code></pre> <p>All other services (<code>wiki</code>, <code>cas</code>, <code>y_websocket</code>, the subsystems, <code>test_idp</code>, databases and queues) are reached only inside the Compose network; when one of them needs a browser-facing port, <code>compose render</code> assigns it and <code>plan</code> prints it. <code>compose render</code> writes every chosen host port to <code>runtime/.env</code> as <code>GRDM_PORT_<SERVICE></code> (upper case), which the acceptance tests read (SPEC-04 \u00a71). If a default port is already in use (macOS AirPlay on <code>5000</code> is the known case), <code>compose render</code> takes the next free port and records the change in the install report; exit 12 is returned only when no free port is found.</p>"},{"location":"spec/02_installer_cli/#5-flags","title":"5. Flags","text":"Flag Meaning <code>--yes</code> Answer every question with its default. Required when no terminal is attached. <code>--profile minimum\\|core\\|full</code> Default <code>core</code>. Saved in <code>runtime/.env</code> as <code>GRDM_PROFILE</code> and reused on later runs. <code>--platform linux/arm64,linux/amd64</code> Override the platforms for <code>build</code>. Default: host platform only. <code>--no-open</code> Do not open the browser after <code>up</code>. <code>--json</code> Print reports as JSON instead of TOON."},{"location":"spec/02_installer_cli/#6-exit-codes","title":"6. Exit codes","text":"<pre><code>exit_codes[13]{code,meaning}:\n 0,success\n 2,\"usage error: unknown flag or bad value\"\n 10,\"host unsupported: OS, CPU, memory, or Python too old\"\n 11,\"Docker missing, not running, or Compose / buildx plugin absent\"\n 12,a required port on 127.0.0.1 is in use and no free alternative was found\n 20,manifest invalid or TOON excerpt disagrees with JSON\n 30,image build failed\n 40,\"health check failed, or a port listens on a non-loopback address\"\n 50,security scan gate failed for the current milestone\n 51,\"scanner could not run: tool missing or vulnerability database download failed\"\n 52,\"services not healthy, so scan --dynamic could not run\"\n 53,\"red-team preflight failed: egress reachable or a target outside redteam-targets.json\"\n 60,acceptance test failed</code></pre> <p>Numbers are never reused for a new meaning; a new cause gets a new number. The canonical table is <code>installer/grdm_dev/messages.tsv</code>, and this TOON block must agree with it (<code>manifest check</code> verifies). Codes 50\u201353 are described in detail in SPEC-03 \u00a78.</p>"},{"location":"spec/02_installer_cli/#7-behavior-rules","title":"7. Behavior rules","text":"<ul> <li>Non-interactive. When <code>stdin</code> is not a terminal and <code>--yes</code> is absent, every question is answered \"no\" and the command exits 2 with a hint to add <code>--yes</code>.</li> <li>Idempotent. Running any subcommand twice gives the same result. <code>secrets init</code> keeps existing secrets, <code>compose render</code> overwrites only the generated file, <code>build</code> uses the buildx cache, <code>up</code> is a no-op for healthy services.</li> <li>No secrets in Git. <code>runtime/</code> is in <code>.gitignore</code>. <code>docs check</code> and the CI secret scan fail if a file under <code>runtime/</code> or a value that looks like a secret is committed.</li> <li>No host network changes. The loopback alias <code>192.168.168.167</code> from the old guide is not created; <code>compose render</code> rewrites the upstream <code>local.py</code> and <code>.docker-compose.*.env</code> settings to use service names inside the Compose network and <code>127.0.0.1</code> for the browser (ADR-02).</li> <li>No <code>-private</code> code here. The installer clones the integration repositories by name and SHA from the manifest at run time; this public repository holds no code from them (POL-01).</li> </ul>"},{"location":"spec/02_installer_cli/#8-supported-hosts","title":"8. Supported hosts","text":"Host CPU Support macOS 14 or newer with Docker Desktop arm64 official (M2 acceptance runs here) Ubuntu 24.04 with Docker Engine amd64, arm64 official Windows 11 with WSL2 (Ubuntu 24.04) and Docker Desktop amd64 required to work; checked in CI as build-only Other Linux, macOS on Intel any best-effort; <code>doctor</code> warns and continues"},{"location":"spec/02_installer_cli/#9-directory-layout","title":"9. Directory layout","text":"<pre><code>layout:\n installer/install.sh: bash 3.2 bootstrap\n installer/pyproject.toml: package metadata, console script grdm-dev, extra accept\n installer/grdm_dev/:\n cli.py: argument parsing, subcommand dispatch, exit codes\n host.py: OS, CPU, memory, disk, Docker detection\n manifest.py: load and validate manifest/upstreams.json, TOON comparison\n secrets.py: random secret generation, runtime/.env with mode 0600\n compose.py: render runtime/docker-compose.yml from manifest and profile\n build.py: buildx wrapper, platform list, optional push\n health.py: service health and loopback-only check\n scan.py: baseline controls, Trivy SBOM and CVE, gitleaks, Semgrep, ZAP, allow-list diff, staged gate (SPEC-03)\n redteam.py: red-team preflight (SPEC-03 \u00a76)\n upstream.py: mirror and integrate (SPEC-05)\n accept.py: run pytest-playwright in the same venv\n docs.py: MkDocs build and SPEC-06 checks\n report.py: bundle TOON and JSON reports\n messages.tsv: exit code, English message, Japanese message\n installer/tests/: unittest, files named test_*.py\n installer/acceptance/: Playwright Python, see SPEC-04\n manifest/:\n upstreams.json: canonical manifest (SPEC-01)\n upstreams.toon: excerpt generated by grdm-dev manifest toon (SPEC-01)\n allowlist.json: accepted findings (SPEC-03 \u00a75.1)\n allowlist.baseline.json: allow-list count at the last milestone exit, owner-maintained (SPEC-03 \u00a75.1)\n milestone.json: current milestone, owner-maintained (SPEC-03 \u00a75.2)\n hardening.json: per-service exceptions to read-only root and cap_drop, with reasons (SPEC-03 \u00a73.3)\n redteam-targets.json: container names the AI red team may touch (SPEC-03 \u00a76)\n runtime/: generated, git-ignored (.env, docker-compose.yml, volumes/, reports/)</code></pre>"},{"location":"spec/02_installer_cli/#10-tests","title":"10. Tests","text":"<p><code>python3 -m unittest discover -s installer/tests</code> must pass on every PR. Each module has a <code>test_<module>.py</code> that covers at least one success case and one rejection case, and every rejection case asserts the exit code from \u00a76. Docker is never required by unit tests: <code>host.py</code> and <code>build.py</code> take an injectable runner so tests pass fake <code>docker</code> output. Integration and acceptance tiers are defined in SPEC-04.</p> <p></p>"},{"location":"spec/02_installer_cli/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"spec/02_installer_cli/#1-\u7bc4\u56f2\u3068\u76ee\u7684","title":"1. \u7bc4\u56f2\u3068\u76ee\u7684","text":"<p>\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306f\u3001\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u53d6\u308a\u51fa\u3057\u305f\u76f4\u5f8c\u306e\u72b6\u614b\u304b\u3089\u3001\u00a78 \u306b\u6319\u3052\u305f\u30db\u30b9\u30c8\u3067\u3001\u30b3\u30de\u30f3\u30c9\u4e00\u3064\u3067 GakuNin RDM \u306e\u958b\u767a\u74b0\u5883\u3092\u52d5\u304b\u3059\u3082\u306e\u3067\u3059\u3002<code>sudo</code>\uff08\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u306e\u7ba1\u7406\u8005\u3068\u3057\u3066\u30b3\u30de\u30f3\u30c9\u3092\u52d5\u304b\u3059\u4ed5\u7d44\u307f\uff09\u3092\u4f7f\u308f\u305a\u3001\u30db\u30b9\u30c8\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u8a2d\u5b9a\u3092\u5909\u3048\u305a\u3001\u4f55\u5ea6\u3084\u308a\u76f4\u3057\u3066\u3082\u58ca\u308c\u307e\u305b\u3093\u3002\u4f5c\u3089\u308c\u308b\u3082\u306e\u306f\u3059\u3079\u3066 <code>runtime/</code> \u306e\u4e0b\u306b\u3042\u308a\u3001Git \u306f\u7121\u8996\u3057\u307e\u3059\u3002</p> <p>\u7528\u8a9e\u6ce8\u3002 \u300c\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u300d\u306f\u3001\u307b\u304b\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u304c\u52d5\u304f\u3088\u3046\u306b\u6e96\u5099\u3059\u308b\u30d7\u30ed\u30b0\u30e9\u30e0\u3067\u3059\u3002\u300cCLI\u300d\uff08\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\uff09\u306f\u3001\u6587\u5b57\u3067\u30b3\u30de\u30f3\u30c9\u3092\u6253\u3063\u3066\u4f7f\u3046\u30d7\u30ed\u30b0\u30e9\u30e0\u3067\u3059\u3002\u300c\u30b3\u30f3\u30c6\u30ca\u300d\u306f\u3001\u4e00\u3064\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u3068\u5fc5\u8981\u306a\u3082\u306e\u3092\u4e00\u7bb1\u306b\u5165\u308c\u3001\u3069\u306e\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u3067\u3082\u540c\u3058\u3088\u3046\u306b\u52d5\u304b\u3059\u305f\u3081\u306e\u7bb1\u3067\u3059\u3002\u300cDocker Compose\u300d\u306f\u3001\u4e00\u679a\u306e\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u591a\u304f\u306e\u30b3\u30f3\u30c6\u30ca\u3092\u307e\u3068\u3081\u3066\u8d77\u52d5\u3059\u308b\u9053\u5177\u3067\u3059\u3002\u300cmanifest\u300d\u306f\u3001\u3069\u306e\u30bd\u30fc\u30b9\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u3069\u306e\u7248\u3092\u4f7f\u3046\u304b\u3092\u6b63\u78ba\u306b\u66f8\u3044\u305f\u4e00\u89a7\u3067\u3059\uff08SPEC-01\uff09\u3002</p>"},{"location":"spec/02_installer_cli/#2-\u4e8c\u3064\u306e\u5165\u53e3","title":"2. \u4e8c\u3064\u306e\u5165\u53e3","text":""},{"location":"spec/02_installer_cli/#21-installerinstallsh--\u8584\u3044\u8d77\u52d5\u30b9\u30af\u30ea\u30d7\u30c8","title":"2.1 <code>installer/install.sh</code> \u2014 \u8584\u3044\u8d77\u52d5\u30b9\u30af\u30ea\u30d7\u30c8","text":"<p><code>install.sh</code> \u304c\u3059\u308b\u3053\u3068\u306f\u6b21\u306e\u56db\u3064\u3060\u3051\u3067\u3059\u3002</p> <ol> <li>macOS \u6a19\u6e96\u306e <code>bash</code>\uff08\u7248 3.2\uff09\u3067\u52d5\u304f\u3002\u305d\u306e\u305f\u3081\u9023\u60f3\u914d\u5217\u3001<code>mapfile</code>\u3001<code>${var,,}</code> \u306e\u3088\u3046\u306a\u65b0\u3057\u3044\u6a5f\u80fd\u306f\u4f7f\u308f\u306a\u3044\u3002</li> <li><code>python3</code> \u3092\u63a2\u3057\u30013.11 \u4ee5\u4e0a\u304b\u3092\u78ba\u304b\u3081\u308b\u3002\u8db3\u308a\u306a\u3051\u308c\u3070\u3001\u5224\u5b9a\u3057\u305f OS \u306b\u5408\u308f\u305b\u305f\u5c0e\u5165\u65b9\u6cd5\u3092\u8868\u793a\u3057\u3066\u7d42\u4e86\u30b3\u30fc\u30c9 10 \u3067\u7d42\u308f\u308b\u3002</li> <li>\u300c\u4eee\u60f3\u74b0\u5883\u300d\uff08\u30b7\u30b9\u30c6\u30e0\u3068\u306f\u5225\u306e\u3001Python \u3068\u30e9\u30a4\u30d6\u30e9\u30ea\u3060\u3051\u306e\u79c1\u7528\u30d5\u30a9\u30eb\u30c0\uff09\u3092 <code>.venv/</code> \u306b\u4f5c\u308a\u3001<code>pip install -e installer</code> \u3067 <code>installer/</code> \u30d1\u30c3\u30b1\u30fc\u30b8\u3092\u5165\u308c\u308b\u3002</li> <li>\u5f15\u6570\u3092\u3059\u3079\u3066 <code>.venv/bin/grdm-dev install \"$@\"</code> \u306b\u6e21\u3057\u3001\u305d\u306e\u7d42\u4e86\u30b3\u30fc\u30c9\u3067\u7d42\u308f\u308b\u3002</li> </ol> <p>OS \u306e\u9055\u3044\u306f <code>install.sh</code> \u306b\u306f\u66f8\u304d\u307e\u305b\u3093\u3002<code>installer/grdm_dev/host.py</code> \u306b\u9589\u3058\u8fbc\u3081\u307e\u3059\u3002\u5229\u7528\u8005\u5411\u3051\u306e\u6587\u8a00\u306f <code>installer/grdm_dev/messages.tsv</code>\uff08\u30b3\u30fc\u30c9\u3054\u3068\u306b\u4e00\u884c\u3001\u82f1\u8a9e\u3068\u65e5\u672c\u8a9e\u306e\u5217\uff09\u304b\u3089\u51fa\u3057\u3001\u30b9\u30af\u30ea\u30d7\u30c8\u3068 Python \u30b3\u30de\u30f3\u30c9\u304c\u540c\u3058\u8a00\u8449\u3092\u8a71\u3059\u3088\u3046\u306b\u3057\u307e\u3059\u3002</p> <pre><code>flowchart TD\n A[./installer/install.sh --yes] --> B{python3 \u306f 3.11 \u4ee5\u4e0a?}\n B -- \u3044\u3044\u3048 --> X10[\u7d42\u4e86 10: Python \u306e\u5c0e\u5165\u65b9\u6cd5\u3092\u8868\u793a]\n B -- \u306f\u3044 --> C[.venv/ \u3092\u4f5c\u308a pip install -e installer]\n C --> D[grdm-dev doctor]\n D -- \u5bfe\u8c61\u5916\u306e\u30db\u30b9\u30c8 --> X10b[\u7d42\u4e86 10]\n D -- Docker \u304c\u7121\u3044 --> X11[\u7d42\u4e86 11]\n D --> E[grdm-dev plan]\n E -- manifest \u4e0d\u6b63 --> X20[\u7d42\u4e86 20]\n E --> F[grdm-dev secrets init]\n F --> G[grdm-dev compose render]\n G --> H[grdm-dev build]\n H -- \u5931\u6557 --> X30[\u7d42\u4e86 30]\n H --> I[grdm-dev up]\n I --> J[grdm-dev health --network]\n J -- \u5931\u6557 --> X40[\u7d42\u4e86 40]\n J --> K[grdm-dev scan]\n K -- \u9580\u3067\u4e0d\u5408\u683c --> X50[\u7d42\u4e86 50]\n K --> L[grdm-dev report]\n L --> Z[\u7d42\u4e86 0\u3002URL http://127.0.0.1:5000 \u3092\u8868\u793a]</code></pre>"},{"location":"spec/02_installer_cli/#22-grdm-dev--python-\u30b3\u30de\u30f3\u30c9","title":"2.2 <code>grdm-dev</code> \u2014 Python \u30b3\u30de\u30f3\u30c9","text":"<p><code>grdm-dev</code> \u306f\u30d1\u30c3\u30b1\u30fc\u30b8 <code>installer/grdm_dev/</code> \u3092\u3001\u30b3\u30f3\u30bd\u30fc\u30eb\u30b9\u30af\u30ea\u30d7\u30c8\u3068\u3057\u3066\u516c\u958b\u3057\u305f\u3082\u306e\u3067\u3059\u3002\u898f\u5247\u306f\u6b21\u306e\u3068\u304a\u308a\u3067\u3059\u3002</p> <ul> <li>\u6a19\u6e96\u30e9\u30a4\u30d6\u30e9\u30ea\u512a\u5148\u3002 \u30b3\u30de\u30f3\u30c9\u672c\u4f53\u306f\u5916\u90e8\u30e9\u30a4\u30d6\u30e9\u30ea\u306b\u4f9d\u5b58\u3057\u307e\u305b\u3093\u3002manifest \u306f JSON\uff08<code>json</code> \u3067\u8aad\u3080\uff09\u3001\u30db\u30b9\u30c8\u306f <code>platform</code>\u30fb<code>shutil</code>\u30fb<code>socket</code>\u30fb<code>subprocess</code> \u3067\u8aad\u307f\u3001\u751f\u6210\u3059\u308b Compose \u30d5\u30a1\u30a4\u30eb\u306f JSON \u3067\u66f8\u304d\u51fa\u3057\u307e\u3059\u3002JSON \u306f YAML \u3068\u3057\u3066\u6b63\u3057\u3044\u306e\u3067 Docker Compose \u304c\u305d\u306e\u307e\u307e\u8aad\u3081\u307e\u3059\u3002\u3057\u305f\u304c\u3063\u3066 PyYAML \u306f\u8981\u308a\u307e\u305b\u3093\u3002</li> <li>\u4efb\u610f\u306e\u8ffd\u52a0 <code>accept</code>\u3002 <code>pip install -e \"installer[accept]\"</code> \u3067 <code>pytest</code>\u30fb<code>pytest-playwright</code>\u30fb<code>playwright</code> \u304c\u5165\u308a\u307e\u3059\u3002\u3053\u308c\u3089\u3092\u8aad\u307f\u8fbc\u3080\u306e\u306f <code>grdm-dev accept</code> \u3060\u3051\u3067\u3059\uff08SPEC-04\uff09\u3002</li> <li>\u5916\u90e8\u306e\u9053\u5177 \u306f\u30b5\u30d6\u30d7\u30ed\u30bb\u30b9\u3068\u3057\u3066\u547c\u3073\u3001<code>doctor</code> \u304c\u6709\u7121\u3092\u78ba\u304b\u3081\u307e\u3059\u3002<code>docker</code>\uff0827 \u4ee5\u4e0a\uff09\u3068 Compose \u30d7\u30e9\u30b0\u30a4\u30f3\uff08v2 \u4ee5\u4e0a\uff09\u30fbbuildx\u3001<code>scan</code> \u7528\u306e <code>trivy</code>\u30fb<code>gitleaks</code>\u30fb<code>semgrep</code>\u3001<code>scan --dynamic</code> \u7528\u306e OWASP ZAP \u306e\u30b3\u30f3\u30c6\u30ca\u30a4\u30e1\u30fc\u30b8\u3001<code>docs</code> \u7528\u306e <code>mkdocs</code> \u3067\u3059\u3002\u30b9\u30ad\u30e3\u30ca\u30fc\u304c\u7121\u3044\u3068 <code>scan</code> \u306f\u7d42\u4e86 51 \u3067\u7d42\u308f\u308a\u307e\u3059\uff08SPEC-03 \u00a78\uff09\u3002</li> <li>\u3059\u3079\u3066\u306e\u30b5\u30d6\u30b3\u30de\u30f3\u30c9\u306f <code>--json</code> \u3092\u53d7\u3051\u4ed8\u3051\u3001TOON\uff08JSON \u3092\u77ed\u304f\u66f8\u3044\u305f\u6587\u5b57\u5f62\u5f0f\u3002SPEC-06 \u00a74\uff09\u306e\u4ee3\u308f\u308a\u306b\u6a5f\u68b0\u304c\u8aad\u3080 JSON \u3067\u540c\u3058\u5831\u544a\u3092\u51fa\u3057\u307e\u3059\u3002</li> </ul>"},{"location":"spec/02_installer_cli/#3-\u30b5\u30d6\u30b3\u30de\u30f3\u30c9","title":"3. \u30b5\u30d6\u30b3\u30de\u30f3\u30c9","text":"\u30b5\u30d6\u30b3\u30de\u30f3\u30c9 \u5951\u7d04 Docker \u306b\u89e6\u308c\u308b\u304b <code>doctor</code> OS\uff08macOS\u30fbUbuntu\u30fbWSL2\uff09\u3001CPU\uff08<code>arm64</code>\u30fb<code>amd64</code>\uff09\u3001\u30e1\u30e2\u30ea\u3001\u7a7a\u304d\u5bb9\u91cf\u3001Docker 27 \u4ee5\u4e0a\u3001Compose \u30d7\u30e9\u30b0\u30a4\u30f3\uff08v2 \u4ee5\u4e0a\uff09\u3001buildx \u3092\u5224\u5b9a\u3057 TOON \u3067\u5831\u544a\u3059\u308b\u3002\u5bfe\u8c61\u5916\u306e\u30db\u30b9\u30c8\u306f\u7d42\u4e86 10\u3001Docker \u304c\u7121\u3044\u30fb\u52d5\u3044\u3066\u3044\u306a\u3044\u3068\u304d\u306f 11\u3002 \u8aad\u3080\u3060\u3051 <code>plan</code> manifest \u3068\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3092\u89e3\u6c7a\u3057\u3001\u3069\u306e\u30a4\u30e1\u30fc\u30b8\u3092\u4f5c\u308a\u3069\u306e\u30b5\u30fc\u30d3\u30b9\u3092\u8d77\u3053\u3059\u304b\u3001\u516c\u958b\u30dd\u30fc\u30c8\uff08\u00a74\uff09\u3068\u3068\u3082\u306b\u8868\u793a\u3059\u308b\u3002\u4f55\u3082\u5909\u3048\u306a\u3044\u3002manifest \u304c SPEC-01 \u306e\u691c\u67fb\u306b\u843d\u3061\u308c\u3070\u7d42\u4e86 20\u3002 \u89e6\u308c\u306a\u3044 <code>secrets init</code> / <code>secrets rotate</code> <code>init</code> \u306f\u4e71\u6570\u306e\u79d8\u5bc6\uff08DB \u30d1\u30b9\u30ef\u30fc\u30c9\u3001Django \u306e\u79d8\u5bc6\u9375\u3001CAS \u306e\u9375\uff09\u3092 <code>runtime/.env</code> \u306b\u30e2\u30fc\u30c9 <code>0600</code> \u3067\u66f8\u304f\u3002\u65e2\u5b9a\u5024\u3084\u4f8b\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u6c7a\u3057\u3066\u66f8\u304b\u306a\u3044\u3002\u65e2\u5b58\u30d5\u30a1\u30a4\u30eb\u306f <code>--force</code> \u304c\u306a\u3051\u308c\u3070\u4e0a\u66f8\u304d\u3057\u306a\u3044\u3002<code>rotate</code> \u306f\u3059\u3079\u3066\u306e\u79d8\u5bc6\u3092\u4f5c\u308a\u76f4\u3057\u3001\u7a3c\u50cd\u4e2d\u306e PostgreSQL \u3068 RabbitMQ \u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5909\u66f4\u3057\u3001\u65b0\u3057\u3044\u74b0\u5883\u3092\u53d7\u3051\u53d6\u308b\u3088\u3046\u30b3\u30f3\u30c6\u30ca\u3092\u518d\u4f5c\u6210\u3057\u3001\u65e7\u3044\u8cc7\u683c\u60c5\u5831\u304c\u62d2\u5426\u3055\u308c\u308b\u3053\u3068\u3092\u78ba\u304b\u3081\u308b\u3002\u3069\u3053\u304b\u3067\u5931\u6557\u3057\u305f\u3089\u4ee5\u524d\u306e <code>runtime/.env</code> \u306b\u623b\u3057\u3066 40 \u3067\u7d42\u308f\u308b\u3002\u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u306b\u79d8\u5bc6\u3092\u53d6\u3089\u308c\u305f\u5f8c\u306b\u4f7f\u3046\uff08SPEC-03 \u00a76\uff09\u3002 \u89e6\u308c\u306a\u3044 / \u89e6\u308c\u308b <code>compose render</code> manifest \u3068\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u304b\u3089 <code>runtime/docker-compose.yml</code> \u3092\u66f8\u304f\u3002\u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af <code>grdm</code> \u3068\u516c\u958b\u5c02\u7528\u306e <code>grdm-edge</code>\uff08<code>--egress <services></code> \u3067\u8ffd\u52a0\u63a5\u7d9a\u3057 <code>runtime/.env</code> \u306b\u8a18\u9332\u3002SPEC-03 \u00a73.2\uff09\u3001\u90e8\u54c1\u3054\u3068\u306e <code>platform:</code> \u306f manifest \u306e <code>build_platform</code> \u304b\u3089\u3001\u30dd\u30fc\u30c8\u306f <code>127.0.0.1</code> \u306b\u3060\u3051\u516c\u958b\uff08\u00a74\uff09\u3001\u5168\u30b5\u30fc\u30d3\u30b9\u306b\u975e root \u306e <code>user:</code>\u3001<code>read_only</code>\u30fb<code>cap_drop</code>\u30fb\u8cc7\u6e90\u5236\u9650\uff08<code>mem_limit</code>\u30fb<code>cpus</code>\u30fb<code>pids_limit</code>\u3002<code>doctor</code> \u304c\u691c\u51fa\u3057\u305f\u30e1\u30e2\u30ea\u306b\u5fdc\u3058\u3066\u6c7a\u3081\u308b\uff09\u3001\u30b5\u30fc\u30d3\u30b9\u3054\u3068\u306e\u4f8b\u5916\u306f <code>manifest/hardening.json</code> \u304b\u3089\uff08SPEC-03 \u00a73.3\uff09\u3001<code>platform:</code> \u306f <code>doctor</code> \u306e\u7d50\u679c\u304b\u3089\u9078\u3076\u3001\u540d\u524d\u4ed8\u304d\u30dc\u30ea\u30e5\u30fc\u30e0\u306f <code>runtime/volumes/</code> \u306e\u4e0b\u3002ADR-02 \u306b\u5f93\u3046\u3002 \u89e6\u308c\u306a\u3044 <code>build</code> <code>docker buildx</code> \u3067\u30a4\u30e1\u30fc\u30b8\u3092\u4f5c\u308b\u3002\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306f\u512a\u5148\u9806\u306b <code>--platform</code>\u3001manifest \u306e\u90e8\u54c1\u306e <code>build_platform</code>\uff08\u4f8b: EOL \u30d9\u30fc\u30b9\u3067 arm64 \u306b\u7d44\u3081\u306a\u3044\u90e8\u54c1\u306f <code>linux/amd64</code> \u306b\u3057\u3066\u30a8\u30df\u30e5\u30ec\u30fc\u30b7\u30e7\u30f3\u3067\u52d5\u304b\u3059\uff09\u3001\u305d\u308c\u3082\u306a\u3051\u308c\u3070\u30db\u30b9\u30c8\u3068\u540c\u3058\u3002\u30a4\u30e1\u30fc\u30b8\u306f\u30ed\u30fc\u30ab\u30eb\u306b\u8aad\u307f\u8fbc\u3080\u3002<code>prebuilt_image</code>\uff08SPEC-01\uff09\u3092\u6301\u3064\u90e8\u54c1\u306f\u7d44\u307e\u305a\u3001\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u56fa\u5b9a\u306e\u30a4\u30e1\u30fc\u30b8\u3092\u53d6\u5f97\u3057\u3066 <code>prebuilt</code> \u3068\u5831\u544a\u3059\u308b\uff08<code>pull-failed</code> \u306f\u7d42\u4e86 30\uff09\u3002<code>--push</code> \u3067 multi-arch \u306e manifest \u3092 <code>ghcr.io/rcosdp/<name></code>\uff08\u975e\u516c\u958b\uff09\u3078\u9001\u308b\u3002\u5931\u6557\u306f\u7d42\u4e86 30\u3002 \u89e6\u308c\u308b <code>up</code> / <code>down</code> / <code>reset</code> <code>up</code> \u306f\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3092\u8d77\u52d5\u3057\u5065\u5eb7\u306b\u306a\u308b\u307e\u3067\u5f85\u3064\u3002<code>down</code> \u306f\u30b3\u30f3\u30c6\u30ca\u3092\u6b62\u3081\u30dc\u30ea\u30e5\u30fc\u30e0\u3092\u6b8b\u3059\u3002<code>reset</code> \u306f\u6b62\u3081\u305f\u3046\u3048\u3067\u78ba\u8a8d\u306e\u5f8c\u306b <code>runtime/volumes/</code> \u3092\u6d88\u3059\uff08<code>--yes</code> \u3067\u78ba\u8a8d\u3092\u7701\u304f\uff09\u3002 \u89e6\u308c\u308b <code>health</code> \u5404\u30b5\u30fc\u30d3\u30b9\u306e\u5065\u5eb7\u78ba\u8a8d\u7528\u306e URL \u3092\u8abf\u3079\u308b\u3002<code>--network</code> \u3092\u4ed8\u3051\u308b\u3068\u3001\u30db\u30b9\u30c8\u3067\u5f85\u3061\u53d7\u3051\u3066\u3044\u308b\u30bd\u30b1\u30c3\u30c8\u3082\u4e00\u89a7\u3057\u3001\u30b3\u30f3\u30c6\u30ca\u306e\u30dd\u30fc\u30c8\u304c\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u4ee5\u5916\u306e\u756a\u5730\u306b\u7d50\u3073\u4ed8\u3044\u3066\u3044\u308c\u3070\u7d42\u4e86 40\u3002 \u8aad\u3080\u3060\u3051 <code>scan</code> SPEC-03 \u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u9580\u3092\u5168\u90e8\u52d5\u304b\u3059\u3002\u57fa\u672c\u5bfe\u7b56\u3001Trivy \u306e SBOM\uff08\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u90e8\u54c1\u8868\u3002\u30a4\u30e1\u30fc\u30b8\u306b\u5165\u3063\u3066\u3044\u308b\u90e8\u54c1\u306e\u4e00\u89a7\uff09\u3068 CVE \u306e\u4e00\u89a7\u3001gitleaks\u3001Semgrep\u3001OWASP ZAP\u3002<code>runtime/reports/scan_<\u65e5\u4ed8>.json</code> \u3068 TOON \u3092\u66f8\u304d\u3001<code>manifest/milestone.json</code> \u306e\u7bc0\u76ee\u306b\u5408\u308f\u305b\u3066 <code>manifest/allowlist.json</code> \u3068 <code>manifest/allowlist.baseline.json</code> \u3068\u5dee\u5206\u3092\u53d6\u308b\u3002\u9580\u306f ADR-03 \u3069\u304a\u308a\u3001M1\u301cM3 \u306f\u5831\u544a\u306e\u307f\u3001M4 \u306f HIGH \u3067\u7d42\u4e86 50\u3001M5 \u306f CRITICAL \u304b HIGH \u3067\u7d42\u4e86 50\u3002\u30d5\u30e9\u30b0 <code>--baseline</code>\u30fb<code>--secrets</code>\u30fb<code>--dynamic</code> \u306f\u4e00\u90e8\u3060\u3051\u3092\u52d5\u304b\u3059\u3002\u30b9\u30ad\u30e3\u30ca\u30fc\u304c\u52d5\u304b\u306a\u3051\u308c\u3070\u7d42\u4e86 51\u3001\u30b5\u30fc\u30d3\u30b9\u304c\u5065\u5168\u3067\u306a\u3044\u306e\u306b <code>--dynamic</code> \u3092\u6c42\u3081\u305f\u3089\u7d42\u4e86 52\u3002 \u8aad\u3080\u3060\u3051 <code>redteam preflight</code> AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u306e\u5b9f\u884c\u524d\u306b\u3001\u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u7528 Compose \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u653b\u6483\u5074\u30b3\u30f3\u30c6\u30ca\u304c\u9694\u96e2\u3055\u308c\u3066\u3044\u308b\u3053\u3068\uff08\u5c4a\u304f\u306f\u305a\u306e\u30ab\u30ca\u30ea\u30a2\u3067\u8a3c\u660e\u3059\u308b\u3002SPEC-03 \u00a76\uff09\u3001<code>manifest/redteam-targets.json</code> \u306b\u540d\u524d\u306e\u3042\u308b\u30b3\u30f3\u30c6\u30ca\u3060\u3051\u304c\u63a5\u7d9a\u3057\u3066\u3044\u308b\u3053\u3068\u3001\u627f\u8a8d\u8a18\u9332\u304c\u3042\u308a\u65b0\u3057\u3044\u3053\u3068\u3092\u78ba\u304b\u3081\u308b\u3002\u3069\u3061\u3089\u304b\u304c\u5916\u308c\u308c\u3070\u7d42\u4e86 53\u3002\u8a73\u7d30\u306f SPEC-03 \u00a76\u3002 \u89e6\u308c\u308b\uff08\u691c\u67fb\u7528\u306e\u30ab\u30ca\u30ea\u30a2\u306e\u30b3\u30f3\u30c6\u30ca\u3068\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3092\u4f5c\u3063\u3066\u6d88\u3059\uff09 <code>accept</code> Playwright Python \u306e\u53d7\u5165\u8a66\u9a13\u3092\u540c\u3058 <code>.venv/</code> \u3067\u5b9f\u884c\u3059\u308b\u3002<code>--only <\u30b7\u30ca\u30ea\u30aa></code> \u3067\u4e00\u3064\u3060\u3051\u3001<code>--seed</code> \u3067\u4f7f\u3044\u6368\u3066\u306e\u8a66\u9a13\u5229\u7528\u8005\u3092\u4f5c\u308b\u3002\u4e00\u4ef6\u3067\u3082\u5931\u6557\u3059\u308c\u3070\u7d42\u4e86 60\u3002\u8a73\u7d30\u306f SPEC-04\u3002 \u8aad\u3080\u3060\u3051 <code>upstream mirror</code> / <code>upstream integrate</code> SPEC-05 \u306e\u65e5\u6b21\u30df\u30e9\u30fc\u3068\u9031\u6b21\u7d71\u5408\u3092\u624b\u3067\u52d5\u304b\u3059\u3002\u975e\u516c\u958b\u306e <code>-dev2027</code> \u3078\u306e Git \u8a8d\u8a3c\u60c5\u5831\u304c\u8981\u308a\u3001\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e CI \u3067\u306f\u6c7a\u3057\u3066\u52d5\u304b\u3055\u306a\u3044\u3002 \u89e6\u308c\u306a\u3044\uff08Git \u306e\u307f\uff09 <code>manifest check</code> / <code>manifest toon</code> <code>check</code> \u306f <code>manifest/upstreams.json</code> \u3092\u691c\u8a3c\u3057\uff08SPEC-01 \u00a75\uff09\u3001<code>docs/</code> \u5185\u306e TOON \u306e\u6284\u9332\u3068 <code>manifest/upstreams.toon</code> \u304c\u305d\u308c\u3068\u4e00\u81f4\u3059\u308b\u304b\u78ba\u304b\u3081\u308b\u3002\u4e0d\u4e00\u81f4\u306f\u7d42\u4e86 20\u3002<code>toon</code> \u306f <code>upstreams.toon</code> \u304c\u4e00\u81f4\u3059\u3079\u304d\u6284\u9332\u3092\u51fa\u529b\u3059\u308b\u3002 \u89e6\u308c\u306a\u3044 <code>docs build</code> / <code>docs check</code> <code>build</code> \u306f MkDocs \u3067 <code>site/</code> \u3092\u4f5c\u308b\u3002<code>check</code> \u306f SPEC-06 \u00a78 \u306e\u30a2\u30f3\u30ab\u30fc\u3001Jump \u884c\u3001\u76f8\u5bfe\u30ea\u30f3\u30af\u3001TOON \u306e\u4e00\u81f4\u3001Version \u884c\u3092\u691c\u67fb\u3059\u308b\u3002 \u89e6\u308c\u306a\u3044 <code>report</code> <code>doctor</code>\u30fb<code>plan</code>\u30fb<code>health</code>\u30fb<code>scan</code>\u30fb<code>accept</code> \u306e\u6700\u65b0\u306e\u5831\u544a\u3092 <code>runtime/reports/<\u6642\u523b>.toon</code> \u3068 <code>.json</code> \u306b\u307e\u3068\u3081\u308b\u3002 \u89e6\u308c\u306a\u3044 <code>install</code> \u6d41\u308c\u56f3\u306e\u9806\u306b\u5b9f\u884c\u3059\u308b\u3002\u6700\u521d\u306b 0 \u4ee5\u5916\u3067\u7d42\u308f\u3063\u305f\u6bb5\u3067\u6b62\u307e\u308b\u3002 \u89e6\u308c\u308b"},{"location":"spec/02_installer_cli/#4-\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3068\u516c\u958b\u30dd\u30fc\u30c8","title":"4. \u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3068\u516c\u958b\u30dd\u30fc\u30c8","text":"<pre><code>profiles[3]{name,services,note}:\n minimum,\"web api postgres elasticsearch rabbitmq fakecas\",\u30ed\u30b0\u30a4\u30f3\u3068\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u753b\u9762\u304c\u898b\u3048\u308b\u6700\u5c0f\u306e\u7d44\n core,\"minimum + admin worker wb wb_worker mfr unoconv ember_osf_web cas wiki mongo sharejs elasticsearch6 redis y_websocket\",\u30b3\u30a2 6 \u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u57fa\u76e4\u3002Wiki \u5171\u540c\u7de8\u96c6\u306e y_websocket \u3092\u542b\u3080\n full,\"core + rdmcp aipf_mcp_data_grdm oasys shibboleth_sp test_idp\",\u5168\u90e8\u3002shibboleth_sp \u306f fakecas \u3068\u5165\u308c\u66ff\u308f\u308b</code></pre> <p>\u30b5\u30fc\u30d3\u30b9\u540d\u306f RDM-osf.io \u4e0a\u6d41\u306e <code>docker-compose.yml</code> \u306b\u5408\u308f\u305b\u3001\u65e2\u5b58\u306e\u624b\u5f15\u304d\u304c\u305d\u306e\u307e\u307e\u4f7f\u3048\u308b\u3088\u3046\u306b\u3057\u307e\u3059\u3002\u3053\u308c\u306f manifest \u306e <code>services[]</code> \u306e\u5024\u3067\u3082\u3042\u308a\u307e\u3059\uff08SPEC-01 \u00a73\uff09\u3002Compose \u30d7\u30ed\u30d5\u30a1\u30a4\u30eb <code>shibboleth</code> \u3068\u30b5\u30fc\u30d3\u30b9 <code>fakecas</code> \u306f\u6392\u4ed6\u3067\u3059\u3002<code>compose render --profile full --auth shibboleth</code> \u306f <code>fakecas</code> \u3092\u5916\u3057\u3066 <code>shibboleth_sp</code> \u3068 <code>test_idp</code> \u3092\u8db3\u3057\u307e\u3059\u3002<code>full</code> \u306e\u65e2\u5b9a\u306f <code>fakecas</code> \u3067\u3059\u3002<code>y_websocket</code> \u306f <code>full</code> \u3067\u306a\u304f <code>core</code> \u306b\u5c5e\u3057\u307e\u3059\u3002Wiki \u5171\u540c\u7de8\u96c6\u304c M2 \u306e\u53d7\u5165\u30b7\u30ca\u30ea\u30aa\uff08SPEC-04 \u00a74 \u306e C4\uff09\u3060\u304b\u3089\u3067\u3059\u3002manifest \u306e <code>y-websocket</code> \u90e8\u54c1\u306e <code>profile</code> \u3082\u305d\u308c\u306b\u5408\u308f\u305b\u3066 <code>core</code> \u3067\u3059\uff08SPEC-01 \u00a73\uff09\u3002</p> <p>\u516c\u958b\u30dd\u30fc\u30c8\u3002 \u65e2\u5b9a\u306e\u30db\u30b9\u30c8\u5074\u30dd\u30fc\u30c8\u3092\u5b9a\u3081\u308b\u306e\u306f\u3053\u306e\u8868\u3060\u3051\u3067\u3059\u3002ADR-02\u3001SPEC-03\u3001REF-01 \u306f\u3053\u3053\u3092\u6307\u3057\u307e\u3059\u3002\u3059\u3079\u3066 <code>127.0.0.1</code> \u306b\u3060\u3051\u516c\u958b\u3057\u307e\u3059\u3002</p> <pre><code>ports[7]{service,host_port,profile,url}:\n web,5000,minimum,http://127.0.0.1:5000\n api,8000,minimum,http://127.0.0.1:8000\n admin,8001,core,http://127.0.0.1:8001\n wb,7777,core,http://127.0.0.1:7777\n mfr,7778,core,http://127.0.0.1:7778\n fakecas,8080,minimum,http://127.0.0.1:8080\n ember_osf_web,4200,core,http://127.0.0.1:4200</code></pre> <p>\u307b\u304b\u306e\u30b5\u30fc\u30d3\u30b9\uff08<code>wiki</code>\u3001<code>cas</code>\u3001<code>y_websocket</code>\u3001\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\u3001<code>test_idp</code>\u3001\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3068\u30ad\u30e5\u30fc\uff09\u306b\u306f Compose \u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u4e2d\u304b\u3089\u3060\u3051\u5c4a\u304d\u307e\u3059\u3002\u30d6\u30e9\u30a6\u30b6\u5411\u3051\u306e\u30dd\u30fc\u30c8\u304c\u8981\u308b\u3068\u304d\u306f <code>compose render</code> \u304c\u5272\u308a\u5f53\u3066\u3001<code>plan</code> \u304c\u8868\u793a\u3057\u307e\u3059\u3002<code>compose render</code> \u306f\u9078\u3093\u3060\u30db\u30b9\u30c8\u5074\u30dd\u30fc\u30c8\u3092\u3059\u3079\u3066 <code>runtime/.env</code> \u306b <code>GRDM_PORT_<SERVICE></code>\uff08\u5927\u6587\u5b57\uff09\u3068\u3057\u3066\u66f8\u304d\u3001\u53d7\u5165\u8a66\u9a13\u306f\u305d\u308c\u3092\u8aad\u307f\u307e\u3059\uff08SPEC-04 \u00a71\uff09\u3002\u65e2\u5b9a\u306e\u30dd\u30fc\u30c8\u304c\u4f7f\u7528\u4e2d\u306a\u3089\uff08macOS \u306e AirPlay \u3068 <code>5000</code> \u304c\u65e2\u77e5\u306e\u4f8b\uff09\u3001<code>compose render</code> \u306f\u6b21\u306e\u7a7a\u304d\u30dd\u30fc\u30c8\u3092\u53d6\u308a\u3001\u5c0e\u5165\u5831\u544a\u66f8\u306b\u8a18\u9332\u3057\u307e\u3059\u3002\u7d42\u4e86 12 \u306f\u7a7a\u304d\u30dd\u30fc\u30c8\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u3068\u304d\u3060\u3051\u3067\u3059\u3002</p>"},{"location":"spec/02_installer_cli/#5-\u30d5\u30e9\u30b0","title":"5. \u30d5\u30e9\u30b0","text":"\u30d5\u30e9\u30b0 \u610f\u5473 <code>--yes</code> \u3059\u3079\u3066\u306e\u8cea\u554f\u306b\u65e2\u5b9a\u3067\u7b54\u3048\u308b\u3002\u7aef\u672b\u304c\u306a\u3044\u3068\u304d\u306f\u5fc5\u9808\u3002 <code>--profile minimum\\|core\\|full</code> \u65e2\u5b9a\u306f <code>core</code>\u3002<code>runtime/.env</code> \u306b <code>GRDM_PROFILE</code> \u3068\u3057\u3066\u4fdd\u5b58\u3057\u3001\u6b21\u56de\u4ee5\u964d\u3082\u4f7f\u3046\u3002 <code>--platform linux/arm64,linux/amd64</code> <code>build</code> \u306e platform \u3092\u4e0a\u66f8\u304d\u3059\u308b\u3002\u65e2\u5b9a\u306f\u30db\u30b9\u30c8\u306e platform \u3060\u3051\u3002 <code>--no-open</code> <code>up</code> \u306e\u5f8c\u306b\u30d6\u30e9\u30a6\u30b6\u3092\u958b\u304b\u306a\u3044\u3002 <code>--json</code> \u5831\u544a\u3092 TOON \u3067\u306a\u304f JSON \u3067\u51fa\u3059\u3002"},{"location":"spec/02_installer_cli/#6-\u7d42\u4e86\u30b3\u30fc\u30c9","title":"6. \u7d42\u4e86\u30b3\u30fc\u30c9","text":"<pre><code>exit_codes[13]{code,meaning}:\n 0,\u6210\u529f\n 2,\u6307\u5b9a\u306e\u8aa4\u308a\u3002\u4e0d\u660e\u306a\u30d5\u30e9\u30b0\u3084\u5024\u306e\u5f62\u306e\u8aa4\u308a\n 10,\u5bfe\u8c61\u5916\u306e\u30db\u30b9\u30c8\u3002OS\u30fbCPU\u30fb\u30e1\u30e2\u30ea\u3001\u307e\u305f\u306f Python \u304c\u53e4\u3044\n 11,Docker \u304c\u7121\u3044\u30fb\u52d5\u3044\u3066\u3044\u306a\u3044\u3001\u307e\u305f\u306f Compose / buildx \u30d7\u30e9\u30b0\u30a4\u30f3\u304c\u7121\u3044\n 12,\u5fc5\u8981\u306a\u30dd\u30fc\u30c8\u304c 127.0.0.1 \u3067\u4f7f\u7528\u4e2d\u3067\u3001\u7a7a\u304d\u306e\u4ee3\u308f\u308a\u3082\u898b\u3064\u304b\u3089\u306a\u3044\n 20,manifest \u304c\u4e0d\u6b63\u3001\u307e\u305f\u306f TOON \u306e\u6284\u9332\u304c JSON \u3068\u4e00\u81f4\u3057\u306a\u3044\n 30,\u30a4\u30e1\u30fc\u30b8\u306e\u30d3\u30eb\u30c9\u306b\u5931\u6557\n 40,\u5065\u5eb7\u78ba\u8a8d\u306b\u5931\u6557\u3001\u307e\u305f\u306f\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u4ee5\u5916\u306e\u756a\u5730\u3067\u5f85\u3061\u53d7\u3051\u3066\u3044\u308b\n 50,\u4eca\u306e\u7bc0\u76ee\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30b9\u30ad\u30e3\u30f3\u306e\u9580\u3067\u4e0d\u5408\u683c\n 51,\u30b9\u30ad\u30e3\u30ca\u30fc\u304c\u52d5\u304b\u306a\u3044\u3002\u9053\u5177\u304c\u7121\u3044\u3001\u307e\u305f\u306f\u8106\u5f31\u6027\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u53d6\u5f97\u306b\u5931\u6557\n 52,\u30b5\u30fc\u30d3\u30b9\u304c\u5065\u5168\u3067\u306a\u304f scan --dynamic \u3092\u5b9f\u884c\u3067\u304d\u306a\u3044\n 53,\u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u306e\u4e8b\u524d\u78ba\u8a8d\u306b\u5931\u6557\u3002\u5916\u5411\u304d\u901a\u4fe1\u304c\u53ef\u80fd\u3001\u307e\u305f\u306f redteam-targets.json \u5916\u306e\u5bfe\u8c61\n 60,\u53d7\u5165\u8a66\u9a13\u306b\u5931\u6557</code></pre> <p>\u756a\u53f7\u3092\u5225\u306e\u610f\u5473\u306b\u4f7f\u3044\u56de\u3057\u307e\u305b\u3093\u3002\u65b0\u3057\u3044\u539f\u56e0\u306b\u306f\u65b0\u3057\u3044\u756a\u53f7\u3092\u632f\u308a\u307e\u3059\u3002\u6b63\u672c\u306f <code>installer/grdm_dev/messages.tsv</code> \u3067\u3001\u3053\u306e TOON \u30d6\u30ed\u30c3\u30af\u306f\u305d\u308c\u3068\u4e00\u81f4\u3057\u3066\u3044\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\uff08<code>manifest check</code> \u304c\u78ba\u304b\u3081\u307e\u3059\uff09\u300250\u301c53 \u306e\u8a73\u7d30\u306f SPEC-03 \u00a78 \u306b\u3042\u308a\u307e\u3059\u3002</p>"},{"location":"spec/02_installer_cli/#7-\u632f\u308b\u821e\u3044\u306e\u898f\u5247","title":"7. \u632f\u308b\u821e\u3044\u306e\u898f\u5247","text":"<ul> <li>\u5bfe\u8a71\u306a\u3057\u3067\u52d5\u304f\u3002 <code>stdin</code> \u304c\u7aef\u672b\u3067\u306a\u304f <code>--yes</code> \u3082\u306a\u3044\u3068\u304d\u3001\u3059\u3079\u3066\u306e\u8cea\u554f\u306f\u300c\u3044\u3044\u3048\u300d\u3068\u6271\u3044\u3001<code>--yes</code> \u3092\u4ed8\u3051\u308b\u3088\u3046\u4fc3\u3057\u3066\u7d42\u4e86 2 \u3067\u7d42\u308f\u308b\u3002</li> <li>\u4f55\u5ea6\u3067\u3082\u540c\u3058\u7d50\u679c\u3002 \u3069\u306e\u30b5\u30d6\u30b3\u30de\u30f3\u30c9\u3082\u4e8c\u5ea6\u5b9f\u884c\u3057\u3066\u540c\u3058\u7d50\u679c\u306b\u306a\u308b\u3002<code>secrets init</code> \u306f\u65e2\u5b58\u306e\u79d8\u5bc6\u3092\u6b8b\u3057\u3001<code>compose render</code> \u306f\u751f\u6210\u30d5\u30a1\u30a4\u30eb\u3060\u3051\u3092\u4e0a\u66f8\u304d\u3057\u3001<code>build</code> \u306f buildx \u306e\u30ad\u30e3\u30c3\u30b7\u30e5\u3092\u4f7f\u3044\u3001<code>up</code> \u306f\u5065\u5eb7\u306a\u30b5\u30fc\u30d3\u30b9\u306b\u306f\u4f55\u3082\u3057\u306a\u3044\u3002</li> <li>\u79d8\u5bc6\u3092 Git \u306b\u5165\u308c\u306a\u3044\u3002 <code>runtime/</code> \u306f <code>.gitignore</code> \u306b\u5165\u308c\u308b\u3002<code>runtime/</code> \u306e\u4e0b\u306e\u30d5\u30a1\u30a4\u30eb\u3084\u79d8\u5bc6\u306b\u898b\u3048\u308b\u5024\u304c\u30b3\u30df\u30c3\u30c8\u3055\u308c\u308b\u3068\u3001<code>docs check</code> \u3068 CI \u306e\u79d8\u5bc6\u30b9\u30ad\u30e3\u30f3\u304c\u4e0d\u5408\u683c\u306b\u3059\u308b\u3002</li> <li>\u30db\u30b9\u30c8\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3092\u5909\u3048\u306a\u3044\u3002 \u65e7\u624b\u5f15\u304d\u306e\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u5225\u540d <code>192.168.168.167</code> \u306f\u4f5c\u3089\u306a\u3044\u3002<code>compose render</code> \u304c\u4e0a\u6d41\u306e <code>local.py</code> \u3068 <code>.docker-compose.*.env</code> \u306e\u8a2d\u5b9a\u3092\u3001Compose \u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u5185\u3067\u306f\u30b5\u30fc\u30d3\u30b9\u540d\u3001\u30d6\u30e9\u30a6\u30b6\u5411\u3051\u306b\u306f <code>127.0.0.1</code> \u3092\u4f7f\u3046\u3088\u3046\u66f8\u304d\u63db\u3048\u308b\uff08ADR-02\uff09\u3002</li> <li><code>-private</code> \u306e\u30b3\u30fc\u30c9\u3092\u7f6e\u304b\u306a\u3044\u3002 \u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u306f\u5b9f\u884c\u6642\u306b manifest \u306e\u540d\u524d\u3068 SHA \u3067\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u53d6\u5f97\u3059\u308b\u3002\u3053\u306e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u306f\u305d\u308c\u3089\u306e\u30b3\u30fc\u30c9\u3092\u7f6e\u304b\u306a\u3044\uff08POL-01\uff09\u3002</li> </ul>"},{"location":"spec/02_installer_cli/#8-\u5bfe\u5fdc\u30db\u30b9\u30c8","title":"8. \u5bfe\u5fdc\u30db\u30b9\u30c8","text":"\u30db\u30b9\u30c8 CPU \u5bfe\u5fdc macOS 14 \u4ee5\u4e0a \u3068 Docker Desktop arm64 \u6b63\u5f0f\uff08M2 \u306e\u53d7\u5165\u306f\u3053\u3053\u3067\u5b9f\u884c\uff09 Ubuntu 24.04 \u3068 Docker Engine amd64\u30fbarm64 \u6b63\u5f0f Windows 11 \u306e WSL2\uff08Ubuntu 24.04\uff09\u3068 Docker Desktop amd64 \u52d5\u304f\u3053\u3068\u3092\u5fc5\u9808\u3068\u3059\u308b\u3002CI \u3067\u306f\u30d3\u30eb\u30c9\u78ba\u8a8d\u306e\u307f \u305d\u306e\u4ed6\u306e Linux\u3001Intel \u306e macOS \u4efb\u610f \u3067\u304d\u308b\u7bc4\u56f2\u3067\u5bfe\u5fdc\u3002<code>doctor</code> \u304c\u8b66\u544a\u3057\u3066\u7d9a\u884c"},{"location":"spec/02_installer_cli/#9-\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u69cb\u6210","title":"9. \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u69cb\u6210","text":"<pre><code>layout:\n installer/install.sh: bash 3.2 \u306e\u8d77\u52d5\u30b9\u30af\u30ea\u30d7\u30c8\n installer/pyproject.toml: \u30d1\u30c3\u30b1\u30fc\u30b8\u60c5\u5831\u3001\u30b3\u30f3\u30bd\u30fc\u30eb\u30b9\u30af\u30ea\u30d7\u30c8 grdm-dev\u3001\u8ffd\u52a0 accept\n installer/grdm_dev/:\n cli.py: \u5f15\u6570\u306e\u89e3\u91c8\u3001\u30b5\u30d6\u30b3\u30de\u30f3\u30c9\u306e\u632f\u308a\u5206\u3051\u3001\u7d42\u4e86\u30b3\u30fc\u30c9\n host.py: OS\u30fbCPU\u30fb\u30e1\u30e2\u30ea\u30fb\u30c7\u30a3\u30b9\u30af\u30fbDocker \u306e\u5224\u5b9a\n manifest.py: manifest/upstreams.json \u306e\u8aad\u307f\u8fbc\u307f\u3068\u691c\u8a3c\u3001TOON \u3068\u306e\u6bd4\u8f03\n secrets.py: \u4e71\u6570\u306e\u79d8\u5bc6\u306e\u751f\u6210\u3001\u30e2\u30fc\u30c9 0600 \u306e runtime/.env\n compose.py: manifest \u3068\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u304b\u3089 runtime/docker-compose.yml \u3092\u751f\u6210\n build.py: buildx \u306e\u547c\u3073\u51fa\u3057\u3001platform \u306e\u4e00\u89a7\u3001\u4efb\u610f\u306e push\n health.py: \u30b5\u30fc\u30d3\u30b9\u306e\u5065\u5eb7\u78ba\u8a8d\u3068\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u9650\u5b9a\u306e\u78ba\u8a8d\n scan.py: \u57fa\u672c\u5bfe\u7b56\u3001Trivy \u306e SBOM \u3068 CVE\u3001gitleaks\u3001Semgrep\u3001ZAP\u3001\u8a31\u5bb9\u30ea\u30b9\u30c8\u3068\u306e\u5dee\u5206\u3001\u6bb5\u968e\u7684\u306a\u9580\uff08SPEC-03\uff09\n redteam.py: \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u306e\u4e8b\u524d\u78ba\u8a8d\uff08SPEC-03 \u00a76\uff09\n upstream.py: \u30df\u30e9\u30fc\u3068\u7d71\u5408\uff08SPEC-05\uff09\n accept.py: \u540c\u3058 venv \u3067 pytest-playwright \u3092\u5b9f\u884c\n docs.py: MkDocs \u306e\u30d3\u30eb\u30c9\u3068 SPEC-06 \u306e\u691c\u67fb\n report.py: TOON \u3068 JSON \u306e\u5831\u544a\u3092\u307e\u3068\u3081\u308b\n messages.tsv: \u7d42\u4e86\u30b3\u30fc\u30c9\u3001\u82f1\u8a9e\u306e\u6587\u8a00\u3001\u65e5\u672c\u8a9e\u306e\u6587\u8a00\n installer/tests/: unittest\u3002\u30d5\u30a1\u30a4\u30eb\u540d\u306f test_*.py\n installer/acceptance/: Playwright Python\u3002SPEC-04 \u3092\u53c2\u7167\n manifest/:\n upstreams.json: manifest \u306e\u6b63\u672c\uff08SPEC-01\uff09\n upstreams.toon: grdm-dev manifest toon \u304c\u751f\u6210\u3059\u308b\u6284\u9332\uff08SPEC-01\uff09\n allowlist.json: \u8a31\u5bb9\u3059\u308b\u691c\u51fa\uff08SPEC-03 \u00a75.1\uff09\n allowlist.baseline.json: \u524d\u306e\u7bc0\u76ee\u306e\u7d42\u4e86\u6642\u306e\u8a31\u5bb9\u30ea\u30b9\u30c8\u4ef6\u6570\u3002\u6240\u6709\u8005\u304c\u4fdd\u5b88\uff08SPEC-03 \u00a75.1\uff09\n milestone.json: \u73fe\u5728\u306e\u7bc0\u76ee\u3002\u6240\u6709\u8005\u304c\u4fdd\u5b88\uff08SPEC-03 \u00a75.2\uff09\n hardening.json: \u8aad\u307f\u53d6\u308a\u5c02\u7528\u30eb\u30fc\u30c8\u3068 cap_drop \u306e\u30b5\u30fc\u30d3\u30b9\u3054\u3068\u306e\u4f8b\u5916\u3068\u7406\u7531\uff08SPEC-03 \u00a73.3\uff09\n redteam-targets.json: AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u304c\u89e6\u308c\u3066\u3088\u3044\u30b3\u30f3\u30c6\u30ca\u540d\uff08SPEC-03 \u00a76\uff09\n runtime/: \u751f\u6210\u7269\u3002Git \u306f\u7121\u8996\uff08.env\u3001docker-compose.yml\u3001volumes/\u3001reports/\uff09</code></pre>"},{"location":"spec/02_installer_cli/#10-\u8a66\u9a13","title":"10. \u8a66\u9a13","text":"<p><code>python3 -m unittest discover -s installer/tests</code> \u306f\u3059\u3079\u3066\u306e PR \u3067\u5408\u683c\u3057\u3066\u3044\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002\u5404\u30e2\u30b8\u30e5\u30fc\u30eb\u306b <code>test_<\u30e2\u30b8\u30e5\u30fc\u30eb>.py</code> \u3092\u7f6e\u304d\u3001\u6210\u529f\u30b1\u30fc\u30b9\u3068\u62d2\u5426\u30b1\u30fc\u30b9\u3092\u5c11\u306a\u304f\u3068\u3082\u4e00\u3064\u305a\u3064\u542b\u3081\u3001\u62d2\u5426\u30b1\u30fc\u30b9\u3067\u306f \u00a76 \u306e\u7d42\u4e86\u30b3\u30fc\u30c9\u3092 assert \u3057\u307e\u3059\u3002\u5358\u4f53\u8a66\u9a13\u306f Docker \u3092\u8981\u6c42\u3057\u307e\u305b\u3093\u3002<code>host.py</code> \u3068 <code>build.py</code> \u306f\u5b9f\u884c\u5668\u3092\u5dee\u3057\u66ff\u3048\u3089\u308c\u308b\u4f5c\u308a\u306b\u3057\u3001\u8a66\u9a13\u3067\u306f\u507d\u306e <code>docker</code> \u306e\u51fa\u529b\u3092\u6e21\u3057\u307e\u3059\u3002\u7d71\u5408\u3068\u53d7\u5165\u306e\u6bb5\u306f SPEC-04 \u3067\u5b9a\u3081\u307e\u3059\u3002</p>"},{"location":"spec/02_installer_cli/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Virtual environment (venv) A private folder of Python and its libraries, separate from the system's. \u30b7\u30b9\u30c6\u30e0\u3068\u306f\u5225\u306e\u3001Python \u3068\u30e9\u30a4\u30d6\u30e9\u30ea\u3060\u3051\u306e\u79c1\u7528\u30d5\u30a9\u30eb\u30c0\u3002 buildx The part of Docker that builds images for more than one kind of CPU at once. \u8907\u6570\u306e\u7a2e\u985e\u306e CPU \u5411\u3051\u306e\u30a4\u30e1\u30fc\u30b8\u3092\u4e00\u5ea6\u306b\u4f5c\u308b Docker \u306e\u6a5f\u80fd\u3002 Loopback / 127.0.0.1 The address that means \"this same computer\"; nothing outside can reach it. \u300c\u3053\u306e\u540c\u3058\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u300d\u3092\u6307\u3059\u756a\u5730\u3002\u5916\u304b\u3089\u306f\u5c4a\u304b\u306a\u3044\u3002 SBOM A list of every software part inside an image, like an ingredients label. \u30a4\u30e1\u30fc\u30b8\u306b\u5165\u3063\u3066\u3044\u308b\u90e8\u54c1\u306e\u4e00\u89a7\u3002\u98df\u54c1\u306e\u539f\u6750\u6599\u8868\u793a\u306e\u3088\u3046\u306a\u3082\u306e\u3002 CVE A public record number for one known security weakness. \u4e00\u3064\u306e\u65e2\u77e5\u306e\u5f31\u70b9\u306b\u4ed8\u3044\u305f\u516c\u958b\u306e\u756a\u53f7\u3002 Exit code The number a program returns when it stops; 0 means success. \u30d7\u30ed\u30b0\u30e9\u30e0\u304c\u7d42\u308f\u308b\u3068\u304d\u306b\u8fd4\u3059\u6570\u30020 \u304c\u6210\u529f\u3002"},{"location":"spec/03_security_gate/","title":"SPEC-03 Security Gate / \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u9580","text":"<p>Summary: What the development environment protects, which controls every install must have from the first milestone, how <code>grdm-dev scan</code> finds vulnerabilities, how the allow-list works, and how the gate tightens from \"report\" (M1) to \"zero CRITICAL/HIGH plus a passing AI red team\" (M5). \u6982\u8981: \u958b\u767a\u74b0\u5883\u304c\u4f55\u3092\u5b88\u308b\u304b\u3001\u6700\u521d\u306e\u7bc0\u76ee\u304b\u3089\u5168\u5c0e\u5165\u306b\u5fc5\u9808\u306e\u5bfe\u7b56\u3001<code>grdm-dev scan</code> \u304c\u8106\u5f31\u6027\u3092\u898b\u3064\u3051\u308b\u624b\u9806\u3001\u8a31\u5bb9\u30ea\u30b9\u30c8\u306e\u6c7a\u307e\u308a\u3001\u305d\u3057\u3066\u9580\u304c\u300c\u5831\u544a\u306e\u307f\u300d\uff08M1\uff09\u304b\u3089\u300cCRITICAL/HIGH \u30bc\u30ed\uff0bAI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u5408\u683c\u300d\uff08M5\uff09\u3078\u6bb5\u968e\u7684\u306b\u53b3\u3057\u304f\u306a\u308b\u69d8\u5b50\u3092\u5b9a\u3081\u308b\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.3 \u2014 2026-11-05. Learned: the first rendered configuration showed that a single internal network cannot publish ports, so the baseline needs two networks (<code>grdm</code> internal, <code>grdm-edge</code> for publishing) and an explicit, recorded egress choice; the red-team preflight must prove isolation with a reachable canary rather than infer it from a failed lookup (review r1 of PR #21). \uff0f \u6700\u521d\u306b\u63cf\u753b\u3057\u305f\u69cb\u6210\u3067\u3001\u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u4e00\u3064\u3067\u306f\u30dd\u30fc\u30c8\u3092\u516c\u958b\u3067\u304d\u306a\u3044\u3068\u5206\u304b\u3063\u305f\u3002\u57fa\u672c\u5bfe\u7b56\u306f\u4e8c\u3064\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\uff08\u5185\u90e8\u306e <code>grdm</code> \u3068\u516c\u958b\u7528\u306e <code>grdm-edge</code>\uff09\u3068\u3001\u8a18\u9332\u3055\u308c\u305f\u660e\u793a\u7684\u306a egress \u306e\u9078\u629e\u3092\u8981\u3059\u308b\u3002\u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u306e\u4e8b\u524d\u78ba\u8a8d\u306f\u3001\u5931\u6557\u3057\u305f\u540d\u524d\u89e3\u6c7a\u304b\u3089\u63a8\u6e2c\u305b\u305a\u3001\u5230\u9054\u3067\u304d\u308b\u30ab\u30ca\u30ea\u30a2\u3067\u9694\u96e2\u3092\u8a3c\u660e\u3059\u308b\uff08PR #21 \u30ec\u30d3\u30e5\u30fc r1\uff09\u3002 0.2 \u2014 2026-11-05. Learned: a scanner that runs inside a container must address its targets by Compose service name, because loopback inside that container is the scanner itself; and a promised scanner must say what it scans at each milestone. \uff0f \u30b3\u30f3\u30c6\u30ca\u306e\u4e2d\u3067\u52d5\u304f\u30b9\u30ad\u30e3\u30ca\u30fc\u306f\u76f8\u624b\u3092 Compose \u306e\u30b5\u30fc\u30d3\u30b9\u540d\u3067\u6307\u3055\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u3002\u305d\u306e\u30b3\u30f3\u30c6\u30ca\u306e\u4e2d\u306e\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u306f\u30b9\u30ad\u30e3\u30ca\u30fc\u81ea\u8eab\u3060\u304b\u3089\u3060\u3002\u307e\u305f\u7d04\u675f\u3057\u305f\u30b9\u30ad\u30e3\u30ca\u30fc\u306f\u7bc0\u76ee\u3054\u3068\u306b\u4f55\u3092\u691c\u67fb\u3059\u308b\u304b\u3092\u660e\u8a18\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: the gate must be written as a schedule, not a single threshold, because every current base image is end-of-life and a zero gate on day one would stop the first install before anything could be measured. \uff0f \u73fe\u884c\u306e\u30d9\u30fc\u30b9\u30a4\u30e1\u30fc\u30b8\u304c\u3059\u3079\u3066\u30b5\u30dd\u30fc\u30c8\u7d42\u4e86\u306e\u305f\u3081\u3001\u9580\u3092\u4e00\u3064\u306e\u57fa\u6e96\u5024\u3067\u306a\u304f\u300c\u7bc0\u76ee\u3054\u3068\u306e\u4e88\u5b9a\u8868\u300d\u3068\u3057\u3066\u66f8\u304b\u306a\u3044\u3068\u3001\u521d\u65e5\u306e\u5c0e\u5165\u304c\u4f55\u3082\u6e2c\u308c\u306a\u3044\u307e\u307e\u6b62\u307e\u308b\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Normative for: <code>installer/grdm_dev/</code> (<code>scan</code>, <code>redteam preflight</code>, <code>health --network</code>, <code>secrets</code>), <code>manifest/allowlist.json</code>, <code>manifest/allowlist.baseline.json</code>, <code>manifest/milestone.json</code>, <code>manifest/hardening.json</code>, <code>manifest/redteam-targets.json</code>, <code>.github/workflows/security.yml</code>, every <code>docker-compose</code> file generated by <code>grdm-dev</code>, and every AI red-team run.</li> <li>Related: SPEC-00 Overview \u00b7 SPEC-02 Installer CLI \u00b7 SPEC-04 Acceptance Tests \u00b7 SPEC-05 Upstream Tracking \u00b7 SPEC-06 Documentation Conventions \u00b7 POL-01 Position \u00b7 ADR-02 Network Model \u00b7 ADR-03 Staged Security Gate \u00b7 ADR-04 AI Autonomy and Roles \u00b7 docs/README.md</li> </ul> <p></p>"},{"location":"spec/03_security_gate/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"spec/03_security_gate/#1-scope","title":"1. Scope","text":"<p>This specification defines the security gate (a checkpoint that an install must pass before it is called good) of the GRDM developer environment 2027. It covers what we protect, the baseline controls that apply from milestone M1, the scanners, the allow-list, the staged thresholds up to M5, the AI red team, the evidence format, and the exit codes. The decision to stage the gate instead of enforcing zero from the start is recorded in ADR-03. Who may fix, review, and merge is recorded in ADR-04.</p> <p>Glossary notes. A vulnerability is a known weak spot in a program that someone could use to break in. A CVE (Common Vulnerabilities and Exposures) is the public ID number given to one vulnerability, like <code>CVE-2026-12345</code>. Severity is how bad it is: CRITICAL, HIGH, MEDIUM, LOW. A milestone (M1 to M5) is one of the five planned stages of this project, defined in POL-01.</p>"},{"location":"spec/03_security_gate/#2-threat-model","title":"2. Threat model","text":"<p>A threat model is a short list of what we are protecting and who we imagine is trying to harm it. It keeps the controls honest: every control in \u00a73 must answer at least one line of this table.</p> <p>What we protect:</p> Asset Why it matters The developer's machine It holds the developer's own files, browser sessions, and SSH keys. A container that escapes could reach them. Credentials Database passwords, session keys, OAuth client secrets, and the GitHub token that mirrors upstream repositories. <code>-private</code> code The security-hardened variants of the six core repositories are private to RCOSDP. They must never leave the private <code>-dev2027</code> repositories or appear in this public repository. The integrity of the gate itself If an attacker can edit a scan report or the allow-list, every other control is meaningless. <p>Attackers we consider:</p> Attacker What they can do Main controls Anyone on the same LAN (office Wi-Fi, home router) Open a port that the developer left published; guess a default password. \u00a73.2 publish only on <code>127.0.0.1</code>; \u00a73.1 random secrets. A malicious dependency (a library that <code>pip</code> or <code>npm</code> downloads) Run code at build or start time; read environment variables; call home. \u00a73.4 pinned digests; \u00a74 SBOM + CVE scan; \u00a74.4 dependency bots; \u00a73.2 internal network. A compromised container (one service already broken into) Reach other services; write to the host; use host resources. \u00a73.3 non-root, read-only root, no privileged, resource limits; \u00a73.2 internal network. An adversarial top-tier AI agent probing the running system Chain small weaknesses fast; try every public exploit for every CVE in the SBOM; brute-force weak defaults. \u00a75 staged gate to zero CRITICAL/HIGH; \u00a76 AI red team that uses the same capability on our side first. <p>Out of scope: attacks on the developer's operating system itself, phishing of the developer, and the production GRDM service. Those belong to the operating institution, not to the developer environment.</p>"},{"location":"spec/03_security_gate/#3-baseline-controls-apply-from-m1-every-install","title":"3. Baseline controls (apply from M1, every install)","text":"<p>These controls are not negotiable and have no allow-list. <code>grdm-dev health --network</code> and <code>grdm-dev scan --baseline</code> verify them; failure of any one is exit code 50 even at M1.</p>"},{"location":"spec/03_security_gate/#31-secrets","title":"3.1 Secrets","text":"<ul> <li>Every secret (a password or key that only the system should know) is generated at install time by <code>grdm-dev secrets init</code> from the operating system's random source.</li> <li>Secrets are written to <code>runtime/.env</code> (SPEC-02 \u00a73) with file mode <code>0600</code> (only the owner can read and write). <code>runtime/</code> is listed in <code>.gitignore</code>; the secret scanner in \u00a73.5 confirms the file never enters a commit.</li> <li>No default passwords. Upstream <code>docker-compose.yml</code> files ship with values such as <code>postgres</code>/<code>postgres</code> and <code>changeme</code>; the installer replaces every one of them and fails if one is still present.</li> <li>Reports and logs never print a secret. <code>grdm-dev report</code> masks any value that matches a key in <code>runtime/.env</code> before writing.</li> </ul>"},{"location":"spec/03_security_gate/#32-network","title":"3.2 Network","text":"<ul> <li>Services talk to each other only on the Compose network <code>grdm</code>, which is declared <code>internal: true</code> (a private virtual network inside Docker with no route to the host's interfaces, the LAN, or the Internet), so a compromised container cannot call home from it. See ADR-02.</li> <li>Docker cannot publish a port from an internal network, so the services a browser must reach (<code>web</code>, <code>api</code>, <code>admin</code>, <code>wb</code>, <code>mfr</code>, <code>fakecas</code>, <code>ember_osf_web</code>) are additionally attached to a second, ordinary bridge network <code>grdm-edge</code>. Ports are published from it on <code>127.0.0.1</code> only; no other service joins it by default.</li> <li>Egress (outbound traffic to the Internet) is therefore not available to the remaining services. A developer who needs it, for example to reach an external storage provider while developing an add-on, attaches named services with <code>grdm-dev compose render --egress <service>[,<service>...]</code>. The choice is recorded in <code>runtime/.env</code> as <code>GRDM_EGRESS_SERVICES</code>, shown in the compose and install reports, and read by <code>grdm-dev scan --baseline</code>; <code>--egress none</code> clears it. Egress granted this way is a recorded developer choice, not a baseline violation; an undeclared service on <code>grdm-edge</code> is a violation (<code>BASE-NETWORK</code>), and a grant that names a service which is not actually attached is also a finding (<code>BASE-EGRESS-STALE</code>): the record and the running configuration must agree.</li> <li><code>grdm-dev health --network</code> enumerates the project's own bindings (<code>docker compose ps</code>, <code>docker inspect</code>) and the host's listening sockets and fails if any address is not <code>127.0.0.1</code>, including a listener on a project port whose owning process is not visible.</li> <li>Ports that a browser needs are published only on <code>127.0.0.1</code>; the list of default ports (<code>5000</code> web, <code>8000</code> api, <code>8001</code> admin, <code>7777</code> wb, <code>7778</code> mfr, <code>8080</code> fakecas, <code>4200</code> ember) is the ports table in SPEC-02 \u00a74. Nothing is published on <code>0.0.0.0</code> or on a LAN address. The old loopback alias <code>192.168.168.167</code> is gone.</li> <li><code>grdm-dev health --network</code> lists every listening socket of the Compose project and fails if any address is not <code>127.0.0.1</code>.</li> </ul>"},{"location":"spec/03_security_gate/#33-container-hardening","title":"3.3 Container hardening","text":"<ul> <li>Every service runs as a non-root user. Where an upstream image runs as root, the generated Compose sets <code>user:</code> to a fixed UID/GID and the installer creates writable volumes for the few paths that need it.</li> <li>Root filesystem is read-only (<code>read_only: true</code>) where the service tolerates it; writable paths are explicit <code>tmpfs</code> or named volumes. Exceptions are listed per service in <code>manifest/hardening.json</code> with a reason.</li> <li><code>privileged: true</code> is forbidden. <code>cap_drop: [ALL]</code> is the default; a service that needs a capability adds it back by name with a reason.</li> <li>Every service has <code>mem_limit</code>, <code>cpus</code>, and <code>pids_limit</code>. <code>grdm-dev compose render</code> (SPEC-02 \u00a73) writes them, scaled from the memory that <code>doctor</code> detected.</li> </ul>"},{"location":"spec/03_security_gate/#34-supply-chain","title":"3.4 Supply chain","text":"<ul> <li>Images are pulled by digest (the exact fingerprint of one image version, <code>sha256:...</code>), never by a floating tag such as <code>latest</code>. The digest of each base image is the <code>base_image_digest</code> field of <code>manifest/upstreams.json</code>, next to the Git SHAs (SPEC-01 \u00a73); it is <code>null</code> until the image is pinned, at the latest at M2.</li> <li>Locally built images record the base-image digest in a label so that <code>grdm-dev scan</code> can tell which base they came from.</li> </ul>"},{"location":"spec/03_security_gate/#35-secret-scanning-in-ci","title":"3.5 Secret scanning in CI","text":"<p>Because this repository is public, every pull request and every push to <code>develop</code> runs a secret scanner (<code>gitleaks</code> or an equivalent that detects private keys, tokens, and passwords in the diff and in history). One finding fails the workflow. The same scanner runs locally in <code>grdm-dev scan --secrets</code>. False positives are suppressed by a rule in <code>.gitleaks.toml</code> with a reason, never by deleting the finding from the report.</p>"},{"location":"spec/03_security_gate/#4-scanning","title":"4. Scanning","text":"<p><code>grdm-dev scan</code> runs four kinds of scanners and writes one combined report. A scanner runs either inside the Compose project, where it reaches services by their Compose service names (ZAP, \u00a74.3), or on the host, where it looks at the <code>127.0.0.1</code> ports (the network baseline check, \u00a73.2); none sends data to an outside service except to download its vulnerability database.</p>"},{"location":"spec/03_security_gate/#41-sbom-and-cve-trivy-required-grype-optional-second-opinion","title":"4.1 SBOM and CVE: Trivy (required), Grype (optional second opinion)","text":"<ul> <li>An SBOM (software bill of materials: the complete list of every library inside an image or project) is generated by Trivy for every image in the Compose project and for every lockfile (<code>requirements*.txt</code>, <code>poetry.lock</code>, <code>package-lock.json</code>, <code>yarn.lock</code>, <code>build.gradle</code>) in the integration repositories.</li> <li>Trivy then matches the SBOM against its CVE database. Output is JSON (canonical) plus a TOON excerpt in the report.</li> <li>Grype may run on the same SBOM as a second opinion. Grype findings are informational and never change the gate result unless the owner promotes one to the allow-list process.</li> <li>M1 scope. At M1 no image exists yet (<code>grdm-dev build</code> arrives with M2), so the Trivy job in <code>security.yml</code> scans the repository file system only, in report-only mode: it writes its findings to the job log and never fails the PR. Image and lockfile scanning of the integration repositories starts with the first build.</li> </ul>"},{"location":"spec/03_security_gate/#42-static-analysis-semgrep-and-codeql","title":"4.2 Static analysis: Semgrep and CodeQL","text":"<p>Static analysis reads source code without running it and flags dangerous patterns (for example, building an SQL query from user text). Semgrep runs locally and in CI on every PR with the <code>p/default</code>, <code>p/python</code>, <code>p/javascript</code>, and <code>p/docker-compose</code> rule packs. CodeQL runs in the private <code>-dev2027</code> repositories on <code>develop</code> nightly. Findings of severity ERROR count as HIGH in the gate; WARNING counts as MEDIUM.</p>"},{"location":"spec/03_security_gate/#43-dynamic-scan-owasp-zap-baseline","title":"4.3 Dynamic scan: OWASP ZAP baseline","text":"<p>A dynamic scan pokes the running web application like a browser would. <code>grdm-dev scan --dynamic</code> starts OWASP ZAP in a container attached to the Compose internal network (ADR-02 \u00a73) and runs the baseline scan against the Compose service names and container ports: <code>http://web:5000</code> (web), <code>http://admin:8001</code> (admin), and <code>http://ember_osf_web:4200</code> (ember). It never targets <code>127.0.0.1</code>: inside the ZAP container, loopback is ZAP itself, not a service and not the host. The container ports are the ports the services listen on inside the network; their numbers equal the default host ports in the ports table of SPEC-02 \u00a74, but that table defines host ports, which browsers, acceptance tests, and <code>grdm-dev health --network</code> use. When <code>compose render</code> remaps a host port on collision and records it as <code>GRDM_PORT_<SERVICE></code> in <code>runtime/.env</code> (SPEC-02 \u00a74), host-side checks read the new number from there and the ZAP targets do not change. ZAP risk High maps to HIGH, Medium to MEDIUM. The scan runs only after <code>grdm-dev health</code> reports all services healthy: a full <code>grdm-dev scan</code> skips the dynamic part and notes it in the report, while an explicit <code>scan --dynamic</code> exits 52.</p>"},{"location":"spec/03_security_gate/#44-dependency-update-bots","title":"4.4 Dependency update bots","text":"<p>The private <code>-dev2027</code> repositories enable Dependabot (or Renovate) for Python, npm, Gradle, and Docker base images, grouped weekly. The bot opens a PR; the PR enters the normal flow of ADR-04: AID (AI\u958b\u767a\u62c5\u5f53\u8005) adapts the code if needed, REV (\u62c5\u5f53\u30ec\u30d3\u30e5\u30ef) reviews, QAE (QA\u62c5\u5f53) runs regression, the owner merges.</p>"},{"location":"spec/03_security_gate/#45-flow-of-grdm-dev-scan","title":"4.5 Flow of <code>grdm-dev scan</code>","text":"<pre><code>flowchart TD\n A[grdm-dev scan] --> B{baseline controls<br/>secrets 0600, 127.0.0.1 only,<br/>non-root, no privileged}\n B -- any failure --> X[exit 50: gate failed]\n B -- pass --> C[Trivy: SBOM for images + lockfiles]\n C --> D[Trivy: CVE match]\n C --> E[Grype second opinion<br/>optional, informational]\n D --> F[Semgrep static analysis]\n F --> G{services healthy?}\n G -- yes --> H[\"OWASP ZAP baseline<br/>web, admin, ember_osf_web by service name\"]\n G -- no --> I[skip dynamic, note in report]\n H --> J[merge findings]\n I --> J\n E --> J\n J --> K[apply allowlist.json<br/>drop expired entries]\n K --> L{compare with threshold<br/>of current milestone \u00a75}\n L -- within threshold --> M[write report TOON + JSON<br/>exit 0]\n L -- over threshold --> N[write report<br/>exit 50]</code></pre>"},{"location":"spec/03_security_gate/#5-allow-list-and-staged-gate","title":"5. Allow-list and staged gate","text":""},{"location":"spec/03_security_gate/#51-allow-list","title":"5.1 Allow-list","text":"<p>The allow-list is the written list of findings we know about, have judged, and accept for a limited time. Canonical file: <code>manifest/allowlist.json</code>. The TOON excerpt in <code>docs/status/</code> is regenerated by <code>grdm-dev scan</code> and checked by <code>grdm-dev manifest check</code> (see SPEC-06 \u00a74).</p> <p>Rules:</p> <ol> <li>Every entry has all six fields: <code>cve</code>, <code>component</code>, <code>reason</code>, <code>owner</code>, <code>expires</code>, <code>added_at</code>. An entry with a missing field is invalid and the scan fails with exit 50.</li> <li><code>reason</code> says why the finding is not exploitable here or why it cannot be fixed yet (for example \"code path not reachable in dev profile\", \"fix requires Python 3.13 port scheduled for M4\").</li> <li><code>owner</code> is a person or a role from the role table, never \"team\".</li> <li><code>expires</code> is a date no later than the start of the next milestone. On expiry the entry is ignored and the finding counts again.</li> <li>The number of entries must never increase from one milestone to the next. <code>grdm-dev scan</code> compares the count with <code>manifest/allowlist.baseline.json</code>, which the owner updates at each milestone exit, and fails if the count went up.</li> <li>Only the owner approves additions. AID may propose an entry in a PR; REV and QAE check it; the owner merges.</li> </ol> <pre><code>allowlist:\n milestone: M2\n baseline_count: 3\n entries[3]{cve,component,severity,reason,owner,expires,added_at}:\n CVE-2021-3177,python:3.6-base,HIGH,\"EOL interpreter; removed by Python 3.13 port in M4\",AID,2027-03-31,2026-11-20\n CVE-2022-24785,moment@2.24,HIGH,\"ember dev build only; not served to browser in dev profile\",AID,2027-01-31,2026-11-20\n CVE-2020-8265,node:12-base,CRITICAL,\"EOL runtime; replaced by node 20 image in M4\",AID,2027-03-31,2026-11-20</code></pre> <p>Note: the TOON block above is an example of the shape. The real content lives in <code>manifest/allowlist.json</code> and is regenerated into <code>docs/status/</code> by <code>grdm-dev scan</code>.</p>"},{"location":"spec/03_security_gate/#52-staged-gate","title":"5.2 Staged gate","text":"Milestone Gate rule What happens when a finding is over the rule M1 Baseline controls (\u00a73) must pass. CVE findings are reported; allow-list is created. Install continues. Report shows the count. M2 Baseline must pass. Allow-list count \u2264 M1 count. Install continues. Scan exits 50 only if the count grew or a baseline control failed. M3 Baseline must pass. Allow-list count \u2264 M2 count. Same as M2. M4 Fail on any HIGH or CRITICAL not in the allow-list. First AI red team run (\u00a76) must be completed and every found path fixed or allow-listed. <code>grdm-dev install</code> stops before starting services; exit 50. M5 Fail on any CRITICAL or HIGH, allow-list for CRITICAL/HIGH must be empty. AI red team must report zero unresolved intrusion paths. Exit 50; the environment is not distributable until fixed. Steady state Same as M5. Daily scan; a new HIGH opens a fix PR automatically (ADR-04). Exit 50 in CI; owner is notified. <p>The current milestone is read from <code>manifest/milestone.json</code>; only the owner changes it.</p>"},{"location":"spec/03_security_gate/#6-ai-red-team","title":"6. AI red team","text":"<p>An AI red team is a group of AI agents that is told to attack our own test system, in a sealed box, so that we find our weaknesses before a real attacker does. It is defensive, authorized testing of our own isolated environment only.</p> <p>Rules, all mandatory:</p> <ol> <li>Isolation. The red team runs inside a dedicated Compose project on a Docker network with <code>internal: true</code> and no egress (no route to the internet or the LAN). <code>manifest/redteam-targets.json</code> names the project, the network, the attacker container (<code>attacker</code>) and the targets. <code>grdm-dev redteam preflight</code> proves isolation instead of inferring it: it starts a canary container on a separate ordinary network, checks that the canary is reachable from its own network (otherwise the probe is inconclusive and the preflight fails), then, inside the attacker container, first self-tests the probe tool against a listener it starts itself (an open port must connect and a closed port must be refused, otherwise the tool is unreliable and the result is inconclusive) and only then checks that neither the canary nor an external address is reachable; a connection error counts as blocked, any other tool error counts as inconclusive, and inconclusive fails the preflight. The attacker must be attached to exactly one network. The approval record (<code>docs/demo/<date>_redteam_<run>.md</code>) must carry a header with <code>approved_by</code>, <code>approved_on</code> (an ISO date, not in the future and at most 30 days old), <code>scope</code> (the target container names) and <code>run_id</code>; a missing or stale record, or a target outside the scope, fails the preflight. <code>grdm-dev redteam preflight</code> verifies that no external address is reachable from the attacker container before any test starts.</li> <li>Target list. The targets are exactly our own containers in that isolated project, listed by name in <code>manifest/redteam-targets.json</code>. Nothing else is ever a target: not the developer's machine, not other containers, not any address outside the project.</li> <li>Approval record. Before each run, a record is written to <code>docs/demo/</code> as <code>nn_redteam_<date>.md</code> with: who approved (owner), when, scope (target list and commit SHAs), the model and runner used, and the stop conditions. No record, no run.</li> <li>Findings to fixes. Every intrusion path found becomes an issue, then a fix PR through the normal flow (AID fix \u2192 REV review \u2192 QAE regression \u2192 owner merge), then a retest with the same scenario. A path is \"resolved\" only when the retest fails to reproduce it.</li> <li>Never outside. Techniques learned here are for finding our own weaknesses. Running them against any system outside the isolated project, including production GRDM or upstream services, is forbidden.</li> <li>No secrets in findings. Findings quote the weakness, not the harvested secret. If a secret was captured, the finding says \"credential obtained\" and the secret is rotated by <code>grdm-dev secrets rotate</code>.</li> </ol> <pre><code>sequenceDiagram\n participant O as Owner\n participant Q as QAE (Claude Code Fable)\n participant R as Red team agents\n participant T as Isolated targets\n O->>Q: approval record in docs/demo/\n Q->>R: preflight: no egress, target list only\n R->>T: probe, exploit attempts\n R-->>Q: findings (no secrets)\n Q->>Q: open issues, request fix PRs (ADR-04)\n Q->>R: retest after merge\n R-->>O: zero unresolved paths \u2192 M5 gate passes</code></pre>"},{"location":"spec/03_security_gate/#7-evidence-format","title":"7. Evidence format","text":"<p>Every scan writes <code>runtime/reports/scan_<date>.json</code> (canonical, SPEC-02 \u00a73) and the TOON excerpt below into <code>docs/status/security_<milestone>.md</code>. The report must not contain any secret (\u00a73.1). Fields:</p> <pre><code>scan:\n date: 2026-11-20T09:12:00Z\n milestone: M2\n commit: 1a2b3c4d\n host: macos-arm64\n baseline: pass\n tools[4]{name,version,result}:\n trivy,0.68.0,ok\n grype,0.98.0,ok\n semgrep,1.140.0,ok\n zap,2.17.0,ok\n findings_total: 212\n findings_by_severity{critical,high,medium,low}: 9,48,120,35\n allowlisted: 3\n allowlist_baseline: 3\n over_threshold: 0\n gate: pass\n exit_code: 0</code></pre>"},{"location":"spec/03_security_gate/#8-exit-codes","title":"8. Exit codes","text":"<p>Exit codes are defined in SPEC-02 \u00a76; this table explains the ones <code>scan</code> and <code>redteam preflight</code> return:</p> Code Meaning 0 Gate passed (or, at M1\u2013M3, report written and count did not grow). 50 Gate failed: baseline control violated, allow-list invalid or grew, finding over the milestone threshold, or red team unresolved at M5. 51 Scanner could not run (tool missing, database download failed). Not a pass. 52 <code>scan --dynamic</code> was requested while services were not healthy. The static part of the report is still written. A full <code>scan</code> does not return 52; it skips the dynamic part and notes it. 53 <code>redteam preflight</code> failed: an external address was reachable from the attacker container, or a target outside <code>manifest/redteam-targets.json</code> was reachable. No red-team run starts."},{"location":"spec/03_security_gate/#9-checks","title":"9. Checks","text":"<ul> <li><code>python3 -m unittest discover -s installer/tests</code> covers: secret file mode, default-password detection, listening-address check, allow-list field validation, count comparison, severity mapping, and secret masking in reports.</li> <li>CI workflow <code>security.yml</code> runs gitleaks, Semgrep, and Trivy on every PR; at M1 Trivy is report-only over the repository file system because no image exists yet (\u00a74.1). The arm64 self-hosted runner runs the full <code>grdm-dev scan</code> nightly on <code>develop</code> once the installer exists (M2).</li> </ul>"},{"location":"spec/03_security_gate/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"spec/03_security_gate/#1-\u7bc4\u56f2","title":"1. \u7bc4\u56f2","text":"<p>\u3053\u306e\u4ed5\u69d8\u306f\u3001GRDM \u958b\u767a\u74b0\u5883 2027 \u7248\u306e\u300c\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u9580\u300d\uff08\u5c0e\u5165\u304c\u5408\u683c\u3068\u547c\u3070\u308c\u308b\u524d\u306b\u5fc5\u305a\u901a\u308b\u691c\u554f\u6240\uff09\u3092\u5b9a\u3081\u307e\u3059\u3002\u5b88\u308b\u3082\u306e\u3001\u7bc0\u76ee M1 \u304b\u3089\u9069\u7528\u3059\u308b\u57fa\u672c\u5bfe\u7b56\u3001\u30b9\u30ad\u30e3\u30ca\u30fc\u3001\u8a31\u5bb9\u30ea\u30b9\u30c8\u3001M5 \u307e\u3067\u306e\u6bb5\u968e\u7684\u306a\u57fa\u6e96\u3001AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u3001\u8a3c\u8de1\u306e\u5f62\u5f0f\u3001\u7d42\u4e86\u30b3\u30fc\u30c9\u3092\u6271\u3044\u307e\u3059\u3002\u6700\u521d\u304b\u3089\u30bc\u30ed\u3092\u6c42\u3081\u305a\u6bb5\u968e\u5316\u3059\u308b\u6c7a\u5b9a\u306f ADR-03 \u306b\u3001\u8ab0\u304c\u4fee\u6b63\u30fb\u30ec\u30d3\u30e5\u30fc\u30fb\u30de\u30fc\u30b8\u3059\u308b\u304b\u306f ADR-04 \u306b\u3042\u308a\u307e\u3059\u3002</p> <p>\u7528\u8a9e\u6ce8\u3002 \u300c\u8106\u5f31\u6027\u300d\u306f\u3001\u30d7\u30ed\u30b0\u30e9\u30e0\u306e\u4e2d\u306e\u3001\u8ab0\u304b\u304c\u4fb5\u5165\u306b\u4f7f\u3048\u308b\u3068\u5206\u304b\u3063\u3066\u3044\u308b\u5f31\u3044\u6240\u3067\u3059\u3002\u300cCVE\u300d\uff08Common Vulnerabilities and Exposures\uff09\u306f\u3001\u4e00\u3064\u306e\u8106\u5f31\u6027\u306b\u4ed8\u304f\u516c\u958b\u306e\u756a\u53f7\u3067\u3001<code>CVE-2026-12345</code> \u306e\u3088\u3046\u306b\u66f8\u304d\u307e\u3059\u3002\u300c\u6df1\u523b\u5ea6\u300d\u306f\u3069\u308c\u307b\u3069\u5371\u306a\u3044\u304b\u3067\u3001CRITICAL\u30fbHIGH\u30fbMEDIUM\u30fbLOW \u306e\u56db\u6bb5\u968e\u3067\u3059\u3002\u300c\u7bc0\u76ee\u300d\uff08M1\u301cM5\uff09\u306f\u8a08\u753b\u306e\u4e94\u3064\u306e\u6bb5\u968e\u3067\u3001POL-01 \u306b\u5b9a\u7fa9\u304c\u3042\u308a\u307e\u3059\u3002</p>"},{"location":"spec/03_security_gate/#2-\u8105\u5a01\u30e2\u30c7\u30eb","title":"2. \u8105\u5a01\u30e2\u30c7\u30eb","text":"<p>\u300c\u8105\u5a01\u30e2\u30c7\u30eb\u300d\u306f\u3001\u4f55\u3092\u5b88\u308b\u304b\u3001\u8ab0\u304c\u58ca\u305d\u3046\u3068\u3059\u308b\u3068\u60f3\u5b9a\u3059\u308b\u304b\u3092\u77ed\u304f\u66f8\u3044\u305f\u4e00\u89a7\u3067\u3059\u3002\u00a73 \u306e\u5404\u5bfe\u7b56\u306f\u3001\u3053\u306e\u8868\u306e\u3069\u308c\u304b\u4e00\u884c\u306b\u5fc5\u305a\u7b54\u3048\u307e\u3059\u3002</p> <p>\u5b88\u308b\u3082\u306e:</p> \u8cc7\u7523 \u5927\u4e8b\u306a\u7406\u7531 \u958b\u767a\u8005\u306e\u30d1\u30bd\u30b3\u30f3 \u958b\u767a\u8005\u81ea\u8eab\u306e\u30d5\u30a1\u30a4\u30eb\u3001\u30d6\u30e9\u30a6\u30b6\u306e\u30ed\u30b0\u30a4\u30f3\u3001SSH \u306e\u9375\u304c\u3042\u308b\u3002\u30b3\u30f3\u30c6\u30ca\u304b\u3089\u629c\u3051\u51fa\u3055\u308c\u308b\u3068\u5c4a\u304f\u3002 \u8cc7\u683c\u60c5\u5831 \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3001\u30bb\u30c3\u30b7\u30e7\u30f3\u9375\u3001OAuth \u306e\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u79d8\u5bc6\u3001\u4e0a\u6d41\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u30df\u30e9\u30fc\u3059\u308b GitHub \u30c8\u30fc\u30af\u30f3\u3002 <code>-private</code> \u306e\u30b3\u30fc\u30c9 \u30b3\u30a2 6 \u672c\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u691c\u8a3c\u7248\u306f RCOSDP \u5185\u9650\u5b9a\u3002\u975e\u516c\u958b\u306e <code>-dev2027</code> \u304b\u3089\u51fa\u3055\u305a\u3001\u3053\u306e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u3082\u7f6e\u304b\u306a\u3044\u3002 \u9580\u305d\u306e\u3082\u306e\u306e\u6b63\u3057\u3055 \u653b\u6483\u8005\u304c\u30b9\u30ad\u30e3\u30f3\u5831\u544a\u3084\u8a31\u5bb9\u30ea\u30b9\u30c8\u3092\u66f8\u304d\u63db\u3048\u3089\u308c\u308b\u306a\u3089\u3001\u307b\u304b\u306e\u5bfe\u7b56\u306f\u610f\u5473\u3092\u5931\u3046\u3002 <p>\u60f3\u5b9a\u3059\u308b\u653b\u6483\u8005:</p> \u653b\u6483\u8005 \u3067\u304d\u308b\u3053\u3068 \u4e3b\u306a\u5bfe\u7b56 \u540c\u3058 LAN\uff08\u8077\u5834\u306e Wi-Fi\u3001\u5bb6\u306e\u30eb\u30fc\u30bf\u30fc\uff09\u306b\u3044\u308b\u8ab0\u304b \u958b\u767a\u8005\u304c\u516c\u958b\u3057\u305f\u307e\u307e\u306e\u30dd\u30fc\u30c8\u3092\u958b\u304f\u3002\u65e2\u5b9a\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5f53\u3066\u308b\u3002 \u00a73.2 <code>127.0.0.1</code> \u306e\u307f\u516c\u958b\u3001\u00a73.1 \u4e71\u6570\u306e\u79d8\u5bc6 \u60aa\u610f\u3042\u308b\u4f9d\u5b58\u30e9\u30a4\u30d6\u30e9\u30ea\uff08<code>pip</code> \u3084 <code>npm</code> \u304c\u53d6\u3063\u3066\u304f\u308b\u90e8\u54c1\uff09 \u30d3\u30eb\u30c9\u6642\u3084\u8d77\u52d5\u6642\u306b\u30b3\u30fc\u30c9\u3092\u52d5\u304b\u3059\u3002\u74b0\u5883\u5909\u6570\u3092\u8aad\u3080\u3002\u5916\u3078\u901a\u4fe1\u3059\u308b\u3002 \u00a73.4 \u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u56fa\u5b9a\u3001\u00a74 SBOM\uff0bCVE\u3001\u00a74.4 \u66f4\u65b0\u30dc\u30c3\u30c8\u3001\u00a73.2 \u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af \u4e57\u3063\u53d6\u3089\u308c\u305f\u30b3\u30f3\u30c6\u30ca\uff08\u3059\u3067\u306b\u4fb5\u5165\u3055\u308c\u305f\u4e00\u3064\u306e\u30b5\u30fc\u30d3\u30b9\uff09 \u307b\u304b\u306e\u30b5\u30fc\u30d3\u30b9\u3078\u5c4a\u304f\u3002\u30db\u30b9\u30c8\u306b\u66f8\u304f\u3002\u30db\u30b9\u30c8\u306e\u8cc7\u6e90\u3092\u4f7f\u3046\u3002 \u00a73.3 \u975e root\u30fb\u8aad\u307f\u53d6\u308a\u5c02\u7528\u30fbprivileged \u7981\u6b62\u30fb\u8cc7\u6e90\u5236\u9650\u3001\u00a73.2 \u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af \u7a3c\u50cd\u4e2d\u306e\u30b7\u30b9\u30c6\u30e0\u3092\u63a2\u308b\u3001\u6700\u4e0a\u4f4d\u306e\u6575\u5bfe\u7684 AI \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8 \u5c0f\u3055\u306a\u5f31\u70b9\u3092\u7d20\u65e9\u304f\u3064\u306a\u3052\u308b\u3002SBOM \u306e\u5168 CVE \u306b\u516c\u958b\u306e\u653b\u6483\u30b3\u30fc\u30c9\u3092\u8a66\u3059\u3002\u5f31\u3044\u65e2\u5b9a\u5024\u3092\u7dcf\u5f53\u305f\u308a\u3059\u308b\u3002 \u00a75 \u6bb5\u968e\u7684\u306a\u9580\u3067 CRITICAL/HIGH \u30bc\u30ed\u3078\u3001\u00a76 \u540c\u3058\u80fd\u529b\u3092\u5148\u306b\u5473\u65b9\u3068\u3057\u3066\u4f7f\u3046 AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0 <p>\u7bc4\u56f2\u5916: \u958b\u767a\u8005\u306e OS \u81ea\u4f53\u3078\u306e\u653b\u6483\u3001\u958b\u767a\u8005\u3092\u3060\u307e\u3059\u624b\u53e3\u3001\u672c\u756a GRDM \u30b5\u30fc\u30d3\u30b9\u3002\u3053\u308c\u3089\u306f\u904b\u7528\u6a5f\u95a2\u306e\u8cac\u4efb\u3067\u3001\u958b\u767a\u74b0\u5883\u306e\u8cac\u4efb\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002</p>"},{"location":"spec/03_security_gate/#3-\u57fa\u672c\u5bfe\u7b56m1-\u304b\u3089\u5168\u5c0e\u5165\u306b\u9069\u7528","title":"3. \u57fa\u672c\u5bfe\u7b56\uff08M1 \u304b\u3089\u5168\u5c0e\u5165\u306b\u9069\u7528\uff09","text":"<p>\u6b21\u306e\u5bfe\u7b56\u306f\u4ea4\u6e09\u306e\u4f59\u5730\u304c\u306a\u304f\u3001\u8a31\u5bb9\u30ea\u30b9\u30c8\u3082\u3042\u308a\u307e\u305b\u3093\u3002<code>grdm-dev health --network</code> \u3068 <code>grdm-dev scan --baseline</code> \u304c\u78ba\u8a8d\u3057\u3001\u4e00\u3064\u3067\u3082\u5916\u308c\u308b\u3068 M1 \u3067\u3082\u7d42\u4e86\u30b3\u30fc\u30c9 50 \u3067\u3059\u3002</p>"},{"location":"spec/03_security_gate/#31-\u79d8\u5bc6","title":"3.1 \u79d8\u5bc6","text":"<ul> <li>\u3059\u3079\u3066\u306e\u79d8\u5bc6\uff08\u30b7\u30b9\u30c6\u30e0\u3060\u3051\u304c\u77e5\u3063\u3066\u3044\u3066\u3088\u3044\u30d1\u30b9\u30ef\u30fc\u30c9\u3084\u9375\uff09\u306f\u3001\u5c0e\u5165\u6642\u306b <code>grdm-dev secrets init</code> \u304c OS \u306e\u4e71\u6570\u6e90\u304b\u3089\u751f\u6210\u3059\u308b\u3002</li> <li>\u79d8\u5bc6\u306f <code>runtime/.env</code>\uff08SPEC-02 \u00a73\uff09\u306b\u3001\u30d5\u30a1\u30a4\u30eb\u30e2\u30fc\u30c9 <code>0600</code>\uff08\u6240\u6709\u8005\u3060\u3051\u304c\u8aad\u307f\u66f8\u304d\u3067\u304d\u308b\uff09\u3067\u66f8\u304f\u3002<code>runtime/</code> \u306f <code>.gitignore</code> \u306b\u8f09\u305b\u3001\u00a73.5 \u306e\u79d8\u5bc6\u30b9\u30ad\u30e3\u30f3\u304c\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u30b3\u30df\u30c3\u30c8\u306b\u5165\u3089\u306a\u3044\u3053\u3068\u3092\u78ba\u304b\u3081\u308b\u3002</li> <li>\u65e2\u5b9a\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u4f7f\u308f\u306a\u3044\u3002\u4e0a\u6d41\u306e <code>docker-compose.yml</code> \u306b\u306f <code>postgres</code>/<code>postgres</code> \u3084 <code>changeme</code> \u306e\u3088\u3046\u306a\u5024\u304c\u6b8b\u3063\u3066\u3044\u308b\u304c\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u304c\u3059\u3079\u3066\u7f6e\u304d\u63db\u3048\u3001\u6b8b\u3063\u3066\u3044\u308c\u3070\u5931\u6557\u3059\u308b\u3002</li> <li>\u5831\u544a\u3068\u30ed\u30b0\u306b\u79d8\u5bc6\u3092\u66f8\u304b\u306a\u3044\u3002<code>grdm-dev report</code> \u306f\u66f8\u304d\u51fa\u3059\u524d\u306b <code>runtime/.env</code> \u306e\u5024\u3068\u4e00\u81f4\u3059\u308b\u6587\u5b57\u5217\u3092\u4f0f\u305b\u5b57\u306b\u3059\u308b\u3002</li> </ul>"},{"location":"spec/03_security_gate/#32-\u30cd\u30c3\u30c8\u30ef\u30fc\u30af","title":"3.2 \u30cd\u30c3\u30c8\u30ef\u30fc\u30af","text":"<ul> <li>\u30b5\u30fc\u30d3\u30b9\u540c\u58eb\u306f Compose \u30cd\u30c3\u30c8\u30ef\u30fc\u30af <code>grdm</code> \u3060\u3051\u3067\u901a\u4fe1\u3059\u308b\u3002<code>grdm</code> \u306f <code>internal: true</code> \u3067\u5ba3\u8a00\u3057\uff08Docker \u306e\u4e2d\u3060\u3051\u306b\u3042\u308b\u79c1\u8a2d\u306e\u4eee\u60f3\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3067\u3001\u30db\u30b9\u30c8\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u30fbLAN\u30fb\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u3078\u306e\u7d4c\u8def\u3092\u6301\u305f\u306a\u3044\uff09\u3001\u4fb5\u5165\u3055\u308c\u305f\u30b3\u30f3\u30c6\u30ca\u3082\u3053\u3053\u304b\u3089\u306f\u5916\u3078\u901a\u4fe1\u3067\u304d\u306a\u3044\u3002\u8a73\u3057\u304f\u306f ADR-02\u3002</li> <li>Docker \u306f\u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u304b\u3089\u30dd\u30fc\u30c8\u3092\u516c\u958b\u3067\u304d\u306a\u3044\u305f\u3081\u3001\u30d6\u30e9\u30a6\u30b6\u304c\u5c4a\u304f\u5fc5\u8981\u306e\u3042\u308b\u30b5\u30fc\u30d3\u30b9\uff08<code>web</code>\u3001<code>api</code>\u3001<code>admin</code>\u3001<code>wb</code>\u3001<code>mfr</code>\u3001<code>fakecas</code>\u3001<code>ember_osf_web</code>\uff09\u306f\u3001\u3082\u3046\u4e00\u3064\u306e\u901a\u5e38\u306e bridge \u30cd\u30c3\u30c8\u30ef\u30fc\u30af <code>grdm-edge</code> \u306b\u3082\u63a5\u7d9a\u3059\u308b\u3002\u516c\u958b\u306f\u305d\u3053\u304b\u3089 <code>127.0.0.1</code> \u306e\u307f\u306b\u884c\u3044\u3001\u65e2\u5b9a\u3067\u306f\u307b\u304b\u306e\u30b5\u30fc\u30d3\u30b9\u306f\u63a5\u7d9a\u3057\u306a\u3044\u3002</li> <li>\u3057\u305f\u304c\u3063\u3066\u3001\u305d\u308c\u4ee5\u5916\u306e\u30b5\u30fc\u30d3\u30b9\u306b\u306f\u5916\u5411\u304d\u901a\u4fe1\uff08egress\u3002\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u3078\u51fa\u308b\u901a\u4fe1\uff09\u304c\u306a\u3044\u3002\u5fc5\u8981\u306a\u958b\u767a\u8005\uff08\u4f8b: \u30a2\u30c9\u30aa\u30f3\u958b\u767a\u3067\u5916\u90e8\u30b9\u30c8\u30ec\u30fc\u30b8\u3078\u63a5\u7d9a\u3059\u308b\uff09\u306f <code>grdm-dev compose render --egress <service>[,<service>...]</code> \u3067\u540d\u6307\u3057\u3057\u305f\u30b5\u30fc\u30d3\u30b9\u3092 <code>grdm-edge</code> \u306b\u63a5\u7d9a\u3059\u308b\u3002\u9078\u629e\u306f <code>runtime/.env</code> \u306e <code>GRDM_EGRESS_SERVICES</code> \u306b\u8a18\u9332\u3055\u308c\u3001compose \u3068 install \u306e\u5831\u544a\u306b\u8868\u793a\u3055\u308c\u3001<code>grdm-dev scan --baseline</code> \u304c\u8aad\u3080\u3002<code>--egress none</code> \u3067\u89e3\u9664\u3059\u308b\u3002\u3053\u306e\u65b9\u6cd5\u3067\u4e0e\u3048\u305f egress \u306f\u8a18\u9332\u3055\u308c\u305f\u958b\u767a\u8005\u306e\u9078\u629e\u3067\u3042\u308a\u57fa\u672c\u5bfe\u7b56\u9055\u53cd\u3067\u306f\u306a\u3044\u3002\u5ba3\u8a00\u306a\u3057\u306b <code>grdm-edge</code> \u306b\u3044\u308b\u30b5\u30fc\u30d3\u30b9\u306f\u9055\u53cd\uff08<code>BASE-NETWORK</code>\uff09\u3067\u3042\u308a\u3001\u8a31\u53ef\u306b\u540d\u524d\u304c\u3042\u308b\u306e\u306b\u5b9f\u969b\u306b\u306f\u63a5\u7d9a\u3057\u3066\u3044\u306a\u3044\u30b5\u30fc\u30d3\u30b9\u3082\u6240\u898b\uff08<code>BASE-EGRESS-STALE</code>\uff09\u3068\u3059\u308b\u3002\u8a18\u9332\u3068\u52d5\u3044\u3066\u3044\u308b\u69cb\u6210\u306f\u4e00\u81f4\u3057\u3066\u3044\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u3002</li> <li><code>grdm-dev health --network</code> \u306f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u81ea\u8eab\u306e\u516c\u958b\uff08<code>docker compose ps</code>\u3001<code>docker inspect</code>\uff09\u3068\u30db\u30b9\u30c8\u306e\u5f85\u3061\u53d7\u3051\u30bd\u30b1\u30c3\u30c8\u3092\u5217\u6319\u3057\u3001<code>127.0.0.1</code> \u4ee5\u5916\u306e\u30a2\u30c9\u30ec\u30b9\u304c\u4e00\u3064\u3067\u3082\u3042\u308c\u3070\u5931\u6557\u3059\u308b\u3002\u6240\u6709\u30d7\u30ed\u30bb\u30b9\u304c\u898b\u3048\u306a\u3044\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30dd\u30fc\u30c8\u4e0a\u306e\u5f85\u3061\u53d7\u3051\u3082\u5931\u6557\u3068\u3059\u308b\u3002</li> <li>\u30d6\u30e9\u30a6\u30b6\u304c\u5fc5\u8981\u3068\u3059\u308b\u30dd\u30fc\u30c8\u306f <code>127.0.0.1</code> \u3060\u3051\u306b\u516c\u958b\u3059\u308b\u3002\u65e2\u5b9a\u306e\u30dd\u30fc\u30c8\u306e\u4e00\u89a7\uff08<code>5000</code> web\u3001<code>8000</code> api\u3001<code>8001</code> admin\u3001<code>7777</code> wb\u3001<code>7778</code> mfr\u3001<code>8080</code> fakecas\u3001<code>4200</code> ember\uff09\u306f SPEC-02 \u00a74 \u306e\u30dd\u30fc\u30c8\u8868\u306b\u3042\u308b\u3002<code>0.0.0.0</code> \u3084 LAN \u306e\u30a2\u30c9\u30ec\u30b9\u306b\u306f\u516c\u958b\u3057\u306a\u3044\u3002\u65e7\u6765\u306e\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u5225\u540d <code>192.168.168.167</code> \u306f\u5ec3\u6b62\u3002</li> <li><code>grdm-dev health --network</code> \u306f Compose \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u5f85\u3061\u53d7\u3051\u30bd\u30b1\u30c3\u30c8\u3092\u5217\u6319\u3057\u3001<code>127.0.0.1</code> \u4ee5\u5916\u304c\u3042\u308c\u3070\u5931\u6557\u306b\u3059\u308b\u3002</li> </ul>"},{"location":"spec/03_security_gate/#33-\u30b3\u30f3\u30c6\u30ca\u306e\u5805\u7262\u5316","title":"3.3 \u30b3\u30f3\u30c6\u30ca\u306e\u5805\u7262\u5316","text":"<ul> <li>\u5168\u30b5\u30fc\u30d3\u30b9\u3092\u975e root \u30e6\u30fc\u30b6\u30fc\u3067\u52d5\u304b\u3059\u3002\u4e0a\u6d41\u30a4\u30e1\u30fc\u30b8\u304c root \u3067\u52d5\u304f\u5834\u5408\u3001\u751f\u6210\u3059\u308b Compose \u306b\u56fa\u5b9a\u306e UID/GID \u3092 <code>user:</code> \u3067\u6307\u5b9a\u3057\u3001\u66f8\u304d\u8fbc\u307f\u304c\u5fc5\u8981\u306a\u5c11\u6570\u306e\u30d1\u30b9\u306b\u306f\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u304c\u30dc\u30ea\u30e5\u30fc\u30e0\u3092\u7528\u610f\u3059\u308b\u3002</li> <li>\u30eb\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u306f\u3001\u30b5\u30fc\u30d3\u30b9\u304c\u8010\u3048\u3089\u308c\u308b\u9650\u308a\u8aad\u307f\u53d6\u308a\u5c02\u7528\uff08<code>read_only: true</code>\uff09\u306b\u3057\u3001\u66f8\u304d\u8fbc\u307f\u5148\u306f\u660e\u793a\u7684\u306a <code>tmpfs</code> \u304b\u540d\u524d\u4ed8\u304d\u30dc\u30ea\u30e5\u30fc\u30e0\u306b\u3059\u308b\u3002\u4f8b\u5916\u306f\u30b5\u30fc\u30d3\u30b9\u3054\u3068\u306b <code>manifest/hardening.json</code> \u3078\u7406\u7531\u4ed8\u304d\u3067\u8a18\u3059\u3002</li> <li><code>privileged: true</code> \u306f\u7981\u6b62\u3002<code>cap_drop: [ALL]</code> \u3092\u65e2\u5b9a\u306b\u3057\u3001\u5fc5\u8981\u306a\u6a29\u9650\u3060\u3051\u3092\u540d\u524d\u3068\u7406\u7531\u3092\u66f8\u3044\u3066\u623b\u3059\u3002</li> <li>\u5168\u30b5\u30fc\u30d3\u30b9\u306b <code>mem_limit</code>\u3001<code>cpus</code>\u3001<code>pids_limit</code> \u3092\u4ed8\u3051\u308b\u3002<code>grdm-dev compose render</code>\uff08SPEC-02 \u00a73\uff09\u304c\u3001<code>doctor</code> \u304c\u691c\u51fa\u3057\u305f\u30e1\u30e2\u30ea\u306b\u5fdc\u3058\u3066\u5024\u3092\u6c7a\u3081\u3066\u66f8\u304f\u3002</li> </ul>"},{"location":"spec/03_security_gate/#34-\u30b5\u30d7\u30e9\u30a4\u30c1\u30a7\u30fc\u30f3","title":"3.4 \u30b5\u30d7\u30e9\u30a4\u30c1\u30a7\u30fc\u30f3","text":"<ul> <li>\u30a4\u30e1\u30fc\u30b8\u306f\u300c\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u300d\uff08\u4e00\u3064\u306e\u30a4\u30e1\u30fc\u30b8\u7248\u306e\u6b63\u78ba\u306a\u6307\u7d0b\u3002<code>sha256:...</code>\uff09\u3067\u53d6\u5f97\u3057\u3001<code>latest</code> \u306e\u3088\u3046\u306a\u52d5\u304f\u30bf\u30b0\u306f\u4f7f\u308f\u306a\u3044\u3002\u5404\u30d9\u30fc\u30b9\u30a4\u30e1\u30fc\u30b8\u306e\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u306f <code>manifest/upstreams.json</code> \u306e <code>base_image_digest</code> \u9805\u76ee\u3067\u3001Git \u306e SHA \u3068\u4e26\u3079\u3066\u7f6e\u304f\uff08SPEC-01 \u00a73\uff09\u3002\u30a4\u30e1\u30fc\u30b8\u3092\u56fa\u5b9a\u3059\u308b\u307e\u3067\uff08\u9045\u304f\u3068\u3082 M2\uff09\u306f <code>null</code>\u3002</li> <li>\u30ed\u30fc\u30ab\u30eb\u3067\u30d3\u30eb\u30c9\u3057\u305f\u30a4\u30e1\u30fc\u30b8\u306b\u306f\u30d9\u30fc\u30b9\u30a4\u30e1\u30fc\u30b8\u306e\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u3092\u30e9\u30d9\u30eb\u306b\u8a18\u9332\u3057\u3001<code>grdm-dev scan</code> \u304c\u3069\u306e\u30d9\u30fc\u30b9\u304b\u3089\u4f5c\u3089\u308c\u305f\u304b\u5206\u304b\u308b\u3088\u3046\u306b\u3059\u308b\u3002</li> </ul>"},{"location":"spec/03_security_gate/#35-ci-\u3067\u306e\u79d8\u5bc6\u30b9\u30ad\u30e3\u30f3","title":"3.5 CI \u3067\u306e\u79d8\u5bc6\u30b9\u30ad\u30e3\u30f3","text":"<p>\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306f\u516c\u958b\u306e\u305f\u3081\u3001\u3059\u3079\u3066\u306e PR \u3068 <code>develop</code> \u3078\u306e push \u3067\u79d8\u5bc6\u30b9\u30ad\u30e3\u30ca\u30fc\uff08<code>gitleaks</code> \u304b\u540c\u7b49\u54c1\u3002\u5dee\u5206\u3068\u5c65\u6b74\u306e\u4e2d\u306e\u79d8\u5bc6\u9375\u30fb\u30c8\u30fc\u30af\u30f3\u30fb\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u691c\u51fa\u3059\u308b\uff09\u3092\u52d5\u304b\u3059\u3002\u4e00\u4ef6\u306e\u691c\u51fa\u3067\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306f\u5931\u6557\u3059\u308b\u3002\u540c\u3058\u30b9\u30ad\u30e3\u30ca\u30fc\u3092\u30ed\u30fc\u30ab\u30eb\u3067\u306f <code>grdm-dev scan --secrets</code> \u304c\u52d5\u304b\u3059\u3002\u8aa4\u691c\u51fa\u306f <code>.gitleaks.toml</code> \u306e\u30eb\u30fc\u30eb\u306b\u7406\u7531\u3092\u66f8\u3044\u3066\u6291\u3048\u3001\u5831\u544a\u304b\u3089\u6d88\u3057\u3066\u5bfe\u51e6\u3057\u306a\u3044\u3002</p>"},{"location":"spec/03_security_gate/#4-\u30b9\u30ad\u30e3\u30f3","title":"4. \u30b9\u30ad\u30e3\u30f3","text":"<p><code>grdm-dev scan</code> \u306f\u56db\u7a2e\u985e\u306e\u30b9\u30ad\u30e3\u30ca\u30fc\u3092\u52d5\u304b\u3057\u3001\u4e00\u3064\u306e\u5831\u544a\u306b\u307e\u3068\u3081\u307e\u3059\u3002\u30b9\u30ad\u30e3\u30ca\u30fc\u306f\u3001Compose \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u4e2d\u3067 Compose \u306e\u30b5\u30fc\u30d3\u30b9\u540d\u3067\u76f8\u624b\u306b\u5c4a\u304f\u304b\uff08ZAP\u3002\u00a74.3\uff09\u3001\u30db\u30b9\u30c8\u4e0a\u3067 <code>127.0.0.1</code> \u306e\u30dd\u30fc\u30c8\u3092\u8abf\u3079\u308b\u304b\uff08\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u57fa\u672c\u5bfe\u7b56\u306e\u78ba\u8a8d\u3002\u00a73.2\uff09\u306e\u3069\u3061\u3089\u304b\u3067\u52d5\u304d\u3001\u8106\u5f31\u6027\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u53d6\u5f97\u4ee5\u5916\u3067\u5916\u90e8\u306e\u30b5\u30fc\u30d3\u30b9\u3078\u30c7\u30fc\u30bf\u3092\u9001\u308a\u307e\u305b\u3093\u3002</p>"},{"location":"spec/03_security_gate/#41-sbom-\u3068-cve-trivy\u5fc5\u9808grype\u4efb\u610f\u306e\u7b2c\u4e8c\u610f\u898b","title":"4.1 SBOM \u3068 CVE: Trivy\uff08\u5fc5\u9808\uff09\u3001Grype\uff08\u4efb\u610f\u306e\u7b2c\u4e8c\u610f\u898b\uff09","text":"<ul> <li>\u300cSBOM\u300d\uff08\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u90e8\u54c1\u8868\u3002\u30a4\u30e1\u30fc\u30b8\u3084\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u4e2d\u306b\u3042\u308b\u30e9\u30a4\u30d6\u30e9\u30ea\u306e\u5b8c\u5168\u306a\u4e00\u89a7\uff09\u3092\u3001Compose \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u5168\u30a4\u30e1\u30fc\u30b8\u3068\u3001\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u5168\u30ed\u30c3\u30af\u30d5\u30a1\u30a4\u30eb\uff08<code>requirements*.txt</code>\u3001<code>poetry.lock</code>\u3001<code>package-lock.json</code>\u3001<code>yarn.lock</code>\u3001<code>build.gradle</code>\uff09\u306b\u3064\u3044\u3066 Trivy \u304c\u4f5c\u308b\u3002</li> <li>Trivy \u306f SBOM \u3092 CVE \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3068\u7167\u5408\u3059\u308b\u3002\u51fa\u529b\u306f JSON\uff08\u6b63\u672c\uff09\u3068\u3001\u5831\u544a\u5185\u306e TOON \u6284\u9332\u3002</li> <li>Grype \u306f\u540c\u3058 SBOM \u306b\u5bfe\u3057\u7b2c\u4e8c\u610f\u898b\u3068\u3057\u3066\u52d5\u304b\u3057\u3066\u3088\u3044\u3002Grype \u306e\u691c\u51fa\u306f\u53c2\u8003\u60c5\u5831\u3067\u3001\u6240\u6709\u8005\u304c\u8a31\u5bb9\u30ea\u30b9\u30c8\u306e\u624b\u7d9a\u304d\u306b\u4e57\u305b\u308b\u307e\u3067\u9580\u306e\u7d50\u679c\u3092\u5909\u3048\u306a\u3044\u3002</li> <li>M1 \u306e\u7bc4\u56f2\u3002 M1 \u3067\u306f\u30a4\u30e1\u30fc\u30b8\u304c\u307e\u3060\u5b58\u5728\u3057\u306a\u3044\uff08<code>grdm-dev build</code> \u306f M2 \u304b\u3089\uff09\u306e\u3067\u3001<code>security.yml</code> \u306e Trivy \u30b8\u30e7\u30d6\u306f\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u3060\u3051\u3092\u5831\u544a\u306e\u307f\u306e\u65b9\u5f0f\u3067\u691c\u67fb\u3059\u308b\u3002\u691c\u51fa\u306f\u30b8\u30e7\u30d6\u306e\u30ed\u30b0\u306b\u66f8\u304d\u3001PR \u3092\u4e0d\u5408\u683c\u306b\u306f\u3057\u306a\u3044\u3002\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30a4\u30e1\u30fc\u30b8\u3068\u30ed\u30c3\u30af\u30d5\u30a1\u30a4\u30eb\u306e\u691c\u67fb\u306f\u6700\u521d\u306e\u30d3\u30eb\u30c9\u304b\u3089\u59cb\u3081\u308b\u3002</li> </ul>"},{"location":"spec/03_security_gate/#42-\u9759\u7684\u89e3\u6790-semgrep-\u3068-codeql","title":"4.2 \u9759\u7684\u89e3\u6790: Semgrep \u3068 CodeQL","text":"<p>\u300c\u9759\u7684\u89e3\u6790\u300d\u306f\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u3092\u52d5\u304b\u3055\u305a\u306b\u8aad\u307f\u3001\u5371\u306a\u3044\u66f8\u304d\u65b9\uff08\u305f\u3068\u3048\u3070\u5229\u7528\u8005\u306e\u5165\u529b\u6587\u5b57\u304b\u3089 SQL \u3092\u7d44\u307f\u7acb\u3066\u308b\uff09\u3092\u898b\u3064\u3051\u307e\u3059\u3002Semgrep \u306f\u30ed\u30fc\u30ab\u30eb\u3068 CI \u3067\u5168 PR \u306b\u5bfe\u3057 <code>p/default</code>\u3001<code>p/python</code>\u3001<code>p/javascript</code>\u3001<code>p/docker-compose</code> \u306e\u30eb\u30fc\u30eb\u96c6\u3067\u52d5\u304b\u3057\u307e\u3059\u3002CodeQL \u306f\u975e\u516c\u958b\u306e <code>-dev2027</code> \u30ea\u30dd\u30b8\u30c8\u30ea\u306e <code>develop</code> \u3067\u6bce\u6669\u52d5\u304b\u3057\u307e\u3059\u3002\u6df1\u523b\u5ea6 ERROR \u306f\u9580\u3067\u306f HIGH\u3001WARNING \u306f MEDIUM \u3068\u3057\u3066\u6570\u3048\u307e\u3059\u3002</p>"},{"location":"spec/03_security_gate/#43-\u52d5\u7684\u30b9\u30ad\u30e3\u30f3-owasp-zap-\u30d9\u30fc\u30b9\u30e9\u30a4\u30f3","title":"4.3 \u52d5\u7684\u30b9\u30ad\u30e3\u30f3: OWASP ZAP \u30d9\u30fc\u30b9\u30e9\u30a4\u30f3","text":"<p>\u300c\u52d5\u7684\u30b9\u30ad\u30e3\u30f3\u300d\u306f\u3001\u52d5\u3044\u3066\u3044\u308b Web \u30a2\u30d7\u30ea\u3092\u30d6\u30e9\u30a6\u30b6\u306e\u3088\u3046\u306b\u7a81\u3044\u3066\u8abf\u3079\u307e\u3059\u3002<code>grdm-dev scan --dynamic</code> \u306f Compose \u306e\u5185\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306b\u3064\u306a\u3044\u3060\u30b3\u30f3\u30c6\u30ca\u3067 OWASP ZAP \u3092\u8d77\u52d5\u3057\uff08ADR-02 \u00a73\uff09\u3001Compose \u306e\u30b5\u30fc\u30d3\u30b9\u540d\u3068\u30b3\u30f3\u30c6\u30ca\u5074\u30dd\u30fc\u30c8\u3001\u3059\u306a\u308f\u3061 <code>http://web:5000</code>\uff08web\uff09\u3001<code>http://admin:8001</code>\uff08admin\uff09\u3001<code>http://ember_osf_web:4200</code>\uff08ember\uff09\u306b\u5bfe\u3057\u3066\u30d9\u30fc\u30b9\u30e9\u30a4\u30f3\u30b9\u30ad\u30e3\u30f3\u3092\u884c\u3044\u307e\u3059\u3002<code>127.0.0.1</code> \u3092\u5bfe\u8c61\u306b\u3059\u308b\u3053\u3068\u306f\u3042\u308a\u307e\u305b\u3093\u3002ZAP \u306e\u30b3\u30f3\u30c6\u30ca\u306e\u4e2d\u3067\u306f\u3001\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u306f\u30b5\u30fc\u30d3\u30b9\u3067\u3082\u30db\u30b9\u30c8\u3067\u3082\u306a\u304f ZAP \u81ea\u8eab\u3060\u304b\u3089\u3067\u3059\u3002\u30b3\u30f3\u30c6\u30ca\u5074\u30dd\u30fc\u30c8\u306f\u30b5\u30fc\u30d3\u30b9\u304c\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u4e2d\u3067\u5f85\u3061\u53d7\u3051\u308b\u30dd\u30fc\u30c8\u3067\u3001\u756a\u53f7\u306f SPEC-02 \u00a74 \u306e\u30dd\u30fc\u30c8\u8868\u306e\u65e2\u5b9a\u306e\u30db\u30b9\u30c8\u5074\u30dd\u30fc\u30c8\u3068\u540c\u3058\u3067\u3059\u304c\u3001\u305d\u306e\u8868\u304c\u5b9a\u3081\u308b\u306e\u306f\u300c\u30db\u30b9\u30c8\u5074\u300d\u306e\u30dd\u30fc\u30c8\u3067\u3001\u30d6\u30e9\u30a6\u30b6\u30fb\u53d7\u5165\u8a66\u9a13\u30fb<code>grdm-dev health --network</code> \u304c\u4f7f\u3044\u307e\u3059\u3002<code>compose render</code> \u304c\u885d\u7a81\u3067\u30db\u30b9\u30c8\u5074\u30dd\u30fc\u30c8\u3092\u4ed8\u3051\u66ff\u3048\u3066 <code>runtime/.env</code> \u306b <code>GRDM_PORT_<SERVICE></code> \u3068\u3057\u3066\u8a18\u9332\u3057\u305f\u3068\u304d\uff08SPEC-02 \u00a74\uff09\u3001\u30db\u30b9\u30c8\u5074\u306e\u78ba\u8a8d\u306f\u305d\u3053\u304b\u3089\u65b0\u3057\u3044\u756a\u53f7\u3092\u8aad\u307f\u3001ZAP \u306e\u5bfe\u8c61\u306f\u5909\u308f\u308a\u307e\u305b\u3093\u3002ZAP \u306e\u30ea\u30b9\u30af High \u306f HIGH\u3001Medium \u306f MEDIUM \u306b\u5bfe\u5fdc\u3055\u305b\u307e\u3059\u3002<code>grdm-dev health</code> \u304c\u5168\u30b5\u30fc\u30d3\u30b9\u5065\u5168\u3068\u5831\u544a\u3057\u305f\u5f8c\u306b\u3060\u3051\u52d5\u304b\u3057\u307e\u3059\u3002<code>grdm-dev scan</code> \u5168\u4f53\u3067\u306f\u52d5\u7684\u90e8\u5206\u3092\u7701\u7565\u3057\u3066\u5831\u544a\u306b\u8a18\u3057\u3001<code>scan --dynamic</code> \u3092\u660e\u793a\u3057\u305f\u3068\u304d\u306f\u7d42\u4e86 52 \u3067\u7d42\u308f\u308a\u307e\u3059\u3002</p>"},{"location":"spec/03_security_gate/#44-\u4f9d\u5b58\u66f4\u65b0\u30dc\u30c3\u30c8","title":"4.4 \u4f9d\u5b58\u66f4\u65b0\u30dc\u30c3\u30c8","text":"<p>\u975e\u516c\u958b\u306e <code>-dev2027</code> \u30ea\u30dd\u30b8\u30c8\u30ea\u3067\u306f Dependabot\uff08\u307e\u305f\u306f Renovate\uff09\u3092 Python\u30fbnpm\u30fbGradle\u30fbDocker \u30d9\u30fc\u30b9\u30a4\u30e1\u30fc\u30b8\u306b\u5bfe\u3057\u3066\u6709\u52b9\u306b\u3057\u3001\u9031\u3054\u3068\u306b\u307e\u3068\u3081\u307e\u3059\u3002\u30dc\u30c3\u30c8\u304c PR \u3092\u958b\u304d\u3001\u305d\u306e PR \u306f ADR-04 \u306e\u901a\u5e38\u306e\u6d41\u308c\u306b\u5165\u308a\u307e\u3059\u3002\u5fc5\u8981\u306a\u3089 AID\uff08AI\u958b\u767a\u62c5\u5f53\u8005\uff09\u304c\u30b3\u30fc\u30c9\u3092\u5408\u308f\u305b\u3001REV\uff08\u62c5\u5f53\u30ec\u30d3\u30e5\u30ef\uff09\u304c\u30ec\u30d3\u30e5\u30fc\u3057\u3001QAE\uff08QA\u62c5\u5f53\uff09\u304c\u56de\u5e30\u3092\u5b9f\u884c\u3057\u3001\u6240\u6709\u8005\u304c\u30de\u30fc\u30b8\u3057\u307e\u3059\u3002</p>"},{"location":"spec/03_security_gate/#45-grdm-dev-scan-\u306e\u6d41\u308c","title":"4.5 <code>grdm-dev scan</code> \u306e\u6d41\u308c","text":"<pre><code>flowchart TD\n A[grdm-dev scan] --> B{\u57fa\u672c\u5bfe\u7b56<br/>\u79d8\u5bc6 0600\u30fb127.0.0.1 \u306e\u307f<br/>\u975e root\u30fbprivileged \u306a\u3057}\n B -- \u4e00\u3064\u3067\u3082\u4e0d\u5408\u683c --> X[\u7d42\u4e86 50: \u9580\u3067\u505c\u6b62]\n B -- \u5408\u683c --> C[Trivy: \u30a4\u30e1\u30fc\u30b8\u3068\u30ed\u30c3\u30af\u30d5\u30a1\u30a4\u30eb\u306e SBOM]\n C --> D[Trivy: CVE \u7167\u5408]\n C --> E[Grype \u7b2c\u4e8c\u610f\u898b<br/>\u4efb\u610f\u30fb\u53c2\u8003]\n D --> F[Semgrep \u9759\u7684\u89e3\u6790]\n F --> G{\u30b5\u30fc\u30d3\u30b9\u306f\u5065\u5168?}\n G -- \u306f\u3044 --> H[\"OWASP ZAP \u30d9\u30fc\u30b9\u30e9\u30a4\u30f3<br/>web\u30fbadmin\u30fbember_osf_web \u3078\u30b5\u30fc\u30d3\u30b9\u540d\u3067\"]\n G -- \u3044\u3044\u3048 --> I[\u52d5\u7684\u3092\u7701\u7565\u3057\u5831\u544a\u306b\u8a18\u3059]\n H --> J[\u691c\u51fa\u3092\u7d71\u5408]\n I --> J\n E --> J\n J --> K[allowlist.json \u3092\u9069\u7528<br/>\u671f\u9650\u5207\u308c\u306f\u9664\u5916]\n K --> L{\u73fe\u5728\u306e\u7bc0\u76ee\u306e\u57fa\u6e96\u3068\u6bd4\u8f03 \u00a75}\n L -- \u57fa\u6e96\u5185 --> M[\u5831\u544a TOON\uff0bJSON \u3092\u66f8\u304f<br/>\u7d42\u4e86 0]\n L -- \u57fa\u6e96\u8d85\u3048 --> N[\u5831\u544a\u3092\u66f8\u304f<br/>\u7d42\u4e86 50]</code></pre>"},{"location":"spec/03_security_gate/#5-\u8a31\u5bb9\u30ea\u30b9\u30c8\u3068\u6bb5\u968e\u7684\u306a\u9580","title":"5. \u8a31\u5bb9\u30ea\u30b9\u30c8\u3068\u6bb5\u968e\u7684\u306a\u9580","text":""},{"location":"spec/03_security_gate/#51-\u8a31\u5bb9\u30ea\u30b9\u30c8","title":"5.1 \u8a31\u5bb9\u30ea\u30b9\u30c8","text":"<p>\u300c\u8a31\u5bb9\u30ea\u30b9\u30c8\u300d\u306f\u3001\u77e5\u3063\u3066\u3044\u3066\u3001\u5224\u65ad\u6e08\u307f\u3067\u3001\u671f\u9650\u4ed8\u304d\u3067\u53d7\u3051\u5165\u308c\u308b\u691c\u51fa\u3092\u66f8\u3044\u305f\u4e00\u89a7\u3067\u3059\u3002\u6b63\u672c\u306f <code>manifest/allowlist.json</code>\u3002<code>docs/status/</code> \u306e TOON \u6284\u9332\u306f <code>grdm-dev scan</code> \u304c\u518d\u751f\u6210\u3057\u3001<code>grdm-dev manifest check</code> \u304c\u4e00\u81f4\u3092\u78ba\u304b\u3081\u307e\u3059\uff08SPEC-06 \u00a74\uff09\u3002</p> <p>\u6c7a\u307e\u308a:</p> <ol> <li>\u5404\u9805\u76ee\u306f\u516d\u3064\u306e\u6b04\u3092\u3059\u3079\u3066\u6301\u3064: <code>cve</code>\u3001<code>component</code>\u3001<code>reason</code>\u3001<code>owner</code>\u3001<code>expires</code>\u3001<code>added_at</code>\u3002\u6b04\u304c\u6b20\u3051\u305f\u9805\u76ee\u306f\u7121\u52b9\u3067\u3001\u30b9\u30ad\u30e3\u30f3\u306f\u7d42\u4e86\u30b3\u30fc\u30c9 50 \u3067\u5931\u6557\u3059\u308b\u3002</li> <li><code>reason</code> \u306b\u306f\u3001\u3053\u3053\u3067\u306f\u60aa\u7528\u3067\u304d\u306a\u3044\u7406\u7531\u304b\u3001\u307e\u3060\u76f4\u305b\u306a\u3044\u7406\u7531\u3092\u66f8\u304f\uff08\u4f8b:\u300c\u958b\u767a\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3067\u306f\u5230\u9054\u3057\u306a\u3044\u30b3\u30fc\u30c9\u7d4c\u8def\u300d\u300c\u4fee\u6b63\u306b\u306f M4 \u4e88\u5b9a\u306e Python 3.13 \u79fb\u690d\u304c\u5fc5\u8981\u300d\uff09\u3002</li> <li><code>owner</code> \u306f\u4eba\u304b\u3001\u5f79\u5272\u8868 \u306e\u5f79\u5272\u3002\u300c\u30c1\u30fc\u30e0\u300d\u3068\u306f\u66f8\u304b\u306a\u3044\u3002</li> <li><code>expires</code> \u306f\u6b21\u306e\u7bc0\u76ee\u306e\u958b\u59cb\u65e5\u4ee5\u524d\u306e\u65e5\u4ed8\u3002\u671f\u9650\u304c\u5207\u308c\u305f\u9805\u76ee\u306f\u7121\u8996\u3055\u308c\u3001\u305d\u306e\u691c\u51fa\u306f\u518d\u3073\u6570\u3048\u3089\u308c\u308b\u3002</li> <li>\u9805\u76ee\u6570\u306f\u7bc0\u76ee\u3092\u307e\u305f\u3044\u3067\u5897\u3048\u3066\u306f\u306a\u3089\u306a\u3044\u3002 <code>grdm-dev scan</code> \u306f <code>manifest/allowlist.baseline.json</code>\uff08\u5404\u7bc0\u76ee\u306e\u7d42\u4e86\u6642\u306b\u6240\u6709\u8005\u304c\u66f4\u65b0\u3059\u308b\uff09\u3068\u4ef6\u6570\u3092\u6bd4\u3079\u3001\u5897\u3048\u3066\u3044\u308c\u3070\u5931\u6557\u306b\u3059\u308b\u3002</li> <li>\u8ffd\u52a0\u3092\u627f\u8a8d\u3067\u304d\u308b\u306e\u306f\u6240\u6709\u8005\u3060\u3051\u3002AID \u306f PR \u3067\u9805\u76ee\u3092\u63d0\u6848\u3067\u304d\u3001REV \u3068 QAE \u304c\u78ba\u8a8d\u3057\u3001\u6240\u6709\u8005\u304c\u30de\u30fc\u30b8\u3059\u308b\u3002</li> </ol> <pre><code>allowlist:\n milestone: M2\n baseline_count: 3\n entries[3]{cve,component,severity,reason,owner,expires,added_at}:\n CVE-2021-3177,python:3.6-base,HIGH,\"\u30b5\u30dd\u30fc\u30c8\u7d42\u4e86\u306e\u51e6\u7406\u7cfb\u3002M4 \u306e Python 3.13 \u79fb\u690d\u3067\u9664\u53bb\",AID,2027-03-31,2026-11-20\n CVE-2022-24785,moment@2.24,HIGH,\"ember \u306e\u958b\u767a\u30d3\u30eb\u30c9\u306e\u307f\u3002\u958b\u767a\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3067\u306f\u30d6\u30e9\u30a6\u30b6\u3078\u914d\u4fe1\u3057\u306a\u3044\",AID,2027-01-31,2026-11-20\n CVE-2020-8265,node:12-base,CRITICAL,\"\u30b5\u30dd\u30fc\u30c8\u7d42\u4e86\u306e\u5b9f\u884c\u74b0\u5883\u3002M4 \u3067 node 20 \u30a4\u30e1\u30fc\u30b8\u3078\u7f6e\u63db\",AID,2027-03-31,2026-11-20</code></pre> <p>Note: \u4e0a\u306e TOON \u306f\u5f62\u306e\u4f8b\u3067\u3059\u3002\u5b9f\u969b\u306e\u5185\u5bb9\u306f <code>manifest/allowlist.json</code> \u306b\u3042\u308a\u3001<code>grdm-dev scan</code> \u304c <code>docs/status/</code> \u3078\u518d\u751f\u6210\u3057\u307e\u3059\u3002</p>"},{"location":"spec/03_security_gate/#52-\u6bb5\u968e\u7684\u306a\u9580","title":"5.2 \u6bb5\u968e\u7684\u306a\u9580","text":"\u7bc0\u76ee \u9580\u306e\u6c7a\u307e\u308a \u57fa\u6e96\u3092\u8d85\u3048\u305f\u3068\u304d\u306e\u52d5\u304d M1 \u57fa\u672c\u5bfe\u7b56\uff08\u00a73\uff09\u306f\u5408\u683c\u5fc5\u9808\u3002CVE \u306e\u691c\u51fa\u306f\u5831\u544a\u306e\u307f\u3002\u8a31\u5bb9\u30ea\u30b9\u30c8\u3092\u4f5c\u308b\u3002 \u5c0e\u5165\u306f\u7d9a\u304f\u3002\u5831\u544a\u306b\u4ef6\u6570\u3092\u793a\u3059\u3002 M2 \u57fa\u672c\u5bfe\u7b56\u306f\u5408\u683c\u5fc5\u9808\u3002\u8a31\u5bb9\u30ea\u30b9\u30c8\u4ef6\u6570 \u2264 M1 \u306e\u4ef6\u6570\u3002 \u5c0e\u5165\u306f\u7d9a\u304f\u3002\u4ef6\u6570\u304c\u5897\u3048\u305f\u304b\u57fa\u672c\u5bfe\u7b56\u304c\u5916\u308c\u305f\u3068\u304d\u3060\u3051\u7d42\u4e86 50\u3002 M3 \u57fa\u672c\u5bfe\u7b56\u306f\u5408\u683c\u5fc5\u9808\u3002\u8a31\u5bb9\u30ea\u30b9\u30c8\u4ef6\u6570 \u2264 M2 \u306e\u4ef6\u6570\u3002 M2 \u3068\u540c\u3058\u3002 M4 \u8a31\u5bb9\u30ea\u30b9\u30c8\u306b\u306a\u3044 HIGH\u30fbCRITICAL \u304c\u4e00\u4ef6\u3067\u3082\u3042\u308c\u3070\u4e0d\u5408\u683c\u3002 \u521d\u56de\u306e AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\uff08\u00a76\uff09\u3092\u5b8c\u4e86\u3057\u3001\u898b\u3064\u304b\u3063\u305f\u7d4c\u8def\u306f\u3059\u3079\u3066\u4fee\u6b63\u304b\u8a31\u5bb9\u30ea\u30b9\u30c8\u767b\u9332\u3002 <code>grdm-dev install</code> \u306f\u30b5\u30fc\u30d3\u30b9\u8d77\u52d5\u524d\u306b\u6b62\u307e\u308b\u3002\u7d42\u4e86 50\u3002 M5 CRITICAL\u30fbHIGH \u304c\u4e00\u4ef6\u3067\u3082\u3042\u308c\u3070\u4e0d\u5408\u683c\u3002CRITICAL/HIGH \u306e\u8a31\u5bb9\u30ea\u30b9\u30c8\u306f\u7a7a\u3067\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u3002 AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u304c\u672a\u89e3\u6c7a\u306e\u4fb5\u5165\u7d4c\u8def\u30bc\u30ed\u3092\u5831\u544a\u3059\u308b\u3053\u3068\u3002 \u7d42\u4e86 50\u3002\u76f4\u3059\u307e\u3067\u914d\u5e03\u53ef\u80fd\u306a\u72b6\u614b\u306b\u306a\u3089\u306a\u3044\u3002 \u6052\u5e38 M5 \u3068\u540c\u3058\u3002\u65e5\u6b21\u30b9\u30ad\u30e3\u30f3\u3002\u65b0\u3057\u3044 HIGH \u306f\u81ea\u52d5\u3067\u4fee\u6b63 PR \u3092\u958b\u304f\uff08ADR-04\uff09\u3002 CI \u3067\u7d42\u4e86 50\u3002\u6240\u6709\u8005\u306b\u901a\u77e5\u3002 <p>\u73fe\u5728\u306e\u7bc0\u76ee\u306f <code>manifest/milestone.json</code> \u304b\u3089\u8aad\u307f\u3001\u5909\u66f4\u3067\u304d\u308b\u306e\u306f\u6240\u6709\u8005\u3060\u3051\u3067\u3059\u3002</p>"},{"location":"spec/03_security_gate/#6-ai-\u30ec\u30c3\u30c9\u30c1\u30fc\u30e0","title":"6. AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0","text":"<p>\u300cAI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u300d\u306f\u3001\u5bc6\u9589\u3057\u305f\u7bb1\u306e\u4e2d\u3067\u81ea\u5206\u305f\u3061\u306e\u8a66\u9a13\u30b7\u30b9\u30c6\u30e0\u3092\u653b\u6483\u3059\u308b\u3088\u3046\u6307\u793a\u3055\u308c\u305f AI \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u306e\u96c6\u307e\u308a\u3067\u3001\u672c\u7269\u306e\u653b\u6483\u8005\u3088\u308a\u5148\u306b\u81ea\u5206\u305f\u3061\u306e\u5f31\u70b9\u3092\u898b\u3064\u3051\u308b\u305f\u3081\u306e\u3082\u306e\u3067\u3059\u3002\u5b88\u308b\u305f\u3081\u306e\u3001\u627f\u8a8d\u3055\u308c\u305f\u3001\u81ea\u5206\u305f\u3061\u306e\u9694\u96e2\u74b0\u5883\u3060\u3051\u306b\u5bfe\u3059\u308b\u8a66\u9a13\u3067\u3059\u3002</p> <p>\u6c7a\u307e\u308a\uff08\u3059\u3079\u3066\u5fc5\u9808\uff09:</p> <ol> <li>\u9694\u96e2\u3002 \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u306f\u5c02\u7528\u306e Compose \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u4e2d\u3001<code>internal: true</code> \u3067\u5916\u5411\u304d\u901a\u4fe1\u306e\u306a\u3044\uff08\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u306b\u3082 LAN \u306b\u3082\u7d4c\u8def\u304c\u306a\u3044\uff09Docker \u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3067\u52d5\u304b\u3059\u3002<code>manifest/redteam-targets.json</code> \u306b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3001\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3001\u653b\u6483\u5074\u30b3\u30f3\u30c6\u30ca\uff08<code>attacker</code>\uff09\u3001\u5bfe\u8c61\u3092\u8a18\u3059\u3002<code>grdm-dev redteam preflight</code> \u306f\u9694\u96e2\u3092\u63a8\u6e2c\u3067\u306f\u306a\u304f\u8a3c\u660e\u3059\u308b\u3002\u5225\u306e\u901a\u5e38\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306b\u30ab\u30ca\u30ea\u30a2\uff08\u898b\u5f35\u308a\u5f79\uff09\u306e\u30b3\u30f3\u30c6\u30ca\u3092\u8d77\u52d5\u3057\u3001\u307e\u305a\u30ab\u30ca\u30ea\u30a2\u304c\u81ea\u5206\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u304b\u3089\u5c4a\u304f\u3053\u3068\u3092\u78ba\u304b\u3081\uff08\u5c4a\u304b\u306a\u3051\u308c\u3070\u691c\u67fb\u81ea\u4f53\u304c\u4e0d\u78ba\u304b\u306a\u306e\u3067\u4e0d\u5408\u683c\uff09\u3001\u6b21\u306b\u653b\u6483\u5074\u30b3\u30f3\u30c6\u30ca\u306e\u4e2d\u3067\u3001\u307e\u305a\u81ea\u5206\u3067\u8d77\u3053\u3057\u305f\u8074\u53d6\u53e3\u306b\u5bfe\u3057\u3066\u63a2\u67fb\u306e\u9053\u5177\u3092\u81ea\u5df1\u8a66\u9a13\u3057\uff08\u958b\u3044\u305f\u53e3\u306b\u306f\u63a5\u7d9a\u3067\u304d\u3001\u9589\u3058\u305f\u53e3\u306f\u62d2\u5426\u3055\u308c\u308b\u3053\u3068\u3002\u3069\u3061\u3089\u304b\u304c\u5916\u308c\u308c\u3070\u9053\u5177\u306f\u4fe1\u7528\u3067\u304d\u305a\u7d50\u679c\u306f\u300c\u4e0d\u78ba\u304b\u300d\uff09\u3001\u305d\u306e\u3046\u3048\u3067\u30ab\u30ca\u30ea\u30a2\u306b\u3082\u5916\u90e8\u30a2\u30c9\u30ec\u30b9\u306b\u3082\u5c4a\u304b\u306a\u3044\u3053\u3068\u3092\u78ba\u304b\u3081\u308b\u3002\u63a5\u7d9a\u306e\u5931\u6557\u306f\u300c\u906e\u65ad\u300d\u3001\u305d\u308c\u4ee5\u5916\u306e\u9053\u5177\u306e\u7570\u5e38\u306f\u300c\u4e0d\u78ba\u304b\u300d\u3068\u6570\u3048\u3001\u4e0d\u78ba\u304b\u306a\u3089\u4e8b\u524d\u78ba\u8a8d\u306f\u4e0d\u5408\u683c\u3002\u653b\u6483\u5074\u306f\u3061\u3087\u3046\u3069\u4e00\u3064\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306b\u3060\u3051\u63a5\u7d9a\u3057\u3066\u3044\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u3002\u627f\u8a8d\u8a18\u9332\uff08<code>docs/demo/<\u65e5\u4ed8>_redteam_<\u5b9f\u884c>.md</code>\uff09\u306b\u306f <code>approved_by</code>\u3001<code>approved_on</code>\uff08ISO \u65e5\u4ed8\u3002\u672a\u6765\u3067\u306a\u304f 30 \u65e5\u4ee5\u5185\uff09\u3001<code>scope</code>\uff08\u5bfe\u8c61\u30b3\u30f3\u30c6\u30ca\u540d\uff09\u3001<code>run_id</code> \u306e\u30d8\u30c3\u30c0\u304c\u5fc5\u9808\u3067\u3001\u8a18\u9332\u304c\u306a\u3044\u30fb\u53e4\u3044\u30fbscope \u5916\u306e\u5bfe\u8c61\u304c\u3042\u308b\u5834\u5408\u306f\u4e0d\u5408\u683c\u3002\u8a66\u9a13\u306e\u524d\u306b <code>grdm-dev redteam preflight</code> \u304c\u3001\u653b\u6483\u5074\u30b3\u30f3\u30c6\u30ca\u304b\u3089\u5916\u90e8\u30a2\u30c9\u30ec\u30b9\u3078\u5c4a\u304b\u306a\u3044\u3053\u3068\u3092\u78ba\u304b\u3081\u308b\u3002</li> <li>\u5bfe\u8c61\u4e00\u89a7\u3002 \u5bfe\u8c61\u306f\u3001\u305d\u306e\u9694\u96e2\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5185\u306e\u81ea\u5206\u305f\u3061\u306e\u30b3\u30f3\u30c6\u30ca\u3060\u3051\u3067\u3001<code>manifest/redteam-targets.json</code> \u306b\u540d\u524d\u3067\u5217\u6319\u3059\u308b\u3002\u958b\u767a\u8005\u306e\u30d1\u30bd\u30b3\u30f3\u3001\u307b\u304b\u306e\u30b3\u30f3\u30c6\u30ca\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5916\u306e\u30a2\u30c9\u30ec\u30b9\u306f\u6c7a\u3057\u3066\u5bfe\u8c61\u306b\u3057\u306a\u3044\u3002</li> <li>\u627f\u8a8d\u8a18\u9332\u3002 \u5404\u56de\u306e\u524d\u306b <code>docs/demo/</code> \u3078 <code>nn_redteam_<\u65e5\u4ed8>.md</code> \u3092\u66f8\u304f\u3002\u5185\u5bb9\u306f\u3001\u8ab0\u304c\u627f\u8a8d\u3057\u305f\u304b\uff08\u6240\u6709\u8005\uff09\u3001\u3044\u3064\u3001\u7bc4\u56f2\uff08\u5bfe\u8c61\u4e00\u89a7\u3068\u30b3\u30df\u30c3\u30c8 SHA\uff09\u3001\u4f7f\u3046\u30e2\u30c7\u30eb\u3068\u5b9f\u884c\u57fa\u76e4\u3001\u505c\u6b62\u6761\u4ef6\u3002\u8a18\u9332\u304c\u306a\u3051\u308c\u3070\u5b9f\u65bd\u3057\u306a\u3044\u3002</li> <li>\u691c\u51fa\u304b\u3089\u4fee\u6b63\u3078\u3002 \u898b\u3064\u304b\u3063\u305f\u4fb5\u5165\u7d4c\u8def\u306f\u3059\u3079\u3066 issue \u306b\u3057\u3001\u901a\u5e38\u306e\u6d41\u308c\uff08AID \u4fee\u6b63 \u2192 REV \u30ec\u30d3\u30e5\u30fc \u2192 QAE \u56de\u5e30 \u2192 \u6240\u6709\u8005\u30de\u30fc\u30b8\uff09\u3067\u4fee\u6b63 PR \u306b\u3057\u3001\u540c\u3058\u30b7\u30ca\u30ea\u30aa\u3067\u518d\u8a66\u9a13\u3059\u308b\u3002\u518d\u8a66\u9a13\u3067\u518d\u73fe\u3057\u306a\u304f\u306a\u3063\u305f\u3068\u304d\u3060\u3051\u300c\u89e3\u6c7a\u300d\u3068\u3059\u308b\u3002</li> <li>\u5916\u3078\u306f\u6c7a\u3057\u3066\u5411\u3051\u306a\u3044\u3002 \u3053\u3053\u3067\u5f97\u305f\u624b\u6cd5\u306f\u81ea\u5206\u305f\u3061\u306e\u5f31\u70b9\u3092\u898b\u3064\u3051\u308b\u305f\u3081\u306e\u3082\u306e\u3002\u672c\u756a GRDM \u3084\u4e0a\u6d41\u30b5\u30fc\u30d3\u30b9\u3092\u542b\u3081\u3001\u9694\u96e2\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5916\u306e\u3069\u306e\u30b7\u30b9\u30c6\u30e0\u306b\u3082\u4f7f\u3063\u3066\u306f\u306a\u3089\u306a\u3044\u3002</li> <li>\u691c\u51fa\u306b\u79d8\u5bc6\u3092\u66f8\u304b\u306a\u3044\u3002 \u691c\u51fa\u306f\u5f31\u70b9\u3092\u66f8\u304d\u3001\u53d6\u5f97\u3057\u305f\u79d8\u5bc6\u305d\u306e\u3082\u306e\u306f\u66f8\u304b\u306a\u3044\u3002\u79d8\u5bc6\u3092\u53d6\u5f97\u3067\u304d\u305f\u5834\u5408\u306f\u300c\u8cc7\u683c\u60c5\u5831\u3092\u53d6\u5f97\u300d\u3068\u8a18\u3057\u3001<code>grdm-dev secrets rotate</code> \u3067\u79d8\u5bc6\u3092\u66f4\u65b0\u3059\u308b\u3002</li> </ol> <pre><code>sequenceDiagram\n participant O as \u6240\u6709\u8005\n participant Q as QAE\uff08Claude Code Fable\uff09\n participant R as \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u306e\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\n participant T as \u9694\u96e2\u3055\u308c\u305f\u5bfe\u8c61\n O->>Q: docs/demo/ \u306b\u627f\u8a8d\u8a18\u9332\n Q->>R: \u4e8b\u524d\u78ba\u8a8d: \u5916\u5411\u304d\u901a\u4fe1\u306a\u3057\u3001\u5bfe\u8c61\u4e00\u89a7\u306e\u307f\n R->>T: \u63a2\u7d22\u30fb\u4fb5\u5165\u306e\u8a66\u307f\n R-->>Q: \u691c\u51fa\uff08\u79d8\u5bc6\u3092\u542b\u307e\u306a\u3044\uff09\n Q->>Q: issue \u8d77\u7968\u3001\u4fee\u6b63 PR \u3092\u4f9d\u983c\uff08ADR-04\uff09\n Q->>R: \u30de\u30fc\u30b8\u5f8c\u306b\u518d\u8a66\u9a13\n R-->>O: \u672a\u89e3\u6c7a\u306e\u7d4c\u8def\u30bc\u30ed \u2192 M5 \u306e\u9580\u3092\u901a\u904e</code></pre>"},{"location":"spec/03_security_gate/#7-\u8a3c\u8de1\u306e\u5f62\u5f0f","title":"7. \u8a3c\u8de1\u306e\u5f62\u5f0f","text":"<p>\u5404\u30b9\u30ad\u30e3\u30f3\u306f <code>runtime/reports/scan_<\u65e5\u4ed8>.json</code>\uff08\u6b63\u672c\u3002SPEC-02 \u00a73\uff09\u3068\u3001\u6b21\u306e TOON \u6284\u9332\u3092 <code>docs/status/security_<\u7bc0\u76ee>.md</code> \u306b\u66f8\u304d\u307e\u3059\u3002\u5831\u544a\u306b\u306f\u79d8\u5bc6\u3092\u4e00\u5207\u542b\u3081\u307e\u305b\u3093\uff08\u00a73.1\uff09\u3002\u6b04:</p> <pre><code>scan:\n date: 2026-11-20T09:12:00Z\n milestone: M2\n commit: 1a2b3c4d\n host: macos-arm64\n baseline: pass\n tools[4]{name,version,result}:\n trivy,0.68.0,ok\n grype,0.98.0,ok\n semgrep,1.140.0,ok\n zap,2.17.0,ok\n findings_total: 212\n findings_by_severity{critical,high,medium,low}: 9,48,120,35\n allowlisted: 3\n allowlist_baseline: 3\n over_threshold: 0\n gate: pass\n exit_code: 0</code></pre>"},{"location":"spec/03_security_gate/#8-\u7d42\u4e86\u30b3\u30fc\u30c9","title":"8. \u7d42\u4e86\u30b3\u30fc\u30c9","text":"<p>\u7d42\u4e86\u30b3\u30fc\u30c9\u306f SPEC-02 \u00a76 \u3067\u5b9a\u3081\u307e\u3059\u3002\u3053\u306e\u8868\u306f <code>scan</code> \u3068 <code>redteam preflight</code> \u304c\u8fd4\u3059\u3082\u306e\u3092\u8aac\u660e\u3057\u307e\u3059\u3002</p> \u30b3\u30fc\u30c9 \u610f\u5473 0 \u9580\u3092\u901a\u904e\uff08M1\u301cM3 \u3067\u306f\u3001\u5831\u544a\u3092\u66f8\u304d\u3001\u4ef6\u6570\u304c\u5897\u3048\u3066\u3044\u306a\u3044\uff09\u3002 50 \u9580\u3067\u505c\u6b62: \u57fa\u672c\u5bfe\u7b56\u306e\u9055\u53cd\u3001\u8a31\u5bb9\u30ea\u30b9\u30c8\u306e\u4e0d\u5099\u307e\u305f\u306f\u5897\u52a0\u3001\u7bc0\u76ee\u306e\u57fa\u6e96\u3092\u8d85\u3048\u308b\u691c\u51fa\u3001M5 \u3067\u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u672a\u89e3\u6c7a\u3002 51 \u30b9\u30ad\u30e3\u30ca\u30fc\u304c\u52d5\u304b\u306a\u304b\u3063\u305f\uff08\u9053\u5177\u304c\u306a\u3044\u3001\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u53d6\u5f97\u5931\u6557\uff09\u3002\u5408\u683c\u3067\u306f\u306a\u3044\u3002 52 \u30b5\u30fc\u30d3\u30b9\u304c\u5065\u5168\u3067\u306a\u3044\u306e\u306b <code>scan --dynamic</code> \u3092\u6c42\u3081\u305f\u3002\u9759\u7684\u90e8\u5206\u306e\u5831\u544a\u306f\u66f8\u304f\u3002<code>scan</code> \u5168\u4f53\u3067\u306f 52 \u3092\u8fd4\u3055\u305a\u3001\u52d5\u7684\u90e8\u5206\u3092\u7701\u7565\u3057\u3066\u5831\u544a\u306b\u8a18\u3059\u3002 53 <code>redteam preflight</code> \u306b\u5931\u6557\u3002\u653b\u6483\u5074\u30b3\u30f3\u30c6\u30ca\u304b\u3089\u5916\u90e8\u30a2\u30c9\u30ec\u30b9\u3078\u5c4a\u304f\u3001\u307e\u305f\u306f <code>manifest/redteam-targets.json</code> \u5916\u306e\u5bfe\u8c61\u3078\u5c4a\u304f\u3002\u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u306f\u958b\u59cb\u3057\u306a\u3044\u3002"},{"location":"spec/03_security_gate/#9-\u691c\u67fb","title":"9. \u691c\u67fb","text":"<ul> <li><code>python3 -m unittest discover -s installer/tests</code> \u304c\u3001\u79d8\u5bc6\u30d5\u30a1\u30a4\u30eb\u306e\u30e2\u30fc\u30c9\u3001\u65e2\u5b9a\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u691c\u51fa\u3001\u5f85\u3061\u53d7\u3051\u30a2\u30c9\u30ec\u30b9\u306e\u78ba\u8a8d\u3001\u8a31\u5bb9\u30ea\u30b9\u30c8\u306e\u6b04\u306e\u691c\u8a3c\u3001\u4ef6\u6570\u6bd4\u8f03\u3001\u6df1\u523b\u5ea6\u306e\u5bfe\u5fdc\u3001\u5831\u544a\u3067\u306e\u79d8\u5bc6\u306e\u4f0f\u305b\u5b57\u3092\u691c\u67fb\u3059\u308b\u3002</li> <li>CI \u306e <code>security.yml</code> \u306f\u5168 PR \u3067 gitleaks\u30fbSemgrep\u30fbTrivy \u3092\u52d5\u304b\u3059\u3002M1 \u3067\u306f\u30a4\u30e1\u30fc\u30b8\u304c\u307e\u3060\u306a\u3044\u305f\u3081\u3001Trivy \u306f\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u306b\u5bfe\u3059\u308b\u5831\u544a\u306e\u307f\uff08\u00a74.1\uff09\u3002arm64 \u306e\u30bb\u30eb\u30d5\u30db\u30b9\u30c8\u30e9\u30f3\u30ca\u30fc\u306f\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fc\u304c\u3067\u304d\u3066\u304b\u3089\uff08M2\uff09<code>develop</code> \u3067\u6bce\u6669 <code>grdm-dev scan</code> \u306e\u5168\u4f53\u3092\u52d5\u304b\u3059\u3002</li> </ul>"},{"location":"spec/03_security_gate/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Security gate A checkpoint an install must pass before it is called good. \u5c0e\u5165\u304c\u5408\u683c\u3068\u547c\u3070\u308c\u308b\u524d\u306b\u5fc5\u305a\u901a\u308b\u691c\u554f\u6240\u3002 Vulnerability A known weak spot that someone could use to break in. \u4fb5\u5165\u306b\u4f7f\u3048\u308b\u3068\u5206\u304b\u3063\u3066\u3044\u308b\u5f31\u3044\u6240\u3002 CVE The public ID number of one vulnerability. \u4e00\u3064\u306e\u8106\u5f31\u6027\u306b\u4ed8\u304f\u516c\u958b\u306e\u756a\u53f7\u3002 SBOM The complete list of every library inside an image or project. \u30a4\u30e1\u30fc\u30b8\u3084\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u5165\u3063\u3066\u3044\u308b\u90e8\u54c1\u306e\u5b8c\u5168\u306a\u4e00\u89a7\u3002 Allow-list Findings we know, judged, and accept for a limited time. \u77e5\u3063\u3066\u3044\u3066\u3001\u5224\u65ad\u6e08\u307f\u3067\u3001\u671f\u9650\u4ed8\u304d\u3067\u53d7\u3051\u5165\u308c\u308b\u691c\u51fa\u306e\u4e00\u89a7\u3002 Digest The exact fingerprint of one image version. \u4e00\u3064\u306e\u30a4\u30e1\u30fc\u30b8\u7248\u306e\u6b63\u78ba\u306a\u6307\u7d0b\u3002 Internal network A private network inside Docker that the outside cannot reach. Docker \u306e\u4e2d\u3060\u3051\u306b\u3042\u308a\u3001\u5916\u304b\u3089\u5c4a\u304b\u306a\u3044\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3002 Static analysis Reading code without running it to find dangerous patterns. \u30b3\u30fc\u30c9\u3092\u52d5\u304b\u3055\u305a\u306b\u8aad\u307f\u3001\u5371\u306a\u3044\u66f8\u304d\u65b9\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u3002 Dynamic scan Poking the running application like a browser would. \u52d5\u3044\u3066\u3044\u308b\u30a2\u30d7\u30ea\u3092\u30d6\u30e9\u30a6\u30b6\u306e\u3088\u3046\u306b\u7a81\u3044\u3066\u8abf\u3079\u308b\u3053\u3068\u3002 AI red team AI agents told to attack our own sealed test system so we find weaknesses first. \u5bc6\u9589\u3057\u305f\u81ea\u5206\u305f\u3061\u306e\u8a66\u9a13\u30b7\u30b9\u30c6\u30e0\u3092\u653b\u6483\u3055\u305b\u3001\u5f31\u70b9\u3092\u5148\u306b\u898b\u3064\u3051\u308b AI \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3002 Egress Traffic leaving a network toward the outside. \u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u304b\u3089\u5916\u3078\u51fa\u3066\u3044\u304f\u901a\u4fe1\u3002"},{"location":"spec/04_acceptance_tests/","title":"SPEC-04 Acceptance Tests / \u53d7\u5165\u8a66\u9a13","text":"<p>Summary: How we prove that an installed GakuNin RDM developer environment really works: the three test tiers, the browser scenarios for the core and each subsystem, test data, evidence, and the pass criteria for each milestone. \u6982\u8981: \u5c0e\u5165\u3057\u305f GakuNin RDM \u958b\u767a\u74b0\u5883\u304c\u672c\u5f53\u306b\u52d5\u304f\u3053\u3068\u3092\u793a\u3059\u65b9\u6cd5\u3002\u4e09\u3064\u306e\u8a66\u9a13\u306e\u6bb5\u3001\u30b3\u30a2\u3068\u5404\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\u306e\u30d6\u30e9\u30a6\u30b6\u30b7\u30ca\u30ea\u30aa\u3001\u8a66\u9a13\u30c7\u30fc\u30bf\u3001\u8a3c\u8de1\u3001\u7bc0\u76ee\u3054\u3068\u306e\u5408\u683c\u57fa\u6e96\u3092\u5b9a\u3081\u308b\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.4 \u2014 2026-11-05. Learned: a browser trace is raw evidence that can carry cookies and response bodies, so it cannot live under the public evidence folder; it is off by default and quarantined under <code>runtime/</code> when requested (PR #21 review r2, R2-01). \uff0f \u30d6\u30e9\u30a6\u30b6\u306e\u30c8\u30ec\u30fc\u30b9\u306f cookie \u3084\u5fdc\u7b54\u672c\u6587\u3092\u542b\u307f\u5f97\u308b\u751f\u306e\u8a3c\u8de1\u306a\u306e\u3067\u3001\u516c\u958b\u3055\u308c\u308b\u8a3c\u8de1\u30d5\u30a9\u30eb\u30c0\u306b\u306f\u7f6e\u3051\u306a\u3044\u3002\u65e2\u5b9a\u3067\u306f\u8a18\u9332\u305b\u305a\u3001\u6c42\u3081\u3089\u308c\u305f\u3068\u304d\u3060\u3051 <code>runtime/</code> \u914d\u4e0b\u306b\u9694\u96e2\u3059\u308b\uff08PR #21 \u30ec\u30d3\u30e5\u30fc r2\u3001R2-01\uff09\u3002 0.3 \u2014 2026-11-05. Learned: downloading a browser inside a test run would make the run depend on the network, so installation is a separate, explicit step and <code>accept</code> only checks for it. \uff0f \u8a66\u9a13\u306e\u5b9f\u884c\u4e2d\u306b\u30d6\u30e9\u30a6\u30b6\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b\u3068\u5b9f\u884c\u304c\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306b\u4f9d\u5b58\u3059\u308b\u305f\u3081\u3001\u5c0e\u5165\u306f\u5225\u306e\u660e\u793a\u7684\u306a\u624b\u9806\u306b\u3057\u3001<code>accept</code> \u306f\u6709\u7121\u3092\u78ba\u304b\u3081\u308b\u3060\u3051\u306b\u3059\u308b\u3002 0.2 \u2014 2026-11-05. Learned: a case that may skip in the profile a milestone is judged on cannot be a pass criterion, and a diagram that renders in one language half must parse in the other too. \uff0f \u7bc0\u76ee\u3092\u5224\u5b9a\u3059\u308b\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3067\u30b9\u30ad\u30c3\u30d7\u3057\u5f97\u308b\u30b1\u30fc\u30b9\u306f\u5408\u683c\u57fa\u6e96\u306b\u306a\u308c\u305a\u3001\u7247\u65b9\u306e\u8a00\u8a9e\u3067\u63cf\u3051\u308b\u56f3\u306f\u3082\u3046\u7247\u65b9\u3067\u3082\u89e3\u6790\u3067\u304d\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: a scenario without a rejection case proves only that the happy path renders; permission and authentication bugs are found by the case that must fail. \uff0f \u62d2\u5426\u30b1\u30fc\u30b9\u306e\u306a\u3044\u30b7\u30ca\u30ea\u30aa\u306f\u753b\u9762\u304c\u51fa\u308b\u3053\u3068\u3057\u304b\u793a\u3055\u305a\u3001\u6a29\u9650\u3068\u8a8d\u8a3c\u306e\u4e0d\u5177\u5408\u306f\u300c\u5931\u6557\u3057\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u30b1\u30fc\u30b9\u300d\u3067\u521d\u3081\u3066\u898b\u3064\u304b\u308b\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Normative for: <code>installer/acceptance/</code>, <code>grdm-dev accept</code>, <code>docs/demo/</code> result files, CI workflow <code>acceptance-arm64</code>.</li> <li>Related: SPEC-00 Overview \u00b7 SPEC-01 Manifest \u00b7 SPEC-02 Installer CLI \u00b7 SPEC-03 Security Gate \u00b7 SPEC-05 Upstream Tracking \u00b7 SPEC-06 Documentation Conventions \u00b7 ADR-02 Network Model \u00b7 ADR-03 Staged Security Gate \u00b7 POL-01 Position \u00b7 docs/README.md</li> </ul> <p></p>"},{"location":"spec/04_acceptance_tests/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"spec/04_acceptance_tests/#1-scope-and-tooling","title":"1. Scope and tooling","text":"<p>Acceptance tests drive a real browser against the environment that SPEC-02 installed, the way a researcher would use it. They are written in Python with Playwright (a library that opens a browser and clicks, types, and reads pages for you) through pytest-playwright (a plugin that lets the pytest test runner hand each test a ready browser page).</p> <ul> <li>Location: <code>installer/acceptance/</code>, one file per scenario, named <code>test_<scenario>.py</code>.</li> <li>Runner: <code>grdm-dev accept [--profile ...] [--only <scenario>] [--json]</code>. It runs <code>pytest</code> inside the same <code>.venv/</code> that <code>install.sh</code> created (SPEC-02 \u00a72.2) and exits 60 if any test fails.</li> <li>Browsers: <code>grdm-dev accept</code> checks that Chromium is present under <code>PLAYWRIGHT_BROWSERS_PATH=.venv/.playwright/</code> and, if not, exits 2 and prints the exact install command (<code>pip install -e \"installer[accept]\"</code> then <code>playwright install chromium</code> with that variable). The download is a one-time setup step, never part of a test run. Nothing is installed outside the venv.</li> <li>Target URL: always <code>http://127.0.0.1:<port></code> as published by <code>compose render</code> (ADR-02; defaults in the ports table of SPEC-02 \u00a74). Tests read the ports from <code>runtime/.env</code> (<code>GRDM_PORT_<SERVICE></code>); they never hard-code them.</li> </ul>"},{"location":"spec/04_acceptance_tests/#2-test-tiers","title":"2. Test tiers","text":"Tier Where Tool Needs Docker What it proves Unit <code>installer/tests/</code> <code>unittest</code> no Each <code>grdm_dev</code> module and every exit code in SPEC-02 \u00a76 Integration <code>installer/acceptance/integration/</code> <code>pytest</code> + <code>urllib</code> yes <code>compose up</code> reaches health, API answers over HTTP, loopback-only binding Acceptance <code>installer/acceptance/</code> <code>pytest-playwright</code> yes A person can do the core tasks in a browser, and forbidden actions are refused <p><code>grdm-dev accept</code> runs integration first and stops before acceptance if integration fails, because a browser test against a half-started stack produces noise, not evidence.</p>"},{"location":"spec/04_acceptance_tests/#3-scenario-rules","title":"3. Scenario rules","text":"<ol> <li>Every scenario has a success case and a rejection case. The rejection case is one of: an unauthenticated request, or a logged-in user doing something outside their permission. It asserts the HTTP status (<code>401</code>, <code>403</code>, or <code>404</code> as the product defines) or a visible error message, never \"the page looked wrong\".</li> <li>Deterministic. No <code>sleep</code> for luck; wait for a selector, a network response, or a health state. A test that passes only on retry is a failed test.</li> <li>Time-boxed. Each test has <code>timeout=120s</code>; the whole suite has 30 minutes. Exceeding either is a failure.</li> <li>No external network. Tests set <code>PLAYWRIGHT_OFFLINE=1</code> semantics by routing: any request whose host is not <code>127.0.0.1</code> is aborted and the test fails. This also catches containers that try to call the internet.</li> <li>Disposable data only. Every run creates a fresh user, project, and files under a run id (<code>acc-<timestamp>-<6 hex></code>), and deletes them in teardown. No real names, emails, or files of real people, ever (POL-01).</li> <li>One assertion target per test. A test checks one scenario and one case; helpers live in <code>installer/acceptance/conftest.py</code>.</li> </ol>"},{"location":"spec/04_acceptance_tests/#4-core-scenarios-m2","title":"4. Core scenarios (M2)","text":"<pre><code>core_scenarios[6]{id,scenario,success_case,rejection_case,services}:\n C1,Login via fakecas,test user signs in and sees dashboard,\"GET /dashboard without session -> 302 to login; API GET /v2/users/me/ -> 401\",\"web api fakecas\"\n C2,Create project,new project appears with title and user as admin,\"second user (contributor read-only) PATCH /v2/nodes/<id>/ -> 403\",\"web api\"\n C3,Upload and download file,upload via waterbutler then download bytes equal,\"anonymous GET of private file -> 401/403; non-contributor PUT -> 403\",\"wb wb_worker osfstorage\"\n C4,Wiki collaborative edit,two browser contexts type and both see merged text,\"logged-out context connecting to wiki websocket -> closed with 4401\",\"web y_websocket sharejs\"\n C5,File preview,uploaded PDF renders in mfr iframe,\"preview URL of private file without session -> 401/403\",\"mfr unoconv\"\n C6,Institution admin screen,institution admin lists institution users,\"ordinary user opens admin URL -> 403 or redirect; API -> 403\",\"admin api\"</code></pre> <p>Scenario C4 uses two independent Playwright browser contexts (two separate browsers in one test, with their own cookies) so that the second user's cursor and text appear in the first user's page through the <code>y-websocket</code> service. <code>y_websocket</code> is part of the <code>core</code> profile (SPEC-02 \u00a74) because collaborative editing is an M2 scenario, so C4 runs and must pass in both <code>core</code> and <code>full</code>; it never skips.</p>"},{"location":"spec/04_acceptance_tests/#5-subsystem-scenarios-m3","title":"5. Subsystem scenarios (M3)","text":"<pre><code>subsystem_scenarios[5]{id,subsystem,success_case,rejection_case}:\n S1,y-websocket,two contexts converge on same Wiki document within 5 s,\"connection without valid token -> close code 4401, no document state leaked\"\n S2,rdmcp (MCP endpoint),\"authenticated MCP client lists tools and reads one project resource\",\"request without token -> 401; token of user B reading project of user A -> 403\"\n S3,aipf_mcp_data_grdm,\"MCP data query returns the run's project metadata\",\"query for a project id the user cannot see -> 403 or empty with explicit code\"\n S4,OASys,\"OASys page loads and shows the run's project linked from GRDM\",\"unauthenticated OASys API call -> 401\"\n S5,Shibboleth-SP via test IdP,\"SP -> IdP login -> GRDM dashboard with institution attribute\",\"IdP user without the eduPersonEntitlement required by SP -> SP error page, no GRDM session\"</code></pre> <p>MCP (Model Context Protocol) is a standard way for an AI assistant to ask a service for tools and data; <code>rdmcp</code> and <code>aipf_mcp_data_grdm</code> expose GRDM through it. Their tests use an HTTP client in the same <code>pytest</code> session, not a browser.</p>"},{"location":"spec/04_acceptance_tests/#51-shibboleth-scenario","title":"5.1 Shibboleth scenario","text":"<p>With <code>compose render --profile full --auth shibboleth</code> (SPEC-02 \u00a74) <code>fakecas</code> is removed and a bundled test IdP (identity provider: the server that checks who you are, like a university login page) answers for the SP (service provider: the part of GRDM that trusts the IdP). Mock attributes used by the test IdP (names like <code>Test User 01</code>, <code>test01@idp.test</code>) live only in <code>installer/acceptance/fixtures/idp/</code> and are clearly labeled <code>MOCK</code>; they never resemble real institution attributes, as POL-01 requires for separating mock and real data.</p> <pre><code>sequenceDiagram\n participant T as pytest-playwright\n participant W as web (GRDM)\n participant SP as shibboleth_sp\n participant IdP as test_idp\n T->>W: GET http://127.0.0.1:5000/login?campaign=institution\n W-->>T: 302 to SP /Shibboleth.sso/Login\n T->>SP: GET /Shibboleth.sso/Login\n SP-->>T: 302 to IdP SSO URL (SAML AuthnRequest)\n T->>IdP: POST username and password (mock user)\n IdP-->>T: HTML form with SAML Response\n T->>SP: POST /Shibboleth.sso/SAML2/POST\n SP->>W: forward with attributes (eppn, mail, institution)\n W-->>T: 302 to /dashboard, session cookie set\n T->>T: assert dashboard visible, assert institution name shown\n Note over T,IdP: Rejection: the mock user lacking entitlement stops at the SP error page and no GRDM cookie is set</code></pre>"},{"location":"spec/04_acceptance_tests/#6-fixtures-and-test-data","title":"6. Fixtures and test data","text":"<ul> <li><code>conftest.py</code> provides: <code>run_id</code>, <code>base_urls</code> (from <code>runtime/.env</code>), <code>admin_user</code>, <code>user_a</code>, <code>user_b</code> (created through the API with random passwords, deleted in teardown), <code>tmp_pdf</code> and <code>tmp_txt</code> (generated bytes, 1 KiB and 1 MiB).</li> <li>Users are created with the <code>--yes</code> helper <code>grdm-dev accept --seed</code>, which calls the Django management command inside the <code>web</code> container. The admin user is created only for C6 and removed after.</li> <li>Fixtures never read the host's home directory or environment beyond <code>runtime/.env</code>.</li> </ul>"},{"location":"spec/04_acceptance_tests/#7-evidence","title":"7. Evidence","text":"<p>Each run writes, under <code>docs/demo/runs/<run_id>/</code>:</p> <pre><code>evidence:\n results.toon: one line per test with id, case, status, duration_ms, http_status\n results.json: same data, canonical, consumed by grdm-dev report\n junit.xml: for CI and the GitHub checks tab\n screenshots/: <test>_<case>.png, taken only on failure\n trace: \"off by default. With --trace, Playwright trace zips are retained only on failure and moved to runtime/reports/quarantine/<run_id>/ (0700, git-ignored, raw: may hold cookies and bodies). Any zip left under docs/demo/runs/ is sanitized member by member\"</code></pre> <p><code>grdm-dev report</code> (SPEC-02 \u00a73) copies <code>results.toon</code> into the bundle. The demo document for the milestone (<code>docs/demo/20_core_install_mac_studio.md</code> and similar) links to the run folder; the TOON in the document must agree with <code>results.json</code> (<code>docs check</code>).</p>"},{"location":"spec/04_acceptance_tests/#8-pass-criteria-per-milestone","title":"8. Pass criteria per milestone","text":"Milestone Required green Host Note M2 C1\u2013C6, every success and rejection case Mac Studio arm64 (self-hosted runner) amd64: <code>grdm-dev build --platform linux/amd64</code> succeeds on a GitHub runner; no acceptance M3 M2 plus S1\u2013S5 Mac Studio arm64 Shibboleth profile run separately from fakecas profile M4 M3, unchanged after Python 3.13 migration Mac Studio arm64 Acceptance is the regression gate for the port M5 M4 plus SPEC-03 final gate Mac Studio arm64 and Ubuntu 24.04 amd64 Full acceptance on both architectures <p>A milestone is not passed by the author of the change. The QAE role runs <code>grdm-dev accept</code> and records the run id in <code>docs/status/</code>; the owner approves (SPEC-00).</p> <p>The Mac Studio self-hosted runner is registered only with the private <code>-dev2027</code> repositories, never with this public repository (REF-01). The <code>acceptance-arm64</code> workflow therefore runs there, and the QAE brings the run folder into <code>docs/demo/runs/</code> here through a PR.</p> <p></p>"},{"location":"spec/04_acceptance_tests/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"spec/04_acceptance_tests/#1-\u7bc4\u56f2\u3068\u9053\u5177","title":"1. \u7bc4\u56f2\u3068\u9053\u5177","text":"<p>\u53d7\u5165\u8a66\u9a13\u306f\u3001SPEC-02 \u3067\u5c0e\u5165\u3057\u305f\u74b0\u5883\u306b\u5bfe\u3057\u3066\u672c\u7269\u306e\u30d6\u30e9\u30a6\u30b6\u3092\u52d5\u304b\u3057\u3001\u7814\u7a76\u8005\u304c\u4f7f\u3046\u306e\u3068\u540c\u3058\u64cd\u4f5c\u3067\u78ba\u304b\u3081\u307e\u3059\u3002Python \u3067\u66f8\u304d\u3001Playwright\uff08\u30d6\u30e9\u30a6\u30b6\u3092\u958b\u3044\u3066\u30af\u30ea\u30c3\u30af\u30fb\u5165\u529b\u30fb\u8aad\u307f\u53d6\u308a\u3092\u4ee3\u308f\u308a\u306b\u3057\u3066\u304f\u308c\u308b\u30e9\u30a4\u30d6\u30e9\u30ea\uff09\u3092 pytest-playwright\uff08\u8a66\u9a13\u306e\u5b9f\u884c\u5668 pytest \u304c\u5404\u8a66\u9a13\u306b\u6e96\u5099\u6e08\u307f\u306e\u30d6\u30e9\u30a6\u30b6\u753b\u9762\u3092\u6e21\u305b\u308b\u3088\u3046\u306b\u3059\u308b\u8ffd\u52a0\u90e8\u54c1\uff09\u7d4c\u7531\u3067\u4f7f\u3044\u307e\u3059\u3002</p> <ul> <li>\u7f6e\u304d\u5834: <code>installer/acceptance/</code>\u3002\u30b7\u30ca\u30ea\u30aa\u3054\u3068\u306b\u4e00\u30d5\u30a1\u30a4\u30eb\u3001\u540d\u524d\u306f <code>test_<\u30b7\u30ca\u30ea\u30aa>.py</code>\u3002</li> <li>\u5b9f\u884c\u5668: <code>grdm-dev accept [--profile ...] [--only <\u30b7\u30ca\u30ea\u30aa>] [--json]</code>\u3002<code>install.sh</code> \u304c\u4f5c\u3063\u305f\u540c\u3058 <code>.venv/</code> \u306e\u4e2d\u3067 <code>pytest</code> \u3092\u52d5\u304b\u3057\uff08SPEC-02 \u00a72.2\uff09\u3001\u4e00\u4ef6\u3067\u3082\u5931\u6557\u3059\u308c\u3070\u7d42\u4e86 60\u3002</li> <li>\u30d6\u30e9\u30a6\u30b6: <code>grdm-dev accept</code> \u306f <code>PLAYWRIGHT_BROWSERS_PATH=.venv/.playwright/</code> \u306b Chromium \u304c\u3042\u308b\u304b\u3092\u78ba\u304b\u3081\u3001\u306a\u3051\u308c\u3070\u7d42\u4e86\u30b3\u30fc\u30c9 2 \u3067\u5c0e\u5165\u30b3\u30de\u30f3\u30c9\uff08<code>pip install -e \"installer[accept]\"</code> \u306e\u3042\u3068\u540c\u3058\u5909\u6570\u3092\u4ed8\u3051\u3066 <code>playwright install chromium</code>\uff09\u3092\u305d\u306e\u307e\u307e\u8868\u793a\u3059\u308b\u3002\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u306f\u4e00\u5ea6\u3060\u3051\u306e\u6e96\u5099\u3067\u3042\u308a\u3001\u8a66\u9a13\u306e\u5b9f\u884c\u306b\u306f\u542b\u3081\u306a\u3044\u3002venv \u306e\u5916\u306b\u306f\u4f55\u3082\u5165\u308c\u306a\u3044\u3002</li> <li>\u5bfe\u8c61 URL: \u5e38\u306b <code>compose render</code> \u304c\u516c\u958b\u3057\u305f <code>http://127.0.0.1:<\u30dd\u30fc\u30c8></code>\uff08ADR-02\u3002\u65e2\u5b9a\u5024\u306f SPEC-02 \u00a74 \u306e\u30dd\u30fc\u30c8\u8868\uff09\u3002\u30dd\u30fc\u30c8\u306f <code>runtime/.env</code>\uff08<code>GRDM_PORT_<SERVICE></code>\uff09\u304b\u3089\u8aad\u307f\u3001\u6c7a\u3081\u6253\u3061\u3057\u306a\u3044\u3002</li> </ul>"},{"location":"spec/04_acceptance_tests/#2-\u8a66\u9a13\u306e\u6bb5","title":"2. \u8a66\u9a13\u306e\u6bb5","text":"\u6bb5 \u5834\u6240 \u9053\u5177 Docker \u304c\u8981\u308b\u304b \u793a\u3059\u3053\u3068 \u5358\u4f53 <code>installer/tests/</code> <code>unittest</code> \u4e0d\u8981 <code>grdm_dev</code> \u306e\u5404\u30e2\u30b8\u30e5\u30fc\u30eb\u3068 SPEC-02 \u00a76 \u306e\u5168\u7d42\u4e86\u30b3\u30fc\u30c9 \u7d71\u5408 <code>installer/acceptance/integration/</code> <code>pytest</code> + <code>urllib</code> \u8981\u308b <code>compose up</code> \u304c\u5065\u5eb7\u306b\u9054\u3057\u3001API \u304c HTTP \u3067\u5fdc\u3048\u3001\u30eb\u30fc\u30d7\u30d0\u30c3\u30af\u306b\u3060\u3051\u7d50\u3073\u4ed8\u3044\u3066\u3044\u308b \u53d7\u5165 <code>installer/acceptance/</code> <code>pytest-playwright</code> \u8981\u308b \u4eba\u304c\u30d6\u30e9\u30a6\u30b6\u3067\u30b3\u30a2\u306e\u4f5c\u696d\u3092\u3067\u304d\u3001\u7981\u6b62\u3055\u308c\u305f\u64cd\u4f5c\u304c\u62d2\u307e\u308c\u308b <p><code>grdm-dev accept</code> \u306f\u7d71\u5408\u3092\u5148\u306b\u52d5\u304b\u3057\u3001\u7d71\u5408\u304c\u843d\u3061\u305f\u3089\u53d7\u5165\u306e\u524d\u3067\u6b62\u307e\u308a\u307e\u3059\u3002\u534a\u5206\u3057\u304b\u8d77\u52d5\u3057\u3066\u3044\u306a\u3044\u74b0\u5883\u3078\u306e\u30d6\u30e9\u30a6\u30b6\u8a66\u9a13\u306f\u3001\u8a3c\u8de1\u3067\u306f\u306a\u304f\u96d1\u97f3\u306b\u306a\u308b\u304b\u3089\u3067\u3059\u3002</p>"},{"location":"spec/04_acceptance_tests/#3-\u30b7\u30ca\u30ea\u30aa\u306e\u898f\u5247","title":"3. \u30b7\u30ca\u30ea\u30aa\u306e\u898f\u5247","text":"<ol> <li>\u3059\u3079\u3066\u306e\u30b7\u30ca\u30ea\u30aa\u306b\u6210\u529f\u30b1\u30fc\u30b9\u3068\u62d2\u5426\u30b1\u30fc\u30b9\u3092\u7f6e\u304f\u3002 \u62d2\u5426\u30b1\u30fc\u30b9\u306f\u3001\u672a\u8a8d\u8a3c\u306e\u8981\u6c42\u304b\u3001\u30ed\u30b0\u30a4\u30f3\u6e08\u307f\u306e\u5229\u7528\u8005\u304c\u6a29\u9650\u306e\u5916\u306e\u64cd\u4f5c\u3092\u3059\u308b\u3082\u306e\u3002HTTP \u30b9\u30c6\u30fc\u30bf\u30b9\uff08\u88fd\u54c1\u306e\u5b9a\u7fa9\u3069\u304a\u308a <code>401</code>\u30fb<code>403</code>\u30fb<code>404</code>\uff09\u304b\u3001\u753b\u9762\u306b\u898b\u3048\u308b\u30a8\u30e9\u30fc\u6587\u8a00\u3092 assert \u3059\u308b\u3002\u300c\u753b\u9762\u304c\u5909\u3060\u3063\u305f\u300d\u3067\u306f\u78ba\u304b\u3081\u306a\u3044\u3002</li> <li>\u6c7a\u5b9a\u7684\u306b\u52d5\u304f\u3002 \u904b\u306b\u983c\u308b <code>sleep</code> \u3092\u4f7f\u308f\u305a\u3001\u30bb\u30ec\u30af\u30bf\u3001\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u5fdc\u7b54\u3001\u5065\u5eb7\u72b6\u614b\u3092\u5f85\u3064\u3002\u518d\u8a66\u884c\u3067\u901a\u308b\u8a66\u9a13\u306f\u5931\u6557\u3057\u305f\u8a66\u9a13\u3068\u898b\u306a\u3059\u3002</li> <li>\u6642\u9593\u3092\u533a\u5207\u308b\u3002 \u5404\u8a66\u9a13\u306f <code>timeout=120s</code>\u3001\u5168\u4f53\u306f 30 \u5206\u3002\u8d85\u3048\u305f\u3089\u5931\u6557\u3002</li> <li>\u5916\u90e8\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306b\u51fa\u306a\u3044\u3002 \u7d4c\u8def\u306e\u5236\u5fa1\u3067\u3001\u30db\u30b9\u30c8\u304c <code>127.0.0.1</code> \u3067\u306a\u3044\u8981\u6c42\u306f\u3059\u3079\u3066\u4e2d\u65ad\u3057\u3001\u305d\u306e\u8a66\u9a13\u3092\u5931\u6557\u306b\u3059\u308b\u3002\u3053\u308c\u3067\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u3078\u51fa\u3088\u3046\u3068\u3059\u308b\u30b3\u30f3\u30c6\u30ca\u3082\u898b\u3064\u304b\u308b\u3002</li> <li>\u4f7f\u3044\u6368\u3066\u306e\u30c7\u30fc\u30bf\u3060\u3051\u3002 \u6bce\u56de\u3001\u5b9f\u884c ID\uff08<code>acc-<\u6642\u523b>-<6 \u6841\u306e16\u9032></code>\uff09\u306e\u4e0b\u306b\u65b0\u3057\u3044\u5229\u7528\u8005\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u308a\u3001\u5f8c\u7247\u4ed8\u3051\u3067\u6d88\u3059\u3002\u5b9f\u5728\u306e\u4eba\u306e\u540d\u524d\u30fb\u30e1\u30fc\u30eb\u30fb\u30d5\u30a1\u30a4\u30eb\u306f\u6c7a\u3057\u3066\u4f7f\u308f\u306a\u3044\uff08POL-01\uff09\u3002</li> <li>\u4e00\u8a66\u9a13\u4e00\u5bfe\u8c61\u3002 \u4e00\u3064\u306e\u8a66\u9a13\u306f\u4e00\u3064\u306e\u30b7\u30ca\u30ea\u30aa\u306e\u4e00\u3064\u306e\u30b1\u30fc\u30b9\u3060\u3051\u3092\u78ba\u304b\u3081\u308b\u3002\u5171\u901a\u51e6\u7406\u306f <code>installer/acceptance/conftest.py</code> \u306b\u7f6e\u304f\u3002</li> </ol>"},{"location":"spec/04_acceptance_tests/#4-\u30b3\u30a2\u306e\u30b7\u30ca\u30ea\u30aam2","title":"4. \u30b3\u30a2\u306e\u30b7\u30ca\u30ea\u30aa\uff08M2\uff09","text":"<pre><code>core_scenarios[6]{id,scenario,success_case,rejection_case,services}:\n C1,fakecas \u3067\u30ed\u30b0\u30a4\u30f3,\u8a66\u9a13\u5229\u7528\u8005\u304c\u30ed\u30b0\u30a4\u30f3\u3057\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u3092\u898b\u308b,\"\u30bb\u30c3\u30b7\u30e7\u30f3\u306a\u3057\u3067 GET /dashboard -> \u30ed\u30b0\u30a4\u30f3\u3078 302\u3002API GET /v2/users/me/ -> 401\",\"web api fakecas\"\n C2,\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u4f5c\u6210,\u984c\u540d\u4ed8\u304d\u306e\u65b0\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u3067\u304d\u5229\u7528\u8005\u304c\u7ba1\u7406\u8005\u306b\u306a\u308b,\"\u4e8c\u4eba\u76ee\uff08\u8aad\u53d6\u306e\u307f\u306e\u5171\u540c\u7814\u7a76\u8005\uff09\u304c PATCH /v2/nodes/<id>/ -> 403\",\"web api\"\n C3,\u30d5\u30a1\u30a4\u30eb\u306e\u4e0a\u4e0b\u8f09,waterbutler \u3067\u4e0a\u3052\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u4e0b\u308d\u3057\u30d0\u30a4\u30c8\u5217\u304c\u4e00\u81f4,\"\u533f\u540d\u3067\u975e\u516c\u958b\u30d5\u30a1\u30a4\u30eb\u3092 GET -> 401/403\u3002\u5171\u540c\u7814\u7a76\u8005\u3067\u306a\u3044\u4eba\u304c PUT -> 403\",\"wb wb_worker osfstorage\"\n C4,Wiki \u5171\u540c\u7de8\u96c6,\u4e8c\u3064\u306e\u30d6\u30e9\u30a6\u30b6\u6587\u8108\u3067\u5165\u529b\u3057\u53cc\u65b9\u306b\u7d71\u5408\u3055\u308c\u305f\u6587\u304c\u898b\u3048\u308b,\"\u30ed\u30b0\u30a2\u30a6\u30c8\u3057\u305f\u6587\u8108\u304c wiki \u306e websocket \u306b\u63a5\u7d9a -> 4401 \u3067\u5207\u65ad\",\"web y_websocket sharejs\"\n C5,\u30d5\u30a1\u30a4\u30eb\u30d7\u30ec\u30d3\u30e5\u30fc,\u4e0a\u3052\u305f PDF \u304c mfr \u306e iframe \u306b\u63cf\u304b\u308c\u308b,\"\u30bb\u30c3\u30b7\u30e7\u30f3\u306a\u3057\u3067\u975e\u516c\u958b\u30d5\u30a1\u30a4\u30eb\u306e\u30d7\u30ec\u30d3\u30e5\u30fc URL -> 401/403\",\"mfr unoconv\"\n C6,\u6a5f\u95a2\u7ba1\u7406\u753b\u9762,\u6a5f\u95a2\u7ba1\u7406\u8005\u304c\u6a5f\u95a2\u306e\u5229\u7528\u8005\u4e00\u89a7\u3092\u898b\u308b,\"\u4e00\u822c\u5229\u7528\u8005\u304c\u7ba1\u7406 URL \u3092\u958b\u304f -> 403 \u304b\u8ee2\u9001\u3002API -> 403\",\"admin api\"</code></pre> <p>\u30b7\u30ca\u30ea\u30aa C4 \u306f\u72ec\u7acb\u3057\u305f\u4e8c\u3064\u306e Playwright \u306e\u300c\u30d6\u30e9\u30a6\u30b6\u6587\u8108\u300d\uff08\u4e00\u3064\u306e\u8a66\u9a13\u306e\u4e2d\u306b\u3042\u308b\u3001cookie \u3092\u5225\u3005\u306b\u6301\u3064\u4e8c\u3064\u306e\u30d6\u30e9\u30a6\u30b6\uff09\u3092\u4f7f\u3044\u3001\u4e8c\u4eba\u76ee\u306e\u6587\u5b57\u304c <code>y-websocket</code> \u30b5\u30fc\u30d3\u30b9\u3092\u901a\u3057\u3066\u4e00\u4eba\u76ee\u306e\u753b\u9762\u306b\u73fe\u308c\u308b\u3053\u3068\u3092\u78ba\u304b\u3081\u307e\u3059\u3002\u5171\u540c\u7de8\u96c6\u306f M2 \u306e\u30b7\u30ca\u30ea\u30aa\u306a\u306e\u3067 <code>y_websocket</code> \u306f <code>core</code> \u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u306b\u542b\u307e\u308c\uff08SPEC-02 \u00a74\uff09\u3001C4 \u306f <code>core</code> \u3067\u3082 <code>full</code> \u3067\u3082\u5b9f\u884c\u3057\u3066\u5408\u683c\u304c\u5fc5\u9808\u3067\u3059\u3002\u30b9\u30ad\u30c3\u30d7\u306f\u3057\u307e\u305b\u3093\u3002</p>"},{"location":"spec/04_acceptance_tests/#5-\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\u306e\u30b7\u30ca\u30ea\u30aam3","title":"5. \u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\u306e\u30b7\u30ca\u30ea\u30aa\uff08M3\uff09","text":"<pre><code>subsystem_scenarios[5]{id,subsystem,success_case,rejection_case}:\n S1,y-websocket,\u4e8c\u3064\u306e\u6587\u8108\u304c 5 \u79d2\u4ee5\u5185\u306b\u540c\u3058 Wiki \u6587\u66f8\u306b\u53ce\u675f\u3059\u308b,\"\u6b63\u3057\u3044\u30c8\u30fc\u30af\u30f3\u306e\u306a\u3044\u63a5\u7d9a -> \u7d42\u4e86\u30b3\u30fc\u30c9 4401\u3002\u6587\u66f8\u306e\u5185\u5bb9\u306f\u6f0f\u308c\u306a\u3044\"\n S2,rdmcp\uff08MCP \u306e\u53e3\uff09,\"\u8a8d\u8a3c\u6e08\u307f\u306e MCP \u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u304c\u30c4\u30fc\u30eb\u4e00\u89a7\u3092\u5f97\u3066\u4e00\u3064\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u8cc7\u6e90\u3092\u8aad\u3080\",\"\u30c8\u30fc\u30af\u30f3\u306a\u3057 -> 401\u3002\u5229\u7528\u8005 B \u306e\u30c8\u30fc\u30af\u30f3\u3067\u5229\u7528\u8005 A \u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u8aad\u3080 -> 403\"\n S3,aipf_mcp_data_grdm,\"MCP \u306e\u30c7\u30fc\u30bf\u554f\u3044\u5408\u308f\u305b\u304c\u5b9f\u884c\u4e2d\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30e1\u30bf\u30c7\u30fc\u30bf\u3092\u8fd4\u3059\",\"\u898b\u3048\u306a\u3044\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 ID \u306e\u554f\u3044\u5408\u308f\u305b -> 403\u3001\u307e\u305f\u306f\u660e\u793a\u306e\u30b3\u30fc\u30c9\u4ed8\u304d\u306e\u7a7a\"\n S4,OASys,\"OASys \u306e\u753b\u9762\u304c\u958b\u304d\u3001GRDM \u304b\u3089\u30ea\u30f3\u30af\u3057\u305f\u5b9f\u884c\u4e2d\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u898b\u3048\u308b\",\"\u672a\u8a8d\u8a3c\u306e OASys API \u547c\u3073\u51fa\u3057 -> 401\"\n S5,\u30c6\u30b9\u30c8 IdP \u7d4c\u7531\u306e Shibboleth-SP,\"SP -> IdP \u30ed\u30b0\u30a4\u30f3 -> \u6a5f\u95a2\u5c5e\u6027\u4ed8\u304d\u3067 GRDM \u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\",\"SP \u304c\u8981\u6c42\u3059\u308b eduPersonEntitlement \u306e\u306a\u3044 IdP \u5229\u7528\u8005 -> SP \u306e\u30a8\u30e9\u30fc\u753b\u9762\u3002GRDM \u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u4f5c\u3089\u308c\u306a\u3044\"</code></pre> <p>MCP\uff08Model Context Protocol\uff09\u306f\u3001AI \u30a2\u30b7\u30b9\u30bf\u30f3\u30c8\u304c\u30b5\u30fc\u30d3\u30b9\u306b\u9053\u5177\u3068\u30c7\u30fc\u30bf\u3092\u5c0b\u306d\u308b\u305f\u3081\u306e\u5171\u901a\u306e\u6c7a\u307e\u308a\u3067\u3059\u3002<code>rdmcp</code> \u3068 <code>aipf_mcp_data_grdm</code> \u306f GRDM \u3092\u3053\u306e\u6c7a\u307e\u308a\u3067\u516c\u958b\u3057\u307e\u3059\u3002\u3053\u308c\u3089\u306e\u8a66\u9a13\u306f\u30d6\u30e9\u30a6\u30b6\u3067\u306a\u304f\u3001\u540c\u3058 <code>pytest</code> \u30bb\u30c3\u30b7\u30e7\u30f3\u5185\u306e HTTP \u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3067\u884c\u3044\u307e\u3059\u3002</p>"},{"location":"spec/04_acceptance_tests/#51-shibboleth-\u306e\u30b7\u30ca\u30ea\u30aa","title":"5.1 Shibboleth \u306e\u30b7\u30ca\u30ea\u30aa","text":"<p><code>compose render --profile full --auth shibboleth</code>\uff08SPEC-02 \u00a74\uff09\u3067\u306f <code>fakecas</code> \u3092\u5916\u3057\u3001\u540c\u68b1\u3057\u305f\u30c6\u30b9\u30c8\u7528 IdP\uff08\u30a2\u30a4\u30c7\u30f3\u30c6\u30a3\u30c6\u30a3\u30d7\u30ed\u30d0\u30a4\u30c0\u3002\u5927\u5b66\u306e\u30ed\u30b0\u30a4\u30f3\u753b\u9762\u306e\u3088\u3046\u306b\u300c\u3042\u306a\u305f\u304c\u8ab0\u304b\u300d\u3092\u78ba\u304b\u3081\u308b\u30b5\u30fc\u30d0\uff09\u304c SP\uff08\u30b5\u30fc\u30d3\u30b9\u30d7\u30ed\u30d0\u30a4\u30c0\u3002IdP \u3092\u4fe1\u983c\u3059\u308b GRDM \u5074\u306e\u90e8\u54c1\uff09\u306b\u5fdc\u3048\u307e\u3059\u3002\u30c6\u30b9\u30c8 IdP \u306e\u6a21\u64ec\u5c5e\u6027\uff08<code>Test User 01</code>\u3001<code>test01@idp.test</code> \u306e\u3088\u3046\u306a\u540d\u524d\uff09\u306f <code>installer/acceptance/fixtures/idp/</code> \u306b\u3060\u3051\u7f6e\u304d\u3001<code>MOCK</code> \u3068\u660e\u8a18\u3057\u307e\u3059\u3002\u5b9f\u5728\u306e\u6a5f\u95a2\u306e\u5c5e\u6027\u306b\u4f3c\u305b\u3066\u306f\u306a\u3089\u305a\u3001\u6a21\u64ec\u3068\u5b9f\u30c7\u30fc\u30bf\u306e\u5206\u96e2\u306f POL-01 \u306e\u8981\u6c42\u3069\u304a\u308a\u3067\u3059\u3002</p> <pre><code>sequenceDiagram\n participant T as pytest-playwright\n participant W as web\uff08GRDM\uff09\n participant SP as shibboleth_sp\n participant IdP as test_idp\n T->>W: GET http://127.0.0.1:5000/login?campaign=institution\n W-->>T: SP \u306e /Shibboleth.sso/Login \u3078 302\n T->>SP: GET /Shibboleth.sso/Login\n SP-->>T: IdP \u306e SSO URL \u3078 302\uff08SAML AuthnRequest\uff09\n T->>IdP: \u5229\u7528\u8005\u540d\u3068\u30d1\u30b9\u30ef\u30fc\u30c9\u3092 POST\uff08\u6a21\u64ec\u5229\u7528\u8005\uff09\n IdP-->>T: SAML Response \u5165\u308a\u306e HTML \u30d5\u30a9\u30fc\u30e0\n T->>SP: POST /Shibboleth.sso/SAML2/POST\n SP->>W: \u5c5e\u6027\uff08eppn\u30fbmail\u30fb\u6a5f\u95a2\uff09\u3092\u4ed8\u3051\u3066\u8ee2\u9001\n W-->>T: /dashboard \u3078 302\u3002\u30bb\u30c3\u30b7\u30e7\u30f3 cookie \u3092\u8a2d\u5b9a\n T->>T: \u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u304c\u898b\u3048\u308b\u3053\u3068\u3001\u6a5f\u95a2\u540d\u304c\u8868\u793a\u3055\u308c\u308b\u3053\u3068\u3092 assert\n Note over T,IdP: \u62d2\u5426: entitlement \u306e\u306a\u3044\u6a21\u64ec\u5229\u7528\u8005\u306f SP \u306e\u30a8\u30e9\u30fc\u753b\u9762\u3067\u6b62\u307e\u308a\u3001GRDM \u306e cookie \u306f\u4f5c\u3089\u308c\u306a\u3044</code></pre>"},{"location":"spec/04_acceptance_tests/#6-\u30d5\u30a3\u30af\u30b9\u30c1\u30e3\u3068\u8a66\u9a13\u30c7\u30fc\u30bf","title":"6. \u30d5\u30a3\u30af\u30b9\u30c1\u30e3\u3068\u8a66\u9a13\u30c7\u30fc\u30bf","text":"<ul> <li><code>conftest.py</code> \u304c\u63d0\u4f9b\u3059\u308b\u3082\u306e: <code>run_id</code>\u3001<code>base_urls</code>\uff08<code>runtime/.env</code> \u304b\u3089\uff09\u3001<code>admin_user</code>\u30fb<code>user_a</code>\u30fb<code>user_b</code>\uff08API \u3067\u4e71\u6570\u30d1\u30b9\u30ef\u30fc\u30c9\u4ed8\u304d\u306b\u4f5c\u308a\u3001\u5f8c\u7247\u4ed8\u3051\u3067\u6d88\u3059\uff09\u3001<code>tmp_pdf</code>\u30fb<code>tmp_txt</code>\uff08\u751f\u6210\u3057\u305f\u30d0\u30a4\u30c8\u5217\u30021 KiB \u3068 1 MiB\uff09\u3002</li> <li>\u5229\u7528\u8005\u306f <code>--yes</code> \u4ed8\u304d\u306e\u88dc\u52a9 <code>grdm-dev accept --seed</code> \u3067\u4f5c\u308a\u3001\u3053\u308c\u306f <code>web</code> \u30b3\u30f3\u30c6\u30ca\u5185\u306e Django \u7ba1\u7406\u30b3\u30de\u30f3\u30c9\u3092\u547c\u3076\u3002\u7ba1\u7406\u8005\u5229\u7528\u8005\u306f C6 \u306e\u305f\u3081\u3060\u3051\u306b\u4f5c\u308a\u3001\u7d42\u308f\u3063\u305f\u3089\u6d88\u3059\u3002</li> <li>\u30d5\u30a3\u30af\u30b9\u30c1\u30e3\u306f <code>runtime/.env</code> \u4ee5\u5916\u306b\u3001\u30db\u30b9\u30c8\u306e\u30db\u30fc\u30e0\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3084\u74b0\u5883\u5909\u6570\u3092\u8aad\u307e\u306a\u3044\u3002</li> </ul>"},{"location":"spec/04_acceptance_tests/#7-\u8a3c\u8de1","title":"7. \u8a3c\u8de1","text":"<p>\u6bce\u56de\u306e\u5b9f\u884c\u306f <code>docs/demo/runs/<run_id>/</code> \u306e\u4e0b\u306b\u6b21\u3092\u66f8\u304d\u307e\u3059\u3002</p> <pre><code>evidence:\n results.toon: \u8a66\u9a13\u3054\u3068\u306b\u4e00\u884c\u3002id\u30fbcase\u30fbstatus\u30fbduration_ms\u30fbhttp_status\n results.json: \u540c\u3058\u30c7\u30fc\u30bf\u306e\u6b63\u672c\u3002grdm-dev report \u304c\u8aad\u3080\n junit.xml: CI \u3068 GitHub \u306e checks \u30bf\u30d6\u5411\u3051\n screenshots/: <\u8a66\u9a13>_<\u30b1\u30fc\u30b9>.png\u3002\u5931\u6557\u6642\u3060\u3051\u64ae\u308b\n trace: \"\u65e2\u5b9a\u3067\u306f\u8a18\u9332\u3057\u306a\u3044\u3002--trace \u306e\u3068\u304d\u3060\u3051\u5931\u6557\u6642\u306b Playwright \u306e\u30c8\u30ec\u30fc\u30b9 zip \u3092\u6b8b\u3057\u3001runtime/reports/quarantine/<run_id>/\uff080700\u3001git \u7ba1\u7406\u5916\u3001\u751f\u30c7\u30fc\u30bf\u3067 cookie \u3084\u672c\u6587\u3092\u542b\u307f\u5f97\u308b\uff09\u3078\u9694\u96e2\u3059\u308b\u3002docs/demo/runs/ \u306b\u6b8b\u3063\u305f zip \u306f\u30e1\u30f3\u30d0\u30fc\u5358\u4f4d\u3067\u7121\u5bb3\u5316\u3059\u308b\"</code></pre> <p><code>grdm-dev report</code>\uff08SPEC-02 \u00a73\uff09\u304c <code>results.toon</code> \u3092\u675f\u306b\u5199\u3057\u307e\u3059\u3002\u7bc0\u76ee\u306e\u5b9f\u8a3c\u6587\u66f8\uff08<code>docs/demo/20_core_install_mac_studio.md</code> \u304a\u3088\u3073\u305d\u306e\u985e\uff09\u306f\u5b9f\u884c\u30d5\u30a9\u30eb\u30c0\u3078\u30ea\u30f3\u30af\u3057\u3001\u6587\u66f8\u5185\u306e TOON \u306f <code>results.json</code> \u3068\u4e00\u81f4\u3057\u3066\u3044\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\uff08<code>docs check</code>\uff09\u3002</p>"},{"location":"spec/04_acceptance_tests/#8-\u7bc0\u76ee\u3054\u3068\u306e\u5408\u683c\u57fa\u6e96","title":"8. \u7bc0\u76ee\u3054\u3068\u306e\u5408\u683c\u57fa\u6e96","text":"\u7bc0\u76ee \u5168\u4ef6\u5408\u683c\u304c\u5fc5\u8981\u306a\u3082\u306e \u30db\u30b9\u30c8 \u5099\u8003 M2 C1\u301cC6 \u306e\u6210\u529f\u30fb\u62d2\u5426\u30b1\u30fc\u30b9\u3059\u3079\u3066 Mac Studio arm64\uff08\u30bb\u30eb\u30d5\u30db\u30b9\u30c8\u30e9\u30f3\u30ca\u30fc\uff09 amd64 \u306f GitHub \u30e9\u30f3\u30ca\u30fc\u3067 <code>grdm-dev build --platform linux/amd64</code> \u304c\u6210\u529f\u3059\u308b\u3053\u3068\u3002\u53d7\u5165\u306f\u884c\u308f\u306a\u3044 M3 M2 \u306b\u52a0\u3048 S1\u301cS5 Mac Studio arm64 Shibboleth \u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u306f fakecas \u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3068\u5225\u306b\u5b9f\u884c M4 M3 \u304c Python 3.13 \u79fb\u690d\u5f8c\u3082\u5909\u308f\u3089\u305a\u5408\u683c Mac Studio arm64 \u53d7\u5165\u304c\u79fb\u690d\u306e\u56de\u5e30\u5224\u5b9a\u306e\u9580\u306b\u306a\u308b M5 M4 \u306b\u52a0\u3048 SPEC-03 \u306e\u6700\u7d42\u306e\u9580 Mac Studio arm64 \u3068 Ubuntu 24.04 amd64 \u4e21\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3\u3067\u5168\u53d7\u5165 <p>\u7bc0\u76ee\u306e\u5408\u683c\u306f\u5909\u66f4\u306e\u4f5c\u8005\u304c\u5224\u5b9a\u3057\u307e\u305b\u3093\u3002QAE\uff08QA\u62c5\u5f53\uff09\u306e\u5f79\u5272\u304c <code>grdm-dev accept</code> \u3092\u5b9f\u884c\u3057\u3001\u5b9f\u884c ID \u3092 <code>docs/status/</code> \u306b\u8a18\u9332\u3057\u3001\u6240\u6709\u8005\u304c\u627f\u8a8d\u3057\u307e\u3059\uff08SPEC-00\uff09\u3002</p> <p>Mac Studio \u306e\u30bb\u30eb\u30d5\u30db\u30b9\u30c8\u30e9\u30f3\u30ca\u30fc\u306f\u975e\u516c\u958b\u306e <code>-dev2027</code> \u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u3060\u3051\u767b\u9332\u3057\u3001\u516c\u958b\u306e\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u306f\u767b\u9332\u3057\u307e\u305b\u3093\uff08REF-01\uff09\u3002\u305d\u306e\u305f\u3081 <code>acceptance-arm64</code> \u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306f\u305d\u3061\u3089\u3067\u52d5\u304d\u3001QAE \u304c\u5b9f\u884c\u30d5\u30a9\u30eb\u30c0\u3092 PR \u3067\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e <code>docs/demo/runs/</code> \u3078\u6301\u3061\u8fbc\u307f\u307e\u3059\u3002</p>"},{"location":"spec/04_acceptance_tests/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Playwright A library that opens a browser and clicks, types, and reads pages for you. \u30d6\u30e9\u30a6\u30b6\u3092\u958b\u304d\u3001\u30af\u30ea\u30c3\u30af\u30fb\u5165\u529b\u30fb\u8aad\u307f\u53d6\u308a\u3092\u4ee3\u308f\u308a\u306b\u3057\u3066\u304f\u308c\u308b\u30e9\u30a4\u30d6\u30e9\u30ea\u3002 pytest A Python tool that finds and runs test functions and reports which passed. Python \u306e\u8a66\u9a13\u95a2\u6570\u3092\u898b\u3064\u3051\u3066\u52d5\u304b\u3057\u3001\u5408\u5426\u3092\u5831\u544a\u3059\u308b\u9053\u5177\u3002 Browser context A separate browser session with its own cookies, inside one test. \u4e00\u3064\u306e\u8a66\u9a13\u306e\u4e2d\u306b\u3042\u308b\u3001cookie \u3092\u5225\u3005\u306b\u6301\u3064\u72ec\u7acb\u3057\u305f\u30d6\u30e9\u30a6\u30b6\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3002 Fixture Ready-made test data or setup that a test receives before it starts. \u8a66\u9a13\u304c\u59cb\u307e\u308b\u524d\u306b\u53d7\u3051\u53d6\u308b\u3001\u7528\u610f\u6e08\u307f\u306e\u30c7\u30fc\u30bf\u3084\u6e96\u5099\u3002 IdP / SP The server that checks who you are / the service that trusts that answer. \u300c\u3042\u306a\u305f\u304c\u8ab0\u304b\u300d\u3092\u78ba\u304b\u3081\u308b\u30b5\u30fc\u30d0\uff0f\u305d\u306e\u7b54\u3048\u3092\u4fe1\u983c\u3059\u308b\u30b5\u30fc\u30d3\u30b9\u3002 SAML The message format an IdP and an SP use to pass a login result. IdP \u3068 SP \u304c\u30ed\u30b0\u30a4\u30f3\u7d50\u679c\u3092\u6e21\u3057\u5408\u3046\u305f\u3081\u306e\u6587\u66f8\u306e\u5f62\u5f0f\u3002 MCP A standard way for an AI assistant to ask a service for tools and data. AI \u30a2\u30b7\u30b9\u30bf\u30f3\u30c8\u304c\u30b5\u30fc\u30d3\u30b9\u306b\u9053\u5177\u3068\u30c7\u30fc\u30bf\u3092\u5c0b\u306d\u308b\u305f\u3081\u306e\u5171\u901a\u306e\u6c7a\u307e\u308a\u3002 JUnit XML A common file format that CI systems read to show test results. CI \u304c\u8a66\u9a13\u7d50\u679c\u3092\u8868\u793a\u3059\u308b\u305f\u3081\u306b\u8aad\u3080\u3001\u3088\u304f\u4f7f\u308f\u308c\u308b\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u3002"},{"location":"spec/05_upstream_tracking/","title":"SPEC-05 Upstream Tracking / \u4e0a\u6d41\u8ffd\u5f93","text":"<p>Summary: How the integration repositories stay current with their upstreams: a daily job mirrors the <code>upstream/*</code> branches and writes a diff report, a weekly job lets an AI agent open one integration PR per repository, conflicts are solved on the PR, review and checks are automatic, and only merge and publish are human. Also how the COS original is tracked for reference and what happens if COS archives OSF. \u6982\u8981: \u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u4e0a\u6d41\u306b\u8ffd\u5f93\u3055\u305b\u308b\u4ed5\u7d44\u307f\u3002\u65e5\u6b21\u30b8\u30e7\u30d6\u304c <code>upstream/*</code> \u3092\u30df\u30e9\u30fc\u3057\u3066\u5dee\u5206\u5831\u544a\u3092\u66f8\u304d\u3001\u9031\u6b21\u30b8\u30e7\u30d6\u3067 AI \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u304c\u30ea\u30dd\u30b8\u30c8\u30ea\u3054\u3068\u306b\u7d71\u5408 PR \u3092\u4e00\u672c\u958b\u304f\u3002\u885d\u7a81\u306f PR \u4e0a\u3067\u89e3\u304f\u3002\u30ec\u30d3\u30e5\u30fc\u3068\u691c\u67fb\u306f\u81ea\u52d5\u3001\u30de\u30fc\u30b8\u3068\u516c\u958b\u3060\u3051\u304c\u4eba\u3002COS \u672c\u5bb6\u3092\u53c2\u7167\u7528\u306b\u8ffd\u3046\u65b9\u6cd5\u3068\u3001COS \u304c OSF \u3092\u51cd\u7d50\u3057\u305f\u3068\u304d\u306e\u6271\u3044\u3082\u5b9a\u3081\u308b\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: the 2026-11-05 survey found eleven upstreams that moved on five different days in one week; without a daily mirror and a weekly merge the integration branch would drift into large, unreviewable conflicts. \uff0f 2026-11-05 \u306e\u8abf\u67fb\u3067\u3001\u4e0a\u6d41 11 \u672c\u304c\u4e00\u9031\u9593\u306b 5 \u3064\u306e\u7570\u306a\u308b\u65e5\u306b\u52d5\u3044\u3066\u3044\u305f\u3002\u65e5\u6b21\u30df\u30e9\u30fc\u3068\u9031\u6b21\u30de\u30fc\u30b8\u304c\u7121\u3051\u308c\u3070\u3001\u7d71\u5408\u30d6\u30e9\u30f3\u30c1\u306f\u5927\u304d\u304f\u30ec\u30d3\u30e5\u30fc\u4e0d\u80fd\u306a\u885d\u7a81\u306b\u306f\u307e\u308b\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Normative for: the <code>upstream-mirror</code> and <code>upstream-integrate</code> workflows in every <code>RDM-<name>-dev2027</code> repository, the <code>grdm-dev upstream</code> subcommand (SPEC-02), and <code>docs/status/upstream/</code>.</li> <li>Related: SPEC-00 Overview \u00b7 SPEC-01 Manifest \u00b7 SPEC-06 Documentation conventions \u00b7 POL-01 Position \u00b7 ADR-01 Integration repository placement \u00b7 ADR-04 AI autonomy and roles \u00b7 docs/README.md</li> </ul> <p></p>"},{"location":"spec/05_upstream_tracking/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"spec/05_upstream_tracking/#1-branches-that-are-tracked","title":"1. Branches that are tracked","text":"<p>Every integration repository <code>RDM-<name>-dev2027</code> (SPEC-00 \u00a73) has one tracking branch (a read-only copy of a branch that lives in another repository) per <code>upstreams[]</code> entry of the manifest (SPEC-01 \u00a73). The name is <code>upstream/<kind>-<branch></code>, where <code><branch></code> is the upstream branch name with every <code>/</code> replaced by <code>-</code>; a second upstream of the same kind inserts a tag, <code>upstream/<kind>-<tag>-<branch></code> (SPEC-01 \u00a74 rule 7).</p> <pre><code>tracking[4]{branch,source,kind,merged_into_develop,examples}:\n upstream/public-<branch>,\"RDM-<name> default branch\",public,yes,\"upstream/public-develop (osf.io, waterbutler, mfr, cas-overlay, wiki-frontend); upstream/public-master (ember-osf-web, y-websocket)\"\n upstream/private-<branch>,\"RDM-<name>-*-private default branch\",private,yes,\"upstream/private-develop; upstream/private-master (ember-osf-web, y-websocket); upstream/private-main (OASys, Shibboleth-SP, rdmcp, aipf_mcp_data_grdm)\"\n upstream/cos-develop,\"CenterForOpenScience/<name> develop\",cos,no (compare only),\"five cores; wiki-frontend has no COS original\"\n upstream/<kind>-<tag>-<branch>,\"a second upstream of the same kind\",private,no (candidate),\"upstream/private-sec-test-fix-sec-test = RDM-osf.io-private fix/sec-test\"</code></pre> <p>A component has only the branches its manifest entry lists: the five private subsystems have <code>upstream/private-main</code> alone; the cores have <code>public</code>, <code>private</code>, and (except wiki-frontend) <code>cos</code>.</p> <p>Rules that never bend:</p> <ul> <li><code>upstream/*</code> branches are written only by the mirror job. No human and no agent commits to them.</li> <li><code>upstream/*</code> branches are never rewritten. The mirror job fast-forwards; if the source itself was force-pushed, the job stops, keeps the old branch, and opens an issue.</li> <li>Nobody force-pushes anywhere in a <code>-dev2027</code> repository. Branch protection on <code>develop</code> enforces this.</li> </ul>"},{"location":"spec/05_upstream_tracking/#2-daily-job-mirror-and-diff-report","title":"2. Daily job: mirror and diff report","text":"<p>The <code>upstream-mirror</code> workflow runs once a day (03:00 JST) in each <code>-dev2027</code> repository, and can be run by hand with <code>grdm-dev upstream mirror</code>.</p> <ol> <li>Fetch each source repository at the <code>branch</code> named in the manifest.</li> <li>Fast-forward the matching <code>tracking_branch</code>. Record the new SHA (the 40-character fingerprint of a commit).</li> <li>Compare each <code>upstream/*</code> branch with <code>develop</code> and with the SHA pinned in the manifest (SPEC-01).</li> <li>Write the diff report and push it to this public repository as a PR-less commit on a bot branch <code>status/upstream</code>, which a daily PR brings into <code>develop</code>.</li> </ol> <p>Where the report lives. Chosen: <code>docs/status/upstream/latest.toon</code> is overwritten every day, and the same content is archived as <code>docs/status/upstream/archive/YYYY-MM-DD.toon</code>. Archives older than 90 days are deleted by the job. The report is in TOON (a compact text form of JSON; SPEC-06 \u00a74); the canonical JSON sits beside it as <code>latest.json</code>.</p> <p>Warning: The report is public. It contains repository names, branch names, SHAs, and commit counts only. It never contains commit messages, author names, file paths, or diff text from <code>private</code> upstreams.</p> <p>Example report:</p> <pre><code>report:\n generated_at: 2026-11-05T03:00:12+09:00\n repositories[2]:\n - integration_repo: RDM-osf.io-dev2027\n develop_sha: 1111111111111111111111111111111111111111\n upstreams[3]{branch,kind,sha,ahead_of_develop,behind_develop,manifest_sha_matches,moved_since_yesterday}:\n upstream/public-develop,public,2222222222222222222222222222222222222222,14,0,false,true\n upstream/private-develop,private,3333333333333333333333333333333333333333,0,0,true,false\n upstream/cos-develop,cos,4444444444444444444444444444444444444444,310,0,true,true\n action: integrate\n - integration_repo: RDM-wiki-frontend-dev2027\n develop_sha: 5555555555555555555555555555555555555555\n upstreams[2]{branch,kind,sha,ahead_of_develop,behind_develop,manifest_sha_matches,moved_since_yesterday}:\n upstream/public-develop,public,6666666666666666666666666666666666666666,0,0,true,false\n upstream/private-develop,private,6666666666666666666666666666666666666666,0,0,true,false\n action: none\n summary:\n repositories_needing_integration: 1\n force_push_detected: 0</code></pre> <p>The repeated digits are placeholders for the example only. <code>action</code> is <code>integrate</code> when any merged upstream is ahead of <code>develop</code>, <code>none</code> otherwise, and <code>halt</code> when a force-push was detected.</p>"},{"location":"spec/05_upstream_tracking/#3-weekly-integration-pr","title":"3. Weekly integration PR","text":"<p>The <code>upstream-integrate</code> workflow runs once a week (Monday 04:00 JST), or by hand with <code>grdm-dev upstream integrate</code>, and is executed by an AI agent in the AID role (an AI agent is a program that reads instructions, edits code, and reports back). For each <code>-dev2027</code> repository whose latest report says <code>integrate</code>:</p> <pre><code>sequenceDiagram\n autonumber\n participant Mir as Daily mirror\n participant AID as AID agent (Open Code 2)\n participant Repo as RDM-name-dev2027\n participant CI as CI (build, scan, acceptance)\n participant REV as REV (Codex Astra)\n participant QAE as QAE (Claude Code Fable)\n participant Own as Owner\n\n Mir->>Repo: fast-forward upstream/* branches\n Mir->>AID: latest.toon says integrate\n AID->>Repo: branch integrate/YYYY-MM-DD from develop\n AID->>Repo: merge upstream/public-<branch> (if any)\n AID->>Repo: merge upstream/private-<branch>\n AID->>Repo: re-apply adopted_prs in manifest order\n AID->>Repo: open PR with manifest SHA bump\n Repo->>CI: build arm64/amd64, Trivy, Semgrep, acceptance\n CI-->>AID: results on PR\n AID->>Repo: fix conflicts and failures on the same branch\n REV->>Repo: review, record in docs/reviews/\n QAE->>Repo: check regression and acceptance verdict\n Own->>Repo: merge to develop\n Own->>Repo: publish images (optional)</code></pre> <p>Steps in words:</p> <ol> <li>Create branch <code>integrate/YYYY-MM-DD</code> from <code>develop</code>.</li> <li>Merge the <code>public</code> tracking branch with <code>status: merged</code> (<code>upstream/public-develop</code> for osf.io, <code>upstream/public-master</code> for ember-osf-web); the private subsystems have none and skip this step. Then merge the <code>private</code> tracking branch (<code>upstream/private-develop</code>, <code>upstream/private-master</code>, or <code>upstream/private-main</code>). Candidate upstreams such as <code>upstream/private-sec-test-fix-sec-test</code> are never merged. Then re-apply each <code>adopted_prs[]</code> entry from the manifest in list order (<code>git cherry-pick</code> of the PR's commits, or <code>git merge</code> of its branch when the PR is still open).</li> <li>Open one PR per repository titled <code>\u7d71\u5408: upstream YYYY-MM-DD\uff08<name>\uff09</code>. The PR body lists the three source SHAs, the commit counts, and the adopted PRs touched. In this public repository, a matching PR bumps <code>manifest/upstreams.json</code> and <code>upstreams.toon</code> to the new SHAs (SPEC-01 \u00a74 rule 2).</li> <li>CI runs the build, the security gate (SPEC-03), and the acceptance tests (SPEC-04).</li> </ol>"},{"location":"spec/05_upstream_tracking/#4-conflict-handling","title":"4. Conflict handling","text":"<p>A merge conflict happens when two sides changed the same lines and Git cannot choose. On the integration PR:</p> <ul> <li>The AID agent resolves conflicts on the PR branch with ordinary commits. It explains each resolution in the commit body in Japanese.</li> <li>Resolution preference: keep the <code>private</code> change when the conflict is a security fix; keep the <code>public</code> change when it is a feature; when unclear, keep both behind a comment and label the PR <code>needs-owner-decision</code>.</li> <li>The agent never force-pushes the PR branch, never rebases it after review began, never touches <code>upstream/*</code>, and never edits <code>develop</code> directly.</li> <li>If an adopted PR no longer applies, the agent does not drop it silently: it marks that entry <code>candidate</code> with <code>reason: \"no longer applies after <sha>\"</code> in the manifest PR and labels the PR <code>adopted-pr-broken</code>.</li> <li>If CI fails for reasons the agent cannot fix within its budget, it leaves the PR open with a summary comment and the daily report keeps saying <code>integrate</code>.</li> </ul>"},{"location":"spec/05_upstream_tracking/#5-review-check-merge","title":"5. Review, check, merge","text":"<ul> <li>REV (Codex Astra) reviews every integration PR and writes <code>docs/reviews/YYYY-MM-DD_Upstream_Integration_<name>_rN.md</code> plus PR comments.</li> <li>QAE (Claude Code Fable) checks the regression and acceptance results and records the verdict on the PR.</li> <li>Owner merges. Squash is forbidden on integration PRs (it would hide upstream history); use a merge commit.</li> <li>No agent merges. The autonomy boundary is detection \u2192 fix PR \u2192 review \u2192 regression and acceptance automatic; merge and publish human (ADR-04).</li> </ul>"},{"location":"spec/05_upstream_tracking/#6-cos-reference-tracking","title":"6. COS reference tracking","text":"<p><code>CenterForOpenScience/*</code> repositories are mirrored to <code>upstream/cos-develop</code> only. They are never merged, because RCOSDP's code has diverged for years. They are used to:</p> <ul> <li>Compare how COS solved the same modernization (for example the Python 3.12 port of osf.io) when we do ours at M4.</li> <li>Spot security fixes COS made that RCOSDP has not yet made; the weekly PR body lists commits on <code>upstream/cos-develop</code> whose message mentions <code>CVE</code>, <code>security</code>, or <code>vuln</code>.</li> </ul> <p>If COS archives OSF (an archived repository is frozen read-only by its owner):</p> <ol> <li>The mirror job detects the archived flag and stops fetching that source.</li> <li>The manifest keeps the last <code>cos</code> SHA with <code>fetched_at</code> frozen and <code>kind: cos</code>, plus a note <code>archived: YYYY-MM-DD</code>.</li> <li><code>upstream/cos-develop</code> stays in the repository as history. Nothing else changes: the daily mirror, the weekly PR, the security gate, and the AI vulnerability work continue on <code>public</code> and <code>private</code> upstreams and on our own <code>develop</code>. This is the point of POL-01: GRDM keeps building whether COS does or not.</li> </ol> <p></p>"},{"location":"spec/05_upstream_tracking/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"spec/05_upstream_tracking/#1-\u8ffd\u8de1\u3059\u308b\u30d6\u30e9\u30f3\u30c1","title":"1. \u8ffd\u8de1\u3059\u308b\u30d6\u30e9\u30f3\u30c1","text":"<p>\u3059\u3079\u3066\u306e\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea <code>RDM-<name>-dev2027</code>\uff08SPEC-00 \u00a73\uff09\u306b\u306f\u3001\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306e <code>upstreams[]</code> \u306e\u8981\u7d20\u3054\u3068\u306b\u4e00\u672c\u306e\u300c\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\u300d\uff08\u4ed6\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u3042\u308b\u30d6\u30e9\u30f3\u30c1\u306e\u8aad\u307f\u53d6\u308a\u5c02\u7528\u306e\u5199\u3057\uff09\u304c\u3042\u308a\u307e\u3059\uff08SPEC-01 \u00a73\uff09\u3002\u540d\u524d\u306f <code>upstream/<kind>-<branch></code> \u3067\u3001<code><branch></code> \u306f\u4e0a\u6d41\u306e\u30d6\u30e9\u30f3\u30c1\u540d\u306e <code>/</code> \u3092\u3059\u3079\u3066 <code>-</code> \u306b\u7f6e\u304d\u63db\u3048\u305f\u3082\u306e\u3067\u3059\u3002\u540c\u3058 kind \u306e\u4e0a\u6d41\u304c\u4e8c\u3064\u3042\u308b\u3068\u304d\u306f <code>upstream/<kind>-<tag>-<branch></code> \u3068\u30bf\u30b0\u3092\u631f\u307f\u307e\u3059\uff08SPEC-01 \u00a74 \u306e\u898f\u5247 7\uff09\u3002</p> <pre><code>tracking[4]{branch,source,kind,merged_into_develop,examples}:\n upstream/public-<branch>,\"RDM-<name> \u306e\u65e2\u5b9a\u30d6\u30e9\u30f3\u30c1\",public,yes,\"upstream/public-develop\uff08osf.io\u3001waterbutler\u3001mfr\u3001cas-overlay\u3001wiki-frontend\uff09\u3001upstream/public-master\uff08ember-osf-web\u3001y-websocket\uff09\"\n upstream/private-<branch>,\"RDM-<name>-*-private \u306e\u65e2\u5b9a\u30d6\u30e9\u30f3\u30c1\",private,yes,\"upstream/private-develop\u3001upstream/private-master\uff08ember-osf-web\u3001y-websocket\uff09\u3001upstream/private-main\uff08OASys\u3001Shibboleth-SP\u3001rdmcp\u3001aipf_mcp_data_grdm\uff09\"\n upstream/cos-develop,\"CenterForOpenScience/<name> \u306e develop\",cos,no\uff08\u6bd4\u8f03\u306e\u307f\uff09,\"\u30b3\u30a2 5 \u672c\u3002wiki-frontend \u306b\u306f COS \u672c\u5bb6\u304c\u306a\u3044\"\n upstream/<kind>-<tag>-<branch>,\"\u540c\u3058 kind \u306e\u4e8c\u3064\u76ee\u306e\u4e0a\u6d41\",private,no\uff08\u5019\u88dc\uff09,\"upstream/private-sec-test-fix-sec-test = RDM-osf.io-private \u306e fix/sec-test\"</code></pre> <p>\u90e8\u54c1\u304c\u6301\u3064\u306e\u306f\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306e\u8981\u7d20\u306b\u5bfe\u5fdc\u3059\u308b\u30d6\u30e9\u30f3\u30c1\u3060\u3051\u3067\u3059\u3002\u975e\u516c\u958b\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0 5 \u672c\u306f <code>upstream/private-main</code> \u306e\u307f\u3001\u30b3\u30a2\u306f <code>public</code>\u30fb<code>private</code> \u3068\uff08wiki-frontend \u4ee5\u5916\u306f\uff09<code>cos</code> \u3092\u6301\u3061\u307e\u3059\u3002</p> <p>\u6c7a\u3057\u3066\u66f2\u3052\u306a\u3044\u898f\u5247:</p> <ul> <li><code>upstream/*</code> \u306b\u66f8\u304f\u306e\u306f \u30df\u30e9\u30fc\u30b8\u30e7\u30d6\u3060\u3051 \u3067\u3059\u3002\u4eba\u3082\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3082\u30b3\u30df\u30c3\u30c8\u3057\u307e\u305b\u3093\u3002</li> <li><code>upstream/*</code> \u306f \u66f8\u304d\u63db\u3048\u307e\u305b\u3093\u3002\u30df\u30e9\u30fc\u30b8\u30e7\u30d6\u306f fast-forward\uff08\u307e\u3063\u3059\u3050\u524d\u306b\u9032\u3081\u308b\uff09\u3060\u3051\u3092\u884c\u3044\u3001\u5143\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u5074\u304c force push \u3055\u308c\u3066\u3044\u305f\u3089\u6b62\u307e\u3063\u3066\u3001\u53e4\u3044\u30d6\u30e9\u30f3\u30c1\u3092\u6b8b\u3057\u3001Issue \u3092\u958b\u304d\u307e\u3059\u3002</li> <li><code>-dev2027</code> \u306e\u3069\u3053\u306b\u3082 force push \u3057\u307e\u305b\u3093\u3002<code>develop</code> \u306e\u30d6\u30e9\u30f3\u30c1\u4fdd\u8b77\u304c\u3053\u308c\u3092\u5f37\u5236\u3057\u307e\u3059\u3002</li> </ul>"},{"location":"spec/05_upstream_tracking/#2-\u65e5\u6b21\u30b8\u30e7\u30d6-\u30df\u30e9\u30fc\u3068\u5dee\u5206\u5831\u544a","title":"2. \u65e5\u6b21\u30b8\u30e7\u30d6: \u30df\u30e9\u30fc\u3068\u5dee\u5206\u5831\u544a","text":"<p><code>upstream-mirror</code> \u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306f\u3001\u5404 <code>-dev2027</code> \u30ea\u30dd\u30b8\u30c8\u30ea\u3067\u6bce\u65e5\u4e00\u56de\uff08JST 03:00\uff09\u52d5\u304d\u307e\u3059\u3002\u624b\u3067\u52d5\u304b\u3059\u306a\u3089 <code>grdm-dev upstream mirror</code> \u3067\u3059\u3002</p> <ol> <li>\u5404\u5143\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306e <code>branch</code> \u3067\u53d6\u5f97\u3059\u308b\u3002</li> <li>\u5bfe\u5fdc\u3059\u308b <code>tracking_branch</code> \u3092 fast-forward \u3059\u308b\u3002\u65b0\u3057\u3044 SHA\uff08\u30b3\u30df\u30c3\u30c8\u306e 40 \u6587\u5b57\u306e\u6307\u7d0b\uff09\u3092\u8a18\u9332\u3059\u308b\u3002</li> <li>\u5404 <code>upstream/*</code> \u3092 <code>develop</code> \u3068\u3001\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\uff08SPEC-01\uff09\u306b\u56fa\u5b9a\u3057\u305f SHA \u3068\u6bd4\u3079\u308b\u3002</li> <li>\u5dee\u5206\u5831\u544a\u3092\u66f8\u304d\u3001\u3053\u306e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30dc\u30c3\u30c8\u7528\u30d6\u30e9\u30f3\u30c1 <code>status/upstream</code> \u306b\u30b3\u30df\u30c3\u30c8\u3059\u308b\u3002\u65e5\u6b21\u306e PR \u304c\u305d\u308c\u3092 <code>develop</code> \u306b\u53d6\u308a\u8fbc\u3080\u3002</li> </ol> <p>\u5831\u544a\u306e\u7f6e\u304d\u5834\u3002 \u63a1\u7528: <code>docs/status/upstream/latest.toon</code> \u3092\u6bce\u65e5\u4e0a\u66f8\u304d\u3057\u3001\u540c\u3058\u5185\u5bb9\u3092 <code>docs/status/upstream/archive/YYYY-MM-DD.toon</code> \u3068\u3057\u3066\u4fdd\u7ba1\u3057\u307e\u3059\u300290 \u65e5\u3088\u308a\u53e4\u3044\u4fdd\u7ba1\u5206\u306f\u30b8\u30e7\u30d6\u304c\u524a\u9664\u3057\u307e\u3059\u3002\u5831\u544a\u306f TOON\uff08JSON \u3092\u77ed\u304f\u5b57\u4e0b\u3052\u3067\u66f8\u3044\u305f\u5f62\u3002SPEC-06 \u00a74\uff09\u3067\u3001\u6b63\u672c\u306e JSON \u3092 <code>latest.json</code> \u3068\u3057\u3066\u96a3\u306b\u7f6e\u304d\u307e\u3059\u3002</p> <p>Warning: \u5831\u544a\u306f\u516c\u958b\u3067\u3059\u3002\u4e2d\u8eab\u306f\u30ea\u30dd\u30b8\u30c8\u30ea\u540d\u3001\u30d6\u30e9\u30f3\u30c1\u540d\u3001SHA\u3001\u30b3\u30df\u30c3\u30c8\u6570\u3060\u3051\u3067\u3059\u3002<code>private</code> \u306e\u4e0a\u6d41\u306e\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3001\u4f5c\u8005\u540d\u3001\u30d5\u30a1\u30a4\u30eb\u30d1\u30b9\u3001\u5dee\u5206\u306e\u672c\u6587\u306f\u6c7a\u3057\u3066\u542b\u3081\u307e\u305b\u3093\u3002</p> <p>\u5831\u544a\u306e\u4f8b:</p> <pre><code>report:\n generated_at: 2026-11-05T03:00:12+09:00\n repositories[2]:\n - integration_repo: RDM-osf.io-dev2027\n develop_sha: 1111111111111111111111111111111111111111\n upstreams[3]{branch,kind,sha,ahead_of_develop,behind_develop,manifest_sha_matches,moved_since_yesterday}:\n upstream/public-develop,public,2222222222222222222222222222222222222222,14,0,false,true\n upstream/private-develop,private,3333333333333333333333333333333333333333,0,0,true,false\n upstream/cos-develop,cos,4444444444444444444444444444444444444444,310,0,true,true\n action: integrate\n - integration_repo: RDM-wiki-frontend-dev2027\n develop_sha: 5555555555555555555555555555555555555555\n upstreams[2]{branch,kind,sha,ahead_of_develop,behind_develop,manifest_sha_matches,moved_since_yesterday}:\n upstream/public-develop,public,6666666666666666666666666666666666666666,0,0,true,false\n upstream/private-develop,private,6666666666666666666666666666666666666666,0,0,true,false\n action: none\n summary:\n repositories_needing_integration: 1\n force_push_detected: 0</code></pre> <p>\u540c\u3058\u6570\u5b57\u306e\u4e26\u3073\u306f\u4f8b\u306e\u305f\u3081\u306e\u4eee\u306e\u5024\u3067\u3059\u3002<code>action</code> \u306f\u3001\u30de\u30fc\u30b8\u5bfe\u8c61\u306e\u4e0a\u6d41\u306e\u3069\u308c\u304b\u304c <code>develop</code> \u3088\u308a\u9032\u3093\u3067\u3044\u308c\u3070 <code>integrate</code>\u3001\u305d\u3046\u3067\u306a\u3051\u308c\u3070 <code>none</code>\u3001force push \u3092\u691c\u51fa\u3057\u305f\u3089 <code>halt</code> \u3067\u3059\u3002</p>"},{"location":"spec/05_upstream_tracking/#3-\u9031\u6b21\u306e\u7d71\u5408-pr","title":"3. \u9031\u6b21\u306e\u7d71\u5408 PR","text":"<p><code>upstream-integrate</code> \u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306f\u9031\u4e00\u56de\uff08\u6708\u66dc JST 04:00\uff09\u306b\u52d5\u304d\u307e\u3059\u3002\u624b\u3067\u52d5\u304b\u3059\u306a\u3089 <code>grdm-dev upstream integrate</code> \u3067\u3059\u3002\u5b9f\u884c\u3059\u308b\u306e\u306f AID \u5f79\u306e AI \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\uff08\u6307\u793a\u3092\u8aad\u307f\u3001\u30b3\u30fc\u30c9\u3092\u76f4\u3057\u3001\u7d50\u679c\u3092\u5831\u544a\u3059\u308b\u30d7\u30ed\u30b0\u30e9\u30e0\uff09\u3067\u3059\u3002\u6700\u65b0\u306e\u5831\u544a\u304c <code>integrate</code> \u3068\u8a00\u3046 <code>-dev2027</code> \u30ea\u30dd\u30b8\u30c8\u30ea\u3054\u3068\u306b\u6b21\u3092\u884c\u3044\u307e\u3059\u3002</p> <pre><code>sequenceDiagram\n autonumber\n participant Mir as \u65e5\u6b21\u30df\u30e9\u30fc\n participant AID as AID \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\uff08Open Code 2\uff09\n participant Repo as RDM-name-dev2027\n participant CI as CI\uff08\u30d3\u30eb\u30c9\u30fb\u30b9\u30ad\u30e3\u30f3\u30fb\u53d7\u5165\uff09\n participant REV as REV\uff08Codex Astra\uff09\n participant QAE as QAE\uff08Claude Code Fable\uff09\n participant Own as \u6240\u6709\u8005\n\n Mir->>Repo: upstream/* \u3092 fast-forward\n Mir->>AID: latest.toon \u304c integrate\n AID->>Repo: develop \u304b\u3089 integrate/YYYY-MM-DD \u3092\u4f5c\u308b\n AID->>Repo: upstream/public-<branch> \u3092\u30de\u30fc\u30b8\uff08\u3042\u308c\u3070\uff09\n AID->>Repo: upstream/private-<branch> \u3092\u30de\u30fc\u30b8\n AID->>Repo: adopted_prs \u3092\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306e\u9806\u306b\u518d\u9069\u7528\n AID->>Repo: \u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306e SHA \u66f4\u65b0\u3092\u6dfb\u3048\u3066 PR \u3092\u958b\u304f\n Repo->>CI: arm64/amd64 \u30d3\u30eb\u30c9\u3001Trivy\u3001Semgrep\u3001\u53d7\u5165\n CI-->>AID: \u7d50\u679c\u3092 PR \u306b\n AID->>Repo: \u540c\u3058\u30d6\u30e9\u30f3\u30c1\u3067\u885d\u7a81\u3068\u5931\u6557\u3092\u76f4\u3059\n REV->>Repo: \u30ec\u30d3\u30e5\u30fc\u3057 docs/reviews/ \u306b\u8a18\u9332\n QAE->>Repo: \u56de\u5e30\u30fb\u53d7\u5165\u306e\u5224\u5b9a\u3092\u8a18\u9332\n Own->>Repo: develop \u3078\u30de\u30fc\u30b8\n Own->>Repo: \u30a4\u30e1\u30fc\u30b8\u3092\u516c\u958b\uff08\u4efb\u610f\uff09</code></pre> <p>\u8a00\u8449\u3067\u66f8\u304f\u3068:</p> <ol> <li><code>develop</code> \u304b\u3089 <code>integrate/YYYY-MM-DD</code> \u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u308b\u3002</li> <li><code>status: merged</code> \u306e <code>public</code> \u306e\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\uff08osf.io \u306f <code>upstream/public-develop</code>\u3001ember-osf-web \u306f <code>upstream/public-master</code>\uff09\u3092\u30de\u30fc\u30b8\u3059\u308b\u3002\u975e\u516c\u958b\u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\u306b\u306f\u3053\u308c\u304c\u306a\u3044\u306e\u3067\u98db\u3070\u3059\u3002\u6b21\u306b <code>private</code> \u306e\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\uff08<code>upstream/private-develop</code>\u3001<code>upstream/private-master</code>\u3001\u307e\u305f\u306f <code>upstream/private-main</code>\uff09\u3092\u30de\u30fc\u30b8\u3059\u308b\u3002<code>upstream/private-sec-test-fix-sec-test</code> \u306e\u3088\u3046\u306a\u5019\u88dc\u306e\u4e0a\u6d41\u306f\u6c7a\u3057\u3066\u30de\u30fc\u30b8\u3057\u306a\u3044\u3002\u6700\u5f8c\u306b\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306e <code>adopted_prs[]</code> \u3092\u4e26\u3073\u9806\u306b\u518d\u9069\u7528\u3059\u308b\uff08PR \u306e\u30b3\u30df\u30c3\u30c8\u3092 <code>git cherry-pick</code>\u3002PR \u304c\u307e\u3060\u958b\u3044\u3066\u3044\u308c\u3070\u305d\u306e\u30d6\u30e9\u30f3\u30c1\u3092 <code>git merge</code>\uff09\u3002</li> <li>\u30ea\u30dd\u30b8\u30c8\u30ea\u3054\u3068\u306b\u4e00\u672c\u306e PR \u3092 <code>\u7d71\u5408: upstream YYYY-MM-DD\uff08<name>\uff09</code> \u306e\u984c\u3067\u958b\u304f\u3002PR \u672c\u6587\u306b\u306f\u4e09\u3064\u306e\u5143 SHA\u3001\u30b3\u30df\u30c3\u30c8\u6570\u3001\u89e6\u3063\u305f\u63a1\u7528 PR \u3092\u66f8\u304f\u3002\u3053\u306e\u516c\u958b\u30ea\u30dd\u30b8\u30c8\u30ea\u5074\u3067\u306f\u3001\u5bfe\u306b\u306a\u308b PR \u304c <code>manifest/upstreams.json</code> \u3068 <code>upstreams.toon</code> \u3092\u65b0\u3057\u3044 SHA \u306b\u9032\u3081\u308b\uff08SPEC-01 \u00a74 \u306e\u898f\u5247 2\uff09\u3002</li> <li>CI \u304c\u30d3\u30eb\u30c9\u3001\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u9580\uff08SPEC-03\uff09\u3001\u53d7\u5165\u8a66\u9a13\uff08SPEC-04\uff09\u3092\u5b9f\u884c\u3059\u308b\u3002</li> </ol>"},{"location":"spec/05_upstream_tracking/#4-\u885d\u7a81\u306e\u6271\u3044","title":"4. \u885d\u7a81\u306e\u6271\u3044","text":"<p>\u300c\u30de\u30fc\u30b8\u306e\u885d\u7a81\u300d\u306f\u3001\u4e21\u5074\u304c\u540c\u3058\u884c\u3092\u5909\u3048\u3066\u3044\u3066 Git \u304c\u9078\u3079\u306a\u3044\u3068\u304d\u306b\u8d77\u304d\u307e\u3059\u3002\u7d71\u5408 PR \u3067\u306f:</p> <ul> <li>AID \u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u306f\u885d\u7a81\u3092 PR \u306e\u30d6\u30e9\u30f3\u30c1\u4e0a\u3067 \u901a\u5e38\u306e\u30b3\u30df\u30c3\u30c8\u3068\u3057\u3066\u89e3\u304d\u307e\u3059\u3002\u89e3\u304d\u65b9\u306e\u7406\u7531\u3092\u30b3\u30df\u30c3\u30c8\u672c\u6587\u306b\u65e5\u672c\u8a9e\u3067\u66f8\u304d\u307e\u3059\u3002</li> <li>\u512a\u5148\u9806: \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u4fee\u6b63\u306e\u885d\u7a81\u306a\u3089 <code>private</code> \u5074\u3092\u6b8b\u3059\u3002\u6a5f\u80fd\u306e\u885d\u7a81\u306a\u3089 <code>public</code> \u5074\u3092\u6b8b\u3059\u3002\u5224\u65ad\u3067\u304d\u306a\u3044\u3068\u304d\u306f\u4e21\u65b9\u3092\u30b3\u30e1\u30f3\u30c8\u4ed8\u304d\u3067\u6b8b\u3057\u3001PR \u306b\u30e9\u30d9\u30eb <code>needs-owner-decision</code> \u3092\u4ed8\u3051\u308b\u3002</li> <li>\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u306f PR \u30d6\u30e9\u30f3\u30c1\u3092 \u6c7a\u3057\u3066 force push \u305b\u305a\u3001\u30ec\u30d3\u30e5\u30fc\u958b\u59cb\u5f8c\u306b rebase \u305b\u305a\u3001<code>upstream/*</code> \u306b\u89e6\u308c\u305a\u3001<code>develop</code> \u3092\u76f4\u63a5\u7de8\u96c6\u3057\u307e\u305b\u3093\u3002</li> <li>\u63a1\u7528 PR \u304c\u5f53\u305f\u3089\u306a\u304f\u306a\u3063\u305f\u3089\u3001\u9ed9\u3063\u3066\u843d\u3068\u3055\u305a\u3001\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306e PR \u3067\u305d\u306e\u9805\u76ee\u3092 <code>candidate</code> \u306b\u3057\u3066 <code>reason: \"no longer applies after <sha>\"</code> \u3092\u66f8\u304d\u3001PR \u306b\u30e9\u30d9\u30eb <code>adopted-pr-broken</code> \u3092\u4ed8\u3051\u307e\u3059\u3002</li> <li>\u4e88\u7b97\u5185\u3067\u76f4\u305b\u306a\u3044\u7406\u7531\u3067 CI \u304c\u843d\u3061\u305f\u3089\u3001\u8981\u7d04\u30b3\u30e1\u30f3\u30c8\u3092\u6b8b\u3057\u3066 PR \u3092\u958b\u3044\u305f\u307e\u307e\u306b\u3057\u307e\u3059\u3002\u65e5\u6b21\u5831\u544a\u306f <code>integrate</code> \u3092\u51fa\u3057\u7d9a\u3051\u307e\u3059\u3002</li> </ul>"},{"location":"spec/05_upstream_tracking/#5-\u30ec\u30d3\u30e5\u30fc\u691c\u67fb\u30de\u30fc\u30b8","title":"5. \u30ec\u30d3\u30e5\u30fc\u30fb\u691c\u67fb\u30fb\u30de\u30fc\u30b8","text":"<ul> <li>REV\uff08Codex Astra\uff09 \u304c\u5168\u7d71\u5408 PR \u3092\u30ec\u30d3\u30e5\u30fc\u3057\u3001<code>docs/reviews/YYYY-MM-DD_Upstream_Integration_<name>_rN.md</code> \u3068 PR \u30b3\u30e1\u30f3\u30c8\u306b\u66f8\u304d\u307e\u3059\u3002</li> <li>QAE\uff08Claude Code Fable\uff09 \u304c\u56de\u5e30\u30fb\u53d7\u5165\u306e\u7d50\u679c\u3092\u691c\u67fb\u3057\u3001\u5224\u5b9a\u3092 PR \u306b\u8a18\u9332\u3057\u307e\u3059\u3002</li> <li>\u6240\u6709\u8005 \u304c\u30de\u30fc\u30b8\u3057\u307e\u3059\u3002\u7d71\u5408 PR \u3067\u306f squash\uff08\u8907\u6570\u30b3\u30df\u30c3\u30c8\u3092\u4e00\u3064\u306b\u6f70\u3059\uff09\u3092\u7981\u6b62\u3057\u307e\u3059\u3002\u4e0a\u6d41\u306e\u5c65\u6b74\u304c\u6d88\u3048\u308b\u304b\u3089\u3067\u3059\u3002\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3092\u4f7f\u3044\u307e\u3059\u3002</li> <li>\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u306f\u30de\u30fc\u30b8\u3057\u307e\u305b\u3093\u3002\u81ea\u5f8b\u306e\u5883\u754c\u306f\u3001\u691c\u51fa \u2192 \u4fee\u6b63 PR \u2192 \u30ec\u30d3\u30e5\u30fc \u2192 \u56de\u5e30\u30fb\u53d7\u5165 \u307e\u3067\u304c\u81ea\u52d5\u3001\u30de\u30fc\u30b8\u3068\u516c\u958b \u304c\u4eba\u3067\u3059\uff08ADR-04\uff09\u3002</li> </ul>"},{"location":"spec/05_upstream_tracking/#6-cos-\u672c\u5bb6\u306e\u53c2\u7167\u8ffd\u8de1","title":"6. COS \u672c\u5bb6\u306e\u53c2\u7167\u8ffd\u8de1","text":"<p><code>CenterForOpenScience/*</code> \u306f <code>upstream/cos-develop</code> \u306b\u30df\u30e9\u30fc\u3059\u308b\u3060\u3051\u3067\u3059\u3002RCOSDP \u306e\u30b3\u30fc\u30c9\u306f\u4f55\u5e74\u3082\u524d\u306b\u5206\u304b\u308c\u3066\u3044\u308b\u306e\u3067\u3001\u30de\u30fc\u30b8\u306f\u3057\u307e\u305b\u3093\u3002\u4f7f\u3044\u65b9\u306f\u6b21\u306e\u4e8c\u3064\u3067\u3059\u3002</p> <ul> <li>\u540c\u3058\u8fd1\u4ee3\u5316\uff08\u4f8b: osf.io \u306e Python 3.12 \u79fb\u690d\uff09\u3092 COS \u304c\u3069\u3046\u89e3\u3044\u305f\u304b\u3092\u3001M4 \u3067\u79c1\u305f\u3061\u304c\u79fb\u690d\u3059\u308b\u3068\u304d\u306b\u6bd4\u3079\u308b\u3002</li> <li>COS \u304c\u884c\u3044 RCOSDP \u304c\u307e\u3060\u884c\u3063\u3066\u3044\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u4fee\u6b63\u3092\u898b\u3064\u3051\u308b\u3002\u9031\u6b21 PR \u306e\u672c\u6587\u306b\u3001<code>upstream/cos-develop</code> \u306e\u30b3\u30df\u30c3\u30c8\u306e\u3046\u3061\u30e1\u30c3\u30bb\u30fc\u30b8\u306b <code>CVE</code>\u30fb<code>security</code>\u30fb<code>vuln</code> \u3092\u542b\u3080\u3082\u306e\u3092\u5217\u6319\u3059\u308b\u3002</li> </ul> <p>COS \u304c OSF \u3092\u30a2\u30fc\u30ab\u30a4\u30d6\u3057\u305f\u3089\uff08\u300c\u30a2\u30fc\u30ab\u30a4\u30d6\u300d\u306f\u6301\u3061\u4e3b\u304c\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u8aad\u307f\u53d6\u308a\u5c02\u7528\u306b\u51cd\u7d50\u3059\u308b\u3053\u3068\uff09:</p> <ol> <li>\u30df\u30e9\u30fc\u30b8\u30e7\u30d6\u304c\u30a2\u30fc\u30ab\u30a4\u30d6\u306e\u5370\u3092\u691c\u51fa\u3057\u3001\u305d\u306e\u5143\u306e\u53d6\u5f97\u3092\u6b62\u3081\u308b\u3002</li> <li>\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306f\u6700\u5f8c\u306e <code>cos</code> \u306e SHA \u3092 <code>fetched_at</code> \u3092\u51cd\u7d50\u3057\u3066 <code>kind: cos</code> \u306e\u307e\u307e\u4fdd\u3061\u3001<code>archived: YYYY-MM-DD</code> \u306e\u6ce8\u3092\u8db3\u3059\u3002</li> <li><code>upstream/cos-develop</code> \u306f\u5c65\u6b74\u3068\u3057\u3066\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u6b8b\u3059\u3002\u307b\u304b\u306f\u4f55\u3082\u5909\u308f\u3089\u306a\u3044\u3002\u65e5\u6b21\u30df\u30e9\u30fc\u3001\u9031\u6b21 PR\u3001\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u9580\u3001AI \u306b\u3088\u308b\u8106\u5f31\u6027\u5bfe\u5fdc\u306f\u3001<code>public</code> \u3068 <code>private</code> \u306e\u4e0a\u6d41\u3068\u79c1\u305f\u3061\u81ea\u8eab\u306e <code>develop</code> \u306e\u4e0a\u3067\u7d9a\u304f\u3002\u3053\u308c\u304c POL-01 \u306e\u8981\u70b9\u3067\u3001COS \u304c\u7d9a\u3051\u3066\u3082\u6b62\u3081\u3066\u3082 GRDM \u306f\u7d44\u307f\u7d9a\u3051\u3089\u308c\u308b\u3002</li> </ol>"},{"location":"spec/05_upstream_tracking/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Mirror A copy that is kept identical to the original. \u5143\u3068\u540c\u3058\u4e2d\u8eab\u306b\u4fdd\u305f\u308c\u308b\u5199\u3057\u3002 Fast-forward Moving a branch straight ahead to a newer commit without creating a merge. \u30de\u30fc\u30b8\u3092\u4f5c\u3089\u305a\u306b\u30d6\u30e9\u30f3\u30c1\u3092\u65b0\u3057\u3044\u30b3\u30df\u30c3\u30c8\u3078\u307e\u3063\u3059\u3050\u9032\u3081\u308b\u3053\u3068\u3002 Force push Overwriting a branch's history on the server. Forbidden here. \u30b5\u30fc\u30d0\u4e0a\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u5c65\u6b74\u3092\u4e0a\u66f8\u304d\u3059\u308b\u3053\u3068\u3002\u3053\u3053\u3067\u306f\u7981\u6b62\u3002 Merge conflict Two sides changed the same lines and Git cannot choose. \u4e21\u5074\u304c\u540c\u3058\u884c\u3092\u5909\u3048\u3066 Git \u304c\u9078\u3079\u306a\u3044\u72b6\u614b\u3002 Cherry-pick Copying one commit from one branch onto another. \u3042\u308b\u30d6\u30e9\u30f3\u30c1\u306e\u4e00\u3064\u306e\u30b3\u30df\u30c3\u30c8\u3092\u5225\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u5199\u3059\u3053\u3068\u3002 Squash Combining several commits into one, losing the individual history. \u8907\u6570\u306e\u30b3\u30df\u30c3\u30c8\u3092\u4e00\u3064\u306b\u6f70\u3057\u3001\u500b\u3005\u306e\u5c65\u6b74\u3092\u5931\u3046\u3053\u3068\u3002 Archived repository A repository its owner froze read-only. \u6301\u3061\u4e3b\u304c\u8aad\u307f\u53d6\u308a\u5c02\u7528\u306b\u51cd\u7d50\u3057\u305f\u30ea\u30dd\u30b8\u30c8\u30ea\u3002 CVE A public identification number for one known vulnerability. \u4e00\u3064\u306e\u65e2\u77e5\u306e\u8106\u5f31\u6027\u306b\u4ed8\u304f\u516c\u958b\u306e\u8b58\u5225\u756a\u53f7\u3002"},{"location":"spec/06_documentation_conventions/","title":"SPEC-06 Documentation Conventions / \u6587\u66f8\u898f\u7d04","text":"<p>Summary: How every document in this repository is written: bilingual layout, glossary notes, diagrams, data, versions, and links. \u6982\u8981: \u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u5168\u6587\u66f8\u306e\u66f8\u304d\u65b9\u3002\u82f1\u548c\u4e8c\u90e8\u69cb\u6210\u3001\u7528\u8a9e\u6ce8\u3001\u56f3\u3001\u30c7\u30fc\u30bf\u3001\u7248\u3001\u30ea\u30f3\u30af\u306e\u898f\u5247\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.3 \u2014 2026-11-05. Learned: the written description of a check drifts from the tool as soon as the tool improves, so \u00a78 must be re-read against <code>tools/docs_check.py</code> on every change to either (review r2, R2-03). \uff0f \u691c\u67fb\u306e\u8aac\u660e\u306f\u9053\u5177\u304c\u826f\u304f\u306a\u3063\u305f\u77ac\u9593\u306b\u53e4\u304f\u306a\u308b\u305f\u3081\u3001\u3069\u3061\u3089\u304b\u3092\u5909\u3048\u308b\u305f\u3073\u306b \u00a78 \u3068 <code>tools/docs_check.py</code> \u3092\u7a81\u304d\u5408\u308f\u305b\u308b\u5fc5\u8981\u304c\u3042\u308b\u3068\u5206\u304b\u3063\u305f\uff08\u30ec\u30d3\u30e5\u30fc r2\u3001R2-03\uff09\u3002 0.2 \u2014 2026-11-05. Learned: a convention is only as strong as the check that enforces it, so the convention must name what the checker does today, what it leaves out, and which legacy files are exempt. \uff0f \u898f\u7d04\u306e\u5f37\u3055\u306f\u3001\u305d\u308c\u3092\u5b88\u3089\u305b\u308b\u691c\u67fb\u306e\u5f37\u3055\u307e\u3067\u3057\u304b\u306a\u3044\u3002\u3060\u304b\u3089\u898f\u7d04\u306f\u3001\u691c\u67fb\u304c\u4eca\u65e5\u4f55\u3092\u898b\u3066\u4f55\u3092\u898b\u306a\u3044\u304b\u3001\u3069\u306e\u65e7\u8cc7\u6599\u3092\u4f8b\u5916\u306b\u3059\u308b\u304b\u3092\u540d\u6307\u3057\u3067\u66f8\u304f\u5fc5\u8981\u304c\u3042\u308b\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: a shared convention must exist before any other document, or the English/Japanese halves and glossary notes drift from the first page onward. \uff0f \u4ed6\u306e\u6587\u66f8\u3088\u308a\u5148\u306b\u5171\u901a\u898f\u7d04\u3092\u7f6e\u304b\u306a\u3044\u3068\u3001\u521d\u3081\u306e\u4e00\u679a\u304b\u3089\u82f1\u548c\u306e\u5bfe\u5fdc\u3068\u7528\u8a9e\u6ce8\u304c\u305a\u308c\u308b\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Normative for: every <code>*.md</code> under this repository, including <code>README.md</code> at every directory level.</li> <li>Related: SPEC-00 Overview \u00b7 POL-01 Position \u00b7 docs/README.md</li> </ul> <p></p>"},{"location":"spec/06_documentation_conventions/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"spec/06_documentation_conventions/#1-scope","title":"1. Scope","text":"<p>This specification governs the form of documents, not their content. It applies to all Markdown files in the repository: policies (<code>POL-nn</code>), specifications (<code>00</code>\u2013<code>nn</code>), decisions (<code>ADR-nn</code>), references (<code>REF-nn</code>), demos, hand-offs, reviews, status boards, guides, and every <code>README.md</code>.</p> <p>Glossary notes. A specification is a rule book that implementers must follow. A policy is the position we take. A decision record (ADR) is a note that explains why we chose one way and not another.</p>"},{"location":"spec/06_documentation_conventions/#2-page-layout-mandatory-order","title":"2. Page layout (mandatory order)","text":"<ol> <li><code># <ID> <Title in English> / <\u65e5\u672c\u8a9e\u984c></code> \u2014 one H1 only.</li> <li>A blockquote with Summary (English, one or two sentences) and \u6982\u8981 (Japanese).</li> <li>A Jump line with two links: <code>[English](#english)</code> and <code>[\u65e5\u672c\u8a9e](#japanese)</code>.</li> <li>A Version / \u7248 line (see \u00a76), Normative for or Applies to, and Related links.</li> <li><code>---</code></li> <li><code><a id=\"english\"></a></code> then <code>## English</code>, first line <code>[\u2192 \u65e5\u672c\u8a9e\u7248\u3078](#japanese)</code>, then the English body.</li> <li><code>---</code></li> <li><code><a id=\"japanese\"></a></code> then <code>## \u65e5\u672c\u8a9e</code>, first line <code>[\u2192 To English](#english)</code>, then the Japanese body.</li> <li>Optional <code>## Glossary / \u7528\u8a9e</code> table at the end, bilingual.</li> </ol> <p>The two halves say the same thing. The English half is the one translated into other languages later; the Japanese half is the one the GRDM team reviews. When they disagree, fix both in the same commit.</p> <p>Why HTML anchors? GitHub and MkDocs generate heading anchors differently, and Japanese headings produce unstable ids. An explicit <code><a id=\"...\"></code> works in both. Anchor ids are lowercase ASCII with hyphens.</p>"},{"location":"spec/06_documentation_conventions/#3-writing-style","title":"3. Writing style","text":"<ul> <li>Target reader: a new employee on their first week. Assume they can use a terminal but have never seen GRDM.</li> <li>One idea per sentence. Prefer verbs. Avoid \"etc.\" \u2014 list the items or say \"and similar\".</li> <li>Every technical term gets a glossary note the first time it appears in a document, in parentheses or as a bold-lead sentence, in words a primary-school child would understand. Example: \"a container (a box that holds one program and everything it needs, so it runs the same on any computer)\". Terms already explained in the shared glossary (<code>docs/reference/REF-01_Glossary.md</code>) still get a short note on first use, plus a link.</li> <li>Procedures are complete: every command the reader must type is in a fenced code block, with the directory it runs in and the expected result or how to check it.</li> <li>Follow the GitHub Docs style: sentence-case headings, bold for UI labels, <code>code</code> for file names, commands, and identifiers, admonitions as blockquotes starting with Note:, Warning:, or Tip:. Use emoji sparingly and only as section markers in README files (for example \ud83d\ude80 Quick start, \ud83e\udded Map, \ud83d\udcda Documents, \ud83d\udee1\ufe0f Security).</li> <li>Do not write \"this document\", \"the above\", \"below\"; link to the section instead.</li> </ul>"},{"location":"spec/06_documentation_conventions/#4-diagrams-and-data","title":"4. Diagrams and data","text":"<ul> <li>Diagrams are written in Markdown with Mermaid fenced blocks (<code>```mermaid</code>). No binary images for architecture, flows, or sequences. Screenshots are allowed for UI guides and live under <code>images/</code> next to the document.</li> <li>Data shown in documents (lists of repositories, versions, test results, allow-lists) is written in TOON (Token-Oriented Object Notation: a compact, indentation-based text form of JSON that both people and AI read easily) in a <code>```toon</code> fenced block. When a machine also needs the data, the canonical file is JSON or YAML next to it and the document says so; <code>grdm-dev manifest check</code> verifies that the TOON excerpt and the JSON agree.</li> <li>A <code>```toon</code> block that mirrors a JSON file declares it with an HTML comment on the line before the block, for example <code><!-- canonical: manifest/upstreams.json --></code> (the path is relative to the repository root). A block that is only an illustrative example carries no declaration and the surrounding text says that it is an example, not canonical data.</li> <li>Tables are for comparisons with few columns. Long tabular data goes in TOON.</li> </ul>"},{"location":"spec/06_documentation_conventions/#5-links","title":"5. Links","text":"<ul> <li>Links are relative paths within the repository. Never link to <code>master</code>; link to files on <code>develop</code> or to tagged versions.</li> <li>Each document links to: its parent index (<code>README.md</code> of its folder), the specification it implements or the decision it records, and the documents that depend on it (\"Used by\").</li> <li>Every folder has a <code>README.md</code> that lists its documents with one-line descriptions, in both languages. The root <code>README.md</code> is the table of contents of the whole repository and links to the HTML site at <code>site/index.html</code> (built by MkDocs, see SPEC-02 for the <code>grdm-dev docs</code> command).</li> <li>Upstream GitHub links are allowed when they name a specific commit or PR; link to the private <code>-dev2027</code> repositories only by name, never by URL, in public-facing text.</li> </ul>"},{"location":"spec/06_documentation_conventions/#6-version-header","title":"6. Version header","text":"<ul> <li>Versions live in the header, not in the file name (POL-02 \u00a74). Format: <code>Version / \u7248: X.Y \u2014 YYYY-MM-DD. **Learned:** <what was discovered>. \uff0f <\u65e5\u672c\u8a9e></code>.</li> <li>The newest version is first; older versions stay as one line each below it.</li> <li>The version line records what was learned, not what changed. Changing a document and bumping its version happen in the same commit.</li> </ul>"},{"location":"spec/06_documentation_conventions/#7-file-naming","title":"7. File naming","text":"Kind Name Example Specification <code>nn_<topic>.md</code> (two digits) <code>02_installer_cli.md</code> Policy / Decision / Reference <code>POL-nn_<Title>.md</code> / <code>ADR-nn_<Title>.md</code> / <code>REF-nn_<Title>.md</code> <code>ADR-01_Integration_Repository_Placement.md</code> Demo <code>nn_<feature>.md</code>, sub-step <code>nn_m_<step>.md</code> <code>20_core_install_mac_studio.md</code> Hand-off / Review <code>YYYY-MM-DD_<Title>.md</code>, reviews end with <code>_rN</code> <code>2026-11-06_M1_Skeleton_Review_r1.md</code> Guide <code>docs/guides/<topic>/README.md</code> <code>docs/guides/environment/README.md</code>"},{"location":"spec/06_documentation_conventions/#8-checks","title":"8. Checks","text":"<p><code>grdm-dev docs check</code> (and the <code>docs</code> GitHub Actions workflow) fails when a Markdown file:</p> <ul> <li>lacks the <code>english</code>/<code>japanese</code> anchors or the Jump line;</li> <li>has a relative link that does not resolve;</li> <li>has a <code>```toon</code> block whose sibling JSON disagrees;</li> <li>has a glossary term from <code>REF-01</code> used without a note on first occurrence (warning, not failure, until M2);</li> <li>lacks a Version line in the header.</li> </ul> <p>What <code>tools/docs_check.py</code> checks today. Until <code>grdm-dev docs check</code> exists (SPEC-02 \u00a73), the helper <code>tools/docs_check.py</code>, run by the <code>docs</code> workflow, is the implementation. It checks exactly these points:</p> <ul> <li>the <code>english</code> and <code>japanese</code> anchors;</li> <li>the Jump line;</li> <li>the Version line;</li> <li>relative links: the file part before any <code>#fragment</code> must exist, and the fragment must resolve to an <code><a id></code> / <code><a name></code> anchor or a heading in the target file (same-file <code>#fragment</code> links are checked the same way);</li> <li>TOON SHA parity: when the line before a <code>```toon</code> block carries <code><!-- canonical: <path> --></code>, every 40-character SHA in the block must appear in that JSON file (\u00a74);</li> <li>the glossary-note warning: a <code>REF-01</code> term used without a note on first occurrence is reported as a warning, not a failure.</li> </ul> <p>Legacy-format exception. Files kept in their historical form are not checked and are not rewritten to SPEC-06: <code>*.legacy.md</code>; sample code and sub-documents under <code>docs/guides/<topic>/</code> other than that guide's <code>README.md</code>; and the pointer files left at old paths (<code>Environment.md</code>, <code>SetupOsfOnEC2.md</code> and similar at the repository root), which only redirect to the new location. They are history, not current procedure. Every other Markdown file in the repository, including <code>manifest/README.md</code> and the installer README, is checked.</p> <p></p>"},{"location":"spec/06_documentation_conventions/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"spec/06_documentation_conventions/#1-\u7bc4\u56f2","title":"1. \u7bc4\u56f2","text":"<p>\u3053\u306e\u898f\u7d04\u306f\u6587\u66f8\u306e\u300c\u5f62\u300d\u3092\u5b9a\u3081\u308b\u3082\u306e\u3067\u3001\u5185\u5bb9\u306f\u5b9a\u3081\u307e\u305b\u3093\u3002\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306e\u3059\u3079\u3066\u306e Markdown \u306b\u9069\u7528\u3057\u307e\u3059\u3002\u65b9\u91dd\uff08<code>POL-nn</code>\uff09\u3001\u4ed5\u69d8\uff08<code>00</code>\u301c<code>nn</code>\uff09\u3001\u6c7a\u5b9a\u306e\u8a18\u9332\uff08<code>ADR-nn</code>\uff09\u3001\u53c2\u8003\uff08<code>REF-nn</code>\uff09\u3001\u5b9f\u8a3c\u3001\u5f15\u7d99\u304e\u3001\u30ec\u30d3\u30e5\u30fc\u3001\u9032\u6357\u3001\u624b\u5f15\u304d\u3001\u305d\u3057\u3066\u5404\u30d5\u30a9\u30eb\u30c0\u306e <code>README.md</code> \u3067\u3059\u3002</p> <p>\u7528\u8a9e\u6ce8\u3002 \u300c\u4ed5\u69d8\u300d\u306f\u3001\u5b9f\u88c5\u3059\u308b\u4eba\u304c\u5fc5\u305a\u5b88\u308b\u30eb\u30fc\u30eb\u30d6\u30c3\u30af\u3067\u3059\u3002\u300c\u65b9\u91dd\u300d\u306f\u3001\u79c1\u305f\u3061\u306e\u7acb\u5834\u3092\u66f8\u3044\u305f\u3082\u306e\u3067\u3059\u3002\u300c\u6c7a\u5b9a\u306e\u8a18\u9332\u300d\uff08ADR\uff09\u306f\u3001\u306a\u305c\u305d\u306e\u9053\u3092\u9078\u3073\u3001\u307b\u304b\u3092\u9078\u3070\u306a\u304b\u3063\u305f\u304b\u3092\u6b8b\u3059\u30e1\u30e2\u3067\u3059\u3002</p>"},{"location":"spec/06_documentation_conventions/#2-\u30da\u30fc\u30b8\u306e\u69cb\u6210\u3053\u306e\u9806\u756a\u3067\u5fc5\u9808","title":"2. \u30da\u30fc\u30b8\u306e\u69cb\u6210\uff08\u3053\u306e\u9806\u756a\u3067\u5fc5\u9808\uff09","text":"<ol> <li><code># <ID> <\u82f1\u8a9e\u984c> / <\u65e5\u672c\u8a9e\u984c></code> \u2014 H1 \u306f\u4e00\u3064\u3060\u3051\u3002</li> <li>\u5f15\u7528\u30d6\u30ed\u30c3\u30af\u306b Summary\uff08\u82f1\u8a9e 1\u301c2 \u6587\uff09\u3068 \u6982\u8981\uff08\u65e5\u672c\u8a9e\uff09\u3002</li> <li>Jump \u884c\u306b <code>[English](#english)</code> \u3068 <code>[\u65e5\u672c\u8a9e](#japanese)</code> \u306e\u4e8c\u3064\u306e\u30ea\u30f3\u30af\u3002</li> <li>Version / \u7248 \u884c\uff08\u00a76\uff09\u3001Normative for \u307e\u305f\u306f Applies to\u3001Related \u30ea\u30f3\u30af\u3002</li> <li><code>---</code></li> <li><code><a id=\"english\"></a></code> \u306e\u6b21\u306b <code>## English</code>\u3001\u6700\u521d\u306e\u884c\u306f <code>[\u2192 \u65e5\u672c\u8a9e\u7248\u3078](#japanese)</code>\u3001\u7d9a\u3044\u3066\u82f1\u8a9e\u672c\u6587\u3002</li> <li><code>---</code></li> <li><code><a id=\"japanese\"></a></code> \u306e\u6b21\u306b <code>## \u65e5\u672c\u8a9e</code>\u3001\u6700\u521d\u306e\u884c\u306f <code>[\u2192 To English](#english)</code>\u3001\u7d9a\u3044\u3066\u65e5\u672c\u8a9e\u672c\u6587\u3002</li> <li>\u672b\u5c3e\u306b\u4efb\u610f\u3067 <code>## Glossary / \u7528\u8a9e</code> \u306e\u4e8c\u8a00\u8a9e\u306e\u8868\u3002</li> </ol> <p>\u82f1\u8a9e\u3068\u65e5\u672c\u8a9e\u306f\u540c\u3058\u5185\u5bb9\u3092\u66f8\u304d\u307e\u3059\u3002\u82f1\u8a9e\u306f\u5f8c\u3067\u4ed6\u8a00\u8a9e\u3078\u8a33\u3059\u5143\u306b\u306a\u308a\u3001\u65e5\u672c\u8a9e\u306f GRDM \u30c1\u30fc\u30e0\u304c\u30ec\u30d3\u30e5\u30fc\u3059\u308b\u5143\u306b\u306a\u308a\u307e\u3059\u3002\u98df\u3044\u9055\u3063\u305f\u3089\u540c\u3058\u30b3\u30df\u30c3\u30c8\u3067\u4e21\u65b9\u3092\u76f4\u3057\u307e\u3059\u3002</p> <p>\u306a\u305c HTML \u306e\u30a2\u30f3\u30ab\u30fc\u304b\u3002 GitHub \u3068 MkDocs \u306f\u898b\u51fa\u3057\u306e ID \u306e\u4f5c\u308a\u65b9\u304c\u9055\u3044\u3001\u65e5\u672c\u8a9e\u898b\u51fa\u3057\u306f\u4e0d\u5b89\u5b9a\u306a ID \u306b\u306a\u308a\u307e\u3059\u3002\u660e\u793a\u7684\u306a <code><a id=\"...\"></code> \u306f\u4e21\u65b9\u3067\u52d5\u304d\u307e\u3059\u3002ID \u306f\u5c0f\u6587\u5b57\u306e ASCII \u3068\u30cf\u30a4\u30d5\u30f3\u3060\u3051\u306b\u3057\u307e\u3059\u3002</p>"},{"location":"spec/06_documentation_conventions/#3-\u6587\u4f53","title":"3. \u6587\u4f53","text":"<ul> <li>\u60f3\u5b9a\u8aad\u8005\u306f\u5165\u793e\u4e00\u9031\u76ee\u306e\u65b0\u5165\u793e\u54e1\u3002\u7aef\u672b\u306f\u4f7f\u3048\u308b\u304c GRDM \u306f\u521d\u3081\u3066\u3001\u3068\u8003\u3048\u307e\u3059\u3002</li> <li>\u4e00\u6587\u4e00\u7fa9\u3002\u52d5\u8a5e\u3067\u66f8\u304f\u3002\u300c\u306a\u3069\u300d\u306f\u907f\u3051\u3001\u9805\u76ee\u3092\u5217\u6319\u3059\u308b\u304b\u300c\u304a\u3088\u3073\u305d\u306e\u985e\u300d\u3068\u66f8\u304f\u3002</li> <li>\u5c02\u9580\u7528\u8a9e\u306f\u3001\u6587\u66f8\u5185\u3067\u521d\u3081\u3066\u51fa\u305f\u7b87\u6240\u306b\u5fc5\u305a\u7528\u8a9e\u6ce8\u3092\u4ed8\u3051\u308b\u3002 \u62ec\u5f27\u307e\u305f\u306f\u592a\u5b57\u3067\u59cb\u307e\u308b\u4e00\u6587\u3067\u3001\u5c0f\u5b66\u751f\u306b\u3082\u5206\u304b\u308b\u8a00\u8449\u3067\u8aac\u660e\u3059\u308b\u3002\u4f8b:\u300c\u30b3\u30f3\u30c6\u30ca\uff08\u4e00\u3064\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u3068\u5fc5\u8981\u306a\u3082\u306e\u3092\u4e00\u7bb1\u306b\u5165\u308c\u3001\u3069\u306e\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u3067\u3082\u540c\u3058\u3088\u3046\u306b\u52d5\u304b\u3059\u305f\u3081\u306e\u7bb1\uff09\u300d\u3002\u5171\u901a\u7528\u8a9e\u96c6\uff08<code>docs/reference/REF-01_Glossary.md</code>\uff09\u306b\u3042\u308b\u8a9e\u3067\u3082\u3001\u521d\u51fa\u3067\u306f\u77ed\u3044\u6ce8\u3068\u30ea\u30f3\u30af\u3092\u4ed8\u3051\u308b\u3002</li> <li>\u624b\u9806\u306f\u5b8c\u7d50\u3055\u305b\u308b\u3002\u8aad\u8005\u304c\u6253\u3064\u30b3\u30de\u30f3\u30c9\u306f\u3059\u3079\u3066\u30b3\u30fc\u30c9\u30d6\u30ed\u30c3\u30af\u306b\u5165\u308c\u3001\u5b9f\u884c\u3059\u308b\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3068\u3001\u671f\u5f85\u3059\u308b\u7d50\u679c\u304b\u78ba\u8a8d\u65b9\u6cd5\u3092\u6dfb\u3048\u308b\u3002</li> <li>GitHub Docs \u306e\u30b9\u30bf\u30a4\u30eb\u306b\u5f93\u3046\u3002\u898b\u51fa\u3057\u306f\u6587\u982d\u306e\u307f\u5927\u6587\u5b57\uff08\u82f1\u8a9e\uff09\u3001UI \u306e\u30e9\u30d9\u30eb\u306f\u592a\u5b57\u3001\u30d5\u30a1\u30a4\u30eb\u540d\u30fb\u30b3\u30de\u30f3\u30c9\u30fb\u8b58\u5225\u5b50\u306f <code>code</code>\u3001\u6ce8\u610f\u66f8\u304d\u306f Note: / Warning: / Tip: \u3067\u59cb\u307e\u308b\u5f15\u7528\u30d6\u30ed\u30c3\u30af\u3002\u7d75\u6587\u5b57\u306f README \u306e\u7bc0\u306e\u76ee\u5370\u306b\u9650\u3063\u3066\u63a7\u3048\u3081\u306b\u4f7f\u3046\uff08\u4f8b: \ud83d\ude80 \u30af\u30a4\u30c3\u30af\u30b9\u30bf\u30fc\u30c8\u3001\ud83e\udded \u5730\u56f3\u3001\ud83d\udcda \u6587\u66f8\u3001\ud83d\udee1\ufe0f \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\uff09\u3002</li> <li>\u300c\u672c\u6587\u66f8\u300d\u300c\u4e0a\u8a18\u300d\u300c\u4e0b\u8a18\u300d\u306f\u4f7f\u308f\u305a\u3001\u8a72\u5f53\u306e\u7bc0\u3078\u30ea\u30f3\u30af\u3059\u308b\u3002</li> </ul>"},{"location":"spec/06_documentation_conventions/#4-\u56f3\u3068\u30c7\u30fc\u30bf","title":"4. \u56f3\u3068\u30c7\u30fc\u30bf","text":"<ul> <li>\u56f3\u306f Markdown \u5185\u306e Mermaid \u30b3\u30fc\u30c9\u30d6\u30ed\u30c3\u30af\uff08<code>```mermaid</code>\uff09\u3067\u66f8\u304f\u3002\u69cb\u6210\u56f3\u30fb\u6d41\u308c\u56f3\u30fb\u30b7\u30fc\u30b1\u30f3\u30b9\u56f3\u306b\u753b\u50cf\u30d5\u30a1\u30a4\u30eb\u3092\u4f7f\u308f\u306a\u3044\u3002UI \u306e\u624b\u5f15\u304d\u306b\u9650\u308a\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8\u3092\u8a31\u3057\u3001\u6587\u66f8\u3068\u540c\u3058\u5834\u6240\u306e <code>images/</code> \u306b\u7f6e\u304f\u3002</li> <li>\u6587\u66f8\u306b\u8f09\u305b\u308b\u30c7\u30fc\u30bf\uff08\u30ea\u30dd\u30b8\u30c8\u30ea\u4e00\u89a7\u3001\u30d0\u30fc\u30b8\u30e7\u30f3\u3001\u8a66\u9a13\u7d50\u679c\u3001\u8a31\u5bb9\u30ea\u30b9\u30c8\uff09\u306f TOON\uff08Token-Oriented Object Notation\u3002JSON \u3092\u5b57\u4e0b\u3052\u3067\u8868\u3057\u305f\u77ed\u3044\u6587\u5b57\u5f62\u5f0f\u3067\u3001\u4eba\u3082 AI \u3082\u8aad\u307f\u3084\u3059\u3044\uff09\u3067 <code>```toon</code> \u306e\u30d6\u30ed\u30c3\u30af\u306b\u66f8\u304f\u3002\u6a5f\u68b0\u3082\u8aad\u3080\u30c7\u30fc\u30bf\u306f\u3001\u96a3\u306b JSON \u304b YAML \u306e\u6b63\u672c\u3092\u7f6e\u304d\u3001\u6587\u66f8\u306b\u305d\u3046\u8a18\u3059\u3002<code>grdm-dev manifest check</code> \u304c TOON \u306e\u6284\u9332\u3068 JSON \u306e\u4e00\u81f4\u3092\u78ba\u304b\u3081\u308b\u3002</li> <li>JSON \u30d5\u30a1\u30a4\u30eb\u3092\u5199\u3059 <code>```toon</code> \u30d6\u30ed\u30c3\u30af\u306f\u3001\u305d\u306e\u76f4\u524d\u306e\u884c\u306b HTML \u30b3\u30e1\u30f3\u30c8\u3067\u6b63\u672c\u3092\u5ba3\u8a00\u3059\u308b\u3002\u4f8b: <code><!-- canonical: manifest/upstreams.json --></code>\uff08\u30d1\u30b9\u306f\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30eb\u30fc\u30c8\u304b\u3089\u306e\u76f8\u5bfe\uff09\u3002\u8aac\u660e\u306e\u305f\u3081\u306e\u4f8b\u306b\u3059\u304e\u306a\u3044\u30d6\u30ed\u30c3\u30af\u306b\u306f\u5ba3\u8a00\u3092\u4ed8\u3051\u305a\u3001\u5468\u308a\u306e\u6587\u3067\u300c\u4f8b\u3067\u3042\u308a\u6b63\u672c\u3067\u306f\u306a\u3044\u300d\u3068\u66f8\u304f\u3002</li> <li>\u8868\u306f\u5217\u306e\u5c11\u306a\u3044\u6bd4\u8f03\u306b\u4f7f\u3046\u3002\u9577\u3044\u8868\u5f62\u5f0f\u306e\u30c7\u30fc\u30bf\u306f TOON \u306b\u3059\u308b\u3002</li> </ul>"},{"location":"spec/06_documentation_conventions/#5-\u30ea\u30f3\u30af","title":"5. \u30ea\u30f3\u30af","text":"<ul> <li>\u30ea\u30f3\u30af\u306f\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306e\u76f8\u5bfe\u30d1\u30b9\u3002<code>master</code> \u3078\u306f\u30ea\u30f3\u30af\u305b\u305a\u3001<code>develop</code> \u4e0a\u306e\u30d5\u30a1\u30a4\u30eb\u304b\u30bf\u30b0\u4ed8\u304d\u306e\u7248\u3078\u30ea\u30f3\u30af\u3059\u308b\u3002</li> <li>\u5404\u6587\u66f8\u306f\u6b21\u3078\u30ea\u30f3\u30af\u3059\u308b: \u89aa\u306e\u7d22\u5f15\uff08\u305d\u306e\u30d5\u30a9\u30eb\u30c0\u306e <code>README.md</code>\uff09\u3001\u5b9f\u88c5\u3059\u308b\u4ed5\u69d8\u307e\u305f\u306f\u8a18\u9332\u3059\u308b\u6c7a\u5b9a\u3001\u305d\u3057\u3066\u3053\u306e\u6587\u66f8\u306b\u4f9d\u5b58\u3059\u308b\u6587\u66f8\uff08\u300cUsed by\u300d\uff09\u3002</li> <li>\u5404\u30d5\u30a9\u30eb\u30c0\u306b <code>README.md</code> \u3092\u7f6e\u304d\u3001\u6587\u66f8\u3092\u4e00\u884c\u8aac\u660e\u4ed8\u304d\u3067\u4e8c\u8a00\u8a9e\u3067\u5217\u6319\u3059\u308b\u3002\u30eb\u30fc\u30c8\u306e <code>README.md</code> \u306f\u30ea\u30dd\u30b8\u30c8\u30ea\u5168\u4f53\u306e\u76ee\u6b21\u3067\u3001MkDocs \u304c\u751f\u6210\u3059\u308b HTML\uff08<code>site/index.html</code>\u3002\u30b3\u30de\u30f3\u30c9\u306f SPEC-02 \u306e <code>grdm-dev docs</code>\uff09\u3078\u30ea\u30f3\u30af\u3059\u308b\u3002</li> <li>\u4e0a\u6d41 GitHub \u3078\u306e\u30ea\u30f3\u30af\u306f\u3001\u7279\u5b9a\u306e\u30b3\u30df\u30c3\u30c8\u304b PR \u3092\u6307\u3059\u3068\u304d\u3060\u3051\u8a31\u3059\u3002\u975e\u516c\u958b\u306e <code>-dev2027</code> \u30ea\u30dd\u30b8\u30c8\u30ea\u306f\u3001\u5916\u5411\u3051\u306e\u6587\u7ae0\u3067\u306f\u540d\u524d\u3060\u3051\u3092\u66f8\u304d URL \u306f\u66f8\u304b\u306a\u3044\u3002</li> </ul>"},{"location":"spec/06_documentation_conventions/#6-\u7248\u306e\u30d8\u30c3\u30c0","title":"6. \u7248\u306e\u30d8\u30c3\u30c0","text":"<ul> <li>\u7248\u306f\u30d5\u30a1\u30a4\u30eb\u540d\u3067\u306a\u304f\u30d8\u30c3\u30c0\u306b\u6301\u3064\uff08POL-02 \u00a74\uff09\u3002\u5f62\u5f0f: <code>Version / \u7248: X.Y \u2014 YYYY-MM-DD. **Learned:** <\u5206\u304b\u3063\u305f\u3053\u3068>. \uff0f <\u65e5\u672c\u8a9e></code>\u3002</li> <li>\u6700\u65b0\u306e\u7248\u3092\u5148\u982d\u306b\u7f6e\u304d\u3001\u904e\u53bb\u306e\u7248\u306f\u4e00\u884c\u305a\u3064\u4e0b\u306b\u6b8b\u3059\u3002</li> <li>\u7248\u306e\u884c\u306b\u306f\u300c\u4f55\u3092\u5909\u3048\u305f\u304b\u300d\u3067\u306a\u304f \u300c\u4f55\u304c\u5206\u304b\u3063\u305f\u304b\u300d \u3092\u66f8\u304f\u3002\u6587\u66f8\u306e\u5909\u66f4\u3068\u7248\u306e\u66f4\u65b0\u306f\u540c\u3058\u30b3\u30df\u30c3\u30c8\u3067\u884c\u3046\u3002</li> </ul>"},{"location":"spec/06_documentation_conventions/#7-\u30d5\u30a1\u30a4\u30eb\u540d","title":"7. \u30d5\u30a1\u30a4\u30eb\u540d","text":"\u7a2e\u5225 \u547d\u540d \u4f8b \u4ed5\u69d8 <code>nn_<\u984c>.md</code>\uff082 \u6841\uff09 <code>02_installer_cli.md</code> \u65b9\u91dd\u30fb\u6c7a\u5b9a\u30fb\u53c2\u8003 <code>POL-nn_<\u984c>.md</code> / <code>ADR-nn_<\u984c>.md</code> / <code>REF-nn_<\u984c>.md</code> <code>ADR-01_Integration_Repository_Placement.md</code> \u5b9f\u8a3c <code>nn_<\u6a5f\u80fd>.md</code>\u3001\u679d\u756a <code>nn_m_<\u624b\u9806>.md</code> <code>20_core_install_mac_studio.md</code> \u5f15\u7d99\u304e\u30fb\u30ec\u30d3\u30e5\u30fc <code>YYYY-MM-DD_<\u984c>.md</code>\u3001\u30ec\u30d3\u30e5\u30fc\u306f\u672b\u5c3e <code>_rN</code> <code>2026-11-06_M1_Skeleton_Review_r1.md</code> \u624b\u5f15\u304d <code>docs/guides/<\u984c>/README.md</code> <code>docs/guides/environment/README.md</code>"},{"location":"spec/06_documentation_conventions/#8-\u691c\u67fb","title":"8. \u691c\u67fb","text":"<p><code>grdm-dev docs check</code>\uff08\u3068 GitHub Actions \u306e <code>docs</code> \u30ef\u30fc\u30af\u30d5\u30ed\u30fc\uff09\u306f\u3001\u6b21\u306e Markdown \u3092\u4e0d\u5408\u683c\u306b\u3059\u308b\u3002</p> <ul> <li><code>english</code> / <code>japanese</code> \u306e\u30a2\u30f3\u30ab\u30fc\u304b Jump \u884c\u304c\u306a\u3044\u3002</li> <li>\u89e3\u6c7a\u3067\u304d\u306a\u3044\u76f8\u5bfe\u30ea\u30f3\u30af\u304c\u3042\u308b\u3002</li> <li><code>```toon</code> \u30d6\u30ed\u30c3\u30af\u3068\u96a3\u306e JSON \u304c\u4e00\u81f4\u3057\u306a\u3044\u3002</li> <li><code>REF-01</code> \u306e\u7528\u8a9e\u304c\u521d\u51fa\u3067\u6ce8\u306a\u3057\u306b\u4f7f\u308f\u308c\u3066\u3044\u308b\uff08M2 \u307e\u3067\u306f\u8b66\u544a\u3001\u4ee5\u5f8c\u306f\u4e0d\u5408\u683c\uff09\u3002</li> <li>\u30d8\u30c3\u30c0\u306b Version \u884c\u304c\u306a\u3044\u3002</li> </ul> <p><code>tools/docs_check.py</code> \u304c\u4eca\u65e5\u691c\u67fb\u3059\u308b\u3053\u3068\u3002 <code>grdm-dev docs check</code> \u304c\u3067\u304d\u308b\u307e\u3067\uff08SPEC-02 \u00a73\uff09\u3001<code>docs</code> \u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u304c\u52d5\u304b\u3059\u88dc\u52a9\u30c4\u30fc\u30eb <code>tools/docs_check.py</code> \u304c\u5b9f\u88c5\u3067\u3059\u3002\u691c\u67fb\u3059\u308b\u306e\u306f\u6b21\u306e\u70b9\u306b\u9650\u308a\u307e\u3059\u3002</p> <ul> <li><code>english</code> \u3068 <code>japanese</code> \u306e\u30a2\u30f3\u30ab\u30fc\u3002</li> <li>Jump \u884c\u3002</li> <li>Version \u884c\u3002</li> <li>\u76f8\u5bfe\u30ea\u30f3\u30af\u3002<code>#\u30d5\u30e9\u30b0\u30e1\u30f3\u30c8</code> \u3088\u308a\u524d\u306e\u30d5\u30a1\u30a4\u30eb\u90e8\u5206\u304c\u5b58\u5728\u3057\u3001\u30d5\u30e9\u30b0\u30e1\u30f3\u30c8\u304c\u76f8\u624b\u306e\u30d5\u30a1\u30a4\u30eb\u306e <code><a id></code> / <code><a name></code> \u30a2\u30f3\u30ab\u30fc\u304b\u898b\u51fa\u3057\u306b\u89e3\u6c7a\u3057\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\uff08\u540c\u3058\u30d5\u30a1\u30a4\u30eb\u5185\u306e <code>#\u30d5\u30e9\u30b0\u30e1\u30f3\u30c8</code> \u3082\u540c\u69d8\u306b\u78ba\u304b\u3081\u308b\uff09\u3002</li> <li>TOON \u306e SHA \u4e00\u81f4\u3002<code>```toon</code> \u30d6\u30ed\u30c3\u30af\u306e\u76f4\u524d\u306e\u884c\u306b <code><!-- canonical: <\u30d1\u30b9> --></code> \u306e\u5ba3\u8a00\u304c\u3042\u308b\u3068\u304d\u3001\u30d6\u30ed\u30c3\u30af\u5185\u306e 40 \u6587\u5b57\u306e SHA \u304c\u3059\u3079\u3066\u305d\u306e JSON \u306b\u73fe\u308c\u308b\u3053\u3068\uff08\u00a74\uff09\u3002</li> <li>\u7528\u8a9e\u6ce8\u306e\u8b66\u544a\u3002<code>REF-01</code> \u306e\u7528\u8a9e\u304c\u521d\u51fa\u3067\u6ce8\u306a\u3057\u306b\u4f7f\u308f\u308c\u3066\u3044\u308c\u3070\u8b66\u544a\u3068\u3057\u3066\u5831\u544a\u3059\u308b\uff08\u4e0d\u5408\u683c\u3067\u306f\u306a\u3044\uff09\u3002</li> </ul> <p>\u65e7\u5f62\u5f0f\u306e\u4f8b\u5916\u3002 \u6b74\u53f2\u7684\u306a\u5f62\u306e\u307e\u307e\u6b8b\u3059\u30d5\u30a1\u30a4\u30eb\u306f\u691c\u67fb\u305b\u305a\u3001SPEC-06 \u306e\u5f62\u306b\u3082\u66f8\u304d\u76f4\u3055\u306a\u3044\u3002<code>*.legacy.md</code>\u3001<code>docs/guides/<\u984c>/</code> \u306e\u4e0b\u306b\u3042\u308b\u305d\u306e\u624b\u5f15\u304d\u306e <code>README.md</code> \u4ee5\u5916\u306e\u30b5\u30f3\u30d7\u30eb\u30b3\u30fc\u30c9\u3068\u4e0b\u4f4d\u6587\u66f8\u3001\u305d\u3057\u3066\u65e7\u30d1\u30b9\u306b\u6b8b\u3057\u305f\u8a98\u5c0e\u30d5\u30a1\u30a4\u30eb\uff08\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30eb\u30fc\u30c8\u306e <code>Environment.md</code>\u3001<code>SetupOsfOnEC2.md</code> \u304a\u3088\u3073\u305d\u306e\u985e\u3002\u65b0\u3057\u3044\u7f6e\u304d\u5834\u3078\u6848\u5185\u3059\u308b\u3060\u3051\u306e\u3082\u306e\uff09\u3067\u3059\u3002\u3053\u308c\u3089\u306f\u6b74\u53f2\u3067\u3042\u308a\u3001\u73fe\u884c\u306e\u624b\u9806\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u305d\u308c\u4ee5\u5916\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306e Markdown \u306f\u3001<code>manifest/README.md</code> \u3068 installer \u306e README \u3092\u542b\u3081\u3066\u3059\u3079\u3066\u691c\u67fb\u3057\u307e\u3059\u3002</p>"},{"location":"spec/06_documentation_conventions/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Markdown A plain-text way of writing documents where <code>#</code> makes a heading and <code>-</code> makes a list. <code>#</code> \u3067\u898b\u51fa\u3057\u3001<code>-</code> \u3067\u7b87\u6761\u66f8\u304d\u306b\u306a\u308b\u3001\u6587\u5b57\u3060\u3051\u3067\u66f8\u304f\u6587\u66f8\u306e\u66f8\u304d\u65b9\u3002 Anchor A bookmark inside a page that a link can jump to. \u30da\u30fc\u30b8\u306e\u4e2d\u306e\u300c\u3057\u304a\u308a\u300d\u3002\u30ea\u30f3\u30af\u3067\u98db\u3079\u308b\u3002 Mermaid A way to draw diagrams by typing text instead of drawing with a mouse. \u30de\u30a6\u30b9\u3067\u63cf\u304f\u4ee3\u308f\u308a\u306b\u6587\u5b57\u3067\u56f3\u3092\u63cf\u304f\u4ed5\u7d44\u307f\u3002 TOON A compact text form of JSON data, easy for people and AI to read. JSON \u306e\u30c7\u30fc\u30bf\u3092\u77ed\u304f\u5b57\u4e0b\u3052\u3067\u66f8\u3044\u305f\u5f62\u3002\u4eba\u306b\u3082 AI \u306b\u3082\u8aad\u307f\u3084\u3059\u3044\u3002 MkDocs A tool that turns Markdown files into a website. Markdown \u306e\u30d5\u30a1\u30a4\u30eb\u3092 Web \u30b5\u30a4\u30c8\u306b\u5909\u3048\u308b\u9053\u5177\u3002"},{"location":"status/","title":"Status Board / \u9032\u6357\u30dc\u30fc\u30c9","text":"<p>Summary: The single source of truth for milestone progress: M1\u2013M5 status, open items, upstream tracking reports. The rules that define this board as the authoritative progress record. \u6982\u8981: \u7bc0\u76ee\u9032\u6357\u306e\u552f\u4e00\u306e\u6b63\u672c\uff1aM1\u301cM5 \u306e\u9032\u6357\u3001\u672a\u89e3\u6c7a\u9805\u76ee\u3001\u4e0a\u6d41\u8ffd\u5f93\u5831\u544a\u3002\u3053\u306e\u30dc\u30fc\u30c9\u304c\u6a29\u5a01\u3042\u308b\u9032\u884c\u72b6\u6cc1\u8a18\u9332\u3067\u3042\u308b\u3053\u3068\u3092\u5b9a\u3081\u308b\u898f\u5247\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.3 \u2014 2026-11-05. Learned: a milestone is marked done only when its PR is merged, so M1 flipped to done at the merge of PR #19 and not when the documents were written. \uff0f \u7bc0\u76ee\u306f PR \u304c\u30de\u30fc\u30b8\u3055\u308c\u305f\u3068\u304d\u306b\u3060\u3051\u5b8c\u4e86\u306b\u3059\u308b\u3002M1 \u306f\u6587\u66f8\u3092\u66f8\u3044\u305f\u6642\u70b9\u3067\u306f\u306a\u304f PR #19 \u306e\u30de\u30fc\u30b8\u3067\u5b8c\u4e86\u306b\u306a\u3063\u305f\u3002 0.2 \u2014 2026-11-05. Learned: the board must say what a CI check covers at the current milestone (Trivy: file system, report-only), or a green run is read as full coverage. \uff0f \u30dc\u30fc\u30c9\u306f CI \u306e\u691c\u67fb\u304c\u4eca\u306e\u7bc0\u76ee\u3067\u4f55\u3092\u5bfe\u8c61\u306b\u3057\u3066\u3044\u308b\u304b\uff08Trivy \u306f\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u306b\u5bfe\u3059\u308b\u5831\u544a\u306e\u307f\uff09\u3092\u66f8\u304b\u306a\u3051\u308c\u3070\u3001\u7dd1\u306e\u7d50\u679c\u304c\u5168\u7bc4\u56f2\u306e\u5408\u683c\u3068\u8aad\u307e\u308c\u3066\u3057\u307e\u3046\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: without a single source of truth, it was unclear whether M1 completion meant \"docs written\" or \"PR merged\"; the board's explicit rules resolve ambiguity. \uff0f \u5358\u4e00\u306e\u6b63\u672c\u304c\u306a\u3051\u308c\u3070\u3001M1 \u5b8c\u4e86\u304c\u300c\u6587\u66f8\u3092\u66f8\u3044\u305f\u300d\u304b\u300cPR \u3092\u30de\u30fc\u30b8\u3057\u305f\u300d\u304b\u5206\u304b\u3089\u305a\u3001\u30dc\u30fc\u30c9\u306e\u660e\u793a\u7684\u306a\u898f\u5247\u3067\u66d6\u6627\u3055\u3092\u89e3\u6d88\u3059\u308b\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Normative for: status/upstream/ and all milestone progress tracking.</li> <li>Related: ../README.md \u00b7 demo/ \u00b7 spec/00_overview.md#5-milestone-ladder</li> </ul> <p></p>"},{"location":"status/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"status/#1-milestones","title":"1. Milestones","text":"Milestone Goal Security gate Status M1 Docs skeleton, manifest, dev2027 repos exist; reviewed PRs merged to develop Report + allow-list \u2705 Done (PR #19 merged 2026-11-05) M2 Core 6 install with one command on Mac Studio; Playwright acceptance passes; amd64 builds Report + allow-list (fewer entries than M1) In progress (branch feat/m2-installer) M3 5 subsystems start; one success + one rejection case each Report + allow-list (fewer entries than M2) Planned M4 Waterbutler, mfr, osf.io on Python 3.13 Stop on HIGH or above; first AI red-team run Planned M5 ES2 and mongo removed; ES8 + postgres 15 or later; distributable abroad Zero CRITICAL/HIGH; zero open AI red-team paths Planned"},{"location":"status/#2-open-items-for-m1","title":"2. Open items for M1","text":"Item Status docs skeleton (READMEs for all folders) \u2705 Written manifest/upstreams.json \u2705 Created dev2027 integration repos (11) \u2705 Created dev2027 strict reconstruction PRs (8 repos, ADR-01 \u00a75; osf.io #1 closed as superseded by #2) \ud83d\udd04 Open, Codex Astra review in progress MkDocs site build (<code>site/</code>, strict build passes) \u2705 Built Guides migration to <code>docs/guides/</code> (pointers kept at old paths) \u2705 Done Codex Astra review of RDM-osf.io-dev2027 PR #1 \ud83d\udd04 r1/r2 done: request changes. R1 fixed; R2 awaits the owner's decision on ADR-01 \u00a75; R3 is the owner's call M1 skeleton PR to <code>develop</code> (this repository, PR #19) \ud83d\udd04 Open; review r1 of 2026-11-05 asked for changes (R1\u2013R8); corrections in progress, then owner merge GitHub Actions (docs, security) \u2705 Running on PR #19 (docs, gitleaks, manifest pass) Trivy in CI (<code>security.yml</code>) \u23f3 At M1 report-only over the repository file system, because no image exists yet (SPEC-03 \u00a74.1); image scanning starts with the first build (M2) Semgrep findings in legacy guide sample code (6: raw HTML in templates \u00d74, exec \u00d71, path join \u00d71) \u23f3 Deferred to the guide rewrite (M2/M3); paths listed in <code>.semgrepignore</code> with reasons"},{"location":"status/#3-rules","title":"3. Rules","text":"<p>This board is the single source of truth for milestone progress:</p> <ol> <li>Every document that mentions a milestone must link to this board.</li> <li>The \"Status\" column above is authoritative; status updates require a PR with evidence (demo run or acceptance pass).</li> <li>\"Open items\" lists only M1 at this time; future milestones will have their own tables.</li> </ol> <p></p>"},{"location":"status/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"status/#1-\u7bc0\u76ee","title":"1. \u7bc0\u76ee","text":"\u7bc0\u76ee \u30b4\u30fc\u30eb \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u9580 \u30b9\u30c6\u30fc\u30bf\u30b9 M1 docs \u306e\u9aa8\u683c\u30fbmanifest\u30fbdev2027 \u30ea\u30dd\u30b8\u30c8\u30ea\u7fa4\u304c\u3042\u308b\u3002\u30ec\u30d3\u30e5\u30fc\u6e08\u307f PR \u304c develop \u306b\u30de\u30fc\u30b8 \u5831\u544a\uff0b\u8a31\u5bb9\u30ea\u30b9\u30c8 \u2705 \u5b8c\u4e86\uff08PR #19 \u3092 2026-11-05 \u306b\u30de\u30fc\u30b8\uff09 M2 \u30b3\u30a2 6 \u672c\u304c Mac Studio \u3067\u4e00\u767a\u5c0e\u5165\u3002Playwright \u53d7\u5165\u5408\u683c\u3002amd64 \u30d3\u30eb\u30c9 \u5831\u544a\uff0b\u8a31\u5bb9\u30ea\u30b9\u30c8\uff08M1 \u3088\u308a\u4ef6\u6570\u3092\u6e1b\u3089\u3059\uff09 \u9032\u884c\u4e2d\uff08\u30d6\u30e9\u30f3\u30c1 feat/m2-installer\uff09 M3 \u30b5\u30d6\u30b7\u30b9\u30c6\u30e0 5 \u672c\u304c\u8d77\u52d5\u3002\u5404 1 \u672c\u306e\u6b63\u5e38\u7cfb\uff0b\u62d2\u5426\u30b1\u30fc\u30b9 \u5831\u544a\uff0b\u8a31\u5bb9\u30ea\u30b9\u30c8\uff08M2 \u3088\u308a\u4ef6\u6570\u3092\u6e1b\u3089\u3059\uff09 \u8a08\u753b\u4e2d M4 waterbutler\u30fbmfr\u30fbosf.io \u3092 Python 3.13 \u3078 HIGH \u4ee5\u4e0a\u3067\u505c\u6b62\u3002AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u521d\u56de \u8a08\u753b\u4e2d M5 ES2\u30fbmongo \u5ec3\u6b62\u3002ES8\uff0bpostgres 15 \u4ee5\u964d\u3002\u6d77\u5916\u914d\u5e03\u53ef CRITICAL/HIGH \u30bc\u30ed\u3002AI \u30ec\u30c3\u30c9\u30c1\u30fc\u30e0\u306e\u672a\u89e3\u6c7a\u7d4c\u8def\u30bc\u30ed \u8a08\u753b\u4e2d"},{"location":"status/#2-m1-\u306e\u6b8b\u4ef6","title":"2. M1 \u306e\u6b8b\u4ef6","text":"\u9805\u76ee \u30b9\u30c6\u30fc\u30bf\u30b9 docs \u306e\u9aa8\u683c\uff08\u5168\u30d5\u30a9\u30eb\u30c0\u306e README\uff09 \u2705 \u4f5c\u6210\u6e08\u307f manifest/upstreams.json \u2705 \u4f5c\u6210 dev2027 \u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea\uff0811\uff09 \u2705 \u4f5c\u6210 dev2027 \u306e\u53b3\u5bc6\u518d\u69cb\u7bc9 PR\uff088 \u30ea\u30dd\u30b8\u30c8\u30ea\u3001ADR-01 \u00a75\u3002osf.io #1 \u306f #2 \u306b\u7f6e\u304d\u63db\u3048\u3066\u9589\u9396\uff09 \ud83d\udd04 \u4f5c\u6210\u6e08\u307f\u3001Codex Astra \u30ec\u30d3\u30e5\u30fc\u4e2d MkDocs \u30b5\u30a4\u30c8\u306e\u30d3\u30eb\u30c9\uff08<code>site/</code>\u3001strict \u30d3\u30eb\u30c9\u5408\u683c\uff09 \u2705 \u751f\u6210\u6e08\u307f \u30ac\u30a4\u30c9\u306e <code>docs/guides/</code> \u3078\u306e\u79fb\u690d\uff08\u65e7\u30d1\u30b9\u306b\u8a98\u5c0e\u3092\u6b8b\u3059\uff09 \u2705 \u5b8c\u4e86 Codex Astra \u306b\u3088\u308b RDM-osf.io-dev2027 PR #1 \u306e\u30ec\u30d3\u30e5\u30fc \ud83d\udd04 r1/r2 \u5b8c\u4e86: request changes\u3002R1 \u4fee\u6b63\u6e08\u307f\u3001R2 \u306f ADR-01 \u00a75 \u306e\u6240\u6709\u8005\u5224\u65ad\u5f85\u3061\u3001R3 \u306f\u6240\u6709\u8005\u5224\u65ad M1 \u9aa8\u683c PR\uff08\u672c\u30ea\u30dd\u30b8\u30c8\u30ea\u3001develop \u5411\u3051\u3001PR #19\uff09 \ud83d\udd04 \u4f5c\u6210\u6e08\u307f\u30022026-11-05 \u306e\u30ec\u30d3\u30e5\u30fc r1 \u304c\u4fee\u6b63\u8981\u6c42\uff08R1\u301cR8\uff09\u3002\u4fee\u6b63\u4e2d\u3001\u305d\u306e\u5f8c\u306b\u6240\u6709\u8005\u30de\u30fc\u30b8 GitHub Actions\uff08docs, security\uff09 \u2705 PR #19 \u3067\u7a3c\u50cd\uff08docs\u30fbgitleaks\u30fbmanifest \u5408\u683c\uff09 CI \u306e Trivy\uff08<code>security.yml</code>\uff09 \u23f3 M1 \u3067\u306f\u30a4\u30e1\u30fc\u30b8\u304c\u307e\u3060\u306a\u3044\u305f\u3081\u3001\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u306b\u5bfe\u3059\u308b\u5831\u544a\u306e\u307f\uff08SPEC-03 \u00a74.1\uff09\u3002\u30a4\u30e1\u30fc\u30b8\u306e\u691c\u67fb\u306f\u6700\u521d\u306e\u30d3\u30eb\u30c9\uff08M2\uff09\u304b\u3089 \u65e7\u30ac\u30a4\u30c9\u306e\u30b5\u30f3\u30d7\u30eb\u30b3\u30fc\u30c9\u306b\u5bfe\u3059\u308b Semgrep \u6307\u6458\uff086 \u4ef6: \u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u751f HTML \u00d74\u3001exec \u00d71\u3001path join \u00d71\uff09 \u23f3 \u30ac\u30a4\u30c9\u66f8\u304d\u76f4\u3057\uff08M2/M3\uff09\u3067\u5bfe\u5fdc\u3002\u5bfe\u8c61\u30d1\u30b9\u3068\u7406\u7531\u306f <code>.semgrepignore</code> \u306b\u8a18\u8f09"},{"location":"status/#3-\u898f\u5247","title":"3. \u898f\u5247","text":"<p>\u3053\u306e\u30dc\u30fc\u30c9\u306f\u7bc0\u76ee\u9032\u884c\u72b6\u6cc1\u306e\u552f\u4e00\u306e\u6b63\u672c\u3067\u3059\uff1a</p> <ol> <li>\u7bc0\u76ee\u3092\u8a00\u53ca\u3059\u308b\u3059\u3079\u3066\u306e\u6587\u66f8\u306f\u3053\u306e\u30dc\u30fc\u30c9\u3078\u30ea\u30f3\u30af\u3057\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u3002</li> <li>\u4e0a\u8a18\u306e\u300c\u30b9\u30c6\u30fc\u30bf\u30b9\u300d\u5217\u304c\u6a29\u5a01\u3042\u308b\u3082\u306e\u3067\u3042\u308b\u3002\u30b9\u30c6\u30fc\u30bf\u30b9\u66f4\u65b0\u306b\u306f PR \u3068\u8a3c\u8de1\uff08\u5b9f\u884c\u7d50\u679c\u307e\u305f\u306f\u53d7\u5165\u5408\u683c\uff09\u304c\u5fc5\u8981\u3002</li> <li>\u300c\u672a\u89e3\u6c7a\u9805\u76ee\u300d\u306f\u73fe\u6642\u70b9\u3067 M1 \u306e\u307f\u3002\u5c06\u6765\u306e\u7bc0\u76ee\u306b\u306f\u305d\u308c\u305e\u308c\u5c02\u7528\u306e\u8868\u304c\u8ffd\u52a0\u3055\u308c\u308b\u3002</li> </ol>"},{"location":"status/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Milestone A checkpoint with a pass/fail test. \u5408\u5426\u306e\u8a66\u9a13\u304c\u3042\u308b\u95a2\u9580\u3002 Security gate A checkpoint the build must pass before it is called good. \u30d3\u30eb\u30c9\u3092\u5c0e\u5165\u3057\u3066\u3088\u3044\u304b\u3092\u6c7a\u3081\u308b\u8a66\u9a13\u3002 Open item A task or PR that has not been completed. \u5b8c\u4e86\u3057\u3066\u3044\u306a\u3044\u30bf\u30b9\u30af\u307e\u305f\u306f PR\u3002 Status board The single source of truth for milestone progress. \u7bc0\u76ee\u9032\u884c\u72b6\u6cc1\u306e\u552f\u4e00\u306e\u6b63\u672c\u3002 Evidence Proof that a test or check passed. \u8a66\u9a13\u307e\u305f\u306f\u691c\u67fb\u304c\u5408\u683c\u3057\u305f\u8a3c\u62e0\u3002"},{"location":"status/upstream/","title":"Upstream Tracking Status / \u4e0a\u6d41\u8ffd\u5f93\u72b6\u6cc1","text":"<p>Summary: Daily mirror and diff reports: <code>latest.toon</code>/<code>latest.json</code> are overwritten every day, and archives older than 90 days are deleted. These records show which upstreams changed and whether integration is needed. \u6982\u8981: \u65e5\u6b21\u30df\u30e9\u30fc\u3068\u5dee\u5206\u5831\u544a\uff1a<code>latest.toon</code>/<code>latest.json</code> \u306f\u6bce\u65e5\u4e0a\u66f8\u304d\u3055\u308c\u300190 \u65e5\u3088\u308a\u53e4\u3044\u4fdd\u7ba1\u5206\u306f\u524a\u9664\u3055\u308c\u307e\u3059\u3002\u3053\u308c\u3089\u306e\u8a18\u9332\u306f\u3069\u306e\u4e0a\u6d41\u304c\u5909\u66f4\u3055\u308c\u305f\u304b\u3001\u7d71\u5408\u304c\u5fc5\u8981\u304b\u3069\u3046\u304b\u3092\u793a\u3057\u307e\u3059\u3002</p> <p>Jump: English \u00b7 \u65e5\u672c\u8a9e</p> <ul> <li>Version / \u7248: 0.2 \u2014 2026-11-05. Learned: an example data block must itself parse: a declared row count with an ellipsis in place of rows is a syntax error, not an example. \uff0f \u4f8b\u3068\u3057\u3066\u7f6e\u304f\u30c7\u30fc\u30bf\u30d6\u30ed\u30c3\u30af\u3082\u305d\u308c\u81ea\u4f53\u304c\u89e3\u6790\u3067\u304d\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u3002\u884c\u6570\u3092\u5ba3\u8a00\u3057\u3066\u7701\u7565\u8a18\u53f7\u3092\u7f6e\u3044\u305f\u3082\u306e\u306f\u4f8b\u3067\u306f\u306a\u304f\u69cb\u6587\u30a8\u30e9\u30fc\u3060\u3068\u5206\u304b\u3063\u305f\u3002</li> <li>Version / \u7248: 0.1 \u2014 2026-11-05. Learned: the daily job's outputs need a fixed place and a fixed name before the job exists, or SPEC-05 and the status board would point at nothing. The files named here do not exist yet; the daily job (SPEC-05) will create them. \uff0f \u65e5\u6b21\u30b8\u30e7\u30d6\u306e\u51fa\u529b\u306b\u306f\u3001\u30b8\u30e7\u30d6\u304c\u5b58\u5728\u3059\u308b\u524d\u304b\u3089\u7f6e\u304d\u5834\u3068\u540d\u524d\u3092\u6c7a\u3081\u3066\u304a\u304f\u5fc5\u8981\u304c\u3042\u308b\u3068\u5206\u304b\u3063\u305f\u3002\u3055\u3082\u306a\u3044\u3068 SPEC-05 \u3068\u9032\u6357\u30dc\u30fc\u30c9\u306e\u53c2\u7167\u5148\u304c\u7121\u304f\u306a\u308b\u3002\u3053\u3053\u306b\u66f8\u3044\u305f\u30d5\u30a1\u30a4\u30eb\u306f\u307e\u3060\u5b58\u5728\u305b\u305a\u3001\u65e5\u6b21\u30b8\u30e7\u30d6\uff08SPEC-05\uff09\u304c\u4f5c\u308b\u3002</li> <li>Normative for: SPEC-05 Upstream Tracking.</li> <li>Related: ../README.md \u00b7 status/README.md \u00b7 spec/05_upstream_tracking.md#2-daily-job-mirror-and-diff-report</li> </ul> <p></p>"},{"location":"status/upstream/#english","title":"English","text":"<p>\u2192 \u65e5\u672c\u8a9e\u7248\u3078</p>"},{"location":"status/upstream/#1-files-written-by-the-daily-job","title":"1. Files written by the daily job","text":"<p>The <code>upstream-mirror</code> workflow (or <code>grdm-dev upstream mirror</code>) writes:</p> File Behavior <code>latest.toon</code> Overwritten every day; TOON excerpt of the daily report. <code>latest.json</code> Overwritten every day; canonical JSON of the daily report. <code>archive/</code> Subdirectory with daily reports dated <code>YYYY-MM-DD.toon</code> and <code>.json</code>. <p>Note: Archives older than 90 days are deleted by the daily job to keep storage reasonable.</p>"},{"location":"status/upstream/#2-report-structure","title":"2. Report structure","text":"<p>The report format is defined in SPEC-05 \u00a72:</p> <pre><code>report:\n generated_at: 2026-11-05T03:00:12+09:00\n repositories[1]:\n - integration_repo: RDM-osf.io-dev2027\n develop_sha: 1111111111111111111111111111111111111111\n upstreams[3]{branch,kind,sha,ahead_of_develop,behind_develop,manifest_sha_matches,moved_since_yesterday}:\n upstream/public-develop,public,2222222222222222222222222222222222222222,14,0,false,true\n upstream/private-develop,private,3333333333333333333333333333333333333333,0,0,true,false\n upstream/cos-develop,cos,4444444444444444444444444444444444444444,310,0,true,true\n action: integrate\n summary:\n repositories_needing_integration: 1\n force_push_detected: 0</code></pre> <p>The example shows one of the eleven integration repositories; a real report lists all eleven (<code>repositories[11]</code>), and the repeated digits stand for real SHAs.</p> <p>The <code>action</code> field is:</p> Value Meaning <code>integrate</code> Any merged upstream is ahead of develop; open an integration PR. <code>none</code> No changes since yesterday; no action needed. <code>halt</code> Force-push detected on an upstream branch; stop and investigate."},{"location":"status/upstream/#3-open-items-no-entries-yet--\u307e\u3060\u3042\u308a\u307e\u305b\u3093","title":"3. Open items (no entries yet / \u307e\u3060\u3042\u308a\u307e\u305b\u3093)","text":"Date Repository Action \u2014 \u2014 \u2014"},{"location":"status/upstream/#\u65e5\u672c\u8a9e","title":"\u65e5\u672c\u8a9e","text":"<p>\u2192 To English</p>"},{"location":"status/upstream/#1-\u65e5\u6b21\u30b8\u30e7\u30d6\u304c\u66f8\u304f\u30d5\u30a1\u30a4\u30eb","title":"1. \u65e5\u6b21\u30b8\u30e7\u30d6\u304c\u66f8\u304f\u30d5\u30a1\u30a4\u30eb","text":"<p><code>upstream-mirror</code> \u30ef\u30fc\u30af\u30d5\u30ed\u30fc\uff08\u307e\u305f\u306f <code>grdm-dev upstream mirror</code>\uff09\u304c\u6b21\u3092\u66f8\u304d\u307e\u3059\uff1a</p> \u30d5\u30a1\u30a4\u30eb \u632f\u308b\u821e\u3044 <code>latest.toon</code> \u6bce\u65e5\u4e0a\u66f8\u304d\u3055\u308c\u308b\u3002\u65e5\u6b21\u5831\u544a\u306e TOON \u6284\u9332\u3002 <code>latest.json</code> \u6bce\u65e5\u4e0a\u66f8\u304d\u3055\u308c\u308b\u3002\u65e5\u6b21\u5831\u544a\u306e\u6b63\u672c JSON\u3002 <code>archive/</code> \u65e5\u4ed8\u4ed8\u304d\u306e\u65e5\u6b21\u5831\u544a <code>YYYY-MM-DD.toon</code> \u3068 <code>.json</code> \u306e\u30b5\u30d6\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3002 <p>Note: 90 \u65e5\u3088\u308a\u53e4\u3044\u4fdd\u7ba1\u5206\u306f\u3001\u30b9\u30c8\u30ec\u30fc\u30b8\u3092\u9069\u5207\u306b\u4fdd\u3064\u305f\u3081\u65e5\u6b21\u30b8\u30e7\u30d6\u304c\u524a\u9664\u3057\u307e\u3059\u3002</p>"},{"location":"status/upstream/#2-\u5831\u544a\u306e\u69cb\u9020","title":"2. \u5831\u544a\u306e\u69cb\u9020","text":"<p>\u5831\u544a\u5f62\u5f0f\u306f SPEC-05 \u00a72 \u306b\u5b9a\u3081\u3089\u308c\u3066\u3044\u307e\u3059\uff1a</p> <pre><code>report:\n generated_at: 2026-11-05T03:00:12+09:00\n repositories[1]:\n - integration_repo: RDM-osf.io-dev2027\n develop_sha: 1111111111111111111111111111111111111111\n upstreams[3]{branch,kind,sha,ahead_of_develop,behind_develop,manifest_sha_matches,moved_since_yesterday}:\n upstream/public-develop,public,2222222222222222222222222222222222222222,14,0,false,true\n upstream/private-develop,private,3333333333333333333333333333333333333333,0,0,true,false\n upstream/cos-develop,cos,4444444444444444444444444444444444444444,310,0,true,true\n action: integrate\n summary:\n repositories_needing_integration: 1\n force_push_detected: 0</code></pre> <p>\u4f8b\u306f\u7d71\u5408\u30ea\u30dd\u30b8\u30c8\u30ea 11 \u672c\u306e\u3046\u3061 1 \u672c\u3060\u3051\u3092\u793a\u3057\u3066\u3044\u307e\u3059\u3002\u672c\u7269\u306e\u5831\u544a\u306f 11 \u672c\u3059\u3079\u3066\u3092\u8f09\u305b\uff08<code>repositories[11]</code>\uff09\u3001\u540c\u3058\u6570\u5b57\u306e\u4e26\u3073\u306f\u672c\u7269\u306e SHA \u306e\u4ee3\u308f\u308a\u3067\u3059\u3002</p> <p><code>action</code> \u30d5\u30a3\u30fc\u30eb\u30c9\u306f\uff1a</p> \u5024 \u610f\u5473 <code>integrate</code> \u30de\u30fc\u30b8\u5bfe\u8c61\u306e\u4e0a\u6d41\u306e\u3069\u308c\u304b\u304c develop \u3088\u308a\u9032\u3093\u3067\u3044\u308b\u3002\u7d71\u5408 PR \u3092\u958b\u304f\u3002 <code>none</code> \u6628\u65e5\u304b\u3089\u306e\u5909\u66f4\u306a\u3057\u3002\u4f55\u3082\u3059\u308b\u5fc5\u8981\u306a\u3057\u3002 <code>halt</code> \u4e0a\u6d41\u30d6\u30e9\u30f3\u30c1\u3067 force-push \u3092\u691c\u51fa\u3002\u505c\u6b62\u3057\u3066\u8abf\u67fb\u3059\u308b\u3002"},{"location":"status/upstream/#3-\u672a\u89e3\u6c7a\u9805\u76ee\u307e\u3060\u3042\u308a\u307e\u305b\u3093--no-entries-yet","title":"3. \u672a\u89e3\u6c7a\u9805\u76ee\uff08\u307e\u3060\u3042\u308a\u307e\u305b\u3093 / no entries yet\uff09","text":"\u65e5\u4ed8 \u30ea\u30dd\u30b8\u30c8\u30ea \u30a2\u30af\u30b7\u30e7\u30f3 \u2014 \u2014 \u2014"},{"location":"status/upstream/#glossary--\u7528\u8a9e","title":"Glossary / \u7528\u8a9e","text":"Term English note \u65e5\u672c\u8a9e\u6ce8 Mirror A copy that is kept identical to the original. \u5143\u3068\u540c\u3058\u4e2d\u8eab\u306b\u4fdd\u305f\u308c\u308b\u5199\u3057\u3002 Diff report A record of changes between branches. \u30d6\u30e9\u30f3\u30c1\u9593\u306e\u5909\u66f4\u8a18\u9332\u3002 Fast-forward Moving a branch straight ahead to a newer commit without creating a merge. \u30de\u30fc\u30b8\u3092\u4f5c\u3089\u305a\u306b\u30d6\u30e9\u30f3\u30c1\u3092\u65b0\u3057\u3044\u30b3\u30df\u30c3\u30c8\u3078\u307e\u3063\u3059\u3050\u9032\u3081\u308b\u3053\u3068\u3002 Force-push Overwriting a branch's history on the server. Forbidden here. \u30b5\u30fc\u30d0\u4e0a\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u5c65\u6b74\u3092\u4e0a\u66f8\u304d\u3059\u308b\u3053\u3068\u3002\u3053\u3053\u3067\u306f\u7981\u6b62\u3002 Archive Old reports kept for reference, deleted after 90 days. \u53c2\u7167\u306e\u305f\u3081\u306b\u4fdd\u7ba1\u3059\u308b\u53e4\u3044\u5831\u544a\u300290 \u65e5\u5f8c\u306b\u524a\u9664\u3055\u308c\u308b\u3002 Action The decision on whether to open an integration PR. \u7d71\u5408 PR \u3092\u958b\u304f\u304b\u3069\u3046\u304b\u306e\u5224\u65ad\u3002"}]} \ No newline at end of file diff --git a/site/sitemap.xml b/site/sitemap.xml new file mode 100644 index 0000000..0f8724e --- /dev/null +++ b/site/sitemap.xml @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="UTF-8"?> +<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> +</urlset> \ No newline at end of file diff --git a/site/sitemap.xml.gz b/site/sitemap.xml.gz new file mode 100644 index 0000000..fae34fc Binary files /dev/null and b/site/sitemap.xml.gz differ diff --git a/site/spec/00_overview/index.html b/site/spec/00_overview/index.html new file mode 100644 index 0000000..fb018d4 --- /dev/null +++ b/site/spec/00_overview/index.html @@ -0,0 +1,3314 @@ + +<!doctype html> +<html lang="en" class="no-js"> + <head> + + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width,initial-scale=1"> + + + + + <link rel="prev" href="../"> + + + <link rel="next" href="../01_manifest/"> + + + <link rel="icon" href="../../assets/images/favicon.png"> + <meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.37"> + + + + <title>SPEC-00 Overview and Architecture / 全体像と構成 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

                                                            +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            SPEC-00 Overview and Architecture / 全体像と構成

                                                            +
                                                            +

                                                            Summary: What the GakuNin RDM developer environment 2027 is, which parts it is made of, how upstream code is combined, how the network is shaped, which milestones it passes, who does what, and where the other specifications are. +概要: GakuNin RDM 開発環境 2027 版とは何か。どの部品でできているか、上流のコードをどう重ねるか、ネットワークはどんな形か、どの節目を通るか、誰が何をするか、他の仕様はどこにあるか。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.2 — 2026-11-05. Learned: the profile of one component (y-websocket) is decided by the milestone that tests it (Wiki co-editing, M2), not by its role, so the overview must mirror SPEC-02 and the manifest. / 部品のプロファイルは役割でなく、それを試験する節目(Wiki 共同編集は M2)が決めるため、概要図と抄録は SPEC-02 と manifest に合わせ続けなければならないと分かった。
                                                            • +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: eleven upstream repositories and three tracking branches per component cannot be held in anyone's head, so the map, the manifest, and the roles had to be written down before the first integration repository was created. / 上流 11 本と部品ごとの追跡ブランチ 3 本は頭の中では管理できないので、最初の統合リポジトリを作る前に、地図・マニフェスト・役割分担を文書にする必要があると分かった。
                                                            • +
                                                            • Normative for: the shape of the whole environment. Every other specification (01–06) refines one part of this page.
                                                            • +
                                                            • Related: POL-01 Position · ADR-01 Integration repository placement · ADR-02 Network model · ADR-03 Staged security gate · ADR-04 AI autonomy and roles · SPEC-01 Manifest · SPEC-05 Upstream tracking · SPEC-06 Documentation conventions · docs/README.md
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            1. Purpose

                                                            +

                                                            The developer environment 2027 is a set of instructions and tools that lets one person start a complete GakuNin RDM (GRDM, the research data management service run by NII) on one computer with one command. It runs on macOS arm64, Ubuntu 24.04 (amd64 and arm64), and Windows 11 WSL2. It has three jobs:

                                                            +
                                                              +
                                                            1. Combine the public core repositories, their -private security-verified versions, and the private subsystems into one consistent build.
                                                            2. +
                                                            3. Move every base image (a base image is the ready-made operating-system layer a program is built on top of) from end-of-life versions to current ones, step by step.
                                                            4. +
                                                            5. Keep removing security vulnerabilities (a vulnerability is a weak spot an attacker could use) with AI agents, so GRDM can continue even if the Center for Open Science (COS) stops developing OSF, the software GRDM is based on.
                                                            6. +
                                                            +

                                                            This repository, RDM-developer-guide, is public. It holds documents, the manifest (the list of exactly which upstream versions we build; see SPEC-01), and the installer. It never holds code copied from -private repositories, secrets, or links to private repositories.

                                                            +

                                                            2. Component map

                                                            +

                                                            A component is one program that runs as its own container (a box that holds one program and everything it needs, so it runs the same on any computer). Core components are the GRDM application itself. Infrastructure components are shared services such as databases. Subsystems are optional extras that plug into the core.

                                                            +
                                                            flowchart LR
                                                            +  subgraph browser["Browser on the developer's computer (127.0.0.1 only)"]
                                                            +    B[Web browser]
                                                            +  end
                                                            +  subgraph core["Core (6 repositories)"]
                                                            +    EMB[ember-osf-web]
                                                            +    OSFW[osf.io web]
                                                            +    OSFA[osf.io api]
                                                            +    OSFM[osf.io admin]
                                                            +    OSFK[osf.io worker]
                                                            +    WB[waterbutler]
                                                            +    MFR[modular-file-renderer]
                                                            +    CAS["cas-overlay (+ fakecas for dev)"]
                                                            +    WIKI[wiki-frontend]
                                                            +  end
                                                            +  subgraph infra["Infrastructure"]
                                                            +    PG[(postgres)]
                                                            +    ES[(elasticsearch)]
                                                            +    MQ[rabbitmq]
                                                            +    MG[("mongo (legacy)")]
                                                            +    RD[(redis)]
                                                            +    SJ[sharejs]
                                                            +    UNO[unoconv]
                                                            +  end
                                                            +  subgraph subs["Subsystems (y-websocket in profile core, the others in full)"]
                                                            +    YWS[y-websocket]
                                                            +    OAS[OASys]
                                                            +    SHIB["Shibboleth-SP + test IdP"]
                                                            +    MCP[rdmcp]
                                                            +    AIPF[aipf_mcp_data_grdm]
                                                            +  end
                                                            +  B --> EMB & OSFW & OSFA & OSFM & CAS & WIKI
                                                            +  OSFW & OSFA & OSFM & OSFK --> PG & ES & MQ & RD
                                                            +  OSFW --> SJ & MG
                                                            +  WB --> OSFA
                                                            +  MFR --> WB & UNO
                                                            +  WIKI --> YWS
                                                            +  SHIB --> OSFW
                                                            +  MCP & AIPF --> OSFA
                                                            +  OAS --> OSFA
                                                            +

                                                            The inventory in TOON (a compact text form of JSON; see SPEC-06 §4). The canonical, machine-read list is manifest/upstreams.json (SPEC-01); this excerpt shows only id, role, services, integration_repo, and profile (the smallest installer profile that includes the component, SPEC-02 §4). Service names are the Compose service names.

                                                            + +
                                                            components[20]{id,role,services,integration_repo,profile}:
                                                            +  osf.io,core,"web,api,admin,worker",RDM-osf.io-dev2027,minimum
                                                            +  waterbutler,core,"wb,wb_worker",RDM-waterbutler-dev2027,core
                                                            +  modular-file-renderer,core,mfr,RDM-modular-file-renderer-dev2027,core
                                                            +  ember-osf-web,core,ember_osf_web,RDM-ember-osf-web-dev2027,core
                                                            +  cas-overlay,core,cas,RDM-cas-overlay-dev2027,core
                                                            +  wiki-frontend,core,wiki,RDM-wiki-frontend-dev2027,core
                                                            +  postgres,infra,postgres,null,minimum
                                                            +  elasticsearch2,infra,elasticsearch,null,minimum
                                                            +  elasticsearch6,infra,elasticsearch6,null,core
                                                            +  rabbitmq,infra,rabbitmq,null,minimum
                                                            +  mongo,infra,mongo,null,core
                                                            +  redis,infra,redis,null,core
                                                            +  sharejs,infra,sharejs,null,core
                                                            +  unoconv,infra,unoconv,null,core
                                                            +  fakecas,infra,fakecas,null,minimum
                                                            +  y-websocket,subsystem,y_websocket,RDM-y-websocket-dev2027,core
                                                            +  OASys,subsystem,oasys,RDM-OASys-dev2027,full
                                                            +  Shibboleth-SP,subsystem,"shibboleth_sp,test_idp",RDM-Shibboleth-SP-dev2027,full
                                                            +  rdmcp,subsystem,rdmcp,RDM-rdmcp-dev2027,full
                                                            +  aipf_mcp_data_grdm,subsystem,aipf_mcp_data_grdm,RDM-aipf_mcp_data_grdm-dev2027,full
                                                            +

                                                            mongo and elasticsearch2 are legacy and are removed at M5 (§5).

                                                            +

                                                            fakecas and the Shibboleth test IdP (an IdP, identity provider, is the server that checks who you are when you log in) are both login helpers for development. They are mutually exclusive: the installer starts one or the other, never both.

                                                            +

                                                            3. Integration model

                                                            +

                                                            Each core component and each subsystem gets one private integration repository in the RCOSDP organization, named RDM-<name>-dev2027. Its develop branch is what the installer builds. Beside it sit tracking branches (read-only copies of someone else's branch), one per upstream listed in the manifest, named upstream/<kind>-<branch> where <branch> is the upstream branch name with / replaced by - (SPEC-01 §4 rule 7):

                                                            +
                                                              +
                                                            • upstream/public-<branch> — the public RCOSDP repository's default branch. Examples: upstream/public-develop (osf.io, waterbutler, mfr, cas-overlay, wiki-frontend), upstream/public-master (ember-osf-web, y-websocket).
                                                            • +
                                                            • upstream/private-<branch> — the -private security-verified repository's default branch. Examples: upstream/private-develop, upstream/private-master (ember-osf-web, y-websocket), upstream/private-main (OASys, Shibboleth-SP, rdmcp, aipf_mcp_data_grdm, which have no public upstream and therefore only this one branch).
                                                            • +
                                                            • upstream/cos-develop — the original COS repository, kept for reference only (the six cores except wiki-frontend).
                                                            • +
                                                            • A second upstream of the same kind gets a tag: upstream/private-sec-test-fix-sec-test mirrors RDM-osf.io-private (branch fix/sec-test) as a candidate that is not merged.
                                                            • +
                                                            +
                                                            flowchart LR
                                                            +  PUB["RDM-<name> (public)<br/>default branch"] -->|mirror| UP1["upstream/public-<branch>"]
                                                            +  PRV["RDM-<name>-*-private<br/>default branch"] -->|mirror| UP2["upstream/private-<branch>"]
                                                            +  COS["CenterForOpenScience/<name><br/>develop"] -->|mirror| UP3["upstream/cos-develop (reference)"]
                                                            +  UP1 -->|1. merge| DEV["RDM-<name>-dev2027<br/>develop"]
                                                            +  UP2 -->|2. merge| DEV
                                                            +  PRS["adopted PRs<br/>(listed in manifest)"] -->|3. apply| DEV
                                                            +  UP3 -.->|compare only| DEV
                                                            +  DEV -->|installer builds| IMG["Local images"]
                                                            +

                                                            Order matters: public first, then private, then adopted pull requests. The manifest (SPEC-01) records the exact commit (by SHA, the 40-character fingerprint of a commit) for each step. The daily and weekly jobs that keep this up to date are in SPEC-05. Why the repositories are placed this way is in ADR-01.

                                                            +

                                                            4. Network model

                                                            +
                                                              +
                                                            • The loopback alias 192.168.168.167 used by the old guide is gone. It needed sudo (administrator rights) and exposed services to the local network.
                                                            • +
                                                            • Containers talk to each other on the Compose internal network (a private network that only the containers of one project can see) by service name, for example http://api:8000.
                                                            • +
                                                            • Only ports bound to 127.0.0.1 (the address that means "this computer only") are published to the host. Nothing listens on other interfaces.
                                                            • +
                                                            • No step of installation requires sudo. The reasoning is in ADR-02.
                                                            • +
                                                            +

                                                            5. Milestone ladder

                                                            +

                                                            A milestone is a checkpoint with a pass/fail test. The security gate is the test that decides whether a build may be installed; it gets stricter at each milestone (ADR-03).

                                                            +
                                                            milestones[5]{id,goal,security_gate}:
                                                            +  M1,"docs skeleton, manifest, dev2027 repositories exist; reviewed PRs merged to develop","report + allow-list"
                                                            +  M2,"core 6 install with one command on Mac Studio; Playwright acceptance passes; amd64 builds","report + allow-list (fewer entries than M1)"
                                                            +  M3,"5 subsystems start; one success + one rejection case each","report + allow-list (fewer entries than M2)"
                                                            +  M4,"waterbutler, mfr, osf.io on Python 3.13","stop on HIGH or above; first AI red-team run"
                                                            +  M5,"ES2 and mongo removed; ES8 + postgres 15 or later; distributable abroad","zero CRITICAL/HIGH; zero open AI red-team paths"
                                                            +

                                                            6. Roles

                                                            +

                                                            Role codes follow the shared table in AGENTS.md. An AI agent is a program that reads instructions, writes code or documents, and reports back.

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            CodeWhoDoes
                                                            AID (AI Developer)Orca Open Code 2 workers on a local LLMImplements what the specifications say; writes documents and code in PRs
                                                            QAE (QA Engineer)Claude Code FableWrites specifications, checks implementations, runs and judges regression and acceptance tests
                                                            REV (Reviewer)Codex AstraIndependent review of every PR; records results in docs/reviews/ and PR comments
                                                            OwnerHumanDecides policy, accepts, merges, publishes
                                                            +

                                                            Detection, fix PR, review, and automated tests run without a human. Merging and publishing are always done by the owner (ADR-04).

                                                            +

                                                            7. Index of specifications

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            IDFileOne line
                                                            SPEC-0101_manifest.mdThe manifest: which upstream commits and PRs the installer builds
                                                            SPEC-0202_installer_cli.mdThe grdm-dev CLI and install.sh: host checks, secrets, compose, build, health, reports
                                                            SPEC-0303_security_gate.mdSBOM, CVE scan, static analysis, ZAP, AI red team, and the per-milestone thresholds
                                                            SPEC-0404_acceptance_tests.mdPlaywright Python acceptance: success and rejection cases per feature
                                                            SPEC-0505_upstream_tracking.mdDaily mirror and diff report, weekly AI integration PR, COS reference tracking
                                                            SPEC-0606_documentation_conventions.mdHow every document is written
                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            1. 目的

                                                            +

                                                            「開発環境 2027 版」は、GakuNin RDM(GRDM。NII が運用する研究データ管理サービス)の一式を、一台のコンピュータ上で一つのコマンドで立ち上げるための手引きと道具の集まりです。macOS arm64、Ubuntu 24.04(amd64 と arm64)、Windows 11 WSL2 で動きます。役目は三つです。

                                                            +
                                                              +
                                                            1. 公開コアのリポジトリ、その -private(セキュリティ検証版)、非公開サブシステムを、矛盾なく一つのビルドに重ねる。
                                                            2. +
                                                            3. すべてのベースイメージ(プログラムを載せる土台になる、できあいの OS の層)を、サポート切れの版から現行の版へ段階的に移す。
                                                            4. +
                                                            5. AI エージェントで脆弱性(攻撃者につけ込まれる弱い所)を取り除き続け、GRDM の元になっている OSF の開発を Center for Open Science(COS)がやめても、GRDM を提供し続けられるようにする。
                                                            6. +
                                                            +

                                                            このリポジトリ RDM-developer-guide は 公開 です。文書、マニフェスト(どの上流の版を組むかを決める一覧。SPEC-01)、インストーラーを置きます。-private 由来のコード、秘密、非公開リポジトリへのリンクは絶対に置きません。

                                                            +

                                                            2. 部品の地図

                                                            +

                                                            「部品(コンポーネント)」は、それぞれ自分のコンテナ(一つのプログラムと必要なものを一箱に入れ、どのコンピュータでも同じように動かすための箱)で動く一つのプログラムです。「コア」は GRDM 本体、「基盤」はデータベースのような共用サービス、「サブシステム」はコアに差し込む追加機能です。

                                                            +
                                                            flowchart LR
                                                            +  subgraph browser["開発者のブラウザ(127.0.0.1 のみ)"]
                                                            +    B[Web ブラウザ]
                                                            +  end
                                                            +  subgraph core["コア(6 リポジトリ)"]
                                                            +    EMB[ember-osf-web]
                                                            +    OSFW[osf.io web]
                                                            +    OSFA[osf.io api]
                                                            +    OSFM[osf.io admin]
                                                            +    OSFK[osf.io worker]
                                                            +    WB[waterbutler]
                                                            +    MFR[modular-file-renderer]
                                                            +    CAS["cas-overlay(開発用 fakecas 付き)"]
                                                            +    WIKI[wiki-frontend]
                                                            +  end
                                                            +  subgraph infra["基盤"]
                                                            +    PG[(postgres)]
                                                            +    ES[(elasticsearch)]
                                                            +    MQ[rabbitmq]
                                                            +    MG[("mongo(旧)")]
                                                            +    RD[(redis)]
                                                            +    SJ[sharejs]
                                                            +    UNO[unoconv]
                                                            +  end
                                                            +  subgraph subs["サブシステム(y-websocket は core、ほかは full)"]
                                                            +    YWS[y-websocket]
                                                            +    OAS[OASys]
                                                            +    SHIB["Shibboleth-SP + テスト IdP"]
                                                            +    MCP[rdmcp]
                                                            +    AIPF[aipf_mcp_data_grdm]
                                                            +  end
                                                            +  B --> EMB & OSFW & OSFA & OSFM & CAS & WIKI
                                                            +  OSFW & OSFA & OSFM & OSFK --> PG & ES & MQ & RD
                                                            +  OSFW --> SJ & MG
                                                            +  WB --> OSFA
                                                            +  MFR --> WB & UNO
                                                            +  WIKI --> YWS
                                                            +  SHIB --> OSFW
                                                            +  MCP & AIPF --> OSFA
                                                            +  OAS --> OSFA
                                                            +

                                                            一覧を TOON(JSON を短く字下げで書いた形。SPEC-06 §4)で示します。機械が読む正本は manifest/upstreams.json(SPEC-01)で、この抄録は id・role・services・integration_repo・profile(その部品を含む最小のインストーラープロファイル。SPEC-02 §4)だけを載せています。サービス名は Compose のサービス名です。

                                                            + +
                                                            components[20]{id,role,services,integration_repo,profile}:
                                                            +  osf.io,core,"web,api,admin,worker",RDM-osf.io-dev2027,minimum
                                                            +  waterbutler,core,"wb,wb_worker",RDM-waterbutler-dev2027,core
                                                            +  modular-file-renderer,core,mfr,RDM-modular-file-renderer-dev2027,core
                                                            +  ember-osf-web,core,ember_osf_web,RDM-ember-osf-web-dev2027,core
                                                            +  cas-overlay,core,cas,RDM-cas-overlay-dev2027,core
                                                            +  wiki-frontend,core,wiki,RDM-wiki-frontend-dev2027,core
                                                            +  postgres,infra,postgres,null,minimum
                                                            +  elasticsearch2,infra,elasticsearch,null,minimum
                                                            +  elasticsearch6,infra,elasticsearch6,null,core
                                                            +  rabbitmq,infra,rabbitmq,null,minimum
                                                            +  mongo,infra,mongo,null,core
                                                            +  redis,infra,redis,null,core
                                                            +  sharejs,infra,sharejs,null,core
                                                            +  unoconv,infra,unoconv,null,core
                                                            +  fakecas,infra,fakecas,null,minimum
                                                            +  y-websocket,subsystem,y_websocket,RDM-y-websocket-dev2027,core
                                                            +  OASys,subsystem,oasys,RDM-OASys-dev2027,full
                                                            +  Shibboleth-SP,subsystem,"shibboleth_sp,test_idp",RDM-Shibboleth-SP-dev2027,full
                                                            +  rdmcp,subsystem,rdmcp,RDM-rdmcp-dev2027,full
                                                            +  aipf_mcp_data_grdm,subsystem,aipf_mcp_data_grdm,RDM-aipf_mcp_data_grdm-dev2027,full
                                                            +

                                                            mongo と elasticsearch2 は旧来の部品で、M5 で廃止します(§5)。

                                                            +

                                                            fakecas と Shibboleth のテスト IdP(IdP=アイデンティティプロバイダ。ログインのときに「あなたは誰か」を確かめるサーバ)は、どちらも開発用のログインの助け役です。二つは排他で、インストーラーはどちらか一方だけを起動します。

                                                            +

                                                            3. 統合の仕組み

                                                            +

                                                            コアの各部品とサブシステムには、RCOSDP 組織内に非公開の「統合リポジトリ」を一つずつ作ります。名前は RDM-<name>-dev2027 です。その develop ブランチをインストーラーが組みます。横に「追跡ブランチ」(他の場所のブランチを読み取り専用で写したもの)を、マニフェストに載せた上流ごとに一本置きます。名前は upstream/<kind>-<branch> で、<branch> は上流のブランチ名の / を - に置き換えたものです(SPEC-01 §4 の規則 7)。

                                                            +
                                                              +
                                                            • upstream/public-<branch> — 公開 RCOSDP リポジトリの既定ブランチ。例: upstream/public-develop(osf.io、waterbutler、mfr、cas-overlay、wiki-frontend)、upstream/public-master(ember-osf-web、y-websocket)。
                                                            • +
                                                            • upstream/private-<branch> — -private セキュリティ検証版の既定ブランチ。例: upstream/private-develop、upstream/private-master(ember-osf-web、y-websocket)、upstream/private-main(OASys、Shibboleth-SP、rdmcp、aipf_mcp_data_grdm。公開の上流がないので、この一本だけ)。
                                                            • +
                                                            • upstream/cos-develop — COS 本家。参照専用(wiki-frontend を除くコア 5 本)。
                                                            • +
                                                            • 同じ kind の上流が二つあるときはタグを挟みます。upstream/private-sec-test-fix-sec-test は RDM-osf.io-private(ブランチ fix/sec-test)を、マージしない候補として写したものです。
                                                            • +
                                                            +
                                                            flowchart LR
                                                            +  PUB["RDM-<name>(公開)<br/>既定ブランチ"] -->|ミラー| UP1["upstream/public-<branch>"]
                                                            +  PRV["RDM-<name>-*-private<br/>既定ブランチ"] -->|ミラー| UP2["upstream/private-<branch>"]
                                                            +  COS["CenterForOpenScience/<name><br/>develop"] -->|ミラー| UP3["upstream/cos-develop(参照)"]
                                                            +  UP1 -->|1. マージ| DEV["RDM-<name>-dev2027<br/>develop"]
                                                            +  UP2 -->|2. マージ| DEV
                                                            +  PRS["採用 PR<br/>(マニフェストに列挙)"] -->|3. 適用| DEV
                                                            +  UP3 -.->|比較のみ| DEV
                                                            +  DEV -->|インストーラーが組む| IMG["ローカルのイメージ"]
                                                            +

                                                            順番が大事です。公開版、次に private 版、最後に採用 PR。マニフェスト(SPEC-01)が各段のコミットを SHA(コミットの 40 文字の指紋)で記録します。これを毎日・毎週保つ仕事は SPEC-05 に、なぜこの置き方にしたかは ADR-01 にあります。

                                                            +

                                                            4. ネットワークの形

                                                            +
                                                              +
                                                            • 旧手引きのループバック別名 192.168.168.167 は 廃止 しました。sudo(管理者権限)が要り、サービスが LAN に見えてしまうからです。
                                                            • +
                                                            • コンテナ同士は Compose の内部ネットワーク(一つのプロジェクトのコンテナだけが見える私設の網)でサービス名を使って話します。例: http://api:8000。
                                                            • +
                                                            • ホストに公開するポートは 127.0.0.1(「このコンピュータだけ」を意味する番地)に結び付けたものだけです。他のインターフェースでは何も待ち受けません。
                                                            • +
                                                            • 導入のどの手順にも sudo は要りません。理由は ADR-02 にあります。
                                                            • +
                                                            +

                                                            5. 節目のはしご

                                                            +

                                                            「節目(マイルストーン)」は合否の試験がある関門です。「セキュリティ門」はそのビルドを導入してよいかを決める試験で、節目ごとに厳しくなります(ADR-03)。

                                                            +
                                                            milestones[5]{id,goal,security_gate}:
                                                            +  M1,"docs の骨格・manifest・dev2027 リポジトリ群がある。レビュー済み PR が develop にマージ済み","報告+許容リスト"
                                                            +  M2,"コア 6 本が Mac Studio で一発導入。Playwright 受入合格。amd64 ビルド確認","報告+許容リスト(M1 より件数を減らす)"
                                                            +  M3,"サブシステム 5 本が起動。各 1 本の正常系+拒否ケース","報告+許容リスト(M2 より件数を減らす)"
                                                            +  M4,"waterbutler・mfr・osf.io を Python 3.13 へ","HIGH 以上で停止。AI レッドチーム初回"
                                                            +  M5,"ES2・mongo 廃止。ES8+postgres 15 以降。海外配布可","CRITICAL/HIGH ゼロ。AI レッドチームの未解決経路ゼロ"
                                                            +

                                                            6. 役割

                                                            +

                                                            役割の略称は AGENTS.md の対応表に従います。「AI エージェント」は、指示を読み、コードや文書を書き、結果を報告するプログラムです。

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            略称誰何をする
                                                            AID(AI開発担当者)Orca の Open Code 2 ワーカー(ローカル LLM)仕様どおりに実装する。文書とコードを PR で出す
                                                            QAE(QA担当)Claude Code Fable仕様を書く。実装を検査する。回帰・受入試験を実行し判定する
                                                            REV(担当レビュワ)Codex Astra全 PR の独立レビュー。結果を docs/reviews/ と PR コメントに残す
                                                            所有者人方針を決める。受け入れる。マージし公開する
                                                            +

                                                            検出、修正 PR、レビュー、自動試験までは人が介在しません。マージと公開は必ず所有者が行います(ADR-04)。

                                                            +

                                                            7. 仕様の索引

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            IDファイル一行説明
                                                            SPEC-0101_manifest.mdマニフェスト。インストーラーが組む上流のコミットと PR
                                                            SPEC-0202_installer_cli.mdgrdm-dev CLI と install.sh。ホスト判定・秘密・compose・ビルド・健康確認・報告
                                                            SPEC-0303_security_gate.mdSBOM、CVE スキャン、静的解析、ZAP、AI レッドチームと節目ごとの基準
                                                            SPEC-0404_acceptance_tests.mdPlaywright Python の受入。機能ごとの正常系と拒否ケース
                                                            SPEC-0505_upstream_tracking.md日次ミラーと差分報告、週次の AI 統合 PR、COS の参照追跡
                                                            SPEC-0606_documentation_conventions.mdすべての文書の書き方
                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            ContainerA box that holds one program and everything it needs, so it runs the same anywhere.一つのプログラムと必要なものを一箱に入れ、どこでも同じように動かす箱。
                                                            Base imageThe ready-made operating-system layer a program is built on.プログラムを載せる土台になる、できあいの OS の層。
                                                            UpstreamThe original repository we copy code from.コードを写してくる元のリポジトリ。
                                                            Tracking branchA read-only copy of a branch that lives somewhere else.他の場所にあるブランチの読み取り専用の写し。
                                                            SHAThe 40-character fingerprint that names one commit.一つのコミットを指す 40 文字の指紋。
                                                            Loopback / 127.0.0.1The network address that means "this computer only".「このコンピュータだけ」を意味する番地。
                                                            Security gateThe test that decides whether a build may be installed.ビルドを導入してよいかを決める試験。
                                                            MilestoneA checkpoint with a pass/fail test.合否の試験がある関門。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/spec/01_manifest/index.html b/site/spec/01_manifest/index.html new file mode 100644 index 0000000..d449435 --- /dev/null +++ b/site/spec/01_manifest/index.html @@ -0,0 +1,3348 @@ + + + + + + + + + + + + + + + + + + + + + + + SPEC-01 Upstream Manifest / 上流マニフェスト - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            SPEC-01 Upstream Manifest / 上流マニフェスト

                                                            +
                                                            +

                                                            Summary: The manifest is the single source of truth for what the installer builds: every component, its upstream repositories pinned to exact commits, the pull requests we adopt, the base and target images, and the profiles and platforms. This page defines its schema, its rules, and the checks that grdm-dev manifest check runs. +概要: マニフェストは「インストーラーが何を組むか」の唯一の正本です。全部品、固定したコミットの上流、採用する PR、現行と目標のイメージ、プロファイルと対応アーキテクチャを持ちます。この文書はその形、規則、grdm-dev manifest check の検査項目を定めます。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.5 — 2026-11-05. Learned: the second real install on Apple Silicon showed that a Dockerfile whose base image is a schema-1 manifest cannot be built by current Docker at all, so a digest-pinned prebuilt_image fallback is needed per component, with a note and an M4 removal date, because it bypasses the build-from-pinned-source guarantee. / Apple Silicon での二度目の実導入で、ベースイメージが schema 1 のマニフェストである Dockerfile は現行 Docker ではまったく組めないと分かった。だから「固定した元から組む」保証を外す代わりに、理由と M4 での撤去を書いた note を伴うダイジェスト固定の prebuilt_image が部品ごとに要る。 + 0.4 — 2026-11-05. Learned: the first real build on Apple Silicon showed that an EOL Python 3.5 base cannot install pandas 0.25.1 for arm64, so a per-component build_platform is needed until M4 modernizes those images. / Apple Silicon での最初の実ビルドで、EOL の Python 3.5 ベースは arm64 向け pandas 0.25.1 を入れられないと分かった。M4 で近代化するまで部品ごとの build_platform が要る。 + 0.3 — 2026-11-05. Learned: building from "the tip of develop" is not reproducible unless the manifest pins that tip, so each component needs an integration_sha (nullable until the first strict merge). / 「develop の先端」から組むのでは再現できないため、各部品に integration_sha(最初の厳密マージまでは null 可)が要ると分かった。 + 0.2 — 2026-11-05. Learned: a TOON block that is only an example must say so, or readers and the checker treat it as data that has to stay in step with the JSON. / 例にすぎない TOON ブロックはそう明記しないと、読者も検査も JSON と一致させるべきデータとして扱ってしまうと分かった。
                                                            • +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: the public osf.io develop (2026-11-05) is already newer than its -private twin (2026-11-02), so "the latest" is not one answer; only a file that pins each upstream to a SHA can say what "consistent" means. / 公開 osf.io の develop(2026-11-05)は -private(2026-11-02)より既に新しく、「最新」は一つに決まらない。各上流を SHA で固定したファイルがあってこそ「矛盾なく」を定義できると分かった。
                                                            • +
                                                            • Normative for: manifest/upstreams.json (canonical), manifest/upstreams.toon (excerpt), manifest/README.md, the manifest subcommand of grdm-dev (SPEC-02), and every document that quotes the manifest.
                                                            • +
                                                            • Related: SPEC-00 Overview · SPEC-05 Upstream tracking · SPEC-06 Documentation conventions · POL-01 Position · ADR-01 Integration repository placement · ADR-03 Staged security gate · docs/README.md
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            1. What the manifest is

                                                            +

                                                            A manifest is a packing list: it says exactly what goes into the box. Ours says, for every component of the environment (SPEC-00 §2), which upstream repositories (the original places we copy code from) are combined, at which SHA (the 40-character fingerprint of one commit), and which pull requests (PRs, proposed changes waiting to be merged) we add on top.

                                                            +

                                                            The installer reads the manifest and nothing else to decide what to build. If a fact is not in the manifest, the installer does not know it.

                                                            +

                                                            2. Files

                                                            + + + + + + + + + + + + + + + + + + + + + +
                                                            FileRole
                                                            manifest/upstreams.jsonCanonical. The only file machines trust. JSON, UTF-8, two-space indent, keys sorted.
                                                            manifest/upstreams.toonExcerpt in TOON (a compact text form of JSON that people read easily; SPEC-06 §4). Generated from the JSON by grdm-dev manifest toon. Must always equal the JSON.
                                                            manifest/README.mdExplains the two files for readers, bilingual.
                                                            +

                                                            The excerpt contains the top-level fields and, for every component, id, role, integration_repo, profile, every field of upstreams[], and adopted_prs[] reduced to repo, number, status. It omits candidate_prs, images, services, and platforms. Other files under manifest/ (allowlist.json, allowlist.baseline.json, milestone.json, hardening.json, redteam-targets.json) are defined by SPEC-03; their file list is in SPEC-02 §9.

                                                            +
                                                            +

                                                            Warning: This repository is public. The manifest contains repository names and SHAs only. It never contains URLs to private repositories, access tokens, or code fragments from -private repositories. The CI secret scan fails the PR if it finds any.

                                                            +
                                                            +

                                                            3. Schema

                                                            +

                                                            The top level has schema_version (integer, currently 1), generated_at (ISO date), an optional note (free text), and components[]. Infrastructure images (databases, queues, fakecas) are components with role: infra. Each component has:

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            FieldTypeMeaning
                                                            idstringShort name, same as in SPEC-00 §2. Unique.
                                                            rolecore | infra | subsystemWhat kind of component. COS repositories are not components; they appear as upstreams[] entries with kind: cos.
                                                            services[]listThe Compose service names the component provides, as used in SPEC-02 §4 (for example web, api, admin, worker for osf.io). Never empty.
                                                            integration_repostring or nullName of the private integration repository, RDM-<name>-dev2027. Name only, never a URL. null for infra.
                                                            integration_branchstring or nullAlways develop; null for infra.
                                                            integration_shastring (40 hex) or nullThe commit at the tip of the integration branch develop that this manifest pins. grdm-dev build and compose render use it for image tags. May be null until the strict reconstruction PRs are merged; required for M2 acceptance.
                                                            build_platformstring or absentPlatform used to build and run this component's image, for example linux/amd64. Absent means the host platform. grdm-dev build --platform overrides it. Components whose EOL base has no arm64 wheels (modular-file-renderer, ember-osf-web, cas-overlay until M4) set linux/amd64; Compose then runs them under emulation. Must be null or absent for infra.
                                                            prebuilt_imagestring or absentA registry image reference pinned by digest (name@sha256:<64 hex>, for example niicloudoperation/rdm-ember-osf-web@sha256:…) that is run instead of building from the integration repository. Allowed only together with a note that says why the build is impossible and until which milestone the fallback stays; never a URL or a private-repository reference; not allowed for infra. grdm-dev build records the component as prebuilt, pulls the reference and does not clone or build; compose render writes it as image: (with platform: from build_platform); scan treats it like any other compose image. A prebuilt image bypasses the "build from pinned source" guarantee of this specification: nobody can show which commits are inside it. It is a temporary measure for M2 and must be removed by M4. Current use: ember-osf-web, whose Dockerfile base quay.io/centerforopenscience/ember-base is a Docker image manifest v2 schema 1 image that current Docker refuses to pull.
                                                            upstreams[]listEach: repo (name), branch, kind (public | private | cos), tracking_branch (named by rule 7), status (merged | reference | candidate), sha (40 lowercase hex), fetched_at (ISO date). Empty for infra.
                                                            adopted_prs[]listEach: repo, number, title, reason, status (adopted). PRs applied on top of the merged upstreams.
                                                            candidate_prs[]listSame shape; status is candidate or rejected. Not built.
                                                            base_imagestringThe image the component builds from today (for example python:3.6-slim). For infra, the image that is run.
                                                            base_image_digeststring or nullThe sha256: digest of base_image once pinned (SPEC-03 §3.4); null until then.
                                                            target_imageobjectKeys M4 and M5, each the image planned at that milestone (a milestone is a checkpoint; SPEC-00 §5), or null when nothing changes at that milestone.
                                                            profileminimum | core | fullThe smallest installer profile that includes the component (SPEC-02 §4).
                                                            platforms[]listSubset of linux/arm64, linux/amd64.
                                                            notestring or nullOptional free text (for example "mutually exclusive with fakecas").
                                                            +

                                                            Example for one component, in TOON:

                                                            +
                                                            schema_version: 1
                                                            +generated_at: 2026-11-05
                                                            +note: "Names and SHAs only."
                                                            +components[1]:
                                                            +  - id: waterbutler
                                                            +    role: core
                                                            +    services[2]: wb,wb_worker
                                                            +    integration_repo: RDM-waterbutler-dev2027
                                                            +    integration_branch: develop
                                                            +    upstreams[3]{repo,branch,kind,tracking_branch,status,sha,fetched_at}:
                                                            +      RDM-waterbutler,develop,public,upstream/public-develop,merged,0000000000000000000000000000000000000000,2026-11-05
                                                            +      RDM-waterbutler-develop-private,develop,private,upstream/private-develop,merged,0000000000000000000000000000000000000000,2026-11-05
                                                            +      CenterForOpenScience/waterbutler,develop,cos,upstream/cos-develop,reference,0000000000000000000000000000000000000000,2026-11-05
                                                            +    adopted_prs[1]{repo,number,title,reason,status}:
                                                            +      RDM-waterbutler,101,"Python 3.13, dependency update, multi-stage image (WIP)","vulnerability remediation (M4)",adopted
                                                            +    candidate_prs[1]{repo,number,title,reason,status}:
                                                            +      RDM-waterbutler,93,"S3 SigV4",feature,candidate
                                                            +    base_image: python:3.6-slim-buster
                                                            +    base_image_digest: null
                                                            +    target_image:
                                                            +      M4: "python:3.13-slim multi-stage, non-root"
                                                            +      M5: null
                                                            +    profile: core
                                                            +    platforms[2]: linux/arm64,linux/amd64
                                                            +    note: null
                                                            +

                                                            The all-zero SHAs above are placeholders for the example only; a real manifest never contains them. The block is an illustrative example, not a mirror of manifest/upstreams.json, so it carries no <!-- canonical: ... --> declaration (SPEC-06 §4); blocks that do mirror the manifest (for example in SPEC-00 §2) declare it.

                                                            +

                                                            4. Rules

                                                            +
                                                              +
                                                            1. SHAs are pinned. Every upstreams[].sha is a real 40-character commit that exists on the named branch at fetched_at. Branch names alone are never enough.
                                                            2. +
                                                            3. A change to the manifest is a PR. Nobody edits upstreams.json on develop directly. The weekly integration PR (SPEC-05 §3) is the normal way SHAs move. Adopting or rejecting a PR is also a manifest PR, with the reason filled in.
                                                            4. +
                                                            5. Integration order is fixed: merge the public upstream with status: merged, then the private one, then apply adopted_prs in list order. A component that has no public upstream (the private subsystems) starts from its private upstream. The cos upstream (status: reference) is never merged; it is compared.
                                                            6. +
                                                            7. "Consistent" (矛盾なく) means all of the following:
                                                            8. +
                                                            9. No two components reference two different SHAs of the same upstream repository and branch.
                                                            10. +
                                                            11. Every adopted_prs[] entry applies cleanly (no conflict) on the integration branch built from the pinned upstreams.
                                                            12. +
                                                            13. upstreams.toon is byte-for-byte what grdm-dev manifest toon produces from upstreams.json.
                                                            14. +
                                                            15. Every integration_repo named exists and has the branch develop plus one tracking branch per upstreams[] entry, named exactly as its tracking_branch.
                                                            16. +
                                                            17. Names only. repo and integration_repo are bare names (RDM-osf.io-dev2027). A value starting with http, git@, or containing github.com is invalid.
                                                            18. +
                                                            19. Undecided upstreams are listed with status: candidate. They are mirrored to their tracking branch but not merged. Example: RDM-osf.io-private (branch fix/sec-test, tracking branch upstream/private-sec-test-fix-sec-test) is a candidate until the owner decides (plan §7).
                                                            20. +
                                                            21. Tracking branches are named by one rule: upstream/<kind>-<branch>, where <branch> is the upstream branch name with every / replaced by -. When one component lists two upstreams of the same kind, the second inserts a short tag after the kind: upstream/<kind>-<tag>-<branch>. Examples: RDM-ember-osf-web (master) → upstream/public-master; RDM-ember-osf-web-master-private → upstream/private-master; RDM-OASys-main-private → upstream/private-main; CenterForOpenScience/osf.io → upstream/cos-develop; RDM-osf.io-private (fix/sec-test) → upstream/private-sec-test-fix-sec-test. The same rule is stated in SPEC-05 §1 and ADR-01 §3.
                                                            22. +
                                                            +

                                                            5. Validation: grdm-dev manifest check

                                                            +

                                                            Run from the repository root. Exit code 0 means pass; any failure prints one line per finding and exits 20 (manifest invalid, SPEC-02 §6).

                                                            +
                                                            grdm-dev manifest check
                                                            +
                                                            +

                                                            Checks, in order:

                                                            +
                                                            checks[13]{id,rule,severity}:
                                                            +  MC-01,"upstreams.json parses as JSON and matches schema_version 1",error
                                                            +  MC-02,"every component id is unique and matches ^[A-Za-z0-9_.-]+$",error
                                                            +  MC-03,"role is one of core|infra|subsystem; services is a non-empty list",error
                                                            +  MC-04,"integration_repo matches ^RDM-[A-Za-z0-9_.-]+-dev2027$ or is null for infra",error
                                                            +  MC-05,"integration_branch is develop, or null for infra",error
                                                            +  MC-06,"every sha matches ^[0-9a-f]{40}$; base_image_digest is null or sha256:<64 hex>; fetched_at is an ISO date not in the future; prebuilt_image, when present, is name@sha256:<64 hex>, has a non-empty note, is not a URL or private-repository reference, and is not on infra",error
                                                            +  MC-07,"no value anywhere contains http, git@, github.com, or a token-like string",error
                                                            +  MC-08,"the same (repo, branch) pair has one sha across all components",error
                                                            +  MC-09,"adopted_prs status is adopted; candidate_prs status is candidate|rejected; upstreams status is merged|reference|candidate and cos upstreams are reference; number is a positive integer",error
                                                            +  MC-10,"profile and platforms use only the allowed values; core components list both platforms",error
                                                            +  MC-11,"upstreams.toon equals the output of grdm-dev manifest toon",error
                                                            +  MC-12,"with --remote: each integration_repo has develop plus every tracking_branch listed, and each sha is reachable from its tracking_branch",error
                                                            +  MC-13,"every tracking_branch follows rule 7 (upstream/<kind>[-<tag>]-<branch with / replaced by ->)",error
                                                            +

                                                            --remote needs network and credentials and is run in the private -dev2027 CI, not in this public repository's CI. The documentation check in SPEC-06 §8 reuses MC-11 for TOON blocks quoted in documents.

                                                            +

                                                            6. Who changes it

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            ChangeOpened byReviewed byMerged by
                                                            Weekly SHA advanceAID agent (weekly job, SPEC-05)REV (Codex Astra), check by QAE (Claude Code Fable)Owner
                                                            Adopt / reject a PRAID or QAE, with reasonREVOwner
                                                            Change target_imageQAE, referencing the milestone planREVOwner
                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            1. マニフェストとは

                                                            +

                                                            「マニフェスト」は荷物の明細書です。箱に何が入るかを正確に書きます。私たちのマニフェストは、環境の全部品(SPEC-00 §2)について、どの上流(コードを写してくる元のリポジトリ)を、どの SHA(一つのコミットを指す 40 文字の指紋)で重ね、どの PR(プルリクエスト。マージを待っている変更の提案)をその上に足すかを書きます。

                                                            +

                                                            インストーラーは何を組むかをマニフェストだけから決めます。マニフェストに無いことは、インストーラーは知りません。

                                                            +

                                                            2. ファイル

                                                            + + + + + + + + + + + + + + + + + + + + + +
                                                            ファイル役割
                                                            manifest/upstreams.json正本。 機械が信じる唯一のファイル。JSON、UTF-8、字下げ 2 つ、キーは並べ替え済み。
                                                            manifest/upstreams.toonTOON(JSON を人が読みやすい短い文字形式にしたもの。SPEC-06 §4)の 抄録。grdm-dev manifest toon が JSON から生成する。常に JSON と一致していなければならない。
                                                            manifest/README.md二つのファイルを読者向けに二言語で説明する。
                                                            +

                                                            抄録には、最上位の項目と、各部品の id・role・integration_repo・profile、upstreams[] の全項目、そして repo・number・status に絞った adopted_prs[] を載せます。candidate_prs、イメージ、サービス、platform は載せません。manifest/ の下のほかのファイル(allowlist.json、allowlist.baseline.json、milestone.json、hardening.json、redteam-targets.json)は SPEC-03 が定め、一覧は SPEC-02 §9 にあります。

                                                            +
                                                            +

                                                            Warning: このリポジトリは公開です。マニフェストには リポジトリ名と SHA だけ を書きます。非公開リポジトリの URL、アクセストークン、-private 由来のコード断片は決して書きません。CI の秘密スキャンが見つけたら PR は不合格です。

                                                            +
                                                            +

                                                            3. 形(スキーマ)

                                                            +

                                                            最上位は schema_version(整数。今は 1)、generated_at(ISO 日付)、任意の note(自由記述)、components[] です。基盤のイメージ(データベース、キュー、fakecas)も role: infra の部品として載せます。各部品は次を持ちます。

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            項目型意味
                                                            id文字列短い名前。SPEC-00 §2 と同じ。重複しない。
                                                            rolecore | infra | subsystem部品の種類。COS のリポジトリは部品ではなく、kind: cos の upstreams[] 要素として現れる。
                                                            services[]配列その部品が提供する Compose のサービス名。SPEC-02 §4 と同じ名前(例: osf.io は web、api、admin、worker)。空にしない。
                                                            integration_repo文字列または null非公開の統合リポジトリの名前 RDM-<name>-dev2027。名前だけで URL は書かない。infra は null。
                                                            integration_branch文字列または null常に develop。infra は null。
                                                            integration_sha文字列(40 桁の 16 進)または nullこのマニフェストが固定する統合ブランチ develop の先端のコミット。grdm-dev build と compose render はこの値をイメージのタグに使う。厳密再構築 PR のマージ前は null でよいが、M2 の受入では必須。
                                                            build_platform文字列または省略この部品のイメージを組んで動かすプラットフォーム。例: linux/amd64。省略時はホストと同じ。grdm-dev build --platform が優先する。EOL ベースで arm64 の wheel がない部品(M4 までの modular-file-renderer・ember-osf-web・cas-overlay)は linux/amd64 を指定し、Compose はエミュレーションで動かす。infra では null か省略。
                                                            prebuilt_image文字列または省略統合リポジトリから組む 代わりに 動かす、ダイジェストで固定したレジストリのイメージ参照(name@sha256:<16 進 64 文字>。例: niicloudoperation/rdm-ember-osf-web@sha256:…)。なぜ組めないか、どの節目までこの代替を続けるかを書いた note と一緒にしか書けない。URL や非公開リポジトリの参照は不可。infra には使えない。grdm-dev build はその部品を prebuilt として記録し、参照を pull するだけで clone も build もしない。compose render はそれを image: に書き(platform: は build_platform から)、scan はほかの Compose イメージと同じに扱う。事前ビルド済みイメージは、この仕様の「固定した元から組む」保証を外す。中にどのコミットが入っているかを誰も示せない。 M2 のための一時措置であり、M4 までに必ず外す。現在の使用: ember-osf-web。その Dockerfile のベース quay.io/centerforopenscience/ember-base は Docker image manifest v2 schema 1 のイメージで、現行の Docker は pull を拒否する。
                                                            upstreams[]配列各要素: repo(名前)、branch、kind(public | private | cos)、tracking_branch(規則 7 で命名)、status(merged | reference | candidate)、sha(小文字 16 進 40 文字)、fetched_at(ISO 日付)。infra は空。
                                                            adopted_prs[]配列各要素: repo、number、title、reason、status(adopted)。上流をマージした上に適用する PR。
                                                            candidate_prs[]配列同じ形。status は candidate か rejected。組まない。
                                                            base_image文字列その部品が今日組む元のイメージ(例 python:3.6-slim)。infra では実行するイメージ。
                                                            base_image_digest文字列または nullbase_image を固定したときの sha256: ダイジェスト(SPEC-03 §3.4)。固定するまでは null。
                                                            target_imageオブジェクトキー M4 と M5。各節目(合否の試験がある関門。SPEC-00 §5)で予定するイメージ。その節目で変えないなら null。
                                                            profileminimum | core | fullその部品を含む最小のインストーラープロファイル(SPEC-02 §4)。
                                                            platforms[]配列linux/arm64、linux/amd64 の部分集合。
                                                            note文字列または null任意の自由記述(例:「fakecas と排他」)。
                                                            +

                                                            一部品の例を TOON で示します。

                                                            +
                                                            schema_version: 1
                                                            +generated_at: 2026-11-05
                                                            +note: "Names and SHAs only."
                                                            +components[1]:
                                                            +  - id: waterbutler
                                                            +    role: core
                                                            +    services[2]: wb,wb_worker
                                                            +    integration_repo: RDM-waterbutler-dev2027
                                                            +    integration_branch: develop
                                                            +    upstreams[3]{repo,branch,kind,tracking_branch,status,sha,fetched_at}:
                                                            +      RDM-waterbutler,develop,public,upstream/public-develop,merged,0000000000000000000000000000000000000000,2026-11-05
                                                            +      RDM-waterbutler-develop-private,develop,private,upstream/private-develop,merged,0000000000000000000000000000000000000000,2026-11-05
                                                            +      CenterForOpenScience/waterbutler,develop,cos,upstream/cos-develop,reference,0000000000000000000000000000000000000000,2026-11-05
                                                            +    adopted_prs[1]{repo,number,title,reason,status}:
                                                            +      RDM-waterbutler,101,"Python 3.13, dependency update, multi-stage image (WIP)","vulnerability remediation (M4)",adopted
                                                            +    candidate_prs[1]{repo,number,title,reason,status}:
                                                            +      RDM-waterbutler,93,"S3 SigV4",feature,candidate
                                                            +    base_image: python:3.6-slim-buster
                                                            +    base_image_digest: null
                                                            +    target_image:
                                                            +      M4: "python:3.13-slim multi-stage, non-root"
                                                            +      M5: null
                                                            +    profile: core
                                                            +    platforms[2]: linux/arm64,linux/amd64
                                                            +    note: null
                                                            +

                                                            上の全部ゼロの SHA は例のための仮の値です。本物のマニフェストには現れません。このブロックは説明のための例であって manifest/upstreams.json の写しではないので、<!-- canonical: ... --> の宣言は付けません(SPEC-06 §4)。マニフェストを写すブロック(たとえば SPEC-00 §2)には宣言を付けます。

                                                            +

                                                            4. 規則

                                                            +
                                                              +
                                                            1. SHA を固定する。 すべての upstreams[].sha は、fetched_at の時点でそのブランチに実在する 40 文字のコミットです。ブランチ名だけでは足りません。
                                                            2. +
                                                            3. マニフェストの変更は PR で行う。 develop 上の upstreams.json を直接編集する人はいません。SHA が進む通常の経路は週次の統合 PR(SPEC-05 §3)です。PR の採用・却下もマニフェストの PR で、reason を書きます。
                                                            4. +
                                                            5. 統合の順番は固定: status: merged の public の上流をマージ、次に private の上流をマージ、最後に adopted_prs を並び順に適用。public の上流がない部品(非公開サブシステム)は private の上流から始めます。cos の上流(status: reference)はマージせず、比較だけに使います。
                                                            6. +
                                                            7. 「矛盾なく」とは次のすべてを満たすこと:
                                                            8. +
                                                            9. 同じ上流リポジトリの同じブランチについて、二つの部品が異なる SHA を参照していない。
                                                            10. +
                                                            11. すべての adopted_prs[] が、固定した上流から組んだ統合ブランチにきれいに(衝突なく)当たる。
                                                            12. +
                                                            13. upstreams.toon が、grdm-dev manifest toon が upstreams.json から出す結果と 1 バイトも違わない。
                                                            14. +
                                                            15. 名前を書いた integration_repo がすべて存在し、develop と、upstreams[] の各要素につき一本の追跡ブランチ(名前はその tracking_branch と完全に同じ)を持つ。
                                                            16. +
                                                            17. 名前だけを書く。 repo と integration_repo は裸の名前(RDM-osf.io-dev2027)です。http や git@ で始まる値、github.com を含む値は不正です。
                                                            18. +
                                                            19. 決まっていない上流は status: candidate で載せる。 追跡ブランチにはミラーするが、マージはしない。例: RDM-osf.io-private(ブランチ fix/sec-test、追跡ブランチ upstream/private-sec-test-fix-sec-test)は所有者が決めるまで候補です(計画書 §7)。
                                                            20. +
                                                            21. 追跡ブランチの名前は一つの規則で決める: upstream/<kind>-<branch>。<branch> は上流のブランチ名の / をすべて - に置き換えたもの。一つの部品に同じ kind の上流が二つあるときは、二つ目は kind の後ろに短いタグを挟む: upstream/<kind>-<tag>-<branch>。例: RDM-ember-osf-web(master)→ upstream/public-master、RDM-ember-osf-web-master-private → upstream/private-master、RDM-OASys-main-private → upstream/private-main、CenterForOpenScience/osf.io → upstream/cos-develop、RDM-osf.io-private(fix/sec-test)→ upstream/private-sec-test-fix-sec-test。同じ規則を SPEC-05 §1 と ADR-01 §3 にも書いています。
                                                            22. +
                                                            +

                                                            5. 検査: grdm-dev manifest check

                                                            +

                                                            リポジトリのルートで実行します。終了コード 0 が合格。不合格なら指摘ごとに一行出して 20(manifest が不正。SPEC-02 §6)で終わります。

                                                            +
                                                            grdm-dev manifest check
                                                            +
                                                            +

                                                            検査は次の順で行います。

                                                            +
                                                            checks[13]{id,rule,severity}:
                                                            +  MC-01,"upstreams.json が JSON として読め、schema_version 1 の形に合う",error
                                                            +  MC-02,"部品の id が重複せず ^[A-Za-z0-9_.-]+$ に合う",error
                                                            +  MC-03,"role が core|infra|subsystem のいずれか。services が空でない配列",error
                                                            +  MC-04,"integration_repo が ^RDM-[A-Za-z0-9_.-]+-dev2027$ に合う。infra は null",error
                                                            +  MC-05,"integration_branch が develop。infra は null",error
                                                            +  MC-06,"sha が ^[0-9a-f]{40}$ に合う。base_image_digest は null か sha256:<16 進 64 文字>。fetched_at が未来でない ISO 日付。prebuilt_image があるときは name@sha256:<16 進 64 文字> で、空でない note を伴い、URL や非公開リポジトリの参照でなく、infra に無い",error
                                                            +  MC-07,"どの値にも http、git@、github.com、トークンらしい文字列が含まれない",error
                                                            +  MC-08,"同じ (repo, branch) の組は全部品で一つの sha",error
                                                            +  MC-09,"adopted_prs の status は adopted。candidate_prs は candidate|rejected。upstreams の status は merged|reference|candidate で cos は reference。number は正の整数",error
                                                            +  MC-10,"profile と platforms が許された値だけ。core の部品は両 platform を持つ",error
                                                            +  MC-11,"upstreams.toon が grdm-dev manifest toon の出力と一致",error
                                                            +  MC-12,"--remote 付き: 各 integration_repo が develop と列挙した全 tracking_branch を持ち、各 sha がその tracking_branch から到達できる",error
                                                            +  MC-13,"すべての tracking_branch が規則 7(upstream/<kind>[-<tag>]-<branch の / を - に置換>)に合う",error
                                                            +

                                                            --remote はネットワークと認証情報が要るので、公開であるこのリポジトリの CI ではなく、非公開の -dev2027 側の CI で実行します。SPEC-06 §8 の文書検査は、文書内に引用した TOON ブロックに MC-11 を使い回します。

                                                            +

                                                            6. 誰が変えるか

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            変更起票レビューマージ
                                                            週次の SHA 前進AID エージェント(週次ジョブ。SPEC-05)REV(Codex Astra)。検査は QAE(Claude Code Fable)所有者
                                                            PR の採用・却下AID または QAE。reason 付きREV所有者
                                                            target_image の変更QAE。節目の計画を参照REV所有者
                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            ManifestA packing list that says exactly what goes into the build.ビルドに何が入るかを正確に書いた明細書。
                                                            UpstreamThe original repository we copy code from.コードを写してくる元のリポジトリ。
                                                            SHAThe 40-character fingerprint that names one commit.一つのコミットを指す 40 文字の指紋。
                                                            Pull request (PR)A proposed change waiting to be reviewed and merged.レビューとマージを待つ変更の提案。
                                                            SchemaThe agreed shape of a data file: which fields, which types.データファイルの決まった形。どの項目がどの型か。
                                                            ProfileA named set of components the installer starts together.インストーラーがまとめて起動する部品の組に付けた名前。
                                                            TokenA secret string that proves who you are to a computer.コンピュータに「自分は誰か」を示す秘密の文字列。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/spec/02_installer_cli/index.html b/site/spec/02_installer_cli/index.html new file mode 100644 index 0000000..e6b2f88 --- /dev/null +++ b/site/spec/02_installer_cli/index.html @@ -0,0 +1,3671 @@ + + + + + + + + + + + + + + + + + + + + + + + SPEC-02 Installer CLI / インストーラー CLI - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            SPEC-02 Installer CLI / インストーラー CLI

                                                            +
                                                            +

                                                            Summary: The contract of the two entry points that install the GakuNin RDM developer environment: the thin bootstrap installer/install.sh and the Python command grdm-dev with its subcommands, profiles, flags, exit codes, and directory layout. +概要: GakuNin RDM 開発環境を導入する二つの入口、薄い起動スクリプト installer/install.sh と Python コマンド grdm-dev の契約。サブコマンド、プロファイル、フラグ、終了コード、ディレクトリ構成を定める。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.3 — 2026-11-05. Learned: secrets rotate had to become a coordinated database-password change plus container recreation, because restart keeps the old environment and leaves the captured credential valid (PR #21 review r1). / restart は旧い環境を保つため、捕られた資格情報が有効なまま残る。secrets rotate は DB パスワードの変更とコンテナ再作成を束ねた手順にする必要があると分かった(PR #21 レビュー r1)。 + 0.2 — 2026-11-05. Learned: a profile table and the acceptance criteria that depend on it must change together, and a TOON row whose text contains a comma or a colon must be quoted or the parser sees extra columns. / プロファイル表と、それに依存する受入基準は同時に変えなければならず、カンマやコロンを含む TOON の行は引用符で囲まないと列が増えて解析に失敗すると分かった。
                                                            • +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: keeping the shell part to a bootstrap and putting every decision in one Python command is the only way to make the OS differences, the manifest check, and the reports testable with unittest. / シェルは起動だけに留め、判断をすべて一つの Python コマンドに集めないと、OS の違い・manifest の整合・報告書を unittest で試験できないと分かった。
                                                            • +
                                                            • Normative for: installer/install.sh, installer/grdm_dev/, installer/tests/, runtime/.
                                                            • +
                                                            • Related: SPEC-00 Overview · SPEC-01 Manifest · SPEC-03 Security Gate · SPEC-04 Acceptance Tests · SPEC-05 Upstream Tracking · SPEC-06 Documentation Conventions · ADR-02 Network Model · ADR-03 Staged Security Gate · POL-01 Position · docs/README.md
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            1. Scope and goal

                                                            +

                                                            The installer turns a fresh checkout of this repository into a running GakuNin RDM developer environment with one command, on the hosts listed in §8. It never needs sudo (a way to run a command as the computer's administrator), never changes network settings on the host, and can be run again at any time without harm. Everything it creates lives under runtime/, which is ignored by Git.

                                                            +

                                                            Glossary notes. An installer is a program that prepares other programs so they can run. A CLI (command line interface) is a program you drive by typing commands. A container is a box that holds one program and everything it needs, so it runs the same on any computer. Docker Compose is the tool that starts many containers together from one description file. A manifest is the list that says exactly which version of each source repository we use (SPEC-01).

                                                            +

                                                            2. Two entry points

                                                            +

                                                            2.1 installer/install.sh — thin bootstrap

                                                            +

                                                            install.sh does four things and nothing else:

                                                            +
                                                              +
                                                            1. Runs with the bash that ships with macOS (version 3.2), so it uses no feature newer than that: no associative arrays, no mapfile, no ${var,,}.
                                                            2. +
                                                            3. Finds python3 and checks that it is 3.11 or newer. If not, it prints how to install one for the detected OS and exits with code 10.
                                                            4. +
                                                            5. Creates a virtual environment (a private folder of Python and its libraries, separate from the system) at .venv/ and installs the installer/ package into it with pip install -e installer.
                                                            6. +
                                                            7. Hands every argument to .venv/bin/grdm-dev install "$@" and exits with that command's exit code.
                                                            8. +
                                                            +

                                                            OS differences are not written in install.sh. They live in installer/grdm_dev/host.py. User-facing messages come from installer/grdm_dev/messages.tsv (one line per code, English and Japanese columns) so that the script and the Python command say the same thing.

                                                            +
                                                            flowchart TD
                                                            +  A[./installer/install.sh --yes] --> B{python3 >= 3.11?}
                                                            +  B -- no --> X10[exit 10: how to install Python]
                                                            +  B -- yes --> C[create .venv/ and pip install -e installer]
                                                            +  C --> D[grdm-dev doctor]
                                                            +  D -- unsupported host --> X10b[exit 10]
                                                            +  D -- Docker missing --> X11[exit 11]
                                                            +  D --> E[grdm-dev plan]
                                                            +  E -- manifest invalid --> X20[exit 20]
                                                            +  E --> F[grdm-dev secrets init]
                                                            +  F --> G[grdm-dev compose render]
                                                            +  G --> H[grdm-dev build]
                                                            +  H -- failed --> X30[exit 30]
                                                            +  H --> I[grdm-dev up]
                                                            +  I --> J[grdm-dev health --network]
                                                            +  J -- failed --> X40[exit 40]
                                                            +  J --> K[grdm-dev scan]
                                                            +  K -- gate failed --> X50[exit 50]
                                                            +  K --> L[grdm-dev report]
                                                            +  L --> Z[exit 0 and print URL http://127.0.0.1:5000]
                                                            +

                                                            2.2 grdm-dev — the Python command

                                                            +

                                                            grdm-dev is the package installer/grdm_dev/, exposed as a console script. Rules:

                                                            +
                                                              +
                                                            • Standard library first. The command itself has no third-party dependency. The manifest is JSON (read with json), the host is read with platform, shutil, socket, and subprocess, and the generated Compose file is written as JSON, which Docker Compose accepts because JSON is valid YAML. PyYAML is therefore not required.
                                                            • +
                                                            • Optional extra accept. pip install -e "installer[accept]" adds pytest, pytest-playwright, and playwright. Only grdm-dev accept imports them (SPEC-04).
                                                            • +
                                                            • External tools are called as subprocesses and checked by doctor: docker (27 or newer) with the Compose plugin (v2 or newer) and buildx, trivy, gitleaks, and semgrep for scan, the OWASP ZAP container image for scan --dynamic, and mkdocs for docs. A missing scanner makes scan exit 51 (SPEC-03 §8).
                                                            • +
                                                            • Every subcommand supports --json, which prints the same report as machine-readable JSON instead of TOON (a compact text form of JSON, see SPEC-06 §4).
                                                            • +
                                                            +

                                                            3. Subcommands

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            SubcommandContractTouches Docker
                                                            doctorDetects OS (macOS, Ubuntu, WSL2), CPU (arm64, amd64), memory, free disk, Docker ≥ 27, Compose plugin (v2 or newer), buildx. Prints a TOON report. Exit 10 if the host is unsupported, 11 if Docker is missing or not running.read-only
                                                            planResolves manifest + profile and prints which images would be built and which services started, with the published ports (§4). Changes nothing. Exit 20 if the manifest fails SPEC-01 checks.no
                                                            secrets init / secrets rotateinit writes random secrets (database passwords, Django secret key, CAS keys) into runtime/.env with file mode 0600. Never writes a default or example password. Refuses to overwrite an existing file unless --force. rotate regenerates every secret, changes the live PostgreSQL and RabbitMQ passwords, recreates the containers so they receive the new environment, and verifies that the old credentials are rejected; any failure restores the previous runtime/.env and exits 40. Used after a red-team capture (SPEC-03 §6).no / yes
                                                            compose renderWrites runtime/docker-compose.yml from manifest + profile: the internal network grdm plus the publishing-only grdm-edge (--egress <services> attaches more, recorded in runtime/.env; SPEC-03 §3.2), per-component platform: from the manifest's build_platform, ports published only on 127.0.0.1 (§4), non-root user: for every service, read_only, cap_drop, and resource limits (mem_limit, cpus, pids_limit) scaled from the memory doctor detected, with per-service exceptions from manifest/hardening.json (SPEC-03 §3.3), platform: chosen from doctor, named volumes mapped under runtime/volumes/. Follows ADR-02.no
                                                            buildBuilds images with docker buildx. The platform is, in order of precedence, --platform, the component's build_platform in the manifest (for example linux/amd64 for components whose EOL base cannot be built for arm64, run under emulation), otherwise the host platform; the image is loaded locally. A component with prebuilt_image (SPEC-01) is not built: the digest-pinned image is pulled and reported as prebuilt (pull-failed → exit 30). --push pushes the multi-arch manifest to ghcr.io/rcosdp/<name> (private). Exit 30 on failure.yes
                                                            up / down / resetup starts the profile and waits for health; down stops containers and keeps volumes; reset stops and deletes runtime/volumes/ after a confirmation (skipped by --yes).yes
                                                            healthChecks every service's health endpoint. With --network, also lists listening sockets on the host and fails (exit 40) if any container port is bound to a non-loopback address.read-only
                                                            scanRuns the whole security gate of SPEC-03: baseline controls, Trivy SBOM (software bill of materials: the list of all parts inside an image) and CVE list, gitleaks, Semgrep, and OWASP ZAP; writes runtime/reports/scan_<date>.json plus TOON, and diffs findings against manifest/allowlist.json and manifest/allowlist.baseline.json for the milestone in manifest/milestone.json. Gate per ADR-03: M1–M3 report only, M4 exit 50 on HIGH, M5 exit 50 on CRITICAL or HIGH. Flags --baseline, --secrets, --dynamic run one part only. Exit 51 if a scanner cannot run, 52 if --dynamic was asked for while services are unhealthy.read-only
                                                            redteam preflightVerifies, before an AI red-team run, that the attacker container of the red-team Compose project is isolated (proved with a reachable canary, see SPEC-03 §6), that only the containers named in manifest/redteam-targets.json are attached, and that the approval record is present and current. Exit 53 if either check fails. See SPEC-03 §6.yes (starts and removes a canary container and network for the probe)
                                                            acceptRuns the Playwright Python acceptance suite in the same .venv/. --only <scenario> runs one scenario; --seed creates the disposable test users. Exit 60 on any failing test. See SPEC-04.read-only
                                                            upstream mirror / upstream integrateRuns the daily mirror or the weekly integration of SPEC-05 by hand. Needs Git credentials for the private -dev2027 repositories; never run in this repository's CI.no (Git only)
                                                            manifest check / manifest tooncheck validates manifest/upstreams.json (SPEC-01 §5) and verifies that every TOON excerpt in docs/ and manifest/upstreams.toon agree with it. Exit 20 on mismatch. toon prints the excerpt that upstreams.toon must equal.no
                                                            docs build / docs checkbuild runs MkDocs into site/. check enforces SPEC-06 §8: anchors, Jump line, relative links, TOON consistency, Version line.no
                                                            reportBundles the latest reports of doctor, plan, health, scan, and accept into runtime/reports/<timestamp>.toon and .json.no
                                                            installThe sequence shown in the flowchart. Stops at the first non-zero step.yes
                                                            +

                                                            +

                                                            4. Profiles and published ports

                                                            +
                                                            profiles[3]{name,services,note}:
                                                            +  minimum,"web api postgres elasticsearch rabbitmq fakecas",smallest set that shows a login and a project page
                                                            +  core,"minimum + admin worker wb wb_worker mfr unoconv ember_osf_web cas wiki mongo sharejs elasticsearch6 redis y_websocket","the six core repositories with their infrastructure, plus y_websocket for Wiki collaborative editing"
                                                            +  full,"core + rdmcp aipf_mcp_data_grdm oasys shibboleth_sp test_idp",everything; shibboleth_sp replaces fakecas
                                                            +

                                                            Service names follow the upstream docker-compose.yml of RDM-osf.io so that existing guides keep working, and they are the services[] values of the manifest (SPEC-01 §3). The shibboleth Compose profile and the fakecas service are mutually exclusive: compose render --profile full --auth shibboleth removes fakecas and adds shibboleth_sp and test_idp; the default for full is fakecas. y_websocket belongs to core, not full, because Wiki collaborative editing is an M2 acceptance scenario (C4 in SPEC-04 §4); the manifest's profile for the y-websocket component is core accordingly (SPEC-01 §3).

                                                            +

                                                            Published ports. This table is the only place where default host ports are defined; ADR-02, SPEC-03, and REF-01 point here. Every port is published on 127.0.0.1 only.

                                                            +
                                                            ports[7]{service,host_port,profile,url}:
                                                            +  web,5000,minimum,http://127.0.0.1:5000
                                                            +  api,8000,minimum,http://127.0.0.1:8000
                                                            +  admin,8001,core,http://127.0.0.1:8001
                                                            +  wb,7777,core,http://127.0.0.1:7777
                                                            +  mfr,7778,core,http://127.0.0.1:7778
                                                            +  fakecas,8080,minimum,http://127.0.0.1:8080
                                                            +  ember_osf_web,4200,core,http://127.0.0.1:4200
                                                            +

                                                            All other services (wiki, cas, y_websocket, the subsystems, test_idp, databases and queues) are reached only inside the Compose network; when one of them needs a browser-facing port, compose render assigns it and plan prints it. compose render writes every chosen host port to runtime/.env as GRDM_PORT_<SERVICE> (upper case), which the acceptance tests read (SPEC-04 §1). If a default port is already in use (macOS AirPlay on 5000 is the known case), compose render takes the next free port and records the change in the install report; exit 12 is returned only when no free port is found.

                                                            +

                                                            5. Flags

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            FlagMeaning
                                                            --yesAnswer every question with its default. Required when no terminal is attached.
                                                            --profile minimum\|core\|fullDefault core. Saved in runtime/.env as GRDM_PROFILE and reused on later runs.
                                                            --platform linux/arm64,linux/amd64Override the platforms for build. Default: host platform only.
                                                            --no-openDo not open the browser after up.
                                                            --jsonPrint reports as JSON instead of TOON.
                                                            +

                                                            6. Exit codes

                                                            +
                                                            exit_codes[13]{code,meaning}:
                                                            +  0,success
                                                            +  2,"usage error: unknown flag or bad value"
                                                            +  10,"host unsupported: OS, CPU, memory, or Python too old"
                                                            +  11,"Docker missing, not running, or Compose / buildx plugin absent"
                                                            +  12,a required port on 127.0.0.1 is in use and no free alternative was found
                                                            +  20,manifest invalid or TOON excerpt disagrees with JSON
                                                            +  30,image build failed
                                                            +  40,"health check failed, or a port listens on a non-loopback address"
                                                            +  50,security scan gate failed for the current milestone
                                                            +  51,"scanner could not run: tool missing or vulnerability database download failed"
                                                            +  52,"services not healthy, so scan --dynamic could not run"
                                                            +  53,"red-team preflight failed: egress reachable or a target outside redteam-targets.json"
                                                            +  60,acceptance test failed
                                                            +

                                                            Numbers are never reused for a new meaning; a new cause gets a new number. The canonical table is installer/grdm_dev/messages.tsv, and this TOON block must agree with it (manifest check verifies). Codes 50–53 are described in detail in SPEC-03 §8.

                                                            +

                                                            7. Behavior rules

                                                            +
                                                              +
                                                            • Non-interactive. When stdin is not a terminal and --yes is absent, every question is answered "no" and the command exits 2 with a hint to add --yes.
                                                            • +
                                                            • Idempotent. Running any subcommand twice gives the same result. secrets init keeps existing secrets, compose render overwrites only the generated file, build uses the buildx cache, up is a no-op for healthy services.
                                                            • +
                                                            • No secrets in Git. runtime/ is in .gitignore. docs check and the CI secret scan fail if a file under runtime/ or a value that looks like a secret is committed.
                                                            • +
                                                            • No host network changes. The loopback alias 192.168.168.167 from the old guide is not created; compose render rewrites the upstream local.py and .docker-compose.*.env settings to use service names inside the Compose network and 127.0.0.1 for the browser (ADR-02).
                                                            • +
                                                            • No -private code here. The installer clones the integration repositories by name and SHA from the manifest at run time; this public repository holds no code from them (POL-01).
                                                            • +
                                                            +

                                                            +

                                                            8. Supported hosts

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            HostCPUSupport
                                                            macOS 14 or newer with Docker Desktoparm64official (M2 acceptance runs here)
                                                            Ubuntu 24.04 with Docker Engineamd64, arm64official
                                                            Windows 11 with WSL2 (Ubuntu 24.04) and Docker Desktopamd64required to work; checked in CI as build-only
                                                            Other Linux, macOS on Intelanybest-effort; doctor warns and continues
                                                            +

                                                            9. Directory layout

                                                            +
                                                            layout:
                                                            +  installer/install.sh: bash 3.2 bootstrap
                                                            +  installer/pyproject.toml: package metadata, console script grdm-dev, extra accept
                                                            +  installer/grdm_dev/:
                                                            +    cli.py: argument parsing, subcommand dispatch, exit codes
                                                            +    host.py: OS, CPU, memory, disk, Docker detection
                                                            +    manifest.py: load and validate manifest/upstreams.json, TOON comparison
                                                            +    secrets.py: random secret generation, runtime/.env with mode 0600
                                                            +    compose.py: render runtime/docker-compose.yml from manifest and profile
                                                            +    build.py: buildx wrapper, platform list, optional push
                                                            +    health.py: service health and loopback-only check
                                                            +    scan.py: baseline controls, Trivy SBOM and CVE, gitleaks, Semgrep, ZAP, allow-list diff, staged gate (SPEC-03)
                                                            +    redteam.py: red-team preflight (SPEC-03 §6)
                                                            +    upstream.py: mirror and integrate (SPEC-05)
                                                            +    accept.py: run pytest-playwright in the same venv
                                                            +    docs.py: MkDocs build and SPEC-06 checks
                                                            +    report.py: bundle TOON and JSON reports
                                                            +    messages.tsv: exit code, English message, Japanese message
                                                            +  installer/tests/: unittest, files named test_*.py
                                                            +  installer/acceptance/: Playwright Python, see SPEC-04
                                                            +  manifest/:
                                                            +    upstreams.json: canonical manifest (SPEC-01)
                                                            +    upstreams.toon: excerpt generated by grdm-dev manifest toon (SPEC-01)
                                                            +    allowlist.json: accepted findings (SPEC-03 §5.1)
                                                            +    allowlist.baseline.json: allow-list count at the last milestone exit, owner-maintained (SPEC-03 §5.1)
                                                            +    milestone.json: current milestone, owner-maintained (SPEC-03 §5.2)
                                                            +    hardening.json: per-service exceptions to read-only root and cap_drop, with reasons (SPEC-03 §3.3)
                                                            +    redteam-targets.json: container names the AI red team may touch (SPEC-03 §6)
                                                            +  runtime/: generated, git-ignored (.env, docker-compose.yml, volumes/, reports/)
                                                            +

                                                            10. Tests

                                                            +

                                                            python3 -m unittest discover -s installer/tests must pass on every PR. Each module has a test_<module>.py that covers at least one success case and one rejection case, and every rejection case asserts the exit code from §6. Docker is never required by unit tests: host.py and build.py take an injectable runner so tests pass fake docker output. Integration and acceptance tiers are defined in SPEC-04.

                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            1. 範囲と目的

                                                            +

                                                            インストーラーは、このリポジトリを取り出した直後の状態から、§8 に挙げたホストで、コマンド一つで GakuNin RDM の開発環境を動かすものです。sudo(コンピュータの管理者としてコマンドを動かす仕組み)を使わず、ホストのネットワーク設定を変えず、何度やり直しても壊れません。作られるものはすべて runtime/ の下にあり、Git は無視します。

                                                            +

                                                            用語注。 「インストーラー」は、ほかのプログラムが動くように準備するプログラムです。「CLI」(コマンドラインインターフェース)は、文字でコマンドを打って使うプログラムです。「コンテナ」は、一つのプログラムと必要なものを一箱に入れ、どのコンピュータでも同じように動かすための箱です。「Docker Compose」は、一枚の設定ファイルから多くのコンテナをまとめて起動する道具です。「manifest」は、どのソースリポジトリのどの版を使うかを正確に書いた一覧です(SPEC-01)。

                                                            +

                                                            2. 二つの入口

                                                            +

                                                            2.1 installer/install.sh — 薄い起動スクリプト

                                                            +

                                                            install.sh がすることは次の四つだけです。

                                                            +
                                                              +
                                                            1. macOS 標準の bash(版 3.2)で動く。そのため連想配列、mapfile、${var,,} のような新しい機能は使わない。
                                                            2. +
                                                            3. python3 を探し、3.11 以上かを確かめる。足りなければ、判定した OS に合わせた導入方法を表示して終了コード 10 で終わる。
                                                            4. +
                                                            5. 「仮想環境」(システムとは別の、Python とライブラリだけの私用フォルダ)を .venv/ に作り、pip install -e installer で installer/ パッケージを入れる。
                                                            6. +
                                                            7. 引数をすべて .venv/bin/grdm-dev install "$@" に渡し、その終了コードで終わる。
                                                            8. +
                                                            +

                                                            OS の違いは install.sh には書きません。installer/grdm_dev/host.py に閉じ込めます。利用者向けの文言は installer/grdm_dev/messages.tsv(コードごとに一行、英語と日本語の列)から出し、スクリプトと Python コマンドが同じ言葉を話すようにします。

                                                            +
                                                            flowchart TD
                                                            +  A[./installer/install.sh --yes] --> B{python3 は 3.11 以上?}
                                                            +  B -- いいえ --> X10[終了 10: Python の導入方法を表示]
                                                            +  B -- はい --> C[.venv/ を作り pip install -e installer]
                                                            +  C --> D[grdm-dev doctor]
                                                            +  D -- 対象外のホスト --> X10b[終了 10]
                                                            +  D -- Docker が無い --> X11[終了 11]
                                                            +  D --> E[grdm-dev plan]
                                                            +  E -- manifest 不正 --> X20[終了 20]
                                                            +  E --> F[grdm-dev secrets init]
                                                            +  F --> G[grdm-dev compose render]
                                                            +  G --> H[grdm-dev build]
                                                            +  H -- 失敗 --> X30[終了 30]
                                                            +  H --> I[grdm-dev up]
                                                            +  I --> J[grdm-dev health --network]
                                                            +  J -- 失敗 --> X40[終了 40]
                                                            +  J --> K[grdm-dev scan]
                                                            +  K -- 門で不合格 --> X50[終了 50]
                                                            +  K --> L[grdm-dev report]
                                                            +  L --> Z[終了 0。URL http://127.0.0.1:5000 を表示]
                                                            +

                                                            2.2 grdm-dev — Python コマンド

                                                            +

                                                            grdm-dev はパッケージ installer/grdm_dev/ を、コンソールスクリプトとして公開したものです。規則は次のとおりです。

                                                            +
                                                              +
                                                            • 標準ライブラリ優先。 コマンド本体は外部ライブラリに依存しません。manifest は JSON(json で読む)、ホストは platform・shutil・socket・subprocess で読み、生成する Compose ファイルは JSON で書き出します。JSON は YAML として正しいので Docker Compose がそのまま読めます。したがって PyYAML は要りません。
                                                            • +
                                                            • 任意の追加 accept。 pip install -e "installer[accept]" で pytest・pytest-playwright・playwright が入ります。これらを読み込むのは grdm-dev accept だけです(SPEC-04)。
                                                            • +
                                                            • 外部の道具 はサブプロセスとして呼び、doctor が有無を確かめます。docker(27 以上)と Compose プラグイン(v2 以上)・buildx、scan 用の trivy・gitleaks・semgrep、scan --dynamic 用の OWASP ZAP のコンテナイメージ、docs 用の mkdocs です。スキャナーが無いと scan は終了 51 で終わります(SPEC-03 §8)。
                                                            • +
                                                            • すべてのサブコマンドは --json を受け付け、TOON(JSON を短く書いた文字形式。SPEC-06 §4)の代わりに機械が読む JSON で同じ報告を出します。
                                                            • +
                                                            +

                                                            3. サブコマンド

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            サブコマンド契約Docker に触れるか
                                                            doctorOS(macOS・Ubuntu・WSL2)、CPU(arm64・amd64)、メモリ、空き容量、Docker 27 以上、Compose プラグイン(v2 以上)、buildx を判定し TOON で報告する。対象外のホストは終了 10、Docker が無い・動いていないときは 11。読むだけ
                                                            planmanifest とプロファイルを解決し、どのイメージを作りどのサービスを起こすか、公開ポート(§4)とともに表示する。何も変えない。manifest が SPEC-01 の検査に落ちれば終了 20。触れない
                                                            secrets init / secrets rotateinit は乱数の秘密(DB パスワード、Django の秘密鍵、CAS の鍵)を runtime/.env にモード 0600 で書く。既定値や例のパスワードは決して書かない。既存ファイルは --force がなければ上書きしない。rotate はすべての秘密を作り直し、稼働中の PostgreSQL と RabbitMQ のパスワードを変更し、新しい環境を受け取るようコンテナを再作成し、旧い資格情報が拒否されることを確かめる。どこかで失敗したら以前の runtime/.env に戻して 40 で終わる。レッドチームに秘密を取られた後に使う(SPEC-03 §6)。触れない / 触れる
                                                            compose rendermanifest とプロファイルから runtime/docker-compose.yml を書く。内部ネットワーク grdm と公開専用の grdm-edge(--egress <services> で追加接続し runtime/.env に記録。SPEC-03 §3.2)、部品ごとの platform: は manifest の build_platform から、ポートは 127.0.0.1 にだけ公開(§4)、全サービスに非 root の user:、read_only・cap_drop・資源制限(mem_limit・cpus・pids_limit。doctor が検出したメモリに応じて決める)、サービスごとの例外は manifest/hardening.json から(SPEC-03 §3.3)、platform: は doctor の結果から選ぶ、名前付きボリュームは runtime/volumes/ の下。ADR-02 に従う。触れない
                                                            builddocker buildx でイメージを作る。プラットフォームは優先順に --platform、manifest の部品の build_platform(例: EOL ベースで arm64 に組めない部品は linux/amd64 にしてエミュレーションで動かす)、それもなければホストと同じ。イメージはローカルに読み込む。prebuilt_image(SPEC-01)を持つ部品は組まず、ダイジェスト固定のイメージを取得して prebuilt と報告する(pull-failed は終了 30)。--push で multi-arch の manifest を ghcr.io/rcosdp/<name>(非公開)へ送る。失敗は終了 30。触れる
                                                            up / down / resetup はプロファイルを起動し健康になるまで待つ。down はコンテナを止めボリュームを残す。reset は止めたうえで確認の後に runtime/volumes/ を消す(--yes で確認を省く)。触れる
                                                            health各サービスの健康確認用の URL を調べる。--network を付けると、ホストで待ち受けているソケットも一覧し、コンテナのポートがループバック以外の番地に結び付いていれば終了 40。読むだけ
                                                            scanSPEC-03 のセキュリティ門を全部動かす。基本対策、Trivy の SBOM(ソフトウェア部品表。イメージに入っている部品の一覧)と CVE の一覧、gitleaks、Semgrep、OWASP ZAP。runtime/reports/scan_<日付>.json と TOON を書き、manifest/milestone.json の節目に合わせて manifest/allowlist.json と manifest/allowlist.baseline.json と差分を取る。門は ADR-03 どおり、M1〜M3 は報告のみ、M4 は HIGH で終了 50、M5 は CRITICAL か HIGH で終了 50。フラグ --baseline・--secrets・--dynamic は一部だけを動かす。スキャナーが動かなければ終了 51、サービスが健全でないのに --dynamic を求めたら終了 52。読むだけ
                                                            redteam preflightAI レッドチームの実行前に、レッドチーム用 Compose プロジェクトの攻撃側コンテナが隔離されていること(届くはずのカナリアで証明する。SPEC-03 §6)、manifest/redteam-targets.json に名前のあるコンテナだけが接続していること、承認記録があり新しいことを確かめる。どちらかが外れれば終了 53。詳細は SPEC-03 §6。触れる(検査用のカナリアのコンテナとネットワークを作って消す)
                                                            acceptPlaywright Python の受入試験を同じ .venv/ で実行する。--only <シナリオ> で一つだけ、--seed で使い捨ての試験利用者を作る。一件でも失敗すれば終了 60。詳細は SPEC-04。読むだけ
                                                            upstream mirror / upstream integrateSPEC-05 の日次ミラーと週次統合を手で動かす。非公開の -dev2027 への Git 認証情報が要り、このリポジトリの CI では決して動かさない。触れない(Git のみ)
                                                            manifest check / manifest tooncheck は manifest/upstreams.json を検証し(SPEC-01 §5)、docs/ 内の TOON の抄録と manifest/upstreams.toon がそれと一致するか確かめる。不一致は終了 20。toon は upstreams.toon が一致すべき抄録を出力する。触れない
                                                            docs build / docs checkbuild は MkDocs で site/ を作る。check は SPEC-06 §8 のアンカー、Jump 行、相対リンク、TOON の一致、Version 行を検査する。触れない
                                                            reportdoctor・plan・health・scan・accept の最新の報告を runtime/reports/<時刻>.toon と .json にまとめる。触れない
                                                            install流れ図の順に実行する。最初に 0 以外で終わった段で止まる。触れる
                                                            +

                                                            +

                                                            4. プロファイルと公開ポート

                                                            +
                                                            profiles[3]{name,services,note}:
                                                            +  minimum,"web api postgres elasticsearch rabbitmq fakecas",ログインとプロジェクト画面が見える最小の組
                                                            +  core,"minimum + admin worker wb wb_worker mfr unoconv ember_osf_web cas wiki mongo sharejs elasticsearch6 redis y_websocket",コア 6 リポジトリと基盤。Wiki 共同編集の y_websocket を含む
                                                            +  full,"core + rdmcp aipf_mcp_data_grdm oasys shibboleth_sp test_idp",全部。shibboleth_sp は fakecas と入れ替わる
                                                            +

                                                            サービス名は RDM-osf.io 上流の docker-compose.yml に合わせ、既存の手引きがそのまま使えるようにします。これは manifest の services[] の値でもあります(SPEC-01 §3)。Compose プロファイル shibboleth とサービス fakecas は排他です。compose render --profile full --auth shibboleth は fakecas を外して shibboleth_sp と test_idp を足します。full の既定は fakecas です。y_websocket は full でなく core に属します。Wiki 共同編集が M2 の受入シナリオ(SPEC-04 §4 の C4)だからです。manifest の y-websocket 部品の profile もそれに合わせて core です(SPEC-01 §3)。

                                                            +

                                                            公開ポート。 既定のホスト側ポートを定めるのはこの表だけです。ADR-02、SPEC-03、REF-01 はここを指します。すべて 127.0.0.1 にだけ公開します。

                                                            +
                                                            ports[7]{service,host_port,profile,url}:
                                                            +  web,5000,minimum,http://127.0.0.1:5000
                                                            +  api,8000,minimum,http://127.0.0.1:8000
                                                            +  admin,8001,core,http://127.0.0.1:8001
                                                            +  wb,7777,core,http://127.0.0.1:7777
                                                            +  mfr,7778,core,http://127.0.0.1:7778
                                                            +  fakecas,8080,minimum,http://127.0.0.1:8080
                                                            +  ember_osf_web,4200,core,http://127.0.0.1:4200
                                                            +

                                                            ほかのサービス(wiki、cas、y_websocket、サブシステム、test_idp、データベースとキュー)には Compose ネットワークの中からだけ届きます。ブラウザ向けのポートが要るときは compose render が割り当て、plan が表示します。compose render は選んだホスト側ポートをすべて runtime/.env に GRDM_PORT_<SERVICE>(大文字)として書き、受入試験はそれを読みます(SPEC-04 §1)。既定のポートが使用中なら(macOS の AirPlay と 5000 が既知の例)、compose render は次の空きポートを取り、導入報告書に記録します。終了 12 は空きポートが見つからないときだけです。

                                                            +

                                                            5. フラグ

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            フラグ意味
                                                            --yesすべての質問に既定で答える。端末がないときは必須。
                                                            --profile minimum\|core\|full既定は core。runtime/.env に GRDM_PROFILE として保存し、次回以降も使う。
                                                            --platform linux/arm64,linux/amd64build の platform を上書きする。既定はホストの platform だけ。
                                                            --no-openup の後にブラウザを開かない。
                                                            --json報告を TOON でなく JSON で出す。
                                                            +

                                                            6. 終了コード

                                                            +
                                                            exit_codes[13]{code,meaning}:
                                                            +  0,成功
                                                            +  2,指定の誤り。不明なフラグや値の形の誤り
                                                            +  10,対象外のホスト。OS・CPU・メモリ、または Python が古い
                                                            +  11,Docker が無い・動いていない、または Compose / buildx プラグインが無い
                                                            +  12,必要なポートが 127.0.0.1 で使用中で、空きの代わりも見つからない
                                                            +  20,manifest が不正、または TOON の抄録が JSON と一致しない
                                                            +  30,イメージのビルドに失敗
                                                            +  40,健康確認に失敗、またはループバック以外の番地で待ち受けている
                                                            +  50,今の節目のセキュリティスキャンの門で不合格
                                                            +  51,スキャナーが動かない。道具が無い、または脆弱性データベースの取得に失敗
                                                            +  52,サービスが健全でなく scan --dynamic を実行できない
                                                            +  53,レッドチームの事前確認に失敗。外向き通信が可能、または redteam-targets.json 外の対象
                                                            +  60,受入試験に失敗
                                                            +

                                                            番号を別の意味に使い回しません。新しい原因には新しい番号を振ります。正本は installer/grdm_dev/messages.tsv で、この TOON ブロックはそれと一致していなければなりません(manifest check が確かめます)。50〜53 の詳細は SPEC-03 §8 にあります。

                                                            +

                                                            7. 振る舞いの規則

                                                            +
                                                              +
                                                            • 対話なしで動く。 stdin が端末でなく --yes もないとき、すべての質問は「いいえ」と扱い、--yes を付けるよう促して終了 2 で終わる。
                                                            • +
                                                            • 何度でも同じ結果。 どのサブコマンドも二度実行して同じ結果になる。secrets init は既存の秘密を残し、compose render は生成ファイルだけを上書きし、build は buildx のキャッシュを使い、up は健康なサービスには何もしない。
                                                            • +
                                                            • 秘密を Git に入れない。 runtime/ は .gitignore に入れる。runtime/ の下のファイルや秘密に見える値がコミットされると、docs check と CI の秘密スキャンが不合格にする。
                                                            • +
                                                            • ホストのネットワークを変えない。 旧手引きのループバック別名 192.168.168.167 は作らない。compose render が上流の local.py と .docker-compose.*.env の設定を、Compose ネットワーク内ではサービス名、ブラウザ向けには 127.0.0.1 を使うよう書き換える(ADR-02)。
                                                            • +
                                                            • -private のコードを置かない。 インストーラーは実行時に manifest の名前と SHA で統合リポジトリを取得する。この公開リポジトリにはそれらのコードを置かない(POL-01)。
                                                            • +
                                                            +

                                                            +

                                                            8. 対応ホスト

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            ホストCPU対応
                                                            macOS 14 以上 と Docker Desktoparm64正式(M2 の受入はここで実行)
                                                            Ubuntu 24.04 と Docker Engineamd64・arm64正式
                                                            Windows 11 の WSL2(Ubuntu 24.04)と Docker Desktopamd64動くことを必須とする。CI ではビルド確認のみ
                                                            その他の Linux、Intel の macOS任意できる範囲で対応。doctor が警告して続行
                                                            +

                                                            9. ディレクトリ構成

                                                            +
                                                            layout:
                                                            +  installer/install.sh: bash 3.2 の起動スクリプト
                                                            +  installer/pyproject.toml: パッケージ情報、コンソールスクリプト grdm-dev、追加 accept
                                                            +  installer/grdm_dev/:
                                                            +    cli.py: 引数の解釈、サブコマンドの振り分け、終了コード
                                                            +    host.py: OS・CPU・メモリ・ディスク・Docker の判定
                                                            +    manifest.py: manifest/upstreams.json の読み込みと検証、TOON との比較
                                                            +    secrets.py: 乱数の秘密の生成、モード 0600 の runtime/.env
                                                            +    compose.py: manifest とプロファイルから runtime/docker-compose.yml を生成
                                                            +    build.py: buildx の呼び出し、platform の一覧、任意の push
                                                            +    health.py: サービスの健康確認とループバック限定の確認
                                                            +    scan.py: 基本対策、Trivy の SBOM と CVE、gitleaks、Semgrep、ZAP、許容リストとの差分、段階的な門(SPEC-03)
                                                            +    redteam.py: レッドチームの事前確認(SPEC-03 §6)
                                                            +    upstream.py: ミラーと統合(SPEC-05)
                                                            +    accept.py: 同じ venv で pytest-playwright を実行
                                                            +    docs.py: MkDocs のビルドと SPEC-06 の検査
                                                            +    report.py: TOON と JSON の報告をまとめる
                                                            +    messages.tsv: 終了コード、英語の文言、日本語の文言
                                                            +  installer/tests/: unittest。ファイル名は test_*.py
                                                            +  installer/acceptance/: Playwright Python。SPEC-04 を参照
                                                            +  manifest/:
                                                            +    upstreams.json: manifest の正本(SPEC-01)
                                                            +    upstreams.toon: grdm-dev manifest toon が生成する抄録(SPEC-01)
                                                            +    allowlist.json: 許容する検出(SPEC-03 §5.1)
                                                            +    allowlist.baseline.json: 前の節目の終了時の許容リスト件数。所有者が保守(SPEC-03 §5.1)
                                                            +    milestone.json: 現在の節目。所有者が保守(SPEC-03 §5.2)
                                                            +    hardening.json: 読み取り専用ルートと cap_drop のサービスごとの例外と理由(SPEC-03 §3.3)
                                                            +    redteam-targets.json: AI レッドチームが触れてよいコンテナ名(SPEC-03 §6)
                                                            +  runtime/: 生成物。Git は無視(.env、docker-compose.yml、volumes/、reports/)
                                                            +

                                                            10. 試験

                                                            +

                                                            python3 -m unittest discover -s installer/tests はすべての PR で合格していなければなりません。各モジュールに test_<モジュール>.py を置き、成功ケースと拒否ケースを少なくとも一つずつ含め、拒否ケースでは §6 の終了コードを assert します。単体試験は Docker を要求しません。host.py と build.py は実行器を差し替えられる作りにし、試験では偽の docker の出力を渡します。統合と受入の段は SPEC-04 で定めます。

                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            Virtual environment (venv)A private folder of Python and its libraries, separate from the system's.システムとは別の、Python とライブラリだけの私用フォルダ。
                                                            buildxThe part of Docker that builds images for more than one kind of CPU at once.複数の種類の CPU 向けのイメージを一度に作る Docker の機能。
                                                            Loopback / 127.0.0.1The address that means "this same computer"; nothing outside can reach it.「この同じコンピュータ」を指す番地。外からは届かない。
                                                            SBOMA list of every software part inside an image, like an ingredients label.イメージに入っている部品の一覧。食品の原材料表示のようなもの。
                                                            CVEA public record number for one known security weakness.一つの既知の弱点に付いた公開の番号。
                                                            Exit codeThe number a program returns when it stops; 0 means success.プログラムが終わるときに返す数。0 が成功。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/spec/03_security_gate/index.html b/site/spec/03_security_gate/index.html new file mode 100644 index 0000000..bbea57c --- /dev/null +++ b/site/spec/03_security_gate/index.html @@ -0,0 +1,4088 @@ + + + + + + + + + + + + + + + + + + + + + + + SPEC-03 Security Gate / セキュリティの門 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            + + + + + + + +

                                                            SPEC-03 Security Gate / セキュリティの門

                                                            +
                                                            +

                                                            Summary: What the development environment protects, which controls every install must have from the first milestone, how grdm-dev scan finds vulnerabilities, how the allow-list works, and how the gate tightens from "report" (M1) to "zero CRITICAL/HIGH plus a passing AI red team" (M5). +概要: 開発環境が何を守るか、最初の節目から全導入に必須の対策、grdm-dev scan が脆弱性を見つける手順、許容リストの決まり、そして門が「報告のみ」(M1)から「CRITICAL/HIGH ゼロ+AI レッドチーム合格」(M5)へ段階的に厳しくなる様子を定める。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.3 — 2026-11-05. Learned: the first rendered configuration showed that a single internal network cannot publish ports, so the baseline needs two networks (grdm internal, grdm-edge for publishing) and an explicit, recorded egress choice; the red-team preflight must prove isolation with a reachable canary rather than infer it from a failed lookup (review r1 of PR #21). / 最初に描画した構成で、内部ネットワーク一つではポートを公開できないと分かった。基本対策は二つのネットワーク(内部の grdm と公開用の grdm-edge)と、記録された明示的な egress の選択を要する。レッドチームの事前確認は、失敗した名前解決から推測せず、到達できるカナリアで隔離を証明する(PR #21 レビュー r1)。 + 0.2 — 2026-11-05. Learned: a scanner that runs inside a container must address its targets by Compose service name, because loopback inside that container is the scanner itself; and a promised scanner must say what it scans at each milestone. / コンテナの中で動くスキャナーは相手を Compose のサービス名で指さなければならない。そのコンテナの中のループバックはスキャナー自身だからだ。また約束したスキャナーは節目ごとに何を検査するかを明記する必要があると分かった。
                                                            • +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: the gate must be written as a schedule, not a single threshold, because every current base image is end-of-life and a zero gate on day one would stop the first install before anything could be measured. / 現行のベースイメージがすべてサポート終了のため、門を一つの基準値でなく「節目ごとの予定表」として書かないと、初日の導入が何も測れないまま止まると分かった。
                                                            • +
                                                            • Normative for: installer/grdm_dev/ (scan, redteam preflight, health --network, secrets), manifest/allowlist.json, manifest/allowlist.baseline.json, manifest/milestone.json, manifest/hardening.json, manifest/redteam-targets.json, .github/workflows/security.yml, every docker-compose file generated by grdm-dev, and every AI red-team run.
                                                            • +
                                                            • Related: SPEC-00 Overview · SPEC-02 Installer CLI · SPEC-04 Acceptance Tests · SPEC-05 Upstream Tracking · SPEC-06 Documentation Conventions · POL-01 Position · ADR-02 Network Model · ADR-03 Staged Security Gate · ADR-04 AI Autonomy and Roles · docs/README.md
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            1. Scope

                                                            +

                                                            This specification defines the security gate (a checkpoint that an install must pass before it is called good) of the GRDM developer environment 2027. It covers what we protect, the baseline controls that apply from milestone M1, the scanners, the allow-list, the staged thresholds up to M5, the AI red team, the evidence format, and the exit codes. The decision to stage the gate instead of enforcing zero from the start is recorded in ADR-03. Who may fix, review, and merge is recorded in ADR-04.

                                                            +

                                                            Glossary notes. A vulnerability is a known weak spot in a program that someone could use to break in. A CVE (Common Vulnerabilities and Exposures) is the public ID number given to one vulnerability, like CVE-2026-12345. Severity is how bad it is: CRITICAL, HIGH, MEDIUM, LOW. A milestone (M1 to M5) is one of the five planned stages of this project, defined in POL-01.

                                                            +

                                                            2. Threat model

                                                            +

                                                            A threat model is a short list of what we are protecting and who we imagine is trying to harm it. It keeps the controls honest: every control in §3 must answer at least one line of this table.

                                                            +

                                                            What we protect:

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            AssetWhy it matters
                                                            The developer's machineIt holds the developer's own files, browser sessions, and SSH keys. A container that escapes could reach them.
                                                            CredentialsDatabase passwords, session keys, OAuth client secrets, and the GitHub token that mirrors upstream repositories.
                                                            -private codeThe security-hardened variants of the six core repositories are private to RCOSDP. They must never leave the private -dev2027 repositories or appear in this public repository.
                                                            The integrity of the gate itselfIf an attacker can edit a scan report or the allow-list, every other control is meaningless.
                                                            +

                                                            Attackers we consider:

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            AttackerWhat they can doMain controls
                                                            Anyone on the same LAN (office Wi-Fi, home router)Open a port that the developer left published; guess a default password.§3.2 publish only on 127.0.0.1; §3.1 random secrets.
                                                            A malicious dependency (a library that pip or npm downloads)Run code at build or start time; read environment variables; call home.§3.4 pinned digests; §4 SBOM + CVE scan; §4.4 dependency bots; §3.2 internal network.
                                                            A compromised container (one service already broken into)Reach other services; write to the host; use host resources.§3.3 non-root, read-only root, no privileged, resource limits; §3.2 internal network.
                                                            An adversarial top-tier AI agent probing the running systemChain small weaknesses fast; try every public exploit for every CVE in the SBOM; brute-force weak defaults.§5 staged gate to zero CRITICAL/HIGH; §6 AI red team that uses the same capability on our side first.
                                                            +

                                                            Out of scope: attacks on the developer's operating system itself, phishing of the developer, and the production GRDM service. Those belong to the operating institution, not to the developer environment.

                                                            +

                                                            3. Baseline controls (apply from M1, every install)

                                                            +

                                                            These controls are not negotiable and have no allow-list. grdm-dev health --network and grdm-dev scan --baseline verify them; failure of any one is exit code 50 even at M1.

                                                            +

                                                            3.1 Secrets

                                                            +
                                                              +
                                                            • Every secret (a password or key that only the system should know) is generated at install time by grdm-dev secrets init from the operating system's random source.
                                                            • +
                                                            • Secrets are written to runtime/.env (SPEC-02 §3) with file mode 0600 (only the owner can read and write). runtime/ is listed in .gitignore; the secret scanner in §3.5 confirms the file never enters a commit.
                                                            • +
                                                            • No default passwords. Upstream docker-compose.yml files ship with values such as postgres/postgres and changeme; the installer replaces every one of them and fails if one is still present.
                                                            • +
                                                            • Reports and logs never print a secret. grdm-dev report masks any value that matches a key in runtime/.env before writing.
                                                            • +
                                                            +

                                                            3.2 Network

                                                            +
                                                              +
                                                            • Services talk to each other only on the Compose network grdm, which is declared internal: true (a private virtual network inside Docker with no route to the host's interfaces, the LAN, or the Internet), so a compromised container cannot call home from it. See ADR-02.
                                                            • +
                                                            • Docker cannot publish a port from an internal network, so the services a browser must reach (web, api, admin, wb, mfr, fakecas, ember_osf_web) are additionally attached to a second, ordinary bridge network grdm-edge. Ports are published from it on 127.0.0.1 only; no other service joins it by default.
                                                            • +
                                                            • Egress (outbound traffic to the Internet) is therefore not available to the remaining services. A developer who needs it, for example to reach an external storage provider while developing an add-on, attaches named services with grdm-dev compose render --egress <service>[,<service>...]. The choice is recorded in runtime/.env as GRDM_EGRESS_SERVICES, shown in the compose and install reports, and read by grdm-dev scan --baseline; --egress none clears it. Egress granted this way is a recorded developer choice, not a baseline violation; an undeclared service on grdm-edge is a violation (BASE-NETWORK), and a grant that names a service which is not actually attached is also a finding (BASE-EGRESS-STALE): the record and the running configuration must agree.
                                                            • +
                                                            • grdm-dev health --network enumerates the project's own bindings (docker compose ps, docker inspect) and the host's listening sockets and fails if any address is not 127.0.0.1, including a listener on a project port whose owning process is not visible.
                                                            • +
                                                            • Ports that a browser needs are published only on 127.0.0.1; the list of default ports (5000 web, 8000 api, 8001 admin, 7777 wb, 7778 mfr, 8080 fakecas, 4200 ember) is the ports table in SPEC-02 §4. Nothing is published on 0.0.0.0 or on a LAN address. The old loopback alias 192.168.168.167 is gone.
                                                            • +
                                                            • grdm-dev health --network lists every listening socket of the Compose project and fails if any address is not 127.0.0.1.
                                                            • +
                                                            +

                                                            3.3 Container hardening

                                                            +
                                                              +
                                                            • Every service runs as a non-root user. Where an upstream image runs as root, the generated Compose sets user: to a fixed UID/GID and the installer creates writable volumes for the few paths that need it.
                                                            • +
                                                            • Root filesystem is read-only (read_only: true) where the service tolerates it; writable paths are explicit tmpfs or named volumes. Exceptions are listed per service in manifest/hardening.json with a reason.
                                                            • +
                                                            • privileged: true is forbidden. cap_drop: [ALL] is the default; a service that needs a capability adds it back by name with a reason.
                                                            • +
                                                            • Every service has mem_limit, cpus, and pids_limit. grdm-dev compose render (SPEC-02 §3) writes them, scaled from the memory that doctor detected.
                                                            • +
                                                            +

                                                            3.4 Supply chain

                                                            +
                                                              +
                                                            • Images are pulled by digest (the exact fingerprint of one image version, sha256:...), never by a floating tag such as latest. The digest of each base image is the base_image_digest field of manifest/upstreams.json, next to the Git SHAs (SPEC-01 §3); it is null until the image is pinned, at the latest at M2.
                                                            • +
                                                            • Locally built images record the base-image digest in a label so that grdm-dev scan can tell which base they came from.
                                                            • +
                                                            +

                                                            3.5 Secret scanning in CI

                                                            +

                                                            Because this repository is public, every pull request and every push to develop runs a secret scanner (gitleaks or an equivalent that detects private keys, tokens, and passwords in the diff and in history). One finding fails the workflow. The same scanner runs locally in grdm-dev scan --secrets. False positives are suppressed by a rule in .gitleaks.toml with a reason, never by deleting the finding from the report.

                                                            +

                                                            4. Scanning

                                                            +

                                                            grdm-dev scan runs four kinds of scanners and writes one combined report. A scanner runs either inside the Compose project, where it reaches services by their Compose service names (ZAP, §4.3), or on the host, where it looks at the 127.0.0.1 ports (the network baseline check, §3.2); none sends data to an outside service except to download its vulnerability database.

                                                            +

                                                            4.1 SBOM and CVE: Trivy (required), Grype (optional second opinion)

                                                            +
                                                              +
                                                            • An SBOM (software bill of materials: the complete list of every library inside an image or project) is generated by Trivy for every image in the Compose project and for every lockfile (requirements*.txt, poetry.lock, package-lock.json, yarn.lock, build.gradle) in the integration repositories.
                                                            • +
                                                            • Trivy then matches the SBOM against its CVE database. Output is JSON (canonical) plus a TOON excerpt in the report.
                                                            • +
                                                            • Grype may run on the same SBOM as a second opinion. Grype findings are informational and never change the gate result unless the owner promotes one to the allow-list process.
                                                            • +
                                                            • M1 scope. At M1 no image exists yet (grdm-dev build arrives with M2), so the Trivy job in security.yml scans the repository file system only, in report-only mode: it writes its findings to the job log and never fails the PR. Image and lockfile scanning of the integration repositories starts with the first build.
                                                            • +
                                                            +

                                                            4.2 Static analysis: Semgrep and CodeQL

                                                            +

                                                            Static analysis reads source code without running it and flags dangerous patterns (for example, building an SQL query from user text). Semgrep runs locally and in CI on every PR with the p/default, p/python, p/javascript, and p/docker-compose rule packs. CodeQL runs in the private -dev2027 repositories on develop nightly. Findings of severity ERROR count as HIGH in the gate; WARNING counts as MEDIUM.

                                                            +

                                                            4.3 Dynamic scan: OWASP ZAP baseline

                                                            +

                                                            A dynamic scan pokes the running web application like a browser would. grdm-dev scan --dynamic starts OWASP ZAP in a container attached to the Compose internal network (ADR-02 §3) and runs the baseline scan against the Compose service names and container ports: http://web:5000 (web), http://admin:8001 (admin), and http://ember_osf_web:4200 (ember). It never targets 127.0.0.1: inside the ZAP container, loopback is ZAP itself, not a service and not the host. The container ports are the ports the services listen on inside the network; their numbers equal the default host ports in the ports table of SPEC-02 §4, but that table defines host ports, which browsers, acceptance tests, and grdm-dev health --network use. When compose render remaps a host port on collision and records it as GRDM_PORT_<SERVICE> in runtime/.env (SPEC-02 §4), host-side checks read the new number from there and the ZAP targets do not change. ZAP risk High maps to HIGH, Medium to MEDIUM. The scan runs only after grdm-dev health reports all services healthy: a full grdm-dev scan skips the dynamic part and notes it in the report, while an explicit scan --dynamic exits 52.

                                                            +

                                                            4.4 Dependency update bots

                                                            +

                                                            The private -dev2027 repositories enable Dependabot (or Renovate) for Python, npm, Gradle, and Docker base images, grouped weekly. The bot opens a PR; the PR enters the normal flow of ADR-04: AID (AI開発担当者) adapts the code if needed, REV (担当レビュワ) reviews, QAE (QA担当) runs regression, the owner merges.

                                                            +

                                                            4.5 Flow of grdm-dev scan

                                                            +
                                                            flowchart TD
                                                            +    A[grdm-dev scan] --> B{baseline controls<br/>secrets 0600, 127.0.0.1 only,<br/>non-root, no privileged}
                                                            +    B -- any failure --> X[exit 50: gate failed]
                                                            +    B -- pass --> C[Trivy: SBOM for images + lockfiles]
                                                            +    C --> D[Trivy: CVE match]
                                                            +    C --> E[Grype second opinion<br/>optional, informational]
                                                            +    D --> F[Semgrep static analysis]
                                                            +    F --> G{services healthy?}
                                                            +    G -- yes --> H["OWASP ZAP baseline<br/>web, admin, ember_osf_web by service name"]
                                                            +    G -- no --> I[skip dynamic, note in report]
                                                            +    H --> J[merge findings]
                                                            +    I --> J
                                                            +    E --> J
                                                            +    J --> K[apply allowlist.json<br/>drop expired entries]
                                                            +    K --> L{compare with threshold<br/>of current milestone §5}
                                                            +    L -- within threshold --> M[write report TOON + JSON<br/>exit 0]
                                                            +    L -- over threshold --> N[write report<br/>exit 50]
                                                            +

                                                            5. Allow-list and staged gate

                                                            +

                                                            5.1 Allow-list

                                                            +

                                                            The allow-list is the written list of findings we know about, have judged, and accept for a limited time. Canonical file: manifest/allowlist.json. The TOON excerpt in docs/status/ is regenerated by grdm-dev scan and checked by grdm-dev manifest check (see SPEC-06 §4).

                                                            +

                                                            Rules:

                                                            +
                                                              +
                                                            1. Every entry has all six fields: cve, component, reason, owner, expires, added_at. An entry with a missing field is invalid and the scan fails with exit 50.
                                                            2. +
                                                            3. reason says why the finding is not exploitable here or why it cannot be fixed yet (for example "code path not reachable in dev profile", "fix requires Python 3.13 port scheduled for M4").
                                                            4. +
                                                            5. owner is a person or a role from the role table, never "team".
                                                            6. +
                                                            7. expires is a date no later than the start of the next milestone. On expiry the entry is ignored and the finding counts again.
                                                            8. +
                                                            9. The number of entries must never increase from one milestone to the next. grdm-dev scan compares the count with manifest/allowlist.baseline.json, which the owner updates at each milestone exit, and fails if the count went up.
                                                            10. +
                                                            11. Only the owner approves additions. AID may propose an entry in a PR; REV and QAE check it; the owner merges.
                                                            12. +
                                                            +
                                                            allowlist:
                                                            +  milestone: M2
                                                            +  baseline_count: 3
                                                            +  entries[3]{cve,component,severity,reason,owner,expires,added_at}:
                                                            +    CVE-2021-3177,python:3.6-base,HIGH,"EOL interpreter; removed by Python 3.13 port in M4",AID,2027-03-31,2026-11-20
                                                            +    CVE-2022-24785,moment@2.24,HIGH,"ember dev build only; not served to browser in dev profile",AID,2027-01-31,2026-11-20
                                                            +    CVE-2020-8265,node:12-base,CRITICAL,"EOL runtime; replaced by node 20 image in M4",AID,2027-03-31,2026-11-20
                                                            +
                                                            +

                                                            Note: the TOON block above is an example of the shape. The real content lives in manifest/allowlist.json and is regenerated into docs/status/ by grdm-dev scan.

                                                            +
                                                            +

                                                            5.2 Staged gate

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            MilestoneGate ruleWhat happens when a finding is over the rule
                                                            M1Baseline controls (§3) must pass. CVE findings are reported; allow-list is created.Install continues. Report shows the count.
                                                            M2Baseline must pass. Allow-list count ≤ M1 count.Install continues. Scan exits 50 only if the count grew or a baseline control failed.
                                                            M3Baseline must pass. Allow-list count ≤ M2 count.Same as M2.
                                                            M4Fail on any HIGH or CRITICAL not in the allow-list. First AI red team run (§6) must be completed and every found path fixed or allow-listed.grdm-dev install stops before starting services; exit 50.
                                                            M5Fail on any CRITICAL or HIGH, allow-list for CRITICAL/HIGH must be empty. AI red team must report zero unresolved intrusion paths.Exit 50; the environment is not distributable until fixed.
                                                            Steady stateSame as M5. Daily scan; a new HIGH opens a fix PR automatically (ADR-04).Exit 50 in CI; owner is notified.
                                                            +

                                                            The current milestone is read from manifest/milestone.json; only the owner changes it.

                                                            +

                                                            6. AI red team

                                                            +

                                                            An AI red team is a group of AI agents that is told to attack our own test system, in a sealed box, so that we find our weaknesses before a real attacker does. It is defensive, authorized testing of our own isolated environment only.

                                                            +

                                                            Rules, all mandatory:

                                                            +
                                                              +
                                                            1. Isolation. The red team runs inside a dedicated Compose project on a Docker network with internal: true and no egress (no route to the internet or the LAN). manifest/redteam-targets.json names the project, the network, the attacker container (attacker) and the targets. grdm-dev redteam preflight proves isolation instead of inferring it: it starts a canary container on a separate ordinary network, checks that the canary is reachable from its own network (otherwise the probe is inconclusive and the preflight fails), then, inside the attacker container, first self-tests the probe tool against a listener it starts itself (an open port must connect and a closed port must be refused, otherwise the tool is unreliable and the result is inconclusive) and only then checks that neither the canary nor an external address is reachable; a connection error counts as blocked, any other tool error counts as inconclusive, and inconclusive fails the preflight. The attacker must be attached to exactly one network. The approval record (docs/demo/<date>_redteam_<run>.md) must carry a header with approved_by, approved_on (an ISO date, not in the future and at most 30 days old), scope (the target container names) and run_id; a missing or stale record, or a target outside the scope, fails the preflight. grdm-dev redteam preflight verifies that no external address is reachable from the attacker container before any test starts.
                                                            2. +
                                                            3. Target list. The targets are exactly our own containers in that isolated project, listed by name in manifest/redteam-targets.json. Nothing else is ever a target: not the developer's machine, not other containers, not any address outside the project.
                                                            4. +
                                                            5. Approval record. Before each run, a record is written to docs/demo/ as nn_redteam_<date>.md with: who approved (owner), when, scope (target list and commit SHAs), the model and runner used, and the stop conditions. No record, no run.
                                                            6. +
                                                            7. Findings to fixes. Every intrusion path found becomes an issue, then a fix PR through the normal flow (AID fix → REV review → QAE regression → owner merge), then a retest with the same scenario. A path is "resolved" only when the retest fails to reproduce it.
                                                            8. +
                                                            9. Never outside. Techniques learned here are for finding our own weaknesses. Running them against any system outside the isolated project, including production GRDM or upstream services, is forbidden.
                                                            10. +
                                                            11. No secrets in findings. Findings quote the weakness, not the harvested secret. If a secret was captured, the finding says "credential obtained" and the secret is rotated by grdm-dev secrets rotate.
                                                            12. +
                                                            +
                                                            sequenceDiagram
                                                            +    participant O as Owner
                                                            +    participant Q as QAE (Claude Code Fable)
                                                            +    participant R as Red team agents
                                                            +    participant T as Isolated targets
                                                            +    O->>Q: approval record in docs/demo/
                                                            +    Q->>R: preflight: no egress, target list only
                                                            +    R->>T: probe, exploit attempts
                                                            +    R-->>Q: findings (no secrets)
                                                            +    Q->>Q: open issues, request fix PRs (ADR-04)
                                                            +    Q->>R: retest after merge
                                                            +    R-->>O: zero unresolved paths → M5 gate passes
                                                            +

                                                            7. Evidence format

                                                            +

                                                            Every scan writes runtime/reports/scan_<date>.json (canonical, SPEC-02 §3) and the TOON excerpt below into docs/status/security_<milestone>.md. The report must not contain any secret (§3.1). Fields:

                                                            +
                                                            scan:
                                                            +  date: 2026-11-20T09:12:00Z
                                                            +  milestone: M2
                                                            +  commit: 1a2b3c4d
                                                            +  host: macos-arm64
                                                            +  baseline: pass
                                                            +  tools[4]{name,version,result}:
                                                            +    trivy,0.68.0,ok
                                                            +    grype,0.98.0,ok
                                                            +    semgrep,1.140.0,ok
                                                            +    zap,2.17.0,ok
                                                            +  findings_total: 212
                                                            +  findings_by_severity{critical,high,medium,low}: 9,48,120,35
                                                            +  allowlisted: 3
                                                            +  allowlist_baseline: 3
                                                            +  over_threshold: 0
                                                            +  gate: pass
                                                            +  exit_code: 0
                                                            +

                                                            8. Exit codes

                                                            +

                                                            Exit codes are defined in SPEC-02 §6; this table explains the ones scan and redteam preflight return:

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            CodeMeaning
                                                            0Gate passed (or, at M1–M3, report written and count did not grow).
                                                            50Gate failed: baseline control violated, allow-list invalid or grew, finding over the milestone threshold, or red team unresolved at M5.
                                                            51Scanner could not run (tool missing, database download failed). Not a pass.
                                                            52scan --dynamic was requested while services were not healthy. The static part of the report is still written. A full scan does not return 52; it skips the dynamic part and notes it.
                                                            53redteam preflight failed: an external address was reachable from the attacker container, or a target outside manifest/redteam-targets.json was reachable. No red-team run starts.
                                                            +

                                                            9. Checks

                                                            +
                                                              +
                                                            • python3 -m unittest discover -s installer/tests covers: secret file mode, default-password detection, listening-address check, allow-list field validation, count comparison, severity mapping, and secret masking in reports.
                                                            • +
                                                            • CI workflow security.yml runs gitleaks, Semgrep, and Trivy on every PR; at M1 Trivy is report-only over the repository file system because no image exists yet (§4.1). The arm64 self-hosted runner runs the full grdm-dev scan nightly on develop once the installer exists (M2).
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            1. 範囲

                                                            +

                                                            この仕様は、GRDM 開発環境 2027 版の「セキュリティの門」(導入が合格と呼ばれる前に必ず通る検問所)を定めます。守るもの、節目 M1 から適用する基本対策、スキャナー、許容リスト、M5 までの段階的な基準、AI レッドチーム、証跡の形式、終了コードを扱います。最初からゼロを求めず段階化する決定は ADR-03 に、誰が修正・レビュー・マージするかは ADR-04 にあります。

                                                            +

                                                            用語注。 「脆弱性」は、プログラムの中の、誰かが侵入に使えると分かっている弱い所です。「CVE」(Common Vulnerabilities and Exposures)は、一つの脆弱性に付く公開の番号で、CVE-2026-12345 のように書きます。「深刻度」はどれほど危ないかで、CRITICAL・HIGH・MEDIUM・LOW の四段階です。「節目」(M1〜M5)は計画の五つの段階で、POL-01 に定義があります。

                                                            +

                                                            2. 脅威モデル

                                                            +

                                                            「脅威モデル」は、何を守るか、誰が壊そうとすると想定するかを短く書いた一覧です。§3 の各対策は、この表のどれか一行に必ず答えます。

                                                            +

                                                            守るもの:

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            資産大事な理由
                                                            開発者のパソコン開発者自身のファイル、ブラウザのログイン、SSH の鍵がある。コンテナから抜け出されると届く。
                                                            資格情報データベースのパスワード、セッション鍵、OAuth のクライアント秘密、上流リポジトリをミラーする GitHub トークン。
                                                            -private のコードコア 6 本のセキュリティ検証版は RCOSDP 内限定。非公開の -dev2027 から出さず、この公開リポジトリにも置かない。
                                                            門そのものの正しさ攻撃者がスキャン報告や許容リストを書き換えられるなら、ほかの対策は意味を失う。
                                                            +

                                                            想定する攻撃者:

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            攻撃者できること主な対策
                                                            同じ LAN(職場の Wi-Fi、家のルーター)にいる誰か開発者が公開したままのポートを開く。既定のパスワードを当てる。§3.2 127.0.0.1 のみ公開、§3.1 乱数の秘密
                                                            悪意ある依存ライブラリ(pip や npm が取ってくる部品)ビルド時や起動時にコードを動かす。環境変数を読む。外へ通信する。§3.4 ダイジェスト固定、§4 SBOM+CVE、§4.4 更新ボット、§3.2 内部ネットワーク
                                                            乗っ取られたコンテナ(すでに侵入された一つのサービス)ほかのサービスへ届く。ホストに書く。ホストの資源を使う。§3.3 非 root・読み取り専用・privileged 禁止・資源制限、§3.2 内部ネットワーク
                                                            稼働中のシステムを探る、最上位の敵対的 AI エージェント小さな弱点を素早くつなげる。SBOM の全 CVE に公開の攻撃コードを試す。弱い既定値を総当たりする。§5 段階的な門で CRITICAL/HIGH ゼロへ、§6 同じ能力を先に味方として使う AI レッドチーム
                                                            +

                                                            範囲外: 開発者の OS 自体への攻撃、開発者をだます手口、本番 GRDM サービス。これらは運用機関の責任で、開発環境の責任ではありません。

                                                            +

                                                            3. 基本対策(M1 から全導入に適用)

                                                            +

                                                            次の対策は交渉の余地がなく、許容リストもありません。grdm-dev health --network と grdm-dev scan --baseline が確認し、一つでも外れると M1 でも終了コード 50 です。

                                                            +

                                                            3.1 秘密

                                                            +
                                                              +
                                                            • すべての秘密(システムだけが知っていてよいパスワードや鍵)は、導入時に grdm-dev secrets init が OS の乱数源から生成する。
                                                            • +
                                                            • 秘密は runtime/.env(SPEC-02 §3)に、ファイルモード 0600(所有者だけが読み書きできる)で書く。runtime/ は .gitignore に載せ、§3.5 の秘密スキャンがこのファイルがコミットに入らないことを確かめる。
                                                            • +
                                                            • 既定のパスワードを使わない。上流の docker-compose.yml には postgres/postgres や changeme のような値が残っているが、インストーラーがすべて置き換え、残っていれば失敗する。
                                                            • +
                                                            • 報告とログに秘密を書かない。grdm-dev report は書き出す前に runtime/.env の値と一致する文字列を伏せ字にする。
                                                            • +
                                                            +

                                                            3.2 ネットワーク

                                                            +
                                                              +
                                                            • サービス同士は Compose ネットワーク grdm だけで通信する。grdm は internal: true で宣言し(Docker の中だけにある私設の仮想ネットワークで、ホストのインターフェース・LAN・インターネットへの経路を持たない)、侵入されたコンテナもここからは外へ通信できない。詳しくは ADR-02。
                                                            • +
                                                            • Docker は内部ネットワークからポートを公開できないため、ブラウザが届く必要のあるサービス(web、api、admin、wb、mfr、fakecas、ember_osf_web)は、もう一つの通常の bridge ネットワーク grdm-edge にも接続する。公開はそこから 127.0.0.1 のみに行い、既定ではほかのサービスは接続しない。
                                                            • +
                                                            • したがって、それ以外のサービスには外向き通信(egress。インターネットへ出る通信)がない。必要な開発者(例: アドオン開発で外部ストレージへ接続する)は grdm-dev compose render --egress <service>[,<service>...] で名指ししたサービスを grdm-edge に接続する。選択は runtime/.env の GRDM_EGRESS_SERVICES に記録され、compose と install の報告に表示され、grdm-dev scan --baseline が読む。--egress none で解除する。この方法で与えた egress は記録された開発者の選択であり基本対策違反ではない。宣言なしに grdm-edge にいるサービスは違反(BASE-NETWORK)であり、許可に名前があるのに実際には接続していないサービスも所見(BASE-EGRESS-STALE)とする。記録と動いている構成は一致していなければならない。
                                                            • +
                                                            • grdm-dev health --network はプロジェクト自身の公開(docker compose ps、docker inspect)とホストの待ち受けソケットを列挙し、127.0.0.1 以外のアドレスが一つでもあれば失敗する。所有プロセスが見えないプロジェクトポート上の待ち受けも失敗とする。
                                                            • +
                                                            • ブラウザが必要とするポートは 127.0.0.1 だけに公開する。既定のポートの一覧(5000 web、8000 api、8001 admin、7777 wb、7778 mfr、8080 fakecas、4200 ember)は SPEC-02 §4 のポート表にある。0.0.0.0 や LAN のアドレスには公開しない。旧来のループバック別名 192.168.168.167 は廃止。
                                                            • +
                                                            • grdm-dev health --network は Compose プロジェクトの待ち受けソケットを列挙し、127.0.0.1 以外があれば失敗にする。
                                                            • +
                                                            +

                                                            3.3 コンテナの堅牢化

                                                            +
                                                              +
                                                            • 全サービスを非 root ユーザーで動かす。上流イメージが root で動く場合、生成する Compose に固定の UID/GID を user: で指定し、書き込みが必要な少数のパスにはインストーラーがボリュームを用意する。
                                                            • +
                                                            • ルートファイルシステムは、サービスが耐えられる限り読み取り専用(read_only: true)にし、書き込み先は明示的な tmpfs か名前付きボリュームにする。例外はサービスごとに manifest/hardening.json へ理由付きで記す。
                                                            • +
                                                            • privileged: true は禁止。cap_drop: [ALL] を既定にし、必要な権限だけを名前と理由を書いて戻す。
                                                            • +
                                                            • 全サービスに mem_limit、cpus、pids_limit を付ける。grdm-dev compose render(SPEC-02 §3)が、doctor が検出したメモリに応じて値を決めて書く。
                                                            • +
                                                            +

                                                            3.4 サプライチェーン

                                                            +
                                                              +
                                                            • イメージは「ダイジェスト」(一つのイメージ版の正確な指紋。sha256:...)で取得し、latest のような動くタグは使わない。各ベースイメージのダイジェストは manifest/upstreams.json の base_image_digest 項目で、Git の SHA と並べて置く(SPEC-01 §3)。イメージを固定するまで(遅くとも M2)は null。
                                                            • +
                                                            • ローカルでビルドしたイメージにはベースイメージのダイジェストをラベルに記録し、grdm-dev scan がどのベースから作られたか分かるようにする。
                                                            • +
                                                            +

                                                            3.5 CI での秘密スキャン

                                                            +

                                                            このリポジトリは公開のため、すべての PR と develop への push で秘密スキャナー(gitleaks か同等品。差分と履歴の中の秘密鍵・トークン・パスワードを検出する)を動かす。一件の検出でワークフローは失敗する。同じスキャナーをローカルでは grdm-dev scan --secrets が動かす。誤検出は .gitleaks.toml のルールに理由を書いて抑え、報告から消して対処しない。

                                                            +

                                                            4. スキャン

                                                            +

                                                            grdm-dev scan は四種類のスキャナーを動かし、一つの報告にまとめます。スキャナーは、Compose プロジェクトの中で Compose のサービス名で相手に届くか(ZAP。§4.3)、ホスト上で 127.0.0.1 のポートを調べるか(ネットワークの基本対策の確認。§3.2)のどちらかで動き、脆弱性データベースの取得以外で外部のサービスへデータを送りません。

                                                            +

                                                            4.1 SBOM と CVE: Trivy(必須)、Grype(任意の第二意見)

                                                            +
                                                              +
                                                            • 「SBOM」(ソフトウェア部品表。イメージやプロジェクトの中にあるライブラリの完全な一覧)を、Compose プロジェクトの全イメージと、統合リポジトリの全ロックファイル(requirements*.txt、poetry.lock、package-lock.json、yarn.lock、build.gradle)について Trivy が作る。
                                                            • +
                                                            • Trivy は SBOM を CVE データベースと照合する。出力は JSON(正本)と、報告内の TOON 抄録。
                                                            • +
                                                            • Grype は同じ SBOM に対し第二意見として動かしてよい。Grype の検出は参考情報で、所有者が許容リストの手続きに乗せるまで門の結果を変えない。
                                                            • +
                                                            • M1 の範囲。 M1 ではイメージがまだ存在しない(grdm-dev build は M2 から)ので、security.yml の Trivy ジョブはリポジトリのファイルシステムだけを報告のみの方式で検査する。検出はジョブのログに書き、PR を不合格にはしない。統合リポジトリのイメージとロックファイルの検査は最初のビルドから始める。
                                                            • +
                                                            +

                                                            4.2 静的解析: Semgrep と CodeQL

                                                            +

                                                            「静的解析」はソースコードを動かさずに読み、危ない書き方(たとえば利用者の入力文字から SQL を組み立てる)を見つけます。Semgrep はローカルと CI で全 PR に対し p/default、p/python、p/javascript、p/docker-compose のルール集で動かします。CodeQL は非公開の -dev2027 リポジトリの develop で毎晩動かします。深刻度 ERROR は門では HIGH、WARNING は MEDIUM として数えます。

                                                            +

                                                            4.3 動的スキャン: OWASP ZAP ベースライン

                                                            +

                                                            「動的スキャン」は、動いている Web アプリをブラウザのように突いて調べます。grdm-dev scan --dynamic は Compose の内部ネットワークにつないだコンテナで OWASP ZAP を起動し(ADR-02 §3)、Compose のサービス名とコンテナ側ポート、すなわち http://web:5000(web)、http://admin:8001(admin)、http://ember_osf_web:4200(ember)に対してベースラインスキャンを行います。127.0.0.1 を対象にすることはありません。ZAP のコンテナの中では、ループバックはサービスでもホストでもなく ZAP 自身だからです。コンテナ側ポートはサービスがネットワークの中で待ち受けるポートで、番号は SPEC-02 §4 のポート表の既定のホスト側ポートと同じですが、その表が定めるのは「ホスト側」のポートで、ブラウザ・受入試験・grdm-dev health --network が使います。compose render が衝突でホスト側ポートを付け替えて runtime/.env に GRDM_PORT_<SERVICE> として記録したとき(SPEC-02 §4)、ホスト側の確認はそこから新しい番号を読み、ZAP の対象は変わりません。ZAP のリスク High は HIGH、Medium は MEDIUM に対応させます。grdm-dev health が全サービス健全と報告した後にだけ動かします。grdm-dev scan 全体では動的部分を省略して報告に記し、scan --dynamic を明示したときは終了 52 で終わります。

                                                            +

                                                            4.4 依存更新ボット

                                                            +

                                                            非公開の -dev2027 リポジトリでは Dependabot(または Renovate)を Python・npm・Gradle・Docker ベースイメージに対して有効にし、週ごとにまとめます。ボットが PR を開き、その PR は ADR-04 の通常の流れに入ります。必要なら AID(AI開発担当者)がコードを合わせ、REV(担当レビュワ)がレビューし、QAE(QA担当)が回帰を実行し、所有者がマージします。

                                                            +

                                                            4.5 grdm-dev scan の流れ

                                                            +
                                                            flowchart TD
                                                            +    A[grdm-dev scan] --> B{基本対策<br/>秘密 0600・127.0.0.1 のみ<br/>非 root・privileged なし}
                                                            +    B -- 一つでも不合格 --> X[終了 50: 門で停止]
                                                            +    B -- 合格 --> C[Trivy: イメージとロックファイルの SBOM]
                                                            +    C --> D[Trivy: CVE 照合]
                                                            +    C --> E[Grype 第二意見<br/>任意・参考]
                                                            +    D --> F[Semgrep 静的解析]
                                                            +    F --> G{サービスは健全?}
                                                            +    G -- はい --> H["OWASP ZAP ベースライン<br/>web・admin・ember_osf_web へサービス名で"]
                                                            +    G -- いいえ --> I[動的を省略し報告に記す]
                                                            +    H --> J[検出を統合]
                                                            +    I --> J
                                                            +    E --> J
                                                            +    J --> K[allowlist.json を適用<br/>期限切れは除外]
                                                            +    K --> L{現在の節目の基準と比較 §5}
                                                            +    L -- 基準内 --> M[報告 TOON+JSON を書く<br/>終了 0]
                                                            +    L -- 基準超え --> N[報告を書く<br/>終了 50]
                                                            +

                                                            5. 許容リストと段階的な門

                                                            +

                                                            5.1 許容リスト

                                                            +

                                                            「許容リスト」は、知っていて、判断済みで、期限付きで受け入れる検出を書いた一覧です。正本は manifest/allowlist.json。docs/status/ の TOON 抄録は grdm-dev scan が再生成し、grdm-dev manifest check が一致を確かめます(SPEC-06 §4)。

                                                            +

                                                            決まり:

                                                            +
                                                              +
                                                            1. 各項目は六つの欄をすべて持つ: cve、component、reason、owner、expires、added_at。欄が欠けた項目は無効で、スキャンは終了コード 50 で失敗する。
                                                            2. +
                                                            3. reason には、ここでは悪用できない理由か、まだ直せない理由を書く(例:「開発プロファイルでは到達しないコード経路」「修正には M4 予定の Python 3.13 移植が必要」)。
                                                            4. +
                                                            5. owner は人か、役割表 の役割。「チーム」とは書かない。
                                                            6. +
                                                            7. expires は次の節目の開始日以前の日付。期限が切れた項目は無視され、その検出は再び数えられる。
                                                            8. +
                                                            9. 項目数は節目をまたいで増えてはならない。 grdm-dev scan は manifest/allowlist.baseline.json(各節目の終了時に所有者が更新する)と件数を比べ、増えていれば失敗にする。
                                                            10. +
                                                            11. 追加を承認できるのは所有者だけ。AID は PR で項目を提案でき、REV と QAE が確認し、所有者がマージする。
                                                            12. +
                                                            +
                                                            allowlist:
                                                            +  milestone: M2
                                                            +  baseline_count: 3
                                                            +  entries[3]{cve,component,severity,reason,owner,expires,added_at}:
                                                            +    CVE-2021-3177,python:3.6-base,HIGH,"サポート終了の処理系。M4 の Python 3.13 移植で除去",AID,2027-03-31,2026-11-20
                                                            +    CVE-2022-24785,moment@2.24,HIGH,"ember の開発ビルドのみ。開発プロファイルではブラウザへ配信しない",AID,2027-01-31,2026-11-20
                                                            +    CVE-2020-8265,node:12-base,CRITICAL,"サポート終了の実行環境。M4 で node 20 イメージへ置換",AID,2027-03-31,2026-11-20
                                                            +
                                                            +

                                                            Note: 上の TOON は形の例です。実際の内容は manifest/allowlist.json にあり、grdm-dev scan が docs/status/ へ再生成します。

                                                            +
                                                            +

                                                            5.2 段階的な門

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            節目門の決まり基準を超えたときの動き
                                                            M1基本対策(§3)は合格必須。CVE の検出は報告のみ。許容リストを作る。導入は続く。報告に件数を示す。
                                                            M2基本対策は合格必須。許容リスト件数 ≤ M1 の件数。導入は続く。件数が増えたか基本対策が外れたときだけ終了 50。
                                                            M3基本対策は合格必須。許容リスト件数 ≤ M2 の件数。M2 と同じ。
                                                            M4許容リストにない HIGH・CRITICAL が一件でもあれば不合格。 初回の AI レッドチーム(§6)を完了し、見つかった経路はすべて修正か許容リスト登録。grdm-dev install はサービス起動前に止まる。終了 50。
                                                            M5CRITICAL・HIGH が一件でもあれば不合格。CRITICAL/HIGH の許容リストは空でなければならない。 AI レッドチームが未解決の侵入経路ゼロを報告すること。終了 50。直すまで配布可能な状態にならない。
                                                            恒常M5 と同じ。日次スキャン。新しい HIGH は自動で修正 PR を開く(ADR-04)。CI で終了 50。所有者に通知。
                                                            +

                                                            現在の節目は manifest/milestone.json から読み、変更できるのは所有者だけです。

                                                            +

                                                            6. AI レッドチーム

                                                            +

                                                            「AI レッドチーム」は、密閉した箱の中で自分たちの試験システムを攻撃するよう指示された AI エージェントの集まりで、本物の攻撃者より先に自分たちの弱点を見つけるためのものです。守るための、承認された、自分たちの隔離環境だけに対する試験です。

                                                            +

                                                            決まり(すべて必須):

                                                            +
                                                              +
                                                            1. 隔離。 レッドチームは専用の Compose プロジェクトの中、internal: true で外向き通信のない(インターネットにも LAN にも経路がない)Docker ネットワークで動かす。manifest/redteam-targets.json にプロジェクト、ネットワーク、攻撃側コンテナ(attacker)、対象を記す。grdm-dev redteam preflight は隔離を推測ではなく証明する。別の通常ネットワークにカナリア(見張り役)のコンテナを起動し、まずカナリアが自分のネットワークから届くことを確かめ(届かなければ検査自体が不確かなので不合格)、次に攻撃側コンテナの中で、まず自分で起こした聴取口に対して探査の道具を自己試験し(開いた口には接続でき、閉じた口は拒否されること。どちらかが外れれば道具は信用できず結果は「不確か」)、そのうえでカナリアにも外部アドレスにも届かないことを確かめる。接続の失敗は「遮断」、それ以外の道具の異常は「不確か」と数え、不確かなら事前確認は不合格。攻撃側はちょうど一つのネットワークにだけ接続していなければならない。承認記録(docs/demo/<日付>_redteam_<実行>.md)には approved_by、approved_on(ISO 日付。未来でなく 30 日以内)、scope(対象コンテナ名)、run_id のヘッダが必須で、記録がない・古い・scope 外の対象がある場合は不合格。試験の前に grdm-dev redteam preflight が、攻撃側コンテナから外部アドレスへ届かないことを確かめる。
                                                            2. +
                                                            3. 対象一覧。 対象は、その隔離プロジェクト内の自分たちのコンテナだけで、manifest/redteam-targets.json に名前で列挙する。開発者のパソコン、ほかのコンテナ、プロジェクト外のアドレスは決して対象にしない。
                                                            4. +
                                                            5. 承認記録。 各回の前に docs/demo/ へ nn_redteam_<日付>.md を書く。内容は、誰が承認したか(所有者)、いつ、範囲(対象一覧とコミット SHA)、使うモデルと実行基盤、停止条件。記録がなければ実施しない。
                                                            6. +
                                                            7. 検出から修正へ。 見つかった侵入経路はすべて issue にし、通常の流れ(AID 修正 → REV レビュー → QAE 回帰 → 所有者マージ)で修正 PR にし、同じシナリオで再試験する。再試験で再現しなくなったときだけ「解決」とする。
                                                            8. +
                                                            9. 外へは決して向けない。 ここで得た手法は自分たちの弱点を見つけるためのもの。本番 GRDM や上流サービスを含め、隔離プロジェクト外のどのシステムにも使ってはならない。
                                                            10. +
                                                            11. 検出に秘密を書かない。 検出は弱点を書き、取得した秘密そのものは書かない。秘密を取得できた場合は「資格情報を取得」と記し、grdm-dev secrets rotate で秘密を更新する。
                                                            12. +
                                                            +
                                                            sequenceDiagram
                                                            +    participant O as 所有者
                                                            +    participant Q as QAE(Claude Code Fable)
                                                            +    participant R as レッドチームのエージェント
                                                            +    participant T as 隔離された対象
                                                            +    O->>Q: docs/demo/ に承認記録
                                                            +    Q->>R: 事前確認: 外向き通信なし、対象一覧のみ
                                                            +    R->>T: 探索・侵入の試み
                                                            +    R-->>Q: 検出(秘密を含まない)
                                                            +    Q->>Q: issue 起票、修正 PR を依頼(ADR-04)
                                                            +    Q->>R: マージ後に再試験
                                                            +    R-->>O: 未解決の経路ゼロ → M5 の門を通過
                                                            +

                                                            7. 証跡の形式

                                                            +

                                                            各スキャンは runtime/reports/scan_<日付>.json(正本。SPEC-02 §3)と、次の TOON 抄録を docs/status/security_<節目>.md に書きます。報告には秘密を一切含めません(§3.1)。欄:

                                                            +
                                                            scan:
                                                            +  date: 2026-11-20T09:12:00Z
                                                            +  milestone: M2
                                                            +  commit: 1a2b3c4d
                                                            +  host: macos-arm64
                                                            +  baseline: pass
                                                            +  tools[4]{name,version,result}:
                                                            +    trivy,0.68.0,ok
                                                            +    grype,0.98.0,ok
                                                            +    semgrep,1.140.0,ok
                                                            +    zap,2.17.0,ok
                                                            +  findings_total: 212
                                                            +  findings_by_severity{critical,high,medium,low}: 9,48,120,35
                                                            +  allowlisted: 3
                                                            +  allowlist_baseline: 3
                                                            +  over_threshold: 0
                                                            +  gate: pass
                                                            +  exit_code: 0
                                                            +

                                                            8. 終了コード

                                                            +

                                                            終了コードは SPEC-02 §6 で定めます。この表は scan と redteam preflight が返すものを説明します。

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            コード意味
                                                            0門を通過(M1〜M3 では、報告を書き、件数が増えていない)。
                                                            50門で停止: 基本対策の違反、許容リストの不備または増加、節目の基準を超える検出、M5 でレッドチーム未解決。
                                                            51スキャナーが動かなかった(道具がない、データベース取得失敗)。合格ではない。
                                                            52サービスが健全でないのに scan --dynamic を求めた。静的部分の報告は書く。scan 全体では 52 を返さず、動的部分を省略して報告に記す。
                                                            53redteam preflight に失敗。攻撃側コンテナから外部アドレスへ届く、または manifest/redteam-targets.json 外の対象へ届く。レッドチームは開始しない。
                                                            +

                                                            9. 検査

                                                            +
                                                              +
                                                            • python3 -m unittest discover -s installer/tests が、秘密ファイルのモード、既定パスワードの検出、待ち受けアドレスの確認、許容リストの欄の検証、件数比較、深刻度の対応、報告での秘密の伏せ字を検査する。
                                                            • +
                                                            • CI の security.yml は全 PR で gitleaks・Semgrep・Trivy を動かす。M1 ではイメージがまだないため、Trivy はリポジトリのファイルシステムに対する報告のみ(§4.1)。arm64 のセルフホストランナーは、インストーラーができてから(M2)develop で毎晩 grdm-dev scan の全体を動かす。
                                                            • +
                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            Security gateA checkpoint an install must pass before it is called good.導入が合格と呼ばれる前に必ず通る検問所。
                                                            VulnerabilityA known weak spot that someone could use to break in.侵入に使えると分かっている弱い所。
                                                            CVEThe public ID number of one vulnerability.一つの脆弱性に付く公開の番号。
                                                            SBOMThe complete list of every library inside an image or project.イメージやプロジェクトに入っている部品の完全な一覧。
                                                            Allow-listFindings we know, judged, and accept for a limited time.知っていて、判断済みで、期限付きで受け入れる検出の一覧。
                                                            DigestThe exact fingerprint of one image version.一つのイメージ版の正確な指紋。
                                                            Internal networkA private network inside Docker that the outside cannot reach.Docker の中だけにあり、外から届かないネットワーク。
                                                            Static analysisReading code without running it to find dangerous patterns.コードを動かさずに読み、危ない書き方を見つけること。
                                                            Dynamic scanPoking the running application like a browser would.動いているアプリをブラウザのように突いて調べること。
                                                            AI red teamAI agents told to attack our own sealed test system so we find weaknesses first.密閉した自分たちの試験システムを攻撃させ、弱点を先に見つける AI エージェント。
                                                            EgressTraffic leaving a network toward the outside.ネットワークから外へ出ていく通信。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/spec/04_acceptance_tests/index.html b/site/spec/04_acceptance_tests/index.html new file mode 100644 index 0000000..742e9b0 --- /dev/null +++ b/site/spec/04_acceptance_tests/index.html @@ -0,0 +1,3328 @@ + + + + + + + + + + + + + + + + + + + + + + + SPEC-04 Acceptance Tests / 受入試験 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            SPEC-04 Acceptance Tests / 受入試験

                                                            +
                                                            +

                                                            Summary: How we prove that an installed GakuNin RDM developer environment really works: the three test tiers, the browser scenarios for the core and each subsystem, test data, evidence, and the pass criteria for each milestone. +概要: 導入した GakuNin RDM 開発環境が本当に動くことを示す方法。三つの試験の段、コアと各サブシステムのブラウザシナリオ、試験データ、証跡、節目ごとの合格基準を定める。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.4 — 2026-11-05. Learned: a browser trace is raw evidence that can carry cookies and response bodies, so it cannot live under the public evidence folder; it is off by default and quarantined under runtime/ when requested (PR #21 review r2, R2-01). / ブラウザのトレースは cookie や応答本文を含み得る生の証跡なので、公開される証跡フォルダには置けない。既定では記録せず、求められたときだけ runtime/ 配下に隔離する(PR #21 レビュー r2、R2-01)。 + 0.3 — 2026-11-05. Learned: downloading a browser inside a test run would make the run depend on the network, so installation is a separate, explicit step and accept only checks for it. / 試験の実行中にブラウザをダウンロードすると実行がネットワークに依存するため、導入は別の明示的な手順にし、accept は有無を確かめるだけにする。 + 0.2 — 2026-11-05. Learned: a case that may skip in the profile a milestone is judged on cannot be a pass criterion, and a diagram that renders in one language half must parse in the other too. / 節目を判定するプロファイルでスキップし得るケースは合格基準になれず、片方の言語で描ける図はもう片方でも解析できなければならないと分かった。
                                                            • +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: a scenario without a rejection case proves only that the happy path renders; permission and authentication bugs are found by the case that must fail. / 拒否ケースのないシナリオは画面が出ることしか示さず、権限と認証の不具合は「失敗しなければならないケース」で初めて見つかると分かった。
                                                            • +
                                                            • Normative for: installer/acceptance/, grdm-dev accept, docs/demo/ result files, CI workflow acceptance-arm64.
                                                            • +
                                                            • Related: SPEC-00 Overview · SPEC-01 Manifest · SPEC-02 Installer CLI · SPEC-03 Security Gate · SPEC-05 Upstream Tracking · SPEC-06 Documentation Conventions · ADR-02 Network Model · ADR-03 Staged Security Gate · POL-01 Position · docs/README.md
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            1. Scope and tooling

                                                            +

                                                            Acceptance tests drive a real browser against the environment that SPEC-02 installed, the way a researcher would use it. They are written in Python with Playwright (a library that opens a browser and clicks, types, and reads pages for you) through pytest-playwright (a plugin that lets the pytest test runner hand each test a ready browser page).

                                                            +
                                                              +
                                                            • Location: installer/acceptance/, one file per scenario, named test_<scenario>.py.
                                                            • +
                                                            • Runner: grdm-dev accept [--profile ...] [--only <scenario>] [--json]. It runs pytest inside the same .venv/ that install.sh created (SPEC-02 §2.2) and exits 60 if any test fails.
                                                            • +
                                                            • Browsers: grdm-dev accept checks that Chromium is present under PLAYWRIGHT_BROWSERS_PATH=.venv/.playwright/ and, if not, exits 2 and prints the exact install command (pip install -e "installer[accept]" then playwright install chromium with that variable). The download is a one-time setup step, never part of a test run. Nothing is installed outside the venv.
                                                            • +
                                                            • Target URL: always http://127.0.0.1:<port> as published by compose render (ADR-02; defaults in the ports table of SPEC-02 §4). Tests read the ports from runtime/.env (GRDM_PORT_<SERVICE>); they never hard-code them.
                                                            • +
                                                            +

                                                            2. Test tiers

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TierWhereToolNeeds DockerWhat it proves
                                                            Unitinstaller/tests/unittestnoEach grdm_dev module and every exit code in SPEC-02 §6
                                                            Integrationinstaller/acceptance/integration/pytest + urllibyescompose up reaches health, API answers over HTTP, loopback-only binding
                                                            Acceptanceinstaller/acceptance/pytest-playwrightyesA person can do the core tasks in a browser, and forbidden actions are refused
                                                            +

                                                            grdm-dev accept runs integration first and stops before acceptance if integration fails, because a browser test against a half-started stack produces noise, not evidence.

                                                            +

                                                            3. Scenario rules

                                                            +
                                                              +
                                                            1. Every scenario has a success case and a rejection case. The rejection case is one of: an unauthenticated request, or a logged-in user doing something outside their permission. It asserts the HTTP status (401, 403, or 404 as the product defines) or a visible error message, never "the page looked wrong".
                                                            2. +
                                                            3. Deterministic. No sleep for luck; wait for a selector, a network response, or a health state. A test that passes only on retry is a failed test.
                                                            4. +
                                                            5. Time-boxed. Each test has timeout=120s; the whole suite has 30 minutes. Exceeding either is a failure.
                                                            6. +
                                                            7. No external network. Tests set PLAYWRIGHT_OFFLINE=1 semantics by routing: any request whose host is not 127.0.0.1 is aborted and the test fails. This also catches containers that try to call the internet.
                                                            8. +
                                                            9. Disposable data only. Every run creates a fresh user, project, and files under a run id (acc-<timestamp>-<6 hex>), and deletes them in teardown. No real names, emails, or files of real people, ever (POL-01).
                                                            10. +
                                                            11. One assertion target per test. A test checks one scenario and one case; helpers live in installer/acceptance/conftest.py.
                                                            12. +
                                                            +

                                                            4. Core scenarios (M2)

                                                            +
                                                            core_scenarios[6]{id,scenario,success_case,rejection_case,services}:
                                                            +  C1,Login via fakecas,test user signs in and sees dashboard,"GET /dashboard without session -> 302 to login; API GET /v2/users/me/ -> 401","web api fakecas"
                                                            +  C2,Create project,new project appears with title and user as admin,"second user (contributor read-only) PATCH /v2/nodes/<id>/ -> 403","web api"
                                                            +  C3,Upload and download file,upload via waterbutler then download bytes equal,"anonymous GET of private file -> 401/403; non-contributor PUT -> 403","wb wb_worker osfstorage"
                                                            +  C4,Wiki collaborative edit,two browser contexts type and both see merged text,"logged-out context connecting to wiki websocket -> closed with 4401","web y_websocket sharejs"
                                                            +  C5,File preview,uploaded PDF renders in mfr iframe,"preview URL of private file without session -> 401/403","mfr unoconv"
                                                            +  C6,Institution admin screen,institution admin lists institution users,"ordinary user opens admin URL -> 403 or redirect; API -> 403","admin api"
                                                            +

                                                            Scenario C4 uses two independent Playwright browser contexts (two separate browsers in one test, with their own cookies) so that the second user's cursor and text appear in the first user's page through the y-websocket service. y_websocket is part of the core profile (SPEC-02 §4) because collaborative editing is an M2 scenario, so C4 runs and must pass in both core and full; it never skips.

                                                            +

                                                            5. Subsystem scenarios (M3)

                                                            +
                                                            subsystem_scenarios[5]{id,subsystem,success_case,rejection_case}:
                                                            +  S1,y-websocket,two contexts converge on same Wiki document within 5 s,"connection without valid token -> close code 4401, no document state leaked"
                                                            +  S2,rdmcp (MCP endpoint),"authenticated MCP client lists tools and reads one project resource","request without token -> 401; token of user B reading project of user A -> 403"
                                                            +  S3,aipf_mcp_data_grdm,"MCP data query returns the run's project metadata","query for a project id the user cannot see -> 403 or empty with explicit code"
                                                            +  S4,OASys,"OASys page loads and shows the run's project linked from GRDM","unauthenticated OASys API call -> 401"
                                                            +  S5,Shibboleth-SP via test IdP,"SP -> IdP login -> GRDM dashboard with institution attribute","IdP user without the eduPersonEntitlement required by SP -> SP error page, no GRDM session"
                                                            +

                                                            MCP (Model Context Protocol) is a standard way for an AI assistant to ask a service for tools and data; rdmcp and aipf_mcp_data_grdm expose GRDM through it. Their tests use an HTTP client in the same pytest session, not a browser.

                                                            +

                                                            5.1 Shibboleth scenario

                                                            +

                                                            With compose render --profile full --auth shibboleth (SPEC-02 §4) fakecas is removed and a bundled test IdP (identity provider: the server that checks who you are, like a university login page) answers for the SP (service provider: the part of GRDM that trusts the IdP). Mock attributes used by the test IdP (names like Test User 01, test01@idp.test) live only in installer/acceptance/fixtures/idp/ and are clearly labeled MOCK; they never resemble real institution attributes, as POL-01 requires for separating mock and real data.

                                                            +
                                                            sequenceDiagram
                                                            +  participant T as pytest-playwright
                                                            +  participant W as web (GRDM)
                                                            +  participant SP as shibboleth_sp
                                                            +  participant IdP as test_idp
                                                            +  T->>W: GET http://127.0.0.1:5000/login?campaign=institution
                                                            +  W-->>T: 302 to SP /Shibboleth.sso/Login
                                                            +  T->>SP: GET /Shibboleth.sso/Login
                                                            +  SP-->>T: 302 to IdP SSO URL (SAML AuthnRequest)
                                                            +  T->>IdP: POST username and password (mock user)
                                                            +  IdP-->>T: HTML form with SAML Response
                                                            +  T->>SP: POST /Shibboleth.sso/SAML2/POST
                                                            +  SP->>W: forward with attributes (eppn, mail, institution)
                                                            +  W-->>T: 302 to /dashboard, session cookie set
                                                            +  T->>T: assert dashboard visible, assert institution name shown
                                                            +  Note over T,IdP: Rejection: the mock user lacking entitlement stops at the SP error page and no GRDM cookie is set
                                                            +

                                                            6. Fixtures and test data

                                                            +
                                                              +
                                                            • conftest.py provides: run_id, base_urls (from runtime/.env), admin_user, user_a, user_b (created through the API with random passwords, deleted in teardown), tmp_pdf and tmp_txt (generated bytes, 1 KiB and 1 MiB).
                                                            • +
                                                            • Users are created with the --yes helper grdm-dev accept --seed, which calls the Django management command inside the web container. The admin user is created only for C6 and removed after.
                                                            • +
                                                            • Fixtures never read the host's home directory or environment beyond runtime/.env.
                                                            • +
                                                            +

                                                            7. Evidence

                                                            +

                                                            Each run writes, under docs/demo/runs/<run_id>/:

                                                            +
                                                            evidence:
                                                            +  results.toon: one line per test with id, case, status, duration_ms, http_status
                                                            +  results.json: same data, canonical, consumed by grdm-dev report
                                                            +  junit.xml: for CI and the GitHub checks tab
                                                            +  screenshots/: <test>_<case>.png, taken only on failure
                                                            +  trace: "off by default. With --trace, Playwright trace zips are retained only on failure and moved to runtime/reports/quarantine/<run_id>/ (0700, git-ignored, raw: may hold cookies and bodies). Any zip left under docs/demo/runs/ is sanitized member by member"
                                                            +

                                                            grdm-dev report (SPEC-02 §3) copies results.toon into the bundle. The demo document for the milestone (docs/demo/20_core_install_mac_studio.md and similar) links to the run folder; the TOON in the document must agree with results.json (docs check).

                                                            +

                                                            8. Pass criteria per milestone

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            MilestoneRequired greenHostNote
                                                            M2C1–C6, every success and rejection caseMac Studio arm64 (self-hosted runner)amd64: grdm-dev build --platform linux/amd64 succeeds on a GitHub runner; no acceptance
                                                            M3M2 plus S1–S5Mac Studio arm64Shibboleth profile run separately from fakecas profile
                                                            M4M3, unchanged after Python 3.13 migrationMac Studio arm64Acceptance is the regression gate for the port
                                                            M5M4 plus SPEC-03 final gateMac Studio arm64 and Ubuntu 24.04 amd64Full acceptance on both architectures
                                                            +

                                                            A milestone is not passed by the author of the change. The QAE role runs grdm-dev accept and records the run id in docs/status/; the owner approves (SPEC-00).

                                                            +

                                                            The Mac Studio self-hosted runner is registered only with the private -dev2027 repositories, never with this public repository (REF-01). The acceptance-arm64 workflow therefore runs there, and the QAE brings the run folder into docs/demo/runs/ here through a PR.

                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            1. 範囲と道具

                                                            +

                                                            受入試験は、SPEC-02 で導入した環境に対して本物のブラウザを動かし、研究者が使うのと同じ操作で確かめます。Python で書き、Playwright(ブラウザを開いてクリック・入力・読み取りを代わりにしてくれるライブラリ)を pytest-playwright(試験の実行器 pytest が各試験に準備済みのブラウザ画面を渡せるようにする追加部品)経由で使います。

                                                            +
                                                              +
                                                            • 置き場: installer/acceptance/。シナリオごとに一ファイル、名前は test_<シナリオ>.py。
                                                            • +
                                                            • 実行器: grdm-dev accept [--profile ...] [--only <シナリオ>] [--json]。install.sh が作った同じ .venv/ の中で pytest を動かし(SPEC-02 §2.2)、一件でも失敗すれば終了 60。
                                                            • +
                                                            • ブラウザ: grdm-dev accept は PLAYWRIGHT_BROWSERS_PATH=.venv/.playwright/ に Chromium があるかを確かめ、なければ終了コード 2 で導入コマンド(pip install -e "installer[accept]" のあと同じ変数を付けて playwright install chromium)をそのまま表示する。ダウンロードは一度だけの準備であり、試験の実行には含めない。venv の外には何も入れない。
                                                            • +
                                                            • 対象 URL: 常に compose render が公開した http://127.0.0.1:<ポート>(ADR-02。既定値は SPEC-02 §4 のポート表)。ポートは runtime/.env(GRDM_PORT_<SERVICE>)から読み、決め打ちしない。
                                                            • +
                                                            +

                                                            2. 試験の段

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            段場所道具Docker が要るか示すこと
                                                            単体installer/tests/unittest不要grdm_dev の各モジュールと SPEC-02 §6 の全終了コード
                                                            統合installer/acceptance/integration/pytest + urllib要るcompose up が健康に達し、API が HTTP で応え、ループバックにだけ結び付いている
                                                            受入installer/acceptance/pytest-playwright要る人がブラウザでコアの作業をでき、禁止された操作が拒まれる
                                                            +

                                                            grdm-dev accept は統合を先に動かし、統合が落ちたら受入の前で止まります。半分しか起動していない環境へのブラウザ試験は、証跡ではなく雑音になるからです。

                                                            +

                                                            3. シナリオの規則

                                                            +
                                                              +
                                                            1. すべてのシナリオに成功ケースと拒否ケースを置く。 拒否ケースは、未認証の要求か、ログイン済みの利用者が権限の外の操作をするもの。HTTP ステータス(製品の定義どおり 401・403・404)か、画面に見えるエラー文言を assert する。「画面が変だった」では確かめない。
                                                            2. +
                                                            3. 決定的に動く。 運に頼る sleep を使わず、セレクタ、ネットワーク応答、健康状態を待つ。再試行で通る試験は失敗した試験と見なす。
                                                            4. +
                                                            5. 時間を区切る。 各試験は timeout=120s、全体は 30 分。超えたら失敗。
                                                            6. +
                                                            7. 外部ネットワークに出ない。 経路の制御で、ホストが 127.0.0.1 でない要求はすべて中断し、その試験を失敗にする。これでインターネットへ出ようとするコンテナも見つかる。
                                                            8. +
                                                            9. 使い捨てのデータだけ。 毎回、実行 ID(acc-<時刻>-<6 桁の16進>)の下に新しい利用者・プロジェクト・ファイルを作り、後片付けで消す。実在の人の名前・メール・ファイルは決して使わない(POL-01)。
                                                            10. +
                                                            11. 一試験一対象。 一つの試験は一つのシナリオの一つのケースだけを確かめる。共通処理は installer/acceptance/conftest.py に置く。
                                                            12. +
                                                            +

                                                            4. コアのシナリオ(M2)

                                                            +
                                                            core_scenarios[6]{id,scenario,success_case,rejection_case,services}:
                                                            +  C1,fakecas でログイン,試験利用者がログインしダッシュボードを見る,"セッションなしで GET /dashboard -> ログインへ 302。API GET /v2/users/me/ -> 401","web api fakecas"
                                                            +  C2,プロジェクト作成,題名付きの新プロジェクトができ利用者が管理者になる,"二人目(読取のみの共同研究者)が PATCH /v2/nodes/<id>/ -> 403","web api"
                                                            +  C3,ファイルの上下載,waterbutler で上げたファイルを下ろしバイト列が一致,"匿名で非公開ファイルを GET -> 401/403。共同研究者でない人が PUT -> 403","wb wb_worker osfstorage"
                                                            +  C4,Wiki 共同編集,二つのブラウザ文脈で入力し双方に統合された文が見える,"ログアウトした文脈が wiki の websocket に接続 -> 4401 で切断","web y_websocket sharejs"
                                                            +  C5,ファイルプレビュー,上げた PDF が mfr の iframe に描かれる,"セッションなしで非公開ファイルのプレビュー URL -> 401/403","mfr unoconv"
                                                            +  C6,機関管理画面,機関管理者が機関の利用者一覧を見る,"一般利用者が管理 URL を開く -> 403 か転送。API -> 403","admin api"
                                                            +

                                                            シナリオ C4 は独立した二つの Playwright の「ブラウザ文脈」(一つの試験の中にある、cookie を別々に持つ二つのブラウザ)を使い、二人目の文字が y-websocket サービスを通して一人目の画面に現れることを確かめます。共同編集は M2 のシナリオなので y_websocket は core プロファイルに含まれ(SPEC-02 §4)、C4 は core でも full でも実行して合格が必須です。スキップはしません。

                                                            +

                                                            5. サブシステムのシナリオ(M3)

                                                            +
                                                            subsystem_scenarios[5]{id,subsystem,success_case,rejection_case}:
                                                            +  S1,y-websocket,二つの文脈が 5 秒以内に同じ Wiki 文書に収束する,"正しいトークンのない接続 -> 終了コード 4401。文書の内容は漏れない"
                                                            +  S2,rdmcp(MCP の口),"認証済みの MCP クライアントがツール一覧を得て一つのプロジェクト資源を読む","トークンなし -> 401。利用者 B のトークンで利用者 A のプロジェクトを読む -> 403"
                                                            +  S3,aipf_mcp_data_grdm,"MCP のデータ問い合わせが実行中のプロジェクトのメタデータを返す","見えないプロジェクト ID の問い合わせ -> 403、または明示のコード付きの空"
                                                            +  S4,OASys,"OASys の画面が開き、GRDM からリンクした実行中のプロジェクトが見える","未認証の OASys API 呼び出し -> 401"
                                                            +  S5,テスト IdP 経由の Shibboleth-SP,"SP -> IdP ログイン -> 機関属性付きで GRDM ダッシュボード","SP が要求する eduPersonEntitlement のない IdP 利用者 -> SP のエラー画面。GRDM のセッションは作られない"
                                                            +

                                                            MCP(Model Context Protocol)は、AI アシスタントがサービスに道具とデータを尋ねるための共通の決まりです。rdmcp と aipf_mcp_data_grdm は GRDM をこの決まりで公開します。これらの試験はブラウザでなく、同じ pytest セッション内の HTTP クライアントで行います。

                                                            +

                                                            5.1 Shibboleth のシナリオ

                                                            +

                                                            compose render --profile full --auth shibboleth(SPEC-02 §4)では fakecas を外し、同梱したテスト用 IdP(アイデンティティプロバイダ。大学のログイン画面のように「あなたが誰か」を確かめるサーバ)が SP(サービスプロバイダ。IdP を信頼する GRDM 側の部品)に応えます。テスト IdP の模擬属性(Test User 01、test01@idp.test のような名前)は installer/acceptance/fixtures/idp/ にだけ置き、MOCK と明記します。実在の機関の属性に似せてはならず、模擬と実データの分離は POL-01 の要求どおりです。

                                                            +
                                                            sequenceDiagram
                                                            +  participant T as pytest-playwright
                                                            +  participant W as web(GRDM)
                                                            +  participant SP as shibboleth_sp
                                                            +  participant IdP as test_idp
                                                            +  T->>W: GET http://127.0.0.1:5000/login?campaign=institution
                                                            +  W-->>T: SP の /Shibboleth.sso/Login へ 302
                                                            +  T->>SP: GET /Shibboleth.sso/Login
                                                            +  SP-->>T: IdP の SSO URL へ 302(SAML AuthnRequest)
                                                            +  T->>IdP: 利用者名とパスワードを POST(模擬利用者)
                                                            +  IdP-->>T: SAML Response 入りの HTML フォーム
                                                            +  T->>SP: POST /Shibboleth.sso/SAML2/POST
                                                            +  SP->>W: 属性(eppn・mail・機関)を付けて転送
                                                            +  W-->>T: /dashboard へ 302。セッション cookie を設定
                                                            +  T->>T: ダッシュボードが見えること、機関名が表示されることを assert
                                                            +  Note over T,IdP: 拒否: entitlement のない模擬利用者は SP のエラー画面で止まり、GRDM の cookie は作られない
                                                            +

                                                            6. フィクスチャと試験データ

                                                            +
                                                              +
                                                            • conftest.py が提供するもの: run_id、base_urls(runtime/.env から)、admin_user・user_a・user_b(API で乱数パスワード付きに作り、後片付けで消す)、tmp_pdf・tmp_txt(生成したバイト列。1 KiB と 1 MiB)。
                                                            • +
                                                            • 利用者は --yes 付きの補助 grdm-dev accept --seed で作り、これは web コンテナ内の Django 管理コマンドを呼ぶ。管理者利用者は C6 のためだけに作り、終わったら消す。
                                                            • +
                                                            • フィクスチャは runtime/.env 以外に、ホストのホームディレクトリや環境変数を読まない。
                                                            • +
                                                            +

                                                            7. 証跡

                                                            +

                                                            毎回の実行は docs/demo/runs/<run_id>/ の下に次を書きます。

                                                            +
                                                            evidence:
                                                            +  results.toon: 試験ごとに一行。id・case・status・duration_ms・http_status
                                                            +  results.json: 同じデータの正本。grdm-dev report が読む
                                                            +  junit.xml: CI と GitHub の checks タブ向け
                                                            +  screenshots/: <試験>_<ケース>.png。失敗時だけ撮る
                                                            +  trace: "既定では記録しない。--trace のときだけ失敗時に Playwright のトレース zip を残し、runtime/reports/quarantine/<run_id>/(0700、git 管理外、生データで cookie や本文を含み得る)へ隔離する。docs/demo/runs/ に残った zip はメンバー単位で無害化する"
                                                            +

                                                            grdm-dev report(SPEC-02 §3)が results.toon を束に写します。節目の実証文書(docs/demo/20_core_install_mac_studio.md およびその類)は実行フォルダへリンクし、文書内の TOON は results.json と一致していなければなりません(docs check)。

                                                            +

                                                            8. 節目ごとの合格基準

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            節目全件合格が必要なものホスト備考
                                                            M2C1〜C6 の成功・拒否ケースすべてMac Studio arm64(セルフホストランナー)amd64 は GitHub ランナーで grdm-dev build --platform linux/amd64 が成功すること。受入は行わない
                                                            M3M2 に加え S1〜S5Mac Studio arm64Shibboleth プロファイルは fakecas プロファイルと別に実行
                                                            M4M3 が Python 3.13 移植後も変わらず合格Mac Studio arm64受入が移植の回帰判定の門になる
                                                            M5M4 に加え SPEC-03 の最終の門Mac Studio arm64 と Ubuntu 24.04 amd64両アーキテクチャで全受入
                                                            +

                                                            節目の合格は変更の作者が判定しません。QAE(QA担当)の役割が grdm-dev accept を実行し、実行 ID を docs/status/ に記録し、所有者が承認します(SPEC-00)。

                                                            +

                                                            Mac Studio のセルフホストランナーは非公開の -dev2027 リポジトリにだけ登録し、公開のこのリポジトリには登録しません(REF-01)。そのため acceptance-arm64 ワークフローはそちらで動き、QAE が実行フォルダを PR でこのリポジトリの docs/demo/runs/ へ持ち込みます。

                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            PlaywrightA library that opens a browser and clicks, types, and reads pages for you.ブラウザを開き、クリック・入力・読み取りを代わりにしてくれるライブラリ。
                                                            pytestA Python tool that finds and runs test functions and reports which passed.Python の試験関数を見つけて動かし、合否を報告する道具。
                                                            Browser contextA separate browser session with its own cookies, inside one test.一つの試験の中にある、cookie を別々に持つ独立したブラウザのセッション。
                                                            FixtureReady-made test data or setup that a test receives before it starts.試験が始まる前に受け取る、用意済みのデータや準備。
                                                            IdP / SPThe server that checks who you are / the service that trusts that answer.「あなたが誰か」を確かめるサーバ/その答えを信頼するサービス。
                                                            SAMLThe message format an IdP and an SP use to pass a login result.IdP と SP がログイン結果を渡し合うための文書の形式。
                                                            MCPA standard way for an AI assistant to ask a service for tools and data.AI アシスタントがサービスに道具とデータを尋ねるための共通の決まり。
                                                            JUnit XMLA common file format that CI systems read to show test results.CI が試験結果を表示するために読む、よく使われるファイル形式。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/spec/05_upstream_tracking/index.html b/site/spec/05_upstream_tracking/index.html new file mode 100644 index 0000000..5ef2960 --- /dev/null +++ b/site/spec/05_upstream_tracking/index.html @@ -0,0 +1,3125 @@ + + + + + + + + + + + + + + + + + + + + + + + SPEC-05 Upstream Tracking / 上流追従 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            SPEC-05 Upstream Tracking / 上流追従

                                                            +
                                                            +

                                                            Summary: How the integration repositories stay current with their upstreams: a daily job mirrors the upstream/* branches and writes a diff report, a weekly job lets an AI agent open one integration PR per repository, conflicts are solved on the PR, review and checks are automatic, and only merge and publish are human. Also how the COS original is tracked for reference and what happens if COS archives OSF. +概要: 統合リポジトリを上流に追従させる仕組み。日次ジョブが upstream/* をミラーして差分報告を書き、週次ジョブで AI エージェントがリポジトリごとに統合 PR を一本開く。衝突は PR 上で解く。レビューと検査は自動、マージと公開だけが人。COS 本家を参照用に追う方法と、COS が OSF を凍結したときの扱いも定める。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: the 2026-11-05 survey found eleven upstreams that moved on five different days in one week; without a daily mirror and a weekly merge the integration branch would drift into large, unreviewable conflicts. / 2026-11-05 の調査で、上流 11 本が一週間に 5 つの異なる日に動いていた。日次ミラーと週次マージが無ければ、統合ブランチは大きくレビュー不能な衝突にはまると分かった。
                                                            • +
                                                            • Normative for: the upstream-mirror and upstream-integrate workflows in every RDM-<name>-dev2027 repository, the grdm-dev upstream subcommand (SPEC-02), and docs/status/upstream/.
                                                            • +
                                                            • Related: SPEC-00 Overview · SPEC-01 Manifest · SPEC-06 Documentation conventions · POL-01 Position · ADR-01 Integration repository placement · ADR-04 AI autonomy and roles · docs/README.md
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            1. Branches that are tracked

                                                            +

                                                            Every integration repository RDM-<name>-dev2027 (SPEC-00 §3) has one tracking branch (a read-only copy of a branch that lives in another repository) per upstreams[] entry of the manifest (SPEC-01 §3). The name is upstream/<kind>-<branch>, where <branch> is the upstream branch name with every / replaced by -; a second upstream of the same kind inserts a tag, upstream/<kind>-<tag>-<branch> (SPEC-01 §4 rule 7).

                                                            +
                                                            tracking[4]{branch,source,kind,merged_into_develop,examples}:
                                                            +  upstream/public-<branch>,"RDM-<name> default branch",public,yes,"upstream/public-develop (osf.io, waterbutler, mfr, cas-overlay, wiki-frontend); upstream/public-master (ember-osf-web, y-websocket)"
                                                            +  upstream/private-<branch>,"RDM-<name>-*-private default branch",private,yes,"upstream/private-develop; upstream/private-master (ember-osf-web, y-websocket); upstream/private-main (OASys, Shibboleth-SP, rdmcp, aipf_mcp_data_grdm)"
                                                            +  upstream/cos-develop,"CenterForOpenScience/<name> develop",cos,no (compare only),"five cores; wiki-frontend has no COS original"
                                                            +  upstream/<kind>-<tag>-<branch>,"a second upstream of the same kind",private,no (candidate),"upstream/private-sec-test-fix-sec-test = RDM-osf.io-private fix/sec-test"
                                                            +

                                                            A component has only the branches its manifest entry lists: the five private subsystems have upstream/private-main alone; the cores have public, private, and (except wiki-frontend) cos.

                                                            +

                                                            Rules that never bend:

                                                            +
                                                              +
                                                            • upstream/* branches are written only by the mirror job. No human and no agent commits to them.
                                                            • +
                                                            • upstream/* branches are never rewritten. The mirror job fast-forwards; if the source itself was force-pushed, the job stops, keeps the old branch, and opens an issue.
                                                            • +
                                                            • Nobody force-pushes anywhere in a -dev2027 repository. Branch protection on develop enforces this.
                                                            • +
                                                            +

                                                            2. Daily job: mirror and diff report

                                                            +

                                                            The upstream-mirror workflow runs once a day (03:00 JST) in each -dev2027 repository, and can be run by hand with grdm-dev upstream mirror.

                                                            +
                                                              +
                                                            1. Fetch each source repository at the branch named in the manifest.
                                                            2. +
                                                            3. Fast-forward the matching tracking_branch. Record the new SHA (the 40-character fingerprint of a commit).
                                                            4. +
                                                            5. Compare each upstream/* branch with develop and with the SHA pinned in the manifest (SPEC-01).
                                                            6. +
                                                            7. Write the diff report and push it to this public repository as a PR-less commit on a bot branch status/upstream, which a daily PR brings into develop.
                                                            8. +
                                                            +

                                                            Where the report lives. Chosen: docs/status/upstream/latest.toon is overwritten every day, and the same content is archived as docs/status/upstream/archive/YYYY-MM-DD.toon. Archives older than 90 days are deleted by the job. The report is in TOON (a compact text form of JSON; SPEC-06 §4); the canonical JSON sits beside it as latest.json.

                                                            +
                                                            +

                                                            Warning: The report is public. It contains repository names, branch names, SHAs, and commit counts only. It never contains commit messages, author names, file paths, or diff text from private upstreams.

                                                            +
                                                            +

                                                            Example report:

                                                            +
                                                            report:
                                                            +  generated_at: 2026-11-05T03:00:12+09:00
                                                            +  repositories[2]:
                                                            +    - integration_repo: RDM-osf.io-dev2027
                                                            +      develop_sha: 1111111111111111111111111111111111111111
                                                            +      upstreams[3]{branch,kind,sha,ahead_of_develop,behind_develop,manifest_sha_matches,moved_since_yesterday}:
                                                            +        upstream/public-develop,public,2222222222222222222222222222222222222222,14,0,false,true
                                                            +        upstream/private-develop,private,3333333333333333333333333333333333333333,0,0,true,false
                                                            +        upstream/cos-develop,cos,4444444444444444444444444444444444444444,310,0,true,true
                                                            +      action: integrate
                                                            +    - integration_repo: RDM-wiki-frontend-dev2027
                                                            +      develop_sha: 5555555555555555555555555555555555555555
                                                            +      upstreams[2]{branch,kind,sha,ahead_of_develop,behind_develop,manifest_sha_matches,moved_since_yesterday}:
                                                            +        upstream/public-develop,public,6666666666666666666666666666666666666666,0,0,true,false
                                                            +        upstream/private-develop,private,6666666666666666666666666666666666666666,0,0,true,false
                                                            +      action: none
                                                            +  summary:
                                                            +    repositories_needing_integration: 1
                                                            +    force_push_detected: 0
                                                            +

                                                            The repeated digits are placeholders for the example only. action is integrate when any merged upstream is ahead of develop, none otherwise, and halt when a force-push was detected.

                                                            +

                                                            3. Weekly integration PR

                                                            +

                                                            The upstream-integrate workflow runs once a week (Monday 04:00 JST), or by hand with grdm-dev upstream integrate, and is executed by an AI agent in the AID role (an AI agent is a program that reads instructions, edits code, and reports back). For each -dev2027 repository whose latest report says integrate:

                                                            +
                                                            sequenceDiagram
                                                            +  autonumber
                                                            +  participant Mir as Daily mirror
                                                            +  participant AID as AID agent (Open Code 2)
                                                            +  participant Repo as RDM-name-dev2027
                                                            +  participant CI as CI (build, scan, acceptance)
                                                            +  participant REV as REV (Codex Astra)
                                                            +  participant QAE as QAE (Claude Code Fable)
                                                            +  participant Own as Owner
                                                            +
                                                            +  Mir->>Repo: fast-forward upstream/* branches
                                                            +  Mir->>AID: latest.toon says integrate
                                                            +  AID->>Repo: branch integrate/YYYY-MM-DD from develop
                                                            +  AID->>Repo: merge upstream/public-<branch> (if any)
                                                            +  AID->>Repo: merge upstream/private-<branch>
                                                            +  AID->>Repo: re-apply adopted_prs in manifest order
                                                            +  AID->>Repo: open PR with manifest SHA bump
                                                            +  Repo->>CI: build arm64/amd64, Trivy, Semgrep, acceptance
                                                            +  CI-->>AID: results on PR
                                                            +  AID->>Repo: fix conflicts and failures on the same branch
                                                            +  REV->>Repo: review, record in docs/reviews/
                                                            +  QAE->>Repo: check regression and acceptance verdict
                                                            +  Own->>Repo: merge to develop
                                                            +  Own->>Repo: publish images (optional)
                                                            +

                                                            Steps in words:

                                                            +
                                                              +
                                                            1. Create branch integrate/YYYY-MM-DD from develop.
                                                            2. +
                                                            3. Merge the public tracking branch with status: merged (upstream/public-develop for osf.io, upstream/public-master for ember-osf-web); the private subsystems have none and skip this step. Then merge the private tracking branch (upstream/private-develop, upstream/private-master, or upstream/private-main). Candidate upstreams such as upstream/private-sec-test-fix-sec-test are never merged. Then re-apply each adopted_prs[] entry from the manifest in list order (git cherry-pick of the PR's commits, or git merge of its branch when the PR is still open).
                                                            4. +
                                                            5. Open one PR per repository titled 統合: upstream YYYY-MM-DD(<name>). The PR body lists the three source SHAs, the commit counts, and the adopted PRs touched. In this public repository, a matching PR bumps manifest/upstreams.json and upstreams.toon to the new SHAs (SPEC-01 §4 rule 2).
                                                            6. +
                                                            7. CI runs the build, the security gate (SPEC-03), and the acceptance tests (SPEC-04).
                                                            8. +
                                                            +

                                                            4. Conflict handling

                                                            +

                                                            A merge conflict happens when two sides changed the same lines and Git cannot choose. On the integration PR:

                                                            +
                                                              +
                                                            • The AID agent resolves conflicts on the PR branch with ordinary commits. It explains each resolution in the commit body in Japanese.
                                                            • +
                                                            • Resolution preference: keep the private change when the conflict is a security fix; keep the public change when it is a feature; when unclear, keep both behind a comment and label the PR needs-owner-decision.
                                                            • +
                                                            • The agent never force-pushes the PR branch, never rebases it after review began, never touches upstream/*, and never edits develop directly.
                                                            • +
                                                            • If an adopted PR no longer applies, the agent does not drop it silently: it marks that entry candidate with reason: "no longer applies after <sha>" in the manifest PR and labels the PR adopted-pr-broken.
                                                            • +
                                                            • If CI fails for reasons the agent cannot fix within its budget, it leaves the PR open with a summary comment and the daily report keeps saying integrate.
                                                            • +
                                                            +

                                                            5. Review, check, merge

                                                            +
                                                              +
                                                            • REV (Codex Astra) reviews every integration PR and writes docs/reviews/YYYY-MM-DD_Upstream_Integration_<name>_rN.md plus PR comments.
                                                            • +
                                                            • QAE (Claude Code Fable) checks the regression and acceptance results and records the verdict on the PR.
                                                            • +
                                                            • Owner merges. Squash is forbidden on integration PRs (it would hide upstream history); use a merge commit.
                                                            • +
                                                            • No agent merges. The autonomy boundary is detection → fix PR → review → regression and acceptance automatic; merge and publish human (ADR-04).
                                                            • +
                                                            +

                                                            6. COS reference tracking

                                                            +

                                                            CenterForOpenScience/* repositories are mirrored to upstream/cos-develop only. They are never merged, because RCOSDP's code has diverged for years. They are used to:

                                                            +
                                                              +
                                                            • Compare how COS solved the same modernization (for example the Python 3.12 port of osf.io) when we do ours at M4.
                                                            • +
                                                            • Spot security fixes COS made that RCOSDP has not yet made; the weekly PR body lists commits on upstream/cos-develop whose message mentions CVE, security, or vuln.
                                                            • +
                                                            +

                                                            If COS archives OSF (an archived repository is frozen read-only by its owner):

                                                            +
                                                              +
                                                            1. The mirror job detects the archived flag and stops fetching that source.
                                                            2. +
                                                            3. The manifest keeps the last cos SHA with fetched_at frozen and kind: cos, plus a note archived: YYYY-MM-DD.
                                                            4. +
                                                            5. upstream/cos-develop stays in the repository as history. Nothing else changes: the daily mirror, the weekly PR, the security gate, and the AI vulnerability work continue on public and private upstreams and on our own develop. This is the point of POL-01: GRDM keeps building whether COS does or not.
                                                            6. +
                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            1. 追跡するブランチ

                                                            +

                                                            すべての統合リポジトリ RDM-<name>-dev2027(SPEC-00 §3)には、マニフェストの upstreams[] の要素ごとに一本の「追跡ブランチ」(他のリポジトリにあるブランチの読み取り専用の写し)があります(SPEC-01 §3)。名前は upstream/<kind>-<branch> で、<branch> は上流のブランチ名の / をすべて - に置き換えたものです。同じ kind の上流が二つあるときは upstream/<kind>-<tag>-<branch> とタグを挟みます(SPEC-01 §4 の規則 7)。

                                                            +
                                                            tracking[4]{branch,source,kind,merged_into_develop,examples}:
                                                            +  upstream/public-<branch>,"RDM-<name> の既定ブランチ",public,yes,"upstream/public-develop(osf.io、waterbutler、mfr、cas-overlay、wiki-frontend)、upstream/public-master(ember-osf-web、y-websocket)"
                                                            +  upstream/private-<branch>,"RDM-<name>-*-private の既定ブランチ",private,yes,"upstream/private-develop、upstream/private-master(ember-osf-web、y-websocket)、upstream/private-main(OASys、Shibboleth-SP、rdmcp、aipf_mcp_data_grdm)"
                                                            +  upstream/cos-develop,"CenterForOpenScience/<name> の develop",cos,no(比較のみ),"コア 5 本。wiki-frontend には COS 本家がない"
                                                            +  upstream/<kind>-<tag>-<branch>,"同じ kind の二つ目の上流",private,no(候補),"upstream/private-sec-test-fix-sec-test = RDM-osf.io-private の fix/sec-test"
                                                            +

                                                            部品が持つのはマニフェストの要素に対応するブランチだけです。非公開サブシステム 5 本は upstream/private-main のみ、コアは public・private と(wiki-frontend 以外は)cos を持ちます。

                                                            +

                                                            決して曲げない規則:

                                                            +
                                                              +
                                                            • upstream/* に書くのは ミラージョブだけ です。人もエージェントもコミットしません。
                                                            • +
                                                            • upstream/* は 書き換えません。ミラージョブは fast-forward(まっすぐ前に進める)だけを行い、元のリポジトリ側が force push されていたら止まって、古いブランチを残し、Issue を開きます。
                                                            • +
                                                            • -dev2027 のどこにも force push しません。develop のブランチ保護がこれを強制します。
                                                            • +
                                                            +

                                                            2. 日次ジョブ: ミラーと差分報告

                                                            +

                                                            upstream-mirror ワークフローは、各 -dev2027 リポジトリで毎日一回(JST 03:00)動きます。手で動かすなら grdm-dev upstream mirror です。

                                                            +
                                                              +
                                                            1. 各元リポジトリをマニフェストの branch で取得する。
                                                            2. +
                                                            3. 対応する tracking_branch を fast-forward する。新しい SHA(コミットの 40 文字の指紋)を記録する。
                                                            4. +
                                                            5. 各 upstream/* を develop と、マニフェスト(SPEC-01)に固定した SHA と比べる。
                                                            6. +
                                                            7. 差分報告を書き、この公開リポジトリのボット用ブランチ status/upstream にコミットする。日次の PR がそれを develop に取り込む。
                                                            8. +
                                                            +

                                                            報告の置き場。 採用: docs/status/upstream/latest.toon を毎日上書きし、同じ内容を docs/status/upstream/archive/YYYY-MM-DD.toon として保管します。90 日より古い保管分はジョブが削除します。報告は TOON(JSON を短く字下げで書いた形。SPEC-06 §4)で、正本の JSON を latest.json として隣に置きます。

                                                            +
                                                            +

                                                            Warning: 報告は公開です。中身はリポジトリ名、ブランチ名、SHA、コミット数だけです。private の上流のコミットメッセージ、作者名、ファイルパス、差分の本文は決して含めません。

                                                            +
                                                            +

                                                            報告の例:

                                                            +
                                                            report:
                                                            +  generated_at: 2026-11-05T03:00:12+09:00
                                                            +  repositories[2]:
                                                            +    - integration_repo: RDM-osf.io-dev2027
                                                            +      develop_sha: 1111111111111111111111111111111111111111
                                                            +      upstreams[3]{branch,kind,sha,ahead_of_develop,behind_develop,manifest_sha_matches,moved_since_yesterday}:
                                                            +        upstream/public-develop,public,2222222222222222222222222222222222222222,14,0,false,true
                                                            +        upstream/private-develop,private,3333333333333333333333333333333333333333,0,0,true,false
                                                            +        upstream/cos-develop,cos,4444444444444444444444444444444444444444,310,0,true,true
                                                            +      action: integrate
                                                            +    - integration_repo: RDM-wiki-frontend-dev2027
                                                            +      develop_sha: 5555555555555555555555555555555555555555
                                                            +      upstreams[2]{branch,kind,sha,ahead_of_develop,behind_develop,manifest_sha_matches,moved_since_yesterday}:
                                                            +        upstream/public-develop,public,6666666666666666666666666666666666666666,0,0,true,false
                                                            +        upstream/private-develop,private,6666666666666666666666666666666666666666,0,0,true,false
                                                            +      action: none
                                                            +  summary:
                                                            +    repositories_needing_integration: 1
                                                            +    force_push_detected: 0
                                                            +

                                                            同じ数字の並びは例のための仮の値です。action は、マージ対象の上流のどれかが develop より進んでいれば integrate、そうでなければ none、force push を検出したら halt です。

                                                            +

                                                            3. 週次の統合 PR

                                                            +

                                                            upstream-integrate ワークフローは週一回(月曜 JST 04:00)に動きます。手で動かすなら grdm-dev upstream integrate です。実行するのは AID 役の AI エージェント(指示を読み、コードを直し、結果を報告するプログラム)です。最新の報告が integrate と言う -dev2027 リポジトリごとに次を行います。

                                                            +
                                                            sequenceDiagram
                                                            +  autonumber
                                                            +  participant Mir as 日次ミラー
                                                            +  participant AID as AID エージェント(Open Code 2)
                                                            +  participant Repo as RDM-name-dev2027
                                                            +  participant CI as CI(ビルド・スキャン・受入)
                                                            +  participant REV as REV(Codex Astra)
                                                            +  participant QAE as QAE(Claude Code Fable)
                                                            +  participant Own as 所有者
                                                            +
                                                            +  Mir->>Repo: upstream/* を fast-forward
                                                            +  Mir->>AID: latest.toon が integrate
                                                            +  AID->>Repo: develop から integrate/YYYY-MM-DD を作る
                                                            +  AID->>Repo: upstream/public-<branch> をマージ(あれば)
                                                            +  AID->>Repo: upstream/private-<branch> をマージ
                                                            +  AID->>Repo: adopted_prs をマニフェストの順に再適用
                                                            +  AID->>Repo: マニフェストの SHA 更新を添えて PR を開く
                                                            +  Repo->>CI: arm64/amd64 ビルド、Trivy、Semgrep、受入
                                                            +  CI-->>AID: 結果を PR に
                                                            +  AID->>Repo: 同じブランチで衝突と失敗を直す
                                                            +  REV->>Repo: レビューし docs/reviews/ に記録
                                                            +  QAE->>Repo: 回帰・受入の判定を記録
                                                            +  Own->>Repo: develop へマージ
                                                            +  Own->>Repo: イメージを公開(任意)
                                                            +

                                                            言葉で書くと:

                                                            +
                                                              +
                                                            1. develop から integrate/YYYY-MM-DD ブランチを作る。
                                                            2. +
                                                            3. status: merged の public の追跡ブランチ(osf.io は upstream/public-develop、ember-osf-web は upstream/public-master)をマージする。非公開サブシステムにはこれがないので飛ばす。次に private の追跡ブランチ(upstream/private-develop、upstream/private-master、または upstream/private-main)をマージする。upstream/private-sec-test-fix-sec-test のような候補の上流は決してマージしない。最後にマニフェストの adopted_prs[] を並び順に再適用する(PR のコミットを git cherry-pick。PR がまだ開いていればそのブランチを git merge)。
                                                            4. +
                                                            5. リポジトリごとに一本の PR を 統合: upstream YYYY-MM-DD(<name>) の題で開く。PR 本文には三つの元 SHA、コミット数、触った採用 PR を書く。この公開リポジトリ側では、対になる PR が manifest/upstreams.json と upstreams.toon を新しい SHA に進める(SPEC-01 §4 の規則 2)。
                                                            6. +
                                                            7. CI がビルド、セキュリティ門(SPEC-03)、受入試験(SPEC-04)を実行する。
                                                            8. +
                                                            +

                                                            4. 衝突の扱い

                                                            +

                                                            「マージの衝突」は、両側が同じ行を変えていて Git が選べないときに起きます。統合 PR では:

                                                            +
                                                              +
                                                            • AID エージェントは衝突を PR のブランチ上で 通常のコミットとして解きます。解き方の理由をコミット本文に日本語で書きます。
                                                            • +
                                                            • 優先順: セキュリティ修正の衝突なら private 側を残す。機能の衝突なら public 側を残す。判断できないときは両方をコメント付きで残し、PR にラベル needs-owner-decision を付ける。
                                                            • +
                                                            • エージェントは PR ブランチを 決して force push せず、レビュー開始後に rebase せず、upstream/* に触れず、develop を直接編集しません。
                                                            • +
                                                            • 採用 PR が当たらなくなったら、黙って落とさず、マニフェストの PR でその項目を candidate にして reason: "no longer applies after <sha>" を書き、PR にラベル adopted-pr-broken を付けます。
                                                            • +
                                                            • 予算内で直せない理由で CI が落ちたら、要約コメントを残して PR を開いたままにします。日次報告は integrate を出し続けます。
                                                            • +
                                                            +

                                                            5. レビュー・検査・マージ

                                                            +
                                                              +
                                                            • REV(Codex Astra) が全統合 PR をレビューし、docs/reviews/YYYY-MM-DD_Upstream_Integration_<name>_rN.md と PR コメントに書きます。
                                                            • +
                                                            • QAE(Claude Code Fable) が回帰・受入の結果を検査し、判定を PR に記録します。
                                                            • +
                                                            • 所有者 がマージします。統合 PR では squash(複数コミットを一つに潰す)を禁止します。上流の履歴が消えるからです。マージコミットを使います。
                                                            • +
                                                            • エージェントはマージしません。自律の境界は、検出 → 修正 PR → レビュー → 回帰・受入 までが自動、マージと公開 が人です(ADR-04)。
                                                            • +
                                                            +

                                                            6. COS 本家の参照追跡

                                                            +

                                                            CenterForOpenScience/* は upstream/cos-develop にミラーするだけです。RCOSDP のコードは何年も前に分かれているので、マージはしません。使い方は次の二つです。

                                                            +
                                                              +
                                                            • 同じ近代化(例: osf.io の Python 3.12 移植)を COS がどう解いたかを、M4 で私たちが移植するときに比べる。
                                                            • +
                                                            • COS が行い RCOSDP がまだ行っていないセキュリティ修正を見つける。週次 PR の本文に、upstream/cos-develop のコミットのうちメッセージに CVE・security・vuln を含むものを列挙する。
                                                            • +
                                                            +

                                                            COS が OSF をアーカイブしたら(「アーカイブ」は持ち主がリポジトリを読み取り専用に凍結すること):

                                                            +
                                                              +
                                                            1. ミラージョブがアーカイブの印を検出し、その元の取得を止める。
                                                            2. +
                                                            3. マニフェストは最後の cos の SHA を fetched_at を凍結して kind: cos のまま保ち、archived: YYYY-MM-DD の注を足す。
                                                            4. +
                                                            5. upstream/cos-develop は履歴としてリポジトリに残す。ほかは何も変わらない。日次ミラー、週次 PR、セキュリティ門、AI による脆弱性対応は、public と private の上流と私たち自身の develop の上で続く。これが POL-01 の要点で、COS が続けても止めても GRDM は組み続けられる。
                                                            6. +
                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            MirrorA copy that is kept identical to the original.元と同じ中身に保たれる写し。
                                                            Fast-forwardMoving a branch straight ahead to a newer commit without creating a merge.マージを作らずにブランチを新しいコミットへまっすぐ進めること。
                                                            Force pushOverwriting a branch's history on the server. Forbidden here.サーバ上のブランチの履歴を上書きすること。ここでは禁止。
                                                            Merge conflictTwo sides changed the same lines and Git cannot choose.両側が同じ行を変えて Git が選べない状態。
                                                            Cherry-pickCopying one commit from one branch onto another.あるブランチの一つのコミットを別のブランチに写すこと。
                                                            SquashCombining several commits into one, losing the individual history.複数のコミットを一つに潰し、個々の履歴を失うこと。
                                                            Archived repositoryA repository its owner froze read-only.持ち主が読み取り専用に凍結したリポジトリ。
                                                            CVEA public identification number for one known vulnerability.一つの既知の脆弱性に付く公開の識別番号。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/spec/06_documentation_conventions/index.html b/site/spec/06_documentation_conventions/index.html new file mode 100644 index 0000000..20b9df5 --- /dev/null +++ b/site/spec/06_documentation_conventions/index.html @@ -0,0 +1,3172 @@ + + + + + + + + + + + + + + + + + + + + + + + SPEC-06 Documentation Conventions / 文書規約 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            SPEC-06 Documentation Conventions / 文書規約

                                                            +
                                                            +

                                                            Summary: How every document in this repository is written: bilingual layout, glossary notes, diagrams, data, versions, and links. +概要: このリポジトリの全文書の書き方。英和二部構成、用語注、図、データ、版、リンクの規則。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.3 — 2026-11-05. Learned: the written description of a check drifts from the tool as soon as the tool improves, so §8 must be re-read against tools/docs_check.py on every change to either (review r2, R2-03). / 検査の説明は道具が良くなった瞬間に古くなるため、どちらかを変えるたびに §8 と tools/docs_check.py を突き合わせる必要があると分かった(レビュー r2、R2-03)。 + 0.2 — 2026-11-05. Learned: a convention is only as strong as the check that enforces it, so the convention must name what the checker does today, what it leaves out, and which legacy files are exempt. / 規約の強さは、それを守らせる検査の強さまでしかない。だから規約は、検査が今日何を見て何を見ないか、どの旧資料を例外にするかを名指しで書く必要があると分かった。
                                                            • +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: a shared convention must exist before any other document, or the English/Japanese halves and glossary notes drift from the first page onward. / 他の文書より先に共通規約を置かないと、初めの一枚から英和の対応と用語注がずれると分かった。
                                                            • +
                                                            • Normative for: every *.md under this repository, including README.md at every directory level.
                                                            • +
                                                            • Related: SPEC-00 Overview · POL-01 Position · docs/README.md
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            1. Scope

                                                            +

                                                            This specification governs the form of documents, not their content. It applies to all Markdown files in the repository: policies (POL-nn), specifications (00–nn), decisions (ADR-nn), references (REF-nn), demos, hand-offs, reviews, status boards, guides, and every README.md.

                                                            +

                                                            Glossary notes. A specification is a rule book that implementers must follow. A policy is the position we take. A decision record (ADR) is a note that explains why we chose one way and not another.

                                                            +

                                                            2. Page layout (mandatory order)

                                                            +
                                                              +
                                                            1. # <ID> <Title in English> / <日本語題> — one H1 only.
                                                            2. +
                                                            3. A blockquote with Summary (English, one or two sentences) and 概要 (Japanese).
                                                            4. +
                                                            5. A Jump line with two links: [English](#english) and [日本語](#japanese).
                                                            6. +
                                                            7. A Version / 版 line (see §6), Normative for or Applies to, and Related links.
                                                            8. +
                                                            9. ---
                                                            10. +
                                                            11. <a id="english"></a> then ## English, first line [→ 日本語版へ](#japanese), then the English body.
                                                            12. +
                                                            13. ---
                                                            14. +
                                                            15. <a id="japanese"></a> then ## 日本語, first line [→ To English](#english), then the Japanese body.
                                                            16. +
                                                            17. Optional ## Glossary / 用語 table at the end, bilingual.
                                                            18. +
                                                            +

                                                            The two halves say the same thing. The English half is the one translated into other languages later; the Japanese half is the one the GRDM team reviews. When they disagree, fix both in the same commit.

                                                            +

                                                            Why HTML anchors? GitHub and MkDocs generate heading anchors differently, and Japanese headings produce unstable ids. An explicit <a id="..."> works in both. Anchor ids are lowercase ASCII with hyphens.

                                                            +

                                                            3. Writing style

                                                            +
                                                              +
                                                            • Target reader: a new employee on their first week. Assume they can use a terminal but have never seen GRDM.
                                                            • +
                                                            • One idea per sentence. Prefer verbs. Avoid "etc." — list the items or say "and similar".
                                                            • +
                                                            • Every technical term gets a glossary note the first time it appears in a document, in parentheses or as a bold-lead sentence, in words a primary-school child would understand. Example: "a container (a box that holds one program and everything it needs, so it runs the same on any computer)". Terms already explained in the shared glossary (docs/reference/REF-01_Glossary.md) still get a short note on first use, plus a link.
                                                            • +
                                                            • Procedures are complete: every command the reader must type is in a fenced code block, with the directory it runs in and the expected result or how to check it.
                                                            • +
                                                            • Follow the GitHub Docs style: sentence-case headings, bold for UI labels, code for file names, commands, and identifiers, admonitions as blockquotes starting with Note:, Warning:, or Tip:. Use emoji sparingly and only as section markers in README files (for example 🚀 Quick start, 🧭 Map, 📚 Documents, 🛡️ Security).
                                                            • +
                                                            • Do not write "this document", "the above", "below"; link to the section instead.
                                                            • +
                                                            +

                                                            4. Diagrams and data

                                                            +
                                                              +
                                                            • Diagrams are written in Markdown with Mermaid fenced blocks (```mermaid). No binary images for architecture, flows, or sequences. Screenshots are allowed for UI guides and live under images/ next to the document.
                                                            • +
                                                            • Data shown in documents (lists of repositories, versions, test results, allow-lists) is written in TOON (Token-Oriented Object Notation: a compact, indentation-based text form of JSON that both people and AI read easily) in a ```toon fenced block. When a machine also needs the data, the canonical file is JSON or YAML next to it and the document says so; grdm-dev manifest check verifies that the TOON excerpt and the JSON agree.
                                                            • +
                                                            • A ```toon block that mirrors a JSON file declares it with an HTML comment on the line before the block, for example <!-- canonical: manifest/upstreams.json --> (the path is relative to the repository root). A block that is only an illustrative example carries no declaration and the surrounding text says that it is an example, not canonical data.
                                                            • +
                                                            • Tables are for comparisons with few columns. Long tabular data goes in TOON.
                                                            • +
                                                            + +
                                                              +
                                                            • Links are relative paths within the repository. Never link to master; link to files on develop or to tagged versions.
                                                            • +
                                                            • Each document links to: its parent index (README.md of its folder), the specification it implements or the decision it records, and the documents that depend on it ("Used by").
                                                            • +
                                                            • Every folder has a README.md that lists its documents with one-line descriptions, in both languages. The root README.md is the table of contents of the whole repository and links to the HTML site at site/index.html (built by MkDocs, see SPEC-02 for the grdm-dev docs command).
                                                            • +
                                                            • Upstream GitHub links are allowed when they name a specific commit or PR; link to the private -dev2027 repositories only by name, never by URL, in public-facing text.
                                                            • +
                                                            +

                                                            6. Version header

                                                            +
                                                              +
                                                            • Versions live in the header, not in the file name (POL-02 §4). Format: Version / 版: X.Y — YYYY-MM-DD. **Learned:** <what was discovered>. / <日本語>.
                                                            • +
                                                            • The newest version is first; older versions stay as one line each below it.
                                                            • +
                                                            • The version line records what was learned, not what changed. Changing a document and bumping its version happen in the same commit.
                                                            • +
                                                            +

                                                            7. File naming

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            KindNameExample
                                                            Specificationnn_<topic>.md (two digits)02_installer_cli.md
                                                            Policy / Decision / ReferencePOL-nn_<Title>.md / ADR-nn_<Title>.md / REF-nn_<Title>.mdADR-01_Integration_Repository_Placement.md
                                                            Demonn_<feature>.md, sub-step nn_m_<step>.md20_core_install_mac_studio.md
                                                            Hand-off / ReviewYYYY-MM-DD_<Title>.md, reviews end with _rN2026-11-06_M1_Skeleton_Review_r1.md
                                                            Guidedocs/guides/<topic>/README.mddocs/guides/environment/README.md
                                                            +

                                                            8. Checks

                                                            +

                                                            grdm-dev docs check (and the docs GitHub Actions workflow) fails when a Markdown file:

                                                            +
                                                              +
                                                            • lacks the english/japanese anchors or the Jump line;
                                                            • +
                                                            • has a relative link that does not resolve;
                                                            • +
                                                            • has a ```toon block whose sibling JSON disagrees;
                                                            • +
                                                            • has a glossary term from REF-01 used without a note on first occurrence (warning, not failure, until M2);
                                                            • +
                                                            • lacks a Version line in the header.
                                                            • +
                                                            +

                                                            What tools/docs_check.py checks today. Until grdm-dev docs check exists (SPEC-02 §3), the helper tools/docs_check.py, run by the docs workflow, is the implementation. It checks exactly these points:

                                                            +
                                                              +
                                                            • the english and japanese anchors;
                                                            • +
                                                            • the Jump line;
                                                            • +
                                                            • the Version line;
                                                            • +
                                                            • relative links: the file part before any #fragment must exist, and the fragment must resolve to an <a id> / <a name> anchor or a heading in the target file (same-file #fragment links are checked the same way);
                                                            • +
                                                            • TOON SHA parity: when the line before a ```toon block carries <!-- canonical: <path> -->, every 40-character SHA in the block must appear in that JSON file (§4);
                                                            • +
                                                            • the glossary-note warning: a REF-01 term used without a note on first occurrence is reported as a warning, not a failure.
                                                            • +
                                                            +

                                                            Legacy-format exception. Files kept in their historical form are not checked and are not rewritten to SPEC-06: *.legacy.md; sample code and sub-documents under docs/guides/<topic>/ other than that guide's README.md; and the pointer files left at old paths (Environment.md, SetupOsfOnEC2.md and similar at the repository root), which only redirect to the new location. They are history, not current procedure. Every other Markdown file in the repository, including manifest/README.md and the installer README, is checked.

                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            1. 範囲

                                                            +

                                                            この規約は文書の「形」を定めるもので、内容は定めません。リポジトリ内のすべての Markdown に適用します。方針(POL-nn)、仕様(00〜nn)、決定の記録(ADR-nn)、参考(REF-nn)、実証、引継ぎ、レビュー、進捗、手引き、そして各フォルダの README.md です。

                                                            +

                                                            用語注。 「仕様」は、実装する人が必ず守るルールブックです。「方針」は、私たちの立場を書いたものです。「決定の記録」(ADR)は、なぜその道を選び、ほかを選ばなかったかを残すメモです。

                                                            +

                                                            2. ページの構成(この順番で必須)

                                                            +
                                                              +
                                                            1. # <ID> <英語題> / <日本語題> — H1 は一つだけ。
                                                            2. +
                                                            3. 引用ブロックに Summary(英語 1〜2 文)と 概要(日本語)。
                                                            4. +
                                                            5. Jump 行に [English](#english) と [日本語](#japanese) の二つのリンク。
                                                            6. +
                                                            7. Version / 版 行(§6)、Normative for または Applies to、Related リンク。
                                                            8. +
                                                            9. ---
                                                            10. +
                                                            11. <a id="english"></a> の次に ## English、最初の行は [→ 日本語版へ](#japanese)、続いて英語本文。
                                                            12. +
                                                            13. ---
                                                            14. +
                                                            15. <a id="japanese"></a> の次に ## 日本語、最初の行は [→ To English](#english)、続いて日本語本文。
                                                            16. +
                                                            17. 末尾に任意で ## Glossary / 用語 の二言語の表。
                                                            18. +
                                                            +

                                                            英語と日本語は同じ内容を書きます。英語は後で他言語へ訳す元になり、日本語は GRDM チームがレビューする元になります。食い違ったら同じコミットで両方を直します。

                                                            +

                                                            なぜ HTML のアンカーか。 GitHub と MkDocs は見出しの ID の作り方が違い、日本語見出しは不安定な ID になります。明示的な <a id="..."> は両方で動きます。ID は小文字の ASCII とハイフンだけにします。

                                                            +

                                                            3. 文体

                                                            +
                                                              +
                                                            • 想定読者は入社一週目の新入社員。端末は使えるが GRDM は初めて、と考えます。
                                                            • +
                                                            • 一文一義。動詞で書く。「など」は避け、項目を列挙するか「およびその類」と書く。
                                                            • +
                                                            • 専門用語は、文書内で初めて出た箇所に必ず用語注を付ける。 括弧または太字で始まる一文で、小学生にも分かる言葉で説明する。例:「コンテナ(一つのプログラムと必要なものを一箱に入れ、どのコンピュータでも同じように動かすための箱)」。共通用語集(docs/reference/REF-01_Glossary.md)にある語でも、初出では短い注とリンクを付ける。
                                                            • +
                                                            • 手順は完結させる。読者が打つコマンドはすべてコードブロックに入れ、実行するディレクトリと、期待する結果か確認方法を添える。
                                                            • +
                                                            • GitHub Docs のスタイルに従う。見出しは文頭のみ大文字(英語)、UI のラベルは太字、ファイル名・コマンド・識別子は code、注意書きは Note: / Warning: / Tip: で始まる引用ブロック。絵文字は README の節の目印に限って控えめに使う(例: 🚀 クイックスタート、🧭 地図、📚 文書、🛡️ セキュリティ)。
                                                            • +
                                                            • 「本文書」「上記」「下記」は使わず、該当の節へリンクする。
                                                            • +
                                                            +

                                                            4. 図とデータ

                                                            +
                                                              +
                                                            • 図は Markdown 内の Mermaid コードブロック(```mermaid)で書く。構成図・流れ図・シーケンス図に画像ファイルを使わない。UI の手引きに限りスクリーンショットを許し、文書と同じ場所の images/ に置く。
                                                            • +
                                                            • 文書に載せるデータ(リポジトリ一覧、バージョン、試験結果、許容リスト)は TOON(Token-Oriented Object Notation。JSON を字下げで表した短い文字形式で、人も AI も読みやすい)で ```toon のブロックに書く。機械も読むデータは、隣に JSON か YAML の正本を置き、文書にそう記す。grdm-dev manifest check が TOON の抄録と JSON の一致を確かめる。
                                                            • +
                                                            • JSON ファイルを写す ```toon ブロックは、その直前の行に HTML コメントで正本を宣言する。例: <!-- canonical: manifest/upstreams.json -->(パスはリポジトリのルートからの相対)。説明のための例にすぎないブロックには宣言を付けず、周りの文で「例であり正本ではない」と書く。
                                                            • +
                                                            • 表は列の少ない比較に使う。長い表形式のデータは TOON にする。
                                                            • +
                                                            +

                                                            5. リンク

                                                            +
                                                              +
                                                            • リンクはリポジトリ内の相対パス。master へはリンクせず、develop 上のファイルかタグ付きの版へリンクする。
                                                            • +
                                                            • 各文書は次へリンクする: 親の索引(そのフォルダの README.md)、実装する仕様または記録する決定、そしてこの文書に依存する文書(「Used by」)。
                                                            • +
                                                            • 各フォルダに README.md を置き、文書を一行説明付きで二言語で列挙する。ルートの README.md はリポジトリ全体の目次で、MkDocs が生成する HTML(site/index.html。コマンドは SPEC-02 の grdm-dev docs)へリンクする。
                                                            • +
                                                            • 上流 GitHub へのリンクは、特定のコミットか PR を指すときだけ許す。非公開の -dev2027 リポジトリは、外向けの文章では名前だけを書き URL は書かない。
                                                            • +
                                                            +

                                                            6. 版のヘッダ

                                                            +
                                                              +
                                                            • 版はファイル名でなくヘッダに持つ(POL-02 §4)。形式: Version / 版: X.Y — YYYY-MM-DD. **Learned:** <分かったこと>. / <日本語>。
                                                            • +
                                                            • 最新の版を先頭に置き、過去の版は一行ずつ下に残す。
                                                            • +
                                                            • 版の行には「何を変えたか」でなく 「何が分かったか」 を書く。文書の変更と版の更新は同じコミットで行う。
                                                            • +
                                                            +

                                                            7. ファイル名

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            種別命名例
                                                            仕様nn_<題>.md(2 桁)02_installer_cli.md
                                                            方針・決定・参考POL-nn_<題>.md / ADR-nn_<題>.md / REF-nn_<題>.mdADR-01_Integration_Repository_Placement.md
                                                            実証nn_<機能>.md、枝番 nn_m_<手順>.md20_core_install_mac_studio.md
                                                            引継ぎ・レビューYYYY-MM-DD_<題>.md、レビューは末尾 _rN2026-11-06_M1_Skeleton_Review_r1.md
                                                            手引きdocs/guides/<題>/README.mddocs/guides/environment/README.md
                                                            +

                                                            8. 検査

                                                            +

                                                            grdm-dev docs check(と GitHub Actions の docs ワークフロー)は、次の Markdown を不合格にする。

                                                            +
                                                              +
                                                            • english / japanese のアンカーか Jump 行がない。
                                                            • +
                                                            • 解決できない相対リンクがある。
                                                            • +
                                                            • ```toon ブロックと隣の JSON が一致しない。
                                                            • +
                                                            • REF-01 の用語が初出で注なしに使われている(M2 までは警告、以後は不合格)。
                                                            • +
                                                            • ヘッダに Version 行がない。
                                                            • +
                                                            +

                                                            tools/docs_check.py が今日検査すること。 grdm-dev docs check ができるまで(SPEC-02 §3)、docs ワークフローが動かす補助ツール tools/docs_check.py が実装です。検査するのは次の点に限ります。

                                                            +
                                                              +
                                                            • english と japanese のアンカー。
                                                            • +
                                                            • Jump 行。
                                                            • +
                                                            • Version 行。
                                                            • +
                                                            • 相対リンク。#フラグメント より前のファイル部分が存在し、フラグメントが相手のファイルの <a id> / <a name> アンカーか見出しに解決しなければならない(同じファイル内の #フラグメント も同様に確かめる)。
                                                            • +
                                                            • TOON の SHA 一致。```toon ブロックの直前の行に <!-- canonical: <パス> --> の宣言があるとき、ブロック内の 40 文字の SHA がすべてその JSON に現れること(§4)。
                                                            • +
                                                            • 用語注の警告。REF-01 の用語が初出で注なしに使われていれば警告として報告する(不合格ではない)。
                                                            • +
                                                            +

                                                            旧形式の例外。 歴史的な形のまま残すファイルは検査せず、SPEC-06 の形にも書き直さない。*.legacy.md、docs/guides/<題>/ の下にあるその手引きの README.md 以外のサンプルコードと下位文書、そして旧パスに残した誘導ファイル(リポジトリのルートの Environment.md、SetupOsfOnEC2.md およびその類。新しい置き場へ案内するだけのもの)です。これらは歴史であり、現行の手順ではありません。それ以外のリポジトリ内の Markdown は、manifest/README.md と installer の README を含めてすべて検査します。

                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            MarkdownA plain-text way of writing documents where # makes a heading and - makes a list.# で見出し、- で箇条書きになる、文字だけで書く文書の書き方。
                                                            AnchorA bookmark inside a page that a link can jump to.ページの中の「しおり」。リンクで飛べる。
                                                            MermaidA way to draw diagrams by typing text instead of drawing with a mouse.マウスで描く代わりに文字で図を描く仕組み。
                                                            TOONA compact text form of JSON data, easy for people and AI to read.JSON のデータを短く字下げで書いた形。人にも AI にも読みやすい。
                                                            MkDocsA tool that turns Markdown files into a website.Markdown のファイルを Web サイトに変える道具。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/spec/index.html b/site/spec/index.html new file mode 100644 index 0000000..9f6159d --- /dev/null +++ b/site/spec/index.html @@ -0,0 +1,2913 @@ + + + + + + + + + + + + + + + + + + + + + + + Specifications / 仕様 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            Specifications / 仕様

                                                            +
                                                            +

                                                            Summary: Rules to implement: how the installer works, security gate thresholds, acceptance test scenarios, upstream tracking, documentation conventions. These documents tell implementers what to build. +概要: 実装するルール:インストーラーの仕組み、セキュリティ門の基準、受入試験のシナリオ、上流追従、文書規約。これらの文書は実装者に何を構築すべきかを伝えます。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: the installer, the security gate and the acceptance tests had to be written down as rules before any code, otherwise each implementer would fill the gaps differently. / インストーラー、セキュリティの門、受入試験は、コードより先に規則として書いておかないと、実装する人ごとに隙間の埋め方が変わると分かった。
                                                            • +
                                                            • Normative for: SPEC-00 Overview through SPEC-06 Documentation Conventions.
                                                            • +
                                                            • Related: ../README.md · policy/ · decisions/ · reference/REF-01_Glossary.md
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            1. What belongs here

                                                            +

                                                            A specification is a rule book that implementers must follow. This folder contains:

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            IDFilePurpose
                                                            SPEC-0000_overview.mdComponent map, milestones, roles, the big picture.
                                                            SPEC-0101_manifest.mdThe manifest: which upstream commits and PRs the installer builds.
                                                            SPEC-0202_installer_cli.mdThe grdm-dev CLI and install.sh: host checks, secrets, compose, build, health, reports.
                                                            SPEC-0303_security_gate.mdSBOM, CVE scan, static analysis, ZAP, AI red team, per-milestone thresholds.
                                                            SPEC-0404_acceptance_tests.mdPlaywright Python acceptance: success and rejection cases per feature.
                                                            SPEC-0505_upstream_tracking.mdDaily mirror and diff report, weekly AI integration PR, COS reference tracking.
                                                            SPEC-0606_documentation_conventions.mdHow every document is written.
                                                            +

                                                            2. Creating a new specification

                                                            +
                                                              +
                                                            1. Name the file NN_<Topic>.md (two-digit number, next available).
                                                            2. +
                                                            3. Follow SPEC-06 documentation conventions.
                                                            4. +
                                                            5. Link to related policies (POL-NN) and decisions (ADR-NN).
                                                            6. +
                                                            7. Create a decision record if the specification records a choice.
                                                            8. +
                                                            9. The owner approves; QAE writes specifications for new features.
                                                            10. +
                                                            +

                                                            3. How specifications relate to other documents

                                                            +
                                                            flowchart TD
                                                            +    P[Policy: position] --> S[Spec: rules to implement]
                                                            +    A[Decision record: why we chose this] --> S
                                                            +    S --> C[Code: implement the rule]
                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            1. ここに属するもの

                                                            +

                                                            「仕様」は実装する人が守るルールブックです。このフォルダには次が含まれます:

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            IDファイル目的
                                                            SPEC-0000_overview.md部品の地図、節目、役割、全体像。
                                                            SPEC-0101_manifest.mdマニフェスト:どの上流のコミットと PR を組むか。
                                                            SPEC-0202_installer_cli.mdgrdm-dev CLI と install.sh:ホスト判定、秘密、compose、ビルド、健康確認、報告。
                                                            SPEC-0303_security_gate.mdSBOM、CVE スキャン、静的解析、ZAP、AI レッドチーム、節目ごとの基準。
                                                            SPEC-0404_acceptance_tests.mdPlaywright Python 受入:機能ごとの成功・拒否ケース。
                                                            SPEC-0505_upstream_tracking.md日次ミラーと差分報告、週次の AI 統合 PR、COS 参照追跡。
                                                            SPEC-0606_documentation_conventions.mdすべての文書の書き方。
                                                            +

                                                            2. 新しい仕様をつくるには

                                                            +
                                                              +
                                                            1. ファイル名を NN_<題>.md(2 桁の番号、次に空いているもの)にする。
                                                            2. +
                                                            3. SPEC-06 文書規約に従う。
                                                            4. +
                                                            5. 関連する方針(POL-NN)と決定(ADR-NN)へリンクする。
                                                            6. +
                                                            7. 仕様が選択を記録する場合は決定の記録を作成する。
                                                            8. +
                                                            9. 所有者が承認;QAE が新機能の仕様を書く。
                                                            10. +
                                                            +

                                                            3. 仕様が他の文書とどう関係するか

                                                            +
                                                            flowchart TD
                                                            +    P[方針:立場] --> S[仕様:実装するルール]
                                                            +    A[決定の記録:なぜこの道を選んだか] --> S
                                                            +    S --> C[コード:ルールを実装]
                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            SpecificationA rule book that implementers must follow.実装する人が守るルールブック。
                                                            PolicyA statement of our position on what we will and will not do.我々が何をし、何をしないかの立場。
                                                            Decision record (ADR)A note explaining why we chose one way and not another.なぜその道を選び、ほかを選ばなかったかのメモ。
                                                            ImplementationWriting code that follows the spec.仕様に従ってコードを書くこと。
                                                            MilestoneA checkpoint with a pass/fail test.合否の試験がある関門。
                                                            Acceptance testA check that the whole thing does what the user asked for.全体が利用者の望みどおりに動くかの確認。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/status/index.html b/site/status/index.html new file mode 100644 index 0000000..0e8bab3 --- /dev/null +++ b/site/status/index.html @@ -0,0 +1,3001 @@ + + + + + + + + + + + + + + + + + + + + + + + Status Board / 進捗ボード - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + +
                                                            +
                                                            + + + + + + + +

                                                            Status Board / 進捗ボード

                                                            +
                                                            +

                                                            Summary: The single source of truth for milestone progress: M1–M5 status, open items, upstream tracking reports. The rules that define this board as the authoritative progress record. +概要: 節目進捗の唯一の正本:M1〜M5 の進捗、未解決項目、上流追従報告。このボードが権威ある進行状況記録であることを定める規則。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.3 — 2026-11-05. Learned: a milestone is marked done only when its PR is merged, so M1 flipped to done at the merge of PR #19 and not when the documents were written. / 節目は PR がマージされたときにだけ完了にする。M1 は文書を書いた時点ではなく PR #19 のマージで完了になった。 + 0.2 — 2026-11-05. Learned: the board must say what a CI check covers at the current milestone (Trivy: file system, report-only), or a green run is read as full coverage. / ボードは CI の検査が今の節目で何を対象にしているか(Trivy はファイルシステムに対する報告のみ)を書かなければ、緑の結果が全範囲の合格と読まれてしまうと分かった。
                                                            • +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: without a single source of truth, it was unclear whether M1 completion meant "docs written" or "PR merged"; the board's explicit rules resolve ambiguity. / 単一の正本がなければ、M1 完了が「文書を書いた」か「PR をマージした」か分からず、ボードの明示的な規則で曖昧さを解消すると分かった。
                                                            • +
                                                            • Normative for: status/upstream/ and all milestone progress tracking.
                                                            • +
                                                            • Related: ../README.md · demo/ · spec/00_overview.md#5-milestone-ladder
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            1. Milestones

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            MilestoneGoalSecurity gateStatus
                                                            M1Docs skeleton, manifest, dev2027 repos exist; reviewed PRs merged to developReport + allow-list✅ Done (PR #19 merged 2026-11-05)
                                                            M2Core 6 install with one command on Mac Studio; Playwright acceptance passes; amd64 buildsReport + allow-list (fewer entries than M1)In progress (branch feat/m2-installer)
                                                            M35 subsystems start; one success + one rejection case eachReport + allow-list (fewer entries than M2)Planned
                                                            M4Waterbutler, mfr, osf.io on Python 3.13Stop on HIGH or above; first AI red-team runPlanned
                                                            M5ES2 and mongo removed; ES8 + postgres 15 or later; distributable abroadZero CRITICAL/HIGH; zero open AI red-team pathsPlanned
                                                            +

                                                            2. Open items for M1

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            ItemStatus
                                                            docs skeleton (READMEs for all folders)✅ Written
                                                            manifest/upstreams.json✅ Created
                                                            dev2027 integration repos (11)✅ Created
                                                            dev2027 strict reconstruction PRs (8 repos, ADR-01 §5; osf.io #1 closed as superseded by #2)🔄 Open, Codex Astra review in progress
                                                            MkDocs site build (site/, strict build passes)✅ Built
                                                            Guides migration to docs/guides/ (pointers kept at old paths)✅ Done
                                                            Codex Astra review of RDM-osf.io-dev2027 PR #1🔄 r1/r2 done: request changes. R1 fixed; R2 awaits the owner's decision on ADR-01 §5; R3 is the owner's call
                                                            M1 skeleton PR to develop (this repository, PR #19)🔄 Open; review r1 of 2026-11-05 asked for changes (R1–R8); corrections in progress, then owner merge
                                                            GitHub Actions (docs, security)✅ Running on PR #19 (docs, gitleaks, manifest pass)
                                                            Trivy in CI (security.yml)⏳ At M1 report-only over the repository file system, because no image exists yet (SPEC-03 §4.1); image scanning starts with the first build (M2)
                                                            Semgrep findings in legacy guide sample code (6: raw HTML in templates ×4, exec ×1, path join ×1)⏳ Deferred to the guide rewrite (M2/M3); paths listed in .semgrepignore with reasons
                                                            +

                                                            3. Rules

                                                            +

                                                            This board is the single source of truth for milestone progress:

                                                            +
                                                              +
                                                            1. Every document that mentions a milestone must link to this board.
                                                            2. +
                                                            3. The "Status" column above is authoritative; status updates require a PR with evidence (demo run or acceptance pass).
                                                            4. +
                                                            5. "Open items" lists only M1 at this time; future milestones will have their own tables.
                                                            6. +
                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            1. 節目

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            節目ゴールセキュリティ門ステータス
                                                            M1docs の骨格・manifest・dev2027 リポジトリ群がある。レビュー済み PR が develop にマージ報告+許容リスト✅ 完了(PR #19 を 2026-11-05 にマージ)
                                                            M2コア 6 本が Mac Studio で一発導入。Playwright 受入合格。amd64 ビルド報告+許容リスト(M1 より件数を減らす)進行中(ブランチ feat/m2-installer)
                                                            M3サブシステム 5 本が起動。各 1 本の正常系+拒否ケース報告+許容リスト(M2 より件数を減らす)計画中
                                                            M4waterbutler・mfr・osf.io を Python 3.13 へHIGH 以上で停止。AI レッドチーム初回計画中
                                                            M5ES2・mongo 廃止。ES8+postgres 15 以降。海外配布可CRITICAL/HIGH ゼロ。AI レッドチームの未解決経路ゼロ計画中
                                                            +

                                                            2. M1 の残件

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            項目ステータス
                                                            docs の骨格(全フォルダの README)✅ 作成済み
                                                            manifest/upstreams.json✅ 作成
                                                            dev2027 統合リポジトリ(11)✅ 作成
                                                            dev2027 の厳密再構築 PR(8 リポジトリ、ADR-01 §5。osf.io #1 は #2 に置き換えて閉鎖)🔄 作成済み、Codex Astra レビュー中
                                                            MkDocs サイトのビルド(site/、strict ビルド合格)✅ 生成済み
                                                            ガイドの docs/guides/ への移植(旧パスに誘導を残す)✅ 完了
                                                            Codex Astra による RDM-osf.io-dev2027 PR #1 のレビュー🔄 r1/r2 完了: request changes。R1 修正済み、R2 は ADR-01 §5 の所有者判断待ち、R3 は所有者判断
                                                            M1 骨格 PR(本リポジトリ、develop 向け、PR #19)🔄 作成済み。2026-11-05 のレビュー r1 が修正要求(R1〜R8)。修正中、その後に所有者マージ
                                                            GitHub Actions(docs, security)✅ PR #19 で稼働(docs・gitleaks・manifest 合格)
                                                            CI の Trivy(security.yml)⏳ M1 ではイメージがまだないため、リポジトリのファイルシステムに対する報告のみ(SPEC-03 §4.1)。イメージの検査は最初のビルド(M2)から
                                                            旧ガイドのサンプルコードに対する Semgrep 指摘(6 件: テンプレートの生 HTML ×4、exec ×1、path join ×1)⏳ ガイド書き直し(M2/M3)で対応。対象パスと理由は .semgrepignore に記載
                                                            +

                                                            3. 規則

                                                            +

                                                            このボードは節目進行状況の唯一の正本です:

                                                            +
                                                              +
                                                            1. 節目を言及するすべての文書はこのボードへリンクしなければならない。
                                                            2. +
                                                            3. 上記の「ステータス」列が権威あるものである。ステータス更新には PR と証跡(実行結果または受入合格)が必要。
                                                            4. +
                                                            5. 「未解決項目」は現時点で M1 のみ。将来の節目にはそれぞれ専用の表が追加される。
                                                            6. +
                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            MilestoneA checkpoint with a pass/fail test.合否の試験がある関門。
                                                            Security gateA checkpoint the build must pass before it is called good.ビルドを導入してよいかを決める試験。
                                                            Open itemA task or PR that has not been completed.完了していないタスクまたは PR。
                                                            Status boardThe single source of truth for milestone progress.節目進行状況の唯一の正本。
                                                            EvidenceProof that a test or check passed.試験または検査が合格した証拠。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/status/upstream/index.html b/site/status/upstream/index.html new file mode 100644 index 0000000..92d14bd --- /dev/null +++ b/site/status/upstream/index.html @@ -0,0 +1,2961 @@ + + + + + + + + + + + + + + + + + + + + + Upstream Tracking Status / 上流追従状況 - GakuNin RDM Developer Environment 2027 / 開発環境 2027 版 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            + +
                                                            + + + + +
                                                            + + +
                                                            + +
                                                            + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            +
                                                            + + + + + + + +
                                                            +
                                                            + + + + + + + +

                                                            Upstream Tracking Status / 上流追従状況

                                                            +
                                                            +

                                                            Summary: Daily mirror and diff reports: latest.toon/latest.json are overwritten every day, and archives older than 90 days are deleted. These records show which upstreams changed and whether integration is needed. +概要: 日次ミラーと差分報告:latest.toon/latest.json は毎日上書きされ、90 日より古い保管分は削除されます。これらの記録はどの上流が変更されたか、統合が必要かどうかを示します。

                                                            +
                                                            +

                                                            Jump: English · 日本語

                                                            +
                                                              +
                                                            • Version / 版: 0.2 — 2026-11-05. Learned: an example data block must itself parse: a declared row count with an ellipsis in place of rows is a syntax error, not an example. / 例として置くデータブロックもそれ自体が解析できなければならない。行数を宣言して省略記号を置いたものは例ではなく構文エラーだと分かった。
                                                            • +
                                                            • Version / 版: 0.1 — 2026-11-05. Learned: the daily job's outputs need a fixed place and a fixed name before the job exists, or SPEC-05 and the status board would point at nothing. The files named here do not exist yet; the daily job (SPEC-05) will create them. / 日次ジョブの出力には、ジョブが存在する前から置き場と名前を決めておく必要があると分かった。さもないと SPEC-05 と進捗ボードの参照先が無くなる。ここに書いたファイルはまだ存在せず、日次ジョブ(SPEC-05)が作る。
                                                            • +
                                                            • Normative for: SPEC-05 Upstream Tracking.
                                                            • +
                                                            • Related: ../README.md · status/README.md · spec/05_upstream_tracking.md#2-daily-job-mirror-and-diff-report
                                                            • +
                                                            +
                                                            +

                                                            +

                                                            English

                                                            +

                                                            → 日本語版へ

                                                            +

                                                            1. Files written by the daily job

                                                            +

                                                            The upstream-mirror workflow (or grdm-dev upstream mirror) writes:

                                                            + + + + + + + + + + + + + + + + + + + + + +
                                                            FileBehavior
                                                            latest.toonOverwritten every day; TOON excerpt of the daily report.
                                                            latest.jsonOverwritten every day; canonical JSON of the daily report.
                                                            archive/Subdirectory with daily reports dated YYYY-MM-DD.toon and .json.
                                                            +
                                                            +

                                                            Note: Archives older than 90 days are deleted by the daily job to keep storage reasonable.

                                                            +
                                                            +

                                                            2. Report structure

                                                            +

                                                            The report format is defined in SPEC-05 §2:

                                                            +
                                                            report:
                                                            +  generated_at: 2026-11-05T03:00:12+09:00
                                                            +  repositories[1]:
                                                            +    - integration_repo: RDM-osf.io-dev2027
                                                            +      develop_sha: 1111111111111111111111111111111111111111
                                                            +      upstreams[3]{branch,kind,sha,ahead_of_develop,behind_develop,manifest_sha_matches,moved_since_yesterday}:
                                                            +        upstream/public-develop,public,2222222222222222222222222222222222222222,14,0,false,true
                                                            +        upstream/private-develop,private,3333333333333333333333333333333333333333,0,0,true,false
                                                            +        upstream/cos-develop,cos,4444444444444444444444444444444444444444,310,0,true,true
                                                            +      action: integrate
                                                            +  summary:
                                                            +    repositories_needing_integration: 1
                                                            +    force_push_detected: 0
                                                            +

                                                            The example shows one of the eleven integration repositories; a real report lists all eleven (repositories[11]), and the repeated digits stand for real SHAs.

                                                            +

                                                            The action field is:

                                                            + + + + + + + + + + + + + + + + + + + + + +
                                                            ValueMeaning
                                                            integrateAny merged upstream is ahead of develop; open an integration PR.
                                                            noneNo changes since yesterday; no action needed.
                                                            haltForce-push detected on an upstream branch; stop and investigate.
                                                            +

                                                            3. Open items (no entries yet / まだありません)

                                                            + + + + + + + + + + + + + + + +
                                                            DateRepositoryAction
                                                            ———
                                                            +
                                                            +

                                                            +

                                                            日本語

                                                            +

                                                            → To English

                                                            +

                                                            1. 日次ジョブが書くファイル

                                                            +

                                                            upstream-mirror ワークフロー(または grdm-dev upstream mirror)が次を書きます:

                                                            + + + + + + + + + + + + + + + + + + + + + +
                                                            ファイル振る舞い
                                                            latest.toon毎日上書きされる。日次報告の TOON 抄録。
                                                            latest.json毎日上書きされる。日次報告の正本 JSON。
                                                            archive/日付付きの日次報告 YYYY-MM-DD.toon と .json のサブディレクトリ。
                                                            +
                                                            +

                                                            Note: 90 日より古い保管分は、ストレージを適切に保つため日次ジョブが削除します。

                                                            +
                                                            +

                                                            2. 報告の構造

                                                            +

                                                            報告形式は SPEC-05 §2 に定められています:

                                                            +
                                                            report:
                                                            +  generated_at: 2026-11-05T03:00:12+09:00
                                                            +  repositories[1]:
                                                            +    - integration_repo: RDM-osf.io-dev2027
                                                            +      develop_sha: 1111111111111111111111111111111111111111
                                                            +      upstreams[3]{branch,kind,sha,ahead_of_develop,behind_develop,manifest_sha_matches,moved_since_yesterday}:
                                                            +        upstream/public-develop,public,2222222222222222222222222222222222222222,14,0,false,true
                                                            +        upstream/private-develop,private,3333333333333333333333333333333333333333,0,0,true,false
                                                            +        upstream/cos-develop,cos,4444444444444444444444444444444444444444,310,0,true,true
                                                            +      action: integrate
                                                            +  summary:
                                                            +    repositories_needing_integration: 1
                                                            +    force_push_detected: 0
                                                            +

                                                            例は統合リポジトリ 11 本のうち 1 本だけを示しています。本物の報告は 11 本すべてを載せ(repositories[11])、同じ数字の並びは本物の SHA の代わりです。

                                                            +

                                                            action フィールドは:

                                                            + + + + + + + + + + + + + + + + + + + + + +
                                                            値意味
                                                            integrateマージ対象の上流のどれかが develop より進んでいる。統合 PR を開く。
                                                            none昨日からの変更なし。何もする必要なし。
                                                            halt上流ブランチで force-push を検出。停止して調査する。
                                                            +

                                                            3. 未解決項目(まだありません / no entries yet)

                                                            + + + + + + + + + + + + + + + +
                                                            日付リポジトリアクション
                                                            ———
                                                            +
                                                            +

                                                            Glossary / 用語

                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            TermEnglish note日本語注
                                                            MirrorA copy that is kept identical to the original.元と同じ中身に保たれる写し。
                                                            Diff reportA record of changes between branches.ブランチ間の変更記録。
                                                            Fast-forwardMoving a branch straight ahead to a newer commit without creating a merge.マージを作らずにブランチを新しいコミットへまっすぐ進めること。
                                                            Force-pushOverwriting a branch's history on the server. Forbidden here.サーバ上のブランチの履歴を上書きすること。ここでは禁止。
                                                            ArchiveOld reports kept for reference, deleted after 90 days.参照のために保管する古い報告。90 日後に削除される。
                                                            ActionThe decision on whether to open an integration PR.統合 PR を開くかどうかの判断。
                                                            + + + + + + + + + + + + + +
                                                            +
                                                            + + + +
                                                            + +
                                                            + + + +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/docs_check.py b/tools/docs_check.py new file mode 100644 index 0000000..a304567 --- /dev/null +++ b/tools/docs_check.py @@ -0,0 +1,442 @@ +#!/usr/bin/env python3 +""" +docs_check.py - SPEC-06 §8 documentation checks for every tracked Markdown file. + +Standard library only, Python 3.11+. Run from the repository root: + + python3 tools/docs_check.py [--all-warnings] [--root DIR] + +Scope: every `*.md` that `git ls-files` reports, anywhere in the repository +(docs/, README.md, manifest/, installer/, docs/assets/, ...), except `site/` +(generated output). Each file is classified: + + full SPEC-06 applies in full (new bilingual documents). + pointer the seven old-path pointer files kept for inbound links + (Environment.md, SetupOsfOnEC2.md, Skelton/README.md, StorageAddon/README.md, + ScreenExpansion/README.md, APIGuide/README.md, AdminRDMAddonGuide/README.md). + They are short redirects, not bilingual documents, so only their relative + links are checked and one of them must lead into docs/guides/. + legacy `*.legacy.md`: 2020-era guide text kept verbatim for history (SPEC-06 applies + to new documents only). Skipped, listed in the summary. + sample Markdown inside docs/guides// other than that guide's README.md: + sample code documentation copied with the legacy guides. Skipped, listed. + +Checks on `full` files (failure => exit 1): + - and anchors, and the Jump line + - a Version / 版 line in the header + - every relative link resolves; for `file.md#frag` the file must exist AND the + fragment must be an / or a heading in that file; for `#frag` the + anchor must exist in the same file + - a ```toon block that declares its canonical JSON (a preceding line + `` or text like canonical: `path/to.json`) + must point to an existing JSON file and every 40-hex SHA in the block must + appear in that JSON + +Warnings (printed, never fail; SPEC-06 says warning until M2): + - a REF-01 glossary term used in the English half without a parenthetical note + on its first occurrence. Files under docs/reviews/ are exempt from this + warning: review records are kept verbatim (SPEC-06 §8). + +Exit codes: 0 pass (warnings allowed); 1 any failure; 2 usage error. +""" + +from __future__ import annotations + +import argparse +import json +import re +import subprocess +import sys +from dataclasses import dataclass, field +from pathlib import Path + +EXIT_OK = 0 +EXIT_FAIL = 1 +EXIT_USAGE = 2 + +GLOSSARY_PATH = Path("docs/reference/REF-01_Glossary.md") +GLOSSARY_EXEMPT_PREFIXES = ("docs/reviews/",) # review records are kept verbatim (SPEC-06 §8) + +POINTER_FILES: dict[str, str] = { + "Environment.md": "old path of the environment guide; redirect to docs/guides/environment/", + "SetupOsfOnEC2.md": "old path of the EC2 guide; redirect to docs/guides/ec2/", + "Skelton/README.md": "old path of the skeleton add-on guide; redirect to docs/guides/skeleton/", + "StorageAddon/README.md": "old path of the storage add-on guide; redirect to docs/guides/storage-addon/", + "ScreenExpansion/README.md": "old path of the screen expansion guide; redirect to docs/guides/screen-expansion/", + "APIGuide/README.md": "old path of the API guide; redirect to docs/guides/api/", + "AdminRDMAddonGuide/README.md": "old path of the admin add-on guide; redirect to docs/guides/admin-addon/", +} + +RE_FENCE = re.compile(r"^(\s*)(```+|~~~+)(.*)$") +RE_LINK = re.compile(r"!?\[[^\]]*\]\(\s*]+)>?(?:\s+\"[^\"]*\")?\s*\)") +RE_HEADING = re.compile(r"^\s{0,3}#{1,6}\s+(.+?)\s*#*\s*$") +RE_A_ID = re.compile(r" list[str]: + try: + out = subprocess.run(["git", "ls-files", "-z", "--", "*.md", "**/*.md"], cwd=root, + check=True, capture_output=True).stdout + files = sorted({p.decode("utf-8") for p in out.split(b"\0") if p}) + except (subprocess.CalledProcessError, FileNotFoundError): + files = sorted(str(p.relative_to(root)) for p in root.rglob("*.md") if ".git" not in p.parts) + return [f for f in files if not f.startswith("site/")] + + +def classify(rel_path: str) -> tuple[str, str]: + """Return (category, reason) for a tracked Markdown path.""" + if rel_path in POINTER_FILES: + return "pointer", POINTER_FILES[rel_path] + if rel_path.endswith(".legacy.md"): + return "legacy", "legacy guide text kept verbatim for history (SPEC-06 applies to new documents)" + parts = rel_path.split("/") + if len(parts) >= 4 and parts[:2] == ["docs", "guides"] and parts[-1] != "README.md": + return "sample", "sample code documentation inside docs/guides// copied with the legacy guide" + if len(parts) == 4 and parts[:2] == ["docs", "guides"] and parts[-1] == "README.md": + return "full", "" + if len(parts) >= 5 and parts[:2] == ["docs", "guides"]: + return "sample", "sample code documentation inside docs/guides// copied with the legacy guide" + return "full", "" + + +# --------------------------------------------------------------------------- markdown helpers + +def strip_code(content: str) -> str: + """Blank out fenced code blocks and inline code so their text is not scanned for links/terms.""" + out: list[str] = [] + fence: str | None = None + for line in content.splitlines(): + m = RE_FENCE.match(line) + if fence is None and m: + fence = m.group(2)[0] + out.append("") + continue + if fence is not None: + if m and m.group(2)[0] == fence and not m.group(3).strip(): + fence = None + out.append("") + continue + out.append(re.sub(r"`[^`]*`", "``", line)) + return "\n".join(out) + + +def github_slug(text: str) -> str: + text = re.sub(r"<[^>]+>", "", text) + text = re.sub(r"`([^`]*)`", r"\1", text) + text = re.sub(r"\[([^\]]*)\]\([^)]*\)", r"\1", text) + text = text.strip().lower() + text = re.sub(r"[^\w\- ]", "", text) + return text.replace(" ", "-") + + +def anchors_in(content: str) -> set[str]: + """All ids a `#fragment` may legally point to inside a Markdown file.""" + ids: set[str] = set(RE_A_ID.findall(content)) + ids.update(RE_ATTR_ID.findall(content)) + counts: dict[str, int] = {} + for line in strip_code(content).splitlines(): + m = RE_HEADING.match(line) + if not m: + continue + heading = re.sub(r"\{#[^}]+\}\s*$", "", m.group(1)) + slug = github_slug(heading) + n = counts.get(slug, 0) + counts[slug] = n + 1 + ids.add(slug if n == 0 else f"{slug}-{n}") + ids.add(heading.strip()) + return ids + + +def fenced_blocks(content: str, lang: str) -> list[tuple[int, str, list[str]]]: + """Return (start_line_no, block_text, up_to_5_preceding_lines) for ``` blocks.""" + blocks: list[tuple[int, str, list[str]]] = [] + lines = content.splitlines() + i = 0 + while i < len(lines): + m = RE_FENCE.match(lines[i]) + if m: + fence_char = m.group(2)[0] + info = m.group(3).strip().split()[0].lower() if m.group(3).strip() else "" + start = i + j = i + 1 + while j < len(lines): + mm = RE_FENCE.match(lines[j]) + if mm and mm.group(2)[0] == fence_char and not mm.group(3).strip(): + break + j += 1 + if info == lang: + blocks.append((start + 1, "\n".join(lines[i + 1:j]), lines[max(0, i - 5):i])) + i = j + 1 + continue + i += 1 + return blocks + + +# --------------------------------------------------------------------------- checks + +def check_anchors(content: str, rel: str) -> list[str]: + errors = [] + if '' not in content: + errors.append(f"{rel}: missing anchor") + if '' not in content: + errors.append(f"{rel}: missing anchor") + return errors + + +def check_jump_line(content: str, rel: str) -> list[str]: + if not RE_JUMP.search(content): + return [f"{rel}: missing Jump line with [English](#english) and [日本語](#japanese)"] + return [] + + +def check_version_line(content: str, rel: str) -> list[str]: + if not RE_VERSION.search(content): + return [f"{rel}: missing Version / 版 line"] + return [] + + +def check_links(content: str, rel: str, root: Path) -> list[str]: + """Every relative link resolves; fragments must exist in the target (or same) file.""" + errors: list[str] = [] + file_path = root / rel + file_dir = file_path.parent + own_anchors: set[str] | None = None + for m in RE_LINK.finditer(strip_code(content)): + link = m.group(1) + if re.match(r"^[a-z][a-z0-9+.-]*:", link): # http:, https:, mailto:, ... + continue + if link.startswith("/"): + errors.append(f"{rel}: absolute link is not allowed (use a relative link): {link}") + continue + file_part, _, fragment = link.partition("#") + if file_part == "": + if own_anchors is None: + own_anchors = anchors_in(content) + if fragment and fragment not in own_anchors: + errors.append(f"{rel}: same-file anchor not found: #{fragment}") + continue + target = (file_dir / file_part) + if not target.exists() and not target.with_suffix(".md").exists(): + errors.append(f"{rel}: relative link to non-existent file: {link}") + continue + if not target.exists(): + target = target.with_suffix(".md") + if fragment and target.is_file() and target.suffix.lower() == ".md": + try: + target_content = target.read_text(encoding="utf-8") + except (OSError, UnicodeDecodeError): + errors.append(f"{rel}: cannot read link target {file_part}") + continue + if fragment not in anchors_in(target_content): + errors.append(f"{rel}: anchor #{fragment} not found in {file_part}") + return errors + + +def check_toon_parity(content: str, rel: str, root: Path) -> list[str]: + """A ```toon block with a declared canonical JSON: the JSON exists and contains every SHA.""" + errors: list[str] = [] + file_dir = (root / rel).parent + for start, block, preceding in fenced_blocks(content, "toon"): + decl = None + for line in reversed(preceding): + mm = RE_CANONICAL.search(line) + if mm: + decl = mm.group(1) + break + if decl is None: + continue + candidates = [file_dir / decl, root / decl] + json_path = next((c for c in candidates if c.is_file()), None) + if json_path is None: + errors.append(f"{rel}:{start}: toon block declares canonical JSON {decl} which does not exist") + continue + try: + json_text = json_path.read_text(encoding="utf-8") + json.loads(json_text) + except (OSError, UnicodeDecodeError, json.JSONDecodeError) as e: + errors.append(f"{rel}:{start}: canonical JSON {decl} is unreadable or invalid: {e}") + continue + for sha in sorted(set(RE_SHA40.findall(block))): + if sha not in json_text: + errors.append(f"{rel}:{start}: toon block SHA {sha} is not in canonical JSON {decl} (stale excerpt)") + return errors + + +def load_glossary_terms(root: Path) -> list[str]: + """Term column of the English table in REF-01 (first table cell of each row).""" + path = root / GLOSSARY_PATH + if not path.is_file(): + return [] + text = path.read_text(encoding="utf-8") + start = text.find('') + end = text.find('') + english = text[start:end] if start != -1 and end != -1 else text + terms: list[str] = [] + for line in english.splitlines(): + if not line.startswith("|"): + continue + cells = [c.strip() for c in line.strip().strip("|").split("|")] + if not cells or cells[0] in ("Term", "") or set(cells[0]) <= {"-", ":"}: + continue + cell = re.sub(r"`", "", cells[0]) + for piece in re.split(r"\s*/\s*|\(|\)", cell): + piece = piece.strip() + if len(piece) >= 2 and re.search(r"[A-Za-z]", piece) and piece not in terms: + terms.append(piece) + return terms + + +def check_glossary_terms(content: str, rel: str, terms: list[str]) -> list[str]: + """WARNING: a glossary term whose first use in the English half has no parenthetical note.""" + warnings: list[str] = [] + if not terms: + return warnings + start = content.find('') + end = content.find('') + if start == -1: + return warnings + english = strip_code(content[start:end if end != -1 else len(content)]) + for term in terms: + pattern = re.compile(r"(? bool: + """The glossary-note warning skips REF-01 itself and review records (docs/reviews/, kept verbatim).""" + if rel == str(GLOSSARY_PATH): + return False + return not rel.startswith(GLOSSARY_EXEMPT_PREFIXES) + + +def check_pointer_file(content: str, rel: str, root: Path) -> list[str]: + errors = check_links(content, rel, root) + if not re.search(r"\]\(\s*]*docs/guides/", content): + errors.append(f"{rel}: pointer file must link to its new location under docs/guides/") + return errors + + +# --------------------------------------------------------------------------- driver + +def check_file(rel: str, root: Path, terms: list[str]) -> FileResult: + category, reason = classify(rel) + result = FileResult(path=rel, category=category, reason=reason) + if category in ("legacy", "sample"): + return result + try: + content = (root / rel).read_text(encoding="utf-8") + except (OSError, UnicodeDecodeError) as e: + result.errors.append(f"{rel}: could not read file: {e}") + return result + if category == "pointer": + result.errors.extend(check_pointer_file(content, rel, root)) + return result + result.errors.extend(check_anchors(content, rel)) + result.errors.extend(check_jump_line(content, rel)) + result.errors.extend(check_version_line(content, rel)) + result.errors.extend(check_links(content, rel, root)) + result.errors.extend(check_toon_parity(content, rel, root)) + if glossary_check_applies(rel): + result.warnings.extend(check_glossary_terms(content, rel, terms)) + return result + + +def main(argv: list[str] | None = None) -> int: + parser = argparse.ArgumentParser( + prog="docs_check.py", + description="SPEC-06 §8 checks over every tracked Markdown file.", + epilog="Exit codes: 0 pass (warnings allowed); 1 failure; 2 usage error.", + ) + parser.add_argument("--root", default=".", help="repository root (default: current directory)") + parser.add_argument("--all-warnings", action="store_true", help="print every glossary warning (default: first 40)") + args = parser.parse_args(argv) + root = Path(args.root).resolve() + if not (root / "docs").is_dir(): + print("Error: run from the repository root (where docs/ exists)", file=sys.stderr) + return EXIT_USAGE + + files = git_tracked_markdown(root) + terms = load_glossary_terms(root) + results = [check_file(rel, root, terms) for rel in files] + + print("=" * 70) + print("docs_check.py - SPEC-06 §8 documentation checks") + print("=" * 70) + by_cat: dict[str, list[FileResult]] = {} + for r in results: + by_cat.setdefault(r.category, []).append(r) + print(f"\nTracked Markdown files: {len(results)} " + f"(full {len(by_cat.get('full', []))}, pointer {len(by_cat.get('pointer', []))}, " + f"legacy {len(by_cat.get('legacy', []))}, sample {len(by_cat.get('sample', []))})") + skipped = by_cat.get("legacy", []) + by_cat.get("sample", []) + if skipped: + print("\nExempt from SPEC-06 (documented exceptions):") + for r in sorted(skipped, key=lambda r: r.path): + print(f" ~ {r.path}: {r.reason}") + pointers = by_cat.get("pointer", []) + if pointers: + print("\nPointer files (links to new location checked only):") + for r in pointers: + print(f" > {r.path}: {r.reason}") + print(f"\nGlossary terms loaded from {GLOSSARY_PATH}: {len(terms)}") + + errors = [e for r in results for e in r.errors] + warnings = [w for r in results for w in r.warnings] + if warnings: + print(f"\n{len(warnings)} WARNING(s) (glossary first-use notes; not failing until M2):") + shown = warnings if args.all_warnings else warnings[:40] + for w in shown: + print(f" WARNING: {w}") + if len(shown) < len(warnings): + print(f" ... and {len(warnings) - len(shown)} more (use --all-warnings)") + print("\n" + "=" * 70) + if errors: + print(f"Found {len(errors)} error(s):\n") + for e in errors: + print(f" - {e}") + print("\n" + "=" * 70) + print(f"FAILED: {len(errors)} error(s) in {len(results)} file(s)") + print("=" * 70) + return EXIT_FAIL + checked = len(by_cat.get("full", [])) + len(pointers) + print(f"PASSED: {checked} file(s) checked, {len(skipped)} exempt, {len(warnings)} warning(s)") + print("=" * 70) + return EXIT_OK + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/tools/manifest_check.py b/tools/manifest_check.py new file mode 100644 index 0000000..07919f7 --- /dev/null +++ b/tools/manifest_check.py @@ -0,0 +1,1060 @@ +#!/usr/bin/env python3 +""" +manifest_check.py - Validate manifest/upstreams.json, its TOON excerpt, and the +repository-wide private-URL / token policy (SPEC-01 §5, SPEC-06 §5). + +Standard library only, Python 3.11+. Run from the repository root: + + python3 tools/manifest_check.py # manifest + TOON parity + policy scan + python3 tools/manifest_check.py --manifest-only # SPEC-01 checks only + python3 tools/manifest_check.py --policy-only # repository policy scan only + +Checks implemented (ids from docs/spec/01_manifest.md §5): + + MC-01 upstreams.json parses as JSON, schema_version == 1, generated_at is an ISO date + MC-02 component id unique and matches ^[A-Za-z0-9_.-]+$ + MC-03 role in core|infra|subsystem; services is a non-empty list of strings + MC-04 integration_repo matches ^RDM-[A-Za-z0-9_.-]+-dev2027$, or null for infra + MC-05 integration_branch == "develop", or null for infra; integration_sha 40-hex or null (null for infra) + MC-06 every upstreams[].sha is ^[0-9a-f]{40}$; base_image_digest is null or + sha256:<64 hex>; fetched_at is an ISO date not in the future; + prebuilt_image (optional) is a registry reference pinned by @sha256:<64 hex>, + only on a non-infra component, only together with a non-empty note, and + never a private-repository URL (it bypasses the build-from-pinned-source + guarantee and must be removed by M4) + MC-07 no string value anywhere contains http, git@, github.com, or a token-like string + MC-08 the same (repo, branch) pair has one sha across all components + MC-09 adopted_prs status == adopted; candidate_prs status in candidate|rejected; + upstreams status in merged|reference|candidate and kind cos => reference; + PR number is a positive integer + MC-15 image_build {context, tag} only on infra, context is a repo-relative directory with a Dockerfile, + tag is a valid image tag, note required, exclusive with prebuilt_image and build_platform (ADR-07) + MC-16 build_dockerfile only with integration_repo, a plain repo-relative file in this repository, note required, + exclusive with prebuilt_image and overlay_of (ADR-07) + MC-10 profile in minimum|core|full; platforms subset of linux/arm64,linux/amd64; + build_platform on infra only together with a non-empty note (PR #32 review r1 R1-01); + core components list both platforms + MC-11 upstreams.toon exists and its projection equals the JSON (every component id, + every upstream field, every adopted PR (repo, number, status), top-level fields, + and all counts). A missing or stale TOON fails. + MC-13 tracking_branch follows rule 7: upstream/[-]- -> + MC-14 overlay_of (optional, string|null) names another component that exists, is + not infra, is not itself an overlay and is not prebuilt; the overlay itself is + not infra and not prebuilt; at most one overlay per base (SPEC-01 §3, ADR-06: + wiki-frontend is an overlay of osf.io whose image is a bundle builder run by the + one-shot service wiki_assets; the installer checks the one-shot template) + MC-12 (--remote) is NOT implemented here; it runs in the private -dev2027 CI. + +Type validation runs first (validate_structure): every scalar and container is +checked against the SPEC-01 §3 types (ints are not bools, strings are not bools, +lists are lists, objects are objects) before any set-membership test or TOON +projection touches the data. A type problem is reported as a finding with the MC +id and the JSON path (for example components[3].role) and the run exits 20; the +TOON parity check (MC-11) runs only once the manifest is well formed. + +Policy scan (not an MC check; SPEC-01 rule 5, SPEC-06 §5): every git-tracked +text file except site/, *.legacy.md and sample-code directories under +docs/guides// is scanned for + - URLs to private repositories: github.com/RCOSDP/-private or -dev2027 + (https form and ssh form git@github.com:RCOSDP/...), + - token-like strings: ghp_/gho_/ghu_/ghs_/ghr_, github_pat_, AKIA..., xox[abprs]-, + - private key blocks: -----BEGIN ... PRIVATE KEY-----. + +The scan covers EVERY git-tracked file, including generated site/**, verbatim +*.legacy.md guides and legacy sample code under docs/guides///. +There are no path exemptions (a formatting or Semgrep exception is not an +exception to the publication policy). The only guard is technical: files that are +not valid UTF-8 (binary) or larger than POLICY_MAX_BYTES are skipped and the +number of skipped files is reported. + +Exit codes (aligned with SPEC-02 §6): + 0 all checks passed + 1 policy violation(s) found in tracked files (manifest itself valid) + 20 manifest invalid or TOON excerpt disagrees with JSON (takes precedence over 1) + 2 usage error +""" + +from __future__ import annotations + +import argparse +import datetime as _dt +import json +import re +import subprocess +import sys +from pathlib import Path +from typing import Any + +EXIT_OK = 0 +EXIT_POLICY = 1 +EXIT_USAGE = 2 +EXIT_MANIFEST = 20 + +MANIFEST_JSON = Path("manifest/upstreams.json") +MANIFEST_TOON = Path("manifest/upstreams.toon") +REPO_ROOT = Path(__file__).resolve().parent.parent # tools/ -> repository root (MC-15 looks for Dockerfiles) + +ROLES = {"core", "infra", "subsystem"} +KINDS = {"public", "private", "cos"} +UPSTREAM_STATUSES = {"merged", "reference", "candidate"} +ADOPTED_STATUSES = {"adopted"} +CANDIDATE_STATUSES = {"candidate", "rejected"} +PROFILES = {"minimum", "core", "full"} +PLATFORMS = {"linux/arm64", "linux/amd64"} + +RE_ID = re.compile(r"^[A-Za-z0-9_.-]+$") +RE_SHA = re.compile(r"^[0-9a-f]{40}$") +RE_DIGEST = re.compile(r"^sha256:[0-9a-f]{64}$") +RE_INTEGRATION_REPO = re.compile(r"^RDM-[A-Za-z0-9_.-]+-dev2027$") +# prebuilt_image: name[:tag]@sha256:<64 hex>; lower-case path components, optional port. +RE_PREBUILT_IMAGE = re.compile(r"^[a-z0-9][a-z0-9._-]*(?::[0-9]+)?(?:/[a-z0-9][a-z0-9._-]*)*(?::[A-Za-z0-9_][A-Za-z0-9_.-]{0,127})?@sha256:[0-9a-f]{64}$") +RE_REPO_NAME = re.compile(r"^[A-Za-z0-9_.-]+(/[A-Za-z0-9_.-]+)?$") + +UPSTREAM_FIELDS = ("repo", "branch", "kind", "tracking_branch", "status", "sha", "fetched_at") +PR_FIELDS = ("repo", "number", "title", "reason", "status") +COMPONENT_FIELDS = ( + "id", "role", "services", "integration_repo", "integration_branch", "upstreams", + "adopted_prs", "candidate_prs", "base_image", "base_image_digest", "target_image", + "profile", "platforms", +) + +# Token-like strings (MC-07 and policy scan). Built so that this source file +# itself never matches: each pattern needs the token body after the prefix. +TOKEN_PATTERNS: list[tuple[str, re.Pattern[str]]] = [ + ("GitHub token", re.compile(r"\bgh[pousr]_[A-Za-z0-9]{36,}")), + ("GitHub fine-grained token", re.compile(r"\bgithub_pat_[A-Za-z0-9_]{22,}")), + ("AWS access key id", re.compile(r"\bAKIA[0-9A-Z]{16}\b")), + ("Slack token", re.compile(r"\bxox[abprs]-[A-Za-z0-9-]{10,}")), + ("private key block", re.compile(r"-----BEGIN [A-Z ]*PRIVATE KEY-----")), +] + +# Private repository URLs (policy scan): the https, scp-style ssh (git@host:org/repo) +# and ssh:// forms of a github.com/RCOSDP repository whose name ends in -private +# or -dev2027, with or without a .git suffix. (No literal example here: this +# file is itself scanned.) +RE_PRIVATE_URL = re.compile( + r"(?i)(?:https?://|ssh://)?(?:git@)?github\.com[/:]RCOSDP/[A-Za-z0-9_.-]*?(?:-private|-dev2027)(?:\.git)?\b" +) + +# Policy scan guard (technical only, never a path exemption): files larger than this +# or not decodable as UTF-8 are skipped and counted. +POLICY_MAX_BYTES = 5 * 1024 * 1024 + +# Structural (type) schema, SPEC-01 §3. Each entry: field -> (MC id, type spec). +# Type specs: "int", "str", "str|null", "list[str]", "list[obj]", "obj", "str|null-map". +STRUCT_TOP: dict[str, tuple[str, str]] = { + "schema_version": ("MC-01", "int"), + "generated_at": ("MC-01", "str"), + "note": ("MC-01", "str|null"), + "components": ("MC-01", "list[obj]"), +} +STRUCT_COMPONENT: dict[str, tuple[str, str]] = { + "id": ("MC-02", "str"), + "role": ("MC-03", "str"), + "services": ("MC-03", "list[str]"), + "integration_repo": ("MC-04", "str|null"), + "integration_branch": ("MC-05", "str|null"), + "integration_sha": ("MC-05", "str|null"), + "upstreams": ("MC-01", "list[obj]"), + "adopted_prs": ("MC-09", "list[obj]"), + "candidate_prs": ("MC-09", "list[obj]"), + "base_image": ("MC-01", "str"), + "base_image_digest": ("MC-06", "str|null"), + "target_image": ("MC-01", "str|null-map"), + "profile": ("MC-10", "str"), + "platforms": ("MC-10", "list[str]"), + "build_platform": ("MC-10", "str|null"), + "prebuilt_image": ("MC-06", "str|null"), + "overlay_of": ("MC-14", "str|null"), + "image_build": ("MC-15", "obj"), + "build_dockerfile": ("MC-16", "str"), + "note": ("MC-01", "str|null"), +} +STRUCT_UPSTREAM: dict[str, tuple[str, str]] = { + "repo": ("MC-01", "str"), + "branch": ("MC-01", "str"), + "kind": ("MC-09", "str"), + "tracking_branch": ("MC-13", "str"), + "status": ("MC-09", "str"), + "sha": ("MC-06", "str"), + "fetched_at": ("MC-06", "str"), +} +STRUCT_PR: dict[str, tuple[str, str]] = { + "repo": ("MC-01", "str"), + "number": ("MC-09", "int"), + "title": ("MC-01", "str"), + "reason": ("MC-01", "str"), + "status": ("MC-09", "str"), +} + + +# --------------------------------------------------------------------------- helpers + +def _is_iso_date(value: Any) -> _dt.date | None: + if not isinstance(value, str): + return None + try: + return _dt.date.fromisoformat(value) + except ValueError: + return None + + +def _walk_strings(value: Any, path: str = "$"): + """Yield (json_path, string) for every string inside a JSON value.""" + if isinstance(value, str): + yield path, value + elif isinstance(value, dict): + for k, v in value.items(): + yield from _walk_strings(v, f"{path}.{k}") + elif isinstance(value, list): + for i, v in enumerate(value): + yield from _walk_strings(v, f"{path}[{i}]") + + +def expected_tracking_branch(kind: str, branch: str) -> str: + """Rule 7 without a tag: upstream/-.""" + return f"upstream/{kind}-{branch.replace('/', '-')}" + + +def tracking_branch_ok(tracking_branch: str, kind: str, branch: str, same_kind_count: int) -> bool: + """Rule 7: upstream/-; with 2+ upstreams of one kind in a component the + second may insert a tag: upstream/--.""" + plain = expected_tracking_branch(kind, branch) + if tracking_branch == plain: + return True + if same_kind_count >= 2: + suffix = "-" + branch.replace("/", "-") + prefix = f"upstream/{kind}-" + if tracking_branch.startswith(prefix) and tracking_branch.endswith(suffix): + tag = tracking_branch[len(prefix):-len(suffix)] + return bool(tag) and RE_ID.match(tag) is not None + return False + + +# --------------------------------------------------------------------------- type checks + +def _type_name(value: Any) -> str: + if value is None: + return "null" + if isinstance(value, bool): + return "boolean" + if isinstance(value, int): + return "integer" + if isinstance(value, float): + return "number" + if isinstance(value, str): + return "string" + if isinstance(value, list): + return "list" + if isinstance(value, dict): + return "object" + return type(value).__name__ + + +def _is_int(v: Any) -> bool: + return isinstance(v, int) and not isinstance(v, bool) + + +def _is_str(v: Any) -> bool: + return isinstance(v, str) + + +def _type_errors(value: Any, spec: str, path: str, mc: str) -> list[str]: + """Check one value against a type spec; return findings (never raises).""" + expected = { + "int": "integer", "str": "string", "str|null": "string or null", + "list[str]": "list of strings", "list[obj]": "list of objects", "obj": "object", + "str|null-map": "object whose values are string or null", + }[spec] + + def bad(v: Any, p: str) -> str: + return f"{mc}: {p}: expected {expected}, got {_type_name(v)}" + + if spec == "int": + return [] if _is_int(value) else [bad(value, path)] + if spec == "str": + return [] if _is_str(value) else [bad(value, path)] + if spec == "str|null": + return [] if value is None or _is_str(value) else [bad(value, path)] + if spec == "obj": + return [] if isinstance(value, dict) else [bad(value, path)] + if spec == "list[str]": + if not isinstance(value, list): + return [bad(value, path)] + return [f"{mc}: {path}[{i}]: expected string, got {_type_name(v)}" + for i, v in enumerate(value) if not _is_str(v)] + if spec == "list[obj]": + if not isinstance(value, list): + return [bad(value, path)] + return [f"{mc}: {path}[{i}]: expected object, got {_type_name(v)}" + for i, v in enumerate(value) if not isinstance(v, dict)] + if spec == "str|null-map": + if not isinstance(value, dict): + return [bad(value, path)] + return [f"{mc}: {path}.{k}: expected string or null, got {_type_name(v)}" + for k, v in value.items() if not (v is None or _is_str(v))] + raise AssertionError(spec) # programming error, not a manifest error + + +def _check_fields(obj: dict[str, Any], schema: dict[str, tuple[str, str]], path: str) -> list[str]: + errors: list[str] = [] + for field, (mc, spec) in schema.items(): + if field in obj: + errors.extend(_type_errors(obj[field], spec, f"{path}.{field}", mc)) + return errors + + +def validate_structure(data: Any) -> list[str]: + """Type validation of the parsed manifest against SPEC-01 §3 (R2-02). + + Checks every present field's type (missing required fields are reported by + validate_manifest as MC-01) without any set-membership test, so an unhashable + or wrongly typed value can never raise. Returns findings with the MC id and + the JSON path, for example 'MC-03: components[3].role: expected string, got list'. + An empty list means the manifest is well formed and the semantic checks and + the TOON projection may safely run.""" + if not isinstance(data, dict): + return [f"MC-01: $: expected object, got {_type_name(data)}"] + errors = _check_fields(data, STRUCT_TOP, "$") + if "schema_version" in data and _is_int(data["schema_version"]) and data["schema_version"] != 1: + errors.append(f"MC-01: $.schema_version: must be 1 (got {data['schema_version']!r})") + components = data.get("components") + if not isinstance(components, list): + return errors + for idx, comp in enumerate(components): + cpath = f"components[{idx}]" + if not isinstance(comp, dict): + continue # already reported by the list[obj] check + errors.extend(_check_fields(comp, STRUCT_COMPONENT, cpath)) + ups = comp.get("upstreams") + if isinstance(ups, list): + for uidx, up in enumerate(ups): + if isinstance(up, dict): + errors.extend(_check_fields(up, STRUCT_UPSTREAM, f"{cpath}.upstreams[{uidx}]")) + for list_name in ("adopted_prs", "candidate_prs"): + prs = comp.get(list_name) + if isinstance(prs, list): + for pidx, pr in enumerate(prs): + if isinstance(pr, dict): + errors.extend(_check_fields(pr, STRUCT_PR, f"{cpath}.{list_name}[{pidx}]")) + return errors + + +# --------------------------------------------------------------------------- JSON checks + +def validate_manifest(data: Any, today: _dt.date | None = None) -> list[str]: + """Return a list of findings (empty == valid) for the parsed JSON manifest. + Implements MC-01..MC-10, MC-13 and MC-14. Type validation (validate_structure) runs + first; when it finds anything, only those findings are returned and the + value-level checks are not attempted on ill-typed data.""" + today = today or _dt.date.today() + errors: list[str] = [] + + structural = validate_structure(data) + if structural: + return structural + + # MC-01 + if not isinstance(data, dict): + return ["MC-01: top level must be a JSON object"] + if not _is_int(data.get("schema_version")) or data.get("schema_version") != 1: + errors.append(f"MC-01: schema_version must be the integer 1 (got {data.get('schema_version')!r})") + if _is_iso_date(data.get("generated_at")) is None: + errors.append(f"MC-01: generated_at must be an ISO date (got {data.get('generated_at')!r})") + components = data.get("components") + if not isinstance(components, list): + errors.append("MC-01: components must be a list") + return errors + + seen_ids: set[str] = set() + sha_by_repo_branch: dict[tuple[str, str], dict[str, set[str]]] = {} + + for idx, comp in enumerate(components): + label = f"components[{idx}]" + if not isinstance(comp, dict): + errors.append(f"MC-01: {label} must be an object") + continue + comp_id = comp.get("id") + if isinstance(comp_id, str) and comp_id: + label = f"component '{comp_id}'" + + for field in COMPONENT_FIELDS: + if field not in comp: + errors.append(f"MC-01: {label}: missing required field '{field}'") + + # MC-02 + if not isinstance(comp_id, str) or not RE_ID.match(comp_id): + errors.append(f"MC-02: {label}: id must match ^[A-Za-z0-9_.-]+$ (got {comp_id!r})") + elif comp_id in seen_ids: + errors.append(f"MC-02: duplicate component id '{comp_id}'") + else: + seen_ids.add(comp_id) + + # MC-03 + role = comp.get("role") + if role not in ROLES: + errors.append(f"MC-03: {label}: role must be one of {sorted(ROLES)} (got {role!r})") + services = comp.get("services") + if not isinstance(services, list) or not services or not all(isinstance(s, str) and s for s in services): + errors.append(f"MC-03: {label}: services must be a non-empty list of strings (got {services!r})") + + # MC-04 + repo = comp.get("integration_repo") + if role == "infra": + if repo is not None: + errors.append(f"MC-04: {label}: integration_repo must be null for infra (got {repo!r})") + elif not isinstance(repo, str) or not RE_INTEGRATION_REPO.match(repo): + errors.append(f"MC-04: {label}: integration_repo must match ^RDM-[A-Za-z0-9_.-]+-dev2027$ (got {repo!r})") + + # MC-05 + branch = comp.get("integration_branch") + if role == "infra": + if branch is not None: + errors.append(f"MC-05: {label}: integration_branch must be null for infra (got {branch!r})") + elif branch != "develop": + errors.append(f"MC-05: {label}: integration_branch must be 'develop' (got {branch!r})") + isha = comp.get("integration_sha") + if isha is not None and not re.fullmatch(r"[0-9a-f]{40}", isha): + errors.append(f"MC-05: {label}: integration_sha must be 40 lowercase hex or null (got {isha!r})") + if comp.get("integration_repo") is None and isha is not None: + errors.append(f"MC-05: {label}: integration_sha must be null for infra") + + # MC-06 base_image_digest + digest = comp.get("base_image_digest") + if digest is not None and (not isinstance(digest, str) or not RE_DIGEST.match(digest)): + errors.append(f"MC-06: {label}: base_image_digest must be null or sha256:<64 hex> (got {digest!r})") + if not isinstance(comp.get("base_image"), str) or not comp.get("base_image"): + errors.append(f"MC-01: {label}: base_image must be a non-empty string") + errors.extend(check_prebuilt_image(comp, label)) + target = comp.get("target_image") + if not isinstance(target, dict) or set(target.keys()) != {"M4", "M5"}: + errors.append(f"MC-01: {label}: target_image must be an object with exactly the keys M4 and M5") + elif not all(v is None or isinstance(v, str) for v in target.values()): + errors.append(f"MC-01: {label}: target_image values must be a string or null") + + # upstreams: MC-06, MC-08, MC-09, MC-13 + upstreams = comp.get("upstreams") + if not isinstance(upstreams, list): + errors.append(f"MC-01: {label}: upstreams must be a list") + upstreams = [] + if role == "infra" and upstreams: + errors.append(f"MC-01: {label}: upstreams must be empty for infra") + kind_counts: dict[str, int] = {} + for up in upstreams: + if isinstance(up, dict) and isinstance(up.get("kind"), str): + kind_counts[up["kind"]] = kind_counts.get(up["kind"], 0) + 1 + for uidx, up in enumerate(upstreams): + ulabel = f"{label} upstreams[{uidx}]" + if not isinstance(up, dict): + errors.append(f"MC-01: {ulabel}: must be an object") + continue + for field in UPSTREAM_FIELDS: + if field not in up: + errors.append(f"MC-01: {ulabel}: missing required field '{field}'") + urepo, ubranch, kind = up.get("repo"), up.get("branch"), up.get("kind") + if not isinstance(urepo, str) or not RE_REPO_NAME.match(urepo): + errors.append(f"MC-01: {ulabel}: repo must be a bare name (got {urepo!r})") + if not isinstance(ubranch, str) or not ubranch: + errors.append(f"MC-01: {ulabel}: branch must be a non-empty string (got {ubranch!r})") + if kind not in KINDS: + errors.append(f"MC-09: {ulabel}: kind must be one of {sorted(KINDS)} (got {kind!r})") + status = up.get("status") + if status not in UPSTREAM_STATUSES: + errors.append(f"MC-09: {ulabel}: status must be one of {sorted(UPSTREAM_STATUSES)} (got {status!r})") + elif kind == "cos" and status != "reference": + errors.append(f"MC-09: {ulabel}: cos upstreams must have status 'reference' (got {status!r})") + sha = up.get("sha") + if not isinstance(sha, str) or not RE_SHA.match(sha): + errors.append(f"MC-06: {ulabel}: sha must match ^[0-9a-f]{{40}}$ (got {sha!r})") + fetched = _is_iso_date(up.get("fetched_at")) + if fetched is None: + errors.append(f"MC-06: {ulabel}: fetched_at must be an ISO date (got {up.get('fetched_at')!r})") + elif fetched > today: + errors.append(f"MC-06: {ulabel}: fetched_at {fetched} is in the future (today {today})") + tb = up.get("tracking_branch") + if isinstance(urepo, str) and isinstance(ubranch, str) and kind in KINDS: + if not isinstance(tb, str) or not tracking_branch_ok(tb, kind, ubranch, kind_counts.get(kind, 0)): + errors.append( + f"MC-13: {ulabel}: tracking_branch {tb!r} does not follow rule 7 " + f"(expected {expected_tracking_branch(kind, ubranch)!r}" + f"{' or upstream/' + kind + '--' + ubranch.replace('/', '-') if kind_counts.get(kind, 0) >= 2 else ''})" + ) + if isinstance(sha, str): + sha_by_repo_branch.setdefault((urepo, ubranch), {}).setdefault(sha, set()).add(str(comp_id)) + + # PR lists: MC-09 + for list_name, allowed in (("adopted_prs", ADOPTED_STATUSES), ("candidate_prs", CANDIDATE_STATUSES)): + prs = comp.get(list_name) + if not isinstance(prs, list): + errors.append(f"MC-01: {label}: {list_name} must be a list") + continue + for pidx, pr in enumerate(prs): + plabel = f"{label} {list_name}[{pidx}]" + if not isinstance(pr, dict): + errors.append(f"MC-01: {plabel}: must be an object") + continue + for field in PR_FIELDS: + if field not in pr: + errors.append(f"MC-01: {plabel}: missing required field '{field}'") + number = pr.get("number") + if not isinstance(number, int) or isinstance(number, bool) or number <= 0: + errors.append(f"MC-09: {plabel}: number must be a positive integer (got {number!r})") + if pr.get("status") not in allowed: + errors.append(f"MC-09: {plabel}: status must be one of {sorted(allowed)} (got {pr.get('status')!r})") + if not isinstance(pr.get("repo"), str) or not RE_REPO_NAME.match(pr.get("repo") or ""): + errors.append(f"MC-01: {plabel}: repo must be a bare name (got {pr.get('repo')!r})") + + # MC-10 + profile = comp.get("profile") + if profile not in PROFILES: + errors.append(f"MC-10: {label}: profile must be one of {sorted(PROFILES)} (got {profile!r})") + platforms = comp.get("platforms") + if not isinstance(platforms, list) or not set(platforms) <= PLATFORMS or not platforms: + errors.append(f"MC-10: {label}: platforms must be a non-empty subset of {sorted(PLATFORMS)} (got {platforms!r})") + elif role == "core" and set(platforms) != PLATFORMS: + errors.append(f"MC-10: {label}: core components must list both platforms (got {platforms!r})") + if role == "infra" and comp.get("build_platform") and not (isinstance(comp.get("note"), str) and comp.get("note").strip()): + errors.append(f"MC-10: {label}: build_platform on an infra component requires a non-empty note saying why its image lacks the other platform (SPEC-01 §3)") + + # MC-14 + errors.extend(check_overlays(components)) + + # MC-15: image_build (ADR-07) only on infra, with a repo-relative context that holds a Dockerfile, + # a tag, a note, no prebuilt_image and no build_platform (the point is a native build) + for i, comp in enumerate(components): + if not isinstance(comp, dict) or "image_build" not in comp: + continue # key absent: not an image_build component + label = f"components[{i}]" + ib = comp["image_build"] + if comp.get("role") != "infra": + errors.append(f"MC-15: {label}: image_build is only for infra components") + if not isinstance(ib, dict) or not isinstance(ib.get("context"), str) or not isinstance(ib.get("tag"), str) or not ib["context"] or not ib["tag"]: + # an empty object or a missing key is an error, never "no image_build" (review PR #34 r1 R1-02) + errors.append(f"MC-15: {label}: image_build must be an object with non-empty string context and tag (got {ib!r})") + continue + ctxp = ib["context"] + if ctxp.startswith("/") or ".." in ctxp.split("/") or not re.fullmatch(r"[A-Za-z0-9_./-]+", ctxp): + errors.append(f"MC-15: {label}: image_build.context must be a plain repo-relative path (got {ctxp!r})") + else: + root = REPO_ROOT.resolve() + ctx_dir = (REPO_ROOT / ctxp).resolve() + dockerfile = (REPO_ROOT / ctxp / "Dockerfile").resolve() + inside = all(str(q).startswith(str(root) + "/") for q in (ctx_dir, dockerfile)) + if not inside: + errors.append(f"MC-15: {label}: image_build.context {ctxp} resolves outside this repository (symlink?)") + elif not ctx_dir.is_dir() or not dockerfile.is_file(): + errors.append(f"MC-15: {label}: image_build.context {ctxp} has no Dockerfile in this repository") + if not re.fullmatch(r"[A-Za-z0-9_][A-Za-z0-9_.-]{0,127}", ib["tag"]): + errors.append(f"MC-15: {label}: image_build.tag must be a valid image tag (got {ib['tag']!r})") + if comp.get("prebuilt_image"): + errors.append(f"MC-15: {label}: image_build and prebuilt_image are exclusive") + if comp.get("build_platform"): + errors.append(f"MC-15: {label}: image_build components are built for the host platform; drop build_platform") + if not (isinstance(comp.get("note"), str) and comp["note"].strip()): + errors.append(f"MC-15: {label}: image_build requires a note (why the official image cannot be used, until which milestone)") + + # MC-16: build_dockerfile, this repository's recipe over a pinned integration checkout + for i, comp in enumerate(components): + if not isinstance(comp, dict) or "build_dockerfile" not in comp: + continue + label = f"components[{i}]" + path = comp["build_dockerfile"] + if not comp.get("integration_repo"): + errors.append(f"MC-16: {label}: build_dockerfile needs an integration_repo checkout as its context") + if comp.get("prebuilt_image") or comp.get("overlay_of"): + errors.append(f"MC-16: {label}: build_dockerfile is exclusive with prebuilt_image and overlay_of") + if not (isinstance(comp.get("note"), str) and comp["note"].strip()): + errors.append(f"MC-16: {label}: build_dockerfile requires a note (why the integration repository's Dockerfile is replaced)") + if not isinstance(path, str) or path.startswith("/") or ".." in path.split("/") or not re.fullmatch(r"[A-Za-z0-9_./-]+", path): + errors.append(f"MC-16: {label}: build_dockerfile must be a plain repo-relative path (got {path!r})") + continue + root = REPO_ROOT.resolve() + resolved = (REPO_ROOT / path).resolve() + if not str(resolved).startswith(str(root) + "/") or not resolved.is_file(): + errors.append(f"MC-16: {label}: build_dockerfile {path} is not a file in this repository") + + # MC-08 + for (urepo, ubranch), shas in sorted(sha_by_repo_branch.items()): + if len(shas) > 1: + detail = "; ".join(f"{s} in {sorted(c)}" for s, c in sorted(shas.items())) + errors.append(f"MC-08: upstream ({urepo}, {ubranch}) pinned to different SHAs: {detail}") + + # MC-07 + errors.extend(f"MC-07: {e}" for e in find_forbidden_strings(data)) + return errors + + +def check_prebuilt_image(comp: dict[str, Any], label: str) -> list[str]: + """MC-06 for the optional `prebuilt_image` (SPEC-01 §3). + + A prebuilt image replaces building the component from its integration repository, so it + bypasses the build-from-pinned-source guarantee. It is tolerated only when (a) it is pinned + by an `@sha256:<64 hex>` digest, (b) the component carries a non-empty `note` saying why and + until which milestone, (c) it is not a URL and not a private-repository address, and (d) the + component is not `infra` (infra already runs `base_image[@base_image_digest]`).""" + if "prebuilt_image" not in comp or comp.get("prebuilt_image") is None: + return [] + value = comp.get("prebuilt_image") + errors: list[str] = [] + if not isinstance(value, str) or not RE_PREBUILT_IMAGE.match(value): + errors.append(f"MC-06: {label}: prebuilt_image must be a registry reference pinned as name@sha256:<64 hex> (got {value!r})") + if isinstance(value, str): + low = value.lower() + if "://" in low or "git@" in low or "github.com" in low or RE_PRIVATE_URL.search(value) \ + or any(seg.endswith(("-private", "-dev2027")) for seg in re.split(r"[/@:]", low)): + errors.append(f"MC-06: {label}: prebuilt_image must not be a URL or a private-repository reference (public registry image only)") + note = comp.get("note") + if not isinstance(note, str) or not note.strip(): + errors.append(f"MC-06: {label}: prebuilt_image requires a non-empty note explaining why the build is bypassed and until which milestone") + if comp.get("role") == "infra": + errors.append(f"MC-06: {label}: prebuilt_image is not allowed for infra (use base_image and base_image_digest)") + return errors + + +def is_overlay(comp: dict[str, Any]) -> bool: + return isinstance(comp.get("overlay_of"), str) and bool(comp.get("overlay_of")) + + +def check_overlays(components: list[Any]) -> list[str]: + """MC-14 for the optional `overlay_of` (SPEC-01 §3, ADR-06). + + An overlay component's image is built from a merged context (the base component's checkout with + the overlay's files copied over it) with the overlay's Dockerfile and tagged + `-`; its services are one-shot bundle copiers (the installer checks + the `one_shot` template flag). For that to be well defined the base must exist, be buildable + from source (not infra, not prebuilt) and not be an overlay itself; the overlay must be + buildable too (not infra, not prebuilt); and a base takes at most one overlay (the copy order + of two would be arbitrary).""" + errors: list[str] = [] + by_id: dict[str, dict[str, Any]] = {} + for comp in components: + if isinstance(comp, dict) and isinstance(comp.get("id"), str): + by_id.setdefault(comp["id"], comp) + overlays_of: dict[str, list[str]] = {} + for comp in components: + if not isinstance(comp, dict): + continue + cid = comp.get("id") + label = f"component '{cid}'" if isinstance(cid, str) and cid else "component" + if comp.get("overlay_of") == "": + errors.append(f"MC-14: {label}: overlay_of must be a component id or null, not an empty string") + continue + if not is_overlay(comp): + continue + target = comp["overlay_of"] + if target == cid: + errors.append(f"MC-14: {label}: overlay_of must not name the component itself") + continue + base = by_id.get(target) + if base is None: + errors.append(f"MC-14: {label}: overlay_of names unknown component {target!r}") + continue + overlays_of.setdefault(target, []).append(str(cid)) + if base.get("role") == "infra": + errors.append(f"MC-14: {label}: overlay_of must name a buildable component, not infra ({target!r})") + if is_overlay(base): + errors.append(f"MC-14: {label}: overlay_of {target!r} is itself an overlay (overlay of overlay is not allowed)") + if base.get("prebuilt_image"): + errors.append(f"MC-14: {label}: base {target!r} has prebuilt_image; an overlay needs a base built from source") + if comp.get("role") == "infra": + errors.append(f"MC-14: {label}: an overlay must not be infra") + if comp.get("prebuilt_image"): + errors.append(f"MC-14: {label}: an overlay must not have prebuilt_image (its image is built from the merged context)") + for target, ids in sorted(overlays_of.items()): + if len(ids) > 1: + errors.append(f"MC-14: component '{target}' has more than one overlay ({', '.join(sorted(ids))}); at most one is allowed") + return errors + + +def find_forbidden_strings(data: Any) -> list[str]: + """MC-07: no string value contains http, git@, github.com or a token-like string.""" + errors: list[str] = [] + for path, value in _walk_strings(data): + low = value.lower() + if "http" in low or "git@" in low or "github.com" in low: + errors.append(f"{path}: value must not contain http/git@/github.com (names only, rule 5)") + for name, pattern in TOKEN_PATTERNS: + if pattern.search(value): + errors.append(f"{path}: value looks like a {name}") + return errors + + +# --------------------------------------------------------------------------- TOON parsing + +class ToonError(ValueError): + pass + + +def _split_csv(row: str) -> list[str]: + """Split one TOON tabular row on commas, honouring double quotes.""" + out: list[str] = [] + buf: list[str] = [] + in_q = False + i = 0 + while i < len(row): + ch = row[i] + if in_q: + if ch == "\\" and i + 1 < len(row): + buf.append(row[i + 1]) + i += 2 + continue + if ch == '"': + in_q = False + else: + buf.append(ch) + elif ch == '"': + in_q = True + elif ch == ",": + out.append("".join(buf)) + buf = [] + else: + buf.append(ch) + i += 1 + out.append("".join(buf)) + return [v.strip() for v in out] + + +def _scalar(text: str) -> Any: + text = text.strip() + if text == "": + return "" + if text.startswith('"') and text.endswith('"') and len(text) >= 2: + return json.loads(text) + if text == "null": + return None + if text == "true": + return True + if text == "false": + return False + if re.fullmatch(r"-?\d+", text): + return int(text) + if re.fullmatch(r"-?\d+\.\d+", text): + return float(text) + return text + + +_RE_KEY = re.compile(r"^(?P[A-Za-z_][A-Za-z0-9_.-]*)(?:\[(?P\d+)\](?:\{(?P[^}]*)\})?)?:(?P.*)$") + + +def parse_toon(text: str) -> dict[str, Any]: + """Parse the TOON excerpt format of SPEC-01 §2 into Python data. + + Supports: `key: value`, `key[N]: a,b,c` (inline list), `key[N]:` followed by N + `- key: value` list items (each item's other fields indented under it), + `key[N]{f1,f2}:` followed by N CSV rows, and nested `key:` objects. + Raises ToonError on shape errors (wrong counts, bad indentation).""" + raw_lines = text.splitlines() + lines: list[tuple[int, str, int]] = [] # (indent, content, lineno) + for n, raw in enumerate(raw_lines, 1): + if not raw.strip() or raw.lstrip().startswith("#"): + continue + lines.append((len(raw) - len(raw.lstrip(" ")), raw.strip(), n)) + + pos = 0 + + def parse_block(indent: int) -> dict[str, Any]: + nonlocal pos + obj: dict[str, Any] = {} + while pos < len(lines): + ind, content, lineno = lines[pos] + if ind < indent: + break + if ind > indent: + raise ToonError(f"line {lineno}: unexpected indentation") + if content.startswith("- "): + break + m = _RE_KEY.match(content) + if not m: + raise ToonError(f"line {lineno}: cannot parse {content!r}") + key, n, fields, rest = m.group("key"), m.group("n"), m.group("fields"), m.group("rest").strip() + pos += 1 + if n is None and fields is None: + if rest: + obj[key] = _scalar(rest) + else: # nested object + obj[key] = parse_block(_child_indent(indent)) + continue + count = int(n) + if fields is not None: # tabular rows + names = [f.strip() for f in fields.split(",")] if fields.strip() else [] + rows: list[dict[str, Any]] = [] + for _ in range(count): + if pos >= len(lines) or lines[pos][0] <= indent: + raise ToonError(f"line {lineno}: {key}[{count}] declares {count} rows but fewer follow") + rind, rcontent, rlineno = lines[pos] + values = _split_csv(rcontent) + if len(values) != len(names): + raise ToonError(f"line {rlineno}: row has {len(values)} values, header has {len(names)}") + rows.append({k: _scalar(v) for k, v in zip(names, values)}) + pos += 1 + if pos < len(lines) and lines[pos][0] > indent and not lines[pos][1].startswith("- "): + raise ToonError(f"line {lineno}: {key}[{count}] has more rows than declared") + obj[key] = rows + continue + if rest: # inline primitive list + items = [_scalar(v) for v in _split_csv(rest)] if count else [] + if len(items) != count: + raise ToonError(f"line {lineno}: {key}[{count}] has {len(items)} inline values") + obj[key] = items + continue + # list of objects: `- field: value` items + items_obj: list[Any] = [] + for _ in range(count): + if pos >= len(lines) or lines[pos][0] <= indent or not lines[pos][1].startswith("- "): + raise ToonError(f"line {lineno}: {key}[{count}] declares {count} items but fewer follow") + iind, icontent, ilineno = lines[pos] + # rewrite "- k: v" as "k: v" at indent iind+2 and parse the item as a block + lines[pos] = (iind + 2, icontent[2:].strip(), ilineno) + items_obj.append(parse_block(iind + 2)) + if pos < len(lines) and lines[pos][0] > indent: + raise ToonError(f"line {lineno}: {key}[{count}] has more items than declared") + obj[key] = items_obj + return obj + + def _child_indent(indent: int) -> int: + if pos < len(lines) and lines[pos][0] > indent: + return lines[pos][0] + return indent + 2 + + result = parse_block(lines[0][0] if lines else 0) + if pos != len(lines): + raise ToonError(f"line {lines[pos][2]}: trailing content {lines[pos][1]!r}") + return result + + +def project_manifest(data: dict[str, Any]) -> dict[str, Any]: + """The projection of the JSON that upstreams.toon must equal (SPEC-01 §2).""" + out: dict[str, Any] = {"schema_version": data.get("schema_version"), "generated_at": data.get("generated_at")} + if "note" in data: + out["note"] = data["note"] + comps = [] + for c in data.get("components", []): + comps.append({ + "id": c.get("id"), + "role": c.get("role"), + "integration_repo": c.get("integration_repo"), + "profile": c.get("profile"), + "upstreams": [{f: u.get(f) for f in UPSTREAM_FIELDS} for u in c.get("upstreams", [])], + "adopted_prs": [{f: p.get(f) for f in ("repo", "number", "status")} for p in c.get("adopted_prs", [])], + }) + out["components"] = comps + return out + + +def compare_toon(json_data: dict[str, Any], toon_data: dict[str, Any]) -> list[str]: + """MC-11: every id, upstream and adopted PR in the TOON equals the JSON, counts match.""" + errors: list[str] = [] + expected = project_manifest(json_data) + for key in ("schema_version", "generated_at", "note"): + if key in expected and toon_data.get(key) != expected[key]: + errors.append(f"MC-11: top-level {key}: TOON {toon_data.get(key)!r} != JSON {expected[key]!r}") + tcomps = toon_data.get("components") + if not isinstance(tcomps, list): + return errors + ["MC-11: TOON has no components[] list"] + if len(tcomps) != len(expected["components"]): + errors.append(f"MC-11: component count: TOON {len(tcomps)} != JSON {len(expected['components'])}") + jmap = {c["id"]: c for c in expected["components"]} + tids = [c.get("id") for c in tcomps if isinstance(c, dict)] + for cid in jmap: + if cid not in tids: + errors.append(f"MC-11: component '{cid}' is in JSON but missing from TOON") + for tc in tcomps: + if not isinstance(tc, dict): + errors.append("MC-11: TOON component is not an object") + continue + cid = tc.get("id") + jc = jmap.get(cid) + if jc is None: + errors.append(f"MC-11: component '{cid}' is in TOON but not in JSON") + continue + for key in ("role", "integration_repo", "profile"): + if tc.get(key) != jc[key]: + errors.append(f"MC-11: component '{cid}' {key}: TOON {tc.get(key)!r} != JSON {jc[key]!r}") + tups = tc.get("upstreams") if isinstance(tc.get("upstreams"), list) else [] + if "upstreams" not in tc or not isinstance(tc.get("upstreams"), list): + errors.append(f"MC-11: component '{cid}' has no upstreams[] in TOON") + if len(tups) != len(jc["upstreams"]): + errors.append(f"MC-11: component '{cid}' upstream count: TOON {len(tups)} != JSON {len(jc['upstreams'])}") + for i, (tu, ju) in enumerate(zip(tups, jc["upstreams"])): + for f in UPSTREAM_FIELDS: + if tu.get(f) != ju.get(f): + errors.append(f"MC-11: component '{cid}' upstreams[{i}].{f}: TOON {tu.get(f)!r} != JSON {ju.get(f)!r}") + tprs = tc.get("adopted_prs") if isinstance(tc.get("adopted_prs"), list) else [] + if "adopted_prs" not in tc or not isinstance(tc.get("adopted_prs"), list): + errors.append(f"MC-11: component '{cid}' has no adopted_prs[] in TOON") + if len(tprs) != len(jc["adopted_prs"]): + errors.append(f"MC-11: component '{cid}' adopted_prs count: TOON {len(tprs)} != JSON {len(jc['adopted_prs'])}") + for i, (tp, jp) in enumerate(zip(tprs, jc["adopted_prs"])): + for f in ("repo", "number", "status"): + if tp.get(f) != jp.get(f): + errors.append(f"MC-11: component '{cid}' adopted_prs[{i}].{f}: TOON {tp.get(f)!r} != JSON {jp.get(f)!r}") + return errors + + +def validate_toon_parity(json_data: dict[str, Any], toon_path: Path) -> list[str]: + if not toon_path.exists(): + return [f"MC-11: {toon_path} is missing (the TOON excerpt is required)"] + try: + toon_data = parse_toon(toon_path.read_text(encoding="utf-8")) + except (ToonError, json.JSONDecodeError, UnicodeDecodeError) as e: + return [f"MC-11: {toon_path} does not parse: {e}"] + return compare_toon(json_data, toon_data) + + +# --------------------------------------------------------------------------- policy scan + +class PolicyScanResult: + """Outcome of the repository policy scan.""" + + def __init__(self) -> None: + self.findings: list[str] = [] + self.scanned: list[str] = [] + self.skipped: list[tuple[str, str]] = [] # (path, reason) + + @property + def skipped_binary(self) -> int: + return sum(1 for _, r in self.skipped if r == "not UTF-8 text") + + @property + def skipped_large(self) -> int: + return sum(1 for _, r in self.skipped if r.startswith("larger than")) + + +def scan_text_for_policy(text: str, rel_path: str) -> list[str]: + """Return findings for private URLs, token-like strings and private keys in text.""" + findings: list[str] = [] + for lineno, line in enumerate(text.splitlines(), 1): + for m in RE_PRIVATE_URL.finditer(line): + # Report the repository *name* only; the URL itself is never echoed. + name = re.split(r"[/:]", m.group(0))[-1].removesuffix(".git") + findings.append(f"{rel_path}:{lineno}: URL to private repository '{name}' (names only, SPEC-01 rule 5)") + for name, pattern in TOKEN_PATTERNS: + if pattern.search(line): + findings.append(f"{rel_path}:{lineno}: {name} pattern found (value redacted)") + return findings + + +def git_tracked_files(root: Path) -> list[str]: + out = subprocess.run( + ["git", "ls-files", "-z"], cwd=root, check=True, capture_output=True + ).stdout + return [p.decode("utf-8", "surrogateescape") for p in out.split(b"\0") if p] + + +def scan_policy(root: Path, files: list[str] | None = None, max_bytes: int = POLICY_MAX_BYTES) -> PolicyScanResult: + """Scan every tracked file (or the given relative paths) for policy violations. + + There are NO path exemptions: site/**, *.legacy.md and legacy sample code are + scanned like everything else (R2-01). The only guard is technical: a file that + is larger than max_bytes or is not valid UTF-8 is skipped and counted.""" + result = PolicyScanResult() + files = git_tracked_files(root) if files is None else files + for rel in files: + path = root / rel + if not path.is_file(): + continue # deleted in the working tree, or a submodule entry + try: + size = path.stat().st_size + if size > max_bytes: + result.skipped.append((rel, f"larger than {max_bytes} bytes ({size})")) + continue + text = path.read_bytes().decode("utf-8") + except UnicodeDecodeError: + result.skipped.append((rel, "not UTF-8 text")) + continue + except OSError as e: + result.skipped.append((rel, f"unreadable ({e.__class__.__name__})")) + continue + result.scanned.append(rel) + result.findings.extend(scan_text_for_policy(text, rel)) + return result + + +def run_policy_scan(root: Path, files: list[str] | None = None) -> list[str]: + """Findings only (compatibility wrapper around scan_policy).""" + return scan_policy(root, files).findings + + +# --------------------------------------------------------------------------- CLI + +def check_manifest_files(json_path: Path, toon_path: Path) -> list[str]: + try: + data = json.loads(json_path.read_text(encoding="utf-8")) + except FileNotFoundError: + return [f"MC-01: {json_path} not found"] + except (json.JSONDecodeError, UnicodeDecodeError) as e: + return [f"MC-01: {json_path} is not valid JSON: {e}"] + errors = validate_manifest(data) + # MC-11 projects the JSON; run it only once the manifest is well typed, so an + # ill-formed manifest yields findings and exit 20 instead of a traceback. + if not validate_structure(data): + errors.extend(validate_toon_parity(data, toon_path)) + return errors + + +def main(argv: list[str] | None = None) -> int: + parser = argparse.ArgumentParser( + prog="manifest_check.py", + description="SPEC-01 manifest validation (MC-01..MC-11, MC-13) and repository policy scan.", + epilog="Exit codes: 0 pass; 1 policy violation; 20 manifest invalid or TOON excerpt " + "disagrees with JSON (SPEC-02 §6); 2 usage error.", + ) + mode = parser.add_mutually_exclusive_group() + mode.add_argument("--manifest-only", action="store_true", help="run only the SPEC-01 manifest and TOON checks") + mode.add_argument("--policy-only", action="store_true", help="run only the repository-wide private-URL/token scan") + parser.add_argument("--root", default=".", help="repository root (default: current directory)") + args = parser.parse_args(argv) + + root = Path(args.root).resolve() + json_path, toon_path = root / MANIFEST_JSON, root / MANIFEST_TOON + + print("=" * 70) + print("manifest_check.py - SPEC-01 manifest validation and policy scan") + print("=" * 70) + + manifest_errors: list[str] = [] + policy_findings: list[str] = [] + + if not args.policy_only: + if not json_path.exists(): + print(f"Error: {json_path} not found. Run from the repository root.", file=sys.stderr) + return EXIT_MANIFEST + try: + manifest_errors = check_manifest_files(json_path, toon_path) + except Exception as e: # last resort: an invalid manifest must never end in a traceback + manifest_errors = [f"MC-01: manifest could not be validated: {e.__class__.__name__}: {e}"] + print(f"\n[manifest] {MANIFEST_JSON} + {MANIFEST_TOON}: {len(manifest_errors)} finding(s)") + for e in manifest_errors: + print(f" - {e}") + + if not args.manifest_only: + try: + scan = scan_policy(root) + except (subprocess.CalledProcessError, FileNotFoundError) as e: + print(f"Error: git ls-files failed ({e}); the policy scan needs a Git checkout.", file=sys.stderr) + return EXIT_POLICY + policy_findings = scan.findings + print( + f"\n[policy] all tracked files, no path exemptions: {len(scan.scanned)} scanned, " + f"{len(scan.skipped)} skipped ({scan.skipped_binary} not UTF-8, {scan.skipped_large} over " + f"{POLICY_MAX_BYTES // (1024 * 1024)} MB), {len(policy_findings)} finding(s)" + ) + for f in policy_findings: + print(f" - {f}") + + print("\n" + "=" * 70) + if manifest_errors: + print(f"FAILED: manifest invalid ({len(manifest_errors)} finding(s)) -> exit {EXIT_MANIFEST}") + print("=" * 70) + return EXIT_MANIFEST + if policy_findings: + print(f"FAILED: policy violations ({len(policy_findings)}) -> exit {EXIT_POLICY}") + print("=" * 70) + return EXIT_POLICY + print("PASSED") + print("=" * 70) + return EXIT_OK + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/tools/tests/test_docs_check.py b/tools/tests/test_docs_check.py new file mode 100644 index 0000000..547c743 --- /dev/null +++ b/tools/tests/test_docs_check.py @@ -0,0 +1,202 @@ +"""Unit tests for tools/docs_check.py (SPEC-06 §8 checks). + +Run from the repository root: python3 -m unittest discover -s tools/tests +""" + +from __future__ import annotations + +import json +import sys +import tempfile +import unittest +from pathlib import Path + +sys.path.insert(0, str(Path(__file__).resolve().parents[1])) + +import docs_check as dc # noqa: E402 + +SHA_A = "a" * 40 +SHA_B = "b" * 40 + +HEADER = """# Title / 題 + +> **Summary:** s +> **概要:** s + +**Jump:** [English](#english) · [日本語](#japanese) + +- Version / 版: 0.1 — 2026-11-05 + +--- + + +## English + +### 2. Component map + +Body text. + + +## 日本語 + +本文。 +""" + + +class _Repo: + """A throw-away repository root with docs/ and helper writers.""" + + def __init__(self): + self._tmp = tempfile.TemporaryDirectory() + self.root = Path(self._tmp.name) + (self.root / "docs").mkdir() + + def write(self, rel: str, text: str) -> str: + path = self.root / rel + path.parent.mkdir(parents=True, exist_ok=True) + path.write_text(text, encoding="utf-8") + return rel + + def check(self, rel: str, terms: list[str] | None = None) -> dc.FileResult: + return dc.check_file(rel, self.root, terms or []) + + def cleanup(self): + self._tmp.cleanup() + + +class DocsCheckTests(unittest.TestCase): + def setUp(self): + self.repo = _Repo() + self.addCleanup(self.repo.cleanup) + + def test_compliant_document_passes(self): + rel = self.repo.write("docs/a.md", HEADER) + self.assertEqual(self.repo.check(rel).errors, []) + + def test_missing_same_file_anchor_fails(self): + rel = self.repo.write("docs/a.md", HEADER + "\nSee [there](#nowhere).\n") + errors = self.repo.check(rel).errors + self.assertTrue(any("#nowhere" in e for e in errors), errors) + + def test_existing_anchor_and_heading_slug_pass(self): + rel = self.repo.write("docs/a.md", HEADER + "\n[jp](#japanese) and [map](#2-component-map)\n") + self.assertEqual(self.repo.check(rel).errors, []) + + def test_broken_file_with_fragment_fails(self): + rel = self.repo.write("docs/a.md", HEADER + "\n[x](absent-file.md#english)\n") + errors = self.repo.check(rel).errors + self.assertTrue(any("absent-file.md#english" in e for e in errors), errors) + + def test_fragment_missing_in_existing_target_fails(self): + self.repo.write("docs/b.md", HEADER) + rel = self.repo.write("docs/a.md", HEADER + "\n[ok](b.md#english) [bad](b.md#no-such-id)\n") + errors = self.repo.check(rel).errors + self.assertEqual(len(errors), 1, errors) + self.assertIn("#no-such-id", errors[0]) + + def test_links_inside_code_are_ignored(self): + rel = self.repo.write("docs/a.md", HEADER + "\n```md\n[x](missing.md)\n```\n`[y](also-missing.md)`\n") + self.assertEqual(self.repo.check(rel).errors, []) + + def test_pointer_file_exemption(self): + self.repo.write("docs/guides/README.md", HEADER) + self.repo.write("docs/guides/skeleton/README.md", HEADER) + rel = self.repo.write( + "Skelton/README.md", + "# Skeleton\n\nMoved to [docs/guides/skeleton/](../docs/guides/skeleton/).\n\n- [index](../docs/guides/README.md)\n", + ) + result = self.repo.check(rel) + self.assertEqual(result.category, "pointer") + self.assertEqual(result.errors, []) # no anchors / jump / version required + + def test_pointer_file_with_broken_link_fails(self): + rel = self.repo.write("Environment.md", "# Env\n\nMoved to [here](docs/guides/environment/).\n") + result = self.repo.check(rel) + self.assertEqual(result.category, "pointer") + self.assertTrue(any("non-existent" in e for e in result.errors), result.errors) + + def test_classification_of_exceptions(self): + self.assertEqual(dc.classify("docs/guides/api/README.legacy.md")[0], "legacy") + self.assertEqual(dc.classify("docs/guides/api/Decorators.md")[0], "sample") + self.assertEqual(dc.classify("docs/guides/api/osf/addon/README.md")[0], "sample") + self.assertEqual(dc.classify("docs/guides/api/README.md")[0], "full") + self.assertEqual(dc.classify("manifest/README.md")[0], "full") + self.assertEqual(dc.classify("installer/README.md")[0], "full") + self.assertEqual(dc.classify("APIGuide/README.md")[0], "pointer") + + def test_legacy_and_sample_are_skipped(self): + rel = self.repo.write("docs/guides/x/README.legacy.md", "no anchors at all") + self.assertEqual(self.repo.check(rel).errors, []) + rel = self.repo.write("docs/guides/x/code/README.md", "no anchors at all") + self.assertEqual(self.repo.check(rel).errors, []) + + def test_toon_sha_mismatch_fails(self): + self.repo.write("manifest/upstreams.json", json.dumps({"components": [{"upstreams": [{"sha": SHA_A}]}]})) + body = ( + "\n\n```toon\n" + f"upstreams[1]{{repo,sha}}:\n RDM-x,{SHA_B}\n```\n" + ) + rel = self.repo.write("docs/a.md", HEADER + body) + errors = self.repo.check(rel).errors + self.assertTrue(any(SHA_B in e and "stale" in e for e in errors), errors) + + def test_toon_sha_match_passes_and_inline_declaration(self): + self.repo.write("manifest/upstreams.json", json.dumps({"sha": SHA_A})) + body = f"\nThe canonical file is `manifest/upstreams.json`; canonical: `manifest/upstreams.json`.\n```toon\nrow: {SHA_A}\n```\n" + rel = self.repo.write("docs/a.md", HEADER + body) + self.assertEqual(self.repo.check(rel).errors, []) + + def test_toon_missing_canonical_json_fails(self): + body = "\n\n```toon\nrow: 1\n```\n" + rel = self.repo.write("docs/a.md", HEADER + body) + errors = self.repo.check(rel).errors + self.assertTrue(any("does not exist" in e for e in errors), errors) + + def test_toon_without_declaration_is_not_checked(self): + body = f"\n```toon\nrow: {SHA_B}\n```\n" + rel = self.repo.write("docs/a.md", HEADER + body) + self.assertEqual(self.repo.check(rel).errors, []) + + def test_glossary_warning_does_not_fail(self): + body = "\nThe manifest pins every Upstream. A Mirror (an automatic copy) is refreshed daily.\n" + text = HEADER.replace("Body text.\n", body) + rel = self.repo.write("docs/a.md", text) + result = self.repo.check(rel, terms=["Upstream", "Mirror"]) + self.assertEqual(result.errors, []) + self.assertEqual(len(result.warnings), 1) + self.assertIn("'Upstream'", result.warnings[0]) + + def test_glossary_warning_skips_review_records(self): + body = "\nThe manifest pins every Upstream.\n" + text = HEADER.replace("Body text.\n", body) + rel = self.repo.write("docs/reviews/2026-11-06_PR99_r1.md", text) + result = self.repo.check(rel, terms=["Upstream"]) + self.assertEqual(result.errors, []) # anchors, links and version are still checked + self.assertEqual(result.warnings, []) # review records are kept verbatim (SPEC-06 §8) + self.assertFalse(dc.glossary_check_applies("docs/reviews/README.md")) + self.assertFalse(dc.glossary_check_applies("docs/reference/REF-01_Glossary.md")) + self.assertTrue(dc.glossary_check_applies("docs/spec/00_overview.md")) + rel = self.repo.write("docs/spec/a.md", text) + self.assertEqual(len(self.repo.check(rel, terms=["Upstream"]).warnings), 1) + + def test_review_record_still_fails_other_checks(self): + # the exemption covers the glossary warning only: anchors, Jump, Version and links still fail + broken = HEADER.replace('\n', "").replace("- Version / 版: 0.1 — 2026-11-05\n", "") + rel = self.repo.write("docs/reviews/2026-11-06_PR99_r2.md", broken + "\nSee [gone](missing.md).\n") + result = self.repo.check(rel, terms=["Upstream"]) + self.assertEqual(result.warnings, []) + joined = "\n".join(result.errors) + self.assertIn('', joined) + self.assertIn("Version", joined) + self.assertIn("missing.md", joined) + + def test_glossary_terms_loaded_from_ref01(self): + self.repo.write( + "docs/reference/REF-01_Glossary.md", + '\n| Term | For everyone |\n|---|---|\n| Pull request (PR) | x |\n| Loopback / localhost | y |\n\n', + ) + self.assertEqual(dc.load_glossary_terms(self.repo.root), ["Pull request", "PR", "Loopback", "localhost"]) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_manifest_check.py b/tools/tests/test_manifest_check.py new file mode 100644 index 0000000..4ca5fc8 --- /dev/null +++ b/tools/tests/test_manifest_check.py @@ -0,0 +1,930 @@ +"""Unit tests for tools/manifest_check.py (SPEC-01 MC checks, TOON parity, policy scan). + +Run from the repository root: python3 -m unittest discover -s tools/tests +""" + +from __future__ import annotations + +import contextlib +import copy +import datetime as dt +import io +import json +import subprocess +import sys +import tempfile +import unittest +from pathlib import Path + +TOOLS_DIR = Path(__file__).resolve().parents[1] +REPO_ROOT = TOOLS_DIR.parent +sys.path.insert(0, str(TOOLS_DIR)) + +import manifest_check as mc # noqa: E402 + + +def private_address(form: str, repo: str) -> str: + """Build a prohibited private-repository address at run time, so that this test + source never contains one literally (the policy scan covers tools/tests/ too).""" + host = "github" + "." + "com" + if form == "https": + return "https://" + host + "/RCOSDP/" + repo + if form == "scp": + return "git@" + host + ":RCOSDP/" + repo + ".git" + if form == "ssh": + return "ssh://git@" + host + "/RCOSDP/" + repo + ".git" + raise ValueError(form) + + +DEV2027 = "-dev" + "2027" +PRIVATE = "-priv" + "ate" + +SHA_A = "a" * 40 +SHA_B = "b" * 40 +SHA_C = "0123456789abcdef0123456789abcdef01234567" +TODAY = dt.date(2026, 11, 5) + + +def valid_manifest() -> dict: + return { + "schema_version": 1, + "generated_at": "2026-11-05", + "note": "Names and SHAs only.", + "components": [ + { + "id": "osf.io", + "role": "core", + "services": ["web", "api"], + "integration_repo": "RDM-osf.io-dev2027", + "integration_branch": "develop", + "upstreams": [ + {"repo": "RDM-osf.io", "branch": "develop", "kind": "public", + "tracking_branch": "upstream/public-develop", "status": "merged", + "sha": SHA_A, "fetched_at": "2026-11-05"}, + {"repo": "RDM-osf.io-develop-private", "branch": "develop", "kind": "private", + "tracking_branch": "upstream/private-develop", "status": "merged", + "sha": SHA_B, "fetched_at": "2026-11-05"}, + {"repo": "CenterForOpenScience/osf.io", "branch": "develop", "kind": "cos", + "tracking_branch": "upstream/cos-develop", "status": "reference", + "sha": SHA_C, "fetched_at": "2026-11-05"}, + {"repo": "RDM-osf.io-private", "branch": "fix/sec-test", "kind": "private", + "tracking_branch": "upstream/private-sec-test-fix-sec-test", "status": "candidate", + "sha": SHA_C, "fetched_at": "2026-11-05"}, + ], + "adopted_prs": [ + {"repo": "RDM-osf.io", "number": 796, "title": "t", "reason": "r", "status": "adopted"}, + ], + "candidate_prs": [ + {"repo": "RDM-osf.io", "number": 812, "title": "t", "reason": "r", "status": "candidate"}, + ], + "base_image": "python:3.6-slim", + "base_image_digest": None, + "target_image": {"M4": "python:3.13-slim", "M5": None}, + "profile": "minimum", + "platforms": ["linux/arm64", "linux/amd64"], + "note": None, + }, + { + "id": "postgres", + "role": "infra", + "services": ["postgres"], + "integration_repo": None, + "integration_branch": None, + "upstreams": [], + "adopted_prs": [], + "candidate_prs": [], + "base_image": "postgres:9.6", + "base_image_digest": None, + "target_image": {"M4": None, "M5": "postgres:15"}, + "profile": "minimum", + "platforms": ["linux/arm64", "linux/amd64"], + "note": None, + }, + ], + } + + +VALID_TOON = f"""schema_version: 1 +generated_at: 2026-11-05 +note: "Names and SHAs only." +components[2]: + - id: osf.io + role: core + integration_repo: RDM-osf.io-dev2027 + profile: minimum + upstreams[4]{{repo,branch,kind,tracking_branch,status,sha,fetched_at}}: + RDM-osf.io,develop,public,upstream/public-develop,merged,{SHA_A},2026-11-05 + RDM-osf.io-develop-private,develop,private,upstream/private-develop,merged,{SHA_B},2026-11-05 + CenterForOpenScience/osf.io,develop,cos,upstream/cos-develop,reference,{SHA_C},2026-11-05 + RDM-osf.io-private,fix/sec-test,private,upstream/private-sec-test-fix-sec-test,candidate,{SHA_C},2026-11-05 + adopted_prs[1]{{repo,number,status}}: + RDM-osf.io,796,adopted + - id: postgres + role: infra + integration_repo: null + profile: minimum + upstreams[0]: + adopted_prs[0]: +""" + + +def codes(errors: list[str]) -> set[str]: + return {e.split(":", 1)[0] for e in errors} + + +class ValidateManifestTests(unittest.TestCase): + def test_valid_manifest_passes(self): + self.assertEqual(mc.validate_manifest(valid_manifest(), today=TODAY), []) + + def test_bad_role_fails(self): + data = valid_manifest() + data["components"][0]["role"] = "plugin" + errors = mc.validate_manifest(data, today=TODAY) + self.assertIn("MC-03", codes(errors)) + + def test_missing_sha_fails(self): + data = valid_manifest() + del data["components"][0]["upstreams"][0]["sha"] + errors = mc.validate_manifest(data, today=TODAY) + self.assertIn("MC-06", codes(errors)) + self.assertTrue(any("sha" in e for e in errors)) + + def test_short_or_uppercase_sha_fails(self): + data = valid_manifest() + data["components"][0]["upstreams"][0]["sha"] = "ABC" + self.assertIn("MC-06", codes(mc.validate_manifest(data, today=TODAY))) + + def test_future_fetched_at_fails(self): + data = valid_manifest() + data["components"][0]["upstreams"][0]["fetched_at"] = "2030-01-01" + self.assertIn("MC-06", codes(mc.validate_manifest(data, today=TODAY))) + + def test_bad_tracking_branch_fails_rule_7(self): + data = valid_manifest() + data["components"][0]["upstreams"][0]["tracking_branch"] = "upstream/develop" + self.assertIn("MC-13", codes(mc.validate_manifest(data, today=TODAY))) + + def test_tagged_tracking_branch_needs_two_of_same_kind(self): + data = valid_manifest() + # drop the second private upstream, so the tag form is no longer allowed + data["components"][0]["upstreams"].pop(1) + self.assertIn("MC-13", codes(mc.validate_manifest(data, today=TODAY))) + + def test_bad_integration_repo_fails(self): + data = valid_manifest() + data["components"][0]["integration_repo"] = "RDM-osf.io" + self.assertIn("MC-04", codes(mc.validate_manifest(data, today=TODAY))) + data["components"][1]["integration_repo"] = "RDM-postgres-dev2027" + self.assertIn("MC-04", codes(mc.validate_manifest(data, today=TODAY))) + + def test_pr_number_and_status(self): + data = valid_manifest() + data["components"][0]["adopted_prs"][0]["number"] = 0 + self.assertIn("MC-09", codes(mc.validate_manifest(data, today=TODAY))) + data = valid_manifest() + data["components"][0]["adopted_prs"][0]["status"] = "candidate" + self.assertIn("MC-09", codes(mc.validate_manifest(data, today=TODAY))) + data = valid_manifest() + data["components"][0]["candidate_prs"][0]["status"] = "adopted" + self.assertIn("MC-09", codes(mc.validate_manifest(data, today=TODAY))) + + def test_cos_upstream_must_be_reference(self): + data = valid_manifest() + data["components"][0]["upstreams"][2]["status"] = "merged" + self.assertIn("MC-09", codes(mc.validate_manifest(data, today=TODAY))) + + def test_same_repo_branch_different_sha_fails(self): + data = valid_manifest() + other = copy.deepcopy(data["components"][0]) + other["id"] = "second" + other["integration_repo"] = "RDM-second-dev2027" + other["upstreams"][0]["sha"] = SHA_B + data["components"].append(other) + self.assertIn("MC-08", codes(mc.validate_manifest(data, today=TODAY))) + + def test_url_in_value_fails(self): + data = valid_manifest() + data["components"][0]["note"] = "see https://github.com/example/x" + self.assertIn("MC-07", codes(mc.validate_manifest(data, today=TODAY))) + + def test_token_in_value_fails(self): + data = valid_manifest() + data["components"][0]["note"] = "token " + "ghp" + "_" + "A" * 36 + self.assertIn("MC-07", codes(mc.validate_manifest(data, today=TODAY))) + + def test_core_needs_both_platforms(self): + data = valid_manifest() + data["components"][0]["platforms"] = ["linux/arm64"] + self.assertIn("MC-10", codes(mc.validate_manifest(data, today=TODAY))) + + def test_image_build_rules_mc15(self): + """SPEC-01 §3 image_build (ADR-07): infra only, repo-relative context with a Dockerfile, valid tag, note, + exclusive with prebuilt_image and build_platform.""" + data = json.loads((REPO_ROOT / "manifest" / "upstreams.json").read_text(encoding="utf-8")) + es = [c for c in data["components"] if c["id"] == "elasticsearch8"][0] + self.assertEqual(es["image_build"], {"context": "installer/images/elasticsearch8", "tag": "8.19.24-1"}) + self.assertNotIn("MC-15", codes(mc.validate_manifest(data, today=TODAY))) + bad = json.loads(json.dumps(data)); bad_es = [c for c in bad["components"] if c["id"] == "elasticsearch8"][0] + bad_es["image_build"] = {"context": "installer/images/does-not-exist", "tag": "8.19.24-1"} + self.assertIn("MC-15", codes(mc.validate_manifest(bad, today=TODAY))) + bad_es["image_build"] = {"context": "../outside", "tag": "x"} + self.assertIn("MC-15", codes(mc.validate_manifest(bad, today=TODAY))) + bad_es["image_build"] = {"context": "installer/images/elasticsearch8", "tag": "not a tag!"} + self.assertIn("MC-15", codes(mc.validate_manifest(bad, today=TODAY))) + bad_es["image_build"] = {"context": "installer/images/elasticsearch8", "tag": "8.19.24-1"} + bad_es["build_platform"] = "linux/amd64" + self.assertIn("MC-15", codes(mc.validate_manifest(bad, today=TODAY))) + del bad_es["build_platform"]; bad_es["note"] = None + self.assertIn("MC-15", codes(mc.validate_manifest(bad, today=TODAY))) + bad_es["note"] = "x"; core = [c for c in bad["components"] if c["role"] == "core"][0] + core["image_build"] = {"context": "installer/images/elasticsearch8", "tag": "1"}; core["note"] = "x" + self.assertIn("MC-15", codes(mc.validate_manifest(bad, today=TODAY))) + + def test_image_build_empty_object_newline_tag_and_symlink_context_are_rejected(self): + """PR #34 review r1 R1-02: presence (not truthiness), full-string tag, resolved containment.""" + import tempfile, os + data = json.loads((REPO_ROOT / "manifest" / "upstreams.json").read_text(encoding="utf-8")) + es = [c for c in data["components"] if c["id"] == "elasticsearch8"][0] + es["image_build"] = {} + self.assertIn("MC-15", codes(mc.validate_manifest(data, today=TODAY))) + es["image_build"] = {"context": "installer/images/elasticsearch8"} + self.assertIn("MC-15", codes(mc.validate_manifest(data, today=TODAY))) + es["image_build"] = {"context": "installer/images/elasticsearch8", "tag": "8.19.24-1\n"} + self.assertIn("MC-15", codes(mc.validate_manifest(data, today=TODAY))) + es["image_build"] = {"context": "/etc", "tag": "1"} + self.assertIn("MC-15", codes(mc.validate_manifest(data, today=TODAY))) + # a symlinked context pointing outside the repository is refused even though it holds a Dockerfile + with tempfile.TemporaryDirectory() as outside: + (Path(outside) / "Dockerfile").write_text("FROM scratch\n") + link = REPO_ROOT / "installer" / "images" / "escape-test-link" + try: + os.symlink(outside, link) + es["image_build"] = {"context": "installer/images/escape-test-link", "tag": "1"} + errs = mc.validate_manifest(data, today=TODAY) + self.assertIn("MC-15", codes(errs)) + self.assertTrue(any("outside this repository" in e for e in errs), errs) + finally: + if link.is_symlink(): + link.unlink() + + def test_build_dockerfile_rules_mc16(self): + """SPEC-01 §3 build_dockerfile: a checkout to build, a real file here, a note, no prebuilt or overlay.""" + data = json.loads((REPO_ROOT / "manifest" / "upstreams.json").read_text(encoding="utf-8")) + self.assertNotIn("MC-16", codes(mc.validate_manifest(data, today=TODAY))) + comp = [c for c in data["components"] if c["id"] == "y-websocket"][0] + good = comp["build_dockerfile"] + for bad_path in ("installer/images/does-not-exist/Dockerfile", "../outside", "/etc/passwd", 7): + comp["build_dockerfile"] = bad_path + self.assertIn("MC-16", codes(mc.validate_manifest(data, today=TODAY)), bad_path) + comp["build_dockerfile"] = good + note, comp["note"] = comp["note"], None + self.assertIn("MC-16", codes(mc.validate_manifest(data, today=TODAY))) + comp["note"] = note + comp["overlay_of"] = "osf.io" + self.assertIn("MC-16", codes(mc.validate_manifest(data, today=TODAY))) + del comp["overlay_of"] + comp["prebuilt_image"] = PREBUILT_REF + self.assertIn("MC-16", codes(mc.validate_manifest(data, today=TODAY))) + del comp["prebuilt_image"] + infra = [c for c in data["components"] if c["role"] == "infra"][0] + infra["build_dockerfile"] = good + infra["note"] = "x" + self.assertIn("MC-16", codes(mc.validate_manifest(data, today=TODAY))) + + def test_infra_build_platform_requires_note(self): + data = json.loads((REPO_ROOT / "manifest" / "upstreams.json").read_text(encoding="utf-8")) + infra = [c for c in data["components"] if c["role"] == "infra"] + self.assertTrue(infra) + comp = infra[0] + comp["build_platform"] = "linux/amd64" + comp["note"] = None + self.assertIn("MC-10", codes(mc.validate_manifest(data, today=TODAY))) + comp["note"] = "image is linux/amd64 only (test)" + self.assertNotIn("MC-10", codes(mc.validate_manifest(data, today=TODAY))) + + def test_duplicate_id_fails(self): + data = valid_manifest() + data["components"][1]["id"] = "osf.io" + self.assertIn("MC-02", codes(mc.validate_manifest(data, today=TODAY))) + + +PREBUILT_DIGEST = "sha256:" + "a" * 64 +PREBUILT_REF = "niicloudoperation/rdm-ember-osf-web@" + PREBUILT_DIGEST + + +def prebuilt_manifest(ref=PREBUILT_REF, note="schema-1 base image refused by Docker; remove at M4") -> dict: + m = valid_manifest() + m["components"][0]["prebuilt_image"] = ref + m["components"][0]["note"] = note + return m + + +class PrebuiltImageTests(unittest.TestCase): + """SPEC-01 §3 `prebuilt_image`: digest-pinned, with a note, never a private URL, not on infra (MC-06).""" + + def test_digest_pinned_reference_with_note_passes(self): + self.assertEqual(mc.validate_manifest(prebuilt_manifest(), today=TODAY), []) + + def test_null_and_absent_pass(self): + m = valid_manifest() + m["components"][0]["prebuilt_image"] = None + self.assertEqual(mc.validate_manifest(m, today=TODAY), []) + self.assertEqual(mc.validate_manifest(valid_manifest(), today=TODAY), []) + + def test_registry_host_port_and_tag_before_digest_pass(self): + m = prebuilt_manifest(ref="registry.example:5000/team/rdm-ember-osf-web:latest@" + PREBUILT_DIGEST) + self.assertEqual(mc.validate_manifest(m, today=TODAY), []) + + def test_tag_only_or_short_digest_fails(self): + for ref in ("niicloudoperation/rdm-ember-osf-web:latest", "niicloudoperation/rdm-ember-osf-web@sha256:" + "a" * 63, + "niicloudoperation/rdm-ember-osf-web@sha1:" + "a" * 64, "niicloudoperation/rdm-ember-osf-web@" + "a" * 64, ""): + errors = mc.validate_manifest(prebuilt_manifest(ref=ref), today=TODAY) + self.assertEqual(codes(errors), {"MC-06"}, ref) + self.assertTrue(any("name@sha256:<64 hex>" in e for e in errors), errors) + + def test_missing_or_blank_note_fails(self): + for note in (None, "", " "): + errors = mc.validate_manifest(prebuilt_manifest(note=note), today=TODAY) + self.assertEqual(codes(errors), {"MC-06"}, repr(note)) + self.assertTrue(any("requires a non-empty note" in e for e in errors), errors) + + def test_url_forms_fail(self): + for ref in (private_address("https", "RDM-ember-osf-web" + DEV2027) + "@" + PREBUILT_DIGEST, + private_address("scp", "RDM-ember-osf-web" + PRIVATE), + "https://registry.example/x@" + PREBUILT_DIGEST): + errors = mc.validate_manifest(prebuilt_manifest(ref=ref), today=TODAY) + self.assertIn("MC-06", codes(errors), ref) + self.assertTrue(any("private-repository reference" in e for e in errors), errors) + + def test_private_repository_name_in_a_registry_path_fails(self): + for ref in ("ghcr.io/rcosdp/rdm-osf.io" + DEV2027.lower() + "@" + PREBUILT_DIGEST, + "ghcr.io/rcosdp/rdm-ember-osf-web-master" + PRIVATE + "@" + PREBUILT_DIGEST): + errors = mc.validate_manifest(prebuilt_manifest(ref=ref), today=TODAY) + self.assertEqual(codes(errors), {"MC-06"}, ref) + self.assertTrue(any("private-repository reference" in e for e in errors), errors) + + def test_infra_component_cannot_be_prebuilt(self): + m = valid_manifest() + m["components"][1]["prebuilt_image"] = "postgres@" + PREBUILT_DIGEST + m["components"][1]["note"] = "why" + errors = mc.validate_manifest(m, today=TODAY) + self.assertEqual(codes(errors), {"MC-06"}) + self.assertTrue(any("not allowed for infra" in e for e in errors), errors) + + def test_wrong_type_is_a_structure_finding(self): + m = prebuilt_manifest() + m["components"][0]["prebuilt_image"] = 5 + errors = mc.validate_manifest(m, today=TODAY) + self.assertEqual(errors, ["MC-06: components[0].prebuilt_image: expected string or null, got integer"]) + + def test_prebuilt_image_is_not_part_of_the_toon_projection(self): + """The TOON excerpt lists ids, roles, repos, profiles, upstreams and adopted PRs only (SPEC-01 §2).""" + self.assertEqual(mc.compare_toon(prebuilt_manifest(), mc.parse_toon(VALID_TOON)), []) + + def test_real_manifest_builds_ember_osf_web_from_its_pinned_commit(self): + """PR #2 review r1 R1-03: the static ember image is built from source; no component is prebuilt any more.""" + data = json.loads((REPO_ROOT / "manifest" / "upstreams.json").read_text(encoding="utf-8")) + ember = next(c for c in data["components"] if c["id"] == "ember-osf-web") + self.assertNotIn("prebuilt_image", ember) + self.assertNotIn("build_platform", ember) # the Node build stage runs on the build platform; nginx is multi-arch + self.assertRegex(ember["integration_sha"], r"^[0-9a-f]{40}$") + self.assertRegex(ember["base_image_digest"], r"^sha256:[0-9a-f]{64}$") + self.assertFalse([c["id"] for c in data["components"] if c.get("prebuilt_image")]) + self.assertEqual(mc.check_manifest_files(REPO_ROOT / "manifest" / "upstreams.json", REPO_ROOT / "manifest" / "upstreams.toon"), []) + + +def overlay_manifest() -> dict: + """valid_manifest() plus a wiki-frontend overlay of osf.io (SPEC-01 §3 overlay_of, ADR-06).""" + m = valid_manifest() + m["components"].append({ + "id": "wiki-frontend", + "role": "core", + "services": ["wiki_assets"], + "overlay_of": "osf.io", + "integration_repo": "RDM-wiki-frontend-dev2027", + "integration_branch": "develop", + "upstreams": [ + {"repo": "RDM-wiki-frontend", "branch": "develop", "kind": "public", + "tracking_branch": "upstream/public-develop", "status": "merged", + "sha": SHA_B, "fetched_at": "2026-11-05"}, + ], + "adopted_prs": [], + "candidate_prs": [], + "base_image": "node:21-alpine", + "base_image_digest": None, + "target_image": {"M4": "node LTS alpine, non-root", "M5": None}, + "profile": "core", + "platforms": ["linux/arm64", "linux/amd64"], + "note": "overlay of osf.io: the Dockerfile COPYs osf.io paths", + }) + return m + + +class OverlayTests(unittest.TestCase): + """MC-14: overlay_of names a buildable base; the overlay is buildable and keeps its (one-shot) services.""" + + def overlay(self, m: dict) -> dict: + return next(c for c in m["components"] if c["id"] == "wiki-frontend") + + def test_valid_overlay_passes_with_its_own_services_and_profile(self): + self.assertEqual(mc.validate_manifest(overlay_manifest(), today=TODAY), []) + m = overlay_manifest() + self.overlay(m)["build_platform"] = "linux/amd64" # its own image: build_platform is allowed like any built component + self.assertEqual(mc.validate_manifest(m, today=TODAY), []) + + def test_overlay_with_empty_services_is_mc03_like_any_component(self): + m = overlay_manifest() + self.overlay(m)["services"] = [] + self.assertEqual(codes(mc.validate_manifest(m, today=TODAY)), {"MC-03"}) + + def test_overlay_of_self_unknown_infra_and_overlay_of_overlay_are_rejected(self): + m = overlay_manifest() + self.overlay(m)["overlay_of"] = "wiki-frontend" + errors = mc.validate_manifest(m, today=TODAY) + self.assertEqual(codes(errors), {"MC-14"}) + self.assertTrue(any("itself" in e for e in errors), errors) + + m = overlay_manifest() + self.overlay(m)["overlay_of"] = "nope" + errors = mc.validate_manifest(m, today=TODAY) + self.assertEqual(codes(errors), {"MC-14"}) + self.assertTrue(any("unknown component 'nope'" in e for e in errors), errors) + + m = overlay_manifest() + self.overlay(m)["overlay_of"] = "postgres" + errors = mc.validate_manifest(m, today=TODAY) + self.assertEqual(codes(errors), {"MC-14"}) + self.assertTrue(any("not infra" in e for e in errors), errors) + + m = overlay_manifest() + second = copy.deepcopy(self.overlay(m)) + second["id"] = "wiki-theme" + second["integration_repo"] = "RDM-wiki-theme-dev2027" + second["services"] = ["wiki_theme_assets"] + second["overlay_of"] = "wiki-frontend" + second["upstreams"] = [] + m["components"].append(second) + errors = mc.validate_manifest(m, today=TODAY) + self.assertEqual(codes(errors), {"MC-14"}) + self.assertTrue(any("overlay of overlay" in e for e in errors), errors) + + def test_two_overlays_of_one_base_are_rejected(self): + m = overlay_manifest() + second = copy.deepcopy(self.overlay(m)) + second["id"] = "wiki-theme" + second["integration_repo"] = "RDM-wiki-theme-dev2027" + second["services"] = ["wiki_theme_assets"] + second["upstreams"] = [] + m["components"].append(second) + errors = mc.validate_manifest(m, today=TODAY) + self.assertEqual(codes(errors), {"MC-14"}) + self.assertTrue(any("more than one overlay" in e for e in errors), errors) + + def test_prebuilt_base_or_prebuilt_overlay_are_rejected(self): + m = overlay_manifest() + m["components"][0]["prebuilt_image"] = "niicloudoperation/rdm-osf@" + PREBUILT_DIGEST + m["components"][0]["note"] = "why" + errors = mc.validate_manifest(m, today=TODAY) + self.assertEqual(codes(errors), {"MC-14"}) + self.assertTrue(any("base 'osf.io' has prebuilt_image" in e for e in errors), errors) + + m = overlay_manifest() + self.overlay(m)["prebuilt_image"] = "niicloudoperation/rdm-wiki@" + PREBUILT_DIGEST + errors = mc.validate_manifest(m, today=TODAY) + self.assertEqual(codes(errors), {"MC-14"}) + self.assertTrue(any("must not have prebuilt_image" in e for e in errors), errors) + + def test_infra_overlay_is_rejected(self): + m = overlay_manifest() + o = self.overlay(m) + o["role"] = "infra"; o["integration_repo"] = None; o["integration_branch"] = None; o["upstreams"] = [] + errors = mc.validate_manifest(m, today=TODAY) + self.assertIn("MC-14", codes(errors)) + self.assertTrue(any("must not be infra" in e for e in errors), errors) + + def test_empty_string_overlay_of_is_rejected_not_normalized(self): + """Review r1: "when present" means a component id; "" is neither absent nor valid.""" + m = overlay_manifest() + self.overlay(m)["overlay_of"] = "" + errors = mc.validate_manifest(m, today=TODAY) + self.assertEqual(codes(errors), {"MC-14"}) + self.assertTrue(any("empty string" in e for e in errors), errors) + m = overlay_manifest() + self.overlay(m)["overlay_of"] = None # null is "absent": an ordinary component + self.assertEqual(mc.validate_manifest(m, today=TODAY), []) + + def test_wrong_type_is_a_structure_finding(self): + m = overlay_manifest() + self.overlay(m)["overlay_of"] = ["osf.io"] + self.assertEqual(mc.validate_manifest(m, today=TODAY), + ["MC-14: components[2].overlay_of: expected string or null, got list"]) + + def test_overlay_of_is_not_part_of_the_toon_projection(self): + proj = mc.project_manifest(overlay_manifest()) + self.assertNotIn("overlay_of", proj["components"][2]) + self.assertNotIn("services", proj["components"][2]) + + def test_real_manifest_wiki_frontend_is_an_overlay_of_osf_io(self): + data = json.loads((REPO_ROOT / "manifest" / "upstreams.json").read_text(encoding="utf-8")) + comps = {c["id"]: c for c in data["components"]} + wiki = comps["wiki-frontend"] + self.assertEqual(wiki["overlay_of"], "osf.io") + self.assertEqual(wiki["services"], ["wiki_assets"]) + self.assertEqual(wiki["profile"], "core") + self.assertNotIn("prebuilt_image", comps["osf.io"]) + self.assertRegex(wiki["integration_sha"], r"^[0-9a-f]{40}$") + self.assertIn("ADR-06", wiki["note"]) + self.assertEqual(mc.check_manifest_files(REPO_ROOT / "manifest" / "upstreams.json", REPO_ROOT / "manifest" / "upstreams.toon"), []) + + +class StructureValidationTests(unittest.TestCase): + """R2-02: types are checked before any set membership or projection; a type + problem is a finding (MC id + JSON path), never an exception.""" + + def assert_structural(self, mutate, expected_code: str, expected_path: str): + data = valid_manifest() + mutate(data) + errors = mc.validate_structure(data) + self.assertTrue(errors, "expected a structural finding") + self.assertIn(expected_code, codes(errors)) + self.assertTrue(any(expected_path in e for e in errors), errors) + # validate_manifest must return findings too, without raising + full = mc.validate_manifest(data, today=TODAY) + self.assertTrue(full) + self.assertTrue(any(expected_path in e for e in full), full) + return errors + + def test_valid_manifest_is_well_formed(self): + self.assertEqual(mc.validate_structure(valid_manifest()), []) + + def test_schema_version_true_is_rejected(self): + def m(d): + d["schema_version"] = True + errors = self.assert_structural(m, "MC-01", "$.schema_version") + self.assertIn("boolean", errors[0]) + + def test_schema_version_string_and_other_int_are_rejected(self): + def m(d): + d["schema_version"] = "1" + self.assert_structural(m, "MC-01", "$.schema_version") + + def m2(d): + d["schema_version"] = 2 + self.assert_structural(m2, "MC-01", "$.schema_version") + + def test_target_image_value_true_is_rejected(self): + def m(d): + d["components"][0]["target_image"]["M4"] = True + self.assert_structural(m, "MC-01", "components[0].target_image.M4") + + def test_target_image_null_and_string_values_pass(self): + data = valid_manifest() + data["components"][0]["target_image"] = {"M4": None, "M5": "x:1"} + self.assertEqual(mc.validate_structure(data), []) + + def test_components_string_is_a_finding_not_attribute_error(self): + def m(d): + d["components"] = "bad" + errors = self.assert_structural(m, "MC-01", "$.components") + self.assertIn("got string", errors[0]) + # no AttributeError from the projection either + data = valid_manifest() + data["components"] = "bad" + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + (root / "upstreams.json").write_text(json.dumps(data), encoding="utf-8") + (root / "upstreams.toon").write_text(VALID_TOON, encoding="utf-8") + errors = mc.check_manifest_files(root / "upstreams.json", root / "upstreams.toon") + self.assertTrue(errors) + self.assertFalse(any(e.startswith("MC-11") for e in errors), "TOON parity must not run on ill-typed data") + + def test_component_role_list_is_a_finding_not_type_error(self): + def m(d): + d["components"][0]["role"] = [] + errors = self.assert_structural(m, "MC-03", "components[0].role") + self.assertIn("got list", errors[0]) + + def test_component_not_an_object(self): + def m(d): + d["components"].append(42) + self.assert_structural(m, "MC-01", "$.components[2]") + + def test_string_fields_reject_booleans(self): + for field, code in (("id", "MC-02"), ("base_image", "MC-01"), ("profile", "MC-10"), + ("integration_repo", "MC-04"), ("integration_branch", "MC-05"), + ("base_image_digest", "MC-06")): + def m(d, field=field): + d["components"][0][field] = True + self.assert_structural(m, code, f"components[0].{field}") + + def test_list_fields_reject_non_lists_and_wrong_items(self): + def m(d): + d["components"][0]["services"] = "web" + self.assert_structural(m, "MC-03", "components[0].services") + + def m2(d): + d["components"][0]["services"] = ["web", False] + self.assert_structural(m2, "MC-03", "components[0].services[1]") + + def m3(d): + d["components"][0]["platforms"] = [["linux/arm64"]] # unhashable item: no TypeError + self.assert_structural(m3, "MC-10", "components[0].platforms[0]") + + def m4(d): + d["components"][0]["upstreams"] = {"repo": "x"} + self.assert_structural(m4, "MC-01", "components[0].upstreams") + + def test_upstream_entries_must_be_objects_with_string_fields(self): + def m(d): + d["components"][0]["upstreams"][0] = "RDM-osf.io" + self.assert_structural(m, "MC-01", "components[0].upstreams[0]") + + def m2(d): + d["components"][0]["upstreams"][1]["sha"] = 12345 + self.assert_structural(m2, "MC-06", "components[0].upstreams[1].sha") + + def m3(d): + d["components"][0]["upstreams"][1]["kind"] = ["private"] + self.assert_structural(m3, "MC-09", "components[0].upstreams[1].kind") + + def test_pr_entries_must_be_objects_with_int_number(self): + def m(d): + d["components"][0]["adopted_prs"][0] = 796 + self.assert_structural(m, "MC-09", "components[0].adopted_prs[0]") + + def m2(d): + d["components"][0]["adopted_prs"][0]["number"] = True + self.assert_structural(m2, "MC-09", "components[0].adopted_prs[0].number") + + def m3(d): + d["components"][0]["candidate_prs"][0]["number"] = "93" + self.assert_structural(m3, "MC-09", "components[0].candidate_prs[0].number") + + def m4(d): + d["components"][0]["candidate_prs"] = [None] + self.assert_structural(m4, "MC-09", "components[0].candidate_prs[0]") + + def test_top_level_not_an_object(self): + for data in ([], "x", None, 1): + errors = mc.validate_structure(data) + self.assertEqual(len(errors), 1) + self.assertIn("MC-01", codes(errors)) + self.assertTrue(mc.validate_manifest(data, today=TODAY)) + + +class ToonParityTests(unittest.TestCase): + def test_parse_toon_roundtrip(self): + parsed = mc.parse_toon(VALID_TOON) + self.assertEqual(parsed, mc.project_manifest(valid_manifest())) + + def test_matching_toon_passes(self): + self.assertEqual(mc.compare_toon(valid_manifest(), mc.parse_toon(VALID_TOON)), []) + + def test_changed_sha_fails(self): + stale = VALID_TOON.replace(SHA_A, "f" * 40, 1) + errors = mc.compare_toon(valid_manifest(), mc.parse_toon(stale)) + self.assertTrue(errors) + self.assertTrue(any("upstreams[0].sha" in e for e in errors)) + + def test_changed_pr_number_and_profile_fail(self): + stale = VALID_TOON.replace("RDM-osf.io,796,adopted", "RDM-osf.io,797,adopted") + self.assertTrue(any("adopted_prs[0].number" in e for e in mc.compare_toon(valid_manifest(), mc.parse_toon(stale)))) + stale = VALID_TOON.replace("profile: minimum\n upstreams[4]", "profile: core\n upstreams[4]") + self.assertTrue(any("profile" in e for e in mc.compare_toon(valid_manifest(), mc.parse_toon(stale)))) + + def test_missing_component_fails(self): + data = valid_manifest() + data["components"].append(copy.deepcopy(data["components"][1]) | {"id": "redis", "services": ["redis"]}) + errors = mc.compare_toon(data, mc.parse_toon(VALID_TOON)) + self.assertTrue(any("count" in e for e in errors)) + self.assertTrue(any("'redis'" in e for e in errors)) + + def test_wrong_row_count_is_a_parse_error(self): + broken = VALID_TOON.replace("upstreams[4]{", "upstreams[3]{") + with self.assertRaises(mc.ToonError): + mc.parse_toon(broken) + + def test_missing_toon_file_fails(self): + with tempfile.TemporaryDirectory() as tmp: + errors = mc.validate_toon_parity(valid_manifest(), Path(tmp) / "upstreams.toon") + self.assertEqual(len(errors), 1) + self.assertIn("missing", errors[0]) + + def test_check_manifest_files_reports_stale_toon(self): + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + (root / "upstreams.json").write_text(json.dumps(valid_manifest()), encoding="utf-8") + (root / "upstreams.toon").write_text(VALID_TOON.replace(SHA_B, "e" * 40), encoding="utf-8") + errors = mc.check_manifest_files(root / "upstreams.json", root / "upstreams.toon") + self.assertTrue(errors) + self.assertTrue(all(e.startswith("MC-11") for e in errors)) + + +class PolicyScanTests(unittest.TestCase): + def test_private_url_in_text_fails(self): + # Built at run time so that this test file never contains a private URL literal + # (the policy scan covers tools/tests/ too). + dev, priv = "-dev" + "2027", "-priv" + "ate" + for url in ( + "https://github.com/RCOSDP/RDM-osf.io" + dev, + "https://github.com/rcosdp/RDM-osf.io" + dev, + "git@github.com:RCOSDP/RDM-osf.io" + priv + ".git", + "ssh://git@github.com/RCOSDP/RDM-osf.io-develop" + priv + ".git", + ): + findings = mc.scan_text_for_policy(f"see {url} here\n", "x.md") + self.assertEqual(len(findings), 1, url) + self.assertNotIn("github.com", findings[0]) # the URL itself is never echoed + + def test_public_url_and_bare_names_pass(self): + text = "https://github.com/RCOSDP/RDM-osf.io and the name RDM-osf.io-dev2027 and RDM-osf.io-private\n" + self.assertEqual(mc.scan_text_for_policy(text, "x.md"), []) + + def test_synthetic_tokens_fail(self): + ghp = "ghp" + "_" + "x" * 36 + akia = "AKIA" + "Q" * 16 + key = "-----BEGIN " + "RSA PRIVATE KEY-----" + for sample in (ghp, akia, key): + self.assertTrue(mc.scan_text_for_policy(sample + "\n", "x.txt"), sample) + + def test_no_path_exemptions_remain(self): + # R2-01: the publication policy has no path-based exemption function any more. + self.assertFalse(hasattr(mc, "policy_excluded")) + self.assertFalse(hasattr(mc, "POLICY_EXCLUDED_PREFIXES")) + self.assertFalse(hasattr(mc, "POLICY_TEXT_SUFFIXES")) + + def test_run_policy_scan_on_file_list(self): + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + (root / "a.md").write_text(private_address("scp", "RDM-x" + DEV2027) + "\n", encoding="utf-8") + (root / "b.md").write_text("clean\n", encoding="utf-8") + findings = mc.run_policy_scan(root, files=["a.md", "b.md"]) + self.assertEqual(len(findings), 1) + self.assertTrue(findings[0].startswith("a.md:1:")) + + def test_previously_excluded_locations_are_now_reported(self): + """R2-01 reproduction: the same prohibited address in site/, a *.legacy.md and + nested legacy sample code must each be reported (control: docs/README.md).""" + cases = { + "site/index.html": private_address("https", "RDM-osf.io" + DEV2027), + "site/search/search_index.json": private_address("https", "RDM-osf.io" + DEV2027), + "docs/guides/api/README.legacy.md": private_address("scp", "RDM-osf.io" + PRIVATE), + "docs/guides/api/addon/x.py": private_address("ssh", "RDM-osf.io-develop" + PRIVATE), + "docs/guides/api/osf/addon/deep/y.js": private_address("https", "RDM-x" + PRIVATE), + "docs/README.md": private_address("https", "RDM-osf.io" + DEV2027), + "Dockerfile": private_address("scp", "RDM-osf.io" + DEV2027), # no suffix at all + "assets/data.unknownext": private_address("https", "RDM-osf.io" + DEV2027), + } + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + for rel, addr in cases.items(): + path = root / rel + path.parent.mkdir(parents=True, exist_ok=True) + path.write_text("

                                                            clean

                                                            \nsee " + addr + " here\n", encoding="utf-8") + findings = mc.run_policy_scan(root, files=[rel]) + self.assertEqual(len(findings), 1, rel) + self.assertTrue(findings[0].startswith(f"{rel}:2:"), findings[0]) + self.assertNotIn("github", findings[0].lower()) # address never echoed + # and all at once + result = mc.scan_policy(root, files=list(cases)) + self.assertEqual(len(result.findings), len(cases)) + self.assertEqual(sorted(result.scanned), sorted(cases)) + self.assertEqual(result.skipped, []) + + def test_token_in_site_and_legacy_files_is_reported(self): + ghp = "ghp" + "_" + "x" * 36 + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + for rel in ("site/js/app.js", "docs/guides/x/README.legacy.md"): + path = root / rel + path.parent.mkdir(parents=True, exist_ok=True) + path.write_text("token = '" + ghp + "'\n", encoding="utf-8") + findings = mc.run_policy_scan(root, files=[rel]) + self.assertEqual(len(findings), 1, rel) + self.assertNotIn(ghp, findings[0]) + + def test_binary_and_oversized_files_are_skipped_and_counted(self): + addr = private_address("https", "RDM-osf.io" + DEV2027) + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + (root / "img.png").write_bytes(b"\x89PNG\r\n\x1a\n\xff\xfe" + addr.encode("utf-8")) + (root / "big.txt").write_text("x" * 100 + "\n" + addr + "\n", encoding="utf-8") + (root / "ok.txt").write_text(addr + "\n", encoding="utf-8") + (root / "latin1.txt").write_bytes("caf\xe9 ".encode("latin-1") + addr.encode("utf-8")) + result = mc.scan_policy(root, files=["img.png", "big.txt", "ok.txt", "latin1.txt", "missing.md"], max_bytes=80) + self.assertEqual(result.scanned, ["ok.txt"]) + self.assertEqual(len(result.findings), 1) + self.assertEqual(result.skipped_binary, 2) + self.assertEqual(result.skipped_large, 1) + self.assertEqual(len(result.skipped), 3) + self.assertEqual(mc.POLICY_MAX_BYTES, 5 * 1024 * 1024) + + def test_real_repository_tracked_set_is_fully_scanned(self): + """The real checkout: site/**, *.legacy.md and nested guide files are scanned.""" + if not (REPO_ROOT / ".git").exists(): + self.skipTest("not a git checkout") + result = mc.scan_policy(REPO_ROOT) + scanned = set(result.scanned) + tracked = set(mc.git_tracked_files(REPO_ROOT)) + skipped = {p for p, _ in result.skipped} + present = {p for p in tracked if (REPO_ROOT / p).is_file()} + self.assertEqual(scanned | skipped, present) + self.assertTrue(any(p.startswith("site/") and p.endswith(".html") for p in scanned)) + self.assertTrue(any(p.endswith(".legacy.md") for p in scanned)) + self.assertTrue(any(p.startswith("docs/guides/") and p.count("/") >= 4 for p in scanned)) + for p in skipped: + self.assertNotEqual(Path(p).suffix, ".md", p) # no Markdown is ever skipped + self.assertEqual(result.findings, []) + + +class CliTests(unittest.TestCase): + def test_exit_codes_are_documented(self): + self.assertEqual(mc.EXIT_MANIFEST, 20) + self.assertEqual(mc.EXIT_POLICY, 1) + self.assertIn("20", mc.__doc__) + + def _run_cli(self, root: Path, *args: str) -> subprocess.CompletedProcess: + return subprocess.run( + [sys.executable, "-I", str(TOOLS_DIR / "manifest_check.py"), "--root", str(root), *args], + capture_output=True, text=True, cwd=str(root), + ) + + def _write_manifest_copy(self, root: Path, mutate) -> None: + """Temporary copy of the real JSON (mutated) with the unchanged real TOON.""" + (root / "manifest").mkdir(exist_ok=True) + data = json.loads((REPO_ROOT / "manifest" / "upstreams.json").read_text(encoding="utf-8")) + mutate(data) + (root / "manifest" / "upstreams.json").write_text(json.dumps(data), encoding="utf-8") + (root / "manifest" / "upstreams.toon").write_text( + (REPO_ROOT / "manifest" / "upstreams.toon").read_text(encoding="utf-8"), encoding="utf-8") + + def test_subprocess_exit_20_without_traceback_for_ill_typed_manifests(self): + """R2-02 review cases against copies of the real JSON + unchanged TOON.""" + cases = [ + ("schema_version true", lambda d: d.__setitem__("schema_version", True), "$.schema_version"), + ("target_image.M4 true", lambda d: d["components"][0]["target_image"].__setitem__("M4", True), + "components[0].target_image.M4"), + ("components string", lambda d: d.__setitem__("components", "bad"), "$.components"), + ("role list", lambda d: d["components"][0].__setitem__("role", []), "components[0].role"), + ("pr number bool", lambda d: d["components"][0]["adopted_prs"][0].__setitem__("number", True), + "adopted_prs[0].number"), + ("services bool item", lambda d: d["components"][0].__setitem__("services", [True]), + "components[0].services[0]"), + ("top level list", lambda d: None, None), + ] + for name, mutate, path in cases: + with self.subTest(name), tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + if path is None: + (root / "manifest").mkdir() + (root / "manifest" / "upstreams.json").write_text("[]", encoding="utf-8") + (root / "manifest" / "upstreams.toon").write_text("schema_version: 1\n", encoding="utf-8") + else: + self._write_manifest_copy(root, mutate) + proc = self._run_cli(root, "--manifest-only") + self.assertEqual(proc.returncode, 20, proc.stdout + proc.stderr) + self.assertNotIn("Traceback", proc.stderr) + self.assertNotIn("Error", proc.stderr.replace("Error:", "")) # no AttributeError/TypeError + self.assertIn("MC-0", proc.stdout) + if path: + self.assertIn(path, proc.stdout) + self.assertNotIn("MC-11", proc.stdout) # TOON parity not attempted on ill-typed data + + def test_subprocess_real_manifest_copy_passes(self): + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + self._write_manifest_copy(root, lambda d: None) + proc = self._run_cli(root, "--manifest-only") + self.assertEqual(proc.returncode, 0, proc.stdout + proc.stderr) + + def test_subprocess_manifest_errors_take_precedence_over_policy(self): + """Exit 20 beats exit 1 when both the manifest is invalid and a policy hit exists.""" + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + subprocess.run(["git", "init", "-q", str(root)], check=True, capture_output=True) + self._write_manifest_copy(root, lambda d: d.__setitem__("schema_version", True)) + (root / "site").mkdir() + (root / "site" / "index.html").write_text(private_address("https", "RDM-x" + DEV2027) + "\n", encoding="utf-8") + subprocess.run(["git", "-C", str(root), "add", "-A"], check=True, capture_output=True) + proc = self._run_cli(root) + self.assertEqual(proc.returncode, 20, proc.stdout + proc.stderr) + self.assertIn("site/index.html:1:", proc.stdout) + # valid manifest + same policy hit -> exit 1, address not echoed, skip count printed + self._write_manifest_copy(root, lambda d: None) + proc = self._run_cli(root) + self.assertEqual(proc.returncode, 1, proc.stdout + proc.stderr) + self.assertIn("site/index.html:1:", proc.stdout) + self.assertNotIn("github", proc.stdout.lower()) + self.assertIn("skipped", proc.stdout) + + def test_manifest_only_exit_20_on_missing_toon(self): + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + (root / "manifest").mkdir() + (root / "manifest" / "upstreams.json").write_text(json.dumps(valid_manifest()), encoding="utf-8") + with contextlib.redirect_stdout(io.StringIO()): + code = mc.main(["--manifest-only", "--root", tmp]) + self.assertEqual(code, 20) + + +if __name__ == "__main__": + unittest.main()